diff --git a/.evergreen/.evg.yml b/.evergreen/.evg.yml
new file mode 100644
index 00000000000..49d1c6df521
--- /dev/null
+++ b/.evergreen/.evg.yml
@@ -0,0 +1,721 @@
+########################################
+# Evergreen Template for MongoDB Drivers
+########################################
+
+# When a task that used to pass starts to fail
+# Go through all versions that may have been skipped to detect
+# when the task started failing
+stepback: true
+
+# Mark a failure as a system/bootstrap failure (purple box) rather then a task
+# failure by default.
+# Actual testing tasks are marked with `type: test`
+command_type: system
+
+# Protect ourself against rogue test case, or curl gone wild, that runs forever
+# 12 minutes is the longest we'll ever run
+exec_timeout_secs: 3600 # 12 minutes is the longest we'll ever run
+
+# What to do when evergreen hits the timeout (`post:` tasks are run automatically)
+timeout:
+  - command: shell.exec
+    params:
+      script: |
+        ls -la
+
+functions:
+  "fetch source":
+    # Executes git clone and applies the submitted patch, if any
+    - command: git.get_project
+      params:
+        directory: "src"
+    # Applies the subitted patch, if any
+    # Deprecated. Should be removed. But still needed for certain agents (ZAP)
+    - command: git.apply_patch
+    # Make an evergreen exapanstion file with dynamic values
+    - command: shell.exec
+      params:
+        working_dir: "src"
+        script: |
+           # Get the current unique version of this checkout
+           if [ "${is_patch}" = "true" ]; then
+              CURRENT_VERSION=$(git describe)-patch-${version_id}
+           else
+              CURRENT_VERSION=latest
+           fi
+
+           export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
+
+           # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
+           if [ "Windows_NT" == "$OS" ]; then # Magic variable in cygwin
+              export DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
+           fi
+
+           export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
+           export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
+           export UPLOAD_BUCKET="${project}"
+           export PROJECT_DIRECTORY="$(pwd)"
+
+           cat <<EOT > expansion.yml
+           CURRENT_VERSION: "$CURRENT_VERSION"
+           DRIVERS_TOOLS: "$DRIVERS_TOOLS"
+           MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
+           MONGODB_BINARIES: "$MONGODB_BINARIES"
+           UPLOAD_BUCKET: "$UPLOAD_BUCKET"
+           PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
+           PREPARE_SHELL: |
+              set -o errexit
+              set -o xtrace
+              export DRIVERS_TOOLS="$DRIVERS_TOOLS"
+              export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
+              export MONGODB_BINARIES="$MONGODB_BINARIES"
+              export UPLOAD_BUCKET="$UPLOAD_BUCKET"
+              export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
+
+              export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
+              export PATH="$MONGODB_BINARIES:$PATH"
+              export PROJECT="${project}"
+           EOT
+           # See what we've done
+           cat expansion.yml
+
+    # Load the expansion file to make an evergreen variable with the current unique version
+    - command: expansions.update
+      params:
+        file: src/expansion.yml
+
+  "prepare resources":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          rm -rf $DRIVERS_TOOLS
+          if [ "${project}" = "drivers-tools" ]; then
+            # If this was a patch build, doing a fresh clone would not actually test the patch
+            cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
+          else
+            git clone git://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
+          fi
+          echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
+
+  # Upload build artifacts that other tasks may depend on
+  # Note this URL needs to be totally unique, while predictable for the next task
+  # so it can automatically download the artifacts
+  "upload build":
+    # Compress and upload the entire build directory
+    - command: archive.targz_pack
+      params:
+        # Example: mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz
+        target: "${build_id}.tar.gz"
+        source_dir: ${PROJECT_DIRECTORY}/
+        include:
+          - "./**"
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: ${build_id}.tar.gz
+        # Example: /mciuploads/${UPLOAD_BUCKET}/gcc49/9dfb7d741efbca16faa7859b9349d7a942273e43/debug-compile-nosasl-nossl/mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz
+        bucket: mciuploads
+        permissions: public-read
+        content_type: ${content_type|application/x-gzip}
+
+  "exec script" :
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          ${PROJECT_DIRECTORY}/${file}
+
+  "upload mo artifacts":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          find $MONGO_ORCHESTRATION_HOME -name \*.log | xargs tar czf mongodb-logs.tar.gz
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: mongodb-logs.tar.gz
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz
+        bucket: mciuploads
+        permissions: public-read
+        content_type: ${content_type|application/x-gzip}
+        display_name: "mongodb-logs.tar.gz"
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: drivers-tools/.evergreen/orchestration/server.log
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log
+        bucket: mciuploads
+        permissions: public-read
+        content_type: ${content_type|text/plain}
+        display_name: "orchestration.log"
+
+  "upload working dir":
+    - command: archive.targz_pack
+      params:
+        target: "working-dir.tar.gz"
+        source_dir: ${PROJECT_DIRECTORY}/
+        include:
+          - "./**"
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: working-dir.tar.gz
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/artifacts/${task_id}-${execution}-working-dir.tar.gz
+        bucket: mciuploads
+        permissions: public-read
+        content_type: ${content_type|application/x-gzip}
+        display_name: "working-dir.tar.gz"
+    - command: archive.targz_pack
+      params:
+        target: "drivers-dir.tar.gz"
+        source_dir: ${DRIVERS_TOOLS}
+        include:
+          - "./**"
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: drivers-dir.tar.gz
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/artifacts/${task_id}-${execution}-drivers-dir.tar.gz
+        bucket: mciuploads
+        permissions: public-read
+        content_type: ${content_type|application/x-gzip}
+        display_name: "drivers-dir.tar.gz"
+
+  "upload test results":
+    - command: attach.xunit_results
+      params:
+        file: ./src/*/build/test-results/test/TEST-*.xml
+
+  "bootstrap mongo-orchestration":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+    # run-orchestration generates expansion file with the MONGODB_URI for the cluster
+    - command: expansions.update
+      params:
+        file: mo-expansion.yml
+
+  "run tests":
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" SAFE_FOR_MULTI_MONGOS="${SAFE_FOR_MULTI_MONGOS}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JDK="${JDK}" AWS_ACCESS_KEY_ID=${aws_access_key_id} AWS_SECRET_ACCESS_KEY=${aws_secret_access_key} .evergreen/run-tests.sh
+
+  "run slow tests":
+  - command: shell.exec
+    type: test
+    params:
+      working_dir: "src"
+      script: |
+        ${PREPARE_SHELL}
+        AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JDK="${JDK}" SLOW_TESTS_ONLY=true .evergreen/run-tests.sh
+
+  "run socket tests":
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          AUTH="${AUTH}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JDK="${JDK}" .evergreen/run-socket-tests.sh
+
+  "run embedded tests":
+  - command: shell.exec
+    type: test
+    params:
+      working_dir: "src"
+      script: |
+        ${PREPARE_SHELL}
+        JDK="${JDK}" .evergreen/run-embedded-tests.sh
+
+  "run plain auth test":
+    - command: shell.exec
+      type: test
+      params:
+        silent: true
+        working_dir: "src"
+        script: |
+          # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
+          JDK="jdk8" MONGODB_URI="${plain_auth_mongodb_uri}" .evergreen/run-plain-auth-test.sh
+
+  "run gssapi auth test":
+    - command: shell.exec
+      type: test
+      params:
+        silent: true
+        working_dir: "src"
+        script: |
+          # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
+          PROJECT_DIRECTORY=${PROJECT_DIRECTORY} JDK=${JDK} MONGODB_URI=${gssapi_auth_mongodb_uri} KDC=${gssapi_auth_kdc} REALM=${gssapi_auth_realm} KEYTAB_BASE64=${gssapi_auth_keytab_base64} .evergreen/run-gssapi-auth-test.sh
+
+  "run mmapv1 storage test":
+    - command: shell.exec
+      type: test
+      params:
+        silent: true
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          PROJECT_DIRECTORY=${PROJECT_DIRECTORY} JDK=${JDK} TOPOLOGY=${TOPOLOGY} STORAGE_ENGINE=${STORAGE_ENGINE} MONGODB_URI="${MONGODB_URI}" .evergreen/run-mmapv1-storage-test.sh
+
+  "run atlas test":
+    - command: shell.exec
+      type: test
+      params:
+        silent: true
+        working_dir: "src"
+        script: |
+          # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
+          JDK="jdk8" .evergreen/run-connectivity-tests.sh '${atlas_free_tier_uri}' '${atlas_replica_set_uri}' '${atlas_sharded_uri}' '${atlas_tls_v11_uri}' '${atlas_tls_v12_uri}' '${atlas_free_tier_uri_srv}' '${atlas_replica_set_uri_srv}' '${atlas_sharded_uri_srv}' '${atlas_tls_v11_uri_srv}' '${atlas_tls_v12_uri_srv}'
+
+  "publish snapshot":
+    - command: shell.exec
+      type: test
+      params:
+        silent: true
+        working_dir: "src"
+        script: |
+          # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
+          PROJECT_DIRECTORY=${PROJECT_DIRECTORY} NEXUS_USERNAME=${nexus_username} NEXUS_PASSWORD=${nexus_password} SIGNING_PASSWORD=${signing_password} SIGNING_KEY_ID=${signing_keyId} RING_FILE_GPG_BASE64=${ring_file_gpg_base64} .evergreen/publish.sh
+
+  "cleanup":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          cd "$MONGO_ORCHESTRATION_HOME"
+          # source the mongo-orchestration virtualenv if it exists
+          if [ -f venv/bin/activate ]; then
+            . venv/bin/activate
+          elif [ -f venv/Scripts/activate ]; then
+            . venv/Scripts/activate
+          fi
+          mongo-orchestration stop || true
+          cd -
+          rm -rf $DRIVERS_TOOLS || true
+
+  "fix absolute paths":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do
+            perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename
+          done
+
+  "windows fix":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do
+            cat $i | tr -d '\r' > $i.new
+            mv $i.new $i
+          done
+
+  "make files executable":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do
+            chmod +x $i
+          done
+
+  "init test-results":
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test-results.json found was created"  } ]}' > ${PROJECT_DIRECTORY}/test-results.json
+
+  "run perf tests":
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: "src"
+        script: |
+          ${PREPARE_SHELL}
+          PROJECT_DIRECTORY=${PROJECT_DIRECTORY} .evergreen/run-perf-tests.sh
+
+  "send dashboard data":
+    - command: json.send
+      params:
+        name: perf
+        file: src/results.json
+
+# Anchors
+
+hosts: &hosts
+ - rhel70-small
+
+pre:
+  - func: "fetch source"
+  - func: "prepare resources"
+  - func: "windows fix"
+  - func: "fix absolute paths"
+  - func: "init test-results"
+  - func: "make files executable"
+
+post:
+  # Removed, causing timeouts
+  # - func: "upload working dir"
+  - func: "upload mo artifacts"
+  - func: "upload test results"
+  - func: "cleanup"
+
+tasks:
+
+    # Compile / check build variant
+    - name: static-analysis
+      commands:
+        - func: "exec script"
+          vars:
+            file: ".evergreen/compile.sh"
+        - func: "upload build"
+
+    - name: "test"
+      commands:
+        - func: "bootstrap mongo-orchestration"
+        - func: "run tests"
+
+    - name: "plain-auth-test"
+      commands:
+        - func: "run plain auth test"
+
+    - name: "gssapi-auth-test"
+      commands:
+        - func: "run gssapi auth test"
+
+    - name: "slow-test"
+      commands:
+      - func: "bootstrap mongo-orchestration"
+      - func: "run slow tests"
+
+    - name: "socket-test"
+      commands:
+        - func: "bootstrap mongo-orchestration"
+        - func: "run socket tests"
+
+    - name: "embedded-test"
+      commands:
+      - func: "run embedded tests"
+
+    - name: "atlas-test"
+      commands:
+        - func: "run atlas test"
+
+    - name: publish-snapshot
+      depends_on:
+        - variant: "static-checks"
+          name: "static-analysis"
+        - variant: ".tests-variant"
+          name: "test"
+        - variant: ".tests-slow-variant"
+          name: "slow-test"
+        - variant: ".test-gssapi-variant"
+          name: "gssapi-auth-test"
+        - variant: "plain-auth-test"
+          name: "plain-auth-test"
+        - variant: ".test-embedded-variant"
+          name: "embedded-test"
+      commands:
+        - func: "publish snapshot"
+
+    - name: "perf"
+      tags: ["perf"]
+      commands:
+        - func: "bootstrap mongo-orchestration"
+        - func: "run perf tests"
+        - func: "send dashboard data"
+
+    - name: "mmapv1-storage-test"
+      commands:
+        - func: "bootstrap mongo-orchestration"
+        - func: "run mmapv1 storage test"
+
+axes:
+  - id: version
+    display_name: MongoDB Version
+    values:
+      - id: "latest"
+        display_name: "latest"
+        variables:
+           VERSION: "latest"
+           # Multiple mongos instances can be specified in the connection string
+           # for this version.
+           SAFE_FOR_MULTI_MONGOS: true
+      - id: "4.2"
+        display_name: "4.2"
+        variables:
+           VERSION: "4.2"
+           # Multiple mongos instances can be specified in the connection string
+           # for this version.
+           SAFE_FOR_MULTI_MONGOS: true
+      - id: "4.0"
+        display_name: "4.0"
+        variables:
+           VERSION: "4.0"
+      - id: "3.6"
+        display_name: "3.6"
+        variables:
+           VERSION: "3.6"
+      - id: "3.4"
+        display_name: "3.4"
+        variables:
+           VERSION: "3.4"
+      - id: "3.2"
+        display_name: "3.2"
+        variables:
+           VERSION: "3.2"
+      - id: "3.0"
+        display_name: "3.0"
+        variables:
+           VERSION: "3.0"
+      - id: "2.6"
+        display_name: "2.6"
+        variables:
+           VERSION: "2.6"
+  - id: os
+    display_name: OS
+    values:
+      - id: "linux"
+        display_name: "Linux"
+        run_on: *hosts
+      - id: "ubuntu"
+        display_name: "Ubuntu 18.04"
+        run_on: ubuntu1804-test
+
+  - id: topology
+    display_name: Topology
+    values:
+      - id: "standalone"
+        display_name: Standalone
+        variables:
+           TOPOLOGY: "server"
+      - id: "replicaset"
+        display_name: Replica Set
+        variables:
+           TOPOLOGY: "replica_set"
+      - id: "sharded-cluster"
+        display_name: Sharded Cluster
+        variables:
+           TOPOLOGY: "sharded_cluster"
+  - id: auth
+    display_name: Authentication
+    values:
+      - id: "auth"
+        display_name: Auth
+        variables:
+           AUTH: "auth"
+      - id: "noauth"
+        display_name: NoAuth
+        variables:
+           AUTH: "noauth"
+  - id: ssl
+    display_name: SSL
+    values:
+      - id: "ssl"
+        display_name: SSL
+        variables:
+           SSL: "ssl"
+      - id: "nossl"
+        display_name: NoSSL
+        variables:
+           SSL: "nossl"
+  - id: compressor
+    display_name: Compressor
+    values:
+      - id: "snappy"
+        display_name: Snappy
+        variables:
+           COMPRESSOR: "snappy"
+      - id: "zlib"
+        display_name: Zlib
+        variables:
+           COMPRESSOR: "zlib"
+      - id: "zstd"
+        display_name: Zstd
+        variables:
+           COMPRESSOR: "zstd"
+  - id: jdk
+    display_name: JDK
+    values:
+      - id: "jdk11"
+        display_name: JDK11
+        variables:
+          JDK: "jdk11"
+      - id: "jdk9"
+        display_name: JDK9
+        variables:
+           JDK: "jdk9"
+      - id: "jdk8"
+        display_name: JDK8 
+        variables:
+           JDK: "jdk8"
+      - id: "jdk7"
+        display_name: JDK7 
+        variables:
+           JDK: "jdk7"
+      - id: "jdk6"
+        display_name: JDK6
+        variables:
+           JDK: "jdk6"
+
+  # Choice of MongoDB storage engine
+  - id: storage-engine
+    display_name: Storage
+    values:
+      - id: mmapv1
+        display_name: MMAPv1
+        variables:
+           STORAGE_ENGINE: "mmapv1"
+           
+buildvariants:
+
+# Test packaging and other release related routines
+- name: static-checks
+  display_name: "Static Checks"
+  run_on: *hosts
+  tasks:
+    - name: "static-analysis"
+
+- matrix_name: "tests-zlib-compression"
+  matrix_spec: { compressor : "zlib", auth: "noauth", ssl: "nossl", jdk: "jdk6", version: ["3.6", "4.0", "4.2", "latest"], topology: "standalone", os: "linux" }
+  display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
+  tags: ["tests-variant"]
+  tasks:
+     - name: "test"
+
+- matrix_name: "tests-snappy-compression"
+  matrix_spec: { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["3.4", "3.6", "4.0", "4.2", "latest"], topology: "standalone", os: "linux" }
+  display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
+  tags: ["tests-variant"]
+  tasks:
+     - name: "test"
+
+- matrix_name: "tests-zstd-compression"
+  matrix_spec: { compressor : "zstd", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["4.2", "latest"], topology: "standalone", os: "linux" }
+  display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
+  tags: ["tests-variant"]
+  tasks:
+     - name: "test"
+
+- matrix_name: "tests-jdk6-unsecure"
+  matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk6", version: "*", topology: "*", os: "linux" }
+  display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
+  tags: ["tests-variant"]
+  tasks:
+     - name: "test"
+
+- matrix_name: "tests-jdk6-secure"
+  matrix_spec:  { auth: "auth", ssl: "ssl", jdk: "jdk6", version: "*", topology: "*", os: "linux" }
+  exclude_spec: { auth: "auth", ssl: "ssl", jdk: "jdk6", version: ["4.0", "4.2", "latest"], topology: "*", os: "linux" }
+  display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
+  tags: ["tests-variant"]
+  tasks:
+     - name: "test"
+
+- matrix_name: "tests-jdk-newer-secure"
+  matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk8", "jdk11"], version: ["4.0", "4.2", "latest"], topology: "*", os: "linux" }
+  display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
+  tags: ["tests-variant"]
+  tasks:
+     - name: "test"
+
+- matrix_name: "tests-jdk7-secure"
+  matrix_spec: { auth: "auth", ssl: "ssl", jdk: "jdk7", version: "3.6", topology: "standalone", os: "linux" }
+  display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
+  tags: ["tests-variant"]
+  tasks:
+     - name: "test"
+
+- matrix_name: "tests-slow"
+  matrix_spec: { auth: "noauth", ssl: "*", jdk: "jdk8", version: ["4.2"], topology: "*", os: "linux" }
+  display_name: "Slow: ${version} ${topology} ${ssl} ${jdk} ${os} "
+  tags: ["tests-slow-variant"]
+  tasks:
+  - name: "slow-test"
+
+- matrix_name: "tests-socket"
+  matrix_spec: { auth: "*", ssl: "nossl", jdk: "jdk8", version: ["4.2"], topology: "standalone", os: "linux" }
+  display_name: "Socket: ${version} ${topology} ${auth} ${jdk} ${os} "
+  tags: ["tests-socket-variant"]
+  tasks:
+     - name: "socket-test"
+
+- matrix_name: "tests-socket-snappy-compression"
+  matrix_spec: { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["4.2"], topology: "standalone", os: "linux" }
+  display_name: "Socket: ${version} ${compressor} ${topology} ${auth} ${jdk} ${os} "
+  tags: ["tests-socket-variant"]
+  tasks:
+     - name: "socket-test"
+
+- matrix_name: "tests-socket-zstd-compression"
+  matrix_spec: { compressor : "zstd", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["4.2"], topology: "standalone", os: "linux" }
+  display_name: "Socket: ${version} ${compressor} ${topology} ${auth} ${jdk} ${os} "
+  tags: ["tests-socket-variant"]
+  tasks:
+     - name: "socket-test"
+
+- matrix_name: "test-gssapi"
+  matrix_spec: { jdk: "*", os: "linux" }
+  display_name: "GSSAPI (Kerberos) Auth test ${jdk} ${os} "
+  tags: ["test-gssapi-variant"]
+  tasks:
+     - name: "gssapi-auth-test"
+
+- matrix_name: "perf"
+  matrix_spec:  { auth: "noauth", ssl: "nossl", jdk: "jdk9", version: "*", topology: "standalone", os: "linux" }
+  batchtime: 1440 # run once a day
+  display_name: "Perf Tests ${version} "
+  tags: ["perf-variant"]
+  tasks:
+     - name: "perf"
+
+- matrix_name: "tests-embedded"
+  matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "*", version: ["4.2"], topology: "standalone", os: "ubuntu" }
+  exclude_spec: { auth: "*", ssl: "*", jdk: "jdk6", version: "*", topology: "*", os: "*" }
+  display_name: "Embedded: ${jdk}"
+  tags: ["test-embedded-variant"]
+  tasks:
+  - name: "embedded-test"
+
+- name: plain-auth-test
+  display_name: "PLAIN (LDAP) Auth test"
+  run_on: *hosts
+  tasks:
+    - name: "plain-auth-test"
+
+- name: atlas-test
+  display_name: "Atlas test"
+  run_on: *hosts
+  tasks:
+    - name: "atlas-test"
+
+- name: publish-snapshot
+  display_name: "Publish Snapshot"
+  run_on: ubuntu1804-test
+  tasks:
+    - name: "publish-snapshot"
+
+- matrix_name: "tests-storage-engines"
+  matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk8", os: "linux", version: ["3.6", "4.0"], topology: ["replicaset", "sharded-cluster"], storage-engine: "mmapv1" }
+  display_name: "${version} Storage ${storage-engine} ${jdk} ${os} ${topology}"
+  tasks:
+    - name: "mmapv1-storage-test"
diff --git a/.evergreen/compile.sh b/.evergreen/compile.sh
new file mode 100755
index 00000000000..1e1adb970c2
--- /dev/null
+++ b/.evergreen/compile.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -o xtrace   # Write all commands first to stderr
+set -o errexit  # Exit the script with error if any of the commands fail
+
+############################################
+#            Main Program                  #
+############################################
+
+echo "Compiling java driver with jdk11"
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+./gradlew -version
+./gradlew -PxmlReports.enabled=true --info -x test clean check jar testClasses docs
diff --git a/.evergreen/publish.sh b/.evergreen/publish.sh
new file mode 100755
index 00000000000..74c6b35acb7
--- /dev/null
+++ b/.evergreen/publish.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# DO NOT ECHO COMMANDS AS THEY CONTAIN SECRETS!
+
+set -o errexit  # Exit the script with error if any of the commands fail
+
+############################################
+#            Main Program                  #
+############################################
+
+echo ${RING_FILE_GPG_BASE64} | base64 -d > ${PROJECT_DIRECTORY}/secring.gpg
+
+trap "rm ${PROJECT_DIRECTORY}/secring.gpg; exit" EXIT HUP
+
+
+
+export ORG_GRADLE_PROJECT_nexusUsername=${NEXUS_USERNAME}
+export ORG_GRADLE_PROJECT_nexusPassword=${NEXUS_PASSWORD}
+export ORG_GRADLE_PROJECT_signing_keyId=${SIGNING_KEY_ID}
+export ORG_GRADLE_PROJECT_signing_password=${SIGNING_PASSWORD}
+export ORG_GRADLE_PROJECT_signing_secretKeyRingFile=${PROJECT_DIRECTORY}/secring.gpg
+
+echo "Publishing snapshot with jdk11"
+export JAVA_HOME="/opt/java/jdk11"
+
+./gradlew -version
+./gradlew publishSnapshots
diff --git a/.evergreen/run-connectivity-tests.sh b/.evergreen/run-connectivity-tests.sh
new file mode 100755
index 00000000000..057fe88c8a8
--- /dev/null
+++ b/.evergreen/run-connectivity-tests.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Don't trace since the URI contains a password that shouldn't show up in the logs
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Supported/used environment variables:
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk5", "jdk6", "jdk7", "jdk8", "jdk9"
+# Support arguments:
+#       Pass as many MongoDB URIS as arguments to this script as required
+
+JDK=${JDK:-jdk}
+
+############################################
+#            Main Program                  #
+############################################
+
+echo "Running connectivity tests with ${JDK}"
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+
+./gradlew -version
+
+for MONGODB_URI in $@; do
+    ./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.uri=${MONGODB_URI} --stacktrace --info -Dtest.single=ConnectivityTest --rerun-tasks driver-sync:test
+    ./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.uri=${MONGODB_URI} --stacktrace --info -Dtest.single=ConnectivityTest --rerun-tasks driver-async:test
+    ./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.uri=${MONGODB_URI} --stacktrace --info -Dtest.single=ConnectivityTest --rerun-tasks driver-legacy:test
+done
diff --git a/.evergreen/run-embedded-tests.sh b/.evergreen/run-embedded-tests.sh
new file mode 100755
index 00000000000..960c2beab5b
--- /dev/null
+++ b/.evergreen/run-embedded-tests.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -o xtrace   # Write all commands first to stderr
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Supported/used environment variables:
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk6", "jdk7", "jdk8", "jdk9"
+
+JDK=${JDK:-jdk}
+
+############################################
+#            Main Program                  #
+############################################
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+
+export EMBEDDED_PATH="${PROJECT_DIRECTORY}/tmp/mongo-embedded-java"
+mkdir -p ${EMBEDDED_PATH}
+
+echo "Running tests with ${JDK}"
+./gradlew -version
+./gradlew -PjdkHome=/opt/java/${JDK} --stacktrace --info :driver-embedded:test -Dorg.mongodb.test.embedded.path=${EMBEDDED_PATH}
diff --git a/.evergreen/run-gssapi-auth-test.sh b/.evergreen/run-gssapi-auth-test.sh
new file mode 100755
index 00000000000..0d791dc7a98
--- /dev/null
+++ b/.evergreen/run-gssapi-auth-test.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Don't trace since the URI contains a password that shouldn't show up in the logs
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Supported/used environment variables:
+#       MONGODB_URI             Set the URI, including username/password to use to connect to the server via PLAIN authentication mechanism
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk5", "jdk6", "jdk7", "jdk8", "jdk9", "jdk11"
+#       KDC                     The KDC
+#       REALM                   The realm
+#       KEYTAB_BASE64           The BASE64-encoded keytab
+#       PROJECT_DIRECTORY       The project directory
+
+JDK=${JDK:-jdk}
+
+############################################
+#            Main Program                  #
+############################################
+
+echo "Running GSSAPI authentication tests"
+
+echo ${KEYTAB_BASE64} | base64 -d > ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab
+
+trap "rm ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab; exit" EXIT HUP
+
+cat << EOF > .evergreen/java.login.drivers.config
+com.sun.security.jgss.krb5.initiate {
+    com.sun.security.auth.module.Krb5LoginModule required
+          doNotPrompt=true useKeyTab=true keyTab="${PROJECT_DIRECTORY}/.evergreen/drivers.keytab" principal=drivers;
+};
+EOF
+
+echo "Compiling java driver with jdk11"
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+
+echo "Running tests with ${JDK}"
+./gradlew -version
+./gradlew -PjdkHome=/opt/java/${JDK} --stacktrace --info \
+-Dorg.mongodb.test.uri=${MONGODB_URI} \
+-Pgssapi.enabled=true -Psun.security.krb5.debug=true -Pauth.login.config=file://${PROJECT_DIRECTORY}/.evergreen/java.login.drivers.config \
+-Pkrb5.kdc=${KDC} -Pkrb5.realm=${REALM} -Psun.security.krb5.debug=true \
+-Dtest.single=GSSAPIAuthenticationSpecification driver-core:test
diff --git a/.evergreen/run-mmapv1-storage-test.sh b/.evergreen/run-mmapv1-storage-test.sh
new file mode 100644
index 00000000000..3ca436b8d89
--- /dev/null
+++ b/.evergreen/run-mmapv1-storage-test.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Supported/used environment variables:
+#       MONGODB_URI             Set the URI, including username/password to use to connect to the server via PLAIN authentication mechanism
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk5", "jdk6", "jdk7", "jdk8", "jdk9"
+
+JDK=${JDK:-jdk}
+
+############################################
+#            Main Program                  #
+############################################
+
+echo "Running MMAPv1 Storage Test"
+
+echo "Compiling java driver with jdk11"
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+
+echo "Running tests with ${JDK}"
+./gradlew -version
+./gradlew -PjdkHome=/opt/java/${JDK} --stacktrace --info \
+-Dorg.mongodb.test.uri=${MONGODB_URI} \
+-Dtest.single=RetryableWritesProseTest driver-sync:test driver-async:test
diff --git a/.evergreen/run-perf-tests.sh b/.evergreen/run-perf-tests.sh
new file mode 100755
index 00000000000..7bf115383be
--- /dev/null
+++ b/.evergreen/run-perf-tests.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -o xtrace
+set -o errexit
+
+rm -rf driver-performance-test-data
+git clone https://github.com/mongodb-labs/driver-performance-test-data.git
+cd driver-performance-test-data
+tar xf extended_bson.tgz
+tar xf parallel.tgz
+tar xf single_and_multi_document.tgz
+cd ..
+
+export JAVA_HOME="/opt/java/jdk11"
+
+export TEST_PATH="${PROJECT_DIRECTORY}/driver-performance-test-data/"
+export OUTPUT_FILE="${PROJECT_DIRECTORY}/results.json"
+
+start_time=$(date +%s)
+./gradlew -Dorg.mongodb.benchmarks.data=${TEST_PATH} -Dorg.mongodb.benchmarks.output=${OUTPUT_FILE} driver-benchmarks:run
+end_time=$(date +%s)
+elapsed_secs=$((end_time-start_time))
+
diff --git a/.evergreen/run-plain-auth-test.sh b/.evergreen/run-plain-auth-test.sh
new file mode 100755
index 00000000000..c72cb3a2dce
--- /dev/null
+++ b/.evergreen/run-plain-auth-test.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Don't trace since the URI contains a password that shouldn't show up in the logs
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Supported/used environment variables:
+#       MONGODB_URI             Set the URI, including username/password to use to connect to the server via PLAIN authentication mechanism
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk5", "jdk6", "jdk7", "jdk8", "jdk9"
+
+JDK=${JDK:-jdk}
+
+############################################
+#            Main Program                  #
+############################################
+
+echo "Running PLAIN authentication tests"
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+
+echo "Running tests with ${JDK}"
+./gradlew -version
+./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.uri=${MONGODB_URI} --stacktrace --info -Dtest.single=PlainAuthenticationSpecification driver-core:test
diff --git a/.evergreen/run-socket-tests.sh b/.evergreen/run-socket-tests.sh
new file mode 100755
index 00000000000..b7c4d634d2c
--- /dev/null
+++ b/.evergreen/run-socket-tests.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+set -o xtrace   # Write all commands first to stderr
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Supported/used environment variables:
+#       AUTH                    Set to enable authentication. Values are: "auth" / "noauth" (default)
+#       MONGODB_URI             Set the suggested connection MONGODB_URI (including credentials and topology info)
+#       TOPOLOGY                Allows you to modify variables and the MONGODB_URI based on test topology
+#                               Supported values: "server", "replica_set", "sharded_cluster"
+#       COMPRESSOR              Set to enable compression. Values are "snappy" and "zlib" (default is no compression)
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk5", "jdk6", "jdk7", "jdk8", "jdk9", "jdk11"
+
+AUTH=${AUTH:-noauth}
+MONGODB_URI=${MONGODB_URI:-}
+JDK=${JDK:-jdk}
+TOPOLOGY=${TOPOLOGY:-server}
+COMPRESSOR=${COMPRESSOR:-}
+
+############################################
+#            Main Program                  #
+############################################
+
+SOCKET_REGEX='(.*)localhost:([0-9]+)?(.*)'
+while [[ $MONGODB_URI =~ $SOCKET_REGEX ]]; do
+	MONGODB_URI="${BASH_REMATCH[1]}%2Ftmp%2Fmongodb-${BASH_REMATCH[2]}.sock${BASH_REMATCH[3]}"
+done
+
+# Provision the correct connection string and set up SSL if needed
+if [ "$TOPOLOGY" == "sharded_cluster" ]; then
+
+     if [ "$AUTH" = "auth" ]; then
+       export MONGODB_URI="mongodb://bob:pwd123@%2Ftmp%2Fmongodb-27017.sock/?authSource=admin"
+     else
+       export MONGODB_URI="mongodb://%2Ftmp%2Fmongodb-27017.sock/"
+     fi
+fi
+
+if [ "$COMPRESSOR" != "" ]; then
+     if [[ "$MONGODB_URI" == *"?"* ]]; then
+       export MONGODB_URI="${MONGODB_URI}&compressors=${COMPRESSOR}"
+     else
+       export MONGODB_URI="${MONGODB_URI}/?compressors=${COMPRESSOR}"
+     fi
+fi
+
+echo "Running $AUTH tests over for $TOPOLOGY and connecting to $MONGODB_URI"
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+
+echo "Running tests with ${JDK}"
+./gradlew -version
+./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.uri=${MONGODB_URI} ${GRADLE_EXTRA_VARS} --stacktrace --info :driver-legacy:test :driver-sync:test
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
new file mode 100755
index 00000000000..040ce207a03
--- /dev/null
+++ b/.evergreen/run-tests.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+set -o xtrace   # Write all commands first to stderr
+set -o errexit  # Exit the script with error if any of the commands fail
+
+# Supported/used environment variables:
+#       AUTH                    Set to enable authentication. Values are: "auth" / "noauth" (default)
+#       SSL                     Set to enable SSL. Values are "ssl" / "nossl" (default)
+#       MONGODB_URI             Set the suggested connection MONGODB_URI (including credentials and topology info)
+#       TOPOLOGY                Allows you to modify variables and the MONGODB_URI based on test topology
+#                               Supported values: "server", "replica_set", "sharded_cluster"
+#       COMPRESSOR              Set to enable compression. Values are "snappy" and "zlib" (default is no compression)
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk5", "jdk6", "jdk7", "jdk8", "jdk9"
+#       SLOW_TESTS_ONLY         Set to true to only run the slow tests
+#       AWS_ACCESS_KEY_ID       The AWS access key identifier for client-side encryption
+#       AWS_SECRET_ACCESS_KEY   The AWS secret access key for client-side encryption
+
+AUTH=${AUTH:-noauth}
+SSL=${SSL:-nossl}
+MONGODB_URI=${MONGODB_URI:-}
+JDK=${JDK:-jdk}
+TOPOLOGY=${TOPOLOGY:-server}
+COMPRESSOR=${COMPRESSOR:-}
+SLOW_TESTS_ONLY=${SLOW_TESTS_ONLY:-false}
+
+# JDK6 needs async.type=netty
+if [ "$JDK" == "jdk6" ]; then
+  export ASYNC_TYPE="-Dorg.mongodb.async.type=netty"
+else
+  export ASYNC_TYPE="-Dorg.mongodb.async.type=nio2"
+fi
+
+# We always compile with the latest version of java
+export JAVA_HOME="/opt/java/jdk11"
+
+
+############################################
+#            Functions                     #
+############################################
+
+provision_ssl () {
+  echo "SSL !"
+
+  # We generate the keystore and truststore on every run with the certs in the drivers-tools repo
+  if [ ! -f client.pkc ]; then
+    openssl pkcs12 -CAfile ${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem -export -in ${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem -out client.pkc -password pass:bithere
+  fi
+
+  cp ${JAVA_HOME}/lib/security/cacerts mongo-truststore
+  ${JAVA_HOME}/bin/keytool -importcert -trustcacerts -file ${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem -keystore mongo-truststore -storepass changeit -storetype JKS -noprompt
+
+  # We add extra gradle arguments for SSL
+  export GRADLE_EXTRA_VARS="-Pssl.enabled=true -Pssl.keyStoreType=pkcs12 -Pssl.keyStore=`pwd`/client.pkc -Pssl.keyStorePassword=bithere -Pssl.trustStoreType=jks -Pssl.trustStore=`pwd`/mongo-truststore -Pssl.trustStorePassword=changeit"
+  # Arguments for auth + SSL
+  if [ "$AUTH" != "noauth" ] || [ "$TOPOLOGY" == "replica_set" ]; then
+    export MONGODB_URI="${MONGODB_URI}&ssl=true&sslInvalidHostNameAllowed=true"
+    if [ "$SAFE_FOR_MULTI_MONGOS" == "true" ]; then
+        export TRANSACTION_URI="${TRANSACTION_URI}&ssl=true&sslInvalidHostNameAllowed=true"
+    fi
+  else
+    export MONGODB_URI="${MONGODB_URI}/?ssl=true&sslInvalidHostNameAllowed=true"
+    if [ "$SAFE_FOR_MULTI_MONGOS" == "true" ]; then
+        export TRANSACTION_URI="${TRANSACTION_URI}/?ssl=true&sslInvalidHostNameAllowed=true"
+    fi
+  fi
+}
+
+############################################
+#            Main Program                  #
+############################################
+
+# Provision the correct connection string and set up SSL if needed
+if [ "$TOPOLOGY" == "sharded_cluster" ]; then
+    if [ "$SAFE_FOR_MULTI_MONGOS" == "true" ]; then
+        if [ "$AUTH" = "auth" ]; then
+            export TRANSACTION_URI="mongodb://bob:pwd123@localhost:27017,localhost:27018/?authSource=admin"
+        else
+            export TRANSACTION_URI="${MONGODB_URI}"
+        fi
+    fi
+    
+     if [ "$AUTH" = "auth" ]; then
+       export MONGODB_URI="mongodb://bob:pwd123@localhost:27017/?authSource=admin"
+     else
+       export MONGODB_URI="mongodb://localhost:27017"
+     fi
+fi
+
+if [ "$COMPRESSOR" != "" ]; then
+     if [[ "$MONGODB_URI" == *"?"* ]]; then
+       export MONGODB_URI="${MONGODB_URI}&compressors=${COMPRESSOR}"
+     else
+       export MONGODB_URI="${MONGODB_URI}/?compressors=${COMPRESSOR}"
+     fi
+
+     if [ "$SAFE_FOR_MULTI_MONGOS" == "true" ]; then
+         if [[ "$TRANSACTION_URI" == *"?"* ]]; then
+             export TRANSACTION_URI="${TRANSACTION_URI}&compressors=${COMPRESSOR}"
+         else
+             export TRANSACTION_URI="${TRANSACTION_URI}/?compressors=${COMPRESSOR}"
+         fi
+     fi
+fi
+
+if [ "$SSL" != "nossl" ]; then
+   provision_ssl
+fi
+
+if [ "$SAFE_FOR_MULTI_MONGOS" == "true" ]; then
+    export TRANSACTION_URI="-Dorg.mongodb.test.transaction.uri=${TRANSACTION_URI}"
+fi
+
+echo "Running $AUTH tests over $SSL for $TOPOLOGY and connecting to $MONGODB_URI"
+
+echo "Running tests with ${JDK}"
+./gradlew -version
+
+if [ "$SLOW_TESTS_ONLY" == "true" ]; then
+    ./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.uri=${MONGODB_URI} \
+              ${TRANSACTION_URI} ${GRADLE_EXTRA_VARS} ${ASYNC_TYPE} --stacktrace --info testSlowOnly
+else
+    ./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.uri=${MONGODB_URI} \
+              -Dorg.mongodb.test.awsAccessKeyId=${AWS_ACCESS_KEY_ID} -Dorg.mongodb.test.awsSecretAccessKey=${AWS_SECRET_ACCESS_KEY} \
+              ${TRANSACTION_URI} ${GRADLE_EXTRA_VARS} ${ASYNC_TYPE} --stacktrace --info test
+fi
diff --git a/.evg.yml b/.evg.yml
deleted file mode 100644
index 9c702058ff5..00000000000
--- a/.evg.yml
+++ /dev/null
@@ -1,218 +0,0 @@
-#########################################
-#      Java Driver Config for Evergreen #
-#########################################
-
-java_driver_variables:
-## Common download urls (merge in as hashes)
-  mongo_download_url_prefixes:
-    linux64: &mongo_url_linux64
-      mongo_url_prefix: "http://downloads.mongodb.org/linux/mongodb-linux-x86_64-"
-    ubuntu1404: &mongo_url_ubuntu1404
-      mongo_url_platform: "ubuntu1404-"
-      <<: *mongo_url_linux64
-
-#######################################
-#            Functions                #
-#######################################
-
-functions:
-  "fetch source" :
-      command: git.get_project
-      params:
-          directory: "mongo-java-driver"
-
-  "set topology standalone" :
-    command: expansions.update
-    params:
-      updates:
-        - key: "orchestration_file"
-          value: "basic.json"
-        - key: "topology_type"
-          value: "server"
-        - key: "mongodb_test_uri"
-          value: "mongodb://localhost:27017"
-        - key: "rs_enabled"
-          value: "false"
-
-
-  "set topology replica set" :
-    command: expansions.update
-    params:
-      updates:
-        - key: "orchestration_file"
-          value: "basic.json"
-        - key: "topology_type"
-          value: "replica_set"
-        - key: "mongodb_test_uri"
-          value: "mongodb://localhost:27017,localhost:27018"
-        - key: "rs_enabled"
-          value: "true"
-
-  "set topology sharded" :
-    command: expansions.update
-    params:
-      updates:
-        - key: "orchestration_file"
-          value: "basic.json"
-        - key: "topology_type"
-          value: "sharded_cluster"
-        - key: "mongodb_test_uri"
-          value: "mongodb://localhost:27017"
-        - key: "rs_enabled"
-          value: "false"
-
-  "set version latest" :
-    command: expansions.update
-    params:
-      updates:
-        - key: "mongo_url"
-          value: ${mongo_url_prefix}${mongo_url_platform|}latest.${mongo_url_extension|tgz}
-
-  "fetch mongodb" :
-    command: shell.exec
-    params:
-      working_dir: "mongo-java-driver"
-      script: |
-        set -o verbose
-        set -o errexit
-        ls -la
-        curl -s ${mongo_url} --output mongo-archive.${ext|tgz}
-        ${decompress} mongo-archive.${ext|tgz}
-        mv mongodb* mongodb
-        chmod +x ./mongodb/bin/mongod${extension}
-        if [ ${windows|false} = true ]; then
-            rm -rf /cygdrive/c/mongodb
-            cp -r mongodb /cygdrive/c/mongodb
-        fi
-
-  "run tests" :
-    command: shell.exec
-    params:
-      working_dir: "mongo-java-driver"
-      script: |
-        export ORCHESTRATION_FILE="orchestration_configs/${topology_type}s/${orchestration_file}"
-
-        mkdir -p $(dirname "$ORCHESTRATION_FILE")
-
-        # Borrow MO config from the C driver
-        #
-        curl --location "https://raw.githubusercontent.com/mongodb/mongo-c-driver/master/orchestration_configs/${topology_type}s/${orchestration_file}" > "$ORCHESTRATION_FILE"
-        export ORCHESTRATION_URL="http://localhost:8889/v1/${topology_type}s"
-        export MONGO_ORCHESTRATION_HOME=/tmp/orchestration-home
-
-        if [ ! -d /tmp/orchestration-home ]; then
-           mkdir /tmp/orchestration-home
-        fi
-
-        ${start_mongo_orchestration}
-        ${start_topology}
-        ./gradlew -Dorg.mongodb.test.uri=${mongodb_test_uri} -Prs.enabled=${rs_enabled} --stacktrace --info test
-
-  "attach junit results" :
-    command: attach.xunit_results
-    params:
-      file: ./mongo-java-driver/*/build/test-results/TEST-*.xml
-
-#######################################
-#               Tasks                 #
-#######################################
-
-tasks:
-    - name: compileAndAnalyze
-      commands:
-        - func: "fetch source"
-        - command: git.apply_patch
-          params:
-              directory: "mongo-java-driver"
-        - command: shell.exec
-          params:
-              working_dir: "mongo-java-driver"
-              script: |
-                  ./gradlew -PxmlReports.enabled=true --info -x test clean check jar testClasses
-    - name: test-standalone
-      commands:
-        - func: "fetch source"
-        - command: git.apply_patch
-          params:
-              directory: "mongo-java-driver"
-        - func: "set topology standalone"
-        - func: "set version latest"
-        - func: "fetch mongodb"
-        - func: "run tests"
-        - func: "attach junit results"
-    - name: test-replica-set
-      commands:
-        - func: "fetch source"
-        - command: git.apply_patch
-          params:
-              directory: "mongo-java-driver"
-        - func: "set topology replica set"
-        - func: "set version latest"
-        - func: "fetch mongodb"
-        - func: "run tests"
-        - func: "attach junit results"
-    - name: test-sharded
-      commands:
-        - func: "fetch source"
-        - command: git.apply_patch
-          params:
-              directory: "mongo-java-driver"
-        - func: "set topology sharded"
-        - func: "set version latest"
-        - func: "fetch mongodb"
-        - func: "run tests"
-        - func: "attach junit results"
-
-scripts:
-  ## Scripts that are shared between buildvariants
-  scripts:
-    mongo_orchestration:
-      unix: &mongo_orchestration_unix
-        start_mongo_orchestration: |
-          trap 'set +o errexit; mongo-orchestration --pidfile /data/mo.pid stop;' EXIT
-          pidfile=/data/mo.pid
-          if [ -f $pidfile ]; then
-            echo "Existing pidfile $pidfile"
-            cat $pidfile
-            mongo-orchestration --pidfile /data/mo.pid stop;
-            rm -f $pidfile
-          fi
-          df -h
-          ls -la
-          echo "Starting Mongo Orchestration..."
-          echo "{ \"releases\": { \"default\": \"`pwd`/mongodb/bin\" } }" > orchestration.config
-          TMPDIR=/data/db mongo-orchestration -f orchestration.config -e default start --socket-timeout-ms=60000 --bind=127.0.0.1  --enable-majority-read-concern --pidfile $pidfile
-          curl -s http://localhost:8889/
-      start_topology_command: &start_topology_command
-        start_topology: |
-          curl -s --data @"$ORCHESTRATION_FILE" "$ORCHESTRATION_URL"
-          ./mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS --eval 'printjson(db.serverBuildInfo())' admin
-          ./mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS --eval 'printjson(db.adminCommand({getCmdLineOpts:1}))' admin
-          ./mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS --eval 'printjson(db.isMaster())' admin
-
-#######################################
-#               Variants              #
-#######################################
-
-buildvariants:
-- name: ubuntu-1404
-  display_name: "Ubuntu-1404"
-  expansions:
-    <<: *start_topology_command
-    <<: *mongo_url_ubuntu1404 # sets ${mongo_url_prefix}
-    <<: *mongo_orchestration_unix # sets start_topology and start_mongo_orchestration
-  run_on:
-    - ubuntu1404-test
-  tasks:
-  - name: compileAndAnalyze
-    run_on:
-    - ubuntu1404-build
-  - name: test-standalone
-    depends_on:
-     - name: compileAndAnalyze
-  - name: test-replica-set
-    depends_on:
-     - name: compileAndAnalyze
-  - name: test-sharded
-    depends_on:
-     - name: compileAndAnalyze
diff --git a/.gitignore b/.gitignore
index db821035a65..941dd18a4a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 .#*
 .git
 *#
-*.sh
 
 # os x stuff
 *Thumbs.db*
@@ -34,8 +33,18 @@ codereview.rc
 
 # local settings
 **/gradle.properties
+local.properties
 
 # doc settings
 docs/reference/public
 docs/landing/public
 docs/hugo*
+
+# jenv
+.java-version
+
+# mongocryptd
+**/mongocryptd.pid
+
+# shell scripts
+*.sh
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 7eca32b7673..596a6c1c5ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
+dist: trusty
+sudo: true
 language: java
 jdk:
-- oraclejdk8
+- oraclejdk9
 
 notifications:
   email:
@@ -9,8 +11,6 @@ notifications:
     - ross@mongodb.com
     on_success: change
     on_failure: always
-  flowdock:
-    secure: "Ziw1Be2tV0QAYuiYDrepfdNH/oBfNhnXFMji3AdRi6MePVpc6CtOOT/b9Fra\nQgMMrX3AHk/QIDo6QQx9/aVB3FS1fzOPGQkSsEZmiljZU7wZCct1sSSyttf/\nsRG0lyTnmgFNTHyTSDT3JbXAkyF/vJmG/JJJoBUZhmFxzR2fM0Q="
 
 branches:
   only:
@@ -18,31 +18,27 @@ branches:
 
 env:
   global:
-    - MONGO_REPO="http://repo.mongodb.com/apt/ubuntu"
-    - REPO_TYPE="precise/mongodb-enterprise/2.6 multiverse"
-    - SOURCES_LOC="/etc/apt/sources.list.d/mongodb-enterprise.list"
-    - KEY_SERVER="hkp://keyserver.ubuntu.com:80"
-    - MONGOD_PARAMS="--setParameter=enableTestCommands=1"
-    - MONGOD_OPTS="--dbpath ./data --fork --logpath mongod.log ${MONGOD_PARAMS}"
-    - TERM=dumb
-
-before_install:
-    # MongoDB Enterprise Edition 2.6
-    - sudo apt-key adv --keyserver ${KEY_SERVER} --recv 7F0CEB10
-    - echo "deb ${MONGO_REPO} ${REPO_TYPE}" | sudo tee ${SOURCES_LOC}
-
-    # Update all the repositories
-    - sudo apt-get update -qq
+    - MONGODB_FILE_NAME=mongodb-linux-x86_64-enterprise-ubuntu1404
+    - MONGODB=3.6.1
+
+addons:
+  apt:
+    packages:
+    - libsnmp-dev
 
 install:
-    # Install MongoDB Enterprise
-    - sudo apt-get install mongodb-enterprise-server
-    - sudo stop mongod
-    - mkdir data
+  - wget http://downloads.mongodb.com/linux/${MONGODB_FILE_NAME}-${MONGODB}.tgz
+  - tar xzf ${MONGODB_FILE_NAME}-${MONGODB}.tgz
+  - ${PWD}/${MONGODB_FILE_NAME}-${MONGODB}/bin/mongod --version
 
 before_script:
-    - mongod ${MONGOD_OPTS}
+  - mkdir ${PWD}/${MONGODB_FILE_NAME}-${MONGODB}/data
+  - ${PWD}/${MONGODB_FILE_NAME}-${MONGODB}/bin/mongod --dbpath ${PWD}/${MONGODB_FILE_NAME}-${MONGODB}/data --logpath ${PWD}/${MONGODB_FILE_NAME}-${MONGODB}/mongodb.log --setParameter enableTestCommands=1 --fork --smallfiles --nojournal
 
 script:
   - ./gradlew -q assemble
-  - ./gradlew check -i -S -Ptravistest=true
+  - ./gradlew check -Ptravistest=true
+  - ./gradlew docs
+
+after_script:
+  - pkill mongod
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fb639d527a1..9a2ecd97527 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,9 +17,11 @@ Pull Requests
 
 Pull requests should generally be made against the master (default) branch and include relevant tests, if applicable. 
 
-Code should compile and tests should pass under all Java versions which the driver currently supports.  Currently the Java driver 
-supports a minimum version of Java 6.  Please run './gradlew test' to confirm.   By default, running the tests requires that you started a 
-mongod server on localhost, listening on the default port.   At minimum, please test against the latest release version of the MongoDB 
+Code should compile with the Java 9 compiler and tests should pass under all Java versions which the driver currently
+supports. Currently the Java driver supports a minimum version of Java 6.  Please run './gradlew test' to confirm.   By default, running the
+tests requires that you start a mongod server on localhost, listening on the default port and configured to run with
+[`enableTestCommands`](http://docs.mongodb.org/manual/reference/parameters/#param.enableTestCommands), which may be set with the 
+`--setParameter enableTestCommands=1` command-line parameter.   At minimum, please test against the latest release version of the MongoDB 
 server.
 
 The results of pull request testing will be appended to the request. If any tests do not pass, or relevant tests are not included, the 
diff --git a/History.md b/History.md
deleted file mode 100644
index 863790fb5b7..00000000000
--- a/History.md
+++ /dev/null
@@ -1,99 +0,0 @@
-
-2.7.3 / 2012-01-30 
-==================
-
-  * synchronized access to encoder/decoder
-  * JAVA-505: Made encoder creation work just like decoder creation
-    + using cached DBDecoder in most cases to avoid excessive memory allocation caused by too many instances of DefaultDBDecoder being created
-  * JAVA-505 / JAVA-421 - Regression in performance of Java Driver should be rolled back (GC Related)
-
-2.7.3RC1 / 2012-01-17 
-==================
-
-  * Remove defunct BSONInputTest
-  * JAVA-505 / JAVA-421 - Regression in performance of Java Driver should be rolled back (GC Related)
-
-2.7.2 / 2011-11-10 
-==================
-
-  * JAVA-469: java.net.NetworkInterface.getNetworkInterfaces may fail with IBM JVM, which prevents from using driver
-  * deprecated replica pair constructors. 
-    - updated javadocs and removed replica pair javadocs in class doc.
-  * JAVA-428: Fixed an issue where read preferences not set on cursor
-
-2.7.1 / 2011-11-08 
-==================
-
-  * JAVA-467 - added _check call to getServerAddress if _it is null 
-  * JAVA-467 - Moved variable calls to method to fix read preference hierarchy 
-  * simplified getServerAddress method.
-
-2.7.0 / 2011-11-04 
-===================
-
- * Released Java Driver 2.7.0
- * See change notes from Release Candidate series
- * Please report any bugs or issues to https://jira.mongodb.org/browse/JAVA
-
-
-2.7.0-rc4 / 2011-11-03 
-=======================
-
-  * New Secondary Selection tests for Replica Sets introduced
-  * To correct a regression, make WriteConcern immutable (Otherwise you can mutate static presets like SAFE at runtime) * Reintroduced constructors which accept continueOnErrorForInsert args * To enable you to set continueOnErrorForInsert with the presets like SAFE, immutable "new WriteConcern like this with COEI changed" method added.
-
-2.7.0-rc3 / 2011-10-31 
-=======================
-
-  * changed if statement to improve readability.
-  * JAVA-462: GridFSInputFile does not close input streams when constructed by the driver (greenlaw110)
-    - Add closeStreamOnPersist option when creating GridFSInputFile
-  * JAVA-425 fixes
-    - attempt to clean up and standardize writeConcern
-    - throw exception if w is wrong type
-    - fix cast exception in case W is a String
-  * Documented continue on error better.
-  * Close inputstream of GridFSInputFile once chunk saved
-  * JAVA-461: the logic to spread requests around slaves may select a slave over latency limit
-  * Reset buffer when the object is checked out and before adding back.
-  * added MongoOptions test
-  * use the socket factory from the Mongo for ReplicaSetStatus connections
-  * added MongoOptions.copy
-
-2.7.0-rc2 / 2011-10-26 
-========================
-
-  * JAVA-459: smooth the latency measurements (for secondary/slave server selection)
-  * JAVA-428: Fixed edge cases where slaveOK / ReadPreference.SECONDARY wasn't working
-  * JAVA-444: make ensureIndex first do a read on index collection to see if index exists * If an embedded field was referenced in an index a hard failure   occurred,  due to triggering of the 'no dots in key names' logic   via the insert.  Moved code to use the lower level API method which   permits disabling of key checks.
-  * Introduced "bamboo-test" task which does NOT halt on failure to allow bamboo tests to complete and report properly (and various fixes)
-  * added unit test for x.y ensureIndex.
-
-2.7.0-rc1 / 2011-10-24 
-=======================
-
-  * JAVA-434: replaced isEmpty() with 1.5 compatible alternative
-  * JAVA-363: NPE in GridFS.validate
-  * JAVA-356: make JSONParseException public
-  * JAVA-413: intern dbref.ns
-  * JAVA-444: query before insert on index creation.
-  * JAVA-404: slaveOk support for inline mapreduce (routes to secondaries); changed CommandResult to include serverUsed, made readPref-Secondary set slaveOk query flag, toString/toJSON on Node/ReplicaSetStatus.
-  * Import javax.net in an OSGi environment.
-  * JAVA-428 - Support new ReadPreference semantics, deprecate SlaveOK 
-  * Added a skip method to ensure continueOnInsertError test is only run on Server versions 2.0+
-  * JAVA-448 - Tailable Cursor behavior while not in AWAIT mode 
-    + Fixed non-await empty tailable cursor behavior to be more consistently inline with other drivers & user expectations. Instead of forcing a sleep of 500 milliseconds on "no data", we instead when tailable catch an empty cursor and return null instead.  This should be more safely non blocking for users who need to roll their own event driven code, for which the sleep breaks logic.
-  * JAVA-439: Check keys to disallow dot in key names for embedded maps
-  * added getObjectId method.
-  * add partial query option flag
-  * JAVA-425 - Support MongoDB Server 2.0 getLastError Changes (j, w=string/number) 
-  * JAVA-427 - Support ContinueOnError Flag for bulk insert 
-  * JAVA-422 - Memoize field locations (and other calculated data) for LazyBSONObject
-  * JAVA-421 - LazyBSONObject exhibits certain behavioral breakages
-  * JAVA-420: LazyBSONObject does not handle DBRef
-  * Fix & cleanup of  Javadoc comments (kevinsawicki)
-  * JAVA-365: Poor concurrency handling in DBApiLayer.doGetCollection
-  * JAVA-364: MapReduceOutput sometimes returns empty results in a replica set when SLAVE_OK=true
-  * JAVA-333: Allow bson decoder per operation (find/cursor)
-  * JAVA-323: When executing a command, only toplevel object returned should be a CommandResult (not sub-objects)
-
diff --git a/Issues.txt b/Issues.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/LICENSE.txt b/LICENSE.txt
index 2f44352e735..261eeb9e9f8 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,192 @@
-1) Copyright 2008-2015 MongoDB, Inc
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -11,77 +199,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-2) The following files: Immutable.java, NotThreadSafe.java, ThreadSafe.java
-
-   Copyright (c) 2005 Brian Goetz and Tim Peierls
-   Released under the Creative Commons Attribution License (http://creativecommons.org/licenses/by/2.5)
-   Official home: http://www.jcip.net
-
-   Any republication or derived work distributed in source code form
-   must include this copyright and license notice.
-
-3) The following files: Assertions.java, AbstractCopyOnWriteMap.java, CopyOnWriteMap.java
-
-    Copyright (c) 2008-2014 Atlassian Pty Ltd
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-4) The following files: Beta.java
-
-    Copyright 2010 The Guava Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-5) The following files: Base64Codec.java
-
-    Copyright 1999,2005 The Apache Software Foundation.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-6) The following files: ReadTimeoutHandler.java
-
-    Copyright 2015 MongoDB, Inc.
-    Copyright 2012 The Netty Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
diff --git a/README.md b/README.md
index 448deae19b4..489cb537711 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,7 @@ Javadoc for all major and minor releases is available [here](http://api.mongodb.
 For issues with, questions about, or feedback for the MongoDB Java driver, please look into
 our [support channels](http://www.mongodb.org/about/support). Please
 do not email any of the Java driver developers directly with issues or
-questions - you're more likely to get an answer on the [mongodb-user]
-(http://groups.google.com/group/mongodb-user) list on Google Groups.
+questions - you're more likely to get an answer on the [mongodb-user](http://groups.google.com/group/mongodb-user) list on Google Groups.
 
 At a minimum, please include in your description the exact version of the driver that you are using.  If you are having
 connectivity issues, it's often also useful to paste in the line of code where you construct the MongoClient instance,
@@ -31,8 +30,7 @@ case in our issue management tool, JIRA:
 Bug reports in JIRA for the driver and the Core Server (i.e. SERVER) project are **public**.
 
 If you’ve identified a security vulnerability in a driver or any other
-MongoDB project, please report it according to the [instructions here]
-(http://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report).
+MongoDB project, please report it according to the [instructions here](http://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report).
 
 ## Versioning
 
@@ -43,9 +41,9 @@ called out in the release notes.
 Minor 3.x increments (such as 3.1, 3.2, etc) will occur when non-trivial new functionality is added or significant enhancements or bug
 fixes occur that may have behavioral changes that may affect some edge cases (such as dependence on behavior resulting from a bug). An
 example of an enhancement is a method or class added to support new functionality added to the MongoDB server.   Minor releases will
-almost always be binary compatible with prior minor releases from the same major release branch, exept as noted below.
+almost always be binary compatible with prior minor releases from the same major release branch, except as noted below.
 
-Patch 3.x.y increments (such as 3.0.0 -> 3.0.1, 3.1.1 -> 3.1.2, etc) will occur for bug fixes only and will always be binary compitible
+Patch 3.x.y increments (such as 3.0.0 -> 3.0.1, 3.1.1 -> 3.1.2, etc) will occur for bug fixes only and will always be binary compatible
 with prior patch releases of the same minor release branch.
 
 #### @Beta
@@ -106,7 +104,7 @@ For binaries containing the asynchronous API, see the [driver-async README](driv
 
 ## Build
 
-To build and test the driver:
+Java 9+ is required to build and compile the source. To build and test the driver:
 
 ```
 $ git clone https://github.com/mongodb/mongo-java-driver.git
@@ -114,12 +112,33 @@ $ cd mongo-java-driver
 $ ./gradlew check
 ```
 
-The test suite requires mongod to be running with [`enableTestCommands`](http://docs.mongodb.org/manual/reference/parameters/#param.enableTestCommands).
+The test suite requires mongod to be running with [`enableTestCommands`](http://docs.mongodb.org/manual/reference/parameters/#param.enableTestCommands), which may be set with the `--setParameter enableTestCommands=1`
+command-line parameter:
+```
+$ mongod --dbpath ./data/db --logpath ./data/mongod.log --port 27017 --logappend --fork --setParameter enableTestCommands=1
+```
+
+If you encounter `"Too many open files"` errors when running the tests then you will need to increase 
+the number of available file descriptors prior to starting mongod as described in [https://docs.mongodb.com/manual/reference/ulimit/](https://docs.mongodb.com/manual/reference/ulimit/)
+
+## IntelliJ IDEA
+
+A couple of manual configuration steps are required to run the code in IntelliJ:
+
+- Java 9+ is required to build and compile the source.
+
+- **Error:** `java: cannot find symbol: class SNIHostName location: package javax.net.ssl`<br>
+ **Fix:** Settings > Build, Execution, Deployment > Compiler > Java Compiler - untick "Use '--release' option for cross-compilation (Java 9 and later)"
 
+- **Error:** `java: package com.mongodb.internal.build does not exist`<br>
+ **Fixes:** Any of the following: <br>
+ - Run the `compileBuildConfig` task: eg: `./gradlew compileBuildConfig` or via Gradle > driver-core > Tasks > other > compileBuildConfig
+ - Set `compileBuildConfig` to execute Before Build. via Gradle > Tasks > other > right click compileBuildConfig - click on "Execute Before Build" 
+ - Delegate all build actions to Gradle: Settings > Build, Execution, Deployment > Build Tools > Gradle > Runner - tick "Delegate IDE build/run actions to gradle"
 
 ### Build status:
 
-[![Build Status](https://travis-ci.org/mongodb/mongo-java-driver.svg?branch=master)](https://travis-ci.org/mongodb/mongo-java-driver) | [![Build Status](https://jenkins.10gen.com/job/mongo-java-driver-3.x/badge/icon)](https://jenkins.10gen.com/job/mongo-java-driver/)
+[![Build Status](https://travis-ci.org/mongodb/mongo-java-driver.svg?branch=master)](https://travis-ci.org/mongodb/mongo-java-driver)
 
 ## Maintainers
 
@@ -140,6 +159,5 @@ YourKit is supporting this open source project with its [YourKit Java Profiler](
 
 JetBrains is supporting this open source project with:
 
-[![Intellij IDEA](http://www.jetbrains.com/img/logos/logo_intellij_idea.png)]
-(http://www.jetbrains.com/idea/)
+[![Intellij IDEA](http://www.jetbrains.com/img/logos/logo_intellij_idea.png)](http://www.jetbrains.com/idea/)
 
diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES
new file mode 100644
index 00000000000..ee82fd2607f
--- /dev/null
+++ b/THIRD-PARTY-NOTICES
@@ -0,0 +1,150 @@
+The MongoDB Java Driver uses third-party libraries or other resources that may
+be distributed under licenses different than the MongoDB Java Driver software.
+
+In the event that we accidentally failed to list a required notice,
+please bring it to our attention through any of the ways detailed here:
+
+           mongodb-dev@googlegroups.com
+
+The attached notices are provided for information only.
+
+For any licenses that require disclosure of source, sources are available at
+https://github.com/mongodb/mongo-java-driver.
+
+
+1) The following files: Immutable.java, NotThreadSafe.java, ThreadSafe.java
+
+   Copyright (c) 2005 Brian Goetz and Tim Peierls
+   Released under the Creative Commons Attribution License (http://creativecommons.org/licenses/by/2.5)
+   Official home: http://www.jcip.net
+
+   Any republication or derived work distributed in source code form
+   must include this copyright and license notice.
+
+2) The following files: Assertions.java, AbstractCopyOnWriteMap.java, CopyOnWriteMap.java
+
+    Copyright (c) 2008-2014 Atlassian Pty Ltd
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+3) The following files: Beta.java, UnsignedLongs.java, UnsignedLongsTest.java
+
+    Copyright 2010 The Guava Authors
+    Copyright 2011 The Guava Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+4) The following files: ReadTimeoutHandler.java
+
+    Copyright 2008-present MongoDB, Inc.
+    Copyright 2012 The Netty Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+5) The following files: InstantCodec.java, Jsr310CodecProvider.java, LocalDateCodec.java, LocalDateTimeCodec.java, LocalTimeCodec.java
+
+    Copyright 2008-present MongoDB, Inc.
+    Copyright 2018 Cezary Bartosiak
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+6) The following files: SaslPrep.java
+
+     Copyright 2008-present MongoDB, Inc.
+     Copyright 2017 Tom Bentley
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+7) The following files (originally from https://github.com/marianobarrios/tls-channel):
+
+       AsynchronousTlsChannel.java
+       AsynchronousTlsChannelGroup.java
+       ExtendedAsynchronousByteChannel.java
+       BufferHolder.java
+       ByteBufferSet.java
+       ByteBufferUtil.java
+       TlsChannelImpl.java
+       TlsChannelCallbackException.java
+       Util.java
+       BufferAllocator.java
+       ClientTlsChannel.java
+       NeedsReadException.java
+       NeedsTaskException.java
+       NeedsWriteException.java
+       TlsChannel.java
+       TlsChannelBuilder.java
+       TlsChannelFlowControlException.java
+       TrackingAllocator.java
+       WouldBlockException.java
+
+     Copyright (c) [2015-2018] all contributors
+
+     MIT License
+
+     Permission is hereby granted, free of charge, to any person obtaining a copy
+     of this software and associated documentation files (the "Software"), to deal
+     in the Software without restriction, including without limitation the rights
+     to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the Software is
+     furnished to do so, subject to the following conditions:
+
+     The above copyright notice and this permission notice shall be included in all
+     copies or substantial portions of the Software.
+
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+     SOFTWARE.
diff --git a/bson/build.gradle b/bson/build.gradle
index 9eb2441dafc..749e719c17a 100644
--- a/bson/build.gradle
+++ b/bson/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,30 +14,26 @@
  * limitations under the License.
  */
 
-apply plugin: 'osgi'
-apply plugin: 'org.kordamp.gradle.clirr'
-
-def configDir = new File(rootDir, 'config')
 archivesBaseName = 'bson'
+description = 'The BSON library'
+
+ext {
+    pomName = 'BSON'
+    pomURL = 'https://bsonspec.org'
+}
 
 clirr {
     excludeFilter = new File("$configDir/clirr-exclude.yml")
-    baseline 'org.mongodb:bson:3.2.0'
+    baseline 'org.mongodb:bson:3.8.0'
     failOnErrors = true
 }
 
 jar {
     manifest {
+        instruction 'Automatic-Module-Name', 'org.mongodb.bson'
+        instruction 'Build-Version', project.gitVersion
         instruction 'Import-Package',
                     'javax.xml.bind.*',
                     'org.slf4j;resolution:=optional'
     }
 }
-
-modifyPom {
-    project {
-        name 'BSON'
-        description 'The BSON library'
-        url 'http://bsonspec.org'
-    }
-}
diff --git a/bson/src/main/org/bson/AbstractBsonReader.java b/bson/src/main/org/bson/AbstractBsonReader.java
index d1f75a57ff8..a7195344324 100644
--- a/bson/src/main/org/bson/AbstractBsonReader.java
+++ b/bson/src/main/org/bson/AbstractBsonReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
-import java.io.Closeable;
-
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 
@@ -28,7 +27,7 @@
  *
  * @since 3.0
  */
-public abstract class AbstractBsonReader implements Closeable, BsonReader {
+public abstract class AbstractBsonReader implements BsonReader {
     private State state;
     private Context context;
     private BsonType currentBsonType;
@@ -119,6 +118,14 @@ protected boolean isClosed() {
      */
     protected abstract byte doPeekBinarySubType();
 
+    /**
+     * Handles the logic to peek at the binary size.
+     *
+     * @return the binary size
+     * @since 3.4
+     */
+    protected abstract int doPeekBinarySize();
+
     /**
      * Handles the logic to read booleans
      *
@@ -164,6 +171,15 @@ protected boolean isClosed() {
      */
     protected abstract long doReadInt64();
 
+
+    /**
+     * Handles the logic to read Decimal128
+     *
+     * @return the Decimal128 value
+     * @since 3.4
+     */
+    protected abstract Decimal128 doReadDecimal128();
+
     /**
      * Handles the logic to read Javascript functions
      *
@@ -273,6 +289,12 @@ public byte peekBinarySubType() {
         return doPeekBinarySubType();
     }
 
+    @Override
+    public int peekBinarySize() {
+        checkPreconditions("readBinaryData", BsonType.BINARY);
+        return doPeekBinarySize();
+    }
+
     @Override
     public boolean readBoolean() {
         checkPreconditions("readBoolean", BsonType.BOOLEAN);
@@ -353,6 +375,13 @@ public long readInt64() {
         return doReadInt64();
     }
 
+    @Override
+    public Decimal128 readDecimal128() {
+        checkPreconditions("readDecimal", BsonType.DECIMAL128);
+        setState(getNextState());
+        return doReadDecimal128();
+    }
+
     @Override
     public String readJavaScript() {
         checkPreconditions("readJavaScript", BsonType.JAVASCRIPT);
@@ -513,6 +542,12 @@ public long readInt64(final String name) {
         return readInt64();
     }
 
+    @Override
+    public Decimal128 readDecimal128(final String name) {
+        verifyName(name);
+        return readDecimal128();
+    }
+
     @Override
     public String readJavaScript(final String name) {
         verifyName(name);
@@ -736,12 +771,13 @@ private void setStateOnEnd() {
                 throw new BSONException(format("Unexpected ContextType %s.", getContext().getContextType()));
         }
     }
-    protected class Mark {
-        private State state;
-        private Context parentContext;
-        private BsonContextType contextType;
-        private BsonType currentBsonType;
-        private String currentName;
+
+    protected class Mark implements BsonReaderMark {
+        private final State state;
+        private final Context parentContext;
+        private final BsonContextType contextType;
+        private final BsonType currentBsonType;
+        private final String currentName;
 
         protected Context getParentContext() {
             return parentContext;
@@ -759,7 +795,7 @@ protected Mark() {
             currentName = AbstractBsonReader.this.currentName;
         }
 
-        protected void reset() {
+        public void reset() {
             AbstractBsonReader.this.state = state;
             AbstractBsonReader.this.currentBsonType = currentBsonType;
             AbstractBsonReader.this.currentName = currentName;
diff --git a/bson/src/main/org/bson/AbstractBsonWriter.java b/bson/src/main/org/bson/AbstractBsonWriter.java
index e141646be76..5dc229d7307 100644
--- a/bson/src/main/org/bson/AbstractBsonWriter.java
+++ b/bson/src/main/org/bson/AbstractBsonWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,17 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 import java.io.Closeable;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.Stack;
 
 import static java.lang.String.format;
+import static org.bson.assertions.Assertions.notNull;
 
 /**
  * Represents a BSON writer for some external format (see subclasses).
@@ -185,6 +189,14 @@ protected void setContext(final Context context) {
      */
     protected abstract void doWriteInt64(long value);
 
+    /**
+     * Handles the logic of writing a Decimal128 value
+     *
+     * @param value the {@code Decimal128} value to write
+     * @since 3.4
+     */
+    protected abstract void doWriteDecimal128(Decimal128 value);
+
     /**
      * Handles the logic of writing a JavaScript function
      *
@@ -341,12 +353,15 @@ public void writeEndArray() {
 
     @Override
     public void writeBinaryData(final String name, final BsonBinary binary) {
+        notNull("name", name);
+        notNull("value", binary);
         writeName(name);
         writeBinaryData(binary);
     }
 
     @Override
     public void writeBinaryData(final BsonBinary binary) {
+        notNull("value", binary);
         checkPreconditions("writeBinaryData", State.VALUE, State.INITIAL);
         doWriteBinaryData(binary);
         setState(getNextState());
@@ -380,12 +395,15 @@ public void writeDateTime(final long value) {
 
     @Override
     public void writeDBPointer(final String name, final BsonDbPointer value) {
+        notNull("name", name);
+        notNull("value", value);
         writeName(name);
         writeDBPointer(value);
     }
 
     @Override
     public void writeDBPointer(final BsonDbPointer value) {
+        notNull("value", value);
         checkPreconditions("writeDBPointer", State.VALUE, State.INITIAL);
         doWriteDBPointer(value);
         setState(getNextState());
@@ -430,14 +448,33 @@ public void writeInt64(final long value) {
         setState(getNextState());
     }
 
+    @Override
+    public void writeDecimal128(final Decimal128 value) {
+        notNull("value", value);
+        checkPreconditions("writeInt64", State.VALUE);
+        doWriteDecimal128(value);
+        setState(getNextState());
+    }
+
+    @Override
+    public void writeDecimal128(final String name, final Decimal128 value) {
+        notNull("name", name);
+        notNull("value", value);
+        writeName(name);
+        writeDecimal128(value);
+    }
+
     @Override
     public void writeJavaScript(final String name, final String code) {
+        notNull("name", name);
+        notNull("value", code);
         writeName(name);
         writeJavaScript(code);
     }
 
     @Override
     public void writeJavaScript(final String code) {
+        notNull("value", code);
         checkPreconditions("writeJavaScript", State.VALUE);
         doWriteJavaScript(code);
         setState(getNextState());
@@ -445,12 +482,15 @@ public void writeJavaScript(final String code) {
 
     @Override
     public void writeJavaScriptWithScope(final String name, final String code) {
+        notNull("name", name);
+        notNull("value", code);
         writeName(name);
         writeJavaScriptWithScope(code);
     }
 
     @Override
     public void writeJavaScriptWithScope(final String code) {
+        notNull("value", code);
         checkPreconditions("writeJavaScriptWithScope", State.VALUE);
         doWriteJavaScriptWithScope(code);
         setState(State.SCOPE_DOCUMENT);
@@ -484,19 +524,27 @@ public void writeMinKey() {
 
     @Override
     public void writeName(final String name) {
+        notNull("name", name);
         if (state != State.NAME) {
             throwInvalidState("WriteName", State.NAME);
         }
-        if (name == null) {
-            throw new IllegalArgumentException("BSON field name can not be null");
-        }
         if (!fieldNameValidatorStack.peek().validate(name)) {
             throw new IllegalArgumentException(format("Invalid BSON field name %s", name));
         }
+        doWriteName(name);
         context.name = name;
         state = State.VALUE;
     }
 
+    /**
+     * Handles the logic of writing the element name.
+     *
+     * @param name the name of the element
+     * @since 3.5
+     */
+    protected void doWriteName(final String name) {
+    }
+
     @Override
     public void writeNull(final String name) {
         writeName(name);
@@ -512,12 +560,15 @@ public void writeNull() {
 
     @Override
     public void writeObjectId(final String name, final ObjectId objectId) {
+        notNull("name", name);
+        notNull("value", objectId);
         writeName(name);
         writeObjectId(objectId);
     }
 
     @Override
     public void writeObjectId(final ObjectId objectId) {
+        notNull("value", objectId);
         checkPreconditions("writeObjectId", State.VALUE);
         doWriteObjectId(objectId);
         setState(getNextState());
@@ -525,12 +576,15 @@ public void writeObjectId(final ObjectId objectId) {
 
     @Override
     public void writeRegularExpression(final String name, final BsonRegularExpression regularExpression) {
+        notNull("name", name);
+        notNull("value", regularExpression);
         writeName(name);
         writeRegularExpression(regularExpression);
     }
 
     @Override
     public void writeRegularExpression(final BsonRegularExpression regularExpression) {
+        notNull("value", regularExpression);
         checkPreconditions("writeRegularExpression", State.VALUE);
         doWriteRegularExpression(regularExpression);
         setState(getNextState());
@@ -538,12 +592,15 @@ public void writeRegularExpression(final BsonRegularExpression regularExpression
 
     @Override
     public void writeString(final String name, final String value) {
+        notNull("name", name);
+        notNull("value", value);
         writeName(name);
         writeString(value);
     }
 
     @Override
     public void writeString(final String value) {
+        notNull("value", value);
         checkPreconditions("writeString", State.VALUE);
         doWriteString(value);
         setState(getNextState());
@@ -552,12 +609,15 @@ public void writeString(final String value) {
 
     @Override
     public void writeSymbol(final String name, final String value) {
+        notNull("name", name);
+        notNull("value", value);
         writeName(name);
         writeSymbol(value);
     }
 
     @Override
     public void writeSymbol(final String value) {
+        notNull("value", value);
         checkPreconditions("writeSymbol", State.VALUE);
         doWriteSymbol(value);
         setState(getNextState());
@@ -565,12 +625,15 @@ public void writeSymbol(final String value) {
 
     @Override
     public void writeTimestamp(final String name, final BsonTimestamp value) {
+        notNull("name", name);
+        notNull("value", value);
         writeName(name);
         writeTimestamp(value);
     }
 
     @Override
     public void writeTimestamp(final BsonTimestamp value) {
+        notNull("value", value);
         checkPreconditions("writeTimestamp", State.VALUE);
         doWriteTimestamp(value);
         setState(getNextState());
@@ -689,39 +752,73 @@ public void close() {
 
     @Override
     public void pipe(final BsonReader reader) {
-        pipeDocument(reader);
+        notNull("reader", reader);
+        pipeDocument(reader, null);
+    }
+
+    /**
+     * Reads a single document from the given BsonReader and writes it to this, appending the given extra elements to the document.
+     *
+     * @param reader the source of the document
+     * @param extraElements the extra elements to append to the document
+     * @since 3.6
+     */
+    public void pipe(final BsonReader reader, final List<BsonElement> extraElements) {
+        notNull("reader", reader);
+        notNull("extraElements", extraElements);
+        pipeDocument(reader, extraElements);
     }
 
-    private void pipeDocument(final BsonReader reader) {
+    /**
+     * Pipe a list of extra element to this writer
+     *
+     * @param extraElements the extra elements
+     */
+    protected void pipeExtraElements(final List<BsonElement> extraElements) {
+        notNull("extraElements", extraElements);
+        for (BsonElement cur : extraElements) {
+            writeName(cur.getName());
+            pipeValue(cur.getValue());
+        }
+    }
+
+    /**
+     * Return true if the current execution of the pipe method should be aborted.
+     *
+     * @return true if the current execution of the pipe method should be aborted.
+     *
+     * @since 3.7
+     */
+    protected boolean abortPipe() {
+        return false;
+    }
+
+    private void pipeDocument(final BsonReader reader, final List<BsonElement> extraElements) {
         reader.readStartDocument();
         writeStartDocument();
         while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
             writeName(reader.readName());
             pipeValue(reader);
+            if (abortPipe()) {
+                return;
+            }
         }
         reader.readEndDocument();
-        writeEndDocument();
-    }
-
-    private void pipeArray(final BsonReader reader) {
-        reader.readStartArray();
-        writeStartArray();
-        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-            pipeValue(reader);
+        if (extraElements != null) {
+            pipeExtraElements(extraElements);
         }
-        reader.readEndArray();
-        writeEndArray();
+        writeEndDocument();
     }
 
     private void pipeJavascriptWithScope(final BsonReader reader) {
         writeJavaScriptWithScope(reader.readJavaScriptWithScope());
-        pipeDocument(reader);
+        pipeDocument(reader, null);
     }
 
     private void pipeValue(final BsonReader reader) {
         switch (reader.getCurrentBsonType()) {
             case DOCUMENT:
-                pipeDocument(reader);
+                pipeDocument(reader, null);
                 break;
             case ARRAY:
                 pipeArray(reader);
@@ -773,6 +870,9 @@ private void pipeValue(final BsonReader reader) {
             case INT64:
                 writeInt64(reader.readInt64());
                 break;
+            case DECIMAL128:
+                writeDecimal128(reader.readDecimal128());
+                break;
             case MIN_KEY:
                 reader.readMinKey();
                 writeMinKey();
@@ -789,6 +889,111 @@ private void pipeValue(final BsonReader reader) {
         }
     }
 
+    private void pipeDocument(final BsonDocument value) {
+        writeStartDocument();
+        for (Map.Entry<String, BsonValue> cur : value.entrySet()) {
+            writeName(cur.getKey());
+            pipeValue(cur.getValue());
+        }
+        writeEndDocument();
+    }
+
+    private void pipeArray(final BsonReader reader) {
+        reader.readStartArray();
+        writeStartArray();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            pipeValue(reader);
+            if (abortPipe()) {
+                return;
+            }
+        }
+        reader.readEndArray();
+        writeEndArray();
+    }
+
+    private void pipeArray(final BsonArray array) {
+        writeStartArray();
+        for (BsonValue cur : array) {
+            pipeValue(cur);
+        }
+        writeEndArray();
+    }
+
+    private void pipeJavascriptWithScope(final BsonJavaScriptWithScope javaScriptWithScope) {
+        writeJavaScriptWithScope(javaScriptWithScope.getCode());
+        pipeDocument(javaScriptWithScope.getScope());
+    }
+
+    private void pipeValue(final BsonValue value) {
+        switch (value.getBsonType()) {
+            case DOCUMENT:
+                pipeDocument(value.asDocument());
+                break;
+            case ARRAY:
+                pipeArray(value.asArray());
+                break;
+            case DOUBLE:
+                writeDouble(value.asDouble().getValue());
+                break;
+            case STRING:
+                writeString(value.asString().getValue());
+                break;
+            case BINARY:
+                writeBinaryData(value.asBinary());
+                break;
+            case UNDEFINED:
+                writeUndefined();
+                break;
+            case OBJECT_ID:
+                writeObjectId(value.asObjectId().getValue());
+                break;
+            case BOOLEAN:
+                writeBoolean(value.asBoolean().getValue());
+                break;
+            case DATE_TIME:
+                writeDateTime(value.asDateTime().getValue());
+                break;
+            case NULL:
+                writeNull();
+                break;
+            case REGULAR_EXPRESSION:
+                writeRegularExpression(value.asRegularExpression());
+                break;
+            case JAVASCRIPT:
+                writeJavaScript(value.asJavaScript().getCode());
+                break;
+            case SYMBOL:
+                writeSymbol(value.asSymbol().getSymbol());
+                break;
+            case JAVASCRIPT_WITH_SCOPE:
+                pipeJavascriptWithScope(value.asJavaScriptWithScope());
+                break;
+            case INT32:
+                writeInt32(value.asInt32().getValue());
+                break;
+            case TIMESTAMP:
+                writeTimestamp(value.asTimestamp());
+                break;
+            case INT64:
+                writeInt64(value.asInt64().getValue());
+                break;
+            case DECIMAL128:
+                writeDecimal128(value.asDecimal128().getValue());
+                break;
+            case MIN_KEY:
+                writeMinKey();
+                break;
+            case DB_POINTER:
+                writeDBPointer(value.asDBPointer());
+                break;
+            case MAX_KEY:
+                writeMaxKey();
+                break;
+            default:
+                throw new IllegalArgumentException("unhandled BSON type: " + value.getBsonType());
+        }
+    }
+
     /**
      * The state of a writer.  Indicates where in a document the writer is.
      */
diff --git a/driver/src/main/org/bson/BSON.java b/bson/src/main/org/bson/BSON.java
similarity index 96%
rename from driver/src/main/org/bson/BSON.java
rename to bson/src/main/org/bson/BSON.java
index 671efaa8c8b..02ce9b68873 100644
--- a/driver/src/main/org/bson/BSON.java
+++ b/bson/src/main/org/bson/BSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.bson;
 
-import org.bson.util.ClassMap;
-
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Pattern;
@@ -27,7 +25,10 @@
  * supports the registration of encoding and decoding hooks to transform BSON types during encoding or decoding.
  *
  * @see org.bson.Transformer
+ * @deprecated there is no replacement for this class
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class BSON {
 
     public static final byte EOO = 0;
@@ -85,8 +86,8 @@ public class BSON {
 
     private static volatile boolean encodeHooks = false;
     private static volatile boolean decodeHooks = false;
-    private static final ClassMap<List<Transformer>> encodingHooks = new ClassMap<List<Transformer>>();
-    private static final ClassMap<List<Transformer>> decodingHooks = new ClassMap<List<Transformer>>();
+    private static final org.bson.util.ClassMap<List<Transformer>> encodingHooks = new org.bson.util.ClassMap<List<Transformer>>();
+    private static final org.bson.util.ClassMap<List<Transformer>> decodingHooks = new org.bson.util.ClassMap<List<Transformer>>();
 
     /**
      * Gets whether any encoding transformers have been registered for any classes.
diff --git a/driver/src/main/org/bson/BSONCallback.java b/bson/src/main/org/bson/BSONCallback.java
similarity index 94%
rename from driver/src/main/org/bson/BSONCallback.java
rename to bson/src/main/org/bson/BSONCallback.java
index 6d9258634ac..09995ce21e8 100644
--- a/driver/src/main/org/bson/BSONCallback.java
+++ b/bson/src/main/org/bson/BSONCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 /**
@@ -135,6 +136,16 @@ public interface BSONCallback {
      */
     void gotDouble(String name, double value);
 
+    /**
+     * Called when reading a field with a {@link org.bson.BsonType#DECIMAL128} value.
+     *
+     * @param name the field name
+     * @param value the Decimal128 field value
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    void gotDecimal128(String name, Decimal128 value);
+
     /**
      * Called when reading a field with a {@link org.bson.BsonType#INT32} value.
      *
@@ -217,7 +228,7 @@ public interface BSONCallback {
      *
      * @param name the name of the field
      * @param data the field's value
-     * @deprecated
+     * @deprecated this method is no longer called by the decoder
      */
     @Deprecated
     void gotBinaryArray(String name, byte[] data);
diff --git a/driver/src/main/org/bson/BSONCallbackAdapter.java b/bson/src/main/org/bson/BSONCallbackAdapter.java
similarity index 95%
rename from driver/src/main/org/bson/BSONCallbackAdapter.java
rename to bson/src/main/org/bson/BSONCallbackAdapter.java
index 6aa9bd1ce71..cc6d192a3db 100644
--- a/driver/src/main/org/bson/BSONCallbackAdapter.java
+++ b/bson/src/main/org/bson/BSONCallbackAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 import static org.bson.io.Bits.readLong;
@@ -122,6 +123,11 @@ protected void doWriteInt64(final long value) {
         bsonCallback.gotLong(getName(), value);
     }
 
+    @Override
+    protected void doWriteDecimal128(final Decimal128 value) {
+        bsonCallback.gotDecimal128(getName(), value);
+    }
+
     @Override
     protected void doWriteJavaScript(final String value) {
         bsonCallback.gotCode(getName(), value);
@@ -200,7 +206,7 @@ public class Context extends AbstractBsonWriter.Context {
         private String code;
         private String name;
 
-        public Context(final Context parentContext, final BsonContextType contextType) {
+        Context(final Context parentContext, final BsonContextType contextType) {
             super(parentContext, contextType);
         }
 
diff --git a/driver/src/main/org/bson/BSONDecoder.java b/bson/src/main/org/bson/BSONDecoder.java
similarity index 98%
rename from driver/src/main/org/bson/BSONDecoder.java
rename to bson/src/main/org/bson/BSONDecoder.java
index f869a9780d9..9b7e7dd326d 100644
--- a/driver/src/main/org/bson/BSONDecoder.java
+++ b/bson/src/main/org/bson/BSONDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/BSONEncoder.java b/bson/src/main/org/bson/BSONEncoder.java
similarity index 98%
rename from driver/src/main/org/bson/BSONEncoder.java
rename to bson/src/main/org/bson/BSONEncoder.java
index 06d91f33c42..6974147b845 100644
--- a/driver/src/main/org/bson/BSONEncoder.java
+++ b/bson/src/main/org/bson/BSONEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BSONException.java b/bson/src/main/org/bson/BSONException.java
index 0af0405f230..dd445268a03 100644
--- a/bson/src/main/org/bson/BSONException.java
+++ b/bson/src/main/org/bson/BSONException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/BSONObject.java b/bson/src/main/org/bson/BSONObject.java
similarity index 89%
rename from driver/src/main/org/bson/BSONObject.java
rename to bson/src/main/org/bson/BSONObject.java
index f23126d156f..84142dce097 100644
--- a/driver/src/main/org/bson/BSONObject.java
+++ b/bson/src/main/org/bson/BSONObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ public interface BSONObject {
      *
      * @param key Name to set
      * @param v   Corresponding value
-     * @return the previous value associated with <tt>key</tt>, or <tt>null</tt> if there was no mapping for <tt>key</tt>. (A <tt>null</tt>
-     * return can also indicate that the map previously associated <tt>null</tt> with <tt>key</tt>.)
+     * @return the previous value associated with {@code key}, or {@code null} if there was no mapping for {@code key}. (A
+     * {@code null} return can also indicate that the map previously associated {@code null} with {@code key}.)
      */
     Object put(String key, Object v);
 
diff --git a/driver/src/main/org/bson/BasicBSONCallback.java b/bson/src/main/org/bson/BasicBSONCallback.java
similarity index 97%
rename from driver/src/main/org/bson/BasicBSONCallback.java
rename to bson/src/main/org/bson/BasicBSONCallback.java
index e9b98d5aad7..88247e69d72 100644
--- a/driver/src/main/org/bson/BasicBSONCallback.java
+++ b/bson/src/main/org/bson/BasicBSONCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
@@ -36,6 +37,7 @@
 /**
  * An implementation of {@code BsonCallback} that creates an instance of BSONObject.
  */
+@SuppressWarnings("deprecation")
 public class BasicBSONCallback implements BSONCallback {
 
     private Object root;
@@ -177,6 +179,11 @@ public void gotLong(final String name, final long value) {
         _put(name, value);
     }
 
+    @Override
+    public void gotDecimal128(final String name, final Decimal128 value) {
+        _put(name, value);
+    }
+
     @Override
     public void gotDate(final String name, final long millis) {
         _put(name, new Date(millis));
diff --git a/driver/src/main/org/bson/BasicBSONDecoder.java b/bson/src/main/org/bson/BasicBSONDecoder.java
similarity index 98%
rename from driver/src/main/org/bson/BasicBSONDecoder.java
rename to bson/src/main/org/bson/BasicBSONDecoder.java
index 1775fee24ed..7233aaf2396 100644
--- a/driver/src/main/org/bson/BasicBSONDecoder.java
+++ b/bson/src/main/org/bson/BasicBSONDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/BasicBSONEncoder.java b/bson/src/main/org/bson/BasicBSONEncoder.java
similarity index 96%
rename from driver/src/main/org/bson/BasicBSONEncoder.java
rename to bson/src/main/org/bson/BasicBSONEncoder.java
index 0b3c81ce51f..5de070b0603 100644
--- a/driver/src/main/org/bson/BasicBSONEncoder.java
+++ b/bson/src/main/org/bson/BasicBSONEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 
 package org.bson;
 
-import com.mongodb.DBRef;
 import org.bson.io.BasicOutputBuffer;
 import org.bson.io.OutputBuffer;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
@@ -37,11 +37,10 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Pattern;
 
-import static org.bson.BSON.regexFlags;
-
 /**
  * This is meant to be pooled or cached. There is some per instance memory for string conversion, etc...
  */
+@SuppressWarnings("deprecation")
 public class BasicBSONEncoder implements BSONEncoder {
 
     private BsonBinaryWriter bsonWriter;
@@ -153,6 +152,8 @@ protected void _putObjectField(final String name, final Object initialValue) {
             putNull(name);
         } else if (value instanceof Date) {
             putDate(name, (Date) value);
+        } else if (value instanceof Decimal128) {
+            putDecimal128(name, (Decimal128) value);
         } else if (value instanceof Number) {
             putNumber(name, (Number) value);
         } else if (value instanceof Character) {
@@ -187,15 +188,6 @@ protected void _putObjectField(final String name, final Object initialValue) {
             putCodeWScope(name, (CodeWScope) value);
         } else if (value instanceof Code) {
             putCode(name, (Code) value);
-        } else if (value instanceof DBRef) {
-            BSONObject temp = new BasicBSONObject();
-            DBRef dbRef = (DBRef) value;
-            temp.put("$ref", dbRef.getCollectionName());
-            temp.put("$id", dbRef.getId());
-            if (dbRef.getDatabaseName() != null) {
-                temp.put("$db", dbRef.getDatabaseName());
-            }
-            putObject(name, temp);
         } else if (value instanceof MinKey) {
             putMinKey(name);
         } else if (value instanceof MaxKey) {
@@ -307,6 +299,19 @@ protected void putNumber(final String name, final Number number) {
         }
     }
 
+    /**
+     * Encodes a Decimal128 field.
+     *
+     * @param name   the field name
+     * @param value the value
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    protected void putDecimal128(final String name, final Decimal128 value) {
+        putName(name);
+        bsonWriter.writeDecimal128(value);
+    }
+
     /**
      * Encodes a byte array field
      *
@@ -380,7 +385,7 @@ protected void putString(final String name, final String value) {
      */
     protected void putPattern(final String name, final Pattern value) {
         putName(name);
-        bsonWriter.writeRegularExpression(new BsonRegularExpression(value.pattern(), regexFlags(value.flags())));
+        bsonWriter.writeRegularExpression(new BsonRegularExpression(value.pattern(), org.bson.BSON.regexFlags(value.flags())));
     }
 
     /**
diff --git a/driver/src/main/org/bson/BasicBSONObject.java b/bson/src/main/org/bson/BasicBSONObject.java
similarity index 96%
rename from driver/src/main/org/bson/BasicBSONObject.java
rename to bson/src/main/org/bson/BasicBSONObject.java
index 43d14f63df3..2a354fc636c 100644
--- a/driver/src/main/org/bson/BasicBSONObject.java
+++ b/bson/src/main/org/bson/BasicBSONObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.bson;
 
-import com.mongodb.util.JSONSerializers;
 import org.bson.types.BasicBSONList;
 import org.bson.types.ObjectId;
 
@@ -336,16 +335,6 @@ public BasicBSONObject append(final String key, final Object val) {
         return this;
     }
 
-    /**
-     * Returns a JSON serialization of this object
-     *
-     * @return JSON serialization
-     */
-    @Override
-    public String toString() {
-        return JSONSerializers.getStrict().serialize(this);
-    }
-
     /**
      * Compares two documents according to their serialized form, ignoring the order of keys.
      *
@@ -368,7 +357,7 @@ public boolean equals(final Object o) {
             return false;
         }
 
-        return Arrays.equals(canonicalizeBSONObject(this).encode(), canonicalizeBSONObject(other).encode());
+        return Arrays.equals(getEncoder().encode(canonicalizeBSONObject(this)), getEncoder().encode(canonicalizeBSONObject(other)));
     }
 
     @Override
@@ -377,7 +366,11 @@ public int hashCode() {
     }
 
     private byte[] encode() {
-        return new BasicBSONEncoder().encode(this);
+        return getEncoder().encode(this);
+    }
+
+    private BSONEncoder getEncoder() {
+        return new BasicBSONEncoder();
     }
 
     // create a copy of "from", but with keys ordered alphabetically
diff --git a/bson/src/main/org/bson/BsonArray.java b/bson/src/main/org/bson/BsonArray.java
index 49fc08558f3..f914e05567b 100644
--- a/bson/src/main/org/bson/BsonArray.java
+++ b/bson/src/main/org/bson/BsonArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.bson;
 
+import org.bson.codecs.BsonArrayCodec;
+import org.bson.codecs.DecoderContext;
+import org.bson.json.JsonReader;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -38,14 +42,37 @@ public class BsonArray extends BsonValue implements List<BsonValue>, Cloneable {
      * @param values the list of values, none of whose members may be null.
      */
     public BsonArray(final List<? extends BsonValue> values) {
-        this.values = new ArrayList<BsonValue>(values);
+        this(values, true);
     }
 
     /**
-     * Construct an empty B
+     * Construct an empty BsonArray
      */
     public BsonArray() {
-        values = new ArrayList<BsonValue>();
+        this(new ArrayList<BsonValue>(), false);
+    }
+
+    @SuppressWarnings("unchecked")
+    BsonArray(final List<? extends BsonValue> values, final boolean copy) {
+        if (copy) {
+            this.values = new ArrayList<BsonValue>(values);
+        } else {
+            this.values = (List<BsonValue>) values;
+        }
+    }
+
+    /**
+     * Parses a string in MongoDB Extended JSON format to a {@code BsonArray}
+     *
+     * @param json the JSON string
+     * @return a corresponding {@code BsonArray} object
+     * @see org.bson.json.JsonReader
+     * @mongodb.driver.manual reference/mongodb-extended-json/ MongoDB Extended JSON
+     *
+     * @since 3.4
+     */
+    public static BsonArray parse(final String json) {
+        return new BsonArrayCodec().decode(new JsonReader(json), DecoderContext.builder().build());
     }
 
     /**
@@ -182,17 +209,12 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (!(o instanceof BsonArray)) {
             return false;
         }
 
         BsonArray that = (BsonArray) o;
-
-        if (!values.equals(that.values)) {
-            return false;
-        }
-
-        return true;
+        return getValues().equals(that.getValues());
     }
 
     @Override
diff --git a/bson/src/main/org/bson/BsonBinary.java b/bson/src/main/org/bson/BsonBinary.java
index fb10f73fd8e..1a91c8d7f30 100644
--- a/bson/src/main/org/bson/BsonBinary.java
+++ b/bson/src/main/org/bson/BsonBinary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,11 @@
 
 package org.bson;
 
+import org.bson.assertions.Assertions;
+import org.bson.internal.UuidHelper;
+
 import java.util.Arrays;
+import java.util.UUID;
 
 /**
  * A representation of the BSON Binary type.  Note that for performance reasons instances of this class are not immutable,
@@ -75,6 +79,75 @@ public BsonBinary(final byte type, final byte[] data) {
         this.data = data;
     }
 
+    /**
+     * Construct a Type 4 BsonBinary from the given UUID.
+     *
+     * @param uuid the UUID
+     * @since 3.9
+     */
+    public BsonBinary(final UUID uuid) {
+        this(uuid, UuidRepresentation.STANDARD);
+    }
+
+    /**
+     * Construct a new instance from the given UUID and UuidRepresentation
+     *
+     * @param uuid the UUID
+     * @param uuidRepresentation the UUID representation
+     * @since 3.9
+     */
+    public BsonBinary(final UUID uuid, final UuidRepresentation uuidRepresentation) {
+        if (uuid == null) {
+            throw new IllegalArgumentException("uuid may not be null");
+        }
+        if (uuidRepresentation == null) {
+            throw new IllegalArgumentException("uuidRepresentation may not be null");
+        }
+        this.data = UuidHelper.encodeUuidToBinary(uuid, uuidRepresentation);
+        this.type = uuidRepresentation == UuidRepresentation.STANDARD
+                ? BsonBinarySubType.UUID_STANDARD.getValue()
+                : BsonBinarySubType.UUID_LEGACY.getValue();
+    }
+
+    /**
+     * Returns the binary as a UUID. The binary type must be 4.
+     *
+     * @return the uuid
+     * @since 3.9
+     */
+    public UUID asUuid() {
+        if (!BsonBinarySubType.isUuid(type)) {
+            throw new BsonInvalidOperationException("type must be a UUID subtype.");
+        }
+
+        if (type != BsonBinarySubType.UUID_STANDARD.getValue()) {
+            throw new BsonInvalidOperationException("uuidRepresentation must be set to return the correct UUID.");
+        }
+
+        return UuidHelper.decodeBinaryToUuid(this.data.clone(), this.type, UuidRepresentation.STANDARD);
+    }
+
+    /**
+     * Returns the binary as a UUID.
+     *
+     * @param uuidRepresentation the UUID representation
+     * @return the uuid
+     * @since 3.9
+     */
+    public UUID asUuid(final UuidRepresentation uuidRepresentation) {
+        Assertions.notNull("uuidRepresentation", uuidRepresentation);
+
+        final byte uuidType = uuidRepresentation == UuidRepresentation.STANDARD
+                ? BsonBinarySubType.UUID_STANDARD.getValue()
+                : BsonBinarySubType.UUID_LEGACY.getValue();
+
+        if (type != uuidType) {
+            throw new BsonInvalidOperationException("uuidRepresentation does not match current uuidRepresentation.");
+        }
+
+        return UuidHelper.decodeBinaryToUuid(data.clone(), type, uuidRepresentation);
+    }
+
     @Override
     public BsonType getBsonType() {
         return BsonType.BINARY;
diff --git a/bson/src/main/org/bson/BsonBinaryReader.java b/bson/src/main/org/bson/BsonBinaryReader.java
index bc6939501c4..6de8f6f32be 100644
--- a/bson/src/main/org/bson/BsonBinaryReader.java
+++ b/bson/src/main/org/bson/BsonBinaryReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,9 @@
 package org.bson;
 
 import org.bson.io.BsonInput;
+import org.bson.io.BsonInputMark;
 import org.bson.io.ByteBufferBsonInput;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 import java.nio.ByteBuffer;
@@ -108,7 +110,7 @@ public BsonType readBsonType() {
                     return BsonType.END_OF_DOCUMENT;
                 default:
                     throw new BsonSerializationException(format("BSONType EndOfDocument is not valid when ContextType is %s.",
-                                                                getContext().getContextType()));
+                            getContext().getContextType()));
             }
         } else {
             switch (getContext().getContextType()) {
@@ -135,7 +137,10 @@ protected BsonBinary doReadBinaryData() {
         byte type = bsonInput.readByte();
 
         if (type == BsonBinarySubType.OLD_BINARY.getValue()) {
-            bsonInput.readInt32();
+            int repeatedNumBytes = bsonInput.readInt32();
+            if (repeatedNumBytes != numBytes - 4) {
+                throw new BsonSerializationException("Binary sub type OldBinary has inconsistent sizes");
+            }
             numBytes -= 4;
         }
         byte[] bytes = new byte[numBytes];
@@ -152,11 +157,19 @@ protected byte doPeekBinarySubType() {
         return type;
     }
 
+    @Override
+    protected int doPeekBinarySize() {
+        mark();
+        int size = readSize();
+        reset();
+        return size;
+    }
+
     @Override
     protected boolean doReadBoolean() {
         byte booleanByte = bsonInput.readByte();
         if (booleanByte != 0 && booleanByte != 1) {
-           throw new BsonSerializationException(format("Expected a boolean value but found %d", booleanByte));
+            throw new BsonSerializationException(format("Expected a boolean value but found %d", booleanByte));
         }
         return booleanByte == 0x1;
     }
@@ -181,6 +194,13 @@ protected long doReadInt64() {
         return bsonInput.readInt64();
     }
 
+    @Override
+    public Decimal128 doReadDecimal128() {
+        long low = bsonInput.readInt64();
+        long high = bsonInput.readInt64();
+        return Decimal128.fromIEEE754BIDEncoding(high, low);
+    }
+
     @Override
     protected String doReadJavaScript() {
         return bsonInput.readString();
@@ -233,9 +253,7 @@ protected String doReadSymbol() {
 
     @Override
     protected BsonTimestamp doReadTimestamp() {
-        int increment = bsonInput.readInt32();
-        int time = bsonInput.readInt32();
-        return new BsonTimestamp(time, increment);
+        return new BsonTimestamp(bsonInput.readInt64());
     }
 
     @Override
@@ -252,7 +270,7 @@ public void doReadStartArray() {
     @Override
     protected void doReadStartDocument() {
         BsonContextType contextType = (getState() == State.SCOPE_DOCUMENT)
-                                      ? BsonContextType.SCOPE_DOCUMENT : BsonContextType.DOCUMENT;
+                ? BsonContextType.SCOPE_DOCUMENT : BsonContextType.DOCUMENT;
         int startPosition = bsonInput.getPosition(); // position of size field
         int size = readSize();
         setContext(new Context(getContext(), contextType, startPosition, size));
@@ -310,6 +328,9 @@ protected void doSkipValue() {
             case INT64:
                 skip = 8;
                 break;
+            case DECIMAL128:
+                skip = 16;
+                break;
             case JAVASCRIPT:
                 skip = readSize();
                 break;
@@ -345,6 +366,9 @@ protected void doSkipValue() {
             case UNDEFINED:
                 skip = 0;
                 break;
+            case DB_POINTER:
+                skip = readSize() + 12;   // String followed by ObjectId
+                break;
             default:
                 throw new BSONException("Unexpected BSON type: " + getCurrentBsonType());
         }
@@ -365,14 +389,22 @@ private int readSize() {
     protected Context getContext() {
         return (Context) super.getContext();
     }
+
+    @Deprecated
     @Override
     public void mark() {
         if (mark != null) {
-             throw new BSONException("A mark already exists; it needs to be reset before creating a new one");
+            throw new BSONException("A mark already exists; it needs to be reset before creating a new one");
         }
         mark = new Mark();
     }
 
+    @Override
+    public BsonReaderMark getMark() {
+        return new Mark();
+    }
+
+    @Deprecated
     @Override
     public void reset() {
         if (mark == null) {
@@ -385,17 +417,18 @@ public void reset() {
     protected class Mark extends AbstractBsonReader.Mark {
         private final int startPosition;
         private final int size;
+        private final BsonInputMark bsonInputMark;
 
         protected Mark() {
             super();
             startPosition = BsonBinaryReader.this.getContext().startPosition;
             size = BsonBinaryReader.this.getContext().size;
-            BsonBinaryReader.this.bsonInput.mark(Integer.MAX_VALUE);
+            bsonInputMark = BsonBinaryReader.this.bsonInput.getMark(Integer.MAX_VALUE);
         }
 
-        protected void reset() {
+        public void reset() {
             super.reset();
-            BsonBinaryReader.this.bsonInput.reset();
+            bsonInputMark.reset();
             BsonBinaryReader.this.setContext(new Context((Context) getParentContext(), getContextType(), startPosition, size));
         }
     }
diff --git a/bson/src/main/org/bson/BsonBinarySubType.java b/bson/src/main/org/bson/BsonBinarySubType.java
index f9fe386f518..b43b9eb519a 100644
--- a/bson/src/main/org/bson/BsonBinarySubType.java
+++ b/bson/src/main/org/bson/BsonBinarySubType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,6 +59,17 @@ public enum BsonBinarySubType {
 
     private final byte value;
 
+    /**
+     * Returns true if the given value is a UUID subtype
+     *
+     * @param value the subtype value as a byte
+     * @return true if value is a UUID subtype
+     * @since 3.4
+     */
+    public static boolean isUuid(final byte value) {
+        return value == UUID_LEGACY.getValue() || value == UUID_STANDARD.getValue();
+    }
+
     BsonBinarySubType(final byte value) {
         this.value = value;
     }
@@ -71,5 +82,4 @@ public enum BsonBinarySubType {
     public byte getValue() {
         return value;
     }
-
 }
diff --git a/bson/src/main/org/bson/BsonBinaryWriter.java b/bson/src/main/org/bson/BsonBinaryWriter.java
index c3a1d26f1dc..2cce2090694 100644
--- a/bson/src/main/org/bson/BsonBinaryWriter.java
+++ b/bson/src/main/org/bson/BsonBinaryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,14 @@
 
 import org.bson.io.BsonInput;
 import org.bson.io.BsonOutput;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
+import java.util.List;
 import java.util.Stack;
 
 import static java.lang.String.format;
+import static org.bson.assertions.Assertions.notNull;
 
 /**
  * A BsonWriter implementation that writes to a binary stream of data.  This is the most commonly used implementation.
@@ -97,6 +100,14 @@ public BsonOutput getBsonOutput() {
         return bsonOutput;
     }
 
+    /**
+     * @return the BsonBinaryWriterSettings
+     * @since 3.6
+     */
+    public BsonBinaryWriterSettings getBinaryWriterSettings() {
+        return binaryWriterSettings;
+    }
+
     @Override
     public void flush() {
     }
@@ -206,6 +217,14 @@ protected void doWriteInt64(final long value) {
         bsonOutput.writeInt64(value);
     }
 
+    @Override
+    protected void doWriteDecimal128(final Decimal128 value) {
+        bsonOutput.writeByte(BsonType.DECIMAL128.getValue());
+        writeCurrentName();
+        bsonOutput.writeInt64(value.getLow());
+        bsonOutput.writeInt64(value.getHigh());
+    }
+
     @Override
     protected void doWriteJavaScript(final String value) {
         bsonOutput.writeByte(BsonType.JAVASCRIPT.getValue());
@@ -273,8 +292,7 @@ public void doWriteSymbol(final String value) {
     public void doWriteTimestamp(final BsonTimestamp value) {
         bsonOutput.writeByte(BsonType.TIMESTAMP.getValue());
         writeCurrentName();
-        bsonOutput.writeInt32(value.getInc());
-        bsonOutput.writeInt32(value.getTime());
+        bsonOutput.writeInt64(value.getValue());
     }
 
     @Override
@@ -285,6 +303,18 @@ public void doWriteUndefined() {
 
     @Override
     public void pipe(final BsonReader reader) {
+        notNull("reader", reader);
+        pipeDocument(reader, null);
+    }
+
+    @Override
+    public void pipe(final BsonReader reader, final List<BsonElement> extraElements) {
+        notNull("reader", reader);
+        notNull("extraElements", extraElements);
+        pipeDocument(reader, extraElements);
+    }
+
+    private void pipeDocument(final BsonReader reader, final List<BsonElement> extraElements) {
         if (reader instanceof BsonBinaryReader) {
             BsonBinaryReader binaryReader = (BsonBinaryReader) reader;
             if (getState() == State.VALUE) {
@@ -296,12 +326,24 @@ public void pipe(final BsonReader reader) {
             if (size < 5) {
                 throw new BsonSerializationException("Document size must be at least 5");
             }
+            int pipedDocumentStartPosition = bsonOutput.getPosition();
             bsonOutput.writeInt32(size);
             byte[] bytes = new byte[size - 4];
             bsonInput.readBytes(bytes);
             bsonOutput.writeBytes(bytes);
+
             binaryReader.setState(AbstractBsonReader.State.TYPE);
 
+            if (extraElements != null) {
+                bsonOutput.truncateToPosition(bsonOutput.getPosition() - 1);
+                setContext(new Context(getContext(), BsonContextType.DOCUMENT, pipedDocumentStartPosition));
+                setState(State.NAME);
+                pipeExtraElements(extraElements);
+                bsonOutput.writeByte(0);
+                bsonOutput.writeInt32(pipedDocumentStartPosition, bsonOutput.getPosition() - pipedDocumentStartPosition);
+                setContext(getContext().getParentContext());
+            }
+
             if (getContext() == null) {
                 setState(State.DONE);
             } else {
@@ -311,6 +353,10 @@ public void pipe(final BsonReader reader) {
                 }
                 setState(getNextState());
             }
+
+            validateSize(bsonOutput.getPosition() - pipedDocumentStartPosition);
+        } else if (extraElements != null) {
+            super.pipe(reader, extraElements);
         } else {
             super.pipe(reader);
         }
@@ -363,11 +409,15 @@ private void writeCurrentName() {
 
     private void backpatchSize() {
         int size = bsonOutput.getPosition() - getContext().startPosition;
+        validateSize(size);
+        bsonOutput.writeInt32(bsonOutput.getPosition() - size, size);
+    }
+
+    private void validateSize(final int size) {
         if (size > maxDocumentSizeStack.peek()) {
-            throw new BsonSerializationException(format("Size %d is larger than MaxDocumentSize %d.", size,
-                                                        binaryWriterSettings.getMaxDocumentSize()));
+            throw new BsonMaximumSizeExceededException(format("Document size of %d is larger than maximum of %d.", size,
+                    maxDocumentSizeStack.peek()));
         }
-        bsonOutput.writeInt32(bsonOutput.getPosition() - size, size);
     }
 
     protected class Context extends AbstractBsonWriter.Context {
diff --git a/bson/src/main/org/bson/BsonBinaryWriterSettings.java b/bson/src/main/org/bson/BsonBinaryWriterSettings.java
index a1d4b16e9cc..4c2957987b3 100644
--- a/bson/src/main/org/bson/BsonBinaryWriterSettings.java
+++ b/bson/src/main/org/bson/BsonBinaryWriterSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonBoolean.java b/bson/src/main/org/bson/BsonBoolean.java
index 76f7cc1bb1d..fc95ad2baf7 100644
--- a/bson/src/main/org/bson/BsonBoolean.java
+++ b/bson/src/main/org/bson/BsonBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonContextType.java b/bson/src/main/org/bson/BsonContextType.java
index 80c5ae1ba77..161f33d11b6 100644
--- a/bson/src/main/org/bson/BsonContextType.java
+++ b/bson/src/main/org/bson/BsonContextType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonDateTime.java b/bson/src/main/org/bson/BsonDateTime.java
index 7155bf39e8c..1bb045f4ed4 100644
--- a/bson/src/main/org/bson/BsonDateTime.java
+++ b/bson/src/main/org/bson/BsonDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonDbPointer.java b/bson/src/main/org/bson/BsonDbPointer.java
index 92ad6ed26eb..e74ec049ce4 100644
--- a/bson/src/main/org/bson/BsonDbPointer.java
+++ b/bson/src/main/org/bson/BsonDbPointer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonDecimal128.java b/bson/src/main/org/bson/BsonDecimal128.java
new file mode 100644
index 00000000000..842fbb83d8c
--- /dev/null
+++ b/bson/src/main/org/bson/BsonDecimal128.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson;
+
+import org.bson.types.Decimal128;
+
+import static org.bson.assertions.Assertions.notNull;
+
+/**
+ * A representation of the BSON Decimal128 type.
+ *
+ * @since 3.4
+ */
+public final class BsonDecimal128 extends BsonNumber {
+    private final Decimal128 value;
+
+    /**
+     * Construct a new instance with the given value.
+     *
+     * @param value the value, which may not be null
+     */
+    public BsonDecimal128(final Decimal128 value) {
+        notNull("value", value);
+        this.value = value;
+    }
+
+    @Override
+    public BsonType getBsonType() {
+        return BsonType.DECIMAL128;
+    }
+
+    /**
+     * Gets the Decimal128 value.
+     *
+     * @return the value
+     */
+    public Decimal128 getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BsonDecimal128 that = (BsonDecimal128) o;
+
+        if (!value.equals(that.value)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "BsonDecimal128{"
+                       + "value=" + value
+                       + '}';
+    }
+
+    @Override
+    public int intValue() {
+        return value.bigDecimalValue().intValue();
+    }
+
+    @Override
+    public long longValue() {
+        return value.bigDecimalValue().longValue();
+    }
+
+    @Override
+    public double doubleValue() {
+        return value.bigDecimalValue().doubleValue();
+    }
+
+    @Override
+    public Decimal128 decimal128Value() {
+        return value;
+    }
+}
diff --git a/bson/src/main/org/bson/BsonDocument.java b/bson/src/main/org/bson/BsonDocument.java
index b248463c15b..3b87487f58d 100644
--- a/bson/src/main/org/bson/BsonDocument.java
+++ b/bson/src/main/org/bson/BsonDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -185,6 +185,19 @@ public BsonInt64 getInt64(final Object key) {
         return get(key).asInt64();
     }
 
+    /**
+     * Gets the value of the key if it is a BsonDecimal128, or throws if not.
+     *
+     * @param key the key
+     * @return the value of the key as a BsonDecimal128
+     * @throws org.bson.BsonInvalidOperationException if the document does not contain the key or the value is not of the expected type
+     * @since 3.4
+     */
+    public BsonDecimal128 getDecimal128(final Object key) {
+        throwIfKeyAbsent(key);
+        return get(key).asDecimal128();
+    }
+
     /**
      * Gets the value of the key if it is a BsonDouble, or throws if not.
      *
@@ -359,6 +372,21 @@ public boolean isInt64(final Object key) {
         return get(key).isInt64();
     }
 
+    /**
+     * Returns true if the value of the key is a BsonDecimal128, returns false if the document does not contain the key.
+     *
+     * @param key the key
+     * @return true if the value of the key is a BsonDecimal128, returns false if the document does not contain the key.
+     * @since 3.4
+     */
+    public boolean isDecimal128(final Object key) {
+        if (!containsKey(key)) {
+            return false;
+        }
+        return get(key).isDecimal128();
+    }
+
+
     /**
      * Returns true if the value of the key is a BsonDouble, returns false if the document does not contain the key.
      *
@@ -542,6 +570,23 @@ public BsonInt64 getInt64(final Object key, final BsonInt64 defaultValue) {
         return get(key).asInt64();
     }
 
+    /**
+     * If the document does not contain the given key, return the given default value.  Otherwise, gets the value of the key as a
+     * BsonDecimal128.
+     *
+     * @param key the key
+     * @param defaultValue the default value
+     * @return the value of the key as a BsonDecimal128
+     * @throws org.bson.BsonInvalidOperationException if the document contains the key but the value is not of the expected type
+     * @since 3.4
+     */
+    public BsonDecimal128 getDecimal128(final Object key, final BsonDecimal128 defaultValue) {
+        if (!containsKey(key)) {
+            return defaultValue;
+        }
+        return get(key).asDecimal128();
+    }
+
     /**
      * If the document does not contain the given key, return the given default value.  Otherwise, gets the value of the key as a
      * BsonDouble.
@@ -726,6 +771,28 @@ public BsonDocument append(final String key, final BsonValue value) {
         return this;
     }
 
+    /**
+     * Gets the first key in the document.
+     *
+     * @return the first key in the document
+     * @throws java.util.NoSuchElementException if the document is empty
+     * @since 3.6
+     */
+    public String getFirstKey() {
+        return keySet().iterator().next();
+    }
+
+    /**
+     * Gets the first value in the document
+     *
+     * @return the first value in the document
+     * @throws java.util.NoSuchElementException if the document is empty
+     * @since 3.7
+     */
+    public BsonReader asBsonReader() {
+        return new BsonDocumentReader(this);
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
@@ -746,10 +813,14 @@ public int hashCode() {
     }
 
     /**
-     * Gets a JSON representation of this document using the default settings of {@code JsonWriterSettings}.
+     * Gets a JSON representation of this document using the {@link org.bson.json.JsonMode#STRICT} output mode, and otherwise the default
+     * settings of {@link JsonWriterSettings.Builder}.
+     *
      * @return a JSON representation of this document
+     * @see #toJson(JsonWriterSettings)
      * @see JsonWriterSettings
      */
+    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(new JsonWriterSettings());
     }
@@ -815,7 +886,7 @@ private static class SerializationProxy implements Serializable {
 
         private final byte[] bytes;
 
-        public SerializationProxy(final BsonDocument document) {
+        SerializationProxy(final BsonDocument document) {
             BasicOutputBuffer buffer = new BasicOutputBuffer();
             new BsonDocumentCodec().encode(new BsonBinaryWriter(buffer), document, EncoderContext.builder().build());
             this.bytes = new byte[buffer.size()];
diff --git a/bson/src/main/org/bson/BsonDocumentReader.java b/bson/src/main/org/bson/BsonDocumentReader.java
index 4b7ca259f88..e3d153d0e1a 100644
--- a/bson/src/main/org/bson/BsonDocumentReader.java
+++ b/bson/src/main/org/bson/BsonDocumentReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 import java.util.ArrayList;
@@ -57,6 +58,11 @@ protected byte doPeekBinarySubType() {
         return currentValue.asBinary().getType();
     }
 
+    @Override
+    protected int doPeekBinarySize() {
+        return currentValue.asBinary().getData().length;
+    }
+
     @Override
     protected boolean doReadBoolean() {
         return currentValue.asBoolean().getValue();
@@ -103,6 +109,11 @@ protected long doReadInt64() {
         return currentValue.asInt64().getValue();
     }
 
+    @Override
+    public Decimal128 doReadDecimal128() {
+        return currentValue.asDecimal128().getValue();
+    }
+
     @Override
     protected String doReadJavaScript() {
         return currentValue.asJavaScript().getCode();
@@ -224,6 +235,7 @@ public BsonType readBsonType() {
         return getCurrentBsonType();
     }
 
+    @Deprecated
     @Override
     public void mark() {
         if (mark != null) {
@@ -232,6 +244,12 @@ public void mark() {
         mark = new Mark();
     }
 
+    @Override
+    public BsonReaderMark getMark() {
+        return new Mark();
+    }
+
+    @Deprecated
     @Override
     public void reset() {
         if (mark == null) {
@@ -246,8 +264,8 @@ protected Context getContext() {
         return (Context) super.getContext();
     }
     protected class Mark extends AbstractBsonReader.Mark {
-        private BsonValue currentValue;
-        private Context context;
+        private final BsonValue currentValue;
+        private final Context context;
 
         protected Mark() {
             super();
@@ -256,7 +274,7 @@ protected Mark() {
             context.mark();
         }
 
-        protected void reset() {
+        public void reset() {
             super.reset();
             BsonDocumentReader.this.currentValue = currentValue;
             BsonDocumentReader.this.setContext(context);
diff --git a/bson/src/main/org/bson/BsonDocumentWrapper.java b/bson/src/main/org/bson/BsonDocumentWrapper.java
index 343daf75aa0..c90f3b5a931 100644
--- a/bson/src/main/org/bson/BsonDocumentWrapper.java
+++ b/bson/src/main/org/bson/BsonDocumentWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonDocumentWriter.java b/bson/src/main/org/bson/BsonDocumentWriter.java
index ef0112eb14b..7c36a368336 100644
--- a/bson/src/main/org/bson/BsonDocumentWriter.java
+++ b/bson/src/main/org/bson/BsonDocumentWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 import static org.bson.BsonContextType.DOCUMENT;
@@ -133,6 +134,11 @@ protected void doWriteInt64(final long value) {
         write(new BsonInt64(value));
     }
 
+    @Override
+    protected void doWriteDecimal128(final Decimal128 value) {
+        write(new BsonDecimal128(value));
+    }
+
     @Override
     protected void doWriteJavaScript(final String value) {
         write(new BsonJavaScript(value));
@@ -204,12 +210,12 @@ private void write(final BsonValue value) {
     private class Context extends AbstractBsonWriter.Context {
         private BsonValue container;
 
-        public Context(final BsonValue container, final BsonContextType contextType, final Context parent) {
+        Context(final BsonValue container, final BsonContextType contextType, final Context parent) {
             super(parent, contextType);
             this.container = container;
         }
 
-        public Context() {
+        Context() {
             super(null, BsonContextType.TOP_LEVEL);
         }
 
diff --git a/bson/src/main/org/bson/BsonDouble.java b/bson/src/main/org/bson/BsonDouble.java
index 0535ff19519..c3f114df493 100644
--- a/bson/src/main/org/bson/BsonDouble.java
+++ b/bson/src/main/org/bson/BsonDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
+
+import java.math.BigDecimal;
+
 /**
  * A representation of the BSON Double type.
  *
@@ -63,6 +67,18 @@ public long longValue() {
         return (long) value;
     }
 
+    @Override
+    public Decimal128 decimal128Value() {
+        if (Double.isNaN(value)) {
+            return Decimal128.NaN;
+        }
+        if (Double.isInfinite(value)) {
+            return value > 0 ? Decimal128.POSITIVE_INFINITY : Decimal128.NEGATIVE_INFINITY;
+        }
+
+        return new Decimal128(new BigDecimal(value));
+    }
+
     @Override
     public double doubleValue() {
         return value;
diff --git a/bson/src/main/org/bson/BsonElement.java b/bson/src/main/org/bson/BsonElement.java
index afec63910b3..0b898fb8d8d 100644
--- a/bson/src/main/org/bson/BsonElement.java
+++ b/bson/src/main/org/bson/BsonElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,4 +54,32 @@ public String getName() {
     public BsonValue getValue() {
         return value;
     }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BsonElement that = (BsonElement) o;
+
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
+            return false;
+        }
+        if (getValue() != null ? !getValue().equals(that.getValue()) : that.getValue() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getName() != null ? getName().hashCode() : 0;
+        result = 31 * result + (getValue() != null ? getValue().hashCode() : 0);
+        return result;
+    }
 }
diff --git a/bson/src/main/org/bson/BsonInt32.java b/bson/src/main/org/bson/BsonInt32.java
index 21ee187463a..d89a977941a 100644
--- a/bson/src/main/org/bson/BsonInt32.java
+++ b/bson/src/main/org/bson/BsonInt32.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
+
 /**
  * A representation of the BSON Int32 type.
  *
@@ -63,6 +65,11 @@ public long longValue() {
         return value;
     }
 
+    @Override
+    public Decimal128 decimal128Value() {
+        return new Decimal128(value);
+    }
+
     @Override
     public double doubleValue() {
         return value;
diff --git a/bson/src/main/org/bson/BsonInt64.java b/bson/src/main/org/bson/BsonInt64.java
index 8ab43d32e9a..8f2b4f40223 100644
--- a/bson/src/main/org/bson/BsonInt64.java
+++ b/bson/src/main/org/bson/BsonInt64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
+
 /**
  * A representation of the BSON Int64 type.
  */
@@ -67,6 +69,11 @@ public double doubleValue() {
         return value;
     }
 
+    @Override
+    public Decimal128 decimal128Value() {
+        return new Decimal128(value);
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
diff --git a/bson/src/main/org/bson/BsonInvalidOperationException.java b/bson/src/main/org/bson/BsonInvalidOperationException.java
index 9514cb3d973..9e405ff919f 100644
--- a/bson/src/main/org/bson/BsonInvalidOperationException.java
+++ b/bson/src/main/org/bson/BsonInvalidOperationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,4 +32,15 @@ public class BsonInvalidOperationException extends BSONException {
     public BsonInvalidOperationException(final String message) {
         super(message);
     }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param message the message
+     * @param t       the throwable cause.
+     * @since 3.5
+     */
+    public BsonInvalidOperationException(final String message, final Throwable t) {
+        super(message, t);
+    }
 }
diff --git a/bson/src/main/org/bson/BsonJavaScript.java b/bson/src/main/org/bson/BsonJavaScript.java
index 1ac4789cec5..506107e0f9d 100644
--- a/bson/src/main/org/bson/BsonJavaScript.java
+++ b/bson/src/main/org/bson/BsonJavaScript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonJavaScriptWithScope.java b/bson/src/main/org/bson/BsonJavaScriptWithScope.java
index 4c81f1517b1..67e172a0aad 100644
--- a/bson/src/main/org/bson/BsonJavaScriptWithScope.java
+++ b/bson/src/main/org/bson/BsonJavaScriptWithScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonMaxKey.java b/bson/src/main/org/bson/BsonMaxKey.java
index 12ef3c757c9..63ee4b48529 100644
--- a/bson/src/main/org/bson/BsonMaxKey.java
+++ b/bson/src/main/org/bson/BsonMaxKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonMaximumSizeExceededException.java b/bson/src/main/org/bson/BsonMaximumSizeExceededException.java
new file mode 100644
index 00000000000..aac48523e0e
--- /dev/null
+++ b/bson/src/main/org/bson/BsonMaximumSizeExceededException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson;
+
+/**
+ * An exception indicating a failure to serialize a BSON document due to it exceeding the maximum size.
+ *
+ * @since 3.7
+ */
+public class BsonMaximumSizeExceededException extends BsonSerializationException {
+    private static final long serialVersionUID = 8725368828269129777L;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param message the message
+     */
+    public BsonMaximumSizeExceededException(final String message) {
+        super(message);
+    }
+}
diff --git a/bson/src/main/org/bson/BsonMinKey.java b/bson/src/main/org/bson/BsonMinKey.java
index 362c0f472e8..d9abf013e87 100644
--- a/bson/src/main/org/bson/BsonMinKey.java
+++ b/bson/src/main/org/bson/BsonMinKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonNull.java b/bson/src/main/org/bson/BsonNull.java
index ae446d72968..3ab61bc9cd2 100644
--- a/bson/src/main/org/bson/BsonNull.java
+++ b/bson/src/main/org/bson/BsonNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonNumber.java b/bson/src/main/org/bson/BsonNumber.java
index 1e5c8125788..68f375ec25d 100644
--- a/bson/src/main/org/bson/BsonNumber.java
+++ b/bson/src/main/org/bson/BsonNumber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
+
 /**
  * Base class for the three numeric BSON types.  This class mirrors the functionality provided by {@code java.lang.Number}.
  *
@@ -42,4 +44,12 @@ public abstract class BsonNumber extends BsonValue {
      * @return the numeric value represented by this object after conversion to type {@code double}.
      */
     public abstract double doubleValue();
+
+    /**
+     * Returns the value of the specified number as a {@code Decimal128}, which may involve rounding.
+     *
+     * @return the numeric value represented by this object after conversion to type {@code Decimal128}.
+     * @since 3.4
+     */
+    public abstract Decimal128 decimal128Value();
 }
diff --git a/bson/src/main/org/bson/BsonObjectId.java b/bson/src/main/org/bson/BsonObjectId.java
index ea124a9a37f..790daa006a1 100644
--- a/bson/src/main/org/bson/BsonObjectId.java
+++ b/bson/src/main/org/bson/BsonObjectId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonReader.java b/bson/src/main/org/bson/BsonReader.java
index f16c68f3c10..0bd096cb477 100644
--- a/bson/src/main/org/bson/BsonReader.java
+++ b/bson/src/main/org/bson/BsonReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,17 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
+import java.io.Closeable;
+
 /**
  * An interface for reading a logical BSON document using a pull-oriented API.
  *
  * @since 3.0
  */
-public interface BsonReader {
+public interface BsonReader extends Closeable {
     /**
      * @return The current BsonType.
      */
@@ -51,6 +54,15 @@ public interface BsonReader {
      */
     byte peekBinarySubType();
 
+    /**
+     * Peeks the size of the binary data that the reader is positioned at.  This operation is not permitted if the mark is already set.
+     *
+     * @return the size of the binary data
+     * @see #mark()
+     * @since 3.4
+     */
+    int peekBinarySize();
+
     /**
      * Reads a BSON Binary data element from the reader.
      *
@@ -151,6 +163,23 @@ public interface BsonReader {
      */
     long readInt64(String name);
 
+    /**
+     * Reads a BSON Decimal128 from the reader.
+     *
+     * @return A Decimal128
+     * @since 3.4
+     */
+    Decimal128 readDecimal128();
+
+    /**
+     * Reads a BSON Decimal128 element from the reader.
+     *
+     * @param name The name of the element.
+     * @return A Decimal128
+     * @since 3.4
+     */
+    Decimal128 readDecimal128(String name);
+
     /**
      * Reads a BSON JavaScript from the reader.
      *
@@ -357,13 +386,28 @@ public interface BsonReader {
      * Creates a bookmark in the BsonReader's input
      *
      * The previous mark must be cleared before creating a new one
+     * @deprecated Use {@link #getMark()} instead
      */
+    @Deprecated
     void mark();
 
+    /**
+     * Gets a mark representing the current state of the reader.
+     *
+     * @return the mark
+     * @since 3.5
+     */
+    BsonReaderMark getMark();
+
     /**
      * Go back to the state at the last mark and removes the mark
      *
      * @throws org.bson.BSONException if no mark has been set
+     * @deprecated Prefer {@link #getMark()}
      */
+    @Deprecated
     void reset();
+
+    @Override
+    void close();
 }
diff --git a/bson/src/main/org/bson/BsonReaderMark.java b/bson/src/main/org/bson/BsonReaderMark.java
new file mode 100644
index 00000000000..f24190222fa
--- /dev/null
+++ b/bson/src/main/org/bson/BsonReaderMark.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson;
+
+/**
+ * Represents a bookmark that can be used to reset a {@link BsonReader} to its state at the time the mark was created.
+ *
+ * @see BsonReader#getMark()
+ *
+ * @since 3.5
+ */
+public interface BsonReaderMark {
+    /**
+     * Reset the {@link BsonReader} to its state at the time the mark was created.
+     */
+    void reset();
+}
diff --git a/bson/src/main/org/bson/BsonRegularExpression.java b/bson/src/main/org/bson/BsonRegularExpression.java
index 03ba879cbd4..e9b6839be6a 100644
--- a/bson/src/main/org/bson/BsonRegularExpression.java
+++ b/bson/src/main/org/bson/BsonRegularExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.bson;
 
+import java.util.Arrays;
+
 import static org.bson.assertions.Assertions.notNull;
 
 /**
@@ -36,7 +38,7 @@ public final class BsonRegularExpression extends BsonValue {
      */
     public BsonRegularExpression(final String pattern, final String options) {
         this.pattern = notNull("pattern", pattern);
-        this.options = options == null ? "" : options;
+        this.options = options == null ? "" : sortOptionCharacters(options);
     }
 
     /**
@@ -45,7 +47,7 @@ public BsonRegularExpression(final String pattern, final String options) {
      * @param pattern the regular expression {@link java.util.regex.Pattern}
      */
     public BsonRegularExpression(final String pattern) {
-        this(pattern, "");
+        this(pattern, null);
     }
 
     @Override
@@ -106,4 +108,10 @@ public String toString() {
                + ", options='" + options + '\''
                + '}';
     }
+
+    private String sortOptionCharacters(final String options) {
+        char[] chars = options.toCharArray();
+        Arrays.sort(chars);
+        return new String(chars);
+    }
 }
diff --git a/bson/src/main/org/bson/BsonSerializationException.java b/bson/src/main/org/bson/BsonSerializationException.java
index ea540931bac..d2b7713e980 100644
--- a/bson/src/main/org/bson/BsonSerializationException.java
+++ b/bson/src/main/org/bson/BsonSerializationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonString.java b/bson/src/main/org/bson/BsonString.java
index 09d9b01996d..379aaa8ef14 100644
--- a/bson/src/main/org/bson/BsonString.java
+++ b/bson/src/main/org/bson/BsonString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonSymbol.java b/bson/src/main/org/bson/BsonSymbol.java
index 1d20c896081..b4d9ded22c4 100644
--- a/bson/src/main/org/bson/BsonSymbol.java
+++ b/bson/src/main/org/bson/BsonSymbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonTimestamp.java b/bson/src/main/org/bson/BsonTimestamp.java
index 9874fc446c2..3909fbcb330 100644
--- a/bson/src/main/org/bson/BsonTimestamp.java
+++ b/bson/src/main/org/bson/BsonTimestamp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.bson;
 
+import org.bson.internal.UnsignedLongs;
+
 /**
  * A value representing the BSON timestamp type.
  *
@@ -23,26 +25,33 @@
  */
 public final class BsonTimestamp extends BsonValue implements Comparable<BsonTimestamp> {
 
-    private final int seconds;
-    private final int inc;
+    private final long value;
 
     /**
      * Construct a new instance with a null time and a 0 increment.
      */
     public BsonTimestamp() {
-        seconds = 0;
-        inc = 0;
+        value = 0;
+    }
+
+    /**
+     * Construct a new instance for the given value, which combines the time in seconds and the increment as a single long value.
+     *
+     * @param value the timetamp as a single long value
+     * @since 3.5
+     */
+    public BsonTimestamp(final long value) {
+        this.value = value;
     }
 
     /**
      * Construct a new instance for the given time and increment.
      *
      * @param seconds the number of seconds since the epoch
-     * @param inc  the increment.
+     * @param increment  the increment.
      */
-    public BsonTimestamp(final int seconds, final int inc) {
-        this.seconds = seconds;
-        this.inc = inc;
+    public BsonTimestamp(final int seconds, final int increment) {
+        value = ((long) seconds << 32) | (increment & 0xFFFFFFFFL);
     }
 
     @Override
@@ -50,13 +59,24 @@ public BsonType getBsonType() {
         return BsonType.TIMESTAMP;
     }
 
+
+    /**
+     * Gets the value of the timestamp.
+     *
+     * @return the timestamp value
+     * @since 3.5
+     */
+    public long getValue() {
+        return value;
+    }
+
     /**
      * Gets the time in seconds since epoch.
      *
      * @return an int representing time in seconds since epoch
      */
     public int getTime() {
-       return seconds;
+       return (int) (value >> 32);
     }
 
     /**
@@ -65,24 +85,21 @@ public int getTime() {
      * @return an incrementing ordinal for operations within a given second
      */
     public int getInc() {
-        return inc;
+        return (int) value;
     }
 
     @Override
     public String toString() {
         return "Timestamp{"
-               + "seconds=" + seconds
-               + ", inc=" + inc
+               + "value=" + getValue()
+               + ", seconds=" + getTime()
+               + ", inc=" + getInc()
                + '}';
     }
 
     @Override
     public int compareTo(final BsonTimestamp ts) {
-        if (getTime() != ts.getTime()) {
-            return getTime() - ts.getTime();
-        } else {
-            return getInc() - ts.getInc();
-        }
+        return UnsignedLongs.compare(value, ts.value);
     }
 
     @Override
@@ -96,11 +113,7 @@ public boolean equals(final Object o) {
 
         BsonTimestamp timestamp = (BsonTimestamp) o;
 
-        if (seconds != timestamp.seconds) {
-            return false;
-        }
-
-        if (inc != timestamp.inc) {
+        if (value != timestamp.value) {
             return false;
         }
 
@@ -109,8 +122,6 @@ public boolean equals(final Object o) {
 
     @Override
     public int hashCode() {
-        int result = seconds;
-        result = 31 * result + inc;
-        return result;
+        return (int) (value ^ (value >>> 32));
     }
 }
diff --git a/bson/src/main/org/bson/BsonType.java b/bson/src/main/org/bson/BsonType.java
index 51d92622cfc..c3f0530000e 100644
--- a/bson/src/main/org/bson/BsonType.java
+++ b/bson/src/main/org/bson/BsonType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,6 +99,12 @@ public enum BsonType {
      * A BSON 64-bit integer.
      */
     INT64(0x12),
+    /**
+     * A BSON Decimal128.
+     *
+     * @since 3.4
+     */
+    DECIMAL128(0x13),
     /**
      * A BSON MinKey value.
      */
diff --git a/bson/src/main/org/bson/BsonUndefined.java b/bson/src/main/org/bson/BsonUndefined.java
index 78c5ec139a9..28f18957c7d 100644
--- a/bson/src/main/org/bson/BsonUndefined.java
+++ b/bson/src/main/org/bson/BsonUndefined.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/BsonValue.java b/bson/src/main/org/bson/BsonValue.java
index 39779f28add..66edb96af0a 100644
--- a/bson/src/main/org/bson/BsonValue.java
+++ b/bson/src/main/org/bson/BsonValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,6 +106,18 @@ public BsonInt64 asInt64() {
         return (BsonInt64) this;
     }
 
+    /**
+     * Gets this value as a BsonDecimal128 if it is one, otherwise throws exception
+     *
+     * @return a BsonDecimal128
+     * @throws org.bson.BsonInvalidOperationException if this value is not of the expected type
+     * @since 3.4
+     */
+    public BsonDecimal128 asDecimal128() {
+        throwIfInvalidType(BsonType.DECIMAL128);
+        return (BsonDecimal128) this;
+    }
+
     /**
      * Gets this value as a BsonDouble if it is one, otherwise throws exception
      *
@@ -291,6 +303,16 @@ public boolean isInt64() {
         return this instanceof BsonInt64;
     }
 
+    /**
+     * Returns true if this is a BsonDecimal128, false otherwise.
+     *
+     * @return true if this is a BsonDecimal128, false otherwise
+     * @since 3.4
+     */
+    public boolean isDecimal128() {
+        return this instanceof BsonDecimal128;
+    }
+
     /**
      * Returns true if this is a BsonDouble, false otherwise.
      *
diff --git a/bson/src/main/org/bson/BsonWriter.java b/bson/src/main/org/bson/BsonWriter.java
index 133f25ef185..c3da5dc6059 100644
--- a/bson/src/main/org/bson/BsonWriter.java
+++ b/bson/src/main/org/bson/BsonWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 /**
@@ -144,6 +145,23 @@ public interface BsonWriter {
      */
     void writeInt64(String name, long value);
 
+    /**
+     * Writes a BSON Decimal128 to the writer.
+     *
+     * @param value The Decimal128 value.
+     * @since 3.4
+     */
+    void writeDecimal128(Decimal128 value);
+
+    /**
+     * Writes a BSON Decimal128 element to the writer.
+     *
+     * @param name  The name of the element.
+     * @param value The Decimal128 value.
+     * @since 3.4
+     */
+    void writeDecimal128(String name, Decimal128 value);
+
     /**
      * Writes a BSON JavaScript to the writer.
      *
@@ -338,4 +356,5 @@ public interface BsonWriter {
      * @param reader The source.
      */
     void pipe(BsonReader reader);
+
 }
diff --git a/bson/src/main/org/bson/BsonWriterSettings.java b/bson/src/main/org/bson/BsonWriterSettings.java
index 1a4a23f0490..9e3f1243e14 100644
--- a/bson/src/main/org/bson/BsonWriterSettings.java
+++ b/bson/src/main/org/bson/BsonWriterSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/ByteBuf.java b/bson/src/main/org/bson/ByteBuf.java
index 5dfde47bb9d..4ef5b410a10 100644
--- a/bson/src/main/org/bson/ByteBuf.java
+++ b/bson/src/main/org/bson/ByteBuf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -232,18 +232,18 @@ public interface ByteBuf  {
      * <p> This method transfers bytes from this buffer into the given
      * destination array.  If there are fewer bytes remaining in the
      * buffer than are required to satisfy the request, that is, if
-     * <tt>length</tt>&nbsp;<tt>&gt;</tt>&nbsp;<tt>remaining()</tt>, then no
+     * <code style="white-space:nowrap">length &gt; remaining()</code>, then no
      * bytes are transferred and a {@link java.nio.BufferUnderflowException} is
      * thrown.
      *
-     * <p> Otherwise, this method copies <tt>length</tt> bytes from this
+     * <p> Otherwise, this method copies {@code length} bytes from this
      * buffer into the given array, starting at the current position of this
      * buffer and at the given offset in the array.  The position of this
-     * buffer is then incremented by <tt>length</tt>.
+     * buffer is then incremented by {@code length}.
      *
      * <p> In other words, an invocation of this method of the form
-     * <tt>src.get(dst,&nbsp;off,&nbsp;len)</tt> has exactly the same effect as
-     * the loop
+     * <code style="white-space:nowrap">src.get(dst, off, len)</code>
+     * has exactly the same effect as the loop
      *
      * <pre>
      * {@code
@@ -261,21 +261,21 @@ public interface ByteBuf  {
      * @param  offset
      *         The offset within the array of the first byte to be
      *         written; must be non-negative and no larger than
-     *         <tt>dst.length</tt>
+     *         {@code dst.length}
      *
      * @param  length
      *         The maximum number of bytes to be written to the given
      *         array; must be non-negative and no larger than
-     *         <tt>dst.length - offset</tt>
+     *         {@code dst.length - offset}
      *
      * @return  This buffer
      *
      * @throws java.nio.BufferUnderflowException
-     *          If there are fewer than <tt>length</tt> bytes
+     *          If there are fewer than {@code length} bytes
      *          remaining in this buffer
      *
      * @throws  IndexOutOfBoundsException
-     *          If the preconditions on the <tt>offset</tt> and <tt>length</tt>
+     *          If the preconditions on the {@code offset} and {@code length}
      *          parameters do not hold
      */
     ByteBuf get(byte[] bytes, int offset, int length);
diff --git a/bson/src/main/org/bson/ByteBufNIO.java b/bson/src/main/org/bson/ByteBufNIO.java
index 14fd5a31427..83bfa7d893a 100644
--- a/bson/src/main/org/bson/ByteBufNIO.java
+++ b/bson/src/main/org/bson/ByteBufNIO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -35,7 +36,7 @@ public class ByteBufNIO implements ByteBuf {
      * @param buf the {@code ByteBuffer} to wrap.
      */
     public ByteBufNIO(final ByteBuffer buf) {
-        this.buf = buf;
+        this.buf = buf.order(ByteOrder.LITTLE_ENDIAN);
     }
 
     @Override
@@ -98,7 +99,7 @@ public ByteBuf put(final byte b) {
 
     @Override
     public ByteBuf flip() {
-        buf.flip();
+        ((Buffer) buf).flip();
         return this;
     }
 
@@ -114,13 +115,13 @@ public int limit() {
 
     @Override
     public ByteBuf position(final int newPosition) {
-        buf.position(newPosition);
+        ((Buffer) buf).position(newPosition);
         return this;
     }
 
     @Override
     public ByteBuf clear() {
-        buf.clear();
+        ((Buffer) buf).clear();
         return this;
     }
 
@@ -202,7 +203,7 @@ public int position() {
 
     @Override
     public ByteBuf limit(final int newLimit) {
-        buf.limit(newLimit);
+        ((Buffer) buf).limit(newLimit);
         return this;
     }
 
diff --git a/bson/src/main/org/bson/Document.java b/bson/src/main/org/bson/Document.java
index bda18319152..5ba7723ace5 100644
--- a/bson/src/main/org/bson/Document.java
+++ b/bson/src/main/org/bson/Document.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +32,14 @@
 import java.io.StringWriter;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static java.lang.String.format;
+import static org.bson.assertions.Assertions.isTrue;
 import static org.bson.assertions.Assertions.notNull;
 
 /**
@@ -140,6 +144,94 @@ public <T> T get(final Object key, final Class<T> clazz) {
         return clazz.cast(documentAsMap.get(key));
     }
 
+    /**
+     * Gets the value of the given key, casting it to {@code Class<T>} or returning the default value if null.
+     * This is useful to avoid having casts in client code, though the effect is the same.
+     *
+     * @param key   the key
+     * @param defaultValue what to return if the value is null
+     * @param <T>   the type of the class
+     * @return the value of the given key, or null if the instance does not contain this key.
+     * @throws ClassCastException if the value of the given key is not of type T
+     * @since 3.5
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T get(final Object key, final T defaultValue) {
+        notNull("defaultValue", defaultValue);
+        Object value = documentAsMap.get(key);
+        return value == null ? defaultValue : (T) value;
+    }
+
+    /**
+     * Gets the value in an embedded document, casting it to the given {@code Class<T>}.  The list of keys represents a path to the
+     * embedded value, drilling down into an embedded document for each key. This is useful to avoid having casts in
+     * client code, though the effect is the same.
+     *
+     * The generic type of the keys list is {@code ?} to be consistent with the corresponding {@code get} methods, but in practice
+     * the actual type of the argument should be {@code List<String>}. So to get the embedded value of a key list that is of type String,
+     * you would write {@code String name = doc.getEmbedded(List.of("employee", "manager", "name"), String.class)} instead of
+     * {@code String name = (String) doc.get("employee", Document.class).get("manager", Document.class).get("name") }.
+     *
+     * @param keys  the list of keys
+     * @param clazz the non-null class to cast the value to
+     * @param <T>   the type of the class
+     * @return the value of the given embedded key, or null if the instance does not contain this embedded key.
+     * @throws ClassCastException if the value of the given embedded key is not of type T
+     * @since 3.10
+     */
+    public <T> T getEmbedded(final List<?> keys, final Class<T> clazz) {
+        notNull("keys", keys);
+        isTrue("keys", !keys.isEmpty());
+        notNull("clazz", clazz);
+        return getEmbeddedValue(keys, clazz, null);
+    }
+
+    /**
+     * Gets the value in an embedded document, casting it to the given {@code Class<T>} or returning the default value if null.
+     * The list of keys represents a path to the embedded value, drilling down into an embedded document for each key.
+     * This is useful to avoid having casts in client code, though the effect is the same.
+     *
+     * The generic type of the keys list is {@code ?} to be consistent with the corresponding {@code get} methods, but in practice
+     * the actual type of the argument should be {@code List<String>}. So to get the embedded value of a key list that is of type String,
+     * you would write {@code String name = doc.getEmbedded(List.of("employee", "manager", "name"), "John Smith")} instead of
+     * {@code String name = doc.get("employee", Document.class).get("manager", Document.class).get("name", "John Smith") }.
+     *
+     * @param keys  the list of keys
+     * @param defaultValue what to return if the value is null
+     * @param <T>   the type of the class
+     * @return the value of the given key, or null if the instance does not contain this key.
+     * @throws ClassCastException if the value of the given key is not of type T
+     * @since 3.10
+     */
+    public <T> T getEmbedded(final List<?> keys, final T defaultValue) {
+        notNull("keys", keys);
+        isTrue("keys", !keys.isEmpty());
+        notNull("defaultValue", defaultValue);
+        return getEmbeddedValue(keys, null, defaultValue);
+    }
+
+
+    // Gets the embedded value of the given list of keys, casting it to {@code Class<T>} or returning the default value if null.
+    // Throws ClassCastException if any of the intermediate embedded values is not a Document.
+    @SuppressWarnings("unchecked")
+    private <T> T getEmbeddedValue(final List<?> keys, final Class<T> clazz, final T defaultValue) {
+        Object value = this;
+        Iterator<?> keyIterator = keys.iterator();
+        while (keyIterator.hasNext()) {
+            Object key = keyIterator.next();
+            value = ((Document) value).get(key);
+            if (!(value instanceof Document)) {
+                if (value == null) {
+                    return defaultValue;
+                } else if (keyIterator.hasNext()) {
+                    throw new ClassCastException(format("At key %s, the value is not a Document (%s)",
+                            key, value.getClass().getName()));
+                }
+            }
+        }
+        return clazz != null ? clazz.cast(value) : (T) value;
+    }
+
     /**
      * Gets the value of the given key as an Integer.
      *
@@ -160,8 +252,7 @@ public Integer getInteger(final Object key) {
      * @throws java.lang.ClassCastException if the value is not an integer
      */
     public int getInteger(final Object key, final int defaultValue) {
-        Object value = get(key);
-        return value == null ? defaultValue : (Integer) value;
+        return get(key, defaultValue);
     }
 
     /**
@@ -201,8 +292,8 @@ public String getString(final Object key) {
      * Gets the value of the given key as a Boolean.
      *
      * @param key the key
-     * @return the value as a double, which may be null
-     * @throws java.lang.ClassCastException if the value is not an double
+     * @return the value as a Boolean, which may be null
+     * @throws java.lang.ClassCastException if the value is not an boolean
      */
     public Boolean getBoolean(final Object key) {
         return (Boolean) get(key);
@@ -213,12 +304,11 @@ public Boolean getBoolean(final Object key) {
      *
      * @param key          the key
      * @param defaultValue what to return if the value is null
-     * @return the value as a double, which may be null
-     * @throws java.lang.ClassCastException if the value is not an double
+     * @return the value as a primitive boolean
+     * @throws java.lang.ClassCastException if the value is not a boolean
      */
     public boolean getBoolean(final Object key, final boolean defaultValue) {
-        Object value = get(key);
-        return value == null ? defaultValue : (Boolean) value;
+        return get(key, defaultValue);
     }
 
     /**
@@ -244,13 +334,67 @@ public Date getDate(final Object key) {
     }
 
     /**
-     * Gets a JSON representation of this document
+     * Gets the list value of the given key, casting the list elements to the given {@code Class<T>}.  This is useful to avoid having
+     * casts in client code, though the effect is the same.
      *
-     * <p>With the default {@link JsonWriterSettings} and {@link DocumentCodec}.</p>
+     * @param key   the key
+     * @param clazz the non-null class to cast the list value to
+     * @param <T>   the type of the class
+     * @return the list value of the given key, or null if the instance does not contain this key.
+     * @throws ClassCastException if the elements in the list value of the given key is not of type T or the value is not a list
+     * @since 3.10
+     */
+    public <T> List<T> getList(final Object key, final Class<T> clazz) {
+        notNull("clazz", clazz);
+        return constructValuesList(key, clazz, null);
+    }
+
+    /**
+     * Gets the list value of the given key, casting the list elements to {@code Class<T>} or returning the default list value if null.
+     * This is useful to avoid having casts in client code, though the effect is the same.
+     *
+     * @param key   the key
+     * @param clazz the non-null class to cast the list value to
+     * @param defaultValue what to return if the value is null
+     * @param <T>   the type of the class
+     * @return the list value of the given key, or the default list value if the instance does not contain this key.
+     * @throws ClassCastException if the value of the given key is not of type T
+     * @since 3.10
+     */
+    public <T> List<T> getList(final Object key, final Class<T> clazz, final List<T> defaultValue) {
+        notNull("defaultValue", defaultValue);
+        notNull("clazz", clazz);
+        return constructValuesList(key, clazz, defaultValue);
+    }
+
+
+    // Construct the list of values for the specified key, or return the default value if the value is null.
+    // A ClassCastException will be thrown if an element in the list is not of type T.
+    @SuppressWarnings("unchecked")
+    private <T> List<T> constructValuesList(final Object key, final Class<T> clazz, final List<T> defaultValue) {
+        List<?> value = get(key, List.class);
+        if (value == null) {
+            return defaultValue;
+        }
+
+        for (Object item : value) {
+            if (!clazz.isAssignableFrom(item.getClass())) {
+                throw new ClassCastException(format("List element cannot be cast to %s", clazz.getName()));
+            }
+        }
+        return (List<T>) value;
+    }
+
+    /**
+     * Gets a JSON representation of this document using the {@link org.bson.json.JsonMode#STRICT} output mode, and otherwise the default
+     * settings of {@link JsonWriterSettings.Builder} and {@link DocumentCodec}.
      *
      * @return a JSON representation of this document
      * @throws org.bson.codecs.configuration.CodecConfigurationException if the document contains types not in the default registry
+     * @see #toJson(JsonWriterSettings)
+     * @see JsonWriterSettings
      */
+    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(new JsonWriterSettings());
     }
@@ -277,6 +421,7 @@ public String toJson(final JsonWriterSettings writerSettings) {
      * @return a JSON representation of this document
      * @throws org.bson.codecs.configuration.CodecConfigurationException if the registry does not contain a codec for the document values.
      */
+    @SuppressWarnings("deprecation")
     public String toJson(final Encoder<Document> encoder) {
         return toJson(new JsonWriterSettings(), encoder);
     }
@@ -291,7 +436,7 @@ public String toJson(final Encoder<Document> encoder) {
      */
     public String toJson(final JsonWriterSettings writerSettings, final Encoder<Document> encoder) {
         JsonWriter writer = new JsonWriter(new StringWriter(), writerSettings);
-        encoder.encode(writer, this, EncoderContext.builder().isEncodingCollectibleDocument(true).build());
+        encoder.encode(writer, this, EncoderContext.builder().build());
         return writer.getWriter().toString();
     }
 
diff --git a/driver/src/main/org/bson/EmptyBSONCallback.java b/bson/src/main/org/bson/EmptyBSONCallback.java
similarity index 95%
rename from driver/src/main/org/bson/EmptyBSONCallback.java
rename to bson/src/main/org/bson/EmptyBSONCallback.java
index d847b7a05c0..d7714f39407 100644
--- a/driver/src/main/org/bson/EmptyBSONCallback.java
+++ b/bson/src/main/org/bson/EmptyBSONCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson;
 
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
 /**
@@ -108,6 +109,11 @@ public void gotLong(final String name, final long value) {
         throw new UnsupportedOperationException("Operation is not supported");
     }
 
+    @Override
+    public void gotDecimal128(final String name, final Decimal128 value) {
+        throw new UnsupportedOperationException("Operation is not supported");
+    }
+
     @Override
     public void gotDate(final String name, final long millis) {
         throw new UnsupportedOperationException("Operation is not supported");
diff --git a/bson/src/main/org/bson/FieldNameValidator.java b/bson/src/main/org/bson/FieldNameValidator.java
index 89d7b1e58b6..bb528da90d6 100644
--- a/bson/src/main/org/bson/FieldNameValidator.java
+++ b/bson/src/main/org/bson/FieldNameValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/LazyBSONCallback.java b/bson/src/main/org/bson/LazyBSONCallback.java
similarity index 98%
rename from driver/src/main/org/bson/LazyBSONCallback.java
rename to bson/src/main/org/bson/LazyBSONCallback.java
index 060c3245538..6ae03ce8cce 100644
--- a/driver/src/main/org/bson/LazyBSONCallback.java
+++ b/bson/src/main/org/bson/LazyBSONCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/LazyBSONDecoder.java b/bson/src/main/org/bson/LazyBSONDecoder.java
similarity index 98%
rename from driver/src/main/org/bson/LazyBSONDecoder.java
rename to bson/src/main/org/bson/LazyBSONDecoder.java
index db2e80e9dd3..c133482d544 100644
--- a/driver/src/main/org/bson/LazyBSONDecoder.java
+++ b/bson/src/main/org/bson/LazyBSONDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/LazyBSONList.java b/bson/src/main/org/bson/LazyBSONList.java
similarity index 99%
rename from driver/src/main/org/bson/LazyBSONList.java
rename to bson/src/main/org/bson/LazyBSONList.java
index 5f2f62f4b79..2e6137171f5 100644
--- a/driver/src/main/org/bson/LazyBSONList.java
+++ b/bson/src/main/org/bson/LazyBSONList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/LazyBSONObject.java b/bson/src/main/org/bson/LazyBSONObject.java
similarity index 77%
rename from driver/src/main/org/bson/LazyBSONObject.java
rename to bson/src/main/org/bson/LazyBSONObject.java
index 42a01bbe6fe..ffce92712bf 100644
--- a/driver/src/main/org/bson/LazyBSONObject.java
+++ b/bson/src/main/org/bson/LazyBSONObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.bson;
 
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.UuidCodec;
 import org.bson.io.ByteBufferBsonInput;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Binary;
@@ -27,27 +29,32 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 import java.util.AbstractMap;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.regex.Pattern;
 
-import static org.bson.io.Bits.readLong;
+import static org.bson.BsonBinarySubType.BINARY;
+import static org.bson.BsonBinarySubType.OLD_BINARY;
 
 /**
  * An immutable {@code BSONObject} backed by a byte buffer that lazily provides keys and values on request. This is useful for transferring
  * BSON documents between servers when you don't want to pay the performance penalty of encoding or decoding them fully.
  */
+@SuppressWarnings("deprecation")
 public class LazyBSONObject implements BSONObject {
     private final byte[] bytes;
     private final int offset;
@@ -168,12 +175,13 @@ Object readValue(final BsonBinaryReader reader) {
             case STRING:
                 return reader.readString();
             case BINARY:
+                byte binarySubType = reader.peekBinarySubType();
+                if (BsonBinarySubType.isUuid(binarySubType) && reader.peekBinarySize() == 16) {
+                    return new UuidCodec(UuidRepresentation.JAVA_LEGACY).decode(reader, DecoderContext.builder().build());
+                }
                 BsonBinary binary = reader.readBinaryData();
-                byte binaryType = binary.getType();
-                if (binaryType == BsonBinarySubType.BINARY.getValue() || binaryType == BsonBinarySubType.OLD_BINARY.getValue()) {
+                if (binarySubType == BINARY.getValue() || binarySubType == OLD_BINARY.getValue()) {
                     return binary.getData();
-                } else if (binaryType == BsonBinarySubType.UUID_LEGACY.getValue()) {
-                    return new UUID(readLong(binary.getData(), 0), readLong(binary.getData(), 8));
                 } else {
                     return new Binary(binary.getType(), binary.getData());
                 }
@@ -203,7 +211,7 @@ Object readValue(final BsonBinaryReader reader) {
             case SYMBOL:
                 return new Symbol(reader.readSymbol());
             case JAVASCRIPT_WITH_SCOPE:
-                return new CodeWScope(reader.readJavaScriptWithScope(), (BSONObject) readDocument(reader));
+                return new CodeWScope(reader.readJavaScriptWithScope(), (BSONObject) readJavaScriptWithScopeDocument(reader));
             case INT32:
                 return reader.readInt32();
             case TIMESTAMP:
@@ -211,6 +219,8 @@ Object readValue(final BsonBinaryReader reader) {
                 return new BSONTimestamp(timestamp.getTime(), timestamp.getInc());
             case INT64:
                 return reader.readInt64();
+            case DECIMAL128:
+                return reader.readDecimal128();
             case MIN_KEY:
                 reader.readMinKey();
                 return new MinKey();
@@ -229,6 +239,12 @@ private Object readArray(final BsonBinaryReader reader) {
     }
 
     private Object readDocument(final BsonBinaryReader reader) {
+        int position = reader.getBsonInput().getPosition();
+        reader.skipValue();
+        return callback.createObject(bytes, offset + position);
+    }
+
+    private Object readJavaScriptWithScopeDocument(final BsonBinaryReader reader) {
         int position = reader.getBsonInput().getPosition();
         reader.readStartDocument();
         while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
@@ -247,8 +263,8 @@ BsonBinaryReader getBsonReader() {
     private ByteBuffer getBufferForInternalBytes() {
         ByteBuffer buffer = ByteBuffer.wrap(bytes, offset, bytes.length - offset).slice();
         buffer.order(ByteOrder.LITTLE_ENDIAN);
-        buffer.limit(buffer.getInt());
-        buffer.rewind();
+        ((Buffer) buffer).limit(buffer.getInt());
+        ((Buffer) buffer).rewind();
         return buffer;
     }
 
@@ -283,12 +299,12 @@ public int pipe(final OutputStream os) throws IOException {
     }
 
     /**
-     * Gets the entry set for all the key/value pairs in this {@code BSONObject}.
+     * Gets the entry set for all the key/value pairs in this {@code BSONObject}.  The returned set is immutable.
      *
      * @return then entry set
      */
     public Set<Map.Entry<String, Object>> entrySet() {
-        Set<Map.Entry<String, Object>> entries = new LinkedHashSet<Map.Entry<String, Object>>();
+        final List<Map.Entry<String, Object>> entries = new ArrayList<Map.Entry<String, Object>>();
         BsonBinaryReader reader = getBsonReader();
         try {
             reader.readStartDocument();
@@ -299,12 +315,82 @@ public Set<Map.Entry<String, Object>> entrySet() {
         } finally {
             reader.close();
         }
-        return Collections.unmodifiableSet(entries);
+        return new Set<Map.Entry<String, Object>>() {
+            @Override
+            public int size() {
+                return entries.size();
+            }
+
+            @Override
+            public boolean isEmpty() {
+                return entries.isEmpty();
+            }
+
+            @Override
+            public Iterator<Map.Entry<String, Object>> iterator() {
+                return entries.iterator();
+            }
+
+            @Override
+            public Object[] toArray() {
+                return entries.toArray();
+            }
+
+            @Override
+            public <T> T[] toArray(final T[] a) {
+                return entries.toArray(a);
+            }
+
+            @Override
+            public boolean contains(final Object o) {
+                return entries.contains(o);
+            }
+
+            @Override
+            public boolean containsAll(final Collection<?> c) {
+                return entries.containsAll(c);
+            }
+
+            @Override
+            public boolean add(final Map.Entry<String, Object> stringObjectEntry) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean remove(final Object o) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean addAll(final Collection<? extends Map.Entry<String, Object>> c) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean retainAll(final Collection<?> c) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean removeAll(final Collection<?> c) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void clear() {
+                throw new UnsupportedOperationException();
+            }
+        };
     }
 
     @Override
     public int hashCode() {
-        return Arrays.hashCode(bytes);
+        int result = 1;
+        int size = getBSONSize();
+        for (int i = offset; i < offset + size; i++) {
+            result = 31 * result + bytes[i];
+        }
+        return result;
     }
 
     @Override
@@ -344,15 +430,6 @@ public boolean equals(final Object o) {
         return true;
     }
 
-    /**
-     * Returns a JSON serialization of this object
-     *
-     * @return JSON serialization
-     */
-    public String toString() {
-        return com.mongodb.util.JSON.serialize(this);
-    }
-
 
     /* ----------------- Unsupported operations --------------------- */
 
diff --git a/bson/src/main/org/bson/NoOpFieldNameValidator.java b/bson/src/main/org/bson/NoOpFieldNameValidator.java
index 5cbb229430d..9d47705f574 100644
--- a/bson/src/main/org/bson/NoOpFieldNameValidator.java
+++ b/bson/src/main/org/bson/NoOpFieldNameValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/RawBsonArray.java b/bson/src/main/org/bson/RawBsonArray.java
new file mode 100644
index 00000000000..6e5c239980a
--- /dev/null
+++ b/bson/src/main/org/bson/RawBsonArray.java
@@ -0,0 +1,363 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson;
+
+import org.bson.io.ByteBufferBsonInput;
+
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.AbstractList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
+import static org.bson.assertions.Assertions.isTrueArgument;
+import static org.bson.assertions.Assertions.notNull;
+
+/**
+ * An immutable BSON array that is represented using only the raw bytes.
+ *
+ * @since 3.7
+ */
+public class RawBsonArray extends BsonArray implements Serializable {
+    private static final long serialVersionUID = 2L;
+    private static final String IMMUTABLE_MSG = "RawBsonArray instances are immutable";
+
+    private final transient RawBsonArrayList delegate;
+
+    /**
+     * Constructs a new instance with the given byte array. Note that it does not make a copy of the array, so do not modify it after
+     * passing it to this constructor.
+     *
+     * @param bytes the bytes representing a BSON document. Note that the byte array is NOT copied, so care must be taken not to modify it
+     *              after passing it to this construction, unless of course that is your intention.
+     */
+    public RawBsonArray(final byte[] bytes) {
+        this(notNull("bytes", bytes), 0, bytes.length);
+    }
+
+    /**
+     * Constructs a new instance with the given byte array, offset, and length. Note that it does not make a copy of the array, so do not
+     * modify it after passing it to this constructor.
+     *
+     * @param bytes the bytes representing a BSON document.  Note that the byte array is NOT copied, so care must be taken not to modify it
+     *              after passing it to this construction, unless of course that is your intention.
+     * @param offset the offset into the byte array
+     * @param length the length of the subarray to use
+     */
+    public RawBsonArray(final byte[] bytes, final int offset, final int length) {
+        this(new RawBsonArrayList(bytes, offset, length));
+    }
+
+    private RawBsonArray(final RawBsonArrayList values) {
+        super(values, false);
+        this.delegate = values;
+    }
+
+    ByteBuf getByteBuffer() {
+        return delegate.getByteBuffer();
+    }
+
+    @Override
+    public boolean add(final BsonValue bsonValue) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public boolean remove(final Object o) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public boolean addAll(final Collection<? extends BsonValue> c) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public boolean addAll(final int index, final Collection<? extends BsonValue> c) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public boolean removeAll(final Collection<?> c) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public boolean retainAll(final Collection<?> c) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public BsonValue set(final int index, final BsonValue element) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public void add(final int index, final BsonValue element) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public BsonValue remove(final int index) {
+        throw new UnsupportedOperationException(IMMUTABLE_MSG);
+    }
+
+    @Override
+    public BsonArray clone() {
+        return new RawBsonArray(delegate.bytes.clone(), delegate.offset, delegate.length);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        return super.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    // see https://docs.oracle.com/javase/6/docs/platform/serialization/spec/output.html
+    private Object writeReplace() {
+        return new SerializationProxy(delegate.bytes, delegate.offset, delegate.length);
+    }
+
+    // see https://docs.oracle.com/javase/6/docs/platform/serialization/spec/input.html
+    private void readObject(final ObjectInputStream stream) throws InvalidObjectException {
+        throw new InvalidObjectException("Proxy required");
+    }
+
+    private static class SerializationProxy implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        private final byte[] bytes;
+
+        SerializationProxy(final byte[] bytes, final int offset, final int length) {
+            if (bytes.length == length) {
+                this.bytes = bytes;
+            } else {
+                this.bytes = new byte[length];
+                System.arraycopy(bytes, offset, this.bytes, 0, length);
+            }
+        }
+
+        private Object readResolve() {
+            return new RawBsonArray(bytes);
+        }
+    }
+
+    static class RawBsonArrayList extends AbstractList<BsonValue> {
+        private static final int MIN_BSON_ARRAY_SIZE = 5;
+        private Integer cachedSize;
+        private final byte[] bytes;
+        private final int offset;
+        private final int length;
+
+        RawBsonArrayList(final byte[] bytes, final int offset, final int length) {
+            notNull("bytes", bytes);
+            isTrueArgument("offset >= 0", offset >= 0);
+            isTrueArgument("offset < bytes.length", offset < bytes.length);
+            isTrueArgument("length <= bytes.length - offset", length <= bytes.length - offset);
+            isTrueArgument("length >= 5", length >= MIN_BSON_ARRAY_SIZE);
+            this.bytes = bytes;
+            this.offset = offset;
+            this.length = length;
+        }
+
+        @Override
+        public BsonValue get(final int index) {
+            if (index < 0) {
+                throw new IndexOutOfBoundsException();
+            }
+            int curIndex = 0;
+            BsonBinaryReader bsonReader = createReader();
+            try {
+                bsonReader.readStartDocument();
+                while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                    bsonReader.skipName();
+                    if (curIndex == index) {
+                        return RawBsonValueHelper.decode(bytes, bsonReader);
+                    }
+                    bsonReader.skipValue();
+                    curIndex++;
+                }
+                bsonReader.readEndDocument();
+            } finally {
+                bsonReader.close();
+            }
+            throw new IndexOutOfBoundsException();
+        }
+
+        @Override
+        public int size() {
+            if (cachedSize != null) {
+                return cachedSize;
+            }
+            int size = 0;
+            BsonBinaryReader bsonReader = createReader();
+            try {
+                bsonReader.readStartDocument();
+                while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                    size++;
+                    bsonReader.readName();
+                    bsonReader.skipValue();
+                }
+                bsonReader.readEndDocument();
+            } finally {
+                bsonReader.close();
+            }
+            cachedSize = size;
+            return cachedSize;
+        }
+
+        @Override
+        public Iterator<BsonValue> iterator() {
+            return new Itr();
+        }
+
+        @Override
+        public ListIterator<BsonValue> listIterator() {
+            return new ListItr(0);
+        }
+
+        @Override
+        public ListIterator<BsonValue> listIterator(final int index) {
+            return new ListItr(index);
+        }
+
+        private class Itr implements Iterator<BsonValue> {
+            private int cursor = 0;
+            private BsonBinaryReader bsonReader;
+            private int currentPosition = 0;
+
+            Itr() {
+                this(0);
+            }
+
+            Itr(final int cursorPosition) {
+                setIterator(cursorPosition);
+            }
+
+            public boolean hasNext() {
+                boolean hasNext = cursor != size();
+                if (!hasNext) {
+                    bsonReader.close();
+                }
+                return hasNext;
+            }
+
+            public BsonValue next() {
+                while (cursor > currentPosition && bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                    bsonReader.skipName();
+                    bsonReader.skipValue();
+                    currentPosition++;
+                }
+
+                if (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                    bsonReader.skipName();
+                    cursor += 1;
+                    currentPosition = cursor;
+                    return RawBsonValueHelper.decode(bytes, bsonReader);
+                } else {
+                    bsonReader.close();
+                    throw new NoSuchElementException();
+                }
+            }
+
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException(IMMUTABLE_MSG);
+            }
+
+            public int getCursor() {
+                return cursor;
+            }
+
+            public void setCursor(final int cursor) {
+                this.cursor = cursor;
+            }
+
+            void setIterator(final int cursorPosition) {
+                cursor = cursorPosition;
+                currentPosition = 0;
+                if (bsonReader != null) {
+                    bsonReader.close();
+                }
+                bsonReader = createReader();
+                bsonReader.readStartDocument();
+            }
+        }
+
+        private class ListItr extends Itr implements ListIterator<BsonValue> {
+            ListItr(final int index) {
+                super(index);
+            }
+
+            public boolean hasPrevious() {
+                return getCursor() != 0;
+            }
+
+            public BsonValue previous() {
+                try {
+                    BsonValue previous = get(previousIndex());
+                    setIterator(previousIndex());
+                    return previous;
+                } catch (IndexOutOfBoundsException e) {
+                    throw new NoSuchElementException();
+                }
+            }
+
+            public int nextIndex() {
+                return getCursor();
+            }
+
+            public int previousIndex() {
+                return getCursor() - 1;
+            }
+
+            @Override
+            public void set(final BsonValue bsonValue) {
+                throw new UnsupportedOperationException(IMMUTABLE_MSG);
+            }
+
+            @Override
+            public void add(final BsonValue bsonValue) {
+                throw new UnsupportedOperationException(IMMUTABLE_MSG);
+            }
+        }
+
+        private BsonBinaryReader createReader() {
+            return new BsonBinaryReader(new ByteBufferBsonInput(getByteBuffer()));
+        }
+
+        ByteBuf getByteBuffer() {
+            ByteBuffer buffer = ByteBuffer.wrap(bytes, offset, length);
+            buffer.order(ByteOrder.LITTLE_ENDIAN);
+            return new ByteBufNIO(buffer);
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/RawBsonDocument.java b/bson/src/main/org/bson/RawBsonDocument.java
index b00e0dbacc5..b4c9112823e 100644
--- a/bson/src/main/org/bson/RawBsonDocument.java
+++ b/bson/src/main/org/bson/RawBsonDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,11 @@
 package org.bson;
 
 import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.BsonValueCodecProvider;
 import org.bson.codecs.Codec;
+import org.bson.codecs.Decoder;
 import org.bson.codecs.DecoderContext;
 import org.bson.codecs.EncoderContext;
 import org.bson.codecs.RawBsonDocumentCodec;
-import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.io.BasicOutputBuffer;
 import org.bson.io.ByteBufferBsonInput;
 import org.bson.json.JsonReader;
@@ -37,12 +36,11 @@
 import java.nio.ByteOrder;
 import java.util.Collection;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import static org.bson.assertions.Assertions.isTrueArgument;
 import static org.bson.assertions.Assertions.notNull;
-import static org.bson.codecs.BsonValueCodecProvider.getClassForBsonType;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 
 /**
  * An immutable BSON document that is represented using only the raw bytes.
@@ -53,8 +51,6 @@ public final class RawBsonDocument extends BsonDocument {
     private static final long serialVersionUID = 1L;
     private static final int MIN_BSON_DOCUMENT_SIZE = 5;
 
-    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
-
     private final byte[] bytes;
     private final int offset;
     private final int length;
@@ -147,9 +143,21 @@ public ByteBuf getByteBuffer() {
      * @return the decoded document
      */
     public <T> T decode(final Codec<T> codec) {
+        return decode((Decoder<T>) codec);
+    }
+
+    /**
+     * Decode this into a document.
+     *
+     * @param decoder the decoder to facilitate the transformation
+     * @param <T>   the BSON type that the codec encodes/decodes
+     * @return the decoded document
+     * @since 3.6
+     */
+    public <T> T decode(final Decoder<T> decoder) {
         BsonBinaryReader reader = createReader();
         try {
-            return codec.decode(reader, DecoderContext.builder().build());
+            return decoder.decode(reader, DecoderContext.builder().build());
         } finally {
             reader.close();
         }
@@ -230,6 +238,21 @@ public Set<String> keySet() {
         return toBsonDocument().keySet();
     }
 
+    @Override
+    public String getFirstKey() {
+        BsonBinaryReader bsonReader = createReader();
+        try {
+            bsonReader.readStartDocument();
+            try {
+                return bsonReader.readName();
+            } catch (BsonInvalidOperationException e) {
+                throw new NoSuchElementException();
+            }
+        } finally {
+            bsonReader.close();
+        }
+    }
+
     @Override
     public boolean containsKey(final Object key) {
         if (key == null) {
@@ -260,7 +283,7 @@ public boolean containsValue(final Object value) {
             bsonReader.readStartDocument();
             while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
                 bsonReader.skipName();
-                if (deserializeBsonValue(bsonReader).equals(value)) {
+                if (RawBsonValueHelper.decode(bytes, bsonReader).equals(value)) {
                     return true;
                 }
             }
@@ -281,7 +304,7 @@ public BsonValue get(final Object key) {
             bsonReader.readStartDocument();
             while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
                 if (bsonReader.readName().equals(key)) {
-                    return deserializeBsonValue(bsonReader);
+                    return RawBsonValueHelper.decode(bytes, bsonReader);
                 }
                 bsonReader.skipValue();
             }
@@ -294,6 +317,7 @@ public BsonValue get(final Object key) {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(new JsonWriterSettings());
     }
@@ -320,10 +344,6 @@ public BsonDocument clone() {
         return new RawBsonDocument(bytes.clone(), offset, length);
     }
 
-    private BsonValue deserializeBsonValue(final BsonBinaryReader bsonReader) {
-        return REGISTRY.get(getClassForBsonType(bsonReader.getCurrentBsonType())).decode(bsonReader, DecoderContext.builder().build());
-    }
-
     private BsonBinaryReader createReader() {
         return new BsonBinaryReader(new ByteBufferBsonInput(getByteBuffer()));
     }
@@ -352,7 +372,7 @@ private static class SerializationProxy implements Serializable {
 
         private final byte[] bytes;
 
-        public SerializationProxy(final byte[] bytes, final int offset, final int length) {
+        SerializationProxy(final byte[] bytes, final int offset, final int length) {
             if (bytes.length == length) {
                 this.bytes = bytes;
             } else {
diff --git a/bson/src/main/org/bson/RawBsonValueHelper.java b/bson/src/main/org/bson/RawBsonValueHelper.java
new file mode 100644
index 00000000000..864d285a1a6
--- /dev/null
+++ b/bson/src/main/org/bson/RawBsonValueHelper.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson;
+
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.io.BsonInputMark;
+
+import static org.bson.codecs.BsonValueCodecProvider.getClassForBsonType;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+final class RawBsonValueHelper {
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+
+    static BsonValue decode(final byte[] bytes, final BsonBinaryReader bsonReader) {
+        if (bsonReader.getCurrentBsonType() == BsonType.DOCUMENT || bsonReader.getCurrentBsonType() == BsonType.ARRAY) {
+            int position = bsonReader.getBsonInput().getPosition();
+            BsonInputMark mark = bsonReader.getBsonInput().getMark(4);
+            int size = bsonReader.getBsonInput().readInt32();
+            mark.reset();
+            bsonReader.skipValue();
+            if (bsonReader.getCurrentBsonType() == BsonType.DOCUMENT) {
+                return new RawBsonDocument(bytes, position, size);
+            } else {
+                return new RawBsonArray(bytes, position, size);
+            }
+        } else {
+            return REGISTRY.get(getClassForBsonType(bsonReader.getCurrentBsonType())).decode(bsonReader, DecoderContext.builder().build());
+        }
+    }
+
+    private RawBsonValueHelper() {
+    }
+}
diff --git a/bson/src/main/org/bson/StringUtils.java b/bson/src/main/org/bson/StringUtils.java
index d6fe73aa29c..a6017fc88a9 100644
--- a/bson/src/main/org/bson/StringUtils.java
+++ b/bson/src/main/org/bson/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/Transformer.java b/bson/src/main/org/bson/Transformer.java
index 0a0e54a14ca..edf4a82b2bb 100644
--- a/bson/src/main/org/bson/Transformer.java
+++ b/bson/src/main/org/bson/Transformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/UuidRepresentation.java b/bson/src/main/org/bson/UuidRepresentation.java
index d696d5c6274..58fdbe3e6ae 100644
--- a/bson/src/main/org/bson/UuidRepresentation.java
+++ b/bson/src/main/org/bson/UuidRepresentation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,14 @@
  * @since 3.0
  */
 public enum UuidRepresentation {
+
+    /**
+     * An unspecified representation of UUID.  Essentially, this is the null representation value.
+     *
+     * @since 3.12
+     */
+    UNSPECIFIED,
+
     /**
      * The canonical representation of UUID
      *
diff --git a/bson/src/main/org/bson/assertions/Assertions.java b/bson/src/main/org/bson/assertions/Assertions.java
index 3ca0b14862e..e3de9f1eaf1 100644
--- a/bson/src/main/org/bson/assertions/Assertions.java
+++ b/bson/src/main/org/bson/assertions/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -63,6 +63,25 @@ public static void isTrueArgument(final String name, final boolean condition) {
         }
     }
 
+    /**
+     * Throw IllegalArgumentException if the condition if false, otherwise return the value.  This is useful when arguments must be checked
+     * within an expression, as when using {@code this} to call another constructor, which must be the first line of the calling
+     * constructor.
+     *
+     * @param <T>       the value type
+     * @param name      the name of the state that is being checked
+     * @param value     the value of the argument
+     * @param condition the condition about the parameter to check
+     * @return          the value
+     * @throws java.lang.IllegalArgumentException if the condition is false
+     */
+    public static <T> T isTrueArgument(final String name, final T value, final boolean condition) {
+        if (!condition) {
+            throw new IllegalArgumentException("state should be: " + name);
+        }
+        return value;
+    }
+
     /**
      * Cast an object to the given class and return it, or throw IllegalArgumentException if it's not assignable to that class.
      *
diff --git a/bson/src/main/org/bson/assertions/package-info.java b/bson/src/main/org/bson/assertions/package-info.java
index 9bd358c890a..c098c82b4be 100644
--- a/bson/src/main/org/bson/assertions/package-info.java
+++ b/bson/src/main/org/bson/assertions/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bson/src/main/org/bson/codecs/AtomicBooleanCodec.java b/bson/src/main/org/bson/codecs/AtomicBooleanCodec.java
index fcde2127829..f04d286f09a 100644
--- a/bson/src/main/org/bson/codecs/AtomicBooleanCodec.java
+++ b/bson/src/main/org/bson/codecs/AtomicBooleanCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/AtomicIntegerCodec.java b/bson/src/main/org/bson/codecs/AtomicIntegerCodec.java
index f441ae55c9a..8fd3e55876b 100644
--- a/bson/src/main/org/bson/codecs/AtomicIntegerCodec.java
+++ b/bson/src/main/org/bson/codecs/AtomicIntegerCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.bson.codecs.NumberCodecHelper.decodeInt;
+
 /**
  * Encodes and decodes {@code AtomicInteger} objects.
  *
@@ -28,6 +30,7 @@
  */
 
 public class AtomicIntegerCodec implements Codec<AtomicInteger> {
+
     @Override
     public void encode(final BsonWriter writer, final AtomicInteger value, final EncoderContext encoderContext) {
         writer.writeInt32(value.intValue());
@@ -35,7 +38,7 @@ public void encode(final BsonWriter writer, final AtomicInteger value, final Enc
 
     @Override
     public AtomicInteger decode(final BsonReader reader, final DecoderContext decoderContext) {
-        return new AtomicInteger(reader.readInt32());
+        return new AtomicInteger(decodeInt(reader));
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/AtomicLongCodec.java b/bson/src/main/org/bson/codecs/AtomicLongCodec.java
index 4efe618ef77..c6e053c6d9f 100644
--- a/bson/src/main/org/bson/codecs/AtomicLongCodec.java
+++ b/bson/src/main/org/bson/codecs/AtomicLongCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.bson.codecs.NumberCodecHelper.decodeLong;
+
 /**
  * Encodes and decodes {@code AtomicLong} objects.
  *
@@ -28,6 +30,7 @@
  */
 
 public class AtomicLongCodec implements Codec<AtomicLong> {
+
     @Override
     public void encode(final BsonWriter writer, final AtomicLong value, final EncoderContext encoderContext) {
         writer.writeInt64(value.longValue());
@@ -35,7 +38,7 @@ public void encode(final BsonWriter writer, final AtomicLong value, final Encode
 
     @Override
     public AtomicLong decode(final BsonReader reader, final DecoderContext decoderContext) {
-        return new AtomicLong(reader.readInt64());
+        return new AtomicLong(decodeLong(reader));
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/BigDecimalCodec.java b/bson/src/main/org/bson/codecs/BigDecimalCodec.java
new file mode 100644
index 00000000000..8ad6d555baa
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/BigDecimalCodec.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.types.Decimal128;
+
+import java.math.BigDecimal;
+
+/**
+ * Encodes and decodes {@code BigDecimal} objects.
+ *
+ * @since 3.5
+ */
+public final class BigDecimalCodec implements Codec<BigDecimal> {
+
+    @Override
+    public void encode(final BsonWriter writer, final BigDecimal value, final EncoderContext encoderContext) {
+        writer.writeDecimal128(new Decimal128(value));
+    }
+
+    @Override
+    public BigDecimal decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return reader.readDecimal128().bigDecimalValue();
+    }
+
+    @Override
+    public Class<BigDecimal> getEncoderClass() {
+        return BigDecimal.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/BinaryCodec.java b/bson/src/main/org/bson/codecs/BinaryCodec.java
index f2dc08e1ded..cb6c6dbac41 100644
--- a/bson/src/main/org/bson/codecs/BinaryCodec.java
+++ b/bson/src/main/org/bson/codecs/BinaryCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BooleanCodec.java b/bson/src/main/org/bson/codecs/BooleanCodec.java
index d32b8a2d44c..79206748527 100644
--- a/bson/src/main/org/bson/codecs/BooleanCodec.java
+++ b/bson/src/main/org/bson/codecs/BooleanCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonArrayCodec.java b/bson/src/main/org/bson/codecs/BsonArrayCodec.java
index 0fbc315b344..9f9c11a1859 100644
--- a/bson/src/main/org/bson/codecs/BsonArrayCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonArrayCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 
 /**
  * A codec for BsonArray instances.
@@ -34,8 +35,20 @@
  * @since 3.0
  */
 public class BsonArrayCodec implements Codec<BsonArray> {
+
+    private static final CodecRegistry DEFAULT_REGISTRY = fromProviders(new BsonValueCodecProvider());
+
     private final CodecRegistry codecRegistry;
 
+    /**
+     * Creates a new instance with a default codec registry that uses the {@link BsonValueCodecProvider}.
+     *
+     * @since 3.4
+     */
+    public BsonArrayCodec() {
+        this(DEFAULT_REGISTRY);
+    }
+
     /**
      * Construct an instance with the given registry
      *
diff --git a/bson/src/main/org/bson/codecs/BsonBinaryCodec.java b/bson/src/main/org/bson/codecs/BsonBinaryCodec.java
index 04ece05e348..9790b972ea0 100644
--- a/bson/src/main/org/bson/codecs/BsonBinaryCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonBinaryCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonBooleanCodec.java b/bson/src/main/org/bson/codecs/BsonBooleanCodec.java
index ae9549f017a..aabdb10df82 100644
--- a/bson/src/main/org/bson/codecs/BsonBooleanCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonBooleanCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonCodec.java b/bson/src/main/org/bson/codecs/BsonCodec.java
new file mode 100644
index 00000000000..f7e81a0bb3f
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/BsonCodec.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonDocument;
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import static java.lang.String.format;
+
+/**
+ * A codec for encoding Bson Implementations
+ *
+ * @since 3.11
+ */
+public class BsonCodec implements Codec<Bson> {
+    private static final Codec<BsonDocument> BSON_DOCUMENT_CODEC = new BsonDocumentCodec();
+    private final CodecRegistry registry;
+
+    /**
+     * Create a new instance
+     *
+     * @param registry the codec registry
+     */
+    public BsonCodec(final CodecRegistry registry) {
+        this.registry = registry;
+    }
+
+    @Override
+    public Bson decode(final BsonReader reader, final DecoderContext decoderContext) {
+        throw new UnsupportedOperationException("The BsonCodec can only encode to Bson");
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final Bson value, final EncoderContext encoderContext) {
+        try {
+            BsonDocument bsonDocument = value.toBsonDocument(BsonDocument.class, registry);
+            BSON_DOCUMENT_CODEC.encode(writer, bsonDocument, encoderContext);
+        } catch (Exception e) {
+            throw new CodecConfigurationException(format("Unable to encode a Bson implementation: %s", value), e);
+        }
+    }
+
+    @Override
+    public Class<Bson> getEncoderClass() {
+        return Bson.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/BsonCodecProvider.java b/bson/src/main/org/bson/codecs/BsonCodecProvider.java
new file mode 100644
index 00000000000..8761c617dfd
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/BsonCodecProvider.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+/**
+ * A codec for encoding simple Bson interface implementations
+ *
+ * @since 3.11
+ */
+public class BsonCodecProvider implements CodecProvider {
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
+        if (Bson.class.isAssignableFrom(clazz)) {
+            return (Codec<T>) new BsonCodec(registry);
+        }
+        return null;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/BsonDBPointerCodec.java b/bson/src/main/org/bson/codecs/BsonDBPointerCodec.java
index 8d6371c5889..eabb6fce153 100644
--- a/bson/src/main/org/bson/codecs/BsonDBPointerCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonDBPointerCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonDateTimeCodec.java b/bson/src/main/org/bson/codecs/BsonDateTimeCodec.java
index 5f1b6d32cfe..0ec7dcc20ae 100644
--- a/bson/src/main/org/bson/codecs/BsonDateTimeCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonDateTimeCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonDecimal128Codec.java b/bson/src/main/org/bson/codecs/BsonDecimal128Codec.java
new file mode 100644
index 00000000000..576e30536fb
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/BsonDecimal128Codec.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonDecimal128;
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+
+/**
+ * A Codec for BsonDecimal128 instances.
+ *
+ * @since 3.4
+ */
+public class BsonDecimal128Codec implements Codec<BsonDecimal128> {
+    @Override
+    public BsonDecimal128 decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return new BsonDecimal128(reader.readDecimal128());
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final BsonDecimal128 value, final EncoderContext encoderContext) {
+        writer.writeDecimal128(value.getValue());
+    }
+
+    @Override
+    public Class<BsonDecimal128> getEncoderClass() {
+        return BsonDecimal128.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/BsonDocumentCodec.java b/bson/src/main/org/bson/codecs/BsonDocumentCodec.java
index 271b1607b25..7e45e30abcd 100644
--- a/bson/src/main/org/bson/codecs/BsonDocumentCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonDocumentCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonDocumentWrapperCodec.java b/bson/src/main/org/bson/codecs/BsonDocumentWrapperCodec.java
index 60a0489bcce..70df3a677e1 100644
--- a/bson/src/main/org/bson/codecs/BsonDocumentWrapperCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonDocumentWrapperCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonDoubleCodec.java b/bson/src/main/org/bson/codecs/BsonDoubleCodec.java
index ad829dd23be..ea135c3ec6b 100644
--- a/bson/src/main/org/bson/codecs/BsonDoubleCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonDoubleCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonInt32Codec.java b/bson/src/main/org/bson/codecs/BsonInt32Codec.java
index b8328532e01..76ca33b8cb3 100644
--- a/bson/src/main/org/bson/codecs/BsonInt32Codec.java
+++ b/bson/src/main/org/bson/codecs/BsonInt32Codec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonInt64Codec.java b/bson/src/main/org/bson/codecs/BsonInt64Codec.java
index 147a816b3b4..df7a3e0f266 100644
--- a/bson/src/main/org/bson/codecs/BsonInt64Codec.java
+++ b/bson/src/main/org/bson/codecs/BsonInt64Codec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonJavaScriptCodec.java b/bson/src/main/org/bson/codecs/BsonJavaScriptCodec.java
index 9b4cdcaa459..1a0f0efe1ca 100644
--- a/bson/src/main/org/bson/codecs/BsonJavaScriptCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonJavaScriptCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonJavaScriptWithScopeCodec.java b/bson/src/main/org/bson/codecs/BsonJavaScriptWithScopeCodec.java
index 04b349e4b15..cd55b0cf9de 100644
--- a/bson/src/main/org/bson/codecs/BsonJavaScriptWithScopeCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonJavaScriptWithScopeCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonMaxKeyCodec.java b/bson/src/main/org/bson/codecs/BsonMaxKeyCodec.java
index 32e065db7d6..17f9ff22303 100644
--- a/bson/src/main/org/bson/codecs/BsonMaxKeyCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonMaxKeyCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonMinKeyCodec.java b/bson/src/main/org/bson/codecs/BsonMinKeyCodec.java
index 20e13ac8cd0..fd2cefb7082 100644
--- a/bson/src/main/org/bson/codecs/BsonMinKeyCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonMinKeyCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonNullCodec.java b/bson/src/main/org/bson/codecs/BsonNullCodec.java
index f88f186c25d..454f411e93c 100644
--- a/bson/src/main/org/bson/codecs/BsonNullCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonNullCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonObjectIdCodec.java b/bson/src/main/org/bson/codecs/BsonObjectIdCodec.java
index abde6401b02..9044ffc9769 100644
--- a/bson/src/main/org/bson/codecs/BsonObjectIdCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonObjectIdCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonRegularExpressionCodec.java b/bson/src/main/org/bson/codecs/BsonRegularExpressionCodec.java
index 6b34220b2af..e9efde5fadc 100644
--- a/bson/src/main/org/bson/codecs/BsonRegularExpressionCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonRegularExpressionCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonStringCodec.java b/bson/src/main/org/bson/codecs/BsonStringCodec.java
index 0222e6d13e7..837bd7ee1a2 100644
--- a/bson/src/main/org/bson/codecs/BsonStringCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonStringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonSymbolCodec.java b/bson/src/main/org/bson/codecs/BsonSymbolCodec.java
index 561dfdc8687..b68f85e3262 100644
--- a/bson/src/main/org/bson/codecs/BsonSymbolCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonSymbolCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonTimestampCodec.java b/bson/src/main/org/bson/codecs/BsonTimestampCodec.java
index 1171e8ca19e..95d64346275 100644
--- a/bson/src/main/org/bson/codecs/BsonTimestampCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonTimestampCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonTypeClassMap.java b/bson/src/main/org/bson/codecs/BsonTypeClassMap.java
index ad33e2d844d..3f441a557a7 100644
--- a/bson/src/main/org/bson/codecs/BsonTypeClassMap.java
+++ b/bson/src/main/org/bson/codecs/BsonTypeClassMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWithScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
@@ -33,6 +34,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -50,6 +52,7 @@
  *     <li><em>DOUBLE</em>: {@code java.lang.Double.class} </li>
  *     <li><em>INT32</em>: {@code java.lang.Integer.class} </li>
  *     <li><em>INT64</em>: {@code java.lang.Long.class} </li>
+ *     <li><em>DECIMAL128</em>: {@code org.bson.types.Decimal128.class} </li>
  *     <li><em>STRING</em>: {@code java.lang.String.class} </li>
  *     <li><em>BINARY</em>: {@code org.bson.types.Binary.class} </li>
  *     <li><em>OBJECT_ID</em>: {@code org.bson.types.ObjectId.class} </li>
@@ -102,6 +105,7 @@ public Class<?> get(final BsonType bsonType) {
     }
 
     private void addDefaults() {
+        map.put(BsonType.ARRAY, List.class);
         map.put(BsonType.BINARY, Binary.class);
         map.put(BsonType.BOOLEAN, Boolean.class);
         map.put(BsonType.DATE_TIME, Date.class);
@@ -110,6 +114,7 @@ private void addDefaults() {
         map.put(BsonType.DOUBLE, Double.class);
         map.put(BsonType.INT32, Integer.class);
         map.put(BsonType.INT64, Long.class);
+        map.put(BsonType.DECIMAL128, Decimal128.class);
         map.put(BsonType.MAX_KEY, MaxKey.class);
         map.put(BsonType.MIN_KEY, MinKey.class);
         map.put(BsonType.JAVASCRIPT, Code.class);
diff --git a/bson/src/main/org/bson/codecs/BsonTypeCodecMap.java b/bson/src/main/org/bson/codecs/BsonTypeCodecMap.java
index cdc669db799..510a6041a0b 100644
--- a/bson/src/main/org/bson/codecs/BsonTypeCodecMap.java
+++ b/bson/src/main/org/bson/codecs/BsonTypeCodecMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,19 +7,20 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.bson.codecs;
 
 import org.bson.BsonType;
+import org.bson.codecs.configuration.CodecConfigurationException;
 import org.bson.codecs.configuration.CodecRegistry;
 
+import static java.lang.String.format;
 import static org.bson.assertions.Assertions.notNull;
 
 /**
@@ -28,6 +29,7 @@
  * @since 3.3
  */
 public class BsonTypeCodecMap {
+    private final BsonTypeClassMap bsonTypeClassMap;
     private final Codec<?>[] codecs = new Codec<?>[256];
 
     /**
@@ -36,12 +38,16 @@ public class BsonTypeCodecMap {
      * @param codecRegistry the non-null CodecRegistry
      */
     public BsonTypeCodecMap(final BsonTypeClassMap bsonTypeClassMap, final CodecRegistry codecRegistry) {
-        notNull("bsonTypeClassMap", bsonTypeClassMap);
+        this.bsonTypeClassMap = notNull("bsonTypeClassMap", bsonTypeClassMap);
         notNull("codecRegistry", codecRegistry);
         for (BsonType cur : bsonTypeClassMap.keys()) {
             Class<?> clazz = bsonTypeClassMap.get(cur);
             if (clazz != null) {
-                codecs[cur.getValue()] = codecRegistry.get(clazz);
+                try {
+                    codecs[cur.getValue()] = codecRegistry.get(clazz);
+                } catch (CodecConfigurationException e) {
+                    // delay reporting this until the codec is actually requested
+                }
             }
         }
     }
@@ -53,6 +59,15 @@ public BsonTypeCodecMap(final BsonTypeClassMap bsonTypeClassMap, final CodecRegi
      * @return the non-null Codec
      */
     public Codec<?> get(final BsonType bsonType) {
-        return codecs[bsonType.getValue()];
+        Codec<?> codec = codecs[bsonType.getValue()];
+        if (codec == null) {
+            Class<?> clazz = bsonTypeClassMap.get(bsonType);
+            if (clazz == null) {
+                throw new CodecConfigurationException(format("No class mapped for BSON type %s.", bsonType));
+            } else {
+                throw new CodecConfigurationException(format("Can't find a codec for %s.", clazz));
+            }
+        }
+        return codec;
     }
 }
diff --git a/bson/src/main/org/bson/codecs/BsonUndefinedCodec.java b/bson/src/main/org/bson/codecs/BsonUndefinedCodec.java
index 52b0c7db312..7cebe50ad76 100644
--- a/bson/src/main/org/bson/codecs/BsonUndefinedCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonUndefinedCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/BsonValueCodec.java b/bson/src/main/org/bson/codecs/BsonValueCodec.java
index 56fe7ff7463..d8ecfd9fb28 100644
--- a/bson/src/main/org/bson/codecs/BsonValueCodec.java
+++ b/bson/src/main/org/bson/codecs/BsonValueCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bson/src/main/org/bson/codecs/BsonValueCodecProvider.java b/bson/src/main/org/bson/codecs/BsonValueCodecProvider.java
index a4e7792420f..312e72246db 100644
--- a/bson/src/main/org/bson/codecs/BsonValueCodecProvider.java
+++ b/bson/src/main/org/bson/codecs/BsonValueCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import org.bson.BsonBoolean;
 import org.bson.BsonDateTime;
 import org.bson.BsonDbPointer;
+import org.bson.BsonDecimal128;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWrapper;
 import org.bson.BsonDouble;
@@ -90,10 +91,6 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
             return (Codec<T>) codecs.get(clazz);
         }
 
-        if (clazz == BsonArray.class) {
-            return (Codec<T>) new BsonArrayCodec(registry);
-        }
-
         if (clazz == BsonJavaScriptWithScope.class) {
             return (Codec<T>) new BsonJavaScriptWithScopeCodec(registry.get(BsonDocument.class));
         }
@@ -114,6 +111,10 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
             return (Codec<T>) new BsonDocumentCodec(registry);
         }
 
+        if (BsonArray.class.isAssignableFrom(clazz)) {
+            return (Codec<T>) new BsonArrayCodec(registry);
+        }
+
         return null;
     }
 
@@ -126,6 +127,7 @@ private void addCodecs() {
         addCodec(new BsonDoubleCodec());
         addCodec(new BsonInt32Codec());
         addCodec(new BsonInt64Codec());
+        addCodec(new BsonDecimal128Codec());
         addCodec(new BsonMinKeyCodec());
         addCodec(new BsonMaxKeyCodec());
         addCodec(new BsonJavaScriptCodec());
@@ -154,6 +156,7 @@ private <T extends BsonValue> void addCodec(final Codec<T> codec) {
         map.put(BsonType.DOUBLE, BsonDouble.class);
         map.put(BsonType.INT32, BsonInt32.class);
         map.put(BsonType.INT64, BsonInt64.class);
+        map.put(BsonType.DECIMAL128, BsonDecimal128.class);
         map.put(BsonType.MAX_KEY, BsonMaxKey.class);
         map.put(BsonType.MIN_KEY, BsonMinKey.class);
         map.put(BsonType.JAVASCRIPT, BsonJavaScript.class);
diff --git a/bson/src/main/org/bson/codecs/ByteArrayCodec.java b/bson/src/main/org/bson/codecs/ByteArrayCodec.java
index 670e7af7fdd..99b07efa9ab 100644
--- a/bson/src/main/org/bson/codecs/ByteArrayCodec.java
+++ b/bson/src/main/org/bson/codecs/ByteArrayCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/ByteCodec.java b/bson/src/main/org/bson/codecs/ByteCodec.java
index 16d5443e873..26b5005ea66 100644
--- a/bson/src/main/org/bson/codecs/ByteCodec.java
+++ b/bson/src/main/org/bson/codecs/ByteCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,20 @@
 
 package org.bson.codecs;
 
+import org.bson.BsonInvalidOperationException;
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 
+import static java.lang.String.format;
+import static org.bson.codecs.NumberCodecHelper.decodeInt;
+
 /**
  * Encodes and decodes {@code Byte} objects.
  *
  * @since 3.0
  */
 public class ByteCodec implements Codec<Byte> {
+
     @Override
     public void encode(final BsonWriter writer, final Byte value, final EncoderContext encoderContext) {
         writer.writeInt32(value);
@@ -32,7 +37,11 @@ public void encode(final BsonWriter writer, final Byte value, final EncoderConte
 
     @Override
     public Byte decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException();
+        int value = decodeInt(reader);
+        if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
+            throw new BsonInvalidOperationException(format("%s can not be converted into a Byte.", value));
+        }
+        return (byte) value;
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/CharacterCodec.java b/bson/src/main/org/bson/codecs/CharacterCodec.java
index 42b3d589302..0a9e6252056 100644
--- a/bson/src/main/org/bson/codecs/CharacterCodec.java
+++ b/bson/src/main/org/bson/codecs/CharacterCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/CodeCodec.java b/bson/src/main/org/bson/codecs/CodeCodec.java
index 8febfa504b3..0b5fafd6c8e 100644
--- a/bson/src/main/org/bson/codecs/CodeCodec.java
+++ b/bson/src/main/org/bson/codecs/CodeCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/CodeWithScopeCodec.java b/bson/src/main/org/bson/codecs/CodeWithScopeCodec.java
index 8e7b295df5a..33cb8efafc5 100644
--- a/bson/src/main/org/bson/codecs/CodeWithScopeCodec.java
+++ b/bson/src/main/org/bson/codecs/CodeWithScopeCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/Codec.java b/bson/src/main/org/bson/codecs/Codec.java
index 7848398fabc..6e9dfc2f8dc 100644
--- a/bson/src/main/org/bson/codecs/Codec.java
+++ b/bson/src/main/org/bson/codecs/Codec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/CollectibleCodec.java b/bson/src/main/org/bson/codecs/CollectibleCodec.java
index c1fdf2208c2..27d8ee9c324 100644
--- a/bson/src/main/org/bson/codecs/CollectibleCodec.java
+++ b/bson/src/main/org/bson/codecs/CollectibleCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/DateCodec.java b/bson/src/main/org/bson/codecs/DateCodec.java
index 86a370b9e4c..cf0cc7cb621 100644
--- a/bson/src/main/org/bson/codecs/DateCodec.java
+++ b/bson/src/main/org/bson/codecs/DateCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/Decimal128Codec.java b/bson/src/main/org/bson/codecs/Decimal128Codec.java
new file mode 100644
index 00000000000..d82bb39288c
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/Decimal128Codec.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.types.Decimal128;
+
+/**
+ * Encodes and decodes {@code Decimal128} objects.
+ *
+ * @since 3.4
+ */
+public final class Decimal128Codec implements Codec<Decimal128> {
+    @Override
+    public Decimal128 decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return reader.readDecimal128();
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final Decimal128 value, final EncoderContext encoderContext) {
+        writer.writeDecimal128(value);
+    }
+
+    @Override
+    public Class<Decimal128> getEncoderClass() {
+        return Decimal128.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/Decoder.java b/bson/src/main/org/bson/codecs/Decoder.java
index 0b85ca7b5fb..051b102c92d 100644
--- a/bson/src/main/org/bson/codecs/Decoder.java
+++ b/bson/src/main/org/bson/codecs/Decoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/DecoderContext.java b/bson/src/main/org/bson/codecs/DecoderContext.java
index 0c89547daf2..30c0b700316 100644
--- a/bson/src/main/org/bson/codecs/DecoderContext.java
+++ b/bson/src/main/org/bson/codecs/DecoderContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,25 @@
 
 package org.bson.codecs;
 
+import org.bson.BsonReader;
+
 /**
- * The context for decoding values to BSON.  Currently this is a placeholder, as there is nothing needed yet.
+ * The context for decoding values to BSON.
  *
  * @see org.bson.codecs.Decoder
  * @since 3.0
  */
 public final class DecoderContext {
+    private static final DecoderContext DEFAULT_CONTEXT = DecoderContext.builder().build();
+    private final boolean checkedDiscriminator;
+
+    /**
+     * @return true if the discriminator has been checked
+     */
+    public boolean hasCheckedDiscriminator() {
+        return checkedDiscriminator;
+    }
+
     /**
      * Create a builder.
      *
@@ -39,6 +51,26 @@ public static final class Builder {
         private Builder() {
         }
 
+        private boolean checkedDiscriminator;
+
+        /**
+         * @return true if the discriminator has been checked
+         */
+        public boolean hasCheckedDiscriminator() {
+            return checkedDiscriminator;
+        }
+
+        /**
+         * Sets the checkedDiscriminator
+         *
+         * @param checkedDiscriminator the checkedDiscriminator
+         * @return this
+         */
+        public Builder checkedDiscriminator(final boolean checkedDiscriminator) {
+            this.checkedDiscriminator = checkedDiscriminator;
+            return this;
+        }
+
         /**
          * Build an instance of {@code DecoderContext}.
          * @return the decoder context
@@ -48,6 +80,20 @@ public DecoderContext build() {
         }
     }
 
+    /**
+     * Creates a child context and then deserializes using the reader.
+     *
+     * @param decoder the decoder to decode with
+     * @param reader the reader to decode to
+     * @param <T> the type of the decoder
+     * @return the decoded value
+     * @since 3.5
+     */
+    public <T> T decodeWithChildContext(final Decoder<T> decoder, final BsonReader reader) {
+        return decoder.decode(reader, DEFAULT_CONTEXT);
+    }
+
     private DecoderContext(final Builder builder) {
+        this.checkedDiscriminator = builder.hasCheckedDiscriminator();
     }
 }
diff --git a/bson/src/main/org/bson/codecs/DocumentCodec.java b/bson/src/main/org/bson/codecs/DocumentCodec.java
index 4f657260a60..e5224c395ca 100644
--- a/bson/src/main/org/bson/codecs/DocumentCodec.java
+++ b/bson/src/main/org/bson/codecs/DocumentCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.bson.codecs;
 
-import org.bson.BsonBinarySubType;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWriter;
 import org.bson.BsonReader;
@@ -25,6 +24,7 @@
 import org.bson.BsonWriter;
 import org.bson.Document;
 import org.bson.Transformer;
+import org.bson.UuidRepresentation;
 import org.bson.codecs.configuration.CodecRegistry;
 
 import java.util.ArrayList;
@@ -42,7 +42,7 @@
  * @see org.bson.Document
  * @since 3.0
  */
-public class DocumentCodec implements CollectibleCodec<Document> {
+public class DocumentCodec implements CollectibleCodec<Document>, OverridableUuidRepresentationCodec<Document> {
 
     private static final String ID_FIELD_NAME = "_id";
     private static final CodecRegistry DEFAULT_REGISTRY = fromProviders(asList(new ValueCodecProvider(),
@@ -54,12 +54,23 @@ public class DocumentCodec implements CollectibleCodec<Document> {
     private final CodecRegistry registry;
     private final IdGenerator idGenerator;
     private final Transformer valueTransformer;
+    private final UuidRepresentation uuidRepresentation;
 
     /**
-     * Construct a new instance with a default {@code CodecRegistry} and
+     * Construct a new instance with a default {@code CodecRegistry}.
      */
     public DocumentCodec() {
-        this(DEFAULT_REGISTRY, DEFAULT_BSON_TYPE_CLASS_MAP);
+        this(DEFAULT_REGISTRY);
+    }
+
+    /**
+     * Construct a new instance with the given registry.
+     *
+     * @param registry         the registry
+     * @since 3.5
+     */
+    public DocumentCodec(final CodecRegistry registry) {
+        this(registry, DEFAULT_BSON_TYPE_CLASS_MAP);
     }
 
     /**
@@ -82,15 +93,27 @@ public DocumentCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTy
      * @param valueTransformer the value transformer to use as a final step when decoding the value of any field in the document
      */
     public DocumentCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
+        this(registry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry),
+                new ObjectIdGenerator(), valueTransformer, UuidRepresentation.JAVA_LEGACY);
+    }
+
+    private DocumentCodec(final CodecRegistry registry, final BsonTypeCodecMap bsonTypeCodecMap, final IdGenerator idGenerator,
+                          final Transformer valueTransformer, final UuidRepresentation uuidRepresentation) {
         this.registry = notNull("registry", registry);
-        this.bsonTypeCodecMap = new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry);
-        this.idGenerator = new ObjectIdGenerator();
+        this.bsonTypeCodecMap = bsonTypeCodecMap;
+        this.idGenerator = idGenerator;
         this.valueTransformer = valueTransformer != null ? valueTransformer : new Transformer() {
             @Override
             public Object transform(final Object value) {
                 return value;
             }
         };
+        this.uuidRepresentation = uuidRepresentation;
+    }
+
+    @Override
+    public Codec<Document> withUuidRepresentation(final UuidRepresentation uuidRepresentation) {
+        return new DocumentCodec(registry, bsonTypeCodecMap, idGenerator, valueTransformer, uuidRepresentation);
     }
 
     @Override
@@ -205,14 +228,30 @@ private Object readValue(final BsonReader reader, final DecoderContext decoderCo
             reader.readNull();
             return null;
         } else if (bsonType == BsonType.ARRAY) {
-           return readList(reader, decoderContext);
-        } else if (bsonType == BsonType.BINARY) {
-            byte bsonSubType = reader.peekBinarySubType();
-            if (bsonSubType == BsonBinarySubType.UUID_STANDARD.getValue() || bsonSubType == BsonBinarySubType.UUID_LEGACY.getValue()) {
-                return registry.get(UUID.class).decode(reader, decoderContext);
+            return readList(reader, decoderContext);
+        } else {
+            Codec<?> codec = bsonTypeCodecMap.get(bsonType);
+
+            if (bsonType == BsonType.BINARY && reader.peekBinarySize() == 16) {
+                switch (reader.peekBinarySubType()) {
+                    case 3:
+                        if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY
+                                || uuidRepresentation == UuidRepresentation.C_SHARP_LEGACY
+                                || uuidRepresentation == UuidRepresentation.PYTHON_LEGACY) {
+                            codec = registry.get(UUID.class);
+                        }
+                        break;
+                    case 4:
+                        if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY || uuidRepresentation == UuidRepresentation.STANDARD) {
+                            codec = registry.get(UUID.class);
+                        }
+                        break;
+                    default:
+                        break;
+                }
             }
+            return valueTransformer.transform(codec.decode(reader, decoderContext));
         }
-        return valueTransformer.transform(bsonTypeCodecMap.get(bsonType).decode(reader, decoderContext));
     }
 
     private List<Object> readList(final BsonReader reader, final DecoderContext decoderContext) {
diff --git a/bson/src/main/org/bson/codecs/DocumentCodecProvider.java b/bson/src/main/org/bson/codecs/DocumentCodecProvider.java
index 78c3e2f9530..a2e08c99ede 100644
--- a/bson/src/main/org/bson/codecs/DocumentCodecProvider.java
+++ b/bson/src/main/org/bson/codecs/DocumentCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/DoubleCodec.java b/bson/src/main/org/bson/codecs/DoubleCodec.java
index 7dded30fa0d..523042bb163 100644
--- a/bson/src/main/org/bson/codecs/DoubleCodec.java
+++ b/bson/src/main/org/bson/codecs/DoubleCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 
+import static org.bson.codecs.NumberCodecHelper.decodeDouble;
+
 /**
  * Encodes and decodes {@code Double} objects.
  *
@@ -32,7 +34,7 @@ public void encode(final BsonWriter writer, final Double value, final EncoderCon
 
     @Override
     public Double decode(final BsonReader reader, final DecoderContext decoderContext) {
-        return reader.readDouble();
+        return decodeDouble(reader);
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/Encoder.java b/bson/src/main/org/bson/codecs/Encoder.java
index 018bec15cd7..4b06894c71d 100644
--- a/bson/src/main/org/bson/codecs/Encoder.java
+++ b/bson/src/main/org/bson/codecs/Encoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/EncoderContext.java b/bson/src/main/org/bson/codecs/EncoderContext.java
index 85f5eede8d7..cad35fce3e0 100644
--- a/bson/src/main/org/bson/codecs/EncoderContext.java
+++ b/bson/src/main/org/bson/codecs/EncoderContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/FloatCodec.java b/bson/src/main/org/bson/codecs/FloatCodec.java
index ccd502e24eb..84b85c5aa1b 100644
--- a/bson/src/main/org/bson/codecs/FloatCodec.java
+++ b/bson/src/main/org/bson/codecs/FloatCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,20 @@
 
 package org.bson.codecs;
 
+import org.bson.BsonInvalidOperationException;
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 
+import static java.lang.String.format;
+import static org.bson.codecs.NumberCodecHelper.decodeDouble;
+
 /**
  * Encodes and decodes {@code Float} objects.
  *
  * @since 3.0
  */
 public class FloatCodec implements Codec<Float> {
+
     @Override
     public void encode(final BsonWriter writer, final Float value, final EncoderContext encoderContext) {
         writer.writeDouble(value);
@@ -32,7 +37,11 @@ public void encode(final BsonWriter writer, final Float value, final EncoderCont
 
     @Override
     public Float decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException();
+        double value = decodeDouble(reader);
+        if (value < -Float.MAX_VALUE || value > Float.MAX_VALUE) {
+            throw new BsonInvalidOperationException(format("%s can not be converted into a Float.", value));
+        }
+        return (float) value;
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/IdGenerator.java b/bson/src/main/org/bson/codecs/IdGenerator.java
index 5e05be4e6ee..790737542c1 100644
--- a/bson/src/main/org/bson/codecs/IdGenerator.java
+++ b/bson/src/main/org/bson/codecs/IdGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/IntegerCodec.java b/bson/src/main/org/bson/codecs/IntegerCodec.java
index 2a6edc31298..dee6e2512fb 100644
--- a/bson/src/main/org/bson/codecs/IntegerCodec.java
+++ b/bson/src/main/org/bson/codecs/IntegerCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,15 @@
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 
+import static org.bson.codecs.NumberCodecHelper.decodeInt;
+
 /**
  * Encodes and decodes {@code Integer} objects.
  *
  * @since 3.0
  */
 public class IntegerCodec implements Codec<Integer> {
+
     @Override
     public void encode(final BsonWriter writer, final Integer value, final EncoderContext encoderContext) {
         writer.writeInt32(value);
@@ -32,7 +35,7 @@ public void encode(final BsonWriter writer, final Integer value, final EncoderCo
 
     @Override
     public Integer decode(final BsonReader reader, final DecoderContext decoderContext) {
-        return reader.readInt32();
+        return decodeInt(reader);
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/IterableCodec.java b/bson/src/main/org/bson/codecs/IterableCodec.java
index b7fd2170bdb..c15e13e207b 100644
--- a/bson/src/main/org/bson/codecs/IterableCodec.java
+++ b/bson/src/main/org/bson/codecs/IterableCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 package org.bson.codecs;
 
-import org.bson.BsonBinarySubType;
 import org.bson.BsonReader;
 import org.bson.BsonType;
 import org.bson.BsonWriter;
 import org.bson.Transformer;
+import org.bson.UuidRepresentation;
 import org.bson.codecs.configuration.CodecRegistry;
 
 import java.util.ArrayList;
@@ -35,11 +35,12 @@
  * @since 3.3
  */
 @SuppressWarnings("rawtypes")
-public class IterableCodec implements Codec<Iterable> {
+public class IterableCodec implements Codec<Iterable>, OverridableUuidRepresentationCodec<Iterable> {
 
     private final CodecRegistry registry;
     private final BsonTypeCodecMap bsonTypeCodecMap;
     private final Transformer valueTransformer;
+    private final UuidRepresentation uuidRepresentation;
 
     /**
      * Construct a new instance with the given {@code CodecRegistry} and {@code BsonTypeClassMap}.
@@ -59,14 +60,27 @@ public IterableCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTy
      * @param valueTransformer the value Transformer
      */
     public IterableCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
+        this(registry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry), valueTransformer,
+                UuidRepresentation.JAVA_LEGACY);
+    }
+
+    private IterableCodec(final CodecRegistry registry, final BsonTypeCodecMap bsonTypeCodecMap, final Transformer valueTransformer,
+                         final UuidRepresentation uuidRepresentation) {
         this.registry = notNull("registry", registry);
-        this.bsonTypeCodecMap = new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry);
+        this.bsonTypeCodecMap = bsonTypeCodecMap;
         this.valueTransformer = valueTransformer != null ? valueTransformer : new Transformer() {
             @Override
             public Object transform(final Object objectToTransform) {
                 return objectToTransform;
             }
         };
+        this.uuidRepresentation = uuidRepresentation;
+    }
+
+
+    @Override
+    public Codec<Iterable> withUuidRepresentation(final UuidRepresentation uuidRepresentation) {
+        return new IterableCodec(registry, bsonTypeCodecMap, valueTransformer, uuidRepresentation);
     }
 
     @Override
@@ -112,12 +126,27 @@ private Object readValue(final BsonReader reader, final DecoderContext decoderCo
         if (bsonType == BsonType.NULL) {
             reader.readNull();
             return null;
-        } else if (bsonType == BsonType.BINARY) {
-            byte bsonSubType = reader.peekBinarySubType();
-            if (bsonSubType == BsonBinarySubType.UUID_STANDARD.getValue() || bsonSubType == BsonBinarySubType.UUID_LEGACY.getValue()) {
-                return registry.get(UUID.class).decode(reader, decoderContext);
+        } else {
+            Codec<?> codec = bsonTypeCodecMap.get(bsonType);
+            if (bsonType == BsonType.BINARY && reader.peekBinarySize() == 16) {
+                switch (reader.peekBinarySubType()) {
+                    case 3:
+                        if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY
+                                || uuidRepresentation == UuidRepresentation.C_SHARP_LEGACY
+                                || uuidRepresentation == UuidRepresentation.PYTHON_LEGACY) {
+                            codec = registry.get(UUID.class);
+                        }
+                        break;
+                    case 4:
+                        if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY || uuidRepresentation == UuidRepresentation.STANDARD) {
+                            codec = registry.get(UUID.class);
+                        }
+                        break;
+                    default:
+                        break;
+                }
             }
+            return valueTransformer.transform(codec.decode(reader, decoderContext));
         }
-        return valueTransformer.transform(bsonTypeCodecMap.get(bsonType).decode(reader, decoderContext));
     }
 }
diff --git a/bson/src/main/org/bson/codecs/IterableCodecProvider.java b/bson/src/main/org/bson/codecs/IterableCodecProvider.java
index 254650f4362..8a0cd4cc757 100644
--- a/bson/src/main/org/bson/codecs/IterableCodecProvider.java
+++ b/bson/src/main/org/bson/codecs/IterableCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package org.bson.codecs;
@@ -44,7 +43,6 @@ public IterableCodecProvider() {
      * IterableCodec as a last step when decoding values.
      *
      * @param valueTransformer the value transformer for decoded values
-     * @see org.bson.codecs.DocumentCodec#DocumentCodec(org.bson.codecs.configuration.CodecRegistry, BsonTypeClassMap, org.bson.Transformer)
      */
     public IterableCodecProvider(final Transformer valueTransformer) {
         this(new BsonTypeClassMap(), valueTransformer);
diff --git a/bson/src/main/org/bson/codecs/LongCodec.java b/bson/src/main/org/bson/codecs/LongCodec.java
index 30547c1d6ef..29adc373488 100644
--- a/bson/src/main/org/bson/codecs/LongCodec.java
+++ b/bson/src/main/org/bson/codecs/LongCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 
+import static org.bson.codecs.NumberCodecHelper.decodeLong;
+
 /**
  * Encodes and decodes {@code Long} objects.
  *
@@ -26,6 +28,7 @@
  */
 
 public class LongCodec implements Codec<Long> {
+
     @Override
     public void encode(final BsonWriter writer, final Long value, final EncoderContext encoderContext) {
         writer.writeInt64(value);
@@ -33,7 +36,7 @@ public void encode(final BsonWriter writer, final Long value, final EncoderConte
 
     @Override
     public Long decode(final BsonReader reader, final DecoderContext decoderContext) {
-        return reader.readInt64();
+        return decodeLong(reader);
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/MapCodec.java b/bson/src/main/org/bson/codecs/MapCodec.java
new file mode 100644
index 00000000000..c0b6b7e6d41
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/MapCodec.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.BsonWriter;
+import org.bson.Transformer;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static java.util.Arrays.asList;
+import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+/**
+ * A Codec for Map instances.
+ *
+ * @since 3.5
+ */
+public class MapCodec implements Codec<Map<String, Object>>, OverridableUuidRepresentationCodec<Map<String, Object>> {
+
+    private static final CodecRegistry DEFAULT_REGISTRY = fromProviders(asList(new ValueCodecProvider(), new BsonValueCodecProvider(),
+            new DocumentCodecProvider(), new IterableCodecProvider(), new MapCodecProvider()));
+    private static final BsonTypeClassMap DEFAULT_BSON_TYPE_CLASS_MAP = new BsonTypeClassMap();
+    private final BsonTypeCodecMap bsonTypeCodecMap;
+    private final CodecRegistry registry;
+    private final Transformer valueTransformer;
+    private final UuidRepresentation uuidRepresentation;
+
+    /**
+     * Construct a new instance with a default {@code CodecRegistry}
+     */
+    public MapCodec() {
+        this(DEFAULT_REGISTRY);
+    }
+
+    /**
+     Construct a new instance with the given registry
+     *
+     * @param registry the registry
+     */
+    public MapCodec(final CodecRegistry registry) {
+        this(registry, DEFAULT_BSON_TYPE_CLASS_MAP);
+    }
+
+    /**
+     * Construct a new instance with the given registry and BSON type class map.
+     *
+     * @param registry         the registry
+     * @param bsonTypeClassMap the BSON type class map
+     */
+    public MapCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap) {
+        this(registry, bsonTypeClassMap, null);
+    }
+
+    /**
+     * Construct a new instance with the given registry and BSON type class map. The transformer is applied as a last step when decoding
+     * values, which allows users of this codec to control the decoding process.  For example, a user of this class could substitute a
+     * value decoded as a Document with an instance of a special purpose class (e.g., one representing a DBRef in MongoDB).
+     *
+     * @param registry         the registry
+     * @param bsonTypeClassMap the BSON type class map
+     * @param valueTransformer the value transformer to use as a final step when decoding the value of any field in the map
+     */
+    public MapCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
+        this(registry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry), valueTransformer,
+                UuidRepresentation.JAVA_LEGACY);
+    }
+
+    private MapCodec(final CodecRegistry registry, final BsonTypeCodecMap bsonTypeCodecMap, final Transformer valueTransformer,
+               final UuidRepresentation uuidRepresentation) {
+        this.registry = notNull("registry", registry);
+        this.bsonTypeCodecMap = bsonTypeCodecMap;
+        this.valueTransformer = valueTransformer != null ? valueTransformer : new Transformer() {
+            @Override
+            public Object transform(final Object value) {
+                return value;
+            }
+        };
+        this.uuidRepresentation = uuidRepresentation;
+    }
+
+    @Override
+    public Codec<Map<String, Object>> withUuidRepresentation(final UuidRepresentation uuidRepresentation) {
+        return new MapCodec(registry, bsonTypeCodecMap, valueTransformer, uuidRepresentation);
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final Map<String, Object> map, final EncoderContext encoderContext) {
+        writer.writeStartDocument();
+        for (final Map.Entry<String, Object> entry : map.entrySet()) {
+            writer.writeName(entry.getKey());
+            writeValue(writer, encoderContext, entry.getValue());
+        }
+        writer.writeEndDocument();
+    }
+
+    @Override
+    public Map<String, Object> decode(final BsonReader reader, final DecoderContext decoderContext) {
+        Map<String, Object> map = new HashMap<String, Object>();
+
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String fieldName = reader.readName();
+            map.put(fieldName, readValue(reader, decoderContext));
+        }
+
+        reader.readEndDocument();
+        return map;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Class<Map<String, Object>> getEncoderClass() {
+        return (Class<Map<String, Object>>) ((Class) Map.class);
+    }
+
+    private Object readValue(final BsonReader reader, final DecoderContext decoderContext) {
+        BsonType bsonType = reader.getCurrentBsonType();
+        if (bsonType == BsonType.NULL) {
+            reader.readNull();
+            return null;
+        } else if (bsonType == BsonType.ARRAY) {
+            return decoderContext.decodeWithChildContext(registry.get(List.class), reader);
+        } else if (bsonType == BsonType.BINARY && reader.peekBinarySize() == 16) {
+            Codec<?> codec = bsonTypeCodecMap.get(bsonType);
+            switch (reader.peekBinarySubType()) {
+                case 3:
+                    if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY
+                            || uuidRepresentation == UuidRepresentation.C_SHARP_LEGACY
+                            || uuidRepresentation == UuidRepresentation.PYTHON_LEGACY) {
+                        codec = registry.get(UUID.class);
+                    }
+                    break;
+                case 4:
+                    if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY || uuidRepresentation == UuidRepresentation.STANDARD) {
+                        codec = registry.get(UUID.class);
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+            return decoderContext.decodeWithChildContext(codec, reader);
+        }
+        return valueTransformer.transform(bsonTypeCodecMap.get(bsonType).decode(reader, decoderContext));
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    private void writeValue(final BsonWriter writer, final EncoderContext encoderContext, final Object value) {
+        if (value == null) {
+            writer.writeNull();
+        } else {
+            Codec codec = registry.get(value.getClass());
+            encoderContext.encodeWithChildContext(codec, writer, value);
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/MapCodecProvider.java b/bson/src/main/org/bson/codecs/MapCodecProvider.java
new file mode 100644
index 00000000000..348908eb6b5
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/MapCodecProvider.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.Transformer;
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.Map;
+
+import static org.bson.assertions.Assertions.notNull;
+
+/**
+ * A {@code CodecProvider} for the Map class and all the default Codec implementations on which it depends.
+ *
+ * @since 3.5
+ */
+public class MapCodecProvider implements CodecProvider {
+    private final BsonTypeClassMap bsonTypeClassMap;
+    private final Transformer valueTransformer;
+
+    /**
+     * Construct a new instance with a default {@code BsonTypeClassMap}.
+     */
+    public MapCodecProvider() {
+        this(new BsonTypeClassMap());
+    }
+
+    /**
+     * Construct a new instance with the given instance of {@code BsonTypeClassMap}.
+     *
+     * @param bsonTypeClassMap the non-null {@code BsonTypeClassMap} with which to construct instances of {@code DocumentCodec} and {@code
+     *                         ListCodec}
+     */
+    public MapCodecProvider(final BsonTypeClassMap bsonTypeClassMap) {
+        this(bsonTypeClassMap, null);
+    }
+
+    /**
+     * Construct a new instance with a default {@code BsonTypeClassMap} and the given {@code Transformer}.  The transformer is used by the
+     * MapCodec as a last step when decoding values.
+     *
+     * @param valueTransformer the value transformer for decoded values
+     */
+    public MapCodecProvider(final Transformer valueTransformer) {
+        this(new BsonTypeClassMap(), valueTransformer);
+    }
+
+    /**
+     * Construct a new instance with the given instance of {@code BsonTypeClassMap}.
+     *
+     * @param bsonTypeClassMap the non-null {@code BsonTypeClassMap} with which to construct instances of {@code MapCodec}.
+     * @param valueTransformer the value transformer for decoded values
+     */
+    public MapCodecProvider(final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
+        this.bsonTypeClassMap = notNull("bsonTypeClassMap", bsonTypeClassMap);
+        this.valueTransformer = valueTransformer;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
+        if (Map.class.isAssignableFrom(clazz)) {
+            return (Codec<T>) new MapCodec(registry, bsonTypeClassMap, valueTransformer);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MapCodecProvider that = (MapCodecProvider) o;
+        if (!bsonTypeClassMap.equals(that.bsonTypeClassMap)) {
+            return false;
+        }
+        if (valueTransformer != null ? !valueTransformer.equals(that.valueTransformer) : that.valueTransformer != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = bsonTypeClassMap.hashCode();
+        result = 31 * result + (valueTransformer != null ? valueTransformer.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/MaxKeyCodec.java b/bson/src/main/org/bson/codecs/MaxKeyCodec.java
index 954c0d27476..a8907e5a9a4 100644
--- a/bson/src/main/org/bson/codecs/MaxKeyCodec.java
+++ b/bson/src/main/org/bson/codecs/MaxKeyCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/MinKeyCodec.java b/bson/src/main/org/bson/codecs/MinKeyCodec.java
index beb26a5e724..c3bb34efaa9 100644
--- a/bson/src/main/org/bson/codecs/MinKeyCodec.java
+++ b/bson/src/main/org/bson/codecs/MinKeyCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/NumberCodecHelper.java b/bson/src/main/org/bson/codecs/NumberCodecHelper.java
new file mode 100644
index 00000000000..69dfe29ac7e
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/NumberCodecHelper.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.types.Decimal128;
+
+import java.math.BigDecimal;
+
+import static java.lang.String.format;
+
+final class NumberCodecHelper {
+
+    static int decodeInt(final BsonReader reader) {
+        int intValue;
+        BsonType bsonType = reader.getCurrentBsonType();
+        switch (bsonType) {
+            case INT32:
+                intValue = reader.readInt32();
+                break;
+            case INT64:
+                long longValue = reader.readInt64();
+                intValue = (int) longValue;
+                if (longValue != (long) intValue) {
+                    throw invalidConversion(Integer.class, longValue);
+                }
+                break;
+            case DOUBLE:
+                double doubleValue = reader.readDouble();
+                intValue = (int) doubleValue;
+                if (doubleValue != (double) intValue) {
+                    throw invalidConversion(Integer.class, doubleValue);
+                }
+                break;
+            case DECIMAL128:
+                Decimal128 decimal128 = reader.readDecimal128();
+                intValue = decimal128.intValue();
+                if (!decimal128.equals(new Decimal128(intValue))) {
+                    throw invalidConversion(Integer.class, decimal128);
+                }
+                break;
+            default:
+                throw new BsonInvalidOperationException(format("Invalid numeric type, found: %s", bsonType));
+        }
+        return intValue;
+    }
+
+    static long decodeLong(final BsonReader reader) {
+        long longValue;
+        BsonType bsonType = reader.getCurrentBsonType();
+        switch (bsonType) {
+            case INT32:
+                longValue = reader.readInt32();
+                break;
+            case INT64:
+                longValue = reader.readInt64();
+                break;
+            case DOUBLE:
+                double doubleValue = reader.readDouble();
+                longValue = (long) doubleValue;
+                if (doubleValue != (double) longValue) {
+                    throw invalidConversion(Long.class, doubleValue);
+                }
+                break;
+            case DECIMAL128:
+                Decimal128 decimal128 = reader.readDecimal128();
+                longValue = decimal128.longValue();
+                if (!decimal128.equals(new Decimal128(longValue))) {
+                    throw invalidConversion(Long.class, decimal128);
+                }
+                break;
+            default:
+                throw new BsonInvalidOperationException(format("Invalid numeric type, found: %s", bsonType));
+        }
+        return longValue;
+    }
+
+    static double decodeDouble(final BsonReader reader) {
+        double doubleValue;
+        BsonType bsonType = reader.getCurrentBsonType();
+        switch (bsonType) {
+            case INT32:
+                doubleValue = reader.readInt32();
+                break;
+            case INT64:
+                long longValue = reader.readInt64();
+                doubleValue = longValue;
+                if (longValue != (long) doubleValue) {
+                    throw invalidConversion(Double.class, longValue);
+                }
+                break;
+            case DOUBLE:
+                doubleValue = reader.readDouble();
+                break;
+            case DECIMAL128:
+                Decimal128 decimal128 = reader.readDecimal128();
+                try {
+                    doubleValue = decimal128.doubleValue();
+                    if (!decimal128.equals(new Decimal128(new BigDecimal(doubleValue)))) {
+                        throw invalidConversion(Double.class, decimal128);
+                    }
+                } catch (NumberFormatException e) {
+                    throw invalidConversion(Double.class, decimal128);
+                }
+                break;
+            default:
+                throw new BsonInvalidOperationException(format("Invalid numeric type, found: %s", bsonType));
+        }
+        return doubleValue;
+    }
+
+    private static  <T extends Number> BsonInvalidOperationException invalidConversion(final Class<T> clazz, final Number value) {
+        return new BsonInvalidOperationException(format("Could not convert `%s` to a %s without losing precision", value, clazz));
+    }
+
+    private NumberCodecHelper() {
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/ObjectIdCodec.java b/bson/src/main/org/bson/codecs/ObjectIdCodec.java
index 884ea567c48..d688bf69087 100644
--- a/bson/src/main/org/bson/codecs/ObjectIdCodec.java
+++ b/bson/src/main/org/bson/codecs/ObjectIdCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/ObjectIdGenerator.java b/bson/src/main/org/bson/codecs/ObjectIdGenerator.java
index ead66748685..9191ebb1d60 100644
--- a/bson/src/main/org/bson/codecs/ObjectIdGenerator.java
+++ b/bson/src/main/org/bson/codecs/ObjectIdGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/OverridableUuidRepresentationCodec.java b/bson/src/main/org/bson/codecs/OverridableUuidRepresentationCodec.java
new file mode 100644
index 00000000000..f0f392dd140
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/OverridableUuidRepresentationCodec.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.UuidRepresentation;
+
+/**
+ * A marker interface for {@code Codec} implementations that can derive a new instance that overrides the {@code UuidRepresentation}.
+ * @param <T> the value type
+ * @since 3.12
+ */
+public interface OverridableUuidRepresentationCodec<T> {
+    /**
+     * Implementations must return a new instance with the {@code UuidRepresentation} overridden with the given value.
+     *
+     * @param uuidRepresentation the UuidRepresentation
+     * @return a new instance equivalent to this but with the given UuidRepresentation
+     */
+    Codec<T> withUuidRepresentation(UuidRepresentation uuidRepresentation);
+}
diff --git a/bson/src/main/org/bson/codecs/OverridableUuidRepresentationUuidCodec.java b/bson/src/main/org/bson/codecs/OverridableUuidRepresentationUuidCodec.java
new file mode 100644
index 00000000000..b86be1db320
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/OverridableUuidRepresentationUuidCodec.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.UuidRepresentation;
+
+import java.util.UUID;
+
+/**
+ * An extension of {@code UuidCodec} that allows its configured {@code UuidRepresentation} to be overridden by an externally configured
+ * {@code UuidRepresentation}, most likely configured on {@code MongoClientSettings} or {@code MongoClientOptions}.
+ *
+ * @since 3.12
+ */
+public class OverridableUuidRepresentationUuidCodec extends UuidCodec implements OverridableUuidRepresentationCodec<UUID> {
+
+    /**
+     * Construct an instance with the default UUID representation.
+     */
+    public OverridableUuidRepresentationUuidCodec() {
+    }
+
+    /**
+     * Construct an instance with the given UUID representation.
+     *
+     * @param uuidRepresentation the UUID representation
+     */
+    public OverridableUuidRepresentationUuidCodec(final UuidRepresentation uuidRepresentation) {
+        super(uuidRepresentation);
+    }
+
+    @Override
+    public Codec<UUID> withUuidRepresentation(final UuidRepresentation uuidRepresentation) {
+        return new OverridableUuidRepresentationUuidCodec(uuidRepresentation);
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/PatternCodec.java b/bson/src/main/org/bson/codecs/PatternCodec.java
index 28a5f70468b..8df0f603c5a 100644
--- a/bson/src/main/org/bson/codecs/PatternCodec.java
+++ b/bson/src/main/org/bson/codecs/PatternCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ private static int getOptionsAsInt(final BsonRegularExpression regularExpression
 
     private static final int GLOBAL_FLAG = 256;
 
-    private static enum RegexFlag {
+    private enum RegexFlag {
         CANON_EQ(Pattern.CANON_EQ, 'c', "Pattern.CANON_EQ"),
         UNIX_LINES(Pattern.UNIX_LINES, 'd', "Pattern.UNIX_LINES"),
         GLOBAL(GLOBAL_FLAG, 'g', null),
diff --git a/bson/src/main/org/bson/codecs/RawBsonDocumentCodec.java b/bson/src/main/org/bson/codecs/RawBsonDocumentCodec.java
index 24ad9b5691d..4d7b46fc291 100644
--- a/bson/src/main/org/bson/codecs/RawBsonDocumentCodec.java
+++ b/bson/src/main/org/bson/codecs/RawBsonDocumentCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/ShortCodec.java b/bson/src/main/org/bson/codecs/ShortCodec.java
index bdc07ee2118..e5aaf8f9acb 100644
--- a/bson/src/main/org/bson/codecs/ShortCodec.java
+++ b/bson/src/main/org/bson/codecs/ShortCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,20 @@
 
 package org.bson.codecs;
 
+import org.bson.BsonInvalidOperationException;
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 
+import static java.lang.String.format;
+import static org.bson.codecs.NumberCodecHelper.decodeInt;
+
 /**
  * Encodes and decodes {@code Short} objects.
  *
  * @since 3.0
  */
 public class ShortCodec implements Codec<Short> {
+
     @Override
     public void encode(final BsonWriter writer, final Short value, final EncoderContext encoderContext) {
         writer.writeInt32(value);
@@ -32,7 +37,11 @@ public void encode(final BsonWriter writer, final Short value, final EncoderCont
 
     @Override
     public Short decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException();
+        int value = decodeInt(reader);
+        if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
+            throw new BsonInvalidOperationException(format("%s can not be converted into a Short.", value));
+        }
+        return (short) value;
     }
 
     @Override
diff --git a/bson/src/main/org/bson/codecs/StringCodec.java b/bson/src/main/org/bson/codecs/StringCodec.java
index 2673de062ca..f08508341a2 100644
--- a/bson/src/main/org/bson/codecs/StringCodec.java
+++ b/bson/src/main/org/bson/codecs/StringCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/SymbolCodec.java b/bson/src/main/org/bson/codecs/SymbolCodec.java
index ff3c5f66326..3b1d5a1c086 100644
--- a/bson/src/main/org/bson/codecs/SymbolCodec.java
+++ b/bson/src/main/org/bson/codecs/SymbolCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/UuidCodec.java b/bson/src/main/org/bson/codecs/UuidCodec.java
index 7ac576ce0b8..dc30ebeb2e9 100644
--- a/bson/src/main/org/bson/codecs/UuidCodec.java
+++ b/bson/src/main/org/bson/codecs/UuidCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,14 @@
 import org.bson.BsonBinary;
 import org.bson.BsonBinarySubType;
 import org.bson.BsonReader;
-import org.bson.BsonSerializationException;
 import org.bson.BsonWriter;
 import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.internal.UuidHelper;
 
 import java.util.UUID;
 
-import static org.bson.codecs.UuidCodecHelper.reverseByteArray;
+import static org.bson.assertions.Assertions.notNull;
 
 /**
  * Encodes and decodes {@code UUID} objects.
@@ -35,8 +36,7 @@
  */
 public class UuidCodec implements Codec<UUID> {
 
-    private final UuidRepresentation encoderUuidRepresentation;
-    private final UuidRepresentation decoderUuidRepresentation;
+    private final UuidRepresentation uuidRepresentation;
 
     /**
      * The default UUIDRepresentation is JAVA_LEGACY to be compatible with existing documents
@@ -45,41 +45,35 @@ public class UuidCodec implements Codec<UUID> {
      * @see org.bson.UuidRepresentation
      */
     public UuidCodec(final UuidRepresentation uuidRepresentation) {
-        this.encoderUuidRepresentation = uuidRepresentation;
-        this.decoderUuidRepresentation = uuidRepresentation;
+        notNull("uuidRepresentation", uuidRepresentation);
+        this.uuidRepresentation = uuidRepresentation;
     }
 
     /**
      * The constructor for UUIDCodec, default is JAVA_LEGACY
      */
     public UuidCodec() {
-        this.encoderUuidRepresentation = UuidRepresentation.JAVA_LEGACY;
-        this.decoderUuidRepresentation = UuidRepresentation.JAVA_LEGACY;
+        this.uuidRepresentation = UuidRepresentation.JAVA_LEGACY;
+    }
+
+    /**
+     * The {@code UuidRepresentation} with which this instance is configured
+     *
+     * @return the uuid representation
+     * @since 3.12
+     */
+    public UuidRepresentation getUuidRepresentation() {
+        return uuidRepresentation;
     }
 
     @Override
     public void encode(final BsonWriter writer, final UUID value, final EncoderContext encoderContext) {
-        byte[] binaryData = new byte[16];
-        writeLongToArrayBigEndian(binaryData, 0, value.getMostSignificantBits());
-        writeLongToArrayBigEndian(binaryData, 8, value.getLeastSignificantBits());
-        switch (encoderUuidRepresentation) {
-            case C_SHARP_LEGACY:
-                UuidCodecHelper.reverseByteArray(binaryData, 0, 4);
-                UuidCodecHelper.reverseByteArray(binaryData, 4, 2);
-                UuidCodecHelper.reverseByteArray(binaryData, 6, 2);
-                break;
-            case JAVA_LEGACY:
-                UuidCodecHelper.reverseByteArray(binaryData, 0, 8);
-                UuidCodecHelper.reverseByteArray(binaryData, 8, 8);
-                break;
-            case PYTHON_LEGACY:
-            case STANDARD:
-                break;
-            default:
-                throw new BSONException("Unexpected UUID representation");
+        if (uuidRepresentation == UuidRepresentation.UNSPECIFIED) {
+            throw new CodecConfigurationException("The uuidRepresentation has not been specified, so the UUID cannot be encoded.");
         }
+        byte[] binaryData = UuidHelper.encodeUuidToBinary(value, uuidRepresentation);
         // changed the default subtype to STANDARD since 3.0
-        if (encoderUuidRepresentation == UuidRepresentation.STANDARD) {
+        if (uuidRepresentation == UuidRepresentation.STANDARD) {
             writer.writeBinaryData(new BsonBinary(BsonBinarySubType.UUID_STANDARD, binaryData));
         } else {
             writer.writeBinaryData(new BsonBinary(BsonBinarySubType.UUID_LEGACY, binaryData));
@@ -96,30 +90,7 @@ public UUID decode(final BsonReader reader, final DecoderContext decoderContext)
 
         byte[] bytes = reader.readBinaryData().getData();
 
-        if (bytes.length != 16) {
-            throw new BsonSerializationException(String.format("Expected length to be 16, not %d.", bytes.length));
-        }
-
-        if (subType == BsonBinarySubType.UUID_LEGACY.getValue()) {
-            switch (decoderUuidRepresentation) {
-                case C_SHARP_LEGACY:
-                    reverseByteArray(bytes, 0, 4);
-                    reverseByteArray(bytes, 4, 2);
-                    reverseByteArray(bytes, 6, 2);
-                    break;
-                case JAVA_LEGACY:
-                    reverseByteArray(bytes, 0, 8);
-                    reverseByteArray(bytes, 8, 8);
-                    break;
-                case PYTHON_LEGACY:
-                case STANDARD:
-                    break;
-                default:
-                    throw new BSONException("Unexpected UUID representation");
-            }
-        }
-
-        return new UUID(readLongFromArrayBigEndian(bytes, 0), readLongFromArrayBigEndian(bytes, 8));
+        return UuidHelper.decodeBinaryToUuid(bytes, subType, uuidRepresentation);
     }
 
     @Override
@@ -127,28 +98,10 @@ public Class<UUID> getEncoderClass() {
         return UUID.class;
     }
 
-    private static void writeLongToArrayBigEndian(final byte[] bytes, final int offset, final long x) {
-        bytes[offset + 7] = (byte) (0xFFL & (x));
-        bytes[offset + 6] = (byte) (0xFFL & (x >> 8));
-        bytes[offset + 5] = (byte) (0xFFL & (x >> 16));
-        bytes[offset + 4] = (byte) (0xFFL & (x >> 24));
-        bytes[offset + 3] = (byte) (0xFFL & (x >> 32));
-        bytes[offset + 2] = (byte) (0xFFL & (x >> 40));
-        bytes[offset + 1] = (byte) (0xFFL & (x >> 48));
-        bytes[offset] = (byte) (0xFFL & (x >> 56));
-    }
-
-    private static long readLongFromArrayBigEndian(final byte[] bytes, final int offset) {
-        long x = 0;
-        x |= (0xFFL & bytes[offset + 7]);
-        x |= (0xFFL & bytes[offset + 6]) << 8;
-        x |= (0xFFL & bytes[offset + 5]) << 16;
-        x |= (0xFFL & bytes[offset + 4]) << 24;
-        x |= (0xFFL & bytes[offset + 3]) << 32;
-        x |= (0xFFL & bytes[offset + 2]) << 40;
-        x |= (0xFFL & bytes[offset + 1]) << 48;
-        x |= (0xFFL & bytes[offset]) << 56;
-        return x;
+    @Override
+    public String toString() {
+        return "UuidCodec{"
+                + "uuidRepresentation=" + uuidRepresentation
+                + '}';
     }
-
 }
diff --git a/bson/src/main/org/bson/codecs/UuidCodecHelper.java b/bson/src/main/org/bson/codecs/UuidCodecHelper.java
index 30f6215f7e8..5087c212dee 100644
--- a/bson/src/main/org/bson/codecs/UuidCodecHelper.java
+++ b/bson/src/main/org/bson/codecs/UuidCodecHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/UuidCodecProvider.java b/bson/src/main/org/bson/codecs/UuidCodecProvider.java
index 9f2d507d167..25de388c3d2 100644
--- a/bson/src/main/org/bson/codecs/UuidCodecProvider.java
+++ b/bson/src/main/org/bson/codecs/UuidCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/ValueCodecProvider.java b/bson/src/main/org/bson/codecs/ValueCodecProvider.java
index facf3106dcd..9420b50568a 100644
--- a/bson/src/main/org/bson/codecs/ValueCodecProvider.java
+++ b/bson/src/main/org/bson/codecs/ValueCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
  *     <li>{@link org.bson.codecs.DoubleCodec}</li>
  *     <li>{@link org.bson.codecs.IntegerCodec}</li>
  *     <li>{@link org.bson.codecs.LongCodec}</li>
+ *     <li>{@link org.bson.codecs.Decimal128Codec}</li>
  *     <li>{@link org.bson.codecs.MinKeyCodec}</li>
  *     <li>{@link org.bson.codecs.MaxKeyCodec}</li>
  *     <li>{@link org.bson.codecs.CodeCodec}</li>
@@ -78,11 +79,13 @@ private void addCodecs() {
         addCodec(new MinKeyCodec());
         addCodec(new MaxKeyCodec());
         addCodec(new CodeCodec());
+        addCodec(new Decimal128Codec());
+        addCodec(new BigDecimalCodec());
         addCodec(new ObjectIdCodec());
         addCodec(new CharacterCodec());
         addCodec(new StringCodec());
         addCodec(new SymbolCodec());
-        addCodec(new UuidCodec());
+        addCodec(new OverridableUuidRepresentationUuidCodec());
 
         addCodec(new ByteCodec());
         addCodec(new PatternCodec());
diff --git a/bson/src/main/org/bson/codecs/configuration/CodecConfigurationException.java b/bson/src/main/org/bson/codecs/configuration/CodecConfigurationException.java
index a5f5997fbe4..13d5c79dfa5 100644
--- a/bson/src/main/org/bson/codecs/configuration/CodecConfigurationException.java
+++ b/bson/src/main/org/bson/codecs/configuration/CodecConfigurationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,4 +34,15 @@ public class CodecConfigurationException extends RuntimeException {
     public CodecConfigurationException(final String msg) {
         super(msg);
     }
+
+    /**
+     * Construct a new instance and wraps a cause
+     *
+     * @param message the message
+     * @param cause   the underlying cause
+     * @since 3.5
+     */
+    public CodecConfigurationException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/bson/src/main/org/bson/codecs/configuration/CodecProvider.java b/bson/src/main/org/bson/codecs/configuration/CodecProvider.java
index 699cced1f82..b667067d4ff 100644
--- a/bson/src/main/org/bson/codecs/configuration/CodecProvider.java
+++ b/bson/src/main/org/bson/codecs/configuration/CodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/configuration/CodecRegistries.java b/bson/src/main/org/bson/codecs/configuration/CodecRegistries.java
index e692a9e5cd0..f4821e9ea3c 100644
--- a/bson/src/main/org/bson/codecs/configuration/CodecRegistries.java
+++ b/bson/src/main/org/bson/codecs/configuration/CodecRegistries.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,7 @@
 package org.bson.codecs.configuration;
 
 import org.bson.codecs.Codec;
+import org.bson.internal.ProvidersCodecRegistry;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bson/src/main/org/bson/codecs/configuration/CodecRegistry.java b/bson/src/main/org/bson/codecs/configuration/CodecRegistry.java
index 31fb577b91f..0ccad168756 100644
--- a/bson/src/main/org/bson/codecs/configuration/CodecRegistry.java
+++ b/bson/src/main/org/bson/codecs/configuration/CodecRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/configuration/MapOfCodecsProvider.java b/bson/src/main/org/bson/codecs/configuration/MapOfCodecsProvider.java
index acf22aa94fd..e98ff3b7729 100644
--- a/bson/src/main/org/bson/codecs/configuration/MapOfCodecsProvider.java
+++ b/bson/src/main/org/bson/codecs/configuration/MapOfCodecsProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,7 @@
 final class MapOfCodecsProvider implements CodecProvider {
     private final Map<Class<?>, Codec<?>> codecsMap = new HashMap<Class<?>, Codec<?>>();
 
-    public MapOfCodecsProvider(final List<? extends Codec<?>> codecsList) {
+    MapOfCodecsProvider(final List<? extends Codec<?>> codecsList) {
        for (Codec<?> codec : codecsList) {
            codecsMap.put(codec.getEncoderClass(), codec);
        }
diff --git a/bson/src/main/org/bson/codecs/configuration/Optional.java b/bson/src/main/org/bson/codecs/configuration/Optional.java
deleted file mode 100644
index 312554be785..00000000000
--- a/bson/src/main/org/bson/codecs/configuration/Optional.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bson.codecs.configuration;
-
-import java.util.NoSuchElementException;
-
-
-abstract class Optional<T> {
-
-    private static final Optional<Object> NONE = new Optional<Object>() {
-        @Override
-        public Object get() {
-            throw new NoSuchElementException(".get call on None!");
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
-
-    @SuppressWarnings("unchecked")
-    public static <T> Optional<T> empty() {
-        return (Optional<T>) NONE;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> Optional<T> of(final T it) {
-        if (it == null) {
-            return (Optional<T>) Optional.NONE;
-        } else {
-            return new Some<T>(it);
-        }
-    }
-
-    public abstract T get();
-
-    public abstract boolean isEmpty();
-
-    @Override
-    public String toString() {
-        return "None";
-    }
-
-    public boolean isDefined() {
-        return !isEmpty();
-    }
-
-    public static class Some<T> extends Optional<T> {
-        private final T value;
-
-        Some(final T value) {
-            this.value = value;
-        }
-
-        @Override
-        public T get() {
-            return value;
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return false;
-        }
-
-        @Override
-        public String toString() {
-            return String.format("Some(%s)", value);
-        }
-    }
-}
diff --git a/bson/src/main/org/bson/codecs/configuration/package-info.java b/bson/src/main/org/bson/codecs/configuration/package-info.java
index 04c1566d9be..a4c3e3847ea 100644
--- a/bson/src/main/org/bson/codecs/configuration/package-info.java
+++ b/bson/src/main/org/bson/codecs/configuration/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bson/src/main/org/bson/codecs/jsr310/DateTimeBasedCodec.java b/bson/src/main/org/bson/codecs/jsr310/DateTimeBasedCodec.java
new file mode 100644
index 00000000000..b956d022198
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/jsr310/DateTimeBasedCodec.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310;
+
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import static java.lang.String.format;
+
+abstract class DateTimeBasedCodec<T> implements Codec<T> {
+
+    long validateAndReadDateTime(final BsonReader reader) {
+        BsonType currentType = reader.getCurrentBsonType();
+        if (!currentType.equals(BsonType.DATE_TIME)) {
+            throw new CodecConfigurationException(format("Could not decode into %s, expected '%s' BsonType but got '%s'.",
+                    getEncoderClass().getSimpleName(), BsonType.DATE_TIME, currentType));
+        }
+        return reader.readDateTime();
+    }
+
+}
diff --git a/bson/src/main/org/bson/codecs/jsr310/InstantCodec.java b/bson/src/main/org/bson/codecs/jsr310/InstantCodec.java
new file mode 100644
index 00000000000..79134024b7a
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/jsr310/InstantCodec.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2018 Cezary Bartosiak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.time.Instant;
+
+import static java.lang.String.format;
+
+/**
+ * Instant Codec.
+ *
+ * <p>
+ * Encodes and decodes {@code Instant} objects to and from {@code DateTime}. Data is stored to millisecond accuracy.
+ * </p>
+ * <p>Note: Requires Java 8 or greater.</p>
+ *
+ * @mongodb.driver.manual reference/bson-types
+ * @since 3.7
+ */
+public class InstantCodec extends DateTimeBasedCodec<Instant> {
+
+    @Override
+    public Instant decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return Instant.ofEpochMilli(validateAndReadDateTime(reader));
+    }
+
+    /**
+     * {@inheritDoc}
+     * @throws CodecConfigurationException if the Instant cannot be converted to a valid Bson DateTime.
+     */
+    @Override
+    public void encode(final BsonWriter writer, final Instant value, final EncoderContext encoderContext) {
+        try {
+            writer.writeDateTime(value.toEpochMilli());
+        } catch (ArithmeticException e) {
+            throw new CodecConfigurationException(format("Unsupported Instant value '%s' could not be converted to milliseconds: %s",
+                    value, e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public Class<Instant> getEncoderClass() {
+        return Instant.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/jsr310/Jsr310CodecProvider.java b/bson/src/main/org/bson/codecs/jsr310/Jsr310CodecProvider.java
new file mode 100644
index 00000000000..941fc15cfff
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/jsr310/Jsr310CodecProvider.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2018 Cezary Bartosiak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A CodecProvider for JSR-310 Date and Time API classes.
+ *
+ * <p>
+ * Supplies the following JSR-310 based Codecs:
+ * <ul>
+ * <li>{@link InstantCodec}
+ * <li>{@link LocalDateCodec}
+ * <li>{@link LocalDateTimeCodec}
+ * <li>{@link LocalTimeCodec}
+ * </ul>
+ * <p>Requires Java 8 or greater.</p>
+ *
+ * @since 3.7
+ */
+public class Jsr310CodecProvider implements CodecProvider {
+    private static final Map<Class<?>, Codec<?>> JSR310_CODEC_MAP = new HashMap<Class<?>, Codec<?>>();
+    static {
+        try {
+            Class.forName("java.time.Instant"); // JSR-310 support canary test.
+            putCodec(new InstantCodec());
+            putCodec(new LocalDateCodec());
+            putCodec(new LocalDateTimeCodec());
+            putCodec(new LocalTimeCodec());
+        } catch (ClassNotFoundException e) {
+            // No JSR-310 support
+        }
+    }
+
+    private static void putCodec(final Codec<?> codec) {
+        JSR310_CODEC_MAP.put(codec.getEncoderClass(), codec);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
+        return (Codec<T>) JSR310_CODEC_MAP.get(clazz);
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/jsr310/LocalDateCodec.java b/bson/src/main/org/bson/codecs/jsr310/LocalDateCodec.java
new file mode 100644
index 00000000000..3b273df3455
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/jsr310/LocalDateCodec.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2018 Cezary Bartosiak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+
+import static java.lang.String.format;
+
+/**
+ * LocalDate Codec.
+ *
+ * <p>Encodes and decodes {@code LocalDate} objects to and from {@code DateTime}.</p>
+ * <p>Converts the {@code LocalDate} values to and from {@link ZoneOffset#UTC}.</p>
+ * <p>Note: Requires Java 8 or greater.</p>
+ *
+ * @mongodb.driver.manual reference/bson-types
+ * @since 3.7
+ */
+public class LocalDateCodec extends DateTimeBasedCodec<LocalDate> {
+
+    @Override
+    public LocalDate decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return Instant.ofEpochMilli(validateAndReadDateTime(reader)).atZone(ZoneOffset.UTC).toLocalDate();
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>Converts the {@code LocalDate} to {@link ZoneOffset#UTC} via {@link LocalDate#atStartOfDay(ZoneId)}.</p>
+     * @throws CodecConfigurationException if the LocalDate cannot be converted to a valid Bson DateTime.
+     */
+    @Override
+    public void encode(final BsonWriter writer, final LocalDate value, final EncoderContext encoderContext) {
+        try {
+            writer.writeDateTime(value.atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli());
+        } catch (ArithmeticException e) {
+            throw new CodecConfigurationException(format("Unsupported LocalDate '%s' could not be converted to milliseconds: %s",
+                    value, e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public Class<LocalDate> getEncoderClass() {
+        return LocalDate.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/jsr310/LocalDateTimeCodec.java b/bson/src/main/org/bson/codecs/jsr310/LocalDateTimeCodec.java
new file mode 100644
index 00000000000..a1cf068aecf
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/jsr310/LocalDateTimeCodec.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2018 Cezary Bartosiak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
+import static java.lang.String.format;
+
+/**
+ * LocalDateTime Codec.
+ *
+ * <p>Encodes and decodes {@code LocalDateTime} objects to and from {@code DateTime}. Data is stored to millisecond accuracy.</p>
+ * <p>Converts the {@code LocalDateTime} values to and from {@link ZoneOffset#UTC}.</p>
+ * <p>Note: Requires Java 8 or greater.</p>
+ *
+ * @mongodb.driver.manual reference/bson-types
+ * @since 3.7
+ */
+public class LocalDateTimeCodec extends DateTimeBasedCodec<LocalDateTime> {
+
+    @Override
+    public LocalDateTime decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return Instant.ofEpochMilli(validateAndReadDateTime(reader)).atZone(ZoneOffset.UTC).toLocalDateTime();
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>Converts the {@code LocalDateTime} to {@link ZoneOffset#UTC} via {@link LocalDateTime#toInstant(ZoneOffset)}.</p>
+     * @throws CodecConfigurationException if the LocalDateTime cannot be converted to a valid Bson DateTime.
+     */
+    @Override
+    public void encode(final BsonWriter writer, final LocalDateTime value, final EncoderContext encoderContext) {
+        try {
+            writer.writeDateTime(value.toInstant(ZoneOffset.UTC).toEpochMilli());
+        } catch (ArithmeticException e) {
+            throw new CodecConfigurationException(format("Unsupported LocalDateTime value '%s' could not be converted to milliseconds: %s",
+                    value, e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public Class<LocalDateTime> getEncoderClass() {
+        return LocalDateTime.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/jsr310/LocalTimeCodec.java b/bson/src/main/org/bson/codecs/jsr310/LocalTimeCodec.java
new file mode 100644
index 00000000000..8aa7081b765
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/jsr310/LocalTimeCodec.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2018 Cezary Bartosiak
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+
+/**
+ * LocalTime Codec.
+ *
+ * <p>Encodes and decodes {@code LocalTime} objects to and from {@code DateTime}. Data is stored to millisecond accuracy.</p>
+ * <p>Converts the {@code LocalTime} values to and from EpochDay at {@link ZoneOffset#UTC}.</p>
+ * <p>Note: Requires Java 8 or greater.</p>
+ *
+ * @mongodb.driver.manual reference/bson-types
+ * @since 3.7
+ */
+public class LocalTimeCodec extends DateTimeBasedCodec<LocalTime> {
+
+    @Override
+    public LocalTime decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return Instant.ofEpochMilli(validateAndReadDateTime(reader)).atOffset(ZoneOffset.UTC).toLocalTime();
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>Converts the {@code LocalTime} to {@link ZoneOffset#UTC} at EpochDay via {@link LocalTime#atDate(LocalDate)} and
+     * {@link java.time.LocalDateTime#toInstant(ZoneOffset)}.</p>
+     */
+    @Override
+    public void encode(final BsonWriter writer, final LocalTime value, final EncoderContext encoderContext) {
+        writer.writeDateTime(value.atDate(LocalDate.ofEpochDay(0L)).toInstant(ZoneOffset.UTC).toEpochMilli());
+    }
+
+    @Override
+    public Class<LocalTime> getEncoderClass() {
+        return LocalTime.class;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/jsr310/package-info.java b/bson/src/main/org/bson/codecs/jsr310/package-info.java
new file mode 100644
index 00000000000..6541a66af34
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/jsr310/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains classes specific to the JSR-310 Date and Time API
+ */
+package org.bson.codecs.jsr310;
diff --git a/bson/src/main/org/bson/codecs/package-info.java b/bson/src/main/org/bson/codecs/package-info.java
index b0aac1d1b3a..74000679ccd 100644
--- a/bson/src/main/org/bson/codecs/package-info.java
+++ b/bson/src/main/org/bson/codecs/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/codecs/pojo/AutomaticPojoCodec.java b/bson/src/main/org/bson/codecs/pojo/AutomaticPojoCodec.java
new file mode 100644
index 00000000000..3b001ee047c
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/AutomaticPojoCodec.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import static java.lang.String.format;
+
+final class AutomaticPojoCodec<T> extends PojoCodec<T> {
+    private final PojoCodec<T> pojoCodec;
+
+    AutomaticPojoCodec(final PojoCodec<T> pojoCodec) {
+        this.pojoCodec = pojoCodec;
+    }
+
+    @Override
+    public T decode(final BsonReader reader, final DecoderContext decoderContext) {
+        try {
+            return pojoCodec.decode(reader, decoderContext);
+        } catch (CodecConfigurationException e) {
+            throw new CodecConfigurationException(
+                    format("An exception occurred when decoding using the AutomaticPojoCodec.%n"
+                            + "Decoding into a '%s' failed with the following exception:%n%n%s%n%n"
+                            + "A custom Codec or PojoCodec may need to be explicitly configured and registered to handle this type.",
+                            pojoCodec.getEncoderClass().getSimpleName(), e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final T value, final EncoderContext encoderContext) {
+        try {
+            pojoCodec.encode(writer, value, encoderContext);
+        } catch (CodecConfigurationException e) {
+            throw new CodecConfigurationException(
+                    format("An exception occurred when encoding using the AutomaticPojoCodec.%n"
+                            + "Encoding a %s: '%s' failed with the following exception:%n%n%s%n%n"
+                            + "A custom Codec or PojoCodec may need to be explicitly configured and registered to handle this type.",
+                            getEncoderClass().getSimpleName(), value, e.getMessage()), e);
+        }
+    }
+
+    @Override
+    public Class<T> getEncoderClass() {
+        return pojoCodec.getEncoderClass();
+    }
+
+    @Override
+    ClassModel<T> getClassModel() {
+        return pojoCodec.getClassModel();
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/ClassModel.java b/bson/src/main/org/bson/codecs/pojo/ClassModel.java
new file mode 100644
index 00000000000..3c039a178c3
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/ClassModel.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This model represents the metadata for a class and all its properties.
+ *
+ * @param <T> The type of the class the ClassModel represents
+ * @since 3.5
+ */
+public final class ClassModel<T> {
+    private final String name;
+    private final Class<T> type;
+    private final boolean hasTypeParameters;
+    private final InstanceCreatorFactory<T> instanceCreatorFactory;
+    private final boolean discriminatorEnabled;
+    private final String discriminatorKey;
+    private final String discriminator;
+    private final IdPropertyModelHolder<?> idPropertyModelHolder;
+    private final List<PropertyModel<?>> propertyModels;
+    private final Map<String, TypeParameterMap> propertyNameToTypeParameterMap;
+
+    ClassModel(final Class<T> clazz, final Map<String, TypeParameterMap> propertyNameToTypeParameterMap,
+               final InstanceCreatorFactory<T> instanceCreatorFactory, final Boolean discriminatorEnabled, final String discriminatorKey,
+               final String discriminator, final IdPropertyModelHolder<?> idPropertyModelHolder,
+               final List<PropertyModel<?>> propertyModels) {
+        this.name = clazz.getSimpleName();
+        this.type = clazz;
+        this.hasTypeParameters = clazz.getTypeParameters().length > 0;
+        this.propertyNameToTypeParameterMap = Collections.unmodifiableMap(
+                new HashMap<String, TypeParameterMap>(propertyNameToTypeParameterMap));
+        this.instanceCreatorFactory = instanceCreatorFactory;
+        this.discriminatorEnabled = discriminatorEnabled;
+        this.discriminatorKey = discriminatorKey;
+        this.discriminator = discriminator;
+        this.idPropertyModelHolder = idPropertyModelHolder;
+        this.propertyModels = Collections.unmodifiableList(new ArrayList<PropertyModel<?>>(propertyModels));
+    }
+
+    /**
+     * Creates a new Class Model builder instance using reflection.
+     *
+     * @param type the POJO class to reflect and configure the builder with.
+     * @param <S> the type of the class
+     * @return a new Class Model builder instance using reflection on the {@code clazz}.
+     */
+    public static <S> ClassModelBuilder<S> builder(final Class<S> type) {
+        return new ClassModelBuilder<S>(type);
+    }
+
+    /**
+     * @return a new InstanceCreator instance for the ClassModel
+     */
+    InstanceCreator<T> getInstanceCreator() {
+        return instanceCreatorFactory.create();
+    }
+
+    /**
+     * @return the backing class for the ClassModel
+     */
+    public Class<T> getType() {
+        return type;
+    }
+
+    /**
+     * @return true if the underlying type has type parameters.
+     */
+    public boolean hasTypeParameters() {
+        return hasTypeParameters;
+    }
+
+    /**
+     * @return true if a discriminator should be used when storing the data.
+     */
+    public boolean useDiscriminator() {
+        return discriminatorEnabled;
+    }
+
+    /**
+     * Gets the value for the discriminator.
+     *
+     * @return the discriminator value or null if not set
+     */
+    public String getDiscriminatorKey() {
+        return discriminatorKey;
+    }
+
+    /**
+     * Returns the discriminator key.
+     *
+     * @return the discriminator key or null if not set
+     */
+    public String getDiscriminator() {
+        return discriminator;
+    }
+
+    /**
+     * Gets a {@link PropertyModel} by the property name.
+     *
+     * @param propertyName the PropertyModel's property name
+     * @return the PropertyModel or null if the property is not found
+     */
+    public PropertyModel<?> getPropertyModel(final String propertyName) {
+        for (PropertyModel<?> propertyModel : propertyModels) {
+            if (propertyModel.getName().equals(propertyName)) {
+                return propertyModel;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns all the properties on this model
+     *
+     * @return the list of properties
+     */
+    public List<PropertyModel<?>> getPropertyModels() {
+        return propertyModels;
+    }
+
+    /**
+     * Returns the {@link PropertyModel} mapped as the id property for this ClassModel
+     *
+     * @return the PropertyModel for the id
+     */
+    public PropertyModel<?> getIdPropertyModel() {
+        return idPropertyModelHolder != null ? idPropertyModelHolder.getPropertyModel() : null;
+    }
+
+    IdPropertyModelHolder<?> getIdPropertyModelHolder() {
+        return idPropertyModelHolder;
+    }
+
+    /**
+     * Returns the name of the class represented by this ClassModel
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return "ClassModel{"
+                + "type=" + type
+                + "}";
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ClassModel<?> that = (ClassModel<?>) o;
+
+        if (discriminatorEnabled != that.discriminatorEnabled) {
+            return false;
+        }
+        if (!getType().equals(that.getType())) {
+            return false;
+        }
+        if (!getInstanceCreatorFactory().equals(that.getInstanceCreatorFactory())) {
+            return false;
+        }
+        if (getDiscriminatorKey() != null ? !getDiscriminatorKey().equals(that.getDiscriminatorKey())
+                : that.getDiscriminatorKey() != null) {
+            return false;
+        }
+        if (getDiscriminator() != null ? !getDiscriminator().equals(that.getDiscriminator()) : that.getDiscriminator() != null) {
+            return false;
+        }
+        if (idPropertyModelHolder != null ? !idPropertyModelHolder.equals(that.idPropertyModelHolder)
+                : that.idPropertyModelHolder != null) {
+            return false;
+        }
+        if (!getPropertyModels().equals(that.getPropertyModels())) {
+            return false;
+        }
+        if (!getPropertyNameToTypeParameterMap().equals(that.getPropertyNameToTypeParameterMap())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getType().hashCode();
+        result = 31 * result + getInstanceCreatorFactory().hashCode();
+        result = 31 * result + (discriminatorEnabled ? 1 : 0);
+        result = 31 * result + (getDiscriminatorKey() != null ? getDiscriminatorKey().hashCode() : 0);
+        result = 31 * result + (getDiscriminator() != null ? getDiscriminator().hashCode() : 0);
+        result = 31 * result + (getIdPropertyModelHolder() != null ? getIdPropertyModelHolder().hashCode() : 0);
+        result = 31 * result + getPropertyModels().hashCode();
+        result = 31 * result + getPropertyNameToTypeParameterMap().hashCode();
+        return result;
+    }
+
+    InstanceCreatorFactory<T> getInstanceCreatorFactory() {
+        return instanceCreatorFactory;
+    }
+
+    Map<String, TypeParameterMap> getPropertyNameToTypeParameterMap() {
+        return propertyNameToTypeParameterMap;
+    }
+
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/ClassModelBuilder.java b/bson/src/main/org/bson/codecs/pojo/ClassModelBuilder.java
new file mode 100644
index 00000000000..6783ef815df
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/ClassModelBuilder.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.lang.String.format;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
+import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.pojo.Conventions.DEFAULT_CONVENTIONS;
+import static org.bson.codecs.pojo.PojoBuilderHelper.configureClassModelBuilder;
+import static org.bson.codecs.pojo.PojoBuilderHelper.stateNotNull;
+
+/**
+ * A builder for programmatically creating {@code ClassModels}.
+ *
+ * @param <T> The type of the class the ClassModel represents
+ * @since 3.5
+ * @see ClassModel
+ */
+public class ClassModelBuilder<T> {
+    static final String ID_PROPERTY_NAME = "_id";
+    private final List<PropertyModelBuilder<?>> propertyModelBuilders = new ArrayList<PropertyModelBuilder<?>>();
+    private IdGenerator<?> idGenerator;
+    private InstanceCreatorFactory<T> instanceCreatorFactory;
+    private Class<T> type;
+    private Map<String, TypeParameterMap> propertyNameToTypeParameterMap = emptyMap();
+    private List<Convention> conventions = DEFAULT_CONVENTIONS;
+    private List<Annotation> annotations = emptyList();
+    private boolean discriminatorEnabled;
+    private String discriminator;
+    private String discriminatorKey;
+    private String idPropertyName;
+
+    ClassModelBuilder(final Class<T> type) {
+        configureClassModelBuilder(this, notNull("type", type));
+    }
+
+    /**
+     * Sets the IdGenerator for the ClassModel
+     *
+     * @param idGenerator the IdGenerator
+     * @return this
+     * @since 3.10
+     */
+    public ClassModelBuilder<T> idGenerator(final IdGenerator<?> idGenerator) {
+        this.idGenerator = idGenerator;
+        return this;
+    }
+
+    /**
+     * @return the IdGenerator for the ClassModel, or null if not set
+     * @since 3.10
+     */
+    public IdGenerator<?> getIdGenerator() {
+        return idGenerator;
+    }
+
+    /**
+     * Sets the InstanceCreatorFactory for the ClassModel
+     *
+     * @param instanceCreatorFactory the InstanceCreatorFactory
+     * @return this
+     */
+    public ClassModelBuilder<T> instanceCreatorFactory(final InstanceCreatorFactory<T> instanceCreatorFactory) {
+        this.instanceCreatorFactory = notNull("instanceCreatorFactory", instanceCreatorFactory);
+        return this;
+    }
+
+    /**
+     * @return the InstanceCreatorFactory for the ClassModel
+     */
+    public InstanceCreatorFactory<T> getInstanceCreatorFactory() {
+        return instanceCreatorFactory;
+    }
+
+    /**
+     * Sets the type of the model
+     *
+     * @param type the type of the class
+     * @return the builder to configure the class being modeled
+     */
+    public ClassModelBuilder<T> type(final Class<T> type) {
+        this.type = notNull("type", type);
+        return this;
+    }
+
+    /**
+     * @return the type if set or null
+     */
+    public Class<T> getType() {
+        return type;
+    }
+
+    /**
+     * Sets the conventions to apply to the model
+     *
+     * @param conventions a list of conventions
+     * @return this
+     */
+    public ClassModelBuilder<T> conventions(final List<Convention> conventions) {
+        this.conventions = notNull("conventions", conventions);
+        return this;
+    }
+
+    /**
+     * @return the conventions o apply to the model
+     */
+    public List<Convention> getConventions() {
+        return conventions;
+    }
+
+    /**
+     * Sets the annotations for the model
+     *
+     * @param annotations a list of annotations
+     * @return this
+     */
+    public ClassModelBuilder<T> annotations(final List<Annotation> annotations) {
+        this.annotations = notNull("annotations", annotations);
+        return this;
+    }
+
+    /**
+     * @return the annotations on the modeled type if set or null
+     */
+    public List<Annotation> getAnnotations() {
+        return annotations;
+    }
+
+    /**
+     * Sets the discriminator to be used when storing instances of the modeled type
+     *
+     * @param discriminator the discriminator value
+     * @return this
+     */
+    public ClassModelBuilder<T> discriminator(final String discriminator) {
+        this.discriminator = discriminator;
+        return this;
+    }
+
+    /**
+     * @return the discriminator to be used when storing instances of the modeled type or null if not set
+     */
+    public String getDiscriminator() {
+        return discriminator;
+    }
+
+    /**
+     * Sets the discriminator key to be used when storing instances of the modeled type
+     *
+     * @param discriminatorKey the discriminator key value
+     * @return this
+     */
+    public ClassModelBuilder<T> discriminatorKey(final String discriminatorKey) {
+        this.discriminatorKey = discriminatorKey;
+        return this;
+    }
+
+    /**
+     * @return the discriminator key to be used when storing instances of the modeled type or null if not set
+     */
+    public String getDiscriminatorKey() {
+        return discriminatorKey;
+    }
+
+    /**
+     * Enables or disables the use of a discriminator when serializing
+     *
+     * @param discriminatorEnabled true to enable the use of a discriminator
+     * @return this
+     */
+    public ClassModelBuilder<T> enableDiscriminator(final boolean discriminatorEnabled) {
+        this.discriminatorEnabled = discriminatorEnabled;
+        return this;
+    }
+
+    /**
+     * @return true if a discriminator should be used when serializing, otherwise false
+     */
+    public Boolean useDiscriminator() {
+        return discriminatorEnabled;
+    }
+
+    /**
+     * Designates a property as the {@code _id} property for this type.  If another property is currently marked as the  {@code _id}
+     * property, that setting is cleared in favor of the named property.
+     *
+     * @param idPropertyName the property name to use for the {@code _id} property, a null value removes the set idPropertyName.
+     *
+     * @return this
+     */
+    public ClassModelBuilder<T> idPropertyName(final String idPropertyName) {
+        this.idPropertyName = idPropertyName;
+        return this;
+    }
+
+    /**
+     * @return the designated {@code _id} property name for this type or null if not set
+     */
+    public String getIdPropertyName() {
+        return idPropertyName;
+    }
+
+    /**
+     * Remove a property from the builder
+     *
+     * @param propertyName the actual property name in the POJO and not the {@code documentPropertyName}.
+     * @return returns true if the property matched and was removed
+     */
+    public boolean removeProperty(final String propertyName) {
+        return propertyModelBuilders.remove(getProperty(notNull("propertyName", propertyName)));
+    }
+
+    /**
+     * Gets a property by the property name.
+     *
+     * @param propertyName the name of the property to find.
+     * @return the property or null if the property is not found
+     */
+    public PropertyModelBuilder<?> getProperty(final String propertyName) {
+        notNull("propertyName", propertyName);
+        for (PropertyModelBuilder<?> propertyModelBuilder : propertyModelBuilders) {
+            if (propertyModelBuilder.getName().equals(propertyName)) {
+                return propertyModelBuilder;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @return the properties on the modeled type
+     */
+    public List<PropertyModelBuilder<?>> getPropertyModelBuilders() {
+        return Collections.unmodifiableList(propertyModelBuilders);
+    }
+
+    /**
+     * Creates a new ClassModel instance based on the mapping data provided.
+     *
+     * @return the new instance
+     */
+    public ClassModel<T> build() {
+        List<PropertyModel<?>> propertyModels = new ArrayList<PropertyModel<?>>();
+        PropertyModel<?> idPropertyModel = null;
+
+        stateNotNull("type", type);
+        for (Convention convention : conventions) {
+            convention.apply(this);
+        }
+
+        stateNotNull("instanceCreatorFactory", instanceCreatorFactory);
+        if (discriminatorEnabled) {
+            stateNotNull("discriminatorKey", discriminatorKey);
+            stateNotNull("discriminator", discriminator);
+        }
+
+        for (PropertyModelBuilder<?> propertyModelBuilder : propertyModelBuilders) {
+            boolean isIdProperty = propertyModelBuilder.getName().equals(idPropertyName);
+            if (isIdProperty) {
+                propertyModelBuilder.readName(ID_PROPERTY_NAME).writeName(ID_PROPERTY_NAME);
+            }
+
+            PropertyModel<?> model = propertyModelBuilder.build();
+            propertyModels.add(model);
+            if (isIdProperty) {
+                idPropertyModel = model;
+            }
+        }
+        validatePropertyModels(type.getSimpleName(), propertyModels);
+        return new ClassModel<T>(type, propertyNameToTypeParameterMap, instanceCreatorFactory, discriminatorEnabled, discriminatorKey,
+                discriminator, IdPropertyModelHolder.create(type, idPropertyModel, idGenerator), unmodifiableList(propertyModels));
+    }
+
+    @Override
+    public String toString() {
+        return format("ClassModelBuilder{type=%s}", type);
+    }
+
+    Map<String, TypeParameterMap> getPropertyNameToTypeParameterMap() {
+        return propertyNameToTypeParameterMap;
+    }
+
+    ClassModelBuilder<T> propertyNameToTypeParameterMap(final Map<String, TypeParameterMap> propertyNameToTypeParameterMap) {
+        this.propertyNameToTypeParameterMap = unmodifiableMap(new HashMap<String, TypeParameterMap>(propertyNameToTypeParameterMap));
+        return this;
+    }
+
+    ClassModelBuilder<T> addProperty(final PropertyModelBuilder<?> propertyModelBuilder) {
+        propertyModelBuilders.add(notNull("propertyModelBuilder", propertyModelBuilder));
+        return this;
+    }
+
+    private void validatePropertyModels(final String declaringClass, final List<PropertyModel<?>> propertyModels) {
+        Map<String, Integer> propertyNameMap = new HashMap<String, Integer>();
+        Map<String, Integer> propertyReadNameMap = new HashMap<String, Integer>();
+        Map<String, Integer> propertyWriteNameMap = new HashMap<String, Integer>();
+
+        for (PropertyModel<?> propertyModel : propertyModels) {
+            if (propertyModel.hasError()) {
+                throw new CodecConfigurationException(propertyModel.getError());
+            }
+            checkForDuplicates("property", propertyModel.getName(), propertyNameMap, declaringClass);
+            if (propertyModel.isReadable()) {
+                checkForDuplicates("read property", propertyModel.getReadName(), propertyReadNameMap, declaringClass);
+            }
+            if (propertyModel.isWritable()) {
+                checkForDuplicates("write property", propertyModel.getWriteName(), propertyWriteNameMap, declaringClass);
+            }
+        }
+
+        if (idPropertyName != null && !propertyNameMap.containsKey(idPropertyName)) {
+            throw new CodecConfigurationException(format("Invalid id property, property named '%s' can not be found.", idPropertyName));
+        }
+    }
+
+    private void checkForDuplicates(final String propertyType, final String propertyName, final Map<String, Integer> propertyNameMap,
+                                    final String declaringClass) {
+        if (propertyNameMap.containsKey(propertyName)) {
+            throw new CodecConfigurationException(format("Duplicate %s named '%s' found in %s.", propertyType, propertyName,
+                    declaringClass));
+        }
+        propertyNameMap.put(propertyName, 1);
+    }
+
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/CollectionPropertyCodecProvider.java b/bson/src/main/org/bson/codecs/pojo/CollectionPropertyCodecProvider.java
new file mode 100644
index 00000000000..e7440cfeb68
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/CollectionPropertyCodecProvider.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo;
+
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+
+import static java.lang.String.format;
+
+final class CollectionPropertyCodecProvider implements PropertyCodecProvider {
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    @Override
+    public <T> Codec<T> get(final TypeWithTypeParameters<T> type, final PropertyCodecRegistry registry) {
+        if (Collection.class.isAssignableFrom(type.getType()) && type.getTypeParameters().size() == 1) {
+            return new CollectionCodec(type.getType(), registry.get(type.getTypeParameters().get(0)));
+        } else {
+            return null;
+        }
+    }
+
+    private static class CollectionCodec<T> implements Codec<Collection<T>> {
+        private final Class<Collection<T>> encoderClass;
+        private final Codec<T> codec;
+
+        CollectionCodec(final Class<Collection<T>> encoderClass, final Codec<T> codec) {
+            this.encoderClass = encoderClass;
+            this.codec = codec;
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final Collection<T> collection, final EncoderContext encoderContext) {
+            writer.writeStartArray();
+            for (final T value : collection) {
+                if (value == null) {
+                    writer.writeNull();
+                } else {
+                    codec.encode(writer, value, encoderContext);
+                }
+            }
+            writer.writeEndArray();
+        }
+
+        @Override
+        public Collection<T> decode(final BsonReader reader, final DecoderContext context) {
+            Collection<T> collection = getInstance();
+            reader.readStartArray();
+            while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                if (reader.getCurrentBsonType() == BsonType.NULL) {
+                    collection.add(null);
+                    reader.readNull();
+                } else {
+                    collection.add(codec.decode(reader, context));
+                }
+            }
+            reader.readEndArray();
+            return collection;
+        }
+
+        @Override
+        public Class<Collection<T>> getEncoderClass() {
+            return encoderClass;
+        }
+
+        private Collection<T> getInstance() {
+            if (encoderClass.isInterface()) {
+                if (encoderClass.isAssignableFrom(ArrayList.class)) {
+                    return new ArrayList<T>();
+                } else if (encoderClass.isAssignableFrom(HashSet.class)) {
+                    return new HashSet<T>();
+                } else {
+                    throw new CodecConfigurationException(format("Unsupported Collection interface of %s!", encoderClass.getName()));
+                }
+            }
+
+            try {
+                return encoderClass.getDeclaredConstructor().newInstance();
+            } catch (final Exception e) {
+                throw new CodecConfigurationException(e.getMessage(), e);
+            }
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/Convention.java b/bson/src/main/org/bson/codecs/pojo/Convention.java
new file mode 100644
index 00000000000..f2101822200
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/Convention.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+/**
+ * Defines a convention to be applied when mapping a class.
+ *
+ * @since 3.5
+ */
+public interface Convention {
+
+    /**
+     * This method applies this Convention to the given ClassModelBuilder
+     *
+     * @param classModelBuilder the ClassModelBuilder to apply the convention to
+     */
+    void apply(ClassModelBuilder<?> classModelBuilder);
+
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/ConventionAnnotationImpl.java b/bson/src/main/org/bson/codecs/pojo/ConventionAnnotationImpl.java
new file mode 100644
index 00000000000..776b0767301
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/ConventionAnnotationImpl.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.lang.reflect.Modifier.isPublic;
+import static java.lang.reflect.Modifier.isStatic;
+import static org.bson.codecs.pojo.PojoBuilderHelper.createPropertyModelBuilder;
+
+final class ConventionAnnotationImpl implements Convention {
+
+    @Override
+    public void apply(final ClassModelBuilder<?> classModelBuilder) {
+        for (final Annotation annotation : classModelBuilder.getAnnotations()) {
+            processClassAnnotation(classModelBuilder, annotation);
+        }
+
+        for (PropertyModelBuilder<?> propertyModelBuilder : classModelBuilder.getPropertyModelBuilders()) {
+            processPropertyAnnotations(classModelBuilder, propertyModelBuilder);
+        }
+
+        processCreatorAnnotation(classModelBuilder);
+
+        cleanPropertyBuilders(classModelBuilder);
+    }
+
+    private void processClassAnnotation(final ClassModelBuilder<?> classModelBuilder, final Annotation annotation) {
+        if (annotation instanceof BsonDiscriminator) {
+            BsonDiscriminator discriminator = (BsonDiscriminator) annotation;
+            String key = discriminator.key();
+            if (!key.equals("")) {
+                classModelBuilder.discriminatorKey(key);
+            }
+
+            String name = discriminator.value();
+            if (!name.equals("")) {
+                classModelBuilder.discriminator(name);
+            }
+            classModelBuilder.enableDiscriminator(true);
+        }
+    }
+
+    private void processPropertyAnnotations(final ClassModelBuilder<?> classModelBuilder,
+                                            final PropertyModelBuilder<?> propertyModelBuilder) {
+        for (Annotation annotation : propertyModelBuilder.getReadAnnotations()) {
+            if (annotation instanceof BsonProperty) {
+                BsonProperty bsonProperty = (BsonProperty) annotation;
+                if (!"".equals(bsonProperty.value())) {
+                    propertyModelBuilder.readName(bsonProperty.value());
+                }
+                propertyModelBuilder.discriminatorEnabled(bsonProperty.useDiscriminator());
+                if (propertyModelBuilder.getName().equals(classModelBuilder.getIdPropertyName())) {
+                    classModelBuilder.idPropertyName(null);
+                }
+            } else if (annotation instanceof BsonId) {
+                classModelBuilder.idPropertyName(propertyModelBuilder.getName());
+            } else if (annotation instanceof BsonIgnore) {
+                propertyModelBuilder.readName(null);
+            }
+        }
+
+        for (Annotation annotation : propertyModelBuilder.getWriteAnnotations()) {
+            if (annotation instanceof BsonProperty) {
+                BsonProperty bsonProperty = (BsonProperty) annotation;
+                if (!"".equals(bsonProperty.value())) {
+                    propertyModelBuilder.writeName(bsonProperty.value());
+                }
+            } else if (annotation instanceof BsonIgnore) {
+                propertyModelBuilder.writeName(null);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> void processCreatorAnnotation(final ClassModelBuilder<T> classModelBuilder) {
+        Class<T> clazz = classModelBuilder.getType();
+        CreatorExecutable<T> creatorExecutable = null;
+        for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
+            if (isPublic(constructor.getModifiers()) && !constructor.isSynthetic()) {
+                for (Annotation annotation : constructor.getDeclaredAnnotations()) {
+                    if (annotation.annotationType().equals(BsonCreator.class)) {
+                        if (creatorExecutable != null) {
+                            throw new CodecConfigurationException("Found multiple constructors annotated with @BsonCreator");
+                        }
+                        creatorExecutable = new CreatorExecutable<T>(clazz, (Constructor<T>) constructor);
+                    }
+                }
+            }
+        }
+
+        Class<?> bsonCreatorClass = clazz;
+        boolean foundStaticBsonCreatorMethod = false;
+        while (bsonCreatorClass != null && !foundStaticBsonCreatorMethod) {
+            for (Method method : bsonCreatorClass.getDeclaredMethods()) {
+                if (isStatic(method.getModifiers()) && !method.isSynthetic() && !method.isBridge()) {
+                    for (Annotation annotation : method.getDeclaredAnnotations()) {
+                        if (annotation.annotationType().equals(BsonCreator.class)) {
+                            if (creatorExecutable != null) {
+                                throw new CodecConfigurationException("Found multiple constructors / methods annotated with @BsonCreator");
+                            } else if (!bsonCreatorClass.isAssignableFrom(method.getReturnType())) {
+                                throw new CodecConfigurationException(
+                                        format("Invalid method annotated with @BsonCreator. Returns '%s', expected %s",
+                                                method.getReturnType(), bsonCreatorClass));
+                            }
+                            creatorExecutable = new CreatorExecutable<T>(clazz, method);
+                            foundStaticBsonCreatorMethod = true;
+                        }
+                    }
+                }
+            }
+
+            bsonCreatorClass = bsonCreatorClass.getSuperclass();
+        }
+
+        if (creatorExecutable != null) {
+            List<BsonProperty> properties = creatorExecutable.getProperties();
+            List<Class<?>> parameterTypes = creatorExecutable.getParameterTypes();
+            List<Type> parameterGenericTypes = creatorExecutable.getParameterGenericTypes();
+
+            if (properties.size() != parameterTypes.size()) {
+                throw creatorExecutable.getError(clazz, "All parameters in the @BsonCreator method / constructor must be annotated "
+                                + "with a @BsonProperty.");
+            }
+            for (int i = 0; i < properties.size(); i++) {
+                boolean isIdProperty = creatorExecutable.getIdPropertyIndex() != null && creatorExecutable.getIdPropertyIndex().equals(i);
+                Class<?> parameterType = parameterTypes.get(i);
+                Type genericType = parameterGenericTypes.get(i);
+                PropertyModelBuilder<?> propertyModelBuilder = null;
+
+                if (isIdProperty) {
+                    propertyModelBuilder = classModelBuilder.getProperty(classModelBuilder.getIdPropertyName());
+                } else {
+                    BsonProperty bsonProperty = properties.get(i);
+
+                    // Find the property using write name and falls back to read name
+                    for (PropertyModelBuilder<?> builder : classModelBuilder.getPropertyModelBuilders()) {
+                        if (bsonProperty.value().equals(builder.getWriteName())) {
+                            propertyModelBuilder = builder;
+                            break;
+                        } else if (bsonProperty.value().equals(builder.getReadName())) {
+                            // When there is a property that matches the read name of the parameter, save it but continue to look
+                            // This is just in case there is another property that matches the write name.
+                            propertyModelBuilder = builder;
+                        }
+                    }
+
+                    // Support legacy options, when BsonProperty matches the actual POJO property name (e.g. method name or field name).
+                    if (propertyModelBuilder == null) {
+                        propertyModelBuilder = classModelBuilder.getProperty(bsonProperty.value());
+                    }
+
+                    if (propertyModelBuilder == null) {
+                        propertyModelBuilder = addCreatorPropertyToClassModelBuilder(classModelBuilder, bsonProperty.value(),
+                            parameterType);
+                    } else {
+                        // If not using a legacy BsonProperty reference to the property set the write name to be the annotated name.
+                        if (!bsonProperty.value().equals(propertyModelBuilder.getName())) {
+                            propertyModelBuilder.writeName(bsonProperty.value());
+                        }
+                        tryToExpandToGenericType(parameterType, propertyModelBuilder, genericType);
+                    }
+                }
+
+                if (!propertyModelBuilder.getTypeData().isAssignableFrom(parameterType)) {
+                    throw creatorExecutable.getError(clazz, format("Invalid Property type for '%s'. Expected %s, found %s.",
+                        propertyModelBuilder.getWriteName(), propertyModelBuilder.getTypeData().getType(), parameterType));
+                }
+            }
+            classModelBuilder.instanceCreatorFactory(new InstanceCreatorFactoryImpl<T>(creatorExecutable));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> void tryToExpandToGenericType(final Class<?> parameterType, final PropertyModelBuilder<T> propertyModelBuilder,
+                                                     final Type genericType) {
+        if (parameterType.isAssignableFrom(propertyModelBuilder.getTypeData().getType())) {
+            // The existing getter for this field returns a more specific type than what the constructor accepts
+            // This is typical when the getter returns a specific subtype, but the constructor accepts a more
+            // general one (e.g.: getter returns ImmutableList<T>, while constructor just accepts List<T>)
+            propertyModelBuilder.typeData(TypeData.newInstance(genericType, (Class<T>) parameterType));
+        }
+    }
+
+    private <T, S> PropertyModelBuilder<S> addCreatorPropertyToClassModelBuilder(final ClassModelBuilder<T> classModelBuilder,
+                                                                                 final String name,
+                                                                                 final Class<S> clazz) {
+        PropertyModelBuilder<S> propertyModelBuilder = createPropertyModelBuilder(new PropertyMetadata<S>(name,
+            classModelBuilder.getType().getSimpleName(), TypeData.builder(clazz).build())).readName(null).writeName(name);
+        classModelBuilder.addProperty(propertyModelBuilder);
+        return propertyModelBuilder;
+    }
+
+    private void cleanPropertyBuilders(final ClassModelBuilder<?> classModelBuilder) {
+        List<String> propertiesToRemove = new ArrayList<String>();
+        for (PropertyModelBuilder<?> propertyModelBuilder : classModelBuilder.getPropertyModelBuilders()) {
+            if (!propertyModelBuilder.isReadable() && !propertyModelBuilder.isWritable()) {
+                propertiesToRemove.add(propertyModelBuilder.getName());
+            }
+        }
+        for (String propertyName : propertiesToRemove) {
+            classModelBuilder.removeProperty(propertyName);
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/ConventionDefaultsImpl.java b/bson/src/main/org/bson/codecs/pojo/ConventionDefaultsImpl.java
new file mode 100644
index 00000000000..c7628f84248
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/ConventionDefaultsImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+final class ConventionDefaultsImpl implements Convention {
+    @Override
+    public void apply(final ClassModelBuilder<?> classModelBuilder) {
+        if (classModelBuilder.getDiscriminatorKey() == null) {
+            classModelBuilder.discriminatorKey("_t");
+        }
+        if (classModelBuilder.getDiscriminator() == null && classModelBuilder.getType() != null) {
+            classModelBuilder.discriminator(classModelBuilder.getType().getName());
+        }
+
+       for (final PropertyModelBuilder<?> propertyModel : classModelBuilder.getPropertyModelBuilders()) {
+            if (classModelBuilder.getIdPropertyName() == null) {
+                String propertyName = propertyModel.getName();
+                if (propertyName.equals("_id") || propertyName.equals("id")) {
+                    classModelBuilder.idPropertyName(propertyName);
+                }
+            }
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/ConventionObjectIdGeneratorsImpl.java b/bson/src/main/org/bson/codecs/pojo/ConventionObjectIdGeneratorsImpl.java
new file mode 100644
index 00000000000..ed783835254
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/ConventionObjectIdGeneratorsImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonObjectId;
+import org.bson.types.ObjectId;
+
+final class ConventionObjectIdGeneratorsImpl implements Convention {
+    @Override
+    public void apply(final ClassModelBuilder<?> classModelBuilder) {
+       if (classModelBuilder.getIdGenerator() == null && classModelBuilder.getIdPropertyName() != null) {
+           PropertyModelBuilder<?> idProperty = classModelBuilder.getProperty(classModelBuilder.getIdPropertyName());
+           if (idProperty != null) {
+               Class<?> idType = idProperty.getTypeData().getType();
+               if (classModelBuilder.getIdGenerator() == null && idType.equals(ObjectId.class)) {
+                   classModelBuilder.idGenerator(IdGenerators.OBJECT_ID_GENERATOR);
+               } else if (classModelBuilder.getIdGenerator() == null && idType.equals(BsonObjectId.class)) {
+                   classModelBuilder.idGenerator(IdGenerators.BSON_OBJECT_ID_GENERATOR);
+               }
+           }
+       }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/ConventionSetPrivateFieldImpl.java b/bson/src/main/org/bson/codecs/pojo/ConventionSetPrivateFieldImpl.java
new file mode 100644
index 00000000000..0ff5721ea4a
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/ConventionSetPrivateFieldImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import static java.lang.String.format;
+import static java.lang.reflect.Modifier.isPrivate;
+
+final class ConventionSetPrivateFieldImpl implements Convention {
+
+    @Override
+    public void apply(final ClassModelBuilder<?> classModelBuilder) {
+        for (PropertyModelBuilder<?> propertyModelBuilder : classModelBuilder.getPropertyModelBuilders()) {
+            if (!(propertyModelBuilder.getPropertyAccessor() instanceof PropertyAccessorImpl)) {
+                throw new CodecConfigurationException(format("The SET_PRIVATE_FIELDS_CONVENTION is not compatible with "
+                        + "propertyModelBuilder instance that have custom implementations of org.bson.codecs.pojo.PropertyAccessor: %s",
+                        propertyModelBuilder.getPropertyAccessor().getClass().getName()));
+            }
+            PropertyAccessorImpl<?> defaultAccessor = (PropertyAccessorImpl<?>) propertyModelBuilder.getPropertyAccessor();
+            PropertyMetadata<?> propertyMetaData = defaultAccessor.getPropertyMetadata();
+            if (!propertyMetaData.isDeserializable() && propertyMetaData.getField() != null
+                    && isPrivate(propertyMetaData.getField().getModifiers())) {
+                setPropertyAccessor(propertyModelBuilder);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> void setPropertyAccessor(final PropertyModelBuilder<T> propertyModelBuilder) {
+        propertyModelBuilder.propertyAccessor(new PrivatePropertyAccessor<T>(
+                (PropertyAccessorImpl<T>) propertyModelBuilder.getPropertyAccessor()));
+    }
+
+    private static final class PrivatePropertyAccessor<T> implements PropertyAccessor<T> {
+        private final PropertyAccessorImpl<T> wrapped;
+
+        private PrivatePropertyAccessor(final PropertyAccessorImpl<T> wrapped) {
+            this.wrapped = wrapped;
+            try {
+                wrapped.getPropertyMetadata().getField().setAccessible(true);
+             } catch (Exception e) {
+                throw new CodecConfigurationException(format("Unable to make private field accessible '%s' in %s",
+                        wrapped.getPropertyMetadata().getName(), wrapped.getPropertyMetadata().getDeclaringClassName()), e);
+            }
+        }
+
+        @Override
+        public <S> T get(final S instance) {
+            return wrapped.get(instance);
+        }
+
+        @Override
+        public <S> void set(final S instance, final T value) {
+            try {
+                wrapped.getPropertyMetadata().getField().set(instance, value);
+            } catch (Exception e) {
+                throw new CodecConfigurationException(format("Unable to set value for property '%s' in %s",
+                        wrapped.getPropertyMetadata().getName(), wrapped.getPropertyMetadata().getDeclaringClassName()), e);
+            }
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/ConventionUseGettersAsSettersImpl.java b/bson/src/main/org/bson/codecs/pojo/ConventionUseGettersAsSettersImpl.java
new file mode 100644
index 00000000000..07dbec9ad15
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/ConventionUseGettersAsSettersImpl.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.util.Collection;
+import java.util.Map;
+
+import static java.lang.String.format;
+
+final class ConventionUseGettersAsSettersImpl implements Convention {
+
+    @Override
+    public void apply(final ClassModelBuilder<?> classModelBuilder) {
+        for (PropertyModelBuilder<?> propertyModelBuilder : classModelBuilder.getPropertyModelBuilders()) {
+            if (!(propertyModelBuilder.getPropertyAccessor() instanceof PropertyAccessorImpl)) {
+                throw new CodecConfigurationException(format("The USE_GETTER_AS_SETTER_CONVENTION is not compatible with "
+                        + "propertyModelBuilder instance that have custom implementations of org.bson.codecs.pojo.PropertyAccessor: %s",
+                        propertyModelBuilder.getPropertyAccessor().getClass().getName()));
+            }
+            PropertyAccessorImpl<?> defaultAccessor = (PropertyAccessorImpl<?>) propertyModelBuilder.getPropertyAccessor();
+            PropertyMetadata<?> propertyMetaData = defaultAccessor.getPropertyMetadata();
+            if (!propertyMetaData.isDeserializable() && propertyMetaData.isSerializable()
+                    && isMapOrCollection(propertyMetaData.getTypeData().getType())) {
+                setPropertyAccessor(propertyModelBuilder);
+            }
+        }
+    }
+
+    private <T> boolean isMapOrCollection(final Class<T> clazz) {
+        return Collection.class.isAssignableFrom(clazz) || Map.class.isAssignableFrom(clazz);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> void setPropertyAccessor(final PropertyModelBuilder<T> propertyModelBuilder) {
+        propertyModelBuilder.propertyAccessor(new PrivatePropertyAccessor<T>(
+                (PropertyAccessorImpl<T>) propertyModelBuilder.getPropertyAccessor()));
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private static final class PrivatePropertyAccessor<T> implements PropertyAccessor<T> {
+        private final PropertyAccessorImpl<T> wrapped;
+
+        private PrivatePropertyAccessor(final PropertyAccessorImpl<T> wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public <S> T get(final S instance) {
+            return wrapped.get(instance);
+        }
+
+        @Override
+        public <S> void set(final S instance, final T value) {
+            if (value instanceof Collection) {
+                mutateCollection(instance, (Collection) value);
+            } else if (value instanceof Map) {
+                mutateMap(instance, (Map) value);
+            } else {
+                throwCodecConfigurationException(format("Unexpected type: '%s'", value.getClass()), null);
+            }
+        }
+
+        private <S> void mutateCollection(final S instance, final Collection value) {
+            T originalCollection = get(instance);
+            Collection<?> collection = ((Collection<?>) originalCollection);
+            if (collection == null) {
+                throwCodecConfigurationException("The getter returned null.", null);
+            } else if (!collection.isEmpty()) {
+                throwCodecConfigurationException("The getter returned a non empty collection.", null);
+            } else {
+                try {
+                    collection.addAll(value);
+                } catch (Exception e) {
+                    throwCodecConfigurationException("collection#addAll failed.", e);
+                }
+            }
+        }
+
+        private <S> void mutateMap(final S instance, final Map value) {
+            T originalMap = get(instance);
+            Map<?, ?> map = ((Map<?, ?>) originalMap);
+            if (map == null) {
+                throwCodecConfigurationException("The getter returned null.", null);
+            } else if (!map.isEmpty()) {
+                throwCodecConfigurationException("The getter returned a non empty map.", null);
+            } else {
+                try {
+                    map.putAll(value);
+                } catch (Exception e) {
+                    throwCodecConfigurationException("map#putAll failed.", e);
+                }
+            }
+        }
+        private void throwCodecConfigurationException(final String reason, final Exception cause) {
+            throw new CodecConfigurationException(format("Cannot use getter in '%s' to set '%s'. %s",
+                    wrapped.getPropertyMetadata().getDeclaringClassName(), wrapped.getPropertyMetadata().getName(), reason), cause);
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/Conventions.java b/bson/src/main/org/bson/codecs/pojo/Conventions.java
new file mode 100644
index 00000000000..0f54c13815d
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/Conventions.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import java.util.Collections;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableList;
+
+/**
+ * The default Conventions
+ *
+ * @since 3.5
+ * @see Convention
+ */
+public final class Conventions {
+
+    /**
+     * The default class and property conventions
+     *
+     * <ul>
+     *     <li>Sets the discriminator key if not set to {@code _t} and the discriminator value if not set to the
+     *     ClassModels simple type name.</li>
+     *     <li>Configures the PropertyModels. If the {@code idProperty} isn't set and there is a
+     *     property named {@code getId()}, {@code id} or {@code _id} it will be marked as the idProperty.</li>
+     * </ul>
+     */
+    public static final Convention CLASS_AND_PROPERTY_CONVENTION = new ConventionDefaultsImpl();
+
+    /**
+     * The annotation convention.
+     *
+     * <p>Applies all the conventions related to the default {@link org.bson.codecs.pojo.annotations}.</p>
+     */
+    public static final Convention ANNOTATION_CONVENTION = new ConventionAnnotationImpl();
+
+    /**
+     * A convention that enables private fields to be set using reflection.
+     *
+     * <p>This convention mimics how some other JSON libraries directly set a private field when there is no setter.</p>
+     * <p>Note: This convention is not part of the {@code DEFAULT_CONVENTIONS} list and must explicitly be set.</p>
+     *
+     * @since 3.6
+     */
+    public static final Convention SET_PRIVATE_FIELDS_CONVENTION = new ConventionSetPrivateFieldImpl();
+
+    /**
+     * A convention that uses getter methods as setters for collections and maps if there is no setter.
+     *
+     * <p>This convention mimics how JAXB mutate collections and maps.</p>
+     * <p>Note: This convention is not part of the {@code DEFAULT_CONVENTIONS} list and must explicitly be set.</p>
+     *
+     * @since 3.6
+     */
+    public static final Convention USE_GETTERS_FOR_SETTERS = new ConventionUseGettersAsSettersImpl();
+
+
+    /**
+     * A convention that sets the IdGenerator if the id property is either a {@link org.bson.types.ObjectId} or
+     * {@link org.bson.BsonObjectId}.
+     *
+     * @since 3.10
+     */
+    public static final Convention OBJECT_ID_GENERATORS = new ConventionObjectIdGeneratorsImpl();
+
+    /**
+     * The default conventions list
+     */
+    public static final List<Convention> DEFAULT_CONVENTIONS =
+            unmodifiableList(asList(CLASS_AND_PROPERTY_CONVENTION, ANNOTATION_CONVENTION, OBJECT_ID_GENERATORS));
+
+    /**
+     * An empty conventions list
+     */
+    public static final List<Convention> NO_CONVENTIONS = Collections.emptyList();
+
+    private Conventions() {
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/CreatorExecutable.java b/bson/src/main/org/bson/codecs/pojo/CreatorExecutable.java
new file mode 100644
index 00000000000..c212dd2e000
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/CreatorExecutable.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+
+final class CreatorExecutable<T> {
+    private final Class<T> clazz;
+    private final Constructor<T> constructor;
+    private final Method method;
+    private final List<BsonProperty> properties = new ArrayList<BsonProperty>();
+    private final Integer idPropertyIndex;
+    private final List<Class<?>> parameterTypes = new ArrayList<Class<?>>();
+    private final List<Type> parameterGenericTypes = new ArrayList<Type>();
+
+    CreatorExecutable(final Class<T> clazz, final Constructor<T> constructor) {
+        this(clazz, constructor, null);
+    }
+
+    CreatorExecutable(final Class<T> clazz, final Method method) {
+        this(clazz, null, method);
+    }
+
+    private CreatorExecutable(final Class<T> clazz, final Constructor<T> constructor, final Method method) {
+        this.clazz = clazz;
+        this.constructor = constructor;
+        this.method = method;
+        Integer idPropertyIndex = null;
+
+        if (constructor != null || method != null) {
+            Class<?>[] paramTypes = constructor != null ? constructor.getParameterTypes() : method.getParameterTypes();
+            Type[] genericParamTypes = constructor != null ? constructor.getGenericParameterTypes() : method.getGenericParameterTypes();
+            parameterTypes.addAll(asList(paramTypes));
+            parameterGenericTypes.addAll(asList(genericParamTypes));
+            Annotation[][] parameterAnnotations = constructor != null ? constructor.getParameterAnnotations()
+                    : method.getParameterAnnotations();
+
+            for (int i = 0; i < parameterAnnotations.length; ++i) {
+                Annotation[] parameterAnnotation = parameterAnnotations[i];
+
+                for (Annotation annotation : parameterAnnotation) {
+                    if (annotation.annotationType().equals(BsonProperty.class)) {
+                        properties.add((BsonProperty) annotation);
+                        break;
+                    }
+
+                    if (annotation.annotationType().equals(BsonId.class)) {
+                        properties.add(null);
+                        idPropertyIndex = i;
+                        break;
+                    }
+                }
+            }
+        }
+
+        this.idPropertyIndex = idPropertyIndex;
+    }
+
+    Class<T> getType() {
+        return clazz;
+    }
+
+    List<BsonProperty> getProperties() {
+        return properties;
+    }
+
+    Integer getIdPropertyIndex() {
+        return idPropertyIndex;
+    }
+
+    List<Class<?>> getParameterTypes() {
+        return parameterTypes;
+    }
+
+    List<Type> getParameterGenericTypes() {
+        return parameterGenericTypes;
+    }
+
+    @SuppressWarnings("unchecked")
+    T getInstance() {
+        checkHasAnExecutable();
+        try {
+            if (constructor != null) {
+                return constructor.newInstance();
+            } else {
+                return (T) method.invoke(clazz);
+            }
+        } catch (Exception e) {
+            throw new CodecConfigurationException(e.getMessage(), e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    T getInstance(final Object[] params) {
+        checkHasAnExecutable();
+        try {
+            if (constructor != null) {
+                return constructor.newInstance(params);
+            } else {
+                return (T) method.invoke(clazz, params);
+            }
+        } catch (Exception e) {
+            throw new CodecConfigurationException(e.getMessage(), e);
+        }
+    }
+
+
+    CodecConfigurationException getError(final Class<?> clazz, final String msg) {
+        return getError(clazz, constructor != null, msg);
+    }
+
+    private void checkHasAnExecutable() {
+        if (constructor == null && method == null) {
+            throw new CodecConfigurationException(format("Cannot find a public constructor for '%s'.", clazz.getSimpleName()));
+        }
+    }
+
+    private static CodecConfigurationException getError(final Class<?> clazz, final boolean isConstructor, final String msg) {
+        return new CodecConfigurationException(format("Invalid @BsonCreator %s in %s. %s", isConstructor ? "constructor" : "method",
+                clazz.getSimpleName(), msg));
+    }
+
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/DiscriminatorLookup.java b/bson/src/main/org/bson/codecs/pojo/DiscriminatorLookup.java
new file mode 100644
index 00000000000..18fb59d8fef
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/DiscriminatorLookup.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static java.lang.String.format;
+
+final class DiscriminatorLookup {
+    private final Map<String, Class<?>> discriminatorClassMap = new ConcurrentHashMap<String, Class<?>>();
+    private final Set<String> packages;
+
+    DiscriminatorLookup(final Map<Class<?>, ClassModel<?>> classModels, final Set<String> packages) {
+        for (ClassModel<?> classModel : classModels.values()) {
+            if (classModel.getDiscriminator() != null) {
+                discriminatorClassMap.put(classModel.getDiscriminator(), classModel.getType());
+            }
+        }
+        this.packages = packages;
+    }
+
+    public Class<?> lookup(final String discriminator) {
+        if (discriminatorClassMap.containsKey(discriminator)) {
+            return discriminatorClassMap.get(discriminator);
+        }
+
+        Class<?> clazz = getClassForName(discriminator);
+        if (clazz == null) {
+            clazz = searchPackages(discriminator);
+        }
+
+        if (clazz == null) {
+            throw new CodecConfigurationException(format("A class could not be found for the discriminator: '%s'.",  discriminator));
+        } else {
+            discriminatorClassMap.put(discriminator, clazz);
+        }
+        return clazz;
+    }
+
+    void addClassModel(final ClassModel<?> classModel) {
+        if (classModel.getDiscriminator() != null) {
+            discriminatorClassMap.put(classModel.getDiscriminator(), classModel.getType());
+        }
+    }
+
+    private Class<?> getClassForName(final String discriminator) {
+        Class<?> clazz = null;
+        try {
+            clazz = Class.forName(discriminator);
+        } catch (final ClassNotFoundException e) {
+            // Ignore
+        }
+        return clazz;
+    }
+
+    private Class<?> searchPackages(final String discriminator) {
+        Class<?> clazz = null;
+        for (String packageName : packages) {
+            clazz = getClassForName(packageName + "." + discriminator);
+            if (clazz != null) {
+                return clazz;
+            }
+        }
+        return clazz;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/EnumPropertyCodecProvider.java b/bson/src/main/org/bson/codecs/pojo/EnumPropertyCodecProvider.java
new file mode 100644
index 00000000000..fba5f2c99ff
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/EnumPropertyCodecProvider.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecRegistry;
+
+
+final class EnumPropertyCodecProvider implements PropertyCodecProvider {
+    private final CodecRegistry codecRegistry;
+
+    EnumPropertyCodecProvider(final CodecRegistry codecRegistry) {
+        this.codecRegistry = codecRegistry;
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    @Override
+    public <T> Codec<T> get(final TypeWithTypeParameters<T> type, final PropertyCodecRegistry propertyCodecRegistry) {
+        Class<T> clazz = type.getType();
+        if (Enum.class.isAssignableFrom(clazz)) {
+            try {
+                return codecRegistry.get(clazz);
+            } catch (CodecConfigurationException e) {
+                return (Codec<T>) new EnumCodec(clazz);
+            }
+        }
+        return null;
+    }
+
+    private static class EnumCodec<T extends Enum<T>> implements Codec<T> {
+        private final Class<T> clazz;
+
+        EnumCodec(final Class<T> clazz) {
+            this.clazz = clazz;
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final T value, final EncoderContext encoderContext) {
+            writer.writeString(value.name());
+        }
+
+        @Override
+        public Class<T> getEncoderClass() {
+            return clazz;
+        }
+
+        @Override
+        public T decode(final BsonReader reader, final DecoderContext decoderContext) {
+            return Enum.valueOf(clazz, reader.readString());
+        }
+    }
+
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java b/bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java
new file mode 100644
index 00000000000..8c5fd4e9cf3
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecRegistry;
+
+final class FallbackPropertyCodecProvider implements PropertyCodecProvider {
+    private final CodecRegistry codecRegistry;
+    private final PojoCodec<?> pojoCodec;
+
+    FallbackPropertyCodecProvider(final PojoCodec<?> pojoCodec, final CodecRegistry codecRegistry) {
+        this.pojoCodec = pojoCodec;
+        this.codecRegistry = codecRegistry;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <S> Codec<S> get(final TypeWithTypeParameters<S> type, final PropertyCodecRegistry propertyCodecRegistry) {
+        Class<S> clazz = type.getType();
+        if (clazz == pojoCodec.getEncoderClass()) {
+            return (Codec<S>) pojoCodec;
+        }
+        return codecRegistry.get(type.getType());
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/IdGenerator.java b/bson/src/main/org/bson/codecs/pojo/IdGenerator.java
new file mode 100644
index 00000000000..e794c8841ef
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/IdGenerator.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+/**
+ * Classes that implement this interface define a way to create Ids for Pojo's.
+ *
+ * @param <T> the type of the id value.
+ * @since 3.10
+ */
+public interface IdGenerator<T> {
+    /**
+     * Generates an id for a Pojo.
+     *
+     * @return the generated id value
+     */
+    T generate();
+
+    /**
+     * @return the type of the generated id.
+     */
+    Class<T> getType();
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/IdGenerators.java b/bson/src/main/org/bson/codecs/pojo/IdGenerators.java
new file mode 100644
index 00000000000..20f9e3f7dd6
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/IdGenerators.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonObjectId;
+import org.bson.types.ObjectId;
+
+/**
+ * The default IdGenerators
+ *
+ * @see IdGenerator
+ * @since 3.10
+ */
+public final class IdGenerators {
+
+    /**
+     * A IdGenerator for {@code ObjectId}
+     */
+    public static final IdGenerator<ObjectId> OBJECT_ID_GENERATOR = new IdGenerator<ObjectId>() {
+
+        @Override
+        public ObjectId generate() {
+            return new ObjectId();
+        }
+
+        @Override
+        public Class<ObjectId> getType() {
+            return ObjectId.class;
+        }
+    };
+
+    /**
+     * A IdGenerator for {@code BsonObjectId}
+     */
+    public static final IdGenerator<BsonObjectId> BSON_OBJECT_ID_GENERATOR = new IdGenerator<BsonObjectId>() {
+
+        @Override
+        public BsonObjectId generate() {
+            return new BsonObjectId();
+        }
+
+        @Override
+        public Class<BsonObjectId> getType() {
+            return BsonObjectId.class;
+        }
+    };
+
+    private IdGenerators(){
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/IdPropertyModelHolder.java b/bson/src/main/org/bson/codecs/pojo/IdPropertyModelHolder.java
new file mode 100644
index 00000000000..fe11097679c
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/IdPropertyModelHolder.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import static java.lang.String.format;
+
+final class IdPropertyModelHolder<I> {
+    private final PropertyModel<I> propertyModel;
+    private final IdGenerator<I> idGenerator;
+
+    static <T, I> IdPropertyModelHolder<I> create(final ClassModel<T> classModel, final PropertyModel<I> idPropertyModel) {
+        return create(classModel.getType(), idPropertyModel, classModel.getIdPropertyModelHolder().getIdGenerator());
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T, I, V> IdPropertyModelHolder<I> create(final Class<T> type, final PropertyModel<I> idProperty,
+                                                     final IdGenerator<V> idGenerator) {
+        if (idProperty == null && idGenerator != null) {
+            throw new CodecConfigurationException(format("Invalid IdGenerator. There is no IdProperty set for: %s", type));
+        } else if (idGenerator != null && !idProperty.getTypeData().getType().isAssignableFrom(idGenerator.getType())) {
+            throw new CodecConfigurationException(format("Invalid IdGenerator. Mismatching types, the IdProperty type is: %s but"
+                    + " the IdGenerator type is: %s", idProperty.getTypeData().getType(), idGenerator.getType()));
+        }
+        return new IdPropertyModelHolder<I>(idProperty, (IdGenerator<I>) idGenerator);
+    }
+
+    private IdPropertyModelHolder(final PropertyModel<I> propertyModel, final IdGenerator<I> idGenerator) {
+        this.propertyModel = propertyModel;
+        this.idGenerator = idGenerator;
+    }
+
+    PropertyModel<I> getPropertyModel() {
+        return propertyModel;
+    }
+
+    IdGenerator<I> getIdGenerator() {
+        return idGenerator;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        IdPropertyModelHolder<?> that = (IdPropertyModelHolder<?>) o;
+
+        if (propertyModel != null ? !propertyModel.equals(that.propertyModel) : that.propertyModel != null) {
+            return false;
+        }
+        return idGenerator != null ? idGenerator.equals(that.idGenerator) : that.idGenerator == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = propertyModel != null ? propertyModel.hashCode() : 0;
+        result = 31 * result + (idGenerator != null ? idGenerator.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/InstanceCreator.java b/bson/src/main/org/bson/codecs/pojo/InstanceCreator.java
new file mode 100644
index 00000000000..8fca88f9dba
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/InstanceCreator.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+/**
+ * Provides access for setting data and the creation of a class instances.
+ *
+ * @param <T> the type of the class
+ * @since 3.5
+ */
+public interface InstanceCreator<T> {
+
+    /**
+     * Sets a value for the given PropertyModel
+     *
+     * @param value      the new value for the property
+     * @param propertyModel the PropertyModel representing the property to set the value for.
+     * @param <S>        the PropertyModel's type
+     */
+    <S> void set(S value, PropertyModel<S> propertyModel);
+
+    /**
+     * Returns the new instance of the class.
+     * <p>Note: This will be called after all the values have been set.</p>
+     *
+     * @return the new class instance.
+     */
+    T getInstance();
+
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/InstanceCreatorFactory.java b/bson/src/main/org/bson/codecs/pojo/InstanceCreatorFactory.java
new file mode 100644
index 00000000000..14dc42825c6
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/InstanceCreatorFactory.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+/**
+ * The factory for creating {@link InstanceCreator} instances
+ *
+ * @param <T> the type of the ClassAccessor
+ * @since 3.5
+ */
+public interface InstanceCreatorFactory<T> {
+
+    /**
+     * @return a new ClassAccessor instance
+     */
+    InstanceCreator<T> create();
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/InstanceCreatorFactoryImpl.java b/bson/src/main/org/bson/codecs/pojo/InstanceCreatorFactoryImpl.java
new file mode 100644
index 00000000000..294e7f85142
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/InstanceCreatorFactoryImpl.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+final class InstanceCreatorFactoryImpl<T> implements InstanceCreatorFactory<T> {
+    private final CreatorExecutable<T> creatorExecutable;
+
+    InstanceCreatorFactoryImpl(final CreatorExecutable<T> creatorExecutable) {
+        this.creatorExecutable = creatorExecutable;
+    }
+
+    @Override
+    public InstanceCreator<T> create() {
+        return new InstanceCreatorImpl<T>(creatorExecutable);
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/InstanceCreatorImpl.java b/bson/src/main/org/bson/codecs/pojo/InstanceCreatorImpl.java
new file mode 100644
index 00000000000..04fc86bd1f6
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/InstanceCreatorImpl.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static java.lang.String.format;
+
+final class InstanceCreatorImpl<T> implements InstanceCreator<T> {
+    private final CreatorExecutable<T> creatorExecutable;
+    private final Map<PropertyModel<?>, Object> cachedValues;
+    private final Map<String, Integer> properties;
+    private final Object[] params;
+
+    private T newInstance;
+
+    InstanceCreatorImpl(final CreatorExecutable<T> creatorExecutable) {
+        this.creatorExecutable = creatorExecutable;
+        if (creatorExecutable.getProperties().isEmpty()) {
+            this.cachedValues = null;
+            this.properties = null;
+            this.params = null;
+            this.newInstance = creatorExecutable.getInstance();
+        } else {
+            this.cachedValues = new HashMap<PropertyModel<?>, Object>();
+            this.properties = new HashMap<String, Integer>();
+
+            for (int i = 0; i < creatorExecutable.getProperties().size(); i++) {
+                if (creatorExecutable.getIdPropertyIndex() != null && creatorExecutable.getIdPropertyIndex() == i) {
+                    this.properties.put(ClassModelBuilder.ID_PROPERTY_NAME, creatorExecutable.getIdPropertyIndex());
+                } else {
+                    this.properties.put(creatorExecutable.getProperties().get(i).value(), i);
+                }
+            }
+
+            this.params = new Object[properties.size()];
+        }
+    }
+
+    @Override
+    public <S> void set(final S value, final PropertyModel<S> propertyModel) {
+        if (newInstance != null) {
+            propertyModel.getPropertyAccessor().set(newInstance, value);
+        } else {
+            if (!properties.isEmpty()) {
+                String propertyName = propertyModel.getWriteName();
+
+                if (!properties.containsKey(propertyName)) {
+                    // Support legacy BsonProperty settings where the property name was used instead of the write name.
+                    propertyName = propertyModel.getName();
+                }
+
+                Integer index = properties.get(propertyName);
+                if (index != null) {
+                    params[index] = value;
+                }
+                properties.remove(propertyName);
+            }
+
+            if (properties.isEmpty()) {
+                constructInstanceAndProcessCachedValues();
+            } else {
+                cachedValues.put(propertyModel, value);
+            }
+        }
+    }
+
+    @Override
+    public T getInstance() {
+        if (newInstance == null) {
+            try {
+                for (Map.Entry<String, Integer> entry : properties.entrySet()) {
+                    params[entry.getValue()] = null;
+                }
+                constructInstanceAndProcessCachedValues();
+            } catch (CodecConfigurationException e) {
+                throw new CodecConfigurationException(format("Could not construct new instance of: %s. "
+                                + "Missing the following properties: %s",
+                        creatorExecutable.getType().getSimpleName(), properties.keySet()), e);
+            }
+        }
+        return newInstance;
+    }
+
+    private void constructInstanceAndProcessCachedValues() {
+        try {
+            newInstance = creatorExecutable.getInstance(params);
+        } catch (Exception e) {
+            throw new CodecConfigurationException(e.getMessage(), e);
+        }
+
+        for (Map.Entry<PropertyModel<?>, Object> entry : cachedValues.entrySet()) {
+            setPropertyValue(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <S> void setPropertyValue(final PropertyModel<S> propertyModel, final Object value) {
+        set((S) value, propertyModel);
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/LazyMissingCodec.java b/bson/src/main/org/bson/codecs/pojo/LazyMissingCodec.java
new file mode 100644
index 00000000000..b5e24292be1
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/LazyMissingCodec.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+
+class LazyMissingCodec<S> implements Codec<S> {
+    private final Class<S> clazz;
+    private final CodecConfigurationException exception;
+
+    LazyMissingCodec(final Class<S> clazz, final CodecConfigurationException exception) {
+        this.clazz = clazz;
+        this.exception = exception;
+    }
+
+    @Override
+    public S decode(final BsonReader reader, final DecoderContext decoderContext) {
+        throw exception;
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final S value, final EncoderContext encoderContext) {
+        throw exception;
+    }
+
+    @Override
+    public Class<S> getEncoderClass() {
+        return clazz;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/LazyPojoCodec.java b/bson/src/main/org/bson/codecs/pojo/LazyPojoCodec.java
new file mode 100644
index 00000000000..ec3d9469b39
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/LazyPojoCodec.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.concurrent.ConcurrentMap;
+
+class LazyPojoCodec<T> extends PojoCodec<T> {
+    private final ClassModel<T> classModel;
+    private final CodecRegistry registry;
+    private final PropertyCodecRegistry propertyCodecRegistry;
+    private final DiscriminatorLookup discriminatorLookup;
+    private final ConcurrentMap<ClassModel<?>, Codec<?>> codecCache;
+    private volatile PojoCodecImpl<T> pojoCodec;
+
+    LazyPojoCodec(final ClassModel<T> classModel, final CodecRegistry registry, final PropertyCodecRegistry propertyCodecRegistry,
+                  final DiscriminatorLookup discriminatorLookup, final ConcurrentMap<ClassModel<?>, Codec<?>> codecCache) {
+        this.classModel = classModel;
+        this.registry = registry;
+        this.propertyCodecRegistry = propertyCodecRegistry;
+        this.discriminatorLookup = discriminatorLookup;
+        this.codecCache = codecCache;
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final T value, final EncoderContext encoderContext) {
+        getPojoCodec().encode(writer, value, encoderContext);
+    }
+
+    @Override
+    public Class<T> getEncoderClass() {
+        return classModel.getType();
+    }
+
+    @Override
+    public T decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return getPojoCodec().decode(reader, decoderContext);
+    }
+
+    private Codec<T> getPojoCodec() {
+        if (pojoCodec == null) {
+            pojoCodec = new PojoCodecImpl<T>(classModel, registry, propertyCodecRegistry, discriminatorLookup, codecCache, true);
+        }
+        return pojoCodec;
+    }
+
+    @Override
+    ClassModel<T> getClassModel() {
+        return classModel;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/MapPropertyCodecProvider.java b/bson/src/main/org/bson/codecs/pojo/MapPropertyCodecProvider.java
new file mode 100644
index 00000000000..50e665b3974
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/MapPropertyCodecProvider.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo;
+
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static java.lang.String.format;
+
+final class MapPropertyCodecProvider implements PropertyCodecProvider {
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    @Override
+    public <T> Codec<T> get(final TypeWithTypeParameters<T> type, final PropertyCodecRegistry registry) {
+        if (Map.class.isAssignableFrom(type.getType()) && type.getTypeParameters().size() == 2) {
+            Class<?> keyType = type.getTypeParameters().get(0).getType();
+            if (!keyType.equals(String.class)) {
+                throw new CodecConfigurationException(format("Invalid Map type. Maps MUST have string keys, found %s instead.", keyType));
+            }
+
+            try {
+                return new MapCodec(type.getType(), registry.get(type.getTypeParameters().get(1)));
+            } catch (CodecConfigurationException e) {
+                if (type.getTypeParameters().get(1).getType() == Object.class) {
+                    try {
+                        return (Codec<T>) registry.get(TypeData.builder(Map.class).build());
+                    } catch (CodecConfigurationException e1) {
+                        // Ignore and return original exception
+                    }
+                }
+                throw e;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    private static class MapCodec<T> implements Codec<Map<String, T>> {
+        private final Class<Map<String, T>> encoderClass;
+        private final Codec<T> codec;
+
+        MapCodec(final Class<Map<String, T>> encoderClass, final Codec<T> codec) {
+            this.encoderClass = encoderClass;
+            this.codec = codec;
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final Map<String, T> map, final EncoderContext encoderContext) {
+            writer.writeStartDocument();
+            for (final Entry<String, T> entry : map.entrySet()) {
+                writer.writeName(entry.getKey());
+                if (entry.getValue() == null) {
+                    writer.writeNull();
+                } else {
+                    codec.encode(writer, entry.getValue(), encoderContext);
+                }
+            }
+            writer.writeEndDocument();
+        }
+
+        @Override
+        public Map<String, T> decode(final BsonReader reader, final DecoderContext context) {
+            reader.readStartDocument();
+            Map<String, T> map = getInstance();
+            while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                if (reader.getCurrentBsonType() == BsonType.NULL) {
+                    map.put(reader.readName(), null);
+                    reader.readNull();
+                } else {
+                    map.put(reader.readName(), codec.decode(reader, context));
+                }
+            }
+            reader.readEndDocument();
+            return map;
+        }
+
+        @Override
+        public Class<Map<String, T>> getEncoderClass() {
+            return encoderClass;
+        }
+
+        private Map<String, T> getInstance() {
+            if (encoderClass.isInterface()) {
+                return new HashMap<String, T>();
+            }
+            try {
+                return encoderClass.getDeclaredConstructor().newInstance();
+            } catch (final Exception e) {
+                throw new CodecConfigurationException(e.getMessage(), e);
+            }
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PojoBuilderHelper.java b/bson/src/main/org/bson/codecs/pojo/PojoBuilderHelper.java
new file mode 100644
index 00000000000..f86fb5e3c1c
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PojoBuilderHelper.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import static java.lang.String.format;
+import static java.lang.reflect.Modifier.isProtected;
+import static java.lang.reflect.Modifier.isPublic;
+import static java.util.Arrays.asList;
+import static java.util.Collections.reverse;
+import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.pojo.PropertyReflectionUtils.getPropertyMethods;
+import static org.bson.codecs.pojo.PropertyReflectionUtils.isGetter;
+import static org.bson.codecs.pojo.PropertyReflectionUtils.toPropertyName;
+
+final class PojoBuilderHelper {
+
+    @SuppressWarnings("unchecked")
+    static <T> void configureClassModelBuilder(final ClassModelBuilder<T> classModelBuilder, final Class<T> clazz) {
+        classModelBuilder.type(notNull("clazz", clazz));
+
+        ArrayList<Annotation> annotations = new ArrayList<Annotation>();
+        Set<String> propertyNames = new TreeSet<String>();
+        Map<String, TypeParameterMap> propertyTypeParameterMap = new HashMap<String, TypeParameterMap>();
+        Class<? super T> currentClass = clazz;
+        String declaringClassName =  clazz.getSimpleName();
+        TypeData<?> parentClassTypeData = null;
+
+        Map<String, PropertyMetadata<?>> propertyNameMap = new HashMap<String, PropertyMetadata<?>>();
+        while (!currentClass.isEnum() && currentClass.getSuperclass() != null) {
+            annotations.addAll(asList(currentClass.getDeclaredAnnotations()));
+            List<String> genericTypeNames = new ArrayList<String>();
+            for (TypeVariable<? extends Class<? super T>> classTypeVariable : currentClass.getTypeParameters()) {
+                genericTypeNames.add(classTypeVariable.getName());
+            }
+
+            PropertyReflectionUtils.PropertyMethods propertyMethods = getPropertyMethods(currentClass);
+
+            // Note that we're processing setters before getters. It's typical for setters to have more general types
+            // than getters (e.g.: getter returning ImmutableList, but setter accepting Collection), so by evaluating
+            // setters first, we'll initialize the PropertyMetadata with the more general type
+            for (Method method : propertyMethods.getSetterMethods()) {
+                String propertyName = toPropertyName(method);
+                propertyNames.add(propertyName);
+                PropertyMetadata<?> propertyMetadata = getOrCreateMethodPropertyMetadata(propertyName, declaringClassName, propertyNameMap,
+                        TypeData.newInstance(method), propertyTypeParameterMap, parentClassTypeData, genericTypeNames,
+                        getGenericType(method));
+
+                if (propertyMetadata.getSetter() == null) {
+                    propertyMetadata.setSetter(method);
+                    for (Annotation annotation : method.getDeclaredAnnotations()) {
+                        propertyMetadata.addWriteAnnotation(annotation);
+                    }
+                }
+            }
+
+            for (Method method : propertyMethods.getGetterMethods()) {
+                String propertyName = toPropertyName(method);
+                propertyNames.add(propertyName);
+                // If the getter is overridden in a subclass, we only want to process that property, and ignore
+                // potentially less specific methods from super classes
+                PropertyMetadata<?> propertyMetadata = propertyNameMap.get(propertyName);
+                if (propertyMetadata != null && propertyMetadata.getGetter() != null) {
+                    continue;
+                }
+                propertyMetadata = getOrCreateMethodPropertyMetadata(propertyName, declaringClassName, propertyNameMap,
+                                        TypeData.newInstance(method), propertyTypeParameterMap, parentClassTypeData, genericTypeNames,
+                                        getGenericType(method));
+                if (propertyMetadata.getGetter() == null) {
+                    propertyMetadata.setGetter(method);
+                    for (Annotation annotation : method.getDeclaredAnnotations()) {
+                        propertyMetadata.addReadAnnotation(annotation);
+                    }
+                }
+            }
+
+            for (Field field : currentClass.getDeclaredFields()) {
+                propertyNames.add(field.getName());
+                // Note if properties are present and types don't match, the underlying field is treated as an implementation detail.
+                PropertyMetadata<?> propertyMetadata = getOrCreateFieldPropertyMetadata(field.getName(), declaringClassName,
+                        propertyNameMap, TypeData.newInstance(field), propertyTypeParameterMap, parentClassTypeData, genericTypeNames,
+                        field.getGenericType());
+                if (propertyMetadata != null && propertyMetadata.getField() == null) {
+                    propertyMetadata.field(field);
+                    for (Annotation annotation : field.getDeclaredAnnotations()) {
+                        propertyMetadata.addReadAnnotation(annotation);
+                        propertyMetadata.addWriteAnnotation(annotation);
+                    }
+                }
+            }
+
+            parentClassTypeData = TypeData.newInstance(currentClass.getGenericSuperclass(), currentClass);
+            currentClass = currentClass.getSuperclass();
+        }
+
+        if (currentClass.isInterface()) {
+            annotations.addAll(asList(currentClass.getDeclaredAnnotations()));
+        }
+
+        for (String propertyName : propertyNames) {
+            PropertyMetadata<?> propertyMetadata = propertyNameMap.get(propertyName);
+            if (propertyMetadata.isSerializable() || propertyMetadata.isDeserializable()) {
+                classModelBuilder.addProperty(createPropertyModelBuilder(propertyMetadata));
+            }
+        }
+
+        reverse(annotations);
+        classModelBuilder.annotations(annotations);
+        classModelBuilder.propertyNameToTypeParameterMap(propertyTypeParameterMap);
+
+        Constructor<T> noArgsConstructor = null;
+        for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
+            if (constructor.getParameterTypes().length == 0
+                    && (isPublic(constructor.getModifiers()) || isProtected(constructor.getModifiers()))) {
+                noArgsConstructor = (Constructor<T>) constructor;
+                noArgsConstructor.setAccessible(true);
+            }
+        }
+
+        classModelBuilder.instanceCreatorFactory(new InstanceCreatorFactoryImpl<T>(new CreatorExecutable<T>(clazz, noArgsConstructor)));
+    }
+
+    private static <T, S> PropertyMetadata<T> getOrCreateMethodPropertyMetadata(final String propertyName,
+                                                                  final String declaringClassName,
+                                                                  final Map<String, PropertyMetadata<?>> propertyNameMap,
+                                                                  final TypeData<T> typeData,
+                                                                  final Map<String, TypeParameterMap> propertyTypeParameterMap,
+                                                                  final TypeData<S> parentClassTypeData,
+                                                                  final List<String> genericTypeNames,
+                                                                  final Type genericType) {
+        PropertyMetadata<T> propertyMetadata = getOrCreatePropertyMetadata(propertyName, declaringClassName, propertyNameMap, typeData);
+        if (!isAssignableClass(propertyMetadata.getTypeData().getType(), typeData.getType())) {
+            propertyMetadata.setError(format("Property '%s' in %s, has differing data types: %s and %s.", propertyName,
+                    declaringClassName, propertyMetadata.getTypeData(), typeData));
+        }
+        cachePropertyTypeData(propertyMetadata, propertyTypeParameterMap, parentClassTypeData, genericTypeNames, genericType);
+        return propertyMetadata;
+    }
+
+    private static boolean isAssignableClass(final Class<?> propertyTypeClass, final Class<?> typeDataClass) {
+        return propertyTypeClass.isAssignableFrom(typeDataClass) || typeDataClass.isAssignableFrom(propertyTypeClass);
+    }
+
+    private static <T, S> PropertyMetadata<T> getOrCreateFieldPropertyMetadata(final String propertyName,
+                                                                               final String declaringClassName,
+                                                                               final Map<String, PropertyMetadata<?>> propertyNameMap,
+                                                                               final TypeData<T> typeData,
+                                                                               final Map<String, TypeParameterMap> propertyTypeParameterMap,
+                                                                               final TypeData<S> parentClassTypeData,
+                                                                               final List<String> genericTypeNames,
+                                                                               final Type genericType) {
+        PropertyMetadata<T> propertyMetadata = getOrCreatePropertyMetadata(propertyName, declaringClassName, propertyNameMap, typeData);
+        if (!propertyMetadata.getTypeData().getType().isAssignableFrom(typeData.getType())) {
+            return null;
+        }
+        cachePropertyTypeData(propertyMetadata, propertyTypeParameterMap, parentClassTypeData, genericTypeNames, genericType);
+        return propertyMetadata;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> PropertyMetadata<T> getOrCreatePropertyMetadata(final String propertyName,
+                                                                       final String declaringClassName,
+                                                                       final Map<String, PropertyMetadata<?>> propertyNameMap,
+                                                                       final TypeData<T> typeData) {
+        PropertyMetadata<T> propertyMetadata = (PropertyMetadata<T>) propertyNameMap.get(propertyName);
+        if (propertyMetadata == null) {
+            propertyMetadata = new PropertyMetadata<T>(propertyName, declaringClassName, typeData);
+            propertyNameMap.put(propertyName, propertyMetadata);
+        }
+        return propertyMetadata;
+    }
+
+    private static <T, S> void cachePropertyTypeData(final PropertyMetadata<T> propertyMetadata,
+                                                     final Map<String, TypeParameterMap> propertyTypeParameterMap,
+                                                     final TypeData<S> parentClassTypeData,
+                                                     final List<String> genericTypeNames,
+                                                     final Type genericType) {
+        TypeParameterMap typeParameterMap = getTypeParameterMap(genericTypeNames, genericType);
+        propertyTypeParameterMap.put(propertyMetadata.getName(), typeParameterMap);
+        propertyMetadata.typeParameterInfo(typeParameterMap, parentClassTypeData);
+    }
+
+    private static Type getGenericType(final Method method) {
+        return isGetter(method) ? method.getGenericReturnType() : method.getGenericParameterTypes()[0];
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> PropertyModelBuilder<T> createPropertyModelBuilder(final PropertyMetadata<T> propertyMetadata) {
+        PropertyModelBuilder<T> propertyModelBuilder = PropertyModel.<T>builder()
+                .propertyName(propertyMetadata.getName())
+                .readName(propertyMetadata.getName())
+                .writeName(propertyMetadata.getName())
+                .typeData(propertyMetadata.getTypeData())
+                .readAnnotations(propertyMetadata.getReadAnnotations())
+                .writeAnnotations(propertyMetadata.getWriteAnnotations())
+                .propertySerialization(new PropertyModelSerializationImpl<T>())
+                .propertyAccessor(new PropertyAccessorImpl<T>(propertyMetadata))
+                .setError(propertyMetadata.getError());
+
+        if (propertyMetadata.getTypeParameters() != null) {
+            specializePropertyModelBuilder(propertyModelBuilder, propertyMetadata);
+        }
+
+        return propertyModelBuilder;
+    }
+
+    private static TypeParameterMap getTypeParameterMap(final List<String> genericTypeNames, final Type propertyType) {
+        int classParamIndex = genericTypeNames.indexOf(propertyType.toString());
+        TypeParameterMap.Builder builder = TypeParameterMap.builder();
+        if (classParamIndex != -1) {
+            builder.addIndex(classParamIndex);
+        } else {
+            if (propertyType instanceof ParameterizedType) {
+                ParameterizedType pt = (ParameterizedType) propertyType;
+                for (int i = 0; i < pt.getActualTypeArguments().length; i++) {
+                    classParamIndex = genericTypeNames.indexOf(pt.getActualTypeArguments()[i].toString());
+                    if (classParamIndex != -1) {
+                        builder.addIndex(i, classParamIndex);
+                    }
+                }
+            }
+        }
+        return builder.build();
+    }
+    @SuppressWarnings("unchecked")
+    private static <V> void specializePropertyModelBuilder(final PropertyModelBuilder<V> propertyModelBuilder,
+                                                           final PropertyMetadata<V> propertyMetadata) {
+        if (propertyMetadata.getTypeParameterMap().hasTypeParameters() && !propertyMetadata.getTypeParameters().isEmpty()) {
+            TypeData<V> specializedFieldType;
+            Map<Integer, Integer> fieldToClassParamIndexMap = propertyMetadata.getTypeParameterMap().getPropertyToClassParamIndexMap();
+            Integer classTypeParamRepresentsWholeField = fieldToClassParamIndexMap.get(-1);
+            if (classTypeParamRepresentsWholeField != null) {
+                specializedFieldType = (TypeData<V>) propertyMetadata.getTypeParameters().get(classTypeParamRepresentsWholeField);
+            } else {
+                TypeData.Builder<V> builder = TypeData.builder(propertyModelBuilder.getTypeData().getType());
+                List<TypeData<?>> typeParameters = new ArrayList<TypeData<?>>(propertyModelBuilder.getTypeData().getTypeParameters());
+                for (int i = 0; i < typeParameters.size(); i++) {
+                    for (Map.Entry<Integer, Integer> mapping : fieldToClassParamIndexMap.entrySet()) {
+                        if (mapping.getKey().equals(i)) {
+                            typeParameters.set(i, propertyMetadata.getTypeParameters().get(mapping.getValue()));
+                        }
+                    }
+                }
+                builder.addTypeParameters(typeParameters);
+                specializedFieldType = builder.build();
+            }
+            propertyModelBuilder.typeData(specializedFieldType);
+        }
+    }
+
+    static <V> V stateNotNull(final String property, final V value) {
+        if (value == null) {
+            throw new IllegalStateException(format("%s cannot be null", property));
+        }
+        return value;
+    }
+
+    private PojoBuilderHelper() {
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PojoCodec.java b/bson/src/main/org/bson/codecs/pojo/PojoCodec.java
new file mode 100644
index 00000000000..be6ac86248d
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PojoCodec.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+
+abstract class PojoCodec<T> implements Codec<T> {
+
+    abstract ClassModel<T> getClassModel();
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PojoCodecImpl.java b/bson/src/main/org/bson/codecs/pojo/PojoCodecImpl.java
new file mode 100644
index 00000000000..fcd67e9ae72
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PojoCodecImpl.java
@@ -0,0 +1,389 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.BsonReader;
+import org.bson.BsonReaderMark;
+import org.bson.BsonType;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.diagnostics.Logger;
+import org.bson.diagnostics.Loggers;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import static java.lang.String.format;
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+
+
+final class PojoCodecImpl<T> extends PojoCodec<T> {
+    private static final Logger LOGGER = Loggers.getLogger("PojoCodec");
+    private final ClassModel<T> classModel;
+    private final CodecRegistry registry;
+    private final PropertyCodecRegistry propertyCodecRegistry;
+    private final DiscriminatorLookup discriminatorLookup;
+    private final ConcurrentMap<ClassModel<?>, Codec<?>> codecCache;
+    private final boolean specialized;
+
+    PojoCodecImpl(final ClassModel<T> classModel, final CodecRegistry codecRegistry,
+                  final List<PropertyCodecProvider> propertyCodecProviders, final DiscriminatorLookup discriminatorLookup) {
+        this.classModel = classModel;
+        this.registry = fromRegistries(fromCodecs(this), codecRegistry);
+        this.discriminatorLookup = discriminatorLookup;
+        this.codecCache = new ConcurrentHashMap<ClassModel<?>, Codec<?>>();
+        this.propertyCodecRegistry = new PropertyCodecRegistryImpl(this, registry, propertyCodecProviders);
+        this.specialized = shouldSpecialize(classModel);
+        specialize();
+    }
+
+    PojoCodecImpl(final ClassModel<T> classModel, final CodecRegistry registry, final PropertyCodecRegistry propertyCodecRegistry,
+                  final DiscriminatorLookup discriminatorLookup, final ConcurrentMap<ClassModel<?>, Codec<?>> codecCache,
+                  final boolean specialized) {
+        this.classModel = classModel;
+        this.registry = fromRegistries(fromCodecs(this), registry);
+        this.discriminatorLookup = discriminatorLookup;
+        this.codecCache = codecCache;
+        this.propertyCodecRegistry = propertyCodecRegistry;
+        this.specialized = specialized;
+        specialize();
+    }
+
+    private void specialize() {
+        if (specialized) {
+            codecCache.put(classModel, this);
+            for (PropertyModel<?> propertyModel : classModel.getPropertyModels()) {
+                addToCache(propertyModel);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void encode(final BsonWriter writer, final T value, final EncoderContext encoderContext) {
+        if (!specialized) {
+            throw new CodecConfigurationException(format("%s contains generic types that have not been specialised.%n"
+                            + "Top level classes with generic types are not supported by the PojoCodec.", classModel.getName()));
+        }
+
+        if (areEquivalentTypes(value.getClass(), classModel.getType())) {
+            writer.writeStartDocument();
+
+            encodeIdProperty(writer, value, encoderContext, classModel.getIdPropertyModelHolder());
+
+            if (classModel.useDiscriminator()) {
+                writer.writeString(classModel.getDiscriminatorKey(), classModel.getDiscriminator());
+            }
+
+            for (PropertyModel<?> propertyModel : classModel.getPropertyModels()) {
+                if (propertyModel.equals(classModel.getIdPropertyModel())) {
+                    continue;
+                }
+                encodeProperty(writer, value, encoderContext, propertyModel);
+            }
+            writer.writeEndDocument();
+        } else {
+            ((Codec<T>) registry.get(value.getClass())).encode(writer, value, encoderContext);
+        }
+    }
+
+    @Override
+    public T decode(final BsonReader reader, final DecoderContext decoderContext) {
+        if (decoderContext.hasCheckedDiscriminator()) {
+            if (!specialized) {
+                throw new CodecConfigurationException(format("%s contains generic types that have not been specialised.%n"
+                        + "Top level classes with generic types are not supported by the PojoCodec.", classModel.getName()));
+            }
+            InstanceCreator<T> instanceCreator = classModel.getInstanceCreator();
+            decodeProperties(reader, decoderContext, instanceCreator);
+            return instanceCreator.getInstance();
+        } else {
+            return getCodecFromDocument(reader, classModel.useDiscriminator(), classModel.getDiscriminatorKey(), registry,
+                    discriminatorLookup, this).decode(reader, DecoderContext.builder().checkedDiscriminator(true).build());
+        }
+    }
+
+    @Override
+    public Class<T> getEncoderClass() {
+        return classModel.getType();
+    }
+
+    @Override
+    public String toString() {
+        return format("PojoCodec<%s>", classModel);
+    }
+
+    ClassModel<T> getClassModel() {
+        return classModel;
+    }
+
+    private <S> void encodeIdProperty(final BsonWriter writer, final T instance, final EncoderContext encoderContext,
+                                      final IdPropertyModelHolder<S> propertyModelHolder) {
+        if (propertyModelHolder.getPropertyModel() != null) {
+            if (propertyModelHolder.getIdGenerator() == null) {
+                encodeProperty(writer, instance, encoderContext, propertyModelHolder.getPropertyModel());
+            } else {
+                S id = propertyModelHolder.getPropertyModel().getPropertyAccessor().get(instance);
+                if (id == null && encoderContext.isEncodingCollectibleDocument()) {
+                    id = propertyModelHolder.getIdGenerator().generate();
+                    try {
+                        propertyModelHolder.getPropertyModel().getPropertyAccessor().set(instance, id);
+                    } catch (Exception e) {
+                        // ignore
+                    }
+                }
+                encodeValue(writer, encoderContext, propertyModelHolder.getPropertyModel(), id);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <S> void encodeProperty(final BsonWriter writer, final T instance, final EncoderContext encoderContext,
+                                    final PropertyModel<S> propertyModel) {
+        if (propertyModel != null && propertyModel.isReadable()) {
+            S propertyValue = propertyModel.getPropertyAccessor().get(instance);
+            encodeValue(writer, encoderContext, propertyModel, propertyValue);
+        }
+    }
+
+    private <S> void encodeValue(final BsonWriter writer,  final EncoderContext encoderContext, final PropertyModel<S> propertyModel,
+                                 final S propertyValue) {
+        if (propertyModel.shouldSerialize(propertyValue)) {
+            writer.writeName(propertyModel.getReadName());
+            if (propertyValue == null) {
+                writer.writeNull();
+            } else {
+                try {
+                    encoderContext.encodeWithChildContext(propertyModel.getCachedCodec(), writer, propertyValue);
+                } catch (CodecConfigurationException e) {
+                    throw new CodecConfigurationException(format("Failed to encode '%s'. Encoding '%s' errored with: %s",
+                            classModel.getName(), propertyModel.getReadName(), e.getMessage()), e);
+                }
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void decodeProperties(final BsonReader reader, final DecoderContext decoderContext, final InstanceCreator<T> instanceCreator) {
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String name = reader.readName();
+            if (classModel.useDiscriminator() && classModel.getDiscriminatorKey().equals(name)) {
+                reader.readString();
+            } else {
+                decodePropertyModel(reader, decoderContext, instanceCreator, name, getPropertyModelByWriteName(classModel, name));
+            }
+        }
+        reader.readEndDocument();
+    }
+
+    @SuppressWarnings("unchecked")
+    private <S> void decodePropertyModel(final BsonReader reader, final DecoderContext decoderContext,
+                                         final InstanceCreator<T> instanceCreator, final String name,
+                                         final PropertyModel<S> propertyModel) {
+        if (propertyModel != null) {
+            try {
+                S value = null;
+                if (reader.getCurrentBsonType() == BsonType.NULL) {
+                    reader.readNull();
+                } else {
+                    value = decoderContext.decodeWithChildContext(propertyModel.getCachedCodec(), reader);
+                }
+                if (propertyModel.isWritable()) {
+                    instanceCreator.set(value, propertyModel);
+                }
+            } catch (BsonInvalidOperationException e) {
+                throw new CodecConfigurationException(format("Failed to decode '%s'. Decoding '%s' errored with: %s",
+                        classModel.getName(), name, e.getMessage()), e);
+            } catch (CodecConfigurationException e) {
+                throw new CodecConfigurationException(format("Failed to decode '%s'. Decoding '%s' errored with: %s",
+                        classModel.getName(), name, e.getMessage()), e);
+            }
+        } else {
+            if (LOGGER.isTraceEnabled()) {
+                LOGGER.trace(format("Found property not present in the ClassModel: %s", name));
+            }
+            reader.skipValue();
+        }
+    }
+
+    private <S> void addToCache(final PropertyModel<S> propertyModel) {
+        Codec<S> codec = propertyModel.getCodec() != null ? propertyModel.getCodec() : specializePojoCodec(propertyModel);
+        propertyModel.cachedCodec(codec);
+    }
+
+    private <S, V> boolean areEquivalentTypes(final Class<S> t1, final Class<V> t2) {
+        if (t1.equals(t2)) {
+            return true;
+        } else if (Collection.class.isAssignableFrom(t1) && Collection.class.isAssignableFrom(t2)) {
+            return true;
+        } else if (Map.class.isAssignableFrom(t1) && Map.class.isAssignableFrom(t2)) {
+            return true;
+        }
+        return false;
+    }
+
+
+
+    @SuppressWarnings("unchecked")
+    private <S> Codec<S> specializePojoCodec(final PropertyModel<S> propertyModel) {
+        Codec<S> codec = getCodecFromPropertyRegistry(propertyModel);
+        if (codec instanceof PojoCodec) {
+            PojoCodec<S> pojoCodec = (PojoCodec<S>) codec;
+            ClassModel<S> specialized = getSpecializedClassModel(pojoCodec.getClassModel(), propertyModel);
+            if (codecCache.containsKey(specialized)) {
+                codec = (Codec<S>) codecCache.get(specialized);
+            } else {
+                codec = new LazyPojoCodec<S>(specialized, registry, propertyCodecRegistry, discriminatorLookup, codecCache);
+            }
+        }
+        return codec;
+    }
+
+    private <S> Codec<S> getCodecFromPropertyRegistry(final PropertyModel<S> propertyModel) {
+        try {
+            return propertyCodecRegistry.get(propertyModel.getTypeData());
+        } catch (CodecConfigurationException e) {
+            return new LazyMissingCodec<S>(propertyModel.getTypeData().getType(), e);
+        }
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private <S, V> ClassModel<S> getSpecializedClassModel(final ClassModel<S> clazzModel, final PropertyModel<V> propertyModel) {
+        boolean useDiscriminator = propertyModel.useDiscriminator() == null ? clazzModel.useDiscriminator()
+                : propertyModel.useDiscriminator();
+        boolean validDiscriminator = clazzModel.getDiscriminatorKey() != null && clazzModel.getDiscriminator() != null;
+        boolean changeTheDiscriminator = (useDiscriminator != clazzModel.useDiscriminator()) && validDiscriminator;
+
+        if (propertyModel.getTypeData().getTypeParameters().isEmpty() && !changeTheDiscriminator){
+            return clazzModel;
+        }
+
+        ArrayList<PropertyModel<?>> concretePropertyModels = new ArrayList<PropertyModel<?>>(clazzModel.getPropertyModels());
+        PropertyModel<?> concreteIdProperty = clazzModel.getIdPropertyModel();
+
+        List<TypeData<?>> propertyTypeParameters = propertyModel.getTypeData().getTypeParameters();
+        for (int i = 0; i < concretePropertyModels.size(); i++) {
+            PropertyModel<?> model = concretePropertyModels.get(i);
+            String propertyName = model.getName();
+            TypeParameterMap typeParameterMap = clazzModel.getPropertyNameToTypeParameterMap().get(propertyName);
+            if (typeParameterMap.hasTypeParameters()) {
+                PropertyModel<?> concretePropertyModel = getSpecializedPropertyModel(model, typeParameterMap, propertyTypeParameters);
+                concretePropertyModels.set(i, concretePropertyModel);
+                if (concreteIdProperty != null && concreteIdProperty.getName().equals(propertyName)) {
+                    concreteIdProperty = concretePropertyModel;
+                }
+            }
+        }
+
+        boolean discriminatorEnabled = changeTheDiscriminator ? propertyModel.useDiscriminator() : clazzModel.useDiscriminator();
+        return new ClassModel<S>(clazzModel.getType(), clazzModel.getPropertyNameToTypeParameterMap(),
+                clazzModel.getInstanceCreatorFactory(), discriminatorEnabled, clazzModel.getDiscriminatorKey(),
+                clazzModel.getDiscriminator(), IdPropertyModelHolder.create(clazzModel, concreteIdProperty), concretePropertyModels);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <V> PropertyModel<V> getSpecializedPropertyModel(final PropertyModel<V> propertyModel, final TypeParameterMap typeParameterMap,
+                                                             final List<TypeData<?>> propertyTypeParameters) {
+        TypeData<V> specializedPropertyType;
+        Map<Integer, Integer> propertyToClassParamIndexMap = typeParameterMap.getPropertyToClassParamIndexMap();
+        Integer classTypeParamRepresentsWholeProperty = propertyToClassParamIndexMap.get(-1);
+        if (classTypeParamRepresentsWholeProperty != null) {
+            specializedPropertyType = (TypeData<V>) propertyTypeParameters.get(classTypeParamRepresentsWholeProperty);
+        } else {
+            TypeData.Builder<V> builder = TypeData.builder(propertyModel.getTypeData().getType());
+            List<TypeData<?>> typeParameters = new ArrayList<TypeData<?>>(propertyModel.getTypeData().getTypeParameters());
+            for (int i = 0; i < typeParameters.size(); i++) {
+                for (Map.Entry<Integer, Integer> mapping : propertyToClassParamIndexMap.entrySet()) {
+                    if (mapping.getKey().equals(i)) {
+                        typeParameters.set(i, propertyTypeParameters.get(mapping.getValue()));
+                    }
+                }
+            }
+            builder.addTypeParameters(typeParameters);
+            specializedPropertyType = builder.build();
+        }
+        if (propertyModel.getTypeData().equals(specializedPropertyType)) {
+            return propertyModel;
+        }
+
+        return new PropertyModel<V>(propertyModel.getName(), propertyModel.getReadName(), propertyModel.getWriteName(),
+                specializedPropertyType, null, propertyModel.getPropertySerialization(), propertyModel.useDiscriminator(),
+                propertyModel.getPropertyAccessor(), propertyModel.getError());
+    }
+
+    @SuppressWarnings("unchecked")
+    private Codec<T> getCodecFromDocument(final BsonReader reader, final boolean useDiscriminator, final String discriminatorKey,
+                                          final CodecRegistry registry, final DiscriminatorLookup discriminatorLookup,
+                                          final Codec<T> defaultCodec) {
+        Codec<T> codec = defaultCodec;
+        if (useDiscriminator) {
+            BsonReaderMark mark = reader.getMark();
+            reader.readStartDocument();
+            boolean discriminatorKeyFound = false;
+            while (!discriminatorKeyFound && reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                String name = reader.readName();
+                if (discriminatorKey.equals(name)) {
+                    discriminatorKeyFound = true;
+                    try {
+                        codec = (Codec<T>) registry.get(discriminatorLookup.lookup(reader.readString()));
+                    } catch (Exception e) {
+                        throw new CodecConfigurationException(format("Failed to decode '%s'. Decoding errored with: %s",
+                                classModel.getName(), e.getMessage()), e);
+                    }
+                } else {
+                    reader.skipValue();
+                }
+            }
+            mark.reset();
+        }
+        return codec;
+    }
+
+    private PropertyModel<?> getPropertyModelByWriteName(final ClassModel<T> classModel, final String readName) {
+        for (PropertyModel<?> propertyModel : classModel.getPropertyModels()) {
+            if (propertyModel.isWritable() && propertyModel.getWriteName().equals(readName)) {
+                return propertyModel;
+            }
+        }
+        return null;
+    }
+
+    private static <T> boolean shouldSpecialize(final ClassModel<T> classModel) {
+        if (!classModel.hasTypeParameters()) {
+            return true;
+        }
+
+        for (Map.Entry<String, TypeParameterMap> entry : classModel.getPropertyNameToTypeParameterMap().entrySet()) {
+            TypeParameterMap typeParameterMap = entry.getValue();
+            PropertyModel<?> propertyModel = classModel.getPropertyModel(entry.getKey());
+            if (typeParameterMap.hasTypeParameters() && (propertyModel == null || propertyModel.getCodec() == null)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PojoCodecProvider.java b/bson/src/main/org/bson/codecs/pojo/PojoCodecProvider.java
new file mode 100644
index 00000000000..38ee53ebe66
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PojoCodecProvider.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.diagnostics.Logger;
+import org.bson.diagnostics.Loggers;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static org.bson.assertions.Assertions.notNull;
+
+/**
+ * Provides Codecs for registered POJOs via the ClassModel abstractions.
+ *
+ * @since 3.5
+ */
+public final class PojoCodecProvider implements CodecProvider {
+    static final Logger LOGGER = Loggers.getLogger("codecs.pojo");
+    private final boolean automatic;
+    private final Map<Class<?>, ClassModel<?>> classModels;
+    private final Set<String> packages;
+    private final List<Convention> conventions;
+    private final DiscriminatorLookup discriminatorLookup;
+    private final List<PropertyCodecProvider> propertyCodecProviders;
+
+    private PojoCodecProvider(final boolean automatic, final Map<Class<?>, ClassModel<?>> classModels, final Set<String> packages,
+                              final List<Convention> conventions, final List<PropertyCodecProvider> propertyCodecProviders) {
+        this.automatic = automatic;
+        this.classModels = classModels;
+        this.packages = packages;
+        this.conventions = conventions;
+        this.discriminatorLookup = new DiscriminatorLookup(classModels, packages);
+        this.propertyCodecProviders = propertyCodecProviders;
+    }
+
+    /**
+     * Creates a Builder so classes or packages can be registered and configured before creating an immutable CodecProvider.
+     *
+     * @return the Builder
+     * @see Builder#register(Class[])
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
+        return getPojoCodec(clazz, registry);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> PojoCodec<T> getPojoCodec(final Class<T> clazz, final CodecRegistry registry) {
+        ClassModel<T> classModel = (ClassModel<T>) classModels.get(clazz);
+        if (classModel != null) {
+            return new PojoCodecImpl<T>(classModel, registry, propertyCodecProviders, discriminatorLookup);
+        } else if (automatic || (clazz.getPackage() != null && packages.contains(clazz.getPackage().getName()))) {
+            try {
+                classModel = createClassModel(clazz, conventions);
+                if (clazz.isInterface() || !classModel.getPropertyModels().isEmpty()) {
+                    discriminatorLookup.addClassModel(classModel);
+                    return new AutomaticPojoCodec<T>(new PojoCodecImpl<T>(classModel, registry, propertyCodecProviders,
+                            discriminatorLookup));
+                }
+            } catch (Exception e) {
+                LOGGER.warn(format("Cannot use '%s' with the PojoCodec.", clazz.getSimpleName()), e);
+                return null;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * A Builder for the PojoCodecProvider
+     */
+    public static final class Builder {
+        private final Set<String> packages = new HashSet<String>();
+        private final Map<Class<?>, ClassModel<?>> classModels = new HashMap<Class<?>, ClassModel<?>>();
+        private final List<Class<?>> clazzes = new ArrayList<Class<?>>();
+        private List<Convention> conventions = null;
+        private final List<PropertyCodecProvider> propertyCodecProviders = new ArrayList<PropertyCodecProvider>();
+        private boolean automatic;
+
+        /**
+         * Creates the PojoCodecProvider with the classes or packages that configured and registered.
+         *
+         * @return the Provider
+         * @see #register(Class...)
+         */
+        public PojoCodecProvider build() {
+            List<Convention> immutableConventions = conventions != null
+                    ? Collections.unmodifiableList(new ArrayList<Convention>(conventions))
+                    : null;
+            for (Class<?> clazz : clazzes) {
+                if (!classModels.containsKey(clazz)) {
+                    register(createClassModel(clazz, immutableConventions));
+                }
+            }
+            return new PojoCodecProvider(automatic, classModels, packages, immutableConventions, propertyCodecProviders);
+        }
+
+        /**
+         * Sets whether the provider should automatically try to wrap a {@link ClassModel} for any class that is requested.
+         *
+         * <p>Note: As Java Beans are convention based, when using automatic settings the provider should be the last provider in the
+         * registry.</p>
+         *
+         * @param automatic whether to automatically wrap {@code ClassModels} or not.
+         * @return this
+         */
+        public Builder automatic(final boolean automatic) {
+            this.automatic = automatic;
+            return this;
+        }
+
+        /**
+         * Sets the conventions to use when creating {@code ClassModels} from classes or packages.
+         *
+         * @param conventions a list of conventions
+         * @return this
+         */
+        public Builder conventions(final List<Convention> conventions) {
+            this.conventions = notNull("conventions", conventions);
+            return this;
+        }
+
+        /**
+         * Registers a classes with the builder for inclusion in the Provider.
+         *
+         * <p>Note: Uses reflection for the property mapping. If no conventions are configured on the builder the
+         * {@link Conventions#DEFAULT_CONVENTIONS} will be used.</p>
+         *
+         * @param classes the classes to register
+         * @return this
+         */
+        public Builder register(final Class<?>... classes) {
+            clazzes.addAll(asList(classes));
+            return this;
+        }
+
+        /**
+         * Registers classModels for inclusion in the Provider.
+         *
+         * @param classModels the classModels to register
+         * @return this
+         */
+        public Builder register(final ClassModel<?>... classModels) {
+            notNull("classModels", classModels);
+            for (ClassModel<?> classModel : classModels) {
+                this.classModels.put(classModel.getType(), classModel);
+            }
+            return this;
+        }
+
+        /**
+         * Registers the packages of the given classes with the builder for inclusion in the Provider. This will allow classes in the
+         * given packages to mapped for use with PojoCodecProvider.
+         *
+         * <p>Note: Uses reflection for the field mapping. If no conventions are configured on the builder the
+         * {@link Conventions#DEFAULT_CONVENTIONS} will be used.</p>
+         *
+         * @param packageNames the package names to register
+         * @return this
+         */
+        public Builder register(final String... packageNames) {
+            packages.addAll(asList(notNull("packageNames", packageNames)));
+            return this;
+        }
+
+        /**
+         * Registers codec providers that receive the type parameters of properties for instances encoded and decoded
+         * by a {@link PojoCodec} handled by this provider.
+         *
+         * <p>Note that you should prefer working with the {@link CodecRegistry}/{@link CodecProvider} hierarchy. Providers
+         * should only be registered here if a codec needs to be created for custom container types like optionals and
+         * collections. Support for types {@link Map} and {@link java.util.Collection} are built-in so explicitly handling
+         * them is not necessary.
+         * @param providers property codec providers to register
+         * @return this
+         * @since 3.6
+         */
+        public Builder register(final PropertyCodecProvider... providers) {
+            propertyCodecProviders.addAll(asList(notNull("providers", providers)));
+            return this;
+        }
+
+        private Builder() {
+        }
+    }
+
+    private static <T> ClassModel<T> createClassModel(final Class<T> clazz, final List<Convention> conventions) {
+        ClassModelBuilder<T> builder = ClassModel.builder(clazz);
+        if (conventions != null) {
+            builder.conventions(conventions);
+        }
+        return builder.build();
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyAccessor.java b/bson/src/main/org/bson/codecs/pojo/PropertyAccessor.java
new file mode 100644
index 00000000000..740856d876e
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyAccessor.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+/**
+ * Provides access for getting and setting property data.
+ *
+ * @param <T> the type of the property
+ * @since 3.5
+ */
+public interface PropertyAccessor<T> {
+
+    /**
+     * Gets the value for a given PropertyModel instance.
+     *
+     * @param instance the class instance to get the property value from
+     * @param <S>      the class instance type
+     * @return the value of the property.
+     */
+    <S> T get(S instance);
+
+    /**
+     * Sets a value on the given PropertyModel
+     *
+     * @param instance the instance to set the property value to
+     * @param <S>      the class instance type
+     * @param value    the new value for the property
+     */
+    <S> void set(S instance, T value);
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyAccessorImpl.java b/bson/src/main/org/bson/codecs/pojo/PropertyAccessorImpl.java
new file mode 100644
index 00000000000..d0d963b093e
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyAccessorImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import static java.lang.String.format;
+
+final class PropertyAccessorImpl<T> implements PropertyAccessor<T> {
+
+    private final PropertyMetadata<T> propertyMetadata;
+
+    PropertyAccessorImpl(final PropertyMetadata<T> propertyMetadata) {
+        this.propertyMetadata = propertyMetadata;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <S> T get(final S instance) {
+        try {
+            if (propertyMetadata.isSerializable()) {
+                if (propertyMetadata.getGetter() != null) {
+                    return (T) propertyMetadata.getGetter().invoke(instance);
+                } else {
+                    return (T) propertyMetadata.getField().get(instance);
+                }
+            } else {
+                throw getError(null);
+            }
+        } catch (final Exception e) {
+            throw getError(e);
+        }
+    }
+
+    @Override
+    public <S> void set(final S instance, final T value) {
+        try {
+            if (propertyMetadata.isDeserializable()) {
+                if (propertyMetadata.getSetter() != null) {
+                    propertyMetadata.getSetter().invoke(instance, value);
+                } else {
+                    propertyMetadata.getField().set(instance, value);
+                }
+            }
+        } catch (final Exception e) {
+            throw setError(e);
+        }
+    }
+
+    PropertyMetadata<T> getPropertyMetadata() {
+        return propertyMetadata;
+    }
+
+    private CodecConfigurationException getError(final Exception cause) {
+        return new CodecConfigurationException(format("Unable to get value for property '%s' in %s", propertyMetadata.getName(),
+                propertyMetadata.getDeclaringClassName()), cause);
+    }
+
+    private CodecConfigurationException setError(final Exception cause) {
+        return new CodecConfigurationException(format("Unable to set value for property '%s' in %s", propertyMetadata.getName(),
+                propertyMetadata.getDeclaringClassName()), cause);
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyCodecProvider.java b/bson/src/main/org/bson/codecs/pojo/PropertyCodecProvider.java
new file mode 100644
index 00000000000..765a88400aa
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyCodecProvider.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+
+/**
+ * A variant of {@link org.bson.codecs.configuration.CodecProvider} that generates codecs for {@link PojoCodec}.
+ *
+ * <p>This is a specialized codec provider that retrieves codecs which account for type parameters associated with
+ * a property. In particular this should only be used to add support for custom container types like optionals.
+ * It's only applicable for use by {@link PojoCodec} registered through {@link PojoCodecProvider#builder()}.
+ *
+ * @since 3.6
+ */
+public interface PropertyCodecProvider {
+
+    /**
+     * Get a {@code Codec} using the given context, which includes, most importantly, the class and bound type parameters
+     * for which a {@code Codec} is required.
+     *
+     * @param type the class and bound type parameters for which to get a Codec
+     * @param registry the registry to use for resolving dependent Codec instances
+     * @param <T> the type of the class for which a Codec is required
+     * @return the Codec instance, which may be null, if this source is unable to provide one for the requested Class
+     */
+    <T> Codec<T> get(TypeWithTypeParameters<T> type, PropertyCodecRegistry registry);
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyCodecRegistry.java b/bson/src/main/org/bson/codecs/pojo/PropertyCodecRegistry.java
new file mode 100644
index 00000000000..7b91628b987
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyCodecRegistry.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+/**
+ * A variant of {@link org.bson.codecs.configuration.CodecRegistry} that generates codecs for {@link PojoCodec}.
+ *
+ * <p>This is a specialized codec registry that retrieves codecs which account for type parameters associated with
+ * a property. In particular this should only be used to add support for custom container types like optionals.
+ * It's only applicable for use by {@link PojoCodec} registered through {@link PojoCodecProvider#builder()}.
+ *
+ * @since 3.6
+ */
+public interface PropertyCodecRegistry {
+
+    /**
+     * Gets a {@code Codec} for the given Class.
+     *
+     * @param type the Class associated type parameters for this property for which to get a Codec
+     * @param <T> the class type
+     * @return a codec for the given class
+     * @throws CodecConfigurationException if the registry does not contain a codec for the given class.
+     */
+    <T> Codec<T> get(TypeWithTypeParameters<T> type);
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyCodecRegistryImpl.java b/bson/src/main/org/bson/codecs/pojo/PropertyCodecRegistryImpl.java
new file mode 100644
index 00000000000..5adeebeb018
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyCodecRegistryImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class PropertyCodecRegistryImpl implements PropertyCodecRegistry {
+    private final List<PropertyCodecProvider> propertyCodecProviders;
+
+    PropertyCodecRegistryImpl(final PojoCodec<?> pojoCodec, final CodecRegistry codecRegistry,
+                              final List<PropertyCodecProvider> propertyCodecProviders) {
+        List<PropertyCodecProvider> augmentedProviders = new ArrayList<PropertyCodecProvider>();
+        if (propertyCodecProviders != null) {
+            augmentedProviders.addAll(propertyCodecProviders);
+        }
+        augmentedProviders.add(new CollectionPropertyCodecProvider());
+        augmentedProviders.add(new MapPropertyCodecProvider());
+        augmentedProviders.add(new EnumPropertyCodecProvider(codecRegistry));
+        augmentedProviders.add(new FallbackPropertyCodecProvider(pojoCodec, codecRegistry));
+        this.propertyCodecProviders = augmentedProviders;
+    }
+
+    @Override
+    public <S> Codec<S> get(final TypeWithTypeParameters<S> type) {
+        for (PropertyCodecProvider propertyCodecProvider : propertyCodecProviders) {
+            Codec<S> codec = propertyCodecProvider.get(type, this);
+            if (codec != null) {
+                return codec;
+            }
+        }
+        return null;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyMetadata.java b/bson/src/main/org/bson/codecs/pojo/PropertyMetadata.java
new file mode 100644
index 00000000000..cf1c9a45e06
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyMetadata.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.lang.String.format;
+import static java.lang.reflect.Modifier.isFinal;
+import static java.lang.reflect.Modifier.isPublic;
+import static java.lang.reflect.Modifier.isStatic;
+import static java.lang.reflect.Modifier.isTransient;
+
+final class PropertyMetadata<T> {
+    private final String name;
+    private final String declaringClassName;
+    private final TypeData<T> typeData;
+    private final Map<Class<? extends Annotation>, Annotation> readAnnotations = new HashMap<Class<? extends Annotation>, Annotation>();
+    private final Map<Class<? extends Annotation>, Annotation> writeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>();
+    private TypeParameterMap typeParameterMap;
+    private List<TypeData<?>> typeParameters;
+
+    private String error;
+    private Field field;
+    private Method getter;
+    private Method setter;
+
+    PropertyMetadata(final String name, final String declaringClassName, final TypeData<T> typeData) {
+        this.name = name;
+        this.declaringClassName = declaringClassName;
+        this.typeData = typeData;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Annotation> getReadAnnotations() {
+        return new ArrayList<Annotation>(readAnnotations.values());
+    }
+
+    public PropertyMetadata<T> addReadAnnotation(final Annotation annotation) {
+        if (readAnnotations.containsKey(annotation.annotationType())) {
+            if (annotation.equals(readAnnotations.get(annotation.annotationType()))) {
+                return this;
+            }
+            throw new CodecConfigurationException(format("Read annotation %s for '%s' already exists in %s", annotation.annotationType(),
+                    name, declaringClassName));
+        }
+        readAnnotations.put(annotation.annotationType(), annotation);
+        return this;
+    }
+
+    public List<Annotation> getWriteAnnotations() {
+        return new ArrayList<Annotation>(writeAnnotations.values());
+    }
+
+    public PropertyMetadata<T> addWriteAnnotation(final Annotation annotation) {
+        if (writeAnnotations.containsKey(annotation.annotationType())) {
+            if (annotation.equals(writeAnnotations.get(annotation.annotationType()))) {
+                return this;
+            }
+            throw new CodecConfigurationException(format("Write annotation %s for '%s' already exists in %s", annotation.annotationType(),
+                    name, declaringClassName));
+        }
+        writeAnnotations.put(annotation.annotationType(), annotation);
+        return this;
+    }
+
+    public Field getField() {
+        return field;
+    }
+
+    public PropertyMetadata<T> field(final Field field) {
+        this.field = field;
+        return this;
+    }
+
+    public Method getGetter() {
+        return getter;
+    }
+
+    public void setGetter(final Method getter) {
+        this.getter = getter;
+    }
+
+    public Method getSetter() {
+        return setter;
+    }
+
+    public void setSetter(final Method setter) {
+        this.setter = setter;
+    }
+
+    public String getDeclaringClassName() {
+        return declaringClassName;
+    }
+
+    public TypeData<T> getTypeData() {
+        return typeData;
+    }
+
+    public TypeParameterMap getTypeParameterMap() {
+        return typeParameterMap;
+    }
+
+    public List<TypeData<?>> getTypeParameters() {
+        return typeParameters;
+    }
+
+    public <S> PropertyMetadata<T> typeParameterInfo(final TypeParameterMap typeParameterMap, final TypeData<S> parentTypeData) {
+        if (typeParameterMap != null && parentTypeData != null) {
+            this.typeParameterMap = typeParameterMap;
+            this.typeParameters = parentTypeData.getTypeParameters();
+        }
+        return this;
+    }
+
+    String getError() {
+        return error;
+    }
+
+    void setError(final String error) {
+        this.error = error;
+    }
+
+    public boolean isSerializable() {
+        if (getter != null) {
+            return field == null || notStaticOrTransient(field.getModifiers());
+        } else {
+            return field != null && isPublicAndNotStaticOrTransient(field.getModifiers());
+        }
+    }
+
+    public boolean isDeserializable() {
+        if (setter != null) {
+            return field == null || !isFinal(field.getModifiers()) && notStaticOrTransient(field.getModifiers());
+        } else {
+            return field != null && !isFinal(field.getModifiers()) && isPublicAndNotStaticOrTransient(field.getModifiers());
+        }
+    }
+
+    private boolean notStaticOrTransient(final int modifiers) {
+        return !(isTransient(modifiers) || isStatic(modifiers));
+    }
+
+    private boolean isPublicAndNotStaticOrTransient(final int modifiers) {
+        return isPublic(modifiers) && notStaticOrTransient(modifiers);
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyModel.java b/bson/src/main/org/bson/codecs/pojo/PropertyModel.java
new file mode 100644
index 00000000000..799fe88644b
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyModel.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+
+/**
+ * Represents a property on a class and stores various metadata such as generic parameters
+ *
+ * @param <T> the type of the property that the PropertyModel represents.
+ * @since 3.5
+ */
+public final class PropertyModel<T> {
+    private final String name;
+    private final String readName;
+    private final String writeName;
+    private final TypeData<T> typeData;
+    private final Codec<T> codec;
+    private final PropertySerialization<T> propertySerialization;
+    private final Boolean useDiscriminator;
+    private final PropertyAccessor<T> propertyAccessor;
+    private final String error;
+    private volatile Codec<T> cachedCodec;
+
+    PropertyModel(final String name, final String readName, final String writeName, final TypeData<T> typeData,
+                  final Codec<T> codec, final PropertySerialization<T> propertySerialization, final Boolean useDiscriminator,
+                  final PropertyAccessor<T> propertyAccessor, final String error) {
+        this.name = name;
+        this.readName = readName;
+        this.writeName = writeName;
+        this.typeData = typeData;
+        this.codec = codec;
+        this.cachedCodec = codec;
+        this.propertySerialization = propertySerialization;
+        this.useDiscriminator = useDiscriminator;
+        this.propertyAccessor = propertyAccessor;
+        this.error = error;
+    }
+
+    /**
+     * Create a new {@link PropertyModelBuilder}
+     * @param <T> the type of the property
+     * @return the builder
+     */
+    public static <T> PropertyModelBuilder<T> builder() {
+        return new PropertyModelBuilder<T>();
+    }
+
+    /**
+     * @return the property name for the model
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the name of the property to use as the key when deserializing from BSON
+     */
+    public String getWriteName() {
+        return writeName;
+    }
+
+    /**
+     * @return the name of the property to use as the key when serializing into BSON
+     */
+    public String getReadName() {
+        return readName;
+    }
+
+    /**
+     * Property is writable.
+     *
+     * @return true if can be deserialized from BSON
+     */
+    public boolean isWritable() {
+        return writeName != null;
+    }
+
+    /**
+     * Property is readable.
+     *
+     * @return true if can be serialized to BSON
+     */
+    public boolean isReadable() {
+        return readName != null;
+    }
+
+    /**
+     * @return the type data for the property
+     */
+    public TypeData<T> getTypeData() {
+        return typeData;
+    }
+
+    /**
+     * @return the custom codec to use if set or null
+     */
+    public Codec<T> getCodec() {
+        return codec;
+    }
+
+    /**
+     * Returns true if the value should be serialized.
+     *
+     * @param value the value to check
+     * @return true if the value should be serialized.
+     */
+    public boolean shouldSerialize(final T value) {
+        return propertySerialization.shouldSerialize(value);
+    }
+
+    /**
+     * @return the property accessor
+     */
+    public PropertyAccessor<T> getPropertyAccessor() {
+        return propertyAccessor;
+    }
+
+    /**
+     * @return true or false if a discriminator should be used when serializing or null if not set
+     */
+    public Boolean useDiscriminator() {
+        return useDiscriminator;
+    }
+
+    @Override
+    public String toString() {
+        return "PropertyModel{"
+                + "propertyName='" + name + "'"
+                + ", readName='" + readName + "'"
+                + ", writeName='" + writeName + "'"
+                + ", typeData=" + typeData
+                + "}";
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PropertyModel<?> that = (PropertyModel<?>) o;
+
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
+            return false;
+        }
+        if (getReadName() != null ? !getReadName().equals(that.getReadName()) : that.getReadName() != null) {
+            return false;
+        }
+        if (getWriteName() != null ? !getWriteName().equals(that.getWriteName()) : that.getWriteName() != null) {
+            return false;
+        }
+        if (getTypeData() != null ? !getTypeData().equals(that.getTypeData()) : that.getTypeData() != null) {
+            return false;
+        }
+        if (getCodec() != null ? !getCodec().equals(that.getCodec()) : that.getCodec() != null) {
+            return false;
+        }
+        if (getPropertySerialization() != null ? !getPropertySerialization().equals(that.getPropertySerialization()) : that
+                .getPropertySerialization() != null) {
+            return false;
+        }
+        if (useDiscriminator != null ? !useDiscriminator.equals(that.useDiscriminator) : that.useDiscriminator != null) {
+            return false;
+        }
+        if (getPropertyAccessor() != null ? !getPropertyAccessor().equals(that.getPropertyAccessor())
+                : that.getPropertyAccessor() != null) {
+            return false;
+        }
+
+        if (getError() != null ? !getError().equals(that.getError()) : that.getError() != null) {
+            return false;
+        }
+
+        if (getCachedCodec() != null ? !getCachedCodec().equals(that.getCachedCodec()) : that.getCachedCodec() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getName() != null ? getName().hashCode() : 0;
+        result = 31 * result + (getReadName() != null ? getReadName().hashCode() : 0);
+        result = 31 * result + (getWriteName() != null ? getWriteName().hashCode() : 0);
+        result = 31 * result + (getTypeData() != null ? getTypeData().hashCode() : 0);
+        result = 31 * result + (getCodec() != null ? getCodec().hashCode() : 0);
+        result = 31 * result + (getPropertySerialization() != null ? getPropertySerialization().hashCode() : 0);
+        result = 31 * result + (useDiscriminator != null ? useDiscriminator.hashCode() : 0);
+        result = 31 * result + (getPropertyAccessor() != null ? getPropertyAccessor().hashCode() : 0);
+        result = 31 * result + (getError() != null ? getError().hashCode() : 0);
+        result = 31 * result + (getCachedCodec() != null ? getCachedCodec().hashCode() : 0);
+        return result;
+    }
+
+    boolean hasError() {
+        return error != null;
+    }
+
+    String getError() {
+        return error;
+    }
+
+    PropertySerialization<T> getPropertySerialization() {
+        return propertySerialization;
+    }
+
+    void cachedCodec(final Codec<T> codec) {
+        this.cachedCodec = codec;
+    }
+
+    Codec<T> getCachedCodec() {
+        return cachedCodec;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyModelBuilder.java b/bson/src/main/org/bson/codecs/pojo/PropertyModelBuilder.java
new file mode 100644
index 00000000000..9470d8a6931
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyModelBuilder.java
@@ -0,0 +1,277 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
+import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.pojo.PojoBuilderHelper.stateNotNull;
+
+/**
+ * A builder for programmatically creating {@code PropertyModels}.
+ *
+ * @param <T> the type of the property
+ * @since 3.5
+ * @see PropertyModel
+ */
+public final class PropertyModelBuilder<T> {
+    private String name;
+    private String readName;
+    private String writeName;
+    private TypeData<T> typeData;
+    private PropertySerialization<T> propertySerialization;
+    private Codec<T> codec;
+    private PropertyAccessor<T> propertyAccessor;
+    private List<Annotation> readAnnotations = emptyList();
+    private List<Annotation> writeAnnotations = emptyList();
+    private Boolean discriminatorEnabled;
+    private String error;
+
+    PropertyModelBuilder() {
+    }
+
+    /**
+     * @return the property name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the name of the property to use as the key when deserializing the data from BSON.
+     */
+    public String getReadName() {
+        return readName;
+    }
+
+    /**
+     * Sets the readName, the key for this property when deserializing the data from BSON.
+     *
+     * <p>Note: A null means this property will not used when deserializing.</p>
+     *
+     * @param readName the name of the property to use as the key when deserializing the data from BSON.
+     * @return this
+     */
+    public PropertyModelBuilder<T> readName(final String readName) {
+        this.readName = readName;
+        return this;
+    }
+
+    /**
+     * @return the name of the property to use as the key when serializing the data into BSON.
+     */
+    public String getWriteName() {
+        return writeName;
+    }
+
+    /**
+     * Sets the writeName, the key for this property when serializing the data into BSON.
+     *
+     * <p>Note: A null means this property will not be serialized.</p>
+     *
+     * @param writeName the name of the property to use as the key when serializing the data into BSON.
+     * @return this
+     */
+    public PropertyModelBuilder<T> writeName(final String writeName) {
+        this.writeName = writeName;
+        return this;
+    }
+
+    /**
+     * Sets a custom codec for the property
+     *
+     * @param codec the custom codec for the property
+     * @return this
+     */
+    public PropertyModelBuilder<T> codec(final Codec<T> codec) {
+        this.codec = codec;
+        return this;
+    }
+
+    /**
+     * @return the custom codec to use if set or null
+     */
+    Codec<T> getCodec() {
+        return codec;
+    }
+
+    /**
+     * Sets the {@link PropertySerialization} checker
+     *
+     * @param propertySerialization checks if a property should be serialized
+     * @return this
+     */
+    public PropertyModelBuilder<T> propertySerialization(final PropertySerialization<T> propertySerialization) {
+        this.propertySerialization = notNull("propertySerialization", propertySerialization);
+        return this;
+    }
+
+    /**
+     * @return the {@link PropertySerialization} checker
+     */
+    public PropertySerialization<T> getPropertySerialization() {
+        return propertySerialization;
+    }
+
+    /**
+     * Returns the read annotations,  to be applied when serializing to BSON
+     *
+     * @return the read annotations
+     */
+    public List<Annotation> getReadAnnotations() {
+        return readAnnotations;
+    }
+
+    /**
+     * Sets the read annotations, to be applied when serializing to BSON
+     *
+     * @param annotations the read annotations
+     * @return this
+     */
+    public PropertyModelBuilder<T> readAnnotations(final List<Annotation> annotations) {
+        this.readAnnotations = unmodifiableList(notNull("annotations", annotations));
+        return this;
+    }
+
+    /**
+     * Returns the write annotations, to be applied when deserializing from BSON
+     *
+     * @return the write annotations
+     */
+    public List<Annotation> getWriteAnnotations() {
+        return writeAnnotations;
+    }
+
+    /**
+     * Sets the writeAnnotations, to be applied when deserializing from BSON
+     *
+     * @param writeAnnotations the writeAnnotations
+     * @return this
+     */
+    public PropertyModelBuilder<T> writeAnnotations(final List<Annotation> writeAnnotations) {
+        this.writeAnnotations = writeAnnotations;
+        return this;
+    }
+
+    /**
+     * Property is writable.
+     *
+     * @return true if can be deserialized from BSON
+     */
+    public boolean isWritable() {
+        return writeName != null;
+    }
+
+    /**
+     * Property is readable.
+     *
+     * @return true if can be serialized to BSON
+     */
+    public boolean isReadable() {
+        return readName != null;
+    }
+
+    /**
+     * @return true or false if a discriminator should be used when serializing or null if not set
+     */
+    public Boolean isDiscriminatorEnabled() {
+        return discriminatorEnabled;
+    }
+
+    /**
+     * Enables or disables the use of a discriminator when serializing
+     *
+     * @param discriminatorEnabled the useDiscriminator value
+     * @return this
+     */
+    public PropertyModelBuilder<T> discriminatorEnabled(final boolean discriminatorEnabled) {
+        this.discriminatorEnabled = discriminatorEnabled;
+        return this;
+    }
+
+    /**
+     * Returns the {@link PropertyAccessor}
+     *
+     * @return the PropertyAccessor
+     */
+    public PropertyAccessor<T> getPropertyAccessor() {
+        return propertyAccessor;
+    }
+
+    /**
+     * Sets the {@link PropertyAccessor}
+     *
+     * @param propertyAccessor the PropertyAccessor
+     * @return this
+     */
+    public PropertyModelBuilder<T> propertyAccessor(final PropertyAccessor<T> propertyAccessor) {
+        this.propertyAccessor = propertyAccessor;
+        return this;
+    }
+
+    /**
+     * Creates the {@link PropertyModel}.
+     *
+     * @return the PropertyModel
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public PropertyModel<T> build() {
+        if (!isReadable() && !isWritable()) {
+            throw new IllegalStateException(format("Invalid PropertyModel '%s', neither readable or writable,", name));
+        }
+        return new PropertyModel(
+                stateNotNull("propertyName", name),
+                readName,
+                writeName,
+                stateNotNull("typeData", typeData),
+                codec,
+                stateNotNull("propertySerialization", propertySerialization),
+                discriminatorEnabled,
+                stateNotNull("propertyAccessor", propertyAccessor),
+                error);
+    }
+
+    @Override
+    public String toString() {
+        return format("PropertyModelBuilder{propertyName=%s, typeData=%s}", name, typeData);
+    }
+
+    PropertyModelBuilder<T> propertyName(final String propertyName) {
+        this.name = notNull("propertyName", propertyName);
+        return this;
+    }
+
+    TypeData<T> getTypeData() {
+        return typeData;
+    }
+
+    PropertyModelBuilder<T> typeData(final TypeData<T> typeData) {
+        this.typeData = notNull("typeData", typeData);
+        return this;
+    }
+
+    PropertyModelBuilder<T> setError(final String error) {
+        this.error = error;
+        return this;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyModelSerializationImpl.java b/bson/src/main/org/bson/codecs/pojo/PropertyModelSerializationImpl.java
new file mode 100644
index 00000000000..41f44b4a570
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyModelSerializationImpl.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+class PropertyModelSerializationImpl<T> implements PropertySerialization<T> {
+
+    PropertyModelSerializationImpl() {
+    }
+
+    @Override
+    public boolean shouldSerialize(final T value) {
+        return value != null;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertyReflectionUtils.java b/bson/src/main/org/bson/codecs/pojo/PropertyReflectionUtils.java
new file mode 100644
index 00000000000..7f6017a3dc9
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertyReflectionUtils.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static java.lang.reflect.Modifier.isPublic;
+
+final class PropertyReflectionUtils {
+    private PropertyReflectionUtils() {}
+
+    private static final String IS_PREFIX = "is";
+    private static final String GET_PREFIX = "get";
+    private static final String SET_PREFIX = "set";
+
+    static boolean isGetter(final Method method) {
+        if (method.getParameterTypes().length > 0) {
+            return false;
+        } else if (method.getName().startsWith(GET_PREFIX) && method.getName().length() > GET_PREFIX.length()) {
+            return Character.isUpperCase(method.getName().charAt(GET_PREFIX.length()));
+        } else if (method.getName().startsWith(IS_PREFIX) && method.getName().length() > IS_PREFIX.length()) {
+            return Character.isUpperCase(method.getName().charAt(IS_PREFIX.length()));
+        }
+        return false;
+    }
+
+    static boolean isSetter(final Method method) {
+        if (method.getName().startsWith(SET_PREFIX) && method.getName().length() > SET_PREFIX.length()
+                && method.getParameterTypes().length == 1) {
+            return Character.isUpperCase(method.getName().charAt(SET_PREFIX.length()));
+        }
+        return false;
+    }
+
+    static String toPropertyName(final Method method) {
+        String name = method.getName();
+        String propertyName = name.substring(name.startsWith(IS_PREFIX) ? 2 : 3, name.length());
+        char[] chars = propertyName.toCharArray();
+        chars[0] = Character.toLowerCase(chars[0]);
+        return new String(chars);
+    }
+
+    static PropertyMethods getPropertyMethods(final Class<?> clazz) {
+        List<Method> setters = new ArrayList<Method>();
+        List<Method> getters = new ArrayList<Method>();
+        for (Method method : clazz.getDeclaredMethods()) {
+            // Note that if you override a getter to provide a more specific return type, getting the declared methods
+            // on the subclass will return the overridden method as well as the method that was overridden from
+            // the super class. This original method is copied over into the subclass as a bridge method, so we're
+            // excluding them here to avoid multiple getters of the same property with different return types
+            if (isPublic(method.getModifiers()) && !method.isBridge()) {
+                if (isGetter(method)) {
+                    getters.add(method);
+                } else if (isSetter(method)) {
+                    // Setters are a bit more tricky - don't do anything fancy here
+                    setters.add(method);
+                }
+            }
+        }
+
+        return new PropertyMethods(getters, setters);
+    }
+
+    static class PropertyMethods {
+        private final Collection<Method> getterMethods;
+        private final Collection<Method> setterMethods;
+
+        PropertyMethods(final Collection<Method> getterMethods, final Collection<Method> setterMethods) {
+            this.getterMethods = getterMethods;
+            this.setterMethods = setterMethods;
+        }
+
+        Collection<Method> getGetterMethods() {
+            return getterMethods;
+        }
+
+        Collection<Method> getSetterMethods() {
+            return setterMethods;
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/PropertySerialization.java b/bson/src/main/org/bson/codecs/pojo/PropertySerialization.java
new file mode 100644
index 00000000000..46e6324131f
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/PropertySerialization.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+/**
+ * An interface allowing a {@link PropertyModel} to determine if a value should be serialized.
+ *
+ * @param <T> the type of the property.
+ * @since 3.5
+ */
+public interface PropertySerialization<T> {
+
+    /**
+     * Determines if a value should be serialized
+     *
+     * @param value the value to check
+     * @return true if the value should be serialized
+     */
+    boolean shouldSerialize(T value);
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/TypeData.java b/bson/src/main/org/bson/codecs/pojo/TypeData.java
new file mode 100644
index 00000000000..6934128b9b3
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/TypeData.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.lang.String.format;
+import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.pojo.PropertyReflectionUtils.isGetter;
+
+
+final class TypeData<T> implements TypeWithTypeParameters<T> {
+    private final Class<T> type;
+    private final List<TypeData<?>> typeParameters;
+
+    /**
+     * Creates a new builder for ClassTypeData
+     *
+     * @param type the class for the type
+     * @param <T> the type
+     * @return the builder
+     */
+    public static <T> Builder<T> builder(final Class<T> type) {
+        return new Builder<T>(notNull("type", type));
+    }
+
+    public static TypeData<?> newInstance(final Method method) {
+        if (isGetter(method)) {
+            return newInstance(method.getGenericReturnType(), method.getReturnType());
+        } else {
+            return newInstance(method.getGenericParameterTypes()[0], method.getParameterTypes()[0]);
+        }
+    }
+
+    public static TypeData<?> newInstance(final Field field) {
+        return newInstance(field.getGenericType(), field.getType());
+    }
+
+    public static <T> TypeData<T> newInstance(final Type genericType, final Class<T> clazz) {
+        TypeData.Builder<T> builder = TypeData.builder(clazz);
+        if (genericType instanceof ParameterizedType) {
+            ParameterizedType pType = (ParameterizedType) genericType;
+            for (Type argType : pType.getActualTypeArguments()) {
+                getNestedTypeData(builder, argType);
+            }
+        }
+        return builder.build();
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    private static <T> void getNestedTypeData(final TypeData.Builder<T> builder, final Type type) {
+        if (type instanceof ParameterizedType) {
+            ParameterizedType pType = (ParameterizedType) type;
+            TypeData.Builder paramBuilder = TypeData.builder((Class) pType.getRawType());
+            for (Type argType : pType.getActualTypeArguments()) {
+                getNestedTypeData(paramBuilder, argType);
+            }
+            builder.addTypeParameter(paramBuilder.build());
+        } else if (type instanceof WildcardType) {
+            builder.addTypeParameter(TypeData.builder((Class) ((WildcardType) type).getUpperBounds()[0]).build());
+        } else if (type instanceof TypeVariable) {
+            builder.addTypeParameter(TypeData.builder(Object.class).build());
+        } else if (type instanceof Class) {
+            builder.addTypeParameter(TypeData.builder((Class) type).build());
+        }
+    }
+
+    /**
+     * @return the class this {@code ClassTypeData} represents
+     */
+    @Override
+    public Class<T> getType() {
+        return type;
+    }
+
+    /**
+     * @return the type parameters for the class
+     */
+    @Override
+    public List<TypeData<?>> getTypeParameters() {
+        return typeParameters;
+    }
+
+    /**
+     * A builder for TypeData
+     *
+     * @param <T> the main type
+     */
+    public static final class Builder<T> {
+        private final Class<T> type;
+        private final List<TypeData<?>> typeParameters = new ArrayList<TypeData<?>>();
+
+        private Builder(final Class<T> type) {
+            this.type = type;
+        }
+
+        /**
+         * Adds a type parameter
+         *
+         * @param typeParameter the type parameter
+         * @param <S> the type of the type parameter
+         * @return this
+         */
+        public <S> Builder<T> addTypeParameter(final TypeData<S> typeParameter) {
+            typeParameters.add(notNull("typeParameter", typeParameter));
+            return this;
+        }
+
+        /**
+         * Adds multiple type parameters
+         *
+         * @param typeParameters the type parameters
+         * @return this
+         */
+        public Builder<T> addTypeParameters(final List<TypeData<?>> typeParameters) {
+            notNull("typeParameters", typeParameters);
+            for (TypeData<?> typeParameter : typeParameters) {
+                addTypeParameter(typeParameter);
+            }
+            return this;
+        }
+
+        /**
+         * @return the class type data
+         */
+        public TypeData<T> build() {
+            return new TypeData<T>(type, Collections.unmodifiableList(typeParameters));
+        }
+    }
+
+    @Override
+    public String toString() {
+        String typeParams = typeParameters.isEmpty() ? ""
+                : ", typeParameters=[" + nestedTypeParameters(typeParameters) + "]";
+        return "TypeData{"
+                + "type=" + type.getSimpleName()
+                + typeParams
+                + "}";
+    }
+
+    private static String nestedTypeParameters(final List<TypeData<?>> typeParameters) {
+        StringBuilder builder = new StringBuilder();
+        int count = 0;
+        int last = typeParameters.size();
+        for (TypeData<?> typeParameter : typeParameters) {
+            count++;
+            builder.append(typeParameter.getType().getSimpleName());
+            if (!typeParameter.getTypeParameters().isEmpty()) {
+                builder.append(format("<%s>", nestedTypeParameters(typeParameter.getTypeParameters())));
+            }
+            if (count < last) {
+                builder.append(", ");
+            }
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof TypeData)) {
+            return false;
+        }
+
+        TypeData<?> that = (TypeData<?>) o;
+
+        if (!getType().equals(that.getType())) {
+            return false;
+        }
+        if (!getTypeParameters().equals(that.getTypeParameters())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getType().hashCode();
+        result = 31 * result + getTypeParameters().hashCode();
+        return result;
+    }
+
+    private TypeData(final Class<T> type, final List<TypeData<?>> typeParameters) {
+        this.type = boxType(type);
+        this.typeParameters = typeParameters;
+    }
+
+    boolean isAssignableFrom(final Class<?> cls) {
+        return type.isAssignableFrom(boxType(cls));
+    }
+
+    @SuppressWarnings("unchecked")
+    private <S> Class<S> boxType(final Class<S> clazz) {
+        if (clazz.isPrimitive()) {
+            return (Class<S>) PRIMITIVE_CLASS_MAP.get(clazz);
+        } else {
+            return clazz;
+        }
+    }
+
+    private static final Map<Class<?>, Class<?>> PRIMITIVE_CLASS_MAP;
+    static {
+        Map<Class<?>, Class<?>> map = new HashMap<Class<?>, Class<?>>();
+        map.put(boolean.class, Boolean.class);
+        map.put(byte.class, Byte.class);
+        map.put(char.class, Character.class);
+        map.put(double.class, Double.class);
+        map.put(float.class, Float.class);
+        map.put(int.class, Integer.class);
+        map.put(long.class, Long.class);
+        map.put(short.class, Short.class);
+        PRIMITIVE_CLASS_MAP = map;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/TypeParameterMap.java b/bson/src/main/org/bson/codecs/pojo/TypeParameterMap.java
new file mode 100644
index 00000000000..60cdd8a6eec
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/TypeParameterMap.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static java.util.Collections.unmodifiableMap;
+
+
+/**
+ * Maps the index of a class's generic parameter type index to a property's.
+ */
+final class TypeParameterMap {
+    private final Map<Integer, Integer> propertyToClassParamIndexMap;
+
+    /**
+     * Creates a new builder for the TypeParameterMap
+     *
+     * @return the builder
+     */
+    static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a mapping of property type parameter index to the class type parameter index.
+     *
+     * <p>Note: A property index of -1, means the class's parameter type represents the whole property</p>
+     *
+     * @return a mapping of property type parameter index to the class type parameter index.
+     */
+    Map<Integer, Integer> getPropertyToClassParamIndexMap() {
+        return propertyToClassParamIndexMap;
+    }
+
+    boolean hasTypeParameters() {
+        return !propertyToClassParamIndexMap.isEmpty();
+    }
+
+    /**
+     * A builder for mapping field type parameter indices to the class type parameter indices
+     */
+    static final class Builder {
+        private final Map<Integer, Integer> propertyToClassParamIndexMap = new HashMap<Integer, Integer>();
+
+        private Builder() {
+        }
+
+        /**
+         * Adds the type parameter index for a class that represents the whole property
+         *
+         * @param classTypeParameterIndex the class's type parameter index that represents the whole field
+         * @return this
+         */
+        Builder addIndex(final int classTypeParameterIndex) {
+            propertyToClassParamIndexMap.put(-1, classTypeParameterIndex);
+            return this;
+        }
+
+        /**
+         * Adds a mapping that represents the property
+         *
+         * @param propertyTypeParameterIndex the property's type parameter index
+         * @param classTypeParameterIndex the class's type parameter index
+         * @return this
+         */
+        Builder addIndex(final int propertyTypeParameterIndex, final int classTypeParameterIndex) {
+            propertyToClassParamIndexMap.put(propertyTypeParameterIndex, classTypeParameterIndex);
+            return this;
+        }
+
+        /**
+         * @return the TypeParameterMap
+         */
+        TypeParameterMap build() {
+            if (propertyToClassParamIndexMap.size() > 1 && propertyToClassParamIndexMap.containsKey(-1)) {
+                throw new IllegalStateException("You cannot have a generic field that also has type parameters.");
+            }
+            return new TypeParameterMap(propertyToClassParamIndexMap);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "TypeParameterMap{"
+                + "fieldToClassParamIndexMap=" + propertyToClassParamIndexMap
+                + "}";
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TypeParameterMap that = (TypeParameterMap) o;
+
+        if (!getPropertyToClassParamIndexMap().equals(that.getPropertyToClassParamIndexMap())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getPropertyToClassParamIndexMap().hashCode();
+    }
+
+    private TypeParameterMap(final Map<Integer, Integer> propertyToClassParamIndexMap) {
+        this.propertyToClassParamIndexMap = unmodifiableMap(propertyToClassParamIndexMap);
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/TypeWithTypeParameters.java b/bson/src/main/org/bson/codecs/pojo/TypeWithTypeParameters.java
new file mode 100644
index 00000000000..4d8ae778613
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/TypeWithTypeParameters.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo;
+
+import java.util.List;
+
+/**
+ * A combination of a type and its type parameters.
+ *
+ * @param <T> the type which potentially has parameterized types
+ * @since 3.6
+ */
+public interface TypeWithTypeParameters<T> {
+    /**
+     * @return the class this {@code TypeWithTypeParameters} represents
+     */
+    Class<T> getType();
+
+    /**
+     * @return the type parameters for {@link #getType()}
+     */
+    List<? extends TypeWithTypeParameters<?>> getTypeParameters();
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/annotations/BsonCreator.java b/bson/src/main/org/bson/codecs/pojo/annotations/BsonCreator.java
new file mode 100644
index 00000000000..82441d1aeb1
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/annotations/BsonCreator.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An annotation that configures a constructor or method as the Creator for the Pojo.
+ *
+ * <p>Note: Requires the {@link org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION}</p>
+ *
+ * @since 3.5
+ * @see org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+public @interface BsonCreator {
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/annotations/BsonDiscriminator.java b/bson/src/main/org/bson/codecs/pojo/annotations/BsonDiscriminator.java
new file mode 100644
index 00000000000..85da49bf0ba
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/annotations/BsonDiscriminator.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An annotation that configures the discriminator key and value for a class.
+ *
+ * <p>Note: Requires the {@link org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION}</p>
+ *
+ * @since 3.5
+ * @see org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION
+ */
+@Inherited
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface BsonDiscriminator {
+
+    /**
+     * @return the discriminator value to use for this type.
+     */
+    String value() default "";
+
+    /**
+     * @return the discriminator key to use for this type.
+     */
+    String key() default "_t";
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/annotations/BsonId.java b/bson/src/main/org/bson/codecs/pojo/annotations/BsonId.java
new file mode 100644
index 00000000000..af6d4fb4fd9
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/annotations/BsonId.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An annotation that configures the property as the id property for a {@link  org.bson.codecs.pojo.ClassModel}.
+ *
+ * <p>Note: Requires the {@link org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION}</p>
+ *
+ * @since 3.5
+ * @see org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+public @interface BsonId {
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/annotations/BsonIgnore.java b/bson/src/main/org/bson/codecs/pojo/annotations/BsonIgnore.java
new file mode 100644
index 00000000000..019526b135e
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/annotations/BsonIgnore.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An annotation that configures a property to be ignored when reading and writing to BSON
+ *
+ * <p>Note: Requires the {@link org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION}</p>
+ *
+ * @since 3.5
+ * @see org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION
+ */
+@Documented
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BsonIgnore {
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/annotations/BsonProperty.java b/bson/src/main/org/bson/codecs/pojo/annotations/BsonProperty.java
new file mode 100644
index 00000000000..8ce352a16ff
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/annotations/BsonProperty.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.annotations;
+
+import org.bson.codecs.pojo.PropertyModel;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An annotation that configures a property.
+ *
+ * <p>Note: Requires the {@link org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION}</p>
+ *
+ * @since 3.5
+ * @see org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION
+ */
+@Documented
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BsonProperty {
+    /**
+     * The name of the property.
+     *
+     * <p>
+     *     For asymmetrical property names, the context of the {@code BsonProperty} can be important.
+     *     For example, when used with {@code @BsonCreator} the value will relate to the read name.
+     *     When used directly on a field it will set both the read name if unset and the write name if unset.
+     * </p>
+     *
+     * @return the name to use for the property
+     * @see PropertyModel#getWriteName()
+     * @see PropertyModel#getReadName()
+     */
+    String value() default "";
+
+    /**
+     * @return whether to include a discriminator when serializing nested Pojos.
+     */
+    boolean useDiscriminator() default false;
+}
diff --git a/bson/src/main/org/bson/codecs/pojo/annotations/package-info.java b/bson/src/main/org/bson/codecs/pojo/annotations/package-info.java
new file mode 100644
index 00000000000..0a5f54f8046
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/annotations/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package defines various annotations used by the driver provided when used in conjunction with the
+ * {@link org.bson.codecs.pojo.Conventions#ANNOTATION_CONVENTION}.
+ */
+package org.bson.codecs.pojo.annotations;
diff --git a/bson/src/main/org/bson/codecs/pojo/package-info.java b/bson/src/main/org/bson/codecs/pojo/package-info.java
new file mode 100644
index 00000000000..a4a0f6d54ec
--- /dev/null
+++ b/bson/src/main/org/bson/codecs/pojo/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains classes specific to mapping user POJOs.
+ */
+package org.bson.codecs.pojo;
diff --git a/bson/src/main/org/bson/conversions/Bson.java b/bson/src/main/org/bson/conversions/Bson.java
index 21e338b4a71..4b5c22a691a 100644
--- a/bson/src/main/org/bson/conversions/Bson.java
+++ b/bson/src/main/org/bson/conversions/Bson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,5 +35,5 @@ public interface Bson {
      * @param <TDocument> the type of the document class
      * @return the BsonDocument
      */
-    <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry);
+    <TDocument> BsonDocument toBsonDocument(Class<TDocument> documentClass, CodecRegistry codecRegistry);
 }
diff --git a/bson/src/main/org/bson/conversions/package-info.java b/bson/src/main/org/bson/conversions/package-info.java
index 917e7e4d3ef..dc8e5866fcd 100644
--- a/bson/src/main/org/bson/conversions/package-info.java
+++ b/bson/src/main/org/bson/conversions/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/bson/src/main/org/bson/diagnostics/JULLogger.java b/bson/src/main/org/bson/diagnostics/JULLogger.java
new file mode 100644
index 00000000000..65595112140
--- /dev/null
+++ b/bson/src/main/org/bson/diagnostics/JULLogger.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.diagnostics;
+
+import java.util.logging.Level;
+
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.FINER;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
+
+class JULLogger implements Logger {
+
+    private final java.util.logging.Logger delegate;
+
+    JULLogger(final String name) {
+        this.delegate = java.util.logging.Logger.getLogger(name);
+    }
+
+    @Override
+    public String getName() {
+        return delegate.getName();
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return isEnabled(FINER);
+    }
+
+    @Override
+    public void trace(final String msg) {
+        log(FINER, msg);
+    }
+
+    @Override
+    public void trace(final String msg, final Throwable t) {
+        log(FINER, msg, t);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return isEnabled(FINE);
+    }
+
+    @Override
+    public void debug(final String msg) {
+        log(FINE, msg);
+    }
+
+    @Override
+    public void debug(final String msg, final Throwable t) {
+        log(FINE, msg, t);
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return delegate.isLoggable(INFO);
+    }
+
+    @Override
+    public void info(final String msg) {
+        log(INFO, msg);
+    }
+
+    @Override
+    public void info(final String msg, final Throwable t) {
+        log(INFO, msg, t);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return delegate.isLoggable(WARNING);
+    }
+
+    @Override
+    public void warn(final String msg) {
+        log(WARNING, msg);
+    }
+
+    @Override
+    public void warn(final String msg, final Throwable t) {
+        log(WARNING, msg, t);
+    }
+
+
+    @Override
+    public boolean isErrorEnabled() {
+        return delegate.isLoggable(SEVERE);
+    }
+
+    @Override
+    public void error(final String msg) {
+        log(SEVERE, msg);
+    }
+
+    @Override
+    public void error(final String msg, final Throwable t) {
+        log(SEVERE, msg, t);
+    }
+
+
+    private boolean isEnabled(final Level level) {
+        return delegate.isLoggable(level);
+    }
+
+    private void log(final Level level, final String msg) {
+        delegate.log(level, msg);
+    }
+
+    public void log(final Level level, final String msg, final Throwable t) {
+        delegate.log(level, msg, t);
+    }
+}
diff --git a/bson/src/main/org/bson/diagnostics/Logger.java b/bson/src/main/org/bson/diagnostics/Logger.java
new file mode 100644
index 00000000000..2ff055ddb4e
--- /dev/null
+++ b/bson/src/main/org/bson/diagnostics/Logger.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.diagnostics;
+
+/**
+ * This class is not part of the public API.  It may be removed or changed at any time.
+ *
+ */
+public interface Logger {
+    /**
+     * Return the name of this <code>Logger</code> instance.
+     *
+     * @return name of this logger instance
+     */
+    String getName();
+
+    /**
+     * Is the logger instance enabled for the TRACE level?
+     *
+     * @return True if this Logger is enabled for the TRACE level, false otherwise.
+     * @since 1.4
+     */
+    boolean isTraceEnabled();
+
+    /**
+     * Log a message at the TRACE level.
+     *
+     * @param msg the message string to be logged
+     * @since 1.4
+     */
+    void trace(String msg);
+
+    /**
+     * Log an exception (throwable) at the TRACE level with an accompanying message.
+     *
+     * @param msg the message accompanying the exception
+     * @param t   the exception (throwable) to log
+     * @since 1.4
+     */
+    void trace(String msg, Throwable t);
+
+    /**
+     * Is the logger instance enabled for the DEBUG level?
+     *
+     * @return True if this Logger is enabled for the DEBUG level, false otherwise.
+     */
+    boolean isDebugEnabled();
+
+
+    /**
+     * Log a message at the DEBUG level.
+     *
+     * @param msg the message string to be logged
+     */
+    void debug(String msg);
+
+
+    /**
+     * Log an exception (throwable) at the DEBUG level with an accompanying message.
+     *
+     * @param msg the message accompanying the exception
+     * @param t   the exception (throwable) to log
+     */
+    void debug(String msg, Throwable t);
+
+    /**
+     * Is the logger instance enabled for the INFO level?
+     *
+     * @return True if this Logger is enabled for the INFO level, false otherwise.
+     */
+    boolean isInfoEnabled();
+
+
+    /**
+     * Log a message at the INFO level.
+     *
+     * @param msg the message string to be logged
+     */
+    void info(String msg);
+
+    /**
+     * Log an exception (throwable) at the INFO level with an accompanying message.
+     *
+     * @param msg the message accompanying the exception
+     * @param t   the exception (throwable) to log
+     */
+    void info(String msg, Throwable t);
+
+    /**
+     * Is the logger instance enabled for the WARN level?
+     *
+     * @return True if this Logger is enabled for the WARN level, false otherwise.
+     */
+    boolean isWarnEnabled();
+
+    /**
+     * Log a message at the WARN level.
+     *
+     * @param msg the message string to be logged
+     */
+    void warn(String msg);
+
+    /**
+     * Log an exception (throwable) at the WARN level with an accompanying message.
+     *
+     * @param msg the message accompanying the exception
+     * @param t   the exception (throwable) to log
+     */
+    void warn(String msg, Throwable t);
+
+    /**
+     * Is the logger instance enabled for the ERROR level?
+     *
+     * @return True if this Logger is enabled for the ERROR level, false otherwise.
+     */
+    boolean isErrorEnabled();
+
+    /**
+     * Log a message at the ERROR level.
+     *
+     * @param msg the message string to be logged
+     */
+    void error(String msg);
+
+    /**
+     * Log an exception (throwable) at the ERROR level with an accompanying message.
+     *
+     * @param msg the message accompanying the exception
+     * @param t   the exception (throwable) to log
+     */
+    void error(String msg, Throwable t);
+}
diff --git a/bson/src/main/org/bson/diagnostics/Loggers.java b/bson/src/main/org/bson/diagnostics/Loggers.java
index 771318c0e15..ad3bec649ed 100644
--- a/bson/src/main/org/bson/diagnostics/Loggers.java
+++ b/bson/src/main/org/bson/diagnostics/Loggers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.bson.diagnostics;
 
-import java.util.logging.Logger;
+import static org.bson.assertions.Assertions.notNull;
 
 /**
  * This class is not part of the public API.
@@ -29,23 +29,38 @@ public final class Loggers {
      */
     public static final String PREFIX = "org.bson";
 
+    private static final boolean USE_SLF4J = shouldUseSLF4J();
+
     /**
      * Gets a logger with the given suffix appended on to {@code PREFIX}, separated by a '.'.
      *
-     * @param suffix the suffix for the logger.
+     * @param suffix the suffix for the logger
      * @return the logger
      * @see Loggers#PREFIX
      */
     public static Logger getLogger(final String suffix) {
-        if (suffix == null) {
-            throw new IllegalArgumentException("suffix can not be null");
-        }
+        notNull("suffix", suffix);
         if (suffix.startsWith(".") || suffix.endsWith(".")) {
             throw new IllegalArgumentException("The suffix can not start or end with a '.'");
         }
-        return Logger.getLogger(PREFIX + "." + suffix);
+
+        String name = PREFIX + "." + suffix;
+
+        if (USE_SLF4J) {
+            return new SLF4JLogger(name);
+        } else {
+            return new JULLogger(name);
+        }
     }
 
+    private static boolean shouldUseSLF4J() {
+        try {
+            Class.forName("org.slf4j.Logger");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
     private Loggers() {
     }
 }
diff --git a/bson/src/main/org/bson/diagnostics/SLF4JLogger.java b/bson/src/main/org/bson/diagnostics/SLF4JLogger.java
new file mode 100644
index 00000000000..8a63aa43373
--- /dev/null
+++ b/bson/src/main/org/bson/diagnostics/SLF4JLogger.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.diagnostics;
+
+import org.slf4j.LoggerFactory;
+
+class SLF4JLogger implements Logger {
+
+    private final org.slf4j.Logger delegate;
+
+    SLF4JLogger(final String name) {
+        this.delegate = LoggerFactory.getLogger(name);
+    }
+
+    @Override
+    public String getName() {
+        return delegate.getName();
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return delegate.isTraceEnabled();
+    }
+
+    @Override
+    public void trace(final String msg) {
+        delegate.trace(msg);
+    }
+
+    @Override
+    public void trace(final String msg, final Throwable t) {
+        delegate.trace(msg, t);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return delegate.isDebugEnabled();
+    }
+
+    @Override
+    public void debug(final String msg) {
+        delegate.debug(msg);
+    }
+
+    @Override
+    public void debug(final String msg, final Throwable t) {
+        delegate.debug(msg, t);
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return delegate.isInfoEnabled();
+    }
+
+    @Override
+    public void info(final String msg) {
+        delegate.info(msg);
+    }
+
+    @Override
+    public void info(final String msg, final Throwable t) {
+        delegate.info(msg, t);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return delegate.isWarnEnabled();
+    }
+
+    @Override
+    public void warn(final String msg) {
+        delegate.warn(msg);
+    }
+
+    @Override
+    public void warn(final String msg, final Throwable t) {
+        delegate.warn(msg, t);
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return delegate.isErrorEnabled();
+    }
+
+    @Override
+    public void error(final String msg) {
+        delegate.error(msg);
+    }
+
+    @Override
+    public void error(final String msg, final Throwable t) {
+        delegate.error(msg, t);
+    }
+}
diff --git a/bson/src/main/org/bson/diagnostics/package-info.java b/bson/src/main/org/bson/diagnostics/package-info.java
index d59a737dbe0..746722d277c 100644
--- a/bson/src/main/org/bson/diagnostics/package-info.java
+++ b/bson/src/main/org/bson/diagnostics/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/internal/Base64.java b/bson/src/main/org/bson/internal/Base64.java
new file mode 100644
index 00000000000..d6371f73f44
--- /dev/null
+++ b/bson/src/main/org/bson/internal/Base64.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+/**
+ * <p>Provides Base64 encoding and decoding.</p>
+ * <p>This class implements Base64 encoding</p>
+ * <p>Thanks to Apache Commons project. This class refactored from org.apache.commons.codec.binary</p>
+ * <p>Original Thanks to <a href="http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/">commons</a> project in
+ * ws.apache.org for this code. </p>
+ *
+ * @since 3.5
+ */
+public final class Base64 {
+    private static final int BYTES_PER_UNENCODED_BLOCK = 3;
+    private static final int BYTES_PER_ENCODED_BLOCK = 4;
+
+    /**
+     * Mask used to extract 6 bits, used when encoding
+     */
+    private static final int SIX_BIT_MASK = 0x3f;
+
+    /**
+     * padding char
+     */
+    private static final byte PAD = '=';
+
+    /**
+     * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet"
+     * equivalents as specified in Table 1 of RFC 2045.
+     */
+    private static final byte[] ENCODE_TABLE = {'A', 'B', 'C', 'D', 'E', 'F',
+            'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+            'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+            't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
+            '6', '7', '8', '9', '+', '/'};
+
+    private static final int[] DECODE_TABLE = new int[128];
+
+    static {
+        for (int i = 0; i < ENCODE_TABLE.length; i++) {
+            DECODE_TABLE[ENCODE_TABLE[i]] = i;
+        }
+    }
+
+    /**
+     * Decodes the given Base64-encoded string.
+     *
+     * @param s the Base64-encoded string
+     * @return the decoded byte array
+     */
+    public static byte[] decode(final String s) {
+        int delta = s.endsWith("==") ? 2 : s.endsWith("=") ? 1 : 0;
+        byte[] buffer = new byte[s.length() * BYTES_PER_UNENCODED_BLOCK / BYTES_PER_ENCODED_BLOCK - delta];
+        int mask = 0xFF;
+        int pos = 0;
+        for (int i = 0; i < s.length(); i += BYTES_PER_ENCODED_BLOCK) {
+            int c0 = DECODE_TABLE[s.charAt(i)];
+            int c1 = DECODE_TABLE[s.charAt(i + 1)];
+            buffer[pos++] = (byte) (((c0 << 2) | (c1 >> 4)) & mask);
+            if (pos >= buffer.length) {
+                return buffer;
+            }
+            int c2 = DECODE_TABLE[s.charAt(i + 2)];
+            buffer[pos++] = (byte) (((c1 << 4) | (c2 >> 2)) & mask);
+            if (pos >= buffer.length) {
+                return buffer;
+            }
+            int c3 = DECODE_TABLE[s.charAt(i + 3)];
+            buffer[pos++] = (byte) (((c2 << 6) | c3) & mask);
+        }
+        return buffer;
+    }
+
+    /**
+     * Encodes the given byte array into a Base64-encoded string.
+     *
+     *
+     * @param in the byte array
+     * @return the Base64-encoded string
+     */
+    public static String encode(final byte[] in) {
+
+        int modulus = 0;
+        int bitWorkArea = 0;
+        int numEncodedBytes = (in.length / BYTES_PER_UNENCODED_BLOCK) * BYTES_PER_ENCODED_BLOCK
+                + ((in.length % BYTES_PER_UNENCODED_BLOCK == 0) ? 0 : 4);
+
+        byte[] buffer = new byte[numEncodedBytes];
+        int pos = 0;
+
+        for (int b : in) {
+            modulus = (modulus + 1) % BYTES_PER_UNENCODED_BLOCK;
+
+            if (b < 0) {
+                b += 256;
+            }
+
+            bitWorkArea = (bitWorkArea << 8) + b; //  BITS_PER_BYTE
+            if (0 == modulus) { // 3 bytes = 24 bits = 4 * 6 bits to extract
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 18) & SIX_BIT_MASK];
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 12) & SIX_BIT_MASK];
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 6) & SIX_BIT_MASK];
+                buffer[pos++] = ENCODE_TABLE[bitWorkArea & SIX_BIT_MASK];
+            }
+        }
+
+        switch (modulus) { // 0-2
+            case 1: // 8 bits = 6 + 2
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 2) & SIX_BIT_MASK]; // top 6 bits
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea << 4) & SIX_BIT_MASK]; // remaining 2
+                buffer[pos++] = PAD;
+                buffer[pos] = PAD; // Last entry no need to ++
+                break;
+
+            case 2: // 16 bits = 6 + 6 + 4
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 10) & SIX_BIT_MASK];
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 4) & SIX_BIT_MASK];
+                buffer[pos++] = ENCODE_TABLE[(bitWorkArea << 2) & SIX_BIT_MASK];
+                buffer[pos] = PAD; // Last entry no need to ++
+                break;
+            default:
+                break;
+        }
+
+        return byteArrayToString(buffer);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static String byteArrayToString(final byte[] buffer) {
+        return new String(buffer, 0, 0, buffer.length);
+    }
+
+    private Base64() {
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/configuration/ChildCodecRegistry.java b/bson/src/main/org/bson/internal/ChildCodecRegistry.java
similarity index 91%
rename from bson/src/main/org/bson/codecs/configuration/ChildCodecRegistry.java
rename to bson/src/main/org/bson/internal/ChildCodecRegistry.java
index 8a86fcacb3b..393eb9c6dbc 100644
--- a/bson/src/main/org/bson/codecs/configuration/ChildCodecRegistry.java
+++ b/bson/src/main/org/bson/internal/ChildCodecRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package org.bson.codecs.configuration;
+package org.bson.internal;
 
 
 import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecRegistry;
 
 // An implementation of CodecRegistry that is used to detect cyclic dependencies between Codecs
 class ChildCodecRegistry<T> implements CodecRegistry {
 
     private final ChildCodecRegistry<?> parent;
-    private final ProvidersCodecRegistry registry;
+    private final CycleDetectingCodecRegistry registry;
     private final Class<T> codecClass;
 
-    ChildCodecRegistry(final ProvidersCodecRegistry registry, final Class<T> codecClass) {
+    ChildCodecRegistry(final CycleDetectingCodecRegistry registry, final Class<T> codecClass) {
         this.codecClass = codecClass;
         this.parent = null;
         this.registry = registry;
diff --git a/bson/src/main/org/bson/codecs/configuration/CodecCache.java b/bson/src/main/org/bson/internal/CodecCache.java
similarity index 89%
rename from bson/src/main/org/bson/codecs/configuration/CodecCache.java
rename to bson/src/main/org/bson/internal/CodecCache.java
index 11e52a00051..004a8f13c1b 100644
--- a/bson/src/main/org/bson/codecs/configuration/CodecCache.java
+++ b/bson/src/main/org/bson/internal/CodecCache.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.bson.codecs.configuration;
+package org.bson.internal;
 
 import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecConfigurationException;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/bson/src/main/org/bson/internal/CodecRegistryHelper.java b/bson/src/main/org/bson/internal/CodecRegistryHelper.java
new file mode 100644
index 00000000000..ef8104fcfca
--- /dev/null
+++ b/bson/src/main/org/bson/internal/CodecRegistryHelper.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+
+public final class CodecRegistryHelper {
+
+    public static CodecRegistry createRegistry(final CodecRegistry codecRegistry, final UuidRepresentation uuidRepresentation) {
+        CodecRegistry retVal = codecRegistry;
+        if (uuidRepresentation != UuidRepresentation.JAVA_LEGACY) {
+            if (codecRegistry instanceof CodecProvider) {
+                retVal = new OverridableUuidRepresentationCodecRegistry((CodecProvider) codecRegistry, uuidRepresentation);
+            } else {
+                throw new CodecConfigurationException("Changing the default UuidRepresentation requires a CodecRegistry that also "
+                        +    "implements the CodecProvider interface");
+            }
+        }
+        return retVal;
+    }
+
+    private CodecRegistryHelper() {
+    }
+}
diff --git a/bson/src/main/org/bson/internal/CycleDetectingCodecRegistry.java b/bson/src/main/org/bson/internal/CycleDetectingCodecRegistry.java
new file mode 100644
index 00000000000..2aecba9f188
--- /dev/null
+++ b/bson/src/main/org/bson/internal/CycleDetectingCodecRegistry.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecRegistry;
+
+/**
+ * A marker interface for {@code CodecRegistry} implementations that are able to detect cycles.
+ *
+ * @since 3.12
+ */
+interface CycleDetectingCodecRegistry extends CodecRegistry {
+    /**
+     * Get the Codec using the given context.
+     *
+     * @param context the child context
+     * @param <T> the value type
+     * @return the Codec
+     */
+    <T> Codec<T> get(ChildCodecRegistry<T> context);
+}
diff --git a/bson/src/main/org/bson/codecs/configuration/LazyCodec.java b/bson/src/main/org/bson/internal/LazyCodec.java
similarity index 89%
rename from bson/src/main/org/bson/codecs/configuration/LazyCodec.java
rename to bson/src/main/org/bson/internal/LazyCodec.java
index 9206f2ba92c..e8c7b67adf9 100644
--- a/bson/src/main/org/bson/codecs/configuration/LazyCodec.java
+++ b/bson/src/main/org/bson/internal/LazyCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-package org.bson.codecs.configuration;
+package org.bson.internal;
 
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 import org.bson.codecs.Codec;
 import org.bson.codecs.DecoderContext;
 import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
 
 class LazyCodec<T> implements Codec<T> {
     private final CodecRegistry registry;
     private final Class<T> clazz;
     private volatile Codec<T> wrapped;
 
-    public LazyCodec(final CodecRegistry registry, final Class<T> clazz) {
+    LazyCodec(final CodecRegistry registry, final Class<T> clazz) {
         this.registry = registry;
         this.clazz = clazz;
     }
diff --git a/bson/src/main/org/bson/internal/Optional.java b/bson/src/main/org/bson/internal/Optional.java
new file mode 100644
index 00000000000..1e8528e3397
--- /dev/null
+++ b/bson/src/main/org/bson/internal/Optional.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+import java.util.NoSuchElementException;
+
+
+abstract class Optional<T> {
+
+    private static final Optional<Object> NONE = new Optional<Object>() {
+        @Override
+        public Object get() {
+            throw new NoSuchElementException(".get call on None!");
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return true;
+        }
+    };
+
+    @SuppressWarnings("unchecked")
+    public static <T> Optional<T> empty() {
+        return (Optional<T>) NONE;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Optional<T> of(final T it) {
+        if (it == null) {
+            return (Optional<T>) Optional.NONE;
+        } else {
+            return new Some<T>(it);
+        }
+    }
+
+    public abstract T get();
+
+    public abstract boolean isEmpty();
+
+    @Override
+    public String toString() {
+        return "None";
+    }
+
+    public boolean isDefined() {
+        return !isEmpty();
+    }
+
+    public static class Some<T> extends Optional<T> {
+        private final T value;
+
+        Some(final T value) {
+            this.value = value;
+        }
+
+        @Override
+        public T get() {
+            return value;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("Some(%s)", value);
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/internal/OverridableUuidRepresentationCodecRegistry.java b/bson/src/main/org/bson/internal/OverridableUuidRepresentationCodecRegistry.java
new file mode 100644
index 00000000000..3ce1b2da528
--- /dev/null
+++ b/bson/src/main/org/bson/internal/OverridableUuidRepresentationCodecRegistry.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+import org.bson.UuidRepresentation;
+import org.bson.codecs.Codec;
+import org.bson.codecs.OverridableUuidRepresentationCodec;
+import org.bson.codecs.configuration.CodecProvider;
+
+import static org.bson.assertions.Assertions.notNull;
+
+public class OverridableUuidRepresentationCodecRegistry implements CycleDetectingCodecRegistry {
+
+    private final CodecProvider wrapped;
+    private final CodecCache codecCache = new CodecCache();
+    private final UuidRepresentation uuidRepresentation;
+
+    OverridableUuidRepresentationCodecRegistry(final CodecProvider wrapped, final UuidRepresentation uuidRepresentation) {
+        this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
+        this.wrapped = notNull("wrapped", wrapped);
+    }
+
+    public UuidRepresentation getUuidRepresentation() {
+        return uuidRepresentation;
+    }
+
+    public CodecProvider getWrapped() {
+        return wrapped;
+    }
+
+    @Override
+    public <T> Codec<T> get(final Class<T> clazz) {
+        return get(new ChildCodecRegistry<T>(this, clazz));
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public <T> Codec<T> get(final ChildCodecRegistry<T> context) {
+        if (!codecCache.containsKey(context.getCodecClass())) {
+            Codec<T> codec = wrapped.get(context.getCodecClass(), context);
+            if (codec instanceof OverridableUuidRepresentationCodec) {
+                codec = ((OverridableUuidRepresentationCodec<T>) codec).withUuidRepresentation(uuidRepresentation);
+            }
+            codecCache.put(context.getCodecClass(), codec);
+        }
+        return codecCache.getOrThrow(context.getCodecClass());
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        OverridableUuidRepresentationCodecRegistry that = (OverridableUuidRepresentationCodecRegistry) o;
+
+        if (!wrapped.equals(that.wrapped)) {
+            return false;
+        }
+        return uuidRepresentation == that.uuidRepresentation;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = wrapped.hashCode();
+        result = 31 * result + uuidRepresentation.hashCode();
+        return result;
+    }
+}
diff --git a/bson/src/main/org/bson/codecs/configuration/ProvidersCodecRegistry.java b/bson/src/main/org/bson/internal/ProvidersCodecRegistry.java
similarity index 85%
rename from bson/src/main/org/bson/codecs/configuration/ProvidersCodecRegistry.java
rename to bson/src/main/org/bson/internal/ProvidersCodecRegistry.java
index 7c090fb3368..5bb7a6062a3 100644
--- a/bson/src/main/org/bson/codecs/configuration/ProvidersCodecRegistry.java
+++ b/bson/src/main/org/bson/internal/ProvidersCodecRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,22 @@
  * limitations under the License.
  */
 
-package org.bson.codecs.configuration;
+package org.bson.internal;
 
 import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.bson.assertions.Assertions.isTrueArgument;
 
-final class ProvidersCodecRegistry implements CodecRegistry, CodecProvider {
+public final class ProvidersCodecRegistry implements CodecRegistry, CodecProvider, CycleDetectingCodecRegistry {
     private final List<CodecProvider> codecProviders;
     private final CodecCache codecCache = new CodecCache();
 
-    ProvidersCodecRegistry(final List<? extends CodecProvider> codecProviders) {
+    public ProvidersCodecRegistry(final List<? extends CodecProvider> codecProviders) {
         isTrueArgument("codecProviders must not be null or empty", codecProviders != null && codecProviders.size() > 0);
         this.codecProviders = new ArrayList<CodecProvider>(codecProviders);
     }
@@ -37,7 +39,7 @@ public <T> Codec<T> get(final Class<T> clazz) {
         return get(new ChildCodecRegistry<T>(this, clazz));
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("rawtypes")
     public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
         for (CodecProvider provider : codecProviders) {
             Codec<T> codec = provider.get(clazz, registry);
@@ -49,7 +51,7 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    <T> Codec<T> get(final ChildCodecRegistry context) {
+    public <T> Codec<T> get(final ChildCodecRegistry<T> context) {
         if (!codecCache.containsKey(context.getCodecClass())) {
             for (CodecProvider provider : codecProviders) {
                 Codec<T> codec = provider.get(context.getCodecClass(), context);
diff --git a/bson/src/main/org/bson/internal/UnsignedLongs.java b/bson/src/main/org/bson/internal/UnsignedLongs.java
new file mode 100644
index 00000000000..3980df5b80a
--- /dev/null
+++ b/bson/src/main/org/bson/internal/UnsignedLongs.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2010 The Guava Authors
+ * Copyright 2011 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+import java.math.BigInteger;
+
+/**
+ * Utilities for treating long values as unsigned.
+ *
+ * <p>
+ * Similar methods are now available in Java 8, but are required here for Java 6/7 compatibility.
+ * </p>
+ * <p>
+ * This class is not part of the public API and may be removed or changed at any time.
+ * </p>
+ */
+public final class UnsignedLongs {
+    /**
+     * Equivalent of Long.compareUnsigned in Java 8.
+     *
+     * @param first  the first value
+     * @param second the second value
+     * @return 0 if the values are equal, a value greater than zero if first is greater than second,
+     * a value less than zero if first is less than second
+     */
+    public static int compare(final long first, final long second) {
+        return compareLongs(first + Long.MIN_VALUE, second + Long.MIN_VALUE);
+    }
+
+    /**
+     * Equivalent to Long.toUnsignedString in Java 8.
+     *
+     * @param value the long value to treat as unsigned
+     * @return the string representation of unsignedLong treated as an unsigned value
+     */
+    public static String toString(final long value) {
+        if (value >= 0) {
+            return Long.toString(value);
+        } else {
+            // emulate unsigned division and then append the remainder
+            long quotient = (value >>> 1) / 5;   // Unsigned divide by 10 and floor
+            long remainder = value - quotient * 10;
+            return Long.toString(quotient) + remainder;
+        }
+    }
+
+    //
+
+    /**
+     * Equivalent to Long.parseUnsignedLong in Java 8.
+     *
+     * @param string the string representation of an unsigned long
+     * @return the unsigned long
+     */
+    public static long parse(final String string) {
+        if (string.length() == 0) {
+            throw new NumberFormatException("empty string");
+        }
+        int radix = 10;
+        int maxSafePos = MAX_SAFE_DIGITS[radix] - 1;
+        long value = 0;
+        for (int pos = 0; pos < string.length(); pos++) {
+            int digit = Character.digit(string.charAt(pos), radix);
+            if (digit == -1) {
+                throw new NumberFormatException(string);
+            }
+            if (pos > maxSafePos && overflowInParse(value, digit, radix)) {
+                throw new NumberFormatException("Too large for unsigned long: " + string);
+            }
+            value = (value * radix) + digit;
+        }
+
+        return value;
+    }
+
+    // Returns true if (current * radix) + digit is a number too large to be represented by an
+    // unsigned long. This is useful for detecting overflow while parsing a string representation of a
+    // number.
+    private static boolean overflowInParse(final long current, final int digit, final int radix) {
+        if (current >= 0) {
+            if (current < MAX_VALUE_DIVS[radix]) {
+                return false;
+            }
+            if (current > MAX_VALUE_DIVS[radix]) {
+                return true;
+            }
+            // current == maxValueDivs[radix]
+            return (digit > MAX_VALUE_MODS[radix]);
+        }
+
+        // current < 0: high bit is set
+        return true;
+    }
+
+    // this is the equivalent of Long.compare in Java 7
+    private static int compareLongs(final long x, final long y) {
+        return (x < y) ? -1 : ((x == y) ? 0 : 1);
+    }
+
+    // Returns dividend / divisor, where the dividend and divisor are treated as unsigned 64-bit quantities.
+    private static long divide(final long dividend, final long divisor) {
+        if (divisor < 0) { // i.e., divisor >= 2^63:
+            if (compare(dividend, divisor) < 0) {
+                return 0; // dividend < divisor
+            } else {
+                return 1; // dividend >= divisor
+            }
+        }
+
+        // Optimization - use signed division if dividend < 2^63
+        if (dividend >= 0) {
+            return dividend / divisor;
+        }
+
+
+        // Otherwise, approximate the quotient, check, and correct if necessary. Our approximation is
+        // guaranteed to be either exact or one less than the correct value. This follows from fact that
+        // floor(floor(x)/i) == floor(x/i) for any real x and integer i != 0. The proof is not quite
+        // trivial.
+        long quotient = ((dividend >>> 1) / divisor) << 1;
+        long rem = dividend - quotient * divisor;
+        return quotient + (compare(rem, divisor) >= 0 ? 1 : 0);
+    }
+
+    // Returns dividend % divisor, where the dividend and divisor are treated as unsigned 64-bit* quantities.
+    private static long remainder(final long dividend, final long divisor) {
+        if (divisor < 0) { // i.e., divisor >= 2^63:
+            if (compare(dividend, divisor) < 0) {
+                return dividend; // dividend < divisor
+            } else {
+                return dividend - divisor; // dividend >= divisor
+            }
+        }
+
+        // Optimization - use signed modulus if dividend < 2^63
+        if (dividend >= 0) {
+            return dividend % divisor;
+        }
+
+
+        // Otherwise, approximate the quotient, check, and correct if necessary. Our approximation is
+        // guaranteed to be either exact or one less than the correct value. This follows from the fact
+        // that floor(floor(x)/i) == floor(x/i) for any real x and integer i != 0. The proof is not
+        // quite trivial.
+        long quotient = ((dividend >>> 1) / divisor) << 1;
+        long rem = dividend - quotient * divisor;
+        return rem - (compare(rem, divisor) >= 0 ? divisor : 0);
+    }
+
+    private static final long MAX_VALUE = -1L; // Equivalent to 2^64 - 1
+    private static final long[] MAX_VALUE_DIVS = new long[Character.MAX_RADIX + 1];
+    private static final int[] MAX_VALUE_MODS = new int[Character.MAX_RADIX + 1];
+    private static final int[] MAX_SAFE_DIGITS = new int[Character.MAX_RADIX + 1];
+
+    static {
+        BigInteger overflow = new BigInteger("10000000000000000", 16);
+        for (int i = Character.MIN_RADIX; i <= Character.MAX_RADIX; i++) {
+            MAX_VALUE_DIVS[i] = divide(MAX_VALUE, i);
+            MAX_VALUE_MODS[i] = (int) remainder(MAX_VALUE, i);
+            MAX_SAFE_DIGITS[i] = overflow.toString(i).length() - 1;
+        }
+    }
+
+    private UnsignedLongs() {
+    }
+
+}
diff --git a/bson/src/main/org/bson/internal/UuidHelper.java b/bson/src/main/org/bson/internal/UuidHelper.java
new file mode 100644
index 00000000000..427837420ab
--- /dev/null
+++ b/bson/src/main/org/bson/internal/UuidHelper.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+import org.bson.BSONException;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonSerializationException;
+import org.bson.UuidRepresentation;
+
+import java.util.UUID;
+
+/**
+ * Utilities for encoding and decoding UUID into binary.
+ */
+public final class UuidHelper {
+    private static void writeLongToArrayBigEndian(final byte[] bytes, final int offset, final long x) {
+        bytes[offset + 7] = (byte) (0xFFL & (x));
+        bytes[offset + 6] = (byte) (0xFFL & (x >> 8));
+        bytes[offset + 5] = (byte) (0xFFL & (x >> 16));
+        bytes[offset + 4] = (byte) (0xFFL & (x >> 24));
+        bytes[offset + 3] = (byte) (0xFFL & (x >> 32));
+        bytes[offset + 2] = (byte) (0xFFL & (x >> 40));
+        bytes[offset + 1] = (byte) (0xFFL & (x >> 48));
+        bytes[offset] = (byte) (0xFFL & (x >> 56));
+    }
+
+    private static long readLongFromArrayBigEndian(final byte[] bytes, final int offset) {
+        long x = 0;
+        x |= (0xFFL & bytes[offset + 7]);
+        x |= (0xFFL & bytes[offset + 6]) << 8;
+        x |= (0xFFL & bytes[offset + 5]) << 16;
+        x |= (0xFFL & bytes[offset + 4]) << 24;
+        x |= (0xFFL & bytes[offset + 3]) << 32;
+        x |= (0xFFL & bytes[offset + 2]) << 40;
+        x |= (0xFFL & bytes[offset + 1]) << 48;
+        x |= (0xFFL & bytes[offset]) << 56;
+        return x;
+    }
+
+    // reverse elements in the subarray data[start:start+length]
+    private static void reverseByteArray(final byte[] data, final int start, final int length) {
+        for (int left = start, right = start + length - 1; left < right; left++, right--) {
+            // swap the values at the left and right indices
+            byte temp = data[left];
+            data[left]  = data[right];
+            data[right] = temp;
+        }
+    }
+
+    public static byte[] encodeUuidToBinary(final UUID uuid, final UuidRepresentation uuidRepresentation) {
+        byte[] binaryData = new byte[16];
+        writeLongToArrayBigEndian(binaryData, 0, uuid.getMostSignificantBits());
+        writeLongToArrayBigEndian(binaryData, 8, uuid.getLeastSignificantBits());
+        switch(uuidRepresentation) {
+            case C_SHARP_LEGACY:
+                reverseByteArray(binaryData, 0, 4);
+                reverseByteArray(binaryData, 4, 2);
+                reverseByteArray(binaryData, 6, 2);
+                break;
+            case JAVA_LEGACY:
+                reverseByteArray(binaryData, 0, 8);
+                reverseByteArray(binaryData, 8, 8);
+                break;
+            case PYTHON_LEGACY:
+            case STANDARD:
+                break;
+            default:
+                throw new BSONException("Unexpected UUID representation: " + uuidRepresentation);
+        }
+
+        return binaryData;
+    }
+
+    public static UUID decodeBinaryToUuid(final byte[] data, final byte type, final UuidRepresentation uuidRepresentation) {
+        if (data.length != 16) {
+            throw new BsonSerializationException(String.format("Expected length to be 16, not %d.", data.length));
+        }
+
+        if (type == BsonBinarySubType.UUID_LEGACY.getValue()) {
+            switch(uuidRepresentation) {
+                case C_SHARP_LEGACY:
+                    reverseByteArray(data, 0, 4);
+                    reverseByteArray(data, 4, 2);
+                    reverseByteArray(data, 6, 2);
+                    break;
+                case JAVA_LEGACY:
+                    reverseByteArray(data, 0, 8);
+                    reverseByteArray(data, 8, 8);
+                    break;
+                case PYTHON_LEGACY:
+                    break;
+                case STANDARD:
+                    throw new BSONException("Can not decode a subtype 3 (UUID legacy) BSON binary when the decoder is configured to use "
+                            + "the standard UUID representation");
+                default:
+                    throw new BSONException("Unexpected UUID representation: " + uuidRepresentation);
+            }
+        }
+
+        return new UUID(readLongFromArrayBigEndian(data, 0), readLongFromArrayBigEndian(data, 8));
+    }
+
+    private UuidHelper() {
+    }
+}
diff --git a/bson/src/main/org/bson/io/BasicOutputBuffer.java b/bson/src/main/org/bson/io/BasicOutputBuffer.java
index 622c5f9b218..80acefcb7ec 100644
--- a/bson/src/main/org/bson/io/BasicOutputBuffer.java
+++ b/bson/src/main/org/bson/io/BasicOutputBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import java.util.List;
 
 import static java.lang.String.format;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
 
 /**
  * A BSON output stream that stores the output in a single, un-pooled byte array.
@@ -131,7 +132,7 @@ public void truncateToPosition(final int newPosition) {
     @Override
     public List<ByteBuf> getByteBuffers() {
         ensureOpen();
-        return Arrays.<ByteBuf>asList(new ByteBufNIO(ByteBuffer.wrap(buffer, 0, position).duplicate()));
+        return Arrays.<ByteBuf>asList(new ByteBufNIO(ByteBuffer.wrap(buffer, 0, position).duplicate().order(LITTLE_ENDIAN)));
     }
 
     @Override
diff --git a/driver/src/main/org/bson/io/Bits.java b/bson/src/main/org/bson/io/Bits.java
similarity index 98%
rename from driver/src/main/org/bson/io/Bits.java
rename to bson/src/main/org/bson/io/Bits.java
index 1cb758fb064..e1bd4997a96 100644
--- a/driver/src/main/org/bson/io/Bits.java
+++ b/bson/src/main/org/bson/io/Bits.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,9 @@
 
 /**
  * Utility class for reading values from an input stream.
+ * @deprecated there is no replacement for this utility class
  */
+@Deprecated
 public class Bits {
 
     /**
diff --git a/bson/src/main/org/bson/io/BsonInput.java b/bson/src/main/org/bson/io/BsonInput.java
index 472674d99e2..c1ea2c5fea5 100644
--- a/bson/src/main/org/bson/io/BsonInput.java
+++ b/bson/src/main/org/bson/io/BsonInput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,12 +115,25 @@ public interface BsonInput extends Closeable {
      * Marks the current position in the stream. This method obeys the contract as specified in the same method in {@code InputStream}.
      *
      * @param readLimit the maximum limit of bytes that can be read before the mark position becomes invalid
+     * @deprecated Use {@link #getMark(int)} instead
      */
+    @Deprecated
     void mark(int readLimit);
 
+    /**
+     * Gets a mark for the current position in the stream.
+     *
+     * @param readLimit the maximum limit of bytes that can be read before the mark position becomes invalid
+     * @return the mark
+     * @since 3.7
+     */
+    BsonInputMark getMark(int readLimit);
+
     /**
      * Resets the stream to the current mark. This method obeys the contract as specified in the same method in {@code InputStream}.
+     * @deprecated Prefer {@link #getMark(int)}
      */
+    @Deprecated
     void reset();
 
     /**
diff --git a/bson/src/main/org/bson/io/BsonInputMark.java b/bson/src/main/org/bson/io/BsonInputMark.java
new file mode 100644
index 00000000000..fd0b9d8b5cc
--- /dev/null
+++ b/bson/src/main/org/bson/io/BsonInputMark.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.io;
+
+/**
+ * Represents a bookmark that can be used to reset a {@link BsonInput} to its state at the time the mark was created.
+ *
+ * @see BsonInput#getMark(int)
+ *
+ * @since 3.7
+ */
+public interface BsonInputMark {
+    /**
+     * Reset the {@link BsonInput} to its state at the time the mark was created.
+     */
+    void reset();
+}
diff --git a/bson/src/main/org/bson/io/BsonOutput.java b/bson/src/main/org/bson/io/BsonOutput.java
index 884b73b333b..b62fe412b1b 100644
--- a/bson/src/main/org/bson/io/BsonOutput.java
+++ b/bson/src/main/org/bson/io/BsonOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/io/ByteBufferBsonInput.java b/bson/src/main/org/bson/io/ByteBufferBsonInput.java
index 23949b4aaea..eca8c313990 100644
--- a/bson/src/main/org/bson/io/ByteBufferBsonInput.java
+++ b/bson/src/main/org/bson/io/ByteBufferBsonInput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,7 +142,10 @@ public String readCString() {
     private String readString(final int size) {
         if (size == 2) {
             byte asciiByte = readByte();               // if only one byte in the string, it must be ascii.
-            readByte();                                // read null terminator
+            byte nullByte = readByte();                // read null terminator
+            if (nullByte != 0) {
+                throw new BsonSerializationException("Found a BSON string that is not null-terminated");
+            }
             if (asciiByte < 0) {
                 return UTF8_CHARSET.newDecoder().replacement();
             }
@@ -178,12 +181,26 @@ public void skip(final int numBytes) {
         buffer.position(buffer.position() + numBytes);
     }
 
+    @Deprecated
     @Override
     public void mark(final int readLimit) {
         ensureOpen();
         mark = buffer.position();
     }
 
+    @Override
+    public BsonInputMark getMark(final int readLimit) {
+        return new BsonInputMark() {
+            private int mark = buffer.position();
+            @Override
+            public void reset() {
+                ensureOpen();
+                buffer.position(mark);
+            }
+        };
+    }
+
+    @Deprecated
     @Override
     public void reset() {
         ensureOpen();
diff --git a/bson/src/main/org/bson/io/OutputBuffer.java b/bson/src/main/org/bson/io/OutputBuffer.java
index e46ae076fcf..c733032bad1 100644
--- a/bson/src/main/org/bson/io/OutputBuffer.java
+++ b/bson/src/main/org/bson/io/OutputBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,7 @@ public int size() {
      * Get a list of byte buffers that are prepared to be read from; in other words, whose position is 0 and whose limit is the number of
      * bytes that should read. <p> Note that the byte buffers may be read-only. </p>
      *
-     * @return the non-null list of byte buffers.
+     * @return the non-null list of byte buffers, in LITTLE_ENDIAN order
      */
     public abstract List<ByteBuf> getByteBuffers();
 
@@ -171,7 +171,7 @@ public String toString() {
      * @param position the position, which must be greater than equal to 0 and at least 4 less than the stream size
      * @param value the value to write.  The 24 high-order bits of the value are ignored.
      */
-    protected abstract void write(final int position, final int value);
+    protected abstract void write(int position, int value);
 
     /**
      * Writes the given long value to the buffer.
@@ -187,7 +187,7 @@ private int writeCharacters(final String str, final boolean checkForNullCharacte
         int len = str.length();
         int total = 0;
 
-        for (int i = 0; i < len;/*i gets incremented*/) {
+        for (int i = 0; i < len;) {
             int c = Character.codePointAt(str, i);
 
             if (checkForNullCharacters && c == 0x0) {
diff --git a/bson/src/main/org/bson/io/package-info.java b/bson/src/main/org/bson/io/package-info.java
index 82a24cc4275..dca8d1a8df1 100644
--- a/bson/src/main/org/bson/io/package-info.java
+++ b/bson/src/main/org/bson/io/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/json/Converter.java b/bson/src/main/org/bson/json/Converter.java
new file mode 100644
index 00000000000..06342f109f9
--- /dev/null
+++ b/bson/src/main/org/bson/json/Converter.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+/**
+ * A converter from a BSON value to JSON.
+ *
+ * @param <T> the value type to convert
+ * @since 3.5
+ */
+public interface Converter<T> {
+    /**
+     * Convert the given value to JSON using the JSON writer.
+     *
+     * @param value the value, which may be null depending on the type
+     * @param writer the JSON writer
+     */
+    void convert(T value, StrictJsonWriter writer);
+}
diff --git a/bson/src/main/org/bson/json/DateTimeFormatter.java b/bson/src/main/org/bson/json/DateTimeFormatter.java
new file mode 100644
index 00000000000..9188e05bfd2
--- /dev/null
+++ b/bson/src/main/org/bson/json/DateTimeFormatter.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalQuery;
+import java.util.Calendar;
+import java.util.TimeZone;
+
+import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+
+final class DateTimeFormatter {
+    private static final FormatterImpl FORMATTER_IMPL;
+
+    static {
+        FormatterImpl dateTimeHelper;
+        try {
+            dateTimeHelper = loadDateTimeFormatter("org.bson.json.DateTimeFormatter$Java8DateTimeFormatter");
+        } catch (LinkageError e) {
+            // this is expected if running on a release prior to Java 8: fallback to JAXB.
+            dateTimeHelper = loadDateTimeFormatter("org.bson.json.DateTimeFormatter$JaxbDateTimeFormatter");
+        }
+
+        FORMATTER_IMPL = dateTimeHelper;
+    }
+
+    private static FormatterImpl loadDateTimeFormatter(final String className) {
+        try {
+            return (FormatterImpl) Class.forName(className).getDeclaredConstructor().newInstance();
+        } catch (ClassNotFoundException e) {
+            // this is unexpected as it means the class itself is not found
+            throw new ExceptionInInitializerError(e);
+        } catch (InstantiationException e) {
+            // this is unexpected as it means the class can't be instantiated
+            throw new ExceptionInInitializerError(e);
+        } catch (IllegalAccessException e) {
+            // this is unexpected as it means the no-args constructor isn't accessible
+            throw new ExceptionInInitializerError(e);
+        } catch (NoSuchMethodException e) {
+            throw new ExceptionInInitializerError(e);
+        } catch (InvocationTargetException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    static long parse(final String dateTimeString) {
+        return FORMATTER_IMPL.parse(dateTimeString);
+    }
+
+    static String format(final long dateTime) {
+        return FORMATTER_IMPL.format(dateTime);
+    }
+
+    private interface FormatterImpl {
+        long parse(String dateTimeString);
+        String format(long dateTime);
+    }
+
+    // Reflective use of DatatypeConverter avoids a compile-time dependency on the java.xml.bind module in Java 9
+    static class JaxbDateTimeFormatter implements FormatterImpl {
+
+        private static final Method DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD;
+        private static final Method DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD;
+
+        static {
+            try {
+                DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
+                                                                    .getDeclaredMethod("parseDateTime", String.class);
+                DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
+                                                                    .getDeclaredMethod("printDateTime", Calendar.class);
+            } catch (NoSuchMethodException e) {
+                throw new ExceptionInInitializerError(e);
+            } catch (ClassNotFoundException e) {
+                throw new ExceptionInInitializerError(e);
+            }
+        }
+
+        @Override
+        public long parse(final String dateTimeString) {
+            try {
+                return ((Calendar) DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD.invoke(null, dateTimeString)).getTimeInMillis();
+            } catch (IllegalAccessException e) {
+                throw new IllegalStateException(e);
+            } catch (InvocationTargetException e) {
+                throw (RuntimeException) e.getCause();
+            }
+        }
+
+        @Override
+        public String format(final long dateTime) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTimeInMillis(dateTime);
+            calendar.setTimeZone(TimeZone.getTimeZone("Z"));
+            try {
+                return (String) DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD.invoke(null, calendar);
+            } catch (IllegalAccessException e) {
+                throw new IllegalStateException();
+            } catch (InvocationTargetException e) {
+                throw (RuntimeException) e.getCause();
+            }
+        }
+    }
+
+    static class Java8DateTimeFormatter implements FormatterImpl {
+
+        // if running on Java 8 or above then java.time.format.DateTimeFormatter will be available and initialization will succeed.
+        // Otherwise it will fail.
+        static {
+            try {
+                Class.forName("java.time.format.DateTimeFormatter");
+            } catch (ClassNotFoundException e) {
+                throw new ExceptionInInitializerError(e);
+            }
+        }
+
+        @Override
+        public long parse(final String dateTimeString) {
+            try {
+                return ISO_OFFSET_DATE_TIME.parse(dateTimeString, new TemporalQuery<Instant>() {
+                    @Override
+                    public Instant queryFrom(final TemporalAccessor temporal) {
+                        return Instant.from(temporal);
+                    }
+                }).toEpochMilli();
+            } catch (DateTimeParseException e) {
+                throw new IllegalArgumentException(e.getMessage());
+            }
+        }
+
+        @Override
+        public String format(final long dateTime) {
+            return ZonedDateTime.ofInstant(Instant.ofEpochMilli(dateTime), ZoneId.of("Z")).format(ISO_OFFSET_DATE_TIME);
+        }
+    }
+
+    private DateTimeFormatter() {
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonBinaryConverter.java b/bson/src/main/org/bson/json/ExtendedJsonBinaryConverter.java
new file mode 100644
index 00000000000..4deaf55d333
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonBinaryConverter.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonBinary;
+import org.bson.internal.Base64;
+
+class ExtendedJsonBinaryConverter implements Converter<BsonBinary> {
+
+    @Override
+    public void convert(final BsonBinary value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeStartObject("$binary");
+        writer.writeString("base64", Base64.encode(value.getData()));
+        writer.writeString("subType", String.format("%02X", value.getType()));
+        writer.writeEndObject();
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonDateTimeConverter.java b/bson/src/main/org/bson/json/ExtendedJsonDateTimeConverter.java
new file mode 100644
index 00000000000..05a0152e68d
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonDateTimeConverter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class ExtendedJsonDateTimeConverter implements Converter<Long> {
+    @Override
+    public void convert(final Long value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeStartObject("$date");
+        writer.writeString("$numberLong", Long.toString(value));
+        writer.writeEndObject();
+        writer.writeEndObject();
+    }
+
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonDecimal128Converter.java b/bson/src/main/org/bson/json/ExtendedJsonDecimal128Converter.java
new file mode 100644
index 00000000000..f42d701d705
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonDecimal128Converter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.types.Decimal128;
+
+class ExtendedJsonDecimal128Converter implements Converter<Decimal128> {
+    @Override
+    public void convert(final Decimal128 value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeName("$numberDecimal");
+        writer.writeString(value.toString());
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonDoubleConverter.java b/bson/src/main/org/bson/json/ExtendedJsonDoubleConverter.java
new file mode 100644
index 00000000000..1ad0db0ec1b
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonDoubleConverter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class ExtendedJsonDoubleConverter implements Converter<Double> {
+    @Override
+    public void convert(final Double value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeName("$numberDouble");
+        writer.writeString(Double.toString(value));
+        writer.writeEndObject();
+
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonInt32Converter.java b/bson/src/main/org/bson/json/ExtendedJsonInt32Converter.java
new file mode 100644
index 00000000000..64f30294fcd
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonInt32Converter.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class ExtendedJsonInt32Converter implements Converter<Integer> {
+    @Override
+    public void convert(final Integer value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeName("$numberInt");
+        writer.writeString(Integer.toString(value));
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonInt64Converter.java b/bson/src/main/org/bson/json/ExtendedJsonInt64Converter.java
new file mode 100644
index 00000000000..ce0c1b959a0
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonInt64Converter.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class ExtendedJsonInt64Converter implements Converter<Long> {
+    @Override
+    public void convert(final Long value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeName("$numberLong");
+        writer.writeString(Long.toString(value));
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonMaxKeyConverter.java b/bson/src/main/org/bson/json/ExtendedJsonMaxKeyConverter.java
new file mode 100644
index 00000000000..c5ce321b308
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonMaxKeyConverter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonMaxKey;
+
+class ExtendedJsonMaxKeyConverter implements Converter<BsonMaxKey> {
+    @Override
+    public void convert(final BsonMaxKey value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeNumber("$maxKey", "1");
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonMinKeyConverter.java b/bson/src/main/org/bson/json/ExtendedJsonMinKeyConverter.java
new file mode 100644
index 00000000000..f21f69309ed
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonMinKeyConverter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonMinKey;
+
+class ExtendedJsonMinKeyConverter implements Converter<BsonMinKey> {
+    @Override
+    public void convert(final BsonMinKey value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeNumber("$minKey", "1");
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonObjectIdConverter.java b/bson/src/main/org/bson/json/ExtendedJsonObjectIdConverter.java
new file mode 100644
index 00000000000..be0ed8af348
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonObjectIdConverter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.types.ObjectId;
+
+class ExtendedJsonObjectIdConverter implements Converter<ObjectId> {
+
+    @Override
+    public void convert(final ObjectId value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeString("$oid", value.toHexString());
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonRegularExpressionConverter.java b/bson/src/main/org/bson/json/ExtendedJsonRegularExpressionConverter.java
new file mode 100644
index 00000000000..588f46a83e0
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonRegularExpressionConverter.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonRegularExpression;
+
+class ExtendedJsonRegularExpressionConverter implements Converter<BsonRegularExpression> {
+    @Override
+    public void convert(final BsonRegularExpression value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeStartObject("$regularExpression");
+        writer.writeString("pattern", value.getPattern());
+        writer.writeString("options", value.getOptions());
+        writer.writeEndObject();
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonTimestampConverter.java b/bson/src/main/org/bson/json/ExtendedJsonTimestampConverter.java
new file mode 100644
index 00000000000..e82549abc5d
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonTimestampConverter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonTimestamp;
+import org.bson.internal.UnsignedLongs;
+
+class ExtendedJsonTimestampConverter implements Converter<BsonTimestamp> {
+    @Override
+    public void convert(final BsonTimestamp value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeStartObject("$timestamp");
+        writer.writeNumber("t", UnsignedLongs.toString(toUnsignedLong(value.getTime())));
+        writer.writeNumber("i", UnsignedLongs.toString(toUnsignedLong(value.getInc())));
+        writer.writeEndObject();
+        writer.writeEndObject();
+    }
+
+    // Equivalent to Integer.toUnsignedLong() in Java 8
+    private long toUnsignedLong(final int value) {
+        return ((long) value) & 0xffffffffL;
+    }
+}
diff --git a/bson/src/main/org/bson/json/ExtendedJsonUndefinedConverter.java b/bson/src/main/org/bson/json/ExtendedJsonUndefinedConverter.java
new file mode 100644
index 00000000000..196e21e816a
--- /dev/null
+++ b/bson/src/main/org/bson/json/ExtendedJsonUndefinedConverter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonUndefined;
+
+class ExtendedJsonUndefinedConverter implements Converter<BsonUndefined> {
+    @Override
+    public void convert(final BsonUndefined value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeBoolean("$undefined", true);
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonBooleanConverter.java b/bson/src/main/org/bson/json/JsonBooleanConverter.java
new file mode 100644
index 00000000000..9d97d7b7969
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonBooleanConverter.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class JsonBooleanConverter implements Converter<Boolean> {
+    @Override
+    public void convert(final Boolean value, final StrictJsonWriter writer) {
+        writer.writeBoolean(value);
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonBuffer.java b/bson/src/main/org/bson/json/JsonBuffer.java
index ca88ff55e8d..2db6c116238 100644
--- a/bson/src/main/org/bson/json/JsonBuffer.java
+++ b/bson/src/main/org/bson/json/JsonBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,47 +16,17 @@
 
 package org.bson.json;
 
-class JsonBuffer {
-
-    private final String buffer;
-    private int position;
-    private boolean eof;
-
-    public JsonBuffer(final String buffer) {
-        this.buffer = buffer;
-    }
-
-    public int getPosition() {
-        return position;
-    }
-
-    public void setPosition(final int position) {
-        this.position = position;
-    }
-
-    public int read() {
-        if (eof) {
-            throw new JsonParseException("Trying to read past EOF.");
-    } else if (position >= buffer.length()) {
-            eof = true;
-            return -1;
-        }  else {
-            return buffer.charAt(position++);
-        }
-    }
-
-    public void unread(final int c) {
-        eof = false;
-        if (c != -1 && buffer.charAt(position - 1) == c) {
-            position--;
-        }
-    }
-
-    public String substring(final int beginIndex) {
-        return buffer.substring(beginIndex);
-    }
-
-    public String substring(final int beginIndex, final int endIndex) {
-        return buffer.substring(beginIndex, endIndex);
-    }
+interface JsonBuffer {
+
+    int getPosition();
+
+    int read();
+
+    void unread(int c);
+
+    int mark();
+
+    void reset(int markPos);
+
+    void discard(int markPos);
 }
diff --git a/bson/src/main/org/bson/json/JsonDoubleConverter.java b/bson/src/main/org/bson/json/JsonDoubleConverter.java
new file mode 100644
index 00000000000..26b46ab89d5
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonDoubleConverter.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class JsonDoubleConverter implements Converter<Double> {
+    @Override
+    public void convert(final Double value, final StrictJsonWriter writer) {
+        writer.writeNumber(Double.toString(value));
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonInt32Converter.java b/bson/src/main/org/bson/json/JsonInt32Converter.java
new file mode 100644
index 00000000000..fc555e421f6
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonInt32Converter.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class JsonInt32Converter implements Converter<Integer> {
+    @Override
+    public void convert(final Integer value, final StrictJsonWriter writer) {
+        writer.writeNumber(Integer.toString(value));
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonJavaScriptConverter.java b/bson/src/main/org/bson/json/JsonJavaScriptConverter.java
new file mode 100644
index 00000000000..437b8b09f95
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonJavaScriptConverter.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class JsonJavaScriptConverter implements Converter<String> {
+    @Override
+    public void convert(final String value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeString("$code", value);
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonMode.java b/bson/src/main/org/bson/json/JsonMode.java
index dfd1286ce2c..cbe48b32fde 100644
--- a/bson/src/main/org/bson/json/JsonMode.java
+++ b/bson/src/main/org/bson/json/JsonMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,37 @@
  *
  * @see JsonWriter
  * @since 3.0
- * @mongodb.driver.manual reference/mongodb-extended-json/ MongoDB Extended JSON
  */
 public enum JsonMode {
 
     /**
      * Strict mode representations of BSON types conform to the <a href="http://www.json.org">JSON RFC spec</a>.
+     *
+     * @deprecated  The format generated with this mode is no longer considered standard for MongoDB tools. This value is not currently
+     * scheduled for removal.
      */
+    @Deprecated // NOT CURRENTLY INTENDED FOR REMOVAL
     STRICT,
 
     /**
      * While not formally documented, this output mode will attempt to produce output that corresponds to what the MongoDB shell actually
      * produces when showing query results.
      */
-    SHELL
+    SHELL,
+
+    /**
+     * Standard extended JSON representation.
+     *
+     * @since 3.5
+     * @see <a href="https://github.com/mongodb/specifications/blob/master/source/extended-json.rst">Extended JSON Specification</a>
+     */
+    EXTENDED,
+
+    /**
+     * Standard relaxed extended JSON representation.
+     *
+     * @since 3.5
+     * @see <a href="https://github.com/mongodb/specifications/blob/master/source/extended-json.rst">Extended JSON Specification</a>
+     */
+    RELAXED
 }
diff --git a/bson/src/main/org/bson/json/JsonNullConverter.java b/bson/src/main/org/bson/json/JsonNullConverter.java
new file mode 100644
index 00000000000..b5208018c4e
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonNullConverter.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonNull;
+
+class JsonNullConverter implements Converter<BsonNull> {
+    @Override
+    public void convert(final BsonNull value, final StrictJsonWriter writer) {
+        writer.writeNull();
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonParseException.java b/bson/src/main/org/bson/json/JsonParseException.java
index 08ea07e7a17..00dcc172f98 100644
--- a/bson/src/main/org/bson/json/JsonParseException.java
+++ b/bson/src/main/org/bson/json/JsonParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/json/JsonReader.java b/bson/src/main/org/bson/json/JsonReader.java
index ad423cc912b..01f4124c684 100644
--- a/bson/src/main/org/bson/json/JsonReader.java
+++ b/bson/src/main/org/bson/json/JsonReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,15 +24,18 @@
 import org.bson.BsonContextType;
 import org.bson.BsonDbPointer;
 import org.bson.BsonInvalidOperationException;
+import org.bson.BsonReaderMark;
 import org.bson.BsonRegularExpression;
 import org.bson.BsonTimestamp;
 import org.bson.BsonType;
 import org.bson.BsonUndefined;
+import org.bson.internal.Base64;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
 
-import javax.xml.bind.DatatypeConverter;
+import java.io.Reader;
 import java.text.DateFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
@@ -41,6 +44,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
+import static java.lang.String.format;
+
 
 /**
  * Reads a JSON in one of the following modes:
@@ -65,13 +70,31 @@ public class JsonReader extends AbstractBsonReader {
     private Mark mark;
 
     /**
-     * Constructs a new instance with the given JSON string.
+     * Constructs a new instance with the given string positioned at a JSON object.
      *
-     * @param json     A string representation of a JSON.
+     * @param json     A string representation of a JSON object.
      */
     public JsonReader(final String json) {
+        this(new JsonScanner(json));
+    }
+
+    /**
+     * Constructs a new instance with the given {@code Reader} positioned at a JSON object.
+     *
+     * <p>
+     * The application is responsible for closing the {@code Reader}.
+     * </p>
+     *
+     * @param reader A reader representation of a JSON object.
+     * @since 3.11
+     */
+    public JsonReader(final Reader reader) {
+        this(new JsonScanner(reader));
+    }
+
+    private JsonReader(final JsonScanner scanner) {
         super();
-        scanner = new JsonScanner(json);
+        this.scanner = scanner;
         setContext(new Context(null, BsonContextType.TOP_LEVEL));
     }
 
@@ -82,7 +105,12 @@ protected BsonBinary doReadBinaryData() {
 
     @Override
     protected byte doPeekBinarySubType() {
-       return doReadBinaryData().getType();
+        return doReadBinaryData().getType();
+    }
+
+    @Override
+    protected int doPeekBinarySize() {
+        return doReadBinaryData().getData().length;
     }
 
     @Override
@@ -177,6 +205,14 @@ public BsonType readBsonType() {
                     setCurrentBsonType(BsonType.NULL);
                 } else if ("undefined".equals(value)) {
                     setCurrentBsonType(BsonType.UNDEFINED);
+                } else if ("MinKey".equals(value)) {
+                    visitEmptyConstructor();
+                    setCurrentBsonType(BsonType.MIN_KEY);
+                    currentValue = new MinKey();
+                } else if ("MaxKey".equals(value)) {
+                    visitEmptyConstructor();
+                    setCurrentBsonType(BsonType.MAX_KEY);
+                    currentValue = new MaxKey();
                 } else if ("BinData".equals(value)) {
                     setCurrentBsonType(BsonType.BINARY);
                     currentValue = visitBinDataConstructor();
@@ -189,9 +225,15 @@ public BsonType readBsonType() {
                 } else if ("ISODate".equals(value)) {
                     setCurrentBsonType(BsonType.DATE_TIME);
                     currentValue = visitISODateTimeConstructor();
+                } else if ("NumberInt".equals(value)) {
+                    setCurrentBsonType(BsonType.INT32);
+                    currentValue = visitNumberIntConstructor();
                 } else if ("NumberLong".equals(value)) {
                     setCurrentBsonType(BsonType.INT64);
                     currentValue = visitNumberLongConstructor();
+                } else if ("NumberDecimal".equals(value)) {
+                    setCurrentBsonType(BsonType.DECIMAL128);
+                    currentValue = visitNumberDecimalConstructor();
                 } else if ("ObjectId".equals(value)) {
                     setCurrentBsonType(BsonType.OBJECT_ID);
                     currentValue = visitObjectIdConstructor();
@@ -251,6 +293,11 @@ public BsonType readBsonType() {
     }
     //CHECKSTYLE:ON
 
+    @Override
+    public Decimal128 doReadDecimal128() {
+        return (Decimal128) currentValue;
+    }
+
     @Override
     protected long doReadDateTime() {
         return (Long) currentValue;
@@ -273,26 +320,12 @@ protected void doReadEndArray() {
         }
     }
 
-    private void setStateOnEnd() {
-        switch (getContext().getContextType()) {
-            case ARRAY:
-            case DOCUMENT:
-                setState(State.TYPE);
-                break;
-            case TOP_LEVEL:
-                setState(State.DONE);
-                break;
-            default:
-                throw new JsonParseException("Unexpected ContextType %s.", getContext().getContextType());
-        }
-    }
-
     @Override
     protected void doReadEndDocument() {
         setContext(getContext().getParentContext());
         if (getContext() != null && getContext().getContextType() == BsonContextType.SCOPE_DOCUMENT) {
             setContext(getContext().getParentContext()); // JavaScriptWithScope
-            verifyToken("}"); // outermost closing bracket for JavaScriptWithScope
+            verifyToken(JsonTokenType.END_OBJECT); // outermost closing bracket for JavaScriptWithScope
         }
 
         if (getContext() == null) {
@@ -423,6 +456,9 @@ protected void doSkipValue() {
             case INT64:
                 readInt64();
                 break;
+            case DECIMAL128:
+                readDecimal128();
+                break;
             case JAVASCRIPT:
                 readJavaScript();
                 break;
@@ -484,13 +520,20 @@ private void pushToken(final JsonToken token) {
         }
     }
 
-    private void verifyToken(final Object expected) {
-        if (expected == null) {
-            throw new IllegalArgumentException("Can't be null");
+    private void verifyToken(final JsonTokenType expectedType) {
+        JsonToken token = popToken();
+        if (expectedType != token.getType()) {
+            throw new JsonParseException("JSON reader expected token type '%s' but found '%s'.", expectedType, token.getValue());
         }
+    }
+
+    private void verifyToken(final JsonTokenType expectedType, final Object expectedValue) {
         JsonToken token = popToken();
-        if (!expected.equals(token.getValue())) {
-            throw new JsonParseException("JSON reader expected '%s' but found '%s'.", expected, token.getValue());
+        if (expectedType != token.getType()) {
+            throw new JsonParseException("JSON reader expected token type '%s' but found '%s'.", expectedType, token.getValue());
+        }
+        if (!expectedValue.equals(token.getValue())) {
+            throw new JsonParseException("JSON reader expected '%s' but found '%s'.", expectedValue, token.getValue());
         }
     }
 
@@ -502,7 +545,7 @@ private void verifyString(final String expected) {
         JsonToken token = popToken();
         JsonTokenType type = token.getType();
 
-        if ((type != JsonTokenType.STRING && type != JsonTokenType.UNQUOTED_STRING) && !expected.equals(token.getValue())) {
+        if ((type != JsonTokenType.STRING && type != JsonTokenType.UNQUOTED_STRING) || !expected.equals(token.getValue())) {
             throw new JsonParseException("JSON reader expected '%s' but found '%s'.", expected, token.getValue());
         }
     }
@@ -515,7 +558,15 @@ private void visitNew() {
 
         String value = typeToken.getValue(String.class);
 
-        if ("BinData".equals(value)) {
+        if ("MinKey".equals(value)) {
+            visitEmptyConstructor();
+            setCurrentBsonType(BsonType.MIN_KEY);
+            currentValue = new MinKey();
+        } else if ("MaxKey".equals(value)) {
+            visitEmptyConstructor();
+            setCurrentBsonType(BsonType.MAX_KEY);
+            currentValue = new MaxKey();
+        } else if ("BinData".equals(value)) {
             currentValue = visitBinDataConstructor();
             setCurrentBsonType(BsonType.BINARY);
         } else if ("Date".equals(value)) {
@@ -527,9 +578,15 @@ private void visitNew() {
         } else if ("ISODate".equals(value)) {
             currentValue = visitISODateTimeConstructor();
             setCurrentBsonType(BsonType.DATE_TIME);
+        } else if ("NumberInt".equals(value)) {
+            currentValue = visitNumberIntConstructor();
+            setCurrentBsonType(BsonType.INT32);
         } else if ("NumberLong".equals(value)) {
             currentValue = visitNumberLongConstructor();
             setCurrentBsonType(BsonType.INT64);
+        } else if ("NumberDecimal".equals(value)) {
+            currentValue = visitNumberDecimalConstructor();
+            setCurrentBsonType(BsonType.DECIMAL128);
         } else if ("ObjectId".equals(value)) {
             currentValue = visitObjectIdConstructor();
             setCurrentBsonType(BsonType.OBJECT_ID);
@@ -560,10 +617,19 @@ private void visitExtendedJSON() {
         JsonTokenType type = nameToken.getType();
 
         if (type == JsonTokenType.STRING || type == JsonTokenType.UNQUOTED_STRING) {
-            if ("$binary".equals(value)) {
-                currentValue = visitBinDataExtendedJson();
-                setCurrentBsonType(BsonType.BINARY);
-                return;
+
+            if ("$binary".equals(value) || "$type".equals(value)) {
+                currentValue = visitBinDataExtendedJson(value);
+                if (currentValue != null) {
+                    setCurrentBsonType(BsonType.BINARY);
+                    return;
+                }
+            } else if ("$regex".equals(value) || "$options".equals(value)) {
+                currentValue = visitRegularExpressionExtendedJson(value);
+                if (currentValue != null) {
+                    setCurrentBsonType(BsonType.REGULAR_EXPRESSION);
+                    return;
+                }
             } else if ("$code".equals(value)) {
                 visitJavaScriptExtendedJson();
                 return;
@@ -583,8 +649,8 @@ private void visitExtendedJSON() {
                 currentValue = visitObjectIdExtendedJson();
                 setCurrentBsonType(BsonType.OBJECT_ID);
                 return;
-            } else if ("$regex".equals(value)) {
-                currentValue = visitRegularExpressionExtendedJson();
+            } else if ("$regularExpression".equals(value)) {
+                currentValue = visitNewRegularExpressionExtendedJson();
                 setCurrentBsonType(BsonType.REGULAR_EXPRESSION);
                 return;
             } else if ("$symbol".equals(value)) {
@@ -603,39 +669,60 @@ private void visitExtendedJSON() {
                 currentValue = visitNumberLongExtendedJson();
                 setCurrentBsonType(BsonType.INT64);
                 return;
+            } else if ("$numberInt".equals(value)) {
+                currentValue = visitNumberIntExtendedJson();
+                setCurrentBsonType(BsonType.INT32);
+                return;
+            } else if ("$numberDouble".equals(value)) {
+                currentValue = visitNumberDoubleExtendedJson();
+                setCurrentBsonType(BsonType.DOUBLE);
+                return;
+            } else if ("$numberDecimal".equals(value)) {
+                currentValue = visitNumberDecimalExtendedJson();
+                setCurrentBsonType(BsonType.DECIMAL128);
+                return;
+            } else if ("$dbPointer".equals(value)) {
+                currentValue = visitDbPointerExtendedJson();
+                setCurrentBsonType(BsonType.DB_POINTER);
+                return;
             }
         }
+
         pushToken(nameToken);
         setCurrentBsonType(BsonType.DOCUMENT);
     }
 
+    private void visitEmptyConstructor() {
+        JsonToken nextToken = popToken();
+        if (nextToken.getType() == JsonTokenType.LEFT_PAREN) {
+            verifyToken(JsonTokenType.RIGHT_PAREN);
+        } else {
+            pushToken(nextToken);
+        }
+    }
+
     private BsonBinary visitBinDataConstructor() {
-        verifyToken("(");
+        verifyToken(JsonTokenType.LEFT_PAREN);
         JsonToken subTypeToken = popToken();
         if (subTypeToken.getType() != JsonTokenType.INT32) {
             throw new JsonParseException("JSON reader expected a binary subtype but found '%s'.", subTypeToken.getValue());
         }
-        verifyToken(",");
+        verifyToken(JsonTokenType.COMMA);
         JsonToken bytesToken = popToken();
-        if (bytesToken.getType() != JsonTokenType.UNQUOTED_STRING) {
+        if (bytesToken.getType() != JsonTokenType.UNQUOTED_STRING && bytesToken.getType() != JsonTokenType.STRING) {
             throw new JsonParseException("JSON reader expected a string but found '%s'.", bytesToken.getValue());
         }
-        verifyToken(")");
+        verifyToken(JsonTokenType.RIGHT_PAREN);
 
-        byte[] bytes = DatatypeConverter.parseBase64Binary(bytesToken.getValue(String.class));
+        byte[] bytes = Base64.decode(bytesToken.getValue(String.class));
         return new BsonBinary(subTypeToken.getValue(Integer.class).byteValue(), bytes);
     }
 
     private BsonBinary visitUUIDConstructor(final String uuidConstructorName) {
-        //TODO verify information related to https://jira.mongodb.org/browse/SERVER-3168
-        verifyToken("(");
-        JsonToken bytesToken = popToken();
-        if (bytesToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", bytesToken.getValue());
-        }
-        verifyToken(")");
-        String hexString = bytesToken.getValue(String.class).replaceAll("\\{", "").replaceAll("\\}", "").replaceAll("-", "");
-        byte[] bytes = DatatypeConverter.parseHexBinary(hexString);
+        verifyToken(JsonTokenType.LEFT_PAREN);
+        String hexString = readStringFromExtendedJson().replaceAll("\\{", "").replaceAll("}", "").replaceAll("-", "");
+        verifyToken(JsonTokenType.RIGHT_PAREN);
+        byte[] bytes = decodeHex(hexString);
         BsonBinarySubType subType = BsonBinarySubType.UUID_STANDARD;
         if (!"UUID".equals(uuidConstructorName) || !"GUID".equals(uuidConstructorName)) {
             subType = BsonBinarySubType.UUID_LEGACY;
@@ -644,38 +731,28 @@ private BsonBinary visitUUIDConstructor(final String uuidConstructorName) {
     }
 
     private BsonRegularExpression visitRegularExpressionConstructor() {
-        verifyToken("(");
-        JsonToken patternToken = popToken();
-        if (patternToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", patternToken.getValue());
-        }
+        verifyToken(JsonTokenType.LEFT_PAREN);
+        String pattern = readStringFromExtendedJson();
         String options = "";
         JsonToken commaToken = popToken();
         if (commaToken.getType() == JsonTokenType.COMMA) {
-            JsonToken optionsToken = popToken();
-            if (optionsToken.getType() != JsonTokenType.STRING) {
-                throw new JsonParseException("JSON reader expected a string but found '%s'.", optionsToken.getValue());
-            }
-            options = optionsToken.getValue(String.class);
+            options = readStringFromExtendedJson();
         } else {
             pushToken(commaToken);
         }
-        verifyToken(")");
-        return new BsonRegularExpression(patternToken.getValue(String.class), options);
+        verifyToken(JsonTokenType.RIGHT_PAREN);
+        return new BsonRegularExpression(pattern, options);
     }
 
     private ObjectId visitObjectIdConstructor() {
-        verifyToken("(");
-        JsonToken valueToken = popToken();
-        if (valueToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", valueToken.getValue());
-        }
-        verifyToken(")");
-        return new ObjectId(valueToken.getValue(String.class));
+        verifyToken(JsonTokenType.LEFT_PAREN);
+        ObjectId objectId = new ObjectId(readStringFromExtendedJson());
+        verifyToken(JsonTokenType.RIGHT_PAREN);
+        return objectId;
     }
 
     private BsonTimestamp visitTimestampConstructor() {
-        verifyToken("(");
+        verifyToken(JsonTokenType.LEFT_PAREN);
         JsonToken timeToken = popToken();
         int time;
         if (timeToken.getType() != JsonTokenType.INT32) {
@@ -683,7 +760,7 @@ private BsonTimestamp visitTimestampConstructor() {
         } else {
             time = timeToken.getValue(Integer.class);
         }
-        verifyToken(",");
+        verifyToken(JsonTokenType.COMMA);
         JsonToken incrementToken = popToken();
         int increment;
         if (incrementToken.getType() != JsonTokenType.INT32) {
@@ -692,27 +769,36 @@ private BsonTimestamp visitTimestampConstructor() {
             increment = incrementToken.getValue(Integer.class);
         }
 
-        verifyToken(")");
+        verifyToken(JsonTokenType.RIGHT_PAREN);
         return new BsonTimestamp(time, increment);
     }
 
     private BsonDbPointer visitDBPointerConstructor() {
-        verifyToken("(");
-        JsonToken namespaceToken = popToken();
-        if (namespaceToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", namespaceToken.getValue());
-        }
-        verifyToken(",");
-        JsonToken idToken = popToken();
-        if (namespaceToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", idToken.getValue());
+        verifyToken(JsonTokenType.LEFT_PAREN);
+        String namespace = readStringFromExtendedJson();
+        verifyToken(JsonTokenType.COMMA);
+        ObjectId id = new ObjectId(readStringFromExtendedJson());
+        verifyToken(JsonTokenType.RIGHT_PAREN);
+        return new BsonDbPointer(namespace, id);
+    }
+
+    private int visitNumberIntConstructor() {
+        verifyToken(JsonTokenType.LEFT_PAREN);
+        JsonToken valueToken = popToken();
+        int value;
+        if (valueToken.getType() == JsonTokenType.INT32) {
+            value = valueToken.getValue(Integer.class);
+        } else if (valueToken.getType() == JsonTokenType.STRING) {
+            value = Integer.parseInt(valueToken.getValue(String.class));
+        } else {
+            throw new JsonParseException("JSON reader expected an integer or a string but found '%s'.", valueToken.getValue());
         }
-        verifyToken(")");
-        return new BsonDbPointer(namespaceToken.getValue(String.class), new ObjectId(idToken.getValue(String.class)));
+        verifyToken(JsonTokenType.RIGHT_PAREN);
+        return value;
     }
 
     private long visitNumberLongConstructor() {
-        verifyToken("(");
+        verifyToken(JsonTokenType.LEFT_PAREN);
         JsonToken valueToken = popToken();
         long value;
         if (valueToken.getType() == JsonTokenType.INT32 || valueToken.getType() == JsonTokenType.INT64) {
@@ -722,12 +808,28 @@ private long visitNumberLongConstructor() {
         } else {
             throw new JsonParseException("JSON reader expected an integer or a string but found '%s'.", valueToken.getValue());
         }
-        verifyToken(")");
+        verifyToken(JsonTokenType.RIGHT_PAREN);
+        return value;
+    }
+
+    private Decimal128 visitNumberDecimalConstructor() {
+        verifyToken(JsonTokenType.LEFT_PAREN);
+        JsonToken valueToken = popToken();
+        Decimal128 value;
+        if (valueToken.getType() == JsonTokenType.INT32 || valueToken.getType() == JsonTokenType.INT64
+                    || valueToken.getType() == JsonTokenType.DOUBLE) {
+            value = valueToken.getValue(Decimal128.class);
+        } else if (valueToken.getType() == JsonTokenType.STRING) {
+            value = Decimal128.parse(valueToken.getValue(String.class));
+        } else {
+            throw new JsonParseException("JSON reader expected a number or a string but found '%s'.", valueToken.getValue());
+        }
+        verifyToken(JsonTokenType.RIGHT_PAREN);
         return value;
     }
 
     private long visitISODateTimeConstructor() {
-        verifyToken("(");
+        verifyToken(JsonTokenType.LEFT_PAREN);
 
         JsonToken token = popToken();
         if (token.getType() == JsonTokenType.RIGHT_PAREN) {
@@ -736,7 +838,7 @@ private long visitISODateTimeConstructor() {
             throw new JsonParseException("JSON reader expected a string but found '%s'.", token.getValue());
         }
 
-        verifyToken(")");
+        verifyToken(JsonTokenType.RIGHT_PAREN);
         String[] patterns = {"yyyy-MM-dd", "yyyy-MM-dd'T'HH:mm:ssz", "yyyy-MM-dd'T'HH:mm:ss.SSSz"};
 
         SimpleDateFormat format = new SimpleDateFormat(patterns[0], Locale.ENGLISH);
@@ -762,41 +864,37 @@ private long visitISODateTimeConstructor() {
     }
 
     private BsonBinary visitHexDataConstructor() {
-        verifyToken("(");
+        verifyToken(JsonTokenType.LEFT_PAREN);
         JsonToken subTypeToken = popToken();
         if (subTypeToken.getType() != JsonTokenType.INT32) {
             throw new JsonParseException("JSON reader expected a binary subtype but found '%s'.", subTypeToken.getValue());
         }
-        verifyToken(",");
-        JsonToken bytesToken = popToken();
-        if (bytesToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", bytesToken.getValue());
-        }
-        verifyToken(")");
+        verifyToken(JsonTokenType.COMMA);
+        String hex = readStringFromExtendedJson();
+        verifyToken(JsonTokenType.RIGHT_PAREN);
 
-        String hex = bytesToken.getValue(String.class);
         if ((hex.length() & 1) != 0) {
             hex = "0" + hex;
         }
 
         for (final BsonBinarySubType subType : BsonBinarySubType.values()) {
             if (subType.getValue() == subTypeToken.getValue(Integer.class)) {
-                return new BsonBinary(subType, DatatypeConverter.parseHexBinary(hex));
+                return new BsonBinary(subType, decodeHex(hex));
             }
         }
-        return new BsonBinary(DatatypeConverter.parseHexBinary(hex));
+        return new BsonBinary(decodeHex(hex));
     }
 
     private long visitDateTimeConstructor() {
         DateFormat format = new SimpleDateFormat("EEE MMM dd yyyy HH:mm:ss z", Locale.ENGLISH);
 
-        verifyToken("(");
+        verifyToken(JsonTokenType.LEFT_PAREN);
 
         JsonToken token = popToken();
         if (token.getType() == JsonTokenType.RIGHT_PAREN) {
             return new Date().getTime();
         } else if (token.getType() == JsonTokenType.STRING) {
-            verifyToken(")");
+            verifyToken(JsonTokenType.RIGHT_PAREN);
             String s = token.getValue(String.class);
             ParsePosition pos = new ParsePosition(0);
             Date dateTime = format.parse(s, pos);
@@ -846,7 +944,7 @@ private long visitDateTimeConstructor() {
     }
 
     private String visitDateTimeConstructorWithOutNew() {
-        verifyToken("(");
+        verifyToken(JsonTokenType.LEFT_PAREN);
         JsonToken token = popToken();
         if (token.getType() != JsonTokenType.RIGHT_PAREN) {
             while (token.getType() != JsonTokenType.END_OF_FILE) {
@@ -864,196 +962,420 @@ private String visitDateTimeConstructorWithOutNew() {
         return df.format(new Date());
     }
 
-    private BsonBinary visitBinDataExtendedJson() {
-        verifyToken(":");
-        JsonToken bytesToken = popToken();
-        if (bytesToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", bytesToken.getValue());
-        }
-        verifyToken(",");
-        verifyString("$type");
-        verifyToken(":");
-        JsonToken subTypeToken = popToken();
-        if (subTypeToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", subTypeToken.getValue());
+    private BsonBinary visitBinDataExtendedJson(final String firstKey) {
+
+        Mark mark = new Mark();
+
+        try {
+            verifyToken(JsonTokenType.COLON);
+
+            if (firstKey.equals("$binary")) {
+                JsonToken nextToken = popToken();
+                if (nextToken.getType() == JsonTokenType.BEGIN_OBJECT) {
+                    JsonToken nameToken = popToken();
+                    String firstNestedKey = nameToken.getValue(String.class);
+                    byte[] data;
+                    byte type;
+                    if (firstNestedKey.equals("base64")) {
+                        verifyToken(JsonTokenType.COLON);
+                        data = Base64.decode(readStringFromExtendedJson());
+                        verifyToken(JsonTokenType.COMMA);
+                        verifyString("subType");
+                        verifyToken(JsonTokenType.COLON);
+                        type = readBinarySubtypeFromExtendedJson();
+                    } else if (firstNestedKey.equals("subType")) {
+                        verifyToken(JsonTokenType.COLON);
+                        type = readBinarySubtypeFromExtendedJson();
+                        verifyToken(JsonTokenType.COMMA);
+                        verifyString("base64");
+                        verifyToken(JsonTokenType.COLON);
+                        data = Base64.decode(readStringFromExtendedJson());
+                    } else {
+                        throw new JsonParseException("Unexpected key for $binary: " + firstNestedKey);
+                    }
+                    verifyToken(JsonTokenType.END_OBJECT);
+                    verifyToken(JsonTokenType.END_OBJECT);
+                    return new BsonBinary(type, data);
+                } else {
+                    mark.reset();
+                    return visitLegacyBinaryExtendedJson(firstKey);
+                }
+            } else {
+                mark.reset();
+                return visitLegacyBinaryExtendedJson(firstKey);
+            }
+        } finally {
+            mark.discard();
         }
-        verifyToken("}");
+    }
 
-        byte subType = (byte) Integer.parseInt(subTypeToken.getValue(String.class), 16);
+    private BsonBinary visitLegacyBinaryExtendedJson(final String firstKey) {
 
-        for (final BsonBinarySubType st : BsonBinarySubType.values()) {
-            if (st.getValue() == subType) {
-                return new BsonBinary(st, DatatypeConverter.parseBase64Binary(bytesToken.getValue(String.class)));
+        Mark mark = new Mark();
+
+        try {
+            verifyToken(JsonTokenType.COLON);
+
+            byte[] data;
+            byte type;
+
+            if (firstKey.equals("$binary")) {
+                data = Base64.decode(readStringFromExtendedJson());
+                verifyToken(JsonTokenType.COMMA);
+                verifyString("$type");
+                verifyToken(JsonTokenType.COLON);
+                type = readBinarySubtypeFromExtendedJson();
+            } else {
+                type = readBinarySubtypeFromExtendedJson();
+                verifyToken(JsonTokenType.COMMA);
+                verifyString("$binary");
+                verifyToken(JsonTokenType.COLON);
+                data = Base64.decode(readStringFromExtendedJson());
             }
+            verifyToken(JsonTokenType.END_OBJECT);
+
+            return new BsonBinary(type, data);
+        } catch (JsonParseException e) {
+            mark.reset();
+            return null;
+        } catch (NumberFormatException e) {
+            mark.reset();
+            return null;
+        } finally {
+            mark.discard();
+        }
+    }
+
+    private byte readBinarySubtypeFromExtendedJson() {
+        JsonToken subTypeToken = popToken();
+        if (subTypeToken.getType() != JsonTokenType.STRING && subTypeToken.getType() != JsonTokenType.INT32) {
+            throw new JsonParseException("JSON reader expected a string or number but found '%s'.", subTypeToken.getValue());
         }
 
-        return new BsonBinary(DatatypeConverter.parseBase64Binary(bytesToken.getValue(String.class)));
+        if (subTypeToken.getType() == JsonTokenType.STRING) {
+            return (byte) Integer.parseInt(subTypeToken.getValue(String.class), 16);
+        } else {
+            return subTypeToken.getValue(Integer.class).byteValue();
+        }
     }
 
     private long visitDateTimeExtendedJson() {
-        verifyToken(":");
+        long value;
+        verifyToken(JsonTokenType.COLON);
         JsonToken valueToken = popToken();
-        verifyToken("}");
-
-        if (valueToken.getType() == JsonTokenType.INT32 || valueToken.getType() == JsonTokenType.INT64) {
-            return valueToken.getValue(Long.class);
-        } else if (valueToken.getType() == JsonTokenType.STRING) {
-            String dateTimeString = valueToken.getValue(String.class);
-            try {
-                return DatatypeConverter.parseDateTime(dateTimeString).getTimeInMillis();
-            } catch (IllegalArgumentException e) {
-                throw new JsonParseException("JSON reader expected an ISO-8601 date time string but found '%s'.", dateTimeString);
+        if (valueToken.getType() == JsonTokenType.BEGIN_OBJECT) {
+            JsonToken nameToken = popToken();
+            String name = nameToken.getValue(String.class);
+            if (!name.equals("$numberLong")) {
+                throw new JsonParseException(String.format("JSON reader expected $numberLong within $date, but found %s", name));
             }
+            value = visitNumberLongExtendedJson();
+            verifyToken(JsonTokenType.END_OBJECT);
         } else {
-            throw new JsonParseException("JSON reader expected an integer or string but found '%s'.", valueToken.getValue());
+            if (valueToken.getType() == JsonTokenType.INT32 || valueToken.getType() == JsonTokenType.INT64) {
+                value = valueToken.getValue(Long.class);
+            } else if (valueToken.getType() == JsonTokenType.STRING) {
+                String dateTimeString = valueToken.getValue(String.class);
+                try {
+                    value = DateTimeFormatter.parse(dateTimeString);
+                } catch (IllegalArgumentException e) {
+                    throw new JsonParseException("Failed to parse string as a date", e);
+                }
+            } else {
+                throw new JsonParseException("JSON reader expected an integer or string but found '%s'.", valueToken.getValue());
+            }
+            verifyToken(JsonTokenType.END_OBJECT);
         }
+        return value;
     }
 
     private MaxKey visitMaxKeyExtendedJson() {
-        verifyToken(":");
-        verifyToken(1);
-        verifyToken("}");
+        verifyToken(JsonTokenType.COLON);
+        verifyToken(JsonTokenType.INT32, 1);
+        verifyToken(JsonTokenType.END_OBJECT);
         return new MaxKey();
     }
 
     private MinKey visitMinKeyExtendedJson() {
-        verifyToken(":");
-        verifyToken(1);
-        verifyToken("}");
+        verifyToken(JsonTokenType.COLON);
+        verifyToken(JsonTokenType.INT32, 1);
+        verifyToken(JsonTokenType.END_OBJECT);
         return new MinKey();
     }
 
     private ObjectId visitObjectIdExtendedJson() {
-        verifyToken(":");
-        JsonToken valueToken = popToken();
-        if (valueToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", valueToken.getValue());
+        verifyToken(JsonTokenType.COLON);
+        ObjectId objectId = new ObjectId(readStringFromExtendedJson());
+        verifyToken(JsonTokenType.END_OBJECT);
+        return objectId;
+    }
+
+    private BsonRegularExpression visitNewRegularExpressionExtendedJson() {
+        verifyToken(JsonTokenType.COLON);
+        verifyToken(JsonTokenType.BEGIN_OBJECT);
+
+        String pattern;
+        String options = "";
+
+        String firstKey = readStringFromExtendedJson();
+        if (firstKey.equals("pattern")) {
+            verifyToken(JsonTokenType.COLON);
+            pattern = readStringFromExtendedJson();
+            verifyToken(JsonTokenType.COMMA);
+            verifyString("options");
+            verifyToken(JsonTokenType.COLON);
+            options = readStringFromExtendedJson();
+        } else if (firstKey.equals("options")) {
+            verifyToken(JsonTokenType.COLON);
+            options = readStringFromExtendedJson();
+            verifyToken(JsonTokenType.COMMA);
+            verifyString("pattern");
+            verifyToken(JsonTokenType.COLON);
+            pattern = readStringFromExtendedJson();
+        } else {
+            throw new JsonParseException("Expected 't' and 'i' fields in $timestamp document but found " + firstKey);
         }
-        verifyToken("}");
-        return new ObjectId(valueToken.getValue(String.class));
+
+        verifyToken(JsonTokenType.END_OBJECT);
+        verifyToken(JsonTokenType.END_OBJECT);
+        return new BsonRegularExpression(pattern, options);
     }
 
-    private BsonRegularExpression visitRegularExpressionExtendedJson() {
-        verifyToken(":");
+    private BsonRegularExpression visitRegularExpressionExtendedJson(final String firstKey) {
+        Mark extendedJsonMark = new Mark();
+
+        try {
+            verifyToken(JsonTokenType.COLON);
+
+            String pattern;
+            String options = "";
+            if (firstKey.equals("$regex")) {
+                pattern = readStringFromExtendedJson();
+                verifyToken(JsonTokenType.COMMA);
+                verifyString("$options");
+                verifyToken(JsonTokenType.COLON);
+                options = readStringFromExtendedJson();
+            } else {
+                options = readStringFromExtendedJson();
+                verifyToken(JsonTokenType.COMMA);
+                verifyString("$regex");
+                verifyToken(JsonTokenType.COLON);
+                pattern = readStringFromExtendedJson();
+            }
+            verifyToken(JsonTokenType.END_OBJECT);
+            return new BsonRegularExpression(pattern, options);
+        } catch (JsonParseException e) {
+            extendedJsonMark.reset();
+            return null;
+        } finally {
+            extendedJsonMark.discard();
+        }
+    }
+
+    private String readStringFromExtendedJson() {
         JsonToken patternToken = popToken();
         if (patternToken.getType() != JsonTokenType.STRING) {
             throw new JsonParseException("JSON reader expected a string but found '%s'.", patternToken.getValue());
         }
-        String options = "";
-        JsonToken commaToken = popToken();
-        if (commaToken.getType() == JsonTokenType.COMMA) {
-            verifyString("$options");
-            verifyToken(":");
-            JsonToken optionsToken = popToken();
-            if (optionsToken.getType() != JsonTokenType.STRING) {
-                throw new JsonParseException("JSON reader expected a string but found '%s'.", optionsToken.getValue());
-            }
-            options = optionsToken.getValue(String.class);
-        } else {
-            pushToken(commaToken);
-        }
-        verifyToken("}");
-        return new BsonRegularExpression(patternToken.getValue(String.class), options);
+        return patternToken.getValue(String.class);
     }
 
+
     private String visitSymbolExtendedJson() {
-        verifyToken(":");
-        JsonToken nameToken = popToken();
-        if (nameToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", nameToken.getValue());
-        }
-        verifyToken("}");
-        return nameToken.getValue(String.class);
+        verifyToken(JsonTokenType.COLON);
+        String symbol = readStringFromExtendedJson();
+        verifyToken(JsonTokenType.END_OBJECT);
+        return symbol;
     }
 
     private BsonTimestamp visitTimestampExtendedJson() {
-        verifyToken(":");
-        verifyToken("{");
-        verifyString("t");
-        verifyToken(":");
+        verifyToken(JsonTokenType.COLON);
+        verifyToken(JsonTokenType.BEGIN_OBJECT);
 
-        JsonToken timeToken = popToken();
         int time;
-        if (timeToken.getType() == JsonTokenType.INT32) {
-            time = timeToken.getValue(Integer.class);
-        } else {
-            throw new JsonParseException("JSON reader expected an integer but found '%s'.", timeToken.getValue());
-        }
-        verifyToken(",");
-        verifyString("i");
-        verifyToken(":");
-        JsonToken incrementToken = popToken();
         int increment;
-        if (incrementToken.getType() == JsonTokenType.INT32) {
-            increment = incrementToken.getValue(Integer.class);
+
+        String firstKey = readStringFromExtendedJson();
+        if (firstKey.equals("t")) {
+            verifyToken(JsonTokenType.COLON);
+            time = readIntFromExtendedJson();
+            verifyToken(JsonTokenType.COMMA);
+            verifyString("i");
+            verifyToken(JsonTokenType.COLON);
+            increment = readIntFromExtendedJson();
+        } else if (firstKey.equals("i")) {
+            verifyToken(JsonTokenType.COLON);
+            increment = readIntFromExtendedJson();
+            verifyToken(JsonTokenType.COMMA);
+            verifyString("t");
+            verifyToken(JsonTokenType.COLON);
+            time = readIntFromExtendedJson();
         } else {
-            throw new JsonParseException("JSON reader expected an integer but found '%s'.", timeToken.getValue());
+            throw new JsonParseException("Expected 't' and 'i' fields in $timestamp document but found " + firstKey);
         }
 
-        verifyToken("}");
-        verifyToken("}");
+        verifyToken(JsonTokenType.END_OBJECT);
+        verifyToken(JsonTokenType.END_OBJECT);
         return new BsonTimestamp(time, increment);
     }
 
-    private void visitJavaScriptExtendedJson() {
-        verifyToken(":");
-        JsonToken codeToken = popToken();
-        if (codeToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", codeToken.getValue());
+    private int readIntFromExtendedJson() {
+        JsonToken nextToken = popToken();
+        int value;
+        if (nextToken.getType() == JsonTokenType.INT32) {
+            value = nextToken.getValue(Integer.class);
+        } else if (nextToken.getType() == JsonTokenType.INT64) {
+            value = nextToken.getValue(Long.class).intValue();
+        } else {
+            throw new JsonParseException("JSON reader expected an integer but found '%s'.", nextToken.getValue());
         }
+        return value;
+    }
+
+    private void visitJavaScriptExtendedJson() {
+        verifyToken(JsonTokenType.COLON);
+        String code = readStringFromExtendedJson();
         JsonToken nextToken = popToken();
         switch (nextToken.getType()) {
             case COMMA:
                 verifyString("$scope");
-                verifyToken(":");
+                verifyToken(JsonTokenType.COLON);
                 setState(State.VALUE);
-                currentValue = codeToken.getValue();
+                currentValue = code;
                 setCurrentBsonType(BsonType.JAVASCRIPT_WITH_SCOPE);
                 setContext(new Context(getContext(), BsonContextType.SCOPE_DOCUMENT));
                 break;
             case END_OBJECT:
-                currentValue = codeToken.getValue();
+                currentValue = code;
                 setCurrentBsonType(BsonType.JAVASCRIPT);
                 break;
             default:
-                throw new JsonParseException("JSON reader expected ',' or '}' but found '%s'.", codeToken.getValue());
+                throw new JsonParseException("JSON reader expected ',' or '}' but found '%s'.", nextToken);
         }
     }
 
     private BsonUndefined visitUndefinedExtendedJson() {
-        verifyToken(":");
-        JsonToken nameToken = popToken();
-        if (!nameToken.getValue(String.class).equals("true")) {
+        verifyToken(JsonTokenType.COLON);
+        JsonToken valueToken = popToken();
+        if (!valueToken.getValue(String.class).equals("true")) {
             throw new JsonParseException("JSON reader requires $undefined to have the value of true but found '%s'.",
-                                         nameToken.getValue());
+                                                valueToken.getValue());
         }
-        verifyToken("}");
+        verifyToken(JsonTokenType.END_OBJECT);
         return new BsonUndefined();
     }
 
     private Long visitNumberLongExtendedJson() {
-        verifyToken(":");
-        JsonToken nameToken = popToken();
-        if (nameToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", nameToken.getValue());
+        verifyToken(JsonTokenType.COLON);
+        Long value;
+        String longAsString = readStringFromExtendedJson();
+        try {
+            value = Long.valueOf(longAsString);
+        } catch (NumberFormatException e) {
+            throw new JsonParseException(format("Exception converting value '%s' to type %s", longAsString, Long.class.getName()), e);
+        }
+        verifyToken(JsonTokenType.END_OBJECT);
+        return value;
+    }
+
+    private Integer visitNumberIntExtendedJson() {
+        verifyToken(JsonTokenType.COLON);
+        Integer value;
+        String intAsString = readStringFromExtendedJson();
+        try {
+            value = Integer.valueOf(intAsString);
+        } catch (NumberFormatException e) {
+            throw new JsonParseException(format("Exception converting value '%s' to type %s", intAsString, Integer.class.getName()), e);
+        }
+        verifyToken(JsonTokenType.END_OBJECT);
+        return value;
+    }
+
+    private Double visitNumberDoubleExtendedJson() {
+        verifyToken(JsonTokenType.COLON);
+        Double value;
+        String doubleAsString = readStringFromExtendedJson();
+        try {
+            value = Double.valueOf(doubleAsString);
+        } catch (NumberFormatException e) {
+            throw new JsonParseException(format("Exception converting value '%s' to type %s", doubleAsString, Double.class.getName()), e);
+        }
+        verifyToken(JsonTokenType.END_OBJECT);
+        return value;
+    }
+
+    private Decimal128 visitNumberDecimalExtendedJson() {
+        verifyToken(JsonTokenType.COLON);
+        Decimal128 value;
+        String decimal128AsString = readStringFromExtendedJson();
+        try {
+            value = Decimal128.parse(decimal128AsString);
+        } catch (NumberFormatException e) {
+            throw new JsonParseException(format("Exception converting value '%s' to type %s", decimal128AsString,
+                    Decimal128.class.getName()), e);
+        }
+        verifyToken(JsonTokenType.END_OBJECT);
+        return value;
+    }
+
+    private BsonDbPointer visitDbPointerExtendedJson() {
+        verifyToken(JsonTokenType.COLON);
+        verifyToken(JsonTokenType.BEGIN_OBJECT);
+
+        String ref;
+        ObjectId oid;
+
+        String firstKey = readStringFromExtendedJson();
+        if (firstKey.equals("$ref")) {
+            verifyToken(JsonTokenType.COLON);
+            ref = readStringFromExtendedJson();
+            verifyToken(JsonTokenType.COMMA);
+            verifyString("$id");
+            oid = readDbPointerIdFromExtendedJson();
+            verifyToken(JsonTokenType.END_OBJECT);
+        } else if (firstKey.equals("$id")) {
+            oid = readDbPointerIdFromExtendedJson();
+            verifyToken(JsonTokenType.COMMA);
+            verifyString("$ref");
+            verifyToken(JsonTokenType.COLON);
+            ref = readStringFromExtendedJson();
+
+        } else {
+            throw new JsonParseException("Expected $ref and $id fields in $dbPointer document but found " + firstKey);
         }
-        verifyToken("}");
-        return nameToken.getValue(Long.class);
+        verifyToken(JsonTokenType.END_OBJECT);
+        return new BsonDbPointer(ref, oid);
+    }
+
+    private ObjectId readDbPointerIdFromExtendedJson() {
+        ObjectId oid;
+        verifyToken(JsonTokenType.COLON);
+        verifyToken(JsonTokenType.BEGIN_OBJECT);
+        verifyToken(JsonTokenType.STRING, "$oid");
+        oid = visitObjectIdExtendedJson();
+        return oid;
     }
 
+    @Deprecated
     @Override
     public void mark() {
         if (mark != null) {
-             throw new BSONException("A mark already exists; it needs to be reset before creating a new one");
-         }
+            throw new BSONException("A mark already exists; it needs to be reset before creating a new one");
+        }
         mark = new Mark();
     }
 
+    @Override
+    public BsonReaderMark getMark() {
+        return new Mark();
+    }
+
+    @Deprecated
     @Override
     public void reset() {
         if (mark == null) {
-             throw new BSONException("trying to reset a mark before creating it");
-         }
+            throw new BSONException("trying to reset a mark before creating it");
+        }
         mark.reset();
         mark = null;
     }
@@ -1062,25 +1384,30 @@ public void reset() {
     protected Context getContext() {
         return (Context) super.getContext();
     }
+
     protected class Mark extends AbstractBsonReader.Mark {
-        private JsonToken pushedToken;
-        private Object currentValue;
-        private int position;
+        private final JsonToken pushedToken;
+        private final Object currentValue;
+        private final int markPos;
 
         protected Mark() {
             super();
             pushedToken = JsonReader.this.pushedToken;
             currentValue = JsonReader.this.currentValue;
-            position = JsonReader.this.scanner.getBufferPosition();
+            markPos = JsonReader.this.scanner.mark();
         }
 
-        protected void reset() {
+        public void reset() {
             super.reset();
             JsonReader.this.pushedToken = pushedToken;
             JsonReader.this.currentValue = currentValue;
-            JsonReader.this.scanner.setBufferPosition(position);
+            JsonReader.this.scanner.reset(markPos);
             JsonReader.this.setContext(new Context(getParentContext(), getContextType()));
         }
+
+        public void discard() {
+            JsonReader.this.scanner.discard(markPos);
+        }
     }
 
 
@@ -1097,5 +1424,25 @@ protected BsonContextType getContextType() {
             return super.getContextType();
         }
     }
+
+    private static byte[] decodeHex(final String hex) {
+        if (hex.length() % 2 != 0) {
+            throw new IllegalArgumentException("A hex string must contain an even number of characters: " + hex);
+        }
+
+        byte[] out = new byte[hex.length() / 2];
+
+        for (int i = 0; i < hex.length(); i += 2) {
+            int high = Character.digit(hex.charAt(i), 16);
+            int low = Character.digit(hex.charAt(i + 1), 16);
+            if (high == -1 || low == -1) {
+                throw new IllegalArgumentException("A hex string can only contain the characters 0-9, A-F, a-f: " + hex);
+            }
+
+            out[i / 2] = (byte) (high * 16 + low);
+        }
+
+        return out;
+    }
 }
 
diff --git a/bson/src/main/org/bson/json/JsonScanner.java b/bson/src/main/org/bson/json/JsonScanner.java
index c5fad81770c..e2935a2a1d4 100644
--- a/bson/src/main/org/bson/json/JsonScanner.java
+++ b/bson/src/main/org/bson/json/JsonScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 
 import org.bson.BsonRegularExpression;
 
+import java.io.Reader;
+
 /**
  * Parses the string representation of a JSON object into a set of {@link JsonToken}-derived objects.
  *
@@ -27,36 +29,28 @@ class JsonScanner {
 
     private final JsonBuffer buffer;
 
-    /**
-     * @param newPosition the new position of the cursor position in the buffer
-     */
-    public void setBufferPosition(final int newPosition) {
-        buffer.setPosition(newPosition);
+    JsonScanner(final JsonBuffer buffer) {
+        this.buffer = buffer;
     }
 
-    /**
-     * @return the current location of the cursor in the buffer
-     */
-    public int getBufferPosition() {
-        return buffer.getPosition();
+    JsonScanner(final String json) {
+        this(new JsonStringBuffer(json));
     }
 
-    /**
-     * Constructs a a new {@code JSONScanner} that produces values scanned from specified {@code JSONBuffer}.
-     *
-     * @param buffer A buffer to be scanned.
-     */
-    public JsonScanner(final JsonBuffer buffer) {
-        this.buffer = buffer;
+    JsonScanner(final Reader reader) {
+        this(new JsonStreamBuffer(reader));
     }
 
-    /**
-     * Constructs a a new {@code JSONScanner} that produces values scanned from the specified {@code String}.
-     *
-     * @param json A string representation of a JSON to be scanned.
-     */
-    public JsonScanner(final String json) {
-        this(new JsonBuffer(json));
+    public void reset(final int markPos) {
+        buffer.reset(markPos);
+    }
+
+    public int mark() {
+        return buffer.mark();
+    }
+
+    public void discard(final int markPos) {
+        buffer.discard(markPos);
     }
 
     /**
@@ -102,7 +96,7 @@ public JsonToken nextToken() {
                 if (c == '-' || Character.isDigit(c)) {
                     return scanNumber((char) c);
                 } else if (c == '$' || c == '_' || Character.isLetter(c)) {
-                    return scanUnquotedString();
+                    return scanUnquotedString((char) c);
                 } else {
                     int position = buffer.getPosition();
                     buffer.unread(c);
@@ -125,9 +119,8 @@ public JsonToken nextToken() {
      */
     private JsonToken scanRegularExpression() {
 
-        int start = buffer.getPosition() - 1;
-        int options = -1;
-
+        StringBuilder patternBuilder = new StringBuilder();
+        StringBuilder optionsBuilder = new StringBuilder();
         RegularExpressionState state = RegularExpressionState.IN_PATTERN;
         while (true) {
             int c = buffer.read();
@@ -139,7 +132,6 @@ private JsonToken scanRegularExpression() {
                             break;
                         case '/':
                             state = RegularExpressionState.IN_OPTIONS;
-                            options = buffer.getPosition();
                             break;
                         case '\\':
                             state = RegularExpressionState.IN_ESCAPE_SEQUENCE;
@@ -183,13 +175,22 @@ private JsonToken scanRegularExpression() {
             switch (state) {
                 case DONE:
                     buffer.unread(c);
-                    int end = buffer.getPosition();
                     BsonRegularExpression regex
-                        = new BsonRegularExpression(buffer.substring(start + 1, options - 1), buffer.substring(options, end));
+                        = new BsonRegularExpression(patternBuilder.toString(), optionsBuilder.toString());
                     return new JsonToken(JsonTokenType.REGULAR_EXPRESSION, regex);
                 case INVALID:
                     throw new JsonParseException("Invalid JSON regular expression. Position: %d.", buffer.getPosition());
                 default:
+                    switch (state) {
+                        case IN_OPTIONS:
+                            if (c != '/') {
+                                optionsBuilder.append((char) c);
+                            }
+                            break;
+                        default:
+                            patternBuilder.append((char) c);
+                            break;
+                    }
             }
         }
     }
@@ -199,14 +200,16 @@ private JsonToken scanRegularExpression() {
      *
      * @return The string token.
      */
-    private JsonToken scanUnquotedString() {
-        int start = buffer.getPosition() - 1;
+    private JsonToken scanUnquotedString(final char firstChar) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(firstChar);
         int c = buffer.read();
         while (c == '$' || c == '_' || Character.isLetterOrDigit(c)) {
+            sb.append((char) c);
             c = buffer.read();
         }
         buffer.unread(c);
-        String lexeme = buffer.substring(start, buffer.getPosition());
+        String lexeme = sb.toString();
         return new JsonToken(JsonTokenType.UNQUOTED_STRING, lexeme);
     }
 
@@ -232,8 +235,8 @@ private JsonToken scanUnquotedString() {
     private JsonToken scanNumber(final char firstChar) {
 
         int c = firstChar;
-
-        int start = buffer.getPosition() - 1;
+        StringBuilder sb = new StringBuilder();
+        sb.append(firstChar);
 
         NumberState state;
 
@@ -408,6 +411,7 @@ private JsonToken scanNumber(final char firstChar) {
                             sawMinusInfinity = false;
                             break;
                         }
+                        sb.append((char) c);
                         c = buffer.read();
                     }
                     if (sawMinusInfinity) {
@@ -440,7 +444,7 @@ private JsonToken scanNumber(final char firstChar) {
                     throw new JsonParseException("Invalid JSON number");
                 case DONE:
                     buffer.unread(c);
-                    String lexeme = buffer.substring(start, buffer.getPosition());
+                    String lexeme = sb.toString();
                     if (type == JsonTokenType.DOUBLE) {
                         return new JsonToken(JsonTokenType.DOUBLE, Double.parseDouble(lexeme));
                     } else {
@@ -452,6 +456,7 @@ private JsonToken scanNumber(final char firstChar) {
                         }
                     }
                 default:
+                    sb.append((char) c);
             }
         }
 
diff --git a/bson/src/main/org/bson/json/JsonStreamBuffer.java b/bson/src/main/org/bson/json/JsonStreamBuffer.java
new file mode 100644
index 00000000000..036a14dded2
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonStreamBuffer.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+class JsonStreamBuffer implements JsonBuffer {
+
+    private final Reader reader;
+    private final List<Integer> markedPositions = new ArrayList<Integer>();
+    private final int initialBufferSize;
+    private int position;
+    private int lastChar;
+    private boolean reuseLastChar;
+    private boolean eof;
+    private char[] buffer;
+    private int bufferStartPos;
+    private int bufferCount;
+
+    JsonStreamBuffer(final Reader reader) {
+        this(reader, 16);
+    }
+
+    JsonStreamBuffer(final Reader reader, final int initialBufferSize) {
+        this.initialBufferSize = initialBufferSize;
+        this.reader = reader;
+        resetBuffer();
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public int read() {
+        if (eof) {
+            throw new JsonParseException("Trying to read past EOF.");
+        }
+
+        // if we just unread, we need to use the last character read since it may not be in the
+        // buffer
+        if (reuseLastChar) {
+            reuseLastChar = false;
+            int reusedChar = lastChar;
+            lastChar = -1;
+            position++;
+            return reusedChar;
+        }
+
+        // use the buffer until we catch up to the stream position
+        if (position - bufferStartPos < bufferCount) {
+            int currChar = buffer[position - bufferStartPos];
+            lastChar = currChar;
+            position++;
+            return currChar;
+        }
+
+        if (markedPositions.isEmpty()) {
+            resetBuffer();
+        }
+
+        // otherwise, try and read from the stream
+        try {
+            int nextChar = reader.read();
+            if (nextChar != -1) {
+                lastChar = nextChar;
+                addToBuffer((char) nextChar);
+            }
+            position++;
+            if (nextChar == -1) {
+                eof = true;
+            }
+            return nextChar;
+
+        } catch (final IOException e) {
+            throw new JsonParseException(e);
+        }
+    }
+
+    private void resetBuffer() {
+        bufferStartPos = -1;
+        bufferCount = 0;
+        buffer = new char[initialBufferSize];
+    }
+
+    public void unread(final int c) {
+        eof = false;
+        if (c != -1 && lastChar == c) {
+            reuseLastChar = true;
+            position--;
+        }
+    }
+
+    public int mark() {
+        if (bufferCount == 0) {   // Why not markedPositions.isEmpty()?
+            bufferStartPos = position;
+        }
+        if (!markedPositions.contains(position)) {
+            markedPositions.add(position);
+        }
+        return position;
+    }
+
+    public void reset(final int markPos) {
+        if (markPos > position) {
+            throw new IllegalStateException("mark cannot reset ahead of position, only back");
+        }
+        int idx = markedPositions.indexOf(markPos);
+        if (idx == -1) {
+            throw new IllegalArgumentException("mark invalidated");
+        }
+        if (markPos != position) {
+            reuseLastChar = false;
+        }
+        markedPositions.subList(idx, markedPositions.size()).clear();
+        position = markPos;
+    }
+
+    public void discard(final int markPos) {
+        int idx = markedPositions.indexOf(markPos);
+        if (idx == -1) {
+            return;
+        }
+        markedPositions.subList(idx, markedPositions.size()).clear();
+    }
+
+    private void addToBuffer(final char curChar) {
+        // if the lowest mark is ahead of our position, we can safely add it to our buffer
+        if (!markedPositions.isEmpty()) {
+            if (bufferCount == buffer.length) {
+                char[] newBuffer = new char[buffer.length * 2];
+                System.arraycopy(buffer, 0, newBuffer, 0, bufferCount);
+                buffer = newBuffer;
+            }
+            buffer[bufferCount] = curChar;
+            bufferCount++;
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonStringBuffer.java b/bson/src/main/org/bson/json/JsonStringBuffer.java
new file mode 100644
index 00000000000..8a250bb2eb4
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonStringBuffer.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class JsonStringBuffer implements JsonBuffer {
+
+    private final String buffer;
+    private int position;
+    private boolean eof;
+
+    JsonStringBuffer(final String buffer) {
+        this.buffer = buffer;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public int read() {
+        if (eof) {
+            throw new JsonParseException("Trying to read past EOF.");
+        } else if (position >= buffer.length()) {
+            eof = true;
+            return -1;
+        } else {
+            return (int) buffer.charAt(position++);
+        }
+    }
+
+    public void unread(final int c) {
+        eof = false;
+        if (c != -1 && buffer.charAt(position - 1) == c) {
+            position--;
+        }
+    }
+
+    public int mark() {
+        return position;
+    }
+
+    public void reset(final int markPos) {
+        if (markPos > position) {
+            throw new IllegalStateException("mark cannot reset ahead of position, only back");
+        }
+        position = markPos;
+    }
+
+    public void discard(final int markPos) {
+    }
+
+}
diff --git a/bson/src/main/org/bson/json/JsonStringConverter.java b/bson/src/main/org/bson/json/JsonStringConverter.java
new file mode 100644
index 00000000000..6a3d3456913
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonStringConverter.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class JsonStringConverter implements Converter<String> {
+    @Override
+    public void convert(final String value, final StrictJsonWriter writer) {
+        writer.writeString(value);
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonSymbolConverter.java b/bson/src/main/org/bson/json/JsonSymbolConverter.java
new file mode 100644
index 00000000000..51b65e7fd31
--- /dev/null
+++ b/bson/src/main/org/bson/json/JsonSymbolConverter.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class JsonSymbolConverter implements Converter<String> {
+    @Override
+    public void convert(final String value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeString("$symbol", value);
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/JsonToken.java b/bson/src/main/org/bson/json/JsonToken.java
index 2b2144e88e2..68c579f2369 100644
--- a/bson/src/main/org/bson/json/JsonToken.java
+++ b/bson/src/main/org/bson/json/JsonToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,11 @@
 
 package org.bson.json;
 
+import org.bson.BsonDouble;
+import org.bson.types.Decimal128;
+
+import static java.lang.String.format;
+
 /**
  * A JSON token.
  */
@@ -24,7 +29,7 @@ class JsonToken {
     private final Object value;
     private final JsonTokenType type;
 
-    public JsonToken(final JsonTokenType type, final Object value) {
+    JsonToken(final JsonTokenType type, final Object value) {
         this.value = value;
         this.type = type;
     }
@@ -34,18 +39,36 @@ public Object getValue() {
     }
 
     public <T> T getValue(final Class<T> clazz) {
-        if (Long.class == clazz) {
-            if (value instanceof Integer) {
-                return clazz.cast(((Integer) value).longValue());
-            } else if (value instanceof String) {
-                return clazz.cast(Long.valueOf((String) value));
+        try {
+            if (Long.class == clazz) {
+                if (value instanceof Integer) {
+                    return clazz.cast(((Integer) value).longValue());
+                } else if (value instanceof String) {
+                    return clazz.cast(Long.valueOf((String) value));
+                }
+            } else if (Integer.class == clazz) {
+                if (value instanceof String) {
+                    return clazz.cast(Integer.valueOf((String) value));
+                }
+            } else if (Double.class == clazz) {
+                if (value instanceof String) {
+                    return clazz.cast(Double.valueOf((String) value));
+                }
+            } else if (Decimal128.class == clazz) {
+                if (value instanceof Integer) {
+                    return clazz.cast(new Decimal128((Integer) value));
+                } else if (value instanceof Long) {
+                    return clazz.cast(new Decimal128((Long) value));
+                } else if (value instanceof Double) {
+                    return clazz.cast(new BsonDouble((Double) value).decimal128Value());
+                } else if (value instanceof String) {
+                    return clazz.cast(Decimal128.parse((String) value));
+                }
             }
-        }
 
-        try {
             return clazz.cast(value);
-        } catch (ClassCastException e) {
-            throw new IllegalStateException(e);
+        } catch (Exception e) {
+            throw new JsonParseException(format("Exception converting value '%s' to type %s", value, clazz.getName()), e);
         }
     }
 
diff --git a/bson/src/main/org/bson/json/JsonTokenType.java b/bson/src/main/org/bson/json/JsonTokenType.java
index d9ede9e1442..9b2e88d5341 100644
--- a/bson/src/main/org/bson/json/JsonTokenType.java
+++ b/bson/src/main/org/bson/json/JsonTokenType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/json/JsonWriter.java b/bson/src/main/org/bson/json/JsonWriter.java
index 74eae980d0d..f0feabb3e5f 100644
--- a/bson/src/main/org/bson/json/JsonWriter.java
+++ b/bson/src/main/org/bson/json/JsonWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,22 +17,15 @@
 package org.bson.json;
 
 import org.bson.AbstractBsonWriter;
-import org.bson.BSONException;
 import org.bson.BsonBinary;
 import org.bson.BsonContextType;
 import org.bson.BsonDbPointer;
 import org.bson.BsonRegularExpression;
 import org.bson.BsonTimestamp;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 
-import java.io.IOException;
 import java.io.Writer;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-import static java.lang.String.format;
-import static javax.xml.bind.DatatypeConverter.printBase64Binary;
 
 /**
  * A {@code BsonWriter} implementation that outputs a JSON representation of BSON.
@@ -40,14 +33,15 @@
  * @since 3.0
  */
 public class JsonWriter extends AbstractBsonWriter {
-    private final Writer writer;
     private final JsonWriterSettings settings;
+    private final StrictCharacterStreamJsonWriter strictJsonWriter;
 
     /**
      * Creates a new instance which uses {@code writer} to write JSON to.
      *
      * @param writer the writer to write JSON to.
      */
+    @SuppressWarnings("deprecation")
     public JsonWriter(final Writer writer) {
         this(writer, new JsonWriterSettings());
     }
@@ -61,8 +55,13 @@ public JsonWriter(final Writer writer) {
     public JsonWriter(final Writer writer, final JsonWriterSettings settings) {
         super(settings);
         this.settings = settings;
-        this.writer = writer;
-        setContext(new Context(null, BsonContextType.TOP_LEVEL, ""));
+        setContext(new Context(null, BsonContextType.TOP_LEVEL));
+        strictJsonWriter = new StrictCharacterStreamJsonWriter(writer, StrictCharacterStreamJsonWriterSettings.builder()
+                                                                               .indent(settings.isIndent())
+                                                                               .newLineCharacters(settings.getNewLineCharacters())
+                                                                               .indentCharacters(settings.getIndentCharacters())
+                                                                               .maxLength(settings.getMaxLength())
+                                                                               .build());
     }
 
     /**
@@ -71,7 +70,7 @@ public JsonWriter(final Writer writer, final JsonWriterSettings settings) {
      * @return the writer
      */
     public Writer getWriter() {
-        return writer;
+        return strictJsonWriter.getWriter();
     }
 
     @Override
@@ -79,189 +78,110 @@ protected Context getContext() {
         return (Context) super.getContext();
     }
 
+    @Override
+    protected void doWriteName(final String name) {
+        strictJsonWriter.writeName(name);
+    }
+
     @Override
     protected void doWriteStartDocument() {
-        try {
-            if (getState() == State.VALUE || getState() == State.SCOPE_DOCUMENT) {
-                writeNameHelper(getName());
-            }
-            writer.write("{");
-
-            BsonContextType contextType = (getState() == State.SCOPE_DOCUMENT) ? BsonContextType.SCOPE_DOCUMENT : BsonContextType.DOCUMENT;
-            setContext(new Context(getContext(), contextType, settings.getIndentCharacters()));
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        strictJsonWriter.writeStartObject();
+
+        BsonContextType contextType = (getState() == State.SCOPE_DOCUMENT) ? BsonContextType.SCOPE_DOCUMENT : BsonContextType.DOCUMENT;
+        setContext(new Context(getContext(), contextType));
     }
 
     @Override
     protected void doWriteEndDocument() {
-        try {
-            if (settings.isIndent() && getContext().hasElements) {
-                writer.write(settings.getNewLineCharacters());
-                if (getContext().getParentContext() != null) {
-                    writer.write(getContext().getParentContext().indentation);
-                }
-                writer.write("}");
-            } else {
-                writer.write(" }");
-            }
-
-            if (getContext().getContextType() == BsonContextType.SCOPE_DOCUMENT) {
-                setContext(getContext().getParentContext());
-                writeEndDocument();
-            } else {
-                setContext(getContext().getParentContext());
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
+        strictJsonWriter.writeEndObject();
+        if (getContext().getContextType() == BsonContextType.SCOPE_DOCUMENT) {
+            setContext(getContext().getParentContext());
+            writeEndDocument();
+        } else {
+            setContext(getContext().getParentContext());
         }
     }
 
     @Override
     protected void doWriteStartArray() {
-        try {
-            writeNameHelper(getName());
-            writer.write("[");
-            setContext(new Context(getContext(), BsonContextType.ARRAY, settings.getIndentCharacters()));
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        strictJsonWriter.writeStartArray();
+        setContext(new Context(getContext(), BsonContextType.ARRAY));
     }
 
     @Override
     protected void doWriteEndArray() {
-        try {
-            writer.write("]");
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        strictJsonWriter.writeEndArray();
         setContext(getContext().getParentContext());
     }
 
 
     @Override
     protected void doWriteBinaryData(final BsonBinary binary) {
-        try {
-            switch (settings.getOutputMode()) {
-                case SHELL:
-                    writeNameHelper(getName());
-                    writer.write(format("new BinData(%s, \"%s\")", Integer.toString(binary.getType() & 0xFF),
-                                        printBase64Binary(binary.getData())));
-
-                    break;
-                default:
-                    writeStartDocument();
-                    writeString("$binary", printBase64Binary(binary.getData()));
-                    writeString("$type", Integer.toHexString(binary.getType() & 0xFF));
-                    writeEndDocument();
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getBinaryConverter().convert(binary, strictJsonWriter);
     }
 
     @Override
     public void doWriteBoolean(final boolean value) {
-        try {
-            writeNameHelper(getName());
-            writer.write(value ? "true" : "false");
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getBooleanConverter().convert(value, strictJsonWriter);
     }
 
     @Override
     protected void doWriteDateTime(final long value) {
-        try {
-            switch (settings.getOutputMode()) {
-                case STRICT:
-                    writeStartDocument();
-                    writeNameHelper("$date");
-                    writer.write(Long.toString(value));
-                    writeEndDocument();
-                    break;
-                case SHELL:
-                    writeNameHelper(getName());
-
-                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd\'T\'HH:mm:ss.SSS\'Z\'");
-                    dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-                    if (value >= -59014396800000L && value <= 253399536000000L) {
-                        writer.write(format("ISODate(\"%s\")", dateFormat.format(new Date(value))));
-                    } else {
-                        writer.write(format("new Date(%d)", value));
-                    }
-                    break;
-                default:
-                    throw new BSONException("Unexpected JSONMode.");
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getDateTimeConverter().convert(value, strictJsonWriter);
     }
 
     @Override
     protected void doWriteDBPointer(final BsonDbPointer value) {
-        writeStartDocument();
-        writeString("$ref", value.getNamespace());
-        writeObjectId("$id", value.getId());
-        writeEndDocument();
+        if (settings.getOutputMode() == JsonMode.EXTENDED) {
+            new Converter<BsonDbPointer>() {
+                @Override
+                public void convert(final BsonDbPointer value1, final StrictJsonWriter writer) {
+                    writer.writeStartObject();
+                    writer.writeStartObject("$dbPointer");
+                    writer.writeString("$ref", value1.getNamespace());
+                    writer.writeName("$id");
+                    doWriteObjectId(value1.getId());
+                    writer.writeEndObject();
+                    writer.writeEndObject();
+                }
+            }.convert(value, strictJsonWriter);
+        } else {
+            new Converter<BsonDbPointer>() {
+                @Override
+                public void convert(final BsonDbPointer value1, final StrictJsonWriter writer) {
+                    writer.writeStartObject();
+                    writer.writeString("$ref", value1.getNamespace());
+                    writer.writeName("$id");
+                    doWriteObjectId(value1.getId());
+                    writer.writeEndObject();
+                }
+            }.convert(value, strictJsonWriter);
+        }
     }
 
     @Override
     protected void doWriteDouble(final double value) {
-        try {
-            writeNameHelper(getName());
-            writer.write(Double.toString(value));
-            setState(getNextState());
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getDoubleConverter().convert(value, strictJsonWriter);
     }
 
     @Override
     protected void doWriteInt32(final int value) {
-        try {
-            writeNameHelper(getName());
-            writer.write(Integer.toString(value));
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getInt32Converter().convert(value, strictJsonWriter);
     }
 
     @Override
     protected void doWriteInt64(final long value) {
-        try {
-            switch (settings.getOutputMode()) {
-                case STRICT:
-                    writeStartDocument();
-                    writeNameHelper("$numberLong");
-                    writer.write(format("\"%d\"", value));
-                    writeEndDocument();
-                    break;
-                case SHELL:
-                    writeNameHelper(getName());
-                    if (value >= Integer.MIN_VALUE && value <= Integer.MAX_VALUE) {
-                        writer.write(format("NumberLong(%d)", value));
-                    } else {
-                        writer.write(format("NumberLong(\"%d\")", value));
-                    }
-                    break;
-                default:
-                    writeNameHelper(getName());
-                    writer.write(Long.toString(value));
-                    break;
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getInt64Converter().convert(value, strictJsonWriter);
+    }
+
+    @Override
+    protected void doWriteDecimal128(final Decimal128 value) {
+        settings.getDecimal128Converter().convert(value, strictJsonWriter);
     }
 
     @Override
     protected void doWriteJavaScript(final String code) {
-        writeStartDocument();
-        writeString("$code", code);
-        writeEndDocument();
+        settings.getJavaScriptConverter().convert(code, strictJsonWriter);
     }
 
     @Override
@@ -273,242 +193,68 @@ protected void doWriteJavaScriptWithScope(final String code) {
 
     @Override
     protected void doWriteMaxKey() {
-        writeStartDocument();
-        writeInt32("$maxKey", 1);
-        writeEndDocument();
+        settings.getMaxKeyConverter().convert(null, strictJsonWriter);
     }
 
     @Override
     protected void doWriteMinKey() {
-        writeStartDocument();
-        writeInt32("$minKey", 1);
-        writeEndDocument();
+        settings.getMinKeyConverter().convert(null, strictJsonWriter);
     }
 
     @Override
     public void doWriteNull() {
-        try {
-            writeNameHelper(getName());
-            writer.write("null");
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getNullConverter().convert(null, strictJsonWriter);
     }
 
     @Override
     public void doWriteObjectId(final ObjectId objectId) {
-        try {
-            switch (settings.getOutputMode()) {
-                case STRICT:
-                    writeStartDocument();
-                    writeString("$oid", objectId.toString());
-                    writeEndDocument();
-                    break;
-                case SHELL:
-                    writeNameHelper(getName());
-                    writer.write(format("ObjectId(\"%s\")", objectId.toString()));
-                    break;
-                default:
-                    throw new BSONException("Unknown output mode" + settings.getOutputMode());
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getObjectIdConverter().convert(objectId, strictJsonWriter);
     }
 
     @Override
     public void doWriteRegularExpression(final BsonRegularExpression regularExpression) {
-        try {
-            switch (settings.getOutputMode()) {
-                case STRICT:
-                    writeStartDocument();
-                    writeString("$regex", regularExpression.getPattern());
-                    writeString("$options", regularExpression.getOptions());
-                    writeEndDocument();
-                    break;
-                case SHELL:
-                    writeNameHelper(getName());
-                    writer.write("/");
-                    String escaped = (regularExpression.getPattern().equals("")) ? "(?:)" : regularExpression.getPattern()
-                                                                                                             .replace("/", "\\/");
-                    writer.write(escaped);
-                    writer.write("/");
-                    writer.write(regularExpression.getOptions());
-                    break;
-                default:
-                    throw new BSONException("Unknown output mode" + settings.getOutputMode());
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getRegularExpressionConverter().convert(regularExpression, strictJsonWriter);
     }
 
     @Override
     public void doWriteString(final String value) {
-        try {
-            writeNameHelper(getName());
-            writeStringHelper(value);
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getStringConverter().convert(value, strictJsonWriter);
     }
 
     @Override
     public void doWriteSymbol(final String value) {
-        writeStartDocument();
-        writeString("$symbol", value);
-        writeEndDocument();
+        settings.getSymbolConverter().convert(value, strictJsonWriter);
     }
 
     @Override
     public void doWriteTimestamp(final BsonTimestamp value) {
-        try {
-            switch (settings.getOutputMode()) {
-                case STRICT:
-                    writeStartDocument();
-                    writeStartDocument("$timestamp");
-                    writeInt32("t", value.getTime());
-                    writeInt32("i", value.getInc());
-                    writeEndDocument();
-                    writeEndDocument();
-                    break;
-                case SHELL:
-                    writeNameHelper(getName());
-                    writer.write(format("Timestamp(%d, %d)", value.getTime(), value.getInc()));
-                    break;
-                default:
-                    throw new BSONException("Unknown output mode" + settings.getOutputMode());
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getTimestampConverter().convert(value, strictJsonWriter);
     }
 
     @Override
     public void doWriteUndefined() {
-        try {
-            switch (settings.getOutputMode()) {
-                case STRICT:
-                    writeStartDocument();
-                    writeBoolean("$undefined", true);
-                    writeEndDocument();
-                    break;
-                case SHELL:
-                    writeNameHelper(getName());
-                    writer.write("undefined");
-                    break;
-                default:
-                    throw new BSONException("Unknown output mode" + settings.getOutputMode());
-            }
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        settings.getUndefinedConverter().convert(null, strictJsonWriter);
     }
 
     @Override
     public void flush() {
-        try {
-            writer.flush();
-        } catch (IOException e) {
-            throwBSONException(e);
-        }
+        strictJsonWriter.flush();
     }
 
-    private void writeNameHelper(final String name) throws IOException {
-        switch (getContext().getContextType()) {
-            case ARRAY:
-                // don't write Array element names in JSON
-                if (getContext().hasElements) {
-                    writer.write(", ");
-                }
-                break;
-            case DOCUMENT:
-            case SCOPE_DOCUMENT:
-                if (getContext().hasElements) {
-                    writer.write(",");
-                }
-                if (settings.isIndent()) {
-                    writer.write(settings.getNewLineCharacters());
-                    writer.write(getContext().indentation);
-                } else {
-                    writer.write(" ");
-                }
-                writeStringHelper(name);
-                writer.write(" : ");
-                break;
-            case TOP_LEVEL:
-                break;
-            default:
-                throw new BSONException("Invalid contextType.");
-        }
-
-        getContext().hasElements = true;
-    }
-
-    private void writeStringHelper(final String str) throws IOException {
-        writer.write('"');
-        for (final char c : str.toCharArray()) {
-            switch (c) {
-                case '"':
-                    writer.write("\\\"");
-                    break;
-                case '\\':
-                    writer.write("\\\\");
-                    break;
-                case '\b':
-                    writer.write("\\b");
-                    break;
-                case '\f':
-                    writer.write("\\f");
-                    break;
-                case '\n':
-                    writer.write("\\n");
-                    break;
-                case '\r':
-                    writer.write("\\r");
-                    break;
-                case '\t':
-                    writer.write("\\t");
-                    break;
-                default:
-                    switch (Character.getType(c)) {
-                        case Character.UPPERCASE_LETTER:
-                        case Character.LOWERCASE_LETTER:
-                        case Character.TITLECASE_LETTER:
-                        case Character.OTHER_LETTER:
-                        case Character.DECIMAL_DIGIT_NUMBER:
-                        case Character.LETTER_NUMBER:
-                        case Character.OTHER_NUMBER:
-                        case Character.SPACE_SEPARATOR:
-                        case Character.CONNECTOR_PUNCTUATION:
-                        case Character.DASH_PUNCTUATION:
-                        case Character.START_PUNCTUATION:
-                        case Character.END_PUNCTUATION:
-                        case Character.INITIAL_QUOTE_PUNCTUATION:
-                        case Character.FINAL_QUOTE_PUNCTUATION:
-                        case Character.OTHER_PUNCTUATION:
-                        case Character.MATH_SYMBOL:
-                        case Character.CURRENCY_SYMBOL:
-                        case Character.MODIFIER_SYMBOL:
-                        case Character.OTHER_SYMBOL:
-                            writer.write(c);
-                            break;
-                        default:
-                            writer.write("\\u");
-                            writer.write(Integer.toHexString((c & 0xf000) >> 12));
-                            writer.write(Integer.toHexString((c & 0x0f00) >> 8));
-                            writer.write(Integer.toHexString((c & 0x00f0) >> 4));
-                            writer.write(Integer.toHexString(c & 0x000f));
-                            break;
-                    }
-                    break;
-            }
-        }
-        writer.write('"');
+    /**
+     * Return true if the output has been truncated due to exceeding the length specified in {@link JsonWriterSettings#maxLength}.
+     *
+     * @return true if the output has been truncated
+     * @since 3.7
+     * @see JsonWriterSettings#maxLength
+     */
+    public boolean isTruncated() {
+        return strictJsonWriter.isTruncated();
     }
 
-    private void throwBSONException(final IOException e) {
-        throw new BSONException("Wrapping IOException", e);
+    @Override
+    protected boolean abortPipe() {
+        return strictJsonWriter.isTruncated();
     }
 
     /**
@@ -516,8 +262,6 @@ private void throwBSONException(final IOException e) {
      * settings for the indentation level and whether there are any child elements at this level.
      */
     public class Context extends AbstractBsonWriter.Context {
-        private final String indentation;
-        private boolean hasElements;
 
         /**
          * Creates a new context.
@@ -526,9 +270,19 @@ public class Context extends AbstractBsonWriter.Context {
          * @param contextType   the type of this context
          * @param indentChars   the String to use for indentation at this level.
          */
+        @Deprecated
         public Context(final Context parentContext, final BsonContextType contextType, final String indentChars) {
+            this(parentContext, contextType);
+        }
+
+        /**
+         * Creates a new context.
+         *
+         * @param parentContext the parent context that can be used for going back up to the parent level
+         * @param contextType   the type of this context
+         */
+        public Context(final Context parentContext, final BsonContextType contextType) {
             super(parentContext, contextType);
-            this.indentation = (parentContext == null) ? indentChars : parentContext.indentation + indentChars;
         }
 
         @Override
diff --git a/bson/src/main/org/bson/json/JsonWriterSettings.java b/bson/src/main/org/bson/json/JsonWriterSettings.java
index a7f71b7d7ac..1b3aea26977 100644
--- a/bson/src/main/org/bson/json/JsonWriterSettings.java
+++ b/bson/src/main/org/bson/json/JsonWriterSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,19 @@
 
 package org.bson.json;
 
+import org.bson.BsonBinary;
+import org.bson.BsonMaxKey;
+import org.bson.BsonMinKey;
+import org.bson.BsonNull;
+import org.bson.BsonRegularExpression;
+import org.bson.BsonTimestamp;
+import org.bson.BsonUndefined;
 import org.bson.BsonWriterSettings;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+
+import static org.bson.assertions.Assertions.isTrueArgument;
+import static org.bson.assertions.Assertions.notNull;
 
 /**
  * Settings to control the behavior of a {@code JSONWriter} instance.
@@ -25,34 +37,116 @@
  * @since 3.0
  */
 public class JsonWriterSettings extends BsonWriterSettings {
+
+    private static final JsonNullConverter JSON_NULL_CONVERTER = new JsonNullConverter();
+    private static final JsonStringConverter JSON_STRING_CONVERTER = new JsonStringConverter();
+    private static final JsonBooleanConverter JSON_BOOLEAN_CONVERTER = new JsonBooleanConverter();
+    private static final JsonDoubleConverter JSON_DOUBLE_CONVERTER = new JsonDoubleConverter();
+    private static final ExtendedJsonDoubleConverter EXTENDED_JSON_DOUBLE_CONVERTER = new ExtendedJsonDoubleConverter();
+    private static final RelaxedExtendedJsonDoubleConverter RELAXED_EXTENDED_JSON_DOUBLE_CONVERTER =
+            new RelaxedExtendedJsonDoubleConverter();
+    private static final JsonInt32Converter JSON_INT_32_CONVERTER = new JsonInt32Converter();
+    private static final ExtendedJsonInt32Converter EXTENDED_JSON_INT_32_CONVERTER = new ExtendedJsonInt32Converter();
+    private static final JsonSymbolConverter JSON_SYMBOL_CONVERTER = new JsonSymbolConverter();
+    private static final ExtendedJsonMinKeyConverter EXTENDED_JSON_MIN_KEY_CONVERTER = new ExtendedJsonMinKeyConverter();
+    private static final ShellMinKeyConverter SHELL_MIN_KEY_CONVERTER = new ShellMinKeyConverter();
+    private static final ExtendedJsonMaxKeyConverter EXTENDED_JSON_MAX_KEY_CONVERTER = new ExtendedJsonMaxKeyConverter();
+    private static final ShellMaxKeyConverter SHELL_MAX_KEY_CONVERTER = new ShellMaxKeyConverter();
+    private static final ExtendedJsonUndefinedConverter EXTENDED_JSON_UNDEFINED_CONVERTER = new ExtendedJsonUndefinedConverter();
+    private static final ShellUndefinedConverter SHELL_UNDEFINED_CONVERTER = new ShellUndefinedConverter();
+    private static final LegacyExtendedJsonDateTimeConverter LEGACY_EXTENDED_JSON_DATE_TIME_CONVERTER =
+            new LegacyExtendedJsonDateTimeConverter();
+    private static final ExtendedJsonDateTimeConverter EXTENDED_JSON_DATE_TIME_CONVERTER = new ExtendedJsonDateTimeConverter();
+    private static final RelaxedExtendedJsonDateTimeConverter RELAXED_EXTENDED_JSON_DATE_TIME_CONVERTER =
+            new RelaxedExtendedJsonDateTimeConverter();
+    private static final ShellDateTimeConverter SHELL_DATE_TIME_CONVERTER = new ShellDateTimeConverter();
+    private static final ExtendedJsonBinaryConverter EXTENDED_JSON_BINARY_CONVERTER = new ExtendedJsonBinaryConverter();
+    private static final LegacyExtendedJsonBinaryConverter LEGACY_EXTENDED_JSON_BINARY_CONVERTER = new LegacyExtendedJsonBinaryConverter();
+    private static final ShellBinaryConverter SHELL_BINARY_CONVERTER = new ShellBinaryConverter();
+    private static final ExtendedJsonInt64Converter EXTENDED_JSON_INT_64_CONVERTER = new ExtendedJsonInt64Converter();
+    private static final RelaxedExtendedJsonInt64Converter RELAXED_JSON_INT_64_CONVERTER = new RelaxedExtendedJsonInt64Converter();
+    private static final ShellInt64Converter SHELL_INT_64_CONVERTER = new ShellInt64Converter();
+    private static final ExtendedJsonDecimal128Converter EXTENDED_JSON_DECIMAL_128_CONVERTER = new ExtendedJsonDecimal128Converter();
+    private static final ShellDecimal128Converter SHELL_DECIMAL_128_CONVERTER = new ShellDecimal128Converter();
+    private static final ExtendedJsonObjectIdConverter EXTENDED_JSON_OBJECT_ID_CONVERTER = new ExtendedJsonObjectIdConverter();
+    private static final ShellObjectIdConverter SHELL_OBJECT_ID_CONVERTER = new ShellObjectIdConverter();
+    private static final ExtendedJsonTimestampConverter EXTENDED_JSON_TIMESTAMP_CONVERTER = new ExtendedJsonTimestampConverter();
+    private static final ShellTimestampConverter SHELL_TIMESTAMP_CONVERTER = new ShellTimestampConverter();
+    private static final ExtendedJsonRegularExpressionConverter EXTENDED_JSON_REGULAR_EXPRESSION_CONVERTER =
+            new ExtendedJsonRegularExpressionConverter();
+    private static final LegacyExtendedJsonRegularExpressionConverter LEGACY_EXTENDED_JSON_REGULAR_EXPRESSION_CONVERTER =
+            new LegacyExtendedJsonRegularExpressionConverter();
+    private static final ShellRegularExpressionConverter SHELL_REGULAR_EXPRESSION_CONVERTER = new ShellRegularExpressionConverter();
+
     private final boolean indent;
     private final String newLineCharacters;
     private final String indentCharacters;
+    private final int maxLength;
     private final JsonMode outputMode;
+    private final Converter<BsonNull> nullConverter;
+    private final Converter<String> stringConverter;
+    private final Converter<Long> dateTimeConverter;
+    private final Converter<BsonBinary> binaryConverter;
+    private final Converter<Boolean> booleanConverter;
+    private final Converter<Double> doubleConverter;
+    private final Converter<Integer> int32Converter;
+    private final Converter<Long> int64Converter;
+    private final Converter<Decimal128> decimal128Converter;
+    private final Converter<ObjectId> objectIdConverter;
+    private final Converter<BsonTimestamp> timestampConverter;
+    private final Converter<BsonRegularExpression> regularExpressionConverter;
+    private final Converter<String> symbolConverter;
+    private final Converter<BsonUndefined> undefinedConverter;
+    private final Converter<BsonMinKey> minKeyConverter;
+    private final Converter<BsonMaxKey> maxKeyConverter;
+    private final Converter<String> javaScriptConverter;
+
+    /**
+     * Create a builder for JsonWriterSettings, which are immutable.
+     * <p>
+     *     Defaults to {@link JsonMode#RELAXED}
+     * </p>
+     *
+     * @return a Builder instance
+     * @since 3.5
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
 
     /**
      * Creates a new instance with default values for all properties.
+     * <p>
+     *     Defaults to {@link JsonMode#STRICT}
+     * </p>
+     *
+     * @deprecated Prefer {@link #builder()}, but note that the default output mode is different for that method
      */
+    @Deprecated
     public JsonWriterSettings() {
-        this(JsonMode.STRICT, false, null, null);
+        this(builder().outputMode(JsonMode.STRICT));
     }
 
     /**
      * Creates a new instance with the given output mode and default values for all other properties.
      *
      * @param outputMode the output mode
+     * @deprecated Use the {@link Builder} instead
      */
+    @Deprecated
     public JsonWriterSettings(final JsonMode outputMode) {
-        this(outputMode, false, null, null);
+        this(builder().outputMode(outputMode));
     }
 
     /**
      * Creates a new instance with indent mode enabled, and the default value for all other properties.
      *
      * @param indent whether indent mode is enabled
+     * @deprecated Use the {@link Builder} instead
      */
+    @Deprecated
     public JsonWriterSettings(final boolean indent) {
-        this(JsonMode.STRICT, indent, indent ? "  " : null, null);
+        this(builder().indent(indent));
     }
 
     /**
@@ -60,9 +154,11 @@ public JsonWriterSettings(final boolean indent) {
      *
      * @param outputMode the output mode
      * @param indent     whether indent mode is enabled
+     * @deprecated Use the {@link Builder} instead
      */
+    @Deprecated
     public JsonWriterSettings(final JsonMode outputMode, final boolean indent) {
-        this(outputMode, indent, indent ? "  " : null, null);
+        this(builder().outputMode(outputMode).indent(indent));
     }
 
     /**
@@ -71,9 +167,11 @@ public JsonWriterSettings(final JsonMode outputMode, final boolean indent) {
      *
      * @param outputMode       the output mode
      * @param indentCharacters the indent characters
+     * @deprecated Use the {@link Builder} instead
      */
+    @Deprecated
     public JsonWriterSettings(final JsonMode outputMode, final String indentCharacters) {
-        this(outputMode, true, indentCharacters, null);
+        this(builder().outputMode(outputMode).indent(true).indentCharacters(indentCharacters));
     }
 
     /**
@@ -82,33 +180,159 @@ public JsonWriterSettings(final JsonMode outputMode, final String indentCharacte
      * @param outputMode        the output mode
      * @param indentCharacters  the indent characters
      * @param newLineCharacters the new line character(s) to use
+     * @deprecated Use the {@link Builder} instead
      */
+    @Deprecated
     public JsonWriterSettings(final JsonMode outputMode, final String indentCharacters, final String newLineCharacters) {
-        this(outputMode, true, indentCharacters, newLineCharacters);
+        this(builder().outputMode(outputMode).indent(true).indentCharacters(indentCharacters).newLineCharacters(newLineCharacters));
     }
 
-    private JsonWriterSettings(final JsonMode outputMode, final boolean indent, final String indentCharacters,
-                               final String newLineCharacters) {
-        if (indent) {
-            if (indentCharacters == null) {
-                throw new IllegalArgumentException("indent characters can not be null if indent is enabled");
-            }
+    @SuppressWarnings("deprecation")
+    private JsonWriterSettings(final Builder builder) {
+        indent = builder.indent;
+        newLineCharacters = builder.newLineCharacters != null ? builder.newLineCharacters : System.getProperty("line.separator");
+        indentCharacters = builder.indentCharacters;
+        outputMode = builder.outputMode;
+        maxLength = builder.maxLength;
+
+        if (builder.nullConverter != null) {
+            nullConverter = builder.nullConverter;
+        } else {
+            nullConverter = JSON_NULL_CONVERTER;
+        }
+
+        if (builder.stringConverter != null) {
+            stringConverter = builder.stringConverter;
+        } else {
+            stringConverter = JSON_STRING_CONVERTER;
+        }
+
+        if (builder.booleanConverter != null) {
+            booleanConverter = builder.booleanConverter;
+        } else {
+            booleanConverter = JSON_BOOLEAN_CONVERTER;
+        }
+
+        if (builder.doubleConverter != null) {
+            doubleConverter = builder.doubleConverter;
+        } else if (outputMode == JsonMode.EXTENDED) {
+            doubleConverter = EXTENDED_JSON_DOUBLE_CONVERTER;
+        } else if (outputMode == JsonMode.RELAXED) {
+            doubleConverter = RELAXED_EXTENDED_JSON_DOUBLE_CONVERTER;
+        } else {
+            doubleConverter = JSON_DOUBLE_CONVERTER;
+        }
+
+        if (builder.int32Converter != null) {
+            int32Converter = builder.int32Converter;
+        } else if (outputMode == JsonMode.EXTENDED) {
+            int32Converter = EXTENDED_JSON_INT_32_CONVERTER;
+        }
+        else {
+            int32Converter = JSON_INT_32_CONVERTER;
+        }
+
+        if (builder.symbolConverter != null) {
+            symbolConverter = builder.symbolConverter;
+        } else {
+            symbolConverter = JSON_SYMBOL_CONVERTER;
+        }
+
+        if (builder.javaScriptConverter != null) {
+            javaScriptConverter = builder.javaScriptConverter;
+        } else {
+            javaScriptConverter = new JsonJavaScriptConverter();
+        }
+
+        if (builder.minKeyConverter != null) {
+            minKeyConverter = builder.minKeyConverter;
+        } else if (outputMode == JsonMode.STRICT || outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            minKeyConverter = EXTENDED_JSON_MIN_KEY_CONVERTER;
+        } else {
+            minKeyConverter = SHELL_MIN_KEY_CONVERTER;
+        }
+
+        if (builder.maxKeyConverter != null) {
+            maxKeyConverter = builder.maxKeyConverter;
+        } else if (outputMode == JsonMode.STRICT || outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            maxKeyConverter = EXTENDED_JSON_MAX_KEY_CONVERTER;
+        } else {
+            maxKeyConverter = SHELL_MAX_KEY_CONVERTER;
+        }
+
+        if (builder.undefinedConverter != null) {
+            undefinedConverter = builder.undefinedConverter;
+        } else if (outputMode == JsonMode.STRICT || outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            undefinedConverter = EXTENDED_JSON_UNDEFINED_CONVERTER;
+        } else {
+            undefinedConverter = SHELL_UNDEFINED_CONVERTER;
+        }
+
+        if (builder.dateTimeConverter != null) {
+            dateTimeConverter = builder.dateTimeConverter;
+        } else if (outputMode == JsonMode.STRICT) {
+            dateTimeConverter = LEGACY_EXTENDED_JSON_DATE_TIME_CONVERTER;
+        } else if (outputMode == JsonMode.EXTENDED) {
+            dateTimeConverter = EXTENDED_JSON_DATE_TIME_CONVERTER;
+        } else if (outputMode == JsonMode.RELAXED) {
+            dateTimeConverter = RELAXED_EXTENDED_JSON_DATE_TIME_CONVERTER;
+        } else {
+            dateTimeConverter = SHELL_DATE_TIME_CONVERTER;
+        }
+
+        if (builder.binaryConverter != null) {
+            binaryConverter = builder.binaryConverter;
+        } else if (outputMode == JsonMode.STRICT) {
+            binaryConverter = LEGACY_EXTENDED_JSON_BINARY_CONVERTER;
+        } else if (outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            binaryConverter = EXTENDED_JSON_BINARY_CONVERTER;
+        } else {
+            binaryConverter = SHELL_BINARY_CONVERTER;
+        }
+
+        if (builder.int64Converter != null) {
+            int64Converter = builder.int64Converter;
+        } else if (outputMode == JsonMode.STRICT || outputMode == JsonMode.EXTENDED) {
+            int64Converter = EXTENDED_JSON_INT_64_CONVERTER;
+        } else if (outputMode == JsonMode.RELAXED) {
+            int64Converter = RELAXED_JSON_INT_64_CONVERTER;
+        } else {
+            int64Converter = SHELL_INT_64_CONVERTER;
+        }
+
+        if (builder.decimal128Converter != null) {
+            decimal128Converter = builder.decimal128Converter;
+        } else if (outputMode == JsonMode.STRICT || outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            decimal128Converter = EXTENDED_JSON_DECIMAL_128_CONVERTER;
+        } else {
+            decimal128Converter = SHELL_DECIMAL_128_CONVERTER;
+        }
+
+        if (builder.objectIdConverter != null) {
+            objectIdConverter = builder.objectIdConverter;
+        } else if (outputMode == JsonMode.STRICT || outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            objectIdConverter = EXTENDED_JSON_OBJECT_ID_CONVERTER;
         } else {
-            if (newLineCharacters != null) {
-                throw new IllegalArgumentException("new line characters can not be null if indent is disabled.");
-            }
-            if (indentCharacters != null) {
-                throw new IllegalArgumentException("indent characters can not be null if indent is disabled.");
-            }
+            objectIdConverter = SHELL_OBJECT_ID_CONVERTER;
         }
-        if (outputMode == null) {
-            throw new IllegalArgumentException("output mode can not be null");
+
+        if (builder.timestampConverter != null) {
+            timestampConverter = builder.timestampConverter;
+        } else if (outputMode == JsonMode.STRICT || outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            timestampConverter = EXTENDED_JSON_TIMESTAMP_CONVERTER;
+        } else {
+            timestampConverter = SHELL_TIMESTAMP_CONVERTER;
         }
 
-        this.indent = indent;
-        this.newLineCharacters = newLineCharacters != null ? newLineCharacters : System.getProperty("line.separator");
-        this.indentCharacters = indentCharacters;
-        this.outputMode = outputMode;
+        if (builder.regularExpressionConverter != null) {
+            regularExpressionConverter = builder.regularExpressionConverter;
+        } else if (outputMode == JsonMode.EXTENDED || outputMode == JsonMode.RELAXED) {
+            regularExpressionConverter = EXTENDED_JSON_REGULAR_EXPRESSION_CONVERTER;
+        } else if (outputMode == JsonMode.STRICT) {
+            regularExpressionConverter = LEGACY_EXTENDED_JSON_REGULAR_EXPRESSION_CONVERTER;
+        } else {
+            regularExpressionConverter = SHELL_REGULAR_EXPRESSION_CONVERTER;
+        }
     }
 
     /**
@@ -133,7 +357,7 @@ public String getNewLineCharacters() {
     /**
      * The indent characters to use if indent mode is enabled.  The default value is two spaces.
      *
-     * @return the indent characters to use.
+     * @return the indent character(s) to use.
      */
     public String getIndentCharacters() {
         return indentCharacters;
@@ -147,4 +371,475 @@ public String getIndentCharacters() {
     public JsonMode getOutputMode() {
         return outputMode;
     }
+
+    /**
+     * The maximum length of the JSON string.  The string will be truncated at this length.
+     *
+     * @return the maximum length of the JSON string
+     * @since 3.7
+     */
+    public int getMaxLength() {
+        return maxLength;
+    }
+
+    /**
+     * A converter from BSON Null values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<BsonNull> getNullConverter() {
+        return nullConverter;
+    }
+
+    /**
+     * A converter from BSON String values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<String> getStringConverter() {
+        return stringConverter;
+    }
+
+    /**
+     * A converter from BSON Binary values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<BsonBinary> getBinaryConverter() {
+        return binaryConverter;
+    }
+
+    /**
+     * A converter from BSON Boolean values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<Boolean> getBooleanConverter() {
+        return booleanConverter;
+    }
+
+    /**
+     * A converter from BSON DateTime values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<Long> getDateTimeConverter() {
+        return dateTimeConverter;
+    }
+
+    /**
+     * A converter from BSON Double values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<Double> getDoubleConverter() {
+        return doubleConverter;
+    }
+
+    /**
+     * A converter from BSON Int32 values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<Integer> getInt32Converter() {
+        return int32Converter;
+    }
+
+    /**
+     * A converter from BSON Int64 values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<Long> getInt64Converter() {
+        return int64Converter;
+    }
+
+    /**
+     * A converter from BSON Decimal128 values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<Decimal128> getDecimal128Converter() {
+        return decimal128Converter;
+    }
+
+    /**
+     * A converter from BSON ObjectId values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<ObjectId> getObjectIdConverter() {
+        return objectIdConverter;
+    }
+
+    /**
+     * A converter from BSON RegularExpression values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<BsonRegularExpression> getRegularExpressionConverter() {
+        return regularExpressionConverter;
+    }
+
+    /**
+     * A converter from BSON Timestamp values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<BsonTimestamp> getTimestampConverter() {
+        return timestampConverter;
+    }
+
+    /**
+     * A converter from BSON Symbol values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<String> getSymbolConverter() {
+        return symbolConverter;
+    }
+
+    /**
+     * A converter from BSON MinKey values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<BsonMinKey> getMinKeyConverter() {
+        return minKeyConverter;
+    }
+
+    /**
+     * A converter from BSON MaxKey values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<BsonMaxKey> getMaxKeyConverter() {
+        return maxKeyConverter;
+    }
+
+    /**
+     * A converter from BSON Undefined values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<BsonUndefined> getUndefinedConverter() {
+        return undefinedConverter;
+    }
+
+    /**
+     * A converter from BSON JavaScript values to JSON.
+     *
+     * @return this
+     * @since 3.5
+     */
+    public Converter<String> getJavaScriptConverter() {
+        return javaScriptConverter;
+    }
+
+    /**
+     * A builder for JsonWriterSettings
+     *
+     * @since 3.5
+     */
+    @SuppressWarnings("deprecation")
+    public static final class Builder {
+        private boolean indent;
+        private String newLineCharacters = System.getProperty("line.separator");
+        private String indentCharacters = "  ";
+        private JsonMode outputMode = JsonMode.RELAXED;
+        private int maxLength;
+        private Converter<BsonNull> nullConverter;
+        private Converter<String> stringConverter;
+        private Converter<Long> dateTimeConverter;
+        private Converter<BsonBinary> binaryConverter;
+        private Converter<Boolean> booleanConverter;
+        private Converter<Double> doubleConverter;
+        private Converter<Integer> int32Converter;
+        private Converter<Long> int64Converter;
+        private Converter<Decimal128> decimal128Converter;
+        private Converter<ObjectId> objectIdConverter;
+        private Converter<BsonTimestamp> timestampConverter;
+        private Converter<BsonRegularExpression> regularExpressionConverter;
+        private Converter<String> symbolConverter;
+        private Converter<BsonUndefined> undefinedConverter;
+        private Converter<BsonMinKey> minKeyConverter;
+        private Converter<BsonMaxKey> maxKeyConverter;
+        private Converter<String> javaScriptConverter;
+
+        /**
+         * Build a JsonWriterSettings instance.
+         *
+         * @return a JsonWriterSettings instance
+         */
+        public JsonWriterSettings build() {
+            return new JsonWriterSettings(this);
+        }
+
+        /**
+         * Sets whether indentation is enabled, which defaults to false.
+         *
+         * @param indent whether indentation is enabled
+         * @return this
+         */
+        public Builder indent(final boolean indent) {
+            this.indent = indent;
+            return this;
+        }
+
+        /**
+         * Sets the new line character string to use when indentation is enabled, which defaults to
+         * {@code System.getProperty("line.separator")}.
+         *
+         * @param newLineCharacters the non-null new line character string
+         * @return this
+         */
+        public Builder newLineCharacters(final String newLineCharacters) {
+            notNull("newLineCharacters", newLineCharacters);
+            this.newLineCharacters = newLineCharacters;
+            return this;
+        }
+
+        /**
+         * Sets the indent character string to use when indentation is enabled, which defaults to two spaces.
+         *
+         * @param indentCharacters the non-null indent character string
+         * @return this
+         */
+        public Builder indentCharacters(final String indentCharacters) {
+            notNull("indentCharacters", indentCharacters);
+            this.indentCharacters = indentCharacters;
+            return this;
+        }
+
+        /**
+         * Sets the output mode, which defaults to {@link JsonMode#RELAXED}.
+         *
+         * @param outputMode the non-null output mode
+         * @return this
+         */
+        public Builder outputMode(final JsonMode outputMode) {
+            notNull("outputMode", outputMode);
+            this.outputMode = outputMode;
+            return this;
+        }
+
+        /**
+         * Sets the maximum length of the JSON string.  The string will be truncated at this length.
+         *
+         * @param maxLength the maximum length, which must be &gt;= 0 where 0 indicate no maximum length
+         * @return the maximum length of the JSON string
+         * @since 3.7
+         */
+        public Builder maxLength(final int maxLength) {
+            isTrueArgument("maxLength >= 0", maxLength >= 0);
+            this.maxLength = maxLength;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Null values to JSON.
+         *
+         * @param nullConverter the converter
+         * @return this
+         */
+        public Builder nullConverter(final Converter<BsonNull> nullConverter) {
+            this.nullConverter = nullConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON String values to JSON.
+         *
+         * @param stringConverter the converter
+         * @return this
+         */
+        public Builder stringConverter(final Converter<String> stringConverter) {
+            this.stringConverter = stringConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON DateTime values to JSON.
+         *
+         * @param dateTimeConverter the converter
+         * @return this
+         */
+        public Builder dateTimeConverter(final Converter<Long> dateTimeConverter) {
+            this.dateTimeConverter = dateTimeConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Binary values to JSON.
+         *
+         * @param binaryConverter the converter
+         * @return this
+         */
+        public Builder binaryConverter(final Converter<BsonBinary> binaryConverter) {
+            this.binaryConverter = binaryConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Boolean values to JSON.
+         *
+         * @param booleanConverter the converter
+         * @return this
+         */
+        public Builder booleanConverter(final Converter<Boolean> booleanConverter) {
+            this.booleanConverter = booleanConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Double values to JSON.
+         *
+         * @param doubleConverter the converter
+         * @return this
+         */
+        public Builder doubleConverter(final Converter<Double> doubleConverter) {
+            this.doubleConverter = doubleConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Int32 values to JSON.
+         *
+         * @param int32Converter the converter
+         * @return this
+         */
+        public Builder int32Converter(final Converter<Integer> int32Converter) {
+            this.int32Converter = int32Converter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Int64 values to JSON.
+         *
+         * @param int64Converter the converter
+         * @return this
+         */
+        public Builder int64Converter(final Converter<Long> int64Converter) {
+            this.int64Converter = int64Converter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Decimal128 values to JSON.
+         *
+         * @param decimal128Converter the converter
+         * @return this
+         */
+        public Builder decimal128Converter(final Converter<Decimal128> decimal128Converter) {
+            this.decimal128Converter = decimal128Converter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON ObjectId values to JSON.
+         *
+         * @param objectIdConverter the converter
+         * @return this
+         */
+        public Builder objectIdConverter(final Converter<ObjectId> objectIdConverter) {
+            this.objectIdConverter = objectIdConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Timestamp values to JSON.
+         *
+         * @param timestampConverter the converter
+         * @return this
+         */
+        public Builder timestampConverter(final Converter<BsonTimestamp> timestampConverter) {
+            this.timestampConverter = timestampConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Regular Expression values to JSON.
+         *
+         * @param regularExpressionConverter the converter
+         * @return this
+         */
+        public Builder regularExpressionConverter(final Converter<BsonRegularExpression> regularExpressionConverter) {
+            this.regularExpressionConverter = regularExpressionConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Symbol values to JSON.
+         *
+         * @param symbolConverter the converter
+         * @return this
+         */
+        public Builder symbolConverter(final Converter<String> symbolConverter) {
+            this.symbolConverter = symbolConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON MinKey values to JSON.
+         *
+         * @param minKeyConverter the converter
+         * @return this
+         */
+        public Builder minKeyConverter(final Converter<BsonMinKey> minKeyConverter) {
+            this.minKeyConverter = minKeyConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON MaxKey values to JSON.
+         *
+         * @param maxKeyConverter the converter
+         * @return this
+         */
+        public Builder maxKeyConverter(final Converter<BsonMaxKey> maxKeyConverter) {
+            this.maxKeyConverter = maxKeyConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON Undefined values to JSON.
+         *
+         * @param undefinedConverter the converter
+         * @return this
+         */
+        public Builder undefinedConverter(final Converter<BsonUndefined> undefinedConverter) {
+            this.undefinedConverter = undefinedConverter;
+            return this;
+        }
+
+        /**
+         * Sets the converter from BSON JavaScript values to JSON.
+         *
+         * @param javaScriptConverter the converter
+         * @return this
+         */
+        public Builder javaScriptConverter(final Converter<String> javaScriptConverter) {
+            this.javaScriptConverter = javaScriptConverter;
+            return this;
+        }
+
+        private Builder() {
+        }
+    }
 }
diff --git a/bson/src/main/org/bson/json/LegacyExtendedJsonBinaryConverter.java b/bson/src/main/org/bson/json/LegacyExtendedJsonBinaryConverter.java
new file mode 100644
index 00000000000..7a02e62be18
--- /dev/null
+++ b/bson/src/main/org/bson/json/LegacyExtendedJsonBinaryConverter.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonBinary;
+import org.bson.internal.Base64;
+
+class LegacyExtendedJsonBinaryConverter implements Converter<BsonBinary> {
+
+    @Override
+    public void convert(final BsonBinary value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeString("$binary", Base64.encode(value.getData()));
+        writer.writeString("$type", String.format("%02X", value.getType()));
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/LegacyExtendedJsonDateTimeConverter.java b/bson/src/main/org/bson/json/LegacyExtendedJsonDateTimeConverter.java
new file mode 100644
index 00000000000..2fa1692ed7d
--- /dev/null
+++ b/bson/src/main/org/bson/json/LegacyExtendedJsonDateTimeConverter.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class LegacyExtendedJsonDateTimeConverter implements Converter<Long> {
+    @Override
+    public void convert(final Long value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeNumber("$date", Long.toString(value));
+        writer.writeEndObject();
+    }
+
+}
diff --git a/bson/src/main/org/bson/json/LegacyExtendedJsonRegularExpressionConverter.java b/bson/src/main/org/bson/json/LegacyExtendedJsonRegularExpressionConverter.java
new file mode 100644
index 00000000000..4cb8b0c9b0c
--- /dev/null
+++ b/bson/src/main/org/bson/json/LegacyExtendedJsonRegularExpressionConverter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonRegularExpression;
+
+class LegacyExtendedJsonRegularExpressionConverter implements Converter<BsonRegularExpression> {
+    @Override
+    public void convert(final BsonRegularExpression value, final StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeString("$regex", value.getPattern());
+        writer.writeString("$options", value.getOptions());
+        writer.writeEndObject();
+    }
+}
diff --git a/bson/src/main/org/bson/json/RelaxedExtendedJsonDateTimeConverter.java b/bson/src/main/org/bson/json/RelaxedExtendedJsonDateTimeConverter.java
new file mode 100644
index 00000000000..002c7c1c089
--- /dev/null
+++ b/bson/src/main/org/bson/json/RelaxedExtendedJsonDateTimeConverter.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class RelaxedExtendedJsonDateTimeConverter implements Converter<Long> {
+    private static final Converter<Long> FALLBACK_CONVERTER = new ExtendedJsonDateTimeConverter();
+    private static final long LAST_MS_OF_YEAR_9999 = 253402300799999L;
+
+    @Override
+    public void convert(final Long value, final StrictJsonWriter writer) {
+        if (value < 0 || value > LAST_MS_OF_YEAR_9999) {
+            FALLBACK_CONVERTER.convert(value, writer);
+        } else {
+            writer.writeStartObject();
+            writer.writeString("$date", DateTimeFormatter.format(value));
+            writer.writeEndObject();
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/json/RelaxedExtendedJsonDoubleConverter.java b/bson/src/main/org/bson/json/RelaxedExtendedJsonDoubleConverter.java
new file mode 100644
index 00000000000..ac845b2ecd0
--- /dev/null
+++ b/bson/src/main/org/bson/json/RelaxedExtendedJsonDoubleConverter.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class RelaxedExtendedJsonDoubleConverter implements Converter<Double> {
+    private static final Converter<Double> FALLBACK_CONVERTER = new ExtendedJsonDoubleConverter();
+
+    @Override
+    public void convert(final Double value, final StrictJsonWriter writer) {
+        if (value.isNaN() || value.isInfinite()) {
+            FALLBACK_CONVERTER.convert(value, writer);
+        } else {
+            writer.writeNumber(Double.toString(value));
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/json/RelaxedExtendedJsonInt64Converter.java b/bson/src/main/org/bson/json/RelaxedExtendedJsonInt64Converter.java
new file mode 100644
index 00000000000..4a158e28495
--- /dev/null
+++ b/bson/src/main/org/bson/json/RelaxedExtendedJsonInt64Converter.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+class RelaxedExtendedJsonInt64Converter implements Converter<Long> {
+    @Override
+    public void convert(final Long value, final StrictJsonWriter writer) {
+        writer.writeNumber(Long.toString(value));
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellBinaryConverter.java b/bson/src/main/org/bson/json/ShellBinaryConverter.java
new file mode 100644
index 00000000000..cea8fce9878
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellBinaryConverter.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonBinary;
+import org.bson.internal.Base64;
+
+import static java.lang.String.format;
+
+class ShellBinaryConverter implements Converter<BsonBinary> {
+    @Override
+    public void convert(final BsonBinary value, final StrictJsonWriter writer) {
+        writer.writeRaw(format("new BinData(%s, \"%s\")", Integer.toString(value.getType() & 0xFF),
+                Base64.encode(value.getData())));
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellDateTimeConverter.java b/bson/src/main/org/bson/json/ShellDateTimeConverter.java
new file mode 100644
index 00000000000..ae024899853
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellDateTimeConverter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+import static java.lang.String.format;
+
+
+class ShellDateTimeConverter implements Converter<Long> {
+    @Override
+    public void convert(final Long value, final StrictJsonWriter writer) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd\'T\'HH:mm:ss.SSS\'Z\'");
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        if (value >= -59014396800000L && value <= 253399536000000L) {
+            writer.writeRaw(format("ISODate(\"%s\")", dateFormat.format(new Date(value))));
+        } else {
+            writer.writeRaw(format("new Date(%d)", value));
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellDecimal128Converter.java b/bson/src/main/org/bson/json/ShellDecimal128Converter.java
new file mode 100644
index 00000000000..43d235b7417
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellDecimal128Converter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.types.Decimal128;
+
+import static java.lang.String.format;
+
+class ShellDecimal128Converter implements Converter<Decimal128> {
+    @Override
+    public void convert(final Decimal128 value, final StrictJsonWriter writer) {
+        writer.writeRaw(format("NumberDecimal(\"%s\")", value.toString()));
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellInt64Converter.java b/bson/src/main/org/bson/json/ShellInt64Converter.java
new file mode 100644
index 00000000000..94c9884a744
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellInt64Converter.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import static java.lang.String.format;
+
+class ShellInt64Converter implements Converter<Long> {
+    @Override
+    public void convert(final Long value, final StrictJsonWriter writer) {
+        if (value >= Integer.MIN_VALUE && value <= Integer.MAX_VALUE) {
+            writer.writeRaw(format("NumberLong(%d)", value));
+        } else {
+            writer.writeRaw(format("NumberLong(\"%d\")", value));
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellMaxKeyConverter.java b/bson/src/main/org/bson/json/ShellMaxKeyConverter.java
new file mode 100644
index 00000000000..0f3b1ae23d1
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellMaxKeyConverter.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonMaxKey;
+
+class ShellMaxKeyConverter implements Converter<BsonMaxKey> {
+    @Override
+    public void convert(final BsonMaxKey value, final StrictJsonWriter writer) {
+        writer.writeRaw("MaxKey");
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellMinKeyConverter.java b/bson/src/main/org/bson/json/ShellMinKeyConverter.java
new file mode 100644
index 00000000000..f996f5b3e8c
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellMinKeyConverter.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonMinKey;
+
+class ShellMinKeyConverter implements Converter<BsonMinKey> {
+    @Override
+    public void convert(final BsonMinKey value, final StrictJsonWriter writer) {
+        writer.writeRaw("MinKey");
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellObjectIdConverter.java b/bson/src/main/org/bson/json/ShellObjectIdConverter.java
new file mode 100644
index 00000000000..9a8fc9e6f7b
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellObjectIdConverter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.types.ObjectId;
+
+import static java.lang.String.format;
+
+class ShellObjectIdConverter implements Converter<ObjectId> {
+    @Override
+    public void convert(final ObjectId value, final StrictJsonWriter writer) {
+        writer.writeRaw(format("ObjectId(\"%s\")", value.toHexString()));
+
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellRegularExpressionConverter.java b/bson/src/main/org/bson/json/ShellRegularExpressionConverter.java
new file mode 100644
index 00000000000..2deb44213a6
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellRegularExpressionConverter.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonRegularExpression;
+
+class ShellRegularExpressionConverter implements Converter<BsonRegularExpression> {
+    @Override
+    public void convert(final BsonRegularExpression value, final StrictJsonWriter writer) {
+        String escaped = (value.getPattern().equals("")) ? "(?:)" : value.getPattern().replace("/", "\\/");
+        writer.writeRaw("/" + escaped + "/" + value.getOptions());
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellTimestampConverter.java b/bson/src/main/org/bson/json/ShellTimestampConverter.java
new file mode 100644
index 00000000000..1d767ed1372
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellTimestampConverter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonTimestamp;
+
+import static java.lang.String.format;
+
+class ShellTimestampConverter implements Converter<BsonTimestamp> {
+    @Override
+    public void convert(final BsonTimestamp value, final StrictJsonWriter writer) {
+        writer.writeRaw(format("Timestamp(%d, %d)", value.getTime(), value.getInc()));
+    }
+}
diff --git a/bson/src/main/org/bson/json/ShellUndefinedConverter.java b/bson/src/main/org/bson/json/ShellUndefinedConverter.java
new file mode 100644
index 00000000000..297594dadc5
--- /dev/null
+++ b/bson/src/main/org/bson/json/ShellUndefinedConverter.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BsonUndefined;
+
+class ShellUndefinedConverter implements Converter<BsonUndefined> {
+    @Override
+    public void convert(final BsonUndefined value, final StrictJsonWriter writer) {
+        writer.writeRaw("undefined");
+    }
+}
diff --git a/bson/src/main/org/bson/json/StrictCharacterStreamJsonWriter.java b/bson/src/main/org/bson/json/StrictCharacterStreamJsonWriter.java
new file mode 100644
index 00000000000..cce8af2fa17
--- /dev/null
+++ b/bson/src/main/org/bson/json/StrictCharacterStreamJsonWriter.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.bson.BSONException;
+import org.bson.BsonInvalidOperationException;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import static org.bson.assertions.Assertions.notNull;
+
+/**
+ * A class that writes JSON texts as a character stream via a provided {@link Writer}.
+ *
+ * @since 3.5
+ */
+public final class StrictCharacterStreamJsonWriter implements StrictJsonWriter {
+    private enum JsonContextType {
+        TOP_LEVEL,
+        DOCUMENT,
+        ARRAY,
+    }
+
+    private enum State {
+        INITIAL,
+        NAME,
+        VALUE,
+        DONE
+    }
+
+    private static class StrictJsonContext {
+        private final StrictJsonContext parentContext;
+        private final JsonContextType contextType;
+        private final String indentation;
+        private boolean hasElements;
+
+        StrictJsonContext(final StrictJsonContext parentContext, final JsonContextType contextType, final String indentChars) {
+            this.parentContext = parentContext;
+            this.contextType = contextType;
+            this.indentation = (parentContext == null) ? indentChars : parentContext.indentation + indentChars;
+        }
+    }
+
+    private final Writer writer;
+    private final StrictCharacterStreamJsonWriterSettings settings;
+    private StrictJsonContext context = new StrictJsonContext(null, JsonContextType.TOP_LEVEL, "");
+    private State state = State.INITIAL;
+    private int curLength;
+    private boolean isTruncated;
+
+    /**
+     * Construct an instance.
+     *
+     * @param writer   the writer to write JSON to.
+     * @param settings the settings to apply to this writer.
+     */
+    public StrictCharacterStreamJsonWriter(final Writer writer, final StrictCharacterStreamJsonWriterSettings settings) {
+        this.writer = writer;
+        this.settings = settings;
+    }
+
+    /**
+     * Gets the current length of the JSON text.
+     *
+     * @return the current length of the JSON text
+     */
+    public int getCurrentLength() {
+        return curLength;
+    }
+
+    @Override
+    public void writeStartObject(final String name) {
+        writeName(name);
+        writeStartObject();
+    }
+
+    @Override
+    public void writeStartArray(final String name) {
+        writeName(name);
+        writeStartArray();
+    }
+
+    @Override
+    public void writeBoolean(final String name, final boolean value) {
+        notNull("name", name);
+        writeName(name);
+        writeBoolean(value);
+    }
+
+    @Override
+    public void writeNumber(final String name, final String value) {
+        notNull("name", name);
+        notNull("value", value);
+        writeName(name);
+        writeNumber(value);
+    }
+
+    @Override
+    public void writeString(final String name, final String value) {
+        notNull("name", name);
+        notNull("value", value);
+        writeName(name);
+        writeString(value);
+    }
+
+    @Override
+    public void writeRaw(final String name, final String value) {
+        notNull("name", name);
+        notNull("value", value);
+        writeName(name);
+        writeRaw(value);
+    }
+
+    @Override
+    public void writeNull(final String name) {
+        writeName(name);
+        writeNull();
+    }
+
+    @Override
+    public void writeName(final String name) {
+        notNull("name", name);
+        checkState(State.NAME);
+
+        if (context.hasElements) {
+            write(",");
+        }
+        if (settings.isIndent()) {
+            write(settings.getNewLineCharacters());
+            write(context.indentation);
+        } else if (context.hasElements){
+            write(" ");
+        }
+        writeStringHelper(name);
+        write(": ");
+
+        state = State.VALUE;
+    }
+
+    @Override
+    public void writeBoolean(final boolean value) {
+        checkState(State.VALUE);
+        preWriteValue();
+        write(value ? "true" : "false");
+        setNextState();
+    }
+
+    @Override
+    public void writeNumber(final String value) {
+        notNull("value", value);
+        checkState(State.VALUE);
+        preWriteValue();
+        write(value);
+        setNextState();
+    }
+
+    @Override
+    public void writeString(final String value) {
+        notNull("value", value);
+        checkState(State.VALUE);
+        preWriteValue();
+        writeStringHelper(value);
+        setNextState();
+    }
+
+    @Override
+    public void writeRaw(final String value) {
+        notNull("value", value);
+        checkState(State.VALUE);
+        preWriteValue();
+        write(value);
+        setNextState();
+    }
+
+    @Override
+    public void writeNull() {
+        checkState(State.VALUE);
+        preWriteValue();
+        write("null");
+        setNextState();
+    }
+
+    @Override
+    public void writeStartObject() {
+        if (state != State.INITIAL && state != State.VALUE) {
+            throw new BsonInvalidOperationException("Invalid state " + state);
+        }
+        preWriteValue();
+        write("{");
+        context = new StrictJsonContext(context, JsonContextType.DOCUMENT, settings.getIndentCharacters());
+        state = State.NAME;
+    }
+
+    @Override
+    public void writeStartArray() {
+        preWriteValue();
+        write("[");
+        context = new StrictJsonContext(context, JsonContextType.ARRAY, settings.getIndentCharacters());
+        state = State.VALUE;
+    }
+
+    @Override
+    public void writeEndObject() {
+        checkState(State.NAME);
+
+        if (settings.isIndent() && context.hasElements) {
+            write(settings.getNewLineCharacters());
+            write(context.parentContext.indentation);
+        }
+        write("}");
+        context = context.parentContext;
+        if (context.contextType == JsonContextType.TOP_LEVEL) {
+            state = State.DONE;
+        } else {
+            setNextState();
+        }
+    }
+
+    @Override
+    public void writeEndArray() {
+        checkState(State.VALUE);
+
+        if (context.contextType != JsonContextType.ARRAY) {
+            throw new BsonInvalidOperationException("Can't end an array if not in an array");
+        }
+
+        if (settings.isIndent() && context.hasElements) {
+            write(settings.getNewLineCharacters());
+            write(context.parentContext.indentation);
+        }
+        write("]");
+        context = context.parentContext;
+        if (context.contextType == JsonContextType.TOP_LEVEL) {
+            state = State.DONE;
+        } else {
+            setNextState();
+        }
+    }
+
+    /**
+     * Return true if the output has been truncated due to exceeding the length specified in
+     * {@link StrictCharacterStreamJsonWriterSettings#getMaxLength()}.
+     *
+     * @return true if the output has been truncated
+     * @since 3.7
+     * @see StrictCharacterStreamJsonWriterSettings#getMaxLength()
+     */
+    public boolean isTruncated() {
+        return isTruncated;
+    }
+
+    void flush() {
+        try {
+            writer.flush();
+        } catch (IOException e) {
+            throwBSONException(e);
+        }
+    }
+
+    Writer getWriter() {
+        return writer;
+    }
+
+    private void preWriteValue() {
+        if (context.contextType == JsonContextType.ARRAY) {
+            if (context.hasElements) {
+                write(",");
+            }
+            if (settings.isIndent()) {
+                write(settings.getNewLineCharacters());
+                write(context.indentation);
+            } else if (context.hasElements) {
+                write(" ");
+            }
+        }
+        context.hasElements = true;
+    }
+
+    private void setNextState() {
+        if (context.contextType == JsonContextType.ARRAY) {
+            state = State.VALUE;
+        } else {
+            state = State.NAME;
+        }
+    }
+
+    private void writeStringHelper(final String str) {
+        write('"');
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            switch (c) {
+                case '"':
+                    write("\\\"");
+                    break;
+                case '\\':
+                    write("\\\\");
+                    break;
+                case '\b':
+                    write("\\b");
+                    break;
+                case '\f':
+                    write("\\f");
+                    break;
+                case '\n':
+                    write("\\n");
+                    break;
+                case '\r':
+                    write("\\r");
+                    break;
+                case '\t':
+                    write("\\t");
+                    break;
+                default:
+                    switch (Character.getType(c)) {
+                        case Character.UPPERCASE_LETTER:
+                        case Character.LOWERCASE_LETTER:
+                        case Character.TITLECASE_LETTER:
+                        case Character.OTHER_LETTER:
+                        case Character.DECIMAL_DIGIT_NUMBER:
+                        case Character.LETTER_NUMBER:
+                        case Character.OTHER_NUMBER:
+                        case Character.SPACE_SEPARATOR:
+                        case Character.CONNECTOR_PUNCTUATION:
+                        case Character.DASH_PUNCTUATION:
+                        case Character.START_PUNCTUATION:
+                        case Character.END_PUNCTUATION:
+                        case Character.INITIAL_QUOTE_PUNCTUATION:
+                        case Character.FINAL_QUOTE_PUNCTUATION:
+                        case Character.OTHER_PUNCTUATION:
+                        case Character.MATH_SYMBOL:
+                        case Character.CURRENCY_SYMBOL:
+                        case Character.MODIFIER_SYMBOL:
+                        case Character.OTHER_SYMBOL:
+                            write(c);
+                            break;
+                        default:
+                            write("\\u");
+                            write(Integer.toHexString((c & 0xf000) >> 12));
+                            write(Integer.toHexString((c & 0x0f00) >> 8));
+                            write(Integer.toHexString((c & 0x00f0) >> 4));
+                            write(Integer.toHexString(c & 0x000f));
+                            break;
+                    }
+                    break;
+            }
+        }
+        write('"');
+    }
+
+    private void write(final String str) {
+        try {
+            if (settings.getMaxLength() == 0 || str.length() + curLength < settings.getMaxLength()) {
+                writer.write(str);
+                curLength += str.length();
+            } else {
+                writer.write(str.substring(0, settings.getMaxLength() - curLength));
+                curLength = settings.getMaxLength();
+                isTruncated = true;
+            }
+        } catch (IOException e) {
+            throwBSONException(e);
+        }
+    }
+
+    private void write(final char c) {
+        try {
+            if (settings.getMaxLength() == 0 || curLength < settings.getMaxLength()) {
+                writer.write(c);
+                curLength++;
+            } else {
+                isTruncated = true;
+            }
+        } catch (IOException e) {
+            throwBSONException(e);
+        }
+    }
+
+    private void checkState(final State requiredState) {
+        if (state != requiredState) {
+            throw new BsonInvalidOperationException("Invalid state " + state);
+        }
+    }
+
+    private void throwBSONException(final IOException e) {
+        throw new BSONException("Wrapping IOException", e);
+    }
+}
diff --git a/bson/src/main/org/bson/json/StrictCharacterStreamJsonWriterSettings.java b/bson/src/main/org/bson/json/StrictCharacterStreamJsonWriterSettings.java
new file mode 100644
index 00000000000..e395e3ee52c
--- /dev/null
+++ b/bson/src/main/org/bson/json/StrictCharacterStreamJsonWriterSettings.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import static org.bson.assertions.Assertions.notNull;
+
+/**
+ * Settings to control the behavior of a {@code JSONWriter} instance.
+ *
+ * @see StrictCharacterStreamJsonWriter
+ * @since 3.5
+ */
+public final class StrictCharacterStreamJsonWriterSettings {
+
+    private final boolean indent;
+    private final String newLineCharacters;
+    private final String indentCharacters;
+    private final int maxLength;
+
+    /**
+     * Create a builder for StrictCharacterStreamJsonWriterSettings, which are immutable.
+     *
+     * @return a Builder instance
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    private StrictCharacterStreamJsonWriterSettings(final Builder builder) {
+        indent = builder.indent;
+        newLineCharacters = builder.newLineCharacters != null ? builder.newLineCharacters : System.getProperty("line.separator");
+        indentCharacters = builder.indentCharacters;
+        maxLength = builder.maxLength;
+    }
+
+    /**
+     * The indentation mode.  If true, output will be indented.  Otherwise, it will all be on the same line. The default value is {@code
+     * false}.
+     *
+     * @return whether output should be indented.
+     */
+    public boolean isIndent() {
+        return indent;
+    }
+
+    /**
+     * The new line character(s) to use if indent mode is enabled.  The default value is {@code System.getProperty("line.separator")}.
+     *
+     * @return the new line character(s) to use.
+     */
+    public String getNewLineCharacters() {
+        return newLineCharacters;
+    }
+
+    /**
+     * The indent characters to use if indent mode is enabled.  The default value is two spaces.
+     *
+     * @return the indent character(s) to use.
+     */
+    public String getIndentCharacters() {
+        return indentCharacters;
+    }
+
+    /**
+     * The maximum length of the JSON string.  The string will be truncated at this length.
+     *
+     * @return the maximum length of the JSON string
+     * @since 3.7
+     */
+    public int getMaxLength() {
+        return maxLength;
+    }
+
+    /**
+     * A builder for StrictCharacterStreamJsonWriterSettings
+     *
+     * @since 3.4
+     */
+    public static final class Builder {
+        private boolean indent;
+        private String newLineCharacters = System.getProperty("line.separator");
+        private String indentCharacters = "  ";
+        private int maxLength;
+
+        /**
+         * Build a JsonWriterSettings instance.
+         *
+         * @return a JsonWriterSettings instance
+         */
+        public StrictCharacterStreamJsonWriterSettings build() {
+            return new StrictCharacterStreamJsonWriterSettings(this);
+        }
+
+        /**
+         * Sets whether indentation is enabled.
+         *
+         * @param indent whether indentation is enabled
+         * @return this
+         */
+        public Builder indent(final boolean indent) {
+            this.indent = indent;
+            return this;
+        }
+
+        /**
+         * Sets the new line character string to use when indentation is enabled.
+         *
+         * @param newLineCharacters the non-null new line character string
+         * @return this
+         */
+        public Builder newLineCharacters(final String newLineCharacters) {
+            notNull("newLineCharacters", newLineCharacters);
+            this.newLineCharacters = newLineCharacters;
+            return this;
+        }
+
+        /**
+         * Sets the indent character string to use when indentation is enabled.
+         *
+         * @param indentCharacters the non-null indent character string
+         * @return this
+         */
+        public Builder indentCharacters(final String indentCharacters) {
+            notNull("indentCharacters", indentCharacters);
+            this.indentCharacters = indentCharacters;
+            return this;
+        }
+
+        /**
+         * Sets the maximum length of the JSON string.  The string will be truncated at this length.
+         *
+         * @param maxLength the maximum length, which must be &gt;= 0 where 0 indicate no maximum length
+         * @return the maximum length of the JSON string
+         * @since 3.7
+         */
+        public Builder maxLength(final int maxLength) {
+            this.maxLength = maxLength;
+            return this;
+        }
+
+        private Builder() {
+        }
+    }
+}
diff --git a/bson/src/main/org/bson/json/StrictJsonWriter.java b/bson/src/main/org/bson/json/StrictJsonWriter.java
new file mode 100644
index 00000000000..7c75849025b
--- /dev/null
+++ b/bson/src/main/org/bson/json/StrictJsonWriter.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+/**
+ * An interface for creating JSON texts that largely conform to RFC 7159.
+ *
+ * @since 3.5
+ */
+public interface StrictJsonWriter {
+    /**
+     * Writes the name of a member to the writer.
+     *
+     * @param name the member name
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member name
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeName(String name);
+
+    /**
+     * Writes a boolean to the writer.
+     *
+     * @param value the boolean value.
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a value
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeBoolean(boolean value);
+
+    /**
+     * Writes a a member with a boolean value to the writer.
+     *
+     * @param name  the member name
+     * @param value the boolean value
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeBoolean(String name, boolean value);
+
+    /**
+     * Writes a number to the writer.
+     *
+     * @param value the Double value, as a String so that clients can take full control over formatting
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a value
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeNumber(String value);
+
+    /**
+     * Writes a member with a numeric value to the writer.
+     *
+     * @param name  the member name
+     * @param value the Double value, as a String so that clients can take full control over formatting
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeNumber(String name, String value);
+
+    /**
+     * Writes a String to the writer.
+     *
+     * @param value the String value
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a value
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeString(String value);
+
+    /**
+     * Writes a member with a string value to the writer.
+     *
+     * @param name  the member name
+     * @param value the String value
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeString(String name, String value);
+
+    /**
+     * Writes a raw value without quoting or escaping.
+     *
+     * @param value the String value
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a value
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeRaw(String value);
+
+    /**
+     * Writes a member with a raw value without quoting or escaping.
+     *
+     * @param name  the member name
+     * @param value the raw value
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeRaw(String name, String value);
+
+    /**
+     * Writes a null value to the writer.
+     *
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a value
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeNull();
+
+    /**
+     * Writes a member with a null value to the writer.
+     *
+     * @param name the member name
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeNull(String name);
+
+    /**
+     * Writes the start of a array to the writer.
+     *
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a value
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeStartArray();
+
+    /**
+     * Writes the start of JSON array member to the writer.
+     *
+     * @param name the member name
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeStartArray(String name);
+
+    /**
+     * Writes the start of a JSON object to the writer.
+     *
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a value
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeStartObject();
+
+    /**
+     * Writes the start of a JSON object member to the writer.
+     *
+     * @param name the member name
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write a member
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeStartObject(String name);
+
+    /**
+     * Writes the end of a JSON array to the writer.
+     *
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write the end of an array
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeEndArray();
+
+    /**
+     * Writes the end of a JSON object to the writer.
+     *
+     * @throws org.bson.BsonInvalidOperationException if not in the correct state to write the end of an object
+     * @throws org.bson.BSONException if the underlying Writer throws an IOException
+     */
+    void writeEndObject();
+
+    /**
+     * Return true if the output has been truncated due to exceeding any maximum length specified in settings.
+     *
+     * @return true if the output has been truncated
+     * @since 3.7
+     */
+    boolean isTruncated();
+}
diff --git a/bson/src/main/org/bson/json/package-info.java b/bson/src/main/org/bson/json/package-info.java
index 5b0aadf45ad..05c872db6c7 100644
--- a/bson/src/main/org/bson/json/package-info.java
+++ b/bson/src/main/org/bson/json/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/package-info.java b/bson/src/main/org/bson/package-info.java
index 879333c10a1..d02567e5d9d 100644
--- a/bson/src/main/org/bson/package-info.java
+++ b/bson/src/main/org/bson/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/types/BSONTimestamp.java b/bson/src/main/org/bson/types/BSONTimestamp.java
similarity index 98%
rename from driver/src/main/org/bson/types/BSONTimestamp.java
rename to bson/src/main/org/bson/types/BSONTimestamp.java
index d3dcd742cdf..8979f777867 100644
--- a/driver/src/main/org/bson/types/BSONTimestamp.java
+++ b/bson/src/main/org/bson/types/BSONTimestamp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/types/BasicBSONList.java b/bson/src/main/org/bson/types/BasicBSONList.java
similarity index 99%
rename from driver/src/main/org/bson/types/BasicBSONList.java
rename to bson/src/main/org/bson/types/BasicBSONList.java
index 394b4b102ae..9a76f0cc975 100644
--- a/driver/src/main/org/bson/types/BasicBSONList.java
+++ b/bson/src/main/org/bson/types/BasicBSONList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/types/Binary.java b/bson/src/main/org/bson/types/Binary.java
index c073ee36365..ac67bb878f4 100644
--- a/bson/src/main/org/bson/types/Binary.java
+++ b/bson/src/main/org/bson/types/Binary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/types/Code.java b/bson/src/main/org/bson/types/Code.java
index b779ef09cdc..1f8cbb01cbf 100644
--- a/bson/src/main/org/bson/types/Code.java
+++ b/bson/src/main/org/bson/types/Code.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/types/CodeWScope.java b/bson/src/main/org/bson/types/CodeWScope.java
similarity index 97%
rename from driver/src/main/org/bson/types/CodeWScope.java
rename to bson/src/main/org/bson/types/CodeWScope.java
index 1e011b81be2..b46591b2efa 100644
--- a/driver/src/main/org/bson/types/CodeWScope.java
+++ b/bson/src/main/org/bson/types/CodeWScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/types/CodeWithScope.java b/bson/src/main/org/bson/types/CodeWithScope.java
index 36ee1e21bba..7c5fe75f8bd 100644
--- a/bson/src/main/org/bson/types/CodeWithScope.java
+++ b/bson/src/main/org/bson/types/CodeWithScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/types/Decimal128.java b/bson/src/main/org/bson/types/Decimal128.java
new file mode 100644
index 00000000000..f88b07a80ce
--- /dev/null
+++ b/bson/src/main/org/bson/types/Decimal128.java
@@ -0,0 +1,624 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.types;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.HashSet;
+import java.util.Set;
+
+import static java.math.MathContext.DECIMAL128;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+
+/**
+ * A binary integer decimal representation of a 128-bit decimal value, supporting 34 decimal digits of significand and an exponent range
+ * of -6143 to +6144.
+ *
+ * @since 3.4
+ * @see <a href="https://github.com/mongodb/specifications/blob/master/source/bson-decimal128/decimal128.rst">BSON Decimal128
+ * specification</a>
+ * @see <a href="https://en.wikipedia.org/wiki/Binary_Integer_Decimal">binary integer decimal</a>
+ * @see <a href="https://en.wikipedia.org/wiki/Decimal128_floating-point_format">decimal128 floating-point format</a>
+ * @see <a href="http://ieeexplore.ieee.org/document/4610935/">754-2008 - IEEE Standard for Floating-Point Arithmetic</a>
+ */
+public final class Decimal128 extends Number implements Comparable<Decimal128> {
+
+    private static final long serialVersionUID = 4570973266503637887L;
+
+    private static final long INFINITY_MASK = 0x7800000000000000L;
+    private static final long NaN_MASK = 0x7c00000000000000L;
+    private static final long SIGN_BIT_MASK = 1L << 63;
+    private static final int MIN_EXPONENT = -6176;
+    private static final int MAX_EXPONENT = 6111;
+
+    private static final int EXPONENT_OFFSET = 6176;
+    private static final int MAX_BIT_LENGTH = 113;
+
+    private static final BigInteger BIG_INT_TEN = new BigInteger("10");
+    private static final BigInteger BIG_INT_ONE = new BigInteger("1");
+    private static final BigInteger BIG_INT_ZERO = new BigInteger("0");
+
+    private static final Set<String> NaN_STRINGS = new HashSet<String>(singletonList("nan"));
+    private static final Set<String> NEGATIVE_NaN_STRINGS = new HashSet<String>(singletonList("-nan"));
+    private static final Set<String> POSITIVE_INFINITY_STRINGS = new HashSet<String>(asList("inf", "+inf", "infinity", "+infinity"));
+    private static final Set<String> NEGATIVE_INFINITY_STRINGS = new HashSet<String>(asList("-inf", "-infinity"));
+
+    /**
+     * A constant holding the positive infinity of type {@code Decimal128}.  It is equal to the value return by
+     * {@code Decimal128.valueOf("Infinity")}.
+     */
+    public static final Decimal128 POSITIVE_INFINITY = fromIEEE754BIDEncoding(INFINITY_MASK, 0);
+
+    /**
+     * A constant holding the negative infinity of type {@code Decimal128}.  It is equal to the value return by
+     * {@code Decimal128.valueOf("-Infinity")}.
+     */
+    public static final Decimal128 NEGATIVE_INFINITY = fromIEEE754BIDEncoding(INFINITY_MASK | SIGN_BIT_MASK, 0);
+
+    /**
+     * A constant holding a negative Not-a-Number (-NaN) value of type {@code Decimal128}.  It is equal to the value return by
+     * {@code Decimal128.valueOf("-NaN")}.
+     */
+    public static final Decimal128 NEGATIVE_NaN = fromIEEE754BIDEncoding(NaN_MASK | SIGN_BIT_MASK, 0);
+
+    /**
+     * A constant holding a Not-a-Number (NaN) value of type {@code Decimal128}.  It is equal to the value return by
+     * {@code Decimal128.valueOf("NaN")}.
+     */
+    public static final Decimal128 NaN = fromIEEE754BIDEncoding(NaN_MASK, 0);
+
+    /**
+     * A constant holding a postive zero value of type {@code Decimal128}.  It is equal to the value return by
+     * {@code Decimal128.valueOf("0")}.
+     */
+    public static final Decimal128 POSITIVE_ZERO = fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000000L);
+
+    /**
+     * A constant holding a negative zero value of type {@code Decimal128}.  It is equal to the value return by
+     * {@code Decimal128.valueOf("-0")}.
+     */
+    public static final Decimal128 NEGATIVE_ZERO = fromIEEE754BIDEncoding(0xb040000000000000L, 0x0000000000000000L);
+
+    private final long high;
+    private final long low;
+
+    /**
+     * Returns a Decimal128 value representing the given String.
+     *
+     * @param value the Decimal128 value represented as a String
+     * @return the Decimal128 value representing the given String
+     * @throws NumberFormatException if the value is out of the Decimal128 range
+     * @see
+     * <a href="https://github.com/mongodb/specifications/blob/master/source/bson-decimal128/decimal128.rst#from-string-representation">
+     *     From-String Specification</a>
+     */
+    public static Decimal128 parse(final String value) {
+        String lowerCasedValue = value.toLowerCase();
+
+        if (NaN_STRINGS.contains(lowerCasedValue)) {
+            return NaN;
+        }
+        if (NEGATIVE_NaN_STRINGS.contains(lowerCasedValue)) {
+            return NEGATIVE_NaN;
+        }
+        if (POSITIVE_INFINITY_STRINGS.contains(lowerCasedValue)) {
+            return POSITIVE_INFINITY;
+        }
+        if (NEGATIVE_INFINITY_STRINGS.contains(lowerCasedValue)) {
+            return NEGATIVE_INFINITY;
+        }
+        return new Decimal128(new BigDecimal(value), value.charAt(0) == '-');
+    }
+
+    /**
+     * Create an instance with the given high and low order bits representing this Decimal128 as an IEEE 754-2008 128-bit decimal
+     * floating point using the BID encoding scheme.
+     *
+     * @param high the high-order 64 bits
+     * @param low  the low-order 64 bits
+     * @return the Decimal128 value representing the given high and low order bits
+     */
+    public static Decimal128 fromIEEE754BIDEncoding(final long high, final long low) {
+        return new Decimal128(high, low);
+    }
+
+    /**
+     * Constructs a Decimal128 value representing the given long.
+     *
+     * @param value the Decimal128 value represented as a long
+     */
+    public Decimal128(final long value) {
+        this(new BigDecimal(value, DECIMAL128));
+    }
+
+    /**
+     * Constructs a Decimal128 value representing the given BigDecimal.
+     *
+     * @param value the Decimal128 value represented as a BigDecimal
+     * @throws NumberFormatException if the value is out of the Decimal128 range
+     */
+    public Decimal128(final BigDecimal value) {
+        this(value, value.signum() == -1);
+    }
+
+    private Decimal128(final long high, final long low) {
+        this.high = high;
+        this.low = low;
+    }
+
+    // isNegative is necessary to detect -0, which can't be represented with a BigDecimal
+    private Decimal128(final BigDecimal initialValue, final boolean isNegative) {
+        long localHigh = 0;
+        long localLow = 0;
+
+        BigDecimal value = clampAndRound(initialValue);
+
+        long exponent = -value.scale();
+
+        if ((exponent < MIN_EXPONENT) || (exponent > MAX_EXPONENT)) {
+            throw new AssertionError("Exponent is out of range for Decimal128 encoding: " + exponent); }
+
+        if (value.unscaledValue().bitLength() > MAX_BIT_LENGTH) {
+            throw new AssertionError("Unscaled roundedValue is out of range for Decimal128 encoding:" + value.unscaledValue());
+        }
+
+        BigInteger significand = value.unscaledValue().abs();
+        int bitLength = significand.bitLength();
+
+        for (int i = 0; i < Math.min(64, bitLength); i++) {
+            if (significand.testBit(i)) {
+                localLow |= 1L << i;
+            }
+        }
+
+        for (int i = 64; i < bitLength; i++) {
+            if (significand.testBit(i)) {
+                localHigh |= 1L << (i - 64);
+            }
+        }
+
+        long biasedExponent = exponent + EXPONENT_OFFSET;
+
+        localHigh |= biasedExponent << 49;
+
+        if (value.signum() == -1 || isNegative) {
+            localHigh |= SIGN_BIT_MASK;
+        }
+
+        high = localHigh;
+        low = localLow;
+    }
+
+    private BigDecimal clampAndRound(final BigDecimal initialValue) {
+        BigDecimal value;
+        if (-initialValue.scale() > MAX_EXPONENT) {
+            int diff = -initialValue.scale() - MAX_EXPONENT;
+            if (initialValue.unscaledValue().equals(BIG_INT_ZERO)) {
+                value = new BigDecimal(initialValue.unscaledValue(), -MAX_EXPONENT);
+            } else if (diff + initialValue.precision() > 34) {
+                throw new NumberFormatException("Exponent is out of range for Decimal128 encoding of " + initialValue);
+            } else {
+                BigInteger multiplier = BIG_INT_TEN.pow(diff);
+                value = new BigDecimal(initialValue.unscaledValue().multiply(multiplier), initialValue.scale() + diff);
+            }
+        } else if (-initialValue.scale() < MIN_EXPONENT) {
+            // Increasing a very negative exponent may require decreasing precision, which is rounding
+            // Only round exactly (by removing precision that is all zeroes).  An exception is thrown if the rounding would be inexact:
+            // Exact:     .000...0011000  => 11000E-6177  => 1100E-6176  => .000001100
+            // Inexact:   .000...0011001  => 11001E-6177  => 1100E-6176  => .000001100
+            int diff = initialValue.scale() + MIN_EXPONENT;
+            int undiscardedPrecision = ensureExactRounding(initialValue, diff);
+            BigInteger divisor = undiscardedPrecision == 0 ? BIG_INT_ONE : BIG_INT_TEN.pow(diff);
+            value = new BigDecimal(initialValue.unscaledValue().divide(divisor), initialValue.scale() - diff);
+        } else {
+            value = initialValue.round(DECIMAL128);
+            int extraPrecision = initialValue.precision() - value.precision();
+            if (extraPrecision > 0) {
+                // Again, only round exactly
+                ensureExactRounding(initialValue, extraPrecision);
+            }
+        }
+        return value;
+    }
+
+    private int ensureExactRounding(final BigDecimal initialValue, final int extraPrecision) {
+        String significand = initialValue.unscaledValue().abs().toString();
+        int undiscardedPrecision = Math.max(0, significand.length() - extraPrecision);
+        for (int i = undiscardedPrecision; i < significand.length(); i++) {
+            if (significand.charAt(i) != '0') {
+                throw new NumberFormatException("Conversion to Decimal128 would require inexact rounding of " + initialValue);
+            }
+        }
+        return undiscardedPrecision;
+    }
+
+    /**
+     * Gets the high-order 64 bits of the IEEE 754-2008 128-bit decimal floating point encoding for this Decimal128, using the BID encoding
+     * scheme.
+     *
+     * @return the high-order 64 bits of this Decimal128
+     */
+    public long getHigh() {
+        return high;
+    }
+
+    /**
+     * Gets the low-order 64 bits of the IEEE 754-2008 128-bit decimal floating point encoding for this Decimal128, using the BID encoding
+     * scheme.
+     *
+     * @return the low-order 64 bits of this Decimal128
+     */
+    public long getLow() {
+        return low;
+    }
+
+    /**
+     * Gets a BigDecimal that is equivalent to this Decimal128.
+     *
+     * @return a BigDecimal that is equivalent to this Decimal128
+     * @throws ArithmeticException if the Decimal128 value is NaN, Infinity, -Infinity, or -0, none of which can be represented as a
+     * BigDecimal
+     */
+    public BigDecimal bigDecimalValue() {
+
+        if (isNaN()) {
+            throw new ArithmeticException("NaN can not be converted to a BigDecimal");
+        }
+
+        if (isInfinite()) {
+            throw new ArithmeticException("Infinity can not be converted to a BigDecimal");
+        }
+
+        BigDecimal bigDecimal = bigDecimalValueNoNegativeZeroCheck();
+
+        // If the BigDecimal is 0, but the Decimal128 is negative, that means we have -0.
+        if (isNegative() && bigDecimal.signum() == 0) {
+            throw new ArithmeticException("Negative zero can not be converted to a BigDecimal");
+        }
+
+        return bigDecimal;
+    }
+
+    // Make sure that the argument comes from a call to bigDecimalValueNoNegativeZeroCheck on this instance
+    private boolean hasDifferentSign(final BigDecimal bigDecimal) {
+        return isNegative() && bigDecimal.signum() == 0;
+    }
+
+    private boolean isZero(final BigDecimal bigDecimal) {
+        return !isNaN() && !isInfinite() && bigDecimal.compareTo(BigDecimal.ZERO) == 0;
+    }
+
+    private BigDecimal bigDecimalValueNoNegativeZeroCheck() {
+        int scale = -getExponent();
+
+        if (twoHighestCombinationBitsAreSet()) {
+            return BigDecimal.valueOf(0, scale);
+        }
+
+        return new BigDecimal(new BigInteger(isNegative() ? -1 : 1, getBytes()), scale);
+    }
+
+    // May have leading zeros.  Strip them before considering making this method public
+    private byte[] getBytes() {
+        byte[] bytes = new byte[15];
+
+        long mask = 0x00000000000000ff;
+        for (int i = 14; i >= 7; i--) {
+            bytes[i] = (byte) ((low & mask) >>> ((14 - i) << 3));
+            mask = mask << 8;
+        }
+
+        mask = 0x00000000000000ff;
+        for (int i = 6; i >= 1; i--) {
+            bytes[i] = (byte) ((high & mask) >>> ((6 - i) << 3));
+            mask = mask << 8;
+        }
+
+        mask = 0x0001000000000000L;
+        bytes[0] = (byte) ((high & mask) >>> 48);
+        return bytes;
+    }
+
+    private int getExponent() {
+        if (twoHighestCombinationBitsAreSet()) {
+            return (int) ((high & 0x1fffe00000000000L) >>> 47) - EXPONENT_OFFSET;
+        } else {
+            return (int) ((high & 0x7fff800000000000L) >>> 49) - EXPONENT_OFFSET;
+        }
+    }
+
+    private boolean twoHighestCombinationBitsAreSet() {
+        return (high & 3L << 61) == 3L << 61;
+    }
+
+    /**
+     * Returns true if this Decimal128 is negative.
+     *
+     * @return true if this Decimal128 is negative
+     */
+    public boolean isNegative() {
+        return (high & SIGN_BIT_MASK) == SIGN_BIT_MASK;
+    }
+
+    /**
+     * Returns true if this Decimal128 is infinite.
+     *
+     * @return true if this Decimal128 is infinite
+     */
+    public boolean isInfinite() {
+        return (high & INFINITY_MASK) == INFINITY_MASK;
+    }
+
+    /**
+     * Returns true if this Decimal128 is finite.
+     *
+     * @return true if this Decimal128 is finite
+     */
+    public boolean isFinite() {
+        return !isInfinite();
+    }
+
+    /**
+     * Returns true if this Decimal128 is Not-A-Number (NaN).
+     *
+     * @return true if this Decimal128 is Not-A-Number
+     */
+    public boolean isNaN() {
+        return (high & NaN_MASK) == NaN_MASK;
+    }
+
+
+    @Override
+    public int compareTo(final Decimal128 o) {
+        if (isNaN()) {
+            return o.isNaN() ? 0 : 1;
+        }
+        if (isInfinite()) {
+            if (isNegative()) {
+                if (o.isInfinite() && o.isNegative()) {
+                    return 0;
+                } else {
+                    return -1;
+                }
+            } else {
+                if (o.isNaN()) {
+                    return -1;
+                } else if (o.isInfinite() && !o.isNegative()) {
+                    return 0;
+                } else {
+                    return 1;
+                }
+            }
+        }
+        BigDecimal bigDecimal = bigDecimalValueNoNegativeZeroCheck();
+        BigDecimal otherBigDecimal = o.bigDecimalValueNoNegativeZeroCheck();
+
+        if (isZero(bigDecimal) && o.isZero(otherBigDecimal)) {
+            if (hasDifferentSign(bigDecimal)) {
+                if (o.hasDifferentSign(otherBigDecimal)) {
+                    return 0;
+                }
+                else {
+                    return -1;
+                }
+            } else if (o.hasDifferentSign(otherBigDecimal)) {
+                return 1;
+            }
+        }
+
+        if (o.isNaN()) {
+            return -1;
+        } else if (o.isInfinite()) {
+            if (o.isNegative()) {
+                return 1;
+            } else {
+                return -1;
+            }
+        } else {
+            return bigDecimal.compareTo(otherBigDecimal);
+        }
+    }
+
+    /**
+     * Converts this {@code Decimal128} to a {@code int}. This conversion is analogous to the <i>narrowing primitive conversion</i> from
+     * {@code double} to {@code int} as defined in <cite>The Java&trade; Language Specification</cite>: any fractional part of this
+     * {@code Decimal128} will be discarded, and if the resulting integral value is too big to fit in a {@code int}, only the
+     * low-order 32 bits are returned. Note that this conversion can lose information about the overall magnitude and precision of this
+     * {@code Decimal128} value as well as return a result with the opposite sign. Note that {@code #NEGATIVE_ZERO} is converted to
+     * {@code 0}.
+     *
+     * @return this {@code Decimal128} converted to a {@code int}.
+     * @since 3.10
+     */
+    @Override
+    public int intValue() {
+        return (int) doubleValue();
+    }
+
+    /**
+     * Converts this {@code Decimal128} to a {@code long}. This conversion is analogous to the <i>narrowing primitive conversion</i> from
+     * {@code double} to {@code long} as defined in <cite>The Java&trade; Language Specification</cite>: any fractional part of this
+     * {@code Decimal128} will be discarded, and if the resulting integral value is too big to fit in a {@code long}, only the
+     * low-order 64 bits are returned. Note that this conversion can lose information about the overall magnitude and precision of this
+     * {@code Decimal128} value as well as return a result with the opposite sign. Note that {@code #NEGATIVE_ZERO} is converted to
+     * {@code 0L}.
+     *
+     * @return this {@code Decimal128} converted to a {@code long}.
+     * @since 3.10
+     */
+    @Override
+    public long longValue() {
+        return (long) doubleValue();
+    }
+
+    /**
+     * Converts this {@code Decimal128} to a {@code float}. This conversion is similar to the <i>narrowing primitive conversion</i> from
+     * {@code double} to {@code float} as defined in <cite>The Java&trade; Language Specification</cite>: if this {@code Decimal128} has
+     * too great a magnitude to represent as a {@code float}, it will be converted to {@link Float#NEGATIVE_INFINITY} or
+     * {@link Float#POSITIVE_INFINITY} as appropriate.  Note that even when the return value is finite, this conversion can lose
+     * information about the precision of the {@code Decimal128} value. Note that {@code #NEGATIVE_ZERO} is converted to {@code 0.0f}.
+     *
+     * @return this {@code Decimal128} converted to a {@code float}.
+     * @since 3.10
+     */
+    @Override
+    public float floatValue() {
+        return (float) doubleValue();
+    }
+
+    /**
+     * Converts this {@code Decimal128} to a {@code double}. This conversion is similar to the <i>narrowing primitive conversion</i> from
+     * {@code double} to {@code float} as defined in <cite>The Java&trade; Language Specification</cite>: if this {@code Decimal128} has
+     * too great a magnitude to represent as a {@code double}, it will be converted to {@link Double#NEGATIVE_INFINITY} or
+     * {@link Double#POSITIVE_INFINITY} as appropriate.  Note that even when the return value is finite, this conversion can lose
+     * information about the precision of the {@code Decimal128} value. Note that {@code #NEGATIVE_ZERO} is converted to {@code 0.0d}.
+     *
+     * @return this {@code Decimal128} converted to a {@code double}.
+     * @since 3.10
+     */
+    @Override
+    public double doubleValue() {
+        if (isNaN()) {
+            return Double.NaN;
+        }
+        if (isInfinite()) {
+            if (isNegative()) {
+                return Double.NEGATIVE_INFINITY;
+            } else {
+                return Double.POSITIVE_INFINITY;
+            }
+        }
+
+        BigDecimal bigDecimal = bigDecimalValueNoNegativeZeroCheck();
+
+        if (hasDifferentSign(bigDecimal)) {
+            return -0.0d;
+        }
+
+        return bigDecimal.doubleValue();
+    }
+
+    /**
+     * Returns true if the encoded representation of this instance is the same as the encoded representation of {@code o}.
+     * <p>
+     * One consequence is that, whereas {@code Double.NaN != Double.NaN},
+     * {@code new Decimal128("NaN").equals(new Decimal128("NaN")} returns true.
+     * </p>
+     * <p>
+     * Another consequence is that, as with BigDecimal, {@code new Decimal128("1.0").equals(new Decimal128("1.00")} returns false,
+     * because the precision is not the same and therefore the representation is not the same.
+     * </p>
+     *
+     * @param o the object to compare for equality
+     * @return true if the instances are equal
+     */
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Decimal128 that = (Decimal128) o;
+
+        if (high != that.high) {
+            return false;
+        }
+        if (low != that.low) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (int) (low ^ (low >>> 32));
+        result = 31 * result + (int) (high ^ (high >>> 32));
+        return result;
+    }
+
+    /**
+     * Returns the String representation of the Decimal128 value.
+     *
+     * @return the String representation
+     * @see <a href="https://github.com/mongodb/specifications/blob/master/source/bson-decimal128/decimal128.rst#to-string-representation">
+     *     To-String Sprecification</a>
+     */
+    @Override
+    public String toString() {
+        if (isNaN()) {
+            return "NaN";
+        }
+        if (isInfinite()) {
+            if (isNegative()) {
+                return "-Infinity";
+            } else {
+                return "Infinity";
+            }
+        }
+        return toStringWithBigDecimal();
+    }
+
+    private String toStringWithBigDecimal() {
+        StringBuilder buffer = new StringBuilder();
+
+        BigDecimal bigDecimal = bigDecimalValueNoNegativeZeroCheck();
+        String significand = bigDecimal.unscaledValue().abs().toString();
+
+        if (isNegative()) {
+            buffer.append('-');
+        }
+
+        int exponent = -bigDecimal.scale();
+        int adjustedExponent = exponent + (significand.length() - 1);
+        if (exponent <= 0 && adjustedExponent >= -6) {
+            if (exponent == 0) {
+                buffer.append(significand);
+            } else {
+                int pad = -exponent - significand.length();
+                if (pad >= 0) {
+                    buffer.append('0');
+                    buffer.append('.');
+                    for (int i = 0; i < pad; i++) {
+                        buffer.append('0');
+                    }
+                    buffer.append(significand, 0, significand.length());
+                } else {
+                    buffer.append(significand, 0, -pad);
+                    buffer.append('.');
+                    buffer.append(significand, -pad, -pad - exponent);
+                }
+            }
+        } else {
+            buffer.append(significand.charAt(0));
+            if (significand.length() > 1) {
+                buffer.append('.');
+                buffer.append(significand, 1, significand.length());
+            }
+            buffer.append('E');
+            if (adjustedExponent > 0) {
+                buffer.append('+');
+            }
+            buffer.append(adjustedExponent);
+        }
+        return buffer.toString();
+    }
+}
diff --git a/bson/src/main/org/bson/types/MaxKey.java b/bson/src/main/org/bson/types/MaxKey.java
index 54c262ef678..f27cc75d629 100644
--- a/bson/src/main/org/bson/types/MaxKey.java
+++ b/bson/src/main/org/bson/types/MaxKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/types/MinKey.java b/bson/src/main/org/bson/types/MinKey.java
index c4bb7490c33..207934c827e 100644
--- a/bson/src/main/org/bson/types/MinKey.java
+++ b/bson/src/main/org/bson/types/MinKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/types/ObjectId.java b/bson/src/main/org/bson/types/ObjectId.java
index fd28f1b4fb5..1e24497545b 100644
--- a/bson/src/main/org/bson/types/ObjectId.java
+++ b/bson/src/main/org/bson/types/ObjectId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,14 @@
 
 package org.bson.types;
 
-import org.bson.diagnostics.Loggers;
-
 import java.io.Serializable;
-import java.net.NetworkInterface;
-import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.security.SecureRandom;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import static org.bson.assertions.Assertions.isTrueArgument;
+import static org.bson.assertions.Assertions.notNull;
 
 /**
  * <p>A globally unique identifier for objects.</p>
@@ -39,7 +35,7 @@
  *         <td>0</td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td>
  *     </tr>
  *     <tr>
- *         <td colspan="4">time</td><td colspan="3">machine</td> <td colspan="2">pid</td><td colspan="3">inc</td>
+ *         <td colspan="4">time</td><td colspan="5">random value</td><td colspan="3">inc</td>
  *     </tr>
  * </table>
  *
@@ -51,22 +47,23 @@ public final class ObjectId implements Comparable<ObjectId>, Serializable {
 
     private static final long serialVersionUID = 3670079982654483072L;
 
-    static final Logger LOGGER = Loggers.getLogger("ObjectId");
-
+    private static final int OBJECT_ID_LENGTH = 12;
     private static final int LOW_ORDER_THREE_BYTES = 0x00ffffff;
 
-    private static final int MACHINE_IDENTIFIER;
-    private static final short PROCESS_IDENTIFIER;
+    // Use primitives to represent the 5-byte random value.
+    private static final int RANDOM_VALUE1;
+    private static final short RANDOM_VALUE2;
+
     private static final AtomicInteger NEXT_COUNTER = new AtomicInteger(new SecureRandom().nextInt());
 
     private static final char[] HEX_CHARS = new char[] {
-      '0', '1', '2', '3', '4', '5', '6', '7',
-      '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+            '0', '1', '2', '3', '4', '5', '6', '7',
+            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
 
     private final int timestamp;
-    private final int machineIdentifier;
-    private final short processIdentifier;
     private final int counter;
+    private final int randomValue1;
+    private final short randomValue2;
 
     /**
      * Gets a new object id.
@@ -112,54 +109,6 @@ public static boolean isValid(final String hexString) {
         return true;
     }
 
-    /**
-     * Gets the generated machine identifier.
-     *
-     * @return an int representing the machine identifier
-     */
-    public static int getGeneratedMachineIdentifier() {
-        return MACHINE_IDENTIFIER;
-    }
-
-    /**
-     * Gets the generated process identifier.
-     *
-     * @return the process id
-     */
-    public static int getGeneratedProcessIdentifier() {
-        return PROCESS_IDENTIFIER;
-    }
-
-    /**
-     * Gets the current value of the auto-incrementing counter.
-     *
-     * @return the current counter value.
-     */
-    public static int getCurrentCounter() {
-        return NEXT_COUNTER.get();
-    }
-
-    /**
-     * <p>Creates an ObjectId using time, machine and inc values.  The Java driver used to create all ObjectIds this way, but it does not
-     * match the <a href="http://docs.mongodb.org/manual/reference/object-id/">ObjectId specification</a>, which requires four values, not
-     * three. This major release of the Java driver conforms to the specification, but still supports clients that are relying on the
-     * behavior of the previous major release by providing this explicit factory method that takes three parameters instead of four.</p>
-     *
-     * <p>Ordinary users of the driver will not need this method.  It's only for those that have written there own BSON decoders.</p>
-     *
-     * <p>NOTE: This will not break any application that use ObjectIds.  The 12-byte representation will be round-trippable from old to new
-     * driver releases.</p>
-     *
-     * @param time    time in seconds
-     * @param machine machine ID
-     * @param inc     incremental value
-     * @return a new {@code ObjectId} created from the given values
-     * @since 2.12.0
-     */
-    public static ObjectId createFromLegacyFormat(final int time, final int machine, final int inc) {
-        return new ObjectId(time, machine, inc);
-    }
-
     /**
      * Create a new object id.
      */
@@ -173,7 +122,7 @@ public ObjectId() {
      * @param date the date
      */
     public ObjectId(final Date date) {
-        this(dateToTimestampSeconds(date), MACHINE_IDENTIFIER, PROCESS_IDENTIFIER, NEXT_COUNTER.getAndIncrement(), false);
+        this(dateToTimestampSeconds(date), NEXT_COUNTER.getAndIncrement() & LOW_ORDER_THREE_BYTES, false);
     }
 
     /**
@@ -184,7 +133,7 @@ public ObjectId(final Date date) {
      * @throws IllegalArgumentException if the high order byte of counter is not zero
      */
     public ObjectId(final Date date, final int counter) {
-        this(date, MACHINE_IDENTIFIER, PROCESS_IDENTIFIER, counter);
+        this(dateToTimestampSeconds(date), counter, true);
     }
 
     /**
@@ -195,7 +144,9 @@ public ObjectId(final Date date, final int counter) {
      * @param processIdentifier the process identifier
      * @param counter           the counter
      * @throws IllegalArgumentException if the high order byte of machineIdentifier or counter is not zero
+     * @deprecated Use {@link #ObjectId(Date, int)} instead
      */
+    @Deprecated
     public ObjectId(final Date date, final int machineIdentifier, final short processIdentifier, final int counter) {
         this(dateToTimestampSeconds(date), machineIdentifier, processIdentifier, counter);
     }
@@ -208,23 +159,40 @@ public ObjectId(final Date date, final int machineIdentifier, final short proces
      * @param processIdentifier the process identifier
      * @param counter           the counter
      * @throws IllegalArgumentException if the high order byte of machineIdentifier or counter is not zero
+     * @deprecated Use {@link #ObjectId(int, int)} instead
      */
+    @Deprecated
     public ObjectId(final int timestamp, final int machineIdentifier, final short processIdentifier, final int counter) {
         this(timestamp, machineIdentifier, processIdentifier, counter, true);
     }
 
-    private ObjectId(final int timestamp, final int machineIdentifier, final short processIdentifier, final int counter,
+    /**
+     * Creates an ObjectId using the given time, machine identifier, process identifier, and counter.
+     *
+     * @param timestamp         the time in seconds
+     * @param counter           the counter
+     * @throws IllegalArgumentException if the high order byte of counter is not zero
+     */
+    public ObjectId(final int timestamp, final int counter) {
+        this(timestamp, counter, true);
+    }
+
+    private ObjectId(final int timestamp, final int counter, final boolean checkCounter) {
+        this(timestamp, RANDOM_VALUE1, RANDOM_VALUE2, counter, checkCounter);
+    }
+
+    private ObjectId(final int timestamp, final int randomValue1, final short randomValue2, final int counter,
                      final boolean checkCounter) {
-        if ((machineIdentifier & 0xff000000) != 0) {
+        if ((randomValue1 & 0xff000000) != 0) {
             throw new IllegalArgumentException("The machine identifier must be between 0 and 16777215 (it must fit in three bytes).");
         }
         if (checkCounter && ((counter & 0xff000000) != 0)) {
             throw new IllegalArgumentException("The counter must be between 0 and 16777215 (it must fit in three bytes).");
         }
         this.timestamp = timestamp;
-        this.machineIdentifier = machineIdentifier;
-        this.processIdentifier = processIdentifier;
         this.counter = counter & LOW_ORDER_THREE_BYTES;
+        this.randomValue1 = randomValue1;
+        this.randomValue2 = randomValue2;
     }
 
     /**
@@ -244,17 +212,7 @@ public ObjectId(final String hexString) {
      * @throws IllegalArgumentException if array is null or not of length 12
      */
     public ObjectId(final byte[] bytes) {
-        if (bytes == null) {
-            throw new IllegalArgumentException();
-        }
-        if (bytes.length != 12) {
-            throw new IllegalArgumentException("need 12 bytes");
-        }
-
-        timestamp = makeInt(bytes[0], bytes[1], bytes[2], bytes[3]);
-        machineIdentifier = makeInt((byte) 0, bytes[4], bytes[5], bytes[6]);
-        processIdentifier = (short) makeInt((byte) 0, (byte) 0, bytes[7], bytes[8]);
-        counter = makeInt((byte) 0, bytes[9], bytes[10], bytes[11]);
+        this(ByteBuffer.wrap(isTrueArgument("bytes has length of 12", bytes, notNull("bytes", bytes).length == 12)));
     }
 
     /**
@@ -268,8 +226,27 @@ public ObjectId(final byte[] bytes) {
         this(legacyToBytes(timestamp, machineAndProcessIdentifier, counter));
     }
 
+    /**
+     * Constructs a new instance from the given ByteBuffer
+     *
+     * @param buffer the ByteBuffer
+     * @throws IllegalArgumentException if the buffer is null or does not have at least 12 bytes remaining
+     * @since 3.4
+     */
+    public ObjectId(final ByteBuffer buffer) {
+        notNull("buffer", buffer);
+        isTrueArgument("buffer.remaining() >=12", buffer.remaining() >= OBJECT_ID_LENGTH);
+
+        // Note: Cannot use ByteBuffer.getInt because it depends on tbe buffer's byte order
+        // and ObjectId's are always in big-endian order.
+        timestamp = makeInt(buffer.get(), buffer.get(), buffer.get(), buffer.get());
+        randomValue1 = makeInt((byte) 0, buffer.get(), buffer.get(), buffer.get());
+        randomValue2 = makeShort(buffer.get(), buffer.get());
+        counter = makeInt((byte) 0, buffer.get(), buffer.get(), buffer.get());
+    }
+
     private static byte[] legacyToBytes(final int timestamp, final int machineAndProcessIdentifier, final int counter) {
-        byte[] bytes = new byte[12];
+        byte[] bytes = new byte[OBJECT_ID_LENGTH];
         bytes[0] = int3(timestamp);
         bytes[1] = int2(timestamp);
         bytes[2] = int1(timestamp);
@@ -291,56 +268,44 @@ private static byte[] legacyToBytes(final int timestamp, final int machineAndPro
      * @return the byte array
      */
     public byte[] toByteArray() {
-        byte[] bytes = new byte[12];
-        bytes[0] = int3(timestamp);
-        bytes[1] = int2(timestamp);
-        bytes[2] = int1(timestamp);
-        bytes[3] = int0(timestamp);
-        bytes[4] = int2(machineIdentifier);
-        bytes[5] = int1(machineIdentifier);
-        bytes[6] = int0(machineIdentifier);
-        bytes[7] = short1(processIdentifier);
-        bytes[8] = short0(processIdentifier);
-        bytes[9] = int2(counter);
-        bytes[10] = int1(counter);
-        bytes[11] = int0(counter);
-        return bytes;
+        ByteBuffer buffer = ByteBuffer.allocate(OBJECT_ID_LENGTH);
+        putToByteBuffer(buffer);
+        return buffer.array();  // using .allocate ensures there is a backing array that can be returned
     }
 
     /**
-     * Gets the timestamp (number of seconds since the Unix epoch).
-     *
-     * @return the timestamp
-     */
-    public int getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Gets the machine identifier.
-     *
-     * @return the machine identifier
-     */
-    public int getMachineIdentifier() {
-        return machineIdentifier;
-    }
-
-    /**
-     * Gets the process identifier.
+     * Convert to bytes and put those bytes to the provided ByteBuffer.
+     * Note that the numbers are stored in big-endian order.
      *
-     * @return the process identifier
+     * @param buffer the ByteBuffer
+     * @throws IllegalArgumentException if the buffer is null or does not have at least 12 bytes remaining
+     * @since 3.4
      */
-    public short getProcessIdentifier() {
-        return processIdentifier;
+    public void putToByteBuffer(final ByteBuffer buffer) {
+        notNull("buffer", buffer);
+        isTrueArgument("buffer.remaining() >=12", buffer.remaining() >= OBJECT_ID_LENGTH);
+
+        buffer.put(int3(timestamp));
+        buffer.put(int2(timestamp));
+        buffer.put(int1(timestamp));
+        buffer.put(int0(timestamp));
+        buffer.put(int2(randomValue1));
+        buffer.put(int1(randomValue1));
+        buffer.put(int0(randomValue1));
+        buffer.put(short1(randomValue2));
+        buffer.put(short0(randomValue2));
+        buffer.put(int2(counter));
+        buffer.put(int1(counter));
+        buffer.put(int0(counter));
     }
 
     /**
-     * Gets the counter.
+     * Gets the timestamp (number of seconds since the Unix epoch).
      *
-     * @return the counter
+     * @return the timestamp
      */
-    public int getCounter() {
-        return counter;
+    public int getTimestamp() {
+        return timestamp;
     }
 
     /**
@@ -349,7 +314,7 @@ public int getCounter() {
      * @return the Date
      */
     public Date getDate() {
-        return new Date(timestamp * 1000L);
+        return new Date((timestamp & 0xFFFFFFFFL) * 1000L);
     }
 
     /**
@@ -358,13 +323,13 @@ public Date getDate() {
      * @return a string representation of the ObjectId in hexadecimal format
      */
     public String toHexString() {
-      char[] chars = new char[24];
-      int i = 0;
-      for (byte b : toByteArray()) {
-        chars[i++] = HEX_CHARS[b >> 4 & 0xF];
-        chars[i++] = HEX_CHARS[b & 0xF];
-      }
-      return new String(chars);
+        char[] chars = new char[OBJECT_ID_LENGTH * 2];
+        int i = 0;
+        for (byte b : toByteArray()) {
+            chars[i++] = HEX_CHARS[b >> 4 & 0xF];
+            chars[i++] = HEX_CHARS[b & 0xF];
+        }
+        return new String(chars);
     }
 
     @Override
@@ -381,13 +346,15 @@ public boolean equals(final Object o) {
         if (counter != objectId.counter) {
             return false;
         }
-        if (machineIdentifier != objectId.machineIdentifier) {
+        if (timestamp != objectId.timestamp) {
             return false;
         }
-        if (processIdentifier != objectId.processIdentifier) {
+
+        if (randomValue1 != objectId.randomValue1) {
             return false;
         }
-        if (timestamp != objectId.timestamp) {
+
+        if (randomValue2 != objectId.randomValue2) {
             return false;
         }
 
@@ -397,9 +364,9 @@ public boolean equals(final Object o) {
     @Override
     public int hashCode() {
         int result = timestamp;
-        result = 31 * result + machineIdentifier;
-        result = 31 * result + (int) processIdentifier;
         result = 31 * result + counter;
+        result = 31 * result + randomValue1;
+        result = 31 * result + randomValue2;
         return result;
     }
 
@@ -411,7 +378,7 @@ public int compareTo(final ObjectId other) {
 
         byte[] byteArray = toByteArray();
         byte[] otherByteArray = other.toByteArray();
-        for (int i = 0; i < 12; i++) {
+        for (int i = 0; i < OBJECT_ID_LENGTH; i++) {
             if (byteArray[i] != otherByteArray[i]) {
                 return ((byteArray[i] & 0xff) < (otherByteArray[i] & 0xff)) ? -1 : 1;
             }
@@ -426,11 +393,100 @@ public String toString() {
 
     // Deprecated methods
 
+    /**
+     * <p>Creates an ObjectId using time, machine and inc values.  The Java driver used to create all ObjectIds this way, but it does not
+     * match the <a href="http://docs.mongodb.org/manual/reference/object-id/">ObjectId specification</a>, which requires four values, not
+     * three. This major release of the Java driver conforms to the specification, but still supports clients that are relying on the
+     * behavior of the previous major release by providing this explicit factory method that takes three parameters instead of four.</p>
+     *
+     * <p>Ordinary users of the driver will not need this method.  It's only for those that have written there own BSON decoders.</p>
+     *
+     * <p>NOTE: This will not break any application that use ObjectIds.  The 12-byte representation will be round-trippable from old to new
+     * driver releases.</p>
+     *
+     * @param time    time in seconds
+     * @param machine machine ID
+     * @param inc     incremental value
+     * @return a new {@code ObjectId} created from the given values
+     * @since 2.12.0
+     * @deprecated Use {@link #ObjectId(int, int)} instead
+     */
+    @Deprecated
+    public static ObjectId createFromLegacyFormat(final int time, final int machine, final int inc) {
+        return new ObjectId(time, machine, inc);
+    }
+
+    /**
+     * Gets the current value of the auto-incrementing counter.
+     *
+     * @return the current counter value.
+     * @deprecated
+     */
+    @Deprecated
+    public static int getCurrentCounter() {
+        return NEXT_COUNTER.get() & LOW_ORDER_THREE_BYTES;
+    }
+
+    /**
+     * Gets the generated machine identifier.
+     *
+     * @return an int representing the machine identifier
+     * @deprecated
+     */
+    @Deprecated
+    public static int getGeneratedMachineIdentifier() {
+        return RANDOM_VALUE1;
+    }
+
+    /**
+     * Gets the generated process identifier.
+     *
+     * @return the process id
+     * @deprecated
+     */
+    @Deprecated
+    public static int getGeneratedProcessIdentifier() {
+        return RANDOM_VALUE2;
+    }
+
+    /**
+     * Gets the machine identifier.
+     *
+     * @return the machine identifier
+     * @deprecated
+     */
+    @Deprecated
+    public int getMachineIdentifier() {
+        return randomValue1;
+    }
+
+    /**
+     * Gets the process identifier.
+     *
+     * @return the process identifier
+     * @deprecated
+     */
+    @Deprecated
+    public short getProcessIdentifier() {
+        return randomValue2;
+    }
+
+    /**
+     * Gets the counter.
+     *
+     * @return the counter
+     * @deprecated
+     */
+    @Deprecated
+    public int getCounter() {
+        return counter;
+    }
+
     /**
      * Gets the time of this ID, in seconds.
      *
-     * @deprecated Use #getTimestamp instead
      * @return the time component of this ID in seconds
+     * @deprecated Use #getTimestamp instead
      */
     @Deprecated
     public int getTimeSecond() {
@@ -440,12 +496,12 @@ public int getTimeSecond() {
     /**
      * Gets the time of this instance, in milliseconds.
      *
-     * @deprecated Use #getDate instead
      * @return the time component of this ID in milliseconds
+     * @deprecated Use #getDate instead
      */
     @Deprecated
     public long getTime() {
-        return timestamp * 1000L;
+        return (timestamp & 0xFFFFFFFFL) * 1000L;
     }
 
     /**
@@ -460,70 +516,20 @@ public String toStringMongod() {
 
     static {
         try {
-            MACHINE_IDENTIFIER = createMachineIdentifier();
-            PROCESS_IDENTIFIER = createProcessIdentifier();
+            SecureRandom secureRandom = new SecureRandom();
+            RANDOM_VALUE1 = secureRandom.nextInt(0x01000000);
+            RANDOM_VALUE2 = (short) secureRandom.nextInt(0x00008000);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
-    private static int createMachineIdentifier() {
-        // build a 2-byte machine piece based on NICs info
-        int machinePiece;
-        try {
-            StringBuilder sb = new StringBuilder();
-            Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
-            while (e.hasMoreElements()) {
-                NetworkInterface ni = e.nextElement();
-                sb.append(ni.toString());
-                byte[] mac = ni.getHardwareAddress();
-                if (mac != null) {
-                    ByteBuffer bb = ByteBuffer.wrap(mac);
-                    try {
-                        sb.append(bb.getChar());
-                        sb.append(bb.getChar());
-                        sb.append(bb.getChar());
-                    } catch (BufferUnderflowException shortHardwareAddressException) { //NOPMD
-                        // mac with less than 6 bytes. continue
-                    }
-                }
-            }
-            machinePiece = sb.toString().hashCode();
-        } catch (Throwable t) {
-            // exception sometimes happens with IBM JVM, use random
-            machinePiece = (new SecureRandom().nextInt());
-            LOGGER.log(Level.WARNING, "Failed to get machine identifier from network interface, using random number instead", t);
-        }
-        machinePiece = machinePiece & LOW_ORDER_THREE_BYTES;
-        return machinePiece;
-    }
-
-    // Creates the process identifier.  This does not have to be unique per class loader because
-    // NEXT_COUNTER will provide the uniqueness.
-    private static short createProcessIdentifier() {
-        short processId;
-        try {
-            String processName = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();
-            if (processName.contains("@")) {
-                processId = (short) Integer.parseInt(processName.substring(0, processName.indexOf('@')));
-            } else {
-                processId = (short) java.lang.management.ManagementFactory.getRuntimeMXBean().getName().hashCode();
-            }
-
-        } catch (Throwable t) {
-            processId = (short) new SecureRandom().nextInt();
-            LOGGER.log(Level.WARNING, "Failed to get process identifier from JMX, using random number instead", t);
-        }
-
-        return processId;
-    }
-
     private static byte[] parseHexString(final String s) {
         if (!isValid(s)) {
             throw new IllegalArgumentException("invalid hexadecimal representation of an ObjectId: [" + s + "]");
         }
 
-        byte[] b = new byte[12];
+        byte[] b = new byte[OBJECT_ID_LENGTH];
         for (int i = 0; i < b.length; i++) {
             b[i] = (byte) Integer.parseInt(s.substring(i * 2, i * 2 + 2), 16);
         }
@@ -545,6 +551,12 @@ private static int makeInt(final byte b3, final byte b2, final byte b1, final by
         // CHECKSTYLE:ON
     }
 
+    private static short makeShort(final byte b1, final byte b0) {
+        // CHECKSTYLE:OFF
+        return (short) (((b1 & 0xff) << 8) | ((b0 & 0xff)));
+        // CHECKSTYLE:ON
+    }
+
     private static byte int3(final int x) {
         return (byte) (x >> 24);
     }
@@ -568,5 +580,5 @@ private static byte short1(final short x) {
     private static byte short0(final short x) {
         return (byte) (x);
     }
-}
 
+}
diff --git a/driver/src/main/org/bson/types/StringRangeSet.java b/bson/src/main/org/bson/types/StringRangeSet.java
similarity index 93%
rename from driver/src/main/org/bson/types/StringRangeSet.java
rename to bson/src/main/org/bson/types/StringRangeSet.java
index 20b31c0e7fc..4daca26cc03 100644
--- a/driver/src/main/org/bson/types/StringRangeSet.java
+++ b/bson/src/main/org/bson/types/StringRangeSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import static com.mongodb.assertions.Assertions.isTrue;
+import static org.bson.assertions.Assertions.isTrue;
+
 
 class StringRangeSet implements Set<String> {
 
@@ -55,8 +56,12 @@ public boolean contains(final Object o) {
         if (!(o instanceof String)) {
             return false;
         }
-        int i = Integer.parseInt((String) o);
-        return i >= 0 && i < size();
+        try {
+            int i = Integer.parseInt((String) o);
+            return i >= 0 && i < size();
+        } catch (NumberFormatException e) {
+            return false;
+        }
     }
 
     @Override
diff --git a/bson/src/main/org/bson/types/Symbol.java b/bson/src/main/org/bson/types/Symbol.java
index cf63e5235dd..67960e443bc 100644
--- a/bson/src/main/org/bson/types/Symbol.java
+++ b/bson/src/main/org/bson/types/Symbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/types/package-info.java b/bson/src/main/org/bson/types/package-info.java
index 3dda24fd65f..a82a0da608b 100644
--- a/bson/src/main/org/bson/types/package-info.java
+++ b/bson/src/main/org/bson/types/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/org/bson/util/AbstractCopyOnWriteMap.java b/bson/src/main/org/bson/util/AbstractCopyOnWriteMap.java
similarity index 98%
rename from driver/src/main/org/bson/util/AbstractCopyOnWriteMap.java
rename to bson/src/main/org/bson/util/AbstractCopyOnWriteMap.java
index a05dfb72239..e023f0538c0 100644
--- a/driver/src/main/org/bson/util/AbstractCopyOnWriteMap.java
+++ b/bson/src/main/org/bson/util/AbstractCopyOnWriteMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,6 @@
 
 package org.bson.util;
 
-import com.mongodb.annotations.ThreadSafe;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -28,9 +27,9 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static com.mongodb.assertions.Assertions.notNull;
 import static java.util.Collections.unmodifiableCollection;
 import static java.util.Collections.unmodifiableSet;
+import static org.bson.assertions.Assertions.notNull;
 
 /**
  * Abstract base class for COW {@link java.util.Map} implementations that delegate to an internal map.
@@ -39,7 +38,6 @@
  * @param <V> The value type
  * @param <M> the internal {@link java.util.Map} or extension for things like sorted and navigable maps.
  */
-@ThreadSafe
 abstract class AbstractCopyOnWriteMap<K, V, M extends Map<K, V>> implements ConcurrentMap<K, V> {
 
     // @GuardedBy("lock")
@@ -459,7 +457,7 @@ public boolean retainAll(final Collection<?> c) {
     private static class UnmodifiableIterator<T> implements Iterator<T> {
         private final Iterator<T> delegate;
 
-        public UnmodifiableIterator(final Iterator<T> delegate) {
+        UnmodifiableIterator(final Iterator<T> delegate) {
             this.delegate = delegate;
         }
 
diff --git a/driver/src/main/org/bson/util/ClassAncestry.java b/bson/src/main/org/bson/util/ClassAncestry.java
similarity index 95%
rename from driver/src/main/org/bson/util/ClassAncestry.java
rename to bson/src/main/org/bson/util/ClassAncestry.java
index e67451541e2..9f4a7008d51 100644
--- a/driver/src/main/org/bson/util/ClassAncestry.java
+++ b/bson/src/main/org/bson/util/ClassAncestry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 import java.util.concurrent.ConcurrentMap;
 
 import static java.util.Collections.unmodifiableList;
-import static org.bson.util.CopyOnWriteMap.newHashMap;
 
+@SuppressWarnings("deprecation")
 class ClassAncestry {
 
     /**
@@ -81,6 +81,6 @@ private static ConcurrentMap<Class<?>, List<Class<?>>> getClassAncestryCache() {
         return (_ancestryCache);
     }
 
-    private static final ConcurrentMap<Class<?>, List<Class<?>>> _ancestryCache = newHashMap();
+    private static final ConcurrentMap<Class<?>, List<Class<?>>> _ancestryCache = CopyOnWriteMap.newHashMap();
 }
 
diff --git a/driver/src/main/org/bson/util/ClassMap.java b/bson/src/main/org/bson/util/ClassMap.java
similarity index 97%
rename from driver/src/main/org/bson/util/ClassMap.java
rename to bson/src/main/org/bson/util/ClassMap.java
index 622733f4423..d42ecbf5db6 100644
--- a/driver/src/main/org/bson/util/ClassMap.java
+++ b/bson/src/main/org/bson/util/ClassMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,9 @@
  * (assuming Dog.class &lt; Animal.class)
  *
  * @param <T> the type of the value in this map
+ * @deprecated there is no replacement for this class
  */
+@Deprecated
 public class ClassMap<T> {
     /**
      * Helper method that walks superclass and interface graph, superclasses first, then interfaces, to compute an ancestry list. Super
diff --git a/driver/src/main/org/bson/util/ComputingMap.java b/bson/src/main/org/bson/util/ComputingMap.java
similarity index 96%
rename from driver/src/main/org/bson/util/ComputingMap.java
rename to bson/src/main/org/bson/util/ComputingMap.java
index 607f1de4f2c..347531c9f55 100644
--- a/driver/src/main/org/bson/util/ComputingMap.java
+++ b/bson/src/main/org/bson/util/ComputingMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
-import static com.mongodb.assertions.Assertions.notNull;
+import static org.bson.assertions.Assertions.notNull;
 
+@SuppressWarnings("deprecation")
 final class ComputingMap<K, V> implements Map<K, V>, Function<K, V> {
 
     public static <K, V> Map<K, V> create(final Function<K, V> function) {
diff --git a/driver/src/main/org/bson/util/CopyOnWriteMap.java b/bson/src/main/org/bson/util/CopyOnWriteMap.java
similarity index 96%
rename from driver/src/main/org/bson/util/CopyOnWriteMap.java
rename to bson/src/main/org/bson/util/CopyOnWriteMap.java
index f04a3e3e914..cecb200d418 100644
--- a/driver/src/main/org/bson/util/CopyOnWriteMap.java
+++ b/bson/src/main/org/bson/util/CopyOnWriteMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,6 @@
 
 package org.bson.util;
 
-import com.mongodb.annotations.ThreadSafe;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -32,7 +30,7 @@
  * mutations, and is useful when you cannot or don't want to synchronize traversals, yet need to preclude interference among concurrent
  * threads. The "snapshot" style iterators on the collections returned by {@link #entrySet()}, {@link #keySet()} and {@link #values()} use a
  * reference to the internal map at the point that the iterator was created. This map never changes during the lifetime of the iterator, so
- * interference is impossible and the iterator is guaranteed not to throw <tt>ConcurrentModificationException</tt>. The iterators will not
+ * interference is impossible and the iterator is guaranteed not to throw {@code ConcurrentModificationException}. The iterators will not
  * reflect additions, removals, or changes to the list since the iterator was created. Removing elements via these iterators is not
  * supported. The mutable operations on these collections (remove, retain etc.) are supported but as with the {@link java.util.Map}
  * interface, add and addAll are not and throw {@link UnsupportedOperationException}.</p> <p>The actual copy is performed by an abstract
@@ -58,7 +56,6 @@
  * @param <V> the value type
  * @author Jed Wesley-Smith
  */
-@ThreadSafe
 abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K, V>> {
     private static final long serialVersionUID = 7935514534647505917L;
 
@@ -169,19 +166,14 @@ public static <K, V> CopyOnWriteMap<K, V> newLinkedMap(final Map<? extends K, ?
      * Create a new {@link CopyOnWriteMap} with the supplied {@link Map} to initialize the values.
      *
      * @param map the initial map to initialize with
-     * @deprecated since 0.0.12 use the versions that explicitly specify View.Type
      */
-    @Deprecated
     protected CopyOnWriteMap(final Map<? extends K, ? extends V> map) {
         this(map, View.Type.LIVE);
     }
 
     /**
      * Create a new empty {@link CopyOnWriteMap}.
-     *
-     * @deprecated since 0.0.12 use the versions that explicitly specify View.Type
      */
-    @Deprecated
     protected CopyOnWriteMap() {
         this(Collections.<K, V>emptyMap(), View.Type.LIVE);
     }
diff --git a/driver/src/main/org/bson/util/Function.java b/bson/src/main/org/bson/util/Function.java
similarity index 93%
rename from driver/src/main/org/bson/util/Function.java
rename to bson/src/main/org/bson/util/Function.java
index dc49f1fd07b..b4cc3d66b09 100644
--- a/driver/src/main/org/bson/util/Function.java
+++ b/bson/src/main/org/bson/util/Function.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/main/org/bson/util/package-info.java b/bson/src/main/org/bson/util/package-info.java
new file mode 100644
index 00000000000..9226065ec35
--- /dev/null
+++ b/bson/src/main/org/bson/util/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Contains helper classes for working with the BSON protocol.
+ */
+package org.bson.util;
diff --git a/bson/src/test/resources/bson/array.json b/bson/src/test/resources/bson/array.json
index 60c4e2f97d7..9ff953e5ae7 100644
--- a/bson/src/test/resources/bson/array.json
+++ b/bson/src/test/resources/bson/array.json
@@ -1,37 +1,49 @@
 {
-    "description": "Array type", 
-    "documents": [
-        {
-            "decoded": {
-                "a": []
-            }, 
-            "encoded": "0D000000046100050000000000"
-        }, 
-        {
-            "decoded": {
-                "a": [
-                    10
-                ]
-            }, 
-            "encoded": "140000000461000C0000001030000A0000000000"
-        }, 
-        {
-            "decodeOnly": true, 
-            "decoded": {
-                "a": [
-                    10
-                ]
-            }, 
-            "encoded": "130000000461000B00000010000A0000000000"
-        }, 
-        {
-            "decodeOnly": true, 
-            "decoded": {
-                "a": [
-                    10
-                ]
-            }, 
-            "encoded": "150000000461000D000000106162000A0000000000"
+    "description": "Array",
+    "bson_type": "0x04",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Empty",
+            "canonical_bson": "0D000000046100050000000000",
+            "canonical_extjson": "{\"a\" : []}"
+        },
+        {
+            "description": "Single Element Array",
+            "canonical_bson": "140000000461000C0000001030000A0000000000",
+            "canonical_extjson": "{\"a\" : [{\"$numberInt\": \"10\"}]}"
+        },
+        {
+            "description": "Single Element Array with index set incorrectly to empty string",
+            "degenerate_bson": "130000000461000B00000010000A0000000000",
+            "canonical_bson": "140000000461000C0000001030000A0000000000",
+            "canonical_extjson": "{\"a\" : [{\"$numberInt\": \"10\"}]}"
+        },
+        {
+            "description": "Single Element Array with index set incorrectly to ab",
+            "degenerate_bson": "150000000461000D000000106162000A0000000000",
+            "canonical_bson": "140000000461000C0000001030000A0000000000",
+            "canonical_extjson": "{\"a\" : [{\"$numberInt\": \"10\"}]}"
+        },
+        {
+            "description": "Multi Element Array with duplicate indexes",
+            "degenerate_bson": "1b000000046100130000001030000a000000103000140000000000",
+            "canonical_bson": "1b000000046100130000001030000a000000103100140000000000",
+            "canonical_extjson": "{\"a\" : [{\"$numberInt\": \"10\"}, {\"$numberInt\": \"20\"}]}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "Array length too long: eats outer terminator",
+            "bson": "140000000461000D0000001030000A0000000000"
+        },
+        {
+            "description": "Array length too short: leaks terminator",
+            "bson": "140000000461000B0000001030000A0000000000"
+        },
+        {
+            "description": "Invalid Array: bad string length in field",
+            "bson": "1A00000004666F6F00100000000230000500000062617A000000"
         }
     ]
 }
diff --git a/bson/src/test/resources/bson/binary.json b/bson/src/test/resources/bson/binary.json
new file mode 100644
index 00000000000..90a15c1a1c4
--- /dev/null
+++ b/bson/src/test/resources/bson/binary.json
@@ -0,0 +1,85 @@
+{
+    "description": "Binary type",
+    "bson_type": "0x05",
+    "test_key": "x",
+    "valid": [
+        {
+            "description": "subtype 0x00 (Zero-length)",
+            "canonical_bson": "0D000000057800000000000000",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"\", \"subType\" : \"00\"}}}"
+        },
+        {
+            "description": "subtype 0x00 (Zero-length, keys reversed)",
+            "canonical_bson": "0D000000057800000000000000",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"\", \"subType\" : \"00\"}}}",
+            "degenerate_extjson": "{\"x\" : { \"$binary\" : {\"subType\" : \"00\", \"base64\" : \"\"}}}"
+        },
+        {
+            "description": "subtype 0x00",
+            "canonical_bson": "0F0000000578000200000000FFFF00",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"//8=\", \"subType\" : \"00\"}}}"
+        },
+        {
+            "description": "subtype 0x01",
+            "canonical_bson": "0F0000000578000200000001FFFF00",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"//8=\", \"subType\" : \"01\"}}}"
+        },
+        {
+            "description": "subtype 0x02",
+            "canonical_bson": "13000000057800060000000202000000FFFF00",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"//8=\", \"subType\" : \"02\"}}}"
+        },
+        {
+            "description": "subtype 0x03",
+            "canonical_bson": "1D000000057800100000000373FFD26444B34C6990E8E7D1DFC035D400",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"c//SZESzTGmQ6OfR38A11A==\", \"subType\" : \"03\"}}}"
+        },
+        {
+            "description": "subtype 0x04",
+            "canonical_bson": "1D000000057800100000000473FFD26444B34C6990E8E7D1DFC035D400",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"c//SZESzTGmQ6OfR38A11A==\", \"subType\" : \"04\"}}}"
+        },
+        {
+            "description": "subtype 0x05",
+            "canonical_bson": "1D000000057800100000000573FFD26444B34C6990E8E7D1DFC035D400",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"c//SZESzTGmQ6OfR38A11A==\", \"subType\" : \"05\"}}}"
+        },
+        {
+            "description": "subtype 0x80",
+            "canonical_bson": "0F0000000578000200000080FFFF00",
+            "canonical_extjson": "{\"x\" : { \"$binary\" : {\"base64\" : \"//8=\", \"subType\" : \"80\"}}}"
+        },
+        {
+            "description": "$type query operator (conflicts with legacy $binary form with $type field)",
+            "canonical_bson": "1F000000037800170000000224747970650007000000737472696E67000000",
+            "canonical_extjson": "{\"x\" : { \"$type\" : \"string\"}}"
+        },
+        {
+            "description": "$type query operator (conflicts with legacy $binary form with $type field)",
+            "canonical_bson": "180000000378001000000010247479706500020000000000",
+            "canonical_extjson": "{\"x\" : { \"$type\" : {\"$numberInt\": \"2\"}}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "Length longer than document",
+            "bson": "1D000000057800FF0000000573FFD26444B34C6990E8E7D1DFC035D400"
+        },
+        {
+            "description": "Negative length",
+            "bson": "0D000000057800FFFFFFFF0000"
+        },
+        {
+            "description": "subtype 0x02 length too long ",
+            "bson": "13000000057800060000000203000000FFFF00"
+        },
+        {
+            "description": "subtype 0x02 length too short",
+            "bson": "13000000057800060000000201000000FFFF00"
+        },
+        {
+            "description": "subtype 0x02 length negative one",
+            "bson": "130000000578000600000002FFFFFFFFFFFF00"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/boolean.json b/bson/src/test/resources/bson/boolean.json
index 0feff4c198c..84c282299a1 100644
--- a/bson/src/test/resources/bson/boolean.json
+++ b/bson/src/test/resources/bson/boolean.json
@@ -1,17 +1,27 @@
 {
-    "description": "Boolean type", 
-    "documents": [
+    "description": "Boolean",
+    "bson_type": "0x08",
+    "test_key": "b",
+    "valid": [
         {
-            "decoded": {
-                "b": true
-            }, 
-            "encoded": "090000000862000100"
-        }, 
+            "description": "True",
+            "canonical_bson": "090000000862000100",
+            "canonical_extjson": "{\"b\" : true}"
+        },
         {
-            "decoded": {
-                "b": false
-            }, 
-            "encoded": "090000000862000000"
+            "description": "False",
+            "canonical_bson": "090000000862000000",
+            "canonical_extjson": "{\"b\" : false}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "Invalid boolean value of 2",
+            "bson": "090000000862000200"
+        },
+        {
+            "description": "Invalid boolean value of -1",
+            "bson": "09000000086200FF00"
         }
     ]
 }
diff --git a/bson/src/test/resources/bson/code.json b/bson/src/test/resources/bson/code.json
new file mode 100644
index 00000000000..6f37349ad0b
--- /dev/null
+++ b/bson/src/test/resources/bson/code.json
@@ -0,0 +1,67 @@
+{
+    "description": "Javascript Code",
+    "bson_type": "0x0D",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Empty string",
+            "canonical_bson": "0D0000000D6100010000000000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"\"}}"
+        },
+        {
+            "description": "Single character",
+            "canonical_bson": "0E0000000D610002000000620000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"b\"}}"
+        },
+        {
+            "description": "Multi-character",
+            "canonical_bson": "190000000D61000D0000006162616261626162616261620000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"abababababab\"}}"
+        },
+        {
+            "description": "two-byte UTF-8 (\u00e9)",
+            "canonical_bson": "190000000261000D000000C3A9C3A9C3A9C3A9C3A9C3A90000",
+            "canonical_extjson": "{\"a\" : \"\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\"}"
+        },
+        {
+            "description": "three-byte UTF-8 (\u2606)",
+            "canonical_bson": "190000000261000D000000E29886E29886E29886E298860000",
+            "canonical_extjson": "{\"a\" : \"\\u2606\\u2606\\u2606\\u2606\"}"
+        },
+        {
+            "description": "Embedded nulls",
+            "canonical_bson": "190000000261000D0000006162006261620062616261620000",
+            "canonical_extjson": "{\"a\" : \"ab\\u0000bab\\u0000babab\"}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "bad code string length: 0 (but no 0x00 either)",
+            "bson": "0C0000000261000000000000"
+        },
+        {
+            "description": "bad code string length: -1",
+            "bson": "0C000000026100FFFFFFFF00"
+        },
+        {
+            "description": "bad code string length: eats terminator",
+            "bson": "10000000026100050000006200620000"
+        },
+        {
+            "description": "bad code string length: longer than rest of document",
+            "bson": "120000000200FFFFFF00666F6F6261720000"
+        },
+        {
+            "description": "code string is not null-terminated",
+            "bson": "1000000002610004000000616263FF00"
+        },
+        {
+            "description": "empty code string, but extra null",
+            "bson": "0E00000002610001000000000000"
+        },
+        {
+            "description": "invalid UTF-8",
+            "bson": "0E00000002610002000000E90000"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/code_w_scope.json b/bson/src/test/resources/bson/code_w_scope.json
new file mode 100644
index 00000000000..f956bcd54f6
--- /dev/null
+++ b/bson/src/test/resources/bson/code_w_scope.json
@@ -0,0 +1,78 @@
+{
+    "description": "Javascript Code with Scope",
+    "bson_type": "0x0F",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Empty code string, empty scope",
+            "canonical_bson": "160000000F61000E0000000100000000050000000000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"\", \"$scope\" : {}}}"
+        },
+        {
+            "description": "Non-empty code string, empty scope",
+            "canonical_bson": "1A0000000F610012000000050000006162636400050000000000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"abcd\", \"$scope\" : {}}}"
+        },
+        {
+            "description": "Empty code string, non-empty scope",
+            "canonical_bson": "1D0000000F61001500000001000000000C000000107800010000000000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"\", \"$scope\" : {\"x\" : {\"$numberInt\": \"1\"}}}}"
+        },
+        {
+            "description": "Non-empty code string and non-empty scope",
+            "canonical_bson": "210000000F6100190000000500000061626364000C000000107800010000000000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"abcd\", \"$scope\" : {\"x\" : {\"$numberInt\": \"1\"}}}}"
+        },
+        {
+            "description": "Unicode and embedded null in code string, empty scope",
+            "canonical_bson": "1A0000000F61001200000005000000C3A9006400050000000000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"\\u00e9\\u0000d\", \"$scope\" : {}}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "field length zero",
+            "bson": "280000000F6100000000000500000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "field length negative",
+            "bson": "280000000F6100FFFFFFFF0500000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "field length too short (less than minimum size)",
+            "bson": "160000000F61000D0000000100000000050000000000"
+        },
+        {
+            "description": "field length too short (truncates scope)",
+            "bson": "280000000F61001F0000000500000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "field length too long (clips outer doc)",
+            "bson": "280000000F6100210000000500000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "field length too long (longer than outer doc)",
+            "bson": "280000000F6100FF0000000500000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "bad code string: length too short",
+            "bson": "280000000F6100200000000400000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "bad code string: length too long (clips scope)",
+            "bson": "280000000F6100200000000600000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "bad code string: negative length",
+            "bson": "280000000F610020000000FFFFFFFF61626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "bad code string: length longer than field",
+            "bson": "280000000F610020000000FF00000061626364001300000010780001000000107900010000000000"
+        },
+        {
+            "description": "bad scope doc (field has bad string length)",
+            "bson": "1C0000000F001500000001000000000C000000020000000000000000"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/corrupted.json b/bson/src/test/resources/bson/corrupted.json
deleted file mode 100644
index f14cae03516..00000000000
--- a/bson/src/test/resources/bson/corrupted.json
+++ /dev/null
@@ -1,205 +0,0 @@
-{
-    "description": "Corrupted BSON", 
-    "documents": [
-        {
-            "encoded": "09000000016600", 
-            "error": "truncated double"
-        }, 
-        {
-            "encoded": "09000000026600", 
-            "error": "truncated string"
-        }, 
-        {
-            "encoded": "09000000036600", 
-            "error": "truncated document"
-        }, 
-        {
-            "encoded": "09000000046600", 
-            "error": "truncated array"
-        }, 
-        {
-            "encoded": "09000000056600", 
-            "error": "truncated binary"
-        }, 
-        {
-            "encoded": "09000000076600", 
-            "error": "truncated objectid"
-        }, 
-        {
-            "encoded": "09000000086600", 
-            "error": "truncated boolean"
-        }, 
-        {
-            "encoded": "09000000096600", 
-            "error": "truncated date"
-        }, 
-        {
-            "encoded": "090000000b6600", 
-            "error": "truncated regex"
-        }, 
-        {
-            "encoded": "090000000c6600", 
-            "error": "truncated db pointer"
-        }, 
-        {
-            "encoded": "0C0000000d6600", 
-            "error": "truncated javascript"
-        }, 
-        {
-            "encoded": "0C0000000e6600", 
-            "error": "truncated symbol"
-        }, 
-        {
-            "encoded": "0C0000000f6600", 
-            "error": "truncated javascript with scope"
-        }, 
-        {
-            "encoded": "0C000000106600", 
-            "error": "truncated int32"
-        }, 
-        {
-            "encoded": "0C000000116600", 
-            "error": "truncated timestamp"
-        }, 
-        {
-            "encoded": "0C000000126600", 
-            "error": "truncated int64"
-        }, 
-        {
-            "encoded": "0400000000", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "0500000001", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "05000000", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "0700000002610078563412", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "090000001061000500", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "00000000000000000000", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "1300000002666f6f00040000006261720000", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "1800000003666f6f000f0000001062617200ffffff7f0000", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "1500000003666f6f000c0000000862617200010000", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "1c00000003666f6f001200000002626172000500000062617a000000", 
-            "error": "basic"
-        }, 
-        {
-            "encoded": "1000000002610004000000616263ff00", 
-            "error": "string is not null-terminated"
-        }, 
-        {
-            "encoded": "0c0000000200000000000000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "120000000200ffffffff666f6f6261720000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "0c0000000e00000000000000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "120000000e00ffffffff666f6f6261720000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "180000000c00fa5bd841d6585d9900", 
-            "error": ""
-        }, 
-        {
-            "encoded": "1e0000000c00ffffffff666f6f626172005259b56afa5bd841d6585d9900", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "0c0000000d00000000000000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "0c0000000d00ffffffff0000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "1c0000000f001500000000000000000c000000020001000000000000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "1c0000000f0015000000ffffffff000c000000020001000000000000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "1c0000000f001500000001000000000c000000020000000000000000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "1c0000000f001500000001000000000c0000000200ffffffff000000", 
-            "error": "bad_string_length"
-        }, 
-        {
-            "encoded": "0E00000008616263646566676869707172737475", 
-            "error": "Run-on CString"
-        }, 
-        {
-            "encoded": "0100000000", 
-            "error": "An object size that's too small to even include the object size, but is correctly encoded, along with a correct EOO (and no data)"
-        }, 
-        {
-            "encoded": "1a0000000e74657374000c00000068656c6c6f20776f726c6400000500000000", 
-            "error": "One object, but with object size listed smaller than it is in the data"
-        }, 
-        {
-            "encoded": "05000000", 
-            "error": "One object, missing the EOO at the end"
-        }, 
-        {
-            "encoded": "0500000001", 
-            "error": "One object, sized correctly, with a spot for an EOO, but the EOO is 0x01"
-        }, 
-        {
-            "encoded": "05000000ff", 
-            "error": "One object, sized correctly, with a spot for an EOO, but the EOO is 0xff"
-        }, 
-        {
-            "encoded": "0500000070", 
-            "error": "One object, sized correctly, with a spot for an EOO, but the EOO is 0x70"
-        }, 
-        {
-            "encoded": "07000000000000", 
-            "error": "Invalid BSON type low range"
-        }, 
-        {
-            "encoded": "07000000800000", 
-            "error": "Invalid BSON type high range"
-        }, 
-        {
-            "encoded": "090000000862000200", 
-            "error": "Invalid boolean value of 2"
-        }, 
-        {
-            "encoded": "09000000086200ff00", 
-            "error": "Invalid boolean value of -1"
-        }
-    ]
-}
diff --git a/bson/src/test/resources/bson/datetime.json b/bson/src/test/resources/bson/datetime.json
new file mode 100644
index 00000000000..60506ce1749
--- /dev/null
+++ b/bson/src/test/resources/bson/datetime.json
@@ -0,0 +1,36 @@
+{
+    "description": "DateTime",
+    "bson_type": "0x09",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "epoch",
+            "canonical_bson": "10000000096100000000000000000000",
+            "relaxed_extjson": "{\"a\" : {\"$date\" : \"1970-01-01T00:00:00Z\"}}",
+            "canonical_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"0\"}}}"
+        },
+        {
+            "description": "positive ms",
+            "canonical_bson": "10000000096100C5D8D6CC3B01000000",
+            "relaxed_extjson": "{\"a\" : {\"$date\" : \"2012-12-24T12:15:30.501Z\"}}",
+            "canonical_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"1356351330501\"}}}"
+        },
+        {
+            "description": "negative",
+            "canonical_bson": "10000000096100C33CE7B9BDFFFFFF00",
+            "relaxed_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"-284643869501\"}}}",
+            "canonical_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"-284643869501\"}}}"
+        },
+        {
+            "description" : "Y10K",
+            "canonical_bson" : "1000000009610000DC1FD277E6000000",
+            "canonical_extjson" : "{\"a\":{\"$date\":{\"$numberLong\":\"253402300800000\"}}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "datetime field truncated",
+            "bson": "0C0000000961001234567800"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/dbpointer.json b/bson/src/test/resources/bson/dbpointer.json
new file mode 100644
index 00000000000..377e556a0ad
--- /dev/null
+++ b/bson/src/test/resources/bson/dbpointer.json
@@ -0,0 +1,56 @@
+{
+    "description": "DBPointer type (deprecated)",
+    "bson_type": "0x0C",
+    "deprecated": true,
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "DBpointer",
+            "canonical_bson": "1A0000000C610002000000620056E1FC72E0C917E9C471416100",
+            "canonical_extjson": "{\"a\": {\"$dbPointer\": {\"$ref\": \"b\", \"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}}}}",
+            "converted_bson": "2a00000003610022000000022472656600020000006200072469640056e1fc72e0c917e9c47141610000",
+            "converted_extjson": "{\"a\": {\"$ref\": \"b\", \"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}}}"
+        },
+        {
+            "description": "DBpointer with opposite key order",
+            "canonical_bson": "1A0000000C610002000000620056E1FC72E0C917E9C471416100",
+            "canonical_extjson": "{\"a\": {\"$dbPointer\": {\"$ref\": \"b\", \"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}}}}",
+            "degenerate_extjson": "{\"a\": {\"$dbPointer\": {\"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}, \"$ref\": \"b\"}}}",
+            "converted_bson": "2a00000003610022000000022472656600020000006200072469640056e1fc72e0c917e9c47141610000",
+            "converted_extjson": "{\"a\": {\"$ref\": \"b\", \"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}}}"
+        },
+        {
+            "description": "With two-byte UTF-8",
+            "canonical_bson": "1B0000000C610003000000C3A90056E1FC72E0C917E9C471416100",
+            "canonical_extjson": "{\"a\": {\"$dbPointer\": {\"$ref\": \"é\", \"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}}}}",
+            "converted_bson": "2B0000000361002300000002247265660003000000C3A900072469640056E1FC72E0C917E9C47141610000",
+            "converted_extjson": "{\"a\": {\"$ref\": \"é\", \"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "String with negative length",
+            "bson": "1A0000000C6100FFFFFFFF620056E1FC72E0C917E9C471416100"
+        },
+        {
+            "description": "String with zero length",
+            "bson": "1A0000000C610000000000620056E1FC72E0C917E9C471416100"
+        },
+        {
+            "description": "String not null terminated",
+            "bson": "1A0000000C610002000000626256E1FC72E0C917E9C471416100"
+        },
+        {
+            "description": "short OID (less than minimum length for field)",
+            "bson": "160000000C61000300000061620056E1FC72E0C91700"
+        },
+        {
+            "description": "short OID (greater than minimum, but truncated)",
+            "bson": "1A0000000C61000300000061620056E1FC72E0C917E9C4716100"
+        },
+        {
+            "description": "String with bad UTF-8",
+            "bson": "1A0000000C610002000000E90056E1FC72E0C917E9C471416100"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/dbref.json b/bson/src/test/resources/bson/dbref.json
new file mode 100644
index 00000000000..1fe12c6f68d
--- /dev/null
+++ b/bson/src/test/resources/bson/dbref.json
@@ -0,0 +1,31 @@
+{
+    "description": "DBRef",
+    "bson_type": "0x03",
+    "valid": [
+        {
+            "description": "DBRef",
+            "canonical_bson": "37000000036462726566002b0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0000",
+            "canonical_extjson": "{\"dbref\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"58921b3e6e32ab156a22b59e\"}}}"
+        },
+        {
+            "description": "DBRef with database",
+            "canonical_bson": "4300000003646272656600370000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0224646200030000006462000000",
+            "canonical_extjson": "{\"dbref\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"58921b3e6e32ab156a22b59e\"}, \"$db\": \"db\"}}"
+        },
+        {
+            "description": "DBRef with database and additional fields",
+            "canonical_bson": "48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e0010246964002a00000002246462000300000064620002666f6f0004000000626172000000",
+            "canonical_extjson": "{\"dbref\": {\"$ref\": \"collection\", \"$id\": {\"$numberInt\": \"42\"}, \"$db\": \"db\", \"foo\": \"bar\"}}"
+        },
+        {
+            "description": "DBRef with additional fields",
+            "canonical_bson": "4400000003646272656600380000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e02666f6f0004000000626172000000",
+            "canonical_extjson": "{\"dbref\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"58921b3e6e32ab156a22b59e\"}, \"foo\": \"bar\"}}"
+        },
+        {
+            "description": "Document with key names similar to those of a DBRef",
+            "canonical_bson": "3e0000000224726566000c0000006e6f742d612d646272656600072469640058921b3e6e32ab156a22b59e022462616e616e6100050000007065656c0000",
+            "canonical_extjson": "{\"$ref\": \"not-a-dbref\", \"$id\": {\"$oid\": \"58921b3e6e32ab156a22b59e\"}, \"$banana\": \"peel\"}"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/decimal128-1.json b/bson/src/test/resources/bson/decimal128-1.json
new file mode 100644
index 00000000000..7eefec6bf79
--- /dev/null
+++ b/bson/src/test/resources/bson/decimal128-1.json
@@ -0,0 +1,317 @@
+{
+    "description": "Decimal128",
+    "bson_type": "0x13",
+    "test_key": "d",
+    "valid": [
+        {
+            "description": "Special - Canonical NaN",
+            "canonical_bson": "180000001364000000000000000000000000000000007C00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}"
+        },
+        {
+            "description": "Special - Negative NaN",
+            "canonical_bson": "18000000136400000000000000000000000000000000FC00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Special - Negative NaN",
+            "canonical_bson": "18000000136400000000000000000000000000000000FC00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-NaN\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Special - Canonical SNaN",
+            "canonical_bson": "180000001364000000000000000000000000000000007E00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Special - Negative SNaN",
+            "canonical_bson": "18000000136400000000000000000000000000000000FE00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Special - NaN with a payload",
+            "canonical_bson": "180000001364001200000000000000000000000000007E00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Special - Canonical Positive Infinity",
+            "canonical_bson": "180000001364000000000000000000000000000000007800",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"Infinity\"}}"
+        },
+        {
+            "description": "Special - Canonical Negative Infinity",
+            "canonical_bson": "18000000136400000000000000000000000000000000F800",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}"
+        },
+        {
+            "description": "Special - Invalid representation treated as 0",
+            "canonical_bson": "180000001364000000000000000000000000000000106C00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Special - Invalid representation treated as -0",
+            "canonical_bson": "18000000136400DCBA9876543210DEADBEEF00000010EC00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Special - Invalid representation treated as 0E3",
+            "canonical_bson": "18000000136400FFFFFFFFFFFFFFFFFFFFFFFFFFFF116C00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+3\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Regular - Adjusted Exponent Limit",
+            "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3CF22F00",
+            "canonical_extjson": "{\"d\": { \"$numberDecimal\": \"0.000001234567890123456789012345678901234\" }}"
+        },
+        {
+            "description": "Regular - Smallest",
+            "canonical_bson": "18000000136400D204000000000000000000000000343000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.001234\"}}"
+        },
+        {
+            "description": "Regular - Smallest with Trailing Zeros",
+            "canonical_bson": "1800000013640040EF5A07000000000000000000002A3000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00123400000\"}}"
+        },
+        {
+            "description": "Regular - 0.1",
+            "canonical_bson": "1800000013640001000000000000000000000000003E3000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1\"}}"
+        },
+        {
+            "description": "Regular - 0.1234567890123456789012345678901234",
+            "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3CFC2F00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1234567890123456789012345678901234\"}}"
+        },
+        {
+            "description": "Regular - 0",
+            "canonical_bson": "180000001364000000000000000000000000000000403000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+        },
+        {
+            "description": "Regular - -0",
+            "canonical_bson": "18000000136400000000000000000000000000000040B000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0\"}}"
+        },
+        {
+            "description": "Regular - -0.0",
+            "canonical_bson": "1800000013640000000000000000000000000000003EB000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0\"}}"
+        },
+        {
+            "description": "Regular - 2",
+            "canonical_bson": "180000001364000200000000000000000000000000403000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"2\"}}"
+        },
+        {
+            "description": "Regular - 2.000",
+            "canonical_bson": "18000000136400D0070000000000000000000000003A3000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"2.000\"}}"
+        },
+        {
+            "description": "Regular - Largest",
+            "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3C403000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1234567890123456789012345678901234\"}}"
+        },
+        {
+            "description": "Scientific - Tiniest",
+            "canonical_bson": "18000000136400FFFFFFFF638E8D37C087ADBE09ED010000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"9.999999999999999999999999999999999E-6143\"}}"
+        },
+        {
+            "description": "Scientific - Tiny",
+            "canonical_bson": "180000001364000100000000000000000000000000000000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6176\"}}"
+        },
+        {
+            "description": "Scientific - Negative Tiny",
+            "canonical_bson": "180000001364000100000000000000000000000000008000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E-6176\"}}"
+        },
+        {
+            "description": "Scientific - Adjusted Exponent Limit",
+            "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3CF02F00",
+            "canonical_extjson": "{\"d\": { \"$numberDecimal\": \"1.234567890123456789012345678901234E-7\" }}"
+        },
+        {
+            "description": "Scientific - Fractional",
+            "canonical_bson": "1800000013640064000000000000000000000000002CB000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.00E-8\"}}"
+        },
+        {
+            "description": "Scientific - 0 with Exponent",
+            "canonical_bson": "180000001364000000000000000000000000000000205F00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6000\"}}"
+        },
+        {
+            "description": "Scientific - 0 with Negative Exponent",
+            "canonical_bson": "1800000013640000000000000000000000000000007A2B00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-611\"}}"
+        },
+        {
+            "description": "Scientific - No Decimal with Signed Exponent",
+            "canonical_bson": "180000001364000100000000000000000000000000463000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+3\"}}"
+        },
+        {
+            "description": "Scientific - Trailing Zero",
+            "canonical_bson": "180000001364001A04000000000000000000000000423000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.050E+4\"}}"
+        },
+        {
+            "description": "Scientific - With Decimal",
+            "canonical_bson": "180000001364006900000000000000000000000000423000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.05E+3\"}}"
+        },
+        {
+            "description": "Scientific - Full",
+            "canonical_bson": "18000000136400FFFFFFFFFFFFFFFFFFFFFFFFFFFF403000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"5192296858534827628530496329220095\"}}"
+        },
+        {
+            "description": "Scientific - Large",
+            "canonical_bson": "18000000136400000000000A5BC138938D44C64D31FE5F00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000000E+6144\"}}"
+        },
+        {
+            "description": "Scientific - Largest",
+            "canonical_bson": "18000000136400FFFFFFFF638E8D37C087ADBE09EDFF5F00",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"9.999999999999999999999999999999999E+6144\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - Exponent Normalization",
+            "canonical_bson": "1800000013640064000000000000000000000000002CB000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-100E-10\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.00E-8\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - Unsigned Positive Exponent",
+            "canonical_bson": "180000001364000100000000000000000000000000463000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E3\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+3\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - Lowercase Exponent Identifier",
+            "canonical_bson": "180000001364000100000000000000000000000000463000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1e+3\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+3\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - Long Significand with Exponent",
+            "canonical_bson": "1800000013640079D9E0F9763ADA429D0200000000583000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12345689012345789012345E+12\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.2345689012345789012345E+34\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - Positive Sign",
+            "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3C403000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+1234567890123456789012345678901234\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1234567890123456789012345678901234\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - Long Decimal String",
+            "canonical_bson": "180000001364000100000000000000000000000000722800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \".000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-999\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - nan",
+            "canonical_bson": "180000001364000000000000000000000000000000007C00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"nan\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - nAn",
+            "canonical_bson": "180000001364000000000000000000000000000000007C00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"nAn\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - +infinity",
+            "canonical_bson": "180000001364000000000000000000000000000000007800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+infinity\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - infinity",
+            "canonical_bson": "180000001364000000000000000000000000000000007800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"infinity\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - infiniTY",
+            "canonical_bson": "180000001364000000000000000000000000000000007800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"infiniTY\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - inf",
+            "canonical_bson": "180000001364000000000000000000000000000000007800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"inf\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - inF",
+            "canonical_bson": "180000001364000000000000000000000000000000007800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"inF\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - -infinity",
+            "canonical_bson": "18000000136400000000000000000000000000000000F800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-infinity\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - -infiniTy",
+            "canonical_bson": "18000000136400000000000000000000000000000000F800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-infiniTy\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - -Inf",
+            "canonical_bson": "18000000136400000000000000000000000000000000F800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - -inf",
+            "canonical_bson": "18000000136400000000000000000000000000000000F800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-inf\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}"
+        },
+        {
+            "description": "Non-Canonical Parsing - -inF",
+            "canonical_bson": "18000000136400000000000000000000000000000000F800",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-inF\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}"
+        },
+        {
+           "description": "Rounded Subnormal number",
+           "canonical_bson": "180000001364000100000000000000000000000000000000",
+           "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10E-6177\"}}",
+           "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6176\"}}"
+        },
+        {
+           "description": "Clamped",
+           "canonical_bson": "180000001364000a00000000000000000000000000fe5f00",
+           "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E6112\"}}",
+           "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+6112\"}}"
+        },
+        {
+           "description": "Exact rounding",
+           "canonical_bson": "18000000136400000000000a5bc138938d44c64d31cc3700",
+           "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\"}}",
+           "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000000E+999\"}}"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/decimal128-2.json b/bson/src/test/resources/bson/decimal128-2.json
new file mode 100644
index 00000000000..316d3b0e618
--- /dev/null
+++ b/bson/src/test/resources/bson/decimal128-2.json
@@ -0,0 +1,793 @@
+{
+    "description": "Decimal128",
+    "bson_type": "0x13",
+    "test_key": "d",
+    "valid": [
+       {
+          "description": "[decq021] Normality",
+          "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3C40B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1234567890123456789012345678901234\"}}"
+       },
+       {
+          "description": "[decq823] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400010000800000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-2147483649\"}}"
+       },
+       {
+          "description": "[decq822] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400000000800000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-2147483648\"}}"
+       },
+       {
+          "description": "[decq821] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400FFFFFF7F0000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-2147483647\"}}"
+       },
+       {
+          "description": "[decq820] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400FEFFFF7F0000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-2147483646\"}}"
+       },
+       {
+          "description": "[decq152] fold-downs (more below)",
+          "canonical_bson": "18000000136400393000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-12345\"}}"
+       },
+       {
+          "description": "[decq154] fold-downs (more below)",
+          "canonical_bson": "18000000136400D20400000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1234\"}}"
+       },
+       {
+          "description": "[decq006] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE0200000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-750\"}}"
+       },
+       {
+          "description": "[decq164] fold-downs (more below)",
+          "canonical_bson": "1800000013640039300000000000000000000000003CB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-123.45\"}}"
+       },
+       {
+          "description": "[decq156] fold-downs (more below)",
+          "canonical_bson": "180000001364007B0000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-123\"}}"
+       },
+       {
+          "description": "[decq008] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE020000000000000000000000003EB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-75.0\"}}"
+       },
+       {
+          "description": "[decq158] fold-downs (more below)",
+          "canonical_bson": "180000001364000C0000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-12\"}}"
+       },
+       {
+          "description": "[decq122] Nmax and similar",
+          "canonical_bson": "18000000136400FFFFFFFF638E8D37C087ADBE09EDFFDF00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-9.999999999999999999999999999999999E+6144\"}}"
+       },
+       {
+          "description": "[decq002] (mostly derived from the Strawman 4 document and examples)",
+          "canonical_bson": "18000000136400EE020000000000000000000000003CB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-7.50\"}}"
+       },
+       {
+          "description": "[decq004] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE0200000000000000000000000042B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-7.50E+3\"}}"
+       },
+       {
+          "description": "[decq018] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE020000000000000000000000002EB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-7.50E-7\"}}"
+       },
+       {
+          "description": "[decq125] Nmax and similar",
+          "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3CFEDF00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.234567890123456789012345678901234E+6144\"}}"
+       },
+       {
+          "description": "[decq131] fold-downs (more below)",
+          "canonical_bson": "18000000136400000000807F1BCF85B27059C8A43CFEDF00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.230000000000000000000000000000000E+6144\"}}"
+       },
+       {
+          "description": "[decq162] fold-downs (more below)",
+          "canonical_bson": "180000001364007B000000000000000000000000003CB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.23\"}}"
+       },
+       {
+          "description": "[decq176] Nmin and below",
+          "canonical_bson": "18000000136400010000000A5BC138938D44C64D31008000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.000000000000000000000000000000001E-6143\"}}"
+       },
+       {
+          "description": "[decq174] Nmin and below",
+          "canonical_bson": "18000000136400000000000A5BC138938D44C64D31008000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.000000000000000000000000000000000E-6143\"}}"
+       },
+       {
+          "description": "[decq133] fold-downs (more below)",
+          "canonical_bson": "18000000136400000000000A5BC138938D44C64D31FEDF00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.000000000000000000000000000000000E+6144\"}}"
+       },
+       {
+          "description": "[decq160] fold-downs (more below)",
+          "canonical_bson": "18000000136400010000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1\"}}"
+       },
+       {
+          "description": "[decq172] Nmin and below",
+          "canonical_bson": "180000001364000100000000000000000000000000428000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E-6143\"}}"
+       },
+       {
+          "description": "[decq010] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE020000000000000000000000003AB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.750\"}}"
+       },
+       {
+          "description": "[decq012] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE0200000000000000000000000038B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0750\"}}"
+       },
+       {
+          "description": "[decq014] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE0200000000000000000000000034B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000750\"}}"
+       },
+       {
+          "description": "[decq016] derivative canonical plain strings",
+          "canonical_bson": "18000000136400EE0200000000000000000000000030B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00000750\"}}"
+       },
+       {
+          "description": "[decq404] zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000000000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-6176\"}}"
+       },
+       {
+          "description": "[decq424] negative zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000008000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-6176\"}}"
+       },
+       {
+          "description": "[decq407] zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00\"}}"
+       },
+       {
+          "description": "[decq427] negative zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003CB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00\"}}"
+       },
+       {
+          "description": "[decq409] zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[decq428] negative zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0\"}}"
+       },
+       {
+          "description": "[decq700] Selected DPD codes",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[decq406] zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00\"}}"
+       },
+       {
+          "description": "[decq426] negative zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003CB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00\"}}"
+       },
+       {
+          "description": "[decq410] zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000463000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+3\"}}"
+       },
+       {
+          "description": "[decq431] negative zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000046B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+3\"}}"
+       },
+       {
+          "description": "[decq419] clamped zeros...",
+          "canonical_bson": "180000001364000000000000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6111\"}}"
+       },
+       {
+          "description": "[decq432] negative zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000FEDF00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+6111\"}}"
+       },
+       {
+          "description": "[decq405] zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000000000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-6176\"}}"
+       },
+       {
+          "description": "[decq425] negative zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000008000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-6176\"}}"
+       },
+       {
+          "description": "[decq508] Specials",
+          "canonical_bson": "180000001364000000000000000000000000000000007800",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"Infinity\"}}"
+       },
+       {
+          "description": "[decq528] Specials",
+          "canonical_bson": "18000000136400000000000000000000000000000000F800",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-Infinity\"}}"
+       },
+       {
+          "description": "[decq541] Specials",
+          "canonical_bson": "180000001364000000000000000000000000000000007C00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"NaN\"}}"
+       },
+       {
+          "description": "[decq074] Nmin and below",
+          "canonical_bson": "18000000136400000000000A5BC138938D44C64D31000000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000000E-6143\"}}"
+       },
+       {
+          "description": "[decq602] fold-down full sequence",
+          "canonical_bson": "18000000136400000000000A5BC138938D44C64D31FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000000E+6144\"}}"
+       },
+       {
+          "description": "[decq604] fold-down full sequence",
+          "canonical_bson": "180000001364000000000081EFAC855B416D2DEE04FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000000000E+6143\"}}"
+       },
+       {
+          "description": "[decq606] fold-down full sequence",
+          "canonical_bson": "1800000013640000000080264B91C02220BE377E00FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000000000000E+6142\"}}"
+       },
+       {
+          "description": "[decq608] fold-down full sequence",
+          "canonical_bson": "1800000013640000000040EAED7446D09C2C9F0C00FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000E+6141\"}}"
+       },
+       {
+          "description": "[decq610] fold-down full sequence",
+          "canonical_bson": "18000000136400000000A0CA17726DAE0F1E430100FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000000E+6140\"}}"
+       },
+       {
+          "description": "[decq612] fold-down full sequence",
+          "canonical_bson": "18000000136400000000106102253E5ECE4F200000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000000000E+6139\"}}"
+       },
+       {
+          "description": "[decq614] fold-down full sequence",
+          "canonical_bson": "18000000136400000000E83C80D09F3C2E3B030000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000E+6138\"}}"
+       },
+       {
+          "description": "[decq616] fold-down full sequence",
+          "canonical_bson": "18000000136400000000E4D20CC8DCD2B752000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000E+6137\"}}"
+       },
+       {
+          "description": "[decq618] fold-down full sequence",
+          "canonical_bson": "180000001364000000004A48011416954508000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000000E+6136\"}}"
+       },
+       {
+          "description": "[decq620] fold-down full sequence",
+          "canonical_bson": "18000000136400000000A1EDCCCE1BC2D300000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000E+6135\"}}"
+       },
+       {
+          "description": "[decq622] fold-down full sequence",
+          "canonical_bson": "18000000136400000080F64AE1C7022D1500000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000E+6134\"}}"
+       },
+       {
+          "description": "[decq624] fold-down full sequence",
+          "canonical_bson": "18000000136400000040B2BAC9E0191E0200000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000E+6133\"}}"
+       },
+       {
+          "description": "[decq626] fold-down full sequence",
+          "canonical_bson": "180000001364000000A0DEC5ADC935360000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000E+6132\"}}"
+       },
+       {
+          "description": "[decq628] fold-down full sequence",
+          "canonical_bson": "18000000136400000010632D5EC76B050000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000E+6131\"}}"
+       },
+       {
+          "description": "[decq630] fold-down full sequence",
+          "canonical_bson": "180000001364000000E8890423C78A000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000E+6130\"}}"
+       },
+       {
+          "description": "[decq632] fold-down full sequence",
+          "canonical_bson": "18000000136400000064A7B3B6E00D000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000E+6129\"}}"
+       },
+       {
+          "description": "[decq634] fold-down full sequence",
+          "canonical_bson": "1800000013640000008A5D78456301000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000E+6128\"}}"
+       },
+       {
+          "description": "[decq636] fold-down full sequence",
+          "canonical_bson": "180000001364000000C16FF2862300000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000E+6127\"}}"
+       },
+       {
+          "description": "[decq638] fold-down full sequence",
+          "canonical_bson": "180000001364000080C6A47E8D0300000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000E+6126\"}}"
+       },
+       {
+          "description": "[decq640] fold-down full sequence",
+          "canonical_bson": "1800000013640000407A10F35A0000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000E+6125\"}}"
+       },
+       {
+          "description": "[decq642] fold-down full sequence",
+          "canonical_bson": "1800000013640000A0724E18090000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000E+6124\"}}"
+       },
+       {
+          "description": "[decq644] fold-down full sequence",
+          "canonical_bson": "180000001364000010A5D4E8000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000E+6123\"}}"
+       },
+       {
+          "description": "[decq646] fold-down full sequence",
+          "canonical_bson": "1800000013640000E8764817000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000E+6122\"}}"
+       },
+       {
+          "description": "[decq648] fold-down full sequence",
+          "canonical_bson": "1800000013640000E40B5402000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000E+6121\"}}"
+       },
+       {
+          "description": "[decq650] fold-down full sequence",
+          "canonical_bson": "1800000013640000CA9A3B00000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000E+6120\"}}"
+       },
+       {
+          "description": "[decq652] fold-down full sequence",
+          "canonical_bson": "1800000013640000E1F50500000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000E+6119\"}}"
+       },
+       {
+          "description": "[decq654] fold-down full sequence",
+          "canonical_bson": "180000001364008096980000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000E+6118\"}}"
+       },
+       {
+          "description": "[decq656] fold-down full sequence",
+          "canonical_bson": "1800000013640040420F0000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000E+6117\"}}"
+       },
+       {
+          "description": "[decq658] fold-down full sequence",
+          "canonical_bson": "18000000136400A086010000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000E+6116\"}}"
+       },
+       {
+          "description": "[decq660] fold-down full sequence",
+          "canonical_bson": "180000001364001027000000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000E+6115\"}}"
+       },
+       {
+          "description": "[decq662] fold-down full sequence",
+          "canonical_bson": "18000000136400E803000000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000E+6114\"}}"
+       },
+       {
+          "description": "[decq664] fold-down full sequence",
+          "canonical_bson": "180000001364006400000000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00E+6113\"}}"
+       },
+       {
+          "description": "[decq666] fold-down full sequence",
+          "canonical_bson": "180000001364000A00000000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+6112\"}}"
+       },
+       {
+          "description": "[decq060] fold-downs (more below)",
+          "canonical_bson": "180000001364000100000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1\"}}"
+       },
+       {
+          "description": "[decq670] fold-down full sequence",
+          "canonical_bson": "180000001364000100000000000000000000000000FC5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6110\"}}"
+       },
+       {
+          "description": "[decq668] fold-down full sequence",
+          "canonical_bson": "180000001364000100000000000000000000000000FE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6111\"}}"
+       },
+       {
+          "description": "[decq072] Nmin and below",
+          "canonical_bson": "180000001364000100000000000000000000000000420000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6143\"}}"
+       },
+       {
+          "description": "[decq076] Nmin and below",
+          "canonical_bson": "18000000136400010000000A5BC138938D44C64D31000000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000001E-6143\"}}"
+       },
+       {
+          "description": "[decq036] fold-downs (more below)",
+          "canonical_bson": "18000000136400000000807F1BCF85B27059C8A43CFE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.230000000000000000000000000000000E+6144\"}}"
+       },
+       {
+          "description": "[decq062] fold-downs (more below)",
+          "canonical_bson": "180000001364007B000000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.23\"}}"
+       },
+       {
+          "description": "[decq034] Nmax and similar",
+          "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3CFE5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.234567890123456789012345678901234E+6144\"}}"
+       },
+       {
+          "description": "[decq441] exponent lengths",
+          "canonical_bson": "180000001364000700000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7\"}}"
+       },
+       {
+          "description": "[decq449] exponent lengths",
+          "canonical_bson": "1800000013640007000000000000000000000000001E5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+5999\"}}"
+       },
+       {
+          "description": "[decq447] exponent lengths",
+          "canonical_bson": "1800000013640007000000000000000000000000000E3800",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+999\"}}"
+       },
+       {
+          "description": "[decq445] exponent lengths",
+          "canonical_bson": "180000001364000700000000000000000000000000063100",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+99\"}}"
+       },
+       {
+          "description": "[decq443] exponent lengths",
+          "canonical_bson": "180000001364000700000000000000000000000000523000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+9\"}}"
+       },
+       {
+          "description": "[decq842] VG testcase",
+          "canonical_bson": "180000001364000000FED83F4E7C9FE4E269E38A5BCD1700",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7.049000000000010795488000000000000E-3097\"}}"
+       },
+       {
+          "description": "[decq841] VG testcase",
+          "canonical_bson": "180000001364000000203B9DB5056F000000000000002400",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"8.000000000000000000E-1550\"}}"
+       },
+       {
+          "description": "[decq840] VG testcase",
+          "canonical_bson": "180000001364003C17258419D710C42F0000000000002400",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"8.81125000000001349436E-1548\"}}"
+       },
+       {
+          "description": "[decq701] Selected DPD codes",
+          "canonical_bson": "180000001364000900000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"9\"}}"
+       },
+       {
+          "description": "[decq032] Nmax and similar",
+          "canonical_bson": "18000000136400FFFFFFFF638E8D37C087ADBE09EDFF5F00",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"9.999999999999999999999999999999999E+6144\"}}"
+       },
+       {
+          "description": "[decq702] Selected DPD codes",
+          "canonical_bson": "180000001364000A00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10\"}}"
+       },
+       {
+          "description": "[decq057] fold-downs (more below)",
+          "canonical_bson": "180000001364000C00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12\"}}"
+       },
+       {
+          "description": "[decq703] Selected DPD codes",
+          "canonical_bson": "180000001364001300000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"19\"}}"
+       },
+       {
+          "description": "[decq704] Selected DPD codes",
+          "canonical_bson": "180000001364001400000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"20\"}}"
+       },
+       {
+          "description": "[decq705] Selected DPD codes",
+          "canonical_bson": "180000001364001D00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"29\"}}"
+       },
+       {
+          "description": "[decq706] Selected DPD codes",
+          "canonical_bson": "180000001364001E00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"30\"}}"
+       },
+       {
+          "description": "[decq707] Selected DPD codes",
+          "canonical_bson": "180000001364002700000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"39\"}}"
+       },
+       {
+          "description": "[decq708] Selected DPD codes",
+          "canonical_bson": "180000001364002800000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"40\"}}"
+       },
+       {
+          "description": "[decq709] Selected DPD codes",
+          "canonical_bson": "180000001364003100000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"49\"}}"
+       },
+       {
+          "description": "[decq710] Selected DPD codes",
+          "canonical_bson": "180000001364003200000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"50\"}}"
+       },
+       {
+          "description": "[decq711] Selected DPD codes",
+          "canonical_bson": "180000001364003B00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"59\"}}"
+       },
+       {
+          "description": "[decq712] Selected DPD codes",
+          "canonical_bson": "180000001364003C00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"60\"}}"
+       },
+       {
+          "description": "[decq713] Selected DPD codes",
+          "canonical_bson": "180000001364004500000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"69\"}}"
+       },
+       {
+          "description": "[decq714] Selected DPD codes",
+          "canonical_bson": "180000001364004600000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"70\"}}"
+       },
+       {
+          "description": "[decq715] Selected DPD codes",
+          "canonical_bson": "180000001364004700000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"71\"}}"
+       },
+       {
+          "description": "[decq716] Selected DPD codes",
+          "canonical_bson": "180000001364004800000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"72\"}}"
+       },
+       {
+          "description": "[decq717] Selected DPD codes",
+          "canonical_bson": "180000001364004900000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"73\"}}"
+       },
+       {
+          "description": "[decq718] Selected DPD codes",
+          "canonical_bson": "180000001364004A00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"74\"}}"
+       },
+       {
+          "description": "[decq719] Selected DPD codes",
+          "canonical_bson": "180000001364004B00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"75\"}}"
+       },
+       {
+          "description": "[decq720] Selected DPD codes",
+          "canonical_bson": "180000001364004C00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"76\"}}"
+       },
+       {
+          "description": "[decq721] Selected DPD codes",
+          "canonical_bson": "180000001364004D00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"77\"}}"
+       },
+       {
+          "description": "[decq722] Selected DPD codes",
+          "canonical_bson": "180000001364004E00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"78\"}}"
+       },
+       {
+          "description": "[decq723] Selected DPD codes",
+          "canonical_bson": "180000001364004F00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"79\"}}"
+       },
+       {
+          "description": "[decq056] fold-downs (more below)",
+          "canonical_bson": "180000001364007B00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"123\"}}"
+       },
+       {
+          "description": "[decq064] fold-downs (more below)",
+          "canonical_bson": "1800000013640039300000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"123.45\"}}"
+       },
+       {
+          "description": "[decq732] Selected DPD codes",
+          "canonical_bson": "180000001364000802000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"520\"}}"
+       },
+       {
+          "description": "[decq733] Selected DPD codes",
+          "canonical_bson": "180000001364000902000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"521\"}}"
+       },
+       {
+          "description": "[decq740] DPD: one of each of the huffman groups",
+          "canonical_bson": "180000001364000903000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"777\"}}"
+       },
+       {
+          "description": "[decq741] DPD: one of each of the huffman groups",
+          "canonical_bson": "180000001364000A03000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"778\"}}"
+       },
+       {
+          "description": "[decq742] DPD: one of each of the huffman groups",
+          "canonical_bson": "180000001364001303000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"787\"}}"
+       },
+       {
+          "description": "[decq746] DPD: one of each of the huffman groups",
+          "canonical_bson": "180000001364001F03000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"799\"}}"
+       },
+       {
+          "description": "[decq743] DPD: one of each of the huffman groups",
+          "canonical_bson": "180000001364006D03000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"877\"}}"
+       },
+       {
+          "description": "[decq753] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "180000001364007803000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"888\"}}"
+       },
+       {
+          "description": "[decq754] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "180000001364007903000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"889\"}}"
+       },
+       {
+          "description": "[decq760] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "180000001364008203000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"898\"}}"
+       },
+       {
+          "description": "[decq764] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "180000001364008303000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"899\"}}"
+       },
+       {
+          "description": "[decq745] DPD: one of each of the huffman groups",
+          "canonical_bson": "18000000136400D303000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"979\"}}"
+       },
+       {
+          "description": "[decq770] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "18000000136400DC03000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"988\"}}"
+       },
+       {
+          "description": "[decq774] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "18000000136400DD03000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"989\"}}"
+       },
+       {
+          "description": "[decq730] Selected DPD codes",
+          "canonical_bson": "18000000136400E203000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"994\"}}"
+       },
+       {
+          "description": "[decq731] Selected DPD codes",
+          "canonical_bson": "18000000136400E303000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"995\"}}"
+       },
+       {
+          "description": "[decq744] DPD: one of each of the huffman groups",
+          "canonical_bson": "18000000136400E503000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"997\"}}"
+       },
+       {
+          "description": "[decq780] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "18000000136400E603000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"998\"}}"
+       },
+       {
+          "description": "[decq787] DPD all-highs cases (includes the 24 redundant codes)",
+          "canonical_bson": "18000000136400E703000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"999\"}}"
+       },
+       {
+          "description": "[decq053] fold-downs (more below)",
+          "canonical_bson": "18000000136400D204000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1234\"}}"
+       },
+       {
+          "description": "[decq052] fold-downs (more below)",
+          "canonical_bson": "180000001364003930000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12345\"}}"
+       },
+       {
+          "description": "[decq792] Miscellaneous (testers' queries, etc.)",
+          "canonical_bson": "180000001364003075000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"30000\"}}"
+       },
+       {
+          "description": "[decq793] Miscellaneous (testers' queries, etc.)",
+          "canonical_bson": "1800000013640090940D0000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"890000\"}}"
+       },
+       {
+          "description": "[decq824] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400FEFFFF7F00000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"2147483646\"}}"
+       },
+       {
+          "description": "[decq825] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400FFFFFF7F00000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"2147483647\"}}"
+       },
+       {
+          "description": "[decq826] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "180000001364000000008000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"2147483648\"}}"
+       },
+       {
+          "description": "[decq827] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "180000001364000100008000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"2147483649\"}}"
+       },
+       {
+          "description": "[decq828] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400FEFFFFFF00000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"4294967294\"}}"
+       },
+       {
+          "description": "[decq829] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "18000000136400FFFFFFFF00000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"4294967295\"}}"
+       },
+       {
+          "description": "[decq830] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "180000001364000000000001000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"4294967296\"}}"
+       },
+       {
+          "description": "[decq831] values around [u]int32 edges (zeros done earlier)",
+          "canonical_bson": "180000001364000100000001000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"4294967297\"}}"
+       },
+       {
+          "description": "[decq022] Normality",
+          "canonical_bson": "18000000136400C7711CC7B548F377DC80A131C836403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1111111111111111111111111111111111\"}}"
+       },
+       {
+          "description": "[decq020] Normality",
+          "canonical_bson": "18000000136400F2AF967ED05C82DE3297FF6FDE3C403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1234567890123456789012345678901234\"}}"
+       },
+       {
+          "description": "[decq550] Specials",
+          "canonical_bson": "18000000136400FFFFFFFF638E8D37C087ADBE09ED413000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"9999999999999999999999999999999999\"}}"
+       }
+    ]
+}
+
diff --git a/bson/src/test/resources/bson/decimal128-3.json b/bson/src/test/resources/bson/decimal128-3.json
new file mode 100644
index 00000000000..9b015343ce7
--- /dev/null
+++ b/bson/src/test/resources/bson/decimal128-3.json
@@ -0,0 +1,1771 @@
+{
+    "description": "Decimal128",
+    "bson_type": "0x13",
+    "test_key": "d",
+    "valid": [
+       {
+          "description": "[basx066] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400185C0ACE0000000000000000000038B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-00345678.5432\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-345678.5432\"}}"
+       },
+       {
+          "description": "[basx065] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400185C0ACE0000000000000000000038B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0345678.5432\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-345678.5432\"}}"
+       },
+       {
+          "description": "[basx064] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400185C0ACE0000000000000000000038B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-345678.5432\"}}"
+       },
+       {
+          "description": "[basx041] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364004C0000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-76\"}}"
+       },
+       {
+          "description": "[basx027] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364000F270000000000000000000000003AB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-9.999\"}}"
+       },
+       {
+          "description": "[basx026] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364009F230000000000000000000000003AB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-9.119\"}}"
+       },
+       {
+          "description": "[basx025] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364008F030000000000000000000000003CB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-9.11\"}}"
+       },
+       {
+          "description": "[basx024] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364005B000000000000000000000000003EB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-9.1\"}}"
+       },
+       {
+          "description": "[dqbsr531] negatives (Rounded)",
+          "canonical_bson": "1800000013640099761CC7B548F377DC80A131C836FEAF00",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.1111111111111111111111111111123450\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.111111111111111111111111111112345\"}}"
+       },
+       {
+          "description": "[basx022] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364000A000000000000000000000000003EB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.0\"}}"
+       },
+       {
+          "description": "[basx021] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "18000000136400010000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1\"}}"
+       },
+       {
+          "description": "[basx601] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000002E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000000\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-9\"}}"
+       },
+       {
+          "description": "[basx622] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000002EB000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000000000\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-9\"}}"
+       },
+       {
+          "description": "[basx602] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000303000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000000\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-8\"}}"
+       },
+       {
+          "description": "[basx621] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000030B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00000000\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-8\"}}"
+       },
+       {
+          "description": "[basx603] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000000\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-7\"}}"
+       },
+       {
+          "description": "[basx620] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000032B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0000000\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-7\"}}"
+       },
+       {
+          "description": "[basx604] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000343000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000\"}}"
+       },
+       {
+          "description": "[basx619] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000034B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000000\"}}"
+       },
+       {
+          "description": "[basx605] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000363000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000\"}}"
+       },
+       {
+          "description": "[basx618] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000036B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00000\"}}"
+       },
+       {
+          "description": "[basx680] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"000000.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx606] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000383000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000\"}}"
+       },
+       {
+          "description": "[basx617] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000038B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0000\"}}"
+       },
+       {
+          "description": "[basx681] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"00000.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx686] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+00000.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx687] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000040B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-00000.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0\"}}"
+       },
+       {
+          "description": "[basx019] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640000000000000000000000000000003CB000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-00.00\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00\"}}"
+       },
+       {
+          "description": "[basx607] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000\"}}"
+       },
+       {
+          "description": "[basx616] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003AB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000\"}}"
+       },
+       {
+          "description": "[basx682] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0000.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx155] Numbers with E",
+          "canonical_bson": "1800000013640000000000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000e+0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000\"}}"
+       },
+       {
+          "description": "[basx130] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000\"}}"
+       },
+       {
+          "description": "[basx290] some more negative zeros [systematic tests below]",
+          "canonical_bson": "18000000136400000000000000000000000000000038B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0000\"}}"
+       },
+       {
+          "description": "[basx131] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000\"}}"
+       },
+       {
+          "description": "[basx291] some more negative zeros [systematic tests below]",
+          "canonical_bson": "18000000136400000000000000000000000000000036B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00000\"}}"
+       },
+       {
+          "description": "[basx132] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000\"}}"
+       },
+       {
+          "description": "[basx292] some more negative zeros [systematic tests below]",
+          "canonical_bson": "18000000136400000000000000000000000000000034B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000000\"}}"
+       },
+       {
+          "description": "[basx133] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-7\"}}"
+       },
+       {
+          "description": "[basx293] some more negative zeros [systematic tests below]",
+          "canonical_bson": "18000000136400000000000000000000000000000032B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-7\"}}"
+       },
+       {
+          "description": "[basx608] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00\"}}"
+       },
+       {
+          "description": "[basx615] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003CB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00\"}}"
+       },
+       {
+          "description": "[basx683] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"000.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx630] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00\"}}"
+       },
+       {
+          "description": "[basx670] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00\"}}"
+       },
+       {
+          "description": "[basx631] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0\"}}"
+       },
+       {
+          "description": "[basx671] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000\"}}"
+       },
+       {
+          "description": "[basx134] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000\"}}"
+       },
+       {
+          "description": "[basx294] some more negative zeros [systematic tests below]",
+          "canonical_bson": "18000000136400000000000000000000000000000038B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0000\"}}"
+       },
+       {
+          "description": "[basx632] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx672] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000\"}}"
+       },
+       {
+          "description": "[basx135] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000\"}}"
+       },
+       {
+          "description": "[basx295] some more negative zeros [systematic tests below]",
+          "canonical_bson": "18000000136400000000000000000000000000000036B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00000\"}}"
+       },
+       {
+          "description": "[basx633] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000423000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+1\"}}"
+       },
+       {
+          "description": "[basx673] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000\"}}"
+       },
+       {
+          "description": "[basx136] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000\"}}"
+       },
+       {
+          "description": "[basx674] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000\"}}"
+       },
+       {
+          "description": "[basx634] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000443000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+2\"}}"
+       },
+       {
+          "description": "[basx137] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-7\"}}"
+       },
+       {
+          "description": "[basx635] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000463000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+3\"}}"
+       },
+       {
+          "description": "[basx675] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-7\"}}"
+       },
+       {
+          "description": "[basx636] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000483000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+4\"}}"
+       },
+       {
+          "description": "[basx676] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000303000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-8\"}}"
+       },
+       {
+          "description": "[basx637] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+5\"}}"
+       },
+       {
+          "description": "[basx677] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000002E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-9\"}}"
+       },
+       {
+          "description": "[basx638] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6\"}}"
+       },
+       {
+          "description": "[basx678] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000002C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-10\"}}"
+       },
+       {
+          "description": "[basx149] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"000E+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+9\"}}"
+       },
+       {
+          "description": "[basx639] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+7\"}}"
+       },
+       {
+          "description": "[basx679] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000002A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00E-9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-11\"}}"
+       },
+       {
+          "description": "[basx063] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400185C0ACE00000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+00345678.5432\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"345678.5432\"}}"
+       },
+       {
+          "description": "[basx018] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640000000000000000000000000000003EB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0\"}}"
+       },
+       {
+          "description": "[basx609] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0\"}}"
+       },
+       {
+          "description": "[basx614] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003EB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0\"}}"
+       },
+       {
+          "description": "[basx684] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"00.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx640] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0\"}}"
+       },
+       {
+          "description": "[basx660] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0\"}}"
+       },
+       {
+          "description": "[basx641] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx661] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00\"}}"
+       },
+       {
+          "description": "[basx296] some more negative zeros [systematic tests below]",
+          "canonical_bson": "1800000013640000000000000000000000000000003AB000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000\"}}"
+       },
+       {
+          "description": "[basx642] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000423000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+1\"}}"
+       },
+       {
+          "description": "[basx662] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000\"}}"
+       },
+       {
+          "description": "[basx297] some more negative zeros [systematic tests below]",
+          "canonical_bson": "18000000136400000000000000000000000000000038B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0000\"}}"
+       },
+       {
+          "description": "[basx643] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000443000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+2\"}}"
+       },
+       {
+          "description": "[basx663] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000\"}}"
+       },
+       {
+          "description": "[basx644] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000463000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+3\"}}"
+       },
+       {
+          "description": "[basx664] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000\"}}"
+       },
+       {
+          "description": "[basx645] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000483000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+4\"}}"
+       },
+       {
+          "description": "[basx665] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000\"}}"
+       },
+       {
+          "description": "[basx646] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+5\"}}"
+       },
+       {
+          "description": "[basx666] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-7\"}}"
+       },
+       {
+          "description": "[basx647] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6\"}}"
+       },
+       {
+          "description": "[basx667] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000303000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-8\"}}"
+       },
+       {
+          "description": "[basx648] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+7\"}}"
+       },
+       {
+          "description": "[basx668] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000002E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-9\"}}"
+       },
+       {
+          "description": "[basx160] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"00E+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+9\"}}"
+       },
+       {
+          "description": "[basx161] Numbers with E",
+          "canonical_bson": "1800000013640000000000000000000000000000002E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"00E-9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-9\"}}"
+       },
+       {
+          "description": "[basx649] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000503000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+8\"}}"
+       },
+       {
+          "description": "[basx669] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000002C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0E-9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-10\"}}"
+       },
+       {
+          "description": "[basx062] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400185C0ACE00000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+0345678.5432\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"345678.5432\"}}"
+       },
+       {
+          "description": "[basx001] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx017] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "18000000136400000000000000000000000000000040B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0\"}}"
+       },
+       {
+          "description": "[basx611] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx613] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000040B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0\"}}"
+       },
+       {
+          "description": "[basx685] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx688] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+0.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx689] Zeros",
+          "canonical_bson": "18000000136400000000000000000000000000000040B000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0\"}}"
+       },
+       {
+          "description": "[basx650] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0\"}}"
+       },
+       {
+          "description": "[basx651] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000423000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+1\"}}"
+       },
+       {
+          "description": "[basx298] some more negative zeros [systematic tests below]",
+          "canonical_bson": "1800000013640000000000000000000000000000003CB000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00\"}}"
+       },
+       {
+          "description": "[basx652] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000443000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+2\"}}"
+       },
+       {
+          "description": "[basx299] some more negative zeros [systematic tests below]",
+          "canonical_bson": "1800000013640000000000000000000000000000003AB000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000\"}}"
+       },
+       {
+          "description": "[basx653] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000463000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+3\"}}"
+       },
+       {
+          "description": "[basx654] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000483000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+4\"}}"
+       },
+       {
+          "description": "[basx655] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+5\"}}"
+       },
+       {
+          "description": "[basx656] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6\"}}"
+       },
+       {
+          "description": "[basx657] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000004E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+7\"}}"
+       },
+       {
+          "description": "[basx658] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000503000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+8\"}}"
+       },
+       {
+          "description": "[basx138] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+0E+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+9\"}}"
+       },
+       {
+          "description": "[basx139] Numbers with E",
+          "canonical_bson": "18000000136400000000000000000000000000000052B000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+9\"}}"
+       },
+       {
+          "description": "[basx144] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000523000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+9\"}}"
+       },
+       {
+          "description": "[basx154] Numbers with E",
+          "canonical_bson": "180000001364000000000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+9\"}}"
+       },
+       {
+          "description": "[basx659] Zeros",
+          "canonical_bson": "180000001364000000000000000000000000000000523000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+9\"}}"
+       },
+       {
+          "description": "[basx042] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400FC040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+12.76\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.76\"}}"
+       },
+       {
+          "description": "[basx143] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+1E+009\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx061] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400185C0ACE00000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+345678.5432\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"345678.5432\"}}"
+       },
+       {
+          "description": "[basx036] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640015CD5B0700000000000000000000203000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000000123456789\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.23456789E-8\"}}"
+       },
+       {
+          "description": "[basx035] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640015CD5B0700000000000000000000223000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000123456789\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.23456789E-7\"}}"
+       },
+       {
+          "description": "[basx034] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640015CD5B0700000000000000000000243000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000123456789\"}}"
+       },
+       {
+          "description": "[basx053] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364003200000000000000000000000000323000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000050\"}}"
+       },
+       {
+          "description": "[basx033] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640015CD5B0700000000000000000000263000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000123456789\"}}"
+       },
+       {
+          "description": "[basx016] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364000C000000000000000000000000003A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.012\"}}"
+       },
+       {
+          "description": "[basx015] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364007B000000000000000000000000003A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.123\"}}"
+       },
+       {
+          "description": "[basx037] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640078DF0D8648700000000000000000223000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.123456789012344\"}}"
+       },
+       {
+          "description": "[basx038] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640079DF0D8648700000000000000000223000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.123456789012345\"}}"
+       },
+       {
+          "description": "[basx250] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000383000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265\"}}"
+       },
+       {
+          "description": "[basx257] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E-0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265\"}}"
+       },
+       {
+          "description": "[basx256] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.01265\"}}"
+       },
+       {
+          "description": "[basx258] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E+1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265\"}}"
+       },
+       {
+          "description": "[basx251] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000103000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E-20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-21\"}}"
+       },
+       {
+          "description": "[basx263] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000603000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E+20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+19\"}}"
+       },
+       {
+          "description": "[basx255] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.001265\"}}"
+       },
+       {
+          "description": "[basx259] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E+2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65\"}}"
+       },
+       {
+          "description": "[basx254] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0001265\"}}"
+       },
+       {
+          "description": "[basx260] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E+3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5\"}}"
+       },
+       {
+          "description": "[basx253] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000303000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00001265\"}}"
+       },
+       {
+          "description": "[basx261] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E+4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265\"}}"
+       },
+       {
+          "description": "[basx252] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000283000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E-8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-9\"}}"
+       },
+       {
+          "description": "[basx262] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000483000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265E+8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+7\"}}"
+       },
+       {
+          "description": "[basx159] Numbers with E",
+          "canonical_bson": "1800000013640049000000000000000000000000002E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.73e-7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7.3E-8\"}}"
+       },
+       {
+          "description": "[basx004] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640064000000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00\"}}"
+       },
+       {
+          "description": "[basx003] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364000A000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0\"}}"
+       },
+       {
+          "description": "[basx002] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364000100000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1\"}}"
+       },
+       {
+          "description": "[basx148] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+009\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx153] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E009\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx141] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1e+09\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx146] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+09\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx151] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1e09\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx142] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000F43000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+90\"}}"
+       },
+       {
+          "description": "[basx147] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000F43000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1e+90\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+90\"}}"
+       },
+       {
+          "description": "[basx152] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000F43000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E90\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+90\"}}"
+       },
+       {
+          "description": "[basx140] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx150] Numbers with E",
+          "canonical_bson": "180000001364000100000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+9\"}}"
+       },
+       {
+          "description": "[basx014] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "18000000136400D2040000000000000000000000003A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.234\"}}"
+       },
+       {
+          "description": "[basx170] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265\"}}"
+       },
+       {
+          "description": "[basx177] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265\"}}"
+       },
+       {
+          "description": "[basx176] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265\"}}"
+       },
+       {
+          "description": "[basx178] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65\"}}"
+       },
+       {
+          "description": "[basx171] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000123000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-20\"}}"
+       },
+       {
+          "description": "[basx183] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000623000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+20\"}}"
+       },
+       {
+          "description": "[basx175] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.01265\"}}"
+       },
+       {
+          "description": "[basx179] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5\"}}"
+       },
+       {
+          "description": "[basx174] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.001265\"}}"
+       },
+       {
+          "description": "[basx180] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265\"}}"
+       },
+       {
+          "description": "[basx173] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0001265\"}}"
+       },
+       {
+          "description": "[basx181] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000423000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+4\"}}"
+       },
+       {
+          "description": "[basx172] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000002A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-8\"}}"
+       },
+       {
+          "description": "[basx182] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000004A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+8\"}}"
+       },
+       {
+          "description": "[basx157] Numbers with E",
+          "canonical_bson": "180000001364000400000000000000000000000000523000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"4E+9\"}}"
+       },
+       {
+          "description": "[basx067] examples",
+          "canonical_bson": "180000001364000500000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"5E-6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000005\"}}"
+       },
+       {
+          "description": "[basx069] examples",
+          "canonical_bson": "180000001364000500000000000000000000000000323000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"5E-7\"}}"
+       },
+       {
+          "description": "[basx385] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7\"}}"
+       },
+       {
+          "description": "[basx365] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000543000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E10\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+10\"}}"
+       },
+       {
+          "description": "[basx405] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000002C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-10\"}}"
+       },
+       {
+          "description": "[basx363] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000563000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E11\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+11\"}}"
+       },
+       {
+          "description": "[basx407] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000002A3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-11\"}}"
+       },
+       {
+          "description": "[basx361] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000583000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E12\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+12\"}}"
+       },
+       {
+          "description": "[basx409] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000283000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-12\"}}"
+       },
+       {
+          "description": "[basx411] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000263000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-13\"}}"
+       },
+       {
+          "description": "[basx383] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000423000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+1\"}}"
+       },
+       {
+          "description": "[basx387] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.7\"}}"
+       },
+       {
+          "description": "[basx381] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000443000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+2\"}}"
+       },
+       {
+          "description": "[basx389] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.07\"}}"
+       },
+       {
+          "description": "[basx379] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000463000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+3\"}}"
+       },
+       {
+          "description": "[basx391] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.007\"}}"
+       },
+       {
+          "description": "[basx377] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000483000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+4\"}}"
+       },
+       {
+          "description": "[basx393] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0007\"}}"
+       },
+       {
+          "description": "[basx375] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000004A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+5\"}}"
+       },
+       {
+          "description": "[basx395] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00007\"}}"
+       },
+       {
+          "description": "[basx373] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000004C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+6\"}}"
+       },
+       {
+          "description": "[basx397] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000007\"}}"
+       },
+       {
+          "description": "[basx371] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000004E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+7\"}}"
+       },
+       {
+          "description": "[basx399] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000323000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-7\"}}"
+       },
+       {
+          "description": "[basx369] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000503000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+8\"}}"
+       },
+       {
+          "description": "[basx401] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000303000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-8\"}}"
+       },
+       {
+          "description": "[basx367] Engineering notation tests",
+          "canonical_bson": "180000001364000700000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E+9\"}}"
+       },
+       {
+          "description": "[basx403] Engineering notation tests",
+          "canonical_bson": "1800000013640007000000000000000000000000002E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"7E-9\"}}"
+       },
+       {
+          "description": "[basx007] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640064000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10.0\"}}"
+       },
+       {
+          "description": "[basx005] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364000A00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10\"}}"
+       },
+       {
+          "description": "[basx165] Numbers with E",
+          "canonical_bson": "180000001364000A00000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10E+009\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+10\"}}"
+       },
+       {
+          "description": "[basx163] Numbers with E",
+          "canonical_bson": "180000001364000A00000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10E+09\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+10\"}}"
+       },
+       {
+          "description": "[basx325] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10\"}}"
+       },
+       {
+          "description": "[basx305] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000543000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e10\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+11\"}}"
+       },
+       {
+          "description": "[basx345] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000002C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-10\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-9\"}}"
+       },
+       {
+          "description": "[basx303] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000563000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e11\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+12\"}}"
+       },
+       {
+          "description": "[basx347] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000002A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-11\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-10\"}}"
+       },
+       {
+          "description": "[basx301] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000583000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e12\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+13\"}}"
+       },
+       {
+          "description": "[basx349] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000283000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-12\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-11\"}}"
+       },
+       {
+          "description": "[basx351] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000263000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-13\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-12\"}}"
+       },
+       {
+          "description": "[basx323] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000423000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+2\"}}"
+       },
+       {
+          "description": "[basx327] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0\"}}"
+       },
+       {
+          "description": "[basx321] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000443000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+3\"}}"
+       },
+       {
+          "description": "[basx329] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.10\"}}"
+       },
+       {
+          "description": "[basx319] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000463000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+4\"}}"
+       },
+       {
+          "description": "[basx331] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.010\"}}"
+       },
+       {
+          "description": "[basx317] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000483000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+5\"}}"
+       },
+       {
+          "description": "[basx333] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0010\"}}"
+       },
+       {
+          "description": "[basx315] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000004A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+6\"}}"
+       },
+       {
+          "description": "[basx335] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00010\"}}"
+       },
+       {
+          "description": "[basx313] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000004C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+7\"}}"
+       },
+       {
+          "description": "[basx337] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-6\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000010\"}}"
+       },
+       {
+          "description": "[basx311] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000004E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+8\"}}"
+       },
+       {
+          "description": "[basx339] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000010\"}}"
+       },
+       {
+          "description": "[basx309] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000503000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+9\"}}"
+       },
+       {
+          "description": "[basx341] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000303000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-7\"}}"
+       },
+       {
+          "description": "[basx164] Numbers with E",
+          "canonical_bson": "180000001364000A00000000000000000000000000F43000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e+90\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+91\"}}"
+       },
+       {
+          "description": "[basx162] Numbers with E",
+          "canonical_bson": "180000001364000A00000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10E+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+10\"}}"
+       },
+       {
+          "description": "[basx307] Engineering notation tests",
+          "canonical_bson": "180000001364000A00000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+10\"}}"
+       },
+       {
+          "description": "[basx343] Engineering notation tests",
+          "canonical_bson": "180000001364000A000000000000000000000000002E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"10e-9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-8\"}}"
+       },
+       {
+          "description": "[basx008] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640065000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10.1\"}}"
+       },
+       {
+          "description": "[basx009] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640068000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10.4\"}}"
+       },
+       {
+          "description": "[basx010] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640069000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10.5\"}}"
+       },
+       {
+          "description": "[basx011] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364006A000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10.6\"}}"
+       },
+       {
+          "description": "[basx012] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364006D000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"10.9\"}}"
+       },
+       {
+          "description": "[basx013] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "180000001364006E000000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"11.0\"}}"
+       },
+       {
+          "description": "[basx040] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364000C00000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12\"}}"
+       },
+       {
+          "description": "[basx190] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65\"}}"
+       },
+       {
+          "description": "[basx197] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E-0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65\"}}"
+       },
+       {
+          "description": "[basx196] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265\"}}"
+       },
+       {
+          "description": "[basx198] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E+1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5\"}}"
+       },
+       {
+          "description": "[basx191] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000143000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E-20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-19\"}}"
+       },
+       {
+          "description": "[basx203] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000643000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E+20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+21\"}}"
+       },
+       {
+          "description": "[basx195] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265\"}}"
+       },
+       {
+          "description": "[basx199] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E+2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265\"}}"
+       },
+       {
+          "description": "[basx194] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.01265\"}}"
+       },
+       {
+          "description": "[basx200] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000423000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E+3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+4\"}}"
+       },
+       {
+          "description": "[basx193] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000343000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.001265\"}}"
+       },
+       {
+          "description": "[basx201] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000443000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E+4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+5\"}}"
+       },
+       {
+          "description": "[basx192] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000002C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E-8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-7\"}}"
+       },
+       {
+          "description": "[basx202] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000004C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65E+8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+9\"}}"
+       },
+       {
+          "description": "[basx044] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400FC040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"012.76\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.76\"}}"
+       },
+       {
+          "description": "[basx042] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400FC040000000000000000000000003C3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.76\"}}"
+       },
+       {
+          "description": "[basx046] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364001100000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"17.\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"17\"}}"
+       },
+       {
+          "description": "[basx049] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364002C00000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0044\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"44\"}}"
+       },
+       {
+          "description": "[basx048] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364002C00000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"044\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"44\"}}"
+       },
+       {
+          "description": "[basx158] Numbers with E",
+          "canonical_bson": "180000001364002C00000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"44E+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"4.4E+10\"}}"
+       },
+       {
+          "description": "[basx068] examples",
+          "canonical_bson": "180000001364003200000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"50E-7\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000050\"}}"
+       },
+       {
+          "description": "[basx169] Numbers with E",
+          "canonical_bson": "180000001364006400000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"100e+009\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00E+11\"}}"
+       },
+       {
+          "description": "[basx167] Numbers with E",
+          "canonical_bson": "180000001364006400000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"100e+09\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00E+11\"}}"
+       },
+       {
+          "description": "[basx168] Numbers with E",
+          "canonical_bson": "180000001364006400000000000000000000000000F43000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"100E+90\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00E+92\"}}"
+       },
+       {
+          "description": "[basx166] Numbers with E",
+          "canonical_bson": "180000001364006400000000000000000000000000523000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"100e+9\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00E+11\"}}"
+       },
+       {
+          "description": "[basx210] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003E3000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5\"}}"
+       },
+       {
+          "description": "[basx217] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E-0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5\"}}"
+       },
+       {
+          "description": "[basx216] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65\"}}"
+       },
+       {
+          "description": "[basx218] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E+1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265\"}}"
+       },
+       {
+          "description": "[basx211] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000163000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E-20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-18\"}}"
+       },
+       {
+          "description": "[basx223] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000663000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E+20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+22\"}}"
+       },
+       {
+          "description": "[basx215] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265\"}}"
+       },
+       {
+          "description": "[basx219] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000423000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E+2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+4\"}}"
+       },
+       {
+          "description": "[basx214] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265\"}}"
+       },
+       {
+          "description": "[basx220] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000443000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E+3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+5\"}}"
+       },
+       {
+          "description": "[basx213] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.01265\"}}"
+       },
+       {
+          "description": "[basx221] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000463000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E+4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+6\"}}"
+       },
+       {
+          "description": "[basx212] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000002E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E-8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000001265\"}}"
+       },
+       {
+          "description": "[basx222] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000004E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5E+8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+10\"}}"
+       },
+       {
+          "description": "[basx006] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "18000000136400E803000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1000\"}}"
+       },
+       {
+          "description": "[basx230] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265\"}}"
+       },
+       {
+          "description": "[basx237] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000403000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E-0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265\"}}"
+       },
+       {
+          "description": "[basx236] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E-1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"126.5\"}}"
+       },
+       {
+          "description": "[basx238] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000423000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E+1\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+4\"}}"
+       },
+       {
+          "description": "[basx231] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000183000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E-20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E-17\"}}"
+       },
+       {
+          "description": "[basx243] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000683000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E+20\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+23\"}}"
+       },
+       {
+          "description": "[basx235] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E-2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.65\"}}"
+       },
+       {
+          "description": "[basx239] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000443000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E+2\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+5\"}}"
+       },
+       {
+          "description": "[basx234] Numbers with E",
+          "canonical_bson": "18000000136400F1040000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E-3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265\"}}"
+       },
+       {
+          "description": "[basx240] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000463000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E+3\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+6\"}}"
+       },
+       {
+          "description": "[basx233] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000383000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E-4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1265\"}}"
+       },
+       {
+          "description": "[basx241] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000483000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E+4\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+7\"}}"
+       },
+       {
+          "description": "[basx232] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000303000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E-8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00001265\"}}"
+       },
+       {
+          "description": "[basx242] Numbers with E",
+          "canonical_bson": "18000000136400F104000000000000000000000000503000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1265E+8\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.265E+11\"}}"
+       },
+       {
+          "description": "[basx060] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400185C0ACE00000000000000000000383000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"345678.5432\"}}"
+       },
+       {
+          "description": "[basx059] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400F198670C08000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0345678.54321\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"345678.54321\"}}"
+       },
+       {
+          "description": "[basx058] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364006AF90B7C50000000000000000000343000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"345678.543210\"}}"
+       },
+       {
+          "description": "[basx057] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364006A19562522020000000000000000343000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"2345678.543210\"}}"
+       },
+       {
+          "description": "[basx056] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364006AB9C8733A0B0000000000000000343000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12345678.543210\"}}"
+       },
+       {
+          "description": "[basx031] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640040AF0D8648700000000000000000343000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"123456789.000000\"}}"
+       },
+       {
+          "description": "[basx030] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640080910F8648700000000000000000343000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"123456789.123456\"}}"
+       },
+       {
+          "description": "[basx032] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640080910F8648700000000000000000403000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"123456789123456\"}}"
+       }
+    ]
+}
diff --git a/bson/src/test/resources/bson/decimal128-4.json b/bson/src/test/resources/bson/decimal128-4.json
new file mode 100644
index 00000000000..0957019351f
--- /dev/null
+++ b/bson/src/test/resources/bson/decimal128-4.json
@@ -0,0 +1,165 @@
+{
+    "description": "Decimal128",
+    "bson_type": "0x13",
+    "test_key": "d",
+    "valid": [
+       {
+          "description": "[basx023] conform to rules and exponent will be in permitted range).",
+          "canonical_bson": "1800000013640001000000000000000000000000003EB000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.1\"}}"
+       },
+
+       {
+          "description": "[basx045] strings without E cannot generate E in result",
+          "canonical_bson": "1800000013640003000000000000000000000000003A3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+0.003\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.003\"}}"
+       },
+       {
+          "description": "[basx610] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \".0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0\"}}"
+       },
+       {
+          "description": "[basx612] Zeros",
+          "canonical_bson": "1800000013640000000000000000000000000000003EB000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-.0\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.0\"}}"
+       },
+       {
+          "description": "[basx043] strings without E cannot generate E in result",
+          "canonical_bson": "18000000136400FC040000000000000000000000003C3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"+12.76\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"12.76\"}}"
+       },
+       {
+          "description": "[basx055] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364000500000000000000000000000000303000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000005\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"5E-8\"}}"
+       },
+       {
+          "description": "[basx054] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364000500000000000000000000000000323000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0000005\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"5E-7\"}}"
+       },
+       {
+          "description": "[basx052] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364000500000000000000000000000000343000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000005\"}}"
+       },
+       {
+          "description": "[basx051] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364000500000000000000000000000000363000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"00.00005\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00005\"}}"
+       },
+       {
+          "description": "[basx050] strings without E cannot generate E in result",
+          "canonical_bson": "180000001364000500000000000000000000000000383000",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.0005\"}}"
+       },
+       {
+          "description": "[basx047] strings without E cannot generate E in result",
+          "canonical_bson": "1800000013640005000000000000000000000000003E3000",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \".5\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.5\"}}"
+       },
+       {
+          "description": "[dqbsr431] check rounding modes heeded (Rounded)",
+          "canonical_bson": "1800000013640099761CC7B548F377DC80A131C836FE2F00",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.1111111111111111111111111111123450\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.111111111111111111111111111112345\"}}"
+       },
+       {
+          "description": "OK2",
+          "canonical_bson": "18000000136400000000000A5BC138938D44C64D31FC2F00",
+          "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \".100000000000000000000000000000000000000000000000000000000000\"}}",
+          "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.1000000000000000000000000000000000\"}}"
+       }
+    ],
+    "parseErrors": [
+       {
+          "description": "[basx564] Near-specials (Conversion_syntax)",
+          "string": "Infi"
+       },
+       {
+          "description": "[basx565] Near-specials (Conversion_syntax)",
+          "string": "Infin"
+       },
+       {
+          "description": "[basx566] Near-specials (Conversion_syntax)",
+          "string": "Infini"
+       },
+       {
+          "description": "[basx567] Near-specials (Conversion_syntax)",
+          "string": "Infinit"
+       },
+       {
+          "description": "[basx568] Near-specials (Conversion_syntax)",
+          "string": "-Infinit"
+       },
+       {
+          "description": "[basx590] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": ".Infinity"
+       },
+       {
+          "description": "[basx562] Near-specials (Conversion_syntax)",
+          "string": "NaNq"
+       },
+       {
+          "description": "[basx563] Near-specials (Conversion_syntax)",
+          "string": "NaNs"
+       },
+       {
+          "description": "[dqbas939] overflow results at different rounding modes (Overflow & Inexact & Rounded)",
+          "string": "-7e10000"
+       },
+       {
+          "description": "[dqbsr534] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234650"
+       },
+       {
+          "description": "[dqbsr535] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234551"
+       },
+       {
+          "description": "[dqbsr533] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234550"
+       },
+       {
+          "description": "[dqbsr532] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234549"
+       },
+       {
+          "description": "[dqbsr432] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234549"
+       },
+       {
+          "description": "[dqbsr433] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234550"
+       },
+       {
+          "description": "[dqbsr435] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234551"
+       },
+       {
+          "description": "[dqbsr434] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234650"
+       },
+       {
+          "description": "[dqbas938] overflow results at different rounding modes (Overflow & Inexact & Rounded)",
+          "string": "7e10000"
+       },
+       {
+          "description": "Inexact rounding#1",
+          "string": "100000000000000000000000000000000000000000000000000000000001"
+       },
+       {
+          "description": "Inexact rounding#2",
+          "string": "1E-6177"
+       }
+    ]
+}
diff --git a/bson/src/test/resources/bson/decimal128-5.json b/bson/src/test/resources/bson/decimal128-5.json
new file mode 100644
index 00000000000..e976eae4075
--- /dev/null
+++ b/bson/src/test/resources/bson/decimal128-5.json
@@ -0,0 +1,402 @@
+{
+    "description": "Decimal128",
+    "bson_type": "0x13",
+    "test_key": "d",
+    "valid": [
+        {
+            "description": "[decq035] fold-downs (more below) (Clamped)",
+            "canonical_bson": "18000000136400000000807F1BCF85B27059C8A43CFE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.23E+6144\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.230000000000000000000000000000000E+6144\"}}"
+        },
+        {
+            "description": "[decq037] fold-downs (more below) (Clamped)",
+            "canonical_bson": "18000000136400000000000A5BC138938D44C64D31FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6144\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000000E+6144\"}}"
+        },
+        {
+            "description": "[decq077] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000000000081EFAC855B416D2DEE04000000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.100000000000000000000000000000000E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000000000E-6144\"}}"
+        },
+        {
+            "description": "[decq078] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000000000081EFAC855B416D2DEE04000000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000000000E-6144\"}}"
+        },
+        {
+            "description": "[decq079] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000A00000000000000000000000000000000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000000000000000000000000000010E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-6175\"}}"
+        },
+        {
+            "description": "[decq080] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000A00000000000000000000000000000000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E-6175\"}}"
+        },
+        {
+            "description": "[decq081] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000020000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.00000000000000000000000000000001E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6175\"}}"
+        },
+        {
+            "description": "[decq082] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000020000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6175\"}}"
+        },
+        {
+            "description": "[decq083] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000000000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0.000000000000000000000000000000001E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6176\"}}"
+        },
+        {
+            "description": "[decq084] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000000000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6176\"}}"
+        },
+        {
+            "description": "[decq090] underflows cannot be tested for simple copies, check edge cases (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000000000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1e-6176\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E-6176\"}}"
+        },
+        {
+            "description": "[decq100] underflows cannot be tested for simple copies, check edge cases (Subnormal)",
+            "canonical_bson": "18000000136400FFFFFFFF095BC138938D44C64D31000000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"999999999999999999999999999999999e-6176\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"9.99999999999999999999999999999999E-6144\"}}"
+        },
+        {
+            "description": "[decq130] fold-downs (more below) (Clamped)",
+            "canonical_bson": "18000000136400000000807F1BCF85B27059C8A43CFEDF00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.23E+6144\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.230000000000000000000000000000000E+6144\"}}"
+        },
+        {
+            "description": "[decq132] fold-downs (more below) (Clamped)",
+            "canonical_bson": "18000000136400000000000A5BC138938D44C64D31FEDF00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E+6144\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.000000000000000000000000000000000E+6144\"}}"
+        },
+        {
+            "description": "[decq177] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000000000081EFAC855B416D2DEE04008000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.100000000000000000000000000000000E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.00000000000000000000000000000000E-6144\"}}"
+        },
+        {
+            "description": "[decq178] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000000000081EFAC855B416D2DEE04008000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.00000000000000000000000000000000E-6144\"}}"
+        },
+        {
+            "description": "[decq179] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000A00000000000000000000000000008000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000000000000000000000000000000010E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.0E-6175\"}}"
+        },
+        {
+            "description": "[decq180] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000A00000000000000000000000000008000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1.0E-6175\"}}"
+        },
+        {
+            "description": "[decq181] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000028000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.00000000000000000000000000000001E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E-6175\"}}"
+        },
+        {
+            "description": "[decq182] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000028000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E-6175\"}}"
+        },
+        {
+            "description": "[decq183] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000008000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0.000000000000000000000000000000001E-6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E-6176\"}}"
+        },
+        {
+            "description": "[decq184] Nmin and below (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000008000",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E-6176\"}}"
+        },
+        {
+            "description": "[decq190] underflow edge cases (Subnormal)",
+            "canonical_bson": "180000001364000100000000000000000000000000008000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1e-6176\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-1E-6176\"}}"
+        },
+        {
+            "description": "[decq200] underflow edge cases (Subnormal)",
+            "canonical_bson": "18000000136400FFFFFFFF095BC138938D44C64D31008000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-999999999999999999999999999999999e-6176\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-9.99999999999999999999999999999999E-6144\"}}"
+        },
+        {
+            "description": "[decq400] zeros (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000000000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-8000\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-6176\"}}"
+        },
+        {
+            "description": "[decq401] zeros (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000000000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-6177\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-6176\"}}"
+        },
+        {
+            "description": "[decq414] clamped zeros... (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6112\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6111\"}}"
+        },
+        {
+            "description": "[decq416] clamped zeros... (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6144\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6111\"}}"
+        },
+        {
+            "description": "[decq418] clamped zeros... (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+8000\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6111\"}}"
+        },
+        {
+            "description": "[decq420] negative zeros (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000008000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-8000\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-6176\"}}"
+        },
+        {
+            "description": "[decq421] negative zeros (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000008000",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-6177\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-6176\"}}"
+        },
+        {
+            "description": "[decq434] clamped zeros... (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000FEDF00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+6112\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+6111\"}}"
+        },
+        {
+            "description": "[decq436] clamped zeros... (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000FEDF00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+6144\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+6111\"}}"
+        },
+        {
+            "description": "[decq438] clamped zeros... (Clamped)",
+            "canonical_bson": "180000001364000000000000000000000000000000FEDF00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+8000\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+6111\"}}"
+        },
+        {
+            "description": "[decq601] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000000000A5BC138938D44C64D31FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6144\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000000E+6144\"}}"
+        },
+        {
+            "description": "[decq603] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000000000081EFAC855B416D2DEE04FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6143\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000000000E+6143\"}}"
+        },
+        {
+            "description": "[decq605] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000000080264B91C02220BE377E00FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6142\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000000000000E+6142\"}}"
+        },
+        {
+            "description": "[decq607] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000000040EAED7446D09C2C9F0C00FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6141\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000E+6141\"}}"
+        },
+        {
+            "description": "[decq609] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000000A0CA17726DAE0F1E430100FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6140\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000000E+6140\"}}"
+        },
+        {
+            "description": "[decq611] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000000106102253E5ECE4F200000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6139\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000000000E+6139\"}}"
+        },
+        {
+            "description": "[decq613] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000000E83C80D09F3C2E3B030000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6138\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000E+6138\"}}"
+        },
+        {
+            "description": "[decq615] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000000E4D20CC8DCD2B752000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6137\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000000E+6137\"}}"
+        },
+        {
+            "description": "[decq617] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000000004A48011416954508000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6136\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000000E+6136\"}}"
+        },
+        {
+            "description": "[decq619] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000000A1EDCCCE1BC2D300000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6135\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000E+6135\"}}"
+        },
+        {
+            "description": "[decq621] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000080F64AE1C7022D1500000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6134\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000000E+6134\"}}"
+        },
+        {
+            "description": "[decq623] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000040B2BAC9E0191E0200000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6133\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000000E+6133\"}}"
+        },
+        {
+            "description": "[decq625] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000000A0DEC5ADC935360000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6132\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000E+6132\"}}"
+        },
+        {
+            "description": "[decq627] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000010632D5EC76B050000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6131\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000000E+6131\"}}"
+        },
+        {
+            "description": "[decq629] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000000E8890423C78A000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6130\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000000E+6130\"}}"
+        },
+        {
+            "description": "[decq631] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400000064A7B3B6E00D000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6129\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000E+6129\"}}"
+        },
+        {
+            "description": "[decq633] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000008A5D78456301000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6128\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000000E+6128\"}}"
+        },
+        {
+            "description": "[decq635] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000000C16FF2862300000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6127\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000000E+6127\"}}"
+        },
+        {
+            "description": "[decq637] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000080C6A47E8D0300000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6126\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000E+6126\"}}"
+        },
+        {
+            "description": "[decq639] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000407A10F35A0000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6125\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000000E+6125\"}}"
+        },
+        {
+            "description": "[decq641] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000A0724E18090000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6124\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000000E+6124\"}}"
+        },
+        {
+            "description": "[decq643] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000010A5D4E8000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6123\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000E+6123\"}}"
+        },
+        {
+            "description": "[decq645] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000E8764817000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6122\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000000E+6122\"}}"
+        },
+        {
+            "description": "[decq647] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000E40B5402000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6121\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000000E+6121\"}}"
+        },
+        {
+            "description": "[decq649] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000CA9A3B00000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6120\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000E+6120\"}}"
+        },
+        {
+            "description": "[decq651] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640000E1F50500000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6119\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000000E+6119\"}}"
+        },
+        {
+            "description": "[decq653] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364008096980000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6118\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000000E+6118\"}}"
+        },
+        {
+            "description": "[decq655] fold-down full sequence (Clamped)",
+            "canonical_bson": "1800000013640040420F0000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6117\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000E+6117\"}}"
+        },
+        {
+            "description": "[decq657] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400A086010000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6116\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00000E+6116\"}}"
+        },
+        {
+            "description": "[decq659] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364001027000000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6115\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0000E+6115\"}}"
+        },
+        {
+            "description": "[decq661] fold-down full sequence (Clamped)",
+            "canonical_bson": "18000000136400E803000000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6114\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000E+6114\"}}"
+        },
+        {
+            "description": "[decq663] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364006400000000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6113\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.00E+6113\"}}"
+        },
+        {
+            "description": "[decq665] fold-down full sequence (Clamped)",
+            "canonical_bson": "180000001364000A00000000000000000000000000FE5F00",
+            "degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1E+6112\"}}",
+            "canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.0E+6112\"}}"
+        }
+    ]
+}
+
diff --git a/bson/src/test/resources/bson/decimal128-6.json b/bson/src/test/resources/bson/decimal128-6.json
new file mode 100644
index 00000000000..eba6764e853
--- /dev/null
+++ b/bson/src/test/resources/bson/decimal128-6.json
@@ -0,0 +1,131 @@
+{
+    "description": "Decimal128",
+    "bson_type": "0x13",
+    "test_key": "d",
+    "parseErrors": [
+        {
+            "description": "Incomplete Exponent",
+            "string": "1e"
+        },
+        {
+            "description": "Exponent at the beginning",
+            "string": "E01"
+        },
+        {
+            "description": "Just a decimal place",
+            "string": "."
+        },
+        {
+            "description": "2 decimal places",
+            "string": "..3"
+        },
+        {
+            "description": "2 decimal places",
+            "string": ".13.3"
+        },
+        {
+            "description": "2 decimal places",
+            "string": "1..3"
+        },
+        {
+            "description": "2 decimal places",
+            "string": "1.3.4"
+        },
+        {
+            "description": "2 decimal places",
+            "string": "1.34."
+        },
+        {
+            "description": "Decimal with no digits",
+            "string": ".e"
+        },
+        {
+            "description": "2 signs",
+            "string": "+-32.4"
+        },
+        {
+            "description": "2 signs",
+            "string": "-+32.4"
+        },
+        {
+            "description": "2 negative signs",
+            "string": "--32.4"
+        },
+        {
+            "description": "2 negative signs",
+            "string": "-32.-4"
+        },
+        {
+            "description": "End in negative sign",
+            "string": "32.0-"
+        },
+        {
+            "description": "2 negative signs",
+            "string": "32.4E--21"
+        },
+        {
+            "description": "2 negative signs",
+            "string": "32.4E-2-1"
+        },
+        {
+            "description": "2 signs",
+            "string": "32.4E+-21"
+        },
+        {
+            "description": "Empty string",
+            "string": ""
+        },
+        {
+            "description": "leading white space positive number",
+            "string": " 1"
+        },
+        {
+            "description": "leading white space negative number",
+            "string": " -1"
+        },
+        {
+            "description": "trailing white space",
+            "string": "1 "
+        },
+        {
+            "description": "Invalid",
+            "string": "E"
+        },
+        {
+            "description": "Invalid",
+            "string": "invalid"
+        },
+        {
+            "description": "Invalid",
+            "string": "i"
+        },
+        {
+            "description": "Invalid",
+            "string": "in"
+        },
+        {
+            "description": "Invalid",
+            "string": "-in"
+        },
+        {
+            "description": "Invalid",
+            "string": "Na"
+        },
+        {
+            "description": "Invalid",
+            "string": "-Na"
+        },
+        {
+            "description": "Invalid",
+            "string": "1.23abc"
+        },
+        {
+            "description": "Invalid",
+            "string": "1.23abcE+02"
+        },
+        {
+            "description": "Invalid",
+            "string": "1.23E+0aabs2"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/decimal128-7.json b/bson/src/test/resources/bson/decimal128-7.json
new file mode 100644
index 00000000000..0b78f1237b8
--- /dev/null
+++ b/bson/src/test/resources/bson/decimal128-7.json
@@ -0,0 +1,327 @@
+{
+    "description": "Decimal128",
+    "bson_type": "0x13",
+    "test_key": "d",
+    "parseErrors": [
+       {
+          "description": "[basx572] Near-specials (Conversion_syntax)",
+          "string": "-9Inf"
+       },
+       {
+          "description": "[basx516] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "-1-"
+       },
+       {
+          "description": "[basx533] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "0000.."
+       },
+       {
+          "description": "[basx534] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": ".0000."
+       },
+       {
+          "description": "[basx535] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "00..00"
+       },
+       {
+          "description": "[basx569] Near-specials (Conversion_syntax)",
+          "string": "0Inf"
+       },
+       {
+          "description": "[basx571] Near-specials (Conversion_syntax)",
+          "string": "-0Inf"
+       },
+       {
+          "description": "[basx575] Near-specials (Conversion_syntax)",
+          "string": "0sNaN"
+       },
+       {
+          "description": "[basx503] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "++1"
+       },
+       {
+          "description": "[basx504] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "--1"
+       },
+       {
+          "description": "[basx505] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "-+1"
+       },
+       {
+          "description": "[basx506] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "+-1"
+       },
+       {
+          "description": "[basx510] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": " +1"
+       },
+       {
+          "description": "[basx513] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": " + 1"
+       },
+       {
+          "description": "[basx514] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": " - 1"
+       },
+       {
+          "description": "[basx501] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "."
+       },
+       {
+          "description": "[basx502] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": ".."
+       },
+       {
+          "description": "[basx519] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": ""
+       },
+       {
+          "description": "[basx525] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "e100"
+       },
+       {
+          "description": "[basx549] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "e+1"
+       },
+       {
+          "description": "[basx577] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": ".e+1"
+       },
+       {
+          "description": "[basx578] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "+.e+1"
+       },
+       {
+          "description": "[basx581] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "E+1"
+       },
+       {
+          "description": "[basx582] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": ".E+1"
+       },
+       {
+          "description": "[basx583] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "+.E+1"
+       },
+       {
+          "description": "[basx579] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "-.e+"
+       },
+       {
+          "description": "[basx580] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "-.e"
+       },
+       {
+          "description": "[basx584] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "-.E+"
+       },
+       {
+          "description": "[basx585] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "-.E"
+       },
+       {
+          "description": "[basx589] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "+.Inf"
+       },
+       {
+          "description": "[basx586] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": ".NaN"
+       },
+       {
+          "description": "[basx587] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "-.NaN"
+       },
+       {
+          "description": "[basx545] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "ONE"
+       },
+       {
+          "description": "[basx561] Near-specials (Conversion_syntax)",
+          "string": "qNaN"
+       },
+       {
+          "description": "[basx573] Near-specials (Conversion_syntax)",
+          "string": "-sNa"
+       },
+       {
+          "description": "[basx588] some baddies with dots and Es and dots and specials (Conversion_syntax)",
+          "string": "+.sNaN"
+       },
+       {
+          "description": "[basx544] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "ten"
+       },
+       {
+          "description": "[basx527] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "u0b65"
+       },
+       {
+          "description": "[basx526] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "u0e5a"
+       },
+       {
+          "description": "[basx515] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "x"
+       },
+       {
+          "description": "[basx574] Near-specials (Conversion_syntax)",
+          "string": "xNaN"
+       },
+       {
+          "description": "[basx530] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": ".123.5"
+       },
+       {
+          "description": "[basx500] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1..2"
+       },
+       {
+          "description": "[basx542] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1e1.0"
+       },
+       {
+          "description": "[basx553] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E+1.2.3"
+       },
+       {
+          "description": "[basx543] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1e123e"
+       },
+       {
+          "description": "[basx552] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E+1.2"
+       },
+       {
+          "description": "[basx546] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1e.1"
+       },
+       {
+          "description": "[basx547] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1e1."
+       },
+       {
+          "description": "[basx554] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E++1"
+       },
+       {
+          "description": "[basx555] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E--1"
+       },
+       {
+          "description": "[basx556] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E+-1"
+       },
+       {
+          "description": "[basx557] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E-+1"
+       },
+       {
+          "description": "[basx558] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E'1"
+       },
+       {
+          "description": "[basx559] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E\"1"
+       },
+       {
+          "description": "[basx520] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1e-"
+       },
+       {
+          "description": "[basx560] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1E"
+       },
+       {
+          "description": "[basx548] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1ee"
+       },
+       {
+          "description": "[basx551] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1.2.1"
+       },
+       {
+          "description": "[basx550] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1.23.4"
+       },
+       {
+          "description": "[basx529] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "1.34.5"
+       },
+       {
+          "description": "[basx531] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "01.35."
+       },
+       {
+          "description": "[basx532] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "01.35-"
+       },
+       {
+          "description": "[basx518] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "3+"
+       },
+       {
+          "description": "[basx521] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "7e99999a"
+       },
+       {
+          "description": "[basx570] Near-specials (Conversion_syntax)",
+          "string": "9Inf"
+       },
+       {
+          "description": "[basx512] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "12 "
+       },
+       {
+          "description": "[basx517] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "12-"
+       },
+       {
+          "description": "[basx507] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "12e"
+       },
+       {
+          "description": "[basx508] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "12e++"
+       },
+       {
+          "description": "[basx509] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "12f4"
+       },
+       {
+          "description": "[basx536] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "111e*123"
+       },
+       {
+          "description": "[basx537] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "111e123-"
+       },
+       {
+          "description": "[basx540] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "111e1*23"
+       },
+       {
+          "description": "[basx538] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "111e+12+"
+       },
+       {
+          "description": "[basx539] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "111e1-3-"
+       },
+       {
+          "description": "[basx541] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "111E1e+3"
+       },
+       {
+          "description": "[basx528] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "123,65"
+       },
+       {
+          "description": "[basx523] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "7e12356789012x"
+       },
+       {
+          "description": "[basx522] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "7e123567890x"
+       }
+    ]
+}
diff --git a/bson/src/test/resources/bson/document.json b/bson/src/test/resources/bson/document.json
new file mode 100644
index 00000000000..3ec9187044f
--- /dev/null
+++ b/bson/src/test/resources/bson/document.json
@@ -0,0 +1,36 @@
+{
+    "description": "Document type (sub-documents)",
+    "bson_type": "0x03",
+    "test_key": "x",
+    "valid": [
+        {
+            "description": "Empty subdoc",
+            "canonical_bson": "0D000000037800050000000000",
+            "canonical_extjson": "{\"x\" : {}}"
+        },
+        {
+            "description": "Empty-string key subdoc",
+            "canonical_bson": "150000000378000D00000002000200000062000000",
+            "canonical_extjson": "{\"x\" : {\"\" : \"b\"}}"
+        },
+        {
+            "description": "Single-character key subdoc",
+            "canonical_bson": "160000000378000E0000000261000200000062000000",
+            "canonical_extjson": "{\"x\" : {\"a\" : \"b\"}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "Subdocument length too long: eats outer terminator",
+            "bson": "1800000003666F6F000F0000001062617200FFFFFF7F0000"
+        },
+        {
+            "description": "Subdocument length too short: leaks terminator",
+            "bson": "1500000003666F6F000A0000000862617200010000"
+        },
+        {
+            "description": "Invalid subdocument: bad string length in field",
+            "bson": "1C00000003666F6F001200000002626172000500000062617A000000"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/double.json b/bson/src/test/resources/bson/double.json
new file mode 100644
index 00000000000..a483f696761
--- /dev/null
+++ b/bson/src/test/resources/bson/double.json
@@ -0,0 +1,87 @@
+{
+    "description": "Double type",
+    "bson_type": "0x01",
+    "test_key": "d",
+    "valid": [
+        {
+            "description": "+1.0",
+            "canonical_bson": "10000000016400000000000000F03F00",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"1.0\"}}",
+            "relaxed_extjson": "{\"d\" : 1.0}"
+        },
+        {
+            "description": "-1.0",
+            "canonical_bson": "10000000016400000000000000F0BF00",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"-1.0\"}}",
+            "relaxed_extjson": "{\"d\" : -1.0}"
+        },
+        {
+            "description": "+1.0001220703125",
+            "canonical_bson": "10000000016400000000008000F03F00",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"1.0001220703125\"}}",
+            "relaxed_extjson": "{\"d\" : 1.0001220703125}"
+        },
+        {
+            "description": "-1.0001220703125",
+            "canonical_bson": "10000000016400000000008000F0BF00",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"-1.0001220703125\"}}",
+            "relaxed_extjson": "{\"d\" : -1.0001220703125}"
+        },
+        {
+            "description": "1.23456789012345677E18",
+            "canonical_bson": "1000000001640081E97DF41022B14300",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"1.23456789012345677E18\"}}",
+            "relaxed_extjson": "{\"d\" : 1.23456789012345677E18}"
+        },
+        {
+            "description": "-1.23456789012345677E18",
+            "canonical_bson": "1000000001640081E97DF41022B1C300",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"-1.23456789012345677E18\"}}",
+            "relaxed_extjson": "{\"d\" : -1.23456789012345677E18}"
+        },
+        {
+            "description": "0.0",
+            "canonical_bson": "10000000016400000000000000000000",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"0.0\"}}",
+            "relaxed_extjson": "{\"d\" : 0.0}"
+        },
+        {
+            "description": "-0.0",
+            "canonical_bson": "10000000016400000000000000008000",
+            "canonical_extjson": "{\"d\" : {\"$numberDouble\": \"-0.0\"}}",
+            "relaxed_extjson": "{\"d\" : -0.0}"
+        },
+        {
+            "description": "NaN",
+            "canonical_bson": "10000000016400000000000000F87F00",
+            "canonical_extjson": "{\"d\": {\"$numberDouble\": \"NaN\"}}",
+            "relaxed_extjson": "{\"d\": {\"$numberDouble\": \"NaN\"}}",
+            "lossy": true
+        },
+        {
+            "description": "NaN with payload",
+            "canonical_bson": "10000000016400120000000000F87F00",
+            "canonical_extjson": "{\"d\": {\"$numberDouble\": \"NaN\"}}",
+            "relaxed_extjson": "{\"d\": {\"$numberDouble\": \"NaN\"}}",
+            "lossy": true
+        },
+        {
+            "description": "Inf",
+            "canonical_bson": "10000000016400000000000000F07F00",
+            "canonical_extjson": "{\"d\": {\"$numberDouble\": \"Infinity\"}}",
+            "relaxed_extjson": "{\"d\": {\"$numberDouble\": \"Infinity\"}}"
+        },
+        {
+            "description": "-Inf",
+            "canonical_bson": "10000000016400000000000000F0FF00",
+            "canonical_extjson": "{\"d\": {\"$numberDouble\": \"-Infinity\"}}",
+            "relaxed_extjson": "{\"d\": {\"$numberDouble\": \"-Infinity\"}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "double truncated",
+            "bson": "0B0000000164000000F03F00"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/int32.json b/bson/src/test/resources/bson/int32.json
index 78f72b77f17..1353fc3df8b 100644
--- a/bson/src/test/resources/bson/int32.json
+++ b/bson/src/test/resources/bson/int32.json
@@ -1,35 +1,43 @@
 {
-    "description": "Int32 type", 
-    "documents": [
+    "description": "Int32 type",
+    "bson_type": "0x10",
+    "test_key": "i",
+    "valid": [
         {
-            "decoded": {
-                "i": -2147483648
-            }, 
-            "encoded": "0C0000001069000000008000"
-        }, 
+            "description": "MinValue",
+            "canonical_bson": "0C0000001069000000008000",
+            "canonical_extjson": "{\"i\" : {\"$numberInt\": \"-2147483648\"}}",
+            "relaxed_extjson": "{\"i\" : -2147483648}"
+        },
         {
-            "decoded": {
-                "i": 2147483647
-            }, 
-            "encoded": "0C000000106900FFFFFF7F00"
-        }, 
+            "description": "MaxValue",
+            "canonical_bson": "0C000000106900FFFFFF7F00",
+            "canonical_extjson": "{\"i\" : {\"$numberInt\": \"2147483647\"}}",
+            "relaxed_extjson": "{\"i\" : 2147483647}"
+        },
         {
-            "decoded": {
-                "i": -1
-            }, 
-            "encoded": "0C000000106900FFFFFFFF00"
-        }, 
+            "description": "-1",
+            "canonical_bson": "0C000000106900FFFFFFFF00",
+            "canonical_extjson": "{\"i\" : {\"$numberInt\": \"-1\"}}",
+            "relaxed_extjson": "{\"i\" : -1}"
+        },
         {
-            "decoded": {
-                "i": 0
-            }, 
-            "encoded": "0C0000001069000000000000"
-        }, 
+            "description": "0",
+            "canonical_bson": "0C0000001069000000000000",
+            "canonical_extjson": "{\"i\" : {\"$numberInt\": \"0\"}}",
+            "relaxed_extjson": "{\"i\" : 0}"
+        },
         {
-            "decoded": {
-                "i": 1
-            }, 
-            "encoded": "0C0000001069000100000000"
+            "description": "1",
+            "canonical_bson": "0C0000001069000100000000",
+            "canonical_extjson": "{\"i\" : {\"$numberInt\": \"1\"}}",
+            "relaxed_extjson": "{\"i\" : 1}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "Bad int32 field length",
+            "bson": "090000001061000500"
         }
     ]
 }
diff --git a/bson/src/test/resources/bson/int64.json b/bson/src/test/resources/bson/int64.json
new file mode 100644
index 00000000000..91f4abff950
--- /dev/null
+++ b/bson/src/test/resources/bson/int64.json
@@ -0,0 +1,43 @@
+{
+    "description": "Int64 type",
+    "bson_type": "0x12",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "MinValue",
+            "canonical_bson": "10000000126100000000000000008000",
+            "canonical_extjson": "{\"a\" : {\"$numberLong\" : \"-9223372036854775808\"}}",
+            "relaxed_extjson": "{\"a\" : -9223372036854775808}"
+        },
+        {
+            "description": "MaxValue",
+            "canonical_bson": "10000000126100FFFFFFFFFFFFFF7F00",
+            "canonical_extjson": "{\"a\" : {\"$numberLong\" : \"9223372036854775807\"}}",
+            "relaxed_extjson": "{\"a\" : 9223372036854775807}"
+        },
+        {
+            "description": "-1",
+            "canonical_bson": "10000000126100FFFFFFFFFFFFFFFF00",
+            "canonical_extjson": "{\"a\" : {\"$numberLong\" : \"-1\"}}",
+            "relaxed_extjson": "{\"a\" : -1}"
+        },
+        {
+            "description": "0",
+            "canonical_bson": "10000000126100000000000000000000",
+            "canonical_extjson": "{\"a\" : {\"$numberLong\" : \"0\"}}",
+            "relaxed_extjson": "{\"a\" : 0}"
+        },
+        {
+            "description": "1",
+            "canonical_bson": "10000000126100010000000000000000",
+            "canonical_extjson": "{\"a\" : {\"$numberLong\" : \"1\"}}",
+            "relaxed_extjson": "{\"a\" : 1}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "int64 field truncated",
+            "bson": "0C0000001261001234567800"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/maxkey.json b/bson/src/test/resources/bson/maxkey.json
new file mode 100644
index 00000000000..67cad6db57b
--- /dev/null
+++ b/bson/src/test/resources/bson/maxkey.json
@@ -0,0 +1,12 @@
+{
+    "description": "Maxkey type",
+    "bson_type": "0x7F",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Maxkey",
+            "canonical_bson": "080000007F610000",
+            "canonical_extjson": "{\"a\" : {\"$maxKey\" : 1}}"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/minkey.json b/bson/src/test/resources/bson/minkey.json
new file mode 100644
index 00000000000..8adee4509a5
--- /dev/null
+++ b/bson/src/test/resources/bson/minkey.json
@@ -0,0 +1,12 @@
+{
+    "description": "Minkey type",
+    "bson_type": "0xFF",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Minkey",
+            "canonical_bson": "08000000FF610000",
+            "canonical_extjson": "{\"a\" : {\"$minKey\" : 1}}"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/multi-type-deprecated.json b/bson/src/test/resources/bson/multi-type-deprecated.json
new file mode 100644
index 00000000000..5aac1bd2e7d
--- /dev/null
+++ b/bson/src/test/resources/bson/multi-type-deprecated.json
@@ -0,0 +1,15 @@
+{
+    "description": "Multiple types within the same document",
+    "bson_type": "0x00",
+    "deprecated": true,
+    "valid": [
+        {
+            "description": "All BSON types",
+            "canonical_bson": "3B020000075F69640057E193D7A9CC81B4027498B50E53796D626F6C000700000073796D626F6C0002537472696E670007000000737472696E670010496E743332002A00000012496E743634002A0000000000000001446F75626C6500000000000000F0BF0542696E617279001000000003A34C38F7C3ABEDC8A37814A992AB8DB60542696E61727955736572446566696E656400050000008001020304050D436F6465000E00000066756E6374696F6E2829207B7D000F436F64655769746853636F7065001B0000000E00000066756E6374696F6E2829207B7D00050000000003537562646F63756D656E74001200000002666F6F0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696D657374616D7000010000002A0000000B5265676578007061747465726E0000094461746574696D6545706F6368000000000000000000094461746574696D65506F73697469766500FFFFFF7F00000000094461746574696D654E656761746976650000000080FFFFFFFF085472756500010846616C736500000C4442506F696E746572000E00000064622E636F6C6C656374696F6E0057E193D7A9CC81B4027498B1034442526566003D0000000224726566000B000000636F6C6C656374696F6E00072469640057FD71E96E32AB4225B723FB02246462000900000064617461626173650000FF4D696E6B6579007F4D61786B6579000A4E756C6C0006556E646566696E65640000",
+            "converted_bson": "4b020000075f69640057e193d7a9cc81b4027498b50253796d626f6c000700000073796d626f6c0002537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c73650000034442506f696e746572002e0000000224726566000e00000064622e636f6c6c656374696f6e00072469640057e193d7a9cc81b4027498b100034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c000a556e646566696e65640000",
+            "canonical_extjson": "{\"_id\": {\"$oid\": \"57e193d7a9cc81b4027498b5\"}, \"Symbol\": {\"$symbol\": \"symbol\"}, \"String\": \"string\", \"Int32\": {\"$numberInt\": \"42\"}, \"Int64\": {\"$numberLong\": \"42\"}, \"Double\": {\"$numberDouble\": \"-1.0\"}, \"Binary\": { \"$binary\" : {\"base64\": \"o0w498Or7cijeBSpkquNtg==\", \"subType\": \"03\"}}, \"BinaryUserDefined\": { \"$binary\" : {\"base64\": \"AQIDBAU=\", \"subType\": \"80\"}}, \"Code\": {\"$code\": \"function() {}\"}, \"CodeWithScope\": {\"$code\": \"function() {}\", \"$scope\": {}}, \"Subdocument\": {\"foo\": \"bar\"}, \"Array\": [{\"$numberInt\": \"1\"}, {\"$numberInt\": \"2\"}, {\"$numberInt\": \"3\"}, {\"$numberInt\": \"4\"}, {\"$numberInt\": \"5\"}], \"Timestamp\": {\"$timestamp\": {\"t\": 42, \"i\": 1}}, \"Regex\": {\"$regularExpression\": {\"pattern\": \"pattern\", \"options\": \"\"}}, \"DatetimeEpoch\": {\"$date\": {\"$numberLong\": \"0\"}}, \"DatetimePositive\": {\"$date\": {\"$numberLong\": \"2147483647\"}}, \"DatetimeNegative\": {\"$date\": {\"$numberLong\": \"-2147483648\"}}, \"True\": true, \"False\": false, \"DBPointer\": {\"$dbPointer\": {\"$ref\": \"db.collection\", \"$id\": {\"$oid\": \"57e193d7a9cc81b4027498b1\"}}}, \"DBRef\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"57fd71e96e32ab4225b723fb\"}, \"$db\": \"database\"}, \"Minkey\": {\"$minKey\": 1}, \"Maxkey\": {\"$maxKey\": 1}, \"Null\": null, \"Undefined\": {\"$undefined\": true}}",
+            "converted_extjson": "{\"_id\": {\"$oid\": \"57e193d7a9cc81b4027498b5\"}, \"Symbol\": \"symbol\", \"String\": \"string\", \"Int32\": {\"$numberInt\": \"42\"}, \"Int64\": {\"$numberLong\": \"42\"}, \"Double\": {\"$numberDouble\": \"-1.0\"}, \"Binary\": { \"$binary\" : {\"base64\": \"o0w498Or7cijeBSpkquNtg==\", \"subType\": \"03\"}}, \"BinaryUserDefined\": { \"$binary\" : {\"base64\": \"AQIDBAU=\", \"subType\": \"80\"}}, \"Code\": {\"$code\": \"function() {}\"}, \"CodeWithScope\": {\"$code\": \"function() {}\", \"$scope\": {}}, \"Subdocument\": {\"foo\": \"bar\"}, \"Array\": [{\"$numberInt\": \"1\"}, {\"$numberInt\": \"2\"}, {\"$numberInt\": \"3\"}, {\"$numberInt\": \"4\"}, {\"$numberInt\": \"5\"}], \"Timestamp\": {\"$timestamp\": {\"t\": 42, \"i\": 1}}, \"Regex\": {\"$regularExpression\": {\"pattern\": \"pattern\", \"options\": \"\"}}, \"DatetimeEpoch\": {\"$date\": {\"$numberLong\": \"0\"}}, \"DatetimePositive\": {\"$date\": {\"$numberLong\": \"2147483647\"}}, \"DatetimeNegative\": {\"$date\": {\"$numberLong\": \"-2147483648\"}}, \"True\": true, \"False\": false, \"DBPointer\": {\"$ref\": \"db.collection\", \"$id\": {\"$oid\": \"57e193d7a9cc81b4027498b1\"}}, \"DBRef\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"57fd71e96e32ab4225b723fb\"}, \"$db\": \"database\"}, \"Minkey\": {\"$minKey\": 1}, \"Maxkey\": {\"$maxKey\": 1}, \"Null\": null, \"Undefined\": null}"
+        }
+    ]
+}
+
diff --git a/bson/src/test/resources/bson/multi-type.json b/bson/src/test/resources/bson/multi-type.json
new file mode 100644
index 00000000000..1e1d557c9ba
--- /dev/null
+++ b/bson/src/test/resources/bson/multi-type.json
@@ -0,0 +1,11 @@
+{
+    "description": "Multiple types within the same document",
+    "bson_type": "0x00",
+    "valid": [
+        {
+            "description": "All BSON types",
+            "canonical_bson": "F4010000075F69640057E193D7A9CC81B4027498B502537472696E670007000000737472696E670010496E743332002A00000012496E743634002A0000000000000001446F75626C6500000000000000F0BF0542696E617279001000000003A34C38F7C3ABEDC8A37814A992AB8DB60542696E61727955736572446566696E656400050000008001020304050D436F6465000E00000066756E6374696F6E2829207B7D000F436F64655769746853636F7065001B0000000E00000066756E6374696F6E2829207B7D00050000000003537562646F63756D656E74001200000002666F6F0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696D657374616D7000010000002A0000000B5265676578007061747465726E0000094461746574696D6545706F6368000000000000000000094461746574696D65506F73697469766500FFFFFF7F00000000094461746574696D654E656761746976650000000080FFFFFFFF085472756500010846616C73650000034442526566003D0000000224726566000B000000636F6C6C656374696F6E00072469640057FD71E96E32AB4225B723FB02246462000900000064617461626173650000FF4D696E6B6579007F4D61786B6579000A4E756C6C0000",
+            "canonical_extjson": "{\"_id\": {\"$oid\": \"57e193d7a9cc81b4027498b5\"}, \"String\": \"string\", \"Int32\": {\"$numberInt\": \"42\"}, \"Int64\": {\"$numberLong\": \"42\"}, \"Double\": {\"$numberDouble\": \"-1.0\"}, \"Binary\": { \"$binary\" : {\"base64\": \"o0w498Or7cijeBSpkquNtg==\", \"subType\": \"03\"}}, \"BinaryUserDefined\": { \"$binary\" : {\"base64\": \"AQIDBAU=\", \"subType\": \"80\"}}, \"Code\": {\"$code\": \"function() {}\"}, \"CodeWithScope\": {\"$code\": \"function() {}\", \"$scope\": {}}, \"Subdocument\": {\"foo\": \"bar\"}, \"Array\": [{\"$numberInt\": \"1\"}, {\"$numberInt\": \"2\"}, {\"$numberInt\": \"3\"}, {\"$numberInt\": \"4\"}, {\"$numberInt\": \"5\"}], \"Timestamp\": {\"$timestamp\": {\"t\": 42, \"i\": 1}}, \"Regex\": {\"$regularExpression\": {\"pattern\": \"pattern\", \"options\": \"\"}}, \"DatetimeEpoch\": {\"$date\": {\"$numberLong\": \"0\"}}, \"DatetimePositive\": {\"$date\": {\"$numberLong\": \"2147483647\"}}, \"DatetimeNegative\": {\"$date\": {\"$numberLong\": \"-2147483648\"}}, \"True\": true, \"False\": false, \"DBRef\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"57fd71e96e32ab4225b723fb\"}, \"$db\": \"database\"}, \"Minkey\": {\"$minKey\": 1}, \"Maxkey\": {\"$maxKey\": 1}, \"Null\": null}"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/null.json b/bson/src/test/resources/bson/null.json
new file mode 100644
index 00000000000..f9b269473e6
--- /dev/null
+++ b/bson/src/test/resources/bson/null.json
@@ -0,0 +1,12 @@
+{
+    "description": "Null type",
+    "bson_type": "0x0A",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Null",
+            "canonical_bson": "080000000A610000",
+            "canonical_extjson": "{\"a\" : null}"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/oid.json b/bson/src/test/resources/bson/oid.json
new file mode 100644
index 00000000000..14e9caf4b40
--- /dev/null
+++ b/bson/src/test/resources/bson/oid.json
@@ -0,0 +1,28 @@
+{
+    "description": "ObjectId",
+    "bson_type": "0x07",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "All zeroes",
+            "canonical_bson": "1400000007610000000000000000000000000000",
+            "canonical_extjson": "{\"a\" : {\"$oid\" : \"000000000000000000000000\"}}"
+        },
+        {
+            "description": "All ones",
+            "canonical_bson": "14000000076100FFFFFFFFFFFFFFFFFFFFFFFF00",
+            "canonical_extjson": "{\"a\" : {\"$oid\" : \"ffffffffffffffffffffffff\"}}"
+        },
+        {
+            "description": "Random",
+            "canonical_bson": "1400000007610056E1FC72E0C917E9C471416100",
+            "canonical_extjson": "{\"a\" : {\"$oid\" : \"56e1fc72e0c917e9c4714161\"}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "OID truncated",
+            "bson": "1200000007610056E1FC72E0C917E9C471"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/regex.json b/bson/src/test/resources/bson/regex.json
new file mode 100644
index 00000000000..c62b019cdf4
--- /dev/null
+++ b/bson/src/test/resources/bson/regex.json
@@ -0,0 +1,65 @@
+{
+    "description": "Regular Expression type",
+    "bson_type": "0x0B",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "empty regex with no options",
+            "canonical_bson": "0A0000000B6100000000",
+            "canonical_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"\", \"options\" : \"\"}}}"
+        },
+        {
+            "description": "regex without options",
+            "canonical_bson": "0D0000000B6100616263000000",
+            "canonical_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"abc\", \"options\" : \"\"}}}"
+        },
+        {
+            "description": "regex with options",
+            "canonical_bson": "0F0000000B610061626300696D0000",
+            "canonical_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"abc\", \"options\" : \"im\"}}}"
+        },
+        {
+            "description": "regex with options (keys reversed)",
+            "canonical_bson": "0F0000000B610061626300696D0000",
+            "canonical_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"abc\", \"options\" : \"im\"}}}",
+            "degenerate_extjson": "{\"a\" : {\"$regularExpression\" : {\"options\" : \"im\", \"pattern\": \"abc\"}}}"
+        },
+        {
+            "description": "regex with slash",
+            "canonical_bson": "110000000B610061622F636400696D0000",
+            "canonical_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"ab/cd\", \"options\" : \"im\"}}}"
+        },
+        {
+            "description": "flags not alphabetized",
+            "degenerate_bson": "100000000B6100616263006D69780000",
+            "canonical_bson": "100000000B610061626300696D780000",
+            "canonical_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"abc\", \"options\" : \"imx\"}}}",
+            "degenerate_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"abc\", \"options\" : \"mix\"}}}"
+        },
+        {
+            "description" : "Required escapes",
+            "canonical_bson" : "100000000B610061625C226162000000",
+            "canonical_extjson": "{\"a\" : {\"$regularExpression\" : { \"pattern\": \"ab\\\\\\\"ab\", \"options\" : \"\"}}}"
+        },
+        {
+            "description" : "Regular expression as value of $regex query operator",
+            "canonical_bson" : "180000000B247265676578007061747465726E0069780000",
+            "canonical_extjson": "{\"$regex\" : {\"$regularExpression\" : { \"pattern\": \"pattern\", \"options\" : \"ix\"}}}"
+        },
+        {
+            "description" : "Regular expression as value of $regex query operator with $options",
+            "canonical_bson" : "270000000B247265676578007061747465726E000002246F7074696F6E73000300000069780000",
+            "canonical_extjson": "{\"$regex\" : {\"$regularExpression\" : { \"pattern\": \"pattern\", \"options\" : \"\"}}, \"$options\" : \"ix\"}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "embedded null in pattern",
+            "bson": "0F0000000B610061006300696D0000"
+        },
+        {
+            "description": "embedded null in flags",
+            "bson": "100000000B61006162630069006D0000"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/string.json b/bson/src/test/resources/bson/string.json
index 9c4b8d3f543..148334d0919 100644
--- a/bson/src/test/resources/bson/string.json
+++ b/bson/src/test/resources/bson/string.json
@@ -1,29 +1,72 @@
 {
-    "description": "String type", 
-    "documents": [
-        {
-            "decoded": {
-                "s": ""
-            }, 
-            "encoded": "0D000000027300010000000000"
-        }, 
-        {
-            "decoded": {
-                "s": "a"
-            }, 
-            "encoded": "0E00000002730002000000610000"
-        }, 
-        {
-            "decoded": {
-                "s": "This is a string"
-            }, 
-            "encoded": "1D0000000273001100000054686973206973206120737472696E670000"
-        }, 
-        {
-            "decoded": {
-                "s": "\u03ba\u1f79\u03c3\u03bc\u03b5"
-            }, 
-            "encoded": "180000000273000C000000CEBAE1BDB9CF83CEBCCEB50000"
+    "description": "String",
+    "bson_type": "0x02",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Empty string",
+            "canonical_bson": "0D000000026100010000000000",
+            "canonical_extjson": "{\"a\" : \"\"}"
+        },
+        {
+            "description": "Single character",
+            "canonical_bson": "0E00000002610002000000620000",
+            "canonical_extjson": "{\"a\" : \"b\"}"
+        },
+        {
+            "description": "Multi-character",
+            "canonical_bson": "190000000261000D0000006162616261626162616261620000",
+            "canonical_extjson": "{\"a\" : \"abababababab\"}"
+        },
+        {
+            "description": "two-byte UTF-8 (\u00e9)",
+            "canonical_bson": "190000000261000D000000C3A9C3A9C3A9C3A9C3A9C3A90000",
+            "canonical_extjson": "{\"a\" : \"\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\"}"
+        },
+        {
+            "description": "three-byte UTF-8 (\u2606)",
+            "canonical_bson": "190000000261000D000000E29886E29886E29886E298860000",
+            "canonical_extjson": "{\"a\" : \"\\u2606\\u2606\\u2606\\u2606\"}"
+        },
+        {
+            "description": "Embedded nulls",
+            "canonical_bson": "190000000261000D0000006162006261620062616261620000",
+            "canonical_extjson": "{\"a\" : \"ab\\u0000bab\\u0000babab\"}"
+        },
+        {
+            "description": "Required escapes",
+            "canonical_bson" : "320000000261002600000061625C220102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F61620000",
+            "canonical_extjson" : "{\"a\":\"ab\\\\\\\"\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001fab\"}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "bad string length: 0 (but no 0x00 either)",
+            "bson": "0C0000000261000000000000"
+        },
+        {
+            "description": "bad string length: -1",
+            "bson": "0C000000026100FFFFFFFF00"
+        },
+        {
+            "description": "bad string length: eats terminator",
+            "bson": "10000000026100050000006200620000"
+        },
+        {
+            "description": "bad string length: longer than rest of document",
+            "bson": "120000000200FFFFFF00666F6F6261720000"
+        },
+        {
+            "description": "string is not null-terminated",
+            "bson": "1000000002610004000000616263FF00"
+        },
+        {
+            "description": "empty string, but extra null",
+            "bson": "0E00000002610001000000000000"
+        },
+        {
+            "description": "invalid UTF-8",
+            "bson": "0E00000002610002000000E90000"
         }
     ]
 }
diff --git a/bson/src/test/resources/bson/symbol.json b/bson/src/test/resources/bson/symbol.json
new file mode 100644
index 00000000000..4e46cb95117
--- /dev/null
+++ b/bson/src/test/resources/bson/symbol.json
@@ -0,0 +1,80 @@
+{
+    "description": "Symbol",
+    "bson_type": "0x0E",
+    "deprecated": true,
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Empty string",
+            "canonical_bson": "0D0000000E6100010000000000",
+            "canonical_extjson": "{\"a\": {\"$symbol\": \"\"}}",
+            "converted_bson": "0D000000026100010000000000",
+            "converted_extjson": "{\"a\": \"\"}"
+        },
+        {
+            "description": "Single character",
+            "canonical_bson": "0E0000000E610002000000620000",
+            "canonical_extjson": "{\"a\": {\"$symbol\": \"b\"}}",
+            "converted_bson": "0E00000002610002000000620000",
+            "converted_extjson": "{\"a\": \"b\"}"
+        },
+        {
+            "description": "Multi-character",
+            "canonical_bson": "190000000E61000D0000006162616261626162616261620000",
+            "canonical_extjson": "{\"a\": {\"$symbol\": \"abababababab\"}}",
+            "converted_bson": "190000000261000D0000006162616261626162616261620000",
+            "converted_extjson": "{\"a\": \"abababababab\"}"
+        },
+        {
+            "description": "two-byte UTF-8 (\u00e9)",
+            "canonical_bson": "190000000E61000D000000C3A9C3A9C3A9C3A9C3A9C3A90000",
+            "canonical_extjson": "{\"a\": {\"$symbol\": \"éééééé\"}}",
+            "converted_bson": "190000000261000D000000C3A9C3A9C3A9C3A9C3A9C3A90000",
+            "converted_extjson": "{\"a\": \"éééééé\"}"
+        },
+        {
+            "description": "three-byte UTF-8 (\u2606)",
+            "canonical_bson": "190000000E61000D000000E29886E29886E29886E298860000",
+            "canonical_extjson": "{\"a\": {\"$symbol\": \"☆☆☆☆\"}}",
+            "converted_bson": "190000000261000D000000E29886E29886E29886E298860000",
+            "converted_extjson": "{\"a\": \"☆☆☆☆\"}"
+        },
+        {
+            "description": "Embedded nulls",
+            "canonical_bson": "190000000E61000D0000006162006261620062616261620000",
+            "canonical_extjson": "{\"a\": {\"$symbol\": \"ab\\u0000bab\\u0000babab\"}}",
+            "converted_bson": "190000000261000D0000006162006261620062616261620000",
+            "converted_extjson": "{\"a\": \"ab\\u0000bab\\u0000babab\"}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "bad symbol length: 0 (but no 0x00 either)",
+            "bson": "0C0000000261000000000000"
+        },
+        {
+            "description": "bad symbol length: -1",
+            "bson": "0C000000026100FFFFFFFF00"
+        },
+        {
+            "description": "bad symbol length: eats terminator",
+            "bson": "10000000026100050000006200620000"
+        },
+        {
+            "description": "bad symbol length: longer than rest of document",
+            "bson": "120000000200FFFFFF00666F6F6261720000"
+        },
+        {
+            "description": "symbol is not null-terminated",
+            "bson": "1000000002610004000000616263FF00"
+        },
+        {
+            "description": "empty symbol, but extra null",
+            "bson": "0E00000002610001000000000000"
+        },
+        {
+            "description": "invalid UTF-8",
+            "bson": "0E00000002610002000000E90000"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/timestamp.json b/bson/src/test/resources/bson/timestamp.json
new file mode 100644
index 00000000000..c76bc2998eb
--- /dev/null
+++ b/bson/src/test/resources/bson/timestamp.json
@@ -0,0 +1,29 @@
+{
+    "description": "Timestamp type",
+    "bson_type": "0x11",
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Timestamp: (123456789, 42)",
+            "canonical_bson": "100000001161002A00000015CD5B0700",
+            "canonical_extjson": "{\"a\" : {\"$timestamp\" : {\"t\" : 123456789, \"i\" : 42} } }"
+        },
+        {
+            "description": "Timestamp: (123456789, 42) (keys reversed)",
+            "canonical_bson": "100000001161002A00000015CD5B0700",
+            "canonical_extjson": "{\"a\" : {\"$timestamp\" : {\"t\" : 123456789, \"i\" : 42} } }",
+            "degenerate_extjson": "{\"a\" : {\"$timestamp\" : {\"i\" : 42, \"t\" : 123456789} } }"
+        },
+        {
+            "description": "Timestamp with high-order bit set on both seconds and increment",
+            "canonical_bson": "10000000116100FFFFFFFFFFFFFFFF00",
+            "canonical_extjson": "{\"a\" : {\"$timestamp\" : {\"t\" : 4294967295, \"i\" :  4294967295} } }"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "Truncated timestamp field",
+            "bson": "0f0000001161002A00000015CD5B00"
+        }
+    ]
+}
diff --git a/bson/src/test/resources/bson/top.json b/bson/src/test/resources/bson/top.json
new file mode 100644
index 00000000000..68b51195ab1
--- /dev/null
+++ b/bson/src/test/resources/bson/top.json
@@ -0,0 +1,236 @@
+{
+    "description": "Top-level document validity",
+    "bson_type": "0x00",
+    "valid": [
+        {
+            "description": "Document with keys that start with $",
+            "canonical_bson": "0F00000010246B6579002A00000000",
+            "canonical_extjson": "{\"$key\": {\"$numberInt\": \"42\"}}"
+        }
+    ],
+    "decodeErrors": [
+        {
+            "description": "An object size that's too small to even include the object size, but is a well-formed, empty object",
+            "bson": "0100000000"
+        },
+        {
+            "description": "An object size that's only enough for the object size, but is a well-formed, empty object",
+            "bson": "0400000000"
+        },
+        {
+            "description": "One object, with length shorter than size (missing EOO)",
+            "bson": "05000000"
+        },
+        {
+            "description": "One object, sized correctly, with a spot for an EOO, but the EOO is 0x01",
+            "bson": "0500000001"
+        },
+        {
+            "description": "One object, sized correctly, with a spot for an EOO, but the EOO is 0xff",
+            "bson": "05000000FF"
+        },
+        {
+            "description": "One object, sized correctly, with a spot for an EOO, but the EOO is 0x70",
+            "bson": "0500000070"
+        },
+        {
+            "description": "Byte count is zero (with non-zero input length)",
+            "bson": "00000000000000000000"
+        },
+        {
+            "description": "Stated length exceeds byte count, with truncated document",
+            "bson": "1200000002666F6F0004000000626172"
+        },
+        {
+            "description": "Stated length less than byte count, with garbage after envelope",
+            "bson": "1200000002666F6F00040000006261720000DEADBEEF"
+        },
+        {
+            "description": "Stated length exceeds byte count, with valid envelope",
+            "bson": "1300000002666F6F00040000006261720000"
+        },
+        {
+            "description": "Stated length less than byte count, with valid envelope",
+            "bson": "1100000002666F6F00040000006261720000"
+        },
+        {
+            "description": "Invalid BSON type low range",
+            "bson": "07000000000000"
+        },
+        {
+            "description": "Invalid BSON type high range",
+            "bson": "07000000800000"
+        },
+        {
+            "description": "Document truncated mid-key",
+            "bson": "1200000002666F"
+        }
+    ],
+    "parseErrors": [
+        {
+            "description" : "Bad $regularExpression (extra field)",
+            "string" : "{\"a\" : \"$regularExpression\": {\"pattern\": \"abc\", \"options\": \"\", \"unrelated\": true}}}"
+        },
+        {
+            "description" : "Bad $regularExpression (missing options field)",
+            "string" : "{\"a\" : \"$regularExpression\": {\"pattern\": \"abc\"}}}"
+        },
+        {
+            "description": "Bad $regularExpression (pattern is number, not string)",
+            "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": 42, \"$options\" : \"\"}}}"
+        },
+        {
+            "description": "Bad $regularExpression (options are number, not string)",
+            "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": \"a\", \"$options\" : 0}}}"
+        },
+        {
+            "description" : "Bad $regularExpression (missing pattern field)",
+            "string" : "{\"a\" : \"$regularExpression\": {\"options\":\"ix\"}}}"
+        },
+        {
+            "description": "Bad $oid (number, not string)",
+            "string": "{\"a\" : {\"$oid\" : 42}}"
+        },
+        {
+            "description": "Bad $oid (extra field)",
+            "string": "{\"a\" : {\"$oid\" : \"56e1fc72e0c917e9c4714161\", \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad $numberInt (number, not string)",
+            "string": "{\"a\" : {\"$numberInt\" : 42}}"
+        },
+        {
+            "description": "Bad $numberInt (extra field)",
+            "string": "{\"a\" : {\"$numberInt\" : \"42\", \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad $numberLong (number, not string)",
+            "string": "{\"a\" : {\"$numberLong\" : 42}}"
+        },
+        {
+            "description": "Bad $numberLong (extra field)",
+            "string": "{\"a\" : {\"$numberLong\" : \"42\", \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad $numberDouble (number, not string)",
+            "string": "{\"a\" : {\"$numberDouble\" : 42}}"
+        },
+        {
+            "description": "Bad $numberDouble (extra field)",
+            "string": "{\"a\" : {\"$numberDouble\" : \".1\", \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad $numberDecimal (number, not string)",
+            "string": "{\"a\" : {\"$numberDecimal\" : 42}}"
+        },
+        {
+            "description": "Bad $numberDecimal (extra field)",
+            "string": "{\"a\" : {\"$numberDecimal\" : \".1\", \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad $binary (binary is number, not string)",
+            "string": "{\"x\" : {\"$binary\" : {\"base64\" : 0, \"subType\" : \"00\"}}}"
+        },
+        {
+            "description": "Bad $binary (type is number, not string)",
+            "string": "{\"x\" : {\"$binary\" : {\"base64\" : \"\", \"subType\" : 0}}}"
+        },
+        {
+            "description": "Bad $binary (missing $type)",
+            "string": "{\"x\" : {\"$binary\" : {\"base64\" : \"//8=\"}}}"
+        },
+        {
+            "description": "Bad $binary (missing $binary)",
+            "string": "{\"x\" : {\"$binary\" : {\"subType\" : \"00\"}}}"
+        },
+        {
+            "description": "Bad $binary (extra field)",
+            "string": "{\"x\" : {\"$binary\" : {\"base64\" : \"//8=\", \"subType\" : 0, \"unrelated\": true}}}"
+        },
+        {
+            "description": "Bad $code (type is number, not string)",
+            "string": "{\"a\" : {\"$code\" : 42}}"
+        },
+        {
+            "description": "Bad $code (extra field)",
+            "string": "{\"a\" : {\"$code\" : \"\", \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad $code with $scope (scope is number, not doc)",
+            "string": "{\"x\" : {\"$code\" : \"\", \"$scope\" : 42}}"
+        },
+        {
+            "description": "Bad $timestamp (type is number, not doc)",
+            "string": "{\"a\" : {\"$timestamp\" : 42} }"
+        },
+        {
+            "description": "Bad $timestamp ('t' type is string, not number)",
+            "string": "{\"a\" : {\"$timestamp\" : {\"t\" : \"123456789\", \"i\" : 42} } }"
+        },
+        {
+            "description": "Bad $timestamp ('i' type is string, not number)",
+            "string": "{\"a\" : {\"$timestamp\" : {\"t\" : 123456789, \"i\" : \"42\"} } }"
+        },
+        {
+            "description": "Bad $timestamp (extra field at same level as $timestamp)",
+            "string": "{\"a\" : {\"$timestamp\" : {\"t\" : \"123456789\", \"i\" : \"42\"}, \"unrelated\": true } }"
+        },
+        {
+            "description": "Bad $timestamp (extra field at same level as t and i)",
+            "string": "{\"a\" : {\"$timestamp\" : {\"t\" : \"123456789\", \"i\" : \"42\", \"unrelated\": true} } }"
+        },
+        {
+            "description": "Bad $timestamp (missing t)",
+            "string": "{\"a\" : {\"$timestamp\" : {\"i\" : \"42\"} } }"
+        },
+        {
+            "description": "Bad $timestamp (missing i)",
+            "string": "{\"a\" : {\"$timestamp\" : {\"t\" : \"123456789\"} } }"
+        },
+        {
+            "description": "Bad $date (number, not string or hash)",
+            "string": "{\"a\" : {\"$date\" : 42}}"
+        },
+        {
+            "description": "Bad $date (extra field)",
+            "string": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"1356351330501\"}, \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad DBRef (ref is number, not string)",
+            "string": "{\"x\" : {\"$ref\" : 42, \"$id\" : \"abc\"}}"
+        },
+        {
+            "description": "Bad DBRef (db is number, not string)",
+            "string": "{\"x\" : {\"$ref\" : \"a\", \"$id\" : \"abc\", \"$db\" : 42}}"
+        },
+        {
+            "description": "Bad $minKey (boolean, not integer)",
+            "string": "{\"a\" : {\"$minKey\" : true}}"
+        },
+        {
+            "description": "Bad $minKey (wrong integer)",
+            "string": "{\"a\" : {\"$minKey\" : 0}}"
+        },
+        {
+            "description": "Bad $minKey (extra field)",
+            "string": "{\"a\" : {\"$minKey\" : 1, \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad $maxKey (boolean, not integer)",
+            "string": "{\"a\" : {\"$maxKey\" : true}}"
+        },
+        {
+            "description": "Bad $maxKey (wrong integer)",
+            "string": "{\"a\" : {\"$maxKey\" : 0}}"
+        },
+        {
+            "description": "Bad $maxKey (extra field)",
+            "string": "{\"a\" : {\"$maxKey\" : 1, \"unrelated\": true}}"
+        },
+        {
+            "description": "Bad DBpointer (extra field)",
+            "string": "{\"a\": {\"$dbPointer\": {\"a\": {\"$numberInt\": \"1\"}, \"$id\": {\"$oid\": \"56e1fc72e0c917e9c4714161\"}, \"c\": {\"$numberInt\": \"2\"}, \"$ref\": \"b\"}}}"
+        }
+
+    ]
+}
diff --git a/bson/src/test/resources/bson/undefined.json b/bson/src/test/resources/bson/undefined.json
new file mode 100644
index 00000000000..285f068258c
--- /dev/null
+++ b/bson/src/test/resources/bson/undefined.json
@@ -0,0 +1,15 @@
+{
+    "description": "Undefined type (deprecated)",
+    "bson_type": "0x06",
+    "deprecated": true,
+    "test_key": "a",
+    "valid": [
+        {
+            "description": "Undefined",
+            "canonical_bson": "0800000006610000",
+            "canonical_extjson": "{\"a\" : {\"$undefined\" : true}}",
+            "converted_bson": "080000000A610000",
+            "converted_extjson": "{\"a\" : null}"
+        }
+    ]
+}
diff --git a/driver/src/test/unit/org/bson/BSONTest.java b/bson/src/test/unit/org/bson/BSONTest.java
similarity index 86%
rename from driver/src/test/unit/org/bson/BSONTest.java
rename to bson/src/test/unit/org/bson/BSONTest.java
index 9440b2529d1..94a15c44c00 100644
--- a/driver/src/test/unit/org/bson/BSONTest.java
+++ b/bson/src/test/unit/org/bson/BSONTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.bson;
 
-import com.mongodb.BasicDBObject;
 import org.bson.io.BasicOutputBuffer;
 import org.bson.io.OutputBuffer;
 import org.bson.types.CodeWScope;
@@ -31,7 +30,6 @@
 import java.util.Date;
 import java.util.List;
 
-import static com.mongodb.util.Util.hexMD5;
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
@@ -41,6 +39,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
+@SuppressWarnings("deprecation")
 public class BSONTest {
 
     @Before
@@ -55,27 +54,34 @@ public void tearDown() {
 
     @Test
     public void testSimpleDocuments() throws IOException {
-        checkEncodingAndDecoding(new BasicBSONObject("x", true), 9, "6fe24623e4efc5cf07f027f9c66b5456");
-        checkEncodingAndDecoding(new BasicBSONObject("x", null), 8, "12d43430ff6729af501faf0638e68888");
-        checkEncodingAndDecoding(new BasicBSONObject("x", 5.2), 16, "aaeeac4a58e9c30eec6b0b0319d0dff2");
-        checkEncodingAndDecoding(new BasicBSONObject("x", "eliot"), 18, "331a3b8b7cbbe0706c80acdb45d4ebbe");
+        checkEncodingAndDecoding(new BasicBSONObject("x", true), 9, "090000000878000100");
+        checkEncodingAndDecoding(new BasicBSONObject("x", null), 8, "080000000a780000");
+        checkEncodingAndDecoding(new BasicBSONObject("x", 5.2), 16, "10000000017800cdcccccccccc144000");
+        checkEncodingAndDecoding(new BasicBSONObject("x", "eliot"), 18,
+                "1200000002780006000000656c696f740000");
         checkEncodingAndDecoding(new BasicBSONObject("x", 5.2).append("y", "truth")
                                                               .append("z", 1.1),
-                                 40, "7c77b3a6e63e2f988ede92624409da58");
+                                 40,
+                "28000000017800cdcccccccccc144002790006000000747275746800017a009a9999999999f13f00");
 
-        checkEncodingAndDecoding(new BasicBSONObject("a", new BasicBSONObject("b", 1.1)), 24, "31887a4b9d55cd9f17752d6a8a45d51f");
+        checkEncodingAndDecoding(new BasicBSONObject("a", new BasicBSONObject("b", 1.1)), 24,
+                "18000000036100100000000162009a9999999999f13f0000");
         checkEncodingAndDecoding(new BasicBSONObject("x", 5.2).append("y", new BasicBSONObject("a", "eliot").append("b", true))
                                                               .append("z", null),
-                                 44, "b3de8a0739ab329e7aea138d87235205");
+                                 44,
+                "2c000000017800cdcccccccccc14400379001600000002610006000000656c696f740008620001000a7a0000");
         checkEncodingAndDecoding(new BasicBSONObject("x", 5.2).append("y", new Object[]{"a", "eliot", "b", true})
                                                               .append("z", null),
-                                 62, "cb7bad5697714ba0cbf51d113b6a0ee8");
-        checkEncodingAndDecoding(new BasicBSONObject("x", 4), 12, "d1ed8dbf79b78fa215e2ded74548d89d");
+                                 62,
+                "3e000000017800cdcccccccccc14400479002800000002300002000000610002310006000000656c696f740002"
+                        + "320002000000620008330001000a7a0000");
+        checkEncodingAndDecoding(new BasicBSONObject("x", 4), 12, "0c0000001078000400000000");
     }
 
     @Test
     public void testArray() throws IOException {
-        checkEncodingAndDecoding(new BasicBSONObject("x", new int[]{1, 2, 3, 4}), 41, "e63397fe37de1349c50e1e4377a45e2d");
+        checkEncodingAndDecoding(new BasicBSONObject("x", new int[]{1, 2, 3, 4}), 41,
+                "2900000004780021000000103000010000001031000200000010320003000000103300040000000000");
     }
 
     @Test
@@ -83,29 +89,33 @@ public void testCode() throws IOException {
         BSONObject scope = new BasicBSONObject("x", 1);
         CodeWScope c = new CodeWScope("function() { x += 1; }", scope);
         BSONObject document = new BasicBSONObject("map", c);
-        checkEncodingAndDecoding(document, 53, "52918d2367533165bfc617df50335cbb");
+        checkEncodingAndDecoding(document, 53,
+                "350000000f6d6170002b0000001700000066756e6374696f6e2829207b2078202b3d20313b207d000c000000107800010000000000");
     }
 
     @Test
     public void testBinary() throws IOException {
-        byte[] data = new byte[10000];
-        for (int i = 0; i < 10000; i++) {
+        byte[] data = new byte[100];
+        for (int i = 0; i < 100; i++) {
             data[i] = 1;
         }
         BSONObject document = new BasicBSONObject("bin", data);
-        checkEncodingAndDecoding(document, 10015, "1d439ba5b959ecfe297a7862bf95bc10");
+        checkEncodingAndDecoding(document, 115,
+                "730000000562696e006400000000010101010101010101010101010101010101010101010101010101010101010101010101010101"
+                        + "01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101"
+                        + "01010101010100");
     }
 
     private void checkEncodingAndDecoding(final BSONObject toEncodeAndDecode,
                                           final int expectedEncodedSize,
-                                          final String expectedHash) throws IOException {
+                                          final String expectedHex) throws IOException {
         // check encoding
         BSONEncoder bsonEncoder = new BasicBSONEncoder();
         OutputBuffer buf = new BasicOutputBuffer();
         bsonEncoder.set(buf);
         bsonEncoder.putObject(toEncodeAndDecode);
         assertEquals(expectedEncodedSize, buf.size());
-        assertEquals(expectedHash, hexMD5(buf.toByteArray()));
+        assertEquals(expectedHex, toHex(buf.toByteArray()));
         bsonEncoder.done();
 
         // check decoding
@@ -120,7 +130,7 @@ private void checkEncodingAndDecoding(final BSONObject toEncodeAndDecode,
         bsonEncoder.set(buf2);
         bsonEncoder.putObject((BSONObject) callback.get());
         assertEquals(expectedEncodedSize, buf2.size());
-        assertEquals(expectedHash, hexMD5(buf2.toByteArray()));
+        assertEquals(expectedHex, toHex(buf2.toByteArray()));
     }
 
     @Test
@@ -307,7 +317,7 @@ private void roundTrip(final BSONObject o) {
 
     @Test
     public void testEncodingDecode() {
-        BasicDBObject inputDoc = new BasicDBObject("_id", 1);
+        BasicBSONObject inputDoc = new BasicBSONObject("_id", 1);
         byte[] encoded = BSON.encode(inputDoc);
         assertEquals(inputDoc, BSON.decode(encoded));
     }
@@ -321,6 +331,20 @@ public void testToInt() {
         assertEquals(13, BSON.toInt(13));
     }
 
+    public static String toHex(final byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (final byte b : bytes) {
+            String s = Integer.toHexString(0xff & b);
+
+            if (s.length() < 2) {
+                sb.append("0");
+            }
+            sb.append(s);
+        }
+        return sb.toString();
+    }
+
+
     private static class StubTransformer implements Transformer {
 
         private boolean transformCalled = false;
@@ -355,7 +379,7 @@ private class TestDate {
         private final int minute;
         private final int second;
 
-        public TestDate(final int year, final int month, final int date, final int hour, final int minute, final int second) {
+        TestDate(final int year, final int month, final int date, final int hour, final int minute, final int second) {
             this.year = year;
             this.month = month;
             this.date = date;
diff --git a/driver/src/test/unit/org/bson/BasicBSONDecoderSpecification.groovy b/bson/src/test/unit/org/bson/BasicBSONDecoderSpecification.groovy
similarity index 75%
rename from driver/src/test/unit/org/bson/BasicBSONDecoderSpecification.groovy
rename to bson/src/test/unit/org/bson/BasicBSONDecoderSpecification.groovy
index e8abeaa4965..17f91ac2e8a 100644
--- a/driver/src/test/unit/org/bson/BasicBSONDecoderSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BasicBSONDecoderSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 
 package org.bson
 
-import com.mongodb.BasicDBObject
 import org.bson.types.BSONTimestamp
 import org.bson.types.Binary
 import org.bson.types.Code
 import org.bson.types.CodeWScope
+import org.bson.types.Decimal128
 import org.bson.types.MaxKey
 import org.bson.types.MinKey
 import org.bson.types.ObjectId
@@ -37,7 +37,7 @@ class BasicBSONDecoderSpecification extends Specification {
     private final BSONDecoder bsonDecoder = new BasicBSONDecoder();
 
     def setupSpec() {
-        Map.metaClass.bitwiseNegate = { new BasicDBObject(delegate) }
+        Map.metaClass.bitwiseNegate = { new BasicBSONObject(delegate) }
         Pattern.metaClass.equals = { Pattern other ->
             delegate.pattern() == other.pattern() && delegate.flags() == other.flags()
         }
@@ -90,6 +90,7 @@ class BasicBSONDecoderSpecification extends Specification {
         ['i4': Long.MAX_VALUE]                                   | [17, 0, 0, 0, 18, 105, 52, 0, -1, -1, -1, -1, -1, -1, -1, 127, 0]
         ['k1': new MinKey()]                                     | [9, 0, 0, 0, -1, 107, 49, 0, 0]
         ['k2': new MaxKey()]                                     | [9, 0, 0, 0, 127, 107, 50, 0, 0]
+        ['f': Decimal128.parse('0E-6176')]                       | [24, 0, 0, 0, 19, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
         type = BsonType.findByValue(bytes[4])
     }
@@ -120,22 +121,23 @@ class BasicBSONDecoderSpecification extends Specification {
         1 * callback.objectDone()
 
         where:
-        method         | args                                              || bytes
-        'gotDouble'    | ['d1', -1.01d]                                    || [17, 0, 0, 0, 1, 100, 49, 0, 41, 92, -113, -62, -11, 40, -16, -65, 0]
-        'gotString'    | ['s2', 'danke']                                   || [19, 0, 0, 0, 2, 115, 50, 0, 6, 0, 0, 0, 100, 97, 110, 107, 101, 0, 0]
-        'gotBinary'    | ['b2', 0, [102, 111, 111] as byte[]]              || [17, 0, 0, 0, 5, 98, 50, 0, 3, 0, 0, 0, 0, 102, 111, 111, 0]
-        'gotObjectId'  | ['_id', new ObjectId('50d3332018c6a1d8d1662b61')] || [22, 0, 0, 0, 7, 95, 105, 100, 0, 80, -45, 51, 32, 24, -58, -95, -40, -47, 102, 43, 97, 0]
-        'gotBoolean'   | ['b1', true]                                      || [10, 0, 0, 0, 8, 98, 49, 0, 1, 0]
-        'gotDate'      | ['d', 582163200]                                  || [16, 0, 0, 0, 9, 100, 0, 0, 27, -77, 34, 0, 0, 0, 0, 0]
-        'gotNull'      | ['n']                                             || [8, 0, 0, 0, 10, 110, 0, 0]
-        'gotRegex'     | ['r', '[a]*', 'i']                                || [15, 0, 0, 0, 11, 114, 0, 91, 97, 93, 42, 0, 105, 0, 0]
-        'gotCode'      | ['js1', 'var i = 0']                              || [24, 0, 0, 0, 13, 106, 115, 49, 0, 10, 0, 0, 0, 118, 97, 114, 32, 105, 32, 61, 32, 48, 0, 0]
-        'gotSymbol'    | ['s', 'c']                                        || [14, 0, 0, 0, 14, 115, 0, 2, 0, 0, 0, 99, 0, 0]
-        'gotInt'       | ['i1', -12]                                       || [13, 0, 0, 0, 16, 105, 49, 0, -12, -1, -1, -1, 0]
-        'gotLong'      | ['i4', Long.MAX_VALUE]                            || [17, 0, 0, 0, 18, 105, 52, 0, -1, -1, -1, -1, -1, -1, -1, 127, 0]
-        'gotTimestamp' | ['t', 123999401, 44332]                           || [16, 0, 0, 0, 17, 116, 0, 44, -83, 0, 0, -87, 20, 100, 7, 0]
-        'gotMinKey'    | ['k1']                                            || [9, 0, 0, 0, -1, 107, 49, 0, 0]
-        'gotMaxKey'    | ['k2']                                            || [9, 0, 0, 0, 127, 107, 50, 0, 0]
+        method          | args                                              || bytes
+        'gotDouble'     | ['d1', -1.01d]                                    || [17, 0, 0, 0, 1, 100, 49, 0, 41, 92, -113, -62, -11, 40, -16, -65, 0]
+        'gotString'     | ['s2', 'danke']                                   || [19, 0, 0, 0, 2, 115, 50, 0, 6, 0, 0, 0, 100, 97, 110, 107, 101, 0, 0]
+        'gotBinary'     | ['b2', 0, [102, 111, 111] as byte[]]              || [17, 0, 0, 0, 5, 98, 50, 0, 3, 0, 0, 0, 0, 102, 111, 111, 0]
+        'gotObjectId'   | ['_id', new ObjectId('50d3332018c6a1d8d1662b61')] || [22, 0, 0, 0, 7, 95, 105, 100, 0, 80, -45, 51, 32, 24, -58, -95, -40, -47, 102, 43, 97, 0]
+        'gotBoolean'    | ['b1', true]                                      || [10, 0, 0, 0, 8, 98, 49, 0, 1, 0]
+        'gotDate'       | ['d', 582163200]                                  || [16, 0, 0, 0, 9, 100, 0, 0, 27, -77, 34, 0, 0, 0, 0, 0]
+        'gotNull'       | ['n']                                             || [8, 0, 0, 0, 10, 110, 0, 0]
+        'gotRegex'      | ['r', '[a]*', 'i']                                || [15, 0, 0, 0, 11, 114, 0, 91, 97, 93, 42, 0, 105, 0, 0]
+        'gotCode'       | ['js1', 'var i = 0']                              || [24, 0, 0, 0, 13, 106, 115, 49, 0, 10, 0, 0, 0, 118, 97, 114, 32, 105, 32, 61, 32, 48, 0, 0]
+        'gotSymbol'     | ['s', 'c']                                        || [14, 0, 0, 0, 14, 115, 0, 2, 0, 0, 0, 99, 0, 0]
+        'gotInt'        | ['i1', -12]                                       || [13, 0, 0, 0, 16, 105, 49, 0, -12, -1, -1, -1, 0]
+        'gotLong'       | ['i4', Long.MAX_VALUE]                            || [17, 0, 0, 0, 18, 105, 52, 0, -1, -1, -1, -1, -1, -1, -1, 127, 0]
+        'gotTimestamp'  | ['t', 123999401, 44332]                           || [16, 0, 0, 0, 17, 116, 0, 44, -83, 0, 0, -87, 20, 100, 7, 0]
+        'gotMinKey'     | ['k1']                                            || [9, 0, 0, 0, -1, 107, 49, 0, 0]
+        'gotMaxKey'     | ['k2']                                            || [9, 0, 0, 0, 127, 107, 50, 0, 0]
+        'gotDecimal128' | ['f',  Decimal128.parse('0E-6176')]               || [24, 0, 0, 0, 19, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
         //gotDBRef
         //arrayStart
diff --git a/driver/src/test/unit/org/bson/BasicBSONEncoderSpecification.groovy b/bson/src/test/unit/org/bson/BasicBSONEncoderSpecification.groovy
similarity index 97%
rename from driver/src/test/unit/org/bson/BasicBSONEncoderSpecification.groovy
rename to bson/src/test/unit/org/bson/BasicBSONEncoderSpecification.groovy
index ae8c50784d6..6a453b90dd9 100644
--- a/driver/src/test/unit/org/bson/BasicBSONEncoderSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BasicBSONEncoderSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.bson
 
-import com.mongodb.BasicDBObject
 import org.bson.io.BasicOutputBuffer
 import org.bson.io.OutputBuffer
 import org.bson.types.BSONTimestamp
@@ -24,6 +23,7 @@ import org.bson.types.BasicBSONList
 import org.bson.types.Binary
 import org.bson.types.Code
 import org.bson.types.CodeWScope
+import org.bson.types.Decimal128
 import org.bson.types.MaxKey
 import org.bson.types.MinKey
 import org.bson.types.ObjectId
@@ -38,7 +38,7 @@ import java.util.regex.Pattern
 class BasicBSONEncoderSpecification extends Specification {
 
     def setupSpec() {
-        Map.metaClass.bitwiseNegate = { new BasicDBObject(delegate) }
+        Map.metaClass.bitwiseNegate = { new BasicBSONObject(delegate) }
         Pattern.metaClass.equals = { Pattern other ->
             delegate.pattern() == other.pattern() && delegate.flags() == other.flags()
         }
@@ -88,6 +88,7 @@ class BasicBSONEncoderSpecification extends Specification {
         ['i': Long.MAX_VALUE]                                    | [16, 0, 0, 0, 18, 105, 0, -1, -1, -1, -1, -1, -1, -1, 127, 0]
         ['k': new MinKey()]                                      | [8, 0, 0, 0, -1, 107, 0, 0]
         ['k': new MaxKey()]                                      | [8, 0, 0, 0, 127, 107, 0, 0]
+        ['f': Decimal128.parse('0E-6176')]                       | [24, 0, 0, 0, 19, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
         aClass = document.find { true }.value.getClass()
     }
diff --git a/bson/src/test/unit/org/bson/BsonArraySpecification.groovy b/bson/src/test/unit/org/bson/BsonArraySpecification.groovy
new file mode 100644
index 00000000000..a4d4e11c41a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonArraySpecification.groovy
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import spock.lang.Specification
+
+class BsonArraySpecification extends Specification {
+
+    def 'should be array type'() {
+        expect:
+        new BsonArray().getBsonType() == BsonType.ARRAY
+    }
+
+    def 'should construct empty array'() {
+        when:
+        def array = new BsonArray()
+
+        then:
+        array.isEmpty()
+        array.size() == 0
+        array.getValues().isEmpty()
+    }
+
+    def 'should construct from a list'() {
+        given:
+        def list = [BsonBoolean.TRUE, BsonBoolean.FALSE]
+
+        when:
+        def array = new BsonArray(list)
+
+        then:
+        !array.isEmpty()
+        array.size() == 2
+        array.getValues() == list
+
+        when:
+        list.remove(BsonBoolean.TRUE)
+
+        then:
+        array.getValues() != list
+    }
+
+    def 'should parse json'() {
+        expect:
+        BsonArray.parse('[1, true]') == new BsonArray([new BsonInt32(1), BsonBoolean.TRUE])
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonBinaryReaderSpecification.groovy b/bson/src/test/unit/org/bson/BsonBinaryReaderSpecification.groovy
new file mode 100644
index 00000000000..d2f689ea398
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonBinaryReaderSpecification.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import static org.bson.AbstractBsonReader.State.DONE
+import static org.bson.AbstractBsonReader.State.TYPE
+import static org.bson.BsonHelper.toBson
+
+class BsonBinaryReaderSpecification extends Specification {
+
+    @Unroll
+    def 'should skip value #value'() {
+        given:
+        def document = new BsonDocument('name', value)
+        def reader = new BsonBinaryReader(toBson(document))
+        reader.readStartDocument()
+        reader.readBsonType()
+
+        when:
+        reader.skipName()
+        reader.skipValue()
+
+        then:
+        reader.getState() == TYPE
+
+        when:
+        reader.readEndDocument()
+
+        then:
+        reader.getState() == DONE
+
+        where:
+        value << BsonHelper.valuesOfEveryType()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonBinaryReaderTest.java b/bson/src/test/unit/org/bson/BsonBinaryReaderTest.java
index a85e87daa90..54c3d0034e6 100644
--- a/bson/src/test/unit/org/bson/BsonBinaryReaderTest.java
+++ b/bson/src/test/unit/org/bson/BsonBinaryReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/BsonBinarySpecification.groovy b/bson/src/test/unit/org/bson/BsonBinarySpecification.groovy
new file mode 100644
index 00000000000..e51094e964f
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonBinarySpecification.groovy
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
+class BsonBinarySpecification extends Specification {
+
+    @Unroll
+    def 'should initialize with data'() {
+        given:
+        def bsonBinary = new BsonBinary((byte) 80, data as byte[])
+
+        expect:
+        data == bsonBinary.getData()
+
+        where:
+        data << [
+                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+                [2, 5, 4, 67, 3, 4, 5, 2, 4, 2, 5, 6, 7, 4, 5, 12],
+                [34, 24, 56, 76, 3, 4, 1, 12, 1, 9, 8, 7, 56, 46, 3, 9]
+        ]
+    }
+
+    @Unroll
+    def 'should initialize with data and BsonBinarySubType'() {
+        given:
+        byte[] data = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        def bsonBinary = new BsonBinary(subType, data)
+
+        expect:
+        subType.getValue() == bsonBinary.getType()
+        data == bsonBinary.getData()
+
+        where:
+        subType << [BsonBinarySubType.BINARY, BsonBinarySubType.FUNCTION, BsonBinarySubType.MD5,
+                    BsonBinarySubType.OLD_BINARY, BsonBinarySubType.USER_DEFINED, BsonBinarySubType.UUID_LEGACY,
+                    BsonBinarySubType.UUID_STANDARD]
+    }
+
+    @Unroll
+    def 'should initialize with UUID'() {
+        given:
+        def bsonBinary = new BsonBinary(uuid)
+
+        expect:
+        uuid == bsonBinary.asUuid()
+
+        where:
+        uuid << [UUID.fromString('ffadee18-b533-11e8-96f8-529269fb1459'),
+                 UUID.fromString('a5dc280e-b534-11e8-96f8-529269fb1459'),
+                 UUID.fromString('4ef2a357-cb16-45a6-a6f6-a11ae1972917')]
+    }
+
+    @Unroll
+    def 'should initialize with UUID and UUID representation'() {
+        given:
+        def uuid = UUID.fromString('ffadee18-b533-11e8-96f8-529269fb1459')
+        def bsonBinary = new BsonBinary(uuid, uuidRepresentation)
+
+        expect:
+        uuid == bsonBinary.asUuid(uuidRepresentation)
+
+        where:
+        uuidRepresentation << [UuidRepresentation.STANDARD, UuidRepresentation.C_SHARP_LEGACY,
+                               UuidRepresentation.JAVA_LEGACY, UuidRepresentation.PYTHON_LEGACY]
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonBinarySubTypeSpecification.groovy b/bson/src/test/unit/org/bson/BsonBinarySubTypeSpecification.groovy
new file mode 100644
index 00000000000..5376f8203eb
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonBinarySubTypeSpecification.groovy
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import spock.lang.Specification
+
+class BsonBinarySubTypeSpecification extends Specification {
+
+    def 'should be uuid only for legacy and uuid types'() {
+        expect:
+        BsonBinarySubType.isUuid(value as byte) == isUuid
+
+        where:
+        value | isUuid
+        1     | false
+        2     | false
+        3     | true
+        4     | true
+        5     | false
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonBinaryWriterTest.java b/bson/src/test/unit/org/bson/BsonBinaryWriterTest.java
index 4866b86eb25..450647eda13 100644
--- a/bson/src/test/unit/org/bson/BsonBinaryWriterTest.java
+++ b/bson/src/test/unit/org/bson/BsonBinaryWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.List;
 
+import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -49,20 +51,29 @@ public void tearDown() {
         writer.close();
     }
 
-    @Test(expected = BsonSerializationException.class)
+    @Test
     public void shouldThrowWhenMaxDocumentSizeIsExceeded() {
-        writer.writeStartDocument();
-        writer.writeBinaryData("b", new BsonBinary(new byte[1024]));
-        writer.writeEndDocument();
+        try {
+            writer.writeStartDocument();
+            writer.writeBinaryData("b", new BsonBinary(new byte[1024]));
+            writer.writeEndDocument();
+            fail();
+        } catch (BsonMaximumSizeExceededException e) {
+            assertEquals("Document size of 1037 is larger than maximum of 1024.", e.getMessage());
+        }
     }
 
-    @Test(expected = BsonSerializationException.class)
+    @Test
     public void shouldThrowIfAPushedMaxDocumentSizeIsExceeded() {
-        writer.writeStartDocument();
-        writer.pushMaxDocumentSize(10);
-        writer.writeStartDocument("doc");
-        writer.writeString("s", "123456789");
-        writer.writeEndDocument();
+        try {
+            writer.writeStartDocument();
+            writer.pushMaxDocumentSize(10);
+            writer.writeStartDocument("doc");
+            writer.writeString("s", "123456789");
+            writer.writeEndDocument();
+        } catch (BsonMaximumSizeExceededException e) {
+            assertEquals("Document size of 22 is larger than maximum of 10.", e.getMessage());
+        }
     }
 
     @Test
@@ -273,10 +284,6 @@ public void testWriteMinMaxKeys() {
 
         writer.writeEndDocument();
 
-        for (final byte b : buffer.toByteArray()) {
-            System.out.print(b + ", ");
-        }
-
         byte[] expectedValues = {17, 0, 0, 0, 127, 107, 49, 0, -1, 107, 50, 0, 127, 107, 51, 0, 0};
         assertArrayEquals(expectedValues, buffer.toByteArray());
     }
@@ -628,6 +635,98 @@ public void testPipeDocumentIntoScopeDocument() {
         reader2.readEndDocument();
     }
 
+    @Test
+    public void testPipeWithExtraElements() {
+        writer.writeStartDocument();
+        writer.writeBoolean("a", true);
+        writer.writeString("$db", "test");
+        writer.writeStartDocument("$readPreference");
+        writer.writeString("mode", "primary");
+        writer.writeEndDocument();
+        writer.writeEndDocument();
+
+        byte[] bytes = buffer.toByteArray();
+
+        BasicOutputBuffer pipedBuffer = new BasicOutputBuffer();
+        BsonBinaryWriter pipedWriter = new BsonBinaryWriter(new BsonWriterSettings(100),
+                new BsonBinaryWriterSettings(1024), pipedBuffer);
+
+        pipedWriter.writeStartDocument();
+        pipedWriter.writeBoolean("a", true);
+        pipedWriter.writeEndDocument();
+
+        List<BsonElement> extraElements = asList(
+                new BsonElement("$db", new BsonString("test")),
+                new BsonElement("$readPreference", new BsonDocument("mode", new BsonString("primary")))
+        );
+
+        BasicOutputBuffer newBuffer = new BasicOutputBuffer();
+        BsonBinaryWriter newWriter = new BsonBinaryWriter(newBuffer);
+        try {
+            BsonBinaryReader reader =
+                    new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(pipedBuffer.toByteArray()))));
+            try {
+                newWriter.pipe(reader, extraElements);
+            } finally {
+                reader.close();
+            }
+        } finally {
+            newWriter.close();
+        }
+        assertArrayEquals(bytes, newBuffer.toByteArray());
+    }
+
+    @Test
+    public void testPipeOfNestedDocumentWithExtraElements() {
+        writer.writeStartDocument();
+        writer.writeStartDocument("nested");
+
+        writer.writeBoolean("a", true);
+        writer.writeString("$db", "test");
+        writer.writeStartDocument("$readPreference");
+        writer.writeString("mode", "primary");
+        writer.writeEndDocument();
+        writer.writeEndDocument();
+
+        writer.writeBoolean("b", true);
+        writer.writeEndDocument();
+
+        byte[] bytes = buffer.toByteArray();
+
+        BasicOutputBuffer pipedBuffer = new BasicOutputBuffer();
+        BsonBinaryWriter pipedWriter = new BsonBinaryWriter(new BsonWriterSettings(100),
+                new BsonBinaryWriterSettings(1024), pipedBuffer);
+
+        pipedWriter.writeStartDocument();
+        pipedWriter.writeBoolean("a", true);
+        pipedWriter.writeEndDocument();
+
+        List<BsonElement> extraElements = asList(
+                new BsonElement("$db", new BsonString("test")),
+                new BsonElement("$readPreference", new BsonDocument("mode", new BsonString("primary")))
+        );
+
+        BasicOutputBuffer newBuffer = new BasicOutputBuffer();
+        BsonBinaryWriter newWriter = new BsonBinaryWriter(newBuffer);
+        try {
+            BsonBinaryReader reader =
+                    new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(pipedBuffer.toByteArray()))));
+            try {
+                newWriter.writeStartDocument();
+                newWriter.writeName("nested");
+                newWriter.pipe(reader, extraElements);
+                newWriter.writeBoolean("b", true);
+                newWriter.writeEndDocument();
+            } finally {
+                reader.close();
+            }
+        } finally {
+            newWriter.close();
+        }
+        byte[] actualBytes = newBuffer.toByteArray();
+        assertArrayEquals(bytes, actualBytes);
+    }
+
     @Test
     public void testPipeOfDocumentWithInvalidSize() {
         byte[] bytes = {4, 0, 0, 0};  // minimum document size is 5;
diff --git a/bson/src/test/unit/org/bson/BsonDocumentReaderSpecification.groovy b/bson/src/test/unit/org/bson/BsonDocumentReaderSpecification.groovy
index 6a397e0a9f0..e79fcc4f1ca 100644
--- a/bson/src/test/unit/org/bson/BsonDocumentReaderSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BsonDocumentReaderSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.bson
 
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DecoderContext
+import org.bson.types.Decimal128
 import org.bson.types.ObjectId
 import spock.lang.Shared
 import spock.lang.Specification
@@ -40,6 +41,7 @@ class BsonDocumentReaderSpecification extends Specification {
                         new BsonElement('null', new BsonNull()),
                         new BsonElement('int32', new BsonInt32(42)),
                         new BsonElement('int64', new BsonInt64(52L)),
+                        new BsonElement('decimal128', new BsonDecimal128(Decimal128.parse('1.0'))),
                         new BsonElement('boolean', new BsonBoolean(true)),
                         new BsonElement('date', new BsonDateTime(new Date().getTime())),
                         new BsonElement('double', new BsonDouble(62.0)),
@@ -96,4 +98,4 @@ class BsonDocumentReaderSpecification extends Specification {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/bson/src/test/unit/org/bson/BsonDocumentSpecification.groovy b/bson/src/test/unit/org/bson/BsonDocumentSpecification.groovy
index 58098bec3bf..70004b654d5 100644
--- a/bson/src/test/unit/org/bson/BsonDocumentSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BsonDocumentSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,14 @@
 
 package org.bson
 
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.DecoderContext
+import org.bson.types.Decimal128
 import org.bson.types.ObjectId
 import spock.lang.Specification
 
+import static org.bson.BsonHelper.documentWithValuesOfEveryType
+
 class BsonDocumentSpecification extends Specification {
 
     def 'conversion methods should behave correctly for the happy path'() {
@@ -27,6 +32,7 @@ class BsonDocumentSpecification extends Specification {
         def bsonNull = new BsonNull()
         def bsonInt32 = new BsonInt32(42)
         def bsonInt64 = new BsonInt64(52L)
+        def bsonDecimal128 = new BsonDecimal128(Decimal128.parse('1.0'))
         def bsonBoolean = new BsonBoolean(true)
         def bsonDateTime = new BsonDateTime(new Date().getTime())
         def bsonDouble = new BsonDouble(62.0)
@@ -51,6 +57,7 @@ class BsonDocumentSpecification extends Specification {
                         new BsonElement('null', bsonNull),
                         new BsonElement('int32', bsonInt32),
                         new BsonElement('int64', bsonInt64),
+                        new BsonElement('decimal128', bsonDecimal128),
                         new BsonElement('boolean', bsonBoolean),
                         new BsonElement('date', bsonDateTime),
                         new BsonElement('double', bsonDouble),
@@ -73,6 +80,7 @@ class BsonDocumentSpecification extends Specification {
         root.isNull('null')
         root.getInt32('int32').is(bsonInt32)
         root.getInt64('int64').is(bsonInt64)
+        root.getDecimal128('decimal128').is(bsonDecimal128)
         root.getBoolean('boolean').is(bsonBoolean)
         root.getDateTime('date').is(bsonDateTime)
         root.getDouble('double').is(bsonDouble)
@@ -89,6 +97,7 @@ class BsonDocumentSpecification extends Specification {
 
         root.getInt32('int32', new BsonInt32(2)).is(bsonInt32)
         root.getInt64('int64', new BsonInt64(4)).is(bsonInt64)
+        root.getDecimal128('decimal128', new BsonDecimal128(Decimal128.parse('4.0'))).is(bsonDecimal128)
         root.getDouble('double', new BsonDouble(343.0)).is(bsonDouble)
         root.getBoolean('boolean', new BsonBoolean(false)).is(bsonBoolean)
         root.getDateTime('date', new BsonDateTime(3453)).is(bsonDateTime)
@@ -105,6 +114,7 @@ class BsonDocumentSpecification extends Specification {
 
         root.get('int32').asInt32().is(bsonInt32)
         root.get('int64').asInt64().is(bsonInt64)
+        root.get('decimal128').asDecimal128().is(bsonDecimal128)
         root.get('boolean').asBoolean().is(bsonBoolean)
         root.get('date').asDateTime().is(bsonDateTime)
         root.get('double').asDouble().is(bsonDouble)
@@ -118,6 +128,7 @@ class BsonDocumentSpecification extends Specification {
         root.isInt32('int32')
         root.isNumber('int32')
         root.isInt64('int64')
+        root.isDecimal128('decimal128')
         root.isNumber('int64')
         root.isBoolean('boolean')
         root.isDateTime('date')
@@ -140,6 +151,7 @@ class BsonDocumentSpecification extends Specification {
             !root.isNumber('number')
             !root.isInt32('int32')
             !root.isInt64('int64')
+            !root.isDecimal128('decimal128')
             !root.isBoolean('boolean')
             !root.isDateTime('date')
             !root.isDouble('double')
@@ -156,6 +168,7 @@ class BsonDocumentSpecification extends Specification {
         def bsonNull = new BsonNull()
         def bsonInt32 = new BsonInt32(42)
         def bsonInt64 = new BsonInt64(52L)
+        def bsonDecimal128 = new BsonDecimal128(Decimal128.parse('1.0'))
         def bsonBoolean = new BsonBoolean(true)
         def bsonDateTime = new BsonDateTime(new Date().getTime())
         def bsonDouble = new BsonDouble(62.0)
@@ -165,6 +178,7 @@ class BsonDocumentSpecification extends Specification {
         def timestamp = new BsonTimestamp(0x12345678, 5)
         def binary = new BsonBinary((byte) 80, [5, 4, 3, 2, 1] as byte[])
         def bsonArray = new BsonArray([new BsonInt32(1), new BsonInt64(2L), new BsonBoolean(true),
+                                       new BsonDecimal128(Decimal128.parse('4.0')),
                                        new BsonArray([new BsonInt32(1), new BsonInt32(2), new BsonInt32(3)]),
                                        new BsonDocument('a', new BsonInt64(2L))])
         def bsonDocument = new BsonDocument('a', new BsonInt32(1))
@@ -179,6 +193,7 @@ class BsonDocumentSpecification extends Specification {
         root.getDouble('m', bsonDouble).is(bsonDouble)
         root.getInt32('m', bsonInt32).is(bsonInt32)
         root.getInt64('m', bsonInt64).is(bsonInt64)
+        root.getDecimal128('m', bsonDecimal128).is(bsonDecimal128)
         root.getString('m', bsonString).is(bsonString)
         root.getObjectId('m', objectId).is(objectId)
         root.getString('m', bsonString).is(bsonString)
@@ -240,6 +255,12 @@ class BsonDocumentSpecification extends Specification {
         then:
         thrown(BsonInvalidOperationException)
 
+        when:
+        root.getDecimal128('decimal128')
+
+        then:
+        thrown(BsonInvalidOperationException)
+
         when:
         root.getBoolean('boolean')
 
@@ -307,10 +328,44 @@ class BsonDocumentSpecification extends Specification {
         thrown(BsonInvalidOperationException)
     }
 
+    def 'should get first key'() {
+        given:
+        def document = new BsonDocument('i', new BsonInt32(2))
+
+        expect:
+        document.getFirstKey() == 'i'
+    }
+
+    def 'getFirstKey should throw NoSuchElementException if the document is empty'() {
+        given:
+        def document = new BsonDocument()
+
+        when:
+        document.getFirstKey()
+
+        then:
+        thrown(NoSuchElementException)
+    }
+
+    def 'should create BsonReader'() {
+        given:
+        def document = documentWithValuesOfEveryType()
+
+        when:
+        def reader = document.asBsonReader()
+
+        then:
+        new BsonDocumentCodec().decode(reader, DecoderContext.builder().build()) == document
+
+        cleanup:
+        reader.close()
+    }
+
     def 'should serialize and deserialize'() {
         given:
         def document = new BsonDocument('d', new BsonDocument().append('i2', new BsonInt32(1)))
                 .append('i', new BsonInt32(2))
+                .append('d', new BsonDecimal128(Decimal128.parse('1.0')))
                 .append('a', new BsonArray([new BsonInt32(3),
                                             new BsonArray([new BsonInt32(11)]),
                                             new BsonDocument('i3', new BsonInt32(6)),
diff --git a/bson/src/test/unit/org/bson/BsonDocumentTest.java b/bson/src/test/unit/org/bson/BsonDocumentTest.java
index 3589b15c17d..e9029022713 100644
--- a/bson/src/test/unit/org/bson/BsonDocumentTest.java
+++ b/bson/src/test/unit/org/bson/BsonDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public void toJsonShouldRespectDefaultJsonWriterSettings() {
     @Test
     public void toJsonShouldRespectJsonWriterSettings() {
         StringWriter writer = new StringWriter();
-        JsonWriterSettings settings = new JsonWriterSettings(JsonMode.SHELL);
+        JsonWriterSettings settings = JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build();
         new BsonDocumentCodec().encode(new JsonWriter(writer, settings), document, EncoderContext.builder().build());
         assertEquals(writer.toString(), document.toJson(settings));
     }
diff --git a/bson/src/test/unit/org/bson/BsonDocumentWrapperSpecification.groovy b/bson/src/test/unit/org/bson/BsonDocumentWrapperSpecification.groovy
index 231d0234ae7..b3e3ba2ea53 100644
--- a/bson/src/test/unit/org/bson/BsonDocumentWrapperSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BsonDocumentWrapperSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/BsonDocumentWriterSpecification.groovy b/bson/src/test/unit/org/bson/BsonDocumentWriterSpecification.groovy
index 0195319208a..125628272ed 100644
--- a/bson/src/test/unit/org/bson/BsonDocumentWriterSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BsonDocumentWriterSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,45 +18,50 @@ package org.bson
 
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.EncoderContext
-import org.bson.types.ObjectId
 import spock.lang.Specification
 
+import static org.bson.BsonHelper.documentWithValuesOfEveryType
+
 class BsonDocumentWriterSpecification extends Specification {
+
     def 'should write all types'() {
-        given:
-        def doc = new BsonDocument(
-                [
-                        new BsonElement('null', new BsonNull()),
-                        new BsonElement('int32', new BsonInt32(42)),
-                        new BsonElement('int64', new BsonInt64(52L)),
-                        new BsonElement('boolean', new BsonBoolean(true)),
-                        new BsonElement('date', new BsonDateTime(new Date().getTime())),
-                        new BsonElement('double', new BsonDouble(62.0)),
-                        new BsonElement('string', new BsonString('the fox ...')),
-                        new BsonElement('minKey', new BsonMinKey()),
-                        new BsonElement('maxKey', new BsonMaxKey()),
-                        new BsonElement('dbPointer', new BsonDbPointer('test.test', new ObjectId())),
-                        new BsonElement('javaScript', new BsonJavaScript('int i = 0;')),
-                        new BsonElement('codeWithScope', new BsonJavaScriptWithScope('x', new BsonDocument('x', new BsonInt32(1)))),
-                        new BsonElement('objectId', new BsonObjectId(new ObjectId())),
-                        new BsonElement('regex', new BsonRegularExpression('^test.*regex.*xyz$', 'i')),
-                        new BsonElement('symbol', new BsonSymbol('ruby stuff')),
-                        new BsonElement('timestamp', new BsonTimestamp(0x12345678, 5)),
-                        new BsonElement('undefined', new BsonUndefined()),
-                        new BsonElement('binary', new BsonBinary((byte) 80, [5, 4, 3, 2, 1] as byte[])),
-                        new BsonElement('array', new BsonArray([new BsonInt32(1), new BsonInt64(2L), new BsonBoolean(true),
-                                                                new BsonArray([new BsonInt32(1), new BsonInt32(2), new BsonInt32(3)]),
-                                                                new BsonDocument('a', new BsonInt64(2L))])),
-                        new BsonElement('document', new BsonDocument('a', new BsonInt32(1)))
-                ])
+        when:
+        def encodedDoc = new BsonDocument();
+        new BsonDocumentCodec().encode(new BsonDocumentWriter(encodedDoc), documentWithValuesOfEveryType(),
+                EncoderContext.builder().build())
 
+        then:
+        encodedDoc == documentWithValuesOfEveryType()
+    }
+
+    def 'should pipe all types'() {
+        given:
+        def document = new BsonDocument()
+        def reader = new BsonDocumentReader(documentWithValuesOfEveryType())
+        def writer = new BsonDocumentWriter(document)
 
         when:
-        def encodedDoc = new BsonDocument();
-        new BsonDocumentCodec().encode(new BsonDocumentWriter(encodedDoc), doc, EncoderContext.builder().build())
+        writer.pipe(reader)
 
         then:
-        encodedDoc == doc
+        document == documentWithValuesOfEveryType()
     }
 
-}
\ No newline at end of file
+    def 'should pipe all types with extra elements'() {
+        given:
+        def document = new BsonDocument()
+        def reader = new BsonDocumentReader(new BsonDocument())
+        def writer = new BsonDocumentWriter(document)
+
+        def extraElements = []
+        for (def entry : documentWithValuesOfEveryType()) {
+            extraElements.add(new BsonElement(entry.getKey(), entry.getValue()))
+        }
+
+        when:
+        writer.pipe(reader, extraElements)
+
+        then:
+        document == documentWithValuesOfEveryType()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonHelper.java b/bson/src/test/unit/org/bson/BsonHelper.java
new file mode 100644
index 00000000000..29920f6651e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonHelper.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson;
+
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.EncoderContext;
+import org.bson.io.BasicOutputBuffer;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+
+import java.nio.ByteBuffer;
+import java.util.Date;
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+
+public final class BsonHelper {
+
+    private static final Date DATE = new Date();
+    private static final ObjectId OBJECT_ID = new ObjectId();
+
+    private static List<BsonValue> getBsonValues() {
+        return asList(
+                new BsonNull(),
+                new BsonInt32(42),
+                new BsonInt64(52L),
+                new BsonDecimal128(Decimal128.parse("4.00")),
+                new BsonBoolean(true),
+                new BsonDateTime(DATE.getTime()),
+                new BsonDouble(62.0),
+                new BsonString("the fox ..."),
+                new BsonMinKey(),
+                new BsonMaxKey(),
+                new BsonDbPointer("test.test", OBJECT_ID),
+                new BsonJavaScript("int i = 0;"),
+                new BsonJavaScriptWithScope("x", new BsonDocument("x", new BsonInt32(1))),
+                new BsonObjectId(OBJECT_ID),
+                new BsonRegularExpression("^test.*regex.*xyz$", "i"),
+                new BsonSymbol("ruby stuff"),
+                new BsonTimestamp(0x12345678, 5),
+                new BsonUndefined(),
+                new BsonBinary((byte) 80, new byte[]{5, 4, 3, 2, 1}),
+                new BsonArray(asList(
+                        new BsonInt32(1),
+                        new BsonInt64(2L),
+                        new BsonBoolean(true),
+                        new BsonArray(asList(
+                                new BsonInt32(1),
+                                new BsonInt32(2),
+                                new BsonInt32(3),
+                                new BsonDocument("a", new BsonInt64(2L)))))),
+                new BsonDocument("a", new BsonInt32(1)));
+    }
+
+    // fail class loading if any BSON types are not represented in BSON_VALUES.
+    static {
+        for (BsonType curBsonType : BsonType.values()) {
+            if (curBsonType == BsonType.END_OF_DOCUMENT) {
+                continue;
+            }
+
+            boolean found = false;
+            for (BsonValue curBsonValue : getBsonValues()) {
+                if (curBsonValue.getBsonType() == curBsonType) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                throw new IllegalStateException(format("Missing BsonValue type %s in BSON_VALUES. Please add a BsonValue with that type!",
+                        curBsonType));
+            }
+        }
+    }
+
+    public static List<BsonValue> valuesOfEveryType() {
+        return getBsonValues();
+    }
+
+    public static BsonDocument documentWithValuesOfEveryType() {
+        BsonDocument document = new BsonDocument();
+        List<BsonValue> bsonValues = getBsonValues();
+        for (int i = 0; i < bsonValues.size(); i++) {
+            document.append(Integer.toString(i), bsonValues.get(i));
+        }
+        return document;
+    }
+
+    public static ByteBuffer toBson(final BsonDocument document) {
+        BasicOutputBuffer bsonOutput = new BasicOutputBuffer();
+        new BsonDocumentCodec().encode(new BsonBinaryWriter(bsonOutput), document, EncoderContext.builder().build());
+        return ByteBuffer.wrap(bsonOutput.toByteArray());
+    }
+
+    private BsonHelper() {
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonNumberSpecification.groovy b/bson/src/test/unit/org/bson/BsonNumberSpecification.groovy
new file mode 100644
index 00000000000..ae8dac25eae
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonNumberSpecification.groovy
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import org.bson.types.Decimal128
+import spock.lang.Specification
+
+class BsonNumberSpecification extends Specification {
+
+    def 'should convert to int value'() {
+        expect:
+        new BsonInt32(1).intValue() == 1
+
+        new BsonInt64(1L).intValue() == 1
+        new BsonInt64(Long.MAX_VALUE).intValue() == -1
+        new BsonInt64(Long.MIN_VALUE).intValue() == 0
+
+        new BsonDouble(3.14).intValue() == 3
+
+        new BsonDecimal128(new Decimal128(1L)).intValue() == 1
+    }
+
+    def 'should convert to long value'() {
+        expect:
+        new BsonInt32(1).longValue() == 1L
+
+        new BsonInt64(1L).longValue() == 1L
+
+        new BsonDouble(3.14).longValue() == 3L
+
+        new BsonDecimal128(new Decimal128(1L)).longValue() == 1L
+    }
+
+    def 'should convert to double value'() {
+        expect:
+        new BsonInt32(1).doubleValue() == 1.0d
+
+        new BsonInt64(1L).doubleValue() == 1.0d
+        new BsonInt64(Long.MAX_VALUE).doubleValue() == 9.223372036854776E18d
+        new BsonInt64(Long.MIN_VALUE).doubleValue() == -9.223372036854776E18d
+
+        new BsonDouble(3.14d).doubleValue() == 3.14d
+
+        new BsonDecimal128(Decimal128.parse('3.14')).doubleValue() == 3.14d
+    }
+
+    def 'should convert to decimal128 value'() {
+        expect:
+        new BsonInt32(1).decimal128Value() == Decimal128.parse('1')
+
+        new BsonInt64(1L).decimal128Value() == Decimal128.parse('1')
+        new BsonInt64(Long.MAX_VALUE).decimal128Value() == Decimal128.parse('9223372036854775807')
+        new BsonInt64(Long.MIN_VALUE).decimal128Value() == Decimal128.parse('-9223372036854775808')
+
+        new BsonDouble(1.0d).decimal128Value() == Decimal128.parse('1')
+        new BsonDouble(Double.NaN).decimal128Value() == Decimal128.NaN
+        new BsonDouble(Double.POSITIVE_INFINITY).decimal128Value() == Decimal128.POSITIVE_INFINITY
+        new BsonDouble(Double.NEGATIVE_INFINITY).decimal128Value() == Decimal128.NEGATIVE_INFINITY
+
+        new BsonDecimal128(Decimal128.parse('3.14')).decimal128Value() == Decimal128.parse('3.14')
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/BsonRegularExpressionSpecification.groovy b/bson/src/test/unit/org/bson/BsonRegularExpressionSpecification.groovy
new file mode 100644
index 00000000000..a8a58cc9020
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonRegularExpressionSpecification.groovy
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import spock.lang.Specification
+
+class BsonRegularExpressionSpecification extends Specification {
+    def 'should get type'() {
+        expect:
+        new BsonRegularExpression('abc', '').bsonType == BsonType.REGULAR_EXPRESSION
+    }
+
+    def 'should sort options'() {
+        expect:
+        new BsonRegularExpression('abc', 'uxsmi').options == 'imsux'
+    }
+
+    def 'should accept invalid options'() {
+        expect:
+        new BsonRegularExpression('abc', 'uxsmiw').options == 'imsuwx'
+    }
+
+    def 'should allow null options'() {
+        expect:
+        new BsonRegularExpression('abc').options == ''
+        new BsonRegularExpression('abc', null).options == ''
+    }
+
+    def 'should get regular expression'() {
+        expect:
+        new BsonRegularExpression('abc', null).pattern == 'abc'
+    }
+
+    def 'equivalent values should be equal and have same hashcode'() {
+        given:
+        def first = new BsonRegularExpression('abc', 'uxsmi')
+        def second = new BsonRegularExpression('abc', 'imsxu')
+
+        expect:
+        first.equals(second)
+        first.hashCode() == second.hashCode()
+    }
+
+    def 'should convert to string'() {
+        expect:
+        new BsonRegularExpression('abc', 'uxsmi').toString() == 'BsonRegularExpression{pattern=\'abc\', options=\'imsux\'}'
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonTimestampSpecification.groovy b/bson/src/test/unit/org/bson/BsonTimestampSpecification.groovy
new file mode 100644
index 00000000000..e539961d44b
--- /dev/null
+++ b/bson/src/test/unit/org/bson/BsonTimestampSpecification.groovy
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import static java.lang.Integer.MAX_VALUE
+import static java.lang.Integer.MIN_VALUE
+
+class BsonTimestampSpecification extends Specification {
+
+    def 'bsonType should get expected value'() {
+        expect:
+        new BsonTimestamp().bsonType == BsonType.TIMESTAMP
+    }
+
+    @Unroll
+    def 'compareTo should sort the timestamps as unsigned values'() {
+        def timestamps = [new BsonTimestamp(Long.MIN_VALUE),
+                          new BsonTimestamp(Long.MAX_VALUE),
+                          new BsonTimestamp(1),
+                          new BsonTimestamp(2),
+                          new BsonTimestamp(-1),
+                          new BsonTimestamp(-2)]
+        when:
+        Collections.sort(timestamps)
+
+        then:
+        timestamps == [new BsonTimestamp(1),
+                       new BsonTimestamp(2),
+                       new BsonTimestamp(Long.MAX_VALUE),
+                       new BsonTimestamp(Long.MIN_VALUE),
+                       new BsonTimestamp(-2),
+                       new BsonTimestamp(-1)]
+    }
+
+    @Unroll
+    def 'constructors should initialize instance'() {
+        when:
+        def tsFromValue = new BsonTimestamp(value)
+        def tsFromSecondsAndIncrement = new BsonTimestamp(seconds, increment)
+
+        then:
+        tsFromValue.time == seconds
+        tsFromValue.inc == increment
+        tsFromValue.value == value
+
+        tsFromSecondsAndIncrement.time == seconds
+        tsFromSecondsAndIncrement.inc == increment
+        tsFromSecondsAndIncrement.value == value
+
+        where:
+        seconds   | increment | value
+        0         | 0         | 0L
+        1         | 2         | 0x100000002L
+        -1        | -2        | 0xfffffffffffffffeL
+        123456789 | 42        | 530242871224172586L
+        MIN_VALUE | MIN_VALUE | 0x8000000080000000L
+        MIN_VALUE | MAX_VALUE | 0x800000007fffffffL
+        MAX_VALUE | MIN_VALUE | 0x7fffffff80000000L
+        MAX_VALUE | MAX_VALUE | 0x7fffffff7fffffffL
+    }
+
+    def 'no args constructor should initialize instance'() {
+        when:
+        def tsFromValue = new BsonTimestamp()
+
+        then:
+        tsFromValue.time == 0
+        tsFromValue.inc == 0
+        tsFromValue.value == 0
+    }
+}
diff --git a/bson/src/test/unit/org/bson/BsonValueSpecification.groovy b/bson/src/test/unit/org/bson/BsonValueSpecification.groovy
index 6b2644b4665..1313bca7edf 100644
--- a/bson/src/test/unit/org/bson/BsonValueSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BsonValueSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.bson
 
+import org.bson.types.Decimal128
 import org.bson.types.ObjectId
 import spock.lang.Specification
 
@@ -27,6 +28,7 @@ class BsonValueSpecification extends Specification {
         new BsonInt32(42).isNumber()
         new BsonInt64(52L).isInt64()
         new BsonInt64(52L).isNumber()
+        new BsonDecimal128(Decimal128.parse('1')).isDecimal128()
         new BsonDouble(62.0).isDouble()
         new BsonDouble(62.0).isNumber()
         new BsonBoolean(true).isBoolean()
@@ -50,6 +52,7 @@ class BsonValueSpecification extends Specification {
         !new BsonNull().isInt32()
         !new BsonNull().isNumber()
         !new BsonNull().isInt64()
+        !new BsonNull().isDecimal128()
         !new BsonNull().isNumber()
         !new BsonNull().isDouble()
         !new BsonNull().isNumber()
@@ -105,6 +108,12 @@ class BsonValueSpecification extends Specification {
         then:
         thrown(BsonInvalidOperationException)
 
+        when:
+        new BsonNull().asDecimal128()
+
+        then:
+        thrown(BsonInvalidOperationException)
+
         when:
         new BsonNull().asBoolean()
 
@@ -189,4 +198,4 @@ class BsonValueSpecification extends Specification {
         then:
         thrown(BsonInvalidOperationException)
     }
-}
\ No newline at end of file
+}
diff --git a/bson/src/test/unit/org/bson/BsonWriterSpecification.groovy b/bson/src/test/unit/org/bson/BsonWriterSpecification.groovy
index 114ec189081..d85cb47bcaf 100644
--- a/bson/src/test/unit/org/bson/BsonWriterSpecification.groovy
+++ b/bson/src/test/unit/org/bson/BsonWriterSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
diff --git a/bson/src/test/unit/org/bson/DocumentTest.java b/bson/src/test/unit/org/bson/DocumentTest.java
index 4aef414b53b..6deaa90e4de 100644
--- a/bson/src/test/unit/org/bson/DocumentTest.java
+++ b/bson/src/test/unit/org/bson/DocumentTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,10 @@
 import org.bson.json.JsonReader;
 import org.junit.Test;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import static java.util.Arrays.asList;
 import static org.bson.codecs.configuration.CodecRegistries.fromCodecs;
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
@@ -75,6 +79,45 @@ public void toJsonShouldReturnEquivalent() {
                      document);
     }
 
+    // Test to ensure that toJson does not reorder _id field
+    @Test
+    public void toJsonShouldNotReorderIdField() {
+        // given
+        Document d = new Document().append("x", 1)
+                .append("y", Collections.singletonList("one"))
+                .append("_id", "1");
+        assertEquals("{\"x\": 1, \"y\": [\"one\"], \"_id\": \"1\"}", d.toJson());
+    }
+
+    // Test in Java to make sure none of the casts result in compiler warnings or class cast exceptions
+    @Test
+    public void shouldGetWithDefaultValue() {
+        // given
+        Document d = new Document("x", 1)
+                .append("y", Collections.singletonList("one"))
+                .append("z", "foo");
+
+        // when the key is found
+        int x = d.get("x", 2);
+        List<String> y = d.get("y", Arrays.asList("three", "four"));
+        String z = d.get("z", "bar");
+
+        // then it returns the value
+        assertEquals(1, x);
+        assertEquals(Arrays.asList("one"), y);
+        assertEquals("foo", z);
+
+        // when the key is not found
+        int x2 = d.get("x2", 2);
+        List<String> y2 = d.get("y2", Arrays.asList("three", "four"));
+        String z2 = d.get("z2", "bar");
+
+        // then it returns the default value
+        assertEquals(2, x2);
+        assertEquals(Arrays.asList("three", "four"), y2);
+        assertEquals("bar", z2);
+    }
+
     @Test
     public void toJsonShouldTakeACustomDocumentCodec() {
 
@@ -85,7 +128,7 @@ public void toJsonShouldTakeACustomDocumentCodec() {
             // noop
         }
 
-        assertEquals("{ \"database\" : { \"name\" : \"MongoDB\" } }", customDocument.toJson(customDocumentCodec));
+        assertEquals("{\"database\": {\"name\": \"MongoDB\"}}", customDocument.toJson(customDocumentCodec));
     }
 
     public class Name {
diff --git a/bson/src/test/unit/org/bson/GenericBsonTest.java b/bson/src/test/unit/org/bson/GenericBsonTest.java
index 998c5c369e4..0a611267f05 100644
--- a/bson/src/test/unit/org/bson/GenericBsonTest.java
+++ b/bson/src/test/unit/org/bson/GenericBsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- *
  */
 
 package org.bson;
@@ -22,20 +20,31 @@
 import org.bson.codecs.DecoderContext;
 import org.bson.codecs.EncoderContext;
 import org.bson.io.BasicOutputBuffer;
+import org.bson.json.JsonMode;
+import org.bson.json.JsonParseException;
+import org.bson.json.JsonWriterSettings;
+import org.bson.types.Decimal128;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import util.Hex;
 import util.JsonPoweredTestHelper;
 
-import javax.xml.bind.DatatypeConverter;
 import java.io.File;
 import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import static java.lang.String.format;
+import static org.bson.BsonDocument.parse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -43,69 +52,287 @@
 @RunWith(Parameterized.class)
 public class GenericBsonTest {
 
-    private final BsonDocument definition;
+    private static final List<String> IGNORED_PARSE_ERRORS = Arrays.asList(
+            "Bad $binary (type is number, not string)", // for backwards compat, JsonReader supports number for binary type
+            "Bad $date (number, not string or hash)",   // for backwards compat, JsonReader supports numbers for $date
+            "Bad DBRef (ref is number, not string)",    // JsonReader knows nothing of DBRef so these are not parse errors
+            "Bad DBRef (db is number, not string)");
+
+    enum TestCaseType {
+        VALID,
+        DECODE_ERROR,
+        PARSE_ERROR
+    }
+
+    private final BsonDocument testDefinition;
+    private final BsonDocument testCase;
+    private final TestCaseType testCaseType;
 
-    public GenericBsonTest(final String description, final BsonDocument definition) {
-        this.definition = definition;
+    public GenericBsonTest(final String description, final BsonDocument testDefinition, final BsonDocument testCase,
+                           final TestCaseType testCaseType) {
+        this.testDefinition = testDefinition;
+        this.testCase = testCase;
+        this.testCaseType = testCaseType;
     }
 
     @Test
     public void shouldPassAllOutcomes() {
-        for (BsonValue curValue : definition.getArray("documents")) {
-            BsonDocument curDocument = curValue.asDocument();
-            try {
-                validateDecoding(curDocument);
-                validateEncoding(curDocument);
-            } catch (BsonSerializationException e) {
-                // should not throw unless the test case has an error string
-                if (!curDocument.containsKey("error")) {
-                    fail(curDocument.getString("error").getValue() + ": " + e.getMessage());
+        switch (testCaseType) {
+            case VALID:
+                runValid();
+                break;
+            case DECODE_ERROR:
+                runDecodeError();
+                break;
+            case PARSE_ERROR:
+                runParseError();
+                break;
+            default:
+                throw new IllegalArgumentException(format("Unsupported test case type %s", testCaseType));
+        }
+    }
+
+    private void runValid() {
+        String description = testCase.getString("description").getValue();
+        String canonicalBsonHex = testCase.getString("canonical_bson").getValue().toUpperCase();
+        String degenerateBsonHex = testCase.getString("degenerate_bson", new BsonString("")).getValue().toUpperCase();
+        String canonicalJson = replaceUnicodeEscapes(testCase.getString("canonical_extjson").getValue());
+        String relaxedJson = replaceUnicodeEscapes(testCase.getString("relaxed_extjson", new BsonString("")).getValue());
+        String degenerateJson = replaceUnicodeEscapes(testCase.getString("degenerate_extjson", new BsonString("")).getValue());
+        boolean lossy = testCase.getBoolean("lossy", new BsonBoolean(false)).getValue();
+
+        BsonDocument decodedDocument = decodeToDocument(canonicalBsonHex, description);
+
+        // native_to_bson( bson_to_native(cB) ) = cB
+        assertEquals(format("Failed to create expected BSON for document with description '%s'", description),
+                canonicalBsonHex, encodeToHex(decodedDocument));
+
+        JsonWriterSettings canonicalJsonWriterSettings = JsonWriterSettings.builder().outputMode(JsonMode.EXTENDED).build();
+        JsonWriterSettings relaxedJsonWriterSettings = JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build();
+
+        if (!canonicalJson.isEmpty()) {
+            // native_to_canonical_extended_json( bson_to_native(cB) ) = cEJ
+            assertEquals(format("Failed to create expected canonical JSON for document with description '%s'", description),
+                    stripWhiteSpace(canonicalJson), stripWhiteSpace(decodedDocument.toJson(canonicalJsonWriterSettings)));
+
+            // native_to_canonical_extended_json( json_to_native(cEJ) ) = cEJ
+            BsonDocument parsedCanonicalJsonDocument = parse(canonicalJson);
+            assertEquals("Failed to create expected canonical JSON from parsing canonical JSON",
+                    stripWhiteSpace(canonicalJson), stripWhiteSpace(parsedCanonicalJsonDocument.toJson(canonicalJsonWriterSettings)));
+
+            if (!lossy) {
+                // native_to_bson( json_to_native(cEJ) ) = cB
+                assertEquals("Failed to create expected canonical BSON from parsing canonical JSON",
+                        canonicalBsonHex, encodeToHex(parsedCanonicalJsonDocument));
+            }
+        }
+
+        if (!relaxedJson.isEmpty()) {
+            // native_to_relaxed_extended_json( bson_to_native(cB) ) = rEJ
+            assertEquals(format("Failed to create expected relaxed JSON for document with description '%s'", description),
+                    stripWhiteSpace(relaxedJson), stripWhiteSpace(decodedDocument.toJson(relaxedJsonWriterSettings)));
+
+            // native_to_relaxed_extended_json( json_to_native(rEJ) ) = rEJ
+            assertEquals("Failed to create expected relaxed JSON from parsing relaxed JSON", stripWhiteSpace(relaxedJson),
+                    stripWhiteSpace(parse(relaxedJson).toJson(relaxedJsonWriterSettings)));
+        }
+
+        if (!degenerateJson.isEmpty()) {
+            // native_to_bson( json_to_native(dEJ) ) = cB
+            assertEquals("Failed to create expected canonical BSON from parsing canonical JSON",
+                    canonicalBsonHex, encodeToHex(parse(degenerateJson)));
+        }
+
+        if (!degenerateBsonHex.isEmpty()) {
+            BsonDocument decodedDegenerateDocument = decodeToDocument(degenerateBsonHex, description);
+            // native_to_bson( bson_to_native(dB) ) = cB
+            assertEquals(format("Failed to create expected canonical BSON from degenerate BSON for document with description "
+                                        + "'%s'", description), canonicalBsonHex, encodeToHex(decodedDegenerateDocument));
+        }
+    }
+
+    // The corpus escapes all non-ascii characters, but JSONWriter does not.  This method converts the Unicode escape sequence into its
+    // regular UTF encoding in order to match the JSONWriter behavior.
+    private String replaceUnicodeEscapes(final String json) {
+        try {
+            StringReader reader = new StringReader(json);
+            StringWriter writer = new StringWriter();
+            int cur;
+            while ((cur = reader.read()) != -1) {
+                char curChar = (char) cur;
+                if (curChar != '\\') {
+                    writer.write(curChar);
+                    continue;
+                }
+
+                char nextChar = (char) reader.read();
+                if (nextChar != 'u') {
+                    writer.write(curChar);
+                    writer.write(nextChar);
+                    continue;
+                }
+                char[] codePointString = new char[4];
+                reader.read(codePointString);
+                char escapedChar = (char) Integer.parseInt(new String(codePointString), 16);
+                if (shouldEscapeCharacter(escapedChar)) {
+                    writer.write("\\u" + new String(codePointString));
+                } else {
+                    writer.write(escapedChar);
                 }
-            } catch (RuntimeException e) {
-                fail("Threw RuntimeException instead of BsonSerializationException: " + e.toString());
+
             }
+            return writer.toString();
+        } catch (IOException e) {
+            throw new RuntimeException("impossible");
+        }
+    }
+
+    // copied from JsonWriter...
+    private boolean shouldEscapeCharacter(final char escapedChar) {
+        switch (Character.getType(escapedChar)) {
+            case Character.UPPERCASE_LETTER:
+            case Character.LOWERCASE_LETTER:
+            case Character.TITLECASE_LETTER:
+            case Character.OTHER_LETTER:
+            case Character.DECIMAL_DIGIT_NUMBER:
+            case Character.LETTER_NUMBER:
+            case Character.OTHER_NUMBER:
+            case Character.SPACE_SEPARATOR:
+            case Character.CONNECTOR_PUNCTUATION:
+            case Character.DASH_PUNCTUATION:
+            case Character.START_PUNCTUATION:
+            case Character.END_PUNCTUATION:
+            case Character.INITIAL_QUOTE_PUNCTUATION:
+            case Character.FINAL_QUOTE_PUNCTUATION:
+            case Character.OTHER_PUNCTUATION:
+            case Character.MATH_SYMBOL:
+            case Character.CURRENCY_SYMBOL:
+            case Character.MODIFIER_SYMBOL:
+            case Character.OTHER_SYMBOL:
+                return false;
+            default:
+                return true;
         }
     }
 
-    private String validateDecoding(final BsonDocument curDocument) {
-        BsonDocument expectedDecodedDocument = curDocument.getDocument("decoded", null);
-        String encoded = curDocument.getString("encoded").getValue();
-
-        if (encoded != null) {
-            ByteBuffer byteBuffer = ByteBuffer.wrap(DatatypeConverter.parseHexBinary(encoded));
-            BsonDocument actualDecodedDocument = new BsonDocumentCodec().decode(new BsonBinaryReader(byteBuffer),
-                                                                                DecoderContext.builder().build());
-
-            if (byteBuffer.hasRemaining()) {
-                fail("Should have consumed all bytes, but " + byteBuffer.remaining() + " still remain in the buffer");
-            } else if (expectedDecodedDocument == null) {
-                fail("Decoding of '" + encoded + "' should have failed with error '"
-                     + curDocument.getString("error").getValue()
-                     + "' but succeeded with " + actualDecodedDocument.toJson());
-            } else {
-                assertEquals("Failed to decode to expected document", expectedDecodedDocument, actualDecodedDocument);
+    private BsonDocument decodeToDocument(final String subjectHex, final String description) {
+        ByteBuffer byteBuffer = ByteBuffer.wrap(Hex.decode(subjectHex));
+        BsonDocument actualDecodedDocument = new BsonDocumentCodec().decode(new BsonBinaryReader(byteBuffer),
+                DecoderContext.builder().build());
+
+        if (byteBuffer.hasRemaining()) {
+            throw new BsonSerializationException(format("Should have consumed all bytes, but " + byteBuffer.remaining()
+                                                                + " still remain in the buffer for document with description ",
+                    description));
+        }
+        return actualDecodedDocument;
+    }
+
+    private String encodeToHex(final BsonDocument decodedDocument) {
+        BasicOutputBuffer outputBuffer = new BasicOutputBuffer();
+        new BsonDocumentCodec().encode(new BsonBinaryWriter(outputBuffer), decodedDocument, EncoderContext.builder().build());
+        return Hex.encode(outputBuffer.toByteArray());
+    }
+
+    private void runDecodeError() {
+        try {
+            String description = testCase.getString("description").getValue();
+            throwIfValueIsStringContainingReplacementCharacter(description);
+            fail(format("Should have failed parsing for subject with description '%s'", description));
+        } catch (BsonSerializationException e) {
+            // all good
+        }
+    }
+
+    private void runParseError() {
+        String description = testCase.getString("description").getValue();
+
+        Assume.assumeFalse(IGNORED_PARSE_ERRORS.contains(description));
+
+        String str = testCase.getString("string").getValue();
+
+        String testDefinitionDescription = testDefinition.getString("description").getValue();
+        if (testDefinitionDescription.startsWith("Decimal128")) {
+            try {
+                Decimal128.parse(str);
+                fail(format("Should fail to parse '" + str + "' with description '%s'", description + "'"));
+            } catch (NumberFormatException e) {
+                // all good
+            }
+        } else if (testDefinitionDescription.startsWith("Top-level")) {
+            try {
+                parse(str);
+                fail("Should fail to parse JSON '" + str + "' with description '" + description + "'");
+            } catch (JsonParseException e) {
+                // all good
+            } catch (BsonInvalidOperationException e) {
+                if (!description.equals("Bad $code with $scope (scope is number, not doc)")) {
+                    fail("Should throw JsonParseException for '" + str + "' with description '" + description + "'");
+                }
+                // all good
             }
+        } else {
+            fail("Unrecognized test definition description: " + testDefinitionDescription);
         }
-        return encoded;
     }
 
-    private void validateEncoding(final BsonDocument curDocument) {
-        BsonDocument expectedDecodedDocument = curDocument.getDocument("decoded", null);
-        if (expectedDecodedDocument != null && !curDocument.getBoolean("decodeOnly", BsonBoolean.FALSE).getValue()) {
-            BasicOutputBuffer buffer = new BasicOutputBuffer();
-            new BsonDocumentCodec().encode(new BsonBinaryWriter(buffer), expectedDecodedDocument, EncoderContext.builder().build());
-            assertEquals("Failed to properly encode", curDocument.getString("encoded").getValue(),
-                         DatatypeConverter.printHexBinary(buffer.toByteArray()));
+
+
+    // TODO: Working around the fact that the Java driver doesn't report an error for invalid UTF-8, but rather replaces the invalid
+    // sequence with the replacement character
+    private void throwIfValueIsStringContainingReplacementCharacter(final String description) {
+        BsonDocument decodedDocument = decodeToDocument(testCase.getString("bson").getValue(), description);
+        String testKey = decodedDocument.keySet().iterator().next();
+
+        if (decodedDocument.containsKey(testKey)) {
+            String decodedString = null;
+            if (decodedDocument.get(testKey).isString()) {
+                decodedString = decodedDocument.getString(testKey).getValue();
+            }
+            if (decodedDocument.get(testKey).isDBPointer()) {
+                decodedString = decodedDocument.get(testKey).asDBPointer().getNamespace();
+            }
+            if (decodedString != null && decodedString.contains(Charset.forName("UTF-8").newDecoder().replacement())) {
+                throw new BsonSerializationException("String contains replacement character");
+            }
+
         }
     }
 
+
     @Parameterized.Parameters(name = "{0}")
     public static Collection<Object[]> data() throws URISyntaxException, IOException {
         List<Object[]> data = new ArrayList<Object[]>();
         for (File file : JsonPoweredTestHelper.getTestFiles("/bson")) {
             BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
-            data.add(new Object[]{testDocument.getString("description").getValue(), testDocument});
+            for (BsonValue curValue : testDocument.getArray("valid", new BsonArray())) {
+                BsonDocument testCaseDocument = curValue.asDocument();
+                data.add(new Object[]{createTestCaseDescription(testDocument, testCaseDocument, "valid"), testDocument, testCaseDocument,
+                        TestCaseType.VALID});
+            }
+
+            for (BsonValue curValue : testDocument.getArray("decodeErrors", new BsonArray())) {
+                BsonDocument testCaseDocument = curValue.asDocument();
+                data.add(new Object[]{createTestCaseDescription(testDocument, testCaseDocument, "decodeError"), testDocument,
+                        testCaseDocument, TestCaseType.DECODE_ERROR});
+            }
+            for (BsonValue curValue : testDocument.getArray("parseErrors", new BsonArray())) {
+                BsonDocument testCaseDocument = curValue.asDocument();
+                data.add(new Object[]{createTestCaseDescription(testDocument, testCaseDocument, "parseError"), testDocument,
+                        testCaseDocument, TestCaseType.PARSE_ERROR});
+            }
         }
         return data;
     }
+
+    private static String createTestCaseDescription(final BsonDocument testDocument, final BsonDocument testCaseDocument,
+                                                    final String testCaseType) {
+        return testDocument.getString("description").getValue()
+                       + "[" + testCaseType + "]"
+                       + ": " + testCaseDocument.getString("description").getValue();
+    }
+
+    private String stripWhiteSpace(final String json) {
+        return json.replace(" ", "");
+    }
 }
diff --git a/driver/src/test/unit/org/bson/LazyBSONDecoderTest.java b/bson/src/test/unit/org/bson/LazyBSONDecoderTest.java
similarity index 98%
rename from driver/src/test/unit/org/bson/LazyBSONDecoderTest.java
rename to bson/src/test/unit/org/bson/LazyBSONDecoderTest.java
index 715f146cf6b..8e7679a8fb6 100644
--- a/driver/src/test/unit/org/bson/LazyBSONDecoderTest.java
+++ b/bson/src/test/unit/org/bson/LazyBSONDecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/org/bson/LazyBSONListTest.java b/bson/src/test/unit/org/bson/LazyBSONListTest.java
similarity index 97%
rename from driver/src/test/unit/org/bson/LazyBSONListTest.java
rename to bson/src/test/unit/org/bson/LazyBSONListTest.java
index 6c3ca731e47..eb775c48f5b 100644
--- a/driver/src/test/unit/org/bson/LazyBSONListTest.java
+++ b/bson/src/test/unit/org/bson/LazyBSONListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"rawtypes", "deprecation"})
 public class LazyBSONListTest {
     private LazyBSONList encodeAndExtractList(final List<?> list) {
         BSONObject document = new BasicBSONObject("l", list);
diff --git a/bson/src/test/unit/org/bson/LazyBSONObjectSpecification.groovy b/bson/src/test/unit/org/bson/LazyBSONObjectSpecification.groovy
new file mode 100644
index 00000000000..0ec23b66c21
--- /dev/null
+++ b/bson/src/test/unit/org/bson/LazyBSONObjectSpecification.groovy
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import org.bson.types.BSONTimestamp
+import org.bson.types.Binary
+import org.bson.types.Code
+import org.bson.types.CodeWScope
+import org.bson.types.Decimal128
+import org.bson.types.MaxKey
+import org.bson.types.MinKey
+import org.bson.types.ObjectId
+import org.bson.types.Symbol
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import java.util.regex.Pattern
+
+import static org.bson.BsonHelper.toBson
+import static org.bson.BsonHelper.valuesOfEveryType
+import static org.bson.BsonType.SYMBOL
+import static org.bson.BsonType.UNDEFINED
+
+@SuppressWarnings(['LineLength'])
+class LazyBSONObjectSpecification extends Specification {
+
+    def setupSpec() {
+        Map.metaClass.bitwiseNegate = { new BasicBSONObject(delegate) }
+        Pattern.metaClass.equals = { Pattern other ->
+            delegate.pattern() == other.pattern() && delegate.flags() == other.flags()
+        }
+    }
+
+    @Unroll
+    def 'should read #type'() {
+        def lazyBSONObject = new LazyBSONObject(bytes as byte[], new LazyBSONCallback())
+        given:
+
+        expect:
+        value == lazyBSONObject.get('f')
+        lazyBSONObject.keySet().contains('f')
+
+        where:
+        value                                                                 | bytes
+        -1.01                                                                 | [16, 0, 0, 0, 1, 102, 0, 41, 92, -113, -62, -11, 40, -16, -65, 0]
+        Float.MIN_VALUE                                                       | [16, 0, 0, 0, 1, 102, 0, 0, 0, 0, 0, 0, 0, -96, 54, 0]
+        Double.MAX_VALUE                                                      | [16, 0, 0, 0, 1, 102, 0, -1, -1, -1, -1, -1, -1, -17, 127, 0]
+        0.0                                                                   | [16, 0, 0, 0, 1, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        ''                                                                    | [13, 0, 0, 0, 2, 102, 0, 1, 0, 0, 0, 0, 0]
+        'danke'                                                               | [18, 0, 0, 0, 2, 102, 0, 6, 0, 0, 0, 100, 97, 110, 107, 101, 0, 0]
+        ',+\\\"<>;[]{}@#$%^&*()+_'                                            | [35, 0, 0, 0, 2, 102, 0, 23, 0, 0, 0, 44, 43, 92, 34, 60, 62, 59, 91, 93, 123, 125, 64, 35, 36, 37, 94, 38, 42, 40, 41, 43, 95, 0, 0]
+        'a\u00e9\u3042\u0430\u0432\u0431\u0434'                               | [27, 0, 0, 0, 2, 102, 0, 15, 0, 0, 0, 97, -61, -87, -29, -127, -126, -48, -80, -48, -78, -48, -79, -48, -76, 0, 0]
+        new LazyBSONObject([5, 0, 0, 0, 0] as byte[], new LazyBSONCallback()) | [13, 0, 0, 0, 3, 102, 0, 5, 0, 0, 0, 0, 0]
+        []                                                                    | [13, 0, 0, 0, 4, 102, 0, 5, 0, 0, 0, 0, 0]
+        [1, 2, 3] as int[]                                                    | [34, 0, 0, 0, 4, 102, 0, 26, 0, 0, 0, 16, 48, 0, 1, 0, 0, 0, 16, 49, 0, 2, 0, 0, 0, 16, 50, 0, 3, 0, 0, 0, 0, 0]
+        [[]]                                                                  | [21, 0, 0, 0, 4, 102, 0, 13, 0, 0, 0, 4, 48, 0, 5, 0, 0, 0, 0, 0, 0]
+        new Binary((byte) 0x01, (byte[]) [115, 116, 11])                      | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 1, 115, 116, 11, 0]
+        new Binary((byte) 0x03, (byte[]) [115, 116, 11])                      | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 3, 115, 116, 11, 0]
+        new Binary((byte) 0x04, (byte[]) [115, 116, 11])                      | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 4, 115, 116, 11, 0]
+        UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09')               | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')               | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        [13, 12] as byte[]                                                    | [15, 0, 0, 0, 5, 102, 0, 2, 0, 0, 0, 0, 13, 12, 0]
+        [102, 111, 111] as byte[]                                             | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 0, 102, 111, 111, 0]
+        new ObjectId('50d3332018c6a1d8d1662b61')                              | [20, 0, 0, 0, 7, 102, 0, 80, -45, 51, 32, 24, -58, -95, -40, -47, 102, 43, 97, 0]
+        true                                                                  | [9, 0, 0, 0, 8, 102, 0, 1, 0]
+        false                                                                 | [9, 0, 0, 0, 8, 102, 0, 0, 0]
+        new Date(582163200)                                                   | [16, 0, 0, 0, 9, 102, 0, 0, 27, -77, 34, 0, 0, 0, 0, 0]
+        null                                                                  | [8, 0, 0, 0, 10, 102, 0, 0]
+        null                                                                  | [8, 0, 0, 0, 6, 102, 0, 0]
+        Pattern.compile('[a]*', Pattern.CASE_INSENSITIVE)                     | [15, 0, 0, 0, 11, 102, 0, 91, 97, 93, 42, 0, 105, 0, 0]
+        new Code('var i = 0')                                                 | [22, 0, 0, 0, 13, 102, 0, 10, 0, 0, 0, 118, 97, 114, 32, 105, 32, 61, 32, 48, 0, 0]
+        new Symbol('c')                                                       | [14, 0, 0, 0, 14, 102, 0, 2, 0, 0, 0, 99, 0, 0]
+        new CodeWScope('i++', ~['x': 1])                                      | [32, 0, 0, 0, 15, 102, 0, 24, 0, 0, 0, 4, 0, 0, 0, 105, 43, 43, 0, 12, 0, 0, 0, 16, 120, 0, 1, 0, 0, 0, 0, 0]
+        -12                                                                   | [12, 0, 0, 0, 16, 102, 0, -12, -1, -1, -1, 0]
+        Integer.MIN_VALUE                                                     | [12, 0, 0, 0, 16, 102, 0, 0, 0, 0, -128, 0]
+        0                                                                     | [12, 0, 0, 0, 16, 102, 0, 0, 0, 0, 0, 0]
+        new BSONTimestamp(123999401, 44332)                                   | [16, 0, 0, 0, 17, 102, 0, 44, -83, 0, 0, -87, 20, 100, 7, 0]
+        Long.MAX_VALUE                                                        | [16, 0, 0, 0, 18, 102, 0, -1, -1, -1, -1, -1, -1, -1, 127, 0]
+        new MinKey()                                                          | [8, 0, 0, 0, -1, 102, 0, 0]
+        new MaxKey()                                                          | [8, 0, 0, 0, 127, 102, 0, 0]
+        Decimal128.parse('0E-6176')                                           | [24, 0, 0, 0, 19, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+
+        type = BsonType.findByValue(bytes[4])
+    }
+
+    @Unroll
+    def 'should read value of #value'() {
+        given:
+        def bsonDocument = new BsonDocument('name', value)
+        def callback = new BasicBSONCallback()
+        new BasicBSONDecoder().decode(toBson(bsonDocument).array(), callback)
+        def dbObject = callback.get() as BasicBSONObject
+        def lazyBSONObject = new LazyBSONObject(toBson(bsonDocument).array(), new LazyBSONCallback())
+
+        expect:
+        lazyBSONObject.keySet().contains('name')
+
+        when:
+        def expectedValue
+        if (value.bsonType == UNDEFINED) {
+            expectedValue = null
+        } else if (value.bsonType == SYMBOL) {
+            expectedValue = new Symbol(((BsonSymbol) value).getSymbol())
+        } else {
+            expectedValue = dbObject.get('name')
+        }
+
+        then:
+        expectedValue == lazyBSONObject.get('name')
+
+        where:
+        value << valuesOfEveryType()
+    }
+
+    def 'should have nested items as lazy'() {
+        given:
+        byte[] bytes = [
+                53, 0, 0, 0, 4, 97, 0, 26, 0, 0, 0, 16, 48, 0, 1, 0, 0, 0, 16, 49, 0, 2, 0, 0, 0, 16, 50, 0,
+                3, 0, 0, 0, 0, 3, 111, 0, 16, 0, 0, 0, 1, 122, 0, -102, -103, -103, -103, -103, -103, -71, 63, 0, 0
+        ];
+
+        when:
+        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
+
+        then:
+        document.get('a') instanceof LazyBSONList
+        document.get('o') instanceof LazyBSONObject
+    }
+
+    def 'should not understand DBRefs'() {
+        given:
+        byte[] bytes = [
+                44, 0, 0, 0, 3, 102, 0, 36, 0, 0, 0, 2, 36, 114, 101, 102,
+                0, 4, 0, 0, 0, 97, 46, 98, 0, 7, 36, 105, 100, 0, 18, 52,
+                86, 120, -112, 18, 52, 86, 120, -112, 18, 52, 0, 0,
+        ]
+
+        when:
+        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
+
+        then:
+        document.get('f') instanceof LazyBSONObject
+        document.get('f').keySet() == ['$ref', '$id'] as Set
+    }
+
+    def 'should retain fields order'() {
+        given:
+        byte[] bytes = [
+                47, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 16, 98, 0, 2, 0, 0, 0, 16, 100, 0, 3, 0, 0,
+                0, 16, 99, 0, 4, 0, 0, 0, 16, 101, 0, 5, 0, 0, 0, 16, 48, 0, 6, 0, 0, 0, 0
+        ]
+
+        when:
+        Iterator<String> iterator = new LazyBSONObject(bytes, new LazyBSONCallback()).keySet().iterator()
+
+        then:
+        iterator.next() == 'a'
+        iterator.next() == 'b'
+        iterator.next() == 'd'
+        iterator.next() == 'c'
+        iterator.next() == 'e'
+        iterator.next() == '0'
+        !iterator.hasNext()
+    }
+
+    def 'should be able to compare itself to others'() {
+        given:
+        byte[] bytes = [
+                39, 0, 0, 0, 3, 97, 0,
+                14, 0, 0, 0, 2, 120, 0, 2, 0, 0, 0, 121, 0, 0,
+                3, 98, 0,
+                14, 0, 0, 0, 2, 120, 0, 2, 0, 0, 0, 121, 0, 0,
+                0
+        ]
+
+        when:
+        def bsonObject1 = new LazyBSONObject(bytes, new LazyBSONCallback())
+        def bsonObject2 = new LazyBSONObject(bytes, new LazyBSONCallback())
+        def bsonObject3 = new LazyBSONObject(bytes, 7, new LazyBSONCallback())
+        def bsonObject4 = new LazyBSONObject(bytes, 24, new LazyBSONCallback())
+        def bsonObject5 = new LazyBSONObject([14, 0, 0, 0, 2, 120, 0, 2, 0, 0, 0, 121, 0, 0] as byte[], new LazyBSONCallback())
+        def bsonObject6 = new LazyBSONObject([5, 0, 0, 0, 0] as byte[], new LazyBSONCallback())
+
+        then:
+        bsonObject1.equals(bsonObject1)
+        !bsonObject1.equals(null)
+        !bsonObject1.equals('not equal')
+        bsonObject1.equals(bsonObject2)
+        bsonObject3.equals(bsonObject4)
+        !bsonObject1.equals(bsonObject3)
+        bsonObject4.equals(bsonObject5)
+        !bsonObject1.equals(bsonObject6)
+
+        bsonObject1.hashCode() == bsonObject2.hashCode()
+        bsonObject3.hashCode() == bsonObject4.hashCode()
+        bsonObject1.hashCode() != bsonObject3.hashCode()
+        bsonObject4.hashCode() == bsonObject5.hashCode()
+        bsonObject1.hashCode() != bsonObject6.hashCode()
+    }
+
+    def 'should return the size of a document'() {
+        given:
+        byte[] bytes = [12, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 0]
+
+        when:
+        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
+
+        then:
+        document.getBSONSize() == 12
+    }
+
+    def 'should understand that object is empty'() {
+        given:
+        byte[] bytes = [5, 0, 0, 0, 0]
+
+        when:
+        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
+
+        then:
+        document.isEmpty()
+    }
+
+    def 'should implement Map.keySet()'() {
+        given:
+        byte[] bytes = [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0]
+
+        when:
+        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
+
+        then:
+        document.containsField('a')
+        !document.containsField('z')
+        document.get('z') == null
+        document.keySet() == ['a', 'b'] as Set
+    }
+
+    def 'should implement Map.entrySet()'() {
+        given:
+        byte[] bytes = [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0]
+        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
+
+        when:
+        def entrySet = document.entrySet()
+
+        then:
+        entrySet.size() == 2
+        !entrySet.isEmpty()
+        entrySet.contains(new AbstractMap.SimpleImmutableEntry('a', 1))
+        !entrySet.contains(new AbstractMap.SimpleImmutableEntry('a', 2))
+        entrySet.containsAll([new AbstractMap.SimpleImmutableEntry('a', 1), new AbstractMap.SimpleImmutableEntry('b', true)])
+        !entrySet.containsAll([new AbstractMap.SimpleImmutableEntry('a', 1), new AbstractMap.SimpleImmutableEntry('b', false)])
+        entrySet.toArray() == [new AbstractMap.SimpleImmutableEntry('a', 1), new AbstractMap.SimpleImmutableEntry('b', true)].toArray()
+        entrySet.toArray(new Map.Entry[2]) ==
+                [new AbstractMap.SimpleImmutableEntry('a', 1), new AbstractMap.SimpleImmutableEntry('b', true)].toArray()
+
+        when:
+        def iterator = entrySet.iterator()
+
+        then:
+        iterator.hasNext()
+        iterator.next() == new AbstractMap.SimpleImmutableEntry('a', 1)
+        iterator.hasNext()
+        iterator.next() == new AbstractMap.SimpleImmutableEntry('b', true)
+        !iterator.hasNext()
+
+        when:
+        entrySet.add(new AbstractMap.SimpleImmutableEntry('key', null))
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        entrySet.addAll([new AbstractMap.SimpleImmutableEntry('key', null)])
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        entrySet.clear()
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        entrySet.remove(new AbstractMap.SimpleImmutableEntry('key', null))
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        entrySet.removeAll([new AbstractMap.SimpleImmutableEntry('key', null)])
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        entrySet.retainAll([new AbstractMap.SimpleImmutableEntry('key', null)])
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    def 'should throw on modification'() {
+        given:
+        LazyBSONObject document = new LazyBSONObject(
+                [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0] as byte[],
+                new LazyBSONCallback()
+        )
+
+        when:
+        document.keySet().add('c')
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        document.put('c', 2)
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        document.removeField('a')
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        document.toMap().put('a', 22)
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    def 'should pipe to stream'() {
+        given:
+        byte[] bytes = [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0];
+        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+
+        when:
+        document.pipe(baos)
+
+        then:
+        bytes == baos.toByteArray()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/LimitedLookaheadMarkSpecification.groovy b/bson/src/test/unit/org/bson/LimitedLookaheadMarkSpecification.groovy
index f34250ced9a..dd025c13f2f 100644
--- a/bson/src/test/unit/org/bson/LimitedLookaheadMarkSpecification.groovy
+++ b/bson/src/test/unit/org/bson/LimitedLookaheadMarkSpecification.groovy
@@ -1,19 +1,17 @@
 /*
+ * Copyright 2008-present MongoDB, Inc.
  *
- *  * Copyright (c) 2008-2014 MongoDB, Inc.
- *  *
- *  * Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  *   http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.bson
@@ -25,6 +23,7 @@ import org.bson.json.JsonWriter
 import spock.lang.Specification
 
 @SuppressWarnings('UnnecessaryObjectReferences')
+@SuppressWarnings('deprecation')
 class LimitedLookaheadMarkSpecification extends Specification {
 
     def 'should throw if mark without resetting previous mark'(BsonWriter writer) {
@@ -242,7 +241,197 @@ class LimitedLookaheadMarkSpecification extends Specification {
         ]
     }
 
-    def 'should peek binary subtype'(BsonWriter writer) {
+    def 'Lookahead should work at various states with Mark'(BsonWriter writer, boolean useAlternateReader) {
+        given:
+        writer.with {
+            writeStartDocument()
+            writeInt64('int64', 52L)
+            writeStartArray('array')
+            writeInt32(1)
+            writeInt64(2L)
+            writeStartArray()
+            writeInt32(3)
+            writeInt32(4)
+            writeEndArray()
+            writeStartDocument()
+            writeInt32('a', 5)
+            writeEndDocument()
+            writeNull()
+            writeEndArray()
+            writeStartDocument('document')
+            writeInt32('a', 6)
+            writeEndDocument()
+            writeEndDocument()
+        }
+
+
+        when:
+        BsonReader reader
+        BsonReaderMark mark
+        if (writer instanceof BsonDocumentWriter) {
+            reader = new BsonDocumentReader(writer.document)
+        } else if (writer instanceof BsonBinaryWriter) {
+            BasicOutputBuffer buffer = (BasicOutputBuffer) writer.getBsonOutput();
+            reader = new BsonBinaryReader(new ByteBufferBsonInput(buffer.getByteBuffers().get(0)))
+        } else if (writer instanceof JsonWriter) {
+            if (useAlternateReader) {
+                reader = new JsonReader(new InputStreamReader(new ByteArrayInputStream(writer.writer.toString().getBytes())))
+            } else {
+                reader = new JsonReader(writer.writer.toString())
+            }
+        }
+
+        reader.readStartDocument()
+        // mark beginning of document * 1
+        mark = reader.getMark()
+
+        then:
+        reader.readName() == 'int64'
+        reader.readInt64() == 52L
+        reader.readStartArray()
+
+        when:
+        // reset to beginning of document * 2
+        mark.reset()
+        // mark beginning of document * 2
+        mark = reader.getMark()
+
+        then:
+        reader.readName() == 'int64'
+        reader.readInt64() == 52L
+
+        when:
+        // make sure it's possible to reset to a mark after getting a new mark
+        reader.getMark()
+        // reset to beginning of document * 3
+        mark.reset()
+        // mark beginning of document * 3
+        mark = reader.getMark()
+
+        then:
+        reader.readName() == 'int64'
+        reader.readInt64() == 52L
+        reader.readName() == 'array'
+        reader.readStartArray()
+        reader.readInt32() == 1
+        reader.readInt64() == 2
+        reader.readStartArray()
+        reader.readInt32() == 3
+        reader.readInt32() == 4
+        reader.readEndArray()
+        reader.readStartDocument()
+        reader.readName() == 'a'
+        reader.readInt32() == 5
+        reader.readEndDocument()
+        reader.readNull()
+        reader.readEndArray()
+        reader.readName() == 'document'
+        reader.readStartDocument()
+        reader.readName() == 'a'
+        reader.readInt32() == 6
+        reader.readEndDocument()
+        reader.readEndDocument()
+
+        when:
+        // read entire document, reset to beginning
+        mark.reset()
+
+        then:
+        reader.readName() == 'int64'
+        reader.readInt64() == 52L
+        reader.readName() == 'array'
+
+        when:
+        // mark in outer-document * 1
+        mark = reader.getMark()
+
+        then:
+        reader.readStartArray()
+        reader.readInt32() == 1
+        reader.readInt64() == 2
+        reader.readStartArray()
+
+        when:
+        // reset in sub-document * 1
+        mark.reset()
+        // mark in outer-document * 2
+        mark = reader.getMark()
+
+        then:
+        reader.readStartArray()
+        reader.readInt32() == 1
+        reader.readInt64() == 2
+        reader.readStartArray()
+        reader.readInt32() == 3
+
+        when:
+        // reset in sub-document * 2
+        mark.reset()
+
+        then:
+        reader.readStartArray()
+        reader.readInt32() == 1
+        reader.readInt64() == 2
+        reader.readStartArray()
+        reader.readInt32() == 3
+        reader.readInt32() == 4
+
+        when:
+        // mark in sub-document * 1
+        mark = reader.getMark()
+
+        then:
+        reader.readEndArray()
+        reader.readStartDocument()
+        reader.readName() == 'a'
+        reader.readInt32() == 5
+        reader.readEndDocument()
+        reader.readNull()
+        reader.readEndArray()
+
+        when:
+        // reset in outer-document * 1
+        mark.reset()
+        // mark in sub-document * 2
+        mark = reader.getMark()
+
+        then:
+        reader.readEndArray()
+        reader.readStartDocument()
+        reader.readName() == 'a'
+        reader.readInt32() == 5
+        reader.readEndDocument()
+        reader.readNull()
+        reader.readEndArray()
+
+        when:
+        // reset in out-document * 2
+        mark.reset()
+
+        then:
+        reader.readEndArray()
+        reader.readStartDocument()
+        reader.readName() == 'a'
+        reader.readInt32() == 5
+        reader.readEndDocument()
+        reader.readNull()
+        reader.readEndArray()
+        reader.readName() == 'document'
+        reader.readStartDocument()
+        reader.readName() == 'a'
+        reader.readInt32() == 6
+        reader.readEndDocument()
+        reader.readEndDocument()
+
+        where:
+        writer | useAlternateReader
+        new BsonDocumentWriter(new BsonDocument()) | false
+        new BsonBinaryWriter(new BasicOutputBuffer()) | false
+        new JsonWriter(new StringWriter()) | false
+        new JsonWriter(new StringWriter()) | true
+    }
+
+    def 'should peek binary subtype and size'(BsonWriter writer) {
         given:
         writer.with {
             writeStartDocument()
@@ -265,12 +454,14 @@ class LimitedLookaheadMarkSpecification extends Specification {
         reader.readStartDocument()
         reader.readName()
         def subType = reader.peekBinarySubType()
+        def size = reader.peekBinarySize()
         def binary = reader.readBinaryData()
         def longValue = reader.readInt64('int64')
         reader.readEndDocument()
 
         then:
         subType == BsonBinarySubType.UUID_LEGACY.value
+        size == 16
         binary == new BsonBinary(BsonBinarySubType.UUID_LEGACY, new byte[16])
         longValue == 52L
 
@@ -281,4 +472,4 @@ class LimitedLookaheadMarkSpecification extends Specification {
                 new JsonWriter(new StringWriter())
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/bson/src/test/unit/org/bson/RawBsonArraySpecification.groovy b/bson/src/test/unit/org/bson/RawBsonArraySpecification.groovy
new file mode 100644
index 00000000000..27a7dcbbaa7
--- /dev/null
+++ b/bson/src/test/unit/org/bson/RawBsonArraySpecification.groovy
@@ -0,0 +1,402 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson
+
+import org.bson.codecs.BsonDocumentCodec
+import spock.lang.Specification
+
+import java.nio.ByteOrder
+
+import static java.util.Arrays.asList
+import static util.GroovyHelpers.areEqual
+
+class RawBsonArraySpecification extends Specification {
+
+    static BsonArray emptyBsonArray = new BsonArray()
+    static RawBsonArray emptyRawBsonArray = new RawBsonDocument(new BsonDocument('a', emptyBsonArray), new BsonDocumentCodec()).get('a')
+    static BsonArray bsonArray = new BsonArray(asList(new BsonInt32(1), new BsonInt32(2), new BsonDocument('x', BsonBoolean.TRUE),
+            new BsonArray(asList(new BsonDocument('y', BsonBoolean.FALSE), new BsonArray(asList(new BsonInt32(1)))))))
+
+    def 'constructors should throw if parameters are invalid'() {
+        when:
+        new RawBsonArray(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        new RawBsonArray(null, 0, 5)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        new RawBsonArray(new byte[5], -1, 5)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        new RawBsonArray(new byte[5], 5, 5)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        new RawBsonArray(new byte[5], 0, 0)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        new RawBsonArray(new byte[10], 6, 5)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'byteBuffer should contain the correct bytes'() {
+        when:
+        def byteBuf = rawBsonArray.getByteBuffer()
+
+        then:
+        rawBsonArray == bsonArray
+        byteBuf.asNIO().order() == ByteOrder.LITTLE_ENDIAN
+        byteBuf.remaining() == 66
+
+        when:
+        def actualBytes = new byte[66]
+        byteBuf.get(actualBytes)
+
+        then:
+        actualBytes == getBytesFromBsonArray()
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'contains should find existing values'() {
+        expect:
+        rawBsonArray.contains( bsonArray.get(0) )
+        rawBsonArray.contains( bsonArray.get(1) )
+        rawBsonArray.contains( bsonArray.get(2) )
+        rawBsonArray.contains( bsonArray.get(3) )
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'containsAll should return true if contains all'() {
+        expect:
+        rawBsonArray.containsAll(bsonArray.getValues())
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'should return RawBsonDocument for sub documents and RawBsonArray for arrays'() {
+        expect:
+        rawBsonArray.get(0) instanceof BsonInt32
+        rawBsonArray.get(1) instanceof BsonInt32
+        rawBsonArray.get(2) instanceof RawBsonDocument
+        rawBsonArray.get(3) instanceof RawBsonArray
+        rawBsonArray.get(3).asArray().get(0) instanceof RawBsonDocument
+        rawBsonArray.get(3).asArray().get(1) instanceof RawBsonArray
+
+        and:
+        rawBsonArray.get(2).getBoolean('x').value
+        !rawBsonArray.get(3).asArray().get(0).asDocument().getBoolean('y').value
+        rawBsonArray.get(3).asArray().get(1).asArray().get(0).asInt32().value == 1
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+
+    def 'get should throw if index out of bounds'() {
+        when:
+        rawBsonArray.get(-1)
+
+        then:
+        thrown(IndexOutOfBoundsException)
+
+        when:
+        rawBsonArray.get(5)
+
+        then:
+        thrown(IndexOutOfBoundsException)
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'isEmpty should return false when the BsonArray is not empty'() {
+        expect:
+        !rawBsonArray.isEmpty()
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'isEmpty should return true when the BsonArray is empty'() {
+        expect:
+        emptyRawBsonArray.isEmpty()
+    }
+
+    def 'should get correct size when the BsonArray is empty'() {
+        expect:
+        emptyRawBsonArray.size() == 0
+    }
+
+    def 'should get correct values set when the BsonArray is empty'() {
+        expect:
+        emptyRawBsonArray.getValues().isEmpty()
+    }
+
+    def 'should get correct size'() {
+        expect:
+        createRawBsonArrayFromBsonArray().size() == 4
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'should get correct values set'() {
+        expect:
+        rawBsonArray.getValues() == bsonArray.getValues()
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'all write methods should throw UnsupportedOperationException'() {
+        given:
+        def rawBsonArray = createRawBsonArrayFromBsonArray()
+
+        when:
+        rawBsonArray.clear()
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.add(BsonNull.VALUE)
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.add(1, BsonNull.VALUE)
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.addAll([BsonNull.VALUE])
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.addAll(1, [BsonNull.VALUE])
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.remove(BsonNull.VALUE)
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.remove(1)
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.removeAll([BsonNull.VALUE])
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.retainAll([BsonNull.VALUE])
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        rawBsonArray.set(0, BsonNull.VALUE)
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    def 'should find the indexOf a value'() {
+        expect:
+        rawBsonArray.indexOf(bsonArray.get(2)) == 2
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'should find the lastIndexOf a value'() {
+        when:
+        RawBsonArray rawBsonArray = RawBsonDocument.parse('{a: [1, 2, 3, 1]}').get('a')
+
+        then:
+        rawBsonArray.lastIndexOf(rawBsonArray.get(0)) == 3
+    }
+
+
+    def 'should return a valid iterator for empty Bson Arrays'() {
+        when:
+        def iterator = emptyRawBsonArray.iterator()
+
+        then:
+        !iterator.hasNext()
+        !iterator.hasNext()
+    }
+
+    def 'should return a listIterator'() {
+        when:
+        RawBsonArray rawBsonArray = RawBsonDocument.parse('{a: [1, 2, 3, 1]}').get('a')
+
+        then:
+        rawBsonArray.listIterator().toList() == rawBsonArray.getValues()
+    }
+
+    def 'should return a listIterator with index'() {
+        when:
+        RawBsonArray rawBsonArray = RawBsonDocument.parse('{a: [1, 2, 3, 1]}').get('a')
+
+        then:
+        rawBsonArray.listIterator(1).toList() == rawBsonArray.getValues().subList(1, 4)
+    }
+
+    def 'should iterate forwards and backwards through a list iterator'() {
+        when:
+        RawBsonArray rawBsonArray = RawBsonDocument.parse('{a: [1, 2, 3, 4]}').get('a')
+        def iter = rawBsonArray.listIterator()
+
+        then:
+
+        iter.next() == new BsonInt32(1)
+        iter.previous() == new BsonInt32(1)
+        iter.next() == new BsonInt32(1)
+        iter.next() == new BsonInt32(2)
+        iter.previous() == new BsonInt32(2)
+        iter.previous() == new BsonInt32(1)
+
+        when:
+        iter.previous()
+
+        then:
+        thrown(NoSuchElementException)
+    }
+
+    def 'should return a sublist'() {
+        when:
+        RawBsonArray rawBsonArray = RawBsonDocument.parse('{a: [1, 2, 3, 1]}').get('a')
+
+        then:
+        rawBsonArray.subList(2, 3).toList() == rawBsonArray.getValues().subList(2, 3)
+    }
+
+    def 'hashCode should equal hash code of identical BsonArray'() {
+        expect:
+        rawBsonArray.hashCode() == bsonArray.hashCode()
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'equals should equal identical BsonArray'() {
+        expect:
+        areEqual(rawBsonArray, bsonArray)
+        areEqual(bsonArray, rawBsonArray)
+        areEqual(rawBsonArray, rawBsonArray)
+        !areEqual(rawBsonArray, emptyRawBsonArray)
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'clone should make a deep copy'() {
+        when:
+        RawBsonArray cloned = rawBsonArray.clone()
+
+        then:
+        !cloned.getByteBuffer().array().is(createRawBsonArrayFromBsonArray().getByteBuffer().array())
+        cloned.getByteBuffer().remaining() == rawBsonArray.getByteBuffer().remaining()
+        cloned == createRawBsonArrayFromBsonArray()
+
+        where:
+        rawBsonArray << createRawBsonArrayVariants()
+    }
+
+    def 'should serialize and deserialize'() {
+        given:
+        def baos = new ByteArrayOutputStream()
+        def oos = new ObjectOutputStream(baos)
+
+        when:
+        oos.writeObject(localRawDocument)
+        def bais = new ByteArrayInputStream(baos.toByteArray())
+        def ois = new ObjectInputStream(bais)
+        def deserializedDocument = ois.readObject()
+
+        then:
+        bsonArray == deserializedDocument
+
+        where:
+        localRawDocument << createRawBsonArrayVariants()
+    }
+
+    private static List<RawBsonArray> createRawBsonArrayVariants() {
+        [
+                createRawBsonArrayFromBsonArray(),
+                createRawBsonArrayFromByteArray(),
+                createRawBsonArrayFromByteArrayOffsetLength()
+        ]
+    }
+
+    private static RawBsonArray createRawBsonArrayFromBsonArray() {
+        (RawBsonArray) new RawBsonDocument(new BsonDocument('a', bsonArray), new BsonDocumentCodec()).get('a')
+    }
+
+
+    private static byte[] getBytesFromBsonArray() {
+        def byteBuffer = createRawBsonArrayFromBsonArray().byteBuffer
+        byte[] strippedBytes = new byte[byteBuffer.remaining()]
+        byteBuffer.get(strippedBytes)
+        strippedBytes
+    }
+
+    private static RawBsonArray createRawBsonArrayFromByteArray() {
+        new RawBsonArray(getBytesFromBsonArray())
+    }
+
+    private static RawBsonArray createRawBsonArrayFromByteArrayOffsetLength() {
+        def strippedBytes = getBytesFromBsonArray()
+        byte[] unstrippedBytes = new byte[strippedBytes.length + 2]
+        System.arraycopy(strippedBytes, 0, unstrippedBytes, 1, strippedBytes.length)
+        new RawBsonArray(unstrippedBytes, 1, strippedBytes.length)
+    }
+}
diff --git a/bson/src/test/unit/org/bson/RawBsonDocumentSpecification.groovy b/bson/src/test/unit/org/bson/RawBsonDocumentSpecification.groovy
index f85c67aebe2..e4688592e6b 100644
--- a/bson/src/test/unit/org/bson/RawBsonDocumentSpecification.groovy
+++ b/bson/src/test/unit/org/bson/RawBsonDocumentSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -36,12 +36,12 @@ import static util.GroovyHelpers.areEqual
 class RawBsonDocumentSpecification extends Specification {
 
     static emptyDocument = new BsonDocument()
-    static emptyRawDocument = new RawBsonDocument(emptyDocument, new BsonDocumentCodec());
+    static emptyRawDocument = new RawBsonDocument(emptyDocument, new BsonDocumentCodec())
     static document = new BsonDocument()
             .append('a', new BsonInt32(1))
             .append('b', new BsonInt32(2))
             .append('c', new BsonDocument('x', BsonBoolean.TRUE))
-            .append('d', new BsonArray(asList(new BsonDocument('y', BsonBoolean.FALSE), new BsonInt32(1))))
+            .append('d', new BsonArray(asList(new BsonDocument('y', BsonBoolean.FALSE), new BsonArray(asList(new BsonInt32(1))))))
 
     def 'constructors should throw if parameters are invalid'() {
         when:
@@ -100,10 +100,10 @@ class RawBsonDocumentSpecification extends Specification {
         then:
         rawDocument == document
         byteBuf.asNIO().order() == ByteOrder.LITTLE_ENDIAN
-        byteBuf.remaining() == 58
+        byteBuf.remaining() == 66
 
         when:
-        def actualBytes = new byte[58]
+        def actualBytes = new byte[66]
         byteBuf.get(actualBytes)
 
         then:
@@ -161,6 +161,24 @@ class RawBsonDocumentSpecification extends Specification {
         rawDocument << createRawDocumentVariants()
     }
 
+    def 'should return RawBsonDocument for sub documents and RawBsonArray for arrays'() {
+        expect:
+        rawDocument.get('a') instanceof BsonInt32
+        rawDocument.get('b') instanceof BsonInt32
+        rawDocument.get('c') instanceof RawBsonDocument
+        rawDocument.get('d') instanceof RawBsonArray
+        rawDocument.get('d').asArray().get(0) instanceof RawBsonDocument
+        rawDocument.get('d').asArray().get(1) instanceof RawBsonArray
+
+        and:
+        rawDocument.getDocument('c').getBoolean('x').value
+        !rawDocument.get('d').asArray().get(0).asDocument().getBoolean('y').value
+        rawDocument.get('d').asArray().get(1).asArray().get(0).asInt32().value == 1
+
+        where:
+        rawDocument << createRawDocumentVariants()
+    }
+
     def 'containValue should find an existing value'() {
         expect:
         rawDocument.containsValue(document.get('a'))
@@ -250,6 +268,33 @@ class RawBsonDocumentSpecification extends Specification {
         rawDocument << createRawDocumentVariants()
     }
 
+    def 'should get first key'() {
+        expect:
+        document.getFirstKey() == 'a'
+
+        where:
+        rawDocument << createRawDocumentVariants()
+    }
+
+    def 'getFirstKey should throw NoSuchElementException if the document is empty'() {
+        when:
+        emptyRawDocument.getFirstKey()
+
+        then:
+        thrown(NoSuchElementException)
+    }
+
+    def 'should create BsonReader'() {
+        when:
+        def reader = document.asBsonReader()
+
+        then:
+        new BsonDocumentCodec().decode(reader, DecoderContext.builder().build()) == document
+
+        cleanup:
+        reader.close()
+    }
+
     def 'toJson should return equivalent JSON'() {
         expect:
         new RawBsonDocumentCodec().decode(new JsonReader(rawDocument.toJson()), DecoderContext.builder().build()) == document
@@ -260,10 +305,10 @@ class RawBsonDocumentSpecification extends Specification {
 
     def 'toJson should respect default JsonWriterSettings'() {
         given:
-        def writer = new StringWriter();
+        def writer = new StringWriter()
 
         when:
-        new BsonDocumentCodec().encode(new JsonWriter(writer), document, EncoderContext.builder().build());
+        new BsonDocumentCodec().encode(new JsonWriter(writer), document, EncoderContext.builder().build())
 
         then:
         writer.toString() == rawDocument.toJson()
@@ -275,10 +320,10 @@ class RawBsonDocumentSpecification extends Specification {
     def 'toJson should respect JsonWriterSettings'() {
         given:
         def jsonWriterSettings = new JsonWriterSettings(JsonMode.SHELL)
-        def writer = new StringWriter();
+        def writer = new StringWriter()
 
         when:
-        new RawBsonDocumentCodec().encode(new JsonWriter(writer, jsonWriterSettings), rawDocument, EncoderContext.builder().build());
+        new RawBsonDocumentCodec().encode(new JsonWriter(writer, jsonWriterSettings), rawDocument, EncoderContext.builder().build())
 
         then:
         writer.toString() == rawDocument.toJson(jsonWriterSettings)
@@ -381,7 +426,6 @@ class RawBsonDocumentSpecification extends Specification {
 
         where:
         localRawDocument << createRawDocumentVariants()
-
     }
 
     private static List<RawBsonDocument> createRawDocumentVariants() {
@@ -424,7 +468,7 @@ class RawBsonDocumentSpecification extends Specification {
 
     class TestEntry implements Map.Entry<String, BsonValue> {
 
-        private final String key;
+        private final String key
         private BsonValue value
 
         TestEntry(String key, BsonValue value) {
diff --git a/bson/src/test/unit/org/bson/codecs/AtomicCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/AtomicCodecSpecification.groovy
index 56723124fba..df3800f8797 100644
--- a/bson/src/test/unit/org/bson/codecs/AtomicCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/AtomicCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,4 +107,4 @@ class AtomicCodecSpecification extends Specification {
         value.get() == atomicLong.get()
     }
 
-}
\ No newline at end of file
+}
diff --git a/bson/src/test/unit/org/bson/codecs/AtomicIntegerCodecTest.java b/bson/src/test/unit/org/bson/codecs/AtomicIntegerCodecTest.java
new file mode 100644
index 00000000000..e8922aaaf26
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/AtomicIntegerCodecTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.junit.Test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.Assert.assertEquals;
+
+public final class AtomicIntegerCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripAtomicIntegerValues() {
+        Document original = new Document("a", new AtomicInteger(Integer.MAX_VALUE));
+        roundTrip(original, new AtomicIntegerComparator(original));
+
+        original = new Document("a", new AtomicInteger(Integer.MIN_VALUE));
+        roundTrip(original, new AtomicIntegerComparator(original));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", new AtomicInteger(10));
+        roundTrip(new Document("a", 10), new AtomicIntegerComparator(expected));
+        roundTrip(new Document("a", 10L), new AtomicIntegerComparator(expected));
+        roundTrip(new Document("a", 10.00), new AtomicIntegerComparator(expected));
+        roundTrip(new Document("a", 9.9999999999999992), new AtomicIntegerComparator(expected));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDoubleValues() {
+        Document original = new Document("a", 9.9999999999999991);
+        roundTrip(original, new AtomicIntegerComparator(original));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMinRange() {
+        roundTrip(new Document("a", Long.MIN_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMaxRange() {
+        roundTrip(new Document("a", Long.MAX_VALUE));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(AtomicInteger.class);
+    }
+
+    private class AtomicIntegerComparator implements Comparator<Document> {
+        private final Document expected;
+
+        AtomicIntegerComparator(final Document expected) {
+            this.expected = expected;
+        }
+
+        @Override
+        public void apply(final Document result) {
+            assertEquals("Codec Round Trip",
+                    expected.get("a", AtomicInteger.class).get(),
+                    result.get("a", AtomicInteger.class).get());
+        }
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/AtomicLongCodecTest.java b/bson/src/test/unit/org/bson/codecs/AtomicLongCodecTest.java
new file mode 100644
index 00000000000..2321becc1ed
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/AtomicLongCodecTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.junit.Test;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.junit.Assert.assertEquals;
+
+public final class AtomicLongCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripAtomicLongValues() {
+        Document original = new Document("a", new AtomicLong(Long.MAX_VALUE));
+        roundTrip(original, new AtomicLongComparator(original));
+
+        original = new Document("a", new AtomicLong(Long.MIN_VALUE));
+        roundTrip(original, new AtomicLongComparator(original));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", new AtomicLong(10L));
+        roundTrip(new Document("a", 10), new AtomicLongComparator(expected));
+        roundTrip(new Document("a", 10L), new AtomicLongComparator(expected));
+        roundTrip(new Document("a", 10.00), new AtomicLongComparator(expected));
+        roundTrip(new Document("a", 9.9999999999999992), new AtomicLongComparator(expected));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDoubleValues() {
+        Document original = new Document("a", 9.9999999999999991);
+        roundTrip(original, new AtomicLongComparator(original));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMinRange() {
+        roundTrip(new Document("a", -Double.MAX_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMaxRange() {
+        roundTrip(new Document("a", Double.MAX_VALUE));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(AtomicLong.class);
+    }
+
+    private class AtomicLongComparator implements Comparator<Document> {
+        private final Document expected;
+
+        AtomicLongComparator(final Document expected) {
+            this.expected = expected;
+        }
+
+        @Override
+        public void apply(final Document result) {
+            assertEquals("Codec Round Trip",
+                    expected.get("a", AtomicLong.class).get(),
+                    result.get("a", AtomicLong.class).get());
+        }
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/BigDecimalCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/BigDecimalCodecSpecification.groovy
new file mode 100644
index 00000000000..d8381e5c0c8
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/BigDecimalCodecSpecification.groovy
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs
+
+import org.bson.BsonDecimal128
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.BsonReader
+import org.bson.types.Decimal128
+import spock.lang.Specification
+
+class BigDecimalCodecSpecification extends Specification {
+
+    def 'should round trip BigDecimal successfully'() {
+        given:
+        def codec = new BigDecimalCodec()
+        def bsonDecimal128 = new BsonDecimal128(new Decimal128(bigDecimal))
+
+        when:
+        def writer = new BsonDocumentWriter(new BsonDocument())
+        writer.writeStartDocument()
+        writer.writeName('bigDecimal')
+        codec.encode(writer, bigDecimal, EncoderContext.builder().build())
+        writer.writeEndDocument()
+
+        then:
+        bsonDecimal128 == writer.getDocument().get('bigDecimal')
+
+        when:
+        BsonReader bsonReader = new BsonDocumentReader(writer.getDocument())
+        bsonReader.readStartDocument()
+        bsonReader.readName()
+        BigDecimal actual = codec.decode(bsonReader, DecoderContext.builder().build())
+
+        then:
+        bigDecimal == actual
+
+        where:
+        bigDecimal << [
+                new BigDecimal(123),
+                new BigDecimal(42L),
+                new BigDecimal('12345678901234567890'),
+                new BigDecimal(Long.valueOf(42)),
+                new BigDecimal('42.0'),
+                new BigDecimal(Double.valueOf(42)),
+                new BigDecimal('1.2345678901234567890'),
+                new BigDecimal(Long.MAX_VALUE),
+                new BigDecimal(Long.MIN_VALUE),
+                new BigDecimal(0),
+        ]
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/BsonCodecProviderSpecification.groovy b/bson/src/test/unit/org/bson/codecs/BsonCodecProviderSpecification.groovy
new file mode 100644
index 00000000000..13739fe539f
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/BsonCodecProviderSpecification.groovy
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs
+
+
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWrapper
+import org.bson.RawBsonDocument
+import spock.lang.Specification
+
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+
+class BsonCodecProviderSpecification extends Specification {
+
+    def provider = new BsonCodecProvider()
+    def codecRegistry = fromProviders(provider)
+
+    def 'should get correct codec'() {
+        expect:
+        provider.get(String, codecRegistry) == null
+
+        provider.get(BsonDocument, codecRegistry).class == BsonCodec
+        provider.get(BsonDocumentWrapper, codecRegistry).class == BsonCodec
+        provider.get(RawBsonDocument, codecRegistry).class == BsonCodec
+        provider.get(BsonDocumentSubclass, codecRegistry).class == BsonCodec
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/BsonCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/BsonCodecSpecification.groovy
new file mode 100644
index 00000000000..22add20813b
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/BsonCodecSpecification.groovy
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs
+
+
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWriter
+import org.bson.BsonReader
+import org.bson.codecs.configuration.CodecConfigurationException
+import org.bson.codecs.configuration.CodecRegistry
+import org.bson.conversions.Bson
+import spock.lang.Specification
+
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+
+class BsonCodecSpecification extends Specification {
+
+    def provider = new BsonCodecProvider()
+    def registry = fromProviders(provider)
+
+    def 'should encode Bson'() {
+        given:
+        def codec = new BsonCodec()
+        def customBson = new CustomBson()
+
+        when:
+        def writer = new BsonDocumentWriter(new BsonDocument())
+        writer.writeStartDocument()
+        writer.writeName('customBson')
+        codec.encode(writer, customBson, EncoderContext.builder().build())
+        writer.writeEndDocument()
+
+        then:
+        BsonDocument.parse('{a: 1, b:2}') == writer.getDocument().get('customBson')
+    }
+
+    def 'should throw CodecConfiguration exception if cannot encode Bson'() {
+        given:
+        def codec = new BsonCodec()
+        def customBson = new ExceptionRaisingBson()
+
+        when:
+        def writer = new BsonDocumentWriter(new BsonDocument())
+        writer.writeStartDocument()
+        writer.writeName('customBson')
+        codec.encode(writer, customBson, EncoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+    }
+
+    def 'should throw UnsupportedOperation exception if decode is called'() {
+        when:
+        new BsonCodec().decode(Stub(BsonReader), DecoderContext.builder().build())
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    class CustomBson implements Bson {
+        @Override
+        <TDocument> BsonDocument toBsonDocument(final Class<TDocument> clazz, final CodecRegistry codecRegistry) {
+            BsonDocument.parse('{a: 1, b: 2}')
+        }
+    }
+
+    class ExceptionRaisingBson implements Bson {
+        @Override
+        <TDocument> BsonDocument toBsonDocument(final Class<TDocument> clazz, final CodecRegistry codecRegistry) {
+           throw new Exception('Cannot encode')
+        }
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/BsonDocumentCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/BsonDocumentCodecSpecification.groovy
index bdfb179a42d..889ae17dccf 100644
--- a/bson/src/test/unit/org/bson/codecs/BsonDocumentCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/BsonDocumentCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import org.bson.BsonBinaryReader
 import org.bson.BsonBinaryWriter
 import org.bson.BsonBoolean
 import org.bson.BsonDateTime
+import org.bson.BsonDecimal128
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWriter
 import org.bson.BsonDouble
@@ -43,6 +44,7 @@ import org.bson.ByteBufNIO
 import org.bson.RawBsonDocument
 import org.bson.io.BasicOutputBuffer
 import org.bson.io.ByteBufferBsonInput
+import org.bson.types.Decimal128
 import org.bson.types.ObjectId
 import spock.lang.Specification
 
@@ -58,6 +60,7 @@ class BsonDocumentCodecSpecification extends Specification {
                         new BsonElement('null', new BsonNull()),
                         new BsonElement('int32', new BsonInt32(42)),
                         new BsonElement('int64', new BsonInt64(52L)),
+                        new BsonElement('decimal128', new BsonDecimal128(Decimal128.parse('1.0'))),
                         new BsonElement('boolean', new BsonBoolean(true)),
                         new BsonElement('date', new BsonDateTime(new Date().getTime())),
                         new BsonElement('double', new BsonDouble(62.0)),
@@ -93,6 +96,7 @@ class BsonDocumentCodecSpecification extends Specification {
         decodedDoc.get('null') == doc.get('null')
         decodedDoc.get('int32') == doc.get('int32')
         decodedDoc.get('int64') == doc.get('int64')
+        decodedDoc.get('decimal128') == doc.get('decimal128')
         decodedDoc.get('boolean') == doc.get('boolean')
         decodedDoc.get('date') == doc.get('date')
 //        decodedDoc.get('dbPointer') == doc.get('dbPointer')
diff --git a/bson/src/test/unit/org/bson/codecs/BsonDocumentSubclass.java b/bson/src/test/unit/org/bson/codecs/BsonDocumentSubclass.java
index 5ec5fb47c53..980f0ccf8a7 100644
--- a/bson/src/test/unit/org/bson/codecs/BsonDocumentSubclass.java
+++ b/bson/src/test/unit/org/bson/codecs/BsonDocumentSubclass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/codecs/BsonTypeClassMapSpecification.groovy b/bson/src/test/unit/org/bson/codecs/BsonTypeClassMapSpecification.groovy
new file mode 100644
index 00000000000..5f80719690d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/BsonTypeClassMapSpecification.groovy
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs
+
+import org.bson.BsonDbPointer
+import org.bson.BsonRegularExpression
+import org.bson.BsonTimestamp
+import org.bson.BsonType
+import org.bson.BsonUndefined
+import org.bson.Document
+import org.bson.types.Binary
+import org.bson.types.Code
+import org.bson.types.CodeWithScope
+import org.bson.types.Decimal128
+import org.bson.types.MaxKey
+import org.bson.types.MinKey
+import org.bson.types.ObjectId
+import org.bson.types.Symbol
+import spock.lang.Specification
+
+class BsonTypeClassMapSpecification extends Specification {
+    def 'should have defaults for all BSON types'() {
+        when:
+        def map = new BsonTypeClassMap()
+
+        then:
+        map.get(BsonType.BINARY) == Binary
+        map.get(BsonType.BOOLEAN) == Boolean
+        map.get(BsonType.DATE_TIME) == Date
+        map.get(BsonType.DB_POINTER) == BsonDbPointer
+        map.get(BsonType.DOCUMENT) == Document
+        map.get(BsonType.DOUBLE) == Double
+        map.get(BsonType.INT32) == Integer
+        map.get(BsonType.INT64) == Long
+        map.get(BsonType.DECIMAL128) == Decimal128
+        map.get(BsonType.MAX_KEY) == MaxKey
+        map.get(BsonType.MIN_KEY) == MinKey
+        map.get(BsonType.JAVASCRIPT) == Code
+        map.get(BsonType.JAVASCRIPT_WITH_SCOPE) == CodeWithScope
+        map.get(BsonType.OBJECT_ID) == ObjectId
+        map.get(BsonType.REGULAR_EXPRESSION) == BsonRegularExpression
+        map.get(BsonType.STRING) == String
+        map.get(BsonType.SYMBOL) == Symbol
+        map.get(BsonType.TIMESTAMP) == BsonTimestamp
+        map.get(BsonType.UNDEFINED) == BsonUndefined
+        map.get(BsonType.ARRAY) == List
+    }
+
+    def 'should obey replacements'() {
+        when:
+        def map = new BsonTypeClassMap([(BsonType.DATE_TIME): java.sql.Date])
+
+        then:
+        map.get(BsonType.DATE_TIME) == java.sql.Date
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/BsonTypeCodecMapSpecification.groovy b/bson/src/test/unit/org/bson/codecs/BsonTypeCodecMapSpecification.groovy
new file mode 100644
index 00000000000..a86ff0e5a41
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/BsonTypeCodecMapSpecification.groovy
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs
+
+import org.bson.BsonType
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
+
+class BsonTypeCodecMapSpecification extends Specification {
+    def bsonTypeClassMap = new BsonTypeClassMap()
+    def registry = fromRegistries(fromProviders(new DocumentCodecProvider(), new ValueCodecProvider(), new BsonValueCodecProvider()))
+    def bsonTypeCodecMap = new BsonTypeCodecMap(bsonTypeClassMap, registry)
+
+    def 'should map types to codecs'() {
+        expect:
+        bsonTypeCodecMap.get(BsonType.BINARY).class == BinaryCodec
+        bsonTypeCodecMap.get(BsonType.BOOLEAN).class == BooleanCodec
+        bsonTypeCodecMap.get(BsonType.DATE_TIME).class == DateCodec
+        bsonTypeCodecMap.get(BsonType.DB_POINTER).class == BsonDBPointerCodec
+        bsonTypeCodecMap.get(BsonType.DOCUMENT).class == DocumentCodec
+        bsonTypeCodecMap.get(BsonType.DOUBLE).class == DoubleCodec
+        bsonTypeCodecMap.get(BsonType.INT32).class == IntegerCodec
+        bsonTypeCodecMap.get(BsonType.INT64).class == LongCodec
+        bsonTypeCodecMap.get(BsonType.DECIMAL128).class == Decimal128Codec
+        bsonTypeCodecMap.get(BsonType.MAX_KEY).class == MaxKeyCodec
+        bsonTypeCodecMap.get(BsonType.MIN_KEY).class == MinKeyCodec
+        bsonTypeCodecMap.get(BsonType.JAVASCRIPT).class == CodeCodec
+        bsonTypeCodecMap.get(BsonType.JAVASCRIPT_WITH_SCOPE).class == CodeWithScopeCodec
+        bsonTypeCodecMap.get(BsonType.OBJECT_ID).class == ObjectIdCodec
+        bsonTypeCodecMap.get(BsonType.REGULAR_EXPRESSION).class == BsonRegularExpressionCodec
+        bsonTypeCodecMap.get(BsonType.STRING).class == StringCodec
+        bsonTypeCodecMap.get(BsonType.SYMBOL).class == SymbolCodec
+        bsonTypeCodecMap.get(BsonType.TIMESTAMP).class == BsonTimestampCodec
+        bsonTypeCodecMap.get(BsonType.UNDEFINED).class == BsonUndefinedCodec
+    }
+
+    def 'should throw exception for unmapped type'() {
+        when:
+        bsonTypeCodecMap.get(BsonType.NULL)
+
+        then:
+        thrown(CodecConfigurationException)
+    }
+
+    def 'should throw exception for unregistered codec'() {
+        when:
+        bsonTypeCodecMap.get(BsonType.ARRAY)
+
+        then:
+        thrown(CodecConfigurationException)
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/BsonValueCodecProviderSpecification.groovy b/bson/src/test/unit/org/bson/codecs/BsonValueCodecProviderSpecification.groovy
index ea844d9b07d..de01d107551 100644
--- a/bson/src/test/unit/org/bson/codecs/BsonValueCodecProviderSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/BsonValueCodecProviderSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import org.bson.BsonArray
 import org.bson.BsonBoolean
 import org.bson.BsonDateTime
 import org.bson.BsonDbPointer
+import org.bson.BsonDecimal128
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWrapper
 import org.bson.BsonDouble
@@ -36,6 +37,7 @@ import org.bson.BsonString
 import org.bson.BsonSymbol
 import org.bson.BsonTimestamp
 import org.bson.BsonUndefined
+import org.bson.RawBsonArray
 import org.bson.RawBsonDocument
 import spock.lang.Specification
 
@@ -55,6 +57,7 @@ class BsonValueCodecProviderSpecification extends Specification {
         provider.get(BsonDouble, codecRegistry).class == BsonDoubleCodec
         provider.get(BsonString, codecRegistry).class == BsonStringCodec
         provider.get(BsonBoolean, codecRegistry).class == BsonBooleanCodec
+        provider.get(BsonDecimal128, codecRegistry).class == BsonDecimal128Codec
 
         provider.get(BsonNull, codecRegistry).class == BsonNullCodec
         provider.get(BsonDateTime, codecRegistry).class == BsonDateTimeCodec
@@ -71,6 +74,7 @@ class BsonValueCodecProviderSpecification extends Specification {
         provider.get(BsonJavaScriptWithScope, codecRegistry).class == BsonJavaScriptWithScopeCodec
 
         provider.get(BsonArray, codecRegistry).class == BsonArrayCodec
+        provider.get(RawBsonArray, codecRegistry).class == BsonArrayCodec
 
         provider.get(BsonDocument, codecRegistry).class == BsonDocumentCodec
         provider.get(BsonDocumentWrapper, codecRegistry).class == BsonDocumentWrapperCodec
diff --git a/bson/src/test/unit/org/bson/codecs/ByteCodecTest.java b/bson/src/test/unit/org/bson/codecs/ByteCodecTest.java
new file mode 100644
index 00000000000..667c1308527
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/ByteCodecTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.junit.Test;
+
+public final class ByteCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripByteValues() {
+        roundTrip(new Document("a", Byte.MAX_VALUE));
+        roundTrip(new Document("a", Byte.MIN_VALUE));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", (byte) 10);
+        roundTrip(new Document("a", 10), expected);
+        roundTrip(new Document("a", 10.00), expected);
+        roundTrip(new Document("a", 9.9999999999999992), expected);
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMinRange() {
+        roundTrip(new Document("a", Integer.MIN_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMaxRange() {
+        roundTrip(new Document("a", Integer.MAX_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDoubleValues() {
+        roundTrip(new Document("a", 9.9999999999999991));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(Byte.class);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/CharacterCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/CharacterCodecSpecification.groovy
index b5eed939714..596fce92b54 100644
--- a/bson/src/test/unit/org/bson/codecs/CharacterCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/CharacterCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/codecs/CodeWithScopeSpecification.groovy b/bson/src/test/unit/org/bson/codecs/CodeWithScopeSpecification.groovy
index b8ef5a6cecd..5315843f040 100644
--- a/bson/src/test/unit/org/bson/codecs/CodeWithScopeSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/CodeWithScopeSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/codecs/CodecTestCase.java b/bson/src/test/unit/org/bson/codecs/CodecTestCase.java
new file mode 100644
index 00000000000..572a4e26f88
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/CodecTestCase.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonBinaryReader;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonType;
+import org.bson.BsonWriter;
+import org.bson.ByteBufNIO;
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.io.BasicOutputBuffer;
+import org.bson.io.ByteBufferBsonInput;
+import org.bson.io.OutputBuffer;
+
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+
+import static java.util.Arrays.asList;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.junit.Assert.assertEquals;
+
+abstract class CodecTestCase {
+
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return new DocumentCodecProvider();
+    }
+
+    CodecRegistry getRegistry() {
+        return fromProviders(asList(new ValueCodecProvider(), getDocumentCodecProvider()));
+    }
+
+    <T> void roundTrip(final T value) {
+        roundTrip(value, new DefaultComparator<T>(value));
+    }
+
+    <T> void roundTrip(final T value, final Comparator<T> comparator) {
+        roundTripWithRegistry(value, comparator, getRegistry());
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> void roundTripWithRegistry(final T value, final Comparator<T> comparator, final CodecRegistry codecRegistry) {
+        Codec<T> codec = (Codec<T>) codecRegistry.get(value.getClass());
+        OutputBuffer encoded = encode(codec, value);
+        T decoded = decode(codec, encoded);
+        comparator.apply(decoded);
+    }
+
+    public void roundTrip(final Document input, final Document expected) {
+        roundTrip(input, new Comparator<Document>() {
+            @Override
+            public void apply(final Document result) {
+                assertEquals("Codec Round Trip", expected, result);
+            }
+        });
+    }
+
+    <T> OutputBuffer encode(final Codec<T> codec, final T value) {
+        OutputBuffer buffer = new BasicOutputBuffer();
+        BsonWriter writer = new BsonBinaryWriter(buffer);
+        codec.encode(writer, value, EncoderContext.builder().build());
+        return buffer;
+    }
+
+    <T> T decode(final Codec<T> codec, final OutputBuffer buffer) {
+        BsonBinaryReader reader = new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(buffer.toByteArray()))));
+        return codec.decode(reader, DecoderContext.builder().build());
+    }
+
+    DocumentCodecProvider getSpecificNumberDocumentCodecProvider(final Class<? extends Number> clazz) {
+        HashMap<BsonType, Class<?>> replacements = new HashMap<BsonType, Class<?>>();
+        replacements.put(BsonType.DOUBLE, clazz);
+        replacements.put(BsonType.INT32, clazz);
+        replacements.put(BsonType.INT64, clazz);
+        replacements.put(BsonType.DECIMAL128, clazz);
+        return new DocumentCodecProvider(new BsonTypeClassMap(replacements));
+    }
+
+    interface Comparator<T> {
+        void apply(T result);
+    }
+
+    class DefaultComparator<T> implements Comparator<T> {
+        private final T original;
+
+        DefaultComparator(final T original) {
+            this.original = original;
+        }
+
+        @Override
+        public void apply(final T result) {
+            assertEquals("Codec Round Trip", original, result);
+        }
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/CodecTestUtil.java b/bson/src/test/unit/org/bson/codecs/CodecTestUtil.java
index c1be2469e24..54e0efee5b7 100644
--- a/bson/src/test/unit/org/bson/codecs/CodecTestUtil.java
+++ b/bson/src/test/unit/org/bson/codecs/CodecTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/codecs/DocumentCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/DocumentCodecSpecification.groovy
index 3f717e631fe..1902789325d 100644
--- a/bson/src/test/unit/org/bson/codecs/DocumentCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/DocumentCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ import org.bson.types.ObjectId
 import org.bson.types.Symbol
 import spock.lang.Shared
 import spock.lang.Specification
+import spock.lang.Unroll
 
 import java.nio.ByteBuffer
 import java.util.concurrent.atomic.AtomicBoolean
@@ -49,6 +50,12 @@ import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicLong
 
 import static java.util.Arrays.asList
+import static org.bson.UuidRepresentation.C_SHARP_LEGACY
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.PYTHON_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.UuidRepresentation.UNSPECIFIED
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class DocumentCodecSpecification extends Specification {
@@ -95,7 +102,7 @@ class DocumentCodecSpecification extends Specification {
         if (writer instanceof BsonDocumentWriter) {
             reader = new BsonDocumentReader(bsonDoc)
         } else if (writer instanceof BsonBinaryWriter) {
-            BasicOutputBuffer buffer = (BasicOutputBuffer)writer.getBsonOutput();
+            BasicOutputBuffer buffer = (BasicOutputBuffer)writer.getBsonOutput()
             reader = new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(
                     ByteBuffer.wrap(buffer.toByteArray()))))
         } else {
@@ -139,6 +146,67 @@ class DocumentCodecSpecification extends Specification {
         ]
     }
 
+    def 'should decode binary subtypes for UUID that are not 16 bytes into Binary'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def document = new DocumentCodec().decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == document.get('f')
+
+        where:
+        value                                            | bytes
+        new Binary((byte) 0x03, (byte[]) [115, 116, 11]) | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 3, 115, 116, 11, 0]
+        new Binary((byte) 0x04, (byte[]) [115, 116, 11]) | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 4, 115, 116, 11, 0]
+    }
+
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 3 for UUID'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def document = new DocumentCodec(fromCodecs(new UuidCodec(representation), new BinaryCodec()))
+                .withUuidRepresentation(representation)
+                .decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == document.get('f')
+
+        where:
+        representation | value                                                   | bytes
+        JAVA_LEGACY    | UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        C_SHARP_LEGACY | UUID.fromString('04030201-0605-0807-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        PYTHON_LEGACY  | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        STANDARD       | new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        UNSPECIFIED    | new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+    }
+
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 4 for UUID'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def document = new DocumentCodec().withUuidRepresentation(representation)
+                .decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == document.get('f')
+
+        where:
+        representation | value                                                   | bytes
+        STANDARD       | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        JAVA_LEGACY    | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        C_SHARP_LEGACY | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        PYTHON_LEGACY  | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        UNSPECIFIED    | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+    }
+
     def 'should respect encodeIdFirst property in encoder context'() {
         given:
         def originalDocument = new Document('x', 2)
diff --git a/bson/src/test/unit/org/bson/codecs/DocumentCodecTest.java b/bson/src/test/unit/org/bson/codecs/DocumentCodecTest.java
index 10066accac3..61a4f71618e 100644
--- a/bson/src/test/unit/org/bson/codecs/DocumentCodecTest.java
+++ b/bson/src/test/unit/org/bson/codecs/DocumentCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWithScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
@@ -72,6 +73,7 @@ public void testPrimitiveBSONTypeCodecs() throws IOException {
         doc.put("long", 2L);
         doc.put("string", "hello");
         doc.put("double", 3.2);
+        doc.put("decimal", Decimal128.parse("0.100"));
         doc.put("binary", new Binary(BsonBinarySubType.USER_DEFINED, new byte[]{0, 1, 2, 3}));
         doc.put("date", new Date(1000));
         doc.put("boolean", true);
diff --git a/bson/src/test/unit/org/bson/codecs/DoubleCodecTest.java b/bson/src/test/unit/org/bson/codecs/DoubleCodecTest.java
new file mode 100644
index 00000000000..cfceae50530
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/DoubleCodecTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.bson.types.Decimal128;
+import org.junit.Test;
+
+public final class DoubleCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripDoubleValues() {
+        roundTrip(new Document("a", Long.MAX_VALUE), new Document("a", (double) Long.MAX_VALUE));
+        roundTrip(new Document("a", Long.MIN_VALUE), new Document("a", (double) Long.MIN_VALUE));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", 10.00);
+        roundTrip(new Document("a", 10), expected);
+        roundTrip(new Document("a", 10L), expected);
+        roundTrip(new Document("a", Decimal128.parse("10")), expected);
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyLongValues() {
+        roundTrip(new Document("a", Long.MAX_VALUE - 1));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyLongValues2() {
+        roundTrip(new Document("a", Long.MIN_VALUE + 1));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDecimal128Values() {
+        roundTrip(new Document("a", Decimal128.parse("10.0")));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingNonExpressibleDecimal128Values() {
+        roundTrip(new Document("a", Decimal128.parse("NaN")));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(Double.class);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/FloatCodecTest.java b/bson/src/test/unit/org/bson/codecs/FloatCodecTest.java
new file mode 100644
index 00000000000..2d59798fefc
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/FloatCodecTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.bson.types.Decimal128;
+import org.junit.Test;
+
+public final class FloatCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripFloatValues() {
+        roundTrip(new Document("a", Float.MAX_VALUE));
+        roundTrip(new Document("a", -Float.MAX_VALUE));
+    }
+
+    @Test
+    public void shouldRoundTripNegativeFloatValues() {
+        roundTrip(new Document("a", -1f));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", 10f);
+        roundTrip(new Document("a", 10), expected);
+        roundTrip(new Document("a", 10L), expected);
+        roundTrip(new Document("a", 9.9999999999999992), expected);
+        roundTrip(new Document("a", Decimal128.parse("10")), expected);
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMinRange() {
+        roundTrip(new Document("a", -Double.MAX_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMaxRange() {
+        roundTrip(new Document("a", Double.MAX_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDecimal128Values() {
+        roundTrip(new Document("a", Decimal128.parse("10.0")));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(Float.class);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/IntegerCodecTest.java b/bson/src/test/unit/org/bson/codecs/IntegerCodecTest.java
new file mode 100644
index 00000000000..d71e27122e0
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/IntegerCodecTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.bson.types.Decimal128;
+import org.junit.Test;
+
+public final class IntegerCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripIntegerValues() {
+        roundTrip(new Document("a", Integer.MAX_VALUE));
+        roundTrip(new Document("a", Integer.MIN_VALUE));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", 10);
+        roundTrip(new Document("a", 10L), expected);
+        roundTrip(new Document("a", 10.00), expected);
+        roundTrip(new Document("a", 9.9999999999999992), expected);
+        roundTrip(new Document("a", Decimal128.parse("10")), expected);
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMinRange() {
+        roundTrip(new Document("a", Long.MIN_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMaxRange() {
+        roundTrip(new Document("a", Long.MAX_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDoubleValues() {
+        roundTrip(new Document("a", 9.9999999999999991));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDecimal128Values() {
+        roundTrip(new Document("a", Decimal128.parse("10.0")));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(Integer.class);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/IterableCodecProviderSpecification.groovy b/bson/src/test/unit/org/bson/codecs/IterableCodecProviderSpecification.groovy
index f3c6fcb25eb..b0eae796fc4 100644
--- a/bson/src/test/unit/org/bson/codecs/IterableCodecProviderSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/IterableCodecProviderSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,12 +7,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.bson.codecs
@@ -69,4 +68,4 @@ class IterableCodecProviderSpecification extends Specification {
         !first.equals(third)
         !second.equals(third)
     }
-}
\ No newline at end of file
+}
diff --git a/bson/src/test/unit/org/bson/codecs/IterableCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/IterableCodecSpecification.groovy
index 5a5e3e034e3..9391e2bc996 100644
--- a/bson/src/test/unit/org/bson/codecs/IterableCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/IterableCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,22 +7,30 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.bson.codecs
 
+
 import org.bson.BsonDocument
 import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.types.Binary
 import spock.lang.Specification
+import spock.lang.Unroll
 
 import static org.bson.BsonDocument.parse
+import static org.bson.UuidRepresentation.C_SHARP_LEGACY
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.PYTHON_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.UuidRepresentation.UNSPECIFIED
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class IterableCodecSpecification extends Specification {
@@ -68,6 +76,21 @@ class IterableCodecSpecification extends Specification {
         iterable == [1, 2, 3, null]
     }
 
+    def 'should decode a BSON array of arrays to an Iterable of Iterables'() {
+        given:
+        def codec = new IterableCodec(REGISTRY, new BsonTypeClassMap())
+        def reader = new BsonDocumentReader(parse('{array : [[1, 2], [3, 4, 5]]}'))
+
+        when:
+        reader.readStartDocument()
+        reader.readName('array')
+        def iterable = codec.decode(reader, DecoderContext.builder().build())
+        reader.readEndDocument()
+
+        then:
+        iterable == [[1, 2], [3, 4, 5]]
+    }
+
     def 'should use provided transformer'() {
         given:
         def codec = new IterableCodec(REGISTRY, new BsonTypeClassMap(), { Object from ->
@@ -85,10 +108,10 @@ class IterableCodecSpecification extends Specification {
         iterable == ['1', '2', '3']
     }
 
-    def 'should decode a BSON Binary with subtype of UIID_LEGACY to a UUID'() {
+    def 'should decode binary subtypes for UUID'() {
         given:
         def codec = new IterableCodec(REGISTRY, new BsonTypeClassMap(), null)
-        def reader = new BsonDocumentReader(parse('{array : [{ "$binary" : "D0dqZ20GeYvWzXdt0gkSlA==", "$type" : "3" }]}'))
+        def reader = new BsonDocumentReader(parse(document))
 
         when:
         reader.readStartDocument()
@@ -97,13 +120,23 @@ class IterableCodecSpecification extends Specification {
         reader.readEndDocument()
 
         then:
-        iterable == [UUID.fromString('8b79066d-676a-470f-9412-09d26d77cdd6')]
+        iterable == value
+
+        where:
+        document                                                                 | value
+        '{"array": [{ "$binary" : "c3QL", "$type" : "3" }]}'                     | [new Binary((byte) 0x03, (byte[]) [115, 116, 11])]
+        '{"array": [{ "$binary" : "c3QL", "$type" : "4" }]}'                     | [new Binary((byte) 0x04, (byte[]) [115, 116, 11])]
+        '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "3" }]}' | [UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09')]
+        '{"array": [{ "$binary" : "CAcGBQQDAgEQDw4NDAsKCQ==", "$type" : "3" }]}' | [UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')]
     }
 
-    def 'should decode a BSON Binary with subtype of UIID_STANDARD to a UUID'() {
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 3 for UUID'() {
         given:
-        def codec = new IterableCodec(REGISTRY, new BsonTypeClassMap(), null)
-        def reader = new BsonDocumentReader(parse('{array : [{ "$binary" : "i3kGbWdqRw+UEgnSbXfN1g==", "$type" : "4" }]}'))
+        def reader = new BsonDocumentReader(parse(document))
+        def codec = new IterableCodec(fromCodecs(new UuidCodec(representation), new BinaryCodec()), new BsonTypeClassMap())
+                .withUuidRepresentation(representation)
 
         when:
         reader.readStartDocument()
@@ -112,7 +145,40 @@ class IterableCodecSpecification extends Specification {
         reader.readEndDocument()
 
         then:
-        iterable == [UUID.fromString('8b79066d-676a-470f-9412-09d26d77cdd6')]
+        value == iterable
+
+        where:
+        representation | value                                                     | document
+        JAVA_LEGACY    | [UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09')] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "3" }]}'
+        C_SHARP_LEGACY | [UUID.fromString('04030201-0605-0807-090a-0b0c0d0e0f10')] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "3" }]}'
+        PYTHON_LEGACY  | [UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "3" }]}'
+        STANDARD       | [new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[])] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "3" }]}'
+        UNSPECIFIED    | [new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[])] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "3" }]}'
     }
 
-}
\ No newline at end of file
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 4 for UUID'() {
+        given:
+        def reader = new BsonDocumentReader(parse(document))
+        def codec = new IterableCodec(fromCodecs(new UuidCodec(representation), new BinaryCodec()), new BsonTypeClassMap())
+                .withUuidRepresentation(representation)
+
+        when:
+        reader.readStartDocument()
+        reader.readName('array')
+        def iterable = codec.decode(reader, DecoderContext.builder().build())
+        reader.readEndDocument()
+
+        then:
+        value == iterable
+
+        where:
+        representation | value                                                     | document
+        STANDARD       | [UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "4" }]}'
+        JAVA_LEGACY    | [UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "4" }]}'
+        C_SHARP_LEGACY | [new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[])] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "4" }]}'
+        PYTHON_LEGACY  | [new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[])] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "4" }]}'
+        UNSPECIFIED    | [new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[])] | '{"array": [{ "$binary" : "AQIDBAUGBwgJCgsMDQ4PEA==", "$type" : "4" }]}'
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/LongCodecTest.java b/bson/src/test/unit/org/bson/codecs/LongCodecTest.java
new file mode 100644
index 00000000000..07ac4cdede9
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/LongCodecTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.bson.types.Decimal128;
+import org.junit.Test;
+
+public final class LongCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripLongValues() {
+        roundTrip(new Document("a", Long.MAX_VALUE));
+        roundTrip(new Document("a", Long.MIN_VALUE));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", 10L);
+        roundTrip(new Document("a", 10), expected);
+        roundTrip(new Document("a", 10.00), expected);
+        roundTrip(new Document("a", 9.9999999999999992), expected);
+        roundTrip(new Document("a", Decimal128.parse("10")), expected);
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyValues() {
+        roundTrip(new Document("a", Double.MAX_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDoubleValues() {
+        roundTrip(new Document("a", 9.9999999999999991));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldThrowWhenHandlingLossyDecimal128Values() {
+        roundTrip(new Document("a", Decimal128.parse("10.0")));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(Long.class);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/MapCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/MapCodecSpecification.groovy
new file mode 100644
index 00000000000..bd74f1b5f55
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/MapCodecSpecification.groovy
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs
+
+import org.bson.BsonBinaryReader
+import org.bson.BsonBinaryWriter
+import org.bson.BsonDbPointer
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.BsonInt32
+import org.bson.BsonReader
+import org.bson.BsonRegularExpression
+import org.bson.BsonTimestamp
+import org.bson.BsonUndefined
+import org.bson.BsonWriter
+import org.bson.ByteBufNIO
+import org.bson.Document
+import org.bson.io.BasicOutputBuffer
+import org.bson.io.ByteBufferBsonInput
+import org.bson.json.JsonReader
+import org.bson.types.Binary
+import org.bson.types.Code
+import org.bson.types.CodeWithScope
+import org.bson.types.MaxKey
+import org.bson.types.MinKey
+import org.bson.types.ObjectId
+import org.bson.types.Symbol
+import spock.lang.Shared
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import java.nio.ByteBuffer
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+
+import static java.util.Arrays.asList
+import static org.bson.UuidRepresentation.C_SHARP_LEGACY
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.PYTHON_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.UuidRepresentation.UNSPECIFIED
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+
+class MapCodecSpecification extends Specification {
+    @Shared
+    BsonDocument bsonDoc = new BsonDocument()
+    @Shared
+    StringWriter stringWriter = new StringWriter()
+
+    def 'should encode and decode all default types with all readers and writers'(BsonWriter writer) {
+        given:
+        def originalDocument = [:]
+        originalDocument.with {
+            put('null', null)
+            put('int32', 42)
+            put('int64', 52L)
+            put('booleanTrue', true)
+            put('booleanFalse', false)
+            put('date', new Date())
+            put('dbPointer', new BsonDbPointer('foo.bar', new ObjectId()))
+            put('double', 62.0 as double)
+            put('minKey', new MinKey())
+            put('maxKey', new MaxKey())
+            put('code', new Code('int i = 0;'))
+            put('codeWithScope', new CodeWithScope('int x = y', new Document('y', 1)))
+            put('objectId', new ObjectId())
+            put('regex', new BsonRegularExpression('^test.*regex.*xyz$', 'i'))
+            put('string', 'the fox ...')
+            put('symbol', new Symbol('ruby stuff'))
+            put('timestamp', new BsonTimestamp(0x12345678, 5))
+            put('undefined', new BsonUndefined())
+            put('binary', new Binary((byte) 0x80, [5, 4, 3, 2, 1] as byte[]))
+            put('array', asList(1, 1L, true, [1, 2, 3], new Document('a', 1), null))
+            put('uuid', new UUID(1L, 2L))
+            put('document', new Document('a', 2))
+            put('map', [a:1, b:2])
+            put('atomicLong', new AtomicLong(1))
+            put('atomicInteger', new AtomicInteger(1))
+            put('atomicBoolean', new AtomicBoolean(true))
+        }
+
+        when:
+        new MapCodec().encode(writer, originalDocument, EncoderContext.builder().build())
+        BsonReader reader
+        if (writer instanceof BsonDocumentWriter) {
+            reader = new BsonDocumentReader(bsonDoc)
+        } else if (writer instanceof BsonBinaryWriter) {
+            BasicOutputBuffer buffer = (BasicOutputBuffer)writer.getBsonOutput();
+            reader = new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(
+                    ByteBuffer.wrap(buffer.toByteArray()))))
+        } else {
+            reader = new JsonReader(stringWriter.toString())
+        }
+        def decodedDoc = new MapCodec().decode(reader, DecoderContext.builder().build())
+
+        then:
+        decodedDoc.get('null') == originalDocument.get('null')
+        decodedDoc.get('int32') == originalDocument.get('int32')
+        decodedDoc.get('int64') == originalDocument.get('int64')
+        decodedDoc.get('booleanTrue') == originalDocument.get('booleanTrue')
+        decodedDoc.get('booleanFalse') == originalDocument.get('booleanFalse')
+        decodedDoc.get('date') == originalDocument.get('date')
+        decodedDoc.get('dbPointer') == originalDocument.get('dbPointer')
+        decodedDoc.get('double') == originalDocument.get('double')
+        decodedDoc.get('minKey') == originalDocument.get('minKey')
+        decodedDoc.get('maxKey') == originalDocument.get('maxKey')
+        decodedDoc.get('code') == originalDocument.get('code')
+        decodedDoc.get('codeWithScope') == originalDocument.get('codeWithScope')
+        decodedDoc.get('objectId') == originalDocument.get('objectId')
+        decodedDoc.get('regex') == originalDocument.get('regex')
+        decodedDoc.get('string') == originalDocument.get('string')
+        decodedDoc.get('symbol') == originalDocument.get('symbol')
+        decodedDoc.get('timestamp') == originalDocument.get('timestamp')
+        decodedDoc.get('undefined') == originalDocument.get('undefined')
+        decodedDoc.get('binary') == originalDocument.get('binary')
+        decodedDoc.get('uuid') == originalDocument.get('uuid')
+        decodedDoc.get('array') == originalDocument.get('array')
+        decodedDoc.get('document') == originalDocument.get('document')
+        decodedDoc.get('map') == originalDocument.get('map')
+        decodedDoc.get('atomicLong')  == ((AtomicLong) originalDocument.get('atomicLong')).get()
+        decodedDoc.get('atomicInteger')  == ((AtomicInteger) originalDocument.get('atomicInteger')).get()
+        decodedDoc.get('atomicBoolean') == ((AtomicBoolean) originalDocument.get('atomicBoolean')).get()
+
+        where:
+        writer << [
+                new BsonDocumentWriter(bsonDoc),
+                new BsonBinaryWriter(new BasicOutputBuffer())
+        ]
+    }
+
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 3 for UUID'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def map = new MapCodec(fromCodecs(new UuidCodec(representation), new BinaryCodec()))
+                .withUuidRepresentation(representation)
+                .decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == map.get('f')
+
+        where:
+        representation | value                                                   | bytes
+        JAVA_LEGACY    | UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        C_SHARP_LEGACY | UUID.fromString('04030201-0605-0807-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        PYTHON_LEGACY  | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        STANDARD       | new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        UNSPECIFIED    | new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+    }
+
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 4 for UUID'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def map = new MapCodec().withUuidRepresentation(representation)
+                .decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == map.get('f')
+
+        where:
+        representation | value                                                   | bytes
+        STANDARD       | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        JAVA_LEGACY    | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        C_SHARP_LEGACY | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        PYTHON_LEGACY  | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        UNSPECIFIED    | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+    }
+
+    def 'should apply transformer to decoded values'() {
+        given:
+        def codec = new MapCodec(fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()]),
+                                      new BsonTypeClassMap(),
+                                      { Object value -> 5 })
+        when:
+        def doc = codec.decode(new BsonDocumentReader(new BsonDocument('_id', new BsonInt32(1))), DecoderContext.builder().build())
+
+        then:
+        doc['_id'] == 5
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/OverridableUuidRepresentationUuidCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/OverridableUuidRepresentationUuidCodecSpecification.groovy
new file mode 100644
index 00000000000..1504b4e032a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/OverridableUuidRepresentationUuidCodecSpecification.groovy
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs
+
+import org.bson.UuidRepresentation
+import spock.lang.Specification
+
+class OverridableUuidRepresentationUuidCodecSpecification extends Specification{
+
+    def 'should change uuid representation'() {
+        when:
+        def codec = new OverridableUuidRepresentationUuidCodec()
+
+        then:
+        codec.getUuidRepresentation() == UuidRepresentation.JAVA_LEGACY
+
+        when:
+        def newCodec = codec.withUuidRepresentation(UuidRepresentation.STANDARD)
+
+        then:
+        newCodec instanceof OverridableUuidRepresentationCodec
+        (newCodec as OverridableUuidRepresentationCodec).getUuidRepresentation() == UuidRepresentation.STANDARD
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/RawBsonDocumentCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/RawBsonDocumentCodecSpecification.groovy
index 0cf70b386fc..eb3f1e7a9c3 100644
--- a/bson/src/test/unit/org/bson/codecs/RawBsonDocumentCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/RawBsonDocumentCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,4 +63,4 @@ class RawBsonDocumentCodecSpecification extends Specification {
         then:
         bytes == documentBytes
     }
-}
\ No newline at end of file
+}
diff --git a/bson/src/test/unit/org/bson/codecs/ShortCodecTest.java b/bson/src/test/unit/org/bson/codecs/ShortCodecTest.java
new file mode 100644
index 00000000000..3712f35176b
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/ShortCodecTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs;
+
+import org.bson.BsonInvalidOperationException;
+import org.bson.Document;
+import org.junit.Test;
+
+public final class ShortCodecTest extends CodecTestCase {
+
+    @Test
+    public void shouldRoundTripFloatValues() {
+        roundTrip(new Document("a", Short.MAX_VALUE));
+        roundTrip(new Document("a", Short.MIN_VALUE));
+    }
+
+    @Test
+    public void shouldHandleAlternativeNumberValues() {
+        Document expected = new Document("a", (short) 10);
+        roundTrip(new Document("a", 10), expected);
+        roundTrip(new Document("a", 10L), expected);
+        roundTrip(new Document("a", 10.00), expected);
+        roundTrip(new Document("a", 9.9999999999999992), expected);
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMinRange() {
+        roundTrip(new Document("a", Integer.MIN_VALUE));
+    }
+
+    @Test(expected = BsonInvalidOperationException.class)
+    public void shouldErrorDecodingOutsideMaxRange() {
+        roundTrip(new Document("a", Integer.MAX_VALUE));
+    }
+
+    @Override
+    DocumentCodecProvider getDocumentCodecProvider() {
+        return getSpecificNumberDocumentCodecProvider(Short.class);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/UndefinedCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/UndefinedCodecSpecification.groovy
index 33ade1f62a0..a6074f88731 100644
--- a/bson/src/test/unit/org/bson/codecs/UndefinedCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/UndefinedCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/codecs/UuidCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/UuidCodecSpecification.groovy
index 3039706e3bb..6f05e776af3 100644
--- a/bson/src/test/unit/org/bson/codecs/UuidCodecSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/UuidCodecSpecification.groovy
@@ -1,27 +1,28 @@
 /*
+ * Copyright 2008-present MongoDB, Inc.
  *
- *  * Copyright (c) 2008-2014 MongoDB, Inc.
- *  *
- *  * Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  *   http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.bson.codecs
 
 import org.bson.BsonBinaryReader
 import org.bson.BsonBinaryWriter
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWriter
 import org.bson.ByteBufNIO
 import org.bson.UuidRepresentation
+import org.bson.codecs.configuration.CodecConfigurationException
 import org.bson.io.BasicOutputBuffer
 import org.bson.io.ByteBufferBsonInput
 import spock.lang.Shared
@@ -29,6 +30,8 @@ import spock.lang.Specification
 
 import java.nio.ByteBuffer
 
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+
 /**
  *
  */
@@ -42,8 +45,12 @@ class UuidCodecSpecification extends Specification {
         outputBuffer = new BasicOutputBuffer();
     }
 
-    def 'should decode different types of UUID'(UuidCodec codec, byte[] list) throws IOException {
+    def 'should default to Java legacy representation'() {
+        expect:
+        new UuidCodec().getUuidRepresentation() == JAVA_LEGACY
+    }
 
+    def 'should decode different types of UUID'(UuidCodec codec, byte[] list) throws IOException {
         given:
 
         ByteBufferBsonInput inputBuffer = new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(list)))
@@ -104,7 +111,6 @@ class UuidCodecSpecification extends Specification {
                  5, 6, 7, 8, 3, 4, 1, 2,
                  16, 15, 14, 13, 12, 11, 10, 9], //8 bytes for long, 2 longs for UUID, Big Endian
         ]
-
     }
 
     def 'should encode different types of UUIDs'(Byte bsonSubType,
@@ -153,4 +159,15 @@ class UuidCodecSpecification extends Specification {
                 UUID.fromString('04030201-0605-0807-090a-0b0c0d0e0f10') // simulated C# UUID
         ]
     }
-}
\ No newline at end of file
+
+    def 'should throw if representation is unspecified'() {
+        given:
+        def codec = new UuidCodec(UuidRepresentation.UNSPECIFIED)
+
+        when:
+        codec.encode(new BsonDocumentWriter(new BsonDocument()), UUID.randomUUID(), EncoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/ValueCodecProviderSpecification.groovy b/bson/src/test/unit/org/bson/codecs/ValueCodecProviderSpecification.groovy
index 97102c33824..c20299715e0 100644
--- a/bson/src/test/unit/org/bson/codecs/ValueCodecProviderSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/ValueCodecProviderSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import org.bson.Document
 import org.bson.codecs.configuration.CodecRegistries
 import org.bson.types.Binary
 import org.bson.types.Code
+import org.bson.types.Decimal128
 import org.bson.types.MaxKey
 import org.bson.types.MinKey
 import org.bson.types.ObjectId
@@ -44,6 +45,8 @@ class ValueCodecProviderSpecification extends Specification {
         provider.get(Boolean, registry) instanceof BooleanCodec
         provider.get(Integer, registry) instanceof IntegerCodec
         provider.get(Long, registry) instanceof LongCodec
+        provider.get(Decimal128, registry) instanceof Decimal128Codec
+        provider.get(BigDecimal, registry) instanceof BigDecimalCodec
         provider.get(Double, registry) instanceof DoubleCodec
         provider.get(Character, registry) instanceof CharacterCodec
         provider.get(String, registry) instanceof StringCodec
@@ -60,7 +63,7 @@ class ValueCodecProviderSpecification extends Specification {
         provider.get(Code, registry) instanceof CodeCodec
         provider.get(ObjectId, registry) instanceof ObjectIdCodec
         provider.get(Symbol, registry) instanceof SymbolCodec
-        provider.get(UUID, registry) instanceof UuidCodec
+        provider.get(UUID, registry) instanceof OverridableUuidRepresentationCodec
 
         provider.get(Document, registry) == null
     }
diff --git a/bson/src/test/unit/org/bson/codecs/configuration/CodeRegistriesSpecification.groovy b/bson/src/test/unit/org/bson/codecs/configuration/CodeRegistriesSpecification.groovy
index db0aa0cb229..9754b24ed6c 100644
--- a/bson/src/test/unit/org/bson/codecs/configuration/CodeRegistriesSpecification.groovy
+++ b/bson/src/test/unit/org/bson/codecs/configuration/CodeRegistriesSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,6 +23,7 @@ import org.bson.codecs.IntegerCodec
 import org.bson.codecs.LongCodec
 import org.bson.codecs.UuidCodec
 import org.bson.codecs.ValueCodecProvider
+import org.bson.internal.ProvidersCodecRegistry
 import spock.lang.Specification
 
 import static CodecRegistries.fromCodecs
@@ -69,4 +70,4 @@ class CodeRegistriesSpecification extends Specification {
         registry.get(UUID).is(uuidCodec)
         registry.get(Integer) instanceof IntegerCodec
     }
-}
\ No newline at end of file
+}
diff --git a/bson/src/test/unit/org/bson/codecs/jsr310/InstantCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/jsr310/InstantCodecSpecification.groovy
new file mode 100644
index 00000000000..3ece437ce0a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/jsr310/InstantCodecSpecification.groovy
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310
+
+import org.bson.BsonDocument
+import org.bson.codecs.Codec
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.IgnoreIf
+
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+
+@IgnoreIf({ javaVersion < 1.8 })
+class InstantCodecSpecification extends JsrSpecification {
+
+    def 'should round trip Instant successfully'() {
+        when:
+        def writer = encode(instant)
+
+        then:
+        writer.getDocument().get('key').asDateTime().value == millis
+
+        when:
+        Instant actual = decode(writer)
+
+        then:
+        instant == actual
+
+        where:
+        instant                                                                             | millis
+        Instant.EPOCH                                                             | 0
+        LocalDateTime.of(2007, 10, 20, 0, 35).toInstant(ZoneOffset.UTC) | 1_192_840_500_000
+    }
+
+    def 'should wrap long overflow error in a CodecConfigurationException'() {
+        when:
+        encode(instant)
+
+        then:
+        def e = thrown(CodecConfigurationException)
+        e.getCause().getClass() == ArithmeticException
+
+        where:
+        instant << [
+            Instant.MIN,
+            Instant.MAX
+        ]
+    }
+
+    def 'should throw a CodecConfiguration exception if BsonType is invalid'() {
+        when:
+        decode(invalidDuration)
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidDuration << [
+                BsonDocument.parse('{key: "10 Minutes"}'),
+                BsonDocument.parse('{key: 10}')
+        ]
+    }
+
+    @Override
+    Codec<?> getCodec() {
+        new InstantCodec()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/jsr310/Jsr310CodecProviderSpecification.groovy b/bson/src/test/unit/org/bson/codecs/jsr310/Jsr310CodecProviderSpecification.groovy
new file mode 100644
index 00000000000..bf8999cf535
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/jsr310/Jsr310CodecProviderSpecification.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310
+
+import org.bson.codecs.configuration.CodecRegistry
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+class Jsr310CodecProviderSpecification extends Specification {
+
+    @IgnoreIf({ javaVersion < 1.8 })
+    def 'should provide a codec for all JSR-310 classes'() {
+        given:
+        def codecRegistry = Stub(CodecRegistry)
+        def provider = new Jsr310CodecProvider()
+
+        expect:
+        provider.get(clazz, codecRegistry) != null
+
+        where:
+        clazz << [
+            java.time.Instant,
+            java.time.LocalDate,
+            java.time.LocalDateTime,
+            java.time.LocalTime,
+        ]
+    }
+
+    @IgnoreIf({ javaVersion > 1.7 })
+    def 'should not error when used on pre java 8'() {
+        given:
+        def codecRegistry = Stub(CodecRegistry)
+        def provider = new Jsr310CodecProvider()
+
+        expect:
+        provider.get(Integer, codecRegistry) == null
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/jsr310/JsrSpecification.groovy b/bson/src/test/unit/org/bson/codecs/jsr310/JsrSpecification.groovy
new file mode 100644
index 00000000000..119869b3495
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/jsr310/JsrSpecification.groovy
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310
+
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.BsonReader
+import org.bson.codecs.Codec
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import spock.lang.Specification
+
+abstract class JsrSpecification extends Specification {
+
+    abstract Codec<?> getCodec()
+
+    def encode(jsrDateTime) {
+        def writer = new BsonDocumentWriter(new BsonDocument())
+        writer.writeStartDocument()
+        writer.writeName('key')
+        getCodec().encode(writer, jsrDateTime, EncoderContext.builder().build())
+        writer.writeEndDocument()
+        writer
+    }
+
+    def decode(BsonDocumentWriter writer) {
+        decode(writer.getDocument())
+    }
+
+    def decode(BsonDocument document) {
+        BsonReader bsonReader = new BsonDocumentReader(document)
+        bsonReader.readStartDocument()
+        bsonReader.readName()
+        getCodec().decode(bsonReader, DecoderContext.builder().build())
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/jsr310/LocalDateCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/jsr310/LocalDateCodecSpecification.groovy
new file mode 100644
index 00000000000..e418056cb8f
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/jsr310/LocalDateCodecSpecification.groovy
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310
+
+import org.bson.BsonDocument
+import org.bson.codecs.Codec
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.IgnoreIf
+
+import java.time.LocalDate
+
+@IgnoreIf({ javaVersion < 1.8 })
+class LocalDateCodecSpecification extends JsrSpecification {
+
+    def 'should round trip LocalDate successfully'() {
+        when:
+        def writer = encode(localDate)
+
+        then:
+        writer.getDocument().get('key').asDateTime().value == millis
+
+        when:
+        LocalDate actual = decode(writer)
+
+        then:
+        localDate == actual
+
+        where:
+        localDate                             | millis
+        LocalDate.of(2007, 10, 20)            | 1_192_838_400_000
+        LocalDate.ofEpochDay(0)               | 0
+        LocalDate.ofEpochDay(-99_999_999_999) | -99_999_999_999 * 86_400_000
+        LocalDate.ofEpochDay(99_999_999_999)  | 99_999_999_999 * 86_400_000
+    }
+
+    def 'should round trip different timezones the same'() {
+        given:
+        def defaultTimeZone = TimeZone.getDefault()
+        TimeZone.setDefault(TimeZone.getTimeZone(timeZone))
+        def localDate = LocalDate.ofEpochDay(0)
+
+        when:
+        def writer = encode(localDate)
+
+        then:
+        writer.getDocument().get('key').asDateTime().value == 0
+
+        when:
+        def actual = decode(writer)
+
+        then:
+        localDate == actual
+
+        cleanup:
+        TimeZone.setDefault(defaultTimeZone)
+
+        where:
+        timeZone << ['Pacific/Auckland', 'UTC', 'US/Hawaii']
+    }
+
+    def 'should wrap long overflow error in a CodecConfigurationException'() {
+        when:
+        encode(localDate)
+
+        then:
+        def e = thrown(CodecConfigurationException)
+        e.getCause().getClass() == ArithmeticException
+
+        where:
+        localDate << [
+                LocalDate.MIN,
+                LocalDate.MAX
+        ]
+    }
+
+    def 'should throw a CodecConfiguration exception if BsonType is invalid'() {
+        when:
+        decode(invalidDuration)
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidDuration << [
+                BsonDocument.parse('{key: "10 Minutes"}'),
+                BsonDocument.parse('{key: 10}')
+        ]
+    }
+
+    @Override
+    Codec<?> getCodec() {
+        new LocalDateCodec()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/jsr310/LocalDateTimeCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/jsr310/LocalDateTimeCodecSpecification.groovy
new file mode 100644
index 00000000000..1ba101af7ae
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/jsr310/LocalDateTimeCodecSpecification.groovy
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310
+
+import org.bson.BsonDocument
+import org.bson.codecs.Codec
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.IgnoreIf
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.ZoneOffset
+
+@IgnoreIf({ javaVersion < 1.8 })
+class LocalDateTimeCodecSpecification extends JsrSpecification {
+
+    def 'should round trip LocalDateTime successfully'() {
+        when:
+        def writer = encode(localDateTime)
+
+        then:
+        writer.getDocument().get('key').asDateTime().value == millis
+
+        when:
+        LocalDateTime actual = decode(writer)
+
+        then:
+        localDateTime  == actual
+
+        where:
+        localDateTime                                                   | millis
+        LocalDateTime.of(2007, 10, 20, 0, 35)                           | 1_192_840_500_000
+        LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.UTC)               | 0
+        LocalDateTime.ofEpochSecond(-99_999_999_999, 0, ZoneOffset.UTC) | -99_999_999_999 * 1000
+        LocalDateTime.ofEpochSecond(99_999_999_999, 0, ZoneOffset.UTC)  | 99_999_999_999 * 1000
+    }
+
+    def 'should round trip different timezones the same'() {
+        given:
+        def defaultTimeZone = TimeZone.getDefault()
+        TimeZone.setDefault(TimeZone.getTimeZone(timeZone))
+        def localDate = LocalDateTime.of(LocalDate.ofEpochDay(0), LocalTime.MIDNIGHT)
+
+        when:
+        def writer = encode(localDate)
+
+        then:
+        writer.getDocument().get('key').asDateTime().value == 0
+
+        when:
+        def actual = decode(writer)
+
+        then:
+        localDate == actual
+
+        cleanup:
+        TimeZone.setDefault(defaultTimeZone)
+
+        where:
+        timeZone << ['Pacific/Auckland', 'UTC', 'US/Hawaii']
+    }
+
+    def 'should wrap long overflow error in a CodecConfigurationException'() {
+        when:
+        encode(localDateTime)
+
+        then:
+        def e = thrown(CodecConfigurationException)
+        e.getCause().getClass() == ArithmeticException
+
+        where:
+        localDateTime  << [
+                LocalDateTime.MIN,
+                LocalDateTime.MAX
+        ]
+    }
+
+    def 'should throw a CodecConfiguration exception if BsonType is invalid'() {
+        when:
+        decode(invalidDuration)
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidDuration << [
+                BsonDocument.parse('{key: "10 Minutes"}'),
+                BsonDocument.parse('{key: 10}')
+        ]
+    }
+
+    @Override
+    Codec<?> getCodec() {
+        new LocalDateTimeCodec()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/jsr310/LocalTimeCodecSpecification.groovy b/bson/src/test/unit/org/bson/codecs/jsr310/LocalTimeCodecSpecification.groovy
new file mode 100644
index 00000000000..1ad1534ae00
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/jsr310/LocalTimeCodecSpecification.groovy
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.jsr310
+
+import org.bson.BsonDocument
+import org.bson.codecs.Codec
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.IgnoreIf
+
+import java.time.LocalTime
+
+@IgnoreIf({ javaVersion < 1.8 })
+class LocalTimeCodecSpecification extends JsrSpecification {
+
+    def 'should round trip LocalTime successfully'() {
+        when:
+        def writer = encode(localTime)
+
+        then:
+        writer.getDocument().get('key').asDateTime().value == millis
+
+        when:
+        LocalTime actual = decode(writer)
+
+        then:
+        localTime == actual
+
+        where:
+        localTime                             | millis
+        LocalTime.MIN                         | 0
+        LocalTime.of(23, 59, 59, 999_000_000) | 86_399_999
+    }
+
+    def 'should round trip different timezones the same'() {
+        given:
+        def defaultTimeZone = TimeZone.getDefault()
+        TimeZone.setDefault(TimeZone.getTimeZone(timeZone))
+        def localDate = LocalTime.MIDNIGHT
+
+        when:
+        def writer = encode(localDate)
+
+        then:
+        writer.getDocument().get('key').asDateTime().value == 0
+
+        when:
+        def actual = decode(writer)
+
+        then:
+        localDate == actual
+
+        cleanup:
+        TimeZone.setDefault(defaultTimeZone)
+
+        where:
+        timeZone << ['Pacific/Auckland', 'UTC', 'US/Hawaii']
+    }
+
+    def 'should throw a CodecConfiguration exception if BsonType is invalid'() {
+        when:
+        decode(invalidDuration)
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidDuration << [
+            BsonDocument.parse('{key: "10:00"}')
+        ]
+    }
+
+    @Override
+    Codec<?> getCodec() {
+        new LocalTimeCodec()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/ClassModelBuilderTest.java b/bson/src/test/unit/org/bson/codecs/pojo/ClassModelBuilderTest.java
new file mode 100644
index 00000000000..f83e4720f34
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/ClassModelBuilderTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.bson.codecs.pojo.entities.ConcreteCollectionsModel;
+import org.bson.codecs.pojo.entities.GenericHolderModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderModel;
+import org.bson.codecs.pojo.entities.SimpleGenericsModel;
+import org.bson.codecs.pojo.entities.SimpleIdModel;
+import org.bson.codecs.pojo.entities.UpperBoundsModel;
+import org.bson.codecs.pojo.entities.UpperBoundsConcreteModel;
+import org.junit.Test;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+@SuppressWarnings("rawtypes")
+public final class ClassModelBuilderTest {
+
+    @Test
+    public void testDefaults() {
+        Class<SimpleGenericsModel> clazz = SimpleGenericsModel.class;
+        ClassModelBuilder<SimpleGenericsModel> builder = ClassModel.builder(clazz);
+        assertEquals(4, builder.getPropertyModelBuilders().size());
+        for (Field field : clazz.getDeclaredFields()) {
+            assertEquals(field.getName(), builder.getProperty(field.getName()).getWriteName());
+        }
+
+        Map<String, TypeParameterMap> fieldNameToTypeParameterMap = new HashMap<String, TypeParameterMap>();
+        fieldNameToTypeParameterMap.put("myIntegerField", TypeParameterMap.builder().build());
+        fieldNameToTypeParameterMap.put("myGenericField", TypeParameterMap.builder().addIndex(0).build());
+        fieldNameToTypeParameterMap.put("myListField", TypeParameterMap.builder().addIndex(0, 1).build());
+        fieldNameToTypeParameterMap.put("myMapField", TypeParameterMap.builder().addIndex(1, 2).build());
+
+        assertEquals(fieldNameToTypeParameterMap, builder.getPropertyNameToTypeParameterMap());
+        assertEquals(3, builder.getConventions().size());
+        assertTrue(builder.getAnnotations().isEmpty());
+        assertEquals(clazz, builder.getType());
+        assertNull(builder.getIdPropertyName());
+        assertFalse(builder.useDiscriminator());
+        assertNull(builder.getDiscriminator());
+    }
+
+    @Test
+    public void testCanReflectObjectClass() {
+        Class<Object> clazz = Object.class;
+        ClassModelBuilder<Object> builder = ClassModel.builder(clazz);
+
+        assertEquals(0, builder.getPropertyModelBuilders().size());
+        assertTrue(builder.getPropertyNameToTypeParameterMap().isEmpty());
+        assertEquals(3, builder.getConventions().size());
+        assertTrue(builder.getAnnotations().isEmpty());
+        assertEquals(clazz, builder.getType());
+        assertNull(builder.getIdPropertyName());
+        assertFalse(builder.useDiscriminator());
+        assertNull(builder.getDiscriminator());
+    }
+
+    @Test
+    public void testMappedBoundedClasses() {
+        ClassModelBuilder<? extends UpperBoundsModel> builder = ClassModel.builder(UpperBoundsModel.class);
+        assertEquals(Number.class, builder.getProperty("myGenericField").getTypeData().getType());
+
+        builder = ClassModel.builder(UpperBoundsConcreteModel.class);
+        assertEquals(Long.class, builder.getProperty("myGenericField").getTypeData().getType());
+    }
+
+    @Test
+    public void testNestedGenericHolderModel() {
+        ClassModelBuilder<NestedGenericHolderModel> builder =
+                ClassModel.builder(NestedGenericHolderModel.class);
+        assertEquals(GenericHolderModel.class, builder.getProperty("nested").getTypeData().getType());
+        assertEquals(TypeData.builder(GenericHolderModel.class).addTypeParameter(TypeData.builder(String.class).build()).build(),
+                builder.getProperty("nested").getTypeData());
+    }
+
+    @Test
+    public void testFieldsMappedClassTypes() {
+        ClassModelBuilder<ConcreteCollectionsModel> builder =
+                ClassModel.builder(ConcreteCollectionsModel.class);
+
+        assertEquals(Collection.class, builder.getProperty("collection").getTypeData().getType());
+        assertEquals(List.class, builder.getProperty("list").getTypeData().getType());
+        assertEquals(LinkedList.class, builder.getProperty("linked").getTypeData().getType());
+        assertEquals(Map.class, builder.getProperty("map").getTypeData().getType());
+        assertEquals(ConcurrentHashMap.class, builder.getProperty("concurrent").getTypeData().getType());
+    }
+
+    @Test
+    public void testOverrides() throws NoSuchFieldException {
+        ClassModelBuilder<SimpleGenericsModel> builder = ClassModel.<SimpleGenericsModel>builder(SimpleGenericsModel.class)
+                .annotations(TEST_ANNOTATIONS)
+                .conventions(TEST_CONVENTIONS)
+                .discriminatorKey("_cls")
+                .discriminator("myColl")
+                .enableDiscriminator(true)
+                .idPropertyName("myIntegerField")
+                .instanceCreatorFactory(TEST_INSTANCE_CREATOR_FACTORY);
+
+        assertEquals(TEST_ANNOTATIONS, builder.getAnnotations());
+        assertEquals(TEST_CONVENTIONS, builder.getConventions());
+        assertEquals("myIntegerField", builder.getIdPropertyName());
+        assertEquals(SimpleGenericsModel.class, builder.getType());
+        assertTrue(builder.useDiscriminator());
+        assertEquals("_cls", builder.getDiscriminatorKey());
+        assertEquals("myColl", builder.getDiscriminator());
+        assertEquals(TEST_INSTANCE_CREATOR_FACTORY, builder.getInstanceCreatorFactory());
+    }
+
+    @Test
+    public void testCanRemoveField() {
+        ClassModelBuilder<SimpleGenericsModel> builder = ClassModel.builder(SimpleGenericsModel.class)
+                .idPropertyName("ID");
+        assertEquals(4, builder.getPropertyModelBuilders().size());
+        builder.removeProperty("myIntegerField");
+        assertEquals(3, builder.getPropertyModelBuilders().size());
+
+        builder.removeProperty("myIntegerField");
+        assertEquals(3, builder.getPropertyModelBuilders().size());
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testValidationIdProperty() {
+        ClassModel.builder(SimpleGenericsModel.class).idPropertyName("ID").build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testValidationDuplicateDocumentFieldName() {
+        ClassModelBuilder<SimpleGenericsModel> builder = ClassModel.builder(SimpleGenericsModel.class);
+        builder.getProperty("myIntegerField").writeName("myGenericField");
+        builder.build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testDifferentTypeIdGenerator() {
+        ClassModel.builder(SimpleIdModel.class)
+                .idGenerator(new IdGenerator<String>() {
+                    @Override
+                    public String generate() {
+                        return "id";
+                    }
+
+                    @Override
+                    public Class<String> getType() {
+                        return String.class;
+                    }
+                }).build();
+    }
+
+    private static final List<Annotation> TEST_ANNOTATIONS = Collections.<Annotation>singletonList(
+            new BsonProperty() {
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return BsonProperty.class;
+                }
+
+                @Override
+                public String value() {
+                    return "";
+                }
+
+                @Override
+                public boolean useDiscriminator() {
+                    return true;
+                }
+            });
+
+    private static final List<Convention> TEST_CONVENTIONS = Collections.<Convention>singletonList(
+            new Convention() {
+                @Override
+                public void apply(final ClassModelBuilder<?> builder) {
+                }
+            });
+
+    private static final InstanceCreatorFactory<SimpleGenericsModel> TEST_INSTANCE_CREATOR_FACTORY =
+            new InstanceCreatorFactory<SimpleGenericsModel>() {
+                @Override
+                public InstanceCreator<SimpleGenericsModel> create() {
+                    return null;
+                }
+            };
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/ClassModelTest.java b/bson/src/test/unit/org/bson/codecs/pojo/ClassModelTest.java
new file mode 100644
index 00000000000..7cc687bf449
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/ClassModelTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.pojo.entities.CollectionNestedPojoModel;
+import org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel;
+import org.bson.codecs.pojo.entities.GenericHolderModel;
+import org.bson.codecs.pojo.entities.InterfaceBasedModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderMapModel;
+import org.bson.codecs.pojo.entities.PropertySelectionModel;
+import org.bson.codecs.pojo.entities.ShapeHolderCircleModel;
+import org.bson.codecs.pojo.entities.ShapeHolderModel;
+import org.bson.codecs.pojo.entities.ShapeModelAbstract;
+import org.bson.codecs.pojo.entities.ShapeModelCircle;
+import org.bson.codecs.pojo.entities.SimpleGenericsModel;
+import org.bson.codecs.pojo.entities.SimpleModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationInheritedModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationModel;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public final class ClassModelTest {
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testSimpleGenericsModel() {
+        ClassModel<?> classModel = ClassModel.builder(SimpleGenericsModel.class).build();
+
+        assertEquals("SimpleGenericsModel", classModel.getName());
+        assertEquals(SimpleGenericsModel.class, classModel.getType());
+        assertFalse(classModel.useDiscriminator());
+        assertEquals("_t", classModel.getDiscriminatorKey());
+        assertEquals("org.bson.codecs.pojo.entities.SimpleGenericsModel", classModel.getDiscriminator());
+        assertNull(classModel.getIdPropertyModel());
+        assertEquals(4, classModel.getPropertyModels().size());
+        assertTrue(classModel.getInstanceCreatorFactory() instanceof InstanceCreatorFactoryImpl);
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testCollectionNestedPojoModelPropertyTypes() {
+        TypeData<String> string = TypeData.builder(String.class).build();
+        TypeData<SimpleModel> simple = TypeData.builder(SimpleModel.class).build();
+        TypeData<List> list = TypeData.builder(List.class).addTypeParameter(simple).build();
+        TypeData<List> listList = TypeData.builder(List.class).addTypeParameter(list).build();
+        TypeData<Set> set = TypeData.builder(Set.class).addTypeParameter(simple).build();
+        TypeData<Set> setSet = TypeData.builder(Set.class).addTypeParameter(set).build();
+        TypeData<Map> map = TypeData.builder(Map.class).addTypeParameter(string).addTypeParameter(simple).build();
+        TypeData<List> listMap = TypeData.builder(List.class).addTypeParameter(map).build();
+        TypeData<Map> mapMap = TypeData.builder(Map.class).addTypeParameter(string).addTypeParameter(map).build();
+        TypeData<Map> mapList = TypeData.builder(Map.class).addTypeParameter(string).addTypeParameter(list).build();
+        TypeData<Map> mapListMap = TypeData.builder(Map.class).addTypeParameter(string).addTypeParameter(listMap).build();
+        TypeData<Map> mapSet = TypeData.builder(Map.class).addTypeParameter(string).addTypeParameter(set).build();
+        TypeData<List> listMapList = TypeData.builder(List.class).addTypeParameter(mapList).build();
+        TypeData<List> listMapSet = TypeData.builder(List.class).addTypeParameter(mapSet).build();
+
+        ClassModel<?> classModel = ClassModel.builder(CollectionNestedPojoModel.class).build();
+        assertEquals(list, classModel.getPropertyModel("listSimple").getTypeData());
+        assertEquals(listList, classModel.getPropertyModel("listListSimple").getTypeData());
+
+        assertEquals(set, classModel.getPropertyModel("setSimple").getTypeData());
+        assertEquals(setSet, classModel.getPropertyModel("setSetSimple").getTypeData());
+
+        assertEquals(map, classModel.getPropertyModel("mapSimple").getTypeData());
+        assertEquals(mapMap, classModel.getPropertyModel("mapMapSimple").getTypeData());
+
+        assertEquals(mapList, classModel.getPropertyModel("mapListSimple").getTypeData());
+        assertEquals(mapListMap, classModel.getPropertyModel("mapListMapSimple").getTypeData());
+        assertEquals(mapSet, classModel.getPropertyModel("mapSetSimple").getTypeData());
+
+        assertEquals(listMap, classModel.getPropertyModel("listMapSimple").getTypeData());
+        assertEquals(listMapList, classModel.getPropertyModel("listMapListSimple").getTypeData());
+        assertEquals(listMapSet, classModel.getPropertyModel("listMapSetSimple").getTypeData());
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testWildcardModel() {
+        TypeData<InterfaceBasedModel> model = TypeData.builder(InterfaceBasedModel.class).build();
+        TypeData<List> wildcard = TypeData.builder(List.class).addTypeParameter(model).build();
+        ClassModel<?> classModel = ClassModel.builder(ConcreteAndNestedAbstractInterfaceModel.class).build();
+        assertEquals(wildcard, classModel.getPropertyModel("wildcardList").getTypeData());
+    }
+
+    @Test
+    public void testPropertySelection() {
+        ClassModel<PropertySelectionModel> classModel = ClassModel.builder(PropertySelectionModel.class).build();
+
+        assertEquals(2, classModel.getPropertyModels().size());
+        assertNotNull(classModel.getPropertyModel("stringField"));
+        assertNotNull(classModel.getPropertyModel("finalStringField"));
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testMappingConcreteGenericTypes() {
+        TypeData<String> string = TypeData.builder(String.class).build();
+        TypeData<SimpleModel> simple = TypeData.builder(SimpleModel.class).build();
+        TypeData<Map> map = TypeData.builder(Map.class).addTypeParameter(string).addTypeParameter(simple).build();
+        TypeData<GenericHolderModel> genericHolder = TypeData.builder(GenericHolderModel.class).addTypeParameter(map).build();
+
+        ClassModel<?> classModel = ClassModel.builder(NestedGenericHolderMapModel.class).build();
+        assertEquals(genericHolder, classModel.getPropertyModels().get(0).getTypeData());
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testMappingSimpleGenericsModelTypes() {
+        TypeData<Object> object = TypeData.builder(Object.class).build();
+        TypeData<Integer> integer = TypeData.builder(Integer.class).build();
+        TypeData<String> string = TypeData.builder(String.class).build();
+        TypeData<List> list = TypeData.builder(List.class).addTypeParameter(object).build();
+        TypeData<Map> map = TypeData.builder(Map.class).addTypeParameter(string).addTypeParameter(object).build();
+
+        ClassModel<?> classModel = ClassModel.builder(SimpleGenericsModel.class).build();
+        assertEquals(integer, classModel.getPropertyModel("myIntegerField").getTypeData());
+        assertEquals(object, classModel.getPropertyModel("myGenericField").getTypeData());
+        assertEquals(list, classModel.getPropertyModel("myListField").getTypeData());
+        assertEquals(map, classModel.getPropertyModel("myMapField").getTypeData());
+    }
+
+    @Test
+    public void testAnnotationModel() {
+        ClassModel<?> classModel = ClassModel.builder(AnnotationModel.class).build();
+        PropertyModel<?> propertyModel = classModel.getIdPropertyModel();
+
+        assertEquals("AnnotationModel", classModel.getName());
+        assertEquals(AnnotationModel.class, classModel.getType());
+        assertTrue(classModel.useDiscriminator());
+        assertEquals("_cls", classModel.getDiscriminatorKey());
+        assertEquals("MyAnnotationModel", classModel.getDiscriminator());
+        assertEquals(propertyModel, classModel.getIdPropertyModel());
+        assertEquals(3, classModel.getPropertyModels().size());
+        assertEquals(propertyModel, classModel.getPropertyModel("customId"));
+        assertTrue(classModel.getInstanceCreatorFactory() instanceof InstanceCreatorFactoryImpl);
+    }
+
+    @Test
+    public void testInheritedClassAnnotations() {
+        ClassModel<?> classModel = ClassModel.builder(AnnotationInheritedModel.class).build();
+        assertTrue(classModel.useDiscriminator());
+        assertEquals("_cls", classModel.getDiscriminatorKey());
+        assertEquals("org.bson.codecs.pojo.entities.conventions.AnnotationInheritedModel", classModel.getDiscriminator());
+
+        assertEquals(2, classModel.getPropertyModels().size());
+
+        PropertyModel<?> propertyModel = classModel.getPropertyModel("customId");
+        assertEquals(propertyModel, classModel.getIdPropertyModel());
+
+        propertyModel = classModel.getPropertyModel("child");
+        assertTrue(propertyModel.useDiscriminator());
+    }
+
+    @Test
+    public void testOverridePropertyWithSubclass() {
+        ClassModel<?> classModel = ClassModel.builder(ShapeHolderModel.class).build();
+        assertEquals(1, classModel.getPropertyModels().size());
+        assertEquals(ShapeModelAbstract.class, classModel.getPropertyModels().get(0).getTypeData().getType());
+
+        ClassModel<?> overriddenImplementationClassModel = ClassModel.builder(ShapeHolderCircleModel.class).build();
+        assertEquals(1, classModel.getPropertyModels().size());
+        assertEquals(ShapeModelCircle.class, overriddenImplementationClassModel.getPropertyModels().get(0).getTypeData().getType());
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/ConventionsTest.java b/bson/src/test/unit/org/bson/codecs/pojo/ConventionsTest.java
new file mode 100644
index 00000000000..e39dc862712
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/ConventionsTest.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.pojo.entities.SimpleModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationBsonPropertyIdModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationCollision;
+import org.bson.codecs.pojo.entities.conventions.AnnotationDefaultsModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationNameCollision;
+import org.bson.codecs.pojo.entities.conventions.AnnotationWithObjectIdModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationWriteCollision;
+import org.bson.codecs.pojo.entities.conventions.BsonIgnoreDuplicatePropertyMultipleTypes;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidConstructorModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidMethodModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidMethodReturnTypeModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidMultipleConstructorsModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidMultipleCreatorsModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidMultipleStaticCreatorsModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidTypeConstructorModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidTypeMethodModel;
+import org.junit.Test;
+
+import static java.util.Collections.singletonList;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import static org.bson.codecs.pojo.Conventions.ANNOTATION_CONVENTION;
+import static org.bson.codecs.pojo.Conventions.CLASS_AND_PROPERTY_CONVENTION;
+import static org.bson.codecs.pojo.Conventions.DEFAULT_CONVENTIONS;
+import static org.bson.codecs.pojo.Conventions.NO_CONVENTIONS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public final class ConventionsTest {
+
+    @Test
+    public void testDefaultConventions() {
+        ClassModel<AnnotationWithObjectIdModel> classModel = ClassModel.builder(AnnotationWithObjectIdModel.class)
+                .conventions(DEFAULT_CONVENTIONS).build();
+
+        assertTrue(classModel.useDiscriminator());
+        assertEquals("_cls", classModel.getDiscriminatorKey());
+        assertEquals("MyAnnotationModel", classModel.getDiscriminator());
+
+        assertEquals(3, classModel.getPropertyModels().size());
+        PropertyModel<?> idPropertyModel = classModel.getIdPropertyModel();
+        assertNotNull(idPropertyModel);
+        assertEquals("customId", idPropertyModel.getName());
+        assertEquals("_id", idPropertyModel.getWriteName());
+        assertEquals(classModel.getIdPropertyModelHolder().getIdGenerator(), IdGenerators.OBJECT_ID_GENERATOR);
+
+        PropertyModel<?> childPropertyModel = classModel.getPropertyModel("child");
+        assertNotNull(childPropertyModel);
+        assertFalse(childPropertyModel.useDiscriminator());
+
+        PropertyModel<?> renamedPropertyModel = classModel.getPropertyModel("alternative");
+        assertEquals("renamed", renamedPropertyModel.getReadName());
+        assertEquals("renamed", renamedPropertyModel.getWriteName());
+    }
+
+    @Test
+    public void testAnnotationDefaults() {
+        ClassModel<AnnotationDefaultsModel> classModel = ClassModel.builder(AnnotationDefaultsModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+
+        assertTrue(classModel.useDiscriminator());
+        assertEquals("_t", classModel.getDiscriminatorKey());
+        assertEquals("AnnotationDefaultsModel", classModel.getDiscriminator());
+
+        assertEquals(2, classModel.getPropertyModels().size());
+        PropertyModel<?> idPropertyModel = classModel.getIdPropertyModel();
+        assertNotNull(idPropertyModel);
+        assertEquals("customId", idPropertyModel.getName());
+        assertEquals("_id", idPropertyModel.getWriteName());
+
+        PropertyModel<?> childPropertyModel = classModel.getPropertyModel("child");
+        assertNotNull(childPropertyModel);
+        assertFalse(childPropertyModel.useDiscriminator());
+    }
+
+    @Test
+    public void testBsonPropertyIdModelModel() {
+        ClassModel<AnnotationBsonPropertyIdModel> classModel = ClassModel.builder(AnnotationBsonPropertyIdModel.class)
+                .conventions(DEFAULT_CONVENTIONS).build();
+
+        assertFalse(classModel.useDiscriminator());
+        assertEquals(1, classModel.getPropertyModels().size());
+        assertNull(classModel.getIdPropertyModel());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testClassAndFieldConventionDoesNotOverwrite() {
+        ClassModelBuilder<SimpleModel> builder = ClassModel.builder(SimpleModel.class)
+                .enableDiscriminator(true)
+                .discriminatorKey("_cls")
+                .discriminator("Simples")
+                .conventions(singletonList(CLASS_AND_PROPERTY_CONVENTION))
+                .instanceCreatorFactory(new InstanceCreatorFactory<SimpleModel>() {
+                    @Override
+                    public InstanceCreator<SimpleModel> create() {
+                        return null;
+                    }
+                });
+
+        PropertyModelBuilder<Integer> propertyModelBuilder = (PropertyModelBuilder<Integer>) builder.getProperty("integerField");
+        propertyModelBuilder.writeName("id")
+                .propertySerialization(new PropertyModelSerializationImpl<Integer>())
+                .propertyAccessor(new PropertyAccessorTest<Integer>());
+
+        PropertyModelBuilder<String> propertyModelBuilder2 = (PropertyModelBuilder<String>) builder.getProperty("stringField");
+        propertyModelBuilder2.writeName("_id")
+                .propertySerialization(new PropertyModelSerializationImpl<String>())
+                .propertyAccessor(new PropertyAccessorTest<String>());
+
+        ClassModel<SimpleModel> classModel  = builder.idPropertyName("stringField").build();
+
+        assertTrue(classModel.useDiscriminator());
+        assertEquals("_cls", classModel.getDiscriminatorKey());
+        assertEquals("Simples", classModel.getDiscriminator());
+
+        assertEquals(2, classModel.getPropertyModels().size());
+        PropertyModel<?> idPropertyModel = classModel.getIdPropertyModel();
+        assertEquals("stringField", idPropertyModel.getName());
+        assertEquals("_id", idPropertyModel.getWriteName());
+        assertNull(idPropertyModel.useDiscriminator());
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testAnnotationCollision() {
+        ClassModel.builder(AnnotationCollision.class).conventions(DEFAULT_CONVENTIONS).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testAnnotationWriteCollision() {
+        ClassModel.builder(AnnotationWriteCollision.class).conventions(DEFAULT_CONVENTIONS).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testAnnotationNameCollision() {
+        ClassModel.builder(AnnotationNameCollision.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidConstructorModel() {
+        ClassModel.builder(CreatorInvalidConstructorModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidMethodModel() {
+        ClassModel.builder(CreatorInvalidMethodModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidMultipleConstructorsModel() {
+        ClassModel.builder(CreatorInvalidMultipleConstructorsModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidMultipleCreatorsModel() {
+        ClassModel.builder(CreatorInvalidMultipleCreatorsModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidMultipleStaticCreatorsModel() {
+        ClassModel.builder(CreatorInvalidMultipleStaticCreatorsModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidMethodReturnTypeModel() {
+        ClassModel.builder(CreatorInvalidMethodReturnTypeModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidTypeConstructorModel() {
+        ClassModel.builder(CreatorInvalidTypeConstructorModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorInvalidTypeMethodModel() {
+        ClassModel.builder(CreatorInvalidTypeMethodModel.class)
+                .conventions(singletonList(ANNOTATION_CONVENTION)).build();
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testBsonIgnoreDuplicatePropertyMultipleTypesModel() {
+        ClassModel.builder(BsonIgnoreDuplicatePropertyMultipleTypes.class)
+                .conventions(NO_CONVENTIONS).build();
+    }
+
+    private class PropertyAccessorTest<T> implements PropertyAccessor<T> {
+
+        @Override
+        public <S> T get(final S instance) {
+            return null;
+        }
+
+        @Override
+        public <S> void set(final S instance, final T value) {
+
+        }
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/IdGeneratorsTest.java b/bson/src/test/unit/org/bson/codecs/pojo/IdGeneratorsTest.java
new file mode 100644
index 00000000000..da5d33a02b7
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/IdGeneratorsTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonObjectId;
+import org.bson.types.ObjectId;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class IdGeneratorsTest {
+
+    @Test
+    public void testObjectIdGenerator() {
+        IdGenerator<ObjectId> idGenerator = IdGenerators.OBJECT_ID_GENERATOR;
+
+        assertEquals(ObjectId.class, idGenerator.getType());
+        assertEquals(ObjectId.class, idGenerator.generate().getClass());
+    }
+
+    @Test
+    public void testBsonObjectIdGenerator() {
+        IdGenerator<BsonObjectId> idGenerator = IdGenerators.BSON_OBJECT_ID_GENERATOR;
+
+        assertEquals(BsonObjectId.class, idGenerator.getType());
+        assertEquals(BsonObjectId.class, idGenerator.generate().getClass());
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/PojoCodecProviderTest.java b/bson/src/test/unit/org/bson/codecs/pojo/PojoCodecProviderTest.java
new file mode 100644
index 00000000000..22ce1ef19c4
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/PojoCodecProviderTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.ValueCodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.entities.SimpleModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidMethodModel;
+import org.junit.Test;
+
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public final class PojoCodecProviderTest extends PojoTestCase {
+
+    @Test
+    public void testClassNotFound() {
+        PojoCodecProvider provider = PojoCodecProvider.builder().build();
+        CodecRegistry registry = fromProviders(provider, new ValueCodecProvider());
+        Codec<SimpleModel> codec = provider.get(SimpleModel.class, registry);
+        assertNull(codec);
+    }
+
+    @Test
+    public void testPackageLessClasses() {
+        PojoCodecProvider provider = PojoCodecProvider.builder().build();
+        CodecRegistry registry = fromProviders(provider, new ValueCodecProvider());
+        Codec<Byte> codec = provider.get(byte.class, registry);
+        assertNull(codec);
+    }
+
+    @Test
+    public void testAutomatic() {
+        PojoCodecProvider provider = PojoCodecProvider.builder().automatic(true).build();
+        CodecRegistry registry = fromProviders(provider, new ValueCodecProvider());
+        Codec<SimpleModel> codec = provider.get(SimpleModel.class, registry);
+        assertNotNull(codec);
+    }
+
+    @Test
+    public void testAutomaticNoProperty() {
+        PojoCodecProvider provider = PojoCodecProvider.builder().automatic(true).build();
+        CodecRegistry registry = fromProviders(provider);
+        Codec<Integer> codec = provider.get(Integer.class, registry);
+        assertNull(codec);
+    }
+
+    @Test
+    public void testAutomaticInvalidModel() {
+        PojoCodecProvider provider = PojoCodecProvider.builder().automatic(true).build();
+        CodecRegistry registry = fromProviders(provider, new ValueCodecProvider());
+        Codec<CreatorInvalidMethodModel> codec = provider.get(CreatorInvalidMethodModel.class, registry);
+        assertNull(codec);
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/PojoCustomTest.java b/bson/src/test/unit/org/bson/codecs/pojo/PojoCustomTest.java
new file mode 100644
index 00000000000..1d9213a0c81
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/PojoCustomTest.java
@@ -0,0 +1,633 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.Document;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.LongCodec;
+import org.bson.codecs.MapCodec;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.entities.AbstractInterfaceModel;
+import org.bson.codecs.pojo.entities.AsymmetricalCreatorModel;
+import org.bson.codecs.pojo.entities.AsymmetricalIgnoreModel;
+import org.bson.codecs.pojo.entities.AsymmetricalModel;
+import org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel;
+import org.bson.codecs.pojo.entities.ConcreteCollectionsModel;
+import org.bson.codecs.pojo.entities.ConcreteStandAloneAbstractInterfaceModel;
+import org.bson.codecs.pojo.entities.ConstructorNotPublicModel;
+import org.bson.codecs.pojo.entities.ConventionModel;
+import org.bson.codecs.pojo.entities.ConverterModel;
+import org.bson.codecs.pojo.entities.CustomPropertyCodecOptionalModel;
+import org.bson.codecs.pojo.entities.GenericTreeModel;
+import org.bson.codecs.pojo.entities.InterfaceBasedModel;
+import org.bson.codecs.pojo.entities.InvalidCollectionModel;
+import org.bson.codecs.pojo.entities.InvalidGetterAndSetterModel;
+import org.bson.codecs.pojo.entities.InvalidMapModel;
+import org.bson.codecs.pojo.entities.InvalidMapPropertyCodecProvider;
+import org.bson.codecs.pojo.entities.InvalidSetterArgsModel;
+import org.bson.codecs.pojo.entities.MapStringObjectModel;
+import org.bson.codecs.pojo.entities.NestedSimpleIdModel;
+import org.bson.codecs.pojo.entities.Optional;
+import org.bson.codecs.pojo.entities.OptionalPropertyCodecProvider;
+import org.bson.codecs.pojo.entities.PrimitivesModel;
+import org.bson.codecs.pojo.entities.PrivateSetterFieldModel;
+import org.bson.codecs.pojo.entities.SimpleEnum;
+import org.bson.codecs.pojo.entities.SimpleEnumModel;
+import org.bson.codecs.pojo.entities.SimpleIdImmutableModel;
+import org.bson.codecs.pojo.entities.SimpleIdModel;
+import org.bson.codecs.pojo.entities.SimpleModel;
+import org.bson.codecs.pojo.entities.SimpleNestedPojoModel;
+import org.bson.codecs.pojo.entities.UpperBoundsModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationModel;
+import org.bson.codecs.pojo.entities.conventions.CollectionsGetterImmutableModel;
+import org.bson.codecs.pojo.entities.conventions.CollectionsGetterMutableModel;
+import org.bson.codecs.pojo.entities.conventions.CollectionsGetterNonEmptyModel;
+import org.bson.codecs.pojo.entities.conventions.CollectionsGetterNullModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorConstructorPrimitivesModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorConstructorThrowsExceptionModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorMethodThrowsExceptionModel;
+import org.bson.codecs.pojo.entities.conventions.MapGetterImmutableModel;
+import org.bson.codecs.pojo.entities.conventions.MapGetterMutableModel;
+import org.bson.codecs.pojo.entities.conventions.MapGetterNonEmptyModel;
+import org.bson.codecs.pojo.entities.conventions.MapGetterNullModel;
+import org.bson.types.ObjectId;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+import static org.bson.codecs.pojo.Conventions.DEFAULT_CONVENTIONS;
+import static org.bson.codecs.pojo.Conventions.NO_CONVENTIONS;
+import static org.bson.codecs.pojo.Conventions.SET_PRIVATE_FIELDS_CONVENTION;
+import static org.bson.codecs.pojo.Conventions.USE_GETTERS_FOR_SETTERS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public final class PojoCustomTest extends PojoTestCase {
+
+    @Test
+    public void testRegisterClassModelPreferredOverClass() {
+        ClassModel<SimpleModel> classModel = ClassModel.builder(SimpleModel.class).enableDiscriminator(true).build();
+        PojoCodecProvider.Builder builder = PojoCodecProvider.builder().automatic(true).register(SimpleModel.class).register(classModel);
+
+        roundTrip(builder, getSimpleModel(), "{_t: 'org.bson.codecs.pojo.entities.SimpleModel', 'integerField': 42,"
+                + "'stringField': 'myString'}");
+    }
+
+    @Test
+    public void testPackageDiscriminator() {
+        AnnotationModel model = new AnnotationModel("myId", new AnnotationModel("child", null, null),
+                new AnnotationModel("alternative", null, null));
+
+        roundTrip(PojoCodecProvider.builder().register("org.bson.codecs.pojo.entities", "org.bson.codecs.pojo.entities.conventions"), model,
+                "{_id: 'myId', _cls: 'MyAnnotationModel', renamed: {_id: 'alternative'}, child: {_id: 'child'}}");
+    }
+
+    @Test
+    public void testAsymmetricalModel() {
+        AsymmetricalModel model = new AsymmetricalModel(42);
+
+        encodesTo(getPojoCodecProviderBuilder(AsymmetricalModel.class), model, "{foo: 42}");
+        decodesTo(getPojoCodecProviderBuilder(AsymmetricalModel.class), "{bar: 42}", model);
+    }
+
+    @Test
+    public void testAsymmetricalCreatorModel() {
+        AsymmetricalCreatorModel model = new AsymmetricalCreatorModel("Foo", "Bar");
+
+        encodesTo(getPojoCodecProviderBuilder(AsymmetricalCreatorModel.class), model, "{baz: 'FooBar'}");
+        decodesTo(getPojoCodecProviderBuilder(AsymmetricalCreatorModel.class), "{a: 'Foo', b: 'Bar'}", model);
+    }
+
+    @Test
+    public void testAsymmetricalIgnoreModel() {
+        AsymmetricalIgnoreModel encode = new AsymmetricalIgnoreModel("property", "getter", "setter", "getterAndSetter");
+        AsymmetricalIgnoreModel decoded = new AsymmetricalIgnoreModel();
+        decoded.setGetterIgnored("getter");
+
+        encodesTo(getPojoCodecProviderBuilder(AsymmetricalIgnoreModel.class), encode, "{'setterIgnored': 'setter'}");
+        decodesTo(getPojoCodecProviderBuilder(AsymmetricalIgnoreModel.class),
+                "{'propertyIgnored': 'property', 'getterIgnored': 'getter', 'setterIgnored': 'setter', "
+                        + "'getterAndSetterIgnored': 'getterAndSetter'}", decoded);
+    }
+
+    @Test
+    public void testConventionsEmpty() {
+        ClassModelBuilder<ConventionModel> classModel = ClassModel.builder(ConventionModel.class).conventions(NO_CONVENTIONS);
+        ClassModelBuilder<SimpleModel> nestedClassModel = ClassModel.builder(SimpleModel.class).conventions(NO_CONVENTIONS);
+
+        roundTrip(getPojoCodecProviderBuilder(classModel, nestedClassModel), getConventionModel(),
+                "{'myFinalField': 10, 'myIntField': 10, 'customId': 'id',"
+                        + "'child': {'myFinalField': 10, 'myIntField': 10, 'customId': 'child',"
+                        + "          'simpleModel': {'integerField': 42, 'stringField': 'myString' } } }");
+    }
+
+    @Test
+    public void testConventionsCustom() {
+        List<Convention> conventions = Collections.<Convention>singletonList(
+                new Convention() {
+                    @Override
+                    public void apply(final ClassModelBuilder<?> classModelBuilder) {
+                        for (PropertyModelBuilder<?> fieldModelBuilder : classModelBuilder.getPropertyModelBuilders()) {
+                            fieldModelBuilder.discriminatorEnabled(false);
+                            fieldModelBuilder.readName(
+                                    fieldModelBuilder.getName()
+                                            .replaceAll("([^_A-Z])([A-Z])", "$1_$2").toLowerCase());
+                            fieldModelBuilder.writeName(
+                                    fieldModelBuilder.getName()
+                                            .replaceAll("([^_A-Z])([A-Z])", "$1_$2").toLowerCase());
+                        }
+                        if (classModelBuilder.getProperty("customId") != null) {
+                            classModelBuilder.idPropertyName("customId");
+                        }
+                        classModelBuilder.enableDiscriminator(true);
+                        classModelBuilder.discriminatorKey("_cls");
+                        classModelBuilder.discriminator(classModelBuilder.getType().getSimpleName()
+                                .replaceAll("([^_A-Z])([A-Z])", "$1_$2").toLowerCase());
+                    }
+                });
+
+        ClassModelBuilder<ConventionModel> classModel = ClassModel.builder(ConventionModel.class).conventions(conventions);
+        ClassModelBuilder<SimpleModel> nestedClassModel = ClassModel.builder(SimpleModel.class).conventions(conventions);
+
+        roundTrip(getPojoCodecProviderBuilder(classModel, nestedClassModel), getConventionModel(),
+                "{ '_id': 'id', '_cls': 'convention_model', 'my_final_field': 10, 'my_int_field': 10,"
+                        + "'child': { '_id': 'child', 'my_final_field': 10, 'my_int_field': 10, "
+                        + "           'simple_model': {'integer_field': 42, 'string_field': 'myString' } } }");
+    }
+
+    @Test
+    public void testIdGeneratorMutable() {
+        SimpleIdModel simpleIdModel = new SimpleIdModel(42, "myString");
+        assertNull(simpleIdModel.getId());
+        ClassModelBuilder<SimpleIdModel> builder = ClassModel.builder(SimpleIdModel.class).idGenerator(new ObjectIdGenerator());
+
+        roundTrip(getPojoCodecProviderBuilder(builder), simpleIdModel, "{'integerField': 42, 'stringField': 'myString'}");
+        assertNull(simpleIdModel.getId());
+
+        encodesTo(getPojoCodecProviderBuilder(builder), simpleIdModel,
+                "{'_id': {'$oid': '123412341234123412341234'}, 'integerField': 42, 'stringField': 'myString'}", true);
+        assertEquals(new ObjectId("123412341234123412341234"), simpleIdModel.getId());
+    }
+
+    @Test
+    public void testIdGeneratorImmutable() {
+        SimpleIdImmutableModel simpleIdModelNoId = new SimpleIdImmutableModel(42, "myString");
+        SimpleIdImmutableModel simpleIdModelWithId = new SimpleIdImmutableModel(new ObjectId("123412341234123412341234"), 42, "myString");
+        ClassModelBuilder<SimpleIdImmutableModel> builder = ClassModel.builder(SimpleIdImmutableModel.class)
+                .idGenerator(new ObjectIdGenerator());
+        String json = "{'_id': {'$oid': '123412341234123412341234'}, 'integerField': 42, 'stringField': 'myString'}";
+
+        encodesTo(getPojoCodecProviderBuilder(builder), simpleIdModelNoId, json, true);
+        decodesTo(getPojoCodecProviderBuilder(builder), json, simpleIdModelWithId);
+    }
+
+    @Test
+    public void testIdGeneratorNonObjectId() {
+        NestedSimpleIdModel nestedSimpleIdModel = new NestedSimpleIdModel(new SimpleIdModel(42, "myString"));
+        assertNull(nestedSimpleIdModel.getId());
+        ClassModelBuilder<NestedSimpleIdModel> builder = ClassModel.builder(NestedSimpleIdModel.class)
+                .idGenerator(new IdGenerator<String>() {
+                    @Override
+                    public String generate() {
+                        return "a";
+                    }
+
+                    @Override
+                    public Class<String> getType() {
+                        return String.class;
+                    }
+                });
+
+        roundTrip(getPojoCodecProviderBuilder(builder, ClassModel.builder(SimpleIdModel.class)), nestedSimpleIdModel,
+                "{'nestedSimpleIdModel': {'integerField': 42, 'stringField': 'myString'}}");
+        assertNull(nestedSimpleIdModel.getId());
+
+        encodesTo(getPojoCodecProviderBuilder(builder, ClassModel.builder(SimpleIdModel.class)), nestedSimpleIdModel,
+                "{'_id': 'a', 'nestedSimpleIdModel': {'integerField': 42, 'stringField': 'myString'}}", true);
+        assertEquals("a", nestedSimpleIdModel.getId());
+    }
+
+    @Test
+    public void testSetPrivateFieldConvention() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(PrivateSetterFieldModel.class);
+        ArrayList<Convention> conventions = new ArrayList<Convention>(DEFAULT_CONVENTIONS);
+        conventions.add(SET_PRIVATE_FIELDS_CONVENTION);
+        builder.conventions(conventions);
+
+        roundTrip(builder, new PrivateSetterFieldModel(1, "2", asList("a", "b")),
+                "{'someMethod': 'some method', 'integerField': 1, 'stringField': '2', listField: ['a', 'b']}");
+    }
+
+    @Test
+    public void testUseGettersForSettersConvention() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(CollectionsGetterMutableModel.class, MapGetterMutableModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        roundTrip(builder, new CollectionsGetterMutableModel(asList(1, 2)), "{listField: [1, 2]}");
+        roundTrip(builder, new MapGetterMutableModel(Collections.singletonMap("a", 3)), "{mapField: {a: 3}}");
+    }
+
+    @Test
+    public void testWithWildcardListField() {
+        ClassModel<InterfaceBasedModel> interfaceBasedModelClassModel =
+                ClassModel.builder(InterfaceBasedModel.class).enableDiscriminator(true).build();
+        PojoCodecProvider.Builder builder = PojoCodecProvider.builder().automatic(true)
+                .register(interfaceBasedModelClassModel)
+                .register(AbstractInterfaceModel.class, ConcreteStandAloneAbstractInterfaceModel.class,
+                        ConcreteAndNestedAbstractInterfaceModel.class);
+
+        roundTrip(builder,
+                new ConcreteAndNestedAbstractInterfaceModel("A",
+                        singletonList(new ConcreteStandAloneAbstractInterfaceModel("B"))),
+                "{'_t': 'org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel', 'name': 'A', "
+                        + "  'wildcardList': [{'_t': 'org.bson.codecs.pojo.entities.ConcreteStandAloneAbstractInterfaceModel', "
+                        + "'name': 'B'}]}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionInvalidTypeForCollection() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(CollectionsGetterMutableModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        decodingShouldFail(getCodec(builder, CollectionsGetterMutableModel.class), "{listField: ['1', '2']}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionInvalidTypeForMap() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(MapGetterMutableModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        decodingShouldFail(getCodec(builder, MapGetterMutableModel.class), "{mapField: {a: '1'}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionImmutableCollection() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(CollectionsGetterImmutableModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        roundTrip(builder, new CollectionsGetterImmutableModel(asList(1, 2)), "{listField: [1, 2]}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionImmutableMap() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(MapGetterImmutableModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        roundTrip(builder, new MapGetterImmutableModel(Collections.singletonMap("a", 3)), "{mapField: {a: 3}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionNullCollection() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(CollectionsGetterNullModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        roundTrip(builder, new CollectionsGetterNullModel(asList(1, 2)), "{listField: [1, 2]}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionNullMap() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(MapGetterNullModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        roundTrip(builder, new MapGetterNullModel(Collections.singletonMap("a", 3)), "{mapField: {a: 3}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionNotEmptyCollection() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(CollectionsGetterNonEmptyModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        roundTrip(builder, new CollectionsGetterNonEmptyModel(asList(1, 2)), "{listField: [1, 2]}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testUseGettersForSettersConventionNotEmptyMap() {
+        PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(MapGetterNonEmptyModel.class)
+                .conventions(getDefaultAndUseGettersConvention());
+
+        roundTrip(builder, new MapGetterNonEmptyModel(Collections.singletonMap("a", 3)), "{mapField: {a: 3}}");
+    }
+
+    @Test
+    public void testEnumSupportWithCustomCodec() {
+        CodecRegistry registry = fromRegistries(getCodecRegistry(getPojoCodecProviderBuilder(SimpleEnumModel.class)),
+                fromCodecs(new SimpleEnumCodec()));
+        roundTrip(registry, new SimpleEnumModel(SimpleEnum.BRAVO), "{ 'myEnum': 1 }");
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCustomCodec() {
+        ObjectId id = new ObjectId();
+        ConverterModel model = new ConverterModel(id.toHexString(), "myName");
+
+        ClassModelBuilder<ConverterModel> classModel = ClassModel.builder(ConverterModel.class);
+        PropertyModelBuilder<String> idPropertyModelBuilder = (PropertyModelBuilder<String>) classModel.getProperty("id");
+        idPropertyModelBuilder.codec(new StringToObjectIdCodec());
+
+        roundTrip(getPojoCodecProviderBuilder(classModel), model,
+                format("{'_id': {'$oid': '%s'}, 'name': 'myName'}", id.toHexString()));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCustomPropertySerializer() {
+        SimpleModel model = getSimpleModel();
+        model.setIntegerField(null);
+        ClassModelBuilder<SimpleModel> classModel = ClassModel.builder(SimpleModel.class);
+        ((PropertyModelBuilder<Integer>) classModel.getProperty("integerField"))
+                .propertySerialization(new PropertySerialization<Integer>() {
+                    @Override
+                    public boolean shouldSerialize(final Integer value) {
+                        return true;
+                    }
+                });
+
+        roundTrip(getPojoCodecProviderBuilder(classModel), model, "{'integerField': null, 'stringField': 'myString'}");
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCanHandleNullValuesForNestedModels() {
+        SimpleNestedPojoModel model = getSimpleNestedPojoModel();
+        model.setSimple(null);
+        ClassModelBuilder<SimpleNestedPojoModel> classModel = ClassModel.builder(SimpleNestedPojoModel.class);
+        ((PropertyModelBuilder<SimpleModel>) classModel.getProperty("simple"))
+                .propertySerialization(new PropertySerialization<SimpleModel>() {
+                    @Override
+                    public boolean shouldSerialize(final SimpleModel value) {
+                        return true;
+                    }
+                });
+        ClassModelBuilder<SimpleModel> classModelSimple = ClassModel.builder(SimpleModel.class);
+
+        roundTrip(getPojoCodecProviderBuilder(classModel, classModelSimple), model, "{'simple': null}");
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testCanHandleNullValuesForCollectionsAndMaps() {
+        ConcreteCollectionsModel model = getConcreteCollectionsModel();
+        model.setCollection(null);
+        model.setMap(null);
+
+        ClassModelBuilder<ConcreteCollectionsModel> classModel =
+                ClassModel.builder(ConcreteCollectionsModel.class);
+        ((PropertyModelBuilder<Collection<Integer>>) classModel.getProperty("collection"))
+                .propertySerialization(new PropertySerialization<Collection<Integer>>() {
+                    @Override
+                    public boolean shouldSerialize(final Collection<Integer> value) {
+                        return true;
+                    }
+                });
+        ((PropertyModelBuilder<Map<String, Double>>) classModel.getProperty("map"))
+                .propertySerialization(new PropertySerialization<Map<String, Double>>() {
+                    @Override
+                    public boolean shouldSerialize(final Map<String, Double> value) {
+                        return true;
+                    }
+                });
+
+        roundTrip(getPojoCodecProviderBuilder(classModel), model,
+                "{'collection': null, 'list': [4, 5, 6], 'linked': [7, 8, 9], 'map': null,"
+                        + "'concurrent': {'D': 4.4, 'E': 5.5, 'F': 6.6}}");
+    }
+
+    @Test
+    public void testCanHandleExtraData() {
+        decodesTo(getCodec(SimpleModel.class), "{'integerField': 42,  'stringField': 'myString', 'extraFieldA': 1, 'extraFieldB': 2}",
+                getSimpleModel());
+    }
+
+    @Test
+    public void testDataCanHandleMissingData() {
+        SimpleModel model = getSimpleModel();
+        model.setIntegerField(null);
+
+        decodesTo(getCodec(SimpleModel.class), "{'_t': 'SimpleModel', 'stringField': 'myString'}", model);
+    }
+
+    @Test
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public void testCanHandleTopLevelGenericIfHasCodec() {
+        UpperBoundsModel<Long> model = new UpperBoundsModel<Long>(5L);
+
+        ClassModelBuilder<UpperBoundsModel> classModelBuilder = ClassModel.builder(UpperBoundsModel.class);
+        ((PropertyModelBuilder<Long>) classModelBuilder.getProperty("myGenericField")).codec(new LongCodec());
+
+        roundTrip(getPojoCodecProviderBuilder(classModelBuilder), model,
+                "{'myGenericField': {'$numberLong': '5'}}");
+    }
+
+    @Test
+    public void testCustomRegisteredPropertyCodecWithValue() {
+        CustomPropertyCodecOptionalModel model = new CustomPropertyCodecOptionalModel(Optional.of("foo"));
+        roundTrip(getPojoCodecProviderBuilder(CustomPropertyCodecOptionalModel.class).register(new OptionalPropertyCodecProvider()),
+                model, "{'optionalField': 'foo'}");
+    }
+
+    @Test
+    public void testCustomRegisteredPropertyCodecOmittedValue() {
+        CustomPropertyCodecOptionalModel model = new CustomPropertyCodecOptionalModel(Optional.<String>empty());
+        roundTrip(getPojoCodecProviderBuilder(CustomPropertyCodecOptionalModel.class).register(new OptionalPropertyCodecProvider()),
+                model, "{'optionalField': null}");
+    }
+
+    @Test
+    public void testMapStringObjectModel() {
+        MapStringObjectModel model = new MapStringObjectModel(new HashMap<String, Object>(Document.parse("{a : 1, b: 'b', c: [1, 2, 3]}")));
+        CodecRegistry registry = fromRegistries(fromCodecs(new MapCodec()),
+                fromProviders(getPojoCodecProviderBuilder(MapStringObjectModel.class).build()));
+        roundTrip(registry, model, "{ map: {a : 1, b: 'b', c: [1, 2, 3]}}");
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void testMapStringObjectModelWithObjectCodec() {
+        MapStringObjectModel model = new MapStringObjectModel(new HashMap<String, Object>(Document.parse("{a : 1, b: 'b', c: [1, 2, 3]}")));
+        CodecRegistry registry = fromRegistries(fromCodecs(new MapCodec()), fromCodecs(new ObjectCodec()),
+                fromProviders(getPojoCodecProviderBuilder(MapStringObjectModel.class).build()));
+        roundTrip(registry, model, "{ map: {a : 1, b: 'b', c: [1, 2, 3]}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testEncodingInvalidMapModel() {
+        encodesTo(getPojoCodecProviderBuilder(InvalidMapModel.class), getInvalidMapModel(), "{'invalidMap': {'1': 1, '2': 2}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testDecodingInvalidMapModel() {
+        try {
+            decodingShouldFail(getCodec(InvalidMapModel.class), "{'invalidMap': {'1': 1, '2': 2}}");
+        } catch (CodecConfigurationException e) {
+            assertTrue(e.getMessage().startsWith("Failed to decode 'InvalidMapModel'. Decoding 'invalidMap' errored with:"));
+            throw e;
+        }
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testEncodingInvalidCollectionModel() {
+        try {
+            encodesTo(getPojoCodecProviderBuilder(InvalidCollectionModel.class), new InvalidCollectionModel(asList(1, 2, 3)),
+                "{collectionField: [1, 2, 3]}");
+        } catch (CodecConfigurationException e) {
+            assertTrue(e.getMessage().startsWith("Failed to encode 'InvalidCollectionModel'. Encoding 'collectionField' errored with:"));
+            throw e;
+        }
+    }
+
+    @Test
+    public void testInvalidMapModelWithCustomPropertyCodecProvider() {
+        encodesTo(getPojoCodecProviderBuilder(InvalidMapModel.class).register(new InvalidMapPropertyCodecProvider()), getInvalidMapModel(),
+                "{'invalidMap': {'1': 1, '2': 2}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testConstructorNotPublicModel() {
+        decodingShouldFail(getCodec(ConstructorNotPublicModel.class), "{'integerField': 99}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testDataUnknownClass() {
+        ClassModel<SimpleModel> classModel = ClassModel.builder(SimpleModel.class).enableDiscriminator(true).build();
+        try {
+            decodingShouldFail(getCodec(PojoCodecProvider.builder().register(classModel), SimpleModel.class), "{'_t': 'FakeModel'}");
+        } catch (CodecConfigurationException e) {
+            assertTrue(e.getMessage().startsWith("Failed to decode 'SimpleModel'. Decoding errored with:"));
+            throw e;
+        }
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testInvalidTypeForField() {
+        decodingShouldFail(getCodec(SimpleModel.class), "{'_t': 'SimpleModel', 'stringField': 123}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testInvalidTypeForPrimitiveField() {
+        decodingShouldFail(getCodec(PrimitivesModel.class), "{ '_t': 'PrimitivesModel', 'myBoolean': null}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testInvalidTypeForModelField() {
+        decodingShouldFail(getCodec(SimpleNestedPojoModel.class), "{ '_t': 'SimpleNestedPojoModel', 'simple': 123}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testInvalidDiscriminatorInNestedModel() {
+        decodingShouldFail(getCodec(SimpleNestedPojoModel.class), "{ '_t': 'SimpleNestedPojoModel',"
+                + "'simple': {'_t': 'FakeModel', 'integerField': 42, 'stringField': 'myString'}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCannotEncodeUnspecializedClasses() {
+        CodecRegistry registry = fromProviders(getPojoCodecProviderBuilder(GenericTreeModel.class).build());
+        encode(registry.get(GenericTreeModel.class), getGenericTreeModel(), false);
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCannotDecodeUnspecializedClasses() {
+        decodingShouldFail(getCodec(GenericTreeModel.class),
+                "{'field1': 'top', 'field2': 1, "
+                        + "'left': {'field1': 'left', 'field2': 2, 'left': {'field1': 'left', 'field2': 3}}, "
+                        + "'right': {'field1': 'right', 'field2': 4, 'left': {'field1': 'left', 'field2': 5}}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testBsonCreatorPrimitivesAndNullValues() {
+        decodingShouldFail(getCodec(CreatorConstructorPrimitivesModel.class), "{intField: 100,  stringField: 'test'}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorMethodThrowsExceptionModel() {
+        decodingShouldFail(getCodec(CreatorMethodThrowsExceptionModel.class),
+                "{'integerField': 10, 'stringField': 'eleven', 'longField': {$numberLong: '12'}}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testCreatorConstructorThrowsExceptionModel() {
+        decodingShouldFail(getCodec(CreatorConstructorThrowsExceptionModel.class), "{}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testInvalidSetterModel() {
+        decodingShouldFail(getCodec(InvalidSetterArgsModel.class), "{'integerField': 42, 'stringField': 'myString'}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testInvalidGetterAndSetterModelEncoding() {
+        InvalidGetterAndSetterModel model = new InvalidGetterAndSetterModel(42, "myString");
+        roundTrip(getPojoCodecProviderBuilder(InvalidGetterAndSetterModel.class), model, "{'integerField': 42, 'stringField': 'myString'}");
+    }
+
+    @Test(expected = CodecConfigurationException.class)
+    public void testInvalidGetterAndSetterModelDecoding() {
+        decodingShouldFail(getCodec(InvalidGetterAndSetterModel.class), "{'integerField': 42, 'stringField': 'myString'}");
+    }
+
+    private List<Convention> getDefaultAndUseGettersConvention() {
+        List<Convention> conventions = new ArrayList<Convention>(DEFAULT_CONVENTIONS);
+        conventions.add(USE_GETTERS_FOR_SETTERS);
+        return conventions;
+    }
+
+    class ObjectCodec implements Codec<Object> {
+
+        @Override
+        public Object decode(final BsonReader reader, final DecoderContext decoderContext) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final Object value, final EncoderContext encoderContext) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Class<Object> getEncoderClass() {
+            return Object.class;
+        }
+    }
+
+    class ObjectIdGenerator implements IdGenerator<ObjectId> {
+        @Override
+        public ObjectId generate() {
+            return new ObjectId("123412341234123412341234");
+        }
+
+        @Override
+        public Class<ObjectId> getType() {
+            return ObjectId.class;
+        }
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/PojoRoundTripTest.java b/bson/src/test/unit/org/bson/codecs/pojo/PojoRoundTripTest.java
new file mode 100644
index 00000000000..9512422b4e0
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/PojoRoundTripTest.java
@@ -0,0 +1,486 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonDocument;
+import org.bson.codecs.pojo.entities.AbstractInterfaceModel;
+import org.bson.codecs.pojo.entities.CollectionNestedPojoModel;
+import org.bson.codecs.pojo.entities.CollectionSpecificReturnTypeCreatorModel;
+import org.bson.codecs.pojo.entities.CollectionSpecificReturnTypeModel;
+import org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel;
+import org.bson.codecs.pojo.entities.ConcreteCollectionsModel;
+import org.bson.codecs.pojo.entities.ConcreteInterfaceGenericModel;
+import org.bson.codecs.pojo.entities.ConcreteStandAloneAbstractInterfaceModel;
+import org.bson.codecs.pojo.entities.ContainsAlternativeMapAndCollectionModel;
+import org.bson.codecs.pojo.entities.ConventionModel;
+import org.bson.codecs.pojo.entities.FieldAndPropertyTypeMismatchModel;
+import org.bson.codecs.pojo.entities.GenericHolderModel;
+import org.bson.codecs.pojo.entities.GenericTreeModel;
+import org.bson.codecs.pojo.entities.InterfaceBasedModel;
+import org.bson.codecs.pojo.entities.InterfaceModelImpl;
+import org.bson.codecs.pojo.entities.InterfaceUpperBoundsModelAbstractImpl;
+import org.bson.codecs.pojo.entities.MultipleBoundsModel;
+import org.bson.codecs.pojo.entities.MultipleLevelGenericModel;
+import org.bson.codecs.pojo.entities.NestedFieldReusingClassTypeParameter;
+import org.bson.codecs.pojo.entities.NestedGenericHolderFieldWithMultipleTypeParamsModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderMapModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderSimpleGenericsModel;
+import org.bson.codecs.pojo.entities.NestedGenericTreeModel;
+import org.bson.codecs.pojo.entities.NestedMultipleLevelGenericModel;
+import org.bson.codecs.pojo.entities.NestedReusedGenericsModel;
+import org.bson.codecs.pojo.entities.NestedSelfReferentialGenericHolderModel;
+import org.bson.codecs.pojo.entities.NestedSelfReferentialGenericModel;
+import org.bson.codecs.pojo.entities.NestedSimpleIdModel;
+import org.bson.codecs.pojo.entities.PrimitivesModel;
+import org.bson.codecs.pojo.entities.PropertyReusingClassTypeParameter;
+import org.bson.codecs.pojo.entities.PropertySelectionModel;
+import org.bson.codecs.pojo.entities.PropertyWithMultipleTypeParamsModel;
+import org.bson.codecs.pojo.entities.ReusedGenericsModel;
+import org.bson.codecs.pojo.entities.SelfReferentialGenericModel;
+import org.bson.codecs.pojo.entities.ShapeHolderCircleModel;
+import org.bson.codecs.pojo.entities.ShapeHolderModel;
+import org.bson.codecs.pojo.entities.ShapeModelAbstract;
+import org.bson.codecs.pojo.entities.ShapeModelCircle;
+import org.bson.codecs.pojo.entities.ShapeModelRectangle;
+import org.bson.codecs.pojo.entities.SimpleEnum;
+import org.bson.codecs.pojo.entities.SimpleEnumModel;
+import org.bson.codecs.pojo.entities.SimpleGenericsModel;
+import org.bson.codecs.pojo.entities.SimpleIdImmutableModel;
+import org.bson.codecs.pojo.entities.SimpleIdModel;
+import org.bson.codecs.pojo.entities.SimpleModel;
+import org.bson.codecs.pojo.entities.SimpleNestedPojoModel;
+import org.bson.codecs.pojo.entities.TreeWithIdModel;
+import org.bson.codecs.pojo.entities.UpperBoundsConcreteModel;
+import org.bson.codecs.pojo.entities.conventions.AnnotationBsonPropertyIdModel;
+import org.bson.codecs.pojo.entities.conventions.BsonIgnoreDuplicatePropertyMultipleTypes;
+import org.bson.codecs.pojo.entities.conventions.BsonIgnoreInvalidMapModel;
+import org.bson.codecs.pojo.entities.conventions.BsonIgnoreSyntheticProperty;
+import org.bson.codecs.pojo.entities.conventions.CollectionDiscriminatorAbstractClassesModel;
+import org.bson.codecs.pojo.entities.conventions.CollectionDiscriminatorInterfacesModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorAllFinalFieldsModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorConstructorIdModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorConstructorLegacyBsonPropertyModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorConstructorModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorConstructorRenameModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInSuperClassModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInSuperClassModelImpl;
+import org.bson.codecs.pojo.entities.conventions.CreatorMethodModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorNoArgsConstructorModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorNoArgsMethodModel;
+import org.bson.codecs.pojo.entities.DuplicateAnnotationAllowedModel;
+import org.bson.codecs.pojo.entities.conventions.InterfaceModel;
+import org.bson.codecs.pojo.entities.conventions.InterfaceModelImplA;
+import org.bson.codecs.pojo.entities.conventions.InterfaceModelImplB;
+import org.bson.codecs.pojo.entities.conventions.Subclass1Model;
+import org.bson.codecs.pojo.entities.conventions.Subclass2Model;
+import org.bson.codecs.pojo.entities.conventions.SuperClassModel;
+import org.bson.types.ObjectId;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public final class PojoRoundTripTest extends PojoTestCase {
+
+    private final String name;
+    private final Object model;
+    private final PojoCodecProvider.Builder builder;
+    private final String json;
+
+    public PojoRoundTripTest(final String name, final Object model, final String json, final PojoCodecProvider.Builder builder) {
+        this.name = name;
+        this.model = model;
+        this.json = json;
+        this.builder = builder;
+    }
+
+    @Test
+    public void test() {
+        roundTrip(builder, model, json);
+    }
+
+    private static List<TestData> testCases() {
+        List<TestData> data = new ArrayList<TestData>();
+        data.add(new TestData("Simple model", getSimpleModel(), PojoCodecProvider.builder().register(SimpleModel.class),
+                SIMPLE_MODEL_JSON));
+
+        data.add(new TestData("Property selection model", new PropertySelectionModel(),
+                getPojoCodecProviderBuilder(PropertySelectionModel.class),
+                "{'finalStringField': 'finalStringField', 'stringField': 'stringField'}"));
+
+        data.add(new TestData("Conventions default", getConventionModel(),
+                getPojoCodecProviderBuilder(ConventionModel.class, SimpleModel.class),
+                "{'_id': 'id', '_cls': 'AnnotatedConventionModel', 'myFinalField': 10, 'myIntField': 10,"
+                        + "'child': {'_id': 'child', 'myFinalField': 10, 'myIntField': 10,"
+                        + "'model': {'integerField': 42, 'stringField': 'myString'}}}"));
+
+        data.add(new TestData("BsonIgnore invalid map", new BsonIgnoreInvalidMapModel("myString"),
+                getPojoCodecProviderBuilder(BsonIgnoreInvalidMapModel.class),
+                "{stringField: 'myString'}"));
+
+        data.add(new TestData("Interfaced based model", new InterfaceModelImpl("a", "b"),
+                getPojoCodecProviderBuilder(InterfaceModelImpl.class),
+                "{'propertyA': 'a', 'propertyB': 'b'}"));
+
+        data.add(new TestData("Interfaced based model with bound", new InterfaceUpperBoundsModelAbstractImpl("someName",
+                new InterfaceModelImpl("a", "b")),
+                getPojoCodecProviderBuilder(InterfaceUpperBoundsModelAbstractImpl.class, InterfaceModelImpl.class),
+                "{'name': 'someName', 'nestedModel': {'propertyA': 'a', 'propertyB': 'b'}}"));
+
+        data.add(new TestData("Interface concrete and abstract model",
+                new ConcreteAndNestedAbstractInterfaceModel("A", new ConcreteAndNestedAbstractInterfaceModel("B",
+                        new ConcreteStandAloneAbstractInterfaceModel("C"))),
+                getPojoCodecProviderBuilder(InterfaceBasedModel.class, AbstractInterfaceModel.class,
+                        ConcreteAndNestedAbstractInterfaceModel.class, ConcreteStandAloneAbstractInterfaceModel.class),
+                "{'_t': 'org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel', 'name': 'A', "
+                        + "'child': {'_t': 'org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel', 'name': 'B', "
+                        + "  'child': {'_t': 'org.bson.codecs.pojo.entities.ConcreteStandAloneAbstractInterfaceModel', 'name': 'C'}}}}"));
+
+        data.add(new TestData("Concrete generic interface model", new ConcreteInterfaceGenericModel("someValue"),
+                getPojoCodecProviderBuilder(ConcreteInterfaceGenericModel.class), "{propertyA: 'someValue'}"));
+
+        data.add(new TestData("Primitives model", getPrimitivesModel(),
+                getPojoCodecProviderBuilder(PrimitivesModel.class),
+                "{ 'myBoolean': true, 'myByte': 1, 'myCharacter': '1', 'myDouble': 1.0, 'myFloat': 2.0, 'myInteger': 3, "
+                        + "'myLong': { '$numberLong': '5' }, 'myShort': 6}"));
+
+        data.add(new TestData("Concrete collections model", getConcreteCollectionsModel(),
+                getPojoCodecProviderBuilder(ConcreteCollectionsModel.class),
+                "{'collection': [1, 2, 3], 'list': [4, 5, 6], 'linked': [7, 8, 9], 'map': {'A': 1.1, 'B': 2.2, 'C': 3.3},"
+                        + "'concurrent': {'D': 4.4, 'E': 5.5, 'F': 6.6}}"));
+
+        data.add(new TestData("Handling of nulls inside collections", getConcreteCollectionsModelWithNulls(),
+                getPojoCodecProviderBuilder(ConcreteCollectionsModel.class),
+                "{'collection': [1, null, 3], 'list': [4, null, 6], 'linked': [null, 8, 9], 'map': {'A': 1.1, 'B': null, 'C': 3.3}}"));
+
+        data.add(new TestData("Concrete specific return collection type model through BsonCreator",
+                new CollectionSpecificReturnTypeCreatorModel(Arrays.asList("foo", "bar")),
+                getPojoCodecProviderBuilder(CollectionSpecificReturnTypeCreatorModel.class),
+                "{'properties': ['foo', 'bar']}"));
+
+        data.add(new TestData("Concrete specific return collection type model through getter and setter",
+                new CollectionSpecificReturnTypeModel(Arrays.asList("foo", "bar")),
+                getPojoCodecProviderBuilder(CollectionSpecificReturnTypeModel.class),
+                "{'properties': ['foo', 'bar']}"));
+
+        data.add(new TestData("Concrete specific return collection type model", getConcreteCollectionsModel(),
+                getPojoCodecProviderBuilder(ConcreteCollectionsModel.class),
+                "{'collection': [1, 2, 3], 'list': [4, 5, 6], 'linked': [7, 8, 9], 'map': {'A': 1.1, 'B': 2.2, 'C': 3.3},"
+                        + "'concurrent': {'D': 4.4, 'E': 5.5, 'F': 6.6}}"));
+
+        data.add(new TestData("Nested simple", getSimpleNestedPojoModel(),
+                getPojoCodecProviderBuilder(SimpleNestedPojoModel.class, SimpleModel.class),
+                "{'simple': " + SIMPLE_MODEL_JSON + "}"));
+
+        data.add(new TestData("Nested collection", getCollectionNestedPojoModel(),
+                getPojoCodecProviderBuilder(CollectionNestedPojoModel.class, SimpleModel.class),
+                "{ 'listSimple': [" + SIMPLE_MODEL_JSON + "],"
+                        + "'listListSimple': [[" + SIMPLE_MODEL_JSON + "]],"
+                        + "'setSimple': [" + SIMPLE_MODEL_JSON + "],"
+                        + "'setSetSimple': [[" + SIMPLE_MODEL_JSON + "]],"
+                        + "'mapSimple': {'s': " + SIMPLE_MODEL_JSON + "},"
+                        + "'mapMapSimple': {'ms': {'s': " + SIMPLE_MODEL_JSON + "}},"
+                        + "'mapListSimple': {'ls': [" + SIMPLE_MODEL_JSON + "]},"
+                        + "'mapListMapSimple': {'lm': [{'s': " + SIMPLE_MODEL_JSON + "}]},"
+                        + "'mapSetSimple': {'s': [" + SIMPLE_MODEL_JSON + "]},"
+                        + "'listMapSimple': [{'s': " + SIMPLE_MODEL_JSON + "}],"
+                        + "'listMapListSimple': [{'ls': [" + SIMPLE_MODEL_JSON + "]}],"
+                        + "'listMapSetSimple': [{'s': [" + SIMPLE_MODEL_JSON + "]}],"
+                        + "}"));
+
+        data.add(new TestData("Nested collection", getCollectionNestedPojoModelWithNulls(),
+                getPojoCodecProviderBuilder(CollectionNestedPojoModel.class, SimpleModel.class),
+                "{ 'listListSimple': [ null ],"
+                        + "'setSetSimple': [ null ],"
+                        + "'mapMapSimple': {'ms': null},"
+                        + "'mapListSimple': {'ls': null},"
+                        + "'mapListMapSimple': {'lm': [null]},"
+                        + "'mapSetSimple': {'s': null},"
+                        + "'listMapSimple': [null],"
+                        + "'listMapListSimple': [{'ls': null}],"
+                        + "'listMapSetSimple': [{'s': null}],"
+                        + "}"));
+
+        data.add(new TestData("Nested generic holder", getNestedGenericHolderModel(),
+                getPojoCodecProviderBuilder(NestedGenericHolderModel.class, GenericHolderModel.class),
+                "{'nested': {'myGenericField': 'generic', 'myLongField': {'$numberLong': '1'}}}"));
+
+        data.add(new TestData("Nested generic holder map", getNestedGenericHolderMapModel(),
+                getPojoCodecProviderBuilder(NestedGenericHolderMapModel.class,
+                        GenericHolderModel.class, SimpleGenericsModel.class, SimpleModel.class),
+                "{ 'nested': { 'myGenericField': {'s': " + SIMPLE_MODEL_JSON + "}, 'myLongField': {'$numberLong': '1'}}}"));
+
+        data.add(new TestData("Nested reused generic", getNestedReusedGenericsModel(),
+                getPojoCodecProviderBuilder(NestedReusedGenericsModel.class, ReusedGenericsModel.class, SimpleModel.class),
+                "{ 'nested':{ 'field1':{ '$numberLong':'1' }, 'field2':[" + SIMPLE_MODEL_JSON + "], "
+                        + "'field3':'field3', 'field4':42, 'field5':'field5', 'field6':[" + SIMPLE_MODEL_JSON + ", "
+                        + SIMPLE_MODEL_JSON + "], 'field7':{ '$numberLong':'2' }, 'field8':'field8' } }"));
+
+
+        data.add(new TestData("Nested generic holder with multiple types", getNestedGenericHolderFieldWithMultipleTypeParamsModel(),
+                getPojoCodecProviderBuilder(NestedGenericHolderFieldWithMultipleTypeParamsModel.class,
+                        PropertyWithMultipleTypeParamsModel.class, SimpleGenericsModel.class, GenericHolderModel.class),
+                "{'nested': {'myGenericField': {_t: 'PropertyWithMultipleTypeParamsModel', "
+                        + "'simpleGenericsModel': {_t: 'org.bson.codecs.pojo.entities.SimpleGenericsModel', 'myIntegerField': 42, "
+                        + "'myGenericField': {'$numberLong': '101'}, 'myListField': ['B', 'C'], 'myMapField': {'D': 2, 'E': 3, 'F': 4 }}},"
+                        + "'myLongField': {'$numberLong': '42'}}}"));
+
+
+        data.add(new TestData("Nested generic tree", new NestedGenericTreeModel(42, getGenericTreeModel()),
+                getPojoCodecProviderBuilder(NestedGenericTreeModel.class, GenericTreeModel.class),
+                "{'intField': 42, 'nested': {'field1': 'top', 'field2': 1, "
+                        + "'left': {'field1': 'left', 'field2': 2, 'left': {'field1': 'left', 'field2': 3}}, "
+                        + "'right': {'field1': 'right', 'field2': 4, 'left': {'field1': 'left', 'field2': 5}}}}"));
+
+        data.add(new TestData("Nested multiple level",
+                new NestedMultipleLevelGenericModel(42, new MultipleLevelGenericModel<String>("string", getGenericTreeModel())),
+                getPojoCodecProviderBuilder(NestedMultipleLevelGenericModel.class, MultipleLevelGenericModel.class, GenericTreeModel.class),
+                "{'intField': 42, 'nested': {'stringField': 'string', 'nested': {'field1': 'top', 'field2': 1, "
+                        + "'left': {'field1': 'left', 'field2': 2, 'left': {'field1': 'left', 'field2': 3}}, "
+                        + "'right': {'field1': 'right', 'field2': 4, 'left': {'field1': 'left', 'field2': 5}}}}}"));
+
+        data.add(new TestData("Nested Generics holder", getNestedGenericHolderSimpleGenericsModel(),
+                getPojoCodecProviderBuilder(NestedGenericHolderSimpleGenericsModel.class, GenericHolderModel.class,
+                        SimpleGenericsModel.class, SimpleModel.class),
+                "{'nested': {'myGenericField': {'myIntegerField': 42, 'myGenericField': 42,"
+                        + "                           'myListField': [[" + SIMPLE_MODEL_JSON + "]], "
+                        + "                           'myMapField': {'A': {'A': " + SIMPLE_MODEL_JSON + "}}},"
+                        + "         'myLongField': {'$numberLong': '42' }}}"));
+
+        data.add(new TestData("Nested property reusing type parameter",
+                new NestedFieldReusingClassTypeParameter(new PropertyReusingClassTypeParameter<String>(getGenericTreeModelStrings())),
+                getPojoCodecProviderBuilder(NestedFieldReusingClassTypeParameter.class, PropertyReusingClassTypeParameter.class,
+                        GenericTreeModel.class),
+                "{'nested': {'tree': {'field1': 'top', 'field2': '1', "
+                        + "'left': {'field1': 'left', 'field2': '2', 'left': {'field1': 'left', 'field2': '3'}}, "
+                        + "'right': {'field1': 'right', 'field2': '4', 'left': {'field1': 'left', 'field2': '5'}}}}}"));
+
+        data.add(new TestData("Abstract shape model - circle",
+                new ShapeHolderModel(getShapeModelCircle()), getPojoCodecProviderBuilder(ShapeModelAbstract.class,
+                ShapeModelCircle.class, ShapeModelRectangle.class, ShapeHolderModel.class),
+                "{'shape': {'_t': 'org.bson.codecs.pojo.entities.ShapeModelCircle', 'color': 'orange', 'radius': 4.2}}"));
+
+        data.add(new TestData("Abstract shape model - rectangle",
+                new ShapeHolderModel(getShapeModelRectangle()), getPojoCodecProviderBuilder(ShapeModelAbstract.class,
+                ShapeModelCircle.class, ShapeModelRectangle.class, ShapeHolderModel.class),
+                "{'shape': {'_t': 'org.bson.codecs.pojo.entities.ShapeModelRectangle', 'color': 'green', 'width': 22.1, 'height': "
+                        + "105.0}}}"));
+
+        data.add(new TestData("Upper bounds",
+                new UpperBoundsConcreteModel(1L), getPojoCodecProviderBuilder(UpperBoundsConcreteModel.class),
+                "{'myGenericField': {'$numberLong': '1'}}"));
+
+        data.add(new TestData("Multiple bounds", getMultipleBoundsModel(), getPojoCodecProviderBuilder(MultipleBoundsModel.class),
+                "{'level1' : 2.2, 'level2': [1, 2, 3], 'level3': {key: 'value'}}"));
+
+        data.add(new TestData("Self referential", getNestedSelfReferentialGenericHolderModel(),
+                getPojoCodecProviderBuilder(NestedSelfReferentialGenericHolderModel.class, NestedSelfReferentialGenericModel.class,
+                        SelfReferentialGenericModel.class),
+                "{'nested': { 't': true, 'v': {'$numberLong': '42'}, 'z': 44.0, "
+                        + "'selfRef1': {'t': true, 'v': {'$numberLong': '33'}, 'child': {'t': {'$numberLong': '44'}, 'v': false}}, "
+                        + "'selfRef2': {'t': true, 'v': 3.14, 'child': {'t': 3.42, 'v': true}}}}"));
+
+        data.add(new TestData("Creator constructor", new CreatorConstructorModel(asList(10, 11), "twelve", 13),
+                getPojoCodecProviderBuilder(CreatorConstructorModel.class),
+                "{'integersField': [10, 11], 'stringField': 'twelve', 'longField': {$numberLong: '13'}}"));
+
+        data.add(new TestData("Creator constructor with legacy BsonProperty using name",
+                new CreatorConstructorLegacyBsonPropertyModel(asList(10, 11), "twelve", 13),
+                getPojoCodecProviderBuilder(CreatorConstructorLegacyBsonPropertyModel.class),
+                "{'integersField': [10, 11], 'stringField': 'twelve', 'longField': {$numberLong: '13'}}"));
+
+        data.add(new TestData("Creator constructor with rename", new CreatorConstructorRenameModel(asList(10, 11), "twelve", 13),
+            getPojoCodecProviderBuilder(CreatorConstructorRenameModel.class),
+            "{'integerList': [10, 11], 'stringField': 'twelve', 'longField': {$numberLong: '13'}}"));
+
+        data.add(new TestData("Creator constructor with ID", new CreatorConstructorIdModel("1234-34567-890", asList(10, 11), "twelve", 13),
+            getPojoCodecProviderBuilder(CreatorConstructorIdModel.class),
+            "{'_id': '1234-34567-890', 'integersField': [10, 11], 'stringField': 'twelve', 'longField': {$numberLong: '13'}}"));
+
+        data.add(new TestData("Creator no-args constructor", new CreatorNoArgsConstructorModel(40, "one", 42),
+                getPojoCodecProviderBuilder(CreatorNoArgsConstructorModel.class),
+                "{'integerField': 40, 'stringField': 'one', 'longField': {$numberLong: '42'}}"));
+
+        data.add(new TestData("Creator method", new CreatorMethodModel(30, "two", 32),
+                getPojoCodecProviderBuilder(CreatorMethodModel.class),
+                "{'integerField': 30, 'stringField': 'two', 'longField': {$numberLong: '32'}}"));
+
+        data.add(new TestData("Creator method", CreatorMethodModel.create(30),
+                getPojoCodecProviderBuilder(CreatorMethodModel.class),
+                "{'integerField': 30, 'longField': {$numberLong: '0'}}"));
+
+        data.add(new TestData("Creator no-args method", new CreatorNoArgsMethodModel(10, "one", 11),
+                getPojoCodecProviderBuilder(CreatorNoArgsMethodModel.class),
+                "{'integerField': 10, 'stringField': 'one', 'longField': {$numberLong: '11'}}"));
+
+        data.add(new TestData("Creator all final", new CreatorAllFinalFieldsModel("pId", "Ada", "Lovelace"),
+                getPojoCodecProviderBuilder(CreatorAllFinalFieldsModel.class),
+                "{'_id': 'pId', '_t': 'org.bson.codecs.pojo.entities.conventions.CreatorAllFinalFieldsModel', "
+                        + "'firstName': 'Ada', 'lastName': 'Lovelace'}"));
+
+        data.add(new TestData("Creator all final with nulls", new CreatorAllFinalFieldsModel("pId", "Ada", null),
+                getPojoCodecProviderBuilder(CreatorAllFinalFieldsModel.class),
+                "{'_id': 'pId', '_t': 'org.bson.codecs.pojo.entities.conventions.CreatorAllFinalFieldsModel', 'firstName': 'Ada'}"));
+
+        data.add(new TestData("Can handle custom Maps and Collections",
+                new ContainsAlternativeMapAndCollectionModel(BsonDocument.parse("{customList: [1,2,3], customMap: {'field': 'value'}}")),
+                getPojoCodecProviderBuilder(ContainsAlternativeMapAndCollectionModel.class),
+                "{customList: [1,2,3], customMap: {'field': 'value'}}"));
+
+        data.add(new TestData("Collection of discriminators abstract classes", new CollectionDiscriminatorAbstractClassesModel().setList(
+                asList(new Subclass1Model().setName("abc").setValue(true), new Subclass2Model().setInteger(234).setValue(false))).setMap(
+                Collections.singletonMap("key", new Subclass2Model().setInteger(123).setValue(true))),
+                getPojoCodecProviderBuilder(CollectionDiscriminatorAbstractClassesModel.class, SuperClassModel.class, Subclass1Model.class,
+                        Subclass2Model.class),
+                "{list: [{_t: 'org.bson.codecs.pojo.entities.conventions.Subclass1Model', value: true, name: 'abc'},"
+                        + "{_t: 'org.bson.codecs.pojo.entities.conventions.Subclass2Model', value: false, integer: 234}],"
+                        + "map: {key: {_t: 'org.bson.codecs.pojo.entities.conventions.Subclass2Model', value: true, integer: 123}}}"));
+
+        data.add(new TestData("Collection of discriminators interfaces", new CollectionDiscriminatorInterfacesModel().setList(
+                asList(new InterfaceModelImplA().setName("abc").setValue(true),
+                       new InterfaceModelImplB().setInteger(234).setValue(false))).setMap(
+                Collections.<String, InterfaceModel>singletonMap("key", new InterfaceModelImplB().setInteger(123).setValue(true))),
+                getPojoCodecProviderBuilder(CollectionDiscriminatorInterfacesModel.class, InterfaceModelImplA.class,
+                        InterfaceModelImplB.class, InterfaceModel.class),
+                "{list: [{_t: 'org.bson.codecs.pojo.entities.conventions.InterfaceModelImplA', value: true, name: 'abc'},"
+                        + "{_t: 'org.bson.codecs.pojo.entities.conventions.InterfaceModelImplB', value: false, integer: 234}],"
+                        + "map: {key: {_t: 'org.bson.codecs.pojo.entities.conventions.InterfaceModelImplB', value: true, integer: 123}}}"));
+
+        data.add(new TestData("Creator in super class factory method",
+                CreatorInSuperClassModel.newInstance("a", "b"),
+                getPojoCodecProviderBuilder(CreatorInSuperClassModelImpl.class),
+                "{'propertyA': 'a', 'propertyB': 'b'}"));
+
+        data.add(new TestData("Primitive field type doesn't match private property",
+                new FieldAndPropertyTypeMismatchModel("foo"),
+                getPojoCodecProviderBuilder(FieldAndPropertyTypeMismatchModel.class),
+                "{'stringField': 'foo'}"));
+
+        data.add(new TestData("Enums support",
+                new SimpleEnumModel(SimpleEnum.BRAVO),
+                getPojoCodecProviderBuilder(SimpleEnumModel.class),
+                "{ 'myEnum': 'BRAVO' }"));
+
+        data.add(new TestData("AnnotationBsonPropertyIdModel", new AnnotationBsonPropertyIdModel(99L),
+                getPojoCodecProviderBuilder(AnnotationBsonPropertyIdModel.class),
+                "{'id': {'$numberLong': '99' }}"));
+
+        data.add(new TestData("Shape model - circle",
+                new ShapeHolderCircleModel(getShapeModelCircle()),
+                getPojoCodecProviderBuilder(ShapeModelCircle.class, ShapeHolderCircleModel.class),
+                "{'shape': {'_t': 'org.bson.codecs.pojo.entities.ShapeModelCircle', 'color': 'orange', 'radius': 4.2}}"));
+
+        data.add(new TestData("BsonIgnore synthentic property",
+                new BsonIgnoreSyntheticProperty("string value"),
+                getPojoCodecProviderBuilder(BsonIgnoreSyntheticProperty.class).conventions(Conventions.DEFAULT_CONVENTIONS),
+                "{stringField: 'string value'}"));
+
+        data.add(new TestData("SimpleIdModel with existing id",
+                new SimpleIdModel(new ObjectId("123412341234123412341234"), 42, "myString"),
+                getPojoCodecProviderBuilder(SimpleIdModel.class).conventions(Conventions.DEFAULT_CONVENTIONS),
+                "{'_id': {'$oid': '123412341234123412341234'}, 'integerField': 42, 'stringField': 'myString'}"));
+
+
+        data.add(new TestData("SimpleIdImmutableModel with existing id",
+                new SimpleIdImmutableModel(new ObjectId("123412341234123412341234"), 42, "myString"),
+                getPojoCodecProviderBuilder(SimpleIdImmutableModel.class).conventions(Conventions.DEFAULT_CONVENTIONS),
+                "{'_id': {'$oid': '123412341234123412341234'}, 'integerField': 42, 'stringField': 'myString'}"));
+
+        data.add(new TestData("NestedSimpleIdModel",
+                new NestedSimpleIdModel(new SimpleIdModel(42, "myString")),
+                getPojoCodecProviderBuilder(NestedSimpleIdModel.class, SimpleIdModel.class).conventions(Conventions.DEFAULT_CONVENTIONS),
+                "{'nestedSimpleIdModel': {'integerField': 42, 'stringField': 'myString'}}"));
+
+        data.add(new TestData("TreeWithIdModel",
+                new TreeWithIdModel(new ObjectId("123412341234123412341234"), "top",
+                        new TreeWithIdModel("left-1", new TreeWithIdModel("left-2"), null), new TreeWithIdModel("right-1")),
+                getPojoCodecProviderBuilder(TreeWithIdModel.class).conventions(Conventions.DEFAULT_CONVENTIONS),
+                "{'_id': {'$oid': '123412341234123412341234'}, 'level': 'top',"
+                        + "'left': {'level': 'left-1', 'left': {'level': 'left-2'}},"
+                        + "'right': {'level': 'right-1'}}"));
+
+        data.add(new TestData("DuplicateAnnotationAllowedModel",
+                new DuplicateAnnotationAllowedModel("abc"),
+                getPojoCodecProviderBuilder(DuplicateAnnotationAllowedModel.class).conventions(Conventions.DEFAULT_CONVENTIONS),
+                "{'_id': 'abc'}"));
+
+        data.add(new TestData("BsonIgnore duplicate property with multiple types",
+                new BsonIgnoreDuplicatePropertyMultipleTypes("string value"),
+                getPojoCodecProviderBuilder(BsonIgnoreDuplicatePropertyMultipleTypes.class).conventions(Conventions.DEFAULT_CONVENTIONS),
+                "{stringField: 'string value'}"));
+
+        return data;
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Object[]> data() {
+        List<Object[]> data = new ArrayList<Object[]>();
+
+        for (TestData testData : testCases()) {
+            data.add(new Object[]{format("%s", testData.getName()), testData.getModel(), testData.getJson(), testData.getBuilder()});
+            data.add(new Object[]{format("%s [Auto]", testData.getName()), testData.getModel(), testData.getJson(), AUTOMATIC_BUILDER});
+            data.add(new Object[]{format("%s [Package]", testData.getName()), testData.getModel(), testData.getJson(), PACKAGE_BUILDER});
+        }
+        return data;
+    }
+
+    private static final PojoCodecProvider.Builder AUTOMATIC_BUILDER = PojoCodecProvider.builder().automatic(true);
+    private static final PojoCodecProvider.Builder PACKAGE_BUILDER = PojoCodecProvider.builder().register("org.bson.codecs.pojo.entities",
+            "org.bson.codecs.pojo.entities.conventions");
+
+    private static class TestData {
+        private final String name;
+        private final Object model;
+        private final PojoCodecProvider.Builder builder;
+        private final String json;
+
+        TestData(final String name, final Object model, final PojoCodecProvider.Builder builder, final String json) {
+            this.name = name;
+            this.model = model;
+            this.builder = builder;
+            this.json = json;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Object getModel() {
+            return model;
+        }
+
+        public PojoCodecProvider.Builder getBuilder() {
+            return builder;
+        }
+
+        public String getJson() {
+            return json;
+        }
+    }
+
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/PojoTestCase.java b/bson/src/test/unit/org/bson/codecs/pojo/PojoTestCase.java
new file mode 100644
index 00000000000..3ea4e1bafde
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/PojoTestCase.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.BsonBinaryReader;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonDocument;
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.ByteBufNIO;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.ValueCodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.entities.CollectionNestedPojoModel;
+import org.bson.codecs.pojo.entities.ConcreteCollectionsModel;
+import org.bson.codecs.pojo.entities.ConventionModel;
+import org.bson.codecs.pojo.entities.GenericHolderModel;
+import org.bson.codecs.pojo.entities.GenericTreeModel;
+import org.bson.codecs.pojo.entities.InvalidMapModel;
+import org.bson.codecs.pojo.entities.MultipleBoundsModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderFieldWithMultipleTypeParamsModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderMapModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderModel;
+import org.bson.codecs.pojo.entities.NestedGenericHolderSimpleGenericsModel;
+import org.bson.codecs.pojo.entities.NestedReusedGenericsModel;
+import org.bson.codecs.pojo.entities.NestedSelfReferentialGenericHolderModel;
+import org.bson.codecs.pojo.entities.NestedSelfReferentialGenericModel;
+import org.bson.codecs.pojo.entities.PrimitivesModel;
+import org.bson.codecs.pojo.entities.PropertyWithMultipleTypeParamsModel;
+import org.bson.codecs.pojo.entities.ReusedGenericsModel;
+import org.bson.codecs.pojo.entities.SelfReferentialGenericModel;
+import org.bson.codecs.pojo.entities.ShapeModelCircle;
+import org.bson.codecs.pojo.entities.ShapeModelRectangle;
+import org.bson.codecs.pojo.entities.SimpleEnum;
+import org.bson.codecs.pojo.entities.SimpleGenericsModel;
+import org.bson.codecs.pojo.entities.SimpleModel;
+import org.bson.codecs.pojo.entities.SimpleNestedPojoModel;
+import org.bson.io.BasicOutputBuffer;
+import org.bson.io.ByteBufferBsonInput;
+import org.bson.io.OutputBuffer;
+import org.bson.types.ObjectId;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.pojo.Conventions.DEFAULT_CONVENTIONS;
+import static org.junit.Assert.assertEquals;
+
+abstract class PojoTestCase {
+
+    static final BsonDocumentCodec DOCUMENT_CODEC = new BsonDocumentCodec();
+
+    @SuppressWarnings("unchecked")
+    <T> void roundTrip(final T value, final String json) {
+        roundTrip(PojoCodecProvider.builder().automatic(true), value, json);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> void roundTrip(final PojoCodecProvider.Builder builder, final T value, final String json) {
+        encodesTo(getCodecRegistry(builder), value, json);
+        decodesTo(getCodecRegistry(builder), json, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> void roundTrip(final CodecRegistry registry, final T value, final String json) {
+        encodesTo(registry, value, json);
+        decodesTo(registry, json, value);
+    }
+
+    <T> void encodesTo(final PojoCodecProvider.Builder builder, final T value, final String json) {
+        encodesTo(builder, value, json, false);
+    }
+
+    <T> void encodesTo(final PojoCodecProvider.Builder builder, final T value, final String json, final boolean collectible) {
+        encodesTo(getCodecRegistry(builder), value, json, collectible);
+    }
+
+    <T> void encodesTo(final CodecRegistry registry, final T value, final String json) {
+        encodesTo(registry, value, json, false);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> void encodesTo(final CodecRegistry registry, final T value, final String json, final boolean collectible) {
+        Codec<T> codec = (Codec<T>) registry.get(value.getClass());
+        encodesTo(codec, value, json, collectible);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> void encodesTo(final Codec<T> codec, final T value, final String json) {
+       encodesTo(codec, value, json, false);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> void encodesTo(final Codec<T> codec, final T value, final String json, final boolean collectible) {
+        OutputBuffer encoded = encode(codec, value, collectible);
+
+        BsonDocument asBsonDocument = decode(DOCUMENT_CODEC, encoded);
+        assertEquals("Encoded value", BsonDocument.parse(json), asBsonDocument);
+    }
+
+    <T> void decodesTo(final PojoCodecProvider.Builder builder, final String json, final T expected) {
+        decodesTo(getCodecRegistry(builder), json, expected);
+    }
+
+    @SuppressWarnings("unchecked")
+    <T> void decodesTo(final CodecRegistry registry, final String json, final T expected) {
+        Codec<T> codec = (Codec<T>) registry.get(expected.getClass());
+        decodesTo(codec, json, expected);
+    }
+
+    <T> void decodesTo(final Codec<T> codec, final String json, final T expected) {
+        OutputBuffer encoded = encode(DOCUMENT_CODEC, BsonDocument.parse(json), false);
+        T result = decode(codec, encoded);
+        assertEquals("Decoded value", expected, result);
+    }
+
+    <T> void decodingShouldFail(final Codec<T> codec, final String json) {
+        decodesTo(codec, json, null);
+    }
+
+    <T> OutputBuffer encode(final Codec<T> codec, final T value, final boolean collectible) {
+        OutputBuffer buffer = new BasicOutputBuffer();
+        BsonWriter writer = new BsonBinaryWriter(buffer);
+        codec.encode(writer, value, EncoderContext.builder().isEncodingCollectibleDocument(collectible).build());
+        return buffer;
+    }
+
+    <T> T decode(final Codec<T> codec, final OutputBuffer buffer) {
+        BsonBinaryReader reader = new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(buffer.toByteArray()))));
+        return codec.decode(reader, DecoderContext.builder().build());
+    }
+
+    static PojoCodecProvider.Builder getPojoCodecProviderBuilder(final Class<?>... classes) {
+        PojoCodecProvider.Builder builder = PojoCodecProvider.builder();
+        for (final Class<?> clazz : classes) {
+            builder.register(clazz);
+        }
+        builder.conventions(DEFAULT_CONVENTIONS);
+        return builder;
+    }
+
+    <T> PojoCodecImpl<T> getCodec(final PojoCodecProvider.Builder builder, final Class<T> clazz) {
+        return (PojoCodecImpl<T>) getCodecRegistry(builder).get(clazz);
+    }
+
+    <T> PojoCodecImpl<T> getCodec(final Class<T> clazz) {
+        return getCodec(getPojoCodecProviderBuilder(clazz), clazz);
+    }
+
+    PojoCodecProvider.Builder getPojoCodecProviderBuilder(final ClassModelBuilder<?>... classModelBuilders) {
+        List<ClassModel<?>> builders = new ArrayList<ClassModel<?>>();
+        for (ClassModelBuilder<?> classModelBuilder : classModelBuilders) {
+            builders.add(classModelBuilder.build());
+        }
+        return PojoCodecProvider.builder().register(builders.toArray(new ClassModel<?>[builders.size()]));
+    }
+
+    CodecRegistry getCodecRegistry(final PojoCodecProvider.Builder builder) {
+        return fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider(), builder.build());
+    }
+
+    static SimpleModel getSimpleModel() {
+        return new SimpleModel(42, "myString");
+    }
+
+    static PrimitivesModel getPrimitivesModel() {
+        return new PrimitivesModel(true, Byte.parseByte("1", 2), '1', 1.0, 2f, 3, 5L, (short) 6);
+    }
+
+    SimpleGenericsModel<String, String, Integer> getSimpleGenericsModel() {
+        HashMap<String, Integer> map = new HashMap<String, Integer>();
+        map.put("D", 2);
+        map.put("E", 3);
+        map.put("F", 4);
+
+        return new SimpleGenericsModel<String, String, Integer>(42, "A", asList("B", "C"), map);
+    }
+
+    static SimpleGenericsModel<Long, String, Integer> getSimpleGenericsModelAlt() {
+        HashMap<String, Integer> map = new HashMap<String, Integer>();
+        map.put("D", 2);
+        map.put("E", 3);
+        map.put("F", 4);
+
+        return new SimpleGenericsModel<Long, String, Integer>(42, 101L, asList("B", "C"), map);
+    }
+
+    static ConcreteCollectionsModel getConcreteCollectionsModel() {
+        Collection<Integer> collection = asList(1, 2, 3);
+        List<Integer> list = asList(4, 5, 6);
+        LinkedList<Integer> linked = new LinkedList<Integer>(asList(7, 8, 9));
+        Map<String, Double> map = new HashMap<String, Double>();
+        map.put("A", 1.1);
+        map.put("B", 2.2);
+        map.put("C", 3.3);
+        ConcurrentHashMap<String, Double> concurrent = new ConcurrentHashMap<String, Double>();
+        concurrent.put("D", 4.4);
+        concurrent.put("E", 5.5);
+        concurrent.put("F", 6.6);
+
+        return new ConcreteCollectionsModel(collection, list, linked, map, concurrent);
+    }
+
+
+    static ConcreteCollectionsModel getConcreteCollectionsModelWithNulls() {
+        Collection<Integer> collection = asList(1, null, 3);
+        List<Integer> list = asList(4, null, 6);
+        LinkedList<Integer> linked = new LinkedList<Integer>(asList(null, 8, 9));
+        Map<String, Double> map = new HashMap<String, Double>();
+        map.put("A", 1.1);
+        map.put("B", null);
+        map.put("C", 3.3);
+
+        return new ConcreteCollectionsModel(collection, list, linked, map, null);
+    }
+
+    static SimpleNestedPojoModel getSimpleNestedPojoModel() {
+        SimpleModel simpleModel = getSimpleModel();
+        return new SimpleNestedPojoModel(simpleModel);
+    }
+
+    static CollectionNestedPojoModel getCollectionNestedPojoModel() {
+        return getCollectionNestedPojoModel(false);
+    }
+
+    static CollectionNestedPojoModel getCollectionNestedPojoModelWithNulls() {
+        return getCollectionNestedPojoModel(true);
+    }
+
+    private static CollectionNestedPojoModel getCollectionNestedPojoModel(final boolean useNulls) {
+        List<SimpleModel> listSimple;
+        Set<SimpleModel> setSimple;
+        Map<String, SimpleModel> mapSimple;
+
+        if (useNulls) {
+            listSimple = null;
+            setSimple = null;
+            mapSimple = null;
+        } else {
+            SimpleModel simpleModel = getSimpleModel();
+            listSimple = singletonList(simpleModel);
+            setSimple = new HashSet<SimpleModel>(listSimple);
+            mapSimple = new HashMap<String, SimpleModel>();
+            mapSimple.put("s", simpleModel);
+        }
+
+        List<List<SimpleModel>> listListSimple = singletonList(listSimple);
+        Set<Set<SimpleModel>> setSetSimple = new HashSet<Set<SimpleModel>>(singletonList(setSimple));
+
+        Map<String, Map<String, SimpleModel>> mapMapSimple = new HashMap<String, Map<String, SimpleModel>>();
+        mapMapSimple.put("ms", mapSimple);
+
+        Map<String, List<SimpleModel>> mapListSimple = new HashMap<String, List<SimpleModel>>();
+        mapListSimple.put("ls", listSimple);
+
+        Map<String, List<Map<String, SimpleModel>>> mapListMapSimple = new HashMap<String, List<Map<String, SimpleModel>>>();
+        mapListMapSimple.put("lm", singletonList(mapSimple));
+
+        Map<String, Set<SimpleModel>> mapSetSimple = new HashMap<String, Set<SimpleModel>>();
+        mapSetSimple.put("s", setSimple);
+
+        List<Map<String, SimpleModel>> listMapSimple = singletonList(mapSimple);
+        List<Map<String, List<SimpleModel>>> listMapListSimple = singletonList(mapListSimple);
+        List<Map<String, Set<SimpleModel>>> listMapSetSimple = singletonList(mapSetSimple);
+
+        return new CollectionNestedPojoModel(listSimple, listListSimple, setSimple, setSetSimple, mapSimple, mapMapSimple, mapListSimple,
+                mapListMapSimple, mapSetSimple, listMapSimple, listMapListSimple, listMapSetSimple);
+    }
+
+    static ConventionModel getConventionModel() {
+        SimpleModel simpleModel = getSimpleModel();
+        ConventionModel child = new ConventionModel("child", null, simpleModel);
+        return new ConventionModel("id", child, null);
+    }
+
+    static ShapeModelCircle getShapeModelCircle() {
+        return new ShapeModelCircle("orange", 4.2);
+    }
+
+    static ShapeModelRectangle getShapeModelRectangle() {
+        return new ShapeModelRectangle("green", 22.1, 105.0);
+    }
+
+    static MultipleBoundsModel getMultipleBoundsModel() {
+        HashMap<String, String> map = new HashMap<String, String>();
+        map.put("key", "value");
+        List<Integer> list = asList(1, 2, 3);
+        return new MultipleBoundsModel(map, list, 2.2);
+    }
+
+    static NestedGenericHolderFieldWithMultipleTypeParamsModel getNestedGenericHolderFieldWithMultipleTypeParamsModel() {
+        SimpleGenericsModel<Long, String, Integer> simple = getSimpleGenericsModelAlt();
+        PropertyWithMultipleTypeParamsModel<Integer, Long, String> field =
+                new PropertyWithMultipleTypeParamsModel<Integer, Long, String>(simple);
+        GenericHolderModel<PropertyWithMultipleTypeParamsModel<Integer, Long, String>> nested = new
+                GenericHolderModel<PropertyWithMultipleTypeParamsModel<Integer, Long, String>>(field, 42L);
+        return new NestedGenericHolderFieldWithMultipleTypeParamsModel(nested);
+    }
+
+    static NestedGenericHolderSimpleGenericsModel getNestedGenericHolderSimpleGenericsModel() {
+        SimpleModel simpleModel = getSimpleModel();
+        Map<String, SimpleModel> map = new HashMap<String, SimpleModel>();
+        map.put("A", simpleModel);
+        Map<String, Map<String, SimpleModel>> mapB = new HashMap<String, Map<String, SimpleModel>>();
+        mapB.put("A", map);
+        SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>> simpleGenericsModel =
+                new SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>>(42, 42,
+                        singletonList(singletonList(simpleModel)), mapB);
+        GenericHolderModel<SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>>> nested =
+                new GenericHolderModel<SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>>>(simpleGenericsModel, 42L);
+
+        return new NestedGenericHolderSimpleGenericsModel(nested);
+    }
+
+    static NestedSelfReferentialGenericHolderModel getNestedSelfReferentialGenericHolderModel() {
+        SelfReferentialGenericModel<Boolean, Long> selfRef1 = new SelfReferentialGenericModel<Boolean, Long>(true, 33L,
+                new SelfReferentialGenericModel<Long, Boolean>(44L, false, null));
+        SelfReferentialGenericModel<Boolean, Double> selfRef2 = new SelfReferentialGenericModel<Boolean, Double>(true, 3.14,
+                new SelfReferentialGenericModel<Double, Boolean>(3.42, true, null));
+        NestedSelfReferentialGenericModel<Boolean, Long, Double> nested =
+                new NestedSelfReferentialGenericModel<Boolean, Long, Double>(true, 42L, 44.0, selfRef1, selfRef2);
+         return new NestedSelfReferentialGenericHolderModel(nested);
+    }
+
+    static NestedGenericHolderModel getNestedGenericHolderModel() {
+        return new NestedGenericHolderModel(new GenericHolderModel<String>("generic", 1L));
+    }
+
+    static NestedGenericHolderMapModel getNestedGenericHolderMapModel() {
+        Map<String, SimpleModel> mapSimple = new HashMap<String, SimpleModel>();
+        mapSimple.put("s", getSimpleModel());
+        return new NestedGenericHolderMapModel(new GenericHolderModel<Map<String, SimpleModel>>(mapSimple, 1L));
+    }
+
+    static NestedReusedGenericsModel getNestedReusedGenericsModel() {
+        return new NestedReusedGenericsModel(new ReusedGenericsModel<Long, List<SimpleModel>, String>(1L,
+                singletonList(getSimpleModel()), "field3", 42, "field5", asList(getSimpleModel(), getSimpleModel()), 2L, "field8"));
+    }
+
+    static GenericTreeModel<String, Integer> getGenericTreeModel() {
+        return new GenericTreeModel<String, Integer>("top", 1,
+                new GenericTreeModel<String, Integer>("left", 2,
+                        new GenericTreeModel<String, Integer>("left", 3, null, null), null),
+                new GenericTreeModel<String, Integer>("right", 4,
+                        new GenericTreeModel<String, Integer>("left", 5, null, null), null));
+    }
+
+    static GenericTreeModel<String, String> getGenericTreeModelStrings() {
+        return new GenericTreeModel<String, String>("top", "1",
+                new GenericTreeModel<String, String>("left", "2",
+                        new GenericTreeModel<String, String>("left", "3", null, null), null),
+                new GenericTreeModel<String, String>("right", "4",
+                        new GenericTreeModel<String, String>("left", "5", null, null), null));
+    }
+
+    static InvalidMapModel getInvalidMapModel() {
+        Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+        map.put(1, 1);
+        map.put(2, 2);
+        return new InvalidMapModel(map);
+    }
+
+    static final String SIMPLE_MODEL_JSON = "{'integerField': 42, 'stringField': 'myString'}";
+
+    class StringToObjectIdCodec implements Codec<String> {
+
+        @Override
+        public void encode(final BsonWriter writer, final String value, final EncoderContext encoderContext) {
+            writer.writeObjectId(new ObjectId(value));
+        }
+
+        @Override
+        public Class<String> getEncoderClass() {
+            return String.class;
+        }
+
+        @Override
+        public String decode(final BsonReader reader, final DecoderContext decoderContext) {
+            return reader.readObjectId().toHexString();
+        }
+    }
+
+    class SimpleEnumCodec implements Codec<SimpleEnum> {
+
+        @Override
+        public void encode(final BsonWriter writer, final SimpleEnum value, final EncoderContext encoderContext) {
+            writer.writeInt32(value.ordinal());
+        }
+
+        @Override
+        public Class<SimpleEnum> getEncoderClass() {
+            return SimpleEnum.class;
+        }
+
+        @Override
+        public SimpleEnum decode(final BsonReader reader, final DecoderContext decoderContext) {
+            int ordinal = reader.readInt32();
+            switch (ordinal){
+                case 0:
+                    return SimpleEnum.ALPHA;
+                case 1:
+                    return SimpleEnum.BRAVO;
+                default:
+                    return SimpleEnum.CHARLIE;
+            }
+        }
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/PropertyModelBuilderTest.java b/bson/src/test/unit/org/bson/codecs/pojo/PropertyModelBuilderTest.java
new file mode 100644
index 00000000000..3bc54a9cdb8
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/PropertyModelBuilderTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.IntegerCodec;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.junit.Test;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.List;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.bson.codecs.pojo.PojoBuilderHelper.createPropertyModelBuilder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+public final class PropertyModelBuilderTest {
+
+    private static final String FIELD_NAME = "myFieldName";
+    private static final PropertyMetadata<Integer> PROPERTY_METADATA =
+            new PropertyMetadata<Integer>(FIELD_NAME, "MyClass", TypeData.builder(Integer.class).build());
+
+    @Test
+    public void testFieldMapping() throws NoSuchFieldException {
+        PropertyModelBuilder<Integer> propertyModelBuilder = createPropertyModelBuilder(PROPERTY_METADATA);
+        assertEquals(FIELD_NAME, propertyModelBuilder.getName());
+        assertEquals(FIELD_NAME, propertyModelBuilder.getWriteName());
+        assertTrue(propertyModelBuilder.getReadAnnotations().isEmpty());
+        assertNull(propertyModelBuilder.isDiscriminatorEnabled());
+    }
+
+    @Test
+    public void testFieldOverrides() throws NoSuchFieldException {
+        IntegerCodec codec = new IntegerCodec();
+        PropertyModelBuilder<Integer> propertyModelBuilder = createPropertyModelBuilder(PROPERTY_METADATA)
+                .codec(codec)
+                .writeName("altDocumentFieldName")
+                .readAnnotations(ANNOTATIONS)
+                .propertySerialization(CUSTOM_SERIALIZATION)
+                .typeData(TypeData.builder(Integer.class).build())
+                .propertyAccessor(FIELD_ACCESSOR)
+                .discriminatorEnabled(false);
+
+        assertEquals(FIELD_NAME, propertyModelBuilder.getName());
+        assertEquals("altDocumentFieldName", propertyModelBuilder.getWriteName());
+        assertEquals(codec, propertyModelBuilder.getCodec());
+        assertEquals(Integer.class, propertyModelBuilder.getTypeData().getType());
+        assertEquals(ANNOTATIONS, propertyModelBuilder.getReadAnnotations());
+        assertEquals(CUSTOM_SERIALIZATION, propertyModelBuilder.getPropertySerialization());
+        assertEquals(FIELD_ACCESSOR, propertyModelBuilder.getPropertyAccessor());
+        assertFalse(propertyModelBuilder.isDiscriminatorEnabled());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testMustBeReadableOrWritable() {
+        createPropertyModelBuilder(PROPERTY_METADATA)
+                .readName(null)
+                .writeName(null)
+                .build();
+    }
+
+    private static final List<Annotation> ANNOTATIONS = Collections.<Annotation>singletonList(
+            new BsonProperty() {
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return BsonProperty.class;
+                }
+
+                @Override
+                public String value() {
+                    return "";
+                }
+
+                @Override
+                public boolean useDiscriminator() {
+                    return true;
+                }
+            });
+
+    private static final PropertySerialization<Integer> CUSTOM_SERIALIZATION = new PropertySerialization<Integer>() {
+        @Override
+        public boolean shouldSerialize(final Integer value) {
+            return false;
+        }
+    };
+
+    private static final PropertyAccessor<Integer> FIELD_ACCESSOR = new PropertyAccessor<Integer>() {
+        @Override
+        public <S> Integer get(final S instance) {
+            return null;
+        }
+        @Override
+        public <S> void set(final S instance, final Integer value) {
+        }
+    };
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/PropertyModelTest.java b/bson/src/test/unit/org/bson/codecs/pojo/PropertyModelTest.java
new file mode 100644
index 00000000000..be99fb56298
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/PropertyModelTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.IntegerCodec;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.junit.Test;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.List;
+
+import static junit.framework.TestCase.assertFalse;
+import static org.bson.codecs.pojo.PojoBuilderHelper.createPropertyModelBuilder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public final class PropertyModelTest {
+
+    private static final String FIELD_NAME = "myFieldName";
+    private static final PropertyMetadata<Integer> PROPERTY_METADATA =
+            new PropertyMetadata<Integer>(FIELD_NAME, "MyClass", TypeData.builder(Integer.class).build());
+
+    @Test
+    public void testPropertyMapping() throws NoSuchFieldException {
+        PropertySerialization<Integer> serializer = new PropertyModelSerializationImpl<Integer>();
+        PropertyAccessor<Integer> accessor = new PropertyAccessorImpl<Integer>(PROPERTY_METADATA);
+        PropertyModel<Integer> propertyModel = createPropertyModelBuilder(PROPERTY_METADATA)
+                .propertySerialization(serializer)
+                .propertyAccessor(accessor)
+                .build();
+        assertEquals(FIELD_NAME, propertyModel.getName());
+        assertEquals(FIELD_NAME, propertyModel.getWriteName());
+        assertEquals(serializer, propertyModel.getPropertySerialization());
+        assertEquals(accessor, propertyModel.getPropertyAccessor());
+        assertNull(propertyModel.getCodec());
+        assertNull(propertyModel.getCachedCodec());
+        assertNull(propertyModel.useDiscriminator());
+    }
+
+    @Test
+    public void testPropertyOverrides() throws NoSuchFieldException {
+        IntegerCodec codec = new IntegerCodec();
+        PropertyModel<Integer> propertyModel = createPropertyModelBuilder(PROPERTY_METADATA)
+                .codec(codec)
+                .writeName("altDocumentFieldName")
+                .readAnnotations(ANNOTATIONS)
+                .propertySerialization(CUSTOM_SERIALIZATION)
+                .typeData(TypeData.builder(Integer.class).build())
+                .propertyAccessor(FIELD_ACCESSOR)
+                .discriminatorEnabled(false)
+                .build();
+
+        assertEquals(FIELD_NAME, propertyModel.getName());
+        assertEquals("altDocumentFieldName", propertyModel.getWriteName());
+        assertEquals(codec, propertyModel.getCodec());
+        assertEquals(codec, propertyModel.getCachedCodec());
+        assertEquals(Integer.class, propertyModel.getTypeData().getType());
+        assertEquals(CUSTOM_SERIALIZATION, propertyModel.getPropertySerialization());
+        assertEquals(FIELD_ACCESSOR, propertyModel.getPropertyAccessor());
+        assertFalse(propertyModel.useDiscriminator());
+    }
+
+    private static final List<Annotation> ANNOTATIONS = Collections.<Annotation>singletonList(
+            new BsonProperty() {
+                @Override
+                public Class<? extends Annotation> annotationType() {
+                    return BsonProperty.class;
+                }
+
+                @Override
+                public String value() {
+                    return "";
+                }
+
+                @Override
+                public boolean useDiscriminator() {
+                    return true;
+                }
+            });
+
+    private static final PropertySerialization<Integer> CUSTOM_SERIALIZATION = new PropertySerialization<Integer>() {
+        @Override
+        public boolean shouldSerialize(final Integer value) {
+            return false;
+        }
+    };
+
+    private static final PropertyAccessor<Integer> FIELD_ACCESSOR = new PropertyAccessor<Integer>() {
+        @Override
+        public <S> Integer get(final S instance) {
+            return null;
+        }
+        @Override
+        public <S> void set(final S instance, final Integer value) {
+        }
+    };
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/TypeDataTest.java b/bson/src/test/unit/org/bson/codecs/pojo/TypeDataTest.java
new file mode 100644
index 00000000000..03c45dc4b1a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/TypeDataTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.bson.codecs.pojo.entities.GenericHolderModel;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.singletonList;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+@SuppressWarnings("rawtypes")
+public final class TypeDataTest {
+
+    @Test
+    public void testDefaults() {
+        TypeData<String> typeData = TypeData.builder(String.class).build();
+
+        assertEquals(String.class, typeData.getType());
+        assertTrue(typeData.getTypeParameters().isEmpty());
+    }
+
+    @Test
+    public void testListTypeParameters() {
+        TypeData<String> subTypeData = TypeData.builder(String.class).build();
+        TypeData<List> typeData = TypeData.builder(List.class).addTypeParameter(subTypeData).build();
+
+        assertEquals(List.class, typeData.getType());
+        assertEquals(singletonList(subTypeData), typeData.getTypeParameters());
+    }
+
+    @Test
+    public void testMapTypeParameters() {
+        TypeData<String> keyTypeData = TypeData.builder(String.class).build();
+        TypeData<Integer> valueTypeData = TypeData.builder(Integer.class).build();
+        TypeData<Map> typeData = TypeData.builder(Map.class).addTypeParameter(keyTypeData).addTypeParameter(valueTypeData).build();
+
+        assertEquals(Map.class, typeData.getType());
+        assertEquals(Arrays.<TypeData<?>>asList(keyTypeData, valueTypeData), typeData.getTypeParameters());
+    }
+
+    @Test
+    public void testToString() {
+        TypeData<String> stringType = TypeData.builder(String.class).build();
+        TypeData<Map> mapTypeData = TypeData.builder(Map.class)
+                .addTypeParameter(stringType)
+                .addTypeParameter(TypeData.builder(Map.class).addTypeParameter(stringType).addTypeParameter(stringType).build())
+                .build();
+
+        assertEquals("TypeData{type=String}", stringType.toString());
+        assertEquals("TypeData{type=Map, typeParameters=[String, Map<String, String>]}", mapTypeData.toString());
+    }
+
+    @Test
+    public void testRecursiveTypeData() {
+        TypeData<GenericHolderModel> typeData = TypeData.builder(GenericHolderModel.class)
+                .addTypeParameter(TypeData.builder(GenericHolderModel.class)
+                        .addTypeParameter(TypeData.builder(GenericHolderModel.class).build()).build()).build();
+
+        typeData.toString();
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/TypeParameterMapTest.java b/bson/src/test/unit/org/bson/codecs/pojo/TypeParameterMapTest.java
new file mode 100644
index 00000000000..95acff41ae0
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/TypeParameterMapTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public final class TypeParameterMapTest {
+
+    @Test
+    public void testDefault() {
+        TypeParameterMap typeParameterMap = TypeParameterMap.builder().build();
+        assertTrue(typeParameterMap.getPropertyToClassParamIndexMap().isEmpty());
+    }
+
+    @Test
+    public void testClassParamMapsToField() {
+        TypeParameterMap typeParameterMap = TypeParameterMap.builder().addIndex(1).build();
+        Map<Integer, Integer> expected = new HashMap<Integer, Integer>();
+        expected.put(-1, 1);
+        assertEquals(expected, typeParameterMap.getPropertyToClassParamIndexMap());
+    }
+
+    @Test
+    public void testMapsClassAndFieldIndices() {
+        TypeParameterMap typeParameterMap = TypeParameterMap.builder().addIndex(1, 2).addIndex(2, 2).build();
+        Map<Integer, Integer> expected = new HashMap<Integer, Integer>();
+        expected.put(1, 2);
+        expected.put(2, 2);
+        assertEquals(expected, typeParameterMap.getPropertyToClassParamIndexMap());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testFieldCannotBeGenericAndContainTypeParameters() {
+        TypeParameterMap.builder().addIndex(1).addIndex(2, 2).build();
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/AbstractCollectionSpecificReturnTypeCreatorModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/AbstractCollectionSpecificReturnTypeCreatorModel.java
new file mode 100644
index 00000000000..b9b8226f522
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/AbstractCollectionSpecificReturnTypeCreatorModel.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+
+public abstract class AbstractCollectionSpecificReturnTypeCreatorModel {
+    public abstract List<String> getProperties();
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/AbstractInterfaceModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/AbstractInterfaceModel.java
new file mode 100644
index 00000000000..309e11db127
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/AbstractInterfaceModel.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator
+public abstract class AbstractInterfaceModel implements InterfaceBasedModel {
+    private String name;
+
+    public AbstractInterfaceModel() {
+    }
+
+    public AbstractInterfaceModel(final String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AbstractInterfaceModel that = (AbstractInterfaceModel) o;
+
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getName() != null ? getName().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalCreatorModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalCreatorModel.java
new file mode 100644
index 00000000000..8021ab3cf82
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalCreatorModel.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class AsymmetricalCreatorModel {
+    private final String baz;
+
+    @BsonCreator
+    public AsymmetricalCreatorModel(@BsonProperty("a") final String a, @BsonProperty("b") final String b) {
+        this.baz = a + b;
+    }
+
+    public String getBaz() {
+        return baz;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AsymmetricalCreatorModel that = (AsymmetricalCreatorModel) o;
+
+        if (getBaz() != null ? !getBaz().equals(that.getBaz()) : that.getBaz() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getBaz() != null ? getBaz().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalIgnoreModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalIgnoreModel.java
new file mode 100644
index 00000000000..5c1005d07a3
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalIgnoreModel.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+
+public final class AsymmetricalIgnoreModel {
+    @BsonIgnore
+    private String propertyIgnored;
+
+    private String getterIgnored;
+
+    private String setterIgnored;
+
+    private String getterAndSetterIgnored;
+
+    public AsymmetricalIgnoreModel() {
+    }
+
+    public AsymmetricalIgnoreModel(final String propertyIgnored, final String getterIgnored, final String setterIgnored,
+                                   final String getterAndSetterIgnored) {
+        this.propertyIgnored = propertyIgnored;
+        this.getterIgnored = getterIgnored;
+        this.setterIgnored = setterIgnored;
+        this.getterAndSetterIgnored = getterAndSetterIgnored;
+    }
+
+    public String getPropertyIgnored() {
+        return propertyIgnored;
+    }
+
+    public void setPropertyIgnored(final String propertyIgnored) {
+        this.propertyIgnored = propertyIgnored;
+    }
+
+    @BsonIgnore
+    public String getGetterIgnored() {
+        return getterIgnored;
+    }
+
+    public void setGetterIgnored(final String getterIgnored) {
+        this.getterIgnored = getterIgnored;
+    }
+
+    public String getSetterIgnored() {
+        return setterIgnored;
+    }
+
+    @BsonIgnore
+    public void setSetterIgnored(final String setterIgnored) {
+        this.setterIgnored = setterIgnored;
+    }
+
+    @BsonIgnore
+    public String getGetterAndSetterIgnored() {
+        return getterAndSetterIgnored;
+    }
+
+    @BsonIgnore
+    public void setGetterAndSetterIgnored(final String getterAndSetterIgnored) {
+        this.getterAndSetterIgnored = getterAndSetterIgnored;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AsymmetricalIgnoreModel that = (AsymmetricalIgnoreModel) o;
+
+        if (getPropertyIgnored() != null ? !getPropertyIgnored().equals(that.getPropertyIgnored()) : that.getPropertyIgnored() != null) {
+            return false;
+        }
+        if (getGetterIgnored() != null ? !getGetterIgnored().equals(that.getGetterIgnored()) : that.getGetterIgnored() != null) {
+            return false;
+        }
+        if (getSetterIgnored() != null ? !getSetterIgnored().equals(that.getSetterIgnored()) : that.getSetterIgnored() != null) {
+            return false;
+        }
+        if (getGetterAndSetterIgnored() != null ? !getGetterAndSetterIgnored().equals(that.getGetterAndSetterIgnored()) : that
+                .getGetterAndSetterIgnored() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getPropertyIgnored() != null ? getPropertyIgnored().hashCode() : 0;
+        result = 31 * result + (getGetterIgnored() != null ? getGetterIgnored().hashCode() : 0);
+        result = 31 * result + (getSetterIgnored() != null ? getSetterIgnored().hashCode() : 0);
+        result = 31 * result + (getGetterAndSetterIgnored() != null ? getGetterAndSetterIgnored().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalModel.java
new file mode 100644
index 00000000000..f7366973023
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/AsymmetricalModel.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class AsymmetricalModel {
+    private int baz;
+
+    public AsymmetricalModel() {
+    }
+
+    public AsymmetricalModel(final int baz) {
+        this.baz = baz;
+    }
+
+    @BsonProperty("foo")
+    public int getBaz() {
+        return baz;
+    }
+
+    @BsonProperty("bar")
+    public void setBaz(final int bar) {
+        this.baz = bar;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AsymmetricalModel that = (AsymmetricalModel) o;
+
+        if (getBaz() != that.getBaz()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getBaz();
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionNestedPojoModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionNestedPojoModel.java
new file mode 100644
index 00000000000..ce81e18897d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionNestedPojoModel.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Collections.singletonList;
+
+public final class CollectionNestedPojoModel {
+
+    @SuppressWarnings("checkstyle:name")
+    private static List<SimpleModel> staticSimple = singletonList(new SimpleModel(1, "static"));
+    private List<SimpleModel> listSimple;
+    private List<List<SimpleModel>> listListSimple;
+
+    private Set<SimpleModel> setSimple;
+    private Set<Set<SimpleModel>> setSetSimple;
+
+    private Map<String, SimpleModel> mapSimple;
+    private Map<String, Map<String, SimpleModel>> mapMapSimple;
+
+    private Map<String, List<SimpleModel>> mapListSimple;
+    private Map<String, List<Map<String, SimpleModel>>> mapListMapSimple;
+    private Map<String, Set<SimpleModel>> mapSetSimple;
+
+    private List<Map<String, SimpleModel>> listMapSimple;
+    private List<Map<String, List<SimpleModel>>> listMapListSimple;
+    private List<Map<String, Set<SimpleModel>>> listMapSetSimple;
+
+    public CollectionNestedPojoModel() {
+    }
+
+    public CollectionNestedPojoModel(final List<SimpleModel> listSimple, final List<List<SimpleModel>> listListSimple, final
+    Set<SimpleModel> setSimple, final Set<Set<SimpleModel>> setSetSimple, final Map<String, SimpleModel> mapSimple, final Map<String,
+            Map<String, SimpleModel>> mapMapSimple, final Map<String, List<SimpleModel>> mapListSimple, final Map<String,
+            List<Map<String, SimpleModel>>> mapListMapSimple, final Map<String, Set<SimpleModel>> mapSetSimple, final List<Map<String,
+            SimpleModel>> listMapSimple, final List<Map<String, List<SimpleModel>>> listMapListSimple, final List<Map<String,
+            Set<SimpleModel>>> listMapSetSimple) {
+        this.listSimple = listSimple;
+        this.listListSimple = listListSimple;
+        this.setSimple = setSimple;
+        this.setSetSimple = setSetSimple;
+        this.mapSimple = mapSimple;
+        this.mapMapSimple = mapMapSimple;
+        this.mapListSimple = mapListSimple;
+        this.mapListMapSimple = mapListMapSimple;
+        this.mapSetSimple = mapSetSimple;
+        this.listMapSimple = listMapSimple;
+        this.listMapListSimple = listMapListSimple;
+        this.listMapSetSimple = listMapSetSimple;
+    }
+
+    public static List<SimpleModel> getStaticSimple() {
+        return staticSimple;
+    }
+
+    public static void setStaticSimple(final List<SimpleModel> staticSimple) {
+        CollectionNestedPojoModel.staticSimple = staticSimple;
+    }
+
+    public List<SimpleModel> getListSimple() {
+        return listSimple;
+    }
+
+    public void setListSimple(final List<SimpleModel> listSimple) {
+        this.listSimple = listSimple;
+    }
+
+    public List<List<SimpleModel>> getListListSimple() {
+        return listListSimple;
+    }
+
+    public void setListListSimple(final List<List<SimpleModel>> listListSimple) {
+        this.listListSimple = listListSimple;
+    }
+
+    public Set<SimpleModel> getSetSimple() {
+        return setSimple;
+    }
+
+    public void setSetSimple(final Set<SimpleModel> setSimple) {
+        this.setSimple = setSimple;
+    }
+
+    public Set<Set<SimpleModel>> getSetSetSimple() {
+        return setSetSimple;
+    }
+
+    public void setSetSetSimple(final Set<Set<SimpleModel>> setSetSimple) {
+        this.setSetSimple = setSetSimple;
+    }
+
+    public Map<String, SimpleModel> getMapSimple() {
+        return mapSimple;
+    }
+
+    public void setMapSimple(final Map<String, SimpleModel> mapSimple) {
+        this.mapSimple = mapSimple;
+    }
+
+    public Map<String, Map<String, SimpleModel>> getMapMapSimple() {
+        return mapMapSimple;
+    }
+
+    public void setMapMapSimple(final Map<String, Map<String, SimpleModel>> mapMapSimple) {
+        this.mapMapSimple = mapMapSimple;
+    }
+
+    public Map<String, List<SimpleModel>> getMapListSimple() {
+        return mapListSimple;
+    }
+
+    public void setMapListSimple(final Map<String, List<SimpleModel>> mapListSimple) {
+        this.mapListSimple = mapListSimple;
+    }
+
+    public Map<String, List<Map<String, SimpleModel>>> getMapListMapSimple() {
+        return mapListMapSimple;
+    }
+
+    public void setMapListMapSimple(final Map<String, List<Map<String, SimpleModel>>> mapListMapSimple) {
+        this.mapListMapSimple = mapListMapSimple;
+    }
+
+    public Map<String, Set<SimpleModel>> getMapSetSimple() {
+        return mapSetSimple;
+    }
+
+    public void setMapSetSimple(final Map<String, Set<SimpleModel>> mapSetSimple) {
+        this.mapSetSimple = mapSetSimple;
+    }
+
+    public List<Map<String, SimpleModel>> getListMapSimple() {
+        return listMapSimple;
+    }
+
+    public void setListMapSimple(final List<Map<String, SimpleModel>> listMapSimple) {
+        this.listMapSimple = listMapSimple;
+    }
+
+    public List<Map<String, List<SimpleModel>>> getListMapListSimple() {
+        return listMapListSimple;
+    }
+
+    public void setListMapListSimple(final List<Map<String, List<SimpleModel>>> listMapListSimple) {
+        this.listMapListSimple = listMapListSimple;
+    }
+
+    public List<Map<String, Set<SimpleModel>>> getListMapSetSimple() {
+        return listMapSetSimple;
+    }
+
+    public void setListMapSetSimple(final List<Map<String, Set<SimpleModel>>> listMapSetSimple) {
+        this.listMapSetSimple = listMapSetSimple;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CollectionNestedPojoModel that = (CollectionNestedPojoModel) o;
+
+        if (getListSimple() != null ? !getListSimple().equals(that.getListSimple()) : that.getListSimple() != null) {
+            return false;
+        }
+        if (getListListSimple() != null ? !getListListSimple().equals(that.getListListSimple()) : that.getListListSimple() != null) {
+            return false;
+        }
+        if (getSetSimple() != null ? !getSetSimple().equals(that.getSetSimple()) : that.getSetSimple() != null) {
+            return false;
+        }
+        if (getSetSetSimple() != null ? !getSetSetSimple().equals(that.getSetSetSimple()) : that.getSetSetSimple() != null) {
+            return false;
+        }
+        if (getMapSimple() != null ? !getMapSimple().equals(that.getMapSimple()) : that.getMapSimple() != null) {
+            return false;
+        }
+        if (getMapMapSimple() != null ? !getMapMapSimple().equals(that.getMapMapSimple()) : that.getMapMapSimple() != null) {
+            return false;
+        }
+        if (getMapListSimple() != null ? !getMapListSimple().equals(that.getMapListSimple()) : that.getMapListSimple() != null) {
+            return false;
+        }
+        if (getMapListMapSimple() != null ? !getMapListMapSimple().equals(that.getMapListMapSimple())
+                : that.getMapListMapSimple() !=  null) {
+            return false;
+        }
+        if (getMapSetSimple() != null ? !getMapSetSimple().equals(that.getMapSetSimple()) : that.getMapSetSimple() != null) {
+            return false;
+        }
+        if (getListMapSimple() != null ? !getListMapSimple().equals(that.getListMapSimple()) : that.getListMapSimple() != null) {
+            return false;
+        }
+        if (getListMapListSimple() != null ? !getListMapListSimple().equals(that.getListMapListSimple())
+                : that.getListMapListSimple() != null) {
+            return false;
+        }
+        if (getListMapSetSimple() != null ? !getListMapSetSimple().equals(that.getListMapSetSimple())
+                : that.getListMapSetSimple() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getListSimple() != null ? getListSimple().hashCode() : 0;
+        result = 31 * result + (getListListSimple() != null ? getListListSimple().hashCode() : 0);
+        result = 31 * result + (getSetSimple() != null ? getSetSimple().hashCode() : 0);
+        result = 31 * result + (getSetSetSimple() != null ? getSetSetSimple().hashCode() : 0);
+        result = 31 * result + (getMapSimple() != null ? getMapSimple().hashCode() : 0);
+        result = 31 * result + (getMapMapSimple() != null ? getMapMapSimple().hashCode() : 0);
+        result = 31 * result + (getMapListSimple() != null ? getMapListSimple().hashCode() : 0);
+        result = 31 * result + (getMapListMapSimple() != null ? getMapListMapSimple().hashCode() : 0);
+        result = 31 * result + (getMapSetSimple() != null ? getMapSetSimple().hashCode() : 0);
+        result = 31 * result + (getListMapSimple() != null ? getListMapSimple().hashCode() : 0);
+        result = 31 * result + (getListMapListSimple() != null ? getListMapListSimple().hashCode() : 0);
+        result = 31 * result + (getListMapSetSimple() != null ? getListMapSetSimple().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CollectionNestedPojoModel{"
+                + "listSimple=" + listSimple
+                + ", listListSimple=" + listListSimple
+                + ", setSimple=" + setSimple
+                + ", setSetSimple=" + setSetSimple
+                + ", mapSimple=" + mapSimple
+                + ", mapMapSimple=" + mapMapSimple
+                + ", mapListSimple=" + mapListSimple
+                + ", mapListMapSimple=" + mapListMapSimple
+                + ", mapSetSimple=" + mapSetSimple
+                + ", listMapSimple=" + listMapSimple
+                + ", listMapListSimple=" + listMapListSimple
+                + ", listMapSetSimple=" + listMapSetSimple
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionSpecificReturnTypeCreatorModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionSpecificReturnTypeCreatorModel.java
new file mode 100644
index 00000000000..761b7fe9a7b
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionSpecificReturnTypeCreatorModel.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.List;
+
+public class CollectionSpecificReturnTypeCreatorModel extends AbstractCollectionSpecificReturnTypeCreatorModel {
+    private final ImmutableList<String> properties;
+
+    @BsonCreator
+    public CollectionSpecificReturnTypeCreatorModel(@BsonProperty("properties") final List<String> properties) {
+        this.properties = ImmutableList.copyOf(properties);
+    }
+
+    public ImmutableList<String> getProperties() {
+        return properties;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CollectionSpecificReturnTypeCreatorModel that = (CollectionSpecificReturnTypeCreatorModel) o;
+
+        return properties != null ? properties.equals(that.properties) : that.properties == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return properties != null ? properties.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionSpecificReturnTypeModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionSpecificReturnTypeModel.java
new file mode 100644
index 00000000000..cf984f6c731
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/CollectionSpecificReturnTypeModel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+
+public class CollectionSpecificReturnTypeModel {
+    private ImmutableList<String> properties;
+
+    public CollectionSpecificReturnTypeModel() {
+    }
+
+    public CollectionSpecificReturnTypeModel(final List<String> properties) {
+        this.properties = ImmutableList.copyOf(properties);
+    }
+
+    public ImmutableList<String> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(final List<String> properties) {
+        this.properties = ImmutableList.copyOf(properties);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CollectionSpecificReturnTypeModel that = (CollectionSpecificReturnTypeModel) o;
+
+        return properties != null ? properties.equals(that.properties) : that.properties == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return properties != null ? properties.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteAndNestedAbstractInterfaceModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteAndNestedAbstractInterfaceModel.java
new file mode 100644
index 00000000000..9d56540005a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteAndNestedAbstractInterfaceModel.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.List;
+
+public final class ConcreteAndNestedAbstractInterfaceModel extends AbstractInterfaceModel {
+    @BsonProperty(useDiscriminator = true)
+    private InterfaceBasedModel child;
+    private List<? extends InterfaceBasedModel> wildcardList;
+
+    public ConcreteAndNestedAbstractInterfaceModel() {
+        super();
+    }
+
+    public ConcreteAndNestedAbstractInterfaceModel(final String name, final InterfaceBasedModel child) {
+        super(name);
+        this.child = child;
+    }
+
+    public ConcreteAndNestedAbstractInterfaceModel(final String name, final List<? extends InterfaceBasedModel> wildcardList) {
+        super(name);
+        this.child = null;
+        this.wildcardList = wildcardList;
+    }
+
+    public InterfaceBasedModel getChild() {
+        return child;
+    }
+
+    public void setChild(final InterfaceBasedModel child) {
+        this.child = child;
+    }
+
+    public List<? extends InterfaceBasedModel> getWildcardList() {
+        return wildcardList;
+    }
+
+    public void setWildcardList(final List<? extends InterfaceBasedModel> wildcardList) {
+        this.wildcardList = wildcardList;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        ConcreteAndNestedAbstractInterfaceModel that = (ConcreteAndNestedAbstractInterfaceModel) o;
+
+        if (getChild() != null ? !getChild().equals(that.getChild()) : that.getChild() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (getChild() != null ? getChild().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteCollectionsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteCollectionsModel.java
new file mode 100644
index 00000000000..e29e45e309d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteCollectionsModel.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public final class ConcreteCollectionsModel {
+    private Collection<Integer> collection;
+    private List<Integer> list;
+    private LinkedList<Integer> linked;
+    private Map<String, Double> map;
+    private ConcurrentHashMap<String, Double> concurrent;
+
+    public ConcreteCollectionsModel() {
+    }
+
+    public ConcreteCollectionsModel(final Collection<Integer> collection, final List<Integer> list, final LinkedList<Integer> linked,
+                                    final Map<String, Double> map, final ConcurrentHashMap<String, Double> concurrent) {
+        this.collection = collection;
+        this.list = list;
+        this.linked = linked;
+        this.map = map;
+        this.concurrent = concurrent;
+    }
+
+    public Collection<Integer> getCollection() {
+        return collection;
+    }
+
+    public void setCollection(final Collection<Integer> collection) {
+        this.collection = collection;
+    }
+
+    public List<Integer> getList() {
+        return list;
+    }
+
+    public void setList(final List<Integer> list) {
+        this.list = list;
+    }
+
+    public LinkedList<Integer> getLinked() {
+        return linked;
+    }
+
+    public void setLinked(final LinkedList<Integer> linked) {
+        this.linked = linked;
+    }
+
+    public Map<String, Double> getMap() {
+        return map;
+    }
+
+    public void setMap(final Map<String, Double> map) {
+        this.map = map;
+    }
+
+    public ConcurrentHashMap<String, Double> getConcurrent() {
+        return concurrent;
+    }
+
+    public void setConcurrent(final ConcurrentHashMap<String, Double> concurrent) {
+        this.concurrent = concurrent;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ConcreteCollectionsModel that = (ConcreteCollectionsModel) o;
+
+        if (getCollection() != null ? !getCollection().equals(that.getCollection()) : that.getCollection() != null) {
+            return false;
+        }
+        if (getList() != null ? !getList().equals(that.getList()) : that.getList() != null) {
+            return false;
+        }
+        if (getLinked() != null ? !getLinked().equals(that.getLinked()) : that.getLinked() != null) {
+            return false;
+        }
+        if (getMap() != null ? !getMap().equals(that.getMap()) : that.getMap() != null) {
+            return false;
+        }
+        if (getConcurrent() != null ? !getConcurrent().equals(that.getConcurrent()) : that.getConcurrent() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCollection() != null ? getCollection().hashCode() : 0;
+        result = 31 * result + (getList() != null ? getList().hashCode() : 0);
+        result = 31 * result + (getLinked() != null ? getLinked().hashCode() : 0);
+        result = 31 * result + (getMap() != null ? getMap().hashCode() : 0);
+        result = 31 * result + (getConcurrent() != null ? getConcurrent().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteInterfaceGenericModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteInterfaceGenericModel.java
new file mode 100644
index 00000000000..de73e8d46a7
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteInterfaceGenericModel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class ConcreteInterfaceGenericModel implements InterfaceGenericModel<String> {
+    private String property;
+
+    public ConcreteInterfaceGenericModel() {
+    }
+
+    public ConcreteInterfaceGenericModel(final String property) {
+        this.property = property;
+    }
+
+    @Override
+    public String getPropertyA() {
+        return property;
+    }
+
+    @Override
+    public void setPropertyA(final String property) {
+        this.property = property;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ConcreteInterfaceGenericModel that = (ConcreteInterfaceGenericModel) o;
+
+        return property != null ? property.equals(that.property) : that.property == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return property != null ? property.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteStandAloneAbstractInterfaceModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteStandAloneAbstractInterfaceModel.java
new file mode 100644
index 00000000000..701897aef60
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConcreteStandAloneAbstractInterfaceModel.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class ConcreteStandAloneAbstractInterfaceModel extends AbstractInterfaceModel {
+
+    public ConcreteStandAloneAbstractInterfaceModel() {
+        super();
+    }
+
+    public ConcreteStandAloneAbstractInterfaceModel(final String name) {
+        super(name);
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ConstructorNotPublicModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConstructorNotPublicModel.java
new file mode 100644
index 00000000000..1f9f93ec76e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConstructorNotPublicModel.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class ConstructorNotPublicModel {
+    private final Integer integerField;
+
+    ConstructorNotPublicModel(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public static ConstructorNotPublicModel create(final Integer integerField) {
+        return new ConstructorNotPublicModel(integerField);
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ConstructorNotPublicModel that = (ConstructorNotPublicModel) o;
+
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ConstructorNotPublicModel{"
+                + "integerField=" + integerField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ContainsAlternativeMapAndCollectionModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ContainsAlternativeMapAndCollectionModel.java
new file mode 100644
index 00000000000..82176f55df8
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ContainsAlternativeMapAndCollectionModel.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+
+public final class ContainsAlternativeMapAndCollectionModel {
+    private BsonArray customList;
+    private BsonDocument customMap;
+
+    public ContainsAlternativeMapAndCollectionModel() {
+    }
+
+    public ContainsAlternativeMapAndCollectionModel(final BsonDocument source) {
+        this.customList = source.getArray("customList");
+        this.customMap = source.getDocument("customMap");
+    }
+
+    public void setCustomList(final BsonArray customList) {
+        this.customList = customList;
+    }
+
+    public void setCustomMap(final BsonDocument customMap) {
+        this.customMap = customMap;
+    }
+
+    public BsonArray getCustomList() {
+        return customList;
+    }
+
+    public BsonDocument getCustomMap() {
+        return customMap;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ContainsAlternativeMapAndCollectionModel that = (ContainsAlternativeMapAndCollectionModel) o;
+
+        if (getCustomList() != null ? !getCustomList().equals(that.getCustomList()) : that.getCustomList() != null) {
+            return false;
+        }
+        if (getCustomMap() != null ? !getCustomMap().equals(that.getCustomMap()) : that.getCustomMap() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCustomList() != null ? getCustomList().hashCode() : 0;
+        result = 31 * result + (getCustomMap() != null ? getCustomMap().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ContainsAlternativeMapAndCollectionModel{"
+                + "customList=" + customList
+                + ", customMap=" + customMap
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ConventionModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConventionModel.java
new file mode 100644
index 00000000000..dbf4ac9ab21
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConventionModel.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+
+@BsonDiscriminator(value = "AnnotatedConventionModel", key = "_cls")
+public final class ConventionModel {
+    private static final int myStaticField = 10;
+    private transient int myTransientField = 10;
+    private final int myFinalField = 10;
+    private int myIntField = 10;
+
+    @BsonId()
+    private String customId;
+
+    @BsonProperty(useDiscriminator = false)
+    private ConventionModel child;
+
+    @BsonProperty(value = "model", useDiscriminator = false)
+    private SimpleModel simpleModel;
+
+    public ConventionModel(){
+    }
+
+    public ConventionModel(final String customId, final ConventionModel child, final SimpleModel simpleModel) {
+        this.myIntField = myIntField;
+        this.customId = customId;
+        this.child = child;
+        this.simpleModel = simpleModel;
+    }
+
+    public int getMyIntField() {
+        return myIntField;
+    }
+
+    public void setMyIntField(final int myIntField) {
+        this.myIntField = myIntField;
+    }
+
+    public int getMyFinalField() {
+        return myFinalField;
+    }
+
+    public int getMyTransientField() {
+        return myTransientField;
+    }
+
+    public void setMyTransientField(final int myTransientField) {
+        this.myTransientField = myTransientField;
+    }
+
+    public String getCustomId() {
+        return customId;
+    }
+
+    public void setCustomId(final String customId) {
+        this.customId = customId;
+    }
+
+    public ConventionModel getChild() {
+        return child;
+    }
+
+    public void setChild(final ConventionModel child) {
+        this.child = child;
+    }
+
+    public SimpleModel getSimpleModel() {
+        return simpleModel;
+    }
+
+    public void setSimpleModel(final SimpleModel simpleModel) {
+        this.simpleModel = simpleModel;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ConventionModel that = (ConventionModel) o;
+
+        if (getCustomId() != null ? !getCustomId().equals(that.getCustomId()) : that.getCustomId() != null) {
+            return false;
+        }
+        if (getChild() != null ? !getChild().equals(that.getChild()) : that.getChild() != null) {
+            return false;
+        }
+        if (getSimpleModel() != null ? !getSimpleModel().equals(that.getSimpleModel()) : that.getSimpleModel() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCustomId() != null ? getCustomId().hashCode() : 0;
+        result = 31 * result + (getChild() != null ? getChild().hashCode() : 0);
+        result = 31 * result + (getSimpleModel() != null ? getSimpleModel().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ConventionModel{"
+                + "customId='" + customId + "'"
+                + ", child=" + child
+                + ", simpleModel=" + simpleModel
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ConverterModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConverterModel.java
new file mode 100644
index 00000000000..f27d28aa529
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ConverterModel.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class ConverterModel {
+    private String id;
+    private String name;
+
+    public ConverterModel() {
+    }
+
+    public ConverterModel(final String id, final String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ConverterModel that = (ConverterModel) o;
+
+        if (getId() != null ? !getId().equals(that.getId()) : that.getId() != null) {
+            return false;
+        }
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId() != null ? getId().hashCode() : 0;
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/CustomPropertyCodecOptionalModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/CustomPropertyCodecOptionalModel.java
new file mode 100644
index 00000000000..c28da6da915
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/CustomPropertyCodecOptionalModel.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public class CustomPropertyCodecOptionalModel {
+    private final Optional<String> optionalField;
+
+    @BsonCreator
+    public CustomPropertyCodecOptionalModel(final @BsonProperty("optionalField") Optional<String> optionalField) {
+        this.optionalField = optionalField == null ? Optional.<String>empty() : optionalField;
+    }
+
+    public Optional<String> getOptionalField() {
+        return optionalField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CustomPropertyCodecOptionalModel that = (CustomPropertyCodecOptionalModel) o;
+
+        return optionalField != null ? optionalField.equals(that.optionalField) : that.optionalField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return optionalField != null ? optionalField.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "CustomPropertyCodecOptionalModel{"
+                + "optionalField=" + optionalField
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/DuplicateAnnotationAllowedModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/DuplicateAnnotationAllowedModel.java
new file mode 100644
index 00000000000..dd9aed8dc49
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/DuplicateAnnotationAllowedModel.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import javax.annotation.Nullable;
+
+public class DuplicateAnnotationAllowedModel {
+
+    @Nullable
+    private String id;
+
+    @BsonIgnore
+    private String ignoredString;
+
+    @BsonProperty("property")
+    private String propertyString;
+
+    public DuplicateAnnotationAllowedModel() {
+    }
+
+    public DuplicateAnnotationAllowedModel(final String id) {
+        this.id = id;
+    }
+
+    @Nullable
+    public String getId() {
+        return id;
+    }
+
+    public void setId(@Nullable final String id) {
+        this.id = id;
+    }
+
+    @BsonIgnore
+    public String getIgnoredString() {
+        return ignoredString;
+    }
+
+    @BsonIgnore
+    public void setIgnoredString(final String ignoredString) {
+        this.ignoredString = ignoredString;
+    }
+
+    @BsonProperty("property")
+    public String getPropertyString() {
+        return propertyString;
+    }
+
+    @BsonProperty("property")
+    public void setPropertyString(final String propertyString) {
+        this.propertyString = propertyString;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DuplicateAnnotationAllowedModel that = (DuplicateAnnotationAllowedModel) o;
+
+        return (id != null ? id.equals(that.id) : that.id == null);
+    }
+
+    @Override
+    public int hashCode() {
+        return id != null ? id.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/FieldAndPropertyTypeMismatchModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/FieldAndPropertyTypeMismatchModel.java
new file mode 100644
index 00000000000..c6cb93ce6a7
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/FieldAndPropertyTypeMismatchModel.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.Arrays;
+
+public class FieldAndPropertyTypeMismatchModel {
+    private byte[] stringField;
+
+    public FieldAndPropertyTypeMismatchModel() {
+    }
+
+    public FieldAndPropertyTypeMismatchModel(final String stringField) {
+        this.stringField = stringField.getBytes();
+    }
+
+    public String getStringField() {
+        return new String(stringField);
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField.getBytes();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        FieldAndPropertyTypeMismatchModel that = (FieldAndPropertyTypeMismatchModel) o;
+
+        return Arrays.equals(stringField, that.stringField);
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(stringField);
+    }
+
+    @Override
+    public String toString() {
+        return "FieldAndPropertyTypeMismatchModel{"
+                + "stringField=" + new String(stringField)
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/GenericHolderModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/GenericHolderModel.java
new file mode 100644
index 00000000000..1a40376cd95
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/GenericHolderModel.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class GenericHolderModel<P> {
+
+    private P myGenericField;
+    private Long myLongField;
+
+    public GenericHolderModel() {
+    }
+
+    public GenericHolderModel(final P myGenericField, final Long myLongField) {
+        this.myGenericField = myGenericField;
+        this.myLongField = myLongField;
+    }
+
+    public P getMyGenericField() {
+        return myGenericField;
+    }
+
+    public void setMyGenericField(final P myGenericField) {
+        this.myGenericField = myGenericField;
+    }
+
+    public Long getMyLongField() {
+        return myLongField;
+    }
+
+    public void setMyLongField(final Long myLongField) {
+        this.myLongField = myLongField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof GenericHolderModel)) {
+            return false;
+        }
+
+        GenericHolderModel<?> that = (GenericHolderModel<?>) o;
+
+        if (getMyGenericField() != null ? !getMyGenericField().equals(that.getMyGenericField()) : that.getMyGenericField() != null) {
+            return false;
+        }
+        if (getMyLongField() != null ? !getMyLongField().equals(that.getMyLongField()) : that.getMyLongField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getMyGenericField() != null ? getMyGenericField().hashCode() : 0;
+        result = 31 * result + (getMyLongField() != null ? getMyLongField().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/GenericTreeModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/GenericTreeModel.java
new file mode 100644
index 00000000000..92ee9d9f9c6
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/GenericTreeModel.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class GenericTreeModel<A, B> {
+
+    private A field1;
+    private B field2;
+    private GenericTreeModel<A, B> left;
+    private GenericTreeModel<A, B> right;
+
+    public GenericTreeModel() {
+    }
+
+    public GenericTreeModel(final A field1, final B field2, final GenericTreeModel<A, B> left, final GenericTreeModel<A, B> right) {
+        this.field1 = field1;
+        this.field2 = field2;
+        this.left = left;
+        this.right = right;
+    }
+
+    public A getField1() {
+        return field1;
+    }
+
+    public void setField1(final A field1) {
+        this.field1 = field1;
+    }
+
+    public B getField2() {
+        return field2;
+    }
+
+    public void setField2(final B field2) {
+        this.field2 = field2;
+    }
+
+    public GenericTreeModel<A, B> getLeft() {
+        return left;
+    }
+
+    public void setLeft(final GenericTreeModel<A, B> left) {
+        this.left = left;
+    }
+
+    public GenericTreeModel<A, B> getRight() {
+        return right;
+    }
+
+    public void setRight(final GenericTreeModel<A, B> right) {
+        this.right = right;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        GenericTreeModel<?, ?> that = (GenericTreeModel<?, ?>) o;
+
+        if (getField1() != null ? !getField1().equals(that.getField1()) : that.getField1() != null) {
+            return false;
+        }
+        if (getField2() != null ? !getField2().equals(that.getField2()) : that.getField2() != null) {
+            return false;
+        }
+        if (getLeft() != null ? !getLeft().equals(that.getLeft()) : that.getLeft() != null) {
+            return false;
+        }
+        if (getRight() != null ? !getRight().equals(that.getRight()) : that.getRight() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getField1() != null ? getField1().hashCode() : 0;
+        result = 31 * result + (getField2() != null ? getField2().hashCode() : 0);
+        result = 31 * result + (getLeft() != null ? getLeft().hashCode() : 0);
+        result = 31 * result + (getRight() != null ? getRight().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ImmutableList.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ImmutableList.java
new file mode 100644
index 00000000000..de65db6537e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ImmutableList.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+
+public final class ImmutableList<T> implements List<T> {
+
+    final List<T> list;
+
+    public static <T> ImmutableList<T> copyOf(final List<T> list) {
+        if (list instanceof ImmutableList) {
+            return (ImmutableList<T>) list;
+        } else {
+            return new ImmutableList<T>(new ArrayList<T>(list));
+        }
+    }
+
+    private ImmutableList(final List<T> list) {
+        this.list = list;
+    }
+
+    @Override
+    public int size() {
+        return list.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return list.isEmpty();
+    }
+
+    @Override
+    public boolean contains(final Object o) {
+        return list.contains(o);
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return list.iterator();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return list.toArray();
+    }
+
+    @Override
+    public <T1> T1[] toArray(final T1[] a) {
+        return list.toArray(a);
+    }
+
+    @Override
+    public boolean add(final T t) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean remove(final Object o) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean containsAll(final Collection<?> c) {
+        return list.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(final Collection<? extends T> c) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean addAll(final int index, final Collection<? extends T> c) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean removeAll(final Collection<?> c) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean retainAll(final Collection<?> c) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void clear() {
+
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        return list.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return list.hashCode();
+    }
+
+    @Override
+    public T get(final int index) {
+        return list.get(index);
+    }
+
+    @Override
+    public T set(final int index, final T element) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void add(final int index, final T element) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public T remove(final int index) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int indexOf(final Object o) {
+        return list.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(final Object o) {
+        return list.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<T> listIterator() {
+        return list.listIterator();
+    }
+
+    @Override
+    public ListIterator<T> listIterator(final int index) {
+        return list.listIterator(index);
+    }
+
+    @Override
+    public List<T> subList(final int fromIndex, final int toIndex) {
+        return new ImmutableList<T>(list.subList(fromIndex, toIndex));
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceBasedModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceBasedModel.java
new file mode 100644
index 00000000000..b641879b7df
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceBasedModel.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public interface InterfaceBasedModel {
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceGenericModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceGenericModel.java
new file mode 100644
index 00000000000..dab1683daae
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceGenericModel.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+
+public interface InterfaceGenericModel<T> {
+
+    T getPropertyA();
+
+    void setPropertyA(T property);
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelA.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelA.java
new file mode 100644
index 00000000000..a4771f4b3f5
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelA.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+
+public interface InterfaceModelA {
+
+    String getPropertyA();
+
+    void setPropertyA(String property);
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelAbstract.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelAbstract.java
new file mode 100644
index 00000000000..34a1a7c4350
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelAbstract.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public abstract class InterfaceModelAbstract implements InterfaceModelA {
+
+    private String propertyA;
+
+    public InterfaceModelAbstract() {
+    }
+
+    public InterfaceModelAbstract(final String propertyA) {
+        this.propertyA = propertyA;
+    }
+
+    @Override
+    public String getPropertyA() {
+        return propertyA;
+    }
+
+    @Override
+    public void setPropertyA(final String property) {
+        this.propertyA = property;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InterfaceModelAbstract that = (InterfaceModelAbstract) o;
+
+        if (getPropertyA() != null ? !getPropertyA().equals(that.getPropertyA()) : that.getPropertyA() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getPropertyA() != null ? getPropertyA().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelB.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelB.java
new file mode 100644
index 00000000000..687ac46af7e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelB.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+
+public interface InterfaceModelB extends InterfaceModelA {
+
+    String getPropertyB();
+
+    void setPropertyB(String propertyB);
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelImpl.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelImpl.java
new file mode 100644
index 00000000000..90828dc8e6e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceModelImpl.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class InterfaceModelImpl extends InterfaceModelAbstract implements InterfaceModelB {
+
+    private String propertyB;
+
+    public InterfaceModelImpl() {
+    }
+
+    public InterfaceModelImpl(final String propertyA, final String propertyB) {
+        super(propertyA);
+        this.propertyB = propertyB;
+    }
+
+    @Override
+    public String getPropertyB() {
+        return propertyB;
+    }
+
+    @Override
+    public void setPropertyB(final String propertyB) {
+        this.propertyB = propertyB;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InterfaceModelImpl that = (InterfaceModelImpl) o;
+
+        if (getPropertyA() != null ? !getPropertyA().equals(that.getPropertyA()) : that.getPropertyA() != null) {
+            return false;
+        }
+
+        if (getPropertyB() != null ? !getPropertyB().equals(that.getPropertyB()) : that.getPropertyB() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getPropertyA() != null ? getPropertyA().hashCode() : 0;
+        result = 31 * result + getPropertyB() != null ? getPropertyB().hashCode() : 0;
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModel.java
new file mode 100644
index 00000000000..e74cf54c5df
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModel.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public interface InterfaceUpperBoundsModel<T extends InterfaceModelA> {
+    T getNestedModel();
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModelAbstract.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModelAbstract.java
new file mode 100644
index 00000000000..451615aebe7
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModelAbstract.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+abstract class InterfaceUpperBoundsModelAbstract implements InterfaceUpperBoundsModel<InterfaceModelImpl> {
+    public abstract String getName();
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModelAbstractImpl.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModelAbstractImpl.java
new file mode 100644
index 00000000000..88f2df94325
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InterfaceUpperBoundsModelAbstractImpl.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class InterfaceUpperBoundsModelAbstractImpl extends InterfaceUpperBoundsModelAbstract {
+    private String name;
+    private InterfaceModelImpl nestedModel;
+
+    public InterfaceUpperBoundsModelAbstractImpl() {
+    }
+
+    public InterfaceUpperBoundsModelAbstractImpl(final String name, final InterfaceModelImpl nestedModel) {
+        this.name = name;
+        this.nestedModel = nestedModel;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public InterfaceModelImpl getNestedModel() {
+        return nestedModel;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public void setNestedModel(final InterfaceModelImpl nestedModel) {
+        this.nestedModel = nestedModel;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InterfaceUpperBoundsModelAbstractImpl that = (InterfaceUpperBoundsModelAbstractImpl) o;
+
+        if (name != null ? !name.equals(that.name) : that.name != null) {
+            return false;
+        }
+        return nestedModel != null ? nestedModel.equals(that.nestedModel) : that.nestedModel == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + (nestedModel != null ? nestedModel.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidCollection.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidCollection.java
new file mode 100644
index 00000000000..47df811674e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidCollection.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+@SuppressWarnings("rawtypes")
+public class InvalidCollection implements Collection {
+    private final List<Integer> wrapped;
+
+    public InvalidCollection(final List<Integer> wrapped) {
+        this.wrapped = new ArrayList<Integer>(wrapped);
+    }
+
+    @Override
+    public int size() {
+        return wrapped.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return wrapped.isEmpty();
+    }
+
+    @Override
+    public boolean contains(final Object o) {
+        return wrapped.contains(o);
+    }
+
+    @Override
+    public Iterator iterator() {
+        return wrapped.iterator();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return wrapped.toArray();
+    }
+
+    @Override
+    public boolean add(final Object o) {
+        return false;
+    }
+
+    @Override
+    public boolean remove(final Object o) {
+        return false;
+    }
+
+    @Override
+    public boolean addAll(final Collection c) {
+        return false;
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        InvalidCollection that = (InvalidCollection) o;
+        return wrapped.equals(that.wrapped);
+    }
+
+    @Override
+    public int hashCode() {
+        return wrapped.hashCode();
+    }
+
+    @Override
+    public boolean retainAll(final Collection c) {
+        return false;
+    }
+
+    @Override
+    public boolean removeAll(final Collection c) {
+        return false;
+    }
+
+    @Override
+    public boolean containsAll(final Collection c) {
+        return wrapped.containsAll(c);
+    }
+
+    @Override
+    public Object[] toArray(final Object[] a) {
+        return wrapped.toArray(a);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidCollectionModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidCollectionModel.java
new file mode 100644
index 00000000000..7a5f045bc67
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidCollectionModel.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+
+public class InvalidCollectionModel {
+
+    private InvalidCollection collectionField;
+
+    public InvalidCollectionModel() {
+    }
+
+    public InvalidCollectionModel(final List<Integer> list) {
+        this.collectionField = new InvalidCollection(list);
+    }
+
+    public InvalidCollection getCollectionField() {
+        return collectionField;
+    }
+
+    public void setCollectionField(final InvalidCollection collectionField) {
+        this.collectionField = collectionField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        InvalidCollectionModel that = (InvalidCollectionModel) o;
+        return collectionField.equals(that.collectionField);
+    }
+
+    @Override
+    public int hashCode() {
+        return collectionField.hashCode();
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidGetterAndSetterModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidGetterAndSetterModel.java
new file mode 100644
index 00000000000..c185505f17b
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidGetterAndSetterModel.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class InvalidGetterAndSetterModel {
+    private Integer integerField;
+    private String stringField;
+
+    public InvalidGetterAndSetterModel(){
+    }
+
+    public InvalidGetterAndSetterModel(final Integer integerField, final String stringField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        throw new UnsupportedOperationException("Nope");
+    }
+
+    public String getStringField() {
+        throw new UnsupportedOperationException("Nope");
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InvalidGetterAndSetterModel that = (InvalidGetterAndSetterModel) o;
+
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "InvalidGetterAndSetterModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidMapModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidMapModel.java
new file mode 100644
index 00000000000..c7e7ea67e58
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidMapModel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.Map;
+
+public final class InvalidMapModel {
+    private Map<Integer, Integer> invalidMap;
+
+    public InvalidMapModel() {
+    }
+
+    public InvalidMapModel(final Map<Integer, Integer> invalidMap) {
+        this.invalidMap = invalidMap;
+    }
+
+    public Map<Integer, Integer> getInvalidMap() {
+        return invalidMap;
+    }
+
+    public void setInvalidMap(final Map<Integer, Integer> invalidMap) {
+        this.invalidMap = invalidMap;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InvalidMapModel that = (InvalidMapModel) o;
+
+        return invalidMap != null ? invalidMap.equals(that.invalidMap) : that.invalidMap == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return invalidMap != null ? invalidMap.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidMapPropertyCodecProvider.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidMapPropertyCodecProvider.java
new file mode 100644
index 00000000000..4a66f47fe97
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidMapPropertyCodecProvider.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.pojo.PropertyCodecProvider;
+import org.bson.codecs.pojo.PropertyCodecRegistry;
+import org.bson.codecs.pojo.TypeWithTypeParameters;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class InvalidMapPropertyCodecProvider implements PropertyCodecProvider {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> Codec<T> get(final TypeWithTypeParameters<T> type, final PropertyCodecRegistry registry) {
+        if (Map.class.isAssignableFrom(type.getType()) && type.getTypeParameters().size() == 2
+                && type.getTypeParameters().get(0).getType().equals(Integer.class)
+                && type.getTypeParameters().get(1).getType().equals(Integer.class)) {
+            return (Codec<T>) new InvalidMapModelCodec((Class<Map<Integer, Integer>>) type.getType());
+        } else {
+            return null;
+        }
+    }
+
+    private static final class InvalidMapModelCodec implements Codec<Map<Integer, Integer>> {
+        private Class<Map<Integer, Integer>> encoderClass;
+
+        private InvalidMapModelCodec(final Class<Map<Integer, Integer>> encoderClass) {
+            this.encoderClass = encoderClass;
+        }
+
+        @Override
+        public Map<Integer, Integer> decode(final BsonReader reader, final DecoderContext decoderContext) {
+            Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+
+            reader.readStartDocument();
+            while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                map.put(Integer.valueOf(reader.readName()), reader.readInt32());
+            }
+            reader.readEndDocument();
+            return map;
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final Map<Integer, Integer> value, final EncoderContext encoderContext) {
+            writer.writeStartDocument();
+            for (Map.Entry<Integer, Integer> entry : value.entrySet()) {
+                writer.writeInt32(entry.getKey().toString(), entry.getValue());
+            }
+            writer.writeEndDocument();
+        }
+
+        @Override
+        public Class<Map<Integer, Integer>> getEncoderClass() {
+            return encoderClass;
+        }
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidSetterArgsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidSetterArgsModel.java
new file mode 100644
index 00000000000..f913025e3aa
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/InvalidSetterArgsModel.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class InvalidSetterArgsModel {
+    private Integer integerField;
+    private String stringField;
+
+    public InvalidSetterArgsModel(){
+    }
+
+    public InvalidSetterArgsModel(final Integer integerField, final String stringField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final Integer stringField) {
+        this.stringField = stringField.toString();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InvalidSetterArgsModel that = (InvalidSetterArgsModel) o;
+
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "InvalidSetterArgsModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/MapStringObjectModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/MapStringObjectModel.java
new file mode 100644
index 00000000000..45bd893f918
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/MapStringObjectModel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.Map;
+
+public class MapStringObjectModel {
+    private Map<String, Object> map;
+
+    public MapStringObjectModel() {
+    }
+
+    public MapStringObjectModel(final Map<String, Object> map) {
+        this.map = map;
+    }
+
+    public Map<String, Object> getMap() {
+        return map;
+    }
+
+    public void setMap(final Map<String, Object> map) {
+        this.map = map;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MapStringObjectModel that = (MapStringObjectModel) o;
+
+        return getMap() != null ? getMap().equals(that.getMap()) : that.getMap() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return getMap() != null ? getMap().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel1.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel1.java
new file mode 100644
index 00000000000..39fe4e156b2
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel1.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+import java.util.Map;
+
+public class MultipleBoundsLevel1<T> extends MultipleBoundsLevel2<Integer> {
+    private T level1;
+
+    public MultipleBoundsLevel1() {
+        super();
+    }
+
+    public MultipleBoundsLevel1(final Map<String, String> level3, final List<Integer> level2, final T level1) {
+        super(level3, level2);
+        this.level1 = level1;
+    }
+
+    public T getLevel1() {
+        return level1;
+    }
+
+    public void setLevel1(final T level1) {
+        this.level1 = level1;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        MultipleBoundsLevel1<?> that = (MultipleBoundsLevel1<?>) o;
+
+        if (level1 != null ? !level1.equals(that.level1) : that.level1 != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (level1 != null ? level1.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel2.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel2.java
new file mode 100644
index 00000000000..67406dae3aa
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel2.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+import java.util.Map;
+
+public class MultipleBoundsLevel2<T> extends MultipleBoundsLevel3<String> {
+    private List<T> level2;
+
+    public MultipleBoundsLevel2() {
+        super();
+    }
+
+    public MultipleBoundsLevel2(final Map<String, String> level3, final List<T> level2) {
+        super(level3);
+        this.level2 = level2;
+    }
+
+    public List<T> getLevel2() {
+        return level2;
+    }
+
+    public void setLevel2(final List<T> level2) {
+        this.level2 = level2;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        MultipleBoundsLevel2<?> that = (MultipleBoundsLevel2<?>) o;
+
+        if (level2 != null ? !level2.equals(that.level2) : that.level2 != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (level2 != null ? level2.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel3.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel3.java
new file mode 100644
index 00000000000..f5313c05e71
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsLevel3.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.Map;
+
+public class MultipleBoundsLevel3<T> {
+    private Map<String, T> level3;
+
+    public MultipleBoundsLevel3() {
+    }
+
+    public MultipleBoundsLevel3(final Map<String, T> level3) {
+        this.level3 = level3;
+    }
+
+    public Map<String, T> getLevel3() {
+        return level3;
+    }
+
+    public void setLevel3(final Map<String, T> level3) {
+        this.level3 = level3;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MultipleBoundsLevel3<?> that = (MultipleBoundsLevel3<?>) o;
+
+        if (level3 != null ? !level3.equals(that.level3) : that.level3 != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return level3 != null ? level3.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsModel.java
new file mode 100644
index 00000000000..66c8e080c09
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleBoundsModel.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+import java.util.Map;
+
+public final class MultipleBoundsModel extends MultipleBoundsLevel1<Double> {
+
+    public MultipleBoundsModel() {
+        super();
+    }
+
+    public MultipleBoundsModel(final Map<String, String> level3, final List<Integer> level2, final Double level1) {
+        super(level3, level2, level1);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleLevelGenericModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleLevelGenericModel.java
new file mode 100644
index 00000000000..dc25ee57b29
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/MultipleLevelGenericModel.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class MultipleLevelGenericModel<A> {
+
+    private A stringField;
+    private GenericTreeModel<A, Integer> nested;
+
+    public MultipleLevelGenericModel() {
+    }
+
+    public MultipleLevelGenericModel(final A stringField, final GenericTreeModel<A, Integer> nested) {
+        this.stringField = stringField;
+        this.nested = nested;
+    }
+
+    public A getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final A stringField) {
+        this.stringField = stringField;
+    }
+
+    public GenericTreeModel<A, Integer> getNested() {
+        return nested;
+    }
+
+    public void setNested(final GenericTreeModel<A, Integer> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MultipleLevelGenericModel<?> that = (MultipleLevelGenericModel<?>) o;
+
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+        if (getNested() != null ? !getNested().equals(that.getNested()) : that.getNested() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getStringField() != null ? getStringField().hashCode() : 0;
+        result = 31 * result + (getNested() != null ? getNested().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "MultipleLevelGenericModel{"
+                + "stringField=" + stringField
+                + ", nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedFieldReusingClassTypeParameter.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedFieldReusingClassTypeParameter.java
new file mode 100644
index 00000000000..98313294865
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedFieldReusingClassTypeParameter.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class NestedFieldReusingClassTypeParameter {
+    public PropertyReusingClassTypeParameter<String> nested;
+
+    public NestedFieldReusingClassTypeParameter() {
+    }
+
+    public NestedFieldReusingClassTypeParameter(final PropertyReusingClassTypeParameter<String> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedFieldReusingClassTypeParameter that = (NestedFieldReusingClassTypeParameter) o;
+
+        if (nested != null ? !nested.equals(that.nested) : that.nested != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return nested != null ? nested.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderFieldWithMultipleTypeParamsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderFieldWithMultipleTypeParamsModel.java
new file mode 100644
index 00000000000..fd5aefcd0b1
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderFieldWithMultipleTypeParamsModel.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class NestedGenericHolderFieldWithMultipleTypeParamsModel {
+
+    @BsonProperty(useDiscriminator = false)
+    private GenericHolderModel<PropertyWithMultipleTypeParamsModel<Integer, Long, String>> nested;
+
+    public NestedGenericHolderFieldWithMultipleTypeParamsModel() {
+    }
+
+    public NestedGenericHolderFieldWithMultipleTypeParamsModel(
+            final GenericHolderModel<PropertyWithMultipleTypeParamsModel<Integer, Long, String>> nested) {
+        this.nested = nested;
+    }
+
+    public GenericHolderModel<PropertyWithMultipleTypeParamsModel<Integer, Long, String>> getNested() {
+        return nested;
+    }
+
+    public void setNested(final GenericHolderModel<PropertyWithMultipleTypeParamsModel<Integer, Long, String>> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedGenericHolderFieldWithMultipleTypeParamsModel that = (NestedGenericHolderFieldWithMultipleTypeParamsModel) o;
+
+        if (getNested() != null ? !getNested().equals(that.getNested()) : that.getNested() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getNested() != null ? getNested().hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedGenericHolderFieldWithMultipleTypeParamsModel{"
+                + "nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderMapModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderMapModel.java
new file mode 100644
index 00000000000..50c8cf30ec6
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderMapModel.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.Map;
+
+public final class NestedGenericHolderMapModel {
+
+    private GenericHolderModel<Map<String, SimpleModel>> nested;
+
+    public NestedGenericHolderMapModel() {
+    }
+
+    public NestedGenericHolderMapModel(final GenericHolderModel<Map<String, SimpleModel>> nested) {
+        this.nested = nested;
+    }
+
+    public GenericHolderModel<Map<String, SimpleModel>> getNested() {
+        return nested;
+    }
+
+    public void setNested(final GenericHolderModel<Map<String, SimpleModel>> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof NestedGenericHolderMapModel)) {
+            return false;
+        }
+
+        NestedGenericHolderMapModel that = (NestedGenericHolderMapModel) o;
+
+        if (getNested() != null ? !getNested().equals(that.getNested()) : that.getNested() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getNested() != null ? getNested().hashCode() : 0;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedGenericHolderMapModel{"
+                + "nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderModel.java
new file mode 100644
index 00000000000..0979a25389c
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderModel.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class NestedGenericHolderModel {
+
+    private GenericHolderModel<String> nested;
+
+    public NestedGenericHolderModel() {
+    }
+
+    public NestedGenericHolderModel(final GenericHolderModel<String> nested) {
+        this.nested = nested;
+    }
+
+    public GenericHolderModel<String> getNested() {
+        return nested;
+    }
+
+    public void setNested(final GenericHolderModel<String> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof NestedGenericHolderModel)) {
+            return false;
+        }
+
+        NestedGenericHolderModel that = (NestedGenericHolderModel) o;
+
+        if (getNested() != null ? !getNested().equals(that.getNested()) : that.getNested() != null) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getNested() != null ? getNested().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderSimpleGenericsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderSimpleGenericsModel.java
new file mode 100644
index 00000000000..46285ed0411
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericHolderSimpleGenericsModel.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+import java.util.Map;
+
+public final class NestedGenericHolderSimpleGenericsModel {
+    private GenericHolderModel<SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>>> nested;
+
+    public NestedGenericHolderSimpleGenericsModel() {
+    }
+
+    public NestedGenericHolderSimpleGenericsModel(
+            final GenericHolderModel<SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>>> nested) {
+        this.nested = nested;
+    }
+
+    public GenericHolderModel<SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>>> getNested() {
+        return nested;
+    }
+
+    public void setNested(final GenericHolderModel<SimpleGenericsModel<Integer, List<SimpleModel>, Map<String, SimpleModel>>> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof NestedGenericHolderSimpleGenericsModel)) {
+            return false;
+        }
+
+        NestedGenericHolderSimpleGenericsModel that = (NestedGenericHolderSimpleGenericsModel) o;
+
+        if (nested != null ? !nested.equals(that.nested) : that.nested != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return nested != null ? nested.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedGenericHolderSimpleGenericsModel{"
+                + "nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericTreeModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericTreeModel.java
new file mode 100644
index 00000000000..17b384795ed
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedGenericTreeModel.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class NestedGenericTreeModel {
+    private Integer intField;
+    private GenericTreeModel<String, Integer> nested;
+
+    public NestedGenericTreeModel() {
+    }
+
+    public NestedGenericTreeModel(final Integer intField, final GenericTreeModel<String, Integer> nested) {
+        this.intField = intField;
+        this.nested = nested;
+    }
+
+    public Integer getIntField() {
+        return intField;
+    }
+
+    public void setIntField(final Integer intField) {
+        this.intField = intField;
+    }
+
+    public GenericTreeModel<String, Integer> getNested() {
+        return nested;
+    }
+
+    public void setNested(final GenericTreeModel<String, Integer> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedGenericTreeModel that = (NestedGenericTreeModel) o;
+
+        if (getIntField() != null ? !getIntField().equals(that.getIntField()) : that.getIntField() != null) {
+            return false;
+        }
+        if (getNested() != null ? !getNested().equals(that.getNested()) : that.getNested() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntField() != null ? getIntField().hashCode() : 0;
+        result = 31 * result + (getNested() != null ? getNested().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedGenericTreeModel{"
+                + "intField=" + intField
+                + ", nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedMultipleLevelGenericModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedMultipleLevelGenericModel.java
new file mode 100644
index 00000000000..ca8af3a3113
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedMultipleLevelGenericModel.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class NestedMultipleLevelGenericModel {
+    private Integer intField;
+    private MultipleLevelGenericModel<String> nested;
+
+    public NestedMultipleLevelGenericModel() {
+    }
+
+    public NestedMultipleLevelGenericModel(final Integer intField, final MultipleLevelGenericModel<String> nested) {
+        this.intField = intField;
+        this.nested = nested;
+    }
+
+    public Integer getIntField() {
+        return intField;
+    }
+
+    public void setIntField(final Integer intField) {
+        this.intField = intField;
+    }
+
+    public MultipleLevelGenericModel<String> getNested() {
+        return nested;
+    }
+
+    public void setNested(final MultipleLevelGenericModel<String> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedMultipleLevelGenericModel that = (NestedMultipleLevelGenericModel) o;
+
+        if (getIntField() != null ? !getIntField().equals(that.getIntField()) : that.getIntField() != null) {
+            return false;
+        }
+        if (getNested() != null ? !getNested().equals(that.getNested()) : that.getNested() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntField() != null ? getIntField().hashCode() : 0;
+        result = 31 * result + (getNested() != null ? getNested().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedMultipleLevelGenericModel{"
+                + "intField=" + intField
+                + ", nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedReusedGenericsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedReusedGenericsModel.java
new file mode 100644
index 00000000000..f3756f5b4bc
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedReusedGenericsModel.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+
+public final class NestedReusedGenericsModel {
+
+    private ReusedGenericsModel<Long, List<SimpleModel>, String> nested;
+
+    public NestedReusedGenericsModel() {
+    }
+
+    public NestedReusedGenericsModel(final ReusedGenericsModel<Long, List<SimpleModel>, String> nested) {
+        this.nested = nested;
+    }
+
+    /**
+     * Returns the nested
+     *
+     * @return the nested
+     */
+    public ReusedGenericsModel<Long, List<SimpleModel>, String> getNested() {
+        return nested;
+    }
+
+    public void setNested(final ReusedGenericsModel<Long, List<SimpleModel>, String> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof NestedReusedGenericsModel)) {
+            return false;
+        }
+
+        NestedReusedGenericsModel that = (NestedReusedGenericsModel) o;
+
+        if (getNested() != null ? !getNested().equals(that.getNested()) : that.getNested() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getNested() != null ? getNested().hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedReusedGenericsModel{"
+                + "nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSelfReferentialGenericHolderModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSelfReferentialGenericHolderModel.java
new file mode 100644
index 00000000000..4374ba92077
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSelfReferentialGenericHolderModel.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class NestedSelfReferentialGenericHolderModel {
+    private NestedSelfReferentialGenericModel<Boolean, Long, Double> nested;
+
+    public NestedSelfReferentialGenericHolderModel() {
+    }
+
+    public NestedSelfReferentialGenericHolderModel(final NestedSelfReferentialGenericModel<Boolean, Long, Double> nested) {
+        this.nested = nested;
+    }
+
+    public NestedSelfReferentialGenericModel<Boolean, Long, Double> getNested() {
+        return nested;
+    }
+
+    public void setNested(final NestedSelfReferentialGenericModel<Boolean, Long, Double> nested) {
+        this.nested = nested;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedSelfReferentialGenericHolderModel that = (NestedSelfReferentialGenericHolderModel) o;
+
+        if (nested != null ? !nested.equals(that.nested) : that.nested != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return nested != null ? nested.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedSelfReferentialGenericHolderModel{"
+                + "nested=" + nested
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSelfReferentialGenericModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSelfReferentialGenericModel.java
new file mode 100644
index 00000000000..37f201bd088
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSelfReferentialGenericModel.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class NestedSelfReferentialGenericModel<T, V, Z> {
+    private T t;
+    private V v;
+    private Z z;
+    private SelfReferentialGenericModel<T, V> selfRef1;
+    private SelfReferentialGenericModel<T, Z> selfRef2;
+
+    public NestedSelfReferentialGenericModel() {
+    }
+
+    public NestedSelfReferentialGenericModel(final T t, final V v, final Z z, final SelfReferentialGenericModel<T, V> selfRef1,
+                         final SelfReferentialGenericModel<T, Z> selfRef2) {
+        this.t = t;
+        this.v = v;
+        this.z = z;
+        this.selfRef1 = selfRef1;
+        this.selfRef2 = selfRef2;
+    }
+
+    public T getT() {
+        return t;
+    }
+
+    public void setT(final T t) {
+        this.t = t;
+    }
+
+    public V getV() {
+        return v;
+    }
+
+    public void setV(final V v) {
+        this.v = v;
+    }
+
+    public Z getZ() {
+        return z;
+    }
+
+    public void setZ(final Z z) {
+        this.z = z;
+    }
+
+    public SelfReferentialGenericModel<T, V> getSelfRef1() {
+        return selfRef1;
+    }
+
+    public void setSelfRef1(final SelfReferentialGenericModel<T, V> selfRef1) {
+        this.selfRef1 = selfRef1;
+    }
+
+    public SelfReferentialGenericModel<T, Z> getSelfRef2() {
+        return selfRef2;
+    }
+
+    public void setSelfRef2(final SelfReferentialGenericModel<T, Z> selfRef2) {
+        this.selfRef2 = selfRef2;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedSelfReferentialGenericModel<?, ?, ?> that = (NestedSelfReferentialGenericModel<?, ?, ?>) o;
+
+        if (t != null ? !t.equals(that.t) : that.t != null) {
+            return false;
+        }
+        if (v != null ? !v.equals(that.v) : that.v != null) {
+            return false;
+        }
+        if (z != null ? !z.equals(that.z) : that.z != null) {
+            return false;
+        }
+        if (selfRef1 != null ? !selfRef1.equals(that.selfRef1) : that.selfRef1 != null) {
+            return false;
+        }
+        if (selfRef2 != null ? !selfRef2.equals(that.selfRef2) : that.selfRef2 != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = t != null ? t.hashCode() : 0;
+        result = 31 * result + (v != null ? v.hashCode() : 0);
+        result = 31 * result + (z != null ? z.hashCode() : 0);
+        result = 31 * result + (selfRef1 != null ? selfRef1.hashCode() : 0);
+        result = 31 * result + (selfRef2 != null ? selfRef2.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedSelfReferentialGenericModel{"
+                + "t=" + t
+                + ", v=" + v
+                + ", z=" + z
+                + ", selfRef1=" + selfRef1
+                + ", selfRef2=" + selfRef2
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSimpleIdModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSimpleIdModel.java
new file mode 100644
index 00000000000..3bfa82e1ab3
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/NestedSimpleIdModel.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class NestedSimpleIdModel {
+    private String id;
+    private SimpleIdModel nestedSimpleIdModel;
+
+    public NestedSimpleIdModel(){
+    }
+
+    public NestedSimpleIdModel(final SimpleIdModel nestedSimpleIdModel) {
+        this(null, nestedSimpleIdModel);
+    }
+
+    public NestedSimpleIdModel(final String id, final SimpleIdModel nestedSimpleIdModel) {
+        this.id = id;
+        this.nestedSimpleIdModel = nestedSimpleIdModel;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public SimpleIdModel getNestedSimpleIdModel() {
+        return nestedSimpleIdModel;
+    }
+
+    public void setNestedSimpleIdModel(final SimpleIdModel nestedSimpleIdModel) {
+        this.nestedSimpleIdModel = nestedSimpleIdModel;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NestedSimpleIdModel that = (NestedSimpleIdModel) o;
+
+        if (id != null ? !id.equals(that.id) : that.id != null) {
+            return false;
+        }
+        return nestedSimpleIdModel != null ? nestedSimpleIdModel.equals(that.nestedSimpleIdModel) : that.nestedSimpleIdModel == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (nestedSimpleIdModel != null ? nestedSimpleIdModel.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "NestedSimpleIdModel{"
+                + "id='" + id + '\''
+                + ", nestedSimpleIdModel=" + nestedSimpleIdModel
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/Optional.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/Optional.java
new file mode 100644
index 00000000000..4ac1ae0e325
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/Optional.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+
+import java.util.NoSuchElementException;
+
+public abstract class Optional<T> {
+
+    private static final Optional<Object> NONE = new Optional<Object>() {
+        @Override
+        public Object get() {
+            throw new NoSuchElementException(".get call on None!");
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return true;
+        }
+    };
+
+    @SuppressWarnings("unchecked")
+    public static <T> Optional<T> empty() {
+        return (Optional<T>) NONE;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Optional<T> of(final T it) {
+        if (it == null) {
+            return (Optional<T>) Optional.NONE;
+        } else {
+            return new Optional.Some<T>(it);
+        }
+    }
+
+    public abstract T get();
+
+    public abstract boolean isEmpty();
+
+    @Override
+    public String toString() {
+        return "None";
+    }
+
+    public boolean isDefined() {
+        return !isEmpty();
+    }
+
+    public static class Some<T> extends Optional<T> {
+        private final T value;
+
+        Some(final T value) {
+            this.value = value;
+        }
+
+        @Override
+        public T get() {
+            return value;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("Some(%s)", value);
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            Some<?> some = (Some<?>) o;
+            return value.equals(some.value);
+        }
+
+        @Override
+        public int hashCode() {
+            return value.hashCode();
+        }
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/OptionalPropertyCodecProvider.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/OptionalPropertyCodecProvider.java
new file mode 100644
index 00000000000..12fa603ccc0
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/OptionalPropertyCodecProvider.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.bson.codecs.pojo.entities;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.pojo.PropertyCodecProvider;
+import org.bson.codecs.pojo.PropertyCodecRegistry;
+import org.bson.codecs.pojo.TypeWithTypeParameters;
+
+public class OptionalPropertyCodecProvider implements PropertyCodecProvider {
+    @Override
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public <T> Codec<T> get(final TypeWithTypeParameters<T> type, final PropertyCodecRegistry registry) {
+        if (Optional.class.isAssignableFrom(type.getType()) && type.getTypeParameters().size() == 1) {
+            Codec<?> valueCodec = registry.get(type.getTypeParameters().get(0));
+            return new OptionalCodec(type.getType(), valueCodec);
+        } else {
+            return null;
+        }
+    }
+
+    private static final class OptionalCodec<T> implements Codec<Optional<T>> {
+        private final Class<Optional<T>> encoderClass;
+        private final Codec<T> codec;
+
+        private OptionalCodec(final Class<Optional<T>> encoderClass, final Codec<T> codec) {
+            this.encoderClass = encoderClass;
+            this.codec = codec;
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final Optional<T> optionalValue, final EncoderContext encoderContext) {
+            if (optionalValue == null || optionalValue.isEmpty()) {
+                writer.writeNull();
+            } else {
+                codec.encode(writer, optionalValue.get(), encoderContext);
+            }
+        }
+
+        @Override
+        public Optional<T> decode(final BsonReader reader, final DecoderContext context) {
+            return Optional.of(codec.decode(reader, context));
+        }
+
+        @Override
+        public Class<Optional<T>> getEncoderClass() {
+            return encoderClass;
+        }
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/PrimitivesModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/PrimitivesModel.java
new file mode 100644
index 00000000000..bc8dcc633ea
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/PrimitivesModel.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class PrimitivesModel {
+
+    private boolean myBoolean;
+    private byte myByte;
+    private char myCharacter;
+    private double myDouble;
+    private float myFloat;
+    private int myInteger;
+    private long myLong;
+    private short myShort;
+
+    public PrimitivesModel() {
+    }
+
+    public PrimitivesModel(final boolean myBoolean, final byte myByte, final char myCharacter, final double myDouble,
+                           final float myFloat, final int myInteger, final long myLong, final short myShort) {
+        this.myBoolean = myBoolean;
+        this.myByte = myByte;
+        this.myCharacter = myCharacter;
+        this.myDouble = myDouble;
+        this.myFloat = myFloat;
+        this.myInteger = myInteger;
+        this.myLong = myLong;
+        this.myShort = myShort;
+    }
+
+    public boolean isMyBoolean() {
+        return myBoolean;
+    }
+
+    public void setMyBoolean(final boolean myBoolean) {
+        this.myBoolean = myBoolean;
+    }
+
+    public byte getMyByte() {
+        return myByte;
+    }
+
+    public void setMyByte(final byte myByte) {
+        this.myByte = myByte;
+    }
+
+    public char getMyCharacter() {
+        return myCharacter;
+    }
+
+    public void setMyCharacter(final char myCharacter) {
+        this.myCharacter = myCharacter;
+    }
+
+    public double getMyDouble() {
+        return myDouble;
+    }
+
+    public void setMyDouble(final double myDouble) {
+        this.myDouble = myDouble;
+    }
+
+    public float getMyFloat() {
+        return myFloat;
+    }
+
+    public void setMyFloat(final float myFloat) {
+        this.myFloat = myFloat;
+    }
+
+    public int getMyInteger() {
+        return myInteger;
+    }
+
+    public void setMyInteger(final int myInteger) {
+        this.myInteger = myInteger;
+    }
+
+    public long getMyLong() {
+        return myLong;
+    }
+
+    public void setMyLong(final long myLong) {
+        this.myLong = myLong;
+    }
+
+    public short getMyShort() {
+        return myShort;
+    }
+
+    public void setMyShort(final short myShort) {
+        this.myShort = myShort;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PrimitivesModel that = (PrimitivesModel) o;
+
+        if (isMyBoolean() != that.isMyBoolean()) {
+            return false;
+        }
+        if (getMyByte() != that.getMyByte()) {
+            return false;
+        }
+        if (getMyCharacter() != that.getMyCharacter()) {
+            return false;
+        }
+        if (Double.compare(that.getMyDouble(), getMyDouble()) != 0) {
+            return false;
+        }
+        if (Float.compare(that.getMyFloat(), getMyFloat()) != 0) {
+            return false;
+        }
+        if (getMyInteger() != that.getMyInteger()) {
+            return false;
+        }
+        if (getMyLong() != that.getMyLong()) {
+            return false;
+        }
+        if (getMyShort() != that.getMyShort()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        result = (isMyBoolean() ? 1 : 0);
+        result = 31 * result + (int) getMyByte();
+        result = 31 * result + (int) getMyCharacter();
+        temp = Double.doubleToLongBits(getMyDouble());
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        result = 31 * result + (getMyFloat() != +0.0f ? Float.floatToIntBits(getMyFloat()) : 0);
+        result = 31 * result + getMyInteger();
+        result = 31 * result + (int) (getMyLong() ^ (getMyLong() >>> 32));
+        result = 31 * result + (int) getMyShort();
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/PrivateSetterFieldModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/PrivateSetterFieldModel.java
new file mode 100644
index 00000000000..8580aec4dec
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/PrivateSetterFieldModel.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+
+public final class PrivateSetterFieldModel {
+
+    private Integer integerField;
+    private String stringField;
+    private List<String> listField;
+
+    public PrivateSetterFieldModel(){
+    }
+
+    public PrivateSetterFieldModel(final Integer integerField, final String stringField, final List<String> listField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+        this.listField = listField;
+    }
+
+    public String getSomeMethod() {
+        return "some method";
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public List<String> getListField() {
+        return listField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PrivateSetterFieldModel that = (PrivateSetterFieldModel) o;
+
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+        return getListField() != null ? getListField().equals(that.getListField()) : that.getListField() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (getListField() != null ? getListField().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertyReusingClassTypeParameter.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertyReusingClassTypeParameter.java
new file mode 100644
index 00000000000..219c1e3ed14
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertyReusingClassTypeParameter.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class PropertyReusingClassTypeParameter<A> {
+
+    public GenericTreeModel<A, A> tree;
+
+    public PropertyReusingClassTypeParameter(){
+    }
+
+    public PropertyReusingClassTypeParameter(final GenericTreeModel<A, A> tree) {
+        this.tree = tree;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PropertyReusingClassTypeParameter<?> that = (PropertyReusingClassTypeParameter<?>) o;
+
+        if (tree != null ? !tree.equals(that.tree) : that.tree != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return tree != null ? tree.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertySelectionModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertySelectionModel.java
new file mode 100644
index 00000000000..3b935ccb2de
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertySelectionModel.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+
+public final class PropertySelectionModel {
+    private String stringField = "stringField";
+
+    private final String finalStringField = "finalStringField";
+
+    @BsonIgnore
+    private String ignoredStringField = "ignoreMe";
+
+    private String anotherIgnoredStringField = "ignoreMe";
+
+    private static final String staticFinalStringField = "staticFinalStringField";
+
+    private static String staticStringField = "staticStringField";
+
+    private transient String transientString = "transientString";
+
+    public PropertySelectionModel() {
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    public String getFinalStringField() {
+        return finalStringField;
+    }
+
+    public void setFinalStringField(final String finalStringField) {
+        throw new IllegalStateException("Not allowed");
+    }
+
+    public static String getStaticFinalStringField() {
+        return staticFinalStringField;
+    }
+
+    public void setStaticFinalStringField(final String staticFinalStringField) {
+        throw new IllegalStateException("Not allowed");
+    }
+
+    public static String getStaticStringField() {
+        return staticStringField;
+    }
+
+    public static void setStaticStringField(final String staticStringField) {
+        throw new IllegalStateException("Not allowed");
+    }
+
+    public String getTransientString() {
+        return transientString;
+    }
+
+    public void setTransientString(final String transientString) {
+        throw new IllegalStateException("Not allowed");
+    }
+
+    public String getIgnoredStringField() {
+        return ignoredStringField;
+    }
+
+    public void setIgnoredStringField(final String ignoredStringField) {
+        this.ignoredStringField = ignoredStringField;
+    }
+
+    @BsonIgnore
+    public String getAnotherIgnoredStringField() {
+        return anotherIgnoredStringField;
+    }
+
+    @BsonIgnore
+    public void setAnotherIgnoredStringField(final String anotherIgnoredStringField) {
+        this.anotherIgnoredStringField = anotherIgnoredStringField;
+    }
+
+    public int getfoo() {
+        return 42;
+    }
+
+    public void setfoo(final int foo) {
+    }
+
+    public void is() {
+    }
+
+    public void isfoo() {
+    }
+
+    public int get() {
+        return 42;
+    }
+
+    public void set(final int foo) {
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PropertySelectionModel that = (PropertySelectionModel) o;
+
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+        if (getFinalStringField() != null ? !getFinalStringField().equals(that.getFinalStringField())
+                : that.getFinalStringField() != null) {
+            return false;
+        }
+        if (getTransientString() != null ? !getTransientString().equals(that.getTransientString()) : that.getTransientString() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getStringField() != null ? getStringField().hashCode() : 0;
+        result = 31 * result + (getFinalStringField() != null ? getFinalStringField().hashCode() : 0);
+        result = 31 * result + (getTransientString() != null ? getTransientString().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertyWithMultipleTypeParamsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertyWithMultipleTypeParamsModel.java
new file mode 100644
index 00000000000..c0dbe349b34
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/PropertyWithMultipleTypeParamsModel.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+@BsonDiscriminator("PropertyWithMultipleTypeParamsModel")
+public final class PropertyWithMultipleTypeParamsModel<C, A, B> {
+
+    @BsonProperty(useDiscriminator = true)
+    private SimpleGenericsModel<A, B, C> simpleGenericsModel;
+
+    public PropertyWithMultipleTypeParamsModel() {
+    }
+
+    public PropertyWithMultipleTypeParamsModel(final SimpleGenericsModel<A, B, C> simpleGenericsModel) {
+        this.simpleGenericsModel = simpleGenericsModel;
+    }
+
+    public SimpleGenericsModel<A, B, C> getSimpleGenericsModel() {
+        return simpleGenericsModel;
+    }
+
+    public void setSimpleGenericsModel(final SimpleGenericsModel<A, B, C> simpleGenericsModel) {
+        this.simpleGenericsModel = simpleGenericsModel;
+    }
+
+    @Override
+    public String toString() {
+        return "PropertyWithMultipleTypeParamsModel{"
+                + "nested=" + simpleGenericsModel
+                + "}";
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof PropertyWithMultipleTypeParamsModel)) {
+            return false;
+        }
+
+        PropertyWithMultipleTypeParamsModel<?, ?, ?> that = (PropertyWithMultipleTypeParamsModel<?, ?, ?>) o;
+
+        if (getSimpleGenericsModel() != null ? !getSimpleGenericsModel().equals(that.getSimpleGenericsModel())
+                : that.getSimpleGenericsModel() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getSimpleGenericsModel() != null ? getSimpleGenericsModel().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ReusedGenericsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ReusedGenericsModel.java
new file mode 100644
index 00000000000..66d31ab4721
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ReusedGenericsModel.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class ReusedGenericsModel<A, B, C> {
+
+    private A field1;
+    private B field2;
+    private C field3;
+    private Integer field4;
+    private C field5;
+    private B field6;
+    private A field7;
+    private String field8;
+
+    public ReusedGenericsModel() {
+    }
+
+    public ReusedGenericsModel(final A field1, final B field2, final C field3, final Integer field4, final C field5, final B field6,
+                               final A field7, final String field8) {
+        this.field1 = field1;
+        this.field2 = field2;
+        this.field3 = field3;
+        this.field4 = field4;
+        this.field5 = field5;
+        this.field6 = field6;
+        this.field7 = field7;
+        this.field8 = field8;
+    }
+
+    /**
+     * Returns the field1
+     *
+     * @return the field1
+     */
+    public A getField1() {
+        return field1;
+    }
+
+    public void setField1(final A field1) {
+        this.field1 = field1;
+    }
+
+    /**
+     * Returns the field2
+     *
+     * @return the field2
+     */
+    public B getField2() {
+        return field2;
+    }
+
+    public void setField2(final B field2) {
+        this.field2 = field2;
+    }
+
+    /**
+     * Returns the field3
+     *
+     * @return the field3
+     */
+    public C getField3() {
+        return field3;
+    }
+
+    public void setField3(final C field3) {
+        this.field3 = field3;
+    }
+
+    /**
+     * Returns the field4
+     *
+     * @return the field4
+     */
+    public Integer getField4() {
+        return field4;
+    }
+
+    public void setField4(final Integer field4) {
+        this.field4 = field4;
+    }
+
+    /**
+     * Returns the field5
+     *
+     * @return the field5
+     */
+    public C getField5() {
+        return field5;
+    }
+
+    public void setField5(final C field5) {
+        this.field5 = field5;
+    }
+
+    /**
+     * Returns the field6
+     *
+     * @return the field6
+     */
+    public B getField6() {
+        return field6;
+    }
+
+    public void setField6(final B field6) {
+        this.field6 = field6;
+    }
+
+    /**
+     * Returns the field7
+     *
+     * @return the field7
+     */
+    public A getField7() {
+        return field7;
+    }
+
+    public void setField7(final A field7) {
+        this.field7 = field7;
+    }
+
+    /**
+     * Returns the field8
+     *
+     * @return the field8
+     */
+    public String getField8() {
+        return field8;
+    }
+
+    public void setField8(final String field8) {
+        this.field8 = field8;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ReusedGenericsModel)) {
+            return false;
+        }
+
+        ReusedGenericsModel<?, ?, ?> that = (ReusedGenericsModel<?, ?, ?>) o;
+
+        if (getField1() != null ? !getField1().equals(that.getField1()) : that.getField1() != null) {
+            return false;
+        }
+        if (getField2() != null ? !getField2().equals(that.getField2()) : that.getField2() != null) {
+            return false;
+        }
+        if (getField3() != null ? !getField3().equals(that.getField3()) : that.getField3() != null) {
+            return false;
+        }
+        if (getField4() != null ? !getField4().equals(that.getField4()) : that.getField4() != null) {
+            return false;
+        }
+        if (getField5() != null ? !getField5().equals(that.getField5()) : that.getField5() != null) {
+            return false;
+        }
+        if (getField6() != null ? !getField6().equals(that.getField6()) : that.getField6() != null) {
+            return false;
+        }
+        if (getField7() != null ? !getField7().equals(that.getField7()) : that.getField7() != null) {
+            return false;
+        }
+        if (getField8() != null ? !getField8().equals(that.getField8()) : that.getField8() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getField1() != null ? getField1().hashCode() : 0;
+        result = 31 * result + (getField2() != null ? getField2().hashCode() : 0);
+        result = 31 * result + (getField3() != null ? getField3().hashCode() : 0);
+        result = 31 * result + (getField4() != null ? getField4().hashCode() : 0);
+        result = 31 * result + (getField5() != null ? getField5().hashCode() : 0);
+        result = 31 * result + (getField6() != null ? getField6().hashCode() : 0);
+        result = 31 * result + (getField7() != null ? getField7().hashCode() : 0);
+        result = 31 * result + (getField8() != null ? getField8().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ReusedGenericsModel{"
+                + "field1=" + field1
+                + ", field2=" + field2
+                + ", field3=" + field3
+                + ", field4=" + field4
+                + ", field5=" + field5
+                + ", field6=" + field6
+                + ", field7=" + field7
+                + ", field8='" + field8 + "'"
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SelfReferentialGenericModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SelfReferentialGenericModel.java
new file mode 100644
index 00000000000..c6bb12f9b9d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SelfReferentialGenericModel.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class SelfReferentialGenericModel<T, V> {
+    private T t;
+    private V v;
+    private SelfReferentialGenericModel<V, T> child;
+
+    public SelfReferentialGenericModel() {
+    }
+
+    public SelfReferentialGenericModel(final T t, final V v, final SelfReferentialGenericModel<V, T> child) {
+        this.t = t;
+        this.v = v;
+        this.child = child;
+    }
+
+    public T getT() {
+        return t;
+    }
+
+    public void setT(final T t) {
+        this.t = t;
+    }
+
+    public V getV() {
+        return v;
+    }
+
+    public void setV(final V v) {
+        this.v = v;
+    }
+
+    public SelfReferentialGenericModel<V, T> getChild() {
+        return child;
+    }
+
+    public void setChild(final SelfReferentialGenericModel<V, T> child) {
+        this.child = child;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SelfReferentialGenericModel<?, ?> that = (SelfReferentialGenericModel<?, ?>) o;
+
+        if (t != null ? !t.equals(that.t) : that.t != null) {
+            return false;
+        }
+        if (v != null ? !v.equals(that.v) : that.v != null) {
+            return false;
+        }
+        if (child != null ? !child.equals(that.child) : that.child != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = t != null ? t.hashCode() : 0;
+        result = 31 * result + (v != null ? v.hashCode() : 0);
+        result = 31 * result + (child != null ? child.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "SelfReferentialGenericModel{"
+                + "t=" + t
+                + ", v=" + v
+                + ", child=" + child
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeHolderCircleModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeHolderCircleModel.java
new file mode 100644
index 00000000000..ca2dd40afa6
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeHolderCircleModel.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class ShapeHolderCircleModel extends ShapeHolderModel {
+
+    public ShapeHolderCircleModel() {
+    }
+
+    public ShapeHolderCircleModel(final ShapeModelCircle shape) {
+        super(shape);
+    }
+
+    @Override
+    public ShapeModelCircle getShape() {
+        return (ShapeModelCircle) super.getShape();
+    }
+}
+
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeHolderModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeHolderModel.java
new file mode 100644
index 00000000000..2ccd6c4f477
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeHolderModel.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class ShapeHolderModel {
+
+    private ShapeModelAbstract shape;
+
+    public ShapeHolderModel() {
+    }
+
+    public ShapeHolderModel(final ShapeModelAbstract shape) {
+        this.shape = shape;
+    }
+
+    public ShapeModelAbstract getShape() {
+        return shape;
+    }
+
+    public void setShape(final ShapeModelAbstract shape) {
+        this.shape = shape;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ShapeHolderModel)) {
+            return false;
+        }
+
+        ShapeHolderModel that = (ShapeHolderModel) o;
+
+        if (getShape() != null ? !getShape().equals(that.getShape()) : that.getShape() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getShape() != null ? getShape().hashCode() : 0;
+    }
+}
+
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelAbstract.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelAbstract.java
new file mode 100644
index 00000000000..9b0524fe26c
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelAbstract.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator()
+public abstract class ShapeModelAbstract {
+
+    private String color;
+
+    public ShapeModelAbstract() {
+    }
+
+    public ShapeModelAbstract(final String color) {
+        this.color = color;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(final String color) {
+        this.color = color;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ShapeModelAbstract)) {
+            return false;
+        }
+
+        ShapeModelAbstract that = (ShapeModelAbstract) o;
+
+        if (getColor() != null ? !getColor().equals(that.getColor()) : that.getColor() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getColor() != null ? getColor().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelCircle.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelCircle.java
new file mode 100644
index 00000000000..d2d544e3f84
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelCircle.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class ShapeModelCircle extends ShapeModelAbstract {
+
+    private Double radius;
+
+    public ShapeModelCircle() {
+    }
+
+    public ShapeModelCircle(final String color, final Double radius) {
+        super(color);
+        this.radius = radius;
+    }
+
+    public Double getRadius() {
+        return radius;
+    }
+
+    public void setRadius(final Double radius) {
+        this.radius = radius;
+    }
+
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ShapeModelCircle)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        ShapeModelCircle that = (ShapeModelCircle) o;
+
+        if (getRadius() != null ? !getRadius().equals(that.getRadius()) : that.getRadius() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (getRadius() != null ? getRadius().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelRectangle.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelRectangle.java
new file mode 100644
index 00000000000..d644cea85b8
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/ShapeModelRectangle.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class ShapeModelRectangle extends ShapeModelAbstract {
+
+    private Double width;
+    private Double height;
+
+    public ShapeModelRectangle() {
+    }
+
+    public ShapeModelRectangle(final String color, final Double width, final Double height) {
+        super(color);
+        this.width = width;
+        this.height = height;
+    }
+
+    public Double getWidth() {
+        return width;
+    }
+
+    public void setWidth(final Double width) {
+        this.width = width;
+    }
+
+    public Double getHeight() {
+        return height;
+    }
+
+    public void setHeight(final Double height) {
+        this.height = height;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof ShapeModelRectangle)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        ShapeModelRectangle that = (ShapeModelRectangle) o;
+
+        if (getWidth() != null ? !getWidth().equals(that.getWidth()) : that.getWidth() != null) {
+            return false;
+        }
+        if (getHeight() != null ? !getHeight().equals(that.getHeight()) : that.getHeight() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (getWidth() != null ? getWidth().hashCode() : 0);
+        result = 31 * result + (getHeight() != null ? getHeight().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleEnum.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleEnum.java
new file mode 100644
index 00000000000..a7830c1991a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleEnum.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public enum SimpleEnum {
+    ALPHA,
+    BRAVO,
+    CHARLIE
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleEnumModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleEnumModel.java
new file mode 100644
index 00000000000..394f2a72b24
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleEnumModel.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class SimpleEnumModel {
+
+    private SimpleEnum myEnum;
+
+    public SimpleEnumModel() {
+    }
+
+    public SimpleEnumModel(final SimpleEnum myEnum) {
+        this.myEnum = myEnum;
+    }
+
+    /**
+     * Returns the myEnum
+     *
+     * @return the myEnum
+     */
+    public SimpleEnum getMyEnum() {
+        return myEnum;
+    }
+
+    /**
+     * Sets the myEnum
+     *
+     * @param myEnum the myEnum
+     * @return this
+     */
+    public SimpleEnumModel setMyEnum(final SimpleEnum myEnum) {
+        this.myEnum = myEnum;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SimpleEnumModel that = (SimpleEnumModel) o;
+
+        if (getMyEnum() != that.getMyEnum()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getMyEnum() != null ? getMyEnum().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleGenericsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleGenericsModel.java
new file mode 100644
index 00000000000..4753953240e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleGenericsModel.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import java.util.List;
+import java.util.Map;
+
+public final class SimpleGenericsModel<T, V, Z> {
+    private Integer myIntegerField;
+    private T myGenericField;
+    private List<V> myListField;
+    private Map<String, Z> myMapField;
+
+    public SimpleGenericsModel() {
+    }
+
+    public SimpleGenericsModel(final Integer myIntegerField, final T myGenericField, final List<V> myListField, final Map<String, Z>
+            myMapField) {
+        this.myIntegerField = myIntegerField;
+        this.myGenericField = myGenericField;
+        this.myListField = myListField;
+        this.myMapField = myMapField;
+    }
+
+    public Integer getMyIntegerField() {
+        return myIntegerField;
+    }
+
+    public void setMyIntegerField(final Integer myIntegerField) {
+        this.myIntegerField = myIntegerField;
+    }
+
+    public T getMyGenericField() {
+        return myGenericField;
+    }
+
+    public void setMyGenericField(final T myGenericField) {
+        this.myGenericField = myGenericField;
+    }
+
+    public List<V> getMyListField() {
+        return myListField;
+    }
+
+    public void setMyListField(final List<V> myListField) {
+        this.myListField = myListField;
+    }
+
+    public Map<String, Z> getMyMapField() {
+        return myMapField;
+    }
+
+    public void setMyMapField(final Map<String, Z> myMapField) {
+        this.myMapField = myMapField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SimpleGenericsModel<?, ?, ?> that = (SimpleGenericsModel<?, ?, ?>) o;
+
+        if (getMyIntegerField() != null ? !getMyIntegerField().equals(that.getMyIntegerField()) : that.getMyIntegerField() != null) {
+            return false;
+        }
+        if (getMyGenericField() != null ? !getMyGenericField().equals(that.getMyGenericField()) : that.getMyGenericField() != null) {
+            return false;
+        }
+        if (getMyListField() != null ? !getMyListField().equals(that.getMyListField()) : that.getMyListField() != null) {
+            return false;
+        }
+        if (getMyMapField() != null ? !getMyMapField().equals(that.getMyMapField()) : that.getMyMapField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getMyIntegerField() != null ? getMyIntegerField().hashCode() : 0;
+        result = 31 * result + (getMyGenericField() != null ? getMyGenericField().hashCode() : 0);
+        result = 31 * result + (getMyListField() != null ? getMyListField().hashCode() : 0);
+        result = 31 * result + (getMyMapField() != null ? getMyMapField().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "SimpleGenericsModel{"
+                + "myIntegerField=" + myIntegerField
+                + ", myGenericField=" + myGenericField
+                + ", myListField=" + myListField
+                + ", myMapField=" + myMapField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleIdImmutableModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleIdImmutableModel.java
new file mode 100644
index 00000000000..fe604680e09
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleIdImmutableModel.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.bson.types.ObjectId;
+
+public class SimpleIdImmutableModel {
+    private final ObjectId id;
+    private final Integer integerField;
+    private final String stringField;
+
+    public SimpleIdImmutableModel(final Integer integerField, final String stringField){
+        this(null, integerField, stringField);
+    }
+
+    @BsonCreator
+    public SimpleIdImmutableModel(@BsonProperty("id") final ObjectId id,
+                                  @BsonProperty("integerField") final Integer integerField,
+                                  @BsonProperty("stringField") final String stringField) {
+        this.id = id;
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SimpleIdImmutableModel that = (SimpleIdImmutableModel) o;
+
+        if (id != null ? !id.equals(that.id) : that.id != null) {
+            return false;
+        }
+        if (integerField != null ? !integerField.equals(that.integerField) : that.integerField != null) {
+            return false;
+        }
+        return stringField != null ? stringField.equals(that.stringField) : that.stringField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (integerField != null ? integerField.hashCode() : 0);
+        result = 31 * result + (stringField != null ? stringField.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "SimpleIdImmutableModel{"
+                + "id=" + id
+                + ", integerField=" + integerField
+                + ", stringField='" + stringField + '\''
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleIdModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleIdModel.java
new file mode 100644
index 00000000000..801bb6fbe33
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleIdModel.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.types.ObjectId;
+
+public class SimpleIdModel {
+    private ObjectId id;
+    private Integer integerField;
+    private String stringField;
+
+    public SimpleIdModel(){
+    }
+
+    public SimpleIdModel(final Integer integerField, final String stringField) {
+        this(null, integerField, stringField);
+    }
+
+    public SimpleIdModel(final ObjectId objectId, final Integer integerField, final String stringField) {
+        this.id = objectId;
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public void setId(final ObjectId id) {
+        this.id = id;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SimpleIdModel that = (SimpleIdModel) o;
+
+        if (id != null ? !id.equals(that.id) : that.id != null) {
+            return false;
+        }
+        if (integerField != null ? !integerField.equals(that.integerField) : that.integerField != null) {
+            return false;
+        }
+        return stringField != null ? stringField.equals(that.stringField) : that.stringField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (integerField != null ? integerField.hashCode() : 0);
+        result = 31 * result + (stringField != null ? stringField.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "SimpleIdModel{"
+                + "id=" + id
+                + ", integerField=" + integerField
+                + ", stringField='" + stringField + '\''
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleModel.java
new file mode 100644
index 00000000000..91e43e1e415
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleModel.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class SimpleModel {
+    private Integer integerField;
+    private String stringField;
+
+    public SimpleModel(){
+    }
+
+    public SimpleModel(final Integer integerField, final String stringField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SimpleModel that = (SimpleModel) o;
+
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "SimpleModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleNestedPojoModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleNestedPojoModel.java
new file mode 100644
index 00000000000..6682b5c376d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleNestedPojoModel.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class SimpleNestedPojoModel {
+    private SimpleModel simple;
+
+    public SimpleNestedPojoModel() {
+    }
+
+    public SimpleNestedPojoModel(final SimpleModel simple) {
+        this.simple = simple;
+    }
+
+    public SimpleModel getSimple() {
+        return simple;
+    }
+
+    public void setSimple(final SimpleModel simple) {
+        this.simple = simple;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SimpleNestedPojoModel that = (SimpleNestedPojoModel) o;
+
+        if (getSimple() != null ? !getSimple().equals(that.getSimple()) : that.getSimple() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return getSimple() != null ? getSimple().hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/TreeWithIdModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/TreeWithIdModel.java
new file mode 100644
index 00000000000..106ea33a9d8
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/TreeWithIdModel.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+import org.bson.types.ObjectId;
+
+public class TreeWithIdModel {
+    private ObjectId id;
+    private String level;
+    private TreeWithIdModel left;
+    private TreeWithIdModel right;
+
+    public TreeWithIdModel() {
+    }
+
+    public TreeWithIdModel(final String level) {
+        this(null, level, null, null);
+    }
+
+    public TreeWithIdModel(final String level, final TreeWithIdModel left, final TreeWithIdModel right) {
+        this(null, level, left, right);
+    }
+
+    public TreeWithIdModel(final ObjectId id, final String level, final TreeWithIdModel left, final TreeWithIdModel right) {
+        this.id = id;
+        this.level = level;
+        this.left = left;
+        this.right = right;
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public void setId(final ObjectId id) {
+        this.id = id;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(final String level) {
+        this.level = level;
+    }
+
+    public TreeWithIdModel getLeft() {
+        return left;
+    }
+
+    public void setLeft(final TreeWithIdModel left) {
+        this.left = left;
+    }
+
+    public TreeWithIdModel getRight() {
+        return right;
+    }
+
+    public void setRight(final TreeWithIdModel right) {
+        this.right = right;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TreeWithIdModel that = (TreeWithIdModel) o;
+
+        if (id != null ? !id.equals(that.id) : that.id != null) {
+            return false;
+        }
+        if (level != null ? !level.equals(that.level) : that.level != null) {
+            return false;
+        }
+        if (left != null ? !left.equals(that.left) : that.left != null) {
+            return false;
+        }
+        return right != null ? right.equals(that.right) : that.right == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (level != null ? level.hashCode() : 0);
+        result = 31 * result + (left != null ? left.hashCode() : 0);
+        result = 31 * result + (right != null ? right.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "TreeWithIdModel{"
+                + "id=" + id
+                + ", level=" + level
+                + ", left=" + left
+                + ", right=" + right
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/UpperBoundsConcreteModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/UpperBoundsConcreteModel.java
new file mode 100644
index 00000000000..b0b6964334c
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/UpperBoundsConcreteModel.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public final class UpperBoundsConcreteModel extends UpperBoundsModel<Long> {
+
+    public UpperBoundsConcreteModel() {
+        super();
+    }
+
+    public UpperBoundsConcreteModel(final Long myGenericField) {
+        super(myGenericField);
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/UpperBoundsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/UpperBoundsModel.java
new file mode 100644
index 00000000000..31cfe6acc53
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/UpperBoundsModel.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities;
+
+public class UpperBoundsModel<T extends Number> {
+    private T myGenericField;
+
+    public UpperBoundsModel() {
+    }
+
+    public UpperBoundsModel(final T myGenericField) {
+        this.myGenericField = myGenericField;
+    }
+
+    public T getMyGenericField() {
+        return myGenericField;
+    }
+
+    public void setMyGenericField(final T myGenericField) {
+        this.myGenericField = myGenericField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        UpperBoundsModel<?> that = (UpperBoundsModel<?>) o;
+
+        if (myGenericField != null ? !myGenericField.equals(that.myGenericField) : that.myGenericField != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return myGenericField != null ? myGenericField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationAbstract.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationAbstract.java
new file mode 100644
index 00000000000..0257ee71b17
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationAbstract.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+@BsonDiscriminator(key = "_key")
+public abstract class AnnotationAbstract {
+
+    @BsonProperty
+    public AnnotationModel child;
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationBsonPropertyIdModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationBsonPropertyIdModel.java
new file mode 100644
index 00000000000..906b458026a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationBsonPropertyIdModel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public class AnnotationBsonPropertyIdModel {
+    @BsonProperty("id")
+    private long id;
+
+    public AnnotationBsonPropertyIdModel() {
+    }
+
+    public AnnotationBsonPropertyIdModel(final long id) {
+        this.id = id;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AnnotationBsonPropertyIdModel that = (AnnotationBsonPropertyIdModel) o;
+        return getId() == that.getId();
+    }
+
+    @Override
+    public int hashCode() {
+        return (int) (getId() ^ (getId() >>> 32));
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationCollision.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationCollision.java
new file mode 100644
index 00000000000..8d6a2856e39
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationCollision.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class AnnotationCollision {
+
+    public String id;
+
+    @BsonProperty("color")
+    private String color;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    @BsonProperty("theme")
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(final String color) {
+        this.color = color;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationDefaultsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationDefaultsModel.java
new file mode 100644
index 00000000000..01277592677
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationDefaultsModel.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+@BsonDiscriminator("AnnotationDefaultsModel")
+public final class AnnotationDefaultsModel {
+
+    @BsonId
+    public String customId;
+
+    @BsonProperty
+    public AnnotationModel child;
+
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationInheritedModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationInheritedModel.java
new file mode 100644
index 00000000000..4bf23fc5fda
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationInheritedModel.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+@BsonDiscriminator(key = "_cls")
+public final class AnnotationInheritedModel extends AnnotationAbstract {
+
+    @BsonId
+    public String customId;
+
+    @BsonProperty(useDiscriminator = true)
+    public AnnotationModel child;
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationModel.java
new file mode 100644
index 00000000000..b45d092d54e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationModel.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+@BsonDiscriminator(value = "MyAnnotationModel", key = "_cls")
+public final class AnnotationModel {
+
+    @BsonId()
+    public String customId;
+
+    @BsonProperty(useDiscriminator = false)
+    public AnnotationModel child;
+
+    @BsonProperty("renamed")
+    public AnnotationModel alternative;
+
+    public AnnotationModel() {
+    }
+
+    public AnnotationModel(final String customId, final AnnotationModel child, final AnnotationModel alternative) {
+        this.customId = customId;
+        this.child = child;
+        this.alternative = alternative;
+    }
+
+    public String getCustomId() {
+        return customId;
+    }
+
+    public void setCustomId(final String customId) {
+        this.customId = customId;
+    }
+
+    public AnnotationModel getChild() {
+        return child;
+    }
+
+    public void setChild(final AnnotationModel child) {
+        this.child = child;
+    }
+
+    public AnnotationModel getAlternative() {
+        return alternative;
+    }
+
+    public void setAlternative(final AnnotationModel alternative) {
+        this.alternative = alternative;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AnnotationModel that = (AnnotationModel) o;
+
+        if (getCustomId() != null ? !getCustomId().equals(that.getCustomId()) : that.getCustomId() != null) {
+            return false;
+        }
+        if (getChild() != null ? !getChild().equals(that.getChild()) : that.getChild() != null) {
+            return false;
+        }
+        if (getAlternative() != null ? !getAlternative().equals(that.getAlternative()) : that.getAlternative() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCustomId() != null ? getCustomId().hashCode() : 0;
+        result = 31 * result + (getChild() != null ? getChild().hashCode() : 0);
+        result = 31 * result + (getAlternative() != null ? getAlternative().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationNameCollision.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationNameCollision.java
new file mode 100644
index 00000000000..4161eea087d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationNameCollision.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class AnnotationNameCollision {
+
+    public String id;
+
+    @BsonProperty("id")
+    public String alternative;
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationWithObjectIdModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationWithObjectIdModel.java
new file mode 100644
index 00000000000..8cddf1e6160
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationWithObjectIdModel.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.bson.types.ObjectId;
+
+@BsonDiscriminator(value = "MyAnnotationModel", key = "_cls")
+public final class AnnotationWithObjectIdModel {
+
+    @BsonId()
+    public ObjectId customId;
+
+    @BsonProperty(useDiscriminator = false)
+    public AnnotationWithObjectIdModel child;
+
+    @BsonProperty("renamed")
+    public AnnotationWithObjectIdModel alternative;
+
+    public AnnotationWithObjectIdModel() {
+    }
+
+    public AnnotationWithObjectIdModel(final ObjectId customId, final AnnotationWithObjectIdModel child,
+                                       final AnnotationWithObjectIdModel alternative) {
+        this.customId = customId;
+        this.child = child;
+        this.alternative = alternative;
+    }
+
+    public ObjectId getCustomId() {
+        return customId;
+    }
+
+    public void setCustomId(final ObjectId customId) {
+        this.customId = customId;
+    }
+
+    public AnnotationWithObjectIdModel getChild() {
+        return child;
+    }
+
+    public void setChild(final AnnotationWithObjectIdModel child) {
+        this.child = child;
+    }
+
+    public AnnotationWithObjectIdModel getAlternative() {
+        return alternative;
+    }
+
+    public void setAlternative(final AnnotationWithObjectIdModel alternative) {
+        this.alternative = alternative;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AnnotationWithObjectIdModel that = (AnnotationWithObjectIdModel) o;
+
+        if (getCustomId() != null ? !getCustomId().equals(that.getCustomId()) : that.getCustomId() != null) {
+            return false;
+        }
+        if (getChild() != null ? !getChild().equals(that.getChild()) : that.getChild() != null) {
+            return false;
+        }
+        if (getAlternative() != null ? !getAlternative().equals(that.getAlternative()) : that.getAlternative() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getCustomId() != null ? getCustomId().hashCode() : 0;
+        result = 31 * result + (getChild() != null ? getChild().hashCode() : 0);
+        result = 31 * result + (getAlternative() != null ? getAlternative().hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationWriteCollision.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationWriteCollision.java
new file mode 100644
index 00000000000..1d826cc5689
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/AnnotationWriteCollision.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class AnnotationWriteCollision {
+
+    public String id;
+
+    @BsonProperty("color")
+    private String color;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    @BsonProperty("theme")
+    public void setColor(final String color) {
+        this.color = color;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreDuplicatePropertyMultipleTypes.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreDuplicatePropertyMultipleTypes.java
new file mode 100644
index 00000000000..6c6aa62d415
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreDuplicatePropertyMultipleTypes.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public class BsonIgnoreDuplicatePropertyMultipleTypes {
+    private final String stringField;
+    private String altStringField;
+
+    @BsonCreator
+    public BsonIgnoreDuplicatePropertyMultipleTypes(@BsonProperty("stringField") final String stringField) {
+        this.stringField = stringField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    @BsonIgnore
+    public String getAltStringField() {
+        return altStringField;
+    }
+
+    @BsonIgnore
+    public void setAltStringField(final String altStringField) {
+        this.altStringField = altStringField;
+    }
+
+    @BsonIgnore
+    public void setAltStringField(final Integer i) {
+        this.altStringField = i.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "BsonIgnoreDuplicatePropertyMultipleTypes{"
+                + "stringField='" + stringField + '\''
+                + ", altStringField='" + altStringField + '\''
+                + '}';
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BsonIgnoreDuplicatePropertyMultipleTypes that = (BsonIgnoreDuplicatePropertyMultipleTypes) o;
+
+        if (stringField != null ? !stringField.equals(that.stringField) : that.stringField != null) {
+            return false;
+        }
+        return altStringField != null ? altStringField.equals(that.altStringField) : that.altStringField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = stringField != null ? stringField.hashCode() : 0;
+        result = 31 * result + (altStringField != null ? altStringField.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreInvalidMapModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreInvalidMapModel.java
new file mode 100644
index 00000000000..9a964811b48
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreInvalidMapModel.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+
+import java.util.Map;
+
+public class BsonIgnoreInvalidMapModel {
+
+    private String stringField;
+
+    @BsonIgnore
+    private Map<Integer, Integer> invalidMap;
+
+    public BsonIgnoreInvalidMapModel() {
+    }
+
+    public BsonIgnoreInvalidMapModel(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    public Map<Integer, Integer> getInvalidMap() {
+        return invalidMap;
+    }
+
+    public void setInvalidMap(final Map<Integer, Integer> invalidMap) {
+        this.invalidMap = invalidMap;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BsonIgnoreInvalidMapModel that = (BsonIgnoreInvalidMapModel) o;
+
+        if (stringField != null ? !stringField.equals(that.stringField) : that.stringField != null) {
+            return false;
+        }
+        return invalidMap != null ? invalidMap.equals(that.invalidMap) : that.invalidMap == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = stringField != null ? stringField.hashCode() : 0;
+        result = 31 * result + (invalidMap != null ? invalidMap.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreSyntheticProperty.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreSyntheticProperty.java
new file mode 100644
index 00000000000..cf93764411e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/BsonIgnoreSyntheticProperty.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public class BsonIgnoreSyntheticProperty {
+    private final String stringField;
+
+    @BsonCreator
+    public BsonIgnoreSyntheticProperty(@BsonProperty("stringField") final String stringField) {
+        this.stringField = stringField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    @BsonIgnore
+    public Object getSyntheticProperty() {
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "BsonIgnoreSyntheticProperty{"
+                + "stringField='" + stringField + '\''
+                + '}';
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BsonIgnoreSyntheticProperty that = (BsonIgnoreSyntheticProperty) o;
+
+        return stringField != null ? stringField.equals(that.stringField) : that.stringField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return stringField != null ? stringField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionDiscriminatorAbstractClassesModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionDiscriminatorAbstractClassesModel.java
new file mode 100644
index 00000000000..b719145c8f8
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionDiscriminatorAbstractClassesModel.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.List;
+import java.util.Map;
+
+public class CollectionDiscriminatorAbstractClassesModel {
+    private List<SuperClassModel> list;
+    private Map<String, SuperClassModel> map;
+
+    public List<SuperClassModel> getList() {
+        return list;
+    }
+
+    public CollectionDiscriminatorAbstractClassesModel setList(final List<SuperClassModel> list) {
+        this.list = list;
+        return this;
+    }
+
+    public Map<String, SuperClassModel> getMap() {
+        return map;
+    }
+
+    public CollectionDiscriminatorAbstractClassesModel setMap(final Map<String, SuperClassModel> map) {
+        this.map = map;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CollectionDiscriminatorAbstractClassesModel that = (CollectionDiscriminatorAbstractClassesModel) o;
+
+        if (getList() != null ? !getList().equals(that.getList()) : that.getList() != null) {
+            return false;
+        }
+        return getMap() != null ? getMap().equals(that.getMap()) : that.getMap() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getList() != null ? getList().hashCode() : 0;
+        result = 31 * result + (getMap() != null ? getMap().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CollectionDiscriminatorModel{"
+                + "list=" + list
+                + ", map=" + map
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionDiscriminatorInterfacesModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionDiscriminatorInterfacesModel.java
new file mode 100644
index 00000000000..b9155e738d1
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionDiscriminatorInterfacesModel.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.List;
+import java.util.Map;
+
+public class CollectionDiscriminatorInterfacesModel {
+    private List<InterfaceModel> list;
+    private Map<String, InterfaceModel> map;
+
+    public List<InterfaceModel> getList() {
+        return list;
+    }
+
+    public CollectionDiscriminatorInterfacesModel setList(final List<InterfaceModel> list) {
+        this.list = list;
+        return this;
+    }
+
+    public Map<String, InterfaceModel> getMap() {
+        return map;
+    }
+
+    public CollectionDiscriminatorInterfacesModel setMap(final Map<String, InterfaceModel> map) {
+        this.map = map;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CollectionDiscriminatorInterfacesModel that = (CollectionDiscriminatorInterfacesModel) o;
+
+        if (getList() != null ? !getList().equals(that.getList()) : that.getList() != null) {
+            return false;
+        }
+        return getMap() != null ? getMap().equals(that.getMap()) : that.getMap() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getList() != null ? getList().hashCode() : 0;
+        result = 31 * result + (getMap() != null ? getMap().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CollectionDiscriminatorModel{"
+                + "list=" + list
+                + ", map=" + map
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionNameModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionNameModel.java
new file mode 100644
index 00000000000..225982c9ebc
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionNameModel.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+public final class CollectionNameModel {
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterImmutableModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterImmutableModel.java
new file mode 100644
index 00000000000..2b9ff3cfc7c
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterImmutableModel.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.Collections;
+import java.util.List;
+
+public class CollectionsGetterImmutableModel {
+
+    private final List<Integer> listField;
+
+    public CollectionsGetterImmutableModel() {
+        this(Collections.<Integer>emptyList());
+    }
+
+    public CollectionsGetterImmutableModel(final List<Integer> listField) {
+        this.listField = Collections.unmodifiableList(listField);
+    }
+
+    public List<Integer> getListField() {
+        return listField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
+
+        CollectionsGetterImmutableModel that = (CollectionsGetterImmutableModel) o;
+
+        return listField != null ? listField.equals(that.listField) : that.listField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return listField != null ? listField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterMutableModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterMutableModel.java
new file mode 100644
index 00000000000..ed320f74f99
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterMutableModel.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CollectionsGetterMutableModel {
+
+    private final List<Integer> listField;
+
+    public CollectionsGetterMutableModel() {
+        this(new ArrayList<Integer>());
+    }
+
+    public CollectionsGetterMutableModel(final List<Integer> listField) {
+        this.listField = listField;
+    }
+
+    public List<Integer> getListField() {
+        return listField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CollectionsGetterMutableModel that = (CollectionsGetterMutableModel) o;
+        return listField != null ? listField.equals(that.listField) : that.listField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return listField != null ? listField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterNonEmptyModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterNonEmptyModel.java
new file mode 100644
index 00000000000..4a8bee9aa93
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterNonEmptyModel.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+public class CollectionsGetterNonEmptyModel {
+
+    private final List<Integer> listField;
+
+    public CollectionsGetterNonEmptyModel() {
+        this(asList(1, 2));
+    }
+
+    public CollectionsGetterNonEmptyModel(final List<Integer> listField) {
+        this.listField = listField;
+    }
+
+    public List<Integer> getListField() {
+        return listField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
+
+        CollectionsGetterNonEmptyModel that = (CollectionsGetterNonEmptyModel) o;
+
+        return listField != null ? listField.equals(that.listField) : that.listField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return listField != null ? listField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterNullModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterNullModel.java
new file mode 100644
index 00000000000..f827c0a37bd
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CollectionsGetterNullModel.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.List;
+
+public class CollectionsGetterNullModel {
+
+    private final List<Integer> listField;
+
+    public CollectionsGetterNullModel() {
+        this(null);
+    }
+
+    public CollectionsGetterNullModel(final List<Integer> listField) {
+        this.listField = listField;
+    }
+
+    public List<Integer> getListField() {
+        return listField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
+
+        CollectionsGetterNullModel that = (CollectionsGetterNullModel) o;
+        return listField != null ? listField.equals(that.listField) : that.listField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return listField != null ? listField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorAllFinalFieldsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorAllFinalFieldsModel.java
new file mode 100644
index 00000000000..d7c3215f943
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorAllFinalFieldsModel.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+@BsonDiscriminator
+public final class CreatorAllFinalFieldsModel {
+    private final String pid;
+    private final String fName;
+    private final String lName;
+
+    @BsonCreator
+    public CreatorAllFinalFieldsModel(@BsonProperty("personId") final String personId,
+                                      @BsonProperty("firstName") final String firstName,
+                                      @BsonProperty("lastName") final String lastName) {
+        this.pid = personId;
+        this.fName = firstName;
+        this.lName = lastName;
+    }
+
+    @BsonId
+    public String getPersonId() {
+        return pid;
+    }
+
+    public String getFirstName() {
+        return fName;
+    }
+
+    public String getLastName() {
+        return lName;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorAllFinalFieldsModel that = (CreatorAllFinalFieldsModel) o;
+
+        if (pid != null ? !pid.equals(that.pid) : that.pid != null) {
+            return false;
+        }
+        if (fName != null ? !fName.equals(that.fName) : that.fName != null) {
+            return false;
+        }
+        if (lName != null ? !lName.equals(that.lName) : that.lName != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = pid != null ? pid.hashCode() : 0;
+        result = 31 * result + (fName != null ? fName.hashCode() : 0);
+        result = 31 * result + (lName != null ? lName.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorIdModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorIdModel.java
new file mode 100644
index 00000000000..aeb84821e18
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorIdModel.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.List;
+
+public class CreatorConstructorIdModel {
+  private final String id;
+  private final List<Integer> integersField;
+  private String stringField;
+  public long longField;
+
+  @BsonCreator
+  public CreatorConstructorIdModel(final @BsonId String id, @BsonProperty("integersField") final List<Integer> integerField,
+      @BsonProperty("longField") final long longField) {
+    this.id = id;
+    this.integersField = integerField;
+    this.longField = longField;
+  }
+
+  public CreatorConstructorIdModel(final String id, final List<Integer> integersField, final String stringField, final long longField) {
+    this.id = id;
+    this.integersField = integersField;
+    this.stringField = stringField;
+    this.longField = longField;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public List<Integer> getIntegersField() {
+    return integersField;
+  }
+
+  public String getStringField() {
+    return stringField;
+  }
+
+  public void setStringField(final String stringField) {
+    this.stringField = stringField;
+  }
+
+  public long getLongField() {
+    return longField;
+  }
+
+  public void setLongField(final long longField) {
+    this.longField = longField;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    CreatorConstructorIdModel that = (CreatorConstructorIdModel) o;
+
+    if (getLongField() != that.getLongField()) {
+      return false;
+    }
+    if (getId() != null ? !getId().equals(that.getId()) : that.getId() != null) {
+      return false;
+    }
+    if (getIntegersField() != null ? !getIntegersField().equals(that.getIntegersField())
+        : that.getIntegersField() != null) {
+      return false;
+    }
+    return getStringField() != null ? getStringField().equals(that.getStringField()) : that.getStringField() == null;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = getId() != null ? getId().hashCode() : 0;
+    result = 31 * result + (getIntegersField() != null ? getIntegersField().hashCode() : 0);
+    result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+    result = 31 * result + (int) (getLongField() ^ (getLongField() >>> 32));
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "CreatorConstructorIdModel{"
+        + "id='" + id + '\''
+        + ", integersField=" + integersField
+        + ", stringField='" + stringField + '\''
+        + ", longField=" + longField
+        + '}';
+  }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorLegacyBsonPropertyModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorLegacyBsonPropertyModel.java
new file mode 100644
index 00000000000..81011970500
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorLegacyBsonPropertyModel.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.List;
+
+public final class CreatorConstructorLegacyBsonPropertyModel {
+    private final List<Integer> integersField;
+    private String stringField;
+    @BsonProperty("longField")
+    private long myLongField;
+
+    // Here we use the @BsonProperty using the actual field name, that has been set to read and write to "longField"
+    @BsonCreator
+    public CreatorConstructorLegacyBsonPropertyModel(@BsonProperty("integersField") final List<Integer> integerField,
+                                                     @BsonProperty("myLongField") final long longField) {
+        this.integersField = integerField;
+        this.myLongField = longField;
+    }
+
+    public CreatorConstructorLegacyBsonPropertyModel(final List<Integer> integersField, final String stringField, final long longField) {
+        this.integersField = integersField;
+        this.stringField = stringField;
+        this.myLongField = longField;
+    }
+
+    public List<Integer> getIntegersField() {
+        return integersField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    public long getMyLongField() {
+        return myLongField;
+    }
+
+    public void setMyLongField(final long myLongField) {
+        this.myLongField = myLongField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorConstructorLegacyBsonPropertyModel that = (CreatorConstructorLegacyBsonPropertyModel) o;
+
+        if (getMyLongField() != that.getMyLongField()) {
+            return false;
+        }
+        if (getIntegersField() != null ? !getIntegersField().equals(that.getIntegersField()) : that.getIntegersField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegersField() != null ? getIntegersField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (getMyLongField() ^ (getMyLongField() >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorConstructorModel{"
+                + "integersField=" + integersField
+                + ", stringField='" + stringField + "'"
+                + ", myLongField=" + myLongField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorModel.java
new file mode 100644
index 00000000000..d3a5c028b3b
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorModel.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.List;
+
+public final class CreatorConstructorModel {
+    private final List<Integer> integersField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public CreatorConstructorModel(@BsonProperty("integersField") final List<Integer> integerField,
+                                   @BsonProperty("longField") final long longField) {
+        this.integersField = integerField;
+        this.longField = longField;
+    }
+
+    public CreatorConstructorModel(final List<Integer> integersField, final String stringField, final long longField) {
+        this.integersField = integersField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    public List<Integer> getIntegersField() {
+        return integersField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    public long getLongField() {
+        return longField;
+    }
+
+    public void setLongField(final long longField) {
+        this.longField = longField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorConstructorModel that = (CreatorConstructorModel) o;
+
+        if (getLongField() != that.getLongField()) {
+            return false;
+        }
+        if (getIntegersField() != null ? !getIntegersField().equals(that.getIntegersField()) : that.getIntegersField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegersField() != null ? getIntegersField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (getLongField() ^ (getLongField() >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorConstructorModel{"
+                + "integersField=" + integersField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorPrimitivesModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorPrimitivesModel.java
new file mode 100644
index 00000000000..ded3c18516e
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorPrimitivesModel.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorConstructorPrimitivesModel {
+    private final int intField;
+    private final String stringField;
+    private final long longField;
+
+
+    @BsonCreator
+    public CreatorConstructorPrimitivesModel(@BsonProperty("intField") final int intField,
+                                             @BsonProperty("stringField") final String stringField,
+                                             @BsonProperty("longField") final long longField) {
+        this.intField = intField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    /**
+     * Returns the intField
+     *
+     * @return the intField
+     */
+    public int getIntField() {
+        return intField;
+    }
+
+    /**
+     * Returns the stringField
+     *
+     * @return the stringField
+     */
+    public String getStringField() {
+        return stringField;
+    }
+
+    /**
+     * Returns the longField
+     *
+     * @return the longField
+     */
+    public long getLongField() {
+        return longField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorConstructorPrimitivesModel that = (CreatorConstructorPrimitivesModel) o;
+
+        if (getIntField() != that.getIntField()) {
+            return false;
+        }
+        if (getLongField() != that.getLongField()) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntField();
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (getLongField() ^ (getLongField() >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorConstructorPrimativesModel{"
+                + "intField=" + intField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorRenameModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorRenameModel.java
new file mode 100644
index 00000000000..ee94086fe98
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorRenameModel.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.List;
+
+public class CreatorConstructorRenameModel {
+  private final List<Integer> integersField;
+  private String stringField;
+  public long longField;
+
+  @BsonCreator
+  public CreatorConstructorRenameModel(@BsonProperty("integerList") final List<Integer> integerField,
+      @BsonProperty("longField") final long longField) {
+    this.integersField = integerField;
+    this.longField = longField;
+  }
+
+  public CreatorConstructorRenameModel(final List<Integer> integersField, final String stringField, final long longField) {
+    this.integersField = integersField;
+    this.stringField = stringField;
+    this.longField = longField;
+  }
+
+  @BsonProperty("integerList")
+  public List<Integer> getIntegersField() {
+    return integersField;
+  }
+
+  public String getStringField() {
+    return stringField;
+  }
+
+  public void setStringField(final String stringField) {
+    this.stringField = stringField;
+  }
+
+  public long getLongField() {
+    return longField;
+  }
+
+  public void setLongField(final long longField) {
+    this.longField = longField;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    CreatorConstructorRenameModel that = (CreatorConstructorRenameModel) o;
+
+    if (getLongField() != that.getLongField()) {
+      return false;
+    }
+    if (getIntegersField() != null ? !getIntegersField().equals(that.getIntegersField()) : that.getIntegersField() != null) {
+      return false;
+    }
+    if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = getIntegersField() != null ? getIntegersField().hashCode() : 0;
+    result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+    result = 31 * result + (int) (getLongField() ^ (getLongField() >>> 32));
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "CreatorConstructorRenameModel{"
+        + "integersField=" + integersField
+        + ", stringField='" + stringField + "'"
+        + ", longField=" + longField
+        + "}";
+  }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorThrowsExceptionModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorThrowsExceptionModel.java
new file mode 100644
index 00000000000..10c2721395d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorConstructorThrowsExceptionModel.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+
+public final class CreatorConstructorThrowsExceptionModel {
+    private Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public CreatorConstructorThrowsExceptionModel(){
+        throw new UnsupportedOperationException("Nope");
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorConstructorThrowsExceptionModel that = (CreatorConstructorThrowsExceptionModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorNoArgsConstructorModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInSuperClassModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInSuperClassModel.java
new file mode 100644
index 00000000000..2064663ff88
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInSuperClassModel.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public abstract class CreatorInSuperClassModel {
+    @BsonCreator
+    public static CreatorInSuperClassModel newInstance(@BsonProperty("propertyA") final String propertyA,
+                                                       @BsonProperty("propertyB") final String propertyB) {
+        return new CreatorInSuperClassModelImpl(propertyA, propertyB);
+    }
+    public abstract String getPropertyA();
+    public abstract String getPropertyB();
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInSuperClassModelImpl.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInSuperClassModelImpl.java
new file mode 100644
index 00000000000..72461cdabd5
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInSuperClassModelImpl.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+public class CreatorInSuperClassModelImpl extends CreatorInSuperClassModel {
+    private final String propertyA;
+    private final String propertyB;
+
+    CreatorInSuperClassModelImpl(final String propertyA, final String propertyB) {
+        this.propertyA = propertyA;
+        this.propertyB = propertyB;
+    }
+
+    @Override
+    public String getPropertyA() {
+        return propertyA;
+    }
+
+    @Override
+    public String getPropertyB() {
+        return propertyB;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorInSuperClassModelImpl that = (CreatorInSuperClassModelImpl) o;
+
+        if (propertyA != null ? !propertyA.equals(that.propertyA) : that.propertyA != null) {
+            return false;
+        }
+        return propertyB != null ? propertyB.equals(that.propertyB) : that.propertyB == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = propertyA != null ? propertyA.hashCode() : 0;
+        result = 31 * result + (propertyB != null ? propertyB.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidConstructorModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidConstructorModel.java
new file mode 100644
index 00000000000..efe2ecac762
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidConstructorModel.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidConstructorModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public CreatorInvalidConstructorModel(@BsonProperty("integerField") final Integer integerField, final String stringField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorInvalidConstructorModel that = (CreatorInvalidConstructorModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidConstructorModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMethodModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMethodModel.java
new file mode 100644
index 00000000000..26d60ea5d24
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMethodModel.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidMethodModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    private CreatorInvalidMethodModel(final Integer integerField, final String stringField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    @BsonCreator
+    public static CreatorInvalidMethodModel create(@BsonProperty("integerField") final Integer integerField, final String stringField) {
+        return new CreatorInvalidMethodModel(integerField, stringField);
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorMethodModel that = (CreatorMethodModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidMethodModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMethodReturnTypeModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMethodReturnTypeModel.java
new file mode 100644
index 00000000000..5929d979ca7
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMethodReturnTypeModel.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidMethodReturnTypeModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    private CreatorInvalidMethodReturnTypeModel(final Integer integerField, final String stringField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+    }
+
+    @BsonCreator
+    public static String create(@BsonProperty("integerField") final Integer integerField) {
+        return "Nope";
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorMethodModel that = (CreatorMethodModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidMethodModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleConstructorsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleConstructorsModel.java
new file mode 100644
index 00000000000..9451be68824
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleConstructorsModel.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidMultipleConstructorsModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public CreatorInvalidMultipleConstructorsModel(@BsonProperty("integerField") final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    @BsonCreator
+    public CreatorInvalidMultipleConstructorsModel(@BsonProperty("integerField") final Integer integerField,
+                                                   @BsonProperty("stringField") final String string) {
+        this(integerField);
+        setStringField(stringField);
+    }
+
+
+    public CreatorInvalidMultipleConstructorsModel(final Integer integerField, final String stringField, final long longField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorInvalidMultipleConstructorsModel that = (CreatorInvalidMultipleConstructorsModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidMultipleModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleCreatorsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleCreatorsModel.java
new file mode 100644
index 00000000000..034c78fa530
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleCreatorsModel.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidMultipleCreatorsModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public CreatorInvalidMultipleCreatorsModel(@BsonProperty("integerField") final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public CreatorInvalidMultipleCreatorsModel(final Integer integerField, final String stringField, final long longField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    @BsonCreator
+    public static CreatorInvalidMultipleCreatorsModel create(@BsonProperty("integerField") final Integer integerField) {
+        return new CreatorInvalidMultipleCreatorsModel(integerField);
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorInvalidMultipleCreatorsModel that = (CreatorInvalidMultipleCreatorsModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidMultipleModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleStaticCreatorsModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleStaticCreatorsModel.java
new file mode 100644
index 00000000000..fa3d445219c
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidMultipleStaticCreatorsModel.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidMultipleStaticCreatorsModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    private CreatorInvalidMultipleStaticCreatorsModel(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public CreatorInvalidMultipleStaticCreatorsModel(final Integer integerField, final String stringField, final long longField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    @BsonCreator
+    public static CreatorInvalidMultipleStaticCreatorsModel create(@BsonProperty("integerField") final Integer integerField) {
+        return new CreatorInvalidMultipleStaticCreatorsModel(integerField);
+    }
+
+    @BsonCreator
+    public static CreatorInvalidMultipleStaticCreatorsModel create(@BsonProperty("integerField") final Integer integerField,
+                                                                   @BsonProperty("stringField") final String stringField) {
+        CreatorInvalidMultipleStaticCreatorsModel model = new CreatorInvalidMultipleStaticCreatorsModel(integerField);
+        model.setStringField(stringField);
+        return model;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorInvalidMultipleStaticCreatorsModel that = (CreatorInvalidMultipleStaticCreatorsModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidMultipleModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidTypeConstructorModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidTypeConstructorModel.java
new file mode 100644
index 00000000000..f5e3a242b13
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidTypeConstructorModel.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidTypeConstructorModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public CreatorInvalidTypeConstructorModel(@BsonProperty("integerField") final String integerField) {
+        this.integerField = Integer.parseInt(integerField);
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorInvalidTypeConstructorModel that = (CreatorInvalidTypeConstructorModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidConstructorModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidTypeMethodModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidTypeMethodModel.java
new file mode 100644
index 00000000000..c5cb636add3
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorInvalidTypeMethodModel.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorInvalidTypeMethodModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    private CreatorInvalidTypeMethodModel(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    @BsonCreator
+    public static CreatorInvalidTypeMethodModel create(@BsonProperty("integerField") final String integerField) {
+        return new CreatorInvalidTypeMethodModel(Integer.parseInt(integerField));
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorMethodModel that = (CreatorMethodModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorInvalidMethodModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorMethodModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorMethodModel.java
new file mode 100644
index 00000000000..55924e9c94d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorMethodModel.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorMethodModel {
+    private final Integer integerField;
+    private String stringField;
+    public long longField;
+
+    private CreatorMethodModel(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    @BsonCreator
+    public static CreatorMethodModel create(@BsonProperty("integerField") final Integer integerField) {
+        return new CreatorMethodModel(integerField);
+    }
+
+    public CreatorMethodModel(final Integer integerField, final String stringField, final long longField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorMethodModel that = (CreatorMethodModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorMethodModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorMethodThrowsExceptionModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorMethodThrowsExceptionModel.java
new file mode 100644
index 00000000000..4b09c75b76d
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorMethodThrowsExceptionModel.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+public final class CreatorMethodThrowsExceptionModel {
+    private Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public static CreatorMethodThrowsExceptionModel create(@BsonProperty("integerField") final Integer integerField) {
+        throw new UnsupportedOperationException("Nope");
+    }
+
+    private CreatorMethodThrowsExceptionModel() {
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorNoArgsMethodModel that = (CreatorNoArgsMethodModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorMethodThrowsExceptionModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorNoArgsConstructorModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorNoArgsConstructorModel.java
new file mode 100644
index 00000000000..c4e5b4e69c9
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorNoArgsConstructorModel.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+
+public final class CreatorNoArgsConstructorModel {
+    private Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public CreatorNoArgsConstructorModel(){
+    }
+
+    public CreatorNoArgsConstructorModel(final Integer integerField, final String stringField, final long longField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorNoArgsConstructorModel that = (CreatorNoArgsConstructorModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorNoArgsConstructorModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorNoArgsMethodModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorNoArgsMethodModel.java
new file mode 100644
index 00000000000..ddee7f48668
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/CreatorNoArgsMethodModel.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonCreator;
+
+public final class CreatorNoArgsMethodModel {
+    private Integer integerField;
+    private String stringField;
+    public long longField;
+
+    @BsonCreator
+    public static CreatorNoArgsMethodModel create() {
+        return new CreatorNoArgsMethodModel();
+    }
+
+    private CreatorNoArgsMethodModel() {
+    }
+
+    public CreatorNoArgsMethodModel(final Integer integerField, final String stringField, final long longField) {
+        this.integerField = integerField;
+        this.stringField = stringField;
+        this.longField = longField;
+    }
+
+    public Integer getIntegerField() {
+        return integerField;
+    }
+
+    public void setIntegerField(final Integer integerField) {
+        this.integerField = integerField;
+    }
+
+    public String getStringField() {
+        return stringField;
+    }
+
+    public void setStringField(final String stringField) {
+        this.stringField = stringField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreatorNoArgsMethodModel that = (CreatorNoArgsMethodModel) o;
+
+        if (longField != that.longField) {
+            return false;
+        }
+        if (getIntegerField() != null ? !getIntegerField().equals(that.getIntegerField()) : that.getIntegerField() != null) {
+            return false;
+        }
+        if (getStringField() != null ? !getStringField().equals(that.getStringField()) : that.getStringField() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getIntegerField() != null ? getIntegerField().hashCode() : 0;
+        result = 31 * result + (getStringField() != null ? getStringField().hashCode() : 0);
+        result = 31 * result + (int) (longField ^ (longField >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "CreatorNoArgsMethodModel{"
+                + "integerField=" + integerField
+                + ", stringField='" + stringField + "'"
+                + ", longField=" + longField
+                + "}";
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/DiscriminatorNameModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/DiscriminatorNameModel.java
new file mode 100644
index 00000000000..dd9bde84836
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/DiscriminatorNameModel.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+public final class DiscriminatorNameModel {
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/FieldStorageModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/FieldStorageModel.java
new file mode 100644
index 00000000000..f0609c0c8b2
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/FieldStorageModel.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+public final class FieldStorageModel {
+    private String id;
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModel.java
new file mode 100644
index 00000000000..b5def72fb17
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModel.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator
+public interface InterfaceModel {
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModelImplA.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModelImplA.java
new file mode 100644
index 00000000000..3b6d5c7f4d0
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModelImplA.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator
+public class InterfaceModelImplA implements InterfaceModel {
+    private boolean value;
+    private String name;
+
+    public boolean isValue() {
+        return value;
+    }
+
+    public InterfaceModelImplA setValue(final boolean value) {
+        this.value = value;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public InterfaceModelImplA setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InterfaceModelImplA that = (InterfaceModelImplA) o;
+
+        if (value != that.value) {
+            return false;
+        }
+        return name != null ? name.equals(that.name) : that.name == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (value ? 1 : 0);
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModelImplB.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModelImplB.java
new file mode 100644
index 00000000000..5cf71117115
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/InterfaceModelImplB.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator
+public class InterfaceModelImplB implements InterfaceModel {
+    private boolean value;
+    private int integer;
+
+    public boolean isValue() {
+        return value;
+    }
+
+    public InterfaceModelImplB setValue(final boolean value) {
+        this.value = value;
+        return this;
+    }
+
+    public int getInteger() {
+        return integer;
+    }
+
+    public InterfaceModelImplB setInteger(final int integer) {
+        this.integer = integer;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        InterfaceModelImplB that = (InterfaceModelImplB) o;
+
+        if (value != that.value) {
+            return false;
+        }
+        return integer == that.integer;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (value ? 1 : 0);
+        result = 31 * result + integer;
+        return result;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterImmutableModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterImmutableModel.java
new file mode 100644
index 00000000000..440f2109798
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterImmutableModel.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class MapGetterImmutableModel {
+
+    private final Map<String, Integer> mapField;
+
+    public MapGetterImmutableModel() {
+        this(Collections.<String, Integer>emptyMap());
+    }
+
+    public MapGetterImmutableModel(final Map<String, Integer> mapField) {
+        this.mapField = Collections.unmodifiableMap(mapField);
+    }
+
+    public Map<String, Integer> getMapField() {
+        return mapField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
+
+        MapGetterImmutableModel that = (MapGetterImmutableModel) o;
+
+        return mapField != null ? mapField.equals(that.mapField) : that.mapField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return mapField != null ? mapField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterMutableModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterMutableModel.java
new file mode 100644
index 00000000000..1f4eb1a7391
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterMutableModel.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MapGetterMutableModel {
+
+    private final Map<String, Integer> mapField;
+
+    public MapGetterMutableModel() {
+        this.mapField = new HashMap<String, Integer>();
+    }
+
+    public MapGetterMutableModel(final Map<String, Integer> mapField) {
+        this.mapField = mapField;
+    }
+
+    public Map<String, Integer> getMapField() {
+        return mapField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
+
+        MapGetterMutableModel that = (MapGetterMutableModel) o;
+        return mapField != null ? mapField.equals(that.mapField) : that.mapField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return mapField != null ? mapField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterNonEmptyModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterNonEmptyModel.java
new file mode 100644
index 00000000000..e4d5aa712bc
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterNonEmptyModel.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class MapGetterNonEmptyModel {
+
+    private final Map<String, Integer> mapField;
+
+    public MapGetterNonEmptyModel() {
+        this(Collections.singletonMap("a", 1));
+    }
+
+    public MapGetterNonEmptyModel(final Map<String, Integer> mapField) {
+        this.mapField = mapField;
+    }
+
+    public Map<String, Integer> getMapField() {
+        return mapField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
+
+        MapGetterNonEmptyModel that = (MapGetterNonEmptyModel) o;
+
+        return mapField != null ? mapField.equals(that.mapField) : that.mapField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return mapField != null ? mapField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterNullModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterNullModel.java
new file mode 100644
index 00000000000..c1f60b07d37
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/MapGetterNullModel.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import java.util.Map;
+
+public class MapGetterNullModel {
+
+    private final Map<String, Integer> mapField;
+
+    public MapGetterNullModel() {
+        this(null);
+    }
+
+    public MapGetterNullModel(final Map<String, Integer> mapField) {
+        this.mapField = mapField;
+    }
+
+    public Map<String, Integer> getMapField() {
+        return mapField;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
+
+        MapGetterNullModel that = (MapGetterNullModel) o;
+
+        return mapField != null ? mapField.equals(that.mapField) : that.mapField == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return  mapField != null ? mapField.hashCode() : 0;
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/PropertyNameModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/PropertyNameModel.java
new file mode 100644
index 00000000000..0f87d599cb4
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/PropertyNameModel.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+public final class PropertyNameModel {
+    private int myModelField;
+    private int myModel2Field;
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/Subclass1Model.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/Subclass1Model.java
new file mode 100644
index 00000000000..51bbdd46583
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/Subclass1Model.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator
+public class Subclass1Model extends SuperClassModel {
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public Subclass1Model setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        Subclass1Model that = (Subclass1Model) o;
+
+        return getName() != null ? getName().equals(that.getName()) : that.getName() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Subclass1Model{"
+                + "name='" + name + '\''
+                + "} " + super.toString();
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/Subclass2Model.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/Subclass2Model.java
new file mode 100644
index 00000000000..1fd69138651
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/Subclass2Model.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator
+public class Subclass2Model extends SuperClassModel {
+    private int integer;
+
+    public int getInteger() {
+        return integer;
+    }
+
+    public Subclass2Model setInteger(final int integer) {
+        this.integer = integer;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        Subclass2Model that = (Subclass2Model) o;
+
+        return getInteger() == that.getInteger();
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + getInteger();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Subclass2Model{"
+                + "integer=" + integer
+                + "} " + super.toString();
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/SuperClassModel.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/SuperClassModel.java
new file mode 100644
index 00000000000..b46ebbd699b
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/SuperClassModel.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.codecs.pojo.entities.conventions;
+
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+
+@BsonDiscriminator
+public abstract class SuperClassModel {
+    private boolean value;
+
+    public boolean isValue() {
+        return value;
+    }
+
+    public SuperClassModel setValue(final boolean value) {
+        this.value = value;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SuperClassModel that = (SuperClassModel) o;
+
+        return isValue() == that.isValue();
+    }
+
+    @Override
+    public int hashCode() {
+        return (isValue() ? 1 : 0);
+    }
+
+    @Override
+    public String toString() {
+        return "SuperClassModel{"
+                + "value=" + value
+                + '}';
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/package-info.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/package-info.java
new file mode 100644
index 00000000000..44ac0e845ad
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/conventions/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Package contains test models for conventions
+ */
+package org.bson.codecs.pojo.entities.conventions;
diff --git a/bson/src/test/unit/org/bson/codecs/pojo/entities/package-info.java b/bson/src/test/unit/org/bson/codecs/pojo/entities/package-info.java
new file mode 100644
index 00000000000..abd43766a50
--- /dev/null
+++ b/bson/src/test/unit/org/bson/codecs/pojo/entities/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Test entities and related classes for the conventions tests
+ */
+package org.bson.codecs.pojo.entities;
diff --git a/bson/src/test/unit/org/bson/codecs/configuration/CodecCacheSpecification.groovy b/bson/src/test/unit/org/bson/internal/CodecCacheSpecification.groovy
similarity index 86%
rename from bson/src/test/unit/org/bson/codecs/configuration/CodecCacheSpecification.groovy
rename to bson/src/test/unit/org/bson/internal/CodecCacheSpecification.groovy
index bb68235e92f..e4eab0b34a2 100644
--- a/bson/src/test/unit/org/bson/codecs/configuration/CodecCacheSpecification.groovy
+++ b/bson/src/test/unit/org/bson/internal/CodecCacheSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.bson.codecs.configuration
+package org.bson.internal
 
 import org.bson.codecs.MinKeyCodec
+import org.bson.codecs.configuration.CodecConfigurationException
 import org.bson.types.MinKey
 import spock.lang.Specification
 
diff --git a/bson/src/test/unit/org/bson/internal/OverridableUuidRepresentationCodecRegistrySpecification.groovy b/bson/src/test/unit/org/bson/internal/OverridableUuidRepresentationCodecRegistrySpecification.groovy
new file mode 100644
index 00000000000..756c03af788
--- /dev/null
+++ b/bson/src/test/unit/org/bson/internal/OverridableUuidRepresentationCodecRegistrySpecification.groovy
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal
+
+import org.bson.BsonBinaryReader
+import org.bson.BsonBinaryWriter
+import org.bson.ByteBufNIO
+import org.bson.UuidRepresentation
+import org.bson.codecs.Codec
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import org.bson.io.BasicOutputBuffer
+import org.bson.io.ByteBufferBsonInput
+import spock.lang.Specification
+
+import java.nio.ByteBuffer
+
+
+class OverridableUuidRepresentationCodecRegistrySpecification extends Specification {
+    def 'should handle cycles'() {
+        given:
+        def registry = new OverridableUuidRepresentationCodecRegistry(new ClassModelCodecProvider(), UuidRepresentation.STANDARD)
+
+        when:
+        Codec<Top> topCodec = registry.get(Top)
+
+        then:
+        topCodec instanceof TopCodec
+
+        when:
+        def top = new Top('Bob',
+                new Top('Jim', null, null),
+                new Nested('George', new Top('Joe', null, null)))
+        def writer = new BsonBinaryWriter(new BasicOutputBuffer())
+        topCodec.encode(writer, top, EncoderContext.builder().build())
+        ByteArrayOutputStream os = new ByteArrayOutputStream()
+        writer.getBsonOutput().pipe(os)
+        writer.close()
+
+        then:
+        topCodec.decode(new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(os.toByteArray())))),
+                DecoderContext.builder().build()) == top
+    }
+}
diff --git a/bson/src/test/unit/org/bson/codecs/configuration/ProvidersCodecRegistrySpecification.groovy b/bson/src/test/unit/org/bson/internal/ProvidersCodecRegistrySpecification.groovy
similarity index 97%
rename from bson/src/test/unit/org/bson/codecs/configuration/ProvidersCodecRegistrySpecification.groovy
rename to bson/src/test/unit/org/bson/internal/ProvidersCodecRegistrySpecification.groovy
index 97b05f6f832..7aad6cb9c15 100644
--- a/bson/src/test/unit/org/bson/codecs/configuration/ProvidersCodecRegistrySpecification.groovy
+++ b/bson/src/test/unit/org/bson/internal/ProvidersCodecRegistrySpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bson.codecs.configuration
+package org.bson.internal
 
 import org.bson.BsonBinaryReader
 import org.bson.BsonBinaryWriter
@@ -26,6 +26,9 @@ import org.bson.codecs.Codec
 import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
 import org.bson.codecs.MinKeyCodec
+import org.bson.codecs.configuration.CodecConfigurationException
+import org.bson.codecs.configuration.CodecProvider
+import org.bson.codecs.configuration.CodecRegistry
 import org.bson.io.BasicOutputBuffer
 import org.bson.io.ByteBufferBsonInput
 import org.bson.types.MaxKey
diff --git a/bson/src/test/unit/org/bson/internal/UnsignedLongsTest.java b/bson/src/test/unit/org/bson/internal/UnsignedLongsTest.java
new file mode 100644
index 00000000000..4dcc50fed37
--- /dev/null
+++ b/bson/src/test/unit/org/bson/internal/UnsignedLongsTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2010 The Guava Authors
+ * Copyright 2011 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.internal;
+
+import org.junit.Test;
+
+import java.math.BigInteger;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class UnsignedLongsTest {
+
+    @Test
+    public void testCompare() {
+        // max value
+        assertTrue(UnsignedLongs.compare(0, 0xffffffffffffffffL) < 0);
+        assertTrue(UnsignedLongs.compare(0xffffffffffffffffL, 0) > 0);
+
+        // both with high bit set
+        assertTrue(UnsignedLongs.compare(0xff1a618b7f65ea12L, 0xffffffffffffffffL) < 0);
+        assertTrue(UnsignedLongs.compare(0xffffffffffffffffL, 0xff1a618b7f65ea12L) > 0);
+
+        // one with high bit set
+        assertTrue(UnsignedLongs.compare(0x5a4316b8c153ac4dL, 0xff1a618b7f65ea12L) < 0);
+        assertTrue(UnsignedLongs.compare(0xff1a618b7f65ea12L, 0x5a4316b8c153ac4dL) > 0);
+
+        // neither with high bit set
+        assertTrue(UnsignedLongs.compare(0x5a4316b8c153ac4dL, 0x6cf78a4b139a4e2aL) < 0);
+        assertTrue(UnsignedLongs.compare(0x6cf78a4b139a4e2aL, 0x5a4316b8c153ac4dL) > 0);
+
+        // same value
+        assertTrue(UnsignedLongs.compare(0xff1a618b7f65ea12L, 0xff1a618b7f65ea12L) == 0);
+    }
+
+    @Test
+    public void testParseLong() {
+        assertEquals(0xffffffffffffffffL, UnsignedLongs.parse("18446744073709551615"));
+        assertEquals(0x7fffffffffffffffL, UnsignedLongs.parse("9223372036854775807"));
+        assertEquals(0xff1a618b7f65ea12L, UnsignedLongs.parse("18382112080831834642"));
+        assertEquals(0x5a4316b8c153ac4dL, UnsignedLongs.parse("6504067269626408013"));
+        assertEquals(0x6cf78a4b139a4e2aL, UnsignedLongs.parse("7851896530399809066"));
+    }
+
+    @Test
+    public void testToString() {
+        String[] tests = {
+                "ffffffffffffffff",
+                "7fffffffffffffff",
+                "ff1a618b7f65ea12",
+                "5a4316b8c153ac4d",
+                "6cf78a4b139a4e2a"
+        };
+        for (String x : tests) {
+            BigInteger xValue = new BigInteger(x, 16);
+            long xLong = xValue.longValue(); // signed
+            assertEquals(xValue.toString(10), UnsignedLongs.toString(xLong));
+        }
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/internal/UuidHelperSpecification.groovy b/bson/src/test/unit/org/bson/internal/UuidHelperSpecification.groovy
new file mode 100644
index 00000000000..6bd1fb219dc
--- /dev/null
+++ b/bson/src/test/unit/org/bson/internal/UuidHelperSpecification.groovy
@@ -0,0 +1,52 @@
+package org.bson.internal
+
+import org.bson.BSONException
+import org.bson.UuidRepresentation
+import spock.lang.Specification
+import spock.lang.Unroll
+
+class UuidHelperSpecification extends Specification {
+
+    @Unroll
+    def 'should encode different types of UUID'() {
+        given:
+        def expectedUuid = UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09')
+
+        expect:
+        bytes == UuidHelper.encodeUuidToBinary(expectedUuid, uuidRepresentation)
+
+        where:
+        bytes                                                   | uuidRepresentation
+        [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] | UuidRepresentation.JAVA_LEGACY
+        [8, 7, 6, 5, 4, 3, 2, 1, 16, 15, 14, 13, 12, 11, 10, 9] | UuidRepresentation.STANDARD
+        [8, 7, 6, 5, 4, 3, 2, 1, 16, 15, 14, 13, 12, 11, 10, 9] | UuidRepresentation.PYTHON_LEGACY
+        [5, 6, 7, 8, 3, 4, 1, 2, 16, 15, 14, 13, 12, 11, 10, 9] | UuidRepresentation.C_SHARP_LEGACY
+    }
+
+    @Unroll
+    def 'should decode different types of UUID'() {
+        given:
+        byte[] expectedBytes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+
+        expect:
+        uuid == UuidHelper.decodeBinaryToUuid(expectedBytes, (byte) type, uuidRepresentation)
+
+        where:
+        uuid                                                    | type | uuidRepresentation
+        UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09') | 3    | UuidRepresentation.JAVA_LEGACY
+        UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | 3    | UuidRepresentation.PYTHON_LEGACY
+        UUID.fromString('04030201-0605-0807-090a-0b0c0d0e0f10') | 3    | UuidRepresentation.C_SHARP_LEGACY
+        UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | 4    | UuidRepresentation.STANDARD
+    }
+
+    def 'should error when decoding a subtype 3 binary to standard representation'() {
+        given:
+        byte[] expectedBytes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+
+        when:
+        UuidHelper.decodeBinaryToUuid(expectedBytes, (byte) 3, UuidRepresentation.STANDARD)
+
+        then:
+        thrown(BSONException)
+    }
+}
diff --git a/bson/src/test/unit/org/bson/io/BasicOutputBufferSpecification.groovy b/bson/src/test/unit/org/bson/io/BasicOutputBufferSpecification.groovy
index 0ebaea2a92f..38de06bf8cf 100644
--- a/bson/src/test/unit/org/bson/io/BasicOutputBufferSpecification.groovy
+++ b/bson/src/test/unit/org/bson/io/BasicOutputBufferSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -309,6 +309,17 @@ class BasicOutputBufferSpecification extends Specification {
         bsonOutput.size == 10
     }
 
+    def 'should get byte buffer as little endian'() {
+        given:
+        def bsonOutput = new BasicOutputBuffer(4)
+
+        when:
+        bsonOutput.writeBytes([1, 0, 0, 0] as byte[])
+
+        then:
+        bsonOutput.getByteBuffers()[0].getInt() == 1
+    }
+
     def 'should get internal buffer'() {
         given:
         def bsonOutput = new BasicOutputBuffer(4)
diff --git a/bson/src/test/unit/org/bson/io/BasicOutputBufferTest.java b/bson/src/test/unit/org/bson/io/BasicOutputBufferTest.java
index 054c2d41128..1531c7d0678 100644
--- a/bson/src/test/unit/org/bson/io/BasicOutputBufferTest.java
+++ b/bson/src/test/unit/org/bson/io/BasicOutputBufferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/org/bson/io/BitsTest.java b/bson/src/test/unit/org/bson/io/BitsTest.java
similarity index 98%
rename from driver/src/test/unit/org/bson/io/BitsTest.java
rename to bson/src/test/unit/org/bson/io/BitsTest.java
index e86b3acc2f6..1ff8d6130e4 100644
--- a/driver/src/test/unit/org/bson/io/BitsTest.java
+++ b/bson/src/test/unit/org/bson/io/BitsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/org/bson/io/ByteBufferBsonInputSpecification.groovy b/bson/src/test/unit/org/bson/io/ByteBufferBsonInputSpecification.groovy
index e9887754b15..80623280c80 100644
--- a/bson/src/test/unit/org/bson/io/ByteBufferBsonInputSpecification.groovy
+++ b/bson/src/test/unit/org/bson/io/ByteBufferBsonInputSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,6 @@ class ByteBufferBsonInputSpecification extends Specification {
         expect:
         bytesRead == bytes
         stream.position == 3
-
     }
 
     def 'should read into a byte array at offset until length'() {
@@ -270,6 +269,35 @@ class ByteBufferBsonInputSpecification extends Specification {
         stream.position == 2
     }
 
+    def 'should reset to the BsonInputMark'() {
+        given:
+        def stream = new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap([0x4a, 0x61, 0x76, 0x61, 0] as byte[])))
+
+        when:
+        BsonInputMark markOne = null
+        BsonInputMark markTwo = null
+
+        stream.with {
+            readByte()
+            readByte()
+            markOne = getMark(1024)
+            readByte()
+            readByte()
+            markTwo = getMark(1025)
+            readByte()
+        }
+        markOne.reset()
+
+        then:
+        stream.position == 2
+
+        when:
+        markTwo.reset()
+
+        then:
+        stream.position == 4
+    }
+
     def 'should have remaining when there are more bytes'() {
         given:
         def stream = new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap([0x4a, 0x61, 0x76, 0x61, 0] as byte[])))
@@ -396,4 +424,15 @@ class ByteBufferBsonInputSpecification extends Specification {
         then:
         thrown(BsonSerializationException)
     }
+
+    def 'should throw BsonSerializationException if a one-byte BSON string is not null-terminated'() {
+        given:
+        def stream = new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap([2, 0, 0, 0, 1, 3] as byte[])))
+
+        when:
+        stream.readString()
+
+        then:
+        thrown(BsonSerializationException)
+    }
 }
diff --git a/bson/src/test/unit/org/bson/json/Base64Specification.groovy b/bson/src/test/unit/org/bson/json/Base64Specification.groovy
new file mode 100644
index 00000000000..0bc2566bbcc
--- /dev/null
+++ b/bson/src/test/unit/org/bson/json/Base64Specification.groovy
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json
+
+import org.bson.internal.Base64
+import spock.lang.Specification
+import spock.lang.Unroll
+
+class Base64Specification extends Specification {
+
+    @Unroll
+    def 'encodes #encoded into #decoded'() {
+        expect:
+        Base64.encode(encoded.getBytes()) == decoded
+        Base64.decode(decoded) == encoded.getBytes()
+
+        where:
+        encoded  | decoded
+        ''       | ''
+        'f'      | 'Zg=='
+        'fo'     | 'Zm8='
+        'foo'    | 'Zm9v'
+        'foob'   | 'Zm9vYg=='
+        'fooba'  | 'Zm9vYmE='
+        'foobar' | 'Zm9vYmFy'
+    }
+
+}
diff --git a/bson/src/test/unit/org/bson/json/JsonBufferTest.java b/bson/src/test/unit/org/bson/json/JsonBufferTest.java
deleted file mode 100644
index 281d8c98437..00000000000
--- a/bson/src/test/unit/org/bson/json/JsonBufferTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bson.json;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class JsonBufferTest {
-
-    @Test
-    public void testRead() {
-        JsonBuffer buffer = new JsonBuffer("ABC");
-        assertEquals('A', buffer.read());
-        assertEquals('B', buffer.read());
-        assertEquals('C', buffer.read());
-        assertEquals(-1, buffer.read());
-    }
-
-    @Test
-    public void testUnRead() {
-        JsonBuffer buffer = new JsonBuffer("A");
-        buffer.unread(buffer.read());
-        assertEquals('A', buffer.read());
-        assertEquals(-1, buffer.read());
-    }
-
-    @Test
-    public void testPosition() {
-        JsonBuffer buffer = new JsonBuffer("ABC");
-
-        buffer.setPosition(2);
-        assertEquals(2, buffer.getPosition());
-    }
-
-    @Test(expected = JsonParseException.class)
-    public void testEOFCheck() {
-        JsonBuffer buffer = new JsonBuffer("");
-
-        buffer.read();
-        buffer.read();
-    }
-}
diff --git a/bson/src/test/unit/org/bson/json/JsonReaderSpecification.groovy b/bson/src/test/unit/org/bson/json/JsonReaderSpecification.groovy
new file mode 100644
index 00000000000..70417300595
--- /dev/null
+++ b/bson/src/test/unit/org/bson/json/JsonReaderSpecification.groovy
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json
+
+import org.bson.BsonDocument
+import org.bson.BsonHelper
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import static org.bson.AbstractBsonReader.State.DONE
+import static org.bson.AbstractBsonReader.State.TYPE
+
+class JsonReaderSpecification extends Specification {
+
+    @Unroll
+    def 'should skip value #value'() {
+        given:
+        def document = new BsonDocument('name', value)
+        def reader = new JsonReader(document.toJson())
+        reader.readStartDocument()
+        reader.readBsonType()
+
+        when:
+        reader.skipName()
+        reader.skipValue()
+
+        then:
+        reader.getState() == TYPE
+
+        when:
+        reader.readEndDocument()
+
+        then:
+        reader.getState() == DONE
+
+        where:
+        value << BsonHelper.valuesOfEveryType()
+    }
+}
diff --git a/bson/src/test/unit/org/bson/json/JsonReaderTest.java b/bson/src/test/unit/org/bson/json/JsonReaderTest.java
index bcf97c345ba..260c3784338 100644
--- a/bson/src/test/unit/org/bson/json/JsonReaderTest.java
+++ b/bson/src/test/unit/org/bson/json/JsonReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,794 +20,1491 @@
 import org.bson.BsonBinary;
 import org.bson.BsonBinarySubType;
 import org.bson.BsonDbPointer;
+import org.bson.BsonReaderMark;
 import org.bson.BsonRegularExpression;
 import org.bson.BsonTimestamp;
 import org.bson.BsonType;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 import org.junit.Test;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 
+import static java.util.Arrays.asList;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 
 public class JsonReaderTest {
-    private AbstractBsonReader bsonReader;
+
+    // Define our own until Java 8 is the minimum supported version
+    interface Function<T, R> {
+       R apply(T t);
+    }
 
     @Test
     public void testArrayEmpty() {
         String json = "[]";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
-        bsonReader.readStartArray();
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndArray();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
+                bsonReader.readStartArray();
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndArray();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testArrayOneElement() {
         String json = "[1]";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
-        bsonReader.readStartArray();
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals(1, bsonReader.readInt32());
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndArray();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
+                bsonReader.readStartArray();
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals(1, bsonReader.readInt32());
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndArray();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testArrayTwoElements() {
         String json = "[1, 2]";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
-        bsonReader.readStartArray();
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals(1, bsonReader.readInt32());
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals(2, bsonReader.readInt32());
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndArray();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
+                bsonReader.readStartArray();
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals(1, bsonReader.readInt32());
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals(2, bsonReader.readInt32());
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndArray();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testBooleanFalse() {
         String json = "false";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.BOOLEAN, bsonReader.readBsonType());
-        assertEquals(false, bsonReader.readBoolean());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BOOLEAN, bsonReader.readBsonType());
+                assertFalse(bsonReader.readBoolean());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testBooleanTrue() {
         String json = "true";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.BOOLEAN, bsonReader.readBsonType());
-        assertEquals(true, bsonReader.readBoolean());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BOOLEAN, bsonReader.readBsonType());
+                assertTrue(bsonReader.readBoolean());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeMinBson() {
         String json = "new Date(-9223372036854775808)";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(-9223372036854775808L, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(-9223372036854775808L, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeMaxBson() {
         String json = "new Date(9223372036854775807)";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        long k = bsonReader.readDateTime();
-        assertEquals(9223372036854775807L, k);
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                long k = bsonReader.readDateTime();
+                assertEquals(9223372036854775807L, k);
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeShell() {
         String json = "ISODate(\"1970-01-01T00:00:00Z\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(0, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(0, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeShellWith24HourTimeSpecification() {
         String json = "ISODate(\"2013-10-04T12:07:30.443Z\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(1380888450443L, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(1380888450443L, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeStrict() {
         String json = "{ \"$date\" : 0 }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(0, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(0, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testNestedDateTimeStrict() {
+        String json = "{d1 : { \"$date\" : 0 }, d2 : { \"$date\" : 1 } }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(0L, bsonReader.readDateTime("d1"));
+                assertEquals(1L, bsonReader.readDateTime("d2"));
+                bsonReader.readEndDocument();
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeISOString() {
         String json = "{ \"$date\" : \"2015-04-16T14:55:57.626Z\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(1429196157626L, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(1429196157626L, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeISOStringWithTimeOffset() {
         String json = "{ \"$date\" : \"2015-04-16T16:55:57.626+02:00\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(1429196157626L, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-    }
-
-    @Test(expected = JsonParseException.class)
-    public void testInvalidDateTimeISOString1() {
-        String json = "{ \"$date\" : \"2015-04-16T16:55:57.626+02:0000\" }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readBsonType();
-    }
-
-    @Test(expected = JsonParseException.class)
-    public void testInvalidDateTimeISOString2() {
-        String json = "{ \"$date\" : \"2015-04-16T16:55:57.626Z invalid string\" }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readBsonType();
-    }
-
-    @Test(expected = JsonParseException.class)
-    public void testInvalidDateTimeValue() {
-        String json = "{ \"$date\" : {} }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readBsonType();
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(1429196157626L, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeTengen() {
         String json = "new Date(0)";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(0, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(0, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDocumentEmpty() {
         String json = "{ }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndDocument();
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndDocument();
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDocumentNested() {
         String json = "{ \"a\" : { \"x\" : 1 }, \"y\" : 2 }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        assertEquals("a", bsonReader.readName());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals("x", bsonReader.readName());
-        assertEquals(1, bsonReader.readInt32());
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndDocument();
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals("y", bsonReader.readName());
-        assertEquals(2, bsonReader.readInt32());
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                assertEquals("a", bsonReader.readName());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals("x", bsonReader.readName());
+                assertEquals(1, bsonReader.readInt32());
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndDocument();
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals("y", bsonReader.readName());
+                assertEquals(2, bsonReader.readInt32());
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDocumentOneElement() {
         String json = "{ \"x\" : 1 }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals("x", bsonReader.readName());
-        assertEquals(1, bsonReader.readInt32());
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals("x", bsonReader.readName());
+                assertEquals(1, bsonReader.readInt32());
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDocumentTwoElements() {
         String json = "{ \"x\" : 1, \"y\" : 2 }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals("x", bsonReader.readName());
-        assertEquals(1, bsonReader.readInt32());
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals("y", bsonReader.readName());
-        assertEquals(2, bsonReader.readInt32());
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals("x", bsonReader.readName());
+                assertEquals(1, bsonReader.readInt32());
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals("y", bsonReader.readName());
+                assertEquals(2, bsonReader.readInt32());
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDouble() {
         String json = "1.5";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOUBLE, bsonReader.readBsonType());
-        assertEquals(1.5, bsonReader.readDouble(), 0);
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOUBLE, bsonReader.readBsonType());
+                assertEquals(1.5, bsonReader.readDouble(), 0);
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testHexData() {
-        byte[] expectedBytes = new byte[]{0x01, 0x23};
+        final byte[] expectedBytes = new byte[]{0x01, 0x23};
         String json = "HexData(0, \"0123\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.BINARY, bsonReader.readBsonType());
-        BsonBinary binary = bsonReader.readBinaryData();
-        byte[] bytes = binary.getData();
-        assertArrayEquals(expectedBytes, binary.getData());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertArrayEquals(expectedBytes, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testHexDataWithNew() {
-        byte[] expectedBytes = new byte[]{0x01, 0x23};
+        final byte[] expectedBytes = new byte[]{0x01, 0x23};
         String json = "new HexData(0, \"0123\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.BINARY, bsonReader.readBsonType());
-        BsonBinary binary = bsonReader.readBinaryData();
-        byte[] bytes = binary.getData();
-        assertArrayEquals(expectedBytes, binary.getData());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertArrayEquals(expectedBytes, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testInt32() {
         String json = "123";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals(123, bsonReader.readInt32());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals(123, bsonReader.readInt32());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
 
     }
 
     @Test
     public void testInt64() {
         String json = String.valueOf(Long.MAX_VALUE);
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.INT64, bsonReader.readBsonType());
-        assertEquals(Long.MAX_VALUE, bsonReader.readInt64());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-    }
-
-    @Test
-    public void testNumberLong() {
-        String json = "NumberLong(123)";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.INT64, bsonReader.readBsonType());
-        assertEquals(123, bsonReader.readInt64());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.INT64, bsonReader.readBsonType());
+                assertEquals(Long.MAX_VALUE, bsonReader.readInt64());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testNumberLongExtendedJson() {
         String json = "{\"$numberLong\":\"123\"}";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.INT64, bsonReader.readBsonType());
-        assertEquals(123, bsonReader.readInt64());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.INT64, bsonReader.readBsonType());
+                assertEquals(123, bsonReader.readInt64());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
-    public void testNumberLongWithNew() {
-        String json = "new NumberLong(123)";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.INT64, bsonReader.readBsonType());
-        assertEquals(123, bsonReader.readInt64());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+    public void testNumberLong() {
+        List<String> jsonTexts = asList(
+                "NumberLong(123)",
+                "NumberLong(\"123\")",
+                "new NumberLong(123)",
+                "new NumberLong(\"123\")");
+        for (String json : jsonTexts) {
+            testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+                @Override
+                public Void apply(final AbstractBsonReader bsonReader) {
+                    assertEquals(BsonType.INT64, bsonReader.readBsonType());
+                    assertEquals(123, bsonReader.readInt64());
+                    assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                    return null;
+                }
+            });
+        }
+    }
+
+    @Test
+    public void testNumberInt() {
+        List<String> jsonTexts = asList(
+                "NumberInt(123)",
+                "NumberInt(\"123\")",
+                "new NumberInt(123)",
+                "new NumberInt(\"123\")");
+        for (String json : jsonTexts) {
+            testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+                @Override
+                public Void apply(final AbstractBsonReader bsonReader) {
+                    assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                    assertEquals(123, bsonReader.readInt32());
+                    assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                    return null;
+                }
+            });
+        }
+    }
+
+    @Test
+    public void testDecimal128StringConstructor() {
+        String json = "NumberDecimal(\"314E-2\")";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DECIMAL128, bsonReader.readBsonType());
+                assertEquals(Decimal128.parse("314E-2"), bsonReader.readDecimal128());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testDecimal128Int32Constructor() {
+        String json = "NumberDecimal(" + Integer.MAX_VALUE + ")";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DECIMAL128, bsonReader.readBsonType());
+                assertEquals(new Decimal128(Integer.MAX_VALUE), bsonReader.readDecimal128());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testDecimal128Int64Constructor() {
+        String json = "NumberDecimal(" + Long.MAX_VALUE + ")";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DECIMAL128, bsonReader.readBsonType());
+                assertEquals(new Decimal128(Long.MAX_VALUE), bsonReader.readDecimal128());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testDecimal128DoubleConstructor() {
+        String json = "NumberDecimal(" + 1.0 + ")";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DECIMAL128, bsonReader.readBsonType());
+                assertEquals(Decimal128.parse("1"), bsonReader.readDecimal128());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testDecimal128BooleanConstructor() {
+        String json = "NumberDecimal(true)";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                try {
+                    bsonReader.readBsonType();
+                    fail("Should fail to parse NumberDecimal constructor with a string");
+                } catch (JsonParseException e) {
+                    // all good
+                }
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testDecimal128WithNew() {
+        String json = "new NumberDecimal(\"314E-2\")";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DECIMAL128, bsonReader.readBsonType());
+                assertEquals(Decimal128.parse("314E-2"), bsonReader.readDecimal128());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testDecimal128ExtendedJson() {
+        String json = "{\"$numberDecimal\":\"314E-2\"}";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DECIMAL128, bsonReader.readBsonType());
+                assertEquals(Decimal128.parse("314E-2"), bsonReader.readDecimal128());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testJavaScript() {
         String json = "{ \"$code\" : \"function f() { return 1; }\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.JAVASCRIPT, bsonReader.readBsonType());
-        assertEquals("function f() { return 1; }", bsonReader.readJavaScript());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.JAVASCRIPT, bsonReader.readBsonType());
+                assertEquals("function f() { return 1; }", bsonReader.readJavaScript());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testJavaScriptWithScope() {
         String json = "{\"codeWithScope\": { \"$code\" : \"function f() { return n; }\", \"$scope\" : { \"n\" : 1 } } }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.JAVASCRIPT_WITH_SCOPE, bsonReader.readBsonType());
-        assertEquals("codeWithScope", bsonReader.readName());
-        assertEquals("function f() { return n; }", bsonReader.readJavaScriptWithScope());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.INT32, bsonReader.readBsonType());
-        assertEquals("n", bsonReader.readName());
-        assertEquals(1, bsonReader.readInt32());
-        bsonReader.readEndDocument();
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.JAVASCRIPT_WITH_SCOPE, bsonReader.readBsonType());
+                assertEquals("codeWithScope", bsonReader.readName());
+                assertEquals("function f() { return n; }", bsonReader.readJavaScriptWithScope());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.INT32, bsonReader.readBsonType());
+                assertEquals("n", bsonReader.readName());
+                assertEquals(1, bsonReader.readInt32());
+                bsonReader.readEndDocument();
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testMaxKey() {
-        String json = "{ \"$maxKey\" : 1 }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.MAX_KEY, bsonReader.readBsonType());
-        bsonReader.readMaxKey();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
+        for (String maxKeyJson : asList("{ \"$maxKey\" : 1 }", "MaxKey", "MaxKey()", "new MaxKey", "new MaxKey()")) {
+            String json = "{ maxKey : " + maxKeyJson + " }";
+            testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+                @Override
+                public Void apply(final AbstractBsonReader bsonReader) {
+                    bsonReader.readStartDocument();
+                    assertEquals("maxKey", bsonReader.readName());
+                    assertEquals(BsonType.MAX_KEY, bsonReader.getCurrentBsonType());
+                    bsonReader.readMaxKey();
+                    bsonReader.readEndDocument();
+                    assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                    return null;
+                }
+            });
+        }
     }
 
     @Test
     public void testMinKey() {
-        String json = "{ \"$minKey\" : 1 }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.MIN_KEY, bsonReader.readBsonType());
-        bsonReader.readMinKey();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
+        for (String minKeyJson : asList("{ \"$minKey\" : 1 }", "MinKey", "MinKey()", "new MinKey", "new MinKey()")) {
+            String json = "{ minKey : " + minKeyJson + " }";
+            testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+                @Override
+                public Void apply(final AbstractBsonReader bsonReader) {
+                    bsonReader.readStartDocument();
+                    assertEquals("minKey", bsonReader.readName());
+                    assertEquals(BsonType.MIN_KEY, bsonReader.getCurrentBsonType());
+                    bsonReader.readMinKey();
+                    bsonReader.readEndDocument();
+                    assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                    return null;
+                }
+            });
+        }
     }
 
     @Test
     public void testNestedArray() {
         String json = "{ \"a\" : [1, 2] }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
-        assertEquals("a", bsonReader.readName());
-        bsonReader.readStartArray();
-        assertEquals(1, bsonReader.readInt32());
-        assertEquals(2, bsonReader.readInt32());
-        bsonReader.readEndArray();
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.ARRAY, bsonReader.readBsonType());
+                assertEquals("a", bsonReader.readName());
+                bsonReader.readStartArray();
+                assertEquals(1, bsonReader.readInt32());
+                assertEquals(2, bsonReader.readInt32());
+                bsonReader.readEndArray();
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testNestedDocument() {
         String json = "{ \"a\" : { \"b\" : 1, \"c\" : 2 } }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        assertEquals("a", bsonReader.readName());
-        bsonReader.readStartDocument();
-        assertEquals("b", bsonReader.readName());
-        assertEquals(1, bsonReader.readInt32());
-        assertEquals("c", bsonReader.readName());
-        assertEquals(2, bsonReader.readInt32());
-        bsonReader.readEndDocument();
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                assertEquals("a", bsonReader.readName());
+                bsonReader.readStartDocument();
+                assertEquals("b", bsonReader.readName());
+                assertEquals(1, bsonReader.readInt32());
+                assertEquals("c", bsonReader.readName());
+                assertEquals(2, bsonReader.readInt32());
+                bsonReader.readEndDocument();
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testNull() {
         String json = "null";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.NULL, bsonReader.readBsonType());
-        bsonReader.readNull();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.NULL, bsonReader.readBsonType());
+                bsonReader.readNull();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testObjectIdShell() {
         String json = "ObjectId(\"4d0ce088e447ad08b4721a37\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
-        ObjectId objectId = bsonReader.readObjectId();
-        assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
+                ObjectId objectId = bsonReader.readObjectId();
+                assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testObjectIdWithNew() {
         String json = "new ObjectId(\"4d0ce088e447ad08b4721a37\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
-        ObjectId objectId = bsonReader.readObjectId();
-        assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
+                ObjectId objectId = bsonReader.readObjectId();
+                assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testObjectIdStrict() {
         String json = "{ \"$oid\" : \"4d0ce088e447ad08b4721a37\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
-        ObjectId objectId = bsonReader.readObjectId();
-        assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
+                ObjectId objectId = bsonReader.readObjectId();
+                assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testObjectIdTenGen() {
         String json = "ObjectId(\"4d0ce088e447ad08b4721a37\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
-        ObjectId objectId = bsonReader.readObjectId();
-        assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.OBJECT_ID, bsonReader.readBsonType());
+                ObjectId objectId = bsonReader.readObjectId();
+                assertEquals("4d0ce088e447ad08b4721a37", objectId.toString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testRegularExpressionShell() {
         String json = "/pattern/imxs";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
-        BsonRegularExpression regex = bsonReader.readRegularExpression();
-        assertEquals("pattern", regex.getPattern());
-        assertEquals("imxs", regex.getOptions());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
+                BsonRegularExpression regex = bsonReader.readRegularExpression();
+                assertEquals("pattern", regex.getPattern());
+                assertEquals("imsx", regex.getOptions());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testRegularExpressionStrict() {
         String json = "{ \"$regex\" : \"pattern\", \"$options\" : \"imxs\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
-        BsonRegularExpression regex = bsonReader.readRegularExpression();
-        assertEquals("pattern", regex.getPattern());
-        assertEquals("imxs", regex.getOptions());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-        JsonWriterSettings settings = new JsonWriterSettings(JsonMode.STRICT);
-
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
+                BsonRegularExpression regex = bsonReader.readRegularExpression();
+                assertEquals("pattern", regex.getPattern());
+                assertEquals("imsx", regex.getOptions());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testRegularExpressionCanonical() {
+        String json = "{ \"$regularExpression\" : { \"pattern\" : \"pattern\", \"options\" : \"imxs\" }}";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
+                BsonRegularExpression regex = bsonReader.readRegularExpression();
+                assertEquals("pattern", regex.getPattern());
+                assertEquals("imsx", regex.getOptions());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testRegularExpressionQuery() {
+        String json = "{ \"$regex\" : { \"$regularExpression\" : { \"pattern\" : \"pattern\", \"options\" : \"imxs\" }}}";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                BsonRegularExpression regex = bsonReader.readRegularExpression("$regex");
+                assertEquals("pattern", regex.getPattern());
+                assertEquals("imsx", regex.getOptions());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testRegularExpressionQueryShell() {
+        String json = "{ \"$regex\" : /pattern/imxs}";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                BsonRegularExpression regex = bsonReader.readRegularExpression("$regex");
+                assertEquals("pattern", regex.getPattern());
+                assertEquals("imsx", regex.getOptions());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testString() {
-        String str = "abc";
-        String json = '"' + str + '"';
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.STRING, bsonReader.readBsonType());
-        assertEquals(str, bsonReader.readString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
-        str = "\ud806\udc5c";
-        json = '"' + str + '"';
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.STRING, bsonReader.readBsonType());
-        assertEquals(str, bsonReader.readString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
-        str = "\\ud806\\udc5c";
-        json = '"' + str + '"';
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.STRING, bsonReader.readBsonType());
-        assertEquals("\ud806\udc5c", bsonReader.readString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-
-        str = "꼢𑡜ᳫ鉠鮻罖᧭䆔瘉";
-        json = '"' + str + '"';
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.STRING, bsonReader.readBsonType());
-        assertEquals(str, bsonReader.readString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        final String str = "abc";
+        final String json = '"' + str + '"';
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.STRING, bsonReader.readBsonType());
+                assertEquals(str, bsonReader.readString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+
+        final String str2 = "\ud806\udc5c";
+        final String json2 = '"' + str2 + '"';
+        testStringAndStream(json2, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.STRING, bsonReader.readBsonType());
+                assertEquals(str2, bsonReader.readString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+
+        final String str3 = "\\ud806\\udc5c";
+        final String json3 = '"' + str3 + '"';
+        testStringAndStream(json3, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.STRING, bsonReader.readBsonType());
+                assertEquals("\ud806\udc5c", bsonReader.readString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+
+        final String str4 = "꼢𑡜ᳫ鉠鮻罖᧭䆔瘉";
+        final String json4 = '"' + str4 + '"';
+        testStringAndStream(json4, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.STRING, bsonReader.readBsonType());
+                assertEquals(str4, bsonReader.readString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testStringEmpty() {
         String json = "\"\"";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.STRING, bsonReader.readBsonType());
-        assertEquals("", bsonReader.readString());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.STRING, bsonReader.readBsonType());
+                assertEquals("", bsonReader.readString());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testSymbol() {
         String json = "{ \"$symbol\" : \"symbol\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.SYMBOL, bsonReader.readBsonType());
-        assertEquals("symbol", bsonReader.readSymbol());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.SYMBOL, bsonReader.readBsonType());
+                assertEquals("symbol", bsonReader.readSymbol());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testTimestampStrict() {
         String json = "{ \"$timestamp\" : { \"t\" : 1234, \"i\" : 1 } }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.TIMESTAMP, bsonReader.readBsonType());
-        assertEquals(new BsonTimestamp(1234, 1), bsonReader.readTimestamp());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.TIMESTAMP, bsonReader.readBsonType());
+                assertEquals(new BsonTimestamp(1234, 1), bsonReader.readTimestamp());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testTimestampStrictWithOutOfOrderFields() {
+        String json = "{ \"$timestamp\" : { \"i\" : 1, \"t\" : 1234 } }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.TIMESTAMP, bsonReader.readBsonType());
+                assertEquals(new BsonTimestamp(1234, 1), bsonReader.readTimestamp());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testTimestampShell() {
         String json = "Timestamp(1234, 1)";
-        bsonReader = new JsonReader(json);
-
-        assertEquals(BsonType.TIMESTAMP, bsonReader.readBsonType());
-        assertEquals(new BsonTimestamp(1234, 1), bsonReader.readTimestamp());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.TIMESTAMP, bsonReader.readBsonType());
+                assertEquals(new BsonTimestamp(1234, 1), bsonReader.readTimestamp());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testUndefined() {
         String json = "undefined";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.UNDEFINED, bsonReader.readBsonType());
-        bsonReader.readUndefined();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.UNDEFINED, bsonReader.readBsonType());
+                bsonReader.readUndefined();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testUndefinedExtended() {
         String json = "{ \"$undefined\" : true }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.UNDEFINED, bsonReader.readBsonType());
-        bsonReader.readUndefined();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-    }
-
-    @Test(expected = JsonParseException.class)
-    public void testUndefinedExtendedInvalid() {
-        String json = "{ \"$undefined\" : false }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readUndefined();
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.UNDEFINED, bsonReader.readBsonType());
+                bsonReader.readUndefined();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test(expected = IllegalStateException.class)
     public void testClosedState() {
-        bsonReader = new JsonReader("");
+        final AbstractBsonReader bsonReader = new JsonReader("");
         bsonReader.close();
         bsonReader.readBinaryData();
     }
 
-    @Test(expected = JsonParseException.class)
+    @Test
     public void testEndOfFile0() {
         String json = "{";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        bsonReader.readBsonType();
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                bsonReader.readBsonType();
+                return null;
+            }
+        }, JsonParseException.class);
     }
 
-    @Test(expected = JsonParseException.class)
+    @Test
     public void testEndOfFile1() {
         String json = "{ test : ";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readStartDocument();
-        bsonReader.readBsonType();
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readStartDocument();
+                bsonReader.readBsonType();
+                return null;
+            }
+        }, JsonParseException.class);
     }
 
     @Test
-    public void testBinary() {
+    public void testLegacyBinary() {
         String json = "{ \"$binary\" : \"AQID\", \"$type\" : \"0\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.BINARY, bsonReader.readBsonType());
-        BsonBinary binary = bsonReader.readBinaryData();
-        assertEquals(0, binary.getType());
-        assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
-    }
-
-    @Test
-    public void testUserDefinedBinary() {
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.BINARY.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testLegacyBinaryWithNumericType() {
+        String json = "{ \"$binary\" : \"AQID\", \"$type\" : 0 }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.BINARY.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testLegacyUserDefinedBinary() {
         String json = "{ \"$binary\" : \"AQID\", \"$type\" : \"80\" }";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.BINARY, bsonReader.readBsonType());
-        BsonBinary binary = bsonReader.readBinaryData();
-        assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
-        assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testLegacyUserDefinedBinaryWithKeyOrderReversed() {
+        String json = "{ \"$type\" : \"80\", \"$binary\" : \"AQID\" }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testLegacyUserDefinedBinaryWithNumericType() {
+        String json = "{ \"$binary\" : \"AQID\", \"$type\" : 128 }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testCanonicalExtendedJsonBinary() {
+        String json = "{ \"$binary\" : { \"base64\" : \"AQID\", \"subType\" : \"80\" } }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testCanonicalExtendedJsonBinaryWithKeysReversed() {
+        String json = "{ \"$binary\" : { \"subType\" : \"80\", \"base64\" : \"AQID\" } }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testCanonicalExtendedJsonBinaryWithIncorrectFirstKey() {
+        String json = "{ \"$binary\" : { \"badKey\" : \"80\", \"base64\" : \"AQID\" } }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                return null;
+            }
+        }, JsonParseException.class);
     }
 
     @Test
     public void testInfinity() {
         String json = "{ \"value\" : Infinity }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.DOUBLE, bsonReader.readBsonType());
-        bsonReader.readName();
-        assertEquals(Double.POSITIVE_INFINITY, bsonReader.readDouble(), 0.0001);
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.DOUBLE, bsonReader.readBsonType());
+                bsonReader.readName();
+                assertEquals(Double.POSITIVE_INFINITY, bsonReader.readDouble(), 0.0001);
+                return null;
+            }
+        });
     }
 
     @Test
     public void testNaN() {
         String json = "{ \"value\" : NaN }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.DOUBLE, bsonReader.readBsonType());
-        bsonReader.readName();
-        assertEquals(Double.NaN, bsonReader.readDouble(), 0.0001);
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.DOUBLE, bsonReader.readBsonType());
+                bsonReader.readName();
+                assertEquals(Double.NaN, bsonReader.readDouble(), 0.0001);
+                return null;
+            }
+        });
     }
 
     @Test
     public void testBinData() {
         String json = "{ \"a\" : BinData(3, AQID) }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.BINARY, bsonReader.readBsonType());
-        BsonBinary binary = bsonReader.readBinaryData();
-        assertEquals(3, binary.getType());
-        assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(3, binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testBinDataUserDefined() {
         String json = "{ \"a\" : BinData(128, AQID) }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.BINARY, bsonReader.readBsonType());
-        BsonBinary binary = bsonReader.readBinaryData();
-        assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
-        assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(BsonBinarySubType.USER_DEFINED.getValue(), binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testBinDataWithNew() {
         String json = "{ \"a\" : new BinData(3, AQID) }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readStartDocument();
-        assertEquals(BsonType.BINARY, bsonReader.readBsonType());
-        BsonBinary binary = bsonReader.readBinaryData();
-        assertEquals(3, binary.getType());
-        assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(3, binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3}, binary.getData());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testBinDataQuoted() {
+        String json = "{ \"a\" : BinData(3, \"AQIDBA==\") }";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                assertEquals(BsonType.BINARY, bsonReader.readBsonType());
+                BsonBinary binary = bsonReader.readBinaryData();
+                assertEquals(3, binary.getType());
+                assertArrayEquals(new byte[]{1, 2, 3, 4}, binary.getData());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateWithNumbers() {
         String json = "new Date(1988, 06, 13 , 22 , 1)";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(584834460000L, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(584834460000L, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeConstructorWithNew() {
         String json = "new Date(\"Sat Jul 13 2013 11:10:05 UTC\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertEquals(1373713805000L, bsonReader.readDateTime());
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertEquals(1373713805000L, bsonReader.readDateTime());
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testEmptyDateTimeConstructorWithNew() {
-        long currentTime = new Date().getTime();
+        final long currentTime = new Date().getTime();
         String json = "new Date()";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertTrue(bsonReader.readDateTime() >= currentTime);
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertTrue(bsonReader.readDateTime() >= currentTime);
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeWithOutNew() {
-        long currentTime = currentTimeWithoutMillis();
+        final long currentTime = currentTimeWithoutMillis();
         String json = "Date()";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.STRING, bsonReader.readBsonType());
-        assertTrue(dateStringToTime(bsonReader.readString()) >= currentTime);
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.STRING, bsonReader.readBsonType());
+                assertTrue(dateStringToTime(bsonReader.readString()) >= currentTime);
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDateTimeWithOutNewContainingJunk() {
-        long currentTime = currentTimeWithoutMillis();
+        final long currentTime = currentTimeWithoutMillis();
         String json = "Date({ok: 1}, 1234)";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.STRING, bsonReader.readBsonType());
-        assertTrue(dateStringToTime(bsonReader.readString()) >= currentTime);
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.STRING, bsonReader.readBsonType());
+                assertTrue(dateStringToTime(bsonReader.readString()) >= currentTime);
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testEmptyISODateTimeConstructorWithNew() {
-        long currentTime = new Date().getTime();
+        final long currentTime = new Date().getTime();
         String json = "new ISODate()";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertTrue(bsonReader.readDateTime() >= currentTime);
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertTrue(bsonReader.readDateTime() >= currentTime);
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testEmptyISODateTimeConstructor() {
-        long currentTime = new Date().getTime();
+        final long currentTime = new Date().getTime();
         String json = "ISODate()";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        assertTrue(bsonReader.readDateTime() >= currentTime);
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+                assertTrue(bsonReader.readDateTime() >= currentTime);
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testRegExp() {
         String json = "RegExp(\"abc\",\"im\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
-        BsonRegularExpression regularExpression = bsonReader.readRegularExpression();
-        assertEquals("abc", regularExpression.getPattern());
-        assertEquals("im", regularExpression.getOptions());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
+                BsonRegularExpression regularExpression = bsonReader.readRegularExpression();
+                assertEquals("abc", regularExpression.getPattern());
+                assertEquals("im", regularExpression.getOptions());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testRegExpWithNew() {
         String json = "new RegExp(\"abc\",\"im\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
-        BsonRegularExpression regularExpression = bsonReader.readRegularExpression();
-        assertEquals("abc", regularExpression.getPattern());
-        assertEquals("im", regularExpression.getOptions());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.REGULAR_EXPRESSION, bsonReader.readBsonType());
+                BsonRegularExpression regularExpression = bsonReader.readRegularExpression();
+                assertEquals("abc", regularExpression.getPattern());
+                assertEquals("im", regularExpression.getOptions());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testSkip() {
         String json = "{ \"a\" : 2 }";
-        bsonReader = new JsonReader(json);
-        bsonReader.readStartDocument();
-        bsonReader.readBsonType();
-        bsonReader.skipName();
-        bsonReader.skipValue();
-        assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
-        bsonReader.readEndDocument();
-        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                bsonReader.readBsonType();
+                bsonReader.skipName();
+                bsonReader.skipValue();
+                assertEquals(BsonType.END_OF_DOCUMENT, bsonReader.readBsonType());
+                bsonReader.readEndDocument();
+                assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDBPointer() {
         String json = "DBPointer(\"b\",\"5209296cd6c4e38cf96fffdc\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DB_POINTER, bsonReader.readBsonType());
-        BsonDbPointer dbPointer = bsonReader.readDBPointer();
-        assertEquals("b", dbPointer.getNamespace());
-        assertEquals(new ObjectId("5209296cd6c4e38cf96fffdc"), dbPointer.getId());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DB_POINTER, bsonReader.readBsonType());
+                BsonDbPointer dbPointer = bsonReader.readDBPointer();
+                assertEquals("b", dbPointer.getNamespace());
+                assertEquals(new ObjectId("5209296cd6c4e38cf96fffdc"), dbPointer.getId());
+                return null;
+            }
+        });
     }
 
     @Test
     public void testDBPointerWithNew() {
         String json = "new DBPointer(\"b\",\"5209296cd6c4e38cf96fffdc\")";
-        bsonReader = new JsonReader(json);
-        assertEquals(BsonType.DB_POINTER, bsonReader.readBsonType());
-        BsonDbPointer dbPointer = bsonReader.readDBPointer();
-        assertEquals("b", dbPointer.getNamespace());
-        assertEquals(new ObjectId("5209296cd6c4e38cf96fffdc"), dbPointer.getId());
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                assertEquals(BsonType.DB_POINTER, bsonReader.readBsonType());
+                BsonDbPointer dbPointer = bsonReader.readDBPointer();
+                assertEquals("b", dbPointer.getNamespace());
+                assertEquals(new ObjectId("5209296cd6c4e38cf96fffdc"), dbPointer.getId());
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testMultipleMarks() {
+        String json = "{a : { b : 1 }}";
+        testStringAndStream(json, new Function<AbstractBsonReader, Void>() {
+            @Override
+            public Void apply(final AbstractBsonReader bsonReader) {
+                bsonReader.readStartDocument();
+                BsonReaderMark markOne = bsonReader.getMark();
+                bsonReader.readName("a");
+                bsonReader.readStartDocument();
+                BsonReaderMark markTwo = bsonReader.getMark();
+                bsonReader.readName("b");
+                bsonReader.readInt32();
+                bsonReader.readEndDocument();
+                markTwo.reset();
+                bsonReader.readName("b");
+                markOne.reset();
+                bsonReader.readName("a");
+                return null;
+            }
+        });
+    }
+
+    @Test
+    public void testTwoDocuments() {
+        Reader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream("{a : 1}{b : 1}".getBytes())));
+
+        JsonReader jsonReader = new JsonReader(reader);
+        jsonReader.readStartDocument();
+        jsonReader.readName("a");
+        jsonReader.readInt32();
+        jsonReader.readEndDocument();
+
+        jsonReader = new JsonReader(reader);
+        jsonReader.readStartDocument();
+        jsonReader.readName("b");
+        jsonReader.readInt32();
+        jsonReader.readEndDocument();
+    }
+
+    private void testStringAndStream(final String json, final Function<AbstractBsonReader, Void> testFunc,
+                                     final Class<? extends RuntimeException> exClass) {
+        try {
+            testFunc.apply(new JsonReader(json));
+        } catch (final RuntimeException e) {
+            if (exClass == null) {
+                throw e;
+            }
+            assertEquals(exClass, e.getClass());
+        }
+        try {
+            testFunc.apply(new JsonReader(new InputStreamReader(new ByteArrayInputStream(json.getBytes(Charset.forName("UTF-8"))),
+                    Charset.forName("UTF-8"))));
+        } catch (final RuntimeException e) {
+            if (exClass == null) {
+                throw e;
+            }
+            assertEquals(exClass, e.getClass());
+        }
+    }
+
+    private void testStringAndStream(final String json, final Function<AbstractBsonReader, Void> testFunc) {
+        testStringAndStream(json, testFunc, null);
     }
 
     private long dateStringToTime(final String date) {
diff --git a/bson/src/test/unit/org/bson/json/JsonScannerTest.java b/bson/src/test/unit/org/bson/json/JsonScannerTest.java
index 5955c8a0775..290adab453e 100644
--- a/bson/src/test/unit/org/bson/json/JsonScannerTest.java
+++ b/bson/src/test/unit/org/bson/json/JsonScannerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ public class JsonScannerTest {
     @Test
     public void testEndOfFile() {
         String json = "\t ";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.END_OF_FILE, token.getType());
@@ -36,7 +36,7 @@ public void testEndOfFile() {
     @Test
     public void testBeginObject() {
         String json = "\t {x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.BEGIN_OBJECT, token.getType());
@@ -47,7 +47,7 @@ public void testBeginObject() {
     @Test
     public void testEndObject() {
         String json = "\t }x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.END_OBJECT, token.getType());
@@ -58,7 +58,7 @@ public void testEndObject() {
     @Test
     public void testBeginArray() {
         String json = "\t [x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.BEGIN_ARRAY, token.getType());
@@ -69,7 +69,7 @@ public void testBeginArray() {
     @Test
     public void testEndArray() {
         String json = "\t ]x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.END_ARRAY, token.getType());
@@ -80,7 +80,7 @@ public void testEndArray() {
     @Test
     public void testParentheses() {
         String json = "\t (jj)x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.LEFT_PAREN, token.getType());
@@ -95,7 +95,7 @@ public void testParentheses() {
     @Test
     public void testNameSeparator() {
         String json = "\t :x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.COLON, token.getType());
@@ -106,7 +106,7 @@ public void testNameSeparator() {
     @Test
     public void testValueSeparator() {
         String json = "\t ,x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.COMMA, token.getType());
@@ -117,7 +117,7 @@ public void testValueSeparator() {
     @Test
     public void testEmptyString() {
         String json = "\t \"\"x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.STRING, token.getType());
@@ -128,7 +128,7 @@ public void testEmptyString() {
     @Test
     public void test1CharacterString() {
         String json = "\t \"1\"x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.STRING, token.getType());
@@ -139,7 +139,7 @@ public void test1CharacterString() {
     @Test
     public void test2CharacterString() {
         String json = "\t \"12\"x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.STRING, token.getType());
@@ -150,7 +150,7 @@ public void test2CharacterString() {
     @Test
     public void test3CharacterString() {
         String json = "\t \"123\"x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.STRING, token.getType());
@@ -161,7 +161,7 @@ public void test3CharacterString() {
     @Test
     public void testEscapeSequences() {
         String json = "\t \"x\\\"\\\\\\/\\b\\f\\n\\r\\t\\u0030y\"x";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.STRING, token.getType());
@@ -173,7 +173,7 @@ public void testEscapeSequences() {
     @Test
     public void testTrue() {
         String json = "\t true,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.UNQUOTED_STRING, token.getType());
@@ -184,7 +184,7 @@ public void testTrue() {
     @Test
     public void testMinusInfinity() {
         String json = "\t -Infinity]";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -195,7 +195,7 @@ public void testMinusInfinity() {
     @Test
     public void testFalse() {
         String json = "\t false,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.UNQUOTED_STRING, token.getType());
@@ -206,7 +206,7 @@ public void testFalse() {
     @Test
     public void testNull() {
         String json = "\t null,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.UNQUOTED_STRING, token.getType());
@@ -217,7 +217,7 @@ public void testNull() {
     @Test
     public void testUndefined() {
         String json = "\t undefined,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.UNQUOTED_STRING, token.getType());
@@ -228,7 +228,7 @@ public void testUndefined() {
     @Test
     public void testUnquotedStringWithSeparator() {
         String json = "\t name123:1";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.UNQUOTED_STRING, token.getType());
@@ -239,7 +239,7 @@ public void testUnquotedStringWithSeparator() {
     @Test
     public void testUnquotedString() {
         String json = "name123";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.UNQUOTED_STRING, token.getType());
@@ -250,7 +250,7 @@ public void testUnquotedString() {
     @Test
     public void testZero() {
         String json = "\t 0,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.INT32, token.getType());
@@ -261,7 +261,7 @@ public void testZero() {
     @Test
     public void testMinusZero() {
         String json = "\t -0,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.INT32, token.getType());
@@ -272,7 +272,7 @@ public void testMinusZero() {
     @Test
     public void testOne() {
         String json = "\t 1,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.INT32, token.getType());
@@ -283,7 +283,7 @@ public void testOne() {
     @Test
     public void testMinusOne() {
         String json = "\t -1,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.INT32, token.getType());
@@ -294,7 +294,7 @@ public void testMinusOne() {
     @Test
     public void testTwelve() {
         String json = "\t 12,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.INT32, token.getType());
@@ -305,7 +305,7 @@ public void testTwelve() {
     @Test
     public void testMinusTwelve() {
         String json = "\t -12,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.INT32, token.getType());
@@ -316,7 +316,7 @@ public void testMinusTwelve() {
     @Test
     public void testZeroPointZero() {
         String json = "\t 0.0,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -327,7 +327,7 @@ public void testZeroPointZero() {
     @Test
     public void testMinusZeroPointZero() {
         String json = "\t -0.0,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -338,7 +338,7 @@ public void testMinusZeroPointZero() {
     @Test
     public void testZeroExponentOne() {
         String json = "\t 0e1,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -349,7 +349,7 @@ public void testZeroExponentOne() {
     @Test
     public void testMinusZeroExponentOne() {
         String json = "\t -0e1,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -360,7 +360,7 @@ public void testMinusZeroExponentOne() {
     @Test
     public void testZeroExponentMinusOne() {
         String json = "\t 0e-1,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -371,7 +371,7 @@ public void testZeroExponentMinusOne() {
     @Test
     public void testMinusZeroExponentMinusOne() {
         String json = "\t -0e-1,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -382,7 +382,7 @@ public void testMinusZeroExponentMinusOne() {
     @Test
     public void testOnePointTwo() {
         String json = "\t 1.2,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -393,7 +393,7 @@ public void testOnePointTwo() {
     @Test
     public void testMinusOnePointTwo() {
         String json = "\t -1.2,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -404,7 +404,7 @@ public void testMinusOnePointTwo() {
     @Test
     public void testOneExponentTwelve() {
         String json = "\t 1e12,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -415,7 +415,7 @@ public void testOneExponentTwelve() {
     @Test
     public void testMinusZeroExponentTwelve() {
         String json = "\t -1e12,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -426,7 +426,7 @@ public void testMinusZeroExponentTwelve() {
     @Test
     public void testOneExponentMinuesTwelve() {
         String json = "\t 1e-12,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -437,7 +437,7 @@ public void testOneExponentMinuesTwelve() {
     @Test
     public void testMinusZeroExponentMinusTwelve() {
         String json = "\t -1e-12,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.DOUBLE, token.getType());
@@ -448,7 +448,7 @@ public void testMinusZeroExponentMinusTwelve() {
     @Test
     public void testRegularExpressionEmpty() {
         String json = "\t //,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.REGULAR_EXPRESSION, token.getType());
@@ -464,7 +464,7 @@ public void testRegularExpressionEmpty() {
     public void testRegularExpressionPattern() {
         String json = "\t /pattern/,";
 
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.REGULAR_EXPRESSION, token.getType());
@@ -475,7 +475,7 @@ public void testRegularExpressionPattern() {
     @Test
     public void testRegularExpressionPatternAndOptions() {
         String json = "\t /pattern/im,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.REGULAR_EXPRESSION, token.getType());
@@ -489,7 +489,7 @@ public void testRegularExpressionPatternAndOptions() {
     @Test
     public void testRegularExpressionPatternAndEscapeSequence() {
         String json = "\t /patte\\.n/,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         JsonToken token = scanner.nextToken();
         assertEquals(JsonTokenType.REGULAR_EXPRESSION, token.getType());
@@ -500,7 +500,7 @@ public void testRegularExpressionPatternAndEscapeSequence() {
     @Test(expected = JsonParseException.class)
     public void testInvalidRegularExpression() {
         String json = "\t /pattern/nsk,";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         scanner.nextToken();
     }
@@ -508,7 +508,7 @@ public void testInvalidRegularExpression() {
     @Test(expected = JsonParseException.class)
     public void testInvalidRegularExpressionNoEnd() {
         String json = "/b";
-        JsonBuffer buffer = new JsonBuffer(json);
+        JsonBuffer buffer = new JsonStringBuffer(json);
         JsonScanner scanner = new JsonScanner(buffer);
         scanner.nextToken();
     }
diff --git a/bson/src/test/unit/org/bson/json/JsonStreamBufferTest.java b/bson/src/test/unit/org/bson/json/JsonStreamBufferTest.java
new file mode 100644
index 00000000000..faa607755d3
--- /dev/null
+++ b/bson/src/test/unit/org/bson/json/JsonStreamBufferTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+
+import static org.junit.Assert.assertEquals;
+
+public class JsonStreamBufferTest {
+
+    @Test
+    public void testRead() {
+        JsonStreamBuffer buffer = new JsonStreamBuffer(new InputStreamReader(new ByteArrayInputStream("ABC".getBytes())));
+        assertEquals('A', buffer.read());
+        assertEquals('B', buffer.read());
+        assertEquals('C', buffer.read());
+        assertEquals(-1, buffer.read());
+    }
+
+    @Test
+    public void testUnRead() {
+        JsonStreamBuffer buffer = new JsonStreamBuffer(new InputStreamReader(new ByteArrayInputStream("A".getBytes())));
+        buffer.unread(buffer.read());
+        assertEquals('A', buffer.read());
+        assertEquals(-1, buffer.read());
+    }
+
+    @Test
+    public void testPosition() {
+        JsonStreamBuffer buffer = new JsonStreamBuffer(new InputStreamReader(new ByteArrayInputStream("ABC".getBytes())));
+
+        buffer.read();
+        buffer.read();
+        assertEquals(2, buffer.getPosition());
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testEOFCheck() {
+        JsonStreamBuffer buffer = new JsonStreamBuffer(new InputStreamReader(new ByteArrayInputStream("".getBytes())));
+
+        buffer.read();
+        buffer.read();
+    }
+
+    @Test
+    public void testMarkAndReset() {
+        JsonStreamBuffer buffer =
+                new JsonStreamBuffer(new InputStreamReader(new ByteArrayInputStream("ABCDEFGHIJKLMNOPQRSTUPWXYZ".getBytes())), 4);
+
+        int pos = buffer.mark();
+        assertEquals(0, pos);
+        assertEquals('A', buffer.read());
+
+        buffer.reset(pos);
+        assertEquals('A', buffer.read());
+
+        pos = buffer.mark();
+        buffer.discard(pos);
+        assertEquals('B', buffer.read());
+
+        pos = buffer.mark();
+        assertEquals(2, pos);
+
+        buffer.read();
+        buffer.mark();
+
+        buffer.read();
+        buffer.mark();
+
+        buffer.reset(pos + 1);
+        assertEquals(pos + 1, buffer.getPosition());
+        assertEquals('D', buffer.read());
+
+        pos = buffer.mark();
+        buffer.read();
+        buffer.read();
+        buffer.read();
+        buffer.read();
+        buffer.read();
+
+        buffer.reset(pos);
+        assertEquals('E', buffer.read());
+        assertEquals('F', buffer.read());
+        assertEquals('G', buffer.read());
+        assertEquals('H', buffer.read());
+        assertEquals('I', buffer.read());
+        assertEquals('J', buffer.read());
+    }
+}
diff --git a/bson/src/test/unit/org/bson/json/JsonStringBufferTest.java b/bson/src/test/unit/org/bson/json/JsonStringBufferTest.java
new file mode 100644
index 00000000000..8fdab60b12f
--- /dev/null
+++ b/bson/src/test/unit/org/bson/json/JsonStringBufferTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class JsonStringBufferTest {
+
+    @Test
+    public void testRead() {
+        JsonBuffer buffer = new JsonStringBuffer("ABC");
+        assertEquals('A', buffer.read());
+        assertEquals('B', buffer.read());
+        assertEquals('C', buffer.read());
+        assertEquals(-1, buffer.read());
+    }
+
+    @Test
+    public void testUnRead() {
+        JsonStringBuffer buffer = new JsonStringBuffer("A");
+        buffer.unread(buffer.read());
+        assertEquals('A', buffer.read());
+        assertEquals(-1, buffer.read());
+    }
+
+    @Test
+    public void testPosition() {
+        JsonStringBuffer buffer = new JsonStringBuffer("ABC");
+
+        buffer.read();
+        buffer.read();
+        assertEquals(2, buffer.getPosition());
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testEOFCheck() {
+        JsonStringBuffer buffer = new JsonStringBuffer("");
+
+        buffer.read();
+        buffer.read();
+    }
+}
diff --git a/bson/src/test/unit/org/bson/json/JsonWriterSettingsSpecification.groovy b/bson/src/test/unit/org/bson/json/JsonWriterSettingsSpecification.groovy
new file mode 100644
index 00000000000..f09c134e902
--- /dev/null
+++ b/bson/src/test/unit/org/bson/json/JsonWriterSettingsSpecification.groovy
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json
+
+import spock.lang.Specification
+
+class JsonWriterSettingsSpecification extends Specification {
+
+    def 'test defaults'() {
+        when:
+        def settings = new JsonWriterSettings();
+
+        then:
+        !settings.isIndent()
+        settings.getOutputMode() == JsonMode.STRICT
+
+        when:
+        settings = JsonWriterSettings.builder().build();
+
+        then:
+        !settings.isIndent()
+        settings.getOutputMode() == JsonMode.RELAXED
+        settings.getMaxLength() == 0
+    }
+
+
+    def 'test output mode'() {
+        when:
+        def settings = JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build()
+
+        then:
+        settings.getOutputMode() == JsonMode.SHELL
+    }
+
+    def 'test indent defaults'() {
+        when:
+        def settings = JsonWriterSettings.builder().indent(true).build()
+
+        then:
+        settings.isIndent()
+        settings.getIndentCharacters() == '  '
+        settings.getNewLineCharacters() == System.getProperty('line.separator')
+    }
+
+    def 'test indent settings'() {
+        when:
+        def settings = JsonWriterSettings.builder()
+                .indent(true).indentCharacters('\t').newLineCharacters('\r\n').build()
+
+        then:
+        settings.getIndentCharacters() == '\t'
+        settings.getNewLineCharacters() == '\r\n'
+    }
+
+    def 'test max length setting'() {
+        when:
+        def settings = JsonWriterSettings.builder()
+                .maxLength(100).build()
+
+        then:
+        settings.getMaxLength() == 100
+    }
+
+    def 'test constructors'() {
+        when:
+        def settings = new JsonWriterSettings()
+
+        then:
+        !settings.isIndent()
+        settings.getOutputMode() == JsonMode.STRICT
+        settings.getMaxLength() == 0
+
+        when:
+        settings = new JsonWriterSettings(JsonMode.SHELL)
+
+        then:
+        settings.getOutputMode() == JsonMode.SHELL
+
+        when:
+        settings = new JsonWriterSettings(true)
+
+        then:
+        settings.isIndent()
+
+        when:
+        settings = new JsonWriterSettings(JsonMode.SHELL, true)
+
+        then:
+        settings.getOutputMode() == JsonMode.SHELL
+        settings.isIndent()
+
+        when:
+        settings = new JsonWriterSettings(JsonMode.SHELL, '\t')
+
+        then:
+        settings.getOutputMode() == JsonMode.SHELL
+        settings.isIndent()
+        settings.getIndentCharacters() == '\t'
+
+        when:
+        settings = new JsonWriterSettings(JsonMode.SHELL, '\t', '\r')
+
+        then:
+        settings.getOutputMode() == JsonMode.SHELL
+        settings.isIndent()
+        settings.getIndentCharacters() == '\t'
+        settings.getNewLineCharacters() == '\r'
+    }
+
+    def 'should use legacy extended json converters for strict mode'() {
+        when:
+        def settings = JsonWriterSettings.builder().outputMode(JsonMode.STRICT).build()
+
+        then:
+        settings.binaryConverter.class == LegacyExtendedJsonBinaryConverter
+        settings.booleanConverter.class == JsonBooleanConverter
+        settings.dateTimeConverter.class == LegacyExtendedJsonDateTimeConverter
+        settings.decimal128Converter.class == ExtendedJsonDecimal128Converter
+        settings.doubleConverter.class == JsonDoubleConverter
+        settings.int32Converter.class == JsonInt32Converter
+        settings.int64Converter.class == ExtendedJsonInt64Converter
+        settings.javaScriptConverter.class == JsonJavaScriptConverter
+        settings.maxKeyConverter.class == ExtendedJsonMaxKeyConverter
+        settings.minKeyConverter.class == ExtendedJsonMinKeyConverter
+        settings.nullConverter.class == JsonNullConverter
+        settings.objectIdConverter.class == ExtendedJsonObjectIdConverter
+        settings.regularExpressionConverter.class == LegacyExtendedJsonRegularExpressionConverter
+        settings.stringConverter.class == JsonStringConverter
+        settings.symbolConverter.class == JsonSymbolConverter
+        settings.timestampConverter.class == ExtendedJsonTimestampConverter
+        settings.undefinedConverter.class == ExtendedJsonUndefinedConverter
+    }
+
+    def 'should use extended json converters for extended json mode'() {
+        when:
+        def settings = JsonWriterSettings.builder().outputMode(JsonMode.EXTENDED).build()
+
+        then:
+        settings.binaryConverter.class == ExtendedJsonBinaryConverter
+        settings.booleanConverter.class == JsonBooleanConverter
+        settings.dateTimeConverter.class == ExtendedJsonDateTimeConverter
+        settings.decimal128Converter.class == ExtendedJsonDecimal128Converter
+        settings.doubleConverter.class == ExtendedJsonDoubleConverter
+        settings.int32Converter.class == ExtendedJsonInt32Converter
+        settings.int64Converter.class == ExtendedJsonInt64Converter
+        settings.javaScriptConverter.class == JsonJavaScriptConverter
+        settings.maxKeyConverter.class == ExtendedJsonMaxKeyConverter
+        settings.minKeyConverter.class == ExtendedJsonMinKeyConverter
+        settings.nullConverter.class == JsonNullConverter
+        settings.objectIdConverter.class == ExtendedJsonObjectIdConverter
+        settings.regularExpressionConverter.class == ExtendedJsonRegularExpressionConverter
+        settings.stringConverter.class == JsonStringConverter
+        settings.symbolConverter.class == JsonSymbolConverter
+        settings.timestampConverter.class == ExtendedJsonTimestampConverter
+        settings.undefinedConverter.class == ExtendedJsonUndefinedConverter
+    }
+
+    def 'should use shell converters for shell mode'() {
+        when:
+        def settings = JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build()
+
+        then:
+        settings.binaryConverter.class == ShellBinaryConverter
+        settings.booleanConverter.class == JsonBooleanConverter
+        settings.dateTimeConverter.class == ShellDateTimeConverter
+        settings.decimal128Converter.class == ShellDecimal128Converter
+        settings.doubleConverter.class == JsonDoubleConverter
+        settings.int32Converter.class == JsonInt32Converter
+        settings.int64Converter.class == ShellInt64Converter
+        settings.javaScriptConverter.class == JsonJavaScriptConverter
+        settings.maxKeyConverter.class == ShellMaxKeyConverter
+        settings.minKeyConverter.class == ShellMinKeyConverter
+        settings.nullConverter.class == JsonNullConverter
+        settings.objectIdConverter.class == ShellObjectIdConverter
+        settings.regularExpressionConverter.class == ShellRegularExpressionConverter
+        settings.stringConverter.class == JsonStringConverter
+        settings.symbolConverter.class == JsonSymbolConverter
+        settings.timestampConverter.class == ShellTimestampConverter
+        settings.undefinedConverter.class == ShellUndefinedConverter
+    }
+
+    def 'should set converters'() {
+        given:
+        def binaryConverter = new ShellBinaryConverter()
+        def booleanConverter = new JsonBooleanConverter()
+        def dateTimeConverter = new ShellDateTimeConverter()
+        def decimal128Converter = new ShellDecimal128Converter()
+        def doubleConverter = new JsonDoubleConverter()
+        def int32Converter = new JsonInt32Converter()
+        def int64Converter = new ShellInt64Converter()
+        def javaScriptConverter = new JsonJavaScriptConverter()
+        def maxKeyConverter = new ShellMaxKeyConverter()
+        def minKeyConverter = new ShellMinKeyConverter()
+        def nullConverter = new JsonNullConverter()
+        def objectIdConverter = new ShellObjectIdConverter()
+        def regularExpressionConverter = new ShellRegularExpressionConverter()
+        def stringConverter = new JsonStringConverter()
+        def symbolConverter = new JsonSymbolConverter()
+        def timestampConverter = new ShellTimestampConverter()
+        def undefinedConverter = new ShellUndefinedConverter()
+
+        when:
+        def settings = JsonWriterSettings.builder()
+                .binaryConverter(binaryConverter)
+                .booleanConverter(booleanConverter)
+                .dateTimeConverter(dateTimeConverter)
+                .decimal128Converter(decimal128Converter)
+                .doubleConverter(doubleConverter)
+                .int32Converter(int32Converter)
+                .int64Converter(int64Converter)
+                .javaScriptConverter(javaScriptConverter)
+                .maxKeyConverter(maxKeyConverter)
+                .minKeyConverter(minKeyConverter)
+                .nullConverter(nullConverter)
+                .objectIdConverter(objectIdConverter)
+                .regularExpressionConverter(regularExpressionConverter)
+                .stringConverter(stringConverter)
+                .symbolConverter(symbolConverter)
+                .timestampConverter(timestampConverter)
+                .undefinedConverter(undefinedConverter)
+                .build()
+
+        then:
+        settings.binaryConverter == binaryConverter
+        settings.booleanConverter == booleanConverter
+        settings.dateTimeConverter == dateTimeConverter
+        settings.decimal128Converter == decimal128Converter
+        settings.doubleConverter == doubleConverter
+        settings.int32Converter == int32Converter
+        settings.int64Converter == int64Converter
+        settings.javaScriptConverter == javaScriptConverter
+        settings.maxKeyConverter == maxKeyConverter
+        settings.minKeyConverter == minKeyConverter
+        settings.nullConverter == nullConverter
+        settings.objectIdConverter == objectIdConverter
+        settings.regularExpressionConverter == regularExpressionConverter
+        settings.stringConverter == stringConverter
+        settings.symbolConverter == symbolConverter
+        settings.timestampConverter == timestampConverter
+        settings.undefinedConverter == undefinedConverter
+    }
+}
diff --git a/bson/src/test/unit/org/bson/json/JsonWriterSpecification.groovy b/bson/src/test/unit/org/bson/json/JsonWriterSpecification.groovy
new file mode 100644
index 00000000000..c1dafb2306a
--- /dev/null
+++ b/bson/src/test/unit/org/bson/json/JsonWriterSpecification.groovy
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json
+
+import org.bson.BsonBinary
+import org.bson.BsonDbPointer
+import org.bson.BsonDocumentReader
+import org.bson.BsonRegularExpression
+import org.bson.BsonTimestamp
+import org.bson.types.Decimal128
+import org.bson.types.ObjectId
+import spock.lang.Specification
+
+import static org.bson.BsonHelper.documentWithValuesOfEveryType
+
+class JsonWriterSpecification extends Specification {
+
+    def stringWriter = new StringWriter();
+    def writer = new JsonWriter(stringWriter)
+    def jsonWithValuesOfEveryType = documentWithValuesOfEveryType().toJson(JsonWriterSettings.builder().build())
+
+    def 'should pipe all types'() {
+        given:
+        def reader = new BsonDocumentReader(documentWithValuesOfEveryType())
+
+        when:
+        writer.pipe(reader)
+
+        then:
+        stringWriter.toString() == documentWithValuesOfEveryType().toJson()
+    }
+
+    def 'should pipe all types with capped length'() {
+        given:
+        def reader = new BsonDocumentReader(documentWithValuesOfEveryType())
+        def writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().maxLength(maxLength).build())
+
+        when:
+        writer.pipe(reader)
+
+        then:
+        stringWriter.toString() == ((maxLength == 0) ?
+                jsonWithValuesOfEveryType : jsonWithValuesOfEveryType[0..<Math.min(maxLength, jsonWithValuesOfEveryType.length())])
+        writer.isTruncated() || maxLength == 0 || jsonWithValuesOfEveryType.length() <= maxLength
+
+        where:
+        maxLength << (0..1000)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullName() {
+        given:
+        writer.writeStartDocument()
+
+        when:
+        writer.writeName(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullValue() {
+        given:
+        writer.writeStartDocument()
+        writer.writeName('v')
+
+        when:
+        writer.writeString(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeBinaryData(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDBPointer(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDecimal128(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeJavaScript(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeJavaScriptWithScope(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeObjectId(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeRegularExpression(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeSymbol(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeTimestamp(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullMemberValue() {
+        given:
+        writer.writeStartDocument()
+
+        when:
+        writer.writeString('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeBinaryData('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDBPointer('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDecimal128('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeJavaScript('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeJavaScriptWithScope('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeObjectId('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeRegularExpression('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeSymbol('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeTimestamp('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullMemberName() {
+        given:
+        writer.writeStartDocument()
+
+        when:
+        writer.writeStartDocument(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeStartArray(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeString(null, 's')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeBinaryData(null, new BsonBinary(new byte[1]))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDBPointer(null, new BsonDbPointer('a.b', new ObjectId()))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDecimal128(null, Decimal128.NaN)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeJavaScript(null, 'function() {}')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeJavaScriptWithScope(null, 'function() {}')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeObjectId(null, new ObjectId())
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeRegularExpression(null, new BsonRegularExpression('.*'))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeSymbol(null, 's')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeTimestamp(null, new BsonTimestamp(42, 1))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeNull(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeBoolean(null, true)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeInt32(null, 1)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeInt64(null, 1L)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDouble(null, 2)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeDateTime(null, 100)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeMaxKey(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeMinKey(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeUndefined(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+}
diff --git a/bson/src/test/unit/org/bson/json/JsonWriterTest.java b/bson/src/test/unit/org/bson/json/JsonWriterTest.java
index 8a73ec04ce9..c8c68f42885 100644
--- a/bson/src/test/unit/org/bson/json/JsonWriterTest.java
+++ b/bson/src/test/unit/org/bson/json/JsonWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import org.bson.BsonInvalidOperationException;
 import org.bson.BsonRegularExpression;
 import org.bson.BsonTimestamp;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,9 +32,6 @@
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 @SuppressWarnings("unchecked")
 public class JsonWriterTest {
@@ -43,52 +41,19 @@ public class JsonWriterTest {
     @Before
     public void before() {
         stringWriter = new StringWriter();
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings());
+        writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().build());
     }
 
     private static class TestData<T> {
         private final T value;
         private final String expected;
 
-        public TestData(final T value, final String expected) {
+        TestData(final T value, final String expected) {
             this.value = value;
             this.expected = expected;
         }
     }
 
-    @Test
-    public void testSettings() {
-        JsonWriterSettings settings = new JsonWriterSettings();
-        assertNull(settings.getIndentCharacters());
-        assertEquals(System.getProperty("line.separator"), settings.getNewLineCharacters());
-        assertFalse(settings.isIndent());
-        assertEquals(JsonMode.STRICT, settings.getOutputMode());
-
-        settings = new JsonWriterSettings(JsonMode.SHELL);
-        assertNull(settings.getIndentCharacters());
-        assertEquals(System.getProperty("line.separator"), settings.getNewLineCharacters());
-        assertFalse(settings.isIndent());
-        assertEquals(JsonMode.SHELL, settings.getOutputMode());
-
-        settings = new JsonWriterSettings(true);
-        assertEquals("  ", settings.getIndentCharacters());
-        assertEquals(System.getProperty("line.separator"), settings.getNewLineCharacters());
-        assertTrue(settings.isIndent());
-        assertEquals(JsonMode.STRICT, settings.getOutputMode());
-
-        settings = new JsonWriterSettings(JsonMode.SHELL, true);
-        assertEquals("  ", settings.getIndentCharacters());
-        assertEquals(System.getProperty("line.separator"), settings.getNewLineCharacters());
-        assertTrue(settings.isIndent());
-        assertEquals(JsonMode.SHELL, settings.getOutputMode());
-
-        settings = new JsonWriterSettings(JsonMode.SHELL, "\t", "\r\n");
-        assertEquals("\t", settings.getIndentCharacters());
-        assertEquals("\r\n", settings.getNewLineCharacters());
-        assertTrue(settings.isIndent());
-        assertEquals(JsonMode.SHELL, settings.getOutputMode());
-    }
-
     @Test(expected = BsonInvalidOperationException.class)
     public void shouldThrowExceptionForBooleanWhenWritingBeforeStartingDocument() {
         writer.writeBoolean("b1", true);
@@ -212,77 +177,95 @@ public void shouldThrowAnErrorIfTryingToWriteEndDocumentIntoAJavascriptScope() {
     public void testEmptyDocument() {
         writer.writeStartDocument();
         writer.writeEndDocument();
-        String expected = "{ }";
+        String expected = "{}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
-    public void testSingleString() {
+    public void testSingleElementDocument() {
         writer.writeStartDocument();
-        writer.writeString("abc", "xyz");
+        writer.writeName("s");
+        writer.writeString("str");
         writer.writeEndDocument();
-        String expected = "{ \"abc\" : \"xyz\" }";
+        String expected = "{\"s\": \"str\"}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
-    public void testIndentedEmptyDocument() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(true));
+    public void testTwoElementDocument() {
+        writer.writeStartDocument();
+        writer.writeName("s");
+        writer.writeString("str");
+        writer.writeName("d");
+        writer.writeString("str2");
+        writer.writeEndDocument();
+        String expected = "{\"s\": \"str\", \"d\": \"str2\"}";
+        assertEquals(expected, stringWriter.toString());
+    }
+
+    @Test
+    public void testNestedDocument() {
+        writer.writeStartDocument();
+        writer.writeName("doc");
+        writer.writeStartDocument();
+        writer.writeName("doc");
         writer.writeStartDocument();
+        writer.writeName("s");
+        writer.writeString("str");
         writer.writeEndDocument();
-        String expected = "{ }";
+        writer.writeEndDocument();
+        writer.writeEndDocument();
+        String expected = "{\"doc\": {\"doc\": {\"s\": \"str\"}}}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
-    public void testIndentedOneElement() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(true));
+    public void testSingleString() {
         writer.writeStartDocument();
-        writer.writeString("name", "value");
+        writer.writeString("abc", "xyz");
         writer.writeEndDocument();
-        String expected = String.format("{%n  \"name\" : \"value\"%n}");
+        String expected = "{\"abc\": \"xyz\"}";
         assertEquals(expected, stringWriter.toString());
     }
 
+
     @Test
-    public void testIndentedTwoElements() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(true));
+    public void testBoolean() {
         writer.writeStartDocument();
-        writer.writeString("a", "x");
-        writer.writeString("b", "y");
+        writer.writeBoolean("abc", true);
         writer.writeEndDocument();
-        String expected = String.format("{%n  \"a\" : \"x\",%n  \"b\" : \"y\"%n}");
+        String expected = "{\"abc\": true}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     public void testDouble() {
         List<TestData<Double>> tests = asList(new TestData<Double>(0.0, "0.0"), new TestData<Double>(0.0005, "5.0E-4"),
-                                              new TestData<Double>(0.5, "0.5"), new TestData<Double>(1.0, "1.0"),
-                                              new TestData<Double>(1.5, "1.5"), new TestData<Double>(1.5E+40, "1.5E40"),
-                                              new TestData<Double>(1.5E-40, "1.5E-40"),
-                                              new TestData<Double>(1234567890.1234568E+123, "1.2345678901234568E132"),
-                                              new TestData<Double>(Double.MAX_VALUE, "1.7976931348623157E308"),
-                                              new TestData<Double>(Double.MIN_VALUE, "4.9E-324"),
-
-                                              new TestData<Double>(-0.0005, "-5.0E-4"),
-                                              new TestData<Double>(-0.5, "-0.5"),
-                                              new TestData<Double>(-1.0, "-1.0"),
-                                              new TestData<Double>(-1.5, "-1.5"),
-                                              new TestData<Double>(-1.5E+40, "-1.5E40"),
-                                              new TestData<Double>(-1.5E-40, "-1.5E-40"),
-                                              new TestData<Double>(-1234567890.1234568E+123, "-1.2345678901234568E132"),
-
-                                              new TestData<Double>(Double.NaN, "NaN"),
-                                              new TestData<Double>(Double.NEGATIVE_INFINITY, "-Infinity"),
-                                              new TestData<Double>(Double.POSITIVE_INFINITY, "Infinity"));
+                new TestData<Double>(0.5, "0.5"), new TestData<Double>(1.0, "1.0"),
+                new TestData<Double>(1.5, "1.5"), new TestData<Double>(1.5E+40, "1.5E40"),
+                new TestData<Double>(1.5E-40, "1.5E-40"),
+                new TestData<Double>(1234567890.1234568E+123, "1.2345678901234568E132"),
+                new TestData<Double>(Double.MAX_VALUE, "1.7976931348623157E308"),
+                new TestData<Double>(Double.MIN_VALUE, "4.9E-324"),
+
+                new TestData<Double>(-0.0005, "-5.0E-4"),
+                new TestData<Double>(-0.5, "-0.5"),
+                new TestData<Double>(-1.0, "-1.0"),
+                new TestData<Double>(-1.5, "-1.5"),
+                new TestData<Double>(-1.5E+40, "-1.5E40"),
+                new TestData<Double>(-1.5E-40, "-1.5E-40"),
+                new TestData<Double>(-1234567890.1234568E+123, "-1.2345678901234568E132"),
+
+                new TestData<Double>(Double.NaN, "NaN"),
+                new TestData<Double>(Double.NEGATIVE_INFINITY, "-Infinity"),
+                new TestData<Double>(Double.POSITIVE_INFINITY, "Infinity"));
         for (final TestData<Double> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings());
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.EXTENDED).build());
             writer.writeStartDocument();
             writer.writeDouble("d", cur.value);
             writer.writeEndDocument();
-            String expected = "{ \"d\" : " + cur.expected + " }";
+            String expected = "{\"d\": {\"$numberDouble\": \"" + cur.expected + "\"}}";
             assertEquals(expected, stringWriter.toString());
         }
     }
@@ -290,69 +273,80 @@ public void testDouble() {
     @Test
     public void testInt64Shell() {
         List<TestData<Long>> tests = asList(new TestData<Long>(Long.MIN_VALUE, "NumberLong(\"-9223372036854775808\")"),
-                                            new TestData<Long>(Integer.MIN_VALUE - 1L, "NumberLong(\"-2147483649\")"),
-                                            new TestData<Long>(Integer.MIN_VALUE + 0L, "NumberLong(-2147483648)")
-                                               ,
-                                            new TestData<Long>(0L, "NumberLong(0)"),
-                                            new TestData<Long>(Integer.MAX_VALUE + 0L, "NumberLong(2147483647)"),
-                                            new TestData<Long>(Integer.MAX_VALUE + 1L, "NumberLong(\"2147483648\")"),
-                                            new TestData<Long>(Long.MAX_VALUE, "NumberLong(\"9223372036854775807\")"));
+                new TestData<Long>(Integer.MIN_VALUE - 1L, "NumberLong(\"-2147483649\")"),
+                new TestData<Long>(Integer.MIN_VALUE + 0L, "NumberLong(-2147483648)"),
+                new TestData<Long>(0L, "NumberLong(0)"),
+                new TestData<Long>(Integer.MAX_VALUE + 0L, "NumberLong(2147483647)"),
+                new TestData<Long>(Integer.MAX_VALUE + 1L, "NumberLong(\"2147483648\")"),
+                new TestData<Long>(Long.MAX_VALUE, "NumberLong(\"9223372036854775807\")"));
         for (final TestData<Long> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.SHELL));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
             writer.writeStartDocument();
             writer.writeInt64("l", cur.value);
             writer.writeEndDocument();
-            String expected = "{ \"l\" : " + cur.expected + " }";
+            String expected = "{\"l\": " + cur.expected + "}";
             assertEquals(expected, stringWriter.toString());
         }
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testInt64Strict() {
         List<TestData<Long>> tests = asList(new TestData<Long>(Long.MIN_VALUE, "-9223372036854775808"),
-                                            new TestData<Long>(Integer.MIN_VALUE - 1L, "-2147483649"),
-                                            new TestData<Long>(Integer.MIN_VALUE - 0L, "-2147483648"),
-                                            new TestData<Long>(0L, "0"),
-                                            new TestData<Long>(Integer.MAX_VALUE + 0L, "2147483647"),
-                                            new TestData<Long>(Integer.MAX_VALUE + 1L, "2147483648"),
-                                            new TestData<Long>(Long.MAX_VALUE, "9223372036854775807"));
+                new TestData<Long>(Integer.MIN_VALUE - 1L, "-2147483649"),
+                new TestData<Long>(Integer.MIN_VALUE - 0L, "-2147483648"),
+                new TestData<Long>(0L, "0"),
+                new TestData<Long>(Integer.MAX_VALUE + 0L, "2147483647"),
+                new TestData<Long>(Integer.MAX_VALUE + 1L, "2147483648"),
+                new TestData<Long>(Long.MAX_VALUE, "9223372036854775807"));
 
         for (final TestData<Long> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.STRICT));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.STRICT).build());
             writer.writeStartDocument();
             writer.writeInt64("l", cur.value);
             writer.writeEndDocument();
-            String expected = "{ \"l\" : { \"$numberLong\" : \"" + cur.expected + "\" } }";
+            String expected = "{\"l\": {\"$numberLong\": \"" + cur.expected + "\"}}";
             assertEquals(expected, stringWriter.toString());
         }
     }
 
     @Test
-    public void testEmbeddedDocument() {
-        writer.writeStartDocument();
-        writer.writeStartDocument("doc");
-        writer.writeInt32("a", 1);
-        writer.writeInt32("b", 2);
-        writer.writeEndDocument();
-        writer.writeEndDocument();
-        String expected = "{ \"doc\" : { \"a\" : 1, \"b\" : 2 } }";
-        assertEquals(expected, stringWriter.toString());
-    }
+    public void testDecimal128SShell() {
+        List<TestData<Decimal128>> tests = asList(
+                new TestData<Decimal128>(Decimal128.parse("1.0"), "1.0"),
+                new TestData<Decimal128>(Decimal128.POSITIVE_INFINITY, Decimal128.POSITIVE_INFINITY.toString()));
+
 
+        for (final TestData<Decimal128> cur : tests) {
+            stringWriter = new StringWriter();
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
+            writer.writeStartDocument();
+            writer.writeDecimal128("d", cur.value);
+            writer.writeEndDocument();
+            String expected = "{\"d\": NumberDecimal(\"" + cur.expected + "\")}";
+            assertEquals(expected, stringWriter.toString());
+        }
+    }
 
     @Test
-    public void testIndentedEmbeddedDocument() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(true));
-        writer.writeStartDocument();
-        writer.writeStartDocument("doc");
-        writer.writeInt32("a", 1);
-        writer.writeInt32("b", 2);
-        writer.writeEndDocument();
-        writer.writeEndDocument();
-        String expected = String.format("{%n  \"doc\" : {%n    \"a\" : 1,%n    \"b\" : 2%n  }%n}");
-        assertEquals(expected, stringWriter.toString());
+    @SuppressWarnings("deprecation")
+    public void testDecimal128Strict() {
+        List<TestData<Decimal128>> tests = asList(
+                new TestData<Decimal128>(Decimal128.parse("1.0"), "1.0"),
+                new TestData<Decimal128>(Decimal128.POSITIVE_INFINITY, Decimal128.POSITIVE_INFINITY.toString()));
+
+
+        for (final TestData<Decimal128> cur : tests) {
+            stringWriter = new StringWriter();
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.STRICT).build());
+            writer.writeStartDocument();
+            writer.writeDecimal128("d", cur.value);
+            writer.writeEndDocument();
+            String expected = "{\"d\": {\"$numberDecimal\": \"" + cur.expected + "\"}}";
+            assertEquals(expected, stringWriter.toString());
+        }
     }
 
     @Test
@@ -364,34 +358,35 @@ public void testArray() {
         writer.writeInt32(3);
         writer.writeEndArray();
         writer.writeEndDocument();
-        String expected = "{ \"array\" : [1, 2, 3] }";
+        String expected = "{\"array\": [1, 2, 3]}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testBinaryStrict() {
         List<TestData<BsonBinary>> tests = asList(new TestData<BsonBinary>(new BsonBinary(new byte[0]),
-                                                                   "{ \"$binary\" : \"\", "
-                                                                   + "\"$type\" : \"0\" }"),
-                                              new TestData<BsonBinary>(new BsonBinary(new byte[]{1}),
-                                                                   "{ \"$binary\" : \"AQ==\", "
-                                                                   + "\"$type\" : \"0\" }"),
-                                              new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2}),
-                                                                   "{ \"$binary\" : \"AQI=\", "
-                                                                   + "\"$type\" : \"0\" }"),
-                                              new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2, 3}),
-                                                                   "{ \"$binary\" : \"AQID\", "
-                                                                   + "\"$type\" : \"0\" }"),
-                                              new TestData<BsonBinary>(new BsonBinary((byte) 0x80, new byte[]{1, 2, 3}),
-                                                                   "{ \"$binary\" : \"AQID\", "
-                                                                   + "\"$type\" : \"80\" }"));
+                        "{\"$binary\": \"\", "
+                                + "\"$type\": \"00\"}"),
+                new TestData<BsonBinary>(new BsonBinary(new byte[]{1}),
+                        "{\"$binary\": \"AQ==\", "
+                                + "\"$type\": \"00\"}"),
+                new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2}),
+                        "{\"$binary\": \"AQI=\", "
+                                + "\"$type\": \"00\"}"),
+                new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2, 3}),
+                        "{\"$binary\": \"AQID\", "
+                                + "\"$type\": \"00\"}"),
+                new TestData<BsonBinary>(new BsonBinary((byte) 0x80, new byte[]{1, 2, 3}),
+                        "{\"$binary\": \"AQID\", "
+                                + "\"$type\": \"80\"}"));
         for (final TestData<BsonBinary> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.STRICT));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.STRICT).build());
             writer.writeStartDocument();
             writer.writeBinaryData("binary", cur.value);
             writer.writeEndDocument();
-            String expected = "{ \"binary\" : " + cur.expected + " }";
+            String expected = "{\"binary\": " + cur.expected + "}";
             assertEquals(expected, stringWriter.toString());
         }
     }
@@ -399,34 +394,35 @@ public void testBinaryStrict() {
     @Test
     public void testBinaryShell() {
         List<TestData<BsonBinary>> tests = asList(new TestData<BsonBinary>(new BsonBinary(new byte[0]), "new BinData(0, \"\")"),
-                                              new TestData<BsonBinary>(new BsonBinary(new byte[]{1}), "new BinData(0, \"AQ==\")"),
-                                              new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2}), "new BinData(0, \"AQI=\")"),
-                                              new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2, 3}), "new BinData(0, \"AQID\")"),
-                                              new TestData<BsonBinary>(new BsonBinary((byte) 0x80, new byte[]{1, 2, 3}),
-                                                                   "new BinData(128, \"AQID\")"));
+                new TestData<BsonBinary>(new BsonBinary(new byte[]{1}), "new BinData(0, \"AQ==\")"),
+                new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2}), "new BinData(0, \"AQI=\")"),
+                new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2, 3}), "new BinData(0, \"AQID\")"),
+                new TestData<BsonBinary>(new BsonBinary((byte) 0x80, new byte[]{1, 2, 3}),
+                        "new BinData(128, \"AQID\")"));
         for (final TestData<BsonBinary> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.SHELL));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
             writer.writeStartDocument();
             writer.writeBinaryData("binary", cur.value);
             writer.writeEndDocument();
-            String expected = "{ \"binary\" : " + cur.expected + " }";
+            String expected = "{\"binary\": " + cur.expected + "}";
             assertEquals(expected, stringWriter.toString());
         }
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testDateTimeStrict() {
-        List<TestData<Date>> tests = asList(new TestData<Date>(new Date(0), "{ \"$date\" : 0 }"),
-                                            new TestData<Date>(new Date(Long.MAX_VALUE), "{ \"$date\" : 9223372036854775807 }"),
-                                            new TestData<Date>(new Date(Long.MIN_VALUE), "{ \"$date\" : -9223372036854775808 }"));
+        List<TestData<Date>> tests = asList(new TestData<Date>(new Date(0), "{\"$date\": 0}"),
+                new TestData<Date>(new Date(Long.MAX_VALUE), "{\"$date\": 9223372036854775807}"),
+                new TestData<Date>(new Date(Long.MIN_VALUE), "{\"$date\": -9223372036854775808}"));
         for (final TestData<Date> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.STRICT));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.STRICT).build());
             writer.writeStartDocument();
             writer.writeDateTime("date", cur.value.getTime());
             writer.writeEndDocument();
-            String expected = "{ \"date\" : " + cur.expected + " }";
+            String expected = "{\"date\": " + cur.expected + "}";
             assertEquals(expected, stringWriter.toString());
         }
     }
@@ -434,17 +430,17 @@ public void testDateTimeStrict() {
     @Test
     public void testDateTimeShell() {
         List<TestData<Date>> tests = asList(new TestData<Date>(new Date(0), "ISODate(\"1970-01-01T00:00:00.000Z\")"),
-                                            new TestData<Date>(new Date(1), "ISODate(\"1970-01-01T00:00:00.001Z\")"),
-                                            new TestData<Date>(new Date(-1), "ISODate(\"1969-12-31T23:59:59.999Z\")"),
-                                            new TestData<Date>(new Date(Long.MAX_VALUE), "new Date(9223372036854775807)"),
-                                            new TestData<Date>(new Date(Long.MIN_VALUE), "new Date(-9223372036854775808)"));
+                new TestData<Date>(new Date(1), "ISODate(\"1970-01-01T00:00:00.001Z\")"),
+                new TestData<Date>(new Date(-1), "ISODate(\"1969-12-31T23:59:59.999Z\")"),
+                new TestData<Date>(new Date(Long.MAX_VALUE), "new Date(9223372036854775807)"),
+                new TestData<Date>(new Date(Long.MIN_VALUE), "new Date(-9223372036854775808)"));
         for (final TestData<Date> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.SHELL));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
             writer.writeStartDocument();
             writer.writeDateTime("date", cur.value.getTime());
             writer.writeEndDocument();
-            String expected = "{ \"date\" : " + cur.expected + " }";
+            String expected = "{\"date\": " + cur.expected + "}";
             assertEquals(expected, stringWriter.toString());
         }
     }
@@ -454,7 +450,7 @@ public void testJavaScript() {
         writer.writeStartDocument();
         writer.writeJavaScript("f", "function f() { return 1; }");
         writer.writeEndDocument();
-        String expected = "{ \"f\" : { \"$code\" : \"function f() { return 1; }\" } }";
+        String expected = "{\"f\": {\"$code\": \"function f() { return 1; }\"}}";
         assertEquals(expected, stringWriter.toString());
     }
 
@@ -467,25 +463,46 @@ public void testJavaScriptWithScope() {
         writer.writeEndDocument();
         writer.writeEndDocument();
         String expected =
-            "{ \"f\" : { \"$code\" : \"function f() { return n; }\", " + "\"$scope\" : { \"n\" : 1 } } }";
+                "{\"f\": {\"$code\": \"function f() { return n; }\", " + "\"$scope\": {\"n\": 1}}}";
+        assertEquals(expected, stringWriter.toString());
+    }
+
+    @Test
+    public void testMaxKeyStrict() {
+        writer.writeStartDocument();
+        writer.writeMaxKey("maxkey");
+        writer.writeEndDocument();
+        String expected = "{\"maxkey\": {\"$maxKey\": 1}}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
-    public void testMaxKey() {
+    public void testMinKeyStrict() {
+        writer.writeStartDocument();
+        writer.writeMinKey("minkey");
+        writer.writeEndDocument();
+        String expected = "{\"minkey\": {\"$minKey\": 1}}";
+        assertEquals(expected, stringWriter.toString());
+    }
+
+
+    @Test
+    public void testMaxKeyShell() {
+        writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
         writer.writeStartDocument();
         writer.writeMaxKey("maxkey");
         writer.writeEndDocument();
-        String expected = "{ \"maxkey\" : { \"$maxKey\" : 1 } }";
+        String expected = "{\"maxkey\": MaxKey}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
-    public void testMinKey() {
+    public void testMinKeyShell() {
+        writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
         writer.writeStartDocument();
         writer.writeMinKey("minkey");
         writer.writeEndDocument();
-        String expected = "{ \"minkey\" : { \"$minKey\" : 1 } }";
+        String expected = "{\"minkey\": MinKey}";
         assertEquals(expected, stringWriter.toString());
     }
 
@@ -494,20 +511,20 @@ public void testNull() {
         writer.writeStartDocument();
         writer.writeNull("null");
         writer.writeEndDocument();
-        String expected = "{ \"null\" : null }";
+        String expected = "{\"null\": null}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     public void testObjectIdShell() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.SHELL));
+        writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
         ObjectId objectId = new ObjectId("4d0ce088e447ad08b4721a37");
 
         writer.writeStartDocument();
         writer.writeObjectId("_id", objectId);
         writer.writeEndDocument();
 
-        String expected = "{ \"_id\" : ObjectId(\"4d0ce088e447ad08b4721a37\") }";
+        String expected = "{\"_id\": ObjectId(\"4d0ce088e447ad08b4721a37\")}";
         assertEquals(expected, stringWriter.toString());
     }
 
@@ -519,7 +536,7 @@ public void testObjectIdStrict() {
         writer.writeObjectId("_id", objectId);
         writer.writeEndDocument();
 
-        String expected = "{ \"_id\" : { \"$oid\" : \"4d0ce088e447ad08b4721a37\" } }";
+        String expected = "{\"_id\": {\"$oid\": \"4d0ce088e447ad08b4721a37\"}}";
         assertEquals(expected, stringWriter.toString());
     }
 
@@ -527,88 +544,64 @@ public void testObjectIdStrict() {
     public void testRegularExpressionShell() {
         List<TestData<BsonRegularExpression>> tests;
         tests = asList(new TestData<BsonRegularExpression>(new BsonRegularExpression(""), "/(?:)/"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a"), "/a/"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a/b"), "/a\\/b/"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a\\b"), "/a\\b/"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "i"), "/a/i"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "m"), "/a/m"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "x"), "/a/x"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "s"), "/a/s"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "imxs"), "/a/imxs"));
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a"), "/a/"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a/b"), "/a\\/b/"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a\\b"), "/a\\b/"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "i"), "/a/i"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "m"), "/a/m"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "x"), "/a/x"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "s"), "/a/s"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "imxs"), "/a/imsx"));
         for (final TestData<BsonRegularExpression> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.SHELL));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
             writer.writeStartDocument();
             writer.writeRegularExpression("regex", cur.value);
             writer.writeEndDocument();
-            String expected = "{ \"regex\" : " + cur.expected + " }";
+            String expected = "{\"regex\": " + cur.expected + "}";
             assertEquals(expected, stringWriter.toString());
         }
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testRegularExpressionStrict() {
         List<TestData<BsonRegularExpression>> tests;
-        tests = asList(new TestData<BsonRegularExpression>(new BsonRegularExpression(""), "{ \"$regex\" : \"\", "
-                                                                                  + "\"$options\" : \"\" "
-                                                                                  + "}"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a"), "{ \"$regex\" : \"a\","
-                                                                                   + " \"$options\" : \"\" "
-                                                                                   + "}"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a/b"), "{ \"$regex\" : "
-                                                                                     + "\"a/b\", "
-                                                                                     + "\"$options\" : \"\" "
-                                                                                     + "}"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a\\b"), "{ \"$regex\" : "
-                                                                                      + "\"a\\\\b\", "
-                                                                                      + "\"$options\" : \"\" "
-                                                                                      + "}"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "i"), "{ \"$regex\" : \"a\","
-                                                                                        + " \"$options\" : \"i\""
-                                                                                        + " }"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "m"), "{ \"$regex\" : \"a\","
-                                                                                        + " \"$options\" : \"m\""
-                                                                                        + " }"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "x"), "{ \"$regex\" : \"a\","
-                                                                                        + " \"$options\" : \"x\""
-                                                                                        + " }"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "s"), "{ \"$regex\" : \"a\","
-                                                                                        + " \"$options\" : \"s\""
-                                                                                        + " }"),
-                       new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "imxs"),
-                                                       "{ \"$regex\" : \"a\"," + " \"$options\" : \"imxs\" }"));
+        tests = asList(new TestData<BsonRegularExpression>(new BsonRegularExpression(""), "{\"$regex\": \"\", "
+                        + "\"$options\": \"\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a"), "{\"$regex\": \"a\", "
+                        + "\"$options\": \"\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a/b"), "{\"$regex\": "
+                        + "\"a/b\", "
+                        + "\"$options\": \"\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a\\b"), "{\"$regex\": "
+                        + "\"a\\\\b\", "
+                        + "\"$options\": \"\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "i"), "{\"$regex\": \"a\", "
+                        + "\"$options\": \"i\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "m"), "{\"$regex\": \"a\", "
+                        + "\"$options\": \"m\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "x"), "{\"$regex\": \"a\", "
+                        + "\"$options\": \"x\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "s"), "{\"$regex\": \"a\", "
+                        + "\"$options\": \"s\""
+                        + "}"),
+                new TestData<BsonRegularExpression>(new BsonRegularExpression("a", "imxs"),
+                        "{\"$regex\": \"a\", " + "\"$options\": \"imsx\"}"));
         for (final TestData<BsonRegularExpression> cur : tests) {
             stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.STRICT));
+            writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.STRICT).build());
             writer.writeStartDocument();
             writer.writeRegularExpression("regex", cur.value);
             writer.writeEndDocument();
-            String expected = "{ \"regex\" : " + cur.expected + " }";
-            assertEquals(expected, stringWriter.toString());
-        }
-    }
-
-    @Test
-    public void testString() {
-        List<TestData<String>> tests;
-        tests = asList(new TestData<String>("", "\"\""), new TestData<String>(" ", "\" \""),
-                       new TestData<String>("a", "\"a\""), new TestData<String>("ab", "\"ab\""),
-                       new TestData<String>("abc", "\"abc\""),
-                       new TestData<String>("abc\u0000def", "\"abc\\u0000def\""),
-                       new TestData<String>("\\", "\"\\\\\""), new TestData<String>("\'", "\"'\""),
-                       new TestData<String>("\"", "\"\\\"\""), new TestData<String>("\0", "\"\\u0000\""),
-                       new TestData<String>("\b", "\"\\b\""), new TestData<String>("\f", "\"\\f\""),
-                       new TestData<String>("\n", "\"\\n\""), new TestData<String>("\r", "\"\\r\""),
-                       new TestData<String>("\t", "\"\\t\""), new TestData<String>("\u0080", "\"\\u0080\""),
-                       new TestData<String>("\u0080\u0081", "\"\\u0080\\u0081\""),
-                       new TestData<String>("\u0080\u0081\u0082", "\"\\u0080\\u0081\\u0082\""));
-        for (final TestData<String> cur : tests) {
-            stringWriter = new StringWriter();
-            writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.STRICT));
-            writer.writeStartDocument();
-            writer.writeString("str", cur.value);
-            writer.writeEndDocument();
-            String expected = "{ \"str\" : " + cur.expected + " }";
+            String expected = "{\"regex\": " + cur.expected + "}";
             assertEquals(expected, stringWriter.toString());
         }
     }
@@ -618,7 +611,7 @@ public void testSymbol() {
         writer.writeStartDocument();
         writer.writeSymbol("symbol", "name");
         writer.writeEndDocument();
-        String expected = "{ \"symbol\" : { \"$symbol\" : \"name\" } }";
+        String expected = "{\"symbol\": {\"$symbol\": \"name\"}}";
         assertEquals(expected, stringWriter.toString());
     }
 
@@ -628,37 +621,38 @@ public void testTimestampStrict() {
         writer.writeStartDocument();
         writer.writeTimestamp("timestamp", new BsonTimestamp(1000, 1));
         writer.writeEndDocument();
-        String expected = "{ \"timestamp\" : { \"$timestamp\" : { \"t\" : 1000, \"i\" : 1 } } }";
+        String expected = "{\"timestamp\": {\"$timestamp\": {\"t\": 1000, \"i\": 1}}}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     public void testTimestampShell() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.SHELL));
+        writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
         writer.writeStartDocument();
         writer.writeTimestamp("timestamp", new BsonTimestamp(1000, 1));
         writer.writeEndDocument();
-        String expected = "{ \"timestamp\" : Timestamp(1000, 1) }";
+        String expected = "{\"timestamp\": Timestamp(1000, 1)}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testUndefinedStrict() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.STRICT));
+        writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.STRICT).build());
         writer.writeStartDocument();
         writer.writeUndefined("undefined");
         writer.writeEndDocument();
-        String expected = "{ \"undefined\" : { \"$undefined\" : true } }";
+        String expected = "{\"undefined\": {\"$undefined\": true}}";
         assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     public void testUndefinedShell() {
-        writer = new JsonWriter(stringWriter, new JsonWriterSettings(JsonMode.SHELL));
+        writer = new JsonWriter(stringWriter, JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build());
         writer.writeStartDocument();
         writer.writeUndefined("undefined");
         writer.writeEndDocument();
-        String expected = "{ \"undefined\" : undefined }";
+        String expected = "{\"undefined\": undefined}";
         assertEquals(expected, stringWriter.toString());
     }
 
@@ -667,7 +661,7 @@ public void testDBPointer() {
         writer.writeStartDocument();
         writer.writeDBPointer("dbPointer", new BsonDbPointer("my.test", new ObjectId("4d0ce088e447ad08b4721a37")));
         writer.writeEndDocument();
-        String expected = "{ \"dbPointer\" : { \"$ref\" : \"my.test\", \"$id\" : { \"$oid\" : \"4d0ce088e447ad08b4721a37\" } } }";
+        String expected = "{\"dbPointer\": {\"$ref\": \"my.test\", \"$id\": {\"$oid\": \"4d0ce088e447ad08b4721a37\"}}}";
         assertEquals(expected, stringWriter.toString());
     }
 }
diff --git a/bson/src/test/unit/org/bson/json/StrictCharacterStreamJsonWriterSpecification.groovy b/bson/src/test/unit/org/bson/json/StrictCharacterStreamJsonWriterSpecification.groovy
new file mode 100644
index 00000000000..8a3d16036f3
--- /dev/null
+++ b/bson/src/test/unit/org/bson/json/StrictCharacterStreamJsonWriterSpecification.groovy
@@ -0,0 +1,569 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.json
+
+import org.bson.BsonInvalidOperationException
+import spock.lang.Specification
+
+import static java.lang.String.format
+
+class StrictCharacterStreamJsonWriterSpecification extends Specification {
+
+    private StringWriter stringWriter
+    private StrictCharacterStreamJsonWriter writer
+
+    def setup() {
+        stringWriter = new StringWriter()
+        writer = new StrictCharacterStreamJsonWriter(stringWriter, StrictCharacterStreamJsonWriterSettings.builder().build())
+    }
+
+    def 'should write empty document'() {
+        when:
+        writer.writeStartObject()
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{}'
+    }
+
+    def 'should write empty array'() {
+        when:
+        writer.writeStartArray()
+        writer.writeEndArray()
+
+        then:
+        stringWriter.toString() == '[]'
+    }
+
+    def 'should write null'() {
+        when:
+        writer.writeStartObject()
+        writer.writeNull('n')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"n": null}'
+    }
+
+    def 'should write boolean'() {
+        when:
+        writer.writeStartObject()
+        writer.writeBoolean('b1', true)
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"b1": true}'
+    }
+
+    def 'should write number'() {
+        when:
+        writer.writeStartObject()
+        writer.writeNumber('n', '42')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"n": 42}'
+    }
+
+    def 'should write string'() {
+        when:
+        writer.writeStartObject()
+        writer.writeString('n', '42')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"n": "42"}'
+    }
+
+    def 'should write unquoted string'() {
+        when:
+        writer.writeStartObject()
+        writer.writeRaw('s', 'NumberDecimal("42.0")')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"s": NumberDecimal("42.0")}'
+    }
+
+    def 'should write document'() {
+        when:
+        writer.writeStartObject()
+        writer.writeStartObject('d')
+        writer.writeEndObject()
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"d": {}}'
+    }
+
+    def 'should write array'() {
+        when:
+        writer.writeStartObject()
+        writer.writeStartArray('a')
+        writer.writeEndArray()
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"a": []}'
+    }
+
+    def 'should write array of values'() {
+        when:
+        writer.writeStartObject()
+        writer.writeStartArray('a')
+        writer.writeNumber('1')
+        writer.writeNull()
+        writer.writeString('str')
+        writer.writeEndArray()
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"a": [1, null, "str"]}'
+    }
+
+    def 'should write strings'() {
+        when:
+        writer.writeStartObject()
+        writer.writeString('str', value)
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"str": ' + expected + '}'
+
+        where:
+        value                | expected
+        ''                   | '""'
+        ' '                  | '" "'
+        'a'                  | '"a"'
+        'ab'                 | '"ab"'
+        'abc'                | '"abc"'
+        'abc\u0000def'       | '"abc\\u0000def"'
+        '\\'                 | '"\\\\"'
+        '\''                 | '"\'"'
+        '"'                  | '"\\""'
+        '\0'                 | '"\\u0000"'
+        '\b'                 | '"\\b"'
+        '\f'                 | '"\\f"'
+        '\n'                 | '"\\n"'
+        '\r'                 | '"\\r"'
+        '\t'                 | '"\\t"'
+        '\u0080'             | '"\\u0080"'
+        '\u0080\u0081'       | '"\\u0080\\u0081"'
+        '\u0080\u0081\u0082' | '"\\u0080\\u0081\\u0082"'
+    }
+
+    def 'should write two object elements'() {
+        when:
+        writer.writeStartObject()
+        writer.writeBoolean('b1', true)
+        writer.writeBoolean('b2', false)
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == '{"b1": true, "b2": false}'
+    }
+
+    def 'should indent one element'() {
+        given:
+        writer = new StrictCharacterStreamJsonWriter(stringWriter, StrictCharacterStreamJsonWriterSettings.builder().indent(true).build())
+
+        when:
+        writer.writeStartObject()
+        writer.writeString('name', 'value')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == format('{%n  "name": "value"%n}')
+    }
+
+    def 'should indent one element with indent and newline characters'() {
+        given:
+        writer = new StrictCharacterStreamJsonWriter(stringWriter, StrictCharacterStreamJsonWriterSettings.builder()
+                .indent(true)
+                .indentCharacters('\t')
+                .newLineCharacters('\r')
+                .build())
+
+        when:
+        writer.writeStartObject()
+        writer.writeString('name', 'value')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == format('{\r\t"name": "value"\r}')
+    }
+
+    def 'should indent two elements'() {
+        given:
+        writer = new StrictCharacterStreamJsonWriter(stringWriter, StrictCharacterStreamJsonWriterSettings.builder().indent(true).build())
+
+        when:
+        writer.writeStartObject()
+        writer.writeString('a', 'x')
+        writer.writeString('b', 'y')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == format('{%n  "a": "x",%n  "b": "y"%n}')
+    }
+
+    def 'should indent two array elements'() {
+        given:
+        writer = new StrictCharacterStreamJsonWriter(stringWriter, StrictCharacterStreamJsonWriterSettings.builder().indent(true).build())
+
+        when:
+        writer.writeStartObject()
+        writer.writeStartArray('a')
+        writer.writeNull()
+        writer.writeNumber('4')
+        writer.writeEndArray()
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == format('{%n  "a": [%n    null,%n    4%n  ]%n}')
+    }
+
+    def 'should indent two document elements'() {
+        given:
+        writer = new StrictCharacterStreamJsonWriter(stringWriter, StrictCharacterStreamJsonWriterSettings.builder().indent(true).build())
+
+        when:
+        writer.writeStartObject()
+        writer.writeStartArray('a')
+        writer.writeStartObject()
+        writer.writeNull('a')
+        writer.writeEndObject()
+        writer.writeStartObject()
+        writer.writeNull('a')
+        writer.writeEndObject()
+        writer.writeEndArray()
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == format('{%n  "a": [%n    {%n      "a": null%n    },%n    {%n      "a": null%n    }%n  ]%n}')
+    }
+
+    def 'should indent embedded document'() {
+        given:
+        writer = new StrictCharacterStreamJsonWriter(stringWriter, StrictCharacterStreamJsonWriterSettings.builder().indent(true).build())
+
+        when:
+        writer.writeStartObject()
+        writer.writeStartObject('doc')
+        writer.writeNumber('a', '1')
+        writer.writeNumber('b', '2')
+        writer.writeEndObject()
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == format('{%n  "doc": {%n    "a": 1,%n    "b": 2%n  }%n}')
+    }
+
+    def shouldThrowExceptionForBooleanWhenWritingBeforeStartingDocument() {
+        when:
+        writer.writeBoolean('b1', true)
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowExceptionForNameWhenWritingBeforeStartingDocument() {
+        when:
+        writer.writeName('name')
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowExceptionForStringWhenStateIsValue() {
+        given:
+        writer.writeStartObject()
+
+        when:
+        writer.writeString('SomeString')
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowExceptionWhenEndingAnArrayWhenStateIsValue() {
+        given:
+        writer.writeStartObject()
+
+        when:
+        writer.writeEndArray()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowExceptionWhenWritingASecondName() {
+        given:
+        writer.writeStartObject()
+        writer.writeName('f1')
+
+        when:
+        writer.writeName('i2')
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowExceptionWhenEndingADocumentBeforeValueIsWritten() {
+        given:
+        writer.writeStartObject()
+        writer.writeName('f1')
+
+        when:
+        writer.writeEndObject()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenTryingToWriteAValue() {
+        when:
+        writer.writeString('i2')
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingANameInAnArray() {
+        given:
+        writer.writeStartObject()
+        writer.writeStartArray('f2')
+
+        when:
+        writer.writeName('i3')
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenEndingDocumentInTheMiddleOfWritingAnArray() {
+        given:
+        writer.writeStartObject()
+        writer.writeStartArray('f2')
+
+        when:
+        writer.writeEndObject()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenEndingAnArrayInASubDocument() {
+        given:
+        writer.writeStartObject()
+        writer.writeStartArray('f2')
+        writer.writeStartObject()
+
+        when:
+        writer.writeEndArray()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenEndingAnArrayWhenValueIsExpected() {
+        given:
+        writer.writeStartObject()
+        writer.writeName('a')
+
+        when:
+        writer.writeEndArray()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingANameInAnArrayEvenWhenSubDocumentExistsInArray() {
+        given:
+        writer.writeStartObject()
+        writer.writeStartArray('f2')
+        writer.writeStartObject()
+        writer.writeEndObject()
+
+        when:
+        writer.writeName('i3')
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenStartingAnObjectWhenDone() {
+        given:
+        writer.writeStartObject()
+        writer.writeEndObject()
+
+        when:
+        writer.writeStartObject()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenStartingAnObjectWhenNameIsExpected() {
+        given:
+        writer.writeStartObject()
+
+        when:
+        writer.writeStartObject()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenAttemptingToEndAnArrayThatWasNotStarted() {
+        given:
+        writer.writeStartObject()
+        writer.writeStartArray('f2')
+        writer.writeEndArray()
+
+        when:
+        writer.writeEndArray()
+
+        then:
+        thrown(BsonInvalidOperationException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullName() {
+        given:
+        writer.writeStartObject()
+
+        when:
+        writer.writeName(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullValue() {
+        given:
+        writer.writeStartObject()
+        writer.writeName('v')
+
+        when:
+        writer.writeNumber(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeString(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeRaw(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullMemberValue() {
+        given:
+        writer.writeStartObject()
+
+        when:
+        writer.writeNumber('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeString('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeRaw('v', null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def shouldThrowAnExceptionWhenWritingNullMemberName() {
+        given:
+        writer.writeStartObject()
+
+        when:
+        writer.writeNumber(null, '1')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeString(null, 'str')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeRaw(null, 'raw')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeBoolean(null, true)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeNull(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeStartObject(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        writer.writeStartArray(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def shouldStopAtMaxLength() {
+        given:
+        def fullJsonText = '{"n": null}'
+        writer = new StrictCharacterStreamJsonWriter(stringWriter,
+                StrictCharacterStreamJsonWriterSettings.builder().maxLength(maxLength).build())
+
+        when:
+        writer.writeStartObject()
+        writer.writeNull('n')
+        writer.writeEndObject()
+
+        then:
+        stringWriter.toString() == fullJsonText[0..<Math.min(maxLength, fullJsonText.length())]
+        writer.getCurrentLength() == Math.min(maxLength, fullJsonText.length())
+        writer.isTruncated() || fullJsonText.length() <= maxLength
+
+        where:
+        maxLength << (1..20)
+    }
+}
diff --git a/driver/src/test/unit/org/bson/types/BSONBsonTimestampTest.java b/bson/src/test/unit/org/bson/types/BSONBsonTimestampTest.java
similarity index 96%
rename from driver/src/test/unit/org/bson/types/BSONBsonTimestampTest.java
rename to bson/src/test/unit/org/bson/types/BSONBsonTimestampTest.java
index 8d1d93b0ccc..28d864c9465 100644
--- a/driver/src/test/unit/org/bson/types/BSONBsonTimestampTest.java
+++ b/bson/src/test/unit/org/bson/types/BSONBsonTimestampTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/org/bson/types/BasicBSONListSpecification.groovy b/bson/src/test/unit/org/bson/types/BasicBSONListSpecification.groovy
similarity index 90%
rename from driver/src/test/unit/org/bson/types/BasicBSONListSpecification.groovy
rename to bson/src/test/unit/org/bson/types/BasicBSONListSpecification.groovy
index 7d67bf34368..e7dc5cd4e54 100644
--- a/driver/src/test/unit/org/bson/types/BasicBSONListSpecification.groovy
+++ b/bson/src/test/unit/org/bson/types/BasicBSONListSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.bson.types
 
-import com.mongodb.BasicDBList
 import org.bson.BSONObject
 import spock.lang.Specification
 
@@ -30,7 +29,7 @@ class BasicBSONListSpecification extends Specification {
         obj.put(2, 'c')
 
         then:
-        obj == ['a', 'b', 'c'] as BasicDBList
+        obj == ['a', 'b', 'c'] as BasicBSONList
     }
 
     def 'should support keys that are strings which be converted to ints'() {
@@ -41,7 +40,7 @@ class BasicBSONListSpecification extends Specification {
         obj.put('2', 'c')
 
         then:
-        obj == ['a', 'b', 'c'] as BasicDBList
+        obj == ['a', 'b', 'c'] as BasicBSONList
     }
 
     def 'should throw IllegalArgumentException if passed invalid string key'() {
@@ -61,7 +60,7 @@ class BasicBSONListSpecification extends Specification {
         obj.put(5, 'c')
 
         then:
-        obj == ['a', 'b', null, null, null, 'c'] as BasicDBList
+        obj == ['a', 'b', null, null, null, 'c'] as BasicBSONList
     }
 
     def 'should provide an iterable keySet'() {
diff --git a/bson/src/test/unit/org/bson/types/Decimal128Test.java b/bson/src/test/unit/org/bson/types/Decimal128Test.java
new file mode 100644
index 00000000000..f2421e304cf
--- /dev/null
+++ b/bson/src/test/unit/org/bson/types/Decimal128Test.java
@@ -0,0 +1,600 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bson.types;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.bson.types.Decimal128.NEGATIVE_INFINITY;
+import static org.bson.types.Decimal128.NEGATIVE_NaN;
+import static org.bson.types.Decimal128.NEGATIVE_ZERO;
+import static org.bson.types.Decimal128.NaN;
+import static org.bson.types.Decimal128.POSITIVE_INFINITY;
+import static org.bson.types.Decimal128.POSITIVE_ZERO;
+import static org.bson.types.Decimal128.fromIEEE754BIDEncoding;
+import static org.bson.types.Decimal128.parse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class Decimal128Test {
+
+    @Test
+    public void shouldHaveCorrectConstants() {
+        // expect
+        assertEquals(fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000000L), POSITIVE_ZERO);
+        assertEquals(fromIEEE754BIDEncoding(0xb040000000000000L, 0x0000000000000000L), NEGATIVE_ZERO);
+        assertEquals(fromIEEE754BIDEncoding(0x7800000000000000L, 0x0000000000000000L), POSITIVE_INFINITY);
+        assertEquals(fromIEEE754BIDEncoding(0xf800000000000000L, 0x0000000000000000L), NEGATIVE_INFINITY);
+        assertEquals(fromIEEE754BIDEncoding(0x7c00000000000000L, 0x0000000000000000L), NaN);
+    }
+
+    @Test
+    public void shouldConstructFromHighAndLow() {
+        // given
+        Decimal128 val = fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000001L);
+
+        // then
+        assertEquals(0x3040000000000000L, val.getHigh());
+        assertEquals(0x0000000000000001L, val.getLow());
+    }
+
+    @Test
+    public void shouldConstructFromSimpleString() {
+        // expect
+        assertEquals(fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000000L), parse("0"));
+        assertEquals(fromIEEE754BIDEncoding(0xb040000000000000L, 0x0000000000000000L), parse("-0"));
+        assertEquals(fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000001L), parse("1"));
+        assertEquals(fromIEEE754BIDEncoding(0xb040000000000000L, 0x0000000000000001L), parse("-1"));
+        assertEquals(fromIEEE754BIDEncoding(0x3040000000000000L, 0x002bdc545d6b4b87L), parse("12345678901234567"));
+        assertEquals(fromIEEE754BIDEncoding(0x3040000000000000L, 0x000000e67a93c822L), parse("989898983458"));
+        assertEquals(fromIEEE754BIDEncoding(0xb040000000000000L, 0x002bdc545d6b4b87L), parse("-12345678901234567"));
+        assertEquals(fromIEEE754BIDEncoding(0x3036000000000000L, 0x0000000000003039L), parse("0.12345"));
+        assertEquals(fromIEEE754BIDEncoding(0x3032000000000000L, 0x0000000000003039L), parse("0.0012345"));
+        assertEquals(fromIEEE754BIDEncoding(0x3040000000000000L, 0x002bdc545d6b4b87L), parse("00012345678901234567"));
+    }
+
+    @Test
+    public void shouldRoundExactly() {
+        // expect
+        assertEquals(parse("1.234567890123456789012345678901234"), parse("1.234567890123456789012345678901234"));
+        assertEquals(parse("1.234567890123456789012345678901234"), parse("1.2345678901234567890123456789012340"));
+        assertEquals(parse("1.234567890123456789012345678901234"), parse("1.23456789012345678901234567890123400"));
+        assertEquals(parse("1.234567890123456789012345678901234"), parse("1.234567890123456789012345678901234000"));
+    }
+
+    @Test
+    public void shouldClampPositiveExponents() {
+        // expect
+        assertEquals(parse("10E6111"), parse("1E6112"));
+        assertEquals(parse("100E6111"), parse("1E6113"));
+        assertEquals(parse("100000000000000000000000000000000E+6111"), parse("1E6143"));
+        assertEquals(parse("1000000000000000000000000000000000E+6111"), parse("1E6144"));
+        assertEquals(parse("1100000000000000000000000000000000E+6111"), parse("11E6143"));
+        assertEquals(parse("0E6111"), parse("0E8000"));
+        assertEquals(parse("0E6111"), parse("0E2147483647"));
+
+        assertEquals(parse("-10E6111"), parse("-1E6112"));
+        assertEquals(parse("-100E6111"), parse("-1E6113"));
+        assertEquals(parse("-100000000000000000000000000000000E+6111"), parse("-1E6143"));
+        assertEquals(parse("-1000000000000000000000000000000000E+6111"), parse("-1E6144"));
+        assertEquals(parse("-1100000000000000000000000000000000E+6111"), parse("-11E6143"));
+        assertEquals(parse("-0E6111"), parse("-0E8000"));
+        assertEquals(parse("-0E6111"), parse("-0E2147483647"));
+    }
+
+    @Test
+    public void shouldClampNegativeExponents() {
+        // expect
+        assertEquals(parse("0E-6176"), parse("0E-8000"));
+        assertEquals(parse("0E-6176"), parse("0E-2147483647"));
+        assertEquals(parse("1E-6176"), parse("10E-6177"));
+        assertEquals(parse("1E-6176"), parse("100E-6178"));
+        assertEquals(parse("11E-6176"), parse("110E-6177"));
+
+        assertEquals(parse("-0E-6176"), parse("-0E-8000"));
+        assertEquals(parse("-0E-6176"), parse("-0E-2147483647"));
+        assertEquals(parse("-1E-6176"), parse("-10E-6177"));
+        assertEquals(parse("-1E-6176"), parse("-100E-6178"));
+        assertEquals(parse("-11E-6176"), parse("-110E-6177"));
+    }
+
+    @Test
+    public void shouldConstructFromLong() {
+        // expect
+        assertEquals(new Decimal128(new BigDecimal("1")), new Decimal128(1L));
+        assertEquals(new Decimal128(new BigDecimal(Long.MIN_VALUE)), new Decimal128(Long.MIN_VALUE));
+        assertEquals(new Decimal128(new BigDecimal(Long.MAX_VALUE)), new Decimal128(Long.MAX_VALUE));
+    }
+
+    @Test
+    public void shouldConstructFromLargeBigDecimal() {
+        // expect
+        assertEquals(fromIEEE754BIDEncoding(0x304000000000029dL, 0x42da3a76f9e0d979L), parse("12345689012345789012345"));
+        assertEquals(fromIEEE754BIDEncoding(0x30403cde6fff9732L, 0xde825cd07e96aff2L), parse("1234567890123456789012345678901234"));
+        assertEquals(fromIEEE754BIDEncoding(0x5fffed09bead87c0L, 0x378d8e63ffffffffL), parse("9.999999999999999999999999999999999E+6144"));
+        assertEquals(fromIEEE754BIDEncoding(0x0001ed09bead87c0L, 0x378d8e63ffffffffL), parse("9.999999999999999999999999999999999E-6143"));
+        assertEquals(fromIEEE754BIDEncoding(0x3040ffffffffffffL, 0xffffffffffffffffL), parse("5.192296858534827628530496329220095E+33"));
+    }
+
+    @Test
+    public void shouldConvertToSimpleBigDecimal() {
+        // expect
+        assertEquals(new BigDecimal("0"), fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000000L).bigDecimalValue());
+        assertEquals(new BigDecimal("1"), fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000001L).bigDecimalValue());
+        assertEquals(new BigDecimal("-1"), fromIEEE754BIDEncoding(0xb040000000000000L, 0x0000000000000001L).bigDecimalValue());
+        assertEquals(new BigDecimal("12345678901234567"),
+                fromIEEE754BIDEncoding(0x3040000000000000L, 0x002bdc545d6b4b87L).bigDecimalValue());
+        assertEquals(new BigDecimal("989898983458"), fromIEEE754BIDEncoding(0x3040000000000000L, 0x000000e67a93c822L).bigDecimalValue());
+        assertEquals(new BigDecimal("-12345678901234567"),
+                fromIEEE754BIDEncoding(0xb040000000000000L, 0x002bdc545d6b4b87L).bigDecimalValue());
+        assertEquals(new BigDecimal("0.12345"), fromIEEE754BIDEncoding(0x3036000000000000L, 0x0000000000003039L).bigDecimalValue());
+        assertEquals(new BigDecimal("0.0012345"), fromIEEE754BIDEncoding(0x3032000000000000L, 0x0000000000003039L).bigDecimalValue());
+        assertEquals(new BigDecimal("00012345678901234567"),
+                fromIEEE754BIDEncoding(0x3040000000000000L, 0x002bdc545d6b4b87L).bigDecimalValue());
+    }
+
+    @Test
+    public void shouldConvertToLargeBigDecimal() {
+        // expect
+        assertEquals(new BigDecimal("12345689012345789012345"),
+                fromIEEE754BIDEncoding(0x304000000000029dL, 0x42da3a76f9e0d979L).bigDecimalValue());
+
+        assertEquals(new BigDecimal("1234567890123456789012345678901234"), fromIEEE754BIDEncoding(0x30403cde6fff9732L,
+                0xde825cd07e96aff2L).bigDecimalValue());
+
+        assertEquals(new BigDecimal("9.999999999999999999999999999999999E+6144"),
+                fromIEEE754BIDEncoding(0x5fffed09bead87c0L, 0x378d8e63ffffffffL).bigDecimalValue());
+
+        assertEquals(new BigDecimal("9.999999999999999999999999999999999E-6143"),
+                fromIEEE754BIDEncoding(0x0001ed09bead87c0L, 0x378d8e63ffffffffL).bigDecimalValue());
+
+        assertEquals(new BigDecimal("5.192296858534827628530496329220095E+33"),
+                fromIEEE754BIDEncoding(0x3040ffffffffffffL, 0xffffffffffffffffL).bigDecimalValue());
+    }
+
+    @Test
+    public void shouldConvertInvalidRepresentationsOfZeroAsBigDecimalZero() {
+        // expect
+        assertEquals(new BigDecimal("0"), fromIEEE754BIDEncoding(0x6C10000000000000L, 0x0).bigDecimalValue());
+        assertEquals(new BigDecimal("0E+3"), fromIEEE754BIDEncoding(0x6C11FFFFFFFFFFFFL, 0xffffffffffffffffL).bigDecimalValue());
+    }
+
+    @Test
+    public void shouldDetectInfinity() {
+        // expect
+        assertTrue(POSITIVE_INFINITY.isInfinite());
+        assertTrue(NEGATIVE_INFINITY.isInfinite());
+        assertFalse(parse("0").isInfinite());
+        assertFalse(parse("9.999999999999999999999999999999999E+6144").isInfinite());
+        assertFalse(parse("9.999999999999999999999999999999999E-6143").isInfinite());
+        assertFalse(POSITIVE_INFINITY.isFinite());
+        assertFalse(NEGATIVE_INFINITY.isFinite());
+        assertTrue(parse("0").isFinite());
+        assertTrue(parse("9.999999999999999999999999999999999E+6144").isFinite());
+        assertTrue(parse("9.999999999999999999999999999999999E-6143").isFinite());
+    }
+
+    @Test
+    public void shouldDetectNaN() {
+        // expect
+        assertTrue(NaN.isNaN());
+        assertTrue(fromIEEE754BIDEncoding(0x7e00000000000000L, 0).isNaN());    // SNaN
+        assertFalse(POSITIVE_INFINITY.isNaN());
+        assertFalse(NEGATIVE_INFINITY.isNaN());
+        assertFalse(parse("0").isNaN());
+        assertFalse(parse("9.999999999999999999999999999999999E+6144").isNaN());
+        assertFalse(parse("9.999999999999999999999999999999999E-6143").isNaN());
+    }
+
+    @Test
+    public void shouldConvertNaNToString() {
+        // expect
+        assertEquals("NaN", NaN.toString());
+    }
+
+    @Test
+    public void shouldConvertNaNFromString() {
+        // expect
+        assertEquals(NaN, parse("NaN"));
+        assertEquals(NaN, parse("nan"));
+        assertEquals(NaN, parse("nAn"));
+        assertEquals(NEGATIVE_NaN, parse("-NaN"));
+        assertEquals(NEGATIVE_NaN, parse("-nan"));
+        assertEquals(NEGATIVE_NaN, parse("-nAn"));
+    }
+
+    @Test(expected = ArithmeticException.class)
+    public void shouldNotConvertNaNToBigDecimal() {
+        // when
+        NaN.bigDecimalValue();
+    }
+
+    @Test
+    public void shouldConvertInfinityToString() {
+        // expect
+        assertEquals("Infinity", POSITIVE_INFINITY.toString());
+        assertEquals("-Infinity", NEGATIVE_INFINITY.toString());
+    }
+
+    @Test
+    public void shouldConvertInfinityFromString() {
+        // expect
+        assertEquals(POSITIVE_INFINITY, parse("Inf"));
+        assertEquals(POSITIVE_INFINITY, parse("inf"));
+        assertEquals(POSITIVE_INFINITY, parse("inF"));
+        assertEquals(POSITIVE_INFINITY, parse("+Inf"));
+        assertEquals(POSITIVE_INFINITY, parse("+inf"));
+        assertEquals(POSITIVE_INFINITY, parse("+inF"));
+        assertEquals(POSITIVE_INFINITY, parse("Infinity"));
+        assertEquals(POSITIVE_INFINITY, parse("infinity"));
+        assertEquals(POSITIVE_INFINITY, parse("infiniTy"));
+        assertEquals(POSITIVE_INFINITY, parse("+Infinity"));
+        assertEquals(POSITIVE_INFINITY, parse("+infinity"));
+        assertEquals(POSITIVE_INFINITY, parse("+infiniTy"));
+        assertEquals(NEGATIVE_INFINITY, parse("-Inf"));
+        assertEquals(NEGATIVE_INFINITY, parse("-inf"));
+        assertEquals(NEGATIVE_INFINITY, parse("-inF"));
+        assertEquals(NEGATIVE_INFINITY, parse("-Infinity"));
+        assertEquals(NEGATIVE_INFINITY, parse("-infinity"));
+        assertEquals(NEGATIVE_INFINITY, parse("-infiniTy"));
+    }
+
+    @Test
+    public void shouldConvertFiniteToString() {
+        // expect
+        assertEquals("0", parse("0").toString());
+        assertEquals("-0", parse("-0").toString());
+        assertEquals("0E+10", parse("0E10").toString());
+        assertEquals("-0E+10", parse("-0E10").toString());
+        assertEquals("1", parse("1").toString());
+        assertEquals("-1", parse("-1").toString());
+        assertEquals("-1.1", parse("-1.1").toString());
+
+        assertEquals("1.23E-7", parse("123E-9").toString());
+        assertEquals("0.00000123", parse("123E-8").toString());
+        assertEquals("0.0000123", parse("123E-7").toString());
+        assertEquals("0.000123", parse("123E-6").toString());
+        assertEquals("0.00123", parse("123E-5").toString());
+        assertEquals("0.0123", parse("123E-4").toString());
+        assertEquals("0.123", parse("123E-3").toString());
+        assertEquals("1.23", parse("123E-2").toString());
+        assertEquals("12.3", parse("123E-1").toString());
+        assertEquals("123", parse("123E0").toString());
+        assertEquals("1.23E+3", parse("123E1").toString());
+
+        assertEquals("0.0001234", parse("1234E-7").toString());
+        assertEquals("0.001234", parse("1234E-6").toString());
+
+        assertEquals("1E+6", parse("1E6").toString());
+    }
+
+    @Test
+    public void shouldConvertInvalidRepresentationsOfZeroToString() {
+        // expect
+        assertEquals("0", fromIEEE754BIDEncoding(0x6C10000000000000L, 0x0).bigDecimalValue().toString());
+        assertEquals("0E+3", fromIEEE754BIDEncoding(0x6C11FFFFFFFFFFFFL, 0xffffffffffffffffL).toString());
+    }
+
+    @Test
+    public void testEquals() {
+        // given
+        Decimal128 d1 = fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000001L);
+        Decimal128 d2 = fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000001L);
+        Decimal128 d3 = fromIEEE754BIDEncoding(0x3040000000000001L, 0x0000000000000001L);
+        Decimal128 d4 = fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000011L);
+
+        // expect
+        assertTrue(d1.equals(d1));
+        assertTrue(d1.equals(d2));
+        assertFalse(d1.equals(d3));
+        assertFalse(d1.equals(d4));
+        assertFalse(d1.equals(null));
+        assertFalse(d1.equals(0L));
+    }
+
+    @Test
+    public void testHashCode() {
+        // expect
+        assertEquals(809500703, fromIEEE754BIDEncoding(0x3040000000000000L, 0x0000000000000001L).hashCode());
+    }
+
+    @Test(expected = ArithmeticException.class)
+    public void shouldNotConvertPositiveInfinityToBigDecimal() {
+        POSITIVE_INFINITY.bigDecimalValue();
+    }
+
+    @Test(expected = ArithmeticException.class)
+    public void shouldNotConvertNegativeInfinityToBigDecimal() {
+        NEGATIVE_INFINITY.bigDecimalValue();
+    }
+
+    @Test
+    public void shouldNotConvertNegativeZeroToBigDecimal() {
+        try {
+            parse("-0").bigDecimalValue();
+            fail();
+        } catch (ArithmeticException e) {
+            // pass
+        }
+
+        try {
+            parse("-0E+1").bigDecimalValue();
+            fail();
+        } catch (ArithmeticException e) {
+            // pass
+        }
+
+        try {
+            parse("-0E-1").bigDecimalValue();
+            fail();
+        } catch (ArithmeticException e) {
+            // pass
+        }
+    }
+
+    @Test
+    public void shouldNotRoundInexactly() {
+        try {
+            parse("12345678901234567890123456789012345E+6111");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("123456789012345678901234567890123456E+6111");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("1234567890123456789012345678901234567E+6111");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("12345678901234567890123456789012345E-6176");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("123456789012345678901234567890123456E-6176");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("1234567890123456789012345678901234567E-6176");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-12345678901234567890123456789012345E+6111");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-123456789012345678901234567890123456E+6111");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234567E+6111");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-12345678901234567890123456789012345E-6176");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-123456789012345678901234567890123456E-6176");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234567E-6176");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+    }
+
+    @Test
+    public void shouldNotClampLargeExponentsIfNoExtraPrecisionIsAvailable() {
+        try {
+            parse("1234567890123456789012345678901234E+6112");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("1234567890123456789012345678901234E+6113");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("1234567890123456789012345678901234E+6114");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234E+6112");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234E+6113");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234E+6114");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+    }
+
+    @Test
+    public void shouldNotClampSmallExponentsIfNoExtraPrecisionCanBeDiscarded() {
+        try {
+            parse("1234567890123456789012345678901234E-6177");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("1234567890123456789012345678901234E-6178");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("1234567890123456789012345678901234E-6179");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234E-6177");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234E-6178");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+        try {
+            parse("-1234567890123456789012345678901234E-6179");
+            fail();
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowIllegalArgumentExceptionIfBigDecimalIsTooLarge() {
+        new Decimal128(new BigDecimal("12345678901234567890123456789012345"));
+    }
+
+    @Test
+    public void shouldExtendNumber() {
+        // expect
+        assertEquals(Double.POSITIVE_INFINITY, POSITIVE_INFINITY.doubleValue(), 0);
+        assertEquals(Float.POSITIVE_INFINITY, POSITIVE_INFINITY.floatValue(), 0);
+        assertEquals(Long.MAX_VALUE, POSITIVE_INFINITY.longValue());
+        assertEquals(Integer.MAX_VALUE, POSITIVE_INFINITY.intValue());
+
+        assertEquals(Double.NEGATIVE_INFINITY, NEGATIVE_INFINITY.doubleValue(), 0);
+        assertEquals(Float.NEGATIVE_INFINITY, NEGATIVE_INFINITY.floatValue(), 0);
+        assertEquals(Long.MIN_VALUE, NEGATIVE_INFINITY.longValue());
+        assertEquals(Integer.MIN_VALUE, NEGATIVE_INFINITY.intValue());
+
+        assertEquals(Double.NaN, NaN.doubleValue(), 0);
+        assertEquals(Double.NaN, NaN.floatValue(), 0);
+        assertEquals(0, NaN.longValue());
+        assertEquals(0, NaN.intValue());
+
+        assertEquals(Double.NaN, NEGATIVE_NaN.doubleValue(), 0);
+        assertEquals(Float.NaN, NEGATIVE_NaN.floatValue(), 0);
+        assertEquals(0, NEGATIVE_NaN.longValue());
+        assertEquals(0, NEGATIVE_NaN.intValue());
+
+        assertEquals(0.0d, POSITIVE_ZERO.doubleValue(), 0);
+        assertEquals(0.0f, POSITIVE_ZERO.floatValue(), 0);
+        assertEquals(0L, POSITIVE_ZERO.longValue());
+        assertEquals(0, POSITIVE_ZERO.intValue());
+
+        assertEquals(NEGATIVE_ZERO.doubleValue(), -0d, 0);
+        assertEquals(NEGATIVE_ZERO.floatValue(), -0f, 0);
+        assertEquals(0L, NEGATIVE_ZERO.longValue());
+        assertEquals(0, NEGATIVE_ZERO.intValue());
+
+        assertEquals(parse("-0.0").doubleValue(), -0d, 0);
+        assertEquals(parse("-0.0").floatValue(), -0f, 0);
+        assertEquals(0L, parse("-0.0").longValue());
+        assertEquals(0, parse("-0.0").intValue());
+
+        assertEquals(5.4d, parse("5.4").doubleValue(), 0);
+        assertEquals(5.4f, parse("5.4").floatValue(), 0);
+        assertEquals(5L, parse("5.4").longValue());
+        assertEquals(5, parse("5.4").intValue());
+
+        assertEquals(1.2345678901234568E33d, parse("1234567890123456789012345678901234").doubleValue(), 0);
+        assertEquals(1.2345679E33f, parse("1234567890123456789012345678901234").floatValue(), 0);
+        assertEquals(Long.MAX_VALUE, parse("1234567890123456789012345678901234").longValue());
+        assertEquals(Integer.MAX_VALUE, parse("1234567890123456789012345678901234").intValue());
+
+        assertEquals(-1.2345678901234568E33d, parse("-1234567890123456789012345678901234").doubleValue(), 0);
+        assertEquals(-1.2345679E33f, parse("-1234567890123456789012345678901234").floatValue(), 0);
+        assertEquals(Long.MIN_VALUE, parse("-1234567890123456789012345678901234").longValue());
+        assertEquals(Integer.MIN_VALUE, parse("-1234567890123456789012345678901234").intValue());
+    }
+
+    @Test
+    public void shouldImplementComparable() {
+        assertEquals(1, NaN.compareTo(NEGATIVE_ZERO));
+        assertEquals(0, NaN.compareTo(NaN));
+        assertEquals(1, NaN.compareTo(POSITIVE_INFINITY));
+        assertEquals(1, NaN.compareTo(NEGATIVE_INFINITY));
+        assertEquals(1, NaN.compareTo(parse("1")));
+        assertEquals(1, POSITIVE_INFINITY.compareTo(NEGATIVE_INFINITY));
+        assertEquals(0, POSITIVE_INFINITY.compareTo(POSITIVE_INFINITY));
+        assertEquals(-1, POSITIVE_INFINITY.compareTo(NaN));
+        assertEquals(1, POSITIVE_INFINITY.compareTo(NEGATIVE_ZERO));
+        assertEquals(1, POSITIVE_INFINITY.compareTo(parse("1")));
+        assertEquals(-1, NEGATIVE_INFINITY.compareTo(POSITIVE_INFINITY));
+        assertEquals(0, NEGATIVE_INFINITY.compareTo(NEGATIVE_INFINITY));
+        assertEquals(-1, NEGATIVE_INFINITY.compareTo(NaN));
+        assertEquals(-1, NEGATIVE_INFINITY.compareTo(NEGATIVE_ZERO));
+        assertEquals(-1, NEGATIVE_INFINITY.compareTo(parse("1")));
+        assertEquals(-1, parse("1").compareTo(NaN));
+        assertEquals(-1, parse("1").compareTo(POSITIVE_INFINITY));
+        assertEquals(1, parse("1").compareTo(NEGATIVE_INFINITY));
+        assertEquals(1, parse("1").compareTo(NEGATIVE_ZERO));
+        assertEquals(-1, parse("-0").compareTo(parse("0")));
+        assertEquals(0, parse("-0").compareTo(parse("-0")));
+        assertEquals(-1, parse("-0").compareTo(NaN));
+        assertEquals(-1, parse("-0").compareTo(POSITIVE_INFINITY));
+        assertEquals(1, parse("-0").compareTo(NEGATIVE_INFINITY));
+        assertEquals(1, parse("0").compareTo(parse("-0")));
+        assertEquals(0, parse("0").compareTo(parse("0")));
+        assertEquals(0, parse("5.4").compareTo(parse("5.4")));
+        assertEquals(1, parse("5.4").compareTo(parse("5.3")));
+        assertEquals(-1, parse("5.3").compareTo(parse("5.4")));
+        assertEquals(0, parse("5.4").compareTo(parse("5.40")));
+    }
+}
diff --git a/bson/src/test/unit/org/bson/types/DocumentSpecification.groovy b/bson/src/test/unit/org/bson/types/DocumentSpecification.groovy
index 84bf8b49b49..fa676bac5ee 100644
--- a/bson/src/test/unit/org/bson/types/DocumentSpecification.groovy
+++ b/bson/src/test/unit/org/bson/types/DocumentSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,14 +37,189 @@ class DocumentSpecification extends Specification {
                 .append('objectId', objectId).append('date', date);
 
         then:
-        doc.getInteger('int') == 1;
-        doc.getLong('long') == 2L;
-        doc.getDouble('double') == 3.0d;
-        doc.getString('string') == 'hi';
-        doc.getBoolean('boolean');
-        doc.getObjectId('objectId') == objectId;
-        doc.getDate('date') == date;
-        doc.get('objectId', ObjectId) == objectId;
+        doc.getInteger('int') == 1
+        doc.getInteger('intNoVal', 42) == 42
+        doc.getLong('long') == 2L
+        doc.getDouble('double') == 3.0d
+        doc.getString('string') == 'hi'
+        doc.getBoolean('boolean')
+        doc.getBoolean('booleanNoVal', true)
+        doc.getObjectId('objectId') == objectId
+        doc.getDate('date') == date
+
+
+        doc.get('objectId', ObjectId) == objectId
+        doc.get('int', Integer) == 1
+        doc.get('long', Long) == 2L
+        doc.get('double', Double) == 3.0d
+        doc.get('string', String) == 'hi'
+        doc.get('boolean', Boolean)
+        doc.get('date', Date) == date
+
+        doc.get('noVal', 42L) == 42L
+        doc.get('noVal', 3.1d) == 3.1d
+        doc.get('noVal', 'defVal') == 'defVal'
+        doc.get('noVal', true)
+        doc.get('noVal', objectId) == objectId
+        doc.get('noVal', date) == date
+        doc.get('noVal', objectId) == objectId
+    }
+
+    def 'should return a list with elements of the specified class'() {
+        when:
+        Document doc = Document.parse("{x: 1, y: ['two', 'three'], z: [{a: 'one'}, {b:2}], w: {a: ['One', 'Two']}}")
+                .append('numberList', [10, 20.5d, 30L])
+        List<String> defaultList = ['a', 'b', 'c']
+
+        then:
+        doc.getList('y', String).get(0) == 'two'
+        doc.getList('y', String).get(1) == 'three'
+        doc.getList('z', Document).get(0).getString('a') == 'one'
+        doc.getList('z', Document).get(1).getInteger('b') == 2
+        doc.get('w', Document).getList('a', String).get(0) == 'One'
+        doc.get('w', Document).getList('a', String).get(1) == 'Two'
+        doc.getList('invalidKey', Document, defaultList).get(0) == 'a'
+        doc.getList('invalidKey', Document, defaultList).get(1) == 'b'
+        doc.getList('invalidKey', Document, defaultList).get(2) == 'c'
+        doc.getList('numberList', Number).get(0) == 10
+        doc.getList('numberList', Number).get(1) == 20.5d
+        doc.getList('numberList', Number).get(2) == 30L
+    }
+
+    def 'should return null list when key is not found'() {
+        when:
+        Document doc = Document.parse('{x: 1}')
+
+        then:
+        doc.getList('a', String) == null
+    }
+
+    def 'should return specified default value when key is not found'() {
+        when:
+        Document doc = Document.parse('{x: 1}')
+        List<String> defaultList = ['a', 'b', 'c']
+
+        then:
+        doc.getList('a', String, defaultList) == defaultList
+    }
+
+    def 'should throw an exception when the list elements are not objects of the specified class'() {
+        given:
+        Document doc = Document.parse('{x: 1, y: [{a: 1}, {b: 2}], z: [1, 2]}')
+
+        when:
+        doc.getList('x', String)
+
+        then:
+        thrown(ClassCastException)
+
+        when:
+        doc.getList('y', String)
+
+        then:
+        thrown(ClassCastException)
+
+        when:
+        doc.getList('z', String)
+
+        then:
+        thrown(ClassCastException)
+    }
+
+    def 'should return null when getting embedded value'() {
+        when:
+        Document document = Document.parse("{a: 1, b: {x: [2, 3, 4], y: {m: 'one', len: 3}}, 'a.b': 'two'}")
+
+        then:
+        document.getEmbedded(['notAKey'], String) == null
+        document.getEmbedded(['b', 'y', 'notAKey'], String) == null
+        document.getEmbedded(['b', 'b', 'm'], String) == null
+        Document.parse('{}').getEmbedded(['a', 'b'], Integer) == null
+        Document.parse('{b: 1}').getEmbedded(['a'], Integer) == null
+        Document.parse('{b: 1}').getEmbedded(['a', 'b'], Integer) == null
+        Document.parse('{a: {c: 1}}').getEmbedded(['a', 'b'], Integer) == null
+        Document.parse('{a: {c: 1}}').getEmbedded(['a', 'b', 'c'], Integer) == null
+    }
+
+    def 'should return embedded value'() {
+        given:
+        Date date = new Date();
+        ObjectId objectId = new ObjectId();
+
+        when:
+        Document document = Document.parse("{a: 1, b: {x: [2, 3, 4], y: {m: 'one', len: 3}}, 'a.b': 'two'}")
+                .append('l', new Document('long', 2L))
+                .append('d', new Document('double', 3.0 as double))
+                .append('t', new Document('boolean', true))
+                .append('o', new Document('objectId', objectId))
+                .append('n', new Document('date', date))
+
+        then:
+        document.getEmbedded(['a'], Integer) == 1
+        document.getEmbedded(['b', 'x'], List).get(0) == 2
+        document.getEmbedded(['b', 'x'], List).get(1) == 3
+        document.getEmbedded(['b', 'x'], List).get(2) == 4
+        document.getEmbedded(['b', 'y', 'm'], String) == 'one'
+        document.getEmbedded(['b', 'y', 'len'], Integer) == 3
+        document.getEmbedded(['a.b'], String) == 'two'
+        document.getEmbedded(['b', 'y'], Document).getString('m') == 'one'
+        document.getEmbedded(['b', 'y'], Document).getInteger('len') == 3
+
+        document.getEmbedded(['l', 'long'], Long) == 2L
+        document.getEmbedded(['d', 'double'], Double) == 3.0d
+        document.getEmbedded(['l', 'long'], Number) == 2L
+        document.getEmbedded(['d', 'double'], Number) == 3.0d
+        document.getEmbedded(['t', 'boolean'], Boolean) == true
+        document.getEmbedded(['t', 'x'], false) == false
+        document.getEmbedded(['o', 'objectId'], ObjectId) == objectId
+        document.getEmbedded(['n', 'date'], Date) == date
+    }
+
+    def 'should throw an exception getting an embedded value'() {
+        given:
+        Document document = Document.parse("{a: 1, b: {x: [2, 3, 4], y: {m: 'one', len: 3}}, 'a.b': 'two'}")
+
+        when:
+        document.getEmbedded(null, String) == null
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        document.getEmbedded([], String) == null
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        document.getEmbedded(['a', 'b'], Integer)
+
+        then:
+        thrown(ClassCastException)
+
+        when:
+        document.getEmbedded(['b', 'y', 'm'], Integer)
+
+        then:
+        thrown(ClassCastException)
+
+        when:
+        document.getEmbedded(['b', 'x'], Document)
+
+        then:
+        thrown(ClassCastException)
+
+        when:
+        document.getEmbedded(['b', 'x', 'm'], String)
+
+        then:
+        thrown(ClassCastException)
+
+        when:
+        document.getEmbedded(['b', 'x', 'm'], 'invalid')
+
+        then:
+        thrown(ClassCastException)
     }
 
     def 'should parse a valid JSON string to a Document'() {
diff --git a/bson/src/test/unit/org/bson/types/ObjectIdTest.java b/bson/src/test/unit/org/bson/types/ObjectIdTest.java
index 2aeb39ad342..bc95e8acd59 100644
--- a/bson/src/test/unit/org/bson/types/ObjectIdTest.java
+++ b/bson/src/test/unit/org/bson/types/ObjectIdTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,31 +18,72 @@
 
 import org.junit.Test;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Random;
+import java.nio.ByteBuffer;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+@SuppressWarnings("deprecation")
 public class ObjectIdTest {
     @Test
-    public void testToByteArray() {
+    public void testToBytes() {
         ObjectId objectId = new ObjectId(0x5106FC9A, 0x00BC8237, (short) 0x5581, 0x0036D289);
-        assertArrayEquals(new byte[]{81, 6, -4, -102, -68, -126, 55, 85, -127, 54, -46, -119}, objectId.toByteArray());
+        byte[] expectedBytes = new byte[]{81, 6, -4, -102, -68, -126, 55, 85, -127, 54, -46, -119};
+
+        assertArrayEquals(expectedBytes, objectId.toByteArray());
+
+        ByteBuffer buffer = ByteBuffer.allocate(12);
+        objectId.putToByteBuffer(buffer);
+        assertArrayEquals(expectedBytes, buffer.array());
     }
 
     @Test
-    public void testFromByteArray() {
-        ObjectId objectId = new ObjectId(new byte[]{81, 6, -4, -102, -68, -126, 55, 85, -127, 54, -46, -119});
-        assertEquals(0x5106FC9A, objectId.getTimestamp());
-        assertEquals(0x00BC8237, objectId.getMachineIdentifier());
-        assertEquals((short) 0x5581, objectId.getProcessIdentifier());
-        assertEquals(0x0036D289, objectId.getCounter());
+    public void testFromBytes() {
+
+        try {
+            new ObjectId((byte[]) null);
+            fail("Expected IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertEquals("bytes can not be null", e.getMessage());
+        }
+
+        try {
+            new ObjectId(new byte[11]);
+            fail("Expected IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertEquals("state should be: bytes has length of 12", e.getMessage());
+        }
+
+        try {
+            new ObjectId(new byte[13]);
+            fail("Expected IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertEquals("state should be: bytes has length of 12", e.getMessage());
+        }
+
+        byte[] bytes = new byte[]{81, 6, -4, -102, -68, -126, 55, 85, -127, 54, -46, -119};
+
+        ObjectId objectId1 = new ObjectId(bytes);
+        assertEquals(0x5106FC9A, objectId1.getTimestamp());
+        assertEquals(0x00BC8237, objectId1.getMachineIdentifier());
+        assertEquals((short) 0x5581, objectId1.getProcessIdentifier());
+        assertEquals(0x0036D289, objectId1.getCounter());
+
+        ObjectId objectId2 = new ObjectId(ByteBuffer.wrap(bytes));
+        assertEquals(0x5106FC9A, objectId2.getTimestamp());
+        assertEquals(0x00BC8237, objectId2.getMachineIdentifier());
+        assertEquals((short) 0x5581, objectId2.getProcessIdentifier());
+        assertEquals(0x0036D289, objectId2.getCounter());
     }
 
     @Test
-    public void testBytes() {
+    public void testBytesRoundtrip() {
         ObjectId expected = new ObjectId();
         ObjectId actual = new ObjectId(expected.toByteArray());
         assertEquals(expected, actual);
@@ -57,6 +98,26 @@ public void testBytes() {
         assertEquals("41d91c58988b09375cc1fe9f", expected.toString());
     }
 
+    @Test
+    public void testGetTimeZero() {
+        assertEquals(0L, new ObjectId(0, 0).getTime());
+    }
+
+    @Test
+    public void testGetTimeMaxSignedInt() {
+        assertEquals(0x7FFFFFFFL * 1000, new ObjectId(0x7FFFFFFF, 0).getTime());
+    }
+
+    @Test
+    public void testGetTimeMaxSignedIntPlusOne() {
+        assertEquals(0x80000000L * 1000, new ObjectId(0x80000000, 0).getTime());
+    }
+
+    @Test
+    public void testGetTimeMaxInt() {
+        assertEquals(0xFFFFFFFFL * 1000, new ObjectId(0xFFFFFFFF, 0).getTime());
+    }
+
     @Test
     public void testTime() {
         long a = System.currentTimeMillis();
@@ -66,9 +127,7 @@ public void testTime() {
 
     @Test
     public void testDateCons() {
-        Date d = new Date();
-        ObjectId a = new ObjectId(d);
-        assertEquals(d.getTime() / 1000, a.getDate().getTime() / 1000);
+        assertEquals(new Date().getTime() / 1000, new ObjectId(new Date()).getDate().getTime() / 1000);
     }
 
     @Test
@@ -127,7 +186,31 @@ public void testCompareTo() {
     public void testToHexString() {
         assertEquals("000000000000000000000000", new ObjectId(0, 0, (short) 0, 0).toHexString());
         assertEquals("7fffffff007fff7fff007fff",
-                     new ObjectId(Integer.MAX_VALUE, Short.MAX_VALUE, Short.MAX_VALUE, Short.MAX_VALUE).toHexString());
+                new ObjectId(Integer.MAX_VALUE, Short.MAX_VALUE, Short.MAX_VALUE, Short.MAX_VALUE).toHexString());
+    }
+
+    private Date getDate(final String s) throws ParseException {
+        return new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss Z").parse(s);
+    }
+
+    @Test
+    public void testTimeZero() throws ParseException {
+        assertEquals(getDate("01-Jan-1970 00:00:00 -0000"), new ObjectId(0, 0).getDate());
+    }
+
+    @Test
+    public void testTimeMaxSignedInt() throws ParseException {
+        assertEquals(getDate("19-Jan-2038 03:14:07 -0000"), new ObjectId(0x7FFFFFFF, 0).getDate());
+    }
+
+    @Test
+    public void testTimeMaxSignedIntPlusOne() throws ParseException {
+        assertEquals(getDate("19-Jan-2038 03:14:08 -0000"), new ObjectId(0x80000000, 0).getDate());
+    }
+
+    @Test
+    public void testTimeMaxInt() throws ParseException {
+        assertEquals(getDate("07-Feb-2106 06:28:15 -0000"), new ObjectId(0xFFFFFFFF, 0).getDate());
     }
 
     @SuppressWarnings("deprecation")
@@ -139,14 +222,13 @@ public void testDeprecatedMethods() {
         assertEquals(id.getDate().getTime(), id.getTime());
         assertEquals(id.toHexString(), id.toStringMongod());
         assertArrayEquals(new byte[]{0x12, 0x34, 0x56, 0x78, 0x43, 0x21, 0xffffff87, 0x65, 0x74, 0xffffff92, 0xffffff87, 0x56},
-                          new ObjectId(0x12345678, 0x43218765, 0x74928756).toByteArray());
+                new ObjectId(0x12345678, 0x43218765, 0x74928756).toByteArray());
     }
 
     // Got these values from 2.12.0 driver.  This test is ensuring that we properly round-trip old and new format ObjectIds.
     @Test
     public void testCreateFromLegacy() {
         assertArrayEquals(new byte[]{82, 23, -82, -78, -80, -58, -95, -92, -75, -38, 118, -16},
-                          ObjectId.createFromLegacyFormat(1377283762, -1329159772, -1243973904).toByteArray());
+                ObjectId.createFromLegacyFormat(1377283762, -1329159772, -1243973904).toByteArray());
     }
 }
-
diff --git a/driver/src/test/unit/org/bson/types/StringRangeSetSpecification.groovy b/bson/src/test/unit/org/bson/types/StringRangeSetSpecification.groovy
similarity index 93%
rename from driver/src/test/unit/org/bson/types/StringRangeSetSpecification.groovy
rename to bson/src/test/unit/org/bson/types/StringRangeSetSpecification.groovy
index e6cc8a88267..191057b4cb4 100644
--- a/driver/src/test/unit/org/bson/types/StringRangeSetSpecification.groovy
+++ b/bson/src/test/unit/org/bson/types/StringRangeSetSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,15 @@ class StringRangeSetSpecification extends Specification {
         !stringSet.containsAll([0, 1, 2])
     }
 
+    def 'should not contain strings that do not parse as integers'() {
+        when:
+        def stringSet = new StringRangeSet(5)
+
+        then:
+        !stringSet.contains('foo')
+        !stringSet.containsAll(['foo', 'bar', 'baz'])
+    }
+
     def 'set should be ordered string representations of the range'() {
         given:
         def size = 2000;
diff --git a/driver/src/test/unit/org/bson/util/ClassMapSpecification.groovy b/bson/src/test/unit/org/bson/util/ClassMapSpecification.groovy
similarity index 98%
rename from driver/src/test/unit/org/bson/util/ClassMapSpecification.groovy
rename to bson/src/test/unit/org/bson/util/ClassMapSpecification.groovy
index b9edb6576e3..a87f96b237e 100644
--- a/driver/src/test/unit/org/bson/util/ClassMapSpecification.groovy
+++ b/bson/src/test/unit/org/bson/util/ClassMapSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/util/GroovyHelpers.java b/bson/src/test/unit/util/GroovyHelpers.java
index 0fb52cc557b..8319f7f9e16 100644
--- a/bson/src/test/unit/util/GroovyHelpers.java
+++ b/bson/src/test/unit/util/GroovyHelpers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bson/src/test/unit/util/Hex.java b/bson/src/test/unit/util/Hex.java
new file mode 100644
index 00000000000..3ea40ab39db
--- /dev/null
+++ b/bson/src/test/unit/util/Hex.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package util;
+
+public final class Hex {
+    public static byte[] decode(final String hex) {
+        if (hex.length() % 2 != 0) {
+            throw new IllegalArgumentException("A hex string must contain an even number of characters: " + hex);
+        }
+
+        byte[] out = new byte[hex.length() / 2];
+
+        for (int i = 0; i < hex.length(); i += 2) {
+            int high = Character.digit(hex.charAt(i), 16);
+            int low = Character.digit(hex.charAt(i + 1), 16);
+            if (high == -1 || low == -1) {
+                throw new IllegalArgumentException("A hex string can only contain the characters 0-9, A-F, a-f: " + hex);
+            }
+
+            out[i / 2] = (byte) (high * 16 + low);
+        }
+
+        return out;
+    }
+
+    private static final char[] UPPER_HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', };
+
+    public static String encode(final byte[] bytes) {
+        StringBuilder stringBuilder = new StringBuilder(bytes.length * 2);
+        for (byte cur : bytes) {
+            stringBuilder.append(UPPER_HEX_DIGITS[(cur >> 4) & 0xF]);
+            stringBuilder.append(UPPER_HEX_DIGITS[(cur & 0xF)]);
+        }
+        return stringBuilder.toString();
+    }
+
+    private Hex() {
+    }
+}
diff --git a/bson/src/test/unit/util/JsonPoweredTestHelper.java b/bson/src/test/unit/util/JsonPoweredTestHelper.java
index a375c3a63dc..09a547dbfbe 100644
--- a/bson/src/test/unit/util/JsonPoweredTestHelper.java
+++ b/bson/src/test/unit/util/JsonPoweredTestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- *
  */
 
 package util;
@@ -39,6 +37,10 @@ public static BsonDocument getTestDocument(final File file) throws IOException {
         return new BsonDocumentCodec().decode(new JsonReader(getFileAsString(file)), DecoderContext.builder().build());
     }
 
+    public static BsonDocument getTestDocument(final String resourcePath) throws IOException, URISyntaxException {
+        return getTestDocument(new File(JsonPoweredTestHelper.class.getResource(resourcePath).toURI()));
+    }
+
     public static List<File> getTestFiles(final String resourcePath) throws URISyntaxException {
         List<File> files = new ArrayList<File>();
         addFilesFromDirectory(new File(JsonPoweredTestHelper.class.getResource(resourcePath).toURI()), files);
diff --git a/build.gradle b/build.gradle
index 487327e882c..176b4422ea4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,17 @@
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-def configDir = new File(rootDir, 'config')
-ext.nettyVersion = '4.0.26.Final'
-
 buildscript {
     repositories {
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-        jcenter()
-        mavenCentral()
         mavenLocal()
+        mavenCentral()
+        jcenter()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.2'
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
-        classpath 'com.bmuschko:gradle-nexus-plugin:2.2'
+        classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.5'
+        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
+        classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.4'
     }
 }
 
@@ -38,25 +35,57 @@ buildscript {
 // Common behavior                      //
 //////////////////////////////////////////
 
-configure(subprojects.findAll { it.name != 'util' }) {
-    apply plugin: 'java'
-    apply plugin: 'optional-base'
+ext {
+    configDir = new File(rootDir, 'config')
+    jnrUnixsocketVersion = '0.18'
+    nettyVersion = '4.1.17.Final'
+    snappyVersion = '1.1.4'
+    zstdVersion = '1.3.8-3'
+    mongoCryptVersion = '1.0.0'
+    gitVersion = getGitVersion()
+}
 
-    evaluationDependsOn(':util')
+def configDir = ext.configDir
+def coreProjects = subprojects.findAll { !['util'].contains(it.name) }
+def javaProjects = subprojects
+def javaMainProjects = subprojects.findAll { !['util'].contains(it.name) }
+def javaCodeCheckedProjects = subprojects.findAll { !['util', 'mongo-java-driver', 'driver-benchmarks'].contains(it.name) }
 
+configure(coreProjects) {
+    evaluationDependsOn(':util')
     group = 'org.mongodb'
-    version = '3.3.0'
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
+    version = '3.12.0'
 
     repositories {
-        mavenCentral()
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
         mavenLocal()
+        google()
+        mavenCentral()
+        jcenter()
     }
+}
+
+configure(javaProjects) {
+    apply plugin: 'java-library'
+
+    sourceCompatibility = JavaVersion.VERSION_1_6
+    targetCompatibility = JavaVersion.VERSION_1_6
+
+    sourceSets {
+        main {
+            java.srcDirs = ['src/main']
+        }
+    }
+}
+
+configure(javaMainProjects) {
+    apply plugin: 'idea'
+    apply plugin: 'osgi'
+    apply plugin: 'nebula.optional-base'
 
     dependencies {
+        compileOnly 'com.google.code.findbugs:jsr305:1.3.9'
         compile 'org.slf4j:slf4j-api:1.7.6', optional
+        testCompile 'com.google.code.findbugs:jsr305:1.3.9'
     }
 
     /* Compiling */
@@ -64,63 +93,21 @@ configure(subprojects.findAll { it.name != 'util' }) {
         options.encoding = 'ISO-8859-1'
         options.fork = true
         options.debug = true
-        options.compilerArgs = ['-Xlint:all', '-Xlint:-options']
-
-        onlyIf { JavaVersion.current().isJava7Compatible() }
-    }
-
-    project.ext.buildingWith = { propertyName ->
-        project.hasProperty(propertyName) && project.property(propertyName).toBoolean()
-    }
-
-    javadoc {
-        exclude "**/com/mongodb/**/internal/**"
-
-        dependsOn project(':util').compileJava //We need taglets to be compiled
-        options.author = true
-        options.version = true
-        options.links 'http://docs.oracle.com/javase/7/docs/api/'
-        options.tagletPath project(':util').sourceSets.main.output.classesDir
-        options.taglets 'ManualTaglet'
-        options.taglets 'ServerReleaseTaglet'
-        options.encoding = 'UTF-8'
-        options.charSet 'UTF-8'
-        options.docEncoding 'UTF-8'
-        options.header = '''
-            <script type="text/javascript">
-            <!-- Set the location hash in the classFrame -->
-            try {
-              locationHash = top.location.hash;
-              if (window.name == "classFrame" && locationHash != "") {
-                window.location.hash = locationHash;
-              }
-            } catch (error) {}
-            <!-- GA Tracking code -->
-            if (window.name == "" || window.name == "classFrame") {
-                var _elqQ = _elqQ || [];
-                _elqQ.push(["elqSetSiteId", "413370795"]);
-                _elqQ.push(["elqTrackPageView"]);
-                (function () {
-                function async_load() { var s = document.createElement("script"); s.type = "text/javascript"; s.async = true; s.src = "//img03.en25.com/i/elqCfg.min.js"; var x = document.getElementsByTagName("script")[0]; x.parentNode.insertBefore(s, x); }
-                if (window.addEventListener) window.addEventListener("DOMContentLoaded", async_load, false);
-                else if (window.attachEvent) window.attachEvent("onload", async_load);
-                })();
-            }
-            </script>
-        '''
+        options.compilerArgs = ['-Xlint:all', '-Xlint:-options', '-Xlint:-deprecation']
     }
 }
 
-configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driver' }) {
+configure(javaCodeCheckedProjects) {
     apply plugin: 'checkstyle'
-    apply plugin: 'findbugs'
+    apply plugin: "com.github.spotbugs"
+    apply plugin: 'org.kordamp.gradle.clirr'
     apply plugin: 'jacoco'
     apply plugin: 'groovy'
     apply plugin: 'codenarc'
 
     dependencies {
-        testCompile 'org.codehaus.groovy:groovy-all:2.3.9'
-        testCompile 'org.spockframework:spock-core:1.1-groovy-2.3-SNAPSHOT'
+        testCompile 'org.codehaus.groovy:groovy-all:2.4.15'
+        testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
         testCompile 'cglib:cglib-nodep:2.2.2'
         testCompile 'org.objenesis:objenesis:1.3'
         testCompile 'org.hamcrest:hamcrest-all:1.3'
@@ -129,12 +116,8 @@ configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driv
     }
 
     sourceSets {
-        main {
-            java.srcDirs = ['src/main']
-        }
         test {
             groovy.srcDirs = ['src/test/functional', 'src/test/unit']
-            java.srcDirs = ['src/test/functional', 'src/test/unit']
         }
     }
 
@@ -144,26 +127,36 @@ configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driv
         maxParallelForks = 1
 
         systemProperties(
-                'org.mongodb.test.uri': System.getProperty('org.mongodb.test.uri', null),
+                'org.mongodb.test.uri': System.getProperty('org.mongodb.test.uri'),
+                'org.mongodb.test.transaction.uri': System.getProperty('org.mongodb.test.transaction.uri'),
+                'org.mongodb.test.embedded.path': System.getProperty('org.mongodb.test.embedded.path'),
                 'org.mongodb.useSocket': System.getProperty('org.mongodb.useSocket', 'false'),
                 'org.mongodb.disableAsync': System.getProperty('org.mongodb.disableAsync', 'false'),
                 'org.mongodb.async.type': System.getProperty('org.mongodb.async.type', 'nio2'),
-
-                'javax.net.ssl.trustStore': System.getProperty('javax.net.ssl.trustStore', "${System.getProperty('user.home')}/.keystore"),
-                'javax.net.ssl.keyStore': System.getProperty('javax.net.ssl.keyStore', "${System.getProperty('user.home')}/.keystore"),
-                'javax.net.ssl.keyStorePassword': System.getProperty('javax.net.ssl.keyStorePassword', 'changeit'),
-                'javax.net.ssl.trustStorePassword': System.getProperty('javax.net.ssl.trustStorePassword', 'changeit')
+                'org.mongodb.test.awsAccessKeyId': System.getProperty('org.mongodb.test.awsAccessKeyId'),
+                'org.mongodb.test.awsSecretAccessKey': System.getProperty('org.mongodb.test.awsSecretAccessKey'),
+                'jna.library.path': System.getProperty('jna.library.path')
         )
 
+        project.ext.buildingWith = { propertyName ->
+            project.hasProperty(propertyName) && project.property(propertyName).toBoolean()
+        }
+
         if (project.buildingWith('ssl.enabled')) {
-            systemProperties(
-                    'javax.net.ssl.keyStoreType': project.property('ssl.keyStoreType'),
-                    'javax.net.ssl.keyStore': project.property('ssl.keyStore'),
-                    'javax.net.ssl.keyStorePassword': project.property('ssl.keyStorePassword'),
-                    'javax.net.ssl.trustStoreType': project.property('ssl.trustStoreType'),
-                    'javax.net.ssl.trustStore': project.property('ssl.trustStore'),
-                    'javax.net.ssl.trustStorePassword': project.property('ssl.trustStorePassword')
-            )
+            if (project.hasProperty('ssl.keyStoreType')) {
+                systemProperties(
+                        'javax.net.ssl.keyStoreType': project.property('ssl.keyStoreType'),
+                        'javax.net.ssl.keyStore': project.property('ssl.keyStore'),
+                        'javax.net.ssl.keyStorePassword': project.property('ssl.keyStorePassword'),
+                )
+            }
+            if (project.hasProperty('ssl.trustStoreType')) {
+                systemProperties(
+                        'javax.net.ssl.trustStoreType': project.property('ssl.trustStoreType'),
+                        'javax.net.ssl.trustStore': project.property('ssl.trustStore'),
+                        'javax.net.ssl.trustStorePassword': project.property('ssl.trustStorePassword')
+                )
+            }
         }
 
         if (project.buildingWith('gssapi.enabled')) {
@@ -177,36 +170,17 @@ configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driv
         }
 
         useJUnit {
-            if (!project.buildingWith('rs.enabled')) {
-                excludeCategories 'category.ReplicaSet'
-            }
-            if (project.buildingWith('quicktest')) {
-                excludeCategories 'category.SlowUnit'
-            }
-            if (project.buildingWith('travistest')) {
-                excludeCategories 'category.SlowUnit', 'category.Slow'
-            }
+            excludeCategories 'category.Slow'
         }
 
         jacoco { enabled = false }
 
-        beforeTest { descr ->
-            logger.info("[Test ${descr.className} > ${descr.name}]")
-        }
-
-        afterTest { descr, result ->
-                def failureStartTime = result.getResultType().toString() == "FAILURE" ? " Started at: ${result.getStartTime()}" : ""
-                logger.info("[Test ${descr.className} > ${descr.name}] ${result.getResultType()} "
-                        + "(${result.getEndTime() - result.getStartTime()} ms) ${failureStartTime}")
-
-        }
-
         testLogging { exceptionFormat = 'full' }
     }
 
-    task testSlowUnit(type: Test) {
+    task testSlowOnly(type: Test) {
         useJUnit {
-            includeCategories 'category.SlowUnit'
+            includeCategories 'category.Slow'
         }
     }
 
@@ -219,54 +193,77 @@ configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driv
     task testCoverage(dependsOn: test)
 
     /* Code quality */
+    tasks.withType(Checkstyle) {
+        reports {
+            xml.enabled true
+            html.enabled true
+        }
+    }
 
     checkstyle {
-        toolVersion = "6.2"
+        toolVersion = "7.4"
         configFile = new File(configDir, 'checkstyle.xml')
         configProperties.checkstyleConfigDir = configDir
     }
 
-    findbugs {
+    spotbugs {
         excludeFilter = new File(configDir, 'findbugs-exclude.xml')
         sourceSets = [sourceSets.main]
-        toolVersion = '3.0.1'
+        toolVersion = '3.1.7'
     }
 
     codenarc {
-        toolVersion = '0.24'
+        toolVersion = '1.1'
         reportFormat = project.buildingWith('xmlReports.enabled') ? 'xml' : 'html'
     }
 
-    tasks.withType(FindBugs) {
+    tasks.withType(com.github.spotbugs.SpotBugsTask) {
         reports {
             xml.enabled = project.buildingWith('xmlReports.enabled')
             html.enabled = !project.buildingWith('xmlReports.enabled')
         }
     }
+
+    tasks.withType(Test) {
+        def jdkHome = findProperty("jdkHome")
+        if (jdkHome) {
+            def javaExecutablesPath = new File(jdkHome, 'bin')
+            def javaExecutables = [:].withDefault { execName ->
+                def executable = new File(javaExecutablesPath, execName)
+                assert executable.exists() : "There is no ${execName} executable in ${javaExecutablesPath}"
+                executable
+            }
+            executable = javaExecutables.java
+        }
+    }
 }
 
-task docs(type: Javadoc) {
-    source subprojects.grep({ it.name != 'util' }).collect {project -> project.sourceSets.main.allJava }
-    options = subprojects.first().javadoc.options
-    dependsOn = subprojects.first().javadoc.dependsOn
-    excludes =  subprojects.first().javadoc.excludes
-    classpath = files(subprojects.collect {project -> project.sourceSets.main.compileClasspath})
-    destinationDir = new File(projectDir, 'build/docs')
+def getGitVersion() {
+    def describeStdOut = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'describe', '--tags', '--always', '--dirty'
+        standardOutput = describeStdOut
+    }
+    describeStdOut.toString().substring(1).trim()
 }
 
+apply from: 'gradle/publish.gradle'
+apply from: 'gradle/deploy.gradle'
+apply from: 'gradle/javadoc.gradle'
+apply from: 'gradle/testColorOutput.gradle'
+
+
 //////////////////////////////////////////
 // Root project configuration           //
 //////////////////////////////////////////
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.4'
+    gradleVersion = '4.10.2'
 }
 
-gradle.buildFinished { BuildResult result ->
-    if (result.failure && !JavaVersion.current().isJava7Compatible()) {
-        gradle.rootProject.logger.error("\n* Warning:\nJDK ${JavaVersion.VERSION_1_7} is minimal requirement for building the driver. " +
-                                        "You have ${JavaVersion.current()}.")
-    }
+if (!JavaVersion.current().isJava9Compatible()) {
+    throw new GradleException("""
+        | ERROR:
+        | JDK ${JavaVersion.VERSION_1_9.getMajorVersion()} is required to build the driver: You are using JDK ${JavaVersion.current().getMajorVersion()}.
+        |""".stripMargin()
+    )
 }
-
-apply from: 'gradle/deploy.gradle'
-
diff --git a/config/checkstyle-exclude.xml b/config/checkstyle-exclude.xml
index 183e378ccb4..19c29707230 100644
--- a/config/checkstyle-exclude.xml
+++ b/config/checkstyle-exclude.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  ~ Copyright (c) 2008-2014 MongoDB, Inc.
+  ~ Copyright 2008-present MongoDB, Inc.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,10 +21,25 @@
         "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <suppressions>
+
+    <suppress checks="VisibilityModifier" files="com[\\/]mongodb[\\/]internal[\\/]connection[\\/]tlschannel[\\/]"/>
+
     <suppress checks="MethodLength" files="QuickTour"/>
-    <suppress checks="Regexp" files="QuickTour"/>
+    <suppress checks="Regexp" files="Tour"/>
+
+    <suppress checks="MethodLength" files="PojoRoundTripTest"/>
+
+    <suppress checks="JavadocPackage" files="com[\\/]mongodb[\\/][^\\/]*\.java"/>
+    <suppress checks="JavadocPackage" files="com[\\/]mongodb[\\/]client[\\/][^\\/]*\.java"/>
+    <suppress checks="JavadocPackage" files="com[\\/]mongodb[\\/]client[\\/]model[\\/][^\\/]*\.java"/>
+    <suppress checks="JavadocPackage" files="org[\\/]bson[\\/][^\\/]*\.java"/>
+    <suppress checks="JavadocPackage" files="org[\\/]bson[\\/]io[\\/][^\\/]*\.java"/>
+    <suppress checks="JavadocPackage" files="org[\\/]bson[\\/]types[\\/][^\\/]*\.java"/>
 
     <suppress checks="Javadoc*" files="com[\\/]mongodb[\\/]internal[\\/]"/>
+    <suppress checks="Javadoc*" files="com[\\/]mongodb[\\/]async[\\/]client[\\/]internal[\\/]"/>
+    <suppress checks="Javadoc*" files="com[\\/]mongodb[\\/]client[\\/]internal[\\/]"/>
+    <suppress checks="Javadoc*" files="org[\\/]bson[\\/]internal[\\/]"/>
 
     <!--Do not check primer classes -->
     <suppress checks="Javadoc*" files=".*primer.*"/>
@@ -32,6 +47,13 @@
     <suppress checks="AvoidStarImportCheck" files=".*primer.*"/>
     <suppress checks="VisibilityModifierCheck" files=".*primer.*"/>
 
+    <!-- Allow printStackTrace in this file -->
+    <suppress checks="Regexp" files="CallbackResultHolder"/>
+
+    <!--Do not check documentation tests classes -->
+    <suppress checks="Javadoc*" files=".*documentation.*"/>
+    <suppress checks="Regexp" files=".*documentation.*"/>
+
     <!--Do not check test classes -->
     <suppress checks="Javadoc*" files=".*test.*"/>
 
@@ -41,9 +63,13 @@
 
     <!--DBCollection is insanely long, and we should not compromise every class length for this one-->
     <suppress checks="FileLength" files="DBCollection"/>
+    <suppress checks="FileLength" files="MongoCollection"/>
 
     <suppress checks="ParameterNumber" files="Connection"/>
     <suppress checks="ParameterNumber" files="DefaultServer"/>
+    <suppress checks="ParameterNumber" files="DefaultClusterFactory"/>
+    <suppress checks="ParameterNumber" files="DefaultClusterableServerFactory"/>
+    <suppress checks="ParameterNumber" files="Operations"/>
 
     <!--Legacy code that has not yet been cleaned-->
     <suppress checks="FinalClass" files="AggregationOptions"/>
@@ -61,6 +87,7 @@
     <suppress checks="ConstantName" files="JSONCallback"/>
     <suppress checks="ConstantName" files="Mongo"/>
     <suppress checks="ConstantName" files="ReflectionDBObject"/>
+    <suppress checks="ConstantName" files="Decimal128"/>  <!-- For NaN -->
 
     <suppress checks="JavadocMethod" files="BasicDBObject"/>
 
@@ -90,11 +117,26 @@
     <suppress checks="HideUtilityClassConstructor" files="ClassAncestry"/>
     <suppress checks="HideUtilityClassConstructor" files="CLI"/>
     <suppress checks="HideUtilityClassConstructor" files="JSON"/>
-    <suppress checks="HideUtilityClassConstructor" files="QuickTour"/>
+    <suppress checks="HideUtilityClassConstructor" files="Tour"/>
     <suppress checks="HideUtilityClassConstructor" files="Util"/>
+    <suppress checks="HideUtilityClassConstructor" files="DatabaseTestCase"/>
+
+    <suppress checks="ParameterNumber" files="BulkWriteBatch"/>
 
     <!-- Alternative copyrights -->
     <suppress checks="RegexpSingleline" files="Immutable"/>
     <suppress checks="RegexpSingleline" files="NotThreadSafe"/>
     <suppress checks="RegexpSingleline" files="ThreadSafe"/>
+
+    <!-- Pojo test entities -->
+    <suppress checks="ConstantName" files=".*org[\\/]bson[\\/]codecs[\\/]pojo[\\/]entities[\\/].*"/>
+    <suppress checks="VisibilityModifier" files=".*org[\\/]bson[\\/]codecs[\\/]pojo[\\/]entities[\\/].*"/>
+    <suppress checks="ParameterNumber" files=".*org[\\/]bson[\\/]codecs[\\/]pojo[\\/]entities[\\/].*"/>
+
+    <!-- Pojo test bench -->
+    <suppress checks="MemberName" files=".*org[\\/]bson[\\/]codecs[\\/]pojo[\\/]bench[\\/].*"/>
+    <suppress checks="MethodName" files=".*org[\\/]bson[\\/]codecs[\\/]pojo[\\/]bench[\\/].*"/>
+    <suppress checks="ParameterName" files=".*org[\\/]bson[\\/]codecs[\\/]pojo[\\/]bench[\\/].*"/>
+    <suppress checks="Regexp" files=".*org[\\/]bson[\\/]codecs[\\/]pojo[\\/]bench[\\/].*"/>
+
 </suppressions>
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 36b767522a5..6ba0a356009 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright (c) 2008-2015 MongoDB, Inc.
+  ~ Copyright 2008-present MongoDB, Inc.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -33,12 +33,12 @@
         <!-- Requires a Mongodb copyright notice in each file.
           <pre>
             /*
-             * Copyright 2008-2014 MongoDB, Inc.
+             * Copyright 2008-present MongoDB, Inc.
              *
           </pre>
         -->
         <property name="format"
-                  value="^(//| \*) Copyright (\([cC]\) )?[\d]{4}(\-[\d]{4})? (MongoDB, Inc\.).*$" />
+                  value="^(//| \*) Copyright 2008-present MongoDB, Inc\.$" />
         <property name="minimum" value="1" />
         <property name="maximum" value="10" />
         <property name="message" value="MongoDB copyright is missing or malformed." />
@@ -47,7 +47,9 @@
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf_cr_crlf" />
+    </module>
 
     <!-- Checks that property files contain the same keys.         -->
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
@@ -121,7 +123,7 @@
 
         <module name="MethodLength"/>
         <module name="ParameterNumber">
-            <property name="max" value="11"/>
+            <property name="max" value="12"/>
         </module>
 
 
@@ -218,6 +220,12 @@
         </module>
     </module>
     <module name="SuppressionCommentFilter"/>
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+        <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+        <property name="checkFormat" value="$1"/>
+    </module>
+
     <module name="SuppressionFilter">
         <property name="file" value="${checkstyleConfigDir}/checkstyle-exclude.xml"/>
     </module>
diff --git a/config/clirr-exclude.yml b/config/clirr-exclude.yml
index 789844841d4..7cc05ec93d8 100644
--- a/config/clirr-exclude.yml
+++ b/config/clirr-exclude.yml
@@ -4,3 +4,29 @@ differenceTypes: []
 packages:
 - io.netty.*
 - org.slf4j.*
+
+classes:
+  - org.bson.codecs.configuration.Optional$Some
+
+members:
+  org.bson.AbstractBsonReader:
+  - doReadDecimal128()
+  - doPeekBinarySize()
+  org.bson.AbstractBsonWriter:
+  - doWriteDecimal128(org.bson.types.Decimal128)
+  org.bson.BsonNumber:
+  - decimal128Value()
+  org.bson.BsonReader:
+  - readDecimal128()
+  - readDecimal128(java.lang.String)
+  - peekBinarySize()
+  - getMark()
+  - close()
+  org.bson.io.BsonInput:
+  - getMark(int)
+  org.bson.BsonWriter:
+  - writeDecimal128(org.bson.types.Decimal128)
+  - writeDecimal128(java.lang.String,org.bson.types.Decimal128)
+  - pipe(org.bson.BsonReader,java.util.List)
+  org.bson.diagnostics.Loggers:
+  - getLogger(java.lang.String)
diff --git a/config/codenarc/codenarc.xml b/config/codenarc/codenarc.xml
index 6662b18bbb0..2e6aeae2eb5 100644
--- a/config/codenarc/codenarc.xml
+++ b/config/codenarc/codenarc.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright 2008-present MongoDB, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <ruleset xmlns="http://codenarc.org/ruleset/1.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://codenarc.org/ruleset/1.0 http://codenarc.org/ruleset-schema.xsd"
@@ -18,11 +34,27 @@
         <exclude name="ComparisonWithSelf"/>
     </ruleset-ref>
     <ruleset-ref path='rulesets/braces.xml'/>
-    <ruleset-ref path='rulesets/concurrency.xml'/>
+    <ruleset-ref path='rulesets/concurrency.xml'>
+        <rule-config name='BusyWait'>
+            <property name='doNotApplyToFileNames' value='AsyncQueryBatchCursorFunctionalSpecification.groovy'/>
+        </rule-config>
+
+    </ruleset-ref>
     <ruleset-ref path='rulesets/convention.xml'>
         <rule-config name='NoDef'>
             <property name='doNotApplyToFilesMatching' value='.*Specification.groovy'/>
         </rule-config>
+        <rule-config name='HashtableIsObsolete'>
+            <property name='doNotApplyToFileNames' value='MongoClientFactorySpecification.groovy'/>
+        </rule-config>
+        <exclude name="TrailingComma"/>
+        <exclude name="CouldBeSwitchStatement"/>
+        <exclude name="NoDef"/>
+        <exclude name='InvertedCondition'/>
+        <exclude name='MethodReturnTypeRequired'/>
+        <exclude name='MethodParameterTypeRequired'/>
+        <exclude name='FieldTypeRequired '/>
+        <exclude name="VariableTypeRequired"/>
     </ruleset-ref>
     <ruleset-ref path='rulesets/design.xml'>
         <rule-config name='BuilderMethodWithSideEffects'>
@@ -40,10 +72,15 @@
         <exclude name="DuplicateStringLiteral"/>
         <exclude name="DuplicateMapLiteral"/>
     </ruleset-ref>
-    <ruleset-ref path='rulesets/exceptions.xml'/>
+    <ruleset-ref path='rulesets/exceptions.xml'>
+        <rule-config name='ThrowException'>
+            <property name='doNotApplyToFileNames' value='BsonCodecSpecification.groovy'/>
+        </rule-config>
+    </ruleset-ref>
     <ruleset-ref path='rulesets/formatting.xml'>
         <rule-config name='LineLength'>
             <property name='length' value='140'/>
+            <property name='doNotApplyToFileNames' value='ClientSideEncryptionProseTestSpecification.groovy'/>
         </rule-config>
         <!-- this check is failing '})' when it shouldn't -->
         <exclude name='SpaceAfterClosingBrace'/>
@@ -53,9 +90,11 @@
         <exclude name='BlankLineBeforePackage'/>
         <exclude name='ConsecutiveBlankLines'/>
         <exclude name='FileEndsWithoutNewline'/>
+        <exclude name='Indentation'/>
     </ruleset-ref>
     <ruleset-ref path='rulesets/generic.xml'/>
     <ruleset-ref path='rulesets/groovyism.xml'>
+        <exclude name="ExplicitCallToEqualsMethod"/>
         <exclude name="ExplicitCallToAndMethod"/>
         <exclude name="ExplicitCallToEqualsMethod"/>
         <exclude name="ExplicitCallToCompareToMethod"/>
@@ -76,6 +115,9 @@
         <rule-config name='ParameterCount'>
             <property name='doNotApplyToFilesMatching' value='.*Specification.groovy'/>
         </rule-config>
+        <rule-config name='NestedBlockDepth'>
+            <property name='doNotApplyToFilesMatching' value='.*Specification.groovy'/>
+        </rule-config>
         <exclude name='CrapMetric'/>
         <exclude name='AbcMetric'/>
         <exclude name='MethodSize'/>
@@ -86,6 +128,8 @@
         <exclude name='UnnecessarySemicolon'/>
         <!-- dangerous rule because if you use "with in a then clause of a Spock test, the assertions are not run -->
         <exclude name="UnnecessaryObjectReferences"/>
+        <exclude name="UnnecessaryBigDecimalInstantiation"/>
+        <exclude name="UnnecessarySetter"/>
     </ruleset-ref>
     <ruleset-ref path='rulesets/unused.xml'>
         <rule-config name='UnusedObject'>
diff --git a/config/findbugs-exclude.xml b/config/findbugs-exclude.xml
index d27a2f4af29..eb6c479d606 100644
--- a/config/findbugs-exclude.xml
+++ b/config/findbugs-exclude.xml
@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright 2008-present MongoDB, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <FindBugsFilter>
     <!-- specific excludes which should be fixed -->
     <Match>
@@ -17,7 +33,7 @@
 
     <!-- Deliberately ignoring return value of CountDownLatch.await -->
     <Match>
-        <Class name="com.mongodb.connection.BaseCluster"/>
+        <Class name="com.mongodb.internal.connection.BaseCluster"/>
         <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
     </Match>
 
@@ -72,6 +88,17 @@
         <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
     </Match>
 
+    <Match>
+        <Class name="org.bson.RawBsonArray"/>
+        <Method name="clone"/>
+        <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
+    </Match>
+
+    <Match>
+        <Class name="org.bson.codecs.jsr310.Jsr310CodecProvider"/>
+        <Bug pattern="DE_MIGHT_IGNORE"/>
+    </Match>
+
     <!-- Test exclusions -->
     <!-- All bugs in test classes, except for JUnit-specific bugs -->
     <Match>
@@ -100,8 +127,35 @@
     </Match>
 
     <Match>
-        <Class name="~com.mongodb.connection.ByteBufBsonDocument.*"/>
+        <Class name="~com.mongodb.internal.connection.AbstractByteBufBsonDocument.*"/>
         <Bug pattern="NP_BOOLEAN_RETURN_NULL"/>
     </Match>
 
+    <Match>
+        <Class name="~com.mongodb.client.ClientSession.*"/>
+        <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE"/>
+    </Match>
+
+    <Match>
+        <Class name="~com.mongodb.async.client.ClientSession.*"/>
+        <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE"/>
+    </Match>
+
+    <Match>
+        <Class name="~com.mongodb.async.client.internal.AsyncCryptConnection.*"/>
+        <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+    </Match>
+
+    <!-- Spotbugs assumes that SSLSocket#getSSLParameters never returns null, when that is not the case for all JDKs -->
+    <Match>
+        <Class name="com.mongodb.internal.connection.SocketStreamHelper"/>
+        <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
+    </Match>
+
+    <Match>
+        <Class name="com.mongodb.client.internal.CryptConnection"/>
+        <Method name="retain"/>
+        <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+    </Match>
+
 </FindBugsFilter>
diff --git a/docs/landing/README.md b/docs/landing/README.md
index 1efb1858835..5f1702b3a37 100644
--- a/docs/landing/README.md
+++ b/docs/landing/README.md
@@ -3,7 +3,7 @@
 The static front page site for the Java documentation portal.
 
 ## Requirements
-Hugo version 0.13 [download here](https://github.com/spf13/hugo/releases/tag/v0.13)
+Hugo version 0.25 [download here](https://github.com/spf13/hugo/releases/tag/v0.25)
 <br>
 Check out the hugo [quickstart guide](http://gohugo.io/overview/quickstart/).
 
diff --git a/docs/landing/config.toml b/docs/landing/config.toml
index f4b0ac5aaee..013e39ec8ba 100644
--- a/docs/landing/config.toml
+++ b/docs/landing/config.toml
@@ -2,5 +2,7 @@ baseurl = "/mongo-java-driver/"
 languageCode = "en-us"
 title = "MongoDB Java Driver"
 canonifyurls = false
+disableHugoGeneratorInject = true
+disableKinds = ["section", "taxonomy", "taxonomyTerm", "404"]
 
 githubRepo = "mongo-java-driver"
diff --git a/docs/landing/data/releases.toml b/docs/landing/data/releases.toml
index 2476ee9c005..4d4c1edd0ca 100644
--- a/docs/landing/data/releases.toml
+++ b/docs/landing/data/releases.toml
@@ -1,8 +1,53 @@
-current = "3.3.0"
+current = "3.12.0"
 
 [[versions]]
-  version = "3.3.0"
+  version = "3.12.0"
   status = "current"
+  docs = "./3.12"
+  api = "./3.12/javadoc"
+
+[[versions]]
+  version = "3.11.2"
+  docs = "./3.11"
+  api = "./3.11/javadoc"
+
+[[versions]]
+  version = "3.10.2"
+  docs = "./3.10"
+  api = "./3.10/javadoc"
+
+[[versions]]
+  version = "3.9.0"
+  docs = "./3.9"
+  api = "./3.9/javadoc"
+
+[[versions]]
+  version = "3.8.2"
+  docs = "./3.8"
+  api = "./3.8/javadoc"
+
+[[versions]]
+  version = "3.7.1"
+  docs = "./3.7"
+  api = "./3.7/javadoc"
+
+[[versions]]
+  version = "3.6.4"
+  docs = "./3.6"
+  api = "./3.6/javadoc"
+
+[[versions]]
+  version = "3.5.0"
+  docs = "./3.5"
+  api = "./3.5/javadoc"
+
+[[versions]]
+  version = "3.4.3"
+  docs = "./3.4"
+  api = "./3.4/javadoc"
+
+[[versions]]
+  version = "3.3.0"
   docs = "./3.3"
   api = "http://api.mongodb.com/java/3.3"
 
@@ -32,21 +77,17 @@ current = "3.3.0"
   api = "http://api.mongodb.com/java/2.13"
 
 [[drivers]]
-  name = "mongodb-driver"
-  description = "The synchronous driver, new in 3.0.<br/>For older versions of the driver or for OSGi-based applications please use the `mongo-java-driver`."
-  versions = "3.3.0,3.2.2,3.1.1,3.0.4"
+  name = "mongodb-driver-sync"
+  description = "The synchronous driver, new in 3.7."
+  versions = "3.12.0,3.11.2,3.10.2,3.9.0,3.8.2,3.7.1"
 
 [[drivers]]
-  name = "mongo-java-driver"
-  description = "An uber jar containing the bson library, the core library and the mongodb-driver.<br/>This artifact is a valid OSGi bundle."
-  versions = "3.3.0,3.2.2,3.1.1,3.0.4,2.14.2,2.13.3"
+  name = "mongodb-driver-legacy"
+  description = "The legacy API for the synchronous driver.<br/>Prefer mongodb-driver-sync for new applications"
+  versions = "3.12.0,3.11.2,3.10.2,3.9.0"
 
 [[drivers]]
   name = "mongodb-driver-async"
-  description = "The new asynchronous driver, new in 3.0"
-  versions = "3.3.0,3.2.2,3.1.1,3.0.4"
+  description = "The callback-based asynchronous driver.<br/>Prefer the Reactive Streams driver for new applications."
+  versions = "3.12.0,3.11.2,3.10.2,3.9.0,3.8.2,3.7.1,3.6.4,3.5.0,3.4.3,3.3.0,3.2.2,3.1.1,3.0.4"
 
-[[drivers]]
-  name = "mongodb-driver-core"
-  description = "The core library, new in 3.0"
-  versions = "3.3.0,3.2.2,3.1.1,3.0.4"
diff --git a/docs/landing/layouts/404.html b/docs/landing/layouts/404.html
index 32eba427510..634869dcb9b 100644
--- a/docs/landing/layouts/404.html
+++ b/docs/landing/layouts/404.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     {{ partial "meta.html"}}
-    <link rel="shortcut icon" href="{{.Site.BaseUrl}}/img/favicon.png">
+    <link rel="shortcut icon" href="{{.Site.BaseURL}}/img/favicon.png">
 
     <title>{{.Title}}</title>
 
diff --git a/docs/landing/layouts/index.html b/docs/landing/layouts/index.html
index b47a66a7c20..1164cfe59ad 100644
--- a/docs/landing/layouts/index.html
+++ b/docs/landing/layouts/index.html
@@ -1,34 +1,34 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    {{ partial "meta.html"}}
-    <link rel="shortcut icon" href="{{.Site.BaseUrl}}/s/img/favicon.png">
+    {{- partial "meta.html" -}}
+    <link rel="shortcut icon" href="{{.Site.BaseURL}}/s/img/favicon.png">
 
     <title>{{.Title}}</title>
 
-    {{ partial "assets/css.html" . }}
+    {{- partial "assets/css.html" . -}}
   </head>
 
   <body>
   <!--header start-->
-  {{ partial "header/main.html" . }}
+  {{- partial "header/main.html" . -}}
   <!--header end-->
 
-  {{ partial "hero.html" . }}
+  {{- partial "hero.html" . -}}
 
   <!-- Main content -->
   <div class="container" id="mainContent">
     <div class="row">
       <div class="col-md-8">
-        {{ partial "introduction.html" . }}
+        {{- partial "introduction.html" . -}}
 
-        {{ partial "features.html" . }}
+        {{- partial "features.html" . -}}
 
-        {{ partial "quickStart.html" . }}
+        {{- partial "quickStart.html" . -}}
       </div>
       <div class="col-md-4">
-        {{ partial "releases.html" . }}
-        {{ partial "mongodbUniversity.html" . }}
+        {{- partial "releases.html" . -}}
+        {{- partial "mongodbUniversity.html" . -}}
      </div>
     </div>
   </div>
@@ -38,7 +38,7 @@
   <div class="container">
     <div class="row">
       <div class="col-md-12">
-        {{ partial "footer.html" .}}
+        {{- partial "footer.html" . -}}
       </div>
     </div>
   </div>
@@ -46,7 +46,7 @@
 
 
 <!-- javascripts -->
-{{ partial "assets/javascripts.html" . }}
-{{ partial "assets/analytics.html" . }}
+{{- partial "assets/javascripts.html" . -}}
+{{- partial "assets/analytics.html" . -}}
 </body>
 </html>
diff --git a/docs/landing/layouts/partials/assets/css.html b/docs/landing/layouts/partials/assets/css.html
index 7f49b2a0220..e053bda9e00 100644
--- a/docs/landing/layouts/partials/assets/css.html
+++ b/docs/landing/layouts/partials/assets/css.html
@@ -1,6 +1,6 @@
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/bootstrap.min.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/font-awesome/css/font-awesome.min.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/highlight/styles/vs.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/bootstrap-select/bootstrap-select.min.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/css/frontpage.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/bootstrap.min.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/font-awesome/css/font-awesome.min.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/highlight/styles/vs.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/bootstrap-select/bootstrap-select.min.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/s/css/frontpage.css" type="text/css" />
diff --git a/docs/landing/layouts/partials/assets/javascripts.html b/docs/landing/layouts/partials/assets/javascripts.html
index 535b1b3db7e..6ef23295901 100644
--- a/docs/landing/layouts/partials/assets/javascripts.html
+++ b/docs/landing/layouts/partials/assets/javascripts.html
@@ -1,7 +1,7 @@
-<script type="text/javascript" src="{{.Site.BaseUrl}}/s/js/jquery.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/bootstrap.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/highlight/highlight.pack.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/bootstrap-select/bootstrap-select.min.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/zeroclipboard/ZeroClipboard.min.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/s/js/frontpage.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/s/js/jquery.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/bootstrap.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/highlight/highlight.pack.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/bootstrap-select/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/zeroclipboard/ZeroClipboard.min.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/s/js/frontpage.js"></script>
diff --git a/docs/landing/layouts/partials/features.html b/docs/landing/layouts/partials/features.html
index 76dc1ad72d8..0b062a181c9 100644
--- a/docs/landing/layouts/partials/features.html
+++ b/docs/landing/layouts/partials/features.html
@@ -8,7 +8,7 @@ <h2>Features</h2>
   <dt>MongoDB Driver</dt>
   <dd>An updated Java driver that includes the legacy API as well as a new generic MongoCollection interface that complies with a new cross-driver CRUD specification.</dd>
   <dt>MongoDB Async Driver</dt>
-  <dd>A new asynchronous API that can leverage either Netty or Java 7's AsynchronousSocketChannel for fast and non-blocking IO.</dd>
-  <dt>Core driver</dt>
-  <dd>The MongoDB Driver and Async Driver are both built on top of a new core library, which anyone can use to build alternative or experimental high-level APIs.</dd>
+  <dd>A callback-based asynchronous driver.  Note that this driver is now deprecated in favor of the
+      <a href="http://mongodb.github.io/mongo-java-driver-reactivestreams/">Reactive Streams Java Driver</a>
+  </dd>
 </dl>
diff --git a/docs/landing/layouts/partials/footer.html b/docs/landing/layouts/partials/footer.html
index 39df5b0403f..bf9321d6f96 100644
--- a/docs/landing/layouts/partials/footer.html
+++ b/docs/landing/layouts/partials/footer.html
@@ -1,6 +1,6 @@
 <div class="footer">
   <div class="copyright">
-    <p>Copyright © 2008-2015 <a class="smalltext" href="http://www.mongodb.com">MongoDB, Inc</a>.
+    <p>Copyright © 2008-present <a class="smalltext" href="http://www.mongodb.com">MongoDB, Inc</a>.
        MongoDB, Mongo, and the leaf logo are registered trademarks of MongoDB, Inc.
     </p>
   </div>
diff --git a/docs/landing/layouts/partials/header/main.html b/docs/landing/layouts/partials/header/main.html
index c9a32f11540..3da110ccda2 100644
--- a/docs/landing/layouts/partials/header/main.html
+++ b/docs/landing/layouts/partials/header/main.html
@@ -2,8 +2,8 @@
   <div class="header-content">
     <!--logo start-->
     <div class="logo pull-left">
-      <a href="{{.Site.BaseUrl}}">
-        <img src="{{.Site.BaseUrl}}/s/img/logo-mongodb-header.png", alt="MongoDB.org" />
+      <a href="{{.Site.BaseURL}}">
+        <img src="{{.Site.BaseURL}}/s/img/logo-mongodb-header.png", alt="MongoDB.org" />
       </a>
     </div>
     <!--logo end-->
diff --git a/docs/landing/layouts/partials/hero.html b/docs/landing/layouts/partials/hero.html
index 8413ecebafb..7b214b24c0e 100644
--- a/docs/landing/layouts/partials/hero.html
+++ b/docs/landing/layouts/partials/hero.html
@@ -8,8 +8,10 @@ <h2>MongoDB Java Driver</h2>
         The next generation Java driver for MongoDB
       </p>
       <p>
-        {{ range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current  }}{{ $.Scratch.Set "qs.currentReleasedVersion" . }}{{end }}
-        {{$currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion"}}
+        {{- range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current -}}
+         {{- $.Scratch.Set "qs.currentReleasedVersion" . -}}
+        {{- end -}}
+        {{- $currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion" -}}
       <a href="{{$currentReleasedVersion.docs}}" class="btn btn-success btn-dark btn-mongo">Latest documentation</a>
       </p>
 
diff --git a/docs/landing/layouts/partials/introduction.html b/docs/landing/layouts/partials/introduction.html
index dcffa95360a..80849536c8a 100644
--- a/docs/landing/layouts/partials/introduction.html
+++ b/docs/landing/layouts/partials/introduction.html
@@ -2,5 +2,4 @@ <h2>Introduction</h2>
 
 <p>
   The official MongoDB Java Driver providing both synchronous and asynchronous interaction with MongoDB.
-  Powering the drivers is a new driver core and BSON library.
 </p>
diff --git a/docs/landing/layouts/partials/quickStart.html b/docs/landing/layouts/partials/quickStart.html
index af50c5b9488..35d641c9e74 100644
--- a/docs/landing/layouts/partials/quickStart.html
+++ b/docs/landing/layouts/partials/quickStart.html
@@ -8,37 +8,41 @@ <h2 id="quickStart">Quick Start</h2>
   Alternatively, head over to our documentation to learn more about getting started with Java and MongoDB.
 </p>
 
-{{ range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current  }}{{ $.Scratch.Set "qs.currentReleasedVersion" . }}{{end }}
-{{$currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion"}}
+{{- range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current -}}
+  {{- $.Scratch.Set "qs.currentReleasedVersion" . -}}
+{{- end -}}
+{{- $currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion" -}}
 
 <div id="downloadWidget">
   <div class="container">
     <div class="row downloadForm">
       <form>
         <div class="col-xs-5 col-lg-4 col-lg-push-2 ">
-      {{ $.Scratch.Set "qs.pos" 0 }}
-      {{ $.Scratch.Set "qs.firstDriver" false }}
-      {{ with $.Site.Data.releases.drivers }}
+      {{- $.Scratch.Set "qs.pos" 0 -}}
+      {{- $.Scratch.Set "qs.firstDriver" false -}}
+      {{- with $.Site.Data.releases.drivers -}}
         <select class="driverPicker">
-          {{ range . }}
-          {{ if eq ($.Scratch.Get "qs.firstDriver") false }}{{ $.Scratch.Set "qs.firstDriver" . }}{{end}}
-          <option value="{{$.Scratch.Get "qs.pos"}}" data-versions="{{.versions}}">{{.name}}</option>
-          {{ $.Scratch.Add "qs.pos" 1 }}
-          {{ end }}
+          {{- range . -}}
+            {{- if eq ($.Scratch.Get "qs.firstDriver") false -}}
+              {{- $.Scratch.Set "qs.firstDriver" . -}}
+            {{- end -}}
+            <option value="{{$.Scratch.Get "qs.pos"}}" data-versions="{{.versions}}">{{.name}}</option>
+            {{- $.Scratch.Add "qs.pos" 1 -}}
+          {{- end -}}
         </select>
-      {{ end }}
+      {{- end -}}
       </div>
     <div class="col-xs-5 col-lg-4 col-lg-push-2 ">
-    {{ $.Scratch.Set "qs.pos" 0 }}
-    {{ $firstDriver := $.Scratch.Get "qs.firstDriver"}}
-    {{ with $.Site.Data.releases.versions }}
+    {{- $.Scratch.Set "qs.pos" 0 -}}
+    {{- $firstDriver := $.Scratch.Get "qs.firstDriver" -}}
+    {{- with $.Site.Data.releases.versions -}}
       <select class="releasePicker">
-        {{ range . }}
-        <option value="{{$.Scratch.Get "qs.pos"}}" {{ if eq (in $firstDriver.versions .version) false }}disabled="disabled"{{else if eq .status "current"}}selected{{end}}>{{.version}}</option>
-        {{ $.Scratch.Add "qs.pos" 1 }}
-        {{ end }}
+        {{- range . -}}
+          <option value="{{$.Scratch.Get "qs.pos"}}" {{ if eq (in $firstDriver.versions .version) false }}disabled="disabled"{{else if eq .status "current"}}selected{{end}}>{{.version}}</option>
+        {{- $.Scratch.Add "qs.pos" 1 -}}
+        {{- end -}}
       </select>
-    {{ end }}
+    {{- end -}}
     </div>
     <div class="col-lg-2 col-lg-push-2 ">
     <input type="checkbox" checked class="distroPicker" data-toggle="toggle" data-on="Maven" data-off="Gradle" data-offstyle="success">
@@ -55,21 +59,21 @@ <h2 id="quickStart">Quick Start</h2>
   <div class="clipboard" title="copy">
   <button class="btn btn-dark"><i class="fa fa-clipboard fa-2"></i></button>
   </div>
-  {{ $currentNode := . }}
-  {{ $.Scratch.Set "qs.firstDriver" true }}
-  {{ with $currentNode.Site.Data.releases.drivers }}
-    {{ $.Scratch.Set "qs.driverPos" 0 }}
-    {{ range . }}
-      {{ $currentDriver := . }}
-      {{ with $.Site.Data.releases.versions }}
-        {{ $.Scratch.Set "qs.versionPos" 0 }}
-        {{ range . }}
-          {{ $currentVersion := . }}
-          {{ $firstDriver := $.Scratch.Get "qs.firstDriver"}}
-          {{ $driverPos := $.Scratch.Get "qs.driverPos" }}
-          {{ $versionPos := $.Scratch.Get "qs.versionPos" }}
-          {{ if in $currentDriver.versions $currentVersion.version }}
-{{ if in $currentVersion.version "SNAPSHOT" }}
+  {{- $currentNode := . -}}
+  {{- $.Scratch.Set "qs.firstDriver" true -}}
+  {{- with $currentNode.Site.Data.releases.drivers -}}
+    {{- $.Scratch.Set "qs.driverPos" 0 -}}
+    {{- range . -}}
+      {{- $currentDriver := . -}}
+      {{- with $.Site.Data.releases.versions -}}
+        {{- $.Scratch.Set "qs.versionPos" 0 -}}
+        {{- range . -}}
+          {{- $currentVersion := . -}}
+          {{- $firstDriver := $.Scratch.Get "qs.firstDriver" -}}
+          {{- $driverPos := $.Scratch.Get "qs.driverPos" -}}
+          {{- $versionPos := $.Scratch.Get "qs.versionPos" -}}
+          {{- if in $currentDriver.versions $currentVersion.version -}}
+{{- if in $currentVersion.version "SNAPSHOT" -}}
 <div id="maven-{{$versionPos}}-{{$driverPos}}" class="download {{if or (ne $firstDriver true) (ne $currentVersion.status "current") }} hidden{{end}}">
 <pre><code>
 &lt;dependencies&gt;
@@ -104,8 +108,8 @@ <h2 id="quickStart">Quick Start</h2>
   }
 </code></pre>
 </div>
-{{ else }}
-<div id="maven-{{$versionPos}}-{{$driverPos}}" class="download {{if or (ne $firstDriver true) (ne $currentVersion.status "current") }} hidden{{end}}">
+{{- else -}}
+<div id="maven-{{$versionPos}}-{{$driverPos}}" class="download {{ if or (ne $firstDriver true) (ne $currentVersion.status "current") }} hidden{{end}}">
 <pre><code>
 &lt;dependencies&gt;
     &lt;dependency&gt;
@@ -126,21 +130,21 @@ <h2 id="quickStart">Quick Start</h2>
 
 </code></pre>
 </div>
-{{ end }}
-         {{ if eq $currentVersion.status "current" }}
-          {{ $.Scratch.Set "qs.firstDriver" false }}
-         {{end}}
-          {{ $.Scratch.Add "qs.versionPos" 1 }}
-          {{ end }}
-          {{ end }}
-          {{ end }}
-          {{ $driverPos := $.Scratch.Get "qs.driverPos" }}
+{{- end -}}
+         {{- if eq $currentVersion.status "current" -}}
+          {{- $.Scratch.Set "qs.firstDriver" false -}}
+         {{- end -}}
+          {{- $.Scratch.Add "qs.versionPos" 1 -}}
+          {{- end -}}
+          {{- end -}}
+          {{- end -}}
+          {{- $driverPos := $.Scratch.Get "qs.driverPos" -}}
           <div id="driver-{{$driverPos}}" class="download description{{if ne $driverPos 0}} hidden{{end}}">
-            {{$currentDriver.description | markdownify}}
+            {{- $currentDriver.description | markdownify -}}
           </div>
-          {{ $.Scratch.Add "qs.driverPos" 1 }}
-      {{ end }}
-      {{ end }}
+          {{- $.Scratch.Add "qs.driverPos" 1 -}}
+      {{- end -}}
+      {{- end -}}
     </div>
     </div>
   </div>
diff --git a/docs/landing/layouts/partials/releases.html b/docs/landing/layouts/partials/releases.html
index 152652f8502..c4e94b9d6bd 100644
--- a/docs/landing/layouts/partials/releases.html
+++ b/docs/landing/layouts/partials/releases.html
@@ -1,16 +1,16 @@
-{{ with $.Site.Data.releases.versions }}
+{{- with $.Site.Data.releases.versions -}}
 <section id="releases">
   <h2>Releases</h2>
   <table class="table table-striped">
     <thead><tr><th>Release</th><th>Documentation</th></tr></thead>
     <tbody>
-    {{ range . }}
+    {{- range . -}}
       <tr>
         <th class="{{.status}}">{{.version}}</th>
         <td><a href="{{.docs}}" class="reference">Reference</a> &#124; <a href="{{.api}}">API</a></td>
       </tr>
-    {{ end }}
+    {{- end -}}
   </tbody>
   </table>
 </section>
-{{ end }}
+{{- end -}}
diff --git a/docs/landing/static/versions.json b/docs/landing/static/versions.json
index f7abd635f23..8c3f51f68ba 100644
--- a/docs/landing/static/versions.json
+++ b/docs/landing/static/versions.json
@@ -1 +1,17 @@
-[{"version": "3.3"}, {"version": "3.2"}, {"version": "3.1"}, {"version": "3.0"}, {"version": "2.13"}, {"version": "2.14"}]
+[
+  {"version": "3.12"},
+  {"version": "3.11"},
+  {"version": "3.10"},
+  {"version": "3.9"},
+  {"version": "3.8"},
+  {"version": "3.7"},
+  {"version": "3.6"},
+  {"version": "3.5"},
+  {"version": "3.4"},
+  {"version": "3.3"},
+  {"version": "3.2"},
+  {"version": "3.1"},
+  {"version": "3.0"},
+  {"version": "2.14"},
+  {"version": "2.13"}
+]
diff --git a/docs/reference/README.md b/docs/reference/README.md
index 6b411022c7c..bb49b73e5e1 100644
--- a/docs/reference/README.md
+++ b/docs/reference/README.md
@@ -7,7 +7,7 @@
  3. Create content
 
 ## Requirements
-Hugo version 0.13 [download here](https://github.com/spf13/hugo/releases/tag/v0.13)
+Hugo version 0.25 [download here](https://github.com/spf13/hugo/releases/tag/v0.25)
 <br>
 Check out the hugo [quickstart guide](http://gohugo.io/overview/quickstart/).
 
diff --git a/docs/reference/config.toml b/docs/reference/config.toml
index de764db73ba..9845910c8cc 100644
--- a/docs/reference/config.toml
+++ b/docs/reference/config.toml
@@ -1,20 +1,21 @@
-baseurl = "/mongo-java-driver/3.3"
+baseURL = "/mongo-java-driver/3.12"
 languageCode = "en-us"
 title = "MongoDB Java Driver"
 theme = "mongodb"
-canonifyurls = false
+canonifyURLs = false
+disableHugoGeneratorInject = true
+disableKinds = ["section", "taxonomy", "taxonomyTerm", "404"]
 
 [blackfriday]
   plainIdAnchors = true
 
-
 # Update versions in mongodb.toml as well
 [[menu.main]]
     name = "API Documentation"
     pre = "<i class='fa fa-file-text-o'></i>"
     weight = 90
     identifier = "apiDocs"
-    url = "http://api.mongodb.com/java/3.3"
+    url = "/javadoc"
 
 [[menu.main]]
     name = "Source Code"
diff --git a/docs/reference/content/bson/documents.md b/docs/reference/content/bson/documents.md
index 772e74ab521..b84b63c6555 100644
--- a/docs/reference/content/bson/documents.md
+++ b/docs/reference/content/bson/documents.md
@@ -11,6 +11,15 @@ title = "Documents"
 
 The driver includes several classes and interfaces used for representing BSON documents.
 
+{{% note class="important" %}}
+
+The server's behavior related to duplicate key names in a document is undefined. When a
+document with duplicate key names is decoded, the driver will assign the last
+value associated with the duplicate key. Storing such a document will cause
+the other values to be lost. 
+
+{{% /note %}}
+
 ### BsonDocument
 
 Although generally not needed by users of the high-level driver API, the [`BsonDocument`]({{< apiref "org/bson/BsonDocument" >}}) class is 
diff --git a/docs/reference/content/bson/extended-json.md b/docs/reference/content/bson/extended-json.md
index db9d8e28556..646440c0f94 100644
--- a/docs/reference/content/bson/extended-json.md
+++ b/docs/reference/content/bson/extended-json.md
@@ -7,23 +7,29 @@ title = "Extended JSON"
   pre = "<i class='fa'></i>"
 +++
 
-## MongoDB Extended JSON
-
-As discussed earlier, the Java driver supports reading and writing BSON documents represented as  
-[MongoDB Extended JSON](http://docs.mongodb.org/manual/reference/mongodb-extended-json/).  Both variants are supported: 
-
-- Strict Mode: representations of BSON types that conform to the [JSON RFC](http://www.json.org/). This is the 
-format that [mongoexport](http://docs.mongodb.org/manual/reference/program/mongoexport/) produces and 
-[mongoimport](http://docs.mongodb.org/manual/reference/program/mongoimport/) consumes.
+## JSON
+
+As discussed earlier, the Java driver supports reading and writing BSON documents represented as JSON values. The driver supports four 
+standard variants:   
+
+- Extended Mode: Canonical representation that avoids any loss of BSON type information. See the 
+[Extended JSON specification](https://github.com/mongodb/specifications/blob/master/source/extended-json.rst) for a description of this 
+mode.
+- Relaxed Mode:  Relaxed representation that loses type information for BSON numeric types and uses a more human-readable representation
+of BSON dates. See the 
+[Extended JSON specification](https://github.com/mongodb/specifications/blob/master/source/extended-json.rst) for a description of this 
+mode.
 - Shell Mode: a superset of JSON that the 
 [MongoDB shell](http://docs.mongodb.org/manual/tutorial/getting-started-with-the-mongo-shell/) can parse. 
+- Strict Mode: Legacy representation.  Though now deprecated, this is still the default mode when writing JSON in order to avoid breaking
+backwards compatibility.  This may change in a future major release of the driver.
 
-Furthermore, the `Document` class provides two sets of convenience methods for this purpose:
+Furthermore, the `Document`, `BsonDocument`, and `BasicDBObject` classes each provide two sets of convenience methods for this purpose:
 
-- toJson(): a set of overloaded methods that convert a `Document` instance to a JSON string
-- parse(): a set of overloaded static factory methods that convert a JSON string to a `Document` instance
+- toJson(): a set of overloaded methods that convert an instance to a JSON string
+- parse(): a set of overloaded static factory methods that convert a JSON string to an instance of the class
  
-## Writing JSON
+### Writing JSON
 
 Consider the task of implementing a [mongoexport](http://docs.mongodb.org/manual/reference/program/mongoexport/)-like tool using the 
 Java driver.  
@@ -35,12 +41,15 @@ MongoCollection<Document> collection;  // initialize to the collection from whic
 BufferedWriter writer = new BufferedWriter(new FileWriter(outputFilename));
 
 try {
+    JsonWriterSettings settings = JsonWriterSettings.builder().outputMode(JsonMode.EXTENDED).build();
     for (Document doc : collection.find()) {
-        writer.write(doc.toJson());
+        writer.write(doc.toJson(settings));
         writer.newLine();
-} finally {
-   writer.close();
+    } finally{
+        writer.close();
+    }
 }
+
 ```
 
 The `Document.toJson()` method constructs an instance of a `JsonWriter` with its default settings, which will write in strict mode with 
@@ -63,7 +72,26 @@ This code snippet will print out MongoDB shell-compatible JSON, which can then b
 { "startDate" : { "$gt" : ISODate("2014-01-01T05:00:00.000Z"), "$lt" : ISODate("2015-01-01T05:00:00.000Z") } }
 ```
 
-## Reading JSON
+#### Customizing the output
+
+Often applications have specific requirements on the structure of JSON that is generated from documents stored in MongoDB, where none of
+the modes described above will suffice.   For those situations a `JsonWriterSettings` instance can be customized with an application-provided 
+[`Converter`]({{< apiref "org/bson/json/Converter" >}}) for each BSON type.
+  
+Consider a situation where an application wants to output the hex string representation of an ObjectId as a simple JSON string.  Simply 
+register a custom `Converter` with `JsonWriterSettings` for the ObjectId type:
+
+```java
+        JsonWriterSettings settings = JsonWriterSettings.builder()
+                                              .outputMode(JsonMode.RELAXED)
+                                              .objectIdConverter((value, writer) -> writer.writeString(value.toHexString()))
+                                              .build();
+```
+
+A `JsonWriter` configured with these settings will use the given `JsonMode` as the default for all BSON types, but override the mode
+with any registered converters.
+
+### Reading JSON
 
 Consider the task of implementing a [mongoimport](http://docs.mongodb.org/manual/reference/program/mongoimport/)-like tool using the 
 Java driver.  
@@ -86,9 +114,7 @@ try {
 ```
 
 The `Document.parse()` static factory method constructs an instance of a `JsonReader` with the given string and returns an instance of an
-equivalent Document instance. `JsonReader` automatically detects the JSON flavor in the string, so you do not need to specify it. 
-
- 
+equivalent Document. `JsonReader` automatically detects the JSON flavor in the string, so you do not need to specify it.
 
 
 
diff --git a/docs/reference/content/bson/index.md b/docs/reference/content/bson/index.md
index 73ca1fac34b..0398e0c7e30 100644
--- a/docs/reference/content/bson/index.md
+++ b/docs/reference/content/bson/index.md
@@ -15,6 +15,7 @@ The BSON library comprehensively supports [BSON](http://www.bsonspec.org), the d
 - [Documents]({{< relref "documents.md" >}}): Documentation of the driver's support for BSON document representations
 - [Readers and Writers]({{< relref "readers-and-writers.md" >}}): Documentation of the driver's support for stream-based reading and writing
  of BSON documents
+- [JSON]({{< relref "extended-json.md" >}}): Documentation of the driver's support for JSON
 - [Codec and CodecRegistry]({{< relref "codecs.md" >}}): Documentation of the driver's `Codec` API, an abstraction for producing and 
 consuming  BSON document representations using the stream-based readers and writers
-- [Extended JSON]({{< relref "extended-json.md" >}}): Documentation of the driver's support for MongoDB Extended JSON
+- [POJOs]({{< relref "pojos.md" >}}): Documentation of the driver's POJO support. 
diff --git a/docs/reference/content/bson/installation-guide.md b/docs/reference/content/bson/installation-guide.md
index c6445a3024c..c07b6397790 100644
--- a/docs/reference/content/bson/installation-guide.md
+++ b/docs/reference/content/bson/installation-guide.md
@@ -22,4 +22,4 @@ This library comprehensively supports [BSON](http://www.bsonspec.org),
 the data storage and network transfer format that MongoDB uses for "documents".
 BSON is short for Binary [JSON](http://json.org/), is a binary-encoded serialization of JSON-like documents.
 
-{{< install artifactId="bson" version="3.3.0" >}}
+{{< install artifactId="bson" version="3.12.0" >}}
diff --git a/docs/reference/content/bson/pojos.md b/docs/reference/content/bson/pojos.md
new file mode 100644
index 00000000000..89436b5c38d
--- /dev/null
+++ b/docs/reference/content/bson/pojos.md
@@ -0,0 +1,480 @@
++++
+date = "2017-04-10T14:27:51-04:00"
+title = "POJOs"
+[menu.main]
+  parent = "BSON"
+  weight = 45
+  pre = "<i class='fa fa-star'></i>"
++++
+
+## POJOs - Plain Old Java Objects
+
+The 3.5 release of the driver adds POJO support via the [`PojoCodecProvider`]({{<apiref "org/bson/codecs/pojo/PojoCodecProvider.html">}}), 
+which allows for direct serialization of POJOs and Java Beans to and from BSON. Internally, the `Codec` for each POJO utilizes a
+[`ClassModel`]({{<apiref "org/bson/codecs/pojo/ClassModel.html">}}) instance to store metadata about how the POJO should be serialized.
+
+A `ClassModel` for a POJO includes:
+
+  * The class of the POJO.
+  * A new instance factory. Handling the creation of new instances of the POJO. By default it requires the POJO to have an empty constructor.
+  * Property information, a list of [`PropertyModel`]({{<apiref "org/bson/codecs/pojo/PropertyModel.html">}}) instances that contain all the 
+    property metadata. By default this includes; any public getter methods with any corresponding setter methods and any public fields.
+  * An optional IdProperty (see `BsonId` annotation). By default the `_id` or `id` property in the POJO.
+  * Type data for the POJO and its fields to work around type erasure.
+  * An optional discriminator value. The discriminator is the value used to represent the POJO class being stored.
+  * An optional discriminator key. The document key name for the discriminator.
+  * The use discriminator flag. This determines if the discriminator should be serialized. By default it is off.
+  * An optional IdGenerator used to generate the `id` value, when inserting the POJO. (New in 3.10)
+  
+Each `PropertyModel` includes:
+
+  * The property name.
+  * The read name, the name of the property to use as the key when serializing into BSON.
+  * The write name, the name of the property to use as the key when deserializing from BSON.
+  * Type data, to work around type erasure.
+  * An optional `Codec` for the property. The codec allows for fine grained control over how the property is encoded and decoded.
+  * A serialization checker. This checks if the value should be serialized. By default, `null` values are not serialized.
+  * A property accessor. Used to access the property values from the POJO instance.
+  * Use discriminator flag, only used when serializing other POJOs. By default it is off. When on the `PojoCodecProvider` copies the 
+    `ClassModel` for the field's type and turns on the use discriminator flag. The corresponding `ClassModel` must be configured with a 
+    discriminator key and value.
+
+ClassModels are built using the [`ClassModelBuilder`]({{<apiref "org/bson/codecs/pojo/ClassModelBuilder.html">}}) which can be accessed via
+ the [`ClassModel.builder(clazz)`]({{<apiref "org/bson/codecs/pojo/ClassModel.html#builder(java.lang.Class)">}}) method. The builder 
+ initially uses reflection to create the required metadata.
+
+POJO `Codec` instances are created by the [`PojoCodecProvider`]({{<apiref "org/bson/codecs/pojo/PojoCodecProvider.html">}}) which is a
+`CodecProvider`. CodecProviders are used by the `CodecRegistry` to find the correct `Codec` for any given class.
+
+{{% note class="important" %}}
+By default all POJOs **must** include a public or protected, empty, no arguments, constructor. The 
+[`BsonCreator`]({{<apiref "org/bson/codecs/pojo/annotations/BsonCreator.html">}}) annotation can be used to support constructors or 
+public static methods to create new instances of a POJO.
+
+All properties in a POJO must have a [`Codec`]({{< relref "codecs.md" >}}) registered in the `CodecRegistry` so that their values can be 
+encoded and decoded.
+{{% /note %}}
+
+## POJO support
+
+Automatic POJO support can be provided by setting `PojoCodecProvider.Builder#automatic(true)`, once built the `PojoCodecProvider` will 
+automatically create a POJO `Codec` for any class that contains at least one serializable or deserializable property.
+
+The entry point for customisable POJO support is the `PojoCodecProvider`. New instances can be created via the
+[`PojoCodecProvider.builder()`]({{<apiref "org/bson/codecs/pojo/PojoCodecProvider.html#builder">}}) method. The `builder` allows users to 
+register any combination of:
+
+  * Individual POJO classes.
+  * Package names containing POJO classes.
+  * `ClassModel` instances which allow fine grained control over how a POJO is encoded and decoded.
+  
+The `builder` also allows the user to register default [Conventions](#conventions) for any POJOs that are automatically mapped, either 
+the individual POJO classes or POJOs found from registered packages. The `PojoCodecProvider` will lookup POJO `Codec` instances and return 
+the first that matches the POJO class:
+  
+  * Registered ClassModels
+  * Registered POJO classes
+  * Registered POJO classes contained in one of the registered packages
+
+Once the `PojoCodecProvider` has been built, by calling `builder.build()`, it can be combined with an existing `CodecRegistry` to create a 
+new registry that will also support the registered POJOs. The following example registers the package `org.example.pojos` and creates a new 
+`CodecRegistry`.
+
+```java
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static com.mongodb.MongoClientSettings.getDefaultCodecRegistry;
+
+// Create a CodecRegistry containing the PojoCodecProvider instance.
+CodecProvider pojoCodecProvider = PojoCodecProvider.builder().register("org.example.pojos").build();
+CodecRegistry pojoCodecRegistry = fromRegistries(getDefaultCodecRegistry(), fromProviders(pojoCodecProvider));
+```
+
+{{% note class="tip" %}}
+In general only one instance of a `PojoCodecProvider` should be created. 
+
+This is because each `PojoCodecProvider` instance contains a look up table for discriminator names. If multiple `PojoCodecProvider`s are 
+used, care should be taken to ensure that each provider contains a holistic view of POJO classes, otherwise discriminator lookups can fail. 
+Alternatively, using the full class name as the discriminator value will ensure successful POJO lookups. 
+{{% /note %}}
+
+## Default configuration
+
+By default the POJO `Codec` will not store `null` values or a discriminator when converting a POJO to BSON. 
+
+Take the following `Person` class:
+
+```java
+public class Person {
+    private String firstName;
+    private String lastName;
+    private Address address = null;
+ 
+    public Person() { }
+    
+    public Person(final String firstName, final String lastName) {  /* Set values... */ }
+
+    public String getFirstName() {
+        return firstName;
+    }
+    
+    public void setFirstName(final String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+    
+    public void setLastName(final String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+    
+    public void setAddress(final Address address) {
+        this.address = address;
+    }
+    
+}
+```
+
+The instance of `new Person("Ada", "Lovelace");` would be serialized to the equivalent of `{ firstName: "Ada", lastName: "Lovelace"}`. 
+
+Notice the `address` property is omitted because it hasn't been set and has a `null` value. If the person instance contained an address, it 
+would be stored as a sub document and use the `CodecRegistry` to look up the `Codec` for the `Address` class and use that to 
+encode and decode the address value.
+
+{{% note class="note" %}}
+#### POJO Properties
+
+Properties are identified by **public** getter methods, **public** setter methods and **public** fields. 
+
+Any properties with an underlying field that is transient or static will be ignored and not serialized or deserialized.
+
+**Serializing to BSON**
+
+If a public getter methods exists, it is used to obtain the value for the property, otherwise the field is used directly.
+
+**Deserializing from BSON**
+
+If a public setter method exists it is used to set the value, otherwise the field is set directly.
+
+{{% /note %}}
+
+### Generics support
+
+Generics are fully supported. During the creation of a `ClassModelBuilder` type parameters are inspected and saved to work around type 
+erasure. The only requirement is the top level POJO **cannot** contain any type parameters. 
+
+Take the following classes:
+
+```java
+public class GenericClass<T> {
+    T genericField;
+    // Rest of implementation
+}
+
+public class GenericTree<A, B> {
+    GenericTree<A, B> left;
+    GenericTree<A, B> right;
+    // Rest of implementation
+}
+
+public final class Tree extends GenericTree<Integer, String> {
+    GenericClass<Long> genericClass;
+    // Rest of implementation
+}
+```
+
+The `Tree` POJO is serializable because it doesn't have any unknown type parameters. The `left`, `right` and `genericClass` properties are 
+all serializable because they are bound to the concrete types `Integer`, `String` and `Long`. 
+
+On their own, instances of `GenericTree` or `GenericClass` are not serializable by the POJO `Codec`. This is because the runtime type 
+parameter information is erased by the JVM, and the type parameters cannot be specialized accurately.
+
+The 3.6 release of the driver further improves generic support with the addition of PropertyCodecProviders. The `PropertyCodecProvider` API 
+allows type-safe support of container types by providing concrete type parameters for the generic types as declared in the POJO.
+
+A great use of the `PropertyCodecProvider` API could be to add support for Guava's `Optional` class. The following example creates a 
+`OptionalPropertyCodecProvider`:
+
+```java
+public class OptionalPropertyCodecProvider implements PropertyCodecProvider {
+
+    @Override
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public <T> Codec<T> get(final TypeWithTypeParameters<T> type, final PropertyCodecRegistry registry) {
+        // Check the main type and number of generic parameters
+        if (Optional.class.isAssignableFrom(type.getType()) && type.getTypeParameters().size() == 1) {
+            // Get the codec for the concrete type of the Optional, as its declared in the POJO.
+            Codec<?> valueCodec = registry.get(type.getTypeParameters().get(0));
+            return new OptionalCodec(type.getType(), valueCodec);
+        } else {
+            return null;
+        }
+    }
+
+    private static final class OptionalCodec<T> implements Codec<Optional<T>> {
+        private final Class<Optional<T>> encoderClass;
+        private final Codec<T> codec;
+
+        private OptionalCodec(final Class<Optional<T>> encoderClass, final Codec<T> codec) {
+            this.encoderClass = encoderClass;
+            this.codec = codec;
+        }
+
+        @Override
+        public void encode(final BsonWriter writer, final Optional<T> optionalValue, final EncoderContext encoderContext) {
+            if (optionalValue != null && optionalValue.isPresent()) {
+                codec.encode(writer, optionalValue.get(), encoderContext);
+            } else {
+                writer.writeNull();
+            }
+        }
+
+        @Override
+        public Optional<T> decode(final BsonReader reader, final DecoderContext context) {
+            return Optional.of(codec.decode(reader, context));
+        }
+
+        @Override
+        public Class<Optional<T>> getEncoderClass() {
+            return encoderClass;
+        }
+    }
+}
+```
+
+The `OptionalPropertyCodecProvider` can be registered via the `PojoCodecProvider.builder().register` method: 
+
+```java
+CodecProvider pojoCodecProvider = PojoCodecProvider.builder()
+        .register("org.example.pojos")
+        .register(new OptionalPropertyCodecProvider())
+        .build();
+```
+
+Then `Optional` classes are fully supported in the POJOs. In the following example a `Person` has an `Optional` address and an `Optional`
+membership id:
+
+```java
+public class Person {
+    ... 
+    private Optional<Address> optionalAddress;
+    private Optional<Integer>  optionalMembershipId;
+}
+```
+
+### Enum support
+
+Enums are fully supported. The POJO `Codec` uses the name of the enum constant as the property value. This is then converted back into an
+Enum value by the codec using the static `Enum.valueOf` method.
+
+Take the following example:
+
+```Java
+
+public enum Membership {
+    UNREGISTERED,
+    SUBSCRIBER,
+    PREMIUM
+}
+
+public class Person {
+    private String firstName;
+    private String lastName;
+    private Membership membership = Membership.UNREGISTERED;
+
+    public Person() { }
+
+    public Person(final String firstName, final String lastName, final Membership membership) { }
+
+    // Rest of implementation
+}
+```
+
+The instance of `new Person("Bryan", "May", SUBSCRIBER);` would be serialized to the equivalent of 
+`{ firstName: "Bryan", lastName: "May", membership: "SUBSCRIBER"}`. 
+
+If you require an alternative representation of the Enum, you can override how a Enum is stored by registering a custom `Codec` for the 
+Enum in the `CodecRegistry`.
+
+### Conventions
+
+The [`Convention`]({{<apiref "org/bson/codecs/pojo/Convention.html">}}) interface provides a mechanism for `ClassModelBuilder`
+instances to be configured during the build stage and the creation of the `ClassModel`.
+
+The following Conventions are available from the [`Conventions`]({{<apiref "org/bson/codecs/pojo/Conventions.html">}}) class:
+
+  * The [`ANNOTATION_CONVENTION`]({{<apiref "org/bson/codecs/pojo/Conventions.html#ANNOTATION_CONVENTION">}}). Applies all the 
+    default annotations.
+  * The [`CLASS_AND_PROPERTY_CONVENTION`]({{<apiref "org/bson/codecs/pojo/Conventions.html#CLASS_AND_PROPERTY_CONVENTION">}}). Sets the 
+        discriminator key if not set to `_t` and the discriminator value if not set to the ClassModels simple type name. Also, configures 
+        the PropertyModels. If the `idProperty` isn't set and there is a property named `_id` or `id` then it will be marked as the `idProperty`.
+  * The [`SET_PRIVATE_FIELDS_CONVENTION`]({{<apiref "org/bson/codecs/pojo/Conventions.html#SET_PRIVATE_FIELDS_CONVENTION">}}).  Enables 
+        private fields to be set directly using reflection, without the need of a setter method. Note this convention is not enabled by default.
+  * The [`USE_GETTERS_FOR_SETTERS`]({{<apiref "org/bson/codecs/pojo/Conventions.html#USE_GETTERS_FOR_SETTERS">}}) convention. Allows getters to be used
+        for Map and Collection properties without setters, the collection/map is then mutated. Note this convention is not enabled by default.
+  * The [`OBJECT_ID_GENERATORS`]({{<apiref "org/bson/codecs/pojo/Conventions.html#OBJECT_ID_GENERATORS">}}) convention. Adds an `IdGenerator` that
+        generates new `ObjectId` for ClassModels that have an `ObjectId` value for the `id` property.
+  * The [`DEFAULT_CONVENTIONS`]({{<apiref "org/bson/codecs/pojo/Conventions.html#DEFAULT_CONVENTIONS">}}), a list containing the 
+    `ANNOTATION_CONVENTION`, the `CLASS_AND_PROPERTY_CONVENTION` and the `OBJECT_ID_GENERATORS` convention.
+  * The [`NO_CONVENTIONS`]({{<apiref "org/bson/codecs/pojo/Conventions.html#NO_CONVENTIONS">}}) an empty list.
+
+Custom Conventions can either be set globally via the 
+[`PojoCodecProvider.Builder.conventions(conventions)`]({{<apiref "org/bson/codecs/pojo/PojoCodecProvider.Builder.html#conventions(java.util.List)">}}) 
+method, or via the [`ClassModelBuilder.conventions(conventions)`]({{<apiref "org/bson/codecs/pojo/ClassModelBuilder.html#conventions(java.util.List)">}}) 
+method.
+
+{{% note class="note" %}}
+Conventions are applied in order during the build stage when creating a `ClassModel`. 
+
+Each `Convention` can mutate the underlying `ClassModelBuilder`, so care should be taken that Conventions do not conflict with each other 
+in their intent. 
+{{% /note %}}
+
+
+### Annotations
+
+Annotations require the `ANNOTATION_CONVENTION` and provide an easy way to configure how POJOs are serialized. 
+
+The following annotations are available from the 
+[`org.bson.codecs.pojo.annotations`]({{<apiref "org/bson/codecs/pojo/annotations/package-summary.html">}}) package:
+
+  * [`BsonCreator`]({{<apiref "org/bson/codecs/pojo/annotations/BsonCreator.html">}}), marks a public constructor or a public static method as
+    the creator for new instances of the class. Can be combined with the `BsonProperty` annotation to link the parameters with properties.
+  * [`BsonDiscriminator`]({{<apiref "org/bson/codecs/pojo/annotations/BsonDiscriminator.html">}}), enables using a discriminator. 
+    Also allows for setting a custom discriminator key and value.
+  * [`BsonId`]({{<apiref "org/bson/codecs/pojo/annotations/BsonId.html">}}), marks a property to be serialized as the `_id` property.
+  * [`BsonIgnore`]({{<apiref "org/bson/codecs/pojo/annotations/BsonIgnore.html">}}), marks a property to be ignored. Can be used to 
+    configure if a property is serialized and / or deserialized.
+  * [`BsonProperty`]({{<apiref "org/bson/codecs/pojo/annotations/BsonProperty.html">}}). Allows for an alternative document key 
+    name when converting the POJO field to BSON. Also, allows a field to turn on using a discriminator when storing a POJO value.
+
+Annotations can be applied to read and / or write contexts by configuring the getter / setter methods. Any annotations applied to a field 
+are applied to both read and write contexts.
+
+Take the following `Person` class:
+
+```java
+import org.bson.codecs.pojo.annotations.*;
+
+@BsonDiscriminator
+public final class Person {
+
+    @BsonId
+    public String personId;
+    public String firstName;
+
+    @BsonProperty("surname")
+    public String lastName;
+
+    @BsonIgnore
+    public String password;
+
+    @BsonProperty(useDiscriminator = true)
+    public Address addr;
+
+    public Person(){
+    }
+
+}
+```
+
+The `Person` POJO Will produce BSON similar to:
+
+```json
+{ "_id": "1234567890", "_t": "Person", "firstName": "Alan", "surname": "Turing",
+  "address": { "_t": "Address", "address": "The Mansion", "street": "Sherwood Drive", 
+               "town": "Bletchley", "postcode": "MK3 6EB" } }
+```
+
+The getter methods are used to configure the document keys used when storing the data in MongoDB. The `_id` document key maps to the POJO's 
+`personId` property. The `_t` field contains the discriminator and the `address` field also contains a discriminator.
+
+
+## Advanced configuration
+
+For most scenarios there is no need for further configuration. However, there are some scenarios where custom configuration is required.
+
+### Properties with abstract or interface types.
+
+If a POJO contains a field that has an abstract type or has an interface as its type, then a discriminator is required. The type and all 
+subtypes / implementations need to be registered with the `PojoCodecProvider` so that values can be encoded and decoded correctly.
+
+The easiest way to enable a discriminator is to annotate the abstract class with the `Discriminator` annotation. Alternatively, the 
+[`ClassModelBuilder.enableDiscriminator(true)`]({{<apiref "org/bson/codecs/pojo/ClassModelBuilder.html#enableDiscriminator(boolean)">}}) 
+method can be used to enable the use of a discriminator. 
+
+The following example creates a `CodecRegistry` with discriminators enabled for a `User` interface and its concrete `FreeUser` and 
+`SubscriberUser` implementations:
+
+```java
+ClassModel<User> userModel = ClassModel.builder(User.class).enableDiscriminator(true).build();
+ClassModel<FreeUser> freeUserModel = ClassModel.builder(FreeUser.class).enableDiscriminator(true).build();
+ClassModel<SubscriberUser> subscriberUserModel = ClassModel.builder(SubscriberUser.class).enableDiscriminator(true).build();
+
+PojoCodecProvider pojoCodecProvider = PojoCodecProvider.builder().register(userModel, freeUserModel, subscriberUserModel).build();
+
+CodecRegistry pojoCodecRegistry = fromRegistries(getDefaultCodecRegistry(), fromProviders(pojoCodecProvider));
+```
+
+### Supporting POJOs without no args constructors
+
+By default a POJO `Codec` works with POJOs that have an empty, no arguments, constructor. POJOs with alternative constructors are supported 
+via the `ANNOTATION_CONVENTION` and the `@BsonCreator` annotation. Any parameters for the creator constructor should be annotated with the 
+`@BsonProperty` annotation. Below is an example of a `Person` POJO that contains final fields that are set via the annotated constructor:
+
+```java
+import org.bson.codecs.pojo.annotations.*;
+
+@BsonDiscriminator
+public final class Person {
+    private final String pid;
+    private final String fName;
+    private final String lName;
+    
+    @BsonProperty(useDiscriminator = true)
+    private final Address addr;
+    
+    @BsonCreator
+    public Person(@BsonProperty("personId") final String personId, @BsonProperty("firstName") final String firstName,
+                  @BsonProperty("lastName") final String lastName, @BsonProperty("address") final Address address) {
+        this.pid = personId;
+        this.fName = firstName;
+        this.lName = lastName;
+        this.addr = address;
+    }
+
+    @BsonId
+    public String getPersonId() {
+        return pid;
+    }
+
+    public String getFirstName() {
+        return fName;
+    }
+
+    public String getLastName() {
+        return lName;
+    }
+
+    public String getAddress() {
+        return addr;
+    }
+}
+```
+
+### Changing what is serialized
+
+By default `null` values aren't serialized. This is controlled by the default implementation of the 
+[`FieldSerialization`]({{<apiref "org/bson/codecs/pojo/FieldSerialization.html">}}) interface. Custom implementations can be set on 
+the `PropertyModelBuilder` which is available from the `ClassModelBuilder`.
+
+The [`BsonIgnore`]({{<apiref "org/bson/codecs/pojo/annotations/BsonIgnore.html">}}) can be used along with the `DEFAULT_CONVENTIONS` to mark
+a property to be ignored when serializing and or deserializing.
diff --git a/docs/reference/content/bson/readers-and-writers.md b/docs/reference/content/bson/readers-and-writers.md
index b17fe7ab2bc..80ce6c2530b 100644
--- a/docs/reference/content/bson/readers-and-writers.md
+++ b/docs/reference/content/bson/readers-and-writers.md
@@ -12,7 +12,7 @@ title = "Readers and Writers"
 The various implementations of the `Bson` interface discussed in the previous section all represent BSON documents using an underlying 
 Java `Map` instance. However, they are not directly responsible for reading and writing their representations from and to BSON.  Instead, 
 this process is delegated to [`BsonWriter`]({{< apiref "org/bson/BsonWriter" >}}) and 
-[`BsonReader`]({{< apiref "org/bson/BsonReader" >}}), abstract classes that expose methods for iterative, stream-based processing of 
+[`BsonReader`]({{< apiref "org/bson/BsonReader" >}}), interfaces that expose methods for iterative, stream-based processing of 
 BSON documents. 
   
 ### BsonWriter
@@ -54,7 +54,7 @@ The two most important classes to extend `BsonWriter` are [`BsonBinaryWriter`]({
 [`JsonWriter`]({{< apiref "org/bson/json/JsonWriter" >}}).  `BsonBinaryWriter` writes the BSON 
 document as a stream of bytes in accordance with the [BSON](http://www.bsonspec.org) specification, while `JsonWriter` writes the BSON 
 document as a stream of characters in accordance with 
-[MongoDB Extended JSON](http://docs.mongodb.org/manual/reference/mongodb-extended-json/).
+[MongoDB Extended JSON](https://github.com/mongodb/specifications/blob/master/source/extended-json.rst).
  
 ### BsonReader
 
@@ -134,4 +134,4 @@ The two most important classes to extend `BsonReader` are [`BsonBinaryReader`]({
 [`JsonReader`]({{< apiref "org/bson/json/JsonReader" >}}). `BsonBinaryReader` reads the BSON 
 document as a stream of bytes in accordance with the [BSON](http://www.bsonspec.org) specification, while `JsonReader` reads the BSON 
 document as a stream of characters in accordance with 
-[MongoDB Extended JSON](http://docs.mongodb.org/manual/reference/mongodb-extended-json/).                              
+[MongoDB Extended JSON](https://github.com/mongodb/specifications/blob/master/source/extended-json.rst).                              
diff --git a/docs/reference/content/builders/aggregation.md b/docs/reference/content/builders/aggregation.md
index cb92bb8b789..94fded28aa4 100644
--- a/docs/reference/content/builders/aggregation.md
+++ b/docs/reference/content/builders/aggregation.md
@@ -1,48 +1,49 @@
 +++
 date = "2015-03-19T14:27:51-04:00"
-title = "Aggregation"
+title = "Aggregates"
 [menu.main]
   parent = "Builders"
+  identifier = "Aggregates"
   weight = 40
   pre = "<i class='fa'></i>"
 +++
 
-## Aggregation
+## Aggregates
 
-The [`Aggregates`]({{< apiref "com/mongodb/client/model/Aggregates" >}}) class provides static factory methods that build [aggregation 
-pipeline operators]({{< docsref "reference/operator/aggregation/" >}}).  Each method returns an instance of the 
+The [`Aggregates`]({{< apiref "com/mongodb/client/model/Aggregates" >}}) class provides static factory methods that build [aggregation
+pipeline operators]({{< docsref "reference/operator/aggregation/" >}}).  Each method returns an instance of the
 [`Bson`]({{< relref "bson/documents.md#bson" >}}) type, which can in turn be passed to the `aggregate` method of `MongoCollection`.
 
 For brevity, you may choose to import the methods of the `Aggregates` class statically:
 
 ```java
-import com.mongodb.client.model.Aggregates.*;
+import static com.mongodb.client.model.Aggregates.*;
 ```
-  
+
 All the examples below assume this static import.
-  
+
 ### Match
-  
-The [`$match`]({{< docsref "reference/operator/aggregation/match/" >}}) pipeline stage passes all documents matching the 
-specified filter to the next stage.  Though the filter can be an instance of any class that implements `Bson`, it's convenient to 
-combine with use of the [`Filters`]({{< apiref "com/mongodb/client/model/Filters" >}}) class.  In the example below, it's assumed that the 
+
+The [`$match`]({{< docsref "reference/operator/aggregation/match/" >}}) pipeline stage passes all documents matching the
+specified filter to the next stage.  Though the filter can be an instance of any class that implements `Bson`, it's convenient to
+combine with use of the [`Filters`]({{< apiref "com/mongodb/client/model/Filters" >}}) class.  In the example below, it's assumed that the
 `eq` method of the `Filters` class has been statically imported.
-  
+
 This example creates a pipeline stage that matches all documents where the `author` field is equal to `"Dave"`:
- 
+
 ```java
 match(eq("author", "Dave"))
 ```
 
 ### Project
-  
-The [`$project`]({{< docsref "reference/operator/aggregation/project/" >}}) pipeline stage passes the projected fields of all 
-documents to the next stage.  Though the projection can be an instance of any class that implements `Bson`, it's convenient to combine 
-with use of the [`Projections`]({{< apiref "com/mongodb/client/model/Projections" >}}) class.  In the example below, it's assumed that the 
-`include`, `excludeId`, and `fields` methods of the `Projections` class have been statically imported. 
-  
+
+The [`$project`]({{< docsref "reference/operator/aggregation/project/" >}}) pipeline stage passes the projected fields of all
+documents to the next stage.  Though the projection can be an instance of any class that implements `Bson`, it's convenient to combine
+with use of the [`Projections`]({{< apiref "com/mongodb/client/model/Projections" >}}) class.  In the example below, it's assumed that the
+`include`, `excludeId`, and `fields` methods of the `Projections` class have been statically imported.
+
 This example creates a pipeline stage that excludes the `_id` field but includes the `title` and `author` fields:
- 
+
 ```java
 project(fields(include("title", "author"), excludeId()))
 ```
@@ -52,7 +53,7 @@ project(fields(include("title", "author"), excludeId()))
 The `$project` stage can project computed fields as well.
 
 This example simply projects the `qty` field into a new field called `quantity`.  In other words, it renames the field:
- 
+
 ```java
 project(computed("quantity", "$qty"))
 ```
@@ -66,22 +67,22 @@ sample(5)
 ```
 
 ### Sort
-  
-The [`$sort`]({{< docsref "reference/operator/aggregation/sort/" >}}) pipeline stage passes all documents to the next stage, 
-sorted by the specified sort criteria. Though the sort criteria can be an instance of any class that implements `Bson`, it's convenient to 
-combine with use of the [`Sorts`]({{< apiref "com/mongodb/client/model/Sorts" >}}) class.  In the example below, it's assumed that the 
+
+The [`$sort`]({{< docsref "reference/operator/aggregation/sort/" >}}) pipeline stage passes all documents to the next stage,
+sorted by the specified sort criteria. Though the sort criteria can be an instance of any class that implements `Bson`, it's convenient to
+combine with use of the [`Sorts`]({{< apiref "com/mongodb/client/model/Sorts" >}}) class.  In the example below, it's assumed that the
 `descending`, `ascending`, and `orderBy` methods of the `Sorts` class have been statically imported.
-  
-This example creates a pipeline stage that sorts in descending order according to the value of the `age` field and then in ascending order 
+
+This example creates a pipeline stage that sorts in descending order according to the value of the `age` field and then in ascending order
 according to the value of the `posts` field:
- 
+
 ```java
 sort(orderBy(descending("age"), ascending("posts")))
 ```
 
 ### Skip
 
-The [`$skip`]({{< docsref "reference/operator/aggregation/skip/" >}}) pipeline stage skips over the specified number of 
+The [`$skip`]({{< docsref "reference/operator/aggregation/skip/" >}}) pipeline stage skips over the specified number of
 documents that pass into the stage and passes the remaining documents to the next stage.
 
 This example skips the first `5` documents:
@@ -94,7 +95,7 @@ skip(5)
 
 The [`$limit`]({{< docsref "reference/operator/aggregation/limit/" >}}) pipeline stage limits the number of documents passed
 to the next stage.
-  
+
 This example limits the number of documents to `10`:
 
 ```java
@@ -103,29 +104,78 @@ limit(10)
 
 ### Lookup
 
-Starting in 3.2, MongoDB provides a new [`$lookup`]({{< docsref "reference/operator/aggregation/lookup/" >}}) pipeline stage 
+Starting in 3.2, MongoDB provides a new [`$lookup`]({{< docsref "reference/operator/aggregation/lookup/" >}}) pipeline stage
 that performs a left outer join with another collection to filter in documents from the joined collection for processing.
 
-This example performs a left outer join on the `fromCollection` collection, joining the `local` field to the `from` field and outputted in 
+This example performs a left outer join on the `fromCollection` collection, joining the `local` field to the `from` field and outputted in
 the `joinedOutput` field:
 
 ```java
 lookup("fromCollection", "local", "from", "joinedOutput")
 ```
 
+Starting in 3.6, the `$lookup` pipeline stage also supports uncorrelated subqueries between two collections as well as allows other join 
+conditions besides a single equality match.
+
+For example, given a collection `orders` with the following documents:
+
+```json
+  { "_id" : 1, "item" : "almonds", "price" : 12, "ordered" : 2 }
+  { "_id" : 2, "item" : "pecans",  "price" : 20, "ordered" : 1 }
+  { "_id" : 3, "item" : "cookies", "price" : 10, "ordered" : 60 }
+```
+
+and another collection `warehouses` with the following documents:
+
+```json
+  { "_id" : 1, "stock_item" : "almonds", "warehouse": "A", "instock" : 120 }
+  { "_id" : 2, "stock_item" : "pecans",  "warehouse": "A", "instock" : 80 }
+  { "_id" : 3, "stock_item" : "almonds", "warehouse": "B", "instock" : 60 }
+  { "_id" : 4, "stock_item" : "cookies", "warehouse": "B", "instock" : 40 }
+  { "_id" : 5, "stock_item" : "cookies", "warehouse": "A", "instock" : 80 }
+```
+
+The following `$lookup` stage, executed in an aggregation against the `orders` collection, joins with the `warehouses` collection by the 
+item and whether the quantity in stock is sufficient to cover the ordered quantity:
+
+```java
+        List<Variable<?>> variables = asList(
+                new Variable<>("order_item", "$item"),
+                new Variable<>("order_qty", "$ordered"));
+
+        List<Bson> pipeline = asList(
+                match(expr(new Document("$and",
+                        asList(new Document("$eq", asList("$stock_item", "$$order_item")),
+                                new Document("$gte", asList("$instock", "$$order_qty")))))),
+                project(fields(exclude("stock_item"), excludeId())));
+
+        lookup("warehouses", variables, pipeline, "stockdata");
+```
+
+The aggregation produces the following documents:
+
+```json
+{ "_id" : 1, "item" : "almonds", "price" : 12, "ordered" : 2,
+   "stockdata" : [ { "warehouse" : "A", "instock" : 120 }, { "warehouse" : "B", "instock" : 60 } ] }
+{ "_id" : 2, "item" : "pecans", "price" : 20, "ordered" : 1,
+   "stockdata" : [ { "warehouse" : "A", "instock" : 80 } ] }
+{ "_id" : 3, "item" : "cookies", "price" : 10, "ordered" : 60,
+   "stockdata" : [ { "warehouse" : "A", "instock" : 80 } ] }
+```
+
 ### Group
 
-The [`$group`]({{< docsref "reference/operator/aggregation/group/" >}}) pipeline stage groups documents by some specified 
-expression and outputs to the next stage a document for each distinct grouping.  A group consists of an `_id` which specifies the 
-expression on which to group, and zero or more 
-[accumulators]({{< docsref "reference/operator/aggregation/group/#accumulator-operator" >}}) which are evaluated for each 
-grouping.  To simplify the expression of accumulators, the driver includes an 
-[`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators" >}}) class with static factory methods for each of the supported 
-accumulators. In the example below, it's assumed that the `sum` and `avg` methods of the `Accumulators` class have been statically 
-imported. 
- 
-This example groups documents by the value of the `customerId` field, and for each group accumulates the sum and average of the values of 
-the `quantity` field into the `totalQuantity` and `averageQuantity` fields, respectively. 
+The [`$group`]({{< docsref "reference/operator/aggregation/group/" >}}) pipeline stage groups documents by some specified
+expression and outputs to the next stage a document for each distinct grouping.  A group consists of an `_id` which specifies the
+expression on which to group, and zero or more
+[accumulators]({{< docsref "reference/operator/aggregation/group/#accumulator-operator" >}}) which are evaluated for each
+grouping.  To simplify the expression of accumulators, the driver includes an
+[`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators" >}}) class with static factory methods for each of the supported
+accumulators. In the example below, it's assumed that the `sum` and `avg` methods of the `Accumulators` class have been statically
+imported.
+
+This example groups documents by the value of the `customerId` field, and for each group accumulates the sum and average of the values of
+the `quantity` field into the `totalQuantity` and `averageQuantity` fields, respectively.
 
 ```java
 group("$customerId", sum("totalQuantity", "$quantity"), avg("averageQuantity", "$quantity"))
@@ -133,7 +183,7 @@ group("$customerId", sum("totalQuantity", "$quantity"), avg("averageQuantity", "
 
 ### Unwind
 
-The [`$unwind`]({{< docsref "reference/operator/aggregation/unwind/" >}}) pipeline stage deconstructs an array field from the 
+The [`$unwind`]({{< docsref "reference/operator/aggregation/unwind/" >}}) pipeline stage deconstructs an array field from the
 input documents to output a document for each element.
 
 This example outputs, for each document, a document for each element in the `sizes` array:
@@ -142,7 +192,7 @@ This example outputs, for each document, a document for each element in the `siz
 unwind("$sizes")
 ```
 
-Available with MongoDB 3.2, this example also includes any documents that have missing or `null` values for the `$sizes` field or where 
+Available with MongoDB 3.2, this example also includes any documents that have missing or `null` values for the `$sizes` field or where
 the `$sizes` list is empty:
 
 ```java
@@ -157,32 +207,233 @@ unwind("$sizes", new UnwindOptions().includeArrayIndex("$position"))
 
 ### Out
 
-The [`$out`]({{< docsref "reference/operator/aggregation/out/" >}}) pipeline stage outputs all documents to the specified 
+The [`$out`]({{< docsref "reference/operator/aggregation/out/" >}}) pipeline stage outputs all documents to the specified
 collection.  It must be the last stage in any aggregate pipeline:
 
 This example writes the pipeline to the `authors` collection:
-     
+
 ```java
 out("authors")
 ```
 
-### Creating a Pipeline
+### Merge
 
-The above pipeline operators are typically combined into a list and passed to the `aggregate` method of a `MongoCollection`.  For instance:
+The [`$merge`]({{< docsref "reference/operator/aggregation/merge/" >}}) pipeline stage merges all documents into the specified
+collection.  It must be the last stage in any aggregate pipeline:
+
+This example merges the pipeline into the `authors` collection using the default options:
 
 ```java
-collection.aggregate(Arrays.asList(match(eq("author", "Dave")),
-                                   group("$customerId", sum("totalQuantity", "$quantity"),
-                                                        avg("averageQuantity", "$quantity"))
-                                   out("authors")));
+merge("authors")
 ```
 
+This example merges the pipeline into the `authors` collection using some non-default options:
+
+```java
+merge(new MongoNamespace("reporting", customers"),
+    new MergeOptions().uniqueIdentifier(Arrays.asList("date", "customerId"))
+                      .whenMatched(MergeOptions.WhenMatched.REPLACE)
+                      .whenNotMatched(MergeOptions.WhenNotMatched.INSERT))
+```
 
 
+### GraphLookup
 
+The [`$graphLookup`]({{< docsref "reference/operator/aggregation/graphLookup/" >}}) pipeline stage performs a recursive search on a specified collection to match field A of one document to some field B of the other documents. For the matching documents, the stage repeats the search to match field A from the matching documents to the field B of the remaining documents until no new documents are encountered or until a specified depth. To each output document, `$graphLookup` adds a new array field that contains the traversal results of the search for that document.
 
+The following example computes the social network graph for users in the `contacts` collection, recursively matching the value in the `friends` field to the `name` field, up to recursive depth of 1.
+
+```java
+graphLookup("contacts", "$friends", "friends", "name", "socialNetwork",
+	new GraphLookupOptions().maxDepth(1))
+```
+
+Using `GraphLookupOptions`, the output can be tailored to restrict the depth of the recursion as well to inject a field containing the depth of the recursion at which a document was included.
+
+The recursive search can be filtered by specifying additional conditions.
+
+```java
+graphLookup("contacts", "$friends", "friends", "name", "socialNetwork",
+	new GraphLookupOptions().maxDepth(1).restrictSearchWithMatch(Filters.eq("hobbies","golf"))
+```
 
 
+### SortByCount
 
+The [`$sortByCount`]({{< docsref "reference/operator/aggregation/sortByCount/" >}}) stage groups documents by a given expression and then sorts these groups by count in descending order. The `sortByCount` outputs documents that contains an `_id` field, which contains the discrete values of the given expression, and the `count` field that contains the number of documents that fall into that group.
+
+The following example groups documents by the truncated value of the field `x` and computes the count for each distinct value of `x`. 
+
+```java
+sortByCount(new Document("$floor", "$x"))
+```
+
+### ReplaceRoot
+
+The [`$replaceRoot`]({{< docsref "reference/operator/aggregation/replaceRoot/" >}}) pipeline stage replaces each input document to the stage with the specified document. All existing fields, including the `_id` field, are replaced. 
+
+If each input document to the `replaceRoot` stage has a field `a1` that contains a field `b` whose value is a document, the following operation replaces each input document with the document in the `b` field.
+
+```java
+replaceRoot("$a1.b")
+```
+
+### AddFields
+
+The [`$addFields`]({{< docsref "reference/operator/aggregation/addFields/" >}}) pipeline stage adds new fields to documents. The stage outputs documents that contain all existing fields from the input documents and the newly added fields.
+
+This example adds two new fields, `myNewField` and `z` to the input documents; `myNewField` has the value `{c: 3, d: 4}`, `z` has the value 5.
+
+```java
+addFields(new Field("myNewField", new Document("c", 3).append("d", 4)),
+	new Field("z", 5))
+```
 
+These new fields do not need be statically defined.  The following example shows how to add a new field which is a function of the current document's values.  In this case, a new field `alt3` is added with a value of `true` if the current value of the field `a` is less than 3.  Otherwise, `alt3` will be `false` in the new field.
 
+```java
+addFields(new Field("alt3", new Document("$lt", asList("$a", 3))))
+```
+
+### Count
+
+The [`$count`]({{< docsref "reference/operator/aggregation/count/" >}}) pipeline stage specifies the name of the field that will contain the number of documents that enter this stage.  The `$count` stage is syntactic sugar for: `{$group:{_id:null, count:{$sum:1}}}`
+
+There are two ways to invoke this stage.  The first way is to explicitly name the resulting field as in the two following examples:
+
+```java
+count("count")
+```
+
+```java
+count("total")
+```
+
+These two invocations will put the count in the `count` and `total` fields respectively.  If `count` is the field name to be used, this can be shortened with the following convenience method:
+
+```java
+count()
+```
+
+This invocation defaults the field name to `count`.
+
+
+### Bucket
+
+The [`$bucket`]({{< docsref "reference/operator/aggregation/bucket/" >}}) pipeline stage automates the bucketing of data around predefined boundary values.
+
+The following example shows a basic `$bucket` stage:
+
+```java
+bucket("$screenSize", [0, 24, 32, 50, 70, 200])
+```
+
+This will result in output that looks like this:
+
+```json
+[_id:0, count:1]
+[_id:24, count:2]
+[_id:32, count:1]
+[_id:50, count:1]
+[_id:70, count:2]
+```
+
+The default output is simply the lower bound as the `_id` and a single field containing the size of that bucket.  This output can be modified using the `BucketOptions` class.  The above example can be expanded to look like this:
+
+```java
+bucket("$screenSize", [0, 24, 32, 50, 70], new BucketOptions()
+                .defaultBucket("monster")
+                .output(sum("count", 1), push("matches", "$screenSize")))
+```
+
+The optional value `defaultBucket` defines the name of the bucket for values that fall outside defined bucket boundaries.  If `defaultBucket` is undefined and values exist outside of the defined bucket boundaries, the stage will produce an error.  The other value is the `output` field which defines the shape of the document output for each bucket.  The output of this stage looks something like this:
+
+```json
+[[_id: 0, count: 1, matches: [22]],
+ [_id: 24, count: 2, matches: [24, 30]],
+ [_id: 32, count: 1, matches: [42]],
+ [_id: 50, count: 1, matches: [55]],
+ [_id: monster, count: 2, matches: [75, 155]]]
+```
+
+This output contains not only the size of the bucket but also the values in the bucket.  Notice the enormous screen sizes are found in the synthetic bucket named `monster` reflecting the outrageously large screen sizes.
+
+### BucketAuto
+
+The [`$bucketAuto`]({{< docsref "reference/operator/aggregation/bucketAuto/" >}}) pipeline stage automatically determines the boundaries of each bucket in its attempt to distribute the documents evenly into a specified number of buckets. Depending on the input documents, the number of buckets may be less than the specified number of buckets.
+
+For example, this stage creates 10 buckets:
+
+```java
+bucketAuto("$price", 10)
+```
+
+This results in output that looks something like this:
+
+```json
+[[_id: [min: 2, max: 30], count: 14],
+ [_id: [min: 30, max: 58], count: 14],
+ [_id: [min: 58, max: 86], count: 14],
+ [_id: [min: 86, max: 114], count: 14],
+ [_id: [min: 114, max: 142], count: 14],
+ [_id: [min: 142, max: 170], count: 14],
+ [_id: [min: 170, max: 198], count: 14],
+ [_id: [min: 198, max: 226], count: 14],
+ [_id: [min: 226, max: 254], count: 14],
+ [_id: [min: 254, max: 274], count: 11]]
+```
+
+Note the uniformity of bucket sizes except for the last bucket.  For a more precise scheme of bucket definition, the `BucketAutoOptions` class exposes the opportunity to use a [preferred number](https://en.wikipedia.org/wiki/Preferred_number) based scheme to determine those boundary values.  As with `BucketOptions`, the output document shape can be defined using the `output` value on `BucketAutoOptions`.  An example of these options is shown below:
+
+```java
+bucketAuto("$price", 10, new BucketAutoOptions()
+            .granularity(BucketGranularity.POWERSOF2)
+            .output(sum("count", 1), avg("avgPrice", "$price")))
+```
+
+### Facet 
+
+The [`$facet`]({{< docsref "reference/operator/aggregation/facet/" >}}) pipeline stage allows for the definition of a faceted search.  The stage is defined with a set of names and nested aggregation pipelines which define each particular facet.  For example, to return to the example of the television screen size search, the following `$facet` will return a document that groups televisions by size and manufacturer:
+
+```java
+facet(
+	new Facet("Screen Sizes",
+		unwind("$attributes"),
+		bucketAuto("$attributes.screen_size", 5, new BucketAutoOptions()
+			.output(sum("count", 1)))),
+	new Facet("Manufacturer",
+		sortByCount("$attributes.manufacturer"),
+		limit(5))
+)
+```
+
+This stage returns a document that looks like this:
+
+```json
+{
+	"Manufacturer": [
+		{"_id": "Vizio", "count": 17},
+		{"_id": "Samsung", "count": 17},
+		{"_id": "Sony", "count": 17}
+	],
+	"Screen Sizes": [
+		{"_id": {"min": 35, "max": 45}, "count": 10},
+		{"_id": {"min": 45, "max": 55}, "count": 10},
+		{"_id": {"min": 55, "max": 65}, "count": 10},
+		{"_id": {"min": 65, "max": 75}, "count": 10},
+		{"_id": {"min": 75, "max": 85}, "count": 11}
+	]
+}
+
+```
+
+### Creating a Pipeline
+
+The above pipeline operators are typically combined into a list and passed to the `aggregate` method of a `MongoCollection`.  For instance:
+
+```java
+collection.aggregate(Arrays.asList(match(eq("author", "Dave")),
+                                   group("$customerId", sum("totalQuantity", "$quantity"),
+                                                        avg("averageQuantity", "$quantity"))
+                                   out("authors")));
+```
diff --git a/docs/reference/content/builders/filters.md b/docs/reference/content/builders/filters.md
index 7e1c06e4ee5..23888578c29 100644
--- a/docs/reference/content/builders/filters.md
+++ b/docs/reference/content/builders/filters.md
@@ -16,7 +16,7 @@ any method that expects a query filter.
 For brevity, you may choose to import the methods of the `Filters` class statically:
 
 ```java
-import com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Filters.*;
 ```
   
 All the examples below assume this static import.
@@ -88,8 +88,16 @@ This example creates a filter that selects all documents where the `price` field
 is equal to `true` or the `qty` field value is less than `20`:
   
 ```java
-and(or(eq("price", 0.99), eq("price", 1.99)
-    or(eq("sale", true), lt("qty", 20)))
+and(
+    or(
+        eq("price", 0.99), 
+        eq("price", 1.99)
+    ),
+    or(
+        eq("sale", true), 
+        lt("qty", 20)
+    )
+)
 ```
 
 This query cannot be constructed using an implicit and operation, because it uses the `$or` operator more than once.  So it will render as:
diff --git a/docs/reference/content/builders/indexes.md b/docs/reference/content/builders/indexes.md
index 1f7d907cd9d..d3e901e248a 100644
--- a/docs/reference/content/builders/indexes.md
+++ b/docs/reference/content/builders/indexes.md
@@ -16,14 +16,14 @@ methods.
 For brevity, you may choose to import the methods of the `Indexes` class statically:
 
 ```java
-import com.mongodb.client.model.Indexes.*;
+import static com.mongodb.client.model.Indexes.*;
 ```
-  
+
 All the examples below assume this static import.
 
 ### Ascending
 
-To specify an ascending index key, use one of the `ascending` methods.
+To specify an ascending index key, use one of the [`ascending`]({{< apiref "com/mongodb/client/model/Indexes" >}}) methods.
 
 This example specifies an ascending index key for the `quantity` field:
 
@@ -35,7 +35,7 @@ This example specifies a compound index key composed of the `quantity` field sor
 sorted in ascending order:
 
 ```java
-ascending("quantity", "totalAmount") 
+ascending("quantity", "totalAmount")
 ```
 
 ### Descending
@@ -53,7 +53,7 @@ sorted in descending order:
 
 
 ```java
-descending("quantity", "totalAmount") 
+descending("quantity", "totalAmount")
 ```
 
 ### Compound indexes
@@ -77,6 +77,12 @@ This example specifies a text index key for the `description` field:
 text("description")
 ```
 
+This example specifies a text index key for every field that contains string data:
+
+```java
+text()
+```
+
 ### Hashed Index
 
 To specify a [hashed]({{< docsref "core/index-hashed" >}}) index key, use the `hashed` method.
@@ -123,8 +129,8 @@ geo2d("points")
 To specify a [geoHaystack]({{< docsref "core/geohaystack/" >}}) index key, use the `geoHaystack` method.
 
 {{% note class="important"%}}
-For queries that use spherical geometry, a 2dsphere index is a better option than a haystack index. 2dsphere indexes allow field reordering; 
-geoHaystack indexes require the first field to be the location field. Also, geoHaystack indexes are only usable via commands and so always 
+For queries that use spherical geometry, a 2dsphere index is a better option than a haystack index. 2dsphere indexes allow field reordering;
+geoHaystack indexes require the first field to be the location field. Also, geoHaystack indexes are only usable via commands and so always
 return all results at once.
 {{% /note %}}
 
diff --git a/docs/reference/content/builders/sorts.md b/docs/reference/content/builders/sorts.md
index d8db686ca11..d7513452d62 100644
--- a/docs/reference/content/builders/sorts.md
+++ b/docs/reference/content/builders/sorts.md
@@ -16,7 +16,7 @@ any method that expects sort criteria.
 For brevity, you may choose to import the methods of the `Sorts` class statically:
 
 ```java
-import com.mongodb.client.model.Sorts.*;
+import static com.mongodb.client.model.Sorts.*;
 ```
   
 All the examples below assume this static import.
diff --git a/docs/reference/content/builders/updates.md b/docs/reference/content/builders/updates.md
index 699ebe37f3d..98dc124f821 100644
--- a/docs/reference/content/builders/updates.md
+++ b/docs/reference/content/builders/updates.md
@@ -16,7 +16,7 @@ any method that expects an update.
 For brevity, you may choose to import the methods of the `Updates` class statically:
 
 ```java
-import com.mongodb.client.model.Updates.*;
+import static com.mongodb.client.model.Updates.*;
 ```
   
 All the examples below assume this static import.
diff --git a/docs/reference/content/driver-async/getting-started/index.md b/docs/reference/content/driver-async/getting-started/index.md
deleted file mode 100644
index a43e4ce3b96..00000000000
--- a/docs/reference/content/driver-async/getting-started/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Getting Started"
-[menu.main]
-  parent = "MongoDB Async Driver"
-  identifier = "Async Getting Started"
-  weight = 30
-  pre = "<i class='fa fa-road'></i>"
-+++
-
-## Getting Started
-
-To help you get started quickly on the new driver, follow:
-
-  * [Installation]({{< ref "driver-async/getting-started/installation-guide.md" >}})
-  * [Quick Tour]({{< ref "driver-async/getting-started/quick-tour.md" >}})
-  * [Admin Quick Tour]({{< ref "driver-async/getting-started/quick-tour-admin.md" >}})
diff --git a/docs/reference/content/driver-async/getting-started/installation-guide.md b/docs/reference/content/driver-async/getting-started/installation-guide.md
deleted file mode 100644
index 3121f3cc83e..00000000000
--- a/docs/reference/content/driver-async/getting-started/installation-guide.md
+++ /dev/null
@@ -1,25 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Installation Guide"
-[menu.main]
-  parent = "Async Getting Started"
-  identifier = "Async Installation Guide"
-  weight = 1
-  pre = "<i class='fa'></i>"
-+++
-
-# Installation
-
-
-The recommended way to get started using one of the drivers in your project is with a dependency management system.
-
-{{% note class="important" %}}
-The MongoDB Async Driver requires either [Netty](http://netty.io/) or Java 7.
-{{% /note %}}
-
-{{< distroPicker >}}
-
-## MongoDB Async Driver
-The new asynchronous API that can leverage either Netty or Java 7's AsynchronousSocketChannel for fast and non-blocking IO.
-
-{{< install artifactId="mongodb-driver-async" version="3.3.0" dependencies="true">}}
diff --git a/docs/reference/content/driver-async/getting-started/installation.md b/docs/reference/content/driver-async/getting-started/installation.md
new file mode 100644
index 00000000000..6c0bdca1898
--- /dev/null
+++ b/docs/reference/content/driver-async/getting-started/installation.md
@@ -0,0 +1,27 @@
++++
+date = "2015-03-17T15:36:56Z"
+title = "Installation"
+[menu.main]
+  parent = "MongoDB Async Driver"
+  identifier = "Async Installation"
+  weight = 1
+  pre = "<i class='fa'></i>"
++++
+
+# Installation
+
+
+The recommended way to get started using one of the drivers in your project is with a dependency management system.
+
+{{% note class="important" %}}
+When TLS/SSL is disabled, the MongoDB Async Driver requires either [Netty](http://netty.io/) or Java 7+.
+When TLS/SSL is enabled, the MongoDB Async Driver requires either [Netty](http://netty.io/) or Java 8+. 
+{{% /note %}}
+
+{{< distroPicker >}}
+
+## MongoDB Async Driver
+
+The MongoDB Async Driver provides asynchronous API that can leverage either Netty or Java 7's AsynchronousSocketChannel for fast and non-blocking I/O.
+
+{{< install artifactId="mongodb-driver-async" version="3.12.0" dependencies="true">}}
diff --git a/docs/reference/content/driver-async/getting-started/quick-start-pojo.md b/docs/reference/content/driver-async/getting-started/quick-start-pojo.md
new file mode 100644
index 00000000000..0ab8f1404c7
--- /dev/null
+++ b/docs/reference/content/driver-async/getting-started/quick-start-pojo.md
@@ -0,0 +1,392 @@
++++
+date = "2017-05-17T15:36:57Z"
+title = "Quick Start - POJOs"
+[menu.main]
+  parent = "MongoDB Async Driver"
+  identifier = "Async Quick Start - POJOs"
+  weight = 15
+  pre = "<i class='fa'></i>"
++++
+
+# MongoDB Async Driver Quick Start - POJOs
+
+{{% note %}}
+POJOs stands for Plain Old Java Objects.
+
+The following code snippets come from the [`PojoQuickTour.java`]({{< srcref "driver-async/src/examples/tour/PojoQuickTour.java">}}) example code
+that can be found with the driver source on github.
+{{% /note %}}
+
+## Prerequisites
+
+- A running MongoDB on localhost using the default port for MongoDB `27017`
+
+- MongoDB Driver. See [Installation]({{< relref "driver/getting-started/installation.md" >}}) for instructions on how to install the MongoDB driver.
+
+- Quick Start. This guide follows on from the [Quick Start]({{< relref "driver/getting-started/quick-start.md" >}}).
+
+- The following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import com.mongodb.async.client.MongoDatabase;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+
+import java.util.List;
+
+import static com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Updates.*;
+import static java.util.Arrays.asList;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+```
+
+- The following POJO classes. The full source is available on github for the [Person]({{< srcref "driver-async/src/examples/tour/Person.java">}}) and [Address]({{< srcref "driver-async/src/examples/tour/Address.java">}})
+POJOs. Here are the main implementation details:
+
+```java
+public final class Person {
+    private ObjectId id;
+    private String name;
+    private int age;
+    private Address address;
+
+    public Person() {
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public void setId(final ObjectId id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(final int age) {
+        this.age = age;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(final Address address) {
+        this.address = address;
+    }
+    
+    // Rest of implementation
+}
+
+public final class Address {
+    private String street;
+    private String city;
+    private String zip;
+
+    public Address() {
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(final String street) {
+        this.street = street;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(final String city) {
+        this.city = city;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(final String zip) {
+        this.zip = zip;
+    }
+    
+    // Rest of implementation
+}
+```
+
+## Creating a Custom CodecRegistry
+
+Before you can use a POJO with the driver, you need to configure the [`CodecRegistry` ]({{< relref "bson/codecs.md" >}}) to include a codecs 
+to handle the translation to and from [`bson`]({{< relref "bson/index.md" >}}) for your POJOs. The simplest way to do that is to use the 
+[`PojoCodecProvider.builder()`]({{< apiref "org/bson/codecs/pojo/PojoCodecProvider.html">}}) to create and configure a `CodecProvider`.
+
+The following example will combine the default codec registry, with the `PojoCodecProvider` configured to automatically create POJO 
+`Codec`s:
+
+```java
+CodecRegistry pojoCodecRegistry = fromRegistries(MongoClients.getDefaultCodecRegistry(),
+                                        fromProviders(PojoCodecProvider.builder().automatic(true).build()));
+```
+
+### Using the CodecRegistry
+
+There are multiple ways to set the `pojoCodecRegistry` for use:
+
+ - You can set it when instantiating a MongoClient object:
+ 
+ ```java
+ MongoClient mongoClient = MongoClients.create(MongoClientSettings.builder()
+                                           .codecRegistry(pojoCodecRegistry).build());
+```
+
+- You can use an alternative `CodecRegistry` with a `MongoDatabase`:
+
+ ```java
+database = database.withCodecRegistry(pojoCodecRegistry);
+```
+
+- You can use an alternative `CodecRegistry` with a `MongoCollection`:
+
+ ```java
+collection = collection.withCodecRegistry(pojoCodecRegistry);
+```
+
+## Inserting a POJO into MongoDB
+
+The codec registry will automatically try to create a POJO `Codec` for unknown classes. This allows you to use POJOs out of the 
+box without any extra configuration. See the [Bson POJO page]({{< ref "bson/pojos.md" >}}) for information on configuring POJO `Codec`s.
+
+Before you can insert a POJO into MongoDB, you need a `MongoCollection` instance configured with the Pojo's type:
+
+```java
+MongoCollection<Person> collection = database.getCollection("people", Person.class);
+```
+
+### Insert a Person
+{{% note class="important" %}}
+Remember, always check for errors in any `SingleResultCallback<T>` implementation and handle them appropriately.
+
+For sake of brevity, this tutorial omits the error check logic in the code examples.
+{{% /note %}}
+
+To insert a Person into the collection, you can use the collection's [`insertOne()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertOne(TDocument)" >}}) method.
+
+```java
+Person ada = new Person("Ada Byron", 20, new Address("St James Square", "London", "W1"));
+collection.insertOne(ada, new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Inserted!");
+    }
+});
+```
+
+### Insert Many Persons
+
+To add multiple Person instances, you can use the collection's [`insertMany()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertMany(java.util.List)" >}}) method 
+which takes a list of `Person`.
+
+The following example will add multiple Person instances into the collection:
+
+```java
+List<Person> people = asList(
+        new Person("Charles Babbage", 45, new Address("5 Devonshire Street", "London", "W11")),
+        new Person("Alan Turing", 28, new Address("Bletchley Hall", "Bletchley Park", "MK12")),
+        new Person("Timothy Berners-Lee", 61, new Address("Colehill", "Wimborne", null))
+);
+
+collection.insertMany(people, new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        collection.countDocuments(new SingleResultCallback<Long>() {
+            @Override
+            public void onResult(final Long count, final Throwable t) {
+                System.out.println("total # of people " + count);
+            }
+        });
+    }
+});
+```
+
+## Query the Collection
+
+To query the collection, you can use the collection's [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method. 
+
+The following example prints all the Person instances in the collection:
+```java
+Block<Person> printBlock = new Block<Person>() {
+    @Override
+    public void apply(final Person person) {
+        System.out.println(person);
+    }
+};
+
+SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+};
+
+collection.find().forEach(printBlock, callbackWhenFinished);
+```
+
+The example uses the [`forEach`]({{ <apiref "com/mongodb/client/MongoIterable.html#forEach(com.mongodb.Block)">}}) method on the ``FindIterable`` 
+object to apply a block to each Person and outputs the following:
+
+```bash
+Person{id='591dbc2550852fa685b3ad17', name='Ada Byron', age=20, address=Address{street='St James Square', city='London', zip='W1'}}
+Person{id='591dbc2550852fa685b3ad18', name='Charles Babbage', age=45, address=Address{street='5 Devonshire Street', city='London', zip='W11'}}
+Person{id='591dbc2550852fa685b3ad19', name='Alan Turing', age=28, address=Address{street='Bletchley Hall', city='Bletchley Park', zip='MK12'}}
+Person{id='591dbc2550852fa685b3ad1a', name='Timothy Berners-Lee', age=61, address=Address{street='Colehill', city='Wimborne', zip='null'}}
+```
+
+## Specify a Query Filter
+
+To query for Person instance that match certain conditions, pass a filter object to the [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method. 
+To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+{{% note class="important" %}}
+When querying POJOs you *must* query against the document field name and not the Pojo's property name. 
+By default they are the same but it is possible to change how POJO property names are mapped.
+{{% /note %}}
+
+
+### Get A Single Person That Matches a Filter
+
+For example, to find the first `Person` in the database that lives in `Wimborne` pass an [`eq`]({{<apiref  "com/mongodb/client/model/Filters.html#eq(java.lang.String,TItem)">}}) 
+filter object to specify the equality condition:
+
+```java
+SingleResultCallback<Person> printCallback = new SingleResultCallback<Person>() {
+    @Override
+    public void onResult(final Person person, final Throwable t) {
+        System.out.println(person);
+    }
+};
+collection.find(eq("address.city", "Wimborne")).first(printCallback);
+```
+The example prints one document:
+
+```bash
+Person{id='591dbc2550852fa685b3ad1a', name='Timothy Berners-Lee', age=61, 
+       address=Address{street='Colehill', city='Wimborne', zip='null'}}
+```
+
+### Get All Person Instances That Match a Filter
+
+The following example returns and prints everyone where ``"age" > 30``:
+
+```java
+collection.find(gt("age", 30)).forEach(printBlock, callbackWhenFinished);
+```
+
+## Update Documents
+
+To update documents in a collection, you can use the collection's [`updateOne`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}})  and  [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) methods.
+
+Pass to the methods:
+
+- A filter object to determine the document or documents to update. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all Persons in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+- An update document that specifies the modifications. For a list of the available operators, see [update operators]({{<docsref "reference/operator/update-field">}}).
+
+The update methods return an [`UpdateResult`]({{<apiref "com/mongodb/client/result/UpdateResult.html">}}) which provides information about the operation including the number of documents modified by the update.
+
+### Update a Single Person
+
+To update at most a single `Person`, use the [`updateOne`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method.
+
+The following example updates `Ada Byron` setting their age to `23` and name to `Ada Lovelace`:
+
+```java
+SingleResultCallback<UpdateResult> printModifiedCount = new SingleResultCallback<UpdateResult>() {
+    @Override
+    public void onResult(final UpdateResult result, final Throwable t) {
+        System.out.println(result.getModifiedCount());
+    }
+};
+collection.updateOne(eq("name", "Ada Byron"), combine(set("age", 23), set("name", "Ada Lovelace")), printModifiedCount);
+```
+
+### Update Multiple Persons
+
+To update all Persons that match a filter, use the [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method.
+
+The following example sets the zip field to `null` for all documents that have a `zip` value:
+
+```java
+collection.updateMany(not(eq("zip", null)), set("zip", null), printModifiedCount);
+
+```
+
+### Replace a Single Person
+
+An alternative method to change an existing `Person`, would be to use the [`replaceOne`]({{<apiref "com/mongodb/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument)">}}) method.
+
+The following example replaces the `Ada Lovelace` back to the original document:
+
+```java
+collection.replaceOne(eq("name", "Ada Lovelace"), ada, printModifiedCount);
+```
+
+## Delete Documents
+
+To delete documents from a collection, you can use the collection's [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) and [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) methods.
+
+Pass to the methods a filter object to determine the document or documents to delete. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+The delete methods return a [`DeleteResult`]({{< apiref "com/mongodb/client/result/DeleteResult.html">}})
+which provides information about the operation including the number of documents deleted.
+
+### Delete a Single Person That Matches a Filter
+
+To delete at most a single `Person` that matches a filter, use the [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) method:
+
+The following example deletes at most one `Person` who lives in `Wimborne`:
+
+```java
+SingleResultCallback<DeleteResult> printDeletedCount = new SingleResultCallback<DeleteResult>() {
+    @Override
+    public void onResult(final DeleteResult result, final Throwable t) {
+        System.out.println(result.getDeletedCount());
+    }
+};
+
+collection.deleteOne(eq("address.city", "Wimborne"), printDeletedCount);
+```
+
+### Delete All Persons That Match a Filter
+
+To delete multiple Persons matching a filter use the [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) method.
+
+The following example deletes all Persons that live in `London`:
+
+```java
+collection.deleteMany(eq("address.city", "London"), printDeletedCount);
+```
+
+### Additional Information
+
+For additional information about the configuring the `PojoCodecProvider`, see the [Bson POJO page]({{< ref "bson/pojos.md" >}}).
+
+For additional tutorials about using MongoDB (such as to use the aggregation framework, specify write concern, etc.), see the [Java Async Driver Tutorials]({{< ref "driver-async/tutorials/index.md" >}}).
+
diff --git a/docs/reference/content/driver-async/getting-started/quick-start.md b/docs/reference/content/driver-async/getting-started/quick-start.md
new file mode 100644
index 00000000000..7ac396f4eec
--- /dev/null
+++ b/docs/reference/content/driver-async/getting-started/quick-start.md
@@ -0,0 +1,447 @@
++++
+date = "2015-03-17T15:36:56Z"
+title = "Quick Start"
+[menu.main]
+  parent = "MongoDB Async Driver"
+  identifier = "Async Quick Start"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+# MongoDB Async Driver Quick Start
+
+The following code snippets come from the [`QuickTour.java`]({{< srcref "driver-async/src/examples/tour/QuickTour.java">}}) example code
+that can be found with the async driver source on github.
+
+{{% note %}}
+The callback-based Async Java Driver has been deprecated in favor of the 
+[MongoDB Reactive Streams Java Driver](http://mongodb.github.io/mongo-java-driver-reactivestreams/).
+{{% /note %}}
+
+## SingleResultCallback
+
+The MongoDB Async driver provides an asynchronous API that can leverage either Netty or Java 7's `AsynchronousSocketChannel` for fast and non-blocking I/O.
+
+The MongoDB Asynchronous Driver API mirrors the new Synchronous MongoDB Driver API, but asynchronous methods that make network I/O operations take a [`SingleResultCallback<T>`]({{< apiref "com/mongodb/async/SingleResultCallback.html">}}) and return immediately. The `SingleResultCallback<T>` interface requires the implementation of a single method `onResult(T result, Throwable t)` which is called upon the completion of the operation.  Upon successful operation, the `result` parameter contains the result of the operation. If the operation failed for any reason, then the `t` contains the reason for the failure.
+
+{{% note class="important" %}}
+Always check for errors in any `SingleResultCallback<T>` implementation
+and handle them appropriately.
+
+For sake of brevity, this tutorial omits the error check logic in the code examples.
+{{% /note %}}
+
+To use a callback more than once, you can either create a class that implements the callback or assign the callback to a variable.
+
+## Prerequisites
+
+- A running MongoDB on localhost using the default port for MongoDB `27017`
+
+- MongoDB Async Driver.  See [Installation]({{< relref "driver-async/getting-started/installation.md" >}}) for instructions on how to install the MongoDB driver.
+
+- The following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.*;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.ConnectionString;
+import org.bson.Document;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Updates.inc;
+import static com.mongodb.client.model.Updates.set;
+import static java.util.Arrays.asList;
+```
+
+- The following callback code which the examples in the tutorials will use:
+
+```java
+SingleResultCallback<Document> callbackPrintDocuments = new SingleResultCallback<Document>() {
+   @Override
+   public void onResult(final Document document, final Throwable t) {
+       System.out.println(document.toJson());
+   }
+};
+
+SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+};
+
+```
+
+- The following `Block` code which the examples will use to print the results of the find operations:
+
+```java
+Block<Document> printDocumentBlock = new Block<Document>() {
+    @Override
+    public void apply(final Document document) {
+        System.out.println(document.toJson());
+    }
+};
+```
+
+## Make a Connection
+
+To make a connection to a running MongoDB instance, use [`MongoClients.create`]({{< apiref "com/mongodb/async/client/MongoClients.html#create()" >}}) to create a new [`MongoClient`]({{< apiref "com/mongodb/async/client/MongoClient.html">}}) instance. A `MongoClient` instance actually represents a pool of connections
+to the database; you will only need one instance of class
+`MongoClient` even with multiple concurrently executing asynchronous operations.
+
+{{% note class="important" %}}
+Typically you only create one `MongoClient` instance for a given MongoDB
+deployment (e.g. standalone, replica set, or a sharded cluster) and use it across your application. However, if you do create multiple instances:
+
+-  All resource usage limits (max connections, etc.) apply per `MongoClient` instance.
+-  To dispose of an instance, call `MongoClient.close()` to clean up resources.
+{{% /note %}}
+
+### Connect to a Standalone MongoDB Instance
+
+The following example shows various ways to connect to a standalone MongoDB instance running on the local machine.
+
+To connect to a standalone MongoDB instance:
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create()" >}}) without any parameters to connect to a MongoDB instance running on localhost on port ``27017``:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(java.lang.String)" >}}) with a string that specifies the connection string:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://localhost");
+```
+
+The connection string mostly follows [RFC 3986](http://tools.ietf.org/html/rfc3986), with the exception of the domain name. For MongoDB, it is possible to list multiple domain names separated by a comma. For more information on the connection string, see [connection string]({{< docsref "reference/connection-string" >}}).
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.ConnectionString)" >}}) with a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object:
+
+```java
+MongoClient mongoClient = MongoClients.create(new ConnectionString("mongodb://localhost"));
+```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.MongoClientSettings)" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object:
+
+```java
+ClusterSettings clusterSettings = ClusterSettings.builder()
+                                  .hosts(asList(new ServerAddress("localhost"))).build();
+MongoClientSettings settings = MongoClientSettings.builder()
+                                  .clusterSettings(clusterSettings).build();
+MongoClient mongoClient = MongoClients.create(settings);
+```
+
+## Access a Database
+
+Once you have a [`MongoClient`]({{< apiref "com/mongodb/async/client/MongoClient.html">}}) instance connected to a MongoDB deployment, use its [`getDatabase()`]({{<apiref "com/mongodb/async/client/MongoClient.html#getDatabase(java.lang.String)">}}) method to access a database.
+
+Specify the name of the database to the `getDatabase()` method. The `getDatabase()` method does not require a callback since there is no network I/O required.  If a database does not exist, MongoDB creates the database when you first store data for that database.
+
+The following example accesses the `mydb` database:
+
+```java
+MongoDatabase database = mongoClient.getDatabase("mydb");
+```
+
+## Get a Collection
+
+Once you have a [`MongoDatabase`]({{< apiref "com/mongodb/async/client/MongoDatabase.html" >}}) instance, use its [`getCollection()`]({{< apiref "com/mongodb/async/client/MongoDatabase.html#getCollection(java.lang.String)">}})
+method to access a collection.
+
+Specify the name of the collection to the `getCollection()` method. If a collection does not exist, MongoDB creates the collection when you first store data for that collection.
+
+For example, using the `database` instance, the following statement accesses the collection named `test` in the `mydb` database:
+
+```java
+MongoCollection<Document> collection = database.getCollection("test");
+```
+
+## Create a Document
+
+To create the document using the Java async driver, use the [`Document`]({{< apiref "org/bson/Document.html" >}}) class.
+
+For example, consider the following JSON document:
+
+```javascript
+  {
+   "name" : "MongoDB",
+   "type" : "database",
+   "count" : 1,
+   "versions": [ "v3.2", "v3.0", "v2.6" ],
+   "info" : { x : 203, y : 102 }
+  }
+```
+
+To create the document using the Java async driver, instantiate a `Document` object with a field and value, and use its
+ [`append()`]({{< apiref "org/bson/Document.html#append" >}}) method to include additional fields and values to the document object. The value can be another `Document` object to specify an embedded document:
+
+ ```java
+ Document doc = new Document("name", "MongoDB")
+                .append("type", "database")
+                .append("count", 1)
+                .append("versions", Arrays.asList("v3.2", "v3.0", "v2.6"))
+                .append("info", new Document("x", 203).append("y", 102));
+ ```
+
+{{% note %}}
+The BSON type of array corresponds to the Java type `java.util.List`. For a list of the BSON type and the corresponding type in Java, see [BSON  Documents reference]({{<relref "bson/documents.md" >}}).
+{{% /note %}}
+
+## Insert a Document
+
+Once you have the [`MongoCollection`]({{< apiref "com/mongodb/async/client/MongoCollection.html">}}) object, you can insert documents into the collection.
+
+### Insert One Document
+
+To insert the document into the collection, use the [`insertOne()`]({{<apiref "com/mongodb/async/client/MongoCollection.html#insertOne(TDocument,com.mongodb.async.SingleResultCallback)">}}) method.
+
+```java
+collection.insertOne(doc, new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Inserted!");
+    }
+});
+```
+
+{{% note %}}
+If no top-level `_id` field is specified in the document, the driver automatically adds the `_id` field to the inserted document.
+{{% /note %}}
+
+`SingleResultCallback<T>` is a [functional interface](https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.8) and can be implemented as a lambda if using Java 8:
+
+```java
+collection.insertOne(doc, (Void result, final Throwable t) -> System.out.println("Inserted!"));
+```
+
+### Insert Multiple Documents
+
+To add multiple documents, you can use the [`insertMany()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#insertMany(java.util.List,com.mongodb.async.SingleResultCallback)">}}) method which takes a list of documents to insert.
+
+The following example will add multiple documents of the form:
+
+```javascript
+{ "i" : value }
+```
+
+Create the documents in a loop and add to the `documents` list:
+
+```java
+List<Document> documents = new ArrayList<Document>();
+for (int i = 0; i < 100; i++) {
+    documents.add(new Document("i", i));
+}
+```
+
+To insert these documents to the collection, pass the list of documents to the
+[`insertMany()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#insertMany(java.util.List,com.mongodb.async.SingleResultCallback)">}}) method.
+
+```java
+collection.insertMany(documents, new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Documents inserted!");
+    }
+});
+```
+
+{{% note %}}
+If no top-level `_id` field is specified in the document, the driver automatically adds the `_id` field to the inserted document.
+{{% /note %}}
+
+## Count Documents in A Collection
+
+To count the number of documents in a collection, you can use the collection's [`count()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#count(com.mongodb.async.SingleResultCallback)">}})
+method.  The following code should print `101` (the 100 inserted via `insertMany` plus the 1 inserted via the `insertOne`).
+
+```java
+collection.countDocuments(
+  new SingleResultCallback<Long>() {
+      @Override
+      public void onResult(final Long count, final Throwable t) {
+          System.out.println(count);
+      }
+  });
+```
+
+## Query the Collection
+
+To query the collection, you can use the collection's [`find()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method. You can call the method without any arguments to query all documents in a collection or pass a filter to query for documents that match the filter criteria.
+
+The [`find()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method returns a [`FindIterable()`]({{< apiref "com/mongodb/async/client/FindIterable.html" >}}) instance that provides a fluent interface for chaining other methods.
+
+### Find the First Document in a Collection
+
+To return the first document in the collection, use the [find()]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method without any parameters and chain to [find()]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method the [`first()`] ({{< apiref "com/mongodb/async/client/MongoIterable.html#first(com.mongodb.async.SingleResultCallback)">}}) method.
+
+If the collection is empty, the operation returns null.
+
+{{% note class="tip" %}}
+The `find().first()` construct is useful for queries that should only match a single document or if you are interested in the first document only.
+{{% /note %}}
+
+The following example prints the first document found in the collection, using the `printDocument` callback declared earlier in the tutorial:
+
+```java
+collection.find().first(callbackPrintDocuments);
+```
+
+The example will print the following document:
+
+```json
+{ "_id" : { "$oid" : "579f5278b9c1d14ae2a31c27" }, "name" : "MongoDB", "type" : "database", "count" : 1, "versions" : ["v3.2", "v3.0", "v2.6"], "info" : { "x" : 203, "y" : 102 } }
+```
+
+{{% note %}}
+The `_id` element has been added automatically by the Java async driver to your
+document and your value will differ from that shown. MongoDB reserves field
+names that start with `"_"` and `"$"` for internal use.
+{{% /note %}}
+
+### Find All Documents in a Collection
+
+To retrieve all the documents in the collection, we will use the
+[`find()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method without any parameters.
+
+You can chain the
+[`forEach()`]({{< apiref "com/mongodb/async/client/MongoIterable.html#forEach(com.mongodb.Block,com.mongodb.async.SingleResultCallback)" >}}) method to the `find()` method to iterate through the results and apply a [`Block`]({{< apiref "com/mongodb/Block.html" >}}) to each document in the results.  The [`forEach()`]({{< apiref "com/mongodb/async/client/MongoIterable.html#forEach(com.mongodb.Block,com.mongodb.async.SingleResultCallback)" >}}) method also takes a callback that is run once the iteration has finished.
+
+The following code retrieves all documents in the collection and prints the returned documents (101 documents). The example uses the `callbackWhenFinished` and the `printDocumentBlock` defined earlier in the tutorial:
+
+```java
+collection.find().forEach(printDocumentBlock, callbackWhenFinished);
+```
+
+## Specify a Query Filter
+
+To query for documents that match certain conditions, pass a filter object to the [find()]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method. To facilitate creating filter objects, the driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+### Get a Single Document That Matches a Filter
+
+For example, to find the first document where the field ``i`` has the value `71`, pass an [`eq`]({{<apiref  "com/mongodb/client/model/Filters.html#eq(java.lang.String,TItem)">}}) filter object to specify the equality condition. The example uses the `callbackPrintDocuments` defined earlier in the tutorial:
+
+
+```java
+collection.find(eq("i", 71)).first(callbackPrintDocuments);
+```
+
+### Get All Documents That Match a Filter
+
+The following example returns and prints all documents where `"i" > 50`. The example uses the `printDocumentBlock` code and `callbackWhenFinished`  defined earlier in the tutorial:
+
+```java
+collection.find(gt("i", 50)).forEach(printDocumentBlock, callbackWhenFinished);
+```
+
+To specify a filter for a range, such as ``50 < i <= 100``, you can use the [`and`]({{<apiref "com/mongodb/client/model/Filters.html#and(org.bson.conversions.Bson...)">}}) helper:
+
+
+```java
+collection.find(and(gt("i", 50), lte("i", 100))).forEach(printDocumentBlock, callbackWhenFinished);
+```
+
+## Updating documents
+
+To update documents in a collection, you can use the collection's [`updateOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}})  and  [`updateMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) methods.
+
+Pass to the methods:
+
+- A filter object to determine the document or documents to update. To facilitate creating filter objects, Java async driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+- An update document that specifies the modifications. For a list of the available operators, see [update operators]({{<docsref "reference/operator/update-field">}}).
+
+- A callback.
+
+The update methods return an [`UpdateResult`]({{<apiref "com/mongodb/client/result/UpdateResult.html">}}), which provides information about the operation including the number of documents modified by the update.
+
+### Update a Single Document
+
+To update at most a single document, use the [`updateOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}).
+
+The following example updates the first document that meets the filter ``i`` equals ``10`` and sets the value of ``i`` to ``110``:
+
+```java
+collection.updateOne(eq("i", 10), set("i", 110),
+    new SingleResultCallback<UpdateResult>() {
+        @Override
+        public void onResult(final UpdateResult result, final Throwable t) {
+            System.out.println(result.getModifiedCount());
+        }
+    });
+```
+
+### Update Multiple Documents
+
+To update all documents matching the filter, use the [`updateMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method.
+
+The following example increments the value of ``i`` by ``100`` for all documents where ``i`` is less than ``100``:
+
+```java
+collection.updateMany(lt("i", 100), inc("i", 100),
+    new SingleResultCallback<UpdateResult>() {
+        @Override
+        public void onResult(final UpdateResult result, final Throwable t) {
+            System.out.println(result.getModifiedCount());
+        }
+    });
+```
+
+## Delete Documents
+
+To delete documents from a collection, you can use the collection's [`deleteOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) and [`deleteMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) methods.
+
+Pass to the methods:
+
+- A filter object to determine the document or documents to delete. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+- A callback.
+
+The delete methods return a [`DeleteResult`]({{< apiref "com/mongodb/client/result/DeleteResult.html">}})
+which provides information about the operation including the number of documents deleted.
+
+### Delete a Single Document That Match a Filter
+
+To delete at most a single document that match the filter, use the [`deleteOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) method:
+
+The following example deletes at most one document that meets the filter ``i`` equals ``110``:
+
+```java
+collection.deleteOne(eq("i", 110), new SingleResultCallback<DeleteResult>() {
+    @Override
+    public void onResult(final DeleteResult result, final Throwable t) {
+        System.out.println(result.getDeletedCount());
+    }
+});
+```
+
+### Delete All Documents That Match a Filter
+
+To delete all documents matching the filter use the [`deleteMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) method.
+
+The following example deletes all documents where ``i`` is greater or equal to ``100``:
+
+```java
+collection.deleteMany(gte("i", 100), new SingleResultCallback<DeleteResult>() {
+    @Override
+    public void onResult(final DeleteResult result, final Throwable t) {
+        System.out.println(result.getDeletedCount());
+    }
+});
+```
+
+### Additional Information
+
+For additional tutorials about using MongoDB with POJOs, see the [POJOs Quick Start]({{< ref "driver-async/getting-started/quick-start-pojo.md" >}}).
+
+For additional tutorials (such as to use the aggregation framework, specify write concern, etc.), see the [Java Async Driver Tutorials]({{< ref "driver-async/tutorials/index.md" >}}).
diff --git a/docs/reference/content/driver-async/getting-started/quick-tour-admin.md b/docs/reference/content/driver-async/getting-started/quick-tour-admin.md
deleted file mode 100644
index 2e0f388ccca..00000000000
--- a/docs/reference/content/driver-async/getting-started/quick-tour-admin.md
+++ /dev/null
@@ -1,236 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Admin Quick Tour"
-[menu.main]
-  parent = "Async Getting Started"
-  identifier = "Async Admin Quick Tour"
-  weight = 50
-  pre = "<i class='fa'></i>"
-+++
-
-# MongoDB Driver Admin Quick Tour
-
-This is the second part of the MongoDB driver quick tour. In the
-[quick tour]({{< relref "driver-async/getting-started/quick-tour.md" >}}) we looked at how to
-use the Async Java driver to execute basic CRUD operations.  In this section we'll look at some of the
-administrative features available in the driver.
-
-The following code snippets come from the `QuickTourAdmin.java` example code
-that can be found with the [driver
-source]({{< srcref "driver-async/src/examples/tour/QuickTourAdmin.java">}}).
-
-{{% note %}}
-See the [installation guide]({{< relref "driver-async/getting-started/installation-guide.md" >}})
-for instructions on how to install the MongoDB Driver.
-{{% /note %}}
-
-## Setup
-
-To get started we'll quickly connect and create a `mongoClient`, `database` and `collection`
-variable for use in the examples below:
-
-```java
-MongoClient mongoClient = new MongoClient(new ConnectionString("mongodb://localhost"));
-MongoDatabase database = mongoClient.getDatabase("mydb");
-MongoCollection<Document> collection = database.getCollection("test");
-```
-
-{{% note %}}
-Calling the `getDatabase()` on `MongoClient` does not create a database.
-Only when a database is written to will a database be created.  Examples include the creation of an index or the insertion of a document 
-into a previously non-existent collection.
-{{% /note %}}
-
-{{% note %}}
-Sometimes you will need the same or similar callbacks more than once.  In these situations
-it makes sense to DRY (Do not Repeat Yourself) up your code and save the callback either
-as a concrete class or assign to a variable as below:
-
-```java
-SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
-    @Override
-    public void onResult(final Void result, final Throwable t) {
-        System.out.println("Operation Finished!");
-    }
-};
-```
-{{% /note %}}
-
-
-## Get A List of Databases
-
-You can get a list of the available databases:
-
-```java
-mongoClient.listDatabaseNames().forEach(new Block<String>() {
-    @Override
-    public void apply(final String s) {
-        System.out.println(s);
-    }
-}, callbackWhenFinished);
-```
-
-## Drop A Database
-
-You can drop a database by name using a `MongoClient` instance:
-
-```java
-mongoClient.getDatabase("databaseToBeDropped").drop(callbackWhenFinished);
-```
-
-## Create A Collection
-
-Collections in MongoDB are created automatically simply by inserted a document into it. Using the 
-[`createCollection`]({{< apiref "com/mongodb/async/client/MongoDatabase.html#createCollection-java.lang.String-com.mongodb.async.SingleResultCallback-">}}) 
-method, you can also create a collection explicitly in order to customize its configuration. For example, to create a capped collection sized to 1 megabyte:
-
-```java
-database.createCollection("cappedCollection",
-  new CreateCollectionOptions().capped(true).sizeInBytes(0x100000),
-  callbackWhenFinished);
-```
-
-## Get A List of Collections
-
-You can get a list of the available collections in a database:
-
-```java
-database.listCollectionNames().forEach(new Block<String>() {
-    @Override
-    public void apply(final String databaseName) {
-        System.out.println(databaseName);
-    }
-}, callbackWhenFinished);
-```
-
-## Drop A Collection
-
-You can drop a collection by using the drop() method:
-
-```java
-collection.drop(callbackWhenFinished);
-```
-
-## Create An Index
-
-MongoDB supports secondary indexes. To create an index, you just
-specify the field or combination of fields, and for each field specify the direction of the index for that field.
-We can use the [`Indexes`]({{< relref "builders/indexes.md">}}) helpers to create index keys:
-
-```java
-// create an ascending index on the "i" field
- collection.createIndex(Indexes.ascending("i"), callbackWhenFinished);
-```
-
-## Get a List of Indexes on a Collection
-
-Use the `listIndexes()` method to get a list of indexes. The following creates a
-`printDocumentBlock` Block that prints out the Json version of a document and then passes
-that block to the `forEach` method on a
-[`mongoIterable`]({{< apiref "com/mongodb/async/client/MongoIterable.html">}})
-so that it will printout all the indexes on the collection `test`:
-
-```java
-Block<Document> printDocumentBlock = new Block<Document>() {
-    @Override
-    public void apply(final Document document) {
-        System.out.println(document.toJson());
-    }
-};
-
-collection.listIndexes().forEach(printDocumentBlock, callbackWhenFinished);
-```
-
-The example should print the following indexes:
-
-```json
-{ "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "mydb.test" }
-{ "v" : 1, "key" : { "i" : 1 }, "name" : "i_1", "ns" : "mydb.test" }
-Operation Finished!
-```
-
-## Text indexes
-
-MongoDB also provides text indexes to support text search of string
-content. Text indexes can include any field whose value is a string or
-an array of string elements. To create a text index use the [`Indexes.text`]({{< relref "builders/indexes.md#text-index">}})
-static helper:
-
-```java
-// create a text index on the "content" field
-coll.createIndex(Indexes.text("content"), callbackWhenFinished);
-```
-
-As of MongoDB 2.6, text indexes are now integrated into the main query
-language and enabled by default (here we use the [`Filters.text`]({{< relref "builders/filters.md#evaluation">}}) helper):
-
-```java
-// Insert some documents
-collection.insertOne(new Document("_id", 0).append("content", "textual content"), callbackWhenFinished);
-collection.insertOne(new Document("_id", 1).append("content", "additional content"), callbackWhenFinished);
-collection.insertOne(new Document("_id", 2).append("content", "irrelevant content"), callbackWhenFinished);
-
-// Find using the text index
-long matchCount = collection.count(text("textual content -irrelevant"));
-System.out.println("Text search matches: " + matchCount);
-
-// Find using the $language operator
-Bson textSearch = Filters.text("textual content -irrelevant", new TextSearchOptions().language("english"));
-matchCount = collection.count(textSearch);
-System.out.println("Text search matches (english): " + matchCount);
-
-// Find the highest scoring match
-// Find using the text index
-collection.count(text("textual content -irrelevant"), new SingleResultCallback<Long>() {
-    @Override
-    public void onResult(final Long matchCount, final Throwable t) {
-        System.out.println("Text search matches: " + matchCount);
-    }
-});
-
-
-// Find using the $language operator
-Bson textSearch = text("textual content -irrelevant", "english");
-collection.count(textSearch, new SingleResultCallback<Long>() {
-    @Override
-    public void onResult(final Long matchCount, final Throwable t) {
-        System.out.println("Text search matches (english): " + matchCount);
-    }
-});
-
-// Find the highest scoring match
-Document projection = new Document("score", new Document("$meta", "textScore"));
-collection.find(textSearch).projection(projection).first(new SingleResultCallback<Document>() {
-    @Override
-    public void onResult(final Document highest, final Throwable t) {
-        System.out.println("Highest scoring document: " + highest.toJson());
-
-    }
-});
-```
-
-and it should print:
-
-```json
-Text search matches: 2
-Text search matches (english): 2
-Highest scoring document: { "_id" : 1, "content" : "additional content", "score" : 0.75 }
-```
-
-For more information about text search see the [text index]({{< docsref "/core/index-text" >}}) and
-[$text query operator]({{< docsref "/reference/operator/query/text">}}) documentation.
-
-## Running a command
-
-While not all commands have a specific helper, however you can run any [command]({{< docsref "/reference/command">}})
-by using the [`runCommand()`]({{< apiref "com/mongodb/async/client/MongoDatabase.html#runCommand-org.bson.conversions.Bson-com.mongodb.ReadPreference-com.mongodb.async.SingleResultCallback-">}})
-method.  Here we call the [buildInfo]({{ docsref "reference/command/buildInfo" }}) command:
-
-```java
-database.runCommand(new Document("buildInfo", 1), new SingleResultCallback<Document>() {
-    @Override
-    public void onResult(final Document buildInfo, final Throwable t) {
-        System.out.println(buildInfo);
-    }
-});
-```
diff --git a/docs/reference/content/driver-async/getting-started/quick-tour.md b/docs/reference/content/driver-async/getting-started/quick-tour.md
deleted file mode 100644
index 196d5737f30..00000000000
--- a/docs/reference/content/driver-async/getting-started/quick-tour.md
+++ /dev/null
@@ -1,495 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Quick Tour"
-[menu.main]
-  parent = "Async Getting Started"
-  identifier = "Async Quick Tour"
-  weight = 30
-  pre = "<i class='fa'></i>"
-+++
-
-# MongoDB Async Driver Quick Tour
-
-The following code snippets come from the `QuickTour.java` example code
-that can be found with the [async driver
-source]({{< srcref "driver-async/src/examples/tour/QuickTour.java">}}).
-
-{{% note %}}
-See the [installation guide]({{< relref "driver-async/getting-started/installation-guide.md#mongodb-async-driver" >}})
-for instructions on how to install the MongoDB Async Driver.
-{{% /note %}}
-
-## Going Async with Callbacks
-
-The MongoDB Async driver provides an asynchronous API that can leverage either Netty or Java 7's `AsynchronousSocketChannel` for fast and non-blocking IO.
-
-The API mirrors the new Synchronous API from the MongoDB Driver, but any methods that cause network IO take a `SingleResponseCallback<T>` and return immediately, where `T` is the type of response for the document.
-
-The `SingleResponseCallback<T>` interface requires the implementation of a single method `onResult(T result, Throwable t)` which is called when the operation has completed.  The `result` parameter contains the result of the operation, if successful. If the operation failed for any reason then the `t` contains the `Throwable` reason for the failure.
-
-{{% note class="important" %}}
-It's important to always check for errors in any `SingleResponseCallback<T>` implementation
-and handle them appropriately! Below the error checks are left out only for the sake of brevity.
-{{% /note %}}
-
-## Make a Connection
-
-The following example shows multiple ways to connect to the database `mydb` on the local machine, using the 
-[`MongoClients.create`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.ConnectionString-" >}}) helper.
-
-
-```java
-// To directly connect to the default server localhost on port 27017
-MongoClient mongoClient = MongoClients.create();
-
-// Use a Connection String
-MongoClient mongoClient = MongoClients.create("mongodb://localhost");
-
-// or a Connection String
-MongoClient mongoClient = MongoClients.create(new ConnectionString("mongodb://localhost"));
-
-// or provide custom MongoClientSettings
-ClusterSettings clusterSettings = ClusterSettings.builder().hosts(asList(new ServerAddress("localhost"))).build();
-MongoClientSettings settings = MongoClientSettings.builder().clusterSettings(clusterSettings).build();
-MongoClient mongoClient = MongoClients.create(settings);
-
-MongoDatabase database = mongoClient.getDatabase("mydb");
-```
-
-At this point, the `database` object will be a connection to a MongoDB
-server for the specified database.
-
-{{% note %}}
-There is no callback required for `getDatabase("mydb")` as there is no network IO required.
-A `MongoDatabase` instance provides methods to interact with a database
-but the database might not actually exist and will only be created on the
-insertion of data via some means; e.g. the creation of a collection or the insertion of documents
-which do require callbacks as they require network IO.
-{{% /note %}}
-
-### MongoClient
-
-The `MongoClient` instance actually represents a pool of connections
-to the database; you will only need one instance of class
-`MongoClient` even with multiple concurrently executing asynchronous operations.
-
-{{% note class="important" %}}
-Typically you only create one `MongoClient` instance for a given database
-cluster and use it across your application. When creating multiple instances:
-
--   All resource usage limits (max connections, etc) apply per
-    `MongoClient` instance
--   To dispose of an instance, make sure you call `MongoClient.close()`
-    to clean up resources
-{{% /note %}}
-
-## Get a Collection
-
-To get a collection to operate upon, specify the name of the collection to
-the [`getCollection(String collectionName)`]({{< apiref "com/mongodb/async/client/MongoDatabase.html#getCollection-java.lang.String-">}})
-method:
-
-The following example gets the collection `test`:
-
-```java
-MongoCollection<Document> collection = database.getCollection("test");
-```
-
-## Insert a Document
-
-Once you have the collection object, you can insert documents into the
-collection. For example, consider the following JSON document; the document
-contains a field `info` which is an embedded document:
-
-``` javascript
-{
-   "name" : "MongoDB",
-   "type" : "database",
-   "count" : 1,
-   "info" : {
-               x : 203,
-               y : 102
-             }
-}
-```
-
-To create the document using the Java driver, use the
-[Document]({{< apiref "org/bson/Document.html">}}) class. You
-can use this class to create the embedded document as well.
-
-```java
-Document doc = new Document("name", "MongoDB")
-               .append("type", "database")
-               .append("count", 1)
-               .append("info", new Document("x", 203).append("y", 102));
-```
-
-To insert the document into the collection, use the `insertOne()` method.
-
-```java
-collection.insertOne(doc, new SingleResultCallback<Void>() {
-    @Override
-    public void onResult(final Void result, final Throwable t) {
-        System.out.println("Inserted!");
-    }
-});
-```
-
-As `SingleResponseCallback<T>` is a [functional interface](https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.8) and it can be
-implemented as a lambda for users on Java 8:
-
-```java
-collection.insertOne(doc, (Void result, final Throwable t) -> System.out.println("Inserted!"));
-```
-
-Once the document has been inserted the `onResult` callback will be called and it will
-print "Inserted!".  Remember, in a normal application you would always check for the presence of
-errors in the `t` variable.
-
-## Add Multiple Documents
-
-To add multiple documents, you can use the `insertMany()` method.
-
-The following example will add multiple documents of the form:
-
-```javascript
-{ "i" : value }
-```
-
-Create the documents in a loop.
-
-```java
-List<Document> documents = new ArrayList<Document>();
-for (int i = 0; i < 100; i++) {
-    documents.add(new Document("i", i));
-}
-```
-
-To insert these documents to the collection, pass the list of documents to the
-`insertMany()` method.
-
-```java
-collection.insertMany(documents, new SingleResultCallback<Void>() {
-    @Override
-    public void onResult(final Void result, final Throwable t) {
-        System.out.println("Documents inserted!");
-    }
-});
-```
-
-## Count Documents in A Collection
-
-Now that we've inserted 101 documents (the 100 we did in the loop, plus
-the first one), we can check to see if we have them all using the
-[count()]({{< apiref "com/mongodb/async/client/MongoCollection#count--">}})
-method. The following code should print `101`.
-
-```java
-collection.count(
-  new SingleResultCallback<Long>() {
-      @Override
-      public void onResult(final Long count, final Throwable t) {
-          System.out.println(count);
-      }
-  });
-```
-
-## Query the Collection
-
-Use the
-[find()]({{< apiref "com/mongodb/async/client/MongoCollection.html#find--">}})
-method to query the collection.
-
-### Find the First Document in a Collection
-
-To get the first document in the collection, call the
-[first()]({{< apiref "com/mongodb/async/client/MongoIterable.html#first--">}})
-method on the [find()]({{< apiref "com/mongodb/async/client/MongoCollection.html#find--">}})
-operation. `collection.find().first()` returns the first document or null rather than a cursor.
-This is useful for queries that should only match a single document, or if you are
-interested in the first document only.
-
-{{% note %}}
-Sometimes you will need the same or similar callbacks more than once.  In these situations
-it makes sense to DRY (Do not Repeat Yourself) up your code and save the callback either
-as a concrete class or assign to a variable as below:
-
-```java
-SingleResultCallback<Document> printDocument = new SingleResultCallback<Document>() {
-    @Override
-    public void onResult(final Document document, final Throwable t) {
-        System.out.println(document.toJson());
-    }
-};
-```
-{{% /note %}}
-
-The following example passes the `printDocument` callback  to the `first` method:
-
-```java
-collection.find().first(printDocument);
-```
-
-The example will print the following document:
-
-```json
-{ "_id" : { "$oid" : "551582c558c7b4fbacf16735" },
-  "name" : "MongoDB", "type" : "database", "count" : 1,
-  "info" : { "x" : 203, "y" : 102 } }
-```
-
-{{% note %}}
-The `_id` element has been added automatically by MongoDB to your
-document and your value will differ from that shown. MongoDB reserves field
-names that start with
-"_" and "$" for internal use.
-{{% /note %}}
-
-### Find All Documents in a Collection
-
-To retrieve all the documents in the collection, we will use the
-`find()` method. The `find()` method returns a `FindIterable` instance that
-provides a fluent interface for chaining or controlling find operations. Use the
-`forEach()` method to provide a `Block` to apply to each document and a callback that
-is run once the iteration has finished.
-The following code retrieves all documents in the collection and prints them out
-(101 documents) and then finally prints out "Operation Finished!":
-
-```java
-Block<Document> printDocumentBlock = new Block<Document>() {
-    @Override
-    public void apply(final Document document) {
-        System.out.println(document.toJson());
-    }
-};
-SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
-    @Override
-    public void onResult(final Void result, final Throwable t) {
-        System.out.println("Operation Finished!");
-    }
-};
-
-collection.find().forEach(printDocumentBlock, callbackWhenFinished);
-```
-
-## Get A Single Document with a Query Filter
-
-We can create a filter to pass to the find() method to get a subset of
-the documents in our collection. For example, if we wanted to find the
-document for which the value of the "i" field is 71, we would do the
-following (reusing the `printDocument` callback):
-
-```java
-import static com.mongodb.client.model.Filters.*;
-
-collection.find(eq("i", 71)).first(printDocument);
-```
-
-will eventually print just one document:
-
-```json
-{ "_id" : { "$oid" : "5515836e58c7b4fbc756320b" }, "i" : 71 }
-```
-
-
-{{% note %}}
-Use the [`Filters`]({{< relref "builders/filters.md">}}), [`Sorts`]({{< relref "builders/sorts.md">}}),
-[`Projections`]({{< relref "builders/projections.md">}}) and [`Updates`]({{< relref "builders/updates.md">}})
-helpers for simple and concise ways of building up queries.
-{{% /note %}}
-
-## Get a Set of Documents with a Query
-
-We can use the query to get a set of documents from our collection. For
-example, if we wanted to get all documents where `"i" > 50`, we could
-write (reusing `printDocumentBlock` block and `callbackWhenFinished` callback):
-
-```java
-// now use a range query to get a larger subset
-collection.find(gt("i", 50)).forEach(printDocumentBlock, callbackWhenFinished);
-```
-which should print the documents where `i > 50`.
-
-We could also get a range, say `50 < i <= 100`:
-
-```java
-collection.find(and(gt("i", 50), lte("i", 100))).forEach(printDocumentBlock, callbackWhenFinished);
-```
-
-## Sorting documents
-
-We can also use the [Sorts]({{< relref "builders/sorts.md">}}) helpers to sort documents.
-We add a sort to a find query by calling the `sort()` method on a `FindIterable`.  Below we use the [`exists()`]({{< relref "builders/filters.md#elements">}}) helper and sort
-[`descending("i")`]({{< relref "builders/sorts.md#descending">}}) helper to sort our documents:
-
-```java
-collection.find(exists("i")).sort(descending("i")).first(printDocument);
-```
-
-## Projecting fields
-
-Sometimes we don't need all the data contained in a document. The [Projections]({{< relref "builders/projections.md">}}) 
-helpers can be used to build the projection parameter for the find operation and limit the fields returned.  
-Below we'll sort the collection, exclude the `_id` field and output the first matching document:
-
-```java
-collection.find().projection(excludeId()).first(printDocument);
-```
-
-## Aggregations
-
-Sometimes we need to aggregate the data stored in MongoDB. The [`Aggregates`]({{< relref "builders/aggregation.md" >}}) helper provides 
-builders for each of type of aggregation stage.
-
-Below we'll do a simple two step transformation that will calculate the value of `i * 10`. First we find all Documents 
-where `i > 0` by using the [`Aggregates.match`]({{< relref "builders/aggregation.md#match" >}}) 
-helper. Then we reshape the document by using [`Aggregates.project`]({{< relref "builders/aggregation.md#project" >}}) 
-in conjunction with the [`$multiply`]({{< docsref "reference/operator/aggregation/multiply/" >}}) operator to calculate the "`ITimes10`" 
-value:
-
-```java
-collection.aggregate(asList(
-    match(gt("i", 0)),
-    project(Document.parse("{ITimes10: {$multiply: ['$i', 10]}}")))
-).forEach(printDocumentBlock, callbackWhenFinished);
-```
-
-For [`$group`]({{< relref "builders/aggregation.md#group" >}}) operations use the 
-[`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators" >}}) helper for any 
-[accumulator operations]({{< docsref "reference/operator/aggregation/group/#accumulator-operator" >}}). Below we sum up all the values of 
-`i` by using the [`Aggregates.group`]({{< relref "builders/aggregation.md#group" >}}) helper in conjunction with the 
-[`Accumulators.sum`]({{< apiref "com/mongodb/client/model/Accumulators#sum-java.lang.String-TExpression-" >}}) helper:
-
-```java
-collection.aggregate(singletonList(group(null, sum("total", "$i")))).first(printDocument);
-```
-
-{{% note %}}
-Currently, there are no helpers for [aggregation expressions]({{< docsref "meta/aggregation-quick-reference/#aggregation-expressions" >}}). 
-Use the [`Document.parse()`]({{< relref "bson/extended-json.md" >}}) helper to quickly build aggregation expressions from extended JSON.
-{{% /note %}}
-
-## Updating documents
-
-There are numerous [update operators](http://docs.mongodb.org/manual/reference/operator/update-field/)
-supported by MongoDB.
-
-To update at most a single document (may be 0 if none match the filter), use the [`updateOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateOne-org.bson.conversions.Bson-org.bson.conversions.Bson-">}})
-method to specify the filter and the update document. Here we use the [`Updates.set`]({{< relref "builders/updates.md#set">}}) helper to update the first document that meets the filter `i` equals `10` and set the value of `i` to `110`:
-
-```java
-collection.updateOne(eq("i", 10), set("i", 110),
-    new SingleResultCallback<UpdateResult>() {
-        @Override
-        public void onResult(final UpdateResult result, final Throwable t) {
-            System.out.println(result.getModifiedCount());
-        }
-    });
-```
-
-To update all documents matching the filter use the [`updateMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany-org.bson.conversions.Bson-org.bson.conversions.Bson-">}})
-method. Here we use the [`Updates.inc`]({{< relref "builders/updates.md#increment">}}) helper to increment the value of `i` by `100` 
-where `i` is less than `100`.
-
-```java
-collection.updateMany(lt("i", 100), inc("i", 100),
-    new SingleResultCallback<UpdateResult>() {
-        @Override
-        public void onResult(final UpdateResult result, final Throwable t) {
-            System.out.println(result.getModifiedCount());
-        }
-    });
-```
-
-The update methods return an [`UpdateResult`]({{< apiref "com/mongodb/client/result/UpdateResult.html">}}),
-which provides information about the operation including the number of documents modified by the update.
-
-## Deleting documents
-
-To delete at most a single document (may be 0 if none match the filter) use the [`deleteOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteOne-org.bson.conversions.Bson-">}})
-method:
-
-```java
-collection.deleteOne(eq("i", 110), new SingleResultCallback<DeleteResult>() {
-    @Override
-    public void onResult(final DeleteResult result, final Throwable t) {
-        System.out.println(result.getDeletedCount());
-    }
-});
-```
-
-To delete all documents matching the filter use the 
-[`deleteMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteMany-org.bson.conversions.Bson-">}}) method. Here we delete 
-all documents where `i` is greater or equal to `100`:
-
-```java
-collection.deleteMany(gte("i", 100), new SingleResultCallback<DeleteResult>() {
-    @Override
-    public void onResult(final DeleteResult result, final Throwable t) {
-        System.out.println(result.getDeletedCount());
-    }
-});
-```
-
-The delete methods return a [`DeleteResult`]({{< apiref "com/mongodb/client/result/DeleteResult.html">}}),
-which provides information about the operation including the number of documents deleted.
-
-
-## Bulk operations
-
-These commands allow for the execution of bulk
-insert/update/delete operations. There are two types of bulk operations:
-
-1.  Ordered bulk operations.
-
-      Executes all the operation in order and error out on the first write error.
-
-2.   Unordered bulk operations.
-
-      Executes all the operations and reports any the errors.
-
-      Unordered bulk operations do not guarantee order of execution.
-
-Let's look at two simple examples using ordered and unordered
-operations:
-
-```java
-SingleResultCallback<BulkWriteResult> printBatchResult = new SingleResultCallback<BulkWriteResult>() {
-    @Override
-    public void onResult(final BulkWriteResult result, final Throwable t) {
-        System.out.println(result);
-    }
-};
-
-// 2. Ordered bulk operation - order is guaranteed
-collection.bulkWrite(
-  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
-                new InsertOneModel<>(new Document("_id", 5)),
-                new InsertOneModel<>(new Document("_id", 6)),
-                new UpdateOneModel<>(new Document("_id", 1),
-                                     new Document("$set", new Document("x", 2))),
-                new DeleteOneModel<>(new Document("_id", 2)),
-                new ReplaceOneModel<>(new Document("_id", 3),
-                                      new Document("_id", 3).append("x", 4))),
-  printBatchResult
-);
-
-
- // 2. Unordered bulk operation - no guarantee of order of operation
-collection.bulkWrite(
-  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
-                new InsertOneModel<>(new Document("_id", 5)),
-                new InsertOneModel<>(new Document("_id", 6)),
-                new UpdateOneModel<>(new Document("_id", 1),
-                                     new Document("$set", new Document("x", 2))),
-                new DeleteOneModel<>(new Document("_id", 2)),
-                new ReplaceOneModel<>(new Document("_id", 3),
-                                      new Document("_id", 3).append("x", 4))),
-  new BulkWriteOptions().ordered(false),
-  printBatchResult
-);
-```
-
-{{% note class="important" %}}
-Use of the bulkWrite methods is not recommended when connected to pre-2.6 MongoDB servers, as this was the first server version to support bulk write commands for insert, update, and delete in a way that allows the driver to implement the correct semantics for BulkWriteResult and BulkWriteException. The methods will still work for pre-2.6 servers, but performance will suffer, as each write operation has to be executed one at a time.
-{{% /note %}}
diff --git a/docs/reference/content/driver-async/index.md b/docs/reference/content/driver-async/index.md
index 0d4934224b6..258ca6758ee 100644
--- a/docs/reference/content/driver-async/index.md
+++ b/docs/reference/content/driver-async/index.md
@@ -9,13 +9,25 @@ title = "MongoDB Async Driver"
 
 ## MongoDB Async Java Driver Documentation
 
-Welcome to the MongoDB Async Java driver documentation hub.
+The following guide provides information on using the callback-based MongoDB Async Java Driver 3.12.
 
-### Getting Started
+{{% note %}}
+The callback-based Async Java Driver has been deprecated in favor of the 
+[MongoDB Reactive Streams Java Driver](http://mongodb.github.io/mongo-java-driver-reactivestreams/).
+{{% /note %}}
 
-The [Getting Started]({{< relref "driver-async/getting-started/index.md" >}}) guide contains installation instructions
-and a simple tutorial to get up  and running quickly.
+### What's New in 3.10
 
-### Reference
+The driver now natively supports TLS/SSL when used with Java 8+.  
 
-For more detailed documentation, see the [Reference]({{< relref "driver-async/reference/index.md" >}}) guide.
+### What's New in 3.9
+
+The callback-based MongoDB Async Java driver has been deprecated in the 3.9 release.  
+
+## Getting Started
+
+To get started, see the [Installation Guide]({{< relref "driver-async/getting-started/installation.md" >}}), the [Quick Start Guide]({{< relref "driver-async/getting-started/quick-start.md" >}}) and the [Quick Start with POJOs Guide]({{< relref "driver-async/getting-started/quick-start-pojo.md" >}})..
+
+## Tutorials
+
+For tutorials for some frequently used operations, see the [Tutorials section]({{<relref "driver-async/tutorials/index.md">}}).
diff --git a/docs/reference/content/driver-async/reference/connecting/authenticating.md b/docs/reference/content/driver-async/reference/connecting/authenticating.md
deleted file mode 100644
index f65c404f01f..00000000000
--- a/docs/reference/content/driver-async/reference/connecting/authenticating.md
+++ /dev/null
@@ -1,234 +0,0 @@
-+++
-date = "2015-03-19T14:27:51-04:00"
-title = "Authenticating"
-[menu.main]
-  parent = "Async Connecting"
-  identifier = "Async Authenticating"
-  weight = 20
-  pre = "<i class='fa'></i>"
-+++
-
-# Authentication
-
-The Java driver supports all MongoDB [authentication mechanisms](http://docs.mongodb.org/manual/core/authentication/), including those
-only available in the MongoDB [Enterprise Edition](http://docs.mongodb.org/manual/administration/install-enterprise/).
-
-An authentication credential is represented as an instance of the
-[`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}}) class, which includes static factory methods for
-each of the supported authentication mechanisms.  A list of these instances must be passed to the driver via a
-[`MongoClients`]({{< apiref "com/mongodb/async/client/MongoClients" >}}) static factory method that takes a 
-[`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) parameter.  Alternatively, a single 
-`MongoCredential` can be created implicity via a 
-[`ConnectionString`]({{< apiref "com/mongodb/ConnectionString" >}}) and passed to a 
-`MongoClients` static factory method that takes a `ConnectionString` parameter. 
-
-{{% note %}}
-Given the flexibility of role-based access control in MongoDB, it is usually sufficient to authenticate with a single user, but, for completeness, the driver accepts a list of credentials.
-{{% /note %}}
-
-## Default authentication mechanism
-
-MongoDB 3.0 changed the default authentication mechanism from
-[MONGODB-CR](http://docs.mongodb.org/manual/core/authentication/#mongodb-cr-authentication) to
-[SCRAM-SHA-1](http://docs.mongodb.org/manual/core/authentication/#scram-sha-1-authentication).  To create a credential that will
-authenticate properly regardless of server version, create a credential using the following static factory method:
-
- ```java
-import com.mongodb.MongoCredential;
-
-// ...
-
-String user;        // the user name
-String database;    // the name of the database in which the user is defined
-char[] password;    // the password as a character array
-// ...
-MongoCredential credential = MongoCredential.createCredential(user,
-                                                              database,
-                                                              password);
-```
-
-or with a connection string:
-
-```java
-ConnectionString uri = new ConnectionString("mongodb://user1:pwd1@host1/?authSource=db1");
-```
-
-This is the recommended approach as it will make upgrading from MongoDB 2.6 to MongoDB 3.0 seamless, even after [upgrading the
-authentication schema](http://docs.mongodb.org/manual/release-notes/3.0-scram/#upgrade-mongodb-cr-to-scram).
-
-
-## SCRAM-SHA-1
-
-To explicitly create a credential of type [SCRAM-SHA-1](http://docs.mongodb .org/manual/core/authentication/#scram-sha-1-authentication)
-use the following static factory method:
-
-```java
-MongoCredential credential = MongoCredential.createScramSha1Credential(user,
-                                                                       database,
-                                                                       password);
-```
-
-or with a connection string:
-
-```java
-ConnectionString uri = new ConnectionString("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-1");
-```
-
-## MONGODB-CR
-
-To explicitly create a credential of type [MONGODB-CR](http://docs.mongodb.org/manual/core/authentication/#mongodb-cr-authentication)
-use the following static factory method:
-
-```java
-MongoCredential credential = MongoCredential.createMongoCRCredential(user,
-                                                                     database,
-                                                                     password);
-```
-
-or with a connection string:
-
-```java
-ConnectionString uri = new ConnectionString("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=MONGODB-CR");
-```
-
-Note that this is not recommended as a credential created in this way will fail to authenticate after an authentication schema upgrade
-from MONGODB-CR to SCRAM-SHA-1.
-
-## x.509
-
-The [x.509](http://docs.mongodb.org/manual/core/authentication/#x-509-certificate-authentication) mechanism authenticates a user
-whose name is derived from the distinguished subject name of the X.509 certificate presented by the driver during SSL negotiation. This
-authentication method requires the use of SSL connections with certificate validation and is available in MongoDB 2.6 and newer. To
-create a credential of this type use the following static factory method:
-
-```java
-String user;     // The x.509 certificate derived user name, e.g. "CN=user,OU=OrgUnit,O=myOrg,..."
-MongoCredential credential = MongoCredential.createMongoX509Credential(user);
-```
-
-or with a connection string:
-
-```java
-ConnectionString uri = new ConnectionString("mongodb://subjectName@host1/?authMechanism=MONGODB-X509");
-```
-
-See the MongoDB server
-[x.509 tutorial](http://docs.mongodb.org/manual/tutorial/configure-x509-client-authentication/#add-x-509-certificate-subject-as-a-user) for
-more information about determining the subject name from the certificate.
-
-## Kerberos (GSSAPI)
-
-[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy authentication through a Kerberos service.  To
-create a credential of type [Kerberos (GSSAPI)](http://docs.mongodb.org/manual/core/authentication/#kerberos-authentication) use the
-following static factory method:
-
-```java
-String user;   // The Kerberos user name, including the realm, e.g. "user1@MYREALM.ME"
-// ...
-MongoCredential credential = MongoCredential.createGSSAPICredential(user);
-```
-
-Or via a connection string:
-
-```java
-ConnectionString uri = new ConnectionString("mongodb://username%40MYREALM.com@host1/?authMechanism=GSSAPI");
-```
-
-{{% note %}}
-The method refers to the `GSSAPI` authentication mechanism instead of `Kerberos` because technically the driver is authenticating via the 
-[GSSAPI](https://tools.ietf.org/html/rfc4752) SASL mechanism.
-{{% /note %}}
-
-To successfully authenticate via Kerberos, the application typically must specify several system properties so that the underlying GSSAPI
-Java libraries can acquire a Kerberos ticket:
-
-    java.security.krb5.realm=MYREALM.ME
-    java.security.krb5.kdc=mykdc.myrealm.me
-
-Depending on the Kerberos setup, it may be required to specify additional properties, either via code or, in some cases,
-the connection string.
-
-- **[`SERVICE_NAME`]({{< apiref "com/mongodb/MongoCredential.html#SERVICE_NAME_KEY" >}})**
-
-	This property is used when the service's name is different that the default of `mongodb`.
-
-	```java
-	credential = credential.withMechanismProperty(MongoCredential.SERVICE_NAME_KEY, "othername");
-	```
-
-	Or via the connection string:
-
-	```
-	mongodb://username%40MYREALM.com@myserver/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:othername
-	```
-
-- **[`CANONICALIZE_HOST_NAME`]({{< apiref "com/mongodb/MongoCredential.html#CANONICALIZE_HOST_NAME_KEY" >}})**
-
-	This property is used when the fully qualified domain name (FQDN) of the host is required to properly authenticate.
-
-	```java
-	credential = credential.withMechanismProperty(MongoCredential.CANONICALIZE_HOST_NAME_KEY, true);
-	```
-
-	Or via the connection string:
-
-	```
-	mongodb://username%40MYREALM.com@myserver/?authMechanism=GSSAPI&authMechanismProperties=CANONICALIZE_HOST_NAME:true
-	```
-
-- **[`JAVA_SUBJECT`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SUBJECT_KEY" >}})**
-
-    This property is used for overriding the [Subject](http://docs.oracle.com/javase/8/docs/api/javax/security/auth/Subject.html)
-    under which GSSAPI authentication executes.
-
-	```java
-	LoginContext loginContext;
-	// ...
-    loginContext.login();
-    Subject subject = loginContext.getSubject()
-
-	credential = credential.withMechanismProperty(MongoCredential.JAVA_SUBJECT_KEY, subject);
-	```
-
-- **[`JAVA_SASL_CLIENT_PROPERTIES`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SASL_CLIENT_PROPERTIES_KEY" >}})**
-
-    While rarely needed, this property is used to replace the
-    [SasClient](http://docs.oracle.com/javase/8/docs/api/javax/security/sasl/SaslClient.html) properties.
-
-    ```java
-    Map<String, Object> saslClientProperties;
-	// ...
-
-	credential = credential.withMechanismProperty(MongoCredential.JAVA_SASL_CLIENT_PROPERTIES_KEY, saslClientProperties);
-	```
-
-{{% note %}}
-The `GSSAPI` authentication mechanism is supported only in the following environments:
-
-* Linux: Java 6 and above 
-* Windows: Java 7 and above with [SSPI](https://msdn.microsoft.com/en-us/library/windows/desktop/aa380493)
-* OS X: Java 7 and above
-{{% /note %}}
-
-## LDAP (PLAIN)
-
-[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy authentication through a Lightweight Directory
-Access Protocol (LDAP) service.  To create a credential of type [LDAP](http://docs.mongodb
-.org/manual/core/authentication/#ldap-proxy-authority-authentication) use the following static factory method:
-
-```java
-String user;          // The LDAP user name
-char[] password;      // The LDAP password
-// ...
-MongoCredential credential = MongoCredential.createPlainCredential(user, "$external", password);
-```
-
-or with a connection string:
-
-```java
-ConnectionString uri = new ConnectionString("mongodb://user1@host1/?authSource=$external&authMechanism=PLAIN");
-```
-
-{{% note %}}
-The method refers to the `plain` authentication mechanism instead of `LDAP` because technically the driver is authenticating via the [PLAIN](https://www.ietf.org/rfc/rfc4616.txt) SASL mechanism.
-{{% /note %}}
diff --git a/docs/reference/content/driver-async/reference/connecting/connection-settings.md b/docs/reference/content/driver-async/reference/connecting/connection-settings.md
deleted file mode 100644
index 3fb16cf6901..00000000000
--- a/docs/reference/content/driver-async/reference/connecting/connection-settings.md
+++ /dev/null
@@ -1,138 +0,0 @@
-+++
-date = "2015-03-19T12:53:30-04:00"
-title = "Connection Settings"
-[menu.main]
-  parent = "Async Connecting"
-  identifier = "Async Connection Settings"
-  weight = 10
-  pre = "<i class='fa'></i>"
-+++
-
-## Connection Settings
-
-The Java driver has two ways of specifying the settings of a connection to a MongoDB server deployment.
-
-### Connection String
-
-The [connection string](http://docs.mongodb.org/manual/reference/connection-string/) is the simplest way to specify the properties of a 
-connection. . A connection string mostly follows [RFC 3986](http://tools.ietf.org/html/rfc3986), with the exception of the domain name.
- For MongoDB, it is possible to list multiple domain names separated by a comma. Below are some example connection strings.
-
-
-- For a standalone mongod, mongos, or a direct connection to a member of a replica set:
-
-```ini
-mongodb://host:27017
-```
-
-- To connect to multiple mongos or a replica set:
-
-```ini
-mongodb://host1:27017,host2:27017
-```
-
-The [authentication guide]({{< relref "driver-async/reference/connecting/authenticating.md" >}}) contains information on how to provide credentials in the connection string.
-
-#### The Database Component
-
-The database component is optional and is used to indicate which database to authenticate against. When the database component is not
-provided, the "admin" database is used.
-
-```ini
-mongodb://host:27017/mydb
-```
-
-Above, the database by the name of "mydb" is where the credentials are stored for the application.
-
-{{% note %}}
-Some drivers utilize the database component to indicate which database to work with by default. The Java driver, while it parses the 
-database component, does not use the database component for anything other than authentication.
-{{% /note %}}
-
-#### Options
-
-Many options can be provided via the connection string. The ones that cannot may be provided in a 
-[`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) instance. To
-provide an option, append a `?` to the connection string and separate options by an `&`.
-
-```ini
-mongodb://host:27017/?replicaSet=rs0&maxPoolSize=200
-```
-
-The above connection string sets the "replicaSet" value to "rs0" and the "maxPoolSize" to "200".
-
-For a comprehensive list of the available options, see the [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString" >}}) documentation.  
-
-
-### MongoClient
-
-A [`MongoClient`]({{< apiref "com/mongodb/async/client/MongoClient" >}}) instance will be the root object for all interaction with MongoDB. It is all 
-that is needed to handle connecting to servers, monitoring servers, and performing operations against those servers. 
-
-To create a `MongoClient` use the [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create-com.mongodb.ConnectionString-" >}}) 
-static helper.  Without any arguments `MongoClients.create()` will return a [`MongoClient`]({{< apiref "com/mongodb/async/client/MongoClient" >}}) 
-instance will connect to "localhost" port 27017.  
-
-```java
-MongoClient client = MongoClients.create();
-```
-
-Alternatively, a connection string may be provided:
-
-```java
-MongoClient client = MongoClients.create(new ConnectionString("mongodb://host:27017,host2:27017/?replicaSet=rs0"));
-```
-
-Finally, the [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) class provides an in-code way to set the 
-same options from a connection string.  This is sometimes necessary, as the connection string does not allow an application to configure as 
-many properties of the connection as  `MongoClientSettings`.  
-[`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) instances are immutable, so to create one an 
-application uses a builder: 
-
-```java
-ClusterSettings clusterSettings = ClusterSettings.builder().hosts(asList(new ServerAddress("localhost"))).description("Local Server").build();
-MongoClientSettings settings = MongoClientSettings.builder().clusterSettings(clusterSettings).build();
-MongoClient client = MongoClients.create(settings);
-```
-
-### Netty Configuration
-
-By default, the async driver relies on the
-[`AsynchronousSocketChannel`](http://docs.oracle.com/javase/7/docs/api/java/nio/channels/AsynchronousSocketChannel.html) class, introduced
-in Java 7.  If configured properly, the driver will use [Netty](http://netty.io/) instead.  An application must use Netty for the 
-following reasons:
-      
-* The application is configured to use SSL to communicate with the MongoDB server.
-* The application runs on Java 6.
-         
-To configure the driver to use Netty, the application must configure the MongoClientSettings appropriately:
-         
-```java
-MongoClient client = MongoClients.create(MongoClientSettings.builder()
-                                                 .clusterSettings(ClusterSettings.builder()
-                                                                          .hosts(Arrays.asList(new ServerAddress()))
-                                                                          .build())
-                                                 .streamFactoryFactory(NettyStreamFactoryFactory.builder().build())
-                                                 .build());
-
-```
-
-or via connection string:
-
-```java
-MongoClient client = MongoClients.create("mongodb://localhost/?streamType=netty");
-```
-
-By default the Netty-based streams will use the [NioEventLoopGroup](http://netty.io/4.0/api/io/netty/channel/nio/NioEventLoopGroup.html) 
-and Netty's [default `ByteBufAllocator`](http://netty.io/4.0/api/io/netty/buffer/ByteBufAllocator.html#DEFAULT), but these are 
-configurable via the [`NettyStreamFactoryFactory`]({{< apiref "com/mongodb/connection/netty/NettyStreamFactoryFactory" >}}) constructor.   
-
-{{% note %}}
-Netty is an optional dependency of the asynchronous driver. If your application requires Netty it must explicitly add a dependency to
-Netty artifacts.  The driver is currently tested against Netty 4.0.
-{{% /note %}}
-
-{{% note %}}
-Netty may also be configured by setting the `org.mongodb.async.type` system property to `netty`, but this should be considered as 
-deprecated as of the 3.1 driver release.
-{{% /note %}}
diff --git a/docs/reference/content/driver-async/reference/connecting/index.md b/docs/reference/content/driver-async/reference/connecting/index.md
deleted file mode 100644
index 3fec46d03a5..00000000000
--- a/docs/reference/content/driver-async/reference/connecting/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
-+++
-date = "2015-03-19T12:53:30-04:00"
-title = "Connecting"
-[menu.main]
-  parent = "Async Reference"
-  identifier = "Async Connecting"
-  weight = 30
-  pre = "<i class='fa'></i>"
-+++
-
-## Connecting
-
-The reference documentation for connecting to a MongoDB server deployment is divided into three sections:   
-
-- [Connection Settings]({{<relref "driver-async/reference/connecting/connection-settings.md">}}): documentation of the various ways to specify the properties of a connection
-- [Authenticating]({{<relref "driver-async/reference/connecting/authenticating.md">}}): detailed documentation of the various ways to specify authentication credentials
-- [SSL]({{<relref "driver-async/reference/connecting/ssl.md">}}): Detailed documentation of the various ways to specify the properties of an SSL connection
diff --git a/docs/reference/content/driver-async/reference/connecting/ssl.md b/docs/reference/content/driver-async/reference/connecting/ssl.md
deleted file mode 100644
index 44de0a46ad4..00000000000
--- a/docs/reference/content/driver-async/reference/connecting/ssl.md
+++ /dev/null
@@ -1,98 +0,0 @@
-+++
-date = "2015-03-19T12:53:26-04:00"
-title = "SSL"
-[menu.main]
-  parent = "Async Connecting"
-  identifier = "Async SSL"
-  weight = 10
-  pre = "<i class='fa'></i>"
-+++
-
-## SSL
-
-The async Java driver supports SSL connections to MongoDB servers using the underlying support for SSL provided by
-[Netty](http://netty .io/). You can configure the driver to use SSL with `MongoClientSettings` by setting the sslEnabled property to true 
-and the stream factory to [`NettyStreamFactoryFactory`]({{< apiref "com/mongodb/connection/netty/NettyStreamFactoryFactory" >}}), as in:
-
-```java
-MongoClient client = MongoClients.create(MongoClientSettings.builder()
-                                                 .clusterSettings(ClusterSettings.builder()
-                                                                          .hosts(Arrays.asList(new ServerAddress()))
-                                                                          .build())
-                                                 .sslSettings(SslSettings.builder()
-                                                                      .enabled(true)
-                                                                      .build())
-                                                 .streamFactoryFactory(NettyStreamFactoryFactory.builder().build())
-                                                 .build());
-
-```
-
-or via connection string:
-
-```java
-MongoClient client = MongoClients.create("mongodb://localhost/?ssl=true&streamType=netty");
-```
-
-See [Netty Configuration]({{< relref "driver-async/reference/connecting/connection-settings.md#netty-configuration" >}}) for details on 
-configuring Netty.
-
-### Host name verification
-
-By default, the driver ensures that the host name included in the server's SSL certificate(s) matches the host name(s) provided when 
-constructing a `MongoClient`.  However, this host name verification requires a Java 7 JVM, as it relies on additions to the 
-`javax.net.SSLParameters` class that were introduced in Java 7.  If your application must run on Java 6, or for some other reason you need
- to disable host name verification, you must expicitly indicate this in `SslSettings` using the `invalidHostNameAllowed` property:
-   
-```java
-MongoClient client = MongoClients.create(MongoClientSettings.builder()
-                                                 .clusterSettings(ClusterSettings.builder()
-                                                                          .hosts(Arrays.asList(new ServerAddress()))
-                                                                          .build())
-                                                  .sslSettings(SslSettings.builder()
-                                                                       .enabled(true)
-                                                                       .invalidHostNameAllowed(true)
-                                                                       .build())
-                                                  .streamFactoryFactory(NettyStreamFactoryFactory.builder().build())
-                                                  .build());
-```
-
-or via connection string:
-
-```java
-MongoClient client = MongoClients.create("mongodb://localhost/?ssl=true&sslInvalidHostNameAllowed=true&streamType=netty");
-```
-
-### JVM system properties
-
-A typical application will need to set several JVM system properties to ensure that the client is able to validate the SSL certificate 
-presented by the server:
-
-- `javax.net.ssl.trustStore`: the path to a trust store containing the certificate of the signing authority
-- `javax.net.ssl.trustStorePassword`: the password to access this trust store 
-
-The trust store is typically created with the [keytool](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) 
-command line program provided as part of the JDK.  For example:
-
-```bash
-    keytool -importcert -trustcacerts -file <path to certificate authority file> 
-        -keystore <path to trust store> -storepass <password>
-```
-
-A typical application will also need to set several JVM system properties to ensure that the client presents an SSL certificate to the 
-MongoDB server:
-
-- `javax.net.ssl.keyStore`: the path to a key store containing the client's SSL certificates
-- `javax.net.ssl.keyStorePassword`: the password to access this key store
- 
-The key store is typically created with the [keytool](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) or the
-[openssl](https://www.openssl.org/docs/apps/openssl.html) command line program.
-
-For more information on configuring a Java application for SSL, please refer to the  
-[JSSE Reference Guide](http://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html).
-
-
-
-
-
-
-   
diff --git a/docs/reference/content/driver-async/reference/crud/index.md b/docs/reference/content/driver-async/reference/crud/index.md
deleted file mode 100644
index 3a2c00cf803..00000000000
--- a/docs/reference/content/driver-async/reference/crud/index.md
+++ /dev/null
@@ -1,195 +0,0 @@
-+++
-date = "2015-03-19T12:53:30-04:00"
-title = "CRUD Operations"
-[menu.main]
-  parent = "Async Reference"
-  identifier = "Async CRUD Operations"
-  weight = 70
-  pre = "<i class='fa'></i>"
-+++
-
-
-## CRUD
-
-For a walkthrough of the main CRUD operations please refer to the [Quick Tour]({{< ref "driver-async/getting-started/quick-tour.md" >}}).
-
-All CRUD-related methods in the Java driver are accessed through the 
-[`MongoCollection`]({{< apiref "com/mongodb/async/client/MongoCollection" >}}) interface.  Instances of 
-[`MongoCollection`]({{< apiref "com/mongodb/async/client/MongoCollection" >}}) can be obtained from a  
-[`MongoClient`]({{< apiref "com/mongodb/async/client/MongoClient" >}}) instance by way of a
-[`MongoDatabase`]({{< apiref "com/mongodb/async/client/MongoDatabase" >}}):
-
-```java
-MongoClient client = MongoClients.create();
-MongoDatabase database = client.getDatabase("mydb");
-MongoCollection<Document> collection = database.getCollection("mycoll");
-```
-
-[`MongoCollection`]({{< apiref "com/mongodb/async/client/MongoCollection" >}}) is a generic interface: the `TDocument` type parameter 
-is the class that clients use to insert or replace documents in a collection, and the default type returned from `find` and `aggregate`.
- 
-The single-argument `getCollection` method returns an instance of `MongoCollection<Document>`, and so with this type of collection 
-an application uses instances of the `Document` class:
-
-```java
-MongoCollection<Document> collection = database.getCollection("mycoll");
-
-// insert a document
-Document document = new Document("x", 1)
-collection.insertOne(document, new SingleResultCallback<Void>() {
-   @Override
-   public void onResult(final Void result, final Throwable t) {
-       System.out.println("Inserted!");
-   }
-});
-
-...
-
-document.append("x", 2).append("y", 3);
-
-// replace a document
-collection.replaceOne(Filters.eq("_id", document.get("_id"), document, 
-    new SingleResultCallback<UpdateResult>() {
-       @Override
-       public void onResult(final UpdateResult result, final Throwable t) {
-           System.out.println(result.getModifiedCount());
-       }
-   });
-
-...
-
-// find documents
-collection.find().into(new ArrayList<Document>(), 
-    new SingleResultCallback<List<Document>>() {
-        @Override
-        public void onResult(final List<Document> result, final Throwable t) {
-            System.out.println("Found Documents: #" + result.size());
-        }
-    });
-```
-
-### CodecRegistry
-
-An overload of the `getCollection` method allows clients to specify a different class for representing BSON documents.  For example, 
-users my wish to use the type-safe [`BsonDocument`]({{< apiref "org/bson/BsonDocument" >}}) with the CRUD API:
-
-```java
-// Pass BsonDocument.class as the second argument
-MongoCollection<BsonDocument> collection = database.getCollection("mycoll", BsonDocument.class);
-
-// insert a document
-BsonDocument document = new BsonDocument("x", new BsonInt32(1));
-collection.insertOne(document, new SingleResultCallback<Void>() {
-   @Override
-   public void onResult(final Void result, final Throwable t) {
-       System.out.println("Inserted!");
-   }
-});
-
-...
-
-document.append("x", new BsonInt32(2)).append("y", new BsonInt32(3));
-
-// replace a document
-collection.replaceOne(Filters.eq("_id", document.get("_id"), document, 
-    new SingleResultCallback<UpdateResult>() {
-       @Override
-       public void onResult(final UpdateResult result, final Throwable t) {
-           System.out.println(result.getModifiedCount());
-       }
-   });
-
-...
-
-// find documents
-collection.find().into(new ArrayList<BsonDocument>(), 
-    new SingleResultCallback<List<BsonDocument>>() {
-        @Override
-        public void onResult(final List<BsonDocument> result, final Throwable t) {
-            System.out.println("Found BsonDocuments: #" + result.size());
-        }
-    });
-```
-
-There are two requirements that must be met for any class used in this way:
-
-- a `Codec` for it must be registered in the `MongoCollection`'s `CodecRegistry`
-- the `Codec` must be one that encodes and decodes a full BSON document (and not just, for example, a single BSON value like an Int32)
-
-By default, a `MongoCollection` is configured with `Codec`s for two classes:
- 
-- `Document`
-- `BsonDocument`
-
-Applications, however, are free to register `Codec` implementations for other classes by customizing the `CodecRegistry`.  New 
-`CodecRegistry` instances are configurable at three levels:
-
-- In a `MongoClient` via `MongoClientOptions`
-- In a `MongoDatabase` via its `withCodecRegistry` method
-- In a `MongoCollection` via its `withCodecRegistry` method
-
-Consider the case of encoding and decoding instances of the `UUID` class.  The Java driver by default encodes instances of `UUID` using a
-byte ordering that is not compatible with other MongoDB drivers, and changing the default would be quite dangerous.  But it is 
-possible for new applications that require interoperability across multiple drivers to be able to change that default, and they can do 
-that with a `CodecRegistry`.   
-
-```java
-// Replaces the default UuidCodec with one that uses the new standard UUID representation
-CodecRegistry codecRegistry = 
-CodecRegistries.fromRegistries(CodecRegistries.fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)),
-                               MongoClient.getDefaultCodecRegistry());
-
-// globally
-MongoClientSettings clientSettings = MongoClients.create("mongodb://localhost").ggetSettings();
-newClientSettings = MongoClientSettings.builder(clientSettings).codecRegistry(codecRegistry).build();
-MongoClient client = MongoClients.create(newClientSettings);
- 
-
-// or per database
-MongoDatabase database = client.getDatabase("mydb")
-                               .withCodecRegistry(codecRegistry);
-
-// or per collection
-MongoCollection<Document> collection = database.getCollection("mycoll")
-                                               .withCodecRegistry(codecRegistry);
-```
-
-
-### Write Concern
-
-Applications can configure the `WriteConcern` that a `MongoCollection` uses for write operations.  Like `CodecRegistry`, the 
-`WriteConcern` can be configured at three levels:
-
-- In a `MongoClient` via `MongoClientOptions`
-- In a `MongoDatabase` via its `withWriteConcern` method
-- In a `MongoCollection` via its `withWriteConcern` method
-
-
-### Read Preference
-
-Applications can configure the `ReadPreference` that a `MongoCollection` uses for read operations.  Like `WriteConcern`, the 
-`ReadPreference` can be configured at three levels:
-
-- In a `MongoClient` via `MongoClientOptions`
-- In a `MongoDatabase` via its `withReadPreference` method
-- In a `MongoCollection` via its `withReadPreference` method
-
-### Immutability of MongoDatabase and MongoCollection
-
-Instance of `MongoDatabase` and `MongoCollection` are immutable, so rather than mutate the state of the `MongoCollection` on which they
-are invoked, the three methods discussed above return new instances.  Applications should therefore be sure to store the result of the 
-method call.  For example:
-
-```java
-// CORRECT: The results of the method calls are chained and the final one is referenced 
-// by collection 
-MongoCollection<Document> collection = database.getCollection("mycoll")
-                                                .withWriteConcern(WriteConcern.JOURNALED)
-                                                .withReadPreference(ReadPreference.primary())
-                                                .withCodecRegistry(newRegistry);
-
-// INCORRECT: withReadPreference returns a new instance of MongoCollection
-// It does not modify the collection it's called on.  So this will
-// have no effect
-collection.withReadPreference(ReadPreference.secondary());
-```
diff --git a/docs/reference/content/driver-async/reference/gridfs/index.md b/docs/reference/content/driver-async/reference/gridfs/index.md
deleted file mode 100644
index 498bdaa5991..00000000000
--- a/docs/reference/content/driver-async/reference/gridfs/index.md
+++ /dev/null
@@ -1,314 +0,0 @@
-+++
-date = "2015-11-27T12:00:00-00:00"
-title = "GridFS"
-[menu.main]
-  parent = "Async Reference"
-  identifier = "Async GridFS"
-  weight = 80
-  pre = "<i class='fa'></i>"
-+++
-
-
-## GridFS
-
-GridFS is a specification for storing and retrieving files that exceed the BSON-document size limit of 16MB.
-
-Instead of storing a file in a single document, GridFS divides a file into parts, or chunks, and stores each of those chunks as a separate document. By default GridFS limits chunk size to 255k. GridFS uses two collections to store files. The chunks collection stores the file chunks, and the files collection stores the file metadata.
-
-When you query a GridFS store for a file, the driver or client will reassemble the chunks as needed. GridFS is useful not only for storing files that exceed 16MB but also for storing any files for which you want access without having to load the entire file into memory.
-
-{{% note %}}
-For more information about GridFS see the [MongoDB GridFS documentation](http://docs.mongodb.org/manual/core/gridfs/).
-{{% /note %}}
-
-The following code snippets come from the `GridFSTour.java` example code
-that can be found with the [driver source]({{< srcref "driver-async/src/examples/gridfs/GridFSTour.java">}}).
-
-{{% note class="important" %}}
-It's important to always check for errors in any `SingleResponseCallback<T>` implementation and handle them appropriately! 
-Below the error checks are left out only for the sake of brevity.
-{{% /note %}}
-
-## Async Streams
-
-As there are multiple API's for Asynchronous I/O on the JVM the GridFS library uses a flexible interfaces for asynchronous input and output.
-The [`AsyncInputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncInputStream" >}}) interface represents an `InputStream`
-and the [`AsyncOutputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncOutputStream" >}}) interface represents an `OutputStream`.
-
-In addition to these interfaces there are the following helpers:
-
-* [`AsyncStreamHelper`]({{< apiref "com/mongodb/async/client/gridfs/helpers/AsyncStreamHelper" >}}) which provides support for:
-    * `byte[]`
-    * `ByteBuffer`
-    * `InputStream` - note: input streams are blocking
-    * `OutputStream` - note: output streams are blocking
-    
-* [`AsynchronousChannelHelper`]({{< apiref "com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelper" >}}) which provides support for:
-    * `AsynchronousByteChannel`
-    * `AsynchronousFileChannel`
-
-These interfaces should be easy to wrap for any alternative asynchronous I/O implementations such as Netty or Vertx.
-
-## Connecting to GridFS
-
-Interactions with GridFS are done via the [`GridFSBucket`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket" >}}) class.
-To create a `GridFSBucket` use the [`GridFSBuckets`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBuckets" >}}) factory class.  
-
-Creating a `GridFSBucket` requires an instance of a
-[`MongoDatabase`]({{< apiref "com/mongodb/async/client/MongoDatabase" >}}) and you can optionally provide a custom bucket name.
-
-The following example shows how to create a `GridFSBucket`:
-
-```java
-// Create a gridFSBucket using the default bucket name "fs"
-GridFSBucket gridFSBucket = GridFSBuckets.create(myDatabase);
-
-// Create a gridFSBucket with a custom bucket name "files"
-GridFSBucket gridFSBucket = GridFSBuckets.create(myDatabase, "files");
-```
-
-## Uploading to GridFS
-
-There are two main ways to upload data into GridFS.  
-
-### UploadFromStream
-
-The [`uploadFromStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#openUploadStream-java.lang.String-com.mongodb.client.gridfs.model.GridFSUploadOptions-" >}}) method
-reads the contents of an [`AsyncInputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncInputStream" >}}) and saves it to the `GridFSBucket`.
-The size of the chunks defaults to 255 bytes, but can be configured via the [`GridFSUploadOptions`]({{< apiref "com/mongodb/async/client/gridfs/model/GridFSUploadOptions" >}}).
-
-The following example uploads an `AsyncInputStream` into `GridFSBucket`:
-
-```java
-// Get the input stream
-Path inputPath = Paths.get("/tmp/mongodb-tutorial.pdf");
-AsynchronousFileChannel streamToDownloadTo = AsynchronousFileChannel.open(outputPath, StandardOpenOptionRead);
-final AsyncInputStream streamToUploadFrom = channelToInputStream(streamToDownloadTo); // Using the AsynchronousChannelHelper
-
-// Create some custom options
-GridFSUploadOptions options = new GridFSUploadOptions()
-                                    .chunkSizeBytes(1024 * 1024)
-                                    .metadata(new Document("type", "presentation"));
-
-gridFSBucket.uploadFromStream("mongodb-tutorial", streamToUploadFrom, options, 
-    new SingleResultCallback<ObjectId>() {
-       @Override
-       public void onResult(final ObjectId result, final Throwable t) {
-           System.out.println("The fileId of the uploaded file is: " + result.toHexString());
-            streamToUploadFrom.close(new SingleResultCallback<Void>() {
-                @Override
-                public void onResult(final Void result, final Throwable t) {
-                    // Stream closed
-                }
-            });
-       }
-    }
-);
-```
-
-### OpenUploadStream
-
-The [`openUploadStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#openUploadStream-java.lang.String-com.mongodb.client.gridfs.model.GridFSUploadOptions-">}}) method returns a [`GridFSUploadStream`]({{< apiref "mongodb/client/gridfs/GridFSUploadStream.html">}}) which extends [`AsyncOutputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncOutputStream" >}}) and can be written to.
-
-The `GridFSUploadStream` buffers data until it reaches the `chunkSizeBytes` and then inserts the chunk into the chunks collection.
-When the `GridFSUploadStream` is closed, the final chunk is written and the file metadata is inserted into the files collection.
-
-The following example uploads an into `GridFSBucket` via the returned `OutputStream`:
-
-```java
-ByteBuffer data = ByteBuffer.wrap("Data to upload into GridFS".getBytes(StandardCharsets.UTF_8));
-final GridFSUploadStream uploadStream = gridFSBucket.openUploadStream("sampleData");
-uploadStream.write(data, new SingleResultCallback<Integer>() {
-    @Override
-    public void onResult(final Integer result, final Throwable t) {
-        System.out.println("The fileId of the uploaded file is: " + uploadStream.getFileId().toHexString());
-
-        uploadStream.close(new SingleResultCallback<Void>() {
-            @Override
-            public void onResult(final Void result, final Throwable t) {
-                // Stream closed
-            }
-        });
-    }
-});
-```
-
-{{% note %}}
-GridFS will automatically create indexes on the files and chunks collections on first upload of data into the GridFS bucket.
-{{% /note %}}
-
-## Finding files stored in GridFS
-
-To find the files stored in the `GridFSBucket` use the [`find`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#find--">}}) method.
-
-The following example prints out the filename of each file stored:
-
-```java
-gridFSBucket.find().forEach(
-    new Block<GridFSFile>() {
-        @Override
-        public void apply(final GridFSFile gridFSFile) {
-            System.out.println(gridFSFile.getFilename());
-        }
-    }, 
-    new SingleResultCallback<Void>() {
-        @Override
-        public void onResult(final Void result, final Throwable t) {
-            // Finished
-        }
-    }
-);
-```
-
-You can also provide a custom filter to limit the results returned. The following example prints out the filenames of all files with a "image/png" value set as the contentType in the user defined metadata document:
-
-```java
-gridFSBucket.find(eq("metadata.contentType", "image/png")).forEach(
-    new Block<GridFSFile>() {
-        @Override
-        public void apply(final GridFSFile gridFSFile) {
-            System.out.println(gridFSFile.getFilename());
-        }
-    },
-    new SingleResultCallback<Void>() {
-        @Override
-        public void onResult(final Void result, final Throwable t) {
-            // Finished
-        }
-    }
-);
-```
-
-## Downloading from GridFS
-
-There are four main ways to download data from GridFS.
-
-### DownloadFromStream
-
-The [`downloadToStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#downloadToStream-org.bson.types.ObjectId-java.io.OutputStream-" >}}) method reads the contents from MongoDB and writes the data directly to the provided [`AsyncOutputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncOutputStream" >}}).
-
-The following example downloads a file into the provided `OutputStream`:
-
-```java
-Path outputPath = Paths.get("/tmp/mongodb-tutorial.pdf");
-final AsynchronousFileChannel streamToDownloadTo = AsynchronousFileChannel.open(outputPath, StandardOpenOption.CREATE_NEW,
-        StandardOpenOption.WRITE, StandardOpenOption.DELETE_ON_CLOSE);
-gridFSBucket.downloadToStream(fileId, channelToOutputStream(streamToDownloadTo), new SingleResultCallback<Long>() {
-    @Override
-    public void onResult(final Long result, final Throwable t) {
-        streamToDownloadTo.close();
-        System.out.println("downloaded file sized: " + result);
-    }
-});
-```
-
-### DownloadToStreamByName
-
-If you don't know the [`ObjectId`]({{< apiref "org/bson/types/ObjectId.html">}}) of the file you want to download, then you use the [`downloadToStreamByName`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#downloadToStreamByName-java.lang.String-java.io.OutputStream-com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions-" >}}) method. By default it will download the latest version of the file. Use the [`GridFSDownloadByNameOptions`]({{< apiref "com/mongodb/async/client/gridfs/model/GridFSDownloadByNameOptions.html" >}}) to configure which version to download.
-
-The following example downloads the original version of the file named "mongodb-tutorial" into the `OutputStream`:
-
-```java
-final streamToDownloadTo = AsynchronousFileChannel.open(outputPath, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE,
-        StandardOpenOption.DELETE_ON_CLOSE);
-GridFSDownloadByNameOptions downloadOptions = new GridFSDownloadByNameOptions().revision(0);
-gridFSBucket.downloadToStreamByName("mongodb-tutorial", channelToOutputStream(streamToDownloadTo), downloadOptions,
-    new SingleResultCallback<Long>() {
-        @Override
-        public void onResult(final Long result, final Throwable t) {
-            System.out.println("downloaded file sized: " + result);
-            streamToDownloadTo.close();
-        }
-    }
-);
-```
-
-### OpenDownloadStream
-
-The [`openDownloadStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#openDownloadStream-org.bson.types.ObjectId-">}}) method returns a [`GridFSDownloadStream`]({{< apiref "mongodb/client/gridfs/GridFSDownloadStream.html">}}) which extends [`AsyncInputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncInputStream" >}}) and can be read from.
-
-The following example reads from the `GridFSBucket` via the returned `AsyncInputStream`:
-
-```java
-final ByteBuffer dstByteBuffer = ByteBuffer.allocate(1024 * 1024);
-final GridFSDownloadStream downloadStream = gridFSBucket.openDownloadStream(fileId);
-downloadStream.read(dstByteBuffer, new SingleResultCallback<Integer>() {
-    @Override
-    public void onResult(final Integer result, final Throwable t) {
-        dstByteBuffer.flip();
-        byte[] bytes = new byte[result];
-        dstByteBuffer.get(bytes);
-        System.out.println(new String(bytes, StandardCharsets.UTF_8));
-
-        downloadStream.close(new SingleResultCallback<Void>() {
-            @Override
-            public void onResult(final Void result, final Throwable t) {
-                // Finished
-            }
-        });
-    }
-});
-```
-
-### OpenDownloadStreamByName
-
-You can also open a `GridFSDownloadStream` by searching against the filename, using the [`openDownloadStreamByName`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#openDownloadStreamByName-java.lang.String-com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions-" >}}) method. By default it will download the latest version of the file. Use the [`GridFSDownloadByNameOptions`]({{< apiref "com/mongodb/async/client/gridfs/model/GridFSDownloadByNameOptions.html" >}}) to configure which version to download.
-
-The following example downloads the latest version of the file named "sampleData" into the `dstByteBuffer` ByteBuffer:
-
-```java
-final GridFSDownloadStream downloadStreamByName = gridFSBucket.openDownloadStreamByName("sampleData");
-final ByteBuffer dstByteBuffer = ByteBuffer.allocate(1024 * 1024);
-downloadStreamByName.read(dstByteBuffer, new SingleResultCallback<Integer>() {
-    @Override
-    public void onResult(final Integer result, final Throwable t) {
-        dstByteBuffer.flip();
-        byte[] bytes = new byte[result];
-        dstByteBuffer.get(bytes);
-        System.out.println(new String(bytes, StandardCharsets.UTF_8));
-
-        downloadStreamByName.close(new SingleResultCallback<Void>() {
-            @Override
-            public void onResult(final Void result, final Throwable t) {
-                // Finished
-            }
-        });
-    }
-});
-```
-
-## Renaming files
-
-If you should need to rename a file, then the [`rename`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#rename-org.bson.types.ObjectId-java.lang.String-">}}) method can be used.  
-
-The following example renames a file to "mongodbTutorial":
-
-```java
-gridFSBucket.rename(fileId, "mongodbTutorial", new SingleResultCallback<Void>() {
-    @Override
-    public void onResult(final Void result, final Throwable t) {
-        System.out.println("Renamed file");
-    }
-});
-```
-
-{{% note %}}
-The `rename` method requires an `ObjectId` rather than a `filename` to ensure the correct file is renamed.
-
-To rename multiple revisions of the same filename, first retrieve the full list of files. Then for every file that should be renamed then execute `rename` with the corresponding `_id`.
-{{% /note %}}
-
-## Deleting files
-
-To delete a file from the `GridFSBucket` use the [`delete`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#delete-org.bson.types.ObjectId-">}}) method.
-
-The following example deletes a file from the `GridFSBucket`:
-
-```java
-gridFSBucket.delete(fileId, new SingleResultCallback<Void>() {
-    @Override
-    public void onResult(final Void result, final Throwable t) {
-        System.out.println("Deleted file");
-    }
-});
-```
diff --git a/docs/reference/content/driver-async/reference/index.md b/docs/reference/content/driver-async/reference/index.md
index 42a7de88841..57a870e6a3a 100644
--- a/docs/reference/content/driver-async/reference/index.md
+++ b/docs/reference/content/driver-async/reference/index.md
@@ -10,11 +10,11 @@ title = "Reference"
 
 ## Reference
 
-The reference documentation for the Java driver focuses on high-level documentation and use-cases. The Javadoc-generated API reference is
-[here]({{< apiref "" >}}).    
+The reference documentation for the Java driver focuses on high-level documentation and use-cases. 
 
-- [Connecting]({{< relref "driver-async/reference/connecting/index.md" >}}): Documentation of the driver's support for connecting to MongoDB servers
-- [CRUD]({{< relref "driver-async/reference/crud/index.md" >}}): Documentation of the driver's support for CRUD operations
-- [Management]({{< relref "driver-async/reference/management/index.md" >}}): Documentation of the driver's support for logging and monitoring of its 
-internal state
+- [Logging]({{< relref "driver-async/reference/logging.md" >}})
+
+- [Monitoring]({{< relref "driver-async/reference/monitoring.md" >}})
+
+See also [Javadoc-generated API]({{< apiref "" >}}).
 
diff --git a/docs/reference/content/driver-async/reference/logging.md b/docs/reference/content/driver-async/reference/logging.md
new file mode 100644
index 00000000000..887b39d2df8
--- /dev/null
+++ b/docs/reference/content/driver-async/reference/logging.md
@@ -0,0 +1,31 @@
++++
+date = "2015-03-18T21:14:20-04:00"
+title = "Logging"
+[menu.main]
+  parent = "Async Reference"
+  identifier = "Async Logging"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+# Logging
+
+By default, logging is enabled via the popular [SLF4J](http://www.slf4j.org/) API. The use of [SLF4J](http://www.slf4j.org/) is optional;
+the driver will use SLF4J if the driver detects the presence of SLF4J API (class `org.slf4j.Logger`) in the classpath. 
+Otherwise, the driver will fall back to JUL (`java.util.logging`).
+
+The driver uses the following logger names:
+
+- `org.mongodb.driver`: the root logger
+    - `cluster`: for logs related to monitoring of the MongoDB servers to which the driver connects
+    - `connection`: for logs related to connections and connection pools
+    - `protocol`: for logs related to protocol message sent to and received from a MongoDB server
+        - `insert`: for logs related to insert messages and responses
+        - `update`: for logs related to update messages and responses
+        - `delete`: for logs related to delete messages and responses
+        - `query`: for logs related to query messages and responses
+        - `getmore`: for logs related to getmore messages and responses
+        - `killcursor`: for logs related to killcursor messages and responses
+        - `command`: for logs related to command messages and responses
+    - `uri`: for logs related to connection string parsing
+    - `management`: for logs related to JMX
diff --git a/docs/reference/content/driver-async/reference/management/index.md b/docs/reference/content/driver-async/reference/management/index.md
deleted file mode 100644
index a0086050c6a..00000000000
--- a/docs/reference/content/driver-async/reference/management/index.md
+++ /dev/null
@@ -1,16 +0,0 @@
-+++
-date = "2015-03-19T14:27:51-04:00"
-title = "Management"
-[menu.main]
-  parent = "Async Reference"
-  identifier = "Async Management"
-  weight = 80
-  pre = "<i class='fa'></i>"
-+++
-
-## Management
-
-The driver provides two mechanisms for examining its state:
-
-- [Logging]({{< relref "driver-async/reference/management/logging.md" >}}): Comprehensive logging of all operations using [SLF4J](http://www.slf4j.org/)
-- [Monitoring]({{< relref "driver-async/reference/management/monitoring.md" >}}): Built on [JMX](http://docs.oracle.com/javase/8/docs/technotes/guides/jmx/) 
diff --git a/docs/reference/content/driver-async/reference/management/logging.md b/docs/reference/content/driver-async/reference/management/logging.md
deleted file mode 100644
index a49c0467dbc..00000000000
--- a/docs/reference/content/driver-async/reference/management/logging.md
+++ /dev/null
@@ -1,31 +0,0 @@
-+++
-date = "2015-03-18T21:14:20-04:00"
-title = "Logging"
-[menu.main]
-  parent = "Async Management"
-  identifier = "Async Logging"
-  weight = 10
-  pre = "<i class='fa'></i>"
-+++
-
-# Logging
-
-By default, logging is enabled via the popular [SLF4J](http://www.slf4j.org/) API. The use of [SLF4J](http://www.slf4j.org/) is optional;
-the driver will use SLF4J if the driver detects the presence of SLF4J in the classpath. Otherwise, the driver will fall back to 
-JUL (`java.util.logging`).
-
-The driver uses the following logger names:
-
-- `org.mongodb.driver`: the root logger
-    - `cluster`: for logs related to monitoring of the MongoDB servers to which the driver connects
-    - `connection`: for logs related to connections and connection pools
-    - `protocol`: for logs related to protocol message sent to and received from a MongoDB server
-        - `insert`: for logs related to insert messages and responses
-        - `update`: for logs related to update messages and responses
-        - `delete`: for logs related to delete messages and responses
-        - `query`: for logs related to query messages and responses
-        - `getmore`: for logs related to getmore messages and responses
-        - `killcursor`: for logs related to killcursor messages and responses
-        - `command`: for logs related to command messages and responses
-    - `uri`: for logs related to connection string parsing
-    - `management`: for logs related to JMX
diff --git a/docs/reference/content/driver-async/reference/management/monitoring.md b/docs/reference/content/driver-async/reference/management/monitoring.md
deleted file mode 100644
index e639fdd005a..00000000000
--- a/docs/reference/content/driver-async/reference/management/monitoring.md
+++ /dev/null
@@ -1,184 +0,0 @@
-+++
-date = "2015-03-19T12:53:26-04:00"
-title = "Monitoring"
-[menu.main]
-  parent = "Async Management"
-  identifier = "Async Monitoring"
-  weight = 100
-  pre = "<i class='fa'></i>"
-+++
-
-# JMX Monitoring
-
-The driver uses [JMX](http://docs.oracle.com/javase/8/docs/technotes/guides/jmx/) to create
-[MXBeans](http://docs.oracle.com/javase/tutorial/jmx/mbeans/mxbeans.html) that allow an
-application or end user to monitor various aspects of the driver.
-
-The driver creates MXBean instances of a single type:
-[ConnectionPoolStatisticsMBean]({{< apiref "com/mongodb/management/ConnectionPoolStatisticsMBean" >}}).
- The driver registers one `ConnectionPoolStatisticsMBean` instance per each server it connects to. For example, in the case of a replica 
- set, the driver creates an instance per each non-hidden member of the replica set.
-
-Each MXBean instance is required to be registered with a unique object name, which consists of a domain and a set of named properties. All 
-MXBean instances created by the driver are under the domain `"org.mongodb.driver"`.  Instances of `ConnectionPoolStatisticsMBean` will have 
-the following properties:
-
-- `clusterId`: a client-generated unique identifier, required to ensure object name uniqueness in situations where an
-application has multiple `MongoClient` instances connected to the same MongoDB server deployment
-- `host`: the host name of the server
-- `port`: the port on which the server is listening
-- `minSize`: the minimum allowed size of the pool, including idle and in-use members
-- `maxSize`: the maximum allowed size of the pool, including idle and in-use members
-- `size`: the current size of the pool, including idle and and in-use members
-- `waitQueueSize`: the current size of the wait queue for a connection from this pool
-- `checkedOutCount`: the current count of connections that are currently in use
-
-# Command Monitoring
-
-The driver implements the
-[command monitoring specification](https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst),
-allowing an application to be notified when a command starts and when it either succeeds or fails.
-
-An application registers command listeners with a `MongoClient` by configuring `MongoClientSettings` with instances of classes
-that implement the [`CommandListener`]({{< apiref "com/mongodb/event/CommandListener" >}}) interface. Consider the following, somewhat
-simplistic, implementation of the `CommandListener` interface:
-
-```java
-public class TestCommandListener implements CommandListener {
-    @Override
-    public void commandStarted(final CommandStartedEvent event) {
-        System.out.println(String.format("Sent command '%s:%s' with id %s to database '%s' "
-                                         + "on connection '%s' to server '%s'",
-                                         event.getCommandName(),
-                                         event.getCommand().get(event.getCommandName()),
-                                         event.getRequestId(),
-                                         event.getDatabaseName(),
-                                         event.getConnectionDescription()
-                                              .getConnectionId(),
-                                         event.getConnectionDescription().getServerAddress()));
-    }
-
-    @Override
-    public void commandSucceeded(final CommandSucceededEvent event) {
-        System.out.println(String.format("Successfully executed command '%s' with id %s "
-                                         + "on connection '%s' to server '%s'",
-                                         event.getCommandName(),
-                                         event.getRequestId(),
-                                         event.getConnectionDescription()
-                                              .getConnectionId(),
-                                         event.getConnectionDescription().getServerAddress()));
-    }
-
-    @Override
-    public void commandFailed(final CommandFailedEvent event) {
-        System.out.println(String.format("Failed execution of command '%s' with id %s "
-                                         + "on connection '%s' to server '%s' with exception '%s'",
-                                         event.getCommandName(),
-                                         event.getRequestId(),
-                                         event.getConnectionDescription()
-                                              .getConnectionId(),
-                                         event.getConnectionDescription().getServerAddress(),
-                                         event.getThrowable()));
-    }
-}
-```
-
-and an instance of `MongoClientSettings` configured with an instance of `TestCommandListener`:
-
-```java
-ClusterSettings clusterSettings = ...
-MongoClientSettings settings = MongoClientSettings.builder()
-                                       .clusterSettings(clusterSettings)
-                                       .addCommandListener(new TestCommandListener())
-                                       .build();
-MongoClient client = MongoClients.create(settings);
-```
-
-A `MongoClient` configured with these options will print a message to `System.out` before sending each command to a MongoDB server, and
-another message upon either successful completion or failure of each command.
-
-# Cluster Monitoring
-
-The driver implements the
-[SDAM Monitoring specification](https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst),
-allowing an application to be notified when the driver detects changes to the topology of the MongoDB cluster to which it is connected.
-
-An application registers listeners with a `MongoClient` by configuring  `MongoClientSettings` with instances of classes that
-implement any of the [`ClusterListener`]({{< apiref "com/mongodb/event/ClusterListener" >}}),
- [`ServerListener`]({{< apiref "com/mongodb/event/ServerListener" >}}),
-or [`ServerMonitorListener`]({{< apiref "com/mongodb/event/ServerMonitorListener" >}}) interfaces.
-
-Consider the following, somewhat simplistic, example of a cluster listener:
-
-```java
-public class TestClusterListener implements ClusterListener {
-    private final ReadPreference readPreference;
-    private boolean isWritable;
-    private boolean isReadable;
-
-    public TestClusterListener(final ReadPreference readPreference) {
-        this.readPreference = readPreference;
-    }
-
-    @Override
-    public void clusterOpening(final ClusterOpeningEvent clusterOpeningEvent) {
-        System.out.println(String.format("Cluster with unique client identifier %s opening",
-                clusterOpeningEvent.getClusterId()));
-    }
-
-    @Override
-    public void clusterClosed(final ClusterClosedEvent clusterClosedEvent) {
-        System.out.println(String.format("Cluster with unique client identifier %s closed",
-                clusterClosedEvent.getClusterId()));
-    }
-
-    @Override
-    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
-        if (!isWritable) {
-            if (event.getNewDescription().hasWritableServer()) {
-                isWritable = true;
-                System.out.println("Writable server available!");
-            }
-        } else {
-            if (!event.getNewDescription().hasWritableServer()) {
-                isWritable = false;
-                System.out.println("No writable server available!");
-            }
-        }
-
-        if (!isReadable) {
-            if (event.getNewDescription().hasReadableServer(readPreference)) {
-                isReadable = true;
-                System.out.println("Readable server available!");
-            }
-        } else {
-            if (!event.getNewDescription().hasReadableServer(readPreference)) {
-                isReadable = false;
-                System.out.println("No readable server available!");
-            }
-        }
-    }
-}
-```
-
-and an instance of `MongoClientSettings` configured with an instance of `TestClusterListener`:
-
-```java
-List<ServerAddress> seedList = ...
-ClusterSettings clusterSettings = ClusterSettings.builder()
-                                          .hosts(seedList)
-                                          .addClusterListener(new TestClusterListener(ReadPreference.secondary()))
-                                          .build();
-MongoClientSettings settings = MongoClientSettings.builder()
-                                       .clusterSettings(clusterSettings)
-                                       .build();
-MongoClient client = MongoClients.create(settings);
-```
-
-A `MongoClient` configured with these settings will print a message to `System.out` when the MongoClient is created with these options,
-and when that MongoClient is closed.  In addition, it will print a message when the client enters a state:
-
-* with an available server that will accept writes
-* without an available server that will accept writes
-* with an available server that will accept reads using the configured `ReadPreference`
-* without an available server that will accept reads using the configured `ReadPreference`
diff --git a/docs/reference/content/driver-async/reference/monitoring.md b/docs/reference/content/driver-async/reference/monitoring.md
new file mode 100644
index 00000000000..2932f5e60cf
--- /dev/null
+++ b/docs/reference/content/driver-async/reference/monitoring.md
@@ -0,0 +1,269 @@
++++
+date = "2015-03-19T12:53:26-04:00"
+title = "Monitoring"
+[menu.main]
+  parent = "Async Reference"
+  identifier = "Async Monitoring"
+  weight = 20
+  pre = "<i class='fa'></i>"
++++
+
+# JMX Monitoring
+
+The driver uses [JMX](http://docs.oracle.com/javase/8/docs/technotes/guides/jmx/) to create
+[MXBeans](http://docs.oracle.com/javase/tutorial/jmx/mbeans/mxbeans.html) that allow an
+application or end user to monitor various aspects of the driver.
+
+The driver creates MXBean instances of a single type:
+[ConnectionPoolStatisticsMBean]({{< apiref "com/mongodb/management/ConnectionPoolStatisticsMBean" >}}).
+ The driver registers one `ConnectionPoolStatisticsMBean` instance per each server it connects to. For example, in the case of a replica 
+ set, the driver creates an instance per each non-hidden member of the replica set.
+
+Each MXBean instance is required to be registered with a unique object name, which consists of a domain and a set of named properties. All 
+MXBean instances created by the driver are under the domain `"org.mongodb.driver"`.  Instances of `ConnectionPoolStatisticsMBean` will have 
+the following properties:
+
+- `clusterId`: a client-generated unique identifier, required to ensure object name uniqueness in situations where an
+application has multiple `MongoClient` instances connected to the same MongoDB server deployment
+- `host`: the host name of the server
+- `port`: the port on which the server is listening
+- `minSize`: the minimum allowed size of the pool, including idle and in-use members
+- `maxSize`: the maximum allowed size of the pool, including idle and in-use members
+- `size`: the current size of the pool, including idle and and in-use members
+- `waitQueueSize`: the current size of the wait queue for a connection from this pool
+- `checkedOutCount`: the current count of connections that are currently in use
+
+JMX connection pool monitoring is disabled by default. To enable it add a `com.mongodb.management.JMXConnectionPoolListener` instance via 
+`MongoClientSettings`:
+
+```java
+MongoClientSettings settings =
+        MongoClientSettings.builder()
+        .applyToConnectionPoolSettings(builder -> builder.addConnectionPoolListener(new JMXConnectionPoolListener()))
+        .build();
+```
+
+# Command Monitoring
+
+The driver implements the
+[command monitoring specification](https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst),
+allowing an application to be notified when a command starts and when it either succeeds or fails.
+
+An application registers command listeners with a `MongoClient` by configuring `MongoClientSettings` with instances of classes
+that implement the [`CommandListener`]({{< apiref "com/mongodb/event/CommandListener" >}}) interface. Consider the following, somewhat
+simplistic, implementation of the `CommandListener` interface:
+
+```java
+public class TestCommandListener implements CommandListener {
+    @Override
+    public void commandStarted(final CommandStartedEvent event) {
+        System.out.println(String.format("Sent command '%s:%s' with id %s to database '%s' "
+                                         + "on connection '%s' to server '%s'",
+                                         event.getCommandName(),
+                                         event.getCommand().get(event.getCommandName()),
+                                         event.getRequestId(),
+                                         event.getDatabaseName(),
+                                         event.getConnectionDescription()
+                                              .getConnectionId(),
+                                         event.getConnectionDescription().getServerAddress()));
+    }
+
+    @Override
+    public void commandSucceeded(final CommandSucceededEvent event) {
+        System.out.println(String.format("Successfully executed command '%s' with id %s "
+                                         + "on connection '%s' to server '%s'",
+                                         event.getCommandName(),
+                                         event.getRequestId(),
+                                         event.getConnectionDescription()
+                                              .getConnectionId(),
+                                         event.getConnectionDescription().getServerAddress()));
+    }
+
+    @Override
+    public void commandFailed(final CommandFailedEvent event) {
+        System.out.println(String.format("Failed execution of command '%s' with id %s "
+                                         + "on connection '%s' to server '%s' with exception '%s'",
+                                         event.getCommandName(),
+                                         event.getRequestId(),
+                                         event.getConnectionDescription()
+                                              .getConnectionId(),
+                                         event.getConnectionDescription().getServerAddress(),
+                                         event.getThrowable()));
+    }
+}
+```
+
+and an instance of `MongoClientSettings` configured with an instance of `TestCommandListener`:
+
+```java
+ClusterSettings clusterSettings = ...
+MongoClientSettings settings = MongoClientSettings.builder()
+                                       .clusterSettings(clusterSettings)
+                                       .addCommandListener(new TestCommandListener())
+                                       .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+A `MongoClient` configured with these options will print a message to `System.out` before sending each command to a MongoDB server, and
+another message upon either successful completion or failure of each command.
+
+# Cluster Monitoring
+
+The driver implements the
+[SDAM Monitoring specification](https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst),
+allowing an application to be notified when the driver detects changes to the topology of the MongoDB cluster to which it is connected.
+
+An application registers listeners with a `MongoClient` by configuring  `MongoClientSettings` with instances of classes that
+implement any of the [`ClusterListener`]({{< apiref "com/mongodb/event/ClusterListener" >}}),
+ [`ServerListener`]({{< apiref "com/mongodb/event/ServerListener" >}}),
+or [`ServerMonitorListener`]({{< apiref "com/mongodb/event/ServerMonitorListener" >}}) interfaces.
+
+Consider the following, somewhat simplistic, example of a cluster listener:
+
+```java
+public class TestClusterListener implements ClusterListener {
+    private final ReadPreference readPreference;
+    private boolean isWritable;
+    private boolean isReadable;
+
+    public TestClusterListener(final ReadPreference readPreference) {
+        this.readPreference = readPreference;
+    }
+
+    @Override
+    public void clusterOpening(final ClusterOpeningEvent clusterOpeningEvent) {
+        System.out.println(String.format("Cluster with unique client identifier %s opening",
+                clusterOpeningEvent.getClusterId()));
+    }
+
+    @Override
+    public void clusterClosed(final ClusterClosedEvent clusterClosedEvent) {
+        System.out.println(String.format("Cluster with unique client identifier %s closed",
+                clusterClosedEvent.getClusterId()));
+    }
+
+    @Override
+    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
+        if (!isWritable) {
+            if (event.getNewDescription().hasWritableServer()) {
+                isWritable = true;
+                System.out.println("Writable server available!");
+            }
+        } else {
+            if (!event.getNewDescription().hasWritableServer()) {
+                isWritable = false;
+                System.out.println("No writable server available!");
+            }
+        }
+
+        if (!isReadable) {
+            if (event.getNewDescription().hasReadableServer(readPreference)) {
+                isReadable = true;
+                System.out.println("Readable server available!");
+            }
+        } else {
+            if (!event.getNewDescription().hasReadableServer(readPreference)) {
+                isReadable = false;
+                System.out.println("No readable server available!");
+            }
+        }
+    }
+}
+```
+
+and an instance of `MongoClientSettings` configured with an instance of `TestClusterListener`:
+
+```java
+List<ServerAddress> seedList = ...
+ClusterSettings clusterSettings = ClusterSettings.builder()
+                                          .hosts(seedList)
+                                          .addClusterListener(new TestClusterListener(ReadPreference.secondary()))
+                                          .build();
+MongoClientSettings settings = MongoClientSettings.builder()
+                                       .clusterSettings(clusterSettings)
+                                       .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+A `MongoClient` configured with these settings will print a message to `System.out` when the MongoClient is created with these options,
+and when that MongoClient is closed.  In addition, it will print a message when the client enters a state:
+
+* with an available server that will accept writes
+* without an available server that will accept writes
+* with an available server that will accept reads using the configured `ReadPreference`
+* without an available server that will accept reads using the configured `ReadPreference`
+
+# Connection Pool Monitoring
+
+The driver supports monitoring of connection pool-related events.
+
+An application registers listeners with a `MongoClient` by configuring `MongoClientSettings` with instances of classes that
+implement the [`ConnectionPoolListener`]({{< apiref "com/mongodb/event/ConnectionPoolListener" >}}) interface.
+
+Consider the following, simplistic, example of a connection pool listener:
+
+```java
+public class TestConnectionPoolListener implements ConnectionPoolListener {
+    @Override
+    public void connectionPoolOpened(final ConnectionPoolOpenedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionPoolClosed(final ConnectionPoolClosedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionCheckedOut(final ConnectionCheckedOutEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionCheckedIn(final ConnectionCheckedInEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void waitQueueEntered(final ConnectionPoolWaitQueueEnteredEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void waitQueueExited(final ConnectionPoolWaitQueueExitedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionAdded(final ConnectionAddedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionRemoved(final ConnectionRemovedEvent event) {
+        System.out.println(event);
+    }
+}
+```
+
+and an instance of `MongoClientSettings` configured with an instance of `TestConnectionPoolListener`:
+
+```java
+List<ServerAddress> seedList = ...
+TestConnectionPoolListener connectionPoolListener = new TestConnectionPoolListener();
+ClusterSettings clusterSettings = ClusterSettings.builder()
+                                          .hosts(seedList)
+                                          .build();
+ConnectionPoolSettings connectionPoolSettings = 
+        ConnectionPoolSettings.builder()
+                              .addConnectionPoolListener(connectionPoolListener)
+                              .build();
+MongoClientSettings settings = MongoClientSettings.builder()
+                                       .clusterSettings(clusterSettings)
+                                       .connectionPoolSettings(connectionPoolSettings)
+                                       .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+A `MongoClient` configured with these options will print a message to `System.out` for each connection pool-related event for each MongoDB
+server to which the MongoClient is connected.
\ No newline at end of file
diff --git a/docs/reference/content/driver-async/reference/observables.md b/docs/reference/content/driver-async/reference/observables.md
index 32064349af0..8b0226e60f6 100644
--- a/docs/reference/content/driver-async/reference/observables.md
+++ b/docs/reference/content/driver-async/reference/observables.md
@@ -10,7 +10,7 @@ title = "Observables"
 
 ## Observables
 
-The MongoDB Async Driver is fully callback based and makes extensive use of [`SingleResultCallback<T>`]({{< apiref "com/mongodb/async/client/SingleResultCallback" >}}) to achieve this. The `SingleResultCallback<T>` interface requires the implementation of a single method `onResult(T result, Throwable t)` which is called once the operation has completed or errored. The `result` parameter contains the result of the operation if successful. If the operation failed for any reason then the `t` contains the `Throwable` reason for the failure. This pattern allows the users application logic to be deferred until the underlying network IO to MongoDB has been completed. 
+The MongoDB Async Driver is fully callback-based and makes extensive use of [`SingleResultCallback<T>`]({{< apiref "com/mongodb/async/client/SingleResultCallback" >}}) to achieve this. The `SingleResultCallback<T>` interface requires the implementation of a single method `onResult(T result, Throwable t)` which is called once the operation has completed or errored. The `result` parameter contains the result of the operation if successful. If the operation failed for any reason then the `t` contains the `Throwable` reason for the failure. This pattern allows the users application logic to be deferred until the underlying network IO to MongoDB has been completed. 
 
 The callback pattern is extremely flexible but can quickly become unwieldy if the application logic requires a chain of operations. Nesting of callbacks can make code harder to read and give the appearance of making the codebase more complex that it actually is. To help with this we also have released two observable based asynchronous drivers: 
 
@@ -19,7 +19,7 @@ The callback pattern is extremely flexible but can quickly become unwieldy if th
 
 These observable drivers follow similar patterns that split the logic into `onNext`, `onError` and `onComplete(d)` methods. These methods split out the logic used by `SingleResultCallback<T>.onResult(T result, Throwable t)` into individual components that can make the code  easier to reason with.
 
-The MongoDB Async Driver provides a factory and interfaces that do the heavy lifting of converting callback based operations into an observable operations.  There are three interfaces [`Observable`]({{< apiref "com/mongodb/async/client/Observable" >}}), [`Subscription`]({{< apiref "com/mongodb/async/client/Subscription" >}}) and [`Observer`]({{< apiref "com/mongodb/async/client/Observer" >}}). The [`Observables`]({{< apiref "com/mongodb/async/client/Observables" >}}) helpers convert any callback based operations into observable operations.
+The MongoDB Async Driver provides a factory and interfaces that do the heavy lifting of converting callback-based operations into an observable operations.  There are three interfaces [`Observable`]({{< apiref "com/mongodb/async/client/Observable" >}}), [`Subscription`]({{< apiref "com/mongodb/async/client/Subscription" >}}) and [`Observer`]({{< apiref "com/mongodb/async/client/Observer" >}}). The [`Observables`]({{< apiref "com/mongodb/async/client/Observables" >}}) helpers convert any callback-based operations into observable operations.
 
 {{% note %}}
 The interfaces are similar to `Publisher`, `Subscription` and `Subscriber` interfaces from the [reactive streams](http://www.reactive-streams.org/) JVM implementation.  However, we prefer the name `Observerable` to `Publisher` and `Observer` to `Subscriber` for readability purposes.
@@ -68,9 +68,9 @@ In the following example we iterate and print out all json forms of documents in
     });
 ```
 
-## Wrapping a callback based method
+## Wrapping a callback-based method
 
-Creating an `Observable` from any callback based methods requires the wrapping of the method inside a [`Block`]({{< apiref "com/mongodb/Block" >}}). This allows the execution of the operation to be delayed, until demand is request by the `Subscription`.  The method *must* use the supplied callback to convert the results into an `Observable`. 
+Creating an `Observable` from any callback-based methods requires the wrapping of the method inside a [`Block`]({{< apiref "com/mongodb/Block" >}}). This allows the execution of the operation to be delayed, until demand is request by the `Subscription`.  The method *must* use the supplied callback to convert the results into an `Observable`. 
 
 In the following example we print out the count of the number of documents in a collection:
 
@@ -79,12 +79,12 @@ In the following example we print out the count of the number of documents in a
     Block<SingleResultCallback<Long>> operation = new Block<SingleResultCallback<Long>>() {
         @Override
         void apply(final SingleResultCallback<Long> callback) {
-            collection.count(callback);
+            collection.countDocuments(callback);
         }
     };
 
     // Or in Java 8 syntax:
-    operation = (Block<SingleResultCallback<Long>>) collection::count;
+    operation = (Block<SingleResultCallback<Long>>) collection::countDocuments;
 
     Observables.observe(operation).subscribe(new Observer<Long>(){
         @Override
diff --git a/docs/reference/content/driver-async/tutorials/aggregation.md b/docs/reference/content/driver-async/tutorials/aggregation.md
new file mode 100644
index 00000000000..45541fc5a19
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/aggregation.md
@@ -0,0 +1,105 @@
++++
+date = "2016-08-01T11:35:05-04:00"
+title = "Aggregation"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Aggregation"
+  weight = 20
+  pre = "<i class='fa'></i>"
+
++++
+
+## Aggregation Framework
+
+The [aggregation pipeline]({{<docsref "core/aggregation-pipeline">}}) is a framework for data aggregation, modeled on the concept of data processing pipelines.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.async.client.*;
+import com.mongodb.async.SingleResultCallback;
+
+import com.mongodb.client.model.*;
+
+import org.bson.Document;
+
+import java.util.Arrays;
+```
+
+- Include the following callback code which the examples in the tutorials will use:
+
+```java
+SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+};
+```
+
+- Include the following code which the examples in the tutorials will use to print the results of the aggregation:
+
+```java
+Block<Document> printBlock = new Block<Document>() {
+    @Override
+    public void apply(final Document document) {
+        System.out.println(document.toJson());
+    }
+};
+```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+
+## Perform Aggregation
+
+To perform aggregation, pass a list of [aggregation stages]({{< docsref "meta/aggregation-quick-reference" >}}) to the [`MongoCollection.aggregate()`]({{<apiref "com/mongodb/client/MongoCollection.html#aggregate(java.util.List)">}}) method.
+The Java driver provides the [`Aggregates`]({{< apiref "com/mongodb/client/model/Aggregates.html" >}}) helper class that contains builders for aggregation stages.
+
+In the following example, the aggregation pipeline
+
+- First uses a [`$match`]({{< docsref "reference/operator/aggregation/match/" >}}) stage to filter for documents whose `categories` array field contains the element `Bakery`. The example uses [`Aggregates.match`]({{< relref "builders/aggregation.md#match" >}}) to build the `$match` stage.
+
+- Then, uses  a [`$group`]({{< docsref "reference/operator/aggregation/group/" >}}) stage to group the matching documents by the `stars` field, accumulating a count of documents for each distinct value of `stars`. The example uses [`Aggregates.group`]({{< relref "builders/aggregation.md#group" >}}) to build the `$group` stage and [`Accumulators.sum`]({{< apiref "com/mongodb/client/model/Accumulators#sum(java.lang.String,TExpression)" >}}) to build the [accumulator expression]({{< docsref "reference/operator/aggregation/group/#accumulator-operator" >}}).  For the [accumulator expressions]({{< docsref "reference/operator/aggregation-group/" >}}) for use within the [`$group`]({{< docsref "reference/operator/aggregation/group/" >}}) stage, the Java driver provides [`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators.html">}}) helper class.
+
+```java
+collection.aggregate(Arrays.asList(
+                        Aggregates.match(Filters.eq("categories", "Bakery")),
+                        Aggregates.group("$stars", Accumulators.sum("count", 1))))
+          .forEach(printBlock, callbackWhenFinished);
+```
+
+### Use Aggregation Expressions
+
+For [$group accumulator expressions]({{< docsref "reference/operator/aggregation-group/" >}}), the Java driver provides [`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators.html">}}) helper class. For other [aggregation expressions]({{< docsref "meta/aggregation-quick-reference/#aggregation-expressions" >}}), manually build the expression `Document`.
+
+In the following example, the aggregation pipeline uses a [`$project`]({{< docsref "reference/operator/aggregation/project/" >}}) stage to return only the `name` field and the calculated field `firstCategory` whose value is the first element in the `categories` array. The example uses [`Aggregates.project`]({{< relref "builders/aggregation.md#project" >}}) and various
+[`Projections`]({{<apiref "com/mongodb/client/model/Projections.html">}}) methods to build the `$project` stage.
+
+```java
+collection.aggregate(Arrays.asList(Aggregates.project(Projections.fields(
+                                        Projections.excludeId(),
+                                        Projections.include("name"),
+                                        Projections.computed(
+                                                "firstCategory",
+                                                new Document("$arrayElemAt",
+                                                    Arrays.asList("$categories", 0)))))))
+          .forEach(printBlock, callbackWhenFinished);
+```
diff --git a/docs/reference/content/driver-async/tutorials/authentication.md b/docs/reference/content/driver-async/tutorials/authentication.md
new file mode 100644
index 00000000000..58518b54142
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/authentication.md
@@ -0,0 +1,316 @@
++++
+date = "2015-03-19T14:27:51-04:00"
+title = "Authentication"
+[menu.main]
+  parent = "Async Connection Settings"
+  identifier = "Async Authentication"
+  weight = 20
+  pre = "<i class='fa'></i>"
++++
+
+## Authentication
+
+The Java driver supports all MongoDB [authentication mechanisms](http://docs.mongodb.org/manual/core/authentication/), including those
+only available in the MongoDB [Enterprise Edition](http://docs.mongodb.org/manual/administration/install-enterprise/).
+
+## `MongoCredential`
+
+```java
+import com.mongodb.MongoCredential;
+```
+
+An authentication credential is represented as an instance of the
+[`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}}) class. The [`MongoCredential`]({{<apiref "com/mongodb/MongoCredential.html">}}) class includes static
+factory methods for each of the supported authentication mechanisms.  
+
+You can also use a connection string and pass it to a
+[`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(String)" >}}) method.
+
+## Default Authentication Mechanism
+
+
+In MongoDB 3.0, MongoDB changed the default authentication mechanism from [`MONGODB-CR`]({{<docsref "core/security-mongodb-cr">}}) to
+[`SCRAM-SHA-1`]({{<docsref "core/security-scram">}}). In MongoDB 4.0 support for the deprecated
+[`MONGODB-CR`]({{<docsref "core/security-mongodb-cr">}}) mechanism was removed and
+[`SCRAM-SHA-256`]({{<docsref "core/security-scram">}}) support was added.
+
+
+To create a credential that will authenticate using the default
+authentication mechanism regardless of server version, create a
+credential using the [`createCredential`]({{<apiref "com/mongodb/MongoCredential.html#createCredential(java.lang.String,java.lang.String,char[])">}})
+static factory method:
+
+```java
+String user;     // the user name
+String source;   // the source where the user is defined
+char[] password; // the password as a character array
+// ...
+
+MongoCredential credential = MongoCredential.createCredential(user, source, password);
+
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+Or use a connection string that does not  specify the authentication mechanism:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1");
+```
+
+For challenge and response mechanisms, using the default authentication mechanism is the recommended approach as it will make upgrading
+from MongoDB 2.6 to MongoDB 3.0 seamless, even after [upgrading the authentication schema]({{<docsref "release-notes/3.0-scram/">}}).
+For MongoDB 4.0 users it is also recommended as the supported authentication mechanisms are checked and the correct hashing algorithm is
+used.
+
+## SCRAM
+
+Salted Challenge Response Authentication Mechanism (`SCRAM`) has been the default authentication mechanism for MongoDB since 3.0. `SCRAM` is
+based on the [IETF RFC 5802](https://tools.ietf.org/html/rfc5802) standard that defines best practices for implementation of
+challenge-response mechanisms for authenticating users with passwords.
+
+MongoDB 3.0 introduced support for `SCRAM-SHA-1` which uses the `SHA-1` hashing function. MongoDB 4.0 introduced support for `SCRAM-SHA-256`
+which uses the `SHA-256` hashing function.
+
+### SCRAM-SHA-256
+
+Requires MongoDB 4.0 and `featureCompatibilityVersion` to be set to 4.0.
+
+To explicitly create a credential of type [`SCRAM-SHA-256`]({{<docsref "core/security-scram/">}}), use the
+[`createScramSha256Credential`]({{<apiref "com/mongodb/MongoCredential.html#createScramSha256Credential(java.lang.String,java.lang.String,char[])">}})
+method:
+
+```java
+String user;     // the user name
+String source;   // the source where the user is defined
+char[] password; // the password as a character array
+// ...
+
+MongoCredential credential = MongoCredential.createScramSha256Credential(user, source, password);
+
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=SCRAM-SHA-256`:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-256");
+```
+
+### SCRAM-SHA-1
+
+To explicitly create a credential of type [`SCRAM-SHA-1`]({{<docsref "core/security-scram-sha-1/">}}), use the
+[`createScramSha1Credential`]({{<apiref "com/mongodb/MongoCredential.html#createScramSha1Credential(java.lang.String,java.lang.String,char[])">}}) method:
+
+
+```java
+String user;     // the user name
+String source;   // the source where the user is defined
+char[] password; // the password as a character array
+// ...
+
+MongoCredential credential = MongoCredential.createScramSha1Credential(user, source, password);
+
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+
+Or use a connection string that explicitly specifies the `authMechanism=SCRAM-SHA-1`:
+
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-1");
+```
+
+## MONGODB-CR
+
+{{% note class="important" %}}
+Starting in version 4.0, MongoDB removes support for the deprecated MongoDB Challenge-Response (`MONGODB-CR`) authentication mechanism.
+
+If your deployment has user credentials stored in `MONGODB-CR` schema, you must upgrade to `SCRAM` before you upgrade to version 4.0.
+For information on upgrading to `SCRAM`, see Upgrade to [SCRAM]({{<docsref "release-notes/3.0-scram/">}}).
+{{% /note %}}
+
+To explicitly create a credential of type [`MONGODB-CR`]({{<docsref "core/security-mongodb-cr">}}) use the [`createMongCRCredential`]({{<apiref "com/mongodb/MongoCredential.html#createMongoCRCredential(java.lang.String,java.lang.String,char[])">}})
+static factory method:
+
+```java
+MongoCredential credential = MongoCredential.createMongoCRCredential(user, source, password);
+
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=MONGODB-CR`:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=MONGODB-CR");
+```
+
+{{% note %}}
+After the [authentication schema upgrade]({{<docsref "release-notes/3.0-scram/">}}) from MONGODB-CR to SCRAM,
+MONGODB-CR credentials will fail to authenticate.
+{{% /note %}}
+
+## X.509
+
+With [X.509]({{<docsref "core/security-x.509">}}) mechanism, MongoDB uses the
+X.509 certificate presented during SSL negotiation to
+authenticate a user whose name is derived from the distinguished name
+of the X.509 certificate.
+
+X.509 authentication requires the use of SSL connections with
+certificate validation and is available in MongoDB 2.6 and later. To
+create a credential of this type use the
+[`createMongoX509Credential`]({{<apiref "com/mongodb/MongoCredential.html#createMongoX509Credential(java.lang.String)">}}) static factory method:
+
+```java
+String user;     // The x.509 certificate derived user name, e.g. "CN=user,OU=OrgUnit,O=myOrg,..."
+MongoCredential credential = MongoCredential.createMongoX509Credential(user);
+
+EventLoopGroup eventLoopGroup = new NioEventLoopGroup();  // make sure application shuts this down
+
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .streamFactoryFactory(NettyStreamFactoryFactory.builder().eventLoopGroup(eventLoopGroup).build())
+                .applyToSslSettings(builder -> builder.enabled(true))
+                .build());
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=MONGODB-X509`:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://subjectName@host1/?authMechanism=MONGODB-X509&streamType=netty&ssl=true");
+```
+
+{{% note %}}
+The streamType connection string query parameter is deprecated as of the 3.10 release and will be removed in the next major release.
+{{% /note %}}
+
+See the MongoDB server
+[x.509 tutorial](http://docs.mongodb.org/manual/tutorial/configure-x509-client-authentication/#add-x-509-certificate-subject-as-a-user) for
+more information about determining the subject name from the certificate.
+
+## Kerberos (GSSAPI)
+
+[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy
+authentication through Kerberos service. To create a credential of type
+[Kerberos (GSSAPI)]({{<apiref "core/authentication/#kerberos-authentication">}}), use the
+[`createGSSAPICredential`]({{<apiref "com/mongodb/MongoCredential.html#createGSSAPICredential(java.lang.String)">}})
+static factory method:
+
+```java
+String user;   // The Kerberos user name, including the realm, e.g. "user1@MYREALM.ME"
+// ...
+MongoCredential credential = MongoCredential.createGSSAPICredential(user);
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=GSSAPI`:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://username%40MYREALM.ME@host1/?authMechanism=GSSAPI");
+```
+
+{{% note %}}
+The method refers to the `GSSAPI` authentication mechanism instead of `Kerberos` because technically the driver is authenticating via the
+[GSSAPI](https://tools.ietf.org/html/rfc4752) SASL mechanism.
+{{% /note %}}
+
+To successfully authenticate via Kerberos, the application typically
+must specify several system properties so that the underlying GSSAPI
+Java libraries can acquire a Kerberos ticket:
+
+```java
+java.security.krb5.realm=MYREALM.ME
+java.security.krb5.kdc=mykdc.myrealm.me
+```
+
+Depending on the Kerberos setup, additional property specifications may be required, either via the application code or, in some cases, the [withMechanismProperty()]({{<apiref "com/mongodb/MongoCredential.html#withMechanismProperty(java.lang.String,T)">}}) method of the `MongoCredential` instance:
+
+- **[`SERVICE_NAME`]({{< apiref "com/mongodb/MongoCredential.html#SERVICE_NAME_KEY" >}})**
+
+
+- **[`CANONICALIZE_HOST_NAME`]({{< apiref "com/mongodb/MongoCredential.html#CANONICALIZE_HOST_NAME_KEY" >}})**
+
+
+- **[`JAVA_SUBJECT`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SUBJECT_KEY" >}})**
+
+- **[`JAVA_SASL_CLIENT_PROPERTIES`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SASL_CLIENT_PROPERTIES_KEY" >}})**
+
+For example, to specify the `SERVICE_NAME` property via the `MongoCredential` object:
+
+
+```java
+credential = credential.withMechanismProperty(MongoCredential.SERVICE_NAME_KEY, "othername");
+```
+
+Or via a connection string:
+
+```
+mongodb://username%40MYREALM.com@myserver/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:othername
+```
+
+{{% note %}}
+On Windows, Oracle's JRE uses [LSA](https://msdn.microsoft.com/en-us/library/windows/desktop/aa378326.aspx) rather than 
+[SSPI](https://msdn.microsoft.com/en-us/library/windows/desktop/aa380493.aspx) in its implementation of GSSAPI, which limits
+interoperability with Windows Active Directory and in particular the ability to implement single sign-on. 
+
+- [JDK-8054026](https://bugs.openjdk.java.net/browse/JDK-8054026) 
+- [JDK-6722928](https://bugs.openjdk.java.net/browse/JDK-6722928) 
+- [SO 23427343](https://stackoverflow.com/questions/23427343/cannot-retrieve-tgt-despite-allowtgtsessionkey-registry-entry)    
+{{% /note %}}
+
+
+## LDAP (PLAIN)
+
+[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy authentication through a Lightweight Directory Access Protocol (LDAP) service. To create a credential of type [LDAP]({{<apiref "core/authentication/#ldap-proxy-authority-authentication">}}) use the
+[`createPlainCredential`]({{<apiref "com/mongodb/MongoCredential.html#createPlainCredential(java.lang.String,java.lang.String,char[])">}}) static factory method:
+
+```java
+String user;          // The LDAP user name
+char[] password;      // The LDAP password
+// ...
+MongoCredential credential = MongoCredential.createPlainCredential(user, "$external", password);
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or with a connection string:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1@host1/?authSource=$external&authMechanism=PLAIN");
+```
+
+{{% note %}}
+The method refers to the `plain` authentication mechanism instead of `LDAP` because technically the driver is authenticating via the [PLAIN](https://www.ietf.org/rfc/rfc4616.txt) SASL mechanism.
+{{% /note %}}
diff --git a/docs/reference/content/driver-async/tutorials/bulk-writes.md b/docs/reference/content/driver-async/tutorials/bulk-writes.md
new file mode 100644
index 00000000000..99793aedc2a
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/bulk-writes.md
@@ -0,0 +1,64 @@
++++
+date = "2016-05-29T12:47:54-04:00"
+title = "Bulk Writes"
+[menu.main]
+  parent = "Async Write Operations"
+  identifier = "Async Bulk Writes"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+## Bulk operations
+
+Starting in version 2.6, MongoDB servers support bulk write commands for insert, update, and delete in a way that allows the driver to implement the correct semantics for BulkWriteResult and BulkWriteException.
+
+There are two types of bulk operations, ordered and unordered bulk operations.
+
+1. Ordered bulk operations execute all the operation in order and error out on the first write error.
+
+2. Unordered bulk operations execute all the operations and report any the errors. Unordered bulk operations do not guarantee order of execution.
+
+The following code provide examples using ordered and unordered
+operations:
+
+```java
+// Callback
+SingleResultCallback<BulkWriteResult> printBatchResult = new SingleResultCallback<BulkWriteResult>() {
+    @Override
+    public void onResult(final BulkWriteResult result, final Throwable t) {
+        System.out.println(result);
+    }
+};
+
+// 1. Ordered bulk operation - order is guaranteed
+collection.bulkWrite(
+  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
+                new InsertOneModel<>(new Document("_id", 5)),
+                new InsertOneModel<>(new Document("_id", 6)),
+                new UpdateOneModel<>(new Document("_id", 1),
+                                     new Document("$set", new Document("x", 2))),
+                new DeleteOneModel<>(new Document("_id", 2)),
+                new ReplaceOneModel<>(new Document("_id", 3),
+                                      new Document("_id", 3).append("x", 4))),
+  printBatchResult
+);
+
+
+ // 2. Unordered bulk operation - no guarantee of order of operation
+collection.bulkWrite(
+  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
+                new InsertOneModel<>(new Document("_id", 5)),
+                new InsertOneModel<>(new Document("_id", 6)),
+                new UpdateOneModel<>(new Document("_id", 1),
+                                     new Document("$set", new Document("x", 2))),
+                new DeleteOneModel<>(new Document("_id", 2)),
+                new ReplaceOneModel<>(new Document("_id", 3),
+                                      new Document("_id", 3).append("x", 4))),
+  new BulkWriteOptions().ordered(false),
+  printBatchResult
+);
+```
+
+{{% note class="important" %}}
+Use of the bulkWrite methods is not recommended when connected to pre-2.6 MongoDB servers, as this was the first server version to support bulk write commands for insert, update, and delete in a way that allows the driver to implement the correct semantics for BulkWriteResult and BulkWriteException. The methods will still work for pre-2.6 servers, but performance will suffer, as each write operation has to be executed one at a time.
+{{% /note %}}
diff --git a/docs/reference/content/driver-async/tutorials/change-streams.md b/docs/reference/content/driver-async/tutorials/change-streams.md
new file mode 100644
index 00000000000..09aaae7d0b3
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/change-streams.md
@@ -0,0 +1,129 @@
++++
+date = "2017-08-15T14:19:24-04:00"
+title = "Change Streams"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Change Streams"
+  weight = 21
+  pre = "<i class='fa'></i>"
++++
+
+## Change Streams
+
+MongoDB 3.6 introduces a new [`$changeStream`](http://dochub.mongodb.org/core/changestreams) aggregation pipeline
+operator.
+
+Change streams provide a way to watch changes to documents in a collection. To improve the usability of this new stage, the 
+`MongoCollection` API includes a new `watch` method. The `ChangeStreamIterable` sets up the change stream and automatically attempts 
+to resume if it encounters a potentially recoverable error.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.async.client.*;
+import com.mongodb.async.SingleResultCallback;
+
+import com.mongodb.client.model.*;
+
+import org.bson.Document;
+
+import java.util.Arrays;
+```
+
+- Include the following callback code which the examples in the tutorials will use:
+
+```java
+SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+};
+```
+
+- Include the following code which the examples in the tutorials will use to print the results of the change stream:
+
+```java
+Block<ChangeStreamDocument<Document>> printBlock = new Block<>() {
+    @Override
+    public void apply(final ChangeStreamDocument<Document> changeStreamDocument) {
+        System.out.println(changeStreamDocument);
+    }
+};
+```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a replicaSet MongoDB deployment running on localhost on ports `27017`, `27018` and `27019`. 
+It also defines `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection.
+
+```java
+MongoClient mongoClient = MongoClients.create(new ConnectionString("mongodb://localhost:27017,localhost:27018,localhost:27019"));
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+## Watch the collection
+
+To create a change stream use one the [`MongoCollection.watch()`]({{<apiref "com/mongodb/async/client/MongoCollection.html#watch">}}) 
+methods.
+
+In the following example, the change stream prints out all changes it observes.
+
+```java
+collection.watch().forEach(printBlock, callbackWhenFinished);
+```
+
+## Watch the database
+
+New in the 3.8 driver and MongoDB 4.0, applications can open a single change stream to watch all non-system collections of a database. To
+create such a change stream use one of the [`MongoDatabase.watch()`]({{<apiref "com/mongodb/async/client/MongoDatabase.html#watch">}}) 
+methods.
+
+In the following example, the change stream prints out all the changes it observes on the given database.
+
+```java
+database.watch().forEach(printBlock, callbackWhenFinished);
+```
+
+## Watch all databases
+
+New in the 3.8 driver and MongoDB 4.0, applications can open a single change stream to watch all non-system collections of all databases 
+in a MongoDB deployment. To create such a change stream use one of the 
+[`MongoClient.watch()`]({{<apiref "com/mongodb/async/client/MongoClient.html#watch">}}) methods.
+
+In the following example, the change stream prints out all the changes it observes on the deployement to which the `MongoClient` is
+connected
+
+```java
+mongoClient.watch().forEach(printBlock, callbackWhenFinished);
+```
+
+## Filtering content
+
+The `watch` method can also be passed a list of [aggregation stages]({{< docsref "meta/aggregation-quick-reference" >}}), that can modify 
+the data returned by the `$changeStream` operator. Note: not all aggregation operators are supported. See the 
+[`$changeStream`](http://dochub.mongodb.org/core/changestreams) documentation for more information.
+
+In the following example the change stream prints out all changes it observes, for `insert`, `update`, `replace` and `delete` operations:
+
+- First it uses a [`$match`]({{< docsref "reference/operator/aggregation/match/" >}}) stage to filter for documents where the `operationType` 
+is either an `insert`, `update`, `replace` or `delete`.
+
+- Then, it sets the `fullDocument` to [`FullDocument.UPDATE_LOOKUP`]({{<apiref "com/mongodb/client/model/FullDocument.html#UPDATE_LOOKUP">}}),
+so that the document after the update is included in the results.
+
+```java
+collection.watch(asList(Aggregates.match(Filters.in("operationType", asList("insert", "update", "replace", "delete")))))
+        .fullDocument(FullDocument.UPDATE_LOOKUP)
+        .forEach(printBlock, callbackWhenFinished);
+```
diff --git a/docs/reference/content/driver-async/tutorials/client-side-encryption.md b/docs/reference/content/driver-async/tutorials/client-side-encryption.md
new file mode 100644
index 00000000000..859bd676a92
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/client-side-encryption.md
@@ -0,0 +1,200 @@
++++
+date = "2019-06-13T09:00:01+01:00"
+title = "Client Side Encryption"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Client Side Encryption"
+  weight = 16
+  pre = "<i class='fa fa-lock'></i>"
++++
+
+# Client Side Encryption
+
+New in MongoDB 4.2 client side encryption allows administrators and developers to encrypt specific data fields in addition to other
+MongoDB encryption features.
+
+With field level encryption, developers can encrypt fields client side without any server-side 
+configuration or directives. Client-side field level encryption supports workloads where applications must guarantee that 
+unauthorized parties, including server administrators, cannot read the encrypted data.
+
+{{% note class="important" %}}
+Java 8 is the minimum required version that supports Async client side encryption. 
+{{% /note %}}
+
+## Installation
+
+The recommended way to get started using field level encryption in your project is with a dependency management system. 
+Field level encryption requires additional packages to be installed as well as the driver itself.  
+See the [installation]({{< relref "driver-async/getting-started/installation.md" >}}) for instructions on how to install the MongoDB driver. 
+
+{{< distroPicker >}}
+
+### libmongocrypt
+
+There is a separate jar file containing`libmongocrypt` bindings.
+
+{{< install artifactId="mongodb-crypt" version="1.0.0">}}
+
+### mongocryptd configuration
+
+`libmongocrypt` requires the `mongocryptd` daemon / process to be running. A specific daemon / process uri can be configured in the 
+`AutoEncryptionSettings` class by setting `mongocryptdURI` in the `extraOptions`.
+
+More information about mongocryptd will soon be available from the official documentation.
+
+
+### Examples
+
+The following is a sample app that assumes the **key** and **schema** have already been created in MongoDB. The example uses a local key,
+however using AWS Key Management Service is also an option. The data in the `encryptedField` field is automatically encrypted on the
+insert and decrypted when using find on the client side. The following code snippet comes from the 
+[`ClientSideEncryptionSimpleTour.java`]({{< srcref "driver-async/src/driver-async/src/examples/tour/ClientSideEncryptionSimpleTour.java">}}) example code
+that can be found with the driver source on github:
+
+```java
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import org.bson.Document;
+
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+public class ClientSideEncryptionSimpleTour {
+
+    public static void main(final String[] args) {
+
+        // This would have to be the same master key as was used to create the encryption key
+        final byte[] localMasterKey = new byte[96];
+        new SecureRandom().nextBytes(localMasterKey);
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
+           put("local", new HashMap<String, Object>() {{
+               put("key", localMasterKey);
+           }});
+        }};
+
+        String keyVaultNamespace = "admin.datakeys";
+
+        AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .build();
+
+        MongoClientSettings clientSettings = MongoClientSettings.builder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+
+        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoCollection<Document> collection = mongoClient.getDatabase("test").getCollection("coll");
+        final CountDownLatch dropLatch = new CountDownLatch(1);
+        
+        // clear old data
+        collection.drop(new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                dropLatch.countDown();
+            }
+        });
+        dropLatch.await();
+
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertOne(new Document("encryptedField", "123456789"),
+                new SingleResultCallback<Void>() {
+                    @Override
+                    public void onResult(final Void result, final Throwable t) {
+                        System.out.println("Inserted!");
+                        insertLatch.countDown();
+                    }
+                });
+        insertLatch.await();
+
+        final CountDownLatch findLatch = new CountDownLatch(1);
+        collection.find().first(new SingleResultCallback<Document>() {
+            @Override
+            public void onResult(final Document result, final Throwable t) {
+                System.out.println(result.toJson());
+                findLatch.countDown();
+            }
+        });
+        findLatch.await();
+    }
+}
+```
+
+{{% note %}}
+Auto encryption is an **enterprise** only feature.
+{{% /note %}}
+
+The following example shows how to configure the `AutoEncryptionSettings` instance to create a new key and setting the json schema map.
+The full code snippet can be found in 
+[`ClientSideEncryptionAutoEncryptionSettingsTour.java`]({{< srcref "driver-async/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java">}}):
+
+```java
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.ConnectionString;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+
+import java.util.Base64;
+
+...
+
+String keyVaultNamespace = "admin.datakeys";
+ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
+        .keyVaultMongoClientSettings(MongoClientSettings.builder()
+                .applyConnectionString(new ConnectionString("mongodb://localhost"))
+                .build())
+        .keyVaultNamespace(keyVaultNamespace)
+        .kmsProviders(kmsProviders)
+        .build();
+
+ClientEncryption clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+
+final CountDownLatch createKeyLatch = new CountDownLatch(1);
+final AtomicReference<String> base64DataKeyId = new AtomicReference<String>();
+clientEncryption.createDataKey("local", new DataKeyOptions(), new SingleResultCallback<BsonBinary>() {
+    @Override
+    public void onResult(final BsonBinary dataKeyId, final Throwable t) {
+        base64DataKeyId.set(Base64.getEncoder().encodeToString(dataKeyId.getData()));
+        createKeyLatch.countDown();
+    }
+});
+createKeyLatch.await();
+
+final String dbName = "test";
+final String collName = "coll";
+AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+        .keyVaultNamespace(keyVaultNamespace)
+        .kmsProviders(kmsProviders)
+        .schemaMap(new HashMap<String, BsonDocument>() {{
+            put(dbName + "." + collName,
+                    // Need a schema that references the new data key
+                    BsonDocument.parse("{"
+                            + "  properties: {"
+                            + "    encryptedField: {"
+                            + "      encrypt: {"
+                            + "        keyId: [{"
+                            + "          \"$binary\": {"
+                            + "            \"base64\": \"" + base64DataKeyId + "\","
+                            + "            \"subType\": \"04\""
+                            + "          }"
+                            + "        }],"
+                            + "        bsonType: \"string\","
+                            + "        algorithm: \"AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic\""
+                            + "      }"
+                            + "    }"
+                            + "  },"
+                            + "  \"bsonType\": \"object\""
+                            + "}"));
+        }}).build();
+```
+
+**Coming soon:** An example using the community version and demonstrating explicit encryption/decryption.
diff --git a/docs/reference/content/driver-async/tutorials/commands.md b/docs/reference/content/driver-async/tutorials/commands.md
new file mode 100644
index 00000000000..fada2892b36
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/commands.md
@@ -0,0 +1,65 @@
++++
+date = "2016-05-31T13:07:04-04:00"
+title = "Run Commands"
+[menu.main]
+parent = "Async Tutorials"
+identifier = "Async Run Commands"
+weight = 90
+pre = "<i class='fa'></i>"
++++
+
+## Run Commands
+
+Not all commands have a specific helper. However, you can run any [MongoDB command]({{<docsref "reference/command">}}) by using the [`runCommand()`]({{< apiref "com/mongodb/async/client/MongoDatabase.html#runCommand(org.bson.conversions.Bson,com.mongodb.ReadPreference,com.mongodb.async.SingleResultCallback)">}}) method.
+
+## Prerequisites
+
+- The example below requires a `restaurants` collection in the `test` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.async.client.MongoClient;
+     import com.mongodb.async.client.MongoClients;
+     import com.mongodb.async.client.MongoDatabase;
+     import com.mongodb.async.SingleResultCallback;
+     import org.bson.Document;
+     ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("mydb");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md">}}).
+
+## Run `buildInfo` and `collStats` Commands
+
+To run a command, construct a [`Document`]({{< apiref "org/bson/Document.html" >}})
+object that specifies the command and pass it to the `runCommand()` method.
+
+The following runs the [`buildInfo`]({{<docsref "reference/command/buildInfo">}}) command and the [`collStats`]({{<docsref "reference/command/collStats">}}) method:
+
+```java
+database.runCommand(new Document("buildInfo", 1), new SingleResultCallback<Document>() {
+    @Override
+    public void onResult(final Document buildInfo, final Throwable t) {
+        System.out.println(buildInfo);
+    }
+});
+
+database.runCommand(new Document("collStats", 1), new SingleResultCallback<Document>() {
+    @Override
+    public void onResult(final Document collStats, final Throwable t) {
+        System.out.println(collStats);
+    }
+});
+```
+
+For a list of available MongoDB commands, see [MongoDB commands]({{<docsref "reference/command">}}).
diff --git a/docs/reference/content/driver-async/tutorials/compression.md b/docs/reference/content/driver-async/tutorials/compression.md
new file mode 100644
index 00000000000..2bb8035831c
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/compression.md
@@ -0,0 +1,127 @@
++++
+date = "2017-06-16T22:05:03-04:00"
+title = "Compression"
+[menu.main]
+  parent = "Async Connection Settings"
+  identifier = "Async Compression"
+  weight = 25
+  pre = "<i class='fa'></i>"
++++
+
+## Compression
+
+The Java driver supports compression of messages to and from MongoDB servers.  The driver implements the two algorithms that are 
+supported by MongoDB servers:
+
+* [Snappy](https://google.github.io/snappy/): Snappy compression can be used when connecting to MongoDB servers starting with the 3.4 
+release.
+* [Zlib](https://zlib.net/): Zlib compression can be used when connecting to MongoDB servers starting with the 3.6 release.
+* [Zstandard](https://github.com/facebook/zstd/): Zstandard compression can be used when connecting to MongoDB servers starting with the 4.2 release.
+
+The driver will negotiate which, if any, compression algorithm is used based on capabilities advertised by the server in
+the [ismaster]({{<docsref "reference/command/isMaster/">}}) command response. 
+
+### Specify compression via connection string
+
+```java
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoClient;
+
+```
+
+To specify compression with a connection string, specify `compressors` as part of the connection string, as in:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://localhost/?compressors=snappy");
+```
+
+for Snappy compression, or
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://localhost/?compressors=zlib");
+```
+
+for zlib compression, or 
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://localhost/?compressors=zstd");
+```
+
+for Zstandard compression, or 
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://localhost/?compressors=snappy,zlib,zstd");
+```
+
+to configure multiple compressors. 
+
+In all cases the driver will use the first compressor in the list for which the server advertises support. 
+
+### Specify compression via `MongoClientSettings`
+
+```java
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoCompressor;
+import java.util.Arrays;
+
+```
+
+To specify compression with [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings">}}), set the `compressors` property
+to a list of `MongoCompressor` instances:
+
+```java
+ClusterSettings clusterSettings = ClusterSettings.builder().hosts(Arrays.asList(new ServerAddress("localhost"))).build();
+MongoClientSettings settings = MongoClientSettings.builder()
+                                                  .clusterSettings(clusterSettings);
+                                                  .compressorList(Arrays.asList(MongoCompressor.createSnappyCompressor()))
+                                                  .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+for Snappy compression, or
+
+```java
+ClusterSettings clusterSettings = ClusterSettings.builder().hosts(Arrays.asList(new ServerAddress("localhost"))).build();
+MongoClientSettings settings = MongoClientSettings.builder()
+                                                  .clusterSettings(clusterSettings);
+                                                  .compressorList(Arrays.asList(MongoCompressor.createZlibCompressor()))
+                                                  .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+for zlib compression, or
+
+```java
+ClusterSettings clusterSettings = ClusterSettings.builder().hosts(Arrays.asList(new ServerAddress("localhost"))).build();
+MongoClientSettings settings = MongoClientSettings.builder()
+                                                  .clusterSettings(clusterSettings);
+                                                  .compressorList(Arrays.asList(MongoCompressor.createZstdCompressor()))
+                                                  .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+for Zstandard compression, or
+
+```java
+ClusterSettings clusterSettings = ClusterSettings.builder().hosts(Arrays.asList(new ServerAddress("localhost"))).build();
+MongoClientSettings settings = MongoClientSettings.builder()
+                                                  .clusterSettings(clusterSettings);
+                                                  .compressorList(Arrays.asList(MongoCompressor.createSnappyCompressor(),
+                                                                                MongoCompressor.createZlibCompressor(),
+                                                                                MongoCompressor.createZstdCompressor()))
+                                                  .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+to configure multiple compressors. 
+
+As with configuration with a URI, the driver will use the first compressor in the list for which the server advertises support. 
+
+### Dependencies
+
+As the JDK has no built-in support for Snappy or Zstandard, the driver takes a dependency on an existing open-source Snappy and Zstandard implementation.  See the
+[snappy-java Github repository](https://github.com/xerial/snappy-java) and the
+[zstd-java Github repository](https://github.com/luben/zstd-jni) for details.
diff --git a/docs/reference/content/driver-async/tutorials/connect-to-mongodb.md b/docs/reference/content/driver-async/tutorials/connect-to-mongodb.md
new file mode 100644
index 00000000000..1137844d69b
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/connect-to-mongodb.md
@@ -0,0 +1,260 @@
++++
+date = "2015-03-19T12:53:30-04:00"
+title = "Connect to MongoDB"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Connection Settings"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+## Connect to MongoDB
+
+To make a connection to a running MongoDB instance, use [`MongoClients.create`]({{< apiref "com/mongodb/async/client/MongoClients.html#create()" >}}) to create a new [`MongoClient`]({{< apiref "com/mongodb/async/client/MongoClient.html">}}) instance.
+
+A [`MongoClient`]({{< apiref "com/mongodb/async/client/MongoClient.html">}}) instance actually represents a pool of connections
+to the database; you will only need one instance of class
+`MongoClient` even with multiple concurrently executing asynchronous operations.
+
+{{% note class="important" %}}
+Typically you only create one `MongoClient` instance for a given MongoDB
+deployment (e.g. standalone, replica set, or a sharded cluster) and use it across your application. However, if you do create multiple instances:
+
+-  All resource usage limits (max connections, etc.) apply per `MongoClient` instance.
+-  To dispose of an instance, call `MongoClient.close()` to clean up resources.
+{{% /note %}}
+
+{{% note %}}
+The 3.5 release deprecated socket keep-alive settings, also socket keep-alive checks are now on by default.
+It is *strongly recommended* that system keep-alive settings should be configured with shorter timeouts. 
+
+See the 
+['does TCP keep-alive time affect MongoDB deployments?']({{<docsref "/faq/diagnostics/#does-tcp-keepalive-time-affect-mongodb-deployments">}}) 
+documentation for more information.
+{{% /note %}}
+
+
+## Prerequisites
+
+- Running MongoDB deployments to which to connect. For example, to connect to a standalone, you must have a running standalone.
+
+- The MongoDB Asynchronous Driver.  See [Installation]({{< relref "driver-async/getting-started/installation.md" >}}) for instructions on how to install the MongoDB async driver.
+
+- The following import statements:
+
+    ```java
+    import com.mongodb.ConnectionString;
+    import com.mongodb.ServerAddress;
+    import com.mongodb.async.client.*;
+    import com.mongodb.connection.ClusterSettings;
+    import java.util.Arrays;
+    import static java.util.Arrays.asList;
+    ```
+
+## Connect to a Standalone MongoDB Instance
+
+To connect to a standalone MongoDB instance:
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create()" >}}) without any parameters to connect to a MongoDB instance running on localhost on port ``27017``:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create();
+    ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(java.lang.String)" >}}) with a string that specifies the connection string:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create("mongodb://localhost");
+    ```
+
+    The connection string mostly follows [RFC 3986](http://tools.ietf.org/html/rfc3986), with the exception of the domain name. For MongoDB, it is possible to list multiple domain names separated by a comma. For more information on the connection string, see [connection string]({{< docsref "reference/connection-string" >}}).
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.ConnectionString)" >}}) with a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create(new ConnectionString("mongodb://localhost"));
+    ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.MongoClientSettings)" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information, use the [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}).
+
+    ```java
+    ClusterSettings clusterSettings = ClusterSettings.builder()
+                                      .hosts(asList(new ServerAddress("localhost")))
+                                      .build();
+    MongoClientSettings settings = MongoClientSettings.builder()
+                                      .clusterSettings(clusterSettings).build();
+    MongoClient mongoClient = MongoClients.create(settings);
+    ```
+
+{{% note class="tip" %}}
+[`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings" >}}) provide more configuration options than a connection string.
+{{% /note %}}
+
+## Connect to a Replica Set
+
+To connect to a [replica set]({{<docsref "replication/">}}), specify at least one or more members of the replica set in the connection string or `MongoClientSettings` object and pass to [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create()" >}}).
+
+{{% note %}}
+MongoDB will auto-discover the primary and the secondaries.
+{{% /note %}}
+
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(java.lang.String)" >}}) with a connection string that specifies the members of the replica set:
+
+  - Specify at least two members of the replica set if you are not specifying the replica set name
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+                  "mongodb://host1:27017,host2:27017,host3:27017");
+      ```
+
+  - Specify at least one member of the replica set and the replica set name
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+                  "mongodb://host1:27017,host2:27017,host3:27017/?replicaSet=myReplicaSet");
+      ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.ConnectionString)" >}}) with a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object that specifies the members of the replica set:
+
+  - Specify at least two members of the replica set if you are not specifying the replica set name
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+            new ConnectionString("mongodb://host1:27017,host2:27017,host3:27017"));
+      ```
+
+  - Specify at least one member of the replica set and the replica set name:
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+          new ConnectionString("mongodb://host1:27017,host2:27017,host3:27017/?replicaSet=myReplicaSet"));
+      ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.MongoClientSettings)" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information of the replica set members, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}).
+
+      ```java
+      ClusterSettings clusterSettings = ClusterSettings.builder()
+                                          .hosts(asList(
+                                              new ServerAddress("host1", 27017),
+                                              new ServerAddress("host2", 27017),
+                                              new ServerAddress("host3", 27017)))
+                                          .build();
+
+      MongoClientSettings settings = MongoClientSettings.builder()
+                                          .clusterSettings(clusterSettings).build();
+
+      MongoClient mongoClient = MongoClients.create(settings);
+      ```
+
+## Connect to a Sharded Cluster
+
+To connect to a [sharded cluster]({{<docsref "sharding/">}}), specify the `mongos` instance or instances to the `MongoClient` constructor.
+
+To connect to a single `mongos` instance:
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create()" >}}) without any parameters to connect to a :program:`mongos` running on localhost on port ``27017``:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create();
+    ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(java.lang.String)" >}}) with a string that specifies the host information of the `mongos` instance in the connection URI:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create("mongodb://localhost");
+    ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.ConnectionString)" >}}) with a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object that specifies the host information of the `mongos` instance:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create(
+                new ConnectionString("mongodb://localhost"));
+    ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.MongoClientSettings)" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information of the `mongos` instance, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}):
+
+    ```java
+    ClusterSettings clusterSettings = ClusterSettings.builder()
+                                        .hosts(asList(new ServerAddress("localhost")))
+                                        .build();
+    MongoClientSettings settings = MongoClientSettings.builder()
+                                        .clusterSettings(clusterSettings)
+                                        .build();
+    MongoClient mongoClient = MongoClients.create(settings);
+    ```
+
+To connect to multiple `mongos` instances, specify the host and port of the `mongos` instances:
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(java.lang.String)" >}}) with a string that specifies the host and port information of the `mongos` instances in the connection URI:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create("mongodb://host1:27017,host2:27017");
+    ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.ConnectionString)" >}}) with a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object that specifies the host and port information of the `mongos` instances:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create(
+                new ConnectionString("mongodb://host1:27017,host2:27017"));
+    ```
+
+- You can call [`MongoClients.create()`]({{< apiref "com/mongodb/async/client/MongoClients.html#create(com.mongodb.MongoClientSettings)" >}}) with a [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.html">}}) object. To specify the host information of the `mongos` instances, use [`ClusterSettings`]({{<apiref "com/mongodb/connection/ClusterSettings.html">}}):
+
+
+    ```java
+    ClusterSettings clusterSettings = ClusterSettings.builder()
+                                          .hosts(asList(
+                                              new ServerAddress("host1", 27017),
+                                              new ServerAddress("host2", 27017)))
+                                          .build();
+
+
+    MongoClientSettings settings = MongoClientSettings.builder()
+                                          .clusterSettings(clusterSettings).build();
+    MongoClient mongoClient = MongoClients.create(settings);
+    ```
+
+
+## Connection Options
+
+You can specify the connection settings using either the
+connection string (or `ConnectionString` object) or the `MongoClientSettings` or both.
+
+
+### Netty Configuration
+
+{{% note %}}
+Netty is an optional dependency of the asynchronous driver. If your application requires Netty, it must explicitly add a dependency to
+Netty artifacts.  The driver is currently tested against Netty 4.1.
+{{% /note %}}
+
+In its default configuration, the async driver is supported on Java 7+ when TLS/SSL is disabled, and on Java 8+ when TLS/SSL is enabled.  
+Otherwise, applications must use [Netty](http://netty.io/).
+
+To configure the driver to use Netty,  
+
+- Include the `streamType` option set to `netty` in the connection string
+
+    ```java
+    MongoClient client = MongoClients.create("mongodb://localhost/?streamType=netty");
+    ```
+
+- Configure [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.Builder.html#streamFactoryFactory(com.mongodb.connection.StreamFactoryFactory)">}}) with the `StreamFactory` set to use Netty:
+
+    ```java
+    MongoClient client = MongoClients.create(MongoClientSettings.builder()
+            .applyConnectionString(new ConnectionString("mongodb://localhost"))
+            .streamFactoryFactory(NettyStreamFactoryFactory.builder().build())
+            .build());
+
+    ```
+
+{{% note %}}
+The streamType connection string query parameter is deprecated as of the 3.10 release and will be removed in the next major release.
+{{% /note %}}
+
+{{% note %}}
+Netty may also be configured by setting the `org.mongodb.async.type` system property to `netty`, but this should be considered as
+deprecated as of the 3.1 driver release, and will be removed in the next major release.
+{{% /note %}}
diff --git a/docs/reference/content/driver-async/tutorials/databases-collections.md b/docs/reference/content/driver-async/tutorials/databases-collections.md
new file mode 100644
index 00000000000..29e1bd61fb5
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/databases-collections.md
@@ -0,0 +1,166 @@
++++
+date = "2015-03-17T15:36:56Z"
+title = "Databases and Collections"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Databases and Collections"
+  weight = 11
+  pre = "<i class='fa'></i>"
++++
+
+## Databases and Collections
+
+MongoDB stores documents in collections; the collections in databases.
+
+## Consideration
+
+{{% note class="important" %}}
+Always check for errors in any [`SingleResultCallback<T>`]({{< apiref "com/mongodb/async/SingleResultCallback.html">}}) implementation
+and handle them appropriately.
+
+For sake of brevity, this tutorial omits the error check logic in the code examples.
+{{% /note %}}
+
+## Prerequisites
+
+- Include the following import statements:
+
+    ```java
+    import com.mongodb.Block;
+    import com.mongodb.async.SingleResultCallback;
+    import com.mongodb.async.client.MongoClient;
+    import com.mongodb.async.client.MongoClients;
+    import com.mongodb.async.client.MongoCollection;
+    import com.mongodb.async.client.MongoDatabase;
+    import com.mongodb.client.model.CreateCollectionOptions;
+    import com.mongodb.client.model.Filters;
+    import com.mongodb.client.model.ValidationOptions;
+    import org.bson.Document;
+    ```
+
+- The following callback:
+
+    ```java
+    SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+        @Override
+        public void onResult(final Void result, final Throwable t) {
+            System.out.println("Operation Finished!");
+        }
+    };
+    ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a running MongoDB deployment.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017`.
+
+```java
+MongoClient mongoClient = MongoClients.create();
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+## Access a Database
+
+Once you have a `MongoClient` instance connected to a MongoDB deployment, use its [`getDatabase()`]({{<apiref "com/mongodb/async/client/MongoClient.html#getDatabase(java.lang.String)">}}) method to access a database.
+
+Specify the name of the database to the `getDatabase()` method. If a database does not exist, MongoDB creates the database when you first store data for that database.
+
+The following example accesses the ``test`` database:
+
+```java
+MongoDatabase database = mongoClient.getDatabase("test");
+```
+
+{{% note %}}
+`MongoDatabase` instances are immutable.
+{{% /note %}}
+
+## Get A List of Databases
+
+You can get a list of the available databases using the `MongoClient` instance's  [`listDatabaseNames`]({{ < apiref "com/mongodb/async/client/MongoClient.html#listDatabaseNames()">}}) method.
+
+```java
+mongoClient.listDatabaseNames().forEach(new Block<String>() {
+    @Override
+    public void apply(final String s) {
+        System.out.println(s);
+    }
+}, callbackWhenFinished);
+```
+
+## Drop A Database
+
+You can drop the current database using its [`drop`]({{<apiref "com/mongodb/async/client/MongoDatabase.html#drop(com.mongodb.async.SingleResultCallback)">}}):
+
+```java
+mongoClient.getDatabase("databaseToBeDropped").drop(callbackWhenFinished);
+```
+
+## Access a Collection
+
+Once you have a `MongoDatabase` instance, use its [`getCollection()`]({{< apiref "com/mongodb/async/client/MongoDatabase.html#getCollection(java.lang.String)">}}) method to access a collection.
+
+Specify the name of the collection to the `getCollection()` method.
+
+For example, using the `database` instance, the following statement accesses the collection named `myTestCollection`:
+
+```java
+MongoCollection<Document> coll = database.getCollection("myTestCollection");
+```
+
+{{% note %}}
+`MongoCollection` instances are immutable.
+{{% /note %}}
+
+If a collection does not exist, MongoDB creates the collection when you first store data for that collection.
+
+You can also explicitly create a collection with various options, such as setting the maximum size or the documentation validation rules.
+
+## Explicitly Create a Collection
+
+The async driver provides the [`createCollection`]({{< apiref "com/mongodb/async/client/MongoDatabase.html#createCollection(java.lang.String,com.mongodb.async.SingleResultCallback)">}}) method to explicitly create a collection. When you explicitly create a collection, you can specify various collection options, such as a maximum size or the documentation validation rules, with the [`CreateCollectionOptions`]({{<apiref "com/mongodb/client/model/CreateCollectionOptions.html">}}) class. If you are not specifying these options, you do not need to explicitly create the collection since MongoDB creates new collections when you first store data for the collections.
+
+### Capped Collection
+
+For example, the following operation creates a [capped collection]({{<docsref "core/capped-collections">}}) sized to 1 megabyte:
+
+```java
+database.createCollection("cappedCollection",
+          new CreateCollectionOptions().capped(true).sizeInBytes(0x100000),
+          callbackWhenFinished);
+```
+
+### Document Validation
+
+MongoDB provides the capability to [validate documents]({{<docsref "core/document-validation">}}) during updates and insertions. Validation rules are specified on a per-collection basis using the [`ValidationOptions`]({{< apiref "com/mongodb/client/model/ValidationOptions.html">}}), which takes a filter document that specifies the validation rules or expressions.
+
+```java
+ValidationOptions collOptions = new ValidationOptions().validator(
+        Filters.or(Filters.exists("email"), Filters.exists("phone")));
+database.createCollection("contacts",
+        new CreateCollectionOptions().validationOptions(collOptions),
+        callbackWhenFinished);
+```
+
+## Get A List of Collections
+
+You can get a list of the collections in a database using the [`MongoDatabase.listCollectionNames()`]({{<apiref "com/mongodb/async/client/MongoDatabase.html#listCollectionNames()">}}) method:
+
+```java
+database.listCollectionNames().forEach(new Block<String>() {
+    @Override
+    public void apply(final String name) {
+        System.out.println(name);
+    }
+}, callbackWhenFinished);
+```
+
+## Drop a Collection
+
+You can drop a collection by using the [`MongoCollection.drop()`]({{<apiref "com/mongodb/async/client/MongoCollection.html#drop(com.mongodb.async.SingleResultCallback)">}}) method:
+
+```java
+collection.drop(callbackWhenFinished);
+```
diff --git a/docs/reference/content/driver-async/tutorials/geospatial-search.md b/docs/reference/content/driver-async/tutorials/geospatial-search.md
new file mode 100644
index 00000000000..33e8a3ed6c2
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/geospatial-search.md
@@ -0,0 +1,99 @@
+
++++
+date = "2016-06-12T17:26:54-04:00"
+title = "Geospatial Search"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Geospatial Search"
+  weight = 85
+  pre = "<i class='fa'></i>"
++++
+
+## Geospatial Search
+
+To support geospatial queries, MongoDB provides various geospatial indexes as well as [geospatial query operators]({{<docsref "reference/operator/query-geospatial/">}}).
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import com.mongodb.async.client.MongoDatabase;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Indexes;
+import com.mongodb.client.model.geojson.Point;
+import com.mongodb.client.model.geojson.Position;
+import org.bson.Document;
+```
+
+
+- Include the following callback code which the examples in the tutorials will use:
+
+```java
+SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+};
+```
+
+- Include the following code which the examples in the tutorials will use to print the results of the aggregation:
+
+```java
+Block<Document> printBlock = new Block<Document>() {
+    @Override
+    public void apply(final Document document) {
+        System.out.println(document.toJson());
+    }
+};
+```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+## Create the `2dsphere` Index
+
+To create a [`2dsphere` index]({{<docsref "core/2dsphere">}}), use the [`Indexes.geo2dsphere`]({{<apiref "com/mongodb/client/model/Indexes.html#geo2dspherejava.lang.String...)">}})
+helper to create a specification for the `2dsphere` index and pass to [`MongoCollection.createIndex()`]({{<apiref "com/mongodb/client/MongoCollection.html#createIndex(org.bson.conversions.Bson)">}}) method.
+
+The following example creates a `2dsphere` index on the `"contact.location"` field for the `restaurants` collection.
+
+```java
+collection.createIndex(Indexes.geo2dsphere("contact.location"), new SingleResultCallback<String>() {
+    @Override
+    public void onResult(final String result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+});
+```
+
+## Query for Locations Near a GeoJSON Point
+
+MongoDB provides various [geospatial query operators]({{<apiref "reference/operator/query-geospatial">}}). To facilitate the creation of geospatial queries filters, the Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) class and the ``com.mongodb.client.model.geojson`` package.
+
+The following example returns documents that are at least 1000 meters from and at most 5000 meters from the specified GeoJSON point ``com.mongodb.client.model.geojson.Point``, sorted from nearest to farthest:
+
+```java
+Point refPoint = new Point(new Position(-73.9667, 40.78));
+collection.find(Filters.near("contact.location", refPoint, 5000.0, 1000.0))
+          .forEach(printBlock, callbackWhenFinished);
+```
diff --git a/docs/reference/content/driver-async/tutorials/gridfs.md b/docs/reference/content/driver-async/tutorials/gridfs.md
new file mode 100644
index 00000000000..e8b7efc4d26
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/gridfs.md
@@ -0,0 +1,303 @@
++++
+date = "2015-11-27T12:00:00-00:00"
+title = "GridFS"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async GridFS"
+  weight = 90
+  pre = "<i class='fa'></i>"
++++
+
+## GridFS
+
+[GridFS]({{< docsref "core/gridfs">}}) is a specification for storing and retrieving files that exceed the BSON document size limit of 16MB. Instead of storing a file in a single document, GridFS divides a file into parts, or chunks, and stores each of those chunks as a separate document.
+
+When you query a GridFS store for a file, the Java Async driver will reassemble the chunks as needed.
+
+The following code snippets come from the [`GridFSTour.java`]({{< srcref "driver-async/src/examples/gridfs/GridFSTour.java">}}) example code,
+which can be found with the driver source on github.
+
+## Async Streams
+
+The driver's GridFS library uses flexible interfaces for asynchronous input and output. The [`AsyncInputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncInputStream" >}}) interface represents an `InputStream`
+and the [`AsyncOutputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncOutputStream" >}}) interface represents an `OutputStream`.
+These interfaces should be easy to wrap for any alternative asynchronous I/O implementations such as Netty or Vertx.
+
+In addition to these interfaces, the driver provides the following helpers:
+
+* [`AsyncStreamHelper`]({{< apiref "com/mongodb/async/client/gridfs/helpers/AsyncStreamHelper.html" >}}), which provides support for:
+    * `byte[]`
+    * `ByteBuffer`
+    * `InputStream` - note: input streams are blocking
+    * `OutputStream` - note: output streams are blocking
+
+* [`AsynchronousChannelHelper`]({{< apiref "com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelper.html" >}}), which provides support for:
+    * `AsynchronousByteChannel`
+    * `AsynchronousFileChannel`
+
+
+## Prerequisites
+
+Include the following import statements:
+
+```java
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoDatabase;
+
+import com.mongodb.async.client.gridfs.GridFSBucket;
+import com.mongodb.async.client.gridfs.GridFSBuckets;
+import com.mongodb.async.client.gridfs.AsyncInputStream;
+import com.mongodb.async.client.gridfs.GridFSDownloadStream;
+import com.mongodb.async.client.gridfs.GridFSUploadStream;
+import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+
+import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream;
+import static com.mongodb.async.client.gridfs.helpers.AsynchronousChannelHelper.channelToOutputStream;
+import com.mongodb.async.SingleResultCallback;
+
+import com.mongodb.Block;
+import static com.mongodb.client.model.Filters.eq;
+import java.nio.charset.StandardCharsets;
+import java.nio.ByteBuffer;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.nio.channels.AsynchronousFileChannel;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+```
+
+## Consideration
+
+{{% note class="important" %}}
+Always check for errors in any [`SingleResultCallback<T>`]({{< apiref "com/mongodb/async/SingleResultCallback.html">}}) implementation
+and handle them appropriately.
+
+For sake of brevity, this tutorial omits the error check logic in the code examples.
+{{% /note %}}
+
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017`:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+## Create a GridFS Bucket
+
+GridFS stores files in [two collections]({{<docsref "core/gridfs/#gridfs-collections">}}): a `chunks` collection stores the file chunks, and a  `files` collection stores file metadata. The two collections are in a common bucket and the collection names are prefixed with the bucket name.
+
+The Java Async driver provides the [`GridFSBuckets.create()`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBuckets.html#create(com.mongodb.async.client.MongoDatabase)" >}})  method
+to create the [`GridFSBucket`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html" >}}):
+
+```java
+MongoDatabase myDatabase = mongoClient.getDatabase("mydb");
+
+// Create a gridFSBucket using the default bucket name "fs"
+GridFSBucket gridFSBucket = GridFSBuckets.create(myDatabase);
+```
+
+You can specify a bucket name to [`GridFSBuckets.create()`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBuckets.html#create(com.mongodb.async.client.MongoDatabase)" >}}) method.
+
+```java
+// Create a gridFSBucket with a custom bucket name "files"
+GridFSBucket gridFSBucketCustom = GridFSBuckets.create(myDatabase, "files");
+```
+
+{{% note %}}
+GridFS will automatically create indexes on the `files` and `chunks` collections on first upload of data into the GridFS bucket.
+{{% /note %}}
+
+## Upload to GridFS
+
+To upload data into GridFS, you can upload from an `InputStream` or write data to a `GridFSUploadStream`.
+
+### UploadFromStream
+
+The [`uploadFromStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#openUploadStream(java.lang.String,com.mongodb.client.gridfs.model.GridFSUploadOptions)" >}}) method
+reads the contents of an [`AsyncInputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncInputStream" >}}) and saves it to the `GridFSBucket`.
+
+You can use the [`GridFSUploadOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSUploadOptions.html" >}}) to configure the chunk size or include additional metadata.
+
+
+```java
+// Get the input stream
+final AsyncInputStream streamToUploadFrom = toAsyncInputStream(
+                    "/tmp/mongodb-tutorial.pdf".getBytes(StandardCharsets.UTF_8));
+
+// Create some custom options
+GridFSUploadOptions options = new GridFSUploadOptions()
+                                    .chunkSizeBytes(1024 * 1024)
+                                    .metadata(new Document("type", "presentation"));
+
+gridFSBucket.uploadFromStream("mongodb-tutorial", streamToUploadFrom, options,
+    new SingleResultCallback<ObjectId>() {
+       @Override
+       public void onResult(final ObjectId result, final Throwable t) {
+           System.out.println("The fileId of the uploaded file is: " + result.toHexString());
+            streamToUploadFrom.close(new SingleResultCallback<Void>() {
+                @Override
+                public void onResult(final Void result, final Throwable t) {
+                    // Stream closed
+                }
+            });
+       }
+    }
+);
+```
+
+
+### OpenUploadStream
+
+For a finer-grained control of the upload, the driver also provides a [`GridFSBucket.openUploadStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#openUploadStream(java.lang.String,com.mongodb.client.gridfs.model.GridFSUploadOptions)">}}) method, which returns a [`GridFSUploadStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSUploadStream.html">}}). You can write data to a [`GridFSUploadStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSUploadStream.html">}}) which extends [`AsyncOutputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncOutputStream" >}}).
+
+The [`GridFSUploadStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSUploadStream.html">}}) buffers data until it reaches the `chunkSizeBytes` and then inserts the chunk into the `chunks` collection.  When the `GridFSUploadStream` is closed, the final chunk is written and the file metadata is inserted into the `files` collection.
+
+
+## Find Files Stored in GridFS
+
+To find the files stored in the `GridFSBucket` use the [`find`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#find()">}}) method.
+
+The following example prints out the filename of each file stored:
+
+```java
+gridFSBucket.find().forEach(
+    new Block<GridFSFile>() {
+        @Override
+        public void apply(final GridFSFile gridFSFile) {
+            System.out.println(gridFSFile.getFilename() + " has file id: " +
+                                gridFSFile.getObjectId().toHexString());
+        }
+    },
+    new SingleResultCallback<Void>() {
+        @Override
+        public void onResult(final Void result, final Throwable t) {
+            // Finished
+        }
+    }
+);
+```
+
+You can also provide a custom filter to limit the results returned. The following example prints out the filenames of all files with a "image/png" value set as the contentType in the user defined metadata document:
+
+```java
+gridFSBucket.find(eq("metadata.contentType", "image/png")).forEach(
+    new Block<GridFSFile>() {
+        @Override
+        public void apply(final GridFSFile gridFSFile) {
+            System.out.println(gridFSFile.getFilename() + " has file id: " +
+                               gridFSFile.getObjectId().toHexString());
+        }
+    },
+    new SingleResultCallback<Void>() {
+        @Override
+        public void onResult(final Void result, final Throwable t) {
+            // Finished
+        }
+    }
+);
+```
+
+## Download from GridFS
+
+
+### DownloadToStream
+
+The [`downloadToStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#downloadToStream(org.bson.types.ObjectId,com.mongodb.async.client.gridfs.AsyncOutputStream,com.mongodb.async.SingleResultCallback)" >}}) method reads the contents from MongoDB and writes the data directly to the provided [`AsyncOutputStream`]({{< apiref "com/mongodb/async/client/gridfs/AsyncOutputStream" >}}).
+
+For the `fileId` variable, specify an `ObjectId` value returned from the find operation section in this tutorial.
+
+```java
+Path outputPath = Paths.get("/tmp/mongodb-tutorial-out.pdf");
+AsynchronousFileChannel streamToDownloadTo = AsynchronousFileChannel.open(outputPath,
+        StandardOpenOption.CREATE_NEW,
+        StandardOpenOption.WRITE,
+        StandardOpenOption.DELETE_ON_CLOSE);
+
+gridFSBucket.downloadToStream(fileId, channelToOutputStream(streamToDownloadTo),
+    new SingleResultCallback<Long>() {
+      @Override
+      public void onResult(final Long result, final Throwable t) {
+          System.out.println("downloaded file sized: " + result);
+      }
+});
+// Note: AsynchronousFileChannel was opened with option delete on close
+streamToDownloadTo.close();
+```
+
+If the `_id` of the file is unknown but you know the filename, then you can pass the filename to the [`downloadToStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#downloadToStream(java.lang.String,com.mongodb.async.client.gridfs.AsyncOutputStream,com.mongodb.client.gridfs.model.GridFSDownloadOptionscom.mongodb.async.SingleResultCallback)" >}}) method. By default, it will download the latest version of the file. Use the [`GridFSDownloadOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSDownloadOptions.html" >}}) to configure which version to download.
+
+```java
+Path outputPath = Paths.get("/tmp/mongodb-tutorial-out.pdf");
+AsynchronousFileChannel streamToDownloadTo = AsynchronousFileChannel.open(outputPath,
+        StandardOpenOption.CREATE_NEW,
+        StandardOpenOption.WRITE,
+        StandardOpenOption.DELETE_ON_CLOSE);
+
+GridFSDownloadOptions downloadOptions = new GridFSDownloadOptions().revision(0);
+
+gridFSBucket.downloadToStream("mongodb-tutorial", channelToOutputStream(streamToDownloadTo), downloadOptions,
+    new SingleResultCallback<Long>() {
+      @Override
+      public void onResult(final Long result, final Throwable t) {
+          System.out.println("downloaded file sized: " + result);
+      }
+});
+// Note: AsynchronousFileChannel was opened with option delete on close
+streamToDownloadTo.close();
+```
+
+### OpenDownloadStream
+
+For a finer-grained control of the upload, the driver also provides a [`openDownloadStream`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#openDownloadStream(org.bson.types.ObjectId)">}}) method, which returns a [`GridFSDownloadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSDownloadStream.html">}}).
+
+## Rename Files
+
+If you should need to rename a file, then use the [`rename`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#rename(org.bson.types.ObjectId,java.lang.String,com.mongodb.async.SingleResultCallback)">}}) method.  
+
+The following example renames a file to "mongodbTutorial":
+
+```java
+ObjectId fileId; // The id of a file uploaded to GridFS, initialize to valid file id 
+...
+gridFSBucket.rename(fileId, "mongodbTutorial", new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Renamed file");
+    }
+});
+```
+
+{{% note %}}
+The `rename` method requires an `_id` rather than a `filename` to ensure the correct file is renamed.
+
+To rename multiple revisions of the same filename, first retrieve the full list of files. Then, for every file that should be renamed, execute `rename` with the corresponding `_id`.
+{{% /note %}}
+
+## Delete Files
+
+To delete a file from the `GridFSBucket` use the [`delete`]({{< apiref "com/mongodb/async/client/gridfs/GridFSBucket.html#delete(org.bson.types.ObjectId,com.mongodb.async.SingleResultCallback)">}}) method.
+
+The following example deletes a file from the `GridFSBucket`:
+
+```java
+ObjectId fileId; // The id of a file uploaded to GridFS, initialize to valid file id 
+...
+gridFSBucket.delete(fileId, new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Deleted file");
+    }
+});
+```
diff --git a/docs/reference/content/driver-async/tutorials/index.md b/docs/reference/content/driver-async/tutorials/index.md
new file mode 100644
index 00000000000..96ce519818a
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/index.md
@@ -0,0 +1,34 @@
++++
+date = "2016-05-29T12:49:33-04:00"
+title = "Tutorials"
+[menu.main]
+  parent = "MongoDB Async Driver"
+  identifier = "Async Tutorials"
+  weight = 20
+  pre = "<i class='fa fa-thumb-tack'></i>"
++++
+
+## Java Async Driver Tutorials
+
+The tutorials in this section provide examples of some frequently used operations. This section is not meant to be an exhaustive list of all operations available in the Java Async driver.
+
+
+- [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}})
+
+- [Databases and Collections]({{< relref "driver-async/tutorials/databases-collections.md" >}})
+
+- [Create Indexes]({{< relref "driver-async/tutorials/indexes.md" >}})
+
+- [Read Operations]({{< relref "driver-async/tutorials/perform-read-operations.md" >}})
+
+- [Write Operations]({{< relref "driver-async/tutorials/perform-write-operations.md" >}})
+
+- [Aggregation]({{< relref "driver-async/tutorials/aggregation.md" >}})
+
+- [Text Search]({{< relref "driver-async/tutorials/text-search.md" >}})
+
+- [Geospatial Search]({{< relref "driver-async/tutorials/geospatial-search.md" >}})
+
+- [GridFS]({{< relref "driver-async/tutorials/gridfs.md" >}})
+
+- [Run Commands]({{< relref "driver-async/tutorials/commands.md" >}})
diff --git a/docs/reference/content/driver-async/tutorials/indexes.md b/docs/reference/content/driver-async/tutorials/indexes.md
new file mode 100644
index 00000000000..3864e30527d
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/indexes.md
@@ -0,0 +1,263 @@
++++
+date = "2016-08-01T14:13:59-04:00"
+title = "Create Indexes"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Create Indexes"
+  weight = 12
+  pre = "<i class='fa'></i>"
++++
+
+
+## Create Indexes
+
+[Indexes]({{<docsref "indexes">}}) support the efficient execution of queries in MongoDB. To create an [index]({{<docsref "indexes">}}) on a field or fields, pass an index specification document to the [`MongoCollection.createIndex`]({{< apiref "com/mongodb/async/client/MongoCollection.html#createIndex(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) method.
+
+
+The MongoDB Java Async Driver provides the [`Indexes`]({{< relref "builders/indexes.md">}}) helper class that
+provides static factory methods to create index specification
+documents for the various MongoDB Index key types.
+
+{{% note %}}
+MongoDB only creates an index if an index of the same specification does not already exist.
+{{% /note %}}
+
+## Consideration
+
+{{% note class="important" %}}
+Always check for errors in any [`SingleResultCallback<T>`]({{< apiref "com/mongodb/async/SingleResultCallback.html">}}) implementation
+and handle them appropriately.
+
+For sake of brevity, this tutorial omits the error check logic in the code examples.
+{{% /note %}}
+
+## Prerequisites
+
+- Include the following import statements:
+
+    ```java
+    import com.mongodb.Block;
+    import com.mongodb.async.SingleResultCallback;
+    import com.mongodb.async.client.MongoClient;
+    import com.mongodb.async.client.MongoClients;
+    import com.mongodb.async.client.MongoCollection;
+    import com.mongodb.async.client.MongoDatabase;
+    import com.mongodb.client.model.*;
+    import org.bson.Document;
+    ```
+
+- Include the following callback code which the examples in the tutorials will use:
+
+    ```java
+    SingleResultCallback<String> callbackWhenFinished = new SingleResultCallback<String>() {
+               @Override
+               public void onResult(final String result, final Throwable t) {
+                   System.out.println("Operation Finished!");
+               }
+           };
+    ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+## Ascending Index
+
+To create a specification for an ascending index, use the [`Indexes.ascending`]({{<apiref "com/mongodb/client/model/Indexes.html">}}) static helper methods.
+
+### Single Ascending Index
+
+The following example creates an ascending index on the
+`name` field:
+
+```java
+collection.createIndex(Indexes.ascending("name"), callbackWhenFinished);
+```
+
+### Compound Ascending Index
+
+The following example creates an ascending [compound index]({{<docsref "core/index-compound">}})  on the `stars` field and the `name`
+ field:
+
+```java
+collection.createIndex(Indexes.ascending("stars", "name"), callbackWhenFinished);
+```
+
+For an alternative way to create a compound index, see [Compound Indexes](#compound-indexes).
+
+
+## Descending Index
+
+To create a specification of a descending index, use the [`Indexes.descending`]({{<apiref "com/mongodb/client/model/Indexes.html">}}) static helper methods.
+
+### Single Descending Key Index
+
+The following example creates a descending index on the `stars` field:
+
+```java
+collection.createIndex(Indexes.descending("stars"), callbackWhenFinished);
+```
+
+### Compound Descending Key Index
+
+The following example creates a descending [compound index]({{<docsref "core/index-compound">}}) on the `stars` field and the `name` field:
+
+```java
+collection.createIndex(Indexes.descending("stars", "name"), callbackWhenFinished);
+```
+
+For an alternative way to create a compound index, see [Compound Indexes](#compound-indexes).
+
+## Compound Indexes
+
+To create a specification for a [compound index]({{<docsref "core/index-compound">}}), use the [`Indexes.compoundIndex`]({{<apiref "com/mongodb/client/model/Indexes.html">}}) static helper methods.
+
+{{% note %}}
+To create a specification for a compound index where all the keys are ascending, you can use the [`ascending()`](#compound-ascending-key-index) method. To create a specification for a compound index where all the keys are descending, you can use the [`descending()`](##compound-descending-key-index) method.
+{{% /note %}}
+
+The following example creates a compound index with the `stars` field in descending order and the `name` field in ascending order:
+
+```java
+collection.createIndex(Indexes.compoundIndex(Indexes.descending("stars"),
+                       Indexes.ascending("name")), callbackWhenFinished);
+```
+
+## Text Indexes
+
+MongoDB provides [text indexes]({{<docsref "core/index-text">}}) to support text search of string content. Text indexes can include any field whose value is a string or an array of string elements. To create a specification for a text index, use the
+[`Indexes.text`]({{<apiref "com/mongodb/client/model/Indexes.html#text(java.lang.String)">}}) static helper method.
+
+The following example creates a text index on the `name` field:
+
+```java
+collection.createIndex(Indexes.text("name"), callbackWhenFinished);
+```
+
+## Hashed Index
+
+To create a specification for a [hashed index]({{<docsref "core/index-hashed">}}) index, use the [`Indexes.hashed`]({{<apiref "com/mongodb/client/model/Indexes.html#hashed(java.lang.String)">}}) static helper method.
+
+The following example creates a hashed index on the `_id` field:
+
+```java
+collection.createIndex(Indexes.hashed("_id"), callbackWhenFinished);
+```
+
+## Geospatial Indexes
+
+To support geospatial queries, MongoDB supports various
+[geospatial indexes]({{<docsref "applications/geospatial-indexes">}}).
+
+### `2dsphere`
+
+To create a specification for a [`2dsphere` index]({{<docsref "core/2dsphere">}}), use the [`Indexes.geo2dsphere`]({{<apiref "com/mongodb/client/model/Indexes.html#geo2dsphere(java.lang.String...)">}}) static helper methods.
+
+The following example creates a `2dsphere` index on the `"contact.location"` field:
+
+```java
+collection.createIndex(Indexes.geo2dsphere("contact.location"), callbackWhenFinished);
+```
+
+### `2d`
+
+To create a specification for a [`2d` index]({{<docsref "core/2d/">}}) index, use the [`Indexes.geo2d`]({{<apiref "com/mongodb/client/model/Indexes.html#geo2d(java.lang.String)">}})
+static helper method.
+
+{{% note class="important" %}}
+A 2d index is for data stored as points on a two-dimensional plane
+and is intended for legacy coordinate pairs used in MongoDB 2.2 and
+earlier.
+{{% /note %}}
+
+The following example creates a `2d` index on the `"contact.location"` field:
+
+```java
+collection.createIndex(Indexes.geo2d("contact.location"), callbackWhenFinished);
+```
+
+### geoHaystack
+
+To create a specification for a [`geoHaystack` index]({{<docsref "core/geohaystack/">}}), use the [`Indexes.geoHaystack`]({{<apiref "com/mongodb/client/model/Indexes.html#geoHaystack(java.lang.String,org.bson.conversions.Bson)">}}) method. `geoHaystack` indexes can improve performance on queries that use flat geometries.
+
+The following example creates a `geoHaystack` index on the `contact.location` field and an ascending index on the `stars` field:
+
+```java
+IndexOptions haystackOption = new IndexOptions().bucketSize(1.0);
+collection.createIndex(
+         Indexes.geoHaystack("contact.location", Indexes.ascending("stars")),
+         haystackOption, callbackWhenFinished);
+```
+
+To query a haystack index, use the [`geoSearch`]({{<docsref "reference/command/geoSearch">}}) command.
+
+## IndexOptions
+
+```java
+import com.mongodb.client.model.IndexOptions;
+```
+
+In addition to the index specification document, the
+[`createIndex()`]({{<apiref "com/mongodb/async/client/MongoCollection.html#createIndex(org.bson.conversions.Bson,com.mongodb.client.model.IndexOptions,com.mongodb.async.SingleResultCallback)">}}) method can take an index options document, such as to create unique indexes or partial indexes.
+
+The Java Driver provides the [IndexOptions]({{<apiref "com/mongodb/client/model/IndexOptions.html">}}) class to specify various index options.
+
+### Unique Index
+
+The following specifies a [`unique(true)`]({{<apiref "com/mongodb/client/model/IndexOptions.html#unique(boolean)">}}) option to create a [unique index]({{<docsref "core/index-unique">}}) on the `name` and `stars` fields:
+
+```java
+IndexOptions indexOptions = new IndexOptions().unique(true);
+collection.createIndex(Indexes.ascending("name", "stars"),
+                       indexOptions,
+                       callbackWhenFinished);
+```
+
+For more information on unique indexes, see [Unique Indexes]({{<docsref "core/index-unique">}}).
+
+### Partial Index
+
+To create a [partial index]({{<docsref "core/index-partial/">}}), include a [partialFilterExpression]({{<apiref "com/mongodb/client/model/IndexOptions.html#partialFilterExpression(org.bson.conversions.Bson)">}}) as an index option.
+
+The following example creates a partial index on documents that have `status` field equal to `"A"`.
+
+```java
+IndexOptions partialFilterIndexOptions = new IndexOptions()
+                       .partialFilterExpression(Filters.exists("contact.email"));
+collection.createIndex(Indexes.descending("name", "stars"),
+                       partialFilterIndexOptions,
+                       callbackWhenFinished);
+```
+
+For more information on partial indexes, see [Partial Indexes]({{<docsref "core/index-partial/">}}).
+
+
+## Get a List of Indexes on a Collection
+
+Use the `listIndexes()` method to get a list of indexes. The following lists the indexes on the collection:
+
+```java
+Block<Document> printBlock = new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                System.out.println(document.toJson());
+            }
+        };
+
+collection.listIndexes().forEach(printBlock, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                System.out.println("Operation Finished!");
+            }
+        });
+```
diff --git a/docs/reference/content/driver-async/tutorials/perform-read-operations.md b/docs/reference/content/driver-async/tutorials/perform-read-operations.md
new file mode 100644
index 00000000000..a91011eb7e4
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/perform-read-operations.md
@@ -0,0 +1,345 @@
++++
+date = "2015-03-19T12:53:30-04:00"
+title = "Read Operations"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Read Operations"
+  weight = 15
+  pre = "<i class='fa'></i>"
++++
+
+
+## Find Operations
+
+Find operations retrieve documents from a collection. You can specify a filter to select only those documents that match the filter condition.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+```java
+import com.mongodb.*;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.*;
+import com.mongodb.client.model.Sorts;
+import com.mongodb.connection.ClusterSettings;
+import org.bson.Document;
+
+import static com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
+import static java.util.Arrays.asList;
+```
+
+- Include the following callback code which the examples in the tutorials will use:
+
+```java
+SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+};
+```
+
+- Include the following code which the examples will use to print the results of the find operations:
+
+```java
+Block<Document> printBlock = new Block<Document>() {
+    @Override
+    public void apply(final Document document) {
+        System.out.println(document.toJson());
+    }
+};
+```
+
+## Considerations
+
+{{% note class="important" %}}
+Always check for errors in any `SingleResultCallback<T>` implementation
+and handle them appropriately.
+
+For sake of brevity, this tutorial omits the error check logic in the code examples.
+{{% /note %}}
+
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+
+## Query a Collection
+
+To query the collection, you can use the [`find()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#find(org.bson.conversions.Bson)">}}) method.
+
+You can call the method without any arguments to query all documents in a collection:
+
+```java
+collection.find().forEach(printBlock, callbackWhenFinished);
+```
+
+Or pass a filter to query for documents that match the filter criteria:
+
+```java
+collection.find(eq("name", "456 Cookies Shop"))
+            .forEach(printBlock, callbackWhenFinished);
+```
+
+## Query Filters
+
+To query for documents that match certain conditions, pass a filter document to the [`find()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#find(org.bson.conversions.Bson)">}}) method.
+
+### Empty Filter
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+```java
+collection.find(new Document()).forEach(printBlock, callbackWhenFinished);
+```
+
+{{% note class="tip"%}}
+For the [`find()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method, you can also call the method without passing a filter object to match all documents in a collection.
+{{% /note %}}
+
+```java
+collection.find().forEach(printBlock, callbackWhenFinished);
+```
+
+### `Filters` Helper
+
+To facilitate the creation of filter documents, the Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) class that provides filter condition helper methods.
+
+Consider the following `find` operation which includes a filter `Document` which specifies that:
+
+- the `stars` field is greater than or equal to 2 and less than 5, *AND*
+
+- the `categories` field equals `"Bakery"` (or if `categories` is an array, contains the string `"Bakery"` as an element):
+
+```java
+collection.find(
+    new Document("stars", new Document("$gte", 2)
+          .append("$lt", 5))
+          .append("categories", "Bakery")).forEach(printBlock, callbackWhenFinished);
+```
+
+The following example specifies the same filter condition using the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper methods:
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+            .forEach(printBlock, callbackWhenFinished);
+```
+
+For a list of MongoDB query filter operators, refer to the [MongoDB Manual]({{<docsref "reference/operator/query">}}). For the associated `Filters` helpers, see [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}).
+See also the  [Query Documents Tutorial]({{<docsref "tutorial/query-documents">}}) for an overview of querying in MongoDB, including specifying filter conditions on arrays and embedded documents.
+
+## FindIterable
+
+The [`find()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#find()">}}) method returns an instance of the [`FindIterable`]({{< apiref "com/mongodb/async/client/FindIterable.html" >}}) interface. The interface provides various methods that you can chain to the `find()` method to modify the output or behavior of the query, such as [`sort()`]({{<apiref "com/mongodb/async/client/FindIterable.html#sort(org.bson.conversions.Bson)">}})  or [`projection()`]({{<apiref "com/mongodb/async/client/FindIterable.html#projection(org.bson.conversions.Bson)">}}), as well as for iterating the results, such as [`forEach()`]({{<apiref "com/mongodb/async/client/MongoIterable.html#forEach(com.mongodb.Block,com.mongodb.async.SingleResultCallback)">}}).
+
+
+### Projections
+
+By default, queries in MongoDB return all fields in matching documents. To specify the fields to return in the matching documents, you can specify a [projection document]({{<docsref "tutorial/project-fields-from-query-results/#projection-document">}}).
+
+Consider the following `find` operation which includes a projection `Document` which specifies that the matching documents return only the `name` field, `stars` field, and the `categories` field.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .projection(new Document("name", 1)
+                     .append("stars", 1)
+                     .append("categories",1)
+                     .append("_id", 0))
+                .forEach(printBlock, callbackWhenFinished);
+```
+
+To facilitate the creation of projection documents, the Java driver provides the
+[`Projections`]({{<apiref "com/mongodb/client/model/Projections.html">}}) class.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .projection(fields(include("name", "stars", "categories"), excludeId()))
+                .forEach(printBlock, callbackWhenFinished);
+```
+
+In the projection document, you can also specify a projection expression using a [projection operator]({{<apiref "reference/operator/projection/">}})
+
+For an example on using the [`Projections.metaTextScore`]({{<apiref "com/mongodb/client/model/Projections.html#metaTextScore(java.lang.String)">}}),
+see the [Text Search tutorial]({{<relref "driver/tutorials/text-search.md">}}).
+
+### Sorts
+
+To sort documents, pass a [sort specification document]({{<docsref "reference/method/cursor.sort/#cursor.sort">}}) to the [`FindIterable.sort()`]({{<apiref "com/mongodb/async/client/FindIterable.html#sort(org.bson.conversions.Bson)">}}) method.  The Java driver provides [`Sorts`]({{< relref "builders/sorts.md">}}) helpers to facilitate the sort specification document.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .sort(Sorts.ascending("name"))
+                .forEach(printBlock, callbackWhenFinished);
+
+```
+
+### Sort with Projections
+
+The [`FindIterable`]({{< apiref "com/mongodb/async/client/FindIterable.html" >}}) methods themselves return `FindIterable` objects, and as such, you can append multiple `FindIterable` methods to the `find()` method.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .sort(Sorts.ascending("name"))
+                .projection(fields(include("name", "stars", "categories"), excludeId()))
+                .forEach(printBlock, callbackWhenFinished);
+```
+
+## MongoIterable
+
+The [`MongoIterable`]({{< apiref "com/mongodb/async/client/FindIterable.html" >}}) interface provides helper methods to access the results of an operation:
+
+
+- [`first()`]({{< apiref "com/mongodb/async/client/MongoIterable.html#first(com.mongodb.async.SingleResultCallback)" >}})
+
+- [`forEach()`]({{< apiref "com/mongodb/async/client/MongoIterable.html#forEach(com.mongodb.Block,com.mongodb.async.SingleResultCallback)" >}})
+
+- [`map()`]({{< apiref "com/mongodb/async/client/MongoIterable.html#map(com.mongodb.Function)" >}})
+
+- [`into()`]({{< apiref "com/mongodb/async/client/MongoIterable.html#into(A,com.mongodb.async.SingleResultCallback)" >}})
+
+
+## Read Preference
+
+For read operations on [replica sets]({{<docsref "replication/">}}) or [sharded clusters]({{<docsref "sharding/">}}), applications can configure the [read preference]({{<docsref "reference/read-preference">}}) at three levels:
+
+- In a [`MongoClient()`]({{< apiref "com/mongodb/async/client/MongoClient.html" >}})
+
+  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings.html">}}), as in the following example:
+
+      ```java
+      ClusterSettings clusterSettings = ClusterSettings.builder()
+                                .hosts(asList(
+                                new ServerAddress("host1", 27017),
+                                new ServerAddress("host2", 27017))).build();
+      MongoClientSettings settings = MongoClientSettings.builder()
+                                        .clusterSettings(clusterSettings)
+                                        .readPreference(ReadPreference.secondary())
+                                        .build();
+      MongoClient mongoClient = MongoClients.create(settings);
+      ```                                      
+
+  - Via a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object.
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(new ConnectionString(
+            "mongodb://host1:27017,host2:27017/?readPreference=secondary"));
+      ```
+
+  - Via string that specifies the connection URI:
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+            "mongodb://host1:27017,host2:27017/?readPreference=secondary");
+      ```
+
+- In a [`MongoDatabase`]({{<apiref "com/mongodb/async/client/MongoDatabase.html">}}) via its [`withReadPreference`]({{<apiref
+"com/mongodb/async/client/MongoDatabase.html#withReadPreference-com.mongodb.ReadPreference-">}}) method, as in the following example:
+
+
+    ```java
+     MongoDatabase database = mongoClient.getDatabase("test")     
+            .withReadPreference(ReadPreference.secondary());
+    ```
+
+- In a [`MongoCollection`]({{<apiref "com/mongodb/async/client/MongoCollection.html">}}) via its [`withReadPreference`]({{<apiref "com/mongodb/async/client/MongoCollection.html#withReadPreference(com.mongodb.ReadPreference)">}}) method, as in the following example:
+
+    ```java
+    MongoCollection<Document> collection = database.getCollection("restaurants")
+              .withReadPreference(ReadPreference.secondary());
+    ```
+
+`MongoDatabase` and `MongoCollection` instances are immutable. Calling `.withReadPreference()` on an existing `MongoDatabase` or `MongoCollection` instance returns a new instance and does not affect the instance on which the method is called.
+
+For example, in the following, the `collectionWithReadPref` instance has the read preference of primaryPreferred whereas the read preference of the `collection` is unaffected.
+
+```java
+  MongoCollection<Document> collectionWithReadPref =
+                collection.withReadPreference(ReadPreference.primaryPreferred());
+```
+
+## Read Concern
+
+For read operations on [replica sets]({{<docsref "replication/">}}) or [sharded clusters]({{<docsref "sharding/">}}), applications can configure the [read concern]({{<docsref "reference/read-concern">}}) at three levels:
+
+- In a [`MongoClient()`]({{< apiref "com/mongodb/async/client/MongoClient.html" >}})
+
+  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings.html">}}), as in the following example:
+
+      ```java
+      ClusterSettings clusterSettings = ClusterSettings.builder()
+                                .hosts(asList(
+                                new ServerAddress("host1", 27017),
+                                new ServerAddress("host2", 27017))).build();
+      MongoClientSettings settings = MongoClientSettings.builder()
+                                        .clusterSettings(clusterSettings)
+                                        .readConcern(ReadConcern.DEFAULT)
+                                        .build();
+      MongoClient mongoClient = MongoClients.create(settings);
+      ```                                      
+
+  - Via a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object.
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(new ConnectionString(
+              "mongodb://host1:27017,host2:27017/?readConcernLevel=majority"));
+      ```
+
+  - Via string that specifies the connection URI:
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+              "mongodb://host1:27017,host2:27017/?readConcernLevel=majority");
+      ```
+
+- In a [`MongoDatabase`]({{<apiref "com/mongodb/async/client/MongoDatabase.html">}}) via its [`withReadConcern`]({{<apiref
+"com/mongodb/client/MongoDatabase.html#withReadConcern-com.mongodb.ReadConcern-">}}) method, as in the following example:
+
+
+    ```java
+     MongoDatabase database = mongoClient.getDatabase("test")
+                                .withReadConcern(ReadConcern.DEFAULT);
+    ```
+
+- In a [`MongoCollection`]({{<apiref "com/mongodb/async/client/MongoCollection.html">}}) via its [`withReadConcern`]({{<apiref "com/mongodb/client/MongoCollection.html#withReadConcern(com.mongodb.ReadConcern)">}}) method, as in the following example:
+
+    ```java
+    MongoCollection<Document> collection = database.getCollection("restaurants")
+                                .withReadConcern(ReadConcern.DEFAULT);
+    ```
+
+`MongoDatabase` and `MongoCollection` instances are immutable. Calling `.withReadConcern()` on an existing `MongoDatabase` or `MongoCollection` instance returns a new instance and does not affect the instance on which the method is called.
+
+For example, in the following, the `collWithReadConcern` instance has majority read concern whereas the read concern of the `collection` is unaffected.
+
+```java
+MongoCollection<Document> collWithReadConcern = collection
+                                                  .withReadConcern(ReadConcern.MAJORITY);
+```
+
+You can build `MongoClientOptions`, `MongoDatabase`, or `MongoCollection` to include a combination of read concern, read preference, and [write concern]({{<docsref "reference/write-concern">}}).
+
+For example, the following sets all three at the collection level:
+
+```java
+collection = database.getCollection("restaurants")
+                .withReadPreference(ReadPreference.primary())
+                .withReadConcern(ReadConcern.MAJORITY)
+                .withWriteConcern(WriteConcern.MAJORITY);
+```
diff --git a/docs/reference/content/driver-async/tutorials/perform-write-operations.md b/docs/reference/content/driver-async/tutorials/perform-write-operations.md
new file mode 100644
index 00000000000..7d926d15913
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/perform-write-operations.md
@@ -0,0 +1,404 @@
++++
+date = "2015-03-19T12:53:30-04:00"
+title = "Write Operations"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Write Operations"
+  weight = 15
+  pre = "<i class='fa'></i>"
++++
+
+
+## Write Operations (Insert, Update, Replace, Delete)
+
+Perform write operations to insert new documents into a collection, update existing document or documents in a collection, replace an existing document in a collection, or delete existing document or documents from a collection.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+```java
+import com.mongodb.ConnectionString;
+import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.client.*;
+import com.mongodb.async.SingleResultCallback;
+
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.connection.ClusterSettings;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Updates.combine;
+import static com.mongodb.client.model.Updates.currentDate;
+import static com.mongodb.client.model.Updates.set;
+import static java.util.Arrays.asList;
+```
+
+## Considerations
+
+{{% note class="important" %}}
+Always check for errors in any `SingleResultCallback<T>` implementation
+and handle them appropriately.
+
+For sake of brevity, this tutorial omits the error check logic in the code examples.
+{{% /note %}}
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+## Insert New Document
+
+To insert the document into the collection, you can use the collection's [`insertOne()`]({{<apiref "com/mongodb/async/client/MongoCollection.html#insertOne(TDocument,com.mongodb.async.SingleResultCallback)">}}) method.
+
+```java
+Document document = new Document("name", "Café Con Leche")
+               .append("contact", new Document("phone", "228-555-0149")
+                                       .append("email", "cafeconleche@example.com")
+                                       .append("location",Arrays.asList(-73.92502, 40.8279556)))
+               .append("stars", 3)
+               .append("categories", Arrays.asList("Bakery", "Coffee", "Pastries"));
+
+
+collection.insertOne(document, new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Inserted!");
+    }
+});
+```
+
+{{% note %}}
+If no top-level `_id` field is specified in the document, the driver automatically adds the `_id` field to the inserted document.
+{{% /note %}}
+
+### Insert Multiple Documents
+
+To add multiple documents, you can use the [`insertMany()`]({{< apiref "com/mongodb/async/client/MongoCollection.html#insertMany(java.util.List,com.mongodb.async.SingleResultCallback)">}}) method which takes a list of documents to insert.
+
+
+The following example inserts two documents to the collection:
+
+```java
+Document doc1 = new Document("name", "Amarcord Pizzeria")
+               .append("contact", new Document("phone", "264-555-0193")
+                                       .append("email", "amarcord.pizzeria@example.net")
+                                       .append("location",Arrays.asList(-73.88502, 40.749556)))
+               .append("stars", 2)
+               .append("categories", Arrays.asList("Pizzeria", "Italian", "Pasta"));
+
+
+Document doc2 = new Document("name", "Blue Coffee Bar")
+               .append("contact", new Document("phone", "604-555-0102")
+                                       .append("email", "bluecoffeebar@example.com")
+                                       .append("location",Arrays.asList(-73.97902, 40.8479556)))
+               .append("stars", 5)
+               .append("categories", Arrays.asList("Coffee", "Pastries"));
+
+List<Document> documents = new ArrayList<Document>();
+documents.add(doc1);
+documents.add(doc2);
+
+collection.insertMany(documents, new SingleResultCallback<Void>() {
+    @Override
+    public void onResult(final Void result, final Throwable t) {
+        System.out.println("Documents inserted!");
+    }
+});
+```
+
+{{% note %}}
+If no top-level `_id` field is specified in the document, the driver automatically adds the `_id` field to the inserted document.
+{{% /note %}}
+
+## Update Existing Documents
+
+To update existing documents in a collection, you can use the collection's
+[`updateOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson-com.mongodb.async.SingleResultCallback)">}}) and [`updateMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) methods.
+
+### Filters
+
+You can pass in a filter document to the methods to specify which documents to update. The filter document specification is the same as for [read operations]({{< relref "driver-async/tutorials/perform-read-operations.md" >}}). To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+### Update Operators
+
+To change a field in a document, MongoDB provides [update operators]({{<docsref "reference/operator/update">}}).  To specify the modification to perform using the update operators, use an updates document.
+
+To facilitate the creation of updates documents, the Java driver provides the [`Updates`]({{< apiref "com/mongodb/client/model/Updates.html">}}) class.
+
+{{% note class="important" %}}
+The `_id` field is immutable; i.e. you cannot change the value of the `_id` field.
+{{% /note %}}
+
+### Update a Single Document
+
+The [`updateOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}})  method updates at most a single document, even if the filter condition matches multiple documents in the collection.
+
+The following operation on the `restaurants` collection updates a document whose `_id` field equals `ObjectId("57506d62f57802807471dd41")`.
+
+```java
+collection.updateOne(
+                eq("_id", new ObjectId("57506d62f57802807471dd41")),
+                combine(set("stars", 1),
+                        set("contact.phone", "228-555-9999"),
+                        currentDate("lastModified")),
+                new SingleResultCallback<UpdateResult>() {
+                        @Override
+                        public void onResult(final UpdateResult result, final Throwable t) {
+                            System.out.println(result.getModifiedCount());
+                        }
+                });
+```
+
+Specifically, the operation uses:
+
+- [`Updates.set`]({{<apiref "com/mongodb/client/model/Updates.html#set(java.lang.String,TItem)">}}) to set the value of the `stars` field to `1` and the `contact.phone` field to `"228-555-9999"`, and
+
+- [`Updates.currentDate`]({{<apiref "com/mongodb/client/model/Updates.html#currentDate(java.lang.String)">}}) to modify the `lastModified` field to the current date. If the `lastModified` field does not exist, the operator adds the field to the document.  
+
+{{% note class="tip" %}}
+In some cases where you may need to update many fields in a document, it may be more efficient to replace the document.  See [Replace a Document](#replace-a-document).
+{{% /note %}}
+
+### Update Multiple Documents
+
+The   [`updateMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) method updates all documents that match the filter condition.
+
+The following operation on the `restaurants` collection updates all documents whose `stars` field equals `2`.
+
+```java
+collection.updateMany(
+              eq("stars", 2),
+              combine(set("stars", 0), currentDate("lastModified")),
+              new SingleResultCallback<UpdateResult>() {
+                      @Override
+                      public void onResult(final UpdateResult result, final Throwable t) {
+                          System.out.println(result.getModifiedCount());
+                      }
+              });
+```
+
+Specifically, the operation uses:
+
+- [`Updates.set`]({{<apiref "com/mongodb/client/model/Updates.html#set(java.lang.String,TItem)">}}) to set the value of the `stars` field to `0` , and
+
+- [`Updates.currentDate`]({{<apiref "com/mongodb/client/model/Updates.html#currentDate(java.lang.String)">}}) to modify the `lastModified` field to the current date. If the `lastModified` field does not exist, the operator adds the field to the document.  
+
+### Update operations
+
+With the [`updateOne()`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.client.model.UpdateOptions,com.mongodb.async.SingleResultCallback)">}})  and  [`updateMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson,com.mongodb.client.model.UpdateOptions,com.mongodb.async.SingleResultCallback)">}}) methods, you can include an [`UpdateOptions`]({{<apiref "com/mongodb/client/model/UpdateOptions.html">}}) document to specify the [`upsert`]({{<docsref "reference/method/db.collection.update/#upsert-option">}}) option or the [`bypassDocumentationValidation`]({{<docsref "core/document-validation/#bypass-document-validation">}}) option.
+
+```java
+collection.updateOne(
+                eq("_id", 1),
+                combine(set("name", "Fresh Breads and Tulips"),     
+                        currentDate("lastModified")),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true),
+                new SingleResultCallback<UpdateResult>(){
+                        @Override
+                        public void onResult(final UpdateResult result, final Throwable t) {
+                            System.out.println(result.getModifiedCount());
+                        }
+                });
+```
+
+## Replace an Existing Document
+
+To replace an existing document in a collection, you can use the collection's [`replaceOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument,com.mongodb.async.SingleResultCallback)">}}) method.
+
+{{% note class="important" %}}
+The `_id` field is immutable; i.e. you cannot replace the `_id` field value.
+{{% /note %}}
+
+### Filters
+
+You can pass in a filter document to the method to specify which document to replace. The filter document specification is the same as for [read operations]({{< relref "driver/tutorials/perform-read-operations.md" >}}). To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+The [`replaceOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument,com.mongodb.async.SingleResultCallback)">}}) method replaces at most a single document, even if the filter condition matches multiple documents in the collection.
+
+### Replace a Document
+
+To replace a document, pass a new document to the [`replaceOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument,com.mongodb.async.SingleResultCallback)">}})  method.
+
+{{% note class="important" %}}
+The replacement document can have different fields from the original document. In the replacement document, you can omit the `_id` field since the `_id` field is immutable; however, if you do include the `_id` field, you cannot specify a different value for the `_id` field.
+{{% /note %}}
+
+The following operation on the `restaurants` collection replaces the document whose `_id` field equals `ObjectId("57506d62f57802807471dd41")`.
+
+```java
+collection.replaceOne(
+                eq("_id", new ObjectId("57506d62f57802807471dd41")),
+                new Document("name", "Green Salads Buffet")
+                        .append("contact", "TBD")
+                        .append("categories", Arrays.asList("Salads", "Health Foods", "Buffet")),
+                new SingleResultCallback<UpdateResult>() {
+                        @Override
+                        public void onResult(final UpdateResult result, final Throwable t) {
+                            System.out.println(result.getModifiedCount());
+                        }
+                });
+```
+
+See also [Update a Document](#update-a-single-document).
+
+### Update Options
+
+With the [`replaceOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument,com.mongodb.client.model.UpdateOptions,com.mongodb.async.SingleResultCallback)">}}) method, you can include an [`UpdateOptions`]({{<apiref "com/mongodb/client/model/UpdateOptions.html">}}) document to specify the [`upsert`]({{<docsref "reference/method/db.collection.update/#upsert-option">}}) option or the [`bypassDocumentationValidation`]({{<docsref "core/document-validation/#bypass-document-validation">}}) option.
+
+```java
+collection.replaceOne(
+                eq("name", "Orange Patisserie and Gelateria"),
+                new Document("stars", 5)
+                        .append("contact", "TBD")
+                        .append("categories", Arrays.asList("Cafe", "Pastries", "Ice Cream")),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true),
+                new SingleResultCallback<UpdateResult>() {
+                    @Override
+                    public void onResult(final UpdateResult result, final Throwable t) {
+                        System.out.println(result.getModifiedCount());
+                    }
+                });
+```
+
+## Delete Documents
+
+To delete documents in a collection, you can use the
+[`deleteOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) and [`deleteMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) methods.
+
+
+### Filters
+
+You can pass in a filter document to the methods to specify which documents to delete. The filter document specification is the same as for [read operations]({{< relref "driver/tutorials/perform-read-operations.md" >}}). To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+
+### Delete a Single Document
+
+The [`deleteOne`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) method deletes at most a single document, even if the filter condition matches multiple documents in the collection.
+
+The following operation on the `restaurants` collection deletes a document whose `_id` field equals `ObjectId("57506d62f57802807471dd41")`.
+
+```java
+collection.deleteOne(eq("_id", new ObjectId("57506d62f57802807471dd41")),
+      new SingleResultCallback<DeleteResult>(){
+          @Override
+          public void onResult(final DeleteResult result, final Throwable t) {
+              System.out.println(result.getDeletedCount());
+          }
+      });
+```
+
+### Delete Multiple Documents
+
+The [`deleteMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson,com.mongodb.async.SingleResultCallback)">}}) method deletes all documents that match the filter condition.
+
+The following operation on the `restaurants` collection deletes all documents whose `stars` field equals `4`.
+
+```java
+collection.deleteMany(eq("stars", 4),new SingleResultCallback<DeleteResult>(){
+    @Override
+    public void onResult(final DeleteResult result, final Throwable t) {
+        System.out.println(result.getDeletedCount());
+    }
+});
+```
+
+See also [Drop a Collection]({{< relref  "driver-async/tutorials/databases-collections.md" >}}).
+
+## Write Concern
+
+[Write concern]({{<docsref "reference/write-concern">}}) describes the level of acknowledgement requested from MongoDB for write operations.
+
+Applications can configure [write concern]({{<docsref "reference/write-concern">}}) at three levels:
+
+- In a [`MongoClient()`]({{< apiref "com/mongodb/async/client/MongoClient.html" >}})
+
+  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings.html">}}), as in the following example:
+
+      ```java
+      ClusterSettings clusterSettings = ClusterSettings.builder()
+                                .hosts(asList(
+                                new ServerAddress("host1", 27017),
+                                new ServerAddress("host2", 27017))).build();
+      MongoClientSettings settings = MongoClientSettings.builder()
+                                        .clusterSettings(clusterSettings)
+                                        .writeConcern(WriteConcern.MAJORITY).build();
+      MongoClient mongoClient = MongoClients.create(settings);
+      ```
+
+
+  - Via a [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString.html">}}) object.
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+            new ConnectionString("mongodb://host1:27017,host2:27017/?w=majority"));
+      ```
+
+  - Via string that specifies the connection URI:
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(
+            "mongodb://host1:27017,host2:27017/?w=majority");
+      ```
+
+- In a [`MongoDatabase`]({{<apiref "com/mongodb/async/client/MongoDatabase.html">}}) via its
+[`withWriteConcern`]({{<apiref "com/mongodb/async/client/MongoDatabase.html#withWriteConcern(com.mongodb.WriteConcern)">}}) method, as in the following example:
+
+
+    ```java
+     MongoDatabase database = mongoClient.getDatabase("test")
+                                         .withWriteConcern(WriteConcern.MAJORITY);
+    ```
+
+- In a [`MongoCollection`]({{<apiref "com/mongodb/async/client/MongoCollection.html">}}) via its [`withWriteConcern`]({{<apiref "com/mongodb/async/client/MongoCollection.html#withWriteConcern(com.mongodb.WriteConcern)">}}) method, as in the following example:
+
+    ```java
+     MongoCollection<Document> collection = database.getCollection("restaurants")
+                                            .withWriteConcern(WriteConcern.MAJORITY);
+    ```
+
+`MongoDatabase` and `MongoCollection` instances are immutable. Calling `.withWriteConcern()` on an existing `MongoDatabase` or `MongoCollection` instance returns a new instance and does not affect the instance on which the method is called.
+
+For example, in the following, the `collWithWriteConcern` instance has the write concern of majority whereas the write concern of the `collection` is unaffected.
+
+```java
+MongoCollection<Document> collWithWriteConcern = collection
+                                                  .withWriteConcern(WriteConcern.MAJORITY);
+```
+
+You can build `MongoClientOptions`, `MongoDatabase`, or `MongoCollection` to include a combination of write concern, [read concern]({{<docsref "reference/read-concern">}}), and [read preference]({{<docsref "reference/read-preference">}}).
+
+For example, the following sets all three at the collection level:
+
+```java
+collection = database.getCollection("restaurants")
+                .withReadPreference(ReadPreference.primary())
+                .withReadConcern(ReadConcern.MAJORITY)
+                .withWriteConcern(WriteConcern.MAJORITY);
+```
diff --git a/docs/reference/content/driver-async/tutorials/ssl.md b/docs/reference/content/driver-async/tutorials/ssl.md
new file mode 100644
index 00000000000..38b8d9c8493
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/ssl.md
@@ -0,0 +1,186 @@
++++
+date = "2015-03-19T12:53:26-04:00"
+title = "SSL"
+[menu.main]
+  parent = "Async Connection Settings"
+  identifier = "Async SSL"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+## TLS/SSL
+
+The asynchronous Java driver supports TLS/SSL connections to MongoDB servers using the underlying support 
+for TLS/SSL provided by the JDK.
+
+In its default configuration, the asynchronous driver is supported on Java 8+ when TLS/SSL is enabled.  
+Otherwise, applications must configure the asynchronous driver to use [Netty](http://netty.io/).
+
+
+## Specify TLS/SSL and Netty Configuration
+
+{{% note %}}
+If your application requires Netty, it must explicitly add a dependency to
+Netty artifacts.  The driver is currently tested against Netty 4.1.
+{{% /note %}}
+
+### Via Connection String
+
+To configure the driver to use TLS/SSL, include the `ssl=true` option in the connection string, as in:
+
+```java
+MongoClient client = MongoClients.create("mongodb://localhost/?ssl=true");
+```
+
+To configure the driver to use use TLS/SSL with Netty, include the `ssl=true` and `streamType=netty` options in the connection string, as
+in:
+
+```java
+MongoClient client = MongoClients.create("mongodb://localhost/?streamType=netty&ssl=true");
+```
+
+{{% note %}}
+The streamType connection string query parameter is deprecated as of the 3.10 release and will be removed in the next major release.
+{{% /note %}}
+
+### Via `MongoClientSettings`
+
+To specify TLS/SSL with [`MongoClientSettings`]({{< apiref "com/mongodb/MongoClientSettings.Builder.html#streamFactoryFactory(com.mongodb.connection.StreamFactoryFactory)">}}),
+set the ``sslEnabled`` property to ``true`, as in
+
+```java
+MongoClient client = MongoClients.create(MongoClientSettings.builder()
+        .applyToClusterSettings(builder -> builder.hosts(Arrays.asList(new ServerAddress())))
+        .applyToSslSettings(builder -> builder.enabled(true))
+        .build());
+```
+
+To specify TLS/SSL using Netty, set the ``sslEnabled`` property to ``true``, and the stream factory to 
+[`NettyStreamFactoryFactory`]({{< apiref "com/mongodb/connection/netty/NettyStreamFactoryFactory" >}}), as in
+
+```java
+EventLoopGroup eventLoopGroup = new NioEventLoopGroup();  // make sure application shuts this down
+
+MongoClient client = MongoClients.create(MongoClientSettings.builder()
+        .applyToClusterSettings(builder -> builder.hosts(Arrays.asList(new ServerAddress())))
+        .applyToSslSettings(builder -> builder.enabled(true))
+        .streamFactoryFactory(NettyStreamFactoryFactory.builder()
+                .eventLoopGroup(eventLoopGroup).build())
+        .build());
+```
+
+By default, the Netty-based streams will use the [NioEventLoopGroup](http://netty.io/4.0/api/io/netty/channel/nio/NioEventLoopGroup.html)
+and Netty's [default `ByteBufAllocator`](http://netty.io/4.0/api/io/netty/buffer/ByteBufAllocator.html#DEFAULT), but these are
+configurable via the [`NettyStreamFactoryFactory`]({{< apiref "com/mongodb/connection/netty/NettyStreamFactoryFactory" >}}) constructor.   
+
+To override the default [`javax.net.ssl.SSLContext`](https://docs.oracle.com/javase/8/docs/api/javax/net/ssl/SSLContext.html) used for SSL
+connections, set the `sslContext` property on the `SslSettings`, as in:
+
+```java
+MongoClient client = MongoClients.create(MongoClientSettings.builder()
+        .applyToClusterSettings(builder -> builder.hosts(Arrays.asList(new ServerAddress())))
+        .applyToSslSettings(builder ->
+                builder.enabled(true)
+                       .context(sslContext))
+        .streamFactoryFactory(NettyStreamFactoryFactory.builder()
+                .eventLoopGroup(eventLoopGroup).build())
+        .build());
+```
+
+
+## Disable Hostname Verification
+
+
+By default, the driver ensures that the hostname included in the
+server's SSL certificate(s) matches the hostname(s) provided when
+creating a `MongoClient`. However, the hostname verification
+requires a Java 7 JVM, as it relies on additions introduced in Java 7
+to the `javax.net.SSLParameters` class.
+
+If your application must run on Java 6, or for some other reason you need
+to disable host name verification, you must explicitly indicate this using the `invalidHostNameAllowed` property:
+
+```java
+MongoClient client = MongoClients.create(MongoClientSettings.builder()
+        .applyToClusterSettings(builder -> builder.hosts(Arrays.asList(new ServerAddress())))
+        .applyToSslSettings(builder -> 
+                builder.enabled(true)
+                       .invalidHostNameAllowed(true))
+        .build());
+```
+
+Or via the connection string:
+
+```java
+MongoClient client = MongoClients.create("mongodb://localhost/?ssl=true&sslInvalidHostNameAllowed=true");
+```
+
+{{% note %}}
+The streamType connection string query parameter is deprecated as of the 3.10 release and will be removed in the next major release.
+{{% /note %}}
+
+## JVM System Properties for TLS/SSL
+
+A typical application will need to set several JVM system properties to
+ensure that the client is able to validate the TLS/SSL certificate
+presented by the server:
+
+-  `javax.net.ssl.trustStore`:
+      The path to a trust store containing the certificate of the
+      signing authority
+
+-  `javax.net.ssl.trustStorePassword`:
+      The password to access this trust store
+
+The trust store is typically created with the
+[`keytool`](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html)
+command line program provided as part of the JDK. For example:
+
+```bash
+    keytool -importcert -trustcacerts -file <path to certificate authority file>
+        -keystore <path to trust store> -storepass <password>
+```
+
+A typical application will also need to set several JVM system
+properties to ensure that the client presents an TLS/SSL certificate to the
+MongoDB server:
+
+- `javax.net.ssl.keyStore`
+      The path to a key store containing the client's TLS/SSL certificates
+
+- `javax.net.ssl.keyStorePassword`
+      The password to access this key store
+
+The key store is typically created with the
+[`keytool`](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html)
+or the [`openssl`](https://www.openssl.org/docs/apps/openssl.html)
+command line program.
+
+For more information on configuring a Java application for TLS/SSL, please
+refer to the [`JSSE Reference Guide`](http://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSS
+ERefGuide.html).
+
+## JVM Support for TLS v1.1 and newer
+
+Industry best practices recommend, and some regulations require, the use of TLS 1.1 or newer. Though no application changes are required
+for the driver to make use of the newest TLS protocols, Java runtime environments prior to Java 8 started to enable TLS 1.1 only in later
+updates:
+
+* Java 7
+  - Starting with
+    [Update 131](http://www.oracle.com/technetwork/java/javaseproducts/documentation/javase7supportreleasenotes-1601161.html#R170_131),
+    released October 8, 2016, TSL 1.1 and TLS 1.2 are enabled by default.
+  - Starting with
+    [Update 95](http://www.oracle.com/technetwork/java/javaseproducts/documentation/javase7supportreleasenotes-1601161.html#R170_95),
+    released January 19, 2016, TLS 1.1 and TLS 1.2 can be enabled by applications via the `jdk.tls.client.protocols` system property.
+
+* Java 6
+  - Starting with
+    [Update 141](http://www.oracle.com/technetwork/java/javase/documentation/overview-156328.html#R160_141), released on January 17, 2017,
+    TSL 1.1 and TLS 1.2 are enabled by default.
+  - Starting with
+    [Update 115 b32](http://www.oracle.com/technetwork/java/javase/documentation/overview-156328.html#6u115-b32), released July 19, 2016,
+    TLS 1.1 and TLS 1.2 can be enabled by applications via the `jdk.tls.client.protocols` system property.
+
+Note that these updates are only available from Oracle via its Java SE commercial support program.  Java 7 Update 131
+is available via [OpenJDK](http://openjdk.java.net/install/).
diff --git a/docs/reference/content/driver-async/tutorials/text-search.md b/docs/reference/content/driver-async/tutorials/text-search.md
new file mode 100644
index 00000000000..077f62d99ee
--- /dev/null
+++ b/docs/reference/content/driver-async/tutorials/text-search.md
@@ -0,0 +1,144 @@
++++
+date = "2016-06-07T23:28:50-04:00"
+title = "Text Search"
+[menu.main]
+  parent = "Async Tutorials"
+  identifier = "Async Text Search"
+  weight = 80
+  pre = "<i class='fa'></i>"
++++
+
+## Text Search
+
+MongoDB supports query operations that perform a [text search]({{<docsref "text-search">}}) of string content. To perform text search, MongoDB uses a [text index]({{<docsref "core/index-text">}}) and the [`$text` query operator]({{<docsref "reference/operator/query/text">}}).
+
+The Java driver provides the [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text(java.lang.String,com.mongodb.client.model.TextSearchOptions)">}}) helper to facilitate the creation of text search query filters.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import com.mongodb.async.client.MongoDatabase;
+import com.mongodb.client.model.*;
+import org.bson.Document;
+```
+
+- Include the following code which the examples in the tutorials will use to print the results of the aggregation:
+
+```java
+Block<Document> printBlock = new Block<Document>() {
+    @Override
+    public void apply(final Document document) {
+        System.out.println(document.toJson());
+    }
+};
+```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< relref "driver-async/tutorials/connect-to-mongodb.md" >}}).
+
+## Create the `text` Index
+
+To create a [text index]({{<docsref "core/index-text">}}), use the [`Indexes.text`]({{< relref "builders/indexes.md#text-index">}})
+static helper to create a specification for a text index and pass to [`MongoCollection.createIndex()`]({{<apiref "com/mongodb/client/MongoCollection.html#createIndex(org.bson.conversions.Bson)">}}) method.
+
+The following example creates a text index on the `name` field for the `restaurants` collection.
+
+```java
+collection.createIndex(Indexes.text("name"), new SingleResultCallback<String>() {
+    @Override
+    public void onResult(final String result, final Throwable t) {
+        System.out.println("Operation Finished!");
+    }
+});
+```
+
+## Perform Text Search
+
+To perform text search, use the [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text(java.lang.String,com.mongodb.client.model.TextSearchOptions)">}}) helper to specify the text search query filter.
+
+For example, the following code performs a text search on the `name` field for the word `"bakery"` or `"coffee"`.
+
+```java
+collection.countDocuments(Filters.text("bakery coffee"), new SingleResultCallback<Long>()  {
+    @Override
+    public void onResult(final Long count, final Throwable t) {
+        System.out.println("Text search matches: " +count);
+    }
+});
+```
+
+The example should print the following output:
+
+```json
+Text search matches: 2
+```
+
+For more information on the text search, see [`$text` operator]({{<docsref "reference/operator/query/text">}}).
+
+### Text Score
+
+For each matching document, text search assigns a score, representing the relevance of a document to the specified text search query filter. To return and sort by score, use the [`$meta`]({{< docsref "reference/operator/query/text/#sort-by-text-search-score">}}) operator in the projection document and the sort expression.
+
+
+```java
+collection.find(Filters.text("bakery cafe"))
+                       .projection(Projections.metaTextScore("score"))
+                       .sort(Sorts.metaTextScore("score"))
+          .forEach(printBlock, new SingleResultCallback<Void>() {
+              @Override
+              public void onResult(final Void result, final Throwable t) {
+                  System.out.println("Operation Finished!");
+              }
+          });
+```
+
+### Specify a Text Search Option
+
+The  [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text(java.lang.String,com.mongodb.client.model.TextSearchOptions)">}}) helper can accept various [text search options]({{<docsref "reference/operator/query/text">}}). The Java driver provides [`TextSearchOptions`]({{<apiref "com/mongodb/client/model/TextSearchOptions.html">}}) class to specify these options.
+
+For example, the following text search specifies the [text search language]({{<docsref "reference/text-search-languages">}}) option when performing text search for the word `cafe`:
+
+```java
+collection.countDocuments(Filters.text("cafe",
+      new TextSearchOptions().language("english")),
+      new SingleResultCallback<Long>()  {
+            @Override
+            public void onResult(final Long count, final Throwable t) {
+                System.out.println("Text search matches: " +count);
+            }
+});
+```
+
+The example should print the following output:
+
+```json
+Text search matches: 1
+```
+
+For more information about text search see the following sections in the MongoDB Server Manual:
+
+- [`$text` query operator]({{< docsref "reference/operator/query/text">}})
+
+- [`text` index]({{< docsref "core/index-text" >}})
+
+- [Text Search Languages]({{<docsref "reference/text-search-languages">}})
diff --git a/docs/reference/content/driver/getting-started/index.md b/docs/reference/content/driver/getting-started/index.md
deleted file mode 100644
index 32b0db5988e..00000000000
--- a/docs/reference/content/driver/getting-started/index.md
+++ /dev/null
@@ -1,22 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Getting Started"
-[menu.main]
-  parent = "MongoDB Driver"
-  identifier = "Sync Getting Started"
-  weight = 20
-  pre = "<i class='fa fa-road'></i>"
-+++
-
-## Getting Started
-
-To help you get started quickly on the new driver, follow:
-
-  * [Installation]({{< ref "driver/getting-started/installation-guide.md" >}})
-  * [Quick Tour]({{< ref "driver/getting-started/quick-tour.md" >}})
-  * [Admin Quick Tour]({{< ref "driver/getting-started/quick-tour-admin.md" >}})
-
-To help you get started with the legacy `DB` and `DBCollection` API, follow:
-
-  * [Legacy Quick Tour](http://mongodb.github.io/mongo-java-driver/2.13/getting-started/quick-tour/)
-  * [Legacy Admin Quick Tour](http://mongodb.github.io/mongo-java-driver/2.13/getting-started/quick-tour-admin/)
diff --git a/docs/reference/content/driver/getting-started/installation-guide.md b/docs/reference/content/driver/getting-started/installation-guide.md
deleted file mode 100644
index 807c318f9f8..00000000000
--- a/docs/reference/content/driver/getting-started/installation-guide.md
+++ /dev/null
@@ -1,41 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Installation Guide"
-[menu.main]
-  parent = "Sync Getting Started"
-  identifier = "Sync Installation Guide"
-  weight = 1
-  pre = "<i class='fa'></i>"
-+++
-
-# Installation
-
-There are two Maven artifacts available in the 3.3 release. The preferred artifact for new applications is `mongodb-driver`;
-however, we still publish the legacy `mongo-java-driver` uber-jar.
-The recommended way to get started using one of the drivers in your project is with a dependency management system.
-
-{{< distroPicker >}}
-
-## MongoDB Driver  
-
-The MongoDB Driver is the updated synchronous Java driver that includes the
-legacy API as well as a new generic MongoCollection interface that complies with
-a new cross-driver CRUD specification.
-
-{{% note class="important" %}}
-For OSGi-based applications: due to the fact that there are classes from the `com.mongodb` package in both this artifact and in the 
-`mongodb-driver-core` artifact, on which this depends, this artifact is *not* an OSGi bundle.  Please use the `mongo-java-driver` uber 
-jar (described below) instead. 
-{{% /note %}}
-
-{{< install artifactId="mongodb-driver" version="3.3.0" dependencies="true">}}
-
-
-## Uber MongoDB Java Driver
-An uber jar that contains everything you need; the BSON library, the core library and the mongodb-driver.
-
-{{% note %}}
-For OSGi-based applications: this artifact is a valid OSGi bundle. 
-{{% /note %}}
-
-{{< install artifactId="mongo-java-driver" version="3.3.0">}}
diff --git a/docs/reference/content/driver/getting-started/installation.md b/docs/reference/content/driver/getting-started/installation.md
new file mode 100644
index 00000000000..6f2f818a7b7
--- /dev/null
+++ b/docs/reference/content/driver/getting-started/installation.md
@@ -0,0 +1,84 @@
++++
+date = "2015-03-17T15:36:56Z"
+title = "Installation"
+[menu.main]
+  parent = "MongoDB Driver"
+  identifier = "Sync Installation"
+  weight = 1
+  pre = "<i class='fa'></i>"
++++
+
+# Installation
+
+The recommended way to get started using one of the drivers in your
+project is with a dependency management system.
+
+There are two Maven artifacts available in the release. The preferred artifact for new applications is `mongodb-driver-sync`
+however, we still publish the legacy `mongo-java-driver` uber-jar as well as the `mongodb-driver` jar introduced in 3.0.
+
+{{< distroPicker >}}
+
+## MongoDB Driver Sync 
+
+The MongoDB Driver `mongodb-driver-sync` is the synchronous Java driver containing only the generic `MongoCollection` interface that 
+complies with a new cross-driver CRUD specification.  It does *not* include the legacy API (e.g. `DBCollection`).
+
+{{% note class="important" %}}
+
+This is a Java 9-compliant module with an Automatic-Module-Name of `org.mongodb.driver.sync.client`.
+
+The `mongodb-driver-sync` artifact is a valid OSGi bundle whose symbolic name is `org.mongodb.driver-sync`.
+
+{{% /note %}}
+
+{{< install artifactId="mongodb-driver-sync" version="3.12.0" dependencies="true">}}
+
+## MongoDB Driver Legacy 
+
+The MongoDB Legacy driver `mongodb-driver-legacy` is the legacy synchronous Java driver whose entry point is `com.mongodb.MongoClient` 
+and central classes include `com.mongodb.DB`, `com.mongodb.DBCollection`, and `com.mongodb.DBCursor`.
+
+{{% note class="important" %}}
+
+While not deprecated, we recommend that new applications depend on the `mongodb-driver-sync` module.
+
+{{% /note %}}
+
+{{< install artifactId="mongodb-driver-legacy" version="3.12.0" dependencies="true">}}
+
+## MongoDB Driver  
+
+The MongoDB Driver `mongodb-driver` is the updated synchronous Java driver that includes the legacy API as well as a new generic `MongoCollection` interface that complies with a new cross-driver CRUD specification.
+
+{{% note class="important" %}}
+`mongodb-driver` is *not* an OSGi bundle: both `mongodb-driver` and `mongodb-driver-core`, a dependency of `mongodb-driver`, include classes from the `com.mongodb` package.
+
+For OSGi-based applications, use the [mongodb-driver-sync](#mongodb-driver-sync) or the [mongo-java-driver](#uber-jar-legacy) uber jar instead.
+
+It is also *not* a Java 9 module.
+
+This module is deprecated and will no longer be published in the next major release of the driver (4.0).
+
+{{% /note %}}
+
+{{< install artifactId="mongodb-driver" version="3.12.0" dependencies="true">}}
+
+
+## Uber Jar (Legacy)
+
+For new applications, the preferred artifact is [mongodb-driver-sync](#mongodb-driver-sync); however, the legacy `mongo-java-driver` uber
+jar is still available.  The uber jar contains: the BSON library, the core library, and the `mongodb-driver`.
+
+
+{{% note %}}
+This is a Java 9-compliant module with an Automatic-Module-Name of `org.mongodb.driver.sync.client`.
+
+The `mongo-java-driver` artifact is a valid OSGi bundle whose symbolic name is `org.mongodb.mongo-java-driver`.
+
+{{% note class="important" %}}
+
+This module is deprecated and will no longer be published in the next major release of the driver (4.0).
+
+{{% /note %}}
+
+{{< install artifactId="mongo-java-driver" version="3.12.0">}}
diff --git a/docs/reference/content/driver/getting-started/quick-start-pojo.md b/docs/reference/content/driver/getting-started/quick-start-pojo.md
new file mode 100644
index 00000000000..d263eaf28a8
--- /dev/null
+++ b/docs/reference/content/driver/getting-started/quick-start-pojo.md
@@ -0,0 +1,350 @@
++++
+date = "2017-05-17T15:36:56Z"
+title = "Quick Start - POJOs"
+[menu.main]
+  parent = "MongoDB Driver"
+  identifier = "Sync Quick Start POJOs"
+  weight = 15
+  pre = "<i class='fa'></i>"
++++
+
+# MongoDB Driver Quick Start - POJOs
+
+{{% note %}}
+POJOs stands for Plain Old Java Objects.
+
+The following code snippets come from the [`PojoQuickTour.java`]({{< srcref "driver-sync/src/examples/tour/PojoQuickTour.java">}}) example code
+that can be found with the driver source on github.
+{{% /note %}}
+
+## Prerequisites
+
+- A running MongoDB on localhost using the default port for MongoDB `27017`
+
+- MongoDB Driver. See [Installation]({{< relref "driver/getting-started/installation.md" >}}) for instructions on how to install the MongoDB driver.
+
+- Quick Start. This guide follows on from the [Quick Start]({{< relref "driver/getting-started/quick-start.md" >}}).
+
+- The following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+
+import java.util.List;
+
+import static com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Updates.*;
+import static java.util.Arrays.asList;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+```
+
+- The following POJO classes. The full source is available on github for the [Person]({{< srcref "driver-sync/src/examples/tour/Person.java">}}) and [Address]({{< srcref "driver-sync/src/examples/tour/Address.java">}})
+POJOs. Here are the main implementation details:
+
+```java
+public final class Person {
+    private ObjectId id;
+    private String name;
+    private int age;
+    private Address address;
+
+    public Person() {
+    }
+
+    public ObjectId getId() {
+        return id;
+    }
+
+    public void setId(final ObjectId id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(final int age) {
+        this.age = age;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(final Address address) {
+        this.address = address;
+    }
+    
+    // Rest of implementation
+}
+
+public final class Address {
+    private String street;
+    private String city;
+    private String zip;
+
+    public Address() {
+    }
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(final String street) {
+        this.street = street;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(final String city) {
+        this.city = city;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(final String zip) {
+        this.zip = zip;
+    }
+    
+    // Rest of implementation
+}
+```
+## Creating a Custom CodecRegistry
+
+Before you can use a POJO with the driver, you need to configure the [`CodecRegistry` ]({{< relref "bson/codecs.md" >}}) to include a codecs 
+to handle the translation to and from [`bson`]({{< relref "bson/index.md" >}}) for your POJOs. The simplest way to do that is to use the 
+[`PojoCodecProvider.builder()`]({{< apiref "org/bson/codecs/pojo/PojoCodecProvider.html">}}) to create and configure a `CodecProvider`.
+
+The following example will combine the default codec registry, with the `PojoCodecProvider` configured to automatically create POJO 
+`Codec`s:
+
+```java
+CodecRegistry pojoCodecRegistry = fromRegistries(MongoClientSettings.getDefaultCodecRegistry(),
+                fromProviders(PojoCodecProvider.builder().automatic(true).build()));
+```
+
+### Using the CodecRegistry
+
+There are multiple ways to set the `pojoCodecRegistry` for use:
+
+ - You can set it when instantiating a MongoClient object:
+ 
+ ```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .codecRegistry(pojoCodecRegistry)
+        .build();
+MongoClient mongoClient = MongoClients.create(settings);
+```
+
+- You can use an alternative `CodecRegistry` with a `MongoDatabase`:
+
+ ```java
+database = database.withCodecRegistry(pojoCodecRegistry);
+```
+
+- You can use an alternative `CodecRegistry` with a `MongoCollection`:
+
+ ```java
+collection = collection.withCodecRegistry(pojoCodecRegistry);
+```
+
+## Inserting a POJO into MongoDB
+
+The codec registry will automatically try to create a POJO `Codec` for unknown classes. This allows you to use POJOs out of the 
+box without any extra configuration. See the [Bson POJO page]({{< ref "bson/pojos.md" >}}) for information on configuring POJO `Codec`s.
+
+Before you can insert a POJO into MongoDB, you need a `MongoCollection` instance configured with the Pojo's type:
+
+```java
+MongoCollection<Person> collection = database.getCollection("people", Person.class);
+```
+
+### Insert a Person
+
+To insert a Person into the collection, you can use the collection's [`insertOne()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertOne(TDocument)" >}}) method.
+
+```java
+Person ada = new Person("Ada Byron", 20, new Address("St James Square", "London", "W1"));
+
+collection.insertOne(ada);
+```
+
+### Insert Many Persons
+
+To add multiple Person instances, you can use the collection's [`insertMany()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertMany(java.util.List)" >}}) method 
+which takes a list of `Person`.
+
+The following example will add multiple Person instances into the collection:
+
+```java
+List<Person> people = asList(
+        new Person("Charles Babbage", 45, new Address("5 Devonshire Street", "London", "W11")),
+        new Person("Alan Turing", 28, new Address("Bletchley Hall", "Bletchley Park", "MK12")),
+        new Person("Timothy Berners-Lee", 61, new Address("Colehill", "Wimborne", null))
+);
+
+collection.insertMany(people);
+```
+
+## Query the Collection
+
+To query the collection, you can use the collection's [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method. 
+
+The following example prints all the Person instances in the collection:
+```java
+Block<Person> printBlock = new Block<Person>() {
+    @Override
+    public void apply(final Person person) {
+        System.out.println(person);
+    }
+};
+
+collection.find().forEach(printBlock);
+```
+
+The example uses the [`forEach`]({{ <apiref "com/mongodb/client/MongoIterable.html#forEach(com.mongodb.Block)">}}) method on the ``FindIterable`` 
+object to apply a block to each Person and outputs the following:
+
+```bash
+Person{id='591dbc2550852fa685b3ad17', name='Ada Byron', age=20, address=Address{street='St James Square', city='London', zip='W1'}}
+Person{id='591dbc2550852fa685b3ad18', name='Charles Babbage', age=45, address=Address{street='5 Devonshire Street', city='London', zip='W11'}}
+Person{id='591dbc2550852fa685b3ad19', name='Alan Turing', age=28, address=Address{street='Bletchley Hall', city='Bletchley Park', zip='MK12'}}
+Person{id='591dbc2550852fa685b3ad1a', name='Timothy Berners-Lee', age=61, address=Address{street='Colehill', city='Wimborne', zip='null'}}
+```
+
+## Specify a Query Filter
+
+To query for Person instance that match certain conditions, pass a filter object to the [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method. 
+To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+{{% note class="important" %}}
+When querying POJOs you *must* query against the document field name and not the Pojo's property name. 
+By default they are the same but it is possible to change how POJO property names are mapped.
+{{% /note %}}
+
+
+### Get A Single Person That Matches a Filter
+
+For example, to find the first `Person` in the database that lives in `Wimborne` pass an [`eq`]({{<apiref  "com/mongodb/client/model/Filters.html#eq(java.lang.String,TItem)">}}) 
+filter object to specify the equality condition:
+
+```java
+somebody = collection.find(eq("address.city", "Wimborne")).first();
+System.out.println(somebody);
+```
+The example prints one document:
+
+```bash
+Person{id='591dbc2550852fa685b3ad1a', name='Timothy Berners-Lee', age=61, 
+       address=Address{street='Colehill', city='Wimborne', zip='null'}}
+```
+
+### Get All Person Instances That Match a Filter
+
+The following example returns and prints everyone where ``"age" > 30``:
+
+```java
+collection.find(gt("age", 30)).forEach(printBlock);
+```
+
+## Update Documents
+
+To update documents in a collection, you can use the collection's [`updateOne`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}})  and  [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) methods.
+
+Pass to the methods:
+
+- A filter object to determine the document or documents to update. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all Persons in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+- An update document that specifies the modifications. For a list of the available operators, see [update operators]({{<docsref "reference/operator/update-field">}}).
+
+The update methods return an [`UpdateResult`]({{<apiref "com/mongodb/client/result/UpdateResult.html">}}) which provides information about the operation including the number of documents modified by the update.
+
+### Update a Single Person
+
+To update at most a single `Person`, use the [`updateOne`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method.
+
+The following example updates `Ada Byron` setting their age to `23` and name to `Ada Lovelace`:
+
+```java
+collection.updateOne(eq("name", "Ada Byron"), combine(set("age", 23), set("name", "Ada Lovelace")));
+```
+
+### Update Multiple Persons
+
+To update all Persons that match a filter, use the [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method.
+
+The following example sets the zip field to `null` for all documents that have a `zip` value:
+
+```java
+UpdateResult updateResult = collection.updateMany(not(eq("zip", null)), set("zip", null));
+System.out.println(updateResult.getModifiedCount());
+
+```
+
+### Replace a Single Person
+
+An alternative method to change an existing `Person`, would be to use the [`replaceOne`]({{<apiref "com/mongodb/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument)">}}) method.
+
+The following example replaces the `Ada Lovelace` back to the original document:
+
+```java
+collection.replaceOne(eq("name", "Ada Lovelace"), ada);
+```
+
+## Delete Documents
+
+To delete documents from a collection, you can use the collection's [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) and [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) methods.
+
+Pass to the methods a filter object to determine the document or documents to delete. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+The delete methods return a [`DeleteResult`]({{< apiref "com/mongodb/client/result/DeleteResult.html">}})
+which provides information about the operation including the number of documents deleted.
+
+### Delete a Single Person That Matches a Filter
+
+To delete at most a single `Person` that matches a filter, use the [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) method:
+
+The following example deletes at most one `Person` who lives in `Wimborne`:
+
+```java
+collection.deleteOne(eq("address.city", "Wimborne"));
+```
+
+### Delete All Persons That Match a Filter
+
+To delete multiple Persons matching a filter use the [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) method.
+
+The following example deletes all Persons that live in `London`:
+
+```java
+DeleteResult deleteResult = collection.deleteMany(eq("address.city", "London"));
+System.out.println(deleteResult.getDeletedCount());
+```
+
+### Additional Information
+
+For additional information about the configuring the `PojoCodecProvider`, see the [Bson POJO page]({{< ref "bson/pojos.md" >}}).
+
+For additional tutorials about using MongoDB (such as to use the aggregation framework, specify write concern, etc.), see [Java Driver Tutorials]({{< ref "driver/tutorials/index.md" >}}).
+
diff --git a/docs/reference/content/driver/getting-started/quick-start.md b/docs/reference/content/driver/getting-started/quick-start.md
new file mode 100644
index 00000000000..db4d717129d
--- /dev/null
+++ b/docs/reference/content/driver/getting-started/quick-start.md
@@ -0,0 +1,472 @@
++++
+date = "2015-03-17T15:36:56Z"
+title = "Quick Start"
+[menu.main]
+  parent = "MongoDB Driver"
+  identifier = "Sync Quick Start"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+# MongoDB Driver Quick Start
+
+{{% note %}}
+The following code snippets come from the [`QuickTour.java`]({{< srcref "driver-sync/src/examples/tour/QuickTour.java">}}) example code
+that can be found with the driver source on github.
+{{% /note %}}
+
+## Prerequisites
+
+- A running MongoDB on localhost using the default port for MongoDB `27017`
+
+- MongoDB Driver.  See [Installation]({{< relref "driver/getting-started/installation.md" >}}) for instructions on how to install the MongoDB driver.
+
+- The following import statements:
+
+New MongoClient API (since 3.7):
+
+```java
+import com.mongodb.ConnectionString;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+```
+
+Legacy MongoClient API:
+
+```java
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+```
+
+And the common elements between the legacy and new APIs:
+
+```java
+import com.mongodb.ServerAddress;
+
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.MongoCollection;
+
+import org.bson.Document;
+import java.util.Arrays;
+import com.mongodb.Block;
+
+import com.mongodb.client.MongoCursor;
+import static com.mongodb.client.model.Filters.*;
+import com.mongodb.client.result.DeleteResult;
+import static com.mongodb.client.model.Updates.*;
+import com.mongodb.client.result.UpdateResult;
+import java.util.ArrayList;
+import java.util.List;
+```
+## Make a Connection
+
+Use [`MongoClients.create()`]({{< apiref "com/mongodb/client/MongoClients.html">}}), 
+or [`MongoClient()`]({{< apiref "com/mongodb/MongoClient.html">}}) for the legacy MongoClient API, 
+to make a connection to a running MongoDB instance.
+
+The `MongoClient` instance represents a pool of connections to the database; you will only need one instance of class `MongoClient` even with multiple threads.
+
+{{% note class="important" %}}
+
+ Typically you only create one `MongoClient` instance for a given MongoDB deployment (e.g. standalone, replica set, or a sharded cluster) and use it across your application. However, if you do create multiple instances:
+
+ - All resource usage limits (e.g. max connections, etc.) apply per `MongoClient` instance.
+
+ - To dispose of an instance, call `MongoClient.close()` to clean up resources.
+{{% /note %}}
+
+
+### Connect to a Single MongoDB instance
+
+The following example shows several ways to connect to a single MongoDB server.
+
+##### New MongoClient API (since 3.7)
+
+To connect to a single MongoDB instance:
+
+- You can instantiate a MongoClient object without any parameters to connect to a MongoDB instance running on localhost on port ``27017``:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+```
+
+- You can explicitly specify the hostname to connect to a MongoDB instance running on the specified host on port ``27017``:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("hostOne"))))
+                .build());
+```
+
+- You can explicitly specify the hostname and the port:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("hostOne", 27018))))
+                .build());
+```
+
+- You can specify the [`ConnectionString`]({{< apiref "/com/mongodb/ConnectionString.html">}}):
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://hostOne:27017,hostTwo:27018");
+```
+
+
+##### Legacy MongoClient API
+
+To connect to a single MongoDB instance:
+
+- You can instantiate a MongoClient object without any parameters to connect to a MongoDB instance running on localhost on port ``27017``:
+
+```java
+MongoClient mongoClient = new MongoClient();
+```
+
+- You can explicitly specify the hostname to connect to a MongoDB instance running on the specified host on port ``27017``:
+
+```java
+MongoClient mongoClient = new MongoClient( "hostOne" );
+```
+
+- You can explicitly specify the hostname and the port:
+
+```java
+MongoClient mongoClient = new MongoClient( "hostOne" , 27018 );
+```
+
+- You can specify the
+[`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}) connection string:
+
+```java
+ MongoClientURI connectionString = new MongoClientURI("mongodb://hostOne:27017,hostTwo:27017");
+ MongoClient mongoClient = new MongoClient(connectionString);
+```
+
+The connection string mostly follows [RFC 3986](http://tools.ietf.org/html/rfc3986), with the exception of the domain name. For MongoDB, 
+it is possible to list multiple domain names separated by a comma. For more information on the connection string, see 
+[connection string]({{< docsref "reference/connection-string" >}}).
+
+## Access a Database
+
+Once you have a ``MongoClient`` instance connected to a MongoDB deployment, use the [`MongoClient.getDatabase()`]({{<apiref "com/mongodb/MongoClient.html#getDatabase(java.lang.String)">}}) method to access a database.
+
+Specify the name of the database to the ``getDatabase()`` method. If a database does not exist, MongoDB creates the database when you first store data for that database.
+
+The following example accesses the ``mydb`` database:
+
+```java
+ MongoDatabase database = mongoClient.getDatabase("mydb");
+ ```
+
+`MongoDatabase` instances are immutable.
+
+## Access a Collection
+
+Once you have a `MongoDatabase` instance, use its [`getCollection()`]({{< apiref "com/mongodb/client/MongoDatabase.html#getCollection(java.lang.String)">}})
+method to access a collection.
+
+Specify the name of the collection to the `getCollection()` method. If a collection does not exist, MongoDB creates the collection when you first store data for that collection.
+
+For example, using the `database` instance, the following statement accesses the collection named `test` in the `mydb` database:
+
+```java
+MongoCollection<Document> collection = database.getCollection("test");
+```
+
+`MongoCollection` instances are immutable.
+
+## Create a Document
+
+To create the document using the Java driver, use the [`Document`]({{< apiref "org/bson/Document.html" >}}) class.
+
+For example, consider the following JSON document:
+
+```javascript
+
+  {
+   "name" : "MongoDB",
+   "type" : "database",
+   "count" : 1,
+   "versions": [ "v3.2", "v3.0", "v2.6" ],
+   "info" : { x : 203, y : 102 }
+  }
+```
+
+To create the document using the Java driver, instantiate a `Document` object with a field and value, and use its
+ [`append()`]({{< apiref "org/bson/Document.html#append" >}}) method to include additional fields and values to the document object. The value can be another `Document` object to specify an embedded document:
+
+ ```java
+ Document doc = new Document("name", "MongoDB")
+                .append("type", "database")
+                .append("count", 1)
+                .append("versions", Arrays.asList("v3.2", "v3.0", "v2.6"))
+                .append("info", new Document("x", 203).append("y", 102));
+ ```
+
+{{% note %}}
+The BSON type of array corresponds to the Java type `java.util.List`. For a list of the BSON type and the corresponding type in Java, see .
+{{% /note %}}
+
+
+## Insert a Document
+
+Once you have the `MongoCollection` object, you can insert documents into the
+collection.
+
+### Insert One Document
+
+To insert a single document into the collection, you can use the collection's [`insertOne()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertOne(TDocument)" >}}) method.
+
+```java
+collection.insertOne(doc);
+```
+
+{{% note %}}
+If no top-level `_id` field is specified in the document, MongoDB automatically adds the `_id` field to the inserted document.
+{{% /note %}}
+
+### Insert Multiple Documents
+
+To add multiple documents, you can use the collection's [`insertMany()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertMany(java.util.List)" >}}) method which takes a list of documents to insert.
+
+The following example will add multiple documents of the form:
+
+```javascript
+{ "i" : value }
+```
+
+Create the documents in a loop and add to the `documents` list:
+
+
+```java
+List<Document> documents = new ArrayList<Document>();
+for (int i = 0; i < 100; i++) {
+    documents.add(new Document("i", i));
+}
+```
+
+To insert these documents to the collection, pass the list of documents to the
+[`insertMany()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertMany(java.util.List)" >}}) method.
+
+```java
+collection.insertMany(documents);
+```
+{{% note %}}
+If no top-level `_id` field is specified in the document, MongoDB automatically adds the `_id` field to the inserted document.
+{{% /note %}}
+
+## Count Documents in A Collection
+
+To count the number of documents in a collection, you can use the collection's [`countDocuments()`]({{< apiref "com/mongodb/client/MongoCollection#countDocuments()">}})
+method.  The following code should print `101` (the 100 inserted via `insertMany` plus the 1 inserted via the `insertOne`).
+
+```java
+System.out.println(collection.countDocuments());
+```
+
+## Query the Collection
+
+To query the collection, you can use the collection's [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method. You can call the method without any arguments to query all documents in a collection or pass a filter to query for documents that match the filter criteria.
+
+The [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method returns a [`FindIterable()`]({{< apiref "com/mongodb/client/FindIterable.html" >}}) instance that provides a fluent interface for chaining other methods.
+
+### Find the First Document in a Collection
+
+To return the first document in the collection, use the [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method without any parameters and chain to `find()` method the [`first()`] ({{< apiref "com/mongodb/client/MongoIterable.html#first()">}}) method.
+
+If the collection is empty, the operation returns null.
+
+{{% note class="tip" %}}
+The `find().first()` construct is useful for queries that should only match a single document or if you are interested in the first document only.
+{{% /note %}}
+
+The following example prints the first document found in the collection.
+
+```java
+Document myDoc = collection.find().first();
+System.out.println(myDoc.toJson());
+```
+
+The example should print the following document:
+
+```json
+{ "_id" : { "$oid" : "551582c558c7b4fbacf16735" },
+  "name" : "MongoDB",
+  "type" : "database",
+  "count" : 1,
+  "info" : { "x" : 203, "y" : 102 } }
+```
+
+{{% note %}}
+
+The `_id` element has been added automatically by MongoDB to your
+document and your value will differ from that shown. MongoDB reserves field
+names that start with
+`"_"` and `"$"` for internal use.
+{{% /note %}}
+
+### Find All Documents in a Collection
+
+To retrieve all the documents in the collection, we will use the
+`find()` method without any parameters.
+
+To iterate through the results, chain the
+[`iterator()`]({{< apiref "com/mongodb/client/MongoIterable.html#iterator()" >}}) method to the `find()`.
+
+The following example retrieves all documents in the collection
+and prints the returned documents (101 documents):
+
+```java
+MongoCursor<Document> cursor = collection.find().iterator();
+try {
+    while (cursor.hasNext()) {
+        System.out.println(cursor.next().toJson());
+    }
+} finally {
+    cursor.close();
+}
+```
+
+Although the following idiom for iteration is permissible, avoid its use as the application can leak a cursor if the loop terminates early:
+
+```java
+for (Document cur : collection.find()) {
+    System.out.println(cur.toJson());
+}
+```
+
+## Specify a Query Filter
+
+To query for documents that match certain conditions, pass a filter object to the [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+### Get A Single Document That Matches a Filter
+
+For example, to find the first document where the field ``i`` has the value `71`, pass an [`eq`]({{<apiref  "com/mongodb/client/model/Filters.html#eq(java.lang.String,TItem)">}}) filter object to specify the equality condition:
+
+```java
+myDoc = collection.find(eq("i", 71)).first();
+System.out.println(myDoc.toJson());
+```
+The example prints one document:
+
+```json
+{ "_id" : { "$oid" : "5515836e58c7b4fbc756320b" }, "i" : 71 }
+```
+
+### Get All Documents That Match a Filter
+
+The following example returns and prints all documents where ``"i" > 50``:
+
+```java
+Block<Document> printBlock = new Block<Document>() {
+     @Override
+     public void apply(final Document document) {
+         System.out.println(document.toJson());
+     }
+};
+
+collection.find(gt("i", 50)).forEach(printBlock);
+```
+
+The example uses the [`forEach`]({{ <apiref "com/mongodb/client/MongoIterable.html#forEach(com.mongodb.Block)">}}) method on the ``FindIterable`` object to apply a block to each document.
+
+To specify a filter for a range, such as ``50 < i <= 100``, you can use the [`and`]({{<apiref "com/mongodb/client/model/Filters.html#and(org.bson.conversions.Bson...)">}}) helper:
+
+```java
+collection.find(and(gt("i", 50), lte("i", 100))).forEach(printBlock);
+```
+
+## Update Documents
+
+To update documents in a collection, you can use the collection's [`updateOne`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}})  and  [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) methods.
+
+Pass to the methods:
+
+- A filter object to determine the document or documents to update. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+- An update document that specifies the modifications. For a list of the available operators, see [update operators]({{<docsref "reference/operator/update-field">}}).
+
+The update methods return an [`UpdateResult`]({{<apiref "com/mongodb/client/result/UpdateResult.html">}}) which provides information about the operation including the number of documents modified by the update.
+
+### Update a Single Document
+
+To update at most a single document, use the [`updateOne`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}})
+
+The following example updates the first document that meets the filter ``i`` equals ``10`` and sets the value of ``i`` to ``110``:
+
+```java
+collection.updateOne(eq("i", 10), new Document("$set", new Document("i", 110)));
+```
+
+
+### Update Multiple Documents
+
+To update all documents matching the filter, use the [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method.
+
+The following example increments the value of ``i`` by ``100`` for all documents where  =``i`` is less than ``100``:
+
+```java
+UpdateResult updateResult = collection.updateMany(lt("i", 100), inc("i", 100));
+System.out.println(updateResult.getModifiedCount());
+
+```
+
+## Delete Documents
+
+To delete documents from a collection, you can use the collection's [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) and [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) methods.
+
+Pass to the methods a filter object to determine the document or documents to delete. To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper. To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+The delete methods return a [`DeleteResult`]({{< apiref "com/mongodb/client/result/DeleteResult.html">}})
+which provides information about the operation including the number of documents deleted.
+
+### Delete a Single Document That Match a Filter
+
+To delete at most a single document that match the filter, use the [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) method:
+
+The following example deletes at most one document that meets the filter ``i`` equals ``110``:
+
+```java
+collection.deleteOne(eq("i", 110));
+```
+
+### Delete All Documents That Match a Filter
+
+To delete all documents matching the filter use the [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) method.
+
+The following example deletes all documents where ``i`` is greater or equal to ``100``:
+
+```java
+DeleteResult deleteResult = collection.deleteMany(gte("i", 100));
+System.out.println(deleteResult.getDeletedCount());
+```
+
+## Create Indexes
+
+To create an index on a field or fields, pass an index specification document to the [`createIndex()`]({{<apiref "com/mongodb/client/MongoCollection.html#createIndex(org.bson.conversions.Bson)">}}) method. An index key specification document contains the fields to index and the index type for each field:
+
+```java
+ new Document(<field1>, <type1>).append(<field2>, <type2>) ...
+```
+
+- For an ascending index type, specify ``1`` for ``<type>``.
+- For a descending index type, specify ``-1`` for ``<type>``.
+
+The following example creates an ascending index on the ``i`` field:
+
+```java
+ collection.createIndex(new Document("i", 1));
+```
+
+For a list of other index types, see [Create Indexes]({{< ref "driver/tutorials/indexes.md" >}})
+
+### Additional Information
+
+For additional tutorials about using MongoDB with Pojos, see the [Pojos Quick Start]({{< ref "driver/getting-started/quick-start-pojo.md" >}}).
+
+For additional tutorials (such as to use the aggregation framework, specify write concern, etc.), see [Java Driver Tutorials]({{< ref "driver/tutorials/index.md" >}})
diff --git a/docs/reference/content/driver/getting-started/quick-tour-admin.md b/docs/reference/content/driver/getting-started/quick-tour-admin.md
deleted file mode 100644
index 90a672e0162..00000000000
--- a/docs/reference/content/driver/getting-started/quick-tour-admin.md
+++ /dev/null
@@ -1,175 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Admin Quick Tour"
-[menu.main]
-  parent = "Sync Getting Started"
-  identifier = "Sync Admin Quick Tour"
-  weight = 20
-  pre = "<i class='fa'></i>"
-+++
-
-# MongoDB Driver Admin Quick Tour
-
-This is the second part of the MongoDB driver quick tour. In the
-[quick tour]({{< relref "driver/getting-started/quick-tour.md" >}}) we looked at how to
-use the Java driver to execute basic CRUD operations.  In this section we'll look at some of the
-administrative features available in the driver.
-
-The following code snippets come from the `QuickTourAdmin.java` example code
-that can be found with the [driver
-source]({{< srcref "driver/src/examples/tour/QuickTourAdmin.java">}}).
-
-{{% note %}}
-See the [installation guide]({{< relref "driver/getting-started/installation-guide.md" >}})
-for instructions on how to install the MongoDB Driver.
-{{% /note %}}
-
-## Setup
-
-To get started we'll quickly connect and create a `mongoClient`, `database` and `collection`
-variable for use in the examples below:
-
-```java
-MongoClient mongoClient = new MongoClient();
-MongoDatabase database = mongoClient.getDatabase("mydb");
-MongoCollection<Document> collection = database.getCollection("test");
-```
-
-{{% note %}}
-Calling the `getDatabase()` on `MongoClient` does not create a database.
-Only when a database is written to will a database be created.  Examples include the creation of an index or the insertion of a document 
-into a previously non-existent collection.
-{{% /note %}}
-
-## Get A List of Databases
-
-You can get a list of the available databases:
-
-```java
-for (String name: mongoClient.listDatabaseNames()) {
-    System.out.println(name);
-}
-```
-
-## Drop A Database
-
-You can drop a database by name using a `MongoClient` instance:
-
-```java
-mongoClient.getDatabase("databaseToBeDropped").drop();
-```
-
-## Create A Collection
-
-Collections in MongoDB are created automatically simply by inserted a document into it. Using the [`createCollection`]({{< apiref "com/mongodb/client/MongoDatabase.html#createCollection-java.lang.String-">}})
-method, you can also create a collection explicitly in order to customize its configuration. For example, to create a capped collection sized to 1 megabyte:
-
-```java
-database.createCollection("cappedCollection",
-  new CreateCollectionOptions().capped(true).sizeInBytes(0x100000));
-```
-
-## Get A List of Collections
-
-You can get a list of the available collections in a database:
-
-```java
-for (String name : database.listCollectionNames()) {
-    System.out.println(name);
-}
-```
-
-## Drop A Collection
-
-You can drop a collection by using the drop() method:
-
-```java
-collection.drop();
-```
-
-## Create An Index
-
-MongoDB supports secondary indexes. To create an index, you just
-specify the field or combination of fields, and for each field specify the direction of the index for that field.
-We can use the [`Indexes`]({{< relref "builders/indexes.md">}}) helpers to create index keys:
-
-```java
-// create an ascending index on the "i" field
- collection.createIndex(Indexes.ascending("i"));
-```
-
-## Get a List of Indexes on a Collection
-
-Use the `listIndexes()` method to get a list of indexes. The following lists
- the indexes on the collection `test`:
-
-```java
-for (final Document index : collection.listIndexes()) {
-    System.out.println(index.toJson());
-}
-```
-
-The example should print the following indexes:
-
-```json
-{ "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "mydb.test" }
-{ "v" : 1, "key" : { "i" : 1 }, "name" : "i_1", "ns" : "mydb.test" }
-```
-
-## Text indexes
-
-MongoDB also provides text indexes to support text search of string
-content. Text indexes can include any field whose value is a string or
-an array of string elements. To create a text index use the [`Indexes.text`]({{< relref "builders/indexes.md#text-index">}})
-static helper:
-
-```java
-// create a text index on the "content" field
-coll.createIndex(Indexes.text("content"));
-```
-
-As of MongoDB 2.6, text indexes are now integrated into the main query
-language and enabled by default (here we use the [`Filters.text`]({{< relref "builders/filters.md#evaluation">}}) helper):
-
-```java
-// Insert some documents
-collection.insertOne(new Document("_id", 0).append("content", "textual content"));
-collection.insertOne(new Document("_id", 1).append("content", "additional content"));
-collection.insertOne(new Document("_id", 2).append("content", "irrelevant content"));
-
-// Find using the text index
-long matchCount = collection.count(Filters.text("textual content -irrelevant"));
-System.out.println("Text search matches: " + matchCount);
-
-// Find using the $language operator
-Bson textSearch = Filters.text("textual content -irrelevant", new TextSearchOptions().language("english"));
-matchCount = collection.count(textSearch);
-System.out.println("Text search matches (english): " + matchCount);
-
-// Find the highest scoring match
-Document projection = new Document("score", new Document("$meta", "textScore"));
-Document myDoc = collection.find(textSearch).projection(projection).first();
-System.out.println("Highest scoring document: " + myDoc.toJson());
-```
-
-and it should print:
-
-```json
-Text search matches: 2
-Text search matches (english): 2
-Highest scoring document: { "_id" : 1, "content" : "additional content", "score" : 0.75 }
-```
-
-For more information about text search see the [text index]({{< docsref "/core/index-text" >}}) and
-[$text query operator]({{< docsref "/reference/operator/query/text">}}) documentation.
-
-## Running a command
-
-While not all commands have a specific helper, however you can run any [command]({{< docsref "/reference/command">}})
-by using the [`runCommand()`]({{< apiref "com/mongodb/client/MongoDatabase.html#runCommand-org.bson.conversions.Bson-com.mongodb.ReadPreference-">}})
-method.  Here we call the [buildInfo]({{ docsref "reference/command/buildInfo" }}) command:
-
-```java
-Document buildInfo = database.runCommand(new Document("buildInfo", 1));
-System.out.println(buildInfo);
-```
diff --git a/docs/reference/content/driver/getting-started/quick-tour.md b/docs/reference/content/driver/getting-started/quick-tour.md
deleted file mode 100644
index b7e873bad50..00000000000
--- a/docs/reference/content/driver/getting-started/quick-tour.md
+++ /dev/null
@@ -1,421 +0,0 @@
-+++
-date = "2015-03-17T15:36:56Z"
-title = "Quick Tour"
-[menu.main]
-  parent = "Sync Getting Started"
-  identifier = "Sync Quick Tour"
-  weight = 10
-  pre = "<i class='fa'></i>"
-+++
-
-# MongoDB Driver Quick Tour
-
-The following code snippets come from the `QuickTour.java` example code
-that can be found with the [driver source]({{< srcref "driver/src/examples/tour/QuickTour.java">}}).
-
-{{% note %}}
-See the [installation guide]({{< relref "driver/getting-started/installation-guide.md" >}})
-for instructions on how to install the MongoDB Driver.
-{{% /note %}}
-
-## Make a Connection
-
-The following example shows five ways to connect to the
-database `mydb` on the local machine. If the database does not exist, MongoDB
-will create it for you.
-
-```java
-// To directly connect to a single MongoDB server
-// (this will not auto-discover the primary even if it's a member of a replica set)
-MongoClient mongoClient = new MongoClient();
-
-// or
-MongoClient mongoClient = new MongoClient( "localhost" );
-
-// or
-MongoClient mongoClient = new MongoClient( "localhost" , 27017 );
-
-// or, to connect to a replica set, with auto-discovery of the primary, supply a seed list of members
-MongoClient mongoClient = new MongoClient(
-  Arrays.asList(new ServerAddress("localhost", 27017),
-                new ServerAddress("localhost", 27018),
-                new ServerAddress("localhost", 27019)));
-
-// or use a connection string
-MongoClientURI connectionString = new MongoClientURI("mongodb://localhost:27017,localhost:27018,localhost:27019");
-MongoClient mongoClient = new MongoClient(connectionString);
-
-MongoDatabase database = mongoClient.getDatabase("mydb");
-```
-
-At this point, the `database` object will be a connection to a MongoDB
-server for the specified database.
-
-### MongoClient
-
-The `MongoClient` instance actually represents a pool of connections
-to the database; you will only need one instance of class
-`MongoClient` even with multiple threads.
-
-{{% note class="important" %}}
-Typically you only create one `MongoClient` instance for a given database
-cluster and use it across your application. When creating multiple instances:
-
--   All resource usage limits (max connections, etc) apply per
-    `MongoClient` instance
--   To dispose of an instance, make sure you call `MongoClient.close()`
-    to clean up resources
-{{% /note %}}
-
-## Get a Collection
-
-To get a collection to operate upon, specify the name of the collection to
-the [`getCollection()`]({{< apiref "com/mongodb/client/MongoDatabase.html#getCollection-java.lang.String-">}})
-method:
-
-The following example gets the collection `test`:
-
-```java
-MongoCollection<Document> collection = database.getCollection("test");
-```
-
-## Insert a Document
-
-Once you have the collection object, you can insert documents into the
-collection. For example, consider the following JSON document; the document
-contains a field `info` which is an embedded document:
-
-``` javascript
-{
-   "name" : "MongoDB",
-   "type" : "database",
-   "count" : 1,
-   "info" : {
-               x : 203,
-               y : 102
-             }
-}
-```
-
-To create the document using the Java driver, use the
-[`Document`]({{< apiref "org/bson/Document.html">}}) class. You
-can use this class to create the embedded document as well.
-
-```java
-Document doc = new Document("name", "MongoDB")
-               .append("type", "database")
-               .append("count", 1)
-               .append("info", new Document("x", 203).append("y", 102));
-```
-
-To insert the document into the collection, use the `insertOne()` method.
-
-```java
-collection.insertOne(doc);
-```
-
-## Add Multiple Documents
-
-To add multiple documents, you can use the `insertMany()` method.
-
-The following example will add multiple documents of the form:
-
-```javascript
-{ "i" : value }
-```
-
-Create the documents in a loop.
-
-```java
-List<Document> documents = new ArrayList<Document>();
-for (int i = 0; i < 100; i++) {
-    documents.add(new Document("i", i));
-}
-```
-
-To insert these documents to the collection, pass the list of documents to the
-`insertMany()` method.
-
-```java
-collection.insertMany(documents);
-```
-
-## Count Documents in A Collection
-
-Now that we've inserted 101 documents (the 100 we did in the loop, plus
-the first one), we can check to see if we have them all using the
-[`count()`]({{< apiref "com/mongodb/client/MongoCollection#count--">}})
-method. The following code should print `101`.
-
-```java
-System.out.println(collection.count());
-```
-
-## Query the Collection
-
-Use the
-[`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find--">}})
-method to query the collection.
-
-### Find the First Document in a Collection
-
-To get the first document in the collection, call the
-[`first()`]({{< apiref "com/mongodb/client/MongoIterable.html#first--">}})
-method on the [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find--">}})
-operation. `collection.find().first()` returns the first document or null rather than a cursor.
-This is useful for queries that should only match a single document, or if you are
-interested in the first document only.
-
-The following example prints the first document found in the collection.
-
-```java
-Document myDoc = collection.find().first();
-System.out.println(myDoc.toJson());
-```
-
-The example should print the following document:
-
-```json
-{ "_id" : { "$oid" : "551582c558c7b4fbacf16735" },
-  "name" : "MongoDB", "type" : "database", "count" : 1,
-  "info" : { "x" : 203, "y" : 102 } }
-```
-
-{{% note %}}
-The `_id` element has been added automatically by MongoDB to your
-document and your value will differ from that shown. MongoDB reserves field
-names that start with
-"_" and "$" for internal use.
-{{% /note %}}
-
-### Find All Documents in a Collection
-
-To retrieve all the documents in the collection, we will use the
-`find()` method. The `find()` method returns a `FindIterable` instance that
-provides a fluent interface for chaining or controlling find operations. Use the
-`iterator()` method to get an iterator over the set of documents that matched the
-query and iterate. The following code retrieves all documents in the collection
-and prints them out (101 documents):
-
-```java
-MongoCursor<Document> cursor = collection.find().iterator();
-try {
-    while (cursor.hasNext()) {
-        System.out.println(cursor.next().toJson());
-    }
-} finally {
-    cursor.close();
-}
-```
-
-Although the following idiom is permissible, its use is discouraged as the
-application can leak a cursor if the loop
-terminates early:
-
-```java
-for (Document cur : collection.find()) {
-    System.out.println(cur.toJson());
-}
-```
-
-## Get A Single Document with a Query Filter
-
-We can create a filter to pass to the find() method to get a subset of
-the documents in our collection. For example, if we wanted to find the
-document for which the value of the "i" field is 71, we would do the
-following:
-
-```java
-import static com.mongodb.client.model.Filters.*;
-
-myDoc = collection.find(eq("i", 71)).first();
-System.out.println(myDoc.toJson());
-```
-
-and it should just print just one document
-
-```json
-{ "_id" : { "$oid" : "5515836e58c7b4fbc756320b" }, "i" : 71 }
-```
-
-
-{{% note %}}
-Use the [`Filters`]({{< relref "builders/filters.md">}}), [`Sorts`]({{< relref "builders/sorts.md">}}),
-[`Projections`]({{< relref "builders/projections.md">}}) and [`Updates`]({{< relref "builders/updates.md">}})
-helpers for simple and concise ways of building up queries.
-{{% /note %}}
-
-## Get a Set of Documents with a Query
-
-We can use the query to get a set of documents from our collection. For
-example, if we wanted to get all documents where `"i" > 50`, we could
-write:
-
-```java
-// now use a range query to get a larger subset
-Block<Document> printBlock = new Block<Document>() {
-     @Override
-     public void apply(final Document document) {
-         System.out.println(document.toJson());
-     }
-};
-collection.find(gt("i", 50)).forEach(printBlock);
-```
-
-Notice we use the `forEach` method on `FindIterable` which applies a block to each
-document and we print all documents where `i > 50`.
-
-We could also get a range, say `50 < i <= 100`:
-
-```java
-collection.find(and(gt("i", 50), lte("i", 100))).forEach(printBlock);
-```
-
-## Sorting documents
-
-We can also use the [`Sorts`]({{< relref "builders/sorts.md">}}) helpers to sort documents.
-We add a sort to a find query by calling the `sort()` method on a `FindIterable`.  Below we use the
-[`exists()`]({{< relref "builders/filters.md#elements" >}}) helper and sort
-[`descending("i")`]({{<relref "builders/sorts.md#descending">}}) helper to
-sort our documents:
-
-```java
-myDoc = collection.find(exists("i")).sort(descending("i")).first();
-System.out.println(myDoc.toJson());
-```
-
-## Projecting fields
-
-Sometimes we don't need all the data contained in a document, the [`Projections`]({{< relref "builders/projections.md">}})
-helpers help build the projection parameter for the find operation.  Below we'll sort the collection, exclude the `_id` field by using the 
-[`Projections.excludeId`]({{< relref "builders/projections.md#exclusion">}}) and output the first matching document:
-
-```java
-myDoc = collection.find().projection(excludeId()).first();
-System.out.println(myDoc.toJson());
-```
-## Aggregations
-
-Sometimes we need to aggregate the data stored in MongoDB. The [`Aggregates`]({{< relref "builders/aggregation.md" >}}) helper provides 
-builders for each of type of aggregation stage. 
- 
-Below we'll do a simple two step transformation that will calculate the value of `i * 10`. First we find all Documents 
-where `i > 0` by using the [`Aggregates.match`]({{< relref "builders/aggregation.md#match" >}}) 
-helper. Then we reshape the document by using [`Aggregates.project`]({{< relref "builders/aggregation.md#project" >}}) 
-in conjunction with the [`$multiply`]({{< docsref "reference/operator/aggregation/multiply/" >}}) operator to calculate the "`ITimes10`" 
-value:
-
-```java
-collection.aggregate(asList(
-        match(gt("i", 0)),
-        project(Document.parse("{ITimes10: {$multiply: ['$i', 10]}}")))
-).forEach(printBlock);
-```
-
-For [`$group`]({{< relref "builders/aggregation.md#group" >}}) operations use the 
-[`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators" >}}) helper for any 
-[accumulator operations]({{< docsref "reference/operator/aggregation/group/#accumulator-operator" >}}). Below we sum up all the values of 
-`i` by using the [`Aggregates.group`]({{< relref "builders/aggregation.md#group" >}}) helper in conjunction with the 
-[`Accumulators.sum`]({{< apiref "com/mongodb/client/model/Accumulators#sum-java.lang.String-TExpression-" >}}) helper:
-
-```java
-myDoc = collection.aggregate(singletonList(group(null, sum("total", "$i")))).first();
-System.out.println(myDoc.toJson());
-```
-
-{{% note %}}
-Currently, there are no helpers for [aggregation expressions]({{< docsref "meta/aggregation-quick-reference/#aggregation-expressions" >}}). 
-Use the [`Document.parse()`]({{< relref "bson/extended-json.md" >}}) helper to quickly build aggregation expressions from extended JSON.
-{{% /note %}}
-
-## Updating documents
-
-There are numerous [update operators](http://docs.mongodb.org/manual/reference/operator/update-field/)
-supported by MongoDB.
-
-To update at most a single document (may be 0 if none match the filter), use the [`updateOne`]({{< apiref "com/mongodb/client/MongoCollection.html#updateOne-org.bson.conversions.Bson-org.bson.conversions.Bson-">}})
-method to specify the filter and the update document. Here we use the [`Updates.set`]({{< relref "builders/updates.md#set">}}) helper to update the first document that meets the filter `i` equals `10` and set the value of `i` to `110`:
-
-```java
-collection.updateOne(eq("i", 10), set("i", 110));
-```
-
-To update all documents matching the filter use the [`updateMany`]({{< apiref "com/mongodb/async/client/MongoCollection.html#updateMany-org.bson.conversions.Bson-org.bson.conversions.Bson-">}})
-method. Here we use the [`Updates.inc`]({{< relref "builders/updates.md#increment">}}) helper to increment the value of `i` by `100` 
-where `i` is less than `100`.
-
-```java
-UpdateResult updateResult = collection.updateMany(lt("i", 100), inc("i", 100));
-System.out.println(updateResult.getModifiedCount());
-```
-
-The update methods return an [`UpdateResult`]({{< apiref "com/mongodb/client/result/UpdateResult.html">}})
-which provides information about the operation including the number of documents modified by the update.
-
-## Deleting documents
-
-To delete at most a single document (may be 0 if none match the filter) use the [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne-org.bson.conversions.Bson-">}})
-method:
-
-```java
-collection.deleteOne(eq("i", 110));
-```
-
-To delete all documents matching the filter use the [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany-org.bson.conversions.Bson-">}}) method.  
-Here we delete all documents where `i` is greater or equal to `100`:
-
-```java
-DeleteResult deleteResult = collection.deleteMany(gte("i", 100));
-System.out.println(deleteResult.getDeletedCount());
-```
-
-The delete methods return a [`DeleteResult`]({{< apiref "com/mongodb/client/result/DeleteResult.html">}})
-which provides information about the operation including the number of documents deleted.
-
-## Bulk operations
-
-These new commands allow for the execution of bulk
-insert/update/delete operations. There are two types of bulk operations:
-
-1.  Ordered bulk operations.
-
-      Executes all the operation in order and error out on the first write error.
-
-2.   Unordered bulk operations.
-
-      Executes all the operations and reports any the errors.
-
-      Unordered bulk operations do not guarantee order of execution.
-
-Let's look at two simple examples using ordered and unordered
-operations:
-
-```java
-// 2. Ordered bulk operation - order is guarenteed
-collection.bulkWrite(
-  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
-                new InsertOneModel<>(new Document("_id", 5)),
-                new InsertOneModel<>(new Document("_id", 6)),
-                new UpdateOneModel<>(new Document("_id", 1),
-                                     new Document("$set", new Document("x", 2))),
-                new DeleteOneModel<>(new Document("_id", 2)),
-                new ReplaceOneModel<>(new Document("_id", 3),
-                                      new Document("_id", 3).append("x", 4))));
-
-
- // 2. Unordered bulk operation - no guarantee of order of operation
-collection.bulkWrite(
-  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
-                new InsertOneModel<>(new Document("_id", 5)),
-                new InsertOneModel<>(new Document("_id", 6)),
-                new UpdateOneModel<>(new Document("_id", 1),
-                                     new Document("$set", new Document("x", 2))),
-                new DeleteOneModel<>(new Document("_id", 2)),
-                new ReplaceOneModel<>(new Document("_id", 3),
-                                      new Document("_id", 3).append("x", 4))),
-  new BulkWriteOptions().ordered(false));
-```
-
-{{% note class="important" %}}
-Use of the bulkWrite methods is not recommended when connected to pre-2.6 MongoDB servers, as this was the first server version to support bulk write commands for insert, update, and delete in a way that allows the driver to implement the correct semantics for BulkWriteResult and BulkWriteException. The methods will still work for pre-2.6 servers, but performance will suffer, as each write operation has to be executed one at a time.
-{{% /note %}}
diff --git a/docs/reference/content/driver/index.md b/docs/reference/content/driver/index.md
index 56b72b74eaa..d17140601ef 100644
--- a/docs/reference/content/driver/index.md
+++ b/docs/reference/content/driver/index.md
@@ -7,24 +7,24 @@ title = "MongoDB Driver"
   pre = "<i class='fa fa-arrows-h'></i>"
 +++
 
-## MongoDB Driver Documentation
+## MongoDB Driver 3.12 Documentation
 
-Welcome to the MongoDB Driver documentation hub.
+The following guide provides information on using the synchronous
+MongoDB Java Driver 3.12.
 
+### What's New in 3.12
 
-### What's New in 3.3
+The [What's New]({{< relref "whats-new.md" >}}) guide explains
+the major new features of the driver.
 
-The [What's New]({{< relref "whats-new/index.md" >}}) guide explains the major new features of the driver. 
+If you are upgrading from the 2.x series of the driver, consult the
+[Upgrading]({{< relref "upgrading.md" >}}) documentation for
+information on breaking changes.
 
-If you are upgrading from the 2.x series of the driver, consult the [Upgrading]({{< relref "whats-new/upgrading.md" >}}) documentation for 
-information on breaking changes. 
+## Getting Started
 
+To get started, see the [Installation Guide]({{< relref "driver/getting-started/installation.md" >}}), the [Quick Start Guide]({{< relref "driver/getting-started/quick-start.md" >}}) and the [Quick Start with POJOs Guide]({{< relref "driver/getting-started/quick-start-pojo.md" >}}).
 
-### Getting Started
+## Tutorials
 
-The [Getting Started]({{< relref "driver/getting-started/index.md" >}}) guide contains installation instructions
-and a simple tutorial to get up and running quickly.
-
-### Reference
-
-For more detailed documentation, see the [Reference]({{< relref "driver/reference/index.md" >}}) guide.
+For tutorials for some frequently used operations, see the [Tutorials section]({{<relref "driver/tutorials/index.md">}}).
diff --git a/docs/reference/content/driver/reference/connecting/authenticating.md b/docs/reference/content/driver/reference/connecting/authenticating.md
deleted file mode 100644
index fe52bab9f69..00000000000
--- a/docs/reference/content/driver/reference/connecting/authenticating.md
+++ /dev/null
@@ -1,234 +0,0 @@
-+++
-date = "2015-03-19T14:27:51-04:00"
-title = "Authenticating"
-[menu.main]
-  parent = "Sync Connecting"
-  identifier = "Sync Authenticating"
-  weight = 20
-  pre = "<i class='fa'></i>"
-+++
-
-# Authentication
-
-The Java driver supports all MongoDB [authentication mechanisms](http://docs.mongodb.org/manual/core/authentication/), including those
-only available in the MongoDB [Enterprise Edition](http://docs.mongodb.org/manual/administration/install-enterprise/).
-
-An authentication credential is represented as an instance of the
-[`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}}) class, which includes static factory methods for
-each of the supported authentication mechanisms.  A list of these instances must be passed to the driver via one of several
-[`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}}) constructors that take a 
-parameter of type `List<MongoCredential>`.  Alternatively, a single [`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}})
-can be created implicity via a 
-[`MongoClientURI`]({{< apiref "com/mongodb/MongoClientURI" >}}) and passed to a [`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}})
-constructor that takes a [`MongoClientURI`]({{< apiref "com/mongodb/MongoClientURI" >}}) parameter. 
-
-{{% note %}}
-Given the flexibility of role-based access control in MongoDB, it is usually sufficient to authenticate with a single user, but, for completeness, the driver accepts a list of credentials.
-{{% /note %}}
-
-## Default authentication mechanism
-
-MongoDB 3.0 changed the default authentication mechanism from
-[MONGODB-CR](http://docs.mongodb.org/manual/core/authentication/#mongodb-cr-authentication) to
-[SCRAM-SHA-1](http://docs.mongodb.org/manual/core/authentication/#scram-sha-1-authentication).  To create a credential that will
-authenticate properly regardless of server version, create a credential using the following static factory method:
-
- ```java
-import com.mongodb.MongoCredential;
-
-// ...
-
-String user;        // the user name
-String database;    // the name of the database in which the user is defined
-char[] password;    // the password as a character array
-// ...
-MongoCredential credential = MongoCredential.createCredential(user,
-                                                              database,
-                                                              password);
-```
-
-or with a connection string:
-
-```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1");
-```
-
-This is the recommended approach as it will make upgrading from MongoDB 2.6 to MongoDB 3.0 seamless, even after [upgrading the
-authentication schema](http://docs.mongodb.org/manual/release-notes/3.0-scram/#upgrade-mongodb-cr-to-scram).
-
-
-## SCRAM-SHA-1
-
-To explicitly create a credential of type [SCRAM-SHA-1](http://docs.mongodb .org/manual/core/authentication/#scram-sha-1-authentication)
-use the following static factory method:
-
-```java
-MongoCredential credential = MongoCredential.createScramSha1Credential(user,
-                                                                       database,
-                                                                       password);
-```
-
-or with a connection string:
-
-```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-1");
-```
-
-## MONGODB-CR
-
-To explicitly create a credential of type [MONGODB-CR](http://docs.mongodb.org/manual/core/authentication/#mongodb-cr-authentication)
-use the following static factory method:
-
-```java
-MongoCredential credential = MongoCredential.createMongoCRCredential(user,
-                                                                     database,
-                                                                     password);
-```
-
-or with a connection string:
-
-```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=MONGODB-CR");
-```
-
-Note that this is not recommended as a credential created in this way will fail to authenticate after an authentication schema upgrade
-from MONGODB-CR to SCRAM-SHA-1.
-
-## x.509
-
-The [x.509](http://docs.mongodb.org/manual/core/authentication/#x-509-certificate-authentication) mechanism authenticates a user
-whose name is derived from the distinguished subject name of the X.509 certificate presented by the driver during SSL negotiation. This
-authentication method requires the use of SSL connections with certificate validation and is available in MongoDB 2.6 and newer. To
-create a credential of this type use the following static factory method:
-
-```java
-String user;     // The x.509 certificate derived user name, e.g. "CN=user,OU=OrgUnit,O=myOrg,..."
-MongoCredential credential = MongoCredential.createMongoX509Credential(user);
-```
-
-or with a connection string:
-
-```java
-MongoClientURI uri = new MongoClientURI("mongodb://subjectName@host1/?authMechanism=MONGODB-X509");
-```
-
-See the MongoDB server
-[x.509 tutorial](http://docs.mongodb.org/manual/tutorial/configure-x509-client-authentication/#add-x-509-certificate-subject-as-a-user) for
-more information about determining the subject name from the certificate.
-
-## Kerberos (GSSAPI) {#gssapi}
-
-[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy authentication through a Kerberos service.  To
-create a credential of type [Kerberos (GSSAPI)](http://docs.mongodb.org/manual/core/authentication/#kerberos-authentication) use the
-following static factory method:
-
-```java
-String user;   // The Kerberos user name, including the realm, e.g. "user1@MYREALM.ME"
-// ...
-MongoCredential credential = MongoCredential.createGSSAPICredential(user);
-```
-
-Or via the connection string:
-
-```java
-MongoClientURI uri = new MongoClientURI("mongodb://username%40MYREALM.com@host1/?authMechanism=GSSAPI");
-```
-
-{{% note %}}
-The method refers to the `GSSAPI` authentication mechanism instead of `Kerberos` because technically the driver is authenticating via the
-[GSSAPI](https://tools.ietf.org/html/rfc4752) SASL mechanism.
-{{% /note %}}
-
-To successfully authenticate via Kerberos, the application typically must specify several system properties so that the underlying GSSAPI
-Java libraries can acquire a Kerberos ticket:
-
-    java.security.krb5.realm=MYREALM.ME
-    java.security.krb5.kdc=mykdc.myrealm.me
-
-Depending on the Kerberos setup, it may be required to specify additional properties, either via code or, in some cases,
-the connection string.
-
-- **[`SERVICE_NAME`]({{< apiref "com/mongodb/MongoCredential.html#SERVICE_NAME_KEY" >}})**
-
-	This property is used when the service's name is different that the default of `mongodb`.
-
-	```java
-	credential = credential.withMechanismProperty(MongoCredential.SERVICE_NAME_KEY, "othername");
-	```
-
-	Or via the connection string:
-
-	```
-	mongodb://username%40MYREALM.com@myserver/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:othername
-	```
-
-- **[`CANONICALIZE_HOST_NAME`]({{< apiref "com/mongodb/MongoCredential.html#CANONICALIZE_HOST_NAME_KEY" >}})**
-
-	This property is used when the fully qualified domain name (FQDN) of the host is required to properly authenticate.
-
-	```java
-	credential = credential.withMechanismProperty(MongoCredential.CANONICALIZE_HOST_NAME_KEY, true);
-	```
-
-	Or via the connection string:
-
-	```
-	mongodb://username%40MYREALM.com@myserver/?authMechanism=GSSAPI&authMechanismProperties=CANONICALIZE_HOST_NAME:true
-	```
-
-- **[`JAVA_SUBJECT`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SUBJECT_KEY" >}})**
-
-    This property is used for overriding the [Subject](http://docs.oracle.com/javase/8/docs/api/javax/security/auth/Subject.html)
-    under which GSSAPI authentication executes.
-
-	```java
-	LoginContext loginContext;
-	// ...
-    loginContext.login();
-    Subject subject = loginContext.getSubject()
-
-	credential = credential.withMechanismProperty(MongoCredential.JAVA_SUBJECT_KEY, subject);
-	```
-
-- **[`JAVA_SASL_CLIENT_PROPERTIES`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SASL_CLIENT_PROPERTIES_KEY" >}})**
-
-    While rarely needed, this property is used to replace the
-    [SasClient](http://docs.oracle.com/javase/8/docs/api/javax/security/sasl/SaslClient.html) properties.
-
-    ```java
-    Map<String, Object> saslClientProperties;
-	// ...
-
-	credential = credential.withMechanismProperty(MongoCredential.JAVA_SASL_CLIENT_PROPERTIES_KEY, saslClientProperties);
-	```
-
-{{% note %}}
-The `GSSAPI` authentication mechanism is supported only in the following environments:
-
-* Linux: Java 6 and above 
-* Windows: Java 7 and above with [SSPI](https://msdn.microsoft.com/en-us/library/windows/desktop/aa380493)
-* OS X: Java 7 and above
-{{% /note %}}
-
-## LDAP (PLAIN)
-
-[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy authentication through a Lightweight Directory
-Access Protocol (LDAP) service.  To create a credential of type [LDAP](http://docs.mongodb
-.org/manual/core/authentication/#ldap-proxy-authority-authentication) use the following static factory method:
-
-```java
-String user;          // The LDAP user name
-char[] password;      // The LDAP password
-// ...
-MongoCredential credential = MongoCredential.createPlainCredential(user, "$external", password);
-```
-
-or with a connection string:
-
-```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1@host1/?authSource=$external&authMechanism=PLAIN");
-```
-
-{{% note %}}
-The method refers to the `plain` authentication mechanism instead of `LDAP` because technically the driver is authenticating via the [PLAIN](https://www.ietf.org/rfc/rfc4616.txt) SASL mechanism.
-{{% /note %}}
diff --git a/docs/reference/content/driver/reference/connecting/connection-settings.md b/docs/reference/content/driver/reference/connecting/connection-settings.md
deleted file mode 100644
index 91401e0728a..00000000000
--- a/docs/reference/content/driver/reference/connecting/connection-settings.md
+++ /dev/null
@@ -1,104 +0,0 @@
-+++
-date = "2015-03-19T12:53:30-04:00"
-title = "Connection Settings"
-[menu.main]
-  parent = "Sync Connecting"
-  identifier = "Sync Connection Settings"
-  weight = 10
-  pre = "<i class='fa'></i>"
-+++
-
-## Connection Settings
-
-The Java driver has two ways of specifying the settings of a connection to a MongoDB server deployment.
-
-### Connection String
-
-The [connection string](http://docs.mongodb.org/manual/reference/connection-string/) is the simplest way to specify the properties of a 
-connection. . A connection string mostly follows [RFC 3986](http://tools.ietf.org/html/rfc3986), with the exception of the domain name.
- For MongoDB, it is possible to list multiple domain names separated by a comma. Below are some example connection strings.
-
-
-- For a standalone mongod, mongos, or a direct connection to a member of a replica set:
-
-	```ini
-	mongodb://host:27017
-	```
-
-- To connect to multiple mongos or a replica set:
-
-	```ini
-	mongodb://host1:27017,host2:27017
-	```
-
-The [authentication guide]({{< relref "driver/reference/connecting/authenticating.md" >}}) contains information on how to provide credentials in the connection string.
-
-#### The Database Component
-
-The database component is optional and is used to indicate which database to authenticate against. When the database component is not
-provided, the "admin" database is used.
-
-```ini
-mongodb://host:27017/mydb
-```
-
-Above, the database by the name of "mydb" is where the credentials are stored for the application.
-
-{{% note %}}
-Some drivers utilize the database component to indicate which database to work with by default. The Java driver, while it parses the 
-database component, does not use the database component for anything other than authentication.
-{{% /note %}}
-
-#### Options
-
-Many options can be provided via the connection string. The ones that cannot may be provided in a 
-[`MongoClientOptions`]({{< apiref "com/mongodb/MongoClientOptions" >}}) instance. To
-provide an option, append a `?` to the connection string and separate options by an `&`.
-
-```ini
-mongodb://host:27017/?replicaSet=rs0&maxPoolSize=200
-```
-
-The above connection string sets the "replicaSet" value to "rs0" and the "maxPoolSize" to "200".
-
-For a comprehensive list of the available options, see the [`MongoClientURI`]({{< apiref "com/mongodb/MongoClientURI" >}}) documentation.  
-
-
-### MongoClient
-
-A [`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}}) instance will be the root object for all interaction with MongoDB. It is all 
-that is needed to handle connecting to servers, monitoring servers, and performing operations against those servers. Without any 
-arguments, constructing a [`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}}) instance will connect to "localhost" port 27017.  
-
-```java
-MongoClient client = new MongoClient();
-```
-
-Alternatively, a connection string may be provided:
-
-```java
-MongoClient client = new MongoClient(new MongoClientURI("mongodb://host:27017,host2:27017/?replicaSet=rs0"));
-```
-
-Finally, the [`MongoClientOptions`]({{< apiref "com/mongodb/MongoClientOptions" >}}) class provides an in-code way to set the same 
-options from a connection string.  This is sometimes 
-necessary, as the connection string does not allow an application to configure as many properties of the connection as 
-`MongoClientOptions`.  
-[`MongoClientOptions`]({{< apiref "com/mongodb/MongoClientOptions" >}}) instances are immutable, so to create one an application uses a
- builder: 
-
-```java
-MongoClientOptions options = MongoClientOptions.builder().cursorFinalizerEnabled(false).build();
-MongoClient client = new MongoClient(options);
-```
-
-It's also possible to combine [`MongoClientOptions`]({{< apiref "com/mongodb/MongoClientOptions" >}}) with 
-[`MongoClientURI`]({{< apiref "com/mongodb/MongoClientURI" >}}), for situations in which an application needs to set some options
-in code but others via the connection string:
-
-```java
-
-MongoClientURI uri = new MongoClientURI("mongodb://host:27017,host2:27017/?replicaSet=rs0",
-                                        MongoClientOptions.builder().cursorFinalizerEnabled(false))
-MongoClient client = new MongoClient(uri);
-```
diff --git a/docs/reference/content/driver/reference/connecting/index.md b/docs/reference/content/driver/reference/connecting/index.md
deleted file mode 100644
index 717d549d0c1..00000000000
--- a/docs/reference/content/driver/reference/connecting/index.md
+++ /dev/null
@@ -1,18 +0,0 @@
-+++
-date = "2015-03-19T12:53:30-04:00"
-title = "Connecting"
-[menu.main]
-  parent = "Sync Reference"
-  identifier = "Sync Connecting"
-  weight = 30
-  pre = "<i class='fa'></i>"
-+++
-
-## Connecting
-
-The reference documentation for connecting to a MongoDB server deployment is divided into the following sections:
-
-- [Connection Settings]({{<relref "driver/reference/connecting/connection-settings.md">}}): documentation of the various ways to specify the properties of a connection
-- [Authenticating]({{<relref "driver/reference/connecting/authenticating.md">}}): detailed documentation of the various ways to specify authentication credentials
-- [SSL]({{<relref "driver/reference/connecting/ssl.md">}}): Detailed documentation of the various ways to specify the properties of an SSL connection
-- [JNDI]({{<relref "driver/reference/connecting/jndi.md">}}): Detailed documentation of the various ways to configure JNDI to return MongoClient instances
diff --git a/docs/reference/content/driver/reference/connecting/ssl.md b/docs/reference/content/driver/reference/connecting/ssl.md
deleted file mode 100644
index 44a58fb9c8f..00000000000
--- a/docs/reference/content/driver/reference/connecting/ssl.md
+++ /dev/null
@@ -1,72 +0,0 @@
-+++
-date = "2015-03-19T12:53:26-04:00"
-title = "SSL"
-[menu.main]
-  parent = "Sync Connecting"
-  identifier = "Sync SSL"
-  weight = 10
-  pre = "<i class='fa'></i>"
-+++
-
-## SSL
-
-The Java driver supports SSL connections to MongoDB servers using the underlying support for SSL provided by the JDK. You can configure 
-the driver to use SSL either with `MongoClientURI` or with `MongoClientOptions`.  
-
-With `MongoClientURI`, specify `ssl=true as a query parameter, as in:
-
-```java
-    new MongoClientURI("mongodb://localhost/?ssl=true")
-```
-
-With `MongoClientOptions`, set the sslEnabled property to true, as in:
-
-```java
-    MongoClientOptions.builder().sslEnabled(true).build()
-```
-
-### Host name verification
-
-By default, the driver ensures that the host name included in the server's SSL certificate(s) matches the host name(s) provided when 
-constructing a `MongoClient`.  However, this host name verification requires a Java 7 JVM, as it relies on additions to the 
-`javax.net.SSLParameters` class that were introduced in Java 7.  If your application must run on Java 6, or for some other reason you need
- to disable host name verification, you must expicitly indicate this in `MongoClientOptions` using the `sslInvalidHostNameAllowed` property:
-   
-```java
-    MongoClientOptions.builder().sslEnabled(true).sslInvalidHostNameAllowed(true).build()
-``` 
-
-### JVM system properties
-
-A typical application will need to set several JVM system properties to ensure that the client is able to validate the SSL certificate 
-presented by the server:
-
-- `javax.net.ssl.trustStore`: the path to a trust store containing the certificate of the signing authority
-- `javax.net.ssl.trustStorePassword`: the password to access this trust store 
-
-The trust store is typically created with the [keytool](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) 
-command line program provided as part of the JDK.  For example:
-
-```bash
-    keytool -importcert -trustcacerts -file <path to certificate authority file> 
-        -keystore <path to trust store> -storepass <password>
-```
-
-A typical application will also need to set several JVM system properties to ensure that the client presents an SSL certificate to the 
-MongoDB server:
-
-- `javax.net.ssl.keyStore`: the path to a key store containing the client's SSL certificates
-- `javax.net.ssl.keyStorePassword`: the password to access this key store
- 
-The key store is typically created with the [keytool](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) or the
-[openssl](https://www.openssl.org/docs/apps/openssl.html) command line program.
-
-For more information on configuring a Java application for SSL, please refer to the  
-[JSSE Reference Guide](http://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSSERefGuide.html).
-
-
-
-
-
-
-   
diff --git a/docs/reference/content/driver/reference/crud/index.md b/docs/reference/content/driver/reference/crud/index.md
deleted file mode 100644
index 29d389b1b4b..00000000000
--- a/docs/reference/content/driver/reference/crud/index.md
+++ /dev/null
@@ -1,153 +0,0 @@
-+++
-date = "2015-03-19T12:53:30-04:00"
-title = "CRUD Operations"
-[menu.main]
-  parent = "Sync Reference"
-  identifier = "Sync CRUD Operations"
-  weight = 70
-  pre = "<i class='fa'></i>"
-+++
-
-
-## CRUD
-
-For a walkthrough of the main CRUD operations please refer to the [Quick Tour]({{< ref "driver/getting-started/quick-tour.md" >}}).
-
-All CRUD-related methods in the Java driver are accessed through the 
-[`MongoCollection`]({{< apiref "com/mongodb/client/MongoCollection" >}}) interface.  Instances of 
-[`MongoCollection`]({{< apiref "com/mongodb/client/MongoCollection" >}}) can be obtained from a  
-[`MongoClient`]({{< apiref "com/mongodb/client/MongoClient" >}}) instance by way of a
-[`MongoDatabase`]({{< apiref "com/mongodb/client/MongoDatabase" >}}):
-
-```java
-MongoClient client = new MongoClient();
-MongoDatabase database = client.getDatabase("mydb");
-MongoCollection<Document> collection = database.getCollection("mycoll");
-```
-
-[`MongoCollection`]({{< apiref "com/mongodb/client/MongoCollection" >}}) is a generic interface: the `TDocument` type parameter 
-is the class that clients use to insert or replace documents in a collection, and the default type returned from `find` and `aggregate`.
- 
-The single-argument `getCollection` method returns an instance of `MongoCollection<Document>`, and so with this type of collection 
-an application uses instances of the `Document` class:
-
-```java
-MongoCollection<Document> collection = database.getCollection("mycoll");
-
-// insert a document
-Document document = new Document("x", 1)
-collection.insertOne(document);
-document.append("x", 2).append("y", 3);
-
-// replace a document
-collection.replaceOne(Filters.eq("_id", document.get("_id")), document);
-
-// find documents
-List<Document> foundDocument = collection.find().into(new ArrayList<Document>());
-```
-
-### CodecRegistry
-
-An overload of the `getCollection` method allows clients to specify a different class for representing BSON documents.  For example, 
-users of the legacy CRUD API from the 2.x driver series may wish to continue using `BasicDBObject` in order to ease the transition to the 
-new 
-CRUD API:
-
-```java
-// Pass BasicDBObject.class as the second argument
-MongoCollection<BasicDBObject> collection = database.getCollection("mycoll", BasicDBObject.class);
-
-// insert a document
-BasicDBObject document = new BasicDBObject("x", 1)
-collection.insertOne(document);
-document.append("x", 2).append("y", 3);
-
-// replace a document
-collection.replaceOne(Filters.eq("_id", document.get("_id"), document);
-
-// find documents
-List<BasicDBObject> foundDocument = collection.find().into(new ArrayList<BasicDBObject>());
-```
-
-There are two requirements that must be met for any class used in this way:
-
-- a `Codec` for it must be registered in the `MongoCollection`'s `CodecRegistry`
-- the `Codec` must be one that encodes and decodes a full BSON document (and not just, for example, a single BSON value like an Int32)
-
-By default, a `MongoCollection` is configured with `Codec`s for three classes:
- 
-- `Document`
-- `BasicDBObject`
-- `BsonDocument`
-
-Applications, however, are free to register `Codec` implementations for other classes by customizing the `CodecRegistry`.  New 
-`CodecRegistry` instances are configurable at three levels:
-
-- In a `MongoClient` via `MongoClientOptions`
-- In a `MongoDatabase` via its `withCodecRegistry` method
-- In a `MongoCollection` via its `withCodecRegistry` method
-
-Consider the case of encoding and decoding instances of the `UUID` class.  The Java driver by default encodes instances of `UUID` using a
-byte ordering that is not compatible with other MongoDB drivers, and changing the default would be quite dangerous.  But it is 
-possible for new applications that require interoperability across multiple drivers to be able to change that default, and they can do 
-that with a `CodecRegistry`.   
-
-```java
-// Replaces the default UuidCodec with one that uses the new standard UUID representation
-CodecRegistry codecRegistry = 
-CodecRegistries.fromRegistries(CodecRegistries.fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)),
-                               MongoClient.getDefaultCodecRegistry());
-
-// globally
-MongoClientOptions options = MongoClientOptions.builder()
-                                                .codecRegistry(codecRegistry).build();
-MongoClient client = new MongoClient(new ServerAddress(), options);  
-
-// or per database
-MongoDatabase database = client.getDatabase("mydb")
-                               .withCodecRegistry(codecRegistry);
-
-// or per collection
-MongoCollection<Document> collection = database.getCollection("mycoll")
-                                               .withCodecRegistry(codecRegistry);
-```
-
-
-### Write Concern
-
-Applications can configure the `WriteConcern` that a `MongoCollection` uses for write operations.  Like `CodecRegistry`, the 
-`WriteConcern` can be configured at three levels:
-
-- In a `MongoClient` via `MongoClientOptions`
-- In a `MongoDatabase` via its `withWriteConcern` method
-- In a `MongoCollection` via its `withWriteConcern` method
-
-
-### Read Preference
-
-Applications can configure the `ReadPreference` that a `MongoCollection` uses for read operations.  Like `WriteConcern`, the 
-`ReadPreference` can be configured at three levels:
-
-- In a `MongoClient` via `MongoClientOptions`
-- In a `MongoDatabase` via its `withReadPreference` method
-- In a `MongoCollection` via its `withReadPreference` method
-
-### Immutability of MongoDatabase and MongoCollection
-
-Instance of `MongoDatabase` and `MongoCollection` are immutable, so rather than mutate the state of the `MongoCollection` on which they
-are invoked, the three methods discussed above return new instances.  Applications should therefore be sure to store the result of the 
-method call.  For example:
-
-```java
-// CORRECT: The results of the method calls are chained and the final one is referenced 
-// by collection 
-MongoCollection<Document> collection = database.getCollection("mycoll")
-                                                .withWriteConcern(WriteConcern.JOURNALED)
-                                                .withReadPreference(ReadPreference.primary())
-                                                .withCodecRegistry(newRegistry);
-
-// INCORRECT: withReadPreference returns a new instance of MongoCollection
-// It does not modify the collection it's called on.  So this will
-// have no effect
-collection.withReadPreference(ReadPreference.secondary());
-```
diff --git a/docs/reference/content/driver/reference/gridfs/index.md b/docs/reference/content/driver/reference/gridfs/index.md
deleted file mode 100644
index 58febdee318..00000000000
--- a/docs/reference/content/driver/reference/gridfs/index.md
+++ /dev/null
@@ -1,196 +0,0 @@
-+++
-date = "2015-08-05T12:00:00-00:00"
-title = "GridFS"
-[menu.main]
-  parent = "Sync Reference"
-  identifier = "Sync GridFS"
-  weight = 80
-  pre = "<i class='fa'></i>"
-+++
-
-
-## GridFS
-
-GridFS is a specification for storing and retrieving files that exceed the BSON-document size limit of 16MB.
-
-Instead of storing a file in a single document, GridFS divides a file into parts, or chunks, and stores each of those chunks as a separate document. By default GridFS limits chunk size to 255k. GridFS uses two collections to store files. The chunks collection stores the file chunks, and the files collection stores the file metadata.
-
-When you query a GridFS store for a file, the driver or client will reassemble the chunks as needed. GridFS is useful not only for storing files that exceed 16MB but also for storing any files for which you want access without having to load the entire file into memory.
-
-{{% note %}}
-For more information about GridFS see the [MongoDB GridFS documentation](http://docs.mongodb.org/manual/core/gridfs/).
-{{% /note %}}
-
-The following code snippets come from the `GridFSTour.java` example code
-that can be found with the [driver source]({{< srcref "driver/src/examples/gridfs/GridFSTour.java">}}).
-
-## Connecting to GridFS
-
-Interactions with GridFS are done via the [`GridFSBucket`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket" >}}) class. To create a `GridFSBucket` use the [`GridFSBuckets`]({{< apiref "com/mongodb/client/gridfs/GridFSBuckets" >}}) factory class.  
-
-Creating a `GridFSBucket` requires an instance of a
-[`MongoDatabase`]({{< apiref "com/mongodb/client/MongoDatabase" >}}) and you can optionally provide a custom bucket name.
-
-The following example shows how to create a `GridFSBucket`:
-
-```java
-// Create a gridFSBucket using the default bucket name "fs"
-GridFSBucket gridFSBucket = GridFSBuckets.create(myDatabase);
-
-// Create a gridFSBucket with a custom bucket name "files"
-GridFSBucket gridFSBucket = GridFSBuckets.create(myDatabase, "files");
-```
-
-## Uploading to GridFS
-
-There are two main ways to upload data into GridFS.  
-
-### UploadFromStream
-
-The [`uploadFromStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openUploadStream-java.lang.String-com.mongodb.client.gridfs.model.GridFSUploadOptions-" >}}) method reads the contents of an [`InputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/InputStream.html) and saves it to the `GridFSBucket`.  The size of the chunks defaults to 255 bytes, but can be configured via the [`GridFSUploadOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSUploadOptions" >}}).
-
-The following example uploads an `InputStream` into `GridFSBucket`:
-
-```java
-// Get the input stream
-InputStream streamToUploadFrom = new FileInputStream(new File("/tmp/mongodb-tutorial.pdf"));
-
-// Create some custom options
-GridFSUploadOptions options = new GridFSUploadOptions()
-                                    .chunkSizeBytes(1024)
-                                    .metadata(new Document("type", "presentation"));
-
-ObjectId fileId = gridFSBucket.uploadFromStream("mongodb-tutorial", streamToUploadFrom, options);
-```
-
-### OpenUploadStream
-
-The [`openUploadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openUploadStream-java.lang.String-com.mongodb.client.gridfs.model.GridFSUploadOptions-">}}) method returns a [`GridFSUploadStream`]({{< apiref "mongodb/client/gridfs/GridFSUploadStream.html">}}) which extends [`OutputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/OutputStream.html) and can be written to.
-
-The `GridFSUploadStream` buffers data until it reaches the `chunkSizeBytes` and then inserts the chunk into the chunks collection.  When the `GridFSUploadStream` is closed, the final chunk is written and the file metadata is inserted into the files collection.
-
-The following example uploads an into `GridFSBucket` via the returned `OutputStream`:
-
-```java
-byte[] data = "Data to upload into GridFS".getBytes(StandardCharsets.UTF_8);
-GridFSUploadStream uploadStream = gridFSBucket.openUploadStream("sampleData", options);
-uploadStream.write(data);
-uploadStream.close();
-System.out.println("The fileId of the uploaded file is: " + uploadStream.getFileId().toHexString());
-```
-
-{{% note %}}
-GridFS will automatically create indexes on the files and chunks collections on first upload of data into the GridFS bucket.
-{{% /note %}}
-
-## Finding files stored in GridFS
-
-To find the files stored in the `GridFSBucket` use the [`find`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#find--">}}) method.
-
-The following example prints out the filename of each file stored:
-
-```java
-gridFSBucket.find().forEach(
-  new Block<GridFSFile>() {
-    @Override
-    public void apply(final GridFSFile gridFSFile) {
-        System.out.println(gridFSFile.getFilename());
-    }
-});
-```
-
-You can also provide a custom filter to limit the results returned. The following example prints out the filenames of all files with a "image/png" value set as the contentType in the user defined metadata document:
-
-```java
-gridFSBucket.find(eq("metadata.contentType", "image/png")).forEach(
-  new Block<GridFSFile>() {
-      @Override
-      public void apply(final GridFSFile gridFSFile) {
-          System.out.println(gridFSFile.getFilename());
-      }
-  });
-```
-
-## Downloading from GridFS
-
-There are four main ways to download data from GridFS.
-
-### DownloadFromStream
-
-The [`downloadToStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#downloadToStream-org.bson.types.ObjectId-java.io.OutputStream-" >}}) method reads the contents from MongoDB and writes the data directly to the provided [`OutputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/OutputStream.html).
-
-The following example downloads a file into the provided `OutputStream`:
-
-```java
-FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
-gridFSBucket.downloadToStream(fileId, streamToDownloadTo);
-streamToDownloadTo.close();
-System.out.println(streamToDownloadTo.toString());
-```
-
-If you don't know the [`ObjectId`]({{< apiref "org/bson/types/ObjectId.html">}}) of the file but know the filename, you can use the [`downloadToStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#downloadToStream-java.lang.String-java.io.OutputStream-com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions-" >}}) method. By default it will download the latest version of the file. Use the [`GridFSDownloadByNameOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSDownloadByNameOptions.html" >}}) to configure which version to download.
-
-The following example downloads the original version of the file named "mongodb-tutorial" into the `OutputStream`:
-
-```java
-FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
-GridFSDownloadByNameOptions downloadOptions = new GridFSDownloadByNameOptions().revision(0);
-gridFSBucket.downloadToStream("mongodb-tutorial", streamToDownloadTo, downloadOptions);
-streamToDownloadTo.close();
-```
-
-### OpenDownloadStream
-
-The [`openDownloadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openDownloadStream-org.bson.types.ObjectId-">}}) method returns a [`GridFSDownloadStream`]({{< apiref "mongodb/client/gridfs/GridFSDownloadStream.html">}}) which extends [`InputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/InputStream.html) and can be read from.
-
-The following example reads from the `GridFSBucket` via the returned `InputStream`:
-
-```java
-GridFSDownloadStream downloadStream = gridFSBucket.openDownloadStream(fileId);
-int fileLength = (int) downloadStream.getGridFSFile().getLength();
-byte[] bytesToWriteTo = new byte[fileLength];
-downloadStream.read(bytesToWriteTo);
-downloadStream.close();
-
-System.out.println(new String(bytesToWriteTo, StandardCharsets.UTF_8));
-```
-
-You can also open a `GridFSDownloadStream` by searching against the filename, using the [`openDownloadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openDownloadStream-java.lang.String-com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions-" >}}) method. By default it will download the latest version of the file. Use the [`GridFSDownloadByNameOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSDownloadByNameOptions.html" >}}) to configure which version to download.
-
-The following example downloads the latest version of the file named "sampleData" into the `OutputStream`:
-
-```java
-GridFSDownloadStream downloadStream = gridFSBucket.openDownloadStream("sampleData");
-int fileLength = (int) downloadStream.getGridFSFile().getLength();
-byte[] bytesToWriteTo = new byte[fileLength];
-downloadStream.read(bytesToWriteTo);
-downloadStream.close();
-
-System.out.println(new String(bytesToWriteTo, StandardCharsets.UTF_8));
-```
-
-## Renaming files
-
-If you should need to rename a file, then the [`rename`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#rename-org.bson.types.ObjectId-java.lang.String-">}}) method can be used.  
-
-The following example renames a file to "mongodbTutorial":
-
-```java
-gridFSBucket.rename(fileId, "mongodbTutorial");
-```
-
-{{% note %}}
-The `rename` method requires an `ObjectId` rather than a `filename` to ensure the correct file is renamed.
-
-To rename multiple revisions of the same filename, first retrieve the full list of files. Then for every file that should be renamed then execute `rename` with the corresponding `_id`.
-{{% /note %}}
-
-## Deleting files
-
-To delete a file from the `GridFSBucket` use the [`delete`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#delete-org.bson.types.ObjectId-">}}) method.
-
-The following example deletes a file from the `GridFSBucket`:
-
-```java
-gridFSBucket.delete(fileId);
-```
diff --git a/docs/reference/content/driver/reference/index.md b/docs/reference/content/driver/reference/index.md
index 1f6d987aff4..02785543d11 100644
--- a/docs/reference/content/driver/reference/index.md
+++ b/docs/reference/content/driver/reference/index.md
@@ -4,17 +4,16 @@ title = "Reference"
 [menu.main]
   parent = "MongoDB Driver"
   identifier = "Sync Reference"
-  weight = 20
+  weight = 30
   pre = "<i class='fa fa-book'></i>"
 +++
 
 ## Reference
 
-The reference documentation for the Java driver focuses on high-level documentation and use-cases. The Javadoc-generated API reference is
-[here](http://api.mongodb.com/java/3.3/).
+The reference documentation for the Java driver focuses on high-level documentation and use-cases.
 
-- [Connecting]({{< relref "driver/reference/connecting/index.md" >}}): Documentation of the driver's support for connecting to MongoDB servers
-- [CRUD]({{< relref "driver/reference/crud/index.md" >}}): Documentation of the driver's support for CRUD operations
-- [Management]({{< relref "driver/reference/management/index.md" >}}): Documentation of the driver's support for logging and monitoring of its 
-internal state
+- [Logging]({{< relref "driver/reference/logging.md" >}})
 
+- [Monitoring]({{< relref "driver/reference/monitoring.md" >}})
+
+See also [Javadoc-generated API]({{<apiref "">}}).
diff --git a/docs/reference/content/driver/reference/logging.md b/docs/reference/content/driver/reference/logging.md
new file mode 100644
index 00000000000..6317bcd4ac7
--- /dev/null
+++ b/docs/reference/content/driver/reference/logging.md
@@ -0,0 +1,31 @@
++++
+date = "2015-03-18T21:14:20-04:00"
+title = "Logging"
+[menu.main]
+  parent = "Sync Reference"
+  identifier = "Sync Logging"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+# Logging
+
+By default, logging is enabled via the popular [SLF4J](http://www.slf4j.org/) API. The use of [SLF4J](http://www.slf4j.org/) is optional;
+the driver will use SLF4J if the driver detects the presence of SLF4J API (class `org.slf4j.Logger`) in the classpath. 
+Otherwise, the driver will fall back to JUL (`java.util.logging`).
+
+The driver uses the following logger names:
+
+- `org.mongodb.driver`: the root logger
+    - `cluster`: for logs related to monitoring of the MongoDB servers to which the driver connects
+    - `connection`: for logs related to connections and connection pools
+    - `protocol`: for logs related to protocol message sent to and received from a MongoDB server
+        - `insert`: for logs related to insert messages and responses
+        - `update`: for logs related to update messages and responses
+        - `delete`: for logs related to delete messages and responses
+        - `query`: for logs related to query messages and responses
+        - `getmore`: for logs related to getmore messages and responses
+        - `killcursor`: for logs related to killcursor messages and responses
+        - `command`: for logs related to command messages and responses
+    - `uri`: for logs related to connection string parsing
+    - `management`: for logs related to JMX
diff --git a/docs/reference/content/driver/reference/management/index.md b/docs/reference/content/driver/reference/management/index.md
deleted file mode 100644
index 5cb236ec11f..00000000000
--- a/docs/reference/content/driver/reference/management/index.md
+++ /dev/null
@@ -1,16 +0,0 @@
-+++
-date = "2015-03-19T14:27:51-04:00"
-title = "Management"
-[menu.main]
-  parent = "Sync Reference"
-  identifier = "Sync Management"
-  weight = 90
-  pre = "<i class='fa'></i>"
-+++
-
-## Management
-
-The driver provides two mechanisms for examining its state:
-
-- [Logging]({{< relref "driver/reference/management/logging.md" >}}): Comprehensive logging of all operations using [SLF4J](http://www.slf4j.org/)
-- [Monitoring]({{< relref "driver/reference/management/monitoring.md" >}}): Built on [JMX](http://docs.oracle.com/javase/8/docs/technotes/guides/jmx/)
diff --git a/docs/reference/content/driver/reference/management/logging.md b/docs/reference/content/driver/reference/management/logging.md
deleted file mode 100644
index a7d9483028e..00000000000
--- a/docs/reference/content/driver/reference/management/logging.md
+++ /dev/null
@@ -1,31 +0,0 @@
-+++
-date = "2015-03-18T21:14:20-04:00"
-title = "Logging"
-[menu.main]
-  parent = "Sync Management"
-  identifier = "Sync Logging"
-  weight = 10
-  pre = "<i class='fa'></i>"
-+++
-
-# Logging
-
-By default, logging is enabled via the popular [SLF4J](http://www.slf4j.org/) API. The use of [SLF4J](http://www.slf4j.org/) is optional;
-the driver will use SLF4J if the driver detects the presence of SLF4J in the classpath. Otherwise, the driver will fall back to 
-JUL (`java.util.logging`).
-
-The driver uses the following logger names:
-
-- `org.mongodb.driver`: the root logger
-    - `cluster`: for logs related to monitoring of the MongoDB servers to which the driver connects
-    - `connection`: for logs related to connections and connection pools
-    - `protocol`: for logs related to protocol message sent to and received from a MongoDB server
-        - `insert`: for logs related to insert messages and responses
-        - `update`: for logs related to update messages and responses
-        - `delete`: for logs related to delete messages and responses
-        - `query`: for logs related to query messages and responses
-        - `getmore`: for logs related to getmore messages and responses
-        - `killcursor`: for logs related to killcursor messages and responses
-        - `command`: for logs related to command messages and responses
-    - `uri`: for logs related to connection string parsing
-    - `management`: for logs related to JMX
diff --git a/docs/reference/content/driver/reference/management/monitoring.md b/docs/reference/content/driver/reference/management/monitoring.md
deleted file mode 100644
index b9d7ababaa2..00000000000
--- a/docs/reference/content/driver/reference/management/monitoring.md
+++ /dev/null
@@ -1,178 +0,0 @@
-+++
-date = "2015-03-19T12:53:26-04:00"
-title = "Monitoring"
-[menu.main]
-  parent = "Sync Management"
- identifier = "Sync Monitoring"
-  weight = 100
-  pre = "<i class='fa'></i>"
-+++
-
-# JMX Monitoring
-
-The driver uses [JMX](http://docs.oracle.com/javase/8/docs/technotes/guides/jmx/) to create
-[MXBeans](http://docs.oracle.com/javase/tutorial/jmx/mbeans/mxbeans.html) that allow an
-application or end user to monitor various aspects of the driver.
-
-The driver creates MXBean instances of a single type:
-[ConnectionPoolStatisticsMBean]({{< apiref "com/mongodb/management/ConnectionPoolStatisticsMBean" >}}).
- The driver registers one `ConnectionPoolStatisticsMBean` instance per each server it connects to. For example, in the case of a replica 
- set, the driver creates an instance per each non-hidden member of the replica set.
-
-Each MXBean instance is required to be registered with a unique object name, which consists of a domain and a set of named properties. All 
-MXBean instances created by the driver are under the domain `"org.mongodb.driver"`.  Instances of `ConnectionPoolStatisticsMBean` will have 
-the following properties:
-
-- `clusterId`: a client-generated unique identifier, required to ensure object name uniqueness in situations where an
-application has multiple `MongoClient` instances connected to the same MongoDB server deployment
-- `host`: the host name of the server
-- `port`: the port on which the server is listening
-- `minSize`: the minimum allowed size of the pool, including idle and in-use members
-- `maxSize`: the maximum allowed size of the pool, including idle and in-use members
-- `size`: the current size of the pool, including idle and and in-use members
-- `waitQueueSize`: the current size of the wait queue for a connection from this pool
-- `checkedOutCount`: the current count of connections that are currently in use
-
-# Command Monitoring
-
-The driver implements the
-[command monitoring specification](https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst),
-allowing an application to be notified when a command starts and when it either succeeds or fails.
-
-An application registers command listeners with a `MongoClient` by configuring `MongoClientOptions` with instances of classes
-that implement the [`CommandListener`]({{< apiref "com/mongodb/event/CommandListener" >}}) interface. Consider the following, somewhat
-simplistic, implementation of the `CommandListener` interface:
- 
-```java
-public class TestCommandListener implements CommandListener {                        
-    @Override                                                                                                        
-    public void commandStarted(final CommandStartedEvent event) {                                                    
-        System.out.println(String.format("Sent command '%s:%s' with id %s to database '%s' "                         
-                                         + "on connection '%s' to server '%s'",                                      
-                                         event.getCommandName(),                                                     
-                                         event.getCommand().get(event.getCommandName()),                             
-                                         event.getRequestId(),                                                       
-                                         event.getDatabaseName(),                                                    
-                                         event.getConnectionDescription()                                            
-                                              .getConnectionId(),                                                    
-                                         event.getConnectionDescription().getServerAddress()));                      
-    }                                                                                                                
-                                                                                                                     
-    @Override                                                                                                        
-    public void commandSucceeded(final CommandSucceededEvent event) {                                                
-        System.out.println(String.format("Successfully executed command '%s' with id %s "                            
-                                         + "on connection '%s' to server '%s'",                                      
-                                         event.getCommandName(),                                                     
-                                         event.getRequestId(),                                                       
-                                         event.getConnectionDescription()                                            
-                                              .getConnectionId(),                                                    
-                                         event.getConnectionDescription().getServerAddress()));                      
-    }                                                                                                                
-                                                                                                                     
-    @Override                                                                                                        
-    public void commandFailed(final CommandFailedEvent event) {                                                      
-        System.out.println(String.format("Failed execution of command '%s' with id %s "                              
-                                         + "on connection '%s' to server '%s' with exception '%s'",                  
-                                         event.getCommandName(),                                                     
-                                         event.getRequestId(),                                                       
-                                         event.getConnectionDescription()                                            
-                                              .getConnectionId(),                                                    
-                                         event.getConnectionDescription().getServerAddress(),                        
-                                         event.getThrowable()));                                                     
-    }                                                                                                                
-}                                                                                                                            
-```
-     
-and an instance of `MongoClientOptions` configured with an instance of `TestCommandListener`:            
-            
-```java                                                                                   
-MongoClientOptions options = MongoClientOptions.builder()                            
-                                           .addCommandListener(new TestCommandListener())
-                                           .build();
-```
-
-A `MongoClient` configured with these options will print a message to `System.out` before sending each command to a MongoDB server, and 
-another message upon either successful completion or failure of each command.
-
-# Cluster Monitoring
-
-The driver implements the
-[SDAM Monitoring specification](https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst),
-allowing an application to be notified when the driver detects changes to the topology of the MongoDB cluster to which it is connected.
-
-An application registers listeners with a `MongoClient` by configuring  `MongoClientOptions` with instances of classes that
-implement any of the [`ClusterListener`]({{< apiref "com/mongodb/event/ClusterListener" >}}),
- [`ServerListener`]({{< apiref "com/mongodb/event/ServerListener" >}}),
-or [`ServerMonitorListener`]({{< apiref "com/mongodb/event/ServerMonitorListener" >}}) interfaces.
-
-Consider the following, somewhat simplistic, example of a cluster listener:
-
-```java
-public class TestClusterListener implements ClusterListener {
-    private final ReadPreference readPreference;
-    private boolean isWritable;
-    private boolean isReadable;
-
-    public TestClusterListener(final ReadPreference readPreference) {
-        this.readPreference = readPreference;
-    }
-
-    @Override
-    public void clusterOpening(final ClusterOpeningEvent clusterOpeningEvent) {
-        System.out.println(String.format("Cluster with unique client identifier %s opening",
-                clusterOpeningEvent.getClusterId()));
-    }
-
-    @Override
-    public void clusterClosed(final ClusterClosedEvent clusterClosedEvent) {
-        System.out.println(String.format("Cluster with unique client identifier %s closed",
-                clusterClosedEvent.getClusterId()));
-    }
-
-    @Override
-    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
-        if (!isWritable) {
-            if (event.getNewDescription().hasWritableServer()) {
-                isWritable = true;
-                System.out.println("Writable server available!");
-            }
-        } else {
-            if (!event.getNewDescription().hasWritableServer()) {
-                isWritable = false;
-                System.out.println("No writable server available!");
-            }
-        }
-
-        if (!isReadable) {
-            if (event.getNewDescription().hasReadableServer(readPreference)) {
-                isReadable = true;
-                System.out.println("Readable server available!");
-            }
-        } else {
-            if (!event.getNewDescription().hasReadableServer(readPreference)) {
-                isReadable = false;
-                System.out.println("No readable server available!");
-            }
-        }
-    }
-}
-```
-
-and an instance of `MongoClientOptions` configured with an instance of `TestClusterListener`:
-
-```java
-List<ServerAddress> seedList = ...
-MongoClientOptions options = MongoClientOptions.builder()
-                                           .addClusterListener(new TestClusterListener(ReadPreference.secondary()))
-                                           .build();
-MongoClient client = new MongoClient(seedList, options);
-```
-
-A `MongoClient` configured with these options will print a message to `System.out` when the MongoClient is constructed with these options,
-and when that MongoClient is closed.  In addition, it will print a message when the client enters a state:
-
-* with an available server that will accept writes
-* without an available server that will accept writes
-* with an available server that will accept reads using the configured `ReadPreference`
-* without an available server that will accept reads using the configured `ReadPreference`
-
diff --git a/docs/reference/content/driver/reference/monitoring.md b/docs/reference/content/driver/reference/monitoring.md
new file mode 100644
index 00000000000..7b43c1dd7f8
--- /dev/null
+++ b/docs/reference/content/driver/reference/monitoring.md
@@ -0,0 +1,261 @@
++++
+date = "2015-03-19T12:53:26-04:00"
+title = "Monitoring"
+[menu.main]
+  parent = "Sync Reference"
+ identifier = "Sync Monitoring"
+  weight = 20
+  pre = "<i class='fa'></i>"
++++
+
+# JMX Monitoring
+
+The driver uses [JMX](http://docs.oracle.com/javase/8/docs/technotes/guides/jmx/) to create
+[MXBeans](http://docs.oracle.com/javase/tutorial/jmx/mbeans/mxbeans.html) that allow an
+application or end user to monitor various aspects of the driver.
+
+The driver creates MXBean instances of a single type:
+[ConnectionPoolStatisticsMBean]({{< apiref "com/mongodb/management/ConnectionPoolStatisticsMBean" >}}).
+ The driver registers one `ConnectionPoolStatisticsMBean` instance per each server it connects to. For example, in the case of a replica
+ set, the driver creates an instance per each non-hidden member of the replica set.
+
+Each MXBean instance is required to be registered with a unique object name, which consists of a domain and a set of named properties. All
+MXBean instances created by the driver are under the domain `"org.mongodb.driver"`.  Instances of `ConnectionPoolStatisticsMBean` will have
+the following properties:
+
+- `clusterId`: a client-generated unique identifier, required to ensure object name uniqueness in situations where an
+application has multiple `MongoClient` instances connected to the same MongoDB server deployment
+- `host`: the host name of the server
+- `port`: the port on which the server is listening
+- `minSize`: the minimum allowed size of the pool, including idle and in-use members
+- `maxSize`: the maximum allowed size of the pool, including idle and in-use members
+- `size`: the current size of the pool, including idle and and in-use members
+- `waitQueueSize`: the current size of the wait queue for a connection from this pool
+- `checkedOutCount`: the current count of connections that are currently in use
+
+
+JMX connection pool monitoring is disabled by default. To enable it add a `com.mongodb.management.JMXConnectionPoolListener` instance via 
+`MongoClientOptions`:
+
+```java
+MongoClientOptions options =
+        MongoClientOptions.builder()
+                .addConnectionPoolListener(new JMXConnectionPoolListener())
+                .build();
+
+
+```
+
+# Command Monitoring
+
+The driver implements the
+[command monitoring specification](https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst),
+allowing an application to be notified when a command starts and when it either succeeds or fails.
+
+An application registers command listeners with a `MongoClient` by configuring `MongoClientOptions` with instances of classes
+that implement the [`CommandListener`]({{< apiref "com/mongodb/event/CommandListener" >}}) interface. Consider the following, somewhat
+simplistic, implementation of the `CommandListener` interface:
+ 
+```java
+public class TestCommandListener implements CommandListener {                        
+    @Override                                                                                                        
+    public void commandStarted(final CommandStartedEvent event) {                                                    
+        System.out.println(String.format("Sent command '%s:%s' with id %s to database '%s' "                         
+                                         + "on connection '%s' to server '%s'",                                      
+                                         event.getCommandName(),                                                     
+                                         event.getCommand().get(event.getCommandName()),                             
+                                         event.getRequestId(),                                                       
+                                         event.getDatabaseName(),                                                    
+                                         event.getConnectionDescription()                                            
+                                              .getConnectionId(),                                                    
+                                         event.getConnectionDescription().getServerAddress()));                      
+    }                                                                                                                
+
+    @Override                                                                                                        
+    public void commandSucceeded(final CommandSucceededEvent event) {                                                
+        System.out.println(String.format("Successfully executed command '%s' with id %s "                            
+                                         + "on connection '%s' to server '%s'",                                      
+                                         event.getCommandName(),                                                     
+                                         event.getRequestId(),                                                       
+                                         event.getConnectionDescription()                                            
+                                              .getConnectionId(),                                                    
+                                         event.getConnectionDescription().getServerAddress()));                      
+    }                                                                                                                
+
+    @Override                                                                                                        
+    public void commandFailed(final CommandFailedEvent event) {                                                      
+        System.out.println(String.format("Failed execution of command '%s' with id %s "                              
+                                         + "on connection '%s' to server '%s' with exception '%s'",                  
+                                         event.getCommandName(),                                                     
+                                         event.getRequestId(),                                                       
+                                         event.getConnectionDescription()                                            
+                                              .getConnectionId(),                                                    
+                                         event.getConnectionDescription().getServerAddress(),                        
+                                         event.getThrowable()));                                                     
+    }                                                                                                                
+}                                                                                                                            
+```
+
+
+and an instance of `MongoClientOptions` configured with an instance of `TestCommandListener`:
+
+```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .addCommandListener(new TestCommandListener())
+        .build();
+MongoClient client = MongoClients.create(settings);
+
+```
+
+A `MongoClient` configured with these options will print a message to `System.out` before sending each command to a MongoDB server, and
+another message upon either successful completion or failure of each command.
+
+# Cluster Monitoring
+
+The driver implements the
+[SDAM Monitoring specification](https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst),
+allowing an application to be notified when the driver detects changes to the topology of the MongoDB cluster to which it is connected.
+
+An application registers listeners with a `MongoClient` by configuring  `MongoClientOptions` with instances of classes that
+implement any of the [`ClusterListener`]({{< apiref "com/mongodb/event/ClusterListener" >}}),
+ [`ServerListener`]({{< apiref "com/mongodb/event/ServerListener" >}}),
+or [`ServerMonitorListener`]({{< apiref "com/mongodb/event/ServerMonitorListener" >}}) interfaces.
+
+Consider the following, somewhat simplistic, example of a cluster listener:
+
+```java
+public class TestClusterListener implements ClusterListener {
+    private final ReadPreference readPreference;
+    private boolean isWritable;
+    private boolean isReadable;
+
+    public TestClusterListener(final ReadPreference readPreference) {
+        this.readPreference = readPreference;
+    }
+
+    @Override
+    public void clusterOpening(final ClusterOpeningEvent clusterOpeningEvent) {
+        System.out.println(String.format("Cluster with unique client identifier %s opening",
+                clusterOpeningEvent.getClusterId()));
+    }
+
+    @Override
+    public void clusterClosed(final ClusterClosedEvent clusterClosedEvent) {
+        System.out.println(String.format("Cluster with unique client identifier %s closed",
+                clusterClosedEvent.getClusterId()));
+    }
+
+    @Override
+    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
+        if (!isWritable) {
+            if (event.getNewDescription().hasWritableServer()) {
+                isWritable = true;
+                System.out.println("Writable server available!");
+            }
+        } else {
+            if (!event.getNewDescription().hasWritableServer()) {
+                isWritable = false;
+                System.out.println("No writable server available!");
+            }
+        }
+
+        if (!isReadable) {
+            if (event.getNewDescription().hasReadableServer(readPreference)) {
+                isReadable = true;
+                System.out.println("Readable server available!");
+            }
+        } else {
+            if (!event.getNewDescription().hasReadableServer(readPreference)) {
+                isReadable = false;
+                System.out.println("No readable server available!");
+            }
+        }
+    }
+}
+```
+
+and an instance of `MongoClientOptions` configured with an instance of `TestClusterListener`:
+
+```java
+List<ServerAddress> seedList = ...
+MongoClientSettings settings = MongoClientSettings.builder()
+        .applyToClusterSettings(builder -> 
+                builder.addClusterListener(new TestClusterListener(ReadPreference.secondary())))
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+A `MongoClient` configured with these options will print a message to `System.out` when the MongoClient is created with these options,
+and when that MongoClient is closed.  In addition, it will print a message when the client enters a state:
+
+* with an available server that will accept writes
+* without an available server that will accept writes
+* with an available server that will accept reads using the configured `ReadPreference`
+* without an available server that will accept reads using the configured `ReadPreference`
+
+# Connection Pool Monitoring
+
+The driver supports monitoring of connection pool-related events.
+
+An application registers listeners with a `MongoClient` by configuring `MongoClientOptions` with instances of classes that
+implement the [`ConnectionPoolListener`]({{< apiref "com/mongodb/event/ConnectionPoolListener" >}}) interface.
+
+Consider the following, simplistic, example of a connection pool listener:
+
+```java
+public class TestConnectionPoolListener implements ConnectionPoolListener {
+    @Override
+    public void connectionPoolOpened(final ConnectionPoolOpenedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionPoolClosed(final ConnectionPoolClosedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionCheckedOut(final ConnectionCheckedOutEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionCheckedIn(final ConnectionCheckedInEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void waitQueueEntered(final ConnectionPoolWaitQueueEnteredEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void waitQueueExited(final ConnectionPoolWaitQueueExitedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionAdded(final ConnectionAddedEvent event) {
+        System.out.println(event);
+    }
+
+    @Override
+    public void connectionRemoved(final ConnectionRemovedEvent event) {
+        System.out.println(event);
+    }
+}
+```
+
+and an instance of `MongoClientOptions` configured with an instance of `TestConnectionPoolListener`:
+
+```java
+List<ServerAddress> seedList = ...
+MongoClientSettings settings = MongoClientSettings.builder()
+        .applyToConnectionPoolSettings(builder -> 
+                builder.addConnectionPoolListener(new TestConnectionPoolListener()))
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+A `MongoClient` configured with these options will print a message to `System.out` for each connection pool-related event for each MongoDB
+server to which the MongoClient is connected.
diff --git a/docs/reference/content/driver/tutorials/aggregation.md b/docs/reference/content/driver/tutorials/aggregation.md
new file mode 100644
index 00000000000..6b9884ad96b
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/aggregation.md
@@ -0,0 +1,102 @@
++++
+date = "2016-06-08T14:19:24-04:00"
+title = "Aggregation"
+[menu.main]
+parent = "Sync Tutorials"
+identifier = "Aggregation"
+weight = 50
+pre = "<i class='fa'></i>"
++++
+
+## Aggregation Framework
+
+The [aggregation pipeline]({{<docsref "core/aggregation-pipeline">}}) is a framework for data aggregation, modeled on the concept of data processing pipelines.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.Block;
+     import com.mongodb.client.MongoClients;
+     import com.mongodb.client.MongoClient;
+     import com.mongodb.client.MongoCollection;
+     import com.mongodb.client.MongoDatabase;
+     import com.mongodb.client.model.Aggregates;
+     import com.mongodb.client.model.Accumulators;
+     import com.mongodb.client.model.Projections;
+     import com.mongodb.client.model.Filters;
+     
+     import org.bson.Document;
+     ```
+
+- Include the following code which the examples in the tutorials will use to print the results of the aggregation:
+
+     ```java
+     Block<Document> printBlock = new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                System.out.println(document.toJson());
+            }
+        };
+     ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection.
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Perform Aggregation
+
+To perform aggregation, pass a list of [aggregation stages]({{< docsref "meta/aggregation-quick-reference" >}}) to the [`MongoCollection.aggregate()`]({{<apiref "com/mongodb/client/MongoCollection.html#aggregate(java.util.List)">}}) method.
+The Java driver provides the [`Aggregates`]({{< apiref "com/mongodb/client/model/Aggregates.html" >}}) helper class that contains builders for aggregation stages.
+
+In the following example, the aggregation pipeline
+
+- First uses a [`$match`]({{< docsref "reference/operator/aggregation/match/" >}}) stage to filter for documents whose `categories` array field contains the element `Bakery`. The example uses [`Aggregates.match`]({{< relref "builders/aggregation.md#match" >}}) to build the `$match` stage.
+
+- Then, uses  a [`$group`]({{< docsref "reference/operator/aggregation/group/" >}}) stage to group the matching documents by the `stars` field, accumulating a count of documents for each distinct value of `stars`. The example uses [`Aggregates.group`]({{< relref "builders/aggregation.md#group" >}}) to build the `$group` stage and [`Accumulators.sum`]({{< apiref "com/mongodb/client/model/Accumulators#sum(java.lang.String,TExpression)" >}}) to build the [accumulator expression]({{< docsref "reference/operator/aggregation/group/#accumulator-operator" >}}).  For the [accumulator expressions]({{< docsref "reference/operator/aggregation-group/" >}}) for use within the [`$group`]({{< docsref "reference/operator/aggregation/group/" >}}) stage, the Java driver provides [`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators.html">}}) helper class.
+```java
+collection.aggregate(
+      Arrays.asList(
+              Aggregates.match(Filters.eq("categories", "Bakery")),
+              Aggregates.group("$stars", Accumulators.sum("count", 1))
+      )
+).forEach(printBlock);
+```
+
+### Use Aggregation Expressions
+
+For [$group accumulator expressions]({{< docsref "reference/operator/aggregation-group/" >}}), the Java driver provides [`Accumulators`]({{< apiref "com/mongodb/client/model/Accumulators.html">}}) helper class. For other [aggregation expressions]({{< docsref "meta/aggregation-quick-reference/#aggregation-expressions" >}}), manually build the expression `Document`.
+
+In the following example, the aggregation pipeline uses a [`$project`]({{< docsref "reference/operator/aggregation/project/" >}}) stage to return only the `name` field and the calculated field `firstCategory` whose value is the first element in the `categories` array. The example uses [`Aggregates.project`]({{< relref "builders/aggregation.md#project" >}}) and various
+[`Projections`]({{<apiref "com/mongodb/client/model/Projections.html">}}) methods to build the `$project` stage.
+
+
+```java
+collection.aggregate(
+      Arrays.asList(
+          Aggregates.project(
+              Projections.fields(
+                    Projections.excludeId(),
+                    Projections.include("name"),
+                    Projections.computed(
+                            "firstCategory",
+                            new Document("$arrayElemAt", Arrays.asList("$categories", 0))
+                    )
+              )
+          )
+      )
+).forEach(printBlock);
+```
diff --git a/docs/reference/content/driver/tutorials/authentication.md b/docs/reference/content/driver/tutorials/authentication.md
new file mode 100644
index 00000000000..7858911b925
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/authentication.md
@@ -0,0 +1,449 @@
++++
+date = "2016-05-29T23:27:26-04:00"
+title = "Authentication"
+[menu.main]
+  parent = "Connect to MongoDB"
+  identifier = "Authentication"
+  weight = 20
+  pre = "<i class='fa'></i>"
++++
+
+## Authentication
+
+The Java driver supports all [MongoDB authentication mechanisms]({{<docsref "core/authentication/">}}), including those only available in the
+[MongoDB Enterprise Edition]({{<docsref "administration/install-enterprise/">}}).
+
+## `MongoCredential`
+
+```java
+import com.mongodb.MongoCredential;
+```
+
+New MongoClient API (since 3.7):
+
+```java
+import com.mongodb.ConnectionString;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+```
+
+Legacy MongoClient API:
+
+```java
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+```
+
+An authentication credential is represented as an instance of the
+[`MongoCredential`]({{<apiref "com/mongodb/MongoCredential.html">}}) class. The [`MongoCredential`]({{<apiref "com/mongodb/MongoCredential.html">}}) class includes static
+factory methods for each of the supported authentication mechanisms.
+
+You can also use a [`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}) and pass it to a 
+[`MongoClient()`]({{< apiref "com/mongodb/MongoClient.html">}}) constructor that takes a `MongoClientURI` parameter.
+
+## Default Authentication Mechanism
+
+In MongoDB 3.0, MongoDB changed the default authentication mechanism from [`MONGODB-CR`]({{<docsref "core/security-mongodb-cr">}}) to
+[`SCRAM-SHA-1`]({{<docsref "core/security-scram">}}). In MongoDB 4.0 support for the deprecated
+[`MONGODB-CR`]({{<docsref "core/security-mongodb-cr">}}) mechanism was removed and
+[`SCRAM-SHA-256`]({{<docsref "core/security-scram">}}) support was added.
+
+
+To create a credential that will authenticate using the default
+authentication mechanism regardless of server version, create a
+credential using the [`createCredential`]({{<apiref "com/mongodb/MongoCredential.html#createCredential(java.lang.String,java.lang.String,char[])">}})
+static factory method:
+
+```java
+String user;     // the user name
+String source;   // the source where the user is defined
+char[] password; // the password as a character array
+// ...
+MongoCredential credential = MongoCredential.createCredential(user, source, password);
+```
+
+and then construct a MongoClient with that credential.  Using the new (since 3.7) MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder -> 
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017), credential);
+```
+
+Or use a connection string without explicitly specifying the authentication mechanism. Using the new MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1");
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1");
+MongoClient mongoClient = new MongoClient(uri);
+```
+
+For challenge and response mechanisms, using the default authentication mechanism is the recommended approach as it will make upgrading
+from MongoDB 2.6 to MongoDB 3.0 seamless, even after [upgrading the authentication schema]({{<docsref "release-notes/3.0-scram/">}}).
+For MongoDB 4.0 users it is also recommended as the supported authentication mechanisms are checked and the correct hashing algorithm is
+used.
+
+## SCRAM
+
+Salted Challenge Response Authentication Mechanism (`SCRAM`) has been the default authentication mechanism for MongoDB since 3.0. `SCRAM` is
+based on the [IETF RFC 5802](https://tools.ietf.org/html/rfc5802) standard that defines best practices for implementation of
+challenge-response mechanisms for authenticating users with passwords.
+
+MongoDB 3.0 introduced support for `SCRAM-SHA-1` which uses the `SHA-1` hashing function. MongoDB 4.0 introduced support for `SCRAM-SHA-256`
+which uses the `SHA-256` hashing function.
+
+### SCRAM-SHA-256
+
+Requires MongoDB 4.0 and `featureCompatibilityVersion` to be set to 4.0.
+
+To explicitly create a credential of type [`SCRAM-SHA-256`]({{<docsref "core/security-scram/">}}), use the
+[`createScramSha256Credential`]({{<apiref "com/mongodb/MongoCredential.html#createScramSha256Credential(java.lang.String,java.lang.String,char[])">}})
+method:
+
+```java
+String user;     // the user name
+String source;   // the source where the user is defined
+char[] password; // the password as a character array
+// ...
+MongoCredential credential = MongoCredential.createScramSha256Credential(user, source, password);
+```
+
+and then construct a MongoClient with that credential.  Using the new (since 3.7) MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder ->
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017), credential);
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=SCRAM-SHA-256`. Using the new MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-256");
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-256");
+MongoClient mongoClient = new MongoClient(uri);
+```
+
+
+### SCRAM-SHA-1
+
+To explicitly create a credential of type [`SCRAM-SHA-1`]({{<docsref "core/security-scram/">}}), use the 
+[`createScramSha1Credential`]({{<apiref "com/mongodb/MongoCredential.html#createScramSha1Credential(java.lang.String,java.lang.String,char[])">}}) 
+method:
+
+```java
+String user;     // the user name
+String source;   // the source where the user is defined
+char[] password; // the password as a character array
+// ...
+MongoCredential credential = MongoCredential.createScramSha1Credential(user, source, password);
+```
+
+and then construct a MongoClient with that credential.  Using the new (since 3.7) MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder -> 
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017), credential);
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=SCRAM-SHA-1`. Using the new MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-1");
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-1");
+MongoClient mongoClient = new MongoClient(uri);
+```
+
+## MONGODB-CR
+
+{{% note class="important" %}}
+Starting in version 4.0, MongoDB removes support for the deprecated MongoDB Challenge-Response (`MONGODB-CR`) authentication mechanism.
+
+If your deployment has user credentials stored in `MONGODB-CR` schema, you must upgrade to `SCRAM` before you upgrade to version 4.0.
+For information on upgrading to `SCRAM`, see Upgrade to [SCRAM]({{<docsref "release-notes/3.0-scram/">}}).
+{{% /note %}}
+
+
+To explicitly create a credential of type [`MONGODB-CR`]({{<docsref "core/security-mongodb-cr">}}) use the [`createMongCRCredential`]({{<apiref "com/mongodb/MongoCredential.html#createMongoCRCredential(java.lang.String,java.lang.String,char[])">}})
+static factory method:
+
+```java
+String user; // the user name
+String database; // the name of the database in which the user is defined
+char[] password; // the password as a character array
+// ...
+MongoCredential credential = MongoCredential.createMongoCRCredential(user, database, password);
+```
+
+and then construct a MongoClient with that credential.  Using the new (since 3.7) MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder -> 
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017), credential);
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=MONGODB-CR`. Using the new MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=MONGODB-CR");
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=MONGODB-CR");
+MongoClient mongoClient = new MongoClient(uri);
+```
+
+{{% note %}}
+After the [authentication schema upgrade]({{<docsref "release-notes/3.0-scram/">}}) from MONGODB-CR to SCRAM,
+MONGODB-CR credentials will fail to authenticate.
+{{% /note %}}
+
+## X.509
+
+With [X.509]({{<docsref "core/security-x.509">}}) mechanism, MongoDB uses the
+X.509 certificate presented during SSL negotiation to
+authenticate a user whose name is derived from the distinguished name
+of the X.509 certificate.
+
+X.509 authentication requires the use of SSL connections with
+certificate validation and is available in MongoDB 2.6 and later. To
+create a credential of this type use the
+[`createMongoX509Credential`]({{<apiref "com/mongodb/MongoCredential.html#createMongoX509Credential(java.lang.String)">}}) static factory method:
+
+```java
+String user;     // The X.509 certificate derived user name, e.g. "CN=user,OU=OrgUnit,O=myOrg,..."
+// ...
+MongoCredential credential = MongoCredential.createMongoX509Credential(user);
+MongoClientOptions options = MongoClientOptions.builder().sslEnabled(true).build();
+```
+
+and then construct a MongoClient with that credential.  Using the new (since 3.7) MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder -> 
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017), credential, options);
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=MONGODB-X509`. Using the new MongoClient API:
+                                                                                      
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://subjectName@host1/?authMechanism=MONGODB-X509&ssl=true");
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://subjectName@host1/?authMechanism=MONGODB-X509&ssl=true");
+MongoClient mongoClient = new MongoClient(uri);
+```
+
+See the MongoDB server [x.509 tutorial]({{<apiref "tutorial/configure-x509-client-authentication/#add-x-509-certificate-subject-as-a-user">}})
+for more information about determining the subject
+name from the certificate.
+
+## Kerberos (GSSAPI) {#gssapi}
+
+[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy
+authentication through Kerberos service. To create a credential of type
+[Kerberos (GSSAPI)]({{<apiref "core/authentication/#kerberos-authentication">}}), use the
+[`createGSSAPICredential`]({{<apiref "com/mongodb/MongoCredential.html#createGSSAPICredential(java.lang.String)">}})
+static factory method:
+
+```java
+String user;   // The Kerberos user name, including the realm, e.g. "user1@MYREALM.ME"
+// ...
+MongoCredential credential = MongoCredential.createGSSAPICredential(user);
+```
+
+and then construct a MongoClient with that credential.  Using the new (since 3.7) MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder -> 
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017), credential);
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=GSSAPI`. Using the new MongoClient API:
+                                                                                      
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://username%40REALM.ME@host1/?authMechanism=GSSAPI");
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://username%40REALM.ME@host1/?authMechanism=GSSAPI");
+```
+{{%note%}}
+
+The method refers to the `GSSAPI` authentication mechanism instead
+of `Kerberos` because technically the driver authenticates via
+the [`GSSAPI`](https://tools.ietf.org/html/rfc4752) SASL mechanism.
+
+{{%/note%}}
+
+To successfully authenticate via Kerberos, the application typically
+must specify several system properties so that the underlying GSSAPI
+Java libraries can acquire a Kerberos ticket:
+
+```java
+java.security.krb5.realm=MYREALM.ME
+java.security.krb5.kdc=mykdc.myrealm.me
+```
+
+Depending on the Kerberos setup, additional property specifications may be required, either via the application code or, in some cases, the [withMechanismProperty()]({{<apiref "com/mongodb/MongoCredential.html#withMechanismProperty(java.lang.String,T)">}}) method of the `MongoCredential` instance:
+
+- **[`SERVICE_NAME`]({{< apiref "com/mongodb/MongoCredential.html#SERVICE_NAME_KEY" >}})**
+
+
+- **[`CANONICALIZE_HOST_NAME`]({{< apiref "com/mongodb/MongoCredential.html#CANONICALIZE_HOST_NAME_KEY" >}})**
+
+
+- **[`JAVA_SUBJECT`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SUBJECT_KEY" >}})**
+
+- **[`JAVA_SASL_CLIENT_PROPERTIES`]({{< apiref "com/mongodb/MongoCredential.html#JAVA_SASL_CLIENT_PROPERTIES_KEY" >}})**
+
+For example, to specify the `SERVICE_NAME` property via the `MongoCredential` object:
+
+
+```java
+credential = credential.withMechanismProperty(MongoCredential.SERVICE_NAME_KEY, "othername");
+```
+
+Or via the `ConnectionString`:
+
+```
+mongodb://username%40MYREALM.com@myserver/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:othername
+```
+
+{{% note %}}
+On Windows, Oracle's JRE uses [LSA](https://msdn.microsoft.com/en-us/library/windows/desktop/aa378326.aspx) rather than 
+[SSPI](https://msdn.microsoft.com/en-us/library/windows/desktop/aa380493.aspx) in its implementation of GSSAPI, which limits
+interoperability with Windows Active Directory and in particular the ability to implement single sign-on. 
+
+- [JDK-8054026](https://bugs.openjdk.java.net/browse/JDK-8054026) 
+- [JDK-6722928](https://bugs.openjdk.java.net/browse/JDK-6722928) 
+- [SO 23427343](https://stackoverflow.com/questions/23427343/cannot-retrieve-tgt-despite-allowtgtsessionkey-registry-entry)    
+{{% /note %}}
+
+
+## LDAP (PLAIN)
+
+[MongoDB Enterprise](http://www.mongodb.com/products/mongodb-enterprise) supports proxy authentication through a Lightweight Directory Access Protocol (LDAP) service. To create a credential of type [LDAP]({{<apiref "core/authentication/#ldap-proxy-authority-authentication">}}) use the
+[`createPlainCredential`]({{<apiref "com/mongodb/MongoCredential.html#createPlainCredential(java.lang.String,java.lang.String,char[])">}}) static factory method:
+
+```java
+String user;          // The LDAP user name
+char[] password;      // The LDAP password
+// ...
+MongoCredential credential = MongoCredential.createPlainCredential(user, "$external", password);
+```
+
+and then construct a MongoClient with that credential.  Using the new (since 3.7) MongoClient API:
+
+```java
+MongoClient mongoClient = MongoClients.create(
+        MongoClientSettings.builder()
+                .applyToClusterSettings(builder -> 
+                        builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+                .credential(credential)
+                .build());
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017), credential);
+```
+
+Or use a connection string that explicitly specifies the `authMechanism=PLAIN`.  Using the new MongoClient API:
+                                                                                      
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://user1@host1/?authSource=$external&authMechanism=PLAIN");
+```
+
+or using the legacy MongoClient API:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://user1@host1/?authSource=$external&authMechanism=PLAIN");
+```
+
+{{%note%}}
+The method refers to the `plain` authentication mechanism instead
+of `LDAP` because technically the driver authenticates via the
+[`PLAIN`](https://www.ietf.org/rfc/rfc4616.txt) SASL mechanism.
+{{%/note%}}
diff --git a/docs/reference/content/driver/tutorials/bulk-writes.md b/docs/reference/content/driver/tutorials/bulk-writes.md
new file mode 100644
index 00000000000..920a0d1110d
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/bulk-writes.md
@@ -0,0 +1,53 @@
++++
+date = "2016-05-29T12:47:54-04:00"
+title = "Bulk Writes"
+[menu.main]
+  parent = "Perform Write Operations"
+  identifier = "Bulk Writes"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+## Bulk operations
+
+
+Starting in version 2.6, MongoDB servers support bulk write commands for insert, update, and delete in a way that allows the driver to implement the correct semantics for BulkWriteResult and BulkWriteException.
+
+There are two types of bulk operations, ordered and unordered bulk operations.
+
+1. Ordered bulk operations execute all the operation in order and error out on the first write error.
+
+2. Unordered bulk operations execute all the operations and report any the errors. Unordered bulk operations do not guarantee order of execution.
+
+The following code provide examples using ordered and unordered
+operations:
+
+```java
+// 1. Ordered bulk operation - order is guaranteed
+collection.bulkWrite(
+  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
+                new InsertOneModel<>(new Document("_id", 5)),
+                new InsertOneModel<>(new Document("_id", 6)),
+                new UpdateOneModel<>(new Document("_id", 1),
+                                     new Document("$set", new Document("x", 2))),
+                new DeleteOneModel<>(new Document("_id", 2)),
+                new ReplaceOneModel<>(new Document("_id", 3),
+                                      new Document("_id", 3).append("x", 4))));
+
+
+ // 2. Unordered bulk operation - no guarantee of order of operation
+collection.bulkWrite(
+  Arrays.asList(new InsertOneModel<>(new Document("_id", 4)),
+                new InsertOneModel<>(new Document("_id", 5)),
+                new InsertOneModel<>(new Document("_id", 6)),
+                new UpdateOneModel<>(new Document("_id", 1),
+                                     new Document("$set", new Document("x", 2))),
+                new DeleteOneModel<>(new Document("_id", 2)),
+                new ReplaceOneModel<>(new Document("_id", 3),
+                                      new Document("_id", 3).append("x", 4))),
+  new BulkWriteOptions().ordered(false));
+```
+
+{{% note class="important" %}}
+Use of the bulkWrite methods is not recommended when connected to pre-2.6 MongoDB servers. Although these methods will work for pre-2.6 servers, performance will suffer as each write operation executes one at a time.
+{{% /note %}}
diff --git a/docs/reference/content/driver/tutorials/change-streams.md b/docs/reference/content/driver/tutorials/change-streams.md
new file mode 100644
index 00000000000..15d0a42328f
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/change-streams.md
@@ -0,0 +1,115 @@
++++
+date = "2017-08-15T14:19:24-04:00"
+title = "Change Streams"
+[menu.main]
+  parent = "Sync Tutorials"
+  identifier = "Change Streams"
+  weight = 51
+  pre = "<i class='fa'></i>"
++++
+
+## Change Streams
+
+MongoDB 3.6 introduces a new [`$changeStream`](http://dochub.mongodb.org/core/changestreams) aggregation pipeline
+operator.
+
+Change streams provide a way to watch changes to documents in a collection. To improve the usability of this new stage, the 
+`MongoCollection` API includes a new `watch` method. The `ChangeStreamIterable` sets up the change stream and automatically attempts 
+to resume if it encounters a potentially recoverable error.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+import com.mongodb.ConnectionString;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import org.bson.Document;
+```
+
+- Include the following code which the examples in the tutorials will use to print the results of the change stream:
+
+```java
+Block<ChangeStreamDocument<Document>> printBlock = new Block<>() {
+    @Override
+    public void apply(final ChangeStreamDocument<Document> changeStreamDocument) {
+        System.out.println(changeStreamDocument);
+    }
+};
+```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instance.
+
+For example, include the following code to connect to a replicaSet MongoDB deployment running on localhost on ports `27017`, `27018` and `27019`. 
+It also defines `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection.
+
+```java
+MongoClient mongoClient = MongoClients.create(new ConnectionString("mongodb://localhost:27017,localhost:27018,localhost:27019"));
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Watch the collection
+
+To create a change stream use one of the [`MongoCollection.watch()`]({{<apiref "com/mongodb/client/MongoCollection.html#watch">}}) methods.
+
+In the following example, the change stream prints out all changes it observes.
+
+```java
+collection.watch().forEach(printBlock);
+```
+
+## Watch the database
+
+New in the 3.8 driver and MongoDB 4.0, applications can open a single change stream to watch all non-system collections of a database. To
+create such a change stream use one of the [`MongoDatabase.watch()`]({{<apiref "com/mongodb/client/MongoDatabase.html#watch">}}) methods.
+
+In the following example, the change stream prints out all the changes it observes on the given database.
+
+```java
+database.watch().forEach(printBlock);
+```
+
+## Watch all databases
+
+New in the 3.8 driver and MongoDB 4.0, applications can open a single change stream to watch all non-system collections of all databases 
+in a MongoDB deployment. To create such a change stream use one of the 
+[`MongoClient.watch()`]({{<apiref "com/mongodb/client/MongoClient.html#watch">}}) methods.
+
+In the following example, the change stream prints out all the changes it observes on the deployement to which the `MongoClient` is
+connected
+
+```java
+mongoClient.watch().forEach(printBlock);
+```
+
+## Filtering content
+
+The `watch` method can also be passed a list of [aggregation stages]({{< docsref "meta/aggregation-quick-reference" >}}), that can modify 
+the data returned by the `$changeStream` operator. Note: not all aggregation operators are supported. See the 
+[`$changeStream`](http://dochub.mongodb.org/core/changestreams) documentation for more information.
+
+In the following example the change stream prints out all changes it observes, for `insert`, `update`, `replace` and `delete` operations:
+
+- First it uses a [`$match`]({{< docsref "reference/operator/aggregation/match/" >}}) stage to filter for documents where the `operationType` 
+is either an `insert`, `update`, `replace` or `delete`.
+
+- Then, it sets the `fullDocument` to [`FullDocument.UPDATE_LOOKUP`]({{<apiref "com/mongodb/client/model/FullDocument.html#UPDATE_LOOKUP">}}),
+so that the document after the update is included in the results.
+
+```java
+collection.watch(asList(Aggregates.match(Filters.in("operationType", asList("insert", "update", "replace", "delete")))))
+        .fullDocument(FullDocument.UPDATE_LOOKUP).forEach(printBlock);
+```
diff --git a/docs/reference/content/driver/tutorials/client-side-encryption.md b/docs/reference/content/driver/tutorials/client-side-encryption.md
new file mode 100644
index 00000000000..b821e93ea04
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/client-side-encryption.md
@@ -0,0 +1,160 @@
++++
+date = "2019-06-13T09:00:01+01:00"
+title = "Client Side Encryption"
+[menu.main]
+  parent = "Sync Tutorials"
+  identifier = "Sync Client Side Encryption"
+  weight = 16
+  pre = "<i class='fa fa-lock'></i>"
++++
+
+# Client Side Encryption
+
+New in MongoDB 4.2 client side encryption allows administrators and developers to encrypt specific data fields in addition to other
+MongoDB encryption features.
+
+With field level encryption, developers can encrypt fields client side without any server-side 
+configuration or directives. Client-side field level encryption supports workloads where applications must guarantee that 
+unauthorized parties, including server administrators, cannot read the encrypted data.
+
+## Installation
+
+The recommended way to get started using field level encryption in your project is with a dependency management system. 
+Field level encryption requires additional packages to be installed as well as the driver itself.  
+See the [installation]({{< relref "driver/getting-started/installation.md" >}}) for instructions on how to install the MongoDB driver. 
+
+{{< distroPicker >}}
+
+### libmongocrypt
+
+There is a separate jar file containing`libmongocrypt` bindings.
+
+{{< install artifactId="mongodb-crypt" version="1.0.0">}}
+
+### mongocryptd configuration
+
+`libmongocrypt` requires the `mongocryptd` daemon / process to be running. A specific daemon / process uri can be configured in the 
+`AutoEncryptionSettings` class by setting `mongocryptdURI` in the `extraOptions`.
+
+More information about mongocryptd will soon be available from the official documentation.
+
+
+### Examples
+
+The following is a sample app that assumes the **key** and **schema** have already been created in MongoDB. The example uses a local key,
+however using AWS Key Management Service is also an option. The data in the `encryptedField` field is automatically encrypted on the
+insert and decrypted when using find on the client side. The following code snippet comes from the 
+[`ClientSideEncryptionSimpleTour.java`]({{< srcref "driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java">}}) example code
+that can be found with the driver source on github:
+
+```java
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import org.bson.Document;
+
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClientSideEncryptionSimpleTour {
+
+    public static void main(final String[] args) {
+
+        // This would have to be the same master key as was used to create the encryption key
+        final byte[] localMasterKey = new byte[96];
+        new SecureRandom().nextBytes(localMasterKey);
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
+           put("local", new HashMap<String, Object>() {{
+               put("key", localMasterKey);
+           }});
+        }};
+
+        String keyVaultNamespace = "admin.datakeys";
+
+        AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .build();
+
+        MongoClientSettings clientSettings = MongoClientSettings.builder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+
+        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoCollection<Document> collection = mongoClient.getDatabase("test").getCollection("coll");
+        collection.drop(); // Clear old data
+
+        collection.insertOne(new Document("encryptedField", "123456789"));
+
+        System.out.println(collection.find().first().toJson());
+    }
+}
+```
+
+{{% note %}}
+Auto encryption is an **enterprise** only feature.
+{{% /note %}}
+
+The following example shows how to configure the `AutoEncryptionSettings` instance to create a new key and setting the json schema map.
+The full code snippet can be found in 
+[`ClientSideEncryptionAutoEncryptionSettingsTour.java`]({{< srcref "driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java">}}):
+
+```java
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.ConnectionString;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+
+import java.util.Base64;
+
+...
+
+String keyVaultNamespace = "admin.datakeys";
+ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
+        .keyVaultMongoClientSettings(MongoClientSettings.builder()
+                .applyConnectionString(new ConnectionString("mongodb://localhost"))
+                .build())
+        .keyVaultNamespace(keyVaultNamespace)
+        .kmsProviders(kmsProviders)
+        .build();
+
+ClientEncryption clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+BsonBinary dataKeyId = clientEncryption.createDataKey("local", new DataKeyOptions());
+final String base64DataKeyId = Base64.getEncoder().encodeToString(dataKeyId.getData());
+
+final String dbName = "test";
+final String collName = "coll";
+AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+        .keyVaultNamespace(keyVaultNamespace)
+        .kmsProviders(kmsProviders)
+        .schemaMap(new HashMap<String, BsonDocument>() {{
+            put(dbName + "." + collName,
+                    // Need a schema that references the new data key
+                    BsonDocument.parse("{"
+                            + "  properties: {"
+                            + "    encryptedField: {"
+                            + "      encrypt: {"
+                            + "        keyId: [{"
+                            + "          \"$binary\": {"
+                            + "            \"base64\": \"" + base64DataKeyId + "\","
+                            + "            \"subType\": \"04\""
+                            + "          }"
+                            + "        }],"
+                            + "        bsonType: \"string\","
+                            + "        algorithm: \"AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic\""
+                            + "      }"
+                            + "    }"
+                            + "  },"
+                            + "  \"bsonType\": \"object\""
+                            + "}"));
+        }}).build();
+```
+
+**Coming soon:** An example using the community version and demonstrating explicit encryption/decryption.
diff --git a/docs/reference/content/driver/tutorials/commands.md b/docs/reference/content/driver/tutorials/commands.md
new file mode 100644
index 00000000000..0e5dde1d985
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/commands.md
@@ -0,0 +1,56 @@
++++
+date = "2016-05-31T13:07:04-04:00"
+title = "Run Commands"
+[menu.main]
+parent = "Sync Tutorials"
+identifier = "Run Commands"
+weight = 90
+pre = "<i class='fa'></i>"
++++
+
+## Run Commands
+
+Not all commands have a specific helper. However you can run any [MongoDB command]({{<docsref "reference/command">}}) by using the MongoDatabase's [`runCommand()`]({{<apiref "com/mongodb/client/MongoDatabase.html#runCommand(org.bson.conversions.Bson,com.mongodb.ReadPreference)">}}) method.
+
+## Prerequisites
+
+- The example below requires a `restaurants` collection in the `test` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.client.MongoClients;
+     import com.mongodb.client.MongoClient;
+     import com.mongodb.client.MongoDatabase;
+     import org.bson.Document;
+     ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Run `buildInfo` and `collStats` Commands
+
+To run a command, construct a [`Document`]({{< apiref "org/bson/Document.html" >}})
+object that specifies the command and pass it to the `runCommand()` method.
+
+The following runs the [`buildInfo`]({{<docsref "reference/command/buildInfo">}}) command and the [`collStats`]({{<docsref "reference/command/collStats">}}) command:
+
+```java
+Document buildInfoResults = database.runCommand(new Document("buildInfo", 1));
+System.out.println(buildInfoResults.toJson());
+
+Document collStatsResults = database.runCommand(new Document("collStats", "restaurants"));
+System.out.println(collStatsResults.toJson());
+```
+
+For a list of available MongoDB commands, see [MongoDB commands]({{<docsref "reference/command">}}).
diff --git a/docs/reference/content/driver/tutorials/compression.md b/docs/reference/content/driver/tutorials/compression.md
new file mode 100644
index 00000000000..7d5deb10053
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/compression.md
@@ -0,0 +1,122 @@
++++
+date = "2017-06-16T22:05:03-04:00"
+title = "Compression"
+[menu.main]
+  parent = "Connect to MongoDB"
+  identifier = "Compression"
+  weight = 25
+  pre = "<i class='fa'></i>"
++++
+
+## Compression
+
+The Java driver supports compression of messages to and from MongoDB servers.  The driver implements the three algorithms that are 
+supported by MongoDB servers:
+
+* [Snappy](https://google.github.io/snappy/): Snappy compression can be used when connecting to MongoDB servers starting with the 3.4 
+release.
+* [Zlib](https://zlib.net/): Zlib compression can be used when connecting to MongoDB servers starting with the 3.6 release.
+* [Zstandard](https://github.com/facebook/zstd/): Zstandard compression can be used when connecting to MongoDB servers starting with the 4.2 release.
+
+The driver will negotiate which, if any, compression algorithm is used based on capabilities advertised by the server in
+the [ismaster]({{<docsref "reference/command/isMaster/">}}) command response. 
+
+### Specify compression via `MongoClientURI`
+
+```java
+import com.mongodb.ConnectionString;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+```
+
+To specify compression with [`MongoClientURI`]({{<apiref "com/mongodb/MongoClientURI">}}), specify `compressors` as part of the connection
+string, as in:
+
+```java
+ConnectionString connectionString = new ConnectionString("mongodb://localhost/?compressors=snappy");
+MongoClient mongoClient = MongoClients.create(connectionString);
+```
+
+for Snappy compression, or
+
+```java
+ConnectionString connectionString = new ConnectionString("mongodb://localhost/?compressors=zlib");
+MongoClient mongoClient = MongoClients.create(connectionString);
+```
+
+for zlib compression, or 
+
+```java
+ConnectionString connectionString = new ConnectionString("mongodb://localhost/?compressors=zstd");
+MongoClient mongoClient = MongoClients.create(connectionString);
+```
+
+for Zstandard compression, or 
+
+```java
+ConnectionString connectionString = new ConnectionString("mongodb://localhost/?compressors=snappy,zlib,zstd");
+MongoClient mongoClient = MongoClients.create(connectionString);
+```
+
+to configure multiple compressors. 
+
+In all cases the driver will use the first compressor in the list for which the server advertises support. 
+
+### Specify compression via `MongoClientOptions`
+
+```java
+import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoCompressor;
+import java.util.Arrays;
+```
+
+To specify compression with [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings">}}), set the `compressors` property 
+to a list of `MongoCompressor` instances:
+
+```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .compressorList(Arrays.asList(MongoCompressor.createSnappyCompressor()))
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+for Snappy compression, or
+
+```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .compressorList(Arrays.asList(MongoCompressor.createZlibCompressor()))
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+for zlib compression, or
+
+```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .compressorList(Arrays.asList(MongoCompressor.createZstdCompressor()))
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+for Zstandard compression, or
+
+```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .compressorList(Arrays.asList(MongoCompressor.createSnappyCompressor(),
+                                      MongoCompressor.createZlibCompressor(),
+                                      MongoCompressor.createZstdCompressor()))
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+to configure multiple compressors. 
+
+As with configuration with a URI, the driver will use the first compressor in the list for which the server advertises support. 
+
+### Dependencies
+
+As the JDK has no built-in support for Snappy or Zstandard, the driver takes a dependency on existing open-source Snappy and Zstandard implementations.  See the
+[snappy-java Github repository](https://github.com/xerial/snappy-java) and the
+[zstd-java Github repository](https://github.com/luben/zstd-jni) for details.
+
+ 
\ No newline at end of file
diff --git a/docs/reference/content/driver/tutorials/connect-to-mongodb.md b/docs/reference/content/driver/tutorials/connect-to-mongodb.md
new file mode 100644
index 00000000000..7ab78aa4cb8
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/connect-to-mongodb.md
@@ -0,0 +1,386 @@
++++
+date = "2016-05-29T13:26:13-04:00"
+title = "Connect to MongoDB"
+[menu.main]
+  parent = "Sync Tutorials"
+  identifier = "Connect to MongoDB"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+## Connect to MongoDB
+
+Use [`MongoClients.create()`]({{< apiref "com/mongodb/client/MongoClients.html">}}) (as of the 3.7 release), or 
+[`MongoClient()`]({{< apiref "com/mongodb/MongoClient .html">}}) for the legacy MongoClient API, to make a connection to a running MongoDB instance.
+
+{{% note class="important" %}}
+The following examples are not meant to provide an exhaustive list
+of ways to instantiate `MongoClient`. For a complete list of MongoClients factory methods, see the 
+[`MongoClients API documentation`]({{< apiref "com/mongodb/client/MongoClient.html">}}), or for the legacy MongoClient API see 
+the [`MongoClient() API documentation`]({{< apiref "com/mongodb/MongoClient.html">}}).
+
+{{% /note %}}
+
+{{% note %}}
+The 3.5 release deprecated socket keep-alive settings, also socket keep-alive checks are now on by default.
+It is *strongly recommended* that system keep-alive settings should be configured with shorter timeouts. 
+
+See the 
+['does TCP keep-alive time affect MongoDB deployments?']({{<docsref "/faq/diagnostics/#does-tcp-keepalive-time-affect-mongodb-deployments">}}) 
+documentation for more information.
+{{% /note %}}
+
+## Prerequisites
+
+- Running MongoDB deployments to which to connect. For example, to connect to a standalone, you must have a running standalone.
+
+- The MongoDB Driver.  See [Installation]({{< relref "driver/getting-started/installation.md" >}}) for instructions on how to install the MongoDB driver.
+
+- The following import statements:
+
+```java
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ConnectionString;
+import com.mongodb.ServerAddress;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoClientOptions;
+
+import java.util.Arrays;
+```
+
+or for the legacy MongoClient API:
+
+```java
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+import com.mongodb.ServerAddress;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoClientOptions;
+
+import java.util.Arrays;
+```
+
+## `MongoClient` (since 3.7 release)
+
+A [`MongoClient`]({{< apiref "com/mongodb/client/MongoClient.html">}}) instance represents a pool of connections
+to the database; you will only need one instance of class `MongoClient` even with multiple threads.
+
+{{% note class="important" %}}
+
+Typically you only create one `MongoClient` instance for a given MongoDB deployment (e.g. standalone, replica set, or a sharded cluster)
+ and use it across your application. However, if you do create multiple instances:
+
+ - All resource usage limits (e.g. max connections, etc.) apply per `MongoClient` instance.
+
+ - To dispose of an instance, call `MongoClient.close()` to clean up resources.
+{{% /note %}}
+
+## Connect to a Standalone MongoDB Instance
+
+To connect to a standalone MongoDB instance:
+
+- You can create a `MongoClient` object without any parameters to
+  connect to a MongoDB instance running on localhost on port `27017`:
+
+```java
+    MongoClient mongoClient = MongoClients.create()
+```
+
+- You can explicitly specify the hostname to connect to a MongoDB
+  instance running on the specified host on port `27017`:
+
+```java
+    MongoClient mongoClient = MongoClients.create("mongodb://host1");
+```
+
+- You can explicitly specify the hostname and the port:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create("mongodb://host1:27017");
+    ```
+
+## Connect to a Replica Set
+
+To connect to a [replica set]({{<docsref "replication/">}}), you must specify one or more members to the `MongoClients` create method.
+
+{{% note %}}
+MongoDB will auto-discover the primary and the secondaries.
+{{% /note %}}
+
+- You can specify the members using a [`ConnectionString`]({{< apiref "/com/mongodb/ConnectionString.html">}}):
+
+  - To specify at least two members of the replica set:
+
+```java
+    MongoClient mongoClient = MongoClients.create("mongodb://host1:27017,host2:27017,host3:27017");
+```
+
+  - With at least one member of the replica set and the `replicaSet` option specifying the replica set name:
+
+```java
+    MongoClient mongoClient = MongoClients.create("mongodb://host1:27017,host2:27017,host3:27017/?replicaSet=myReplicaSet");
+```
+
+- You can specify a list of the all the replica set members' [`ServerAddress`]({{<apiref "com/mongodb/ServerAddress.html">}}):
+
+```java
+    MongoClient mongoClient = MongoClients.create(
+            MongoClientSettings.builder()
+                    .applyToClusterSettings(builder ->
+                            builder.hosts(Arrays.asList(
+                                    new ServerAddress("host1", 27017),
+                                    new ServerAddress("host2", 27017),
+                                    new ServerAddress("host3", 27017))))
+                    .build());
+```
+
+
+## Connect to a Sharded Cluster
+
+To connect to a [sharded cluster]({{<docsref "sharding/">}}), specify the `mongos` instance
+or instances to a `MongoClients` create method.
+
+To connect to a single `mongos` instance:
+
+- You can specify the hostname and the port in a [`ConnectionString`]({{< apiref "/com/mongodb/ConnectionString.html">}})
+
+```java
+    MongoClient mongoClient = MongoClients.create( "mongodb://localhost:27017" );
+```
+
+or leave the connection string out if the `mongos` is running on localhost:27017:
+
+```java
+    MongoClient mongoClient = MongoClients.create();
+```
+
+To connect to multiple `mongos` instances:
+
+- You can specify the [`ConnectionString`]({{< apiref "/com/mongodb/ConnectionString.html">}}) with their hostnames and ports:
+
+    ```java
+    MongoClient mongoClient = MongoClients.create("mongodb://host1:27017,host2:27017");
+    ```
+
+- You can specify a list of the `mongos` instances' [`ServerAddress`]({{ <apiref "com/mongodb/ServerAddress.html">}}):
+
+```java
+    MongoClient mongoClient = MongoClients.create(
+            MongoClientSettings.builder()
+                    .applyToClusterSettings(builder ->
+                            builder.hosts(Arrays.asList(
+                                    new ServerAddress("host1", 27017),
+                                    new ServerAddress("host2", 27017))))
+                    .build());
+```
+
+## Connection Options
+
+You can specify the connection settings using either the
+`ConnectionString` or `MongoClientSettings` or both.
+
+For example, you can specify TLS/SSL and authentication setting in the
+`MongoClientURI` connection string:
+
+```java
+    MongoClient mongoClient = MongoClients.create("mongodb://user1:pwd1@host1/?authSource=db1&ssl=true");
+```
+
+You can also use `MongoClientSettings` to specify TLS/SSL and the `MongoCredential` for the authentication information:
+
+```java
+    String user; // the user name
+    String database; // the name of the database in which the user is defined
+    char[] password; // the password as a character array
+    // ...
+
+    MongoCredential credential = MongoCredential.createCredential(user, database, password);
+
+    MongoClientSettings settings = MongoClientSettings.builder()
+            .credential(credential)
+            .applyToSslSettings(builder -> builder.enabled(true))
+            .applyToClusterSettings(builder -> 
+                builder.hosts(Arrays.asList(new ServerAddress("host1", 27017))))
+            .build();
+
+    MongoClient mongoClient = MongoClients.create(settings);
+```
+
+Finally, in some cases you may need to combine a connection string with programmatic configuration:
+
+```java
+    ConnectionString connectionString = new ConnectionString("mongodb://host1:27107,host2:27017/?ssl=true");
+    CommandListener myCommandListener = ...;
+    MongoClientSettings settings = MongoClientSettings.builder()
+            .addCommandListener(myCommandListener)
+            .applyConnectionString(connectionString)
+            .build();
+
+    MongoClient mongoClient = MongoClients.create(settings);
+```
+
+## `MongoClient` (legacy API)
+
+A [`MongoClient`]({{< apiref "com/mongodb/MongoClient.html">}}) instance represents a pool of connections
+to the database; you will only need one instance of class `MongoClient` even with multiple threads.
+
+{{% note class="important" %}}
+
+ Typically you only create one `MongoClient` instance for a given MongoDB deployment (e.g. standalone, replica set, or a sharded cluster) and use it across your application. However, if you do create multiple instances:
+
+ - All resource usage limits (e.g. max connections, etc.) apply per `MongoClient` instance.
+
+ - To dispose of an instance, call `MongoClient.close()` to clean up resources.
+{{% /note %}}
+
+## Connect to a Standalone MongoDB Instance
+
+To connect to a standalone MongoDB instance:
+
+- You can instantiate a `MongoClient` object without any parameters to
+  connect to a MongoDB instance running on localhost on port `27017`:
+
+    ```java
+    MongoClient mongoClient = new MongoClient();
+    ```
+
+- You can explicitly specify the hostname to connect to a MongoDB
+  instance running on the specified host on port `27017`:
+
+    ```java
+    MongoClient mongoClient = new MongoClient( "host1" );
+    ```
+
+- You can connect to the Unix domain socket (requires the `jnr.unixsocket` library):
+
+    ```java
+    MongoClient mongoClient = new MongoClient( "/tmp/mongodb-27017.sock" );
+    ```
+
+- You can explicitly specify the hostname and the port:
+
+    ```java
+    MongoClient mongoClient = new MongoClient( "host1" , 27017 );
+    ```
+
+- You can specify the
+  [`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}) connection string.
+
+    ```java
+    MongoClient mongoClient = new MongoClient(new MongoClientURI("mongodb://host1:27017"));
+    ```
+
+  Unix domain socket connections via the connection string (requires the `jnr.unixsocket` library and the path to be urlencoded):
+
+  ```java
+  MongoClient mongoClient = new MongoClient(new MongoClientURI("mongodb://%2Ftmp%2Fmongodb-27107.sock"));
+  ```
+
+## Connect to a Replica Set
+
+To connect to a [replica set]({{<docsref "replication/">}}), you must specify  one or more members to the
+`MongoClient` constructor.
+
+{{% note %}}
+MongoDB will auto-discover the primary and the secondaries.
+{{% /note %}}
+
+- You can specify the members using the [`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}) connection string:
+
+  - To specify at least two members of the replica set:
+
+        ```java
+        MongoClient mongoClient = new MongoClient(
+            new MongoClientURI("mongodb://host1:27017,host2:27017,host3:27017"));
+        ```
+
+  - With at least one member of the replica set and the `replicaSet` option:
+
+        ```java
+        MongoClient mongoClient = new MongoClient(
+            new MongoClientURI(
+              "mongodb://host1:27017,host2:27017,host3:27017/?replicaSet=myReplicaSet"));
+        ```
+
+- You can specify a list of the all the replica set members' [`ServerAddress`]({{<apiref "com/mongodb/ServerAddress.html">}}):
+
+    ```java
+    MongoClient mongoClient = new MongoClient(
+    Arrays.asList(new ServerAddress("host1", 27017),
+                  new ServerAddress("host2", 27017),
+                  new ServerAddress("host3", 27017)));
+    ```
+
+
+## Connect to a Sharded Cluster
+
+To connect to a [sharded cluster]({{<docsref "sharding/">}}), specify the `mongos` instance
+or instances to the `MongoClient` constructor.
+
+To connect to a single `mongos` instance:
+
+- You can specify the hostname and the port (or you can omit the
+  parameters if `mongos` is running on `localhost` and port
+  `27017`)
+
+    ```java
+    MongoClient mongoClient = new MongoClient( "localhost" , 27017 );
+    ```
+
+- You can specify the [`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}) connection string:
+
+    ```java
+    MongoClient mongoClient = new MongoClient(new MongoClientURI("mongodb://localhost:27017"));
+    ```
+
+To connect to multiple `mongos` instances:
+
+- You can specify the [`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}) connection string with their hostnames and ports:
+
+    ```java
+    MongoClient mongoClient = new MongoClient(
+       new MongoClientURI("mongodb://host1:27017,host2:27017"));
+    ```
+
+- You can specify a list of the `mongos` instances'
+  [`ServerAddress`]({{ <apiref "com/mongodb/ServerAddress.html">}}):
+
+    ```java
+    MongoClient mongoClient = new MongoClient(
+       Arrays.asList(new ServerAddress("host1", 27017),
+                     new ServerAddress("host2", 27017)));
+    ```
+
+## Connection Options
+
+You can specify the connection settings using either the
+`MongoClientURI` or `MongoClientOptions` or both.
+
+For example, you can specify TLS/SSL and authentication setting in the
+`MongoClientURI` connection string:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&ssl=true");
+MongoClient mongoClient = new MongoClient(uri);
+```
+
+You can also use `MongoClientOptions` to specify TLS/SSL and the
+`MongoCredential` for the authentication information:
+
+```java
+
+ String user; // the user name
+ String database; // the name of the database in which the user is defined
+ char[] password; // the password as a character array
+ // ...
+
+ MongoCredential credential = MongoCredential.createCredential(user, database, password);
+
+ MongoClientOptions options = MongoClientOptions.builder().sslEnabled(true).build();
+
+ MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017),
+                                           Arrays.asList(credential),
+                                           options);
+```
diff --git a/docs/reference/content/driver/tutorials/databases-collections.md b/docs/reference/content/driver/tutorials/databases-collections.md
new file mode 100644
index 00000000000..9ce3049ed9b
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/databases-collections.md
@@ -0,0 +1,211 @@
++++
+date = "2016-05-31T13:40:45-04:00"
+title = "Databases and Collections"
+[menu.main]
+parent = "Sync Tutorials"
+identifier = "Databases and Collections"
+weight = 11
+pre = "<i class='fa'></i>"
++++
+## Databases and Collections
+
+MongoDB stores documents in collections; the collections in databases.
+
+## Prerequisites
+
+- Include following import statements:
+
+    ```java
+    import com.mongodb.client.MongoClients;
+    import com.mongodb.client.MongoClient;
+    import com.mongodb.client.MongoCollection;
+    import com.mongodb.client.MongoDatabase;
+    import static com.mongodb.client.model.Filters.*;
+    import com.mongodb.client.model.CreateCollectionOptions;
+    import com.mongodb.client.model.ValidationOptions;
+    ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a running MongoDB deployment.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017`.
+
+```java
+MongoClient mongoClient = MongoClients.create();
+```
+
+For more information on connecting to running MongoDB deployments, see
+[Connect to MongoDB]({{< ref "driver/tutorials/connect-to-mongodb.md" >}}).
+
+## Access a Database
+
+Once you have a `MongoClient` instance connected to a MongoDB deployment, use its [`getDatabase()`]({{<apiref "com/mongodb/MongoClient.html#getDatabase(java.lang.String)">}}) method to access a database.
+
+Specify the name of the database to the `getDatabase()` method. If a database does not exist, MongoDB creates the database when you first store data for that database.
+
+The following example accesses the ``test`` database:
+
+```java
+MongoDatabase database = mongoClient.getDatabase("test");
+```
+
+{{% note %}}
+`MongoDatabase` instances are immutable.
+{{% /note %}}
+
+## Access a Collection
+
+Once you have a `MongoDatabase` instance, use its [`getCollection()`]({{< apiref "com/mongodb/client/MongoDatabase.html#getCollection(java.lang.String)">}})
+method to access a collection.
+
+Specify the name of the collection to the `getCollection()` method.
+
+For example, using the `database` instance, the following statement accesses the collection named `myTestCollection`:
+
+```java
+MongoCollection<Document> coll = database.getCollection("myTestCollection");
+```
+
+{{% note %}}
+`MongoCollection` instances are immutable.
+{{% /note %}}
+
+If a collection does not exist, MongoDB creates the collection when you first store data for that collection.
+
+You can also explicitly create a collection with various options, such as setting the maximum size or the documentation validation rules.
+
+## Explicitly Create a Collection
+
+The MongoDB driver provides the [`createCollection()`]({{<apiref "com/mongodb/client/MongoDatabase.html#createCollection(java.lang.String,com.mongodb.client.model.CreateCollectionOptions)">}}) method to explicitly create a collection. When you explicitly create a collection, you can specify various collection options, such as a maximum size or the documentation validation rules, with the [`CreateCollectionOptions`]({{<apiref "com/mongodb/client/model/CreateCollectionOptions.html">}}) class. If you are not specifying these options, you do not need to explicitly create the collection since MongoDB creates new collections when you first store data for the collections.
+
+### Capped Collection
+
+For example, the following operation creates a [capped collection]({{<docsref "core/capped-collections">}}) sized to 1 megabyte:
+
+```java
+database.createCollection("cappedCollection",
+          new CreateCollectionOptions().capped(true).sizeInBytes(0x100000));
+```
+
+### Document Validation
+
+MongoDB provides the capability to [validate documents]({{<docsref "core/document-validation">}}) during updates and insertions. Validation rules are specified on a per-collection basis using the [`ValidationOptions`]({{< apiref "com/mongodb/client/model/ValidationOptions.html">}}), which takes a filter document that specifies the validation rules or expressions.
+
+```java
+ValidationOptions collOptions = new ValidationOptions().validator(
+        Filters.or(Filters.exists("email"), Filters.exists("phone")));
+database.createCollection("contacts",
+        new CreateCollectionOptions().validationOptions(collOptions));
+```
+
+## Get A List of Collections
+
+You can get a list of the collections in a database using the [`MongoDatabase.listCollectionNames()`]({{<apiref "com/mongodb/client/MongoDatabase.html#listCollectionNames()">}}) method:
+
+```java
+for (String name : database.listCollectionNames()) {
+    System.out.println(name);
+}
+```
+
+## Drop a Collection
+
+You can drop a collection by using the [`MongoCollection.drop()`]({{<apiref "com/mongodb/client/MongoCollection.html#drop()">}}) method:
+
+```java
+MongoCollection<Document> collection = database.getCollection("contacts");
+collection.drop();
+```
+
+## Immutability
+
+`MongoDatabase` and `MongoCollection` instances are immutable. To create new instances from existing instances that
+have different property values, such as [read concern]({{<docsref "reference/read-concern">}}), [read preference]({{<docsref "reference/read-preference">}}), and [write concern]({{<docsref "reference/write-concern">}}), the `MongoDatabase` and `MongoCollection` class provides various methods:
+
+- [`MongoDatabase.withReadConcern`]({{<apiref "com/mongodb/client/MongoDatabase.html#withReadConcern(com.mongodb.ReadConcern)">}})
+
+- [`MongoDatabase.withReadPreference`]({{<apiref "com/mongodb/client/MongoDatabase.html#withReadPreference(com.mongodb.ReadPreference)">}})
+
+- [`MongoDatabase.withWriteConcern`]({{<apiref "com/mongodb/client/MongoDatabase.html#withWriteConcern(com.mongodb.WriteConcern)">}})
+
+- [`MongoCollection.withReadConcern`]({{<apiref "com/mongodb/client/MongoCollection.html#withReadConcern(com.mongodb.ReadConcern)">}})
+
+- [`MongoCollection.withReadPreference`]({{<apiref "com/mongodb/client/MongoCollection.html#withReadPreference(com.mongodb.ReadPreference)">}})
+
+- [`MongoCollection.withWriteConcern`]({{<apiref "com/mongodb/client/MongoCollection.html#withWriteConcern(com.mongodb.WriteConcern)">}})
+
+For details, see [Read Operations]({{< relref  "driver/tutorials/perform-read-operations.md" >}}) and [Write Operations]({{< relref  "driver/tutorials/perform-write-operations.md" >}}).
+
+## CodecRegistry
+
+An overload of the `getCollection` method allows clients to specify a different class for representing BSON documents.  For example,
+users of the legacy CRUD API from the 2.x driver series may wish to continue using `BasicDBObject` in order to ease the transition to the new
+CRUD API:
+
+```java
+// Pass BasicDBObject.class as the second argument
+MongoCollection<BasicDBObject> collection = database.getCollection("mycoll", BasicDBObject.class);
+
+// insert a document
+BasicDBObject document = new BasicDBObject("x", 1)
+collection.insertOne(document);
+document.append("x", 2).append("y", 3);
+
+// replace a document
+collection.replaceOne(Filters.eq("_id", document.get("_id")), document);
+
+// find documents
+List<BasicDBObject> foundDocument = collection.find().into(new ArrayList<BasicDBObject>());
+```
+
+There are two requirements that must be met for any class used in this way:
+
+- a `Codec` for it must be registered in the `MongoCollection`'s `CodecRegistry`
+- the `Codec` must be one that encodes and decodes a full BSON document (and not just, for example, a single BSON value like an Int32)
+
+By default, a `MongoCollection` is configured with `Codec`s for three classes:
+
+- `Document`
+- `BasicDBObject`
+- `BsonDocument`
+
+Applications, however, are free to register `Codec` implementations for other classes by customizing the `CodecRegistry`.  New
+`CodecRegistry` instances are configurable at three levels:
+
+- In a `MongoClient` via `MongoClientOptions`
+- In a `MongoDatabase` via its `withCodecRegistry` method
+- In a `MongoCollection` via its `withCodecRegistry` method
+
+Consider the case of encoding and decoding instances of the `UUID` class.  The Java driver by default encodes instances of `UUID` using a
+byte ordering that is not compatible with other MongoDB drivers, and changing the default would be quite dangerous.  But it is
+possible for new applications that require interoperability across multiple drivers to be able to change that default, and they can do
+that with a `CodecRegistry`.   
+
+```java
+// Replaces the default UuidCodec with one that uses the new standard UUID representation
+CodecRegistry codecRegistry =
+CodecRegistries.fromRegistries(CodecRegistries.fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)),
+                               MongoClientSettings.getDefaultCodecRegistry());
+
+// globally
+MongoClientSettings settings = MongoClientSettings.builder()
+        .codecRegistry(codecRegistry).build();
+MongoClient client = MongoClients.create(settings);
+
+// or per database
+MongoDatabase database = client.getDatabase("mydb")
+                               .withCodecRegistry(codecRegistry);
+
+// or per collection
+MongoCollection<Document> collection = database.getCollection("mycoll")
+                                               .withCodecRegistry(codecRegistry);
+```   
+
+{{% note %}}
+Starting with the 3.12 release of the driver, you can also change the encoding of `UUID` instances via the `uuidRepresentation` property of
+`MongoClientSettings`.  See 
+[`MongoClientSettings.getUuidRepresentation`]({{<apiref "com/mongodb/MongoClientSettings.html#getUuidRepresentation()">}}) for
+details.
+{{% /note %}}
+
diff --git a/docs/reference/content/driver/tutorials/geospatial-search.md b/docs/reference/content/driver/tutorials/geospatial-search.md
new file mode 100644
index 00000000000..7fc0b7fbc2c
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/geospatial-search.md
@@ -0,0 +1,79 @@
++++
+date = "2016-06-12T17:26:54-04:00"
+title = "Geospatial Search"
+[menu.main]
+parent = "Sync Tutorials"
+identifier = "Geospatial Search"
+weight = 85
+pre = "<i class='fa'></i>"
++++
+
+## Geospatial Search
+
+To support geospatial queries, MongoDB provides various geospatial indexes as well as [geospatial query operators]({{<docsref "reference/operator/query-geospatial/">}}).
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.Block;
+     import com.mongodb.client.MongoClients;
+     import com.mongodb.client.MongoClient;
+     import com.mongodb.client.MongoCollection;
+     import com.mongodb.client.MongoDatabase;
+     import com.mongodb.client.MongoCursor;
+     import com.mongodb.client.model.geojson.*;
+     import com.mongodb.client.model.Indexes;
+     import com.mongodb.client.model.Filters;
+     import org.bson.Document;
+     ```
+
+- Include the following code which the examples in the tutorials will use to print the results of the geospatial search:
+
+     ```java
+     Block<Document> printBlock = new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                System.out.println(document.toJson());
+            }
+        };
+     ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Create the `2dsphere` Index
+
+To create a [`2dsphere` index]({{<docsref "core/2dsphere">}}), use the [`Indexes.geo2dsphere`]({{<apiref "com/mongodb/client/model/Indexes.html#geo2dsphere(java.lang.String...)">}})
+helper to create a specification for the `2dsphere` index and pass to [`MongoCollection.createIndex()`]({{<apiref "com/mongodb/client/MongoCollection.html#createIndex(org.bson.conversions.Bson)">}}) method.
+
+The following example creates a `2dsphere` index on the `"contact.location"` field for the `restaurants` collection.
+
+```java
+MongoCollection<Document> collection = database.getCollection("restaurants");
+collection.createIndex(Indexes.geo2dsphere("contact.location"));
+```
+
+## Query for Locations Near a GeoJSON Point
+
+MongoDB provides various [geospatial query operators]({{<apiref "reference/operator/query-geospatial">}}). To facilitate the creation of geospatial queries filters, the Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) class and the ``com.mongodb.client.model.geojson`` package.
+
+The following example returns documents that are at least 1000 meters from and at most 5000 meters from the specified GeoJSON point ``com.mongodb.client.model.geojson.Point``, sorted from nearest to farthest:
+
+```java
+Point refPoint = new Point(new Position(-73.9667, 40.78));
+collection.find(Filters.near("contact.location", refPoint, 5000.0, 1000.0)).forEach(printBlock);
+```
diff --git a/docs/reference/content/driver/tutorials/gridfs.md b/docs/reference/content/driver/tutorials/gridfs.md
new file mode 100644
index 00000000000..5ad753697c4
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/gridfs.md
@@ -0,0 +1,260 @@
++++
+date = "2016-06-12T17:29:57-04:00"
+title = "GridFS"
+[menu.main]
+parent = "Sync Tutorials"
+identifier = "GridFS"
+weight = 90
+pre = "<i class='fa'></i>"
++++
+
+
+## GridFS
+
+[GridFS]({{< docsref "core/gridfs">}}) is a specification for storing and retrieving files that exceed the BSON document size limit of 16MB. Instead of storing a file in a single document, GridFS divides a file into parts, or chunks, and stores each of those chunks as a separate document.
+
+When you query a GridFS store for a file, the Java driver will reassemble the chunks as needed.
+
+The following code snippets come from the [`GridFSTour.java`]({{< srcref "driver-sync/src/examples/gridfs/GridFSTour.java">}}) example code
+that can be found with the driver source on github.
+
+## Prerequisites
+
+Include the following import statements:
+
+```java
+import com.mongodb.Block;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.gridfs.*;
+import com.mongodb.client.gridfs.model.*;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.charset.StandardCharsets;
+import static com.mongodb.client.model.Filters.eq;
+```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017`:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Create a GridFS Bucket
+
+GridFS stores files in [two collections]({{<docsref "core/gridfs/#gridfs-collections">}}): a `chunks` collection stores the file chunks, and a  `files` collection stores file metadata. The two collections are in a common bucket and the collection names are prefixed with the bucket name.
+
+The Java driver provides the [`GridFSBuckets.create()`]({{< apiref "com/mongodb/client/gridfs/GridFSBuckets.html#create(com.mongodb.client.MongoDatabase)" >}}) method
+to create the [`GridFSBucket`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket" >}}).
+
+```java
+MongoDatabase myDatabase = mongoClient.getDatabase("mydb");
+
+// Create a gridFSBucket using the default bucket name "fs"
+GridFSBucket gridFSBucket = GridFSBuckets.create(myDatabase);
+```
+
+You can specify a bucket name to [`GridFSBuckets.create()`]({{< apiref "com/mongodb/client/gridfs/GridFSBuckets.html#create(com.mongodb.client.MongoDatabase,java.lang.String)">}}) method.
+
+```java
+// Create a gridFSBucket with a custom bucket name "files"
+GridFSBucket gridFSFilesBucket = GridFSBuckets.create(myDatabase, "files");
+```
+
+{{% note %}}
+GridFS will automatically create indexes on the `files` and `chunks` collections on first upload of data into the GridFS bucket.
+{{% /note %}}
+
+## Upload to GridFS
+
+To upload data into GridFS, you can upload from an `InputStream` or write data to a `GridFSUploadStream`.
+
+### UploadFromStream
+
+The [`GridFSBucket.uploadFromStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openUploadStream(java.lang.String,com.mongodb.client.gridfs.model.GridFSUploadOptions)" >}}) method reads the contents of an [`InputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/InputStream.html) and saves it to the `GridFSBucket`.  
+
+You can use the [`GridFSUploadOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSUploadOptions" >}}) to configure the chunk size or include additional metadata.
+
+The following example uploads an `InputStream` into `GridFSBucket`:
+
+```java
+// Get the input stream
+
+try {
+    InputStream streamToUploadFrom = new FileInputStream(new File("/tmp/mongodb-tutorial.pdf"));
+    // Create some custom options
+    GridFSUploadOptions options = new GridFSUploadOptions()
+                                        .chunkSizeBytes(358400)
+                                        .metadata(new Document("type", "presentation"));
+
+    ObjectId fileId = gridFSBucket.uploadFromStream("mongodb-tutorial", streamToUploadFrom, options);
+} catch (FileNotFoundException e){
+   // handle exception
+}
+```
+
+### OpenUploadStream
+
+You can write data to a [`GridFSUploadStream`]({{< apiref "mongodb/client/gridfs/GridFSUploadStream.html">}}) which extends [`OutputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/OutputStream.html). The [`GridFSBucket.openUploadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openUploadStream(java.lang.String,com.mongodb.client.gridfs.model.GridFSUploadOptions)">}}) method returns a [`GridFSUploadStream`]({{< apiref "mongodb/client/gridfs/GridFSUploadStream.html">}}).
+
+The `GridFSUploadStream` buffers data until it reaches the `chunkSizeBytes` and then inserts the chunk into the `chunks` collection.  When the `GridFSUploadStream` is closed, the final chunk is written and the file metadata is inserted into the `files` collection.
+
+The following example uploads into a `GridFSBucket` via the returned `GridFSUploadStream`:
+
+```java
+try {
+    GridFSUploadOptions options = new GridFSUploadOptions()
+                       .chunkSizeBytes(358400)
+                       .metadata(new Document("type", "presentation"));
+
+    GridFSUploadStream uploadStream = gridFSFilesBucket.openUploadStream("mongodb-tutorial-2", options);
+    byte[] data = Files.readAllBytes(new File("/tmp/MongoDB-manual-master.pdf").toPath());
+
+    uploadStream.write(data);
+    uploadStream.close();
+    System.out.println("The fileId of the uploaded file is: " + uploadStream.getObjectId().toHexString());
+
+} catch(IOException e){
+    // handle exception
+}
+```
+
+## Find Files Stored in GridFS
+
+To find the files stored in the `GridFSBucket` use the [`find`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#find()">}}) method.
+
+The following example prints out the filename of each file stored:
+
+```java
+gridFSBucket.find().forEach(
+  new Block<GridFSFile>() {
+    public void apply(final GridFSFile gridFSFile) {
+        System.out.println(gridFSFile.getFilename());
+    }
+});
+```
+
+You can also provide a custom filter to limit the results returned. The following example prints out the filenames of all files with a "image/png" value set as the contentType in the user defined metadata document:
+
+```java
+gridFSBucket.find(eq("metadata.contentType", "image/png")).forEach(
+  new Block<GridFSFile>() {
+      public void apply(final GridFSFile gridFSFile) {
+          System.out.println(gridFSFile.getFilename());
+      }
+  });
+```
+
+## Download from GridFS
+
+There are various ways to download data from GridFS.
+
+### DownloadToStream
+
+The [`downloadToStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#downloadToStream(org.bson.types.ObjectId,java.io.OutputStream)" >}}) method reads the contents from MongoDB and writes the data directly to the provided [`OutputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/OutputStream.html).
+
+To download a file by its file `_id`, pass the `_id` to the method. The
+following example downloads a file by its file `_id` into the provided
+`OutputStream`:
+
+```java
+ObjectId fileId; //The id of a file uploaded to GridFS, initialize to valid file id 
+
+try {
+    FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
+    gridFSBucket.downloadToStream(fileId, streamToDownloadTo);
+    streamToDownloadTo.close();
+    System.out.println(streamToDownloadTo.toString());
+} catch (IOException e) {
+    // handle exception
+}
+
+```
+
+If you don't know the `_id` of the file but know the filename, then you can pass the filename to the [`downloadToStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#downloadToStream(java.lang.String,java.io.OutputStream,com.mongodb.client.gridfs.model.GridFSDownloadOptions)" >}}) method. By default, it will download the latest version of the file. Use the [`GridFSDownloadOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSDownloadOptions.html" >}}) to configure which version to download.
+
+The following example downloads the original version of the file named "mongodb-tutorial" into the `OutputStream`:
+
+```java
+try {
+    FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
+    GridFSDownloadOptions downloadOptions = new GridFSDownloadOptions().revision(0);
+    gridFSBucket.downloadToStream("mongodb-tutorial", streamToDownloadTo, downloadOptions);
+    streamToDownloadTo.close();
+} catch (IOException e) {
+   // handle exception
+}
+
+```
+
+### OpenDownloadStream
+
+ 
+The [`openDownloadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openDownloadStream(org.bson.types.ObjectId)">}}) method returns a [`GridFSDownloadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSDownloadStream.html">}}) which extends [`InputStream`](http://docs.oracle.com/javase/8/docs/api/index.html?java/io/InputStream.html).
+
+The following example reads from the `GridFSBucket` via the returned `InputStream`:
+
+```java
+ObjectId fileId; //The id of a file uploaded to GridFS, initialize to valid file id 
+
+GridFSDownloadStream downloadStream = gridFSBucket.openDownloadStream(fileId);
+int fileLength = (int) downloadStream.getGridFSFile().getLength();
+byte[] bytesToWriteTo = new byte[fileLength];
+downloadStream.read(bytesToWriteTo);
+downloadStream.close();
+
+System.out.println(new String(bytesToWriteTo, StandardCharsets.UTF_8));
+```
+
+You can also pass the filename to the [`openDownloadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#openDownloadStream(java.lang.String,com.mongodb.client.gridfs.model.GridFSDownloadOptions)" >}}) method. By default it will download the latest version of the file. Use the [`GridFSDownloadOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSDownloadOptions.html" >}}) to configure which version to download.
+
+The following example downloads the latest version of the file named "sampleData" into the `OutputStream`:
+
+```java
+GridFSDownloadStream downloadStream = gridFSBucket.openDownloadStream("sampleData");
+int fileLength = (int) downloadStream.getGridFSFile().getLength();
+byte[] bytesToWriteTo = new byte[fileLength];
+downloadStream.read(bytesToWriteTo);
+downloadStream.close();
+
+System.out.println(new String(bytesToWriteTo, StandardCharsets.UTF_8));
+```
+
+## Rename files
+
+If you should need to rename a file, then use the [`rename`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#rename(org.bson.types.ObjectId,java.lang.String)">}}) method.  
+
+The following example renames a file to "mongodbTutorial":
+
+```java
+ObjectId fileId; //ObjectId of a file uploaded to GridFS
+
+gridFSBucket.rename(fileId, "mongodbTutorial");
+```
+
+{{% note %}}
+The `rename` method requires an `ObjectId` rather than a `filename` to ensure the correct file is renamed.
+
+To rename multiple revisions of the same filename, first retrieve the full list of files. Then for every file that should be renamed then execute `rename` with the corresponding `_id`.
+{{% /note %}}
+
+## Delete files
+
+To delete a file from the `GridFSBucket` use the [`delete`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#delete(org.bson.types.ObjectId)">}}) method.
+
+The following example deletes a file from the `GridFSBucket`:
+
+```java
+ObjectId fileId; //ObjectId of a file uploaded to GridFS
+
+gridFSBucket.delete(fileId);
+```
diff --git a/docs/reference/content/driver/tutorials/index.md b/docs/reference/content/driver/tutorials/index.md
new file mode 100644
index 00000000000..a42a24ed4e5
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/index.md
@@ -0,0 +1,34 @@
++++
+date = "2016-05-29T12:49:33-04:00"
+title = "Tutorials"
+[menu.main]
+  parent = "MongoDB Driver"
+  identifier = "Sync Tutorials"
+  weight = 20
+  pre = "<i class='fa fa-thumb-tack'></i>"
++++
+
+## Java Driver Tutorials
+
+The tutorials in this section provide examples of some frequently used operations. This section is not meant to be an exhaustive list of all operations available in the Java driver.
+
+
+- [Connect to MongoDB]({{< relref "driver/tutorials/connect-to-mongodb.md" >}})
+
+- [Databases and Collections]({{< relref "driver/tutorials/databases-collections.md" >}})
+
+- [Create Indexes]({{< relref "driver/tutorials/indexes.md" >}})
+
+- [Perform Read Operations]({{< relref "driver/tutorials/perform-read-operations.md" >}})
+
+- [Perform Write Operations]({{< relref "driver/tutorials/perform-write-operations.md" >}})
+
+- [Aggregation]({{< relref "driver/tutorials/aggregation.md" >}})
+
+- [Text Search]({{< relref "driver/tutorials/text-search.md" >}})
+
+- [Geospatial Search]({{< relref "driver/tutorials/geospatial-search.md" >}})
+
+- [GridFS]({{< relref "driver/tutorials/gridfs.md" >}})
+
+- [Run Commands]({{< relref "driver/tutorials/commands.md" >}})
diff --git a/docs/reference/content/driver/tutorials/indexes.md b/docs/reference/content/driver/tutorials/indexes.md
new file mode 100644
index 00000000000..e13b037f884
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/indexes.md
@@ -0,0 +1,230 @@
++++
+date = "2016-05-31T10:10:30-04:00"
+title = "Create Indexes"
+[menu.main]
+parent = "Sync Tutorials"
+identifier = "Create Indexes"
+weight = 15
+pre = "<i class='fa'></i>"
++++
+
+## Create Indexes
+
+[Indexes]({{<docsref "indexes">}}) support the efficient execution of queries in MongoDB. To create an [index]({{<docsref "indexes">}}) on a field or fields, pass an index specification document to the [`MongoCollection.createIndex()`]({{<apiref "com/mongodb/client/MongoCollection.html#createIndex(org.bson.conversions.Bson)">}}) method.
+
+The MongoDB Java Driver provides
+the [`Indexes`]({{<apiref "com/mongodb/client/model/Indexes.html">}}) class that
+includes static factory methods to create index specification
+documents for the various MongoDB Index key types.
+
+{{% note %}}
+MongoDB only creates an index if an index of the same specification does not already exist.
+{{% /note %}}
+
+## Prerequisites
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.client.MongoClient;
+     import com.mongodb.client.MongoClients;
+     import com.mongodb.client.MongoDatabase;
+     import com.mongodb.client.MongoCollection;
+     import org.bson.Document;
+
+     import com.mongodb.client.model.Indexes;
+     import com.mongodb.client.model.IndexOptions;
+     import com.mongodb.client.model.Filters;
+     ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` and a `MongoCollection` instances.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Ascending Index
+
+To create a specification for an ascending index, use the [`Indexes.ascending`]({{<apiref "com/mongodb/client/model/Indexes.html">}}) static helper methods.
+
+### Single Ascending Index
+
+The following example creates an ascending index on the
+`name` field:
+
+```java
+collection.createIndex(Indexes.ascending("name"));
+```
+
+### Compound Ascending Index
+
+The following example creates an ascending [compound index]({{<docsref "core/index-compound">}})  on the `stars` field and the `name`
+ field:
+
+```java
+collection.createIndex(Indexes.ascending("stars", "name"));
+```
+
+For an alternative way to create a compound index, see [Compound Indexes](#compound-indexes).
+
+## Descending Index
+
+To create a specification of a descending index, use the [`Indexes.descending`]({{<apiref "com/mongodb/client/model/Indexes.html">}}) static helper methods.
+
+### Single Descending Key Index
+
+The following example creates a descending index on the `stars` field:
+
+```java
+collection.createIndex(Indexes.descending("stars"));
+```
+
+### Compound Descending Key Index
+
+The following example creates a descending [compound index]({{<docsref "core/index-compound">}}) on the `stars` field and the `name` field:
+
+```java
+collection.createIndex(Indexes.descending("stars", "name"));
+```
+
+For an alternative way to create a compound index, see [Compound Indexes](#compound-indexes).
+
+## Compound Indexes
+
+To create a specification for a [compound index]({{<docsref "core/index-compound">}}), use the [`Indexes.compoundIndex`]({{<apiref "com/mongodb/client/model/Indexes.html">}}) static helper methods.
+
+{{% note %}}
+To create a specification for a compound index where all the keys are ascending, you can use the [`ascending()`](#compound-ascending-key-index) method. To create a specification for a compound index where all the keys are descending, you can use the [`descending()`](##compound-descending-key-index) method.
+{{% /note %}}
+
+The following example creates a compound index with the `stars` field in descending order and the `name` field in ascending order:
+
+```java
+collection.createIndex(Indexes.compoundIndex(Indexes.descending("stars"), Indexes.ascending("name")));
+```
+
+## Text Indexes
+
+MongoDB provides [text indexes]({{<docsref "core/index-text">}}) to support text search of string content. Text indexes can include any field whose value is a string or an array of string elements. To create a specification for a text index, use the
+[`Indexes.text`]({{<apiref "com/mongodb/client/model/Indexes.html#text(java.lang.String)">}}) static helper method.
+
+The following example creates a text index on the `name` field:
+
+```java
+collection.createIndex(Indexes.text("name"));
+```
+
+## Hashed Index
+
+To create a specification for a [hashed index]({{<docsref "core/index-hashed">}}) index, use the [`Indexes.hashed`]({{<apiref "com/mongodb/client/model/Indexes.html#hashed(java.lang.String)">}}) static helper method.
+
+The following example creates a hashed index on the `_id` field:
+
+```java
+collection.createIndex(Indexes.hashed("_id"));
+```
+
+## Geospatial Indexes
+
+To support geospatial queries, MongoDB supports various
+[geospatial indexes]({{<docsref "applications/geospatial-indexes">}}).
+
+### `2dsphere`
+
+To create a specification for a [`2dsphere` index]({{<docsref "core/2dsphere">}}), use the [`Indexes.geo2dsphere`]({{<apiref "com/mongodb/client/model/Indexes.html#geo2dsphere(java.lang.String...)">}}) static helper methods.
+
+The following example creates a `2dsphere` index on the `"contact.location"` field:
+
+```java
+collection.createIndex(Indexes.geo2dsphere("contact.location"));
+```
+
+### `2d`
+
+To create a specification for a [`2d` index]({{<docsref "core/2d/">}}) index, use the [`Indexes.geo2d`]({{<apiref "com/mongodb/client/model/Indexes.html#geo2d(java.lang.String)">}})
+static helper method.
+
+{{% note class="important" %}}
+A 2d index is for data stored as points on a two-dimensional plane
+and is intended for legacy coordinate pairs used in MongoDB 2.2 and
+earlier.
+{{% /note %}}
+
+The following example creates a `2d` index on the `"contact.location"` field:
+
+```java
+collection.createIndex(Indexes.geo2d("contact.location"));
+```
+
+### geoHaystack
+
+To create a specification for a [`geoHaystack` index]({{<docsref "core/geohaystack/">}}), use the [`Indexes.geoHaystack`]({{<apiref "com/mongodb/client/model/Indexes.html#geoHaystack(java.lang.String,org.bson.conversions.Bson)">}}) method. `geoHaystack` indexes can improve performance on queries that use flat geometries.
+
+The following example creates a `geoHaystack` index on the `contact.location` field and an ascending index on the `stars` field:
+
+```java
+IndexOptions haystackOption = new IndexOptions().bucketSize(1.0);
+collection.createIndex(
+         Indexes.geoHaystack("contact.location", Indexes.ascending("stars")),
+         haystackOption);
+```
+
+
+To query a haystack index, use the [`geoSearch`]({{<docsref "reference/command/geoSearch">}}) command.
+
+## IndexOptions
+
+```java
+import com.mongodb.client.model.IndexOptions;
+```
+
+In addition to the index specification document, the
+[`createIndex()`]({{<apiref "com/mongodb/client/MongoCollection.html#createIndex(org.bson.conversions.Bson)">}}) method can take an index options document, such as to create unique indexes or partial indexes.
+
+The Java Driver provides the [IndexOptions]({{<apiref "com/mongodb/client/model/IndexOptions.html">}}) class to specify various index options.
+
+### Unique Index
+
+The following specifies a [`unique(true)`]({{<apiref "com/mongodb/client/model/IndexOptions.html#unique(boolean)">}}) option to create a [unique index]({{<docsref "core/index-unique">}}) on the `name` and `stars` fields:
+
+```java
+IndexOptions indexOptions = new IndexOptions().unique(true);
+collection.createIndex(Indexes.ascending("name", "stars"), indexOptions);
+```
+
+For more information on unique indexes, see [Unique Indexes]({{<docsref "core/index-unique">}}).
+
+### Partial Index
+
+To create a [partial index]({{<docsref "core/index-partial/">}}), include a [partialFilterExpression]({{<apiref "com/mongodb/client/model/IndexOptions.html#partialFilterExpression(org.bson.conversions.Bson)">}}) as an index option.
+
+The following example creates a partial index on documents that have `status` field equal to `"A"`.
+
+```java
+IndexOptions partialFilterIndexOptions = new IndexOptions()
+                .partialFilterExpression(Filters.exists("contact.email"));
+collection.createIndex(
+                Indexes.descending("name", "stars"), partialFilterIndexOptions);
+```
+
+For more information on partial indexes, see [Partial Indexes]({{<docsref "core/index-partial/">}}).
+
+## Get a List of Indexes on a Collection
+
+Use the `listIndexes()` method to get a list of indexes. The following lists the indexes on the collection:
+
+```java
+for (Document index : collection.listIndexes()) {
+    System.out.println(index.toJson());
+}
+```
+
+For other index options, see [MongoDB Manual]({{<docsref "core/index-properties">}}) .
diff --git a/docs/reference/content/driver/reference/connecting/jndi.md b/docs/reference/content/driver/tutorials/jndi.md
similarity index 86%
rename from docs/reference/content/driver/reference/connecting/jndi.md
rename to docs/reference/content/driver/tutorials/jndi.md
index cdc8d62746a..010c6f03155 100644
--- a/docs/reference/content/driver/reference/connecting/jndi.md
+++ b/docs/reference/content/driver/tutorials/jndi.md
@@ -2,7 +2,7 @@
 date = "2015-03-19T12:53:26-04:00"
 title = "JNDI"
 [menu.main]
-  parent = "Sync Connecting"
+  parent = "Connect to MongoDB"
   identifier = "Sync JNDI"
   weight = 30
   pre = "<i class='fa'></i>"
@@ -11,7 +11,7 @@ title = "JNDI"
 ## Java Naming and Directory Interface (JNDI)
 
 The driver includes a [JNDI](http://docs.oracle.com/javase/8/docs/technotes/guides/jndi/index.html) ObjectFactory implementation,
-[`MongoClientFactory`]({{< apiref "com/mongodb/client/jndi/MongoClientFactory" >}}), that returns `MongoClient` instances based on a
+[`MongoClientFactory`]({{< apiref "com/mongodb/client/MongoClientFactory" >}}) ([`legacy version`]({{< apiref "com/mongodb/client/jndi/MongoClientFactory" >}})), that returns `MongoClient` instances based on a
 [connection string](http://docs.mongodb.org/manual/reference/connection-string/).
 
 ## Examples
@@ -28,7 +28,7 @@ The configuration of the `MongoClientFactory` differs depending on the applicati
 
         <module xmlns="urn:jboss:module:1.3" name="org.mongodb">
            <resources>
-               <resource-root path="mongo-java-driver-3.3.0.jar"/>
+               <resource-root path="mongo-java-driver-3.12.0.jar"/>
            </resources>
            <dependencies>
                <module name="javax.api"/>
@@ -40,10 +40,10 @@ The configuration of the `MongoClientFactory` differs depending on the applicati
 
 4. Add a binding to JBoss's naming subsystem configuration that references the above module, the `MongoClientFactory` class, and the
 connection string for the MongoDB cluster.
-
+                 
         <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <bindings>
-                <object-factory name="java:global/MyMongoClient" module="org.mongodb" class="com.mongodb.client.jndi.MongoClientFactory">
+                <object-factory name="java:global/MyMongoClient" module="org.mongodb" class="com.mongodb.client.MongoClientFactory">
                     <environment>
                         <property name="connectionString" value="mongodb://localhost:27017"/>
                     </environment>
@@ -65,7 +65,7 @@ MongoDB cluster:
                   auth="Container"
                   type="com.mongodb.MongoClient"
                   closeMethod="close"
-                  factory="com.mongodb.client.jndi.MongoClientFactory"
+                  factory="com.mongodb.client.MongoClientFactory"
                   singleton="true"
                   connectionString="mongodb://localhost"/>
 
diff --git a/docs/reference/content/driver/tutorials/perform-read-operations.md b/docs/reference/content/driver/tutorials/perform-read-operations.md
new file mode 100644
index 00000000000..e8f29cc1f66
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/perform-read-operations.md
@@ -0,0 +1,291 @@
++++
+date = "2016-06-09T13:21:16-04:00"
+title = "Read Operations"
+[menu.main]
+  parent = "Sync Tutorials"
+  identifier = "Perform Read Operations"
+  weight = 15
+  pre = "<i class='fa'></i>"
++++
+
+## Find Operations
+
+Find operations retrieve documents from a collection. You can specify a filter to select only those documents that match the filter condition.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.*;
+     import com.mongodb.client.MongoClients;
+     import com.mongodb.client.MongoClient;
+     import com.mongodb.client.MongoCollection;
+     import com.mongodb.client.MongoDatabase;
+     import com.mongodb.client.model.Projections;
+     import com.mongodb.client.model.Filters;
+     import static com.mongodb.client.model.Filters.*;
+     import static com.mongodb.client.model.Projections.*;
+     import com.mongodb.client.model.Sorts;
+     import java.util.Arrays;
+     import org.bson.Document;
+     ```
+
+- Include the following code which the examples in the tutorials will use to print the results of the find operations:
+
+    ```java
+    Block<Document> printBlock = new Block<Document>() {
+           @Override
+           public void apply(final Document document) {
+               System.out.println(document.toJson());
+           }
+    };
+    ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance and a `MongoCollection` instance
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Query a Collection
+
+To query the collection, you can use the collection's [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method.
+
+You can call the method without any arguments to query all documents in a collection:
+
+```java
+collection.find().forEach(printBlock);
+```
+
+Or pass a filter to query for documents that match the filter criteria:
+
+```java
+collection.find(eq("name", "456 Cookies Shop"))
+            .forEach(printBlock);
+```
+
+## Query Filters
+
+To query for documents that match certain conditions, pass a filter document to the [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method.
+
+### Empty Filter
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+```java
+collection.find(new Document()).forEach(printBlock);
+```
+{{% note class="tip"%}}
+For the [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method, you can also call the method without passing a filter object to match all documents in a collection.
+{{% /note %}}
+
+```java
+collection.find().forEach(printBlock);
+```
+
+### `Filters` Helper
+
+To facilitate the creation of filter documents, the Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) class that provides filter condition helper methods.
+
+Consider the following `find` operation which includes a filter `Document` which specifies that:
+
+- the `stars` field is greater than or equal to 2 and less than 5, *AND*
+
+- the `categories` field equals `"Bakery"` (or if `categories` is an array, contains the string `"Bakery"` as an element):
+
+```java
+collection.find(
+    new Document("stars", new Document("$gte", 2)
+          .append("$lt", 5))
+          .append("categories", "Bakery")).forEach(printBlock);
+```
+
+The following example specifies the same filter condition using the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper methods:
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+            .forEach(printBlock);
+```
+
+For a list of MongoDB query filter operators, refer to the [MongoDB Manual]({{<docsref "reference/operator/query">}}). For the associated `Filters` helpers, see [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}).
+See also the  [Query Documents Tutorial]({{<docsref "tutorial/query-documents">}}) for an overview of querying in MongoDB, including specifying filter conditions on arrays and embedded documents.
+
+## FindIterable
+
+The [`find()`]({{< apiref "com/mongodb/client/MongoCollection.html#find()">}}) method returns an instance of the [`FindIterable`]({{< apiref "com/mongodb/client/FindIterable.html" >}}) interface. The interface provides various methods that you can chain to the `find()` method to modify the output or behavior of the query, such as [`sort()`]({{<apiref "com/mongodb/client/FindIterable.html#sort(org.bson.conversions.Bson)">}})  or [`projection()`]({{<apiref "com/mongodb/client/FindIterable.html#projection(org.bson.conversions.Bson)">}}), as well as for iterating the results, such as [`iterator()`]({{<apiref "com/mongodb/client/MongoIterable.html#iterator()">}}) and [`forEach()`]({{<apiref "com/mongodb/client/MongoIterable.html#forEach(com.mongodb.Block)">}}).
+
+### Projections
+
+By default, queries in MongoDB return all fields in matching documents. To specify the fields to return in the matching documents, you can specify a [projection document]({{<docsref "tutorial/project-fields-from-query-results/#projection-document">}}).
+
+Consider the following `find` operation which includes a projection `Document` which specifies that the matching documents return only the `name` field, `stars` field, and the `categories` field.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .projection(new Document("name", 1)
+                     .append("stars", 1)
+                     .append("categories",1)
+                     .append("_id", 0))
+                .forEach(printBlock);
+```
+
+To facilitate the creation of projection documents, the Java driver provides the
+[`Projections`]({{<apiref "com/mongodb/client/model/Projections.html">}}) class.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .projection(fields(include("name", "stars", "categories"), excludeId()))
+                .forEach(printBlock);
+```
+
+In the projection document, you can also specify a projection expression using a [projection operator]({{<apiref "reference/operator/projection/">}})
+
+For an example on using the [`Projections.metaTextScore`]({{<apiref "com/mongodb/client/model/Projections.html#metaTextScore(java.lang.String)">}}),
+see the [Text Search tutorial]({{<relref "driver/tutorials/text-search.md">}}).
+
+### Sorts
+
+To sort documents, pass a [sort specification document]({{<docsref "reference/method/cursor.sort/#cursor.sort">}}) to the [`FindIterable.sort()`]({{<apiref "com/mongodb/client/FindIterable.html#sort(org.bson.conversions.Bson)">}}) method.  The Java driver provides [`Sorts`]({{< relref "builders/sorts.md">}}) helpers to facilitate the sort specification document.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .sort(Sorts.ascending("name"))
+                .forEach(printBlock);
+
+```
+
+### Sort with Projections
+
+The [`FindIterable`]({{< apiref "com/mongodb/client/FindIterable.html" >}}) methods themselves return `FindIterable` objects, and as such, you can append multiple `FindIterable` methods to the `find()` method.
+
+```java
+collection.find(and(gte("stars", 2), lt("stars", 5), eq("categories", "Bakery")))
+                .sort(Sorts.ascending("name"))
+                .projection(fields(include("name", "stars", "categories"), excludeId()))
+                .forEach(printBlock);
+```
+
+## MongoIterable
+
+The [`MongoIterable`]({{< apiref "com/mongodb/client/MongoIterable.html" >}}) interface provides helper methods to access the results of an operation:
+
+- [`iterator()`]({{< apiref "com/mongodb/client/MongoIterable.html#iterator()" >}})
+
+- [`first()`]({{< apiref "com/mongodb/client/MongoIterable.html#first()" >}})
+
+- [`forEach()`]({{< apiref "com/mongodb/client/MongoIterable.html#forEach(com.mongodb.Block)" >}})
+
+
+- [`map()`]({{< apiref "com/mongodb/client/MongoIterable.html#map(com.mongodb.Function)" >}})
+
+- [`into()`]({{< apiref "com/mongodb/client/MongoIterable.html#into(A)" >}})
+
+
+## Read Preference
+
+For read operations on [replica sets]({{<docsref "replication/">}}) or [sharded clusters]({{<docsref "sharding/">}}), applications can configure the [read preference]({{<docsref "reference/read-preference">}}) at three levels:
+
+- In a [`MongoClient()`]({{< apiref "com/mongodb/client/MongoClient.html">}})
+
+  - Via [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings.html">}}):
+
+      ```java
+      MongoClient mongoClient = MongoClients.create(MongoClientSettings.builder()
+                                                    .applyConnectionString(new ConnectionString("mongodb://host1,host2"))
+                                                    .readPreference(ReadPreference.secondary())
+                                                    .build());
+      ```
+
+  - Via [`ConnectionString`]({{< apiref "/com/mongodb/ConnectionString.html">}}), as in the following example:
+
+      ```java
+      MongoClient mongoClient = MongoClients.create("mongodb://host1:27017,host2:27017/?readPreference=secondary");
+      ```
+
+- In a [`MongoDatabase`]({{<apiref "com/mongodb/client/MongoDatabase.html">}}) via its [`withReadPreference`]({{<apiref "com/mongodb/client/MongoDatabase.html#withReadPreference(com.mongodb.ReadPreference)">}}) method.
+
+    ```java
+    MongoDatabase database = mongoClient.getDatabase("test")
+                             .withReadPreference(ReadPreference.secondary());
+    ```
+
+- In a [`MongoCollection`]({{<apiref "com/mongodb/client/MongoCollection.html">}}) via its [`withReadPreference`]({{<apiref "com/mongodb/client/MongoCollection.html#withReadPreference(com.mongodb.ReadPreference)">}}) method:
+
+    ```java
+    MongoCollection<Document> collection = database.getCollection("restaurants")
+                .withReadPreference(ReadPreference.secondary());
+    ```
+
+`MongoDatabase` and `MongoCollection` instances are immutable. Calling `.withReadPreference()` on an existing `MongoDatabase` or `MongoCollection` instance returns a new instance and does not affect the instance on which the method is called.
+
+For example, in the following, the `collectionWithReadPref` instance has the read preference of primaryPreferred whereas the read preference of the `collection` is unaffected.
+
+```java
+  MongoCollection<Document> collectionWithReadPref = collection.withReadPreference(ReadPreference.primaryPreferred());
+```
+
+## Read Concern
+
+For read operations on [replica sets]({{<docsref "replication/">}}) or [sharded clusters]({{<docsref "sharding/">}}), applications can configure the [read concern]({{<docsref "reference/read-concern">}}) at three levels:
+
+- In a [`MongoClient()`]({{< apiref "com/mongodb/MongoClient.html">}})
+
+  - Via [`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}), as in the following example:
+
+    ```java
+    MongoClient mongoClient = new MongoClient(
+      new MongoClientURI("mongodb://host1:27017,host2:27017/?readConcernLevel=majority"));
+    ```
+  - Via [`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions.html">}}), as in the following example:
+
+    ```java
+    MongoClientOptions options = MongoClientOptions.builder().readConcern(ReadConcern.DEFAULT).build();
+    MongoClient mongoClient = new MongoClient(Arrays.asList(
+                                  new ServerAddress("host1", 27017),
+                                  new ServerAddress("host1", 27017)), options);
+    ```
+
+- In a [`MongoDatabase`]({{<apiref "com/mongodb/client/MongoDatabase.html">}}) via its [`withReadConcern`]({{<apiref "com/mongodb/client/MongoDatabase.html#withReadConcern(com.mongodb.ReadConcern)">}}) method, as in the following example:
+
+    ```java
+    MongoDatabase database = mongoClient.getDatabase("test")
+                                        .withReadConcern(ReadConcern.DEFAULT);
+    ```
+
+- In a [`MongoCollection`]({{<apiref "com/mongodb/client/MongoCollection.html">}}) via its [`withReadConcern`]({{<apiref "com/mongodb/client/MongoCollection.html#withReadConcern(com.mongodb.ReadConcern)">}}) method, as in the following example:
+
+    ```java
+    MongoCollection<Document> collection = database.getCollection("restaurants")
+                                              .withReadConcern(ReadConcern.DEFAULT);
+    ```
+
+`MongoDatabase` and `MongoCollection` instances are immutable. Calling `.withReadConcern()` on an existing `MongoDatabase` or `MongoCollection` instance returns a new instance and does not affect the instance on which the method is called.
+
+For example, in the following, the `collWithReadConcern` instance has majority read concern whereas the read concern of the `collection` is unaffected.
+
+```java
+MongoCollection<Document> collWithReadConcern = collection
+                                                  .withReadConcern(ReadConcern.MAJORITY);
+```
+
+You can build `MongoClientOptions`, `MongoDatabase`, or `MongoCollection` to include a combination of read concern, read preference, and [write concern]({{<docsref "reference/write-concern">}}).
+
+For example, the following sets all three at the collection level:
+
+```java
+collection = database.getCollection("restaurants")
+                .withReadPreference(ReadPreference.primary())
+                .withReadConcern(ReadConcern.MAJORITY)
+                .withWriteConcern(WriteConcern.MAJORITY);
+```
diff --git a/docs/reference/content/driver/tutorials/perform-write-operations.md b/docs/reference/content/driver/tutorials/perform-write-operations.md
new file mode 100644
index 00000000000..1ff1d2c5b10
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/perform-write-operations.md
@@ -0,0 +1,311 @@
++++
+date = "2016-06-09T13:21:16-04:00"
+title = "Write Operations"
+[menu.main]
+  parent = "Sync Tutorials"
+  identifier = "Perform Write Operations"
+  weight = 20
+  pre = "<i class='fa'></i>"
++++
+
+## Write Operations (Insert, Update, Replace, Delete)
+
+Perform write operations to insert new documents into a collection, update existing document or documents in a collection, replace an existing document in a collection, or delete existing document or documents from a collection.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.*;
+     import com.mongodb.client.MongoClients;
+     import com.mongodb.clientMongoClient;
+     import com.mongodb.client.MongoCollection;
+     import com.mongodb.client.MongoDatabase;
+     import com.mongodb.client.model.Filters;
+     import static com.mongodb.client.model.Filters.*;
+     import static com.mongodb.client.model.Updates.*;
+     import com.mongodb.client.model.UpdateOptions;
+     import com.mongodb.client.result.*;
+     import org.bson.Document;
+     import org.bson.types.ObjectId;
+
+     import java.util.List;
+     import java.util.Arrays;
+     import java.util.ArrayList;
+     ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database and `collection` to refer to the `restaurants` collection:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+MongoCollection<Document> collection = database.getCollection("restaurants");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Insert New Document
+
+To insert a single document into the collection, you can use the collection's [`insertOne()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertOne(TDocument)" >}}) method.
+
+```java
+Document document = new Document("name", "Café Con Leche")
+               .append("contact", new Document("phone", "228-555-0149")
+                                       .append("email", "cafeconleche@example.com")
+                                       .append("location",Arrays.asList(-73.92502, 40.8279556)))
+               .append("stars", 3)
+               .append("categories", Arrays.asList("Bakery", "Coffee", "Pastries"));
+
+collection.insertOne(document);
+```
+
+{{% note %}}
+If no top-level `_id` field is specified in the document, the Java driver automatically adds the `_id` field to the inserted document.
+{{% /note %}}
+
+## Insert Multiple Documents
+
+To add multiple documents, you can use the collection's [`insertMany()`]({{< apiref "com/mongodb/client/MongoCollection.html#insertMany(java.util.List)" >}}) method, which takes a list of documents to insert.
+
+The following example inserts two documents to the collection:
+
+```java
+Document doc1 = new Document("name", "Amarcord Pizzeria")
+               .append("contact", new Document("phone", "264-555-0193")
+                                       .append("email", "amarcord.pizzeria@example.net")
+                                       .append("location",Arrays.asList(-73.88502, 40.749556)))
+               .append("stars", 2)
+               .append("categories", Arrays.asList("Pizzeria", "Italian", "Pasta"));
+
+
+Document doc2 = new Document("name", "Blue Coffee Bar")
+               .append("contact", new Document("phone", "604-555-0102")
+                                       .append("email", "bluecoffeebar@example.com")
+                                       .append("location",Arrays.asList(-73.97902, 40.8479556)))
+               .append("stars", 5)
+               .append("categories", Arrays.asList("Coffee", "Pastries"));
+
+List<Document> documents = new ArrayList<Document>();
+documents.add(doc1);
+documents.add(doc2);
+
+collection.insertMany(documents);
+```
+{{% note %}}
+If no top-level `_id` field is specified in the documents, the Java driver automatically adds the `_id` field to the inserted documents.
+{{% /note %}}
+
+## Update Existing Documents
+
+To update existing documents in a collection, you can use the collection's [`updateOne()`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) or [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) methods.
+
+### Filters
+
+You can pass in a filter document to the methods to specify which documents to update. The filter document specification is the same as for [read operations]({{< relref "driver/tutorials/perform-read-operations.md" >}}). To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+### Update Operators
+
+To change a field in a document, MongoDB provides [update operators]({{<docsref "reference/operator/update">}}).  To specify the modification to perform using the update operators, use an updates document.
+
+To facilitate the creation of updates documents, the Java driver provides the [`Updates`]({{< apiref "com/mongodb/client/model/Updates.html">}}) class.
+
+{{% note class="important" %}}
+The `_id` field is immutable; i.e. you cannot change the value of the `_id` field.
+{{% /note %}}
+
+### Update a Single Document
+
+The [`updateOne()`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method updates at most a single document, even if the filter condition matches multiple documents in the collection.
+
+The following operation on the `restaurants` collection updates a document whose `_id` field equals `ObjectId("57506d62f57802807471dd41")`.
+
+```java
+collection.updateOne(
+                eq("_id", new ObjectId("57506d62f57802807471dd41")),
+                combine(set("stars", 1), set("contact.phone", "228-555-9999"), currentDate("lastModified")));
+```
+
+Specifically, the operation uses:
+
+- [`Updates.set`]({{<apiref "com/mongodb/client/model/Updates.html#set(java.lang.String,TItem)">}}) to set the value of the `stars` field to `1` and the `contact.phone` field to `"228-555-9999"`, and
+
+- [`Updates.currentDate`]({{<apiref "com/mongodb/client/model/Updates.html#currentDate(java.lang.String)">}}) to modify the `lastModified` field to the current date. If the `lastModified` field does not exist, the operator adds the field to the document.  
+
+{{% note class="tip" %}}
+In some cases where you may need to update many fields in a document, it may be more efficient to replace the document.  See [Replace a Document](#replace-a-document).
+{{% /note %}}
+
+### Update Multiple Documents
+
+The [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) method updates all documents that match the filter condition.
+
+The following operation on the `restaurants` collection updates all documents whose `stars` field equals `2`.
+
+```java
+collection.updateMany(
+              eq("stars", 2),
+              combine(set("stars", 0), currentDate("lastModified")));
+```
+
+Specifically, the operation uses:
+
+- [`Updates.set`]({{<apiref "com/mongodb/client/model/Updates.html#set(java.lang.String,TItem)">}}) to set the value of the `stars` field to `0` , and
+
+- [`Updates.currentDate`]({{<apiref "com/mongodb/client/model/Updates.html#currentDate(java.lang.String)">}}) to modify the `lastModified` field to the current date. If the `lastModified` field does not exist, the operator adds the field to the document.  
+
+### Update Options
+
+With the [`updateOne()`]({{<apiref "com/mongodb/client/MongoCollection.html#updateOne(org.bson.conversions.Bsonorg.bson.conversions.Bson)">}}) and [`updateMany`]({{<apiref "com/mongodb/async/client/MongoCollection.html#updateMany(org.bson.conversions.Bson,org.bson.conversions.Bson)">}}) methods, you can include an [`UpdateOptions`]({{<apiref "com/mongodb/client/model/UpdateOptions.html">}}) document to specify the [`upsert`]({{<docsref "reference/method/db.collection.update/#upsert-option">}}) option or the [`bypassDocumentationValidation`]({{<docsref "core/document-validation/#bypass-document-validation">}}) option.
+
+```java
+collection.updateOne(
+                eq("_id", 1),
+                combine(set("name", "Fresh Breads and Tulips"), currentDate("lastModified")),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true));
+```
+## Replace an Existing Document
+
+To replace an existing document in a collection, you can use the collection's [`replaceOne`]({{< apiref "com/mongodb/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument)">}}) method.
+
+{{% note class="important" %}}
+The `_id` field is immutable; i.e. you cannot replace the `_id` field value.
+{{% /note %}}
+
+### Filters
+
+You can pass in a filter document to the method to specify which document to replace. The filter document specification is the same as for [read operations]({{< relref "driver/tutorials/perform-read-operations.md" >}}). To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+The [`replaceOne`]({{< apiref "com/mongodb/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument)">}}) method replaces at most a single document, even if the filter condition matches multiple documents in the collection.
+
+### Replace a Document
+
+To replace a document, pass a new document to the [`replaceOne`]({{< apiref "com/mongodb/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument)">}}) method.
+
+{{% note class="important" %}}
+The replacement document can have different fields from the original document. In the replacement document, you can omit the `_id` field since the `_id` field is immutable; however, if you do include the `_id` field, you cannot specify a different value for the `_id` field.
+{{% /note %}}
+
+The following operation on the `restaurants` collection replaces the document whose `_id` field equals `ObjectId("57506d62f57802807471dd41")`.
+
+```java
+collection.replaceOne(
+                eq("_id", new ObjectId("57506d62f57802807471dd41")),
+                new Document("name", "Green Salads Buffet")
+                        .append("contact", "TBD")
+                        .append("categories", Arrays.asList("Salads", "Health Foods", "Buffet")));
+```
+
+See also [Update a Document](#update-a-single-document).
+
+### Update Options
+
+With the [`replaceOne`]({{< apiref "com/mongodb/client/MongoCollection.html#replaceOne(org.bson.conversions.Bson,TDocument)">}}), you can include an [`UpdateOptions`]({{<apiref "com/mongodb/client/model/UpdateOptions.html">}}) document to specify the [`upsert`]({{<docsref "reference/method/db.collection.update/#upsert-option">}}) option or the [`bypassDocumentationValidation`]({{<docsref "core/document-validation/#bypass-document-validation">}}) option.
+
+```java
+collection.replaceOne(
+                eq("name", "Orange Patisserie and Gelateria"),
+                new Document("stars", 5)
+                        .append("contact", "TBD")
+                        .append("categories", Arrays.asList("Cafe", "Pastries", "Ice Cream")),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true));
+```
+
+## Delete Documents
+
+To delete documents in a collection, you can use the
+[`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) and [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) methods.
+
+### Filters
+
+You can pass in a filter document to the methods to specify which documents to delete. The filter document specification is the same as for [read operations]({{< relref "driver/tutorials/perform-read-operations.md" >}}). To facilitate creating filter objects, Java driver provides the [`Filters`]({{< apiref "com/mongodb/client/model/Filters.html">}}) helper.
+
+To specify an empty filter (i.e. match all documents in a collection), use an empty [`Document`]({{< apiref "org/bson/Document.html" >}}) object.
+
+### Delete a Single Document
+
+The [`deleteOne`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteOne(org.bson.conversions.Bson)">}}) method deletes at most a single document, even if the filter condition matches multiple documents in the collection.
+
+The following operation on the `restaurants` collection deletes a document whose `_id` field equals `ObjectId("57506d62f57802807471dd41")`.
+
+```java
+collection.deleteOne(eq("_id", new ObjectId("57506d62f57802807471dd41")));
+```
+
+### Delete Multiple Documents
+
+The [`deleteMany`]({{< apiref "com/mongodb/client/MongoCollection.html#deleteMany(org.bson.conversions.Bson)">}}) method deletes all documents that match the filter condition.
+
+The following operation on the `restaurants` collection deletes all documents whose `stars` field equals `4`.
+
+```java
+collection.deleteMany(eq("stars", 4));
+```
+
+See also [Drop a Collection]({{< relref  "driver/tutorials/databases-collections.md" >}}).
+
+## Write Concern
+
+[Write concern]({{<docsref "reference/write-concern">}}) describes the level of acknowledgement requested from MongoDB for write operations.
+
+Applications can configure [write concern]({{<docsref "reference/write-concern">}}) at three levels:
+
+- In a [`MongoClient()`]({{< apiref "com/mongodb/MongoClient.html">}})
+
+  - Via [`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions.html">}}), as in the following example:
+
+      ```java
+      MongoClientOptions options = MongoClientOptions.builder().writeConcern(WriteConcern.MAJORITY).build();
+      MongoClient mongoClient = new MongoClient(Arrays.asList(
+            new ServerAddress("host1", 27017),
+            new ServerAddress("host1", 27018)), options);
+      ```
+
+  - Via [`MongoClientURI`]({{< apiref "/com/mongodb/MongoClientURI.html">}}), as in the following example:
+
+      ```java
+      MongoClient mongoClient = new MongoClient(
+        new MongoClientURI("mongodb://host1:27017,host2:27017/?w=majority"));
+      ```
+
+- In a [`MongoDatabase`]({{<apiref "com/mongodb/client/MongoDatabase.html">}}) via its [`withWriteConcern`]({{<apiref "com/mongodb/client/MongoDatabase.html#withWriteConcern(com.mongodb.WriteConcern)">}}) method, as in the following example:
+
+    ```java
+     MongoDatabase database = mongoClient.getDatabase("test").withWriteConcern(WriteConcern.MAJORITY);
+    ```
+
+- In a [`MongoCollection`]({{<apiref "com/mongodb/client/MongoCollection.html">}}) via its [`withWriteConcern`]({{<apiref "com/mongodb/client/MongoCollection.html#withWriteConcern(com.mongodb.WriteConcern)">}}) method, as in the following example:
+
+    ```java
+     MongoCollection<Document> collection = database.getCollection("restaurants").withWriteConcern(WriteConcern.MAJORITY);
+    ```
+
+`MongoDatabase` and `MongoCollection` instances are immutable. Calling `.withWriteConcern()` on an existing `MongoDatabase` or `MongoCollection` instance returns a new instance and does not affect the instance on which the method is called.
+
+For example, in the following, the `collWithWriteConcern` instance has the write concern of majority whereas the write concern of the `collection` is unaffected.
+
+```java
+MongoCollection<Document> collWithWriteConcern = collection
+                                                  .withWriteConcern(WriteConcern.MAJORITY);
+```
+
+You can build `MongoClientOptions`, `MongoDatabase`, or `MongoCollection` to include a combination of write concern, [read concern]({{<docsref "reference/read-concern">}}), and [read preference]({{<docsref "reference/read-preference">}}).
+
+For example, the following sets all three at the collection level:
+
+```java
+collection = database.getCollection("restaurants")
+                .withReadPreference(ReadPreference.primary())
+                .withReadConcern(ReadConcern.MAJORITY)
+                .withWriteConcern(WriteConcern.MAJORITY);
+```
diff --git a/docs/reference/content/driver/tutorials/ssl.md b/docs/reference/content/driver/tutorials/ssl.md
new file mode 100644
index 00000000000..f317d426783
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/ssl.md
@@ -0,0 +1,230 @@
++++
+date = "2016-05-29T22:05:03-04:00"
+title = "TLS/SSL"
+[menu.main]
+  parent = "Connect to MongoDB"
+  identifier = "SSL"
+  weight = 10
+  pre = "<i class='fa'></i>"
++++
+
+## TLS/SSL
+
+The Java driver supports TLS/SSL connections to MongoDB servers using
+the underlying support for TLS/SSL provided by the JDK. 
+You can configure the driver to use TLS/SSL either with [`ConnectionString`]({{<apiref "com/mongodb/ConnectionString">}}) or with
+[`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings">}}).
+With the legacy MongoClient API you can use either [`MongoClientURI`]({{<apiref "com/mongodb/MongoClientURI">}}) or 
+[`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions">}}).
+
+## MongoClient API (since 3.7)
+
+### Specify TLS/SSL via `ConnectionString`
+
+```java
+com.mongodb.client.MongoClients;
+com.mongodb.client.MongoClient;
+```
+
+To specify TLS/SSL with [`ConnectionString`]({{<apiref "com/mongodb/ConnectionString">}}), specify `ssl=true` as part of the connection
+string, as in:
+
+```java
+MongoClient mongoClient = MongoClients.create("mongodb://localhost/?ssl=true");
+```
+
+### Specify TLS/SSL via `MongoClientSettings`
+
+```java
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+```
+
+To specify TLS/SSL with with [`MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings">}}), set the `enabled` property to 
+`true`, as in:
+
+```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .applyToSslSettings(builder -> 
+            builder.enabled(true))
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+### Specify `SSLContext` via `MongoClientSettings`
+
+```java
+import javax.net.ssl.SSLContext;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoClient;
+```
+
+To specify the [`javax.net.ssl.SSLContext`](https://docs.oracle.com/javase/8/docs/api/javax/net/ssl/SSLContext.html) with 
+[`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions">}}), set the `sslContext` property, as in:
+
+```java
+SSLContext sslContext = ...
+MongoClientSettings settings = MongoClientSettings.builder()
+        .applyToSslSettings(builder -> {
+                    builder.enabled(true);
+                    builder.context(sslContext);
+                })
+        .build();
+MongoClient client = MongoClients.create(settings);
+```
+
+## Legacy MongoClient API
+
+### Specify TLS/SSL via `MongoClientURI`
+
+```java
+import com.mongodb.MongoClientURI;
+import com.mongodb.MongoClient;
+```
+
+To specify TLS/SSL with [`MongoClientURI`]({{<apiref "com/mongodb/MongoClientURI">}}), specify `ssl=true` as part of the connection
+string, as in:
+
+```java
+MongoClientURI uri = new MongoClientURI("mongodb://localhost/?ssl=true");
+MongoClient mongoClient = new MongoClient(uri);
+```
+
+### Specify TLS/SSL via `MongoClientOptions`
+
+```java
+import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoClient;
+```
+
+To specify TLS/SSL with with [`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions">}}), set the `sslEnabled` property to `true`, as in:
+
+```java
+MongoClientOptions options = MongoClientOptions.builder()
+        .sslEnabled(true)
+        .build();
+MongoClient client = new MongoClient("localhost", options);
+```
+
+### Specify `SSLContext` via `MongoClientOptions`
+
+```java
+import javax.net.ssl.SSLContext;
+import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoClient;
+```
+
+To specify the [`javax.net.ssl.SSLContext`](https://docs.oracle.com/javase/8/docs/api/javax/net/ssl/SSLContext.html) with 
+[`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions">}}), set the `sslContext` property, as in:
+
+```java
+SSLContext sslContext = ...
+MongoClientOptions options = MongoClientOptions.builder()
+        .sslEnabled(true)
+        .sslContext(sslContext)
+        .build();
+ MongoClient client = new MongoClient("localhost", options);
+```
+
+## Disable Hostname Verification
+
+By default, the driver ensures that the hostname included in the
+server's SSL certificate(s) matches the hostname(s) provided when
+constructing a [`MongoClient()`]({{< apiref "com/mongodb/MongoClient.html">}}). However, the hostname verification
+requires a Java 7 JVM, as it relies on additions introduced in Java 7
+to the `javax.net.SSLParameters` class.
+
+If your application must run on Java 6, or for some other reason you
+need to disable hostname verification, you must explicitly indicate
+this in `MongoClientSettings`]({{<apiref "com/mongodb/MongoClientSettings">}}) 
+
+```java
+MongoClientSettings settings = MongoClientSettings.builder()
+        .applyToSslSettings(builder -> {
+                    builder.enabled(true);
+                    builder.invalidHostNameAllowed(true);
+                })
+        .build();
+```
+
+or, with the legacy `MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions">}}), using the `sslInvalidHostNameAllowed` property:
+
+```java
+MongoClientOptions.builder()
+        .sslEnabled(true)
+        .sslInvalidHostNameAllowed(true)
+        .build();
+```
+
+## JVM System Properties for TLS/SSL
+
+A typical application will need to set several JVM system properties to
+ensure that the client is able to validate the TLS/SSL certificate
+presented by the server:
+
+-  `javax.net.ssl.trustStore`:
+      The path to a trust store containing the certificate of the
+      signing authority
+
+-  `javax.net.ssl.trustStorePassword`:
+      The password to access this trust store
+
+The trust store is typically created with the
+[`keytool`](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html)
+command line program provided as part of the JDK. For example:
+
+```bash
+keytool -importcert -trustcacerts -file <path to certificate authority file>
+            -keystore <path to trust store> -storepass <password>
+```
+A typical application will also need to set several JVM system
+properties to ensure that the client presents an TLS/SSL certificate to the
+MongoDB server:
+
+- `javax.net.ssl.keyStore`
+      The path to a key store containing the client's TLS/SSL certificates
+
+- `javax.net.ssl.keyStorePassword`
+      The password to access this key store
+
+The key store is typically created with the
+[`keytool`](http://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html)
+or the [`openssl`](https://www.openssl.org/docs/apps/openssl.html)
+command line program.
+
+For more information on configuring a Java application for TLS/SSL, please
+refer to the [`JSSE Reference Guide`](http://docs.oracle.com/javase/8/docs/technotes/guides/security/jsse/JSS
+ERefGuide.html).
+
+## JVM Support for TLS v1.1 and newer
+
+Industry best practices recommend, and some regulations require, the use of TLS 1.1 or newer. Though no application changes are required
+for the driver to make use of the newest TLS protocols, Java runtime environments prior to Java 8 started to enable TLS 1.1 only in later
+updates:
+
+* Java 7
+  - Starting with
+    [Update 131](http://www.oracle.com/technetwork/java/javaseproducts/documentation/javase7supportreleasenotes-1601161.html#R170_131),
+    released October 8, 2016, TLS 1.1 and TLS 1.2 are enabled by default.
+  - Starting with
+    [Update 95](http://www.oracle.com/technetwork/java/javaseproducts/documentation/javase7supportreleasenotes-1601161.html#R170_95),
+    released January 19, 2016, TLS 1.1 and TLS 1.2 can be enabled by applications via the `jdk.tls.client.protocols` system property.
+
+* Java 6
+  - Starting with
+    [Update 141](http://www.oracle.com/technetwork/java/javase/documentation/overview-156328.html#R160_141), released on January 17, 2017,
+    TSL 1.1 and TLS 1.2 are enabled by default.
+  - Starting with
+    [Update 115 b32](http://www.oracle.com/technetwork/java/javase/documentation/overview-156328.html#6u115-b32), released July 19, 2016,
+    TLS 1.1 and TLS 1.2 can be enabled by applications via the `jdk.tls.client.protocols` system property.
+
+Note that these updates are only available from Oracle via its Java SE commercial support program.  Java 7 Update 131
+is available via [OpenJDK](http://openjdk.java.net/install/).
+
+### Forcing TLS 1.2
+
+Some applications may want to force only the TLS 1.2 protocol. To do this, set the `jdk.tls.client.protocols` system property to "TLSv1.2".
+
+Java runtime environments prior to Java 8 started to enable the TLS 1.2 protocol only in later updates, as shown in the previous section. For the driver to force the use of the TLS 1.2 protocol with a Java runtime environment prior to Java 8, ensure that the update has TLS 1.2 enabled.
diff --git a/docs/reference/content/driver/tutorials/text-search.md b/docs/reference/content/driver/tutorials/text-search.md
new file mode 100644
index 00000000000..9b6fa7e288b
--- /dev/null
+++ b/docs/reference/content/driver/tutorials/text-search.md
@@ -0,0 +1,131 @@
++++
+date = "2016-06-07T23:28:50-04:00"
+title = "Text Search"
+[menu.main]
+parent = "Sync Tutorials"
+identifier = "Text Search"
+weight = 80
+pre = "<i class='fa'></i>"
++++
+
+## Text Search
+
+MongoDB supports query operations that perform a [text search]({{<docsref "text-search">}}) of string content. To perform text search, MongoDB uses a [text index]({{<docsref "core/index-text">}}) and the [`$text` query operator]({{<docsref "reference/operator/query/text">}}).
+
+The Java driver provides the [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text(java.lang.String,com.mongodb.client.model.TextSearchOptions)">}}) helper to facilitate the creation of text search query filters.
+
+## Prerequisites
+
+- The example below requires a ``restaurants`` collection in the ``test`` database. To create and populate the collection, follow the directions in [github] (https://github.com/mongodb/docs-assets/tree/drivers).
+
+- Include the following import statements:
+
+     ```java
+     import com.mongodb.Block;
+     import com.mongodb.client.MongoClients;
+     import com.mongodb.client.MongoClient;
+     import com.mongodb.client.MongoCollection;
+     import com.mongodb.client.MongoDatabase;
+
+     import com.mongodb.client.model.Indexes;
+     import com.mongodb.client.model.Filters;
+     import com.mongodb.client.model.Sorts;
+     import com.mongodb.client.model.TextSearchOptions;
+     import com.mongodb.client.model.Projections;
+     import org.bson.Document;
+     ```
+
+- Include the following code which the examples in the tutorials will use to print the results of the text search:
+
+     ```java
+     Block<Document> printBlock = new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                System.out.println(document.toJson());
+            }
+        };
+     ```
+
+## Connect to a MongoDB Deployment
+
+Connect to a MongoDB deployment and declare and define a `MongoDatabase` instance.
+
+For example, include the following code to connect to a standalone MongoDB deployment running on localhost on port `27017` and define `database` to refer to the `test` database:
+
+```java
+MongoClient mongoClient = MongoClients.create();
+MongoDatabase database = mongoClient.getDatabase("test");
+```
+
+For additional information on connecting to MongoDB, see [Connect to MongoDB]({{< ref "connect-to-mongodb.md">}}).
+
+## Create the `text` Index
+
+To create a [text index]({{<docsref "core/index-text">}}), use the [`Indexes.text`]({{< relref "builders/indexes.md#text-index">}})
+static helper to create a specification for a text index and pass to [`MongoCollection.createIndex()`]({{<apiref "com/mongodb/client/MongoCollection.html#createIndex(org.bson.conversions.Bson)">}}) method.
+
+The following example creates a text index on the `name` field for the `restaurants` collection.
+
+```java
+MongoCollection<Document> collection = database.getCollection("restaurants");
+collection.createIndex(Indexes.text("name"));
+```
+
+## Perform Text Search
+
+To perform text search, use the [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text(java.lang.String,com.mongodb.client.model.TextSearchOptions)">}}) helper to specify the text search query filter.
+
+For example, the following code performs a text search on the `name` field for the word `"bakery"` or `"coffee"`.
+
+```java
+long matchCount = collection.countDocuments(Filters.text("bakery coffee"));
+System.out.println("Text search matches: " + matchCount);
+```
+
+The example should print the following output:
+
+```json
+Text search matches: 2
+```
+
+For more information on the text search, see [`$text` operator]({{<docsref "reference/operator/query/text">}}).
+
+### Text Score
+
+For each matching document, text search assigns a score, representing the relevance of a document to the specified text search query filter. To return and sort by score, use the [`$meta`]({{<docsref "reference/operator/query/text/#sort-by-text-search-score">}}) operator in the projection document and the sort expression.
+
+
+```java
+collection.find(Filters.text("bakery cafe"))
+                              .projection(Projections.metaTextScore("score"))
+                              .sort(Sorts.metaTextScore("score")).forEach(printBlock);
+```
+
+The example should print the following output:
+
+
+
+### Specify a Text Search Option
+
+The  [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text(java.lang.String,com.mongodb.client.model.TextSearchOptions)">}}) helper can accept various [text search options]({{<docsref "reference/operator/query/text">}}). The Java driver provides [`TextSearchOptions`]({{<apiref "com/mongodb/client/model/TextSearchOptions.html">}}) class to specify these options.
+
+For example, the following text search specifies the [text search language]({{<docsref "reference/text-search-languages">}}) option when performing text search for the word `cafe`:
+
+```java
+long matchCountEnglish = collection.countDocuments(Filters.text("cafe", new TextSearchOptions().language("english")));
+System.out.println("Text search matches (english): " + matchCountEnglish);
+```
+
+The example should print the following output:
+
+```json
+Text search matches (english): 1
+```
+
+For more information about text search see the following sections in the MongoDB Server Manual:
+
+- [`$text` query operator]({{< docsref "reference/operator/query/text">}})
+
+- [`text` index]({{< docsref "core/index-text" >}})
+
+- [Text Search Languages]({{<docsref "reference/text-search-languages">}})
diff --git a/docs/reference/content/index.md b/docs/reference/content/index.md
index 20e4fb19206..c39c8619d19 100644
--- a/docs/reference/content/index.md
+++ b/docs/reference/content/index.md
@@ -6,34 +6,29 @@ type = "index"
 
 ## MongoDB Java Driver Documentation
 
-Welcome to the MongoDB Java driver documentation hub for the 3.3 driver release.
+Welcome to the MongoDB Java driver documentation hub for the 3.12 driver release.
 
 
-### What's New in 3.3
+### What's New in 3.12
 
-The [What's New]({{< relref "whats-new/index.md" >}}) guide explains the major new features of the driver. 
+For key new features of 3.12, see [What's New]({{< relref "whats-new.md" >}}).
 
-If you are upgrading from the 3.2.x series of the driver, consult the [Upgrading]({{< relref "whats-new/upgrading.md" >}}) documentation
-for information on breaking changes.  If you are upgrading from the 2.x series of the driver, please consult the 3.0 reference 
-documentation as well. 
+### Upgrade
 
+To upgrade, refer to the [Upgrade Considerations]({{< relref "upgrading.md" >}}) documentation.
 
 ### MongoDB Driver
 
-For the synchronous MongoDB Driver, the [Getting Started]({{< relref "driver/getting-started/index.md" >}}) guide contains 
-installation instructions and a simple tutorial to get up  and running quickly. For more detailed documentation, see the 
-[Reference]({{< relref "driver/reference/index.md" >}}) guide.
-
+For the synchronous MongoDB Driver, see [MongoDB Driver section]({{< relref "driver/index.md" >}}).
 
 ### MongoDB Async Driver
 
-For the new asynchronous MongoDB Async Driver, the [Getting Started]({{< relref "driver-async/getting-started/index.md" >}}) 
-guide contains installation instructions and a simple tutorial to get up  and running quickly. For more detailed documentation, see the 
-[Reference]({{< relref "driver-async/reference/index.md" >}}) guide.
-
+For the callback-based asynchronous MongoDB Async Driver, see [MongoDB Async Driver section]({{< relref "driver-async/index.md" >}}). Note 
+that this driver has been deprecated in favor of the 
+[Reactive Streams Java Driver](http://mongodb.github.io/mongo-java-driver-reactivestreams/). 
 
 ### BSON Library
 
-The [BSON]({{< relref "bson/index.md">}}) library comprehensively supports the BSON spec, the data storage and network transfer format that MongoDB uses for 
-“documents".  The [reference guide]({{< relref "bson/index.md">}}) provides information about working with [Documents]({{< relref "bson/documents.md">}}), 
-how to use [Codecs]({{< relref "bson/codecs.md">}}) and [Extended JSON]({{< relref "bson/extended-json.md">}}) support. 
+The [BSON]({{< relref "bson/index.md">}}) library comprehensively supports the BSON spec, the data storage and network transfer format that MongoDB uses for
+“documents".  The [reference guide]({{< relref "bson/index.md">}}) provides information about working with [Documents]({{< relref "bson/documents.md">}}),
+how to use [Codecs]({{< relref "bson/codecs.md">}}) and [Extended JSON]({{< relref "bson/extended-json.md">}}) support.
diff --git a/docs/reference/content/upgrading.md b/docs/reference/content/upgrading.md
new file mode 100644
index 00000000000..e5c1d67ffa3
--- /dev/null
+++ b/docs/reference/content/upgrading.md
@@ -0,0 +1,109 @@
++++
+date = "2015-03-19T12:53:39-04:00"
+title = "Upgrade Considerations"
+[menu.main]
+  identifier = "Upgrading to 3.9"
+  weight = 80
+  pre = "<i class='fa fa-level-up'></i>"
++++
+
+{{% note class="important" %}}
+Please note that the 3.x series of releases (which includes support through MongoDB 4.2) will be the last releases that are compatible
+with *Java 6 or Java 7*.  The 4.0 Java driver will require a minimum of Java 8. 
+
+Please also note that support for new features in MongoDB 4.4 will likely only be available via a 4.x driver release.
+{{% /note %}}
+
+## Upgrading from 3.11.x
+
+In the upcoming 4.0 release, all deprecated API elements except those documented as "not currently scheduled for removal" will be removed.
+Currently the only deprecated API elements _not_ scheduled for removal are:
+
+* [`Mongo.getDB`]({{<apiref "com/mongodb/Mongo.html#getDB(java.lang.String)">}})
+* [`JsonMode.STRICT`]({{<apiref "org/bson/json/JsonMode.html#STRICT">}})
+
+To prepare for the 4.0 release, please compile with deprecation warnings enabled and replace all usage of deprecated API elements with their
+recommended replacements.
+
+The 3.12 release is binary and source compatible with the 3.11 release, except for methods that have been added to interfaces that
+have been marked as unstable, and changes to classes or interfaces that have been marked as internal or annotated as Beta.
+
+## Upgrading from 3.10.x
+
+Please note that the 3.11 driver enables both retryable reads and retryable writes by default, so users upgrading to the 3.11 driver may
+wish to adjust any custom retry logic in order to prevent applications from retrying for too long.
+
+In the upcoming 4.0 release, all deprecated API elements except those documented as "not currently scheduled for removal" will be removed.
+Currently the only deprecated API elements _not_ scheduled for removal are:
+
+* [`Mongo.getDB`]({{<apiref "com/mongodb/Mongo.html#getDB(java.lang.String)">}})
+* [`JsonMode.STRICT`]({{<apiref "org/bson/json/JsonMode.html#STRICT">}})
+
+To prepare for the 4.0 release, please compile with deprecation warnings enabled and replace all usage of deprecated API elements with their
+recommended replacements.
+
+The 3.11 release is binary and source compatible with the 3.10 release, except for methods that have been added to interfaces that
+have been marked as unstable, and changes to classes or interfaces that have been marked as internal or annotated as Beta.
+
+## Upgrading from 3.9.x
+
+Please note that two large portions of the current driver have been deprecated as of the 3.9.0 release:
+
+* The callback-based asynchronous driver has been deprecated in favor of the 
+[Reactive Streams Java Driver](http://mongodb.github.io/mongo-java-driver-reactivestreams/).
+* Much of the "core" driver on which the both the asynchronous and synchronous drivers are built has been deprecated.  In 3.0 we made most
+of this "core" driver a public API, but the benefit to users has turned out to be small and the maintenance costs of maintaining backwards 
+compatibility has turned out to be high.  For that reason we've decided to remove it from the public API (though it will still continue 
+to exist as an implementation artifact).
+
+In the upcoming 4.0 release, all deprecated API elements except those documented as "not currently scheduled for removal" will be removed. 
+Currently the only deprecated API elements _not_ scheduled for removal are:
+
+* [`Mongo.getDB`]({{<apiref "com/mongodb/Mongo.html#getDB(java.lang.String)">}})
+* [`JsonMode.STRICT`]({{<apiref "org/bson/json/JsonMode.html#STRICT">}}) 
+
+To prepare for the 4.0 release, please compile with deprecation warnings enabled and replace all usage of deprecated API elements with their
+recommended replacements.
+
+Also, note that the 3.11 release (which will include support for MongoDB 4.2) will be the last release that is compatible with *Java 6
+or Java 7*.  The 4.0 Java driver will require a minimum of Java 8. The 3.11 release will also be the last non-patch release in the 3.x 
+line. In particular, support for MongoDB 4.4 will only be made available via a 4.x driver release.
+
+The 3.10 release is binary and source compatible with the 3.9 release, except for methods that have been added to interfaces that
+have been marked as unstable, and changes to classes or interfaces that have been marked as internal or annotated as Beta.
+
+## Upgrading from 2.x
+
+See the Upgrade guide in the 3.0 driver reference documentation for breaking changes in 3.0.
+
+## System Requirements
+
+The minimum JVM is Java 6. However, specific features require more recent versions:
+
+- [Atlas M0 (Free Tier)](https://docs.atlas.mongodb.com/getting-started/) support requires Java 8 or greater due to 
+its reliance on TLS Server Name Indication (SNI).
+- SSL support requires Java 7 or greater in order to perform host name verification, which is enabled by default.  See
+[SSL]({{< relref "driver/tutorials/ssl.md" >}}) for details on how to disable host name verification.
+- The asynchronous API requires Java 7 when TLS/SSL is disabled, as by default it relies on
+[`AsynchronousSocketChannel`](http://docs.oracle.com/javase/7/docs/api/java/nio/channels/AsynchronousSocketChannel.html) for
+its implementation.  See [Async]({{< ref "driver-async/index.md" >}}) for details on configuring the driver to use 
+[Netty](http://netty.io/) instead.
+- The asynchronous API requires Java 8 when TLS/SSL is enabled. See [Async]({{< ref "driver-async/index.md" >}}) for details on configuring 
+the driver to use [Netty](http://netty.io/) instead.
+
+## Compatibility
+
+The following table specifies the compatibility of the MongoDB Java driver for use with a specific version of MongoDB.
+
+|Java Driver Version|MongoDB 2.6|MongoDB 3.0 |MongoDB 3.2|MongoDB 3.4|MongoDB 3.6|MongoDB 4.0|
+|-------------------|-----------|------------|-----------|-----------|-----------|-----------|
+|Version 3.9        |  ✓  |  ✓  |  ✓  |  ✓  |  ✓  |  ✓  |
+|Version 3.8        |  ✓  |  ✓  |  ✓  |  ✓  |  ✓  |  ✓  |
+|Version 3.7        |  ✓  |  ✓  |  ✓  |  ✓  |  ✓  |     |
+|Version 3.6        |  ✓  |  ✓  |  ✓  |  ✓  |  ✓  |     |
+|Version 3.5        |  ✓  |  ✓  |  ✓  |  ✓  |     |     |
+|Version 3.4        |  ✓  |  ✓  |  ✓  |  ✓  |     |     |
+|Version 3.3        |  ✓  |  ✓  |  ✓  |     |     |     |
+|Version 3.2        |  ✓  |  ✓  |  ✓  |     |     |     |
+|Version 3.1        |  ✓  |  ✓  |     |     |     |     |
+|Version 3.0        |  ✓  |  ✓  |     |     |     |     |
diff --git a/docs/reference/content/whats-new.md b/docs/reference/content/whats-new.md
new file mode 100644
index 00000000000..4e96a5eb3e2
--- /dev/null
+++ b/docs/reference/content/whats-new.md
@@ -0,0 +1,509 @@
++++
+date = "2016-06-09T12:47:43-04:00"
+title = "What's New"
+[menu.main]
+  identifier = "Release notes"
+  weight = 15
+  pre = "<i class='fa fa-level-up'></i>"
++++
+
+## What's new in 3.12
+
+This release fully supports all MongoDB releases from versions 2.6 to 4.2. Key new features of the 3.12 Java driver release include:
+
+### Security improvements
+
+Client-side field level encryption is supported. Automatic encryption and decryption is available for users of
+[MongoDB Enterprise Advanced](https://www.mongodb.com/products/mongodb-enterprise-advanced), while explicit encryption and decryption is
+available for users of MongoDB Community.
+
+See [Client-side Encryption]({{<ref "driver/tutorials/client-side-encryption.md">}}) for further details.
+
+### Improved interoperability when using the native UUID type
+
+The driver now supports setting the BSON binary representation of `java.util.UUID` instances via a new `UuidRepresentation` property on
+`MongoClientSettings`.  The default representation has not changed, but it will in the upcoming 4.0 major release of the driver. 
+Applications that store UUID values in MongoDB can use this setting to easily control the representation in MongoDB without having to
+register a `Codec<Uuid>` in the `CodecRegistry`.  
+
+See [`MongoClientSettings.getUuidRepresentation`]({{<apiref "com/mongodb/MongoClientSettings.html#getUuidRepresentation()">}}) for details. 
+
+## What's new in 3.11
+
+This release fully supports all MongoDB releases from versions 2.6 to 4.2. Key new features of the 3.11 Java driver release include:
+
+### Improved transactions support
+
+* The transactions API supports MongoDB 4.2 distributed transactions for use with sharded clusters. Distributed transactions use the same
+API as replica set transactions.
+* The sessions API supports the
+  [`ClientSession.withTransaction()`]({{<apiref "com/mongodb/client/ClientSession.html#withTransaction(com.mongodb.client.TransactionBody) ">}})
+  method to conveniently run a transaction with automatic retries and at-most-once semantics.
+* The transactions API supports the
+ [`maxCommitTime`]({{<apiref "com/mongodb/TransactionOptions.html#getMaxCommitTime(java.util.concurrent.TimeUnit)">}}) option to control the
+ maximum amount of time to wait for a transaction to commit.
+
+### Reliability improvements
+
+* Most read operations are by default
+  [automatically retried](https://github.com/mongodb/specifications/blob/master/source/retryable-reads/retryable-reads.rst). Supported read
+  operations that fail with a retryable error are retried automatically and transparently.
+* [Retryable writes](https://docs.mongodb.com/manual/core/retryable-writes/) are now enabled by default. Supported write
+  operations that fail with a retryable error are retried automatically and transparently, with at-most-once update semantics.
+* DNS [SRV](https://en.wikipedia.org/wiki/SRV_record) records are periodically polled in order to update the mongos proxy list without
+  having to change client configuration or even restart the client application. This feature is particularly useful when used with a sharded
+  cluster on [MongoDB Atlas](https://www.mongodb.com/cloud/atlas), which dynamically updates SRV records whenever you resize your Atlas
+  sharded cluster.
+* Connections to the replica set primary are no longer closed after a step-down, allowing in progress read operations to complete.
+
+### Security improvements
+
+Client-side encryption is supported. Automatic encryption and decryption is available for users of
+[MongoDB Enterprise Advanced](https://www.mongodb.com/products/mongodb-enterprise-advanced), while explicit encryption and decryption is
+available for users of MongoDB Community.
+
+See [Client-side Encryption]({{<ref "driver/tutorials/client-side-encryption.md">}}) for further details.
+
+### General improvements
+
+* New [`aggregate`]({{<apiref "com/mongodb/client/MongoDatabase.html##aggregate(java.util.List)">}}) helper methods support running
+database-level aggregations.
+* Aggregate helper methods now support the `$merge` pipeline stage, and
+[`Aggregates.merge()`]({{<apiref "com/mongodb/client/model/Aggregates.html#merge(java.lang.String)">}}) builder methods support creation of
+the new pipeline stage.
+* [Zstandard](https://facebook.github.io/zstd/) for wire protocol compression is supported in addition to Snappy and Zlib.
+* Change stream helpers now support the `startAfter` option.
+* Index creation helpers now support wildcard indexes.
+
+### Full list of changes
+
+* [New Features](https://jira.mongodb.org/issues/?jql=project%20%3D%20JAVA%20AND%20issuetype%20%3D%20%22New%20Feature%22%20AND%20resolution%20%3D%20Fixed%20AND%20fixVersion%20%3D%203.11.0%20ORDER%20BY%20component%20DESC%2C%20key%20ASC)
+* [Improvements](https://jira.mongodb.org/issues/?jql=project%20%3D%20JAVA%20AND%20issuetype%20%3D%20Improvement%20AND%20resolution%20%3D%20Fixed%20AND%20fixVersion%20%3D%203.11.0%20ORDER%20BY%20component%20DESC%2C%20key%20ASC)
+* [Bug Fixes](https://jira.mongodb.org/issues/?jql=project%20%3D%20JAVA%20AND%20issuetype%20%3D%20Bug%20AND%20resolution%20%3D%20Fixed%20AND%20fixVersion%20%3D%203.11.0%20ORDER%20BY%20component%20DESC%2C%20key%20ASC)
+
+## What's new in 3.10
+
+Key new features of the 3.10 Java driver release:
+
+### Native asynchronous TLS/SSL support
+
+Previously, any use of our asynchronous drivers with TLS/SSl required the use of Netty.  In 3.10, the driver supports asynchronous
+TLS/SSL natively, so no third-party dependency is required. To accomplish this, the driver contains code vendored from
+[https://github.com/marianobarrios/tls-channel](https://github.com/marianobarrios/tls-channel).
+
+### Operational improvements
+
+When connecting with the `mongodb+srv` protocol, the driver now polls DNS for changes to the SRV records when connected to a sharded 
+cluster.  See 
+[Polling SRV Records for Mongos Discovery](https://github.com/mongodb/specifications/blob/master/source/polling-srv-records-for-mongos-discovery/polling-srv-records-for-mongos-discovery.rst) 
+for more details.
+
+When retryable writes are enabled, the driver now outputs log messages at DEBUG level when a retryable write is attempted.  See
+[JAVA-2964](https://jira.mongodb.org/browse/JAVA-2964) for more details.
+
+### Codec Improvements
+
+The driver now mutates the id property of a POJO, when inserting a document via a POJO with a `null` id property of type `ObjectId`. See
+[JAVA-2674](https://jira.mongodb.org/browse/JAVA-2674) for more details.
+
+### JNDI
+
+The driver now offers a JNDI `ObjectFactory` implementation for creating instances of `com.mongodb.client.MongoClient`, the interface
+introduced in version 3.7 of the driver. See [JAVA-2883](https://jira.mongodb.org/browse/JAVA-2883) for more details.
+
+### Full list of changes
+
+* [New Features](https://jira.mongodb.org/issues/?jql=project%20%3D%20JAVA%20AND%20issuetype%20%3D%20%22New%20Feature%22%20AND%20fixVersion%20%3D%203.10.0%20ORDER%20BY%20component%20DESC%2C%20key%20ASC)
+* [Improvements](https://jira.mongodb.org/issues/?jql=project%20%3D%20JAVA%20AND%20issuetype%20%3D%20Improvement%20AND%20fixVersion%20%3D%203.10.0%20ORDER%20BY%20component%20DESC%2C%20key%20ASC)
+* [Bug Fixes](https://jira.mongodb.org/issues/?jql=project%20%3D%20JAVA%20AND%20issuetype%20%3D%20Bug%20AND%20fixVersion%20%3D%203.10.0%20ORDER%20BY%20component%20DESC%2C%20key%20ASC)
+
+## What's new in 3.9
+
+Key new features of the 3.9 Java driver release:
+
+### Android support
+
+The `mongodb-driver-embedded-android` module supports interaction with a MongoDB server running on an Android device.
+See [MongoDB Mobile](https://www.mongodb.com/products/mobile) for more details.
+
+### Deprecations
+
+Numerous classes and methods have been deprecated in the 3.9 release in preparation for a major 4.0 release.  See the 
+[Upgrading Guide]({{<ref "upgrading.md">}}) for more information.
+
+## What's New in 3.8
+
+Key new features of the 3.8 Java driver release:
+
+### Transactions
+
+The Java driver now provides support for executing CRUD operations within a transaction (requires MongoDB 4.0).  See the 
+[Transactions and MongoDB Drivers](https://docs.mongodb.com/master/core/transactions/#transactions-and-mongodb-drivers) section
+of the documentation and select the `Java (Sync)` tab.
+
+### Change Stream enhancements
+
+The Java driver now provides support for opening a change stream against an entire database, via new 
+[`MongoDatabase.watch`]({{<apiref "com/mongodb/client/MongoDatabase.html">}}) methods, or an 
+entire deployment, via new [`MongoClient.watch`]({{<apiref "com/mongodb/client/MongoClient.html">}}) methods. See 
+[Change Streams]({{<ref "driver/tutorials/change-streams.md">}}) for further details.
+
+### SCRAM-256 Authentication Mechanism
+
+The Java driver now provides support for the SCRAM-256 authentication mechanism (requires MongoDB 4.0).
+
+
+## What's New in 3.7
+
+Key new features of the 3.7 Java driver release:
+
+### Java 9 support
+
+#### Modules
+
+The Java driver now provides a set of JAR files that are compliant with the Java 9 
+[module specification](http://cr.openjdk.java.net/~mr/jigsaw/spec/), and `Automatic-Module-Name` declarations have been added 
+to the manifests of those JAR files. See the [Installation Guide]({{<ref "driver/getting-started/installation.md">}}) 
+for information on which JAR files are now Java 9-compliant modules as well as what each of their module names is.  
+
+Note that it was not possible to modularize all the existing JAR files due to the fact that, for some of them, packages are split amongst 
+multiple JAR files, and this violates a core rule of the Java 9 module system which states that at most one module contains classes for any 
+given package. For instance, the `mongodb-driver` and `mongodb-driver-core` JAR files both contain classes in the `com.mongodb` package, 
+and thus it's not possible to make both `mongodb-driver` and `mongodb-driver-core` Java 9 modules. Also so-called 
+"uber jars" like `mongo-java-driver` are not appropriate for Java 9 modularization, as they can conflict with their non-uber brethren, and 
+thus have not been given module names. 
+
+Note that none of the modular JAR files contain `module-info` class files yet.  Addition of these classes will be considered in a future 
+release.
+
+#### New Entry Point
+
+So that the driver can offer a modular option, a new entry point has been added to the `com.mongodb.client` package. 
+Static methods in this entry point, `com.mongodb.client.MongoClients`, returns instances of a new `com.mongodb.client.MongoClient` 
+interface.  This interface, while similar to the existing `com.mongodb.MongoClient` class in that it is a factory for 
+`com.mongodb.client.MongoDatabase` instances, does not support the legacy `com.mongodb.DBCollection`-based API, and thus does not suffer 
+from the aforementioned package-splitting issue that prevents Java 9 modularization. This new entry point is encapsulated in the new 
+`mongodb-driver-sync` JAR file, which is also a Java 9-compliant module.
+
+The new entry point also moves the driver further in the direction of effective deprecation of the legacy API, which is now only available
+only via the `mongo-java-driver` and `mongodb-driver` uber-jars, which are not Java 9 modules. At this point there are no plans to offer 
+the legacy API as a Java 9 module.
+
+See [Connect To MongoDB]({{<ref "driver/tutorials/connect-to-mongodb.md">}}) for details on the new `com.mongodb.client.MongoClients`
+and how it compares to the existing `com.mongodb.MongoClient` class.   
+
+### Unix domain socket support
+
+The 3.7 driver adds support for Unix domain sockets via the [`jnr.unixsocket`](http://https://github.com/jnr/jnr-unixsocket) library.
+Connecting to Unix domain sockets is done via the [`ConnectionString`]({{< apiref "com/mongodb/ConnectionString" >}}) or via
+[`UnixServerAddress`]({{<apiref "com/mongodb/UnixServerAddress.html">}}).
+
+### PojoCodec improvements
+
+The 3.7 release brings support for `Map<String, Object>` to the POJO `Codec`.
+
+### JSR-310 Instant, LocalDate & LocalDateTime support
+
+Support for `Instant`, `LocalDate` and `LocalDateTime` has been added to the driver. The MongoDB Java drivers team would like to thank
+[Cezary Bartosiak](https://github.com/cbartosiak) for their excellent contribution to the driver. Users needing alternative data structures
+and / or more flexibility regarding JSR-310 dates should check out the alternative JSR-310 codecs provider by Cezary:
+[bson-codecs-jsr310](https://github.com/cbartosiak/bson-codecs-jsr310).
+
+### JSR-305 NonNull annotations
+
+The public API is now annotated with JSR-305 compatible `@NonNull` and `@Nullable` annotations.  This will allow programmers
+to rely on tools like FindBugs/SpotBugs, IDEs like IntelliJ IDEA, and compilers like the Kotlin compiler to find errors in the use of the 
+driver via static analysis rather than via runtime failures.
+
+### Improved logging of commands
+
+When the log level is set to DEBUG for the `org.mongodb.driver.protocol.command` logger, the driver now logs additional information to aid
+in debugging:
+
+* Before sending the command, it logs the full command (up to 1000 characters), and the request id.
+* After receive a response to the command, it logs the request id and elapsed time in milliseconds.
+
+Here's an example
+
+```
+10:37:29.099 [cluster-ClusterId {value='5a466138741fc252712a6d71', description='null'}-127.0.0.1:27017] DEBUG org.mongodb.driver.protocol.command - 
+Sending command '{ "ismaster" : 1, "$db" : "admin" } ...' with request id 4 to database admin on connection [connectionId{localValue:1, serverValue:1958}] to server 127.0.0.1:27017
+10:37:29.104 [cluster-ClusterId{value='5a466138741fc252712a6d71', description='null'}-127.0.0.1:27017] DEBUG org.mongodb.driver.protocol.command - 
+Execution of command with request id 4 completed successfully in 22.44 ms on connection [connectionId {localValue:1, serverValue:1958}] to server 127.0.0.1:27017
+```
+ 
+### Improved support for "raw" documents
+
+When working with "raw" BSON for improved performance via the [`RawBsonDocument`]({{<apiref "org/bson/RawBsonDocument">}}), the efficiency
+of accessing embedded documents and arrays has been drastically improved by returning raw slices of the containing document or array.  For
+instance
+
+```java
+RawBsonDocument doc = new RawBsonDocument(bytes);
+
+// returns a RawBsonDocument that is a slice of the bytes from the containing doc
+BsonDocument embeddedDoc = doc.getDocument("embeddedDoc");
+
+// returns a RawBsonArray that is a slice of the bytes from the containing doc
+BsonArray embeddedArray = doc.getArray("embeddedArray");
+
+// returns a RawBsonDocument that is a slice of the bytes from the containing array 
+BsonDocument embeddedDoc2 = (BsonDocument) embeddedArray.get(0); 
+``` 
+
+## What's New in 3.6
+
+Key new features of the 3.6 Java driver release:
+
+### Change Stream support
+
+The 3.6 release adds support for [change streams](http://dochub.mongodb.org/core/changestreams).
+
+* [Change Stream Quick Start]({{<ref "driver/tutorials/change-streams.md">}}) 
+* [Change Stream Quick Start (Async)]({{<ref "driver-async/tutorials/change-streams.md">}})
+
+### Retryable writes
+
+The 3.6 release adds support for retryable writes using the `retryWrites` option in 
+[`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions">}}).
+
+### Compression
+
+The 3.6 release adds support for compression of messages to and from appropriately configured MongoDB servers:
+
+* [Compression Tutorial]({{<ref "driver/tutorials/compression.md">}})
+* [Compression Tutorial (Async)]({{<ref "driver-async/tutorials/compression.md">}})
+
+### Causal consistency
+              
+The 3.6 release adds support for [causally consistency](http://dochub.mongodb.org/core/causal-consistency) via the new
+[`ClientSession`]({{<apiref "com/mongodb/session/ClientSession">}}) API. 
+
+### Application-configured server selection
+
+The 3.6 release adds support for application-configured control over server selection, using the `serverSelector` option in
+[`MongoClientOptions`]({{<apiref "com/mongodb/MongoClientOptions">}}).
+
+### POJO Codec improvements
+
+The 3.6 release brings new improvements to the POJO `Codec`:
+
+  * Improved sub-class and discriminator support.
+  * Support for custom Collection and Map implementations.
+  * Improvements to the `BsonCreator` annotation, which now supports `@BsonId` and `@BsonProperty` with values that represent the read name of the property.
+  * A new [`PropertyCodecProvider`]({{<apiref "org/bson/codecs/pojo/PropertyCodecProvider">}}) API, allowing for easy and type-safe handling of container types.
+  * Added the [`SET_PRIVATE_FIELDS_CONVENTION`]({{<apiref "org/bson/codecs/pojo/Conventions.html#SET_PRIVATE_FIELDS_CONVENTION">}}) convention.
+  * Added the [`USE_GETTERS_FOR_SETTERS`]({{<apiref "org/bson/codecs/pojo/Conventions.html#USE_GETTERS_FOR_SETTERS">}}) convention.
+
+The MongoDB Java drivers team would like to thank both [Joseph Florencio](https://github.com/jflorencio) and [Qi Liu](https://github.com/visualage)
+for their excellent contributions to the PojoCodec.
+
+## What's New in 3.5
+
+Key new features of the 3.5 Java driver release:
+
+### Native POJO support
+
+The 3.5 release adds support for [POJO](https://en.wikipedia.org/wiki/Plain_old_Java_object) serialization at the BSON layer, and can be
+used by the synchronous and asynchronous drivers.  See the POJO Quick start pages for details.
+
+* [POJO Quick Start]({{<ref "driver/getting-started/quick-start-pojo.md">}}) 
+* [POJO Quick Start (Async)]({{<ref "driver-async/getting-started/quick-start-pojo.md">}})
+* [POJO Reference]({{<ref "bson/pojos.md">}}) 
+
+### Improved JSON support
+
+The 3.5 release improves support for JSON parsing and generation.
+
+* Implements the new [Extended JSON specification](https://github.com/mongodb/specifications/blob/master/source/extended-json.rst)
+* Implements custom JSON converters to give applications full control over JSON generation for each BSON type
+
+See the [JSON reference]({{<ref "bson/extended-json.md">}}) for details. 
+
+### Connection pool monitoring
+
+The 3.5 release adds support for monitoring connection pool-related events.
+
+* [Connection pool monitoring in the driver]({{<ref "driver/reference/monitoring.md">}})
+* [Connection pool monitoring in the async driver]({{<ref "driver-async/reference/monitoring.md">}})
+
+### SSLContext configuration
+
+The 3.5 release supports overriding the default `javax.net.ssl.SSLContext` used for SSL connections to MongoDB.
+
+* [SSL configuration in the driver]({{<ref "driver/tutorials/ssl.md">}})
+* [SSL configuration in the async driver]({{<ref "driver-async/tutorials/ssl.md">}})
+
+### KeepAlive configuration deprecated
+
+The 3.5 release deprecated socket keep-alive settings, also socket keep-alive checks are now on by default.
+It is *strongly recommended* that system keep-alive settings should be configured with shorter timeouts. 
+
+See the 
+['does TCP keep-alive time affect MongoDB deployments?']({{<docsref "/faq/diagnostics/#does-tcp-keepalive-time-affect-mongodb-deployments">}}) 
+documentation for more information.
+
+
+## What's New in 3.4
+
+The 3.4 release includes full support for the MongoDB 3.4 server release.  Key new features include:
+
+### Support for Decimal128 Format
+
+``` java
+import org.bson.types.Decimal128;
+```
+
+The [Decimal128]({{<docsref "release-notes/3.4/#decimal-type">}}) format supports numbers with up to 34 decimal digits
+(i.e. significant digits) and an exponent range of −6143 to +6144.
+
+To create a `Decimal128` number, you can use
+
+- [`Decimal128.parse()`] ({{<apiref "org/bson/types/Decimal128.html">}}) with a string:
+
+      ```java
+      Decimal128.parse("9.9900");
+      ```
+
+- [`new Decimal128()`] ({{<apiref "org/bson/types/Decimal128.html">}}) with a long:
+
+
+      ```java
+      new Decimal128(10L);
+      ```
+
+- [`new Decimal128()`] ({{<apiref "org/bson/types/Decimal128.html">}}) with a `java.math.BigDecimal`:
+
+      ```java
+      new Decimal128(new BigDecimal("4.350000"));
+      ```
+
+### Support for Collation
+
+```java
+import com.mongodb.client.model.Collation;
+```
+
+[Collation]({{<docsref "reference/collation/">}}) allows users to specify language-specific rules for string
+comparison. 
+Use the [`Collation.builder()`] ({{<apiref "com/mongodb/client/model/Collation.html">}}) 
+to create the `Collation` object. For example, the following example creates a `Collation` object with Primary level of comparison and [locale]({{<docsref "reference/collation-locales-defaults/#supported-languages-and-locales">}}) ``fr``.
+
+```java
+Collation.builder().collationStrength(CollationStrength.PRIMARY).locale("fr").build()));
+```
+
+You can specify collation at the collection level, at an index level, or at a collation-supported operation level:
+
+#### Collection Level
+
+To specify collation at the collection level, pass a `Collation` object as an option to the `createCollection()` method. To specify options to the `createCollection` method, use the [`CreateCollectionOptions`]({{<apiref "com/mongodb/client/model/CreateCollectionOptions.html">}}) class. 
+
+```java
+database.createCollection("myColl", new CreateCollectionOptions().collation(
+                              Collation.builder()
+                                    .collationStrength(CollationStrength.PRIMARY)
+                                    .locale("fr").build()));
+```
+
+#### Index Level
+
+To specify collation for an index, pass a `Collation` object as an option to the `createIndex()` method. To specify index options, use the [IndexOptions]({{<apiref "com/mongodb/client/model/IndexOptions.html">}}) class. 
+
+```java
+IndexOptions collationIndexOptions = new IndexOptions().name("collation-fr")
+                                       .collation(Collation.builder()
+                                       .collationStrength(CollationStrength.SECONDARY)
+                                       .locale("fr").build());
+
+collection.createIndex(
+        Indexes.ascending("name"), collationIndexOptions);
+```
+
+#### Operation Level
+
+The following operations support collation by specifying the
+`Collation` object to their respective Iterable object.
+
+- `MongoCollection.aggregate()`
+   
+- `MongoCollection.distinct()`
+   
+- `MongoCollection.find()`
+
+- `MongoCollection.mapReduce()`
+
+For example:
+
+```java
+Collation collation = Collation.builder()
+                                 .collationStrength(CollationStrength.SECONDARY)
+                                 .locale("fr").build();
+
+collection.find(Filters.eq("category", "cafe")).collation(collation);
+
+collection.aggregate(Arrays.asList(
+                         Aggregates.group("$category", Accumulators.sum("count", 1))))
+          .collation(collation);
+
+```
+
+The following operations support collation by specifying the
+`Collation` object as an option using the corresponding option class
+for the method:
+
+- `MongoCollection.count()`
+- `MongoCollection.deleteOne()`
+- `MongoCollection.deleteMany()`
+- `MongoCollection.findOneAndDelete()` 
+- `MongoCollection.findOneAndReplace()`
+- `MongoCollection.findOneAndUpdate()`
+- `MongoCollection.updateOne()`
+- `MongoCollection.updateMany()`
+- `MongoCollection.bulkWrite()` for:
+
+   - `DeleteManyModel` and `DeleteOneModel` using `DeleteOptions` to specify the collation
+   - `ReplaceOneModel`, `UpdateManyModel`, and `UpdateOneModel` using `UpdateOptions` to specify the collation.
+
+For example:
+
+```java
+Collation collation = Collation.builder()
+                                 .collationStrength(CollationStrength.SECONDARY)
+                                 .locale("fr").build();
+
+collection.count(Filters.eq("category", "cafe"), new CountOptions().collation(collation));
+
+collection.updateOne(Filters.eq("category", "cafe"), set("stars", 1), 
+                     new UpdateOptions().collation(collation));
+
+collection.bulkWrite(Arrays.asList(
+                new UpdateOneModel<>(new Document("category", "cafe"),
+                                     new Document("$set", new Document("x", 0)), 
+                                     new UpdateOptions().collation(collation)),
+                new DeleteOneModel<>(new Document("category", "cafe"), 
+                                     new DeleteOptions().collation(collation))));
+```
+  
+
+For more information on collation, including the supported locales, refer to the
+[manual]({{<docsref "reference/collation/">}}).
+
+### Other MongoDB 3.4 features
+
+* Support for specification of
+[maximum staleness for secondary reads](https://github.com/mongodb/specifications/blob/master/source/max-staleness/max-staleness.rst)
+* Support for the
+[MongoDB handshake protocol](https://github.com/mongodb/specifications/blob/master/source/mongodb-handshake/handshake.rst).
+* Builders for [eight new aggregation pipeline stages]({{<docsref "release-notes/3.4/#aggregation">}})
+* Helpers for creating [read-only views]({{<docsref "release-notes/3.4/#views">}})
+* Support for the [linearizable read concern](https://docs.mongodb.com/master/release-notes/3.4/#linearizable-read-concern)
+
+### Support for JNDI
+
+The synchronous driver now includes a [JNDI]({{<ref "driver/tutorials/jndi.md">}}) ObjectFactory implementation.
+
+
+## Upgrading
+
+See the [upgrading guide]({{<ref "upgrading.md">}}) on how to upgrade to 3.5.
diff --git a/docs/reference/content/whats-new/index.md b/docs/reference/content/whats-new/index.md
deleted file mode 100644
index 25e8696962f..00000000000
--- a/docs/reference/content/whats-new/index.md
+++ /dev/null
@@ -1,25 +0,0 @@
-+++
-date = "2015-03-19T12:53:35-04:00"
-title = "What's New"
-[menu.main]
-  identifier = "Whats New"
-  weight = 10
-  pre = "<i class='fa fa-cog'></i>"
-+++
-
-# What's New in 3.3
-
-New features of the 3.3 driver include:
-
-- [Cluster Monitoring]({{<ref "driver/reference/management/monitoring.md#cluster-monitoring">}}) in the synchronous and asynchronous
-drivers
-- [Command Monitoring]({{<ref "driver/reference/management/monitoring.md#command-monitoring">}}) in the asynchronous driver
-(support in the synchronous driver was added in a previous release)
-- Additional query parameters in the [connection string]({{<ref "driver/reference/connecting/connection-settings.md#connection-string">}})
-- [GridFS]({{<ref "driver-async/reference/gridfs/index.md">}}) in the asynchronous driver
-- Additional configuration options for [GSSAPI authentication]({{<ref "driver/reference/connecting/authenticating.md#gssapi">}}).
-- [JNDI]({{<ref "driver/reference/connecting/jndi.md">}}) ObjectFactory implementation
-
-## Upgrading
-
-See the [upgrading guide]({{<ref "whats-new/upgrading.md">}}) on how to upgrade to 3.3.
diff --git a/docs/reference/content/whats-new/upgrading.md b/docs/reference/content/whats-new/upgrading.md
deleted file mode 100644
index d1f1046eef5..00000000000
--- a/docs/reference/content/whats-new/upgrading.md
+++ /dev/null
@@ -1,28 +0,0 @@
-+++
-date = "2015-03-19T12:53:39-04:00"
-title = "Upgrading to 3.3"
-[menu.main]
-  parent = "Whats New"
-  identifier = "Upgrading to 3.3"
-  weight = 40
-  pre = "<i class='fa fa-wrench'></i>"
-+++
-
-# Upgrading from 3.2.x
-
-The 3.3 release is binary and source compatible with the 3.2 release except for methods that have been added to interfaces that have
-been marked as unstable.
- 
-# Upgrading from 2.x
-
-Please see the Upgrading guide in the 3.0 driver reference documentation.
-
-## System Requirements
-
-The minimum JVM is now Java 6: however, specific features require Java 7:
-
-- SSL support requires Java 7 in order to perform host name verification, which is enabled by default.  See below and on
-[SSL]({{< relref "driver/reference/connecting/ssl.md" >}}) for details on how to disable host name verification.
-- The asynchronous API requires Java 7, as by default it relies on
-[`AsynchronousSocketChannel`](http://docs.oracle.com/javase/7/docs/api/java/nio/channels/AsynchronousSocketChannel.html) for
-its implementation.  See [Async]({{< ref "driver-async/index.md" >}}) for details on configuring the driver to use [Netty](http://netty.io/) instead.
diff --git a/docs/reference/data/mongodb.toml b/docs/reference/data/mongodb.toml
index 4ab1f2624c2..ff972c7d4d6 100644
--- a/docs/reference/data/mongodb.toml
+++ b/docs/reference/data/mongodb.toml
@@ -1,6 +1,6 @@
 # Update versions in config.toml as well
 githubRepo = "mongo-java-driver"
 githubBranch = "master"
-currentVersion = "3.3"
+currentVersion = "3.12"
 highlightTheme = "idea.css"
-apiUrl = "http://api.mongodb.com/java/3.3/"
+apiUrl = "/javadoc/"
diff --git a/docs/reference/layouts/partials/assets/cssExtras.html b/docs/reference/layouts/partials/assets/cssExtras.html
index 28e2525d345..222b7e8c2fc 100644
--- a/docs/reference/layouts/partials/assets/cssExtras.html
+++ b/docs/reference/layouts/partials/assets/cssExtras.html
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/lib/bootstrap-toggle/bootstrap-toggle.min.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/css/java.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/lib/bootstrap-toggle/bootstrap-toggle.min.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/css/java.css" type="text/css" />
diff --git a/docs/reference/layouts/partials/assets/javascriptExtras.html b/docs/reference/layouts/partials/assets/javascriptExtras.html
index 7a8a51ea154..ab910702b91 100644
--- a/docs/reference/layouts/partials/assets/javascriptExtras.html
+++ b/docs/reference/layouts/partials/assets/javascriptExtras.html
@@ -1,2 +1,2 @@
-<script type="text/javascript" src="{{.Site.BaseUrl}}/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/js/java.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/js/java.js"></script>
diff --git a/docs/reference/layouts/partials/meta.html b/docs/reference/layouts/partials/meta.html
new file mode 100644
index 00000000000..b0ee3e74af6
--- /dev/null
+++ b/docs/reference/layouts/partials/meta.html
@@ -0,0 +1,6 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="MongoDB Java Driver documentation">
+<meta name="author" content="MongoDB Drivers Team">
+<meta name="keyword" content="MongoDB, Java, JVM, NoSQL, Document Database">
+<meta name="date" content="{{ now.Format "2006-01-02T15:04:05.99"}}">
diff --git a/docs/reference/layouts/shortcodes/apiref.html b/docs/reference/layouts/shortcodes/apiref.html
index 44a77ff26d7..339ba0b8c08 100644
--- a/docs/reference/layouts/shortcodes/apiref.html
+++ b/docs/reference/layouts/shortcodes/apiref.html
@@ -1 +1 @@
-{{ .Page.Site.Data.mongodb.apiUrl }}?{{ with (.Get 0) }}{{ . }}{{ if ne (in . ".html") true}}.html{{ end }}{{ end }}
+{{ .Page.Site.BaseURL}}{{ .Page.Site.Data.mongodb.apiUrl }}{{ with (.Get 0) }}{{ . }}{{ if ne (in . ".html") true}}.html{{ end }}{{ end }}
diff --git a/docs/reference/layouts/shortcodes/install.html b/docs/reference/layouts/shortcodes/install.html
index 87c7c2c054f..68e87b3543d 100644
--- a/docs/reference/layouts/shortcodes/install.html
+++ b/docs/reference/layouts/shortcodes/install.html
@@ -1,6 +1,11 @@
-{{ $artifactId := .Get "artifactId"}}{{ $version := .Get "version"}}{{ $dependencies := .Get "dependencies"}}{{ $snapshot := in $version "SNAPSHOT" }}
-{{ if $snapshot }}
-{{$ossUrl := "https://oss.sonatype.org/content/repositories/snapshots"}}
+{{- $artifactId := .Get "artifactId"}}
+{{- $version := .Get "version" -}}
+{{- $classifier := .Get "classifier" -}}
+{{- $dependencies := .Get "dependencies" -}}
+{{- $snapshot := in $version "SNAPSHOT" -}}
+
+{{- if $snapshot -}}
+{{- $ossUrl := "https://oss.sonatype.org/content/repositories/snapshots" -}}
 <section class="maven">
 <pre><code class="ini">
 &lt;dependencies&gt;
@@ -25,7 +30,7 @@
 <section class="gradle hidden">
 <pre><code>
   dependencies {
-      compile 'org.mongodb:{{$artifactId}}:{{$version}}'
+      compile 'org.mongodb:{{$artifactId}}:{{$version}}{{- if $classifier -}}:{{$classifier}}{{- end -}}'
   }
   repositories {
     maven {
@@ -36,26 +41,27 @@
 </code></pre>
 </section>
 <section class="downloadInfo small">
-    <p>You can also download the jars
+    <p><strong>Note:</strong> You can also download the jars
         <a href="{{$ossUrl}}/org/mongodb/{{$artifactId}}/{{$version}}" target="_blank">directly</a>
         from sonatype.</a></p>
-    {{ with $dependencies}}
+    {{- with $dependencies -}}
     <p>
-        <strong>Note:</strong> <code>{{$artifactId}}</code> requires the following dependencies:
+        <code>{{$artifactId}}</code> requires the following dependencies:
         <a href="{{$ossUrl}}/org/mongodb/bson/{{$version}}" target="_blank"><code>bson</code></a> and
         <a href="{{$ossUrl}}/org/mongodb/mongodb-driver-core/{{$version}}" target="_blank"><code>mongodb-driver-core</code></a>
     </p>
-    {{end}}
+    {{- end -}}
 </section>
-{{ else }}
-{{$ossUrl := "https://oss.sonatype.org/content/repositories/releases"}}
+{{- else -}}
+{{- $ossUrl := "https://oss.sonatype.org/content/repositories/releases" -}}
 <section class="maven">
 <pre><code class="ini">
 &lt;dependencies&gt;
     &lt;dependency&gt;
         &lt;groupId&gt;org.mongodb&lt;/groupId&gt;
         &lt;artifactId&gt;{{$artifactId}}&lt;/artifactId&gt;
-        &lt;version&gt;{{$version}}&lt;/version&gt;
+        &lt;version&gt;{{$version}}&lt;/version&gt;{{- if $classifier }}
+        &lt;classifier&gt;{{$classifier}}&lt;/classifier&gt;{{- end }}
     &lt;/dependency&gt;
 &lt;/dependencies&gt;
 
@@ -64,21 +70,22 @@
 <section class="gradle hidden">
 <pre><code>
   dependencies {
-      compile 'org.mongodb:{{$artifactId}}:{{$version}}'
+      compile 'org.mongodb:{{$artifactId}}:{{$version}}{{- if $classifier -}}:{{$classifier}}{{- end -}}'
   }
 
 </code></pre>
 </section>
 <section class="downloadInfo small">
-    <p>You can also download the jars
+    <p><strong>Note:</strong> You can also download the <code>{{$artifactId}}</code> jar
         <a href="{{$ossUrl}}/org/mongodb/{{$artifactId}}/{{$version}}" target="_blank">directly</a>
         from sonatype.</a></p>
-    {{ with $dependencies}}
+    {{- with $dependencies -}}
     <p>
-        <strong>Note:</strong> <code>{{$artifactId}}</code> requires the following dependencies:
+        If downloading <code>{{$artifactId}}</code> manually,
+        you must also download its dependencies:
         <a href="{{$ossUrl}}/org/mongodb/bson/{{$version}}" target="_blank"><code>bson</code></a> and
         <a href="{{$ossUrl}}/org/mongodb/mongodb-driver-core/{{$version}}" target="_blank"><code>mongodb-driver-core</code></a>
     </p>
-    {{end}}
+    {{- end -}}
 </section>
-{{ end }}
+{{- end -}}
diff --git a/docs/reference/themes/mongodb/layouts/_default/list.html b/docs/reference/themes/mongodb/layouts/_default/list.html
index 95b5a3c2c9a..919f7b218c4 100644
--- a/docs/reference/themes/mongodb/layouts/_default/list.html
+++ b/docs/reference/themes/mongodb/layouts/_default/list.html
@@ -1,12 +1,12 @@
-{{ partial "header.html" . }}
+{{- partial "header.html" . -}}
 <section id="main">
   <div>
-   <h1 id="title">{{ .Title }}</h1>
+   <h1 id="title">{{- .Title -}}</h1>
         <ul id="list">
-            {{ range .Data.Pages }}
-                {{ .Render "li"}}
-            {{ end }}
+            {{- range .Data.Pages -}}
+                {{- .Render "li" -}}
+            {{- end -}}
         </ul>
   </div>
 </section>
-{{ partial "footer.html" . }}
+{{- partial "footer.html" . -}}
diff --git a/docs/reference/themes/mongodb/layouts/_default/single.html b/docs/reference/themes/mongodb/layouts/_default/single.html
index a8ff9f32eb6..d6c8a188ba3 100644
--- a/docs/reference/themes/mongodb/layouts/_default/single.html
+++ b/docs/reference/themes/mongodb/layouts/_default/single.html
@@ -1,4 +1,4 @@
-{{ partial "header.html" . }}
-{{ partial "header/contentHeader.html" . }}
+{{- partial "header.html" . -}}
+{{- partial "header/contentHeader.html" . -}}
 {{ .Content }}
-{{ partial "footer.html" . }}
+{{- partial "footer.html" . -}}
diff --git a/docs/reference/themes/mongodb/layouts/index.html b/docs/reference/themes/mongodb/layouts/index.html
index 9260db43d3f..8f41c752446 100644
--- a/docs/reference/themes/mongodb/layouts/index.html
+++ b/docs/reference/themes/mongodb/layouts/index.html
@@ -1,12 +1,12 @@
-{{ partial "header.html" . }}
-{{ $.Scratch.Set "indexFound" false }}
-{{ range where .Data.Pages ".Type" "index" }}
-    {{ $.Scratch.Set "indexFound" true }}
-    {{ .Content }}
-{{ end }}
+{{- partial "header.html" . -}}
+{{- $.Scratch.Set "indexFound" false -}}
+{{- range where .Data.Pages ".Type" "index" -}}
+    {{- $.Scratch.Set "indexFound" true -}}
+    {{- .Content -}}
+{{- end -}}
 
-{{if eq ($.Scratch.Get "indexFound") false }}
-{{ partial "welcome.html" . }}
-{{ end }}
+{{- if eq ($.Scratch.Get "indexFound") false -}}
+{{- partial "welcome.html" . -}}
+{{- end -}}
 
-{{ partial "footer.html" . }}
+{{- partial "footer.html" . -}}
diff --git a/docs/reference/themes/mongodb/layouts/partials/assets/css.html b/docs/reference/themes/mongodb/layouts/partials/assets/css.html
index 09355f38c9d..6a39d8ff648 100644
--- a/docs/reference/themes/mongodb/layouts/partials/assets/css.html
+++ b/docs/reference/themes/mongodb/layouts/partials/assets/css.html
@@ -1,6 +1,6 @@
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/lib/bootstrap.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/lib/font-awesome/css/font-awesome.min.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/css/mongodb-docs.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/css/overrides.css" type="text/css" />
-<link rel="stylesheet" href="{{.Site.BaseUrl}}/lib/highlight/styles/{{ .Site.Data.mongodb.highlightTheme }}" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/lib/bootstrap.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/lib/font-awesome/css/font-awesome.min.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/css/mongodb-docs.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/css/overrides.css" type="text/css" />
+<link rel="stylesheet" href="{{.Site.BaseURL}}/lib/highlight/styles/{{ .Site.Data.mongodb.highlightTheme }}" />
 {{ partial "assets/cssExtras.html" . }}
diff --git a/docs/reference/themes/mongodb/layouts/partials/assets/javascripts.html b/docs/reference/themes/mongodb/layouts/partials/assets/javascripts.html
index a92a14f8b0c..fcf67f0e4e4 100644
--- a/docs/reference/themes/mongodb/layouts/partials/assets/javascripts.html
+++ b/docs/reference/themes/mongodb/layouts/partials/assets/javascripts.html
@@ -1,15 +1,15 @@
 <script type="text/javascript">
   var DOCUMENTATION_OPTIONS = {
-   URL_ROOT:    {{.Site.BaseUrl}},
+   URL_ROOT:    {{.Site.BaseURL}},
    VERSION:     {{.Site.Data.mongodb.currentVersion}},
    COLLAPSE_INDEX: false,
    FILE_SUFFIX: '.html',
    HAS_SOURCE:  true
   };
 </script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/js/jquery.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/lib/bootstrap.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/js/navbar.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/lib/highlight/highlight.pack.js"></script>
-<script type="text/javascript" src="{{.Site.BaseUrl}}/js/scripts.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/js/jquery.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/lib/bootstrap.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/js/navbar.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/lib/highlight/highlight.pack.js"></script>
+<script type="text/javascript" src="{{.Site.BaseURL}}/js/scripts.js"></script>
 {{ partial "assets/javascriptExtras.html" . }}
diff --git a/docs/reference/themes/mongodb/layouts/partials/footer.html b/docs/reference/themes/mongodb/layouts/partials/footer.html
index e0621527d84..c632933ed79 100644
--- a/docs/reference/themes/mongodb/layouts/partials/footer.html
+++ b/docs/reference/themes/mongodb/layouts/partials/footer.html
@@ -1,28 +1,28 @@
-{{ if .IsPage }}
+{{- if .IsPage -}}
 
-{{ $menuPrev    := $.Scratch.Get "menu.Prev"}}
-{{ $menuNext    := $.Scratch.Get "menu.Next"}}
+{{- $menuPrev    := $.Scratch.Get "menu.Prev" -}}
+{{- $menuNext    := $.Scratch.Get "menu.Next" -}}
 
 <div id="btnv">
-  {{ with $menuPrev }}
+  {{- with $menuPrev -}}
   <div class="pull-left">
-  <a class="navigation prev" href="{{.Url}}">
-      <i class="fa fa-long-arrow-left"> </i> {{.Name}}
+  <a class="navigation prev" href="{{.URL}}">
+      <i class="fa fa-long-arrow-left"> </i> {{ .Name }}
   </a>
   </div>
-  {{ end }}
-  {{ with $menuNext }}
+  {{- end -}}
+  {{- with $menuNext -}}
   <div class="pull-right">
-  <a class="navigation next" href="{{.Url}}">
-    {{.Name}} <i class="fa fa-long-arrow-right"> </i>
+  <a class="navigation next" href="{{.URL}}">
+    {{ .Name }} <i class="fa fa-long-arrow-right"> </i>
   </a>
-  {{ end }}
+  {{- end -}}
 </div>
 </div>
-{{ end }}
+{{- end -}}
 
 </div>
-{{ partial "rightColumn.html" . }}
+{{- partial "rightColumn.html" . -}}
 </div>
 </div>
 </div>
@@ -32,7 +32,7 @@
 </section>
 <!-- container section end -->
 <!-- javascripts -->
-{{ partial "assets/javascripts.html" . }}
-{{ partial "assets/analytics.html" . }}
+{{- partial "assets/javascripts.html" . -}}
+{{- partial "assets/analytics.html" . -}}
 </body>
 </html>
diff --git a/docs/reference/themes/mongodb/layouts/partials/header.html b/docs/reference/themes/mongodb/layouts/partials/header.html
index f1edfbd0f2e..e29afe1b4af 100644
--- a/docs/reference/themes/mongodb/layouts/partials/header.html
+++ b/docs/reference/themes/mongodb/layouts/partials/header.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    {{ partial "meta.html"}}
-    <link rel="shortcut icon" href="{{.Site.BaseUrl}}/img/favicon.png">
+    {{- partial "meta.html" -}}
+    <link rel="shortcut icon" href="{{.Site.BaseURL}}/img/favicon.png">
 
     <title>{{.Title}}</title>
 
-    {{ partial "assets/css.html" . }}
+    {{- partial "assets/css.html" . -}}
   </head>
 
   <body>
   <!-- container section start -->
   <section id="container" class="">
       <!--header start-->
-      {{ partial "header/main.html" . }}
+      {{- partial "header/main.html" . -}}
       <!--header end-->
 
-      {{ partial "menu.html" . }}
+      {{- partial "menu.html" . -}}
 
       <!--main content start-->
       <section id="main-content" class="content">
diff --git a/docs/reference/themes/mongodb/layouts/partials/header/contentHeader.html b/docs/reference/themes/mongodb/layouts/partials/header/contentHeader.html
index b3a57f7b93a..f9e8246616d 100644
--- a/docs/reference/themes/mongodb/layouts/partials/header/contentHeader.html
+++ b/docs/reference/themes/mongodb/layouts/partials/header/contentHeader.html
@@ -1,25 +1,25 @@
-{{ if .IsPage }}
-{{ $File := .File }}  {{with $File.LogicalName }} {{ $srcref := add (add "docs/reference/content/" $File.Dir) $File.LogicalName }}
+{{- if .IsPage -}}
+{{- $File := .File -}}{{ with $File.LogicalName }} {{ $srcref := add (add "docs/reference/content/" $File.Dir) $File.LogicalName }}
 <a class="edit-link" href="https://github.com/mongodb/{{ $.Site.Data.mongodb.githubRepo }}/blob/{{ $.Site.Data.mongodb.githubBranch }}/{{ $srcref }}" target="_blank" title="Edit {{ $File.Dir }}{{ $File.LogicalName }} on GitHub"><i class="fa fa-pencil-square-o"></i></a>
-{{end}}
-{{end}}
-{{ $menuItemL6  := $.Scratch.Get "menu.Item.L6"}}
-{{ $menuItemL5  := $.Scratch.Get "menu.Item.L5"}}
-{{ $menuItemL4  := $.Scratch.Get "menu.Item.L4"}}
-{{ $menuItemL3  := $.Scratch.Get "menu.Item.L3"}}
-{{ $menuItemL2  := $.Scratch.Get "menu.Item.L2"}}
-{{ $menuItemL1  := $.Scratch.Get "menu.Item.L1"}}
-{{ $menuItemL0  := $.Scratch.Get "menu.Item.L0"}}
-{{if $menuItemL0}}
+{{- end -}}
+{{- end -}}
+{{- $menuItemL6  := $.Scratch.Get "menu.Item.L6" -}}
+{{- $menuItemL5  := $.Scratch.Get "menu.Item.L5" -}}
+{{- $menuItemL4  := $.Scratch.Get "menu.Item.L4" -}}
+{{- $menuItemL3  := $.Scratch.Get "menu.Item.L3" -}}
+{{- $menuItemL2  := $.Scratch.Get "menu.Item.L2" -}}
+{{- $menuItemL1  := $.Scratch.Get "menu.Item.L1" -}}
+{{- $menuItemL0  := $.Scratch.Get "menu.Item.L0" -}}
+{{- if $menuItemL0 -}}
 <div class="bc">
 <ul>
-  {{with $menuItemL6}}<li><a href="{{.Url}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{end}}
-  {{with $menuItemL5}}<li><a href="{{.Url}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{end}}
-  {{with $menuItemL4}}<li><a href="{{.Url}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{end}}
-  {{with $menuItemL3}}<li><a href="{{.Url}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{end}}
-  {{with $menuItemL2}}<li><a href="{{.Url}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{end}}
-  {{with $menuItemL1}}<li><a href="{{.Url}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{end}}
-  <li>{{$menuItemL0.Name}}</li>
+  {{- with $menuItemL6 -}}<li><a href="{{.URL}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{- end -}}
+  {{- with $menuItemL5 -}}<li><a href="{{.URL}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{- end -}}
+  {{- with $menuItemL4 -}}<li><a href="{{.URL}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{- end -}}
+  {{- with $menuItemL3 -}}<li><a href="{{.URL}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{- end -}}
+  {{- with $menuItemL2 -}}<li><a href="{{.URL}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{- end -}}
+  {{- with $menuItemL1 -}}<li><a href="{{.URL}}">{{.Name}}</a> <i class="fa fa-angle-right"></i></li>{{- end -}}
+  <li>{{ $menuItemL0.Name }}</li>
 </ul>
 </div>
-{{ end }}
+{{- end -}}
diff --git a/docs/reference/themes/mongodb/layouts/partials/header/main.html b/docs/reference/themes/mongodb/layouts/partials/header/main.html
index 11c373e0ff4..e37d07bc5f9 100644
--- a/docs/reference/themes/mongodb/layouts/partials/header/main.html
+++ b/docs/reference/themes/mongodb/layouts/partials/header/main.html
@@ -6,8 +6,8 @@
     </div>
     <!--logo start-->
     <div class="logo pull-left">
-      <a href="{{ .Site.BaseUrl}}/../">
-        <img src="{{.Site.BaseUrl}}/img/logo-mongodb-header.png", alt="MongoDB.org" />
+      <a href="{{ .Site.BaseURL}}/../">
+        <img src="{{.Site.BaseURL}}/img/logo-mongodb-header.png", alt="MongoDB.org" />
       </a>
     </div>
     <!--logo end-->
diff --git a/docs/reference/themes/mongodb/layouts/partials/header/search.html b/docs/reference/themes/mongodb/layouts/partials/header/search.html
index 2570e110f7b..ac41c4db1b2 100644
--- a/docs/reference/themes/mongodb/layouts/partials/header/search.html
+++ b/docs/reference/themes/mongodb/layouts/partials/header/search.html
@@ -1,7 +1,7 @@
 <div id="search">
 <form method="get" action="//www.google.com/search" target="_blank">
     <input type="text" name="searchQuery" size="20" value="" autocomplete="off" placeholder="Search docs">
-    <input type="hidden" name="site" value="{{.Site.BaseUrl}}">
+    <input type="hidden" name="site" value="{{.Site.BaseURL}}">
     <input type="hidden" name="q" value="">
     <label for="searchQuery"><i class="fa fa-search fa-1"></i></label>
 </form>
diff --git a/docs/reference/themes/mongodb/layouts/partials/menu.html b/docs/reference/themes/mongodb/layouts/partials/menu.html
index c98f682d30e..515ebe2fdf7 100644
--- a/docs/reference/themes/mongodb/layouts/partials/menu.html
+++ b/docs/reference/themes/mongodb/layouts/partials/menu.html
@@ -3,50 +3,50 @@
     <div class="ssidebar nav-collapse">
       <div class="ssidebarwrapper">
         <h3>
-          <a class="index-link" href="{{ .Site.BaseUrl}}/../">{{ .Site.Title }}</a>{{ $baseUrl := .Site.BaseUrl}}
+          <a class="index-link" href="{{ .Site.BaseURL}}/../">{{ .Site.Title }}</a>{{ $baseUrl := .Site.BaseURL}}
           {{ with .Site.Data.mongodb.currentVersion }}<a class="version pull-right" href="{{$baseUrl}}">{{ . }}</a>{{ end }}
         </h3>
 
         <!-- sidebar menu start-->
         <ul class="sidebar-menu">
-          {{ $menuNodeLevel := $.Scratch.Set "menu.NodeLevel" 1 }}
-          {{ $menu := .Site.Menus.main }}
-          {{ $.Scratch.Set "menu.Found" false }}
-          {{ $.Scratch.Set "menu.Item.L6" false }}
-          {{ $.Scratch.Set "menu.Item.L5" false }}
-          {{ $.Scratch.Set "menu.Item.L4" false }}
-          {{ $.Scratch.Set "menu.Item.L3" false }}
-          {{ $.Scratch.Set "menu.Item.L2" false }}
-          {{ $.Scratch.Set "menu.Item.L1" false }}
-          {{ $.Scratch.Set "menu.Item.L0" false }}
-          {{ $.Scratch.Set "menu.Prev" false }}
-          {{ $.Scratch.Set "menu.Next" false }}
+          {{- $menuNodeLevel := $.Scratch.Set "menu.NodeLevel" 1 -}}
+          {{- $menu := .Site.Menus.main -}}
+          {{- $.Scratch.Set "menu.Found" false -}}
+          {{- $.Scratch.Set "menu.Item.L6" false -}}
+          {{- $.Scratch.Set "menu.Item.L5" false -}}
+          {{- $.Scratch.Set "menu.Item.L4" false -}}
+          {{- $.Scratch.Set "menu.Item.L3" false -}}
+          {{- $.Scratch.Set "menu.Item.L2" false -}}
+          {{- $.Scratch.Set "menu.Item.L1" false -}}
+          {{- $.Scratch.Set "menu.Item.L0" false -}}
+          {{- $.Scratch.Set "menu.Prev" false -}}
+          {{- $.Scratch.Set "menu.Next" false -}}
 
-          {{ $currentNode := . }}
-          {{ range $menu.ByWeight }}
-            {{ $.Scratch.Set "menu.Item" . }}
+          {{- $currentNode := . -}}
+          {{- range $menu.ByWeight -}}
+            {{- $.Scratch.Set "menu.Item" . -}}
             {{ partial "menu/currentItem.html" $currentNode }}
-          {{end}}
+          {{- end -}}
 
-          {{if eq ($.Scratch.Get "menu.Found") false }}
-          {{ $.Scratch.Set "menu.Item.L6" false }}
-          {{ $.Scratch.Set "menu.Item.L5" false }}
-          {{ $.Scratch.Set "menu.Item.L4" false }}
-          {{ $.Scratch.Set "menu.Item.L3" false }}
-          {{ $.Scratch.Set "menu.Item.L2" false }}
-          {{ $.Scratch.Set "menu.Item.L1" false }}
-          {{ $.Scratch.Set "menu.Item.L0" false }}
-          {{end}}
+          {{- if eq ($.Scratch.Get "menu.Found") false -}}
+          {{- $.Scratch.Set "menu.Item.L6" false -}}
+          {{- $.Scratch.Set "menu.Item.L5" false -}}
+          {{- $.Scratch.Set "menu.Item.L4" false -}}
+          {{- $.Scratch.Set "menu.Item.L3" false -}}
+          {{- $.Scratch.Set "menu.Item.L2" false -}}
+          {{- $.Scratch.Set "menu.Item.L1" false -}}
+          {{- $.Scratch.Set "menu.Item.L0" false -}}
+          {{- end -}}
 
-          {{ range $menu.ByWeight }}
-            {{ $.Scratch.Set "menu.Item" . }}
-            {{ partial "menu/item.html" $currentNode }}
-          {{end}}
+          {{- range $menu.ByWeight -}}
+            {{- $.Scratch.Set "menu.Item" . -}}
+            {{- partial "menu/item.html" $currentNode -}}
+          {{- end -}}
         </ul>
         <!-- sidebar menu end-->
     </div>
   </div>
-  {{ partial "menu/footer.html" . }}
+  {{- partial "menu/footer.html" . -}}
 </aside>
 <!--sidebar end-->
-{{ partial "menu/options.html" . }}
+{{- partial "menu/options.html" . -}}
diff --git a/docs/reference/themes/mongodb/layouts/partials/menu/currentItem.html b/docs/reference/themes/mongodb/layouts/partials/menu/currentItem.html
index 4c578944175..bfe5311981e 100644
--- a/docs/reference/themes/mongodb/layouts/partials/menu/currentItem.html
+++ b/docs/reference/themes/mongodb/layouts/partials/menu/currentItem.html
@@ -1,75 +1,75 @@
-{{ $currentNode := . }}
-{{ $menuItemL6  := $.Scratch.Get "menu.Item.L6"}}
-{{ $menuItemL5  := $.Scratch.Get "menu.Item.L5"}}
-{{ $menuItemL4  := $.Scratch.Get "menu.Item.L4"}}
-{{ $menuItemL3  := $.Scratch.Get "menu.Item.L3"}}
-{{ $menuItemL2  := $.Scratch.Get "menu.Item.L2"}}
-{{ $menuItemL1  := $.Scratch.Get "menu.Item.L1"}}
-{{ $menuItem    := $.Scratch.Get "menu.Item"}}
+{{- $currentNode := . -}}
+{{- $menuItemL6  := $.Scratch.Get "menu.Item.L6" -}}
+{{- $menuItemL5  := $.Scratch.Get "menu.Item.L5" -}}
+{{- $menuItemL4  := $.Scratch.Get "menu.Item.L4" -}}
+{{- $menuItemL3  := $.Scratch.Get "menu.Item.L3" -}}
+{{- $menuItemL2  := $.Scratch.Get "menu.Item.L2" -}}
+{{- $menuItemL1  := $.Scratch.Get "menu.Item.L1" -}}
+{{- $menuItem    := $.Scratch.Get "menu.Item" -}}
 
-{{ if $currentNode.IsMenuCurrent "main" $menuItem }}
-  {{ $.Scratch.Set "menu.Found" true }}
-  {{ $.Scratch.Set "menu.Item.L6" false }}
-  {{ $.Scratch.Set "menu.Item.L5" false }}
-  {{ $.Scratch.Set "menu.Item.L4" false }}
-  {{ $.Scratch.Set "menu.Item.L3" false }}
-  {{ $.Scratch.Set "menu.Item.L2" false }}
-  {{ $.Scratch.Set "menu.Item.L1" false }}
-  {{ $.Scratch.Set "menu.Item.L0" $menuItem }}
+{{- if $currentNode.IsMenuCurrent "main" $menuItem -}}
+  {{- $.Scratch.Set "menu.Found" true -}}
+  {{- $.Scratch.Set "menu.Item.L6" false -}}
+  {{- $.Scratch.Set "menu.Item.L5" false -}}
+  {{- $.Scratch.Set "menu.Item.L4" false -}}
+  {{- $.Scratch.Set "menu.Item.L3" false -}}
+  {{- $.Scratch.Set "menu.Item.L2" false -}}
+  {{- $.Scratch.Set "menu.Item.L1" false -}}
+  {{- $.Scratch.Set "menu.Item.L0" $menuItem -}}
 
-  {{ if $menuItemL1 }}
-    {{ if eq $menuItemL1.Identifier $menuItem.Parent }}
-    {{ $.Scratch.Set "menu.Item.L1" $menuItemL1 }}
-    {{ if $menuItemL2 }}
-      {{ if eq $menuItemL2.Identifier $menuItemL1.Parent }}
-      {{ $.Scratch.Set "menu.Item.L2" $menuItemL2 }}
-      {{ if $menuItemL3 }}
-        {{ if eq $menuItemL3.Identifier $menuItemL2.Parent }}
-        {{ $.Scratch.Set "menu.Item.L3" $menuItemL3 }}
-        {{ if $menuItemL4 }}
-          {{ if eq $menuItemL4.Identifier $menuItemL3.Parent }}
-          {{ $.Scratch.Set "menu.Item.L4" $menuItemL4 }}
-          {{ if $menuItemL5 }}
-            {{ if eq $menuItemL5.Identifier $menuItemL4.Parent }}
-            {{ $.Scratch.Set "menu.Item.L5" $menuItemL5 }}
-            {{ if $menuItemL6 }}
-              {{ if eq $menuItemL6.Identifier $menuItemL5.Parent }}
-              {{ $.Scratch.Set "menu.Item.L6" $menuItemL6 }}
-            {{end}}
-            {{end}}
-          {{end}}
-          {{end}}
-        {{end}}
-        {{end}}
-      {{end}}
-      {{end}}
-    {{end}}
-    {{end}}
-  {{end}}
-  {{end}}
-{{ else }}
-  {{ if $menuItem.HasChildren }}
-    {{$found := $.Scratch.Get "menu.Found" }}
-    {{ range $menuItem.Children }}
-      {{ $.Scratch.Set "menu.Item" . }}
-      {{if eq ($.Scratch.Get "menu.Found") false }}
-        {{ $.Scratch.Set "menu.Item.L6" $menuItemL5}}
-        {{ $.Scratch.Set "menu.Item.L5" $menuItemL4}}
-        {{ $.Scratch.Set "menu.Item.L4" $menuItemL3}}
-        {{ $.Scratch.Set "menu.Item.L3" $menuItemL2}}
-        {{ $.Scratch.Set "menu.Item.L2" $menuItemL1}}
-        {{ $.Scratch.Set "menu.Item.L1" $menuItem}}
-        {{ $.Scratch.Set "menu.Item" . }}
-        {{ partial "menu/currentItem.html" $currentNode }}
-        {{if eq ($.Scratch.Get "menu.Found") false }}
-          {{ $.Scratch.Set "menu.Prev" . }}
-        {{ end }}
-      {{ else if and (eq $found false) (eq ($.Scratch.Get "menu.Next") false) }}
-        {{ $.Scratch.Set "menu.Next" . }}
-      {{ end }}
-    {{ end }}
-    {{if eq ($.Scratch.Get "menu.Found") false }}
-      {{ $.Scratch.Set "menu.Prev" false }}
-    {{ end }}
-  {{ end }}
-{{ end }}
+  {{- if $menuItemL1 -}}
+    {{- if eq $menuItemL1.Identifier $menuItem.Parent -}}
+    {{- $.Scratch.Set "menu.Item.L1" $menuItemL1 -}}
+    {{- if $menuItemL2 -}}
+      {{- if eq $menuItemL2.Identifier $menuItemL1.Parent -}}
+      {{- $.Scratch.Set "menu.Item.L2" $menuItemL2 -}}
+      {{- if $menuItemL3 -}}
+        {{- if eq $menuItemL3.Identifier $menuItemL2.Parent -}}
+        {{- $.Scratch.Set "menu.Item.L3" $menuItemL3 -}}
+        {{- if $menuItemL4 -}}
+          {{- if eq $menuItemL4.Identifier $menuItemL3.Parent -}}
+          {{- $.Scratch.Set "menu.Item.L4" $menuItemL4 -}}
+          {{- if $menuItemL5 -}}
+            {{- if eq $menuItemL5.Identifier $menuItemL4.Parent -}}
+            {{- $.Scratch.Set "menu.Item.L5" $menuItemL5 -}}
+            {{- if $menuItemL6 -}}
+              {{- if eq $menuItemL6.Identifier $menuItemL5.Parent -}}
+              {{- $.Scratch.Set "menu.Item.L6" $menuItemL6 -}}
+            {{- end -}}
+            {{- end -}}
+          {{- end -}}
+          {{- end -}}
+        {{- end -}}
+        {{- end -}}
+      {{- end -}}
+      {{- end -}}
+    {{- end -}}
+    {{- end -}}
+  {{- end -}}
+  {{- end -}}
+{{- else -}}
+  {{- if $menuItem.HasChildren -}}
+    {{- $found := $.Scratch.Get "menu.Found" -}}
+    {{- range $menuItem.Children -}}
+      {{- $.Scratch.Set "menu.Item" . -}}
+      {{- if eq ($.Scratch.Get "menu.Found") false -}}
+        {{- $.Scratch.Set "menu.Item.L6" $menuItemL5 -}}
+        {{- $.Scratch.Set "menu.Item.L5" $menuItemL4 -}}
+        {{- $.Scratch.Set "menu.Item.L4" $menuItemL3 -}}
+        {{- $.Scratch.Set "menu.Item.L3" $menuItemL2 -}}
+        {{- $.Scratch.Set "menu.Item.L2" $menuItemL1 -}}
+        {{- $.Scratch.Set "menu.Item.L1" $menuItem -}}
+        {{- $.Scratch.Set "menu.Item" . -}}
+        {{- partial "menu/currentItem.html" $currentNode -}}
+        {{- if eq ($.Scratch.Get "menu.Found") false -}}
+          {{- $.Scratch.Set "menu.Prev" . -}}
+        {{- end -}}
+      {{- else if and (eq $found false) (eq ($.Scratch.Get "menu.Next") false) -}}
+        {{- $.Scratch.Set "menu.Next" . -}}
+      {{- end -}}
+    {{- end -}}
+    {{- if eq ($.Scratch.Get "menu.Found") false -}}
+      {{- $.Scratch.Set "menu.Prev" false -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
diff --git a/docs/reference/themes/mongodb/layouts/partials/menu/item.html b/docs/reference/themes/mongodb/layouts/partials/menu/item.html
index 2ddbe0a7ba0..319c599abd8 100644
--- a/docs/reference/themes/mongodb/layouts/partials/menu/item.html
+++ b/docs/reference/themes/mongodb/layouts/partials/menu/item.html
@@ -1,54 +1,54 @@
-{{ $currentNode := . }}
-{{ $menuItem := $.Scratch.Get "menu.Item"}}
-{{ $menuNodeLevel := $.Scratch.Get "menu.NodeLevel"}}
+{{- $currentNode := . -}}
+{{- $menuItem := $.Scratch.Get "menu.Item" -}}
+{{- $menuNodeLevel := $.Scratch.Get "menu.NodeLevel" -}}
 
-{{ $menuItemL6  := $.Scratch.Get "menu.Item.L6"}}
-{{ $menuItemL5  := $.Scratch.Get "menu.Item.L5"}}
-{{ $menuItemL4  := $.Scratch.Get "menu.Item.L4"}}
-{{ $menuItemL3  := $.Scratch.Get "menu.Item.L3"}}
-{{ $menuItemL2  := $.Scratch.Get "menu.Item.L2"}}
-{{ $menuItemL1  := $.Scratch.Get "menu.Item.L1"}}
-{{ $menuItemL0  := $.Scratch.Get "menu.Item.L0"}}
+{{- $menuItemL6  := $.Scratch.Get "menu.Item.L6" -}}
+{{- $menuItemL5  := $.Scratch.Get "menu.Item.L5" -}}
+{{- $menuItemL4  := $.Scratch.Get "menu.Item.L4" -}}
+{{- $menuItemL3  := $.Scratch.Get "menu.Item.L3" -}}
+{{- $menuItemL2  := $.Scratch.Get "menu.Item.L2" -}}
+{{- $menuItemL1  := $.Scratch.Get "menu.Item.L1" -}}
+{{- $menuItemL0  := $.Scratch.Get "menu.Item.L0" -}}
 
-{{$.Scratch.Set "menu.isCurrent" false}}
-{{if eq $menuItem $menuItemL0 }}
-  {{$.Scratch.Set "menu.isCurrent" true}}
-{{else if eq $menuItem $menuItemL1 }}
-  {{$.Scratch.Set "menu.isCurrent" true}}
-{{else if eq $menuItem $menuItemL2 }}
-  {{$.Scratch.Set "menu.isCurrent" true}}
-{{else if eq $menuItem $menuItemL3 }}
-  {{$.Scratch.Set "menu.isCurrent" true}}
-{{else if eq $menuItem $menuItemL4 }}
-  {{$.Scratch.Set "menu.isCurrent" true}}
-{{else if eq $menuItem $menuItemL5 }}
-  {{$.Scratch.Set "menu.isCurrent" true}}
-{{else if eq $menuItem $menuItemL6 }}
-  {{$.Scratch.Set "menu.isCurrent" true}}
-{{end}}
-{{ $isCurrent := $.Scratch.Get "menu.isCurrent"}}
+{{- $.Scratch.Set "menu.isCurrent" false -}}
+{{- if eq $menuItem $menuItemL0 -}}
+  {{- $.Scratch.Set "menu.isCurrent" true -}}
+{{- else if eq $menuItem $menuItemL1 -}}
+  {{- $.Scratch.Set "menu.isCurrent" true -}}
+{{- else if eq $menuItem $menuItemL2 -}}
+  {{- $.Scratch.Set "menu.isCurrent" true -}}
+{{- else if eq $menuItem $menuItemL3 -}}
+  {{- $.Scratch.Set "menu.isCurrent" true -}}
+{{- else if eq $menuItem $menuItemL4 -}}
+  {{- $.Scratch.Set "menu.isCurrent" true -}}
+{{- else if eq $menuItem $menuItemL5 -}}
+  {{- $.Scratch.Set "menu.isCurrent" true -}}
+{{- else if eq $menuItem $menuItemL6 -}}
+  {{- $.Scratch.Set "menu.isCurrent" true -}}
+{{- end -}}
+{{- $isCurrent := $.Scratch.Get "menu.isCurrent" -}}
 
-{{ if $menuItem.HasChildren }}
-<li class="toctree-l{{$menuNodeLevel}} {{if $isCurrent }} current{{end}}">
-  <a href="{{$menuItem.Url}}" class="">
-      {{ $menuItem.Pre }}
-      <span>{{ $menuItem.Name }}</span>
-      {{if lt $menuNodeLevel 2}}<span class="menu-arrow fa {{if $isCurrent }}fa-angle-down{{else}}fa-angle-right{{end}}"></span>{{end}}
+{{- if $menuItem.HasChildren -}}
+<li class="toctree-l{{- $menuNodeLevel -}} {{ if $isCurrent }} current{{ end }}">
+  <a href="{{- $menuItem.URL -}}" class="">
+      {{- $menuItem.Pre -}}
+      <span>{{- $menuItem.Name -}}</span>
+      {{- if lt $menuNodeLevel 2 -}}<span class="menu-arrow fa {{ if $isCurrent }}fa-angle-down{{- else -}}fa-angle-right{{- end -}}"></span>{{- end -}}
   </a>
-    <ul {{if $isCurrent }} class="current"{{end}}>
-        {{ range $menuItem.Children }}
-        {{ $menuItem := $.Scratch.Set "menu.Item" . }}
-        {{ $menuNodeLevel := $.Scratch.Add "menu.NodeLevel" 1}}
-        {{ partial "menu/item.html" $currentNode }}
-        {{ $menuNodeLevel := $.Scratch.Add "menu.NodeLevel" -1}}
-        {{ end }}
+    <ul {{ if $isCurrent }} class="current"{{- end -}}>
+        {{- range $menuItem.Children -}}
+        {{- $menuItem := $.Scratch.Set "menu.Item" . -}}
+        {{- $menuNodeLevel := $.Scratch.Add "menu.NodeLevel" 1 -}}
+        {{- partial "menu/item.html" $currentNode -}}
+        {{- $menuNodeLevel := $.Scratch.Add "menu.NodeLevel" -1 -}}
+        {{- end -}}
     </ul>
   </li>
-{{else}}
-    <li class="toctree-l{{$menuNodeLevel}}">
-    <a href="{{$menuItem.Url}}">
-        {{ $menuItem.Pre }}
-        {{ $menuItem.Name }}
+{{- else -}}
+    <li class="toctree-l{{- $menuNodeLevel -}}">
+    <a href="{{- $menuItem.URL -}}">
+        {{- $menuItem.Pre -}}
+        {{- $menuItem.Name -}}
     </a>
   </li>
-{{end}}
+{{- end -}}
diff --git a/docs/reference/themes/mongodb/layouts/partials/rightColumn.html b/docs/reference/themes/mongodb/layouts/partials/rightColumn.html
index 52e86a5221a..5d872156b21 100644
--- a/docs/reference/themes/mongodb/layouts/partials/rightColumn.html
+++ b/docs/reference/themes/mongodb/layouts/partials/rightColumn.html
@@ -1,10 +1,10 @@
 <div class="right-column">
 <div class="wrapper">
-  {{ if .IsPage }}
+  {{- if .IsPage -}}
   <div class="toc">
     <span class="toc-header">On this page</span>
-    {{ .TableOfContents}}
+    {{- .TableOfContents -}}
   </div>
-  {{ end }}
+  {{- end -}}
 </div><!-- Docs -->
 </div>
diff --git a/docs/reference/themes/mongodb/layouts/shortcodes/docsref.html b/docs/reference/themes/mongodb/layouts/shortcodes/docsref.html
index 6a4d322268e..672197db9a8 100644
--- a/docs/reference/themes/mongodb/layouts/shortcodes/docsref.html
+++ b/docs/reference/themes/mongodb/layouts/shortcodes/docsref.html
@@ -1 +1 @@
-http://docs.mongodb.org/manual/{{ .Get 0 }}
+http://docs.mongodb.org/manual{{ if eq (hasPrefix (.Get 0) "/") false }}/{{ end }}{{ .Get 0 }}
diff --git a/docs/reference/themes/mongodb/static/js/scripts.js b/docs/reference/themes/mongodb/static/js/scripts.js
index 47a96f0cba1..cee867f4df6 100644
--- a/docs/reference/themes/mongodb/static/js/scripts.js
+++ b/docs/reference/themes/mongodb/static/js/scripts.js
@@ -45,7 +45,7 @@ jQuery(document).ready(function() {
     });
     jQuery('.body table').addClass('table').addClass('table-striped');
     var siteInput = $('#search input[name="site"]');
-    if (siteInput.val().substring(0, 4) != "http") {
+    if (siteInput.val().indexOf(window.location.hostname) < 0) {
         siteInput.attr("value", window.location.hostname + siteInput.val());
     }
     jQuery("#search form").submit(function() {
diff --git a/driver-async/README.md b/driver-async/README.md
index 2295bb4bf42..bb46624d075 100644
--- a/driver-async/README.md
+++ b/driver-async/README.md
@@ -1,6 +1,6 @@
 ## The MongoDB Asynchronous Java Driver
 
-A callback based fully non-blocking and asynchronous I/O operations MongoDB Java driver.
+A callback-based fully non-blocking and asynchronous I/O operations MongoDB Java driver.
 
 ## Binaries
 
@@ -107,7 +107,7 @@ Example for Maven:
     final CountDownLatch countLatch = new CountDownLatch(1);
     final AtomicLong count = new AtomicLong();
     System.out.println("Counting the number of documents");
-    collection.count(new SingleResultCallback<Long>() {
+    collection.countDocuments(new SingleResultCallback<Long>() {
         @Override
         public void onResult(final Long result, final Throwable t) {
             count.set(result);
diff --git a/driver-async/build.gradle b/driver-async/build.gradle
index 67c3f1410b4..516b34aa2ee 100644
--- a/driver-async/build.gradle
+++ b/driver-async/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-apply plugin: 'osgi'
-apply plugin: 'org.kordamp.gradle.clirr'
-
-def configDir = new File(rootDir, 'config')
 archivesBaseName = 'mongodb-driver-async'
+description = 'The MongoDB Asynchronous Driver.'
+
+ext {
+    pomName = 'The MongoDB Asynchronous Driver'
+}
 
 sourceSets {
-    test.java.srcDirs += 'src/examples'
+    test.groovy.srcDirs += 'src/examples'
 }
 
 dependencies {
@@ -34,19 +35,22 @@ dependencies {
 
 clirr {
     excludeFilter = new File("$configDir/clirr-exclude.yml")
-    baseline 'org.mongodb:mongodb-driver-async:3.2.0'
+    baseline 'org.mongodb:mongodb-driver-async:3.8.0'
     failOnErrors = false
 }
 
 tasks.withType(Checkstyle) {
     // needed so the Javadoc checks can find the code in other modules
-    classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output);
+    classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output)
 }
 
-modifyPom {
-    project {
-        name 'MongoDB Asynchronous Driver'
-        description 'The MongoDB Asynchronous Driver'
-        url 'http://www.mongodb.org'
+jar {
+    manifest {
+        instruction 'Automatic-Module-Name', 'org.mongodb.driver.async.client'
+        instruction 'Build-Version', project.gitVersion
+        instruction 'Import-Package',
+                'org.bson.*',
+                'com.mongodb.*',
+                'io.netty.*;resolution:=optional'
     }
 }
diff --git a/driver-async/src/examples/documentation/DocumentationSamples.java b/driver-async/src/examples/documentation/DocumentationSamples.java
new file mode 100644
index 00000000000..ee0e71a3ca3
--- /dev/null
+++ b/driver-async/src/examples/documentation/DocumentationSamples.java
@@ -0,0 +1,1028 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package documentation;
+
+import com.mongodb.Block;
+import com.mongodb.MongoCompressor;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.DatabaseTestCase;
+import com.mongodb.async.client.FindIterable;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import org.bson.BsonType;
+import org.bson.Document;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.async.client.Fixture.initializeCollection;
+
+
+// imports required for filters, projections and updates
+import static com.mongodb.client.model.Filters.all;
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.elemMatch;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.exists;
+import static com.mongodb.client.model.Filters.gt;
+import static com.mongodb.client.model.Filters.in;
+import static com.mongodb.client.model.Filters.lt;
+import static com.mongodb.client.model.Filters.lte;
+import static com.mongodb.client.model.Filters.or;
+import static com.mongodb.client.model.Filters.regex;
+import static com.mongodb.client.model.Filters.size;
+import static com.mongodb.client.model.Filters.type;
+import static com.mongodb.client.model.Projections.exclude;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
+import static com.mongodb.client.model.Projections.slice;
+import static com.mongodb.client.model.Updates.combine;
+import static com.mongodb.client.model.Updates.currentDate;
+import static com.mongodb.client.model.Updates.set;
+// end required filters, projections and updates imports
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+
+public final class DocumentationSamples extends DatabaseTestCase {
+
+    private final MongoCollection<Document> collection = initializeCollection(new MongoNamespace(getDefaultDatabaseName(), "inventory"));
+
+    @Test
+    public void testInsert() throws InterruptedException {
+
+        MongoClientSettings settings = MongoClientSettings.builder()
+                                              .compressorList(Collections.singletonList(MongoCompressor.createSnappyCompressor()))
+                                               .build();
+        MongoClient client = MongoClients.create(settings);
+
+        // Start Example 1
+        Document canvas = new Document("item", "canvas")
+                .append("qty", 100)
+                .append("tags", singletonList("cotton"));
+
+        Document size = new Document("h", 28)
+                .append("w", 35.5)
+                .append("uom", "cm");
+        canvas.put("size", size);
+
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertOne(canvas, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Process results
+                insertLatch.countDown();
+            }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 1
+
+        // Start Example 2
+        FindIterable<Document> findIterable = collection.find(eq("item", "canvas"));
+        // End Example 2
+
+        final CountDownLatch check1 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<List<Document>>() {
+            @Override
+            public void onResult(final List<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+                check1.countDown();
+            }
+        });
+        assertTrue(check1.await(10, TimeUnit.SECONDS));
+
+        // Start Example 3
+        Document journal = new Document("item", "journal")
+                .append("qty", 25)
+                .append("tags", asList("blank", "red"));
+
+        Document journalSize = new Document("h", 14)
+                .append("w", 21)
+                .append("uom", "cm");
+        journal.put("size", journalSize);
+
+        Document mat = new Document("item", "mat")
+                .append("qty", 85)
+                .append("tags", singletonList("gray"));
+
+        Document matSize = new Document("h", 27.9)
+                .append("w", 35.5)
+                .append("uom", "cm");
+        mat.put("size", matSize);
+
+        Document mousePad = new Document("item", "mousePad")
+                .append("qty", 25)
+                .append("tags", asList("gel", "blue"));
+
+        Document mousePadSize = new Document("h", 19)
+                .append("w", 22.85)
+                .append("uom", "cm");
+        mousePad.put("size", mousePadSize);
+
+        final CountDownLatch insertManyLatch = new CountDownLatch(1);
+        collection.insertMany(asList(journal, mat, mousePad), new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                insertManyLatch.countDown();
+            }
+        });
+        insertManyLatch.await(10, TimeUnit.SECONDS);
+        // End Example 3
+
+        final CountDownLatch check2 = new CountDownLatch(1);
+        collection.countDocuments(new SingleResultCallback<Long>() {
+            @Override
+            public void onResult(final Long result, final Throwable t) {
+                assertEquals(Long.valueOf(4), result);
+                check2.countDown();
+            }
+        });
+
+        assertTrue(check2.await(10, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testQueryingAtTheTopLevel() throws InterruptedException, TimeoutException, ExecutionException {
+        // Start Example 6
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'A' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }")
+        ), new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Process results
+                insertLatch.countDown();
+            }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 6
+
+        final CountDownLatch check1 = new CountDownLatch(1);
+        collection.countDocuments(new SingleResultCallback<Long>() {
+            @Override
+            public void onResult(final Long result, final Throwable t) {
+                assertEquals(Long.valueOf(5), result);
+                check1.countDown();
+            }
+        });
+
+        // Start Example 7
+        FindIterable<Document> findIterable = collection.find(new Document());
+        // End Example 7
+
+        final CountDownLatch check2 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(5, result.size());
+                check2.countDown();
+            }
+        });
+
+        // Start Example 8
+        findIterable = collection.find();
+        // End Example 8
+
+        final CountDownLatch check3 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(5, result.size());
+                check3.countDown();
+            }
+        });
+
+        // Start Example 9
+        findIterable = collection.find(eq("status", "D"));
+        // End Example 9
+
+        final CountDownLatch check4 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(2, result.size());
+                check4.countDown();
+            }
+        });
+
+        // Start Example 10
+        findIterable = collection.find(in("status", "A", "D"));
+        // End Example 10
+
+        final CountDownLatch check5 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(5, result.size());
+                check5.countDown();
+            }
+        });
+
+        // Start Example 11
+        findIterable = collection.find(and(eq("status", "A"), lt("qty", 30)));
+        // End Example 11
+
+        final CountDownLatch check6 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+                check6.countDown();
+            }
+        });
+
+        // Start Example 12
+        findIterable = collection.find(or(eq("status", "A"), lt("qty", 30)));
+        // End Example 12
+
+        final CountDownLatch check7 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(3, result.size());
+                check7.countDown();
+            }
+        });
+
+        // Start Example 13
+        findIterable = collection.find(
+                and(eq("status", "A"),
+                        or(lt("qty", 30), regex("item", "^p")))
+        );
+        // End Example 13
+
+        final CountDownLatch check8 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(2, result.size());
+                check8.countDown();
+            }
+        });
+
+        assertTrue(check1.await(10, TimeUnit.SECONDS));
+        assertTrue(check2.await(10, TimeUnit.SECONDS));
+        assertTrue(check3.await(10, TimeUnit.SECONDS));
+        assertTrue(check4.await(10, TimeUnit.SECONDS));
+        assertTrue(check5.await(10, TimeUnit.SECONDS));
+        assertTrue(check6.await(10, TimeUnit.SECONDS));
+        assertTrue(check7.await(10, TimeUnit.SECONDS));
+        assertTrue(check8.await(10, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testQueryingEmbeddedDocuments() throws InterruptedException, ExecutionException, TimeoutException {
+        // Start Example 14
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'A' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }")
+        ), new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Process results
+                insertLatch.countDown();
+            }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 14
+
+        final CountDownLatch check1 = new CountDownLatch(1);
+        collection.countDocuments(new SingleResultCallback<Long>() {
+            @Override
+            public void onResult(final Long result, final Throwable t) {
+                assertEquals(Long.valueOf(5), result);
+                check1.countDown();
+            }
+        });
+
+        // Start Example 15
+        FindIterable<Document> findIterable = collection.find(eq("size", Document.parse("{ h: 14, w: 21, uom: 'cm' }")));
+        // End Example 15
+
+        final CountDownLatch check2 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+                check2.countDown();
+            }
+        });
+
+        // Start Example 16
+        findIterable = collection.find(eq("size", Document.parse("{ w: 21, h: 14, uom: 'cm' }")));
+        // End Example 16
+
+        final CountDownLatch check3 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertTrue(result.isEmpty());
+                check3.countDown();
+            }
+        });
+
+        // Start Example 17
+        findIterable = collection.find(eq("size.uom", "in"));
+        // End Example 17
+
+        final CountDownLatch check4 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(2, result.size());
+                check4.countDown();
+            }
+        });
+
+        // Start Example 18
+        findIterable = collection.find(lt("size.h", 15));
+        // End Example 18
+
+        final CountDownLatch check5 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(4, result.size());
+                check5.countDown();
+            }
+        });
+
+        // Start Example 19
+        findIterable = collection.find(and(
+                lt("size.h", 15),
+                eq("size.uom", "in"),
+                eq("status", "D")
+        ));
+        // End Example 19
+
+        final CountDownLatch check6 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+                check6.countDown();
+            }
+        });
+
+        assertTrue(check1.await(10, TimeUnit.SECONDS));
+        assertTrue(check2.await(10, TimeUnit.SECONDS));
+        assertTrue(check3.await(10, TimeUnit.SECONDS));
+        assertTrue(check4.await(10, TimeUnit.SECONDS));
+        assertTrue(check5.await(10, TimeUnit.SECONDS));
+        assertTrue(check6.await(10, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testQueryingArrayValues() throws InterruptedException, ExecutionException, TimeoutException {
+
+        //Start Example 20
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, tags: ['blank', 'red'], dim_cm: [ 14, 21 ] }"),
+                Document.parse("{ item: 'notebook', qty: 50, tags: ['red', 'blank'], dim_cm: [ 14, 21 ] }"),
+                Document.parse("{ item: 'paper', qty: 100, tags: ['red', 'blank', 'plain'], dim_cm: [ 14, 21 ] }"),
+                Document.parse("{ item: 'planner', qty: 75, tags: ['blank', 'red'], dim_cm: [ 22.85, 30 ] }"),
+                Document.parse("{ item: 'postcard', qty: 45, tags: ['blue'], dim_cm: [ 10, 15.25 ] }")
+        ), new SingleResultCallback<Void>() {
+                    @Override
+                    public void onResult(final Void result, final Throwable t) {
+                        // Process results
+                        insertLatch.countDown();
+                    }
+                });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 20
+
+        final CountDownLatch check1 = new CountDownLatch(1);
+        collection.countDocuments(new SingleResultCallback<Long>() {
+            @Override
+            public void onResult(final Long result, final Throwable t) {
+                assertEquals(Long.valueOf(5), result);
+                check1.countDown();
+            }
+        });
+
+        //Start Example 21
+        FindIterable<Document> findIterable = collection.find(eq("tags", asList("red", "blank")));
+        //End Example 21
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+
+        //Start Example 22
+        findIterable = collection.find(all("tags", asList("red", "blank")));
+        //End Example 22
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(4, result.size());
+            }
+        });
+
+        //Start Example 23
+        findIterable = collection.find(eq("tags", "red"));
+        //End Example 23
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(4, result.size());
+            }
+        });
+
+        //Start Example 24
+        findIterable = collection.find(gt("dim_cm", 25));
+        //End Example 24
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+
+        //Start Example 25
+        findIterable = collection.find(and(gt("dim_cm", 15), lt("dim_cm", 20)));
+        //End Example 25
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(4, result.size());
+            }
+        });
+
+        //Start Example 26
+        findIterable = collection.find(elemMatch("dim_cm", Document.parse("{ $gt: 22, $lt: 30 }")));
+        //End Example 26
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+
+        //Start Example 27
+        findIterable = collection.find(gt("dim_cm.1", 25));
+        //End Example 27
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+
+        //Start Example 28
+        findIterable = collection.find(size("tags", 3));
+        //End Example 28
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+    }
+
+    @Test
+    public void testQueryingArraysContainingDocuments() throws InterruptedException, ExecutionException, TimeoutException {
+
+        //Start Example 29
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', instock: [ { warehouse: 'A', qty: 5 }, { warehouse: 'C', qty: 15 } ] }"),
+                Document.parse("{ item: 'notebook', instock: [ { warehouse: 'C', qty: 5 } ] }"),
+                Document.parse("{ item: 'paper', instock: [ { warehouse: 'A', qty: 60 }, { warehouse: 'B', qty: 15 } ] }"),
+                Document.parse("{ item: 'planner', instock: [ { warehouse: 'A', qty: 40 }, { warehouse: 'B', qty: 5 } ] }"),
+                Document.parse("{ item: 'postcard', instock: [ { warehouse: 'B', qty: 15 }, { warehouse: 'C', qty: 35 } ] }")
+        ), new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Process results
+                insertLatch.countDown();
+            }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 29
+
+        FutureResultCallback<Long> assertCountFuture = new FutureResultCallback<Long>();
+        collection.countDocuments(assertCountFuture);
+        assertEquals(Long.valueOf(5), assertCountFuture.get(10, TimeUnit.SECONDS));
+
+        //Start Example 30
+        FindIterable<Document> findIterable = collection.find(eq("instock", Document.parse("{ warehouse: 'A', qty: 5 }")));
+        //End Example 30
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+
+        //Start Example 31
+        findIterable = collection.find(eq("instock", Document.parse("{ qty: 5, warehouse: 'A' }")));
+        //End Example 31
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertTrue(result.isEmpty());
+            }
+        });
+
+        //Start Example 32
+        findIterable = collection.find(lte("instock.0.qty", 20));
+        //End Example 32
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(3, result.size());
+            }
+        });
+
+        //Start Example 33
+        findIterable = collection.find(lte("instock.qty", 20));
+        //End Example 33
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(5, result.size());
+            }
+        });
+
+        //Start Example 34
+        findIterable = collection.find(elemMatch("instock", Document.parse("{ qty: 5, warehouse: 'A' }")));
+        //End Example 34
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+
+        //Start Example 35
+        findIterable = collection.find(elemMatch("instock", Document.parse("{ qty: { $gt: 10, $lte: 20 } }")));
+        //End Example 35
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(3, result.size());
+            }
+        });
+
+        //Start Example 36
+        findIterable = collection.find(and(gt("instock.qty", 10), lte("instock.qty", 20)));
+        //End Example 36
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(4, result.size());
+            }
+        });
+
+        //Start Example 37
+        findIterable = collection.find(and(eq("instock.qty", 5), eq("instock.warehouse", "A")));
+        //End Example 37
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(2, result.size());
+            }
+        });
+    }
+
+    @Test
+    public void testQueryingNullandMissingFields() throws InterruptedException, ExecutionException, TimeoutException {
+
+        //Start Example 38
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+                Document.parse("{'_id': 1, 'item': null}"),
+                Document.parse("{'_id': 2}")
+        ), new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Process results
+                insertLatch.countDown();
+            }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 38
+
+        FutureResultCallback<Long> assertCountFuture = new FutureResultCallback<Long>();
+        collection.countDocuments(assertCountFuture);
+        assertEquals(Long.valueOf(2), assertCountFuture.get(10, TimeUnit.SECONDS));
+
+        //Start Example 39
+        FindIterable<Document> findIterable = collection.find(eq("item", null));
+        //End Example 39
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(2, result.size());
+            }
+        });
+
+        //Start Example 40
+        findIterable = collection.find(type("item", BsonType.NULL));
+        //End Example 40
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+
+        //Start Example 41
+        findIterable = collection.find(exists("item", false));
+        //End Example 41
+
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(1, result.size());
+            }
+        });
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testProjectingFields() throws InterruptedException, ExecutionException, TimeoutException {
+
+        //Start Example 42
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+            Document.parse("{ item: 'journal', status: 'A', size: { h: 14, w: 21, uom: 'cm' }, instock: [ { warehouse: 'A', qty: 5 }]}"),
+            Document.parse("{ item: 'notebook', status: 'A',  size: { h: 8.5, w: 11, uom: 'in' }, instock: [ { warehouse: 'C', qty: 5}]}"),
+            Document.parse("{ item: 'paper', status: 'D', size: { h: 8.5, w: 11, uom: 'in' }, instock: [ { warehouse: 'A', qty: 60 }]}"),
+            Document.parse("{ item: 'planner', status: 'D', size: { h: 22.85, w: 30, uom: 'cm' }, instock: [ { warehouse: 'A', qty: 40}]}"),
+            Document.parse("{ item: 'postcard', status: 'A', size: { h: 10, w: 15.25, uom: 'cm' }, "
+                    + "instock: [ { warehouse: 'B', qty: 15 }, { warehouse: 'C', qty: 35 } ] }")
+        ), new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Process results
+                insertLatch.countDown();
+            }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 42
+
+        final CountDownLatch check1 = new CountDownLatch(1);
+        collection.countDocuments(new SingleResultCallback<Long>() {
+            @Override
+            public void onResult(final Long result, final Throwable t) {
+                assertEquals(Long.valueOf(5), result);
+                check1.countDown();
+            }
+        });
+
+        //Start Example 43
+        FindIterable<Document> findIterable = collection.find(eq("status", "A"));
+        //End Example 43
+
+        final CountDownLatch check2 = new CountDownLatch(1);
+        findIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+            @Override
+            public void onResult(final ArrayList<Document> result, final Throwable t) {
+                assertEquals(3, result.size());
+                check2.countDown();
+            }
+        });
+
+        //Start Example 44
+        findIterable = collection.find(eq("status", "A")).projection(include("item", "status"));
+        //End Example 44
+
+        FutureResultCallback<Void> check3 = new FutureResultCallback<Void>();
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "status")), document.keySet());
+            }
+        }, check3);
+
+        //Start Example 45
+        findIterable = collection.find(eq("status", "A"))
+                .projection(fields(include("item", "status"), excludeId()));
+        //End Example 45
+
+        FutureResultCallback<Void> check4 = new FutureResultCallback<Void>();
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("item", "status")), document.keySet());
+            }
+        }, check4);
+
+        //Start Example 46
+        findIterable = collection.find(eq("status", "A")).projection(exclude("item", "status"));
+        //End Example 46
+
+        FutureResultCallback<Void> check5 = new FutureResultCallback<Void>();
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "size", "instock")), document.keySet());
+            }
+        }, check5);
+
+        //Start Example 47
+        findIterable = collection.find(eq("status", "A")).projection(include("item", "status", "size.uom"));
+        //End Example 47
+
+        FutureResultCallback<Void> check6 = new FutureResultCallback<Void>();
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "status", "size")), document.keySet());
+                assertEquals(new HashSet<String>(singletonList("uom")), document.get("size", Document.class).keySet());
+            }
+        }, check6);
+
+        //Start Example 48
+        findIterable = collection.find(eq("status", "A")).projection(exclude("size.uom"));
+        //End Example 48
+
+        FutureResultCallback<Void> check7 = new FutureResultCallback<Void>();
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "instock", "status", "size")), document.keySet());
+                assertEquals(new HashSet<String>(asList("h", "w")), document.get("size", Document.class).keySet());
+            }
+        }, check7);
+
+        //Start Example 49
+        findIterable = collection.find(eq("status", "A")).projection(include("item", "status", "instock.qty"));
+        //End Example 49
+
+        FutureResultCallback<Void> check8 = new FutureResultCallback<Void>();
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "instock", "status")), document.keySet());
+
+                List<Document> instock = (List<Document>) document.get("instock");
+                for (Document stockDocument : instock) {
+                    assertEquals(new HashSet<String>(singletonList("qty")), stockDocument.keySet());
+                }
+            }
+        }, check8);
+
+        //Start Example 50
+        findIterable = collection.find(eq("status", "A"))
+                .projection(fields(include("item", "status"), slice("instock", -1)));
+        //End Example 50
+
+        FutureResultCallback<Void> check9 = new FutureResultCallback<Void>();
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "instock", "status")), document.keySet());
+
+                List<Document> instock = (List<Document>) document.get("instock");
+                assertEquals(1, instock.size());
+            }
+        }, check9);
+
+        assertTrue(check1.await(10, TimeUnit.SECONDS));
+        assertTrue(check2.await(10, TimeUnit.SECONDS));
+        check3.get(10, TimeUnit.SECONDS);
+        check4.get(10, TimeUnit.SECONDS);
+        check5.get(10, TimeUnit.SECONDS);
+        check6.get(10, TimeUnit.SECONDS);
+        check7.get(10, TimeUnit.SECONDS);
+        check8.get(10, TimeUnit.SECONDS);
+        check9.get(10, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testUpdates() throws InterruptedException, ExecutionException, TimeoutException {
+        //Start Example 51
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+                Document.parse("{ item: 'canvas', qty: 100, size: { h: 28, w: 35.5, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'mat', qty: 85, size: { h: 27.9, w: 35.5, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'mousepad', qty: 25, size: { h: 19, w: 22.85, uom: 'cm' }, status: 'P' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'P' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'sketchbook', qty: 80, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'sketch pad', qty: 95, size: { h: 22.85, w: 30.5, uom: 'cm' }, status: 'A' }")
+        ), new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Process results
+                insertLatch.countDown();
+            }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 51
+
+        FutureResultCallback<Long> check1 = new FutureResultCallback<Long>();
+        collection.countDocuments(check1);
+        assertEquals(Long.valueOf(10), check1.get(10, TimeUnit.SECONDS));
+
+        //Start Example 52
+        final CountDownLatch updateOneLatch = new CountDownLatch(1);
+        collection.updateOne(eq("item", "paper"),
+                combine(set("size.uom", "cm"), set("status", "P"), currentDate("lastModified")),
+                new SingleResultCallback<UpdateResult>() {
+                    @Override
+                    public void onResult(final UpdateResult result, final Throwable t) {
+                        updateOneLatch.countDown();
+                    }
+                });
+        updateOneLatch.await(10, TimeUnit.SECONDS);
+        //End Example 52
+
+        FutureResultCallback<Void> check2 = new FutureResultCallback<Void>();
+        collection.find(eq("item", "paper")).forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals("cm", document.get("size", Document.class).getString("uom"));
+                assertEquals("P", document.getString("status"));
+                assertTrue(document.containsKey("lastModified"));
+            }
+        }, check2);
+        check2.get(10, TimeUnit.SECONDS);
+
+        //Start Example 53
+        final CountDownLatch updateManyLatch = new CountDownLatch(1);
+        collection.updateMany(lt("qty", 50),
+                combine(set("size.uom", "in"), set("status", "P"), currentDate("lastModified")),
+                new SingleResultCallback<UpdateResult>() {
+                    @Override
+                    public void onResult(final UpdateResult result, final Throwable t) {
+                        updateManyLatch.countDown();
+                    }
+                });
+        updateManyLatch.await(10, TimeUnit.SECONDS);
+        //End Example 53
+
+        FutureResultCallback<Void> check3 = new FutureResultCallback<Void>();
+        collection.find(lt("qty", 50)).forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals("in", document.get("size", Document.class).getString("uom"));
+                assertEquals("P", document.getString("status"));
+                assertTrue(document.containsKey("lastModified"));
+            }
+        }, check3);
+        check3.get(10, TimeUnit.SECONDS);
+
+        //Start Example 54
+        final CountDownLatch replaceOneLatch = new CountDownLatch(1);
+        collection.replaceOne(eq("item", "paper"),
+                Document.parse("{ item: 'paper', instock: [ { warehouse: 'A', qty: 60 }, { warehouse: 'B', qty: 40 } ] }"),
+                new SingleResultCallback<UpdateResult>() {
+                    @Override
+                    public void onResult(final UpdateResult result, final Throwable t) {
+                        replaceOneLatch.countDown();
+                    }
+                });
+        replaceOneLatch.await(10, TimeUnit.SECONDS);
+        //End Example 54
+
+        FutureResultCallback<Void> check4 = new FutureResultCallback<Void>();
+        collection.find(eq("item", "paper")).projection(excludeId()).forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(Document.parse("{ item: 'paper', instock: [ { warehouse: 'A', qty: 60 }, { warehouse: 'B', qty: 40 } ] }"),
+                        document);
+            }
+        }, check4);
+        check4.get(10, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testDeletions() throws InterruptedException, ExecutionException, TimeoutException {
+
+        //Start Example 55
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'A' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }")
+        ), new SingleResultCallback<Void>() {
+                @Override
+                public void onResult(final Void result, final Throwable t) {
+                    // Process results
+                    insertLatch.countDown();
+                }
+        });
+        insertLatch.await(10, TimeUnit.SECONDS);
+        // End Example 55
+
+        FutureResultCallback<Long> check1 = new FutureResultCallback<Long>();
+        collection.countDocuments(check1);
+        assertEquals(Long.valueOf(5), check1.get(10, TimeUnit.SECONDS));
+
+        //Start Example 57
+        final CountDownLatch deleteOneLatch = new CountDownLatch(1);
+        collection.deleteMany(eq("status", "A"), new SingleResultCallback<DeleteResult>() {
+            @Override
+            public void onResult(final DeleteResult result, final Throwable t) {
+                deleteOneLatch.countDown();
+            }
+        });
+        deleteOneLatch.await(10, TimeUnit.SECONDS);
+        //End Example 57
+
+        FutureResultCallback<Long> check2 = new FutureResultCallback<Long>();
+        collection.countDocuments(check2);
+        assertEquals(Long.valueOf(2), check2.get(10, TimeUnit.SECONDS));
+
+        //Start Example 58
+        final CountDownLatch deleteOneWithQueryLatch = new CountDownLatch(1);
+        collection.deleteOne(eq("status", "D"), new SingleResultCallback<DeleteResult>() {
+            @Override
+            public void onResult(final DeleteResult result, final Throwable t) {
+                deleteOneWithQueryLatch.countDown();
+            }
+        });
+        deleteOneWithQueryLatch.await(10, TimeUnit.SECONDS);
+        //End Example 58
+
+        FutureResultCallback<Long> check3 = new FutureResultCallback<Long>();
+        collection.countDocuments(check3);
+        assertEquals(Long.valueOf(1), check3.get(10, TimeUnit.SECONDS));
+
+        //Start Example 56
+        final CountDownLatch deleteManyLatch = new CountDownLatch(1);
+        collection.deleteMany(new Document(), new SingleResultCallback<DeleteResult>() {
+            @Override
+            public void onResult(final DeleteResult result, final Throwable t) {
+                deleteManyLatch.countDown();
+            }
+        });
+        deleteManyLatch.await(10, TimeUnit.SECONDS);
+        //End Example 56
+
+        FutureResultCallback<Long> check4 = new FutureResultCallback<Long>();
+        collection.countDocuments(check4);
+        assertEquals(Long.valueOf(0), check4.get(10, TimeUnit.SECONDS));
+    }
+
+}
diff --git a/driver-async/src/examples/gridfs/GridFSTour.java b/driver-async/src/examples/gridfs/GridFSTour.java
index efd13f23e57..cbde375485e 100644
--- a/driver-async/src/examples/gridfs/GridFSTour.java
+++ b/driver-async/src/examples/gridfs/GridFSTour.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/gridfs/package-info.java b/driver-async/src/examples/gridfs/package-info.java
index ea6f91648ae..2ee200c7122 100644
--- a/driver-async/src/examples/gridfs/package-info.java
+++ b/driver-async/src/examples/gridfs/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/primer/AggregatePrimer.java b/driver-async/src/examples/primer/AggregatePrimer.java
index 4572b849851..9c363f6ae5c 100644
--- a/driver-async/src/examples/primer/AggregatePrimer.java
+++ b/driver-async/src/examples/primer/AggregatePrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/primer/IndexesPrimer.java b/driver-async/src/examples/primer/IndexesPrimer.java
index ad0ce4f803f..3a382058f40 100644
--- a/driver-async/src/examples/primer/IndexesPrimer.java
+++ b/driver-async/src/examples/primer/IndexesPrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/primer/InsertPrimer.java b/driver-async/src/examples/primer/InsertPrimer.java
index fa6ae661878..e0357116a92 100644
--- a/driver-async/src/examples/primer/InsertPrimer.java
+++ b/driver-async/src/examples/primer/InsertPrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/primer/PrimerTestCase.java b/driver-async/src/examples/primer/PrimerTestCase.java
index 635a98f4884..94f511cc427 100644
--- a/driver-async/src/examples/primer/PrimerTestCase.java
+++ b/driver-async/src/examples/primer/PrimerTestCase.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/primer/QueryPrimer.java b/driver-async/src/examples/primer/QueryPrimer.java
index c872bab8b47..e927feb1b19 100644
--- a/driver-async/src/examples/primer/QueryPrimer.java
+++ b/driver-async/src/examples/primer/QueryPrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/primer/RemovePrimer.java b/driver-async/src/examples/primer/RemovePrimer.java
index df3bd89db95..ae6264e36b7 100644
--- a/driver-async/src/examples/primer/RemovePrimer.java
+++ b/driver-async/src/examples/primer/RemovePrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/examples/primer/UpdatePrimer.java b/driver-async/src/examples/primer/UpdatePrimer.java
index 00686b74247..3cb7ff63722 100644
--- a/driver-async/src/examples/primer/UpdatePrimer.java
+++ b/driver-async/src/examples/primer/UpdatePrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,18 +22,12 @@
 import org.bson.Document;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.client.result.UpdateResult;
-
-import static java.util.Arrays.asList;
 // @import: end
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static org.junit.Assume.assumeTrue;
 
 public class UpdatePrimer extends PrimerTestCase {
 
     @Test
     public void updateTopLevelFields() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
-
         // @begin: update-top-level-fields
         db.getCollection("restaurants").updateOne(new Document("name", "Juni"),
                 new Document("$set", new Document("cuisine", "American (New)"))
@@ -80,7 +74,6 @@ public void onResult(final UpdateResult result, final Throwable t) {
 
     @Test
     public void updateMultipleDocuments() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
 
         // @begin: update-multiple-documents
         db.getCollection("restaurants").updateMany(new Document("address.zipcode", "10016").append("cuisine", "Other"),
diff --git a/driver-async/src/examples/tour/Address.java b/driver-async/src/examples/tour/Address.java
new file mode 100644
index 00000000000..fb4612c9c31
--- /dev/null
+++ b/driver-async/src/examples/tour/Address.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+/**
+ * The Address POJO
+ */
+public final class Address {
+
+    private String street;
+    private String city;
+    private String zip;
+
+    /**
+     * Construct a new instance
+     */
+    public Address() {
+    }
+
+    /**
+     * Construct a new instance
+     *
+     * @param street the street
+     * @param city the city
+     * @param zip the zip / postal code
+     */
+    public Address(final String street, final String city, final String zip) {
+        this.street = street;
+        this.city = city;
+        this.zip = zip;
+    }
+
+    /**
+     * Returns the street
+     *
+     * @return the street
+     */
+    public String getStreet() {
+        return street;
+    }
+
+    /**
+     * Sets the street
+     *
+     * @param street the street
+     */
+    public void setStreet(final String street) {
+        this.street = street;
+    }
+
+    /**
+     * Returns the city
+     *
+     * @return the city
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * Sets the city
+     *
+     * @param city the city
+     */
+    public void setCity(final String city) {
+        this.city = city;
+    }
+
+    /**
+     * Returns the zip
+     *
+     * @return the zip
+     */
+    public String getZip() {
+        return zip;
+    }
+
+    /**
+     * Sets the zip
+     *
+     * @param zip the zip
+     */
+    public void setZip(final String zip) {
+        this.zip = zip;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Address address = (Address) o;
+
+        if (getStreet() != null ? !getStreet().equals(address.getStreet()) : address.getStreet() != null) {
+            return false;
+        }
+        if (getCity() != null ? !getCity().equals(address.getCity()) : address.getCity() != null) {
+            return false;
+        }
+        if (getZip() != null ? !getZip().equals(address.getZip()) : address.getZip() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getStreet() != null ? getStreet().hashCode() : 0;
+        result = 31 * result + (getCity() != null ? getCity().hashCode() : 0);
+        result = 31 * result + (getZip() != null ? getZip().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Address{"
+                + "street='" + street + "'"
+                + ", city='" + city + "'"
+                + ", zip='" + zip + "'"
+                + "}";
+    }
+}
diff --git a/driver-async/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java b/driver-async/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
new file mode 100644
index 00000000000..1639e5f0d6c
--- /dev/null
+++ b/driver-async/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import com.mongodb.async.client.vault.ClientEncryption;
+import com.mongodb.async.client.vault.ClientEncryptions;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.Document;
+
+import java.security.SecureRandom;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * ClientSideEncryption AutoEncryptionSettings tour
+ */
+public class ClientSideEncryptionAutoEncryptionSettingsTour {
+
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * Requires the mongodb-crypt library in the class path and mongocryptd on the system path.
+     *
+     * @param args ignored args
+     * @throws InterruptedException if interrupting waiting on a latch
+     */
+    public static void main(final String[] args) throws InterruptedException {
+
+        // This would have to be the same master key as was used to create the encryption key
+        final byte[] localMasterKey = new byte[96];
+        new SecureRandom().nextBytes(localMasterKey);
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
+           put("local", new HashMap<String, Object>() {{
+               put("key", localMasterKey);
+           }});
+        }};
+
+        String keyVaultNamespace = "admin.datakeys";
+        ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
+                .keyVaultMongoClientSettings(MongoClientSettings.builder()
+                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
+                        .build())
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .build();
+
+        ClientEncryption clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+
+        final CountDownLatch createKeyLatch = new CountDownLatch(1);
+        final AtomicReference<String> base64DataKeyId = new AtomicReference<String>();
+        clientEncryption.createDataKey("local", new DataKeyOptions(), new SingleResultCallback<BsonBinary>() {
+            @Override
+            public void onResult(final BsonBinary dataKeyId, final Throwable t) {
+                base64DataKeyId.set(Base64.getEncoder().encodeToString(dataKeyId.getData()));
+                createKeyLatch.countDown();
+            }
+        });
+        createKeyLatch.await();
+
+        final String dbName = "test";
+        final String collName = "coll";
+        AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .schemaMap(new HashMap<String, BsonDocument>() {{
+                    put(dbName + "." + collName,
+                            // Need a schema that references the new data key
+                            BsonDocument.parse("{"
+                                    + "  properties: {"
+                                    + "    encryptedField: {"
+                                    + "      encrypt: {"
+                                    + "        keyId: [{"
+                                    + "          \"$binary\": {"
+                                    + "            \"base64\": \"" + base64DataKeyId.get() + "\","
+                                    + "            \"subType\": \"04\""
+                                    + "          }"
+                                    + "        }],"
+                                    + "        bsonType: \"string\","
+                                    + "        algorithm: \"AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic\""
+                                    + "      }"
+                                    + "    }"
+                                    + "  },"
+                                    + "  \"bsonType\": \"object\""
+                                    + "}"));
+                }}).build();
+
+        MongoClientSettings clientSettings = MongoClientSettings.builder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+
+        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoCollection<Document> collection = mongoClient.getDatabase("test").getCollection("coll");
+        final CountDownLatch dropLatch = new CountDownLatch(1);
+        collection.drop(new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                dropLatch.countDown();
+            }
+        });
+        dropLatch.await();
+
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertOne(new Document("encryptedField", "123456789"),
+                new SingleResultCallback<Void>() {
+                    @Override
+                    public void onResult(final Void result, final Throwable t) {
+                        System.out.println("Inserted!");
+                        insertLatch.countDown();
+                    }
+                });
+        insertLatch.await();
+
+        final CountDownLatch findLatch = new CountDownLatch(1);
+        collection.find().first(new SingleResultCallback<Document>() {
+            @Override
+            public void onResult(final Document result, final Throwable t) {
+                System.out.println(result.toJson());
+                findLatch.countDown();
+            }
+        });
+        findLatch.await();
+
+        // release resources
+        mongoClient.close();
+    }
+}
diff --git a/driver-async/src/examples/tour/ClientSideEncryptionSimpleTour.java b/driver-async/src/examples/tour/ClientSideEncryptionSimpleTour.java
new file mode 100644
index 00000000000..c60e2d1a454
--- /dev/null
+++ b/driver-async/src/examples/tour/ClientSideEncryptionSimpleTour.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import org.bson.Document;
+
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * ClientSideEncryption Simple tour
+ */
+public class ClientSideEncryptionSimpleTour {
+
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * Requires the mongodb-crypt library in the class path and mongocryptd on the system path.
+     * Assumes the schema has already been created in MongoDB.
+     *
+     * @param args ignored args
+     * @throws InterruptedException if interrupting waiting on a latch
+     */
+    public static void main(final String[] args) throws InterruptedException {
+
+        // This would have to be the same master key as was used to create the encryption key
+        final byte[] localMasterKey = new byte[96];
+        new SecureRandom().nextBytes(localMasterKey);
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
+            put("local", new HashMap<String, Object>() {{
+                put("key", localMasterKey);
+            }});
+        }};
+
+        String keyVaultNamespace = "admin.datakeys";
+
+        AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .build();
+
+        MongoClientSettings clientSettings = MongoClientSettings.builder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+
+        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoCollection<Document> collection = mongoClient.getDatabase("test").getCollection("coll");
+        final CountDownLatch dropLatch = new CountDownLatch(1);
+        collection.drop(new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                dropLatch.countDown();
+            }
+        });
+        dropLatch.await();
+
+        final CountDownLatch insertLatch = new CountDownLatch(1);
+        collection.insertOne(new Document("encryptedField", "123456789"),
+                new SingleResultCallback<Void>() {
+                    @Override
+                    public void onResult(final Void result, final Throwable t) {
+                        System.out.println("Inserted!");
+                        insertLatch.countDown();
+                    }
+                });
+        insertLatch.await();
+
+        final CountDownLatch findLatch = new CountDownLatch(1);
+        collection.find().first(new SingleResultCallback<Document>() {
+            @Override
+            public void onResult(final Document result, final Throwable t) {
+                System.out.println(result.toJson());
+                findLatch.countDown();
+            }
+        });
+        findLatch.await();
+
+        // release resources
+        mongoClient.close();
+    }
+}
diff --git a/driver-async/src/examples/tour/Person.java b/driver-async/src/examples/tour/Person.java
new file mode 100644
index 00000000000..9294ff5e19d
--- /dev/null
+++ b/driver-async/src/examples/tour/Person.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import org.bson.types.ObjectId;
+
+/**
+ * The Person Pojo
+ */
+public final class Person {
+    private ObjectId id;
+    private String name;
+    private int age;
+    private Address address;
+
+    /**
+     * Construct a new instance
+     */
+    public Person() {
+    }
+
+    /**
+     * Construct a new instance
+     *
+     * @param name the name
+     * @param age the age
+     * @param address the address
+     */
+    public Person(final String name, final int age, final Address address) {
+        this.name = name;
+        this.age = age;
+        this.address = address;
+    }
+
+    /**
+     * Returns the id
+     *
+     * @return the id
+     */
+    public ObjectId getId() {
+        return id;
+    }
+
+    /**
+     * Sets the id
+     *
+     * @param id the id
+     */
+    public void setId(final ObjectId id) {
+        this.id = id;
+    }
+
+    /**
+     * Returns the name
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the name
+     *
+     * @param name the name
+     */
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the age
+     *
+     * @return the age
+     */
+    public int getAge() {
+        return age;
+    }
+
+    /**
+     * Sets the age
+     *
+     * @param age the age
+     */
+    public void setAge(final int age) {
+        this.age = age;
+    }
+
+    /**
+     * Returns the address
+     *
+     * @return the address
+     */
+    public Address getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the address
+     *
+     * @param address the address
+     */
+    public void setAddress(final Address address) {
+        this.address = address;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Person person = (Person) o;
+
+        if (getAge() != person.getAge()) {
+            return false;
+        }
+        if (getId() != null ? !getId().equals(person.getId()) : person.getId() != null) {
+            return false;
+        }
+        if (getName() != null ? !getName().equals(person.getName()) : person.getName() != null) {
+            return false;
+        }
+        if (getAddress() != null ? !getAddress().equals(person.getAddress()) : person.getAddress() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId() != null ? getId().hashCode() : 0;
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        result = 31 * result + getAge();
+        result = 31 * result + (getAddress() != null ? getAddress().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Person{"
+                + "id='" + id + "'"
+                + ", name='" + name + "'"
+                + ", age=" + age
+                + ", address=" + address
+                + "}";
+    }
+}
diff --git a/driver-async/src/examples/tour/PojoQuickTour.java b/driver-async/src/examples/tour/PojoQuickTour.java
new file mode 100644
index 00000000000..6e9af68cf15
--- /dev/null
+++ b/driver-async/src/examples/tour/PojoQuickTour.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.Block;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import com.mongodb.async.client.MongoDatabase;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.gt;
+import static com.mongodb.client.model.Filters.not;
+import static com.mongodb.client.model.Updates.combine;
+import static com.mongodb.client.model.Updates.set;
+import static java.util.Arrays.asList;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+
+/**
+ * The POJO QuickTour code example
+ */
+public class PojoQuickTour {
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * @param args takes an optional single argument for the connection string
+     * @throws InterruptedException if a latch is interrupted
+     */
+    public static void main(final String[] args) throws InterruptedException {
+        MongoClient mongoClient;
+
+        if (args.length == 0) {
+            // connect to the local database server
+            mongoClient = MongoClients.create();
+        } else {
+            mongoClient = MongoClients.create(args[0]);
+        }
+
+        // create codec registry for POJOs
+        CodecRegistry pojoCodecRegistry = fromRegistries(MongoClients.getDefaultCodecRegistry(),
+                fromProviders(PojoCodecProvider.builder().automatic(true).build()));
+
+        // get handle to "mydb" database
+        MongoDatabase database = mongoClient.getDatabase("mydb").withCodecRegistry(pojoCodecRegistry);
+
+        // get a handle to the "people" collection
+        final MongoCollection<Person> collection = database.getCollection("people", Person.class);
+
+        // drop all the data in it
+        final CountDownLatch dropLatch = new CountDownLatch(1);
+        collection.drop(new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                dropLatch.countDown();
+            }
+        });
+        dropLatch.await();
+
+        // make a document and insert it
+        final Person ada = new Person("Ada Byron", 20, new Address("St James Square", "London", "W1"));
+        System.out.println("Original Person Model: " + ada);
+
+        collection.insertOne(ada, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                // Person will now have an ObjectId
+                System.out.println("Mutated Person Model: " + ada);
+                System.out.println("Inserted!");
+            }
+        });
+
+        // get it (since it's the only one in there since we dropped the rest earlier on)
+        SingleResultCallback<Person> printCallback = new SingleResultCallback<Person>() {
+            @Override
+            public void onResult(final Person person, final Throwable t) {
+                System.out.println(person);
+            }
+        };
+        collection.find().first(printCallback);
+
+        // now, lets add some more people so we can explore queries and cursors
+        List<Person> people = asList(
+                new Person("Charles Babbage", 45, new Address("5 Devonshire Street", "London", "W11")),
+                new Person("Alan Turing", 28, new Address("Bletchley Hall", "Bletchley Park", "MK12")),
+                new Person("Timothy Berners-Lee", 61, new Address("Colehill", "Wimborne", null))
+        );
+
+        final CountDownLatch countLatch = new CountDownLatch(1);
+        collection.insertMany(people, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                collection.countDocuments(new SingleResultCallback<Long>() {
+                    @Override
+                    public void onResult(final Long count, final Throwable t) {
+                        System.out.println("total # of people " + count);
+                        countLatch.countDown();
+                    }
+                });
+            }
+        });
+        countLatch.await();
+
+        System.out.println("");
+        // lets get all the documents in the collection and print them out
+        Block<Person> printBlock = new Block<Person>() {
+            @Override
+            public void apply(final Person person) {
+                System.out.println(person);
+            }
+        };
+        SingleResultCallback<Void> callbackWhenFinished = new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                System.out.println("Operation Finished!");
+            }
+        };
+        collection.find().forEach(printBlock, callbackWhenFinished);
+
+        System.out.println("");
+        // now use a query to get 1 document out
+        collection.find(eq("address.city", "Wimborne")).first(printCallback);
+
+        System.out.println("");
+        // now lets find every over 30
+        collection.find(gt("age", 30)).forEach(printBlock, callbackWhenFinished);
+
+        System.out.println("");
+        // Update One
+        SingleResultCallback<UpdateResult> printModifiedCount = new SingleResultCallback<UpdateResult>() {
+            @Override
+            public void onResult(final UpdateResult result, final Throwable t) {
+                System.out.println(result.getModifiedCount());
+            }
+        };
+        collection.updateOne(eq("name", "Ada Byron"), combine(set("age", 23), set("name", "Ada Lovelace")),
+                printModifiedCount);
+
+        System.out.println("");
+        // Update Many
+        collection.updateMany(not(eq("zip", null)), set("zip", null),
+                printModifiedCount);
+
+        System.out.println("");
+        // Replace One
+        collection.replaceOne(eq("name", "Ada Lovelace"), ada, printModifiedCount);
+
+        // Delete One
+        SingleResultCallback<DeleteResult> printDeletedCount = new SingleResultCallback<DeleteResult>() {
+            @Override
+            public void onResult(final DeleteResult result, final Throwable t) {
+                System.out.println(result.getDeletedCount());
+            }
+        };
+        collection.deleteOne(eq("address.city", "Wimborne"), printDeletedCount);
+
+        // Delete Many
+        collection.deleteMany(eq("address.city", "London"), printDeletedCount);
+
+        // Clean up
+        final CountDownLatch deleteLatch = new CountDownLatch(1);
+        database.drop(new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                deleteLatch.countDown();
+            }
+        });
+        deleteLatch.await();
+
+        // release resources
+        mongoClient.close();
+    }
+}
diff --git a/driver-async/src/examples/tour/QuickTour.java b/driver-async/src/examples/tour/QuickTour.java
index ce9728b01e8..b32a72a77a5 100644
--- a/driver-async/src/examples/tour/QuickTour.java
+++ b/driver-async/src/examples/tour/QuickTour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@
 import static java.util.Collections.singletonList;
 
 /**
- * The QuickTour code example see: https://mongodb.github.io/mongo-java-driver/3.0/getting-started
+ * The QuickTour code example
  */
 public class QuickTour {
     /**
@@ -123,7 +123,7 @@ public void onResult(final Document document, final Throwable t) {
         collection.insertMany(documents, new SingleResultCallback<Void>() {
             @Override
             public void onResult(final Void result, final Throwable t) {
-                collection.count(new SingleResultCallback<Long>() {
+                collection.countDocuments(new SingleResultCallback<Long>() {
                     @Override
                     public void onResult(final Long count, final Throwable t) {
                         System.out.println("total # of documents after inserting 100 small ones (should be 101) " + count);
@@ -251,7 +251,7 @@ public void onResult(final Void result, final Throwable t) {
                 dropLatch3.countDown();
             }
         });
-        dropLatch2.await();
+        dropLatch3.await();
 
         collection.bulkWrite(writes, new BulkWriteOptions().ordered(false), printBatchResult);
         collection.find().forEach(printDocumentBlock, callbackWhenFinished);
diff --git a/driver-async/src/examples/tour/QuickTourAdmin.java b/driver-async/src/examples/tour/QuickTourAdmin.java
index 66288af1679..5028090389c 100644
--- a/driver-async/src/examples/tour/QuickTourAdmin.java
+++ b/driver-async/src/examples/tour/QuickTourAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 import static com.mongodb.client.model.Filters.text;
 
 /**
- * The QuickTourAdmin code example see: https://mongodb.github.io/mongo-java-driver/3.0/getting-started
+ * The QuickTourAdmin code example
  */
 public class QuickTourAdmin {
     /**
@@ -131,7 +131,7 @@ public void onResult(final String result, final Throwable t) {
         collection.insertOne(new Document("_id", 2).append("content", "irrelevant content"), callbackWhenFinished);
 
         // Find using the text index
-        collection.count(text("textual content -irrelevant"), new SingleResultCallback<Long>() {
+        collection.countDocuments(text("textual content -irrelevant"), new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long matchCount, final Throwable t) {
                 System.out.println("Text search matches: " + matchCount);
@@ -141,7 +141,7 @@ public void onResult(final Long matchCount, final Throwable t) {
 
         // Find using the $language operator
         Bson textSearch = text("textual content -irrelevant", new TextSearchOptions().language("english"));
-        collection.count(textSearch, new SingleResultCallback<Long>() {
+        collection.countDocuments(textSearch, new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long matchCount, final Throwable t) {
                 System.out.println("Text search matches (english): " + matchCount);
diff --git a/driver-async/src/examples/tour/package-info.java b/driver-async/src/examples/tour/package-info.java
index cf3b973a32e..2261cca5e9d 100644
--- a/driver-async/src/examples/tour/package-info.java
+++ b/driver-async/src/examples/tour/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/main/com/mongodb/async/client/AbstractSubscription.java b/driver-async/src/main/com/mongodb/async/client/AbstractSubscription.java
index 3b99324d146..ea48e2af044 100644
--- a/driver-async/src/main/com/mongodb/async/client/AbstractSubscription.java
+++ b/driver-async/src/main/com/mongodb/async/client/AbstractSubscription.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,11 +16,16 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.MongoException;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.lang.Nullable;
+
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 abstract class AbstractSubscription<TResult> implements Subscription {
-
+    private static final Logger LOGGER = Loggers.getLogger("client");
     private final Observer<? super TResult> observer;
 
     /* protected by `this` */
@@ -33,7 +38,7 @@ abstract class AbstractSubscription<TResult> implements Subscription {
 
     private final ConcurrentLinkedQueue<TResult> resultsQueue = new ConcurrentLinkedQueue<TResult>();
 
-    public AbstractSubscription(final Observer<? super TResult> observer) {
+    AbstractSubscription(final Observer<? super TResult> observer) {
         this.observer = observer;
     }
 
@@ -55,14 +60,14 @@ public void unsubscribe() {
     }
 
     @Override
-    public boolean isUnsubscribed() {
+    public synchronized boolean isUnsubscribed() {
         return isUnsubscribed;
     }
 
     @Override
     public void request(final long n) {
         if (n < 1) {
-            throw new IllegalArgumentException("Number requested cannot be negative: " + n);
+            throw new IllegalArgumentException("Number requested must be > 0: " + n);
         }
 
         boolean requestData = false;
@@ -95,54 +100,62 @@ void postTerminate() {
 
     abstract boolean checkCompleted();
 
-    boolean isTerminated() {
+    synchronized boolean isTerminated() {
         return isTerminated;
     }
 
-    long getRequested() {
+    synchronized long getRequested() {
         return requested;
     }
 
-    void addToQueue(final TResult result) {
+    void addToQueue(@Nullable final TResult result) {
         if (result != null) {
             resultsQueue.add(result);
         }
-        tryProcessResultsQueue();
     }
 
-    void addToQueue(final List<TResult> results) {
+    void addToQueue(@Nullable final List<TResult> results) {
         if (results != null) {
-            resultsQueue.addAll(results);
+            for (TResult cur : results) {
+                addToQueue(cur);
+            }
         }
-        tryProcessResultsQueue();
     }
 
     void onError(final Throwable t) {
         if (terminalAction()) {
             postTerminate();
-            observer.onError(t);
+            try {
+                observer.onError(t);
+            } catch (Throwable t1) {
+                LOGGER.error("Calling onError threw an exception", t1);
+                throw MongoException.fromThrowableNonNull(t1);
+            }
+        } else {
+            throw MongoException.fromThrowableNonNull(t);
         }
     }
 
-    void onNext(final TResult next) {
-        boolean isTerminated = false;
-        synchronized (this) {
-            isTerminated = this.isTerminated;
-        }
-
-        if (!isTerminated) {
+    private void onNext(final TResult next) {
+        if (!isTerminated()) {
             try {
                 observer.onNext(next);
             } catch (Throwable t) {
+                LOGGER.error("Calling onNext threw an exception", t);
                 onError(t);
             }
         }
     }
 
-    void onComplete() {
+    private void onComplete() {
         if (terminalAction()) {
             postTerminate();
-            observer.onComplete();
+            try {
+                observer.onComplete();
+            } catch (Throwable t) {
+                LOGGER.error("Calling onComplete threw an exception", t);
+                throw MongoException.fromThrowableNonNull(t);
+            }
         }
     }
 
@@ -154,7 +167,7 @@ private void tryRequestInitialData() {
         }
     }
 
-    private void tryProcessResultsQueue() {
+    void tryProcessResultsQueue() {
         try {
             processResultsQueue();
         } catch (Throwable t) {
@@ -162,6 +175,7 @@ private void tryProcessResultsQueue() {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void processResultsQueue() {
         boolean mustProcess = false;
 
@@ -178,7 +192,7 @@ private void processResultsQueue() {
             long processedCount = 0;
             boolean completed = false;
             while (true) {
-                long localWanted = 0;
+                long localWanted;
 
                 synchronized (this) {
                     requested -= processedCount;
diff --git a/driver-async/src/main/com/mongodb/async/client/AggregateIterable.java b/driver-async/src/main/com/mongodb/async/client/AggregateIterable.java
index 32c52890443..4fb5ecd651c 100644
--- a/driver-async/src/main/com/mongodb/async/client/AggregateIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/AggregateIterable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,9 @@
 package com.mongodb.async.client;
 
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
 
@@ -25,7 +28,9 @@
  *
  * @param <TResult> The type of the result.
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
 
     /**
@@ -36,7 +41,7 @@ public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
      * @mongodb.driver.manual reference/command/aggregate/ Aggregation
      * @mongodb.server.release 2.6
      */
-    AggregateIterable<TResult> allowDiskUse(Boolean allowDiskUse);
+    AggregateIterable<TResult> allowDiskUse(@Nullable Boolean allowDiskUse);
 
     /**
      * Sets the maximum execution time on the server for this operation.
@@ -48,6 +53,19 @@ public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
      */
     AggregateIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
 
+    /**
+     * The maximum amount of time for the server to wait on new documents to satisfy a {@code $changeStream} aggregation.
+     *
+     * A zero value will be ignored.
+     *
+     * @param maxAwaitTime  the max await time
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum await execution time in the given time unit
+     * @mongodb.server.release 3.6
+     * @since 3.6
+     */
+    AggregateIterable<TResult> maxAwaitTime(long maxAwaitTime, TimeUnit timeUnit);
+
     /**
      * Sets whether the server should use a cursor to return results.
      *
@@ -55,13 +73,18 @@ public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/aggregate/ Aggregation
      * @mongodb.server.release 2.6
+     * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+     * that support it (&gt;= 2.6).  The driver will ignore this as of MongoDB 3.6, which does not support inline results for the aggregate
+     * command.
      */
-    AggregateIterable<TResult> useCursor(Boolean useCursor);
+    @Deprecated
+    AggregateIterable<TResult> useCursor(@Nullable Boolean useCursor);
 
     /**
-     * Aggregates documents according to the specified aggregation pipeline, which must end with a $out stage.
+     * Aggregates documents according to the specified aggregation pipeline, which must end with a $out or $merge stage.
      *
      * @param callback the callback, which is called when the aggregation completes
+     * @throws IllegalStateException if the pipeline does not end with a $out or $merge stage
      * @mongodb.driver.manual aggregation/ Aggregation
      */
     void toCollection(SingleResultCallback<Void> callback);
@@ -78,7 +101,7 @@ public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
     /**
      * Sets the bypass document level validation flag.
      *
-     * <p>Note: This only applies when an $out stage is specified</p>.
+     * <p>Note: This only applies when a $out or $merge stage is specified</p>.
      *
      * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
      * @return this
@@ -86,5 +109,36 @@ public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
      * @mongodb.driver.manual reference/command/aggregate/ Aggregation
      * @mongodb.server.release 3.2
      */
-    AggregateIterable<TResult> bypassDocumentValidation(Boolean bypassDocumentValidation);
+    AggregateIterable<TResult> bypassDocumentValidation(@Nullable Boolean bypassDocumentValidation);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    AggregateIterable<TResult> collation(@Nullable Collation collation);
+
+    /**
+     * Sets the comment to the aggregation. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<TResult> comment(@Nullable String comment);
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<TResult> hint(@Nullable Bson hint);
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/AggregateIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/AggregateIterableImpl.java
index 83ab7fcb0a1..59f140acee3 100644
--- a/driver-async/src/main/com/mongodb/async/client/AggregateIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/AggregateIterableImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,70 +16,91 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.Block;
-import com.mongodb.Function;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.FindOptions;
-import com.mongodb.operation.AggregateOperation;
-import com.mongodb.operation.AggregateToCollectionOperation;
-import com.mongodb.operation.AsyncOperationExecutor;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+import com.mongodb.operation.AsyncWriteOperation;
 import org.bson.BsonDocument;
-import org.bson.BsonValue;
+import org.bson.BsonString;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 
-class AggregateIterableImpl<TDocument, TResult> implements AggregateIterable<TResult> {
+class AggregateIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements AggregateIterable<TResult> {
+    private final AsyncOperations<TDocument> operations;
     private final MongoNamespace namespace;
     private final Class<TDocument> documentClass;
     private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
     private final CodecRegistry codecRegistry;
-    private final AsyncOperationExecutor executor;
     private final List<? extends Bson> pipeline;
+    private final AggregationLevel aggregationLevel;
 
     private Boolean allowDiskUse;
-    private Integer batchSize;
     private long maxTimeMS;
+    private long maxAwaitTimeMS;
     private Boolean useCursor;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
+    private String comment;
+    private Bson hint;
+
+    AggregateIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                          final List<? extends Bson> pipeline, final AggregationLevel aggregationLevel, final boolean retryReads) {
+        this(clientSession, new MongoNamespace(databaseName, "ignored"), documentClass, resultClass, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
 
-    AggregateIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                          final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                          final AsyncOperationExecutor executor, final List<? extends Bson> pipeline) {
+    AggregateIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                          final List<? extends Bson> pipeline, final AggregationLevel aggregationLevel, final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.operations = new AsyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                false, retryReads);
         this.namespace = notNull("namespace", namespace);
         this.documentClass = notNull("documentClass", documentClass);
         this.resultClass = notNull("resultClass", resultClass);
         this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
         this.pipeline = notNull("pipeline", pipeline);
+        this.aggregationLevel = notNull("aggregationLevel", aggregationLevel);
+    }
+
+    @Override
+    public void toCollection(final SingleResultCallback<Void> callback) {
+
+        if (getOutNamespace() == null) {
+            throw new IllegalStateException("The last stage of the aggregation pipeline must be $out or $merge");
+        }
+
+        getExecutor().execute(operations.aggregateToCollection(pipeline, maxTimeMS, allowDiskUse, bypassDocumentValidation, collation, hint,
+                comment, aggregationLevel), getReadConcern(), getClientSession(), callback);
     }
 
     @Override
-    public AggregateIterable<TResult> allowDiskUse(final Boolean allowDiskUse) {
+    public AggregateIterable<TResult> allowDiskUse(@Nullable final Boolean allowDiskUse) {
         this.allowDiskUse = allowDiskUse;
         return this;
     }
 
     @Override
     public AggregateIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
+        super.batchSize(batchSize);
         return this;
     }
 
@@ -91,99 +112,90 @@ public AggregateIterable<TResult> maxTime(final long maxTime, final TimeUnit tim
     }
 
     @Override
-    public AggregateIterable<TResult> useCursor(final Boolean useCursor) {
+    @SuppressWarnings("deprecation")
+    public AggregateIterable<TResult> useCursor(@Nullable final Boolean useCursor) {
         this.useCursor = useCursor;
         return this;
     }
 
     @Override
-    public void toCollection(final SingleResultCallback<Void> callback) {
-        List<BsonDocument> aggregateList = createBsonDocumentList();
-        BsonValue outCollection = getAggregateOutCollection(aggregateList);
-
-        if (outCollection == null) {
-            throw new IllegalArgumentException("The last stage of the aggregation pipeline must be $out");
-        }
-
-        executor.execute(new AggregateToCollectionOperation(namespace, aggregateList)
-                .maxTime(maxTimeMS, MILLISECONDS)
-                .allowDiskUse(allowDiskUse), callback);
+    public AggregateIterable<TResult> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxAwaitTimeMS = TimeUnit.MILLISECONDS.convert(maxAwaitTime, timeUnit);
+        return this;
     }
 
     @Override
-    public void first(final SingleResultCallback<TResult> callback) {
-        notNull("callback", callback);
-        execute().first(callback);
+    public AggregateIterable<TResult> bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        return this;
     }
 
     @Override
-    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        execute().forEach(block, callback);
+    public AggregateIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
     }
 
     @Override
-    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        execute().into(target, callback);
+    public AggregateIterable<TResult> comment(@Nullable final String comment) {
+        this.comment = comment;
+        return this;
     }
 
     @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
+    public AggregateIterable<TResult> hint(@Nullable final Bson hint) {
+        this.hint = hint;
+        return this;
     }
 
     @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
-        notNull("callback", callback);
-        execute().batchCursor(callback);
-    }
+    @SuppressWarnings("deprecation")
+    AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation() {
+        MongoNamespace outNamespace = getOutNamespace();
 
-    @Override
-    public AggregateIterable<TResult> bypassDocumentValidation(final Boolean bypassDocumentValidation) {
-        this.bypassDocumentValidation = bypassDocumentValidation;
-        return this;
-    }
+        if (outNamespace != null) {
+            AsyncWriteOperation<Void> aggregateToCollectionOperation =
+                    operations.aggregateToCollection(pipeline, maxTimeMS, allowDiskUse, bypassDocumentValidation, collation, hint, comment,
+                            aggregationLevel);
 
-    private MongoIterable<TResult> execute() {
-        List<BsonDocument> aggregateList = createBsonDocumentList();
-        BsonValue outCollection = getAggregateOutCollection(aggregateList);
-
-        if (outCollection != null) {
-            AggregateToCollectionOperation operation = new AggregateToCollectionOperation(namespace, aggregateList)
-                    .maxTime(maxTimeMS, MILLISECONDS)
-                    .allowDiskUse(allowDiskUse)
-                    .bypassDocumentValidation(bypassDocumentValidation);
-            MongoIterable<TResult> delegated = new FindIterableImpl<TDocument, TResult>(new MongoNamespace(namespace.getDatabaseName(),
-                    outCollection.asString().getValue()), documentClass, resultClass, codecRegistry, primary(), readConcern,
-                    executor, new BsonDocument(), new FindOptions());
+            FindOptions findOptions = new FindOptions().collation(collation);
+            Integer batchSize = getBatchSize();
             if (batchSize != null) {
-                delegated.batchSize(batchSize);
+                findOptions.batchSize(batchSize);
             }
-            return new AwaitingWriteOperationIterable<TResult, Void>(operation, executor, delegated);
+            AsyncReadOperation<AsyncBatchCursor<TResult>> findOperation =
+                    operations.find(outNamespace, new BsonDocument(), resultClass, findOptions);
+
+            return new WriteOperationThenCursorReadOperation<TResult>(aggregateToCollectionOperation, findOperation);
         } else {
-            return new OperationIterable<TResult>(new AggregateOperation<TResult>(namespace, aggregateList, codecRegistry.get(resultClass))
-                    .maxTime(maxTimeMS, MILLISECONDS)
-                    .allowDiskUse(allowDiskUse)
-                    .batchSize(batchSize)
-                    .useCursor(useCursor)
-                    .readConcern(readConcern),
-                    readPreference,
-                    executor);
+            return operations.aggregate(pipeline, resultClass, maxTimeMS, maxAwaitTimeMS, getBatchSize(), collation,
+                    hint, comment, allowDiskUse, useCursor, aggregationLevel);
         }
-    }
 
-    private BsonValue getAggregateOutCollection(final List<BsonDocument> aggregateList) {
-        return aggregateList.size() == 0 ? null : aggregateList.get(aggregateList.size() - 1).get("$out");
     }
 
-    private List<BsonDocument> createBsonDocumentList() {
-        List<BsonDocument> aggregateList = new ArrayList<BsonDocument>(pipeline.size());
-        for (Bson document : pipeline) {
-            aggregateList.add(document.toBsonDocument(documentClass, codecRegistry));
+    @Nullable
+    private MongoNamespace getOutNamespace() {
+        if (pipeline.size() == 0) {
+            return null;
         }
-        return aggregateList;
+
+        Bson lastStage = notNull("last stage", pipeline.get(pipeline.size() - 1));
+        BsonDocument lastStageDocument = lastStage.toBsonDocument(documentClass, codecRegistry);
+        if (lastStageDocument.containsKey("$out")) {
+            return new MongoNamespace(namespace.getDatabaseName(), lastStageDocument.getString("$out").getValue());
+        } else if (lastStageDocument.containsKey("$merge")) {
+            BsonDocument mergeDocument = lastStageDocument.getDocument("$merge");
+            if (mergeDocument.isDocument("into")) {
+                BsonDocument intoDocument = mergeDocument.getDocument("into");
+                return new MongoNamespace(intoDocument.getString("db", new BsonString(namespace.getDatabaseName())).getValue(),
+                        intoDocument.getString("coll").getValue());
+            } else if (mergeDocument.isString("into")) {
+                return new MongoNamespace(namespace.getDatabaseName(), mergeDocument.getString("into").getValue());
+            }
+        }
+
+        return null;
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/AwaitingWriteOperationIterable.java b/driver-async/src/main/com/mongodb/async/client/AwaitingWriteOperationIterable.java
deleted file mode 100644
index 78bdb1e2a36..00000000000
--- a/driver-async/src/main/com/mongodb/async/client/AwaitingWriteOperationIterable.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright 2014-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.async.client;
-
-import com.mongodb.Block;
-import com.mongodb.Function;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.async.AsyncBatchCursor;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.AsyncWriteOperation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.notNull;
-
-class AwaitingWriteOperationIterable<T, W> implements MongoIterable<T> {
-    private final MongoIterable<T> delegated;
-    private final List<SingleResultCallback<Void>> callbacks = new ArrayList<SingleResultCallback<Void>>();
-    private boolean writeCompleted;
-    private Throwable thrown;
-
-    AwaitingWriteOperationIterable(final AsyncWriteOperation<W> writeOperation, final AsyncOperationExecutor executor,
-                                   final MongoIterable<T> delegated) {
-        this.delegated = delegated;
-        executor.execute(writeOperation, new SingleResultCallback<W>() {
-            @Override
-            public void onResult(final W result, final Throwable t) {
-                synchronized (AwaitingWriteOperationIterable.this) {
-                    writeCompleted = true;
-                    thrown = t;
-                    for (SingleResultCallback<Void> cur : callbacks) {
-                        cur.onResult(null, t);
-                    }
-                }
-            }
-        });
-    }
-
-    @Override
-    public void first(final SingleResultCallback<T> callback) {
-        notNull("callback", callback);
-        boolean localWriteCompleted;
-
-        synchronized (this) {
-            localWriteCompleted = writeCompleted;
-            if (!localWriteCompleted) {
-                callbacks.add(new SingleResultCallback<Void>() {
-                    @Override
-                    public void onResult(final Void result, final Throwable t) {
-                        if (t != null) {
-                            callback.onResult(null, t);
-                        } else {
-                            delegated.first(callback);
-                        }
-                    }
-                });
-            }
-        }
-        if (localWriteCompleted) {
-            if (thrown != null) {
-                callback.onResult(null, thrown);
-            } else {
-                delegated.first(callback);
-            }
-        }
-    }
-
-    @Override
-    public void forEach(final Block<? super T> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        boolean localWriteCompleted;
-
-        synchronized (this) {
-            localWriteCompleted = writeCompleted;
-            if (!localWriteCompleted) {
-                callbacks.add(new SingleResultCallback<Void>() {
-                    @Override
-                    public void onResult(final Void result, final Throwable t) {
-                        if (t != null) {
-                            callback.onResult(null, t);
-                        } else {
-                            delegated.forEach(block, callback);
-                        }
-                    }
-                });
-            }
-        }
-        if (localWriteCompleted) {
-            if (thrown != null) {
-                callback.onResult(null, thrown);
-            } else {
-                delegated.forEach(block, callback);
-            }
-        }
-
-    }
-
-    @Override
-    public <A extends Collection<? super T>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        boolean localWriteCompleted;
-
-        synchronized (this) {
-            localWriteCompleted = writeCompleted;
-            if (!localWriteCompleted) {
-                callbacks.add(new SingleResultCallback<Void>() {
-                    @Override
-                    public void onResult(final Void result, final Throwable t) {
-                        if (t != null) {
-                            callback.onResult(null, t);
-                        } else {
-                            delegated.into(target, callback);
-                        }
-                    }
-                });
-            }
-        }
-        if (localWriteCompleted) {
-            if (thrown != null) {
-                callback.onResult(null, thrown);
-            } else {
-                delegated.into(target, callback);
-            }
-        }
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<T, U> mapper) {
-        return new MappingIterable<T, U>(this, mapper);
-    }
-
-    @Override
-    public AwaitingWriteOperationIterable<T, W> batchSize(final int batchSize) {
-        delegated.batchSize(batchSize);
-        return this;
-    }
-
-    @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        notNull("callback", callback);
-        boolean localWriteCompleted;
-
-        synchronized (this) {
-            localWriteCompleted = writeCompleted;
-            if (!localWriteCompleted) {
-                callbacks.add(new SingleResultCallback<Void>() {
-                    @Override
-                    public void onResult(final Void result, final Throwable t) {
-                        if (t != null) {
-                            callback.onResult(null, t);
-                        } else {
-                            delegated.batchCursor(callback);
-                        }
-                    }
-                });
-            }
-        }
-        if (localWriteCompleted) {
-            if (thrown != null) {
-                callback.onResult(null, thrown);
-            } else {
-                delegated.batchCursor(callback);
-            }
-        }
-    }
-}
diff --git a/driver-async/src/main/com/mongodb/async/client/ChangeStreamIterable.java b/driver-async/src/main/com/mongodb/async/client/ChangeStreamIterable.java
new file mode 100644
index 00000000000..926c1ee0cda
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/ChangeStreamIterable.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Iterable for change streams.
+ *
+ * <p>Note: the {@link ChangeStreamDocument} class will not be applicable for all change stream outputs. If using custom pipelines that
+ * radically change the result, then the {@link #withDocumentClass(Class)} method can be used to provide an alternative document format.</p>
+ *
+ * @param <TResult> The type of the result.
+ * @mongodb.server.release 3.6
+ * @since 3.6
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
+ */
+@Deprecated
+public interface ChangeStreamIterable<TResult> extends MongoIterable<ChangeStreamDocument<TResult>> {
+
+    /**
+     * Sets the fullDocument value.
+     *
+     * @param fullDocument the fullDocument
+     * @return this
+     */
+    ChangeStreamIterable<TResult> fullDocument(FullDocument fullDocument);
+
+    /**
+     * Sets the logical starting point for the new change stream.
+     *
+     * @param resumeToken the resume token
+     * @return this
+     */
+    ChangeStreamIterable<TResult> resumeAfter(BsonDocument resumeToken);
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    ChangeStreamIterable<TResult> batchSize(int batchSize);
+
+    /**
+     * Sets the maximum await execution time on the server for this operation.
+     *
+     * @param maxAwaitTime  the max await time.  A zero value will be ignored, and indicates that the driver should respect the server's
+     *                      default value
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     */
+    ChangeStreamIterable<TResult>  maxAwaitTime(long maxAwaitTime, TimeUnit timeUnit);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     */
+    ChangeStreamIterable<TResult> collation(@Nullable Collation collation);
+
+    /**
+     * Returns a {@code MongoIterable} containing the results of the change stream based on the document class provided.
+     *
+     * @param clazz the class to use for the raw result.
+     * @param <TDocument> the result type
+     * @return the new Mongo Iterable
+     */
+    <TDocument> MongoIterable<TDocument> withDocumentClass(Class<TDocument> clazz);
+
+    /**
+     * The change stream will only provide changes that occurred at or after the specified timestamp.
+     *
+     * <p>Any command run against the server will return an operation time that can be used here.</p>
+     * <p>The default value is an operation time obtained from the server before the change stream was created.</p>
+     *
+     * @param startAtOperationTime the start at operation time
+     * @since 3.8
+     * @return this
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.manual reference/method/db.runCommand/
+     */
+    ChangeStreamIterable<TResult> startAtOperationTime(BsonTimestamp startAtOperationTime);
+
+    /**
+     * Similar to {@code resumeAfter}, this option takes a resume token and starts a
+     * new change stream returning the first notification after the token.
+     *
+     * <p>This will allow users to watch collections that have been dropped and recreated
+     * or newly renamed collections without missing any notifications.</p>
+     *
+     * <p>Note: The server will report an error if both {@code startAfter} and {@code resumeAfter} are specified.</p>
+     *
+     * @param startAfter the startAfter resumeToken
+     * @return this
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual changeStreams/#change-stream-start-after
+     */
+    ChangeStreamIterable<TResult> startAfter(BsonDocument startAfter);
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/ChangeStreamIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/ChangeStreamIterableImpl.java
new file mode 100644
index 00000000000..54b2518d775
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/ChangeStreamIterableImpl.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+import com.mongodb.operation.ChangeStreamOperation;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+final class ChangeStreamIterableImpl<TResult> extends MongoIterableImpl<ChangeStreamDocument<TResult>>
+        implements ChangeStreamIterable<TResult> {
+    private final MongoNamespace namespace;
+    private final CodecRegistry codecRegistry;
+    private final List<? extends Bson> pipeline;
+    private final Codec<ChangeStreamDocument<TResult>> codec;
+    private final ChangeStreamLevel changeStreamLevel;
+
+    private FullDocument fullDocument = FullDocument.DEFAULT;
+    private BsonDocument resumeToken;
+    private BsonDocument startAfter;
+    private long maxAwaitTimeMS;
+    private Collation collation;
+    private BsonTimestamp startAtOperationTime;
+
+
+    ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final CodecRegistry codecRegistry,
+                             final ReadPreference readPreference, final ReadConcern readConcern, final OperationExecutor executor,
+                             final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                             final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        this(clientSession, new MongoNamespace(databaseName, "ignored"), codecRegistry, readPreference, readConcern, executor, pipeline,
+                resultClass, changeStreamLevel, retryReads);
+    }
+
+    ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final CodecRegistry codecRegistry,
+                             final ReadPreference readPreference, final ReadConcern readConcern, final OperationExecutor executor,
+                             final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                             final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.namespace = notNull("namespace", namespace);
+        this.codecRegistry = notNull("codecRegistry", codecRegistry);
+        this.pipeline = notNull("pipeline", pipeline);
+        this.codec = ChangeStreamDocument.createCodec(notNull("resultClass", resultClass), codecRegistry);
+        this.changeStreamLevel = notNull("changeStreamLevel", changeStreamLevel);
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> fullDocument(final FullDocument fullDocument) {
+        this.fullDocument = notNull("fullDocument", fullDocument);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> resumeAfter(final BsonDocument resumeAfter) {
+        this.resumeToken = notNull("resumeAfter", resumeAfter);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxAwaitTimeMS = MILLISECONDS.convert(maxAwaitTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = notNull("collation", collation);
+        return this;
+    }
+
+    @Override
+    public <TDocument> MongoIterable<TDocument> withDocumentClass(final Class<TDocument> clazz) {
+        return new MongoIterableImpl<TDocument>(getClientSession(), getExecutor(), getReadConcern(), getReadPreference(), getRetryReads()) {
+            private AsyncReadOperation<AsyncBatchCursor<TDocument>> operation = createChangeStreamOperation(codecRegistry.get(clazz));
+
+            @Override
+            AsyncReadOperation<AsyncBatchCursor<TDocument>> asAsyncReadOperation() {
+                return operation;
+            }
+        };
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> startAtOperationTime(final BsonTimestamp startAtOperationTime) {
+        this.startAtOperationTime = notNull("startAtOperationTime", startAtOperationTime);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterableImpl<TResult> startAfter(final BsonDocument startAfter) {
+        this.startAfter = notNull("startAfter", startAfter);
+        return this;
+    }
+
+    @Override
+    AsyncReadOperation<AsyncBatchCursor<ChangeStreamDocument<TResult>>> asAsyncReadOperation() {
+        return createChangeStreamOperation(codec);
+    }
+
+    private <S> AsyncReadOperation<AsyncBatchCursor<S>> createChangeStreamOperation(final Codec<S> codec) {
+        return new ChangeStreamOperation<S>(namespace, fullDocument,  createBsonDocumentList(pipeline), codec, changeStreamLevel)
+                .batchSize(getBatchSize())
+                .collation(collation)
+                .maxAwaitTime(maxAwaitTimeMS, MILLISECONDS)
+                .resumeAfter(resumeToken)
+                .startAtOperationTime(startAtOperationTime)
+                .startAfter(startAfter)
+                .retryReads(getRetryReads());
+    }
+
+    private List<BsonDocument> createBsonDocumentList(final List<? extends Bson> pipeline) {
+        List<BsonDocument> aggregateList = new ArrayList<BsonDocument>(pipeline.size());
+        for (Bson obj : pipeline) {
+            if (obj == null) {
+                throw new IllegalArgumentException("pipeline can not contain a null value");
+            }
+            aggregateList.add(obj.toBsonDocument(BsonDocument.class, codecRegistry));
+        }
+        return aggregateList;
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/ClientSession.java b/driver-async/src/main/com/mongodb/async/client/ClientSession.java
new file mode 100644
index 00000000000..53aa93daea7
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/ClientSession.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.TransactionOptions;
+import com.mongodb.async.SingleResultCallback;
+
+/**
+ * A client session that supports transactions.
+ *
+ * @since 3.8
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
+ */
+@Deprecated
+public interface ClientSession extends com.mongodb.session.ClientSession {
+    /**
+     * Returns true if there is an active transaction on this session, and false otherwise
+     *
+     * @return true if there is an active transaction on this session
+     * @mongodb.server.release 4.0
+     */
+    boolean hasActiveTransaction();
+
+    /**
+     *  Notify the client session that a message has been sent.
+     *  <p>
+     *      For internal use only
+     *  </p>
+     *
+     * @return true if this is the first message sent, false otherwise
+     */
+    boolean notifyMessageSent();
+
+    /**
+     * Gets the transaction options.  Only call this method of the session has an active transaction
+     *
+     * @return the transaction options
+     */
+    TransactionOptions getTransactionOptions();
+
+    /**
+     * Start a transaction in the context of this session with default transaction options. A transaction can not be started if there is
+     * already an active transaction on this session.
+     *
+     * @mongodb.server.release 4.0
+     */
+    void startTransaction();
+
+    /**
+     * Start a transaction in the context of this session with the given transaction options. A transaction can not be started if there is
+     * already an active transaction on this session.
+     *
+     * @param transactionOptions the options to apply to the transaction
+     *
+     * @mongodb.server.release 4.0
+     */
+    void startTransaction(TransactionOptions transactionOptions);
+
+    /**
+     * Commit a transaction in the context of this session.  A transaction can only be commmited if one has first been started.
+     *
+     * @param callback the result callback
+     * @mongodb.server.release 4.0
+     */
+    void commitTransaction(SingleResultCallback<Void> callback);
+
+    /**
+     * Abort a transaction in the context of this session.  A transaction can only be aborted if one has first been started.
+     *
+     * @param callback the result callback
+     * @mongodb.server.release 4.0
+     */
+    void abortTransaction(SingleResultCallback<Void> callback);
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/ClientSessionBinding.java b/driver-async/src/main/com/mongodb/async/client/ClientSessionBinding.java
new file mode 100644
index 00000000000..9a75818a135
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/ClientSessionBinding.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
+import com.mongodb.binding.AsyncReadWriteBinding;
+import com.mongodb.binding.AsyncSingleServerBinding;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AsyncClusterAwareReadWriteBinding;
+import com.mongodb.internal.session.ClientSessionContext;
+import com.mongodb.selector.ReadPreferenceServerSelector;
+import com.mongodb.session.SessionContext;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class ClientSessionBinding implements AsyncReadWriteBinding {
+    private final AsyncClusterAwareReadWriteBinding wrapped;
+    private final ClientSession session;
+    private final boolean ownsSession;
+    private final ClientSessionContext sessionContext;
+
+    ClientSessionBinding(final ClientSession session, final boolean ownsSession, final AsyncClusterAwareReadWriteBinding wrapped) {
+        this.wrapped = notNull("wrapped", (wrapped));
+        this.ownsSession = ownsSession;
+        this.session = notNull("session", session);
+        this.sessionContext = new AsyncClientSessionContext(session);
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return wrapped.getReadPreference();
+    }
+
+    @Override
+    public void getReadConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        wrapped.getReadConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    wrapConnectionSource(result, callback);
+                }
+            }
+        });
+    }
+
+    public void getWriteConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        wrapped.getWriteConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    wrapConnectionSource(result, callback);
+                }
+            }
+        });
+    }
+
+    @Override
+    public SessionContext getSessionContext() {
+        return sessionContext;
+    }
+
+    private void wrapConnectionSource(final AsyncConnectionSource connectionSource,
+                                      final SingleResultCallback<AsyncConnectionSource> callback) {
+        if (isActiveShardedTxn()) {
+            if (session.getPinnedServerAddress() == null) {
+                wrapped.getCluster().selectServerAsync(
+                        new ReadPreferenceServerSelector(wrapped.getReadPreference()),
+                        new SingleResultCallback<Server>() {
+                            @Override
+                            public void onResult(final Server server, final Throwable t) {
+                                if (t != null) {
+                                    callback.onResult(null, t);
+                                } else {
+                                    session.setPinnedServerAddress(server.getDescription().getAddress());
+                                    setSingleServerBindingConnectionSource(callback);
+                                }
+                            }
+                        });
+            } else {
+                setSingleServerBindingConnectionSource(callback);
+            }
+        } else {
+            callback.onResult(new SessionBindingAsyncConnectionSource(connectionSource), null);
+        }
+    }
+
+    private void setSingleServerBindingConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        final AsyncSingleServerBinding binding =
+                new AsyncSingleServerBinding(wrapped.getCluster(), session.getPinnedServerAddress(), wrapped.getReadPreference());
+        binding.getWriteConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource result, final Throwable t) {
+                binding.release();
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(new SessionBindingAsyncConnectionSource(result), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public AsyncReadWriteBinding retain() {
+        wrapped.retain();
+        return this;
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+        closeSessionIfCountIsZero();
+    }
+
+    private void closeSessionIfCountIsZero() {
+        if (getCount() == 0 && ownsSession) {
+            session.close();
+        }
+    }
+
+    private boolean isActiveShardedTxn() {
+        return session.hasActiveTransaction() && wrapped.getCluster().getDescription().getType() == ClusterType.SHARDED;
+    }
+
+    private class SessionBindingAsyncConnectionSource implements AsyncConnectionSource {
+        private AsyncConnectionSource wrapped;
+
+        SessionBindingAsyncConnectionSource(final AsyncConnectionSource wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public ServerDescription getServerDescription() {
+            return wrapped.getServerDescription();
+        }
+
+        @Override
+        public SessionContext getSessionContext() {
+            return sessionContext;
+        }
+
+        @Override
+        public void getConnection(final SingleResultCallback<AsyncConnection> callback) {
+            wrapped.getConnection(callback);
+        }
+
+        @Override
+        public AsyncConnectionSource retain() {
+            wrapped = wrapped.retain();
+            return this;
+        }
+
+        @Override
+        public int getCount() {
+            return wrapped.getCount();
+        }
+
+        @Override
+        public void release() {
+            wrapped.release();
+            closeSessionIfCountIsZero();
+        }
+    }
+
+    private final class AsyncClientSessionContext extends ClientSessionContext implements SessionContext {
+
+        private final ClientSession clientSession;
+
+        AsyncClientSessionContext(final ClientSession clientSession) {
+            super(clientSession);
+            this.clientSession = clientSession;
+        }
+
+
+        @Override
+        public boolean isImplicitSession() {
+            return ownsSession;
+        }
+
+        @Override
+        public boolean notifyMessageSent() {
+            return clientSession.notifyMessageSent();
+        }
+
+        @Override
+        public boolean hasActiveTransaction() {
+            return clientSession.hasActiveTransaction();
+        }
+
+        @Override
+        public ReadConcern getReadConcern() {
+            if (clientSession.hasActiveTransaction()) {
+                return clientSession.getTransactionOptions().getReadConcern();
+            } else {
+                return wrapped.getSessionContext().getReadConcern();
+            }
+        }
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/ClientSessionHelper.java b/driver-async/src/main/com/mongodb/async/client/ClientSessionHelper.java
new file mode 100644
index 00000000000..956cd36c2de
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/ClientSessionHelper.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.TransactionOptions;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerType;
+import com.mongodb.internal.session.ServerSessionPool;
+import com.mongodb.lang.Nullable;
+import com.mongodb.selector.ServerSelector;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+
+class ClientSessionHelper {
+    private final MongoClientImpl mongoClient;
+    private final ServerSessionPool serverSessionPool;
+
+    ClientSessionHelper(final MongoClientImpl mongoClient, final ServerSessionPool serverSessionPool) {
+        this.mongoClient = mongoClient;
+        this.serverSessionPool = serverSessionPool;
+    }
+
+    void withClientSession(@Nullable final ClientSession clientSessionFromOperation, final OperationExecutor executor,
+                           final SingleResultCallback<ClientSession> callback) {
+        if (clientSessionFromOperation != null) {
+            isTrue("ClientSession from same MongoClient", clientSessionFromOperation.getOriginator() == mongoClient);
+            callback.onResult(clientSessionFromOperation, null);
+        } else {
+            createClientSession(ClientSessionOptions.builder().causallyConsistent(false).build(), executor, callback);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    void createClientSession(final ClientSessionOptions options, final OperationExecutor executor,
+                             final SingleResultCallback<ClientSession>
+            callback) {
+        if (mongoClient.getSettings().getCredentialList().size() > 1) {
+            callback.onResult(null, null);
+        } else {
+            ClusterDescription clusterDescription = mongoClient.getCluster().getCurrentDescription();
+            if (!getServerDescriptionListToConsiderForSessionSupport(clusterDescription).isEmpty()
+                    && clusterDescription.getLogicalSessionTimeoutMinutes() != null
+                    && clusterDescription.getType() != ClusterType.STANDALONE) {
+                callback.onResult(createClientSession(options, executor), null);
+            } else {
+                mongoClient.getCluster().selectServerAsync(new ServerSelector() {
+                    @Override
+                    public List<ServerDescription> select(final ClusterDescription clusterDescription) {
+                        return getServerDescriptionListToConsiderForSessionSupport(clusterDescription);
+                    }
+                }, new SingleResultCallback<Server>() {
+                    @Override
+                    public void onResult(final Server server, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, null);
+                        } else if (server.getDescription().getLogicalSessionTimeoutMinutes() == null
+                                || server.getDescription().getType() == ServerType.STANDALONE) {
+                            callback.onResult(null, null);
+                        } else {
+                            callback.onResult(createClientSession(options, executor), null);
+                        }
+                    }
+                });
+            }
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private ClientSession createClientSession(final ClientSessionOptions options, final OperationExecutor executor) {
+        ClientSessionOptions mergedOptions = ClientSessionOptions.builder(options)
+                .defaultTransactionOptions(
+                        TransactionOptions.merge(
+                                options.getDefaultTransactionOptions(),
+                                TransactionOptions.builder()
+                                        .readConcern(mongoClient.getSettings().getReadConcern())
+                                        .writeConcern(mongoClient.getSettings().getWriteConcern())
+                                        .readPreference(mongoClient.getSettings().getReadPreference())
+                                        .build()))
+                .build();
+        return new ClientSessionImpl(serverSessionPool, mongoClient, mergedOptions, executor);
+    }
+
+    @SuppressWarnings("deprecation")
+    private List<ServerDescription> getServerDescriptionListToConsiderForSessionSupport(final ClusterDescription clusterDescription) {
+        if (clusterDescription.getConnectionMode() == ClusterConnectionMode.SINGLE) {
+            return clusterDescription.getAny();
+        } else {
+            return clusterDescription.getAnyPrimaryOrSecondary();
+        }
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/ClientSessionImpl.java b/driver-async/src/main/com/mongodb/async/client/ClientSessionImpl.java
new file mode 100644
index 00000000000..8181b1a4687
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/ClientSessionImpl.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.ReadConcern;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.internal.session.BaseClientSessionImpl;
+import com.mongodb.internal.session.ServerSessionPool;
+import com.mongodb.operation.AbortTransactionOperation;
+import com.mongodb.operation.CommitTransactionOperation;
+
+import static com.mongodb.MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL;
+import static com.mongodb.MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL;
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+class ClientSessionImpl extends BaseClientSessionImpl implements ClientSession {
+
+    private enum TransactionState {
+        NONE, IN, COMMITTED, ABORTED
+    }
+
+    private final OperationExecutor executor;
+    private TransactionState transactionState = TransactionState.NONE;
+    private boolean messageSentInCurrentTransaction;
+    private boolean commitInProgress;
+    private TransactionOptions transactionOptions;
+
+    ClientSessionImpl(final ServerSessionPool serverSessionPool, final MongoClient mongoClient, final ClientSessionOptions options,
+                      final OperationExecutor executor) {
+        super(serverSessionPool, mongoClient, options);
+        this.executor = executor;
+    }
+
+    @Override
+    public boolean hasActiveTransaction() {
+        return transactionState == TransactionState.IN || (transactionState == TransactionState.COMMITTED && commitInProgress);
+    }
+
+    @Override
+    public boolean notifyMessageSent() {
+        if (hasActiveTransaction()) {
+            boolean firstMessageInCurrentTransaction = !messageSentInCurrentTransaction;
+            messageSentInCurrentTransaction = true;
+            return firstMessageInCurrentTransaction;
+        } else {
+            if (transactionState == TransactionState.COMMITTED || transactionState == TransactionState.ABORTED) {
+                cleanupTransaction(TransactionState.NONE);
+            }
+            return false;
+        }
+    }
+
+    @Override
+    public TransactionOptions getTransactionOptions() {
+        isTrue("in transaction", transactionState == TransactionState.IN || transactionState == TransactionState.COMMITTED);
+        return transactionOptions;
+    }
+
+    @Override
+    public void startTransaction() {
+        startTransaction(TransactionOptions.builder().build());
+    }
+
+    @Override
+    public void startTransaction(final TransactionOptions transactionOptions) {
+        notNull("transactionOptions", transactionOptions);
+        if (transactionState == TransactionState.IN) {
+            throw new IllegalStateException("Transaction already in progress");
+        }
+        if (transactionState == TransactionState.COMMITTED) {
+            cleanupTransaction(TransactionState.IN);
+        } else {
+            transactionState = TransactionState.IN;
+        }
+        getServerSession().advanceTransactionNumber();
+        this.transactionOptions = TransactionOptions.merge(transactionOptions, getOptions().getDefaultTransactionOptions());
+        WriteConcern writeConcern = this.transactionOptions.getWriteConcern();
+        if (writeConcern == null) {
+            throw new MongoInternalException("Invariant violated.  Transaction options write concern can not be null");
+        }
+        if (!writeConcern.isAcknowledged()) {
+            throw new MongoClientException("Transactions do not support unacknowledged write concern");
+        }
+        setPinnedServerAddress(null);
+    }
+
+    @Override
+    public void commitTransaction(final SingleResultCallback<Void> callback) {
+        if (transactionState == TransactionState.ABORTED) {
+            throw new IllegalStateException("Cannot call commitTransaction after calling abortTransaction");
+        }
+        if (transactionState == TransactionState.NONE) {
+            throw new IllegalStateException("There is no transaction started");
+        }
+        if (!messageSentInCurrentTransaction) {
+            cleanupTransaction(TransactionState.COMMITTED);
+            callback.onResult(null, null);
+        } else {
+            ReadConcern readConcern = transactionOptions.getReadConcern();
+            if (readConcern == null) {
+                throw new MongoInternalException("Invariant violated.  Transaction options read concern can not be null");
+            }
+            boolean alreadyCommitted = commitInProgress || transactionState == TransactionState.COMMITTED;
+            commitInProgress = true;
+            executor.execute(new CommitTransactionOperation(transactionOptions.getWriteConcern(), alreadyCommitted)
+                            .recoveryToken(getRecoveryToken())
+                            .maxCommitTime(transactionOptions.getMaxCommitTime(MILLISECONDS), MILLISECONDS),
+                    readConcern, this,
+                    new SingleResultCallback<Void>() {
+                        @Override
+                        public void onResult(final Void result, final Throwable t) {
+                            if (t != null && t instanceof MongoException) {
+                                unpinServerAddressOnError((MongoException) t);
+                            }
+                            commitInProgress = false;
+                            transactionState = TransactionState.COMMITTED;
+                            callback.onResult(result, t);
+                        }
+                    });
+        }
+    }
+
+    @Override
+    public void abortTransaction(final SingleResultCallback<Void> callback) {
+        if (transactionState == TransactionState.ABORTED) {
+            throw new IllegalStateException("Cannot call abortTransaction twice");
+        }
+        if (transactionState == TransactionState.COMMITTED) {
+            throw new IllegalStateException("Cannot call abortTransaction after calling commitTransaction");
+        }
+        if (transactionState == TransactionState.NONE) {
+            throw new IllegalStateException("There is no transaction started");
+        }
+        if (!messageSentInCurrentTransaction) {
+            cleanupTransaction(TransactionState.ABORTED);
+            callback.onResult(null, null);
+        } else {
+            ReadConcern readConcern = transactionOptions.getReadConcern();
+            if (readConcern == null) {
+                throw new MongoInternalException("Invariant violated.  Transaction options read concern can not be null");
+            }
+            executor.execute(new AbortTransactionOperation(transactionOptions.getWriteConcern()).recoveryToken(getRecoveryToken()),
+                    readConcern, this,
+                    new SingleResultCallback<Void>() {
+                        @Override
+                        public void onResult(final Void result, final Throwable t) {
+                            if (t != null && t instanceof MongoException) {
+                                unpinServerAddressOnError((MongoException) t);
+                            }
+                            cleanupTransaction(TransactionState.ABORTED);
+                            callback.onResult(null, null);
+                        }
+                    });
+        }
+    }
+
+    private void unpinServerAddressOnError(final MongoException e) {
+        if (e.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL) || e.hasErrorLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) {
+            setPinnedServerAddress(null);
+        }
+    }
+
+    // TODO: should there be a version of this that takes a callback?
+    @Override
+    public void close() {
+        if (transactionState == TransactionState.IN) {
+            abortTransaction(new SingleResultCallback<Void>() {
+                @Override
+                public void onResult(final Void result, final Throwable t) {
+                    ClientSessionImpl.super.close();
+                }
+            });
+        } else {
+            super.close();
+        }
+    }
+
+    private void cleanupTransaction(final TransactionState nextState) {
+        messageSentInCurrentTransaction = false;
+        transactionOptions = null;
+        transactionState = nextState;
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/DistinctIterable.java b/driver-async/src/main/com/mongodb/async/client/DistinctIterable.java
index b0a00e12667..ba1c868977b 100644
--- a/driver-async/src/main/com/mongodb/async/client/DistinctIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/DistinctIterable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,8 @@
 package com.mongodb.async.client;
 
 
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -26,7 +28,9 @@
  *
  * @param <TResult> The type of the result.
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface DistinctIterable<TResult> extends MongoIterable<TResult> {
 
     /**
@@ -36,7 +40,7 @@ public interface DistinctIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      */
-    DistinctIterable<TResult> filter(Bson filter);
+    DistinctIterable<TResult> filter(@Nullable Bson filter);
 
     /**
      * Sets the maximum execution time on the server for this operation.
@@ -56,4 +60,15 @@ public interface DistinctIterable<TResult> extends MongoIterable<TResult> {
      */
     DistinctIterable<TResult> batchSize(int batchSize);
 
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    DistinctIterable<TResult> collation(@Nullable Collation collation);
+
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/DistinctIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/DistinctIterableImpl.java
index c5cf5bba0f4..e04100782ec 100644
--- a/driver-async/src/main/com/mongodb/async/client/DistinctIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/DistinctIterableImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,53 +16,44 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.Block;
-import com.mongodb.Function;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.AsyncBatchCursor;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.DistinctOperation;
+import com.mongodb.client.model.Collation;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
-import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-class DistinctIterableImpl<TDocument, TResult> implements DistinctIterable<TResult> {
-    private final MongoNamespace namespace;
-    private final Class<TDocument> documentclass;
+class DistinctIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements DistinctIterable<TResult> {
+    private final AsyncOperations<TDocument> operations;
     private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-    private final AsyncOperationExecutor executor;
     private final String fieldName;
 
     private Bson filter;
     private long maxTimeMS;
+    private Collation collation;
 
-    DistinctIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                         final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                         final AsyncOperationExecutor executor, final String fieldName, final Bson filter) {
-        this.namespace = notNull("namespace", namespace);
-        this.documentclass = notNull("documentClass", documentClass);
+
+    DistinctIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                         final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                         final ReadConcern readConcern, final OperationExecutor executor, final String fieldName, final Bson filter,
+                         final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.operations = new AsyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, retryReads);
         this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
         this.fieldName = notNull("mapFunction", fieldName);
         this.filter = filter;
     }
 
     @Override
-    public DistinctIterable<TResult> filter(final Bson filter) {
+    public DistinctIterable<TResult> filter(@Nullable final Bson filter) {
         this.filter = filter;
         return this;
     }
@@ -76,46 +67,18 @@ public DistinctIterable<TResult> maxTime(final long maxTime, final TimeUnit time
 
     @Override
     public DistinctIterable<TResult> batchSize(final int batchSize) {
-        // Noop - not supported by DistinctIterable
+        super.batchSize(batchSize);
         return this;
     }
 
     @Override
-    public void first(final SingleResultCallback<TResult> callback) {
-        notNull("callback", callback);
-        execute().first(callback);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        execute().forEach(block, callback);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        execute().into(target, callback);
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
+    public DistinctIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
     }
 
     @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
-        notNull("callback", callback);
-        execute().batchCursor(callback);
-    }
-
-    private MongoIterable<TResult> execute() {
-        DistinctOperation<TResult> operation = new DistinctOperation<TResult>(namespace, fieldName, codecRegistry.get(resultClass))
-                .filter(filter == null ? null : filter.toBsonDocument(documentclass, codecRegistry))
-                .maxTime(maxTimeMS, MILLISECONDS)
-                .readConcern(readConcern);
-        return new OperationIterable<TResult>(operation, readPreference, executor);
+    AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation() {
+        return operations.distinct(fieldName, filter, resultClass, maxTimeMS, collation);
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/FindIterable.java b/driver-async/src/main/com/mongodb/async/client/FindIterable.java
index cd7ab46ee13..688691c1b9a 100644
--- a/driver-async/src/main/com/mongodb/async/client/FindIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/FindIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 package com.mongodb.async.client;
 
 import com.mongodb.CursorType;
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -26,7 +28,9 @@
  *
  * @param <T> The type of the result.
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface FindIterable<T> extends MongoIterable<T> {
 
     /**
@@ -36,7 +40,7 @@ public interface FindIterable<T> extends MongoIterable<T> {
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      */
-    FindIterable<T> filter(Bson filter);
+    FindIterable<T> filter(@Nullable Bson filter);
 
     /**
      * Sets the limit to apply.
@@ -91,8 +95,10 @@ public interface FindIterable<T> extends MongoIterable<T> {
      * @param modifiers the query modifiers to apply, which may be null.
      * @return this
      * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
+     * @deprecated use the individual setters instead
      */
-    FindIterable<T> modifiers(Bson modifiers);
+    @Deprecated
+    FindIterable<T> modifiers(@Nullable Bson modifiers);
 
     /**
      * Sets a document describing the fields to return for all matching documents.
@@ -101,7 +107,7 @@ public interface FindIterable<T> extends MongoIterable<T> {
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Projection
      */
-    FindIterable<T> projection(Bson projection);
+    FindIterable<T> projection(@Nullable Bson projection);
     /**
      * Sets the sort criteria to apply to the query.
      *
@@ -109,7 +115,7 @@ public interface FindIterable<T> extends MongoIterable<T> {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    FindIterable<T> sort(Bson sort);
+    FindIterable<T> sort(@Nullable Bson sort);
 
     /**
      * The server normally times out idle cursors after an inactivity period (10 minutes)
@@ -153,4 +159,106 @@ public interface FindIterable<T> extends MongoIterable<T> {
      * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
      */
     FindIterable<T> batchSize(int batchSize);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    FindIterable<T> collation(@Nullable Collation collation);
+
+    /**
+     * Sets the comment to the query. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<T> comment(@Nullable String comment);
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<T> hint(@Nullable Bson hint);
+
+    /**
+     * Sets the hint to apply.
+     *
+     * <p>Note: If {@link FindIterable#hint(Bson)} is set that will be used instead of any hint string.</p>
+     *
+     * @param hint the name of the index which should be used for the operation
+     * @return this
+     * @since 3.12
+     */
+    FindIterable<T> hintString(@Nullable String hint);
+
+    /**
+     * Sets the exclusive upper bound for a specific index. A null value means no max is set.
+     *
+     * @param max the max
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<T> max(@Nullable Bson max);
+
+    /**
+     * Sets the minimum inclusive lower bound for a specific index. A null value means no max is set.
+     *
+     * @param min the min
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<T> min(@Nullable Bson min);
+
+    /**
+     * Sets the maximum number of documents or index keys to scan when executing the query.
+     *
+     * A zero value or less will be ignored, and indicates that the driver should respect the server's default value.
+     *
+     * @param maxScan the maxScan
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated as of MongoDB 4.0 release
+     */
+    @Deprecated
+    FindIterable<T> maxScan(long maxScan);
+
+    /**
+     * Sets the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * @param returnKey the returnKey
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<T> returnKey(boolean returnKey);
+
+    /**
+     * Sets the showRecordId. Set to true to add a field {@code $recordId} to the returned documents.
+     *
+     * @param showRecordId the showRecordId
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<T> showRecordId(boolean showRecordId);
+
+    /**
+     * Sets the snapshot.
+     *
+     * If true it prevents the cursor from returning a document more than once because of an intervening write operation.
+     *
+     * @param snapshot the snapshot
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated in MongoDB 3.6 release and removed in MongoDB 4.0 release
+     */
+    @Deprecated
+    FindIterable<T> snapshot(boolean snapshot);
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/FindIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/FindIterableImpl.java
index 752849b7e6a..6df6b80f69e 100644
--- a/driver-async/src/main/com/mongodb/async/client/FindIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/FindIterableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,54 +16,46 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.Block;
 import com.mongodb.CursorType;
-import com.mongodb.Function;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.FindOptions;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.FindOperation;
-import org.bson.BsonDocument;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
-import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-class FindIterableImpl<TDocument, TResult> implements FindIterable<TResult> {
-    private final MongoNamespace namespace;
-    private final Class<TDocument> documentClass;
+
+@SuppressWarnings("deprecation")
+class FindIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements FindIterable<TResult> {
+    private final AsyncOperations<TDocument> operations;
     private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-    private final AsyncOperationExecutor executor;
     private final FindOptions findOptions;
+
     private Bson filter;
 
-    FindIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                     final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                     final AsyncOperationExecutor executor, final Bson filter, final FindOptions findOptions) {
-        this.namespace = notNull("namespace", namespace);
-        this.documentClass = notNull("documentClass", documentClass);
+    FindIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                     final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                     final ReadConcern readConcern, final OperationExecutor executor, final Bson filter, final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.operations = new AsyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, retryReads);
         this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
         this.filter = notNull("filter", filter);
-        this.findOptions = notNull("findOptions", findOptions);
+        this.findOptions = new FindOptions();
     }
 
     @Override
-    public FindIterable<TResult> filter(final Bson filter) {
+    public FindIterable<TResult> filter(@Nullable final Bson filter) {
         this.filter = filter;
         return this;
     }
@@ -96,24 +88,32 @@ public FindIterable<TResult> maxAwaitTime(final long maxAwaitTime, final TimeUni
 
     @Override
     public FindIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
         findOptions.batchSize(batchSize);
         return this;
     }
 
     @Override
-    public FindIterable<TResult> modifiers(final Bson modifiers) {
+    public FindIterable<TResult> collation(@Nullable final Collation collation) {
+        findOptions.collation(collation);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public FindIterable<TResult> modifiers(@Nullable final Bson modifiers) {
         findOptions.modifiers(modifiers);
         return this;
     }
 
     @Override
-    public FindIterable<TResult> projection(final Bson projection) {
+    public FindIterable<TResult> projection(@Nullable final Bson projection) {
         findOptions.projection(projection);
         return this;
     }
 
     @Override
-    public FindIterable<TResult> sort(final Bson sort) {
+    public FindIterable<TResult> sort(@Nullable final Bson sort) {
         findOptions.sort(sort);
         return this;
     }
@@ -143,65 +143,95 @@ public FindIterable<TResult> cursorType(final CursorType cursorType) {
     }
 
     @Override
-    public void first(final SingleResultCallback<TResult> callback) {
-        notNull("callback", callback);
-        execute(createQueryOperation().batchSize(0).limit(-1)).first(callback);
+    public FindIterable<TResult> comment(@Nullable final String comment) {
+        findOptions.comment(comment);
+        return this;
     }
 
     @Override
-    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        execute().forEach(block, callback);
+    public FindIterable<TResult> hint(@Nullable final Bson hint) {
+        findOptions.hint(hint);
+        return this;
     }
 
     @Override
-    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        execute().into(target, callback);
+    public FindIterable<TResult> hintString(@Nullable final String hint) {
+        findOptions.hintString(hint);
+        return this;
     }
 
     @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
+    public FindIterable<TResult> max(@Nullable final Bson max) {
+        findOptions.max(max);
+        return this;
     }
 
     @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
-        notNull("callback", callback);
-        execute().batchCursor(callback);
+    public FindIterable<TResult> min(@Nullable final Bson min) {
+        findOptions.min(min);
+        return this;
     }
 
-    private MongoIterable<TResult> execute() {
-        return execute(createQueryOperation());
+    @Override
+    @SuppressWarnings("deprecation")
+    public FindIterable<TResult> maxScan(final long maxScan) {
+        findOptions.maxScan(maxScan);
+        return this;
     }
 
-    private MongoIterable<TResult> execute(final FindOperation<TResult> operation) {
-        return new OperationIterable<TResult>(operation, readPreference, executor);
+    @Override
+    public FindIterable<TResult> returnKey(final boolean returnKey) {
+        findOptions.returnKey(returnKey);
+        return this;
     }
 
-    private FindOperation<TResult> createQueryOperation() {
-        return new FindOperation<TResult>(namespace, codecRegistry.get(resultClass))
-               .filter(toBsonDocument(filter))
-               .batchSize(findOptions.getBatchSize())
-               .skip(findOptions.getSkip())
-               .limit(findOptions.getLimit())
-               .maxTime(findOptions.getMaxTime(MILLISECONDS), MILLISECONDS)
-               .maxAwaitTime(findOptions.getMaxAwaitTime(MILLISECONDS), MILLISECONDS)
-               .modifiers(toBsonDocument(findOptions.getModifiers()))
-               .projection(toBsonDocument(findOptions.getProjection()))
-               .sort(toBsonDocument(findOptions.getSort()))
-               .cursorType(findOptions.getCursorType())
-               .noCursorTimeout(findOptions.isNoCursorTimeout())
-               .oplogReplay(findOptions.isOplogReplay())
-               .partial(findOptions.isPartial())
-               .slaveOk(readPreference.isSlaveOk())
-               .readConcern(readConcern);
+    @Override
+    public FindIterable<TResult> showRecordId(final boolean showRecordId) {
+        findOptions.showRecordId(showRecordId);
+        return this;
     }
 
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(documentClass, codecRegistry);
+    @Override
+    @SuppressWarnings("deprecation")
+    public FindIterable<TResult> snapshot(final boolean snapshot) {
+        findOptions.snapshot(snapshot);
+        return this;
     }
 
+    @Override
+    public void first(final SingleResultCallback<TResult> callback) {
+        notNull("callback", callback);
+        getExecutor().execute(operations.findFirst(filter, resultClass, findOptions), getReadPreference(), getReadConcern(),
+                getClientSession(), new SingleResultCallback<AsyncBatchCursor<TResult>>() {
+                    @Override
+                    public void onResult(final AsyncBatchCursor<TResult> batchCursor, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            batchCursor.next(new SingleResultCallback<List<TResult>>() {
+                                @Override
+                                public void onResult(final List<TResult> result, final Throwable t) {
+                                    batchCursor.close();
+                                    if (t != null) {
+                                        callback.onResult(null, t);
+                                    } else if (result == null || result.isEmpty()) {
+                                        callback.onResult(null, null);
+                                    } else {
+                                        callback.onResult(result.get(0), null);
+                                    }
+                                }
+                            });
+                        }
+                    }
+                });
+    }
+
+    @Override
+    AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation() {
+        return createFindOperation();
+    }
+
+    private AsyncReadOperation<AsyncBatchCursor<TResult>> createFindOperation() {
+        return operations.find(filter, resultClass, findOptions);
+    }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/FlatteningSingleResultCallbackSubscription.java b/driver-async/src/main/com/mongodb/async/client/FlatteningSingleResultCallbackSubscription.java
index bfca7c12bb1..665b90b94e2 100644
--- a/driver-async/src/main/com/mongodb/async/client/FlatteningSingleResultCallbackSubscription.java
+++ b/driver-async/src/main/com/mongodb/async/client/FlatteningSingleResultCallbackSubscription.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,8 +29,8 @@ class FlatteningSingleResultCallbackSubscription<TResult> extends AbstractSubscr
     private boolean completed;
     /* protected by `this` */
 
-    public FlatteningSingleResultCallbackSubscription(final Block<SingleResultCallback<List<TResult>>> block,
-                                                      final Observer<? super TResult> observer) {
+    FlatteningSingleResultCallbackSubscription(final Block<SingleResultCallback<List<TResult>>> block,
+                                               final Observer<? super TResult> observer) {
         super(observer);
         this.block = block;
         observer.onSubscribe(this);
@@ -44,10 +44,11 @@ public void onResult(final List<TResult> result, final Throwable t) {
                 if (t != null) {
                     onError(t);
                 } else {
+                    addToQueue(result);
                     synchronized (FlatteningSingleResultCallbackSubscription.this) {
                         completed = true;
                     }
-                    addToQueue(result);
+                    tryProcessResultsQueue();
                 }
             }
         });
diff --git a/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterable.java b/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterable.java
index a13dac9d243..5734e5ee66a 100644
--- a/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -25,7 +26,9 @@
  *
  * @param <TResult> The type of the result.
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface ListCollectionsIterable<TResult> extends MongoIterable<TResult> {
 
     /**
@@ -35,7 +38,7 @@ public interface ListCollectionsIterable<TResult> extends MongoIterable<TResult>
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      */
-    ListCollectionsIterable<TResult> filter(Bson filter);
+    ListCollectionsIterable<TResult> filter(@Nullable Bson filter);
 
     /**
      * Sets the maximum execution time on the server for this operation.
diff --git a/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterableImpl.java
index a20ff50e589..ab1abe36f71 100644
--- a/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/ListCollectionsIterableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,45 +16,42 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.Block;
-import com.mongodb.Function;
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.AsyncBatchCursor;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.ListCollectionsOperation;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
 import org.bson.BsonDocument;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
-import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-final class ListCollectionsIterableImpl<TResult> implements ListCollectionsIterable<TResult> {
+final class ListCollectionsIterableImpl<TResult> extends MongoIterableImpl<TResult> implements ListCollectionsIterable<TResult> {
+    private AsyncOperations<BsonDocument> operations;
     private final String databaseName;
     private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final AsyncOperationExecutor executor;
 
     private Bson filter;
-    private int batchSize;
+    private boolean collectionNamesOnly;
     private long maxTimeMS;
 
-    ListCollectionsIterableImpl(final String databaseName, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
-                                final ReadPreference readPreference, final AsyncOperationExecutor executor) {
+    ListCollectionsIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final boolean collectionNamesOnly,
+                                final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                final OperationExecutor executor, final boolean retryReads) {
+        super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads); // TODO: read concern?
+        this.collectionNamesOnly = collectionNamesOnly;
+        this.operations = new AsyncOperations<BsonDocument>(BsonDocument.class, readPreference, codecRegistry, retryReads);
         this.databaseName = notNull("databaseName", databaseName);
         this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.executor = notNull("executor", executor);
     }
 
     @Override
-    public ListCollectionsIterable<TResult> filter(final Bson filter) {
+    public ListCollectionsIterable<TResult> filter(@Nullable final Bson filter) {
         notNull("filter", filter);
         this.filter = filter;
         return this;
@@ -69,58 +66,13 @@ public ListCollectionsIterable<TResult> maxTime(final long maxTime, final TimeUn
 
     @Override
     public ListCollectionsIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
+        super.batchSize(batchSize);
         return this;
     }
 
     @Override
-    public void first(final SingleResultCallback<TResult> callback) {
-        notNull("callback", callback);
-        execute(createListCollectionsOperation().batchSize(-1)).first(callback);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        execute().forEach(block, callback);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        execute().into(target, callback);
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
-        notNull("callback", callback);
-        execute().batchCursor(callback);
-    }
-
-    private MongoIterable<TResult> execute() {
-        return execute(createListCollectionsOperation());
-    }
-
-    private MongoIterable<TResult> execute(final ListCollectionsOperation<TResult> operation) {
-        return new OperationIterable<TResult>(operation, readPreference, executor);
-    }
-
-    private ListCollectionsOperation<TResult> createListCollectionsOperation() {
-        return new ListCollectionsOperation<TResult>(databaseName, codecRegistry.get(resultClass))
-                .filter(toBsonDocument(filter))
-                .batchSize(batchSize)
-                .maxTime(maxTimeMS, MILLISECONDS);
-    }
-
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(BsonDocument.class, codecRegistry);
+    AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation() {
+        return operations.listCollections(databaseName, resultClass, filter, collectionNamesOnly, getBatchSize(), maxTimeMS);
     }
 
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterable.java b/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterable.java
index 89ba4a6d533..99c340344e9 100644
--- a/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,18 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
 import java.util.concurrent.TimeUnit;
 
 /**
  * Iterable for ListDatabases.
  *
  * @param <T> The type of the result.
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface ListDatabasesIterable<T> extends MongoIterable<T> {
 
     /**
@@ -43,4 +48,25 @@ public interface ListDatabasesIterable<T> extends MongoIterable<T> {
      * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
      */
     ListDatabasesIterable<T> batchSize(int batchSize);
+
+    /**
+     * Sets the query filter to apply to the returned database names.
+     *
+     * @param filter the filter, which may be null.
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.4.2
+     */
+    ListDatabasesIterable<T> filter(@Nullable Bson filter);
+
+    /**
+     * Sets the nameOnly flag that indicates whether the command should return just the database names or return the database names and
+     * size information.
+     *
+     * @param nameOnly the nameOnly flag, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.4.3
+     */
+    ListDatabasesIterable<T> nameOnly(@Nullable Boolean nameOnly);
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterableImpl.java
index 168cb67458d..cc251803cb7 100644
--- a/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/ListDatabasesIterableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,35 +16,35 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.Block;
-import com.mongodb.Function;
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.AsyncBatchCursor;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.ListDatabasesOperation;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+import org.bson.BsonDocument;
 import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
 
-import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-final class ListDatabasesIterableImpl<TResult> implements ListDatabasesIterable<TResult> {
+final class ListDatabasesIterableImpl<TResult> extends MongoIterableImpl<TResult> implements ListDatabasesIterable<TResult> {
+    private AsyncOperations<BsonDocument> operations;
     private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final AsyncOperationExecutor executor;
 
     private long maxTimeMS;
-
-    ListDatabasesIterableImpl(final Class<TResult> resultClass, final CodecRegistry codecRegistry,
-                              final ReadPreference readPreference, final AsyncOperationExecutor executor) {
-        this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.executor = notNull("executor", executor);
+    private Bson filter;
+    private Boolean nameOnly;
+
+    ListDatabasesIterableImpl(@Nullable final ClientSession clientSession, final Class<TResult> resultClass,
+                              final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                              final OperationExecutor executor, final boolean retryReads) {
+        super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads); // TODO: read concern?
+        this.operations = new AsyncOperations<BsonDocument>(BsonDocument.class, readPreference, codecRegistry, retryReads);
+        this.resultClass = notNull("clazz", resultClass);
     }
 
     @Override
@@ -54,52 +54,27 @@ public ListDatabasesIterable<TResult> maxTime(final long maxTime, final TimeUnit
         return this;
     }
 
-    @Override
-    public void first(final SingleResultCallback<TResult> callback) {
-        notNull("callback", callback);
-        execute(createListDatabasesOperation()).first(callback);
-    }
 
     @Override
-    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        execute().forEach(block, callback);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        execute().into(target, callback);
+    public ListDatabasesIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
     }
 
     @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
+    public ListDatabasesIterable<TResult> filter(@Nullable final Bson filter) {
+        this.filter = filter;
+        return this;
     }
 
     @Override
-    public ListDatabasesIterableImpl<TResult> batchSize(final int batchSize) {
-        // Noop - not supported by listDatabasesIterable
+    public ListDatabasesIterable<TResult> nameOnly(@Nullable final Boolean nameOnly) {
+        this.nameOnly = nameOnly;
         return this;
     }
 
     @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
-        notNull("callback", callback);
-        execute().batchCursor(callback);
-    }
-
-    private MongoIterable<TResult> execute() {
-        return execute(createListDatabasesOperation());
-    }
-
-    private MongoIterable<TResult> execute(final ListDatabasesOperation<TResult> operation) {
-        return new OperationIterable<TResult>(operation, readPreference, executor);
-    }
-
-    private ListDatabasesOperation<TResult> createListDatabasesOperation() {
-        return new ListDatabasesOperation<TResult>(codecRegistry.get(resultClass)).maxTime(maxTimeMS, MILLISECONDS);
+    AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation() {
+        return operations.listDatabases(resultClass, filter, nameOnly, maxTimeMS);
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/ListIndexesIterable.java b/driver-async/src/main/com/mongodb/async/client/ListIndexesIterable.java
index b1caab98d43..e2a43dd3ff0 100644
--- a/driver-async/src/main/com/mongodb/async/client/ListIndexesIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/ListIndexesIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@
  *
  * @param <TResult> The type of the result.
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface ListIndexesIterable<TResult> extends MongoIterable<TResult> {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/ListIndexesIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/ListIndexesIterableImpl.java
index fc7c40763db..c7e0da7338d 100644
--- a/driver-async/src/main/com/mongodb/async/client/ListIndexesIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/ListIndexesIterableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,39 +16,32 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.Block;
-import com.mongodb.Function;
 import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.AsyncBatchCursor;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.ListIndexesOperation;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+import org.bson.BsonDocument;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-final class ListIndexesIterableImpl<TResult> implements ListIndexesIterable<TResult> {
-    private final MongoNamespace namespace;
+final class ListIndexesIterableImpl<TResult> extends MongoIterableImpl<TResult> implements ListIndexesIterable<TResult> {
+    private AsyncOperations<BsonDocument> operations;
     private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final AsyncOperationExecutor executor;
-
-    private int batchSize;
     private long maxTimeMS;
 
-    ListIndexesIterableImpl(final MongoNamespace namespace, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
-                            final ReadPreference readPreference, final AsyncOperationExecutor executor) {
-        this.namespace = notNull("namespace", namespace);
+    ListIndexesIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TResult> resultClass,
+                            final CodecRegistry codecRegistry, final ReadPreference readPreference, final OperationExecutor executor,
+                            final boolean retryReads) {
+        super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads);
+        this.operations = new AsyncOperations<BsonDocument>(namespace, BsonDocument.class, readPreference, codecRegistry, retryReads);
         this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.executor = notNull("executor", executor);
     }
 
     @Override
@@ -60,53 +53,13 @@ public ListIndexesIterable<TResult> maxTime(final long maxTime, final TimeUnit t
 
     @Override
     public ListIndexesIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
+        super.batchSize(batchSize);
         return this;
     }
 
     @Override
-    public void first(final SingleResultCallback<TResult> callback) {
-        notNull("callback", callback);
-        execute(createListIndexesOperation().batchSize(-1)).first(callback);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        execute().forEach(block, callback);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        execute().into(target, callback);
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
-        notNull("callback", callback);
-        execute().batchCursor(callback);
-    }
-
-    private MongoIterable<TResult> execute() {
-        return execute(createListIndexesOperation());
-    }
-
-    private MongoIterable<TResult> execute(final ListIndexesOperation<TResult> operation) {
-        return new OperationIterable<TResult>(operation, readPreference, executor);
-    }
-
-    private ListIndexesOperation<TResult> createListIndexesOperation() {
-        return new ListIndexesOperation<TResult>(namespace, codecRegistry.get(resultClass))
-                .batchSize(batchSize)
-                .maxTime(maxTimeMS, MILLISECONDS);
+    AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation() {
+        return operations.listIndexes(resultClass, getBatchSize(), maxTimeMS);
     }
 
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MapReduceIterable.java b/driver-async/src/main/com/mongodb/async/client/MapReduceIterable.java
index a77c0705bd1..7604b67c506 100644
--- a/driver-async/src/main/com/mongodb/async/client/MapReduceIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/MapReduceIterable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +18,9 @@
 
 
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.MapReduceAction;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -28,7 +30,9 @@
  *
  * @param <TResult> The type of the result.
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
 
     /**
@@ -48,7 +52,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce/#mapreduce-finalize-cmd Requirements for the finalize Function
      */
-    MapReduceIterable<TResult> finalizeFunction(String finalizeFunction);
+    MapReduceIterable<TResult> finalizeFunction(@Nullable String finalizeFunction);
 
     /**
      * Sets the global variables that are accessible in the map, reduce and finalize functions.
@@ -57,7 +61,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce mapReduce
      */
-    MapReduceIterable<TResult> scope(Bson scope);
+    MapReduceIterable<TResult> scope(@Nullable Bson scope);
 
     /**
      * Sets the sort criteria to apply to the query.
@@ -66,7 +70,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    MapReduceIterable<TResult> sort(Bson sort);
+    MapReduceIterable<TResult> sort(@Nullable Bson sort);
 
     /**
      * Sets the query filter to apply to the query.
@@ -75,12 +79,12 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      */
-    MapReduceIterable<TResult> filter(Bson filter);
+    MapReduceIterable<TResult> filter(@Nullable Bson filter);
 
     /**
      * Sets the limit to apply.
      *
-     * @param limit the limit, which may be null
+     * @param limit the limit
      * @return this
      * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
      */
@@ -130,7 +134,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce/#output-to-a-collection-with-an-action output with an action
      */
-    MapReduceIterable<TResult> databaseName(String databaseName);
+    MapReduceIterable<TResult> databaseName(@Nullable String databaseName);
     /**
      * Sets if the output database is sharded
      *
@@ -163,21 +167,32 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
     /**
      * Sets the bypass document level validation flag.
      *
-     * <p>Note: This only applies when an $out stage is specified</p>.
-     *
      * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
      * @return this
      * @since 3.2
      * @mongodb.driver.manual reference/command/mapReduce mapReduce
      * @mongodb.server.release 3.2
      */
-    MapReduceIterable<TResult> bypassDocumentValidation(Boolean bypassDocumentValidation);
+    MapReduceIterable<TResult> bypassDocumentValidation(@Nullable Boolean bypassDocumentValidation);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    MapReduceIterable<TResult> collation(@Nullable Collation collation);
 
     /**
      * Aggregates documents to a collection according to the specified map-reduce function with the given options, which must specify a
      * non-inline result.
      *
      * @param callback the callback, which is called when the aggregation completes
+     * @throws IllegalStateException if a collection name to write the results to has not been specified
+     * @see #collectionName(String)
      * @mongodb.driver.manual aggregation/ Aggregation
      */
     void toCollection(SingleResultCallback<Void> callback);
diff --git a/driver-async/src/main/com/mongodb/async/client/MapReduceIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/MapReduceIterableImpl.java
index c4d64911aef..ed7f78afe6e 100644
--- a/driver-async/src/main/com/mongodb/async/client/MapReduceIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/MapReduceIterableImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,39 +16,36 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.Block;
-import com.mongodb.Function;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncReadBinding;
+import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.FindOptions;
 import com.mongodb.client.model.MapReduceAction;
-import com.mongodb.operation.AsyncOperationExecutor;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+import com.mongodb.operation.AsyncWriteOperation;
+import com.mongodb.operation.MapReduceAsyncBatchCursor;
 import com.mongodb.operation.MapReduceStatistics;
-import com.mongodb.operation.MapReduceToCollectionOperation;
-import com.mongodb.operation.MapReduceWithInlineResultsOperation;
 import org.bson.BsonDocument;
-import org.bson.BsonJavaScript;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
-import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-class MapReduceIterableImpl<TDocument, TResult> implements MapReduceIterable<TResult> {
+class MapReduceIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements MapReduceIterable<TResult> {
+    private final AsyncOperations<TDocument> operations;
     private final MongoNamespace namespace;
-    private final Class<TDocument> documentClass;
     private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-    private final AsyncOperationExecutor executor;
     private final String mapFunction;
     private final String reduceFunction;
 
@@ -66,19 +63,18 @@ class MapReduceIterableImpl<TDocument, TResult> implements MapReduceIterable<TRe
     private String databaseName;
     private boolean sharded;
     private boolean nonAtomic;
-    private int batchSize;
     private Boolean bypassDocumentValidation;
-
-    MapReduceIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                          final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                          final AsyncOperationExecutor executor, final String mapFunction, final String reduceFunction) {
+    private Collation collation;
+
+    MapReduceIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                          final String mapFunction, final String reduceFunction) {
+        super(clientSession, executor, readConcern, readPreference, false);
+        this.operations = new AsyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                false, false);
         this.namespace = notNull("namespace", namespace);
-        this.documentClass = notNull("documentClass", documentClass);
         this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
         this.mapFunction = notNull("mapFunction", mapFunction);
         this.reduceFunction = notNull("reduceFunction", reduceFunction);
     }
@@ -91,25 +87,25 @@ public MapReduceIterable<TResult> collectionName(final String collectionName) {
     }
 
     @Override
-    public MapReduceIterable<TResult> finalizeFunction(final String finalizeFunction) {
+    public MapReduceIterable<TResult> finalizeFunction(@Nullable final String finalizeFunction) {
         this.finalizeFunction = finalizeFunction;
         return this;
     }
 
     @Override
-    public MapReduceIterable<TResult> scope(final Bson scope) {
+    public MapReduceIterable<TResult> scope(@Nullable final Bson scope) {
         this.scope = scope;
         return this;
     }
 
     @Override
-    public MapReduceIterable<TResult> sort(final Bson sort) {
+    public MapReduceIterable<TResult> sort(@Nullable final Bson sort) {
         this.sort = sort;
         return this;
     }
 
     @Override
-    public MapReduceIterable<TResult> filter(final Bson filter) {
+    public MapReduceIterable<TResult> filter(@Nullable final Bson filter) {
         this.filter = filter;
         return this;
     }
@@ -146,7 +142,7 @@ public MapReduceIterable<TResult> action(final MapReduceAction action) {
     }
 
     @Override
-    public MapReduceIterable<TResult> databaseName(final String databaseName) {
+    public MapReduceIterable<TResult> databaseName(@Nullable final String databaseName) {
         this.databaseName = databaseName;
         return this;
     }
@@ -165,116 +161,112 @@ public MapReduceIterable<TResult> nonAtomic(final boolean nonAtomic) {
 
     @Override
     public MapReduceIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
+        super.batchSize(batchSize);
         return this;
     }
 
-
     @Override
-    public MapReduceIterable<TResult> bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public MapReduceIterable<TResult> bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
 
+    @Override
+    public MapReduceIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
     @Override
     public void toCollection(final SingleResultCallback<Void> callback) {
         notNull("callback", callback);
         if (inline) {
-            throw new IllegalArgumentException("The options must specify a non-inline result");
+            throw new IllegalStateException("The options must specify a non-inline result");
         }
-        executor.execute(createMapReduceToCollectionOperation(),
-                new SingleResultCallback<MapReduceStatistics>() {
-                    @Override
-                    public void onResult(final MapReduceStatistics result, final Throwable t) {
-                        callback.onResult(null, t);
-                    }
-                });
+        getExecutor().execute(createMapReduceToCollectionOperation(), getReadConcern(), callback);
     }
 
     @Override
-    public void first(final SingleResultCallback<TResult> callback) {
-        notNull("callback", callback);
-        execute().first(callback);
+    ReadPreference getReadPreference() {
+        if (inline) {
+            return super.getReadPreference();
+        } else {
+            return primary();
+        }
     }
 
     @Override
-    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        execute().forEach(block, callback);
+    AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation() {
+        if (inline) {
+            return createMapReduceInlineOperation();
+        } else {
+            return new WriteOperationThenCursorReadOperation<TResult>(createMapReduceToCollectionOperation(), createFindOperation());
+        }
     }
 
-    @Override
-    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        execute().into(target, callback);
+    private WrappedMapReduceReadOperation<TResult> createMapReduceInlineOperation() {
+        return new WrappedMapReduceReadOperation<TResult>(operations.mapReduce(mapFunction, reduceFunction, finalizeFunction,
+                resultClass, filter, limit, maxTimeMS, jsMode, scope, sort, verbose, collation));
     }
 
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
+    private WrappedMapReduceWriteOperation createMapReduceToCollectionOperation() {
+        return new WrappedMapReduceWriteOperation(operations.mapReduceToCollection(databaseName, collectionName, mapFunction,
+                reduceFunction, finalizeFunction, filter, limit, maxTimeMS, jsMode, scope, sort, verbose, action, nonAtomic, sharded,
+                bypassDocumentValidation, collation));
     }
 
-    @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
-        notNull("callback", callback);
-        execute().batchCursor(callback);
+    private AsyncReadOperation<AsyncBatchCursor<TResult>> createFindOperation() {
+        String dbName = databaseName != null ? databaseName : namespace.getDatabaseName();
+        FindOptions findOptions = new FindOptions().collation(collation);
+        Integer batchSize = getBatchSize();
+        if (batchSize != null) {
+            findOptions.batchSize(batchSize);
+        }
+        return operations.find(new MongoNamespace(dbName, collectionName), new BsonDocument(), resultClass, findOptions);
     }
 
-    MongoIterable<TResult> execute() {
-        if (inline) {
-            MapReduceWithInlineResultsOperation<TResult> operation =
-                    new MapReduceWithInlineResultsOperation<TResult>(namespace,
-                            new BsonJavaScript(mapFunction),
-                            new BsonJavaScript(reduceFunction),
-                            codecRegistry.get(resultClass))
-                            .filter(toBsonDocument(filter))
-                            .limit(limit)
-                            .maxTime(maxTimeMS, MILLISECONDS)
-                            .jsMode(jsMode)
-                            .scope(toBsonDocument(scope))
-                            .sort(toBsonDocument(sort))
-                            .verbose(verbose)
-                            .readConcern(readConcern);
-            if (finalizeFunction != null) {
-                operation.finalizeFunction(new BsonJavaScript(finalizeFunction));
-            }
-            return new OperationIterable<TResult>(operation, readPreference, executor);
-        } else {
-            MapReduceToCollectionOperation operation = createMapReduceToCollectionOperation();
+    // this could be inlined, but giving it a name so that it's unit-testable
+    static class WrappedMapReduceReadOperation<TResult> implements AsyncReadOperation<AsyncBatchCursor<TResult>> {
+        private final AsyncReadOperation<MapReduceAsyncBatchCursor<TResult>> operation;
 
-            String dbName = databaseName != null ? databaseName : namespace.getDatabaseName();
-            MongoIterable<TResult> delegated = new FindIterableImpl<TDocument, TResult>(new MongoNamespace(dbName, collectionName),
-                    documentClass, resultClass, codecRegistry, primary(), readConcern, executor, new BsonDocument(),
-                    new FindOptions()).batchSize(batchSize);
-            return new AwaitingWriteOperationIterable<TResult, MapReduceStatistics>(operation, executor, delegated);
+        AsyncReadOperation<MapReduceAsyncBatchCursor<TResult>> getOperation() {
+            return operation;
         }
-    }
 
-    private MapReduceToCollectionOperation createMapReduceToCollectionOperation() {
-        MapReduceToCollectionOperation operation = new MapReduceToCollectionOperation(namespace, new BsonJavaScript(mapFunction),
-                new BsonJavaScript(reduceFunction), collectionName)
-                .filter(toBsonDocument(filter))
-                .limit(limit)
-                .maxTime(maxTimeMS, MILLISECONDS)
-                .jsMode(jsMode)
-                .scope(toBsonDocument(scope))
-                .sort(toBsonDocument(sort))
-                .verbose(verbose)
-                .action(action.getValue())
-                .nonAtomic(nonAtomic)
-                .sharded(sharded)
-                .databaseName(databaseName)
-                .bypassDocumentValidation(bypassDocumentValidation);
-
-        if (finalizeFunction != null) {
-            operation.finalizeFunction(new BsonJavaScript(finalizeFunction));
+        WrappedMapReduceReadOperation(final AsyncReadOperation<MapReduceAsyncBatchCursor<TResult>> operation) {
+            this.operation = operation;
+        }
+
+        @Override
+        public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
+            operation.executeAsync(binding, new SingleResultCallback<MapReduceAsyncBatchCursor<TResult>>() {
+                @Override
+                public void onResult(final MapReduceAsyncBatchCursor<TResult> batchCursor, final Throwable t) {
+                    callback.onResult(batchCursor, t);
+                }
+            });
         }
-        return operation;
     }
 
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(documentClass, codecRegistry);
+    static class WrappedMapReduceWriteOperation implements AsyncWriteOperation<Void> {
+        private final AsyncWriteOperation<MapReduceStatistics> operation;
+
+        AsyncWriteOperation<MapReduceStatistics> getOperation() {
+            return operation;
+        }
+
+        WrappedMapReduceWriteOperation(final AsyncWriteOperation<MapReduceStatistics> operation) {
+            this.operation = operation;
+        }
+
+        @Override
+        public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
+            operation.executeAsync(binding, new SingleResultCallback<MapReduceStatistics>() {
+                @Override
+                public void onResult(final MapReduceStatistics result, final Throwable t) {
+                    callback.onResult(null, t);
+                }
+            });
+        }
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MappingAsyncBatchCursor.java b/driver-async/src/main/com/mongodb/async/client/MappingAsyncBatchCursor.java
index e21798494f1..db00e5fbf9f 100644
--- a/driver-async/src/main/com/mongodb/async/client/MappingAsyncBatchCursor.java
+++ b/driver-async/src/main/com/mongodb/async/client/MappingAsyncBatchCursor.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -35,26 +35,12 @@ class MappingAsyncBatchCursor<T, U> implements AsyncBatchCursor<U> {
 
     @Override
     public void next(final SingleResultCallback<List<U>> callback) {
-        batchCursor.next(new SingleResultCallback<List<T>>() {
-            @Override
-            public void onResult(final List<T> results, final Throwable t) {
-                if (t != null) {
-                    callback.onResult(null, t);
-                } else if (results != null) {
-                    try {
-                        List<U> mappedResults = new ArrayList<U>();
-                        for (T result : results) {
-                            mappedResults.add(mapper.apply(result));
-                        }
-                        callback.onResult(mappedResults, null);
-                    } catch (Throwable t1) {
-                        callback.onResult(null, t1);
-                    }
-                } else {
-                    callback.onResult(null, null);
-                }
-            }
-        });
+        batchCursor.next(getMappingCallback(callback));
+    }
+
+    @Override
+    public void tryNext(final SingleResultCallback<List<U>> callback) {
+        batchCursor.tryNext(getMappingCallback(callback));
     }
 
     @Override
@@ -76,4 +62,27 @@ public boolean isClosed() {
     public void close() {
         batchCursor.close();
     }
+
+    private SingleResultCallback<List<T>> getMappingCallback(final SingleResultCallback<List<U>> callback) {
+        return new SingleResultCallback<List<T>>() {
+            @Override
+            public void onResult(final List<T> results, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else if (results != null) {
+                    try {
+                        List<U> mappedResults = new ArrayList<U>();
+                        for (T result : results) {
+                            mappedResults.add(mapper.apply(result));
+                        }
+                        callback.onResult(mappedResults, null);
+                    } catch (Throwable t1) {
+                        callback.onResult(null, t1);
+                    }
+                } else {
+                    callback.onResult(null, null);
+                }
+            }
+        };
+    }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MappingIterable.java b/driver-async/src/main/com/mongodb/async/client/MappingIterable.java
index 6207b5e228f..2b2259ed984 100644
--- a/driver-async/src/main/com/mongodb/async/client/MappingIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/MappingIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,30 +18,32 @@
 
 import com.mongodb.Block;
 import com.mongodb.Function;
-import com.mongodb.async.SingleResultCallback;
 import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.SingleResultCallback;
 
 import java.util.Collection;
 
-import static org.bson.assertions.Assertions.notNull;
+import static com.mongodb.assertions.Assertions.notNull;
 
-class MappingIterable<T, U> implements MongoIterable<U> {
-    private final MongoIterable<T> iterable;
-    private final Function<T, U> mapper;
+class MappingIterable<U, V> implements MongoIterable<V> {
+    private final MongoIterable<U> iterable;
+    private final Function<U, V> mapper;
 
-    public MappingIterable(final MongoIterable<T> iterable, final Function<T, U> mapper) {
+    MappingIterable(final MongoIterable<U> iterable, final Function<U, V> mapper) {
         this.iterable = notNull("iterable", iterable);
         this.mapper = notNull("mapper", mapper);
     }
 
     @Override
-    public void first(final SingleResultCallback<U> callback) {
+    public void first(final SingleResultCallback<V> callback) {
         notNull("callback", callback);
-        iterable.first(new SingleResultCallback<T>() {
+        iterable.first(new SingleResultCallback<U>() {
             @Override
-            public void onResult(final T result, final Throwable t) {
+            public void onResult(final U result, final Throwable t) {
                 if (t != null) {
                     callback.onResult(null, t);
+                } else if (result == null) {
+                    callback.onResult(null, null);
                 } else {
                     callback.onResult(mapper.apply(result), null);
                 }
@@ -50,12 +52,12 @@ public void onResult(final T result, final Throwable t) {
     }
 
     @Override
-    public void forEach(final Block<? super U> block, final SingleResultCallback<Void> callback) {
+    public void forEach(final Block<? super V> block, final SingleResultCallback<Void> callback) {
         notNull("block", block);
         notNull("callback", callback);
-        iterable.forEach(new Block<T>() {
+        iterable.forEach(new Block<U>() {
             @Override
-            public void apply(final T t) {
+            public void apply(final U t) {
                 block.apply(mapper.apply(t));
             }
         }, new SingleResultCallback<Void>() {
@@ -71,12 +73,12 @@ public void onResult(final Void result, final Throwable t) {
     }
 
     @Override
-    public <A extends Collection<? super U>> void into(final A target, final SingleResultCallback<A> callback) {
+    public <A extends Collection<? super V>> void into(final A target, final SingleResultCallback<A> callback) {
         notNull("target", target);
         notNull("callback", callback);
-        iterable.forEach(new Block<T>() {
+        iterable.forEach(new Block<U>() {
             @Override
-            public void apply(final T t) {
+            public void apply(final U t) {
                 target.add(mapper.apply(t));
             }
         }, new SingleResultCallback<Void>() {
@@ -92,28 +94,37 @@ public void onResult(final Void result, final Throwable t) {
     }
 
     @Override
-    public <V> MongoIterable<V> map(final Function<U, V> mapper) {
-        return new MappingIterable<U, V>(this, mapper);
+    public <W> MongoIterable<W> map(final Function<V, W> mapper) {
+        return new MappingIterable<V, W>(this, mapper);
     }
 
     @Override
-    public MongoIterable<U> batchSize(final int batchSize) {
+    public MongoIterable<V> batchSize(final int batchSize) {
         iterable.batchSize(batchSize);
         return this;
     }
 
     @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<U>> callback) {
+    public Integer getBatchSize() {
+        return iterable.getBatchSize();
+    }
+
+    @Override
+    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<V>> callback) {
         notNull("callback", callback);
-        iterable.batchCursor(new SingleResultCallback<AsyncBatchCursor<T>>() {
+        iterable.batchCursor(new SingleResultCallback<AsyncBatchCursor<U>>() {
             @Override
-            public void onResult(final AsyncBatchCursor<T> batchCursor, final Throwable t) {
+            public void onResult(final AsyncBatchCursor<U> batchCursor, final Throwable t) {
                 if (t != null) {
                     callback.onResult(null, t);
                 } else {
-                    callback.onResult(new MappingAsyncBatchCursor<T, U>(batchCursor, mapper), null);
+                    callback.onResult(new MappingAsyncBatchCursor<U, V>(batchCursor, mapper), null);
                 }
             }
         });
     }
+
+    MongoIterable<U> getMapped() {
+        return iterable;
+    }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoClient.java b/driver-async/src/main/com/mongodb/async/client/MongoClient.java
index 655bdfea9b8..9d6f62b8312 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoClient.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,14 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.ClientSessionOptions;
 import com.mongodb.annotations.Immutable;
+import com.mongodb.async.SingleResultCallback;
 import org.bson.Document;
+import org.bson.conversions.Bson;
 
 import java.io.Closeable;
+import java.util.List;
 
 /**
  * A client-side representation of a MongoDB cluster.  Instances can represent either a standalone MongoDB instance, a replica set,
@@ -29,14 +33,44 @@
  * Instance of this class serve as factories for {@code MongoDatabase} instances.
  * </p>
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
 @Immutable
+@Deprecated
 public interface MongoClient extends Closeable {
+
+    /**
+     * Creates a client session with default options.
+     *
+     * <p>Note: A ClientSession instance can not be used concurrently in multiple asynchronous operations.</p>
+     *
+     * @param callback the callback that is passed the clientSession or a {@code MongoClientException} if the MongoDB cluster to which
+     *                 this client is connected does not support sessions
+     * @mongodb.server.release 3.6
+     * @since 3.8
+     */
+    void startSession(SingleResultCallback<ClientSession> callback);
+
+    /**
+     * Creates a client session.
+     *
+     * <p>Note: A ClientSession instance can not be used concurrently in multiple asynchronous operations.</p>
+     *
+     * @param options  the options for the client session
+     * @param callback the callback that is passed the clientSession or a {@code MongoClientException} if the MongoDB cluster to which
+     *                 this client is connected does not support sessions
+     * @mongodb.server.release 3.6
+     * @since 3.6
+     */
+    void startSession(ClientSessionOptions options, SingleResultCallback<ClientSession> callback);
+
     /**
      * Gets the database with the given name.
      *
      * @param name the name of the database
      * @return the database
+     * @throws IllegalArgumentException if databaseName is invalid
+     * @see com.mongodb.MongoNamespace#checkDatabaseNameValidity(String)
      */
     MongoDatabase getDatabase(String name);
 
@@ -52,17 +86,30 @@ public interface MongoClient extends Closeable {
      * <p>Note: {@link MongoClientSettings} is immutable.</p>
      *
      * @return the settings
+     * @deprecated this method is being removed
      */
+    @Deprecated
     MongoClientSettings getSettings();
 
     /**
      * Get a list of the database names
      *
-     * @mongodb.driver.manual reference/command/listDatabases List Databases
      * @return an iterable containing all the names of all the databases
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
      */
     MongoIterable<String> listDatabaseNames();
 
+    /**
+     * Get a list of the database names
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return an iterable containing all the names of all the databases
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    MongoIterable<String> listDatabaseNames(ClientSession clientSession);
+
     /**
      * Gets the list of databases
      *
@@ -70,6 +117,17 @@ public interface MongoClient extends Closeable {
      */
     ListDatabasesIterable<Document> listDatabases();
 
+    /**
+     * Gets the list of databases
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the list databases iterable interface
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ListDatabasesIterable<Document> listDatabases(ClientSession clientSession);
+
     /**
      * Gets the list of databases
      *
@@ -79,4 +137,113 @@ public interface MongoClient extends Closeable {
      */
     <TResult> ListDatabasesIterable<TResult> listDatabases(Class<TResult> resultClass);
 
+    /**
+     * Gets the list of databases
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to cast the database documents to
+     * @param <TResult>   the type of the class to use instead of {@code Document}.
+     * @return the list databases iterable interface
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ListDatabasesIterable<TResult> listDatabases(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch();
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch(List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoClientImpl.java b/driver-async/src/main/com/mongodb/async/client/MongoClientImpl.java
index b041b03b3cb..a947748a5d9 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoClientImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,50 +16,115 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientSessionOptions;
 import com.mongodb.Function;
+import com.mongodb.MongoClientException;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.SingleResultCallback;
-import com.mongodb.binding.AsyncClusterBinding;
-import com.mongodb.binding.AsyncReadBinding;
-import com.mongodb.binding.AsyncReadWriteBinding;
-import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.async.client.internal.Crypt;
+import com.mongodb.async.client.internal.Crypts;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
 import com.mongodb.connection.Cluster;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.AsyncReadOperation;
-import com.mongodb.operation.AsyncWriteOperation;
+import com.mongodb.internal.session.ServerSessionPool;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static org.bson.internal.CodecRegistryHelper.createRegistry;
 
+@SuppressWarnings("deprecation")
 class MongoClientImpl implements MongoClient {
     private static final Logger LOGGER = Loggers.getLogger("client");
     private final Cluster cluster;
     private final MongoClientSettings settings;
-    private final AsyncOperationExecutor executor;
+    private final OperationExecutor executor;
+    private final Closeable externalResourceCloser;
+    private final ServerSessionPool serverSessionPool;
+    private final ClientSessionHelper clientSessionHelper;
+    private final CodecRegistry codecRegistry;
+    private final Crypt crypt;
+
+    MongoClientImpl(final MongoClientSettings settings, final Cluster cluster, @Nullable final Closeable externalResourceCloser) {
+        this(settings, cluster, null, externalResourceCloser);
+    }
 
-    MongoClientImpl(final MongoClientSettings settings, final Cluster cluster) {
-        this(settings, cluster, createOperationExecutor(settings, cluster));
+    MongoClientImpl(final MongoClientSettings settings, final Cluster cluster, @Nullable final OperationExecutor executor) {
+        this(settings, cluster, executor, null);
     }
 
-    MongoClientImpl(final MongoClientSettings settings, final Cluster cluster, final AsyncOperationExecutor executor) {
+    private MongoClientImpl(final MongoClientSettings settings, final Cluster cluster, @Nullable final OperationExecutor executor,
+                            @Nullable final Closeable externalResourceCloser) {
         this.settings = notNull("settings", settings);
         this.cluster = notNull("cluster", cluster);
-        this.executor = notNull("executor", executor);
+        this.serverSessionPool = new ServerSessionPool(cluster);
+        this.clientSessionHelper = new ClientSessionHelper(this, serverSessionPool);
+        AutoEncryptionSettings autoEncryptSettings = settings.getAutoEncryptionSettings();
+        this.crypt = autoEncryptSettings != null ? Crypts.createCrypt(this, autoEncryptSettings) : null;
+        if (executor == null) {
+            this.executor = new OperationExecutorImpl(this, clientSessionHelper);
+        } else {
+            this.executor = executor;
+        }
+        this.externalResourceCloser = externalResourceCloser;
+        this.codecRegistry = createRegistry(settings.getCodecRegistry(), settings.getUuidRepresentation());
+    }
+
+    @Override
+    public void startSession(final SingleResultCallback<ClientSession> callback) {
+        startSession(ClientSessionOptions.builder().build(), callback);
+    }
+
+    @Override
+    public void startSession(final ClientSessionOptions options, final SingleResultCallback<ClientSession> callback) {
+        notNull("callback", callback);
+        clientSessionHelper.createClientSession(notNull("options", options), executor, new SingleResultCallback<ClientSession>() {
+            @Override
+            public void onResult(final ClientSession clientSession, final Throwable t) {
+                SingleResultCallback<ClientSession> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else if (clientSession == null) {
+                    errHandlingCallback.onResult(null, new MongoClientException("Sessions are not supported by the MongoDB cluster to"
+                            + " which this client is connected"));
+                } else {
+                    errHandlingCallback.onResult(clientSession, null);
+                }
+            }
+        });
     }
 
     @Override
     public MongoDatabase getDatabase(final String name) {
-        return new MongoDatabaseImpl(name, settings.getCodecRegistry(), settings.getReadPreference(), settings.getWriteConcern(),
-                settings.getReadConcern(), executor);
+        return new MongoDatabaseImpl(name, codecRegistry, settings.getReadPreference(), settings.getWriteConcern(),
+                settings.getRetryWrites(), settings.getRetryReads(), settings.getReadConcern(), settings.getUuidRepresentation(), executor);
     }
 
     @Override
     public void close() {
+        if (crypt != null) {
+            crypt.close();
+        }
+        serverSessionPool.close();
         cluster.close();
+        if (externalResourceCloser != null) {
+            try {
+                externalResourceCloser.close();
+            } catch (IOException e) {
+                LOGGER.warn("Exception closing resource", e);
+            }
+        }
     }
 
     @Override
@@ -69,72 +134,114 @@ public MongoClientSettings getSettings() {
 
     @Override
     public MongoIterable<String> listDatabaseNames() {
-        return new ListDatabasesIterableImpl<BsonDocument>(BsonDocument.class, MongoClients.getDefaultCodecRegistry(),
-                                                           ReadPreference.primary(), executor).map(new Function<BsonDocument, String>() {
+        return createListDatabaseNamesIterable(null);
+    }
+
+    @Override
+    public MongoIterable<String> listDatabaseNames(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return createListDatabaseNamesIterable(clientSession);
+    }
+
+    private MongoIterable<String> createListDatabaseNamesIterable(@Nullable final ClientSession clientSession) {
+        return createListDatabasesIterable(clientSession, BsonDocument.class).nameOnly(true).map(new Function<BsonDocument, String>() {
             @Override
-            public String apply(final BsonDocument document) {
-                return document.getString("name").getValue();
+            public String apply(final BsonDocument result) {
+                return result.getString("name").getValue();
             }
         });
     }
 
     @Override
     public ListDatabasesIterable<Document> listDatabases() {
-        return listDatabases(Document.class);
+        return createListDatabasesIterable(null, Document.class);
+    }
+
+    @Override
+    public ListDatabasesIterable<Document> listDatabases(final ClientSession clientSession) {
+        return listDatabases(clientSession, Document.class);
     }
 
     @Override
     public <T> ListDatabasesIterable<T> listDatabases(final Class<T> resultClass) {
-        return new ListDatabasesIterableImpl<T>(resultClass, settings.getCodecRegistry(), ReadPreference.primary(), executor);
+        return createListDatabasesIterable(null, resultClass);
+    }
+
+    @Override
+    public <TResult> ListDatabasesIterable<TResult> listDatabases(final ClientSession clientSession, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createListDatabasesIterable(clientSession, resultClass);
+    }
+
+
+    @Override
+    public ChangeStreamIterable<Document> watch() {
+        return watch(Collections.<Bson>emptyList());
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final Class<TResult> resultClass) {
+        return watch(Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final List<? extends Bson> pipeline) {
+        return watch(pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createChangeStreamIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession) {
+        return watch(clientSession, Collections.<Bson>emptyList(), Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return watch(clientSession, Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return watch(clientSession, pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                         final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createChangeStreamIterable(clientSession, pipeline, resultClass);
+    }
+
+    private <TResult> ChangeStreamIterable<TResult> createChangeStreamIterable(@Nullable final ClientSession clientSession,
+                                                                               final List<? extends Bson> pipeline,
+                                                                               final Class<TResult> resultClass) {
+        return new ChangeStreamIterableImpl<TResult>(clientSession, "admin", codecRegistry,
+                settings.getReadPreference(), settings.getReadConcern(), executor, pipeline, resultClass, ChangeStreamLevel.CLIENT,
+                settings.getRetryReads());
+    }
+
+    private <T> ListDatabasesIterable<T> createListDatabasesIterable(@Nullable final ClientSession clientSession, final Class<T> clazz) {
+        return new ListDatabasesIterableImpl<T>(clientSession, clazz, codecRegistry,
+                ReadPreference.primary(), executor, settings.getRetryReads());
     }
 
     Cluster getCluster() {
         return cluster;
     }
 
-    private static AsyncOperationExecutor createOperationExecutor(final MongoClientSettings settings, final Cluster cluster) {
-        return new AsyncOperationExecutor(){
-            @Override
-            public <T> void execute(final AsyncReadOperation<T> operation, final ReadPreference readPreference,
-                                    final SingleResultCallback<T> callback) {
-                notNull("operation", operation);
-                notNull("readPreference", readPreference);
-                notNull("callback", callback);
-                final SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                final AsyncReadBinding binding = getReadWriteBinding(readPreference, cluster);
-                operation.executeAsync(binding, new SingleResultCallback<T>() {
-                    @Override
-                    public void onResult(final T result, final Throwable t) {
-                        try {
-                            errHandlingCallback.onResult(result, t);
-                        } finally {
-                            binding.release();
-                        }
-                    }
-                });
-            }
+    ServerSessionPool getServerSessionPool() {
+        return serverSessionPool;
+    }
 
-            @Override
-            public <T> void execute(final AsyncWriteOperation<T> operation, final SingleResultCallback<T> callback) {
-                notNull("operation", operation);
-                notNull("callback", callback);
-                final AsyncWriteBinding binding = getReadWriteBinding(ReadPreference.primary(), cluster);
-                operation.executeAsync(binding, new SingleResultCallback<T>() {
-                    @Override
-                    public void onResult(final T result, final Throwable t) {
-                        try {
-                            errorHandlingCallback(callback, LOGGER).onResult(result, t);
-                        } finally {
-                            binding.release();
-                        }
-                    }
-                });
-            }
-        };
+    Crypt getCrypt() {
+        return crypt;
     }
 
-    private static AsyncReadWriteBinding getReadWriteBinding(final ReadPreference readPreference, final Cluster cluster) {
-        notNull("readPreference", readPreference);
-        return new AsyncClusterBinding(cluster, readPreference);
+    public CodecRegistry getCodecRegistry() {
+        return codecRegistry;
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoClientSettings.java b/driver-async/src/main/com/mongodb/async/client/MongoClientSettings.java
index 7a241f25f10..636038ba024 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoClientSettings.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoClientSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,52 +16,48 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.Block;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoCompressor;
 import com.mongodb.MongoCredential;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
-import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory;
 import com.mongodb.connection.ClusterSettings;
 import com.mongodb.connection.ConnectionPoolSettings;
 import com.mongodb.connection.ServerSettings;
 import com.mongodb.connection.SocketSettings;
 import com.mongodb.connection.SslSettings;
 import com.mongodb.connection.StreamFactoryFactory;
-import com.mongodb.connection.netty.NettyStreamFactoryFactory;
 import com.mongodb.event.CommandListener;
+import com.mongodb.lang.Nullable;
+import org.bson.UuidRepresentation;
 import org.bson.codecs.configuration.CodecRegistry;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Collections.singletonList;
 
 
 /**
  * Various settings to control the behavior of a {@code MongoClient}.
  *
  * @since 3.0
+ * @deprecated use {@link com.mongodb.MongoClientSettings} instead
  */
 @Immutable
+@Deprecated
 public final class MongoClientSettings {
-    private final ReadPreference readPreference;
-    private final WriteConcern writeConcern;
-    private final ReadConcern readConcern;
-    private final List<MongoCredential> credentialList;
-    private final StreamFactoryFactory streamFactoryFactory;
-    private final List<CommandListener> commandListeners;
-
-    private final CodecRegistry codecRegistry;
-
-    private final ClusterSettings clusterSettings;
-    private final SocketSettings socketSettings;
+    private final com.mongodb.MongoClientSettings wrapped;
     private final SocketSettings heartbeatSocketSettings;
-    private final ConnectionPoolSettings connectionPoolSettings;
-    private final ServerSettings serverSettings;
-    private final SslSettings sslSettings;
+    private final List<MongoCredential> credentialList;
 
     /**
      * Convenience method to create a Builder.
@@ -82,64 +78,137 @@ public static Builder builder(final MongoClientSettings settings) {
         return new Builder(settings);
     }
 
+    static MongoClientSettings createFromClientSettings(final com.mongodb.MongoClientSettings wrapped) {
+        return new Builder(wrapped).build();
+    }
+
     /**
      * A builder for {@code MongoClientSettings} so that {@code MongoClientSettings} can be immutable, and to support easier construction
      * through chaining.
      */
     @NotThreadSafe
     public static final class Builder {
-        private ReadPreference readPreference = ReadPreference.primary();
-        private WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
-        private ReadConcern readConcern = ReadConcern.DEFAULT;
-        private CodecRegistry codecRegistry = MongoClients.getDefaultCodecRegistry();
-        private StreamFactoryFactory streamFactoryFactory = createDefaultStreamFactoryFactory();
-        private final List<CommandListener> commandListeners = new ArrayList<CommandListener>();
-
-        private ClusterSettings clusterSettings;
-        private SocketSettings socketSettings = SocketSettings.builder().build();
-        private SocketSettings heartbeatSocketSettings = SocketSettings.builder().build();
-        private ConnectionPoolSettings connectionPoolSettings = ConnectionPoolSettings.builder()
-                                                                                      .maxSize(100)
-                                                                                      .maxWaitQueueSize(500)
-                                                                                      .build();
-        private ServerSettings serverSettings = ServerSettings.builder().build();
-        private SslSettings sslSettings = SslSettings.builder().build();
+        private final com.mongodb.MongoClientSettings.Builder wrappedBuilder;
         private List<MongoCredential> credentialList = Collections.emptyList();
+        private SocketSettings.Builder heartbeatSocketSettingsBuilder = null;
 
         private Builder() {
+            wrappedBuilder = com.mongodb.MongoClientSettings.builder();
+        }
+
+        private Builder(final com.mongodb.MongoClientSettings settings) {
+            notNull("settings", settings);
+            wrappedBuilder = com.mongodb.MongoClientSettings.builder(settings);
+            MongoCredential credential = settings.getCredential();
+            if (credential != null) {
+                credentialList(singletonList(credential));
+            }
+        }
+
+        @SuppressWarnings("deprecation")
+        private Builder(final MongoClientSettings settings) {
+            this(notNull("settings", settings).wrapped);
+            credentialList = new ArrayList<MongoCredential>(settings.credentialList);
+            if (settings.heartbeatSocketSettings != null) {
+                heartbeatSocketSettings(settings.heartbeatSocketSettings);
+            }
         }
 
         /**
-         * Creates a Builder from an existing {@code MongoClientSettings}.
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
          *
-         * @param settings create a builder from existing settings
+         * @param connectionString the connection string containing details of how to connect to MongoDB
+         * @return this
+         * @since 3.7
          */
-        private Builder(final MongoClientSettings settings) {
-            readPreference = settings.getReadPreference();
-            writeConcern = settings.getWriteConcern();
-            readConcern = settings.getReadConcern();
-            credentialList = settings.getCredentialList();
-            codecRegistry = settings.getCodecRegistry();
-            streamFactoryFactory = settings.getStreamFactoryFactory();
-            commandListeners.addAll(settings.commandListeners);
-
-            clusterSettings = settings.getClusterSettings();
-            serverSettings = settings.getServerSettings();
-            socketSettings = settings.getSocketSettings();
-            heartbeatSocketSettings = settings.getHeartbeatSocketSettings();
-            connectionPoolSettings = settings.getConnectionPoolSettings();
-            sslSettings = settings.getSslSettings();
+        @SuppressWarnings("deprecation")
+        public Builder applyConnectionString(final ConnectionString connectionString) {
+            credentialList = new ArrayList<MongoCredential>(connectionString.getCredentialList());
+            wrappedBuilder.applyConnectionString(connectionString);
+            return this;
+        }
+
+        /**
+         * Applies the {@link ClusterSettings.Builder} block and then sets the clusterSettings.
+         *
+         * @param block the block to apply to the ClusterSettings.
+         * @return this
+         * @since 3.7
+         * @see MongoClientSettings#getClusterSettings()
+         */
+        public Builder applyToClusterSettings(final Block<ClusterSettings.Builder> block) {
+            wrappedBuilder.applyToClusterSettings(block);
+            return this;
+        }
+
+        /**
+         * Applies the {@link SocketSettings.Builder} block and then sets the socketSettings.
+         *
+         * @param block the block to apply to the SocketSettings.
+         * @return this
+         * @since 3.7
+         * @see MongoClientSettings#getSocketSettings()
+         */
+        public Builder applyToSocketSettings(final Block<SocketSettings.Builder> block) {
+            wrappedBuilder.applyToSocketSettings(block);
+            return this;
+        }
+
+        /**
+         * Applies the {@link ConnectionPoolSettings.Builder} block and then sets the connectionPoolSettings.
+         *
+         * @param block the block to apply to the ConnectionPoolSettings.
+         * @return this
+         * @since 3.7
+         * @see MongoClientSettings#getConnectionPoolSettings()
+         */
+        public Builder applyToConnectionPoolSettings(final Block<ConnectionPoolSettings.Builder> block) {
+            wrappedBuilder.applyToConnectionPoolSettings(block);
+            return this;
+        }
+
+        /**
+         * Applies the {@link ServerSettings.Builder} block and then sets the serverSettings.
+         *
+         * @param block the block to apply to the ServerSettings.
+         * @return this
+         * @since 3.7
+         * @see MongoClientSettings#getServerSettings()
+         */
+        public Builder applyToServerSettings(final Block<ServerSettings.Builder> block) {
+            wrappedBuilder.applyToServerSettings(block);
+            return this;
+        }
+
+        /**
+         * Applies the {@link SslSettings.Builder} block and then sets the sslSettings.
+         *
+         * @param block the block to apply to the SslSettings.
+         * @return this
+         * @since 3.7
+         * @see MongoClientSettings#getSslSettings()
+         */
+        public Builder applyToSslSettings(final Block<SslSettings.Builder> block) {
+            wrappedBuilder.applyToSslSettings(block);
+            return this;
         }
 
         /**
          * Sets the cluster settings.
          *
          * @param clusterSettings the cluster settings
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getClusterSettings()
+         * @deprecated Prefer {@link Builder#applyToClusterSettings(Block)}
          */
+        @Deprecated
         public Builder clusterSettings(final ClusterSettings clusterSettings) {
-            this.clusterSettings = notNull("clusterSettings", clusterSettings);
+            wrappedBuilder.applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                @Override
+                public void apply(final ClusterSettings.Builder builder) {
+                    builder.applySettings(clusterSettings);
+                }
+            });
             return this;
         }
 
@@ -147,11 +216,18 @@ public Builder clusterSettings(final ClusterSettings clusterSettings) {
          * Sets the socket settings.
          *
          * @param socketSettings the socket settings
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getSocketSettings()
+         * @deprecated Prefer {@link Builder#applyToSocketSettings(Block)}
          */
+        @Deprecated
         public Builder socketSettings(final SocketSettings socketSettings) {
-            this.socketSettings = notNull("socketSettings", socketSettings);
+            wrappedBuilder.applyToSocketSettings(new Block<SocketSettings.Builder>() {
+                @Override
+                public void apply(final SocketSettings.Builder builder) {
+                    builder.applySettings(socketSettings);
+                }
+            });
             return this;
         }
 
@@ -159,11 +235,16 @@ public Builder socketSettings(final SocketSettings socketSettings) {
          * Sets the heartbeat socket settings.
          *
          * @param heartbeatSocketSettings the socket settings
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getHeartbeatSocketSettings()
+         * @deprecated configuring heartbeatSocketSettings will be removed in the future.
          */
+        @Deprecated
         public Builder heartbeatSocketSettings(final SocketSettings heartbeatSocketSettings) {
-            this.heartbeatSocketSettings = notNull("heartbeatSocketSettings", heartbeatSocketSettings);
+            if (heartbeatSocketSettingsBuilder == null) {
+                heartbeatSocketSettingsBuilder = SocketSettings.builder();
+            }
+            heartbeatSocketSettingsBuilder.applySettings(heartbeatSocketSettings);
             return this;
         }
 
@@ -171,11 +252,18 @@ public Builder heartbeatSocketSettings(final SocketSettings heartbeatSocketSetti
          * Sets the connection pool settings.
          *
          * @param connectionPoolSettings the connection settings
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getConnectionPoolSettings() ()
+         * @deprecated Prefer {@link Builder#applyToConnectionPoolSettings(Block)}
          */
+        @Deprecated
         public Builder connectionPoolSettings(final ConnectionPoolSettings connectionPoolSettings) {
-            this.connectionPoolSettings = notNull("connectionPoolSettings", connectionPoolSettings);
+            wrappedBuilder.applyToConnectionPoolSettings(new Block<ConnectionPoolSettings.Builder>() {
+                @Override
+                public void apply(final ConnectionPoolSettings.Builder builder) {
+                    builder.applySettings(connectionPoolSettings);
+                }
+            });
             return this;
         }
 
@@ -183,11 +271,18 @@ public Builder connectionPoolSettings(final ConnectionPoolSettings connectionPoo
          * Sets the server settings.
          *
          * @param serverSettings the server settings
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getServerSettings() ()
+         * @deprecated Prefer {@link Builder#applyToServerSettings(Block)}
          */
+        @Deprecated
         public Builder serverSettings(final ServerSettings serverSettings) {
-            this.serverSettings = notNull("serverSettings", serverSettings);
+            wrappedBuilder.applyToServerSettings(new Block<ServerSettings.Builder>() {
+                @Override
+                public void apply(final ServerSettings.Builder builder) {
+                    builder.applySettings(serverSettings);
+                }
+            });
             return this;
         }
 
@@ -195,24 +290,30 @@ public Builder serverSettings(final ServerSettings serverSettings) {
          * Sets the socket settings.
          *
          * @param sslSettings the SSL settings
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getSslSettings() ()
+         * @deprecated Prefer {@link Builder#applyToSslSettings(Block)}
          */
+        @Deprecated
         public Builder sslSettings(final SslSettings sslSettings) {
-            this.sslSettings = notNull("sslSettings", sslSettings);
+            wrappedBuilder.applyToSslSettings(new Block<SslSettings.Builder>() {
+                @Override
+                public void apply(final SslSettings.Builder builder) {
+                    builder.applySettings(sslSettings);
+                }
+            });
             return this;
         }
 
-
         /**
          * Sets the read preference.
          *
          * @param readPreference read preference
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getReadPreference()
          */
         public Builder readPreference(final ReadPreference readPreference) {
-            this.readPreference = notNull("readPreference", readPreference);
+            wrappedBuilder.readPreference(readPreference);
             return this;
         }
 
@@ -220,11 +321,41 @@ public Builder readPreference(final ReadPreference readPreference) {
          * Sets the write concern.
          *
          * @param writeConcern the write concern
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getWriteConcern()
          */
         public Builder writeConcern(final WriteConcern writeConcern) {
-            this.writeConcern = notNull("writeConcern", writeConcern);
+            wrappedBuilder.writeConcern(writeConcern);
+            return this;
+        }
+
+        /**
+         * Sets whether writes should be retried if they fail due to a network error or other retryable error.
+         *
+         * <p>Starting with the 3.11.0 release, the default value is true</p>
+         *
+         * @param retryWrites sets if writes should be retried if they fail due to a network error or other retryable error.
+         * @return this
+         * @see #getRetryWrites()
+         * @since 3.6
+         * @mongodb.server.release 3.6
+         */
+        public Builder retryWrites(final boolean retryWrites) {
+            wrappedBuilder.retryWrites(retryWrites);
+            return this;
+        }
+
+        /**
+         * Sets whether reads should be retried if they fail due to a network error or other retryable error.
+         *
+         * @param retryReads sets if reads should be retried if they fail due to a network error or other retryable error.
+         * @return this
+         * @see #getRetryReads()
+         * @since 3.11
+         * @mongodb.server.release 3.6
+         */
+        public Builder retryReads(final boolean retryReads) {
+            wrappedBuilder.retryReads(retryReads);
             return this;
         }
 
@@ -232,13 +363,13 @@ public Builder writeConcern(final WriteConcern writeConcern) {
          * Sets the read concern.
          *
          * @param readConcern the read concern
-         * @return {@code this}
+         * @return this
          * @since 3.2
          * @mongodb.server.release 3.2
          * @mongodb.driver.manual reference/readConcern/ Read Concern
          */
         public Builder readConcern(final ReadConcern readConcern) {
-            this.readConcern = notNull("readConcern", readConcern);
+            wrappedBuilder.readConcern(readConcern);
             return this;
         }
 
@@ -246,11 +377,30 @@ public Builder readConcern(final ReadConcern readConcern) {
          * Sets the credential list.
          *
          * @param credentialList the credential list
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getCredentialList()
+         * @deprecated Prefer {@link #credential(MongoCredential)}
          */
+        @Deprecated
         public Builder credentialList(final List<MongoCredential> credentialList) {
             this.credentialList = Collections.unmodifiableList(notNull("credentialList", credentialList));
+            if (!credentialList.isEmpty()) {
+                wrappedBuilder.credential(credentialList.get(credentialList.size() - 1));
+            }
+            return this;
+        }
+
+        /**
+         * Sets the credential.
+         *
+         * @param credential the credential
+         * @return this
+         * @see MongoClientSettings#getCredential()
+         * @since 3.6
+         */
+        public Builder credential(final MongoCredential credential) {
+            this.credentialList = singletonList(notNull("credential", credential));
+            wrappedBuilder.credential(credential);
             return this;
         }
 
@@ -258,12 +408,12 @@ public Builder credentialList(final List<MongoCredential> credentialList) {
          * Sets the codec registry
          *
          * @param codecRegistry the codec registry
-         * @return {@code this}
+         * @return this
          * @see MongoClientSettings#getCodecRegistry()
          * @since 3.0
          */
         public Builder codecRegistry(final CodecRegistry codecRegistry) {
-            this.codecRegistry = notNull("codecRegistry", codecRegistry);
+            wrappedBuilder.codecRegistry(codecRegistry);
             return this;
         }
 
@@ -275,7 +425,7 @@ public Builder codecRegistry(final CodecRegistry codecRegistry) {
          * @since 3.1
          */
         public Builder streamFactoryFactory(final StreamFactoryFactory streamFactoryFactory) {
-            this.streamFactoryFactory = notNull("streamFactoryFactory", streamFactoryFactory);
+            wrappedBuilder.streamFactoryFactory(streamFactoryFactory);
             return this;
         }
 
@@ -287,8 +437,66 @@ public Builder streamFactoryFactory(final StreamFactoryFactory streamFactoryFact
          * @since 3.3
          */
         public Builder addCommandListener(final CommandListener commandListener) {
-            notNull("commandListener", commandListener);
-            commandListeners.add(commandListener);
+            wrappedBuilder.addCommandListener(commandListener);
+            return this;
+        }
+
+        /**
+         * Sets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+         * the application to the server, for use in server logs, slow query logs, and profile collection.
+         *
+         * @param applicationName the logical name of the application using this MongoClient.  It may be null.
+         *                        The UTF-8 encoding may not exceed 128 bytes.
+         * @return this
+         * @see #getApplicationName()
+         * @since 3.4
+         * @mongodb.server.release 3.4
+         */
+        public Builder applicationName(final String applicationName) {
+            wrappedBuilder.applicationName(applicationName);
+            return this;
+        }
+
+        /**
+         * Sets the compressors to use for compressing messages to the server. The driver will use the first compressor in the list
+         * that the server is configured to support.
+         *
+         * @param compressorList the list of compressors to request
+         * @return this
+         * @see #getCompressorList() ()
+         * @since 3.6
+         * @mongodb.server.release 3.4
+         */
+        public Builder compressorList(final List<MongoCompressor> compressorList) {
+            wrappedBuilder.compressorList(compressorList);
+            return this;
+        }
+
+        /**
+         * Sets the auto-encryption settings
+         *
+         * @param autoEncryptionSettings the auto-encryption settings
+         * @return this
+         * @since 3.11
+         * @see #getAutoEncryptionSettings()
+         */
+        public Builder autoEncryptionSettings(final AutoEncryptionSettings autoEncryptionSettings) {
+            wrappedBuilder.autoEncryptionSettings(autoEncryptionSettings);
+            return this;
+        }
+
+        /**
+         * Sets the UUID representation to use when encoding instances of {@link java.util.UUID} and when decoding BSON binary values with
+         * subtype of 3.
+         *
+         * <p>See {@link #getUuidRepresentation()} for recommendations on settings this value</p>
+         *
+         * @param uuidRepresentation the UUID representation, which may not be null
+         * @return this
+         * @since 3.12
+         */
+        public Builder uuidRepresentation(final UuidRepresentation uuidRepresentation) {
+            wrappedBuilder.uuidRepresentation(uuidRepresentation);
             return this;
         }
 
@@ -300,18 +508,6 @@ public Builder addCommandListener(final CommandListener commandListener) {
         public MongoClientSettings build() {
             return new MongoClientSettings(this);
         }
-
-        private static StreamFactoryFactory createDefaultStreamFactoryFactory() {
-            String streamType = System.getProperty("org.mongodb.async.type", "nio2");
-
-            if (streamType.equals("netty")) {
-                return NettyStreamFactoryFactory.builder().build();
-            } else if (streamType.equals("nio2")) {
-                return new AsynchronousSocketChannelStreamFactoryFactory();
-            } else {
-                throw new IllegalArgumentException("Unsupported stream type " + streamType);
-            }
-        }
     }
 
     /**
@@ -323,18 +519,32 @@ private static StreamFactoryFactory createDefaultStreamFactoryFactory() {
      * @see com.mongodb.ReadPreference#primary()
      */
     public ReadPreference getReadPreference() {
-        return readPreference;
+        return wrapped.getReadPreference();
     }
 
     /**
      * Gets the credential list.
      *
      * @return the credential list
+     * @deprecated Prefer {@link #getCredential()}
      */
+    @Deprecated
     public List<MongoCredential> getCredentialList() {
         return credentialList;
     }
 
+    /**
+     * Gets the credential.
+     *
+     * @return the credentia, which may be null
+     * @since 3.6
+     */
+    @Nullable
+    public MongoCredential getCredential() {
+        isTrue("Single or no credential", credentialList.size() <= 1);
+        return wrapped.getCredential();
+    }
+
     /**
      * The write concern to use.
      *
@@ -344,7 +554,31 @@ public List<MongoCredential> getCredentialList() {
      * @see com.mongodb.WriteConcern#ACKNOWLEDGED
      */
     public WriteConcern getWriteConcern() {
-        return writeConcern;
+        return wrapped.getWriteConcern();
+    }
+
+    /**
+     * Returns true if writes should be retried if they fail due to a network error or other retryable error.
+     *
+     * <p>Starting with the 3.11.0 release, the default value is true</p>
+     *
+     * @return the retryWrites value
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public boolean getRetryWrites() {
+        return wrapped.getRetryWrites();
+    }
+
+    /**
+     * Returns true if reads should be retried if they fail due to a network error or other retryable error. The default value is true.
+     *
+     * @return the retryReads value
+     * @since 3.11
+     * @mongodb.server.release 3.6
+     */
+    public boolean getRetryReads() {
+        return wrapped.getRetryReads();
     }
 
     /**
@@ -356,7 +590,7 @@ public WriteConcern getWriteConcern() {
      * @mongodb.driver.manual reference/readConcern/ Read Concern
      */
     public ReadConcern getReadConcern() {
-        return readConcern;
+        return wrapped.getReadConcern();
     }
 
     /**
@@ -368,7 +602,7 @@ public ReadConcern getReadConcern() {
      * @since 3.0
      */
     public CodecRegistry getCodecRegistry() {
-        return codecRegistry;
+        return wrapped.getCodecRegistry();
     }
 
     /**
@@ -377,8 +611,9 @@ public CodecRegistry getCodecRegistry() {
      * @return the stream factory factory
      * @since 3.1
      */
+    @Nullable
     public StreamFactoryFactory getStreamFactoryFactory() {
-        return streamFactoryFactory;
+        return wrapped.getStreamFactoryFactory();
     }
 
     /**
@@ -388,7 +623,56 @@ public StreamFactoryFactory getStreamFactoryFactory() {
      * @since 3.3
      */
     public List<CommandListener> getCommandListeners() {
-        return Collections.unmodifiableList(commandListeners);
+        return wrapped.getCommandListeners();
+    }
+
+    /**
+     * Gets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+     * the application to the server, for use in server logs, slow query logs, and profile collection.
+     *
+     * <p>Default is null.</p>
+     *
+     * @return the application name, which may be null
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public String getApplicationName() {
+        return wrapped.getApplicationName();
+    }
+
+    /**
+     * Gets the compressors to use for compressing messages to the server. The driver will use the first compressor in the list
+     * that the server is configured to support.
+     *
+     * <p>Default is the empty list.</p>
+     *
+     * @return the compressors
+     * @since 3.6
+     * @mongodb.server.release 3.4
+     */
+    public List<MongoCompressor> getCompressorList() {
+        return wrapped.getCompressorList();
+    }
+
+    /**
+     * Gets the UUID representation to use when encoding instances of {@link java.util.UUID} and when decoding BSON binary values with
+     * subtype of 3.
+     *
+     * <p>The default is {@link UuidRepresentation#JAVA_LEGACY}, but it will be changing to {@link UuidRepresentation#UNSPECIFIED} in
+     * the next major release.  If your application stores UUID values in MongoDB, consider setting this value to the desired
+     * representation in order to avoid a breaking change when upgrading.  New applications should prefer
+     * {@link UuidRepresentation#STANDARD}, while existing Java applications should prefer {@link UuidRepresentation#JAVA_LEGACY}.
+     * Applications wishing to interoperate with existing Python or .NET applications should prefer
+     * {@link UuidRepresentation#PYTHON_LEGACY} or {@link UuidRepresentation#C_SHARP_LEGACY}, respectively. Applications that do not
+     * store UUID values in MongoDB don't need to set this value.
+     * </p>
+     *
+     * @return the UUID representation, which may not be null
+     * @since 3.12
+     */
+    public UuidRepresentation getUuidRepresentation() {
+        return wrapped.getUuidRepresentation();
     }
 
     /**
@@ -397,7 +681,7 @@ public List<CommandListener> getCommandListeners() {
      * @return the cluster settings
      */
     public ClusterSettings getClusterSettings() {
-        return clusterSettings;
+        return wrapped.getClusterSettings();
     }
 
     /**
@@ -406,7 +690,7 @@ public ClusterSettings getClusterSettings() {
      * @return the SSL settings
      */
     public SslSettings getSslSettings() {
-        return sslSettings;
+        return wrapped.getSslSettings();
     }
 
     /**
@@ -417,18 +701,18 @@ public SslSettings getSslSettings() {
      * @see com.mongodb.connection.SocketSettings
      */
     public SocketSettings getSocketSettings() {
-        return socketSettings;
+        return wrapped.getSocketSettings();
     }
 
     /**
      * Gets the connection settings for the heartbeat thread (the background task that checks the state of the cluster) wrapped in a
-     * settings object. This settings object uses the values for heartbeatConnectTimeout, heartbeatSocketTimeout and socketKeepAlive.
+     * settings object.
      *
-     * @return a SocketSettings object populated with the heartbeat connection settings from this {@code MongoClientSettings} instance.
+     * @return the SocketSettings for the heartbeat thread
      * @see com.mongodb.connection.SocketSettings
      */
     public SocketSettings getHeartbeatSocketSettings() {
-        return heartbeatSocketSettings;
+        return heartbeatSocketSettings != null ? heartbeatSocketSettings : wrapped.getHeartbeatSocketSettings();
     }
 
     /**
@@ -441,7 +725,7 @@ public SocketSettings getHeartbeatSocketSettings() {
      * @see com.mongodb.connection.ConnectionPoolSettings
      */
     public ConnectionPoolSettings getConnectionPoolSettings() {
-        return connectionPoolSettings;
+        return wrapped.getConnectionPoolSettings();
     }
 
     /**
@@ -452,22 +736,40 @@ public ConnectionPoolSettings getConnectionPoolSettings() {
      * @see com.mongodb.connection.ServerSettings
      */
     public ServerSettings getServerSettings() {
-        return serverSettings;
+        return wrapped.getServerSettings();
+    }
+
+    /**
+     * Gets the auto-encryption settings.
+     * <p>
+     * Client side encryption enables an application to specify what fields in a collection must be
+     * encrypted, and the driver automatically encrypts commands and decrypts results.
+     * </p>
+     * <p>
+     * Automatic encryption is an enterprise only feature that only applies to operations on a collection. Automatic encryption is not
+     * supported for operations on a database or view and will result in error. To bypass automatic encryption,
+     * set bypassAutoEncryption=true in ClientSideEncryptionOptions.
+     * </p>
+     * <p>
+     * Explicit encryption/decryption and automatic decryption is a community feature, enabled with the new
+     * {@code com.mongodb.client.vault .ClientEncryption} type. A MongoClient configured with bypassAutoEncryption=true will still
+     * automatically decrypt.
+     * </p>
+     * <p>
+     * Automatic encryption requires the authenticated user to have the listCollections privilege action.
+     * </p>
+     *
+     * @return the auto-encryption settings, which may be null
+     * @since 3.11
+     */
+    @Nullable
+    public AutoEncryptionSettings getAutoEncryptionSettings() {
+        return wrapped.getAutoEncryptionSettings();
     }
 
     private MongoClientSettings(final Builder builder) {
-        readPreference = builder.readPreference;
-        writeConcern = builder.writeConcern;
-        readConcern = builder.readConcern;
+        wrapped = builder.wrappedBuilder.build();
         credentialList = builder.credentialList;
-        streamFactoryFactory = builder.streamFactoryFactory;
-        codecRegistry = builder.codecRegistry;
-        commandListeners = builder.commandListeners;
-        clusterSettings = builder.clusterSettings;
-        serverSettings = builder.serverSettings;
-        socketSettings = builder.socketSettings;
-        heartbeatSocketSettings = builder.heartbeatSocketSettings;
-        connectionPoolSettings = builder.connectionPoolSettings;
-        sslSettings = builder.sslSettings;
+        heartbeatSocketSettings = builder.heartbeatSocketSettingsBuilder != null ?  builder.heartbeatSocketSettingsBuilder.build() : null;
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoClients.java b/driver-async/src/main/com/mongodb/async/client/MongoClients.java
index 25bb2d018ae..4a93e4c2e36 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoClients.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoClients.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,37 +17,30 @@
 package com.mongodb.async.client;
 
 import com.mongodb.ConnectionString;
-import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider;
-import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.MongoInternalException;
+import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory;
 import com.mongodb.connection.Cluster;
-import com.mongodb.connection.ClusterSettings;
-import com.mongodb.connection.ConnectionPoolSettings;
 import com.mongodb.connection.DefaultClusterFactory;
-import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.SslSettings;
 import com.mongodb.connection.StreamFactory;
-import com.mongodb.connection.netty.NettyStreamFactoryFactory;
-import com.mongodb.event.CommandEventMulticaster;
-import com.mongodb.event.CommandListener;
-import com.mongodb.management.JMXConnectionPoolListener;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.DocumentCodecProvider;
-import org.bson.codecs.IterableCodecProvider;
-import org.bson.codecs.ValueCodecProvider;
+import com.mongodb.connection.StreamFactoryFactory;
+import com.mongodb.connection.TlsChannelStreamFactoryFactory;
+import com.mongodb.lang.Nullable;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import java.util.List;
+import java.io.Closeable;
 
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.event.EventListenerHelper.getCommandListener;
 
 /**
  * A factory for MongoClient instances.
  *
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public final class MongoClients {
 
     /**
@@ -64,9 +57,11 @@ public static MongoClient create() {
      *
      * @param settings the settings
      * @return the client
+     * @deprecated use {@link #create(com.mongodb.MongoClientSettings)} instead
      */
+    @Deprecated
     public static MongoClient create(final MongoClientSettings settings) {
-        return new MongoClientImpl(settings, createCluster(settings, getStreamFactory(settings)));
+        return create(settings, null);
     }
 
     /**
@@ -83,13 +78,13 @@ public static MongoClient create(final String connectionString) {
     /**
      * Create a new client with the given connection string.
      * <p>
-     * For each of the settings classed configurable via {@link MongoClientSettings}, the connection string is applied by calling the
-     * {@code applyConnectionString} method on an instance of setting's builder class, building the setting, and adding it to an instance of
-     * {@link com.mongodb.async.client.MongoClientSettings.Builder}.
+     * For each of the settings classed configurable via {@link com.mongodb.MongoClientSettings}, the connection string is applied by
+     * calling the {@code applyConnectionString} method on an instance of setting's builder class, building the setting, and adding it to
+     * an instance of {@link com.mongodb.MongoClientSettings.Builder}.
      * </p>
      * <p>
      * The connection string's stream type is then applied by setting the
-     * {@link com.mongodb.connection.StreamFactoryFactory} to an instance of {@link NettyStreamFactoryFactory},
+     * {@link com.mongodb.connection.StreamFactory} to an instance of NettyStreamFactory,
      * </p>
      *
      * @param connectionString the settings
@@ -97,7 +92,7 @@ public static MongoClient create(final String connectionString) {
      * @throws IllegalArgumentException if the connection string's stream type is not one of "netty" or "nio2"
      *
      * @see ConnectionString#getStreamType()
-     * @see com.mongodb.async.client.MongoClientSettings.Builder
+     * @see com.mongodb.MongoClientSettings.Builder
      * @see com.mongodb.connection.ClusterSettings.Builder#applyConnectionString(ConnectionString)
      * @see com.mongodb.connection.ConnectionPoolSettings.Builder#applyConnectionString(ConnectionString)
      * @see com.mongodb.connection.ServerSettings.Builder#applyConnectionString(ConnectionString)
@@ -105,84 +100,193 @@ public static MongoClient create(final String connectionString) {
      * @see com.mongodb.connection.SocketSettings.Builder#applyConnectionString(ConnectionString)
      */
     public static MongoClient create(final ConnectionString connectionString) {
-        MongoClientSettings.Builder builder = MongoClientSettings.builder()
-                                         .clusterSettings(ClusterSettings.builder()
-                                                                         .applyConnectionString(connectionString)
-                                                                         .build())
-                                         .connectionPoolSettings(ConnectionPoolSettings.builder()
-                                                                                       .applyConnectionString(connectionString)
-                                                                                       .build())
-                                         .serverSettings(ServerSettings.builder()
-                                                                       .applyConnectionString(connectionString)
-                                                                       .build())
-                                         .credentialList(connectionString.getCredentialList())
-                                         .sslSettings(SslSettings.builder()
-                                                                 .applyConnectionString(connectionString)
-                                                                 .build())
-                                         .socketSettings(SocketSettings.builder()
-                                                                       .applyConnectionString(connectionString)
-                                                                       .build());
-        if (connectionString.getStreamType() != null) {
-            if (connectionString.getStreamType().toLowerCase().equals("netty")) {
-                builder.streamFactoryFactory(NettyStreamFactoryFactory.builder().build());
-            } else if (!connectionString.getStreamType().toLowerCase().equals("nio2")) {
-                throw new IllegalArgumentException(format("Unsupported stream type %s", connectionString.getStreamType()));
-            }
+        return create(connectionString, null);
+    }
+
+    /**
+     * Creates a new client with the given client settings.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param settings               the settings
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @return the client
+     * @since 3.4
+     * @deprecated use {@link #create(com.mongodb.MongoClientSettings, MongoDriverInformation)} instead
+     */
+    @Deprecated
+    public static MongoClient create(final MongoClientSettings settings, @Nullable final MongoDriverInformation mongoDriverInformation) {
+        return create(settings, mongoDriverInformation, null);
+    }
+
+    /**
+     * Create a new client with the given connection string.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param connectionString       the settings
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @return the client
+     * @throws IllegalArgumentException if the connection string's stream type is not one of "netty" or "nio2"
+     * @see MongoClients#create(ConnectionString)
+     */
+    public static MongoClient create(final ConnectionString connectionString,
+                                     @Nullable final MongoDriverInformation mongoDriverInformation) {
+
+        return create(MongoClientSettings.builder().applyConnectionString(connectionString).build(),
+                mongoDriverInformation, connectionString.getStreamType());
+    }
+
+    /**
+     * Create a new client with the given client settings.
+     *
+     * @param settings the settings
+     * @return the client
+     * @since 3.7
+     */
+    public static MongoClient create(final com.mongodb.MongoClientSettings settings) {
+        return create(settings, null);
+    }
+
+    /**
+     * Creates a new client with the given client settings.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param settings               the settings
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @return the client
+     * @since 3.7
+     */
+    public static MongoClient create(final com.mongodb.MongoClientSettings settings,
+                                     @Nullable final MongoDriverInformation mongoDriverInformation) {
+        return create(MongoClientSettings.createFromClientSettings(settings), mongoDriverInformation, null);
+    }
+
+    private static MongoClient create(final MongoClientSettings settings,
+                                      @Nullable final MongoDriverInformation mongoDriverInformation,
+                                      @Nullable final String requestedStreamType) {
+        String streamType = getStreamType(requestedStreamType);
+        if (settings.getStreamFactoryFactory() == null) {
+           if (isNetty(streamType)) {
+               return NettyMongoClients.create(settings, mongoDriverInformation);
+           } else if (isNio(streamType)) {
+               if (settings.getSslSettings().isEnabled()) {
+                   return createWithTlsChannel(settings, mongoDriverInformation);
+               } else {
+                   return createWithAsynchronousSocketChannel(settings, mongoDriverInformation);
+               }
+           } else {
+               throw new IllegalArgumentException("Unsupported stream type: " + streamType);
+           }
+        } else {
+            return createMongoClient(settings, mongoDriverInformation, getStreamFactory(settings, false),
+                    getStreamFactory(settings, true), null);
         }
-        return create(builder.build());
+    }
+
+    static MongoClient createMongoClient(final MongoClientSettings settings, @Nullable final MongoDriverInformation mongoDriverInformation,
+                                         final StreamFactory streamFactory, final StreamFactory heartbeatStreamFactory,
+                                         @Nullable final Closeable externalResourceCloser) {
+        return new MongoClientImpl(settings, createCluster(settings, mongoDriverInformation, streamFactory, heartbeatStreamFactory),
+                externalResourceCloser);
+    }
+
+    private static Cluster createCluster(final MongoClientSettings settings, @Nullable final MongoDriverInformation mongoDriverInformation,
+                                         final StreamFactory streamFactory, final StreamFactory heartbeatStreamFactory) {
+        notNull("settings", settings);
+        MongoDriverInformation.Builder builder = mongoDriverInformation == null ? MongoDriverInformation.builder()
+                : MongoDriverInformation.builder(mongoDriverInformation);
+        return new DefaultClusterFactory().createCluster(settings.getClusterSettings(), settings.getServerSettings(),
+                settings.getConnectionPoolSettings(), streamFactory, heartbeatStreamFactory, settings.getCredentialList(),
+                getCommandListener(settings.getCommandListeners()), settings.getApplicationName(), builder.driverName("async").build(),
+                settings.getCompressorList());
     }
 
     /**
      * Gets the default codec registry.  It includes the following providers:
      *
      * <ul>
-     *     <li>{@link org.bson.codecs.ValueCodecProvider}</li>
-     *     <li>{@link org.bson.codecs.DocumentCodecProvider}</li>
-     *     <li>{@link org.bson.codecs.BsonValueCodecProvider}</li>
-     *     <li>{@link com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider}</li>
+     * <li>{@link org.bson.codecs.ValueCodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonValueCodecProvider}</li>
+     * <li>{@link com.mongodb.DBRefCodecProvider}</li>
+     * <li>{@link com.mongodb.DBObjectCodecProvider}</li>
+     * <li>{@link org.bson.codecs.DocumentCodecProvider}</li>
+     * <li>{@link org.bson.codecs.IterableCodecProvider}</li>
+     * <li>{@link org.bson.codecs.MapCodecProvider}</li>
+     * <li>{@link com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider}</li>
+     * <li>{@link com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider}</li>
+     * <li>{@link org.bson.codecs.jsr310.Jsr310CodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonCodecProvider}</li>
      * </ul>
      *
      * @return the default codec registry
-     * @see MongoClientSettings#getCodecRegistry()
+     * @see com.mongodb.MongoClientSettings#getCodecRegistry()
      * @since 3.1
      */
     public static CodecRegistry getDefaultCodecRegistry() {
-        return MongoClients.DEFAULT_CODEC_REGISTRY;
+        return com.mongodb.MongoClientSettings.getDefaultCodecRegistry();
     }
 
-    private static final CodecRegistry DEFAULT_CODEC_REGISTRY =
-            fromProviders(asList(new ValueCodecProvider(),
-                    new DocumentCodecProvider(),
-                    new BsonValueCodecProvider(),
-                    new IterableCodecProvider(),
-                    new GeoJsonCodecProvider(),
-                    new GridFSFileCodecProvider()));
 
-    private static Cluster createCluster(final MongoClientSettings settings, final StreamFactory streamFactory) {
-        StreamFactory heartbeatStreamFactory = getHeartbeatStreamFactory(settings);
-        return new DefaultClusterFactory().create(settings.getClusterSettings(), settings.getServerSettings(),
-                                                  settings.getConnectionPoolSettings(), streamFactory,
-                                                  heartbeatStreamFactory,
-                                                  settings.getCredentialList(), null, new JMXConnectionPoolListener(), null,
-                                                  createCommandListener(settings.getCommandListeners()));
+    private static MongoClient createWithTlsChannel(final MongoClientSettings settings,
+                                                    @Nullable final MongoDriverInformation mongoDriverInformation) {
+        if (!isJava8()) {
+            throw new MongoClientException("TLS is only supported natively with Java 8 and above. Please use Netty instead");
+        }
+        final TlsChannelStreamFactoryFactory streamFactoryFactory = new TlsChannelStreamFactoryFactory();
+        StreamFactory streamFactory = streamFactoryFactory.create(settings.getSocketSettings(), settings.getSslSettings());
+        StreamFactory heartbeatStreamFactory = streamFactoryFactory.create(settings.getHeartbeatSocketSettings(),
+                settings.getSslSettings());
+        return createMongoClient(settings, mongoDriverInformation, streamFactory, heartbeatStreamFactory,
+                new Closeable() {
+                    @Override
+                    public void close() {
+                        streamFactoryFactory.close();
+                    }
+                });
+    }
+
+    private static boolean isJava8() {
+        try {
+            Class.forName("java.time.Instant");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
+    private static MongoClient createWithAsynchronousSocketChannel(final MongoClientSettings settings,
+                                                                   @Nullable final MongoDriverInformation mongoDriverInformation) {
+        StreamFactoryFactory streamFactoryFactory = new AsynchronousSocketChannelStreamFactoryFactory();
+        StreamFactory streamFactory = streamFactoryFactory.create(settings.getSocketSettings(), settings.getSslSettings());
+        StreamFactory heartbeatStreamFactory = streamFactoryFactory.create(settings.getHeartbeatSocketSettings(),
+                settings.getSslSettings());
+        return createMongoClient(settings, mongoDriverInformation, streamFactory, heartbeatStreamFactory, null);
+    }
+
+    private static StreamFactory getStreamFactory(final MongoClientSettings settings, final boolean isHeartbeat) {
+        StreamFactoryFactory streamFactoryFactory = settings.getStreamFactoryFactory();
+        if (streamFactoryFactory == null) {
+            throw new MongoInternalException("should not happen");
+        }
+        return streamFactoryFactory.create(isHeartbeat ? settings.getHeartbeatSocketSettings() : settings.getSocketSettings(),
+                settings.getSslSettings());
     }
 
-    private static StreamFactory getHeartbeatStreamFactory(final MongoClientSettings settings) {
-        return settings.getStreamFactoryFactory().create(settings.getHeartbeatSocketSettings(), settings.getSslSettings());
+    private static boolean isNetty(final String streamType) {
+        return streamType.toLowerCase().equals("netty");
     }
 
-    private static StreamFactory getStreamFactory(final MongoClientSettings settings) {
-        return settings.getStreamFactoryFactory().create(settings.getSocketSettings(), settings.getSslSettings());
+    private static boolean isNio(final String streamType) {
+        return streamType.toLowerCase().equals("nio2");
     }
 
-    private static CommandListener createCommandListener(final List<CommandListener> commandListeners) {
-        switch (commandListeners.size()) {
-            case 0:
-                return null;
-            case 1:
-                return commandListeners.get(0);
-            default:
-                return new CommandEventMulticaster(commandListeners);
+    private static String getStreamType(@Nullable final String requestedStreamType) {
+        if (requestedStreamType != null) {
+            return requestedStreamType;
+        } else {
+            return System.getProperty("org.mongodb.async.type", "nio2");
         }
     }
 
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoCollection.java b/driver-async/src/main/com/mongodb/async/client/MongoCollection.java
index 69ce101f153..0b9438cefec 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoCollection.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,10 @@
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.model.BulkWriteOptions;
 import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.CreateIndexOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropIndexOptions;
+import com.mongodb.client.model.EstimatedDocumentCountOptions;
 import com.mongodb.client.model.FindOneAndDeleteOptions;
 import com.mongodb.client.model.FindOneAndReplaceOptions;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
@@ -33,6 +37,7 @@
 import com.mongodb.client.model.InsertManyOptions;
 import com.mongodb.client.model.InsertOneOptions;
 import com.mongodb.client.model.RenameCollectionOptions;
+import com.mongodb.client.model.ReplaceOptions;
 import com.mongodb.client.model.UpdateOptions;
 import com.mongodb.client.model.WriteModel;
 import com.mongodb.client.result.DeleteResult;
@@ -55,8 +60,10 @@
  *
  * @param <TDocument> The type that this collection will encode documents from and decode documents to.
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
 @ThreadSafe
+@Deprecated
 public interface MongoCollection<TDocument> {
 
     /**
@@ -152,7 +159,9 @@ public interface MongoCollection<TDocument> {
      * Counts the number of documents in the collection.
      *
      * @param callback the callback passed the number of documents in the collection
+     * @deprecated use {@link #estimatedDocumentCount(SingleResultCallback)} or {@link #countDocuments(SingleResultCallback)} instead
      */
+    @Deprecated
     void count(SingleResultCallback<Long> callback);
 
     /**
@@ -160,7 +169,9 @@ public interface MongoCollection<TDocument> {
      *
      * @param filter   the query filter
      * @param callback the callback passed the number of documents in the collection
+     * @deprecated use {@link #countDocuments(Bson, SingleResultCallback)} instead
      */
+    @Deprecated
     void count(Bson filter, SingleResultCallback<Long> callback);
 
     /**
@@ -169,9 +180,230 @@ public interface MongoCollection<TDocument> {
      * @param filter   the query filter
      * @param options  the options describing the count
      * @param callback the callback passed the number of documents in the collection
+     * @deprecated use {@link #countDocuments(Bson, CountOptions, SingleResultCallback)} instead
      */
+    @Deprecated
     void count(Bson filter, CountOptions options, SingleResultCallback<Long> callback);
 
+    /**
+     * Counts the number of documents in the collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated use {@link #estimatedDocumentCount(SingleResultCallback)} or
+     * {@link #countDocuments(ClientSession, SingleResultCallback)} instead
+     */
+    @Deprecated
+    void count(ClientSession clientSession, SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated use {@link #countDocuments(ClientSession, Bson, SingleResultCallback)} instead
+     */
+    @Deprecated
+    void count(ClientSession clientSession, Bson filter, SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter
+     * @param options  the options describing the count
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated use {@link #countDocuments(ClientSession, Bson, CountOptions, SingleResultCallback)} instead
+     */
+    @Deprecated
+    void count(ClientSession clientSession, Bson filter, CountOptions options, SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount(SingleResultCallback)}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     */
+    void countDocuments(SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount(SingleResultCallback)}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param filter the query filter
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     */
+    void countDocuments(Bson filter, SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount(SingleResultCallback)}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param filter  the query filter
+     * @param options the options describing the count
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     */
+    void countDocuments(Bson filter, CountOptions options, SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount(SingleResultCallback)}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    void countDocuments(ClientSession clientSession, SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount(SingleResultCallback)}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    void countDocuments(ClientSession clientSession, Bson filter, SingleResultCallback<Long> callback);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount(SingleResultCallback)}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  the query filter
+     * @param options the options describing the count
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    void countDocuments(ClientSession clientSession, Bson filter, CountOptions options, SingleResultCallback<Long> callback);
+
+    /**
+     * Gets an estimate of the count of documents in a collection using collection metadata.
+     *
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     */
+    void estimatedDocumentCount(SingleResultCallback<Long> callback);
+
+    /**
+     * Gets an estimate of the count of documents in a collection using collection metadata.
+     *
+     * @param options the options describing the count
+     * @param callback the callback passed the number of documents in the collection
+     * @since 3.8
+     */
+    void estimatedDocumentCount(EstimatedDocumentCountOptions options, SingleResultCallback<Long> callback);
+
     /**
      * Gets the distinct values of the specified field name.
      *
@@ -195,6 +427,35 @@ public interface MongoCollection<TDocument> {
      */
     <TResult> DistinctIterable<TResult> distinct(String fieldName, Bson filter, Class<TResult> resultClass);
 
+    /**
+     * Gets the distinct values of the specified field name.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param fieldName   the field name
+     * @param resultClass the default class to cast any distinct items into.
+     * @param <TResult>   the target type of the iterable.
+     * @return an iterable of distinct values
+     * @mongodb.driver.manual reference/command/distinct/ Distinct
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> DistinctIterable<TResult> distinct(ClientSession clientSession, String fieldName, Class<TResult> resultClass);
+
+    /**
+     * Gets the distinct values of the specified field name.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param fieldName   the field name
+     * @param filter      the query filter
+     * @param resultClass the default class to cast any distinct items into.
+     * @param <TResult>   the target type of the iterable.
+     * @return an iterable of distinct values
+     * @mongodb.driver.manual reference/command/distinct/ Distinct
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> DistinctIterable<TResult> distinct(ClientSession clientSession, String fieldName, Bson filter, Class<TResult> resultClass);
+
     /**
      * Finds all documents in the collection.
      *
@@ -234,7 +495,57 @@ public interface MongoCollection<TDocument> {
     <TResult> FindIterable<TResult> find(Bson filter, Class<TResult> resultClass);
 
     /**
-     * Aggregates documents according to the specified aggregation pipeline.  If the pipeline ends with a $out stage, the returned
+     * Finds all documents in the collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    FindIterable<TDocument> find(ClientSession clientSession);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> FindIterable<TResult> find(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter the query filter
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    FindIterable<TDocument> find(ClientSession clientSession, Bson filter);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter      the query filter
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> FindIterable<TResult> find(ClientSession clientSession, Bson filter, Class<TResult> resultClass);
+
+    /**
+     * Aggregates documents according to the specified aggregation pipeline.  If the pipeline ends with a $out or $merge stage, the returned
      * iterable will be a query of the collection that the aggregation was written to.  Note that in this case the pipeline will be
      * executed even if the iterable is never iterated.
      *
@@ -245,7 +556,7 @@ public interface MongoCollection<TDocument> {
     AggregateIterable<TDocument> aggregate(List<? extends Bson> pipeline);
 
     /**
-     * Aggregates documents according to the specified aggregation pipeline.  If the pipeline ends with a $out stage, the returned
+     * Aggregates documents according to the specified aggregation pipeline.  If the pipeline ends with a $out or $merge stage, the returned
      * iterable will be a query of the collection that the aggregation was written to.  Note that in this case the pipeline will be
      * executed even if the iterable is never iterated.
      *
@@ -257,6 +568,132 @@ public interface MongoCollection<TDocument> {
      */
     <TResult> AggregateIterable<TResult> aggregate(List<? extends Bson> pipeline, Class<TResult> resultClass);
 
+    /**
+     * Aggregates documents according to the specified aggregation pipeline.  If the pipeline ends with a $out or $merge stage, the returned
+     * iterable will be a query of the collection that the aggregation was written to.  Note that in this case the pipeline will be
+     * executed even if the iterable is never iterated.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param pipeline the aggregate pipeline
+     * @return an iterable containing the result of the aggregation operation
+     * @mongodb.driver.manual aggregation/ Aggregation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<TDocument> aggregate(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Aggregates documents according to the specified aggregation pipeline.  If the pipeline ends with a $out or $merge stage, the returned
+     * iterable will be a query of the collection that the aggregation was written to.  Note that in this case the pipeline will be
+     * executed even if the iterable is never iterated.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param pipeline    the aggregate pipeline
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return an iterable containing the result of the aggregation operation
+     * @mongodb.driver.manual aggregation/ Aggregation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> AggregateIterable<TResult> aggregate(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ChangeStreamIterable<TDocument> watch();
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param pipeline the aggregation pipeline to apply to the change stream
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ChangeStreamIterable<TDocument> watch(List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @return the change stream iterable
+     * @mongodb.driver.manual reference/operator/aggregation/changeStream $changeStream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ChangeStreamIterable<TDocument> watch(ClientSession clientSession);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.manual reference/operator/aggregation/changeStream $changeStream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline to apply to the change stream
+     * @return the change stream iterable
+     * @mongodb.driver.manual reference/operator/aggregation/changeStream $changeStream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ChangeStreamIterable<TDocument> watch(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.manual reference/operator/aggregation/changeStream $changeStream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
     /**
      * Aggregates documents according to the specified map-reduce function.
      *
@@ -279,55 +716,174 @@ public interface MongoCollection<TDocument> {
      */
     <TResult> MapReduceIterable<TResult> mapReduce(String mapFunction, String reduceFunction, Class<TResult> resultClass);
 
+    /**
+     * Aggregates documents according to the specified map-reduce function.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
+     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
+     * @return an iterable containing the result of the map-reduce operation
+     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    MapReduceIterable<TDocument> mapReduce(ClientSession clientSession, String mapFunction, String reduceFunction);
+
+    /**
+     * Aggregates documents according to the specified map-reduce function.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
+     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
+     * @param resultClass    the class to decode each resulting document into.
+     * @param <TResult>      the target document type of the iterable.
+     * @return an iterable containing the result of the map-reduce operation
+     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> MapReduceIterable<TResult> mapReduce(ClientSession clientSession, String mapFunction, String reduceFunction,
+                                                   Class<TResult> resultClass);
     /**
      * Executes a mix of inserts, updates, replaces, and deletes.
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
      * @param requests the writes to execute
      * @param callback the callback passed the result of the bulk write
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      */
     void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, SingleResultCallback<BulkWriteResult> callback);
 
     /**
      * Executes a mix of inserts, updates, replaces, and deletes.
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
      * @param requests the writes to execute
      * @param options  the options to apply to the bulk write operation
      * @param callback the callback passed the result of the bulk write
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      */
     void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWriteOptions options,
                    SingleResultCallback<BulkWriteResult> callback);
 
+    /**
+     * Executes a mix of inserts, updates, replaces, and deletes.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param requests the writes to execute
+     * @param callback the callback passed the result of the bulk write
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void bulkWrite(ClientSession clientSession, List<? extends WriteModel<? extends TDocument>> requests,
+                   SingleResultCallback<BulkWriteResult> callback);
+
+    /**
+     * Executes a mix of inserts, updates, replaces, and deletes.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param requests the writes to execute
+     * @param options  the options to apply to the bulk write operation
+     * @param callback the callback passed the result of the bulk write
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void bulkWrite(ClientSession clientSession, List<? extends WriteModel<? extends TDocument>> requests, BulkWriteOptions options,
+                   SingleResultCallback<BulkWriteResult> callback);
+
     /**
      * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param document the document to insert
      * @param callback the callback that is completed once the insert has completed
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      */
     void insertOne(TDocument document, SingleResultCallback<Void> callback);
 
     /**
      * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param document the document to insert
      * @param options  the options to apply to the operation
      * @param callback the callback that is completed once the insert has completed
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoCommandException      returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      * @since 3.2
      */
     void insertOne(TDocument document, InsertOneOptions options, SingleResultCallback<Void> callback);
 
+    /**
+     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param document the document to insert
+     * @param callback the callback that is completed once the insert has completed
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertOne(ClientSession clientSession, TDocument document, SingleResultCallback<Void> callback);
+
+    /**
+     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param document the document to insert
+     * @param options  the options to apply to the operation
+     * @param callback the callback that is completed once the insert has completed
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertOne(ClientSession clientSession, TDocument document, InsertOneOptions options, SingleResultCallback<Void> callback);
+
     /**
      * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param documents the documents to insert
      * @param callback  the callback that is completed once the insert has completed
      * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoCommandException   via the callback
      * @throws com.mongodb.MongoException          if the write failed due some other failure
      * @see com.mongodb.async.client.MongoCollection#bulkWrite
      */
@@ -336,6 +892,7 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
     /**
      * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param documents the documents to insert
      * @param options   the options to apply to the operation
      * @param callback  the callback that is completed once the insert has completed
@@ -345,117 +902,613 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void insertMany(List<? extends TDocument> documents, InsertManyOptions options, SingleResultCallback<Void> callback);
 
+    /**
+     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param documents the documents to insert
+     * @param callback  the callback that is completed once the insert has completed
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoException          if the write failed due some other failure
+     * @see com.mongodb.async.client.MongoCollection#bulkWrite
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertMany(ClientSession clientSession, List<? extends TDocument> documents, SingleResultCallback<Void> callback);
+
+    /**
+     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param documents the documents to insert
+     * @param options   the options to apply to the operation
+     * @param callback  the callback that is completed once the insert has completed
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoException          if the write failed due some other failure
+     * @see com.mongodb.async.client.MongoCollection#bulkWrite
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertMany(ClientSession clientSession, List<? extends TDocument> documents, InsertManyOptions options,
+                    SingleResultCallback<Void> callback);
+
     /**
      * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
      * modified.
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter   the query filter to apply the the delete operation
      * @param callback the callback passed the result of the remove one operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      */
     void deleteOne(Bson filter, SingleResultCallback<DeleteResult> callback);
 
+    /**
+     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
+     * modified.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter   the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @param callback the callback passed the result of the remove one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     */
+    void deleteOne(Bson filter, DeleteOptions options, SingleResultCallback<DeleteResult> callback);
+
+    /**
+     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
+     * modified.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter to apply the the delete operation
+     * @param callback the callback passed the result of the remove one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void deleteOne(ClientSession clientSession, Bson filter, SingleResultCallback<DeleteResult> callback);
+
+    /**
+     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
+     * modified.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @param callback the callback passed the result of the remove one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void deleteOne(ClientSession clientSession, Bson filter, DeleteOptions options, SingleResultCallback<DeleteResult> callback);
+
     /**
      * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
      *
      * @param filter   the query filter to apply the the delete operation
      * @param callback the callback passed the result of the remove many operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      */
     void deleteMany(Bson filter, SingleResultCallback<DeleteResult> callback);
 
+    /**
+     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
+     *
+     * @param filter   the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @param callback the callback passed the result of the remove many operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     */
+    void deleteMany(Bson filter, DeleteOptions options, SingleResultCallback<DeleteResult> callback);
+
+    /**
+     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter to apply the the delete operation
+     * @param callback the callback passed the result of the remove many operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void deleteMany(ClientSession clientSession, Bson filter, SingleResultCallback<DeleteResult> callback);
+
+    /**
+     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @param callback the callback passed the result of the remove many operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void deleteMany(ClientSession clientSession, Bson filter, DeleteOptions options, SingleResultCallback<DeleteResult> callback);
+
     /**
      * Replace a document in the collection according to the specified arguments.
      *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(Bson, Bson, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter      the query filter to apply the the replace operation
      * @param replacement the replacement document
      * @param callback    the callback passed the result of the replace one operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
      */
     void replaceOne(Bson filter, TDocument replacement, SingleResultCallback<UpdateResult> callback);
 
     /**
      * Replace a document in the collection according to the specified arguments.
      *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(Bson, Bson, UpdateOptions, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter      the query filter to apply the the replace operation
      * @param replacement the replacement document
      * @param options     the options to apply to the replace operation
      * @param callback    the callback passed the result of the replace one operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @deprecated use {@link #replaceOne(Bson, Object, ReplaceOptions, SingleResultCallback)} instead
      */
+    @Deprecated
     void replaceOne(Bson filter, TDocument replacement, UpdateOptions options, SingleResultCallback<UpdateResult> callback);
 
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(Bson, Bson, UpdateOptions, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param options     the options to apply to the replace operation
+     * @param callback    the callback passed the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.7
+     */
+    void replaceOne(Bson filter, TDocument replacement, ReplaceOptions options, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(ClientSession, Bson, Bson, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param callback    the callback passed the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void replaceOne(ClientSession clientSession, Bson filter, TDocument replacement, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(ClientSession, Bson, Bson, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param options     the options to apply to the replace operation
+     * @param callback    the callback passed the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated use {@link #replaceOne(ClientSession, Bson, Object, ReplaceOptions, SingleResultCallback)}
+     */
+    @Deprecated
+    void replaceOne(ClientSession clientSession, Bson filter, TDocument replacement, UpdateOptions options,
+                    SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(ClientSession, Bson, Bson, UpdateOptions, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param options     the options to apply to the replace operation
+     * @param callback    the callback passed the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @mongodb.server.release 3.6
+     * @since 3.7
+     */
+    void replaceOne(ClientSession clientSession, Bson filter, TDocument replacement, ReplaceOptions options,
+                    SingleResultCallback<UpdateResult> callback);
+
     /**
      * Update a single document in the collection according to the specified arguments.
      *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(Bson, Object,
+     * SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter   a document describing the query filter, which may not be null.
-     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
      * @param callback the callback passed the result of the update one operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
      * @mongodb.driver.manual tutorial/modify-documents/ Updates
      * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.async.client.MongoCollection#replaceOne(Bson, Object, SingleResultCallback)
      */
     void updateOne(Bson filter, Bson update, SingleResultCallback<UpdateResult> callback);
 
     /**
      * Update a single document in the collection according to the specified arguments.
      *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(Bson, Object, ReplaceOptions,
+     * SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter   a document describing the query filter, which may not be null.
-     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
+     * @param options  the options to apply to the update operation
+     * @param callback the callback passed the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.async.client.MongoCollection#replaceOne(Bson, Object, UpdateOptions, SingleResultCallback)
+     */
+    void updateOne(Bson filter, Bson update, UpdateOptions options, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(ClientSession, Bson, Object,
+     * SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
+     * @param callback the callback passed the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @see com.mongodb.async.client.MongoCollection#replaceOne(ClientSession, Bson, Object, SingleResultCallback)
+     */
+    void updateOne(ClientSession clientSession, Bson filter, Bson update, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(ClientSession, Bson, Object,
+     * UpdateOptions, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
      * @param options  the options to apply to the update operation
      * @param callback the callback passed the result of the update one operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @see com.mongodb.async.client.MongoCollection#replaceOne(ClientSession, Bson, Object, UpdateOptions, SingleResultCallback)
+     */
+    void updateOne(ClientSession clientSession, Bson filter, Bson update, UpdateOptions options,
+                   SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @param callback the callback passed the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    void updateOne(Bson filter, List<? extends Bson> update, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
+     * @param callback the callback passed the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    void updateOne(Bson filter, List<? extends Bson> update, UpdateOptions updateOptions,
+                           SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @param callback the callback passed the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    void updateOne(ClientSession clientSession, Bson filter, List<? extends Bson> update, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
+     * @param callback the callback passed the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    void updateOne(ClientSession clientSession, Bson filter, List<? extends Bson> update, UpdateOptions updateOptions,
+                   SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators. T
+     * @param callback the callback passed the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    void updateMany(Bson filter, Bson update, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param options  the options to apply to the update operation
+     * @param callback the callback passed the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    void updateMany(Bson filter, Bson update, UpdateOptions options, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators. T
+     * @param callback the callback passed the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void updateMany(ClientSession clientSession, Bson filter, Bson update, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param options  the options to apply to the update operation
+     * @param callback the callback passed the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        via the callback if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException via the callback if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      via the callback if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             via the callback if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void updateMany(ClientSession clientSession, Bson filter, Bson update, UpdateOptions options,
+                    SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @param callback the callback passed the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    void updateMany(Bson filter, List<? extends Bson> update, SingleResultCallback<UpdateResult> callback);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
+     * @param callback the callback passed the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
      * @mongodb.driver.manual tutorial/modify-documents/ Updates
      * @mongodb.driver.manual reference/operator/update/ Update Operators
      */
-    void updateOne(Bson filter, Bson update, UpdateOptions options, SingleResultCallback<UpdateResult> callback);
+    void updateMany(Bson filter, List<? extends Bson> update, UpdateOptions updateOptions, SingleResultCallback<UpdateResult> callback);
 
     /**
      * Update all documents in the collection according to the specified arguments.
      *
-     * @param filter   a document describing the query filter, which may not be null.
-     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators. T
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
      * @param callback the callback passed the result of the update many operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
      * @mongodb.driver.manual tutorial/modify-documents/ Updates
      * @mongodb.driver.manual reference/operator/update/ Update Operators
      */
-    void updateMany(Bson filter, Bson update, SingleResultCallback<UpdateResult> callback);
+    void updateMany(ClientSession clientSession, Bson filter, List<? extends Bson> update, SingleResultCallback<UpdateResult> callback);
 
     /**
      * Update all documents in the collection according to the specified arguments.
      *
-     * @param filter   a document describing the query filter, which may not be null.
-     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators.
-     * @param options  the options to apply to the update operation
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
      * @param callback the callback passed the result of the update many operation
-     * @throws com.mongodb.MongoWriteException        returned via the callback
-     * @throws com.mongodb.MongoWriteConcernException returned via the callback
-     * @throws com.mongodb.MongoException             returned via the callback
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
      * @mongodb.driver.manual tutorial/modify-documents/ Updates
      * @mongodb.driver.manual reference/operator/update/ Update Operators
      */
-    void updateMany(Bson filter, Bson update, UpdateOptions options, SingleResultCallback<UpdateResult> callback);
+    void updateMany(ClientSession clientSession, Bson filter, List<? extends Bson> update, UpdateOptions updateOptions,
+                    SingleResultCallback<UpdateResult> callback);
 
     /**
      * Atomically find a document and remove it.
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter   the query filter to find the document with
      * @param callback the callback passed the document that was removed.  If no documents matched the query filter, then null will be
      *                 returned
@@ -465,6 +1518,7 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
     /**
      * Atomically find a document and remove it.
      *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter   the query filter to find the document with
      * @param options  the options to apply to the operation
      * @param callback the callback passed the document that was removed.  If no documents matched the query filter, then null will be
@@ -472,51 +1526,250 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void findOneAndDelete(Bson filter, FindOneAndDeleteOptions options, SingleResultCallback<TDocument> callback);
 
+    /**
+     * Atomically find a document and remove it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter to find the document with
+     * @param callback the callback passed the document that was removed.  If no documents matched the query filter, then null will be
+     *                 returned
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void findOneAndDelete(ClientSession clientSession, Bson filter, SingleResultCallback<TDocument> callback);
+
+    /**
+     * Atomically find a document and remove it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   the query filter to find the document with
+     * @param options  the options to apply to the operation
+     * @param callback the callback passed the document that was removed.  If no documents matched the query filter, then null will be
+     *                 returned
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void findOneAndDelete(ClientSession clientSession, Bson filter, FindOneAndDeleteOptions options,
+                          SingleResultCallback<TDocument> callback);
+
     /**
      * Atomically find a document and replace it.
      *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(Bson, Bson, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter      the query filter to apply the the replace operation
      * @param replacement the replacement document
      * @param callback    the callback passed the document that was replaced.  Depending on the value of the {@code returnOriginal}
      *                    property, this will either be the document as it was before the update or as it is after the update.  If no
      *                    documents matched the query filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
      */
     void findOneAndReplace(Bson filter, TDocument replacement, SingleResultCallback<TDocument> callback);
 
     /**
      * Atomically find a document and replace it.
      *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(Bson, Bson, FindOneAndUpdateOptions, SingleResultCallback)} method.</p>
+     *
      * @param filter      the query filter to apply the the replace operation
      * @param replacement the replacement document
      * @param options     the options to apply to the operation
      * @param callback    the callback passed the document that was replaced.  Depending on the value of the {@code returnOriginal}
      *                    property, this will either be the document as it was before the update or as it is after the update.  If no
      *                    documents matched the query filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
      */
     void findOneAndReplace(Bson filter, TDocument replacement, FindOneAndReplaceOptions options, SingleResultCallback<TDocument> callback);
 
+    /**
+     * Atomically find a document and replace it.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(ClientSession, Bson, Bson, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param callback    the callback passed the document that was replaced.  Depending on the value of the {@code returnOriginal}
+     *                    property, this will either be the document as it was before the update or as it is after the update.  If no
+     *                    documents matched the query filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void findOneAndReplace(ClientSession clientSession, Bson filter, TDocument replacement, SingleResultCallback<TDocument> callback);
+
+    /**
+     * Atomically find a document and replace it.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(ClientSession, Bson, Bson, FindOneAndUpdateOptions, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param options     the options to apply to the operation
+     * @param callback    the callback passed the document that was replaced.  Depending on the value of the {@code returnOriginal}
+     *                    property, this will either be the document as it was before the update or as it is after the update.  If no
+     *                    documents matched the query filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void findOneAndReplace(ClientSession clientSession, Bson filter, TDocument replacement, FindOneAndReplaceOptions options,
+                           SingleResultCallback<TDocument> callback);
+
     /**
      * Atomically find a document and update it.
      *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(Bson, Object,
+     * SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter   a document describing the query filter, which may not be null.
-     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
      * @param callback the callback passed the document that was updated before the update was applied.  If no documents matched the query
      *                 filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.async.client.MongoCollection#findOneAndReplace(Bson, Object, SingleResultCallback)
      */
     void findOneAndUpdate(Bson filter, Bson update, SingleResultCallback<TDocument> callback);
 
     /**
      * Atomically find a document and update it.
      *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(Bson, Object,
+     * FindOneAndReplaceOptions, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
      * @param filter   a document describing the query filter, which may not be null.
-     * @param update   a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
      * @param options  the options to apply to the operation
      * @param callback the callback passed the document that was updated.  Depending on the value of the {@code returnOriginal} property,
      *                 this will either be the document as it was before the update or as it is after the update.  If no documents matched
      *                 the query filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.async.client.MongoCollection#findOneAndReplace(Bson, Object, FindOneAndReplaceOptions, SingleResultCallback)
      */
     void findOneAndUpdate(Bson filter, Bson update, FindOneAndUpdateOptions options, SingleResultCallback<TDocument> callback);
 
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(ClientSession, Bson,
+     * Object, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
+     * @param callback the callback passed the document that was updated before the update was applied.  If no documents matched the query
+     *                 filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @see com.mongodb.async.client.MongoCollection#findOneAndReplace(ClientSession, Bson, Object, SingleResultCallback)
+     */
+    void findOneAndUpdate(ClientSession clientSession, Bson filter, Bson update, SingleResultCallback<TDocument> callback);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(ClientSession, Bson,
+     * Object, FindOneAndReplaceOptions, SingleResultCallback)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession  the client session with which to associate this operation
+     * @param filter   a document describing the query filter, which may not be null.
+     * @param update   a document describing the update, which may not be null. The update to apply must include at least one update
+     *                operator.
+     * @param options  the options to apply to the operation
+     * @param callback the callback passed the document that was updated.  Depending on the value of the {@code returnOriginal} property,
+     *                 this will either be the document as it was before the update or as it is after the update.  If no documents matched
+     *                 the query filter, then null will be returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @see com.mongodb.async.client.MongoCollection#findOneAndReplace(ClientSession, Bson, Object, FindOneAndReplaceOptions,
+     * SingleResultCallback)
+     */
+    void findOneAndUpdate(ClientSession clientSession, Bson filter, Bson update, FindOneAndUpdateOptions options,
+                          SingleResultCallback<TDocument> callback);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @param callback the callback passed the document that was updated before the update was applied.  If no documents matched the query
+     *                 filter, then null will be returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    void findOneAndUpdate(Bson filter, List<? extends Bson> update, SingleResultCallback<TDocument> callback);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a pipeline describing the update, which may not be null.
+     * @param options the options to apply to the operation
+     * @param callback the callback passed the document that was updated.  Depending on the value of the {@code returnOriginal} property,
+     *                 this will either be the document as it was before the update or as it is after the update.  If no documents matched
+     *                 the query filter, then null will be returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    void findOneAndUpdate(Bson filter, List<? extends Bson> update, FindOneAndUpdateOptions options,
+                          SingleResultCallback<TDocument> callback);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @param callback the callback passed the document that was updated before the update was applied.  If no documents matched the query
+     *                 filter, then null will be returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    void findOneAndUpdate(ClientSession clientSession, Bson filter, List<? extends Bson> update, SingleResultCallback<TDocument> callback);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a pipeline describing the update, which may not be null.
+     * @param options the options to apply to the operation
+     * @param callback the callback passed the document that was updated.  Depending on the value of the {@code returnOriginal} property,
+     *                 this will either be the document as it was before the update or as it is after the update.  If no documents matched
+     *                 the query filter, then null will be returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    void findOneAndUpdate(ClientSession clientSession, Bson filter, List<? extends Bson> update, FindOneAndUpdateOptions options,
+                          SingleResultCallback<TDocument> callback);
+
     /**
      * Drops this collection from the Database.
      *
@@ -525,6 +1778,17 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void drop(SingleResultCallback<Void> callback);
 
+    /**
+     * Drops this collection from the Database.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param callback the callback that is completed once the collection has been dropped
+     * @mongodb.driver.manual reference/command/drop/ Drop Collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void drop(ClientSession clientSession, SingleResultCallback<Void> callback);
+
     /**
      * Creates an index.  If successful, the callback will be executed with the name of the created index as the result.
      *
@@ -545,7 +1809,32 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
     void createIndex(Bson key, IndexOptions options, SingleResultCallback<String> callback);
 
     /**
-     * Create multiple indexes. If successful, the callback will be executed with a list of the namess of the created index as the result.
+     * Creates an index.  If successful, the callback will be executed with the name of the created index as the result.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param key      an object describing the index key(s), which may not be null.
+     * @param callback the callback that is completed once the index has been created
+     * @mongodb.driver.manual reference/command/createIndexes/ Create indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createIndex(ClientSession clientSession, Bson key, SingleResultCallback<String> callback);
+
+    /**
+     * Creates an index.  If successful, the callback will be executed with the name of the created index as the result.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param key      an object describing the index key(s), which may not be null.
+     * @param options  the options for the index
+     * @param callback the callback that is completed once the index has been created
+     * @mongodb.driver.manual reference/command/createIndexes/ Create indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createIndex(ClientSession clientSession, Bson key, IndexOptions options, SingleResultCallback<String> callback);
+
+    /**
+     * Create multiple indexes. If successful, the callback will be executed with a list of the names of the created indexes as the result.
      *
      * @param indexes the list of indexes
      * @param callback the callback that is completed once the indexes has been created
@@ -554,6 +1843,43 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void createIndexes(List<IndexModel> indexes, SingleResultCallback<List<String>> callback);
 
+    /**
+     * Create multiple indexes. If successful, the callback will be executed with a list of the names of the created indexes as the result.
+     *
+     * @param indexes the list of indexes
+     * @param createIndexOptions options to use when creating indexes
+     * @param callback the callback that is completed once the indexes has been created
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     * @since 3.6
+     */
+    void createIndexes(List<IndexModel> indexes, CreateIndexOptions createIndexOptions, SingleResultCallback<List<String>> callback);
+
+    /**
+     * Create multiple indexes. If successful, the callback will be executed with a list of the names of the created indexes as the result.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param indexes the list of indexes
+     * @param callback the callback that is completed once the indexes has been created
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createIndexes(ClientSession clientSession, List<IndexModel> indexes, SingleResultCallback<List<String>> callback);
+
+    /**
+     * Create multiple indexes. If successful, the callback will be executed with a list of the names of the created indexes as the result.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param indexes the list of indexes
+     * @param createIndexOptions options to use when creating indexes
+     * @param callback the callback that is completed once the indexes has been created
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createIndexes(ClientSession clientSession, List<IndexModel> indexes, CreateIndexOptions createIndexOptions,
+                       SingleResultCallback<List<String>> callback);
+
     /**
      * Get all the indexes in this collection.
      *
@@ -572,6 +1898,30 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     <TResult> ListIndexesIterable<TResult> listIndexes(Class<TResult> resultClass);
 
+    /**
+     * Get all the indexes in this collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @return the list indexes iterable interface
+     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ListIndexesIterable<Document> listIndexes(ClientSession clientSession);
+
+    /**
+     * Get all the indexes in this collection.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the list indexes iterable interface
+     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ListIndexesIterable<TResult> listIndexes(ClientSession clientSession, Class<TResult> resultClass);
+
     /**
      * Drops the index given its name.
      *
@@ -581,6 +1931,17 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void dropIndex(String indexName, SingleResultCallback<Void> callback);
 
+    /**
+     * Drops the index given its name.
+     *
+     * @param indexName the name of the index to remove
+     * @param dropIndexOptions options to use when dropping indexes
+     * @param callback  the callback that is completed once the index has been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     */
+    void dropIndex(String indexName, DropIndexOptions dropIndexOptions, SingleResultCallback<Void> callback);
+
     /**
      * Drops the index given the keys used to create it.
      *
@@ -590,6 +1951,68 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void dropIndex(Bson keys, SingleResultCallback<Void> callback);
 
+    /**
+     * Drops the index given the keys used to create it.
+     *
+     * @param keys the keys of the index to remove
+     * @param dropIndexOptions options to use when dropping indexes
+     * @param callback  the callback that is completed once the index has been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     */
+    void dropIndex(Bson keys, DropIndexOptions dropIndexOptions, SingleResultCallback<Void> callback);
+
+    /**
+     * Drops the index given its name.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param indexName the name of the index to remove
+     * @param callback  the callback that is completed once the index has been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void dropIndex(ClientSession clientSession, String indexName, SingleResultCallback<Void> callback);
+
+    /**
+     * Drops the index given its name.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param indexName the name of the index to remove
+     * @param dropIndexOptions options to use when dropping indexes
+     * @param callback  the callback that is completed once the index has been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void dropIndex(ClientSession clientSession, String indexName, DropIndexOptions dropIndexOptions,
+                   SingleResultCallback<Void> callback);
+
+    /**
+     * Drops the index given the keys used to create it.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param keys the keys of the index to remove
+     * @param callback  the callback that is completed once the index has been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void dropIndex(ClientSession clientSession, Bson keys, SingleResultCallback<Void> callback);
+
+    /**
+     * Drops the index given the keys used to create it.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param keys the keys of the index to remove
+     * @param dropIndexOptions options to use when dropping indexes
+     * @param callback  the callback that is completed once the index has been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void dropIndex(ClientSession clientSession, Bson keys, DropIndexOptions dropIndexOptions, SingleResultCallback<Void> callback);
+
     /**
      * Drop all the indexes on this collection, except for the default on _id.
      *
@@ -598,6 +2021,39 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void dropIndexes(SingleResultCallback<Void> callback);
 
+    /**
+     * Drop all the indexes on this collection, except for the default on _id.
+     *
+     * @param dropIndexOptions options to use when dropping indexes
+     * @param callback the callback that is completed once all the indexes have been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     */
+    void dropIndexes(DropIndexOptions dropIndexOptions, SingleResultCallback<Void> callback);
+
+    /**
+     * Drop all the indexes on this collection, except for the default on _id.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param callback the callback that is completed once all the indexes have been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void dropIndexes(ClientSession clientSession, SingleResultCallback<Void> callback);
+
+    /**
+     * Drop all the indexes on this collection, except for the default on _id.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param dropIndexOptions options to use when dropping indexes
+     * @param callback the callback that is completed once all the indexes have been dropped
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void dropIndexes(ClientSession clientSession, DropIndexOptions dropIndexOptions, SingleResultCallback<Void> callback);
+
     /**
      * Rename the collection with oldCollectionName to the newCollectionName.
      *
@@ -621,4 +2077,34 @@ void bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWri
      */
     void renameCollection(MongoNamespace newCollectionNamespace, RenameCollectionOptions options, SingleResultCallback<Void> callback);
 
+    /**
+     * Rename the collection with oldCollectionName to the newCollectionName.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param newCollectionNamespace the namespace the collection will be renamed to
+     * @param callback               the callback that is completed once the collection has been renamed
+     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection, or if the
+     *                                          oldCollectionName is the name of a collection that doesn't exist
+     * @mongodb.driver.manual reference/command/renameCollection Rename collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void renameCollection(ClientSession clientSession, MongoNamespace newCollectionNamespace, SingleResultCallback<Void> callback);
+
+    /**
+     * Rename the collection with oldCollectionName to the newCollectionName.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param newCollectionNamespace the name the collection will be renamed to
+     * @param options                the options for renaming a collection
+     * @param callback               the callback that is completed once the collection has been renamed
+     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection and dropTarget
+     *                                          is false, or if the oldCollectionName is the name of a collection that doesn't exist
+     * @mongodb.driver.manual reference/command/renameCollection Rename collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void renameCollection(ClientSession clientSession, MongoNamespace newCollectionNamespace, RenameCollectionOptions options,
+                          SingleResultCallback<Void> callback);
+
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java b/driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java
index 6dd672430cf..77ca20760c4 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,85 +28,82 @@
 import com.mongodb.WriteError;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.bulk.IndexRequest;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.bulk.UpdateRequest;
 import com.mongodb.bulk.WriteRequest;
+import com.mongodb.client.model.AggregationLevel;
 import com.mongodb.client.model.BulkWriteOptions;
 import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.DeleteManyModel;
-import com.mongodb.client.model.DeleteOneModel;
+import com.mongodb.client.model.CreateIndexOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropIndexOptions;
+import com.mongodb.client.model.EstimatedDocumentCountOptions;
 import com.mongodb.client.model.FindOneAndDeleteOptions;
 import com.mongodb.client.model.FindOneAndReplaceOptions;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.FindOptions;
 import com.mongodb.client.model.IndexModel;
 import com.mongodb.client.model.IndexOptions;
 import com.mongodb.client.model.InsertManyOptions;
-import com.mongodb.client.model.InsertOneModel;
 import com.mongodb.client.model.InsertOneOptions;
 import com.mongodb.client.model.RenameCollectionOptions;
-import com.mongodb.client.model.ReplaceOneModel;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.model.UpdateManyModel;
-import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.ReplaceOptions;
 import com.mongodb.client.model.UpdateOptions;
 import com.mongodb.client.model.WriteModel;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.CountOperation;
-import com.mongodb.operation.CreateIndexesOperation;
-import com.mongodb.operation.DropCollectionOperation;
-import com.mongodb.operation.DropIndexOperation;
-import com.mongodb.operation.FindAndDeleteOperation;
-import com.mongodb.operation.FindAndReplaceOperation;
-import com.mongodb.operation.FindAndUpdateOperation;
-import com.mongodb.operation.MixedBulkWriteOperation;
-import com.mongodb.operation.RenameCollectionOperation;
+import com.mongodb.internal.client.model.CountStrategy;
+import com.mongodb.internal.operation.AsyncOperations;
+import com.mongodb.internal.operation.IndexHelper;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncWriteOperation;
 import org.bson.BsonDocument;
-import org.bson.BsonDocumentWrapper;
-import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.Document;
-import org.bson.codecs.Codec;
-import org.bson.codecs.CollectibleCodec;
+import org.bson.UuidRepresentation;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static java.lang.String.format;
+import static com.mongodb.bulk.WriteRequest.Type.DELETE;
+import static com.mongodb.bulk.WriteRequest.Type.INSERT;
+import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
+import static com.mongodb.bulk.WriteRequest.Type.UPDATE;
+import static com.mongodb.client.model.ReplaceOptions.createReplaceOptions;
+import static com.mongodb.internal.client.model.CountOptionsHelper.fromEstimatedDocumentCountOptions;
 import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.bson.internal.CodecRegistryHelper.createRegistry;
 
 class MongoCollectionImpl<TDocument> implements MongoCollection<TDocument> {
-    private static final Logger LOGGER = Loggers.getLogger("client");
     private final MongoNamespace namespace;
     private final Class<TDocument> documentClass;
     private final ReadPreference readPreference;
     private final CodecRegistry codecRegistry;
     private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private final boolean retryReads;
     private final ReadConcern readConcern;
-    private final AsyncOperationExecutor executor;
+    private final UuidRepresentation uuidRepresentation;
+    private final OperationExecutor executor;
+    private final AsyncOperations<TDocument> operations;
 
     MongoCollectionImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final CodecRegistry codecRegistry,
-                        final ReadPreference readPreference, final WriteConcern writeConcern, final ReadConcern readConcern,
-                        final AsyncOperationExecutor executor) {
+                        final ReadPreference readPreference, final WriteConcern writeConcern, final boolean retryWrites,
+                        final boolean retryReads, final ReadConcern readConcern, final UuidRepresentation uuidRepresentation,
+                        final OperationExecutor executor) {
         this.namespace = notNull("namespace", namespace);
         this.documentClass = notNull("documentClass", documentClass);
         this.codecRegistry = notNull("codecRegistry", codecRegistry);
         this.readPreference = notNull("readPreference", readPreference);
         this.writeConcern = notNull("writeConcern", writeConcern);
+        this.retryWrites = retryWrites;
+        this.retryReads = retryReads;
         this.readConcern = notNull("readConcern", readConcern);
+        this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
         this.executor = notNull("executor", executor);
+        this.operations = new AsyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                retryWrites, retryReads);
     }
 
     @Override
@@ -141,57 +138,117 @@ public ReadConcern getReadConcern() {
 
     @Override
     public <NewTDocument> MongoCollection<NewTDocument> withDocumentClass(final Class<NewTDocument> newDocumentClass) {
-        return new MongoCollectionImpl<NewTDocument>(namespace, newDocumentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
+        return new MongoCollectionImpl<NewTDocument>(namespace, newDocumentClass, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
     }
 
     @Override
     public MongoCollection<TDocument> withCodecRegistry(final CodecRegistry codecRegistry) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, createRegistry(codecRegistry, uuidRepresentation),
+                readPreference, writeConcern, retryWrites, retryReads, readConcern, uuidRepresentation, executor);
     }
 
     @Override
     public MongoCollection<TDocument> withReadPreference(final ReadPreference readPreference) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-            executor);
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
     }
 
     @Override
     public MongoCollection<TDocument> withWriteConcern(final WriteConcern writeConcern) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
     }
 
     @Override
     public MongoCollection<TDocument> withReadConcern(final ReadConcern readConcern) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void count(final SingleResultCallback<Long> callback) {
-        count(new BsonDocument(), new CountOptions(), callback);
+        count(new BsonDocument(), callback);
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void count(final Bson filter, final SingleResultCallback<Long> callback) {
         count(filter, new CountOptions(), callback);
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void count(final Bson filter, final CountOptions options, final SingleResultCallback<Long> callback) {
-        CountOperation operation = new CountOperation(namespace)
-                                   .filter(toBsonDocument(filter))
-                                   .skip(options.getSkip())
-                                   .limit(options.getLimit())
-                                   .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS);
-        if (options.getHint() != null) {
-            operation.hint(toBsonDocument(options.getHint()));
-        } else if (options.getHintString() != null) {
-            operation.hint(new BsonString(options.getHintString()));
-        }
-        executor.execute(operation, readPreference, callback);
+        executeCount(null, filter, options, CountStrategy.COMMAND, callback);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void count(final ClientSession clientSession, final SingleResultCallback<Long> callback) {
+        count(clientSession, new BsonDocument(), callback);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void count(final ClientSession clientSession, final Bson filter, final SingleResultCallback<Long> callback) {
+        count(clientSession, filter, new CountOptions(), callback);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void count(final ClientSession clientSession, final Bson filter, final CountOptions options,
+                      final SingleResultCallback<Long> callback) {
+        notNull("clientSession", clientSession);
+        executeCount(clientSession, filter, options, CountStrategy.COMMAND, callback);
+    }
+
+    @Override
+    public void countDocuments(final SingleResultCallback<Long> callback) {
+        countDocuments(new BsonDocument(), callback);
+    }
+
+    @Override
+    public void countDocuments(final Bson filter, final SingleResultCallback<Long> callback) {
+        countDocuments(filter, new CountOptions(), callback);
+    }
+
+    @Override
+    public void countDocuments(final Bson filter, final CountOptions options, final SingleResultCallback<Long> callback) {
+        executeCount(null, filter, options, CountStrategy.AGGREGATE, callback);
+    }
+
+    @Override
+    public void countDocuments(final ClientSession clientSession, final SingleResultCallback<Long> callback) {
+        countDocuments(clientSession, new BsonDocument(), callback);
+    }
+
+    @Override
+    public void countDocuments(final ClientSession clientSession, final Bson filter, final SingleResultCallback<Long> callback) {
+        countDocuments(clientSession, filter, new CountOptions(), callback);
+    }
+
+    @Override
+    public void countDocuments(final ClientSession clientSession, final Bson filter, final CountOptions options,
+                               final SingleResultCallback<Long> callback) {
+        notNull("clientSession", clientSession);
+        executeCount(clientSession, filter, options, CountStrategy.AGGREGATE, callback);
+    }
+
+    @Override
+    public void estimatedDocumentCount(final SingleResultCallback<Long> callback) {
+        estimatedDocumentCount(new EstimatedDocumentCountOptions(), callback);
+    }
+
+    @Override
+    public void estimatedDocumentCount(final EstimatedDocumentCountOptions options, final SingleResultCallback<Long> callback) {
+        executeCount(null, new BsonDocument(), fromEstimatedDocumentCountOptions(options), CountStrategy.COMMAND, callback);
+    }
+
+    private void executeCount(@Nullable final ClientSession clientSession, final Bson filter, final CountOptions options,
+                              final CountStrategy countStrategy, final SingleResultCallback<Long> callback) {
+        executor.execute(operations.count(filter, options, countStrategy), readPreference, readConcern, clientSession, callback);
     }
 
     @Override
@@ -201,8 +258,26 @@ public <TResult> DistinctIterable<TResult> distinct(final String fieldName, fina
 
     @Override
     public <TResult> DistinctIterable<TResult> distinct(final String fieldName, final Bson filter, final Class<TResult> resultClass) {
-        return new DistinctIterableImpl<TDocument, TResult>(namespace, documentClass, resultClass, codecRegistry, readPreference,
-                readConcern, executor, fieldName, filter);
+        return createDistinctIterable(null, fieldName, filter, resultClass);
+    }
+
+    @Override
+    public <TResult> DistinctIterable<TResult> distinct(final ClientSession clientSession, final String fieldName,
+                                                        final Class<TResult> resultClass) {
+        return distinct(clientSession, fieldName, new BsonDocument(), resultClass);
+    }
+
+    @Override
+    public <TResult> DistinctIterable<TResult> distinct(final ClientSession clientSession, final String fieldName, final Bson filter,
+                                                        final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createDistinctIterable(clientSession, fieldName, filter, resultClass);
+    }
+
+    private <TResult> DistinctIterable<TResult> createDistinctIterable(@Nullable final ClientSession clientSession, final String fieldName,
+                                                                       final Bson filter, final Class<TResult> resultClass) {
+        return new DistinctIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, fieldName, filter, retryReads);
     }
 
     @Override
@@ -222,8 +297,34 @@ public FindIterable<TDocument> find(final Bson filter) {
 
     @Override
     public <TResult> FindIterable<TResult> find(final Bson filter, final Class<TResult> resultClass) {
-        return new FindIterableImpl<TDocument, TResult>(namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern,
-                executor, filter, new FindOptions());
+        return createFindIterable(null, filter, resultClass);
+    }
+
+    @Override
+    public FindIterable<TDocument> find(final ClientSession clientSession) {
+        return find(clientSession, new BsonDocument(), documentClass);
+    }
+
+    @Override
+    public <TResult> FindIterable<TResult> find(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return find(clientSession, new BsonDocument(), resultClass);
+    }
+
+    @Override
+    public FindIterable<TDocument> find(final ClientSession clientSession, final Bson filter) {
+        return find(clientSession, filter, documentClass);
+    }
+
+    @Override
+    public <TResult> FindIterable<TResult> find(final ClientSession clientSession, final Bson filter, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createFindIterable(clientSession, filter, resultClass);
+    }
+
+    private <TResult> FindIterable<TResult> createFindIterable(@Nullable final ClientSession clientSession, final Bson filter,
+                                                               final Class<TResult> resultClass) {
+        return new FindIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, filter, retryReads);
     }
 
     @Override
@@ -233,8 +334,75 @@ public AggregateIterable<TDocument> aggregate(final List<? extends Bson> pipelin
 
     @Override
     public <TResult> AggregateIterable<TResult> aggregate(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
-        return new AggregateIterableImpl<TDocument, TResult>(namespace, documentClass, resultClass, codecRegistry, readPreference,
-                readConcern, executor, pipeline);
+        return createAggregateIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public AggregateIterable<TDocument> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return aggregate(clientSession, pipeline, documentClass);
+    }
+
+    @Override
+    public <TResult> AggregateIterable<TResult> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                          final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createAggregateIterable(clientSession, pipeline, resultClass);
+    }
+
+    private <TResult> AggregateIterable<TResult> createAggregateIterable(@Nullable final ClientSession clientSession,
+                                                                         final List<? extends Bson> pipeline,
+                                                                         final Class<TResult> resultClass) {
+        return new AggregateIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, retryReads);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch() {
+        return watch(Collections.<Bson>emptyList());
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final Class<TResult> resultClass) {
+        return watch(Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch(final List<? extends Bson> pipeline) {
+        return watch(pipeline, documentClass);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createChangeStreamIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch(final ClientSession clientSession) {
+        return watch(clientSession, Collections.<Bson>emptyList());
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return watch(clientSession, Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return watch(clientSession, pipeline, documentClass);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                         final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createChangeStreamIterable(clientSession, pipeline, resultClass);
+    }
+
+    private <TResult> ChangeStreamIterable<TResult> createChangeStreamIterable(@Nullable final ClientSession clientSession,
+                                                                               final List<? extends Bson> pipeline,
+                                                                               final Class<TResult> resultClass) {
+        return new ChangeStreamIterableImpl<TResult>(clientSession, namespace, codecRegistry, readPreference, readConcern, executor,
+                pipeline, resultClass, ChangeStreamLevel.COLLECTION, retryReads);
     }
 
     @Override
@@ -245,8 +413,27 @@ public MapReduceIterable<TDocument> mapReduce(final String mapFunction, final St
     @Override
     public <TResult> MapReduceIterable<TResult> mapReduce(final String mapFunction, final String reduceFunction,
                                                           final Class<TResult> resultClass) {
-        return new MapReduceIterableImpl<TDocument, TResult>(namespace, documentClass, resultClass, codecRegistry, readPreference,
-                readConcern, executor, mapFunction, reduceFunction);
+        return createMapReduceIterable(null, mapFunction, reduceFunction, resultClass);
+    }
+
+    @Override
+    public MapReduceIterable<TDocument> mapReduce(final ClientSession clientSession, final String mapFunction,
+                                                  final String reduceFunction) {
+        return mapReduce(clientSession, mapFunction, reduceFunction, documentClass);
+    }
+
+    @Override
+    public <TResult> MapReduceIterable<TResult> mapReduce(final ClientSession clientSession, final String mapFunction,
+                                                          final String reduceFunction, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createMapReduceIterable(clientSession, mapFunction, reduceFunction, resultClass);
+    }
+
+    private <TResult> MapReduceIterable<TResult> createMapReduceIterable(@Nullable final ClientSession clientSession,
+                                                                         final String mapFunction, final String reduceFunction,
+                                                                         final Class<TResult> resultClass) {
+        return new MapReduceIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, mapFunction, reduceFunction);
     }
 
     @Override
@@ -255,52 +442,31 @@ public void bulkWrite(final List<? extends WriteModel<? extends TDocument>> requ
         bulkWrite(requests, new BulkWriteOptions(), callback);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests, final BulkWriteOptions options,
                           final SingleResultCallback<BulkWriteResult> callback) {
-        List<WriteRequest> writeRequests = new ArrayList<WriteRequest>(requests.size());
-        for (WriteModel<? extends TDocument> writeModel : requests) {
-            WriteRequest writeRequest;
-            if (writeModel instanceof InsertOneModel) {
-                TDocument document = ((InsertOneModel<TDocument>) writeModel).getDocument();
-                if (getCodec() instanceof CollectibleCodec) {
-                    ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(document);
-                }
-                writeRequest = new InsertRequest(documentToBsonDocument(document));
-            } else if (writeModel instanceof ReplaceOneModel) {
-                ReplaceOneModel<TDocument> replaceOneModel = (ReplaceOneModel<TDocument>) writeModel;
-                writeRequest = new UpdateRequest(toBsonDocument(replaceOneModel.getFilter()), documentToBsonDocument(replaceOneModel
-                                                                                                                     .getReplacement()),
-                                                 WriteRequest.Type.REPLACE)
-                               .upsert(replaceOneModel.getOptions().isUpsert());
-            } else if (writeModel instanceof UpdateOneModel) {
-                UpdateOneModel<TDocument> updateOneModel = (UpdateOneModel<TDocument>) writeModel;
-                writeRequest = new UpdateRequest(toBsonDocument(updateOneModel.getFilter()), toBsonDocument(updateOneModel.getUpdate()),
-                                                 WriteRequest.Type.UPDATE)
-                               .multi(false)
-                               .upsert(updateOneModel.getOptions().isUpsert());
-            } else if (writeModel instanceof UpdateManyModel) {
-                UpdateManyModel<TDocument> updateManyModel = (UpdateManyModel<TDocument>) writeModel;
-                writeRequest = new UpdateRequest(toBsonDocument(updateManyModel.getFilter()), toBsonDocument(updateManyModel.getUpdate()),
-                                                 WriteRequest.Type.UPDATE)
-                               .multi(true)
-                               .upsert(updateManyModel.getOptions().isUpsert());
-            } else if (writeModel instanceof DeleteOneModel) {
-                DeleteOneModel<TDocument> deleteOneModel = (DeleteOneModel<TDocument>) writeModel;
-                writeRequest = new DeleteRequest(toBsonDocument(deleteOneModel.getFilter())).multi(false);
-            } else if (writeModel instanceof DeleteManyModel) {
-                DeleteManyModel<TDocument> deleteManyModel = (DeleteManyModel<TDocument>) writeModel;
-                writeRequest = new DeleteRequest(toBsonDocument(deleteManyModel.getFilter())).multi(true);
-            } else {
-                throw new UnsupportedOperationException(format("WriteModel of type %s is not supported", writeModel.getClass()));
-            }
+        executeBulkWrite(null, requests, options, callback);
+    }
 
-            writeRequests.add(writeRequest);
-        }
+    @Override
+    public void bulkWrite(final ClientSession clientSession, final List<? extends WriteModel<? extends TDocument>> requests,
+                          final SingleResultCallback<BulkWriteResult> callback) {
+        bulkWrite(clientSession, requests, new BulkWriteOptions(), callback);
+    }
 
-        executor.execute(new MixedBulkWriteOperation(namespace, writeRequests, options.isOrdered(), writeConcern)
-                .bypassDocumentValidation(options.getBypassDocumentValidation()), callback);
+    @Override
+    public void bulkWrite(final ClientSession clientSession, final List<? extends WriteModel<? extends TDocument>> requests,
+                          final BulkWriteOptions options, final SingleResultCallback<BulkWriteResult> callback) {
+        notNull("clientSession", clientSession);
+        executeBulkWrite(clientSession, requests, options, callback);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void executeBulkWrite(@Nullable final ClientSession clientSession,
+                                  final List<? extends WriteModel<? extends TDocument>> requests,
+                                  final BulkWriteOptions options, final SingleResultCallback<BulkWriteResult> callback) {
+        notNull("requests", requests);
+        executor.execute(operations.bulkWrite(requests, options), readConcern, clientSession, callback);
     }
 
     @Override
@@ -310,11 +476,24 @@ public void insertOne(final TDocument document, final SingleResultCallback<Void>
 
     @Override
     public void insertOne(final TDocument document, final InsertOneOptions options, final SingleResultCallback<Void> callback) {
-        TDocument insertDocument = document;
-        if (getCodec() instanceof CollectibleCodec) {
-            ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(insertDocument);
-        }
-        executeSingleWriteRequest(new InsertRequest(documentToBsonDocument(insertDocument)), options.getBypassDocumentValidation(),
+        executeInsertOne(null, document, options, callback);
+    }
+
+    @Override
+    public void insertOne(final ClientSession clientSession, final TDocument document, final SingleResultCallback<Void> callback) {
+        insertOne(clientSession, document, new InsertOneOptions(), callback);
+    }
+
+    @Override
+    public void insertOne(final ClientSession clientSession, final TDocument document, final InsertOneOptions options,
+                          final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeInsertOne(clientSession, document, options, callback);
+    }
+
+    private void executeInsertOne(@Nullable final ClientSession clientSession, final TDocument document, final InsertOneOptions options,
+                                  final SingleResultCallback<Void> callback) {
+        executeSingleWriteRequest(clientSession, operations.insertOne(document, options), INSERT,
                 new SingleResultCallback<BulkWriteResult>() {
                     @Override
                     public void onResult(final BulkWriteResult result, final Throwable t) {
@@ -331,53 +510,149 @@ public void insertMany(final List<? extends TDocument> documents, final SingleRe
     @Override
     public void insertMany(final List<? extends TDocument> documents, final InsertManyOptions options,
                            final SingleResultCallback<Void> callback) {
-        List<InsertRequest> requests = new ArrayList<InsertRequest>(documents.size());
-        for (TDocument document : documents) {
-            if (getCodec() instanceof CollectibleCodec) {
-                document = ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(document);
-            }
-            requests.add(new InsertRequest(documentToBsonDocument(document)));
-        }
-        executor.execute(new MixedBulkWriteOperation(namespace, requests, options.isOrdered(), writeConcern)
-                .bypassDocumentValidation(options.getBypassDocumentValidation()), errorHandlingCallback(
+        executeInsertMany(null, documents, options, callback);
+    }
+
+    @Override
+    public void insertMany(final ClientSession clientSession, final List<? extends TDocument> documents,
+                           final SingleResultCallback<Void> callback) {
+        insertMany(clientSession, documents, new InsertManyOptions(), callback);
+    }
+
+    @Override
+    public void insertMany(final ClientSession clientSession, final List<? extends TDocument> documents, final InsertManyOptions options,
+                           final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeInsertMany(clientSession, documents, options, callback);
+    }
+
+    private void executeInsertMany(@Nullable final ClientSession clientSession, final List<? extends TDocument> documents,
+                                   final InsertManyOptions options, final SingleResultCallback<Void> callback) {
+        executor.execute(operations.insertMany(documents, options), readConcern, clientSession,
                 new SingleResultCallback<BulkWriteResult>() {
                     @Override
                     public void onResult(final BulkWriteResult result, final Throwable t) {
                         callback.onResult(null, t);
                     }
-                }, LOGGER));
+                });
     }
 
     @Override
     public void deleteOne(final Bson filter, final SingleResultCallback<DeleteResult> callback) {
-        delete(filter, false, callback);
+        deleteOne(filter, new DeleteOptions(), callback);
+    }
+
+    @Override
+    public void deleteOne(final Bson filter, final DeleteOptions options, final SingleResultCallback<DeleteResult> callback) {
+        executeDelete(null, filter, options, false, callback);
+    }
+
+    @Override
+    public void deleteOne(final ClientSession clientSession, final Bson filter, final SingleResultCallback<DeleteResult> callback) {
+        deleteOne(clientSession, filter, new DeleteOptions(), callback);
+    }
+
+    @Override
+    public void deleteOne(final ClientSession clientSession, final Bson filter, final DeleteOptions options,
+                          final SingleResultCallback<DeleteResult> callback) {
+        notNull("clientSession", clientSession);
+        executeDelete(clientSession, filter, options, false, callback);
     }
 
     @Override
     public void deleteMany(final Bson filter, final SingleResultCallback<DeleteResult> callback) {
-        delete(filter, true, callback);
+        deleteMany(filter, new DeleteOptions(), callback);
+    }
+
+    @Override
+    public void deleteMany(final Bson filter, final DeleteOptions options, final SingleResultCallback<DeleteResult> callback) {
+        executeDelete(null, filter, options, true, callback);
+    }
+
+    @Override
+    public void deleteMany(final ClientSession clientSession, final Bson filter, final SingleResultCallback<DeleteResult> callback) {
+        deleteMany(clientSession, filter, new DeleteOptions(), callback);
+    }
+
+    @Override
+    public void deleteMany(final ClientSession clientSession, final Bson filter, final DeleteOptions options,
+                           final SingleResultCallback<DeleteResult> callback) {
+        notNull("clientSession", clientSession);
+        executeDelete(clientSession, filter, options, true, callback);
+    }
+
+    private void executeDelete(@Nullable final ClientSession clientSession, final Bson filter, final DeleteOptions options,
+                               final boolean multi, final SingleResultCallback<DeleteResult> callback) {
+        executeSingleWriteRequest(clientSession,
+                multi ? operations.deleteMany(filter, options) : operations.deleteOne(filter, options), DELETE,
+                new SingleResultCallback<BulkWriteResult>() {
+                    @Override
+                    public void onResult(final BulkWriteResult result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            if (result.wasAcknowledged()) {
+                                callback.onResult(DeleteResult.acknowledged(result.getDeletedCount()), null);
+                            } else {
+                                callback.onResult(DeleteResult.unacknowledged(), null);
+                            }
+
+                        }
+                    }
+                });
     }
 
     @Override
     public void replaceOne(final Bson filter, final TDocument replacement, final SingleResultCallback<UpdateResult> callback) {
-        replaceOne(filter, replacement, new UpdateOptions(), callback);
+        replaceOne(filter, replacement, new ReplaceOptions(), callback);
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void replaceOne(final Bson filter, final TDocument replacement, final UpdateOptions options,
                            final SingleResultCallback<UpdateResult> callback) {
-        executeSingleWriteRequest(new UpdateRequest(toBsonDocument(filter), documentToBsonDocument(replacement), WriteRequest.Type.REPLACE)
-                                  .upsert(options.isUpsert()), options.getBypassDocumentValidation(),
-                                  new SingleResultCallback<BulkWriteResult>() {
-                                      @Override
-                                      public void onResult(final BulkWriteResult result, final Throwable t) {
-                                          if (t != null) {
-                                              callback.onResult(null, t);
-                                          } else {
-                                              callback.onResult(toUpdateResult(result), null);
-                                          }
-                                      }
-                                  });
+        replaceOne(filter, replacement, createReplaceOptions(options), callback);
+    }
+
+    @Override
+    public void replaceOne(final Bson filter, final TDocument replacement, final ReplaceOptions options,
+                           final SingleResultCallback<UpdateResult> callback) {
+        executeReplaceOne(null, filter, replacement, options, callback);
+    }
+
+    @Override
+    public void replaceOne(final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                           final SingleResultCallback<UpdateResult> callback) {
+        replaceOne(clientSession, filter, replacement, new ReplaceOptions(), callback);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void replaceOne(final ClientSession clientSession, final Bson filter, final TDocument replacement, final UpdateOptions options,
+                           final SingleResultCallback<UpdateResult> callback) {
+        replaceOne(clientSession, filter, replacement, createReplaceOptions(options), callback);
+    }
+
+    @Override
+    public void replaceOne(final ClientSession clientSession, final Bson filter, final TDocument replacement, final ReplaceOptions options,
+                           final SingleResultCallback<UpdateResult> callback) {
+        notNull("clientSession", clientSession);
+        executeReplaceOne(clientSession, filter, replacement, options, callback);
+    }
+
+    private void executeReplaceOne(@Nullable final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                   final ReplaceOptions options, final SingleResultCallback<UpdateResult> callback) {
+        executeSingleWriteRequest(clientSession, operations.replaceOne(filter, replacement, options), REPLACE,
+                new SingleResultCallback<BulkWriteResult>() {
+                    @Override
+                    public void onResult(final BulkWriteResult result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            callback.onResult(toUpdateResult(result), null);
+                        }
+                    }
+                });
     }
 
     @Override
@@ -388,7 +663,44 @@ public void updateOne(final Bson filter, final Bson update, final SingleResultCa
     @Override
     public void updateOne(final Bson filter, final Bson update, final UpdateOptions options,
                           final SingleResultCallback<UpdateResult> callback) {
-        update(filter, update, options, false, callback);
+        executeUpdate(null, filter, update, options, false, callback);
+    }
+
+    @Override
+    public void updateOne(final ClientSession clientSession, final Bson filter, final Bson update,
+                          final SingleResultCallback<UpdateResult> callback) {
+        updateOne(clientSession, filter, update, new UpdateOptions(), callback);
+    }
+
+    @Override
+    public void updateOne(final ClientSession clientSession, final Bson filter, final Bson update, final UpdateOptions options,
+                          final SingleResultCallback<UpdateResult> callback) {
+        notNull("clientSession", clientSession);
+        executeUpdate(clientSession, filter, update, options, false, callback);
+    }
+
+    @Override
+    public void updateOne(final Bson filter, final List<? extends Bson> update, final SingleResultCallback<UpdateResult> callback) {
+        updateOne(filter, update, new UpdateOptions(), callback);
+    }
+
+    @Override
+    public void updateOne(final Bson filter, final List<? extends Bson> update, final UpdateOptions options,
+                          final SingleResultCallback<UpdateResult> callback) {
+        executeUpdate(null, filter, update, options, false, callback);
+    }
+
+    @Override
+    public void updateOne(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                          final SingleResultCallback<UpdateResult> callback) {
+        updateOne(clientSession, filter, update, new UpdateOptions(), callback);
+    }
+
+    @Override
+    public void updateOne(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                          final UpdateOptions options, final SingleResultCallback<UpdateResult> callback) {
+        notNull("clientSession", clientSession);
+        executeUpdate(clientSession, filter, update, options, false, callback);
     }
 
     @Override
@@ -399,7 +711,76 @@ public void updateMany(final Bson filter, final Bson update, final SingleResultC
     @Override
     public void updateMany(final Bson filter, final Bson update, final UpdateOptions options,
                            final SingleResultCallback<UpdateResult> callback) {
-        update(filter, update, options, true, callback);
+        executeUpdate(null, filter, update, options, true, callback);
+    }
+
+    @Override
+    public void updateMany(final ClientSession clientSession, final Bson filter, final Bson update,
+                           final SingleResultCallback<UpdateResult> callback) {
+        updateMany(clientSession, filter, update, new UpdateOptions(), callback);
+    }
+
+    @Override
+    public void updateMany(final ClientSession clientSession, final Bson filter, final Bson update, final UpdateOptions options,
+                           final SingleResultCallback<UpdateResult> callback) {
+        notNull("clientSession", clientSession);
+        executeUpdate(clientSession, filter, update, options, true, callback);
+    }
+
+    @Override
+    public void updateMany(final Bson filter, final List<? extends Bson> update, final SingleResultCallback<UpdateResult> callback) {
+        updateMany(filter, update, new UpdateOptions(), callback);
+    }
+
+    @Override
+    public void updateMany(final Bson filter, final List<? extends Bson> update, final UpdateOptions options,
+                           final SingleResultCallback<UpdateResult> callback) {
+        executeUpdate(null, filter, update, options, true, callback);
+    }
+
+    @Override
+    public void updateMany(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                           final SingleResultCallback<UpdateResult> callback) {
+        updateMany(clientSession, filter, update, new UpdateOptions(), callback);
+    }
+
+    @Override
+    public void updateMany(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                           final UpdateOptions options, final SingleResultCallback<UpdateResult> callback) {
+        notNull("clientSession", clientSession);
+        executeUpdate(clientSession, filter, update, options, true, callback);
+    }
+
+    private void executeUpdate(@Nullable final ClientSession clientSession, final Bson filter, final Bson update,
+                               final UpdateOptions options, final boolean multi, final SingleResultCallback<UpdateResult> callback) {
+        executeSingleWriteRequest(clientSession,
+                multi ? operations.updateMany(filter, update, options) : operations.updateOne(filter, update, options), UPDATE,
+                new SingleResultCallback<BulkWriteResult>() {
+                    @Override
+                    public void onResult(final BulkWriteResult result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            callback.onResult(toUpdateResult(result), null);
+                        }
+                    }
+                });
+    }
+
+    private void executeUpdate(@Nullable final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                               final UpdateOptions options, final boolean multi, final SingleResultCallback<UpdateResult> callback) {
+        executeSingleWriteRequest(clientSession,
+                multi ? operations.updateMany(filter, update, options) : operations.updateOne(filter, update, options), UPDATE,
+                new SingleResultCallback<BulkWriteResult>() {
+                    @Override
+                    public void onResult(final BulkWriteResult result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            callback.onResult(toUpdateResult(result), null);
+                        }
+                    }
+                });
     }
 
     @Override
@@ -409,11 +790,24 @@ public void findOneAndDelete(final Bson filter, final SingleResultCallback<TDocu
 
     @Override
     public void findOneAndDelete(final Bson filter, final FindOneAndDeleteOptions options, final SingleResultCallback<TDocument> callback) {
-        executor.execute(new FindAndDeleteOperation<TDocument>(namespace, writeConcern, getCodec())
-                         .filter(toBsonDocument(filter))
-                         .projection(toBsonDocument(options.getProjection()))
-                         .sort(toBsonDocument(options.getSort()))
-                         .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS), callback);
+        executeFindOneAndDelete(null, filter, options, callback);
+    }
+
+    @Override
+    public void findOneAndDelete(final ClientSession clientSession, final Bson filter, final SingleResultCallback<TDocument> callback) {
+        findOneAndDelete(clientSession, filter, new FindOneAndDeleteOptions(), callback);
+    }
+
+    @Override
+    public void findOneAndDelete(final ClientSession clientSession, final Bson filter, final FindOneAndDeleteOptions options,
+                                 final SingleResultCallback<TDocument> callback) {
+        notNull("clientSession", clientSession);
+        executeFindOneAndDelete(clientSession, filter, options, callback);
+    }
+
+    private void executeFindOneAndDelete(@Nullable final ClientSession clientSession, final Bson filter,
+                                         final FindOneAndDeleteOptions options, final SingleResultCallback<TDocument> callback) {
+        executor.execute(operations.findOneAndDelete(filter, options), readConcern, clientSession, callback);
     }
 
     @Override
@@ -424,14 +818,25 @@ public void findOneAndReplace(final Bson filter, final TDocument replacement, fi
     @Override
     public void findOneAndReplace(final Bson filter, final TDocument replacement, final FindOneAndReplaceOptions options,
                                   final SingleResultCallback<TDocument> callback) {
-        executor.execute(new FindAndReplaceOperation<TDocument>(namespace, writeConcern, getCodec(), documentToBsonDocument(replacement))
-                         .filter(toBsonDocument(filter))
-                         .projection(toBsonDocument(options.getProjection()))
-                         .sort(toBsonDocument(options.getSort()))
-                         .returnOriginal(options.getReturnDocument() == ReturnDocument.BEFORE)
-                         .upsert(options.isUpsert())
-                         .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
-                         .bypassDocumentValidation(options.getBypassDocumentValidation()), callback);
+        executeFindOneAndReplace(null, filter, replacement, options, callback);
+    }
+
+    @Override
+    public void findOneAndReplace(final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                  final SingleResultCallback<TDocument> callback) {
+        findOneAndReplace(clientSession, filter, replacement, new FindOneAndReplaceOptions(), callback);
+    }
+
+    @Override
+    public void findOneAndReplace(final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                  final FindOneAndReplaceOptions options, final SingleResultCallback<TDocument> callback) {
+        notNull("clientSession", clientSession);
+        executeFindOneAndReplace(clientSession, filter, replacement, options, callback);
+    }
+
+    private void executeFindOneAndReplace(@Nullable final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                          final FindOneAndReplaceOptions options, final SingleResultCallback<TDocument> callback) {
+        executor.execute(operations.findOneAndReplace(filter, replacement, options), readConcern, clientSession, callback);
     }
 
     @Override
@@ -442,19 +847,69 @@ public void findOneAndUpdate(final Bson filter, final Bson update, final SingleR
     @Override
     public void findOneAndUpdate(final Bson filter, final Bson update, final FindOneAndUpdateOptions options,
                                  final SingleResultCallback<TDocument> callback) {
-        executor.execute(new FindAndUpdateOperation<TDocument>(namespace, writeConcern, getCodec(), toBsonDocument(update))
-                .filter(toBsonDocument(filter))
-                .projection(toBsonDocument(options.getProjection()))
-                .sort(toBsonDocument(options.getSort()))
-                .returnOriginal(options.getReturnDocument() == ReturnDocument.BEFORE)
-                .upsert(options.isUpsert())
-                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
-                .bypassDocumentValidation(options.getBypassDocumentValidation()), callback);
+        executeFindOneAndUpdate(null, filter, update, options, callback);
+    }
+
+    @Override
+    public void findOneAndUpdate(final ClientSession clientSession, final Bson filter, final Bson update,
+                                 final SingleResultCallback<TDocument> callback) {
+        findOneAndUpdate(clientSession, filter, update, new FindOneAndUpdateOptions(), callback);
+    }
+
+    @Override
+    public void findOneAndUpdate(final ClientSession clientSession, final Bson filter, final Bson update,
+                                 final FindOneAndUpdateOptions options, final SingleResultCallback<TDocument> callback) {
+        notNull("clientSession", clientSession);
+        executeFindOneAndUpdate(clientSession, filter, update, options, callback);
+    }
+
+    @Override
+    public void findOneAndUpdate(final Bson filter, final List<? extends Bson> update, final SingleResultCallback<TDocument> callback) {
+        findOneAndUpdate(filter, update, new FindOneAndUpdateOptions(), callback);
+    }
+
+    @Override
+    public void findOneAndUpdate(final Bson filter, final List<? extends Bson> update, final FindOneAndUpdateOptions options,
+                                 final SingleResultCallback<TDocument> callback) {
+        executeFindOneAndUpdate(null, filter, update, options, callback);
+    }
+
+    @Override
+    public void findOneAndUpdate(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                                 final SingleResultCallback<TDocument> callback) {
+        findOneAndUpdate(clientSession, filter, update, new FindOneAndUpdateOptions(), callback);
+    }
+
+    @Override
+    public void findOneAndUpdate(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                                 final FindOneAndUpdateOptions options, final SingleResultCallback<TDocument> callback) {
+        notNull("clientSession", clientSession);
+        executeFindOneAndUpdate(clientSession, filter, update, options, callback);
+    }
+
+    private void executeFindOneAndUpdate(@Nullable final ClientSession clientSession, final Bson filter, final Bson update,
+                                         final FindOneAndUpdateOptions options, final SingleResultCallback<TDocument> callback) {
+        executor.execute(operations.findOneAndUpdate(filter, update, options), readConcern, clientSession, callback);
+    }
+
+    private void executeFindOneAndUpdate(@Nullable final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                                         final FindOneAndUpdateOptions options, final SingleResultCallback<TDocument> callback) {
+        executor.execute(operations.findOneAndUpdate(filter, update, options), readConcern, clientSession, callback);
     }
 
     @Override
     public void drop(final SingleResultCallback<Void> callback) {
-        executor.execute(new DropCollectionOperation(namespace), callback);
+        executeDrop(null, callback);
+    }
+
+    @Override
+    public void drop(final ClientSession clientSession, final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeDrop(clientSession, callback);
+    }
+
+    private void executeDrop(@Nullable final ClientSession clientSession, final SingleResultCallback<Void> callback) {
+        executor.execute(operations.dropCollection(), readConcern, clientSession, callback);
     }
 
     @Override
@@ -477,43 +932,64 @@ public void onResult(final List<String> result, final Throwable t) {
     }
 
     @Override
-    public void createIndexes(final List<IndexModel> indexes, final SingleResultCallback<List<String>> callback) {
-        notNull("indexes", indexes);
-
-        List<IndexRequest> indexRequests = new ArrayList<IndexRequest>(indexes.size());
-        for (IndexModel model : indexes) {
-            indexRequests.add(new IndexRequest(toBsonDocument(model.getKeys()))
-                              .name(model.getOptions().getName())
-                              .background(model.getOptions().isBackground())
-                              .unique(model.getOptions().isUnique())
-                              .sparse(model.getOptions().isSparse())
-                              .expireAfter(model.getOptions().getExpireAfter(TimeUnit.SECONDS), TimeUnit.SECONDS)
-                              .version(model.getOptions().getVersion())
-                              .weights(toBsonDocument(model.getOptions().getWeights()))
-                              .defaultLanguage(model.getOptions().getDefaultLanguage())
-                              .languageOverride(model.getOptions().getLanguageOverride())
-                              .textVersion(model.getOptions().getTextVersion())
-                              .sphereVersion(model.getOptions().getSphereVersion())
-                              .bits(model.getOptions().getBits())
-                              .min(model.getOptions().getMin())
-                              .max(model.getOptions().getMax())
-                              .bucketSize(model.getOptions().getBucketSize())
-                              .storageEngine(toBsonDocument(model.getOptions().getStorageEngine()))
-                              .partialFilterExpression(toBsonDocument(model.getOptions().getPartialFilterExpression())));
-        }
-        final CreateIndexesOperation createIndexesOperation = new CreateIndexesOperation(getNamespace(), indexRequests);
-        executor.execute(createIndexesOperation, new SingleResultCallback<Void>() {
+    public void createIndex(final ClientSession clientSession, final Bson key, final SingleResultCallback<String> callback) {
+        createIndex(clientSession, key, new IndexOptions(), callback);
+    }
+
+    @Override
+    public void createIndex(final ClientSession clientSession, final Bson key, final IndexOptions indexOptions,
+                            final SingleResultCallback<String> callback) {
+        createIndexes(clientSession, singletonList(new IndexModel(key, indexOptions)), new SingleResultCallback<List<String>>() {
             @Override
-            public void onResult(final Void result, final Throwable t) {
+            public void onResult(final List<String> result, final Throwable t) {
                 if (t != null) {
                     callback.onResult(null, t);
                 } else {
-                    callback.onResult(createIndexesOperation.getIndexNames(), null);
+                    callback.onResult(result.get(0), null);
                 }
             }
         });
     }
 
+    @Override
+    public void createIndexes(final List<IndexModel> indexes, final SingleResultCallback<List<String>> callback) {
+        createIndexes(indexes, new CreateIndexOptions(), callback);
+    }
+
+    @Override
+    public void createIndexes(final List<IndexModel> indexes, final CreateIndexOptions createIndexOptions,
+                              final SingleResultCallback<List<String>> callback) {
+        executeCreateIndexes(null, indexes, createIndexOptions, callback);
+    }
+
+    @Override
+    public void createIndexes(final ClientSession clientSession, final List<IndexModel> indexes,
+                              final SingleResultCallback<List<String>> callback) {
+        createIndexes(clientSession, indexes, new CreateIndexOptions(), callback);
+    }
+
+    @Override
+    public void createIndexes(final ClientSession clientSession, final List<IndexModel> indexes,
+                              final CreateIndexOptions createIndexOptions, final SingleResultCallback<List<String>> callback) {
+        notNull("clientSession", clientSession);
+        executeCreateIndexes(clientSession, indexes, createIndexOptions, callback);
+    }
+
+    private void executeCreateIndexes(@Nullable final ClientSession clientSession, final List<IndexModel> indexes,
+                                      final CreateIndexOptions createIndexOptions, final SingleResultCallback<List<String>> callback) {
+        executor.execute(operations.createIndexes(indexes, createIndexOptions), readConcern, clientSession,
+                new SingleResultCallback<Void>() {
+                    @Override
+                    public void onResult(final Void result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            callback.onResult(IndexHelper.getIndexNames(indexes, codecRegistry), null);
+                        }
+                    }
+                });
+    }
+
     @Override
     public ListIndexesIterable<Document> listIndexes() {
         return listIndexes(Document.class);
@@ -521,22 +997,99 @@ public ListIndexesIterable<Document> listIndexes() {
 
     @Override
     public <TResult> ListIndexesIterable<TResult> listIndexes(final Class<TResult> resultClass) {
-        return new ListIndexesIterableImpl<TResult>(namespace, resultClass, codecRegistry, readPreference, executor);
+        return createListIndexesIterable(null, resultClass);
+    }
+
+    @Override
+    public ListIndexesIterable<Document> listIndexes(final ClientSession clientSession) {
+        return listIndexes(clientSession, Document.class);
+    }
+
+    @Override
+    public <TResult> ListIndexesIterable<TResult> listIndexes(final ClientSession clientSession, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createListIndexesIterable(clientSession, resultClass);
+    }
+
+    private <TResult> ListIndexesIterable<TResult> createListIndexesIterable(@Nullable final ClientSession clientSession,
+                                                                             final Class<TResult> resultClass) {
+        return new ListIndexesIterableImpl<TResult>(clientSession, namespace, resultClass, codecRegistry, readPreference, executor,
+                retryReads);
     }
 
     @Override
     public void dropIndex(final String indexName, final SingleResultCallback<Void> callback) {
-        executor.execute(new DropIndexOperation(namespace, indexName), callback);
+        dropIndex(indexName, new DropIndexOptions(), callback);
+    }
+
+    @Override
+    public void dropIndex(final String indexName, final DropIndexOptions dropIndexOptions, final SingleResultCallback<Void> callback) {
+        executeDropIndex(null, indexName, dropIndexOptions, callback);
     }
 
     @Override
     public void dropIndex(final Bson keys, final SingleResultCallback<Void> callback) {
-        executor.execute(new DropIndexOperation(namespace, keys.toBsonDocument(BsonDocument.class, codecRegistry)), callback);
+        dropIndex(keys, new DropIndexOptions(), callback);
+    }
+
+    @Override
+    public void dropIndex(final Bson keys, final DropIndexOptions dropIndexOptions, final SingleResultCallback<Void> callback) {
+        executeDropIndex(null, keys, dropIndexOptions, callback);
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final String indexName, final SingleResultCallback<Void> callback) {
+        dropIndex(clientSession, indexName, new DropIndexOptions(), callback);
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final String indexName, final DropIndexOptions dropIndexOptions,
+                          final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeDropIndex(clientSession, indexName, dropIndexOptions, callback);
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final Bson keys, final SingleResultCallback<Void> callback) {
+        dropIndex(clientSession, keys, new DropIndexOptions(), callback);
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final Bson keys, final DropIndexOptions dropIndexOptions,
+                          final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeDropIndex(clientSession, keys, dropIndexOptions, callback);
     }
 
     @Override
     public void dropIndexes(final SingleResultCallback<Void> callback) {
-        dropIndex("*", callback);
+        dropIndexes(new DropIndexOptions(), callback);
+    }
+
+    @Override
+    public void dropIndexes(final DropIndexOptions dropIndexOptions, final SingleResultCallback<Void> callback) {
+        dropIndex("*", dropIndexOptions, callback);
+    }
+
+    @Override
+    public void dropIndexes(final ClientSession clientSession, final SingleResultCallback<Void> callback) {
+        dropIndexes(clientSession, new DropIndexOptions(), callback);
+    }
+
+    @Override
+    public void dropIndexes(final ClientSession clientSession, final DropIndexOptions dropIndexOptions,
+                            final SingleResultCallback<Void> callback) {
+        dropIndex(clientSession, "*", dropIndexOptions, callback);
+    }
+
+    private void executeDropIndex(@Nullable final ClientSession clientSession, final Bson keys,
+                                  final DropIndexOptions dropIndexOptions, final SingleResultCallback<Void> callback) {
+        executor.execute(operations.dropIndex(keys, dropIndexOptions), readConcern, clientSession, callback);
+    }
+
+    private void executeDropIndex(@Nullable final ClientSession clientSession, final String indexName,
+                                  final DropIndexOptions dropIndexOptions, final SingleResultCallback<Void> callback) {
+        executor.execute(operations.dropIndex(indexName, dropIndexOptions), readConcern, clientSession, callback);
     }
 
     @Override
@@ -547,50 +1100,31 @@ public void renameCollection(final MongoNamespace newCollectionNamespace, final
     @Override
     public void renameCollection(final MongoNamespace newCollectionNamespace, final RenameCollectionOptions options,
                                  final SingleResultCallback<Void> callback) {
-        executor.execute(new RenameCollectionOperation(getNamespace(), newCollectionNamespace)
-                         .dropTarget(options.isDropTarget()), callback);
+        executeRenameCollection(null, newCollectionNamespace, options, callback);
     }
 
-    private void delete(final Bson filter, final boolean multi, final SingleResultCallback<DeleteResult> callback) {
-        executeSingleWriteRequest(new DeleteRequest(toBsonDocument(filter)).multi(multi), null,
-                new SingleResultCallback<BulkWriteResult>() {
-                    @Override
-                    public void onResult(final BulkWriteResult result, final Throwable t) {
-                        if (t != null) {
-                            callback.onResult(null, t);
-                        } else {
-                            if (result.wasAcknowledged()) {
-                                callback.onResult(DeleteResult.acknowledged(result.getDeletedCount()), null);
-                            } else {
-                                callback.onResult(DeleteResult.unacknowledged(), null);
-                            }
+    @Override
+    public void renameCollection(final ClientSession clientSession, final MongoNamespace newCollectionNamespace,
+                                 final SingleResultCallback<Void> callback) {
+        renameCollection(clientSession, newCollectionNamespace, new RenameCollectionOptions(), callback);
+    }
 
-                        }
-                    }
-                });
+    @Override
+    public void renameCollection(final ClientSession clientSession, final MongoNamespace newCollectionNamespace,
+                                 final RenameCollectionOptions options, final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeRenameCollection(clientSession, newCollectionNamespace, options, callback);
     }
 
-    private void update(final Bson filter, final Bson update, final UpdateOptions updateOptions, final boolean multi,
-                        final SingleResultCallback<UpdateResult> callback) {
-        executeSingleWriteRequest(new UpdateRequest(toBsonDocument(filter), toBsonDocument(update), WriteRequest.Type.UPDATE)
-                        .upsert(updateOptions.isUpsert()).multi(multi), updateOptions.getBypassDocumentValidation(),
-                new SingleResultCallback<BulkWriteResult>() {
-                    @Override
-                    public void onResult(final BulkWriteResult result, final Throwable t) {
-                        if (t != null) {
-                            callback.onResult(null, t);
-                        } else {
-                            callback.onResult(toUpdateResult(result), null);
-                        }
-                    }
-                });
+    private void executeRenameCollection(@Nullable final ClientSession clientSession, final MongoNamespace newCollectionNamespace,
+                                         final RenameCollectionOptions options, final SingleResultCallback<Void> callback) {
+        executor.execute(operations.renameCollection(newCollectionNamespace, options), readConcern, clientSession, callback);
     }
 
-    private void executeSingleWriteRequest(final WriteRequest request, final Boolean bypassDocumentValidation,
-                                           final SingleResultCallback<BulkWriteResult> callback) {
-        executor.execute(new MixedBulkWriteOperation(namespace, singletonList(request), true, writeConcern)
-                         .bypassDocumentValidation(bypassDocumentValidation),
-                         new SingleResultCallback<BulkWriteResult>() {
+    private void executeSingleWriteRequest(@Nullable final ClientSession clientSession,
+                                           final AsyncWriteOperation<BulkWriteResult> writeOperation,
+                                           final WriteRequest.Type type, final SingleResultCallback<BulkWriteResult> callback) {
+        executor.execute(writeOperation, readConcern, clientSession, new SingleResultCallback<BulkWriteResult>() {
                              @Override
                              public void onResult(final BulkWriteResult result, final Throwable t) {
                                  if (t instanceof MongoBulkWriteException) {
@@ -598,7 +1132,7 @@ public void onResult(final BulkWriteResult result, final Throwable t) {
                                      if (e.getWriteErrors().isEmpty()) {
                                          callback.onResult(null,
                                                            new MongoWriteConcernException(e.getWriteConcernError(),
-                                                                                          translateBulkWriteResult(request,
+                                                                                          translateBulkWriteResult(type,
                                                                                                                    e.getWriteResult()),
                                                                                           e.getServerAddress()));
                                      } else {
@@ -612,8 +1146,8 @@ public void onResult(final BulkWriteResult result, final Throwable t) {
                          });
     }
 
-    private WriteConcernResult translateBulkWriteResult(final WriteRequest request, final BulkWriteResult writeResult) {
-        switch (request.getType()) {
+    private WriteConcernResult translateBulkWriteResult(final WriteRequest.Type type, final BulkWriteResult writeResult) {
+        switch (type) {
             case INSERT:
                 return WriteConcernResult.acknowledged(writeResult.getInsertedCount(), false, null);
             case DELETE:
@@ -625,33 +1159,16 @@ private WriteConcernResult translateBulkWriteResult(final WriteRequest request,
                                                        writeResult.getUpserts().isEmpty()
                                                        ? null : writeResult.getUpserts().get(0).getId());
             default:
-                throw new MongoInternalException("Unhandled write request type: " + request.getType());
+                throw new MongoInternalException("Unhandled write request type: " + type);
         }
     }
 
     private UpdateResult toUpdateResult(final com.mongodb.bulk.BulkWriteResult result) {
         if (result.wasAcknowledged()) {
-            Long modifiedCount = result.isModifiedCountAvailable() ? (long) result.getModifiedCount() : null;
             BsonValue upsertedId = result.getUpserts().isEmpty() ? null : result.getUpserts().get(0).getId();
-            return UpdateResult.acknowledged(result.getMatchedCount(), modifiedCount, upsertedId);
+            return UpdateResult.acknowledged(result.getMatchedCount(), (long) result.getModifiedCount(), upsertedId);
         } else {
             return UpdateResult.unacknowledged();
         }
     }
-
-    private Codec<TDocument> getCodec() {
-        return getCodec(documentClass);
-    }
-
-    private <TResult> Codec<TResult> getCodec(final Class<TResult> resultClass) {
-        return codecRegistry.get(resultClass);
-    }
-
-    private BsonDocument documentToBsonDocument(final TDocument document) {
-        return BsonDocumentWrapper.asBsonDocument(document, codecRegistry);
-    }
-
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(documentClass, codecRegistry);
-    }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoDatabase.java b/driver-async/src/main/com/mongodb/async/client/MongoDatabase.java
index 396deac0ded..46f874faa34 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoDatabase.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,18 +22,23 @@
 import com.mongodb.annotations.ThreadSafe;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.CreateViewOptions;
 import org.bson.Document;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
+import java.util.List;
+
 /**
  * The MongoDatabase interface.
  * <p>
  * Note: Additions to this interface will not be considered to break binary compatibility.</p>
  *
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
 @ThreadSafe
+@Deprecated
 public interface MongoDatabase {
 
     /**
@@ -114,6 +119,8 @@ public interface MongoDatabase {
      *
      * @param collectionName the name of the collection to return
      * @return the collection
+     * @throws IllegalArgumentException if collectionName is invalid
+     * @see com.mongodb.MongoNamespace#checkCollectionNameValidity(String)
      */
     MongoCollection<Document> getCollection(String collectionName);
 
@@ -166,6 +173,57 @@ public interface MongoDatabase {
     <TResult> void runCommand(Bson command, ReadPreference readPreference, Class<TResult> resultClass,
                               SingleResultCallback<TResult> callback);
 
+    /**
+     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param command  the command to be run
+     * @param callback the callback that is passed the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void runCommand(ClientSession clientSession, Bson command, SingleResultCallback<Document> callback);
+
+    /**
+     * Executes the given command in the context of the current database with the given read preference.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param command        the command to be run
+     * @param readPreference the {@link ReadPreference} to be used when executing the command
+     * @param callback       the callback that is passed the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void runCommand(ClientSession clientSession, Bson command, ReadPreference readPreference, SingleResultCallback<Document> callback);
+    /**
+     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param command     the command to be run
+     * @param resultClass the default class to cast any documents returned from the database into.
+     * @param <TResult>   the type of the class to use instead of {@code Document}.
+     * @param callback    the callback that is passed the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> void runCommand(ClientSession clientSession, Bson command, Class<TResult> resultClass,
+                              SingleResultCallback<TResult> callback);
+
+    /**
+     * Executes the given command in the context of the current database with the given read preference.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param command        the command to be run
+     * @param readPreference the {@link com.mongodb.ReadPreference} to be used when executing the command
+     * @param resultClass    the default class to cast any documents returned from the database into.
+     * @param <TResult>      the type of the class to use instead of {@code Document}.
+     * @param callback       the callback that is passed the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> void runCommand(ClientSession clientSession, Bson command, ReadPreference readPreference, Class<TResult> resultClass,
+                              SingleResultCallback<TResult> callback);
+
     /**
      * Drops this database.
      *
@@ -174,6 +232,17 @@ <TResult> void runCommand(Bson command, ReadPreference readPreference, Class<TRe
      */
     void drop(SingleResultCallback<Void> callback);
 
+    /**
+     * Drops this database.
+     *
+     * @param callback the callback that is completed once the database has been dropped
+     * @param clientSession the client session with which to associate this operation
+     * @mongodb.driver.manual reference/command/dropDatabase/#dbcmd.dropDatabase Drop database
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void drop(ClientSession clientSession, SingleResultCallback<Void> callback);
+
     /**
      * Gets the names of all the collections in this database.
      *
@@ -181,6 +250,16 @@ <TResult> void runCommand(Bson command, ReadPreference readPreference, Class<TRe
      */
     MongoIterable<String> listCollectionNames();
 
+    /**
+     * Gets the names of all the collections in this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return an iterable containing all the names of all the collections in this database
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    MongoIterable<String> listCollectionNames(ClientSession clientSession);
+
     /**
      * Finds all the collections in this database.
      *
@@ -199,6 +278,30 @@ <TResult> void runCommand(Bson command, ReadPreference readPreference, Class<TRe
      */
     <TResult> ListCollectionsIterable<TResult> listCollections(Class<TResult> resultClass);
 
+    /**
+     * Finds all the collections in this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the list collections iterable interface
+     * @mongodb.driver.manual reference/command/listCollections listCollections
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ListCollectionsIterable<Document> listCollections(ClientSession clientSession);
+
+    /**
+     * Finds all the collections in this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the list collections iterable interface
+     * @mongodb.driver.manual reference/command/listCollections listCollections
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ListCollectionsIterable<TResult> listCollections(ClientSession clientSession, Class<TResult> resultClass);
+
     /**
      * Create a new collection with the given name.
      *
@@ -218,4 +321,239 @@ <TResult> void runCommand(Bson command, ReadPreference readPreference, Class<TRe
      */
     void createCollection(String collectionName, CreateCollectionOptions options, SingleResultCallback<Void> callback);
 
+    /**
+     * Create a new collection with the given name.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param collectionName the name for the new collection to create
+     * @param callback       the callback that is completed once the collection has been created
+     * @mongodb.driver.manual reference/command/create Create Command
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createCollection(ClientSession clientSession, String collectionName, SingleResultCallback<Void> callback);
+
+    /**
+     * Create a new collection with the selected options
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param collectionName the name for the new collection to create
+     * @param options        various options for creating the collection
+     * @param callback       the callback that is completed once the collection has been created
+     * @mongodb.driver.manual reference/command/create Create Command
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createCollection(ClientSession clientSession, String collectionName, CreateCollectionOptions options,
+                          SingleResultCallback<Void> callback);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, and aggregation pipeline that defines the view.
+     *
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @param callback the callback that is completed once the collection has been created
+     * @mongodb.driver.manual reference/command/create Create Command
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    void createView(String viewName, String viewOn, List<? extends Bson> pipeline, SingleResultCallback<Void> callback);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, aggregation pipeline, and options that defines the view.
+     *
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @param createViewOptions various options for creating the view
+     * @param callback the callback that is completed once the collection has been created
+     * @mongodb.driver.manual reference/command/create Create Command
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    void createView(String viewName, String viewOn, List<? extends Bson> pipeline, CreateViewOptions createViewOptions,
+                    SingleResultCallback<Void> callback);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, and aggregation pipeline that defines the view.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @param callback the callback that is completed once the collection has been created
+     * @mongodb.driver.manual reference/command/create Create Command
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createView(ClientSession clientSession, String viewName, String viewOn, List<? extends Bson> pipeline,
+                    SingleResultCallback<Void> callback);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, aggregation pipeline, and options that defines the view.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @param createViewOptions various options for creating the view
+     * @param callback the callback that is completed once the collection has been created
+     * @mongodb.driver.manual reference/command/create Create Command
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void createView(ClientSession clientSession, String viewName, String viewOn, List<? extends Bson> pipeline,
+                    CreateViewOptions createViewOptions, SingleResultCallback<Void> callback);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch();
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch(List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param pipeline the aggregation pipeline
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<Document> aggregate(List<? extends Bson> pipeline);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param pipeline    the aggregation pipeline
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    <TResult> AggregateIterable<TResult> aggregate(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<Document> aggregate(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    <TResult> AggregateIterable<TResult> aggregate(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoDatabaseImpl.java b/driver-async/src/main/com/mongodb/async/client/MongoDatabaseImpl.java
index e26fa44e6cf..aa330189844 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoDatabaseImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoDatabaseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,41 +17,61 @@
 package com.mongodb.async.client;
 
 import com.mongodb.Function;
+import com.mongodb.MongoClientException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.client.model.AggregationLevel;
 import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.CreateViewOptions;
 import com.mongodb.client.model.IndexOptionDefaults;
 import com.mongodb.client.model.ValidationOptions;
-import com.mongodb.operation.AsyncOperationExecutor;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.lang.Nullable;
 import com.mongodb.operation.CommandReadOperation;
 import com.mongodb.operation.CreateCollectionOperation;
+import com.mongodb.operation.CreateViewOperation;
 import com.mongodb.operation.DropDatabaseOperation;
 import org.bson.BsonDocument;
 import org.bson.Document;
+import org.bson.UuidRepresentation;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.MongoNamespace.checkDatabaseNameValidity;
 import static com.mongodb.assertions.Assertions.notNull;
+import static org.bson.internal.CodecRegistryHelper.createRegistry;
 
 class MongoDatabaseImpl implements MongoDatabase {
     private final String name;
     private final ReadPreference readPreference;
     private final CodecRegistry codecRegistry;
     private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private final boolean retryReads;
     private final ReadConcern readConcern;
-    private final AsyncOperationExecutor executor;
+    private final UuidRepresentation uuidRepresentation;
+    private final OperationExecutor executor;
 
     MongoDatabaseImpl(final String name, final CodecRegistry codecRegistry, final ReadPreference readPreference,
-                      final WriteConcern writeConcern, final ReadConcern readConcern, final AsyncOperationExecutor executor) {
+                      final WriteConcern writeConcern, final boolean retryWrites, final boolean retryReads,
+                      final ReadConcern readConcern, final UuidRepresentation uuidRepresentation, final OperationExecutor executor) {
+        checkDatabaseNameValidity(name);
         this.name = notNull("name", name);
         this.codecRegistry = notNull("codecRegistry", codecRegistry);
         this.readPreference = notNull("readPreference", readPreference);
         this.writeConcern = notNull("writeConcern", writeConcern);
+        this.retryWrites = retryWrites;
+        this.retryReads = retryReads;
         this.readConcern = notNull("readConcern", readConcern);
         this.executor = notNull("executor", executor);
+        this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
     }
 
     @Override
@@ -81,33 +101,47 @@ public ReadConcern getReadConcern() {
 
     @Override
     public MongoDatabase withCodecRegistry(final CodecRegistry codecRegistry) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
+        return new MongoDatabaseImpl(name, createRegistry(codecRegistry, uuidRepresentation), readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
     }
 
     @Override
     public MongoDatabase withReadPreference(final ReadPreference readPreference) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
+        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern,
+                uuidRepresentation, executor);
     }
 
     @Override
     public MongoDatabase withWriteConcern(final WriteConcern writeConcern) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
+        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern,
+                uuidRepresentation, executor);
     }
 
     @Override
     public MongoDatabase withReadConcern(final ReadConcern readConcern) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
+        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern,
+                uuidRepresentation, executor);
     }
 
     @Override
     public MongoIterable<String> listCollectionNames() {
-        return new ListCollectionsIterableImpl<BsonDocument>(name, BsonDocument.class, MongoClients.getDefaultCodecRegistry(),
-                                                             ReadPreference.primary(), executor).map(new Function<BsonDocument, String>() {
-            @Override
-            public String apply(final BsonDocument result) {
-                return result.getString("name").getValue();
-            }
-        });
+        return createListCollectionNamesIterable(null);
+    }
+
+    @Override
+    public MongoIterable<String> listCollectionNames(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return createListCollectionNamesIterable(clientSession);
+    }
+
+    private MongoIterable<String> createListCollectionNamesIterable(@Nullable final ClientSession clientSession) {
+        return createListCollectionsIterable(clientSession, BsonDocument.class, true)
+                .map(new Function<BsonDocument, String>() {
+                    @Override
+                    public String apply(final BsonDocument result) {
+                        return result.getString("name").getValue();
+                    }
+                });
     }
 
     @Override
@@ -117,7 +151,25 @@ public ListCollectionsIterable<Document> listCollections() {
 
     @Override
     public <TResult> ListCollectionsIterable<TResult> listCollections(final Class<TResult> resultClass) {
-        return new ListCollectionsIterableImpl<TResult>(name, resultClass, codecRegistry, ReadPreference.primary(), executor);
+        return createListCollectionsIterable(null, resultClass, false);
+    }
+
+    @Override
+    public ListCollectionsIterable<Document> listCollections(final ClientSession clientSession) {
+        return listCollections(clientSession, Document.class);
+    }
+
+    @Override
+    public <TResult> ListCollectionsIterable<TResult> listCollections(final ClientSession clientSession, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createListCollectionsIterable(clientSession, resultClass, false);
+    }
+
+    private <TResult> ListCollectionsIterable<TResult> createListCollectionsIterable(@Nullable final ClientSession clientSession,
+                                                                                     final Class<TResult> resultClass,
+                                                                                     final boolean collectionNamesOnly) {
+        return new ListCollectionsIterableImpl<TResult>(clientSession, name, collectionNamesOnly, resultClass, codecRegistry,
+                ReadPreference.primary(), executor, retryReads);
     }
 
     @Override
@@ -128,7 +180,7 @@ public MongoCollection<Document> getCollection(final String collectionName) {
     @Override
     public <TDocument> MongoCollection<TDocument> getCollection(final String collectionName, final Class<TDocument> documentClass) {
         return new MongoCollectionImpl<TDocument>(new MongoNamespace(name, collectionName), documentClass, codecRegistry, readPreference,
-                                                  writeConcern, readConcern, executor);
+                                                  writeConcern, retryWrites, retryReads, readConcern, uuidRepresentation, executor);
     }
 
     @Override
@@ -144,47 +196,111 @@ public void runCommand(final Bson command, final ReadPreference readPreference,
     @Override
     public <TResult> void runCommand(final Bson command, final Class<TResult> resultClass,
                                      final SingleResultCallback<TResult> callback) {
-        notNull("command", command);
         runCommand(command, ReadPreference.primary(), resultClass, callback);
     }
 
     @Override
     public <TResult> void runCommand(final Bson command, final ReadPreference readPreference, final Class<TResult> resultClass,
                                      final SingleResultCallback<TResult> callback) {
+        executeCommand(null, command, readPreference, resultClass, callback);
+    }
+
+    @Override
+    public void runCommand(final ClientSession clientSession, final Bson command, final SingleResultCallback<Document> callback) {
+        runCommand(clientSession, command, Document.class, callback);
+    }
+
+    @Override
+    public void runCommand(final ClientSession clientSession, final Bson command, final ReadPreference readPreference,
+                           final SingleResultCallback<Document> callback) {
+        runCommand(clientSession, command, readPreference, Document.class, callback);
+    }
+
+    @Override
+    public <TResult> void runCommand(final ClientSession clientSession, final Bson command, final Class<TResult> resultClass,
+                                     final SingleResultCallback<TResult> callback) {
+        runCommand(clientSession, command, ReadPreference.primary(), resultClass, callback);
+    }
+
+    @Override
+    public <TResult> void runCommand(final ClientSession clientSession, final Bson command, final ReadPreference readPreference,
+                                     final Class<TResult> resultClass, final SingleResultCallback<TResult> callback) {
+        notNull("clientSession", clientSession);
+        executeCommand(clientSession, command, readPreference, resultClass, callback);
+    }
+
+    private <TResult> void executeCommand(@Nullable final ClientSession clientSession, final Bson command,
+                                          final ReadPreference readPreference, final Class<TResult> resultClass,
+                                          final SingleResultCallback<TResult> callback) {
         notNull("command", command);
         notNull("readPreference", readPreference);
+        if (clientSession != null && clientSession.hasActiveTransaction() && !readPreference.equals(ReadPreference.primary())) {
+            throw new MongoClientException("Read preference in a transaction must be primary");
+        }
         executor.execute(new CommandReadOperation<TResult>(getName(), toBsonDocument(command), codecRegistry.get(resultClass)),
-                         readPreference, callback);
+                readPreference, readConcern, clientSession, callback);
     }
 
     @Override
     public void drop(final SingleResultCallback<Void> callback) {
-        executor.execute(new DropDatabaseOperation(name), callback);
+        executeDrop(null, callback);
+    }
+
+    @Override
+    public void drop(final ClientSession clientSession, final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeDrop(clientSession, callback);
+    }
+
+    private void executeDrop(@Nullable final ClientSession clientSession, final SingleResultCallback<Void> callback) {
+        executor.execute(new DropDatabaseOperation(name, writeConcern), readConcern, clientSession, callback);
     }
 
     @Override
     public void createCollection(final String collectionName, final SingleResultCallback<Void> callback) {
-        createCollection(collectionName, new CreateCollectionOptions(), callback);
+        executeCreateCollection(null, collectionName, new CreateCollectionOptions(), callback);
     }
 
     @Override
     public void createCollection(final String collectionName, final CreateCollectionOptions createCollectionOptions,
                                  final SingleResultCallback<Void> callback) {
-        CreateCollectionOperation operation = new CreateCollectionOperation(name, collectionName)
-                .capped(createCollectionOptions.isCapped())
-                .sizeInBytes(createCollectionOptions.getSizeInBytes())
-                .autoIndex(createCollectionOptions.isAutoIndex())
-                .maxDocuments(createCollectionOptions.getMaxDocuments())
-                .usePowerOf2Sizes(createCollectionOptions.isUsePowerOf2Sizes())
-                .storageEngineOptions(toBsonDocument(createCollectionOptions.getStorageEngineOptions()));
-
-        IndexOptionDefaults indexOptionDefaults = createCollectionOptions.getIndexOptionDefaults();
-        if (indexOptionDefaults.getStorageEngine() != null) {
-            operation.indexOptionDefaults(new BsonDocument("storageEngine", toBsonDocument(indexOptionDefaults.getStorageEngine())));
+        executeCreateCollection(null, collectionName, createCollectionOptions, callback);
+    }
+
+    @Override
+    public void createCollection(final ClientSession clientSession, final String collectionName,
+                                 final SingleResultCallback<Void> callback) {
+        createCollection(clientSession, collectionName, new CreateCollectionOptions(), callback);
+    }
+
+    @Override
+    public void createCollection(final ClientSession clientSession, final String collectionName, final CreateCollectionOptions options,
+                                 final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeCreateCollection(clientSession, collectionName, options, callback);
+    }
+
+    @SuppressWarnings("deprecation")
+    private void executeCreateCollection(@Nullable final ClientSession clientSession, final String collectionName,
+                                         final CreateCollectionOptions options, final SingleResultCallback<Void> callback) {
+        CreateCollectionOperation operation = new CreateCollectionOperation(name, collectionName, writeConcern)
+                .capped(options.isCapped())
+                .sizeInBytes(options.getSizeInBytes())
+                .autoIndex(options.isAutoIndex())
+                .maxDocuments(options.getMaxDocuments())
+                .usePowerOf2Sizes(options.isUsePowerOf2Sizes())
+                .storageEngineOptions(toBsonDocument(options.getStorageEngineOptions()))
+                .collation(options.getCollation());
+
+        IndexOptionDefaults indexOptionDefaults = options.getIndexOptionDefaults();
+        Bson storageEngine = indexOptionDefaults.getStorageEngine();
+        if (storageEngine != null) {
+            operation.indexOptionDefaults(new BsonDocument("storageEngine", toBsonDocument(storageEngine)));
         }
-        ValidationOptions validationOptions = createCollectionOptions.getValidationOptions();
-        if (validationOptions.getValidator() != null) {
-            operation.validator(toBsonDocument(validationOptions.getValidator()));
+        ValidationOptions validationOptions = options.getValidationOptions();
+        Bson validator = validationOptions.getValidator();
+        if (validator != null) {
+            operation.validator(toBsonDocument(validator));
         }
         if (validationOptions.getValidationLevel() != null) {
             operation.validationLevel(validationOptions.getValidationLevel());
@@ -192,10 +308,134 @@ public void createCollection(final String collectionName, final CreateCollection
         if (validationOptions.getValidationAction() != null) {
             operation.validationAction(validationOptions.getValidationAction());
         }
-        executor.execute(operation, callback);
+        executor.execute(operation, readConcern, clientSession, callback);
+    }
+
+    @Override
+    public void createView(final String viewName, final String viewOn, final List<? extends Bson> pipeline,
+                           final SingleResultCallback<Void> callback) {
+        createView(viewName, viewOn, pipeline, new CreateViewOptions(), callback);
+    }
+
+    @Override
+    public void createView(final String viewName, final String viewOn, final List<? extends Bson> pipeline,
+                           final CreateViewOptions createViewOptions, final SingleResultCallback<Void> callback) {
+        executeCreateView(null, viewName, viewOn, pipeline, createViewOptions, callback);
+    }
+
+    @Override
+    public void createView(final ClientSession clientSession, final String viewName, final String viewOn,
+                           final List<? extends Bson> pipeline, final SingleResultCallback<Void> callback) {
+        createView(clientSession, viewName, viewOn, pipeline, new CreateViewOptions(), callback);
+    }
+
+    @Override
+    public void createView(final ClientSession clientSession, final String viewName, final String viewOn,
+                           final List<? extends Bson> pipeline, final CreateViewOptions createViewOptions,
+                           final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeCreateView(clientSession, viewName, viewOn, pipeline, createViewOptions, callback);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch() {
+        return watch(Collections.<Bson>emptyList());
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final Class<TResult> resultClass) {
+        return watch(Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final List<? extends Bson> pipeline) {
+        return watch(pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createChangeStreamIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession) {
+        return watch(clientSession, Collections.<Bson>emptyList(), Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return watch(clientSession, Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return watch(clientSession, pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                         final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createChangeStreamIterable(clientSession, pipeline, resultClass);
+    }
+
+    @Override
+    public AggregateIterable<Document> aggregate(final List<? extends Bson> pipeline) {
+        return aggregate(pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> AggregateIterable<TResult> aggregate(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createAggregateIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public AggregateIterable<Document> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return aggregate(clientSession, pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> AggregateIterable<TResult> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                          final Class<TResult> resultClass) {
+        return createAggregateIterable(notNull("clientSession", clientSession), pipeline, resultClass);
+    }
+
+    private <TResult> AggregateIterable<TResult> createAggregateIterable(@Nullable final ClientSession clientSession,
+                                                                         final List<? extends Bson> pipeline,
+                                                                         final Class<TResult> resultClass) {
+        return new AggregateIterableImpl<Document, TResult>(clientSession, name, Document.class, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, retryReads);
+    }
+
+    private <TResult> ChangeStreamIterable<TResult> createChangeStreamIterable(@Nullable final ClientSession clientSession,
+                                                                               final List<? extends Bson> pipeline,
+                                                                               final Class<TResult> resultClass) {
+        return new ChangeStreamIterableImpl<TResult>(clientSession, name, codecRegistry, readPreference,
+                readConcern, executor, pipeline, resultClass, ChangeStreamLevel.DATABASE, retryReads);
+    }
+
+    private void executeCreateView(@Nullable final ClientSession clientSession, final String viewName, final String viewOn,
+                                   final List<? extends Bson> pipeline, final CreateViewOptions createViewOptions,
+                                   final SingleResultCallback<Void> callback) {
+        notNull("createViewOptions", createViewOptions);
+        executor.execute(new CreateViewOperation(name, viewName, viewOn, createBsonDocumentList(pipeline), writeConcern)
+                .collation(createViewOptions.getCollation()), readConcern, clientSession, callback);
+    }
+
+    private List<BsonDocument> createBsonDocumentList(final List<? extends Bson> pipeline) {
+        notNull("pipeline", pipeline);
+        List<BsonDocument> bsonDocumentPipeline = new ArrayList<BsonDocument>(pipeline.size());
+        for (Bson obj : pipeline) {
+            if (obj == null) {
+                throw new IllegalArgumentException("pipeline can not contain a null value");
+            }
+            bsonDocumentPipeline.add(obj.toBsonDocument(BsonDocument.class, codecRegistry));
+        }
+        return bsonDocumentPipeline;
     }
 
-    private BsonDocument toBsonDocument(final Bson document) {
+    @Nullable
+    private BsonDocument toBsonDocument(@Nullable final Bson document) {
         return document == null ? null : document.toBsonDocument(BsonDocument.class, codecRegistry);
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoIterable.java b/driver-async/src/main/com/mongodb/async/client/MongoIterable.java
index a81be8d35e2..08af6690e20 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import com.mongodb.Function;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.lang.Nullable;
 
 import java.util.Collection;
 
@@ -28,7 +29,9 @@
  *
  * @param <TResult> the result type
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface MongoIterable<TResult> {
 
     /**
@@ -74,6 +77,16 @@ public interface MongoIterable<TResult> {
      */
     MongoIterable<TResult> batchSize(int batchSize);
 
+    /**
+     * Gets the number of documents to return per batch or null if not set.
+     *
+     * @return the batch size, which may be null
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     * @since 3.7
+     */
+    @Nullable
+    Integer getBatchSize();
+
     /**
      * Provide the underlying {@link com.mongodb.async.AsyncBatchCursor} allowing fine grained control of the cursor.
      *
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/MongoIterableImpl.java
new file mode 100644
index 00000000000..9612f9ea6f2
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/MongoIterableImpl.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.Block;
+import com.mongodb.Function;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+
+abstract class MongoIterableImpl<TResult> implements MongoIterable<TResult> {
+    private final ClientSession clientSession;
+    private final ReadConcern readConcern;
+    private final OperationExecutor executor;
+    private final ReadPreference readPreference;
+    private final boolean retryReads;
+    private Integer batchSize;
+
+    MongoIterableImpl(@Nullable final ClientSession clientSession, final OperationExecutor executor, final ReadConcern readConcern,
+                      final ReadPreference readPreference, final boolean retryReads) {
+        this.clientSession = clientSession;
+        this.executor = notNull("executor", executor);
+        this.readConcern = notNull("readConcern", readConcern);
+        this.readPreference = notNull("readPreference", readPreference);
+        this.retryReads = notNull("retryReads", retryReads);
+    }
+
+    abstract AsyncReadOperation<AsyncBatchCursor<TResult>> asAsyncReadOperation();
+
+    public ClientSession getClientSession() {
+        return clientSession;
+    }
+
+    OperationExecutor getExecutor() {
+        return executor;
+    }
+
+    ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    boolean getRetryReads() {
+        return retryReads;
+    }
+
+    @Override
+    @Nullable
+    public Integer getBatchSize() {
+        return batchSize;
+    }
+
+    @Override
+    public void forEach(final Block<? super TResult> block, final SingleResultCallback<Void> callback) {
+        notNull("block", block);
+        notNull("callback", callback);
+        batchCursor(new SingleResultCallback<AsyncBatchCursor<TResult>>() {
+            @Override
+            public void onResult(final AsyncBatchCursor<TResult> batchCursor, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    loopCursor(batchCursor, block, callback);
+                }
+            }
+        });
+    }
+
+    @Override
+    public <A extends Collection<? super TResult>> void into(final A target, final SingleResultCallback<A> callback) {
+        notNull("target", target);
+        notNull("callback", callback);
+        batchCursor(new SingleResultCallback<AsyncBatchCursor<TResult>>() {
+            @Override
+            public void onResult(final AsyncBatchCursor<TResult> batchCursor, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    loopCursor(batchCursor, new Block<TResult>() {
+                        @Override
+                        public void apply(final TResult t) {
+                            target.add(t);
+                        }
+                    }, new SingleResultCallback<Void>() {
+                        @Override
+                        public void onResult(final Void result, final Throwable t) {
+                            if (t != null) {
+                                callback.onResult(null, t);
+                            } else {
+                                callback.onResult(target, null);
+                            }
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    @Override
+    public void first(final SingleResultCallback<TResult> callback) {
+        notNull("callback", callback);
+        batchCursor(new SingleResultCallback<AsyncBatchCursor<TResult>>() {
+            @Override
+            public void onResult(final AsyncBatchCursor<TResult> batchCursor, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    batchCursor.setBatchSize(1);
+                    batchCursor.next(new SingleResultCallback<List<TResult>>() {
+                        @Override
+                        public void onResult(final List<TResult> results, final Throwable t) {
+                            batchCursor.close();
+                            if (t != null) {
+                                callback.onResult(null, t);
+                            } else if (results == null) {
+                                callback.onResult(null, null);
+                            } else {
+                                callback.onResult(results.get(0), null);
+                            }
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    @Override
+    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
+        return new MappingIterable<TResult, U>(this, mapper);
+    }
+
+    @Override
+    public MongoIterable<TResult> batchSize(final int batchSize) {
+        this.batchSize = batchSize;
+        return this;
+    }
+
+    @Override
+    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<TResult>> callback) {
+        notNull("callback", callback);
+        executor.execute(asAsyncReadOperation(), readPreference, readConcern, clientSession, callback);
+    }
+
+    private void loopCursor(final AsyncBatchCursor<TResult> batchCursor, final Block<? super TResult> block,
+                            final SingleResultCallback<Void> callback) {
+        batchCursor.next(new SingleResultCallback<List<TResult>>() {
+            @Override
+            public void onResult(final List<TResult> results, final Throwable t) {
+                if (t != null || results == null) {
+                    batchCursor.close();
+                    callback.onResult(null, t);
+                } else {
+                    try {
+                        for (TResult result : results) {
+                            block.apply(result);
+                        }
+                        loopCursor(batchCursor, block, callback);
+                    } catch (Throwable tr) {
+                        batchCursor.close();
+                        callback.onResult(null, tr);
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/MongoIterableSubscription.java b/driver-async/src/main/com/mongodb/async/client/MongoIterableSubscription.java
index 01771812389..0166cf0683d 100644
--- a/driver-async/src/main/com/mongodb/async/client/MongoIterableSubscription.java
+++ b/driver-async/src/main/com/mongodb/async/client/MongoIterableSubscription.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -34,17 +34,15 @@ final class MongoIterableSubscription<TResult> extends AbstractSubscription<TRes
 
     private volatile AsyncBatchCursor<TResult> batchCursor;
 
-    public MongoIterableSubscription(final MongoIterable<TResult> mongoIterable, final Observer<? super TResult> observer) {
+    MongoIterableSubscription(final MongoIterable<TResult> mongoIterable, final Observer<? super TResult> observer) {
         super(observer);
         this.mongoIterable = mongoIterable;
         observer.onSubscribe(this);
     }
 
-
-
     @Override
     void requestInitialData() {
-        mongoIterable.batchSize(getBatchSize());
+        mongoIterable.batchSize(calculateBatchSize());
         mongoIterable.batchCursor(new SingleResultCallback<AsyncBatchCursor<TResult>>() {
             @Override
             public void onResult(final AsyncBatchCursor<TResult> result, final Throwable t) {
@@ -67,8 +65,12 @@ boolean checkCompleted() {
 
     @Override
     void postTerminate() {
-        if (batchCursor != null) {
-            batchCursor.close();
+        try {
+            if (batchCursor != null) {
+                batchCursor.close();
+            }
+        } catch (Exception e) {
+            // do nothing
         }
     }
 
@@ -83,22 +85,24 @@ void requestMoreData() {
         }
 
         if (mustRead) {
-            batchCursor.setBatchSize(getBatchSize());
+            batchCursor.setBatchSize(calculateBatchSize());
             batchCursor.next(new SingleResultCallback<List<TResult>>() {
                 @Override
                 public void onResult(final List<TResult> result, final Throwable t) {
-
                     synchronized (MongoIterableSubscription.this) {
                         isReading = false;
-                        if (t == null && result == null) {
-                            completed = true;
-                        }
                     }
 
                     if (t != null) {
                         onError(t);
                     } else {
                         addToQueue(result);
+                        synchronized (MongoIterableSubscription.this) {
+                            if (result == null) {
+                                completed = true;
+                            }
+                        }
+                        tryProcessResultsQueue();
                     }
                 }
             });
@@ -108,12 +112,16 @@ public void onResult(final List<TResult> result, final Throwable t) {
     /**
      * Returns the batchSize to be used with the cursor.
      *
-     * <p>Anything less than 2 would close the cursor so that is the minimum batchSize and `Integer.MAX_VALUE` is the maximum
-     * batchSize.</p>
+     * <p>If the batch size has been set on the MongoIterable that is used, otherwise the requested demand is used. When using requested
+     * demand, values less than 2 would close the cursor so that is the minimum batchSize and `Integer.MAX_VALUE` is the maximum.</p>
      *
      * @return the batchSize to use
      */
-    private int getBatchSize() {
+    private int calculateBatchSize() {
+        Integer batchSize = mongoIterable.getBatchSize();
+        if (batchSize != null) {
+            return batchSize;
+        }
         long requested = getRequested();
         if (requested <= 1) {
             return 2;
diff --git a/driver-async/src/main/com/mongodb/async/client/NettyMongoClients.java b/driver-async/src/main/com/mongodb/async/client/NettyMongoClients.java
new file mode 100644
index 00000000000..3775aab709b
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/NettyMongoClients.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.connection.StreamFactory;
+import com.mongodb.connection.netty.NettyStreamFactory;
+import com.mongodb.lang.Nullable;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+
+import java.io.Closeable;
+
+// Creation of MongoClient using NettyStreamFactory is segregated here to avoid a runtime dependency on Netty in MongoClients
+final class NettyMongoClients {
+
+    @SuppressWarnings("deprecation")
+    static MongoClient create(final MongoClientSettings settings, @Nullable final MongoDriverInformation mongoDriverInformation) {
+        final EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
+        StreamFactory streamFactory = new NettyStreamFactory(settings.getSocketSettings(), settings.getSslSettings(), eventLoopGroup);
+        StreamFactory heartbeatStreamFactory = new NettyStreamFactory(settings.getHeartbeatSocketSettings(), settings.getSslSettings(),
+                eventLoopGroup);
+        return MongoClients.createMongoClient(settings, mongoDriverInformation, streamFactory, heartbeatStreamFactory,
+                new Closeable() {
+                    @Override
+                    public void close() {
+                        eventLoopGroup.shutdownGracefully().awaitUninterruptibly();
+                    }
+                });
+    }
+
+    private NettyMongoClients() {
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/Observable.java b/driver-async/src/main/com/mongodb/async/client/Observable.java
index 8c37b48d229..6794a9ad79b 100644
--- a/driver-async/src/main/com/mongodb/async/client/Observable.java
+++ b/driver-async/src/main/com/mongodb/async/client/Observable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,9 @@
  *
  * @param <TResult> the type of element signaled.
  * @see Observables
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface Observable<TResult> {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/Observables.java b/driver-async/src/main/com/mongodb/async/client/Observables.java
index 42049f422cb..1b4ed43ecd0 100644
--- a/driver-async/src/main/com/mongodb/async/client/Observables.java
+++ b/driver-async/src/main/com/mongodb/async/client/Observables.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -28,7 +28,9 @@
  * <p>Allows async methods to be converted into event-based {@link Observable}s.</p>
  *
  * @since 3.1
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public final class Observables {
 
     /**
@@ -59,7 +61,7 @@ public void subscribe(final Observer<? super TResult> observer) {
      * {@code
      *    Observable<Long> countObservable = observe(new Block<SingleResultCallback<Long>>() {
      *        public void apply(final SingleResultCallback<Long> callback) {
-     *            collection.count(callback);
+     *            collection.countDocuments(callback);
      *        }
      *    });
      * }
diff --git a/driver-async/src/main/com/mongodb/async/client/Observer.java b/driver-async/src/main/com/mongodb/async/client/Observer.java
index 221a638e671..e93204c913f 100644
--- a/driver-async/src/main/com/mongodb/async/client/Observer.java
+++ b/driver-async/src/main/com/mongodb/async/client/Observer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,7 +36,9 @@
  *
  * @param <TResult> The type of element signaled.
  * @since 3.1
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface Observer<TResult> {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/OperationExecutor.java b/driver-async/src/main/com/mongodb/async/client/OperationExecutor.java
new file mode 100644
index 00000000000..e57cb89ae13
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/OperationExecutor.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+import com.mongodb.operation.AsyncWriteOperation;
+import com.mongodb.ReadPreference;
+import com.mongodb.async.SingleResultCallback;
+
+/**
+ * An interface describing the execution of a read or a write operation.
+ */
+interface OperationExecutor {
+    /**
+     * Execute the read operation with the given read preference.
+     *
+     * @param operation the read operation.
+     * @param readPreference the read preference.
+     * @param readConcern the read concern
+     * @param callback the callback to be called when the operation has been executed
+     * @param <T> the operations result type.
+     */
+    <T> void execute(AsyncReadOperation<T> operation, ReadPreference readPreference, ReadConcern readConcern,
+                     SingleResultCallback<T> callback);
+
+    /**
+     * Execute the read operation with the given read preference.
+     *
+     * @param operation the read operation.
+     * @param readPreference the read preference.
+     * @param readConcern the read concern
+     * @param session the session to associate this operation with
+     * @param callback the callback to be called when the operation has been executed
+     * @param <T> the operations result type.
+     */
+    <T> void execute(AsyncReadOperation<T> operation, ReadPreference readPreference, ReadConcern readConcern,
+                     @Nullable ClientSession session, SingleResultCallback<T> callback);
+
+    /**
+     * Execute the write operation.
+     *
+     * @param operation the write operation.
+     * @param readConcern the read concern
+     * @param callback the callback to be called when the operation has been executed
+     * @param <T> the operations result type.
+     */
+    <T> void execute(AsyncWriteOperation<T> operation, ReadConcern readConcern, SingleResultCallback<T> callback);
+
+    /**
+     * Execute the write operation.
+     *
+     * @param operation the write operation.
+     * @param session the session to associate this operation with
+     * @param readConcern the read concern
+     * @param callback the callback to be called when the operation has been executed
+     * @param <T> the operations result type.
+     */
+    <T> void execute(AsyncWriteOperation<T> operation, ReadConcern readConcern, @Nullable ClientSession session,
+                     SingleResultCallback<T> callback);
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/OperationExecutorImpl.java b/driver-async/src/main/com/mongodb/async/client/OperationExecutorImpl.java
new file mode 100644
index 00000000000..242cb2b3fa9
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/OperationExecutorImpl.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoQueryException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.MongoTimeoutException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.internal.Crypt;
+import com.mongodb.async.client.internal.AsyncCryptBinding;
+import com.mongodb.binding.AsyncClusterBinding;
+import com.mongodb.binding.AsyncReadWriteBinding;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.binding.AsyncClusterAwareReadWriteBinding;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AsyncReadOperation;
+import com.mongodb.operation.AsyncWriteOperation;
+
+import static com.mongodb.MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL;
+import static com.mongodb.MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL;
+import static com.mongodb.ReadPreference.primary;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+
+class OperationExecutorImpl implements OperationExecutor {
+    private static final Logger LOGGER = Loggers.getLogger("client");
+    private final MongoClientImpl mongoClient;
+    private final ClientSessionHelper clientSessionHelper;
+
+    OperationExecutorImpl(final MongoClientImpl mongoClient, final ClientSessionHelper clientSessionHelper) {
+        this.mongoClient = mongoClient;
+        this.clientSessionHelper = clientSessionHelper;
+    }
+
+    @Override
+    public <T> void execute(final AsyncReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern,
+                            final SingleResultCallback<T> callback) {
+        execute(operation, readPreference, readConcern, null, callback);
+    }
+
+    @Override
+    public <T> void execute(final AsyncReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern,
+                            @Nullable final ClientSession session, final SingleResultCallback<T> callback) {
+        notNull("operation", operation);
+        notNull("readPreference", readPreference);
+        notNull("callback", callback);
+        final SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        clientSessionHelper.withClientSession(session, this, new SingleResultCallback<ClientSession>(){
+            @Override
+            public void onResult(final ClientSession clientSession, final Throwable t) {
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else {
+                    getReadWriteBinding(readPreference, readConcern, clientSession,
+                            session == null && clientSession != null,
+                            new SingleResultCallback<AsyncReadWriteBinding>() {
+                                @Override
+                                public void onResult(final AsyncReadWriteBinding binding, final Throwable t) {
+                                    if (t != null) {
+                                        errHandlingCallback.onResult(null, t);
+                                    } else {
+                                        if (session != null && session.hasActiveTransaction()
+                                                && !binding.getReadPreference().equals(primary())) {
+                                            binding.release();
+                                            errHandlingCallback.onResult(null,
+                                                    new MongoClientException("Read preference in a transaction must be primary"));
+                                        } else {
+                                            operation.executeAsync(binding, new SingleResultCallback<T>() {
+                                                @Override
+                                                public void onResult(final T result, final Throwable t) {
+                                                    try {
+                                                        labelException(t, session);
+                                                        unpinServerAddressOnTransientTransactionError(session, t);
+                                                        errHandlingCallback.onResult(result, t);
+                                                    } finally {
+                                                        binding.release();
+                                                    }
+                                                }
+                                            });
+                                        }
+                                    }
+                                }
+                            });
+                }
+            }
+        });
+    }
+
+    @Override
+    public <T> void execute(final AsyncWriteOperation<T> operation, final ReadConcern readConcern, final SingleResultCallback<T> callback) {
+        execute(operation, readConcern, null, callback);
+    }
+
+    @Override
+    public <T> void execute(final AsyncWriteOperation<T> operation, final ReadConcern readConcern, @Nullable final ClientSession session,
+                            final SingleResultCallback<T> callback) {
+        notNull("operation", operation);
+        notNull("callback", callback);
+        final SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        clientSessionHelper.withClientSession(session, this, new SingleResultCallback<ClientSession>() {
+            @Override
+            public void onResult(final ClientSession clientSession, final Throwable t) {
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else {
+                    getReadWriteBinding(ReadPreference.primary(), readConcern, clientSession,
+                            session == null && clientSession != null,
+                            new SingleResultCallback<AsyncReadWriteBinding>() {
+                                @Override
+                                public void onResult(final AsyncReadWriteBinding binding, final Throwable t) {
+                                    if (t != null) {
+                                        errHandlingCallback.onResult(null, t);
+                                    } else {
+                                        operation.executeAsync(binding, new SingleResultCallback<T>() {
+                                            @Override
+                                            public void onResult(final T result, final Throwable t) {
+                                                try {
+                                                    labelException(t, session);
+                                                    unpinServerAddressOnTransientTransactionError(session, t);
+                                                    errHandlingCallback.onResult(result, t);
+                                                } finally {
+                                                    binding.release();
+                                                }
+                                            }
+                                        });
+                                    }
+                                }
+                            });
+                }
+            }
+        });
+    }
+
+    private void labelException(final Throwable t, final ClientSession session) {
+        if (session != null && session.hasActiveTransaction()
+                && (t instanceof MongoSocketException || t instanceof MongoTimeoutException
+                || (t instanceof MongoQueryException && ((MongoQueryException) t).getErrorCode() == 91))
+                && !((MongoException) t).hasErrorLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) {
+            ((MongoException) t).addLabel(TRANSIENT_TRANSACTION_ERROR_LABEL);
+        }
+    }
+
+    private void unpinServerAddressOnTransientTransactionError(final @Nullable ClientSession session, final Throwable throwable) {
+        if (session != null && throwable != null && throwable instanceof MongoException
+                && ((MongoException) throwable).hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)) {
+            session.setPinnedServerAddress(null);
+        }
+    }
+
+
+    private void getReadWriteBinding(final ReadPreference readPreference, final ReadConcern readConcern,
+                                     @Nullable final ClientSession session, final boolean ownsSession,
+                                     final SingleResultCallback<AsyncReadWriteBinding> callback) {
+        notNull("readPreference", readPreference);
+        AsyncClusterAwareReadWriteBinding readWriteBinding = new AsyncClusterBinding(mongoClient.getCluster(),
+                getReadPreferenceForBinding(readPreference, session), readConcern);
+
+        Crypt crypt = mongoClient.getCrypt();
+        if (crypt != null) {
+            readWriteBinding = new AsyncCryptBinding(readWriteBinding, crypt);
+        }
+
+        if (session != null) {
+            callback.onResult(new ClientSessionBinding(session, ownsSession, readWriteBinding), null);
+        } else {
+            callback.onResult(readWriteBinding, null);
+        }
+    }
+
+    private ReadPreference getReadPreferenceForBinding(final ReadPreference readPreference, @Nullable final ClientSession session) {
+        if (session == null) {
+            return readPreference;
+        }
+        if (session.hasActiveTransaction()) {
+            ReadPreference readPreferenceForBinding = session.getTransactionOptions().getReadPreference();
+            if (readPreferenceForBinding == null) {
+                throw new MongoInternalException("Invariant violated.  Transaction options read preference can not be null");
+            }
+            return readPreferenceForBinding;
+        }
+        return readPreference;
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/OperationIterable.java b/driver-async/src/main/com/mongodb/async/client/OperationIterable.java
deleted file mode 100644
index 441b8fe41a4..00000000000
--- a/driver-async/src/main/com/mongodb/async/client/OperationIterable.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.async.client;
-
-import com.mongodb.Block;
-import com.mongodb.Function;
-import com.mongodb.ReadPreference;
-import com.mongodb.async.AsyncBatchCursor;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.operation.AsyncOperationExecutor;
-import com.mongodb.operation.AsyncReadOperation;
-
-import java.util.Collection;
-import java.util.List;
-
-import static org.bson.assertions.Assertions.notNull;
-
-class OperationIterable<T> implements MongoIterable<T> {
-    private final AsyncReadOperation<? extends AsyncBatchCursor<T>> operation;
-    private final ReadPreference readPreference;
-    private final AsyncOperationExecutor executor;
-
-    OperationIterable(final AsyncReadOperation<? extends AsyncBatchCursor<T>> operation, final ReadPreference readPreference,
-                      final AsyncOperationExecutor executor) {
-        this.operation = notNull("operation", operation);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.executor = notNull("executor", executor);
-    }
-
-    @Override
-    public void forEach(final Block<? super T> block, final SingleResultCallback<Void> callback) {
-        notNull("block", block);
-        notNull("callback", callback);
-        batchCursor(new SingleResultCallback<AsyncBatchCursor<T>>() {
-            @Override
-            public void onResult(final AsyncBatchCursor<T> batchCursor, final Throwable t) {
-                if (t != null) {
-                    callback.onResult(null, t);
-                } else {
-                    loopCursor(batchCursor, block, callback);
-                }
-            }
-        });
-    }
-
-    @Override
-    public <A extends Collection<? super T>> void into(final A target, final SingleResultCallback<A> callback) {
-        notNull("target", target);
-        notNull("callback", callback);
-        batchCursor(new SingleResultCallback<AsyncBatchCursor<T>>() {
-            @Override
-            public void onResult(final AsyncBatchCursor<T> batchCursor, final Throwable t) {
-                if (t != null) {
-                    callback.onResult(null, t);
-                } else {
-                    loopCursor(batchCursor, new Block<T>() {
-                        @Override
-                        public void apply(final T t) {
-                            target.add(t);
-                        }
-                    }, new SingleResultCallback<Void>() {
-                        @Override
-                        public void onResult(final Void result, final Throwable t) {
-                            if (t != null) {
-                                callback.onResult(null, t);
-                            } else {
-                                callback.onResult(target, null);
-                            }
-                        }
-                    });
-                }
-            }
-        });
-    }
-
-    @Override
-    public void first(final SingleResultCallback<T> callback) {
-        notNull("callback", callback);
-        batchCursor(new SingleResultCallback<AsyncBatchCursor<T>>() {
-            @Override
-            public void onResult(final AsyncBatchCursor<T> batchCursor, final Throwable t) {
-                if (t != null) {
-                    callback.onResult(null, t);
-                } else {
-                    batchCursor.setBatchSize(1);
-                    batchCursor.next(new SingleResultCallback<List<T>>() {
-                        @Override
-                        public void onResult(final List<T> results, final Throwable t) {
-                            batchCursor.close();
-                            if (t != null) {
-                                callback.onResult(null, t);
-                            } else if (results == null) {
-                                callback.onResult(null, null);
-                            } else {
-                                callback.onResult(results.get(0), null);
-                            }
-                        }
-                    });
-                }
-            }
-        });
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<T, U> mapper) {
-        return new MappingIterable<T, U>(this, mapper);
-    }
-
-    @Override
-    public OperationIterable<T> batchSize(final int batchSize) {
-        throw new UnsupportedOperationException();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void batchCursor(final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        notNull("callback", callback);
-        executor.execute((AsyncReadOperation<AsyncBatchCursor<T>>) operation, readPreference, callback);
-    }
-
-    private void loopCursor(final AsyncBatchCursor<T> batchCursor, final Block<? super T> block,
-                            final SingleResultCallback<Void> callback) {
-        batchCursor.next(new SingleResultCallback<List<T>>() {
-            @Override
-            public void onResult(final List<T> results, final Throwable t) {
-                if (t != null || results == null) {
-                    batchCursor.close();
-                    callback.onResult(null, t);
-                } else {
-                    try {
-                        for (T result : results) {
-                            block.apply(result);
-                        }
-                        loopCursor(batchCursor, block, callback);
-                    } catch (Throwable tr) {
-                        batchCursor.close();
-                        callback.onResult(null, tr);
-                    }
-                }
-            }
-        });
-    }
-
-}
diff --git a/driver-async/src/main/com/mongodb/async/client/SingleResultCallbackSubscription.java b/driver-async/src/main/com/mongodb/async/client/SingleResultCallbackSubscription.java
index e6984211536..a52f1747082 100644
--- a/driver-async/src/main/com/mongodb/async/client/SingleResultCallbackSubscription.java
+++ b/driver-async/src/main/com/mongodb/async/client/SingleResultCallbackSubscription.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,8 +27,7 @@ class SingleResultCallbackSubscription<TResult> extends AbstractSubscription<TRe
     private boolean completed;
     /* protected by `this` */
 
-    public SingleResultCallbackSubscription(final Block<SingleResultCallback<TResult>> block,
-                                            final Observer<? super TResult> observer) {
+    SingleResultCallbackSubscription(final Block<SingleResultCallback<TResult>> block, final Observer<? super TResult> observer) {
         super(observer);
         this.block = block;
         observer.onSubscribe(this);
@@ -42,10 +41,11 @@ public void onResult(final TResult result, final Throwable t) {
                 if (t != null) {
                     onError(t);
                 } else {
+                    addToQueue(result);
                     synchronized (SingleResultCallbackSubscription.this) {
                         completed = true;
                     }
-                    addToQueue(result);
+                    tryProcessResultsQueue();
                 }
             }
         });
diff --git a/driver-async/src/main/com/mongodb/async/client/Subscription.java b/driver-async/src/main/com/mongodb/async/client/Subscription.java
index 1f34fc3fb16..80ec1ca5f94 100644
--- a/driver-async/src/main/com/mongodb/async/client/Subscription.java
+++ b/driver-async/src/main/com/mongodb/async/client/Subscription.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,9 @@
  * </p>
  *
  * @since 3.1
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface Subscription {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/WriteOperationThenCursorReadOperation.java b/driver-async/src/main/com/mongodb/async/client/WriteOperationThenCursorReadOperation.java
new file mode 100644
index 00000000000..0b64817ba26
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/WriteOperationThenCursorReadOperation.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncReadBinding;
+import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.operation.AsyncReadOperation;
+import com.mongodb.operation.AsyncWriteOperation;
+
+class WriteOperationThenCursorReadOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>> {
+    private final AsyncWriteOperation<Void> aggregateToCollectionOperation;
+    private final AsyncReadOperation<AsyncBatchCursor<T>> readOperation;
+
+    WriteOperationThenCursorReadOperation(final AsyncWriteOperation<Void> aggregateToCollectionOperation,
+                                          final AsyncReadOperation<AsyncBatchCursor<T>> readOperation) {
+        this.aggregateToCollectionOperation = aggregateToCollectionOperation;
+        this.readOperation = readOperation;
+    }
+
+    public AsyncWriteOperation<Void> getAggregateToCollectionOperation() {
+        return aggregateToCollectionOperation;
+    }
+
+    public AsyncReadOperation<AsyncBatchCursor<T>> getReadOperation() {
+        return readOperation;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
+        aggregateToCollectionOperation.executeAsync((AsyncWriteBinding) binding, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    readOperation.executeAsync(binding, callback);
+                }
+            }
+        });
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncInputStream.java b/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncInputStream.java
index 2470194cd73..86824e41341 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncInputStream.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncInputStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,9 @@
  *
  * <p>See the {@link com.mongodb.async.client.gridfs.helpers} package for adapters that create an {@code AsyncInputStream}</p>
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface AsyncInputStream {
 
     /**
@@ -37,6 +39,15 @@ public interface AsyncInputStream {
      */
     void read(ByteBuffer dst, SingleResultCallback<Integer> callback);
 
+    /**
+     * Skips over and discards n bytes of data from this input stream.
+     * @param bytesToSkip the number of bytes to skip
+     * @param callback the callback returning the actual number of bytes skipped
+     *
+     * @since 3.10
+     */
+    void skip(long bytesToSkip, SingleResultCallback<Long> callback);
+
     /**
      * Closes the input stream
      *
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncOutputStream.java b/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncOutputStream.java
index 7e1e522fecc..eac3fb68042 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncOutputStream.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/AsyncOutputStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,9 @@
  *
  * <p>See the {@link com.mongodb.async.client.gridfs.helpers} package for adapters that create an {@code AsyncOutputStream}</p>
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface AsyncOutputStream {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucket.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucket.java
index f242014c164..96532d6e45a 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucket.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucket.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.annotations.ThreadSafe;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.ClientSession;
 import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
 import com.mongodb.client.gridfs.model.GridFSUploadOptions;
 import org.bson.BsonValue;
@@ -31,8 +32,10 @@
  * Represents a GridFS Bucket
  *
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
 @ThreadSafe
+@Deprecated
 public interface GridFSBucket {
 
     /**
@@ -72,6 +75,16 @@ public interface GridFSBucket {
      */
     ReadConcern getReadConcern();
 
+    /**
+     * Returns true if computing MD5 checksums when uploading files is disabled.
+     *
+     * @return true if computing MD5 checksums when uploading files is disabled.
+     * @since 3.8
+     * @deprecated there is no replacement for this method, as MD5 is being removed
+     */
+    @Deprecated
+    boolean getDisableMD5();
+
     /**
      * Create a new GridFSBucket instance with a new chunk size in bytes.
      *
@@ -106,6 +119,17 @@ public interface GridFSBucket {
      */
     GridFSBucket withReadConcern(ReadConcern readConcern);
 
+    /**
+     * Create a new GridFSBucket instance with the set disable MD5 value.
+     *
+     * @param disableMD5 true if computing MD5 checksums when uploading files should be disabled.
+     * @return a new GridFSBucket instance with the new disable MD5 value.
+     * @since 3.8
+     * @deprecated there is no replacement for this method, as MD5 is being removed
+     */
+    @Deprecated
+    GridFSBucket withDisableMD5(boolean disableMD5);
+
     /**
      * Opens a AsyncOutputStream that the application can write the contents of the file to.
      * <p>
@@ -166,6 +190,78 @@ public interface GridFSBucket {
      */
     GridFSUploadStream openUploadStream(BsonValue id, String filename, GridFSUploadOptions options);
 
+    /**
+     * Opens a AsyncOutputStream that the application can write the contents of the file to.
+     * <p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     * application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, String filename);
+
+    /**
+     * Opens a AsyncOutputStream that the application can write the contents of the file to.
+     * <p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @param options  the GridFSUploadOptions
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     * application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, String filename, GridFSUploadOptions options);
+
+    /**
+     * Opens a AsyncOutputStream that the application can write the contents of the file to.
+     * <p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     * application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, BsonValue id, String filename);
+
+    /**
+     * Opens a AsyncOutputStream that the application can write the contents of the file to.
+     * <p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param options  the GridFSUploadOptions
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     * application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, BsonValue id, String filename, GridFSUploadOptions options);
+
     /**
      * Uploads the contents of the given {@code AsyncInputStream} to a GridFS bucket.
      * <p>
@@ -223,6 +319,77 @@ public interface GridFSBucket {
     void uploadFromStream(BsonValue id, String filename, AsyncInputStream source, GridFSUploadOptions options,
                           SingleResultCallback<Void> callback);
 
+    /**
+     * Uploads the contents of the given {@code AsyncInputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code source} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @param source   the Stream providing the file data
+     * @param callback with the ObjectId of the uploaded file.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void uploadFromStream(ClientSession clientSession, String filename, AsyncInputStream source, SingleResultCallback<ObjectId> callback);
+
+    /**
+     * Uploads the contents of the given {@code AsyncInputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code source} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @param source   the Stream providing the file data
+     * @param options  the GridFSUploadOptions
+     * @param callback with the ObjectId of the uploaded file.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void uploadFromStream(ClientSession clientSession, String filename, AsyncInputStream source, GridFSUploadOptions options,
+                          SingleResultCallback<ObjectId> callback);
+
+    /**
+     * Uploads the contents of the given {@code AsyncInputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code source} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param source   the Stream providing the file data
+     * @param callback with the ObjectId of the uploaded file.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void uploadFromStream(ClientSession clientSession, BsonValue id, String filename, AsyncInputStream source,
+                          SingleResultCallback<Void> callback);
+
+    /**
+     * Uploads the contents of the given {@code AsyncInputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code source} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id       the custom id value of the file
+     * @param filename the filename for the stream
+     * @param source   the Stream providing the file data
+     * @param options  the GridFSUploadOptions
+     * @param callback with the ObjectId of the uploaded file.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void uploadFromStream(ClientSession clientSession, BsonValue id, String filename, AsyncInputStream source, GridFSUploadOptions options,
+                          SingleResultCallback<Void> callback);
+
     /**
      * Opens a AsyncInputStream from which the application can read the contents of the stored file specified by {@code id}.
      *
@@ -232,51 +399,98 @@ void uploadFromStream(BsonValue id, String filename, AsyncInputStream source, Gr
     GridFSDownloadStream openDownloadStream(ObjectId id);
 
     /**
-     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination}
-     * AsyncOutputStream.
+     * Opens a AsyncInputStream from which the application can read the contents of the stored file specified by {@code id}.
      *
-     * @param id          the ObjectId of the file to be written to the destination stream
-     * @param destination the destination stream
-     * @param callback    the callback that is completed once the file has been downloaded
+     * @param id the custom id value of the file, to be put into a stream.
+     * @return the stream
      */
-    void downloadToStream(ObjectId id, AsyncOutputStream destination, SingleResultCallback<Long> callback);
+    GridFSDownloadStream openDownloadStream(BsonValue id);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the latest version of the stored file specified by the
+     * {@code filename}.
+     *
+     * @param filename the name of the file to be downloaded
+     * @return the stream
+     */
+    GridFSDownloadStream openDownloadStream(String filename);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code filename} and the revision
+     * in {@code options}.
+     *
+     * @param filename the name of the file to be downloaded
+     * @param options  the download options
+     * @return the stream
+     */
+    GridFSDownloadStream openDownloadStream(String filename, GridFSDownloadOptions options);
 
     /**
      * Opens a AsyncInputStream from which the application can read the contents of the stored file specified by {@code id}.
      *
-     * @param id the custom id value of the file, to be put into a stream.
+     * @param clientSession the client session with which to associate this operation
+     * @param id the ObjectId of the file to be put into a stream.
      * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
      */
-    GridFSDownloadStream openDownloadStream(BsonValue id);
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, ObjectId id);
 
     /**
-     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination}
-     * AsyncOutputStream.
+     * Opens a AsyncInputStream from which the application can read the contents of the stored file specified by {@code id}.
      *
-     * @param id          the custom id of the file, to be written to the destination stream
-     * @param destination the destination stream
-     * @param callback    the callback that is completed once the file has been downloaded
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file, to be put into a stream.
+     * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
      */
-    void downloadToStream(BsonValue id, AsyncOutputStream destination, SingleResultCallback<Long> callback);
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, BsonValue id);
 
     /**
      * Opens a Stream from which the application can read the contents of the latest version of the stored file specified by the
      * {@code filename}.
      *
+     * @param clientSession the client session with which to associate this operation
      * @param filename the name of the file to be downloaded
      * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
      */
-    GridFSDownloadStream openDownloadStream(String filename);
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, String filename);
 
     /**
      * Opens a Stream from which the application can read the contents of the stored file specified by {@code filename} and the revision
      * in {@code options}.
      *
+     * @param clientSession the client session with which to associate this operation
      * @param filename the name of the file to be downloaded
      * @param options  the download options
      * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
      */
-    GridFSDownloadStream openDownloadStream(String filename, GridFSDownloadOptions options);
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, String filename, GridFSDownloadOptions options);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination}
+     * AsyncOutputStream.
+     *
+     * @param id          the ObjectId of the file to be written to the destination stream
+     * @param destination the destination stream
+     * @param callback    the callback that is completed once the file has been downloaded
+     */
+    void downloadToStream(ObjectId id, AsyncOutputStream destination, SingleResultCallback<Long> callback);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination}
+     * AsyncOutputStream.
+     *
+     * @param id          the custom id of the file, to be written to the destination stream
+     * @param destination the destination stream
+     * @param callback    the callback that is completed once the file has been downloaded
+     */
+    void downloadToStream(BsonValue id, AsyncOutputStream destination, SingleResultCallback<Long> callback);
 
     /**
      * Downloads the contents of the latest version of the stored file specified by {@code filename} and writes the contents to
@@ -300,6 +514,60 @@ void uploadFromStream(BsonValue id, String filename, AsyncInputStream source, Gr
     void downloadToStream(String filename, AsyncOutputStream destination, GridFSDownloadOptions options,
                           SingleResultCallback<Long> callback);
 
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination}
+     * AsyncOutputStream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id          the ObjectId of the file to be written to the destination stream
+     * @param destination the destination stream
+     * @param callback    the callback that is completed once the file has been downloaded
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, ObjectId id, AsyncOutputStream destination, SingleResultCallback<Long> callback);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination}
+     * AsyncOutputStream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id          the custom id of the file, to be written to the destination stream
+     * @param destination the destination stream
+     * @param callback    the callback that is completed once the file has been downloaded
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, BsonValue id, AsyncOutputStream destination, SingleResultCallback<Long> callback);
+
+    /**
+     * Downloads the contents of the latest version of the stored file specified by {@code filename} and writes the contents to
+     * the {@code destination} Stream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename    the name of the file to be downloaded
+     * @param destination the destination stream
+     * @param callback    the callback that is completed once the file has been downloaded
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, String filename, AsyncOutputStream destination, SingleResultCallback<Long> callback);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code filename} and by the revision in {@code options} and writes the
+     * contents to the {@code destination} Stream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename    the name of the file to be downloaded
+     * @param destination the destination stream
+     * @param options     the download options
+     * @param callback    the callback that is completed once the file has been downloaded
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, String filename, AsyncOutputStream destination, GridFSDownloadOptions options,
+                          SingleResultCallback<Long> callback);
+
     /**
      * Finds all documents in the files collection.
      *
@@ -324,6 +592,36 @@ void downloadToStream(String filename, AsyncOutputStream destination, GridFSDown
      */
     GridFSFindIterable find(Bson filter);
 
+    /**
+     * Finds all documents in the files collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the GridFS find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSFindIterable find(ClientSession clientSession);
+
+    /**
+     * Finds all documents in the collection that match the filter.
+     * <p>
+     * Below is an example of filtering against the filename and some nested metadata that can also be stored along with the file data:
+     * <pre>
+     *  {@code
+     *      Filters.and(Filters.eq("filename", "mongodb.png"), Filters.eq("metadata.contentType", "image/png"));
+     *  }
+     *  </pre>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter
+     * @return the GridFS find iterable interface
+     * @see com.mongodb.client.model.Filters
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSFindIterable find(ClientSession clientSession, Bson filter);
+
     /**
      * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
      *
@@ -340,6 +638,28 @@ void downloadToStream(String filename, AsyncOutputStream destination, GridFSDown
      */
     void delete(BsonValue id, SingleResultCallback<Void> callback);
 
+    /**
+     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id       the ObjectId of the file to be deleted
+     * @param callback the callback that is completed once the file has been deleted
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void delete(ClientSession clientSession, ObjectId id, SingleResultCallback<Void> callback);
+
+    /**
+     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id       the ObjectId of the file to be deleted
+     * @param callback the callback that is completed once the file has been deleted
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void delete(ClientSession clientSession, BsonValue id, SingleResultCallback<Void> callback);
+
     /**
      * Renames the stored file with the specified {@code id}.
      *
@@ -358,6 +678,30 @@ void downloadToStream(String filename, AsyncOutputStream destination, GridFSDown
      */
     void rename(BsonValue id, String newFilename, SingleResultCallback<Void> callback);
 
+    /**
+     * Renames the stored file with the specified {@code id}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id          the id of the file in the files collection to rename
+     * @param newFilename the new filename for the file
+     * @param callback    the callback that is completed once the file has been renamed
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void rename(ClientSession clientSession, ObjectId id, String newFilename, SingleResultCallback<Void> callback);
+
+    /**
+     * Renames the stored file with the specified {@code id}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id          the id of the file in the files collection to rename
+     * @param newFilename the new filename for the file
+     * @param callback    the callback that is completed once the file has been renamed
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void rename(ClientSession clientSession, BsonValue id, String newFilename, SingleResultCallback<Void> callback);
+
     /**
      * Drops the data associated with this bucket from the database.
      *
@@ -365,4 +709,13 @@ void downloadToStream(String filename, AsyncOutputStream destination, GridFSDown
      */
     void drop(SingleResultCallback<Void> callback);
 
+    /**
+     * Drops the data associated with this bucket from the database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param callback the callback that is completed once the collection has been dropped
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void drop(ClientSession clientSession, SingleResultCallback<Void> callback);
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucketImpl.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucketImpl.java
index b3e990df249..0fb80170375 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucketImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBucketImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,8 @@
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.ClientSession;
+import com.mongodb.async.client.FindIterable;
 import com.mongodb.async.client.MongoClients;
 import com.mongodb.async.client.MongoCollection;
 import com.mongodb.async.client.MongoDatabase;
@@ -31,6 +33,7 @@
 import com.mongodb.client.result.UpdateResult;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonObjectId;
 import org.bson.BsonString;
@@ -40,6 +43,7 @@
 import org.bson.types.ObjectId;
 
 import java.io.IOException;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
 import static com.mongodb.assertions.Assertions.notNull;
@@ -56,6 +60,7 @@ final class GridFSBucketImpl implements GridFSBucket {
     private final int chunkSizeBytes;
     private final MongoCollection<GridFSFile> filesCollection;
     private final MongoCollection<Document> chunksCollection;
+    private final boolean disableMD5;
 
     GridFSBucketImpl(final MongoDatabase database) {
         this(database, "fs");
@@ -64,15 +69,16 @@ final class GridFSBucketImpl implements GridFSBucket {
     GridFSBucketImpl(final MongoDatabase database, final String bucketName) {
         this(notNull("bucketName", bucketName), DEFAULT_CHUNKSIZE_BYTES,
                 getFilesCollection(notNull("database", database), bucketName),
-                getChunksCollection(database, bucketName));
+                getChunksCollection(database, bucketName), false);
     }
 
     GridFSBucketImpl(final String bucketName, final int chunkSizeBytes, final MongoCollection<GridFSFile> filesCollection,
-                     final MongoCollection<Document> chunksCollection) {
+                     final MongoCollection<Document> chunksCollection, final boolean disableMD5) {
         this.bucketName = notNull("bucketName", bucketName);
         this.chunkSizeBytes = chunkSizeBytes;
         this.filesCollection = notNull("filesCollection", filesCollection);
         this.chunksCollection = notNull("chunksCollection", chunksCollection);
+        this.disableMD5 = disableMD5;
     }
 
     @Override
@@ -100,30 +106,40 @@ public ReadConcern getReadConcern() {
         return filesCollection.getReadConcern();
     }
 
+    @Override
+    public boolean getDisableMD5() {
+        return disableMD5;
+    }
+
     @Override
     public GridFSBucket withChunkSizeBytes(final int chunkSizeBytes) {
-        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection, chunksCollection);
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection, chunksCollection, disableMD5);
     }
 
     @Override
     public GridFSBucket withReadPreference(final ReadPreference readPreference) {
         notNull("readPreference", readPreference);
         return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadPreference(readPreference),
-                chunksCollection.withReadPreference(readPreference));
+                chunksCollection.withReadPreference(readPreference), disableMD5);
     }
 
     @Override
     public GridFSBucket withWriteConcern(final WriteConcern writeConcern) {
         notNull("writeConcern", writeConcern);
         return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withWriteConcern(writeConcern),
-                chunksCollection.withWriteConcern(writeConcern));
+                chunksCollection.withWriteConcern(writeConcern), disableMD5);
     }
 
     @Override
     public GridFSBucket withReadConcern(final ReadConcern readConcern) {
         notNull("readConcern", readConcern);
         return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadConcern(readConcern),
-                chunksCollection.withReadConcern(readConcern));
+                chunksCollection.withReadConcern(readConcern), disableMD5);
+    }
+
+    @Override
+    public GridFSBucket withDisableMD5(final boolean disableMD5) {
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection, chunksCollection, disableMD5);
     }
 
     @Override
@@ -143,10 +159,39 @@ public GridFSUploadStream openUploadStream(final BsonValue id, final String file
 
     @Override
     public GridFSUploadStream openUploadStream(final BsonValue id, final String filename, final GridFSUploadOptions options) {
-        notNull("filename", filename);
-        int chunkSize = options.getChunkSizeBytes() == null ? chunkSizeBytes : options.getChunkSizeBytes();
-        return new GridFSUploadStreamImpl(filesCollection, chunksCollection, id, filename, chunkSize, options.getMetadata(),
-                new GridFSIndexCheckImpl(filesCollection, chunksCollection));
+        return createGridFSUploadStream(null, id, filename, options);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final String filename) {
+        return openUploadStream(clientSession, new BsonObjectId(), filename);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final String filename,
+                                               final GridFSUploadOptions options) {
+        return openUploadStream(clientSession, new BsonObjectId(), filename, options);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final BsonValue id, final String filename) {
+        return openUploadStream(clientSession, id, filename, new GridFSUploadOptions());
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final BsonValue id, final String filename,
+                                               final GridFSUploadOptions options) {
+        notNull("clientSession", clientSession);
+        return createGridFSUploadStream(clientSession, id, filename, options);
+    }
+
+    private GridFSUploadStream createGridFSUploadStream(@Nullable final ClientSession clientSession, final BsonValue id,
+                                                        final String filename, final GridFSUploadOptions options) {
+        notNull("options", options);
+        Integer chunkSizeBytes = options.getChunkSizeBytes();
+        int chunkSize = chunkSizeBytes == null ? this.chunkSizeBytes : chunkSizeBytes;
+        return new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, id, filename, chunkSize, disableMD5,
+                options.getMetadata(), new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection));
     }
 
     @Override
@@ -179,80 +224,183 @@ public void uploadFromStream(final BsonValue id, final String filename, final As
     @Override
     public void uploadFromStream(final BsonValue id, final String filename, final AsyncInputStream source,
                                  final GridFSUploadOptions options, final SingleResultCallback<Void> callback) {
+        executeUploadFromStream(null, id, filename, source, options, callback);
+    }
+
+    @Override
+    public void uploadFromStream(final ClientSession clientSession, final String filename, final AsyncInputStream source,
+                                 final SingleResultCallback<ObjectId> callback) {
+        uploadFromStream(clientSession, filename, source, new GridFSUploadOptions(), callback);
+    }
+
+    @Override
+    public void uploadFromStream(final ClientSession clientSession, final String filename, final AsyncInputStream source,
+                                 final GridFSUploadOptions options, final SingleResultCallback<ObjectId> callback) {
+        final BsonObjectId id = new BsonObjectId();
+        uploadFromStream(clientSession, id, filename, source, options, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(id.getValue(), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void uploadFromStream(final ClientSession clientSession, final BsonValue id, final String filename,
+                                 final AsyncInputStream source, final SingleResultCallback<Void> callback) {
+        uploadFromStream(clientSession, id, filename, source, new GridFSUploadOptions(), callback);
+    }
+
+    @Override
+    public void uploadFromStream(final ClientSession clientSession, final BsonValue id, final String filename,
+                                 final AsyncInputStream source, final GridFSUploadOptions options,
+                                 final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeUploadFromStream(clientSession, id, filename, source, options, callback);
+    }
+
+    private void executeUploadFromStream(@Nullable final ClientSession clientSession, final BsonValue id, final String filename,
+                                 final AsyncInputStream source, final GridFSUploadOptions options,
+                                 final SingleResultCallback<Void> callback) {
         notNull("filename", filename);
         notNull("source", source);
         notNull("options", options);
         notNull("callback", callback);
-        int chunkSize = options.getChunkSizeBytes() == null ? chunkSizeBytes : options.getChunkSizeBytes();
-        readAndWriteInputStream(source, openUploadStream(id, filename, options), ByteBuffer.allocate(chunkSize),
-                errorHandlingCallback(callback, LOGGER));
+        Integer chunkSizeBytes = options.getChunkSizeBytes();
+        int chunkSize = chunkSizeBytes == null ? this.chunkSizeBytes : chunkSizeBytes;
+        GridFSUploadStream uploadStream;
+        if (clientSession != null){
+            uploadStream = openUploadStream(clientSession, id, filename, options);
+        } else {
+            uploadStream = openUploadStream(id, filename, options);
+        }
+        readAndWriteInputStream(source, uploadStream, ByteBuffer.allocate(chunkSize), errorHandlingCallback(callback, LOGGER));
     }
 
     @Override
     public GridFSDownloadStream openDownloadStream(final ObjectId id) {
         notNull("id", id);
-        return new GridFSDownloadStreamImpl(find(new Document("_id", id)), chunksCollection);
+        return createGridFSDownloadStream(null, find(new Document("_id", id)));
     }
-
     @Override
-    public void downloadToStream(final ObjectId id, final AsyncOutputStream destination, final SingleResultCallback<Long> callback) {
+    public GridFSDownloadStream openDownloadStream(final BsonValue id) {
         notNull("id", id);
-        notNull("destination", destination);
-        notNull("callback", callback);
-        downloadToAsyncOutputStream(openDownloadStream(id), destination, errorHandlingCallback(callback, LOGGER));
+        return createGridFSDownloadStream(null, find(new Document("_id", id)));
     }
 
     @Override
-    public GridFSDownloadStream openDownloadStream(final BsonValue id) {
+    public GridFSDownloadStream openDownloadStream(final String filename) {
+        return openDownloadStream(filename, new GridFSDownloadOptions());
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final String filename, final GridFSDownloadOptions options) {
+        return createGridFSDownloadStream(null, createGridFSFindIterable(null, filename, options));
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final ObjectId id) {
         notNull("id", id);
-        return new GridFSDownloadStreamImpl(find(new Document("_id", id)), chunksCollection);
+        return createGridFSDownloadStream(clientSession, find(clientSession, new Document("_id", id)));
     }
 
     @Override
-    public void downloadToStream(final BsonValue id, final AsyncOutputStream destination, final SingleResultCallback<Long> callback) {
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final BsonValue id) {
         notNull("id", id);
-        notNull("destination", destination);
-        notNull("callback", callback);
-        downloadToAsyncOutputStream(openDownloadStream(id), destination, errorHandlingCallback(callback, LOGGER));
+        return createGridFSDownloadStream(clientSession, find(clientSession, new Document("_id", id)));
     }
 
     @Override
-    public GridFSDownloadStream openDownloadStream(final String filename) {
-        return openDownloadStream(filename, new GridFSDownloadOptions());
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final String filename) {
+        return openDownloadStream(clientSession, filename, new GridFSDownloadOptions());
     }
 
     @Override
-    public GridFSDownloadStream openDownloadStream(final String filename, final GridFSDownloadOptions options) {
-        notNull("filename", filename);
-        notNull("options", options);
-        return new GridFSDownloadStreamImpl(findFileByName(filename, options), chunksCollection);
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final String filename,
+                                                   final GridFSDownloadOptions options) {
+        notNull("clientSession", clientSession);
+        return createGridFSDownloadStream(clientSession, createGridFSFindIterable(clientSession, filename, options));
+    }
+
+    private GridFSDownloadStream createGridFSDownloadStream(@Nullable final ClientSession clientSession,
+                                                            final GridFSFindIterable gridFSFindIterable) {
+        return new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection);
     }
 
     @Override
-    public void downloadToStream(final String filename, final AsyncOutputStream destination,
-                                 final SingleResultCallback<Long> callback) {
+    public void downloadToStream(final String filename, final AsyncOutputStream destination, final SingleResultCallback<Long> callback) {
         downloadToStream(filename, destination, new GridFSDownloadOptions(), callback);
     }
 
     @Override
     public void downloadToStream(final String filename, final AsyncOutputStream destination,
                                  final GridFSDownloadOptions options, final SingleResultCallback<Long> callback) {
-        notNull("filename", filename);
-        notNull("destination", destination);
-        notNull("options", options);
-        notNull("callback", callback);
         downloadToAsyncOutputStream(openDownloadStream(filename, options), destination, errorHandlingCallback(callback, LOGGER));
     }
 
+
+    @Override
+    public void downloadToStream(final ObjectId id, final AsyncOutputStream destination, final SingleResultCallback<Long> callback) {
+        downloadToAsyncOutputStream(openDownloadStream(id), destination, errorHandlingCallback(callback, LOGGER));
+    }
+
+    @Override
+    public void downloadToStream(final BsonValue id, final AsyncOutputStream destination, final SingleResultCallback<Long> callback) {
+        downloadToAsyncOutputStream(openDownloadStream(id), destination, errorHandlingCallback(callback, LOGGER));
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final ObjectId id, final AsyncOutputStream destination,
+                                 final SingleResultCallback<Long> callback) {
+        downloadToAsyncOutputStream(openDownloadStream(clientSession, id), destination, errorHandlingCallback(callback, LOGGER));
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final BsonValue id, final AsyncOutputStream destination,
+                                 final SingleResultCallback<Long> callback) {
+        downloadToAsyncOutputStream(openDownloadStream(clientSession, id), destination, errorHandlingCallback(callback, LOGGER));
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final String filename, final AsyncOutputStream destination,
+                                 final SingleResultCallback<Long> callback) {
+        downloadToStream(clientSession, filename, destination, new GridFSDownloadOptions(), callback);
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final String filename, final AsyncOutputStream destination,
+                                 final GridFSDownloadOptions options, final SingleResultCallback<Long> callback) {
+        notNull("clientSession", clientSession);
+        downloadToAsyncOutputStream(openDownloadStream(clientSession, filename, options), destination,
+                errorHandlingCallback(callback, LOGGER));
+    }
+
     @Override
     public GridFSFindIterable find() {
-        return new GridFSFindIterableImpl(filesCollection.find());
+        return createGridFSFindIterable(null, null);
     }
 
     @Override
     public GridFSFindIterable find(final Bson filter) {
         notNull("filter", filter);
-        return new GridFSFindIterableImpl(filesCollection.find(filter));
+        return createGridFSFindIterable(null, filter);
+    }
+
+    @Override
+    public GridFSFindIterable find(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return createGridFSFindIterable(clientSession, null);
+    }
+
+    @Override
+    public GridFSFindIterable find(final ClientSession clientSession, final Bson filter) {
+        notNull("clientSession", clientSession);
+        notNull("filter", filter);
+        return createGridFSFindIterable(clientSession, filter);
     }
 
     @Override
@@ -262,80 +410,152 @@ public void delete(final ObjectId id, final SingleResultCallback<Void> callback)
 
     @Override
     public void delete(final BsonValue id, final SingleResultCallback<Void> callback) {
+        executeDelete(null, id, callback);
+    }
+
+    @Override
+    public void delete(final ClientSession clientSession, final ObjectId id, final SingleResultCallback<Void> callback) {
+        delete(clientSession, new BsonObjectId(id), callback);
+    }
+
+    @Override
+    public void delete(final ClientSession clientSession, final BsonValue id, final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeDelete(clientSession, id, callback);
+    }
+
+   private void executeDelete(@Nullable final ClientSession clientSession, final BsonValue id, final SingleResultCallback<Void> callback) {
+       notNull("id", id);
+       notNull("callback", callback);
+       final SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+       SingleResultCallback<DeleteResult> deleteFileCallback = new SingleResultCallback<DeleteResult>() {
+           @Override
+           public void onResult(final DeleteResult filesResult, final Throwable t) {
+               if (t != null) {
+                   errHandlingCallback.onResult(null, t);
+               } else {
+                   SingleResultCallback<DeleteResult> deleteChunksCallback = new SingleResultCallback<DeleteResult>() {
+                       @Override
+                       public void onResult(final DeleteResult chunksResult, final Throwable t) {
+                           if (t != null) {
+                               errHandlingCallback.onResult(null, t);
+                           } else if (filesResult.wasAcknowledged() && filesResult.getDeletedCount() == 0) {
+                               errHandlingCallback.onResult(null,
+                                       new MongoGridFSException(format("No file found with the ObjectId: %s", id)));
+                           } else {
+                               errHandlingCallback.onResult(null, null);
+                           }
+                       }
+                   };
+                   if (clientSession != null) {
+                       chunksCollection.deleteMany(clientSession, new BsonDocument("files_id", id), deleteChunksCallback);
+                   } else {
+                       chunksCollection.deleteMany(new BsonDocument("files_id", id), deleteChunksCallback);
+                   }
+               }
+           }
+       };
+
+       if (clientSession != null) {
+           filesCollection.deleteOne(clientSession, new BsonDocument("_id", id), deleteFileCallback);
+       } else {
+           filesCollection.deleteOne(new BsonDocument("_id", id), deleteFileCallback);
+       }
+   }
+
+    @Override
+    public void rename(final ObjectId id, final String newFilename, final SingleResultCallback<Void> callback) {
+        rename(new BsonObjectId(id), newFilename, callback);
+    }
+
+    @Override
+    public void rename(final BsonValue id, final String newFilename, final SingleResultCallback<Void> callback) {
+        executeRename(null, id, newFilename, callback);
+    }
+
+    @Override
+    public void rename(final ClientSession clientSession, final ObjectId id, final String newFilename,
+                       final SingleResultCallback<Void> callback) {
+        rename(clientSession, new BsonObjectId(id), newFilename, callback);
+    }
+
+    @Override
+    public void rename(final ClientSession clientSession, final BsonValue id, final String newFilename,
+                       final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeRename(clientSession, id, newFilename, callback);
+    }
+
+    private void executeRename(@Nullable final ClientSession clientSession, final BsonValue id, final String newFilename,
+                       final SingleResultCallback<Void> callback) {
         notNull("id", id);
+        notNull("newFilename", newFilename);
         notNull("callback", callback);
+
         final SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-        filesCollection.deleteOne(new BsonDocument("_id", id), new SingleResultCallback<DeleteResult>() {
+        SingleResultCallback<UpdateResult> resultCallback = new SingleResultCallback<UpdateResult>() {
             @Override
-            public void onResult(final DeleteResult filesResult, final Throwable t) {
+            public void onResult(final UpdateResult result, final Throwable t) {
                 if (t != null) {
                     errHandlingCallback.onResult(null, t);
+                } else if (result.wasAcknowledged() && result.getMatchedCount() == 0) {
+                    errHandlingCallback.onResult(null, new MongoGridFSException(format("No file found with the ObjectId: %s", id)));
                 } else {
-                    chunksCollection.deleteMany(new BsonDocument("files_id", id),
-                            new SingleResultCallback<DeleteResult>() {
-                                @Override
-                                public void onResult(final DeleteResult chunksResult, final Throwable t) {
-                                    if (t != null) {
-                                        errHandlingCallback.onResult(null, t);
-                                    } else if (filesResult.wasAcknowledged() && filesResult.getDeletedCount() == 0) {
-                                        errHandlingCallback.onResult(null,
-                                                new MongoGridFSException(format("No file found with the ObjectId: %s", id)));
-                                    } else {
-                                        errHandlingCallback.onResult(null, null);
-                                    }
-                                }
-                            });
+                    errHandlingCallback.onResult(null, null);
                 }
             }
-        });
+        };
+
+        if (clientSession != null) {
+            filesCollection.updateOne(clientSession, new BsonDocument("_id", id), new BsonDocument("$set",
+                    new BsonDocument("filename", new BsonString(newFilename))), resultCallback);
+        } else {
+            filesCollection.updateOne(new BsonDocument("_id", id), new BsonDocument("$set",
+                    new BsonDocument("filename", new BsonString(newFilename))), resultCallback);
+        }
     }
 
     @Override
-    public void rename(final ObjectId id, final String newFilename, final SingleResultCallback<Void> callback) {
-        rename(new BsonObjectId(id), newFilename, callback);
+    public void drop(final SingleResultCallback<Void> callback) {
+        executeDrop(null, callback);
     }
 
     @Override
-    public void rename(final BsonValue id, final String newFilename, final SingleResultCallback<Void> callback) {
-        notNull("id", id);
-        notNull("newFilename", newFilename);
-        notNull("callback", callback);
-        final SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-        filesCollection.updateOne(new BsonDocument("_id", id), new BsonDocument("$set",
-                new BsonDocument("filename", new BsonString(newFilename))),
-                new SingleResultCallback<UpdateResult>() {
-
-                    @Override
-                    public void onResult(final UpdateResult result, final Throwable t) {
-                        if (t != null) {
-                            errHandlingCallback.onResult(null, t);
-                        } else if (result.wasAcknowledged() && result.getMatchedCount() == 0) {
-                            errHandlingCallback.onResult(null, new MongoGridFSException(format("No file found with the ObjectId: %s",
-                                    id)));
-                        } else {
-                            errHandlingCallback.onResult(null, null);
-                        }
-                    }
-                });
+    public void drop(final ClientSession clientSession, final SingleResultCallback<Void> callback) {
+        notNull("clientSession", clientSession);
+        executeDrop(clientSession, callback);
     }
 
-    @Override
-    public void drop(final SingleResultCallback<Void> callback) {
+    private void executeDrop(@Nullable final ClientSession clientSession, final SingleResultCallback<Void> callback) {
         notNull("callback", callback);
         final SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-        filesCollection.drop(new SingleResultCallback<Void>() {
+        SingleResultCallback<Void> dropFileCallback = new SingleResultCallback<Void>() {
             @Override
             public void onResult(final Void result, final Throwable t) {
                 if (t != null) {
                     errHandlingCallback.onResult(null, t);
                 } else {
-                    chunksCollection.drop(errHandlingCallback);
+                    if (clientSession != null) {
+                        chunksCollection.drop(clientSession, errHandlingCallback);
+                    } else {
+                        chunksCollection.drop(errHandlingCallback);
+                    }
                 }
             }
-        });
+        };
+        if (clientSession != null) {
+            filesCollection.drop(clientSession, dropFileCallback);
+        } else {
+            filesCollection.drop(dropFileCallback);
+        }
+    }
+
+    private GridFSFindIterable createGridFSFindIterable(@Nullable final ClientSession clientSession, @Nullable final Bson filter) {
+        return new GridFSFindIterableImpl(createFindIterable(clientSession, filter));
     }
 
-    private GridFSFindIterable findFileByName(final String filename, final GridFSDownloadOptions options) {
+    private GridFSFindIterable createGridFSFindIterable(@Nullable final ClientSession clientSession, final String filename,
+                                                        final GridFSDownloadOptions options) {
         int revision = options.getRevision();
         int skip;
         int sort;
@@ -347,8 +567,21 @@ private GridFSFindIterable findFileByName(final String filename, final GridFSDow
             sort = -1;
         }
 
-        return new GridFSFindIterableImpl(filesCollection.find(new Document("filename", filename)).skip(skip)
-                .sort(new Document("uploadDate", sort)));
+        return createGridFSFindIterable(clientSession, new Document("filename", filename)).skip(skip)
+                .sort(new Document("uploadDate", sort));
+    }
+
+    private FindIterable<GridFSFile> createFindIterable(@Nullable final ClientSession clientSession, @Nullable final Bson filter) {
+        FindIterable<GridFSFile> findIterable;
+        if (clientSession != null) {
+            findIterable = filesCollection.find(clientSession);
+        } else {
+            findIterable = filesCollection.find();
+        }
+        if (filter != null) {
+            findIterable = findIterable.filter(filter);
+        }
+        return findIterable;
     }
 
     private static MongoCollection<GridFSFile> getFilesCollection(final MongoDatabase database, final String bucketName) {
@@ -363,6 +596,7 @@ private static MongoCollection<Document> getChunksCollection(final MongoDatabase
 
     private void downloadToAsyncOutputStream(final GridFSDownloadStream downloadStream, final AsyncOutputStream destination,
                                              final SingleResultCallback<Long> callback) {
+        notNull("downloadStream", downloadStream);
         downloadStream.getGridFSFile(new SingleResultCallback<GridFSFile>() {
             @Override
             public void onResult(final GridFSFile result, final Throwable t) {
@@ -376,9 +610,10 @@ public void onResult(final GridFSFile result, final Throwable t) {
         });
     }
 
-    private void readAndWriteInputStream(final AsyncInputStream source, final GridFSUploadStream uploadStream, final ByteBuffer buffer,
+    private void readAndWriteInputStream(final AsyncInputStream source,
+                                         final GridFSUploadStream uploadStream, final ByteBuffer buffer,
                                          final SingleResultCallback<Void> callback) {
-        buffer.clear();
+        ((Buffer) buffer).clear();
         source.read(buffer, new SingleResultCallback<Integer>() {
             @Override
             public void onResult(final Integer result, final Throwable t) {
@@ -398,7 +633,7 @@ public void onResult(final Void result, final Throwable abortException) {
                         callback.onResult(null, t);
                     }
                 } else if (result > 0) {
-                    buffer.flip();
+                    ((Buffer) buffer).flip();
                     uploadStream.write(buffer, new SingleResultCallback<Integer>() {
                         @Override
                         public void onResult(final Integer result, final Throwable t) {
@@ -418,14 +653,14 @@ public void onResult(final Integer result, final Throwable t) {
 
     private void readAndWriteOutputStream(final AsyncOutputStream destination, final GridFSDownloadStream downloadStream,
                                           final ByteBuffer buffer, final long amountRead, final SingleResultCallback<Long> callback) {
-        buffer.clear();
+        ((Buffer) buffer).clear();
         downloadStream.read(buffer, new SingleResultCallback<Integer>() {
             @Override
             public void onResult(final Integer readResult, final Throwable t) {
                 if (t != null) {
                     callback.onResult(null, t);
                 } else if (readResult > 0) {
-                    buffer.flip();
+                    ((Buffer) buffer).flip();
                     destination.write(buffer, new SingleResultCallback<Integer>() {
                         @Override
                         public void onResult(final Integer writeResult, final Throwable t) {
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBuckets.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBuckets.java
index 317bf37d2f5..ac6e28ef4c4 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBuckets.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSBuckets.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,7 +22,9 @@
  * A factory for GridFSBucket instances.
  *
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public final class GridFSBuckets {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStream.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStream.java
index 7a8897f5a52..2e3b78cfc48 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStream.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,7 +25,9 @@
  * <p>Provides the {@code GridFSFile} for the file to being downloaded as well as the {@code read} methods of a {@link AsyncInputStream}</p>
  *
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface GridFSDownloadStream extends AsyncInputStream {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStreamImpl.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStreamImpl.java
index dbefbc07b77..d25a1329eb5 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStreamImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSDownloadStreamImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,10 +19,13 @@
 import com.mongodb.MongoGridFSException;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.ClientSession;
+import com.mongodb.async.client.FindIterable;
 import com.mongodb.async.client.MongoCollection;
 import com.mongodb.client.gridfs.model.GridFSFile;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.lang.Nullable;
 import org.bson.Document;
 import org.bson.types.Binary;
 
@@ -37,6 +40,7 @@
 
 final class GridFSDownloadStreamImpl implements GridFSDownloadStream {
     private static final Logger LOGGER = Loggers.getLogger("client.gridfs");
+    private final ClientSession clientSession;
     private final GridFSFindIterable fileInfoIterable;
     private final MongoCollection<Document> chunksCollection;
     private final ConcurrentLinkedQueue<Document> resultsQueue = new ConcurrentLinkedQueue<Document>();
@@ -59,7 +63,9 @@ final class GridFSDownloadStreamImpl implements GridFSDownloadStream {
     private byte[] buffer = null;
 
 
-    GridFSDownloadStreamImpl(final GridFSFindIterable fileInfoIterable, final MongoCollection<Document> chunksCollection) {
+    GridFSDownloadStreamImpl(@Nullable final ClientSession clientSession, final GridFSFindIterable fileInfoIterable,
+                             final MongoCollection<Document> chunksCollection) {
+        this.clientSession = clientSession;
         this.fileInfoIterable = notNull("file information", fileInfoIterable);
         this.chunksCollection = notNull("chunks collection", chunksCollection);
     }
@@ -138,16 +144,65 @@ public void onResult(final Integer result, final Throwable t) {
         });
     }
 
+    @Override
+    public void skip(final long bytesToSkip, final SingleResultCallback<Long> callback) {
+        notNull("callback", callback);
+        final SingleResultCallback<Long> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        if (checkClosed()) {
+            errHandlingCallback.onResult(null, null);
+        } else if (!hasFileInfo()) {
+            getGridFSFile(new SingleResultCallback<GridFSFile>() {
+                @Override
+                public void onResult(final GridFSFile result, final Throwable t) {
+                    if (t != null) {
+                        errHandlingCallback.onResult(null, t);
+                    } else {
+                        skip(bytesToSkip, errHandlingCallback);
+                    }
+                }
+            });
+        } else if (bytesToSkip <= 0) {
+            callback.onResult(0L, null);
+        } else {
+            long skippedPosition = currentPosition + bytesToSkip;
+            bufferOffset = (int) (skippedPosition % fileInfo.getChunkSize());
+            if (skippedPosition >= fileInfo.getLength()) {
+                long skipped = fileInfo.getLength() - currentPosition;
+                chunkIndex = numberOfChunks - 1;
+                currentPosition = fileInfo.getLength();
+                buffer = null;
+                discardCursor();
+                callback.onResult(skipped, null);
+            } else {
+                int newChunkIndex = (int) Math.floor(skippedPosition / (double) fileInfo.getChunkSize());
+                if (chunkIndex != newChunkIndex) {
+                    chunkIndex = newChunkIndex;
+                    buffer = null;
+                    discardCursor();
+                }
+                currentPosition += bytesToSkip;
+                callback.onResult(bytesToSkip, null);
+            }
+        }
+    }
+
     private void checkAndFetchResults(final int amountRead, final ByteBuffer dst, final SingleResultCallback<Integer> callback) {
         if (currentPosition == fileInfo.getLength() || dst.remaining() == 0) {
             callback.onResult(amountRead, null);
-        } else if (!resultsQueue.isEmpty()) {
+        } else if (hasResultsToProcess()) {
             processResults(amountRead, dst, callback);
         } else if (cursor == null) {
-            chunksCollection.find(new Document("files_id", fileInfo.getId())
-                    .append("n", new Document("$gte", chunkIndex)))
-                    .batchSize(batchSize).sort(new Document("n", 1))
-                    .batchCursor(new SingleResultCallback<AsyncBatchCursor<Document>>() {
+            Document filter = new Document("files_id", fileInfo.getId())
+                    .append("n", new Document("$gte", chunkIndex));
+
+            FindIterable<Document> findIterable;
+            if (clientSession != null) {
+                findIterable = chunksCollection.find(clientSession, filter);
+            } else {
+                findIterable = chunksCollection.find(filter);
+            }
+            findIterable.batchSize(batchSize).sort(new Document("n", 1)).batchCursor(
+                    new SingleResultCallback<AsyncBatchCursor<Document>>() {
                         @Override
                         public void onResult(final AsyncBatchCursor<Document> result, final Throwable t) {
                             if (t != null) {
@@ -181,23 +236,31 @@ public void onResult(final List<Document> result, final Throwable t) {
     private void processResults(final int previousAmountRead, final ByteBuffer dst, final SingleResultCallback<Integer> callback) {
         try {
             int amountRead = previousAmountRead;
-            while (currentPosition < fileInfo.getLength() && dst.remaining() > 0 && !resultsQueue.isEmpty()) {
-                if (buffer == null || bufferOffset == buffer.length) {
+            int amountToCopy = dst.remaining();
+            while (currentPosition < fileInfo.getLength() && amountToCopy > 0) {
+
+                if (getBufferFromResultsQueue()) {
+
+                    boolean wasEndOfBuffer = (buffer != null && bufferOffset == buffer.length);
                     buffer = getBufferFromChunk(resultsQueue.poll(), chunkIndex);
-                    bufferOffset = 0;
                     chunkIndex += 1;
+                    if (wasEndOfBuffer) {
+                        bufferOffset = 0;
+                    }
                 }
 
-                int amountToCopy = dst.remaining();
                 if (amountToCopy > buffer.length - bufferOffset) {
                     amountToCopy = buffer.length - bufferOffset;
                 }
-                dst.put(buffer, bufferOffset, amountToCopy);
-                bufferOffset += amountToCopy;
-                currentPosition += amountToCopy;
-                amountRead += amountToCopy;
-            }
 
+                if (amountToCopy > 0) {
+                    dst.put(buffer, bufferOffset, amountToCopy);
+                    bufferOffset += amountToCopy;
+                    currentPosition += amountToCopy;
+                    amountRead += amountToCopy;
+                    amountToCopy = dst.remaining();
+                }
+            }
             checkAndFetchResults(amountRead, dst, callback);
         } catch (MongoGridFSException e) {
             callback.onResult(null, e);
@@ -259,6 +322,14 @@ private byte[] getBufferFromChunk(final Document chunk, final int expectedChunkI
         return data;
     }
 
+    private boolean getBufferFromResultsQueue() {
+        return !resultsQueue.isEmpty() && (buffer == null || bufferOffset == buffer.length);
+    }
+
+    private boolean hasResultsToProcess() {
+        return !resultsQueue.isEmpty() || (buffer != null && bufferOffset < buffer.length);
+    }
+
     private <A> boolean tryGetReadingLock(final SingleResultCallback<A> callback) {
         if (checkClosed()) {
             callbackClosedException(callback);
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterable.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterable.java
index 43d9289434d..a52b6e29c30 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterable.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,8 @@
 
 import com.mongodb.async.client.MongoIterable;
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -26,7 +28,9 @@
  * Iterable for the GridFS Files Collection.
  *
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface GridFSFindIterable extends MongoIterable<GridFSFile> {
 
     /**
@@ -44,7 +48,7 @@ public interface GridFSFindIterable extends MongoIterable<GridFSFile> {
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      * @see com.mongodb.client.model.Filters
      */
-    GridFSFindIterable filter(Bson filter);
+    GridFSFindIterable filter(@Nullable Bson filter);
 
     /**
      * Sets the limit to apply.
@@ -71,7 +75,7 @@ public interface GridFSFindIterable extends MongoIterable<GridFSFile> {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    GridFSFindIterable sort(Bson sort);
+    GridFSFindIterable sort(@Nullable Bson sort);
 
     /**
      * The server normally times out idle cursors after an inactivity period (10 minutes)
@@ -101,4 +105,15 @@ public interface GridFSFindIterable extends MongoIterable<GridFSFile> {
      */
     @Override
     GridFSFindIterable batchSize(int batchSize);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    GridFSFindIterable collation(@Nullable Collation collation);
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterableImpl.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterableImpl.java
index 4f42891a950..d9378413f59 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterableImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSFindIterableImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,6 +23,8 @@
 import com.mongodb.async.client.FindIterable;
 import com.mongodb.async.client.MongoIterable;
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.Collection;
@@ -31,12 +33,12 @@
 final class GridFSFindIterableImpl implements GridFSFindIterable {
     private final FindIterable<GridFSFile> underlying;
 
-    public GridFSFindIterableImpl(final FindIterable<GridFSFile> underlying) {
+    GridFSFindIterableImpl(final FindIterable<GridFSFile> underlying) {
         this.underlying = underlying;
     }
 
     @Override
-    public GridFSFindIterable sort(final Bson sort) {
+    public GridFSFindIterable sort(@Nullable final Bson sort) {
         underlying.sort(sort);
         return this;
     }
@@ -54,7 +56,7 @@ public GridFSFindIterable limit(final int limit) {
     }
 
     @Override
-    public GridFSFindIterable filter(final Bson filter) {
+    public GridFSFindIterable filter(@Nullable final Bson filter) {
         underlying.filter(filter);
         return this;
     }
@@ -97,6 +99,17 @@ public GridFSFindIterable batchSize(final int batchSize) {
         return this;
     }
 
+    @Override
+    public Integer getBatchSize() {
+        return underlying.getBatchSize();
+    }
+
+    @Override
+    public GridFSFindIterable collation(@Nullable final Collation collation) {
+        underlying.collation(collation);
+        return this;
+    }
+
     @Override
     public void batchCursor(final SingleResultCallback<AsyncBatchCursor<GridFSFile>> callback) {
         underlying.batchCursor(callback);
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheck.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheck.java
index 0d350e20fd4..73d39dfc097 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheck.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheck.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheckImpl.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheckImpl.java
index b42a63b068f..aa2bbdc369b 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheckImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSIndexCheckImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,9 +17,13 @@
 package com.mongodb.async.client.gridfs;
 
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.ClientSession;
+import com.mongodb.async.client.FindIterable;
+import com.mongodb.async.client.ListIndexesIterable;
 import com.mongodb.async.client.MongoCollection;
 import com.mongodb.client.gridfs.model.GridFSFile;
 import com.mongodb.client.model.IndexOptions;
+import com.mongodb.lang.Nullable;
 import org.bson.Document;
 
 import java.util.ArrayList;
@@ -29,17 +33,28 @@
 
 final class GridFSIndexCheckImpl implements GridFSIndexCheck {
     private static final Document PROJECTION = new Document("_id", 1);
+    private final ClientSession clientSession;
     private final MongoCollection<GridFSFile> filesCollection;
     private final MongoCollection<Document> chunksCollection;
 
-    GridFSIndexCheckImpl(final MongoCollection<GridFSFile> filesCollection, final MongoCollection<Document> chunksCollection) {
+    GridFSIndexCheckImpl(@Nullable final ClientSession clientSession, final MongoCollection<GridFSFile> filesCollection,
+                         final MongoCollection<Document> chunksCollection) {
+        this.clientSession = clientSession;
         this.filesCollection = notNull("files collection", filesCollection);
         this.chunksCollection = notNull("chunks collection", chunksCollection);
     }
 
     @Override
     public void checkAndCreateIndex(final SingleResultCallback<Void> callback) {
-        filesCollection.withDocumentClass(Document.class).withReadPreference(primary()).find().projection(PROJECTION).first(
+        MongoCollection<Document> collection = filesCollection.withDocumentClass(Document.class).withReadPreference(primary());
+        FindIterable<Document> findIterable;
+        if (clientSession != null) {
+            findIterable = collection.find(clientSession);
+        } else {
+            findIterable = collection.find();
+        }
+
+        findIterable.projection(PROJECTION).first(
                 new SingleResultCallback<Document>() {
                     @Override
                     public void onResult(final Document result, final Throwable t) {
@@ -55,7 +70,14 @@ public void onResult(final Document result, final Throwable t) {
     }
 
     private <T> void hasIndex(final MongoCollection<T> collection, final Document index, final SingleResultCallback<Boolean> callback) {
-        collection.listIndexes().into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
+        ListIndexesIterable<Document> listIndexesIterable;
+        if (clientSession != null) {
+            listIndexesIterable = collection.listIndexes(clientSession);
+        } else {
+            listIndexesIterable = collection.listIndexes();
+        }
+
+        listIndexesIterable.into(new ArrayList<Document>(), new SingleResultCallback<ArrayList<Document>>() {
             @Override
             public void onResult(final ArrayList<Document> indexes, final Throwable t) {
                 if (t != null) {
@@ -83,7 +105,7 @@ public void onResult(final Boolean result, final Throwable t) {
                         if (t != null) {
                             callback.onResult(null, t);
                         } else if (!result) {
-                            filesCollection.createIndex(filesIndex, new SingleResultCallback<String>() {
+                            SingleResultCallback<String> createIndexCallback = new SingleResultCallback<String>() {
                                 @Override
                                 public void onResult(final String result, final Throwable t) {
                                     if (t != null) {
@@ -92,7 +114,12 @@ public void onResult(final String result, final Throwable t) {
                                         checkChunksIndex(callback);
                                     }
                                 }
-                            });
+                            };
+                            if (clientSession != null) {
+                                filesCollection.createIndex(clientSession, filesIndex, createIndexCallback);
+                            } else {
+                                filesCollection.createIndex(filesIndex, createIndexCallback);
+                            }
                         } else {
                             checkChunksIndex(callback);
                         }
@@ -108,7 +135,7 @@ public void onResult(final Boolean result, final Throwable t) {
                 if (t != null) {
                     callback.onResult(null, t);
                 } else if (!result) {
-                    chunksCollection.createIndex(chunksIndex, new IndexOptions().unique(true), new SingleResultCallback<String>() {
+                    SingleResultCallback<String> createIndexCallback = new SingleResultCallback<String>() {
                         @Override
                         public void onResult(final String result, final Throwable t) {
                             if (t != null) {
@@ -117,7 +144,12 @@ public void onResult(final String result, final Throwable t) {
                                 callback.onResult(null, null);
                             }
                         }
-                    });
+                    };
+                    if (clientSession != null) {
+                        chunksCollection.createIndex(clientSession, chunksIndex, new IndexOptions().unique(true), createIndexCallback);
+                    } else {
+                        chunksCollection.createIndex(chunksIndex, new IndexOptions().unique(true), createIndexCallback);
+                    }
                 } else {
                     callback.onResult(null, null);
                 }
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStream.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStream.java
index dec38553940..ee5561ed187 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStream.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,9 @@
  * <p>Provides the {@code id} for the file to be uploaded as well as the {@code write} methods of a {@link AsyncOutputStream}</p>
  *
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface GridFSUploadStream extends AsyncOutputStream {
 
     /**
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStreamImpl.java b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStreamImpl.java
index 07cb90a0bb2..a3f14d4d88f 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStreamImpl.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/GridFSUploadStreamImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,6 +23,8 @@
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.lang.Nullable;
+import com.mongodb.async.client.ClientSession;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.types.Binary;
@@ -39,6 +41,7 @@
 
 final class GridFSUploadStreamImpl implements GridFSUploadStream {
     private static final Logger LOGGER = Loggers.getLogger("client.gridfs");
+    private final ClientSession clientSession;
     private final MongoCollection<GridFSFile> filesCollection;
     private final MongoCollection<Document> chunksCollection;
     private final BsonValue fileId;
@@ -46,6 +49,7 @@ final class GridFSUploadStreamImpl implements GridFSUploadStream {
     private final int chunkSizeBytes;
     private final Document metadata;
     private final MessageDigest md5;
+    private final boolean disableMD5;
     private final GridFSIndexCheck indexCheck;
     private final Object closeAndWritingLock = new Object();
 
@@ -63,9 +67,11 @@ final class GridFSUploadStreamImpl implements GridFSUploadStream {
     private int chunkIndex;
     /* accessed only when writing */
 
-    GridFSUploadStreamImpl(final MongoCollection<GridFSFile> filesCollection, final MongoCollection<Document> chunksCollection,
-                           final BsonValue fileId, final String filename, final int chunkSizeBytes, final Document metadata,
+    GridFSUploadStreamImpl(@Nullable final ClientSession clientSession, final MongoCollection<GridFSFile> filesCollection,
+                           final MongoCollection<Document> chunksCollection, final BsonValue fileId, final String filename,
+                           final int chunkSizeBytes, final boolean disableMD5, @Nullable final Document metadata,
                            final GridFSIndexCheck indexCheck) {
+        this.clientSession = clientSession;
         this.filesCollection = notNull("files collection", filesCollection);
         this.chunksCollection = notNull("chunks collection", chunksCollection);
         this.fileId = notNull("File Id", fileId);
@@ -73,7 +79,8 @@ final class GridFSUploadStreamImpl implements GridFSUploadStream {
         this.chunkSizeBytes = chunkSizeBytes;
         this.metadata = metadata;
         this.indexCheck = indexCheck;
-        md5 = getDigest();
+        this.disableMD5 = disableMD5;
+        md5 = createMD5Digest();
         chunkIndex = 0;
         bufferOffset = 0;
         buffer = new byte[chunkSizeBytes];
@@ -99,13 +106,20 @@ public void abort(final SingleResultCallback<Void> callback) {
         if (!takeWritingLock(errHandlingCallback)) {
             return;
         }
-        chunksCollection.deleteMany(new Document("files_id", fileId), new SingleResultCallback<DeleteResult>() {
+
+        SingleResultCallback<DeleteResult> deleteCallback = new SingleResultCallback<DeleteResult>() {
             @Override
             public void onResult(final DeleteResult result, final Throwable t) {
                 releaseWritingLock();
                 errHandlingCallback.onResult(null, t);
             }
-        });
+        };
+
+        if (clientSession != null) {
+            chunksCollection.deleteMany(clientSession, new Document("files_id", fileId), deleteCallback);
+        } else {
+            chunksCollection.deleteMany(new Document("files_id", fileId), deleteCallback);
+        }
     }
 
     @Override
@@ -165,23 +179,29 @@ public void onResult(final Void result, final Throwable t) {
                     errHandlingCallback.onResult(null, t);
                 } else {
                     GridFSFile gridFSFile = new GridFSFile(fileId, filename, lengthInBytes, chunkSizeBytes, new Date(),
-                            toHex(md5.digest()), metadata);
+                            getMD5Digest(), metadata);
 
-                    filesCollection.insertOne(gridFSFile, new SingleResultCallback<Void>() {
+                    SingleResultCallback<Void> insertCallback = new SingleResultCallback<Void>() {
                         @Override
                         public void onResult(final Void result, final Throwable t) {
                             buffer = null;
                             releaseWritingLock();
                             errHandlingCallback.onResult(result, t);
                         }
-                    });
+                    };
+
+                    if (clientSession != null) {
+                        filesCollection.insertOne(clientSession, gridFSFile, insertCallback);
+                    } else {
+                        filesCollection.insertOne(gridFSFile, insertCallback);
+                    }
                 }
             }
         });
     }
 
     private void write(final int amount, final ByteBuffer src, final SingleResultCallback<Integer> callback) {
-        if (!takeWritingLock(callback)){
+        if (!takeWritingLock(callback)) {
             return;
         }
 
@@ -231,24 +251,29 @@ private <T> boolean takeWritingLock(final SingleResultCallback<T> errHandlingCal
     }
 
     private void writeChunk(final SingleResultCallback<Void> callback) {
-        if (md5 == null) {
-            callback.onResult(null, new MongoGridFSException("No MD5 message digest available, cannot upload file"));
+        if (md5 == null && !disableMD5) {
+            callback.onResult(null, new MongoGridFSException("No MD5 message digest available. "
+                    + "Use `GridFSBucket.withDisableMD5(true)` to disable creating a MD5 hash."));
         } else if (bufferOffset > 0) {
-            chunksCollection.insertOne(new Document("files_id", fileId).append("n", chunkIndex).append("data", getData()),
-                    new SingleResultCallback<Void>() {
-                        @Override
-                        public void onResult(final Void result, final Throwable t) {
-                            if (t != null) {
-                                callback.onResult(null, t);
-                            } else {
-                                md5.update(buffer);
-                                chunkIndex++;
-                                bufferOffset = 0;
-                                callback.onResult(null, null);
-                            }
-                        }
+            Document insertDocument = new Document("files_id", fileId).append("n", chunkIndex).append("data", getData());
+            SingleResultCallback<Void> insertCallback = new SingleResultCallback<Void>() {
+                @Override
+                public void onResult(final Void result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        updateMD5();
+                        chunkIndex++;
+                        bufferOffset = 0;
+                        callback.onResult(null, null);
                     }
-            );
+                }
+            };
+            if (clientSession != null) {
+                chunksCollection.insertOne(clientSession, insertDocument, insertCallback);
+            } else {
+                chunksCollection.insertOne(insertDocument, insertCallback);
+            }
         } else {
             callback.onResult(null, null);
         }
@@ -294,11 +319,27 @@ private <T> void callbackIsWritingException(final SingleResultCallback<T> callba
         callback.onResult(null, new MongoGridFSException("The AsyncOutputStream does not support concurrent writing."));
     }
 
-    private static MessageDigest getDigest() {
-        try {
-            return MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException e) {
+    @Nullable
+    private MessageDigest createMD5Digest() {
+        if (disableMD5) {
             return null;
+        } else {
+            try {
+                return MessageDigest.getInstance("MD5");
+            } catch (NoSuchAlgorithmException e) {
+                return null;
+            }
+        }
+    }
+
+    @Nullable
+    private String getMD5Digest() {
+        return md5 != null ? toHex(md5.digest()) : null;
+    }
+
+    private void updateMD5() {
+        if (md5 != null) {
+            md5.update(buffer);
         }
     }
 }
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelper.java b/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelper.java
index 116472145aa..c10c48a52ac 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelper.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelper.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,9 +23,10 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
-import static org.bson.assertions.Assertions.notNull;
+import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * A general helper class that creates {@link AsyncInputStream} or {@link AsyncOutputStream} instances.
@@ -39,7 +40,9 @@
  * </ul>
  *
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public final class AsyncStreamHelper {
 
     /**
@@ -76,6 +79,12 @@ public void read(final ByteBuffer dstByteBuffer, final SingleResultCallback<Inte
                 transferDataFromByteBuffers(srcByteBuffer, dstByteBuffer, callback);
             }
 
+            @Override
+            public void skip(final long bytesToSkip, final SingleResultCallback<Long> callback) {
+                notNull("callback", callback);
+                callback.onResult(0L, null);
+            }
+
             @Override
             public void close(final SingleResultCallback<Void> callback) {
                 callback.onResult(null, null);
@@ -144,6 +153,17 @@ public void read(final ByteBuffer dstByteBuffer, final SingleResultCallback<Inte
                 callback.onResult(amountRead, null);
             }
 
+            @Override
+            public void skip(final long bytesToSkip, final SingleResultCallback<Long> callback) {
+                notNull("callback", callback);
+                try {
+                    long skipped = inputStream.skip(bytesToSkip);
+                    callback.onResult(skipped, null);
+                } catch (Throwable t) {
+                    callback.onResult(null, t);
+                }
+            }
+
             @Override
             public void close(final SingleResultCallback<Void> callback) {
                 try {
@@ -201,7 +221,7 @@ public void close(final SingleResultCallback<Void> callback) {
     }
 
     private static void transferDataFromByteBuffers(final ByteBuffer srcByteBuffer, final ByteBuffer dstByteBuffer,
-                                             final SingleResultCallback<Integer> callback) {
+                                                    final SingleResultCallback<Integer> callback) {
         if (!srcByteBuffer.hasRemaining()) {
             callback.onResult(-1, null);
             return;
@@ -209,9 +229,9 @@ private static void transferDataFromByteBuffers(final ByteBuffer srcByteBuffer,
         int transferAmount = Math.min(dstByteBuffer.remaining(), srcByteBuffer.remaining());
         if (transferAmount > 0) {
             ByteBuffer temp = srcByteBuffer.duplicate();
-            temp.limit(temp.position() + transferAmount);
+            ((Buffer) temp).limit(temp.position() + transferAmount);
             dstByteBuffer.put(temp);
-            srcByteBuffer.position(srcByteBuffer.position() + transferAmount);
+            ((Buffer) srcByteBuffer).position(srcByteBuffer.position() + transferAmount);
         }
         callback.onResult(transferAmount, null);
     }
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelper.java b/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelper.java
index cb1d672bda2..2eee693f98d 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelper.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelper.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,7 @@
 import java.nio.channels.AsynchronousFileChannel;
 import java.nio.channels.CompletionHandler;
 
-import static org.bson.assertions.Assertions.notNull;
+import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * A helper class to convert to {@link AsynchronousByteChannel} or {@link AsynchronousFileChannel} instances into {@link AsyncInputStream}
@@ -34,7 +34,9 @@
  *
  * <p>Requires Java 7 or greater.</p>
  * @since 3.3
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public final class AsynchronousChannelHelper {
 
     /**
@@ -61,6 +63,12 @@ public void failed(final Throwable exc, final Object attachment) {
                 });
             }
 
+            @Override
+            public void skip(final long bytesToSkip, final SingleResultCallback<Long> callback) {
+                notNull("callback", callback);
+                callback.onResult(0L, null);
+            }
+
             @Override
             public void close(final SingleResultCallback<Void> callback) {
                 try {
@@ -100,6 +108,12 @@ public void failed(final Throwable exc, final Object attachment) {
                 });
             }
 
+            @Override
+            public void skip(final long bytesToSkip, final SingleResultCallback<Long> callback) {
+                notNull("callback", callback);
+                callback.onResult(0L, null);
+            }
+
             @Override
             public void close(final SingleResultCallback<Void> callback) {
                 try {
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/package-info.java b/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/package-info.java
index 9c86e596c0f..90ac0bccef5 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/package-info.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/helpers/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,4 +18,5 @@
  * Contains helper classes to create {@link com.mongodb.async.client.gridfs.AsyncInputStream} and
  * {@link com.mongodb.async.client.gridfs.AsyncOutputStream}'s from external sources.
  */
+@Deprecated
 package com.mongodb.async.client.gridfs.helpers;
diff --git a/driver-async/src/main/com/mongodb/async/client/gridfs/package-info.java b/driver-async/src/main/com/mongodb/async/client/gridfs/package-info.java
index 2a562a1befa..00b9e9e4f55 100644
--- a/driver-async/src/main/com/mongodb/async/client/gridfs/package-info.java
+++ b/driver-async/src/main/com/mongodb/async/client/gridfs/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,4 +18,8 @@
  * Contains the classes for supporting MongoDB's specification for storing very large files, GridFS.
  * @mongodb.driver.manual core/gridfs/ GridFS
  */
+@NonNullApi
+@Deprecated
 package com.mongodb.async.client.gridfs;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/AsyncCryptBinding.java b/driver-async/src/main/com/mongodb/async/client/internal/AsyncCryptBinding.java
new file mode 100644
index 00000000000..5d9ef119cee
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/AsyncCryptBinding.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
+import com.mongodb.binding.AsyncReadWriteBinding;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AsyncClusterAwareReadWriteBinding;
+import com.mongodb.session.SessionContext;
+
+@SuppressWarnings("deprecation")
+public class AsyncCryptBinding implements AsyncClusterAwareReadWriteBinding {
+    private final AsyncClusterAwareReadWriteBinding wrapped;
+    private final Crypt crypt;
+
+    public AsyncCryptBinding(final AsyncClusterAwareReadWriteBinding wrapped, final Crypt crypt) {
+        this.wrapped = wrapped;
+        this.crypt = crypt;
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return wrapped.getReadPreference();
+    }
+
+    @Override
+    public void getWriteConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        wrapped.getWriteConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(new AsyncCryptConnectionSource(result), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public SessionContext getSessionContext() {
+        return wrapped.getSessionContext();
+    }
+
+    @Override
+    public void getReadConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        wrapped.getReadConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(new AsyncCryptConnectionSource(result), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public AsyncReadWriteBinding retain() {
+        return wrapped.retain();
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+    }
+
+    @Override
+    public Cluster getCluster() {
+        return wrapped.getCluster();
+    }
+
+    private class AsyncCryptConnectionSource implements AsyncConnectionSource {
+        private final AsyncConnectionSource wrapped;
+
+        AsyncCryptConnectionSource(final AsyncConnectionSource wrapped) {
+            this.wrapped = wrapped;
+            AsyncCryptBinding.this.retain();
+        }
+
+        @Override
+        public ServerDescription getServerDescription() {
+            return wrapped.getServerDescription();
+        }
+
+        @Override
+        public SessionContext getSessionContext() {
+            return wrapped.getSessionContext();
+        }
+
+        @Override
+        public void getConnection(final SingleResultCallback<AsyncConnection> callback) {
+            wrapped.getConnection(new SingleResultCallback<AsyncConnection>() {
+                @Override
+                public void onResult(final AsyncConnection result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        callback.onResult(new AsyncCryptConnection(result, crypt), null);
+                    }
+                }
+            });
+        }
+
+        @Override
+        public int getCount() {
+            return wrapped.getCount();
+        }
+
+        @Override
+        public AsyncConnectionSource retain() {
+            wrapped.retain();
+            return this;
+        }
+
+        @Override
+        public void release() {
+            wrapped.release();
+        }
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/AsyncCryptConnection.java b/driver-async/src/main/com/mongodb/async/client/internal/AsyncCryptConnection.java
new file mode 100644
index 00000000000..11303f47577
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/AsyncCryptConnection.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.QueryResult;
+import com.mongodb.connection.SplittablePayload;
+import com.mongodb.internal.connection.MessageSettings;
+import com.mongodb.internal.connection.SplittablePayloadBsonWriter;
+import com.mongodb.internal.validator.MappedFieldNameValidator;
+import com.mongodb.lang.Nullable;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonBinaryReader;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonBinaryWriterSettings;
+import org.bson.BsonDocument;
+import org.bson.BsonWriter;
+import org.bson.BsonWriterSettings;
+import org.bson.FieldNameValidator;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.Decoder;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.RawBsonDocumentCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.io.BasicOutputBuffer;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotTwo;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+@SuppressWarnings("deprecation")
+class AsyncCryptConnection implements AsyncConnection {
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+    private static final int MAX_SPLITTABLE_DOCUMENT_SIZE = 2097152;
+
+    private final AsyncConnection wrapped;
+    private final Crypt crypt;
+
+    AsyncCryptConnection(final AsyncConnection wrapped, final Crypt crypt) {
+        this.wrapped = wrapped;
+        this.crypt = crypt;
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public AsyncCryptConnection retain() {
+        wrapped.retain();
+        return this;
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+    }
+
+    @Override
+    public ConnectionDescription getDescription() {
+        return wrapped.getDescription();
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
+                                 final ReadPreference readPreference, final Decoder<T> commandResultDecoder,
+                                 final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+        commandAsync(database, command, fieldNameValidator, readPreference, commandResultDecoder, sessionContext, true, null, null,
+                callback);
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                                 final ReadPreference readPreference, final Decoder<T> commandResultDecoder,
+                                 final SessionContext sessionContext, final boolean responseExpected,
+                                 @Nullable final SplittablePayload payload, @Nullable final FieldNameValidator payloadFieldNameValidator,
+                                 final SingleResultCallback<T> callback) {
+
+        if (serverIsLessThanVersionFourDotTwo(wrapped.getDescription())) {
+            callback.onResult(null, new MongoClientException("Auto-encryption requires a minimum MongoDB version of 4.2"));
+        }
+
+        BasicOutputBuffer bsonOutput = new BasicOutputBuffer();
+        BsonBinaryWriter bsonBinaryWriter = new BsonBinaryWriter(new BsonWriterSettings(),
+                new BsonBinaryWriterSettings(getDescription().getMaxDocumentSize()),
+                bsonOutput, getFieldNameValidator(payload, commandFieldNameValidator, payloadFieldNameValidator));
+        BsonWriter writer = payload == null
+                ? bsonBinaryWriter
+                : new SplittablePayloadBsonWriter(bsonBinaryWriter, bsonOutput, createSplittablePayloadMessageSettings(), payload,
+                MAX_SPLITTABLE_DOCUMENT_SIZE);
+
+        try {
+            getEncoder(command).encode(writer, command, EncoderContext.builder().build());
+            crypt.encrypt(database, new RawBsonDocument(bsonOutput.getInternalBuffer(), 0, bsonOutput.getSize()),
+                    new SingleResultCallback<RawBsonDocument>() {
+
+                        @Override
+                        public void onResult(final RawBsonDocument encryptedCommand, final Throwable t) {
+                            if (t != null) {
+                                callback.onResult(null, t);
+                            } else {
+                                wrapped.commandAsync(database, encryptedCommand, commandFieldNameValidator, readPreference,
+                                        new RawBsonDocumentCodec(), sessionContext, responseExpected, null, null,
+                                        createCommandCallback());
+                            }
+                        }
+
+                        private SingleResultCallback<RawBsonDocument> createCommandCallback() {
+                            return new SingleResultCallback<RawBsonDocument>() {
+                                @Override
+                                public void onResult(final RawBsonDocument encryptedResponse, final Throwable t) {
+                                    if (t != null) {
+                                        callback.onResult(null, t);
+                                    } else {
+                                        crypt.decrypt(encryptedResponse, createDecryptCallback());
+                                    }
+                                }
+                            };
+                        }
+
+                        private SingleResultCallback<RawBsonDocument> createDecryptCallback() {
+                            return new SingleResultCallback<RawBsonDocument>() {
+                                @Override
+                                public void onResult(final RawBsonDocument decryptedResponse, final Throwable t) {
+                                    if (t != null) {
+                                        callback.onResult(null, t);
+                                    } else {
+                                        try {
+                                            BsonBinaryReader reader = new BsonBinaryReader(decryptedResponse.getByteBuffer().asNIO());
+                                            callback.onResult(commandResultDecoder.decode(reader, DecoderContext.builder().build()), null);
+                                        } catch (Throwable t1) {
+                                            callback.onResult(null, t1);
+                                        }
+                                    }
+                                }
+                            };
+                        }
+                    });
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Codec<BsonDocument> getEncoder(final BsonDocument command) {
+        return (Codec<BsonDocument>) REGISTRY.get(command.getClass());
+    }
+
+    private FieldNameValidator getFieldNameValidator(@Nullable final SplittablePayload payload,
+                                                     final FieldNameValidator commandFieldNameValidator,
+                                                     @Nullable final FieldNameValidator payloadFieldNameValidator) {
+        if (payload == null) {
+            return commandFieldNameValidator;
+        }
+
+        Map<String, FieldNameValidator> rootMap = new HashMap<String, FieldNameValidator>();
+        rootMap.put(payload.getPayloadName(), payloadFieldNameValidator);
+        return new MappedFieldNameValidator(commandFieldNameValidator, rootMap);
+    }
+
+    private MessageSettings createSplittablePayloadMessageSettings() {
+        return MessageSettings.builder()
+                .maxBatchCount(getDescription().getMaxBatchCount())
+                .maxMessageSize(getDescription().getMaxMessageSize())
+                .maxDocumentSize(getDescription().getMaxDocumentSize())
+                .build();
+    }
+
+
+    // UNSUPPORTED METHODS for encryption/decryption
+
+    @Override
+    public void insertAsync(final MongoNamespace namespace, final boolean ordered, final InsertRequest insertRequest,
+                            final SingleResultCallback<WriteConcernResult> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public void updateAsync(final MongoNamespace namespace, final boolean ordered, final UpdateRequest updateRequest,
+                            final SingleResultCallback<WriteConcernResult> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public void deleteAsync(final MongoNamespace namespace, final boolean ordered, final DeleteRequest deleteRequest,
+                            final SingleResultCallback<WriteConcernResult> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final boolean slaveOk,
+                                 final FieldNameValidator fieldNameValidator, final Decoder<T> commandResultDecoder,
+                                 final SingleResultCallback<T> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                               final int numberToReturn, final int skip, final boolean slaveOk, final boolean tailableCursor,
+                               final boolean awaitData, final boolean noCursorTimeout, final boolean partial, final boolean oplogReplay,
+                               final Decoder<T> resultDecoder, final SingleResultCallback<QueryResult<T>> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                               final int skip, final int limit, final int batchSize, final boolean slaveOk, final boolean tailableCursor,
+                               final boolean awaitData, final boolean noCursorTimeout, final boolean partial, final boolean oplogReplay,
+                               final Decoder<T> resultDecoder, final SingleResultCallback<QueryResult<T>> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public <T> void getMoreAsync(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
+                                 final Decoder<T> resultDecoder, final SingleResultCallback<QueryResult<T>> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public void killCursorAsync(final List<Long> cursors, final SingleResultCallback<Void> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+    @Override
+    public void killCursorAsync(final MongoNamespace namespace, final List<Long> cursors, final SingleResultCallback<Void> callback) {
+        callback.onResult(null, new UnsupportedOperationException());
+    }
+
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/CollectionInfoRetriever.java b/driver-async/src/main/com/mongodb/async/client/internal/CollectionInfoRetriever.java
new file mode 100644
index 00000000000..d25e8ec6d38
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/CollectionInfoRetriever.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import org.bson.BsonDocument;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class CollectionInfoRetriever {
+
+    private final MongoClient client;
+
+    CollectionInfoRetriever(final MongoClient client) {
+        this.client = notNull("client", client);
+    }
+
+    public void filter(final String databaseName, final BsonDocument filter, final SingleResultCallback<BsonDocument> callback) {
+        client.getDatabase(databaseName).listCollections(BsonDocument.class).filter(filter).first(callback);
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/CommandMarker.java b/driver-async/src/main/com/mongodb/async/client/internal/CommandMarker.java
new file mode 100644
index 00000000000..01a6cbd50fc
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/CommandMarker.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.Block;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoTimeoutException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.connection.ClusterSettings;
+import org.bson.RawBsonDocument;
+
+import java.io.Closeable;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongocryptdSpawnArgs;
+
+@SuppressWarnings("UseOfProcessBuilder")
+class CommandMarker implements Closeable {
+    private MongoClient client;
+    private final ProcessBuilder processBuilder;
+
+    CommandMarker(final Map<String, Object> options) {
+        String connectionString;
+
+        if (options.containsKey("mongocryptdURI")) {
+            connectionString = (String) options.get("mongocryptdURI");
+        } else {
+            connectionString = "mongodb://localhost:27020";
+        }
+
+        if (!options.containsKey("mongocryptdBypassSpawn") || !((Boolean) options.get("mongocryptdBypassSpawn"))) {
+            processBuilder = new ProcessBuilder(createMongocryptdSpawnArgs(options));
+            startProcess();
+        } else {
+            processBuilder = null;
+        }
+
+        client = MongoClients.create(MongoClientSettings.builder()
+                .applyConnectionString(new ConnectionString(connectionString))
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    public void apply(final ClusterSettings.Builder builder) {
+                        builder.serverSelectionTimeout(1, TimeUnit.SECONDS);
+                    }
+                })
+                .build());
+    }
+
+    void mark(final String databaseName, final RawBsonDocument command, final SingleResultCallback<RawBsonDocument> callback) {
+        final SingleResultCallback<RawBsonDocument> wrappedCallback = new SingleResultCallback<RawBsonDocument>() {
+            @Override
+            public void onResult(final RawBsonDocument result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, new MongoClientException("Exception in encryption library: " + t.getMessage(), t));
+                } else {
+                    callback.onResult(result, null);
+                }
+            }
+        };
+        runCommand(databaseName, command, new SingleResultCallback<RawBsonDocument>() {
+            @Override
+            public void onResult(final RawBsonDocument result, final Throwable t) {
+                if (t == null) {
+                    wrappedCallback.onResult(result, null);
+                } else if (t instanceof MongoTimeoutException && processBuilder != null) {
+                    startProcessAndContinue(new SingleResultCallback<Void>() {
+                        @Override
+                        public void onResult(final Void result, final Throwable t) {
+                            if (t != null) {
+                                callback.onResult(null, t);
+                            } else {
+                                runCommand(databaseName, command, wrappedCallback);
+                            }
+                        }
+                    });
+                } else {
+                    wrappedCallback.onResult(null, t);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void close() {
+        client.close();
+    }
+
+    private void runCommand(final String databaseName, final RawBsonDocument command,
+                            final SingleResultCallback<RawBsonDocument> callback) {
+        client.getDatabase(databaseName)
+                .withReadConcern(ReadConcern.DEFAULT)
+                .withReadPreference(ReadPreference.primary())
+                .runCommand(command, RawBsonDocument.class, callback);
+    }
+
+    private void startProcessAndContinue(final SingleResultCallback<Void> callback) {
+        try {
+            startProcess();
+            callback.onResult(null, null);
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+        }
+    }
+
+    private void startProcess() {
+        try {
+            processBuilder.start();
+        } catch (Throwable t) {
+            throw new MongoClientException("Exception starting mongocryptd process. Is `mongocryptd` on the system path?", t);
+        }
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/Crypt.java b/driver-async/src/main/com/mongodb/async/client/internal/Crypt.java
new file mode 100644
index 00000000000..d7c03666aa2
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/Crypt.java
@@ -0,0 +1,368 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.crypt.capi.MongoCrypt;
+import com.mongodb.crypt.capi.MongoCryptContext;
+import com.mongodb.crypt.capi.MongoCryptException;
+import com.mongodb.crypt.capi.MongoDataKeyOptions;
+import com.mongodb.crypt.capi.MongoExplicitEncryptOptions;
+import com.mongodb.crypt.capi.MongoKeyDecryptor;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.RawBsonDocument;
+
+import java.io.Closeable;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.crypt.capi.MongoCryptContext.State;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+
+public class Crypt implements Closeable {
+    private static final Logger LOGGER = Loggers.getLogger("client");
+    private final MongoCrypt mongoCrypt;
+    private final CollectionInfoRetriever collectionInfoRetriever;
+    private final CommandMarker commandMarker;
+    private final KeyRetriever keyRetriever;
+    private final KeyManagementService keyManagementService;
+    private final boolean bypassAutoEncryption;
+
+    /**
+     * Create an instance to use for explicit encryption and decryption, and data key creation.
+     *
+     * @param mongoCrypt           the mongoCrypt wrapper
+     * @param keyRetriever         the key retriever
+     * @param keyManagementService the key management service
+     */
+    Crypt(final MongoCrypt mongoCrypt, final KeyRetriever keyRetriever, final KeyManagementService keyManagementService) {
+        this(mongoCrypt, null, null, keyRetriever, keyManagementService, false);
+    }
+
+    /**
+     * Create an instance to use for auto-encryption and auto-decryption.
+     *
+     * @param mongoCrypt              the mongoCrypt wrapper
+     * @param keyRetriever            the key retriever
+     * @param keyManagementService    the key management service
+     * @param collectionInfoRetriever the collection info retriever
+     * @param commandMarker           the command marker
+     */
+    Crypt(final MongoCrypt mongoCrypt, @Nullable final CollectionInfoRetriever collectionInfoRetriever,
+          @Nullable final CommandMarker commandMarker, final KeyRetriever keyRetriever, final KeyManagementService keyManagementService,
+          final boolean bypassAutoEncryption) {
+        this.mongoCrypt = mongoCrypt;
+        this.collectionInfoRetriever = collectionInfoRetriever;
+        this.commandMarker = commandMarker;
+        this.keyRetriever = keyRetriever;
+        this.keyManagementService = keyManagementService;
+        this.bypassAutoEncryption = bypassAutoEncryption;
+    }
+
+    /**
+     * Encrypt the given command
+     *
+     * @param databaseName the namespace
+     * @param command      the unencrypted command
+     * @param callback the callback containing the encrypted command
+     */
+    public void encrypt(final String databaseName, final RawBsonDocument command,
+                        final SingleResultCallback<RawBsonDocument> callback) {
+        notNull("databaseName", databaseName);
+        notNull("command", command);
+
+        if (bypassAutoEncryption) {
+            callback.onResult(command, null);
+            return;
+        }
+
+        try {
+            final MongoCryptContext encryptionContext = mongoCrypt.createEncryptionContext(databaseName, command);
+            executeStateMachine(encryptionContext, databaseName, createCallback(new SingleResultCallback<RawBsonDocument>() {
+                @Override
+                public void onResult(final RawBsonDocument result, final Throwable t) {
+                    encryptionContext.close();
+                    callback.onResult(result, t);
+                }
+            }));
+        } catch (MongoCryptException e) {
+            callback.onResult(null, wrapInClientException(e));
+        }
+    }
+
+    /**
+     * Decrypt the given command response
+     *
+     * @param commandResponse the encrypted command response
+     * @param callback the callback containing the decrypted command response
+     */
+    public void decrypt(final RawBsonDocument commandResponse, final SingleResultCallback<RawBsonDocument> callback) {
+        notNull("commandResponse", commandResponse);
+        try {
+            final MongoCryptContext decryptionContext = mongoCrypt.createDecryptionContext(commandResponse);
+            executeStateMachine(decryptionContext, null, createCallback(new SingleResultCallback<RawBsonDocument>() {
+                @Override
+                public void onResult(final RawBsonDocument result, final Throwable t) {
+                    decryptionContext.close();
+                    callback.onResult(result, t);
+                }
+            }));
+        } catch (Throwable t) {
+            callback.onResult(null, wrapInClientException(t));
+        }
+    }
+
+    /**
+     * Create a data key.
+     *
+     * @param kmsProvider the KMS provider to create the data key for
+     * @param options     the data key options
+     * @param callback the callback containing the document representing the data key to be added to the key vault
+     */
+    public void createDataKey(final String kmsProvider, final DataKeyOptions options,
+                       final SingleResultCallback<RawBsonDocument> callback) {
+        notNull("kmsProvider", kmsProvider);
+        notNull("options", options);
+
+        try {
+            final MongoCryptContext dataKeyCreationContext = mongoCrypt.createDataKeyContext(kmsProvider,
+                    MongoDataKeyOptions.builder()
+                            .keyAltNames(options.getKeyAltNames())
+                            .masterKey(options.getMasterKey())
+                            .build());
+            executeStateMachine(dataKeyCreationContext, null, createCallback(new SingleResultCallback<RawBsonDocument>() {
+                @Override
+                public void onResult(final RawBsonDocument result, final Throwable t) {
+                    dataKeyCreationContext.close();
+                    callback.onResult(result, t);
+                }
+            }));
+        } catch (Throwable t) {
+            callback.onResult(null, wrapInClientException(t));
+        }
+    }
+
+    /**
+     * Encrypt the given value with the given options
+     *
+     * @param value   the value to encrypt
+     * @param options the options
+     * @param callback the callback containing the encrypted value
+     */
+    public void encryptExplicitly(final BsonValue value, final EncryptOptions options,
+                           final SingleResultCallback<BsonBinary> callback) {
+        notNull("value", value);
+        notNull("options", options);
+
+        try {
+            MongoExplicitEncryptOptions.Builder encryptOptionsBuilder = MongoExplicitEncryptOptions.builder()
+                    .algorithm(options.getAlgorithm());
+
+            if (options.getKeyId() != null) {
+                encryptOptionsBuilder.keyId(options.getKeyId());
+            }
+
+            if (options.getKeyAltName() != null) {
+                encryptOptionsBuilder.keyAltName(options.getKeyAltName());
+            }
+
+            final MongoCryptContext encryptionContext = mongoCrypt.createExplicitEncryptionContext(
+                    new BsonDocument("v", value), encryptOptionsBuilder.build());
+
+            executeStateMachine(encryptionContext, null, createCallback(new SingleResultCallback<RawBsonDocument>() {
+                @Override
+                public void onResult(final RawBsonDocument result, final Throwable t) {
+                    encryptionContext.close();
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        callback.onResult(result.getBinary("v"), null);
+                    }
+                }
+            }));
+        } catch (Throwable t) {
+            callback.onResult(null, wrapInClientException(t));
+        }
+    }
+
+    /**
+     * Decrypt the given encrypted value.
+     *
+     * @param value the encrypted value
+     * @param callback the callback containing the decrypted value
+     */
+    public void decryptExplicitly(final BsonBinary value, final SingleResultCallback<BsonValue> callback) {
+        notNull("value", value);
+
+        try {
+            final MongoCryptContext decryptionContext = mongoCrypt.createExplicitDecryptionContext(new BsonDocument("v", value));
+            executeStateMachine(decryptionContext, null, createCallback(new SingleResultCallback<RawBsonDocument>() {
+                @Override
+                public void onResult(final RawBsonDocument result, final Throwable t) {
+                    decryptionContext.close();
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        callback.onResult(result.get("v"), null);
+                    }
+                }
+            }));
+        } catch (Throwable t) {
+            callback.onResult(null, wrapInClientException(t));
+        }
+    }
+
+    @Override
+    public void close() {
+        mongoCrypt.close();
+        if (commandMarker != null) {
+            commandMarker.close();
+        }
+        keyRetriever.close();
+    }
+
+    private void executeStateMachine(final MongoCryptContext cryptContext, final String databaseName,
+                                     final SingleResultCallback<RawBsonDocument> callback) {
+        State state = cryptContext.getState();
+        switch (state) {
+            case NEED_MONGO_COLLINFO:
+                collInfo(cryptContext, databaseName, callback);
+                break;
+            case NEED_MONGO_MARKINGS:
+                mark(cryptContext, databaseName, callback);
+                break;
+            case NEED_MONGO_KEYS:
+                fetchKeys(cryptContext, databaseName, callback);
+                break;
+            case NEED_KMS:
+                decryptKeys(cryptContext, databaseName, callback);
+                break;
+            case READY:
+                callback.onResult(cryptContext.finish(), null);
+                break;
+            default:
+                callback.onResult(null, new MongoInternalException("Unsupported encryptor state + " + state));
+        }
+
+    }
+
+    private void collInfo(final MongoCryptContext cryptContext, final String databaseName,
+                          final SingleResultCallback<RawBsonDocument> callback) {
+        collectionInfoRetriever.filter(databaseName, cryptContext.getMongoOperation(), createCallback(
+                new SingleResultCallback<BsonDocument>() {
+                    @Override
+                    public void onResult(final BsonDocument result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            try {
+                                if (result != null) {
+                                    cryptContext.addMongoOperationResult(result);
+                                }
+                                cryptContext.completeMongoOperation();
+                                executeStateMachine(cryptContext, databaseName, callback);
+                            } catch (Throwable t1) {
+                                callback.onResult(null, wrapInClientException(t1));
+                            }
+                        }
+                    }
+                }));
+    }
+
+    private void mark(final MongoCryptContext cryptContext, final String databaseName,
+                      final SingleResultCallback<RawBsonDocument> callback) {
+        commandMarker.mark(databaseName, cryptContext.getMongoOperation(), createCallback(new SingleResultCallback<RawBsonDocument>() {
+                    @Override
+                    public void onResult(final RawBsonDocument result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            try {
+                                cryptContext.addMongoOperationResult(result);
+                                cryptContext.completeMongoOperation();
+                                executeStateMachine(cryptContext, databaseName, callback);
+                            } catch (Throwable t1) {
+                                callback.onResult(null, wrapInClientException(t1));
+                            }
+                        }
+                    }
+                }));
+    }
+
+    private void fetchKeys(final MongoCryptContext cryptContext, final String databaseName,
+                           final SingleResultCallback<RawBsonDocument> callback) {
+        keyRetriever.find(cryptContext.getMongoOperation(), createCallback(new SingleResultCallback<List<BsonDocument>>() {
+                    @Override
+                    public void onResult(final List<BsonDocument> results, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            try {
+                                for (BsonDocument result : results) {
+                                    cryptContext.addMongoOperationResult(result);
+                                }
+                                cryptContext.completeMongoOperation();
+                                executeStateMachine(cryptContext, databaseName, callback);
+                            } catch (Throwable t1) {
+                                callback.onResult(null, wrapInClientException(t1));
+                            }
+                        }
+                    }
+                }));
+    }
+
+    private void decryptKeys(final MongoCryptContext cryptContext, final String databaseName,
+                             final SingleResultCallback<RawBsonDocument> callback) {
+        MongoKeyDecryptor keyDecryptor = cryptContext.nextKeyDecryptor();
+        if (keyDecryptor != null) {
+            keyManagementService.decryptKey(keyDecryptor, createCallback(new SingleResultCallback<Void>() {
+                @Override
+                public void onResult(final Void result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, wrapInClientException(t));
+                    } else {
+                        decryptKeys(cryptContext, databaseName, callback);
+                    }
+                }
+            }));
+        } else {
+            try {
+                cryptContext.completeKeyDecryptors();
+                executeStateMachine(cryptContext, databaseName, callback);
+            } catch (Throwable t1) {
+                callback.onResult(null, wrapInClientException(t1));
+            }
+        }
+    }
+
+    private MongoClientException wrapInClientException(final Throwable t) {
+        return new MongoClientException("Exception in encryption library: " + t.getMessage(), t);
+    }
+
+    private <T> SingleResultCallback<T> createCallback(final SingleResultCallback<T> callback) {
+        return errorHandlingCallback(callback, LOGGER);
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/Crypts.java b/driver-async/src/main/com/mongodb/async/client/internal/Crypts.java
new file mode 100644
index 00000000000..65ee594f36a
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/Crypts.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.crypt.capi.MongoCrypts;
+
+import javax.net.ssl.SSLContext;
+import java.security.NoSuchAlgorithmException;
+
+import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongoCryptOptions;
+
+public final class Crypts {
+
+    public static Crypt createCrypt(final MongoClient client, final AutoEncryptionSettings options) {
+        return new Crypt(MongoCrypts.create(createMongoCryptOptions(options.getKmsProviders(), options.getSchemaMap())),
+                new CollectionInfoRetriever(client),
+                new CommandMarker(options.getExtraOptions()),
+                createKeyRetriever(client, options.getKeyVaultMongoClientSettings(), options.getKeyVaultNamespace()),
+                createKeyManagementService(),
+                options.isBypassAutoEncryption());
+    }
+
+    public static Crypt create(final MongoClient keyVaultClient, final ClientEncryptionSettings options) {
+        return new Crypt(MongoCrypts.create(
+                createMongoCryptOptions(options.getKmsProviders(), null)),
+                createKeyRetriever(keyVaultClient, false, options.getKeyVaultNamespace()),
+                createKeyManagementService());
+    }
+
+    private static KeyRetriever createKeyRetriever(final MongoClient defaultKeyVaultClient,
+                                                   final MongoClientSettings keyVaultMongoClientSettings,
+                                                   final String keyVaultNamespaceString) {
+        MongoClient keyVaultClient;
+        boolean keyRetrieverOwnsClient;
+        if (keyVaultMongoClientSettings != null) {
+            keyVaultClient = MongoClients.create(keyVaultMongoClientSettings);
+            keyRetrieverOwnsClient = true;
+        } else {
+            keyVaultClient = defaultKeyVaultClient;
+            keyRetrieverOwnsClient = false;
+        }
+
+        return createKeyRetriever(keyVaultClient, keyRetrieverOwnsClient, keyVaultNamespaceString);
+    }
+
+    private static KeyRetriever createKeyRetriever(final MongoClient keyVaultClient, final boolean keyRetrieverOwnsClient,
+                                                   final String keyVaultNamespaceString) {
+        return new KeyRetriever(keyVaultClient, keyRetrieverOwnsClient, new MongoNamespace(keyVaultNamespaceString));
+    }
+
+    private static KeyManagementService createKeyManagementService() {
+        return new KeyManagementService(getSslContext(), 443, 10000);
+    }
+
+    private static SSLContext getSslContext() {
+        SSLContext sslContext;
+        try {
+            sslContext = SSLContext.getDefault();
+        } catch (NoSuchAlgorithmException e) {
+            throw new MongoClientException("Unable to create default SSLContext", e);
+        }
+        return sslContext;
+    }
+
+    private Crypts() {
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/KeyManagementService.java b/driver-async/src/main/com/mongodb/async/client/internal/KeyManagementService.java
new file mode 100644
index 00000000000..697119c5701
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/KeyManagementService.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.MongoSocketException;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncCompletionHandler;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.connection.Stream;
+import com.mongodb.connection.StreamFactory;
+import com.mongodb.connection.TlsChannelStreamFactoryFactory;
+import com.mongodb.crypt.capi.MongoKeyDecryptor;
+import com.mongodb.internal.connection.AsynchronousChannelStream;
+import org.bson.ByteBuf;
+import org.bson.ByteBufNIO;
+
+import javax.net.ssl.SSLContext;
+import java.nio.channels.CompletionHandler;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+class KeyManagementService {
+    private final int defaultPort;
+    private final StreamFactory streamFactory;
+
+    KeyManagementService(final SSLContext sslContext, final int defaultPort, final int timeoutMillis) {
+        this.defaultPort = defaultPort;
+        this.streamFactory = new TlsChannelStreamFactoryFactory().create(SocketSettings.builder()
+                        .connectTimeout(timeoutMillis, TimeUnit.MILLISECONDS)
+                        .readTimeout(timeoutMillis, TimeUnit.MILLISECONDS)
+                        .build(),
+                SslSettings.builder().enabled(true).context(sslContext).build());
+    }
+
+    void decryptKey(final MongoKeyDecryptor keyDecryptor, final SingleResultCallback<Void> callback) {
+        streamOpen(keyDecryptor, callback);
+    }
+
+    private void streamOpen(final MongoKeyDecryptor keyDecryptor, final SingleResultCallback<Void> callback) {
+        ServerAddress serverAddress = keyDecryptor.getHostName().contains(":")
+                ? new ServerAddress(keyDecryptor.getHostName())
+                : new ServerAddress(keyDecryptor.getHostName(), defaultPort);
+        final Stream stream = streamFactory.create(serverAddress);
+        stream.openAsync(new AsyncCompletionHandler<Void>() {
+            @Override
+            public void completed(final Void aVoid) {
+                streamWrite(stream, keyDecryptor, callback);
+            }
+
+            @Override
+            public void failed(final Throwable t) {
+                stream.close();
+                callback.onResult(null, wrapException(t));
+            }
+        });
+    }
+
+    private void streamWrite(final Stream stream, final MongoKeyDecryptor keyDecryptor, final SingleResultCallback<Void> callback) {
+        List<ByteBuf> byteBufs = Collections.<ByteBuf>singletonList(new ByteBufNIO(keyDecryptor.getMessage()));
+        stream.writeAsync(byteBufs, new AsyncCompletionHandler<Void>() {
+            @Override
+            public void completed(final Void aVoid) {
+                streamRead(stream, keyDecryptor, callback);
+            }
+
+            @Override
+            public void failed(final Throwable t) {
+                stream.close();
+                callback.onResult(null, wrapException(t));
+            }
+        });
+    }
+
+    private void streamRead(final Stream stream, final MongoKeyDecryptor keyDecryptor, final SingleResultCallback<Void> callback) {
+        int bytesNeeded = keyDecryptor.bytesNeeded();
+        if (bytesNeeded > 0) {
+            AsynchronousChannelStream asyncStream = (AsynchronousChannelStream) stream;
+            final ByteBuf buffer = asyncStream.getBuffer(bytesNeeded);
+            asyncStream.getChannel().read(buffer.asNIO(), asyncStream.getSettings().getReadTimeout(MILLISECONDS), MILLISECONDS, null,
+                    new CompletionHandler<Integer, Void>() {
+
+                        @Override
+                        public void completed(final Integer integer, final Void aVoid) {
+                            buffer.flip();
+                            try {
+                                keyDecryptor.feed(buffer.asNIO());
+                                buffer.release();
+                                streamRead(stream, keyDecryptor, callback);
+                            } catch (Throwable t) {
+                                callback.onResult(null, t);
+                            }
+                        }
+
+                        @Override
+                        public void failed(final Throwable t, final Void aVoid) {
+                            buffer.release();
+                            stream.close();
+                            callback.onResult(null, wrapException(t));
+                        }
+                    });
+        } else {
+            stream.close();
+            callback.onResult(null, null);
+        }
+    }
+
+    private Throwable wrapException(final Throwable t) {
+        return t instanceof MongoSocketException ? t.getCause() : t;
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/KeyRetriever.java b/driver-async/src/main/com/mongodb/async/client/internal/KeyRetriever.java
new file mode 100644
index 00000000000..b6477bbad4a
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/KeyRetriever.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import org.bson.BsonDocument;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class KeyRetriever implements Closeable {
+    private final MongoClient client;
+    private final boolean ownsClient;
+    private final MongoNamespace namespace;
+
+    KeyRetriever(final MongoClient client, final boolean ownsClient, final MongoNamespace namespace) {
+        this.client = notNull("client", client);
+        this.ownsClient = ownsClient;
+        this.namespace = notNull("namespace", namespace);
+    }
+
+    public void find(final BsonDocument keyFilter, final SingleResultCallback<List<BsonDocument>> callback) {
+        client.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName(), BsonDocument.class)
+                .withReadConcern(ReadConcern.MAJORITY)
+                .find(keyFilter).into(new ArrayList<BsonDocument>(), callback);
+    }
+
+    @Override
+    public void close() {
+        if (ownsClient) {
+            client.close();
+        }
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/internal/package-info.java b/driver-async/src/main/com/mongodb/async/client/internal/package-info.java
new file mode 100644
index 00000000000..5980420f1f1
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/internal/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@NonNullApi
+package com.mongodb.async.client.internal;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-async/src/main/com/mongodb/async/client/package-info.java b/driver-async/src/main/com/mongodb/async/client/package-info.java
index 2b129f5fbda..29a5890feb5 100644
--- a/driver-async/src/main/com/mongodb/async/client/package-info.java
+++ b/driver-async/src/main/com/mongodb/async/client/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,4 +17,8 @@
 /**
  * This packages contains classes for the new async client
  */
+@Deprecated
+@NonNullApi
 package com.mongodb.async.client;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryption.java b/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryption.java
new file mode 100644
index 00000000000..04c7f6edc66
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryption.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.vault;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import org.bson.BsonBinary;
+import org.bson.BsonValue;
+
+import java.io.Closeable;
+
+/**
+ * The Key vault.
+ * <p>
+ * Used to create data encryption keys, and to explicitly encrypt and decrypt values when auto-encryption is not an option.
+ * </p>
+ * @since 3.11
+ */
+public interface ClientEncryption extends Closeable {
+
+    /**
+     * Create a data key with the given KMS provider.
+     *
+     * <p>
+     * Creates a new key document and inserts into the key vault collection.
+     * </p>
+     *
+     * @param kmsProvider the KMS provider
+     * @param callback the callback containing the identifier for the created data key
+     */
+    void createDataKey(String kmsProvider, SingleResultCallback<BsonBinary> callback);
+
+    /**
+     * Create a data key with the given KMS provider and options.
+     *
+     * <p>
+     * Creates a new key document and inserts into the key vault collection.
+     * </p>
+     *
+     * @param kmsProvider    the KMS provider
+     * @param dataKeyOptions the options for data key creation
+     * @param callback the callback containing the identifier for the created data key
+     */
+    void createDataKey(String kmsProvider, DataKeyOptions dataKeyOptions, SingleResultCallback<BsonBinary> callback);
+
+    /**
+     * Encrypt the given value with the given options.
+     * <p>
+     *  The driver may throw an exception for prohibited BSON value types
+     * </p>
+     *
+     * @param value   the value to encrypt
+     * @param options the options for data encryption
+     * @param callback the callback containing the encrypted value, a BSON binary of subtype 6
+     */
+    void encrypt(BsonValue value, EncryptOptions options, SingleResultCallback<BsonBinary> callback);
+
+    /**
+     * Decrypt the given value.
+     *
+     * @param value the value to decrypt, which must be of subtype 6
+     * @param callback the callback containing the decrypted value
+     */
+    void decrypt(BsonBinary value, SingleResultCallback<BsonValue> callback);
+
+    @Override
+    void close();
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptionImpl.java b/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptionImpl.java
new file mode 100644
index 00000000000..d06f2634538
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptionImpl.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.vault;
+
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.internal.Crypt;
+import com.mongodb.async.client.internal.Crypts;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.RawBsonDocument;
+
+import java.io.Closeable;
+
+class ClientEncryptionImpl implements ClientEncryption, Closeable {
+    private final Crypt crypt;
+    private final ClientEncryptionSettings options;
+    private final MongoClient keyVaultClient;
+
+    ClientEncryptionImpl(final ClientEncryptionSettings options) {
+        this.keyVaultClient = MongoClients.create(options.getKeyVaultMongoClientSettings());
+        this.crypt = Crypts.create(keyVaultClient, options);
+        this.options = options;
+    }
+
+    @Override
+    public void createDataKey(final String kmsProvider, final SingleResultCallback<BsonBinary> callback) {
+        createDataKey(kmsProvider, new DataKeyOptions(), callback);
+    }
+
+    @Override
+    public void createDataKey(final String kmsProvider, final DataKeyOptions dataKeyOptions,
+                              final SingleResultCallback<BsonBinary> callback) {
+        crypt.createDataKey(kmsProvider, dataKeyOptions, new SingleResultCallback<RawBsonDocument>() {
+            @Override
+            public void onResult(final RawBsonDocument dataKeyDocument, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    MongoNamespace namespace = new MongoNamespace(options.getKeyVaultNamespace());
+                    keyVaultClient.getDatabase(namespace.getDatabaseName())
+                            .getCollection(namespace.getCollectionName(), BsonDocument.class)
+                            .withWriteConcern(WriteConcern.MAJORITY)
+                            .insertOne(dataKeyDocument, new SingleResultCallback<Void>() {
+                                @Override
+                                public void onResult(final Void result, final Throwable t) {
+                                    if (t != null) {
+                                        callback.onResult(null, t);
+                                    } else {
+                                        callback.onResult(dataKeyDocument.getBinary("_id"), null);
+                                    }
+                                }
+                            });
+                }
+            }
+        });
+    }
+
+    @Override
+    public void encrypt(final BsonValue value, final EncryptOptions options, final SingleResultCallback<BsonBinary> callback) {
+        crypt.encryptExplicitly(value, options, callback);
+    }
+
+    @Override
+    public void decrypt(final BsonBinary value, final SingleResultCallback<BsonValue> callback) {
+        crypt.decryptExplicitly(value, callback);
+    }
+
+    @Override
+    public void close() {
+        keyVaultClient.close();
+        crypt.close();
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptions.java b/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptions.java
new file mode 100644
index 00000000000..9d541ef2a7b
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/vault/ClientEncryptions.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.vault;
+
+import com.mongodb.ClientEncryptionSettings;
+
+/**
+ * Factory for ClientEncryption implementations.
+ *
+ * @since 3.11
+ */
+public final class ClientEncryptions {
+
+    /**
+     * Create a key vault with the given options.
+     *
+     * @param options the key vault options
+     * @return the key vault
+     */
+    public static ClientEncryption create(final ClientEncryptionSettings options) {
+        return new ClientEncryptionImpl(options);
+    }
+
+    private ClientEncryptions() {
+    }
+}
diff --git a/driver-async/src/main/com/mongodb/async/client/vault/package-info.java b/driver-async/src/main/com/mongodb/async/client/vault/package-info.java
new file mode 100644
index 00000000000..ba8d4ffb9a6
--- /dev/null
+++ b/driver-async/src/main/com/mongodb/async/client/vault/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the Key Vault API
+ *
+ * <p>
+ * Note: support for client-side encryption is in beta.  Backwards-breaking changes may be made before the final release.
+ * </p>
+ * @since 3.11
+ */
+
+@NonNullApi
+package com.mongodb.async.client.vault;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/AbstractUnifiedTest.java b/driver-async/src/test/functional/com/mongodb/async/client/AbstractUnifiedTest.java
new file mode 100644
index 00000000000..283681de6e4
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/AbstractUnifiedTest.java
@@ -0,0 +1,626 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.Block;
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoWriteConcernException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
+import static com.mongodb.async.client.Fixture.getConnectionString;
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.async.client.Fixture.isSharded;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
+@RunWith(Parameterized.class)
+public abstract class AbstractUnifiedTest {
+
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private JsonPoweredCrudTestHelper helper;
+    private final TestCommandListener commandListener;
+    private MongoClient mongoClient;
+    private CollectionHelper<Document> collectionHelper;
+    private Map<String, ClientSession> sessionsMap;
+    private HashMap<String, BsonDocument> lsidMap;
+    private boolean useMultipleMongoses = false;
+    private ConnectionString connectionString;
+    private final String collectionName = "test";
+
+    private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
+
+    public AbstractUnifiedTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+                               final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = getDefaultDatabaseName();
+        this.data = data;
+        this.definition = definition;
+        this.commandListener = new TestCommandListener();
+        this.skipTest = skipTest;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        assumeTrue("Skipping test: " + definition.getString("skipReason", new BsonString("")).getValue(),
+                !definition.containsKey("skipReason"));
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+
+        collectionHelper.killAllSessions();
+        collectionHelper.create(collectionName, new CreateCollectionOptions(), WriteConcern.MAJORITY);
+
+        if (!data.isEmpty()) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+
+            collectionHelper.insertDocuments(documents, WriteConcern.MAJORITY);
+        }
+
+
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+
+        final BsonDocument clientOptions = definition.getDocument("clientOptions", new BsonDocument());
+
+        connectionString = getConnectionString();
+
+        useMultipleMongoses = definition.getBoolean("useMultipleMongoses", BsonBoolean.FALSE).getValue();
+        if (useMultipleMongoses) {
+            assumeTrue(isSharded());
+            connectionString = getMultiMongosConnectionString();
+            assumeTrue("The system property org.mongodb.test.transaction.uri is not set.", connectionString != null);
+        }
+
+        MongoClientSettings.Builder builder = MongoClientSettings.builder().applyConnectionString(connectionString);
+
+        if (System.getProperty("java.version").startsWith("1.6.")) {
+            builder.applyToSslSettings(new Block<SslSettings.Builder>() {
+                @Override
+                public void apply(final SslSettings.Builder builder) {
+                    builder.invalidHostNameAllowed(true);
+                }
+            });
+        }
+        builder.addCommandListener(commandListener)
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+                    @Override
+                    public void apply(final SocketSettings.Builder builder) {
+                        builder.readTimeout(5, TimeUnit.SECONDS);
+                    }
+                })
+                .retryWrites(clientOptions.getBoolean("retryWrites", BsonBoolean.FALSE).getValue())
+                .writeConcern(getWriteConcern(clientOptions))
+                .readConcern(getReadConcern(clientOptions))
+                .readPreference(getReadPreference(clientOptions))
+                .retryWrites(clientOptions.getBoolean("retryWrites", BsonBoolean.FALSE).getValue())
+                .retryReads(false)
+                .applyToServerSettings(new Block<ServerSettings.Builder>() {
+                    @Override
+                    public void apply(final ServerSettings.Builder builder) {
+                        builder.minHeartbeatFrequency(MIN_HEARTBEAT_FREQUENCY_MS, TimeUnit.MILLISECONDS);
+                    }
+                });
+
+        if (clientOptions.containsKey("heartbeatFrequencyMS")) {
+            builder.applyToServerSettings(new Block<ServerSettings.Builder>() {
+                @Override
+                public void apply(final ServerSettings.Builder builder) {
+                    builder.heartbeatFrequency(clientOptions.getInt32("heartbeatFrequencyMS").intValue(), TimeUnit.MILLISECONDS);
+                }
+            });
+        }
+
+        mongoClient = MongoClients.create(builder.build());
+
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+
+        if (useMultipleMongoses) {
+            // non-transactional distinct operation to avoid StaleDbVersion error
+            runDistinctOnEachNode();
+        }
+
+        helper = new JsonPoweredCrudTestHelper(description, database, database.getCollection(collectionName, BsonDocument.class));
+
+        ClientSession sessionZero = createSession("session0");
+        ClientSession sessionOne = createSession("session1");
+
+        sessionsMap = new HashMap<String, ClientSession>();
+        sessionsMap.put("session0", sessionZero);
+        sessionsMap.put("session1", sessionOne);
+        lsidMap = new HashMap<String, BsonDocument>();
+        lsidMap.put("session0", sessionZero.getServerSession().getIdentifier());
+        lsidMap.put("session1", sessionOne.getServerSession().getIdentifier());
+    }
+
+    private ReadConcern getReadConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readConcernLevel")) {
+            return new ReadConcern(ReadConcernLevel.fromString(clientOptions.getString("readConcernLevel").getValue()));
+        } else {
+            return ReadConcern.DEFAULT;
+        }
+    }
+
+    private WriteConcern getWriteConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("w")) {
+            if (clientOptions.isNumber("w")) {
+                return new WriteConcern(clientOptions.getNumber("w").intValue());
+            } else {
+                return new WriteConcern(clientOptions.getString("w").getValue());
+            }
+        } else {
+            return WriteConcern.ACKNOWLEDGED;
+        }
+    }
+
+    private ReadPreference getReadPreference(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readPreference")) {
+            return ReadPreference.valueOf(clientOptions.getString("readPreference").getValue());
+        } else {
+            return ReadPreference.primary();
+        }
+    }
+
+    private ClientSession createSession(final String sessionName) {
+        BsonDocument optionsDocument = definition.getDocument("sessionOptions", new BsonDocument())
+                .getDocument(sessionName, new BsonDocument());
+        final ClientSessionOptions options = ClientSessionOptions.builder()
+                .causallyConsistent(optionsDocument.getBoolean("causalConsistency", BsonBoolean.TRUE).getValue())
+                .defaultTransactionOptions(createDefaultTransactionOptions(optionsDocument))
+                .build();
+        return new MongoOperation<ClientSession>() {
+            @Override
+            public void execute() {
+                mongoClient.startSession(options, getCallback());
+            }
+        }.get();
+    }
+
+    private TransactionOptions createDefaultTransactionOptions(final BsonDocument optionsDocument) {
+        TransactionOptions.Builder builder = TransactionOptions.builder();
+        if (optionsDocument.containsKey("defaultTransactionOptions")) {
+            BsonDocument defaultTransactionOptionsDocument = optionsDocument.getDocument("defaultTransactionOptions");
+            if (defaultTransactionOptionsDocument.containsKey("readConcern")) {
+                builder.readConcern(helper.getReadConcern(defaultTransactionOptionsDocument));
+            }
+            if (defaultTransactionOptionsDocument.containsKey("writeConcern")) {
+                builder.writeConcern(helper.getWriteConcern(defaultTransactionOptionsDocument));
+            }
+            if (defaultTransactionOptionsDocument.containsKey("readPreference")) {
+                builder.readPreference(helper.getReadPreference(defaultTransactionOptionsDocument));
+            }
+            if (defaultTransactionOptionsDocument.containsKey("maxCommitTimeMS")) {
+                builder.maxCommitTime(defaultTransactionOptionsDocument.getNumber("maxCommitTimeMS").longValue(), MILLISECONDS);
+            }
+
+        }
+        return builder.build();
+    }
+
+    private void runDistinctOnEachNode() {
+        List<String> hosts = connectionString.getHosts();
+        for (String host : hosts) {
+            runDistinctOnHost(host);
+        }
+    }
+
+    private void runDistinctOnHost(final String host) {
+        MongoClient client = MongoClients.create(MongoClientSettings.builder()
+                .applyConnectionString(connectionString)
+                .clusterSettings(ClusterSettings.builder()
+                        .hosts(singletonList(new ServerAddress(host))).build()).build());
+        DistinctIterable<BsonValue> iterable = client.getDatabase(databaseName).getCollection(collectionName)
+                .distinct("_id", BsonValue.class);
+        FutureResultCallback<List<BsonValue>> futureResultCallback = new FutureResultCallback<List<BsonValue>>();
+        iterable.into(new BsonArray(), futureResultCallback);
+
+        try {
+            futureResultCallback.get();
+        } catch (RuntimeException e) {
+            throw e;
+        } finally {
+            client.close();
+        }
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+
+        if (collectionHelper != null && definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(new BsonDocument("configureFailPoint",
+                    definition.getDocument("failPoint").getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+        }
+    }
+
+    private void closeAllSessions() {
+        for (final ClientSession cur : sessionsMap.values()) {
+            cur.close();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        try {
+            executeOperations(definition.getArray("operations"), false);
+        } finally {
+            closeAllSessions();
+        }
+
+        if (definition.containsKey("expectations")) {
+            // TODO: null operation may cause test failures, since it's used to grab the read preference
+            // TODO: though read-pref.json doesn't declare expectations, so maybe not
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName, null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+            assertEventsEquality(expectedEvents, events, lsidMap);
+        }
+
+        BsonDocument expectedOutcome = definition.getDocument("outcome", new BsonDocument());
+        if (expectedOutcome.containsKey("collection")) {
+            List<BsonDocument> collectionData = collectionHelper.find(new BsonDocumentCodec());
+            assertEquals(expectedOutcome.getDocument("collection").getArray("data").getValues(), collectionData);
+        }
+    }
+
+    private void executeOperations(final BsonArray operations, final boolean throwExceptions) {
+        TargetedFailPoint failPoint = null;
+        try {
+            for (BsonValue cur : operations) {
+                final BsonDocument operation = cur.asDocument();
+                String operationName = operation.getString("name").getValue();
+                BsonValue expectedResult = operation.get("result");
+                String receiver = operation.getString("object").getValue();
+                final ClientSession clientSession = receiver.startsWith("session") ? sessionsMap.get(receiver)
+                        : (operation.getDocument("arguments", new BsonDocument()).containsKey("session")
+                        ? sessionsMap.get(operation.getDocument("arguments").getString("session").getValue()) : null);
+                try {
+                    if (operationName.equals("startTransaction")) {
+                        BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                        if (arguments.containsKey("options")) {
+                            TransactionOptions transactionOptions = createTransactionOptions(arguments.getDocument("options"));
+                            nonNullClientSession(clientSession).startTransaction(transactionOptions);
+                        } else {
+                            nonNullClientSession(clientSession).startTransaction();
+                        }
+                    } else if (operationName.equals("commitTransaction")) {
+                        new MongoOperation<Void>() {
+                            @Override
+                            public void execute() {
+                                nonNullClientSession(clientSession).commitTransaction(getCallback());
+                            }
+                        }.get();
+                    } else if (operationName.equals("abortTransaction")) {
+                        new MongoOperation<Void>() {
+                            @Override
+                            public void execute() {
+                                nonNullClientSession(clientSession).abortTransaction(getCallback());
+                            }
+                        }.get();
+                    } else if (operationName.equals("targetedFailPoint")) {
+                        assertTrue(failPoint == null);
+                        failPoint = new TargetedFailPoint(operation);
+                        failPoint.executeFailPoint();
+                    } else if (operationName.equals("assertSessionPinned")) {
+                        if (isSharded()) {
+                            final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                            assertNotNull(sessionsMap.get(arguments.getString("session").getValue()).getPinnedServerAddress());
+                        }
+                    } else if (operationName.equals("assertSessionUnpinned")) {
+                        if (isSharded()) {
+                            final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                            assertNull(sessionsMap.get(arguments.getString("session").getValue()).getPinnedServerAddress());
+                        }
+                    } else if (operationName.equals("assertSessionTransactionState")) {
+                        final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                        ClientSession session = sessionsMap.get(arguments.getString("session").getValue());
+                        String state = arguments.getString("state").getValue();
+                        if (state.equals("starting") || state.equals("in_progress")) {
+                            assertTrue(session.hasActiveTransaction());
+                        } else {
+                            assertFalse(session.hasActiveTransaction());
+                        }
+                    } else if (operationName.equals("endSession")) {
+                        clientSession.close();
+                    } else if (operation.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+                        try {
+                            helper.getOperationResults(operation, clientSession);
+                            fail("Error expected but none thrown");
+                        } catch (Exception e) {
+                            // Expected failure ignore
+                        }
+                    } else if (operationName.equals("assertDifferentLsidOnLastTwoCommands")) {
+                        List<CommandEvent> events = lastTwoCommandEvents();
+                        assertNotEquals(((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
+                                ((CommandStartedEvent) events.get(1)).getCommand().getDocument("lsid"));
+                    } else if (operationName.equals("assertSameLsidOnLastTwoCommands")) {
+                        List<CommandEvent> events = lastTwoCommandEvents();
+                        assertEquals(((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
+                                ((CommandStartedEvent) events.get(1)).getCommand().getDocument("lsid"));
+                    } else if (operationName.equals("assertSessionDirty")) {
+                        assertNotNull(clientSession);
+                        assertNotNull(clientSession.getServerSession());
+                        assertTrue(clientSession.getServerSession().isMarkedDirty());
+                    } else if (operationName.equals("assertSessionNotDirty")) {
+                        assertNotNull(clientSession);
+                        assertNotNull(clientSession.getServerSession());
+                        assertFalse(clientSession.getServerSession().isMarkedDirty());
+                    } else {
+                        BsonDocument actualOutcome = helper.getOperationResults(operation, clientSession);
+                        if (expectedResult != null) {
+                            BsonValue actualResult = actualOutcome.get("result");
+                            if (actualResult.isDocument()) {
+                                if (((BsonDocument) actualResult).containsKey("recoveryToken")) {
+                                    ((BsonDocument) actualResult).remove("recoveryToken");
+                                }
+                            }
+
+                            assertEquals("Expected operation result differs from actual", expectedResult, actualResult);
+                        }
+                    }
+                    assertFalse(String.format("Expected error '%s' but none thrown for operation %s",
+                            getErrorContainsField(expectedResult), operationName), hasErrorContainsField(expectedResult));
+                    assertFalse(String.format("Expected error code '%s' but none thrown for operation %s",
+                            getErrorCodeNameField(expectedResult), operationName), hasErrorCodeNameField(expectedResult));
+                } catch (RuntimeException e) {
+                    if (!assertExceptionState(e, expectedResult, operationName) || throwExceptions) {
+                        throw e;
+                    }
+                }
+            }
+        } finally {
+            if (failPoint != null) {
+                failPoint.disableFailPoint();
+            }
+        }
+    }
+
+    private boolean assertExceptionState(final RuntimeException e, final BsonValue expectedResult, final String operationName) {
+        boolean passedAssertion = false;
+        if (hasErrorLabelsContainField(expectedResult)) {
+            if (e instanceof MongoException) {
+                MongoException mongoException = (MongoException) e;
+                for (String curErrorLabel : getErrorLabelsContainField(expectedResult)) {
+                    assertTrue(String.format("Expected error label '%s but found labels '%s' for operation %s",
+                            curErrorLabel, mongoException.getErrorLabels(), operationName),
+                            mongoException.hasErrorLabel(curErrorLabel));
+                }
+                passedAssertion = true;
+            }
+        }
+        if (hasErrorLabelsOmitField(expectedResult)) {
+            if (e instanceof MongoException) {
+                MongoException mongoException = (MongoException) e;
+                for (String curErrorLabel : getErrorLabelsOmitField(expectedResult)) {
+                    assertFalse(String.format("Expected error label '%s omitted but found labels '%s' for operation %s",
+                            curErrorLabel, mongoException.getErrorLabels(), operationName),
+                            mongoException.hasErrorLabel(curErrorLabel));
+                }
+                passedAssertion = true;
+            }
+        }
+        if (hasErrorContainsField(expectedResult)) {
+            String expectedError = getErrorContainsField(expectedResult);
+            assertTrue(String.format("Expected '%s' but got '%s' for operation %s", expectedError, e.getMessage(),
+                    operationName), e.getMessage().toLowerCase().contains(expectedError.toLowerCase()));
+            passedAssertion = true;
+        }
+        if (hasErrorCodeNameField(expectedResult)) {
+            String expectedErrorCodeName = getErrorCodeNameField(expectedResult);
+            if (e instanceof MongoCommandException) {
+                assertEquals(expectedErrorCodeName, ((MongoCommandException) e).getErrorCodeName());
+                passedAssertion = true;
+            } else if (e instanceof MongoWriteConcernException) {
+                assertEquals(expectedErrorCodeName, ((MongoWriteConcernException) e).getWriteConcernError().getCodeName());
+                passedAssertion = true;
+            }
+        }
+        return passedAssertion;
+    }
+
+    private List<CommandEvent> lastTwoCommandEvents() {
+        List<CommandEvent> events = commandListener.getCommandStartedEvents();
+        assertTrue(events.size() >= 2);
+        return events.subList(events.size() - 2, events.size());
+    }
+
+    private TransactionOptions createTransactionOptions(final BsonDocument options) {
+        TransactionOptions.Builder builder = TransactionOptions.builder();
+        if (options.containsKey("writeConcern")) {
+            builder.writeConcern(helper.getWriteConcern(options));
+        }
+        if (options.containsKey("readConcern")) {
+            builder.readConcern(helper.getReadConcern(options));
+        }
+        if (options.containsKey("readPreference")) {
+            builder.readPreference(helper.getReadPreference(options));
+        }
+        if (options.containsKey("maxCommitTimeMS")) {
+            builder.maxCommitTime(options.getNumber("maxCommitTimeMS").longValue(), MILLISECONDS);
+        }
+        return builder.build();
+    }
+
+    private String getErrorContainsField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorContains");
+    }
+
+    private String getErrorCodeNameField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorCodeName");
+    }
+
+    private String getErrorField(final BsonValue expectedResult, final String key) {
+        if (hasErrorField(expectedResult, key)) {
+            return expectedResult.asDocument().getString(key).getValue();
+        } else {
+            return "";
+        }
+    }
+
+    private boolean hasErrorLabelsContainField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorLabelsContain");
+    }
+
+    private List<String> getErrorLabelsContainField(final BsonValue expectedResult) {
+        return getListOfStringsFromBsonArrays(expectedResult.asDocument(), "errorLabelsContain");
+    }
+
+    private boolean hasErrorLabelsOmitField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorLabelsOmit");
+    }
+
+    private List<String> getErrorLabelsOmitField(final BsonValue expectedResult) {
+        return getListOfStringsFromBsonArrays(expectedResult.asDocument(), "errorLabelsOmit");
+    }
+
+
+    private List<String> getListOfStringsFromBsonArrays(final BsonDocument expectedResult, final String arrayFieldName) {
+        List<String> errorLabelContainsList = new ArrayList<String>();
+        for (BsonValue cur : expectedResult.asDocument().getArray(arrayFieldName)) {
+            errorLabelContainsList.add(cur.asString().getValue());
+        }
+        return errorLabelContainsList;
+    }
+
+    private boolean hasErrorContainsField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorContains");
+    }
+
+    private boolean hasErrorCodeNameField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorCodeName");
+    }
+
+    private boolean hasErrorField(final BsonValue expectedResult, final String key) {
+        return expectedResult != null && expectedResult.isDocument() && expectedResult.asDocument().containsKey(key);
+    }
+
+    private ClientSession nonNullClientSession(@Nullable final ClientSession clientSession) {
+        if (clientSession == null) {
+            throw new IllegalArgumentException("clientSession can't be null in this context");
+        }
+        return clientSession;
+    }
+
+    private class TargetedFailPoint {
+        private final BsonDocument failPointDocument;
+        private final MongoDatabase adminDB;
+        private MongoClient mongoClient;
+
+        TargetedFailPoint(final BsonDocument operation) {
+            final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+            final ClientSession clientSession = sessionsMap.get(arguments.getString("session").getValue());
+
+            if (clientSession.getPinnedServerAddress() != null) {
+                mongoClient = MongoClients.create(MongoClientSettings.builder()
+                        .applyConnectionString(connectionString)
+                        .clusterSettings(ClusterSettings.builder()
+                        .hosts(singletonList(clientSession.getPinnedServerAddress())).build()).build());
+
+                adminDB = mongoClient.getDatabase("admin");
+            } else {
+                adminDB = null;
+            }
+            failPointDocument = arguments.getDocument("failPoint");
+        }
+
+        public void executeFailPoint() {
+            executeCommand(failPointDocument);
+        }
+
+        public void disableFailPoint() {
+            executeCommand(new BsonDocument("configureFailPoint",
+                    failPointDocument.getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+            if (mongoClient != null) {
+                mongoClient.close();
+            }
+        }
+
+        private void executeCommand(final BsonDocument doc) {
+            if (adminDB != null) {
+                FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+                adminDB.runCommand(doc, BsonDocument.class, futureResultCallback);
+                futureResultCallback.get();
+            } else {
+                collectionHelper.runAdminCommand(doc);
+            }
+        }
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ChangeStreamProseTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ChangeStreamProseTest.java
new file mode 100644
index 00000000000..8c9ae5d8e77
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ChangeStreamProseTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoChangeStreamException;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoQueryException;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.test.CollectionHelper;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/change-streams/tests/README.rst#prose-tests
+public class ChangeStreamProseTest extends DatabaseTestCase {
+    private BsonDocument failPointDocument;
+    private CollectionHelper<Document> collectionHelper;
+
+    @Before
+    @Override
+    public void setUp() {
+        assumeTrue(canRunTests());
+        super.setUp();
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(getDefaultDatabaseName(), "test"));
+
+        // create the collection before starting tests
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.insertOne(Document.parse("{ _id : 0 }"), callback);
+        futureResult(callback);
+    }
+
+    //
+    // Test that the ChangeStream will throw an exception if the server response is missing the resume token (if wire version is < 8).
+    //
+    @Test
+    public void testMissingResumeTokenThrowsException() {
+        boolean exceptionFound = false;
+        AsyncBatchCursor<ChangeStreamDocument<Document>> cursor =
+                createChangeStreamCursor(collection.watch(singletonList(Aggregates.project(Document.parse("{ _id : 0 }")))));
+
+        try {
+            insertOneDocument();
+            getNextBatch(cursor);
+        } catch (MongoChangeStreamException e) {
+            exceptionFound = true;
+        } catch (MongoQueryException e) {
+            if (serverVersionAtLeast(4, 1)) {
+                exceptionFound = true;
+            }
+        } finally {
+            cursor.close();
+        }
+        assertTrue(exceptionFound);
+    }
+
+    //
+    // Test that the ChangeStream will automatically resume one time on a resumable error (including not master)
+    // with the initial pipeline and options, except for the addition/update of a resumeToken.
+    //
+    @Test
+    public void testResumeOneTimeOnError() {
+        assumeTrue(serverVersionAtLeast(4, 0));
+        AsyncBatchCursor<ChangeStreamDocument<Document>> cursor = createChangeStreamCursor();
+
+        insertOneDocument();
+        setFailPoint("getMore", 10107);
+        try {
+            assertNotNull(getNextBatch(cursor));
+        } finally {
+            disableFailPoint();
+            cursor.close();
+        }
+    }
+
+    //
+    // Test that ChangeStream will not attempt to resume on any error encountered while executing an aggregate command.
+    //
+    @Test
+    public void testNoResumeForAggregateErrors() {
+        boolean exceptionFound = false;
+        AsyncBatchCursor<ChangeStreamDocument<Document>> cursor = null;
+
+        try {
+            cursor = createChangeStreamCursor(collection.watch(singletonList(Document.parse("{ $unsupportedStage: { _id : 0 } }"))));
+        } catch (MongoCommandException e) {
+            exceptionFound = true;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        assertTrue(exceptionFound);
+    }
+
+    //
+    // ChangeStream will not attempt to resume after encountering error code 11601 (Interrupted), 136 (CappedPositionLost),
+    // or 237 (CursorKilled) while executing a getMore command.
+    //
+    @Test
+    public void testNoResumeErrors() {
+        assumeTrue(serverVersionAtLeast(4, 0));
+        AsyncBatchCursor<ChangeStreamDocument<Document>> cursor = createChangeStreamCursor();
+        insertOneDocument();
+
+        for (int errCode : asList(136, 237, 11601)) {
+            try {
+                setFailPoint("getMore", errCode);
+                getNextBatch(cursor);
+            } catch (MongoException e) {
+                assertEquals(errCode, e.getCode());
+            } finally {
+                disableFailPoint();
+            }
+        }
+        cursor.close();
+    }
+
+    private void insertOneDocument() {
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.insertOne(Document.parse("{ x: 1 }"), callback);
+        futureResult(callback);
+    }
+
+    private AsyncBatchCursor<ChangeStreamDocument<Document>> createChangeStreamCursor() {
+        return createChangeStreamCursor(collection.watch());
+    }
+
+    private AsyncBatchCursor<ChangeStreamDocument<Document>> createChangeStreamCursor(
+            final ChangeStreamIterable<Document> changeStreamIterable) {
+        FutureResultCallback<AsyncBatchCursor<ChangeStreamDocument<Document>>> callback =
+                new FutureResultCallback<AsyncBatchCursor<ChangeStreamDocument<Document>>>();
+
+        changeStreamIterable.batchCursor(callback);
+        return futureResult(callback);
+    }
+
+    private List<ChangeStreamDocument<Document>> getNextBatch(final AsyncBatchCursor<ChangeStreamDocument<Document>> cursor) {
+        FutureResultCallback<List<ChangeStreamDocument<Document>>> callback =
+                new FutureResultCallback<List<ChangeStreamDocument<Document>>>();
+        cursor.next(callback);
+        return futureResult(callback);
+    }
+
+    private void setFailPoint(final String command, final int errCode) {
+        failPointDocument = new BsonDocument("configureFailPoint", new BsonString("failCommand"))
+                .append("mode", new BsonDocument("times", new BsonInt32(1)))
+                .append("data", new BsonDocument("failCommands", new BsonArray(asList(new BsonString(command))))
+                        .append("errorCode", new BsonInt32(errCode)));
+        collectionHelper.runAdminCommand(failPointDocument);
+    }
+
+    private void disableFailPoint() {
+        collectionHelper.runAdminCommand(failPointDocument.append("mode", new BsonString("off")));
+    }
+
+    private boolean canRunTests() {
+        return isDiscoverableReplicaSet() && serverVersionAtLeast(3, 6);
+    }
+
+    private <T> T futureResult(final FutureResultCallback<T> callback) {
+        try {
+            return callback.get(30, TimeUnit.SECONDS);
+        } catch (Throwable t) {
+            throw MongoException.fromThrowable(t);
+        }
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ChangeStreamsTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ChangeStreamsTest.java
new file mode 100644
index 00000000000..00bcbe130cf
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ChangeStreamsTest.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.client.CommandMonitoringTestHelper;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.OperationType;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeNotNull;
+
+// See https://github.com/mongodb/specifications/tree/master/source/retryable-writes/tests
+@RunWith(Parameterized.class)
+public class ChangeStreamsTest extends DatabaseTestCase {
+    private final String filename;
+    private final String description;
+    private final MongoNamespace namespace;
+    private final MongoNamespace namespace2;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+
+    private MongoClient mongoClient;
+    private TestCommandListener commandListener;
+
+    public ChangeStreamsTest(final String filename, final String description, final MongoNamespace namespace,
+                             final MongoNamespace namespace2, final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.namespace = namespace;
+        this.namespace2 = namespace2;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+    }
+
+    @AfterClass
+    public static void afterClass() {
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        CollectionHelper.dropDatabase(namespace.getDatabaseName(), WriteConcern.MAJORITY);
+        CollectionHelper<BsonDocument> collectionHelper = new CollectionHelper<BsonDocument>(new BsonDocumentCodec(), namespace);
+        collectionHelper.drop();
+        collectionHelper.create();
+
+        CollectionHelper.dropDatabase(namespace2.getDatabaseName(), WriteConcern.MAJORITY);
+        CollectionHelper<BsonDocument> collectionHelper2 = new CollectionHelper<BsonDocument>(new BsonDocumentCodec(), namespace2);
+        collectionHelper2.drop();
+        collectionHelper2.create();
+
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+
+        commandListener = new TestCommandListener();
+        mongoClient = MongoClients.create(getMongoClientBuilderFromConnectionString().addCommandListener(commandListener).build());
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        BsonDocument result = definition.getDocument("result");
+        AsyncBatchCursor<ChangeStreamDocument<BsonDocument>> cursor = createCursor(result);
+        if (cursor == null) {
+            return;
+        }
+
+        try {
+            handleOperations();
+
+            checkStreamValues(result, cursor);
+        } finally {
+            cursor.close();
+        }
+
+        checkExpectations();
+    }
+
+    private void checkStreamValues(final BsonDocument result, final AsyncBatchCursor<ChangeStreamDocument<BsonDocument>> cursor){
+
+        BsonArray expectedResults = result.getArray("success", new BsonArray());
+        Queue<ChangeStreamDocument<BsonDocument>> results = null;
+
+        try {
+            results = getResults(cursor);
+        } catch (MongoException e) {
+            if (result.containsKey("error")) {
+                final BsonDocument error = result.getDocument("error");
+                assertTrue(e.getCode() == error.getInt32("code").intValue()
+                        || !Collections.disjoint(e.getErrorLabels(), error.getArray("errorLabels")));
+                return;
+            } else {
+                throw e;
+            }
+        }
+        for (BsonValue expectedResult : expectedResults) {
+            BsonDocument expected = expectedResult.asDocument();
+
+            if (results.isEmpty()) {
+                results = getResults(cursor);
+            }
+            ChangeStreamDocument<BsonDocument> actual = results.poll();
+            assumeNotNull(actual);
+
+            MongoNamespace expectedNamespace = null;
+            if (expected.containsKey("ns")) {
+                BsonDocument nsDocument = expected.getDocument("ns");
+                expectedNamespace = nsDocument != null
+                        ? new MongoNamespace(nsDocument.getString("db").getValue(), nsDocument.getString("coll").getValue())
+                        : null;
+            }
+            assertEquals(expectedNamespace, actual.getNamespace());
+            assertEquals(OperationType.fromString(expected.getString("operationType").getValue()), actual.getOperationType());
+            if (actual.getFullDocument() != null) {
+                actual.getFullDocument().remove("_id");
+            }
+
+            assertEquals(expected.get("fullDocument"), actual.getFullDocument());
+        }
+    }
+
+    private Queue<ChangeStreamDocument<BsonDocument>> getResults(final AsyncBatchCursor<ChangeStreamDocument<BsonDocument>> cursor) {
+        FutureResultCallback<List<ChangeStreamDocument<BsonDocument>>> callback =
+                new FutureResultCallback<List<ChangeStreamDocument<BsonDocument>>>();
+        cursor.next(callback);
+        return new LinkedList<ChangeStreamDocument<BsonDocument>>(futureResult(callback));
+    }
+
+    @Nullable
+    private AsyncBatchCursor<ChangeStreamDocument<BsonDocument>> createCursor(final BsonDocument result) {
+        AsyncBatchCursor<ChangeStreamDocument<BsonDocument>> cursor;
+        try {
+            cursor = createChangeStreamCursor();
+        } catch (MongoException e) {
+            assertEquals(result.getDocument("error", new BsonDocument()).getInt32("code", new BsonInt32(-1)).getValue(), e.getCode());
+            return null;
+        }
+        FutureResultCallback<List<ChangeStreamDocument<BsonDocument>>> callback =
+                new FutureResultCallback<List<ChangeStreamDocument<BsonDocument>>>();
+        cursor.tryNext(callback);
+        assertNull(futureResult(callback));
+        return cursor;
+    }
+
+    private void checkExpectations() {
+        if (definition.containsKey("expectations") && definition.getArray("expectations").size() > 0) {
+
+            String database = definition.getString("target").getValue().equals("client") ? "admin" : namespace.getDatabaseName();
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), database, new BsonDocument());
+            List<CommandEvent> events = commandListener.getEvents();
+
+            for (int i = 0; i < expectedEvents.size(); i++) {
+                CommandEvent expectedEvent = expectedEvents.get(i);
+                CommandEvent event = events.get(i);
+                CommandMonitoringTestHelper.assertEventsEquality(singletonList(expectedEvent), singletonList(event));
+            }
+        }
+    }
+
+
+    private AsyncBatchCursor<ChangeStreamDocument<BsonDocument>> createChangeStreamCursor() {
+        String target = definition.getString("target").getValue();
+        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
+        for (BsonValue bsonValue : definition.getArray("changeStreamPipeline", new BsonArray())) {
+            pipeline.add(bsonValue.asDocument());
+        }
+
+        ChangeStreamIterable<BsonDocument> changeStreamIterable;
+
+        if (target.equals("client")) {
+            changeStreamIterable = mongoClient.watch(pipeline, BsonDocument.class);
+        } else if (target.equals("database")) {
+            changeStreamIterable = mongoClient.getDatabase(namespace.getDatabaseName()).watch(pipeline, BsonDocument.class);
+        } else if (target.equals("collection")) {
+            changeStreamIterable = mongoClient.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName())
+                    .watch(pipeline, BsonDocument.class);
+        } else {
+            throw new IllegalArgumentException(format("Unknown target: %s", target));
+        }
+
+        BsonDocument options = definition.getDocument("changeStreamOptions", new BsonDocument());
+
+        if (options.containsKey("batchSize")) {
+            changeStreamIterable.batchSize(options.getNumber("batchSize").intValue());
+        }
+
+
+        FutureResultCallback<AsyncBatchCursor<ChangeStreamDocument<BsonDocument>>> callback =
+                new FutureResultCallback<AsyncBatchCursor<ChangeStreamDocument<BsonDocument>>>();
+
+
+        changeStreamIterable.batchCursor(callback);
+        return futureResult(callback);
+    }
+
+    private void handleOperations() {
+        for (BsonValue operations : definition.getArray("operations")) {
+            BsonDocument op = operations.asDocument();
+            MongoNamespace opNamespace = new MongoNamespace(op.getString("database").getValue(), op.getString("collection").getValue());
+            createJsonPoweredCrudTestHelper(Fixture.getMongoClient(), opNamespace).getOperationResults(op);
+        }
+    }
+
+    private JsonPoweredCrudTestHelper createJsonPoweredCrudTestHelper(final MongoClient localMongoClient, final MongoNamespace namespace) {
+        return new JsonPoweredCrudTestHelper(description, localMongoClient.getDatabase(namespace.getDatabaseName()),
+                localMongoClient.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName(), BsonDocument.class));
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/change-streams")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            MongoNamespace namespace = new MongoNamespace(testDocument.getString("database_name").getValue(),
+                    testDocument.getString("collection_name").getValue());
+            MongoNamespace namespace2 = new MongoNamespace(testDocument.getString("database2_name").getValue(),
+                    testDocument.getString("collection2_name").getValue());
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        namespace, namespace2, test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+    <T> T futureResult(final FutureResultCallback<T> callback) {
+        try {
+            return callback.get(5, TimeUnit.SECONDS);
+        } catch (Throwable t) {
+            throw MongoException.fromThrowable(t);
+        }
+    }
+
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientEncryptionCustomEndpointTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ClientEncryptionCustomEndpointTest.java
new file mode 100644
index 00000000000..6e7aaabfb2e
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ClientEncryptionCustomEndpointTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientException;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.async.client.vault.ClientEncryption;
+import com.mongodb.async.client.vault.ClientEncryptions;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.TIMEOUT;
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+@RunWith(Parameterized.class)
+public class ClientEncryptionCustomEndpointTest {
+
+    private ClientEncryption clientEncryption;
+    private BsonDocument masterKey;
+    private final Class<? extends RuntimeException> exceptionClass;
+    // Delay loading this class because one of the expected classes is MongoCryptException, which should only be loaded after we
+    // determine that we're running on Java 8+ (since MongoCryptException is compiled with Java 8 target version)
+    private final String wrappedExceptionClassName;
+    private final String messageContainedInException;
+
+    public ClientEncryptionCustomEndpointTest(@SuppressWarnings("unused") final String name,
+                                              final BsonDocument masterKey,
+                                              @Nullable final Class<? extends RuntimeException> exceptionClass,
+                                              @Nullable final String wrappedExceptionClassName,
+                                              @Nullable final String messageContainedInException) {
+        this.masterKey = masterKey;
+        this.exceptionClass = exceptionClass;
+        this.wrappedExceptionClassName = wrappedExceptionClassName;
+        this.messageContainedInException = messageContainedInException;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Encryption test with external keyVault is disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> awsCreds = new HashMap<String, Object>();
+        awsCreds.put("accessKeyId", System.getProperty("org.mongodb.test.awsAccessKeyId"));
+        awsCreds.put("secretAccessKey", System.getProperty("org.mongodb.test.awsSecretAccessKey"));
+        kmsProviders.put("aws", awsCreds);
+
+        ClientEncryptionSettings.Builder clientEncryptionSettingsBuilder = ClientEncryptionSettings.builder().
+                keyVaultMongoClientSettings(Fixture.getMongoClientSettings())
+                .kmsProviders(kmsProviders)
+                .keyVaultNamespace("admin.datakeys");
+
+        ClientEncryptionSettings clientEncryptionSettings = clientEncryptionSettingsBuilder.build();
+        clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+    }
+
+    @After
+    public void after() {
+        if (clientEncryption != null) {
+            try {
+                clientEncryption.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+
+    @Test
+    public void testEndpoint() throws Exception {
+        try {
+            FutureResultCallback<BsonBinary> dataKeyCreationCallback = new FutureResultCallback<BsonBinary>();
+            clientEncryption.createDataKey("aws", new DataKeyOptions()
+                    .masterKey(masterKey), dataKeyCreationCallback);
+
+            BsonBinary dataKeyId = dataKeyCreationCallback.get(TIMEOUT, TimeUnit.SECONDS);
+
+            assertNull("Expected exception, but encryption succeeded", exceptionClass);
+
+            FutureResultCallback<BsonBinary> encryptCallback = new FutureResultCallback<BsonBinary>();
+            clientEncryption.encrypt(new BsonString("test"), new EncryptOptions("AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+                    .keyId(dataKeyId), encryptCallback);
+            encryptCallback.get();
+        } catch (Exception e) {
+            if (exceptionClass == null) {
+                throw e;
+            }
+            try {
+                assertEquals(exceptionClass, e.getClass());
+                assertEquals(wrappedExceptionClassName, e.getCause().getClass().getName());
+            } catch (AssertionError ae) {
+                throw e;
+            }
+            if (messageContainedInException != null) {
+                assertTrue(e.getCause().getMessage().contains(messageContainedInException));
+            }
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Object[]> data() {
+        List<Object[]> data = new ArrayList<Object[]>();
+
+        data.add(new Object[]{"default endpoint",
+                getDefaultMasterKey(),
+                null, null, null});
+        data.add(new Object[]{"valid endpoint",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-1.amazonaws.com")),
+                null, null, null});
+        data.add(new Object[]{"valid endpoint port",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-1.amazonaws.com:443")),
+                null, null, null});
+        data.add(new Object[]{"invalid endpoint port",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-1.amazonaws.com:12345")),
+                MongoClientException.class, "java.net.ConnectException", "Connection refused"});
+        data.add(new Object[]{"invalid amazon region in endpoint",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-2.amazonaws.com")),
+                MongoClientException.class, "com.mongodb.crypt.capi.MongoCryptException", "us-east-1"});
+        data.add(new Object[]{"invalid endpoint host",
+                getDefaultMasterKey().append("endpoint", new BsonString("example.com")),
+                MongoClientException.class, "com.mongodb.crypt.capi.MongoCryptException", "parse error"});
+
+        return data;
+    }
+
+    private static BsonDocument getDefaultMasterKey() {
+        return new BsonDocument()
+                .append("region", new BsonString("us-east-1"))
+                .append("key", new BsonString("arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"));
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy
new file mode 100644
index 00000000000..e58116a46eb
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client
+
+import com.mongodb.AutoEncryptionSettings
+import com.mongodb.ClientEncryptionSettings
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoWriteException
+import com.mongodb.WriteConcern
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.client.vault.ClientEncryption
+import com.mongodb.async.client.vault.ClientEncryptions
+import com.mongodb.client.test.CollectionHelper
+import com.mongodb.internal.connection.TestCommandListener
+import org.bson.BsonDocument
+import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString
+import static com.mongodb.async.client.Fixture.getMongoClientSettings
+import static java.util.Collections.singletonMap
+import static org.junit.Assume.assumeFalse
+import static org.junit.Assume.assumeTrue
+import static util.JsonPoweredTestHelper.getTestDocument
+
+class ClientSideEncryptionBsonSizeLimitsSpecification extends FunctionalSpecification {
+
+    private final MongoNamespace keyVaultNamespace = new MongoNamespace('test.datakeys')
+    private final MongoNamespace autoEncryptingCollectionNamespace = new MongoNamespace(getDefaultDatabaseName(),
+            'ClientSideEncryptionProseTestSpecification')
+    private final TestCommandListener commandListener = new TestCommandListener()
+
+    private MongoClient autoEncryptingClient
+    private ClientEncryption clientEncryption
+    private MongoCollection<BsonDocument> autoEncryptingDataCollection
+
+    def setup() {
+        assumeFalse(isNotAtLeastJava8())
+        assumeTrue(serverVersionAtLeast(4, 2))
+        assumeTrue('Key vault tests disabled',
+                System.getProperty('org.mongodb.test.awsAccessKeyId') != null
+                        && !System.getProperty('org.mongodb.test.awsAccessKeyId').isEmpty())
+        Fixture.drop(keyVaultNamespace)
+        Fixture.drop(autoEncryptingCollectionNamespace)
+
+        new CollectionHelper<>(new BsonDocumentCodec(), keyVaultNamespace).insertDocuments(
+                [getTestDocument('/client-side-encryption-limits/limits-key.json')],
+                WriteConcern.MAJORITY)
+
+        def providerProperties =
+                ['local': ['key': Base64.getDecoder().decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN'
+                        + '3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk')]
+                ]
+
+        autoEncryptingClient = MongoClients.create(getMongoClientBuilderFromConnectionString()
+                .autoEncryptionSettings(AutoEncryptionSettings.builder()
+                        .keyVaultNamespace(keyVaultNamespace.fullName)
+                        .kmsProviders(providerProperties)
+                        .schemaMap(singletonMap(autoEncryptingCollectionNamespace.fullName,
+                                getTestDocument('/client-side-encryption-limits/limits-schema.json')))
+                        .build())
+                .addCommandListener(commandListener)
+                .build())
+
+        autoEncryptingDataCollection = autoEncryptingClient.getDatabase(autoEncryptingCollectionNamespace.databaseName)
+                .getCollection(autoEncryptingCollectionNamespace.collectionName, BsonDocument)
+
+        clientEncryption = ClientEncryptions.create(ClientEncryptionSettings.builder()
+                .keyVaultMongoClientSettings(getMongoClientSettings())
+                .keyVaultNamespace(keyVaultNamespace.fullName)
+                .kmsProviders(providerProperties)
+                .build())
+    }
+
+    def 'test BSON size limits'() {
+        when:
+        def callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertOne(
+                new BsonDocument('_id', new BsonString('over_2mib_under_16mib'))
+                        .append('unencrypted', new BsonString('a' * 2097152)), callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+
+        when:
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertOne(getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                .append('_id', new BsonString('encryption_exceeds_2mib'))
+                .append('unencrypted', new BsonString('a' * (2097152 - 2000))), callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+
+        when:
+        commandListener.reset()
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertMany(
+                [
+                        new BsonDocument('_id', new BsonString('over_2mib_1'))
+                                .append('unencrypted', new BsonString('a' * 2097152)),
+                        new BsonDocument('_id', new BsonString('over_2mib_2'))
+                                .append('unencrypted', new BsonString('a' * 2097152))
+                ], callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+        countStartedEvents('insert') == 2
+
+        when:
+        commandListener.reset()
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertMany(
+                [
+                        getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                                .append('_id', new BsonString('encryption_exceeds_2mib_1'))
+                                .append('unencrypted', new BsonString('a' * (2097152 - 2000))),
+                        getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                                .append('_id', new BsonString('encryption_exceeds_2mib_2'))
+                                .append('unencrypted', new BsonString('a' * (2097152 - 2000))),
+                ], callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+        countStartedEvents('insert') == 2
+
+        when:
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertOne(
+                new BsonDocument('_id', new BsonString('under_16mib'))
+                        .append('unencrypted', new BsonString('a' * (16777216 - 2000))), callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+
+        when:
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertOne(getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                .append('_id', new BsonString('encryption_exceeds_16mib'))
+                .append('unencrypted', new BsonString('a' * (16777216 - 2000))), callback)
+        callback.get()
+
+        then:
+        thrown(MongoWriteException)
+    }
+
+    private int countStartedEvents(String name) {
+        int count = 0
+        for (def cur : commandListener.commandStartedEvents) {
+            if (cur.commandName == name) {
+                count++
+            }
+        }
+        count
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionCorpusTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionCorpusTest.java
new file mode 100644
index 00000000000..0508fd31255
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionCorpusTest.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.async.client.vault.ClientEncryption;
+import com.mongodb.async.client.vault.ClientEncryptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.UuidCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString;
+import static com.mongodb.async.client.Fixture.getMongoClientSettings;
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static util.JsonPoweredTestHelper.getTestDocument;
+
+// See https://github.com/mongodb/specifications/tree/master/source/client-side-encryption/corpus
+@RunWith(Parameterized.class)
+public class ClientSideEncryptionCorpusTest {
+    private final boolean useLocalSchema;
+    private MongoClient client;
+    private MongoClient autoEncryptingClient;
+    private ClientEncryption clientEncryption;
+
+    public ClientSideEncryptionCorpusTest(final boolean useLocalSchema) {
+        this.useLocalSchema = useLocalSchema;
+    }
+
+    @Before
+    public void setUp() throws IOException, URISyntaxException {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Corpus tests disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        MongoClientSettings clientSettings = getMongoClientBuilderFromConnectionString()
+                .codecRegistry(fromRegistries(fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)),
+                        MongoClientSettings.getDefaultCodecRegistry())).build();
+
+        // Step 1: create unencrypted client
+        client = MongoClients.create(clientSettings);
+        MongoDatabase db = client.getDatabase("db");
+
+        // Step 2: Drop and recreate db.coll with schema
+        BsonDocument schemaDocument = bsonDocumentFromPath("corpus-schema.json");
+
+        FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
+        db.getCollection("coll").drop(voidCallback);
+        voidCallback.get();
+
+        FutureResultCallback<Document> documentCallback = new FutureResultCallback<Document>();
+        db.runCommand(new BsonDocument("create", new BsonString("coll"))
+                .append("validator", new BsonDocument("$jsonSchema", schemaDocument)), documentCallback);
+        documentCallback.get();
+
+        // Step 3: Drop and create admin.datakeys
+        MongoDatabase adminDatabase = client.getDatabase("admin");
+        MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
+
+        voidCallback = new FutureResultCallback<Void>();
+        dataKeysCollection.drop(voidCallback);
+        voidCallback.get();
+
+        voidCallback = new FutureResultCallback<Void>();
+        dataKeysCollection.insertOne(bsonDocumentFromPath("corpus-key-aws.json"), voidCallback);
+        voidCallback.get();
+        voidCallback = new FutureResultCallback<Void>();
+        dataKeysCollection.insertOne(bsonDocumentFromPath("corpus-key-local.json"), voidCallback);
+        voidCallback.get();
+
+        // Step 4: Configure our objects
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> awsCreds = new HashMap<String, Object>();
+        Map<String, Object> localMasterkey = new HashMap<String, Object>();
+        awsCreds.put("accessKeyId", System.getProperty("org.mongodb.test.awsAccessKeyId"));
+        awsCreds.put("secretAccessKey", System.getProperty("org.mongodb.test.awsSecretAccessKey"));
+
+        byte[] localMasterkeyBytes = Base64.getDecoder().decode("Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBM"
+                + "UN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk");
+        localMasterkey.put("key", localMasterkeyBytes);
+        kmsProviders.put("aws", awsCreds);
+        kmsProviders.put("local", localMasterkey);
+
+        HashMap<String, BsonDocument> schemaMap = new HashMap<String, BsonDocument>();
+        schemaMap.put("db.coll", schemaDocument);
+
+        AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
+                .keyVaultNamespace("admin.datakeys")
+                .kmsProviders(kmsProviders);
+
+        if (useLocalSchema) {
+            autoEncryptionSettingsBuilder.schemaMap(schemaMap);
+        }
+
+        clientSettings = Fixture.getMongoClientBuilderFromConnectionString()
+                .codecRegistry(fromRegistries(
+                        fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)), MongoClientSettings.getDefaultCodecRegistry()))
+                .autoEncryptionSettings(autoEncryptionSettingsBuilder.build())
+                .build();
+        autoEncryptingClient = MongoClients.create(clientSettings);
+
+        ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder().
+                keyVaultMongoClientSettings(getMongoClientSettings()).
+                kmsProviders(kmsProviders).
+                keyVaultNamespace("admin.datakeys").build();
+        clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+    }
+
+    @Test
+    public void testCorpus() throws IOException, URISyntaxException {
+
+        // Step 5: Iterate over corpus
+        BsonDocument corpus = bsonDocumentFromPath("corpus.json");
+        BsonDocument corpusCopied = new BsonDocument();
+        for (String field : corpus.keySet()) {
+            if (field.equals("_id") || field.equals("altname_aws") || field.equals("altname_local")) {
+                corpusCopied.append(field, corpus.get(field));
+                continue;
+            }
+
+            BsonDocument fieldDocument = corpus.getDocument(field).clone();
+            String kms = fieldDocument.getString("kms").getValue();
+            String abbreviatedAlgorithName = fieldDocument.getString("algo").getValue();
+            String method = fieldDocument.getString("method").getValue();
+            String identifier = fieldDocument.getString("identifier").getValue();
+            boolean allowed = fieldDocument.getBoolean("allowed").getValue();
+            BsonValue value = fieldDocument.get("value");
+
+            byte[] awsKeyId = Base64.getDecoder().decode("AWSAAAAAAAAAAAAAAAAAAA==");
+            byte[] localKeyId = Base64.getDecoder().decode("LOCALAAAAAAAAAAAAAAAAA==");
+
+            if (method.equals("auto")) {
+                corpusCopied.append(field, corpus.get(field));
+                continue;
+            }
+
+            if (!method.equals("explicit")) {
+                throw new UnsupportedOperationException("Unsupported method: " + method);
+            }
+
+            String fullAlgorithmName = "AEAD_AES_256_CBC_HMAC_SHA_512-";
+            if (abbreviatedAlgorithName.equals("rand")) {
+                fullAlgorithmName += "Random";
+            } else if (abbreviatedAlgorithName.equals("det")) {
+                fullAlgorithmName += "Deterministic";
+            } else {
+                throw new UnsupportedOperationException("Unsupported algorithm: " + abbreviatedAlgorithName);
+            }
+
+            EncryptOptions opts = new EncryptOptions(fullAlgorithmName);
+            if (identifier.equals("id")) {
+                if (kms.equals("aws")) {
+                    opts.keyId(new BsonBinary(BsonBinarySubType.UUID_STANDARD, awsKeyId));
+                } else if (kms.equals("local")) {
+                    opts.keyId(new BsonBinary(BsonBinarySubType.UUID_STANDARD, localKeyId));
+                } else {
+                    throw new UnsupportedOperationException("Unsupported provider: " + kms);
+                }
+            } else if (identifier.equals("altname")) {
+                opts.keyAltName(kms);
+            } else {
+                throw new UnsupportedOperationException("Unsupported identifier: " + identifier);
+            }
+
+            try {
+                FutureResultCallback<BsonBinary> bsonBinaryCallback = new FutureResultCallback<BsonBinary>();
+                clientEncryption.encrypt(value, opts, bsonBinaryCallback);
+                BsonValue encryptedValue = bsonBinaryCallback.get();
+                fieldDocument.put("value", encryptedValue);
+                corpusCopied.append(field, fieldDocument);
+            } catch (MongoException e) {
+                if (allowed) {
+                    throw e;
+                }
+                corpusCopied.append(field, fieldDocument);
+            }
+        }
+
+        // Step 6: insert corpusCopied
+        MongoCollection<BsonDocument> encryptedCollection = autoEncryptingClient.getDatabase("db")
+                .getCollection("coll", BsonDocument.class);
+        FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
+        encryptedCollection.insertOne(corpusCopied, voidCallback);
+        voidCallback.get();
+
+        // Step 7: check the auto decrypted document
+        FutureResultCallback<BsonDocument> bsonDocumentCallback = new FutureResultCallback<BsonDocument>();
+        encryptedCollection.find(new BsonDocument()).first(bsonDocumentCallback);
+        BsonDocument corpusDecrypted = bsonDocumentCallback.get();
+        assertEquals(corpus, corpusDecrypted);
+
+        // Step 8: check the document with an unencrypted client
+        MongoCollection<BsonDocument> coll = client.getDatabase("db").getCollection("coll", BsonDocument.class);
+        bsonDocumentCallback = new FutureResultCallback<BsonDocument>();
+        coll.find(new BsonDocument()).first(bsonDocumentCallback);
+        BsonDocument corpusEncryptedActual = bsonDocumentCallback.get();
+        BsonDocument corpusEncryptedExpected = bsonDocumentFromPath("corpus-encrypted.json");
+
+        for (String field : corpusEncryptedExpected.keySet()) {
+            if (field.equals("_id") || field.equals("altname_aws") || field.equals("altname_local")) {
+                continue;
+            }
+
+            boolean allowed = corpusEncryptedActual.getDocument(field).getBoolean("allowed").getValue();
+            String algorithm = corpusEncryptedActual.getDocument(field).getString("algo").getValue();
+            BsonValue actualValue = corpusEncryptedActual.getDocument(field).get("value");
+            BsonValue expectedValue = corpusEncryptedExpected.getDocument(field).get("value");
+
+            if (algorithm.equals("det")) {
+                assertEquals(actualValue, expectedValue);
+            } else if (algorithm.equals("rand")) {
+                if (allowed) {
+                    assertNotEquals(actualValue, expectedValue);
+                }
+            } else {
+                throw new UnsupportedOperationException("Unsupported algorithm type: " + algorithm);
+            }
+
+            if (allowed) {
+                FutureResultCallback<BsonValue> callback = new FutureResultCallback<BsonValue>();
+                clientEncryption.decrypt(actualValue.asBinary(), callback);
+                BsonValue decrypted = callback.get();
+                callback = new FutureResultCallback<BsonValue>();
+                clientEncryption.decrypt(expectedValue.asBinary(), callback);
+                BsonValue expectedDecrypted = callback.get();
+                assertEquals("Values should be equal for field " + field, expectedDecrypted, decrypted);
+            } else {
+                assertEquals("Values should be equal for field " + field, expectedValue, actualValue);
+            }
+        }
+    }
+
+    private static BsonDocument bsonDocumentFromPath(final String path) throws IOException, URISyntaxException {
+        return getTestDocument(new File(ClientSideEncryptionTest.class
+                .getResource("/client-side-encryption-corpus/" + path).toURI()));
+    }
+
+    @Parameterized.Parameters(name = "useLocalSchema: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[]{true}, new Object[]{false});
+    }
+
+    @After
+    public void after() {
+        if (client != null) {
+            try {
+                client.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+
+        if (autoEncryptingClient != null) {
+            try {
+                autoEncryptingClient.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+
+        if (clientEncryption != null) {
+            try {
+                clientEncryption.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultSpecification.groovy
new file mode 100644
index 00000000000..ffcdeec9062
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultSpecification.groovy
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client
+
+import com.mongodb.AutoEncryptionSettings
+import com.mongodb.ClientEncryptionSettings
+import com.mongodb.MongoClientException
+import com.mongodb.MongoNamespace
+import com.mongodb.WriteConcern
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.client.vault.ClientEncryption
+import com.mongodb.async.client.vault.ClientEncryptions
+import com.mongodb.client.model.vault.DataKeyOptions
+import com.mongodb.client.model.vault.EncryptOptions
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.internal.connection.TestCommandListener
+import org.bson.BsonBinarySubType
+import org.bson.BsonDocument
+import org.bson.BsonString
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
+import static com.mongodb.async.client.Fixture.getMongoClient
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString
+import static com.mongodb.client.model.Filters.eq
+import static java.util.Collections.singletonMap
+import static org.junit.Assume.assumeFalse
+import static org.junit.Assume.assumeTrue
+
+class ClientSideEncryptionExternalKeyVaultSpecification extends FunctionalSpecification {
+
+    private final MongoNamespace keyVaultNamespace = new MongoNamespace('test.datakeys')
+    private final MongoNamespace autoEncryptingCollectionNamespace = new MongoNamespace(getDefaultDatabaseName(),
+            'ClientSideEncryptionProseTestSpecification')
+    private final MongoCollection dataKeyCollection = getMongoClient()
+            .getDatabase(keyVaultNamespace.databaseName).getCollection(keyVaultNamespace.collectionName, BsonDocument)
+
+    private MongoClient autoEncryptingClient
+    private ClientEncryption clientEncryption
+    private MongoCollection<BsonDocument> autoEncryptingDataCollection
+    private TestCommandListener commandListener
+
+    def setup() {
+        assumeFalse(isNotAtLeastJava8())
+        assumeTrue(serverVersionAtLeast(4, 2))
+        assumeTrue('Key vault tests disabled',
+                System.getProperty('org.mongodb.test.awsAccessKeyId') != null
+                        && !System.getProperty('org.mongodb.test.awsAccessKeyId').isEmpty())
+        Fixture.drop(keyVaultNamespace)
+        Fixture.drop(autoEncryptingCollectionNamespace)
+
+        def providerProperties =
+                ['local': ['key': Base64.getDecoder().decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN'
+                        + '3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk')],
+                 'aws'  : ['accessKeyId'    : System.getProperty('org.mongodb.test.awsAccessKeyId'),
+                           'secretAccessKey': System.getProperty('org.mongodb.test.awsSecretAccessKey')]
+                ]
+
+        autoEncryptingClient = MongoClients.create(getMongoClientBuilderFromConnectionString()
+                .autoEncryptionSettings(AutoEncryptionSettings.builder()
+                        .keyVaultNamespace(keyVaultNamespace.fullName)
+                        .kmsProviders(providerProperties)
+                        .schemaMap(singletonMap(autoEncryptingCollectionNamespace.fullName,
+                                BsonDocument.parse(
+                                        '''
+    {
+      "bsonType": "object",
+      "properties": {
+        "encrypted_placeholder": {
+          "encrypt": {
+            "keyId": "/placeholder",
+            "bsonType": "string",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+          }
+        }
+      }
+    }''')))
+                        .build())
+                .build())
+
+        autoEncryptingDataCollection = autoEncryptingClient.getDatabase(autoEncryptingCollectionNamespace.databaseName)
+                .getCollection(autoEncryptingCollectionNamespace.collectionName, BsonDocument)
+
+        commandListener = new TestCommandListener()
+
+        clientEncryption = ClientEncryptions.create(ClientEncryptionSettings.builder()
+                .keyVaultMongoClientSettings(getMongoClientBuilderFromConnectionString()
+                        .addCommandListener(commandListener)
+                        .build())
+                .keyVaultNamespace(keyVaultNamespace.fullName)
+                .kmsProviders(providerProperties)
+                .build())
+    }
+
+    def 'test external key vault'() {
+        when:
+        def callback = new FutureResultCallback()
+        clientEncryption.createDataKey('local', new DataKeyOptions().keyAltNames(['local_altname']), callback)
+        def localDataKeyId = callback.get()
+
+        then:
+        commandListener.getCommandStartedEvents().size() == 1
+        def event = commandListener.getCommandStartedEvents().get(0) as CommandStartedEvent
+        event.getCommand().containsKey('writeConcern')
+        event.getCommand().getDocument('writeConcern') == WriteConcern.MAJORITY.asDocument()
+
+        localDataKeyId != null
+        localDataKeyId.type == BsonBinarySubType.UUID_STANDARD.value
+
+        when:
+        callback = new FutureResultCallback()
+        dataKeyCollection.find(eq('masterKey.provider', 'local')).into([], callback)
+
+        then:
+        callback.get().size() == 1
+
+        when:
+        callback = new FutureResultCallback()
+        clientEncryption.encrypt(new BsonString('hello local'),
+                new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                        .keyId(localDataKeyId), callback)
+
+        then:
+        def localEncrypted = callback.get()
+        localEncrypted.asBinary().getType() == (byte) 6
+
+        when:
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertOne(new BsonDocument('_id', new BsonString('local'))
+                .append('value', localEncrypted), callback)
+        callback.get()
+
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.find(eq('_id', new BsonString('local'))).first(callback)
+
+        then:
+        callback.get().getString('value').value == 'hello local'
+
+        when:
+        callback = new FutureResultCallback()
+        clientEncryption.encrypt(new BsonString('hello local'),
+                new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                        .keyAltName('local_altname'), callback)
+        def localEncryptedWithAltName = callback.get()
+
+        then:
+        localEncryptedWithAltName == localEncrypted
+
+        when:
+        callback = new FutureResultCallback()
+        clientEncryption.createDataKey('aws', new DataKeyOptions().keyAltNames(['aws_altname'])
+                .masterKey(new BsonDocument('region', new BsonString('us-east-1'))
+                        .append('key', new BsonString('arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0'))),
+                callback)
+        def awsDataKeyId = callback.get()
+
+        then:
+        awsDataKeyId != null
+        awsDataKeyId.type == BsonBinarySubType.UUID_STANDARD.value
+
+        when:
+        callback = new FutureResultCallback()
+        dataKeyCollection.find(eq('masterKey.provider', 'aws')).into([], callback)
+
+        then:
+        callback.get().size() == 1
+
+        when:
+        callback = new FutureResultCallback()
+        clientEncryption.encrypt(new BsonString('hello aws'), new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                .keyId(awsDataKeyId), callback)
+        def awsEncrypted = callback.get()
+
+        then:
+        awsEncrypted.asBinary().getType() == (byte) 6
+
+        when:
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertOne(new BsonDocument('_id', new BsonString('aws'))
+                .append('value', awsEncrypted), callback)
+        callback.get()
+
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.find(eq('_id', new BsonString('aws'))).first(callback)
+
+        then:
+        callback.get().getString('value').value == 'hello aws'
+
+        when:
+        callback = new FutureResultCallback()
+        clientEncryption.encrypt(new BsonString('hello aws'),
+                new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                        .keyAltName('aws_altname'), callback)
+        def awsEncryptedWithAltName = callback.get()
+
+        then:
+        awsEncryptedWithAltName == awsEncrypted
+
+        when:
+        callback = new FutureResultCallback()
+        autoEncryptingDataCollection.insertOne(new BsonDocument('encrypted_placeholder', localEncrypted), callback)
+        callback.get()
+
+        then:
+        thrown(MongoClientException)
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultTest.java
new file mode 100644
index 00000000000..357d4bce220
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.async.client.vault.ClientEncryption;
+import com.mongodb.async.client.vault.ClientEncryptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString;
+import static com.mongodb.async.client.Fixture.getMongoClient;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static util.JsonPoweredTestHelper.getTestDocument;
+
+@RunWith(Parameterized.class)
+public class ClientSideEncryptionExternalKeyVaultTest {
+    private MongoClient client, clientEncrypted;
+    private ClientEncryption clientEncryption;
+    private final boolean withExternalKeyVault;
+
+    public ClientSideEncryptionExternalKeyVaultTest(final boolean withExternalKeyVault) {
+        this.withExternalKeyVault = withExternalKeyVault;
+    }
+
+    @Before
+    public void setUp() throws IOException, URISyntaxException {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Encryption test with external keyVault is disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        /* Step 1: get unencrypted client and recreate keys collection */
+        client = getMongoClient();
+        MongoDatabase admin = client.getDatabase("admin");
+        MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
+        FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
+        datakeys.drop(voidCallback);
+        voidCallback.get();
+
+        voidCallback = new FutureResultCallback<Void>();
+        datakeys.insertOne(bsonDocumentFromPath("external-key.json"), voidCallback);
+        voidCallback.get();
+
+        /* Step 2: create encryption objects. */
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> localMasterkey = new HashMap<String, Object>();
+        Map<String, BsonDocument> schemaMap = new HashMap<String, BsonDocument>();
+
+        byte[] localMasterkeyBytes = Base64.getDecoder().decode("Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBM"
+                + "UN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk");
+        localMasterkey.put("key", localMasterkeyBytes);
+        kmsProviders.put("local", localMasterkey);
+        schemaMap.put("db.coll", bsonDocumentFromPath("external-schema.json"));
+
+        AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
+                .keyVaultNamespace("admin.datakeys")
+                .kmsProviders(kmsProviders)
+                .schemaMap(schemaMap);
+
+        MongoClientSettings externalClientSettings = null;
+        if (withExternalKeyVault) {
+            externalClientSettings = getMongoClientBuilderFromConnectionString()
+                    .credential(MongoCredential.createCredential("fake-user", "admin", "fake-pwd".toCharArray()))
+                    .build();
+            autoEncryptionSettingsBuilder.keyVaultMongoClientSettings(externalClientSettings);
+        }
+
+        AutoEncryptionSettings autoEncryptionSettings = autoEncryptionSettingsBuilder.build();
+
+        MongoClientSettings clientSettings = getMongoClientBuilderFromConnectionString()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+        clientEncrypted = MongoClients.create(clientSettings);
+
+        ClientEncryptionSettings.Builder clientEncryptionSettingsBuilder = ClientEncryptionSettings.builder().
+                keyVaultMongoClientSettings(getMongoClientBuilderFromConnectionString().build())
+                .kmsProviders(kmsProviders)
+                .keyVaultNamespace("admin.datakeys");
+
+        if (withExternalKeyVault) {
+            clientEncryptionSettingsBuilder.keyVaultMongoClientSettings(externalClientSettings);
+        }
+
+        ClientEncryptionSettings clientEncryptionSettings = clientEncryptionSettingsBuilder.build();
+        clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+    }
+
+    @Test
+    public void testExternal() {
+        boolean authExceptionThrown = false;
+        MongoCollection<BsonDocument> coll = clientEncrypted
+                .getDatabase("db")
+                .getCollection("coll", BsonDocument.class);
+        FutureResultCallback<Void> voidCallback;
+        try {
+            voidCallback = new FutureResultCallback<Void>();
+            coll.insertOne(new BsonDocument().append("encrypted", new BsonString("test")), voidCallback);
+            voidCallback.get();
+        } catch (MongoSecurityException mse) {
+            authExceptionThrown = true;
+        }
+        assertEquals(authExceptionThrown, withExternalKeyVault);
+
+        EncryptOptions encryptOptions = new EncryptOptions("AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+                .keyId(new BsonBinary(BsonBinarySubType.UUID_STANDARD, Base64.getDecoder().decode("LOCALAAAAAAAAAAAAAAAAA==")));
+        authExceptionThrown = false;
+        try {
+            FutureResultCallback<BsonBinary> bsonBinaryCallback = new FutureResultCallback<BsonBinary>();
+            clientEncryption.encrypt(new BsonString("test"), encryptOptions, bsonBinaryCallback);
+            bsonBinaryCallback.get();
+        } catch (MongoSecurityException mse) {
+            authExceptionThrown = true;
+        }
+        assertEquals(authExceptionThrown, withExternalKeyVault);
+    }
+
+    private static BsonDocument bsonDocumentFromPath(final String path) throws IOException, URISyntaxException {
+        return getTestDocument(new File(ClientSideEncryptionExternalKeyVaultTest.class
+                .getResource("/client-side-encryption-external/" + path).toURI()));
+    }
+
+    @Parameterized.Parameters(name = "withExternalKeyVault: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[]{true}, new Object[]{false});
+    }
+
+    @After
+    public void after() {
+        if (clientEncrypted != null) {
+            try {
+                clientEncrypted.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+        if (clientEncryption != null) {
+            try {
+                clientEncryption.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java
new file mode 100644
index 00000000000..f05ce661b01
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java
@@ -0,0 +1,330 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoWriteConcernException;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.ValidationOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.async.client.Fixture.getMongoClient;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.CrudTestHelper.replaceTypeAssertionWithActual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/client-side-encryption/tests
+@RunWith(Parameterized.class)
+public class ClientSideEncryptionTest {
+
+    @SuppressWarnings({"FieldCanBeLocal", "unused"})
+    private final String filename;
+    private final BsonDocument specDocument;
+    private final String description;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private JsonPoweredCrudTestHelper helper;
+    private TestCommandListener commandListener;
+    private CollectionHelper<BsonDocument> collectionHelper;
+    private MongoClient mongoClient;
+
+    public ClientSideEncryptionTest(final String filename, final String description, final BsonDocument specDocument,
+                                    final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.specDocument = specDocument;
+        this.description = description;
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    private boolean hasErrorContainsField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorContains");
+    }
+
+    private boolean hasErrorCodeNameField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorCodeName");
+    }
+
+    private boolean hasErrorField(final BsonValue expectedResult, final String key) {
+        return expectedResult != null && expectedResult.isDocument() && expectedResult.asDocument().containsKey(key);
+    }
+
+    private String getErrorField(final BsonValue expectedResult, final String key) {
+        if (hasErrorField(expectedResult, key)) {
+            return expectedResult.asDocument().getString(key).getValue();
+        } else {
+            return "";
+        }
+    }
+
+    private String getErrorContainsField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorContains");
+    }
+
+    private String getErrorCodeNameField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorCodeName");
+    }
+
+
+    @Before
+    public void setUp() {
+        assumeTrue("Client side encryption tests disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+        assumeFalse("Client side encryption requires Java 8+", isNotAtLeastJava8());
+        assumeFalse("runOn requirements not satisfied", skipTest);
+        assumeFalse(definition.getString("skipReason", new BsonString("")).getValue(), definition.containsKey("skipReason"));
+
+        String databaseName = specDocument.getString("database_name").getValue();
+        String collectionName = specDocument.getString("collection_name").getValue();
+        collectionHelper = new CollectionHelper<BsonDocument>(new BsonDocumentCodec(), new MongoNamespace(databaseName, collectionName));
+        MongoDatabase database = getMongoClient().getDatabase(databaseName);
+        MongoCollection<BsonDocument> collection = database.getCollection(collectionName, BsonDocument.class);
+
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.drop(callback);
+        callback.get(30, TimeUnit.SECONDS);
+
+        /* Create the collection for auto encryption. */
+        if (specDocument.containsKey("json_schema")) {
+            callback = new FutureResultCallback<Void>();
+            database.createCollection(collectionName, new CreateCollectionOptions()
+                    .validationOptions(new ValidationOptions()
+                            .validator(new BsonDocument("$jsonSchema", specDocument.getDocument("json_schema")))), callback);
+            callback.get(30, TimeUnit.SECONDS);
+        }
+
+        /* Insert data into the collection */
+        List<BsonDocument> documents = new ArrayList<BsonDocument>();
+        if (!data.isEmpty()) {
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+            callback = new FutureResultCallback<Void>();
+            database.getCollection(collectionName, BsonDocument.class).insertMany(documents, callback);
+            callback.get(30, TimeUnit.SECONDS);
+        }
+
+        /* Insert data into the "admin.datakeys" key vault. */
+        collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
+        callback = new FutureResultCallback<Void>();
+        collection.drop(callback);
+        callback.get(30, TimeUnit.SECONDS);
+
+        BsonArray data = specDocument.getArray("key_vault_data", new BsonArray());
+        if (!data.isEmpty()) {
+            documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+            callback = new FutureResultCallback<Void>();
+            collection.insertMany(documents, callback);
+            callback.get(30, TimeUnit.SECONDS);
+        }
+
+        commandListener = new TestCommandListener();
+        BsonDocument clientOptions = definition.getDocument("clientOptions");
+        BsonDocument cryptOptions = clientOptions.getDocument("autoEncryptOpts");
+        BsonDocument kmsProviders = cryptOptions.getDocument("kmsProviders");
+        boolean bypassAutoEncryption = cryptOptions.getBoolean("bypassAutoEncryption", BsonBoolean.FALSE).getValue();
+
+        Map<String, BsonDocument> namespaceToSchemaMap = new HashMap<String, BsonDocument>();
+        if (cryptOptions.containsKey("schemaMap")) {
+            BsonDocument autoEncryptMapDocument = cryptOptions.getDocument("schemaMap");
+
+            for (Map.Entry<String, BsonValue> entries : autoEncryptMapDocument.entrySet()) {
+                final BsonDocument autoEncryptOptionsDocument = entries.getValue().asDocument();
+                namespaceToSchemaMap.put(entries.getKey(), autoEncryptOptionsDocument);
+            }
+        }
+
+        Map<String, Object> extraOptions = new HashMap<String, Object>();
+        if (cryptOptions.containsKey("extraOptions")) {
+            BsonDocument extraOptionsDocument = cryptOptions.getDocument("extraOptions");
+            if (extraOptionsDocument.containsKey("mongocryptdSpawnArgs")) {
+                List<String> mongocryptdSpawnArgsValue = new ArrayList<String>();
+                for (BsonValue cur: extraOptionsDocument.getArray("mongocryptdSpawnArgs")) {
+                    mongocryptdSpawnArgsValue.add(cur.asString().getValue());
+                }
+                extraOptions.put("mongocryptdSpawnArgs", mongocryptdSpawnArgsValue);
+            }
+            if (extraOptionsDocument.containsKey("mongocryptdBypassSpawn")) {
+                extraOptions.put("mongocryptdBypassSpawn", extraOptionsDocument.getBoolean("mongocryptdBypassSpawn").getValue());
+            }
+            if (extraOptionsDocument.containsKey("mongocryptdURI")) {
+                extraOptions.put("mongocryptdURI", extraOptionsDocument.getString("mongocryptdURI").getValue());
+            }
+        }
+
+        Map<String, Map<String, Object>> kmsProvidersMap = new HashMap<String, Map<String, Object>>();
+
+        for (String kmsProviderKey : kmsProviders.keySet()) {
+            BsonDocument kmsProviderOptions = kmsProviders.get(kmsProviderKey).asDocument();
+            Map<String, Object> kmsProviderMap = new HashMap<String, Object>();
+
+            if (kmsProviderKey.equals("aws")) {
+                kmsProviderMap.put("accessKeyId", System.getProperty("org.mongodb.test.awsAccessKeyId"));
+                kmsProviderMap.put("secretAccessKey", System.getProperty("org.mongodb.test.awsSecretAccessKey"));
+                kmsProvidersMap.put("aws", kmsProviderMap);
+            } else if (kmsProviderKey.equals("local")) {
+                kmsProviderMap.put("key", kmsProviderOptions.getBinary("key").getData());
+                kmsProvidersMap.put("local", kmsProviderMap);
+            }
+        }
+
+        String keyVaultNamespace = "admin.datakeys";
+        if (cryptOptions.containsKey("keyVaultNamespace")) {
+            keyVaultNamespace = cryptOptions.getString("keyVaultNamespace").getValue();
+        }
+
+        mongoClient = MongoClients.create(Fixture.getMongoClientBuilderFromConnectionString()
+                .autoEncryptionSettings(AutoEncryptionSettings.builder()
+                        .keyVaultNamespace(keyVaultNamespace)
+                        .kmsProviders(kmsProvidersMap)
+                        .schemaMap(namespaceToSchemaMap)
+                        .bypassAutoEncryption(bypassAutoEncryption)
+                        .extraOptions(extraOptions)
+                        .build())
+                .addCommandListener(commandListener)
+                .build());
+
+        database = mongoClient.getDatabase(databaseName);
+        helper = new JsonPoweredCrudTestHelper(description, database, database.getCollection("default", BsonDocument.class));
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        for (BsonValue cur : definition.getArray("operations")) {
+            BsonDocument operation = cur.asDocument();
+            String operationName = operation.getString("name").getValue();
+            BsonValue expectedResult = operation.get("result");
+            try {
+                BsonDocument actualOutcome = helper.getOperationResults(operation);
+                if (expectedResult != null) {
+                    BsonValue actualResult = actualOutcome.get("result");
+                    assertEquals("Expected operation result differs from actual", expectedResult, actualResult);
+                }
+
+                assertFalse(String.format("Expected error '%s' but none thrown for operation %s",
+                        getErrorContainsField(expectedResult), operationName), hasErrorContainsField(expectedResult));
+                assertFalse(String.format("Expected error code '%s' but none thrown for operation %s",
+                        getErrorCodeNameField(expectedResult), operationName), hasErrorCodeNameField(expectedResult));
+            } catch (RuntimeException e) {
+                boolean passedAssertion = false;
+                if (hasErrorContainsField(expectedResult)) {
+                    String expectedError = getErrorContainsField(expectedResult);
+                    assertTrue(String.format("Expected '%s' but got '%s' for operation %s", expectedError, e.getMessage(),
+                            operationName), e.getMessage().toLowerCase().contains(expectedError.toLowerCase()));
+                    passedAssertion = true;
+                }
+                if (hasErrorCodeNameField(expectedResult)) {
+                    String expectedErrorCodeName = getErrorCodeNameField(expectedResult);
+                    if (e instanceof MongoCommandException) {
+                        assertEquals(expectedErrorCodeName, ((MongoCommandException) e).getErrorCodeName());
+                        passedAssertion = true;
+                    } else if (e instanceof MongoWriteConcernException) {
+                        assertEquals(expectedErrorCodeName, ((MongoWriteConcernException) e).getWriteConcernError().getCodeName());
+                        passedAssertion = true;
+                    }
+                }
+                if (!passedAssertion) {
+                    throw e;
+                }
+            }
+
+        }
+
+        if (definition.containsKey("expectations")) {
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), "default", null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+            assertEventsEquality(expectedEvents, events);
+        }
+
+        BsonDocument expectedOutcome = definition.getDocument("outcome", new BsonDocument());
+        if (expectedOutcome.containsKey("collection")) {
+            List<BsonDocument> collectionData = collectionHelper.find();
+            List<BsonValue> expectedData = expectedOutcome.getDocument("collection").getArray("data").getValues();
+            assertEquals(collectionData.size(), expectedData.size());
+            int count = collectionData.size();
+            for (int i = 0; i < count; i++) {
+                BsonDocument actual = collectionData.get(i);
+                BsonDocument expected = expectedData.get(i).asDocument();
+                replaceTypeAssertionWithActual(expected, actual);
+                assertEquals(expected, actual);
+            }
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/client-side-encryption")) {
+            BsonDocument specDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : specDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(), specDocument,
+                        specDocument.getArray("data", new BsonArray()), test.asDocument(), skipTest(specDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionViewAreProhibitedTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionViewAreProhibitedTest.java
new file mode 100644
index 00000000000..d22b835add3
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionViewAreProhibitedTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.async.FutureResultCallback;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Base64;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static junit.framework.TestCase.assertTrue;
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString;
+import static com.mongodb.async.client.Fixture.getMongoClient;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.fail;
+
+public class ClientSideEncryptionViewAreProhibitedTest {
+    private MongoClient clientEncrypted;
+
+    @Before
+    public void setUp() {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Encryption test with external keyVault is disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        MongoClient client = getMongoClient();
+
+        MongoDatabase db = client.getDatabase("db");
+        FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
+        db.getCollection("view").drop(voidCallback);
+        voidCallback.get();
+
+        voidCallback = new FutureResultCallback<Void>();
+        db.createView("view", "coll", Collections.<BsonDocument>emptyList(), voidCallback);
+        voidCallback.get();
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> localMasterkey = new HashMap<String, Object>();
+
+        byte[] localMasterkeyBytes = Base64.getDecoder().decode("Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBM"
+                + "UN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk");
+        localMasterkey.put("key", localMasterkeyBytes);
+        kmsProviders.put("local", localMasterkey);
+
+        AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
+                .keyVaultNamespace("admin.datakeys")
+                .kmsProviders(kmsProviders);
+
+        AutoEncryptionSettings autoEncryptionSettings = autoEncryptionSettingsBuilder.build();
+
+        MongoClientSettings.Builder clientSettingsBuilder = getMongoClientBuilderFromConnectionString();
+        MongoClientSettings clientSettings = clientSettingsBuilder
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+        clientEncrypted = MongoClients.create(clientSettings);
+    }
+
+    @Test
+    public void shouldThrowError() {
+        MongoCollection<BsonDocument> coll = clientEncrypted
+                .getDatabase("db")
+                .getCollection("view", BsonDocument.class);
+        try {
+            FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
+            coll.insertOne(new BsonDocument().append("encrypted", new BsonString("test")), voidCallback);
+            voidCallback.get();
+            fail();
+        } catch (MongoException me) {
+            assertTrue(me.getMessage().contains("cannot auto encrypt a view"));
+        }
+    }
+
+    @After
+    public void after() {
+        if (clientEncrypted != null) {
+            clientEncrypted.close();
+        }
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ConnectionsSurvivePrimaryStepDownProseTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ConnectionsSurvivePrimaryStepDownProseTest.java
new file mode 100644
index 00000000000..cab9b18fa0b
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ConnectionsSurvivePrimaryStepDownProseTest.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.Block;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.event.ConnectionAddedEvent;
+import com.mongodb.internal.connection.TestConnectionPoolListener;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.async.client.Fixture.getMongoClientSettings;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/connections-survive-step-down/tests
+public class ConnectionsSurvivePrimaryStepDownProseTest {
+    private static final String COLLECTION_NAME = "step-down";
+
+    private TestConnectionPoolListener connectionPoolListener;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoClient client;
+    private MongoCollection<Document> collection;
+
+    @Before
+    public void setUp() throws InterruptedException {
+        assumeTrue(isDiscoverableReplicaSet() && serverVersionAtLeast(4, 0));
+        connectionPoolListener = new TestConnectionPoolListener();
+        MongoClientSettings settings = MongoClientSettings.builder(getMongoClientSettings()).retryWrites(false)
+                .applyToConnectionPoolSettings(new Block<ConnectionPoolSettings.Builder>() {
+                    @Override
+                    public void apply(final ConnectionPoolSettings.Builder builder) {
+                        builder.addConnectionPoolListener(connectionPoolListener);
+                    }
+                }).build();
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(),
+                new MongoNamespace(getDefaultDatabaseName(), COLLECTION_NAME));
+        client = MongoClients.create(settings);
+        MongoDatabase database = client.getDatabase(getDefaultDatabaseName());
+        collection = client.getDatabase(getDefaultDatabaseName()).getCollection(COLLECTION_NAME);
+
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.withWriteConcern(WriteConcern.MAJORITY).drop(callback);
+        callback.get(30, TimeUnit.SECONDS);
+
+        callback = new FutureResultCallback<Void>();
+        database.withWriteConcern(WriteConcern.MAJORITY).createCollection(COLLECTION_NAME, callback);
+        callback.get(30, TimeUnit.SECONDS);
+    }
+
+    @After
+    public void tearDown() throws InterruptedException {
+        if (client != null) {
+            collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand', mode: 'off'}");
+
+            try {
+                FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+                client.getDatabase(getDefaultDatabaseName()).drop(callback);
+                callback.get(30, TimeUnit.SECONDS);
+            } catch (MongoNotPrimaryException e) {
+                // GetMore will use the same connection so won't force an server description update
+                FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+                client.getDatabase(getDefaultDatabaseName()).drop(callback);
+                callback.get(30, TimeUnit.SECONDS);
+            }
+            client.close();
+        }
+    }
+
+    @Test
+    public void testGetMoreIteration() throws InterruptedException {
+        assumeTrue(serverVersionAtLeast(asList(4, 1, 10)));
+
+        List<Document> documents = asList(Document.parse("{_id: 1}"), Document.parse("{_id: 2}"), Document.parse("{_id: 3}"),
+                Document.parse("{_id: 4}"), Document.parse("{_id: 5}"));
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.withWriteConcern(WriteConcern.MAJORITY).insertMany(documents, callback);
+        callback.get(30, TimeUnit.SECONDS);
+
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        FutureResultCallback<AsyncBatchCursor<Document>> batchCursorCallback = new FutureResultCallback<AsyncBatchCursor<Document>>();
+        collection.find().batchSize(2).batchCursor(batchCursorCallback);
+        AsyncBatchCursor<Document> cursor = batchCursorCallback.get(30, TimeUnit.SECONDS);
+
+        FutureResultCallback<List<Document>> batchCallback = new FutureResultCallback<List<Document>>();
+        cursor.next(batchCallback);
+        assertEquals(asList(documents.get(0), documents.get(1)), batchCallback.get());
+
+        collectionHelper.runAdminCommand("{replSetStepDown: 5, force: true}");
+
+        batchCallback = new FutureResultCallback<List<Document>>();
+        cursor.next(batchCallback);
+        assertEquals(asList(documents.get(2), documents.get(3)), batchCallback.get(30, TimeUnit.SECONDS));
+
+        batchCallback = new FutureResultCallback<List<Document>>();
+        cursor.next(batchCallback);
+        assertEquals(singletonList(documents.get(4)), batchCallback.get(30, TimeUnit.SECONDS));
+        assertEquals(connectionCount, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testNotMasterKeepConnectionPool() throws InterruptedException {
+        assumeTrue(serverVersionAtLeast(asList(4, 1, 10)));
+
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 10107}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+            collection.insertOne(new Document(), callback);
+            callback.get(30, TimeUnit.SECONDS);
+            fail();
+        } catch (MongoException e) {
+            assertEquals(10107, e.getCode());
+        }
+
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.insertOne(new Document(), callback);
+        callback.get(30, TimeUnit.SECONDS);
+        assertEquals(connectionCount, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testNotMasterClearConnectionPool() throws InterruptedException {
+        assumeFalse(serverVersionAtLeast(asList(4, 1, 0)));
+
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 10107}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+            collection.insertOne(new Document(), callback);
+            callback.get(30, TimeUnit.SECONDS);
+            fail();
+        } catch (MongoException e) {
+            assertEquals(10107, e.getCode());
+        }
+
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.insertOne(new Document(), callback);
+        callback.get(30, TimeUnit.SECONDS);
+        assertEquals(connectionCount + 1, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testInterruptedAtShutdownResetsConnectionPool() throws InterruptedException {
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 11600}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+            collection.insertOne(new Document(), callback);
+            callback.get(30, TimeUnit.SECONDS);
+        } catch (MongoException e) {
+            assertEquals(11600, e.getCode());
+        }
+
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.insertOne(new Document(), callback);
+        callback.get(30, TimeUnit.SECONDS);
+        assertEquals(connectionCount + 1, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testShutdownInProgressResetsConnectionPool() throws InterruptedException {
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 91}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+            collection.insertOne(new Document(), callback);
+            callback.get(30, TimeUnit.SECONDS);
+        } catch (MongoException e) {
+            assertEquals(91, e.getCode());
+        }
+
+        FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+        collection.insertOne(new Document(), callback);
+        callback.get(30, TimeUnit.SECONDS);
+        assertEquals(connectionCount + 1, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ConnectivityTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ConnectivityTest.java
new file mode 100644
index 00000000000..66e53595071
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ConnectivityTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.async.FutureResultCallback;
+import org.bson.Document;
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class ConnectivityTest {
+    // the test succeeds if no exception is thrown, and fail otherwise
+    @Test
+    public void testConnectivity() throws InterruptedException {
+        MongoClient client = MongoClients.create(Fixture.getMongoClientSettings());
+
+        try {
+            FutureResultCallback<Document> commandCallback = new FutureResultCallback<Document>();
+            // test that a command that doesn't require auth completes normally
+            client.getDatabase("admin").runCommand(new Document("ismaster", 1), commandCallback);
+
+            commandCallback.get(10, TimeUnit.SECONDS);
+
+            FutureResultCallback<Long> countCallback = new FutureResultCallback<Long>();
+
+            // test that a command that requires auth completes normally
+            client.getDatabase("test").getCollection("test").estimatedDocumentCount(countCallback);
+
+            countCallback.get(10, TimeUnit.SECONDS);
+        } finally {
+            client.close();
+        }
+    }
+
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/CrudTest.java b/driver-async/src/test/functional/com/mongodb/async/client/CrudTest.java
index 51c77732fed..46a46cee2f2 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/CrudTest.java
+++ b/driver-async/src/test/functional/com/mongodb/async/client/CrudTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,20 +17,19 @@
 package com.mongodb.async.client;
 
 import com.mongodb.MongoNamespace;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.FindOneAndDeleteOptions;
-import com.mongodb.client.model.FindOneAndReplaceOptions;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
 import org.bson.BsonArray;
+import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonNull;
+import org.bson.BsonString;
 import org.bson.BsonValue;
-import org.junit.AssumptionViolatedException;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,398 +38,189 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
 import static com.mongodb.async.client.Fixture.getDefaultDatabase;
-import static java.util.Arrays.asList;
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 
 // See https://github.com/mongodb/specifications/tree/master/source/crud/tests
 @RunWith(Parameterized.class)
-public class CrudTest extends DatabaseTestCase {
+public class CrudTest {
     private final String filename;
     private final String description;
+    private final String databaseName;
+    private final String collectionName;
     private final BsonArray data;
     private final BsonDocument definition;
+    private final boolean skipTest;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoClient mongoClient;
     private MongoCollection<BsonDocument> collection;
+    private JsonPoweredCrudTestHelper helper;
+    private final TestCommandListener commandListener;
 
-    public CrudTest(final String filename, final String description, final BsonArray data, final BsonDocument definition) {
+    public CrudTest(final String filename, final String description, final String databaseName, final String collectionName,
+                    final BsonArray data, final BsonDocument definition, final boolean skipTest) {
         this.filename = filename;
         this.description = description;
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
         this.data = data;
         this.definition = definition;
+        this.skipTest = skipTest;
+        this.commandListener = new TestCommandListener();
     }
 
     @Before
-    @Override
     public void setUp() {
-        super.setUp();
-        collection = Fixture.initializeCollection(new MongoNamespace(getDefaultDatabaseName(), getClass().getName()))
-                .withDocumentClass(BsonDocument.class);
-        new MongoOperation<Void>() {
-            @Override
-            public void execute() {
-                List<BsonDocument> documents = new ArrayList<BsonDocument>();
-                for (BsonValue document : data) {
-                    documents.add(document.asDocument());
-                }
-                collection.insertMany(documents, getCallback());
-            }
-        }.get();
-    }
+        assumeFalse(skipTest);
+        assumeFalse(isSharded());
 
-    @Test
-    public void shouldPassAllOutcomes() {
-        BsonDocument outcome = getOperationMongoOperations(definition.getDocument("operation"));
-        BsonDocument expectedOutcome = definition.getDocument("outcome");
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+        collectionHelper.killAllSessions();
+        collectionHelper.create(collectionName, new CreateCollectionOptions(), WriteConcern.ACKNOWLEDGED);
 
-        if (checkResult()) {
-            assertEquals(description, expectedOutcome.get("result"), outcome.get("result"));
-        }
-        if (expectedOutcome.containsKey("collection")) {
-            assertCollectionEquals(expectedOutcome.getDocument("collection"));
-        }
-    }
+        com.mongodb.MongoClientSettings.Builder builder = getMongoClientBuilderFromConnectionString()
+                .addCommandListener(commandListener);
 
-    @Parameterized.Parameters(name = "{1}")
-    public static Collection<Object[]> data() throws URISyntaxException, IOException {
-        List<Object[]> data = new ArrayList<Object[]>();
-        for (File file : JsonPoweredTestHelper.getTestFiles("/crud")) {
-            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
-            for (BsonValue test : testDocument.getArray("tests")) {
-                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
-                        testDocument.getArray("data"), test.asDocument()});
-            }
-        }
-        return data;
-    }
-
-    private boolean checkResult() {
-        if (filename.contains("insert")) {
-            // We don't return any id's for insert commands
-            return false;
-        } else if (!serverVersionAtLeast(asList(3, 0, 0))
-                && description.contains("when no documents match with upsert returning the document before modification")) {
-            // Pre 3.0 versions of MongoDB return an empty document rather than a null
-            return false;
-        }
-        return true;
-    }
+        mongoClient = MongoClients.create(builder.build());
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
 
-    private void assertCollectionEquals(final BsonDocument expectedCollection) {
-        BsonArray actual = new MongoOperation<BsonArray>() {
-            @Override
-            public void execute() {
-                MongoCollection<BsonDocument> collectionToCompare = collection;
-                if (expectedCollection.containsKey("name")) {
-                    collectionToCompare = getDefaultDatabase().getCollection(expectedCollection.getString("name").getValue(),
-                            BsonDocument.class);
-                }
-                collectionToCompare.find().into(new BsonArray(), getCallback());
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
+        if (!data.isEmpty()) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
             }
-        }.get();
-        assertEquals(description, expectedCollection.getArray("data"), actual);
-    }
 
-    private BsonDocument getOperationMongoOperations(final BsonDocument operation) {
-        String name = operation.getString("name").getValue();
-        BsonDocument arguments = operation.getDocument("arguments");
-
-        String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1) + "MongoOperation";
-        try {
-            Method method = getClass().getDeclaredMethod(methodName, BsonDocument.class);
-            return convertMongoOperationToResult(method.invoke(this, arguments));
-        } catch (NoSuchMethodException e) {
-            throw new UnsupportedOperationException("No handler for operation " + methodName);
-        } catch (InvocationTargetException e) {
-            if (e.getTargetException() instanceof AssumptionViolatedException) {
-                throw (AssumptionViolatedException) e.getTargetException();
+            collectionHelper.drop();
+            if (documents.size() > 0) {
+                collectionHelper.insertDocuments(documents, WriteConcern.MAJORITY);
             }
-            throw new UnsupportedOperationException("Invalid handler for operation " + methodName);
-        } catch (IllegalAccessException e) {
-            throw new UnsupportedOperationException("Invalid handler access for operation " + methodName);
         }
+        commandListener.reset();
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    private BsonDocument convertMongoOperationToResult(final Object result) {
-        if (result instanceof MongoOperationLong) {
-            return toResult(new BsonInt32(((MongoOperationLong) result).get().intValue()));
-        } else if (result instanceof MongoOperationVoid) {
-            ((MongoOperationVoid) result).get();
-            return toResult(BsonNull.VALUE);
-        } else if (result instanceof MongoOperationBsonDocument) {
-            return toResult((MongoOperationBsonDocument) result);
-        } else if (result instanceof MongoOperationUpdateResult) {
-            return toResult((MongoOperationUpdateResult) result);
-        } else if (result instanceof MongoOperationDeleteResult) {
-            return toResult((MongoOperationDeleteResult) result);
-        } else if (result instanceof DistinctIterable<?>) {
-            return toResult((DistinctIterable<BsonInt32>) result);
-        } else if (result instanceof MongoIterable<?>) {
-            return toResult((MongoIterable) result);
-        } else if (result instanceof BsonValue) {
-            return toResult((BsonValue) result);
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
         }
-        throw new UnsupportedOperationException("Unknown object type cannot convert: " + result);
-    }
-
-    private BsonDocument toResult(final MongoOperationBsonDocument results) {
-        return toResult(results.get());
-    }
-
-    private BsonDocument toResult(final DistinctIterable<BsonInt32> results) {
-        return toResult(new MongoOperation<BsonArray>() {
-            @Override
-            public void execute() {
-                results.into(new BsonArray(), getCallback());
-            }
-        }.get());
     }
 
-    private BsonDocument toResult(final MongoIterable<BsonDocument> results) {
-        return toResult(new MongoOperation<BsonArray>() {
-            @Override
-            public void execute() {
-                results.into(new BsonArray(), getCallback());
+    @Test
+    public void shouldPassAllOutcomes() {
+        BsonDocument expectedOutcome = definition.getDocument("outcome", null);
+
+        // check if v1 test
+        if (definition.containsKey("operation")) {
+            runOperation(expectedOutcome, definition.getDocument("operation"),
+                    expectedOutcome.containsKey("result") && expectedOutcome.isDocument("result")
+                            ? expectedOutcome.get("result") : null);
+        } else {  // v2 test
+            BsonArray operations = definition.getArray("operations");
+            for (BsonValue operation : operations) {
+                runOperation(expectedOutcome, operation.asDocument(), operation.asDocument().get("result", null));
             }
-        }.get());
-    }
-
-    private BsonDocument toResult(final MongoOperationUpdateResult operation) {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0))); // ModifiedCount is not accessible pre 2.6
-
-        UpdateResult updateResult = operation.get();
-        BsonDocument resultDoc = new BsonDocument("matchedCount", new BsonInt32((int) updateResult.getMatchedCount()))
-                .append("modifiedCount", new BsonInt32((int) updateResult.getModifiedCount()));
-        if (updateResult.getUpsertedId() != null) {
-            resultDoc.append("upsertedId", updateResult.getUpsertedId());
         }
-        return toResult(resultDoc);
-    }
-
-    private BsonDocument toResult(final MongoOperationDeleteResult operation) {
-        DeleteResult deleteResult = operation.get();
-        return toResult(new BsonDocument("deletedCount", new BsonInt32((int) deleteResult.getDeletedCount())));
-    }
-
-    private BsonDocument toResult(final BsonValue results) {
-        return new BsonDocument("result", results != null ? results : BsonNull.VALUE);
     }
 
-    private AggregateIterable<BsonDocument> getAggregateMongoOperation(final BsonDocument arguments) {
-        if (!serverVersionAtLeast(asList(2, 6, 0))) {
-            assumeFalse(description.contains("$out"));
+    private void runOperation(final BsonDocument expectedOutcome, final BsonDocument operation, final BsonValue expectedResult) {
+        BsonDocument outcome = null;
+        boolean wasException = false;
+        try {
+            outcome = helper.getOperationResults(operation);
+        } catch (Exception e) {
+            wasException = true;
         }
 
-        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
-        for (BsonValue stage : arguments.getArray("pipeline")) {
-            pipeline.add(stage.asDocument());
+        if (operation.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+            assertEquals(operation.containsKey("error"), wasException);
         }
-        return collection.aggregate(pipeline).batchSize(arguments.getNumber("batchSize").intValue());
-    }
 
-    private MongoOperationLong getCountMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationLong() {
-            @Override
-            public void execute() {
-                CountOptions options = new CountOptions();
-                if (arguments.containsKey("skip")) {
-                    options.skip(arguments.getNumber("skip").intValue());
-                }
-                if (arguments.containsKey("limit")) {
-                    options.limit(arguments.getNumber("limit").intValue());
-                }
-                collection.count(arguments.getDocument("filter"), options, getCallback());
+        if (expectedResult != null) {
+            // Hack to workaround the lack of upsertedCount
+            BsonValue actualResult = outcome.get("result");
+            if (actualResult.isDocument()
+                    && actualResult.asDocument().containsKey("upsertedCount")
+                    && actualResult.asDocument().getNumber("upsertedCount").intValue() == 0
+                    && !expectedResult.asDocument().containsKey("upsertedCount")) {
+                expectedResult.asDocument().append("upsertedCount", actualResult.asDocument().get("upsertedCount"));
             }
-        };
-    }
+            // Hack to workaround the lack of insertedIds
+            removeIdList("insertedIds", expectedResult, actualResult);
+            removeIdList("upsertedIds", expectedResult, actualResult);
 
-    private DistinctIterable<BsonInt32> getDistinctMongoOperation(final BsonDocument arguments) {
-        return collection.distinct(arguments.getString("fieldName").getValue(), arguments.getDocument("filter"), BsonInt32.class);
-    }
+            removeZeroCountField("deletedCount", expectedResult, actualResult);
+            removeZeroCountField("insertedCount", expectedResult, actualResult);
 
-    private FindIterable<BsonDocument> getFindMongoOperation(final BsonDocument arguments) {
-        FindIterable<BsonDocument> findIterable = collection.find(arguments.getDocument("filter"));
-        if (arguments.containsKey("skip")) {
-            findIterable.skip(arguments.getNumber("skip").intValue());
-        }
-        if (arguments.containsKey("limit")) {
-            findIterable.limit(arguments.getNumber("limit").intValue());
-        }
-        if (arguments.containsKey("batchSize")) {
-            findIterable.batchSize(arguments.getNumber("batchSize").intValue());
+            assertEquals(description, expectedResult, actualResult);
         }
-        return findIterable;
-    }
+        if (definition.containsKey("expectations")) {
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName, null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
 
-    private MongoOperationDeleteResult getDeleteManyMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationDeleteResult() {
-            @Override
-            public void execute() {
-                collection.deleteMany(arguments.getDocument("filter"), getCallback());
-            }
-        };
-    }
 
-    private MongoOperationDeleteResult getDeleteOneMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationDeleteResult() {
-            @Override
-            public void execute() {
-                collection.deleteOne(arguments.getDocument("filter"), getCallback());
-            }
-        };
-    }
-
-    private MongoOperationBsonDocument getFindOneAndDeleteMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationBsonDocument() {
-            @Override
-            public void execute() {
-                FindOneAndDeleteOptions options = new FindOneAndDeleteOptions();
-                if (arguments.containsKey("projection")) {
-                    options.projection(arguments.getDocument("projection"));
-                }
-                if (arguments.containsKey("sort")) {
-                    options.sort(arguments.getDocument("sort"));
-                }
-                collection.findOneAndDelete(arguments.getDocument("filter"), options, getCallback());
-            }
-        };
-    }
-
-    private MongoOperationBsonDocument getFindOneAndReplaceMongoOperation(final BsonDocument arguments) {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0))); // in 2.4 the server can ignore the supplied _id and creates an ObjectID
-
-        return new MongoOperationBsonDocument() {
-            @Override
-            public void execute() {
-                FindOneAndReplaceOptions options = new FindOneAndReplaceOptions();
-                if (arguments.containsKey("projection")) {
-                    options.projection(arguments.getDocument("projection"));
-                }
-                if (arguments.containsKey("sort")) {
-                    options.sort(arguments.getDocument("sort"));
-                }
-                if (arguments.containsKey("upsert")) {
-                    options.upsert(arguments.getBoolean("upsert").getValue());
-                }
-                if (arguments.containsKey("returnDocument")) {
-                    options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
-                            : ReturnDocument.BEFORE);
-                }
-                collection.findOneAndReplace(arguments.getDocument("filter"), arguments.getDocument("replacement"), options, getCallback());
-            }
-        };
-    }
-
-    private MongoOperationBsonDocument getFindOneAndUpdateMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationBsonDocument() {
-            @Override
-            public void execute() {
-
-                FindOneAndUpdateOptions options = new FindOneAndUpdateOptions();
-                if (arguments.containsKey("projection")) {
-                    options.projection(arguments.getDocument("projection"));
-                }
-                if (arguments.containsKey("sort")) {
-                    options.sort(arguments.getDocument("sort"));
-                }
-                if (arguments.containsKey("upsert")) {
-                    options.upsert(arguments.getBoolean("upsert").getValue());
-                }
-                if (arguments.containsKey("returnDocument")) {
-                    options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
-                            : ReturnDocument.BEFORE);
-                }
-                collection.findOneAndUpdate(arguments.getDocument("filter"), arguments.getDocument("update"), options, getCallback());
-            }
-        };
-    }
-
-    private MongoOperationVoid getInsertOneMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationVoid() {
-            @Override
-            public void execute() {
-                collection.insertOne(arguments.getDocument("document"), getCallback());
-            }
-        };
+            assertEventsEquality(expectedEvents, events.subList(0, expectedEvents.size()));
+        }
+        if (expectedOutcome != null && expectedOutcome.containsKey("collection")) {
+            assertCollectionEquals(expectedOutcome.getDocument("collection"));
+        }
     }
 
-    private MongoOperationVoid getInsertManyMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationVoid() {
-            @Override
-            public void execute() {
-                List<BsonDocument> documents = new ArrayList<BsonDocument>();
-                for (BsonValue document : arguments.getArray("documents")) {
-                    documents.add(document.asDocument());
-                }
-                collection.insertMany(documents, getCallback());
-            }
-        };
+    private void removeZeroCountField(final String key, final BsonValue expectedResult, final BsonValue actualResult) {
+        if (actualResult.isDocument()
+                && actualResult.asDocument().containsKey(key)
+                && actualResult.asDocument().getNumber(key).intValue() == 0
+                && !expectedResult.asDocument().containsKey(key)) {
+            actualResult.asDocument().remove(key);
+        }
     }
 
-    private MongoOperationUpdateResult getReplaceOneMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationUpdateResult() {
-            @Override
-            public void execute() {
-                UpdateOptions options = new UpdateOptions();
-                if (arguments.containsKey("upsert")) {
-                    options.upsert(arguments.getBoolean("upsert").getValue());
-                }
-                collection.replaceOne(arguments.getDocument("filter"), arguments.getDocument("replacement"), options, getCallback());
-            }
-        };
+    private void removeIdList(final String key, final BsonValue expectedResult, final BsonValue actualResult) {
+        if (expectedResult.isDocument() && !expectedResult.asDocument().containsKey(key)) {
+            actualResult.asDocument().remove(key);
+        }
     }
 
-    private MongoOperationUpdateResult getUpdateManyMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationUpdateResult() {
-            @Override
-            public void execute() {
-                UpdateOptions options = new UpdateOptions();
-                if (arguments.containsKey("upsert")) {
-                    options.upsert(arguments.getBoolean("upsert").getValue());
-                }
-                collection.updateMany(arguments.getDocument("filter"), arguments.getDocument("update"), options, getCallback());
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/crud")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getString("collection_name", new BsonString("test")).getValue(),
+                        testDocument.getArray("data", new BsonArray()), test.asDocument(), skipTest(testDocument, test.asDocument())});
             }
-        };
+        }
+        return data;
     }
 
-    private MongoOperationUpdateResult getUpdateOneMongoOperation(final BsonDocument arguments) {
-        return new MongoOperationUpdateResult() {
+    private void assertCollectionEquals(final BsonDocument expectedCollection) {
+        BsonArray actual = new MongoOperation<BsonArray>() {
             @Override
             public void execute() {
-                UpdateOptions options = new UpdateOptions();
-                if (arguments.containsKey("upsert")) {
-                    options.upsert(arguments.getBoolean("upsert").getValue());
+                MongoCollection<BsonDocument> collectionToCompare = collection;
+                if (expectedCollection.containsKey("name")) {
+                    collectionToCompare = getDefaultDatabase().getCollection(expectedCollection.getString("name").getValue(),
+                            BsonDocument.class);
                 }
-                collection.updateOne(arguments.getDocument("filter"), arguments.getDocument("update"), options, getCallback());
+                collectionToCompare.find().into(new BsonArray(), getCallback());
             }
-        };
-    }
-
-    abstract class MongoOperationLong extends MongoOperation<Long> {
-    }
-
-    abstract class MongoOperationBsonDocument extends MongoOperation<BsonDocument> {
-    }
-
-
-    abstract class MongoOperationUpdateResult extends MongoOperation<UpdateResult> {
-    }
-
-    abstract class MongoOperationDeleteResult extends MongoOperation<DeleteResult> {
-    }
-
-    abstract class MongoOperationVoid extends MongoOperation<Void> {
+        }.get();
+        assertEquals(description, expectedCollection.getArray("data"), actual);
     }
-
 }
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/DatabaseTestCase.java b/driver-async/src/test/functional/com/mongodb/async/client/DatabaseTestCase.java
index 7a2a0726c83..381740d7762 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/DatabaseTestCase.java
+++ b/driver-async/src/test/functional/com/mongodb/async/client/DatabaseTestCase.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,17 +16,14 @@
 
 package com.mongodb.async.client;
 
-import com.mongodb.MongoException;
-import com.mongodb.async.FutureResultCallback;
 import org.bson.Document;
 import org.junit.After;
 import org.junit.Before;
 
-import java.util.concurrent.TimeUnit;
-
 import static com.mongodb.async.client.Fixture.drop;
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
 import static com.mongodb.async.client.Fixture.getMongoClient;
+import static com.mongodb.async.client.Fixture.waitForLastServerSessionPoolRelease;
 
 public class DatabaseTestCase {
     //For ease of use and readability, in this specific case we'll allow protected variables
@@ -49,26 +46,8 @@ public void tearDown() {
         if (collection != null) {
             drop(collection.getNamespace());
         }
-    }
-
-    public abstract class MongoOperation<TResult> {
-        private FutureResultCallback<TResult> callback = new FutureResultCallback<TResult>();
-
-        public FutureResultCallback<TResult> getCallback() {
-            return callback;
-        }
-
-        public TResult get() {
-            execute();
-            try {
-                return callback.get(60, TimeUnit.SECONDS);
-            } catch (MongoException e) {
-                throw e;
-            } catch (Throwable t) {
-                throw new RuntimeException(t);
-            }
-        }
 
-        public abstract void execute();
+        waitForLastServerSessionPoolRelease();
     }
+
 }
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/Fixture.java b/driver-async/src/test/functional/com/mongodb/async/client/Fixture.java
index 1c421ffa5af..82530478a19 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/Fixture.java
+++ b/driver-async/src/test/functional/com/mongodb/async/client/Fixture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,29 +16,35 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.Block;
+import com.mongodb.ClusterFixture;
 import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCommandException;
+import com.mongodb.MongoInterruptedException;
 import com.mongodb.MongoNamespace;
+import com.mongodb.MongoTimeoutException;
 import com.mongodb.async.FutureResultCallback;
-import com.mongodb.connection.ClusterSettings;
-import com.mongodb.connection.ConnectionPoolSettings;
-import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory;
 import com.mongodb.connection.SslSettings;
+import com.mongodb.connection.StreamFactoryFactory;
+import com.mongodb.connection.TlsChannelStreamFactoryFactory;
+import com.mongodb.connection.netty.NettyStreamFactoryFactory;
 import org.bson.Document;
 
+import static com.mongodb.ClusterFixture.getSslSettings;
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7;
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
 import static com.mongodb.connection.ClusterType.SHARDED;
+import static java.lang.Thread.sleep;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Helper class for asynchronous tests.
  */
 public final class Fixture {
-    public static final String DEFAULT_URI = "mongodb://localhost:27017";
-    public static final String MONGODB_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.uri";
     private static final String DEFAULT_DATABASE_NAME = "JavaDriverTest";
 
-    private static ConnectionString connectionString;
     private static MongoClientImpl mongoClient;
 
 
@@ -47,44 +53,49 @@ private Fixture() {
 
     public static synchronized MongoClient getMongoClient() {
         if (mongoClient == null) {
-            MongoClientSettings.Builder builder = getMongoClientBuilderFromConnectionString();
-            mongoClient = (MongoClientImpl) MongoClients.create(builder.build());
+            mongoClient = (MongoClientImpl) MongoClients.create(getMongoClientBuilderFromConnectionString().build());
             Runtime.getRuntime().addShutdownHook(new ShutdownHook());
         }
         return mongoClient;
     }
 
-    public static MongoClientSettings.Builder getMongoClientBuilderFromConnectionString() {
-        SslSettings.Builder sslSettingsBuilder = SslSettings.builder().applyConnectionString(getConnectionString());
+    public static MongoClientSettings getMongoClientSettings() {
+        return getMongoClientBuilderFromConnectionString().build();
+    }
+
+    public static com.mongodb.MongoClientSettings.Builder getMongoClientBuilderFromConnectionString() {
+        com.mongodb.MongoClientSettings.Builder builder = com.mongodb.MongoClientSettings.builder()
+                .applyConnectionString(getConnectionString());
         if (System.getProperty("java.version").startsWith("1.6.")) {
-            sslSettingsBuilder.invalidHostNameAllowed(true);
+            builder.applyToSslSettings(new Block<SslSettings.Builder>() {
+                @Override
+                public void apply(final SslSettings.Builder builder) {
+                    builder.invalidHostNameAllowed(true);
+                }
+            });
         }
-        ClusterSettings clusterSettings = ClusterSettings.builder()
-                                                         .applyConnectionString(getConnectionString())
-                                                         .build();
-        ConnectionPoolSettings connectionPoolSettings = ConnectionPoolSettings.builder()
-                                                                              .applyConnectionString(getConnectionString())
-                                                                              .build();
-        SocketSettings socketSettings = SocketSettings.builder()
-                                                      .applyConnectionString(getConnectionString())
-                                                      .build();
-        return MongoClientSettings.builder()
-                .clusterSettings(clusterSettings)
-                .connectionPoolSettings(connectionPoolSettings)
-                .serverSettings(ServerSettings.builder().build())
-                .credentialList(getConnectionString().getCredentialList())
-                .sslSettings(sslSettingsBuilder.build())
-                .socketSettings(socketSettings);
+        builder.streamFactoryFactory(getStreamFactoryFactory());
+        return builder;
     }
 
-    public static synchronized ConnectionString getConnectionString() {
-        if (connectionString == null) {
-            String mongoURIProperty = System.getProperty(MONGODB_URI_SYSTEM_PROPERTY_NAME);
-            String mongoURIString = mongoURIProperty == null || mongoURIProperty.isEmpty()
-                                    ? DEFAULT_URI : mongoURIProperty;
-            connectionString = new ConnectionString(mongoURIString);
+    public static StreamFactoryFactory getStreamFactoryFactory() {
+        if (getSslSettings().isEnabled()) {
+            if (isNotAtLeastJava8()) {
+                return NettyStreamFactoryFactory.builder().build();
+            } else {
+                return new TlsChannelStreamFactoryFactory();
+            }
+        } else {
+            if (isNotAtLeastJava7()) {
+                return NettyStreamFactoryFactory.builder().build();
+            } else {
+                return AsynchronousSocketChannelStreamFactoryFactory.builder().build();
+            }
         }
-        return connectionString;
+    }
+
+    public static synchronized ConnectionString getConnectionString() {
+        return ClusterFixture.getConnectionString();
     }
 
     public static String getDefaultDatabaseName() {
@@ -149,6 +160,29 @@ public static void drop(final MongoNamespace namespace) {
         }
     }
 
+    public static synchronized void waitForLastServerSessionPoolRelease() {
+        if (mongoClient != null) {
+            long startTime = System.currentTimeMillis();
+            int sessionInUseCount = getSessionInUseCount();
+            while (sessionInUseCount > 0) {
+                try {
+                    if (System.currentTimeMillis() > startTime + ClusterFixture.TIMEOUT * 1000) {
+                        throw new MongoTimeoutException("Timed out waiting for server session pool in use count to drop to 0.  Now at: "
+                                + sessionInUseCount);
+                    }
+                    sleep(10);
+                    sessionInUseCount = getSessionInUseCount();
+                } catch (InterruptedException e) {
+                    throw new MongoInterruptedException("Interrupted", e);
+                }
+            }
+        }
+    }
+
+    private static int getSessionInUseCount() {
+        return mongoClient.getServerSessionPool().getInUseCount();
+    }
+
     static class ShutdownHook extends Thread {
         @Override
         public void run() {
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ForEachSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/ForEachSpecification.groovy
index d8f237d0e18..dcf2fc54836 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/ForEachSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ForEachSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/FunctionalSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/FunctionalSpecification.groovy
index 6e9e81970bc..659debe95cf 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/FunctionalSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/FunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import spock.lang.Specification
 
 import static Fixture.getDefaultDatabase
 import static Fixture.initializeCollection
+import static com.mongodb.async.client.Fixture.waitForLastServerSessionPoolRelease
 
 class FunctionalSpecification extends Specification {
     protected MongoDatabase database;
@@ -32,6 +33,10 @@ class FunctionalSpecification extends Specification {
         collection = initializeCollection(new MongoNamespace(database.getName(), getClass().getName()))
     }
 
+    def cleanup() {
+        waitForLastServerSessionPoolRelease();
+    }
+
     String getDatabaseName() {
         database.getName();
     }
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/InitialDnsSeedlistDiscoveryTest.java b/driver-async/src/test/functional/com/mongodb/async/client/InitialDnsSeedlistDiscoveryTest.java
new file mode 100644
index 00000000000..1b36e77376f
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/InitialDnsSeedlistDiscoveryTest.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.Block;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.connection.netty.NettyStreamFactoryFactory;
+import com.mongodb.event.ClusterClosedEvent;
+import com.mongodb.event.ClusterDescriptionChangedEvent;
+import com.mongodb.event.ClusterListener;
+import com.mongodb.event.ClusterOpeningEvent;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.mongodb.ClusterFixture.getSslSettings;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.async.client.Fixture.getStreamFactoryFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/initial-dns-seedlist-discovery/tests
+@RunWith(Parameterized.class)
+public class InitialDnsSeedlistDiscoveryTest {
+
+    private final String filename;
+    private final String uri;
+    private final List<String> seeds;
+    private final List<ServerAddress> hosts;
+    private final boolean isError;
+    private final BsonDocument options;
+
+    public InitialDnsSeedlistDiscoveryTest(final String filename, final String uri, final List<String> seeds,
+                                           final List<ServerAddress> hosts, final boolean isError, final BsonDocument options) {
+        this.filename = filename;
+        this.uri = uri;
+        this.seeds = seeds;
+        this.hosts = hosts;
+        this.isError = isError;
+        this.options = options;
+    }
+
+    @Test
+    public void shouldResolve() throws InterruptedException {
+
+        if (isError) {
+            MongoClient client = null;
+            try {
+                final AtomicReference<MongoException> exceptionReference = new AtomicReference<MongoException>();
+                final CountDownLatch latch = new CountDownLatch(1);
+
+                ConnectionString connectionString = new ConnectionString(uri);
+                final SslSettings sslSettings = getSslSettings(connectionString);
+                com.mongodb.MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(connectionString)
+                        .applyToSslSettings(new Block<SslSettings.Builder>() {
+                            @Override
+                            public void apply(final SslSettings.Builder builder) {
+                                builder.applySettings(sslSettings);
+                                builder.invalidHostNameAllowed(true);
+                            }
+                        })
+                        .streamFactoryFactory(NettyStreamFactoryFactory.builder().build())
+                        .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                            @Override
+                            public void apply(final ClusterSettings.Builder builder) {
+                                builder.addClusterListener(new ClusterListener() {
+                                    @Override
+                                    public void clusterOpening(final ClusterOpeningEvent event) {
+                                    }
+
+                                    @Override
+                                    public void clusterClosed(final ClusterClosedEvent event) {
+                                    }
+
+                                    @Override
+                                    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
+                                        if (event.getNewDescription().getSrvResolutionException() != null) {
+                                            exceptionReference.set(event.getNewDescription().getSrvResolutionException());
+                                            latch.countDown();
+                                        }
+                                    }
+                                });
+                            }
+                        })
+                        .build();
+                client = MongoClients.create(settings);
+                if (!latch.await(5, TimeUnit.SECONDS)) {
+                    fail("");
+                }
+                throw exceptionReference.get();
+            } catch (IllegalArgumentException e) {
+                // all good
+            } catch (MongoClientException e) {
+                // all good
+            } finally {
+                if (client != null) {
+                    client.close();
+                }
+            }
+        } else {
+            ConnectionString connectionString = new ConnectionString(this.uri);
+
+            for (Map.Entry<String, BsonValue> entry : options.entrySet()) {
+                if (entry.getKey().equals("replicaSet")) {
+                    assertEquals(entry.getValue().asString().getValue(), connectionString.getRequiredReplicaSetName());
+                } else if (entry.getKey().equals("ssl")) {
+                    assertEquals(entry.getValue().asBoolean().getValue(), connectionString.getSslEnabled());
+                } else if (entry.getKey().equals("authSource")) {
+                    // ignoring authSource for now, because without at least a userName also in the connection string,
+                    // the authSource is ignored.  If the test gets this far, at least we know that a TXT record
+                    // containing in authSource doesn't blow up.  We just don't test that it's actually used.
+                    assertTrue(true);
+                } else {
+                    throw new UnsupportedOperationException("No support configured yet for " + entry.getKey());
+                }
+            }
+        }
+    }
+
+    @Test
+    public void shouldDiscover() throws InterruptedException {
+        if (seeds.isEmpty()) {
+            return;
+        }
+        final CountDownLatch latch = new CountDownLatch(1);
+        final ConnectionString connectionString = new ConnectionString(uri);
+        final SslSettings sslSettings = getSslSettings(connectionString);
+
+        assumeTrue("It's not a replica set", isDiscoverableReplicaSet());
+        assumeTrue("SSL settings don't match", getSslSettings().isEnabled() == sslSettings.isEnabled());
+
+        com.mongodb.MongoClientSettings settings = com.mongodb.MongoClientSettings.builder()
+                .streamFactoryFactory(getStreamFactoryFactory())
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    public void apply(final ClusterSettings.Builder builder) {
+                        builder.applyConnectionString(connectionString)
+                        .addClusterListener(new ClusterListener() {
+                            @Override
+                            public void clusterOpening(final ClusterOpeningEvent event) {
+                            }
+
+                            @Override
+                            public void clusterClosed(final ClusterClosedEvent event) {
+                            }
+
+                            @Override
+                            public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
+                                List<ServerAddress> curHostList = new ArrayList<ServerAddress>();
+                                for (ServerDescription cur : event.getNewDescription().getServerDescriptions()) {
+                                    if (cur.isOk()) {
+                                        curHostList.add(cur.getAddress());
+                                    }
+                                }
+                                if (hosts.size() == curHostList.size() && curHostList.containsAll(hosts)) {
+                                    latch.countDown();
+                                }
+
+                            }
+                        });
+                    }
+                })
+                .applyToSslSettings(new Block<SslSettings.Builder>() {
+                    @Override
+                    public void apply(final SslSettings.Builder builder) {
+                        builder.applySettings(sslSettings);
+                        builder.invalidHostNameAllowed(true);
+                    }
+                })
+                .build();
+
+        MongoClient client = MongoClients.create(settings);
+
+        try {
+            assertTrue(latch.await(5, TimeUnit.SECONDS));
+
+            final CountDownLatch pingLatch = new CountDownLatch(1);
+            client.getDatabase("admin").runCommand(new Document("ping", 1), new SingleResultCallback<Document>() {
+                @Override
+                public void onResult(final Document result, final Throwable t) {
+                    if (t == null) {
+                        pingLatch.countDown();
+                    }
+                }
+            });
+
+            assertTrue(pingLatch.await(5, TimeUnit.SECONDS));
+        } finally {
+            client.close();
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/initial-dns-seedlist-discovery")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            data.add(new Object[]{
+                    file.getName(),
+                    testDocument.getString("uri").getValue(),
+                    toStringList(testDocument.getArray("seeds")),
+                    toServerAddressList(testDocument.getArray("hosts")),
+                    testDocument.getBoolean("error", BsonBoolean.FALSE).getValue(),
+                    testDocument.getDocument("options", new BsonDocument())
+            });
+
+        }
+        return data;
+    }
+
+    private static List<String> toStringList(final BsonArray bsonArray) {
+        List<String> retVal = new ArrayList<String>(bsonArray.size());
+        for (BsonValue cur : bsonArray) {
+            retVal.add(cur.asString().getValue());
+        }
+        return retVal;
+    }
+
+    private static List<ServerAddress> toServerAddressList(final BsonArray bsonArray) {
+        List<ServerAddress> retVal = new ArrayList<ServerAddress>(bsonArray.size());
+        for (BsonValue cur : bsonArray) {
+            retVal.add(new ServerAddress(cur.asString().getValue()));
+        }
+        return retVal;
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/JsonPoweredCrudTestHelper.java b/driver-async/src/test/functional/com/mongodb/async/client/JsonPoweredCrudTestHelper.java
new file mode 100644
index 00000000000..64a1760b7db
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/JsonPoweredCrudTestHelper.java
@@ -0,0 +1,1185 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+
+import com.mongodb.MongoBulkWriteException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoGridFSException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.async.client.gridfs.GridFSBucket;
+import com.mongodb.bulk.BulkWriteError;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.bulk.BulkWriteUpsert;
+import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.CollationAlternate;
+import com.mongodb.client.model.CollationCaseFirst;
+import com.mongodb.client.model.CollationMaxVariable;
+import com.mongodb.client.model.CollationStrength;
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOneModel;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.InsertManyOptions;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.InsertOneOptions;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.model.UpdateManyModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonNull;
+import org.bson.BsonObjectId;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.AssumptionViolatedException;
+import util.Hex;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream;
+import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncOutputStream;
+import static java.lang.String.format;
+
+public class JsonPoweredCrudTestHelper {
+    private final String description;
+    private final MongoDatabase database;
+    private final MongoCollection<BsonDocument> baseCollection;
+    private final GridFSBucket gridFSBucket;
+    private final MongoClient mongoClient;
+
+    public JsonPoweredCrudTestHelper(final String description, final MongoDatabase database,
+                                     final MongoCollection<BsonDocument> collection) {
+        this(description, database, collection, null, null);
+    }
+
+    public JsonPoweredCrudTestHelper(final String description, final MongoDatabase database,
+                                     final MongoCollection<BsonDocument> collection, final GridFSBucket gridFSBucket,
+                                     final MongoClient mongoClient) {
+        this.description = description;
+        this.database = database;
+        this.baseCollection = collection;
+        this.gridFSBucket = gridFSBucket;
+        this.mongoClient = mongoClient;
+    }
+
+    BsonDocument getOperationResults(final BsonDocument operation) {
+        return getOperationResults(operation, null);
+    }
+
+    BsonDocument getOperationResults(final BsonDocument operation, @Nullable final ClientSession clientSession) {
+        BsonDocument collectionOptions = operation.getDocument("collectionOptions", new BsonDocument());
+        BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+
+        String methodName = createMethodName(operation.getString("name").getValue(),
+                operation.getString("object", new BsonString("")).getValue());
+        try {
+            Method method = getClass().getDeclaredMethod(methodName, BsonDocument.class, BsonDocument.class, ClientSession.class);
+            return (BsonDocument) method.invoke(this, collectionOptions, arguments, clientSession);
+        } catch (NoSuchMethodException e) {
+            throw new UnsupportedOperationException("No handler for operation " + methodName);
+        } catch (InvocationTargetException e) {
+            if (e.getTargetException() instanceof AssumptionViolatedException) {
+                throw (AssumptionViolatedException) e.getTargetException();
+            }
+            if (e.getTargetException() instanceof MongoException) {
+                throw (MongoException) e.getTargetException();
+            }
+            throw (RuntimeException) e.getTargetException();
+        } catch (IllegalAccessException e) {
+            throw new UnsupportedOperationException("Invalid handler access for operation " + methodName);
+        }
+    }
+
+    private String createMethodName(final String name, final String object) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("get");
+        if (!object.isEmpty() && !object.equals("collection") && !object.equals("gridfsbucket")) {
+            appendInitCapToBuilder(builder, object);
+        }
+        if (name.indexOf('_') >= 0) {
+            String[] nameParts = name.split("_");
+            for (String part : nameParts) {
+                appendInitCapToBuilder(builder, part);
+            }
+        } else {
+            appendInitCapToBuilder(builder, name);
+        }
+        builder.append("Result");
+        return builder.toString();
+    }
+
+    private void appendInitCapToBuilder(final StringBuilder builder, final String object) {
+        builder.append(object.substring(0, 1).toUpperCase());
+        builder.append(object.substring(1));
+    }
+
+    <T> T futureResult(final FutureResultCallback<T> callback) {
+        try {
+            return callback.get();
+        } catch (Throwable t) {
+            throw MongoException.fromThrowable(t);
+        }
+    }
+
+    BsonDocument toResult(final int count) {
+        return toResult(new BsonInt32(count));
+    }
+
+    BsonDocument toResult(final MongoIterable<BsonDocument> results) {
+        FutureResultCallback<List<BsonDocument>> futureResultCallback = new FutureResultCallback<List<BsonDocument>>();
+        results.into(new ArrayList<BsonDocument>(), futureResultCallback);
+        return toResult(new BsonArray(futureResult(futureResultCallback)));
+    }
+
+    BsonDocument toResult(final String key, final BsonValue value) {
+        return toResult(new BsonDocument(key, value));
+    }
+
+    BsonDocument toResult(final UpdateResult updateResult) {
+        BsonDocument resultDoc = new BsonDocument("matchedCount", new BsonInt32((int) updateResult.getMatchedCount()));
+        resultDoc.append("modifiedCount", new BsonInt32((int) updateResult.getModifiedCount()));
+        // If the upsertedId is an ObjectId that means it came from the server and can't be verified.
+        // This check is to handle the "ReplaceOne with upsert when no documents match without an id specified" test
+        // in replaceOne-pre_2.6
+        if (updateResult.getUpsertedId() != null && !updateResult.getUpsertedId().isObjectId()) {
+            resultDoc.append("upsertedId", updateResult.getUpsertedId());
+        }
+        resultDoc.append("upsertedCount", updateResult.getUpsertedId() == null ? new BsonInt32(0) : new BsonInt32(1));
+
+        return toResult(resultDoc);
+    }
+
+    BsonDocument toResult(final BulkWriteResult bulkWriteResult, final List<? extends WriteModel<BsonDocument>> writeModels,
+                          final List<BulkWriteError> writeErrors) {
+
+        BsonDocument resultDoc = new BsonDocument();
+        if (bulkWriteResult.wasAcknowledged()) {
+            resultDoc.append("deletedCount", new BsonInt32(bulkWriteResult.getDeletedCount()));
+
+            // Determine insertedIds
+            BsonDocument insertedIds = new BsonDocument();
+            for (int i = 0; i < writeModels.size(); i++) {
+                WriteModel<BsonDocument> cur = writeModels.get(i);
+                if (cur instanceof InsertOneModel && writeSuccessful(i, writeErrors)) {
+                    InsertOneModel<BsonDocument> insertOneModel = (InsertOneModel<BsonDocument>) cur;
+                    insertedIds.put(Integer.toString(i), insertOneModel.getDocument().get("_id"));
+                }
+            }
+            resultDoc.append("insertedIds", insertedIds);
+            resultDoc.append("insertedCount", new BsonInt32(insertedIds.size()));
+
+            resultDoc.append("matchedCount", new BsonInt32(bulkWriteResult.getMatchedCount()));
+            resultDoc.append("modifiedCount", new BsonInt32(bulkWriteResult.getModifiedCount()));
+            resultDoc.append("upsertedCount", bulkWriteResult.getUpserts() == null
+                    ? new BsonInt32(0) : new BsonInt32(bulkWriteResult.getUpserts().size()));
+            BsonDocument upserts = new BsonDocument();
+            for (BulkWriteUpsert bulkWriteUpsert : bulkWriteResult.getUpserts()) {
+                upserts.put(String.valueOf(bulkWriteUpsert.getIndex()), bulkWriteUpsert.getId());
+            }
+            resultDoc.append("upsertedIds", upserts);
+        }
+        return toResult(resultDoc);
+    }
+
+    private boolean writeSuccessful(final int index, final List<BulkWriteError> writeErrors) {
+        for (BulkWriteError cur : writeErrors) {
+            if (cur.getIndex() == index) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    BsonDocument toResult(@Nullable final BsonValue results) {
+        return new BsonDocument("result", results != null ? results : BsonNull.VALUE);
+    }
+
+    BsonDocument getDatabaseRunCommandResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                             @Nullable final ClientSession clientSession) {
+        return getRunCommandResult(collectionOptions, arguments, clientSession);
+    }
+
+    BsonDocument getRunCommandResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        BsonDocument command = arguments.getDocument("command");
+        ReadPreference readPreference = arguments.containsKey("readPreference") ? getReadPreference(arguments) : null;
+
+        FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+
+        if (clientSession == null) {
+            if (readPreference == null) {
+                database.runCommand(command, BsonDocument.class, futureResultCallback);
+            } else {
+                database.runCommand(command, readPreference, BsonDocument.class, futureResultCallback);
+            }
+        } else {
+            if (readPreference == null) {
+                database.runCommand(clientSession, command, BsonDocument.class, futureResultCallback);
+            } else {
+                database.runCommand(clientSession, command, readPreference, BsonDocument.class, futureResultCallback);
+            }
+        }
+        BsonDocument response = futureResult(futureResultCallback);
+        response.remove("ok");
+        response.remove("operationTime");
+        response.remove("opTime");
+        response.remove("electionId");
+        response.remove("$clusterTime");
+        return toResult(response);
+    }
+
+    BsonDocument getAggregateResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
+        for (BsonValue stage : arguments.getArray("pipeline")) {
+            pipeline.add(stage.asDocument());
+        }
+
+        AggregateIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).aggregate(pipeline);
+        } else {
+            iterable = getCollection(collectionOptions).aggregate(clientSession, pipeline);
+        }
+
+        if (arguments.containsKey("batchSize")) {
+            iterable.batchSize(arguments.getNumber("batchSize").intValue());
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("maxTimeMS")) {
+            iterable.maxTime(arguments.getNumber("maxTimeMS").longValue(), TimeUnit.MILLISECONDS);
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getDatabaseAggregateResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                            @Nullable final ClientSession clientSession) {
+        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
+        for (BsonValue stage : arguments.getArray("pipeline")) {
+            pipeline.add(stage.asDocument());
+        }
+
+        AggregateIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = database.aggregate(pipeline, BsonDocument.class);
+        } else {
+            iterable = database.aggregate(clientSession, pipeline, BsonDocument.class);
+        }
+
+        if (arguments.containsKey("allowDiskUse")) {
+            iterable.allowDiskUse(arguments.getBoolean("allowDiskUse").getValue());
+        }
+        if (arguments.containsKey("batchSize")) {
+            iterable.batchSize(arguments.getNumber("batchSize").intValue());
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        BsonDocument results = toResult(iterable);
+        for (BsonValue result : results.getArray("result", new BsonArray())) {
+            if (result.isDocument()) {
+                BsonDocument command = result.asDocument().getDocument("command", new BsonDocument());
+                command.remove("$readPreference");
+                command.remove("$clusterTime");
+                command.remove("signature");
+                command.remove("keyId");
+            }
+        }
+        return results;
+    }
+
+    @SuppressWarnings("deprecation")
+    BsonDocument getCountResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                @Nullable final ClientSession clientSession) {
+        CountOptions options = new CountOptions();
+        if (arguments.containsKey("skip")) {
+            options.skip(arguments.getNumber("skip").intValue());
+        }
+        if (arguments.containsKey("limit")) {
+            options.limit(arguments.getNumber("limit").intValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        FutureResultCallback<Long> futureResultCallback = new FutureResultCallback<Long>();
+        BsonDocument filter = arguments.getDocument("filter", new BsonDocument());
+        if (clientSession == null) {
+            getCollection(collectionOptions).count(filter, options, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).count(clientSession, filter, options, futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback).intValue());
+    }
+
+    BsonDocument getEstimatedDocumentCountResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                                 @Nullable final ClientSession clientSession) {
+        if (!arguments.isEmpty()) {
+            throw new UnsupportedOperationException("Unexpected arguments: " + arguments);
+        }
+        FutureResultCallback<Long> futureResultCallback = new FutureResultCallback<Long>();
+        getCollection(collectionOptions).estimatedDocumentCount(futureResultCallback);
+        return toResult(futureResult(futureResultCallback).intValue());
+    }
+
+    BsonDocument getClientListDatabasesResult(final BsonDocument clientOptions, final BsonDocument arguments,
+                                              @Nullable final ClientSession clientSession) {
+        ListDatabasesIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = mongoClient.listDatabases(BsonDocument.class);
+        } else {
+            iterable = mongoClient.listDatabases(clientSession, BsonDocument.class);
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getClientListDatabaseObjectsResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                    @Nullable final ClientSession clientSession) {
+        return getClientListDatabasesResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getClientListDatabaseNamesResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                  @Nullable final ClientSession clientSession) {
+        return getClientListDatabasesResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getDatabaseListCollectionObjectsResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                        @Nullable final ClientSession clientSession) {
+        return getDatabaseListCollectionsResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getDatabaseListCollectionNamesResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                      @Nullable final ClientSession clientSession) {
+        return getDatabaseListCollectionsResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getDatabaseListCollectionsResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                  @Nullable final ClientSession clientSession) {
+        ListCollectionsIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = database.listCollections(BsonDocument.class);
+        } else {
+            iterable = database.listCollections(clientSession, BsonDocument.class);
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getListIndexesResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                      @Nullable final ClientSession clientSession) {
+        ListIndexesIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).listIndexes(BsonDocument.class);
+        } else {
+            iterable = getCollection(collectionOptions).listIndexes(clientSession, BsonDocument.class);
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getCountDocumentsResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                         @Nullable final ClientSession clientSession) {
+        CountOptions options = new CountOptions();
+        if (arguments.containsKey("skip")) {
+            options.skip(arguments.getNumber("skip").intValue());
+        }
+        if (arguments.containsKey("limit")) {
+            options.limit(arguments.getNumber("limit").intValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        BsonDocument filter = arguments.getDocument("filter", new BsonDocument());
+        FutureResultCallback<Long> futureResultCallback = new FutureResultCallback<Long>();
+        if (clientSession == null) {
+            getCollection(collectionOptions).countDocuments(filter, options, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).countDocuments(clientSession, filter, options, futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback).intValue());
+    }
+
+    BsonDocument getDistinctResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                   @Nullable final ClientSession clientSession) {
+        DistinctIterable<BsonValue> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).distinct(arguments.getString("fieldName").getValue(), BsonValue.class);
+        } else {
+            iterable = getCollection(collectionOptions).distinct(clientSession, arguments.getString("fieldName").getValue(),
+                    BsonValue.class);
+        }
+
+        if (arguments.containsKey("filter")) {
+            iterable.filter(arguments.getDocument("filter"));
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        FutureResultCallback<List<BsonValue>> futureResultCallback = new FutureResultCallback<List<BsonValue>>();
+        iterable.into(new BsonArray(), futureResultCallback);
+        return toResult(new BsonArray(futureResult(futureResultCallback)));
+    }
+
+    @SuppressWarnings("deprecation")
+    BsonDocument getFindOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                  @Nullable final ClientSession clientSession) {
+        FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+        createFindIterable(collectionOptions, arguments, clientSession).first(futureResultCallback);
+        return toResult(futureResult(futureResultCallback));
+    }
+
+    @SuppressWarnings("deprecation")
+    BsonDocument getFindResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                               @Nullable final ClientSession clientSession) {
+        return toResult(createFindIterable(collectionOptions, arguments, clientSession));
+    }
+
+    private FindIterable<BsonDocument> createFindIterable(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                                          @Nullable final ClientSession clientSession) {
+        FindIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).find(arguments.getDocument("filter", new BsonDocument()));
+        } else {
+            iterable = getCollection(collectionOptions).find(clientSession, arguments.getDocument("filter", new BsonDocument()));
+        }
+
+        if (arguments.containsKey("skip")) {
+            iterable.skip(arguments.getNumber("skip").intValue());
+        }
+        if (arguments.containsKey("limit")) {
+            iterable.limit(arguments.getNumber("limit").intValue());
+        }
+        if (arguments.containsKey("batchSize")) {
+            iterable.batchSize(arguments.getNumber("batchSize").intValue());
+        }
+        if (arguments.containsKey("sort")) {
+            iterable.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("modifiers")) {
+            iterable.modifiers(arguments.getDocument("modifiers"));
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+        return iterable;
+    }
+
+    BsonDocument getMapReduceResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        MapReduceIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).mapReduce(arguments.get("map").asJavaScript().getCode(),
+                    arguments.get("reduce").asJavaScript().getCode());
+        } else {
+            iterable = getCollection(collectionOptions).mapReduce(clientSession, arguments.get("map").asJavaScript().getCode(),
+                    arguments.get("reduce").asJavaScript().getCode());
+        }
+
+        if (arguments.containsKey("filter")) {
+            iterable.filter(arguments.getDocument("filter"));
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+        FutureResultCallback<List<BsonValue>> futureResultCallback = new FutureResultCallback<List<BsonValue>>();
+        iterable.into(new BsonArray(), futureResultCallback);
+        return toResult(new BsonArray(futureResult(futureResultCallback)));
+    }
+
+    BsonDocument getDeleteManyResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        DeleteOptions options = new DeleteOptions();
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        FutureResultCallback<DeleteResult> futureResultCallback = new FutureResultCallback<DeleteResult>();
+        if (clientSession == null) {
+            getCollection(collectionOptions).deleteMany(arguments.getDocument("filter"), options, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).deleteMany(clientSession, arguments.getDocument("filter"), options, futureResultCallback);
+        }
+        return toResult("deletedCount", new BsonInt32((int) futureResult(futureResultCallback).getDeletedCount()));
+    }
+
+    BsonDocument getDeleteOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        DeleteOptions options = new DeleteOptions();
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        FutureResultCallback<DeleteResult> futureResultCallback = new FutureResultCallback<DeleteResult>();
+        if (clientSession == null) {
+            getCollection(collectionOptions).deleteOne(arguments.getDocument("filter"), options, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).deleteOne(clientSession, arguments.getDocument("filter"), options, futureResultCallback);
+        }
+        return toResult("deletedCount", new BsonInt32((int) futureResult(futureResultCallback).getDeletedCount()));
+    }
+
+    BsonDocument getFindOneAndDeleteResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                           @Nullable final ClientSession clientSession) {
+        FindOneAndDeleteOptions options = new FindOneAndDeleteOptions();
+        if (arguments.containsKey("projection")) {
+            options.projection(arguments.getDocument("projection"));
+        }
+        if (arguments.containsKey("sort")) {
+            options.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+        if (clientSession == null) {
+            getCollection(collectionOptions).findOneAndDelete(arguments.getDocument("filter"), options, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).findOneAndDelete(clientSession, arguments.getDocument("filter"), options,
+                    futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback));
+    }
+
+    BsonDocument getFindOneAndReplaceResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                            @Nullable final ClientSession clientSession) {
+        FindOneAndReplaceOptions options = new FindOneAndReplaceOptions();
+        if (arguments.containsKey("projection")) {
+            options.projection(arguments.getDocument("projection"));
+        }
+        if (arguments.containsKey("sort")) {
+            options.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("returnDocument")) {
+            options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
+                    : ReturnDocument.BEFORE);
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+        if (clientSession == null) {
+            getCollection(collectionOptions).findOneAndReplace(arguments.getDocument("filter"), arguments.getDocument("replacement"),
+                    options, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).findOneAndReplace(clientSession, arguments.getDocument("filter"),
+                    arguments.getDocument("replacement"), options, futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback));
+    }
+
+    BsonDocument getFindOneAndUpdateResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                           @Nullable final ClientSession clientSession) {
+        FindOneAndUpdateOptions options = new FindOneAndUpdateOptions();
+        if (arguments.containsKey("projection")) {
+            options.projection(arguments.getDocument("projection"));
+        }
+        if (arguments.containsKey("sort")) {
+            options.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("returnDocument")) {
+            options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
+                    : ReturnDocument.BEFORE);
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("arrayFilters")) {
+            options.arrayFilters((getListOfDocuments(arguments.getArray("arrayFilters"))));
+        }
+
+        FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+        if (clientSession == null) {
+            if (arguments.isDocument("update")) {
+                getCollection(collectionOptions).findOneAndUpdate(arguments.getDocument("filter"), arguments.getDocument("update"), options,
+                        futureResultCallback);
+            } else {
+                getCollection(collectionOptions).findOneAndUpdate(arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options,
+                        futureResultCallback);
+            }
+        } else {
+            getCollection(collectionOptions).findOneAndUpdate(clientSession, arguments.getDocument("filter"),
+                    arguments.getDocument("update"), options, futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback));
+    }
+
+    BsonDocument getInsertOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        BsonDocument document = arguments.getDocument("document");
+        InsertOneOptions options = new InsertOneOptions();
+        if (arguments.containsKey("bypassDocumentValidation")) {
+            options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+        FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
+        if (clientSession == null) {
+            getCollection(collectionOptions).insertOne(document, options, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).insertOne(clientSession, document, options, futureResultCallback);
+        }
+        futureResult(futureResultCallback);
+        return toResult(new BsonDocument("insertedId", document.get("_id")));
+    }
+
+    BsonDocument getInsertManyResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        List<BsonDocument> documents = new ArrayList<BsonDocument>();
+        for (BsonValue document : arguments.getArray("documents")) {
+            documents.add(document.asDocument());
+        }
+        FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
+
+        try {
+            InsertManyOptions options = new InsertManyOptions().ordered(arguments.getDocument("options", new BsonDocument())
+                    .getBoolean("ordered", BsonBoolean.TRUE).getValue());
+            if (arguments.containsKey("bypassDocumentValidation")) {
+                options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+            }
+
+            if (clientSession == null) {
+                getCollection(collectionOptions).insertMany(documents, options, futureResultCallback);
+            } else {
+                getCollection(collectionOptions).insertMany(clientSession, documents, options, futureResultCallback);
+            }
+            futureResult(futureResultCallback);
+
+            BsonDocument insertedIds = new BsonDocument();
+            for (int i = 0; i < documents.size(); i++) {
+                insertedIds.put(Integer.toString(i), documents.get(i).get("_id"));
+            }
+            return toResult(new BsonDocument("insertedIds", insertedIds));
+        } catch (MongoBulkWriteException e) {
+            // For transaction tests, the exception is expected to be returned.
+            if (clientSession != null && clientSession.hasActiveTransaction()) {
+                throw e;
+            }
+                // Test results are expecting this to look just like bulkWrite error, so translate to InsertOneModel so the result
+                // translation code can be reused.
+                List<InsertOneModel<BsonDocument>> writeModels = new ArrayList<InsertOneModel<BsonDocument>>();
+                for (BsonValue document : arguments.getArray("documents")) {
+                    writeModels.add(new InsertOneModel<BsonDocument>(document.asDocument()));
+                }
+                BsonDocument result = toResult(e.getWriteResult(), writeModels, e.getWriteErrors());
+                result.put("error", BsonBoolean.TRUE);
+                return result;
+        }
+    }
+
+    BsonDocument getReplaceOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        ReplaceOptions options = new ReplaceOptions();
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("bypassDocumentValidation")) {
+            options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+
+        FutureResultCallback<UpdateResult> futureResultCallback = new FutureResultCallback<UpdateResult>();
+        if (clientSession == null) {
+            getCollection(collectionOptions).replaceOne(arguments.getDocument("filter"), arguments.getDocument("replacement"), options,
+                    futureResultCallback);
+        } else {
+            getCollection(collectionOptions).replaceOne(clientSession, arguments.getDocument("filter"),
+                    arguments.getDocument("replacement"), options, futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback));
+    }
+
+    BsonDocument getUpdateManyResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        UpdateOptions options = new UpdateOptions();
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("arrayFilters")) {
+            options.arrayFilters((getListOfDocuments(arguments.getArray("arrayFilters"))));
+        }
+        if (arguments.containsKey("bypassDocumentValidation")) {
+            options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+
+        FutureResultCallback<UpdateResult> futureResultCallback = new FutureResultCallback<UpdateResult>();
+        if (clientSession == null) {
+            if (arguments.isDocument("update")) {
+                getCollection(collectionOptions).updateMany(arguments.getDocument("filter"), arguments.getDocument("update"), options,
+                        futureResultCallback);
+            } else {
+                getCollection(collectionOptions).updateMany(arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options, futureResultCallback);
+            }
+        } else {
+            getCollection(collectionOptions).updateMany(clientSession, arguments.getDocument("filter"), arguments.getDocument("update"),
+                    options, futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback));
+    }
+
+    @SuppressWarnings("unchecked")
+    BsonDocument getUpdateOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        UpdateOptions options = new UpdateOptions();
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("arrayFilters")) {
+            options.arrayFilters((getListOfDocuments(arguments.getArray("arrayFilters"))));
+        }
+        if (arguments.containsKey("bypassDocumentValidation")) {
+            options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+
+        FutureResultCallback<UpdateResult> futureResultCallback = new FutureResultCallback<UpdateResult>();
+        if (clientSession == null) {
+            if (arguments.isDocument("update")) {
+                getCollection(collectionOptions).updateOne(arguments.getDocument("filter"), arguments.getDocument("update"), options,
+                        futureResultCallback);
+            } else {
+                getCollection(collectionOptions).updateOne(arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options, futureResultCallback);
+            }
+        } else {
+            getCollection(collectionOptions).updateOne(clientSession, arguments.getDocument("filter"), arguments.getDocument("update"),
+                    options, futureResultCallback);
+        }
+        return toResult(futureResult(futureResultCallback));
+    }
+
+    BsonDocument getBulkWriteResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
+        if (arguments.containsKey("writeConcern")) {
+            if (arguments.getDocument("writeConcern").size() > 1) {
+                throw new UnsupportedOperationException("Write concern document contains unexpected keys: "
+                        + arguments.getDocument("writeConcern").keySet());
+            }
+            writeConcern = new WriteConcern(arguments.getDocument("writeConcern").getInt32("w").intValue());
+        }
+
+        List<WriteModel<BsonDocument>> writeModels = new ArrayList<WriteModel<BsonDocument>>();
+        for (BsonValue bsonValue : arguments.getArray("requests")) {
+            BsonDocument cur = bsonValue.asDocument();
+            String name = cur.getString("name").getValue();
+            BsonDocument requestArguments = cur.getDocument("arguments");
+            if (name.equals("insertOne")) {
+                writeModels.add(new InsertOneModel<BsonDocument>(requestArguments.getDocument("document")));
+            } else if (name.equals("updateOne")) {
+                if (requestArguments.isDocument("update")) {
+                    writeModels.add(new UpdateOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            requestArguments.getDocument("update"),
+                            getUpdateOptions(requestArguments)));
+                } else {  //  update is a pipeline
+                    writeModels.add(new UpdateOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            getListOfDocuments(requestArguments.getArray("update")),
+                            getUpdateOptions(requestArguments)));
+                }
+            } else if (name.equals("updateMany")) {
+                if (requestArguments.isDocument("update")) {
+                    writeModels.add(new UpdateManyModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            requestArguments.getDocument("update"),
+                            getUpdateOptions(requestArguments)));
+                } else {  // update is a pipeline
+                    writeModels.add(new UpdateManyModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            getListOfDocuments(requestArguments.getArray("update")),
+                            getUpdateOptions(requestArguments)));
+                }
+            } else if (name.equals("deleteOne")) {
+                writeModels.add(new DeleteOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                        getDeleteOptions(requestArguments)));
+            } else if (name.equals("deleteMany")) {
+                writeModels.add(new DeleteManyModel<BsonDocument>(requestArguments.getDocument("filter"),
+                        getDeleteOptions(requestArguments)));
+            } else if (name.equals("replaceOne")) {
+                writeModels.add(new ReplaceOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                        requestArguments.getDocument("replacement"), getReplaceOptions(requestArguments)));
+            } else {
+                throw new UnsupportedOperationException(format("Unsupported write request type: %s", name));
+            }
+        }
+
+        try {
+            FutureResultCallback<BulkWriteResult> futureResultCallback = new FutureResultCallback<BulkWriteResult>();
+            BsonDocument optionsDocument = arguments.getDocument("options", new BsonDocument());
+            BulkWriteOptions options = new BulkWriteOptions()
+                    .ordered(optionsDocument.getBoolean("ordered", BsonBoolean.TRUE).getValue());
+            if (optionsDocument.containsKey("bypassDocumentValidation")) {
+                options.bypassDocumentValidation(optionsDocument.getBoolean("bypassDocumentValidation").getValue());
+            }
+
+            if (clientSession == null) {
+                getCollection(collectionOptions).bulkWrite(writeModels, options, futureResultCallback);
+            } else {
+                getCollection(collectionOptions).bulkWrite(clientSession, writeModels, options, futureResultCallback);
+            }
+            return toResult(futureResult(futureResultCallback), writeModels, Collections.<BulkWriteError>emptyList());
+        } catch (MongoBulkWriteException e) {
+            BsonDocument result = toResult(e.getWriteResult(), writeModels, e.getWriteErrors());
+            result.put("error", BsonBoolean.TRUE);
+            return result;
+        }
+    }
+
+
+    BsonDocument getRenameResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                 @Nullable final ClientSession clientSession) {
+
+        FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
+
+        MongoNamespace toNamespace = new MongoNamespace(database.getName(), arguments.getString("to").getValue());
+        if (clientSession == null) {
+            getCollection(collectionOptions).renameCollection(toNamespace, futureResultCallback);
+        } else {
+            getCollection(collectionOptions).renameCollection(clientSession, toNamespace, futureResultCallback);
+        }
+        futureResult(futureResultCallback);
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    BsonDocument getDropResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                               @Nullable final ClientSession clientSession) {
+
+        FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
+
+        if (clientSession == null) {
+            getCollection(collectionOptions).drop(futureResultCallback);
+        } else {
+            getCollection(collectionOptions).drop(clientSession, futureResultCallback);
+        }
+        futureResult(futureResultCallback);
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    // GridFSBucket operations
+
+    BsonDocument getDownloadByNameResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                         @Nullable final ClientSession clientSession) throws IOException {
+        final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        try {
+            final GridFSDownloadOptions downloadOptions = new GridFSDownloadOptions();
+            if (arguments.containsKey("options")) {
+                int revision = arguments.getDocument("options").getInt32("revision").getValue();
+                downloadOptions.revision(revision);
+            }
+            new MongoOperation<Long>() {
+                @Override
+                public void execute() {
+                    gridFSBucket.downloadToStream(arguments.getString("filename").getValue(), toAsyncOutputStream(outputStream),
+                            downloadOptions, getCallback());
+                }
+            }.get();
+
+            return toResult("result", new BsonString(Hex.encode(outputStream.toByteArray()).toLowerCase()));
+        } finally {
+            outputStream.close();
+        }
+    }
+
+    BsonDocument getDeleteResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                 @Nullable final ClientSession clientSession) {
+        try {
+            new MongoOperation<Void>() {
+                @Override
+                public void execute() {
+                    gridFSBucket.delete(arguments.getObjectId("id").getValue(), getCallback());
+                }
+            }.get();
+
+            return new BsonDocument("ok", new BsonInt32(1));
+        } catch (MongoGridFSException e) {
+            BsonDocument result = toResult("message", new BsonString(e.getMessage()));
+            result.put("error", BsonBoolean.TRUE);
+            return result;
+        }
+    }
+
+    BsonDocument getDownloadResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                   @Nullable final ClientSession clientSession) throws IOException {
+        final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        try {
+            new MongoOperation<Long>() {
+                @Override
+                public void execute() {
+                    gridFSBucket.downloadToStream(arguments.getObjectId("id").getValue(), toAsyncOutputStream(outputStream),
+                            getCallback());
+                }
+            }.get();
+        } finally {
+            outputStream.close();
+        }
+        return toResult("result", new BsonString(Hex.encode(outputStream.toByteArray()).toLowerCase()));
+    }
+
+    BsonDocument getUploadResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                 @Nullable final ClientSession clientSession) {
+        ObjectId objectId = null;
+        BsonDocument arguments = parseHexDocument(rawArguments, "source");
+
+        final GridFSBucket gridFSUploadBucket = gridFSBucket;
+        final String filename = arguments.getString("filename").getValue();
+        final InputStream inputStream = new ByteArrayInputStream(arguments.getBinary("source").getData());
+        final GridFSUploadOptions options = new GridFSUploadOptions();
+        BsonDocument rawOptions = arguments.getDocument("options", new BsonDocument());
+        if (rawOptions.containsKey("chunkSizeBytes")) {
+            options.chunkSizeBytes(rawOptions.getInt32("chunkSizeBytes").getValue());
+        }
+        if (rawOptions.containsKey("metadata")) {
+            options.metadata(Document.parse(rawOptions.getDocument("metadata").toJson()));
+        }
+        if (rawOptions.containsKey("disableMD5")) {
+            gridFSUploadBucket.withDisableMD5(rawOptions.getBoolean("disableMD5").getValue());
+        }
+
+        objectId = new MongoOperation<ObjectId>() {
+            @Override
+            public void execute() {
+                gridFSUploadBucket.uploadFromStream(filename, toAsyncInputStream(inputStream), options, getCallback());
+            }
+        }.get();
+
+        return new BsonDocument("objectId", new BsonObjectId(objectId));
+    }
+
+    // Change streams operations
+
+    BsonDocument getClientWatchResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                      @Nullable final ClientSession clientSession) {
+        new MongoOperation<AsyncBatchCursor<ChangeStreamDocument<Document>>>() {
+            @Override
+            public void execute() {
+                mongoClient.watch().batchCursor(getCallback());
+            }
+        }.get();
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    BsonDocument getWatchResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                @Nullable final ClientSession clientSession) {
+        new MongoOperation<AsyncBatchCursor<ChangeStreamDocument<BsonDocument>>>() {
+            @Override
+            public void execute() {
+                baseCollection.watch().batchCursor(getCallback());
+            }
+        }.get();
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    BsonDocument getDatabaseWatchResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                        @Nullable final ClientSession clientSession) {
+        new MongoOperation<AsyncBatchCursor<ChangeStreamDocument<Document>>>() {
+            @Override
+            public void execute() {
+                database.watch().batchCursor(getCallback());
+            }
+        }.get();
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    Collation getCollation(final BsonDocument bsonCollation) {
+        Collation.Builder builder = Collation.builder();
+        if (bsonCollation.containsKey("locale")) {
+            builder.locale(bsonCollation.getString("locale").getValue());
+        }
+        if (bsonCollation.containsKey("caseLevel")) {
+            builder.caseLevel(bsonCollation.getBoolean("caseLevel").getValue());
+        }
+        if (bsonCollation.containsKey("caseFirst")) {
+            builder.collationCaseFirst(CollationCaseFirst.fromString(bsonCollation.getString("caseFirst").getValue()));
+        }
+        if (bsonCollation.containsKey("strength")) {
+            builder.collationStrength(CollationStrength.fromInt(bsonCollation.getInt32("strength").getValue()));
+        }
+        if (bsonCollation.containsKey("numericOrdering")) {
+            builder.numericOrdering(bsonCollation.getBoolean("numericOrdering").getValue());
+        }
+        if (bsonCollation.containsKey("strength")) {
+            builder.collationStrength(CollationStrength.fromInt(bsonCollation.getInt32("strength").getValue()));
+        }
+        if (bsonCollation.containsKey("alternate")) {
+            builder.collationAlternate(CollationAlternate.fromString(bsonCollation.getString("alternate").getValue()));
+        }
+        if (bsonCollation.containsKey("maxVariable")) {
+            builder.collationMaxVariable(CollationMaxVariable.fromString(bsonCollation.getString("maxVariable").getValue()));
+        }
+        if (bsonCollation.containsKey("normalization")) {
+            builder.normalization(bsonCollation.getBoolean("normalization").getValue());
+        }
+        if (bsonCollation.containsKey("backwards")) {
+            builder.backwards(bsonCollation.getBoolean("backwards").getValue());
+        }
+        return builder.build();
+    }
+
+    private UpdateOptions getUpdateOptions(final BsonDocument requestArguments) {
+        UpdateOptions options = new UpdateOptions();
+        if (requestArguments.containsKey("upsert")) {
+            options.upsert(true);
+        }
+        if (requestArguments.containsKey("arrayFilters")) {
+            options.arrayFilters(getListOfDocuments(requestArguments.getArray("arrayFilters")));
+        }
+        if (requestArguments.containsKey("collation")) {
+            options.collation(getCollation(requestArguments.getDocument("collation")));
+        }
+        return options;
+    }
+
+    private DeleteOptions getDeleteOptions(final BsonDocument requestArguments) {
+        DeleteOptions options = new DeleteOptions();
+        if (requestArguments.containsKey("collation")) {
+            options.collation(getCollation(requestArguments.getDocument("collation")));
+        }
+        return options;
+    }
+
+    private ReplaceOptions getReplaceOptions(final BsonDocument requestArguments) {
+        ReplaceOptions options = new ReplaceOptions();
+        if (requestArguments.containsKey("upsert")) {
+            options.upsert(true);
+        }
+        if (requestArguments.containsKey("collation")) {
+            options.collation(getCollation(requestArguments.getDocument("collation")));
+        }
+        return options;
+    }
+
+    @Nullable
+    private List<BsonDocument> getListOfDocuments(@Nullable final BsonArray bsonArray) {
+        if (bsonArray == null) {
+            return null;
+        }
+        List<BsonDocument> arrayFilters = new ArrayList<BsonDocument>(bsonArray.size());
+        for (BsonValue cur : bsonArray) {
+            arrayFilters.add(cur.asDocument());
+        }
+        return arrayFilters;
+    }
+
+    private MongoCollection<BsonDocument> getCollection(final BsonDocument collectionOptions) {
+        MongoCollection<BsonDocument> retVal = baseCollection;
+        if (collectionOptions.containsKey("readPreference")) {
+            retVal = retVal.withReadPreference(getReadPreference(collectionOptions));
+        }
+
+        if (collectionOptions.containsKey("writeConcern")) {
+            WriteConcern writeConcern = getWriteConcern(collectionOptions);
+            retVal = retVal.withWriteConcern(writeConcern);
+        }
+
+        if (collectionOptions.containsKey("readConcern")) {
+            ReadConcern readConcern = getReadConcern(collectionOptions);
+            retVal = retVal.withReadConcern(readConcern);
+        }
+
+        return retVal;
+    }
+
+    ReadPreference getReadPreference(final BsonDocument arguments) {
+        return ReadPreference.valueOf(
+                arguments.getDocument("readPreference").getString("mode").getValue());
+    }
+
+
+    WriteConcern getWriteConcern(final BsonDocument arguments) {
+        BsonDocument writeConcernDocument = arguments.getDocument("writeConcern");
+        if (!writeConcernDocument.containsKey("w")) {
+            throw new UnsupportedOperationException("Write concern document contains unexpected keys: " + writeConcernDocument.keySet());
+        }
+
+        WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
+        if (writeConcernDocument.isNumber("w")) {
+            writeConcern = writeConcern.withW(writeConcernDocument.getNumber("w").intValue());
+        } else {
+            writeConcern = writeConcern.withW(writeConcernDocument.getString("w").getValue());
+        }
+
+        if (writeConcernDocument.containsKey("wtimeout")) {
+            writeConcern = writeConcern.withWTimeout(writeConcernDocument.getNumber("wtimeout").longValue(), TimeUnit.MILLISECONDS);
+        }
+        if (writeConcernDocument.containsKey("j")) {
+            writeConcern = writeConcern.withJ(writeConcernDocument.getBoolean("j").getValue());
+        }
+        return writeConcern;
+    }
+
+    ReadConcern getReadConcern(final BsonDocument arguments) {
+        return new ReadConcern(ReadConcernLevel.fromString(arguments.getDocument("readConcern").getString("level").getValue()));
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document, final String hexDocument) {
+        if (document.containsKey(hexDocument) && document.get(hexDocument).isDocument()) {
+            byte[] bytes = Hex.decode(document.getDocument(hexDocument).getString("$hex").getValue());
+            document.put(hexDocument, new BsonBinary(bytes));
+        }
+        return document;
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MainTransactionsTest.java b/driver-async/src/test/functional/com/mongodb/async/client/MainTransactionsTest.java
new file mode 100644
index 00000000000..838c1f5dcd3
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/MainTransactionsTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+
+// See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
+@RunWith(Parameterized.class)
+public class MainTransactionsTest extends AbstractUnifiedTest {
+    public MainTransactionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+                                final boolean skipTest) {
+        super(filename, description, data, definition, skipTest);
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/transactions")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MapSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/MapSpecification.groovy
index d62eb4fbaa1..512e038d253 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/MapSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/MapSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MongoClientListenerRegistrationSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientListenerRegistrationSpecification.groovy
index d416bee5e58..1d6c7610714 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/MongoClientListenerRegistrationSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientListenerRegistrationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,36 +17,54 @@
 package com.mongodb.async.client
 
 import com.mongodb.async.FutureResultCallback
+import com.mongodb.event.ClusterListener
 import com.mongodb.event.CommandListener
+import com.mongodb.event.ConnectionPoolListener
+import com.mongodb.event.ServerListener
+import com.mongodb.event.ServerMonitorListener
 import org.bson.Document
 
 import static java.util.concurrent.TimeUnit.SECONDS
 
 class MongoClientListenerRegistrationSpecification extends FunctionalSpecification {
 
-    def 'should register single command listener'() {
+    def 'should register event listeners'() {
         given:
-        def first = Mock(CommandListener)
-        def client = MongoClients.create(Fixture.mongoClientBuilderFromConnectionString
-                .addCommandListener(first)
-                .build());
+        def clusterListener = Mock(ClusterListener) {
+            (1.._) * _
+        }
+        def commandListener = Mock(CommandListener) {
+            (1.._) * _
+        }
+        def connectionPoolListener = Mock(ConnectionPoolListener) {
+            (1.._) * _
+        }
+        def serverListener = Mock(ServerListener) {
+            (1.._) * _
+        }
+        def serverMonitorListener = Mock(ServerMonitorListener) {
+            (1.._) * _
+        }
 
         when:
-        run(client.getDatabase('admin').&runCommand, new Document('ping', 1))
+        def builder = Fixture.mongoClientBuilderFromConnectionString
+        builder.applyToClusterSettings { it.addClusterListener(clusterListener) }
+                .applyToConnectionPoolSettings { it.addConnectionPoolListener(connectionPoolListener) }
+                .applyToServerSettings { it.addServerListener(serverListener).addServerMonitorListener(serverMonitorListener) }
+                .addCommandListener(commandListener)
+        def settings = builder.build()
+        def client = MongoClients.create(settings)
 
         then:
-        1 * first.commandStarted(_)
-        1 * first.commandSucceeded(_)
+        run(client.getDatabase('admin').&runCommand, new Document('ping', 1))
     }
 
     def 'should register multiple command listeners'() {
         given:
         def first = Mock(CommandListener)
         def second = Mock(CommandListener)
-        def client = MongoClients.create(Fixture.mongoClientBuilderFromConnectionString
-                .addCommandListener(first)
-                .addCommandListener(second)
-                .build());
+        def client =  MongoClients.create(Fixture.mongoClientBuilderFromConnectionString
+                .addCommandListener(first).addCommandListener(second).build())
 
         when:
         run(client.getDatabase('admin').&runCommand, new Document('ping', 1))
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MongoClientSessionSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientSessionSpecification.groovy
new file mode 100644
index 00000000000..693f158b713
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientSessionSpecification.groovy
@@ -0,0 +1,373 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client
+
+import category.Slow
+import com.mongodb.ClientSessionOptions
+import com.mongodb.MongoClientException
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import com.mongodb.TransactionOptions
+import com.mongodb.WriteConcern
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.internal.connection.TestCommandListener
+import org.bson.BsonBinarySubType
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonTimestamp
+import org.bson.Document
+import org.junit.Assert
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.isStandalone
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.async.client.Fixture.getMongoClient
+import static com.mongodb.async.client.TestHelper.run
+
+class MongoClientSessionSpecification extends FunctionalSpecification {
+
+    def 'should throw IllegalArgumentException if options are null'() {
+        when:
+        Fixture.getMongoClient().startSession(null, Stub(SingleResultCallback))
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 6) && !isStandalone() })
+    def 'should throw MongoClientException starting a session when sessions are not supported'() {
+        when:
+        startSession(ClientSessionOptions.builder().build())
+
+        then:
+        thrown(MongoClientException)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should create session with correct defaults'() {
+        when:
+        def options = ClientSessionOptions.builder().build()
+        def clientSession = startSession(options)
+
+        then:
+        clientSession != null
+        clientSession.getOriginator() == Fixture.getMongoClient()
+        clientSession.isCausallyConsistent()
+        clientSession.getOptions() == ClientSessionOptions.builder()
+                .defaultTransactionOptions(TransactionOptions.builder()
+                .readConcern(ReadConcern.DEFAULT)
+                .writeConcern(WriteConcern.ACKNOWLEDGED)
+                .readPreference(ReadPreference.primary())
+                .build())
+                .build()
+        clientSession.getClusterTime() == null
+        clientSession.getOperationTime() == null
+        clientSession.getServerSession() != null
+
+        cleanup:
+        clientSession.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'cluster time should advance'() {
+        given:
+        def firstOperationTime = new BsonTimestamp(42, 1)
+        def secondOperationTime = new BsonTimestamp(52, 1)
+        def thirdOperationTime = new BsonTimestamp(22, 1)
+        def firstClusterTime = new BsonDocument('clusterTime', firstOperationTime)
+        def secondClusterTime = new BsonDocument('clusterTime', secondOperationTime)
+        def olderClusterTime = new BsonDocument('clusterTime', thirdOperationTime)
+
+        when:
+        def clientSession = startSession(ClientSessionOptions.builder().build())
+
+        then:
+        clientSession.getClusterTime() == null
+
+        when:
+        clientSession.advanceClusterTime(null)
+
+        then:
+        clientSession.getClusterTime() == null
+
+        when:
+        clientSession.advanceClusterTime(firstClusterTime)
+
+        then:
+        clientSession.getClusterTime() == firstClusterTime
+
+        when:
+        clientSession.advanceClusterTime(secondClusterTime)
+
+        then:
+        clientSession.getClusterTime() == secondClusterTime
+
+        when:
+        clientSession.advanceClusterTime(olderClusterTime)
+
+        then:
+        clientSession.getClusterTime() == secondClusterTime
+
+        cleanup:
+        clientSession.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'operation time should advance'() {
+        given:
+        def firstOperationTime = new BsonTimestamp(42, 1)
+        def secondOperationTime = new BsonTimestamp(52, 1)
+        def olderOperationTime = new BsonTimestamp(22, 1)
+
+        when:
+        def clientSession = startSession(ClientSessionOptions.builder().build())
+
+        then:
+        clientSession.getOperationTime() == null
+
+        when:
+        clientSession.advanceOperationTime(null)
+
+        then:
+        clientSession.getOperationTime() == null
+
+        when:
+        clientSession.advanceOperationTime(firstOperationTime)
+
+        then:
+        clientSession.getOperationTime() == firstOperationTime
+
+        when:
+        clientSession.advanceOperationTime(secondOperationTime)
+
+        then:
+        clientSession.getOperationTime() == secondOperationTime
+
+        when:
+        clientSession.advanceOperationTime(olderOperationTime)
+
+        then:
+        clientSession.getOperationTime() == secondOperationTime
+
+        cleanup:
+        clientSession.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'methods that use the session should throw if the session is closed'() {
+        given:
+        def options = ClientSessionOptions.builder().build()
+        def clientSession = startSession(options)
+        clientSession.close()
+
+        when:
+        clientSession.getServerSession()
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        clientSession.advanceOperationTime(new BsonTimestamp(42, 0))
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        clientSession.advanceClusterTime(new BsonDocument())
+
+        then:
+        thrown(IllegalStateException)
+
+        cleanup:
+        clientSession.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'informational methods should not throw if the session is closed'() {
+        given:
+        def options = ClientSessionOptions.builder().build()
+        def clientSession = startSession(options)
+        clientSession.close()
+
+        when:
+        clientSession.getOptions()
+        clientSession.isCausallyConsistent()
+        clientSession.getClusterTime()
+        clientSession.getOperationTime()
+
+        then:
+        true
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should apply causally consistent session option to client session'() {
+        when:
+        def clientSession = startSession(ClientSessionOptions.builder().causallyConsistent(causallyConsistent).build())
+
+        then:
+        clientSession != null
+        clientSession.isCausallyConsistent() == causallyConsistent
+
+        cleanup:
+        clientSession.close()
+
+        where:
+        causallyConsistent << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'client session should have server session with valid identifier'() {
+        given:
+        def clientSession = startSession(ClientSessionOptions.builder().build())
+
+        when:
+        def identifier = clientSession.getServerSession().identifier
+
+        then:
+        identifier.size() == 1
+        identifier.containsKey('id')
+        identifier.get('id').isBinary()
+        identifier.getBinary('id').getType() == BsonBinarySubType.UUID_STANDARD.value
+        identifier.getBinary('id').data.length == 16
+
+        cleanup:
+        clientSession.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should use a default session'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def options = Fixture.getMongoClientBuilderFromConnectionString().addCommandListener(commandListener).build()
+        def client = MongoClients.create(options)
+
+        when:
+        run(client.getDatabase('admin').&runCommand, new BsonDocument('ping', new BsonInt32(1)))
+
+        then:
+        commandListener.events.size() == 2
+        def pingCommandStartedEvent = commandListener.events.get(0) as CommandStartedEvent
+        pingCommandStartedEvent.command.containsKey('lsid')
+
+        cleanup:
+        client?.close()
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 6) && !isStandalone() })
+    def 'should not use a default session when sessions are not supported'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def options = Fixture.getMongoClientBuilderFromConnectionString().addCommandListener(commandListener).build()
+        def client = MongoClients.create(options)
+
+        when:
+        run(client.getDatabase('admin').&runCommand, new BsonDocument('ping', new BsonInt32(1)))
+
+        then:
+        def pingCommandStartedEvent = commandListener.events.get(0)
+        !(pingCommandStartedEvent as CommandStartedEvent).command.containsKey('lsid')
+
+        cleanup:
+        client?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should throw exception if unacknowledged write used with explicit session'() {
+        given:
+        def session = run(getMongoClient().&startSession)
+
+        when:
+        run(getMongoClient().getDatabase(getDatabaseName()).getCollection(getCollectionName())
+                .withWriteConcern(WriteConcern.UNACKNOWLEDGED).&insertOne, session, new Document())
+
+        then:
+        thrown(MongoClientException)
+
+        cleanup:
+        session?.close()
+    }
+
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 0) || !isDiscoverableReplicaSet() })
+    def 'should ignore unacknowledged write concern when in a transaction'() {
+        given:
+        def collection = getMongoClient().getDatabase(getDatabaseName()).getCollection(getCollectionName())
+        run(collection.&insertOne, new Document())
+
+        def session = run(getMongoClient().&startSession)
+        session.startTransaction()
+
+        when:
+        run(collection.withWriteConcern(WriteConcern.UNACKNOWLEDGED).&insertOne, session, new Document())
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        session.close()
+    }
+
+    // This test attempts attempts to demonstrate that causal consistency works correctly by inserting a document and then immediately
+    // searching for that document on a secondary by its _id and failing the test if the document is not found.  Without causal consistency
+    // enabled the expectation is that eventually that test would fail since generally the find will execute on the secondary before
+    // the secondary has a chance to replicate the document.
+    // This test is inherently racy as it's possible that the server _does_ replicate fast enough and therefore the test passes anyway
+    // even if causal consistency was not actually in effect.  For that reason the test iterates a number of times in order to increase
+    // confidence that it's really causal consistency that is causing the test to succeed
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    @Category(Slow)
+    def 'should find inserted document on a secondary when causal consistency is enabled'() {
+        given:
+        def collection = Fixture.getDefaultDatabase().getCollection(getCollectionName())
+
+        expect:
+        def clientSession = startSession(ClientSessionOptions.builder().causallyConsistent(true).build())
+        try {
+            for (int i = 0; i < 16; i++) {
+                Document document = new Document('_id', i)
+                run(collection.&insertOne, clientSession, document)
+                Document foundDocument = run(collection
+                        .withReadPreference(ReadPreference.secondaryPreferred()) // read from secondary if available
+                        .withReadConcern(readConcern)
+                        .find(clientSession, document)
+                        .maxTime(30, TimeUnit.SECONDS)  // to avoid the test running forever in case replication is broken
+                        .&first)
+                if (foundDocument == null) {
+                    Assert.fail('Should have found recently inserted document on secondary with causal consistency enabled')
+                }
+            }
+        } finally {
+            clientSession.close()
+        }
+
+        where:
+        readConcern << [ReadConcern.DEFAULT, ReadConcern.LOCAL, ReadConcern.MAJORITY]
+    }
+
+    static ClientSession startSession(... args) {
+        FutureResultCallback futureResultCallback = new FutureResultCallback()
+        List opArgs = (args != null) ? args : []
+        Fixture.getMongoClient().&startSession.call(*opArgs + futureResultCallback)
+        futureResultCallback.get(30, TimeUnit.SECONDS)
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy
index d772b985e71..7aae67a0201 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,27 +7,63 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.async.client
 
+import com.mongodb.MongoCompressor
 import com.mongodb.MongoCredential
+import com.mongodb.ReadConcern
 import com.mongodb.ServerAddress
-import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory
-import com.mongodb.connection.netty.NettyStreamFactoryFactory
+import com.mongodb.WriteConcern
+import com.mongodb.async.FutureResultCallback
+import org.bson.Document
 import spock.lang.IgnoreIf
+import spock.lang.Unroll
 
+import static com.mongodb.ClusterFixture.connectionString
+import static com.mongodb.ClusterFixture.getCredentialList
 import static com.mongodb.ClusterFixture.getSslSettings
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.ReadPreference.secondaryPreferred
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
 class MongoClientsSpecification extends FunctionalSpecification {
 
+    @IgnoreIf({ isNotAtLeastJava8() })
+    def 'should connect'() {
+        given:
+        def connectionString = 'mongodb://'
+        if (!getCredentialList().isEmpty()) {
+           connectionString += (getCredentialList()[0].getUserName() + ':' + String.valueOf(getCredentialList()[0].getPassword()) + '@')
+        }
+        connectionString += getConnectionString().getHosts()[0] + '/?'
+        connectionString += 'ssl=' + getSslSettings().isEnabled() + '&'
+        connectionString += 'sslInvalidHostNameAllowed=' + getSslSettings().isInvalidHostNameAllowed() + '&'
+        connectionString += 'streamType=' + streamType
+
+        when:
+        def client = MongoClients.create(connectionString)
+        def callback = new FutureResultCallback()
+        client.getDatabase('admin').runCommand(new Document('ping', 1), callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        client?.close()
+
+        where:
+        streamType << ['netty', 'nio2']
+    }
+
     def 'should apply connection string to cluster settings'() {
         when:
         def client = MongoClients.create('mongodb://localhost,localhost:27018/')
@@ -85,37 +121,100 @@ class MongoClientsSpecification extends FunctionalSpecification {
         client?.close()
     }
 
-    def 'should apply connection string to netty stream type'() {
+    def 'should apply connection string to socket settings'() {
         when:
-        def client = MongoClients.create('mongodb://localhost/?streamType=Netty')
+        def client = MongoClients.create('mongodb://localhost/?connectTimeoutMS=300')
 
         then:
-        client.settings.streamFactoryFactory instanceof NettyStreamFactoryFactory
+        client.settings.socketSettings.getConnectTimeout(MILLISECONDS) == 300
 
         cleanup:
         client?.close()
     }
 
-    @IgnoreIf({ javaVersion < 1.7 || getSslSettings().isEnabled() })
-    def 'should apply connection string to nio2 stream type'() {
+    @Unroll
+    def 'should apply read preference from connection string to settings'() {
         when:
-        def client = MongoClients.create('mongodb://localhost/?streamType=NIO2')
+        def client = MongoClients.create(uri)
 
         then:
-        client.settings.streamFactoryFactory instanceof AsynchronousSocketChannelStreamFactoryFactory
+        client.settings.getReadPreference() == readPreference
 
         cleanup:
         client?.close()
+
+        where:
+        uri                                                              | readPreference
+        'mongodb://localhost/'                                           | primary()
+        'mongodb://localhost/?readPreference=secondaryPreferred'         | secondaryPreferred()
     }
 
-    def 'should apply connection string to socket settings'() {
+    @Unroll
+    def 'should apply read concern from connection string to settings'() {
         when:
-        def client = MongoClients.create('mongodb://localhost/?connectTimeoutMS=300')
+        def client = MongoClients.create(uri)
 
         then:
-        client.settings.socketSettings.getConnectTimeout(MILLISECONDS) == 300
+        client.settings.getReadConcern() == readConcern
+
+        cleanup:
+        client?.close()
+
+        where:
+        uri                                               | readConcern
+        'mongodb://localhost/'                            | ReadConcern.DEFAULT
+        'mongodb://localhost/?readConcernLevel=local'     | ReadConcern.LOCAL
+    }
+
+    @Unroll
+    def 'should apply write concern from connection string to settings'() {
+        when:
+        def client = MongoClients.create(uri)
+
+        then:
+        client.settings.getWriteConcern() == writeConcern
 
         cleanup:
         client?.close()
+
+        where:
+        uri                               | writeConcern
+        'mongodb://localhost'             | WriteConcern.ACKNOWLEDGED
+        'mongodb://localhost/?w=majority' | WriteConcern.MAJORITY
+    }
+
+    @Unroll
+    def 'should apply application name from connection string to settings'() {
+        when:
+        def client = MongoClients.create(uri)
+
+        then:
+        client.settings.getApplicationName() == applicationName
+
+        cleanup:
+        client?.close()
+
+        where:
+        uri                                 | applicationName
+        'mongodb://localhost'               | null
+        'mongodb://localhost/?appname=app1' | 'app1'
+    }
+
+    @Unroll
+    def 'should apply compressors from connection string to settings'() {
+        when:
+        def client = MongoClients.create(uri)
+
+        then:
+        client.settings.getCompressorList() == compressorList
+
+        cleanup:
+        client?.close()
+
+        where:
+        uri                                         | compressorList
+        'mongodb://localhost'                       | []
+        'mongodb://localhost/?compressors=zlib'     | [MongoCompressor.createZlibCompressor()]
+        'mongodb://localhost/?compressors=zstd'     | [MongoCompressor.createZstdCompressor()]
     }
 }
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MongoOperation.java b/driver-async/src/test/functional/com/mongodb/async/client/MongoOperation.java
new file mode 100644
index 00000000000..357c3784db1
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/MongoOperation.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoException;
+import com.mongodb.async.FutureResultCallback;
+
+import java.util.concurrent.TimeUnit;
+
+public abstract class MongoOperation<TResult> {
+    private FutureResultCallback<TResult> callback = new FutureResultCallback<TResult>();
+
+    public FutureResultCallback<TResult> getCallback() {
+        return callback;
+    }
+
+    public TResult get() {
+        execute();
+        try {
+            return callback.get(60, TimeUnit.SECONDS);
+        } catch (MongoException e) {
+            throw e;
+        } catch (Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+
+    public abstract void execute();
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/NettyStreamFactoryFactorySmokeTestSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/NettyStreamFactoryFactorySmokeTestSpecification.groovy
index a608d6505b3..7460a5b9769 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/NettyStreamFactoryFactorySmokeTestSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/NettyStreamFactoryFactorySmokeTestSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -34,11 +34,12 @@ class NettyStreamFactoryFactorySmokeTestSpecification extends FunctionalSpecific
         def eventLoopGroup = new OioEventLoopGroup()
         def streamFactoryFactory = NettyStreamFactoryFactory.builder()
                 .eventLoopGroup(eventLoopGroup).socketChannelClass(OioSocketChannel).build()
-        MongoClientSettings.Builder builder = getMongoClientBuilderFromConnectionString().streamFactoryFactory(streamFactoryFactory)
+        com.mongodb.MongoClientSettings settings = getMongoClientBuilderFromConnectionString()
+                .streamFactoryFactory(streamFactoryFactory).build()
         def document = new Document('a', 1)
 
         when:
-        mongoClient = MongoClients.create(builder.build())
+        mongoClient = MongoClients.create(settings)
         def collection = mongoClient.getDatabase(databaseName).getCollection(collectionName)
 
 
@@ -50,7 +51,6 @@ class NettyStreamFactoryFactorySmokeTestSpecification extends FunctionalSpecific
 
         cleanup:
         mongoClient?.close()
-
     }
 
     def run(operation, ... args) {
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/ReadConcernTest.java b/driver-async/src/test/functional/com/mongodb/async/client/ReadConcernTest.java
new file mode 100644
index 00000000000..800304116df
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/ReadConcernTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ClusterFixture;
+import com.mongodb.ReadConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static org.junit.Assume.assumeTrue;
+
+public class ReadConcernTest {
+    private TestCommandListener commandListener;
+    private MongoClient mongoClient;
+
+    @Before
+    public void setUp() {
+        assumeTrue(canRunTests());
+        commandListener = new TestCommandListener();
+        mongoClient = MongoClients.create(Fixture.getMongoClientBuilderFromConnectionString()
+                .addCommandListener(commandListener)
+                .build());
+    }
+
+    @After
+    public void tearDown() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void shouldIncludeReadConcernInCommand() throws InterruptedException {
+        final CountDownLatch latch = new CountDownLatch(1);
+        mongoClient.getDatabase(getDefaultDatabaseName()).getCollection("test")
+                .withReadConcern(ReadConcern.LOCAL).count(new SingleResultCallback<Long>() {
+            @Override
+            public void onResult(final Long result, final Throwable t) {
+                latch.countDown();
+            }
+        });
+
+        latch.await(ClusterFixture.TIMEOUT, TimeUnit.SECONDS);
+
+        List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+        BsonDocument commandDocument = new BsonDocument("count", new BsonString("test"))
+                .append("readConcern", ReadConcern.LOCAL.asDocument())
+                .append("query", new BsonDocument());
+        if (serverVersionAtLeast(3, 6)) {
+            commandDocument.put("$db", new BsonString(getDefaultDatabaseName()));
+        }
+        assertEventsEquality(Arrays.<CommandEvent>asList(new CommandStartedEvent(1, null, getDefaultDatabaseName(),
+                        "count", commandDocument)), events);
+
+    }
+
+    private boolean canRunTests() {
+        return serverVersionAtLeast(3, 2);
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/RetryableReadsTest.java b/driver-async/src/test/functional/com/mongodb/async/client/RetryableReadsTest.java
new file mode 100644
index 00000000000..9fb59738e3a
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/RetryableReadsTest.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.Block;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.client.gridfs.GridFSBucket;
+import com.mongodb.async.client.gridfs.GridFSBuckets;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.Hex;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.async.client.Fixture.getConnectionString;
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.async.client.Fixture.isSharded;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
+@RunWith(Parameterized.class)
+public class RetryableReadsTest {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final String collectionName;
+    private final String gridFSBucketName;
+    private final BsonDocument gridFSData;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private JsonPoweredCrudTestHelper helper;
+    private final TestCommandListener commandListener;
+    private MongoClient mongoClient;
+    private CollectionHelper<Document> collectionHelper;
+    private boolean useMultipleMongoses = false;
+    private ConnectionString connectionString;
+    private GridFSBucket gridFSBucket;
+    private MongoCollection<BsonDocument> filesCollection;
+    private MongoCollection<BsonDocument> chunksCollection;
+
+    private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
+
+    public RetryableReadsTest(final String filename, final String description, final String databaseName,
+                              final String collectionName, final BsonArray data, final BsonString bucketName,
+                              final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
+        this.definition = definition;
+        this.gridFSBucketName = (bucketName != null ? bucketName.getValue() : null);
+        this.gridFSData = (bucketName != null ? (BsonDocument) data.get(0) : null);
+        this.data = (bucketName != null ? null : data);
+        this.commandListener = new TestCommandListener();
+        this.skipTest = skipTest;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        assumeTrue("Skipping test: " + definition.getString("skipReason", new BsonString("")).getValue(),
+                !definition.containsKey("skipReason"));
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+
+        collectionHelper.killAllSessions();
+        collectionHelper.create(collectionName, new CreateCollectionOptions(), WriteConcern.MAJORITY);
+
+        if (data != null) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+
+            collectionHelper.drop();
+            if (documents.size() > 0) {
+                collectionHelper.insertDocuments(documents, WriteConcern.MAJORITY);
+            }
+        }
+
+        final BsonDocument clientOptions = definition.getDocument("clientOptions", new BsonDocument());
+
+        connectionString = getConnectionString();
+
+        useMultipleMongoses = definition.getBoolean("useMultipleMongoses", BsonBoolean.FALSE).getValue();
+        if (useMultipleMongoses) {
+            assumeTrue(isSharded());
+            connectionString = getMultiMongosConnectionString();
+            assumeTrue("The system property org.mongodb.test.transaction.uri is not set.", connectionString != null);
+        }
+
+        MongoClientSettings.Builder builder = MongoClientSettings.builder().applyConnectionString(connectionString);
+
+        if (System.getProperty("java.version").startsWith("1.6.")) {
+            builder.applyToSslSettings(new Block<SslSettings.Builder>() {
+                @Override
+                public void apply(final SslSettings.Builder builder) {
+                    builder.invalidHostNameAllowed(true);
+                }
+            });
+        }
+        builder.addCommandListener(commandListener)
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+                    @Override
+                    public void apply(final SocketSettings.Builder builder) {
+                        builder.readTimeout(5, TimeUnit.SECONDS);
+                    }
+                })
+                .retryWrites(clientOptions.getBoolean("retryWrites", BsonBoolean.FALSE).getValue())
+                .writeConcern(getWriteConcern(clientOptions))
+                .readConcern(getReadConcern(clientOptions))
+                .readPreference(getReadPreference(clientOptions))
+                .retryReads(clientOptions.getBoolean("retryReads", BsonBoolean.TRUE).getValue())
+                .applyToServerSettings(new Block<ServerSettings.Builder>() {
+                    @Override
+                    public void apply(final ServerSettings.Builder builder) {
+                        builder.minHeartbeatFrequency(MIN_HEARTBEAT_FREQUENCY_MS, TimeUnit.MILLISECONDS);
+                    }
+                });
+
+        if (clientOptions.containsKey("heartbeatFrequencyMS")) {
+            builder.applyToServerSettings(new Block<ServerSettings.Builder>() {
+                @Override
+                public void apply(final ServerSettings.Builder builder) {
+                    builder.heartbeatFrequency(clientOptions.getInt32("heartbeatFrequencyMS").intValue(), TimeUnit.MILLISECONDS);
+                }
+            });
+        }
+
+        mongoClient = MongoClients.create(builder.build());
+
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+        if (gridFSBucketName != null) {
+            setupGridFSBuckets(database);
+            commandListener.reset();
+        }
+        helper = new JsonPoweredCrudTestHelper(description, database, database.getCollection(collectionName, BsonDocument.class),
+                gridFSBucket, mongoClient);
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+
+    }
+
+    private ReadConcern getReadConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readConcernLevel")) {
+            return new ReadConcern(ReadConcernLevel.fromString(clientOptions.getString("readConcernLevel").getValue()));
+        } else {
+            return ReadConcern.DEFAULT;
+        }
+    }
+
+    private WriteConcern getWriteConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("w")) {
+            if (clientOptions.isNumber("w")) {
+                return new WriteConcern(clientOptions.getNumber("w").intValue());
+            } else {
+                return new WriteConcern(clientOptions.getString("w").getValue());
+            }
+        } else {
+            return WriteConcern.ACKNOWLEDGED;
+        }
+    }
+
+    private ReadPreference getReadPreference(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readPreference")) {
+            return ReadPreference.valueOf(clientOptions.getString("readPreference").getValue());
+        } else {
+            return ReadPreference.primary();
+        }
+    }
+
+    private void setupGridFSBuckets(final MongoDatabase database) {
+        gridFSBucket = GridFSBuckets.create(database);
+        filesCollection = Fixture.initializeCollection(new MongoNamespace(databaseName, "fs.files"))
+                .withDocumentClass(BsonDocument.class);
+        chunksCollection = Fixture.initializeCollection(new MongoNamespace(databaseName, "fs.chunks"))
+                .withDocumentClass(BsonDocument.class);
+
+        final List<BsonDocument> filesDocuments = processFiles(gridFSData.getArray("fs.files", new BsonArray()),
+                new ArrayList<BsonDocument>());
+        if (!filesDocuments.isEmpty()) {
+            new MongoOperation<Void>() {
+                @Override
+                public void execute() {
+                    filesCollection.insertMany(filesDocuments, getCallback());
+                }
+            }.get();
+        }
+
+        final List<BsonDocument> chunksDocuments = processChunks(gridFSData.getArray("fs.chunks", new BsonArray()),
+                new ArrayList<BsonDocument>());
+        if (!chunksDocuments.isEmpty()) {
+            new MongoOperation<Void>() {
+                @Override
+                public void execute() {
+                    chunksCollection.insertMany(chunksDocuments, getCallback());
+                }
+            }.get();
+        }
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+
+        if (collectionHelper != null && definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(new BsonDocument("configureFailPoint",
+                    definition.getDocument("failPoint").getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        executeOperations(definition.getArray("operations"));
+
+        if (definition.containsKey("expectations")) {
+            // TODO: null operation may cause test failures, since it's used to grab the read preference
+            // TODO: though read-pref.json doesn't declare expectations, so maybe not
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName, null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+            assertEventsEquality(expectedEvents, events);
+        }
+
+        BsonDocument expectedOutcome = definition.getDocument("outcome", new BsonDocument());
+        if (expectedOutcome.containsKey("collection")) {
+            List<BsonDocument> collectionData = collectionHelper.find(new BsonDocumentCodec());
+            assertEquals(expectedOutcome.getDocument("collection").getArray("data").getValues(), collectionData);
+        }
+    }
+
+    private void executeOperations(final BsonArray operations) {
+        for (BsonValue cur : operations) {
+            final BsonDocument operation = cur.asDocument();
+            BsonValue expectedResult = operation.get("result");
+
+            try {
+                BsonDocument actualOutcome = helper.getOperationResults(operation);
+                if (expectedResult != null) {
+                    BsonValue actualResult = actualOutcome.get("result");
+                    if (actualResult.isDocument()) {
+                        assertEquals("Expected operation result differs from actual", expectedResult, actualResult);
+                    }
+                }
+            } catch (MongoException e) {
+                assertTrue("Unexpected error in operation", operation.getBoolean("error", BsonBoolean.FALSE).getValue());
+            }
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}: {2}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/retryable-reads")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getString("collection_name",
+                                new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
+                        (testDocument.containsKey("bucket_name") ? new BsonArray(singletonList(testDocument.getDocument("data")))
+                                : testDocument.getArray("data")),
+                        testDocument.getString("bucket_name", null), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+    private List<BsonDocument> processFiles(final BsonArray bsonArray, final List<BsonDocument> documents) {
+        for (BsonValue rawDocument : bsonArray.getValues()) {
+            if (rawDocument.isDocument()) {
+                BsonDocument document = rawDocument.asDocument();
+                if (document.get("length").isInt32()) {
+                    document.put("length", new BsonInt64(document.getInt32("length").getValue()));
+                }
+                if (document.containsKey("metadata") && document.getDocument("metadata").isEmpty()) {
+                    document.remove("metadata");
+                }
+                if (document.containsKey("aliases") && document.getArray("aliases").getValues().size() == 0) {
+                    document.remove("aliases");
+                }
+                if (document.containsKey("contentType") && document.getString("contentType").getValue().length() == 0) {
+                    document.remove("contentType");
+                }
+                documents.add(document);
+            }
+        }
+        return documents;
+    }
+
+    private List<BsonDocument> processChunks(final BsonArray bsonArray, final List<BsonDocument> documents) {
+        for (BsonValue rawDocument: bsonArray.getValues()) {
+            if (rawDocument.isDocument()) {
+                documents.add(parseHexDocument(rawDocument.asDocument()));
+            }
+        }
+        return documents;
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document) {
+        return parseHexDocument(document, "data");
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document, final String hexDocument) {
+        if (document.containsKey(hexDocument) && document.get(hexDocument).isDocument()) {
+            byte[] bytes = Hex.decode(document.getDocument(hexDocument).getString("$hex").getValue());
+            document.put(hexDocument, new BsonBinary(bytes));
+        }
+        return document;
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/RetryableWritesProseTest.java b/driver-async/src/test/functional/com/mongodb/async/client/RetryableWritesProseTest.java
new file mode 100644
index 00000000000..45ac33d4088
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/RetryableWritesProseTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoException;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.client.test.CollectionHelper;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.getServerStatus;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.ClusterFixture.serverVersionLessThan;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+public class RetryableWritesProseTest extends DatabaseTestCase {
+    private CollectionHelper<Document> collectionHelper;
+
+    @Before
+    @Override
+    public void setUp() {
+        assumeTrue(canRunTests());
+        super.setUp();
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), collection.getNamespace());
+        collectionHelper.create();
+    }
+
+    @Test
+    public void testRetryWritesWithInsertOneAgainstMMAPv1RaisesError() {
+        boolean exceptionFound = false;
+
+        try {
+            FutureResultCallback<Void> callback = new FutureResultCallback<Void>();
+            collection.insertOne(Document.parse("{ x : 1 }"), callback);
+            futureResult(callback);
+        } catch (MongoClientException e) {
+            assertTrue(e.getMessage().equals("This MongoDB deployment does not support retryable writes. "
+                    + "Please add retryWrites=false to your connection string."));
+            assertTrue(((MongoException) e.getCause()).getCode() == 20);
+            assertTrue(e.getCause().getMessage().contains("Transaction numbers"));
+            exceptionFound = true;
+        }
+        assertTrue(exceptionFound);
+    }
+
+    @Test
+    public void testRetryWritesWithFindOneAndDeleteAgainstMMAPv1RaisesError() {
+        boolean exceptionFound = false;
+
+        try {
+            FutureResultCallback<Document> callback = new FutureResultCallback<Document>();
+            collection.findOneAndDelete(Document.parse("{ x : 1 }"), callback);
+            futureResult(callback);
+        } catch (MongoClientException e) {
+            assertTrue(e.getMessage().equals("This MongoDB deployment does not support retryable writes. "
+                    + "Please add retryWrites=false to your connection string."));
+            assertTrue(((MongoException) e.getCause()).getCode() == 20);
+            assertTrue(e.getCause().getMessage().contains("Transaction numbers"));
+            exceptionFound = true;
+        }
+        assertTrue(exceptionFound);
+    }
+
+    private boolean canRunTests() {
+        Document storageEngine = (Document) getServerStatus().get("storageEngine");
+
+        return ((isSharded() || isDiscoverableReplicaSet())
+                && storageEngine != null && storageEngine.get("name").equals("mmapv1")
+                && serverVersionAtLeast(3, 6) && serverVersionLessThan(4, 1));
+    }
+
+    private <T> T futureResult(final FutureResultCallback<T> callback) {
+        try {
+            return callback.get(30, TimeUnit.SECONDS);
+        } catch (Throwable t) {
+            throw MongoException.fromThrowable(t);
+        }
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/RetryableWritesTest.java b/driver-async/src/test/functional/com/mongodb/async/client/RetryableWritesTest.java
new file mode 100644
index 00000000000..f2d93c6ad03
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/RetryableWritesTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.client.test.CollectionHelper;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.async.client.Fixture.getMongoClientBuilderFromConnectionString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/retryable-writes/tests
+@RunWith(Parameterized.class)
+public class RetryableWritesTest extends DatabaseTestCase {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final String collectionName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private MongoClient mongoClient;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoCollection<BsonDocument> collection;
+    private JsonPoweredCrudTestHelper helper;
+
+    public RetryableWritesTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+                               final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = getDefaultDatabaseName();
+        this.collectionName = filename.substring(0, filename.lastIndexOf("."));
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+    }
+
+    @AfterClass
+    public static void afterClass() {
+    }
+
+    @Before
+    @Override
+    public void setUp() {
+        assumeFalse(skipTest);
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+        BsonDocument clientOptions = definition.getDocument("clientOptions", new BsonDocument());
+        MongoClientSettings.Builder builder = getMongoClientBuilderFromConnectionString();
+        if (clientOptions.containsKey("retryWrites")) {
+            builder.retryWrites(clientOptions.getBoolean("retryWrites").getValue());
+        }
+        mongoClient = MongoClients.create(builder.build());
+
+        List<BsonDocument> documents = new ArrayList<BsonDocument>();
+        for (BsonValue document : data) {
+            documents.add(document.asDocument());
+        }
+
+        collectionHelper.drop();
+        collectionHelper.insertDocuments(documents);
+
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+        if (collectionHelper != null && definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(new BsonDocument("configureFailPoint",
+                    definition.getDocument("failPoint").getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        BsonDocument operation = definition.getDocument("operation");
+        BsonDocument outcome = definition.getDocument("outcome");
+
+        BsonDocument result = new BsonDocument();
+        boolean wasException = false;
+        Exception raisedException = null;
+        try {
+            result = helper.getOperationResults(operation);
+        } catch (Exception e) {
+            wasException = true;
+            raisedException = e;
+        }
+
+        if (outcome.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+            assertEquals(outcome.containsKey("error"), wasException);
+        } else if (wasException) {
+            fail("Unexpected exception: " + raisedException);
+        } else {
+            BsonDocument fixedExpectedResult = outcome.getDocument("result", new BsonDocument());
+            assertEquals(fixedExpectedResult, result.getDocument("result", new BsonDocument()));
+        }
+
+        if (outcome.containsKey("collection")) {
+            FutureResultCallback<List<BsonDocument>> futureResultCallback = new FutureResultCallback<List<BsonDocument>>();
+            collection.withDocumentClass(BsonDocument.class).find().into(new ArrayList<BsonDocument>(), futureResultCallback);
+            assertEquals(outcome.getDocument("collection").getArray("data").getValues(), futureResult(futureResultCallback));
+        }
+
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/retryable-writes")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getArray("data"), test.asDocument(),
+                        !isDiscoverableReplicaSet() || skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+    <T> T futureResult(final FutureResultCallback<T> callback) {
+        try {
+            return callback.get();
+        } catch (Throwable t) {
+            throw new MongoException("FutureResultCallback failed", t);
+        }
+    }
+
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/SessionsTest.java b/driver-async/src/test/functional/com/mongodb/async/client/SessionsTest.java
new file mode 100644
index 00000000000..2518b4a7820
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/SessionsTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+
+// See https://github.com/mongodb/specifications/tree/master/source/sessions/tests
+@RunWith(Parameterized.class)
+public class SessionsTest extends AbstractUnifiedTest {
+    public SessionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+                        final boolean skipTest) {
+        super(filename, description, data, definition, skipTest);
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/sessions")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/SmokeTestSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/SmokeTestSpecification.groovy
index 5ffd6087016..aa0663812fc 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/SmokeTestSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/SmokeTestSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,12 @@
 package com.mongodb.async.client
 
 import com.mongodb.MongoNamespace
-import com.mongodb.async.FutureResultCallback
 import org.bson.Document
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.async.client.Fixture.getMongoClient
 import static com.mongodb.async.client.Fixture.isSharded
-import static java.util.Arrays.asList
-import static java.util.concurrent.TimeUnit.SECONDS
+import static com.mongodb.async.client.TestHelper.run
 
 class SmokeTestSpecification extends FunctionalSpecification {
 
@@ -76,7 +73,6 @@ class SmokeTestSpecification extends FunctionalSpecification {
         run(collection.distinct('id', String).&into, []) == ['a', 'b', 'c']
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should aggregate to collection'() {
         given:
         def mongoClient = getMongoClient()
@@ -118,6 +114,7 @@ class SmokeTestSpecification extends FunctionalSpecification {
 
         then:
         batchCursor.getBatchSize() == 0
+        batchCursor.close()
 
         when: 'The collection name should be in the collections list'
         def collectionNames = run(database.listCollections().&into, [])
@@ -179,12 +176,4 @@ class SmokeTestSpecification extends FunctionalSpecification {
         !run(database.listCollectionNames().&into, []).contains(collectionName)
         run(database.listCollectionNames().&into, []).contains(newCollectionName)
     }
-
-    def run(operation, ... args) {
-        def futureResultCallback = new FutureResultCallback()
-        def opArgs = (args != null) ? args : []
-        operation.call(*opArgs + futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-    }
-
 }
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/TargetDocument.java b/driver-async/src/test/functional/com/mongodb/async/client/TargetDocument.java
index 9ba7ae78b6a..e2813bfc4e4 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/TargetDocument.java
+++ b/driver-async/src/test/functional/com/mongodb/async/client/TargetDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/TestHelper.groovy b/driver-async/src/test/functional/com/mongodb/async/client/TestHelper.groovy
new file mode 100644
index 00000000000..d4eb03d0f44
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/TestHelper.groovy
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client
+
+import com.mongodb.async.AsyncBatchCursor
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.SingleResultCallback
+
+import java.util.concurrent.TimeUnit
+
+class TestHelper {
+    static run(operation, ... args) {
+        runOp(operation, 60, *args)
+    }
+
+    static runSlow(operation, ... args) {
+        runOp(operation, 180, *args)
+    }
+
+    static runOp(operation, timeout, ... args) {
+        FutureResultCallback futureResultCallback = new FutureResultCallback()
+        List opArgs = (args != null) ? args : []
+        operation.call(*opArgs + futureResultCallback)
+        futureResultCallback.get(timeout, TimeUnit.SECONDS)
+    }
+
+    static <T> T execute(final Closure<T> method, final ClientSession session, ... args) {
+        List opArgs = (args != null) ? args : []
+        if (session != null) {
+            opArgs = [session, *opArgs]
+        }
+        if (method.getParameterTypes().last() == SingleResultCallback) {
+            runOp(method, 60, *opArgs)
+        } else {
+            method.call(*opArgs)
+        }
+    }
+
+    static <T> void execute(final MongoIterable method) {
+        method.batchCursor(new SingleResultCallback<AsyncBatchCursor>() {
+            @Override
+            void onResult(final AsyncBatchCursor result, final Throwable t) {
+            }
+        })
+    }
+
+    static <T> MongoIterable<T> createIterable(final Closure<T> method, ClientSession session, ... args) {
+        List opArgs = (args != null) ? args : []
+        if (session != null) {
+            opArgs = [session, *opArgs]
+        }
+        method.call(*opArgs)
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/TransactionFailureTest.java b/driver-async/src/test/functional/com/mongodb/async/client/TransactionFailureTest.java
new file mode 100644
index 00000000000..2b0ea2c79ce
--- /dev/null
+++ b/driver-async/src/test/functional/com/mongodb/async/client/TransactionFailureTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.MongoClientException;
+import com.mongodb.async.FutureResultCallback;
+import org.bson.Document;
+import org.junit.Before;
+import org.junit.Test;
+
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.serverVersionLessThan;
+import static org.junit.Assume.assumeTrue;
+
+public class TransactionFailureTest extends DatabaseTestCase {
+    public TransactionFailureTest() {
+    }
+
+    @Before
+    public void setUp() {
+        assumeTrue(canRunTests());
+        super.setUp();
+    }
+
+    @Test(expected = MongoClientException.class)
+    public void testTransactionFails() throws InterruptedException {
+        final ClientSession clientSession = createSession();
+
+        try {
+            clientSession.startTransaction();
+
+            FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
+            collection.insertOne(clientSession, Document.parse("{_id: 1, a: 1}"), futureResultCallback);
+            futureResultCallback.get();
+        } finally {
+            clientSession.close();
+        }
+    }
+
+    private ClientSession createSession() {
+        final ClientSessionOptions options = ClientSessionOptions.builder().build();
+        return new MongoOperation<ClientSession>() {
+            @Override
+            public void execute() {
+                client.startSession(options, getCallback());
+            }
+        }.get();
+    }
+
+
+    private boolean canRunTests() {
+        return serverVersionLessThan("4.0")
+                || (serverVersionLessThan("4.1.0") && isSharded());
+    }
+}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSBucketSmokeTestSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
index 7f152fe95d1..b5e8876693e 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,13 +37,14 @@ import java.nio.ByteBuffer
 import java.security.MessageDigest
 import java.security.SecureRandom
 
-import static GridFSTestHelper.run
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.async.client.Fixture.getMongoClient
-import static com.mongodb.async.client.gridfs.GridFSTestHelper.runSlow
+import static com.mongodb.async.client.TestHelper.run
+import static com.mongodb.async.client.TestHelper.runSlow
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncOutputStream
 import static com.mongodb.client.model.Filters.eq
+import static com.mongodb.client.model.Updates.unset
 import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
 import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
 
@@ -77,14 +78,15 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         def content = multiChunk ? multiChunkString : singleChunkString
         def contentBytes = content as byte[]
         def expectedLength = contentBytes.length
-        def expectedMD5 = MessageDigest.getInstance('MD5').digest(contentBytes).encodeHex().toString()
+        def expectedMD5 = md5Disabled ? null : MessageDigest.getInstance('MD5').digest(contentBytes).encodeHex().toString()
+        def bucket = gridFSBucket.withDisableMD5(md5Disabled)
         ObjectId fileId
 
         when:
         if (direct) {
-            fileId = run(gridFSBucket.&uploadFromStream, 'myFile', toAsyncInputStream(content.getBytes()));
+            fileId = run(bucket.&uploadFromStream, 'myFile', toAsyncInputStream(content.getBytes()));
         } else {
-            def outputStream = gridFSBucket.openUploadStream('myFile')
+            def outputStream = bucket.openUploadStream('myFile')
             run(outputStream.&write, ByteBuffer.wrap(contentBytes))
             run(outputStream.&close)
             fileId = outputStream.getObjectId()
@@ -95,11 +97,11 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         run(chunksCollection.&count) == chunkCount
 
         when:
-        def fileInfo = run(gridFSBucket.find().filter(eq('_id', fileId)).&first)
+        def fileInfo = run(bucket.find().filter(eq('_id', fileId)).&first)
 
         then:
         fileInfo.getId().getValue() == fileId
-        fileInfo.getChunkSize() == gridFSBucket.getChunkSizeBytes()
+        fileInfo.getChunkSize() == bucket.getChunkSizeBytes()
         fileInfo.getLength() == expectedLength
         fileInfo.getMD5() == expectedMD5
         fileInfo.getMetadata() == null
@@ -107,10 +109,10 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         when:
         def byteBuffer = ByteBuffer.allocate(fileInfo.getLength() as int)
         if (direct) {
-            run(gridFSBucket.openDownloadStream(fileId).&read, byteBuffer)
+            run(bucket.openDownloadStream(fileId).&read, byteBuffer)
         } else {
             def outputStream = toAsyncOutputStream(byteBuffer)
-            run(gridFSBucket.&downloadToStream, fileId, outputStream)
+            run(bucket.&downloadToStream, fileId, outputStream)
             run(outputStream.&close)
         }
 
@@ -118,11 +120,13 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         byteBuffer.array() == contentBytes
 
         where:
-        description              | multiChunk | chunkCount | direct
-        'a small file directly'  | false      | 1          | true
-        'a small file to stream' | false      | 1          | false
-        'a large file directly'  | true       | 5          | true
-        'a large file to stream' | true       | 5          | false
+        description                     | multiChunk | chunkCount | direct | md5Disabled
+        'a small file directly'         | false      | 1          | true   | false
+        'a small file to stream'        | false      | 1          | false  | false
+        'a large file directly'         | true       | 5          | true   | false
+        'a large file to stream'        | true       | 5          | false  | false
+        'a small file directly no md5'  | false      | 1          | true   | true
+        'a small file to stream no md5' | false      | 1          | false  | true
     }
 
     @Category(Slow)
@@ -226,7 +230,7 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         given:
         def contentBytes = new byte[9000];
         new SecureRandom().nextBytes(contentBytes);
-        def bufferSize = 3000
+        def bufferSize = 2000
         def options = new GridFSUploadOptions().chunkSizeBytes(4000)
 
         when:
@@ -262,11 +266,29 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         then:
         read == bufferSize
 
+        when:
+        fileBuffer.put(byteBuffer.array())
+        totalRead += read
+        read = run(downloadStream.&read, byteBuffer.clear())
+        then:
+        read == bufferSize
+
         when:
         fileBuffer.put(byteBuffer.array())
         totalRead += read
         read = run(downloadStream.&read, byteBuffer.clear())
 
+        then:
+        read == 1000
+
+        when:
+        def remaining = new byte[read]
+        byteBuffer.flip()
+        byteBuffer.get(remaining, 0, 1000)
+        fileBuffer.put(remaining)
+        totalRead += read
+        read = run(downloadStream.&read, byteBuffer.clear())
+
         then:
         read == -1
 
@@ -493,5 +515,47 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         then:
         fileAsDocument.getDocument('metadata').getBinary('uuid').getType() == 4 as byte
     }
+
+    @Unroll
+    def 'should handle missing file name data when downloading #description'() {
+        given:
+        def content = multiChunkString
+        def contentBytes = content as byte[]
+        ObjectId fileId
+
+        when:
+        if (direct) {
+            fileId = run(gridFSBucket.&uploadFromStream, 'myFile', toAsyncInputStream(content.getBytes()));
+        } else {
+            def outputStream = gridFSBucket.openUploadStream('myFile')
+            run(outputStream.&write, ByteBuffer.wrap(contentBytes))
+            run(outputStream.&close)
+            fileId = outputStream.getObjectId()
+        }
+
+        then:
+        run(filesCollection.&count) == 1
+
+        when:
+        // Remove filename
+        run(filesCollection.&updateOne, eq('_id', fileId), unset('filename'))
+
+        def byteBuffer = ByteBuffer.allocate(contentBytes.length)
+        if (direct) {
+            run(gridFSBucket.openDownloadStream(fileId).&read, byteBuffer)
+        } else {
+            def outputStream = toAsyncOutputStream(byteBuffer)
+            run(gridFSBucket.&downloadToStream, fileId, outputStream)
+            run(outputStream.&close)
+        }
+
+        then:
+        byteBuffer.array() == contentBytes
+
+        where:
+        description | direct
+        'directly'  | true
+        'a stream'  | false
+    }
 }
 
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTest.java b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTest.java
index af02cfe256a..7a01b94df59 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTest.java
+++ b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,7 @@
 import com.mongodb.async.client.DatabaseTestCase;
 import com.mongodb.async.client.Fixture;
 import com.mongodb.async.client.MongoCollection;
+import com.mongodb.async.client.MongoOperation;
 import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
 import com.mongodb.client.gridfs.model.GridFSUploadOptions;
 import com.mongodb.client.result.DeleteResult;
@@ -38,9 +39,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import util.Hex;
 import util.JsonPoweredTestHelper;
 
-import javax.xml.bind.DatatypeConverter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -54,7 +55,6 @@
 import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream;
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncOutputStream;
-import static javax.xml.bind.DatatypeConverter.printHexBinary;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -279,7 +279,7 @@ public void execute() {
 
         if (assertion.containsKey("result")) {
             assertNull("Should not have thrown an exception", error);
-            assertEquals(printHexBinary(outputStream.toByteArray()).toLowerCase(),
+            assertEquals(Hex.encode(outputStream.toByteArray()).toLowerCase(),
                     assertion.getDocument("result").getString("$hex").getValue());
         } else if (assertion.containsKey("error")) {
             assertNotNull("Should have thrown an exception", error);
@@ -311,7 +311,7 @@ public void execute() {
         }
         if (assertion.containsKey("result")) {
             assertNull("Should not have thrown an exception", error);
-            assertEquals(printHexBinary(outputStream.toByteArray()).toLowerCase(),
+            assertEquals(Hex.encode(outputStream.toByteArray()).toLowerCase(),
                     assertion.getDocument("result").getString("$hex").getValue());
         } else if (assertion.containsKey("error")) {
             assertNotNull("Should have thrown an exception", error);
@@ -326,6 +326,7 @@ private void doUpload(final BsonDocument rawArguments, final BsonDocument assert
             final String filename = arguments.getString("filename").getValue();
             final InputStream inputStream = new ByteArrayInputStream(arguments.getBinary("source").getData());
             final GridFSUploadOptions options = new GridFSUploadOptions();
+            GridFSBucket bucket = gridFSBucket;
             BsonDocument rawOptions = arguments.getDocument("options", new BsonDocument());
             if (rawOptions.containsKey("chunkSizeBytes")) {
                 options.chunkSizeBytes(rawOptions.getInt32("chunkSizeBytes").getValue());
@@ -333,11 +334,15 @@ private void doUpload(final BsonDocument rawArguments, final BsonDocument assert
             if (rawOptions.containsKey("metadata")) {
                 options.metadata(Document.parse(rawOptions.getDocument("metadata").toJson()));
             }
+            if (rawOptions.containsKey("disableMD5")) {
+                bucket = bucket.withDisableMD5(rawOptions.getBoolean("disableMD5").getValue());
+            }
+            final GridFSBucket gridFSUploadBucket = bucket;
 
             objectId = new MongoOperation<ObjectId>() {
                 @Override
                 public void execute() {
-                    gridFSBucket.uploadFromStream(filename, toAsyncInputStream(inputStream), options, getCallback());
+                    gridFSUploadBucket.uploadFromStream(filename, toAsyncInputStream(inputStream), options, getCallback());
                 }
             }.get();
         } catch (Throwable e) {
@@ -404,7 +409,7 @@ private long getChunksCount(final BsonDocument filter) {
         return new MongoOperation<Long>() {
             @Override
             public void execute() {
-                chunksCollection.count(filter, getCallback());
+                chunksCollection.countDocuments(filter, getCallback());
             }
         }.get();
     }
@@ -413,7 +418,7 @@ private long getFilesCount(final BsonDocument filter) {
         return new MongoOperation<Long>() {
             @Override
             public void execute() {
-                filesCollection.count(filter, getCallback());
+                filesCollection.countDocuments(filter, getCallback());
             }
         }.get();
     }
@@ -455,7 +460,7 @@ private BsonDocument parseHexDocument(final BsonDocument document) {
 
     private BsonDocument parseHexDocument(final BsonDocument document, final String hexDocument) {
         if (document.containsKey(hexDocument) && document.get(hexDocument).isDocument()) {
-            byte[] bytes = DatatypeConverter.parseHexBinary(document.getDocument(hexDocument).getString("$hex").getValue());
+            byte[] bytes = Hex.decode(document.getDocument(hexDocument).getString("$hex").getValue());
             document.put(hexDocument, new BsonBinary(bytes));
         }
         return document;
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTestHelper.groovy b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTestHelper.groovy
deleted file mode 100644
index d00b16a0737..00000000000
--- a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/GridFSTestHelper.groovy
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.async.client.gridfs
-
-import com.mongodb.async.FutureResultCallback
-
-import java.nio.ByteBuffer
-import java.nio.channels.AsynchronousByteChannel
-import java.nio.channels.CompletionHandler
-import java.util.concurrent.Future
-
-import static java.util.concurrent.TimeUnit.SECONDS
-
-class GridFSTestHelper {
-
-    static run(operation, ... args) {
-        runOp(operation, 60, *args)
-    }
-
-    static runSlow(operation, ... args) {
-        runOp(operation, 180, *args)
-    }
-
-    static runOp(operation, timeout, ... args) {
-        FutureResultCallback futureResultCallback = new FutureResultCallback()
-        List opArgs = (args != null) ? args : []
-        operation.call(*opArgs + futureResultCallback)
-        futureResultCallback.get(timeout, SECONDS)
-    }
-
-    static class TestAsynchronousByteChannel implements AsynchronousByteChannel, Closeable {
-        private boolean closed
-        private final readBuffer
-        private final writeBuffer = ByteBuffer.allocate(1024)
-
-        TestAsynchronousByteChannel(final readBuffer) {
-            this.readBuffer = readBuffer
-        }
-
-        ByteBuffer getReadBuffer() {
-            readBuffer.flip()
-        }
-
-        ByteBuffer getWriteBuffer() {
-            writeBuffer.flip()
-        }
-
-        @Override
-        <A> void read(final ByteBuffer dst, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
-            int transferAmount = Math.min(dst.remaining(), readBuffer.remaining());
-            if (transferAmount == 0 ) {
-                transferAmount = -1
-            }
-            if (transferAmount > 0) {
-                ByteBuffer temp = readBuffer.duplicate()
-                temp.limit(temp.position() + transferAmount)
-                dst.put(temp)
-                readBuffer.position(readBuffer.position() + transferAmount)
-            }
-            handler.completed(transferAmount, attachment)
-        }
-
-        @Override
-        Future<Integer> read(final ByteBuffer dst) {
-            throw new UnsupportedOperationException('Not Supported')
-        }
-
-        @Override
-        <A> void write(final ByteBuffer src, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
-            int transferAmount = Math.min(src.remaining(), writeBuffer.remaining());
-            if (transferAmount == 0 ) {
-                transferAmount = -1
-            }
-            if (transferAmount > 0) {
-                ByteBuffer temp = src.duplicate()
-                temp.limit(temp.position() + transferAmount)
-                writeBuffer.put(temp)
-            }
-            handler.completed(transferAmount, attachment)
-        }
-
-        @Override
-        Future<Integer> write(final ByteBuffer src) {
-            throw new UnsupportedOperationException('Not Supported')
-        }
-
-        @Override
-        void close() throws IOException {
-            closed = true
-        }
-
-        @Override
-        boolean isOpen() {
-            !closed;
-        }
-    }
-}
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelperTestSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelperTestSpecification.groovy
index 9aa4ce70aaf..ebe46c74d08 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelperTestSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsyncStreamHelperTestSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer
 
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.async.client.Fixture.getMongoClient
-import static com.mongodb.async.client.gridfs.GridFSTestHelper.run
+import static com.mongodb.async.client.TestHelper.run
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream
 import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncOutputStream
 
@@ -87,7 +87,6 @@ class AsyncStreamHelperTestSpecification extends FunctionalSpecification {
         content                             | new byte[content.length]
         ByteBuffer.wrap(content)            | ByteBuffer.allocate(content.length)
         new ByteArrayInputStream(content)   | new ByteArrayOutputStream(content.length)
-
     }
 
     def 'should accept data bigger than the chunkSize'() {
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelperSmokeTestSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelperSmokeTestSpecification.groovy
index 5d410d515d8..30471f9b1be 100644
--- a/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelperSmokeTestSpecification.groovy
+++ b/driver-async/src/test/functional/com/mongodb/async/client/gridfs/helpers/AsynchronousChannelHelperSmokeTestSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,19 +21,27 @@ import com.mongodb.async.client.MongoCollection
 import com.mongodb.async.client.MongoDatabase
 import com.mongodb.async.client.gridfs.GridFSBucket
 import com.mongodb.async.client.gridfs.GridFSBucketImpl
-import com.mongodb.async.client.gridfs.GridFSTestHelper
 import org.bson.Document
 import spock.lang.Requires
 
 import java.nio.ByteBuffer
-import java.nio.channels.*  // Wildcard import to work around Java 1.6
-import java.nio.file.*      // Wildcard import to work around Java 1.6
+import java.nio.channels.AsynchronousByteChannel
+import java.nio.channels.AsynchronousFileChannel
+import java.nio.channels.CompletionHandler
+import java.nio.file.Files
+
+// Wildcard import to work around Java 1.6
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.nio.file.StandardOpenOption
+import java.util.concurrent.Future
 
-import static GridFSTestHelper.TestAsynchronousByteChannel
-import static GridFSTestHelper.run
 import static com.mongodb.async.client.Fixture.getDefaultDatabaseName
 import static com.mongodb.async.client.Fixture.getMongoClient
+import static com.mongodb.async.client.TestHelper.run
 import static com.mongodb.async.client.gridfs.helpers.AsynchronousChannelHelper.channelToInputStream
+
+// Wildcard import to work around Java 1.6
 import static com.mongodb.async.client.gridfs.helpers.AsynchronousChannelHelper.channelToOutputStream
 
 @Requires({ javaVersion >= 1.7 })
@@ -47,7 +55,7 @@ class AsynchronousChannelHelperSmokeTestSpecification extends FunctionalSpecific
         mongoDatabase = getMongoClient().getDatabase(getDefaultDatabaseName())
         filesCollection = mongoDatabase.getCollection('fs.files')
         chunksCollection = mongoDatabase.getCollection('fs.chunks')
-        GridFSTestHelper.run(filesCollection.&drop)
+        run(filesCollection.&drop)
         run(chunksCollection.&drop)
         gridFSBucket = new GridFSBucketImpl(mongoDatabase)
     }
@@ -109,4 +117,70 @@ class AsynchronousChannelHelperSmokeTestSpecification extends FunctionalSpecific
         content == asyncByteChannel.getWriteBuffer()
     }
 
+    static class TestAsynchronousByteChannel implements AsynchronousByteChannel, Closeable {
+        private boolean closed
+        private final readBuffer
+        private final writeBuffer = ByteBuffer.allocate(1024)
+
+        TestAsynchronousByteChannel(final readBuffer) {
+            this.readBuffer = readBuffer
+        }
+
+        ByteBuffer getReadBuffer() {
+            readBuffer.flip()
+        }
+
+        ByteBuffer getWriteBuffer() {
+            writeBuffer.flip()
+        }
+
+        @Override
+        <A> void read(final ByteBuffer dst, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
+            int transferAmount = Math.min(dst.remaining(), readBuffer.remaining());
+            if (transferAmount == 0) {
+                transferAmount = -1
+            }
+            if (transferAmount > 0) {
+                ByteBuffer temp = readBuffer.duplicate()
+                temp.limit(temp.position() + transferAmount)
+                dst.put(temp)
+                readBuffer.position(readBuffer.position() + transferAmount)
+            }
+            handler.completed(transferAmount, attachment)
+        }
+
+        @Override
+        Future<Integer> read(final ByteBuffer dst) {
+            throw new UnsupportedOperationException('Not Supported')
+        }
+
+        @Override
+        <A> void write(final ByteBuffer src, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
+            int transferAmount = Math.min(src.remaining(), writeBuffer.remaining());
+            if (transferAmount == 0) {
+                transferAmount = -1
+            }
+            if (transferAmount > 0) {
+                ByteBuffer temp = src.duplicate()
+                temp.limit(temp.position() + transferAmount)
+                writeBuffer.put(temp)
+            }
+            handler.completed(transferAmount, attachment)
+        }
+
+        @Override
+        Future<Integer> write(final ByteBuffer src) {
+            throw new UnsupportedOperationException('Not Supported')
+        }
+
+        @Override
+        void close() throws IOException {
+            closed = true
+        }
+
+        @Override
+        boolean isOpen() {
+            !closed;
+        }
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/AggregateIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/AggregateIterableSpecification.groovy
index 6bfc71bc6f0..5e51916a453 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/AggregateIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/AggregateIterableSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,12 +21,14 @@ import com.mongodb.Function
 import com.mongodb.MongoException
 import com.mongodb.MongoNamespace
 import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
+import com.mongodb.client.model.AggregationLevel
+import com.mongodb.client.model.Collation
 import com.mongodb.operation.AggregateOperation
 import com.mongodb.operation.AggregateToCollectionOperation
-import com.mongodb.operation.AsyncOperationExecutor
 import com.mongodb.operation.FindOperation
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -51,6 +53,8 @@ class AggregateIterableSpecification extends Specification {
     def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
     def readPreference = secondary()
     def readConcern = ReadConcern.DEFAULT
+    def writeConcern = WriteConcern.MAJORITY
+    def collation = Collation.builder().locale('en').build()
 
     def 'should build the expected AggregationOperation'() {
         given:
@@ -61,8 +65,8 @@ class AggregateIterableSpecification extends Specification {
         }
         def executor = new TestOperationExecutor([cursor, cursor, cursor, cursor, cursor]);
         def pipeline = [new Document('$match', 1)]
-        def aggregationIterable = new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, pipeline)
+        def aggregationIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                writeConcern, executor, pipeline, AggregationLevel.COLLECTION, true)
 
         when: 'default input should be as expected'
         aggregationIterable.into([]) { result, t -> }
@@ -72,23 +76,35 @@ class AggregateIterableSpecification extends Specification {
 
         then:
         expect operation, isTheSameAs(new AggregateOperation<Document>(namespace, [new BsonDocument('$match', new BsonInt32(1))],
-                new DocumentCodec()));
+                new DocumentCodec()).retryReads(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
-        aggregationIterable.maxTime(999, MILLISECONDS).useCursor(true).into([]) { result, t -> }
+        aggregationIterable
+                .maxAwaitTime(99, MILLISECONDS)
+                .maxTime(999, MILLISECONDS)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .useCursor(true)
+                .into([]) { result, t -> }
 
         operation = executor.getReadOperation() as AggregateOperation<Document>
 
         then: 'should use the overrides'
         expect operation, isTheSameAs(new AggregateOperation<Document>(namespace, [new BsonDocument('$match', new BsonInt32(1))],
                 new DocumentCodec())
+                .maxAwaitTime(99, MILLISECONDS)
                 .maxTime(999, MILLISECONDS)
-                .useCursor(true))
-
+                .useCursor(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+                .retryReads(true)
+        )
     }
 
-    def 'should build the expected AggregateToCollectionOperation'() {
+    def 'should build the expected AggregateToCollectionOperation for $out'() {
         given:
         def cursor = Stub(AsyncBatchCursor) {
             next(_) >> {
@@ -101,40 +117,245 @@ class AggregateIterableSpecification extends Specification {
         def pipeline = [new Document('$match', 1), new Document('$out', collectionName)]
 
         when: 'aggregation includes $out'
-        new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor, pipeline)
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, true)
+                .batchSize(99)
+                .maxAwaitTime(99, MILLISECONDS)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .into([]) { result, t -> }
+
+        def operation = executor.getReadOperation() as WriteOperationThenCursorReadOperation
+
+        then: 'should use the overrides'
+        expect operation.getAggregateToCollectionOperation(), isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))],
+                readConcern, writeConcern)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = operation.getReadOperation() as FindOperation
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getCollation() == collation
+        operation.getBatchSize() == 99
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'aggregation includes $out and is at the database level'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.DATABASE, true)
                 .batchSize(99)
+                .maxAwaitTime(99, MILLISECONDS)
                 .maxTime(999, MILLISECONDS)
                 .allowDiskUse(true)
-                .useCursor(true).into([]) { result, t -> }
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .into([]) { result, t -> }
 
-        def operation = executor.getWriteOperation() as AggregateToCollectionOperation
+        operation = executor.getReadOperation() as WriteOperationThenCursorReadOperation
 
         then: 'should use the overrides'
+        expect operation.getAggregateToCollectionOperation(), isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))],
+                readConcern, writeConcern, AggregationLevel.DATABASE)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = operation.getReadOperation() as FindOperation
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getCollation() == collation
+        operation.getBatchSize() == 99
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'toCollection should work as expected'
+        def futureResultCallback = new FutureResultCallback()
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, true)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .toCollection(futureResultCallback)
+        futureResultCallback.get()
+
+        operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then:
         expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
-                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))])
+                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))],
+                readConcern, writeConcern)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
+    }
+
+    def 'should build the expected AggregateToCollectionOperation for $merge'() {
+        given:
+        def cursor = Stub(AsyncBatchCursor) {
+            next(_) >> {
+                it[0].onResult(null, null)
+            }
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor, cursor, cursor, cursor, cursor]);
+        def collectionName = 'collectionName'
+        def collectionNamespace = new MongoNamespace(namespace.getDatabaseName(), collectionName)
+        def pipeline = [new Document('$match', 1), new Document('$merge', new Document('into', collectionName))]
+        def pipelineWithIntoDocument = [new Document('$match', 1), new Document('$merge',
+                new Document('into', new Document('db', 'db2').append('coll', collectionName)))]
+
+        when: 'aggregation includes $merge'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, true)
+                .batchSize(99)
+                .maxAwaitTime(99, MILLISECONDS)
                 .maxTime(999, MILLISECONDS)
-                .allowDiskUse(true))
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .into([]) { result, t -> }
+
+        def operation = executor.getReadOperation() as WriteOperationThenCursorReadOperation
+
+        then: 'should use the overrides'
+        expect operation.getAggregateToCollectionOperation(), isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into', new BsonString(collectionName)))],
+                readConcern, writeConcern)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = operation.getReadOperation() as FindOperation
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getCollation() == collation
+        operation.getBatchSize() == 99
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'aggregation includes $merge into a different database'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipelineWithIntoDocument, AggregationLevel.COLLECTION, false)
+                .batchSize(99)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .into([]) { result, t -> }
+
+        operation = executor.getReadOperation() as WriteOperationThenCursorReadOperation
+
+        then: 'should use the overrides'
+        expect operation.getAggregateToCollectionOperation(), isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into',
+                         new BsonDocument('db', new BsonString('db2')).append('coll', new BsonString(collectionName))))],
+                readConcern, writeConcern,
+                AggregationLevel.COLLECTION)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+        )
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = operation.getReadOperation() as FindOperation
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == new MongoNamespace('db2', collectionName)
+        operation.getBatchSize() == 99
+        operation.getCollation() == collation
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'aggregation includes $out and is at the database level'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.DATABASE, true)
+                .batchSize(99)
+                .maxAwaitTime(99, MILLISECONDS)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .into([]) { result, t -> }
+
+        operation = executor.getReadOperation() as WriteOperationThenCursorReadOperation
+
+        then: 'should use the overrides'
+        expect operation.getAggregateToCollectionOperation(), isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into', new BsonString(collectionName)))],
+                readConcern, writeConcern,
+                AggregationLevel.DATABASE)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
 
         when: 'the subsequent read should have the batchSize set'
-        operation = executor.getReadOperation() as FindOperation<Document>
+        operation = operation.getReadOperation() as FindOperation
 
         then: 'should use the correct settings'
         operation.getNamespace() == collectionNamespace
+        operation.getCollation() == collation
         operation.getBatchSize() == 99
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
 
         when: 'toCollection should work as expected'
         def futureResultCallback = new FutureResultCallback()
-        new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor, pipeline)
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, true)
                 .allowDiskUse(true)
-                .toCollection(futureResultCallback);
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .toCollection(futureResultCallback)
         futureResultCallback.get()
 
         operation = executor.getWriteOperation() as AggregateToCollectionOperation
 
         then:
         expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
-                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))])
-                .allowDiskUse(true))
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into', new BsonString(collectionName)))],
+                readConcern, writeConcern)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
     }
 
     def 'should handle exceptions correctly'() {
@@ -142,8 +363,8 @@ class AggregateIterableSpecification extends Specification {
         def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
         def executor = new TestOperationExecutor([new MongoException('failure')])
         def pipeline = [new BsonDocument('$match', new BsonInt32(1))]
-        def aggregationIterable = new AggregateIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference, readConcern,
-                executor, pipeline)
+        def aggregationIterable = new AggregateIterableImpl(null, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, true)
 
         def futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
 
@@ -154,15 +375,16 @@ class AggregateIterableSpecification extends Specification {
         then: 'the future should handle the exception'
         thrown(MongoException)
 
-        when: 'toCollection should throw IllegalArgumentException when last state is not $out'
+        when: 'toCollection should throw IllegalStateException when last state is not $out'
         aggregationIterable.toCollection(new FutureResultCallback())
 
         then:
-        thrown(IllegalArgumentException)
+        thrown(IllegalStateException)
 
         when: 'a codec is missing'
         futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
-        new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference,  readConcern, executor, pipeline)
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,  readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, true)
                 .into([], futureResultCallback)
         futureResultCallback.get()
 
@@ -189,8 +411,9 @@ class AggregateIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, executor, [new BsonDocument('$match', new BsonInt32(1))])
+        def mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, [new BsonDocument('$match', new BsonInt32(1))],
+                AggregationLevel.COLLECTION, true)
 
         when:
         def results = new FutureResultCallback()
@@ -252,8 +475,9 @@ class AggregateIterableSpecification extends Specification {
 
     def 'should check variables using notNull'() {
         given:
-        def mongoIterable = new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, Stub(AsyncOperationExecutor), [Document.parse('{$match: 1}')])
+        def mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, Stub(OperationExecutor), [Document.parse('{$match: 1}')],
+                AggregationLevel.COLLECTION, true)
         def callback = Stub(SingleResultCallback)
         def block = Stub(Block)
         def target = Stub(List)
@@ -293,6 +517,32 @@ class AggregateIterableSpecification extends Specification {
 
         then:
         thrown(IllegalArgumentException)
+
+        when:
+        def results = new FutureResultCallback()
+        mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, Stub(OperationExecutor), [null], AggregationLevel.COLLECTION, true)
+        mongoIterable.into(target, results)
+        results.get()
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, Stub(OperationExecutor), [null], AggregationLevel.COLLECTION, true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
     }
 
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/AwaitingWriteOperationIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/AwaitingWriteOperationIterableSpecification.groovy
deleted file mode 100644
index 1d5c4c8a47f..00000000000
--- a/driver-async/src/test/unit/com/mongodb/async/client/AwaitingWriteOperationIterableSpecification.groovy
+++ /dev/null
@@ -1,338 +0,0 @@
-package com.mongodb.async.client
-
-import com.mongodb.Block
-import com.mongodb.MongoException
-import com.mongodb.async.AsyncBatchCursor
-import com.mongodb.async.FutureResultCallback
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.operation.AsyncOperationExecutor
-import com.mongodb.operation.AsyncWriteOperation
-import org.bson.Document
-import spock.lang.Specification
-
-class AwaitingWriteOperationIterableSpecification extends Specification {
-
-    def 'first should get first result when awaited operation has completed'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')])
-        def delegateIterable = Stub(MongoIterable) {
-            first(_) >> {
-                it[0].onResult(1, null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def callback = new FutureResultCallback()
-        awaitingIterable.first(callback)
-        def first = callback.get()
-
-        then:
-        first == 1
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        awaitingIterable.first(callback)
-        callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'first should get first result when awaited operation has not completed'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')], true) // queue execution
-        def delegateIterable = Stub(MongoIterable) {
-            first(_) >> {
-                it[0].onResult(1, null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def callback = new FutureResultCallback()
-        awaitingIterable.first(callback)
-        executor.proceedWithWrite()
-        def first = callback.get()
-
-        then:
-        first == 1
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        awaitingIterable.first(callback)
-        executor.proceedWithWrite()
-        callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'into should get results when awaited operation has completed'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')])
-        def delegateIterable = Stub(MongoIterable) {
-            into(_, _) >> {
-                it[1].onResult([1, 2], null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def callback = new FutureResultCallback()
-        awaitingIterable.into([], callback)
-        def list = callback.get()
-
-        then:
-        list == [1, 2]
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        awaitingIterable.into([], callback)
-        callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'into should get results when awaited operation has not completed'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')], true) // queue execution
-        def delegateIterable = Stub(MongoIterable) {
-            into(_, _) >> {
-                it[1].onResult([1, 2], null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def callback = new FutureResultCallback()
-        awaitingIterable.into([], callback)
-        executor.proceedWithWrite()
-        def first = callback.get()
-
-        then:
-        first == [1, 2]
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        awaitingIterable.into([], callback)
-        executor.proceedWithWrite()
-        callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'forEach should get results when awaited operation has completed'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')])
-        def delegateIterable = Stub(MongoIterable) {
-            forEach(_, _) >> {
-                it[0].apply(1)
-                it[0].apply(2)
-                it[1].onResult(null, null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def callback = new FutureResultCallback()
-        def list = []
-        awaitingIterable.forEach({ it -> list.add(it) }, callback)
-        callback.get()
-
-        then:
-        list == [1, 2]
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        list = []
-        awaitingIterable.forEach({ it -> list.add(it) }, callback)
-        callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'forEach should get results when awaited operation has not completed'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')], true) // queue execution
-        def delegateIterable = Stub(MongoIterable) {
-            forEach(_, _) >> {
-                it[0].apply(1)
-                it[0].apply(2)
-                it[1].onResult(null, null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def callback = new FutureResultCallback()
-        def list = []
-        awaitingIterable.forEach({ it -> list.add(it) }, callback)
-        executor.proceedWithWrite()
-        callback.get()
-
-        then:
-        list == [1, 2]
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        list = []
-        awaitingIterable.forEach({ it -> list.add(it) }, callback)
-        executor.proceedWithWrite()
-        callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'should map'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')], true)  // queue execution
-        def delegateIterable = Stub(MongoIterable) {
-            forEach(_, _) >> {
-                it[0].apply(1)
-                it[0].apply(2)
-                it[1].onResult(null, null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def mappingIterable = awaitingIterable.map { it -> it.toString() }
-        def callback = new FutureResultCallback()
-        mappingIterable.into([], callback)
-        executor.proceedWithWrite()
-        def list = callback.get()
-
-        then:
-        list == ['1', '2']
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        mappingIterable = awaitingIterable.map { it -> it.toString() }
-        mappingIterable.into([], callback)
-        executor.proceedWithWrite()
-        callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'batchCursor should get results when awaited operation has completed'() {
-        given:
-        def writeOp = Stub(AsyncWriteOperation)
-        def executor = new TestOperationExecutor(['Response', new MongoException('Failed')], true)  // queue execution
-        def cannedResults = [new Document('_id', 1), new Document('_id', 1), new Document('_id', 1)]
-        def cursor = {
-            Stub(AsyncBatchCursor) {
-                def count = 0
-                def results;
-                def getResult = {
-                    count++
-                    results = count == 1 ? cannedResults : null
-                    results
-                }
-                next(_) >> {
-                    it[0].onResult(getResult(), null)
-                }
-                isClosed() >> { count >= 1 }
-            }
-        }
-        def delegateIterable = Stub(MongoIterable) {
-            batchCursor(_) >> {
-                it[0].onResult(cursor(), null)
-            }
-        }
-
-        when: 'write operation succeeded'
-        def awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        def callback = new FutureResultCallback()
-        awaitingIterable.batchCursor(callback)
-        executor.proceedWithWrite()
-        def batchCursor = callback.get()
-
-        then:
-        !batchCursor.isClosed()
-
-        when:
-        callback = new FutureResultCallback()
-        batchCursor.next(callback)
-
-        then:
-        callback.get() == cannedResults
-        batchCursor.isClosed()
-
-        when: 'write operation failed'
-        awaitingIterable = new AwaitingWriteOperationIterable(writeOp, executor, delegateIterable)
-        callback = new FutureResultCallback()
-        awaitingIterable.batchCursor(callback)
-        executor.proceedWithWrite()
-        batchCursor = callback.get()
-
-        then:
-        thrown(MongoException)
-    }
-
-    def 'should check variables using notNull'() {
-        given:
-        def mongoIterable = new AwaitingWriteOperationIterable(Stub(AsyncWriteOperation), Stub(AsyncOperationExecutor),
-                Stub(MongoIterable))
-        def callback = Stub(SingleResultCallback)
-        def block = Stub(Block)
-        def target = Stub(List)
-
-        when:
-        mongoIterable.first(null)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        mongoIterable.into(null, callback)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        mongoIterable.into(target, null)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        mongoIterable.forEach(null, callback)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        mongoIterable.forEach(block, null)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        mongoIterable.map()
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-}
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/ChangeStreamIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/ChangeStreamIterableSpecification.groovy
new file mode 100644
index 00000000000..a60e7f68617
--- /dev/null
+++ b/driver-async/src/test/unit/com/mongodb/async/client/ChangeStreamIterableSpecification.groovy
@@ -0,0 +1,369 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.async.AsyncBatchCursor
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.changestream.ChangeStreamDocument
+import com.mongodb.client.model.changestream.ChangeStreamDocumentCodec
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import com.mongodb.client.model.changestream.FullDocument
+import com.mongodb.operation.ChangeStreamOperation
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonTimestamp
+import org.bson.Document
+import org.bson.RawBsonDocument
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class ChangeStreamIterableSpecification extends Specification {
+    def namespace = new MongoNamespace('db', 'coll')
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
+    def readPreference = secondary()
+    def readConcern = ReadConcern.DEFAULT
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should build the expected ChangeStreamOperation'() {
+        given:
+        def cursor = Stub(AsyncBatchCursor) {
+            next(_) >> {
+                it[0].onResult(null, null)
+            }
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor, cursor, cursor])
+        def pipeline = [new Document('$match', 1)]
+        def codec = new ChangeStreamDocumentCodec(Document, codecRegistry)
+        def changeStreamIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor,
+                pipeline, Document, ChangeStreamLevel.COLLECTION, true)
+
+        when: 'default input should be as expected'
+        changeStreamIterable.into([]) { result, t -> }
+
+        def operation = executor.getReadOperation() as ChangeStreamOperation<Document>
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new ChangeStreamOperation<Document>(namespace, FullDocument.DEFAULT,
+                [BsonDocument.parse('{$match: 1}')], codec, ChangeStreamLevel.COLLECTION).retryReads(true))
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        def resumeToken = RawBsonDocument.parse('{_id: {a: 1}}')
+        def startAtOperationTime = new BsonTimestamp(99)
+        changeStreamIterable.collation(collation).maxAwaitTime(99, MILLISECONDS)
+                .fullDocument(FullDocument.UPDATE_LOOKUP).resumeAfter(resumeToken).startAtOperationTime(startAtOperationTime)
+                .startAfter(resumeToken).into([]) { result, t -> }
+
+        operation = executor.getReadOperation() as ChangeStreamOperation<Document>
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new ChangeStreamOperation<Document>(namespace, FullDocument.UPDATE_LOOKUP,
+                [BsonDocument.parse('{$match: 1}')], codec, ChangeStreamLevel.COLLECTION)
+                .collation(collation).maxAwaitTime(99, MILLISECONDS)
+                .resumeAfter(resumeToken).startAtOperationTime(startAtOperationTime)
+                .startAfter(resumeToken).retryReads(true))
+    }
+
+    def 'should handle exceptions correctly'() {
+        given:
+        def altRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
+        def executor = new TestOperationExecutor([new MongoException('failure')])
+        def pipeline = [new BsonDocument('$match', new BsonInt32(1))]
+        def changeStreamIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor,
+                pipeline, BsonDocument, ChangeStreamLevel.COLLECTION, true)
+        def futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
+
+        when: 'The operation fails with an exception'
+        changeStreamIterable.into([], futureResultCallback)
+        futureResultCallback.get()
+
+        then:
+        thrown(MongoException)
+
+        when: 'a codec is missing'
+        futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
+        new ChangeStreamIterableImpl(null, namespace, altRegistry, readPreference, readConcern, executor, pipeline, Document,
+                ChangeStreamLevel.COLLECTION, true).into([], futureResultCallback)
+        futureResultCallback.get()
+
+        then:
+        thrown(CodecConfigurationException)
+
+        when: 'pipeline contains null'
+        futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
+        new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [null], Document
+                , ChangeStreamLevel.COLLECTION, true).into([], futureResultCallback)
+        futureResultCallback.get()
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def count = 0
+        def cannedResults = ['{_id: 1}', '{_id: 2}', '{_id: 3}'].collect {
+            new ChangeStreamDocument(RawBsonDocument.parse(it), new BsonDocument(), Document.parse(it),
+                    BsonDocument.parse(it), null, null, null)
+        }
+        def executor = new TestOperationExecutor([cursor(cannedResults), cursor(cannedResults), cursor(cannedResults),
+                                                  cursor(cannedResults), cursor(cannedResults)])
+        def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [],
+                Document, ChangeStreamLevel.COLLECTION, true)
+
+        when:
+        def results = new FutureResultCallback()
+        mongoIterable.first(results)
+
+        then:
+        results.get() == cannedResults[0]
+
+        when:
+        results = new FutureResultCallback()
+        mongoIterable.forEach(new Block<ChangeStreamDocument<Document>>() {
+            @Override
+            void apply(ChangeStreamDocument<Document> document) {
+                count++
+            }
+        }, results)
+        results.get()
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        results = new FutureResultCallback()
+        mongoIterable.into(target, results)
+
+        then:
+        results.get() == cannedResults
+
+        when:
+        target = []
+        results = new FutureResultCallback()
+        mongoIterable.map(new Function<ChangeStreamDocument<Document>, Integer>() {
+            @Override
+            Integer apply(ChangeStreamDocument<Document> document) {
+                document.getFullDocument().getInteger('_id')
+            }
+        }).into(target, results)
+        then:
+        results.get() == [1, 2, 3]
+
+        when:
+        results = new FutureResultCallback()
+        mongoIterable.batchCursor(results)
+        def batchCursor = results.get()
+
+        then:
+        !batchCursor.isClosed()
+
+        when:
+        results = new FutureResultCallback()
+        batchCursor.next(results)
+
+        then:
+        results.get() == cannedResults
+        batchCursor.isClosed()
+    }
+
+    def 'should be able to provide custom document class'() {
+        given:
+        def count = 0
+        def cannedResults = ['{_id: 1}', '{_id: 2}', '{_id: 3}'].collect { RawBsonDocument.parse(it) }
+        def executor = new TestOperationExecutor([cursor(cannedResults), cursor(cannedResults), cursor(cannedResults),
+                                                  cursor(cannedResults), cursor(cannedResults)])
+        def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [],
+                Document, ChangeStreamLevel.COLLECTION, true).withDocumentClass(RawBsonDocument)
+
+        when:
+        def results = new FutureResultCallback()
+        mongoIterable.first(results)
+
+        then:
+        results.get() == cannedResults[0]
+
+        when:
+        results = new FutureResultCallback()
+        mongoIterable.forEach(new Block<RawBsonDocument>() {
+            @Override
+            void apply(RawBsonDocument document) {
+                count++
+            }
+        }, results)
+        results.get()
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        results = new FutureResultCallback()
+        mongoIterable.into(target, results)
+
+        then:
+        results.get() == cannedResults
+
+        when:
+        target = []
+        results = new FutureResultCallback()
+        mongoIterable.map(new Function<RawBsonDocument, Integer>() {
+            @Override
+            Integer apply(RawBsonDocument document) {
+                document.getInt32('_id').intValue()
+            }
+        }).into(target, results)
+        then:
+        results.get() == [1, 2, 3]
+
+        when:
+        results = new FutureResultCallback()
+        mongoIterable.batchCursor(results)
+        def batchCursor = results.get()
+
+        then:
+        !batchCursor.isClosed()
+
+        when:
+        results = new FutureResultCallback()
+        batchCursor.next(results)
+
+        then:
+        results.get() == cannedResults
+        batchCursor.isClosed()
+    }
+
+    def 'should check variables using notNull'() {
+        given:
+        def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern,
+                Stub(OperationExecutor), [new BsonDocument('$match', new BsonInt32(1))], BsonDocument,
+                ChangeStreamLevel.COLLECTION, true)
+        def callback = Stub(SingleResultCallback)
+        def block = Stub(Block)
+        def target = Stub(List)
+
+        when:
+        mongoIterable.first(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        mongoIterable.into(null, callback)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        mongoIterable.into(target, null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        mongoIterable.forEach(null, callback)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        mongoIterable.forEach(block, null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        mongoIterable.map()
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def results = new FutureResultCallback()
+        mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern,
+                Stub(OperationExecutor), [null], BsonDocument, ChangeStreamLevel.COLLECTION, true)
+        mongoIterable.into(target, results)
+        results.get()
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern,
+                Stub(OperationExecutor), [BsonDocument.parse('{$match: 1}')], BsonDocument,
+                ChangeStreamLevel.COLLECTION, true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+
+        when:
+        def adaptedMongoIterable = mongoIterable.withDocumentClass(Document)
+
+        then:
+        adaptedMongoIterable.getBatchSize() == null
+
+        when:
+        adaptedMongoIterable.batchSize(batchSize)
+
+        then:
+        adaptedMongoIterable.getBatchSize() == batchSize
+    }
+
+    def cursor(List<?> cannedResults) {
+        Stub(AsyncBatchCursor) {
+            def count = 0
+            def results
+            def getResult = {
+                count++
+                results = count == 1 ? cannedResults : null
+                results
+            }
+            next(_) >> {
+                it[0].onResult(getResult(), null)
+            }
+            isClosed() >> { count >= 1 }
+        }
+    }
+
+}
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/ClientSessionBindingSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/ClientSessionBindingSpecification.groovy
new file mode 100644
index 00000000000..b56665d757b
--- /dev/null
+++ b/driver-async/src/test/unit/com/mongodb/async/client/ClientSessionBindingSpecification.groovy
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client
+
+import com.mongodb.ReadPreference
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.binding.AsyncClusterBinding
+import com.mongodb.binding.AsyncConnectionSource
+import com.mongodb.connection.Cluster
+import com.mongodb.connection.Server
+import com.mongodb.internal.binding.AsyncClusterAwareReadWriteBinding
+import com.mongodb.internal.session.ClientSessionContext
+import spock.lang.Specification
+
+class ClientSessionBindingSpecification extends Specification {
+    def 'should return the session context from the binding'() {
+        given:
+        def session = Stub(ClientSession)
+        def wrappedBinding = Stub(AsyncClusterAwareReadWriteBinding)
+        def binding = new ClientSessionBinding(session, false, wrappedBinding)
+
+        when:
+        def context = binding.getSessionContext()
+
+        then:
+        (context as ClientSessionContext).getClientSession() == session
+    }
+
+    def 'should return the session context from the connection source'() {
+        given:
+        def session = Stub(ClientSession)
+        def wrappedBinding = Mock(AsyncClusterAwareReadWriteBinding)
+        def binding = new ClientSessionBinding(session, false, wrappedBinding)
+
+        when:
+        def futureResultCallback = new FutureResultCallback<AsyncConnectionSource>()
+        binding.getReadConnectionSource(futureResultCallback)
+
+        then:
+        1 * wrappedBinding.getReadConnectionSource(_) >> {
+            it[0].onResult(Stub(AsyncConnectionSource), null)
+        }
+
+        when:
+        def context = futureResultCallback.get().getSessionContext()
+
+        then:
+        (context as ClientSessionContext).getClientSession() == session
+
+        when:
+        futureResultCallback = new FutureResultCallback<AsyncConnectionSource>()
+        binding.getWriteConnectionSource(futureResultCallback)
+
+        then:
+        1 * wrappedBinding.getWriteConnectionSource(_) >> {
+            it[0].onResult(Stub(AsyncConnectionSource), null)
+        }
+
+        when:
+        context = futureResultCallback.get().getSessionContext()
+
+        then:
+        (context as ClientSessionContext).getClientSession() == session
+    }
+
+    def 'should close client session when binding reference count drops to zero if it is owned by the binding'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+        def binding = new ClientSessionBinding(session, true, wrappedBinding)
+        binding.retain()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        binding.release()
+
+        then:
+        1 * session.close()
+    }
+
+    def 'should close client session when binding reference count drops to zero due to connection source if it is owned by the binding'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+        def binding = new ClientSessionBinding(session, true, wrappedBinding)
+        def futureResultCallback = new FutureResultCallback<AsyncConnectionSource>()
+        binding.getReadConnectionSource(futureResultCallback)
+        def readConnectionSource = futureResultCallback.get()
+        futureResultCallback = new FutureResultCallback<AsyncConnectionSource>()
+        binding.getWriteConnectionSource(futureResultCallback)
+        def writeConnectionSource = futureResultCallback.get()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        writeConnectionSource.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        readConnectionSource.release()
+
+        then:
+        1 * session.close()
+    }
+
+    def 'should not close client session when binding reference count drops to zero if it is not owned by the binding'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+        def binding = new ClientSessionBinding(session, false, wrappedBinding)
+        binding.retain()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+    }
+
+    def 'owned session is implicit'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+
+        when:
+        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
+
+        then:
+        binding.getSessionContext().isImplicitSession() == ownsSession
+
+        where:
+        ownsSession << [true, false]
+    }
+
+    private AsyncClusterAwareReadWriteBinding createStubBinding() {
+        def cluster = Mock(Cluster) {
+            selectServerAsync(_, _) >> {
+                it[1].onResult(Stub(Server), null)
+            }
+        }
+        new AsyncClusterBinding(cluster, ReadPreference.primary())
+    }
+}
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/DistinctIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/DistinctIterableSpecification.groovy
index a694c574005..b2422612ac9 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/DistinctIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/DistinctIterableSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +24,7 @@ import com.mongodb.ReadConcern
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
-import com.mongodb.operation.AsyncOperationExecutor
+import com.mongodb.client.model.Collation
 import com.mongodb.operation.DistinctOperation
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -48,6 +48,7 @@ class DistinctIterableSpecification extends Specification {
     def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
     def readPreference = secondary()
     def readConcern = ReadConcern.DEFAULT
+    def collation = Collation.builder().locale('en').build()
 
     def 'should build the expected DistinctOperation'() {
         given:
@@ -56,9 +57,9 @@ class DistinctIterableSpecification extends Specification {
                 it[0].onResult(null, null)
             }
         }
-        def executor = new TestOperationExecutor([cursor, cursor]);
-        def distinctIterable = new DistinctIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, 'field', new BsonDocument())
+        def executor = new TestOperationExecutor([cursor, cursor])
+        def distinctIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, 'field', new BsonDocument(), true)
 
         when: 'default input should be as expected'
         distinctIterable.into([]) { result, t -> }
@@ -67,26 +68,30 @@ class DistinctIterableSpecification extends Specification {
         def readPreference = executor.getReadPreference()
 
         then:
-        expect operation, isTheSameAs(new DistinctOperation<Document>(namespace, 'field', new DocumentCodec()).filter(new BsonDocument()));
+        expect operation, isTheSameAs(new DistinctOperation<Document>(namespace, 'field', new DocumentCodec())
+                .filter(new BsonDocument()).retryReads(true));
         readPreference == secondary()
 
         when: 'overriding initial options'
-        distinctIterable.filter(new Document('field', 1)).maxTime(999, MILLISECONDS).batchSize(99).into([]) { result, t -> }
+        distinctIterable.filter(new Document('field', 1)).maxTime(999, MILLISECONDS).batchSize(99)
+                .collation(collation).into([]) { result, t -> }
 
         operation = executor.getReadOperation() as DistinctOperation<Document>
 
         then: 'should use the overrides'
         expect operation, isTheSameAs(new DistinctOperation<Document>(namespace, 'field', new DocumentCodec())
                 .filter(new BsonDocument('field', new BsonInt32(1)))
-                .maxTime(999, MILLISECONDS))
+                .maxTime(999, MILLISECONDS)
+                .collation(collation)
+                .retryReads(true))
     }
 
     def 'should handle exceptions correctly'() {
         given:
         def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
         def executor = new TestOperationExecutor([new MongoException('failure')])
-        def distinctIterable = new DistinctIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference, readConcern,
-                executor, 'field', new BsonDocument())
+        def distinctIterable = new DistinctIterableImpl(null, namespace, Document, BsonDocument, codecRegistry, readPreference, readConcern,
+                executor, 'field', new BsonDocument(), true)
 
         def futureResultCallback = new FutureResultCallback()
 
@@ -126,8 +131,8 @@ class DistinctIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new DistinctIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, 'field', new BsonDocument())
+        def mongoIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, 'field', new BsonDocument(), true)
 
         when:
         def results = new FutureResultCallback()
@@ -189,8 +194,8 @@ class DistinctIterableSpecification extends Specification {
 
     def 'should check variables using notNull'() {
         given:
-        def mongoIterable = new DistinctIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, Stub(AsyncOperationExecutor), 'field', new BsonDocument())
+        def mongoIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, Stub(OperationExecutor), 'field', new BsonDocument(), true)
         def callback = Stub(SingleResultCallback)
         def block = Stub(Block)
         def target = Stub(List)
@@ -232,4 +237,20 @@ class DistinctIterableSpecification extends Specification {
         thrown(IllegalArgumentException)
     }
 
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                Stub(OperationExecutor), 'field', new BsonDocument(), true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/FindIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/FindIterableSpecification.groovy
index 27bb4a41f09..bb9975f3fd3 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/FindIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/FindIterableSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,16 +24,17 @@ import com.mongodb.ReadConcern
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
-import com.mongodb.client.model.FindOptions
-import com.mongodb.operation.AsyncOperationExecutor
+import com.mongodb.client.model.Collation
 import com.mongodb.operation.FindOperation
 import org.bson.BsonDocument
 import org.bson.BsonInt32
+import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.DocumentCodec
 import org.bson.codecs.DocumentCodecProvider
 import org.bson.codecs.ValueCodecProvider
+import org.bson.conversions.Bson
 import spock.lang.Specification
 
 import static com.mongodb.CustomMatchers.isTheSameAs
@@ -49,7 +50,9 @@ class FindIterableSpecification extends Specification {
     def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
     def readPreference = secondary()
     def readConcern = ReadConcern.DEFAULT
+    def collation = Collation.builder().locale('en').build()
 
+    @SuppressWarnings('deprecation')
     def 'should build the expected findOperation'() {
         given:
         def cursor = Stub(AsyncBatchCursor) {
@@ -57,8 +60,10 @@ class FindIterableSpecification extends Specification {
                 it[0].onResult(null, null)
             }
         }
-        def executor = new TestOperationExecutor([cursor, cursor]);
-        def findOptions = new FindOptions().sort(new Document('sort', 1))
+        def executor = new TestOperationExecutor([cursor, cursor, cursor])
+        def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
+                new Document('filter', 1), true)
+                .sort(new Document('sort', 1))
                 .modifiers(new Document('modifier', 1))
                 .projection(new Document('projection', 1))
                 .maxTime(10, SECONDS)
@@ -70,8 +75,15 @@ class FindIterableSpecification extends Specification {
                 .oplogReplay(false)
                 .noCursorTimeout(false)
                 .partial(false)
-        def findIterable = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
-                                                new Document('filter', 1), findOptions)
+                .collation(null)
+                .comment('my comment')
+                .hintString('a_1')
+                .min(new Document('min', 1))
+                .max(new Document('max', 1))
+                .maxScan(42L)
+                .returnKey(false)
+                .showRecordId(false)
+                .snapshot(false)
 
         when: 'default input should be as expected'
         findIterable.into([]) { result, t -> }
@@ -92,6 +104,15 @@ class FindIterableSpecification extends Specification {
                 .skip(10)
                 .cursorType(CursorType.NonTailable)
                 .slaveOk(true)
+                .comment('my comment')
+                .hint(new BsonString('a_1'))
+                .min(new BsonDocument('min', new BsonInt32(1)))
+                .max(new BsonDocument('max', new BsonInt32(1)))
+                .maxScan(42L)
+                .returnKey(false)
+                .showRecordId(false)
+                .snapshot(false)
+                .retryReads(true)
         )
         readPreference == secondary()
 
@@ -109,6 +130,15 @@ class FindIterableSpecification extends Specification {
                 .oplogReplay(true)
                 .noCursorTimeout(true)
                 .partial(true)
+                .collation(collation)
+                .comment('alt comment')
+                .hint(new Document('hint', 2))
+                .min(new Document('min', 2))
+                .max(new Document('max', 2))
+                .maxScan(88L)
+                .returnKey(true)
+                .showRecordId(true)
+                .snapshot(true)
                 .into([]) { result, t -> }
 
         operation = executor.getReadOperation() as FindOperation<Document>
@@ -129,7 +159,37 @@ class FindIterableSpecification extends Specification {
                 .noCursorTimeout(true)
                 .partial(true)
                 .slaveOk(true)
+                .collation(collation)
+                .comment('alt comment')
+                .hint(new BsonDocument('hint', new BsonInt32(2)))
+                .min(new BsonDocument('min', new BsonInt32(2)))
+                .max(new BsonDocument('max', new BsonInt32(2)))
+                .maxScan(88L)
+                .returnKey(true)
+                .showRecordId(true)
+                .snapshot(true)
+                .retryReads(true)
         )
+
+        when: 'passing nulls to nullable methods'
+        new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
+                new Document('filter', 1), true)
+                .filter(null as Bson)
+                .collation(null)
+                .modifiers(null)
+                .projection(null)
+                .sort(null as Bson)
+                .comment(null)
+                .hint(null)
+                .max(null as Bson)
+                .min(null as Bson)
+                .into([]) { result, t -> }
+
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should set an empty doc for the filter'
+        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
+                .filter(new BsonDocument()).slaveOk(true).retryReads(true))
     }
 
     def 'should handle mixed types'() {
@@ -139,10 +199,9 @@ class FindIterableSpecification extends Specification {
                 it[0].onResult(null, null)
             }
         }
-        def executor = new TestOperationExecutor([cursor]);
-        def findOptions = new FindOptions()
-        def findIterable = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
-                                                new Document('filter', 1), findOptions)
+        def executor = new TestOperationExecutor([cursor])
+        def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
+                new Document('filter', 1), true)
 
         when:
         findIterable.filter(new Document('filter', 1))
@@ -161,6 +220,7 @@ class FindIterableSpecification extends Specification {
                 .cursorType(CursorType.NonTailable)
                 .slaveOk(true)
                 .batchSize(100)
+                .retryReads(true)
         )
     }
 
@@ -182,10 +242,9 @@ class FindIterableSpecification extends Specification {
                 isClosed() >> { count >= 1 }
             }
         }
-        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()]);
-        def findOptions = new FindOptions()
-        def mongoIterable = new FindIterableImpl(new MongoNamespace('db', 'coll'), Document, Document, codecRegistry,
-                                                 readPreference, readConcern, executor, new Document(), findOptions)
+        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()])
+        def mongoIterable = new FindIterableImpl(null, new MongoNamespace('db', 'coll'), Document, Document, codecRegistry,
+                readPreference, readConcern, executor, new Document(), true)
 
         when:
         def results = new FutureResultCallback()
@@ -247,8 +306,8 @@ class FindIterableSpecification extends Specification {
 
     def 'should check variables using notNull'() {
         given:
-        def mongoIterable = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, Stub(AsyncOperationExecutor), new Document(), new FindOptions())
+        def mongoIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, Stub(OperationExecutor), new Document(), true)
         def callback = Stub(SingleResultCallback)
         def block = Stub(Block)
         def target = Stub(List)
@@ -289,4 +348,20 @@ class FindIterableSpecification extends Specification {
         then:
         thrown(IllegalArgumentException)
     }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, Stub(OperationExecutor), new Document(), true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/FlatteningSingleResultCallbackSubscriptionSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/FlatteningSingleResultCallbackSubscriptionSpecification.groovy
index 99ac3a763a8..c19af40aec0 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/FlatteningSingleResultCallbackSubscriptionSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/FlatteningSingleResultCallbackSubscriptionSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,9 @@ import com.mongodb.MongoException
 import com.mongodb.async.SingleResultCallback
 import spock.lang.Specification
 
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
 import static com.mongodb.async.client.Observables.observeAndFlatten
 
 class FlatteningSingleResultCallbackSubscriptionSpecification extends Specification {
@@ -45,7 +48,8 @@ class FlatteningSingleResultCallbackSubscriptionSpecification extends Specificat
 
     def 'should call onComplete after all data has been consumed'() {
         given:
-        SingleResultCallback<List> listSingleResultCallback
+        SingleResultCallback<List> listSingleResultCallback = null
+        def executor = Executors.newFixedThreadPool(5)
         def observer = new TestObserver()
         observeAndFlatten(new Block<SingleResultCallback<List>>() {
             @Override
@@ -64,12 +68,17 @@ class FlatteningSingleResultCallbackSubscriptionSpecification extends Specificat
         observer.assertNoTerminalEvent()
 
         when:
-        listSingleResultCallback.onResult([1, 2, 3, 4], null)
+        100.times { executor.submit { observer.requestMore(1) } }
+        listSingleResultCallback?.onResult([1, 2, 3, 4], null)
 
         then:
         observer.assertNoErrors()
         observer.assertReceivedOnNext([1, 2, 3, 4])
         observer.assertTerminalEvent()
+
+        cleanup:
+        executor?.shutdown()
+        executor?.awaitTermination(10, TimeUnit.SECONDS)
     }
 
     def 'should throw an error if request is less than 1'() {
@@ -214,7 +223,6 @@ class FlatteningSingleResultCallbackSubscriptionSpecification extends Specificat
 
     def 'should call onError if onNext causes an Error'() {
         given:
-        def block = getBlock()
         def observer = new TestObserver(new Observer() {
             @Override
             void onSubscribe(final Subscription subscription) {
@@ -233,13 +241,80 @@ class FlatteningSingleResultCallbackSubscriptionSpecification extends Specificat
             void onComplete() {
             }
         })
-        observeAndFlatten(block).subscribe(observer)
+        observeAndFlatten(getBlock()).subscribe(observer)
 
         when:
         observer.requestMore(1)
 
         then:
+        notThrown(MongoException)
         observer.assertTerminalEvent()
+        observer.assertErrored()
+    }
+
+    def 'should throw the exception if calling onComplete raises one'() {
+        given:
+        def observer = new TestObserver(new Observer() {
+            @Override
+            void onSubscribe(final Subscription subscription) {
+            }
+
+            @Override
+            void onNext(final Object result) {
+            }
+
+            @Override
+            void onError(final Throwable e) {
+            }
+
+            @Override
+            void onComplete() {
+                throw new MongoException('exception calling onComplete')
+            }
+        })
+        observeAndFlatten(getBlock()).subscribe(observer)
+
+        when:
+        observer.requestMore(100)
+
+        then:
+        def ex = thrown(MongoException)
+        ex.message == 'exception calling onComplete'
+        observer.assertTerminalEvent()
+        observer.assertNoErrors()
+    }
+
+    def 'should throw the exception if calling onError raises one'() {
+        given:
+        def observer = new TestObserver(new Observer() {
+            @Override
+            void onSubscribe(final Subscription subscription) {
+            }
+
+            @Override
+            void onNext(final Object result) {
+                throw new MongoException('fail')
+            }
+
+            @Override
+            void onError(final Throwable e) {
+                throw new MongoException('exception calling onError')
+            }
+
+            @Override
+            void onComplete() {
+            }
+        })
+        observeAndFlatten(getBlock()).subscribe(observer)
+
+        when:
+        observer.requestMore(100)
+
+        then:
+        def ex = thrown(MongoException)
+        ex.message == 'exception calling onError'
+        observer.assertTerminalEvent()
+        observer.assertErrored()
     }
 
     def 'should call onError if the passed block errors'() {
@@ -248,7 +323,7 @@ class FlatteningSingleResultCallbackSubscriptionSpecification extends Specificat
         observeAndFlatten(new Block<SingleResultCallback<List<Integer>>>() {
             @Override
             void apply(final SingleResultCallback<List<Integer>> callback) {
-                throw new MongoException('failed');
+                throw new MongoException('failed')
             }
         }).subscribe(observer)
 
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/ListCollectionsIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/ListCollectionsIterableSpecification.groovy
index 372d1e51084..7b56bf1fcad 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/ListCollectionsIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/ListCollectionsIterableSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import com.mongodb.Function
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
-import com.mongodb.operation.AsyncOperationExecutor
 import com.mongodb.operation.ListCollectionsOperation
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -50,11 +49,11 @@ class ListCollectionsIterableSpecification extends Specification {
                 it[0].onResult(null, null)
             }
         }
-        def executor = new TestOperationExecutor([cursor, cursor]);
-        def listCollectionIterable = new ListCollectionsIterableImpl<Document>('db', Document, codecRegistry, readPreference, executor)
-                .filter(new Document('filter', 1))
-                .batchSize(100)
-                .maxTime(1000, MILLISECONDS)
+        def executor = new TestOperationExecutor([cursor, cursor, cursor]);
+        def listCollectionIterable = new ListCollectionsIterableImpl<Document>(null, 'db', false, Document, codecRegistry, readPreference,
+                executor, true).filter(new Document('filter', 1)).batchSize(100).maxTime(1000, MILLISECONDS)
+        def listCollectionNamesIterable = new ListCollectionsIterableImpl<Document>(null, 'db', true, Document, codecRegistry,
+                readPreference, executor, true)
 
         when: 'default input should be as expected'
         listCollectionIterable.into([]) { result, t -> }
@@ -64,7 +63,8 @@ class ListCollectionsIterableSpecification extends Specification {
 
         then:
         expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(1))).batchSize(100).maxTime(1000, MILLISECONDS))
+                .filter(new BsonDocument('filter', new BsonInt32(1))).batchSize(100).maxTime(1000, MILLISECONDS)
+                .retryReads(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
@@ -74,7 +74,17 @@ class ListCollectionsIterableSpecification extends Specification {
 
         then: 'should use the overrides'
         expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(2))).batchSize(99).maxTime(999, MILLISECONDS))
+                .filter(new BsonDocument('filter', new BsonInt32(2))).batchSize(99).maxTime(999, MILLISECONDS)
+                .retryReads(true))
+
+        when: 'requesting collection names only'
+        listCollectionNamesIterable.into([]) { result, t -> }
+
+        operation = executor.getReadOperation() as ListCollectionsOperation<Document>
+
+        then: 'should create operation with nameOnly'
+        expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec()).nameOnly(true)
+                .retryReads(true))
     }
 
     def 'should follow the MongoIterable interface as expected'() {
@@ -96,7 +106,8 @@ class ListCollectionsIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new ListCollectionsIterableImpl<Document>('db', Document, codecRegistry, readPreference, executor)
+        def mongoIterable = new ListCollectionsIterableImpl<Document>(null, 'db', false, Document, codecRegistry, readPreference,
+                executor, true)
 
         when:
         def results = new FutureResultCallback()
@@ -158,8 +169,8 @@ class ListCollectionsIterableSpecification extends Specification {
 
     def 'should check variables using notNull'() {
         given:
-        def mongoIterable = new ListCollectionsIterableImpl<Document>('db', Document, codecRegistry, readPreference,
-                Stub(AsyncOperationExecutor))
+        def mongoIterable = new ListCollectionsIterableImpl<Document>(null, 'db', false, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor), true)
         def callback = Stub(SingleResultCallback)
         def block = Stub(Block)
         def target = Stub(List)
@@ -200,4 +211,20 @@ class ListCollectionsIterableSpecification extends Specification {
         then:
         thrown(IllegalArgumentException)
     }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ListCollectionsIterableImpl<Document>(null, 'db', false, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor), true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/ListDatabasesIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/ListDatabasesIterableSpecification.groovy
index b24bcd758be..03746bc961f 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/ListDatabasesIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/ListDatabasesIterableSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import com.mongodb.Function
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
-import com.mongodb.operation.AsyncOperationExecutor
 import com.mongodb.operation.ListDatabasesOperation
+import org.bson.BsonDocument
 import org.bson.Document
 import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.DocumentCodec
@@ -49,7 +49,8 @@ class ListDatabasesIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor, cursor]);
-        def listDatabasesIterable = new ListDatabasesIterableImpl<Document>(Document, codecRegistry, readPreference, executor)
+        def listDatabasesIterable = new ListDatabasesIterableImpl<Document>(null, Document, codecRegistry, readPreference,
+                executor, true)
                 .maxTime(1000, MILLISECONDS)
                 .batchSize(1) // batchSize should be silently ignored
 
@@ -60,16 +61,18 @@ class ListDatabasesIterableSpecification extends Specification {
         def readPreference = executor.getReadPreference()
 
         then:
-        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(1000, MILLISECONDS))
+        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(1000, MILLISECONDS)
+                .retryReads(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
-        listDatabasesIterable.maxTime(999, MILLISECONDS).into([]) { result, t -> }
+        listDatabasesIterable.maxTime(999, MILLISECONDS).filter(Document.parse('{a: 1}')).nameOnly(true).into([]) { result, t -> }
 
         operation = executor.getReadOperation() as ListDatabasesOperation<Document>
 
         then: 'should use the overrides'
-        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(999, MILLISECONDS))
+        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(999, MILLISECONDS)
+                .filter(BsonDocument.parse('{a: 1}')).nameOnly(true).retryReads(true))
     }
 
     def 'should follow the MongoIterable interface as expected'() {
@@ -91,7 +94,7 @@ class ListDatabasesIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new ListDatabasesIterableImpl<Document>(Document, codecRegistry, readPreference, executor)
+        def mongoIterable = new ListDatabasesIterableImpl<Document>(null, Document, codecRegistry, readPreference, executor, true)
 
         when:
         def results = new FutureResultCallback()
@@ -153,8 +156,8 @@ class ListDatabasesIterableSpecification extends Specification {
 
     def 'should check variables using notNull'() {
         given:
-        def mongoIterable = new ListDatabasesIterableImpl<Document>(Document, codecRegistry, readPreference,
-                Stub(AsyncOperationExecutor))
+        def mongoIterable = new ListDatabasesIterableImpl<Document>(null, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor), true)
         def callback = Stub(SingleResultCallback)
         def block = Stub(Block)
         def target = Stub(List)
@@ -195,4 +198,20 @@ class ListDatabasesIterableSpecification extends Specification {
         then:
         thrown(IllegalArgumentException)
     }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ListDatabasesIterableImpl<Document>(null, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor), true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/ListIndexesIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/ListIndexesIterableSpecification.groovy
index e6afd656672..eb34ad6073c 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/ListIndexesIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/ListIndexesIterableSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import com.mongodb.MongoNamespace
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
-import com.mongodb.operation.AsyncOperationExecutor
 import com.mongodb.operation.ListIndexesOperation
 import org.bson.Document
 import org.bson.codecs.BsonValueCodecProvider
@@ -50,8 +49,9 @@ class ListIndexesIterableSpecification extends Specification {
                 it[0].onResult(null, null)
             }
         }
-        def executor = new TestOperationExecutor([cursor, cursor]);
-        def listIndexesIterable = new ListIndexesIterableImpl<Document>(namespace, Document, codecRegistry, readPreference, executor)
+        def executor = new TestOperationExecutor([cursor, cursor])
+        def listIndexesIterable = new ListIndexesIterableImpl<Document>(null, namespace, Document, codecRegistry, readPreference,
+                executor, true)
                 .batchSize(100).maxTime(1000, MILLISECONDS)
 
         when: 'default input should be as expected'
@@ -62,7 +62,7 @@ class ListIndexesIterableSpecification extends Specification {
 
         then:
         expect operation, isTheSameAs(new ListIndexesOperation<Document>(namespace, new DocumentCodec())
-                .batchSize(100).maxTime(1000, MILLISECONDS))
+                .batchSize(100).maxTime(1000, MILLISECONDS).retryReads(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
@@ -74,7 +74,7 @@ class ListIndexesIterableSpecification extends Specification {
 
         then: 'should use the overrides'
         expect operation, isTheSameAs(new ListIndexesOperation<Document>(namespace, new DocumentCodec())
-                .batchSize(99).maxTime(999, MILLISECONDS))
+                .batchSize(99).maxTime(999, MILLISECONDS).retryReads(true))
     }
 
     def 'should follow the MongoIterable interface as expected'() {
@@ -96,7 +96,8 @@ class ListIndexesIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new ListIndexesIterableImpl<Document>(namespace, Document, codecRegistry, readPreference, executor)
+        def mongoIterable = new ListIndexesIterableImpl<Document>(null, namespace, Document, codecRegistry, readPreference,
+                executor, true)
 
         when:
         def results = new FutureResultCallback()
@@ -158,8 +159,8 @@ class ListIndexesIterableSpecification extends Specification {
 
     def 'should check variables using notNull'() {
         given:
-        def mongoIterable = new ListIndexesIterableImpl<Document>(namespace, Document, codecRegistry, readPreference,
-                Stub(AsyncOperationExecutor))
+        def mongoIterable = new ListIndexesIterableImpl<Document>(null, namespace, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor), true)
         def callback = Stub(SingleResultCallback)
         def block = Stub(Block)
         def target = Stub(List)
@@ -200,4 +201,20 @@ class ListIndexesIterableSpecification extends Specification {
         then:
         thrown(IllegalArgumentException)
     }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ListIndexesIterableImpl<Document>(null, namespace, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor), true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MapReduceIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MapReduceIterableSpecification.groovy
index fdd94f831c8..a15c23311a6 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/MapReduceIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MapReduceIterableSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,11 +21,12 @@ import com.mongodb.Function
 import com.mongodb.MongoException
 import com.mongodb.MongoNamespace
 import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
+import com.mongodb.client.model.Collation
 import com.mongodb.client.model.MapReduceAction
-import com.mongodb.operation.AsyncOperationExecutor
 import com.mongodb.operation.FindOperation
 import com.mongodb.operation.MapReduceStatistics
 import com.mongodb.operation.MapReduceToCollectionOperation
@@ -53,6 +54,8 @@ class MapReduceIterableSpecification extends Specification {
     def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
     def readPreference = secondary()
     def readConcern = ReadConcern.DEFAULT
+    def writeConcern = WriteConcern.MAJORITY
+    def collation = Collation.builder().locale('en').build()
 
     def 'should build the expected MapReduceWithInlineResultsOperation'() {
         given:
@@ -62,18 +65,18 @@ class MapReduceIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor, cursor]);
-        def mapReduceIterable = new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, 'map', 'reduce')
+        def mapReduceIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                writeConcern, executor, 'map', 'reduce')
 
         when: 'default input should be as expected'
         mapReduceIterable.into([]) { result, t -> }
 
-        def operation = executor.getReadOperation() as MapReduceWithInlineResultsOperation<Document>
+        def operation = executor.getReadOperation() as MapReduceIterableImpl.WrappedMapReduceReadOperation
         def readPreference = executor.getReadPreference()
 
         then:
-        expect operation, isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
-                new BsonJavaScript('reduce'), new DocumentCodec()).verbose(true));
+        expect operation.getOperation(), isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
+                new BsonJavaScript('reduce'), new DocumentCodec()).verbose(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
@@ -84,12 +87,13 @@ class MapReduceIterableSpecification extends Specification {
                 .scope(new Document('scope', 1))
                 .sort(new Document('sort', 1))
                 .verbose(false)
+                .collation(collation)
                 .into([]) { result, t -> }
 
-        operation = executor.getReadOperation() as MapReduceWithInlineResultsOperation<Document>
+        operation = executor.getReadOperation() as MapReduceIterableImpl.WrappedMapReduceReadOperation
 
         then: 'should use the overrides'
-        expect operation, isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
+        expect operation.getOperation(), isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
                 new BsonJavaScript('reduce'), new DocumentCodec())
                 .filter(new BsonDocument('filter', new BsonInt32(1)))
                 .finalizeFunction(new BsonJavaScript('finalize'))
@@ -98,6 +102,7 @@ class MapReduceIterableSpecification extends Specification {
                 .scope(new BsonDocument('scope', new BsonInt32(1)))
                 .sort(new BsonDocument('sort', new BsonInt32(1)))
                 .verbose(false)
+                .collation(collation)
         )
     }
 
@@ -112,8 +117,8 @@ class MapReduceIterableSpecification extends Specification {
 
         when: 'mapReduce to a collection'
         def collectionNamespace = new MongoNamespace('dbName', 'collName')
-        def mapReduceIterable = new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, 'map', 'reduce')
+        def mapReduceIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                writeConcern, executor, 'map', 'reduce')
                 .collectionName(collectionNamespace.getCollectionName())
                 .databaseName(collectionNamespace.getDatabaseName())
                 .filter(new Document('filter', 1))
@@ -129,11 +134,12 @@ class MapReduceIterableSpecification extends Specification {
                 .sharded(true)
                 .jsMode(true)
                 .bypassDocumentValidation(true)
+                .collation(collation)
         mapReduceIterable.into([]) { result, t -> }
 
-        def operation = executor.getWriteOperation() as MapReduceToCollectionOperation
+        def operation = executor.getReadOperation() as WriteOperationThenCursorReadOperation
         def expectedOperation = new MapReduceToCollectionOperation(namespace, new BsonJavaScript('map'),
-                new BsonJavaScript('reduce'), 'collName')
+                new BsonJavaScript('reduce'), 'collName', writeConcern)
                 .databaseName(collectionNamespace.getDatabaseName())
                 .filter(new BsonDocument('filter', new BsonInt32(1)))
                 .finalizeFunction(new BsonJavaScript('finalize'))
@@ -147,34 +153,38 @@ class MapReduceIterableSpecification extends Specification {
                 .jsMode(true)
                 .sharded(true)
                 .bypassDocumentValidation(true)
+                .collation(collation)
+
+        def writeOperation = (operation.getAggregateToCollectionOperation() as MapReduceIterableImpl.WrappedMapReduceWriteOperation)
+                .getOperation()
 
         then: 'should use the overrides'
-        expect operation, isTheSameAs(expectedOperation)
+        expect writeOperation, isTheSameAs(expectedOperation)
 
         when: 'the subsequent read should have the batchSize set'
-        operation = executor.getReadOperation() as FindOperation<Document>
+        def readOperation = operation.getReadOperation() as FindOperation
 
         then: 'should use the correct settings'
-        operation.getNamespace() == collectionNamespace
-        operation.getBatchSize() == 99
+        readOperation.getNamespace() == collectionNamespace
+        readOperation.getBatchSize() == 99
 
         when: 'toCollection should work as expected'
         def futureResultCallback = new FutureResultCallback()
         mapReduceIterable.toCollection(futureResultCallback)
         futureResultCallback.get()
 
-        operation = executor.getWriteOperation() as MapReduceToCollectionOperation
+        operation = executor.getWriteOperation() as MapReduceIterableImpl.WrappedMapReduceWriteOperation
 
         then:
-        expect operation, isTheSameAs(expectedOperation)
+        expect operation.getOperation(), isTheSameAs(expectedOperation)
     }
 
     def 'should handle exceptions correctly'() {
         given:
         def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
         def executor = new TestOperationExecutor([new MongoException('failure')])
-        def mapReduceIterable = new MapReduceIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference, readConcern,
-                executor, 'map', 'reduce')
+        def mapReduceIterable = new MapReduceIterableImpl(null, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, 'map', 'reduce')
 
         def futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
 
@@ -185,16 +195,16 @@ class MapReduceIterableSpecification extends Specification {
         then: 'the future should handle the exception'
         thrown(MongoException)
 
-        when: 'toCollection should throw IllegalArgumentException its inline'
+        when: 'toCollection should throw IllegalStateException its inline'
         mapReduceIterable.toCollection(new FutureResultCallback())
 
         then:
-        thrown(IllegalArgumentException)
+        thrown(IllegalStateException)
 
         when: 'a codec is missing'
         futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
-        new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
-                                  'map', 'reduce').into([], futureResultCallback)
+        new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                'map', 'reduce').into([], futureResultCallback)
         futureResultCallback.get()
 
         then:
@@ -220,8 +230,8 @@ class MapReduceIterableSpecification extends Specification {
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
-                                                      'map', 'reduce')
+        def mongoIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                writeConcern, executor, 'map', 'reduce')
 
         when:
         def results = new FutureResultCallback()
@@ -283,8 +293,8 @@ class MapReduceIterableSpecification extends Specification {
 
     def 'should check variables using notNull'() {
         given:
-        def mongoIterable = new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, Stub(AsyncOperationExecutor), 'map', 'reduce')
+        def mongoIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, Stub(OperationExecutor), 'map', 'reduce')
         def callback = Stub(SingleResultCallback)
         def block = Stub(Block)
         def target = Stub(List)
@@ -332,4 +342,19 @@ class MapReduceIterableSpecification extends Specification {
         thrown(IllegalArgumentException)
     }
 
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, Stub(OperationExecutor), 'map', 'reduce')
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MappingAsyncBatchCursorSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MappingAsyncBatchCursorSpecification.groovy
index a9868ae6eb7..71102bec6d1 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/MappingAsyncBatchCursorSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MappingAsyncBatchCursorSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -66,7 +66,6 @@ class MappingAsyncBatchCursorSpecification extends Specification {
         then:
         results.get() == null
         mappingAsyncBatchCursor.isClosed()
-
     }
 
     def 'should capture mapping errors'() {
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MappingIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MappingIterableSpecification.groovy
new file mode 100644
index 00000000000..f382d51306b
--- /dev/null
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MappingIterableSpecification.groovy
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.async.SingleResultCallback
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MappingIterableSpecification extends Specification {
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def callback = Stub(SingleResultCallback)
+        def iterable = Mock(MongoIterable)
+        def mapper = { doc -> doc }
+        def mappingIterable = new MappingIterable(iterable, mapper)
+
+        when:
+        mappingIterable.first(callback)
+
+        then:
+        1 * iterable.first(_)
+
+        when:
+        mappingIterable.forEach( { } as Block, callback)
+
+        then:
+        1 * iterable.forEach(_, _)
+
+        when:
+        mappingIterable.into([], callback)
+
+        then:
+        1 * iterable.forEach(_, _)  // Use foreach to populate the target
+
+        when:
+        mappingIterable.batchSize(5)
+
+        then:
+        1 * iterable.batchSize(5)
+
+        when:
+        mappingIterable.getBatchSize()
+
+        then:
+        1 * iterable.getBatchSize() >> 5
+
+        when:
+        mappingIterable.batchCursor(callback)
+
+        then:
+        1 * iterable.batchCursor(_)
+
+        when:
+        def newMapper = { } as Function
+
+        then:
+        expect mappingIterable.map(newMapper), isTheSameAs(new MappingIterable(mappingIterable, newMapper))
+    }
+
+}
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSettingsSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSettingsSpecification.groovy
index 161ac5c4c77..ff904405257 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSettingsSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSettingsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,14 @@
 
 package com.mongodb.async.client
 
+import com.mongodb.Block
+import com.mongodb.ConnectionString
+import com.mongodb.MongoCompressor
 import com.mongodb.MongoCredential
 import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
 import com.mongodb.ServerAddress
 import com.mongodb.WriteConcern
-import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory
 import com.mongodb.connection.ClusterSettings
 import com.mongodb.connection.ConnectionPoolSettings
 import com.mongodb.connection.ServerSettings
@@ -29,31 +31,41 @@ import com.mongodb.connection.SocketSettings
 import com.mongodb.connection.SslSettings
 import com.mongodb.connection.netty.NettyStreamFactoryFactory
 import com.mongodb.event.CommandListener
+import org.bson.UuidRepresentation
 import org.bson.codecs.configuration.CodecRegistry
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
 import static com.mongodb.CustomMatchers.isTheSameAs
+import static java.util.Collections.singletonList
 import static spock.util.matcher.HamcrestSupport.expect
 
 class MongoClientSettingsSpecification extends Specification {
 
     def 'should set the correct default values'() {
         given:
-        def options = MongoClientSettings.builder().build()
+        def settings = MongoClientSettings.builder().build()
 
         expect:
-        options.getWriteConcern() == WriteConcern.ACKNOWLEDGED
-        options.getReadConcern() == ReadConcern.DEFAULT
-        options.getReadPreference() == ReadPreference.primary()
-        options.getCommandListeners().isEmpty()
-        options.connectionPoolSettings == ConnectionPoolSettings.builder().build()
-        options.socketSettings == SocketSettings.builder().build()
-        options.heartbeatSocketSettings == SocketSettings.builder().build()
-        options.serverSettings == ServerSettings.builder().build()
-
-        System.getProperty('org.mongodb.async.type', 'nio2') == 'netty' ?
-        options.streamFactoryFactory instanceof NettyStreamFactoryFactory :
-        options.streamFactoryFactory instanceof AsynchronousSocketChannelStreamFactoryFactory
+        settings.getWriteConcern() == WriteConcern.ACKNOWLEDGED
+        settings.getRetryWrites()
+        settings.getRetryReads()
+        settings.getReadConcern() == ReadConcern.DEFAULT
+        settings.getReadPreference() == ReadPreference.primary()
+        settings.getCommandListeners().isEmpty()
+        settings.getApplicationName() == null
+        settings.getConnectionPoolSettings() == ConnectionPoolSettings.builder().build()
+        settings.getSocketSettings() == SocketSettings.builder().build()
+        settings.getHeartbeatSocketSettings() == SocketSettings.builder().readTimeout(10000, TimeUnit.MILLISECONDS).build()
+        settings.getServerSettings() == ServerSettings.builder().build()
+        settings.getStreamFactoryFactory() == null
+        settings.getCompressorList() == []
+        settings.getCredentialList() == []
+        settings.getCredential() == null
+        settings.getUuidRepresentation() == UuidRepresentation.JAVA_LEGACY
     }
 
     @SuppressWarnings('UnnecessaryObjectReferences')
@@ -71,11 +83,6 @@ class MongoClientSettingsSpecification extends Specification {
         then:
         thrown(IllegalArgumentException)
 
-        when:
-        builder.heartbeatSocketSettings(null)
-        then:
-        thrown(IllegalArgumentException)
-
         when:
         builder.connectionPoolSettings(null)
         then:
@@ -101,6 +108,11 @@ class MongoClientSettingsSpecification extends Specification {
         then:
         thrown(IllegalArgumentException)
 
+        when:
+        builder.credential(null)
+        then:
+        thrown(IllegalArgumentException)
+
         when:
         builder.credentialList(null)
         then:
@@ -120,69 +132,174 @@ class MongoClientSettingsSpecification extends Specification {
         builder.addCommandListener(null)
         then:
         thrown(IllegalArgumentException)
+
+        when:
+        builder.compressorList(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.uuidRepresentation(null)
+        then:
+        thrown(IllegalArgumentException)
     }
 
-    def 'should build with set options'() {
+    def 'should build with supplied settings'() {
         given:
         def streamFactoryFactory = NettyStreamFactoryFactory.builder().build()
-        def sslSettings = Stub(SslSettings)
-        def socketSettings = Stub(SocketSettings)
-        def serverSettings = Stub(ServerSettings)
-        def heartbeatSocketSettings = Stub(SocketSettings)
+        def sslSettings = SslSettings.builder().build()
+        def socketSettings = SocketSettings.builder().build()
+        def heartbeatSocketSettings = SocketSettings.builder().readTimeout(100, TimeUnit.MILLISECONDS).build()
+        def serverSettings = ServerSettings.builder().build()
         def credentialList = [MongoCredential.createMongoX509Credential('test')]
-        def connectionPoolSettings = Stub(ConnectionPoolSettings)
+        def connectionPoolSettings = ConnectionPoolSettings.builder().build()
         def codecRegistry = Stub(CodecRegistry)
         def commandListener = Stub(CommandListener)
         def clusterSettings = ClusterSettings.builder().hosts([new ServerAddress('localhost')]).requiredReplicaSetName('test').build()
 
-        def options = MongoClientSettings.builder()
+        when:
+        def settings = MongoClientSettings.builder()
                 .readPreference(ReadPreference.secondary())
                 .writeConcern(WriteConcern.JOURNALED)
+                .retryWrites(true)
+                .retryReads(true)
                 .readConcern(ReadConcern.LOCAL)
+                .applicationName('app1')
                 .addCommandListener(commandListener)
+                .codecRegistry(codecRegistry)
                 .sslSettings(sslSettings)
                 .socketSettings(socketSettings)
-                .serverSettings(serverSettings)
                 .heartbeatSocketSettings(heartbeatSocketSettings)
+                .serverSettings(serverSettings)
                 .credentialList(credentialList)
                 .connectionPoolSettings(connectionPoolSettings)
+                .clusterSettings(clusterSettings).streamFactoryFactory(streamFactoryFactory)
+                .compressorList([MongoCompressor.createZlibCompressor()])
+                .uuidRepresentation(UuidRepresentation.STANDARD)
+                .build()
+
+        then:
+        settings.getReadPreference() == ReadPreference.secondary()
+        settings.getWriteConcern() == WriteConcern.JOURNALED
+        settings.getRetryWrites()
+        settings.getRetryReads()
+        settings.getReadConcern() == ReadConcern.LOCAL
+        settings.getApplicationName() == 'app1'
+        settings.getCommandListeners().get(0) == commandListener
+        settings.getConnectionPoolSettings() == connectionPoolSettings
+        settings.getSocketSettings() == socketSettings
+        settings.getHeartbeatSocketSettings() == heartbeatSocketSettings
+        settings.getServerSettings() == serverSettings
+        settings.getCodecRegistry() == codecRegistry
+        settings.getCredentialList() == credentialList
+        settings.getCredential() == credentialList.get(0)
+        settings.getConnectionPoolSettings() == connectionPoolSettings
+        settings.getClusterSettings() == clusterSettings
+        settings.getStreamFactoryFactory() == streamFactoryFactory
+        settings.getCompressorList() == [MongoCompressor.createZlibCompressor()]
+        settings.getUuidRepresentation() == UuidRepresentation.STANDARD
+    }
+
+    def 'should create from client settings'() {
+        given:
+        def streamFactoryFactory = NettyStreamFactoryFactory.builder().build()
+        def credential = MongoCredential.createMongoX509Credential('test')
+        def codecRegistry = Stub(CodecRegistry)
+        def commandListener = Stub(CommandListener)
+        def clusterSettings = ClusterSettings.builder().hosts([new ServerAddress('localhost')]).requiredReplicaSetName('test').build()
+
+        when:
+        def originalSettings = com.mongodb.MongoClientSettings.builder()
+                .readPreference(ReadPreference.secondary())
+                .writeConcern(WriteConcern.JOURNALED)
+                .retryWrites(true)
+                .retryReads(true)
+                .readConcern(ReadConcern.LOCAL)
+                .applicationName('app1')
+                .addCommandListener(commandListener)
+                .credential(credential)
                 .codecRegistry(codecRegistry)
-                .clusterSettings(clusterSettings)
-                                         .streamFactoryFactory(streamFactoryFactory)
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    void apply(final ClusterSettings.Builder builder) {
+                        builder.applySettings(clusterSettings)
+                    }
+                })
+                .streamFactoryFactory(streamFactoryFactory)
+                .compressorList([MongoCompressor.createZlibCompressor()])
+                .uuidRepresentation(UuidRepresentation.STANDARD)
                 .build()
+        def settings = MongoClientSettings.createFromClientSettings(originalSettings)
 
-        expect:
-        options.getReadPreference() == ReadPreference.secondary()
-        options.getWriteConcern() == WriteConcern.JOURNALED
-        options.getReadConcern() == ReadConcern.LOCAL
-        options.commandListeners.get(0) == commandListener
-        options.connectionPoolSettings == connectionPoolSettings
-        options.socketSettings == socketSettings
-        options.heartbeatSocketSettings == heartbeatSocketSettings
-        options.serverSettings == serverSettings
-        options.codecRegistry == codecRegistry
-        options.credentialList == credentialList
-        options.connectionPoolSettings == connectionPoolSettings
-        options.clusterSettings == clusterSettings
-        options.streamFactoryFactory == streamFactoryFactory
+        then:
+        settings.getReadPreference() == ReadPreference.secondary()
+        settings.getWriteConcern() == WriteConcern.JOURNALED
+        settings.getRetryWrites()
+        settings.getRetryReads()
+        settings.getReadConcern() == ReadConcern.LOCAL
+        settings.getApplicationName() == 'app1'
+        settings.getSocketSettings() == SocketSettings.builder().build()
+        settings.getHeartbeatSocketSettings() == SocketSettings.builder().readTimeout(10000, TimeUnit.MILLISECONDS).keepAlive(true).build()
+        settings.getCommandListeners().get(0) == commandListener
+        settings.getCodecRegistry() == codecRegistry
+        settings.getCredential() == credential
+        settings.getCredentialList() == [credential]
+        settings.getClusterSettings() == clusterSettings
+        settings.getStreamFactoryFactory() == streamFactoryFactory
+        settings.getCompressorList() == [MongoCompressor.createZlibCompressor()]
+        settings.getUuidRepresentation() == UuidRepresentation.STANDARD
+    }
+
+    def 'should support deprecated multiple credentials'() {
+        given:
+        def credentialList = [MongoCredential.createMongoX509Credential('test'), MongoCredential.createGSSAPICredential('gssapi')]
+
+        when:
+        def settings = MongoClientSettings.builder().credentialList(credentialList).build()
+
+        then:
+        settings.getCredentialList() == credentialList
+
+        when:
+        settings.getCredential()
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        settings = MongoClientSettings.builder().credential(credentialList.get(0)).build()
+
+        then:
+        settings.getCredentialList() == [credentialList.get(0)]
+        settings.getCredential() == credentialList.get(0)
     }
 
-    def 'should be easy to create new options from existing'() {
+    def 'should be easy to create new settings from existing'() {
+        when:
+        def settings = MongoClientSettings.builder().build()
+
+        then:
+        expect settings, isTheSameAs(MongoClientSettings.builder(settings).build())
+
         when:
         def sslSettings = Stub(SslSettings)
-        def socketSettings = Stub(SocketSettings)
-        def serverSettings = Stub(ServerSettings)
-        def heartbeatSocketSettings = Stub(SocketSettings)
+        def socketSettings = SocketSettings.builder().build()
+        def serverSettings = ServerSettings.builder().build()
+        def heartbeatSocketSettings = SocketSettings.builder().build()
         def credentialList = [MongoCredential.createMongoX509Credential('test')]
-        def connectionPoolSettings = Stub(ConnectionPoolSettings)
+        def connectionPoolSettings = ConnectionPoolSettings.builder().build()
         def codecRegistry = Stub(CodecRegistry)
         def commandListener = Stub(CommandListener)
         def clusterSettings = ClusterSettings.builder().hosts([new ServerAddress('localhost')]).requiredReplicaSetName('test').build()
+        def compressorList = [MongoCompressor.createZlibCompressor()]
 
-        def options = MongoClientSettings.builder()
+        settings = MongoClientSettings.builder()
                 .readPreference(ReadPreference.secondary())
                 .writeConcern(WriteConcern.JOURNALED)
+                .retryWrites(true)
+                .retryReads(true)
                 .readConcern(ReadConcern.LOCAL)
+                .applicationName('app1')
                 .addCommandListener(commandListener)
                 .sslSettings(sslSettings)
                 .socketSettings(socketSettings)
@@ -192,12 +309,37 @@ class MongoClientSettingsSpecification extends Specification {
                 .connectionPoolSettings(connectionPoolSettings)
                 .codecRegistry(codecRegistry)
                 .clusterSettings(clusterSettings)
+                .compressorList(compressorList)
+                .uuidRepresentation(UuidRepresentation.STANDARD)
                 .build()
 
         then:
-        expect options, isTheSameAs(MongoClientSettings.builder(options).build())
+        expect settings, isTheSameAs(MongoClientSettings.builder(settings).build())
+    }
+
+    def 'applicationName can be 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 126 + '\u00A0'
+
+        when:
+        def settings = MongoClientSettings.builder().applicationName(applicationName).build()
+
+        then:
+        settings.applicationName == applicationName
     }
 
+    def 'should throw IllegalArgumentException if applicationName exceeds 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 127 + '\u00A0'
+
+        when:
+        MongoClientSettings.builder().applicationName(applicationName)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+
     def 'should add command listeners'() {
         given:
         CommandListener commandListenerOne = Mock(CommandListener)
@@ -205,53 +347,163 @@ class MongoClientSettingsSpecification extends Specification {
         CommandListener commandListenerThree = Mock(CommandListener)
 
         when:
-        def options = MongoClientSettings.builder()
-                .build()
+        def settings = MongoClientSettings.builder().build()
 
         then:
-        options.commandListeners.size() == 0
+        settings.commandListeners.size() == 0
 
         when:
-        options = MongoClientSettings.builder()
+        settings = MongoClientSettings.builder()
                 .addCommandListener(commandListenerOne)
                 .build()
 
         then:
-        options.commandListeners.size() == 1
-        options.commandListeners[0].is commandListenerOne
+        settings.commandListeners.size() == 1
+        settings.commandListeners[0].is commandListenerOne
 
         when:
-        options = MongoClientSettings.builder()
+        settings = MongoClientSettings.builder()
                 .addCommandListener(commandListenerOne)
                 .addCommandListener(commandListenerTwo)
                 .build()
 
         then:
-        options.commandListeners.size() == 2
-        options.commandListeners[0].is commandListenerOne
-        options.commandListeners[1].is commandListenerTwo
+        settings.commandListeners.size() == 2
+        settings.commandListeners[0].is commandListenerOne
+        settings.commandListeners[1].is commandListenerTwo
 
         when:
-        def copiedOptions = MongoClientSettings.builder(options).addCommandListener(commandListenerThree).build()
+        def copiedsettings = MongoClientSettings.builder(settings).addCommandListener(commandListenerThree).build()
 
         then:
-        copiedOptions.commandListeners.size() == 3
-        copiedOptions.commandListeners[0].is commandListenerOne
-        copiedOptions.commandListeners[1].is commandListenerTwo
-        copiedOptions.commandListeners[2].is commandListenerThree
-        options.commandListeners.size() == 2
-        options.commandListeners[0].is commandListenerOne
-        options.commandListeners[1].is commandListenerTwo
+        copiedsettings.commandListeners.size() == 3
+        copiedsettings.commandListeners[0].is commandListenerOne
+        copiedsettings.commandListeners[1].is commandListenerTwo
+        copiedsettings.commandListeners[2].is commandListenerThree
+        settings.commandListeners.size() == 2
+        settings.commandListeners[0].is commandListenerOne
+        settings.commandListeners[1].is commandListenerTwo
     }
 
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should build settings from a connection string'() {
+        when:
+        ConnectionString connectionString = new ConnectionString('mongodb://user:pass@host1:1,host2:2/'
+                + '?authMechanism=SCRAM-SHA-1&authSource=test'
+                + '&minPoolSize=5&maxPoolSize=10&waitQueueMultiple=7'
+                + '&waitQueueTimeoutMS=150&maxIdleTimeMS=200&maxLifeTimeMS=300'
+                + '&connectTimeoutMS=2500'
+                + '&socketTimeoutMS=5500'
+                + '&serverSelectionTimeoutMS=25000'
+                + '&localThresholdMS=30'
+                + '&heartbeatFrequencyMS=20000'
+                + '&appName=MyApp'
+                + '&replicaSet=test'
+                + '&retryWrites=true'
+                + '&retryReads=true'
+                + '&ssl=true&sslInvalidHostNameAllowed=true'
+                + '&w=majority&wTimeoutMS=2500'
+                + '&readPreference=secondary'
+                + '&readConcernLevel=majority'
+                + '&compressors=zlib&zlibCompressionLevel=5'
+        )
+        MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(connectionString).build()
+        MongoClientSettings expected = MongoClientSettings.builder()
+                .clusterSettings(ClusterSettings.builder().applyConnectionString(connectionString).build())
+                .heartbeatSocketSettings(SocketSettings.builder()
+                    .connectTimeout(connectionString.getConnectTimeout(), TimeUnit.MILLISECONDS)
+                    .readTimeout(connectionString.getConnectTimeout(), TimeUnit.MILLISECONDS).build())
+                .connectionPoolSettings(ConnectionPoolSettings.builder().applyConnectionString(connectionString).build())
+                .serverSettings(ServerSettings.builder().applyConnectionString(connectionString).build())
+                .socketSettings(SocketSettings.builder().applyConnectionString(connectionString).build())
+                .sslSettings(SslSettings.builder().applyConnectionString(connectionString).build())
+                .readConcern(ReadConcern.MAJORITY)
+                .readPreference(ReadPreference.secondary())
+                .writeConcern(WriteConcern.MAJORITY.withWTimeout(2500, TimeUnit.MILLISECONDS))
+                .applicationName('MyApp')
+                .credential(MongoCredential.createScramSha1Credential('user', 'test', 'pass'.toCharArray()))
+                .compressorList([MongoCompressor.createZlibCompressor().withProperty(MongoCompressor.LEVEL, 5)])
+                .retryWrites(true)
+                .retryReads(true)
+                .build()
+
+        then:
+        expect expected, isTheSameAs(settings, ['heartbeatSocketSettings'])
+        settings.getHeartbeatSocketSettings() == expected.getHeartbeatSocketSettings()
+    }
+
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should allow easy configuration of nested settings'() {
+        when:
+        MongoClientSettings settings = MongoClientSettings.builder()
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+            @Override
+            void apply(final ClusterSettings.Builder builder) {
+                builder.description('My Cluster').hosts(singletonList(new ServerAddress()))
+            }
+        })
+                .applyToConnectionPoolSettings(new Block<ConnectionPoolSettings.Builder>() {
+            @Override
+            void apply(final ConnectionPoolSettings.Builder builder) {
+                builder.maxWaitQueueSize(22)
+            }
+        })
+                .applyToServerSettings(new Block<ServerSettings.Builder>() {
+            @Override
+            void apply(final ServerSettings.Builder builder) {
+                builder.heartbeatFrequency(10, TimeUnit.SECONDS)
+            }
+        })
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+            @Override
+            void apply(final SocketSettings.Builder builder) {
+                builder.sendBufferSize(99)
+            }
+        })
+                .applyToSslSettings(new Block<SslSettings.Builder>() {
+            @Override
+            void apply(final SslSettings.Builder builder) {
+                builder.enabled(true).invalidHostNameAllowed(true)
+            }
+        })
+                .heartbeatSocketSettings(SocketSettings.builder().receiveBufferSize(99).readTimeout(1, TimeUnit.SECONDS).build())
+        .build()
+
+        MongoClientSettings expected = MongoClientSettings.builder()
+                .clusterSettings(ClusterSettings.builder().description('My Cluster').hosts(singletonList(new ServerAddress())).build())
+                .connectionPoolSettings(ConnectionPoolSettings.builder().maxWaitQueueSize(22).build())
+                .heartbeatSocketSettings(SocketSettings.builder().readTimeout(1, TimeUnit.SECONDS).receiveBufferSize(99).build())
+                .serverSettings(ServerSettings.builder().heartbeatFrequency(10, TimeUnit.SECONDS).build())
+                .socketSettings(SocketSettings.builder().sendBufferSize(99).build())
+                .sslSettings(SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build())
+                .build()
+
+        then:
+        expect expected, isTheSameAs(settings)
+    }
+
+    def 'should use the socket settings connectionTime out for the heartbeat settings'() {
+        when:
+        def settings = MongoClientSettings.builder().applyToSocketSettings(new Block<SocketSettings.Builder>() {
+            @Override
+            void apply(final SocketSettings.Builder builder) {
+                builder.connectTimeout(42, TimeUnit.SECONDS).readTimeout(60, TimeUnit.SECONDS).receiveBufferSize(22).sendBufferSize(10)
+            }
+        }).build()
+        def expected = SocketSettings.builder().connectTimeout(42, TimeUnit.SECONDS).readTimeout(42, TimeUnit.SECONDS).build()
+
+        then:
+        settings.getHeartbeatSocketSettings() == expected
+    }
 
     def 'should only have the following methods in the builder'() {
         when:
         // A regression test so that if anymore methods are added then the builder(final MongoClientSettings settings) should be updated
-        def actual = MongoClientSettings.Builder.declaredFields.grep {  !it.synthetic } *.name.sort()
-        def expected = ['clusterSettings', 'codecRegistry', 'commandListeners', 'connectionPoolSettings', 'credentialList',
-                        'heartbeatSocketSettings', 'readConcern', 'readPreference', 'serverSettings', 'socketSettings', 'sslSettings',
-                        'streamFactoryFactory', 'writeConcern']
+        def extras = ['credentialList', 'clusterSettings', 'connectionPoolSettings', 'heartbeatSocketSettings', 'serverSettings',
+                      'socketSettings' , 'sslSettings']
+        def actual = MongoClientSettings.Builder.declaredMethods.grep { !it.synthetic } *.name.sort() - extras
+        def expected = com.mongodb.MongoClientSettings.Builder.declaredMethods.grep { !it.synthetic } *.name.sort()
+        expected -= 'commandListenerList'
 
         then:
         actual == expected
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSpecification.groovy
index 1df3891daf3..9c98b257c62 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MongoClientSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,38 +22,57 @@ import com.mongodb.client.model.geojson.MultiPolygon
 import com.mongodb.connection.Cluster
 import org.bson.BsonDocument
 import org.bson.Document
+import org.bson.UuidRepresentation
 import org.bson.codecs.BsonValueCodecProvider
+import org.bson.internal.OverridableUuidRepresentationCodecRegistry
 import spock.lang.Specification
 
 import static com.mongodb.CustomMatchers.isTheSameAs
 import static com.mongodb.ReadPreference.primary
 import static com.mongodb.ReadPreference.secondary
+import static com.mongodb.async.client.MongoClients.getDefaultCodecRegistry
+import static com.mongodb.async.client.TestHelper.execute
+import static org.bson.UuidRepresentation.STANDARD
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static org.bson.internal.CodecRegistryHelper.createRegistry
 import static spock.util.matcher.HamcrestSupport.expect
 
 class MongoClientSpecification extends Specification {
 
-    def 'should use ListCollectionsOperation correctly'() {
+    def 'should use ListDatabasesIterableImpl correctly'() {
         given:
-        def settings = MongoClientSettings.builder().build()
-        def cluster = Stub(Cluster)
-        def executor = new TestOperationExecutor([null, null, null])
-        def client = new MongoClientImpl(settings, cluster, executor)
-        def codecRegistry = MongoClients.getDefaultCodecRegistry()
+        def executor = new TestOperationExecutor([null, null])
+        def client = new MongoClientImpl(MongoClientSettings.builder().build(), Stub(Cluster), executor)
+        def listDatabasesMethod = client.&listDatabases
+        def listDatabasesNamesMethod = client.&listDatabaseNames
 
         when:
-        def listDatabasesIterable = client.listDatabases()
+        def listDatabasesIterable = execute(listDatabasesMethod, session)
 
         then:
-        expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<Document>(Document, codecRegistry, primary(),
-                executor))
+        expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<Document>(session, Document, getDefaultCodecRegistry(),
+                primary(), executor, true))
 
         when:
-        listDatabasesIterable = client.listDatabases(BsonDocument)
+        listDatabasesIterable = execute(listDatabasesMethod, session, BsonDocument)
 
         then:
-        expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<BsonDocument>(BsonDocument, codecRegistry, primary(),
-                executor))
+        expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl<BsonDocument>(session, BsonDocument,
+                getDefaultCodecRegistry(), primary(), executor, true))
+
+        when:
+        def listDatabaseNamesIterable = execute(listDatabasesNamesMethod, session)
+
+        then:
+        // listDatabaseNamesIterable is an instance of a MappingIterable, so have to get the mapped iterable inside it
+        expect listDatabaseNamesIterable.getMapped(), isTheSameAs(new ListDatabasesIterableImpl<BsonDocument>(session, BsonDocument,
+                getDefaultCodecRegistry(), primary(), executor, true).nameOnly(true))
+
+        cleanup:
+        client?.close()
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should provide the same settings'() {
@@ -73,25 +92,49 @@ class MongoClientSpecification extends Specification {
         def settings = MongoClientSettings.builder()
                                           .readPreference(secondary())
                                           .writeConcern(WriteConcern.MAJORITY)
+                                          .retryWrites(true)
+                                          .retryReads(true)
                                           .readConcern(ReadConcern.MAJORITY)
                                           .codecRegistry(codecRegistry)
+                                          .uuidRepresentation(UuidRepresentation.STANDARD)
                                           .build()
         def client = new MongoClientImpl(settings, Stub(Cluster), new TestOperationExecutor([]))
 
         when:
-        def database = client.getDatabase('name');
+        def database = client.getDatabase('name')
 
         then:
         expect database, isTheSameAs(expectedDatabase)
 
+        cleanup:
+        client?.close()
+
         where:
-        expectedDatabase << new MongoDatabaseImpl('name', fromProviders([new BsonValueCodecProvider()]), secondary(),
-                WriteConcern.MAJORITY, ReadConcern.MAJORITY, new TestOperationExecutor([]))
+        expectedDatabase << new MongoDatabaseImpl('name',
+                createRegistry(fromProviders([new BsonValueCodecProvider()]), UuidRepresentation.STANDARD), secondary(),
+                WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, UuidRepresentation.STANDARD,
+                new TestOperationExecutor([]))
+    }
+
+
+    def 'should cleanly close the external resource closer on close'() {
+        given:
+        def closed = false
+        def client = new MongoClientImpl(MongoClientSettings.builder().build(), Mock(Cluster), {
+            closed = true
+            throw new IOException()
+        })
+
+        when:
+        client.close()
+
+        then:
+        closed
     }
 
     def 'default codec registry should contain all supported providers'() {
         given:
-        def codecRegistry = MongoClients.getDefaultCodecRegistry()
+        def codecRegistry = getDefaultCodecRegistry()
 
         expect:
         codecRegistry.get(BsonDocument)
@@ -100,4 +143,25 @@ class MongoClientSpecification extends Specification {
         codecRegistry.get(MultiPolygon)
         codecRegistry.get(Iterable)
     }
+
+    def 'should create registry reflecting UuidRepresentation'() {
+        given:
+        def codecRegistry = fromProviders([new BsonValueCodecProvider()])
+        def settings = MongoClientSettings.builder()
+                .codecRegistry(codecRegistry)
+                .uuidRepresentation(STANDARD)
+                .build()
+
+        when:
+        def client = new MongoClientImpl(settings, Stub(Cluster), new TestOperationExecutor([]))
+        def registry = client.getCodecRegistry()
+
+        then:
+        registry instanceof OverridableUuidRepresentationCodecRegistry
+        (registry as OverridableUuidRepresentationCodecRegistry).uuidRepresentation == STANDARD
+        (registry as OverridableUuidRepresentationCodecRegistry).wrapped == codecRegistry
+
+        cleanup:
+        client?.close()
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MongoCollectionSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MongoCollectionSpecification.groovy
index 5d579cee916..231e3418e9c 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/MongoCollectionSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MongoCollectionSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package com.mongodb.async.client
 import com.mongodb.MongoBulkWriteException
 import com.mongodb.MongoException
 import com.mongodb.MongoNamespace
-import com.mongodb.MongoSocketReadException
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.MongoWriteException
 import com.mongodb.ReadConcern
@@ -28,38 +27,47 @@ import com.mongodb.WriteConcern
 import com.mongodb.WriteConcernResult
 import com.mongodb.WriteError
 import com.mongodb.async.AsyncBatchCursor
-import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.SingleResultCallback
 import com.mongodb.bulk.BulkWriteError
-import com.mongodb.bulk.BulkWriteResult
 import com.mongodb.bulk.BulkWriteUpsert
 import com.mongodb.bulk.DeleteRequest
 import com.mongodb.bulk.IndexRequest
 import com.mongodb.bulk.InsertRequest
 import com.mongodb.bulk.UpdateRequest
 import com.mongodb.bulk.WriteConcernError
+import com.mongodb.client.ImmutableDocument
+import com.mongodb.client.ImmutableDocumentCodecProvider
+import com.mongodb.client.model.AggregationLevel
 import com.mongodb.client.model.BulkWriteOptions
+import com.mongodb.client.model.Collation
 import com.mongodb.client.model.CountOptions
+import com.mongodb.client.model.CreateIndexOptions
 import com.mongodb.client.model.DeleteManyModel
 import com.mongodb.client.model.DeleteOneModel
+import com.mongodb.client.model.DeleteOptions
+import com.mongodb.client.model.DropIndexOptions
+import com.mongodb.client.model.EstimatedDocumentCountOptions
 import com.mongodb.client.model.FindOneAndDeleteOptions
 import com.mongodb.client.model.FindOneAndReplaceOptions
 import com.mongodb.client.model.FindOneAndUpdateOptions
-import com.mongodb.client.model.FindOptions
 import com.mongodb.client.model.IndexModel
 import com.mongodb.client.model.IndexOptions
 import com.mongodb.client.model.InsertManyOptions
 import com.mongodb.client.model.InsertOneModel
 import com.mongodb.client.model.InsertOneOptions
+import com.mongodb.client.model.RenameCollectionOptions
 import com.mongodb.client.model.ReplaceOneModel
+import com.mongodb.client.model.ReplaceOptions
 import com.mongodb.client.model.UpdateManyModel
 import com.mongodb.client.model.UpdateOneModel
 import com.mongodb.client.model.UpdateOptions
+import com.mongodb.client.model.changestream.ChangeStreamLevel
 import com.mongodb.client.result.DeleteResult
 import com.mongodb.client.result.UpdateResult
 import com.mongodb.client.test.Worker
+import com.mongodb.internal.client.model.CountStrategy
 import com.mongodb.operation.CountOperation
 import com.mongodb.operation.CreateIndexesOperation
-import com.mongodb.operation.DistinctOperation
 import com.mongodb.operation.DropCollectionOperation
 import com.mongodb.operation.DropIndexOperation
 import com.mongodb.operation.FindAndDeleteOperation
@@ -76,7 +84,8 @@ import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.DocumentCodec
 import org.bson.codecs.ValueCodecProvider
 import org.bson.codecs.configuration.CodecConfigurationException
-import org.bson.codecs.configuration.CodecRegistry
+import org.bson.conversions.Bson
+import org.bson.internal.OverridableUuidRepresentationCodecRegistry
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit
@@ -84,6 +93,10 @@ import java.util.concurrent.TimeUnit
 import static com.mongodb.CustomMatchers.isTheSameAs
 import static com.mongodb.ReadPreference.primary
 import static com.mongodb.ReadPreference.secondary
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
+import static com.mongodb.async.client.TestHelper.createIterable
+import static com.mongodb.async.client.TestHelper.execute
 import static com.mongodb.bulk.BulkWriteResult.acknowledged
 import static com.mongodb.bulk.BulkWriteResult.unacknowledged
 import static com.mongodb.bulk.WriteRequest.Type.DELETE
@@ -91,7 +104,10 @@ import static com.mongodb.bulk.WriteRequest.Type.INSERT
 import static com.mongodb.bulk.WriteRequest.Type.REPLACE
 import static com.mongodb.bulk.WriteRequest.Type.UPDATE
 import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
 import static spock.util.matcher.HamcrestSupport.expect
 
 @SuppressWarnings('ClassSize')
@@ -100,46 +116,58 @@ class MongoCollectionSpecification extends Specification {
     def namespace = new MongoNamespace('databaseName', 'collectionName')
     def codecRegistry = MongoClients.getDefaultCodecRegistry()
     def readPreference = secondary()
-    def writeConcern = WriteConcern.ACKNOWLEDGED
-    def readConcern = ReadConcern.DEFAULT
+    def readConcern = ReadConcern.MAJORITY
+    def uuidRepresentation = JAVA_LEGACY
+    def collation = Collation.builder().locale('en').build()
 
     def 'should return the correct name from getName'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern,
-                new TestOperationExecutor([null]))
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, uuidRepresentation, new TestOperationExecutor([null]))
 
         expect:
         collection.getNamespace() == namespace
     }
 
-    def 'should behave correctly when using withDefaultClass'() {
+    def 'should behave correctly when using withDocumentClass'() {
         given:
         def newClass = Worker
         def executor = new TestOperationExecutor([])
 
         when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withDocumentClass(newClass)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor).withDocumentClass(newClass)
 
         then:
         collection.getDocumentClass() == newClass
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, newClass, codecRegistry, readPreference, writeConcern,
-                readConcern, executor))
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, newClass, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor))
     }
 
     def 'should behave correctly when using withCodecRegistry'() {
         given:
-        def newCodecRegistry = Stub(CodecRegistry)
+        def newCodecRegistry = fromProviders(new ValueCodecProvider())
         def executor = new TestOperationExecutor([])
 
         when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withCodecRegistry(newCodecRegistry)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor).withCodecRegistry(newCodecRegistry)
 
         then:
         collection.getCodecRegistry() == newCodecRegistry
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, newCodecRegistry, readPreference, writeConcern,
-                readConcern, executor))
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, newCodecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor))
+
+        when:
+        collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, STANDARD, executor).withCodecRegistry(newCodecRegistry)
+
+        then:
+        collection.getCodecRegistry() instanceof OverridableUuidRepresentationCodecRegistry
+        (collection.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).uuidRepresentation == STANDARD
+        (collection.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).wrapped == newCodecRegistry
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, collection.getCodecRegistry(), readPreference,
+                ACKNOWLEDGED, true, true, readConcern, STANDARD, executor))
     }
 
     def 'should behave correctly when using withReadPreference'() {
@@ -148,13 +176,13 @@ class MongoCollectionSpecification extends Specification {
         def executor = new TestOperationExecutor([])
 
         when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withReadPreference(newReadPreference)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor).withReadPreference(newReadPreference)
 
         then:
         collection.getReadPreference() == newReadPreference
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, newReadPreference, writeConcern,
-                readConcern, executor))
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, newReadPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor))
     }
 
     def 'should behave correctly when using withWriteConcern'() {
@@ -163,13 +191,13 @@ class MongoCollectionSpecification extends Specification {
         def executor = new TestOperationExecutor([])
 
         when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withWriteConcern(newWriteConcern)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor).withWriteConcern(newWriteConcern)
 
         then:
         collection.getWriteConcern() == newWriteConcern
         expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, newWriteConcern,
-                readConcern, executor))
+                true, true, readConcern, uuidRepresentation, executor))
     }
 
     def 'should behave correctly when using withReadConcern'() {
@@ -178,242 +206,401 @@ class MongoCollectionSpecification extends Specification {
         def executor = new TestOperationExecutor([])
 
         when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withReadConcern(newReadConcern)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor).withReadConcern(newReadConcern)
 
         then:
         collection.getReadConcern() == newReadConcern
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
-                newReadConcern, executor))
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, newReadConcern, uuidRepresentation, executor))
     }
 
-    def 'should use CountOperation correctly'() {
+    def 'should use CountOperation correctly with count'() {
         given:
         def executor = new TestOperationExecutor([1L, 2L, 3L])
         def filter = new BsonDocument()
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new CountOperation(namespace).filter(filter)
-        def futureResultCallback = new FutureResultCallback<Long>()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new CountOperation(namespace).filter(filter).retryReads(true)
+
+        def countMethod = collection.&count
 
         when:
-        collection.count(futureResultCallback)
-        futureResultCallback.get()
+        execute(countMethod, session)
         def operation = executor.getReadOperation() as CountOperation
 
         then:
+        executor.getClientSession() == session
         expect operation, isTheSameAs(expectedOperation)
 
         when:
-        futureResultCallback = new FutureResultCallback<Long>()
         filter = new BsonDocument('a', new BsonInt32(1))
-        collection.count(filter, futureResultCallback)
-        futureResultCallback.get()
+        execute(countMethod, session, filter)
         operation = executor.getReadOperation() as CountOperation
 
         then:
+        executor.getClientSession() == session
         expect operation, isTheSameAs(expectedOperation.filter(filter))
 
         when:
-        futureResultCallback = new FutureResultCallback<Long>()
         def hint = new BsonDocument('hint', new BsonInt32(1))
-        collection.count(filter, new CountOptions().hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS), futureResultCallback)
-        futureResultCallback.get()
+        execute(countMethod, session, filter, new CountOptions().hint(hint).skip(10).limit(100)
+                .maxTime(100, MILLISECONDS).collation(collation))
         operation = executor.getReadOperation() as CountOperation
 
         then:
-        expect operation, isTheSameAs(expectedOperation.filter(filter).hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS))
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.filter(filter).hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS)
+                .collation(collation))
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
-    def 'should use DistinctOperation correctly'() {
+    def 'should use CountOperation correctly with documentCount'() {
         given:
-        def codec = codecRegistry.get(String)
-        def asyncCursor = Stub(AsyncBatchCursor) {
-            next(_) >> { args -> args[0].onResult(null, null) }
-        }
-        def executor = new TestOperationExecutor([asyncCursor, asyncCursor, asyncCursor])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def filter = new BsonDocument('a', new BsonInt32(1))
-        def futureResultCallback = new FutureResultCallback<List<String>>()
+        def executor = new TestOperationExecutor([1L, 2L, 3L, 4L])
+        def filter = new BsonDocument()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new CountOperation(namespace, CountStrategy.AGGREGATE).filter(filter).retryReads(true)
+
+        def countMethod = collection.&countDocuments
 
         when:
-        collection.distinct('test', String).into([], futureResultCallback)
-        futureResultCallback.get()
-        def operation = executor.getReadOperation() as DistinctOperation
+        execute(countMethod, session)
+        def operation = executor.getReadOperation() as CountOperation
 
         then:
-        expect operation, isTheSameAs(new DistinctOperation(namespace, 'test', codec).filter(new BsonDocument()))
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation)
 
         when:
-        futureResultCallback = new FutureResultCallback<List<String>>()
-        collection.distinct('test', String).filter(filter).into([], futureResultCallback)
-        futureResultCallback.get()
-        operation = executor.getReadOperation() as DistinctOperation
+        filter = new BsonDocument('a', new BsonInt32(1))
+        execute(countMethod, session, filter)
+        operation = executor.getReadOperation() as CountOperation
 
         then:
-        expect operation, isTheSameAs(new DistinctOperation(namespace, 'test', codec).filter(filter))
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.filter(filter))
 
         when:
-        futureResultCallback = new FutureResultCallback<List<String>>()
-        collection.distinct('test', filter, String).maxTime(100, MILLISECONDS).into([], futureResultCallback)
-        futureResultCallback.get()
-        operation = executor.getReadOperation() as DistinctOperation
+        def hint = new BsonDocument('hint', new BsonInt32(1))
+        execute(countMethod, session, filter, new CountOptions().hint(hint).skip(10).limit(100)
+                .maxTime(100, MILLISECONDS).collation(collation))
+        operation = executor.getReadOperation() as CountOperation
 
         then:
-        expect operation, isTheSameAs(new DistinctOperation(namespace, 'test', codec).filter(filter).maxTime(100, MILLISECONDS))
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.filter(filter).hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS)
+                .collation(collation))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use CountOperation correctly with estimatedDocumentCount'() {
+        given:
+        def executor = new TestOperationExecutor([1L, 2L])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new CountOperation(namespace, CountStrategy.COMMAND).filter(new BsonDocument())
+                .retryReads(true)
+
+        def countMethod = collection.&estimatedDocumentCount
+
+        when:
+        execute(countMethod, session)
+        def operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation)
+
+        when:
+        execute(countMethod, session, new EstimatedDocumentCountOptions().maxTime(100, MILLISECONDS))
+        operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.maxTime(100, MILLISECONDS))
+
+        where:
+        session << [null]
     }
 
     def 'should create DistinctIterable correctly'() {
         given:
         def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def filter = new Document('a', 1)
+        def distinctMethod = collection.&distinct
+
+        when:
+        def distinctIterable = execute(distinctMethod, session, 'field', String)
+
+        then:
+        expect distinctIterable, isTheSameAs(new DistinctIterableImpl(session, namespace, Document, String, codecRegistry, readPreference,
+                readConcern, executor, 'field', new BsonDocument(), true))
 
         when:
-        def distinctIterable = collection.distinct('field', String)
+        distinctIterable = execute(distinctMethod, session, 'field', String).filter(filter)
 
         then:
-        expect distinctIterable, isTheSameAs(new DistinctIterableImpl(namespace, Document, String, codecRegistry, readPreference,
-                readConcern, executor, 'field', new BsonDocument()))
+        expect distinctIterable, isTheSameAs(new DistinctIterableImpl(session, namespace, Document, String, codecRegistry, readPreference,
+                readConcern, executor, 'field', filter, true))
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should create FindIterable correctly'() {
         given:
         def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def findMethod = collection.&find
+
+        when:
+        def findIterable = execute(findMethod, session)
+
+        then:
+        expect findIterable, isTheSameAs(new FindIterableImpl(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern, executor, new BsonDocument(), true))
+
+        when:
+        findIterable = execute(findMethod, session, BsonDocument)
+
+        then:
+        expect findIterable, isTheSameAs(new FindIterableImpl(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, executor, new BsonDocument(), true))
+
+        when:
+        findIterable = execute(findMethod, session, new Document())
+
+        then:
+        expect findIterable, isTheSameAs(new FindIterableImpl(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern, executor, new Document(), true))
+
+        when:
+        findIterable = execute(findMethod, session, new Document(), BsonDocument)
+
+        then:
+        expect findIterable, isTheSameAs(new FindIterableImpl(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, executor, new Document(), true))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should create AggregateIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def aggregateMethod = collection.&aggregate
 
         when:
-        def findIterable = collection.find()
+        def aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)])
 
         then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, new BsonDocument(), new FindOptions()))
+        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, [new Document('$match', 1)], AggregationLevel.COLLECTION, true))
 
         when:
-        findIterable = collection.find(BsonDocument)
+        aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)], BsonDocument)
 
         then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference,
-                readConcern, executor, new BsonDocument(), new FindOptions()))
+        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, [new Document('$match', 1)], AggregationLevel.COLLECTION, true))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the aggregation pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
 
         when:
-        findIterable = collection.find(new Document())
+        collection.aggregate(null)
 
         then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, new Document(), new FindOptions()))
+        thrown(IllegalArgumentException)
 
         when:
-        findIterable = collection.find(new Document(), BsonDocument)
+        execute(collection.aggregate([null]))
 
         then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference,
-                readConcern, executor, new Document(), new FindOptions()))
+        thrown(IllegalArgumentException)
     }
 
-    def 'should use AggregateIterable correctly'() {
+    def 'should create ChangeStreamIterable correctly'() {
         given:
         def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def watchMethod = collection.&watch
 
         when:
-        def aggregateIterable = collection.aggregate([new Document('$match', 1)])
+        def changeStreamIterable = execute(watchMethod, session)
 
         then:
-        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, executor, [new Document('$match', 1)]))
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [], Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
 
         when:
-        aggregateIterable = collection.aggregate([new Document('$match', 1)], BsonDocument)
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)])
 
         then:
-        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference,
-                readConcern, executor, [new Document('$match', 1)]))
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], BsonDocument, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the ChangeStreamIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+
+        when:
+        collection.watch((Class) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        execute(collection.watch([null]).&into, null, [])
+
+        then:
+        thrown(IllegalArgumentException)
     }
 
     def 'should create MapReduceIterable correctly'() {
         given:
         def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def mapReduceMethod = collection.&mapReduce
 
         when:
-        def mapReduceIterable = collection.mapReduce('map', 'reduce')
+        def mapReduceIterable = execute(mapReduceMethod, session, 'map', 'reduce')
 
         then:
-        expect mapReduceIterable, isTheSameAs(new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, executor, 'map', 'reduce'))
+        expect mapReduceIterable, isTheSameAs(new MapReduceIterableImpl(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, 'map', 'reduce'))
+
+
+        when:
+        mapReduceIterable = execute(mapReduceMethod, session, 'map', 'reduce', BsonDocument)
+
+        then:
+        expect mapReduceIterable, isTheSameAs(new MapReduceIterableImpl(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, 'map', 'reduce'))
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'bulkWrite should use MixedBulkWriteOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation ->
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, []) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, BsonDocument, codecRegistry, readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation, List<Bson> arrayFilters ->
             new MixedBulkWriteOperation(namespace, [
-                    new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                    new UpdateRequest(new BsonDocument('a', new BsonInt32(2)),
-                            new BsonDocument('a', new BsonInt32(200)), REPLACE).multi(false).upsert(true),
-                    new UpdateRequest(new BsonDocument('a', new BsonInt32(3)),
-                            new BsonDocument('$set', new BsonDocument('a', new BsonInt32(300))), UPDATE).multi(false).upsert(true),
-                    new UpdateRequest(new BsonDocument('a', new BsonInt32(4)),
-                            new BsonDocument('$set', new BsonDocument('a', new BsonInt32(400))), UPDATE).multi(true).upsert(true),
-                    new DeleteRequest(new BsonDocument('a', new BsonInt32(5))).multi(false),
-                    new DeleteRequest(new BsonDocument('a', new BsonInt32(6))).multi(true)
-            ], ordered, wc).bypassDocumentValidation(bypassDocumentValidation)
+                    new InsertRequest(BsonDocument.parse('{_id: 1}')),
+                    new UpdateRequest(BsonDocument.parse('{a: 2}'), BsonDocument.parse('{a: 200}'), REPLACE)
+                            .multi(false).upsert(true).collation(collation),
+                    new UpdateRequest(BsonDocument.parse('{a: 3}'), BsonDocument.parse('{$set: {a: 1}}'), UPDATE)
+                            .multi(false).upsert(true).collation(collation).arrayFilters(arrayFilters),
+                    new UpdateRequest(BsonDocument.parse('{a: 4}'), BsonDocument.parse('{$set: {a: 1}}'), UPDATE).multi(true)
+                            .upsert(true).collation(collation).arrayFilters(arrayFilters),
+                    new DeleteRequest(BsonDocument.parse('{a: 5}')).multi(false),
+                    new DeleteRequest(BsonDocument.parse('{a: 6}')).multi(true).collation(collation)
+            ], ordered, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation)
         }
-        def updateOptions = new UpdateOptions().upsert(true)
-        def bulkOperations = [new InsertOneModel(new Document('_id', 1)),
-                              new ReplaceOneModel(new Document('a', 2), new Document('a', 200), updateOptions),
-                              new UpdateOneModel(new Document('a', 3), new Document('$set', new Document('a', 300)), updateOptions),
-                              new UpdateManyModel(new Document('a', 4), new Document('$set', new Document('a', 400)), updateOptions),
-                              new DeleteOneModel(new Document('a', 5)),
-                              new DeleteManyModel(new Document('a', 6))]
-        def futureResultCallback = new FutureResultCallback<BulkWriteResult>()
-
-        when:
-        collection.bulkWrite(bulkOperations, futureResultCallback)
-        def result = futureResultCallback.get()
+        def updateOptions = new UpdateOptions().upsert(true).collation(collation).arrayFilters(arrayFilters)
+        def replaceOptions = new ReplaceOptions().upsert(true).collation(collation)
+        def deleteOptions = new DeleteOptions().collation(collation)
+        def bulkOperations = [new InsertOneModel(BsonDocument.parse('{_id: 1}')),
+                              new ReplaceOneModel(BsonDocument.parse('{a: 2}'), BsonDocument.parse('{a: 200}'), replaceOptions),
+                              new UpdateOneModel(BsonDocument.parse('{a: 3}'), BsonDocument.parse('{$set: {a: 1}}'), updateOptions),
+                              new UpdateManyModel(BsonDocument.parse('{a: 4}'), BsonDocument.parse('{$set: {a: 1}}'), updateOptions),
+                              new DeleteOneModel(BsonDocument.parse('{a: 5}')),
+                              new DeleteManyModel(BsonDocument.parse('{a: 6}'), deleteOptions)]
+        def bulkWriteMethod = collection.&bulkWrite
+
+        when:
+        def result = execute(bulkWriteMethod, session, bulkOperations)
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         result.wasAcknowledged() == writeConcern.isAcknowledged()
-        def expected = expectedOperation(true, writeConcern, null)
-        expect operation, isTheSameAs(expected)
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, null, arrayFilters))
 
         when:
-        futureResultCallback = new FutureResultCallback<BulkWriteResult>()
-        collection.bulkWrite(bulkOperations, new BulkWriteOptions().ordered(true).bypassDocumentValidation(true), futureResultCallback)
-        result = futureResultCallback.get()
+        result = execute(bulkWriteMethod, session, bulkOperations, new BulkWriteOptions().ordered(true).bypassDocumentValidation(true))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         result.wasAcknowledged() == writeConcern.isAcknowledged()
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true, arrayFilters))
 
         when:
-        futureResultCallback = new FutureResultCallback<BulkWriteResult>()
-        collection.bulkWrite(bulkOperations, new BulkWriteOptions().ordered(false).bypassDocumentValidation(false), futureResultCallback)
-        result = futureResultCallback.get()
+        result = execute(bulkWriteMethod, session, bulkOperations, new BulkWriteOptions().ordered(false).bypassDocumentValidation(false))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         result.wasAcknowledged() == writeConcern.isAcknowledged()
-        expect operation, isTheSameAs(expectedOperation(false, writeConcern, false))
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, false, arrayFilters))
 
         where:
-
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, [])])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(), unacknowledged(), unacknowledged()])
+        [writeConcern, arrayFilters, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
     def 'should handle exceptions in bulkWrite correctly'() {
         given:
         def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
         def executor = new TestOperationExecutor([new MongoException('failure')])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+
+        when:
+        collection.bulkWrite(null, Stub(SingleResultCallback))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.bulkWrite([null], Stub(SingleResultCallback))
+
+        then:
+        thrown(IllegalArgumentException)
 
         when: 'a codec is missing its acceptable to immediately throw'
-        collection.bulkWrite([new InsertOneModel(new Document('_id', 1))], new FutureResultCallback<BulkWriteResult>())
+        collection.bulkWrite([new InsertOneModel(new Document('_id', 1))], Stub(SingleResultCallback))
 
         then:
         thrown(CodecConfigurationException)
@@ -421,131 +608,173 @@ class MongoCollectionSpecification extends Specification {
 
     def 'insertOne should use MixedBulkWriteOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, []) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
         def expectedOperation = { WriteConcern wc, Boolean bypassDocumentValidation ->
             new MixedBulkWriteOperation(namespace, [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))],
-                    true, wc).bypassDocumentValidation(bypassDocumentValidation)
+                    true, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation)
         }
-        def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
+        def insertOneMethod = collection.&insertOne
 
         when:
-        collection.insertOne(new Document('_id', 1), futureResultCallback)
-        futureResultCallback.get()
+        execute(insertOneMethod, session, new Document('_id', 1))
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation(writeConcern, null))
+        executor.getClientSession() == session
 
         when:
-        futureResultCallback = new FutureResultCallback<WriteConcernResult>()
-        collection.insertOne(new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(true), futureResultCallback)
-        futureResultCallback.get()
+        execute(insertOneMethod, session, new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(true))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation(writeConcern, true))
+        executor.getClientSession() == session
 
         when:
-        futureResultCallback = new FutureResultCallback<WriteConcernResult>()
-        collection.insertOne(new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(false), futureResultCallback)
-        futureResultCallback.get()
+        execute(insertOneMethod, session, new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(false))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation(writeConcern, false))
+        executor.getClientSession() == session
 
         where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, [])])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(), unacknowledged(), unacknowledged()])
+        [writeConcern, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
     def 'insertMany should use MixedBulkWriteOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, []) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
         def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation ->
             new MixedBulkWriteOperation(namespace,
                     [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
                      new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))],
-                    ordered, wc).bypassDocumentValidation(bypassDocumentValidation)
+                    ordered, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation)
         }
-        def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
+        def insertManyMethod = collection.&insertMany
 
         when:
-        collection.insertMany([new Document('_id', 1), new Document('_id', 2)], futureResultCallback)
-        futureResultCallback.get()
+        execute(insertManyMethod, session, [new Document('_id', 1), new Document('_id', 2)])
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation(true, writeConcern, null))
+        executor.getClientSession() == session
 
         when:
-        futureResultCallback = new FutureResultCallback<WriteConcernResult>()
-        collection.insertMany([new Document('_id', 1), new Document('_id', 2)],
-                new InsertManyOptions().ordered(true).bypassDocumentValidation(true), futureResultCallback)
-        futureResultCallback.get()
+        execute(insertManyMethod, session, [new Document('_id', 1), new Document('_id', 2)],
+                new InsertManyOptions().ordered(true).bypassDocumentValidation(true))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
+        executor.getClientSession() == session
 
         when:
-        futureResultCallback = new FutureResultCallback<WriteConcernResult>()
-        collection.insertMany([new Document('_id', 1), new Document('_id', 2)],
-                new InsertManyOptions().ordered(false).bypassDocumentValidation(false), futureResultCallback)
-        futureResultCallback.get()
+        execute(insertManyMethod, session, [new Document('_id', 1), new Document('_id', 2)],
+                new InsertManyOptions().ordered(false).bypassDocumentValidation(false))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation(false, writeConcern, false))
+        executor.getClientSession() == session
 
         where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, [])])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(), unacknowledged(), unacknowledged()])
+        [writeConcern, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'should validate the insertMany data correctly'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, Stub(OperationExecutor))
+
+        when:
+        collection.insertMany(null, Stub(SingleResultCallback))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.insertMany([null], Stub(SingleResultCallback))
+
+        then:
+        thrown(IllegalArgumentException)
     }
 
     def 'deleteOne should use MixedBulkWriteOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<DeleteResult>()
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(DELETE, 1, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? DeleteResult.acknowledged(1) : DeleteResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def deleteOneMethod = collection.&deleteOne
 
         when:
-        collection.deleteOne(new Document('_id', 1), futureResultCallback)
-        def result = futureResultCallback.get()
+        def result = execute(deleteOneMethod, session, new Document('_id', 1))
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(false)],
+                true, writeConcern, retryWrites))
+        result == expectedResult
+        executor.getClientSession() == session
+
+        when:
+        result = execute(deleteOneMethod, session, new Document('_id', 1), new DeleteOptions().collation(collation))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
         expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
-                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))
-                         .multi(false)],
-                true, writeConcern))
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(false).collation(collation)],
+                true, writeConcern, retryWrites))
         result == expectedResult
+        executor.getClientSession() == session
 
         where:
-        writeConcern                | executor                                                 | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(DELETE, 1, [])]) | DeleteResult.acknowledged(1)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged()])            | DeleteResult.unacknowledged()
+        [writeConcern, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
     def 'deleteOne should translate BulkWriteException correctly'() {
         given:
         def bulkWriteException = new MongoBulkWriteException(acknowledged(0, 0, 1, null, []), [],
-                                                             new WriteConcernError(100, '', new BsonDocument()),
-                                                             new ServerAddress());
+                new WriteConcernError(100, '', new BsonDocument()),
+                new ServerAddress())
 
         def executor = new TestOperationExecutor([bulkWriteException])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, WriteConcern.ACKNOWLEDGED,
-                                                 readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<DeleteResult>()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
 
         when:
-        collection.deleteOne(new Document('_id', 1), futureResultCallback)
-        futureResultCallback.get()
+        execute(collection.&deleteOne, null, new Document('_id', 1))
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -558,68 +787,109 @@ class MongoCollectionSpecification extends Specification {
 
     def 'deleteMany should use MixedBulkWriteOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<DeleteResult>()
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(DELETE, 1, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? DeleteResult.acknowledged(1) : DeleteResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def deleteManyMethod = collection.&deleteMany
 
         when:
-        collection.deleteMany(new Document('_id', 1), futureResultCallback)
-        def result = futureResultCallback.get()
+        def result = execute(deleteManyMethod, session, new Document('_id', 1))
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
-        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))
-                                                                                      .multi(true)],
-                true, writeConcern))
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(true)],
+                true, writeConcern, retryWrites))
+        result == expectedResult
+
+        when:
+        result = execute(deleteManyMethod, session, new Document('_id', 1), new DeleteOptions().collation(collation))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(true).collation(collation)],
+                true, writeConcern, retryWrites))
         result == expectedResult
 
         where:
-        writeConcern                | executor                                                 | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(DELETE, 6, [])]) | DeleteResult.acknowledged(6)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged()])            | DeleteResult.unacknowledged()
+        [writeConcern, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
-    @SuppressWarnings('LineLength')
     def 'replaceOne should use MixedBulkWriteOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<UpdateResult>()
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ?
+                    acknowledged(REPLACE, 1, modifiedCount,
+                            upsertedId == null ? [] : [new BulkWriteUpsert(0, upsertedId)]) :
+                    unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ?
+                UpdateResult.acknowledged(1, modifiedCount, upsertedId) : UpdateResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+
+        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation ->
+            new MixedBulkWriteOperation(namespace,
+                    [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), REPLACE)
+                             .collation(collation).upsert(upsert)], true, wc, retryWrites)
+                    .bypassDocumentValidation(bypassDocumentValidation)
+        }
+        def replaceOneMethod = collection.&replaceOne
 
         when:
-        collection.replaceOne(new Document('a', 1), new Document('a', 10),
-                new UpdateOptions().bypassDocumentValidation(bypassDocumentValidation), futureResultCallback)
-        def result = futureResultCallback.get()
+        def result = execute(replaceOneMethod, session, new Document('a', 1), new Document('a', 10),
+                new UpdateOptions().bypassDocumentValidation(bypassDocumentValidation))
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
-        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                new BsonDocument('a', new BsonInt32(10)), REPLACE)], true, writeConcern).bypassDocumentValidation(bypassDocumentValidation))
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, bypassDocumentValidation, null))
+        executor.getClientSession() == session
+        result == expectedResult
+
+        when:
+        result = execute(replaceOneMethod, session, new Document('a', 1), new Document('a', 10),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(bypassDocumentValidation).collation(collation))
+        executor.getClientSession() == session
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, bypassDocumentValidation, collation))
         result == expectedResult
 
         where:
-        bypassDocumentValidation << [null, true, false, null]
-
-        writeConcern                | executor                                                        | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(REPLACE, 1, null, [])]) | UpdateResult.acknowledged(1, null, null)
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(REPLACE, 1, 1, [])])    | UpdateResult.acknowledged(1, 1, null)
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(REPLACE, 1, 1,
-                [new BulkWriteUpsert(0, new BsonInt32(42))])])                                        | UpdateResult.acknowledged(1, 1, new BsonInt32(42))
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged()])                   | UpdateResult.unacknowledged()
+        [bypassDocumentValidation, modifiedCount, upsertedId, writeConcern, session, retryWrites, retryReads] << [
+                [null, true, false],
+                [1],
+                [null, new BsonInt32(42)],
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
     def 'replaceOne should translate BulkWriteException correctly'() {
         given:
         def bulkWriteException = new MongoBulkWriteException(bulkWriteResult, [],
-                                                             new WriteConcernError(100, '', new BsonDocument()),
-                                                             new ServerAddress());
+                new WriteConcernError(100, '', new BsonDocument()), new ServerAddress())
 
         def executor = new TestOperationExecutor([bulkWriteException])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, WriteConcern.ACKNOWLEDGED,
-                                                 readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<UpdateResult>()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
 
         when:
-        collection.replaceOne(new Document('_id', 1), new Document('_id', 1), futureResultCallback)
-        futureResultCallback.get()
+        execute(collection.&replaceOne, null, new Document('_id', 1), new Document('_id', 1))
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -630,96 +900,112 @@ class MongoCollectionSpecification extends Specification {
         ex.writeResult.upsertedId == writeResult.upsertedId
 
         where:
-        bulkWriteResult                                                       | writeResult
-        acknowledged(0, 1, 0, 1, [])                                          | WriteConcernResult.acknowledged(1, true, null)
-        acknowledged(0, 0, 0, 0, [new BulkWriteUpsert(0, new BsonInt32(1))])  | WriteConcernResult.acknowledged(1, false, new BsonInt32(1))
+        bulkWriteResult                                                           | writeResult
+        acknowledged(0, 1, 0, 1, [])                                              | WriteConcernResult.acknowledged(1, true, null)
+        acknowledged(0, 0, 0, 0,
+                [new BulkWriteUpsert(0, new BsonInt32(1))])                       | WriteConcernResult.acknowledged(1, false,
+                new BsonInt32(1))
     }
 
-
     def 'updateOne should use MixedBulkWriteOperationOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation ->
-            new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                    new BsonDocument('a', new BsonInt32(10)), UPDATE).multi(false).upsert(upsert)], true, wc)
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(UPDATE, 1, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? UpdateResult.acknowledged(1, 0, null) : UpdateResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation,
+                                  List<Bson> arrayFilters ->
+            new MixedBulkWriteOperation(namespace,
+                    [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), UPDATE)
+                             .multi(false).upsert(upsert).collation(collation).arrayFilters(arrayFilters)], true, wc, retryWrites)
                     .bypassDocumentValidation(bypassDocumentValidation)
         }
-        def futureResultCallback = new FutureResultCallback<UpdateResult>()
+        def updateOneMethod = collection.&updateOne
 
         when:
-        collection.updateOne(new Document('a', 1), new Document('a', 10), futureResultCallback)
-        def result = futureResultCallback.get()
+        def result = execute(updateOneMethod, session, new Document('a', 1), new Document('a', 10))
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
-        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null))
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null, null, null))
+        executor.getClientSession() == session
         result == expectedResult
 
         when:
-        futureResultCallback = new FutureResultCallback<UpdateResult>()
-        collection.updateOne(new Document('a', 1), new Document('a', 10),
-                new UpdateOptions().upsert(true).bypassDocumentValidation(true), futureResultCallback)
-        result = futureResultCallback.get()
+        result = execute(updateOneMethod, session, new Document('a', 1), new Document('a', 10),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true).collation(collation)
+                        .arrayFilters(arrayFilters))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true, collation, arrayFilters))
+        executor.getClientSession() == session
         result == expectedResult
 
         where:
-        writeConcern                | executor                                                 | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(UPDATE, 1, []),
-                                                                 acknowledged(UPDATE, 1, [])]) | UpdateResult.acknowledged(1, 0, null)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(),
-                                                                 unacknowledged()])            | UpdateResult.unacknowledged()
+        [writeConcern, arrayFilters, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
-    def 'should use UpdateOperation correctly for updateMany'() {
+    def 'updateMany should use MixedBulkWriteOperationOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation ->
-            new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                    new BsonDocument('a', new BsonInt32(10)), UPDATE).multi(true).upsert(upsert)],
-                    true, wc).bypassDocumentValidation(bypassDocumentValidation)
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(UPDATE, 5, 3, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? UpdateResult.acknowledged(5, 3, null) : UpdateResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation,
+                                  List<Bson> arrayFilters ->
+            new MixedBulkWriteOperation(namespace,
+                    [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), UPDATE)
+                             .multi(true).upsert(upsert).collation(collation).arrayFilters(arrayFilters)], true, wc, retryWrites)
+                    .bypassDocumentValidation(bypassDocumentValidation)
         }
-        def futureResultCallback = new FutureResultCallback<UpdateResult>()
+        def updateManyMethod = collection.&updateMany
 
         when:
-        collection.updateMany(new Document('a', 1), new Document('a', 10), futureResultCallback)
-        def result = futureResultCallback.get()
+        def result = execute(updateManyMethod, session, new Document('a', 1), new Document('a', 10))
         def operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
-        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null))
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null, null, null))
         result == expectedResult
 
         when:
-        futureResultCallback = new FutureResultCallback<UpdateResult>()
-        collection.updateMany(new Document('a', 1), new Document('a', 10),
-                new UpdateOptions().upsert(true).bypassDocumentValidation(true), futureResultCallback)
-        result = futureResultCallback.get()
+        result = execute(updateManyMethod, session, new Document('a', 1), new Document('a', 10),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true).collation(collation)
+                        .arrayFilters(arrayFilters))
         operation = executor.getWriteOperation() as MixedBulkWriteOperation
 
         then:
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true, collation, arrayFilters))
         result == expectedResult
 
         where:
-        writeConcern                | executor                                                    | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(UPDATE, 5, 3, []),
-                                                                 acknowledged(UPDATE, 5, 3, [])]) | UpdateResult.acknowledged(5, 3, null)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(),
-                                                                 unacknowledged()])               | UpdateResult.unacknowledged()
+        [writeConcern, arrayFilters, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
-    def 'write operation should translate MongoBulkWriteException to MongoWriteException'() {
+    def 'should translate MongoBulkWriteException to MongoWriteException'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<Void>()
-        collection.insertOne(new Document('_id', 1), futureResultCallback)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
 
         when:
-        futureResultCallback.get()
+        execute(collection.&insertOne, null, new Document('_id', 1))
 
         then:
         def e = thrown(MongoWriteException)
@@ -731,96 +1017,81 @@ class MongoCollectionSpecification extends Specification {
                 null, new ServerAddress())])
     }
 
-    def 'write operation should translate MongoBulkWriteException to MongoWriteConcernException'() {
+    def 'should translate MongoBulkWriteException to MongoWriteConcernException'() {
         given:
         def executor = new TestOperationExecutor([new MongoBulkWriteException(acknowledged(INSERT, 1, []), [],
                 new WriteConcernError(42, 'oops', new BsonDocument()),
                 new ServerAddress())])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<Void>()
-        collection.insertOne(new Document('_id', 1), futureResultCallback)
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
 
         when:
-        futureResultCallback.get()
+        execute(collection.&insertOne, null, new Document('_id', 1))
 
         then:
         def e = thrown(MongoWriteConcernException)
         e.writeConcernError == new WriteConcernError(42, 'oops', new BsonDocument())
     }
 
-    def 'write operation should pass other exception through'() {
-        given:
-        def exception = new MongoSocketReadException('oops', new ServerAddress())
-        def executor = new TestOperationExecutor([exception]);
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<Void>()
-        collection.insertOne(new Document('_id', 1), futureResultCallback)
-
-        when:
-        futureResultCallback.get()
-
-        then:
-        def e = thrown(MongoSocketReadException)
-        e.is(exception)
-    }
-
     def 'should use FindOneAndDeleteOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new FindAndDeleteOperation(namespace, writeConcern, new DocumentCodec())
+        def executor = new TestOperationExecutor((1..4).collect {
+            writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, ACKNOWLEDGED,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new FindAndDeleteOperation(namespace, ACKNOWLEDGED, retryWrites,  new DocumentCodec())
                 .filter(new BsonDocument('a', new BsonInt32(1)))
-
-        def futureResultCallback = new FutureResultCallback<Document>()
+        def findOneAndDeleteMethod = collection.&findOneAndDelete
 
         when:
-        collection.findOneAndDelete(new Document('a', 1), futureResultCallback)
-        futureResultCallback.get()
+        execute(findOneAndDeleteMethod, session, new Document('a', 1))
         def operation = executor.getWriteOperation() as FindAndDeleteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
 
         when:
-        futureResultCallback = new FutureResultCallback<Document>()
-        collection.findOneAndDelete(new Document('a', 1), new FindOneAndDeleteOptions().projection(new Document('projection', 1))
-                .maxTime(100, MILLISECONDS), futureResultCallback)
-        futureResultCallback.get()
+        execute(findOneAndDeleteMethod, session, new Document('a', 1),
+                new FindOneAndDeleteOptions().projection(new Document('projection', 1))
+                        .maxTime(100, MILLISECONDS).collation(collation))
         operation = executor.getWriteOperation() as FindAndDeleteOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS))
+                .maxTime(100, MILLISECONDS).collation(collation))
 
         where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null)])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged()])
+        [writeConcern, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
     def 'should use FindOneAndReplaceOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new FindAndReplaceOperation(namespace, writeConcern, new DocumentCodec(),
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : WriteConcernResult.unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new FindAndReplaceOperation(namespace, writeConcern, retryWrites, new DocumentCodec(),
                 new BsonDocument('a', new BsonInt32(10))).filter(new BsonDocument('a', new BsonInt32(1)))
-
-        def futureResultCallback = new FutureResultCallback<Document>()
+        def findOneAndReplaceMethod = collection.&findOneAndReplace
 
         when:
-        collection.findOneAndReplace(new Document('a', 1), new Document('a', 10), futureResultCallback)
-        futureResultCallback.get()
+        execute(findOneAndReplaceMethod, session, new Document('a', 1), new Document('a', 10))
         def operation = executor.getWriteOperation() as FindAndReplaceOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
 
         when:
-        futureResultCallback = new FutureResultCallback<Document>()
-        collection.findOneAndReplace(new Document('a', 1), new Document('a', 10),
-                new FindOneAndReplaceOptions().projection(new Document('projection', 1)).maxTime(100, MILLISECONDS)
-                        .bypassDocumentValidation(false), futureResultCallback)
-        futureResultCallback.get()
+        execute(findOneAndReplaceMethod, session, new Document('a', 1), new Document('a', 10),
+                new FindOneAndReplaceOptions().projection(new Document('projection', 1))
+                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
         operation = executor.getWriteOperation() as FindAndReplaceOperation
 
         then:
@@ -828,103 +1099,96 @@ class MongoCollectionSpecification extends Specification {
                 .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
 
         when:
-        futureResultCallback = new FutureResultCallback<Document>()
-        collection.findOneAndReplace(new Document('a', 1), new Document('a', 10),
-                new FindOneAndReplaceOptions().projection(new Document('projection', 1)).maxTime(100, MILLISECONDS)
-                        .bypassDocumentValidation(true), futureResultCallback)
-        futureResultCallback.get()
+        execute(findOneAndReplaceMethod, session, new Document('a', 1), new Document('a', 10),
+                new FindOneAndReplaceOptions().projection(new Document('projection', 1))
+                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(true).collation(collation))
         operation = executor.getWriteOperation() as FindAndReplaceOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS).bypassDocumentValidation(true))
+                .maxTime(100, MILLISECONDS).bypassDocumentValidation(true).collation(collation))
 
         where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null)])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged()])
+        [writeConcern, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
     def 'should use FindAndUpdateOperation correctly'() {
         given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, new DocumentCodec(),
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, retryReads, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, retryWrites, new DocumentCodec(),
                 new BsonDocument('a', new BsonInt32(10))).filter(new BsonDocument('a', new BsonInt32(1)))
-
-        def futureResultCallback = new FutureResultCallback<Document>()
+        def findOneAndUpdateMethod = collection.&findOneAndUpdate
 
         when:
-        collection.findOneAndUpdate(new Document('a', 1), new Document('a', 10), futureResultCallback)
-        futureResultCallback.get()
+        execute(findOneAndUpdateMethod, session, new Document('a', 1), new Document('a', 10))
         def operation = executor.getWriteOperation() as FindAndUpdateOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
 
         when:
-        futureResultCallback = new FutureResultCallback<Document>()
-        collection.findOneAndUpdate(new Document('a', 1), new Document('a', 10),
-                new FindOneAndUpdateOptions().projection(new Document('projection', 1))
-                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(false), futureResultCallback)
-        futureResultCallback.get()
-        operation = executor.getWriteOperation() as FindAndUpdateOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
-
-        when:
-        futureResultCallback = new FutureResultCallback<Document>()
-        collection.findOneAndUpdate(new Document('a', 1), new Document('a', 10),
-                new FindOneAndUpdateOptions().projection(new Document('projection', 1))
-                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(true), futureResultCallback)
-        futureResultCallback.get()
+        execute(findOneAndUpdateMethod, session, new Document('a', 1), new Document('a', 10),
+                new FindOneAndUpdateOptions().projection(new Document('projection', 1)).maxTime(100, MILLISECONDS)
+                        .bypassDocumentValidation(bypassDocumentValidation).collation(collation).arrayFilters(arrayFilters))
         operation = executor.getWriteOperation() as FindAndUpdateOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS).bypassDocumentValidation(true))
+                .maxTime(100, MILLISECONDS).bypassDocumentValidation(bypassDocumentValidation).collation(collation)
+                .arrayFilters(arrayFilters))
 
         where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null)])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged()])
+        [writeConcern, arrayFilters, bypassDocumentValidation, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [true, false],
+                [null, Stub(ClientSession)],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
     def 'should use DropCollectionOperation correctly'() {
         given:
         def executor = new TestOperationExecutor([null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new DropCollectionOperation(namespace)
-        def futureResultCallback = new FutureResultCallback<Void>()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new DropCollectionOperation(namespace, ACKNOWLEDGED)
+        def dropMethod = collection.&drop
 
         when:
-        collection.drop(futureResultCallback)
-        futureResultCallback.get()
+        execute(dropMethod, session)
         def operation = executor.getWriteOperation() as DropCollectionOperation
+        executor.getClientSession() == session
 
         then:
         expect operation, isTheSameAs(expectedOperation)
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should use CreateIndexOperations correctly'() {
         given:
-        def executor = new TestOperationExecutor([null, null, null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def executor = new TestOperationExecutor([null, null, null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def createIndexMethod = collection.&createIndex
+        def createIndexesMethod = collection.&createIndexes
 
         when:
-        def expectedOperation = new CreateIndexesOperation(namespace, [new IndexRequest(new BsonDocument('key', new BsonInt32(1)))])
-        def futureResultCallback = new FutureResultCallback<String>()
-        collection.createIndex(new Document('key', 1), futureResultCallback)
-        def indexName = futureResultCallback.get()
+        def expectedOperation = new CreateIndexesOperation(namespace,
+                [new IndexRequest(new BsonDocument('key', new BsonInt32(1)))], ACKNOWLEDGED)
+        def indexName = execute(createIndexMethod, session, new Document('key', 1))
         def operation = executor.getWriteOperation() as CreateIndexesOperation
 
         then:
@@ -932,17 +1196,28 @@ class MongoCollectionSpecification extends Specification {
         indexName == 'key_1'
 
         when:
-        expectedOperation = new CreateIndexesOperation(namespace, [new IndexRequest(new BsonDocument('key', new BsonInt32(1)))])
-        futureResultCallback = new FutureResultCallback<List<String>>()
-        expectedOperation = new CreateIndexesOperation(namespace, [new IndexRequest(new BsonDocument('key', new BsonInt32(1))),
-                                                                   new IndexRequest(new BsonDocument('key1', new BsonInt32(1)))])
-        collection.createIndexes([new IndexModel(new Document('key', 1)), new IndexModel(new Document('key1', 1))],
-                                 futureResultCallback)
-        def indexNames = futureResultCallback.get()
+        expectedOperation = new CreateIndexesOperation(namespace,
+                [new IndexRequest(new BsonDocument('key', new BsonInt32(1))),
+                 new IndexRequest(new BsonDocument('key1', new BsonInt32(1)))], ACKNOWLEDGED)
+        def indexNames = execute(createIndexesMethod, session, [new IndexModel(new Document('key', 1)),
+                                                                new IndexModel(new Document('key1', 1))])
+        operation = executor.getWriteOperation() as CreateIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+        indexNames == ['key_1', 'key1_1']
+
+        when:
+        expectedOperation = expectedOperation.maxTime(10, MILLISECONDS)
+        indexNames = execute(createIndexesMethod, session,
+                [new IndexModel(new Document('key', 1)), new IndexModel(new Document('key1', 1))],
+                new CreateIndexOptions().maxTime(10, MILLISECONDS))
         operation = executor.getWriteOperation() as CreateIndexesOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
         indexNames == ['key_1', 'key1_1']
 
         when:
@@ -964,9 +1239,11 @@ class MongoCollectionSpecification extends Specification {
                          .max(180.0)
                          .bucketSize(200.0)
                          .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
-                         .partialFilterExpression(BsonDocument.parse('{status: "active"}'))])
-        futureResultCallback = new FutureResultCallback<String>()
-        collection.createIndex(new Document('key', 1), new IndexOptions()
+                         .partialFilterExpression(BsonDocument.parse('{status: "active"}'))
+                         .collation(collation)
+                         .wildcardProjection(new BsonDocument('a', new BsonInt32(1)))
+                ], ACKNOWLEDGED)
+        indexName = execute(createIndexMethod, session, new Document('key', 1), new IndexOptions()
                 .background(true)
                 .unique(true)
                 .sparse(true)
@@ -983,100 +1260,358 @@ class MongoCollectionSpecification extends Specification {
                 .max(180.0)
                 .bucketSize(200.0)
                 .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
-                .partialFilterExpression(BsonDocument.parse('{status: "active"}')), futureResultCallback)
-        indexName = futureResultCallback.get()
+                .partialFilterExpression(BsonDocument.parse('{status: "active"}'))
+                .collation(collation)
+                .wildcardProjection(new BsonDocument('a', new BsonInt32(1))))
         operation = executor.getWriteOperation() as CreateIndexesOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
         indexName == 'aIndex'
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the createIndexes data correctly'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, Stub(OperationExecutor))
+
+        when:
+        collection.createIndexes(null, Stub(SingleResultCallback))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.createIndexes([null], Stub(SingleResultCallback))
+
+        then:
+        thrown(IllegalArgumentException)
     }
 
     def 'should use ListIndexesOperations correctly'() {
         given:
-        def asyncCursor = Stub(AsyncBatchCursor) {
-            next(_) >> { args -> args[0].onResult(null, null) }
-        }
-        def executor = new TestOperationExecutor([asyncCursor, asyncCursor])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<List<Document>>()
+        def asyncBatchCursor = Stub(AsyncBatchCursor)
+        def executor = new TestOperationExecutor([asyncBatchCursor, asyncBatchCursor, asyncBatchCursor])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def listIndexesMethod = collection.&listIndexes
 
         when:
-        collection.listIndexes().into([], futureResultCallback)
-        futureResultCallback.get()
+        execute(createIterable(listIndexesMethod, session))
         def operation = executor.getReadOperation() as ListIndexesOperation
 
         then:
-        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()))
+        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()).retryReads(true))
+        executor.getClientSession() == session
 
         when:
-        futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
-        collection.listIndexes(BsonDocument).into([], futureResultCallback)
-        futureResultCallback.get()
+        def indexes = execute(createIterable(listIndexesMethod, session, BsonDocument))
         operation = executor.getReadOperation() as ListIndexesOperation
+        indexes == []
 
         then:
-        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new BsonDocumentCodec()))
+        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new BsonDocumentCodec()).retryReads(true))
+        executor.getClientSession() == session
+
+        when:
+        execute(createIterable(listIndexesMethod, session).batchSize(10).maxTime(10, MILLISECONDS))
+        operation = executor.getReadOperation() as ListIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()).batchSize(10)
+                .maxTime(10, MILLISECONDS).retryReads(true))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should use DropIndexOperation correctly for dropIndex'() {
         given:
-        def executor = new TestOperationExecutor([null, null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def executor = new TestOperationExecutor([null, null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def dropIndexMethod = collection.&dropIndex
 
         when:
-        def expectedOperation = new DropIndexOperation(namespace, 'indexName')
-        def futureResultCallback = new FutureResultCallback<Void>()
-        collection.dropIndex('indexName', futureResultCallback)
-        futureResultCallback.get()
+        def expectedOperation = new DropIndexOperation(namespace, 'indexName', ACKNOWLEDGED)
+        execute(dropIndexMethod, session, 'indexName')
         def operation = executor.getWriteOperation() as DropIndexOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
 
         when:
         def keys = new BsonDocument('x', new BsonInt32(1))
-        expectedOperation = new DropIndexOperation(namespace, keys)
-        futureResultCallback = new FutureResultCallback<Void>()
-        collection.dropIndex(keys, futureResultCallback)
-        futureResultCallback.get()
+        expectedOperation = new DropIndexOperation(namespace, keys, ACKNOWLEDGED)
+        execute(dropIndexMethod, session, keys)
+        operation = executor.getWriteOperation() as DropIndexOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        when:
+        expectedOperation = expectedOperation.maxTime(10, MILLISECONDS)
+        execute(dropIndexMethod, session, keys, new DropIndexOptions().maxTime(10, MILLISECONDS))
         operation = executor.getWriteOperation() as DropIndexOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should use DropIndexOperation correctly for dropIndexes'() {
         given:
-        def executor = new TestOperationExecutor([null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new DropIndexOperation(namespace, '*')
-        def futureResultCallback = new FutureResultCallback<Void>()
+        def executor = new TestOperationExecutor([null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def expectedOperation = new DropIndexOperation(namespace, '*', ACKNOWLEDGED)
+        def dropIndexesMethod = collection.&dropIndexes
 
         when:
-        collection.dropIndexes(futureResultCallback)
-        futureResultCallback.get()
+        execute(dropIndexesMethod, session)
         def operation = executor.getWriteOperation() as DropIndexOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        when:
+        expectedOperation = expectedOperation.maxTime(10, MILLISECONDS)
+        execute(dropIndexesMethod, session, new DropIndexOptions().maxTime(10, MILLISECONDS))
+        operation = executor.getWriteOperation() as DropIndexOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should use RenameCollectionOperation correctly'() {
         given:
-        def executor = new TestOperationExecutor([null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def executor = new TestOperationExecutor([null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
         def newNamespace = new MongoNamespace(namespace.getDatabaseName(), 'newName')
-        def expectedOperation = new RenameCollectionOperation(namespace, newNamespace)
-        def futureResultCallback = new FutureResultCallback<Void>()
+        def renameCollectionOptions = new RenameCollectionOptions().dropTarget(dropTarget)
+        def expectedOperation = new RenameCollectionOperation(namespace, newNamespace, ACKNOWLEDGED)
+        def renameCollection = collection.&renameCollection
 
         when:
-        collection.renameCollection(newNamespace, futureResultCallback)
-        futureResultCallback.get()
+        execute(renameCollection, session, newNamespace)
         def operation = executor.getWriteOperation() as RenameCollectionOperation
 
         then:
         expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        when:
+        execute(renameCollection, session, newNamespace, renameCollectionOptions)
+        operation = executor.getWriteOperation() as RenameCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.dropTarget(dropTarget))
+        executor.getClientSession() == session
+
+        where:
+        [session, dropTarget] << [[null, Stub(ClientSession)], [true, false]].combinations()
+    }
+
+    def 'should not expect to mutate the document when inserting'() {
+        given:
+        def executor = new TestOperationExecutor([null])
+        def customCodecRegistry = fromRegistries(fromProviders(new ImmutableDocumentCodecProvider()), codecRegistry)
+        def collection = new MongoCollectionImpl(namespace, ImmutableDocument, customCodecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def document = new ImmutableDocument(['a': 1])
+
+        when:
+        collection.insertOne(document, Stub(SingleResultCallback))
+
+        then:
+        !document.containsKey('_id')
+
+        when:
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+        def request = operation.writeRequests.get(0) as InsertRequest
+
+        then:
+        request.getDocument().containsKey('_id')
+    }
+
+    def 'should not expect to mutate the document when bulk writing'() {
+        given:
+        def executor = new TestOperationExecutor([null])
+        def customCodecRegistry = fromRegistries(fromProviders(new ImmutableDocumentCodecProvider()), codecRegistry)
+        def collection = new MongoCollectionImpl(namespace, ImmutableDocument, customCodecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, executor)
+        def document = new ImmutableDocument(['a': 1])
+
+        when:
+        collection.bulkWrite([new InsertOneModel<ImmutableDocument>(document)], Stub(SingleResultCallback))
+
+        then:
+        !document.containsKey('_id')
+
+        when:
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+        def request = operation.writeRequests.get(0) as InsertRequest
+
+        then:
+        request.getDocument().containsKey('_id')
+    }
+
+    def 'should validate the client session correctly'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, uuidRepresentation, Stub(OperationExecutor))
+        def callback = Stub(SingleResultCallback)
+
+        when:
+        collection.aggregate(null, [Document.parse('{$match:{}}')])
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.bulkWrite(null, [new InsertOneModel(new Document())], callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.count(null, callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.countDocuments(null, callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.createIndex(null, new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.createIndexes(null, [Stub(IndexModel)], callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.deleteMany(null, new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.deleteOne(null, new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.distinct(null, 'field', Document)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.distinct(null, new Document(), Document)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.drop(null, callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.dropIndex(null, 'index', callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.dropIndex(null, new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.dropIndexes(null, callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.find((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.findOneAndDelete(null, new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.findOneAndReplace(null, new Document(), new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.findOneAndUpdate(null, new Document(), new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.insertMany(null, [new Document()], callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.insertOne(null, new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.listIndexes((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.mapReduce(null, '')
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.renameCollection(null, new MongoNamespace('db', 'coll'), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.replaceOne(null, new Document(), new Document(), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.updateMany(null, new Document(), Document.parse('{$set: {a: 1}}'), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.updateOne(null, new Document(), Document.parse('{$set: {a: 1}}'), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.watch((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
     }
 
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MongoDatabaseSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MongoDatabaseSpecification.groovy
index dd74b62286a..71b8a781569 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/MongoDatabaseSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MongoDatabaseSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,26 +19,37 @@ package com.mongodb.async.client
 import com.mongodb.MongoNamespace
 import com.mongodb.ReadConcern
 import com.mongodb.WriteConcern
-import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.client.model.AggregationLevel
+import com.mongodb.client.model.Collation
 import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.CreateViewOptions
 import com.mongodb.client.model.IndexOptionDefaults
 import com.mongodb.client.model.ValidationAction
 import com.mongodb.client.model.ValidationLevel
 import com.mongodb.client.model.ValidationOptions
+import com.mongodb.client.model.changestream.ChangeStreamLevel
 import com.mongodb.operation.CommandReadOperation
 import com.mongodb.operation.CreateCollectionOperation
+import com.mongodb.operation.CreateViewOperation
 import com.mongodb.operation.DropDatabaseOperation
+import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.Document
+import org.bson.UuidRepresentation
 import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.configuration.CodecRegistry
+import org.bson.codecs.ValueCodecProvider
+import org.bson.internal.OverridableUuidRepresentationCodecRegistry
 import spock.lang.Specification
 
 import static com.mongodb.CustomMatchers.isTheSameAs
 import static com.mongodb.ReadPreference.primary
 import static com.mongodb.ReadPreference.primaryPreferred
 import static com.mongodb.ReadPreference.secondary
+import static com.mongodb.async.client.TestHelper.execute
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 import static spock.util.matcher.HamcrestSupport.expect
 
@@ -49,10 +60,34 @@ class MongoDatabaseSpecification extends Specification {
     def readPreference = secondary()
     def writeConcern = WriteConcern.ACKNOWLEDGED
     def readConcern = ReadConcern.DEFAULT
+    def uuidRepresentation = UuidRepresentation.JAVA_LEGACY
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should throw IllegalArgumentException if name is invalid'() {
+        when:
+        new MongoDatabaseImpl('a.b', codecRegistry, readPreference, writeConcern, false, true,
+                readConcern, uuidRepresentation, new TestOperationExecutor([]))
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should throw IllegalArgumentException from getCollection if collectionName is invalid'() {
+        given:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, new TestOperationExecutor([]))
+
+        when:
+        database.getCollection('')
+
+        then:
+        thrown(IllegalArgumentException)
+    }
 
     def 'should return the correct name from getName'() {
         given:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, new TestOperationExecutor([]))
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, new TestOperationExecutor([]))
 
         expect:
         database.getName() == name
@@ -60,16 +95,30 @@ class MongoDatabaseSpecification extends Specification {
 
     def 'should behave correctly when using withCodecRegistry'() {
         given:
-        def newCodecRegistry = Stub(CodecRegistry)
+        def newCodecRegistry = fromProviders(new ValueCodecProvider())
         def executor = new TestOperationExecutor([])
 
         when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern,
-                readConcern, executor).withCodecRegistry(newCodecRegistry)
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                JAVA_LEGACY, executor)
+                .withCodecRegistry(newCodecRegistry)
 
         then:
         database.getCodecRegistry() == newCodecRegistry
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, newCodecRegistry, readPreference, writeConcern, readConcern, executor))
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, newCodecRegistry, readPreference, writeConcern,
+                false, true, readConcern, JAVA_LEGACY, executor))
+
+        when:
+        database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                STANDARD, executor)
+                .withCodecRegistry(newCodecRegistry)
+
+        then:
+        database.getCodecRegistry() instanceof OverridableUuidRepresentationCodecRegistry
+        (database.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).uuidRepresentation == STANDARD
+        (database.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).wrapped == newCodecRegistry
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, database.getCodecRegistry(), readPreference, writeConcern,
+                false, true, readConcern, STANDARD, executor))
     }
 
     def 'should behave correctly when using withReadPreference'() {
@@ -78,12 +127,14 @@ class MongoDatabaseSpecification extends Specification {
         def executor = new TestOperationExecutor([])
 
         when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern,
-                readConcern, executor).withReadPreference(newReadPreference)
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+                .withReadPreference(newReadPreference)
 
         then:
         database.getReadPreference() == newReadPreference
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, newReadPreference, writeConcern, readConcern, executor))
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, newReadPreference, writeConcern, false, true,
+                readConcern, uuidRepresentation, executor))
     }
 
     def 'should behave correctly when using withWriteConcern'() {
@@ -92,12 +143,14 @@ class MongoDatabaseSpecification extends Specification {
         def executor = new TestOperationExecutor([])
 
         when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withWriteConcern(newWriteConcern)
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+                .withWriteConcern(newWriteConcern)
 
         then:
         database.getWriteConcern() == newWriteConcern
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, newWriteConcern, readConcern, executor))
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, newWriteConcern, false, true, readConcern,
+                uuidRepresentation, executor))
     }
 
 
@@ -107,115 +160,134 @@ class MongoDatabaseSpecification extends Specification {
         def executor = new TestOperationExecutor([])
 
         when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withReadConcern(newReadConcern)
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+                .withReadConcern(newReadConcern)
 
         then:
         database.getReadConcern() == newReadConcern
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, newReadConcern,
-                executor))
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, newReadConcern,
+                uuidRepresentation, executor))
     }
 
     def 'should be able to executeCommand correctly'() {
         given:
         def command = new BsonDocument('command', new BsonInt32(1))
         def executor = new TestOperationExecutor([null, null, null, null])
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<Document>()
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+        def runCommandMethod = database.&runCommand
 
         when:
-        database.runCommand(command, futureResultCallback)
-        futureResultCallback.get()
-
-        then:
+        execute(runCommandMethod, session, command)
         def operation = executor.getReadOperation() as CommandReadOperation<Document>
 
         then:
         operation.command == command
+        executor.getClientSession() == session
         executor.getReadPreference() == primary()
 
         when:
-        futureResultCallback = new FutureResultCallback<Document>()
-        database.runCommand(command, primaryPreferred(), futureResultCallback)
+        execute(runCommandMethod, session, command, primaryPreferred())
         operation = executor.getReadOperation() as CommandReadOperation<Document>
-        futureResultCallback.get()
 
         then:
         operation.command == command
+        executor.getClientSession() == session
         executor.getReadPreference() == primaryPreferred()
 
         when:
-        futureResultCallback = new FutureResultCallback<BsonDocument>()
-        database.runCommand(command, BsonDocument, futureResultCallback)
+        execute(runCommandMethod, session, command, BsonDocument)
         operation = executor.getReadOperation() as CommandReadOperation<BsonDocument>
-        futureResultCallback.get()
 
         then:
         operation.command == command
+        executor.getClientSession() == session
         executor.getReadPreference() == primary()
 
         when:
-        futureResultCallback = new FutureResultCallback<BsonDocument>()
-        database.runCommand(command, primaryPreferred(), BsonDocument, futureResultCallback)
+        execute(runCommandMethod, session, command, primaryPreferred(), BsonDocument)
         operation = executor.getReadOperation() as CommandReadOperation<BsonDocument>
-        futureResultCallback.get()
 
         then:
         operation.command == command
+        executor.getClientSession() == session
         executor.getReadPreference() == primaryPreferred()
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should use DropDatabaseOperation correctly'() {
         given:
         def executor = new TestOperationExecutor([null])
-        def futureResultCallback = new FutureResultCallback<Void>()
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+        def dropMethod = database.&drop
 
         when:
-        new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor).drop(futureResultCallback)
+        execute(dropMethod, session)
         def operation = executor.getWriteOperation() as DropDatabaseOperation
-        futureResultCallback.get()
 
         then:
-        expect operation, isTheSameAs(new DropDatabaseOperation(name))
+        expect operation, isTheSameAs(new DropDatabaseOperation(name, writeConcern))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should use ListCollectionsOperation correctly'() {
         given:
         def executor = new TestOperationExecutor([null, null, null])
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor)
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+        def listCollectionsMethod = database.&listCollections
+        def listCollectionNamesMethod = database.&listCollectionNames
 
         when:
-        def listCollectionIterable = database.listCollections()
+        def listCollectionIterable = execute(listCollectionsMethod, session)
 
         then:
-        expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<Document>(name, Document, codecRegistry, primary(),
-                executor))
+        expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<Document>(session, name, false, Document, codecRegistry,
+                primary(), executor, true))
 
         when:
-        listCollectionIterable = database.listCollections(BsonDocument)
+        listCollectionIterable = execute(listCollectionsMethod, session, BsonDocument)
 
         then:
-        expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<BsonDocument>(name, BsonDocument, codecRegistry,
-                primary(), executor))
+        expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<BsonDocument>(session, name, false, BsonDocument,
+                codecRegistry, primary(), executor, true))
+
+        when:
+        def listCollectionNamesIterable = execute(listCollectionNamesMethod, session)
+
+        then:
+        // listCollectionNamesIterable is an instance of a MappingIterable, so have to get the mapped iterable inside it
+        expect listCollectionNamesIterable.getMapped(), isTheSameAs(new ListCollectionsIterableImpl<BsonDocument>(session, name,
+                true, BsonDocument, codecRegistry, primary(), executor, true))
+
+        where:
+        session << [null, Stub(ClientSession)]
     }
 
     def 'should use CreateCollectionOperation correctly'() {
         given:
         def collectionName = 'collectionName'
         def executor = new TestOperationExecutor([null, null])
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def futureResultCallback = new FutureResultCallback<Void>()
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+        def createCollectionMethod = database.&createCollection
 
         when:
-        database.createCollection(collectionName, futureResultCallback)
-        futureResultCallback.get()
+        execute(createCollectionMethod, session, collectionName)
         def operation = executor.getWriteOperation() as CreateCollectionOperation
 
         then:
-        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName))
+        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName, writeConcern))
+        executor.getClientSession() == session
 
         when:
-        futureResultCallback = new FutureResultCallback<Void>()
         def createCollectionOptions = new CreateCollectionOptions()
                 .autoIndex(false)
                 .capped(true)
@@ -227,13 +299,14 @@ class MongoDatabaseSpecification extends Specification {
                 .validationOptions(new ValidationOptions().validator(BsonDocument.parse('{level: {$gte: 10}}'))
                 .validationLevel(ValidationLevel.MODERATE)
                 .validationAction(ValidationAction.WARN))
+                .collation(collation)
 
-        database.createCollection(collectionName, createCollectionOptions, futureResultCallback)
-        futureResultCallback.get()
+        execute(createCollectionMethod, session, collectionName, createCollectionOptions)
         operation = executor.getWriteOperation() as CreateCollectionOperation
 
         then:
-        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName)
+        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName, writeConcern)
+                .collation(collation)
                 .autoIndex(false)
                 .capped(true)
                 .usePowerOf2Sizes(true)
@@ -244,24 +317,233 @@ class MongoDatabaseSpecification extends Specification {
                 .validator(BsonDocument.parse('{level: {$gte: 10}}'))
                 .validationLevel(ValidationLevel.MODERATE)
                 .validationAction(ValidationAction.WARN))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use CreateViewOperation correctly'() {
+        given:
+        def viewName = 'view1'
+        def viewOn = 'col1'
+        def pipeline = [new Document('$match', new Document('x', true))]
+        def writeConcern = WriteConcern.JOURNALED
+        def executor = new TestOperationExecutor([null, null])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+        def createViewMethod = database.&createView
+
+        when:
+        execute(createViewMethod, session, viewName, viewOn, pipeline)
+        def operation = executor.getWriteOperation() as CreateViewOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateViewOperation(name, viewName, viewOn,
+                [new BsonDocument('$match', new BsonDocument('x', BsonBoolean.TRUE))], writeConcern))
+        executor.getClientSession() == session
+
+        when:
+        execute(createViewMethod, session, viewName, viewOn, pipeline, new CreateViewOptions().collation(collation))
+        operation = executor.getWriteOperation() as CreateViewOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateViewOperation(name, viewName, viewOn,
+                [new BsonDocument('$match', new BsonDocument('x', BsonBoolean.TRUE))], writeConcern).collation(collation))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the createView pipeline data correctly'() {
+        given:
+        def viewName = 'view1'
+        def viewOn = 'col1'
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern,
+                false, true, readConcern, uuidRepresentation, Stub(OperationExecutor))
+        def callback = Stub(SingleResultCallback)
+
+        when:
+        database.createView(viewName, viewOn, null, callback)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.createView(viewName, viewOn, [null], callback)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should create ChangeStreamIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def namespace = new MongoNamespace(name, 'ignored')
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+        def watchMethod = database.&watch
+
+        when:
+        def changeStreamIterable = execute(watchMethod, session)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [], Document, ChangeStreamLevel.DATABASE, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.DATABASE, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], BsonDocument, ChangeStreamLevel.DATABASE, true), ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the ChangeStreamIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+
+        when:
+        database.watch((Class) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.watch([null]).into([]) { result, t -> }
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should create AggregateIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+        def aggregateMethod = database.&aggregate
+
+        when:
+        def aggregateIterable = execute(aggregateMethod, session, [])
+
+        then:
+        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(session, name, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, [], AggregationLevel.DATABASE, true), ['codec'])
+
+        when:
+        aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(session, name, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, [new Document('$match', 1)], AggregationLevel.DATABASE, true), ['codec'])
+
+        when:
+        aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(session, name, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, [new Document('$match', 1)], AggregationLevel.DATABASE, true),
+                ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the AggregationIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                uuidRepresentation, executor)
+
+        when:
+        database.aggregate(null, [])
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.aggregate((List) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.aggregate([null]).into([]) { result, t -> }
+
+        then:
+        thrown(IllegalArgumentException)
     }
 
     def 'should pass the correct options to getCollection'() {
         given:
         def codecRegistry = fromProviders([new BsonValueCodecProvider()])
-        def database = new MongoDatabaseImpl('databaseName', codecRegistry, secondary(), WriteConcern.MAJORITY,
-                ReadConcern.MAJORITY, new TestOperationExecutor([]))
+        def database = new MongoDatabaseImpl('databaseName', codecRegistry, secondary(), WriteConcern.MAJORITY, true, true,
+                ReadConcern.MAJORITY, uuidRepresentation, new TestOperationExecutor([]))
+        def expectedCollection = new MongoCollectionImpl<Document>(new MongoNamespace('databaseName', 'collectionName'), Document,
+                fromProviders([new BsonValueCodecProvider()]), secondary(), WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY,
+                uuidRepresentation, new TestOperationExecutor([]))
 
         when:
         def collection = database.getCollection('collectionName')
 
         then:
         expect collection, isTheSameAs(expectedCollection)
+    }
 
-        where:
-        expectedCollection = new MongoCollectionImpl<Document>(new MongoNamespace('databaseName', 'collectionName'), Document,
-                fromProviders([new BsonValueCodecProvider()]), secondary(), WriteConcern.MAJORITY, ReadConcern.MAJORITY,
-                new TestOperationExecutor([]))
+    def 'should validate the client session correctly'() {
+        given:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern,
+                false, true, readConcern, uuidRepresentation, Stub(OperationExecutor))
+        def callback = Stub(SingleResultCallback)
+
+        when:
+        database.createCollection(null, 'newColl', callback)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.createView(null, 'newView', [Document.parse('{$match: {}}')], callback)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.drop(null, callback)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.listCollectionNames(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.listCollections(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.runCommand(null, Document.parse('{}'), callback)
+
+        then:
+        thrown(IllegalArgumentException)
     }
 
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/MongoIterableSubscriptionSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/MongoIterableSubscriptionSpecification.groovy
index 02a89607f40..18a6600d17b 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/MongoIterableSubscriptionSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/MongoIterableSubscriptionSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,6 +20,9 @@ import com.mongodb.MongoException
 import com.mongodb.async.AsyncBatchCursor
 import spock.lang.Specification
 
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
 import static com.mongodb.async.client.Observables.observe
 
 class MongoIterableSubscriptionSpecification extends Specification {
@@ -72,16 +75,22 @@ class MongoIterableSubscriptionSpecification extends Specification {
     def 'should call onComplete after cursor has completed and all onNext values requested'() {
         given:
         def mongoIterable = getMongoIterable()
+        def executor = Executors.newFixedThreadPool(5)
         def observer = new TestObserver()
         observe(mongoIterable).subscribe(observer)
 
         when:
+        100.times { executor.submit { observer.requestMore(1) } }
         observer.requestMore(10)
 
         then:
         observer.assertNoErrors()
         observer.assertReceivedOnNext([1, 2, 3, 4])
         observer.assertTerminalEvent()
+
+        cleanup:
+        executor?.shutdown()
+        executor?.awaitTermination(10, TimeUnit.SECONDS)
     }
 
     def 'should call onError if batchCursor returns an throwable in the callback'() {
@@ -202,6 +211,58 @@ class MongoIterableSubscriptionSpecification extends Specification {
         observer.assertTerminalEvent()
     }
 
+    def 'should use the set batchSize when configured on the mongoIterable'() {
+        given:
+        def observer = new TestObserver()
+        def cursor = Mock(AsyncBatchCursor) {
+            def cursorResults = [(1..3), (1..3), (1..3)]
+            next(_) >> {
+                it[0].onResult(cursorResults.isEmpty() ? null : cursorResults.remove(0), null)
+            }
+        }
+        def mockIterable = getMongoIterable(cursor)
+        _ * mockIterable.getBatchSize() >> { 3 }
+        observe(mockIterable).subscribe(observer)
+
+        when:
+        observer.getSubscription()
+        observer.requestMore(4)
+
+        then:
+        1 * mockIterable.batchSize(3)
+        2 * cursor.setBatchSize(3)
+
+        when:
+        observer.requestMore(Long.MAX_VALUE)
+
+        then:
+        2 * cursor.setBatchSize(3)
+        observer.assertTerminalEvent()
+    }
+
+    def 'should use negative batchSize values when configured on the mongoIterable'() {
+        given:
+        def observer = new TestObserver()
+        def cursor = Mock(AsyncBatchCursor) {
+            def cursorResults = [(1..3)]
+            next(_) >> {
+                it[0].onResult(cursorResults.isEmpty() ? null : cursorResults.remove(0), null)
+            }
+        }
+        def mockIterable = getMongoIterable(cursor)
+        _ * mockIterable.getBatchSize() >> { -3 }
+        observe(mockIterable).subscribe(observer)
+
+        when:
+        observer.getSubscription()
+        observer.requestMore(4)
+
+        then:
+        1 * mockIterable.batchSize(-3)
+        2 * cursor.setBatchSize(-3)
+        observer.assertTerminalEvent()
+    }
+
     def 'should throw an error if request is less than 1'() {
         given:
         def observer = new TestObserver()
@@ -371,6 +432,72 @@ class MongoIterableSubscriptionSpecification extends Specification {
         observer.requestMore(1)
 
         then:
+        notThrown(MongoException)
+        observer.assertTerminalEvent()
+        observer.assertErrored()
+    }
+
+    def 'should throw the exception if calling onComplete raises one'() {
+        given:
+        def observer = new TestObserver(new Observer() {
+            @Override
+            void onSubscribe(final Subscription subscription) {
+            }
+
+            @Override
+            void onNext(final Object result) {
+            }
+
+            @Override
+            void onError(final Throwable e) {
+            }
+
+            @Override
+            void onComplete() {
+                throw new MongoException('exception calling onComplete')
+            }
+        })
+        observe(getMongoIterable()).subscribe(observer)
+
+        when:
+        observer.requestMore(100)
+
+        then:
+        def ex = thrown(MongoException)
+        ex.message == 'exception calling onComplete'
+        observer.assertTerminalEvent()
+        observer.assertNoErrors()
+    }
+
+    def 'should throw the exception if calling onError raises one'() {
+        given:
+        def observer = new TestObserver(new Observer() {
+            @Override
+            void onSubscribe(final Subscription subscription) {
+            }
+
+            @Override
+            void onNext(final Object result) {
+                throw new MongoException('fail')
+            }
+
+            @Override
+            void onError(final Throwable e) {
+                throw new MongoException('exception calling onError')
+            }
+
+            @Override
+            void onComplete() {
+            }
+        })
+        observe(getMongoIterable()).subscribe(observer)
+
+        when:
+        observer.requestMore(1)
+
+        then:
+        def ex = thrown(MongoException)
+        ex.message == 'exception calling onError'
         observer.assertTerminalEvent()
         observer.assertErrored()
     }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/SingleResultCallbackSubscriptionSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/SingleResultCallbackSubscriptionSpecification.groovy
index 928a8a0146f..cb31f6195fe 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/SingleResultCallbackSubscriptionSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/SingleResultCallbackSubscriptionSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,6 +21,9 @@ import com.mongodb.MongoException
 import com.mongodb.async.SingleResultCallback
 import spock.lang.Specification
 
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+
 import static com.mongodb.async.client.Observables.observe
 
 class SingleResultCallbackSubscriptionSpecification extends Specification {
@@ -45,7 +48,8 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
 
     def 'should call onComplete after all data has been consumed'() {
         given:
-        SingleResultCallback<Integer> singleResultCallback
+        SingleResultCallback<Integer> singleResultCallback = null
+        def executor = Executors.newFixedThreadPool(5)
         def observer = new TestObserver()
         observe(new Block<SingleResultCallback<Integer>>() {
             @Override
@@ -56,20 +60,24 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
 
         when:
         observer.requestMore(5)
-        observer.requestMore(5)
 
         then:
+        observer.assertNoTerminalEvent()
         observer.assertNoErrors()
         observer.assertReceivedOnNext([])
-        observer.assertNoTerminalEvent()
 
         when:
-        singleResultCallback.onResult(1, null)
+        100.times { executor.submit { observer.requestMore(1) } }
+        singleResultCallback?.onResult(1, null)
 
         then:
         observer.assertNoErrors()
-        observer.assertReceivedOnNext([1])
         observer.assertTerminalEvent()
+        observer.assertReceivedOnNext([1])
+
+        cleanup:
+        executor?.shutdown()
+        executor?.awaitTermination(10, TimeUnit.SECONDS)
     }
 
     def 'should throw an error if request is less than 1'() {
@@ -91,7 +99,7 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
         observe(new Block<SingleResultCallback<Integer>>() {
             @Override
             void apply(final SingleResultCallback<Integer> callback) {
-                callback.onResult(null, new MongoException('failed'));
+                callback.onResult(null, new MongoException('failed'))
             }
         }).subscribe(observer)
 
@@ -220,6 +228,7 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
         observer.requestMore(1)
 
         then:
+        thrown(MongoException)
         observer.assertReceivedOnNext([1])
         observer.assertUnsubscribed()
         observer.assertNoTerminalEvent()
@@ -267,7 +276,75 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
         observe(new Block<SingleResultCallback<Integer>>() {
             @Override
             void apply(final SingleResultCallback<Integer> callback) {
-                throw new MongoException('failed');
+                throw new MongoException('failed')
+            }
+        }).subscribe(observer)
+
+        when:
+        observer.requestMore(1)
+
+        then:
+        notThrown(MongoException)
+        observer.assertTerminalEvent()
+        observer.assertErrored()
+    }
+
+    def 'should throw the exception if calling onComplete raises one'() {
+        given:
+        def observer = new TestObserver(new Observer(){
+            @Override
+            void onSubscribe(final Subscription subscription) {
+            }
+
+            @Override
+            void onNext(final Object o) {
+            }
+
+            @Override
+            void onError(final Throwable e) {
+            }
+
+            @Override
+            void onComplete() {
+                throw new MongoException('exception calling onComplete')
+            }
+        })
+        observe(getBlock()).subscribe(observer)
+
+        when:
+        observer.requestMore(100)
+
+        then:
+        def ex = thrown(MongoException)
+        observer.assertNoErrors()
+        observer.assertTerminalEvent()
+        ex.message == 'exception calling onComplete'
+    }
+
+    def 'should throw the exception if calling onError raises one'() {
+        given:
+        def observer = new TestObserver(new Observer(){
+            @Override
+            void onSubscribe(final Subscription subscription) {
+            }
+
+            @Override
+            void onNext(final Object o) {
+            }
+
+            @Override
+            void onError(final Throwable e) {
+                throw new MongoException('exception calling onError')
+            }
+
+            @Override
+            void onComplete() {
+            }
+        })
+        observe(new Block<SingleResultCallback<Integer>>() {
+            @Override
+            void apply(final SingleResultCallback<Integer> callback) {
+                throw new MongoException('fail')
             }
         }).subscribe(observer)
 
@@ -275,6 +352,8 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
         observer.requestMore(1)
 
         then:
+        def ex = thrown(MongoException)
+        ex.message == 'exception calling onError'
         observer.assertErrored()
         observer.assertTerminalEvent()
     }
@@ -288,7 +367,7 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
 
             @Override
             void apply(final SingleResultCallback<Integer> callback) {
-                callback.onResult(results, null);
+                callback.onResult(results, null)
             }
         }
     }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/TestObserver.java b/driver-async/src/test/unit/com/mongodb/async/client/TestObserver.java
index ec59919f798..9d685a4d114 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/TestObserver.java
+++ b/driver-async/src/test/unit/com/mongodb/async/client/TestObserver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -60,7 +60,7 @@ public void onError(final Throwable e) {
     }
 
     @Override
-    public void onSubscribe(final Subscription subscription) {
+    public synchronized void onSubscribe(final Subscription subscription) {
         this.subscription = subscription;
         delegate.onSubscribe(subscription);
     }
@@ -77,7 +77,7 @@ public void onSubscribe(final Subscription subscription) {
      * @param result the item emitted by the obserable
      */
     @Override
-    public void onNext(final T result) {
+    public synchronized void onNext(final T result) {
         onNextEvents.add(result);
         delegate.onNext(result);
     }
@@ -92,7 +92,7 @@ public void onNext(final T result) {
      * @param e the exception encountered by the obserable
      */
     @Override
-    public void onError(final Throwable e) {
+    public synchronized void onError(final Throwable e) {
         try {
             onErrorEvents.add(e);
             delegate.onError(e);
@@ -108,7 +108,7 @@ public void onError(final Throwable e) {
      * </p>
      */
     @Override
-    public void onComplete() {
+    public synchronized void onComplete() {
         try {
             onCompleteEvents.add(null);
             delegate.onComplete();
@@ -123,7 +123,7 @@ public void onComplete() {
      * @param n the maximum number of items you want the obserable to emit to the Subscriber at this time, or
      *          {@code Long.MAX_VALUE} if you want the obserable to emit items at its own pace
      */
-    public void requestMore(final long n) {
+    public synchronized void requestMore(final long n) {
         subscription.request(n);
     }
 
@@ -133,7 +133,7 @@ public void requestMore(final long n) {
      *
      * @return a list of the Throwables that were passed to this Subscriber's {@link #onError} method
      */
-    public List<Throwable> getOnErrorEvents() {
+    public synchronized List<Throwable> getOnErrorEvents() {
         return onErrorEvents;
     }
 
@@ -142,7 +142,7 @@ public List<Throwable> getOnErrorEvents() {
      *
      * @return a list of items observed by this Subscriber, in the order in which they were observed
      */
-    public List<T> getOnNextEvents() {
+    public synchronized List<T> getOnNextEvents() {
         return onNextEvents;
     }
 
@@ -151,7 +151,7 @@ public List<T> getOnNextEvents() {
      *
      * @return the subscription or null if not subscribed to
      */
-    public Subscription getSubscription() {
+    public synchronized Subscription getSubscription() {
         return subscription;
     }
 
@@ -161,7 +161,7 @@ public Subscription getSubscription() {
      * @param items the sequence of items expected to have been observed
      * @throws AssertionError if the sequence of items observed does not exactly match {@code items}
      */
-    public void assertReceivedOnNext(final List<T> items) {
+    public synchronized void assertReceivedOnNext(final List<T> items) {
         if (getOnNextEvents().size() != items.size()) {
             throw new AssertionError("Number of items does not match. Provided: " + items.size() + "  Actual: " + getOnNextEvents().size());
         }
@@ -186,7 +186,7 @@ public void assertReceivedOnNext(final List<T> items) {
      *
      * @throws AssertionError if not exactly one terminal event notification was received
      */
-    public void assertTerminalEvent() {
+    public synchronized void assertTerminalEvent() {
         if (onErrorEvents.size() > 1) {
             throw new AssertionError("Too many onError events: " + onErrorEvents.size());
         }
@@ -209,7 +209,7 @@ public void assertTerminalEvent() {
      *
      * @throws AssertionError if a terminal event notification was received
      */
-    public void assertNoTerminalEvent() {
+    public synchronized void assertNoTerminalEvent() {
         if (onCompleteEvents.size() > 0 || onErrorEvents.size() > 0) {
             throw new AssertionError("Terminal events received.");
         }
@@ -220,7 +220,7 @@ public void assertNoTerminalEvent() {
      *
      * @throws AssertionError if this {@link Subscription} is not unsubscribed
      */
-    public void assertUnsubscribed() {
+    public synchronized void assertUnsubscribed() {
         if (subscription == null || !subscription.isUnsubscribed()) {
             throw new AssertionError("Not unsubscribed.");
         }
@@ -242,7 +242,7 @@ public void assertSubscribed() {
      *
      * @throws AssertionError if this {@link Observer} has received one or more {@link #onError} notifications
      */
-    public void assertNoErrors() {
+    public synchronized void assertNoErrors() {
         if (onErrorEvents.size() > 0) {
             // can't use AssertionError because (message, cause) doesn't exist until Java 7
             throw new RuntimeException("Unexpected onError events: " + getOnErrorEvents().size(), getOnErrorEvents().get(0));
@@ -254,7 +254,7 @@ public void assertNoErrors() {
      *
      * @throws AssertionError if this {@link Observer} did not received an {@link #onError} notifications
      */
-    public void assertErrored() {
+    public synchronized void assertErrored() {
         if (onErrorEvents.size() == 0) {
             // can't use AssertionError because (message, cause) doesn't exist until Java 7
             throw new RuntimeException("No onError events");
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/TestOperationExecutor.java b/driver-async/src/test/unit/com/mongodb/async/client/TestOperationExecutor.java
index 5da651474e5..ca1d516288c 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/TestOperationExecutor.java
+++ b/driver-async/src/test/unit/com/mongodb/async/client/TestOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,10 @@
 
 package com.mongodb.async.client;
 
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.SingleResultCallback;
-import com.mongodb.operation.AsyncOperationExecutor;
+import com.mongodb.lang.Nullable;
 import com.mongodb.operation.AsyncReadOperation;
 import com.mongodb.operation.AsyncWriteOperation;
 
@@ -26,10 +27,11 @@
 import java.util.List;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class TestOperationExecutor implements AsyncOperationExecutor {
+public class TestOperationExecutor implements OperationExecutor {
 
     private final List<Object> responses;
     private final boolean queueExecution;
+    private List<ClientSession> clientSessions = new ArrayList<ClientSession>();
     private final List<ReadPreference> readPreferences = new ArrayList<ReadPreference>();
     private final List<AsyncReadOperation> queuedReadOperations = new ArrayList<AsyncReadOperation>();
     private final List<AsyncWriteOperation> queuedWriteOperations = new ArrayList<AsyncWriteOperation>();
@@ -48,9 +50,16 @@ public class TestOperationExecutor implements AsyncOperationExecutor {
     }
 
     @Override
-    public <T> void execute(final AsyncReadOperation<T> operation, final ReadPreference readPreference,
+    public <T> void execute(final AsyncReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern,
                             final SingleResultCallback<T> callback) {
+        execute(operation, readPreference, readConcern, null, callback);
+    }
+
+    @Override
+    public <T> void execute(final AsyncReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern,
+                            final ClientSession session, final SingleResultCallback<T> callback) {
         readPreferences.add(readPreference);
+        clientSessions.add(session);
         if (queueExecution) {
             queuedReadOperations.add(operation);
             queuedReadCallbacks.add(callback);
@@ -62,7 +71,14 @@ public <T> void execute(final AsyncReadOperation<T> operation, final ReadPrefere
 
 
     @Override
-    public <T> void execute(final AsyncWriteOperation<T> operation, final SingleResultCallback<T> callback) {
+    public <T> void execute(final AsyncWriteOperation<T> operation, final ReadConcern readConcern, final SingleResultCallback<T> callback) {
+        execute(operation, readConcern, null, callback);
+    }
+
+    @Override
+    public <T> void execute(final AsyncWriteOperation<T> operation, final ReadConcern readConcern, final ClientSession session,
+                            final SingleResultCallback<T> callback) {
+        clientSessions.add(session);
         if (queueExecution) {
             queuedWriteOperations.add(operation);
             queuedWriteCallbacks.add(callback);
@@ -91,16 +107,23 @@ <T> void callResult(final SingleResultCallback<T> callback) {
         }
     }
 
+    @Nullable
+    ClientSession getClientSession() {
+        return clientSessions.isEmpty() ? null : clientSessions.remove(0);
+    }
+
+    @Nullable
     AsyncReadOperation getReadOperation() {
         return readOperations.isEmpty() ? null : readOperations.remove(0);
     }
 
+    @Nullable
     ReadPreference getReadPreference() {
         return readPreferences.isEmpty() ? null : readPreferences.remove(0);
     }
 
+    @Nullable
     AsyncWriteOperation getWriteOperation() {
         return writeOperations.isEmpty() ? null : writeOperations.remove(0);
     }
-
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSBucketSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSBucketSpecification.groovy
index 286b0374846..519dcf3e68e 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSBucketSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSBucketSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,21 +24,23 @@ import com.mongodb.WriteConcern
 import com.mongodb.async.AsyncBatchCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
+import com.mongodb.async.client.ClientSession
 import com.mongodb.async.client.FindIterable
 import com.mongodb.async.client.MongoClients
 import com.mongodb.async.client.MongoCollection
 import com.mongodb.async.client.MongoDatabaseImpl
+import com.mongodb.async.client.OperationExecutor
 import com.mongodb.async.client.TestOperationExecutor
 import com.mongodb.client.gridfs.model.GridFSDownloadOptions
 import com.mongodb.client.gridfs.model.GridFSFile
 import com.mongodb.client.result.DeleteResult
 import com.mongodb.client.result.UpdateResult
-import com.mongodb.operation.AsyncOperationExecutor
 import com.mongodb.operation.FindOperation
 import org.bson.BsonDocument
 import org.bson.BsonObjectId
 import org.bson.BsonString
 import org.bson.Document
+import org.bson.UuidRepresentation
 import org.bson.codecs.DocumentCodecProvider
 import org.bson.types.Binary
 import org.bson.types.ObjectId
@@ -55,15 +57,17 @@ import static com.mongodb.async.client.gridfs.helpers.AsyncStreamHelper.toAsyncO
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 import static spock.util.matcher.HamcrestSupport.expect
 
-@SuppressWarnings('ClosureAsLastMethodParameter')
+@SuppressWarnings(['ClosureAsLastMethodParameter', 'ClassSize'])
 class GridFSBucketSpecification extends Specification {
 
     def readConcern = ReadConcern.DEFAULT
+    def uuidRepresentation = UuidRepresentation.STANDARD
     def registry = MongoClients.defaultCodecRegistry
-    def database = databaseWithExecutor(Stub(AsyncOperationExecutor))
-    def databaseWithExecutor(AsyncOperationExecutor executor) {
-        new MongoDatabaseImpl('test', registry, primary(), WriteConcern.ACKNOWLEDGED, readConcern, executor)
+    def database = databaseWithExecutor(Stub(OperationExecutor))
+    def databaseWithExecutor(OperationExecutor executor) {
+        new MongoDatabaseImpl('test', registry, primary(), WriteConcern.ACKNOWLEDGED, true, true, readConcern, uuidRepresentation, executor)
     }
+    def disableMD5 = false
 
     def 'should return the correct bucket name'() {
         when:
@@ -97,7 +101,8 @@ class GridFSBucketSpecification extends Specification {
         def newReadPreference = secondary()
 
         when:
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection).withReadPreference(newReadPreference)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+                .withReadPreference(newReadPreference)
 
         then:
         1 * filesCollection.withReadPreference(newReadPreference) >> filesCollection
@@ -117,7 +122,8 @@ class GridFSBucketSpecification extends Specification {
         def newWriteConcern = WriteConcern.MAJORITY
 
         when:
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection).withWriteConcern(newWriteConcern)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+                .withWriteConcern(newWriteConcern)
 
         then:
         1 * filesCollection.withWriteConcern(newWriteConcern) >> filesCollection
@@ -137,7 +143,8 @@ class GridFSBucketSpecification extends Specification {
         def newReadConcern = ReadConcern.MAJORITY
 
         when:
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection).withReadConcern(newReadConcern)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+                .withReadConcern(newReadConcern)
 
         then:
         1 * filesCollection.withReadConcern(newReadConcern) >> filesCollection
@@ -150,11 +157,25 @@ class GridFSBucketSpecification extends Specification {
         1 * filesCollection.getReadConcern() >> newReadConcern
     }
 
+    def 'should behave correctly when using withDisableMD5'() {
+        when:
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, Stub(MongoCollection), Stub(MongoCollection), disableMD5)
+
+        then:
+        !gridFSBucket.getDisableMD5()
+
+        when:
+        gridFSBucket = gridFSBucket.withDisableMD5(true)
+
+        then:
+        gridFSBucket.getDisableMD5()
+    }
+
     def 'should get defaults from MongoDatabase'() {
         given:
         def defaultChunkSizeBytes = 255 * 1024
         def database = new MongoDatabaseImpl('test', fromProviders(new DocumentCodecProvider()), secondary(), WriteConcern.ACKNOWLEDGED,
-                readConcern, new TestOperationExecutor([]))
+                true, true, readConcern, uuidRepresentation, new TestOperationExecutor([]))
 
         when:
         def gridFSBucket = new GridFSBucketImpl(database)
@@ -170,14 +191,23 @@ class GridFSBucketSpecification extends Specification {
         given:
         def filesCollection = Stub(MongoCollection)
         def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
-        def stream = gridFSBucket.openUploadStream('filename')
+        def stream
+        if (clientSession != null){
+            stream = gridFSBucket.openUploadStream(clientSession, 'filename')
+        } else {
+            stream = gridFSBucket.openUploadStream('filename')
+        }
 
         then:
-        expect stream, isTheSameAs(new GridFSUploadStreamImpl(filesCollection, chunksCollection, stream.getId(), 'filename', 255,
-                null, new GridFSIndexCheckImpl(filesCollection, chunksCollection)), ['md5', 'closeAndWritingLock'])
+        expect stream, isTheSameAs(new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, stream.getId(),
+                'filename', 255, disableMD5, null, new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)),
+                ['md5', 'closeAndWritingLock'])
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should upload from stream'() {
@@ -185,22 +215,38 @@ class GridFSBucketSpecification extends Specification {
         def findIterable = Mock(FindIterable)
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         def contentBytes = 'content' as byte[]
         def inputStream = toAsyncInputStream(new ByteArrayInputStream(contentBytes))
 
         when:
-        gridFSBucket.uploadFromStream('filename', inputStream, Stub(SingleResultCallback))
+        if (clientSession != null){
+            gridFSBucket.uploadFromStream(clientSession, 'filename', inputStream, Stub(SingleResultCallback))
+        } else {
+            gridFSBucket.uploadFromStream('filename', inputStream, Stub(SingleResultCallback))
+        }
 
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(_) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(new Document(), null) }
+        1 * findIterable.first(_) >> { it.last().onResult(new Document(), null) }
+
+        if (clientSession != null){
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(clientSession, _, _)
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(_, _)
+        }
 
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, null) }
-        1 * filesCollection.insertOne(_, _)
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should clean up any chunks when upload from stream throws an IOException'() {
@@ -208,29 +254,46 @@ class GridFSBucketSpecification extends Specification {
         def findIterable = Mock(FindIterable)
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         def inputStream = Mock(AsyncInputStream) {
-            2 * read(_, _) >> { it[0].put(new byte[255]); it[1].onResult(255, null) } >> {
-                it[1].onResult(null, new IOException('stream failure'))
+            2 * read(_, _) >> { it[0].put(new byte[255]); it.last().onResult(255, null) } >> {
+                it.last().onResult(null, new IOException('stream failure'))
             }
         }
         def futureResult = new FutureResultCallback()
 
         when:
-        gridFSBucket.uploadFromStream('filename', inputStream, futureResult)
+        if (clientSession != null){
+            gridFSBucket.uploadFromStream(clientSession, 'filename', inputStream, futureResult)
+        } else {
+            gridFSBucket.uploadFromStream('filename', inputStream, futureResult)
+        }
 
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(_) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(new Document(), null) }
+        1 * findIterable.first(_) >> { it.last().onResult(new Document(), null) }
 
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, null) }
-        1 * chunksCollection.deleteMany(_, _) >> { it[1].onResult(null, null) }
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, null) }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, null) }
+        }
+
+        if (clientSession != null) {
+            1 * chunksCollection.deleteMany(clientSession, _, _) >> { it.last().onResult(null, null) }
+        } else {
+            1 * chunksCollection.deleteMany(_, _) >> { it.last().onResult(null, null) }
+        }
 
         then:
-        0 * filesCollection.insertOne(_, _)
+        0 * filesCollection.insertOne(*_)
 
         when:
         futureResult.get()
@@ -238,8 +301,10 @@ class GridFSBucketSpecification extends Specification {
         then:
         def exception = thrown(MongoGridFSException)
         exception.getMessage() == 'IOException when reading from the InputStream'
-    }
 
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
 
     def 'should not clean up any chunks when upload throws an exception'() {
         given:
@@ -247,25 +312,37 @@ class GridFSBucketSpecification extends Specification {
         def findIterable = Mock(FindIterable)
         def chunksCollection = Mock(MongoCollection)
         def alternativeException = new MongoGridFSException('Alternative failure')
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         def inputStream = Mock(AsyncInputStream) {
-            2 * read(_, _) >> { it[0].put(new byte[255]); it[1].onResult(255, null) } >> {
-                it[1].onResult(null, alternativeException)
+            2 * read(_, _) >> {  it[0].put(new byte[255]); it.last().onResult(255, null) } >> {
+                it.last().onResult(null, alternativeException)
             }
         }
         def futureResult = new FutureResultCallback()
 
         when:
-        gridFSBucket.uploadFromStream('filename', inputStream, futureResult)
+        if (clientSession != null){
+            gridFSBucket.uploadFromStream(clientSession, 'filename', inputStream, futureResult)
+        } else {
+            gridFSBucket.uploadFromStream('filename', inputStream, futureResult)
+        }
 
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(_) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(new Document(), null) }
+        1 * findIterable.first(_) >> { it.last().onResult(new Document(), null) }
 
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, null) }
+        if (clientSession != null){
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, null) }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, null) }
+        }
 
         when:
         futureResult.get()
@@ -273,6 +350,9 @@ class GridFSBucketSpecification extends Specification {
         then:
         def exception = thrown(MongoGridFSException)
         exception == alternativeException
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate errors when writing to the uploadStream'() {
@@ -281,22 +361,35 @@ class GridFSBucketSpecification extends Specification {
         def findIterable = Mock(FindIterable)
         def chunksCollection = Mock(MongoCollection)
         def uploadStreamException = new MongoException('Alternative failure')
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         def inputStream = Mock(AsyncInputStream)
         def futureResult = new FutureResultCallback()
 
         when:
-        gridFSBucket.uploadFromStream('filename', inputStream, futureResult)
+        if (clientSession != null){
+            gridFSBucket.uploadFromStream(clientSession, 'filename', inputStream, futureResult)
+        } else {
+            gridFSBucket.uploadFromStream('filename', inputStream, futureResult)
+        }
 
         then: 'When writing to the stream'
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(_) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(new Document(), null) }
+        1 * findIterable.first(_) >> { it.last().onResult(new Document(), null) }
 
-        1 * inputStream.read(_, _) >> { it[0].put(new byte[255]); it[1].onResult(255, null) }
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, uploadStreamException) }
+        1 * inputStream.read(_, _) >> { it[0].put(new byte[255]); it.last().onResult(255, null) }
+
+        if (clientSession != null){
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, uploadStreamException) }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, uploadStreamException) }
+        }
 
         when:
         futureResult.get()
@@ -312,13 +405,23 @@ class GridFSBucketSpecification extends Specification {
         then: 'When closing the stream'
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(_) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(new Document(), null) }
+        1 * findIterable.first(_) >> { it.last().onResult(new Document(), null) }
 
-        2 * inputStream.read(_, _) >> { it[0].put(new byte[255]); it[1].onResult(255, null) } >> { it[1].onResult(-1, null) }
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, null) }
-        1 * filesCollection.insertOne(_, _) >> { it[1].onResult(null, uploadStreamException) }
+        2 * inputStream.read(_, _) >> { it[0].put(new byte[255]); it.last().onResult(255, null) } >> { it.last().onResult(-1, null) }
+
+        if (clientSession != null){
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, uploadStreamException) }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(_, _) >> { it.last().onResult(null, uploadStreamException) }
+        }
 
         when:
         futureResult.get()
@@ -326,6 +429,9 @@ class GridFSBucketSpecification extends Specification {
         then:
         exception = thrown(MongoException)
         exception == uploadStreamException
+
+        where:
+        clientSession << [null]
     }
 
     def 'should create the expected GridFSDownloadStream'() {
@@ -335,17 +441,30 @@ class GridFSBucketSpecification extends Specification {
         def gridFSFindIterable = new GridFSFindIterableImpl(findIterable)
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
-        def stream = gridFSBucket.openDownloadStream(fileId.getValue())
+        def stream
+        if (clientSession != null){
+            stream = gridFSBucket.openDownloadStream(clientSession, fileId.getValue())
+        } else {
+            stream = gridFSBucket.openDownloadStream(fileId.getValue())
+        }
 
         then:
-        1 * filesCollection.find(_) >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(_) >> findIterable
 
         then:
-        expect stream, isTheSameAs(new GridFSDownloadStreamImpl(gridFSFindIterable, chunksCollection),
+        expect stream, isTheSameAs(new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection),
                 ['closeAndReadingLock', 'resultsQueue'])
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should download to stream'() {
@@ -361,30 +480,46 @@ class GridFSBucketSpecification extends Specification {
         def tenBytes = new byte[sizeOfStream]
         def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(tenBytes))
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         def outputStream = new ByteArrayOutputStream(1024)
         def asyncOutputStream = toAsyncOutputStream(outputStream)
 
         when:
         def futureResult = new FutureResultCallback()
-        gridFSBucket.downloadToStream(fileId, asyncOutputStream, futureResult)
+        if (clientSession != null){
+            gridFSBucket.downloadToStream(clientSession, fileId, asyncOutputStream, futureResult)
+        } else {
+            gridFSBucket.downloadToStream(fileId, asyncOutputStream, futureResult)
+        }
         asyncOutputStream.close(Stub(SingleResultCallback))
         def size = futureResult.get()
 
         then:
-        1 * filesCollection.find(new Document('_id', fileId)) >> filesFindIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> filesFindIterable
+        } else {
+            1 * filesCollection.find() >> filesFindIterable
+        }
+        1 * filesFindIterable.filter(new Document('_id', fileId)) >> filesFindIterable
 
         then:
-        1 * filesFindIterable.first(_) >> { it[0].onResult(fileInfo, null) }
-        1 * chunksCollection.find(_) >> chunksFindIterable
+        1 * filesFindIterable.first(_) >> { it.last().onResult(fileInfo, null) }
+        if (clientSession != null){
+            1 * chunksCollection.find(clientSession, _) >> chunksFindIterable
+        } else {
+            1 * chunksCollection.find(_) >> chunksFindIterable
+        }
         1 * chunksFindIterable.sort(_) >> chunksFindIterable
         1 * chunksFindIterable.batchSize(_) >> chunksFindIterable
-        1 * chunksFindIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult([chunkDocument], null) }
+        1 * chunksFindIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([chunkDocument], null) }
 
         then:
         size == sizeOfStream
         outputStream.toByteArray() == tenBytes
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     @Unroll
@@ -400,35 +535,50 @@ class GridFSBucketSpecification extends Specification {
         def tenBytes = new byte[sizeOfStream]
         def chunkDocument = new Document('files_id', fileId).append('n', 0).append('data', new Binary(tenBytes))
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         def outputStream = new ByteArrayOutputStream(1024)
         def asyncOutputStream = toAsyncOutputStream(outputStream)
 
         when:
         def futureResult = new FutureResultCallback()
-        gridFSBucket.downloadToStream(fileId, asyncOutputStream, futureResult)
+        if (clientSession != null){
+            gridFSBucket.downloadToStream(clientSession, fileId, asyncOutputStream, futureResult)
+        } else {
+            gridFSBucket.downloadToStream(fileId, asyncOutputStream, futureResult)
+        }
         asyncOutputStream.close(Stub(SingleResultCallback))
         def size = futureResult.get()
 
         then:
-        1 * filesCollection.find(new Document('_id', fileId)) >> filesFindIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> filesFindIterable
+        } else {
+            1 * filesCollection.find() >> filesFindIterable
+        }
+        1 * filesFindIterable.filter(new Document('_id', fileId)) >> filesFindIterable
 
         then:
-        1 * filesFindIterable.first(_) >> { it[0].onResult(fileInfo, null) }
-        1 * chunksCollection.find(_) >> chunksFindIterable
+        1 * filesFindIterable.first(_) >> { it.last().onResult(fileInfo, null) }
+        if (clientSession != null){
+            1 * chunksCollection.find(clientSession, _) >> chunksFindIterable
+        } else {
+            1 * chunksCollection.find(_) >> chunksFindIterable
+        }
         1 * chunksFindIterable.sort(_) >> chunksFindIterable
         1 * chunksFindIterable.batchSize(_) >> chunksFindIterable
-        1 * chunksFindIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult([chunkDocument], null) }
+        1 * chunksFindIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([chunkDocument], null) }
 
         then:
         size == sizeOfStream
         outputStream.toByteArray() == tenBytes
 
         where:
-        description       | fileId
-        'using objectId'  | new ObjectId()
-        'using bsonValue' | new BsonString('1')
+        description                    | fileId              | clientSession
+        'using objectId'               | new ObjectId()      | null
+        'using bsonValue'              | new BsonString('1') | null
+        'using objectId with session'  | new ObjectId()      | Stub(ClientSession)
+        'using bsonValue with session' | new BsonString('1') | Stub(ClientSession)
     }
 
     def 'should download to stream by name'() {
@@ -444,32 +594,48 @@ class GridFSBucketSpecification extends Specification {
         def tenBytes = new byte[sizeOfStream]
         def chunkDocument = new Document('files_id', fileId).append('n', 0).append('data', new Binary(tenBytes))
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         def outputStream = new ByteArrayOutputStream(1024)
         def asyncOutputStream = toAsyncOutputStream(outputStream)
 
         when:
         def futureResult = new FutureResultCallback()
-        gridFSBucket.downloadToStream(filename, asyncOutputStream, futureResult)
+        if (clientSession != null){
+            gridFSBucket.downloadToStream(clientSession, filename, asyncOutputStream, futureResult)
+        } else {
+            gridFSBucket.downloadToStream(filename, asyncOutputStream, futureResult)
+        }
         asyncOutputStream.close(Stub(SingleResultCallback))
         def size = futureResult.get()
 
         then:
-        1 * filesCollection.find(new Document('filename', filename)) >> filesFindIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> filesFindIterable
+        } else {
+            1 * filesCollection.find() >> filesFindIterable
+        }
+        1 * filesFindIterable.filter(new Document('filename', filename)) >> filesFindIterable
         1 * filesFindIterable.sort(_) >> filesFindIterable
         1 * filesFindIterable.skip(_) >> filesFindIterable
 
         then:
-        1 * filesFindIterable.first(_) >> { it[0].onResult(fileInfo, null) }
-        1 * chunksCollection.find(_) >> chunksFindIterable
+        1 * filesFindIterable.first(_) >> { it.last().onResult(fileInfo, null) }
+        if (clientSession != null){
+            1 * chunksCollection.find(clientSession, _) >> chunksFindIterable
+        } else {
+            1 * chunksCollection.find(_) >> chunksFindIterable
+        }
         1 * chunksFindIterable.sort(_) >> chunksFindIterable
         1 * chunksFindIterable.batchSize(_) >> chunksFindIterable
-        1 * chunksFindIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult([chunkDocument], null) }
+        1 * chunksFindIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([chunkDocument], null) }
 
         then:
         size == sizeOfStream
         outputStream.toByteArray() == tenBytes
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw an exception if file not found'() {
@@ -478,18 +644,33 @@ class GridFSBucketSpecification extends Specification {
         def findIterable = Mock(FindIterable)
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
-        def stream = gridFSBucket.openDownloadStream(fileId)
+
+        def stream
+        if (clientSession != null){
+            stream = gridFSBucket.openDownloadStream(clientSession, fileId)
+        } else {
+            stream = gridFSBucket.openDownloadStream(fileId)
+        }
         stream.read(ByteBuffer.wrap(new byte[10]), futureResult)
         futureResult.get()
 
         then:
-        1 * filesCollection.find(new Document('_id', fileId)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(new Document('_id', fileId)) >> findIterable
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
         thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     @Unroll
@@ -502,36 +683,55 @@ class GridFSBucketSpecification extends Specification {
         def findIterable = Mock(FindIterable)
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
-        def stream = gridFSBucket.openDownloadStream(filename, new GridFSDownloadOptions().revision(version))
+        def stream
+        if (clientSession != null) {
+            stream = gridFSBucket.openDownloadStream(clientSession, filename, new GridFSDownloadOptions().revision(version))
+        } else {
+            stream = gridFSBucket.openDownloadStream(filename, new GridFSDownloadOptions().revision(version))
+        }
         stream.getGridFSFile(futureResult)
         futureResult.get()
 
         then:
-        1 * filesCollection.find(new Document('filename', filename)) >> findIterable
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(new Document('filename', filename)) >> findIterable
         1 * findIterable.skip(skip) >> findIterable
         1 * findIterable.sort(new Document('uploadDate', sortOrder)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(fileInfo, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(fileInfo, null) }
 
         where:
-        version | skip | sortOrder
-        0       | 0    | 1
-        1       | 1    | 1
-        2       | 2    | 1
-        3       | 3    | 1
-        -1      | 0    | -1
-        -2      | 1    | -1
-        -3      | 2    | -1
+        version | skip | sortOrder  | clientSession
+        0       | 0    | 1          | null
+        1       | 1    | 1          | null
+        2       | 2    | 1          | null
+        3       | 3    | 1          | null
+        -3      | 2    | -1         | null
+        -1      | 0    | -1         | null
+        -2      | 1    | -1         | null
+        0       | 0    | 1          | Stub(ClientSession)
+        1       | 1    | 1          | Stub(ClientSession)
+        2       | 2    | 1          | Stub(ClientSession)
+        3       | 3    | 1          | Stub(ClientSession)
+        -3      | 2    | -1         | Stub(ClientSession)
+        -1      | 0    | -1         | Stub(ClientSession)
+        -2      | 1    | -1         | Stub(ClientSession)
+
+        // todo
     }
 
     def 'should create the expected GridFSFindIterable'() {
         given:
         def collection = Mock(MongoCollection)
         def findIterable = Mock(FindIterable)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, collection, Stub(MongoCollection))
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, collection, Stub(MongoCollection), disableMD5)
 
 
         when:
@@ -540,6 +740,9 @@ class GridFSBucketSpecification extends Specification {
         then:
         1 * collection.find() >> findIterable
         expect result, isTheSameAs(new GridFSFindIterableImpl(findIterable))
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should execute the expected FindOperation when finding a file'() {
@@ -556,7 +759,7 @@ class GridFSBucketSpecification extends Specification {
         then:
         executor.getReadPreference() == primary()
         expect executor.getReadOperation(), isTheSameAs(new FindOperation<GridFSFile>(new MongoNamespace('test.fs.files'), decoder)
-                .filter(new BsonDocument()))
+                .filter(new BsonDocument()).retryReads(true))
 
         when:
         def filter = new BsonDocument('filename', new BsonString('filename'))
@@ -566,7 +769,10 @@ class GridFSBucketSpecification extends Specification {
         then:
         executor.getReadPreference() == secondary()
         expect executor.getReadOperation(), isTheSameAs(new FindOperation<GridFSFile>(new MongoNamespace('test.fs.files'), decoder)
-                .readConcern(readConcern).filter(filter).slaveOk(true))
+                .filter(filter).slaveOk(true).retryReads(true))
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw an exception if file not found when opening by name'() {
@@ -574,21 +780,34 @@ class GridFSBucketSpecification extends Specification {
         def findIterable = Mock(FindIterable)
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
         when:
         def futureResult = new FutureResultCallback()
-        def stream = gridFSBucket.openDownloadStream('filename')
+        def stream
+        if (clientSession != null) {
+            stream = gridFSBucket.openDownloadStream(clientSession, 'filename')
+        } else {
+            stream = gridFSBucket.openDownloadStream('filename')
+        }
         stream.read(ByteBuffer.wrap(new byte[10]), futureResult)
         futureResult.get()
 
         then:
-        1 * filesCollection.find(new Document('filename', 'filename')) >> findIterable
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(new Document('filename', 'filename')) >> findIterable
         1 * findIterable.skip(0) >> findIterable
         1 * findIterable.sort(new Document('uploadDate', -1)) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         then:
         thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should delete from files collection then chunks collection'() {
@@ -596,7 +815,7 @@ class GridFSBucketSpecification extends Specification {
         def fileId = new ObjectId()
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -605,11 +824,14 @@ class GridFSBucketSpecification extends Specification {
 
         then:
         1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId)), _) >> {
-            it[1].onResult(DeleteResult.acknowledged(1), null)
+            it.last().onResult(DeleteResult.acknowledged(1), null)
         }
         1 * chunksCollection.deleteMany(new Document('files_id', new BsonObjectId(fileId)), _) >> {
-            it[1].onResult(DeleteResult.acknowledged(1), null)
+            it.last().onResult(DeleteResult.acknowledged(1), null)
         }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw an exception when deleting if no record in the files collection'() {
@@ -617,7 +839,7 @@ class GridFSBucketSpecification extends Specification {
         def fileId = new ObjectId()
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -626,14 +848,17 @@ class GridFSBucketSpecification extends Specification {
 
         then:
         1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId)), _) >> {
-            it[1].onResult(DeleteResult.acknowledged(0), null)
+            it.last().onResult(DeleteResult.acknowledged(0), null)
         }
         1 * chunksCollection.deleteMany(new Document('files_id', new BsonObjectId(fileId)), _) >> {
-            it[1].onResult(DeleteResult.acknowledged(1), null)
+            it.last().onResult(DeleteResult.acknowledged(1), null)
         }
 
         then:
         thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate exceptions when deleting'() {
@@ -642,7 +867,7 @@ class GridFSBucketSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def deleteException = new MongoException('delete failed')
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -650,7 +875,7 @@ class GridFSBucketSpecification extends Specification {
 
         then:
         1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId)), _) >> {
-            it[1].onResult(null, deleteException)
+            it.last().onResult(null, deleteException)
         }
 
         when:
@@ -666,10 +891,10 @@ class GridFSBucketSpecification extends Specification {
 
         then:
         1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId)), _) >> {
-            it[1].onResult(DeleteResult.acknowledged(0), null)
+            it.last().onResult(DeleteResult.acknowledged(0), null)
         }
         1 * chunksCollection.deleteMany(new Document('files_id', new BsonObjectId(fileId)), _) >> {
-            it[1].onResult(null, deleteException)
+            it.last().onResult(null, deleteException)
         }
 
         when:
@@ -678,6 +903,9 @@ class GridFSBucketSpecification extends Specification {
         then:
         exception = thrown(MongoException)
         exception == deleteException
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should rename a file'() {
@@ -685,7 +913,7 @@ class GridFSBucketSpecification extends Specification {
         def fileId = new ObjectId()
         def filesCollection = Mock(MongoCollection)
         def newFilename = 'newFilename'
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection))
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection), disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -696,8 +924,11 @@ class GridFSBucketSpecification extends Specification {
         1 * filesCollection.updateOne(new BsonDocument('_id', new BsonObjectId(fileId)),
                 new BsonDocument('$set',
                         new BsonDocument('filename', new BsonString(newFilename))), _) >> {
-            it[2].onResult(new UpdateResult.UnacknowledgedUpdateResult(), null)
+            it.last().onResult(new UpdateResult.UnacknowledgedUpdateResult(), null)
         }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw an exception renaming non existent file'() {
@@ -705,7 +936,7 @@ class GridFSBucketSpecification extends Specification {
         def fileId = new ObjectId()
         def filesCollection = Mock(MongoCollection)
         def newFilename = 'newFilename'
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection))
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection), disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -713,10 +944,13 @@ class GridFSBucketSpecification extends Specification {
         futureResult.get()
 
         then:
-        1 * filesCollection.updateOne(_, _, _) >> { it[2].onResult(new UpdateResult.AcknowledgedUpdateResult(0, 0, null), null) }
+        1 * filesCollection.updateOne(_, _, _) >> { it.last().onResult(new UpdateResult.AcknowledgedUpdateResult(0, 0, null), null) }
 
         then:
         thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should handle exceptions when renaming a file'() {
@@ -725,7 +959,7 @@ class GridFSBucketSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def newFilename = 'newFilename'
         def exception =  new MongoException('failed')
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection))
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection), disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -733,18 +967,21 @@ class GridFSBucketSpecification extends Specification {
         futureResult.get()
 
         then:
-        1 * filesCollection.updateOne(_, _, _) >> { it[2].onResult(null, exception) }
+        1 * filesCollection.updateOne(_, _, _) >> { it.last().onResult(null, exception) }
 
         then:
         def e = thrown(MongoException)
         e == exception
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should be able to drop the bucket'() {
         given:
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -752,8 +989,11 @@ class GridFSBucketSpecification extends Specification {
         futureResult.get()
 
         then:
-        1 * filesCollection.drop(_) >> { it[0].onResult(null, null) }
-        1 * chunksCollection.drop(_) >> { it[0].onResult(null, null) }
+        1 * filesCollection.drop(_) >> { it.last().onResult(null, null) }
+        1 * chunksCollection.drop(_) >> { it.last().onResult(null, null) }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should handle exceptions when dropping the bucket'() {
@@ -761,7 +1001,7 @@ class GridFSBucketSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def exception =  new MongoException('failed')
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -769,7 +1009,7 @@ class GridFSBucketSpecification extends Specification {
         futureResult.get()
 
         then:
-        1 * filesCollection.drop(_) >> { it[0].onResult(null, exception) }
+        1 * filesCollection.drop(_) >> { it.last().onResult(null, exception) }
 
         then:
         def e = thrown(MongoException)
@@ -781,11 +1021,87 @@ class GridFSBucketSpecification extends Specification {
         futureResult.get()
 
         then:
-        1 * filesCollection.drop(_) >> { it[0].onResult(null, null) }
-        1 * chunksCollection.drop(_) >> { it[0].onResult(null, exception) }
+        1 * filesCollection.drop(_) >> { it.last().onResult(null, null) }
+        1 * chunksCollection.drop(_) >> { it.last().onResult(null, exception) }
 
         then:
         e = thrown(MongoException)
         e == exception
     }
+
+    def 'should validate the clientSession is not null'() {
+        given:
+        def objectId = new ObjectId()
+        def bsonValue = new BsonObjectId(objectId)
+        def filename = 'filename'
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def callback = Stub(SingleResultCallback)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        gridFSBucket.delete(null, objectId, callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.downloadToStream(null, filename, Stub(AsyncOutputStream), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.downloadToStream(null, objectId, Stub(AsyncOutputStream), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.drop(null, callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.find((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.find((ClientSession) null, new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openDownloadStream(null, filename)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openDownloadStream(null, objectId)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openUploadStream(null, filename)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openUploadStream(null, bsonValue, filename)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.rename(null, objectId, filename, callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.uploadFromStream((ClientSession) null, filename, Stub(AsyncInputStream), callback)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.uploadFromStream(null, bsonValue, filename, Stub(AsyncInputStream), callback)
+        then:
+        thrown(IllegalArgumentException)
+    }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSDownloadStreamSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSDownloadStreamSpecification.groovy
index d7f7f131aee..13573b385bd 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSDownloadStreamSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSDownloadStreamSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,6 +24,7 @@ import com.mongodb.async.SingleResultCallback
 import com.mongodb.async.client.FindIterable
 import com.mongodb.async.client.MongoCollection
 import com.mongodb.client.gridfs.model.GridFSFile
+import com.mongodb.async.client.ClientSession
 import org.bson.BsonObjectId
 import org.bson.Document
 import org.bson.types.Binary
@@ -41,14 +42,14 @@ class GridFSDownloadStreamSpecification extends Specification {
     def 'should return the file info'() {
         given:
         def gridFSFindIterable = Mock(GridFSFindIterable)
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, Stub(MongoCollection))
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, Stub(MongoCollection))
 
         when:
         def futureResult = new FutureResultCallback()
         downloadStream.getGridFSFile(futureResult)
 
         then:
-        1 * gridFSFindIterable.first(_) >> { it[0].onResult(FILE_INFO, null) }
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(FILE_INFO, null) }
         futureResult.get() == FILE_INFO
 
         when: 'Ensure that the fileInfo is cached'
@@ -58,20 +59,23 @@ class GridFSDownloadStreamSpecification extends Specification {
         then:
         0 * gridFSFindIterable.first(_)
         futureResult.get() == FILE_INFO
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     @Unroll
     def 'should return handle errors getting the file info when #description'() {
         given:
         def gridFSFindIterable = Mock(GridFSFindIterable)
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, Stub(MongoCollection))
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, Stub(MongoCollection))
 
         when:
         def futureResult = new FutureResultCallback()
         downloadStream.getGridFSFile(futureResult)
 
         then:
-        1 * gridFSFindIterable.first(_) >> { it[0].onResult(result, error) }
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(result, error) }
 
         when:
         futureResult.get()
@@ -80,9 +84,11 @@ class GridFSDownloadStreamSpecification extends Specification {
         thrown(MongoException)
 
         where:
-        description                     | result    | error
-        'the file info was not found'   | null      | null
-        'there was an error'            | null      | new MongoException('failure')
+        description                                 | clientSession         | result    | error
+        'the file info was not found'               | null                  | null      | null
+        'there was an error'                        | null                  | null      | new MongoException('failure')
+        'the file info was not found with session'  | Stub(ClientSession)   | null      | null
+        'there was an error with session'           | Stub(ClientSession)   | null      | new MongoException('failure')
     }
 
     def 'should query the chunks collection as expected'() {
@@ -103,7 +109,7 @@ class GridFSDownloadStreamSpecification extends Specification {
         def batchCursor = Mock(AsyncBatchCursor)
         def findIterable = Mock(FindIterable)
         def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, chunksCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection)
 
         when:
         def firstByteBuffer = ByteBuffer.allocate(2)
@@ -111,12 +117,16 @@ class GridFSDownloadStreamSpecification extends Specification {
         downloadStream.read(firstByteBuffer, futureResult)
 
         then:
-        1 * gridFSFindIterable.first(_) >> { it[0].onResult(FILE_INFO, null) }
-        1 * chunksCollection.find(findQuery) >> findIterable
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(FILE_INFO, null) }
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQuery) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQuery) >> findIterable
+        }
         1 * findIterable.sort(sort) >> findIterable
         1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult([chunkDocument, secondChunkDocument], null) }
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([chunkDocument, secondChunkDocument], null) }
 
         then:
         futureResult.get() == 2
@@ -141,6 +151,9 @@ class GridFSDownloadStreamSpecification extends Specification {
         futureResult.get() == -1
         0 * batchCursor.next(_)
         thirdByteBuffer == ByteBuffer.allocate(1)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should create a new cursor each time when using batchSize 1'() {
@@ -161,7 +174,7 @@ class GridFSDownloadStreamSpecification extends Specification {
         def batchCursor = Mock(AsyncBatchCursor)
         def findIterable = Mock(FindIterable)
         def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, chunksCollection).batchSize(1)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection).batchSize(1)
 
         when:
         def firstByteBuffer = ByteBuffer.allocate(2)
@@ -169,12 +182,16 @@ class GridFSDownloadStreamSpecification extends Specification {
         downloadStream.read(firstByteBuffer, futureResult)
 
         then:
-        1 * gridFSFindIterable.first(_) >> { it[0].onResult(FILE_INFO, null) }
-        1 * chunksCollection.find(findQuery) >> findIterable
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(FILE_INFO, null) }
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQuery) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQuery) >> findIterable
+        }
         1 * findIterable.sort(sort) >> findIterable
         1 * findIterable.batchSize(1) >> findIterable
-        1 * findIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult([chunkDocument], null) }
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([chunkDocument], null) }
 
         then:
         futureResult.get() == 2
@@ -187,11 +204,15 @@ class GridFSDownloadStreamSpecification extends Specification {
         downloadStream.read(secondByteBuffer, futureResult)
 
         then:
-        1 * chunksCollection.find(findQuery) >> findIterable
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQuery) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQuery) >> findIterable
+        }
         1 * findIterable.batchSize(1) >> findIterable
         1 * findIterable.sort(sort) >> findIterable
-        1 * findIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult([secondChunkDocument], null) }
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([secondChunkDocument], null) }
 
         then:
         futureResult.get() == 1
@@ -203,16 +224,110 @@ class GridFSDownloadStreamSpecification extends Specification {
         downloadStream.read(thirdByteBuffer, futureResult)
 
         then:
-        0 * chunksCollection.find(_) >> findIterable
+        0 * chunksCollection.find(*_) >> findIterable
 
         then:
         futureResult.get() == -1
         thirdByteBuffer == ByteBuffer.allocate(1)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should skip to the correct point'() {
+        given:
+        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 4194297L, 32,
+                new Date(), 'abc', new Document())
+
+        def firstChunkBytes = 1..32 as byte[]
+        def lastChunkBytes = 33 .. 57 as byte[]
+
+        def sort = new Document('n', 1)
+
+        def findQueries = [new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 0)),
+                           new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 131071))]
+        def chunkDocuments =
+                [new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(firstChunkBytes)),
+                 new Document('files_id', fileInfo.getId()).append('n', 131071).append('data', new Binary(lastChunkBytes))]
+
+        def gridFSFindIterable = Mock(GridFSFindIterable)
+        def batchCursor = Mock(AsyncBatchCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection)
+
+        when:
+        def futureResult = new FutureResultCallback()
+        downloadStream.skip(15, futureResult)
+
+        then:
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(fileInfo, null) }
+
+        then:
+        futureResult.get() == 15L
+        0 * chunksCollection.find(*_)
+
+        when:
+        futureResult = new FutureResultCallback()
+        def readByteBuffer = ByteBuffer.allocate(5)
+        downloadStream.read(readByteBuffer, futureResult)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQueries[0]) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQueries[0]) >> findIterable
+        }
+        1 * findIterable.sort(sort) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([chunkDocuments[0]], null) }
+
+        then:
+        readByteBuffer.flip() == ByteBuffer.wrap([16, 17, 18, 19, 20] as byte[])
+
+        when:
+        futureResult = new FutureResultCallback()
+        downloadStream.skip(4194272L, futureResult)
+
+        then:
+        futureResult.get() == 4194272L
+        0 * chunksCollection.find(*_)
+
+        when:
+        futureResult = new FutureResultCallback()
+        readByteBuffer = ByteBuffer.allocate(5)
+        downloadStream.read(readByteBuffer, futureResult)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQueries[1]) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQueries[1]) >> findIterable
+        }
+        1 * findIterable.sort(sort) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([chunkDocuments[1]], null) }
+
+        then:
+        readByteBuffer.flip() == ByteBuffer.wrap([53, 54, 55, 56, 57] as byte[])
+
+        when:
+        futureResult = new FutureResultCallback()
+        downloadStream.skip(1L, futureResult)
+
+        then:
+        futureResult.get() == 0L
+        0 * chunksCollection.find(*_)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw if trying to pass negative batchSize'() {
         given:
-        def downloadStream = new GridFSDownloadStreamImpl(Stub(GridFSFindIterable), Stub(MongoCollection))
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, Stub(GridFSFindIterable), Stub(MongoCollection))
 
         when:
         downloadStream.batchSize(0)
@@ -226,6 +341,9 @@ class GridFSDownloadStreamSpecification extends Specification {
 
         then:
         thrown(IllegalArgumentException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw if no chunks found when data is expected'() {
@@ -234,7 +352,7 @@ class GridFSDownloadStreamSpecification extends Specification {
         def batchCursor = Mock(AsyncBatchCursor)
         def findIterable = Mock(FindIterable)
         def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, chunksCollection).batchSize(1)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection).batchSize(1)
 
         when:
         def firstByteBuffer = ByteBuffer.allocate(2)
@@ -242,18 +360,25 @@ class GridFSDownloadStreamSpecification extends Specification {
         downloadStream.read(firstByteBuffer, futureResult)
 
         then:
-        1 * gridFSFindIterable.first(_) >> { it[0].onResult(FILE_INFO, null) }
-        1 * chunksCollection.find(_) >> findIterable
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(FILE_INFO, null) }
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
         1 * findIterable.sort(_) >> findIterable
         1 * findIterable.batchSize(1) >> findIterable
-        1 * findIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult([], null) }
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult([], null) }
 
         when:
         futureResult.get()
 
         then:
         thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     @Unroll
@@ -262,7 +387,7 @@ class GridFSDownloadStreamSpecification extends Specification {
         def gridFSFindIterable = Mock(GridFSFindIterable)
         def findIterable = Mock(FindIterable)
         def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, chunksCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection)
 
         when:
         def firstByteBuffer = ByteBuffer.allocate(2)
@@ -270,11 +395,15 @@ class GridFSDownloadStreamSpecification extends Specification {
         downloadStream.read(firstByteBuffer, futureResult)
 
         then:
-        1 * gridFSFindIterable.first(_) >> { it[0].onResult(FILE_INFO, null) }
-        1 * chunksCollection.find(_) >> findIterable
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(FILE_INFO, null) }
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
         1 * findIterable.sort(_) >> findIterable
         1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.batchCursor(_) >> { it[0].onResult(result, error) }
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(result, error) }
 
         when:
         futureResult.get()
@@ -283,8 +412,9 @@ class GridFSDownloadStreamSpecification extends Specification {
         thrown(MongoException)
 
         where:
-        description                 | result    | error
-        'when there is an error'    | null      | new MongoException('failure')
+        description                              | clientSession        | result    | error
+        'when there is an error'                 | null                 | null      | new MongoException('failure')
+        'when there is an error with session'    | Stub(ClientSession)  | null      | new MongoException('failure')
     }
 
     @Unroll
@@ -294,7 +424,7 @@ class GridFSDownloadStreamSpecification extends Specification {
         def batchCursor = Mock(AsyncBatchCursor)
         def findIterable = Mock(FindIterable)
         def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, chunksCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, chunksCollection)
 
         when:
         def firstByteBuffer = ByteBuffer.allocate(2)
@@ -302,12 +432,16 @@ class GridFSDownloadStreamSpecification extends Specification {
         downloadStream.read(firstByteBuffer, futureResult)
 
         then:
-        1 * gridFSFindIterable.first(_) >> { it[0].onResult(FILE_INFO, null) }
-        1 * chunksCollection.find(_) >> findIterable
+        1 * gridFSFindIterable.first(_) >> { it.last().onResult(FILE_INFO, null) }
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
         1 * findIterable.sort(_) >> findIterable
         1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.batchCursor(_) >> { it[0].onResult(batchCursor, null) }
-        1 * batchCursor.next(_) >> { it[0].onResult(result, error) }
+        1 * findIterable.batchCursor(_) >> { it.last().onResult(batchCursor, null) }
+        1 * batchCursor.next(_) >> { it.last().onResult(result, error) }
 
         when:
         futureResult.get()
@@ -316,23 +450,34 @@ class GridFSDownloadStreamSpecification extends Specification {
         thrown(MongoException)
 
         where:
-        description                 | result                                                | error
-        'is smaller than expected'  | [Document.parse('{ files_id: 1, n: 0}')
-                                               .append('data', new Binary(new byte[1]))]    | null
-        'is bigger than expected'   | [Document.parse('{ files_id: 1, n: 0}')
-                                               .append('data', new Binary(new byte[100]))]  | null
-        'has the wrong n index'     | [Document.parse('{ files_id: 1, n: 1}')
-                                               .append('data', new Binary(new byte[3]))]    | null
-        'has the wrong data type'   | [Document.parse('{ files_id: 1, n: 0}')
-                                               .append('data', 'hello')]                    | null
-        'is empty'                  | []                                                    | null
-        'is null'                   | null                                                  | null
-        'has an error'              | null                                                  | new MongoException('failure')
+        description                             | clientSession       | result                                          | error
+        'is smaller than expected with session' | Stub(ClientSession) | [Document.parse('{ files_id: 1, n: 0}')
+                                                                         .append('data', new Binary(new byte[1]))]      | null
+        'is bigger than expected with session'  | Stub(ClientSession) | [Document.parse('{ files_id: 1, n: 0}')
+                                                                         .append('data', new Binary(new byte[100]))]    | null
+        'has the wrong n index with session'    | Stub(ClientSession) | [Document.parse('{ files_id: 1, n: 1}')
+                                                                         .append('data', new Binary(new byte[3]))]      | null
+        'has the wrong data type with session'  | Stub(ClientSession) | [Document.parse('{ files_id: 1, n: 0}')
+                                                                            .append('data', 'hello')]                   | null
+        'is empty with session'                 | Stub(ClientSession) | []      | null
+        'is null with session'                  | Stub(ClientSession) | null    | null
+        'has an error with session'             | Stub(ClientSession) | null    | new MongoException('failure')
+        'is smaller than expected'              | null                | [Document.parse('{ files_id: 1, n: 0}')
+                                                                         .append('data', new Binary(new byte[1]))]      | null
+        'is bigger than expected'               | null                | [Document.parse('{ files_id: 1, n: 0}')
+                                                                         .append('data', new Binary(new byte[100]))]    | null
+        'has the wrong n index'                 | null                | [Document.parse('{ files_id: 1, n: 1}')
+                                                                         .append('data', new Binary(new byte[3]))]      | null
+        'has the wrong data type'               | null                | [Document.parse('{ files_id: 1, n: 0}')
+                                                                         .append('data', 'hello')]                      | null
+        'is empty with session'                 | null                | []      | null
+        'is null with session'                  | null                | null    | null
+        'has an error with session'             | null                | null    | new MongoException('failure')
     }
 
     def 'should throw an exception when trying to action post close'() {
         given:
-        def downloadStream = new GridFSDownloadStreamImpl(Stub(GridFSFindIterable), Stub(MongoCollection))
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, Stub(GridFSFindIterable), Stub(MongoCollection))
         def futureResult = new FutureResultCallback()
         downloadStream.close(futureResult)
         futureResult.get()
@@ -360,6 +505,9 @@ class GridFSDownloadStreamSpecification extends Specification {
 
         then:
         notThrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should not allow concurrent reads'() {
@@ -370,10 +518,10 @@ class GridFSDownloadStreamSpecification extends Specification {
             1 * first(_) >> {
                 latchA.countDown()
                 latchB.await()
-                it[0].onResult(null, null)
+                it.last().onResult(null, null)
             }
         }
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, Stub(MongoCollection))
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, Stub(MongoCollection))
         def futureResult = new FutureResultCallback()
 
         when:
@@ -393,6 +541,9 @@ class GridFSDownloadStreamSpecification extends Specification {
         then:
         def exception = thrown(MongoGridFSException)
         exception.getMessage() == 'The AsyncInputStream does not support concurrent reading.'
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should not allow a concurrent read and close'() {
@@ -403,10 +554,10 @@ class GridFSDownloadStreamSpecification extends Specification {
             1 * first(_) >> {
                 latchA.countDown()
                 latchB.await()
-                it[0].onResult(null, null)
+                it.last().onResult(null, null)
             }
         }
-        def downloadStream = new GridFSDownloadStreamImpl(gridFSFindIterable, Stub(MongoCollection))
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, gridFSFindIterable, Stub(MongoCollection))
         def futureResult = new FutureResultCallback()
 
         when:
@@ -426,5 +577,8 @@ class GridFSDownloadStreamSpecification extends Specification {
         then:
         def exception = thrown(MongoGridFSException)
         exception.getMessage() == 'The AsyncInputStream does not support concurrent reading.'
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSFindIterableSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSFindIterableSpecification.groovy
index a3ae8685185..17ac22dd607 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSFindIterableSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSFindIterableSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,9 +27,9 @@ import com.mongodb.async.SingleResultCallback
 import com.mongodb.async.client.FindIterableImpl
 import com.mongodb.async.client.MongoClients
 import com.mongodb.async.client.TestOperationExecutor
-import com.mongodb.client.gridfs.model.GridFSFile
 import com.mongodb.client.gridfs.codecs.GridFSFileCodec
-import com.mongodb.client.model.FindOptions
+import com.mongodb.client.gridfs.model.GridFSFile
+import com.mongodb.client.model.Collation
 import com.mongodb.operation.FindOperation
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -44,19 +44,19 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static spock.util.matcher.HamcrestSupport.expect
 
 class GridFSFindIterableSpecification extends Specification {
-
     def codecRegistry = MongoClients.getDefaultCodecRegistry()
     def gridFSFileCodec = new GridFSFileCodec(codecRegistry)
     def readPreference = secondary()
     def readConcern = ReadConcern.DEFAULT
     def namespace = new MongoNamespace('test', 'fs.files')
+    def collation = Collation.builder().locale('en').build()
 
     def 'should build the expected findOperation'() {
         given:
         def batchCursor = Stub(AsyncBatchCursor)
         def executor = new TestOperationExecutor([batchCursor, batchCursor]);
-        def underlying = new FindIterableImpl(namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
-                new Document(), new FindOptions())
+        def underlying = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
+                new Document(), true)
         def findIterable = new GridFSFindIterableImpl(underlying)
 
         when: 'default input should be as expected'
@@ -65,7 +65,8 @@ class GridFSFindIterableSpecification extends Specification {
         def readPreference = executor.getReadPreference()
 
         then:
-        expect operation, isTheSameAs(new FindOperation<GridFSFile>(namespace, gridFSFileCodec).filter(new BsonDocument()).slaveOk(true))
+        expect operation, isTheSameAs(new FindOperation<GridFSFile>(namespace, gridFSFileCodec).filter(new BsonDocument())
+                .slaveOk(true).retryReads(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
@@ -76,6 +77,7 @@ class GridFSFindIterableSpecification extends Specification {
                 .limit(99)
                 .skip(9)
                 .noCursorTimeout(true)
+                .collation(collation)
                 .batchCursor(Stub(SingleResultCallback))
 
         operation = executor.getReadOperation() as FindOperation<GridFSFile>
@@ -90,16 +92,17 @@ class GridFSFindIterableSpecification extends Specification {
                 .skip(9)
                 .noCursorTimeout(true)
                 .slaveOk(true)
+                .collation(collation)
+                .retryReads(true)
         )
     }
 
     def 'should handle mixed types'() {
         given:
         def batchCursor = Stub(AsyncBatchCursor)
-        def executor = new TestOperationExecutor([batchCursor]);
-        def findOptions = new FindOptions()
-        def findIterable = new FindIterableImpl(namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
-                new Document('filter', 1), findOptions)
+        def executor = new TestOperationExecutor([batchCursor])
+        def findIterable = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern,
+                executor, new Document('filter', 1), true)
 
         when:
         findIterable.filter(new Document('filter', 1))
@@ -116,6 +119,7 @@ class GridFSFindIterableSpecification extends Specification {
                 .modifiers(new BsonDocument('modifier', new BsonInt32(1)))
                 .cursorType(CursorType.NonTailable)
                 .slaveOk(true)
+                .retryReads(true)
         )
     }
 
@@ -136,12 +140,12 @@ class GridFSFindIterableSpecification extends Specification {
                     count++
                     count == 1 ? cannedResults : null
                 }
-                next(_) >> { it[0].onResult(getResult(), null) }
+                next(_) >> { it.last().onResult(getResult(), null) }
             }
         }
-        def executor = new TestOperationExecutor([batchCursor(), batchCursor(), batchCursor(), batchCursor()]);
-        def underlying = new FindIterableImpl(namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
-                new Document(), new FindOptions())
+        def executor = new TestOperationExecutor([batchCursor(), batchCursor(), batchCursor(), batchCursor()])
+        def underlying = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
+                new Document(), true)
         def mongoIterable = new GridFSFindIterableImpl(underlying)
 
         when:
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSIndexCheckSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSIndexCheckSpecification.groovy
index c28e062fe72..5fb4ca7ea68 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSIndexCheckSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSIndexCheckSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,6 +22,7 @@ import com.mongodb.async.SingleResultCallback
 import com.mongodb.async.client.FindIterable
 import com.mongodb.async.client.ListIndexesIterable
 import com.mongodb.async.client.MongoCollection
+import com.mongodb.async.client.ClientSession
 import org.bson.Document
 import spock.lang.Specification
 
@@ -36,7 +37,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
 
         when:
         indexChecker.checkAndCreateIndex(Stub(SingleResultCallback))
@@ -44,9 +45,16 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(new Document(), null) }
+        1 * findIterable.first(_) >> { it.last().onResult(new Document(), null) }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should not do anything if indexes exist'() {
@@ -55,7 +63,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
 
         when:
         indexChecker.checkAndCreateIndex(Stub(SingleResultCallback))
@@ -63,27 +71,42 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
         1 * listIndexesIterable.into(_, _) >> {
-            it[1].onResult([Document.parse('{"key": {"_id": 1}}'),
+            it.last().onResult([Document.parse('{"key": {"_id": 1}}'),
                             Document.parse('{"key": {"filename": 1, "uploadDate": 1 }}')], null)
         }
-        0 * filesCollection.createIndex(_, _)
+        0 * filesCollection.createIndex(*_)
 
         // Chunks Index check
         1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
+        if (clientSession != null){
+            1 * chunksCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * chunksCollection.listIndexes() >> listIndexesIterable
+        }
         1 * listIndexesIterable.into(_, _) >> {
-            it[1].onResult([Document.parse('{"key": {"_id": 1}}'),
+            it.last().onResult([Document.parse('{"key": {"_id": 1}}'),
                             Document.parse('{"key": {"files_id": 1, "n": 1 }}')], null)
         }
-        0 * chunksCollection.createIndex(_, _, _)
+        0 * chunksCollection.createIndex(*_)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should create a chunks index but not a files index if it exists'() {
@@ -92,7 +115,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
 
         when:
         indexChecker.checkAndCreateIndex(Stub(SingleResultCallback))
@@ -100,25 +123,45 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
         1 * listIndexesIterable.into(_, _) >> {
-            it[1].onResult([Document.parse('{"key": {"_id": 1}}'),
+            it.last().onResult([Document.parse('{"key": {"_id": 1}}'),
                             Document.parse('{"key": {"filename": 1, "uploadDate": 1 }}')], null)
         }
-        0 * filesCollection.createIndex(_, _)
+        0 * filesCollection.createIndex(*_)
 
         // Chunks Index check
         1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
-                { indexOptions -> indexOptions.isUnique() }, _) >> { it[2].onResult('files_id_1', null) }
+        if (clientSession != null){
+            1 * chunksCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * chunksCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+        if (clientSession != null) {
+            1 * chunksCollection.createIndex(clientSession, { index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() }, _) >> { it.last().onResult('files_id_1', null) }
+        } else {
+            1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() }, _) >> { it.last().onResult('files_id_1', null) }
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should create a files index but not a chunks index if it exists'() {
@@ -127,34 +170,53 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
 
         when:
         indexChecker.checkAndCreateIndex(Stub(SingleResultCallback))
 
         then:
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >> {
-            it[1].onResult('filename_1', null)
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+        if (clientSession != null){
+            1 * filesCollection.createIndex(clientSession, { index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
+        } else {
+            1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
         }
 
         // Chunks Index check
         1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
+        if (clientSession != null){
+            1 * chunksCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * chunksCollection.listIndexes() >> listIndexesIterable
+        }
         1 * listIndexesIterable.into(_, _) >> {
-            it[1].onResult([Document.parse('{"key": {"_id": 1}}'),
+            it.last().onResult([Document.parse('{"key": {"_id": 1}}'),
                             Document.parse('{"key": {"files_id": 1, "n": 1 }}')], null)
         }
-        0 * chunksCollection.createIndex(_, _, _)
+        0 * chunksCollection.createIndex(*_)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should create indexes if empty files collection and no indexes'() {
@@ -163,7 +225,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
 
         when:
         indexChecker.checkAndCreateIndex(Stub(SingleResultCallback))
@@ -171,25 +233,49 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >> {
-            it[1].onResult('filename_1', null)
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+        if (clientSession != null){
+            1 * filesCollection.createIndex(clientSession, { index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
+        } else {
+            1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
         }
 
         // Chunks Index check
         1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
-                { indexOptions -> indexOptions.isUnique() }, _) >> { it[2].onResult('files_id_1', null) }
+        if (clientSession != null){
+            1 * chunksCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * chunksCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+
+        if (clientSession != null) {
+            1 * chunksCollection.createIndex(clientSession, { index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() }, _) >> { it.last().onResult('files_id_1', null) }
+        } else {
+            1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() }, _) >> { it.last().onResult('files_id_1', null) }
+        }
 
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate errors if error when checking files collection'() {
@@ -197,7 +283,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
         def futureResult = new FutureResultCallback()
 
         when:
@@ -206,9 +292,13 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, exception) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, exception) }
 
         when:
         futureResult.get()
@@ -216,6 +306,9 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         def ex = thrown(MongoException)
         ex == exception
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate errors if error when checking has files index'() {
@@ -224,7 +317,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
         def futureResult = new FutureResultCallback()
 
         when:
@@ -233,14 +326,22 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult(null, exception) }
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult(null, exception) }
 
         when:
         futureResult.get()
@@ -248,6 +349,9 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         def ex = thrown(MongoException)
         ex == exception
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate errors if error when creating files index'() {
@@ -256,7 +360,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
         def futureResult = new FutureResultCallback()
 
         when:
@@ -265,16 +369,28 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >> {
-            it[1].onResult(null, exception)
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+        if (clientSession != null){
+            1 * filesCollection.createIndex(clientSession, { index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult(null, exception) }
+        } else {
+            1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult(null, exception) }
         }
 
         when:
@@ -283,6 +399,9 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         def ex = thrown(MongoException)
         ex == exception
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate errors if error when checking has chunks index'() {
@@ -291,7 +410,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
         def futureResult = new FutureResultCallback()
 
         when:
@@ -300,22 +419,38 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >> {
-            it[1].onResult('filename_1', null)
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+        if (clientSession != null){
+            1 * filesCollection.createIndex(clientSession, { index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
+        } else {
+            1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
         }
 
         // Chunks Index check
         1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], exception) }
+        if (clientSession != null){
+            1 * chunksCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * chunksCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], exception) }
 
         when:
         futureResult.get()
@@ -323,6 +458,9 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         def ex = thrown(MongoException)
         ex == exception
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate errors if error when creating chunks index'() {
@@ -331,7 +469,7 @@ class GridFSIndexCheckSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def listIndexesIterable = Mock(ListIndexesIterable)
         def findIterable = Mock(FindIterable)
-        def indexChecker = new GridFSIndexCheckImpl(filesCollection, chunksCollection)
+        def indexChecker = new GridFSIndexCheckImpl(clientSession, filesCollection, chunksCollection)
         def futureResult = new FutureResultCallback()
 
         when:
@@ -340,24 +478,46 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         1 * filesCollection.withDocumentClass(Document) >> filesCollection
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
+        if (clientSession != null){
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
         1 * findIterable.projection(projection) >> findIterable
-        1 * findIterable.first(_) >> { it[0].onResult(null, null) }
+        1 * findIterable.first(_) >> { it.last().onResult(null, null) }
 
         // Files Index check
         1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >> {
-            it[1].onResult('filename_1', null)
+        if (clientSession != null){
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+        if (clientSession != null){
+            1 * filesCollection.createIndex(clientSession, { index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
+        } else {
+            1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') }, _) >>
+                    { it.last().onResult('filename_1', null) }
         }
 
+
         // Chunks Index check
         1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_, _) >> { it[1].onResult([], null) }
-        1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
-                { indexOptions -> indexOptions.isUnique() }, _) >> { it[2].onResult(null, exception) }
+        if (clientSession != null){
+            1 * chunksCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * chunksCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_, _) >> { it.last().onResult([], null) }
+        if (clientSession != null){
+            1 * chunksCollection.createIndex(clientSession, { index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() }, _) >> { it.last().onResult(null, exception) }
+        } else {
+            1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() }, _) >> { it.last().onResult(null, exception) }
+        }
 
         when:
         futureResult.get()
@@ -365,5 +525,8 @@ class GridFSIndexCheckSpecification extends Specification {
         then:
         def ex = thrown(MongoException)
         ex == exception
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 }
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSUploadStreamSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSUploadStreamSpecification.groovy
index 393657bddc5..253c3ecd0ef 100644
--- a/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSUploadStreamSpecification.groovy
+++ b/driver-async/src/test/unit/com/mongodb/async/client/gridfs/GridFSUploadStreamSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,7 +21,7 @@ import com.mongodb.MongoGridFSException
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
 import com.mongodb.async.client.MongoCollection
-import com.mongodb.client.gridfs.model.GridFSFile
+import com.mongodb.async.client.ClientSession
 import org.bson.BsonObjectId
 import org.bson.BsonString
 import org.bson.Document
@@ -37,14 +37,18 @@ class GridFSUploadStreamSpecification extends Specification {
     def filename = 'filename'
     def metadata = new Document()
     def content = 'file content ' as byte[]
+    def disableMD5 = false
 
     def 'should return the file id'() {
         when:
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         then:
         uploadStream.getId() == fileId
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should write the buffer it reaches the chunk size'() {
@@ -52,19 +56,27 @@ class GridFSUploadStreamSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def callback = Stub(SingleResultCallback)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 2, metadata, NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 2,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         uploadStream.write(ByteBuffer.wrap(new byte[1]), callback)
 
         then:
-        0 * chunksCollection.insertOne(_, _)
+        0 * chunksCollection.insertOne(*_)
 
         when:
         uploadStream.write(ByteBuffer.wrap(new byte[1]), callback)
 
         then:
-        1 * chunksCollection.insertOne(_, _)
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _, _)
+        } else {
+            1 * chunksCollection.insertOne(_, _)
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should write to the files collection on close'() {
@@ -72,21 +84,30 @@ class GridFSUploadStreamSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def callback = Stub(SingleResultCallback)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, null, NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, null, NOOP_INDEXCHECK)
         def byteBuffer = ByteBuffer.wrap(new byte[10])
 
         when:
         uploadStream.write(byteBuffer, callback)
 
         then:
-        0 * chunksCollection.insertOne(_, _)
+        0 * chunksCollection.insertOne(*_)
 
         when:
         uploadStream.close(callback)
 
         then:
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, null) }
-        1 * filesCollection.insertOne(_, _)
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(clientSession, _, _)
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(_, _)
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should write to the files and chunks collection as expected on close'() {
@@ -95,7 +116,8 @@ class GridFSUploadStreamSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def callback = Stub(SingleResultCallback)
         def metadata = new Document('contentType', 'text/txt')
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata, NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                md5Disabled, metadata, NOOP_INDEXCHECK)
         def chunksData
         def fileData
 
@@ -104,13 +126,26 @@ class GridFSUploadStreamSpecification extends Specification {
         uploadStream.close(callback)
 
         then:
-        1 * chunksCollection.insertOne(_, _) >> { Document data, SingleResultCallback<Void> insertCallback ->
-            chunksData = data
-            insertCallback.onResult(null, null)
-        }
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> {
+                chunksData = it[1]
+                it.last().onResult(null, null)
+            }
+
+            1 * filesCollection.insertOne(clientSession, _, _) >> {
+                fileData = it[1]
+                it.last().onResult(null, null)
+            }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> {
+                chunksData = it[0]
+                it.last().onResult(null, null)
+            }
 
-        1 * filesCollection.insertOne(_, _) >> { GridFSFile data, SingleResultCallback<Void> insertCallback ->
-            fileData = data
+            1 * filesCollection.insertOne(_, _) >> {
+                fileData = it[0]
+                it.last().onResult(null, null)
+            }
         }
 
         then:
@@ -122,8 +157,11 @@ class GridFSUploadStreamSpecification extends Specification {
         fileData.getFilename() == filename
         fileData.getLength() == content.length as Long
         fileData.getChunkSize() == 255
-        fileData.getMD5() == MessageDigest.getInstance('MD5').digest(content).encodeHex().toString()
+        fileData.getMD5() == md5Disabled ? null : MessageDigest.getInstance('MD5').digest(content).encodeHex().toString()
         fileData.getMetadata() == metadata
+
+        where:
+        [clientSession, md5Disabled] << [[null, Stub(ClientSession)], [true, false]].combinations()
     }
 
     def 'should not write an empty chunk'() {
@@ -131,36 +169,51 @@ class GridFSUploadStreamSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def callback = Stub(SingleResultCallback)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata, NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         uploadStream.close(callback)
 
         then:
-        0 * chunksCollection.insertOne(_, _)
-        1 * filesCollection.insertOne(_, _)
+        0 * chunksCollection.insertOne(*_)
+        if (clientSession != null) {
+            1 * filesCollection.insertOne(clientSession, _, _)
+        } else {
+            1 * filesCollection.insertOne(_, _)
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should delete any chunks when calling abort'() {
         given:
         def chunksCollection = Mock(MongoCollection)
         def callback = Stub(SingleResultCallback)
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), chunksCollection, fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         uploadStream.write(ByteBuffer.wrap(content), callback)
         uploadStream.abort(callback)
 
         then:
-        1 * chunksCollection.deleteMany(new Document('files_id', fileId), _)
+        if (clientSession != null) {
+            1 * chunksCollection.deleteMany(clientSession, new Document('files_id', fileId), _)
+        } else {
+            1 * chunksCollection.deleteMany(new Document('files_id', fileId), _)
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should close the stream on abort'() {
         given:
         def callback = Stub(SingleResultCallback)
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
         uploadStream.write(ByteBuffer.wrap(content), callback)
         uploadStream.abort(callback)
 
@@ -171,13 +224,16 @@ class GridFSUploadStreamSpecification extends Specification {
 
         then:
         thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw an exception when trying to action post close'() {
         given:
         def callback = Stub(SingleResultCallback)
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
         uploadStream.close(callback)
 
         when:
@@ -203,6 +259,9 @@ class GridFSUploadStreamSpecification extends Specification {
 
         then:
         notThrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should throw an exception when calling getObjectId and the fileId is not an ObjectId'() {
@@ -210,28 +269,26 @@ class GridFSUploadStreamSpecification extends Specification {
         def fileId = new BsonString('myFile')
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata, NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         uploadStream.getObjectId()
 
         then:
         thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should not allow concurrent writes'() {
         given:
         def latchA = new CountDownLatch(1)
         def latchB = new CountDownLatch(1)
-        def chunksCollection = Mock(MongoCollection) {
-            1 * insertOne(_, _) >> {
-                latchA.countDown()
-                latchB.await()
-                it[1].onResult(null, null)
-            }
-        }
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), chunksCollection, fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -249,24 +306,36 @@ class GridFSUploadStreamSpecification extends Specification {
         }
         futureResult.get()
 
+        then:
+        if (clientSession != null ) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> {
+                latchA.countDown()
+                latchB.await()
+                it.last().onResult(null, null)
+            }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> {
+                latchA.countDown()
+                latchB.await()
+                it.last().onResult(null, null)
+            }
+        }
+
         then:
         def exception = thrown(MongoGridFSException)
         exception.getMessage() == 'The AsyncOutputStream does not support concurrent writing.'
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should not allow a concurrent write and close'() {
         given:
         def latchA = new CountDownLatch(1)
         def latchB = new CountDownLatch(1)
-        def chunksCollection = Mock(MongoCollection) {
-            1 * insertOne(_, _) >> {
-                latchA.countDown()
-                latchB.await()
-                it[1].onResult(null, null)
-            }
-        }
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), chunksCollection, fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -284,25 +353,36 @@ class GridFSUploadStreamSpecification extends Specification {
         }
         futureResult.get()
 
+        then:
+        if (clientSession != null ) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> {
+                latchA.countDown()
+                latchB.await()
+                it.last().onResult(null, null)
+            }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> {
+                latchA.countDown()
+                latchB.await()
+                it.last().onResult(null, null)
+            }
+        }
+
         then:
         def exception = thrown(MongoGridFSException)
         exception.getMessage() == 'The AsyncOutputStream does not support concurrent writing.'
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should not allow concurrent write then abort'() {
         given:
-        def callback = Stub(SingleResultCallback)
         def latchA = new CountDownLatch(1)
         def latchB = new CountDownLatch(1)
-        def chunksCollection = Mock(MongoCollection) {
-            1 * insertOne(_, _) >> {
-                latchA.countDown()
-                latchB.await()
-                it[1].onResult(null, null)
-            }
-        }
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), chunksCollection, fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         def futureResult = new FutureResultCallback()
@@ -320,24 +400,46 @@ class GridFSUploadStreamSpecification extends Specification {
         }
         futureResult.get()
 
+        then:
+        if (clientSession != null ) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> {
+                latchA.countDown()
+                latchB.await()
+                it.last().onResult(null, null)
+            }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> {
+                latchA.countDown()
+                latchB.await()
+                it.last().onResult(null, null)
+            }
+        }
+
         then:
         def exception = thrown(MongoGridFSException)
         exception.getMessage() == 'The AsyncOutputStream does not support concurrent writing.'
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate exceptions when writing'() {
         given:
         def chunksCollection = Mock(MongoCollection)
         def alternativeException = new MongoException('Alternative failure')
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), chunksCollection, fileId, filename, 255, metadata,
-                NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
 
         when:
         def futureResult = new FutureResultCallback()
         uploadStream.write(ByteBuffer.allocate(255), futureResult)
 
         then:
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, alternativeException) }
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, alternativeException) }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, alternativeException) }
+        }
 
         when:
         futureResult.get()
@@ -345,6 +447,9 @@ class GridFSUploadStreamSpecification extends Specification {
         then:
         def exception = thrown(MongoException)
         exception == alternativeException
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate exceptions when closing'() {
@@ -355,12 +460,17 @@ class GridFSUploadStreamSpecification extends Specification {
 
         when: 'The insert to the chunks collection fails'
         def futureResult = new FutureResultCallback()
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata, NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
         uploadStream.write(ByteBuffer.wrap(content), Stub(SingleResultCallback))
         uploadStream.close(futureResult)
 
         then:
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, closeException) }
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, closeException) }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, closeException) }
+        }
 
         when:
         futureResult.get()
@@ -371,13 +481,19 @@ class GridFSUploadStreamSpecification extends Specification {
 
         when: 'The insert to the files collection fails'
         futureResult = new FutureResultCallback()
-        uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata, NOOP_INDEXCHECK)
+        uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
         uploadStream.write(ByteBuffer.wrap(content), Stub(SingleResultCallback))
         uploadStream.close(futureResult)
 
         then:
-        1 * chunksCollection.insertOne(_, _) >> { it[1].onResult(null, null) }
-        1 * filesCollection.insertOne(_, _) >> { it[1].onResult(null, closeException) }
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(clientSession, _, _) >> { it.last().onResult(null, closeException) }
+        } else {
+            1 * chunksCollection.insertOne(_, _) >> { it.last().onResult(null, null) }
+            1 * filesCollection.insertOne(_, _) >> { it.last().onResult(null, closeException) }
+        }
 
         when:
         futureResult.get()
@@ -385,6 +501,9 @@ class GridFSUploadStreamSpecification extends Specification {
         then:
         exception = thrown(MongoException)
         exception == closeException
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate exceptions when aborting'() {
@@ -392,14 +511,19 @@ class GridFSUploadStreamSpecification extends Specification {
         def filesCollection = Mock(MongoCollection)
         def chunksCollection = Mock(MongoCollection)
         def abortException = new MongoException('Alternative failure')
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata, NOOP_INDEXCHECK)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, NOOP_INDEXCHECK)
         def futureResult = new FutureResultCallback()
 
         when:
         uploadStream.abort(futureResult)
 
         then:
-        1 * chunksCollection.deleteMany(_, _) >> { it[1].onResult(null, abortException) }
+        if (clientSession != null) {
+            1 * chunksCollection.deleteMany(clientSession, _, _) >> { it.last().onResult(null, abortException) }
+        } else {
+            1 * chunksCollection.deleteMany(_, _) >> { it.last().onResult(null, abortException) }
+        }
 
         when:
         futureResult.get()
@@ -407,6 +531,9 @@ class GridFSUploadStreamSpecification extends Specification {
         then:
         def exception = thrown(MongoException)
         exception == abortException
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     def 'should propagate exceptions when creating indexes'() {
@@ -415,9 +542,10 @@ class GridFSUploadStreamSpecification extends Specification {
         def chunksCollection = Mock(MongoCollection)
         def indexException = new MongoException('Alternative failure')
         def indexCheck = Mock(GridFSIndexCheck) {
-            1 * checkAndCreateIndex(_) >> { it[0].onResult(null, indexException) }
+            1 * checkAndCreateIndex(_) >> { it.last().onResult(null, indexException) }
         }
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata, indexCheck)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata, indexCheck)
         def futureResult = new FutureResultCallback()
 
         when:
@@ -427,6 +555,9 @@ class GridFSUploadStreamSpecification extends Specification {
         then:
         def exception = thrown(MongoException)
         exception == indexException
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
     }
 
     private final static GridFSIndexCheck NOOP_INDEXCHECK = new GridFSIndexCheck() {
diff --git a/driver-async/src/test/unit/com/mongodb/async/client/internal/AsyncCryptConnectionSpecification.groovy b/driver-async/src/test/unit/com/mongodb/async/client/internal/AsyncCryptConnectionSpecification.groovy
new file mode 100644
index 00000000000..1864097e5f1
--- /dev/null
+++ b/driver-async/src/test/unit/com/mongodb/async/client/internal/AsyncCryptConnectionSpecification.groovy
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async.client.internal
+
+import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SplittablePayload
+import com.mongodb.internal.connection.NoOpSessionContext
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonArray
+import org.bson.BsonBinary
+import org.bson.BsonBinaryReader
+import org.bson.BsonBinaryWriter
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWrapper
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.Document
+import org.bson.RawBsonDocument
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.RawBsonDocumentCodec
+import org.bson.io.BasicOutputBuffer
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.ClusterFixture.notAtLeastJava8
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.connection.SplittablePayload.Type.INSERT
+
+@IgnoreIf( { notAtLeastJava8 })
+class AsyncCryptConnectionSpecification extends Specification {
+
+    def 'should encrypt and decrypt a command'() {
+        given:
+        def callback = Mock(SingleResultCallback)
+        def wrappedConnection = Mock(AsyncConnection)
+        def crypt = Mock(Crypt)
+        def cryptConnection = new AsyncCryptConnection(wrappedConnection, crypt)
+        def codec = new DocumentCodec()
+        def encryptedCommand = toRaw(new BsonDocument('find', new BsonString('test'))
+                .append('ssid', new BsonBinary(6 as byte, new byte[10])))
+
+        def encryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1))
+                .append('cursor',
+                        new BsonDocument('firstBatch',
+                                new BsonArray([new BsonDocument('_id', new BsonInt32(1))
+                                                       .append('ssid', new BsonBinary(6 as byte, new byte[10]))]))))
+
+        def decryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1))
+                .append('cursor', new BsonDocument('firstBatch',
+                        new BsonArray([new BsonDocument('_id', new BsonInt32(1))
+                                               .append('ssid', new BsonString('555-55-5555'))]))))
+
+        when:
+        cryptConnection.commandAsync('db',
+                new BsonDocumentWrapper(new Document('find', 'test')
+                        .append('filter', new Document('ssid', '555-55-5555')), codec),
+                new NoOpFieldNameValidator(), ReadPreference.primary(), codec,
+                NoOpSessionContext.INSTANCE, callback)
+
+        then:
+        _ * wrappedConnection.getDescription() >> {
+            new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())), 8, STANDALONE,
+                    1000, 1024 * 16_000, 1024 * 48_000, [])
+        }
+        1 * crypt.encrypt('db', toRaw(new BsonDocument('find', new BsonString('test'))
+                .append('filter', new BsonDocument('ssid', new BsonString('555-55-5555')))), _ as SingleResultCallback) >> {
+            it.last().onResult(encryptedCommand, null)
+        }
+        1 * wrappedConnection.commandAsync('db', encryptedCommand, _ as NoOpFieldNameValidator, ReadPreference.primary(),
+                _ as RawBsonDocumentCodec, NoOpSessionContext.INSTANCE, true, null, null, _ as SingleResultCallback) >> {
+            it.last().onResult(encryptedResponse, null)
+        }
+        1 * crypt.decrypt(encryptedResponse, _ as SingleResultCallback) >> {
+            it.last().onResult(decryptedResponse, null)
+        }
+        1 * callback.onResult(rawToDocument(decryptedResponse), null)
+    }
+
+    def 'should split at 2 MiB'() {
+        given:
+        def callback = Mock(SingleResultCallback)
+        def wrappedConnection = Mock(AsyncConnection)
+        def crypt = Mock(Crypt)
+        def cryptConnection = new AsyncCryptConnection(wrappedConnection, crypt)
+        def codec = new DocumentCodec()
+        def bytes = new byte[2097152 - 85]
+        def payload = new SplittablePayload(INSERT, [
+                new BsonDocumentWrapper(new Document('_id', 1).append('ssid', '555-55-5555').append('b', bytes), codec),
+                new BsonDocumentWrapper(new Document('_id', 2).append('ssid', '666-66-6666').append('b', bytes), codec)
+        ])
+        def encryptedCommand = toRaw(new BsonDocument('insert', new BsonString('test')).append('documents', new BsonArray(
+                [
+                        new BsonDocument('_id', new BsonInt32(1))
+                                .append('ssid', new BsonBinary(6 as byte, new byte[10]))
+                                .append('b', new BsonBinary(bytes))
+                ])))
+
+        def encryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1)))
+        def decryptedResponse = encryptedResponse
+
+        when:
+        cryptConnection.commandAsync('db',
+                new BsonDocumentWrapper(new Document('insert', 'test'), codec),
+                new NoOpFieldNameValidator(), ReadPreference.primary(), new BsonDocumentCodec(),
+                NoOpSessionContext.INSTANCE, true,
+                payload,
+                new NoOpFieldNameValidator(), callback)
+
+        then:
+        _ * wrappedConnection.getDescription() >> {
+            new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())), 8, STANDALONE,
+                    1000, 1024 * 16_000, 1024 * 48_000, [])
+        }
+        1 * crypt.encrypt('db',
+                toRaw(new BsonDocument('insert', new BsonString('test')).append('documents',
+                        new BsonArray([
+                                new BsonDocument('_id', new BsonInt32(1))
+                                        .append('ssid', new BsonString('555-55-5555'))
+                                        .append('b', new BsonBinary(bytes))
+                        ]))), _ as SingleResultCallback) >> {
+            it.last().onResult(encryptedCommand, null)
+        }
+        1 * wrappedConnection.commandAsync('db', encryptedCommand, _ as NoOpFieldNameValidator, ReadPreference.primary(),
+                _ as RawBsonDocumentCodec, NoOpSessionContext.INSTANCE, true, null, null, _ as SingleResultCallback) >> {
+            it.last().onResult(encryptedResponse, null)
+        }
+        1 * crypt.decrypt(encryptedResponse, _ as SingleResultCallback) >> {
+            it.last().onResult(decryptedResponse, null)
+        }
+        1 * callback.onResult(rawToBsonDocument(decryptedResponse), null)
+        payload.getPosition() == 1
+    }
+
+    def 'should split at maxBatchCount'() {
+        given:
+        def callback = Mock(SingleResultCallback)
+        def wrappedConnection = Mock(AsyncConnection)
+        def crypt = Mock(Crypt)
+        def cryptConnection = new AsyncCryptConnection(wrappedConnection, crypt)
+        def codec = new DocumentCodec()
+        def maxBatchCount = 2
+        def payload = new SplittablePayload(INSERT, [
+                new BsonDocumentWrapper(new Document('_id', 1), codec),
+                new BsonDocumentWrapper(new Document('_id', 2), codec),
+                new BsonDocumentWrapper(new Document('_id', 3), codec)
+        ])
+        def encryptedCommand = toRaw(new BsonDocument('insert', new BsonString('test')).append('documents', new BsonArray(
+                [
+                        new BsonDocument('_id', new BsonInt32(1)),
+                        new BsonDocument('_id', new BsonInt32(2)),
+
+                ])))
+
+        def encryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1)))
+        def decryptedResponse = encryptedResponse
+
+        when:
+        cryptConnection.commandAsync('db',
+                new BsonDocumentWrapper(new Document('insert', 'test'), codec),
+                new NoOpFieldNameValidator(), ReadPreference.primary(), new BsonDocumentCodec(),
+                NoOpSessionContext.INSTANCE, true,
+                payload, new NoOpFieldNameValidator(), callback)
+
+        then:
+        _ * wrappedConnection.getDescription() >> {
+            new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())), 8, STANDALONE,
+                    maxBatchCount, 1024 * 16_000, 1024 * 48_000, [])
+        }
+        1 * crypt.encrypt('db',
+                toRaw(new BsonDocument('insert', new BsonString('test')).append('documents',
+                        new BsonArray([
+                                new BsonDocument('_id', new BsonInt32(1)),
+                                new BsonDocument('_id', new BsonInt32(2))
+                        ]))), _ as SingleResultCallback) >> {
+            it.last().onResult(encryptedCommand, null)
+        }
+        1 * wrappedConnection.commandAsync('db', encryptedCommand, _ as NoOpFieldNameValidator, ReadPreference.primary(),
+                _ as RawBsonDocumentCodec, NoOpSessionContext.INSTANCE, true, null, null, _ as SingleResultCallback) >> {
+            it.last().onResult(encryptedResponse, null)
+        }
+        1 * crypt.decrypt(encryptedResponse, _ as SingleResultCallback) >> {
+            it.last().onResult(decryptedResponse, null)
+        }
+        1 * callback.onResult(rawToBsonDocument(decryptedResponse), null)
+        payload.getPosition() == 2
+    }
+
+    RawBsonDocument toRaw(BsonDocument document) {
+        def buffer = new BasicOutputBuffer()
+        def writer = new BsonBinaryWriter(buffer)
+        new BsonDocumentCodec().encode(writer, document, EncoderContext.builder().build())
+        new RawBsonDocument(buffer.getInternalBuffer(), 0, buffer.getSize())
+    }
+
+    Document rawToDocument(RawBsonDocument document) {
+        new DocumentCodec().decode(new BsonBinaryReader(document.getByteBuffer().asNIO()), DecoderContext.builder().build())
+    }
+
+    BsonDocument rawToBsonDocument(RawBsonDocument document) {
+        new BsonDocumentCodec().decode(new BsonBinaryReader(document.getByteBuffer().asNIO()), DecoderContext.builder().build())
+    }
+}
diff --git a/driver-benchmarks/build.gradle b/driver-benchmarks/build.gradle
new file mode 100644
index 00000000000..b2c816a684c
--- /dev/null
+++ b/driver-benchmarks/build.gradle
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'application'
+
+mainClassName = "com.mongodb.benchmark.benchmarks.BenchmarkSuite"
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/main'
+        }
+        resources {
+            srcDir 'src/resources'
+        }
+    }
+}
+
+dependencies {
+    compile project(':driver-sync')
+    compile 'ch.qos.logback:logback-classic:1.1.1'
+}
+
+javadoc {
+    enabled = false
+}
+
+applicationDefaultJvmArgs = ["-Dorg.mongodb.benchmarks.data=" + System.getProperty('org.mongodb.benchmarks.data'),
+                             "-Dorg.mongodb.benchmarks.output=" + System.getProperty('org.mongodb.benchmarks.output')]
+
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractBsonDocumentBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractBsonDocumentBenchmark.java
new file mode 100644
index 00000000000..53b6abe117b
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractBsonDocumentBenchmark.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.Benchmark;
+import com.mongodb.internal.connection.PowerOfTwoBufferPool;
+import org.bson.BsonBinaryWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.io.BasicOutputBuffer;
+import org.bson.json.JsonReader;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public abstract class AbstractBsonDocumentBenchmark<T> extends Benchmark {
+
+    protected final PowerOfTwoBufferPool bufferPool = new PowerOfTwoBufferPool();
+    protected final Codec<T> codec;
+
+    private final String name;
+    private final String resourcePath;
+
+    protected T document;
+    protected byte[] documentBytes;
+    private int fileLength;
+
+    public AbstractBsonDocumentBenchmark(final String name, final String resourcePath, final Codec<T> codec) {
+        this.name = name;
+        this.resourcePath = resourcePath;
+        this.codec = codec;
+    }
+
+    public void setUp() throws IOException {
+        byte[] bytes = readAllBytesFromRelativePath(resourcePath);
+
+        fileLength = bytes.length;
+
+        document = codec.decode(new JsonReader(new String(bytes, StandardCharsets.UTF_8)),
+                DecoderContext.builder().build());
+        documentBytes = getDocumentAsBuffer(document);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return fileLength * NUM_INTERNAL_ITERATIONS;
+    }
+
+    private byte[] getDocumentAsBuffer(final T document) throws IOException {
+        BasicOutputBuffer buffer = new BasicOutputBuffer();
+        codec.encode(new BsonBinaryWriter(buffer), document, EncoderContext.builder().build());
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(buffer.getSize());
+        buffer.pipe(baos);
+        return baos.toByteArray();
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractFindBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractFindBenchmark.java
new file mode 100644
index 00000000000..30930432282
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractFindBenchmark.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.DecoderContext;
+import org.bson.json.JsonReader;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class AbstractFindBenchmark<T> extends AbstractMongoBenchmark {
+    protected MongoCollection<T> collection;
+
+    private final String name;
+    private final String resourcePath;
+    private final Class<T> clazz;
+
+    private int fileLength;
+
+    public AbstractFindBenchmark(final String name, final String resourcePath, final Class<T> clazz) {
+        this.name = name;
+        this.resourcePath = resourcePath;
+        this.clazz = clazz;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setUp() throws Exception {
+        super.setUp();
+        collection = client.getDatabase(DATABASE_NAME).getCollection(COLLECTION_NAME, clazz);
+        byte[] bytes = readAllBytesFromRelativePath(resourcePath);
+
+        fileLength = bytes.length;
+
+        MongoDatabase setUpDatabase = client.getDatabase(DATABASE_NAME);
+        setUpDatabase.drop();
+
+        insertCopiesOfDocument(setUpDatabase.getCollection(COLLECTION_NAME, BsonDocument.class),
+                new BsonDocumentCodec().decode(new JsonReader(new String(bytes, StandardCharsets.UTF_8)),
+                        DecoderContext.builder().build())
+        );
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return fileLength * NUM_INTERNAL_ITERATIONS;
+    }
+
+    private void insertCopiesOfDocument(final MongoCollection<BsonDocument> collection,
+                                        final BsonDocument document) {
+        List<BsonDocument> documents = new ArrayList<BsonDocument>(NUM_INTERNAL_ITERATIONS);
+        for (int i = 0; i < NUM_INTERNAL_ITERATIONS; i++) {
+            BsonDocument copy = document.clone();
+            copy.put("_id", new BsonInt32(i));
+            documents.add(copy);
+        }
+        collection.insertMany(documents);
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractGridFSBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractGridFSBenchmark.java
new file mode 100644
index 00000000000..28db0c7b9c1
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractGridFSBenchmark.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.gridfs.GridFSBucket;
+import com.mongodb.client.gridfs.GridFSBuckets;
+
+public abstract class AbstractGridFSBenchmark extends AbstractMongoBenchmark {
+    private final String resourcePath;
+    protected MongoDatabase database;
+    protected GridFSBucket bucket;
+    protected byte[] fileBytes;
+
+    public AbstractGridFSBenchmark(final String resourcePath) {
+        this.resourcePath = resourcePath;
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        database = client.getDatabase(DATABASE_NAME);
+        bucket = GridFSBuckets.create(database);
+        fileBytes = readAllBytesFromRelativePath(resourcePath);
+        database.drop();
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return fileBytes.length;
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractInsertBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractInsertBenchmark.java
new file mode 100644
index 00000000000..561d5c502b5
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractInsertBenchmark.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.json.JsonReader;
+
+import java.nio.charset.StandardCharsets;
+
+public abstract class AbstractInsertBenchmark<T> extends AbstractMongoBenchmark {
+
+    protected MongoCollection<T> collection;
+
+    private final String name;
+    private final String resourcePath;
+    private final Class<T> clazz;
+    private byte[] bytes;
+    protected int fileLength;
+    protected T document;
+
+    protected AbstractInsertBenchmark(final String name, final String resourcePath, final Class<T> clazz) {
+        this.name = name;
+        this.resourcePath = resourcePath;
+        this.clazz = clazz;
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        MongoDatabase database = client.getDatabase(DATABASE_NAME);
+
+        collection = database.getCollection(COLLECTION_NAME, clazz);
+
+        database.drop();
+        bytes = readAllBytesFromRelativePath(resourcePath);
+
+        fileLength = bytes.length;
+
+        Codec<T> codec = collection.getCodecRegistry().get(clazz);
+
+        document = codec.decode(new JsonReader(new String(bytes, StandardCharsets.UTF_8)), DecoderContext.builder().build());
+    }
+
+    @Override
+    public void before() throws Exception {
+        super.before();
+        collection.drop();
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    protected T createDocument() {
+        Codec<T> codec = collection.getCodecRegistry().get(clazz);
+
+        return codec.decode(new JsonReader(new String(bytes, StandardCharsets.UTF_8)), DecoderContext.builder().build());
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractMongoBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractMongoBenchmark.java
new file mode 100644
index 00000000000..71426525ae5
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractMongoBenchmark.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.Benchmark;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+public abstract class AbstractMongoBenchmark extends Benchmark {
+
+    protected static final int GRIDFS_READING_THREAD_POOL_SIZE = 8;
+    protected static final int MONGODB_READING_THREAD_POOL_SIZE = 8;
+    protected static final int MONGODB_WRITING_THREAD_POOL_SIZE = 8;
+    protected static final int FILE_WRITING_THREAD_POOL_SIZE = 2;
+    protected static final int FILE_READING_THREAD_POOL_SIZE = 4;
+
+    protected static final int ONE_MB = 1000000;
+
+    protected static final String DATABASE_NAME = "perftest";
+    protected static final String COLLECTION_NAME = "corpus";
+
+
+    protected MongoClient client;
+
+    public void setUp() throws Exception {
+       client = MongoClients.create();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        client.close();
+    }
+
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BenchmarkSuite.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BenchmarkSuite.java
new file mode 100644
index 00000000000..d89f00e3bf4
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BenchmarkSuite.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.Benchmark;
+import com.mongodb.benchmark.framework.BenchmarkResult;
+import com.mongodb.benchmark.framework.BenchmarkResultWriter;
+import com.mongodb.benchmark.framework.BenchmarkRunner;
+import com.mongodb.benchmark.framework.EvergreenBenchmarkResultWriter;
+import org.bson.Document;
+import org.bson.codecs.Codec;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static com.mongodb.MongoClientSettings.getDefaultCodecRegistry;
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class BenchmarkSuite {
+
+    private static final int NUM_WARMUP_ITERATIONS = 1;
+    private static final int NUM_ITERATIONS = 100;
+    private static final int MIN_TIME_SECONDS = 60;
+    private static final int MAX_TIME_SECONDS = 300;
+
+    private static final Class DOCUMENT_CLASS = Document.class;
+    private static final IdRemover<Document> ID_REMOVER = new IdRemover<Document>() {
+        public void removeId(final Document document) {
+            document.remove("_id");
+        }
+    };
+    private static final Codec<Document> DOCUMENT_CODEC = getDefaultCodecRegistry().get(DOCUMENT_CLASS);
+
+    private static final List<BenchmarkResultWriter> WRITERS = Arrays.<BenchmarkResultWriter>asList(
+            new EvergreenBenchmarkResultWriter());
+
+    public static void main(String[] args) throws Exception {
+        runBenchmarks();
+
+        for (BenchmarkResultWriter writer : WRITERS) {
+            writer.close();
+        }
+    }
+
+    private static void runBenchmarks()
+            throws Exception {
+
+        runBenchmark(new BsonEncodingBenchmark<Document>("Flat", "extended_bson/flat_bson.json", DOCUMENT_CODEC));
+        runBenchmark(new BsonEncodingBenchmark<Document>("Deep", "extended_bson/deep_bson.json", DOCUMENT_CODEC));
+        runBenchmark(new BsonEncodingBenchmark<Document>("Full", "extended_bson/full_bson.json", DOCUMENT_CODEC));
+
+        runBenchmark(new BsonDecodingBenchmark<Document>("Flat", "extended_bson/flat_bson.json", DOCUMENT_CODEC));
+        runBenchmark(new BsonDecodingBenchmark<Document>("Deep", "extended_bson/deep_bson.json", DOCUMENT_CODEC));
+        runBenchmark(new BsonDecodingBenchmark<Document>("Full", "extended_bson/full_bson.json", DOCUMENT_CODEC));
+
+        runBenchmark(new RunCommandBenchmark<Document>(DOCUMENT_CODEC));
+        runBenchmark(new FindOneBenchmark<Document>("single_and_multi_document/tweet.json", BenchmarkSuite.DOCUMENT_CLASS));
+
+        runBenchmark(new InsertOneBenchmark<Document>("Small", "./single_and_multi_document/small_doc.json", 10000,
+                DOCUMENT_CLASS, ID_REMOVER));
+        runBenchmark(new InsertOneBenchmark<Document>("Large", "./single_and_multi_document/large_doc.json", 10,
+                DOCUMENT_CLASS, ID_REMOVER));
+
+        runBenchmark(new FindManyBenchmark<Document>("single_and_multi_document/tweet.json", BenchmarkSuite.DOCUMENT_CLASS));
+        runBenchmark(new InsertManyBenchmark<Document>("Small", "./single_and_multi_document/small_doc.json", 10000,
+                DOCUMENT_CLASS));
+        runBenchmark(new InsertManyBenchmark<Document>("Large", "./single_and_multi_document/large_doc.json", 10,
+                DOCUMENT_CLASS));
+
+        runBenchmark(new GridFSUploadBenchmark("single_and_multi_document/gridfs_large.bin"));
+        runBenchmark(new GridFSDownloadBenchmark("single_and_multi_document/gridfs_large.bin"));
+
+        runBenchmark(new MultiFileImportBenchmark());
+        runBenchmark(new MultiFileExportBenchmark());
+        runBenchmark(new GridFSMultiFileUploadBenchmark());
+        runBenchmark(new GridFSMultiFileDownloadBenchmark());
+    }
+
+    private static void runBenchmark(final Benchmark benchmark) throws Exception {
+        long startTime = System.currentTimeMillis();
+        BenchmarkResult benchmarkResult = new BenchmarkRunner(benchmark, NUM_WARMUP_ITERATIONS, NUM_ITERATIONS, MIN_TIME_SECONDS,
+                MAX_TIME_SECONDS).run();
+        long endTime = System.currentTimeMillis();
+        System.out.println(benchmarkResult.getName() + ": " + (endTime - startTime) / 1000.0);
+        for (BenchmarkResultWriter writer : WRITERS) {
+            writer.write(benchmarkResult);
+        }
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BsonDecodingBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BsonDecodingBenchmark.java
new file mode 100644
index 00000000000..9f184b78e25
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BsonDecodingBenchmark.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import org.bson.BsonBinaryReader;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+
+import java.nio.ByteBuffer;
+
+public class BsonDecodingBenchmark<T> extends AbstractBsonDocumentBenchmark<T> {
+
+    public BsonDecodingBenchmark(final String name, final String resourcePath, final Codec<T> codec) {
+        super(name + " BSON Decoding", resourcePath, codec);
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < NUM_INTERNAL_ITERATIONS; i++) {
+           codec.decode(new BsonBinaryReader(ByteBuffer.wrap(documentBytes)), DecoderContext.builder().build());
+        }
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BsonEncodingBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BsonEncodingBenchmark.java
new file mode 100644
index 00000000000..e42d52d1cec
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/BsonEncodingBenchmark.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.connection.ByteBufferBsonOutput;
+import org.bson.BsonBinaryWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.EncoderContext;
+
+public class BsonEncodingBenchmark<T> extends AbstractBsonDocumentBenchmark<T> {
+    public BsonEncodingBenchmark(final String name, final String resourcePath, final Codec<T> codec) {
+        super(name + " BSON Encoding", resourcePath, codec);
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < NUM_INTERNAL_ITERATIONS; i++) {
+            ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(bufferPool);
+            codec.encode(new BsonBinaryWriter(bsonOutput), document, EncoderContext.builder().build());
+            bsonOutput.close();
+        }
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindManyBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindManyBenchmark.java
new file mode 100644
index 00000000000..fad0c849a24
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindManyBenchmark.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.client.MongoCursor;
+
+public class FindManyBenchmark<T> extends AbstractFindBenchmark<T> {
+    public FindManyBenchmark(final String resourcePath, final Class<T> clazz) {
+        super("Find many and empty the cursor", resourcePath, clazz);
+    }
+
+    @Override
+    public void run() {
+         MongoCursor<T> cursor = collection.find().iterator();
+         try {
+             while (cursor.hasNext()) {
+                 cursor.next();
+             }
+         } finally {
+             cursor.close();
+         }
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindOneBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindOneBenchmark.java
new file mode 100644
index 00000000000..f5764480252
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindOneBenchmark.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.BenchmarkRunner;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+
+public class FindOneBenchmark<T> extends AbstractFindBenchmark<T> {
+
+    public FindOneBenchmark(final String resourcePath, Class<T> clazz) {
+        super("Find one by ID", resourcePath, clazz);
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < NUM_INTERNAL_ITERATIONS; i++) {
+            collection.find(new BsonDocument("_id", new BsonInt32(i))).first();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        new BenchmarkRunner(new FindOneBenchmark<BsonDocument>("/benchmarks/TWEET.json", BsonDocument.class), 0, 1).run();
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSDownloadBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSDownloadBenchmark.java
new file mode 100644
index 00000000000..5a619c38cbe
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSDownloadBenchmark.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.client.gridfs.GridFSDownloadStream;
+import org.bson.types.ObjectId;
+
+import java.io.ByteArrayInputStream;
+
+public class GridFSDownloadBenchmark extends AbstractGridFSBenchmark {
+
+    private ObjectId fileId;
+
+    public GridFSDownloadBenchmark(final String resourcePath) {
+        super(resourcePath);
+    }
+
+    @Override
+    public String getName() {
+        return "GridFS download";
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        fileId = bucket.uploadFromStream("gridfstest", new ByteArrayInputStream(fileBytes));
+    }
+
+    @Override
+    public void run() {
+        GridFSDownloadStream stream = bucket.openDownloadStream(fileId);
+        byte[] chunk = new byte[bucket.getChunkSizeBytes()];
+        while (stream.read(chunk) != -1) {
+            // discard result
+        }
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileDownloadBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileDownloadBenchmark.java
new file mode 100644
index 00000000000..50303a968c0
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileDownloadBenchmark.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.BenchmarkResult;
+import com.mongodb.benchmark.framework.BenchmarkRunner;
+import com.mongodb.benchmark.framework.TextBasedBenchmarkResultWriter;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.gridfs.GridFSBucket;
+import com.mongodb.client.gridfs.GridFSBuckets;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class GridFSMultiFileDownloadBenchmark extends AbstractMongoBenchmark {
+
+    private GridFSBucket bucket;
+
+    private ExecutorService gridFSService;
+    private ExecutorService fileService;
+
+    private File tempDirectory;
+
+    @Override
+    public String getName() {
+        return "GridFS multi-file download";
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        MongoDatabase database = client.getDatabase(DATABASE_NAME);
+        bucket = GridFSBuckets.create(database);
+
+        database.drop();
+
+        gridFSService = Executors.newFixedThreadPool(GRIDFS_READING_THREAD_POOL_SIZE);
+        fileService = Executors.newFixedThreadPool(FILE_WRITING_THREAD_POOL_SIZE);
+
+        importFiles();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        gridFSService.shutdown();
+        gridFSService.awaitTermination(1, TimeUnit.MINUTES);
+        fileService.shutdown();
+        fileService.awaitTermination(1, TimeUnit.MINUTES);
+
+        super.tearDown();
+    }
+
+    @Override
+    public void before() throws Exception {
+        super.before();
+
+        tempDirectory = Files.createTempDirectory("GRIDFS_MULTI").toFile();
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public void after() throws Exception {
+        for (File file : tempDirectory.listFiles()) {
+            file.delete();
+        }
+
+        tempDirectory.delete();
+
+        super.after();
+    }
+
+    @Override
+    public void run() throws Exception {
+
+        CountDownLatch latch = new CountDownLatch(50);
+
+        for (int i = 0; i < 50; i++) {
+            gridFSService.submit(exportFile(latch, i));
+        }
+
+        latch.await(1, TimeUnit.MINUTES);
+    }
+
+    private Runnable exportFile(final CountDownLatch latch, final int fileId) {
+        return new Runnable() {
+            @Override
+            public void run() {
+                final UnsafeByteArrayOutputStream outputStream = new UnsafeByteArrayOutputStream(5242880);
+                bucket.downloadToStream(GridFSMultiFileDownloadBenchmark.this.getFileName(fileId), outputStream);
+                fileService.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            FileOutputStream fos = new FileOutputStream(new File(tempDirectory, String.format("%02d", fileId) + ".txt"));
+                            fos.write(outputStream.getByteArray());
+                            fos.close();
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                        latch.countDown();
+                    }
+                });
+            }
+        };
+    }
+
+    private void importFiles() throws Exception {
+        CountDownLatch latch = new CountDownLatch(50);
+
+        for (int i = 0; i < 50; i++) {
+            fileService.submit(importFile(latch, i));
+        }
+
+        latch.await(1, TimeUnit.MINUTES);
+    }
+
+    private Runnable importFile(final CountDownLatch latch, final int fileId) {
+        return new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String fileName = GridFSMultiFileDownloadBenchmark.this.getFileName(fileId);
+                    String resourcePath = "parallel/gridfs_multi/" + fileName;
+                    bucket.uploadFromStream(fileName, streamFromRelativePath(resourcePath),
+                            new GridFSUploadOptions().chunkSizeBytes(ONE_MB));
+                    latch.countDown();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+    }
+
+    private String getFileName(final int fileId) {
+        return "file" + String.format("%02d", fileId) + ".txt";
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return 262144000;
+    }
+
+    public static void main(String[] args) throws Exception {
+        BenchmarkResult benchmarkResult = new BenchmarkRunner(new GridFSMultiFileDownloadBenchmark(), 20, 100).run();
+        new TextBasedBenchmarkResultWriter(System.out, false, true).write(benchmarkResult);
+    }
+
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileUploadBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileUploadBenchmark.java
new file mode 100644
index 00000000000..e3db7c10165
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileUploadBenchmark.java
@@ -0,0 +1,110 @@
+/*
+ * * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.BenchmarkResult;
+import com.mongodb.benchmark.framework.BenchmarkRunner;
+import com.mongodb.benchmark.framework.TextBasedBenchmarkResultWriter;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.gridfs.GridFSBucket;
+import com.mongodb.client.gridfs.GridFSBuckets;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class GridFSMultiFileUploadBenchmark extends AbstractMongoBenchmark {
+
+    private MongoDatabase database;
+    private GridFSBucket bucket;
+
+    private ExecutorService fileService;
+
+    @Override
+    public String getName() {
+        return "GridFS multi-file upload";
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        database = client.getDatabase(DATABASE_NAME);
+        bucket = GridFSBuckets.create(database);
+
+        database.drop();
+
+        fileService = Executors.newFixedThreadPool(FILE_READING_THREAD_POOL_SIZE);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        fileService.shutdown();
+        fileService.awaitTermination(1, TimeUnit.MINUTES);
+
+        super.tearDown();
+    }
+
+    @Override
+    public void before() throws Exception {
+        super.before();
+        database.drop();
+        bucket.uploadFromStream("small", new ByteArrayInputStream(new byte[1]));
+    }
+
+    @Override
+    public void run() throws Exception {
+        CountDownLatch latch = new CountDownLatch(50);
+
+        for (int i = 0; i < 50; i++) {
+            fileService.submit(importFile(latch, i));
+        }
+
+        latch.await(1, TimeUnit.MINUTES);
+    }
+
+    private Runnable importFile(final CountDownLatch latch, final int fileId) {
+        return new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String fileName = "file" + String.format("%02d", fileId) + ".txt";
+                    String resourcePath = "parallel/gridfs_multi/" + fileName;
+                    bucket.uploadFromStream(fileName, streamFromRelativePath(resourcePath),
+                            new GridFSUploadOptions().chunkSizeBytes(ONE_MB));
+                    latch.countDown();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return 262144000;
+    }
+
+    public static void main(String[] args) throws Exception {
+        BenchmarkResult benchmarkResult = new BenchmarkRunner(new GridFSMultiFileUploadBenchmark(), 4, 10).run();
+        new TextBasedBenchmarkResultWriter(System.out).write(benchmarkResult);
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSUploadBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSUploadBenchmark.java
new file mode 100644
index 00000000000..c0aed18680a
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSUploadBenchmark.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import java.io.ByteArrayInputStream;
+
+public class GridFSUploadBenchmark extends AbstractGridFSBenchmark {
+
+    public GridFSUploadBenchmark(final String resourcePath) {
+        super(resourcePath);
+    }
+
+    @Override
+    public String getName() {
+        return "GridFS upload";
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        bucket.uploadFromStream("gridfstest", new ByteArrayInputStream(fileBytes));
+    }
+
+    @Override
+    public void before() throws Exception {
+        super.before();
+        database.drop();
+        bucket.uploadFromStream("small", new ByteArrayInputStream(new byte[1]));
+    }
+
+    @Override
+    public void run() {
+        bucket.uploadFromStream("gridfstest", new ByteArrayInputStream(fileBytes));
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/IdRemover.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/IdRemover.java
new file mode 100644
index 00000000000..5ba57d05046
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/IdRemover.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+public interface IdRemover<T> {
+    void removeId(T document);
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertManyBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertManyBenchmark.java
new file mode 100644
index 00000000000..777a39e9a0e
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertManyBenchmark.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InsertManyBenchmark<T> extends AbstractInsertBenchmark<T> {
+    private final int numDocuments;
+    private final List<T> documentList;
+
+    public InsertManyBenchmark(final String name, final String resourcePath, final int numDocuments, final Class<T> clazz) {
+        super(name + " doc bulk insert", resourcePath, clazz);
+        this.numDocuments = numDocuments;
+        documentList = new ArrayList<T>(numDocuments);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Override
+    public void before() throws Exception {
+        super.before();
+        documentList.clear();
+        for (int i = 0; i < numDocuments; i++) {
+            documentList.add(createDocument());
+        }
+    }
+
+    @Override
+    public void run() {
+        collection.insertMany(documentList);
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return fileLength * numDocuments;
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertOneBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertOneBenchmark.java
new file mode 100644
index 00000000000..575a5b4b235
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertOneBenchmark.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+public class InsertOneBenchmark<T> extends AbstractInsertBenchmark<T> {
+    private final int numIterations;
+    private final IdRemover<T> idRemover;
+
+    public InsertOneBenchmark(final String name, final String resourcePath, final int numIterations, final Class<T> clazz,
+                              final IdRemover<T> idRemover) {
+        super(name + " doc insertOne", resourcePath, clazz);
+        this.numIterations = numIterations;
+        this.idRemover = idRemover;
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < numIterations; i++) {
+            idRemover.removeId(document);
+            collection.insertOne(document);
+        }
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return fileLength * numIterations;
+    }
+
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileExportBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileExportBenchmark.java
new file mode 100644
index 00000000000..193c7ebdc67
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileExportBenchmark.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.BenchmarkResult;
+import com.mongodb.benchmark.framework.BenchmarkRunner;
+import com.mongodb.benchmark.framework.TextBasedBenchmarkResultWriter;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.InsertManyOptions;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.RawBsonDocumentCodec;
+import org.bson.json.JsonReader;
+import org.bson.json.JsonWriter;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class MultiFileExportBenchmark extends AbstractMongoBenchmark {
+
+    private MongoDatabase database;
+
+    private MongoCollection<RawBsonDocument> collection;
+
+    private ExecutorService fileWritingService;
+    private ExecutorService documentReadingService;
+    private File tempDirectory;
+
+    @Override
+    public String getName() {
+        return "LDJSON multi-file export";
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        database = client.getDatabase(DATABASE_NAME);
+        collection = database.getCollection(COLLECTION_NAME, RawBsonDocument.class);
+
+        database.drop();
+
+        importJsonFiles();
+
+        fileWritingService = Executors.newFixedThreadPool(FILE_WRITING_THREAD_POOL_SIZE);
+        documentReadingService = Executors.newFixedThreadPool(MONGODB_READING_THREAD_POOL_SIZE);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        fileWritingService.shutdown();
+        documentReadingService.shutdown();
+        fileWritingService.awaitTermination(1, TimeUnit.MINUTES);
+        documentReadingService.awaitTermination(1, TimeUnit.MINUTES);
+
+        super.tearDown();
+    }
+
+    @Override
+    public void before() throws Exception {
+        super.before();
+
+        tempDirectory = Files.createTempDirectory("LDJSON_MULTI").toFile();
+    }
+
+    @Override
+    public void after() throws Exception {
+        for (File file : tempDirectory.listFiles()) {
+            file.delete();
+        }
+
+        tempDirectory.delete();
+        super.after();
+    }
+
+    @Override
+    public void run() throws Exception {
+        CountDownLatch latch = new CountDownLatch(100);
+
+        for (int i = 0; i < 100; i++) {
+            documentReadingService.submit(exportJsonFile(i, latch));
+        }
+
+        latch.await(1, TimeUnit.MINUTES);
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return 557610482;
+    }
+
+    private Runnable exportJsonFile(final int fileId, final CountDownLatch latch) {
+        return new Runnable() {
+            @Override
+            public void run() {
+                List<RawBsonDocument> documents = collection.find(new BsonDocument("fileId", new BsonInt32(fileId)))
+                        .batchSize(5000)
+                        .into(new ArrayList<RawBsonDocument>(5000));
+                fileWritingService.submit(writeJsonFile(fileId, documents, latch));
+            }
+        };
+    }
+
+    private Runnable writeJsonFile(final int fileId, final List<RawBsonDocument> documents, final CountDownLatch latch) {
+        return new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Writer writer = new OutputStreamWriter(
+                            new FileOutputStream(new File(tempDirectory, String.format("%03d", fileId) + ".txt")), StandardCharsets.UTF_8);
+                    try {
+                        RawBsonDocumentCodec codec = new RawBsonDocumentCodec();
+                        for (RawBsonDocument cur : documents) {
+                            codec.encode(new JsonWriter(writer), cur, EncoderContext.builder().build());
+                            writer.write('\n');
+                        }
+                    } finally {
+                        writer.close();
+                    }
+                    latch.countDown();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+    }
+
+    private void importJsonFiles() throws InterruptedException {
+        ExecutorService importService = Executors.newFixedThreadPool(FILE_READING_THREAD_POOL_SIZE);
+
+        final CountDownLatch latch = new CountDownLatch(100);
+
+        for (int i = 0; i < 100; i++) {
+            final int fileId = i;
+            importService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        String resourcePath = "parallel/ldjson_multi/ldjson" + String.format("%03d", fileId) + ".txt";
+                        BufferedReader reader = new BufferedReader(readFromRelativePath(resourcePath), 1024 * 64);
+                        try {
+                            String json;
+                            List<BsonDocument> documents = new ArrayList<BsonDocument>(1000);
+                            while ((json = reader.readLine()) != null) {
+                                BsonDocument document = new BsonDocumentCodec().decode(new JsonReader(json),
+                                        DecoderContext.builder().build());
+                                document.put("fileId", new BsonInt32(fileId));
+                                documents.add(document);
+                            }
+                            database.getCollection(COLLECTION_NAME, BsonDocument.class).insertMany(documents,
+                                    new InsertManyOptions().ordered(false));
+                            latch.countDown();
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        } finally {
+                            reader.close();
+                        }
+                    } catch (IOException e) {
+                         throw new RuntimeException(e);
+                    }
+                }
+            });
+        }
+        latch.await(1, TimeUnit.MINUTES);
+
+        collection.createIndex(new BsonDocument("fileId", new BsonInt32(1)));
+
+        importService.shutdown();
+        importService.awaitTermination(1, TimeUnit.MINUTES);
+    }
+
+    public static void main(String[] args) throws Exception {
+        BenchmarkResult benchmarkResult = new BenchmarkRunner(new MultiFileExportBenchmark(), 0, 1).run();
+        new TextBasedBenchmarkResultWriter(System.out).write(benchmarkResult);
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileImportBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileImportBenchmark.java
new file mode 100644
index 00000000000..1ff6b9258bb
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileImportBenchmark.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.benchmark.framework.BenchmarkResult;
+import com.mongodb.benchmark.framework.BenchmarkRunner;
+import com.mongodb.benchmark.framework.TextBasedBenchmarkResultWriter;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.InsertManyOptions;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.RawBsonDocumentCodec;
+import org.bson.json.JsonReader;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class MultiFileImportBenchmark extends AbstractMongoBenchmark {
+    private MongoDatabase database;
+
+    private MongoCollection<RawBsonDocument> collection;
+
+    private ExecutorService fileReadingService;
+    private ExecutorService documentWritingService;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        database = client.getDatabase(DATABASE_NAME);
+        collection = database.getCollection(COLLECTION_NAME, RawBsonDocument.class);
+
+        database.drop();
+
+        fileReadingService = Executors.newFixedThreadPool(FILE_READING_THREAD_POOL_SIZE);
+        documentWritingService = Executors.newFixedThreadPool(MONGODB_WRITING_THREAD_POOL_SIZE);
+    }
+
+    @Override
+    public void before() throws Exception {
+        super.before();
+
+        collection.drop();
+        database.createCollection(collection.getNamespace().getCollectionName());
+
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        fileReadingService.shutdown();
+        documentWritingService.shutdown();
+        fileReadingService.awaitTermination(1, TimeUnit.MINUTES);
+        documentWritingService.awaitTermination(1, TimeUnit.MINUTES);
+
+        super.tearDown();
+    }
+
+    @Override
+    public String getName() {
+        return "LDJSON multi-file import";
+    }
+
+
+    @Override
+    public void run() throws InterruptedException {
+        CountDownLatch latch = new CountDownLatch(500);
+
+        for (int i = 0; i < 100; i++) {
+            fileReadingService.submit(importJsonFile(latch, i));
+        }
+
+        latch.await(1, TimeUnit.MINUTES);
+    }
+
+    private Runnable importJsonFile(final CountDownLatch latch, final int fileId) {
+        final RawBsonDocumentCodec codec = new RawBsonDocumentCodec();
+        return new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String resourcePath = "parallel/ldjson_multi/ldjson" + String.format("%03d", fileId) + ".txt";
+                    BufferedReader reader = new BufferedReader(readFromRelativePath(resourcePath), 1024 * 64);
+                    try {
+                        String json;
+                        List<RawBsonDocument> documents = new ArrayList<RawBsonDocument>(1000);
+                        while ((json = reader.readLine()) != null) {
+                            RawBsonDocument document = codec.decode(new JsonReader(json), DecoderContext.builder().build());
+                            documents.add(document);
+                            if (documents.size() == 1000) {
+                                final List<RawBsonDocument> documentsToInsert = documents;
+                                documentWritingService.submit(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        collection.insertMany(documentsToInsert, new InsertManyOptions().ordered(false));
+                                        latch.countDown();
+                                    }
+                                });
+                                documents = new ArrayList<RawBsonDocument>(1000);
+                            }
+                        }
+                        if (!documents.isEmpty()) {
+                            throw new IllegalStateException("Document count not a multiple of 1000");
+                        }
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    } finally {
+                        reader.close();
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return 557610482;
+    }
+
+    public static void main(String[] args) throws Exception {
+        BenchmarkResult benchmarkResult = new BenchmarkRunner(new MultiFileImportBenchmark(), 10, 100).run();
+        new TextBasedBenchmarkResultWriter(System.out, true, true).write(benchmarkResult);
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/RunCommandBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/RunCommandBenchmark.java
new file mode 100644
index 00000000000..6632b07b6af
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/RunCommandBenchmark.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonBinaryWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.conversions.Bson;
+import org.bson.io.BasicOutputBuffer;
+import org.bson.json.JsonReader;
+
+public class RunCommandBenchmark<T extends Bson> extends AbstractMongoBenchmark {
+
+    private MongoDatabase database;
+    private final Codec<T> codec;
+    private final T command;
+
+    public RunCommandBenchmark(final Codec<T> codec) {
+        this.codec = codec;
+        this.command = createCommand();
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        database = client.getDatabase("admin");
+    }
+
+    @Override
+    public String getName() {
+        return "Run command";
+    }
+
+    @Override
+    public void run() {
+        for (int i = 0; i < NUM_INTERNAL_ITERATIONS; i++) {
+            database.runCommand(command);
+        }
+    }
+
+    @Override
+    public int getBytesPerRun() {
+        return NUM_INTERNAL_ITERATIONS * getCommandSize();
+    }
+
+    private int getCommandSize() {
+        T command = createCommand();
+        BasicOutputBuffer buffer = new BasicOutputBuffer();
+        codec.encode(new BsonBinaryWriter(buffer), command, EncoderContext.builder().build());
+        return buffer.getSize();
+    }
+
+    private T createCommand() {
+        return codec.decode(new JsonReader("{ismaster: true}"),DecoderContext.builder().build());
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/UnsafeByteArrayOutputStream.java b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/UnsafeByteArrayOutputStream.java
new file mode 100644
index 00000000000..1887912220b
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/UnsafeByteArrayOutputStream.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2008 - 2013 10gen, Inc. <http://10gen.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.benchmarks;
+
+import java.io.ByteArrayOutputStream;
+
+class UnsafeByteArrayOutputStream extends ByteArrayOutputStream {
+    public UnsafeByteArrayOutputStream(final int size) {
+        super(size);
+    }
+
+    public byte[] getByteArray() {
+        return buf;
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/framework/Benchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/Benchmark.java
new file mode 100644
index 00000000000..9d1bac9c60d
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/Benchmark.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.framework;
+
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public abstract class Benchmark {
+
+    protected static final int NUM_INTERNAL_ITERATIONS = 10000;
+    static final String TEST_DATA_SYSTEM_PROPERTY_NAME = "org.mongodb.benchmarks.data";
+
+    public void setUp() throws Exception {
+    }
+
+    public void tearDown() throws Exception {
+    }
+
+    public void before() throws Exception {
+    }
+
+    public void after() throws Exception {
+    }
+
+    public abstract String getName();
+
+    public abstract void run() throws Exception;
+
+    public abstract int getBytesPerRun();
+
+    protected byte[] readAllBytesFromRelativePath(final String relativePath) throws IOException {
+        return Files.readAllBytes(Paths.get(getResourceRoot() + relativePath));
+    }
+
+    protected Reader readFromRelativePath(final String relativePath) throws IOException {
+        return new FileReader(getResourceRoot() + relativePath);
+    }
+
+    protected InputStream streamFromRelativePath(final String relativePath) throws IOException {
+        return new FileInputStream(getResourceRoot() + relativePath);
+    }
+
+    private String getResourceRoot() {
+        return System.getProperty(TEST_DATA_SYSTEM_PROPERTY_NAME);
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkResult.java b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkResult.java
new file mode 100644
index 00000000000..53e42b0950a
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkResult.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.framework;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class BenchmarkResult {
+    private final String name;
+    private final List<Long> elapsedTimeNanosList;
+    private final List<Long> sortedElapsedTimeNanosList;
+    private final int bytesPerRun;
+
+    public BenchmarkResult(final String name, final List<Long> elapsedTimeNanosList, final int bytesPerRun) {
+        this.name = name;
+        this.elapsedTimeNanosList = new ArrayList<Long>(elapsedTimeNanosList);
+        this.bytesPerRun = bytesPerRun;
+        this.sortedElapsedTimeNanosList = new ArrayList<Long>(elapsedTimeNanosList);
+        Collections.sort(this.sortedElapsedTimeNanosList);
+    }
+
+    public int getBytesPerIteration() {
+        return bytesPerRun;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Long> getElapsedTimeNanosList() {
+        return elapsedTimeNanosList;
+    }
+
+    public long getElapsedTimeNanosAtPercentile(final int percentile) {
+        return sortedElapsedTimeNanosList.get(Math.max(0, ((int) (getNumIterations() * percentile / 100.0)) - 1));
+    }
+
+    public int getNumIterations() {
+        return elapsedTimeNanosList.size();
+    }
+
+    @Override
+    public String toString() {
+        return "BenchmarkResult{" +
+                "name='" + name + '\'' +
+                ", elapsedTimeNanosList=" + elapsedTimeNanosList +
+                ", bytesPerRun=" + bytesPerRun +
+                '}';
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkResultWriter.java b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkResultWriter.java
new file mode 100644
index 00000000000..d7f4a4701ce
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkResultWriter.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.framework;
+
+import java.io.Closeable;
+
+public interface BenchmarkResultWriter extends Closeable {
+    void write(BenchmarkResult benchmarkResult);
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkRunner.java b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkRunner.java
new file mode 100644
index 00000000000..03197cdbc52
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/BenchmarkRunner.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.framework;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class BenchmarkRunner {
+    private final Benchmark benchmark;
+    private final int numWarmupIterations;
+    private final int numIterations;
+    private final int minTimeSeconds;
+    private final int maxTimeSeconds;
+
+    public BenchmarkRunner(final Benchmark benchmark, final int numWarmupIterations, int numIterations) {
+        this(benchmark, numWarmupIterations, numIterations, 5, 30);
+    }
+
+    public BenchmarkRunner(final Benchmark benchmark, final int numWarmupIterations, int numIterations,
+                           int minTimeSeconds, int maxTimeSeconds) {
+        this.benchmark = benchmark;
+        this.numWarmupIterations = numWarmupIterations;
+        this.numIterations = numIterations;
+        this.minTimeSeconds = minTimeSeconds;
+        this.maxTimeSeconds = maxTimeSeconds;
+    }
+
+    public BenchmarkResult run() throws Exception {
+        benchmark.setUp();
+
+        for (int i = 0; i < numWarmupIterations; i++) {
+            benchmark.before();
+
+            benchmark.run();
+
+            benchmark.after();
+        }
+
+        List<Long> elapsedTimeNanosList = new ArrayList<Long>(numIterations);
+
+        long totalTimeNanos = 0;
+
+        for (int i = 0; shouldContinue(i, totalTimeNanos); i++) {
+            benchmark.before();
+
+            long startTimeNanos = System.nanoTime();
+            benchmark.run();
+            long elapsedTimeNanos = System.nanoTime() - startTimeNanos;
+            elapsedTimeNanosList.add(elapsedTimeNanos);
+            totalTimeNanos += elapsedTimeNanos;
+
+            benchmark.after();
+        }
+
+        benchmark.tearDown();
+
+        return new BenchmarkResult(benchmark.getName(), elapsedTimeNanosList, benchmark.getBytesPerRun());
+    }
+
+    private boolean shouldContinue(final int iterationCount, final long totalTimeNanos) {
+        if ((totalTimeNanos) < TimeUnit.SECONDS.toNanos(minTimeSeconds)) {
+            return true;
+        }
+
+        if ((totalTimeNanos) > TimeUnit.SECONDS.toNanos(maxTimeSeconds)) {
+            return false;
+        }
+
+        return iterationCount < numIterations;
+    }
+
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/framework/EvergreenBenchmarkResultWriter.java b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/EvergreenBenchmarkResultWriter.java
new file mode 100644
index 00000000000..8971d67bd70
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/EvergreenBenchmarkResultWriter.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.benchmark.framework;
+
+import org.bson.json.JsonMode;
+import org.bson.json.JsonWriter;
+import org.bson.json.JsonWriterSettings;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+
+public class EvergreenBenchmarkResultWriter implements BenchmarkResultWriter {
+
+    private static final String OUTPUT_FILE_SYSTEM_PROPERTY = "org.mongodb.benchmarks.output";
+
+    private final Writer writer;
+    private final JsonWriter jsonWriter;
+
+    public EvergreenBenchmarkResultWriter()  {
+        try {
+            writer = new FileWriter(System.getProperty(OUTPUT_FILE_SYSTEM_PROPERTY));
+            jsonWriter = new JsonWriter(writer,
+                    JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).indent(true).build());;
+            jsonWriter.writeStartDocument();
+            jsonWriter.writeStartArray("results");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void write(final BenchmarkResult benchmarkResult) {
+        jsonWriter.writeStartDocument();
+        jsonWriter.writeString("name", benchmarkResult.getName());
+        jsonWriter.writeStartDocument("results");
+        jsonWriter.writeStartDocument("1");
+
+        jsonWriter.writeDouble("ops_per_sec",
+                (benchmarkResult.getBytesPerIteration() / 1000000d) /
+                        (benchmarkResult.getElapsedTimeNanosAtPercentile(50) / 1000000000d));
+
+        jsonWriter.writeEndDocument();
+        jsonWriter.writeEndDocument();
+        jsonWriter.writeEndDocument();
+    }
+
+    @Override
+    public void close() throws IOException {
+        jsonWriter.writeEndArray();
+        jsonWriter.writeEndDocument();
+        jsonWriter.close();
+        writer.close();
+        System.out.println("DONE");
+    }
+
+    public String getResults() {
+        return writer.toString();
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/framework/MinimalTextBasedBenchmarkResultWriter.java b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/MinimalTextBasedBenchmarkResultWriter.java
new file mode 100644
index 00000000000..20e8da9dd5d
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/MinimalTextBasedBenchmarkResultWriter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.framework;
+
+import java.io.PrintStream;
+
+import static java.lang.String.format;
+
+public class MinimalTextBasedBenchmarkResultWriter implements BenchmarkResultWriter {
+
+    public static final double ONE_BILLION = 1000000000.0; // To convert nanoseconds to seconds
+    private final PrintStream printStream;
+
+    public MinimalTextBasedBenchmarkResultWriter(final PrintStream printStream) {
+        this.printStream = printStream;
+    }
+
+    @Override
+    public void write(final BenchmarkResult benchmarkResult) {
+        printStream.println(format("%s: %.3f", benchmarkResult.getName(),
+                benchmarkResult.getElapsedTimeNanosAtPercentile(50) / ONE_BILLION));
+    }
+
+    @Override
+    public void close() {
+    }
+}
diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/framework/TextBasedBenchmarkResultWriter.java b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/TextBasedBenchmarkResultWriter.java
new file mode 100644
index 00000000000..baf234fe00c
--- /dev/null
+++ b/driver-benchmarks/src/main/com/mongodb/benchmark/framework/TextBasedBenchmarkResultWriter.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.mongodb.benchmark.framework;
+
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.lang.String.format;
+
+public class TextBasedBenchmarkResultWriter implements BenchmarkResultWriter {
+
+    public static final double ONE_MEGABYTE = 1000000.0;   // Intentionally in base 10
+    public static final double ONE_BILLION = 1000000000.0; // To convert nanoseconds to seconds
+    private final PrintStream printStream;
+    private final List<Integer> percentiles;
+    private final boolean includeMegabytes;
+    private final boolean includeRaw;
+
+    public TextBasedBenchmarkResultWriter(final PrintStream printStream) {
+        this(printStream, false, false);
+    }
+
+    public TextBasedBenchmarkResultWriter(final PrintStream printStream, boolean includeMegabytes, boolean includeRaw) {
+        this(printStream, Arrays.asList(1, 10, 25, 50, 75, 90, 95, 99), includeMegabytes, includeRaw);
+    }
+
+    public TextBasedBenchmarkResultWriter(final PrintStream printStream, final List<Integer> percentiles) {
+         this(printStream, percentiles, false, false);
+    }
+
+    public TextBasedBenchmarkResultWriter(final PrintStream printStream, final List<Integer> percentiles,
+                                          boolean includeMegabytes, boolean includeRaw) {
+        this.printStream = printStream;
+        this.percentiles = percentiles;
+        this.includeMegabytes = includeMegabytes;
+        this.includeRaw = includeRaw;
+    }
+
+    @Override
+    public void write(final BenchmarkResult benchmarkResult) {
+        printStream.println(benchmarkResult.getName());
+        printStream.println(benchmarkResult.getNumIterations() + " iterations");
+
+        double megabytesPerIteration = benchmarkResult.getBytesPerIteration() / ONE_MEGABYTE;
+
+        for (int percentile : percentiles) {
+            double secondsPerIteration = benchmarkResult.getElapsedTimeNanosAtPercentile(percentile) / ONE_BILLION;
+            printStream.println(format("%dth percentile: %.3f sec/iteration", percentile, secondsPerIteration));
+        }
+
+        if (includeMegabytes) {
+            printStream.println();
+            for (int percentile : percentiles) {
+                double secondsPerIteration = benchmarkResult.getElapsedTimeNanosAtPercentile(percentile) / ONE_BILLION;
+                printStream.println(format("%dth percentile: %.3f MB/sec", percentile, megabytesPerIteration / secondsPerIteration));
+            }
+        }
+
+        if (includeRaw) {
+            printStream.println();
+            for (int i = 0; i < benchmarkResult.getElapsedTimeNanosList().size(); i++) {
+                double secondsPerIteration = benchmarkResult.getElapsedTimeNanosList().get(i) / ONE_BILLION;
+                printStream.println(format("%d: %.3f sec/iteration", i, secondsPerIteration));
+            }
+        }
+
+        printStream.println();
+        printStream.println();
+    }
+
+    @Override
+    public void close() {
+    }
+}
diff --git a/driver-benchmarks/src/resources/logback.xml b/driver-benchmarks/src/resources/logback.xml
new file mode 100644
index 00000000000..a88a7e73a5d
--- /dev/null
+++ b/driver-benchmarks/src/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="WARN">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
diff --git a/driver-core/build.gradle b/driver-core/build.gradle
index cddae6e7dc5..b96839cc943 100644
--- a/driver-core/build.gradle
+++ b/driver-core/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,50 +14,67 @@
  * limitations under the License.
  */
 
-apply plugin: 'osgi'
-apply plugin: 'org.kordamp.gradle.clirr'
 
-def configDir = new File(rootDir, 'config')
+plugins {
+    id 'de.fuerstenau.buildconfig' version '1.1.8'
+}
+
 archivesBaseName = 'mongodb-driver-core'
+description = '''The Java operations layer for the MongoDB Java Driver.
+ Third parties can wrap this layer to provide custom higher-level APIs'''
+
+ext {
+    pomName = 'MongoDB Java Driver Core'
+}
 
 clirr {
     excludeFilter = new File("$configDir/clirr-exclude.yml")
-    baseline 'org.mongodb:mongodb-driver-core:3.2.0'
+    baseline 'org.mongodb:mongodb-driver-core:3.8.0'
     failOnErrors = false
 }
 
 dependencies {
     compile project(':bson')
 
+    compile "com.github.jnr:jnr-unixsocket:$jnrUnixsocketVersion", optional
     compile "io.netty:netty-buffer:$nettyVersion", optional
     compile "io.netty:netty-transport:$nettyVersion", optional
     compile "io.netty:netty-handler:$nettyVersion", optional
+    compile "org.xerial.snappy:snappy-java:$snappyVersion", optional
+    compile "com.github.luben:zstd-jni:$zstdVersion", optional
+    compile "org.mongodb:mongodb-crypt:$mongoCryptVersion", optional
 
     testCompile project(':bson').sourceSets.test.output
 }
 
+buildConfig {
+    appName = 'mongo-java-driver'
+    version = project.gitVersion
+
+    clsName = 'MongoDriverVersion'
+    packageName = 'com.mongodb.internal.build'
+}
+
 jar {
     manifest {
+        instruction 'Automatic-Module-Name', 'org.mongodb.driver.core'
+        instruction 'Build-Version', project.gitVersion
         instruction 'Import-Package',
                     'org.bson.*',                       // unfortunate that this is necessary, but if it's left out then it's not included
                     'javax.crypto.*',
                     'javax.crypto.spec.*',
                     'javax.management.*',
+                    'javax.naming.*',
+                    'javax.naming.directory.*',
                     'javax.net.*',
                     'javax.net.ssl.*',
                     'javax.security.sasl.*',
                     'javax.security.auth.callback.*',
                     'org.ietf.jgss.*',
                     'io.netty.*;resolution:=optional',
-                    'org.slf4j;resolution:=optional'
-    }
-}
-
-modifyPom {
-    project {
-        name 'MongoDB Java Driver Core'
-        description 'The Java operations layer for the MongoDB Java Driver. Third parties can \' +\n' +
-                    '                                                   \'wrap this layer to provide custom higher-level APIs'
-        url 'http://www.mongodb.org'
+                    'org.xerial.snappy.*;resolution:=optional',
+                    'com.github.luben.zstd.*;resolution:=optional',
+                    'org.slf4j;resolution:=optional',
+                    'jnr.unixsocket;resolution:=optional'
     }
 }
diff --git a/driver-core/src/main/com/mongodb/AuthenticationMechanism.java b/driver-core/src/main/com/mongodb/AuthenticationMechanism.java
index ff29dc5e8da..9a6e6c9b272 100644
--- a/driver-core/src/main/com/mongodb/AuthenticationMechanism.java
+++ b/driver-core/src/main/com/mongodb/AuthenticationMechanism.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,13 +42,22 @@ public enum AuthenticationMechanism {
 
     /**
      * The MongoDB Challenge Response mechanism.
+     *
+     * @deprecated This mechanism was replaced by {@link #SCRAM_SHA_1} in MongoDB 3.0, and is now deprecated
      */
+    @Deprecated
     MONGODB_CR("MONGODB-CR"),
 
     /**
      * The SCRAM-SHA-1 mechanism.  See the <a href="http://tools.ietf.org/html/rfc5802">RFC</a>.
      */
-    SCRAM_SHA_1("SCRAM-SHA-1");
+    SCRAM_SHA_1("SCRAM-SHA-1"),
+
+    /**
+     * The SCRAM-SHA-256 mechanism.  See the <a href="http://tools.ietf.org/html/rfc7677">RFC</a>.
+     * @since 3.8
+     */
+    SCRAM_SHA_256("SCRAM-SHA-256");
 
     private static final Map<String, AuthenticationMechanism> AUTH_MAP = new HashMap<String, AuthenticationMechanism>();
     private final String mechanismName;
diff --git a/driver-core/src/main/com/mongodb/AutoEncryptionSettings.java b/driver-core/src/main/com/mongodb/AutoEncryptionSettings.java
new file mode 100644
index 00000000000..eb184c01012
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/AutoEncryptionSettings.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The client-side automatic encryption settings. Client side encryption enables an application to specify what fields in a collection
+ * must be encrypted, and the driver automatically encrypts commands sent to MongoDB and decrypts responses.
+ * <p>
+ * Automatic encryption is an enterprise only feature that only applies to operations on a collection. Automatic encryption is not
+ * supported for operations on a database or view and will result in error. To bypass automatic encryption,
+ * set bypassAutoEncryption=true in {@code AutoEncryptionSettings}.
+ * </p>
+ * <p>
+ * Explicit encryption/decryption and automatic decryption is a community feature, enabled with the new
+ * {@code com.mongodb.client.vault.ClientEncryption} type.
+ * </p>
+ * <p>
+ * A MongoClient configured with bypassAutoEncryption=true will still automatically decrypt.
+ * </p>
+ * <p>
+ * If automatic encryption fails on an operation, use a MongoClient configured with bypassAutoEncryption=true and use
+ * ClientEncryption#encrypt to manually encrypt values.
+ * </p>
+ * <p>
+ * Enabling client side encryption reduces the maximum document and message size (using a maxBsonObjectSize of 2MiB and
+ * maxMessageSizeBytes of 6MB) and may have a negative performance impact.
+ * </p>
+ * <p>
+ * Automatic encryption requires the authenticated user to have the listCollections privilege action.
+ * </p>
+ *
+ * @since 3.11
+ */
+public final class AutoEncryptionSettings {
+    private final MongoClientSettings keyVaultMongoClientSettings;
+    private final String keyVaultNamespace;
+    private final Map<String, Map<String, Object>> kmsProviders;
+    private final Map<String, BsonDocument> schemaMap;
+    private final Map<String, Object> extraOptions;
+    private final boolean bypassAutoEncryption;
+
+    /**
+     * A builder for {@code AutoEncryptionSettings} so that {@code AutoEncryptionSettings} can be immutable, and to support easier
+     * construction through chaining.
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private MongoClientSettings keyVaultMongoClientSettings;
+        private String keyVaultNamespace;
+        private Map<String, Map<String, Object>> kmsProviders;
+        private Map<String, BsonDocument> schemaMap = Collections.emptyMap();
+        private Map<String, Object> extraOptions = Collections.emptyMap();
+        private boolean bypassAutoEncryption;
+
+        /**
+         * Sets the key vault settings.
+         *
+         * @param keyVaultMongoClientSettings the key vault mongo client settings, which may be null.
+         * @return this
+         * @see #getKeyVaultMongoClientSettings()
+         */
+        public Builder keyVaultMongoClientSettings(final MongoClientSettings keyVaultMongoClientSettings) {
+            this.keyVaultMongoClientSettings = keyVaultMongoClientSettings;
+            return this;
+        }
+
+        /**
+         * Sets the key vault namespace
+         *
+         * @param keyVaultNamespace the key vault namespace, which may not be null
+         * @return this
+         * @see #getKeyVaultNamespace()
+         */
+        public Builder keyVaultNamespace(final String keyVaultNamespace) {
+            this.keyVaultNamespace = notNull("keyVaultNamespace", keyVaultNamespace);
+            return this;
+        }
+
+        /**
+         * Sets the KMS providers map.
+         *
+         * @param kmsProviders the KMS providers map, which may not be null
+         * @return this
+         * @see #getKmsProviders()
+         */
+        public Builder kmsProviders(final Map<String, Map<String, Object>> kmsProviders) {
+            this.kmsProviders = notNull("kmsProviders", kmsProviders);
+            return this;
+        }
+
+        /**
+         * Sets the map from namespace to local schema document
+         *
+         * @param schemaMap the map from namespace to local schema document
+         * @return this
+         * @see #getSchemaMap()
+         */
+        public Builder schemaMap(final Map<String, BsonDocument> schemaMap) {
+            this.schemaMap = notNull("schemaMap", schemaMap);
+            return this;
+        }
+
+        /**
+         * Sets the extra options.
+         *
+         * @param extraOptions the extra options, which may not be null
+         * @return this
+         * @see #getExtraOptions()
+         */
+        public Builder extraOptions(final Map<String, Object> extraOptions) {
+            this.extraOptions = notNull("extraOptions", extraOptions);
+            return this;
+        }
+
+        /**
+         * Sets whether auto-encryption should be bypassed.
+         *
+         * @param bypassAutoEncryption whether auto-encryption should be bypassed
+         * @return this
+         * @see #isBypassAutoEncryption()
+         */
+        public Builder bypassAutoEncryption(final boolean bypassAutoEncryption) {
+            this.bypassAutoEncryption = bypassAutoEncryption;
+            return this;
+        }
+
+        /**
+         * Build an instance of {@code AutoEncryptionSettings}.
+         *
+         * @return the settings from this builder
+         */
+        public AutoEncryptionSettings build() {
+            return new AutoEncryptionSettings(this);
+        }
+
+        private Builder() {
+        }
+    }
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Gets the key vault settings.
+     *
+     * <p>
+     * The key vault collection is assumed to reside on the same MongoDB cluster as the encrypted collections. But the optional
+     * keyVaultMongoClientSettings can be used to route data key queries to a separate MongoDB cluster, or the same cluster but using a
+     * different credential.
+     * </p>
+     *
+     * @return the key vault settings, which may be null to indicate that the same {@code MongoClient} should be used to access the key
+     * vault collection as is used for the rest of the application.
+     */
+    @Nullable
+    public MongoClientSettings getKeyVaultMongoClientSettings() {
+        return keyVaultMongoClientSettings;
+    }
+
+    /**
+     * Gets the key vault namespace.
+     *
+     * <p>
+     * The key vault namespace refers to a collection that contains all data keys used for encryption and decryption (aka the key vault
+     * collection). Data keys are stored as documents in a special MongoDB collection. Data keys are protected with encryption by a KMS
+     * provider (AWS KMS or a local master key).
+     * </p>
+     *
+     * @return the key vault namespace, which may not be null
+     */
+    public String getKeyVaultNamespace() {
+        return keyVaultNamespace;
+    }
+
+    /**
+     * Gets the map of KMS provider properties.
+     *
+     * <p>
+     * Multiple KMS providers may be specified. Initially, two KMS providers are supported: "aws" and "local". The kmsProviders map
+     * values differ by provider:
+     * </p>
+     * <p>
+     * For "aws", the properties are:
+     * </p>
+     * <ul>
+     *     <li>accessKeyId: a String containing the AWS access key identifier</li>
+     *     <li>secretAccessKey: a String the AWS secret access key</li>
+     * </ul>
+     * <p>
+     * For "local", the properties are:
+     * </p>
+     * <ul>
+     *     <li>key: &lt;byte array of length 96&gt;</li>
+     * </ul>
+     *
+     * @return map of KMS provider properties
+     */
+    public Map<String, Map<String, Object>> getKmsProviders() {
+        return kmsProviders;
+    }
+
+    /**
+     * Gets the map of namespace to local JSON schema.
+     * <p>
+     * Automatic encryption is configured with an "encrypt" field in a collection's JSONSchema. By default, a collection's JSONSchema is
+     * periodically polled with the listCollections command. But a JSONSchema may be specified locally with the schemaMap option.
+     * </p>
+     * <p>
+     * The key into the map is the full namespace of the collection, which is {@code &lt;database name>.&lt;collection name>}.  For
+     * example, if the database name is {@code "test"} and the collection name is {@code "users"}, then the namesspace is
+     * {@code "test.users"}.
+     * </p>
+     * <p>
+     * Supplying a schemaMap provides more security than relying on JSON Schemas obtained from the server. It protects against a
+     * malicious server advertising a false JSON Schema, which could trick the client into sending unencrypted data that should be
+     * encrypted.
+     * </p>
+     * <p>
+     * Schemas supplied in the schemaMap only apply to configuring automatic encryption for client side encryption. Other validation
+     * rules in the JSON schema will not be enforced by the driver and will result in an error.
+     * </p>
+     *
+     * @return map of namespace to local JSON schema
+     */
+    public Map<String, BsonDocument> getSchemaMap() {
+        return schemaMap;
+    }
+
+    /**
+     * Gets the extra options that control the behavior of auto-encryption components.
+     * <p>
+     * The extraOptions currently only relate to the mongocryptd process.  The following options keys are supported:
+     * </p>
+     * <ul>
+     * <li>mongocryptdURI: a String which defaults to "mongodb://%2Fvar%2Fmongocryptd.sock" if domain sockets are available or
+     * "mongodb://localhost:27020" otherwise.</li>
+     * <li>mongocryptdBypassSpawn: a boolean which defaults to false. If true, the driver will not attempt to automatically spawn a
+     * mongocryptd process</li>
+     * <li>mongocryptdSpawnPath: specifies the full path to the mongocryptd executable. By default the driver spawns mongocryptd from
+     * the system path.</li>
+     * <li>mongocryptdSpawnArgs: Used to control the behavior of mongocryptd when the driver spawns it. By default, the driver spawns
+     * mongocryptd with the single command line argument {@code "--idleShutdownTimeoutSecs=60"}</li>
+     * </ul>
+     *
+     * @return the extra options map
+     */
+    public Map<String, Object> getExtraOptions() {
+        return extraOptions;
+    }
+
+    /**
+     * Gets whether auto-encryption should be bypassed.  Even when this option is true, auto-decryption is still enabled.
+     * <p>
+     * This option is useful for cases where the driver throws an exception because it is unable to prove that the command does not
+     * contain any fields that should be automatically encrypted, but the application is able to determine that it does not.  For these
+     * cases, the application can construct a {@code MongoClient} with {@code AutoEncryptionSettings} with {@code bypassAutoEncryption}
+     * enabled.
+     * </p>
+     *
+     * @return true if auto-encryption should be bypassed
+     */
+    public boolean isBypassAutoEncryption() {
+        return bypassAutoEncryption;
+    }
+
+    private AutoEncryptionSettings(final Builder builder) {
+        this.keyVaultMongoClientSettings = builder.keyVaultMongoClientSettings;
+        this.keyVaultNamespace = notNull("keyVaultNamespace", builder.keyVaultNamespace);
+        this.kmsProviders = notNull("kmsProviders", builder.kmsProviders);
+        this.schemaMap = notNull("schemaMap", builder.schemaMap);
+        this.extraOptions = notNull("extraOptions", builder.extraOptions);
+        this.bypassAutoEncryption = builder.bypassAutoEncryption;
+    }
+}
diff --git a/driver/src/main/com/mongodb/BSONTimestampCodec.java b/driver-core/src/main/com/mongodb/BSONTimestampCodec.java
similarity index 97%
rename from driver/src/main/com/mongodb/BSONTimestampCodec.java
rename to driver-core/src/main/com/mongodb/BSONTimestampCodec.java
index b02d3bc3666..d5463d97df3 100644
--- a/driver/src/main/com/mongodb/BSONTimestampCodec.java
+++ b/driver-core/src/main/com/mongodb/BSONTimestampCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/BasicDBList.java b/driver-core/src/main/com/mongodb/BasicDBList.java
similarity index 86%
rename from driver/src/main/com/mongodb/BasicDBList.java
rename to driver-core/src/main/com/mongodb/BasicDBList.java
index 50de37c73f0..01934f71966 100644
--- a/driver/src/main/com/mongodb/BasicDBList.java
+++ b/driver-core/src/main/com/mongodb/BasicDBList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 package com.mongodb;
 
-import com.mongodb.util.JSON;
 import org.bson.types.BasicBSONList;
 
 /**
@@ -28,16 +27,6 @@ public class BasicDBList extends BasicBSONList implements DBObject {
 
     private static final long serialVersionUID = -4415279469780082174L;
 
-    /**
-     * Returns a JSON serialization of this object
-     *
-     * @return JSON serialization
-     */
-    @Override
-    public String toString() {
-        return JSON.serialize(this);
-    }
-
     @Override
     public boolean isPartialObject() {
         return _isPartialObject;
diff --git a/driver-core/src/main/com/mongodb/BasicDBObject.java b/driver-core/src/main/com/mongodb/BasicDBObject.java
new file mode 100644
index 00000000000..8a5412667f4
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/BasicDBObject.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import org.bson.BSONObject;
+import org.bson.BasicBSONObject;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWrapper;
+import org.bson.codecs.Decoder;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.Encoder;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+import org.bson.io.BasicOutputBuffer;
+import org.bson.io.OutputBuffer;
+import org.bson.json.JsonReader;
+import org.bson.json.JsonWriter;
+import org.bson.json.JsonWriterSettings;
+import org.bson.types.BasicBSONList;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+
+/**
+ * A basic implementation of BSON object that is MongoDB specific. A {@code DBObject} can be created as follows, using this class:
+ * <pre>
+ * DBObject obj = new BasicDBObject();
+ * obj.put( "foo", "bar" );
+ * </pre>
+ *
+ * @mongodb.driver.manual core/document/ MongoDB Documents
+ */
+@SuppressWarnings({"rawtypes"})
+public class BasicDBObject extends BasicBSONObject implements DBObject, Bson {
+    private static final long serialVersionUID = -4415279469780082174L;
+
+    private boolean isPartialObject;
+
+    /**
+     * Parses a string in MongoDB Extended JSON format to a {@code BasicDBObject}.
+     *
+     * @param json the JSON string
+     * @return a corresponding {@code BasicDBObject} object
+     * @see org.bson.json.JsonReader
+     * @mongodb.driver.manual reference/mongodb-extended-json/ MongoDB Extended JSON
+     */
+    public static BasicDBObject parse(final String json) {
+        return parse(json, DBObjectCodec.getDefaultRegistry().get(BasicDBObject.class));
+    }
+
+    /**
+     * Parses a string in MongoDB Extended JSON format to a {@code BasicDBObject}.
+     *
+     * @param json the JSON string
+     * @param decoder the decoder to use to decode the BasicDBObject instance
+     * @return a corresponding {@code BasicDBObject} object
+     * @see org.bson.json.JsonReader
+     * @mongodb.driver.manual reference/mongodb-extended-json/ MongoDB Extended JSON
+     */
+    public static BasicDBObject parse(final String json, final Decoder<BasicDBObject> decoder) {
+        return decoder.decode(new JsonReader(json), DecoderContext.builder().build());
+    }
+
+    /**
+     * Creates an empty object.
+     */
+    public BasicDBObject() {
+        super();
+    }
+
+    /**
+     * Creates an empty object
+     *
+     * @param size an estimate of number of fields that will be inserted
+     */
+    public BasicDBObject(final int size) {
+        super(size);
+    }
+
+    /**
+     * Creates an object with the given key/value
+     *
+     * @param key   key under which to store
+     * @param value value to store
+     */
+    public BasicDBObject(final String key, final Object value) {
+        super(key, value);
+    }
+
+    /**
+     * Creates an object from a map.
+     *
+     * @param map map to convert
+     */
+    public BasicDBObject(final Map map) {
+        super(map);
+    }
+
+    /**
+     * Add a key/value pair to this object
+     *
+     * @param key the field name
+     * @param val the field value
+     * @return this BasicDBObject with the new values added
+     */
+    @Override
+    public BasicDBObject append(final String key, final Object val) {
+        put(key, val);
+        return this;
+    }
+
+    /**
+     * Whether {@link #markAsPartialObject} was ever called only matters if you are going to upsert and do not want to risk losing fields.
+     *
+     * @return true if this has been marked as a partial object
+     */
+    @Override
+    public boolean isPartialObject() {
+        return isPartialObject;
+    }
+
+    /**
+     * Gets a JSON representation of this document using the {@link org.bson.json.JsonMode#STRICT} output mode, and otherwise the default
+     * settings of {@link JsonWriterSettings.Builder} and {@link DBObjectCodec}.
+     *
+     * @return a JSON representation of this document
+     * @throws org.bson.codecs.configuration.CodecConfigurationException if the document contains types not in the default registry
+     * @see #toJson(JsonWriterSettings)
+     * @see JsonWriterSettings
+     */
+    @SuppressWarnings("deprecation")
+    public String toJson() {
+        return toJson(new JsonWriterSettings());
+    }
+
+    /**
+     * Gets a JSON representation of this document
+     *
+     * <p>With the default {@link DBObjectCodec}.</p>
+     *
+     * @param writerSettings the json writer settings to use when encoding
+     * @return a JSON representation of this document
+     * @throws org.bson.codecs.configuration.CodecConfigurationException if the document contains types not in the default registry
+     */
+    public String toJson(final JsonWriterSettings writerSettings) {
+        return toJson(writerSettings, DBObjectCodec.getDefaultRegistry().get(BasicDBObject.class));
+    }
+
+    /**
+     * Gets a JSON representation of this document
+     *
+     * <p>With the default {@link JsonWriterSettings}.</p>
+     *
+     * @param encoder the BasicDBObject codec instance to encode the document with
+     * @return a JSON representation of this document
+     * @throws org.bson.codecs.configuration.CodecConfigurationException if the registry does not contain a codec for the document values.
+     */
+    @SuppressWarnings("deprecation")
+    public String toJson(final Encoder<BasicDBObject> encoder) {
+        return toJson(new JsonWriterSettings(), encoder);
+    }
+
+    /**
+     * Gets a JSON representation of this document
+     *
+     * @param writerSettings the json writer settings to use when encoding
+     * @param encoder the BasicDBObject codec instance to encode the document with
+     * @return a JSON representation of this document
+     * @throws org.bson.codecs.configuration.CodecConfigurationException if the registry does not contain a codec for the document values.
+     */
+    public String toJson(final JsonWriterSettings writerSettings, final Encoder<BasicDBObject> encoder) {
+        JsonWriter writer = new JsonWriter(new StringWriter(), writerSettings);
+        encoder.encode(writer, this, EncoderContext.builder().build());
+        return writer.getWriter().toString();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (o == this) {
+            return true;
+        }
+
+        if (!(o instanceof BSONObject)) {
+            return false;
+        }
+
+        BSONObject other = (BSONObject) o;
+
+        if (!keySet().equals(other.keySet())) {
+            return false;
+        }
+
+        return Arrays.equals(toBson(canonicalizeBSONObject(this)), toBson(canonicalizeBSONObject(other)));
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(toBson(canonicalizeBSONObject(this)));
+    }
+
+    private static byte[] toBson(final DBObject dbObject) {
+        OutputBuffer outputBuffer = new BasicOutputBuffer();
+        DBObjectCodec.getDefaultRegistry().get(DBObject.class).encode(new BsonBinaryWriter(outputBuffer), dbObject,
+                EncoderContext.builder().build());
+        return outputBuffer.toByteArray();
+    }
+
+    /**
+     * <p>Returns a JSON serialization of this object</p>
+     *
+     * <p>The output will look like: {@code  {"a":1, "b":["x","y","z"]} }</p>
+     *
+     * @return JSON serialization
+     */
+    @SuppressWarnings("deprecation")
+    public String toString() {
+        return toJson();
+    }
+
+    /**
+     * If this object was retrieved with only some fields (using a field filter) this method will be called to mark it as such.
+     */
+    @Override
+    public void markAsPartialObject() {
+        isPartialObject = true;
+    }
+
+    /**
+     * Creates a new instance which is a copy of this BasicDBObject.
+     *
+     * @return a BasicDBObject with exactly the same values as this instance.
+     */
+    public Object copy() {
+        // copy field values into new object
+        BasicDBObject newCopy = new BasicDBObject(this.toMap());
+        // need to clone the sub obj
+        for (final String field : keySet()) {
+            Object val = get(field);
+            if (val instanceof BasicDBObject) {
+                newCopy.put(field, ((BasicDBObject) val).copy());
+            } else if (val instanceof BasicDBList) {
+                newCopy.put(field, ((BasicDBList) val).copy());
+            }
+        }
+        return newCopy;
+    }
+
+    @Override
+    public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry) {
+        return new BsonDocumentWrapper<BasicDBObject>(this, codecRegistry.get(BasicDBObject.class));
+    }
+
+    // create a copy of "from", but with keys ordered alphabetically
+    @SuppressWarnings("unchecked")
+    private static Object canonicalize(final Object from) {
+        if (from instanceof BSONObject && !(from instanceof BasicBSONList)) {
+            return canonicalizeBSONObject((BSONObject) from);
+        } else if (from instanceof List) {
+            return canonicalizeList((List<Object>) from);
+        } else if (from instanceof Map) {
+            return canonicalizeMap((Map<String, Object>) from);
+        } else {
+            return from;
+        }
+    }
+
+    private static Map<String, Object> canonicalizeMap(final Map<String, Object> from) {
+        Map<String, Object> canonicalized = new LinkedHashMap<String, Object>(from.size());
+        TreeSet<String> keysInOrder = new TreeSet<String>(from.keySet());
+        for (String key : keysInOrder) {
+            Object val = from.get(key);
+            canonicalized.put(key, canonicalize(val));
+        }
+        return canonicalized;
+    }
+
+    private static DBObject canonicalizeBSONObject(final BSONObject from) {
+        BasicDBObject canonicalized = new BasicDBObject();
+        TreeSet<String> keysInOrder = new TreeSet<String>(from.keySet());
+        for (String key : keysInOrder) {
+            Object val = from.get(key);
+            canonicalized.put(key, canonicalize(val));
+        }
+        return canonicalized;
+    }
+
+    private static List canonicalizeList(final List<Object> list) {
+        List<Object> canonicalized = new ArrayList<Object>(list.size());
+        for (Object cur : list) {
+            canonicalized.add(canonicalize(cur));
+        }
+        return canonicalized;
+    }
+}
diff --git a/driver/src/main/com/mongodb/BasicDBObjectBuilder.java b/driver-core/src/main/com/mongodb/BasicDBObjectBuilder.java
similarity index 99%
rename from driver/src/main/com/mongodb/BasicDBObjectBuilder.java
rename to driver-core/src/main/com/mongodb/BasicDBObjectBuilder.java
index 1a5d96f055e..d841e4ed511 100644
--- a/driver/src/main/com/mongodb/BasicDBObjectBuilder.java
+++ b/driver-core/src/main/com/mongodb/BasicDBObjectBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/BasicDBObjectFactory.java b/driver-core/src/main/com/mongodb/BasicDBObjectFactory.java
similarity index 95%
rename from driver/src/main/com/mongodb/BasicDBObjectFactory.java
rename to driver-core/src/main/com/mongodb/BasicDBObjectFactory.java
index a6a76883860..c15794e2ae6 100644
--- a/driver/src/main/com/mongodb/BasicDBObjectFactory.java
+++ b/driver-core/src/main/com/mongodb/BasicDBObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/Block.java b/driver-core/src/main/com/mongodb/Block.java
index 278157af91a..ec094e44c1d 100644
--- a/driver-core/src/main/com/mongodb/Block.java
+++ b/driver-core/src/main/com/mongodb/Block.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/ClientEncryptionSettings.java b/driver-core/src/main/com/mongodb/ClientEncryptionSettings.java
new file mode 100644
index 00000000000..4e913cf020e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/ClientEncryptionSettings.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.NotThreadSafe;
+
+import java.util.Map;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The client-side settings for data key creation and explicit encryption.
+ *
+ * <p>
+ * Explicit encryption/decryption is a community feature, enabled with the new {@code com.mongodb.client.vault.ClientEncryption} type,
+ * for which this is the settings.
+ * </p>
+ *
+ * @since 3.11
+ */
+public final class ClientEncryptionSettings {
+    private final MongoClientSettings keyVaultMongoClientSettings;
+    private final String keyVaultNamespace;
+    private final Map<String, Map<String, Object>> kmsProviders;
+
+    /**
+     * A builder for {@code ClientEncryptionSettings} so that {@code ClientEncryptionSettings} can be immutable, and to support easier
+     * construction through chaining.
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private MongoClientSettings keyVaultMongoClientSettings;
+        private String keyVaultNamespace;
+        private Map<String, Map<String, Object>> kmsProviders;
+
+        /**
+         * Sets the key vault settings.
+         *
+         * @param keyVaultMongoClientSettings the key vault mongo client settings, which may be null.
+         * @return this
+         * @see #getKeyVaultMongoClientSettings()
+         */
+        public Builder keyVaultMongoClientSettings(final MongoClientSettings keyVaultMongoClientSettings) {
+            this.keyVaultMongoClientSettings = keyVaultMongoClientSettings;
+            return this;
+        }
+
+        /**
+         * Sets the key vault namespace
+         *
+         * @param keyVaultNamespace the key vault namespace, which may not be null
+         * @return this
+         * @see #getKeyVaultNamespace()
+         */
+        public Builder keyVaultNamespace(final String keyVaultNamespace) {
+            this.keyVaultNamespace = notNull("keyVaultNamespace", keyVaultNamespace);
+            return this;
+        }
+
+        /**
+         * Sets the KMS providers map.
+         *
+         * @param kmsProviders the KMS providers map, which may not be null
+         * @return this
+         * @see #getKmsProviders()
+         */
+        public Builder kmsProviders(final Map<String, Map<String, Object>> kmsProviders) {
+            this.kmsProviders = notNull("kmsProviders", kmsProviders);
+            return this;
+        }
+
+        /**
+         * Build an instance of {@code ClientEncryptionSettings}.
+         *
+         * @return the settings from this builder
+         */
+        public ClientEncryptionSettings build() {
+            return new ClientEncryptionSettings(this);
+        }
+
+        private Builder() {
+        }
+    }
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Gets the key vault settings.
+     *
+     * <p>
+     * The key vault collection is assumed to reside on the same MongoDB cluster as indicated by the connecting URI. But the optional
+     * keyVaultMongoClientSettings can be used to route data key queries to a separate MongoDB cluster, or the same cluster but with a
+     * different credential.
+     * </p>
+     * @return the key vault settings, which may be null to indicate that the same {@code MongoClient} should be used to access the key
+     * vault collection as is used for the rest of the application.
+     */
+    public MongoClientSettings getKeyVaultMongoClientSettings() {
+        return keyVaultMongoClientSettings;
+    }
+
+    /**
+     * Gets the key vault namespace.
+     * <p>
+     * The key vault namespace refers to a collection that contains all data keys used for encryption and decryption (aka the key vault
+     * collection). Data keys are stored as documents in a special MongoDB collection. Data keys are protected with encryption by a KMS
+     * provider (AWS KMS or a local master key).
+     * </p>
+     *
+     * @return the key vault namespace, which may not be null
+     */
+
+    public String getKeyVaultNamespace() {
+        return keyVaultNamespace;
+    }
+
+    /**
+     * Gets the map of KMS provider properties.
+     *
+     * <p>
+     * Multiple KMS providers may be specified. Initially, two KMS providers are supported: "aws" and "local". The kmsProviders map
+     * values differ by provider:
+     * </p>
+     * <p>
+     * For "aws", the properties are:
+     * </p>
+     * <ul>
+     *     <li>accessKeyId: a String containing the AWS access key identifier</li>
+     *     <li>secretAccessKey: a String the AWS secret access key</li>
+     * </ul>
+     * <p>
+     * For "local", the properties are:
+     * </p>
+     * <ul>
+     *     <li>key: &lt;byte array of length 96&gt;</li>
+     * </ul>
+     *
+     * @return map of KMS provider properties
+     */
+    public Map<String, Map<String, Object>> getKmsProviders() {
+        return kmsProviders;
+    }
+
+    private ClientEncryptionSettings(final Builder builder) {
+        this.keyVaultMongoClientSettings = builder.keyVaultMongoClientSettings;
+        this.keyVaultNamespace = notNull("keyVaultNamespace", builder.keyVaultNamespace);
+        this.kmsProviders = notNull("kmsProviders", builder.kmsProviders);
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/ClientSessionOptions.java b/driver-core/src/main/com/mongodb/ClientSessionOptions.java
new file mode 100644
index 00000000000..af76dd4ecab
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/ClientSessionOptions.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.Immutable;
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.lang.Nullable;
+import com.mongodb.session.ClientSession;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The options to apply to a {@code ClientSession}.
+ *
+ * @mongodb.server.release 3.6
+ * @since 3.6
+ * @see ClientSession
+ * @mongodb.driver.dochub core/causal-consistency Causal Consistency
+ */
+@Immutable
+public final class ClientSessionOptions {
+
+    private final Boolean causallyConsistent;
+    private final TransactionOptions defaultTransactionOptions;
+
+    /**
+     * Whether operations using the session should causally consistent with each other.
+     *
+     * @return whether operations using the session should be causally consistent.  A null value indicates to use the global default,
+     * which is currently true.
+     * @mongodb.driver.dochub core/causal-consistency Causal Consistency
+     */
+    @Nullable
+    public Boolean isCausallyConsistent() {
+        return causallyConsistent;
+    }
+
+    /**
+     * Gets the default transaction options for the session.
+     *
+     * @return the default transaction options for the session
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    public TransactionOptions getDefaultTransactionOptions() {
+        return defaultTransactionOptions;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ClientSessionOptions that = (ClientSessionOptions) o;
+
+        if (causallyConsistent != null ? !causallyConsistent.equals(that.causallyConsistent) : that.causallyConsistent != null) {
+            return false;
+        }
+        if (defaultTransactionOptions != null ? !defaultTransactionOptions.equals(that.defaultTransactionOptions)
+                : that.defaultTransactionOptions != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = causallyConsistent != null ? causallyConsistent.hashCode() : 0;
+        result = 31 * result + (defaultTransactionOptions != null ? defaultTransactionOptions.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ClientSessionOptions{"
+                + "causallyConsistent=" + causallyConsistent
+                + ", defaultTransactionOptions=" + defaultTransactionOptions
+                + '}';
+    }
+
+    /**
+     * Gets an instance of a builder
+     *
+     * @return a builder instance
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Gets an instance of a builder initialized with the given options
+     *
+     * @param options the options with which to initialize the builder
+     * @return a builder instance
+     * @since 3.8
+     */
+    public static Builder builder(final ClientSessionOptions options) {
+        notNull("options", options);
+        Builder builder = new Builder();
+        builder.causallyConsistent = options.isCausallyConsistent();
+        builder.defaultTransactionOptions = options.getDefaultTransactionOptions();
+        return builder;
+    }
+
+    /**
+     * A builder for instances of {@code ClientSession}
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private Boolean causallyConsistent;
+        private TransactionOptions defaultTransactionOptions = TransactionOptions.builder().build();
+
+        /**
+         * Sets whether operations using the session should causally consistent with each other.
+         *
+         * @param causallyConsistent whether operations using the session should be causally consistent
+         * @return this
+         * @mongodb.driver.dochub core/causal-consistency Causal Consistency
+         */
+        public Builder causallyConsistent(final boolean causallyConsistent) {
+            this.causallyConsistent = causallyConsistent;
+            return this;
+        }
+
+        /**
+         * Sets whether operations using the session should causally consistent with each other.
+         *
+         * @param defaultTransactionOptions the default transaction options to use for all transactions on this session,
+         * @return this
+         * @since 3.8
+         * @mongodb.server.release 4.0
+         */
+        public Builder defaultTransactionOptions(final TransactionOptions defaultTransactionOptions) {
+            this.defaultTransactionOptions = notNull("defaultTransactionOptions", defaultTransactionOptions);
+            return this;
+        }
+
+        /**
+         * Build the session options instance.
+         *
+         * @return The {@code ClientSessionOptions}
+         */
+        public ClientSessionOptions build() {
+            return new ClientSessionOptions(this);
+        }
+
+        private Builder() {
+        }
+    }
+
+    private ClientSessionOptions(final Builder builder) {
+        this.causallyConsistent = builder.causallyConsistent;
+        this.defaultTransactionOptions = builder.defaultTransactionOptions;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/ConnectionString.java b/driver-core/src/main/com/mongodb/ConnectionString.java
index 97854421173..0b644ddf4f2 100644
--- a/driver-core/src/main/com/mongodb/ConnectionString.java
+++ b/driver-core/src/main/com/mongodb/ConnectionString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,12 @@
 
 package com.mongodb;
 
+import com.mongodb.connection.StreamFactoryFactory;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.dns.DefaultDnsResolver;
+import com.mongodb.lang.Nullable;
+import org.bson.UuidRepresentation;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -25,19 +29,16 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.AuthenticationMechanism.GSSAPI;
-import static com.mongodb.AuthenticationMechanism.MONGODB_CR;
-import static com.mongodb.AuthenticationMechanism.MONGODB_X509;
-import static com.mongodb.AuthenticationMechanism.PLAIN;
-import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static java.util.Collections.unmodifiableList;
 
 
 /**
@@ -46,14 +47,17 @@
  *
  * <p>The format of the Connection String is:</p>
  * <pre>
- *   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
+ *   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database.collection][?options]]
  * </pre>
  * <ul>
  * <li>{@code mongodb://} is a required prefix to identify that this is a string in the standard connection format.</li>
  * <li>{@code username:password@} are optional.  If given, the driver will attempt to login to a database after
  * connecting to a database server.  For some authentication mechanisms, only the username is specified and the password is not,
  * in which case the ":" after the username is left off as well</li>
- * <li>{@code host1} is the only required part of the connection string.  It identifies a server address to connect to.</li>
+ * <li>{@code host1} is the only required part of the connection string. It identifies a server address to connect to.
+ * Support for Unix domain sockets was added in 3.7. Note: The path must be urlencoded eg: {@code mongodb://%2Ftmp%2Fmongodb-27017.sock}
+ * and the {@code jnr.unixsocket} library installed.
+ * </li>
  * <li>{@code :portX} is optional and defaults to :27017 if not provided.</li>
  * <li>{@code /database} is the name of the database to login to and thus is only relevant if the
  * {@code username:password@} syntax is used. If not specified the "admin" database will be used by default.</li>
@@ -62,7 +66,27 @@
  * are separated by "&amp;". For backwards compatibility, ";" is accepted as a separator in addition to "&amp;",
  * but should be considered as deprecated.</li>
  * </ul>
- *
+ * <p>An alternative format, using the mongodb+srv protocol, is:
+ * <pre>
+ *   mongodb+srv://[username:password@]host[/[database][?options]]
+ * </pre>
+ * <ul>
+ * <li>{@code mongodb+srv://} is a required prefix for this format.</li>
+ * <li>{@code username:password@} are optional.  If given, the driver will attempt to login to a database after
+ * connecting to a database server.  For some authentication mechanisms, only the username is specified and the password is not,
+ * in which case the ":" after the username is left off as well</li>
+ * <li>{@code host} is the only required part of the URI.  It identifies a single host name for which SRV records are looked up
+ * from a Domain Name Server after prefixing the host name with {@code "_mongodb._tcp"}.  The host/port for each SRV record becomes the
+ * seed list used to connect, as if each one were provided as host/port pair in a URI using the normal mongodb protocol.</li>
+ * <li>{@code /database} is the name of the database to login to and thus is only relevant if the
+ * {@code username:password@} syntax is used. If not specified the "admin" database will be used by default.</li>
+ * <li>{@code ?options} are connection options. Note that if {@code database} is absent there is still a {@code /}
+ * required between the last host and the {@code ?} introducing the options. Options are name=value pairs and the pairs
+ * are separated by "&amp;". For backwards compatibility, ";" is accepted as a separator in addition to "&amp;",
+ * but should be considered as deprecated. Additionally with the mongodb+srv protocol, TXT records are looked up from a Domain Name
+ * Server for the given host, and the text value of each one is prepended to any options on the URI itself.  Because the last specified
+ * value for any option wins, that means that options provided on the URI will override any that are provided via TXT records.</li>
+ * </ul>
  * <p>The following options are supported (case insensitive):</p>
  *
  * <p>Server Selection Configuration:</p>
@@ -83,22 +107,29 @@
  * all members of the set.</li>
  * </ul>
  * <p>Connection Configuration:</p>
- * <p>Connection Configuration:</p>
  * <ul>
- * <li>{@code streamType=nio2|netty}: The stream type to use for connections. If unspecified, nio2 will be used.</li>
- * <li>{@code ssl=true|false}: Whether to connect using SSL.</li>
- * <li>{@code sslInvalidHostNameAllowed=true|false}: Whether to allow invalid host names for SSL connections.</li>
+ * <li>{@code ssl=true|false}: Whether to connect using TLS.</li>
+ * <li>{@code tls=true|false}: Whether to connect using TLS. Supersedes the ssl option</li>
+ * <li>{@code tlsInsecure=true|false}: If connecting with TLS, this option enables insecure TLS connections. Currently this has the
+ * same effect of setting tlsAllowInvalidHostnames to true. Other mechanism for relaxing TLS security constraints must be handled in
+ * the application by customizing the {@link javax.net.ssl.SSLContext}</li>
+ * <li>{@code sslInvalidHostNameAllowed=true|false}: Whether to allow invalid host names for TLS connections.</li>
+ * <li>{@code tlsAllowInvalidHostnames=true|false}: Whether to allow invalid host names for TLS connections. Supersedes the
+ * sslInvalidHostNameAllowed option</li>
  * <li>{@code connectTimeoutMS=ms}: How long a connection can take to be opened before timing out.</li>
  * <li>{@code socketTimeoutMS=ms}: How long a send or receive on a socket can take before timing out.</li>
  * <li>{@code maxIdleTimeMS=ms}: Maximum idle time of a pooled connection. A connection that exceeds this limit will be closed</li>
  * <li>{@code maxLifeTimeMS=ms}: Maximum life time of a pooled connection. A connection that exceeds this limit will be closed</li>
+ * <li>{@code streamType=nio2|netty}: The stream type to use for connections. If unspecified, nio2 will be used for asynchronous
+ * clients.  Note that this query parameter has been deprecated and applications should use
+ * {@link MongoClientSettings.Builder#streamFactoryFactory(StreamFactoryFactory)} instead.</li>
  * </ul>
  * <p>Connection pool configuration:</p>
  * <ul>
  * <li>{@code maxPoolSize=n}: The maximum number of connections in the connection pool.</li>
  * <li>{@code waitQueueMultiple=n} : this multiplier, multiplied with the maxPoolSize setting, gives the maximum number of
  * threads that may be waiting for a connection to become available from the pool.  All further threads will get an
- * exception right away.</li>
+ * exception right away. Note that this configuration option is deprecated and will be removed in the next major release.</li>
  * <li>{@code waitQueueTimeoutMS=ms}: The maximum wait time in milliseconds that a thread may wait for a connection to
  * become available.</li>
  * </ul>
@@ -106,9 +137,9 @@
  * <ul>
  * <li>{@code safe=true|false}
  * <ul>
- * <li>{@code true}: the driver sends a getLastError command after every update to ensure that the update succeeded
+ * <li>{@code true}: the driver ensures that all writes are acknowledged by the MongoDB server, or else throws an exception.
  * (see also {@code w} and {@code wtimeoutMS}).</li>
- * <li>{@code false}: the driver does not send a getLastError command after every update.</li>
+ * <li>{@code false}: the driver does not ensure that all writes are acknowledged by the MongoDB server.</li>
  * </ul>
  * </li>
  * <li>{@code journal=true|false}
@@ -119,14 +150,14 @@
  * </li>
  * <li>{@code w=wValue}
  * <ul>
- * <li>The driver adds { w : wValue } to the getLastError command. Implies {@code safe=true}.</li>
+ * <li>The driver adds { w : wValue } to all write commands. Implies {@code safe=true}.</li>
  * <li>wValue is typically a number, but can be any string in order to allow for specifications like
  * {@code "majority"}</li>
  * </ul>
  * </li>
  * <li>{@code wtimeoutMS=ms}
  * <ul>
- * <li>The driver adds { wtimeout : ms } to the getlasterror command. Implies {@code safe=true}.</li>
+ * <li>The driver adds { wtimeout : ms } to all write commands. Implies {@code safe=true}.</li>
  * <li>Used in combination with {@code w}</li>
  * </ul>
  * </li>
@@ -155,6 +186,13 @@
  * <li>Order matters when using multiple readPreferenceTags.</li>
  * </ul>
  * </li>
+ * <li>{@code maxStalenessSeconds=seconds}. The maximum staleness in seconds. For use with any non-primary read preference, the driver
+ * estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses, and selects only those
+ * secondaries whose staleness is less than or equal to maxStalenessSeconds.  Not providing the parameter or explicitly setting it to -1
+ * indicates that there should be no max staleness check. The maximum staleness feature is designed to prevent badly-lagging servers from
+ * being selected. The staleness estimate is imprecise and shouldn't be used to try to select "up-to-date" secondaries.  The minimum value
+ * is either 90 seconds, or the heartbeat frequency plus 10 seconds, whichever is greatest.
+ * </li>
  * </ul>
  * <p>Authentication configuration:</p>
  * <ul>
@@ -174,18 +212,43 @@
  *   Deprecated, please use {@code authMechanismProperties=SERVICE_NAME:string} instead.
  * </li>
  * </ul>
+ * <p>Server Handshake configuration:</p>
+ * <ul>
+ * <li>{@code appName=string}: Sets the logical name of the application.  The application name may be used by the client to identify
+ * the application to the server, for use in server logs, slow query logs, and profile collection.</li>
+ * </ul>
+ * <p>Compressor configuration:</p>
+ * <ul>
+ * <li>{@code compressors=string}: A comma-separated list of compressors to request from the server.  The supported compressors
+ * currently are 'zlib', 'snappy' and 'zstd'.</li>
+ * <li>{@code zlibCompressionLevel=integer}: Integer value from -1 to 9 representing the zlib compression level. Lower values will make
+ * compression faster, while higher values will make compression better.</li>
+ * </ul>
+ * <p>General configuration:</p>
+ * <ul>
+ * <li>{@code retryWrites=true|false}. If true the driver will retry supported write operations if they fail due to a network error.
+ *  Defaults to true.</li>
+ * <li>{@code retryReads=true|false}. If true the driver will retry supported read operations if they fail due to a network error.
+ *  Defaults to true.</li>
+ * <li>{@code uuidRepresentation=unspecified|standard|javaLegacy|csharpLegacy|pythonLegacy}.  See
+ * {@link MongoClientSettings#getUuidRepresentation()} for documentation of semantics of this parameter.  Defaults to "javaLegacy", but
+ * will change to "unspecified" in the next major release.</li>
+ * </ul>
  *
  * @mongodb.driver.manual reference/connection-string Connection String Format
  * @since 3.0.0
  */
 public class ConnectionString {
 
-    private static final String PREFIX = "mongodb://";
+    private static final String MONGODB_PREFIX = "mongodb://";
+    private static final String MONGODB_SRV_PREFIX = "mongodb+srv://";
+    private static final Set<String> ALLOWED_OPTIONS_IN_TXT_RECORD = new HashSet<String>(asList("authsource", "replicaset"));
     private static final String UTF_8 = "UTF-8";
 
     private static final Logger LOGGER = Loggers.getLogger("uri");
 
-    private final MongoCredential credentials;
+    private final MongoCredential credential;
+    private final boolean isSrvProtocol;
     private final List<String> hosts;
     private final String database;
     private final String collection;
@@ -193,6 +256,8 @@ public class ConnectionString {
 
     private ReadPreference readPreference;
     private WriteConcern writeConcern;
+    private Boolean retryWrites;
+    private Boolean retryReads;
     private ReadConcern readConcern;
 
     private Integer minConnectionPoolSize;
@@ -210,6 +275,9 @@ public class ConnectionString {
     private Integer serverSelectionTimeout;
     private Integer localThreshold;
     private Integer heartbeatFrequency;
+    private String applicationName;
+    private List<MongoCompressor> compressorList;
+    private UuidRepresentation uuidRepresentation;
 
     /**
      * Creates a ConnectionString from the given string.
@@ -219,16 +287,23 @@ public class ConnectionString {
      */
     public ConnectionString(final String connectionString) {
         this.connectionString = connectionString;
-        if (!connectionString.startsWith(PREFIX)) {
+        boolean isMongoDBProtocol = connectionString.startsWith(MONGODB_PREFIX);
+        isSrvProtocol = connectionString.startsWith(MONGODB_SRV_PREFIX);
+        if (!isMongoDBProtocol && !isSrvProtocol) {
             throw new IllegalArgumentException(format("The connection string is invalid. "
-                    + "Connection strings must start with '%s'", PREFIX));
+                    + "Connection strings must start with either '%s' or '%s", MONGODB_PREFIX, MONGODB_SRV_PREFIX));
         }
 
-        String unprocessedConnectionString = connectionString.substring(PREFIX.length());
+        String unprocessedConnectionString;
+        if (isMongoDBProtocol) {
+            unprocessedConnectionString = connectionString.substring(MONGODB_PREFIX.length());
+        } else {
+            unprocessedConnectionString = connectionString.substring(MONGODB_SRV_PREFIX.length());
+        }
 
         // Split out the user and host information
-        String userAndHostInformation = null;
-        int idx = unprocessedConnectionString.lastIndexOf("/");
+        String userAndHostInformation;
+        int idx = unprocessedConnectionString.indexOf("/");
         if (idx == -1) {
             if (unprocessedConnectionString.contains("?")) {
                 throw new IllegalArgumentException("The connection string contains options without trailing slash");
@@ -241,13 +316,13 @@ public ConnectionString(final String connectionString) {
         }
 
         // Split the user and host information
-        String userInfo = null;
-        String hostIdentifier = null;
+        String userInfo;
+        String hostIdentifier;
         String userName = null;
         char[] password = null;
         idx = userAndHostInformation.lastIndexOf("@");
         if (idx > 0) {
-            userInfo = userAndHostInformation.substring(0, idx);
+            userInfo = userAndHostInformation.substring(0, idx).replace("+", "%2B");
             hostIdentifier = userAndHostInformation.substring(idx + 1);
             int colonCount = countOccurrences(userInfo, ":");
             if (userInfo.contains("@") || colonCount > 1) {
@@ -266,10 +341,19 @@ public ConnectionString(final String connectionString) {
         }
 
         // Validate the hosts
-        hosts = Collections.unmodifiableList(parseHosts(asList(hostIdentifier.split(","))));
+        List<String> unresolvedHosts = unmodifiableList(parseHosts(asList(hostIdentifier.split(","))));
+        if (isSrvProtocol) {
+            if (unresolvedHosts.size() > 1) {
+                throw new IllegalArgumentException("Only one host allowed when using mongodb+srv protocol");
+            }
+            if (unresolvedHosts.get(0).contains(":")) {
+                throw new IllegalArgumentException("Host for when using mongodb+srv protocol can not contain a port");
+            }
+        }
+        this.hosts = unresolvedHosts;
 
         // Process the authDB section
-        String nsPart = null;
+        String nsPart;
         idx = unprocessedConnectionString.indexOf("?");
         if (idx == -1) {
             nsPart = unprocessedConnectionString;
@@ -288,21 +372,36 @@ public ConnectionString(final String connectionString) {
                 database = nsPart.substring(0, idx);
                 collection = nsPart.substring(idx + 1);
             }
+            MongoNamespace.checkDatabaseNameValidity(database);
         } else {
             database = null;
             collection = null;
         }
 
-        Map<String, List<String>> optionsMap = parseOptions(unprocessedConnectionString);
-        translateOptions(optionsMap);
-        credentials = createCredentials(optionsMap, userName, password);
-        warnOnUnsupportedOptions(optionsMap);
+        String txtRecordsQueryParameters = isSrvProtocol
+                ? new DefaultDnsResolver().resolveAdditionalQueryParametersFromTxtRecords(unresolvedHosts.get(0)) : "";
+        String connectionStringQueryParamenters = unprocessedConnectionString;
+
+        Map<String, List<String>> connectionStringOptionsMap = parseOptions(connectionStringQueryParamenters);
+        Map<String, List<String>> txtRecordsOptionsMap = parseOptions(txtRecordsQueryParameters);
+        if (!ALLOWED_OPTIONS_IN_TXT_RECORD.containsAll(txtRecordsOptionsMap.keySet())) {
+            throw new MongoConfigurationException(format("A TXT record is only permitted to contain the keys %s, but the TXT record for "
+            + "'%s' contains the keys %s", ALLOWED_OPTIONS_IN_TXT_RECORD, unresolvedHosts.get(0), txtRecordsOptionsMap.keySet()));
+        }
+        Map<String, List<String>> combinedOptionsMaps = combineOptionsMaps(txtRecordsOptionsMap, connectionStringOptionsMap);
+        if (isSrvProtocol && !combinedOptionsMaps.containsKey("ssl")) {
+            combinedOptionsMaps.put("ssl", singletonList("true"));
+        }
+        translateOptions(combinedOptionsMaps);
+        credential = createCredentials(combinedOptionsMaps, userName, password);
+        warnOnUnsupportedOptions(combinedOptionsMaps);
     }
 
-    private static final Set<String> GENERAL_OPTIONS_KEYS = new HashSet<String>();
+    private static final Set<String> GENERAL_OPTIONS_KEYS = new LinkedHashSet<String>();
     private static final Set<String> AUTH_KEYS = new HashSet<String>();
     private static final Set<String> READ_PREFERENCE_KEYS = new HashSet<String>();
     private static final Set<String> WRITE_CONCERN_KEYS = new HashSet<String>();
+    private static final Set<String> COMPRESSOR_KEYS = new HashSet<String>();
     private static final Set<String> ALL_KEYS = new HashSet<String>();
 
     static {
@@ -314,19 +413,40 @@ public ConnectionString(final String connectionString) {
         GENERAL_OPTIONS_KEYS.add("maxidletimems");
         GENERAL_OPTIONS_KEYS.add("maxlifetimems");
         GENERAL_OPTIONS_KEYS.add("sockettimeoutms");
-        GENERAL_OPTIONS_KEYS.add("sockettimeoutms");
+
+        // Order matters here: Having tls after ssl means than the tls option will supersede the ssl option when both are set
         GENERAL_OPTIONS_KEYS.add("ssl");
-        GENERAL_OPTIONS_KEYS.add("streamtype");
+        GENERAL_OPTIONS_KEYS.add("tls");
+
+        // Order matters here: Having tlsinsecure before sslinvalidhostnameallowed and tlsallowinvalidhostnames means that those options
+        // will supersede this one when both are set.
+        GENERAL_OPTIONS_KEYS.add("tlsinsecure");
+
+        // Order matters here: Having tlsallowinvalidhostnames after sslinvalidhostnameallowed means than the tlsallowinvalidhostnames
+        // option will supersede the sslinvalidhostnameallowed option when both are set
         GENERAL_OPTIONS_KEYS.add("sslinvalidhostnameallowed");
+        GENERAL_OPTIONS_KEYS.add("tlsallowinvalidhostnames");
+
         GENERAL_OPTIONS_KEYS.add("replicaset");
         GENERAL_OPTIONS_KEYS.add("readconcernlevel");
+        GENERAL_OPTIONS_KEYS.add("streamtype");
 
         GENERAL_OPTIONS_KEYS.add("serverselectiontimeoutms");
         GENERAL_OPTIONS_KEYS.add("localthresholdms");
         GENERAL_OPTIONS_KEYS.add("heartbeatfrequencyms");
+        GENERAL_OPTIONS_KEYS.add("retrywrites");
+        GENERAL_OPTIONS_KEYS.add("retryreads");
+
+        GENERAL_OPTIONS_KEYS.add("appname");
+
+        GENERAL_OPTIONS_KEYS.add("uuidrepresentation");
+
+        COMPRESSOR_KEYS.add("compressors");
+        COMPRESSOR_KEYS.add("zlibcompressionlevel");
 
         READ_PREFERENCE_KEYS.add("readpreference");
         READ_PREFERENCE_KEYS.add("readpreferencetags");
+        READ_PREFERENCE_KEYS.add("maxstalenessseconds");
 
         WRITE_CONCERN_KEYS.add("safe");
         WRITE_CONCERN_KEYS.add("w");
@@ -343,25 +463,40 @@ public ConnectionString(final String connectionString) {
         ALL_KEYS.addAll(AUTH_KEYS);
         ALL_KEYS.addAll(READ_PREFERENCE_KEYS);
         ALL_KEYS.addAll(WRITE_CONCERN_KEYS);
+        ALL_KEYS.addAll(COMPRESSOR_KEYS);
     }
 
+    // Any options contained in the connection string completely replace the corresponding options specified in TXT records,
+    // even for options which multiple values, e.g. readPreferenceTags
+    private Map<String, List<String>> combineOptionsMaps(final Map<String, List<String>> txtRecordsOptionsMap,
+                                                         final Map<String, List<String>> connectionStringOptionsMap) {
+        Map<String, List<String>> combinedOptionsMaps = new HashMap<String, List<String>>(txtRecordsOptionsMap);
+        for (Map.Entry<String, List<String>> entry : connectionStringOptionsMap.entrySet()) {
+            combinedOptionsMaps.put(entry.getKey(), entry.getValue());
+        }
+        return combinedOptionsMaps;
+    }
+
+
     private void warnOnUnsupportedOptions(final Map<String, List<String>> optionsMap) {
         for (final String key : optionsMap.keySet()) {
             if (!ALL_KEYS.contains(key)) {
                 if (LOGGER.isWarnEnabled()) {
-                    LOGGER.warn(format("Unsupported option '%s' in the connection string '%s'.", key, connectionString));
+                    LOGGER.warn(format("Connection string contains unsupported option '%s'.", key));
                 }
             }
         }
     }
 
     private void translateOptions(final Map<String, List<String>> optionsMap) {
+        boolean tlsInsecureSet = false;
+        boolean tlsAllowInvalidHostnamesSet = false;
+
         for (final String key : GENERAL_OPTIONS_KEYS) {
             String value = getLastValue(optionsMap, key);
             if (value == null) {
                 continue;
             }
-
             if (key.equals("maxpoolsize")) {
                 maxConnectionPoolSize = parseInteger(value, "maxpoolsize");
             } else if (key.equals("minpoolsize")) {
@@ -378,12 +513,23 @@ private void translateOptions(final Map<String, List<String>> optionsMap) {
                 connectTimeout = parseInteger(value, "connecttimeoutms");
             } else if (key.equals("sockettimeoutms")) {
                 socketTimeout = parseInteger(value, "sockettimeoutms");
-            } else if (key.equals("sslinvalidhostnameallowed") && parseBoolean(value, "sslinvalidhostnameallowed")) {
-                sslInvalidHostnameAllowed = true;
-            } else if (key.equals("ssl") && parseBoolean(value, "ssl")) {
-                sslEnabled = true;
+            } else if (key.equals("tlsallowinvalidhostnames")) {
+                sslInvalidHostnameAllowed = parseBoolean(value, "tlsAllowInvalidHostnames");
+                tlsAllowInvalidHostnamesSet = true;
+            } else if (key.equals("sslinvalidhostnameallowed")) {
+                sslInvalidHostnameAllowed = parseBoolean(value, "sslinvalidhostnameallowed");
+                tlsAllowInvalidHostnamesSet = true;
+            } else if (key.equals("tlsinsecure")) {
+                sslInvalidHostnameAllowed = parseBoolean(value, "tlsinsecure");
+                tlsInsecureSet = true;
+            } else if (key.equals("ssl")) {
+                initializeSslEnabled("ssl", value);
+            } else if (key.equals("tls")) {
+                initializeSslEnabled("tls", value);
             } else if (key.equals("streamtype")) {
                 streamType = value;
+                LOGGER.warn("The streamType query parameter is deprecated and support for it will be removed"
+                        + " in the next major release.");
             } else if (key.equals("replicaset")) {
                 requiredReplicaSetName = value;
             } else if (key.equals("readconcernlevel")) {
@@ -394,17 +540,81 @@ private void translateOptions(final Map<String, List<String>> optionsMap) {
                 localThreshold = parseInteger(value, "localthresholdms");
             } else if (key.equals("heartbeatfrequencyms")) {
                 heartbeatFrequency = parseInteger(value, "heartbeatfrequencyms");
+            } else if (key.equals("appname")) {
+                applicationName = value;
+            } else if (key.equals("retrywrites")) {
+                retryWrites = parseBoolean(value, "retrywrites");
+            } else if (key.equals("retryreads")) {
+                retryReads = parseBoolean(value, "retryreads");
+            } else if (key.equals("uuidrepresentation")) {
+                uuidRepresentation = createUuidRepresentation(value);
             }
         }
 
+        if (tlsInsecureSet && tlsAllowInvalidHostnamesSet) {
+            throw new IllegalArgumentException("tlsAllowInvalidHostnames or sslInvalidHostnameAllowed set along with tlsInsecure "
+                    + "is not allowed");
+        }
+
         writeConcern = createWriteConcern(optionsMap);
         readPreference = createReadPreference(optionsMap);
+        compressorList = createCompressors(optionsMap);
+    }
+
+    private void initializeSslEnabled(final String key, final String value) {
+        Boolean booleanValue = parseBoolean(value, key);
+        if (sslEnabled != null && !sslEnabled.equals(booleanValue)) {
+            throw new IllegalArgumentException("Conflicting tls and ssl parameter values are not allowed");
+        }
+        sslEnabled = booleanValue;
     }
 
+    private List<MongoCompressor> createCompressors(final Map<String, List<String>> optionsMap) {
+        String compressors = "";
+        Integer zlibCompressionLevel = null;
+
+        for (final String key : COMPRESSOR_KEYS) {
+            String value = getLastValue(optionsMap, key);
+            if (value == null) {
+                continue;
+            }
+
+            if (key.equals("compressors")) {
+                compressors = value;
+            } else if (key.equals("zlibcompressionlevel")) {
+                zlibCompressionLevel = Integer.parseInt(value);
+            }
+        }
+        return buildCompressors(compressors, zlibCompressionLevel);
+    }
+
+    private List<MongoCompressor> buildCompressors(final String compressors, @Nullable final Integer zlibCompressionLevel) {
+        List<MongoCompressor> compressorsList = new ArrayList<MongoCompressor>();
+
+        for (String cur : compressors.split(",")) {
+            if (cur.equals("zlib")) {
+                MongoCompressor zlibCompressor = MongoCompressor.createZlibCompressor();
+                if (zlibCompressionLevel != null) {
+                    zlibCompressor = zlibCompressor.withProperty(MongoCompressor.LEVEL, zlibCompressionLevel);
+                }
+                compressorsList.add(zlibCompressor);
+            } else if (cur.equals("snappy")) {
+                compressorsList.add(MongoCompressor.createSnappyCompressor());
+            } else if (cur.equals("zstd")) {
+                compressorsList.add(MongoCompressor.createZstdCompressor());
+            } else if (!cur.isEmpty()) {
+                throw new IllegalArgumentException("Unsupported compressor '" + cur + "'");
+            }
+        }
+
+        return unmodifiableList(compressorsList);
+    }
+
+    @Nullable
     private WriteConcern createWriteConcern(final Map<String, List<String>> optionsMap) {
-        Boolean safe = null;
         String w = null;
         Integer wTimeout = null;
+        Boolean safe = null;
         Boolean fsync = null;
         Boolean journal = null;
 
@@ -429,9 +639,11 @@ private WriteConcern createWriteConcern(final Map<String, List<String>> optionsM
         return buildWriteConcern(safe, w, wTimeout, fsync, journal);
     }
 
+    @Nullable
     private ReadPreference createReadPreference(final Map<String, List<String>> optionsMap) {
         String readPreferenceType = null;
         List<TagSet> tagSetList = new ArrayList<TagSet>();
+        long maxStalenessSeconds = -1;
 
         for (final String key : READ_PREFERENCE_KEYS) {
             String value = getLastValue(optionsMap, key);
@@ -441,6 +653,8 @@ private ReadPreference createReadPreference(final Map<String, List<String>> opti
 
             if (key.equals("readpreference")) {
                 readPreferenceType = value;
+            } else if (key.equals("maxstalenessseconds")) {
+                 maxStalenessSeconds = parseInteger(value, "maxstalenessseconds");
             } else if (key.equals("readpreferencetags")) {
                 for (final String cur : optionsMap.get(key)) {
                     TagSet tagSet = getTags(cur.trim());
@@ -448,17 +662,33 @@ private ReadPreference createReadPreference(final Map<String, List<String>> opti
                 }
             }
         }
-        return buildReadPreference(readPreferenceType, tagSetList);
+        return buildReadPreference(readPreferenceType, tagSetList, maxStalenessSeconds);
     }
 
-    private MongoCredential createCredentials(final Map<String, List<String>> optionsMap, final String userName,
-                                              final char[] password) {
-        if (userName == null) {
-            return null;
+    private UuidRepresentation createUuidRepresentation(final String value) {
+        if (value.equalsIgnoreCase("unspecified")) {
+            return UuidRepresentation.UNSPECIFIED;
+        }
+        if (value.equalsIgnoreCase("javaLegacy")) {
+            return UuidRepresentation.JAVA_LEGACY;
+        }
+        if (value.equalsIgnoreCase("csharpLegacy")) {
+            return UuidRepresentation.C_SHARP_LEGACY;
+        }
+        if (value.equalsIgnoreCase("pythonLegacy")) {
+            return UuidRepresentation.PYTHON_LEGACY;
         }
+        if (value.equalsIgnoreCase("standard")) {
+            return UuidRepresentation.STANDARD;
+        }
+        throw new IllegalArgumentException("Unknown uuid representation: " + value);
+    }
 
+    @Nullable
+    private MongoCredential createCredentials(final Map<String, List<String>> optionsMap, @Nullable final String userName,
+                                              @Nullable final char[] password) {
         AuthenticationMechanism mechanism = null;
-        String authSource = (database == null) ? "admin" : database;
+        String authSource = null;
         String gssapiServiceName = null;
         String authMechanismProperties = null;
 
@@ -475,33 +705,21 @@ private MongoCredential createCredentials(final Map<String, List<String>> option
                 authSource = value;
             } else if (key.equals("gssapiservicename")) {
                 gssapiServiceName = value;
-            } else if (key.endsWith("authmechanismproperties")) {
+            } else if (key.equals("authmechanismproperties")) {
                 authMechanismProperties = value;
             }
         }
 
-        MongoCredential credential;
-        if (mechanism == GSSAPI) {
-            credential = MongoCredential.createGSSAPICredential(userName);
-            if (gssapiServiceName != null) {
-                credential = credential.withMechanismProperty("SERVICE_NAME", gssapiServiceName);
-            }
-        } else if (mechanism == PLAIN) {
-            credential = MongoCredential.createPlainCredential(userName, authSource, password);
-        } else if (mechanism == MONGODB_CR) {
-            credential = MongoCredential.createMongoCRCredential(userName, authSource, password);
-        } else if (mechanism == MONGODB_X509) {
-            credential = MongoCredential.createMongoX509Credential(userName);
-        } else if (mechanism == SCRAM_SHA_1) {
-            credential = MongoCredential.createScramSha1Credential(userName, authSource, password);
-        } else if (mechanism == null) {
-            credential = MongoCredential.createCredential(userName, authSource, password);
-        } else {
-            throw new UnsupportedOperationException(format("The connection string contains an invalid authentication mechanism'. "
-                    + "'%s' is not a supported authentication mechanism", mechanism));
+
+        MongoCredential credential = null;
+        if (mechanism != null) {
+            credential = createMongoCredentialWithMechanism(mechanism, userName, password, authSource, gssapiServiceName);
+        } else if (userName != null) {
+            credential = MongoCredential.createCredential(userName,
+                    getAuthSourceOrDefault(authSource, database != null ? database : "admin"), password);
         }
 
-        if (authMechanismProperties != null) {
+        if (credential != null && authMechanismProperties != null) {
             for (String part : authMechanismProperties.split(",")) {
                 String[] mechanismPropertyKeyValue = part.split(":");
                 if (mechanismPropertyKeyValue.length != 2) {
@@ -520,6 +738,73 @@ private MongoCredential createCredentials(final Map<String, List<String>> option
         return credential;
     }
 
+    @SuppressWarnings("deprecation")
+    private MongoCredential createMongoCredentialWithMechanism(final AuthenticationMechanism mechanism, final String userName,
+                                                               @Nullable final char[] password,
+                                                               @Nullable final String authSource,
+                                                               @Nullable final String gssapiServiceName) {
+        MongoCredential credential;
+        String mechanismAuthSource;
+        switch (mechanism) {
+            case PLAIN:
+                mechanismAuthSource = getAuthSourceOrDefault(authSource, database != null ? database : "$external");
+                break;
+            case GSSAPI:
+            case MONGODB_X509:
+                mechanismAuthSource = getAuthSourceOrDefault(authSource, "$external");
+                if (!mechanismAuthSource.equals("$external")) {
+                    throw new IllegalArgumentException(format("Invalid authSource for %s, it must be '$external'", mechanism));
+                }
+                break;
+            default:
+                mechanismAuthSource = getAuthSourceOrDefault(authSource, database != null ? database : "admin");
+        }
+
+        switch (mechanism) {
+            case GSSAPI:
+                credential = MongoCredential.createGSSAPICredential(userName);
+                if (gssapiServiceName != null) {
+                    credential = credential.withMechanismProperty("SERVICE_NAME", gssapiServiceName);
+                }
+                if (password != null && LOGGER.isWarnEnabled()) {
+                    LOGGER.warn("Password in connection string not used with MONGODB_X509 authentication mechanism.");
+                }
+                break;
+            case PLAIN:
+                credential = MongoCredential.createPlainCredential(userName, mechanismAuthSource, password);
+                break;
+            case MONGODB_CR:
+                credential = MongoCredential.createMongoCRCredential(userName, mechanismAuthSource, password);
+                break;
+            case MONGODB_X509:
+                if (password != null) {
+                    throw new IllegalArgumentException("Invalid mechanism, MONGODB_x509 does not support passwords");
+                }
+                credential = MongoCredential.createMongoX509Credential(userName);
+                break;
+            case SCRAM_SHA_1:
+                credential = MongoCredential.createScramSha1Credential(userName, mechanismAuthSource, password);
+                break;
+            case SCRAM_SHA_256:
+                credential = MongoCredential.createScramSha256Credential(userName, mechanismAuthSource, password);
+                break;
+            default:
+                throw new UnsupportedOperationException(format("The connection string contains an invalid authentication mechanism'. "
+                                                                       + "'%s' is not a supported authentication mechanism",
+                        mechanism));
+        }
+        return credential;
+    }
+
+    private String getAuthSourceOrDefault(@Nullable final String authSource, final String defaultAuthSource) {
+        if (authSource != null) {
+            return authSource;
+        } else {
+            return defaultAuthSource;
+        }
+    }
+
+    @Nullable
     private String getLastValue(final Map<String, List<String>> optionsMap, final String key) {
         List<String> valueList = optionsMap.get(key);
         if (valueList == null) {
@@ -562,8 +847,9 @@ private Map<String, List<String>> parseOptions(final String optionsPart) {
             }
         }
         // handle legacy slaveok settings
-        if (optionsMap.containsKey("slaveok") && !optionsMap.containsKey("readpreference")) {
-            String readPreference = parseBoolean(getLastValue(optionsMap, "slaveok"), "slaveok")
+        String slaveok = getLastValue(optionsMap, "slaveok");
+        if (slaveok != null && !optionsMap.containsKey("readpreference")) {
+            String readPreference = Boolean.TRUE.equals(parseBoolean(slaveok, "slaveok"))
                                     ? "secondaryPreferred" : "primary";
             optionsMap.put("readpreference", singletonList(readPreference));
             if (LOGGER.isWarnEnabled()) {
@@ -581,20 +867,29 @@ private Map<String, List<String>> parseOptions(final String optionsPart) {
         return optionsMap;
     }
 
-    private ReadPreference buildReadPreference(final String readPreferenceType,
-                                               final List<TagSet> tagSetList) {
+    @Nullable
+    private ReadPreference buildReadPreference(@Nullable final String readPreferenceType,
+                                               final List<TagSet> tagSetList, final long maxStalenessSeconds) {
         if (readPreferenceType != null) {
-            if (tagSetList.isEmpty()) {
+            if (tagSetList.isEmpty() && maxStalenessSeconds == -1) {
                 return ReadPreference.valueOf(readPreferenceType);
+            } else if (maxStalenessSeconds == -1) {
+               return ReadPreference.valueOf(readPreferenceType, tagSetList);
+            } else {
+                return ReadPreference.valueOf(readPreferenceType, tagSetList, maxStalenessSeconds, TimeUnit.SECONDS);
             }
-            return ReadPreference.valueOf(readPreferenceType, tagSetList);
+        } else if (!(tagSetList.isEmpty() && maxStalenessSeconds == -1)) {
+            throw new IllegalArgumentException("Read preference mode must be specified if "
+                                                       + "either read preference tags or max staleness is specified");
         }
         return null;
     }
 
     @SuppressWarnings("deprecation")
-    private WriteConcern buildWriteConcern(final Boolean safe, final String w,
-                                           final Integer wTimeout, final Boolean fsync, final Boolean journal) {
+    @Nullable
+    private WriteConcern buildWriteConcern(@Nullable final Boolean safe, @Nullable final String w,
+                                           @Nullable final Integer wTimeout, @Nullable final Boolean fsync,
+                                           @Nullable final Boolean journal) {
         WriteConcern retVal = null;
         if (w != null || wTimeout != null || fsync != null || journal != null) {
             if (w == null) {
@@ -641,16 +936,30 @@ private TagSet getTags(final String tagSetString) {
         return new TagSet(tagList);
     }
 
-    private boolean parseBoolean(final String input, final String key) {
-        String trimmedInput = input.trim();
-        boolean isTrue = trimmedInput.length() > 0 && (trimmedInput.equals("1") || trimmedInput.toLowerCase().equals("true")
-                || trimmedInput.toLowerCase().equals("yes"));
+    private static final Set<String> TRUE_VALUES = new HashSet<String>(asList("true", "yes", "1"));
+    private static final Set<String> FALSE_VALUES = new HashSet<String>(asList("false", "no", "0"));
+
+    @Nullable
+    private Boolean parseBoolean(final String input, final String key) {
+        String trimmedInput = input.trim().toLowerCase();
 
-        if ((!input.equals("true") && !input.equals("false")) && LOGGER.isWarnEnabled()) {
-            LOGGER.warn(format("Deprecated boolean value ('%s') in the connection string for '%s', please update to %s=%s",
-                    input, key, key, isTrue));
+        if (TRUE_VALUES.contains(trimmedInput)) {
+            if (!trimmedInput.equals("true")) {
+                LOGGER.warn(format("Deprecated boolean value '%s' in the connection string for '%s'. Replace with 'true'",
+                        trimmedInput, key));
+            }
+            return true;
+        } else if (FALSE_VALUES.contains(trimmedInput)) {
+            if (!trimmedInput.equals("false")) {
+                LOGGER.warn(format("Deprecated boolean value '%s' in the connection string for '%s'. Replace with'false'",
+                        trimmedInput, key));
+            }
+            return false;
+        } else {
+            LOGGER.warn(format("Ignoring unrecognized boolean value '%s' in the connection string for '%s'. "
+                    + "Replace with either 'true' or 'false'", trimmedInput, key));
+            return null;
         }
-        return isTrue;
     }
 
     private int parseInteger(final String input, final String key) {
@@ -671,8 +980,7 @@ private List<String> parseHosts(final List<String> rawHosts) {
             if (host.length() == 0) {
                 throw new IllegalArgumentException(format("The connection string contains an empty host '%s'. ", rawHosts));
             } else if (host.endsWith(".sock")) {
-                throw new IllegalArgumentException(format("The connection string contains an invalid host '%s'. "
-                        + "Unix Domain Socket which is not supported by the Java driver", host));
+                host = urldecode(host);
             } else if (host.startsWith("[")) {
                 if (!host.contains("]")) {
                     throw new IllegalArgumentException(format("The connection string contains an invalid host '%s'. "
@@ -742,8 +1050,9 @@ private String urldecode(final String input, final boolean password) {
      *
      * @return the username
      */
+    @Nullable
     public String getUsername() {
-        return credentials != null ? credentials.getUserName() : null;
+        return credential != null ? credential.getUserName() : null;
     }
 
     /**
@@ -751,8 +1060,18 @@ public String getUsername() {
      *
      * @return the password
      */
+    @Nullable
     public char[] getPassword() {
-        return credentials != null ? credentials.getPassword() : null;
+        return credential != null ? credential.getPassword() : null;
+    }
+
+    /**
+     * Returns true if the connection string requires SRV protocol to resolve the host lists from the configured host.
+     *
+     * @return true if SRV protocol is required to resolve hosts.
+     */
+    public boolean isSrvProtocol() {
+        return isSrvProtocol;
     }
 
     /**
@@ -769,6 +1088,7 @@ public List<String> getHosts() {
      *
      * @return the database name
      */
+    @Nullable
     public String getDatabase() {
         return database;
     }
@@ -779,6 +1099,7 @@ public String getDatabase() {
      *
      * @return the collection name
      */
+    @Nullable
     public String getCollection() {
         return collection;
     }
@@ -806,18 +1127,32 @@ public String getConnectionString() {
 
 
     /**
-     * Gets the credentials.
+     * Gets the credentials in an immutable list.  The list will be empty if no credentials were specified in the connection string.
      *
-     * @return the credentials
+     * @return the credentials in an immutable list
+     * @deprecated Prefer {@link #getCredential()}
      */
+    @Deprecated
     public List<MongoCredential> getCredentialList() {
-        return credentials != null ? asList(credentials) : new ArrayList<MongoCredential>();
+        return credential != null ? singletonList(credential) : Collections.<MongoCredential>emptyList();
+    }
+
+    /**
+     * Gets the credential or null if no credentials were specified in the connection string.
+     *
+     * @return the credentials in an immutable list
+     * @since 3.6
+     */
+    @Nullable
+    public MongoCredential getCredential() {
+        return credential;
     }
 
     /**
      * Gets the read preference specified in the connection string.
      * @return the read preference
      */
+    @Nullable
     public ReadPreference getReadPreference() {
         return readPreference;
     }
@@ -826,6 +1161,7 @@ public ReadPreference getReadPreference() {
      * Gets the read concern specified in the connection string.
      * @return the read concern
      */
+    @Nullable
     public ReadConcern getReadConcern() {
         return readConcern;
     }
@@ -834,14 +1170,57 @@ public ReadConcern getReadConcern() {
      * Gets the write concern specified in the connection string.
      * @return the write concern
      */
+    @Nullable
     public WriteConcern getWriteConcern() {
         return writeConcern;
     }
 
+    /**
+     * Returns true if writes should be retried if they fail due to a network error, and false otherwise
+     *
+     * <p>Starting with the 3.11.0 release, the default value is true</p>
+     *
+     * @return the retryWrites value, or true if unset
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated Prefer {@link #getRetryWritesValue()}
+     */
+    @Deprecated
+    public boolean getRetryWrites() {
+        return retryWrites == null ? true : retryWrites;
+    }
+
+    /**
+     * <p>Gets whether writes should be retried if they fail due to a network error</p>
+     *
+     * The name of this method differs from others in this class so as not to conflict with the deprecated (and soon to be removed)
+     * {@link #getRetryWrites()} method, which returns a primitive {@code boolean} value, which doesn't allow callers to differentiate
+     * between a false value and an unset value.
+     *
+     * @return the retryWrites value, or null if unset
+     * @since 3.9
+     * @mongodb.server.release 3.6
+     */
+    public Boolean getRetryWritesValue() {
+        return retryWrites;
+    }
+
+    /**
+     * <p>Gets whether reads should be retried if they fail due to a network error</p>
+     *
+     * @return the retryWrites value
+     * @since 3.11
+     * @mongodb.server.release 3.6
+     */
+    public Boolean getRetryReads() {
+        return retryReads;
+    }
+
     /**
      * Gets the minimum connection pool size specified in the connection string.
      * @return the minimum connection pool size
      */
+    @Nullable
     public Integer getMinConnectionPoolSize() {
         return minConnectionPoolSize;
     }
@@ -850,6 +1229,7 @@ public Integer getMinConnectionPoolSize() {
      * Gets the maximum connection pool size specified in the connection string.
      * @return the maximum connection pool size
      */
+    @Nullable
     public Integer getMaxConnectionPoolSize() {
         return maxConnectionPoolSize;
     }
@@ -857,7 +1237,10 @@ public Integer getMaxConnectionPoolSize() {
     /**
      * Gets the multiplier for the number of threads allowed to block waiting for a connection specified in the connection string.
      * @return the multiplier for the number of threads allowed to block waiting for a connection
+     * @deprecated in the next major release, wait queue size limitations will be removed
      */
+    @Deprecated
+    @Nullable
     public Integer getThreadsAllowedToBlockForConnectionMultiplier() {
         return threadsAllowedToBlockForConnectionMultiplier;
     }
@@ -866,6 +1249,7 @@ public Integer getThreadsAllowedToBlockForConnectionMultiplier() {
      * Gets the maximum wait time of a thread waiting for a connection specified in the connection string.
      * @return the maximum wait time of a thread waiting for a connection
      */
+    @Nullable
     public Integer getMaxWaitTime() {
         return maxWaitTime;
     }
@@ -874,6 +1258,7 @@ public Integer getMaxWaitTime() {
      * Gets the maximum connection idle time specified in the connection string.
      * @return the maximum connection idle time
      */
+    @Nullable
     public Integer getMaxConnectionIdleTime() {
         return maxConnectionIdleTime;
     }
@@ -882,6 +1267,7 @@ public Integer getMaxConnectionIdleTime() {
      * Gets the maximum connection life time specified in the connection string.
      * @return the maximum connection life time
      */
+    @Nullable
     public Integer getMaxConnectionLifeTime() {
         return maxConnectionLifeTime;
     }
@@ -890,6 +1276,7 @@ public Integer getMaxConnectionLifeTime() {
      * Gets the socket connect timeout specified in the connection string.
      * @return the socket connect timeout
      */
+    @Nullable
     public Integer getConnectTimeout() {
         return connectTimeout;
     }
@@ -898,6 +1285,7 @@ public Integer getConnectTimeout() {
      * Gets the socket timeout specified in the connection string.
      * @return the socket timeout
      */
+    @Nullable
     public Integer getSocketTimeout() {
         return socketTimeout;
     }
@@ -906,6 +1294,7 @@ public Integer getSocketTimeout() {
      * Gets the SSL enabled value specified in the connection string.
      * @return the SSL enabled value
      */
+    @Nullable
     public Boolean getSslEnabled() {
         return sslEnabled;
     }
@@ -914,7 +1303,11 @@ public Boolean getSslEnabled() {
      * Gets the stream type value specified in the connection string.
      * @return the stream type value
      * @since 3.3
+     * @deprecated Use {@link MongoClientSettings.Builder#streamFactoryFactory(StreamFactoryFactory)} to configure the stream type
+     * programmatically
      */
+    @Deprecated
+    @Nullable
     public String getStreamType() {
         return streamType;
     }
@@ -925,6 +1318,7 @@ public String getStreamType() {
      * @return the SSL invalidHostnameAllowed value
      * @since 3.3
      */
+    @Nullable
     public Boolean getSslInvalidHostnameAllowed() {
         return sslInvalidHostnameAllowed;
     }
@@ -933,6 +1327,7 @@ public Boolean getSslInvalidHostnameAllowed() {
      * Gets the required replica set name specified in the connection string.
      * @return the required replica set name
      */
+    @Nullable
     public String getRequiredReplicaSetName() {
         return requiredReplicaSetName;
     }
@@ -942,6 +1337,7 @@ public String getRequiredReplicaSetName() {
      * @return the server selection timeout (in milliseconds), or null if unset
      * @since 3.3
      */
+    @Nullable
     public Integer getServerSelectionTimeout() {
         return serverSelectionTimeout;
     }
@@ -951,6 +1347,7 @@ public Integer getServerSelectionTimeout() {
      * @return the local threshold (in milliseconds), or null if unset
      * since 3.3
      */
+    @Nullable
     public Integer getLocalThreshold() {
         return localThreshold;
     }
@@ -960,10 +1357,48 @@ public Integer getLocalThreshold() {
      * @return the heartbeat frequency (in milliseconds), or null if unset
      * since 3.3
      */
+    @Nullable
     public Integer getHeartbeatFrequency() {
         return heartbeatFrequency;
     }
 
+    /**
+     * Gets the logical name of the application.  The application name may be used by the client to identify the application to the server,
+     * for use in server logs, slow query logs, and profile collection.
+     *
+     * <p>Default is null.</p>
+     *
+     * @return the application name, which may be null
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    /**
+     * Gets the list of compressors.
+     *
+     * @return the non-null list of compressors
+     * @since 3.6
+     */
+    public List<MongoCompressor> getCompressorList() {
+        return compressorList;
+    }
+
+    /**
+     * Gets the UUID representation.
+     *
+     * <p>Default is null.</p>
+     *
+     * @return the UUID representation, which may be null if it was unspecified
+     * @since 3.12
+     */
+    @Nullable
+    public UuidRepresentation getUuidRepresentation() {
+        return uuidRepresentation;
+    }
 
     @Override
     public String toString() {
@@ -987,7 +1422,7 @@ public boolean equals(final Object o) {
         if (connectTimeout != null ? !connectTimeout.equals(that.connectTimeout) : that.connectTimeout != null) {
             return false;
         }
-        if (credentials != null ? !credentials.equals(that.credentials) : that.credentials != null) {
+        if (credential != null ? !credential.equals(that.credential) : that.credential != null) {
             return false;
         }
         if (database != null ? !database.equals(that.database) : that.database != null) {
@@ -1036,13 +1471,19 @@ public boolean equals(final Object o) {
         if (writeConcern != null ? !writeConcern.equals(that.writeConcern) : that.writeConcern != null) {
             return false;
         }
+        if (applicationName != null ? !applicationName.equals(that.applicationName) : that.applicationName != null) {
+            return false;
+        }
+        if (!compressorList.equals(that.compressorList)) {
+            return false;
+        }
 
         return true;
     }
 
     @Override
     public int hashCode() {
-        int result = credentials != null ? credentials.hashCode() : 0;
+        int result = credential != null ? credential.hashCode() : 0;
         result = 31 * result + hosts.hashCode();
         result = 31 * result + (database != null ? database.hashCode() : 0);
         result = 31 * result + (collection != null ? collection.hashCode() : 0);
@@ -1060,6 +1501,8 @@ public int hashCode() {
         result = 31 * result + (socketTimeout != null ? socketTimeout.hashCode() : 0);
         result = 31 * result + (sslEnabled != null ? sslEnabled.hashCode() : 0);
         result = 31 * result + (requiredReplicaSetName != null ? requiredReplicaSetName.hashCode() : 0);
+        result = 31 * result + (applicationName != null ? applicationName.hashCode() : 0);
+        result = 31 * result + compressorList.hashCode();
         return result;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/CursorType.java b/driver-core/src/main/com/mongodb/CursorType.java
index 347db87c3dd..8511a77f73e 100644
--- a/driver-core/src/main/com/mongodb/CursorType.java
+++ b/driver-core/src/main/com/mongodb/CursorType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBObject.java b/driver-core/src/main/com/mongodb/DBObject.java
similarity index 96%
rename from driver/src/main/com/mongodb/DBObject.java
rename to driver-core/src/main/com/mongodb/DBObject.java
index fa71e82e320..0986e9464d7 100644
--- a/driver/src/main/com/mongodb/DBObject.java
+++ b/driver-core/src/main/com/mongodb/DBObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/DBObjectCodec.java b/driver-core/src/main/com/mongodb/DBObjectCodec.java
new file mode 100644
index 00000000000..a86b1a01ade
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/DBObjectCodec.java
@@ -0,0 +1,419 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.lang.Nullable;
+import org.bson.BSONObject;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonDbPointer;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.BsonValue;
+import org.bson.BsonWriter;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.BsonTypeClassMap;
+import org.bson.codecs.BsonTypeCodecMap;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.CollectibleCodec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.IdGenerator;
+import org.bson.codecs.ObjectIdGenerator;
+import org.bson.codecs.OverridableUuidRepresentationCodec;
+import org.bson.codecs.ValueCodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.types.BSONTimestamp;
+import org.bson.types.Binary;
+import org.bson.types.CodeWScope;
+import org.bson.types.Symbol;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Arrays.asList;
+import static org.bson.BsonBinarySubType.BINARY;
+import static org.bson.BsonBinarySubType.OLD_BINARY;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+/**
+ * A collectible codec for a DBObject.
+ *
+ * @since 3.0
+ */
+@SuppressWarnings({"rawtypes", "deprecation"})
+public class DBObjectCodec implements CollectibleCodec<DBObject>, OverridableUuidRepresentationCodec<DBObject> {
+    private static final BsonTypeClassMap DEFAULT_BSON_TYPE_CLASS_MAP = createDefaultBsonTypeClassMap();
+    private static final CodecRegistry DEFAULT_REGISTRY =
+            fromProviders(asList(new ValueCodecProvider(), new BsonValueCodecProvider(), new DBObjectCodecProvider()));
+
+    private static final String ID_FIELD_NAME = "_id";
+
+    private final CodecRegistry codecRegistry;
+    private final BsonTypeCodecMap bsonTypeCodecMap;
+    private final DBObjectFactory objectFactory;
+    private final IdGenerator idGenerator = new ObjectIdGenerator();
+    private final UuidRepresentation uuidRepresentation;
+
+    private static BsonTypeClassMap createDefaultBsonTypeClassMap() {
+        Map<BsonType, Class<?>> replacements = new HashMap<BsonType, Class<?>>();
+        replacements.put(BsonType.REGULAR_EXPRESSION, Pattern.class);
+        replacements.put(BsonType.SYMBOL, String.class);
+        replacements.put(BsonType.TIMESTAMP, BSONTimestamp.class);
+        replacements.put(BsonType.JAVASCRIPT_WITH_SCOPE, null);
+        replacements.put(BsonType.DOCUMENT, null);
+
+        return new BsonTypeClassMap(replacements);
+    }
+
+    static BsonTypeClassMap getDefaultBsonTypeClassMap() {
+        return DEFAULT_BSON_TYPE_CLASS_MAP;
+    }
+
+    static CodecRegistry getDefaultRegistry() {
+        return DEFAULT_REGISTRY;
+    }
+
+    /**
+     * Construct an instance with the default codec registry
+     *
+     * @since 3.7
+     */
+    public DBObjectCodec() {
+        this(DEFAULT_REGISTRY);
+    }
+
+    /**
+     * Construct an instance with the given codec registry.
+     *
+     * @param codecRegistry the non-null codec registry
+     */
+    public DBObjectCodec(final CodecRegistry codecRegistry) {
+        this(codecRegistry, DEFAULT_BSON_TYPE_CLASS_MAP);
+    }
+
+    /**
+     * Construct an instance.
+     *
+     * @param codecRegistry the codec registry
+     * @param bsonTypeClassMap the non-null BsonTypeClassMap
+     */
+    public DBObjectCodec(final CodecRegistry codecRegistry, final BsonTypeClassMap bsonTypeClassMap) {
+        this(codecRegistry, bsonTypeClassMap, new BasicDBObjectFactory());
+    }
+
+    /**
+     * Construct an instance.
+     *
+     *  @param codecRegistry the non-null codec registry
+     * @param bsonTypeClassMap the non-null BsonTypeClassMap
+     * @param objectFactory the non-null object factory used to create empty DBObject instances when decoding
+     */
+    public DBObjectCodec(final CodecRegistry codecRegistry, final BsonTypeClassMap bsonTypeClassMap, final DBObjectFactory objectFactory) {
+        this(codecRegistry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), codecRegistry), objectFactory,
+                UuidRepresentation.JAVA_LEGACY);
+    }
+
+    private DBObjectCodec(final CodecRegistry codecRegistry, final BsonTypeCodecMap bsonTypeCodecMap, final DBObjectFactory objectFactory,
+                         final UuidRepresentation uuidRepresentation) {
+        this.objectFactory = notNull("objectFactory", objectFactory);
+        this.codecRegistry = notNull("codecRegistry", codecRegistry);
+        this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
+        this.bsonTypeCodecMap = bsonTypeCodecMap;
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final DBObject document, final EncoderContext encoderContext) {
+        writer.writeStartDocument();
+
+        beforeFields(writer, encoderContext, document);
+
+        for (final String key : document.keySet()) {
+            if (skipField(encoderContext, key)) {
+                continue;
+            }
+            writer.writeName(key);
+            writeValue(writer, encoderContext, document.get(key));
+        }
+        writer.writeEndDocument();
+    }
+
+    @Override
+    public DBObject decode(final BsonReader reader, final DecoderContext decoderContext) {
+        List<String> path = new ArrayList<String>(10);
+        return readDocument(reader, decoderContext, path);
+    }
+
+    @Override
+    public Class<DBObject> getEncoderClass() {
+        return DBObject.class;
+    }
+
+    @Override
+    public boolean documentHasId(final DBObject document) {
+        return document.containsField(ID_FIELD_NAME);
+    }
+
+    @Override
+    public BsonValue getDocumentId(final DBObject document) {
+        if (!documentHasId(document)) {
+            throw new IllegalStateException("The document does not contain an _id");
+        }
+
+        Object id = document.get(ID_FIELD_NAME);
+        if (id instanceof BsonValue) {
+            return (BsonValue) id;
+        }
+
+        BsonDocument idHoldingDocument = new BsonDocument();
+        BsonWriter writer = new BsonDocumentWriter(idHoldingDocument);
+        writer.writeStartDocument();
+        writer.writeName(ID_FIELD_NAME);
+        writeValue(writer, EncoderContext.builder().build(), id);
+        writer.writeEndDocument();
+        return idHoldingDocument.get(ID_FIELD_NAME);
+    }
+
+    @Override
+    public DBObject generateIdIfAbsentFromDocument(final DBObject document) {
+        if (!documentHasId(document)) {
+            document.put(ID_FIELD_NAME, idGenerator.generate());
+        }
+        return document;
+    }
+
+    @Override
+    public Codec<DBObject> withUuidRepresentation(final UuidRepresentation uuidRepresentation) {
+        return new DBObjectCodec(codecRegistry, bsonTypeCodecMap, objectFactory, uuidRepresentation);
+    }
+
+    private void beforeFields(final BsonWriter bsonWriter, final EncoderContext encoderContext, final DBObject document) {
+        if (encoderContext.isEncodingCollectibleDocument() && document.containsField(ID_FIELD_NAME)) {
+            bsonWriter.writeName(ID_FIELD_NAME);
+            writeValue(bsonWriter, encoderContext, document.get(ID_FIELD_NAME));
+        }
+    }
+
+    private boolean skipField(final EncoderContext encoderContext, final String key) {
+        return encoderContext.isEncodingCollectibleDocument() && key.equals(ID_FIELD_NAME);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void writeValue(final BsonWriter bsonWriter, final EncoderContext encoderContext, final Object initialValue) {
+        Object value = org.bson.BSON.applyEncodingHooks(initialValue);
+        if (value == null) {
+            bsonWriter.writeNull();
+        } else if (value instanceof DBRef) {
+            encodeDBRef(bsonWriter, (DBRef) value, encoderContext);
+        } else if (value instanceof Map) {
+            encodeMap(bsonWriter, (Map<String, Object>) value, encoderContext);
+        } else if (value instanceof Iterable) {
+            encodeIterable(bsonWriter, (Iterable) value, encoderContext);
+        } else if (value instanceof BSONObject) {
+            encodeBsonObject(bsonWriter, (BSONObject) value, encoderContext);
+        } else if (value instanceof CodeWScope) {
+            encodeCodeWScope(bsonWriter, (CodeWScope) value, encoderContext);
+        } else if (value instanceof byte[]) {
+            encodeByteArray(bsonWriter, (byte[]) value);
+        } else if (value.getClass().isArray()) {
+            encodeArray(bsonWriter, value, encoderContext);
+        } else if (value instanceof Symbol) {
+            bsonWriter.writeSymbol(((Symbol) value).getSymbol());
+        } else {
+            Codec codec = codecRegistry.get(value.getClass());
+            encoderContext.encodeWithChildContext(codec, bsonWriter, value);
+        }
+    }
+
+    private void encodeMap(final BsonWriter bsonWriter, final Map<String, Object> document, final EncoderContext encoderContext) {
+        bsonWriter.writeStartDocument();
+
+        for (final Map.Entry<String, Object> entry : document.entrySet()) {
+            bsonWriter.writeName(entry.getKey());
+            writeValue(bsonWriter, encoderContext.getChildContext(), entry.getValue());
+        }
+        bsonWriter.writeEndDocument();
+    }
+
+    private void encodeBsonObject(final BsonWriter bsonWriter, final BSONObject document, final EncoderContext encoderContext) {
+        bsonWriter.writeStartDocument();
+
+        for (String key : document.keySet()) {
+            bsonWriter.writeName(key);
+            writeValue(bsonWriter, encoderContext.getChildContext(), document.get(key));
+        }
+        bsonWriter.writeEndDocument();
+    }
+
+    private void encodeByteArray(final BsonWriter bsonWriter, final byte[] value) {
+        bsonWriter.writeBinaryData(new BsonBinary(value));
+    }
+
+    private void encodeArray(final BsonWriter bsonWriter, final Object value, final EncoderContext encoderContext) {
+        bsonWriter.writeStartArray();
+
+        int size = Array.getLength(value);
+        for (int i = 0; i < size; i++) {
+            writeValue(bsonWriter, encoderContext.getChildContext(), Array.get(value, i));
+        }
+
+        bsonWriter.writeEndArray();
+    }
+
+    private void encodeDBRef(final BsonWriter bsonWriter, final DBRef dbRef, final EncoderContext encoderContext) {
+        bsonWriter.writeStartDocument();
+
+        bsonWriter.writeString("$ref", dbRef.getCollectionName());
+        bsonWriter.writeName("$id");
+        writeValue(bsonWriter, encoderContext.getChildContext(), dbRef.getId());
+        if (dbRef.getDatabaseName() != null) {
+            bsonWriter.writeString("$db", dbRef.getDatabaseName());
+        }
+        bsonWriter.writeEndDocument();
+    }
+
+    private void encodeCodeWScope(final BsonWriter bsonWriter, final CodeWScope value, final EncoderContext encoderContext) {
+        bsonWriter.writeJavaScriptWithScope(value.getCode());
+        encodeBsonObject(bsonWriter, value.getScope(), encoderContext.getChildContext());
+    }
+
+    private void encodeIterable(final BsonWriter bsonWriter, final Iterable iterable, final EncoderContext encoderContext) {
+        bsonWriter.writeStartArray();
+        for (final Object cur : iterable) {
+            writeValue(bsonWriter, encoderContext.getChildContext(), cur);
+        }
+        bsonWriter.writeEndArray();
+    }
+
+    private Object readValue(final BsonReader reader, final DecoderContext decoderContext, @Nullable final String fieldName,
+                             final List<String> path) {
+        Object initialRetVal;
+        BsonType bsonType = reader.getCurrentBsonType();
+
+        if (bsonType.isContainer() && fieldName != null) {
+            //if we got into some new context like nested document or array
+            path.add(fieldName);
+        }
+
+        switch (bsonType) {
+            case DOCUMENT:
+                initialRetVal = verifyForDBRef(readDocument(reader, decoderContext, path));
+                break;
+            case ARRAY:
+                initialRetVal = readArray(reader, decoderContext, path);
+                break;
+            case JAVASCRIPT_WITH_SCOPE: //custom for driver-compat types
+                initialRetVal = readCodeWScope(reader, decoderContext, path);
+                break;
+            case DB_POINTER: //custom for driver-compat types
+                BsonDbPointer dbPointer = reader.readDBPointer();
+                initialRetVal = new DBRef(dbPointer.getNamespace(), dbPointer.getId());
+                break;
+            case BINARY:
+                initialRetVal = readBinary(reader, decoderContext);
+                break;
+            case NULL:
+                reader.readNull();
+                initialRetVal = null;
+                break;
+            default:
+                initialRetVal = bsonTypeCodecMap.get(bsonType).decode(reader, decoderContext);
+        }
+
+        if (bsonType.isContainer() && fieldName != null) {
+            //step out of current context to a parent
+            path.remove(fieldName);
+        }
+
+        return org.bson.BSON.applyDecodingHooks(initialRetVal);
+    }
+
+    private Object readBinary(final BsonReader reader, final DecoderContext decoderContext) {
+        byte bsonBinarySubType = reader.peekBinarySubType();
+        Codec<?> codec;
+
+        if (BsonBinarySubType.isUuid(bsonBinarySubType) && reader.peekBinarySize() == 16) {
+            codec = codecRegistry.get(Binary.class);
+            switch (bsonBinarySubType) {
+                case 3:
+                    if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY
+                            || uuidRepresentation == UuidRepresentation.C_SHARP_LEGACY
+                            || uuidRepresentation == UuidRepresentation.PYTHON_LEGACY) {
+                        codec = codecRegistry.get(UUID.class);
+                    }
+                    break;
+                case 4:
+                    if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY || uuidRepresentation == UuidRepresentation.STANDARD) {
+                        codec = codecRegistry.get(UUID.class);
+                    }
+                    break;
+                default:
+                    throw new UnsupportedOperationException("Unknown UUID binary subtype " + bsonBinarySubType);
+            }
+        } else if (bsonBinarySubType == BINARY.getValue() || bsonBinarySubType == OLD_BINARY.getValue()) {
+            codec = codecRegistry.get(byte[].class);
+        } else {
+            codec =  codecRegistry.get(Binary.class);
+        }
+        return codec.decode(reader, decoderContext);
+    }
+
+    private List readArray(final BsonReader reader, final DecoderContext decoderContext, final List<String> path) {
+        reader.readStartArray();
+        BasicDBList list = new BasicDBList();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            list.add(readValue(reader, decoderContext, null, path));
+        }
+        reader.readEndArray();
+        return list;
+    }
+
+    private DBObject readDocument(final BsonReader reader, final DecoderContext decoderContext, final List<String> path) {
+        DBObject document = objectFactory.getInstance(path);
+
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String fieldName = reader.readName();
+            document.put(fieldName, readValue(reader, decoderContext, fieldName, path));
+        }
+
+        reader.readEndDocument();
+        return document;
+    }
+
+    private CodeWScope readCodeWScope(final BsonReader reader, final DecoderContext decoderContext, final List<String> path) {
+        return new CodeWScope(reader.readJavaScriptWithScope(), readDocument(reader, decoderContext, path));
+    }
+
+    private Object verifyForDBRef(final DBObject document) {
+        if (document.containsField("$ref") && document.containsField("$id")) {
+            return new DBRef((String) document.get("$db"), (String) document.get("$ref"), document.get("$id"));
+        } else {
+            return document;
+        }
+    }
+}
+
diff --git a/driver/src/main/com/mongodb/DBObjectCodecProvider.java b/driver-core/src/main/com/mongodb/DBObjectCodecProvider.java
similarity index 88%
rename from driver/src/main/com/mongodb/DBObjectCodecProvider.java
rename to driver-core/src/main/com/mongodb/DBObjectCodecProvider.java
index da02ce00142..4aa1798792d 100644
--- a/driver/src/main/com/mongodb/DBObjectCodecProvider.java
+++ b/driver-core/src/main/com/mongodb/DBObjectCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@
 import org.bson.types.BSONTimestamp;
 
 import java.util.Date;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * A provider for a DBObjectCodec.
@@ -48,7 +51,7 @@ public DBObjectCodecProvider() {
      * @param bsonTypeClassMap the BsonTypeClassMap
      */
     public DBObjectCodecProvider(final BsonTypeClassMap bsonTypeClassMap) {
-        this.bsonTypeClassMap = bsonTypeClassMap;
+        this.bsonTypeClassMap = notNull("bsonTypeClassMap", bsonTypeClassMap);
     }
 
     @Override
@@ -58,7 +61,7 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
             return (Codec<T>) new BSONTimestampCodec();
         }
 
-        if (DBObject.class.isAssignableFrom(clazz)) {
+        if (DBObject.class.isAssignableFrom(clazz) && !List.class.isAssignableFrom(clazz)) {
             return (Codec<T>) new DBObjectCodec(registry, bsonTypeClassMap);
         }
 
diff --git a/driver/src/main/com/mongodb/DBObjectFactory.java b/driver-core/src/main/com/mongodb/DBObjectFactory.java
similarity index 94%
rename from driver/src/main/com/mongodb/DBObjectFactory.java
rename to driver-core/src/main/com/mongodb/DBObjectFactory.java
index 426bb10b7c7..4798eb6f040 100644
--- a/driver/src/main/com/mongodb/DBObjectFactory.java
+++ b/driver-core/src/main/com/mongodb/DBObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBRef.java b/driver-core/src/main/com/mongodb/DBRef.java
similarity index 92%
rename from driver/src/main/com/mongodb/DBRef.java
rename to driver-core/src/main/com/mongodb/DBRef.java
index b4bc32a1055..369a4ed7485 100644
--- a/driver/src/main/com/mongodb/DBRef.java
+++ b/driver-core/src/main/com/mongodb/DBRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
 import java.io.Serializable;
 
 import static com.mongodb.assertions.Assertions.notNull;
@@ -53,9 +55,9 @@ public DBRef(final String collectionName, final Object id) {
      * @param id             the object id
      * @since 3.3
      */
-    public DBRef(final String databaseName, final String collectionName, final Object id) {
+    public DBRef(@Nullable final String databaseName, final String collectionName, final Object id) {
         this.id = notNull("id", id);
-        this.collectionName = notNull("ns", collectionName);
+        this.collectionName = notNull("collectionName", collectionName);
         this.databaseName = databaseName;
     }
 
@@ -84,6 +86,7 @@ public String getCollectionName() {
      * @return the possibly-null database name
      * @since 3.3
      */
+    @Nullable
     public String getDatabaseName() {
         return databaseName;
     }
@@ -123,7 +126,7 @@ public int hashCode() {
     @Override
     public String toString() {
         return "{ "
-                       + "\"$ref\" : \"" + collectionName + "\", \"$id\" : \"" + id + ""
+                       + "\"$ref\" : \"" + collectionName + "\", \"$id\" : \"" + id + "\""
                        + (databaseName == null ? "" : ", \"$db\" : \"" + databaseName + "\"")
                        + " }";
     }
diff --git a/driver/src/main/com/mongodb/DBRefCodec.java b/driver-core/src/main/com/mongodb/DBRefCodec.java
similarity index 98%
rename from driver/src/main/com/mongodb/DBRefCodec.java
rename to driver-core/src/main/com/mongodb/DBRefCodec.java
index c03fea9b194..b0091a8ff7e 100644
--- a/driver/src/main/com/mongodb/DBRefCodec.java
+++ b/driver-core/src/main/com/mongodb/DBRefCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBRefCodecProvider.java b/driver-core/src/main/com/mongodb/DBRefCodecProvider.java
similarity index 97%
rename from driver/src/main/com/mongodb/DBRefCodecProvider.java
rename to driver-core/src/main/com/mongodb/DBRefCodecProvider.java
index e1f0f980607..08dd5985bb6 100644
--- a/driver/src/main/com/mongodb/DBRefCodecProvider.java
+++ b/driver-core/src/main/com/mongodb/DBRefCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DocumentToDBRefTransformer.java b/driver-core/src/main/com/mongodb/DocumentToDBRefTransformer.java
similarity index 83%
rename from driver/src/main/com/mongodb/DocumentToDBRefTransformer.java
rename to driver-core/src/main/com/mongodb/DocumentToDBRefTransformer.java
index f23b51df0cd..0b4d53515fd 100644
--- a/driver/src/main/com/mongodb/DocumentToDBRefTransformer.java
+++ b/driver-core/src/main/com/mongodb/DocumentToDBRefTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,14 @@
 import org.bson.Document;
 import org.bson.Transformer;
 
-final class DocumentToDBRefTransformer implements Transformer {
+/**
+ * A Document to DBRef Transformer.
+ *
+ * Can be used with any {@link org.bson.codecs.Codec} that takes a {@link Transformer}.
+ *
+ * @since 3.5
+ */
+public final class DocumentToDBRefTransformer implements Transformer {
     @Override
     public Object transform(final Object value) {
         if (value instanceof Document) {
diff --git a/driver-core/src/main/com/mongodb/DuplicateKeyException.java b/driver-core/src/main/com/mongodb/DuplicateKeyException.java
index dcb944ebdf9..c3bb543037b 100644
--- a/driver-core/src/main/com/mongodb/DuplicateKeyException.java
+++ b/driver-core/src/main/com/mongodb/DuplicateKeyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/ErrorCategory.java b/driver-core/src/main/com/mongodb/ErrorCategory.java
index 6b85f5f7ba2..b7766a10a0a 100644
--- a/driver-core/src/main/com/mongodb/ErrorCategory.java
+++ b/driver-core/src/main/com/mongodb/ErrorCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/ExplainVerbosity.java b/driver-core/src/main/com/mongodb/ExplainVerbosity.java
index 8ba187de496..bea9ef75800 100644
--- a/driver-core/src/main/com/mongodb/ExplainVerbosity.java
+++ b/driver-core/src/main/com/mongodb/ExplainVerbosity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/Function.java b/driver-core/src/main/com/mongodb/Function.java
index 85dfeba3f8b..7595687cfbd 100644
--- a/driver-core/src/main/com/mongodb/Function.java
+++ b/driver-core/src/main/com/mongodb/Function.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoBulkWriteException.java b/driver-core/src/main/com/mongodb/MongoBulkWriteException.java
index 3e9a7b3832c..056fbf19476 100644
--- a/driver-core/src/main/com/mongodb/MongoBulkWriteException.java
+++ b/driver-core/src/main/com/mongodb/MongoBulkWriteException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import com.mongodb.bulk.BulkWriteError;
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.bulk.WriteConcernError;
+import com.mongodb.lang.Nullable;
 
 import java.util.List;
 
@@ -45,7 +46,7 @@ public class MongoBulkWriteException extends MongoServerException {
      * @param serverAddress            the server address.
      */
     public MongoBulkWriteException(final BulkWriteResult writeResult, final List<BulkWriteError> writeErrors,
-                                   final WriteConcernError writeConcernError, final ServerAddress serverAddress) {
+                                   @Nullable final WriteConcernError writeConcernError, final ServerAddress serverAddress) {
         super("Bulk write operation error on server " + serverAddress + ". "
               + (writeErrors.isEmpty() ? "" : "Write errors: " + writeErrors + ". ")
               + (writeConcernError == null ? "" : "Write concern error: " + writeConcernError + ". "), serverAddress);
diff --git a/driver-core/src/main/com/mongodb/MongoChangeStreamException.java b/driver-core/src/main/com/mongodb/MongoChangeStreamException.java
new file mode 100644
index 00000000000..b3a363d2797
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/MongoChangeStreamException.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+/**
+ * An exception indicating that a failure occurred when running a {@code $changeStream}.
+ *
+ * @mongodb.driver.dochub core/changestreams Change Streams
+ * @since 3.6
+ */
+public class MongoChangeStreamException extends MongoException {
+    private static final long serialVersionUID = 3621370414132219001L;
+
+    /**
+     * Constructs a new instance.
+     *
+     * @param message the message
+     */
+    public MongoChangeStreamException(final String message) {
+        super(message);
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/MongoClientException.java b/driver-core/src/main/com/mongodb/MongoClientException.java
index d2c6ee4259e..1a32765e148 100644
--- a/driver-core/src/main/com/mongodb/MongoClientException.java
+++ b/driver-core/src/main/com/mongodb/MongoClientException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoClientSettings.java b/driver-core/src/main/com/mongodb/MongoClientSettings.java
new file mode 100644
index 00000000000..91b4246fb96
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/MongoClientSettings.java
@@ -0,0 +1,750 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.Immutable;
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider;
+import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.connection.StreamFactoryFactory;
+import com.mongodb.event.CommandListener;
+import com.mongodb.lang.Nullable;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.BsonCodecProvider;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.DocumentCodecProvider;
+import org.bson.codecs.IterableCodecProvider;
+import org.bson.codecs.MapCodecProvider;
+import org.bson.codecs.ValueCodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.jsr310.Jsr310CodecProvider;
+
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Arrays.asList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+
+/**
+ * Various settings to control the behavior of a {@code MongoClient}.
+ *
+ * @since 3.7
+ */
+@Immutable
+public final class MongoClientSettings {
+    private static final CodecRegistry DEFAULT_CODEC_REGISTRY =
+            fromProviders(asList(new ValueCodecProvider(),
+                    new BsonValueCodecProvider(),
+                    new DBRefCodecProvider(),
+                    new DBObjectCodecProvider(),
+                    new DocumentCodecProvider(new DocumentToDBRefTransformer()),
+                    new IterableCodecProvider(new DocumentToDBRefTransformer()),
+                    new MapCodecProvider(new DocumentToDBRefTransformer()),
+                    new GeoJsonCodecProvider(),
+                    new GridFSFileCodecProvider(),
+                    new Jsr310CodecProvider(),
+                    new BsonCodecProvider()));
+
+    private final ReadPreference readPreference;
+    private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private final boolean retryReads;
+    private final ReadConcern readConcern;
+    private final MongoCredential credential;
+    private final StreamFactoryFactory streamFactoryFactory;
+    private final List<CommandListener> commandListeners;
+    private final CodecRegistry codecRegistry;
+
+    private final ClusterSettings clusterSettings;
+    private final SocketSettings socketSettings;
+    private final SocketSettings heartbeatSocketSettings;
+    private final ConnectionPoolSettings connectionPoolSettings;
+    private final ServerSettings serverSettings;
+    private final SslSettings sslSettings;
+    private final String applicationName;
+    private final List<MongoCompressor> compressorList;
+    private final UuidRepresentation uuidRepresentation;
+
+    private final AutoEncryptionSettings autoEncryptionSettings;
+
+    /**
+     * Gets the default codec registry.  It includes the following providers:
+     *
+     * <ul>
+     * <li>{@link org.bson.codecs.ValueCodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonValueCodecProvider}</li>
+     * <li>{@link com.mongodb.DBRefCodecProvider}</li>
+     * <li>{@link com.mongodb.DBObjectCodecProvider}</li>
+     * <li>{@link org.bson.codecs.DocumentCodecProvider}</li>
+     * <li>{@link org.bson.codecs.IterableCodecProvider}</li>
+     * <li>{@link org.bson.codecs.MapCodecProvider}</li>
+     * <li>{@link com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider}</li>
+     * <li>{@link com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider}</li>
+     * <li>{@link org.bson.codecs.jsr310.Jsr310CodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonCodecProvider}</li>
+     * </ul>
+     *
+     * @return the default codec registry
+     */
+    public static CodecRegistry getDefaultCodecRegistry() {
+        return DEFAULT_CODEC_REGISTRY;
+    }
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Convenience method to create a from an existing {@code MongoClientSettings}.
+     *
+     * @param settings create a builder from existing settings
+     * @return a builder
+     */
+    public static Builder builder(final MongoClientSettings settings) {
+        return new Builder(settings);
+    }
+
+    /**
+     * A builder for {@code MongoClientSettings} so that {@code MongoClientSettings} can be immutable, and to support easier construction
+     * through chaining.
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private ReadPreference readPreference = ReadPreference.primary();
+        private WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
+        private boolean retryWrites = true;
+        private boolean retryReads = true;
+        private ReadConcern readConcern = ReadConcern.DEFAULT;
+        private CodecRegistry codecRegistry = MongoClientSettings.getDefaultCodecRegistry();
+        private StreamFactoryFactory streamFactoryFactory;
+        private List<CommandListener> commandListeners = new ArrayList<CommandListener>();
+
+        private final ClusterSettings.Builder clusterSettingsBuilder = ClusterSettings.builder();
+        private final SocketSettings.Builder socketSettingsBuilder = SocketSettings.builder();
+        private final ConnectionPoolSettings.Builder connectionPoolSettingsBuilder = ConnectionPoolSettings.builder();
+        private final ServerSettings.Builder serverSettingsBuilder = ServerSettings.builder();
+        private final SslSettings.Builder sslSettingsBuilder = SslSettings.builder();
+        private MongoCredential credential;
+        private String applicationName;
+        private List<MongoCompressor> compressorList = Collections.emptyList();
+        private UuidRepresentation uuidRepresentation = UuidRepresentation.JAVA_LEGACY;
+
+        private AutoEncryptionSettings autoEncryptionSettings;
+
+        private Builder() {
+        }
+
+        private Builder(final MongoClientSettings settings) {
+            notNull("settings", settings);
+            applicationName = settings.getApplicationName();
+            commandListeners = new ArrayList<CommandListener>(settings.getCommandListeners());
+            compressorList = new ArrayList<MongoCompressor>(settings.getCompressorList());
+            codecRegistry = settings.getCodecRegistry();
+            readPreference = settings.getReadPreference();
+            writeConcern = settings.getWriteConcern();
+            retryWrites = settings.getRetryWrites();
+            retryReads = settings.getRetryReads();
+            readConcern = settings.getReadConcern();
+            credential = settings.getCredential();
+            uuidRepresentation = settings.getUuidRepresentation();
+            streamFactoryFactory = settings.getStreamFactoryFactory();
+            autoEncryptionSettings = settings.getAutoEncryptionSettings();
+            clusterSettingsBuilder.applySettings(settings.getClusterSettings());
+            serverSettingsBuilder.applySettings(settings.getServerSettings());
+            socketSettingsBuilder.applySettings(settings.getSocketSettings());
+            connectionPoolSettingsBuilder.applySettings(settings.getConnectionPoolSettings());
+            sslSettingsBuilder.applySettings(settings.getSslSettings());
+        }
+
+        /**
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
+         *
+         * @param connectionString the connection string containing details of how to connect to MongoDB
+         * @return this
+         */
+        public Builder applyConnectionString(final ConnectionString connectionString) {
+            if (connectionString.getApplicationName() != null) {
+                applicationName = connectionString.getApplicationName();
+            }
+            clusterSettingsBuilder.applyConnectionString(connectionString);
+            if (!connectionString.getCompressorList().isEmpty()) {
+                compressorList = connectionString.getCompressorList();
+            }
+            connectionPoolSettingsBuilder.applyConnectionString(connectionString);
+            if (connectionString.getCredential() != null) {
+                credential = connectionString.getCredential();
+            }
+            if (connectionString.getReadConcern() != null) {
+                readConcern = connectionString.getReadConcern();
+            }
+            if (connectionString.getReadPreference() != null) {
+                readPreference = connectionString.getReadPreference();
+            }
+            if (connectionString.getRetryWritesValue() != null) {
+                retryWrites = connectionString.getRetryWrites();
+            }
+            if (connectionString.getUuidRepresentation() != null) {
+                uuidRepresentation = connectionString.getUuidRepresentation();
+            }
+
+            serverSettingsBuilder.applyConnectionString(connectionString);
+            socketSettingsBuilder.applyConnectionString(connectionString);
+            sslSettingsBuilder.applyConnectionString(connectionString);
+            if (connectionString.getWriteConcern() != null) {
+                writeConcern = connectionString.getWriteConcern();
+            }
+            return this;
+        }
+
+        /**
+         * Applies the {@link ClusterSettings.Builder} block and then sets the clusterSettings.
+         *
+         * @param block the block to apply to the ClusterSettings.
+         * @return this
+         * @see MongoClientSettings#getClusterSettings()
+         */
+        public Builder applyToClusterSettings(final Block<ClusterSettings.Builder> block) {
+            notNull("block", block).apply(clusterSettingsBuilder);
+            return this;
+        }
+
+        /**
+         * Applies the {@link SocketSettings.Builder} block and then sets the socketSettings.
+         *
+         * @param block the block to apply to the SocketSettings.
+         * @return this
+         * @see MongoClientSettings#getSocketSettings()
+         */
+        public Builder applyToSocketSettings(final Block<SocketSettings.Builder> block) {
+            notNull("block", block).apply(socketSettingsBuilder);
+            return this;
+        }
+
+        /**
+         * Applies the {@link ConnectionPoolSettings.Builder} block and then sets the connectionPoolSettings.
+         *
+         * @param block the block to apply to the ConnectionPoolSettings.
+         * @return this
+         * @see MongoClientSettings#getConnectionPoolSettings()
+         */
+        public Builder applyToConnectionPoolSettings(final Block<ConnectionPoolSettings.Builder> block) {
+            notNull("block", block).apply(connectionPoolSettingsBuilder);
+            return this;
+        }
+
+        /**
+         * Applies the {@link ServerSettings.Builder} block and then sets the serverSettings.
+         *
+         * @param block the block to apply to the ServerSettings.
+         * @return this
+         * @see MongoClientSettings#getServerSettings()
+         */
+        public Builder applyToServerSettings(final Block<ServerSettings.Builder> block) {
+            notNull("block", block).apply(serverSettingsBuilder);
+            return this;
+        }
+
+        /**
+         * Applies the {@link SslSettings.Builder} block and then sets the sslSettings.
+         *
+         * @param block the block to apply to the SslSettings.
+         * @return this
+         * @see MongoClientSettings#getSslSettings()
+         */
+        public Builder applyToSslSettings(final Block<SslSettings.Builder> block) {
+            notNull("block", block).apply(sslSettingsBuilder);
+            return this;
+        }
+
+        /**
+         * Sets the read preference.
+         *
+         * @param readPreference read preference
+         * @return this
+         * @see MongoClientSettings#getReadPreference()
+         */
+        public Builder readPreference(final ReadPreference readPreference) {
+            this.readPreference = notNull("readPreference", readPreference);
+            return this;
+        }
+
+        /**
+         * Sets the write concern.
+         *
+         * @param writeConcern the write concern
+         * @return this
+         * @see MongoClientSettings#getWriteConcern()
+         */
+        public Builder writeConcern(final WriteConcern writeConcern) {
+            this.writeConcern = notNull("writeConcern", writeConcern);
+            return this;
+        }
+
+        /**
+         * Sets whether writes should be retried if they fail due to a network error.
+         *
+         * <p>Starting with the 3.11.0 release, the default value is true</p>
+         *
+         * @param retryWrites sets if writes should be retried if they fail due to a network error.
+         * @return this
+         * @see #getRetryWrites()
+         * @mongodb.server.release 3.6
+         */
+        public Builder retryWrites(final boolean retryWrites) {
+            this.retryWrites = retryWrites;
+            return this;
+        }
+
+        /**
+         * Sets whether reads should be retried if they fail due to a network error.
+         *
+         * @param retryReads sets if reads should be retried if they fail due to a network error.
+         * @return this
+         * @see #getRetryReads()
+         * @since 3.11
+         * @mongodb.server.release 3.6
+         */
+        public Builder retryReads(final boolean retryReads) {
+            this.retryReads = retryReads;
+            return this;
+        }
+
+        /**
+         * Sets the read concern.
+         *
+         * @param readConcern the read concern
+         * @return this
+         * @mongodb.server.release 3.2
+         * @mongodb.driver.manual reference/readConcern/ Read Concern
+         */
+        public Builder readConcern(final ReadConcern readConcern) {
+            this.readConcern = notNull("readConcern", readConcern);
+            return this;
+        }
+
+        /**
+         * Sets the credential.
+         *
+         * @param credential the credential
+         * @return this
+         */
+        public Builder credential(final MongoCredential credential) {
+            this.credential = notNull("credential", credential);
+            return this;
+        }
+
+        /**
+         * Sets the codec registry
+         *
+         * @param codecRegistry the codec registry
+         * @return this
+         * @see MongoClientSettings#getCodecRegistry()
+         */
+        public Builder codecRegistry(final CodecRegistry codecRegistry) {
+            this.codecRegistry = notNull("codecRegistry", codecRegistry);
+            return this;
+        }
+
+        /**
+         * Sets the factory to use to create a {@code StreamFactory}.
+         *
+         * @param streamFactoryFactory the stream factory factory
+         * @return this
+         */
+        public Builder streamFactoryFactory(final StreamFactoryFactory streamFactoryFactory) {
+            this.streamFactoryFactory = notNull("streamFactoryFactory", streamFactoryFactory);
+            return this;
+        }
+
+        /**
+         * Adds the given command listener.
+         *
+         * @param commandListener the command listener
+         * @return this
+         */
+        public Builder addCommandListener(final CommandListener commandListener) {
+            notNull("commandListener", commandListener);
+            commandListeners.add(commandListener);
+            return this;
+        }
+
+        /**
+         * Sets the the command listeners
+         *
+         * @param commandListeners the list of command listeners
+         * @return this
+         */
+        public Builder commandListenerList(final List<CommandListener> commandListeners) {
+            notNull("commandListeners", commandListeners);
+            this.commandListeners = new ArrayList<CommandListener>(commandListeners);
+            return this;
+        }
+
+        /**
+         * Sets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+         * the application to the server, for use in server logs, slow query logs, and profile collection.
+         *
+         * @param applicationName the logical name of the application using this MongoClient.  It may be null.
+         *                        The UTF-8 encoding may not exceed 128 bytes.
+         * @return this
+         * @see #getApplicationName()
+         * @mongodb.server.release 3.4
+         */
+        public Builder applicationName(@Nullable final String applicationName) {
+            if (applicationName != null) {
+                isTrueArgument("applicationName UTF-8 encoding length <= 128",
+                        applicationName.getBytes(Charset.forName("UTF-8")).length <= 128);
+            }
+            this.applicationName = applicationName;
+            return this;
+        }
+
+        /**
+         * Sets the compressors to use for compressing messages to the server. The driver will use the first compressor in the list
+         * that the server is configured to support.
+         *
+         * @param compressorList the list of compressors to request
+         * @return this
+         * @see #getCompressorList()
+         * @mongodb.server.release 3.4
+         */
+        public Builder compressorList(final List<MongoCompressor> compressorList) {
+            notNull("compressorList", compressorList);
+            this.compressorList = new ArrayList<MongoCompressor>(compressorList);
+            return this;
+        }
+
+        /**
+         * Sets the UUID representation to use when encoding instances of {@link java.util.UUID} and when decoding BSON binary values with
+         * subtype of 3.
+         *
+         * <p>See {@link #getUuidRepresentation()} for recommendations on settings this value</p>
+         *
+         * @param uuidRepresentation the UUID representation, which may not be null
+         * @return this
+         * @since 3.12
+         */
+        public Builder uuidRepresentation(final UuidRepresentation uuidRepresentation) {
+            this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
+            return this;
+        }
+
+        /**
+         * Sets the auto-encryption settings
+         *
+         * @param autoEncryptionSettings the auto-encryption settings
+         * @return this
+         * @since 3.11
+         * @see #getAutoEncryptionSettings()
+         */
+        public Builder autoEncryptionSettings(final AutoEncryptionSettings autoEncryptionSettings) {
+            this.autoEncryptionSettings = autoEncryptionSettings;
+            return this;
+        }
+
+        /**
+         * Build an instance of {@code MongoClientSettings}.
+         *
+         * @return the settings from this builder
+         */
+        public MongoClientSettings build() {
+            return new MongoClientSettings(this);
+        }
+    }
+
+    /**
+     * The read preference to use for queries, map-reduce, aggregation, and count.
+     *
+     * <p>Default is {@code ReadPreference.primary()}.</p>
+     *
+     * @return the read preference
+     * @see ReadPreference#primary()
+     */
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    /**
+     * Gets the credential.
+     *
+     * @return the credential, which may be null
+     */
+    @Nullable
+    public MongoCredential getCredential() {
+        return credential;
+    }
+
+    /**
+     * The write concern to use.
+     *
+     * <p>Default is {@code WriteConcern.ACKNOWLEDGED}.</p>
+     *
+     * @return the write concern
+     * @see WriteConcern#ACKNOWLEDGED
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Returns true if writes should be retried if they fail due to a network error or other retryable error.
+     *
+     * <p>Starting with the 3.11.0 release, the default value is true</p>
+     *
+     * @return the retryWrites value
+     * @mongodb.server.release 3.6
+     */
+    public boolean getRetryWrites() {
+        return retryWrites;
+    }
+
+    /**
+     * Returns true if reads should be retried if they fail due to a network error or other retryable error. The default value is true.
+     *
+     * @return the retryReads value
+     * @since 3.11
+     * @mongodb.server.release 3.6
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
+    /**
+     * The read concern to use.
+     *
+     * @return the read concern
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    /**
+     * The codec registry to use, or null if not set.
+     *
+     * @return the codec registry
+     */
+    public CodecRegistry getCodecRegistry() {
+        return codecRegistry;
+    }
+
+    /**
+     * Gets the factory to use to create a {@code StreamFactory}.
+     *
+     * @return the stream factory factory
+     */
+    @Nullable
+    public StreamFactoryFactory getStreamFactoryFactory() {
+        return streamFactoryFactory;
+    }
+
+    /**
+     * Gets the list of added {@code CommandListener}.
+     *
+     * <p>The default is an empty list.</p>
+     *
+     * @return the unmodifiable list of command listeners
+     */
+    public List<CommandListener> getCommandListeners() {
+        return Collections.unmodifiableList(commandListeners);
+    }
+
+    /**
+     * Gets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+     * the application to the server, for use in server logs, slow query logs, and profile collection.
+     *
+     * <p>Default is null.</p>
+     *
+     * @return the application name, which may be null
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    /**
+     * Gets the compressors to use for compressing messages to the server. The driver will use the first compressor in the list
+     * that the server is configured to support.
+     *
+     * <p>Default is the empty list.</p>
+     *
+     * @return the compressors
+     * @mongodb.server.release 3.4
+     */
+    public List<MongoCompressor> getCompressorList() {
+        return Collections.unmodifiableList(compressorList);
+    }
+
+    /**
+     * Gets the UUID representation to use when encoding instances of {@link java.util.UUID} and when decoding BSON binary values with
+     * subtype of 3.
+     *
+     * <p>The default is {@link UuidRepresentation#JAVA_LEGACY}, but it will be changing to {@link UuidRepresentation#UNSPECIFIED} in
+     * the next major release.  If your application stores UUID values in MongoDB, consider setting this value to the desired
+     * representation in order to avoid a breaking change when upgrading.  New applications should prefer
+     * {@link UuidRepresentation#STANDARD}, while existing Java applications should prefer {@link UuidRepresentation#JAVA_LEGACY}.
+     * Applications wishing to interoperate with existing Python or .NET applications should prefer
+     * {@link UuidRepresentation#PYTHON_LEGACY} or {@link UuidRepresentation#C_SHARP_LEGACY}, respectively. Applications that do not
+     * store UUID values in MongoDB don't need to set this value.
+     * </p>
+     *
+     * @return the UUID representation, which may not be null
+     * @since 3.12
+     */
+    public UuidRepresentation getUuidRepresentation() {
+        return uuidRepresentation;
+    }
+
+    /**
+     * Gets the auto-encryption settings.
+     * <p>
+     * Client side encryption enables an application to specify what fields in a collection must be
+     * encrypted, and the driver automatically encrypts commands and decrypts results.
+     * </p>
+     * <p>
+     * Automatic encryption is an enterprise only feature that only applies to operations on a collection. Automatic encryption is not
+     * supported for operations on a database or view and will result in error. To bypass automatic encryption,
+     * set bypassAutoEncryption=true in ClientSideEncryptionOptions.
+     * </p>
+     * <p>
+     * Explicit encryption/decryption and automatic decryption is a community feature, enabled with the new
+     * {@code com.mongodb.client.vault .ClientEncryption} type. A MongoClient configured with bypassAutoEncryption=true will still
+     * automatically decrypt.
+     * </p>
+     * <p>
+     * Automatic encryption requires the authenticated user to have the listCollections privilege action.
+     * </p>
+     * <p>
+     * Note: support for client side encryption is in beta.  Backwards-breaking changes may be made before the final release.
+     * </p>
+     *
+     * @return the auto-encryption settings, which may be null
+     * @since 3.11
+     */
+    @Nullable
+    public AutoEncryptionSettings getAutoEncryptionSettings() {
+        return autoEncryptionSettings;
+    }
+
+    /**
+     * Gets the cluster settings.
+     *
+     * @return the cluster settings
+     */
+    public ClusterSettings getClusterSettings() {
+        return clusterSettings;
+    }
+
+    /**
+     * Gets the SSL settings.
+     *
+     * @return the SSL settings
+     */
+    public SslSettings getSslSettings() {
+        return sslSettings;
+    }
+
+    /**
+     * Gets the connection-specific settings wrapped in a settings object.   This settings object uses the values for connectTimeout,
+     * socketTimeout and socketKeepAlive.
+     *
+     * @return a SocketSettings object populated with the connection settings from this {@code MongoClientSettings} instance.
+     * @see SocketSettings
+     */
+    public SocketSettings getSocketSettings() {
+        return socketSettings;
+    }
+
+    /**
+     * Gets the connection settings for the heartbeat thread (the background task that checks the state of the cluster) wrapped in a
+     * settings object.
+     *
+     * @return the SocketSettings for the heartbeat thread
+     * @see SocketSettings
+     */
+    public SocketSettings getHeartbeatSocketSettings() {
+        return heartbeatSocketSettings;
+    }
+
+    /**
+     * Gets the settings for the connection provider in a settings object.  This settings object wraps the values for minConnectionPoolSize,
+     * maxConnectionPoolSize, maxWaitTime, maxConnectionIdleTime and maxConnectionLifeTime, and uses maxConnectionPoolSize and
+     * threadsAllowedToBlockForConnectionMultiplier to calculate maxWaitQueueSize.
+     *
+     * @return a ConnectionPoolSettings populated with the settings from this {@code MongoClientSettings} instance that relate to the
+     * connection provider.
+     * @see ConnectionPoolSettings
+     */
+    public ConnectionPoolSettings getConnectionPoolSettings() {
+        return connectionPoolSettings;
+    }
+
+    /**
+     * Gets the server-specific settings wrapped in a settings object.  This settings object uses the heartbeatFrequency and
+     * minHeartbeatFrequency values from this {@code MongoClientSettings} instance.
+     *
+     * @return a ServerSettings
+     * @see ServerSettings
+     */
+    public ServerSettings getServerSettings() {
+        return serverSettings;
+    }
+
+    private MongoClientSettings(final Builder builder) {
+        readPreference = builder.readPreference;
+        writeConcern = builder.writeConcern;
+        retryWrites = builder.retryWrites;
+        retryReads = builder.retryReads;
+        readConcern = builder.readConcern;
+        credential = builder.credential;
+        streamFactoryFactory = builder.streamFactoryFactory;
+        codecRegistry = builder.codecRegistry;
+        commandListeners = builder.commandListeners;
+        applicationName = builder.applicationName;
+        clusterSettings = builder.clusterSettingsBuilder.build();
+        serverSettings = builder.serverSettingsBuilder.build();
+        socketSettings = builder.socketSettingsBuilder.build();
+        connectionPoolSettings = builder.connectionPoolSettingsBuilder.build();
+        sslSettings = builder.sslSettingsBuilder.build();
+        compressorList = builder.compressorList;
+        uuidRepresentation = builder.uuidRepresentation;
+        autoEncryptionSettings = builder.autoEncryptionSettings;
+
+        SocketSettings.Builder heartbeatSocketSettingsBuilder = SocketSettings.builder()
+                .readTimeout(socketSettings.getConnectTimeout(MILLISECONDS), MILLISECONDS)
+                .connectTimeout(socketSettings.getConnectTimeout(MILLISECONDS), MILLISECONDS);
+        heartbeatSocketSettings = heartbeatSocketSettingsBuilder.build();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/MongoCommandException.java b/driver-core/src/main/com/mongodb/MongoCommandException.java
index 413cf02a406..a3d6ba83d39 100644
--- a/driver-core/src/main/com/mongodb/MongoCommandException.java
+++ b/driver-core/src/main/com/mongodb/MongoCommandException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,11 @@
 
 package com.mongodb;
 
+import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonString;
+import org.bson.BsonValue;
 import org.bson.codecs.BsonDocumentCodec;
 import org.bson.codecs.EncoderContext;
 import org.bson.json.JsonWriter;
@@ -45,9 +47,12 @@ public class MongoCommandException extends MongoServerException {
      */
     public MongoCommandException(final BsonDocument response, final ServerAddress address) {
         super(extractErrorCode(response),
-              format("Command failed with error %s: '%s' on server %s. The full response is %s", extractErrorCode(response),
+              format("Command failed with error %s: '%s' on server %s. The full response is %s", extractErrorCodeAndName(response),
                      extractErrorMessage(response), address, getResponseAsJson(response)), address);
         this.response = response;
+        for (BsonValue curErrorLabel : response.getArray("errorLabels", new BsonArray())) {
+            addLabel(curErrorLabel.asString().getValue());
+        }
     }
 
     /**
@@ -59,6 +64,17 @@ public int getErrorCode() {
         return getCode();
     }
 
+    /**
+     * Gets the name associated with the error code.
+     *
+     * @return the error code name, which may be the empty string
+     * @since 3.8
+     * @mongodb.server.release 3.4
+     */
+    public String getErrorCodeName() {
+        return extractErrorCodeName(response);
+    }
+
     /**
      * Gets the error message associated with the command failure.
      *
@@ -84,11 +100,30 @@ private static String getResponseAsJson(final BsonDocument commandResponse) {
         return writer.toString();
     }
 
+    private static String extractErrorCodeAndName(final BsonDocument response) {
+        int errorCode = extractErrorCode(response);
+        String errorCodeName = extractErrorCodeName(response);
+        if (errorCodeName.isEmpty()) {
+            return Integer.toString(errorCode);
+        } else {
+            return String.format("%d (%s)", errorCode, errorCodeName);
+        }
+    }
+
     private static int extractErrorCode(final BsonDocument response) {
         return response.getNumber("code", new BsonInt32(-1)).intValue();
     }
 
+    private static String extractErrorCodeName(final BsonDocument response) {
+        return response.getString("codeName", new BsonString("")).getValue();
+    }
+
     private static String extractErrorMessage(final BsonDocument response) {
-        return response.getString("errmsg", new BsonString("")).getValue();
+        String errorMessage = response.getString("errmsg", new BsonString("")).getValue();
+        // Satisfy nullability checker
+        if (errorMessage == null) {
+            throw new MongoInternalException("This value should not be null");
+        }
+        return errorMessage;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/MongoCompressor.java b/driver-core/src/main/com/mongodb/MongoCompressor.java
new file mode 100644
index 00000000000..37879433c13
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/MongoCompressor.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.lang.Nullable;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * Metadata describing a compressor to use for sending and receiving messages to a MongoDB server.
+ *
+ * @since 3.6
+ * @mongodb.server.release 3.4
+ */
+public final class MongoCompressor {
+
+    /**
+     * The property key for defining the compression level.
+     */
+    public static final String LEVEL = "LEVEL";
+
+    private final String name;
+    private final Map<String, Object> properties;
+
+
+    /**
+     * Create an instance for snappy compression.
+     *
+     * @return A compressor based on the snappy compression algorithm
+     * @mongodb.server.release 3.4
+     */
+    public static MongoCompressor createSnappyCompressor() {
+        return new MongoCompressor("snappy");
+    }
+
+    /**
+     * Create an instance for zlib compression.
+     *
+     * @return A compressor based on the zlib compression algorithm
+     * @mongodb.server.release 3.6
+     */
+    public static MongoCompressor createZlibCompressor() {
+        return new MongoCompressor("zlib");
+    }
+
+    /**
+     * Create an instance for zstd compression.
+     *
+     * @return A compressor based on the zstd compression algorithm
+     * @mongodb.server.release 4.2
+     */
+    public static MongoCompressor createZstdCompressor() {
+        return new MongoCompressor("zstd");
+    }
+
+    /**
+     * Gets the name of the compressor.
+     *
+     * @return the non-null compressor name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the property with the given key.
+     *
+     * @param key the key
+     * @param defaultValue the default value
+     * @param <T> the property value type
+     * @return the property value, or the default value if the property is not defined
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public <T> T getProperty(final String key, final T defaultValue) {
+        notNull("key", key);
+
+        T value = (T) properties.get(key.toLowerCase());
+        return (value == null && !properties.containsKey(key)) ? defaultValue : value;
+    }
+
+    /**
+     * Gets the property with the given key.
+     *
+     * @param key the key
+     * @param defaultValue the default value
+     * @param <T> the property value type
+     * @return the property value, or the default value if the property is not defined
+     * @throws IllegalArgumentException if the value and default value are null
+     * @since 3.7
+     */
+    public <T> T getPropertyNonNull(final String key, final T defaultValue) {
+        T value = getProperty(key, defaultValue);
+        if (value == null) {
+            throw new IllegalArgumentException();
+        }
+        return value;
+    }
+
+    /**
+     * Creates a new compressor from this compressor with the given property added to it.
+     *
+     * @param key the property key
+     * @param value the property value
+     * @param <T> the property value type
+     * @return the new compressor
+     */
+    public <T> MongoCompressor withProperty(final String key, final T value) {
+        return new MongoCompressor(this, key, value);
+    }
+
+
+    private MongoCompressor(final String name) {
+        this.name = name;
+        properties = Collections.emptyMap();
+    }
+
+    private <T> MongoCompressor(final MongoCompressor from, final String propertyKey, final T propertyValue) {
+        notNull("propertyKey", propertyKey);
+
+        this.name = from.name;
+        this.properties = new HashMap<String, Object>(from.properties);
+        this.properties.put(propertyKey.toLowerCase(), propertyValue);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MongoCompressor that = (MongoCompressor) o;
+
+        if (!name.equals(that.name)) {
+            return false;
+        }
+        return properties.equals(that.properties);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name.hashCode();
+        result = 31 * result + properties.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "MongoCompressor{"
+                       + "name='" + name + '\''
+                       + ", properties=" + properties
+                       + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/MongoConfigurationException.java b/driver-core/src/main/com/mongodb/MongoConfigurationException.java
new file mode 100644
index 00000000000..af714131219
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/MongoConfigurationException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+/**
+ * An exception indicating a configuration error in the client.
+ *
+ * @since 3.4
+ */
+public class MongoConfigurationException extends MongoClientException {
+    private static final long serialVersionUID = -2343119787572079323L;
+
+    /**
+     * Construct an instance with the given message.
+     *
+     * @param message the message
+     */
+    public MongoConfigurationException(final String message) {
+        super(message);
+    }
+
+    /**
+     * Construct an instance with the given message and cause.
+     *
+     * @param message the message
+     * @param cause the cause
+     *
+     * @since 3.6
+     */
+    public MongoConfigurationException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/MongoCredential.java b/driver-core/src/main/com/mongodb/MongoCredential.java
index 49cc1ffacdd..71925cf2dd2 100644
--- a/driver-core/src/main/com/mongodb/MongoCredential.java
+++ b/driver-core/src/main/com/mongodb/MongoCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.mongodb;
 
 import com.mongodb.annotations.Immutable;
+import com.mongodb.lang.Nullable;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -28,6 +29,7 @@
 import static com.mongodb.AuthenticationMechanism.MONGODB_X509;
 import static com.mongodb.AuthenticationMechanism.PLAIN;
 import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_256;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -48,7 +50,10 @@ public final class MongoCredential {
     /**
      * The MongoDB Challenge Response mechanism.
      * @mongodb.driver.manual core/authentication/#mongodb-cr-authentication MONGODB-CR
+     * @deprecated This mechanism was replaced by {@link #SCRAM_SHA_1_MECHANISM} in MongoDB 3.0, and is now deprecated
      */
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public static final String MONGODB_CR_MECHANISM = AuthenticationMechanism.MONGODB_CR.getMechanismName();
 
     /**
@@ -86,6 +91,15 @@ public final class MongoCredential {
      */
     public static final String SCRAM_SHA_1_MECHANISM = AuthenticationMechanism.SCRAM_SHA_1.getMechanismName();
 
+    /**
+     * The SCRAM-SHA-256 Mechanism.
+     *
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.manual core/authentication/#authentication-scram-sha-256 SCRAM-SHA-256
+     */
+    public static final String SCRAM_SHA_256_MECHANISM = AuthenticationMechanism.SCRAM_SHA_256.getMechanismName();
+
     /**
      * Mechanism property key for overriding the service name for GSSAPI authentication.
      *
@@ -104,17 +118,29 @@ public final class MongoCredential {
      */
     public static final String CANONICALIZE_HOST_NAME_KEY = "CANONICALIZE_HOST_NAME";
 
-    /*
-     * Mechanism property key for overriding the SasClient properties for GSSAPI authentication.
+    /**
+     * Mechanism property key for overriding the SaslClient properties for GSSAPI authentication.
+     *
+     * The value of this property must be a {@code Map<String, Object>}.  In most cases there is no need to set this mechanism property.
+     * But if an application does:
+     * <ul>
+     * <li>Generally it must set the {@link javax.security.sasl.Sasl#CREDENTIALS} property to an instance of
+     * {@link org.ietf.jgss.GSSCredential}.</li>
+     * <li>It's recommended that it set the {@link javax.security.sasl.Sasl#MAX_BUFFER} property to "0" to ensure compatibility with all
+     * versions of MongoDB.</li>
+     * </ul>
      *
      * @see #createGSSAPICredential(String)
      * @see #withMechanismProperty(String, Object)
+     * @see javax.security.sasl.Sasl
+     * @see javax.security.sasl.Sasl#CREDENTIALS
+     * @see javax.security.sasl.Sasl#MAX_BUFFER
      * @since 3.3
      */
     public static final String JAVA_SASL_CLIENT_PROPERTIES_KEY = "JAVA_SASL_CLIENT_PROPERTIES";
 
-    /*
-     * Mechanism property key for overriding the {@link javax.security.Subject} under which GSSAPI authentication executes.
+    /**
+     * Mechanism property key for overriding the {@link javax.security.auth.Subject} under which GSSAPI authentication executes.
      *
      * @see #createGSSAPICredential(String)
      * @see #withMechanismProperty(String, Object)
@@ -124,10 +150,10 @@ public final class MongoCredential {
 
     /**
      * Creates a MongoCredential instance with an unspecified mechanism.  The client will negotiate the best mechanism based on the
-     * version of the server that the client is authenticating to.  If the server version is 3.0 or higher,
-     * the driver will authenticate using the SCRAM-SHA-1 mechanism.  Otherwise, the driver will authenticate using the MONGODB_CR
-     * mechanism.
+     * version of the server that the client is authenticating to.
      *
+     * <p>If the server version is 4.0 or higher, the driver will negotiate with the server preferring the SCRAM-SHA-256 mechanism. 3.x
+     * servers will authenticate using SCRAM-SHA-1, older servers will authenticate using the MONGODB_CR mechanism.</p>
      *
      * @param userName the user name
      * @param database the database where the user is defined
@@ -135,8 +161,9 @@ public final class MongoCredential {
      * @return the credential
      *
      * @since 2.13
-     * @mongodb.driver.manual core/authentication/#mongodb-cr-authentication MONGODB-CR
+     * @mongodb.driver.manual core/authentication/#authentication-scram-sha-256 SCRAM-SHA-256
      * @mongodb.driver.manual core/authentication/#authentication-scram-sha-1 SCRAM-SHA-1
+     * @mongodb.driver.manual core/authentication/#mongodb-cr-authentication MONGODB-CR
      */
     public static MongoCredential createCredential(final String userName, final String database, final char[] password) {
         return new MongoCredential(null, userName, database, password);
@@ -163,6 +190,23 @@ public static MongoCredential createScramSha1Credential(final String userName, f
         return new MongoCredential(SCRAM_SHA_1, userName, source, password);
     }
 
+    /**
+     * Creates a MongoCredential instance for the SCRAM-SHA-256 SASL mechanism.
+     *
+     * @param userName the non-null user name
+     * @param source the source where the user is defined.
+     * @param password the non-null user password
+     * @return the credential
+     * @see #createCredential(String, String, char[])
+     *
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.manual core/authentication/#authentication-scram-sha-256 SCRAM-SHA-256
+     */
+    public static MongoCredential createScramSha256Credential(final String userName, final String source, final char[] password) {
+        return new MongoCredential(SCRAM_SHA_256, userName, source, password);
+    }
+
     /**
      * Creates a MongoCredential instance for the MongoDB Challenge Response protocol. Use this method only if you want to ensure that
      * the driver uses the MONGODB_CR mechanism regardless of whether the server you are connecting to supports a more secure
@@ -175,7 +219,11 @@ public static MongoCredential createScramSha1Credential(final String userName, f
      * @return the credential
      * @see #createCredential(String, String, char[])
      * @mongodb.driver.manual core/authentication/#mongodb-cr-authentication MONGODB-CR
+     * @deprecated MONGODB-CR was replaced by SCRAM-SHA-1 in MongoDB 3.0, and is now deprecated. Use
+     * the {@link #createCredential(String, String, char[])} factory method instead.
      */
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public static MongoCredential createMongoCRCredential(final String userName, final String database, final char[] password) {
         return new MongoCredential(MONGODB_CR, userName, database, password);
     }
@@ -194,6 +242,22 @@ public static MongoCredential createMongoX509Credential(final String userName) {
         return new MongoCredential(MONGODB_X509, userName, "$external", null);
     }
 
+    /**
+     * Creates a MongoCredential instance for the MongoDB X.509 protocol where the distinguished subject name of the client certificate
+     * acts as the userName.
+     * <p>
+     *     Available on MongoDB server versions &gt;= 3.4.
+     * </p>
+     * @return the credential
+     *
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     * @mongodb.driver.manual core/authentication/#x-509-certificate-authentication X-509
+     */
+    public static MongoCredential createMongoX509Credential() {
+        return new MongoCredential(MONGODB_X509, null, "$external", null);
+    }
+
     /**
      * Creates a MongoCredential instance for the PLAIN SASL mechanism.
      *
@@ -253,6 +317,20 @@ public <T> MongoCredential withMechanismProperty(final String key, final T value
         return new MongoCredential(this, key, value);
     }
 
+    /**
+     * Creates a new MongoCredential with the set mechanism. The existing mechanism must be null.
+     *
+     * @param mechanism the mechanism to set
+     * @return the credential
+     * @since 3.8
+     */
+    public MongoCredential withMechanism(final AuthenticationMechanism mechanism) {
+        if (this.mechanism != null) {
+            throw new IllegalArgumentException("Mechanism already set");
+        }
+        return new MongoCredential(mechanism, userName, source, password, mechanismProperties);
+    }
+
     /**
      * Constructs a new instance using the given mechanism, userName, source, and password
      *
@@ -261,8 +339,14 @@ public <T> MongoCredential withMechanismProperty(final String key, final T value
      * @param source    the source of the user name, typically a database name
      * @param password  the password
      */
-    MongoCredential(final AuthenticationMechanism mechanism, final String userName, final String source, final char[] password) {
-        if (userName == null) {
+    MongoCredential(@Nullable final AuthenticationMechanism mechanism, @Nullable final String userName, final String source,
+                    @Nullable final char[] password) {
+        this(mechanism, userName, source, password, Collections.<String, Object>emptyMap());
+    }
+
+    MongoCredential(@Nullable final AuthenticationMechanism mechanism, @Nullable final String userName, final String source,
+                    @Nullable final char[] password, final Map<String, Object> mechanismProperties) {
+        if (mechanism != MONGODB_X509 && userName == null) {
             throw new IllegalArgumentException("username can not be null");
         }
 
@@ -270,7 +354,7 @@ public <T> MongoCredential withMechanismProperty(final String key, final T value
             throw new IllegalArgumentException("Password can not be null when the authentication mechanism is unspecified");
         }
 
-        if ((mechanism == PLAIN || mechanism == MONGODB_CR || mechanism == SCRAM_SHA_1) && password == null) {
+        if (mechanismRequiresPassword(mechanism) && password == null) {
             throw new IllegalArgumentException("Password can not be null for " + mechanism + " mechanism");
         }
 
@@ -279,11 +363,17 @@ public <T> MongoCredential withMechanismProperty(final String key, final T value
         }
 
         this.mechanism = mechanism;
-        this.userName = notNull("userName", userName);
+        this.userName = userName;
         this.source = notNull("source", source);
 
         this.password = password != null ? password.clone() : null;
-        this.mechanismProperties = Collections.emptyMap();
+        this.mechanismProperties = new HashMap<String, Object>(mechanismProperties);
+    }
+
+    @SuppressWarnings("deprecation")
+    private boolean mechanismRequiresPassword(@Nullable final AuthenticationMechanism mechanism) {
+        return mechanism == PLAIN || mechanism == MONGODB_CR || mechanism == SCRAM_SHA_1 || mechanism == SCRAM_SHA_256;
+
     }
 
     /**
@@ -310,6 +400,7 @@ <T> MongoCredential(final MongoCredential from, final String mechanismPropertyKe
      *
      * @return the mechanism.
      */
+    @Nullable
     public String getMechanism() {
         return mechanism == null ? null : mechanism.getMechanismName();
     }
@@ -320,6 +411,7 @@ public String getMechanism() {
      * @return the mechanism.
      * @since 3.0
      */
+    @Nullable
     public AuthenticationMechanism getAuthenticationMechanism() {
         return mechanism;
     }
@@ -327,8 +419,9 @@ public AuthenticationMechanism getAuthenticationMechanism() {
     /**
      * Gets the user name
      *
-     * @return the user name.  Can never be null.
+     * @return the user name.
      */
+    @Nullable
     public String getUserName() {
         return userName;
     }
@@ -347,6 +440,7 @@ public String getSource() {
      *
      * @return the password.  Can be null for some mechanisms.
      */
+    @Nullable
     public char[] getPassword() {
         if (password == null) {
             return null;
@@ -364,7 +458,8 @@ public char[] getPassword() {
      * @since 2.12
      */
     @SuppressWarnings("unchecked")
-    public <T> T getMechanismProperty(final String key, final T defaultValue) {
+    @Nullable
+    public <T> T getMechanismProperty(final String key, @Nullable final T defaultValue) {
         notNull("key", key);
 
         T value = (T) mechanismProperties.get(key.toLowerCase());
@@ -392,7 +487,7 @@ public boolean equals(final Object o) {
         if (!source.equals(that.source)) {
             return false;
         }
-        if (!userName.equals(that.userName)) {
+        if (userName != null ? !userName.equals(that.userName) : that.userName != null) {
             return false;
         }
         if (!mechanismProperties.equals(that.mechanismProperties)) {
@@ -405,7 +500,7 @@ public boolean equals(final Object o) {
     @Override
     public int hashCode() {
         int result = mechanism != null ? mechanism.hashCode() : 0;
-        result = 31 * result + userName.hashCode();
+        result = 31 * result + (userName != null ? userName.hashCode() : 0);
         result = 31 * result + source.hashCode();
         result = 31 * result + (password != null ? Arrays.hashCode(password) : 0);
         result = 31 * result + mechanismProperties.hashCode();
@@ -415,12 +510,12 @@ public int hashCode() {
     @Override
     public String toString() {
         return "MongoCredential{"
-               + "mechanism=" + mechanism
-               + ", userName='" + userName + '\''
-               + ", source='" + source + '\''
-               + ", password=<hidden>"
-               + ", mechanismProperties=" + mechanismProperties
-               + '}';
+                + "mechanism=" + mechanism
+                + ", userName='" + userName + '\''
+                + ", source='" + source + '\''
+                + ", password=<hidden>"
+                + ", mechanismProperties=<hidden>"
+                + '}';
     }
 }
 
diff --git a/driver-core/src/main/com/mongodb/MongoCursorNotFoundException.java b/driver-core/src/main/com/mongodb/MongoCursorNotFoundException.java
index cd5e9fef3f2..1f60ebe9828 100644
--- a/driver-core/src/main/com/mongodb/MongoCursorNotFoundException.java
+++ b/driver-core/src/main/com/mongodb/MongoCursorNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoDriverInformation.java b/driver-core/src/main/com/mongodb/MongoDriverInformation.java
new file mode 100644
index 00000000000..43d92ed100f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/MongoDriverInformation.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.NotThreadSafe;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The MongoDriverInformation class allows driver and library authors to add extra information about their library. This information is
+ * then available in the MongoD/MongoS logs.
+ *
+ * <p>
+ *     The following metadata can be included when creating a {@code MongoClient}.
+ * </p>
+ * <ul>
+ *     <li>The driver name. Eg: {@code mongo-scala-driver}</li>
+ *     <li>The driver version. Eg: {@code 1.2.0}</li>
+ *     <li>Extra platform information. Eg: {@code Scala 2.11}</li>
+ * </ul>
+ * <p>
+ *     Note: Library authors are responsible for accepting {@code MongoDriverInformation} from external libraries using their library.
+ *     Also all the meta data is limited to 512 bytes and any excess data will be truncated.
+ * </p>
+ *
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ */
+public final class MongoDriverInformation {
+    private final List<String> driverNames;
+    private final List<String> driverVersions;
+    private final List<String> driverPlatforms;
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @param mongoDriverInformation the mongoDriverInformation to extend
+     * @return a builder
+     */
+    public static Builder builder(final MongoDriverInformation mongoDriverInformation) {
+        return new Builder(mongoDriverInformation);
+    }
+
+    /**
+     * Returns the driverNames
+     *
+     * @return the driverNames
+     */
+    public List<String> getDriverNames() {
+        return driverNames;
+    }
+
+    /**
+     * Returns the driverVersions
+     *
+     * @return the driverVersions
+     */
+    public List<String> getDriverVersions() {
+        return driverVersions;
+    }
+
+    /**
+     * Returns the driverPlatforms
+     *
+     * @return the driverPlatforms
+     */
+    public List<String> getDriverPlatforms() {
+        return driverPlatforms;
+    }
+
+    /**
+     *
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private final MongoDriverInformation driverInformation;
+        private String driverName;
+        private String driverVersion;
+        private String driverPlatform;
+
+        /**
+         * Sets the name
+         *
+         * @param driverName the name
+         * @return this
+         */
+        public Builder driverName(final String driverName) {
+            this.driverName = notNull("driverName", driverName);
+            return this;
+        }
+
+        /**
+         * Sets the version
+         *
+         * <p>
+         *     Note: You must also set a driver name if setting a driver version.
+         * </p>
+         *
+         * @param driverVersion the version
+         * @return this
+         */
+        public Builder driverVersion(final String driverVersion) {
+            this.driverVersion = notNull("driverVersion", driverVersion);
+            return this;
+        }
+
+        /**
+         * Sets the platform
+         *
+         * @param driverPlatform the platform
+         * @return this
+         */
+        public Builder driverPlatform(final String driverPlatform) {
+            this.driverPlatform = notNull("driverPlatform", driverPlatform);
+            return this;
+        }
+
+        /**
+         * @return the driver information
+         */
+        public MongoDriverInformation build() {
+            isTrue("You must also set the driver name when setting the driver version", !(driverName == null && driverVersion != null));
+
+            List<String> names = prependToList(driverInformation.getDriverNames(), driverName);
+            List<String> versions = prependToList(driverInformation.getDriverVersions(), driverVersion);
+            List<String> platforms = prependToList(driverInformation.getDriverPlatforms(), driverPlatform);
+            return new MongoDriverInformation(names, versions, platforms);
+        }
+
+        private List<String> prependToList(final List<String> stringList, final String value) {
+            if (value == null) {
+                return stringList;
+            } else {
+                ArrayList<String> newList = new ArrayList<String>();
+                newList.add(value);
+                newList.addAll(stringList);
+                return Collections.unmodifiableList(newList);
+            }
+        }
+
+        private Builder() {
+            List<String> immutableEmptyList = Collections.unmodifiableList(Collections.<String>emptyList());
+            driverInformation = new MongoDriverInformation(immutableEmptyList, immutableEmptyList, immutableEmptyList);
+        }
+
+        private Builder(final MongoDriverInformation driverInformation) {
+            this.driverInformation = notNull("driverInformation", driverInformation);
+        }
+    }
+
+    private MongoDriverInformation(final List<String> driverNames, final List<String> driverVersions, final List<String> driverPlatforms) {
+        this.driverNames = driverNames;
+        this.driverVersions = driverVersions;
+        this.driverPlatforms = driverPlatforms;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/MongoException.java b/driver-core/src/main/com/mongodb/MongoException.java
index 9dfa2a46478..852dc689f82 100644
--- a/driver-core/src/main/com/mongodb/MongoException.java
+++ b/driver-core/src/main/com/mongodb/MongoException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,24 +16,64 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
 /**
  * Top level Exception for all Exceptions, server-side or client-side, that come from the driver.
  */
 public class MongoException extends RuntimeException {
+
+    /**
+     * An error label indicating that the exception can be treated as a transient transaction error.
+     *
+     * @see #hasErrorLabel(String)
+     * @since 3.8
+     */
+    public static final String TRANSIENT_TRANSACTION_ERROR_LABEL = "TransientTransactionError";
+
+    /**
+     * An error label indicating that the exception can be treated as an unknown transaction commit result.
+     *
+     * @see #hasErrorLabel(String)
+     * @since 3.8
+     */
+    public static final String UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL = "UnknownTransactionCommitResult";
+
     private static final long serialVersionUID = -4415279469780082174L;
 
     private final int code;
+    private final Set<String> errorLabels = new HashSet<String>();
 
     /**
      * Static helper to create or cast a MongoException from a throwable
      *
-     * @param t a throwable
-     * @return and MongoException
+     * @param t a throwable, which may be null
+     * @return a MongoException
      */
-    public static MongoException fromThrowable(final Throwable t) {
+    @Nullable
+    public static MongoException fromThrowable(@Nullable final Throwable t) {
         if (t == null) {
             return null;
-        } else if (t instanceof MongoException) {
+        } else {
+            return fromThrowableNonNull(t);
+        }
+    }
+
+    /**
+     * Static helper to create or cast a MongoException from a throwable
+     *
+     * @param t a throwable, which may not be null
+     * @return a MongoException
+     * @since 3.7
+     */
+    public static MongoException fromThrowableNonNull(final Throwable t) {
+      if (t instanceof MongoException) {
             return (MongoException) t;
         } else {
             return new MongoException(t.getMessage(), t);
@@ -84,4 +124,51 @@ public MongoException(final int code, final String msg, final Throwable t) {
     public int getCode() {
         return code;
     }
+
+    /**
+     * Adds the given error label to the exception.
+     *
+     * @param errorLabel the non-null error label to add to the exception
+     *
+     * @since 3.8
+     */
+    public void addLabel(final String errorLabel) {
+        notNull("errorLabel", errorLabel);
+        errorLabels.add(errorLabel);
+    }
+
+    /**
+     * Removes the given error label from the exception.
+     *
+     * @param errorLabel the non-null error label to remove from the exception
+     *
+     * @since 3.8
+     */
+    public void removeLabel(final String errorLabel) {
+        notNull("errorLabel", errorLabel);
+        errorLabels.remove(errorLabel);
+    }
+
+    /**
+     * Gets the set of error labels associated with this exception.
+     *
+     * @return the error labels, which may not be null but may be empty
+     * @since 3.8
+     */
+    public Set<String> getErrorLabels() {
+        return Collections.unmodifiableSet(errorLabels);
+    }
+
+    /**
+     * Return true if the exception is labelled with the given error label, and false otherwise.
+     *
+     * @param errorLabel the non-null error label
+     * @return true if the exception is labelled with the given error label
+     * @since 3.8
+     */
+    public boolean hasErrorLabel(final String errorLabel) {
+        notNull("errorLabel", errorLabel);
+        return errorLabels.contains(errorLabel);
+    }
+
 }
diff --git a/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java b/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java
index d0e82de82e8..3557041e579 100644
--- a/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java
+++ b/driver-core/src/main/com/mongodb/MongoExecutionTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoGridFSException.java b/driver-core/src/main/com/mongodb/MongoGridFSException.java
index 8990953afc9..78d2956fe41 100644
--- a/driver-core/src/main/com/mongodb/MongoGridFSException.java
+++ b/driver-core/src/main/com/mongodb/MongoGridFSException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/MongoIncompatibleDriverException.java b/driver-core/src/main/com/mongodb/MongoIncompatibleDriverException.java
index c3142633b89..9b7030bcf63 100644
--- a/driver-core/src/main/com/mongodb/MongoIncompatibleDriverException.java
+++ b/driver-core/src/main/com/mongodb/MongoIncompatibleDriverException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoInternalException.java b/driver-core/src/main/com/mongodb/MongoInternalException.java
index 5a3e92d9369..a6c3b33dc33 100644
--- a/driver-core/src/main/com/mongodb/MongoInternalException.java
+++ b/driver-core/src/main/com/mongodb/MongoInternalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoInterruptedException.java b/driver-core/src/main/com/mongodb/MongoInterruptedException.java
index eb5000171b2..c225bda4ba5 100644
--- a/driver-core/src/main/com/mongodb/MongoInterruptedException.java
+++ b/driver-core/src/main/com/mongodb/MongoInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoNamespace.java b/driver-core/src/main/com/mongodb/MongoNamespace.java
index 7a542d34b1b..db65fc671ec 100644
--- a/driver-core/src/main/com/mongodb/MongoNamespace.java
+++ b/driver-core/src/main/com/mongodb/MongoNamespace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,16 @@
 package com.mongodb;
 
 import com.mongodb.annotations.Immutable;
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.HashSet;
+import java.util.Set;
 
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Arrays.asList;
 
 /**
  * A MongoDB namespace, which includes a database name and collection name.
@@ -30,35 +37,78 @@
 public final class MongoNamespace {
     public static final String COMMAND_COLLECTION_NAME = "$cmd";
 
+    private static final Set<Character> PROHIBITED_CHARACTERS_IN_DATABASE_NAME =
+            new HashSet<Character>(asList('\0', '/', '\\', ' ', '"', '.'));
+
     private final String databaseName;
     private final String collectionName;
+    @BsonIgnore
     private final String fullName;  // cache to avoid repeated string building
 
     /**
-     * Construct an instance.
+     * Check the validity of the given database name. A valid database name is non-null, non-empty, and does not contain any of the
+     * following characters: {@code '\0', '/', '\\', ' ', '"', '.'}. The server may impose additional restrictions on database names.
      *
-     * @param fullName the full namespace
+     * @param databaseName the database name
+     * @throws IllegalArgumentException if the database name is invalid
+     * @since 3.4
+     * @mongodb.driver.manual reference/limits/#naming-restrictions Naming Restrictions
      */
-    public MongoNamespace(final String fullName) {
-        notNull("fullName", fullName);
-        isTrueArgument("fullName is of form <db>.<collection>", isFullNameValid(fullName));
+    public static void checkDatabaseNameValidity(final String databaseName) {
+        notNull("databaseName", databaseName);
+        isTrueArgument("databaseName is not empty", !databaseName.isEmpty());
+        for (int i = 0; i < databaseName.length(); i++) {
+            isTrueArgument("databaseName does not contain '" + databaseName.charAt(i) + "'",
+                    !PROHIBITED_CHARACTERS_IN_DATABASE_NAME.contains(databaseName.charAt(i)));
+        }
+    }
 
+    /**
+     * Check the validity of the given collection name.   A valid collection name is non-null and non-empty.  The server may impose
+     * additional restrictions on collection names.
+     *
+     * @param collectionName the collection name
+     * @throws IllegalArgumentException if the collection name is invalid
+     * @since 3.4
+     * @mongodb.driver.manual reference/limits/#naming-restrictions Naming Restrictions
+     */
+    public static void checkCollectionNameValidity(final String collectionName) {
+        notNull("collectionName", collectionName);
+        isTrueArgument("collectionName is not empty", !collectionName.isEmpty());
+    }
 
+    /**
+     * Construct an instance for the given full name.  The database name is the string preceding the first {@code "."} character.
+     *
+     * @param fullName the non-null full namespace
+     * @see #checkDatabaseNameValidity(String)
+     * @see #checkCollectionNameValidity(String)
+     */
+    public MongoNamespace(final String fullName) {
+        notNull("fullName", fullName);
+        this.fullName = fullName;
         this.databaseName = getDatatabaseNameFromFullName(fullName);
         this.collectionName = getCollectionNameFullName(fullName);
-        this.fullName = fullName;
+        checkDatabaseNameValidity(databaseName);
+        checkCollectionNameValidity(collectionName);
     }
 
     /**
-     * Construct an instance.
+     * Construct an instance from the given database name and collection name.
      *
-     * @param databaseName the non-null database name
-     * @param collectionName the non-null collection name
+     * @param databaseName   the valid database name
+     * @param collectionName the valid collection name
+     * @see #checkDatabaseNameValidity(String)
+     * @see #checkCollectionNameValidity(String)
      */
-    public MongoNamespace(final String databaseName, final String collectionName) {
-        this.databaseName = notNull("databaseName", databaseName);
-        this.collectionName = notNull("collectionName", collectionName);
-        this.fullName = databaseName + "." + collectionName;
+    @BsonCreator
+    public MongoNamespace(@BsonProperty("db") final String databaseName,
+                          @BsonProperty("coll") final String collectionName) {
+        checkDatabaseNameValidity(databaseName);
+        checkCollectionNameValidity(collectionName);
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
+        this.fullName = databaseName + '.' + collectionName;
     }
 
     /**
@@ -66,6 +116,7 @@ public MongoNamespace(final String databaseName, final String collectionName) {
      *
      * @return the database name
      */
+    @BsonProperty("db")
     public String getDatabaseName() {
         return databaseName;
     }
@@ -75,6 +126,7 @@ public String getDatabaseName() {
      *
      * @return the collection name
      */
+    @BsonProperty("coll")
     public String getCollectionName() {
         return collectionName;
     }
@@ -126,29 +178,19 @@ public int hashCode() {
         return result;
     }
 
-    private static boolean isFullNameValid(final String fullName) {
-        int firstDotIndex = fullName.indexOf(".");
-
-        if (firstDotIndex == -1) {
-            return false;
-        }
-        if (firstDotIndex == 0) {
-            return false;
-        }
-        if (fullName.charAt(fullName.length() - 1) == '.') {
-            return false;
-        }
-        if (fullName.charAt(firstDotIndex + 1) == '.') {
-            return false;
-        }
-        return true;
-    }
-
     private static String getCollectionNameFullName(final String namespace) {
-        return namespace.substring(namespace.indexOf('.') + 1);
+        int firstDot = namespace.indexOf('.');
+        if (firstDot == -1) {
+            return namespace;
+        }
+        return namespace.substring(firstDot + 1);
     }
 
     private static String getDatatabaseNameFromFullName(final String namespace) {
-        return namespace.substring(0, namespace.indexOf('.'));
+        int firstDot = namespace.indexOf('.');
+        if (firstDot == -1) {
+            return "";
+        }
+        return namespace.substring(0, firstDot);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/MongoNodeIsRecoveringException.java b/driver-core/src/main/com/mongodb/MongoNodeIsRecoveringException.java
index dd90889dc1e..65bb1ec4742 100644
--- a/driver-core/src/main/com/mongodb/MongoNodeIsRecoveringException.java
+++ b/driver-core/src/main/com/mongodb/MongoNodeIsRecoveringException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,36 @@
 
 package com.mongodb;
 
+import org.bson.BsonDocument;
+
 /**
  * An exception indicating that the server is a member of a replica set but is in recovery mode, and therefore refused to execute
  * the operation. This can happen when a server is starting up and trying to join the replica set.
  *
  * @since 3.0
  */
-public class MongoNodeIsRecoveringException extends MongoServerException {
+public class MongoNodeIsRecoveringException extends MongoCommandException {
     private static final long serialVersionUID = 6062524147327071635L;
 
+    /**
+     * Construct an instance.
+     *
+     * @param response      the full response from the server
+     * @param serverAddress the address of the server
+     * @since 3.8
+     */
+    public MongoNodeIsRecoveringException(final BsonDocument response, final ServerAddress serverAddress) {
+        super(response, serverAddress);
+    }
+
     /**
      * Construct an instance.
      *
      * @param serverAddress the address of the server
+     * @deprecated Prefer {@link #MongoNodeIsRecoveringException(BsonDocument, ServerAddress)}
      */
+    @Deprecated
     public MongoNodeIsRecoveringException(final ServerAddress serverAddress) {
-        super("The server is in recovery mode and did not execute the operation", serverAddress);
+        super(new BsonDocument(), serverAddress);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/MongoNotPrimaryException.java b/driver-core/src/main/com/mongodb/MongoNotPrimaryException.java
index 8e8cb5594d3..c33afb9c105 100644
--- a/driver-core/src/main/com/mongodb/MongoNotPrimaryException.java
+++ b/driver-core/src/main/com/mongodb/MongoNotPrimaryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,36 @@
 
 package com.mongodb;
 
+import org.bson.BsonDocument;
+
 /**
  * An exception indicating that the server is a member of a replica set but is not the primary, and therefore refused to execute either a
  * write operation or a read operation that required a primary.  This can happen during a replica set election.
  *
  * @since 3.0
  */
-public class MongoNotPrimaryException extends MongoServerException {
+public class MongoNotPrimaryException extends MongoCommandException {
     private static final long serialVersionUID = 694876345217027108L;
 
+    /**
+     * Construct an instance.
+     *
+     * @param response      the full response from the server
+     * @param serverAddress the address of the server
+     * @since 3.8
+     */
+    public MongoNotPrimaryException(final BsonDocument response, final ServerAddress serverAddress) {
+        super(response, serverAddress);
+    }
+
     /**
      * Construct an instance.
      *
      * @param serverAddress the address of the server
+     * @deprecated Prefer {@link #MongoNotPrimaryException(BsonDocument, ServerAddress)}
      */
+    @Deprecated
     public MongoNotPrimaryException(final ServerAddress serverAddress) {
-        super("The server is not the primary and did not execute the operation", serverAddress);
+        super(new BsonDocument(), serverAddress);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/MongoQueryException.java b/driver-core/src/main/com/mongodb/MongoQueryException.java
index b9452594caf..fd31c773294 100644
--- a/driver-core/src/main/com/mongodb/MongoQueryException.java
+++ b/driver-core/src/main/com/mongodb/MongoQueryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,19 @@ public MongoQueryException(final ServerAddress address, final int errorCode, fin
         this.errorMessage = errorMessage;
     }
 
+    /**
+     * Construct an instance from a command exception.
+     *
+     * @param commandException the command exception
+     * @since 3.7
+     */
+    public MongoQueryException(final MongoCommandException commandException) {
+        this(commandException.getServerAddress(), commandException.getErrorCode(), commandException.getErrorMessage());
+        for (String label : commandException.getErrorLabels()) {
+            addLabel(label);
+        }
+    }
+
     /**
      * Gets the error code for this query failure.
      *
diff --git a/driver-core/src/main/com/mongodb/MongoSecurityException.java b/driver-core/src/main/com/mongodb/MongoSecurityException.java
index b30f4586ae9..0eb04f1e160 100644
--- a/driver-core/src/main/com/mongodb/MongoSecurityException.java
+++ b/driver-core/src/main/com/mongodb/MongoSecurityException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoServerException.java b/driver-core/src/main/com/mongodb/MongoServerException.java
index 72e6b860df4..2d7f3e5c78f 100644
--- a/driver-core/src/main/com/mongodb/MongoServerException.java
+++ b/driver-core/src/main/com/mongodb/MongoServerException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoSocketClosedException.java b/driver-core/src/main/com/mongodb/MongoSocketClosedException.java
index dc1de9df944..d6f4337ca70 100644
--- a/driver-core/src/main/com/mongodb/MongoSocketClosedException.java
+++ b/driver-core/src/main/com/mongodb/MongoSocketClosedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoSocketException.java b/driver-core/src/main/com/mongodb/MongoSocketException.java
index 798dabff5b6..939cb7c032b 100644
--- a/driver-core/src/main/com/mongodb/MongoSocketException.java
+++ b/driver-core/src/main/com/mongodb/MongoSocketException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoSocketOpenException.java b/driver-core/src/main/com/mongodb/MongoSocketOpenException.java
index 60db004252c..822c592cb0a 100644
--- a/driver-core/src/main/com/mongodb/MongoSocketOpenException.java
+++ b/driver-core/src/main/com/mongodb/MongoSocketOpenException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,4 +34,15 @@ public class MongoSocketOpenException extends MongoSocketException {
     public MongoSocketOpenException(final String message, final ServerAddress address, final Throwable cause) {
         super(message, address, cause);
     }
+
+    /**
+     * Construct an instance.
+     *
+     * @param message the message
+     * @param address the server address
+     * @since 3.10
+     */
+    public MongoSocketOpenException(final String message, final ServerAddress address) {
+        super(message, address);
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/MongoSocketReadException.java b/driver-core/src/main/com/mongodb/MongoSocketReadException.java
index 9c45f6af590..942429bf049 100644
--- a/driver-core/src/main/com/mongodb/MongoSocketReadException.java
+++ b/driver-core/src/main/com/mongodb/MongoSocketReadException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoSocketReadTimeoutException.java b/driver-core/src/main/com/mongodb/MongoSocketReadTimeoutException.java
index 92f8ecbbd79..4bb658a9061 100644
--- a/driver-core/src/main/com/mongodb/MongoSocketReadTimeoutException.java
+++ b/driver-core/src/main/com/mongodb/MongoSocketReadTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoSocketWriteException.java b/driver-core/src/main/com/mongodb/MongoSocketWriteException.java
index 30635b01ccd..aeab09b463d 100644
--- a/driver-core/src/main/com/mongodb/MongoSocketWriteException.java
+++ b/driver-core/src/main/com/mongodb/MongoSocketWriteException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoTimeoutException.java b/driver-core/src/main/com/mongodb/MongoTimeoutException.java
index 644a5856d78..ff9623b09f0 100644
--- a/driver-core/src/main/com/mongodb/MongoTimeoutException.java
+++ b/driver-core/src/main/com/mongodb/MongoTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/MongoWaitQueueFullException.java b/driver-core/src/main/com/mongodb/MongoWaitQueueFullException.java
index 7464250c755..490b71be946 100644
--- a/driver-core/src/main/com/mongodb/MongoWaitQueueFullException.java
+++ b/driver-core/src/main/com/mongodb/MongoWaitQueueFullException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,9 @@
  *
  * @see com.mongodb.connection.ConnectionPoolSettings#getMaxWaitQueueSize()
  * @since 3.0
+ * @deprecated In the next major release the limit on wait queue size will be removed, so this exception will no longer be thrown
  */
+@Deprecated
 public class MongoWaitQueueFullException extends MongoClientException {
 
     private static final long serialVersionUID = 1482094507852255793L;
diff --git a/driver-core/src/main/com/mongodb/MongoWriteConcernException.java b/driver-core/src/main/com/mongodb/MongoWriteConcernException.java
index 39df6e14f73..9e6041db740 100644
--- a/driver-core/src/main/com/mongodb/MongoWriteConcernException.java
+++ b/driver-core/src/main/com/mongodb/MongoWriteConcernException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.mongodb;
 
 import com.mongodb.bulk.WriteConcernError;
+import com.mongodb.lang.Nullable;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -51,7 +52,7 @@ public MongoWriteConcernException(final WriteConcernError writeConcernError, fin
      * @param serverAddress     the non-null server address
      * @since 3.2
      */
-    public MongoWriteConcernException(final WriteConcernError writeConcernError, final WriteConcernResult writeConcernResult,
+    public MongoWriteConcernException(final WriteConcernError writeConcernError, @Nullable final WriteConcernResult writeConcernResult,
                                       final ServerAddress serverAddress) {
         super(writeConcernError.getCode(), writeConcernError.getMessage(), serverAddress);
         this.writeConcernResult = writeConcernResult;
diff --git a/driver-core/src/main/com/mongodb/MongoWriteException.java b/driver-core/src/main/com/mongodb/MongoWriteException.java
index 674c5534032..4a83efd72a7 100644
--- a/driver-core/src/main/com/mongodb/MongoWriteException.java
+++ b/driver-core/src/main/com/mongodb/MongoWriteException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/ReadConcern.java b/driver-core/src/main/com/mongodb/ReadConcern.java
index f712dfe443d..d5ee34b9d6c 100644
--- a/driver-core/src/main/com/mongodb/ReadConcern.java
+++ b/driver-core/src/main/com/mongodb/ReadConcern.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,28 +16,29 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
- * The readConcern option allows clients to choose a level of isolation for their reads.
+ * A read concern allows clients to choose a level of isolation for their reads.
  *
  * @mongodb.server.release 3.2
  * @mongodb.driver.manual reference/readConcern/ Read Concern
  * @since 3.2
  */
 public final class ReadConcern {
-    private final ReadConcernLevel readConcernLevel;
+    private final ReadConcernLevel level;
 
     /**
      * Construct a new read concern
      *
-     * @param readConcernLevel the read concern level
+     * @param level the read concern level
      */
-    public ReadConcern(final ReadConcernLevel readConcernLevel) {
-        this.readConcernLevel = notNull("readConcernLevel", readConcernLevel);
+    public ReadConcern(final ReadConcernLevel level) {
+        this.level = notNull("level", level);
     }
 
     /**
@@ -46,21 +47,59 @@ public ReadConcern(final ReadConcernLevel readConcernLevel) {
     public static final ReadConcern DEFAULT = new ReadConcern();
 
     /**
-     * Return the node's most recent copy of data. Provides no guarantee that the data has been written to a majority of the nodes.
+     * The local read concern.
      */
     public static final ReadConcern LOCAL = new ReadConcern(ReadConcernLevel.LOCAL);
 
     /**
-     * Return the node's most recent copy of the data confirmed as having been written to a majority of the nodes.
+     * The majority read concern.
      */
     public static final ReadConcern MAJORITY = new ReadConcern(ReadConcernLevel.MAJORITY);
 
+    /**
+     * The linearizable read concern.
+     *
+     * <p>
+     * This read concern is only compatible with {@link ReadPreference#primary()}.
+     * </p>
+     *
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public static final ReadConcern LINEARIZABLE = new ReadConcern(ReadConcernLevel.LINEARIZABLE);
+
+    /**
+     * The snapshot read concern.
+     *
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    public static final ReadConcern SNAPSHOT = new ReadConcern(ReadConcernLevel.SNAPSHOT);
+
+    /**
+     * The available read concern.
+     *
+     * @since 3.9
+     * @mongodb.server.release 3.6
+     */
+    public static final ReadConcern AVAILABLE = new ReadConcern(ReadConcernLevel.AVAILABLE);
+
+    /**
+     * Gets the read concern level.
+     *
+     * @return the read concern level, which may be null (which indicates to use the server's default level)
+     * @since 3.6
+     */
+    @Nullable
+    public ReadConcernLevel getLevel() {
+        return level;
+    }
 
     /**
      * @return true if this is the server default read concern
      */
     public boolean isServerDefault() {
-        return readConcernLevel == null;
+        return level == null;
     }
 
     /**
@@ -70,8 +109,8 @@ public boolean isServerDefault() {
      */
     public BsonDocument asDocument() {
         BsonDocument readConcern = new BsonDocument();
-        if (!isServerDefault()){
-            readConcern.put("level", new BsonString(readConcernLevel.getValue()));
+        if (level != null) {
+            readConcern.put("level", new BsonString(level.getValue()));
         }
         return readConcern;
     }
@@ -81,25 +120,21 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null) {
-            return false;
-        }
-        if (getClass() != o.getClass()) {
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
+
         ReadConcern that = (ReadConcern) o;
-        if (readConcernLevel != that.readConcernLevel) {
-            return false;
-        }
-        return true;
+
+        return level == that.level;
     }
 
     @Override
     public int hashCode() {
-        return readConcernLevel != null ? readConcernLevel.hashCode() : 0;
+        return level != null ? level.hashCode() : 0;
     }
 
     private ReadConcern() {
-        this.readConcernLevel = null;
+        this.level = null;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/ReadConcernLevel.java b/driver-core/src/main/com/mongodb/ReadConcernLevel.java
index fcaebfd05f7..16009b76b8b 100644
--- a/driver-core/src/main/com/mongodb/ReadConcernLevel.java
+++ b/driver-core/src/main/com/mongodb/ReadConcernLevel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,28 +20,54 @@
 import static java.lang.String.format;
 
 /**
- * The readConcern option allows clients to choose a level of isolation for their reads.
- *
- * The WiredTiger storage engine, introduces the readConcern option for replica sets and replica set shards.  Allowing clients to choose a
- * level of isolation for their reads.
+ * A read concern level allows clients to choose a level of isolation for their reads.
  *
  * @mongodb.server.release 3.2
- * @mongodb.driver.manual reference/readConcern/ Read Concern
+ * @mongodb.driver.manual reference/read-concern/#read-concern-levels Read Concern Levels
  * @since 3.2
  */
 public enum ReadConcernLevel {
 
     /**
-     * Return the node's most recent copy of data. Provides no guarantee that the data has been written to a majority of the nodes.
+     * The local read concern level.
      */
     LOCAL("local"),
 
     /**
-     * Return the node's most recent copy of the data confirmed as having been written to a majority of the nodes.
+     * The majority read concern level.
+     */
+    MAJORITY("majority"),
+
+    /**
+     * The linearizable read concern level.
+     *
+     * <p>
+     * This read concern level is only compatible with {@link ReadPreference#primary()}.
+     * </p>
+     *
+     * @since 3.4
+     * @mongodb.server.release 3.4
      */
-    MAJORITY("majority");
+    LINEARIZABLE("linearizable"),
+
+    /**
+     * The snapshot read concern level.
+     *
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    SNAPSHOT("snapshot"),
+
+    /**
+     * The available read concern level.
+     *
+     * @since 3.9
+     * @mongodb.server.release 3.6
+     */
+    AVAILABLE("available");
 
     private final String value;
+
     ReadConcernLevel(final String readConcernLevel) {
         this.value = readConcernLevel;
     }
diff --git a/driver-core/src/main/com/mongodb/ReadPreference.java b/driver-core/src/main/com/mongodb/ReadPreference.java
index 543d76d6777..ecaf7a0da3c 100644
--- a/driver-core/src/main/com/mongodb/ReadPreference.java
+++ b/driver-core/src/main/com/mongodb/ReadPreference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,24 @@
 
 package com.mongodb;
 
+import com.mongodb.TaggableReadPreference.NearestReadPreference;
+import com.mongodb.TaggableReadPreference.PrimaryPreferredReadPreference;
+import com.mongodb.TaggableReadPreference.SecondaryPreferredReadPreference;
+import com.mongodb.TaggableReadPreference.SecondaryReadPreference;
 import com.mongodb.annotations.Immutable;
 import com.mongodb.connection.ClusterDescription;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * A class that represents preferred replica set members to which a query or command can be sent.
@@ -62,7 +73,23 @@ public abstract class ReadPreference {
      * @param clusterDescription the cluster description
      * @return a list of matching server descriptions, which may be empty but may not be null
      */
-    public abstract List<ServerDescription> choose(final ClusterDescription clusterDescription);
+    public final List<ServerDescription> choose(final ClusterDescription clusterDescription) {
+        switch (clusterDescription.getType()) {
+            case REPLICA_SET:
+                return chooseForReplicaSet(clusterDescription);
+            case SHARDED:
+            case STANDALONE:
+                return chooseForNonReplicaSet(clusterDescription);
+            case UNKNOWN:
+                return Collections.emptyList();
+            default:
+                throw new UnsupportedOperationException("Unsupported cluster type: " + clusterDescription.getType());
+        }
+    }
+
+    protected abstract List<ServerDescription> chooseForNonReplicaSet(ClusterDescription clusterDescription);
+
+    protected abstract List<ServerDescription> chooseForReplicaSet(ClusterDescription clusterDescription);
 
     /**
      * Gets a read preference that forces read to the primary.
@@ -109,6 +136,77 @@ public static ReadPreference nearest() {
         return NEAREST;
     }
 
+    /**
+     * Gets a read preference that forces reads to the primary if available, otherwise to a secondary.
+     *
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads primary if available.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static ReadPreference primaryPreferred(final long maxStaleness, final TimeUnit timeUnit) {
+        return new PrimaryPreferredReadPreference(Collections.<TagSet>emptyList(), maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to a secondary that is less stale than the given maximum.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads secondary.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static ReadPreference secondary(final long maxStaleness, final TimeUnit timeUnit) {
+        return new SecondaryReadPreference(Collections.<TagSet>emptyList(), maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to a secondary that is less stale than the given maximumm if one is available,
+     * otherwise to the primary.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>     *
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads secondary if available, otherwise from primary.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static ReadPreference secondaryPreferred(final long maxStaleness, final TimeUnit timeUnit) {
+        return new SecondaryPreferredReadPreference(Collections.<TagSet>emptyList(), maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to a primary or a secondary that is less stale than the given maximum.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads nearest
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static ReadPreference nearest(final long maxStaleness, final TimeUnit timeUnit) {
+        return new NearestReadPreference(Collections.<TagSet>emptyList(), maxStaleness, timeUnit);
+    }
+
     /**
      * Gets a read preference that forces reads to the primary if available, otherwise to a secondary with the given set of tags.
      *
@@ -117,7 +215,7 @@ public static ReadPreference nearest() {
      * @since 2.13
      */
     public static TaggableReadPreference primaryPreferred(final TagSet tagSet) {
-        return new TaggableReadPreference.PrimaryPreferredReadPreference(tagSet);
+        return new PrimaryPreferredReadPreference(singletonList(tagSet), null, MILLISECONDS);
     }
 
     /**
@@ -128,7 +226,7 @@ public static TaggableReadPreference primaryPreferred(final TagSet tagSet) {
      * @since 2.13
      */
     public static TaggableReadPreference secondary(final TagSet tagSet) {
-        return new TaggableReadPreference.SecondaryReadPreference(tagSet);
+        return new SecondaryReadPreference(singletonList(tagSet), null, MILLISECONDS);
     }
 
     /**
@@ -139,7 +237,7 @@ public static TaggableReadPreference secondary(final TagSet tagSet) {
      * @since 2.13
      */
     public static TaggableReadPreference secondaryPreferred(final TagSet tagSet) {
-        return new TaggableReadPreference.SecondaryPreferredReadPreference(tagSet);
+        return new SecondaryPreferredReadPreference(singletonList(tagSet), null, MILLISECONDS);
     }
 
     /**
@@ -150,9 +248,96 @@ public static TaggableReadPreference secondaryPreferred(final TagSet tagSet) {
      * @since 2.13
      */
     public static TaggableReadPreference nearest(final TagSet tagSet) {
-        return new TaggableReadPreference.NearestReadPreference(tagSet);
+        return new NearestReadPreference(singletonList(tagSet), null, MILLISECONDS);
     }
 
+    /**
+     * Gets a read preference that forces reads to the primary if available, otherwise to a secondary with the given set of tags
+     * that is less stale than the given maximum.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param tagSet the set of tags to limit the list of secondaries to.
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads primary if available, otherwise a secondary respective of tags.\
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference primaryPreferred(final TagSet tagSet,
+                                                          final long maxStaleness, final TimeUnit timeUnit) {
+        return new PrimaryPreferredReadPreference(singletonList(tagSet), maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to a secondary with the given set of tags that is less stale than the given maximum.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param tagSet the set of tags to limit the list of secondaries to
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads secondary respective of tags.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference secondary(final TagSet tagSet,
+                                                   final long maxStaleness, final TimeUnit timeUnit) {
+        return new SecondaryReadPreference(singletonList(tagSet), maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to a secondary with the given set of tags that is less stale than the given maximum,
+     * or the primary is none are available.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>     *
+     * @param tagSet the set of tags to limit the list of secondaries to
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads secondary if available respective of tags, otherwise from primary irrespective of tags.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference secondaryPreferred(final TagSet tagSet,
+                                                            final long maxStaleness, final TimeUnit timeUnit) {
+        return new SecondaryPreferredReadPreference(singletonList(tagSet), maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to the primary or a secondary with the given set of tags that is less stale than the
+     * given maximum.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param tagSet the set of tags to limit the list of secondaries to
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads nearest node respective of tags.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference nearest(final TagSet tagSet,
+                                                 final long maxStaleness, final TimeUnit timeUnit) {
+        return new NearestReadPreference(singletonList(tagSet), maxStaleness, timeUnit);
+    }
+
+
     /**
      * Gets a read preference that forces reads to the primary if available, otherwise to a secondary with one of the given sets of tags.
      * The driver will look for a secondary with each tag set in the given list, stopping after one is found,
@@ -163,7 +348,7 @@ public static TaggableReadPreference nearest(final TagSet tagSet) {
      * @since 2.13
      */
     public static TaggableReadPreference primaryPreferred(final List<TagSet> tagSetList) {
-        return new TaggableReadPreference.PrimaryPreferredReadPreference(tagSetList);
+        return new PrimaryPreferredReadPreference(tagSetList, null, MILLISECONDS);
     }
 
     /**
@@ -176,7 +361,7 @@ public static TaggableReadPreference primaryPreferred(final List<TagSet> tagSetL
      * @since 2.13
      */
     public static TaggableReadPreference secondary(final List<TagSet> tagSetList) {
-        return new TaggableReadPreference.SecondaryReadPreference(tagSetList);
+        return new SecondaryReadPreference(tagSetList, null, MILLISECONDS);
     }
 
     /**
@@ -189,7 +374,7 @@ public static TaggableReadPreference secondary(final List<TagSet> tagSetList) {
      * @since 2.13
      */
     public static TaggableReadPreference secondaryPreferred(final List<TagSet> tagSetList) {
-        return new TaggableReadPreference.SecondaryPreferredReadPreference(tagSetList);
+        return new SecondaryPreferredReadPreference(tagSetList, null, MILLISECONDS);
     }
 
     /**
@@ -202,7 +387,115 @@ public static TaggableReadPreference secondaryPreferred(final List<TagSet> tagSe
      * @since 2.13
      */
     public static TaggableReadPreference nearest(final List<TagSet> tagSetList) {
-        return new TaggableReadPreference.NearestReadPreference(tagSetList);
+        return new NearestReadPreference(tagSetList, null, MILLISECONDS);
+    }
+
+    /**
+     * Gets a read preference that forces reads to the primary if available, otherwise to a secondary with one of the given sets of tags
+     * that is less stale than the given maximum.
+     *
+     * <p>
+     * The driver will look for a secondary with each tag set in the given list, stopping after one is found,
+     * or failing if no secondary can be found that matches any of the tag sets in the list.
+     * </p>
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param tagSetList the list of tag sets to limit the list of secondaries to
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads primary if available, otherwise a secondary respective of tags.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference primaryPreferred(final List<TagSet> tagSetList,
+                                                          final long maxStaleness, final TimeUnit timeUnit) {
+        return new PrimaryPreferredReadPreference(tagSetList, maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to a secondary with one of the given sets of tags that is less stale than
+     * the given maximum.
+     *
+     * <p>
+     * The driver will look for a secondary with each tag set in the given list, stopping after one is found,
+     * or failing if no secondary can be found that matches any of the tag sets in the list.
+     * </p>
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param tagSetList the list of tag sets to limit the list of secondaries to
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads secondary respective of tags.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference secondary(final List<TagSet> tagSetList,
+                                                   final long maxStaleness, final TimeUnit timeUnit) {
+        return new SecondaryReadPreference(tagSetList, maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to a secondary with one of the given sets of tags that is less stale than
+     * the given maximum.
+     *
+     * <p>
+     * The driver will look for a secondary with each tag set in the given list, stopping after one is found,
+     * or the primary if none are available.
+     * </p>
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param tagSetList the list of tag sets to limit the list of secondaries to
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads secondary if available respective of tags, otherwise from primary irrespective of tags.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference secondaryPreferred(final List<TagSet> tagSetList,
+                                                            final long maxStaleness, final TimeUnit timeUnit) {
+        return new SecondaryPreferredReadPreference(tagSetList, maxStaleness, timeUnit);
+    }
+
+    /**
+     * Gets a read preference that forces reads to the primary or a secondary with one of the given sets of tags that is less stale than
+     * the given maximum.
+     *
+     * <p>
+     * The driver will look for a secondary with each tag set in the given list, stopping after one is found,
+     * or the primary if none are available.
+     * </p>
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param tagSetList the list of tag sets to limit the list of secondaries to
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return ReadPreference which reads nearest node respective of tags.
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference nearest(final List<TagSet> tagSetList,
+                                                 final long maxStaleness, final TimeUnit timeUnit) {
+        return new NearestReadPreference(tagSetList, maxStaleness, timeUnit);
     }
 
     /**
@@ -212,9 +505,7 @@ public static TaggableReadPreference nearest(final List<TagSet> tagSetList) {
      * @return the read preference
      */
     public static ReadPreference valueOf(final String name) {
-        if (name == null) {
-            throw new IllegalArgumentException();
-        }
+        notNull("name", name);
 
         String nameToCheck = name.toLowerCase();
 
@@ -246,27 +537,54 @@ public static ReadPreference valueOf(final String name) {
      * @since 2.13
      */
     public static TaggableReadPreference valueOf(final String name, final List<TagSet> tagSetList) {
-        if (name == null) {
-            throw new IllegalArgumentException("Name cannot be null");
-        }
+        return valueOf(name, tagSetList, null, MILLISECONDS);
+    }
+
+    /**
+     * Creates a taggable read preference from the given read preference name, list of tag sets, and max allowable staleness of secondaries.
+     *
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     *
+     * @param name the name of the read preference
+     * @param tagSetList the list of tag sets
+     * @param maxStaleness the max allowable staleness of secondaries. The minimum value is either 90 seconds, or the heartbeat frequency
+     *                     plus 10 seconds, whichever is greatest.
+     * @param timeUnit the time unit of maxStaleness
+     * @return the taggable read preference
+     * @since 3.4
+     * @see TaggableReadPreference#getMaxStaleness(TimeUnit)
+     */
+    public static TaggableReadPreference valueOf(final String name, final List<TagSet> tagSetList, final long maxStaleness,
+                                                 final TimeUnit timeUnit) {
+        return valueOf(name, tagSetList, (Long) maxStaleness, timeUnit);
+    }
+
+    private static TaggableReadPreference valueOf(final String name, final List<TagSet> tagSetList, @Nullable final Long maxStaleness,
+                                                  final TimeUnit timeUnit) {
+        notNull("name", name);
+        notNull("tagSetList", tagSetList);
+        notNull("timeUnit", timeUnit);
 
         String nameToCheck = name.toLowerCase();
 
         if (nameToCheck.equals(PRIMARY.getName().toLowerCase())) {
-            throw new IllegalArgumentException("Primary read preference can not also specify tag sets");
+            throw new IllegalArgumentException("Primary read preference can not also specify tag sets or max staleness");
         }
 
         if (nameToCheck.equals(SECONDARY.getName().toLowerCase())) {
-            return new TaggableReadPreference.SecondaryReadPreference(tagSetList);
+            return new SecondaryReadPreference(tagSetList, maxStaleness, timeUnit);
         }
         if (nameToCheck.equals(SECONDARY_PREFERRED.getName().toLowerCase())) {
-            return new TaggableReadPreference.SecondaryPreferredReadPreference(tagSetList);
+            return new SecondaryPreferredReadPreference(tagSetList, maxStaleness, timeUnit);
         }
         if (nameToCheck.equals(PRIMARY_PREFERRED.getName().toLowerCase())) {
-            return new TaggableReadPreference.PrimaryPreferredReadPreference(tagSetList);
+            return new PrimaryPreferredReadPreference(tagSetList, maxStaleness, timeUnit);
         }
         if (nameToCheck.equals(NEAREST.getName().toLowerCase())) {
-            return new TaggableReadPreference.NearestReadPreference(tagSetList);
+            return new NearestReadPreference(tagSetList, maxStaleness, timeUnit);
         }
 
         throw new IllegalArgumentException("No match for read preference of " + name);
@@ -299,13 +617,20 @@ public int hashCode() {
             return getName().hashCode();
         }
 
+        public BsonDocument toDocument() {
+            return new BsonDocument("mode", new BsonString(getName()));
+        }
+
+        @Override
         @SuppressWarnings("deprecation")
-        public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
+        protected List<ServerDescription> chooseForReplicaSet(final ClusterDescription clusterDescription) {
             return clusterDescription.getPrimaries();
         }
 
-        public BsonDocument toDocument() {
-            return new BsonDocument("mode", new BsonString(getName()));
+        @Override
+        @SuppressWarnings("deprecation")
+        protected List<ServerDescription> chooseForNonReplicaSet(final ClusterDescription clusterDescription) {
+            return clusterDescription.getAny();
         }
 
         @Override
@@ -322,9 +647,9 @@ public String getName() {
 
     static {
         PRIMARY = new PrimaryReadPreference();
-        SECONDARY = new TaggableReadPreference.SecondaryReadPreference();
-        SECONDARY_PREFERRED = new TaggableReadPreference.SecondaryPreferredReadPreference();
-        PRIMARY_PREFERRED = new TaggableReadPreference.PrimaryPreferredReadPreference();
-        NEAREST = new TaggableReadPreference.NearestReadPreference();
+        SECONDARY = new SecondaryReadPreference();
+        SECONDARY_PREFERRED = new SecondaryPreferredReadPreference();
+        PRIMARY_PREFERRED = new PrimaryPreferredReadPreference();
+        NEAREST = new NearestReadPreference();
    }
 }
diff --git a/driver-core/src/main/com/mongodb/ServerAddress.java b/driver-core/src/main/com/mongodb/ServerAddress.java
index 04a8b20ed9b..58708320357 100644
--- a/driver-core/src/main/com/mongodb/ServerAddress.java
+++ b/driver-core/src/main/com/mongodb/ServerAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,14 @@
 package com.mongodb;
 
 import com.mongodb.annotations.Immutable;
+import com.mongodb.lang.Nullable;
 
 import java.io.Serializable;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Represents the location of a Mongo server - i.e. server name and port number
@@ -45,7 +48,7 @@ public ServerAddress() {
      *
      * @param host hostname
      */
-    public ServerAddress(final String host) {
+    public ServerAddress(@Nullable final String host) {
         this(host, defaultPort());
     }
 
@@ -83,7 +86,7 @@ public ServerAddress(final InetSocketAddress inetSocketAddress) {
      * @param host hostname
      * @param port mongod port
      */
-    public ServerAddress(final String host, final int port) {
+    public ServerAddress(@Nullable final String host, final int port) {
         String hostToUse = host;
         if (hostToUse == null) {
             hostToUse = defaultHost();
@@ -92,7 +95,6 @@ public ServerAddress(final String host, final int port) {
         if (hostToUse.length() == 0) {
             hostToUse = defaultHost();
         }
-
         int portToUse = port;
 
         if (hostToUse.startsWith("[")) {
@@ -109,10 +111,11 @@ public ServerAddress(final String host, final int port) {
                 }
                 portToUse = Integer.parseInt(host.substring(portIdx + 2));
             }
-            hostToUse = host.substring(0, idx + 1);
+            hostToUse = host.substring(1, idx);
         } else {
             int idx = hostToUse.indexOf(":");
-            if (idx > 0) {
+            int lastIdx = hostToUse.lastIndexOf(":");
+            if (idx == lastIdx && idx > 0) {
                 if (port != defaultPort()) {
                     throw new IllegalArgumentException("can't specify port in construct and via host");
                 }
@@ -124,7 +127,6 @@ public ServerAddress(final String host, final int port) {
                 hostToUse = hostToUse.substring(0, idx).trim();
             }
         }
-
         this.host = hostToUse.toLowerCase();
         this.port = portToUse;
     }
@@ -189,6 +191,27 @@ public InetSocketAddress getSocketAddress() {
         }
     }
 
+    /**
+     * Gets all underlying socket addresses
+     *
+     * @return array of socket addresses
+     *
+     * @since 3.9
+     */
+    public List<InetSocketAddress> getSocketAddresses() {
+        try {
+            InetAddress[] inetAddresses = InetAddress.getAllByName(host);
+            List<InetSocketAddress> inetSocketAddressList = new ArrayList<InetSocketAddress>();
+            for (InetAddress inetAddress : inetAddresses) {
+                inetSocketAddressList.add(new InetSocketAddress(inetAddress, port));
+            }
+
+            return inetSocketAddressList;
+        } catch (UnknownHostException e) {
+            throw new MongoSocketException(e.getMessage(), this, e);
+        }
+    }
+
     @Override
     public String toString() {
         return host + ":" + port;
@@ -217,16 +240,10 @@ public static int defaultPort() {
      *
      * @param hostName the address to compare
      * @return if they are the same
+     * @deprecated use the {@link #equals(Object)} method instead
      */
+    @Deprecated
     public boolean sameHost(final String hostName) {
-        String hostToUse = hostName;
-        int idx = hostToUse.indexOf(":");
-        int portToUse = defaultPort();
-        if (idx > 0) {
-            portToUse = Integer.parseInt(hostToUse.substring(idx + 1));
-            hostToUse = hostToUse.substring(0, idx);
-        }
-
-        return getPort() == portToUse && getHost().equalsIgnoreCase(hostToUse);
+        return equals(new ServerAddress(hostName));
     }
 }
diff --git a/driver-core/src/main/com/mongodb/ServerCursor.java b/driver-core/src/main/com/mongodb/ServerCursor.java
index 8e4ea0d4379..fe4c8cfbcf3 100644
--- a/driver-core/src/main/com/mongodb/ServerCursor.java
+++ b/driver-core/src/main/com/mongodb/ServerCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,10 +41,6 @@ public ServerCursor(final long id, final ServerAddress address) {
         if (id == 0) {
             throw new IllegalArgumentException();
         }
-        if (address == null) {
-            throw new IllegalArgumentException();
-        }
-
         this.id = id;
         this.address = address;
     }
diff --git a/driver-core/src/main/com/mongodb/Tag.java b/driver-core/src/main/com/mongodb/Tag.java
index 57908b3acab..bb4c6ac1bcb 100644
--- a/driver-core/src/main/com/mongodb/Tag.java
+++ b/driver-core/src/main/com/mongodb/Tag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/TagSet.java b/driver-core/src/main/com/mongodb/TagSet.java
index 87dc893ef7e..5d0cc1b0c1d 100644
--- a/driver-core/src/main/com/mongodb/TagSet.java
+++ b/driver-core/src/main/com/mongodb/TagSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -73,7 +74,14 @@ public TagSet(final List<Tag> tagList) {
                 throw new IllegalArgumentException("Duplicate tag names not allowed in a tag set: " + tag.getName());
             }
         }
-        this.wrapped = Collections.unmodifiableList(new ArrayList<Tag>(tagList));
+        ArrayList<Tag> copy = new ArrayList<Tag>(tagList);
+        Collections.sort(copy, new Comparator<Tag>() {
+            @Override
+            public int compare(final Tag o1, final Tag o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+        });
+        this.wrapped = Collections.unmodifiableList(copy);
     }
 
     @Override
@@ -82,10 +90,10 @@ public Iterator<Tag> iterator() {
     }
 
     /**
-     * Returns <tt>true</tt> if this tag set contains all of the elements of the specified tag set.
+     * Returns {@code true} if this tag set contains all of the elements of the specified tag set.
      *
      * @param tagSet tag set to be checked for containment in this tag set
-     * @return <tt>true</tt> if this tag set contains all of the elements of the specified tag set
+     * @return {@code true} if this tag set contains all of the elements of the specified tag set
      */
     public boolean containsAll(final TagSet tagSet) {
         return wrapped.containsAll(tagSet.wrapped);
diff --git a/driver-core/src/main/com/mongodb/TaggableReadPreference.java b/driver-core/src/main/com/mongodb/TaggableReadPreference.java
index a3460d951d2..d80e98045e8 100644
--- a/driver-core/src/main/com/mongodb/TaggableReadPreference.java
+++ b/driver-core/src/main/com/mongodb/TaggableReadPreference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,37 +18,47 @@
 
 import com.mongodb.annotations.Immutable;
 import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterType;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
+import org.bson.BsonInt64;
 import org.bson.BsonString;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
+import static java.lang.String.format;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Abstract class for all preference which can be combined with tags
  */
 @Immutable
 public abstract class TaggableReadPreference extends ReadPreference {
+    private static final int SMALLEST_MAX_STALENESS_MS = 90000;
+    private static final int IDLE_WRITE_PERIOD_MS = 10000;
+
     private final List<TagSet> tagSetList = new ArrayList<TagSet>();
+    private final Long maxStalenessMS;
 
     TaggableReadPreference() {
+        this.maxStalenessMS = null;
     }
 
-    TaggableReadPreference(final TagSet tagSet) {
-        tagSetList.add(tagSet);
-    }
-
-    TaggableReadPreference(final List<TagSet> tagSetList) {
+    TaggableReadPreference(final List<TagSet> tagSetList, @Nullable final Long maxStaleness, final TimeUnit timeUnit) {
         notNull("tagSetList", tagSetList);
+        isTrueArgument("maxStaleness is null or >= 0", maxStaleness == null || maxStaleness >= 0);
+        this.maxStalenessMS = maxStaleness == null ? null : MILLISECONDS.convert(maxStaleness, timeUnit);
 
-        for (final TagSet tagSet : tagSetList) {
-            this.tagSetList.add(tagSet);
-        }
+        this.tagSetList.addAll(tagSetList);
     }
 
     @Override
@@ -64,6 +74,9 @@ public BsonDocument toDocument() {
             readPrefObject.put("tags", tagsListToBsonArray());
         }
 
+        if (maxStalenessMS != null) {
+            readPrefObject.put("maxStalenessSeconds", new BsonInt64(MILLISECONDS.toSeconds(maxStalenessMS)));
+        }
         return readPrefObject;
     }
 
@@ -77,9 +90,37 @@ public List<TagSet> getTagSetList() {
         return Collections.unmodifiableList(tagSetList);
     }
 
+    /**
+     * Gets the maximum acceptable staleness of a secondary in order to be considered for read operations.
+     * <p>
+     * The maximum staleness feature is designed to prevent badly-lagging servers from being selected. The staleness estimate is imprecise
+     * and shouldn't be used to try to select "up-to-date" secondaries.
+     * </p>
+     * <p>
+     * The driver estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses,
+     * and selects only those secondaries whose staleness is less than or equal to maxStaleness.
+     * </p>
+     * @param timeUnit the time unit in which to return the value
+     * @return the maximum acceptable staleness in the given time unit, or null if the value is not set
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    @Nullable
+    public Long getMaxStaleness(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        if (maxStalenessMS == null) {
+            return null;
+        }
+        return timeUnit.convert(maxStalenessMS, TimeUnit.MILLISECONDS);
+    }
+
     @Override
     public String toString() {
-        return getName() + (tagSetList.isEmpty() ? "" : ": " + tagSetList);
+        return "ReadPreference{"
+                       + "name=" + getName()
+                       + (tagSetList.isEmpty() ? "" : ", tagSetList=" + tagSetList)
+                       + (maxStalenessMS == null ? "" : ", maxStalenessMS=" + maxStalenessMS)
+                       + '}';
     }
 
     @Override
@@ -93,16 +134,147 @@ public boolean equals(final Object o) {
 
         TaggableReadPreference that = (TaggableReadPreference) o;
 
-        return tagSetList.equals(that.tagSetList);
+        if (maxStalenessMS != null ? !maxStalenessMS.equals(that.maxStalenessMS) : that.maxStalenessMS != null) {
+            return false;
+        }
+        if (!tagSetList.equals(that.tagSetList)) {
+            return false;
+        }
+
+        return true;
     }
 
     @Override
     public int hashCode() {
         int result = tagSetList.hashCode();
         result = 31 * result + getName().hashCode();
+        result = 31 * result + (maxStalenessMS != null ? maxStalenessMS.hashCode() : 0);
         return result;
     }
 
+    @Override
+    @SuppressWarnings("deprecation")
+    protected List<ServerDescription> chooseForNonReplicaSet(final ClusterDescription clusterDescription) {
+        return selectFreshServers(clusterDescription, clusterDescription.getAny());
+    }
+
+    protected static ClusterDescription copyClusterDescription(final ClusterDescription clusterDescription,
+                                                               final List<ServerDescription> selectedServers) {
+        return new ClusterDescription(clusterDescription.getConnectionMode(),
+                                             clusterDescription.getType(),
+                                             selectedServers,
+                                             clusterDescription.getClusterSettings(),
+                                             clusterDescription.getServerSettings());
+    }
+
+    protected List<ServerDescription> selectFreshServers(final ClusterDescription clusterDescription,
+                                                         final List<ServerDescription> servers) {
+        Long maxStaleness = getMaxStaleness(MILLISECONDS);
+        if (maxStaleness == null) {
+            return servers;
+        }
+
+        if (clusterDescription.getServerSettings() == null) {
+            throw new MongoConfigurationException("heartbeat frequency must be provided in cluster description");
+        }
+
+        if (!serversAreAllThreeDotFour(clusterDescription)) {
+            throw new MongoConfigurationException("Servers must all be at least version 3.4 when max staleness is configured");
+        }
+
+        if (clusterDescription.getType() != ClusterType.REPLICA_SET) {
+            return servers;
+        }
+
+        long heartbeatFrequencyMS = clusterDescription.getServerSettings().getHeartbeatFrequency(MILLISECONDS);
+
+        if (maxStaleness < Math.max(SMALLEST_MAX_STALENESS_MS, heartbeatFrequencyMS + IDLE_WRITE_PERIOD_MS)) {
+            if (SMALLEST_MAX_STALENESS_MS > heartbeatFrequencyMS + IDLE_WRITE_PERIOD_MS){
+                throw new MongoConfigurationException(format("Max staleness (%d sec) must be at least 90 seconds",
+                        getMaxStaleness(SECONDS)));
+            } else {
+                throw new MongoConfigurationException(format("Max staleness (%d ms) must be at least the heartbeat period (%d ms) "
+                                                                     + "plus the idle write period (%d ms)",
+                        maxStaleness, heartbeatFrequencyMS, IDLE_WRITE_PERIOD_MS));
+            }
+        }
+        List<ServerDescription> freshServers = new ArrayList<ServerDescription>(servers.size());
+
+        ServerDescription primary = findPrimary(clusterDescription);
+
+        if (primary != null) {
+            for (ServerDescription cur : servers) {
+                if (cur.isPrimary()) {
+                    freshServers.add(cur);
+                } else {
+                    if (getStalenessOfSecondaryRelativeToPrimary(primary, cur, heartbeatFrequencyMS) <= maxStaleness) {
+                        freshServers.add(cur);
+                    }
+                }
+            }
+        } else {
+            ServerDescription mostUpToDateSecondary = findMostUpToDateSecondary(clusterDescription);
+            for (ServerDescription cur : servers) {
+                if (getLastWriteDateNonNull(mostUpToDateSecondary).getTime() - getLastWriteDateNonNull(cur).getTime()
+                        + heartbeatFrequencyMS <= maxStaleness) {
+                    freshServers.add(cur);
+                }
+            }
+        }
+
+        return freshServers;
+    }
+
+    private long getStalenessOfSecondaryRelativeToPrimary(final ServerDescription primary, final ServerDescription serverDescription,
+                                                          final long heartbeatFrequencyMS) {
+        return getLastWriteDateNonNull(primary).getTime()
+                       + (serverDescription.getLastUpdateTime(MILLISECONDS) - primary.getLastUpdateTime(MILLISECONDS))
+                       - getLastWriteDateNonNull(serverDescription).getTime() + heartbeatFrequencyMS;
+    }
+
+    @Nullable
+    private ServerDescription findPrimary(final ClusterDescription clusterDescription) {
+        for (ServerDescription cur : clusterDescription.getServerDescriptions()) {
+            if (cur.isPrimary()) {
+                return cur;
+            }
+        }
+        return null;
+    }
+
+    private ServerDescription findMostUpToDateSecondary(final ClusterDescription clusterDescription) {
+        ServerDescription mostUpdateToDateSecondary = null;
+        for (ServerDescription cur : clusterDescription.getServerDescriptions()) {
+            if (cur.isSecondary()) {
+                if (mostUpdateToDateSecondary == null
+                            || getLastWriteDateNonNull(cur).getTime() > getLastWriteDateNonNull(mostUpdateToDateSecondary).getTime()) {
+                    mostUpdateToDateSecondary = cur;
+                }
+            }
+        }
+        if (mostUpdateToDateSecondary == null) {
+            throw new MongoInternalException("Expected at least one secondary in cluster description: " + clusterDescription);
+        }
+        return mostUpdateToDateSecondary;
+    }
+
+    private Date getLastWriteDateNonNull(final ServerDescription serverDescription) {
+        Date lastWriteDate = serverDescription.getLastWriteDate();
+        if (lastWriteDate == null) {
+            throw new MongoClientException("lastWriteDate should not be null in " + serverDescription);
+        }
+        return lastWriteDate;
+    }
+
+    private boolean serversAreAllThreeDotFour(final ClusterDescription clusterDescription) {
+        for (ServerDescription cur : clusterDescription.getServerDescriptions()) {
+            if (cur.isOk() && cur.getMaxWireVersion() < 5) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Read from secondary
      */
@@ -110,12 +282,8 @@ static class SecondaryReadPreference extends TaggableReadPreference {
         SecondaryReadPreference() {
         }
 
-        SecondaryReadPreference(final TagSet tagSet) {
-            super(tagSet);
-        }
-
-        SecondaryReadPreference(final List<TagSet> tagSetList) {
-            super(tagSetList);
+        SecondaryReadPreference(final List<TagSet> tagSetList, @Nullable final Long maxStaleness, final TimeUnit timeUnit) {
+            super(tagSetList, maxStaleness, timeUnit);
         }
 
         @Override
@@ -125,21 +293,21 @@ public String getName() {
 
         @Override
         @SuppressWarnings("deprecation")
-        public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
-
-            if (getTagSetList().isEmpty()) {
-                return clusterDescription.getSecondaries();
-            }
-
-            for (final TagSet tagSet : getTagSetList()) {
-                List<ServerDescription> servers = clusterDescription.getSecondaries(tagSet);
-                if (!servers.isEmpty()) {
-                    return servers;
+        protected List<ServerDescription> chooseForReplicaSet(final ClusterDescription clusterDescription) {
+            List<ServerDescription> selectedServers = selectFreshServers(clusterDescription, clusterDescription.getSecondaries());
+            if (!getTagSetList().isEmpty()) {
+                ClusterDescription nonStaleClusterDescription = copyClusterDescription(clusterDescription, selectedServers);
+                selectedServers = Collections.emptyList();
+                for (final TagSet tagSet : getTagSetList()) {
+                    List<ServerDescription> servers = nonStaleClusterDescription.getSecondaries(tagSet);
+                    if (!servers.isEmpty()) {
+                        selectedServers = servers;
+                        break;
+                    }
                 }
             }
-            return Collections.emptyList();
+            return selectedServers;
         }
-
     }
 
     /**
@@ -149,12 +317,8 @@ static class SecondaryPreferredReadPreference extends SecondaryReadPreference {
         SecondaryPreferredReadPreference() {
         }
 
-        SecondaryPreferredReadPreference(final TagSet tagSet) {
-            super(tagSet);
-        }
-
-        SecondaryPreferredReadPreference(final List<TagSet> tagSetList) {
-            super(tagSetList);
+        SecondaryPreferredReadPreference(final List<TagSet> tagSetList, @Nullable final Long maxStaleness, final TimeUnit timeUnit) {
+            super(tagSetList, maxStaleness, timeUnit);
         }
 
         @Override
@@ -164,9 +328,12 @@ public String getName() {
 
         @Override
         @SuppressWarnings("deprecation")
-        public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
-            List<ServerDescription> servers = super.choose(clusterDescription);
-            return (!servers.isEmpty()) ? servers : clusterDescription.getPrimaries();
+        protected List<ServerDescription> chooseForReplicaSet(final ClusterDescription clusterDescription) {
+            List<ServerDescription> selectedServers = super.chooseForReplicaSet(clusterDescription);
+            if (selectedServers.isEmpty()) {
+                selectedServers = clusterDescription.getPrimaries();
+            }
+            return selectedServers;
         }
     }
 
@@ -177,12 +344,8 @@ static class NearestReadPreference extends TaggableReadPreference {
         NearestReadPreference() {
         }
 
-        NearestReadPreference(final TagSet tagSet) {
-            super(tagSet);
-        }
-
-        NearestReadPreference(final List<TagSet> tagSetList) {
-            super(tagSetList);
+        NearestReadPreference(final List<TagSet> tagSetList, @Nullable final Long maxStaleness, final TimeUnit timeUnit) {
+            super(tagSetList, maxStaleness, timeUnit);
         }
 
 
@@ -194,19 +357,20 @@ public String getName() {
 
         @Override
         @SuppressWarnings("deprecation")
-        public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
-
-            if (getTagSetList().isEmpty()) {
-                return clusterDescription.getAnyPrimaryOrSecondary();
-            }
-
-            for (final TagSet tagSet : getTagSetList()) {
-                List<ServerDescription> servers = clusterDescription.getAnyPrimaryOrSecondary(tagSet);
-                if (!servers.isEmpty()) {
-                    return servers;
+        public List<ServerDescription> chooseForReplicaSet(final ClusterDescription clusterDescription) {
+            List<ServerDescription> selectedServers = selectFreshServers(clusterDescription, clusterDescription.getAnyPrimaryOrSecondary());
+            if (!getTagSetList().isEmpty()) {
+                ClusterDescription nonStaleClusterDescription = copyClusterDescription(clusterDescription, selectedServers);
+                selectedServers = Collections.emptyList();
+                for (final TagSet tagSet : getTagSetList()) {
+                    List<ServerDescription> servers = nonStaleClusterDescription.getAnyPrimaryOrSecondary(tagSet);
+                    if (!servers.isEmpty()) {
+                        selectedServers = servers;
+                        break;
+                    }
                 }
             }
-            return Collections.emptyList();
+            return selectedServers;
         }
     }
 
@@ -217,12 +381,8 @@ static class PrimaryPreferredReadPreference extends SecondaryReadPreference {
         PrimaryPreferredReadPreference() {
         }
 
-        PrimaryPreferredReadPreference(final TagSet tagSet) {
-            super(tagSet);
-        }
-
-        PrimaryPreferredReadPreference(final List<TagSet> tagSetList) {
-            super(tagSetList);
+        PrimaryPreferredReadPreference(final List<TagSet> tagSetList, @Nullable final Long maxStaleness, final TimeUnit timeUnit) {
+            super(tagSetList, maxStaleness, timeUnit);
         }
 
         @Override
@@ -232,9 +392,12 @@ public String getName() {
 
         @Override
         @SuppressWarnings("deprecation")
-        public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
-            List<ServerDescription> servers = clusterDescription.getPrimaries();
-            return (!servers.isEmpty()) ? servers : super.choose(clusterDescription);
+        protected List<ServerDescription> chooseForReplicaSet(final ClusterDescription clusterDescription) {
+            List<ServerDescription> selectedServers = selectFreshServers(clusterDescription, clusterDescription.getPrimaries());
+            if (selectedServers.isEmpty()) {
+                selectedServers = super.chooseForReplicaSet(clusterDescription);
+            }
+            return selectedServers;
         }
     }
 
diff --git a/driver-core/src/main/com/mongodb/TransactionOptions.java b/driver-core/src/main/com/mongodb/TransactionOptions.java
new file mode 100644
index 00000000000..09a05dcf65f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/TransactionOptions.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.Immutable;
+import com.mongodb.lang.Nullable;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * Options to apply to transactions. The default values for the options depend on context.  For options specified per-transaction, the
+ * default values come from the default transaction options.  For the default transaction options themselves, the default values come from
+ * the MongoClient on which the session was started.
+ *
+ * @see com.mongodb.session.ClientSession
+ * @see ClientSessionOptions
+ * @since 3.8
+ * @mongodb.server.release 4.0
+ */
+@Immutable
+public final class TransactionOptions {
+    private final ReadConcern readConcern;
+    private final WriteConcern writeConcern;
+    private final ReadPreference readPreference;
+    private final Long maxCommitTimeMS;
+
+    /**
+     * Gets the read concern.
+     *
+     * @return the read concern
+     */
+    @Nullable
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern
+     */
+    @Nullable
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Gets the read preference.
+     *
+     * @return the write concern
+     */
+    @Nullable
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    /**
+     * Gets the maximum amount of time to allow a single commitTransaction command to execute.  The default is null, which places no
+     * limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    @Nullable
+    public Long getMaxCommitTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        if (maxCommitTimeMS == null) {
+            return null;
+        }
+        return timeUnit.convert(maxCommitTimeMS, MILLISECONDS);
+    }
+
+    /**
+     * Gets an instance of a builder
+     *
+     * @return a builder instance
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Merge the two provided transaction options, with the first taking precedence over the second.
+     *
+     * @param options        the transaction options, which take precedence for any property that is non-null
+     * @param defaultOptions the default transaction options
+     * @return the merged transaction options
+     */
+    public static TransactionOptions merge(final TransactionOptions options, final TransactionOptions defaultOptions) {
+        notNull("options", options);
+        notNull("defaultOptions", defaultOptions);
+        return TransactionOptions.builder()
+                .writeConcern(options.getWriteConcern() == null
+                        ? defaultOptions.getWriteConcern() : options.getWriteConcern())
+                .readConcern(options.getReadConcern() == null
+                        ? defaultOptions.getReadConcern() : options.getReadConcern())
+                .readPreference(options.getReadPreference() == null
+                        ? defaultOptions.getReadPreference() : options.getReadPreference())
+                .maxCommitTime(options.getMaxCommitTime(MILLISECONDS) == null
+                                ? defaultOptions.getMaxCommitTime(MILLISECONDS) : options.getMaxCommitTime(MILLISECONDS),
+                        MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TransactionOptions that = (TransactionOptions) o;
+
+        if (maxCommitTimeMS != null ? !maxCommitTimeMS.equals(that.maxCommitTimeMS) : that.maxCommitTimeMS != null) {
+            return false;
+        }
+        if (readConcern != null ? !readConcern.equals(that.readConcern) : that.readConcern != null) {
+            return false;
+        }
+        if (writeConcern != null ? !writeConcern.equals(that.writeConcern) : that.writeConcern != null) {
+            return false;
+        }
+        if (readPreference != null ? !readPreference.equals(that.readPreference) : that.readPreference != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = readConcern != null ? readConcern.hashCode() : 0;
+        result = 31 * result + (writeConcern != null ? writeConcern.hashCode() : 0);
+        result = 31 * result + (readPreference != null ? readPreference.hashCode() : 0);
+        result = 31 * result + (maxCommitTimeMS != null ? maxCommitTimeMS.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "TransactionOptions{"
+                + "readConcern=" + readConcern
+                + ", writeConcern=" + writeConcern
+                + ", readPreference=" + readPreference
+                + ", maxCommitTimeMS" + maxCommitTimeMS
+                + '}';
+    }
+
+    /**
+     * The builder for transaction options
+     */
+    public static final class Builder {
+        private ReadConcern readConcern;
+        private WriteConcern writeConcern;
+        private ReadPreference readPreference;
+        private Long maxCommitTimeMS;
+
+        /**
+         * Sets the read concern.
+         *
+         * @param readConcern the read concern
+         * @return this
+         */
+        public Builder readConcern(@Nullable final ReadConcern readConcern) {
+            this.readConcern = readConcern;
+            return this;
+        }
+
+        /**
+         * Sets the write concern.
+         *
+         * @param writeConcern the write concern, which must be acknowledged
+         * @return this
+         */
+        public Builder writeConcern(@Nullable final WriteConcern writeConcern) {
+            this.writeConcern = writeConcern;
+            return this;
+        }
+
+        /**
+         * Sets the read preference.
+         *
+         * @param readPreference the read preference, which currently must be primary. This restriction may be relaxed in future versions.
+         * @return this
+         */
+        public Builder readPreference(@Nullable final ReadPreference readPreference) {
+            this.readPreference = readPreference;
+            return this;
+        }
+
+        /**
+         * Sets the maximum execution time on the server for the commitTransaction operation.
+         *
+         * @param maxCommitTime the max commit time, which must be either null or greater than zero, in the given time unit
+         * @param timeUnit      the time unit, which may not be null
+         * @return this
+         * @mongodb.server.release 4.2
+         * @since 3.11
+         */
+        public Builder maxCommitTime(@Nullable final Long maxCommitTime, final TimeUnit timeUnit) {
+            if (maxCommitTime == null) {
+                this.maxCommitTimeMS = null;
+            } else {
+                notNull("timeUnit", timeUnit);
+                isTrueArgument("maxCommitTime > 0", maxCommitTime > 0);
+                this.maxCommitTimeMS = MILLISECONDS.convert(maxCommitTime, timeUnit);
+            }
+            return this;
+        }
+
+        /**
+         * Build the transaction options instance.
+         *
+         * @return The {@code TransactionOptions}
+         */
+        public TransactionOptions build() {
+            return new TransactionOptions(this);
+        }
+
+        private Builder() {
+        }
+    }
+
+
+    private TransactionOptions(final Builder builder) {
+        readConcern = builder.readConcern;
+        writeConcern = builder.writeConcern;
+        readPreference = builder.readPreference;
+        maxCommitTimeMS = builder.maxCommitTimeMS;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/UnixServerAddress.java b/driver-core/src/main/com/mongodb/UnixServerAddress.java
new file mode 100644
index 00000000000..d5c1b4c4c84
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/UnixServerAddress.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.Immutable;
+import jnr.unixsocket.UnixSocketAddress;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * Represents the location of a MongoD unix domain socket.
+ *
+ * <p>Requires the 'jnr.unixsocket' library.</p>
+ * @since 3.7
+ */
+@Immutable
+public final class UnixServerAddress extends ServerAddress {
+    private static final long serialVersionUID = 154466643544866543L;
+
+    /**
+     * Creates a new instance
+     * @param path the path of the MongoD unix domain socket.
+     */
+    public UnixServerAddress(final String path) {
+        super(notNull("The path cannot be null", path));
+        isTrueArgument("The path must end in .sock", path.endsWith(".sock"));
+    }
+
+    @Override
+    public InetSocketAddress getSocketAddress() {
+        throw new UnsupportedOperationException("Cannot return a InetSocketAddress from a UnixServerAddress");
+    }
+
+    /**
+     * @return the SocketAddress for the MongoD unix domain socket.
+     */
+    public SocketAddress getUnixSocketAddress() {
+        return new UnixSocketAddress(getHost());
+    }
+
+    @Override
+    public String toString() {
+        return getHost();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/WriteConcern.java b/driver-core/src/main/com/mongodb/WriteConcern.java
index 7be21aecfd0..cf4d1e3a3cc 100644
--- a/driver-core/src/main/com/mongodb/WriteConcern.java
+++ b/driver-core/src/main/com/mongodb/WriteConcern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 package com.mongodb;
 
 import com.mongodb.annotations.Immutable;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -43,7 +44,7 @@
  *  <li> 0: Don't wait for acknowledgement from the server </li>
  *  <li> 1: Wait for acknowledgement, but don't wait for secondaries to replicate</li>
  *  <li> &gt;=2: Wait for one or more secondaries to also acknowledge </li>
- *  <li> "majority": Wait for a majority of secondaries to also acknowledge </li>
+ *  <li> "majority": Wait for a majority of data bearing nodes to acknowledge </li>
  *  <li> "&lt;tag set name&gt;": Wait for one or more secondaries to also acknowledge based on a tag set name</li>
  * </ul>
  * <p>{@code wtimeout} - how long to wait for secondaries to acknowledge before failing</p>
@@ -237,7 +238,7 @@ public WriteConcern(final int w) {
      */
     public WriteConcern(final String w) {
         this(w, null, null, null);
-        isTrueArgument("w != null", w != null);
+        notNull("w", w);
     }
 
     /**
@@ -292,7 +293,7 @@ public WriteConcern(final int w, final int wTimeoutMS, final boolean fsync) {
      */
     @Deprecated
     public WriteConcern(final int w, final int wTimeoutMS, final boolean fsync, final boolean journal) {
-        this((Object) Integer.valueOf(w), wTimeoutMS, fsync, journal);
+        this((Object) w, wTimeoutMS, fsync, journal);
     }
 
     /**
@@ -311,9 +312,14 @@ public WriteConcern(final String w, final int wTimeoutMS, final boolean fsync, f
 
     // Private constructor for creating the "default" unacknowledged write concern.  Necessary because there already a no-args
     // constructor that means something else.
-    private WriteConcern(final Object w, final Integer wTimeoutMS, final Boolean fsync, final Boolean journal) {
+    private WriteConcern(@Nullable final Object w, @Nullable final Integer wTimeoutMS, @Nullable final Boolean fsync,
+                         @Nullable final Boolean journal) {
         if (w instanceof Integer) {
             isTrueArgument("w >= 0", ((Integer) w) >= 0);
+            if ((Integer) w == 0) {
+                isTrueArgument("fsync is false when w is 0", fsync == null || !fsync);
+                isTrueArgument("journal is false when w is 0", journal == null || !journal);
+            }
         } else if (w != null) {
             isTrueArgument("w must be String or int", w instanceof String);
         }
@@ -363,6 +369,7 @@ public String getWString() {
      * @since 3.2
      * @mongodb.driver.manual core/write-concern/#timeouts wTimeout
      */
+    @Nullable
     public Integer getWTimeout(final TimeUnit timeUnit) {
         notNull("timeUnit", timeUnit);
         return wTimeoutMS == null ? null : (int) timeUnit.convert(wTimeoutMS, TimeUnit.MILLISECONDS);
@@ -426,7 +433,7 @@ public boolean fsync() {
     }
 
     /**
-     * Returns whether "getlasterror" should be called (w &gt; 0)
+     * Returns true if this write concern indicates that write operations must be acknowledged.
      *
      * @return whether this write concern will result in an an acknowledged write
      * @deprecated Prefer {@link #isAcknowledged()}
@@ -537,7 +544,7 @@ public String toString() {
      * @mongodb.driver.manual core/write-concern/#replica-acknowledged Replica Acknowledged
      */
     public WriteConcern withW(final int w) {
-        return new WriteConcern((Object) Integer.valueOf(w), wTimeoutMS, fsync, journal);
+        return new WriteConcern(Integer.valueOf(w), wTimeoutMS, fsync, journal);
     }
 
     /**
diff --git a/driver-core/src/main/com/mongodb/WriteConcernException.java b/driver-core/src/main/com/mongodb/WriteConcernException.java
index 0c0e2cd97c6..60799db2a2b 100644
--- a/driver-core/src/main/com/mongodb/WriteConcernException.java
+++ b/driver-core/src/main/com/mongodb/WriteConcernException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonValue;
@@ -50,25 +51,27 @@ public WriteConcernException(final BsonDocument response, final ServerAddress ad
     }
 
     /**
-     * For internal use only: extract the error code from the response to a getlasterror command.
+     * For internal use only: extract the error code from the response to a write command.
      * @param response the response
      * @return the code, or -1 if there is none
      */
     public static int extractErrorCode(final BsonDocument response) {
         // mongos may set an err field containing duplicate key error information
-        if (response.containsKey("err")) {
-            String errorMessage = extractErrorMessage(response);
-            if (errorMessage.contains("E11000 duplicate key error")) {
-                return 11000;
+        String errorMessage = extractErrorMessage(response);
+        if (errorMessage != null) {
+            if (response.containsKey("err")) {
+                if (errorMessage.contains("E11000 duplicate key error")) {
+                    return 11000;
+                }
             }
-        }
 
-        // mongos may return a list of documents representing getlasterror responses from each shard.  Return the one with a matching
-        // "err" field, so that it can be used to get the error code
-        if (!response.containsKey("code") && response.containsKey("errObjects")) {
-            for (BsonValue curErrorDocument : response.getArray("errObjects")) {
-                if (extractErrorMessage(response).equals(extractErrorMessage(curErrorDocument.asDocument()))) {
-                    return curErrorDocument.asDocument().getNumber("code").intValue();
+            // mongos may return a list of documents representing write command responses from each shard.  Return the one with a matching
+            // "err" field, so that it can be used to get the error code
+            if (!response.containsKey("code") && response.containsKey("errObjects")) {
+                for (BsonValue curErrorDocument : response.getArray("errObjects")) {
+                    if (errorMessage.equals(extractErrorMessage(curErrorDocument.asDocument()))) {
+                        return curErrorDocument.asDocument().getNumber("code").intValue();
+                    }
                 }
             }
         }
@@ -76,11 +79,12 @@ public static int extractErrorCode(final BsonDocument response) {
     }
 
     /**
-     * For internal use only: extract the error message from the response to a getlasterror command.
+     * For internal use only: extract the error message from the response to a write command.
      *
      * @param response the response
      * @return the error message
      */
+    @Nullable
     public static String extractErrorMessage(final BsonDocument response) {
         if (response.isString("err")) {
             return response.getString("err").getValue();
@@ -114,6 +118,7 @@ public int getErrorCode() {
      *
      * @return the error message
      */
+    @Nullable
     public String getErrorMessage() {
         return extractErrorMessage(response);
     }
diff --git a/driver-core/src/main/com/mongodb/WriteConcernResult.java b/driver-core/src/main/com/mongodb/WriteConcernResult.java
index f5046b76f9b..11be4780080 100644
--- a/driver-core/src/main/com/mongodb/WriteConcernResult.java
+++ b/driver-core/src/main/com/mongodb/WriteConcernResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import org.bson.BsonValue;
 
 /**
@@ -56,6 +57,7 @@ public abstract class WriteConcernResult {
      * @return the value of _id if this write resulted in an upsert.
      * @throws UnsupportedOperationException if the write was unacknowledged.
      */
+    @Nullable
     public abstract BsonValue getUpsertedId();
 
     /**
@@ -66,7 +68,7 @@ public abstract class WriteConcernResult {
      * @param upsertedId if an upsert resulted in an inserted document, this is the _id of that document.  This may be null
      * @return an acknowledged WriteConcernResult
      */
-    public static WriteConcernResult acknowledged(final int count, final boolean isUpdateOfExisting, final BsonValue upsertedId) {
+    public static WriteConcernResult acknowledged(final int count, final boolean isUpdateOfExisting, @Nullable final BsonValue upsertedId) {
         return new WriteConcernResult() {
             @Override
             public boolean wasAcknowledged() {
@@ -84,6 +86,7 @@ public boolean isUpdateOfExisting() {
             }
 
             @Override
+            @Nullable
             public BsonValue getUpsertedId() {
                 return upsertedId;
             }
diff --git a/driver-core/src/main/com/mongodb/WriteError.java b/driver-core/src/main/com/mongodb/WriteError.java
index d9282831315..65cb6370671 100644
--- a/driver-core/src/main/com/mongodb/WriteError.java
+++ b/driver-core/src/main/com/mongodb/WriteError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/annotations/Beta.java b/driver-core/src/main/com/mongodb/annotations/Beta.java
index ec28c17eea7..a954b892a79 100644
--- a/driver-core/src/main/com/mongodb/annotations/Beta.java
+++ b/driver-core/src/main/com/mongodb/annotations/Beta.java
@@ -1,6 +1,7 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  * Copyright 2010 The Guava Authors
+ * Copyright 2011 The Guava Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +44,7 @@
         ElementType.CONSTRUCTOR,
         ElementType.FIELD,
         ElementType.METHOD,
+        ElementType.PACKAGE,
         ElementType.TYPE })
 @Documented
 @Beta
diff --git a/driver-core/src/main/com/mongodb/annotations/package-info.java b/driver-core/src/main/com/mongodb/annotations/package-info.java
index f2423d5df4b..361a63fa423 100644
--- a/driver-core/src/main/com/mongodb/annotations/package-info.java
+++ b/driver-core/src/main/com/mongodb/annotations/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/assertions/Assertions.java b/driver-core/src/main/com/mongodb/assertions/Assertions.java
index 18452990b9f..9b8ae8c40ce 100644
--- a/driver-core/src/main/com/mongodb/assertions/Assertions.java
+++ b/driver-core/src/main/com/mongodb/assertions/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  * Copyright (c) 2008-2014 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/driver-core/src/main/com/mongodb/assertions/package-info.java b/driver-core/src/main/com/mongodb/assertions/package-info.java
index e6cb0bd3fc7..42b39ec55e0 100644
--- a/driver-core/src/main/com/mongodb/assertions/package-info.java
+++ b/driver-core/src/main/com/mongodb/assertions/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/async/AsyncAggregateResponseBatchCursor.java b/driver-core/src/main/com/mongodb/async/AsyncAggregateResponseBatchCursor.java
new file mode 100644
index 00000000000..9d872196846
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/async/AsyncAggregateResponseBatchCursor.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.async;
+
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+/**
+ * Extends the async batch cursor interface to include information included in an aggregate or getMore response.
+ *
+ * @param <T> The type of documents the cursor contains
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#wire-op-get-more OP_GET_MORE
+ * @since 3.11
+ */
+@Deprecated
+public interface AsyncAggregateResponseBatchCursor<T> extends AsyncBatchCursor<T> {
+    /**
+     * Returns the postBatchResumeToken.
+     *
+     * @return the postBatchResumeToken
+     */
+    BsonDocument getPostBatchResumeToken();
+
+    /**
+     * Returns the operation time found in the aggregate or getMore response.
+     *
+     * @return the operation time
+     */
+    BsonTimestamp getOperationTime();
+
+    /**
+     * Returns true if the first batch was empty.
+     *
+     * @return true if the first batch was empty
+     */
+    boolean isFirstBatchEmpty();
+}
diff --git a/driver-core/src/main/com/mongodb/async/AsyncBatchCursor.java b/driver-core/src/main/com/mongodb/async/AsyncBatchCursor.java
index 025362c8728..d715f0833b7 100644
--- a/driver-core/src/main/com/mongodb/async/AsyncBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/async/AsyncBatchCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,9 @@
  *
  * @param <T> The type of documents the cursor contains
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#wire-op-get-more OP_GET_MORE
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface AsyncBatchCursor<T> extends Closeable {
     /**
      * Returns the next batch of results.  A tailable cursor will block until another batch exists.  After the last batch, the next call
@@ -40,6 +42,18 @@ public interface AsyncBatchCursor<T> extends Closeable {
      */
     void next(SingleResultCallback<List<T>> callback);
 
+    /**
+     * A special {@code next()} case that returns the next batch if available or null.
+     *
+     * <p>Tailable cursors are an example where this is useful. A call to {@code tryNext()} may return null, but in the future calling
+     * {@code tryNext()} would return a new batch if a document had been added to the capped collection.</p>
+     *
+     * @param callback callback to receive the next batch of results
+     * @since 3.6
+     * @mongodb.driver.manual reference/glossary/#term-tailable-cursor Tailable Cursor
+     */
+    void tryNext(SingleResultCallback<List<T>> callback);
+
     /**
      * Sets the batch size to use when requesting the next batch.  This is the number of documents to request in the next batch.
      *
diff --git a/driver-core/src/main/com/mongodb/async/SingleResultCallback.java b/driver-core/src/main/com/mongodb/async/SingleResultCallback.java
index e7874c83c27..3543b019725 100644
--- a/driver-core/src/main/com/mongodb/async/SingleResultCallback.java
+++ b/driver-core/src/main/com/mongodb/async/SingleResultCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,9 @@
  *
  * @param <T> the result type
  * @since 3.0
+ * @deprecated Prefer the Reactive Streams-based asynchronous driver (mongodb-driver-reactivestreams artifactId)
  */
+@Deprecated
 public interface SingleResultCallback<T> {
     /**
      * Called when the operation completes.
diff --git a/driver-core/src/main/com/mongodb/async/package-info.java b/driver-core/src/main/com/mongodb/async/package-info.java
index d27e02b56ff..2eb1f27fdda 100644
--- a/driver-core/src/main/com/mongodb/async/package-info.java
+++ b/driver-core/src/main/com/mongodb/async/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,4 +17,5 @@
 /**
  * This package contains async interfaces
  */
+@Deprecated
 package com.mongodb.async;
diff --git a/driver-core/src/main/com/mongodb/binding/AbstractReferenceCounted.java b/driver-core/src/main/com/mongodb/binding/AbstractReferenceCounted.java
deleted file mode 100644
index 6814f4de8a4..00000000000
--- a/driver-core/src/main/com/mongodb/binding/AbstractReferenceCounted.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.binding;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-abstract class AbstractReferenceCounted implements ReferenceCounted {
-    private final AtomicInteger referenceCount = new AtomicInteger(1);
-    @Override
-    public int getCount() {
-        return referenceCount.get();
-    }
-
-    @Override
-    public ReferenceCounted retain() {
-        if (referenceCount.incrementAndGet() == 1) {
-            throw new IllegalStateException("Attempted to increment the reference count when it is already 0");
-        }
-        return this;
-    }
-
-    @Override
-    public void release() {
-        if (referenceCount.decrementAndGet() < 0) {
-            throw new IllegalStateException("Attempted to decrement the reference count below 0");
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/binding/AsyncClusterBinding.java b/driver-core/src/main/com/mongodb/binding/AsyncClusterBinding.java
index aa7ad12beaa..3216a8605a8 100644
--- a/driver-core/src/main/com/mongodb/binding/AsyncClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/AsyncClusterBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,20 @@
 
 package com.mongodb.binding;
 
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Cluster;
 import com.mongodb.connection.Server;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AbstractReferenceCounted;
+import com.mongodb.internal.binding.AsyncClusterAwareReadWriteBinding;
+import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext;
 import com.mongodb.selector.ReadPreferenceServerSelector;
 import com.mongodb.selector.ServerSelector;
 import com.mongodb.selector.WritableServerSelector;
+import com.mongodb.session.SessionContext;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -34,19 +39,36 @@
  *
  * @since 3.0
  */
-public class AsyncClusterBinding extends AbstractReferenceCounted implements AsyncReadWriteBinding {
+@Deprecated
+public class AsyncClusterBinding extends AbstractReferenceCounted implements AsyncClusterAwareReadWriteBinding {
     private final Cluster cluster;
     private final ReadPreference readPreference;
+    private final ReadConcern readConcern;
 
     /**
      * Creates an instance.
      *
      * @param cluster        a non-null Cluster which will be used to select a server to bind to
      * @param readPreference a non-null ReadPreference for read operations
+     * @deprecated Prefer {@link #AsyncClusterBinding(Cluster, ReadPreference, ReadConcern)}
      */
+    @Deprecated
     public AsyncClusterBinding(final Cluster cluster, final ReadPreference readPreference) {
+        this(cluster, readPreference, ReadConcern.DEFAULT);
+    }
+
+    /**
+     * Creates an instance.
+     *
+     * @param cluster        a non-null Cluster which will be used to select a server to bind to
+     * @param readPreference a non-null ReadPreference for read operations
+     * @param readConcern    a non-null read concern
+     * @since 3.8
+     */
+    public AsyncClusterBinding(final Cluster cluster, final ReadPreference readPreference, final ReadConcern readConcern) {
         this.cluster = notNull("cluster", cluster);
         this.readPreference = notNull("readPreference", readPreference);
+        this.readConcern = (notNull("readConcern", readConcern));
     }
 
     @Override
@@ -55,11 +77,21 @@ public AsyncReadWriteBinding retain() {
         return this;
     }
 
+    @Override
+    public Cluster getCluster() {
+        return cluster;
+    }
+
     @Override
     public ReadPreference getReadPreference() {
         return readPreference;
     }
 
+    @Override
+    public SessionContext getSessionContext() {
+        return new ReadConcernAwareNoOpSessionContext(readConcern);
+    }
+
     @Override
     public void getReadConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
         getAsyncClusterBindingConnectionSource(new ReadPreferenceServerSelector(readPreference), callback);
@@ -97,6 +129,11 @@ public ServerDescription getServerDescription() {
             return server.getDescription();
         }
 
+        @Override
+        public SessionContext getSessionContext() {
+            return new ReadConcernAwareNoOpSessionContext(readConcern);
+        }
+
         @Override
         public void getConnection(final SingleResultCallback<AsyncConnection> callback) {
             server.getConnectionAsync(callback);
diff --git a/driver-core/src/main/com/mongodb/binding/AsyncConnectionSource.java b/driver-core/src/main/com/mongodb/binding/AsyncConnectionSource.java
index 6a8a20cee02..28e4c82bcad 100644
--- a/driver-core/src/main/com/mongodb/binding/AsyncConnectionSource.java
+++ b/driver-core/src/main/com/mongodb/binding/AsyncConnectionSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,14 @@
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.session.SessionContext;
 
 /**
  * A source of connections to a single MongoDB server.
  *
  * @since 3.0
  */
+@Deprecated
 public interface AsyncConnectionSource extends ReferenceCounted {
 
     /**
@@ -34,6 +36,15 @@ public interface AsyncConnectionSource extends ReferenceCounted {
      */
     ServerDescription getServerDescription();
 
+    /**
+     * Gets the session context for this source
+     *
+     * @return the session context, which may not be null
+     *
+     * @since 3.6
+     */
+    SessionContext getSessionContext();
+
     /**
      * Gets a connection from this source.
      *
diff --git a/driver-core/src/main/com/mongodb/binding/AsyncReadBinding.java b/driver-core/src/main/com/mongodb/binding/AsyncReadBinding.java
index d6a03a02803..8cedad94f52 100644
--- a/driver-core/src/main/com/mongodb/binding/AsyncReadBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/AsyncReadBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,14 @@
 
 import com.mongodb.ReadPreference;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.session.SessionContext;
 
 /**
  * An asynchronous factory of connection sources to servers that can be read from and that satisfy the specified read preference.
  *
  * @since 3.0
  */
+@Deprecated
 public interface AsyncReadBinding extends ReferenceCounted {
     /**
      * The read preference that all connection sources returned by this instance will satisfy.
@@ -31,6 +33,15 @@ public interface AsyncReadBinding extends ReferenceCounted {
      */
     ReadPreference getReadPreference();
 
+    /**
+     * Gets the session context for this binding.
+     *
+     * @return the session context, which may not be null
+     *
+     * @since 3.6
+     */
+    SessionContext getSessionContext();
+
     /**
      * Returns a connection source to a server that satisfies the specified read preference.
      * @param callback the to be passed the connection source
diff --git a/driver-core/src/main/com/mongodb/binding/AsyncReadWriteBinding.java b/driver-core/src/main/com/mongodb/binding/AsyncReadWriteBinding.java
index a34a7a64e34..5264f1fac37 100644
--- a/driver-core/src/main/com/mongodb/binding/AsyncReadWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/AsyncReadWriteBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public interface AsyncReadWriteBinding extends AsyncReadBinding, AsyncWriteBinding, ReferenceCounted {
     @Override
     AsyncReadWriteBinding retain();
diff --git a/driver-core/src/main/com/mongodb/binding/AsyncSingleConnectionReadBinding.java b/driver-core/src/main/com/mongodb/binding/AsyncSingleConnectionReadBinding.java
index df8994051a3..65c0026ff0a 100644
--- a/driver-core/src/main/com/mongodb/binding/AsyncSingleConnectionReadBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/AsyncSingleConnectionReadBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,9 @@
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AbstractReferenceCounted;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.session.SessionContext;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -28,6 +31,7 @@
  *
  * @since 3.2
  */
+@Deprecated
 public class AsyncSingleConnectionReadBinding extends AbstractReferenceCounted implements AsyncReadBinding {
     private final ReadPreference readPreference;
     private final ServerDescription serverDescription;
@@ -52,6 +56,11 @@ public ReadPreference getReadPreference() {
         return readPreference;
     }
 
+    @Override
+    public SessionContext getSessionContext() {
+        return NoOpSessionContext.INSTANCE;
+    }
+
     @Override
     public void getReadConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
           callback.onResult(new AsyncSingleConnectionSource(), null);
@@ -72,7 +81,7 @@ public void release() {
     }
 
     private class AsyncSingleConnectionSource extends AbstractReferenceCounted implements AsyncConnectionSource {
-        public AsyncSingleConnectionSource() {
+        AsyncSingleConnectionSource() {
             AsyncSingleConnectionReadBinding.this.retain();
         }
 
@@ -81,6 +90,11 @@ public ServerDescription getServerDescription() {
             return serverDescription;
         }
 
+        @Override
+        public SessionContext getSessionContext() {
+            return NoOpSessionContext.INSTANCE;
+        }
+
         @Override
         public void getConnection(final SingleResultCallback<AsyncConnection> callback) {
             callback.onResult(connection.retain(), null);
diff --git a/driver-core/src/main/com/mongodb/binding/AsyncSingleServerBinding.java b/driver-core/src/main/com/mongodb/binding/AsyncSingleServerBinding.java
new file mode 100644
index 00000000000..6f80154f525
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/binding/AsyncSingleServerBinding.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.binding;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AbstractReferenceCounted;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.selector.ServerAddressSelector;
+import com.mongodb.selector.ServerSelector;
+import com.mongodb.session.SessionContext;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * A simple binding where all connection sources are bound to the server specified in the constructor.
+ *
+ * @since 3.11
+ */
+@Deprecated
+public class AsyncSingleServerBinding extends AbstractReferenceCounted implements AsyncReadWriteBinding {
+    private final Cluster cluster;
+    private final ServerAddress serverAddress;
+    private final ReadPreference readPreference;
+
+    /**
+     * Creates an instance, defaulting to {@link com.mongodb.ReadPreference#primary()} for reads.
+     * @param cluster       a non-null  Cluster which will be used to select a server to bind to
+     * @param serverAddress a non-null  address of the server to bind to
+     */
+    public AsyncSingleServerBinding(final Cluster cluster, final ServerAddress serverAddress) {
+        this(cluster, serverAddress, ReadPreference.primary());
+    }
+
+    /**
+     * Creates an instance.
+     * @param cluster        a non-null  Cluster which will be used to select a server to bind to
+     * @param serverAddress  a non-null  address of the server to bind to
+     * @param readPreference a non-null  ReadPreference for read operations
+     */
+    public AsyncSingleServerBinding(final Cluster cluster, final ServerAddress serverAddress, final ReadPreference readPreference) {
+        this.cluster = notNull("cluster", cluster);
+        this.serverAddress = notNull("serverAddress", serverAddress);
+        this.readPreference = notNull("readPreference", readPreference);
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    @Override
+    public void getReadConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        getAsyncSingleServerBindingConnectionSource(new ServerAddressSelector(serverAddress), callback);
+    }
+
+    @Override
+    public void getWriteConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        getAsyncSingleServerBindingConnectionSource(new ServerAddressSelector(serverAddress), callback);
+    }
+
+    private void getAsyncSingleServerBindingConnectionSource(final ServerSelector serverSelector,
+                                                             final SingleResultCallback<AsyncConnectionSource> callback) {
+        cluster.selectServerAsync(serverSelector, new SingleResultCallback<Server>() {
+            @Override
+            public void onResult(final Server result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(new AsyncSingleServerBindingConnectionSource(result), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public SessionContext getSessionContext() {
+        return NoOpSessionContext.INSTANCE;
+    }
+
+    @Override
+    public AsyncSingleServerBinding retain() {
+        super.retain();
+        return this;
+    }
+
+    private final class AsyncSingleServerBindingConnectionSource extends AbstractReferenceCounted implements AsyncConnectionSource {
+        private final Server server;
+
+        private AsyncSingleServerBindingConnectionSource(final Server server) {
+            AsyncSingleServerBinding.this.retain();
+            this.server = server;
+        }
+
+        @Override
+        public ServerDescription getServerDescription() {
+            return server.getDescription();
+        }
+
+        @Override
+        public SessionContext getSessionContext() {
+            return NoOpSessionContext.INSTANCE;
+        }
+
+        @Override
+        public void getConnection(final SingleResultCallback<AsyncConnection> callback) {
+            server.getConnectionAsync(callback);
+        }
+
+        public AsyncConnectionSource retain() {
+            super.retain();
+            return this;
+        }
+
+        @Override
+        public void release() {
+            super.release();
+            if (super.getCount() == 0) {
+                AsyncSingleServerBinding.this.release();
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/binding/AsyncWriteBinding.java b/driver-core/src/main/com/mongodb/binding/AsyncWriteBinding.java
index 3b7e662eac7..03e3e8bd36e 100644
--- a/driver-core/src/main/com/mongodb/binding/AsyncWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/AsyncWriteBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 package com.mongodb.binding;
 
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.session.SessionContext;
 
 /**
  * An asynchronous factory of connection sources to servers that can be written to, e.g, a standalone, a mongos, or a replica set primary.
  *
  * @since 3.0
  */
+@Deprecated
 public interface AsyncWriteBinding extends ReferenceCounted {
 
     /**
@@ -32,6 +34,15 @@ public interface AsyncWriteBinding extends ReferenceCounted {
      */
     void getWriteConnectionSource(SingleResultCallback<AsyncConnectionSource> callback);
 
+    /**
+     * Gets the session context for this binding.
+     *
+     * @return the session context, which may not be null
+     *
+     * @since 3.6
+     */
+    SessionContext getSessionContext();
+
     @Override
     AsyncWriteBinding retain();
 }
diff --git a/driver-core/src/main/com/mongodb/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/binding/ClusterBinding.java
index cc4dff6f700..9aa89a314e3 100644
--- a/driver-core/src/main/com/mongodb/binding/ClusterBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/ClusterBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,19 @@
 
 package com.mongodb.binding;
 
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.connection.Cluster;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.Server;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AbstractReferenceCounted;
+import com.mongodb.internal.binding.ClusterAwareReadWriteBinding;
+import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext;
 import com.mongodb.selector.ReadPreferenceServerSelector;
 import com.mongodb.selector.ServerSelector;
 import com.mongodb.selector.WritableServerSelector;
+import com.mongodb.session.SessionContext;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -33,18 +38,43 @@
  *
  * @since 3.0
  */
-public class ClusterBinding extends AbstractReferenceCounted implements ReadWriteBinding {
+@Deprecated
+public class ClusterBinding extends AbstractReferenceCounted implements ClusterAwareReadWriteBinding {
     private final Cluster cluster;
     private final ReadPreference readPreference;
+    private final ReadConcern readConcern;
 
     /**
      * Creates an instance.
      * @param cluster        a non-null Cluster which will be used to select a server to bind to
      * @param readPreference a non-null ReadPreference for read operations
+     * @deprecated Prefer {@link #ClusterBinding(Cluster, ReadPreference, ReadConcern)}
      */
+    @Deprecated
     public ClusterBinding(final Cluster cluster, final ReadPreference readPreference) {
+        this(cluster, readPreference, ReadConcern.DEFAULT);
+    }
+
+    /**
+     * Creates an instance.
+     * @param cluster        a non-null Cluster which will be used to select a server to bind to
+     * @param readPreference a non-null ReadPreference for read operations
+     * @param readConcern    a non-null read concern
+     * @since 3.8
+     */
+    public ClusterBinding(final Cluster cluster, final ReadPreference readPreference, final ReadConcern readConcern) {
         this.cluster = notNull("cluster", cluster);
         this.readPreference = notNull("readPreference", readPreference);
+        this.readConcern = notNull("readConcern", readConcern);
+    }
+
+    /**
+     * Return the cluster.
+     * @return the cluster
+     * @since 3.11
+     */
+    public Cluster getCluster() {
+        return cluster;
     }
 
     @Override
@@ -63,6 +93,11 @@ public ConnectionSource getReadConnectionSource() {
         return new ClusterBindingConnectionSource(new ReadPreferenceServerSelector(readPreference));
     }
 
+    @Override
+    public SessionContext getSessionContext() {
+        return new ReadConcernAwareNoOpSessionContext(readConcern);
+    }
+
     @Override
     public ConnectionSource getWriteConnectionSource() {
         return new ClusterBindingConnectionSource(new WritableServerSelector());
@@ -81,6 +116,11 @@ public ServerDescription getServerDescription() {
             return server.getDescription();
         }
 
+        @Override
+        public SessionContext getSessionContext() {
+            return new ReadConcernAwareNoOpSessionContext(readConcern);
+        }
+
         @Override
         public Connection getConnection() {
             return server.getConnection();
diff --git a/driver-core/src/main/com/mongodb/binding/ConnectionSource.java b/driver-core/src/main/com/mongodb/binding/ConnectionSource.java
index 7db4c62ac61..da06255a98a 100644
--- a/driver-core/src/main/com/mongodb/binding/ConnectionSource.java
+++ b/driver-core/src/main/com/mongodb/binding/ConnectionSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,14 @@
 
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.session.SessionContext;
 
 /**
  * A source of connections to a single MongoDB server.
  *
  * @since 3.0
  */
+@Deprecated
 public interface ConnectionSource extends ReferenceCounted {
 
     /**
@@ -33,6 +35,15 @@ public interface ConnectionSource extends ReferenceCounted {
      */
     ServerDescription getServerDescription();
 
+    /**
+     * Gets the session context for this source
+     *
+     * @return the session context, which may not be null
+     *
+     * @since 3.6
+     */
+    SessionContext getSessionContext();
+
     /**
      * Gets a connection from this source.
      *
diff --git a/driver-core/src/main/com/mongodb/binding/ReadBinding.java b/driver-core/src/main/com/mongodb/binding/ReadBinding.java
index 53b22dc8e24..6f263517a51 100644
--- a/driver-core/src/main/com/mongodb/binding/ReadBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/ReadBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 package com.mongodb.binding;
 
 import com.mongodb.ReadPreference;
+import com.mongodb.session.SessionContext;
 
 /**
  * A factory of connection sources to servers that can be read from and that satisfy the specified read preference.
  *
  * @since 3.0
  */
+@Deprecated
 public interface ReadBinding extends ReferenceCounted {
     /**
      * The read preference that all connection sources returned by this instance will satisfy.
@@ -36,6 +38,15 @@ public interface ReadBinding extends ReferenceCounted {
      */
     ConnectionSource getReadConnectionSource();
 
+    /**
+     * Gets the session context for this binding.
+     *
+     * @return the session context, which may not be null
+     *
+     * @since 3.6
+     */
+    SessionContext getSessionContext();
+
     @Override
     ReadBinding retain();
 }
diff --git a/driver-core/src/main/com/mongodb/binding/ReadWriteBinding.java b/driver-core/src/main/com/mongodb/binding/ReadWriteBinding.java
index 5d3c4825166..b725e3851b7 100644
--- a/driver-core/src/main/com/mongodb/binding/ReadWriteBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/ReadWriteBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public interface ReadWriteBinding extends ReadBinding, WriteBinding, ReferenceCounted {
     @Override
     ReadWriteBinding retain();
diff --git a/driver-core/src/main/com/mongodb/binding/ReferenceCounted.java b/driver-core/src/main/com/mongodb/binding/ReferenceCounted.java
index a177739dbeb..71d5620429d 100644
--- a/driver-core/src/main/com/mongodb/binding/ReferenceCounted.java
+++ b/driver-core/src/main/com/mongodb/binding/ReferenceCounted.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public interface ReferenceCounted {
     /**
      * Gets the current reference count, which starts at 0.
diff --git a/driver-core/src/main/com/mongodb/binding/SingleConnectionReadBinding.java b/driver-core/src/main/com/mongodb/binding/SingleConnectionReadBinding.java
index e8195472869..be5a7be4af5 100644
--- a/driver-core/src/main/com/mongodb/binding/SingleConnectionReadBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/SingleConnectionReadBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
 import com.mongodb.ReadPreference;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AbstractReferenceCounted;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.session.SessionContext;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -27,6 +30,7 @@
  *
  * @since 3.2
  */
+@Deprecated
 public class SingleConnectionReadBinding extends AbstractReferenceCounted implements ReadBinding {
 
     private final ReadPreference readPreference;
@@ -57,6 +61,11 @@ public ConnectionSource getReadConnectionSource() {
         return new SingleConnectionSource();
     }
 
+    @Override
+    public SessionContext getSessionContext() {
+        return NoOpSessionContext.INSTANCE;
+    }
+
     @Override
     public ReadBinding retain() {
         super.retain();
@@ -73,7 +82,7 @@ public void release() {
 
     private class SingleConnectionSource extends AbstractReferenceCounted implements ConnectionSource {
 
-        public SingleConnectionSource() {
+        SingleConnectionSource() {
             SingleConnectionReadBinding.this.retain();
         }
 
@@ -82,6 +91,11 @@ public ServerDescription getServerDescription() {
             return serverDescription;
         }
 
+        @Override
+        public SessionContext getSessionContext() {
+            return NoOpSessionContext.INSTANCE;
+        }
+
         @Override
         public Connection getConnection() {
             return connection.retain();
diff --git a/driver-core/src/main/com/mongodb/binding/SingleServerBinding.java b/driver-core/src/main/com/mongodb/binding/SingleServerBinding.java
index e7b0f0c50c7..0d274c772c5 100644
--- a/driver-core/src/main/com/mongodb/binding/SingleServerBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/SingleServerBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,10 @@
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.Server;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AbstractReferenceCounted;
+import com.mongodb.internal.connection.NoOpSessionContext;
 import com.mongodb.selector.ServerAddressSelector;
+import com.mongodb.session.SessionContext;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -31,6 +34,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class SingleServerBinding extends AbstractReferenceCounted implements ReadWriteBinding {
     private final Cluster cluster;
     private final ServerAddress serverAddress;
@@ -72,6 +76,11 @@ public ConnectionSource getReadConnectionSource() {
         return new SingleServerBindingConnectionSource();
     }
 
+    @Override
+    public SessionContext getSessionContext() {
+        return NoOpSessionContext.INSTANCE;
+    }
+
     @Override
     public SingleServerBinding retain() {
         super.retain();
@@ -91,6 +100,11 @@ public ServerDescription getServerDescription() {
             return server.getDescription();
         }
 
+        @Override
+        public SessionContext getSessionContext() {
+            return NoOpSessionContext.INSTANCE;
+        }
+
         @Override
         public Connection getConnection() {
             return cluster.selectServer(new ServerAddressSelector(serverAddress)).getConnection();
@@ -99,13 +113,15 @@ public Connection getConnection() {
         @Override
         public ConnectionSource retain() {
             super.retain();
-            SingleServerBinding.this.retain();
             return this;
         }
 
         @Override
         public void release() {
-            SingleServerBinding.this.release();
+            super.release();
+            if (super.getCount() == 0) {
+                SingleServerBinding.this.release();
+            }
         }
     }
 }
diff --git a/driver-core/src/main/com/mongodb/binding/WriteBinding.java b/driver-core/src/main/com/mongodb/binding/WriteBinding.java
index 9a523c549a9..d726a3f7570 100644
--- a/driver-core/src/main/com/mongodb/binding/WriteBinding.java
+++ b/driver-core/src/main/com/mongodb/binding/WriteBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@
 
 package com.mongodb.binding;
 
+import com.mongodb.session.SessionContext;
+
 /**
  * A factory of connection sources to servers that can be written to, e.g, a standalone, a mongos, or a replica set primary.
  *
  * @since 3.0
  */
+@Deprecated
 public interface WriteBinding extends ReferenceCounted {
     /**
      * Supply a connection source to a server that can be written to
@@ -29,6 +32,15 @@ public interface WriteBinding extends ReferenceCounted {
      */
     ConnectionSource getWriteConnectionSource();
 
+    /**
+     * Gets the session context for this binding.
+     *
+     * @return the session context, which may not be null
+     *
+     * @since 3.6
+     */
+    SessionContext getSessionContext();
+
     @Override
     WriteBinding retain();
 }
diff --git a/driver-core/src/main/com/mongodb/binding/package-info.java b/driver-core/src/main/com/mongodb/binding/package-info.java
index 0456649c1a2..c74864e27d5 100644
--- a/driver-core/src/main/com/mongodb/binding/package-info.java
+++ b/driver-core/src/main/com/mongodb/binding/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,4 +17,5 @@
 /**
  * This package contains classes that manage binding to MongoDB servers for various operations.
  */
+@Deprecated
 package com.mongodb.binding;
diff --git a/driver-core/src/main/com/mongodb/bulk/BulkWriteError.java b/driver-core/src/main/com/mongodb/bulk/BulkWriteError.java
index 7a81f7400fa..cf6a307166e 100644
--- a/driver-core/src/main/com/mongodb/bulk/BulkWriteError.java
+++ b/driver-core/src/main/com/mongodb/bulk/BulkWriteError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,8 +69,8 @@ public boolean equals(final Object o) {
 
     @Override
     public int hashCode() {
-        int result = index;
-        result = 31 * super.hashCode();
+        int result = super.hashCode();
+        result = 31 * result + index;
         return result;
     }
 
diff --git a/driver-core/src/main/com/mongodb/bulk/BulkWriteResult.java b/driver-core/src/main/com/mongodb/bulk/BulkWriteResult.java
index 341a0cdfebc..98f7d4d90df 100644
--- a/driver-core/src/main/com/mongodb/bulk/BulkWriteResult.java
+++ b/driver-core/src/main/com/mongodb/bulk/BulkWriteResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,14 +63,18 @@ public abstract class BulkWriteResult {
     public abstract int getDeletedCount();
 
     /**
-     * Returns true if the server was able to provide a count of modified documents.  If this method returns false (which can happen if the
-     * server is not at least version 2.6) then the {@code getModifiedCount} method will throw {@code UnsupportedOperationException}.
+     * Returns true if the server was able to provide a count of modified documents.
      *
+     * <p>
+     * This method now always returns true, as modified count is available since MongoDB 2.6.
+     * </p>
      * @return true if modifiedCount is available
      * @throws java.lang.UnsupportedOperationException if the write was unacknowledged.
      * @see com.mongodb.WriteConcern#UNACKNOWLEDGED
      * @see #getModifiedCount()
+     * @deprecated no longer needed since all supported server versions support modified count
      */
+    @Deprecated
     public abstract boolean isModifiedCountAvailable();
 
     /**
@@ -78,13 +82,8 @@ public abstract class BulkWriteResult {
      * documents that were actually changed; for example, if you set the value of some field , and the field already has that value, that
      * will not count as a modification.
      *
-     * <p> If the server is not able to provide a count of modified documents (which can happen if the server is not at least version 2.6),
-     * then this method will throw an {@code UnsupportedOperationException} </p>
-     *
      * @return the number of documents modified by the write operation
-     * @throws java.lang.UnsupportedOperationException if the write was unacknowledged or if no modified count is available.
      * @see com.mongodb.WriteConcern#UNACKNOWLEDGED
-     * @see #isModifiedCountAvailable()
      */
     public abstract int getModifiedCount();
 
@@ -133,7 +132,7 @@ public static BulkWriteResult acknowledged(final WriteRequest.Type type, final i
      * @param insertedCount the number of documents inserted by the write operation
      * @param matchedCount  the number of documents matched by the write operation
      * @param removedCount  the number of documents removed by the write operation
-     * @param modifiedCount the number of documents modified, which may be null if the server was not able to provide the count
+     * @param modifiedCount the number of documents modified, which may not be null
      * @param upserts       the list of upserts
      * @return an acknowledged BulkWriteResult
      */
@@ -161,17 +160,13 @@ public int getDeletedCount() {
             }
 
             @Override
+            @Deprecated
             public boolean isModifiedCountAvailable() {
-                return modifiedCount != null;
+                return true;
             }
 
             @Override
             public int getModifiedCount() {
-                if (modifiedCount == null) {
-                    throw new UnsupportedOperationException("The modifiedCount is not available because at least one of the servers that "
-                                                            + "was updated was not able to provide this information (the server is must be "
-                                                            + "at least version 2.6");
-                }
                 return modifiedCount;
             }
 
@@ -197,9 +192,6 @@ public boolean equals(final Object o) {
                 if (insertedCount != that.getInsertedCount()) {
                     return false;
                 }
-                if (isModifiedCountAvailable() != that.isModifiedCountAvailable()) {
-                    return false;
-                }
                 if (modifiedCount != null && !modifiedCount.equals(that.getModifiedCount())) {
                     return false;
                 }
@@ -267,6 +259,7 @@ public int getDeletedCount() {
             }
 
             @Override
+            @Deprecated
             public boolean isModifiedCountAvailable() {
                 throw getUnacknowledgedWriteException();
             }
diff --git a/driver-core/src/main/com/mongodb/bulk/BulkWriteUpsert.java b/driver-core/src/main/com/mongodb/bulk/BulkWriteUpsert.java
index a050ab0eea6..2ed36a5c434 100644
--- a/driver-core/src/main/com/mongodb/bulk/BulkWriteUpsert.java
+++ b/driver-core/src/main/com/mongodb/bulk/BulkWriteUpsert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/bulk/DeleteRequest.java b/driver-core/src/main/com/mongodb/bulk/DeleteRequest.java
index ce4a0dba56c..5708854e94b 100644
--- a/driver-core/src/main/com/mongodb/bulk/DeleteRequest.java
+++ b/driver-core/src/main/com/mongodb/bulk/DeleteRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.bulk;
 
+import com.mongodb.client.model.Collation;
 import org.bson.BsonDocument;
 
 import static com.mongodb.assertions.Assertions.notNull;
@@ -25,9 +26,11 @@
  *
  * @since 3.0
  */
+@Deprecated
 public final class DeleteRequest extends WriteRequest {
     private final BsonDocument filter;
     private boolean isMulti = true;
+    private Collation collation;
 
     /**
      * Construct a new instance.
@@ -68,6 +71,31 @@ public boolean isMulti() {
         return isMulti;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public DeleteRequest collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
     @Override
     public Type getType() {
         return Type.DELETE;
diff --git a/driver-core/src/main/com/mongodb/bulk/IndexRequest.java b/driver-core/src/main/com/mongodb/bulk/IndexRequest.java
index f143b9f90aa..ca9862e7adc 100644
--- a/driver-core/src/main/com/mongodb/bulk/IndexRequest.java
+++ b/driver-core/src/main/com/mongodb/bulk/IndexRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.bulk;
 
+import com.mongodb.client.model.Collation;
 import org.bson.BsonDocument;
 
 import java.util.List;
@@ -31,10 +32,11 @@
  * @mongodb.driver.manual reference/method/db.collection.ensureIndex/#options Index options
  * @since 3.0
  */
+@Deprecated
 public class IndexRequest {
     private final BsonDocument keys;
     private static final List<Integer> VALID_TEXT_INDEX_VERSIONS = asList(1, 2, 3);
-    private static final List<Integer> VALID_SPHERE_INDEX_VERSIONS = asList(1, 2);
+    private static final List<Integer> VALID_SPHERE_INDEX_VERSIONS = asList(1, 2, 3);
     private boolean background;
     private boolean unique;
     private String name;
@@ -53,6 +55,8 @@ public class IndexRequest {
     private boolean dropDups;
     private BsonDocument storageEngine;
     private BsonDocument partialFilterExpression;
+    private Collation collation;
+    private BsonDocument wildcardProjection;
 
     /**
      * Construct a new instance with the given keys
@@ -321,7 +325,7 @@ public Integer getSphereVersion() {
      */
     public IndexRequest sphereVersion(final Integer sphereVersion) {
         if (sphereVersion != null) {
-            isTrueArgument("sphereIndexVersion must be 1 or 2", VALID_SPHERE_INDEX_VERSIONS.contains(sphereVersion));
+            isTrueArgument("sphereIndexVersion must be 1, 2 or 3", VALID_SPHERE_INDEX_VERSIONS.contains(sphereVersion));
         }
         this.sphereVersion = sphereVersion;
         return this;
@@ -485,4 +489,52 @@ public IndexRequest partialFilterExpression(final BsonDocument partialFilterExpr
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public IndexRequest collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Gets the wildcard projection of a wildcard index
+     *
+     * @return the wildcard projection
+     * @mongodb.server.release 4.2
+     * @since 3.10
+     */
+    public BsonDocument getWildcardProjection() {
+        return wildcardProjection;
+    }
+
+    /**
+     * Sets the wildcard projection of a wildcard index
+     *
+     * @param wildcardProjection the wildcard projection
+     * @return this
+     * @mongodb.server.release 4.2
+     * @since 3.10
+     */
+    public IndexRequest wildcardProjection(final BsonDocument wildcardProjection) {
+        this.wildcardProjection = wildcardProjection;
+        return this;
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/bulk/InsertRequest.java b/driver-core/src/main/com/mongodb/bulk/InsertRequest.java
index f23a0daff38..2ba8116d838 100644
--- a/driver-core/src/main/com/mongodb/bulk/InsertRequest.java
+++ b/driver-core/src/main/com/mongodb/bulk/InsertRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public final class InsertRequest extends WriteRequest {
     private final BsonDocument document;
 
diff --git a/driver-core/src/main/com/mongodb/bulk/UpdateRequest.java b/driver-core/src/main/com/mongodb/bulk/UpdateRequest.java
index a5539137645..aa0ce3be8fe 100644
--- a/driver-core/src/main/com/mongodb/bulk/UpdateRequest.java
+++ b/driver-core/src/main/com/mongodb/bulk/UpdateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,11 @@
 
 package com.mongodb.bulk;
 
+import com.mongodb.client.model.Collation;
 import org.bson.BsonDocument;
+import org.bson.BsonValue;
+
+import java.util.List;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -25,12 +29,15 @@
  *
  * @since 3.0
  */
+@Deprecated
 public final class UpdateRequest extends WriteRequest {
-    private final BsonDocument update;
+    private final BsonValue update;
     private final Type updateType;
     private final BsonDocument filter;
     private boolean isMulti = true;
     private boolean isUpsert = false;
+    private Collation collation;
+    private List<BsonDocument> arrayFilters;
 
     /**
      * Construct a new instance.
@@ -38,10 +45,13 @@ public final class UpdateRequest extends WriteRequest {
      * @param update the non-null update operations
      * @param updateType the update type, which must be either UPDATE or REPLACE
      */
-    public UpdateRequest(final BsonDocument filter, final BsonDocument update, final Type updateType) {
+    public UpdateRequest(final BsonDocument filter, final BsonValue update, final Type updateType) {
         if (updateType != Type.UPDATE && updateType != Type.REPLACE) {
             throw new IllegalArgumentException("Update type must be UPDATE or REPLACE");
         }
+        if (update != null && !update.isDocument() && !update.isArray()) {
+            throw new IllegalArgumentException("Update operation type must be a document or a pipeline");
+        }
 
         this.filter = notNull("filter", filter);
         this.update = notNull("update", update);
@@ -67,8 +77,24 @@ public BsonDocument getFilter() {
      * Gets the update.
      *
      * @return the update
+     * @deprecated use {@link #getUpdateValue()} instead
      */
+    @Deprecated
     public BsonDocument getUpdate() {
+        if (update.isDocument()) {
+            return update.asDocument();
+        }
+        return null;
+    }
+
+    /**
+     * Gets the update.
+     * Note: Starting with server version 4.2+, the update can be either a document or a pipeline.
+     *
+     * @return the update
+     * @since 3.11
+     */
+    public BsonValue getUpdateValue() {
         return update;
     }
 
@@ -112,5 +138,54 @@ public UpdateRequest upsert(final boolean isUpsert) {
         this.isUpsert = isUpsert;
         return this;
     }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public UpdateRequest collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Sets the array filters option
+     *
+     * @param arrayFilters the array filters, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public UpdateRequest arrayFilters(final List<BsonDocument> arrayFilters) {
+        this.arrayFilters = arrayFilters;
+        return this;
+    }
+
+    /**
+     * Returns the array filters option
+     *
+     * @return the array filters, which may be null
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public List<BsonDocument> getArrayFilters() {
+        return arrayFilters;
+    }
 }
 
diff --git a/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java b/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java
index c219138e0fd..29f66740860 100644
--- a/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java
+++ b/driver-core/src/main/com/mongodb/bulk/WriteConcernError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,22 +28,39 @@
  */
 public class WriteConcernError {
     private final int code;
+    private final String codeName;
     private final String message;
     private final BsonDocument details;
 
+
     /**
      * Constructs a new instance.
      *
      * @param code    the error code
+     * @param codeName the error code name
      * @param message the error message
      * @param details any details
      */
-    public WriteConcernError(final int code, final String message, final BsonDocument details) {
+    public WriteConcernError(final int code, final String codeName, final String message, final BsonDocument details) {
         this.code = code;
+        this.codeName = notNull("codeName", codeName);
         this.message = notNull("message", message);
         this.details = notNull("details", details);
     }
 
+    /**
+     * Constructs a new instance.
+     *
+     * @param code    the error code
+     * @param message the error message
+     * @param details any details
+     * @deprecated
+     */
+    @Deprecated
+    public WriteConcernError(final int code, final String message, final BsonDocument details) {
+        this(code, "", message, details);
+    }
+
     /**
      * Gets the code associated with this error.
      *
@@ -53,6 +70,17 @@ public int getCode() {
         return code;
     }
 
+    /**
+     * Gets the name associated with the error code.
+     *
+     * @return the error code name, which may be the empty string
+     * @since 3.8
+     * @mongodb.server.release 3.4
+     */
+    public String getCodeName() {
+        return codeName;
+    }
+
     /**
      * Gets the message associated with this error.
      *
@@ -85,6 +113,9 @@ public boolean equals(final Object o) {
         if (code != that.code) {
             return false;
         }
+        if (!codeName.equals(that.codeName)) {
+            return false;
+        }
         if (!details.equals(that.details)) {
             return false;
         }
@@ -98,6 +129,7 @@ public boolean equals(final Object o) {
     @Override
     public int hashCode() {
         int result = code;
+        result = 31 * result + codeName.hashCode();
         result = 31 * result + message.hashCode();
         result = 31 * result + details.hashCode();
         return result;
@@ -105,8 +137,9 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "BulkWriteConcernError{"
+        return "WriteConcernError{"
                + "code=" + code
+               + ", codeName='" + codeName + '\''
                + ", message='" + message + '\''
                + ", details=" + details
                + '}';
diff --git a/driver-core/src/main/com/mongodb/bulk/WriteRequest.java b/driver-core/src/main/com/mongodb/bulk/WriteRequest.java
index 15b55a08452..b5ff2e26dd3 100644
--- a/driver-core/src/main/com/mongodb/bulk/WriteRequest.java
+++ b/driver-core/src/main/com/mongodb/bulk/WriteRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public abstract class WriteRequest {
 
     /**
diff --git a/driver-core/src/main/com/mongodb/bulk/package-info.java b/driver-core/src/main/com/mongodb/bulk/package-info.java
index 0fa0f6a3b76..9eaad699d20 100644
--- a/driver-core/src/main/com/mongodb/bulk/package-info.java
+++ b/driver-core/src/main/com/mongodb/bulk/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodec.java b/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodec.java
index adeaa75af59..00bb5d10258 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodec.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodec.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,7 @@
 package com.mongodb.client.gridfs.codecs;
 
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDateTime;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentReader;
@@ -65,11 +66,11 @@ public GridFSFile decode(final BsonReader reader, final DecoderContext decoderCo
         BsonDocument bsonDocument = bsonDocumentCodec.decode(reader, decoderContext);
 
         BsonValue id = bsonDocument.get("_id");
-        String filename = bsonDocument.getString("filename").getValue();
+        String filename = bsonDocument.get("filename", new BsonString("")).asString().getValue();
         long length = bsonDocument.getNumber("length").longValue();
         int chunkSize = bsonDocument.getNumber("chunkSize").intValue();
         Date uploadDate = new Date(bsonDocument.getDateTime("uploadDate").getValue());
-        String md5 = bsonDocument.getString("md5").getValue();
+        String md5 = bsonDocument.containsKey("md5") ? bsonDocument.getString("md5").getValue() : null;
         BsonDocument metadataBsonDocument = bsonDocument.getDocument("metadata", new BsonDocument());
 
         Document optionalMetadata = asDocumentOrNull(metadataBsonDocument);
@@ -91,7 +92,9 @@ public void encode(final BsonWriter writer, final GridFSFile value, final Encode
         bsonDocument.put("length", new BsonInt64(value.getLength()));
         bsonDocument.put("chunkSize", new BsonInt32(value.getChunkSize()));
         bsonDocument.put("uploadDate", new BsonDateTime(value.getUploadDate().getTime()));
-        bsonDocument.put("md5", new BsonString(value.getMD5()));
+        if (value.getMD5() != null) {
+            bsonDocument.put("md5", new BsonString(value.getMD5()));
+        }
 
         Document metadata = value.getMetadata();
         if (metadata != null) {
@@ -111,6 +114,7 @@ public Class<GridFSFile> getEncoderClass() {
         return GridFSFile.class;
     }
 
+    @Nullable
     private Document asDocumentOrNull(final BsonDocument bsonDocument) {
         if (bsonDocument.isEmpty()) {
             return null;
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodecProvider.java b/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodecProvider.java
index b4a5f556025..42a8b430f14 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodecProvider.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/codecs/GridFSFileCodecProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/codecs/package-info.java b/driver-core/src/main/com/mongodb/client/gridfs/codecs/package-info.java
index 57d7cd4cf65..379c6a5d889 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/codecs/package-info.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/codecs/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,4 +19,7 @@
  *
  * @since 3.3
  */
+@NonNullApi
 package com.mongodb.client.gridfs.codecs;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadByNameOptions.java b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadByNameOptions.java
index ae2b460ff69..232a075b964 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadByNameOptions.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadByNameOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadOptions.java b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadOptions.java
index 129915387a1..eace8fa732f 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadOptions.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSDownloadOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSFile.java b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSFile.java
index 54764452cfe..b45df2d2c3d 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSFile.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSFile.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,7 @@
 package com.mongodb.client.gridfs.model;
 
 import com.mongodb.MongoGridFSException;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.types.ObjectId;
@@ -55,9 +56,11 @@ public final class GridFSFile {
      * @param uploadDate the upload date of the file
      * @param md5 the hash of the files contents
      * @param metadata the optional metadata for the file
+     * @deprecated there is no replacement for this constructor
      */
+    @Deprecated
     public GridFSFile(final BsonValue id, final String filename, final long length, final int chunkSize, final Date uploadDate,
-                      final String md5, final Document metadata) {
+                      @Nullable final String md5, final Document metadata) {
         this(id, filename, length, chunkSize, uploadDate, md5, metadata, null);
     }
 
@@ -74,15 +77,17 @@ public GridFSFile(final BsonValue id, final String filename, final long length,
      * @param md5 the hash of the files contents
      * @param metadata the optional metadata for the file
      * @param extraElements any extra data stored in the document
+     * @deprecated there is no replacement for this constructor
      */
+    @Deprecated
     public GridFSFile(final BsonValue id, final String filename, final long length, final int chunkSize, final Date uploadDate,
-                      final String md5, final Document metadata, final Document extraElements) {
+                      @Nullable final String md5, @Nullable final Document metadata, @Nullable final Document extraElements) {
         this.id = notNull("id", id);
         this.filename = notNull("filename", filename);
         this.length = notNull("length", length);
         this.chunkSize = notNull("chunkSize", chunkSize);
         this.uploadDate = notNull("uploadDate", uploadDate);
-        this.md5 = notNull("md5", md5);
+        this.md5 = md5;
         this.metadata = metadata != null && metadata.isEmpty() ? null : metadata;
         this.extraElements = extraElements;
     }
@@ -149,8 +154,11 @@ public Date getUploadDate() {
     /**
      * The hash of the contents of the stored file
      *
-     * @return the hash of the contents of the stored file
+     * @return the hash of the contents of the stored file or null if hashing the contents was disabled.
+     * @deprecated file hashing is deprecated and may be removed in the future.
      */
+    @Deprecated
+    @Nullable
     public String getMD5() {
         return md5;
     }
@@ -160,6 +168,7 @@ public String getMD5() {
      *
      * @return the metadata document or null
      */
+    @Nullable
     public Document getMetadata() {
         return metadata;
     }
@@ -168,9 +177,10 @@ public Document getMetadata() {
      * All deprecated top level elements including any contentType or aliases data
      *
      * @return the extra elements document or null
-     * @deprecated any extra information should be stored in the metadata document.
+     * @deprecated any extra information should be stored in the metadata document instead.
      */
     @Deprecated
+    @Nullable
     public Document getExtraElements() {
         return extraElements;
     }
@@ -179,7 +189,7 @@ public Document getExtraElements() {
      * The content type of the file
      *
      * @return the content type of the file
-     * @deprecated content type information stored in the metadata document.
+     * @deprecated content type information should be stored the metadata document instead.
      */
     @Deprecated
     public String getContentType() {
@@ -194,7 +204,7 @@ public String getContentType() {
      * The aliases for the file
      *
      * @return the aliases of the file
-     * @deprecated aliases should be stored in the metadata document.
+     * @deprecated any aliases should be stored in the metadata document instead.
      */
     @Deprecated
     @SuppressWarnings("unchecked")
@@ -232,7 +242,7 @@ public boolean equals(final Object o) {
         if (!uploadDate.equals(that.uploadDate)) {
             return false;
         }
-        if (!md5.equals(that.md5)) {
+        if (md5 != null ? !md5.equals(that.md5) : that.md5 != null) {
             return false;
         }
         if (metadata != null ? !metadata.equals(that.metadata) : that.metadata != null) {
@@ -251,7 +261,7 @@ public int hashCode() {
         result = 31 * result + (int) (length ^ (length >>> 32));
         result = 31 * result + chunkSize;
         result = 31 * result + uploadDate.hashCode();
-        result = 31 * result + md5.hashCode();
+        result = 31 * result + (md5 != null ? md5.hashCode() : 0);
         result = 31 * result + (metadata != null ? metadata.hashCode() : 0);
         result = 31 * result + (extraElements != null ? extraElements.hashCode() : 0);
         return result;
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSUploadOptions.java b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSUploadOptions.java
index af411048cee..8328a771021 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSUploadOptions.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/model/GridFSUploadOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.gridfs.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.Document;
 
 /**
@@ -42,6 +43,7 @@ public GridFSUploadOptions() {
      *
      * @return number of bytes per chunk if set or null
      */
+    @Nullable
     public Integer getChunkSizeBytes() {
         return chunkSizeBytes;
     }
@@ -52,7 +54,7 @@ public Integer getChunkSizeBytes() {
      * @param chunkSizeBytes the number of bytes per chunk for the uploaded file
      * @return this
      */
-    public GridFSUploadOptions chunkSizeBytes(final Integer chunkSizeBytes) {
+    public GridFSUploadOptions chunkSizeBytes(@Nullable final Integer chunkSizeBytes) {
         this.chunkSizeBytes = chunkSizeBytes;
         return this;
     }
@@ -62,6 +64,7 @@ public GridFSUploadOptions chunkSizeBytes(final Integer chunkSizeBytes) {
      *
      * @return the user provided metadata for the file if set or null
      */
+    @Nullable
     public Document getMetadata() {
         return metadata;
     }
@@ -72,7 +75,7 @@ public Document getMetadata() {
      * @param metadata the metadata to be stored
      * @return this
      */
-    public GridFSUploadOptions metadata(final Document metadata) {
+    public GridFSUploadOptions metadata(@Nullable final Document metadata) {
         this.metadata = metadata;
         return this;
     }
diff --git a/driver-core/src/main/com/mongodb/client/gridfs/model/package-info.java b/driver-core/src/main/com/mongodb/client/gridfs/model/package-info.java
index a088889c7d8..4c6da8813cc 100644
--- a/driver-core/src/main/com/mongodb/client/gridfs/model/package-info.java
+++ b/driver-core/src/main/com/mongodb/client/gridfs/model/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,4 +19,7 @@
  *
  * @since 3.1
  */
+@NonNullApi
 package com.mongodb.client.gridfs.model;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/client/model/Accumulators.java b/driver-core/src/main/com/mongodb/client/model/Accumulators.java
index 6b1afebff6e..d2e419b6b48 100644
--- a/driver-core/src/main/com/mongodb/client/model/Accumulators.java
+++ b/driver-core/src/main/com/mongodb/client/model/Accumulators.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +20,7 @@
  * Builders for accumulators used in the group pipeline stage of an aggregation pipeline.
  *
  * @mongodb.driver.manual core/aggregation-pipeline/ Aggregation pipeline
- * @mongodb.driver.manual operator/aggregation/group/#accumulator-operator Accumulators
+ * @mongodb.driver.manual reference/operator/aggregation/group/#accumulator-operator Accumulators
  * @mongodb.driver.manual meta/aggregation-quick-reference/#aggregation-expressions Expressions
  * @mongodb.server.release 2.2
  * @since 3.1
diff --git a/driver-core/src/main/com/mongodb/client/model/Aggregates.java b/driver-core/src/main/com/mongodb/client/model/Aggregates.java
index e0d83c2c619..6bd6c3e7bd3 100644
--- a/driver-core/src/main/com/mongodb/client/model/Aggregates.java
+++ b/driver-core/src/main/com/mongodb/client/model/Aggregates.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,17 +16,20 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.MongoNamespace;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWriter;
 import org.bson.BsonInt32;
 import org.bson.BsonString;
+import org.bson.BsonValue;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 
-import java.util.Arrays;
 import java.util.List;
 
+import static java.util.Arrays.asList;
 import static org.bson.assertions.Assertions.notNull;
 
 /**
@@ -36,6 +41,122 @@
  */
 public final class Aggregates {
 
+    /**
+     * Creates an $addFields pipeline stage
+     *
+     * @param fields        the fields to add
+     * @return the $addFields pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/addFields/ $addFields
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static Bson addFields(final Field<?>... fields) {
+        return addFields(asList(fields));
+    }
+
+    /**
+     * Creates an $addFields pipeline stage
+     *
+     * @param fields        the fields to add
+     * @return the $addFields pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/addFields/ $addFields
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static Bson addFields(final List<Field<?>> fields) {
+        return new AddFieldsStage(fields);
+    }
+
+    /**
+     * Creates a $bucket pipeline stage
+     *
+     * @param <TExpression> the groupBy expression type
+     * @param <Boundary>    the boundary type
+     * @param groupBy       the criteria to group By
+     * @param boundaries    the boundaries of the buckets
+     * @return the $bucket pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/bucket/ $bucket
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression, Boundary> Bson bucket(final TExpression groupBy, final List<Boundary> boundaries) {
+        return bucket(groupBy, boundaries, new BucketOptions());
+    }
+
+    /**
+     * Creates a $bucket pipeline stage
+     *
+     * @param <TExpression> the groupBy expression type
+     * @param <TBoundary>    the boundary type
+     * @param groupBy       the criteria to group By
+     * @param boundaries    the boundaries of the buckets
+     * @param options       the optional values for the $bucket stage
+     * @return the $bucket pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/bucket/ $bucket
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression, TBoundary> Bson bucket(final TExpression groupBy, final List<TBoundary> boundaries,
+                                                       final BucketOptions options) {
+        return new BucketStage<TExpression, TBoundary>(groupBy, boundaries, options);
+    }
+
+    /**
+     * Creates a $bucketAuto pipeline stage
+     *
+     * @param <TExpression> the groupBy expression type
+     * @param groupBy       the criteria to group By
+     * @param buckets       the number of the buckets
+     * @return the $bucketAuto pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/bucketAuto/ $bucketAuto
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression> Bson bucketAuto(final TExpression groupBy, final int buckets) {
+        return bucketAuto(groupBy, buckets, new BucketAutoOptions());
+    }
+
+    /**
+     * Creates a $bucketAuto pipeline stage
+     *
+     * @param <TExpression> the groupBy expression type
+     * @param groupBy       the criteria to group By
+     * @param buckets       the number of the buckets
+     * @param options       the optional values for the $bucketAuto stage
+     * @return the $bucketAuto pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/bucketAuto/ $bucketAuto
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression> Bson bucketAuto(final TExpression groupBy, final int buckets, final BucketAutoOptions options) {
+        return new BucketAutoStage<TExpression>(groupBy, buckets, options);
+    }
+
+    /**
+     * Creates a $count pipeline stage using the field name "count" to store the result
+     *
+     * @return the $count pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/count/ $count
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static Bson count() {
+        return count("count");
+    }
+
+    /**
+     * Creates a $count pipeline stage using the named field to store the result
+     *
+     * @param field the field in which to store the count
+     * @return the $count pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/count/ $count
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static Bson count(final String field) {
+        return new BsonDocument("$count", new BsonString(field));
+    }
+
     /**
      * Creates a $match pipeline stage for the specified filter
      *
@@ -72,6 +193,20 @@ public static Bson sort(final Bson sort) {
         return new SimplePipelineStage("$sort", sort);
     }
 
+    /**
+     * Creates a $sortByCount pipeline stage for the specified filter
+     *
+     * @param <TExpression> the expression type
+     * @param filter        the filter specification
+     * @return the $sortByCount pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/sortByCount/ $sortByCount
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression> Bson sortByCount(final TExpression filter) {
+        return new SortByCountStage<TExpression>(filter);
+    }
+
     /**
      * Creates a $skip pipeline stage
      *
@@ -95,11 +230,12 @@ public static Bson limit(final int limit) {
     }
 
     /**
-     * Creates a $lookup pipeline stage for the specified filter
+     * Creates a $lookup pipeline stage, joining the current collection with the one specified in from
+     * using equality match between the local field and the foreign field
      *
      * @param from         the name of the collection in the same database to perform the join with.
-     * @param localField   specifies the field from the local collection to match values against.
-     * @param foreignField specifies the field in the from collection to match values against.
+     * @param localField   the field from the local collection to match values against.
+     * @param foreignField the field in the from collection to match values against.
      * @param as           the name of the new array field to add to the input documents.
      * @return the $lookup pipeline stage
      * @mongodb.driver.manual reference/operator/aggregation/lookup/ $lookup
@@ -113,31 +249,131 @@ public static Bson lookup(final String from, final String localField, final Stri
                                                    .append("as", new BsonString(as)));
     }
 
+    /**
+     * Creates a $lookup pipeline stage, joining the current collection with the one specified in from using the given pipeline
+     *
+     * @param from          the name of the collection in the same database to perform the join with.
+     * @param pipeline      the pipeline to run on the joined collection.
+     * @param as            the name of the new array field to add to the input documents.
+     * @return the $lookup pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/lookup/ $lookup
+     * @mongodb.server.release 3.6
+     * @since 3.7
+     *
+     */
+    public static Bson lookup(final String from, final List<? extends Bson> pipeline, final String as) {
+        return lookup(from, null, pipeline, as);
+    }
+
+    /**
+     * Creates a $lookup pipeline stage, joining the current collection with the one specified in from using the given pipeline
+     *
+     * @param <TExpression> the Variable value expression type
+     * @param from          the name of the collection in the same database to perform the join with.
+     * @param let           the variables to use in the pipeline field stages.
+     * @param pipeline      the pipeline to run on the joined collection.
+     * @param as            the name of the new array field to add to the input documents.
+     * @return the $lookup pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/lookup/ $lookup
+     * @mongodb.server.release 3.6
+     * @since 3.7
+     */
+    public static <TExpression> Bson lookup(final String from, @Nullable final List<Variable<TExpression>> let,
+                                            final List<? extends Bson> pipeline, final String as) {
+       return new LookupStage<TExpression>(from, let, pipeline, as);
+    }
+
+    /**
+     * Creates a facet pipeline stage
+     *
+     * @param facets the facets to use
+     * @return the new pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/facet/ $facet
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static Bson facet(final List<Facet> facets) {
+        return new FacetStage(facets);
+    }
+
+    /**
+     * Creates a facet pipeline stage
+     *
+     * @param facets the facets to use
+     * @return the new pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/facet/ $facet
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static Bson facet(final Facet... facets) {
+        return new FacetStage(asList(facets));
+    }
+
+    /**
+     * Creates a graphLookup pipeline stage for the specified filter
+     *
+     * @param <TExpression>     the expression type
+     * @param from             the collection to query
+     * @param startWith        the expression to start the graph lookup with
+     * @param connectFromField the from field
+     * @param connectToField   the to field
+     * @param as               name of field in output document
+     * @return the $graphLookup pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/graphLookup/ $graphLookup
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression> Bson graphLookup(final String from, final TExpression startWith, final String connectFromField,
+                                                 final String connectToField, final String as) {
+        return graphLookup(from, startWith, connectFromField, connectToField, as, new GraphLookupOptions());
+    }
+
+    /**
+     * Creates a graphLookup pipeline stage for the specified filter
+     *
+     * @param <TExpression>    the expression type
+     * @param from             the collection to query
+     * @param startWith        the expression to start the graph lookup with
+     * @param connectFromField the from field
+     * @param connectToField   the to field
+     * @param as               name of field in output document
+     * @param options          optional values for the graphLookup
+     * @return the $graphLookup pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/graphLookup/ $graphLookup
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression> Bson graphLookup(final String from, final TExpression startWith, final String connectFromField,
+                                                 final String connectToField, final String as, final GraphLookupOptions options) {
+        notNull("options", options);
+        return new GraphLookupStage<TExpression>(from, startWith, connectFromField, connectToField, as, options);
+    }
+
     /**
      * Creates a $group pipeline stage for the specified filter
      *
      * @param <TExpression>     the expression type
-     * @param id                the id expression for the group
+     * @param id                the id expression for the group, which may be null
      * @param fieldAccumulators zero or more field accumulator pairs
      * @return the $group pipeline stage
      * @mongodb.driver.manual reference/operator/aggregation/group/ $group
      * @mongodb.driver.manual meta/aggregation-quick-reference/#aggregation-expressions Expressions
      */
-    public static <TExpression> Bson group(final TExpression id, final BsonField... fieldAccumulators) {
-        return group(id, Arrays.asList(fieldAccumulators));
+    public static <TExpression> Bson group(@Nullable final TExpression id, final BsonField... fieldAccumulators) {
+        return group(id, asList(fieldAccumulators));
     }
 
     /**
      * Creates a $group pipeline stage for the specified filter
      *
      * @param <TExpression>     the expression type
-     * @param id                the id expression for the group
+     * @param id                the id expression for the group, which may be null
      * @param fieldAccumulators zero or more field accumulator pairs
      * @return the $group pipeline stage
      * @mongodb.driver.manual reference/operator/aggregation/group/ $group
      * @mongodb.driver.manual meta/aggregation-quick-reference/#aggregation-expressions Expressions
      */
-    public static <TExpression> Bson group(final TExpression id, final List<BsonField> fieldAccumulators) {
+    public static <TExpression> Bson group(@Nullable final TExpression id, final List<BsonField> fieldAccumulators) {
         return new GroupStage<TExpression>(id, fieldAccumulators);
     }
 
@@ -165,17 +401,19 @@ public static Bson unwind(final String fieldName) {
     public static Bson unwind(final String fieldName, final UnwindOptions unwindOptions) {
         notNull("unwindOptions", unwindOptions);
         BsonDocument options = new BsonDocument("path", new BsonString(fieldName));
-        if (unwindOptions.isPreserveNullAndEmptyArrays() != null) {
-            options.append("preserveNullAndEmptyArrays", BsonBoolean.valueOf(unwindOptions.isPreserveNullAndEmptyArrays()));
+        Boolean preserveNullAndEmptyArrays = unwindOptions.isPreserveNullAndEmptyArrays();
+        if (preserveNullAndEmptyArrays != null) {
+            options.append("preserveNullAndEmptyArrays", BsonBoolean.valueOf(preserveNullAndEmptyArrays));
         }
-        if (unwindOptions.getIncludeArrayIndex() != null) {
-            options.append("includeArrayIndex", new BsonString(unwindOptions.getIncludeArrayIndex()));
+        String includeArrayIndex = unwindOptions.getIncludeArrayIndex();
+        if (includeArrayIndex != null) {
+            options.append("includeArrayIndex", new BsonString(includeArrayIndex));
         }
         return new BsonDocument("$unwind", options);
     }
 
     /**
-     * Creates a $out pipeline stage for the specified filter
+     * Creates a $out pipeline stage that writes into the specified collection
      *
      * @param collectionName the collection name
      * @return the $out pipeline stage
@@ -186,6 +424,94 @@ public static Bson out(final String collectionName) {
         return new BsonDocument("$out", new BsonString(collectionName));
     }
 
+    /**
+     * Creates a $merge pipeline stage that merges into the specified collection
+     *
+     * @param collectionName the name of the collection to merge into
+     * @return the $merge pipeline stage
+     * @since 3.11
+     * @mongodb.driver.manual reference/operator/aggregation/merge/  $merge
+     * @mongodb.server.release 4.2
+     */
+    public static Bson merge(final String collectionName) {
+        return merge(collectionName, new MergeOptions());
+    }
+
+    /**
+     * Creates a $merge pipeline stage that merges into the specified namespace
+     *
+     * @param namespace the namespace to merge into
+     * @return the $merge pipeline stage
+     * @since 3.11
+     * @mongodb.driver.manual reference/operator/aggregation/merge/  $merge
+     * @mongodb.server.release 4.2
+     */
+    public static Bson merge(final MongoNamespace namespace) {
+        return merge(namespace, new MergeOptions());
+    }
+
+    /**
+     * Creates a $merge pipeline stage that merges into the specified collection using the specified options.
+     *
+     * @param collectionName the name of the collection to merge into
+     * @param options the merge options
+     * @return the $merge pipeline stage
+     * @since 3.11
+     * @mongodb.driver.manual reference/operator/aggregation/merge/  $merge
+     * @mongodb.server.release 4.2
+     */
+    public static Bson merge(final String collectionName, final MergeOptions options) {
+        return new MergeStage(new BsonString(collectionName), options);
+    }
+
+    /**
+     * Creates a $merge pipeline stage that merges into the specified namespace using the specified options.
+     *
+     * @param namespace the namespace to merge into
+     * @param options the merge options
+     * @return the $merge pipeline stage
+     * @since 3.11
+     * @mongodb.driver.manual reference/operator/aggregation/merge/  $merge
+     * @mongodb.server.release 4.2
+     */
+    public static Bson merge(final MongoNamespace namespace, final MergeOptions options) {
+        return new MergeStage(new BsonDocument("db", new BsonString(namespace.getDatabaseName()))
+                .append("coll", new BsonString(namespace.getCollectionName())), options);
+    }
+
+    /**
+     * Creates a $replaceRoot pipeline stage
+     *
+     * @param <TExpression> the new root type
+     * @param value         the new root value
+     * @return the $replaceRoot pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/replaceRoot/ $replaceRoot
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public static <TExpression> Bson replaceRoot(final TExpression value) {
+        return new ReplaceStage<TExpression>(value);
+    }
+
+    /**
+     * Creates a $replaceRoot pipeline stage
+     *
+     * <p>With $replaceWith, you can promote an embedded document to the top-level.
+     * You can also specify a new document as the replacement.</p>
+     *
+     * <p>The $replaceWith is an alias for {@link #replaceRoot(Object)}.</p>
+     *
+     * @param <TExpression> the new root type
+     * @param value         the new root value
+     * @return the $replaceRoot pipeline stage
+     * @mongodb.driver.manual reference/operator/aggregation/replaceWith/ $replaceWith
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    public static <TExpression> Bson replaceWith(final TExpression value) {
+        return new ReplaceStage<TExpression>(value, true);
+    }
+
     /**
      * Creates a $sample pipeline stage with the specified sample size
      *
@@ -199,11 +525,24 @@ public static Bson sample(final int size) {
         return new BsonDocument("$sample", new BsonDocument("size", new BsonInt32(size)));
     }
 
+    static void writeBucketOutput(final CodecRegistry codecRegistry, final BsonDocumentWriter writer,
+                                  @Nullable final List<BsonField> output) {
+        if (output != null) {
+            writer.writeName("output");
+            writer.writeStartDocument();
+            for (BsonField field : output) {
+                writer.writeName(field.getName());
+                BuildersHelper.encodeValue(writer, field.getValue(), codecRegistry);
+            }
+            writer.writeEndDocument();
+        }
+    }
+
     private static class SimplePipelineStage implements Bson {
         private final String name;
         private final Bson value;
 
-        public SimplePipelineStage(final String name, final Bson value) {
+        SimplePipelineStage(final String name, final Bson value) {
             this.name = name;
             this.value = value;
         }
@@ -213,6 +552,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return new BsonDocument(name, value.toBsonDocument(documentClass, codecRegistry));
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            SimplePipelineStage that = (SimplePipelineStage) o;
+
+            if (name != null ? !name.equals(that.name) : that.name != null) {
+                return false;
+            }
+            return value != null ? value.equals(that.value) : that.value == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = name != null ? name.hashCode() : 0;
+            result = 31 * result + (value != null ? value.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Stage{"
@@ -222,11 +585,365 @@ public String toString() {
         }
     }
 
+    private static final class BucketStage<TExpression, TBoundary> implements Bson {
+
+        private final TExpression groupBy;
+        private final List<TBoundary> boundaries;
+        private final BucketOptions options;
+
+        BucketStage(final TExpression groupBy, final List<TBoundary> boundaries, final BucketOptions options) {
+            notNull("options", options);
+            this.groupBy = groupBy;
+            this.boundaries = boundaries;
+            this.options = options;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+
+            writer.writeStartDocument();
+
+            writer.writeStartDocument("$bucket");
+
+            writer.writeName("groupBy");
+            BuildersHelper.encodeValue(writer, groupBy, codecRegistry);
+
+            writer.writeStartArray("boundaries");
+            for (TBoundary boundary : boundaries) {
+                BuildersHelper.encodeValue(writer, boundary, codecRegistry);
+            }
+            writer.writeEndArray();
+            Object defaultBucket = options.getDefaultBucket();
+            if (defaultBucket != null) {
+                writer.writeName("default");
+                BuildersHelper.encodeValue(writer, defaultBucket, codecRegistry);
+            }
+            writeBucketOutput(codecRegistry, writer, options.getOutput());
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            BucketStage<?, ?> that = (BucketStage<?, ?>) o;
+
+            if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) {
+                return false;
+            }
+            if (boundaries != null ? !boundaries.equals(that.boundaries) : that.boundaries != null) {
+                return false;
+            }
+            return options.equals(that.options);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = groupBy != null ? groupBy.hashCode() : 0;
+            result = 31 * result + (boundaries != null ? boundaries.hashCode() : 0);
+            result = 31 * result + options.hashCode();
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                + "name='$bucket'"
+                + ", boundaries=" + boundaries
+                + ", groupBy=" + groupBy
+                + ", options=" + options
+                + '}';
+        }
+    }
+
+    private static final class BucketAutoStage<TExpression> implements Bson {
+
+        private final TExpression groupBy;
+        private final int buckets;
+        private final BucketAutoOptions options;
+
+        BucketAutoStage(final TExpression groupBy, final int buckets, final BucketAutoOptions options) {
+            notNull("options", options);
+            this.groupBy = groupBy;
+            this.buckets = buckets;
+            this.options = options;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+
+            writer.writeStartDocument();
+
+            writer.writeStartDocument("$bucketAuto");
+
+            writer.writeName("groupBy");
+            BuildersHelper.encodeValue(writer, groupBy, codecRegistry);
+
+            writer.writeInt32("buckets", buckets);
+
+            writeBucketOutput(codecRegistry, writer, options.getOutput());
+
+            BucketGranularity granularity = options.getGranularity();
+            if (granularity != null) {
+                writer.writeString("granularity", granularity.getValue());
+            }
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            BucketAutoStage<?> that = (BucketAutoStage<?>) o;
+
+            if (buckets != that.buckets) {
+                return false;
+            }
+            if (groupBy != null ? !groupBy.equals(that.groupBy) : that.groupBy != null) {
+                return false;
+            }
+            return options.equals(that.options);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = groupBy != null ? groupBy.hashCode() : 0;
+            result = 31 * result + buckets;
+            result = 31 * result + options.hashCode();
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                + "name='$bucketAuto'"
+                + ", buckets=" + buckets
+                + ", groupBy=" + groupBy
+                + ", options=" + options
+                + '}';
+        }
+    }
+
+    private static final class LookupStage<TExpression> implements Bson {
+        private final String from;
+        private final List<Variable<TExpression>> let;
+        private final List<? extends Bson> pipeline;
+        private final String as;
+
+        private LookupStage(final String from, @Nullable final List<Variable<TExpression>> let, final List<? extends Bson> pipeline,
+                            final String as) {
+            this.from = from;
+            this.let = let;
+            this.pipeline = pipeline;
+            this.as = as;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+
+            writer.writeStartDocument();
+
+            writer.writeStartDocument("$lookup");
+
+            writer.writeString("from", from);
+
+            if (let != null) {
+                writer.writeStartDocument("let");
+
+                for (Variable<?> variable : let) {
+                    writer.writeName(variable.getName());
+                    BuildersHelper.encodeValue(writer, variable.getValue(), codecRegistry);
+                }
+
+                writer.writeEndDocument();
+            }
+
+            writer.writeName("pipeline");
+            writer.writeStartArray();
+            for (Bson stage : pipeline) {
+                BuildersHelper.encodeValue(writer, stage, codecRegistry);
+            }
+            writer.writeEndArray();
+
+            writer.writeString("as", as);
+
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            LookupStage<?> that = (LookupStage<?>) o;
+
+            if (from != null ? !from.equals(that.from) : that.from != null) {
+                return false;
+            }
+            if (let != null ? !let.equals(that.let) : that.let != null) {
+                return false;
+            }
+            if (pipeline != null ? !pipeline.equals(that.pipeline) : that.pipeline != null) {
+                return false;
+            }
+            return as != null ? as.equals(that.as) : that.as == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = from != null ? from.hashCode() : 0;
+            result = 31 * result + (let != null ? let.hashCode() : 0);
+            result = 31 * result + (pipeline != null ? pipeline.hashCode() : 0);
+            result = 31 * result + (as != null ? as.hashCode() : 0);
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                    + "name='$lookup'"
+                    + ", from='" + from + '\''
+                    + ", let=" + let
+                    + ", pipeline=" + pipeline
+                    + ", as='" + as + '\''
+                    + '}';
+        }
+    }
+
+    private static final class GraphLookupStage<TExpression> implements Bson {
+        private final String from;
+        private final TExpression startWith;
+        private final String connectFromField;
+        private final String connectToField;
+        private final String as;
+        private final GraphLookupOptions options;
+
+        private GraphLookupStage(final String from, final TExpression startWith, final String connectFromField, final String connectToField,
+                                 final String as, final GraphLookupOptions options) {
+            this.from = from;
+            this.startWith = startWith;
+            this.connectFromField = connectFromField;
+            this.connectToField = connectToField;
+            this.as = as;
+            this.options = options;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+
+            writer.writeStartDocument();
+
+            writer.writeStartDocument("$graphLookup");
+
+            writer.writeString("from", from);
+            writer.writeName("startWith");
+            BuildersHelper.encodeValue(writer, startWith, codecRegistry);
+
+            writer.writeString("connectFromField", connectFromField);
+            writer.writeString("connectToField", connectToField);
+            writer.writeString("as", as);
+            Integer maxDepth = options.getMaxDepth();
+            if (maxDepth != null) {
+                writer.writeInt32("maxDepth", maxDepth);
+            }
+            String depthField = options.getDepthField();
+            if (depthField != null) {
+                writer.writeString("depthField", depthField);
+            }
+            Bson restrictSearchWithMatch = options.getRestrictSearchWithMatch();
+            if (restrictSearchWithMatch != null) {
+                writer.writeName("restrictSearchWithMatch");
+                BuildersHelper.encodeValue(writer, restrictSearchWithMatch, codecRegistry);
+            }
+
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            GraphLookupStage<?> that = (GraphLookupStage<?>) o;
+
+            if (from != null ? !from.equals(that.from) : that.from != null) {
+                return false;
+            }
+            if (startWith != null ? !startWith.equals(that.startWith) : that.startWith != null) {
+                return false;
+            }
+            if (connectFromField != null ? !connectFromField.equals(that.connectFromField) : that.connectFromField != null) {
+                return false;
+            }
+            if (connectToField != null ? !connectToField.equals(that.connectToField) : that.connectToField != null) {
+                return false;
+            }
+            if (as != null ? !as.equals(that.as) : that.as != null) {
+                return false;
+            }
+            return options != null ? options.equals(that.options) : that.options == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = from != null ? from.hashCode() : 0;
+            result = 31 * result + (startWith != null ? startWith.hashCode() : 0);
+            result = 31 * result + (connectFromField != null ? connectFromField.hashCode() : 0);
+            result = 31 * result + (connectToField != null ? connectToField.hashCode() : 0);
+            result = 31 * result + (as != null ? as.hashCode() : 0);
+            result = 31 * result + (options != null ? options.hashCode() : 0);
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                + "name='$graphLookup'"
+                + ", as='" + as + '\''
+                + ", connectFromField='" + connectFromField + '\''
+                + ", connectToField='" + connectToField + '\''
+                + ", from='" + from + '\''
+                + ", options=" + options
+                + ", startWith=" + startWith
+                + '}';
+        }
+    }
+
     private static class GroupStage<TExpression> implements Bson {
         private final TExpression id;
         private final List<BsonField> fieldAccumulators;
 
-        public GroupStage(final TExpression id, final List<BsonField> fieldAccumulators) {
+        GroupStage(final TExpression id, final List<BsonField> fieldAccumulators) {
             this.id = id;
             this.fieldAccumulators = fieldAccumulators;
         }
@@ -253,6 +970,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentC
             return writer.getDocument();
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            GroupStage<?> that = (GroupStage<?>) o;
+
+            if (id != null ? !id.equals(that.id) : that.id != null) {
+                return false;
+            }
+            return fieldAccumulators != null ? fieldAccumulators.equals(that.fieldAccumulators) : that.fieldAccumulators == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = id != null ? id.hashCode() : 0;
+            result = 31 * result + (fieldAccumulators != null ? fieldAccumulators.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Stage{"
@@ -263,6 +1004,352 @@ public String toString() {
         }
     }
 
+    private static class SortByCountStage<TExpression> implements Bson {
+        private final TExpression filter;
+
+        SortByCountStage(final TExpression filter) {
+            this.filter = filter;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+
+            writer.writeStartDocument();
+
+            writer.writeName("$sortByCount");
+            BuildersHelper.encodeValue(writer, filter, codecRegistry);
+
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            SortByCountStage<?> that = (SortByCountStage<?>) o;
+
+            return filter != null ? filter.equals(that.filter) : that.filter == null;
+        }
+
+        @Override
+        public int hashCode() {
+            return filter != null ? filter.hashCode() : 0;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                + "name='$sortByCount'"
+                + ", id=" + filter
+                + '}';
+        }
+    }
+
+    private static class FacetStage implements Bson {
+
+        private final List<Facet> facets;
+        FacetStage(final List<Facet> facets) {
+            this.facets = facets;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+            writer.writeStartDocument();
+            writer.writeName("$facet");
+            writer.writeStartDocument();
+            for (Facet facet : facets) {
+                writer.writeName(facet.getName());
+                writer.writeStartArray();
+                for (Bson bson : facet.getPipeline()) {
+                    BuildersHelper.encodeValue(writer, bson, codecRegistry);
+                }
+                writer.writeEndArray();
+            }
+            writer.writeEndDocument();
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            FacetStage that = (FacetStage) o;
+
+            return facets != null ? facets.equals(that.facets) : that.facets == null;
+        }
+
+        @Override
+        public int hashCode() {
+            return facets != null ? facets.hashCode() : 0;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                + "name='$facet', "
+                + "facets=" + facets + '}';
+        }
+
+    }
+
+    private static class AddFieldsStage implements Bson {
+        private final List<Field<?>> fields;
+
+        AddFieldsStage(final List<Field<?>> fields) {
+            this.fields = fields;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+            writer.writeStartDocument();
+            writer.writeName("$addFields");
+            writer.writeStartDocument();
+            for (Field<?> field : fields) {
+                writer.writeName(field.getName());
+                BuildersHelper.encodeValue(writer, field.getValue(), codecRegistry);
+            }
+            writer.writeEndDocument();
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            AddFieldsStage that = (AddFieldsStage) o;
+
+            return fields != null ? fields.equals(that.fields) : that.fields == null;
+        }
+
+        @Override
+        public int hashCode() {
+            return fields != null ? fields.hashCode() : 0;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                + "name='$addFields', "
+                + "fields=" + fields
+                + '}';
+        }
+    }
+
+    private static class ReplaceStage<TExpression> implements Bson {
+        private final TExpression value;
+        private final boolean replaceWith;
+
+        ReplaceStage(final TExpression value) {
+            this(value, false);
+        }
+
+        ReplaceStage(final TExpression value, final boolean replaceWith) {
+            this.value = value;
+            this.replaceWith = replaceWith;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+            writer.writeStartDocument();
+
+            if (replaceWith) {
+                writer.writeName("$replaceWith");
+                BuildersHelper.encodeValue(writer, value, codecRegistry);
+            } else {
+                writer.writeName("$replaceRoot");
+                writer.writeStartDocument();
+                writer.writeName("newRoot");
+                BuildersHelper.encodeValue(writer, value, codecRegistry);
+                writer.writeEndDocument();
+            }
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            ReplaceStage<?> that = (ReplaceStage<?>) o;
+
+            return value != null ? value.equals(that.value) : that.value == null;
+        }
+
+        @Override
+        public int hashCode() {
+            return value != null ? value.hashCode() : 0;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                + "name='$replaceRoot', "
+                + "value=" + value
+                + '}';
+        }
+    }
+
+    private static class MergeStage implements Bson {
+        private final BsonValue intoValue;
+        private final MergeOptions options;
+
+        MergeStage(final BsonValue intoValue, final MergeOptions options) {
+            this.intoValue = intoValue;
+            this.options = options;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+            writer.writeStartDocument();
+            writer.writeStartDocument("$merge");
+            writer.writeName("into");
+            if (intoValue.isString()) {
+                writer.writeString(intoValue.asString().getValue());
+            } else {
+                writer.writeStartDocument();
+                writer.writeString("db", intoValue.asDocument().getString("db").getValue());
+                writer.writeString("coll", intoValue.asDocument().getString("coll").getValue());
+                writer.writeEndDocument();
+            }
+            if (options.getUniqueIdentifier() != null) {
+                if (options.getUniqueIdentifier().size() == 1) {
+                    writer.writeString("on", options.getUniqueIdentifier().get(0));
+                } else {
+                    writer.writeStartArray("on");
+                    for (String cur : options.getUniqueIdentifier()) {
+                        writer.writeString(cur);
+                    }
+                    writer.writeEndArray();
+                }
+            }
+            if (options.getVariables() != null) {
+                writer.writeStartDocument("let");
+
+                for (Variable<?> variable : options.getVariables()) {
+                    writer.writeName(variable.getName());
+                    BuildersHelper.encodeValue(writer, variable.getValue(), codecRegistry);
+                }
+
+                writer.writeEndDocument();
+            }
+
+            if (options.getWhenMatched() != null) {
+                writer.writeName("whenMatched");
+                switch (options.getWhenMatched()) {
+                    case REPLACE:
+                        writer.writeString("replace");
+                        break;
+                    case KEEP_EXISTING:
+                        writer.writeString("keepExisting");
+                        break;
+                    case MERGE:
+                        writer.writeString("merge");
+                        break;
+                    case PIPELINE:
+                        writer.writeStartArray();
+                        for (Bson curStage : options.getWhenMatchedPipeline()) {
+                            BuildersHelper.encodeValue(writer, curStage, codecRegistry);
+                        }
+                        writer.writeEndArray();
+                        break;
+                    case FAIL:
+                        writer.writeString("fail");
+                        break;
+                    default:
+                        throw new UnsupportedOperationException("Unexpected value: " + options.getWhenMatched());
+                }
+            }
+            if (options.getWhenNotMatched() != null) {
+                writer.writeName("whenNotMatched");
+                switch (options.getWhenNotMatched()) {
+                    case INSERT:
+                        writer.writeString("insert");
+                        break;
+                    case DISCARD:
+                        writer.writeString("discard");
+                        break;
+                    case FAIL:
+                        writer.writeString("fail");
+                        break;
+                    default:
+                        throw new UnsupportedOperationException("Unexpected value: " + options.getWhenNotMatched());
+                }
+            }
+            writer.writeEndDocument();
+            writer.writeEndDocument();
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            MergeStage that = (MergeStage) o;
+
+            if (!intoValue.equals(that.intoValue)) {
+                return false;
+            }
+            if (!options.equals(that.options)) {
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = intoValue.hashCode();
+            result = 31 * result + options.hashCode();
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "Stage{"
+                    + "name='$merge', "
+                    + ", into=" + intoValue
+                    + ", options=" + options
+                    + '}';
+        }
+    }
+
     private Aggregates() {
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/AggregationLevel.java b/driver-core/src/main/com/mongodb/client/model/AggregationLevel.java
new file mode 100644
index 00000000000..8a3e5b97c42
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/AggregationLevel.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+/**
+ * The aggregation level
+ *
+ * Where an aggregation command should take place.
+ *
+ * @since 3.10
+ */
+@Deprecated
+public enum AggregationLevel {
+
+    /**
+     * Database level aggregation
+     */
+    DATABASE,
+
+    /**
+     * Collection level aggregation
+     */
+    COLLECTION
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/BsonField.java b/driver-core/src/main/com/mongodb/client/model/BsonField.java
index f1fdc1f35fc..02a17ef4605 100644
--- a/driver-core/src/main/com/mongodb/client/model/BsonField.java
+++ b/driver-core/src/main/com/mongodb/client/model/BsonField.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,9 +57,33 @@ public Bson getValue() {
         return value;
     }
 
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BsonField bsonField = (BsonField) o;
+
+        if (!name.equals(bsonField.name)) {
+            return false;
+        }
+        return value.equals(bsonField.value);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name.hashCode();
+        result = 31 * result + value.hashCode();
+        return result;
+    }
+
     @Override
     public String toString() {
-        return "Field{"
+        return "BsonField{"
                + "name='" + name + '\''
                + ", value=" + value
                + '}';
diff --git a/driver-core/src/main/com/mongodb/client/model/BucketAutoOptions.java b/driver-core/src/main/com/mongodb/client/model/BucketAutoOptions.java
new file mode 100644
index 00000000000..deec9a9caa9
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/BucketAutoOptions.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.lang.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+/**
+ * The options for a $bucketAuto aggregation pipeline stage
+ *
+ * @mongodb.driver.manual reference/operator/aggregation/bucketAuto/ $bucketAuto
+ * @mongodb.server.release 3.4
+ * @since 3.4
+ */
+public class BucketAutoOptions {
+    private List<BsonField> output;
+    private BucketGranularity granularity;
+
+    /**
+     * @return the granularity of the bucket definitions
+     */
+    @Nullable
+    public BucketGranularity getGranularity() {
+        return granularity;
+    }
+
+    /**
+     * @return the output document definition
+     */
+    @Nullable
+    public List<BsonField> getOutput() {
+        return output == null ? null : new ArrayList<BsonField>(output);
+    }
+
+    /**
+     * Specifies the granularity of the bucket definitions.
+     *
+     * @param granularity the granularity of the bucket definitions
+     * @return this
+     * @see <a href="https://en.wikipedia.org/wiki/Preferred_number">Preferred numbers</a>
+     * @see BucketGranularity
+     */
+    public BucketAutoOptions granularity(@Nullable final BucketGranularity granularity) {
+        this.granularity = granularity;
+        return this;
+    }
+
+    /**
+     * The definition of the output document in each bucket
+     *
+     * @param output the output document definition
+     * @return this
+     */
+    public BucketAutoOptions output(final BsonField... output) {
+        this.output = asList(output);
+        return this;
+    }
+
+    /**
+     * The definition of the output document in each bucket
+     *
+     * @param output the output document definition
+     * @return this
+     */
+    public BucketAutoOptions output(@Nullable final List<BsonField> output) {
+        this.output = output;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BucketAutoOptions that = (BucketAutoOptions) o;
+
+        if (output != null ? !output.equals(that.output) : that.output != null) {
+            return false;
+        }
+        return granularity == that.granularity;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = output != null ? output.hashCode() : 0;
+        result = 31 * result + (granularity != null ? granularity.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "BucketAutoOptions{"
+                + "output=" + output
+                + ", granularity=" + granularity
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/BucketGranularity.java b/driver-core/src/main/com/mongodb/client/model/BucketGranularity.java
new file mode 100644
index 00000000000..d10e1d36531
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/BucketGranularity.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+/**
+ * Granularity values for automatic bucketing.
+ *
+ * @mongodb.driver.manual reference/operator/aggregation/bucketAuto/ $bucketAuto
+ * @mongodb.server.release 3.4
+ * @see <a href="https://en.wikipedia.org/wiki/Preferred_number">Preferred numbers</a>
+ * @since 3.4
+ */
+public enum BucketGranularity {
+    R5,
+    R10,
+    R20,
+    R40,
+    R80,
+    SERIES_125("1-2-5"),
+    E6,
+    E12,
+    E24,
+    E48,
+    E96,
+    E192,
+    POWERSOF2;
+
+    private final String value;
+
+    BucketGranularity() {
+        value = name();
+    }
+
+    BucketGranularity(final String name) {
+        value = name;
+    }
+
+    /**
+     * Tries find the enum instance for the given value
+     *
+     * @param value the value to search for
+     * @return the enum instance
+     */
+    public static BucketGranularity fromString(final String value) {
+        for (BucketGranularity granularity : BucketGranularity.values()) {
+            if (granularity.getValue().equals(value)) {
+                return granularity;
+            }
+        }
+        throw new IllegalArgumentException("No Granularity exists for the value " + value);
+    }
+
+    /**
+     * Returns the display as defined in the preferred number article
+     *
+     * @return the display name
+     */
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/BucketOptions.java b/driver-core/src/main/com/mongodb/client/model/BucketOptions.java
new file mode 100644
index 00000000000..a0b522ec4bd
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/BucketOptions.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.lang.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+/**
+ * The options for a $bucket aggregation pipeline stage
+ *
+ * @mongodb.driver.manual reference/operator/aggregation/bucketAuto/ $bucket
+ * @mongodb.server.release 3.4
+ * @since 3.4
+ */
+public class BucketOptions {
+    private Object defaultBucket;
+    private List<BsonField> output;
+
+    /**
+     * The name of the default bucket for values outside the defined buckets
+     *
+     * @param name the bucket value
+     * @return this
+     */
+    public BucketOptions defaultBucket(@Nullable final Object name) {
+        defaultBucket = name;
+        return this;
+    }
+
+    /**
+     * @return the default bucket value
+     */
+    @Nullable
+    public Object getDefaultBucket() {
+        return defaultBucket;
+    }
+
+    /**
+     * @return the output document definition
+     */
+    @Nullable
+    public List<BsonField> getOutput() {
+        return output == null ? null : new ArrayList<BsonField>(output);
+    }
+
+    /**
+     * The definition of the output document in each bucket
+     *
+     * @param output the output document definition
+     * @return this
+     */
+    public BucketOptions output(final BsonField... output) {
+        this.output = asList(output);
+        return this;
+    }
+
+    /**
+     * The definition of the output document in each bucket
+     *
+     * @param output the output document definition
+     * @return this
+     */
+    public BucketOptions output(final List<BsonField> output) {
+        this.output = output;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BucketOptions that = (BucketOptions) o;
+
+        if (defaultBucket != null ? !defaultBucket.equals(that.defaultBucket) : that.defaultBucket != null) {
+            return false;
+        }
+        return output != null ? output.equals(that.output) : that.output == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = defaultBucket != null ? defaultBucket.hashCode() : 0;
+        result = 31 * result + (output != null ? output.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "BucketOptions{"
+                + "defaultBucket=" + defaultBucket
+                + ", output=" + output
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/BuildersHelper.java b/driver-core/src/main/com/mongodb/client/model/BuildersHelper.java
index 7b7468f67be..7125037bc83 100644
--- a/driver-core/src/main/com/mongodb/client/model/BuildersHelper.java
+++ b/driver-core/src/main/com/mongodb/client/model/BuildersHelper.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/driver-core/src/main/com/mongodb/client/model/BulkWriteOptions.java b/driver-core/src/main/com/mongodb/client/model/BulkWriteOptions.java
index 95094894494..382ba7c61f9 100644
--- a/driver-core/src/main/com/mongodb/client/model/BulkWriteOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/BulkWriteOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
+
 /**
  * The options to apply to a bulk write.
  *
@@ -56,6 +58,7 @@ public BulkWriteOptions ordered(final boolean ordered) {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -68,8 +71,16 @@ public Boolean getBypassDocumentValidation() {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
-    public BulkWriteOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public BulkWriteOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "BulkWriteOptions{"
+                + "ordered=" + ordered
+                + ", bypassDocumentValidation=" + bypassDocumentValidation
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/Collation.java b/driver-core/src/main/com/mongodb/client/model/Collation.java
new file mode 100644
index 00000000000..c3c388e88a6
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/Collation.java
@@ -0,0 +1,422 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+
+/**
+ * The options regarding collation support in MongoDB 3.4+
+ *
+ * @mongodb.driver.manual reference/method/db.createCollection/ Create Collection
+ * @mongodb.driver.manual reference/command/createIndexes Index options
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ */
+public final class Collation {
+    private final String locale;
+    private final Boolean caseLevel;
+    private final CollationCaseFirst caseFirst;
+    private final CollationStrength strength;
+    private final Boolean numericOrdering;
+    private final CollationAlternate alternate;
+    private final CollationMaxVariable maxVariable;
+    private final Boolean normalization;
+    private final Boolean backwards;
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Convenience method to create a from an existing {@code Collation}.
+     *
+     * @param options create a builder from existing options
+     * @return a builder
+     */
+    public static Builder builder(final Collation options) {
+        return new Builder(options);
+    }
+
+    /**
+     * A Collation builder.
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private String locale;
+        private Boolean caseLevel;
+        private CollationCaseFirst caseFirst;
+        private CollationStrength strength;
+        private Boolean numericOrdering;
+        private CollationAlternate alternate;
+        private CollationMaxVariable maxVariable;
+        private Boolean normalization;
+        private Boolean backwards;
+
+        private Builder() {
+        }
+
+        private Builder(final Collation options) {
+            this.locale = options.getLocale();
+            this.caseLevel = options.getCaseLevel();
+            this.caseFirst = options.getCaseFirst();
+            this.strength = options.getStrength();
+            this.numericOrdering = options.getNumericOrdering();
+            this.alternate = options.getAlternate();
+            this.maxVariable = options.getMaxVariable();
+            this.normalization = options.getNormalization();
+            this.backwards = options.getBackwards();
+        }
+
+        /**
+         * Sets the locale
+         *
+         * @param locale the locale
+         * @see <a href="http://userguide.icu-project.org/locale">ICU User Guide - Locale</a>
+         * @return this
+         */
+        public Builder locale(@Nullable final String locale) {
+            this.locale = locale;
+            return this;
+        }
+
+        /**
+         * Sets the case level value
+         *
+         * <p>Turns on case sensitivity</p>
+         * @param caseLevel the case level value
+         * @return this
+         */
+        public Builder caseLevel(@Nullable final Boolean caseLevel) {
+            this.caseLevel = caseLevel;
+            return this;
+        }
+
+        /**
+         * Sets the collation case first value
+         *
+         * <p>Determines if Uppercase or lowercase values should come first</p>
+         * @param caseFirst the collation case first value
+         * @return this
+         */
+        public Builder collationCaseFirst(@Nullable final CollationCaseFirst caseFirst) {
+            this.caseFirst = caseFirst;
+            return this;
+        }
+
+        /**
+         * Sets the collation strength
+         *
+         * @param strength the strength
+         * @return this
+         */
+        public Builder collationStrength(@Nullable final CollationStrength strength) {
+            this.strength = strength;
+            return this;
+        }
+
+        /**
+         * Sets the numeric ordering
+         *
+         * @param numericOrdering if true will order numbers based on numerical order and not collation order
+         * @return this
+         */
+        public Builder numericOrdering(@Nullable final Boolean numericOrdering) {
+            this.numericOrdering = numericOrdering;
+            return this;
+        }
+
+        /**
+         * Sets the alternate
+         *
+         * <p>Controls whether spaces and punctuation are considered base characters</p>
+         *
+         * @param alternate the alternate
+         * @return this
+         */
+        public Builder collationAlternate(@Nullable final CollationAlternate alternate) {
+            this.alternate = alternate;
+            return this;
+        }
+
+        /**
+         * Sets the maxVariable
+         *
+         * @param maxVariable the maxVariable
+         * @return this
+         */
+        public Builder collationMaxVariable(@Nullable final CollationMaxVariable maxVariable) {
+            this.maxVariable = maxVariable;
+            return this;
+        }
+
+        /**
+         * Sets the normalization value
+         *
+         * <p>If true, normalizes text into Unicode NFD.</p>
+         * @param normalization the normalization value
+         * @return this
+         */
+        public Builder normalization(@Nullable final Boolean normalization) {
+            this.normalization = normalization;
+            return this;
+        }
+
+        /**
+         * Sets the backwards value
+         *
+         * <p>Causes secondary differences to be considered in reverse order, as it is done in the French language</p>
+         *
+         * @param backwards the backwards value
+         * @return this
+         */
+        public Builder backwards(@Nullable final Boolean backwards) {
+            this.backwards = backwards;
+            return this;
+        }
+
+        /**
+         * Creates a new Collation object with the settings initialised on this builder.
+         *
+         * @return a new Collation object
+         */
+        public Collation build() {
+            return new Collation(this);
+        }
+    }
+
+    /**
+     * Returns the locale
+     *
+     * @see <a href="http://userguide.icu-project.org/locale">ICU User Guide - Locale</a>
+     * @return the locale
+     */
+    @Nullable
+    public String getLocale() {
+        return locale;
+    }
+
+    /**
+     * Returns the case level value
+     *
+     * @return the case level value
+     */
+    @Nullable
+    public Boolean getCaseLevel() {
+        return caseLevel;
+    }
+
+    /**
+     * Returns the collation case first value
+     *
+     * @return the collation case first value
+     */
+    @Nullable
+    public CollationCaseFirst getCaseFirst() {
+        return caseFirst;
+    }
+
+    /**
+     * Returns the collation strength
+     *
+     * @return the collation strength
+     */
+    @Nullable
+    public CollationStrength getStrength() {
+        return strength;
+    }
+
+    /**
+     * Returns the numeric ordering, if true will order numbers based on numerical order and not collation order.
+     *
+     * @return the numeric ordering
+     */
+    @Nullable
+    public Boolean getNumericOrdering() {
+        return numericOrdering;
+    }
+
+    /**
+     * Returns the collation alternate
+     *
+     * @return the alternate
+     */
+    @Nullable
+    public CollationAlternate getAlternate() {
+        return alternate;
+    }
+
+    /**
+     * Returns the maxVariable
+     *
+     * <p>Controls which characters are affected by collection alternate {@link CollationAlternate#SHIFTED}.</p>
+     * @return the maxVariable
+     */
+    @Nullable
+    public CollationMaxVariable getMaxVariable() {
+        return maxVariable;
+    }
+
+    /**
+     * Returns the normalization value
+     *
+     * <p>If true, normalizes text into Unicode NFD.</p>
+     * @return the normalization
+     */
+    @Nullable
+    public Boolean getNormalization() {
+        return normalization;
+    }
+
+    /**
+     * Returns the backwards value
+     *
+     * @return the backwards value
+     */
+    @Nullable
+    public Boolean getBackwards() {
+        return backwards;
+    }
+
+    /**
+     * Gets this collation options as a document.
+     *
+     * @return The collation options as a BsonDocument
+     */
+    public BsonDocument asDocument() {
+        BsonDocument collation = new BsonDocument();
+        if (locale != null) {
+            collation.put("locale", new BsonString(locale));
+        }
+        if (caseLevel != null) {
+            collation.put("caseLevel", new BsonBoolean(caseLevel));
+        }
+        if (caseFirst != null) {
+            collation.put("caseFirst", new BsonString(caseFirst.getValue()));
+        }
+        if (strength != null) {
+            collation.put("strength", new BsonInt32(strength.getIntRepresentation()));
+        }
+        if (numericOrdering != null) {
+            collation.put("numericOrdering", new BsonBoolean(numericOrdering));
+        }
+        if (alternate != null) {
+            collation.put("alternate", new BsonString(alternate.getValue()));
+        }
+        if (maxVariable != null) {
+            collation.put("maxVariable", new BsonString(maxVariable.getValue()));
+        }
+        if (normalization != null) {
+            collation.put("normalization", new BsonBoolean(normalization));
+        }
+        if (backwards != null) {
+            collation.put("backwards", new BsonBoolean(backwards));
+        }
+        return collation;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o){
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Collation that = (Collation) o;
+
+        if (locale != null ? !locale.equals(that.getLocale()) : that.getLocale() != null) {
+            return false;
+        }
+        if (caseLevel != null ? !caseLevel.equals(that.getCaseLevel()) : that.getCaseLevel() != null) {
+            return false;
+        }
+        if (getCaseFirst() != that.getCaseFirst()) {
+            return false;
+        }
+        if (getStrength() != that.getStrength()) {
+            return false;
+        }
+        if (numericOrdering != null ? !numericOrdering.equals(that.getNumericOrdering()) : that.getNumericOrdering() != null) {
+            return false;
+        }
+        if (getAlternate() != that.getAlternate()) {
+            return false;
+        }
+        if (getMaxVariable() != that.getMaxVariable()) {
+            return false;
+        }
+        if (normalization != null ? !normalization.equals(that.getNormalization()) : that.getNormalization() != null) {
+            return false;
+        }
+        if (backwards != null ? !backwards.equals(that.getBackwards()) : that.getBackwards() != null) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = locale != null ? locale.hashCode() : 0;
+        result = 31 * result + (caseLevel != null ? caseLevel.hashCode() : 0);
+        result = 31 * result + (caseFirst != null ? caseFirst.hashCode() : 0);
+        result = 31 * result + (strength != null ? strength.hashCode() : 0);
+        result = 31 * result + (numericOrdering != null ? numericOrdering.hashCode() : 0);
+        result = 31 * result + (alternate != null ? alternate.hashCode() : 0);
+        result = 31 * result + (maxVariable != null ? maxVariable.hashCode() : 0);
+        result = 31 * result + (normalization != null ? normalization.hashCode() : 0);
+        result = 31 * result + (backwards != null ? backwards.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Collation{"
+                + "locale='" + locale + "'"
+                + ", caseLevel=" + caseLevel
+                + ", caseFirst=" + caseFirst
+                + ", strength=" + strength
+                + ", numericOrdering=" + numericOrdering
+                + ", alternate=" + alternate
+                + ", maxVariable=" + maxVariable
+                + ", normalization=" + normalization
+                + ", backwards=" + backwards
+                + "}";
+    }
+
+
+    private Collation(final Builder builder) {
+        this.locale = builder.locale;
+        this.caseLevel = builder.caseLevel;
+        this.caseFirst = builder.caseFirst;
+        this.strength = builder.strength;
+        this.numericOrdering = builder.numericOrdering;
+        this.alternate = builder.alternate;
+        this.maxVariable = builder.maxVariable;
+        this.normalization = builder.normalization;
+        this.backwards = builder.backwards;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/CollationAlternate.java b/driver-core/src/main/com/mongodb/client/model/CollationAlternate.java
new file mode 100644
index 00000000000..e3df3aa7a3e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/CollationAlternate.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import static java.lang.String.format;
+
+/**
+ * Collation support allows the specific configuration of whether or not spaces and punctuation are considered base characters.
+ *
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ */
+public enum CollationAlternate {
+    /**
+     * Non-ignorable
+     *
+     * <p>Spaces and punctuation are considered base characters</p>
+     */
+    NON_IGNORABLE("non-ignorable"),
+
+    /**
+     * Shifted
+     *
+     * <p>Spaces and punctuation are not considered base characters, and are only distinguished when the collation strength is &gt; 3</p>
+     * @see CollationMaxVariable
+     */
+    SHIFTED("shifted");
+
+    private final String value;
+    CollationAlternate(final String caseFirst) {
+        this.value = caseFirst;
+    }
+
+    /**
+     * @return the String representation of the collation case first value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Returns the CollationAlternate from the string value.
+     *
+     * @param collationAlternate the string value.
+     * @return the read concern
+     */
+    public static CollationAlternate fromString(final String collationAlternate) {
+        if (collationAlternate != null) {
+            for (CollationAlternate alternate : CollationAlternate.values()) {
+                if (collationAlternate.equals(alternate.value)) {
+                    return alternate;
+                }
+            }
+        }
+        throw new IllegalArgumentException(format("'%s' is not a valid collationAlternate", collationAlternate));
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/CollationCaseFirst.java b/driver-core/src/main/com/mongodb/client/model/CollationCaseFirst.java
new file mode 100644
index 00000000000..16d666593ca
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/CollationCaseFirst.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import static java.lang.String.format;
+
+/**
+ * Collation support allows the specific configuration of how character cases are handled.
+ *
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ */
+public enum CollationCaseFirst {
+
+    /**
+     * Uppercase first
+     */
+    UPPER("upper"),
+
+    /**
+     * Lowercase first
+     */
+    LOWER("lower"),
+
+    /**
+     * Off
+     */
+    OFF("off");
+
+    private final String value;
+    CollationCaseFirst(final String caseFirst) {
+        this.value = caseFirst;
+    }
+
+    /**
+     * @return the String representation of the collation case first value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Returns the CollationCaseFirst from the string value.
+     *
+     * @param collationCaseFirst the string value.
+     * @return the read concern
+     */
+    public static CollationCaseFirst fromString(final String collationCaseFirst) {
+        if (collationCaseFirst != null) {
+            for (CollationCaseFirst caseFirst : CollationCaseFirst.values()) {
+                if (collationCaseFirst.equals(caseFirst.value)) {
+                    return caseFirst;
+                }
+            }
+        }
+        throw new IllegalArgumentException(format("'%s' is not a valid collationCaseFirst", collationCaseFirst));
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/CollationMaxVariable.java b/driver-core/src/main/com/mongodb/client/model/CollationMaxVariable.java
new file mode 100644
index 00000000000..3c1ede0dc35
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/CollationMaxVariable.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import static java.lang.String.format;
+
+/**
+ * Collation support allows the specific configuration of whether or not spaces and punctuation are considered base characters.
+ *
+ * <p>{@code CollationMaxVariable} controls which characters are affected by {@link CollationAlternate#SHIFTED}.</p>
+ *
+ * @see CollationAlternate#SHIFTED
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ */
+public enum CollationMaxVariable {
+    /**
+     * Punct
+     *
+     * <p>Both punctuation and spaces are affected.</p>
+     */
+    PUNCT("punct"),
+
+    /**
+     * Shifted
+     *
+     * <p>Only spaces are affected.</p>
+     */
+    SPACE("space");
+
+    private final String value;
+    CollationMaxVariable(final String caseFirst) {
+        this.value = caseFirst;
+    }
+
+    /**
+     * @return the String representation of the collation case first value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Returns the CollationMaxVariable from the string value.
+     *
+     * @param collationMaxVariable the string value.
+     * @return the read concern
+     */
+    public static CollationMaxVariable fromString(final String collationMaxVariable) {
+        if (collationMaxVariable != null) {
+            for (CollationMaxVariable maxVariable : CollationMaxVariable.values()) {
+                if (collationMaxVariable.equals(maxVariable.value)) {
+                    return maxVariable;
+                }
+            }
+        }
+        throw new IllegalArgumentException(format("'%s' is not a valid collationMaxVariable", collationMaxVariable));
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/CollationStrength.java b/driver-core/src/main/com/mongodb/client/model/CollationStrength.java
new file mode 100644
index 00000000000..7f8ea347d7f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/CollationStrength.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+/**
+ * Collation support allows the specific configuration of how differences between characters are handled.
+ *
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ */
+public enum CollationStrength {
+
+    /**
+     * Strongest level, denote difference between base characters
+     */
+    PRIMARY(1),
+
+    /**
+     * Accents in characters are considered secondary differences
+     */
+    SECONDARY(2),
+
+    /**
+     * Upper and lower case differences in characters are distinguished at the tertiary level. The server default.
+     */
+    TERTIARY(3),
+
+    /**
+     * When punctuation is ignored at level 1-3, an additional level can be used to distinguish words with and without punctuation.
+     */
+    QUATERNARY(4),
+
+    /**
+     * When all other levels are equal, the identical level is used as a tiebreaker.
+     * The Unicode code point values of the NFD form of each string are compared at this level, just in case there is no difference at
+     * levels 1-4
+     */
+    IDENTICAL(5);
+
+    private final int intRepresentation;
+
+    CollationStrength(final int intRepresentation) {
+        this.intRepresentation = intRepresentation;
+    }
+
+    /**
+     * The integer representation of the collation strength.
+     *
+     * @return the integer representation
+     */
+    public int getIntRepresentation() {
+        return intRepresentation;
+    }
+
+    /**
+     * Gets the order from the given integer representation.
+     *
+     * @param intRepresentation the integer representation
+     * @return the order
+     */
+    public static CollationStrength fromInt(final int intRepresentation) {
+        switch (intRepresentation) {
+            case 1:
+                return PRIMARY;
+            case 2:
+                return SECONDARY;
+            case 3:
+                return TERTIARY;
+            case 4:
+                return QUATERNARY;
+            case 5:
+                return IDENTICAL;
+            default:
+                throw new IllegalArgumentException(intRepresentation + " is not a valid collation strength");
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/CountOptions.java b/driver-core/src/main/com/mongodb/client/model/CountOptions.java
index bee4528bcfc..e724854323b 100644
--- a/driver-core/src/main/com/mongodb/client/model/CountOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/CountOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -34,12 +35,14 @@ public class CountOptions {
     private int limit;
     private int skip;
     private long maxTimeMS;
+    private Collation collation;
 
     /**
      * Gets the hint to apply.
      *
      * @return the hint, which should describe an existing
      */
+    @Nullable
     public Bson getHint() {
         return hint;
     }
@@ -49,6 +52,7 @@ public Bson getHint() {
      *
      * @return the hint string, which should be the name of an existing index
      */
+    @Nullable
     public String getHintString() {
         return hintString;
     }
@@ -59,7 +63,7 @@ public String getHintString() {
      * @param hint a document describing the index which should be used for this operation.
      * @return this
      */
-    public CountOptions hint(final Bson hint) {
+    public CountOptions hint(@Nullable final Bson hint) {
         this.hint = hint;
         return this;
     }
@@ -67,10 +71,12 @@ public CountOptions hint(final Bson hint) {
     /**
      * Sets the hint to apply.
      *
+     * <p>Note: If {@link CountOptions#hint(Bson)} is set that will be used instead of any hint string.</p>
+     *
      * @param hint the name of the index which should be used for the operation
      * @return this
      */
-    public CountOptions hintString(final String hint) {
+    public CountOptions hintString(@Nullable final String hint) {
         this.hintString = hint;
         return this;
     }
@@ -142,4 +148,42 @@ public CountOptions maxTime(final long maxTime, final TimeUnit timeUnit) {
         this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
         return this;
     }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public CountOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "CountOptions{"
+                + "hint=" + hint
+                + ", hintString='" + hintString + '\''
+                + ", limit=" + limit
+                + ", skip=" + skip
+                + ", maxTimeMS=" + maxTimeMS
+                + ", collation=" + collation
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java b/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java
index eb8c9736e2e..e5a698fba1e 100644
--- a/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/CreateCollectionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import static com.mongodb.assertions.Assertions.notNull;
@@ -35,12 +36,15 @@ public class CreateCollectionOptions {
     private Bson storageEngineOptions;
     private IndexOptionDefaults indexOptionDefaults = new IndexOptionDefaults();
     private ValidationOptions validationOptions = new ValidationOptions();
+    private Collation collation;
 
     /**
      * Gets if auto-index is enabled
      *
      * @return true if auto-index is enabled
+     * @deprecated this option was deprecated in MongoDB 3.2 and removed in MongodB 4.0
      */
+    @Deprecated
     public boolean isAutoIndex() {
         return autoIndex;
     }
@@ -50,7 +54,9 @@ public boolean isAutoIndex() {
      *
      * @param autoIndex true if auto-index is enabled
      * @return this
+     * @deprecated this option was deprecated in MongoDB 3.2 and removed in MongodB 4.0
      */
+    @Deprecated
     public CreateCollectionOptions autoIndex(final boolean autoIndex) {
         this.autoIndex = autoIndex;
         return this;
@@ -123,7 +129,10 @@ public CreateCollectionOptions sizeInBytes(final long sizeInBytes) {
      * @return true if the usePowerOf2Sizes allocation strategy is turned on for this collection
      * @mongodb.driver.manual reference/command/collMod/#usePowerOf2Sizes usePowerOf2Sizes
      * @mongodb.server.release 2.6
+     * @deprecated As of MongoDB 3.0, power of 2 sizes is ignored by the MongoDB server
      */
+    @Deprecated
+    @Nullable
     public Boolean isUsePowerOf2Sizes() {
         return usePowerOf2Sizes;
     }
@@ -135,8 +144,10 @@ public Boolean isUsePowerOf2Sizes() {
      * @return this
      * @mongodb.driver.manual reference/command/collMod/#usePowerOf2Sizes usePowerOf2Sizes
      * @mongodb.server.release 2.6
+     * @deprecated As of MongoDB 3.0, power of 2 sizes is ignored by the MongoDB server
      */
-    public CreateCollectionOptions usePowerOf2Sizes(final Boolean usePowerOf2Sizes) {
+    @Deprecated
+    public CreateCollectionOptions usePowerOf2Sizes(@Nullable final Boolean usePowerOf2Sizes) {
         this.usePowerOf2Sizes = usePowerOf2Sizes;
         return this;
     }
@@ -147,6 +158,7 @@ public CreateCollectionOptions usePowerOf2Sizes(final Boolean usePowerOf2Sizes)
      * @return the storage engine options
      * @mongodb.server.release 3.0
      */
+    @Nullable
     public Bson getStorageEngineOptions() {
         return storageEngineOptions;
     }
@@ -158,7 +170,7 @@ public Bson getStorageEngineOptions() {
      * @return this
      * @mongodb.server.release 3.0
      */
-    public CreateCollectionOptions storageEngineOptions(final Bson storageEngineOptions) {
+    public CreateCollectionOptions storageEngineOptions(@Nullable final Bson storageEngineOptions) {
         this.storageEngineOptions = storageEngineOptions;
         return this;
     }
@@ -183,7 +195,7 @@ public IndexOptionDefaults getIndexOptionDefaults() {
      * @mongodb.server.release 3.2
      */
     public CreateCollectionOptions indexOptionDefaults(final IndexOptionDefaults indexOptionDefaults) {
-        this.indexOptionDefaults = indexOptionDefaults;
+        this.indexOptionDefaults = notNull("indexOptionDefaults", indexOptionDefaults);
         return this;
     }
 
@@ -210,4 +222,45 @@ public CreateCollectionOptions validationOptions(final ValidationOptions validat
         this.validationOptions = notNull("validationOptions", validationOptions);
         return this;
     }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public CreateCollectionOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "CreateCollectionOptions{"
+                + "autoIndex=" + autoIndex
+                + ", maxDocuments=" + maxDocuments
+                + ", capped=" + capped
+                + ", sizeInBytes=" + sizeInBytes
+                + ", usePowerOf2Sizes=" + usePowerOf2Sizes
+                + ", storageEngineOptions=" + storageEngineOptions
+                + ", indexOptionDefaults=" + indexOptionDefaults
+                + ", validationOptions=" + validationOptions
+                + ", collation=" + collation
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/CreateIndexOptions.java b/driver-core/src/main/com/mongodb/client/model/CreateIndexOptions.java
new file mode 100644
index 00000000000..9dcc9937d7a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/CreateIndexOptions.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The options to apply to the command when creating indexes.
+ *
+ * @mongodb.driver.manual reference/command/createIndexes Index options
+ * @since 3.6
+ */
+public class CreateIndexOptions {
+    private long maxTimeMS;
+
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     */
+    public CreateIndexOptions maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "CreateIndexOptions{"
+                + "maxTimeMS=" + maxTimeMS
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/CreateViewOptions.java b/driver-core/src/main/com/mongodb/client/model/CreateViewOptions.java
new file mode 100644
index 00000000000..72e3ccef650
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/CreateViewOptions.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.lang.Nullable;
+
+/**
+ * Options for creating a view
+ *
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ * @mongodb.driver.manual reference/command/create Create Command
+ */
+public class CreateViewOptions {
+    private Collation collation;
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     */
+    public CreateViewOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "CreateViewOptions{"
+                + "collation=" + collation
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/DeleteManyModel.java b/driver-core/src/main/com/mongodb/client/model/DeleteManyModel.java
index b4c7d13efee..24fc81c3c0a 100644
--- a/driver-core/src/main/com/mongodb/client/model/DeleteManyModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/DeleteManyModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
  */
 public final class DeleteManyModel<T> extends WriteModel<T> {
     private final Bson filter;
+    private final DeleteOptions options;
 
     /**
      * Construct a new instance.
@@ -37,7 +38,20 @@ public final class DeleteManyModel<T> extends WriteModel<T> {
      * @param filter a document describing the query filter, which may not be null.
      */
     public DeleteManyModel(final Bson filter) {
+        this(filter, new DeleteOptions());
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param options the options to apply
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public DeleteManyModel(final Bson filter, final DeleteOptions options) {
         this.filter = notNull("filter", filter);
+        this.options = notNull("options", options);
     }
 
     /**
@@ -48,4 +62,22 @@ public DeleteManyModel(final Bson filter) {
     public Bson getFilter() {
         return filter;
     }
+
+    /**
+     * Gets the options to apply.
+     *
+     * @return the options
+     * @since 3.4
+     */
+    public DeleteOptions getOptions() {
+        return options;
+    }
+
+    @Override
+    public String toString() {
+        return "DeleteManyModel{"
+                + "filter=" + filter
+                + ", options=" + options
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/DeleteOneModel.java b/driver-core/src/main/com/mongodb/client/model/DeleteOneModel.java
index 6db14631106..5c49bae292b 100644
--- a/driver-core/src/main/com/mongodb/client/model/DeleteOneModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/DeleteOneModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
  */
 public class DeleteOneModel<T> extends WriteModel<T> {
     private final Bson filter;
+    private final DeleteOptions options;
 
     /**
      * Construct a new instance.
@@ -37,7 +38,20 @@ public class DeleteOneModel<T> extends WriteModel<T> {
      * @param filter a document describing the query filter, which may not be null.
      */
     public DeleteOneModel(final Bson filter) {
+        this(filter, new DeleteOptions());
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param options the options to apply
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public DeleteOneModel(final Bson filter, final DeleteOptions options) {
         this.filter = notNull("filter", filter);
+        this.options = notNull("options", options);
     }
 
     /**
@@ -48,4 +62,22 @@ public DeleteOneModel(final Bson filter) {
     public Bson getFilter() {
         return filter;
     }
+
+    /**
+     * Gets the options to apply.
+     *
+     * @return the options
+     * @since 3.4
+     */
+    public DeleteOptions getOptions() {
+        return options;
+    }
+
+    @Override
+    public String toString() {
+        return "DeleteOneModel{"
+                + "filter=" + filter
+                + ", options=" + options
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/DeleteOptions.java b/driver-core/src/main/com/mongodb/client/model/DeleteOptions.java
new file mode 100644
index 00000000000..18a32f7e71a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/DeleteOptions.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.lang.Nullable;
+
+/**
+ * The options to apply when deleting documents.
+ *
+ * @since 3.4
+ * @mongodb.driver.manual tutorial/remove-documents/ Remove documents
+ * @mongodb.driver.manual reference/command/delete/ Delete Command
+ */
+public class DeleteOptions {
+    private Collation collation;
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public DeleteOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "DeleteOptions{"
+                + "collation=" + collation
+                + '}';
+    }
+}
+
diff --git a/driver-core/src/main/com/mongodb/client/model/DropIndexOptions.java b/driver-core/src/main/com/mongodb/client/model/DropIndexOptions.java
new file mode 100644
index 00000000000..982a0253a3d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/DropIndexOptions.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The options to apply to the command when dropping indexes.
+ *
+ * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+ * @since 3.6
+ */
+public class DropIndexOptions {
+    private long maxTimeMS;
+
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     */
+    public DropIndexOptions maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "DropIndexOptions{"
+                + "maxTimeMS=" + maxTimeMS
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/EstimatedDocumentCountOptions.java b/driver-core/src/main/com/mongodb/client/model/EstimatedDocumentCountOptions.java
new file mode 100644
index 00000000000..6da6ed40f45
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/EstimatedDocumentCountOptions.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The options an estimated count operation.
+ *
+ * @since 3.8
+ * @mongodb.driver.manual reference/command/count/ Count
+ */
+public class EstimatedDocumentCountOptions {
+    private long maxTimeMS;
+
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     */
+    public EstimatedDocumentCountOptions maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "EstimatedCountOptions{"
+                + ", maxTimeMS=" + maxTimeMS
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/Facet.java b/driver-core/src/main/com/mongodb/client/model/Facet.java
new file mode 100644
index 00000000000..84628f84cb1
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/Facet.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+/**
+ * Defines a Facet for use in $facet pipeline stages.
+ *
+ * @mongodb.driver.manual reference/operator/aggregation/facet/ $facet
+ * @mongodb.server.release 3.4
+ * @since 3.4
+ */
+public class Facet {
+    private final String name;
+    private final List<? extends Bson> pipeline;
+
+    /**
+     * @param name     the name of this facet
+     * @param pipeline the facet definition pipeline
+     */
+    public Facet(final String name, final List<? extends Bson> pipeline) {
+        this.name = name;
+        this.pipeline = pipeline;
+    }
+
+    /**
+     * @param name     the name of this facet
+     * @param pipeline the facet definition pipeline
+     */
+    public Facet(final String name, final Bson... pipeline) {
+        this(name, asList(pipeline));
+    }
+
+    /**
+     * @return the facet name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the pipeline definition
+     */
+    public List<? extends Bson> getPipeline() {
+        return pipeline;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Facet facet = (Facet) o;
+
+        if (name != null ? !name.equals(facet.name) : facet.name != null) {
+            return false;
+        }
+        return pipeline != null ? pipeline.equals(facet.pipeline) : facet.pipeline == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + (pipeline != null ? pipeline.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Facet{"
+                + "name='" + name + '\''
+                + ", pipeline=" + pipeline
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/Field.java b/driver-core/src/main/com/mongodb/client/model/Field.java
new file mode 100644
index 00000000000..e6245c53597
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/Field.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * Helps define new fields for the $addFields pipeline stage
+ *
+ * @param <TExpression> the type of the value for the new field
+ * @mongodb.driver.manual reference/operator/aggregation/addFields/  $addFields
+ * @mongodb.server.release 3.4
+ * @since 3.4
+ */
+public class Field<TExpression> {
+    private final String name;
+    private TExpression value;
+
+    /**
+     * Creates a new field definition for use in $addFields pipeline stages
+     *
+     * @param name  the name of the new field
+     * @param value the value of the new field
+     * @mongodb.driver.manual reference/operator/aggregation/addFields/  $addFields
+     */
+    public Field(final String name, final TExpression value) {
+        this.name = notNull("name", name);
+        this.value = value;
+    }
+
+    /**
+     * @return the name of the new field
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the value of the new field
+     */
+    public TExpression getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Field)) {
+            return false;
+        }
+
+        Field<?> field = (Field<?>) o;
+
+        if (!name.equals(field.name)) {
+            return false;
+        }
+        return value != null ? value.equals(field.value) : field.value == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name.hashCode();
+        result = 31 * result + (value != null ? value.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Field{"
+                + "name='" + name + '\''
+                + ", value=" + value
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/Filters.java b/driver-core/src/main/com/mongodb/client/model/Filters.java
index db1432db55b..258b7bc07a0 100644
--- a/driver-core/src/main/com/mongodb/client/model/Filters.java
+++ b/driver-core/src/main/com/mongodb/client/model/Filters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,7 +9,7 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
@@ -18,6 +18,7 @@
 
 import com.mongodb.client.model.geojson.Geometry;
 import com.mongodb.client.model.geojson.Point;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -33,13 +34,16 @@
 import org.bson.conversions.Bson;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.client.model.BuildersHelper.encodeValue;
 import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableSet;
 
 /**
  * A factory for query filters. A convenient way to use this class is to statically import all of its methods, which allows usage like:
@@ -54,16 +58,31 @@ private Filters() {
     }
 
     /**
-     * Creates a filter that matches all documents where the value of the field name equals the specified value. Note that this does
+     * Creates a filter that matches all documents where the value of _id field equals the specified value. Note that this doesn't
+     * actually generate a $eq operator, as the query language doesn't require it.
+     *
+     * @param value     the value, which may be null
+     * @param <TItem>   the value type
+     * @return the filter
+     * @mongodb.driver.manual reference/operator/query/eq $eq
+     *
+     * @since 3.4
+     */
+    public static <TItem> Bson eq(@Nullable final TItem value) {
+        return eq("_id", value);
+    }
+
+    /**
+     * Creates a filter that matches all documents where the value of the field name equals the specified value. Note that this doesn't
      * actually generate a $eq operator, as the query language doesn't require it.
      *
      * @param fieldName the field name
-     * @param value     the value
+     * @param value     the value, which may be null
      * @param <TItem>   the value type
      * @return the filter
      * @mongodb.driver.manual reference/operator/query/eq $eq
      */
-    public static <TItem> Bson eq(final String fieldName, final TItem value) {
+    public static <TItem> Bson eq(final String fieldName, @Nullable final TItem value) {
         return new SimpleEncodingFilter<TItem>(fieldName, value);
     }
 
@@ -71,12 +90,12 @@ public static <TItem> Bson eq(final String fieldName, final TItem value) {
      * Creates a filter that matches all documents where the value of the field name does not equal the specified value.
      *
      * @param fieldName the field name
-     * @param value     the value
+     * @param value     the value, which may be null
      * @param <TItem>   the value type
      * @return the filter
      * @mongodb.driver.manual reference/operator/query/ne $ne
      */
-    public static <TItem> Bson ne(final String fieldName, final TItem value) {
+    public static <TItem> Bson ne(final String fieldName, @Nullable final TItem value) {
         return new OperatorFilter<TItem>("$ne", fieldName, value);
     }
 
@@ -380,7 +399,7 @@ public static Bson regex(final String fieldName, final String pattern) {
      * @return the filter
      * @mongodb.driver.manual reference/operator/query/regex $regex
      */
-    public static Bson regex(final String fieldName, final String pattern, final String options) {
+    public static Bson regex(final String fieldName, final String pattern, @Nullable final String options) {
         notNull("pattern", pattern);
         return new SimpleFilter(fieldName, new BsonRegularExpression(pattern, options));
     }
@@ -453,6 +472,20 @@ public static Bson where(final String javaScriptExpression) {
         return new BsonDocument("$where", new BsonString(javaScriptExpression));
     }
 
+    /**
+     * Allows the use of aggregation expressions within the query language.
+     *
+     * @param expression the aggregation expression
+     * @param <TExpression> the expression type
+     * @return the filter
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/operator/query/expr/ $expr
+     */
+    public static <TExpression> Bson expr(final TExpression expression) {
+        return new SimpleEncodingFilter<TExpression>("$expr", expression);
+    }
+
     /**
      * Creates a filter that matches all documents where the value of a field is an array that contains all the specified values.
      *
@@ -716,14 +749,15 @@ public static Bson geoIntersects(final String fieldName, final Geometry geometry
      *
      * @param fieldName   the field name
      * @param geometry    the bounding GeoJSON geometry object
-     * @param maxDistance the maximum distance from the point, in meters
-     * @param minDistance the minimum distance from the point, in meters
+     * @param maxDistance the maximum distance from the point, in meters. It may be null.
+     * @param minDistance the minimum distance from the point, in meters. It may be null.
      * @return the filter
      * @since 3.1
      * @mongodb.driver.manual reference/operator/query/near/ $near
      * @mongodb.server.release 2.4
      */
-    public static Bson near(final String fieldName, final Point geometry, final Double maxDistance, final Double minDistance) {
+    public static Bson near(final String fieldName, final Point geometry, @Nullable final Double maxDistance,
+                            @Nullable final Double minDistance) {
         return new GeometryOperatorFilter<Point>("$near", fieldName, geometry, maxDistance, minDistance);
     }
 
@@ -732,14 +766,15 @@ public static Bson near(final String fieldName, final Point geometry, final Doub
      *
      * @param fieldName   the field name
      * @param geometry    the bounding GeoJSON geometry object
-     * @param maxDistance the maximum distance from the point, in meters
-     * @param minDistance the minimum distance from the point, in meters
+     * @param maxDistance the maximum distance from the point, in meters. It may be null.
+     * @param minDistance the minimum distance from the point, in meters. It may be null.
      * @return the filter
      * @since 3.1
      * @mongodb.driver.manual reference/operator/query/near/ $near
      * @mongodb.server.release 2.4
      */
-    public static Bson near(final String fieldName, final Bson geometry, final Double maxDistance, final Double minDistance) {
+    public static Bson near(final String fieldName, final Bson geometry, @Nullable final Double maxDistance,
+                            @Nullable final Double minDistance) {
         return new GeometryOperatorFilter<Bson>("$near", fieldName, geometry, maxDistance, minDistance);
     }
 
@@ -749,14 +784,15 @@ public static Bson near(final String fieldName, final Bson geometry, final Doubl
      * @param fieldName   the field name
      * @param x           the x coordinate
      * @param y           the y coordinate
-     * @param maxDistance the maximum distance from the point, in radians
-     * @param minDistance the minimum distance from the point, in radians
+     * @param maxDistance the maximum distance from the point, in radians. It may be null.
+     * @param minDistance the minimum distance from the point, in radians. It may be null.
      * @return the filter
      * @since 3.1
      * @mongodb.driver.manual reference/operator/query/near/ $near
      * @mongodb.server.release 2.4
      */
-    public static Bson near(final String fieldName, final double x, final double y, final Double maxDistance, final Double minDistance) {
+    public static Bson near(final String fieldName, final double x, final double y, @Nullable final Double maxDistance,
+                            @Nullable final Double minDistance) {
         return createNearFilterDocument(fieldName, x, y, maxDistance, minDistance, "$near");
     }
 
@@ -766,14 +802,15 @@ public static Bson near(final String fieldName, final double x, final double y,
      *
      * @param fieldName   the field name
      * @param geometry    the bounding GeoJSON geometry object
-     * @param maxDistance the maximum distance from the point, in meters
-     * @param minDistance the minimum distance from the point, in meters
+     * @param maxDistance the maximum distance from the point, in meters. It may be null.
+     * @param minDistance the minimum distance from the point, in meters. It may be null.
      * @return the filter
      * @since 3.1
      * @mongodb.driver.manual reference/operator/query/near/ $near
      * @mongodb.server.release 2.4
      */
-    public static Bson nearSphere(final String fieldName, final Point geometry, final Double maxDistance, final Double minDistance) {
+    public static Bson nearSphere(final String fieldName, final Point geometry, @Nullable final Double maxDistance,
+                                  @Nullable final Double minDistance) {
         return new GeometryOperatorFilter<Point>("$nearSphere", fieldName, geometry, maxDistance, minDistance);
     }
 
@@ -783,14 +820,15 @@ public static Bson nearSphere(final String fieldName, final Point geometry, fina
      *
      * @param fieldName   the field name
      * @param geometry    the bounding GeoJSON geometry object
-     * @param maxDistance the maximum distance from the point, in meters
-     * @param minDistance the minimum distance from the point, in meters
+     * @param maxDistance the maximum distance from the point, in meters. It may be null.
+     * @param minDistance the minimum distance from the point, in meters. It may be null.
      * @return the filter
      * @since 3.1
      * @mongodb.driver.manual reference/operator/query/near/ $near
      * @mongodb.server.release 2.4
      */
-    public static Bson nearSphere(final String fieldName, final Bson geometry, final Double maxDistance, final Double minDistance) {
+    public static Bson nearSphere(final String fieldName, final Bson geometry, @Nullable final Double maxDistance,
+                                  @Nullable final Double minDistance) {
         return new GeometryOperatorFilter<Bson>("$nearSphere", fieldName, geometry, maxDistance, minDistance);
     }
 
@@ -801,20 +839,33 @@ public static Bson nearSphere(final String fieldName, final Bson geometry, final
      * @param fieldName   the field name
      * @param x           the x coordinate
      * @param y           the y coordinate
-     * @param maxDistance the maximum distance from the point, in radians
-     * @param minDistance the minimum distance from the point, in radians
+     * @param maxDistance the maximum distance from the point, in radians. It may be null.
+     * @param minDistance the minimum distance from the point, in radians. It may be null.
      * @return the filter
      * @since 3.1
      * @mongodb.driver.manual reference/operator/query/near/ $near
      * @mongodb.server.release 2.4
      */
-    public static Bson nearSphere(final String fieldName, final double x, final double y, final Double maxDistance,
-                                  final Double minDistance) {
+    public static Bson nearSphere(final String fieldName, final double x, final double y, @Nullable final Double maxDistance,
+                                  @Nullable final Double minDistance) {
         return createNearFilterDocument(fieldName, x, y, maxDistance, minDistance, "$nearSphere");
     }
 
-    private static Bson createNearFilterDocument(final String fieldName, final double x, final double y, final Double maxDistance,
-                                                 final Double minDistance, final String operator) {
+    /**
+     * Creates a filter that matches all documents that validate against the given JSON schema document.
+     *
+     * @param schema the JSON schema to validate against
+     * @return the filter
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/operator/query/jsonSchema/ $jsonSchema
+     */
+    public static Bson jsonSchema(final Bson schema) {
+        return new SimpleEncodingFilter<Bson>("$jsonSchema", schema);
+    }
+
+    private static Bson createNearFilterDocument(final String fieldName, final double x, final double y, @Nullable final Double maxDistance,
+                                                 @Nullable final Double minDistance, final String operator) {
         BsonDocument nearFilter = new BsonDocument(operator, new BsonArray(Arrays.asList(new BsonDouble(x), new BsonDouble(y))));
         if (maxDistance != null) {
             nearFilter.append("$maxDistance", new BsonDouble(maxDistance));
@@ -847,6 +898,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return new BsonDocument(fieldName, value);
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            SimpleFilter that = (SimpleFilter) o;
+
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            return value.equals(that.value);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName.hashCode();
+            result = 31 * result + value.hashCode();
+            return result;
+        }
+
         @Override
         public String toString() {
             return operatorFilterToString(fieldName, "$eq", value);
@@ -879,6 +954,34 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return writer.getDocument();
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            OperatorFilter<?> that = (OperatorFilter<?>) o;
+
+            if (!operatorName.equals(that.operatorName)) {
+                return false;
+            }
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            return value != null ? value.equals(that.value) : that.value == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = operatorName.hashCode();
+            result = 31 * result + fieldName.hashCode();
+            result = 31 * result + (value != null ? value.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return operatorFilterToString(fieldName, operatorName, value);
@@ -888,7 +991,7 @@ public String toString() {
     private static class AndFilter implements Bson {
         private final Iterable<Bson> filters;
 
-        public AndFilter(final Iterable<Bson> filters) {
+        AndFilter(final Iterable<Bson> filters) {
             this.filters = notNull("filters", filters);
         }
 
@@ -955,6 +1058,25 @@ private void promoteRenderableToDollarForm(final BsonDocument document, final Ma
             document.put("$and", clauses);
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            AndFilter andFilter = (AndFilter) o;
+
+            return filters.equals(andFilter.filters);
+        }
+
+        @Override
+        public int hashCode() {
+            return filters.hashCode();
+        }
+
         @Override
         public String toString() {
             return "And Filter{"
@@ -980,7 +1102,7 @@ private enum Operator {
         private final Operator operator;
         private final Iterable<Bson> filters;
 
-        public OrNorFilter(final Operator operator, final Iterable<Bson> filters) {
+        OrNorFilter(final Operator operator, final Iterable<Bson> filters) {
             this.operator = notNull("operator", operator);
             this.filters = notNull("filters", filters);
         }
@@ -999,6 +1121,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return orRenderable;
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            OrNorFilter that = (OrNorFilter) o;
+
+            if (operator != that.operator) {
+                return false;
+            }
+            return filters.equals(that.filters);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = operator.hashCode();
+            result = 31 * result + filters.hashCode();
+            return result;
+        }
+
         @Override
         public String toString() {
             return operator.toStringName + " Filter{"
@@ -1039,6 +1185,34 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return writer.getDocument();
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            IterableOperatorFilter<?> that = (IterableOperatorFilter<?>) o;
+
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            if (!operatorName.equals(that.operatorName)) {
+                return false;
+            }
+            return values.equals(that.values);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName.hashCode();
+            result = 31 * result + operatorName.hashCode();
+            result = 31 * result + values.hashCode();
+            return result;
+        }
+
         @Override
         public String toString() {
             return operatorFilterToString(fieldName, operatorName, values);
@@ -1049,7 +1223,7 @@ private static class SimpleEncodingFilter<TItem> implements Bson {
         private final String fieldName;
         private final TItem value;
 
-        public SimpleEncodingFilter(final String fieldName, final TItem value) {
+        SimpleEncodingFilter(final String fieldName, final TItem value) {
             this.fieldName = notNull("fieldName", fieldName);
             this.value = value;
         }
@@ -1066,6 +1240,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return writer.getDocument();
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            SimpleEncodingFilter<?> that = (SimpleEncodingFilter<?>) o;
+
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            return value != null ? value.equals(that.value) : that.value == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName.hashCode();
+            result = 31 * result + (value != null ? value.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Filter{"
@@ -1076,9 +1274,11 @@ public String toString() {
     }
 
     private static class NotFilter implements Bson {
+        private static final Set<String> DBREF_KEYS = unmodifiableSet(new HashSet<String>(asList("$ref", "$id")));
+        private static final Set<String> DBREF_KEYS_WITH_DB =  unmodifiableSet(new HashSet<String>(asList("$ref", "$id", "$db")));
         private final Bson filter;
 
-        public NotFilter(final Bson filter) {
+        NotFilter(final Bson filter) {
             this.filter = notNull("filter", filter);
         }
 
@@ -1097,15 +1297,49 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             }
         }
 
+        private boolean containsOperator(final BsonDocument value) {
+            Set<String> keys = value.keySet();
+            if (keys.equals(DBREF_KEYS) || keys.equals(DBREF_KEYS_WITH_DB)) {
+                return false;
+            }
+
+            for (String key : keys) {
+                if (key.startsWith("$")) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private BsonDocument createFilter(final String fieldName, final BsonValue value) {
             if (fieldName.startsWith("$")) {
                 return new BsonDocument("$not", new BsonDocument(fieldName, value));
-            } else if (value.isDocument() || value.isRegularExpression()) {
+            } else if ((value.isDocument() && containsOperator(value.asDocument())) || value.isRegularExpression()) {
                 return new BsonDocument(fieldName, new BsonDocument("$not", value));
             }
             return new BsonDocument(fieldName, new BsonDocument("$not", new BsonDocument("$eq", value)));
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            NotFilter notFilter = (NotFilter) o;
+
+            return filter.equals(notFilter.filter);
+        }
+
+        @Override
+        public int hashCode() {
+            return filter.hashCode();
+        }
+
         @Override
         public String toString() {
             return "Not Filter{"
@@ -1121,12 +1355,12 @@ private static class GeometryOperatorFilter<TItem> implements Bson {
         private final Double maxDistance;
         private final Double minDistance;
 
-        public GeometryOperatorFilter(final String operatorName, final String fieldName, final TItem geometry) {
+        GeometryOperatorFilter(final String operatorName, final String fieldName, final TItem geometry) {
             this(operatorName, fieldName, geometry, null, null);
         }
 
-        public GeometryOperatorFilter(final String operatorName, final String fieldName, final TItem geometry,
-                                      final Double maxDistance, final Double minDistance) {
+        GeometryOperatorFilter(final String operatorName, final String fieldName, final TItem geometry,
+                               @Nullable final Double maxDistance, @Nullable final Double minDistance) {
             this.operatorName = operatorName;
             this.fieldName = notNull("fieldName", fieldName);
             this.geometry = notNull("geometry", geometry);
@@ -1157,6 +1391,42 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return writer.getDocument();
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            GeometryOperatorFilter<?> that = (GeometryOperatorFilter<?>) o;
+
+            if (operatorName != null ? !operatorName.equals(that.operatorName) : that.operatorName != null) {
+                return false;
+            }
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            if (!geometry.equals(that.geometry)) {
+                return false;
+            }
+            if (maxDistance != null ? !maxDistance.equals(that.maxDistance) : that.maxDistance != null) {
+                return false;
+            }
+            return minDistance != null ? minDistance.equals(that.minDistance) : that.minDistance == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = operatorName != null ? operatorName.hashCode() : 0;
+            result = 31 * result + fieldName.hashCode();
+            result = 31 * result + geometry.hashCode();
+            result = 31 * result + (maxDistance != null ? maxDistance.hashCode() : 0);
+            result = 31 * result + (minDistance != null ? minDistance.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Geometry Operator Filter{"
@@ -1173,7 +1443,7 @@ private static class TextFilter implements Bson {
         private final String search;
         private final TextSearchOptions textSearchOptions;
 
-        public TextFilter(final String search, final TextSearchOptions textSearchOptions) {
+        TextFilter(final String search, final TextSearchOptions textSearchOptions) {
             this.search = search;
             this.textSearchOptions = textSearchOptions;
         }
@@ -1181,18 +1451,48 @@ public TextFilter(final String search, final TextSearchOptions textSearchOptions
         @Override
         public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry) {
             BsonDocument searchDocument = new BsonDocument("$search", new BsonString(search));
-            if (textSearchOptions.getLanguage() != null) {
-                searchDocument.put("$language", new BsonString(textSearchOptions.getLanguage()));
+
+            String language = textSearchOptions.getLanguage();
+            if (language != null) {
+                searchDocument.put("$language", new BsonString(language));
             }
-            if (textSearchOptions.getCaseSensitive() != null) {
-                searchDocument.put("$caseSensitive", BsonBoolean.valueOf(textSearchOptions.getCaseSensitive()));
+
+            Boolean caseSensitive = textSearchOptions.getCaseSensitive();
+            if (caseSensitive != null) {
+                searchDocument.put("$caseSensitive", BsonBoolean.valueOf(caseSensitive));
             }
-            if (textSearchOptions.getDiacriticSensitive() != null) {
-                searchDocument.put("$diacriticSensitive", BsonBoolean.valueOf(textSearchOptions.getDiacriticSensitive()));
+
+            Boolean diacriticSensitive = textSearchOptions.getDiacriticSensitive();
+            if (diacriticSensitive != null) {
+                searchDocument.put("$diacriticSensitive", BsonBoolean.valueOf(diacriticSensitive));
             }
             return new BsonDocument("$text", searchDocument);
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            TextFilter that = (TextFilter) o;
+
+            if (search != null ? !search.equals(that.search) : that.search != null) {
+                return false;
+            }
+            return textSearchOptions != null ? textSearchOptions.equals(that.textSearchOptions) : that.textSearchOptions == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = search != null ? search.hashCode() : 0;
+            result = 31 * result + (textSearchOptions != null ? textSearchOptions.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Text Filter{"
diff --git a/driver-core/src/main/com/mongodb/client/model/FindOneAndDeleteOptions.java b/driver-core/src/main/com/mongodb/client/model/FindOneAndDeleteOptions.java
index cd6932bd62e..b48536754e3 100644
--- a/driver-core/src/main/com/mongodb/client/model/FindOneAndDeleteOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/FindOneAndDeleteOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -33,6 +34,7 @@ public class FindOneAndDeleteOptions {
     private Bson projection;
     private Bson sort;
     private long maxTimeMS;
+    private Collation collation;
 
     /**
      * Gets a document describing the fields to return for all matching documents.
@@ -40,6 +42,7 @@ public class FindOneAndDeleteOptions {
      * @return the project document, which may be null
      * @mongodb.driver.manual tutorial/project-fields-from-query-results Projection
      */
+    @Nullable
     public Bson getProjection() {
         return projection;
     }
@@ -51,7 +54,7 @@ public Bson getProjection() {
      * @return this
      * @mongodb.driver.manual tutorial/project-fields-from-query-results Projection
      */
-    public FindOneAndDeleteOptions projection(final Bson projection) {
+    public FindOneAndDeleteOptions projection(@Nullable final Bson projection) {
         this.projection = projection;
         return this;
     }
@@ -63,6 +66,7 @@ public FindOneAndDeleteOptions projection(final Bson projection) {
      * @return a document describing the sort criteria
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
+    @Nullable
     public Bson getSort() {
         return sort;
     }
@@ -74,7 +78,7 @@ public Bson getSort() {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    public FindOneAndDeleteOptions sort(final Bson sort) {
+    public FindOneAndDeleteOptions sort(@Nullable final Bson sort) {
         this.sort = sort;
         return this;
     }
@@ -102,4 +106,39 @@ public long getMaxTime(final TimeUnit timeUnit) {
         return timeUnit.convert(maxTimeMS, MILLISECONDS);
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public FindOneAndDeleteOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "FindOneAndDeleteOptions{"
+                + "projection=" + projection
+                + ", sort=" + sort
+                + ", maxTimeMS=" + maxTimeMS
+                + ", collation=" + collation
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/FindOneAndReplaceOptions.java b/driver-core/src/main/com/mongodb/client/model/FindOneAndReplaceOptions.java
index 4f0bc7a9eca..48bc3f40fd6 100644
--- a/driver-core/src/main/com/mongodb/client/model/FindOneAndReplaceOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/FindOneAndReplaceOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -36,6 +37,7 @@ public class FindOneAndReplaceOptions {
     private ReturnDocument returnDocument = ReturnDocument.BEFORE;
     private long maxTimeMS;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
 
     /**
      * Gets a document describing the fields to return for all matching documents.
@@ -43,6 +45,7 @@ public class FindOneAndReplaceOptions {
      * @return the project document, which may be null
      * @mongodb.driver.manual tutorial/project-fields-from-query-results Projection
      */
+    @Nullable
     public Bson getProjection() {
         return projection;
     }
@@ -54,7 +57,7 @@ public Bson getProjection() {
      * @return this
      * @mongodb.driver.manual tutorial/project-fields-from-query-results Projection
      */
-    public FindOneAndReplaceOptions projection(final Bson projection) {
+    public FindOneAndReplaceOptions projection(@Nullable final Bson projection) {
         this.projection = projection;
         return this;
     }
@@ -66,6 +69,7 @@ public FindOneAndReplaceOptions projection(final Bson projection) {
      * @return a document describing the sort criteria
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
+    @Nullable
     public Bson getSort() {
         return sort;
     }
@@ -77,7 +81,7 @@ public Bson getSort() {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    public FindOneAndReplaceOptions sort(final Bson sort) {
+    public FindOneAndReplaceOptions sort(@Nullable final Bson sort) {
         this.sort = sort;
         return this;
     }
@@ -118,7 +122,7 @@ public ReturnDocument getReturnDocument() {
      * @return this
      */
     public FindOneAndReplaceOptions returnDocument(final ReturnDocument returnDocument) {
-        this.returnDocument = returnDocument;
+        this.returnDocument = notNull("returnDocument", returnDocument);
         return this;
     }
 
@@ -152,6 +156,7 @@ public long getMaxTime(final TimeUnit timeUnit) {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -164,9 +169,48 @@ public Boolean getBypassDocumentValidation() {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
-    public FindOneAndReplaceOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public FindOneAndReplaceOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public FindOneAndReplaceOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "FindOneAndReplaceOptions{"
+                + "projection=" + projection
+                + ", sort=" + sort
+                + ", upsert=" + upsert
+                + ", returnDocument=" + returnDocument
+                + ", maxTimeMS=" + maxTimeMS
+                + ", bypassDocumentValidation=" + bypassDocumentValidation
+                + ", collation=" + collation
+                + '}';
+    }
 }
 
diff --git a/driver-core/src/main/com/mongodb/client/model/FindOneAndUpdateOptions.java b/driver-core/src/main/com/mongodb/client/model/FindOneAndUpdateOptions.java
index 658794cb5b0..ecf54cdbfdc 100644
--- a/driver-core/src/main/com/mongodb/client/model/FindOneAndUpdateOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/FindOneAndUpdateOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
@@ -36,13 +38,16 @@ public class FindOneAndUpdateOptions {
     private ReturnDocument returnDocument = ReturnDocument.BEFORE;
     private long maxTimeMS;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
+    private List<? extends Bson> arrayFilters;
 
-     /**
+    /**
      * Gets a document describing the fields to return for all matching documents.
      *
      * @return the project document, which may be null
      * @mongodb.driver.manual tutorial/project-fields-from-query-results Projection
      */
+    @Nullable
     public Bson getProjection() {
         return projection;
     }
@@ -54,7 +59,7 @@ public Bson getProjection() {
      * @return this
      * @mongodb.driver.manual tutorial/project-fields-from-query-results Projection
      */
-    public FindOneAndUpdateOptions projection(final Bson projection) {
+    public FindOneAndUpdateOptions projection(@Nullable final Bson projection) {
         this.projection = projection;
         return this;
     }
@@ -66,6 +71,7 @@ public FindOneAndUpdateOptions projection(final Bson projection) {
      * @return a document describing the sort criteria
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
+    @Nullable
     public Bson getSort() {
         return sort;
     }
@@ -77,7 +83,7 @@ public Bson getSort() {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    public FindOneAndUpdateOptions sort(final Bson sort) {
+    public FindOneAndUpdateOptions sort(@Nullable final Bson sort) {
         this.sort = sort;
         return this;
     }
@@ -119,7 +125,7 @@ public ReturnDocument getReturnDocument() {
      * @return this
      */
     public FindOneAndUpdateOptions returnDocument(final ReturnDocument returnDocument) {
-        this.returnDocument = returnDocument;
+        this.returnDocument = notNull("returnDocument", returnDocument);
         return this;
     }
 
@@ -153,6 +159,7 @@ public long getMaxTime(final TimeUnit timeUnit) {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -165,8 +172,72 @@ public Boolean getBypassDocumentValidation() {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
-    public FindOneAndUpdateOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public FindOneAndUpdateOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public FindOneAndUpdateOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+    /**
+     * Sets the array filters option
+     *
+     * @param arrayFilters the array filters, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public FindOneAndUpdateOptions arrayFilters(@Nullable final List<? extends Bson> arrayFilters) {
+        this.arrayFilters = arrayFilters;
+        return this;
+    }
+
+    /**
+     * Returns the array filters option
+     *
+     * @return the array filters, which may be null
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    public List<? extends Bson> getArrayFilters() {
+        return arrayFilters;
+    }
+
+    @Override
+    public String toString() {
+        return "FindOneAndUpdateOptions{"
+                + "projection=" + projection
+                + ", sort=" + sort
+                + ", upsert=" + upsert
+                + ", returnDocument=" + returnDocument
+                + ", maxTimeMS=" + maxTimeMS
+                + ", bypassDocumentValidation=" + bypassDocumentValidation
+                + ", collation=" + collation
+                + ", arrayFilters=" + arrayFilters
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/FindOptions.java b/driver-core/src/main/com/mongodb/client/model/FindOptions.java
index 08d5949a42c..9deb28aecc2 100644
--- a/driver-core/src/main/com/mongodb/client/model/FindOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/FindOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.mongodb.client.model;
 
 import com.mongodb.CursorType;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -30,7 +31,9 @@
  * @since 3.0
  * @mongodb.driver.manual tutorial/query-documents/ Find
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
+ * @deprecated there is no replacement for this class
  */
+@Deprecated
 public final class FindOptions {
     private int batchSize;
     private int limit;
@@ -44,6 +47,16 @@ public final class FindOptions {
     private boolean noCursorTimeout;
     private boolean oplogReplay;
     private boolean partial;
+    private Collation collation;
+    private String comment;
+    private Bson hint;
+    private String hintString;
+    private Bson max;
+    private Bson min;
+    private long maxScan;
+    private boolean returnKey;
+    private boolean showRecordId;
+    private boolean snapshot;
 
     /**
      * Construct a new instance.
@@ -54,7 +67,9 @@ public FindOptions() {
     /**
      * Construct a new instance by making a shallow copy of the given model.
      * @param from model to copy
+     * @deprecated this constructor is unused
      */
+    @Deprecated
     public FindOptions(final FindOptions from) {
         batchSize = from.batchSize;
         limit = from.limit;
@@ -68,6 +83,15 @@ public FindOptions(final FindOptions from) {
         noCursorTimeout = from.noCursorTimeout;
         oplogReplay = from.oplogReplay;
         partial = from.partial;
+        comment = from.comment;
+        hint = from.hint;
+        hintString = from.hintString;
+        max = from.max;
+        min = from.min;
+        maxScan = from.maxScan;
+        returnKey = from.returnKey;
+        showRecordId = from.showRecordId;
+        snapshot = from.snapshot;
     }
 
     /**
@@ -93,9 +117,9 @@ public FindOptions limit(final int limit) {
     }
 
     /**
-     * Gets the number of documents to skip.  The default is 0.
+     * Gets the number of documents to skip. The default is 0.
      *
-     * @return the number of documents to skip, which may be null
+     * @return the number of documents to skip
      * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
      */
     public int getSkip() {
@@ -184,7 +208,7 @@ public FindOptions maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit
      * Gets the number of documents to return per batch.  Default to 0, which indicates that the server chooses an appropriate batch
      * size.
      *
-     * @return the batch size, which may be null
+     * @return the batch size
      * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
      */
     public int getBatchSize() {
@@ -208,7 +232,10 @@ public FindOptions batchSize(final int batchSize) {
      *
      * @return the query modifiers, which may be null
      * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
+     * @deprecated use the individual modifier methods instead.
      */
+    @Deprecated
+    @Nullable
     public Bson getModifiers() {
         return modifiers;
     }
@@ -219,8 +246,10 @@ public Bson getModifiers() {
      * @param modifiers the query modifiers to apply, which may be null.
      * @return this
      * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
+     * @deprecated use the individual modifier methods instead.
      */
-    public FindOptions modifiers(final Bson modifiers) {
+    @Deprecated
+    public FindOptions modifiers(@Nullable final Bson modifiers) {
         this.modifiers = modifiers;
         return this;
     }
@@ -231,6 +260,7 @@ public FindOptions modifiers(final Bson modifiers) {
      * @return the project document, which may be null
      * @mongodb.driver.manual reference/method/db.collection.find/ Projection
      */
+    @Nullable
     public Bson getProjection() {
         return projection;
     }
@@ -242,7 +272,7 @@ public Bson getProjection() {
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Projection
      */
-    public FindOptions projection(final Bson projection) {
+    public FindOptions projection(@Nullable final Bson projection) {
         this.projection = projection;
         return this;
     }
@@ -254,6 +284,7 @@ public FindOptions projection(final Bson projection) {
      * @return a document describing the sort criteria
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
+    @Nullable
     public Bson getSort() {
         return sort;
     }
@@ -265,7 +296,7 @@ public Bson getSort() {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    public FindOptions sort(final Bson sort) {
+    public FindOptions sort(@Nullable final Bson sort) {
         this.sort = sort;
         return this;
     }
@@ -352,20 +383,280 @@ public FindOptions cursorType(final CursorType cursorType) {
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public FindOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Returns the comment to send with the query. The default is not to include a comment with the query.
+     *
+     * @return the comment
+     * @since 3.5
+     */
+    @Nullable
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the comment to the query. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.5
+     */
+    public FindOptions comment(@Nullable final String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    /**
+     * Returns the hint for which index to use. The default is not to set a hint.
+     *
+     * @return the hint
+     * @since 3.5
+     */
+    @Nullable
+    public Bson getHint() {
+        return hint;
+    }
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.5
+     */
+    public FindOptions hint(@Nullable final Bson hint) {
+        this.hint = hint;
+        return this;
+    }
+
+    /**
+     * Gets the hint string to apply.
+     *
+     * @return the hint string, which should be the name of an existing index
+     * @since 3.12
+     */
+    @Nullable
+    public String getHintString() {
+        return hintString;
+    }
+
+    /**
+     * Sets the hint to apply.
+     *
+     * @param hint the name of the index which should be used for the operation
+     * @return this
+     * @since 3.12
+     */
+    public FindOptions hintString(@Nullable final String hint) {
+        this.hintString = hint;
+        return this;
+    }
+
+    /**
+     * Returns the exclusive upper bound for a specific index. By default there is no max bound.
+     *
+     * @return the max
+     * @since 3.5
+     */
+    @Nullable
+    public Bson getMax() {
+        return max;
+    }
+
+    /**
+     * Sets the exclusive upper bound for a specific index. A null value means no max is set.
+     *
+     * @param max the max
+     * @return this
+     * @since 3.5
+     */
+    public FindOptions max(@Nullable final Bson max) {
+        this.max = max;
+        return this;
+    }
+
+    /**
+     * Returns the minimum inclusive lower bound for a specific index. By default there is no min bound.
+     *
+     * @return the min
+     * @since 3.5
+     */
+    @Nullable
+    public Bson getMin() {
+        return min;
+    }
+
+    /**
+     * Sets the minimum inclusive lower bound for a specific index. A null value means no max is set.
+     *
+     * @param min the min
+     * @return this
+     * @since 3.5
+     */
+    public FindOptions min(@Nullable final Bson min) {
+        this.min = min;
+        return this;
+    }
+
+    /**
+     * Returns the maximum number of documents or index keys to scan when executing the query.
+     *
+     * A zero value or less will be ignored, and indicates that the driver should respect the server's default value.
+     *
+     * @return the maxScan
+     * @since 3.5
+     * @deprecated Deprecated as of MongoDB 4.0 release
+     */
+    @Deprecated
+    public long getMaxScan() {
+        return maxScan;
+    }
+
+    /**
+     * Sets the maximum number of documents or index keys to scan when executing the query.
+     *
+     * A zero value or less will be ignored, and indicates that the driver should respect the server's default value.
+     *
+     * @param maxScan the maxScan
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated as of MongoDB 4.0 release
+     */
+    @Deprecated
+    public FindOptions maxScan(final long maxScan) {
+        this.maxScan = maxScan;
+        return this;
+    }
+
+    /**
+     * Returns the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * Default value is false. If returnKey is true and the find command does not use an index, the returned documents will be empty.
+     *
+     * @return the returnKey
+     * @since 3.5
+     */
+    public boolean isReturnKey() {
+        return returnKey;
+    }
+
+    /**
+     * Sets the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * @param returnKey the returnKey
+     * @return this
+     * @since 3.5
+     */
+    public FindOptions returnKey(final boolean returnKey) {
+        this.returnKey = returnKey;
+        return this;
+    }
+
+    /**
+     * Returns the showRecordId.
+     *
+     * Determines whether to return the record identifier for each document. If true, adds a field $recordId to the returned documents.
+     * The default is false.
+     *
+     * @return the showRecordId
+     * @since 3.5
+     */
+    public boolean isShowRecordId() {
+        return showRecordId;
+    }
+
+    /**
+     * Sets the showRecordId. Set to true to add a field {@code $recordId} to the returned documents.
+     *
+     * @param showRecordId the showRecordId
+     * @return this
+     * @since 3.5
+     */
+    public FindOptions showRecordId(final boolean showRecordId) {
+        this.showRecordId = showRecordId;
+        return this;
+    }
+
+    /**
+     * Returns the snapshot.
+     *
+     * Prevents the cursor from returning a document more than once because of an intervening write operation. The default is false.
+     *
+     * @return the snapshot
+     * @since 3.5
+     * @deprecated Deprecated in MongoDB 3.6 release and removed in MongoDB 4.0 release
+     */
+    @Deprecated
+    public boolean isSnapshot() {
+        return snapshot;
+    }
+
+    /**
+     * Sets the snapshot.
+     *
+     * If true it prevents the cursor from returning a document more than once because of an intervening write operation.
+     *
+     * @param snapshot the snapshot
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated in MongoDB 3.6 release and removed in MongoDB 4.0 release
+     */
+    @Deprecated
+    public FindOptions snapshot(final boolean snapshot) {
+        this.snapshot = snapshot;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "FindOptions{"
-               + ", batchSize=" + batchSize
-               + ", limit=" + limit
-               + ", modifiers=" + modifiers
-               + ", projection=" + projection
-               + ", maxTimeMS=" + maxTimeMS
-               + ", skip=" + skip
-               + ", sort=" + sort
-               + ", cursorType=" + cursorType
-               + ", noCursorTimeout=" + noCursorTimeout
-               + ", oplogReplay=" + oplogReplay
-               + ", partial=" + partial
-               + '}';
+                + "batchSize=" + batchSize
+                + ", limit=" + limit
+                + ", modifiers=" + modifiers
+                + ", projection=" + projection
+                + ", maxTimeMS=" + maxTimeMS
+                + ", maxAwaitTimeMS=" + maxAwaitTimeMS
+                + ", skip=" + skip
+                + ", sort=" + sort
+                + ", cursorType=" + cursorType
+                + ", noCursorTimeout=" + noCursorTimeout
+                + ", oplogReplay=" + oplogReplay
+                + ", partial=" + partial
+                + ", collation=" + collation
+                + ", comment='" + comment + "'"
+                + ", hint=" + hint
+                + ", max=" + max
+                + ", min=" + min
+                + ", maxScan=" + maxScan
+                + ", returnKey=" + returnKey
+                + ", showRecordId=" + showRecordId
+                + ", snapshot=" + snapshot
+                + "}";
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/GraphLookupOptions.java b/driver-core/src/main/com/mongodb/client/model/GraphLookupOptions.java
new file mode 100644
index 00000000000..7d1eebb3504
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/GraphLookupOptions.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+/**
+ * The options for a graphLookup aggregation pipeline stage
+ *
+ * @mongodb.driver.manual reference/operator/aggregation/graphLookup/ graphLookup
+ * @mongodb.server.release 3.4
+ * @since 3.4
+ */
+public final class GraphLookupOptions {
+    private Integer maxDepth;
+    private String depthField;
+    private Bson restrictSearchWithMatch;
+
+    /**
+     * The name of the field in which to store the depth value
+     *
+     * @param field the field name
+     * @return this
+     */
+    public GraphLookupOptions depthField(@Nullable final String field) {
+        depthField = field;
+        return this;
+    }
+
+    /**
+     * @return the field name
+     */
+    @Nullable
+    public String getDepthField() {
+        return depthField;
+    }
+
+    /**
+     * Specifies a maximum recursive depth for the $graphLookup.  This number must be non-negative.
+     *
+     * @param max the maximum depth
+     * @return this
+     */
+    public GraphLookupOptions maxDepth(@Nullable final Integer max) {
+        maxDepth = max;
+        return this;
+    }
+
+    /**
+     * @return the maximum depth
+     */
+    @Nullable
+    public Integer getMaxDepth() {
+        return maxDepth;
+    }
+
+    /**
+     * A document specifying additional conditions for the recursive search
+     *
+     * @param filter the filter expression
+     * @return this
+     * @since 3.6
+     */
+    public GraphLookupOptions restrictSearchWithMatch(@Nullable final Bson filter) {
+        restrictSearchWithMatch = filter;
+        return this;
+    }
+
+    /**
+     * @return the filter expression
+     * @since 3.6
+     */
+    @Nullable
+    public Bson getRestrictSearchWithMatch() {
+        return restrictSearchWithMatch;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        GraphLookupOptions that = (GraphLookupOptions) o;
+
+        if (maxDepth != null ? !maxDepth.equals(that.maxDepth) : that.maxDepth != null) {
+            return false;
+        }
+        if (depthField != null ? !depthField.equals(that.depthField) : that.depthField != null) {
+            return false;
+        }
+        return restrictSearchWithMatch != null ? restrictSearchWithMatch.equals(that.restrictSearchWithMatch)
+                : that.restrictSearchWithMatch == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = maxDepth != null ? maxDepth.hashCode() : 0;
+        result = 31 * result + (depthField != null ? depthField.hashCode() : 0);
+        result = 31 * result + (restrictSearchWithMatch != null ? restrictSearchWithMatch.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder stringBuilder = new StringBuilder()
+            .append("GraphLookupOptions{");
+        if (depthField != null) {
+            stringBuilder.append("depthField='")
+                         .append(depthField)
+                         .append('\'');
+            if (maxDepth != null) {
+                stringBuilder.append(", ");
+            }
+        }
+        if (maxDepth != null) {
+            stringBuilder
+                .append("maxDepth=")
+                .append(maxDepth);
+            if (restrictSearchWithMatch != null) {
+                stringBuilder.append(", ");
+            }
+        }
+        if (restrictSearchWithMatch != null) {
+            stringBuilder
+                .append("restrictSearchWithMatch=")
+                .append(restrictSearchWithMatch);
+        }
+
+        return stringBuilder
+            .append('}')
+            .toString();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/IndexModel.java b/driver-core/src/main/com/mongodb/client/model/IndexModel.java
index 1f3345b13c5..65998691810 100644
--- a/driver-core/src/main/com/mongodb/client/model/IndexModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/IndexModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,4 +67,12 @@ public Bson getKeys() {
     public IndexOptions getOptions() {
         return options;
     }
+
+    @Override
+    public String toString() {
+        return "IndexModel{"
+                + "keys=" + keys
+                + ", options=" + options
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/IndexOptionDefaults.java b/driver-core/src/main/com/mongodb/client/model/IndexOptionDefaults.java
index 7a4abdd2beb..30dafd004db 100644
--- a/driver-core/src/main/com/mongodb/client/model/IndexOptionDefaults.java
+++ b/driver-core/src/main/com/mongodb/client/model/IndexOptionDefaults.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 /**
@@ -34,6 +35,7 @@ public final class IndexOptionDefaults {
      *
      * @return the storage engine options
      */
+    @Nullable
     public Bson getStorageEngine() {
         return storageEngine;
     }
@@ -44,8 +46,15 @@ public Bson getStorageEngine() {
      * @param storageEngine the storage engine options
      * @return this
      */
-    public IndexOptionDefaults storageEngine(final Bson storageEngine) {
+    public IndexOptionDefaults storageEngine(@Nullable final Bson storageEngine) {
         this.storageEngine = storageEngine;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "IndexOptionDefaults{"
+                + "storageEngine=" + storageEngine
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/IndexOptions.java b/driver-core/src/main/com/mongodb/client/model/IndexOptions.java
index b1cb6997dc8..92ea96c4afc 100644
--- a/driver-core/src/main/com/mongodb/client/model/IndexOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/IndexOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -44,6 +45,8 @@ public class IndexOptions {
     private Double bucketSize;
     private Bson storageEngine;
     private Bson partialFilterExpression;
+    private Collation collation;
+    private Bson wildcardProjection;
 
     /**
      * Create the index in the background
@@ -90,6 +93,7 @@ public IndexOptions unique(final boolean unique) {
      *
      * @return the name of the index
      */
+    @Nullable
     public String getName() {
         return name;
     }
@@ -100,7 +104,7 @@ public String getName() {
      * @param name of the index
      * @return this
      */
-    public IndexOptions name(final String name) {
+    public IndexOptions name(@Nullable final String name) {
         this.name = name;
         return this;
     }
@@ -132,6 +136,7 @@ public IndexOptions sparse(final boolean sparse) {
      * @param timeUnit the time unit
      * @mongodb.driver.manual tutorial/expire-data TTL
      */
+    @Nullable
     public Long getExpireAfter(final TimeUnit timeUnit) {
         if (expireAfterSeconds == null) {
             return null;
@@ -147,7 +152,7 @@ public Long getExpireAfter(final TimeUnit timeUnit) {
      * @return this
      * @mongodb.driver.manual tutorial/expire-data TTL
      */
-    public IndexOptions expireAfter(final Long expireAfter, final TimeUnit timeUnit) {
+    public IndexOptions expireAfter(@Nullable final Long expireAfter, final TimeUnit timeUnit) {
         if (expireAfter == null) {
             this.expireAfterSeconds = null;
         } else {
@@ -161,6 +166,7 @@ public IndexOptions expireAfter(final Long expireAfter, final TimeUnit timeUnit)
      *
      * @return the index version number
      */
+    @Nullable
     public Integer getVersion() {
         return this.version;
     }
@@ -171,7 +177,7 @@ public Integer getVersion() {
      * @param version the index version number
      * @return this
      */
-    public IndexOptions version(final Integer version) {
+    public IndexOptions version(@Nullable final Integer version) {
         this.version = version;
         return this;
     }
@@ -185,6 +191,7 @@ public IndexOptions version(final Integer version) {
      * @return the weighting object
      * @mongodb.driver.manual tutorial/control-results-of-text-search Control Search Results with Weights
      */
+    @Nullable
     public Bson getWeights() {
         return weights;
     }
@@ -199,7 +206,7 @@ public Bson getWeights() {
      * @return this
      * @mongodb.driver.manual tutorial/control-results-of-text-search Control Search Results with Weights
      */
-    public IndexOptions weights(final Bson weights) {
+    public IndexOptions weights(@Nullable final Bson weights) {
         this.weights = weights;
         return this;
     }
@@ -212,6 +219,7 @@ public IndexOptions weights(final Bson weights) {
      * @return the language for a text index.
      * @mongodb.driver.manual reference/text-search-languages Text Search languages
      */
+    @Nullable
     public String getDefaultLanguage() {
         return defaultLanguage;
     }
@@ -225,7 +233,7 @@ public String getDefaultLanguage() {
      * @return this
      * @mongodb.driver.manual reference/text-search-languages Text Search languages
      */
-    public IndexOptions defaultLanguage(final String defaultLanguage) {
+    public IndexOptions defaultLanguage(@Nullable final String defaultLanguage) {
         this.defaultLanguage = defaultLanguage;
         return this;
     }
@@ -238,6 +246,7 @@ public IndexOptions defaultLanguage(final String defaultLanguage) {
      * @return the name of the field that contains the language string.
      * @mongodb.driver.manual tutorial/specify-language-for-text-index/#specify-language-field-text-index-example Language override
      */
+    @Nullable
     public String getLanguageOverride() {
         return languageOverride;
     }
@@ -251,7 +260,7 @@ public String getLanguageOverride() {
      * @return this
      * @mongodb.driver.manual tutorial/specify-language-for-text-index/#specify-language-field-text-index-example Language override
      */
-    public IndexOptions languageOverride(final String languageOverride) {
+    public IndexOptions languageOverride(@Nullable final String languageOverride) {
         this.languageOverride = languageOverride;
         return this;
     }
@@ -261,6 +270,7 @@ public IndexOptions languageOverride(final String languageOverride) {
      *
      * @return the text index version number.
      */
+    @Nullable
     public Integer getTextVersion() {
         return textVersion;
     }
@@ -271,7 +281,7 @@ public Integer getTextVersion() {
      * @param textVersion the text index version number.
      * @return this
      */
-    public IndexOptions textVersion(final Integer textVersion) {
+    public IndexOptions textVersion(@Nullable final Integer textVersion) {
         this.textVersion = textVersion;
         return this;
     }
@@ -281,6 +291,7 @@ public IndexOptions textVersion(final Integer textVersion) {
      *
      * @return the 2dsphere index version number
      */
+    @Nullable
     public Integer getSphereVersion() {
         return sphereVersion;
     }
@@ -291,7 +302,7 @@ public Integer getSphereVersion() {
      * @param sphereVersion the 2dsphere index version number.
      * @return this
      */
-    public IndexOptions sphereVersion(final Integer sphereVersion) {
+    public IndexOptions sphereVersion(@Nullable final Integer sphereVersion) {
         this.sphereVersion = sphereVersion;
         return this;
     }
@@ -301,6 +312,7 @@ public IndexOptions sphereVersion(final Integer sphereVersion) {
      *
      * @return the number of precision of the stored geohash value
      */
+    @Nullable
     public Integer getBits() {
         return bits;
     }
@@ -311,7 +323,7 @@ public Integer getBits() {
      * @param bits the number of precision of the stored geohash value
      * @return this
      */
-    public IndexOptions bits(final Integer bits) {
+    public IndexOptions bits(@Nullable final Integer bits) {
         this.bits = bits;
         return this;
     }
@@ -321,6 +333,7 @@ public IndexOptions bits(final Integer bits) {
      *
      * @return the lower inclusive boundary for the longitude and latitude values.
      */
+    @Nullable
     public Double getMin() {
         return min;
     }
@@ -331,7 +344,7 @@ public Double getMin() {
      * @param min the lower inclusive boundary for the longitude and latitude values
      * @return this
      */
-    public IndexOptions min(final Double min) {
+    public IndexOptions min(@Nullable final Double min) {
         this.min = min;
         return this;
     }
@@ -341,6 +354,7 @@ public IndexOptions min(final Double min) {
      *
      * @return the upper inclusive boundary for the longitude and latitude values.
      */
+    @Nullable
     public Double getMax() {
         return max;
     }
@@ -351,7 +365,7 @@ public Double getMax() {
      * @param max the upper inclusive boundary for the longitude and latitude values
      * @return this
      */
-    public IndexOptions max(final Double max) {
+    public IndexOptions max(@Nullable final Double max) {
         this.max = max;
         return this;
     }
@@ -362,6 +376,7 @@ public IndexOptions max(final Double max) {
      * @return the specified the number of units within which to group the location values for geoHaystack Indexes
      * @mongodb.driver.manual core/geohaystack/ geoHaystack Indexes
      */
+    @Nullable
     public Double getBucketSize() {
         return bucketSize;
     }
@@ -373,7 +388,7 @@ public Double getBucketSize() {
      * @return this
      * @mongodb.driver.manual core/geohaystack/ geoHaystack Indexes
      */
-    public IndexOptions bucketSize(final Double bucketSize) {
+    public IndexOptions bucketSize(@Nullable final Double bucketSize) {
         this.bucketSize = bucketSize;
         return this;
     }
@@ -384,6 +399,7 @@ public IndexOptions bucketSize(final Double bucketSize) {
      * @return the storage engine options
      * @mongodb.server.release 3.0
      */
+    @Nullable
     public Bson getStorageEngine() {
         return storageEngine;
     }
@@ -395,7 +411,7 @@ public Bson getStorageEngine() {
      * @return this
      * @mongodb.server.release 3.0
      */
-    public IndexOptions storageEngine(final Bson storageEngine) {
+    public IndexOptions storageEngine(@Nullable final Bson storageEngine) {
         this.storageEngine = storageEngine;
         return this;
     }
@@ -407,6 +423,7 @@ public IndexOptions storageEngine(final Bson storageEngine) {
      * @mongodb.server.release 3.2
      * @since 3.2
      */
+    @Nullable
     public Bson getPartialFilterExpression() {
         return partialFilterExpression;
     }
@@ -419,8 +436,83 @@ public Bson getPartialFilterExpression() {
      * @mongodb.server.release 3.2
      * @since 3.2
      */
-    public IndexOptions partialFilterExpression(final Bson partialFilterExpression) {
+    public IndexOptions partialFilterExpression(@Nullable final Bson partialFilterExpression) {
         this.partialFilterExpression = partialFilterExpression;
         return this;
     }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public IndexOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Gets the wildcard projection of a wildcard index
+     *
+     * @return the wildcard projection
+     * @mongodb.server.release 4.2
+     * @since 3.10
+     */
+    public Bson getWildcardProjection() {
+        return wildcardProjection;
+    }
+
+    /**
+     * Sets the wildcard projection of a wildcard index
+     *
+     * @param wildcardProjection the wildcard projection
+     * @return this
+     * @mongodb.server.release 4.2
+     * @since 3.10
+     */
+    public IndexOptions wildcardProjection(final Bson wildcardProjection) {
+        this.wildcardProjection = wildcardProjection;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "IndexOptions{"
+                + "background=" + background
+                + ", unique=" + unique
+                + ", name='" + name + '\''
+                + ", sparse=" + sparse
+                + ", expireAfterSeconds=" + expireAfterSeconds
+                + ", version=" + version
+                + ", weights=" + weights
+                + ", defaultLanguage='" + defaultLanguage + '\''
+                + ", languageOverride='" + languageOverride + '\''
+                + ", textVersion=" + textVersion
+                + ", sphereVersion=" + sphereVersion
+                + ", bits=" + bits
+                + ", min=" + min
+                + ", max=" + max
+                + ", bucketSize=" + bucketSize
+                + ", storageEngine=" + storageEngine
+                + ", partialFilterExpression=" + partialFilterExpression
+                + ", collation=" + collation
+                + ", wildcardProjection=" + wildcardProjection
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/Indexes.java b/driver-core/src/main/com/mongodb/client/model/Indexes.java
index 4e4e246136e..a070186d995 100644
--- a/driver-core/src/main/com/mongodb/client/model/Indexes.java
+++ b/driver-core/src/main/com/mongodb/client/model/Indexes.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -158,6 +158,16 @@ public static Bson text(final String fieldName) {
         return new BsonDocument(fieldName, new BsonString("text"));
     }
 
+    /**
+     * Create an index key for a text index on every field that contains string data.
+     *
+     * @return the index specification
+     * @mongodb.driver.manual core/text text index
+     */
+    public static Bson text() {
+        return text("$**");
+    }
+
     /**
      * Create an index key for a hashed index on the given field.
      *
@@ -188,21 +198,8 @@ public static Bson compoundIndex(final Bson... indexes) {
      * @return the compound index specification
      * @mongodb.driver.manual core/index-compound compoundIndex
      */
-    public static Bson compoundIndex(final List<Bson> indexes) {
-        notNull("indexes", indexes);
-        return new Bson() {
-            @Override
-            public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry) {
-                BsonDocument compoundIndex = new BsonDocument();
-                for (Bson index : indexes) {
-                    BsonDocument indexDocument = index.toBsonDocument(documentClass, codecRegistry);
-                    for (String key : indexDocument.keySet()) {
-                        compoundIndex.append(key, indexDocument.get(key));
-                    }
-                }
-                return compoundIndex;
-            }
-        };
+    public static Bson compoundIndex(final List<? extends Bson> indexes) {
+        return new CompoundIndex(indexes);
     }
 
     private static Bson compoundIndex(final List<String> fieldNames, final BsonValue value) {
@@ -212,4 +209,45 @@ private static Bson compoundIndex(final List<String> fieldNames, final BsonValue
         }
         return document;
     }
+
+    private static class CompoundIndex implements Bson {
+        private final List<? extends Bson> indexes;
+
+        CompoundIndex(final List<? extends Bson> indexes) {
+            notNull("indexes", indexes);
+            this.indexes = indexes;
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry) {
+            BsonDocument compoundIndex = new BsonDocument();
+            for (Bson index : indexes) {
+                BsonDocument indexDocument = index.toBsonDocument(documentClass, codecRegistry);
+                for (String key : indexDocument.keySet()) {
+                    compoundIndex.append(key, indexDocument.get(key));
+                }
+            }
+            return compoundIndex;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            CompoundIndex that = (CompoundIndex) o;
+
+            return indexes.equals(that.indexes);
+        }
+
+        @Override
+        public int hashCode() {
+            return indexes.hashCode();
+        }
+    }
 }
+
diff --git a/driver-core/src/main/com/mongodb/client/model/InsertManyOptions.java b/driver-core/src/main/com/mongodb/client/model/InsertManyOptions.java
index 18ae5fcab20..7a415d5011c 100644
--- a/driver-core/src/main/com/mongodb/client/model/InsertManyOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/InsertManyOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
+
 /**
  * The options to apply to an operation that inserts multiple documents into a collection.
  *
@@ -55,6 +57,7 @@ public InsertManyOptions ordered(final boolean ordered) {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -67,8 +70,16 @@ public Boolean getBypassDocumentValidation() {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
-    public InsertManyOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public InsertManyOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "InsertManyOptions{"
+                + "ordered=" + ordered
+                + ", bypassDocumentValidation=" + bypassDocumentValidation
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/InsertOneModel.java b/driver-core/src/main/com/mongodb/client/model/InsertOneModel.java
index fc1c06e6f15..0f2dcd993b4 100644
--- a/driver-core/src/main/com/mongodb/client/model/InsertOneModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/InsertOneModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,4 +45,11 @@ public InsertOneModel(final T document) {
     public T getDocument() {
         return document;
     }
+
+    @Override
+    public String toString() {
+        return "InsertOneModel{"
+                + "document=" + document
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/InsertOneOptions.java b/driver-core/src/main/com/mongodb/client/model/InsertOneOptions.java
index 0e1381b42c2..d3e8ab3f09a 100644
--- a/driver-core/src/main/com/mongodb/client/model/InsertOneOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/InsertOneOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
+
 /**
  * The options to apply to an operation that inserts a single document into a collection.
  *
@@ -32,6 +34,7 @@ public final class InsertOneOptions {
      *
      * @return the bypass document level validation flag
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -42,8 +45,15 @@ public Boolean getBypassDocumentValidation() {
      * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
      * @return this
      */
-    public InsertOneOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public InsertOneOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "InsertOneOptions{"
+                + "bypassDocumentValidation=" + bypassDocumentValidation
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/MapReduceAction.java b/driver-core/src/main/com/mongodb/client/model/MapReduceAction.java
index 5c1199e6936..3e87cc1c703 100644
--- a/driver-core/src/main/com/mongodb/client/model/MapReduceAction.java
+++ b/driver-core/src/main/com/mongodb/client/model/MapReduceAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public enum MapReduceAction {
 
     private final String value;
 
-    private MapReduceAction(final String value) {
+    MapReduceAction(final String value) {
         this.value = value;
     }
 
diff --git a/driver-core/src/main/com/mongodb/client/model/MergeOptions.java b/driver-core/src/main/com/mongodb/client/model/MergeOptions.java
new file mode 100644
index 00000000000..b08891a3423
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/MergeOptions.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import org.bson.conversions.Bson;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Options to control the behavior of the $merge aggregation stage
+ *
+ * @mongodb.driver.manual reference/operator/aggregation/merge/  $merge stage
+ * @mongodb.server.release 4.2
+ * @see Aggregates#merge(String, MergeOptions)
+ * @see Aggregates#merge(com.mongodb.MongoNamespace, MergeOptions)
+ * @since 3.11
+ */
+public final class MergeOptions {
+
+    /**
+     * The behavior of $merge if a result document and an existing document in the collection have the same value for the specified on
+     * field(s).
+     */
+    public enum WhenMatched {
+        /**
+         *  Replace the existing document in the output collection with the matching results document.
+         */
+        REPLACE,
+
+        /**
+         *  Keep the existing document in the output collection.
+         */
+        KEEP_EXISTING,
+
+        /**
+         * Merge the matching documents
+         */
+        MERGE,
+
+        /**
+         * An aggregation pipeline to update the document in the collection.
+         *
+         * @see #whenMatchedPipeline(List)
+         */
+        PIPELINE,
+
+        /**
+         * Stop and fail the aggregation operation. Any changes to the output collection from previous documents are not reverted.
+         */
+        FAIL,
+    }
+
+    /**
+     * The behavior of $merge if a result document does not match an existing document in the out collection.
+     */
+    public enum WhenNotMatched {
+        /**
+         * Insert the document into the output collection.
+         */
+        INSERT,
+
+        /**
+         * Discard the document; i.e. $merge does not insert the document into the output collection.
+         */
+        DISCARD,
+
+        /**
+         * Stop and fail the aggregation operation. Any changes to the output collection from previous documents are not reverted.
+         */
+        FAIL
+    }
+
+    private List<String> uniqueIdentifier;
+    private WhenMatched whenMatched;
+    private List<Variable<?>> variables;
+    private List<Bson> whenMatchedPipeline;
+    private WhenNotMatched whenNotMatched;
+
+    /**
+     * Gets the fields that act as a unique identifier for a document. The identifier determine if a results document matches an
+     * already existing document in the output collection.
+     *
+     * @return the unique identifier
+     */
+    public List<String> getUniqueIdentifier() {
+        return uniqueIdentifier;
+    }
+
+    /**
+     * Sets the field that act as a unique identifier for a document. The identifier determine if a results document matches an
+     * already existing document in the output collection.
+     *
+     * @param uniqueIdentifier the unique identifier
+     * @return this
+     */
+    public MergeOptions uniqueIdentifier(final String uniqueIdentifier) {
+        this.uniqueIdentifier = Collections.singletonList(uniqueIdentifier);
+        return this;
+    }
+
+    /**
+     * Sets the field that act as a unique identifier for a document. The identifier determine if a results document matches an
+     * already existing document in the output collection.
+     *
+     * @param uniqueIdentifier the unique identifier
+     * @return this
+     */
+    public MergeOptions uniqueIdentifier(final List<String> uniqueIdentifier) {
+        this.uniqueIdentifier = uniqueIdentifier;
+        return this;
+    }
+
+    /**
+     * Gets the behavior of $merge if a result document and an existing document in the collection have the same value for the specified
+     * on field(s).
+     *
+     * @return when matched
+     */
+    public WhenMatched getWhenMatched() {
+        return whenMatched;
+    }
+
+    /**
+     * Sets the behavior of $merge if a result document and an existing document in the collection have the same value for the specified
+     * on field(s).
+     *
+     * @param whenMatched when matched
+     * @return this
+     */
+    public MergeOptions whenMatched(final WhenMatched whenMatched) {
+        this.whenMatched = whenMatched;
+        return this;
+    }
+
+    /**
+     * Gets the variables accessible for use in the whenMatched pipeline
+     * @return the variables
+     */
+    public List<Variable<?>> getVariables() {
+        return variables;
+    }
+
+    /**
+     * Sets the variables accessible for use in the whenMatched pipeline.
+     *
+     * @param variables the variables
+     * @return this
+     */
+    public MergeOptions variables(final List<Variable<?>> variables) {
+        this.variables = variables;
+        return this;
+    }
+
+    /**
+     * Gets aggregation pipeline to update the document in the collection.
+     *
+     * @return when matched pipeline
+     * @see WhenMatched#PIPELINE
+     */
+    public List<Bson> getWhenMatchedPipeline() {
+        return whenMatchedPipeline;
+    }
+
+    /**
+     * Sets aggregation pipeline to update the document in the collection.
+     *
+     * @param whenMatchedPipeline when matched pipeline
+     * @return this
+     * @see WhenMatched#PIPELINE
+     */
+    public MergeOptions whenMatchedPipeline(final List<Bson> whenMatchedPipeline) {
+        this.whenMatchedPipeline = whenMatchedPipeline;
+        return this;
+    }
+
+    /**
+     * Gets the behavior of $merge if a result document does not match an existing document in the out collection.
+     *
+     * @return when not matched
+     */
+    public WhenNotMatched getWhenNotMatched() {
+        return whenNotMatched;
+    }
+
+    /**
+     * Sets the behavior of $merge if a result document does not match an existing document in the out collection.
+     *
+     * @param whenNotMatched when not matched
+     * @return this
+     */
+    public MergeOptions whenNotMatched(final WhenNotMatched whenNotMatched) {
+        this.whenNotMatched = whenNotMatched;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MergeOptions that = (MergeOptions) o;
+
+        if (uniqueIdentifier != null ? !uniqueIdentifier.equals(that.uniqueIdentifier) : that.uniqueIdentifier != null) {
+            return false;
+        }
+        if (whenMatched != that.whenMatched) {
+            return false;
+        }
+        if (variables != null ? !variables.equals(that.variables) : that.variables != null) {
+            return false;
+        }
+        if (whenMatchedPipeline != null ? !whenMatchedPipeline.equals(that.whenMatchedPipeline) : that.whenMatchedPipeline != null) {
+            return false;
+        }
+        if (whenNotMatched != that.whenNotMatched) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = uniqueIdentifier != null ? uniqueIdentifier.hashCode() : 0;
+        result = 31 * result + (whenMatched != null ? whenMatched.hashCode() : 0);
+        result = 31 * result + (variables != null ? variables.hashCode() : 0);
+        result = 31 * result + (whenMatchedPipeline != null ? whenMatchedPipeline.hashCode() : 0);
+        result = 31 * result + (whenNotMatched != null ? whenNotMatched.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "MergeOptions{"
+                + "uniqueIdentifier=" + uniqueIdentifier
+                + ", whenMatched=" + whenMatched
+                + ", variables=" + variables
+                + ", whenMatchedPipeline=" + whenMatchedPipeline
+                + ", whenNotMatched=" + whenNotMatched
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/ParallelCollectionScanOptions.java b/driver-core/src/main/com/mongodb/client/model/ParallelCollectionScanOptions.java
index 311ccac648c..0de77e4dbfd 100644
--- a/driver-core/src/main/com/mongodb/client/model/ParallelCollectionScanOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/ParallelCollectionScanOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/model/Projections.java b/driver-core/src/main/com/mongodb/client/model/Projections.java
index 96c3f482013..4d06cf334af 100644
--- a/driver-core/src/main/com/mongodb/client/model/Projections.java
+++ b/driver-core/src/main/com/mongodb/client/model/Projections.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,7 +9,7 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
@@ -185,17 +185,16 @@ public static Bson fields(final Bson... projections) {
      *
      * @param projections the list of projections to combine
      * @return the combined projection
-     * @mongodb.driver.manual
      */
-    public static Bson fields(final List<Bson> projections) {
-        notNull("sorts", projections);
+    public static Bson fields(final List<? extends Bson> projections) {
+        notNull("projections", projections);
         return new FieldsProjection(projections);
     }
 
     private static class FieldsProjection implements Bson {
-        private final List<Bson> projections;
+        private final List<? extends Bson> projections;
 
-        public FieldsProjection(final List<Bson> projections) {
+        FieldsProjection(final List<? extends Bson> projections) {
             this.projections = projections;
         }
 
@@ -212,6 +211,25 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return combinedDocument;
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            FieldsProjection that = (FieldsProjection) o;
+
+            return projections != null ? projections.equals(that.projections) : that.projections == null;
+        }
+
+        @Override
+        public int hashCode() {
+            return projections != null ? projections.hashCode() : 0;
+        }
+
         @Override
         public String toString() {
             return "Projections{"
@@ -225,7 +243,7 @@ private static class ElemMatchFilterProjection implements Bson {
         private final String fieldName;
         private final Bson filter;
 
-        public ElemMatchFilterProjection(final String fieldName, final Bson filter) {
+        ElemMatchFilterProjection(final String fieldName, final Bson filter) {
             this.fieldName = fieldName;
             this.filter = filter;
         }
@@ -235,6 +253,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return new BsonDocument(fieldName, new BsonDocument("$elemMatch", filter.toBsonDocument(documentClass, codecRegistry)));
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            ElemMatchFilterProjection that = (ElemMatchFilterProjection) o;
+
+            if (fieldName != null ? !fieldName.equals(that.fieldName) : that.fieldName != null) {
+                return false;
+            }
+            return filter != null ? filter.equals(that.filter) : that.filter == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName != null ? fieldName.hashCode() : 0;
+            result = 31 * result + (filter != null ? filter.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "ElemMatch Projection{"
diff --git a/driver-core/src/main/com/mongodb/client/model/PushOptions.java b/driver-core/src/main/com/mongodb/client/model/PushOptions.java
index f864ab40576..02abea0bdd2 100644
--- a/driver-core/src/main/com/mongodb/client/model/PushOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/PushOptions.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 /**
@@ -35,6 +38,7 @@ public class PushOptions {
      * @return the position, which may be null
      * @mongodb.driver.manual reference/operator/update/position/ $position
      */
+    @Nullable
     public Integer getPosition() {
         return position;
     }
@@ -46,7 +50,7 @@ public Integer getPosition() {
      * @return this
      * @mongodb.driver.manual reference/operator/update/position/ $position
      */
-    public PushOptions position(final Integer position) {
+    public PushOptions position(@Nullable final Integer position) {
         this.position = position;
         return this;
     }
@@ -57,6 +61,7 @@ public PushOptions position(final Integer position) {
      * @return the slice value representing the limit on the number of array elements allowed
      * @mongodb.driver.manual reference/operator/update/slice/ $slice
      */
+    @Nullable
     public Integer getSlice() {
         return slice;
     }
@@ -68,7 +73,7 @@ public Integer getSlice() {
      * @return this
      * @mongodb.driver.manual reference/operator/update/slice/ $slice
      */
-    public PushOptions slice(final Integer slice) {
+    public PushOptions slice(@Nullable final Integer slice) {
         this.slice = slice;
         return this;
     }
@@ -80,6 +85,7 @@ public PushOptions slice(final Integer slice) {
      * @mongodb.driver.manual reference/operator/update/sort/ $sort
      * @mongodb.driver.manual reference/operator/update/sort/#sort-array-elements-that-are-not-documents
      */
+    @Nullable
     public Integer getSort() {
         return sort;
     }
@@ -93,7 +99,7 @@ public Integer getSort() {
      * @mongodb.driver.manual reference/operator/update/sort/ $sort
      * @mongodb.driver.manual reference/operator/update/sort/#sort-array-elements-that-are-not-documents
      */
-    public PushOptions sort(final Integer sort) {
+    public PushOptions sort(@Nullable final Integer sort) {
         if (sortDocument != null) {
             throw new IllegalStateException("sort can not be set if sortDocument already is");
         }
@@ -107,6 +113,7 @@ public PushOptions sort(final Integer sort) {
      * @return the sort document
      * @mongodb.driver.manual reference/operator/update/sort/ $sort
      */
+    @Nullable
     public Bson getSortDocument() {
         return sortDocument;
     }
@@ -119,7 +126,7 @@ public Bson getSortDocument() {
      * @throws IllegalStateException if sort property is already set
      * @mongodb.driver.manual reference/operator/update/sort/ $sort
      */
-    public PushOptions sortDocument(final Bson sortDocument) {
+    public PushOptions sortDocument(@Nullable final Bson sortDocument) {
         if (sort != null) {
             throw new IllegalStateException("sortDocument can not be set if sort already is");
         }
@@ -127,6 +134,38 @@ public PushOptions sortDocument(final Bson sortDocument) {
         return this;
     }
 
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PushOptions that = (PushOptions) o;
+
+        if (position != null ? !position.equals(that.position) : that.position != null) {
+            return false;
+        }
+        if (slice != null ? !slice.equals(that.slice) : that.slice != null) {
+            return false;
+        }
+        if (sort != null ? !sort.equals(that.sort) : that.sort != null) {
+            return false;
+        }
+        return sortDocument != null ? sortDocument.equals(that.sortDocument) : that.sortDocument == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = position != null ? position.hashCode() : 0;
+        result = 31 * result + (slice != null ? slice.hashCode() : 0);
+        result = 31 * result + (sort != null ? sort.hashCode() : 0);
+        result = 31 * result + (sortDocument != null ? sortDocument.hashCode() : 0);
+        return result;
+    }
+
     @Override
     public String toString() {
         return "Push Options{"
diff --git a/driver-core/src/main/com/mongodb/client/model/RenameCollectionOptions.java b/driver-core/src/main/com/mongodb/client/model/RenameCollectionOptions.java
index 8c3d9d0500c..363910df8b9 100644
--- a/driver-core/src/main/com/mongodb/client/model/RenameCollectionOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/RenameCollectionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,4 +45,10 @@ public RenameCollectionOptions dropTarget(final boolean dropTarget) {
         return this;
     }
 
+    @Override
+    public String toString() {
+        return "RenameCollectionOptions{"
+                + "dropTarget=" + dropTarget
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/ReplaceOneModel.java b/driver-core/src/main/com/mongodb/client/model/ReplaceOneModel.java
index aa4279973bd..28f0158ad36 100644
--- a/driver-core/src/main/com/mongodb/client/model/ReplaceOneModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/ReplaceOneModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import org.bson.conversions.Bson;
 
 import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.client.model.ReplaceOptions.createReplaceOptions;
 
 /**
  * A model describing the replacement of at most one document that matches the query filter.
@@ -30,7 +31,7 @@
 public final class ReplaceOneModel<T> extends WriteModel<T> {
     private final Bson filter;
     private final T replacement;
-    private final UpdateOptions options;
+    private final ReplaceOptions options;
 
     /**
      * Construct a new instance.
@@ -39,7 +40,7 @@ public final class ReplaceOneModel<T> extends WriteModel<T> {
      * @param replacement the replacement document
      */
     public ReplaceOneModel(final Bson filter, final T replacement) {
-        this(filter, replacement, new UpdateOptions());
+        this(filter, replacement, new ReplaceOptions());
     }
 
     /**
@@ -48,11 +49,25 @@ public ReplaceOneModel(final Bson filter, final T replacement) {
      * @param filter    a document describing the query filter, which may not be null.
      * @param replacement the replacement document
      * @param options     the options to apply
+     * @deprecated use {@link #ReplaceOneModel(Bson, Object, ReplaceOptions)} instead
      */
+    @Deprecated
     public ReplaceOneModel(final Bson filter, final T replacement, final UpdateOptions options) {
+        this(filter, replacement, createReplaceOptions(options));
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param filter    a document describing the query filter, which may not be null.
+     * @param replacement the replacement document
+     * @param options     the options to apply
+     * @since 3.7
+     */
+    public ReplaceOneModel(final Bson filter, final T replacement, final ReplaceOptions options) {
         this.filter = notNull("filter", filter);
-        this.replacement = notNull("replacement", replacement);
         this.options = notNull("options", options);
+        this.replacement = notNull("replacement", replacement);
     }
 
     /**
@@ -76,9 +91,33 @@ public T getReplacement() {
     /**
      * Gets the options to apply.
      *
-     * @return the options
+     * @return the update options
+     * @deprecated use {@link #getReplaceOptions()} instead
      */
+    @Deprecated
     public UpdateOptions getOptions() {
+        return new UpdateOptions()
+                .bypassDocumentValidation(options.getBypassDocumentValidation())
+                .collation(options.getCollation())
+                .upsert(options.isUpsert());
+    }
+
+    /**
+     * Gets the ReplaceOptions to apply.
+     *
+     * @return the replace options
+     * @since 3.7
+     */
+    public ReplaceOptions getReplaceOptions() {
         return options;
     }
+
+    @Override
+    public String toString() {
+        return "ReplaceOneModel{"
+                + "filter=" + filter
+                + ", replacement=" + replacement
+                + ", options=" + options
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/ReplaceOptions.java b/driver-core/src/main/com/mongodb/client/model/ReplaceOptions.java
new file mode 100644
index 00000000000..81726f637d1
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/ReplaceOptions.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The options to apply when replacing documents.
+ *
+ * @since 3.7
+ * @mongodb.driver.manual tutorial/modify-documents/ Updates
+ * @mongodb.driver.manual reference/operator/update/ Update Operators
+ * @mongodb.driver.manual reference/command/update/ Update Command
+ */
+public class ReplaceOptions {
+    private boolean upsert;
+    private Boolean bypassDocumentValidation;
+    private Collation collation;
+
+    /**
+     * Creates replace options from updateOptions.
+     *
+     * @param updateOptions the updateOptions
+     * @return replace options
+     * @deprecated there is no replacement for this method
+     */
+    @Deprecated
+    public static ReplaceOptions createReplaceOptions(final UpdateOptions updateOptions) {
+        notNull("updateOptions", updateOptions);
+
+        List<? extends Bson> arrayFilters = updateOptions.getArrayFilters();
+        isTrue("ArrayFilters should be empty.",  arrayFilters == null || arrayFilters.isEmpty());
+
+        return new ReplaceOptions()
+                .bypassDocumentValidation(updateOptions.getBypassDocumentValidation())
+                .collation(updateOptions.getCollation())
+                .upsert(updateOptions.isUpsert());
+    }
+
+    /**
+     * Returns true if a new document should be inserted if there are no matches to the query filter.  The default is false.
+     *
+     * @return true if a new document should be inserted if there are no matches to the query filter
+     */
+    public boolean isUpsert() {
+        return upsert;
+    }
+
+    /**
+     * Set to true if a new document should be inserted if there are no matches to the query filter.
+     *
+     * @param upsert true if a new document should be inserted if there are no matches to the query filter
+     * @return this
+     */
+    public ReplaceOptions upsert(final boolean upsert) {
+        this.upsert = upsert;
+        return this;
+    }
+
+    /**
+     * Gets the the bypass document level validation flag
+     *
+     * @return the bypass document level validation flag
+     * @mongodb.server.release 3.2
+     */
+    @Nullable
+    public Boolean getBypassDocumentValidation() {
+        return bypassDocumentValidation;
+    }
+
+    /**
+     * Sets the bypass document level validation flag.
+     *
+     * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
+     * @return this
+     * @mongodb.server.release 3.2
+     */
+    public ReplaceOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        return this;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public ReplaceOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ReplaceOptions{"
+                + "upsert=" + upsert
+                + ", bypassDocumentValidation=" + bypassDocumentValidation
+                + ", collation=" + collation
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/ReturnDocument.java b/driver-core/src/main/com/mongodb/client/model/ReturnDocument.java
index b2b82fc4035..e480e142c7d 100644
--- a/driver-core/src/main/com/mongodb/client/model/ReturnDocument.java
+++ b/driver-core/src/main/com/mongodb/client/model/ReturnDocument.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/client/model/SimpleExpression.java b/driver-core/src/main/com/mongodb/client/model/SimpleExpression.java
index fa5de80d965..f7cf15280b0 100644
--- a/driver-core/src/main/com/mongodb/client/model/SimpleExpression.java
+++ b/driver-core/src/main/com/mongodb/client/model/SimpleExpression.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +25,7 @@ class SimpleExpression<TExpression> implements Bson {
     private final String name;
     private final TExpression expression;
 
-    public SimpleExpression(final String name, final TExpression expression) {
+    SimpleExpression(final String name, final TExpression expression) {
         this.name = name;
         this.expression = expression;
     }
@@ -40,6 +42,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
         return writer.getDocument();
     }
 
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SimpleExpression<?> that = (SimpleExpression<?>) o;
+
+        if (name != null ? !name.equals(that.name) : that.name != null) {
+            return false;
+        }
+        return expression != null ? expression.equals(that.expression) : that.expression == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + (expression != null ? expression.hashCode() : 0);
+        return result;
+    }
+
     @Override
     public String toString() {
         return "Expression{"
diff --git a/driver-core/src/main/com/mongodb/client/model/Sorts.java b/driver-core/src/main/com/mongodb/client/model/Sorts.java
index f38bcf52124..9f31165559a 100644
--- a/driver-core/src/main/com/mongodb/client/model/Sorts.java
+++ b/driver-core/src/main/com/mongodb/client/model/Sorts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,7 +9,7 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
@@ -67,7 +67,7 @@ public static Bson ascending(final List<String> fieldNames) {
     }
 
     /**
-     * Create a sort specification for an ascending sort on the given fields.
+     * Create a sort specification for a descending sort on the given fields.
      *
      * @param fieldNames the field names, which must contain at least one
      * @return the sort specification
@@ -78,7 +78,7 @@ public static Bson descending(final String... fieldNames) {
     }
 
     /**
-     * Create a sort specification for an ascending sort on the given fields.
+     * Create a sort specification for a descending sort on the given fields.
      *
      * @param fieldNames the field names, which must contain at least one
      * @return the sort specification
@@ -116,7 +116,7 @@ public static Bson orderBy(final Bson... sorts) {
      * @param sorts the sort specifications
      * @return the combined sort specification
      */
-    public static Bson orderBy(final List<Bson> sorts) {
+    public static Bson orderBy(final List<? extends Bson> sorts) {
         notNull("sorts", sorts);
         return new CompoundSort(sorts);
     }
@@ -130,9 +130,9 @@ private static Bson orderBy(final List<String> fieldNames, final BsonValue value
     }
 
     private static final class CompoundSort implements Bson {
-        private final List<Bson> sorts;
+        private final List<? extends Bson> sorts;
 
-        private CompoundSort(final List<Bson> sorts) {
+        private CompoundSort(final List<? extends Bson> sorts) {
             this.sorts = sorts;
         }
 
@@ -148,6 +148,25 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentCl
             return combinedDocument;
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            CompoundSort that = (CompoundSort) o;
+
+            return sorts != null ? sorts.equals(that.sorts) : that.sorts == null;
+        }
+
+        @Override
+        public int hashCode() {
+            return sorts != null ? sorts.hashCode() : 0;
+        }
+
         @Override
         public String toString() {
             return "Compound Sort{"
diff --git a/driver-core/src/main/com/mongodb/client/model/TextSearchOptions.java b/driver-core/src/main/com/mongodb/client/model/TextSearchOptions.java
index 764301c777c..185c5d05897 100644
--- a/driver-core/src/main/com/mongodb/client/model/TextSearchOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/TextSearchOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
+
 /**
  * Text search options for the {@link Filters#text(String, TextSearchOptions)} helper
  *
@@ -33,6 +35,7 @@ public final class TextSearchOptions {
      *
      * @return the language to use for the text search if set or null
      */
+    @Nullable
     public String getLanguage() {
         return language;
     }
@@ -43,7 +46,7 @@ public String getLanguage() {
      * @param language the language to use for the text search
      * @return this
      */
-    public TextSearchOptions language(final String language) {
+    public TextSearchOptions language(@Nullable final String language) {
         this.language = language;
         return this;
     }
@@ -54,6 +57,7 @@ public TextSearchOptions language(final String language) {
      * @return the case-sensitive flag if set or null
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getCaseSensitive() {
         return caseSensitive;
     }
@@ -65,7 +69,7 @@ public Boolean getCaseSensitive() {
      * @return this
      * @mongodb.server.release 3.2
      */
-    public TextSearchOptions caseSensitive(final Boolean caseSensitive) {
+    public TextSearchOptions caseSensitive(@Nullable final Boolean caseSensitive) {
         this.caseSensitive = caseSensitive;
         return this;
     }
@@ -76,6 +80,7 @@ public TextSearchOptions caseSensitive(final Boolean caseSensitive) {
      * @return the diacritic-sensitive flag if set or null
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getDiacriticSensitive() {
         return diacriticSensitive;
     }
@@ -87,11 +92,39 @@ public Boolean getDiacriticSensitive() {
      * @return this
      * @mongodb.server.release 3.2
      */
-    public TextSearchOptions diacriticSensitive(final Boolean diacriticSensitive) {
+    public TextSearchOptions diacriticSensitive(@Nullable final Boolean diacriticSensitive) {
         this.diacriticSensitive = diacriticSensitive;
         return this;
     }
 
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TextSearchOptions that = (TextSearchOptions) o;
+
+        if (language != null ? !language.equals(that.language) : that.language != null) {
+            return false;
+        }
+        if (caseSensitive != null ? !caseSensitive.equals(that.caseSensitive) : that.caseSensitive != null) {
+            return false;
+        }
+        return diacriticSensitive != null ? diacriticSensitive.equals(that.diacriticSensitive) : that.diacriticSensitive == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = language != null ? language.hashCode() : 0;
+        result = 31 * result + (caseSensitive != null ? caseSensitive.hashCode() : 0);
+        result = 31 * result + (diacriticSensitive != null ? diacriticSensitive.hashCode() : 0);
+        return result;
+    }
+
     @Override
     public String toString() {
         return "Text Search Options{"
diff --git a/driver-core/src/main/com/mongodb/client/model/UnwindOptions.java b/driver-core/src/main/com/mongodb/client/model/UnwindOptions.java
index c77d67c6dbd..832d274591e 100644
--- a/driver-core/src/main/com/mongodb/client/model/UnwindOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/UnwindOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
+
 /**
  * The options for an unwind aggregation pipeline stage
  *
@@ -33,6 +35,7 @@ public final class UnwindOptions {
      *
      * @return the preserve null values and empty arrays value or null
      */
+    @Nullable
     public Boolean isPreserveNullAndEmptyArrays() {
         return preserveNullAndEmptyArrays;
     }
@@ -43,7 +46,7 @@ public Boolean isPreserveNullAndEmptyArrays() {
      * @param preserveNullAndEmptyArrays flag depicting if the unwind stage should include documents that have null values or empty arrays
      * @return this
      */
-    public UnwindOptions preserveNullAndEmptyArrays(final Boolean preserveNullAndEmptyArrays) {
+    public UnwindOptions preserveNullAndEmptyArrays(@Nullable final Boolean preserveNullAndEmptyArrays) {
         this.preserveNullAndEmptyArrays = preserveNullAndEmptyArrays;
         return this;
     }
@@ -53,6 +56,7 @@ public UnwindOptions preserveNullAndEmptyArrays(final Boolean preserveNullAndEmp
      *
      * @return the includeArrayIndex field if set or null
      */
+    @Nullable
     public String getIncludeArrayIndex() {
         return includeArrayIndex;
     }
@@ -63,8 +67,16 @@ public String getIncludeArrayIndex() {
      * @param arrayIndexFieldName the field to be used to store the array index of the unwound item
      * @return this
      */
-    public UnwindOptions includeArrayIndex(final String arrayIndexFieldName) {
+    public UnwindOptions includeArrayIndex(@Nullable final String arrayIndexFieldName) {
         this.includeArrayIndex = arrayIndexFieldName;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "UnwindOptions{"
+                + "preserveNullAndEmptyArrays=" + preserveNullAndEmptyArrays
+                + ", includeArrayIndex='" + includeArrayIndex + '\''
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/UpdateManyModel.java b/driver-core/src/main/com/mongodb/client/model/UpdateManyModel.java
index 8faff3a232b..1c18a7f1645 100644
--- a/driver-core/src/main/com/mongodb/client/model/UpdateManyModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/UpdateManyModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,11 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
+import java.util.List;
+
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -33,6 +36,7 @@
 public final class UpdateManyModel<T> extends WriteModel<T> {
     private final Bson filter;
     private final Bson update;
+    private final List<? extends Bson> updatePipeline;
     private final UpdateOptions options;
 
     /**
@@ -40,7 +44,7 @@ public final class UpdateManyModel<T> extends WriteModel<T> {
      *
      * @param filter a document describing the query filter, which may not be null.
      * @param update a document describing the update, which may not be null. The update to apply must include only update
-     * operators.
+     *               operators.
      */
     public UpdateManyModel(final Bson filter, final Bson update) {
         this(filter, update, new UpdateOptions());
@@ -57,13 +61,42 @@ public UpdateManyModel(final Bson filter, final Bson update) {
     public UpdateManyModel(final Bson filter, final Bson update, final UpdateOptions options) {
         this.filter = notNull("filter", filter);
         this.update = notNull("update", update);
+        this.updatePipeline = null;
+        this.options = notNull("options", options);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    public UpdateManyModel(final Bson filter, final List<? extends Bson> update) {
+        this(filter, update, new UpdateOptions());
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @param options the options to apply
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    public UpdateManyModel(final Bson filter, final List<? extends Bson> update, final UpdateOptions options) {
+        this.filter = notNull("filter", filter);
+        this.update = null;
+        this.updatePipeline = update;
         this.options = notNull("options", options);
     }
 
     /**
      * Gets the query filter.
      *
-     * @return the query filtert
+     * @return the query filter
      */
     public Bson getFilter() {
         return filter;
@@ -75,10 +108,24 @@ public Bson getFilter() {
      *
      * @return the document specifying the updates to apply
      */
+    @Nullable
     public Bson getUpdate() {
         return update;
     }
 
+    /**
+     * Gets the pipeline specifying the updates to apply to the matching document.  The update to apply must include only update
+     * operators.
+     *
+     * @return the pipeline specifying the updates to apply
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    @Nullable
+    public List<? extends Bson> getUpdatePipeline() {
+        return updatePipeline;
+    }
+
     /**
      * Gets the options to apply.
      *
@@ -87,4 +134,13 @@ public Bson getUpdate() {
     public UpdateOptions getOptions() {
         return options;
     }
+
+    @Override
+    public String toString() {
+        return "UpdateManyModel{"
+                + "filter=" + filter
+                + ", update=" + (update != null ? update : updatePipeline)
+                + ", options=" + options
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/UpdateOneModel.java b/driver-core/src/main/com/mongodb/client/model/UpdateOneModel.java
index e9f7298a7ac..43d1e75616c 100644
--- a/driver-core/src/main/com/mongodb/client/model/UpdateOneModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/UpdateOneModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,11 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
+import java.util.List;
+
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -33,6 +36,7 @@
 public final class UpdateOneModel<T> extends WriteModel<T> {
     private final Bson filter;
     private final Bson update;
+    private final List<? extends Bson> updatePipeline;
     private final UpdateOptions options;
 
     /**
@@ -55,6 +59,35 @@ public UpdateOneModel(final Bson filter, final Bson update) {
     public UpdateOneModel(final Bson filter, final Bson update, final UpdateOptions options) {
         this.filter = notNull("filter", filter);
         this.update = notNull("update", update);
+        this.updatePipeline = null;
+        this.options = notNull("options", options);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    public UpdateOneModel(final Bson filter, final List<? extends Bson> update) {
+        this(filter, update, new UpdateOptions());
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @param options the options to apply
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    public UpdateOneModel(final Bson filter, final List<? extends Bson> update, final UpdateOptions options) {
+        this.filter = notNull("filter", filter);
+        this.update = null;
+        this.updatePipeline = update;
         this.options = notNull("options", options);
     }
 
@@ -72,10 +105,23 @@ public Bson getFilter() {
      *
      * @return the document specifying the updates to apply
      */
+    @Nullable
     public Bson getUpdate() {
         return update;
     }
 
+    /**
+     * Gets the pipeline specifying the updates to apply to the matching document.  The update to apply must include only update operators.
+     *
+     * @return the pipeline specifying the updates to apply
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    @Nullable
+    public List<? extends Bson> getUpdatePipeline() {
+        return updatePipeline;
+    }
+
     /**
      * Gets the options to apply.
      *
@@ -84,4 +130,13 @@ public Bson getUpdate() {
     public UpdateOptions getOptions() {
         return options;
     }
+
+    @Override
+    public String toString() {
+        return "UpdateOneModel{"
+                + "filter=" + filter
+                + ", update=" + (update != null ? update : updatePipeline)
+                + ", options=" + options
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/UpdateOptions.java b/driver-core/src/main/com/mongodb/client/model/UpdateOptions.java
index 1e13d808c10..acb5c9df7fe 100644
--- a/driver-core/src/main/com/mongodb/client/model/UpdateOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/UpdateOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,11 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
 /**
  * The options to apply when updating documents.
  *
@@ -27,6 +32,8 @@
 public class UpdateOptions {
     private boolean upsert;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
+    private List<? extends Bson> arrayFilters;
 
     /**
      * Returns true if a new document should be inserted if there are no matches to the query filter.  The default is false.
@@ -55,6 +62,7 @@ public UpdateOptions upsert(final boolean upsert) {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -67,8 +75,69 @@ public Boolean getBypassDocumentValidation() {
      * @since 3.2
      * @mongodb.server.release 3.2
      */
-    public UpdateOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public UpdateOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public UpdateOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Sets the array filters option
+     *
+     * @param arrayFilters the array filters, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public UpdateOptions arrayFilters(@Nullable final List<? extends Bson> arrayFilters) {
+        this.arrayFilters = arrayFilters;
+        return this;
+    }
+
+    /**
+     * Returns the array filters option
+     *
+     * @return the array filters, which may be null
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    public List<? extends Bson> getArrayFilters() {
+        return arrayFilters;
+    }
+
+    @Override
+    public String toString() {
+        return "UpdateOptions{"
+                + "upsert=" + upsert
+                + ", bypassDocumentValidation=" + bypassDocumentValidation
+                + ", collation=" + collation
+                + ", arrayFilters=" + arrayFilters
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/Updates.java b/driver-core/src/main/com/mongodb/client/model/Updates.java
index 1fba10cbc43..5870900931b 100644
--- a/driver-core/src/main/com/mongodb/client/model/Updates.java
+++ b/driver-core/src/main/com/mongodb/client/model/Updates.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWriter;
 import org.bson.BsonInt32;
@@ -57,7 +60,7 @@ public static Bson combine(final Bson... updates) {
      * @param updates the list of updates
      * @return a combined update
      */
-    public static Bson combine(final List<Bson> updates) {
+    public static Bson combine(final List<? extends Bson> updates) {
         notNull("updates", updates);
         return new CompositeUpdate(updates);
     }
@@ -66,12 +69,12 @@ public static Bson combine(final List<Bson> updates) {
      * Creates an update that sets the value of the field with the given name to the given value.
      *
      * @param fieldName the non-null field name
-     * @param value     the value
+     * @param value     the value, which may be null
      * @param <TItem>   the value type
      * @return the update
      * @mongodb.driver.manual reference/operator/update/set/ $set
      */
-    public static <TItem> Bson set(final String fieldName, final TItem value) {
+    public static <TItem> Bson set(final String fieldName, @Nullable final TItem value) {
         return new SimpleUpdate<TItem>(fieldName, value, "$set");
     }
 
@@ -86,18 +89,31 @@ public static Bson unset(final String fieldName) {
         return new SimpleUpdate<String>(fieldName, "", "$unset");
     }
 
+    /**
+     * Creates an update that sets the values for the document, but only if the update is an upsert that results in an insert of a document.
+     *
+     * @param value     the value
+     * @return the update
+     * @mongodb.driver.manual reference/operator/update/setOnInsert/ $setOnInsert
+     * @since 3.10.0
+     * @see UpdateOptions#upsert(boolean)
+     */
+    public static Bson setOnInsert(final Bson value) {
+        return new SimpleBsonKeyValue("$setOnInsert", value);
+    }
+
     /**
      * Creates an update that sets the value of the field with the given name to the given value, but only if the update is an upsert that
      * results in an insert of a document.
      *
      * @param fieldName the non-null field name
-     * @param value     the value
+     * @param value     the value, which may be null
      * @param <TItem>   the value type
      * @return the update
      * @mongodb.driver.manual reference/operator/update/setOnInsert/ $setOnInsert
      * @see UpdateOptions#upsert(boolean)
      */
-    public static <TItem> Bson setOnInsert(final String fieldName, final TItem value) {
+    public static <TItem> Bson setOnInsert(final String fieldName, @Nullable final TItem value) {
         return new SimpleUpdate<TItem>(fieldName, value, "$setOnInsert");
     }
 
@@ -198,12 +214,12 @@ public static Bson currentTimestamp(final String fieldName) {
      * already present, in which case it does nothing
      *
      * @param fieldName the non-null field name
-     * @param value     the value
+     * @param value     the value, which may be null
      * @param <TItem>   the value type
      * @return the update
      * @mongodb.driver.manual reference/operator/update/addToSet/ $addToSet
      */
-    public static <TItem> Bson addToSet(final String fieldName, final TItem value) {
+    public static <TItem> Bson addToSet(final String fieldName, @Nullable final TItem value) {
         return new SimpleUpdate<TItem>(fieldName, value, "$addToSet");
     }
 
@@ -225,12 +241,12 @@ public static <TItem> Bson addEachToSet(final String fieldName, final List<TItem
      * Creates an update that adds the given value to the array value of the field with the given name.
      *
      * @param fieldName the non-null field name
-     * @param value     the value
+     * @param value     the value, which may be null
      * @param <TItem>   the value type
      * @return the update
      * @mongodb.driver.manual reference/operator/update/push/ $push
      */
-    public static <TItem> Bson push(final String fieldName, final TItem value) {
+    public static <TItem> Bson push(final String fieldName, @Nullable final TItem value) {
         return new SimpleUpdate<TItem>(fieldName, value, "$push");
     }
 
@@ -266,12 +282,12 @@ public static <TItem> Bson pushEach(final String fieldName, final List<TItem> va
      * Creates an update that removes all instances of the given value from the array value of the field with the given name.
      *
      * @param fieldName the non-null field name
-     * @param value     the value
+     * @param value     the value, which may be null
      * @param <TItem>   the value type
      * @return the update
      * @mongodb.driver.manual reference/operator/update/pull/ $pull
      */
-    public static <TItem> Bson pull(final String fieldName, final TItem value) {
+    public static <TItem> Bson pull(final String fieldName, @Nullable final TItem value) {
         return new SimpleUpdate<TItem>(fieldName, value, "$pull");
     }
 
@@ -419,12 +435,65 @@ private static Bson createBitUpdateDocument(final String fieldName, final String
         return new BsonDocument("$bit", new BsonDocument(fieldName, new BsonDocument(bitwiseOperator, value)));
     }
 
+    private static class SimpleBsonKeyValue implements Bson {
+        private final String fieldName;
+        private final Bson value;
+
+        SimpleBsonKeyValue(final String fieldName, final Bson value) {
+            this.fieldName = notNull("fieldName", fieldName);
+            this.value = notNull("value", value);
+        }
+
+        @Override
+        public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+            BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+            writer.writeStartDocument();
+            writer.writeName(fieldName);
+            encodeValue(writer, value, codecRegistry);
+            writer.writeEndDocument();
+
+            return writer.getDocument();
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            SimpleBsonKeyValue that = (SimpleBsonKeyValue) o;
+
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            return value.equals(that.value);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName.hashCode();
+            result = 31 * result + value.hashCode();
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "SimpleBsonKeyValue{"
+                    + "fieldName='" + fieldName + '\''
+                    + ", value=" + value
+                    + '}';
+        }
+    }
+
     private static class SimpleUpdate<TItem> implements Bson {
         private final String fieldName;
         private final TItem value;
         private final String operator;
 
-        public SimpleUpdate(final String fieldName, final TItem value, final String operator) {
+        SimpleUpdate(final String fieldName, final TItem value, final String operator) {
             this.fieldName = notNull("fieldName", fieldName);
             this.value = value;
             this.operator = operator;
@@ -447,6 +516,34 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentC
             return writer.getDocument();
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            SimpleUpdate<?> that = (SimpleUpdate<?>) o;
+
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            if (value != null ? !value.equals(that.value) : that.value != null) {
+                return false;
+            }
+            return operator != null ? operator.equals(that.operator) : that.operator == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName.hashCode();
+            result = 31 * result + (value != null ? value.hashCode() : 0);
+            result = 31 * result + (operator != null ? operator.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Update{"
@@ -462,7 +559,7 @@ private static class WithEachUpdate<TItem> implements Bson {
         private final List<TItem> values;
         private final String operator;
 
-        public WithEachUpdate(final String fieldName, final List<TItem> values, final String operator) {
+        WithEachUpdate(final String fieldName, final List<TItem> values, final String operator) {
             this.fieldName = notNull("fieldName", fieldName);
             this.values = notNull("values", values);
             this.operator = operator;
@@ -505,6 +602,34 @@ protected String additionalFieldsToString() {
             return "";
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            WithEachUpdate<?> that = (WithEachUpdate<?>) o;
+
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            if (!values.equals(that.values)) {
+                return false;
+            }
+            return operator != null ? operator.equals(that.operator) : that.operator == null;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName.hashCode();
+            result = 31 * result + values.hashCode();
+            result = 31 * result + (operator != null ? operator.hashCode() : 0);
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Each Update{"
@@ -520,7 +645,7 @@ private static class PushUpdate<TItem> extends WithEachUpdate<TItem> {
 
         private final PushOptions options;
 
-        public PushUpdate(final String fieldName, final List<TItem> values, final PushOptions options) {
+        PushUpdate(final String fieldName, final List<TItem> values, final PushOptions options) {
             super(fieldName, values, "$push");
             this.options = notNull("options", options);
         }
@@ -528,18 +653,48 @@ public PushUpdate(final String fieldName, final List<TItem> values, final PushOp
         @Override
         protected <TDocument> void writeAdditionalFields(final BsonDocumentWriter writer, final Class<TDocument> tDocumentClass,
                                                          final CodecRegistry codecRegistry) {
-            if (options.getPosition() != null) {
-                writer.writeInt32("$position", options.getPosition());
+            Integer position = options.getPosition();
+            if (position != null) {
+                writer.writeInt32("$position", position);
+            }
+            Integer slice = options.getSlice();
+            if (slice != null) {
+                writer.writeInt32("$slice", slice);
+            }
+            Integer sort = options.getSort();
+            if (sort != null) {
+                writer.writeInt32("$sort", sort);
+            } else {
+                Bson sortDocument = options.getSortDocument();
+                if (sortDocument != null) {
+                    writer.writeName("$sort");
+                    encodeValue(writer, sortDocument, codecRegistry);
+                }
+            }
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
             }
-            if (options.getSlice() != null) {
-                writer.writeInt32("$slice", options.getSlice());
+            if (o == null || getClass() != o.getClass()) {
+                return false;
             }
-            if (options.getSort() != null) {
-                writer.writeInt32("$sort", options.getSort());
-            } else if (options.getSortDocument() != null) {
-                writer.writeName("$sort");
-                encodeValue(writer, options.getSortDocument(), codecRegistry);
+            if (!super.equals(o)) {
+                return false;
             }
+
+            PushUpdate<?> that = (PushUpdate<?>) o;
+
+            return options.equals(that.options);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = super.hashCode();
+            result = 31 * result + options.hashCode();
+            return result;
         }
 
         @Override
@@ -552,7 +707,7 @@ private static class PullAllUpdate<TItem> implements Bson {
         private final String fieldName;
         private final List<TItem> values;
 
-        public PullAllUpdate(final String fieldName, final List<TItem> values) {
+        PullAllUpdate(final String fieldName, final List<TItem> values) {
             this.fieldName = notNull("fieldName", fieldName);
             this.values = notNull("values", values);
         }
@@ -580,6 +735,30 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentC
             return writer.getDocument();
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            PullAllUpdate<?> that = (PullAllUpdate<?>) o;
+
+            if (!fieldName.equals(that.fieldName)) {
+                return false;
+            }
+            return values.equals(that.values);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = fieldName.hashCode();
+            result = 31 * result + values.hashCode();
+            return result;
+        }
+
         @Override
         public String toString() {
             return "Update{"
@@ -591,9 +770,9 @@ public String toString() {
     }
 
     private static class CompositeUpdate implements Bson {
-        private final List<Bson> updates;
+        private final List<? extends Bson> updates;
 
-        public CompositeUpdate(final List<Bson> updates) {
+        CompositeUpdate(final List<? extends Bson> updates) {
             this.updates = updates;
         }
 
@@ -620,6 +799,25 @@ public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentC
             return document;
         }
 
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            CompositeUpdate that = (CompositeUpdate) o;
+
+            return updates != null ? updates.equals(that.updates) : that.updates == null;
+        }
+
+        @Override
+        public int hashCode() {
+            return updates != null ? updates.hashCode() : 0;
+        }
+
         @Override
         public String toString() {
             return "Updates{"
diff --git a/driver-core/src/main/com/mongodb/client/model/ValidationAction.java b/driver-core/src/main/com/mongodb/client/model/ValidationAction.java
index 8d42858c624..a6749adfaf4 100644
--- a/driver-core/src/main/com/mongodb/client/model/ValidationAction.java
+++ b/driver-core/src/main/com/mongodb/client/model/ValidationAction.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/client/model/ValidationLevel.java b/driver-core/src/main/com/mongodb/client/model/ValidationLevel.java
index a1b95a0b0b9..4ad4fdd5bf1 100644
--- a/driver-core/src/main/com/mongodb/client/model/ValidationLevel.java
+++ b/driver-core/src/main/com/mongodb/client/model/ValidationLevel.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/client/model/ValidationOptions.java b/driver-core/src/main/com/mongodb/client/model/ValidationOptions.java
index a22f4c6863f..8f514aa2a91 100644
--- a/driver-core/src/main/com/mongodb/client/model/ValidationOptions.java
+++ b/driver-core/src/main/com/mongodb/client/model/ValidationOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 /**
@@ -35,6 +36,7 @@ public final class ValidationOptions {
      *
      * @return the validation rules if set or null
      */
+    @Nullable
     public Bson getValidator() {
         return validator;
     }
@@ -45,7 +47,7 @@ public Bson getValidator() {
      * @param validator the validation rules
      * @return this
      */
-    public ValidationOptions validator(final Bson validator) {
+    public ValidationOptions validator(@Nullable final Bson validator) {
         this.validator = validator;
         return this;
     }
@@ -56,6 +58,7 @@ public ValidationOptions validator(final Bson validator) {
      *
      * @return the ValidationLevel.
      */
+    @Nullable
     public ValidationLevel getValidationLevel() {
         return validationLevel;
     }
@@ -67,7 +70,7 @@ public ValidationLevel getValidationLevel() {
      * @param validationLevel the validation level
      * @return this
      */
-    public ValidationOptions validationLevel(final ValidationLevel validationLevel) {
+    public ValidationOptions validationLevel(@Nullable final ValidationLevel validationLevel) {
         this.validationLevel = validationLevel;
         return this;
     }
@@ -77,6 +80,7 @@ public ValidationOptions validationLevel(final ValidationLevel validationLevel)
      *
      * @return the ValidationAction.
      */
+    @Nullable
     public ValidationAction getValidationAction() {
         return validationAction;
     }
@@ -88,8 +92,17 @@ public ValidationAction getValidationAction() {
      * @param validationAction the validation action
      * @return this
      */
-    public ValidationOptions validationAction(final ValidationAction validationAction) {
+    public ValidationOptions validationAction(@Nullable final ValidationAction validationAction) {
         this.validationAction = validationAction;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "ValidationOptions{"
+                + "validator=" + validator
+                + ", validationLevel=" + validationLevel
+                + ", validationAction=" + validationAction
+                + '}';
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/Variable.java b/driver-core/src/main/com/mongodb/client/model/Variable.java
new file mode 100644
index 00000000000..3feb83d7966
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/Variable.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * Helps define new variable for the $lookup pipeline stage
+ *
+ * @param <TExpression> the type of the value for the new variable
+ * @mongodb.driver.manual reference/operator/aggregation/lookup/  $lookup
+ * @mongodb.server.release 3.6
+ * @since 3.7
+ */
+public class Variable<TExpression> {
+    private final String name;
+    private final TExpression value;
+
+    /**
+     * Creates a new variable definition for use in $lookup pipeline stages
+     *
+     * @param name  the name of the new variable
+     * @param value the value of the new variable
+     * @mongodb.driver.manual reference/operator/aggregation/lookup/  $lookup
+     */
+    public Variable(final String name, final TExpression value) {
+        this.name = notNull("name", name);
+        this.value = value;
+    }
+
+    /**
+     * @return the name of the new variable
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the value of the new variable
+     */
+    public TExpression getValue() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Variable)) {
+            return false;
+        }
+
+        Variable<?> variable = (Variable<?>) o;
+
+        if (!name.equals(variable.name)) {
+            return false;
+        }
+        return value != null ? value.equals(variable.value) : variable.value == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name.hashCode();
+        result = 31 * result + (value != null ? value.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Variable{"
+                + "name='" + name + '\''
+                + ", value=" + value
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/WriteModel.java b/driver-core/src/main/com/mongodb/client/model/WriteModel.java
index 1c25dda8c34..c0fb2b6bae9 100644
--- a/driver-core/src/main/com/mongodb/client/model/WriteModel.java
+++ b/driver-core/src/main/com/mongodb/client/model/WriteModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamDocument.java b/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamDocument.java
new file mode 100644
index 00000000000..86b28e5044a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamDocument.java
@@ -0,0 +1,474 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.assertions.Assertions;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.BsonTimestamp;
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+/**
+ * Represents the {@code $changeStream} aggregation output document.
+ *
+ * <p>Note: this class will not be applicable for all change stream outputs. If using custom pipelines that radically change the
+ * change stream result, then an alternative document format should be used.</p>
+ *
+ * @param <TDocument> The type that this collection will encode the {@code fullDocument} field into.
+ * @since 3.6
+ */
+public final class ChangeStreamDocument<TDocument> {
+
+    @BsonId()
+    private final BsonDocument resumeToken;
+    private final BsonDocument namespaceDocument;
+    private final BsonDocument destinationNamespaceDocument;
+    private final TDocument fullDocument;
+    private final BsonDocument documentKey;
+    private final BsonTimestamp clusterTime;
+    private final OperationType operationType;
+    private final UpdateDescription updateDescription;
+    private final BsonInt64 txnNumber;
+    private final BsonDocument lsid;
+
+    /**
+     * Creates a new instance
+     *
+     * @param resumeToken the resume token
+     * @param namespace the namespace
+     * @param documentKey a document containing the _id of the changed document
+     * @param fullDocument the fullDocument
+     * @param operationType the operation type
+     * @param updateDescription the update description
+     * @deprecated Prefer {@link #ChangeStreamDocument(OperationType, BsonDocument, BsonDocument, BsonDocument, Object, BsonDocument,
+     * BsonTimestamp, UpdateDescription)}
+     */
+    @Deprecated
+    public ChangeStreamDocument(final BsonDocument resumeToken,
+                                final MongoNamespace namespace,
+                                final TDocument fullDocument,
+                                final BsonDocument documentKey,
+                                final OperationType operationType,
+                                final UpdateDescription updateDescription) {
+        this(resumeToken, namespace, fullDocument, documentKey, null, operationType, updateDescription);
+    }
+
+    /**
+     * Creates a new instance
+     *
+     * @param resumeToken the resume token
+     * @param namespace the namespace
+     * @param documentKey a document containing the _id of the changed document
+     * @param clusterTime the cluster time at which the change occurred
+     * @param fullDocument the fullDocument
+     * @param operationType the operation type
+     * @param updateDescription the update description
+     * @deprecated Prefer {@link #ChangeStreamDocument(OperationType, BsonDocument, BsonDocument, BsonDocument, Object, BsonDocument,
+     * BsonTimestamp, UpdateDescription)}
+     */
+    @Deprecated
+    public ChangeStreamDocument(final BsonDocument resumeToken,
+                                final MongoNamespace namespace,
+                                final TDocument fullDocument,
+                                final BsonDocument documentKey,
+                                @Nullable final BsonTimestamp clusterTime,
+                                final OperationType operationType,
+                                final UpdateDescription updateDescription) {
+        this(resumeToken, namespaceToDocument(namespace), fullDocument, documentKey, clusterTime, operationType, updateDescription);
+    }
+
+    /**
+     * Creates a new instance
+     *
+     * @param resumeToken the resume token
+     * @param namespaceDocument the BsonDocument representing the namespace
+     * @param fullDocument the full document
+     * @param documentKey a document containing the _id of the changed document
+     * @param clusterTime the cluster time at which the change occured
+     * @param operationType the operation type
+     * @param updateDescription the update description
+     *
+     * @since 3.8
+     */
+    @Deprecated
+    public ChangeStreamDocument(@BsonProperty("resumeToken") final BsonDocument resumeToken,
+                                @BsonProperty("ns") final BsonDocument namespaceDocument,
+                                @BsonProperty("fullDocument") final TDocument fullDocument,
+                                @BsonProperty("documentKey") final BsonDocument documentKey,
+                                @Nullable @BsonProperty("clusterTime") final BsonTimestamp clusterTime,
+                                @BsonProperty("operationType") final OperationType operationType,
+                                @BsonProperty("updateDescription") final UpdateDescription updateDescription) {
+        this(operationType, resumeToken, namespaceDocument, null, fullDocument, documentKey, clusterTime,
+                updateDescription);
+    }
+
+    /**
+     * Creates a new instance
+     *
+     * @param operationType the operation type
+     * @param resumeToken the resume token
+     * @param namespaceDocument the BsonDocument representing the namespace
+     * @param destinationNamespaceDocument the BsonDocument representing the destinatation namespace
+     * @param fullDocument the full document
+     * @param documentKey a document containing the _id of the changed document
+     * @param clusterTime the cluster time at which the change occured
+     * @param updateDescription the update description
+     *
+     * @since 3.11
+     */
+    @Deprecated
+    public ChangeStreamDocument(@BsonProperty("operationType") final OperationType operationType,
+                                @BsonProperty("resumeToken") final BsonDocument resumeToken,
+                                @Nullable @BsonProperty("ns") final BsonDocument namespaceDocument,
+                                @Nullable @BsonProperty("to") final BsonDocument destinationNamespaceDocument,
+                                @Nullable @BsonProperty("fullDocument") final TDocument fullDocument,
+                                @Nullable @BsonProperty("documentKey") final BsonDocument documentKey,
+                                @Nullable @BsonProperty("clusterTime") final BsonTimestamp clusterTime,
+                                @Nullable @BsonProperty("updateDescription") final UpdateDescription updateDescription) {
+        this(operationType, resumeToken, namespaceDocument, destinationNamespaceDocument, fullDocument, documentKey, clusterTime,
+                updateDescription, null, null);
+    }
+
+    /**
+     * Creates a new instance
+     *
+     * @param operationType the operation type
+     * @param resumeToken the resume token
+     * @param namespaceDocument the BsonDocument representing the namespace
+     * @param destinationNamespaceDocument the BsonDocument representing the destinatation namespace
+     * @param fullDocument the full document
+     * @param documentKey a document containing the _id of the changed document
+     * @param clusterTime the cluster time at which the change occured
+     * @param updateDescription the update description
+     * @param txnNumber the transaction number
+     * @param lsid the identifier for the session associated with the transaction
+     *
+     * @since 3.11
+     */
+    @BsonCreator
+    public ChangeStreamDocument(@BsonProperty("operationType") final OperationType operationType,
+                                @BsonProperty("resumeToken") final BsonDocument resumeToken,
+                                @Nullable @BsonProperty("ns") final BsonDocument namespaceDocument,
+                                @Nullable @BsonProperty("to") final BsonDocument destinationNamespaceDocument,
+                                @Nullable @BsonProperty("fullDocument") final TDocument fullDocument,
+                                @Nullable @BsonProperty("documentKey") final BsonDocument documentKey,
+                                @Nullable @BsonProperty("clusterTime") final BsonTimestamp clusterTime,
+                                @Nullable @BsonProperty("updateDescription") final UpdateDescription updateDescription,
+                                @Nullable @BsonProperty("txnNumber") final BsonInt64 txnNumber,
+                                @Nullable @BsonProperty("lsid") final BsonDocument lsid) {
+        this.resumeToken = resumeToken;
+        this.namespaceDocument = namespaceDocument;
+        this.destinationNamespaceDocument = destinationNamespaceDocument;
+        this.documentKey = documentKey;
+        this.fullDocument = fullDocument;
+        this.clusterTime = clusterTime;
+        this.operationType = operationType;
+        this.updateDescription = updateDescription;
+        this.txnNumber = txnNumber;
+        this.lsid = lsid;
+    }
+
+    private static BsonDocument namespaceToDocument(final MongoNamespace namespace) {
+        Assertions.notNull("namespace", namespace);
+        return new BsonDocument("db", new BsonString(namespace.getDatabaseName()))
+                .append("coll", new BsonString(namespace.getCollectionName()));
+    }
+
+    /**
+     * Returns the resumeToken
+     *
+     * @return the resumeToken
+     */
+    public BsonDocument getResumeToken() {
+        return resumeToken;
+    }
+
+    /**
+     * Returns the namespace, derived from the "ns" field in a change stream document.
+     *
+     * The invalidate operation type does include a MongoNamespace in the ChangeStreamDocument response. The
+     * dropDatabase operation type includes a MongoNamespace, but does not include a collection name as part
+     * of the namespace.
+     *
+     * @return the namespace. If the namespaceDocument is null or if it is missing either the 'db' or 'coll' keys,
+     * then this will return null.
+     */
+    @BsonIgnore
+    @Nullable
+    public MongoNamespace getNamespace() {
+        if (namespaceDocument == null) {
+            return null;
+        }
+        if (!namespaceDocument.containsKey("db") || !namespaceDocument.containsKey("coll")) {
+            return null;
+        }
+
+        return new MongoNamespace(namespaceDocument.getString("db").getValue(), namespaceDocument.getString("coll").getValue());
+    }
+
+    /**
+     * Returns the namespace cocument, derived from the "ns" field in a change stream document.
+     *
+     * The namespace document is a BsonDocument containing the values associated with a MongoNamespace. The
+     * 'db' key refers to the database name and the 'coll' key refers to the collection name.
+     *
+     * @return the namespaceDocument
+     * @since 3.8
+     */
+    @BsonProperty("ns")
+    @Nullable
+    public BsonDocument getNamespaceDocument() {
+        return namespaceDocument;
+    }
+
+    /**
+     * Returns the destination namespace, derived from the "to" field in a change stream document.
+     *
+     * <p>
+     * The destination namespace is used to indicate the destination of a collection rename event.
+     * </p>
+     *
+     * @return the namespace. If the "to" document is null or absent, then this will return null.
+     * @see OperationType#RENAME
+     * @since 3.11
+     */
+    @BsonIgnore
+    @Nullable
+    public MongoNamespace getDestinationNamespace() {
+        if (destinationNamespaceDocument == null) {
+            return null;
+        }
+
+        return new MongoNamespace(destinationNamespaceDocument.getString("db").getValue(),
+                destinationNamespaceDocument.getString("coll").getValue());
+    }
+
+    /**
+     * Returns the destination namespace document, derived from the "to" field in a change stream document.
+     *
+     * <p>
+     * The destination namespace document is a BsonDocument containing the values associated with a MongoNamespace. The
+     * 'db' key refers to the database name and the 'coll' key refers to the collection name.
+     * </p>
+     * @return the destinationNamespaceDocument
+     * @since 3.11
+     */
+    @BsonProperty("to")
+    @Nullable
+    public BsonDocument getDestinationNamespaceDocument() {
+        return destinationNamespaceDocument;
+    }
+
+    /**
+     * Returns the database name
+     *
+     * @return the databaseName. If the namespaceDocument is null or if it is missing the 'db' key, then this will
+     * return null.
+     * @since 3.8
+     */
+    @BsonIgnore
+    @Nullable
+    public String getDatabaseName() {
+        if (namespaceDocument == null) {
+            return null;
+        }
+        if (!namespaceDocument.containsKey("db")) {
+            return null;
+        }
+        return namespaceDocument.getString("db").getValue();
+    }
+
+    /**
+     * Returns the fullDocument
+     *
+     * @return the fullDocument
+     */
+    @Nullable
+    public TDocument getFullDocument() {
+        return fullDocument;
+    }
+
+    /**
+     * Returns a document containing just the _id of the changed document.
+     * <p>
+     * For unsharded collections this contains a single field, _id, with the
+     * value of the _id of the document updated.  For sharded collections,
+     * this will contain all the components of the shard key in order,
+     * followed by the _id if the _id isn’t part of the shard key.
+     * </p>
+     *
+     * @return the document key, or null if the event is not associated with a single document (e.g. a collection rename event)
+     */
+    @Nullable
+    public BsonDocument getDocumentKey() {
+        return documentKey;
+    }
+
+    /**
+     * Gets the cluster time at which the change occurred.
+     *
+     * @return the cluster time at which the change occurred
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    @Nullable
+    public BsonTimestamp getClusterTime() {
+        return clusterTime;
+    }
+
+    /**
+     * Returns the operationType
+     *
+     * @return the operationType
+     */
+    public OperationType getOperationType() {
+        return operationType;
+    }
+
+    /**
+     * Returns the updateDescription
+     *
+     * @return the updateDescription, or null if the event is not associated with a single document (e.g. a collection rename event)
+     */
+    @Nullable
+    public UpdateDescription getUpdateDescription() {
+        return updateDescription;
+    }
+
+    /**
+     * Returns the transaction number
+     *
+     * @return the transaction number, or null if not part of a multi-document transaction
+     * @since 3.11
+     * @mongodb.server.release 4.0
+     */
+    @Nullable
+    public BsonInt64 getTxnNumber() {
+        return txnNumber;
+    }
+
+    /**
+     * Returns the identifier for the session associated with the transaction
+     *
+     * @return the lsid, or null if not part of a multi-document transaction
+     * @since 3.11
+     * @mongodb.server.release 4.0
+     */
+    @Nullable
+    public BsonDocument getLsid() {
+        return lsid;
+    }
+
+    /**
+     * Creates the codec for the specific ChangeStreamOutput type
+     *
+     * @param fullDocumentClass the class to use to represent the fullDocument
+     * @param codecRegistry the codec registry
+     * @param <TFullDocument> the fullDocument type
+     * @return the codec
+     */
+    public static <TFullDocument> Codec<ChangeStreamDocument<TFullDocument>> createCodec(final Class<TFullDocument> fullDocumentClass,
+                                                                                         final CodecRegistry codecRegistry) {
+        return new ChangeStreamDocumentCodec<TFullDocument>(fullDocumentClass, codecRegistry);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ChangeStreamDocument<?> that = (ChangeStreamDocument<?>) o;
+
+        if (resumeToken != null ? !resumeToken.equals(that.resumeToken) : that.resumeToken != null) {
+            return false;
+        }
+        if (namespaceDocument != null ? !namespaceDocument.equals(that.namespaceDocument) : that.namespaceDocument != null) {
+            return false;
+        }
+        if (destinationNamespaceDocument != null
+                ? !destinationNamespaceDocument.equals(that.destinationNamespaceDocument)
+                : that.destinationNamespaceDocument != null) {
+            return false;
+        }
+        if (fullDocument != null ? !fullDocument.equals(that.fullDocument) : that.fullDocument != null) {
+            return false;
+        }
+        if (documentKey != null ? !documentKey.equals(that.documentKey) : that.documentKey != null) {
+            return false;
+        }
+        if (clusterTime != null ? !clusterTime.equals(that.clusterTime) : that.clusterTime != null) {
+            return false;
+        }
+        if (operationType != that.operationType) {
+            return false;
+        }
+        if (updateDescription != null ? !updateDescription.equals(that.updateDescription) : that.updateDescription != null) {
+            return false;
+        }
+        if (txnNumber != null ? !txnNumber.equals(that.txnNumber) : that.txnNumber != null) {
+            return false;
+        }
+        if (lsid != null ? !lsid.equals(that.lsid) : that.lsid != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = resumeToken != null ? resumeToken.hashCode() : 0;
+        result = 31 * result + (namespaceDocument != null ? namespaceDocument.hashCode() : 0);
+        result = 31 * result + (destinationNamespaceDocument != null ? destinationNamespaceDocument.hashCode() : 0);
+        result = 31 * result + (fullDocument != null ? fullDocument.hashCode() : 0);
+        result = 31 * result + (documentKey != null ? documentKey.hashCode() : 0);
+        result = 31 * result + (clusterTime != null ? clusterTime.hashCode() : 0);
+        result = 31 * result + (operationType != null ? operationType.hashCode() : 0);
+        result = 31 * result + (updateDescription != null ? updateDescription.hashCode() : 0);
+        result = 31 * result + (txnNumber != null ? txnNumber.hashCode() : 0);
+        result = 31 * result + (lsid != null ? lsid.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ChangeStreamDocument{"
+                + " operationType=" + operationType
+                + ", resumeToken=" + resumeToken
+                + ", namespace=" + getNamespace()
+                + ", destinationNamespace=" + getDestinationNamespace()
+                + ", fullDocument=" + fullDocument
+                + ", documentKey=" + documentKey
+                + ", clusterTime=" + clusterTime
+                + ", updateDescription=" + updateDescription
+                + ", txnNumber=" + txnNumber
+                + ", lsid=" + lsid
+                + "}";
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamDocumentCodec.java b/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamDocumentCodec.java
new file mode 100644
index 00000000000..7558f07f0bb
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamDocumentCodec.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream;
+
+import com.mongodb.MongoNamespace;
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.ClassModel;
+import org.bson.codecs.pojo.ClassModelBuilder;
+import org.bson.codecs.pojo.PojoCodecProvider;
+import org.bson.codecs.pojo.PropertyModelBuilder;
+
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+
+@SuppressWarnings({"unchecked", "rawtypes"})
+final class ChangeStreamDocumentCodec<TResult> implements Codec<ChangeStreamDocument<TResult>> {
+
+    private static final OperationTypeCodec OPERATION_TYPE_CODEC = new OperationTypeCodec();
+
+    private final Codec<ChangeStreamDocument<TResult>> codec;
+
+    ChangeStreamDocumentCodec(final Class<TResult> fullDocumentClass, final CodecRegistry codecRegistry) {
+
+        ClassModelBuilder<ChangeStreamDocument> classModelBuilder = ClassModel.builder(ChangeStreamDocument.class);
+        ((PropertyModelBuilder<TResult>) classModelBuilder.getProperty("fullDocument")).codec(codecRegistry.get(fullDocumentClass));
+        ((PropertyModelBuilder<OperationType>) classModelBuilder.getProperty("operationType")).codec(OPERATION_TYPE_CODEC);
+        ClassModel<ChangeStreamDocument> changeStreamDocumentClassModel = classModelBuilder.build();
+
+        PojoCodecProvider provider = PojoCodecProvider.builder()
+                .register(MongoNamespace.class)
+                .register(UpdateDescription.class)
+                .register(changeStreamDocumentClassModel)
+                .build();
+
+        CodecRegistry registry = fromRegistries(fromProviders(provider, new BsonValueCodecProvider()), codecRegistry);
+        this.codec = (Codec<ChangeStreamDocument<TResult>>) (Codec<? extends ChangeStreamDocument>)
+                registry.get(ChangeStreamDocument.class);
+    }
+
+    @Override
+    public ChangeStreamDocument<TResult> decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return codec.decode(reader, decoderContext);
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final ChangeStreamDocument<TResult> value, final EncoderContext encoderContext) {
+        codec.encode(writer, value, encoderContext);
+    }
+
+    @Override
+    public Class<ChangeStreamDocument<TResult>> getEncoderClass() {
+        return (Class<ChangeStreamDocument<TResult>>) (Class<? extends ChangeStreamDocument>) ChangeStreamDocument.class;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamLevel.java b/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamLevel.java
new file mode 100644
index 00000000000..22615d9c52d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamLevel.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream;
+
+/**
+ * The level at which the change stream operation operates at.
+ *
+ * @since 3.8
+ * @mongodb.server.release 4.0
+ *
+ */
+@Deprecated
+public enum ChangeStreamLevel {
+    /**
+     * Observing all changes on the Client
+     */
+    CLIENT,
+
+    /**
+     * Observing all changes on a specific database
+     */
+    DATABASE,
+
+    /**
+     * Observing all changes on a specific collection
+     */
+    COLLECTION
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/FullDocument.java b/driver-core/src/main/com/mongodb/client/model/changestream/FullDocument.java
new file mode 100644
index 00000000000..2051476790c
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/FullDocument.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream;
+
+import static java.lang.String.format;
+
+/**
+ *
+ * Change Stream fullDocument configuration.
+ *
+ * <p>Determines what to return for update operations when using a Change Stream. Defaults to {@link FullDocument#DEFAULT}.
+ * When set to {@link FullDocument#UPDATE_LOOKUP}, the change stream for partial updates will include both a delta describing the
+ * changes to the document as well as a copy of the entire document that was changed from <em>some time</em> after the change occurred.</p>
+ *
+ * @since 3.6
+ * @mongodb.server.release 3.6
+ */
+public enum FullDocument {
+
+    /**
+     * Default
+     *
+     * <p>Returns the servers default value in the {@code fullDocument} field.</p>
+     */
+    DEFAULT("default"),
+
+    /**
+     * Lookup
+     *
+     * <p>The change stream for partial updates will include both a delta describing the changes to the document as well as a copy of the
+     * entire document that was changed from <em>some time</em> after the change occurred.</p>
+     */
+    UPDATE_LOOKUP("updateLookup");
+
+    private final String value;
+    FullDocument(final String caseFirst) {
+        this.value = caseFirst;
+    }
+
+    /**
+     * @return the String representation of the collation case first value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Returns the ChangeStreamFullDocument from the string value.
+     *
+     * @param changeStreamFullDocument the string value.
+     * @return the read concern
+     */
+    public static FullDocument fromString(final String changeStreamFullDocument) {
+        if (changeStreamFullDocument != null) {
+            for (FullDocument fullDocument : FullDocument.values()) {
+                if (changeStreamFullDocument.equals(fullDocument.value)) {
+                    return fullDocument;
+                }
+            }
+        }
+        throw new IllegalArgumentException(format("'%s' is not a valid ChangeStreamFullDocument", changeStreamFullDocument));
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/OperationType.java b/driver-core/src/main/com/mongodb/client/model/changestream/OperationType.java
new file mode 100644
index 00000000000..c7ca148e6f9
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/OperationType.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream;
+
+/**
+ * The {@code $changeStream} operation type.
+ *
+ * @since 3.6
+ */
+public enum OperationType {
+
+    /**
+     * The insert operation type
+     */
+    INSERT("insert"),
+
+    /**
+     * The update operation type
+     */
+    UPDATE("update"),
+
+    /**
+     * The replace operation type
+     */
+    REPLACE("replace"),
+
+    /**
+     * The delete operation type
+     */
+    DELETE("delete"),
+
+    /**
+     * The invalidate operation type
+     */
+    INVALIDATE("invalidate"),
+
+    /**
+     * The drop operation type
+     *
+     * @since 3.8.2
+     */
+    DROP("drop"),
+
+    /**
+     * The dropDatabase operation type
+     *
+     * @since 3.8.2
+     */
+    DROP_DATABASE("dropDatabase"),
+
+    /**
+     * The rename operation type for renaming collections
+     *
+     * @since 3.8.2
+     */
+    RENAME("rename"),
+
+    /**
+     * The other operation type.
+     *
+     * <p>A placeholder for newer operation types issued by the server.
+     * Users encountering OTHER operation types are advised to update the driver to get the actual operation type.</p>
+     *
+     * @since 3.8.2
+     */
+    OTHER("other");
+
+    private final String value;
+    OperationType(final String operationTypeName) {
+        this.value = operationTypeName;
+    }
+
+    /**
+     * @return the String representation of the operation type
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Returns the ChangeStreamOperationType from the string value.
+     *
+     * @param operationTypeName the string value.
+     * @return the read concern
+     */
+    public static OperationType fromString(final String operationTypeName) {
+        if (operationTypeName != null) {
+            for (OperationType operationType : OperationType.values()) {
+                if (operationTypeName.equals(operationType.value)) {
+                    return operationType;
+                }
+            }
+        }
+        return OTHER;
+    }
+
+    @Override
+    public String toString() {
+        return "OperationType{"
+                + "value='" + value + "'"
+                + "}";
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/OperationTypeCodec.java b/driver-core/src/main/com/mongodb/client/model/changestream/OperationTypeCodec.java
new file mode 100644
index 00000000000..927ec19b095
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/OperationTypeCodec.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream;
+
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+
+final class OperationTypeCodec implements Codec<OperationType> {
+
+    @Override
+    public OperationType decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return OperationType.fromString(reader.readString());
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final OperationType value, final EncoderContext encoderContext) {
+        writer.writeString(value.getValue());
+    }
+
+    @Override
+    public Class<OperationType> getEncoderClass() {
+        return OperationType.class;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/UpdateDescription.java b/driver-core/src/main/com/mongodb/client/model/changestream/UpdateDescription.java
new file mode 100644
index 00000000000..99b41850185
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/UpdateDescription.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream;
+
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+
+import java.util.List;
+
+/**
+ * The update description for changed fields in a {@code $changeStream} operation.
+ *
+ * @since 3.6
+ */
+public final class UpdateDescription {
+    private final List<String> removedFields;
+    private final BsonDocument updatedFields;
+
+    /**
+     * Creates a new instance
+     *
+     * @param removedFields the list of fields that have been removed.
+     * @param updatedFields the updated fields
+     */
+    @BsonCreator
+    public UpdateDescription(@Nullable @BsonProperty("removedFields") final List<String> removedFields,
+                             @Nullable @BsonProperty("updatedFields") final BsonDocument updatedFields) {
+        this.removedFields = removedFields;
+        this.updatedFields = updatedFields;
+    }
+
+    /**
+     * Returns the removedFields
+     *
+     * @return the removedFields
+     */
+    @Nullable
+    public List<String> getRemovedFields() {
+        return removedFields;
+    }
+
+    /**
+     * Returns the updatedFields
+     *
+     * @return the updatedFields
+     */
+    @Nullable
+    public BsonDocument getUpdatedFields() {
+        return updatedFields;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        UpdateDescription that = (UpdateDescription) o;
+
+        if (removedFields != null ? !removedFields.equals(that.getRemovedFields()) : that.getRemovedFields() != null) {
+            return false;
+        }
+        if (updatedFields != null ? !updatedFields.equals(that.getUpdatedFields()) : that.getUpdatedFields() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = removedFields != null ? removedFields.hashCode() : 0;
+        result = 31 * result + (updatedFields != null ? updatedFields.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "UpdateDescription{"
+                + "removedFields=" + removedFields
+                + ", updatedFields=" + updatedFields
+                + "}";
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/changestream/package-info.java b/driver-core/src/main/com/mongodb/client/model/changestream/package-info.java
new file mode 100644
index 00000000000..cde58eb608f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/changestream/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains classes for the change stream api
+ */
+@NonNullApi
+package com.mongodb.client.model.changestream;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystem.java b/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystem.java
index 4005728f8ff..3e03bd1761c 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystem.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystemType.java b/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystemType.java
index 2404a633cd1..29ab2d8f2d1 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystemType.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/CoordinateReferenceSystemType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/GeoJsonObjectType.java b/driver-core/src/main/com/mongodb/client/model/geojson/GeoJsonObjectType.java
index 1411b514031..d7392f9116d 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/GeoJsonObjectType.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/GeoJsonObjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/Geometry.java b/driver-core/src/main/com/mongodb/client/model/geojson/Geometry.java
index 4162d2c9376..ba4e17e6243 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/Geometry.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/Geometry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.mongodb.client.model.geojson;
 
 import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider;
+import com.mongodb.lang.Nullable;
 import org.bson.codecs.Codec;
 import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistries;
@@ -50,7 +51,7 @@ protected Geometry() {
      *
      * @param coordinateReferenceSystem the coordinate reference system
      */
-    protected Geometry(final CoordinateReferenceSystem coordinateReferenceSystem) {
+    protected Geometry(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem) {
         this.coordinateReferenceSystem = coordinateReferenceSystem;
     }
 
@@ -66,7 +67,7 @@ protected Geometry(final CoordinateReferenceSystem coordinateReferenceSystem) {
      *
      * @return the GeoJSON representation
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings({"unchecked", "rawtypes", "deprecation"})
     public String toJson() {
         StringWriter stringWriter = new StringWriter();
         JsonWriter writer = new JsonWriter(stringWriter, new JsonWriterSettings());
@@ -84,6 +85,7 @@ static CodecRegistry getRegistry() {
      *
      * @return the possibly-null coordinate reference system
      */
+    @Nullable
     public CoordinateReferenceSystem getCoordinateReferenceSystem() {
         return coordinateReferenceSystem;
     }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/GeometryCollection.java b/driver-core/src/main/com/mongodb/client/model/geojson/GeometryCollection.java
index f038a8d3fe4..f688ca03246 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/GeometryCollection.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/GeometryCollection.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,6 +16,8 @@
 
 package com.mongodb.client.model.geojson;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -43,7 +47,7 @@ public GeometryCollection(final List<? extends Geometry> geometries) {
      * @param coordinateReferenceSystem the coordinate reference system
      * @param geometries  the list of Geometry objects
      */
-    public GeometryCollection(final CoordinateReferenceSystem coordinateReferenceSystem,
+    public GeometryCollection(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem,
                               final List<? extends Geometry> geometries) {
         super(coordinateReferenceSystem);
         notNull("geometries", geometries);
@@ -95,9 +99,10 @@ public int hashCode() {
 
     @Override
     public String toString() {
+        CoordinateReferenceSystem coordinateReferenceSystem = getCoordinateReferenceSystem();
         return "GeometryCollection{"
                + "geometries=" + geometries
-               + ((getCoordinateReferenceSystem() == null) ? "" : ", coordinateReferenceSystem=" + getCoordinateReferenceSystem())
+               + ((coordinateReferenceSystem == null) ? "" : ", coordinateReferenceSystem=" + coordinateReferenceSystem)
                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/LineString.java b/driver-core/src/main/com/mongodb/client/model/geojson/LineString.java
index 2afbfd8a85e..cca9bf79ce9 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/LineString.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/LineString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model.geojson;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -46,7 +48,7 @@ public LineString(final List<Position> coordinates) {
      * @param coordinateReferenceSystem the coordinate reference system
      * @param coordinates the coordinates
      */
-    public LineString(final CoordinateReferenceSystem coordinateReferenceSystem,
+    public LineString(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem,
                       final List<Position> coordinates) {
         super(coordinateReferenceSystem);
         notNull("coordinates", coordinates);
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/MultiLineString.java b/driver-core/src/main/com/mongodb/client/model/geojson/MultiLineString.java
index ea4a9049413..6090574a660 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/MultiLineString.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/MultiLineString.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,6 +16,8 @@
 
 package com.mongodb.client.model.geojson;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -44,7 +48,7 @@ public MultiLineString(final List<List<Position>> coordinates) {
      * @param coordinateReferenceSystem the coordinate reference system
      * @param coordinates the coordinates of each line
      */
-    public MultiLineString(final CoordinateReferenceSystem coordinateReferenceSystem, final List<List<Position>> coordinates) {
+    public MultiLineString(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem, final List<List<Position>> coordinates) {
         super(coordinateReferenceSystem);
 
         notNull("coordinates", coordinates);
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/MultiPoint.java b/driver-core/src/main/com/mongodb/client/model/geojson/MultiPoint.java
index da9138ac1dd..dca5b73c8a9 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/MultiPoint.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/MultiPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model.geojson;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -46,7 +48,7 @@ public MultiPoint(final List<Position> coordinates) {
      * @param coordinateReferenceSystem the coordinate reference system
      * @param coordinates               the coordinates
      */
-    public MultiPoint(final CoordinateReferenceSystem coordinateReferenceSystem, final List<Position> coordinates) {
+    public MultiPoint(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem, final List<Position> coordinates) {
         super(coordinateReferenceSystem);
         notNull("coordinates", coordinates);
         isTrueArgument("coordinates contains only non-null positions", !coordinates.contains(null));
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/MultiPolygon.java b/driver-core/src/main/com/mongodb/client/model/geojson/MultiPolygon.java
index 8addc04fbcb..a4a7f9834fc 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/MultiPolygon.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/MultiPolygon.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,6 +16,8 @@
 
 package com.mongodb.client.model.geojson;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -44,7 +48,7 @@ public MultiPolygon(final List<PolygonCoordinates> coordinates) {
      * @param coordinateReferenceSystem the coordinate reference system
      * @param coordinates the coordinates
      */
-    public MultiPolygon(final CoordinateReferenceSystem coordinateReferenceSystem, final List<PolygonCoordinates> coordinates) {
+    public MultiPolygon(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem, final List<PolygonCoordinates> coordinates) {
         super(coordinateReferenceSystem);
         notNull("coordinates", coordinates);
         isTrueArgument("coordinates has no null elements", !coordinates.contains(null));
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/NamedCoordinateReferenceSystem.java b/driver-core/src/main/com/mongodb/client/model/geojson/NamedCoordinateReferenceSystem.java
index 540f3459658..041a409a629 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/NamedCoordinateReferenceSystem.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/NamedCoordinateReferenceSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/Point.java b/driver-core/src/main/com/mongodb/client/model/geojson/Point.java
index a353b90b1f9..8d3e196d18a 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/Point.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/Point.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model.geojson;
 
+import com.mongodb.lang.Nullable;
+
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -41,7 +43,7 @@ public Point(final Position coordinate) {
      * @param coordinateReferenceSystem the coordinate reference system
      * @param coordinate the non-null coordinate of the point
      */
-    public Point(final CoordinateReferenceSystem coordinateReferenceSystem, final Position coordinate) {
+    public Point(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem, final Position coordinate) {
         super(coordinateReferenceSystem);
         this.coordinate = notNull("coordinates", coordinate);
     }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/Polygon.java b/driver-core/src/main/com/mongodb/client/model/geojson/Polygon.java
index 781af27f9fc..f5f77802be0 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/Polygon.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/Polygon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model.geojson;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.List;
 
 import static com.mongodb.assertions.Assertions.notNull;
@@ -54,7 +56,7 @@ public Polygon(final PolygonCoordinates coordinates) {
      * @param coordinateReferenceSystem the coordinate reference system
      * @param coordinates               the coordinates
      */
-    public Polygon(final CoordinateReferenceSystem coordinateReferenceSystem, final PolygonCoordinates coordinates) {
+    public Polygon(@Nullable final CoordinateReferenceSystem coordinateReferenceSystem, final PolygonCoordinates coordinates) {
         super(coordinateReferenceSystem);
         this.coordinates = notNull("coordinates", coordinates);
     }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/PolygonCoordinates.java b/driver-core/src/main/com/mongodb/client/model/geojson/PolygonCoordinates.java
index 6c1eb09b6a8..1c4a08840b7 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/PolygonCoordinates.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/PolygonCoordinates.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/Position.java b/driver-core/src/main/com/mongodb/client/model/geojson/Position.java
index 5bf136d55e5..b66b6001fb6 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/Position.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/Position.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/AbstractGeometryCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/AbstractGeometryCodec.java
new file mode 100644
index 00000000000..553393e2776
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/AbstractGeometryCodec.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs;
+
+import com.mongodb.client.model.geojson.Geometry;
+import org.bson.BsonReader;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import static com.mongodb.client.model.geojson.codecs.GeometryDecoderHelper.decodeGeometry;
+import static com.mongodb.client.model.geojson.codecs.GeometryEncoderHelper.encodeGeometry;
+
+abstract class AbstractGeometryCodec<T extends Geometry> implements Codec<T> {
+    private final CodecRegistry registry;
+    private final Class<T> encoderClass;
+
+    AbstractGeometryCodec(final CodecRegistry registry, final Class<T> encoderClass) {
+        this.registry = registry;
+        this.encoderClass = encoderClass;
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final T value, final EncoderContext encoderContext) {
+        encodeGeometry(writer, value, encoderContext, registry);
+    }
+
+    @Override
+    public T decode(final BsonReader reader, final DecoderContext decoderContext) {
+        return decodeGeometry(reader, getEncoderClass());
+    }
+
+    @Override
+    public Class<T> getEncoderClass() {
+        return encoderClass;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeoJsonCodecProvider.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeoJsonCodecProvider.java
index f553ebd5d4d..2132aede9f1 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeoJsonCodecProvider.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeoJsonCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.model.geojson.codecs;
 
+import com.mongodb.client.model.geojson.Geometry;
 import com.mongodb.client.model.geojson.GeometryCollection;
 import com.mongodb.client.model.geojson.LineString;
 import com.mongodb.client.model.geojson.MultiLineString;
@@ -53,6 +54,8 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
             return (Codec<T>) new GeometryCollectionCodec(registry);
         } else if (clazz.equals(NamedCoordinateReferenceSystem.class)) {
             return (Codec<T>) new NamedCoordinateReferenceSystemCodec();
+        } else if (clazz.equals(Geometry.class)) {
+            return (Codec<T>) new GeometryCodec(registry);
         }
 
         return null;
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodec.java
new file mode 100644
index 00000000000..b2808bcad63
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodec.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs;
+
+import com.mongodb.client.model.geojson.Geometry;
+import org.bson.codecs.configuration.CodecRegistry;
+
+/**
+ * A Codec for a GeoJSON Geometry.
+ *
+ * @since 3.5
+ */
+public final class GeometryCodec extends AbstractGeometryCodec<Geometry> {
+
+    /**
+     * Construct a new instance
+     *
+     * @param registry the CodecRegistry
+     */
+    public GeometryCodec(final CodecRegistry registry) {
+        super(registry, Geometry.class);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodecHelper.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodecHelper.java
deleted file mode 100644
index 47f4adaeac6..00000000000
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCodecHelper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.model.geojson.codecs;
-
-import com.mongodb.client.model.geojson.Geometry;
-import com.mongodb.client.model.geojson.PolygonCoordinates;
-import com.mongodb.client.model.geojson.Position;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.EncoderContext;
-import org.bson.codecs.configuration.CodecRegistry;
-
-import java.util.List;
-
-final class GeometryCodecHelper {
-
-    static void encodeGeometry(final BsonWriter writer, final Geometry geometry, final EncoderContext encoderContext,
-                               final CodecRegistry registry, final Runnable coordinatesEncoder) {
-        writer.writeStartDocument();
-        encodeType(writer, geometry);
-        writer.writeName("coordinates");
-
-        coordinatesEncoder.run();
-
-        encodeCoordinateReferenceSystem(writer, geometry, encoderContext, registry);
-
-        writer.writeEndDocument();
-    }
-
-    static void encodeType(final BsonWriter writer, final Geometry geometry) {
-        writer.writeString("type", geometry.getType().getTypeName());
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    static void encodeCoordinateReferenceSystem(final BsonWriter writer, final Geometry geometry,
-                                                        final EncoderContext encoderContext, final CodecRegistry registry) {
-        if (geometry.getCoordinateReferenceSystem() != null) {
-            writer.writeName("crs");
-            Codec codec = registry.get(geometry.getCoordinateReferenceSystem().getClass());
-            encoderContext.encodeWithChildContext(codec, writer, geometry.getCoordinateReferenceSystem());
-        }
-    }
-
-    static void encodePolygonCoordinates(final BsonWriter writer, final PolygonCoordinates polygonCoordinates) {
-        writer.writeStartArray();
-        encodeLinearRing(polygonCoordinates.getExterior(), writer);
-        for (List<Position> ring : polygonCoordinates.getHoles()) {
-            encodeLinearRing(ring, writer);
-        }
-        writer.writeEndArray();
-    }
-
-    private static void encodeLinearRing(final List<Position> ring, final BsonWriter writer) {
-        writer.writeStartArray();
-        for (Position position : ring) {
-            encodePosition(writer, position);
-        }
-        writer.writeEndArray();
-    }
-
-
-    static void encodePosition(final BsonWriter writer, final Position value) {
-        writer.writeStartArray();
-
-        for (double number : value.getValues()) {
-            writer.writeDouble(number);
-        }
-
-        writer.writeEndArray();
-    }
-
-
-    private GeometryCodecHelper() {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodec.java
index f433aa0bb7c..4ad4fa54aba 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodec.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,26 +16,15 @@
 
 package com.mongodb.client.model.geojson.codecs;
 
-import com.mongodb.client.model.geojson.Geometry;
 import com.mongodb.client.model.geojson.GeometryCollection;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeCoordinateReferenceSystem;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeType;
-
 /**
  * A Codec for a GeoJSON GeometryCollection.
  *
  * @since 3.1
  */
-public class GeometryCollectionCodec implements Codec<GeometryCollection> {
-    private final CodecRegistry registry;
+public class GeometryCollectionCodec extends AbstractGeometryCodec<GeometryCollection> {
 
     /**
      * Constructs an instance.
@@ -41,39 +32,6 @@ public class GeometryCollectionCodec implements Codec<GeometryCollection> {
      * @param registry the registry
      */
     public GeometryCollectionCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final GeometryCollection value, final EncoderContext encoderContext) {
-        writer.writeStartDocument();
-        encodeType(writer, value);
-
-        writer.writeName("geometries");
-
-        writer.writeStartArray();
-        for (Geometry geometry : value.getGeometries()) {
-            encodeGeometry(writer, geometry, encoderContext);
-        }
-        writer.writeEndArray();
-
-        encodeCoordinateReferenceSystem(writer, value, encoderContext, registry);
-        writer.writeEndDocument();
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    private void encodeGeometry(final BsonWriter writer, final Geometry geometry, final EncoderContext encoderContext) {
-        Codec codec = registry.get(geometry.getClass());
-        encoderContext.encodeWithChildContext(codec, writer, geometry);
-    }
-
-    @Override
-    public Class<GeometryCollection> getEncoderClass() {
-        return GeometryCollection.class;
-    }
-
-    @Override
-    public GeometryCollection decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, GeometryCollection.class);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryDecoderHelper.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryDecoderHelper.java
new file mode 100644
index 00000000000..2700f2ce579
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryDecoderHelper.java
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs;
+
+import com.mongodb.client.model.geojson.CoordinateReferenceSystem;
+import com.mongodb.client.model.geojson.Geometry;
+import com.mongodb.client.model.geojson.GeometryCollection;
+import com.mongodb.client.model.geojson.LineString;
+import com.mongodb.client.model.geojson.MultiLineString;
+import com.mongodb.client.model.geojson.MultiPoint;
+import com.mongodb.client.model.geojson.MultiPolygon;
+import com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem;
+import com.mongodb.client.model.geojson.Point;
+import com.mongodb.client.model.geojson.Polygon;
+import com.mongodb.client.model.geojson.PolygonCoordinates;
+import com.mongodb.client.model.geojson.Position;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonReader;
+import org.bson.BsonReaderMark;
+import org.bson.BsonType;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.lang.String.format;
+
+final class GeometryDecoderHelper {
+
+    @SuppressWarnings("unchecked")
+    static <T extends Geometry> T decodeGeometry(final BsonReader reader, final Class<T> clazz) {
+        if (clazz.equals(Point.class)) {
+            return (T) decodePoint(reader);
+        } else if (clazz.equals(MultiPoint.class)) {
+            return (T) decodeMultiPoint(reader);
+        } else if (clazz.equals(Polygon.class)) {
+            return (T) decodePolygon(reader);
+        } else if (clazz.equals(MultiPolygon.class)) {
+            return (T) decodeMultiPolygon(reader);
+        } else if (clazz.equals(LineString.class)) {
+            return (T) decodeLineString(reader);
+        } else if (clazz.equals(MultiLineString.class)) {
+            return (T) decodeMultiLineString(reader);
+        } else if (clazz.equals(GeometryCollection.class)) {
+            return (T) decodeGeometryCollection(reader);
+        } else if (clazz.equals(Geometry.class)) {
+            return (T) decodeGeometry(reader);
+        }
+
+        throw new CodecConfigurationException(format("Unsupported Geometry: %s", clazz));
+    }
+
+    private static Point decodePoint(final BsonReader reader) {
+        String type = null;
+        Position position = null;
+        CoordinateReferenceSystem crs = null;
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+            } else if (key.equals("coordinates")) {
+                position = decodePosition(reader);
+            } else if (key.equals("crs")) {
+                crs = decodeCoordinateReferenceSystem(reader);
+            } else {
+                throw new CodecConfigurationException(format("Unexpected key '%s' found when decoding a GeoJSON point", key));
+            }
+        }
+        reader.readEndDocument();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid Point, document contained no type information.");
+        } else if (!type.equals("Point")) {
+            throw new CodecConfigurationException(format("Invalid Point, found type '%s'.", type));
+        } else if (position == null) {
+            throw new CodecConfigurationException("Invalid Point, missing position coordinates.");
+        }
+        return crs != null ? new Point(crs, position) : new Point(position);
+    }
+
+    private static MultiPoint decodeMultiPoint(final BsonReader reader) {
+        String type = null;
+        List<Position> coordinates = null;
+        CoordinateReferenceSystem crs = null;
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+            } else if (key.equals("coordinates")) {
+                coordinates = decodeCoordinates(reader);
+            } else if (key.equals("crs")) {
+                crs = decodeCoordinateReferenceSystem(reader);
+            } else {
+                throw new CodecConfigurationException(format("Unexpected key '%s' found when decoding a GeoJSON point", key));
+            }
+        }
+        reader.readEndDocument();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid MultiPoint, document contained no type information.");
+        } else if (!type.equals("MultiPoint")) {
+            throw new CodecConfigurationException(format("Invalid MultiPoint, found type '%s'.", type));
+        } else if (coordinates == null) {
+            throw new CodecConfigurationException("Invalid MultiPoint, missing position coordinates.");
+        }
+        return crs != null ? new MultiPoint(crs, coordinates) : new MultiPoint(coordinates);
+    }
+
+    private static Polygon decodePolygon(final BsonReader reader) {
+        String type = null;
+        PolygonCoordinates coordinates = null;
+        CoordinateReferenceSystem crs = null;
+
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+            } else if (key.equals("coordinates")) {
+                coordinates = decodePolygonCoordinates(reader);
+            } else if (key.equals("crs")) {
+                crs = decodeCoordinateReferenceSystem(reader);
+            } else {
+                throw new CodecConfigurationException(format("Unexpected key '%s' found when decoding a GeoJSON Polygon", key));
+            }
+        }
+        reader.readEndDocument();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid Polygon, document contained no type information.");
+        } else if (!type.equals("Polygon")) {
+            throw new CodecConfigurationException(format("Invalid Polygon, found type '%s'.", type));
+        } else if (coordinates == null) {
+            throw new CodecConfigurationException("Invalid Polygon, missing coordinates.");
+        }
+        return crs != null ? new Polygon(crs, coordinates) : new Polygon(coordinates);
+    }
+
+    private static MultiPolygon decodeMultiPolygon(final BsonReader reader) {
+        String type = null;
+        List<PolygonCoordinates> coordinates = null;
+        CoordinateReferenceSystem crs = null;
+
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+            } else if (key.equals("coordinates")) {
+                coordinates = decodeMultiPolygonCoordinates(reader);
+            } else if (key.equals("crs")) {
+                crs = decodeCoordinateReferenceSystem(reader);
+            } else {
+                throw new CodecConfigurationException(format("Unexpected key '%s' found when decoding a GeoJSON Polygon", key));
+            }
+        }
+        reader.readEndDocument();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid MultiPolygon, document contained no type information.");
+        } else if (!type.equals("MultiPolygon")) {
+            throw new CodecConfigurationException(format("Invalid MultiPolygon, found type '%s'.", type));
+        } else if (coordinates == null) {
+            throw new CodecConfigurationException("Invalid MultiPolygon, missing coordinates.");
+        }
+        return crs != null ? new MultiPolygon(crs, coordinates) : new MultiPolygon(coordinates);
+    }
+
+    private static LineString decodeLineString(final BsonReader reader) {
+        String type = null;
+        List<Position> coordinates = null;
+        CoordinateReferenceSystem crs = null;
+
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+            } else if (key.equals("coordinates")) {
+                coordinates = decodeCoordinates(reader);
+            } else if (key.equals("crs")) {
+                crs = decodeCoordinateReferenceSystem(reader);
+            } else {
+                throw new CodecConfigurationException(format("Unexpected key '%s' found when decoding a GeoJSON Polygon", key));
+            }
+        }
+        reader.readEndDocument();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid LineString, document contained no type information.");
+        } else if (!type.equals("LineString")) {
+            throw new CodecConfigurationException(format("Invalid LineString, found type '%s'.", type));
+        } else if (coordinates == null) {
+            throw new CodecConfigurationException("Invalid LineString, missing coordinates.");
+        }
+        return crs != null ? new LineString(crs, coordinates) : new LineString(coordinates);
+    }
+
+    private static MultiLineString decodeMultiLineString(final BsonReader reader) {
+        String type = null;
+        List<List<Position>> coordinates = null;
+        CoordinateReferenceSystem crs = null;
+
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+            } else if (key.equals("coordinates")) {
+                coordinates = decodeMultiCoordinates(reader);
+            } else if (key.equals("crs")) {
+                crs = decodeCoordinateReferenceSystem(reader);
+            } else {
+                throw new CodecConfigurationException(format("Unexpected key '%s' found when decoding a GeoJSON Polygon", key));
+            }
+        }
+        reader.readEndDocument();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid MultiLineString, document contained no type information.");
+        } else if (!type.equals("MultiLineString")) {
+            throw new CodecConfigurationException(format("Invalid MultiLineString, found type '%s'.", type));
+        } else if (coordinates == null) {
+            throw new CodecConfigurationException("Invalid MultiLineString, missing coordinates.");
+        }
+        return crs != null ? new MultiLineString(crs, coordinates) : new MultiLineString(coordinates);
+    }
+
+    private static GeometryCollection decodeGeometryCollection(final BsonReader reader) {
+        String type = null;
+        List<? extends Geometry> geometries = null;
+        CoordinateReferenceSystem crs = null;
+
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+            } else if (key.equals("geometries")) {
+                geometries = decodeGeometries(reader);
+            } else if (key.equals("crs")) {
+                crs = decodeCoordinateReferenceSystem(reader);
+            } else {
+                throw new CodecConfigurationException(format("Unexpected key '%s' found when decoding a GeoJSON Polygon", key));
+            }
+        }
+        reader.readEndDocument();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid GeometryCollection, document contained no type information.");
+        } else if (!type.equals("GeometryCollection")) {
+            throw new CodecConfigurationException(format("Invalid GeometryCollection, found type '%s'.", type));
+        } else if (geometries == null) {
+            throw new CodecConfigurationException("Invalid GeometryCollection, missing geometries.");
+        }
+        return crs != null ? new GeometryCollection(crs, geometries) : new GeometryCollection(geometries);
+    }
+
+    private static List<? extends Geometry> decodeGeometries(final BsonReader reader) {
+        validateIsArray(reader);
+        reader.readStartArray();
+        List<Geometry> values = new ArrayList<Geometry>();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            Geometry geometry = decodeGeometry(reader);
+            values.add(geometry);
+        }
+        reader.readEndArray();
+
+
+        return values;
+    }
+
+    private static Geometry decodeGeometry(final BsonReader reader) {
+        String type = null;
+        BsonReaderMark mark = reader.getMark();
+        validateIsDocument(reader);
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String key = reader.readName();
+            if (key.equals("type")) {
+                type = reader.readString();
+                break;
+            } else {
+                reader.skipValue();
+            }
+        }
+        mark.reset();
+
+        if (type == null) {
+            throw new CodecConfigurationException("Invalid Geometry item, document contained no type information.");
+        }
+        Geometry geometry = null;
+        if (type.equals("Point")) {
+            geometry = decodePoint(reader);
+        } else if (type.equals("MultiPoint")) {
+            geometry = decodeMultiPoint(reader);
+        } else if (type.equals("Polygon")) {
+            geometry = decodePolygon(reader);
+        } else if (type.equals("MultiPolygon")) {
+            geometry = decodeMultiPolygon(reader);
+        } else if (type.equals("LineString")) {
+            geometry = decodeLineString(reader);
+        } else if (type.equals("MultiLineString")) {
+            geometry = decodeMultiLineString(reader);
+        } else if (type.equals("GeometryCollection")) {
+            geometry = decodeGeometryCollection(reader);
+        } else {
+            throw new CodecConfigurationException(format("Invalid Geometry item, found type '%s'.", type));
+        }
+        return geometry;
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    private static PolygonCoordinates decodePolygonCoordinates(final BsonReader reader) {
+        validateIsArray(reader);
+        reader.readStartArray();
+        List<List<Position>> values = new ArrayList<List<Position>>();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            values.add(decodeCoordinates(reader));
+        }
+        reader.readEndArray();
+
+        if (values.isEmpty()) {
+            throw new CodecConfigurationException("Invalid Polygon no coordinates.");
+        }
+
+        List<Position> exterior = values.remove(0);
+        ArrayList[] holes = values.toArray(new ArrayList[values.size()]);
+
+        try {
+            return new PolygonCoordinates(exterior, holes);
+        } catch (IllegalArgumentException e) {
+            throw new CodecConfigurationException(format("Invalid Polygon: %s", e.getMessage()));
+        }
+    }
+
+    private static List<PolygonCoordinates> decodeMultiPolygonCoordinates(final BsonReader reader) {
+        validateIsArray(reader);
+        reader.readStartArray();
+        List<PolygonCoordinates> values = new ArrayList<PolygonCoordinates>();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            values.add(decodePolygonCoordinates(reader));
+        }
+        reader.readEndArray();
+
+        if (values.isEmpty()) {
+            throw new CodecConfigurationException("Invalid MultiPolygon no coordinates.");
+        }
+        return values;
+    }
+
+    private static List<Position> decodeCoordinates(final BsonReader reader) {
+        validateIsArray(reader);
+        reader.readStartArray();
+        List<Position> values = new ArrayList<Position>();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            values.add(decodePosition(reader));
+        }
+        reader.readEndArray();
+        return values;
+    }
+
+    private static List<List<Position>> decodeMultiCoordinates(final BsonReader reader) {
+        validateIsArray(reader);
+        reader.readStartArray();
+        List<List<Position>> values = new ArrayList<List<Position>>();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            values.add(decodeCoordinates(reader));
+        }
+        reader.readEndArray();
+        return values;
+    }
+
+    private static Position decodePosition(final BsonReader reader) {
+        validateIsArray(reader);
+        reader.readStartArray();
+        List<Double> values = new ArrayList<Double>();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            if (reader.getCurrentBsonType() != BsonType.DOUBLE) {
+                throw new CodecConfigurationException("Invalid position");
+            }
+            values.add(reader.readDouble());
+        }
+        reader.readEndArray();
+
+        try {
+            return new Position(values);
+        } catch (IllegalArgumentException e) {
+            throw new CodecConfigurationException(format("Invalid Position: %s", e.getMessage()));
+        }
+    }
+
+    @Nullable
+    static CoordinateReferenceSystem decodeCoordinateReferenceSystem(final BsonReader reader) {
+        String crsName = null;
+        validateIsDocument(reader);
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String name = reader.readName();
+            if (name.equals("type")) {
+                String type = reader.readString();
+                if (!type.equals("name")) {
+                    throw new CodecConfigurationException(format("Unsupported CoordinateReferenceSystem '%s'.", type));
+                }
+            } else if (name.equals("properties")) {
+                crsName = decodeCoordinateReferenceSystemProperties(reader);
+            } else {
+                throw new CodecConfigurationException(format("Found invalid key '%s' in the CoordinateReferenceSystem.", name));
+            }
+        }
+        reader.readEndDocument();
+
+        return crsName != null ? new NamedCoordinateReferenceSystem(crsName) : null;
+    }
+
+    private static String decodeCoordinateReferenceSystemProperties(final BsonReader reader) {
+        String crsName = null;
+        validateIsDocument(reader);
+        reader.readStartDocument();
+        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            String name = reader.readName();
+            if (name.equals("name")) {
+                crsName = reader.readString();
+            } else {
+                throw new CodecConfigurationException(format("Found invalid key '%s' in the CoordinateReferenceSystem.", name));
+            }
+        }
+        reader.readEndDocument();
+
+        if (crsName == null) {
+            throw new CodecConfigurationException("Found invalid properties in the CoordinateReferenceSystem.");
+        }
+        return crsName;
+    }
+
+    private static void validateIsDocument(final BsonReader reader) {
+        BsonType currentType = reader.getCurrentBsonType();
+        if (currentType == null) {
+            currentType = reader.readBsonType();
+        }
+        if (!currentType.equals(BsonType.DOCUMENT)) {
+            throw new CodecConfigurationException("Invalid BsonType expecting a Document");
+        }
+    }
+
+    private static void validateIsArray(final BsonReader reader) {
+        if (reader.getCurrentBsonType() != BsonType.ARRAY) {
+            throw new CodecConfigurationException("Invalid BsonType expecting an Array");
+        }
+    }
+
+    private GeometryDecoderHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryEncoderHelper.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryEncoderHelper.java
new file mode 100644
index 00000000000..7a81db866a4
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/GeometryEncoderHelper.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs;
+
+import com.mongodb.client.model.geojson.CoordinateReferenceSystem;
+import com.mongodb.client.model.geojson.Geometry;
+import com.mongodb.client.model.geojson.GeometryCollection;
+import com.mongodb.client.model.geojson.LineString;
+import com.mongodb.client.model.geojson.MultiLineString;
+import com.mongodb.client.model.geojson.MultiPoint;
+import com.mongodb.client.model.geojson.MultiPolygon;
+import com.mongodb.client.model.geojson.Point;
+import com.mongodb.client.model.geojson.Polygon;
+import com.mongodb.client.model.geojson.PolygonCoordinates;
+import com.mongodb.client.model.geojson.Position;
+import org.bson.BsonWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.List;
+
+import static java.lang.String.format;
+
+final class GeometryEncoderHelper {
+
+
+    @SuppressWarnings("unchecked")
+    static void encodeGeometry(final BsonWriter writer, final Geometry value, final EncoderContext encoderContext,
+                               final CodecRegistry registry) {
+
+        writer.writeStartDocument();
+        writer.writeString("type", value.getType().getTypeName());
+
+        if (value instanceof GeometryCollection) {
+            writer.writeName("geometries");
+            encodeGeometryCollection(writer, (GeometryCollection) value, encoderContext, registry);
+        } else {
+            writer.writeName("coordinates");
+            if (value instanceof Point) {
+                encodePoint(writer, (Point) value);
+            } else if (value instanceof MultiPoint) {
+                encodeMultiPoint(writer, (MultiPoint) value);
+            } else if (value instanceof Polygon) {
+                encodePolygon(writer, (Polygon) value);
+            } else if (value instanceof MultiPolygon) {
+                encodeMultiPolygon(writer, (MultiPolygon) value);
+            } else if (value instanceof LineString) {
+                encodeLineString(writer, (LineString) value);
+            } else if (value instanceof MultiLineString) {
+                encodeMultiLineString(writer, (MultiLineString) value);
+            } else {
+                throw new CodecConfigurationException(format("Unsupported Geometry: %s", value));
+            }
+        }
+
+        encodeCoordinateReferenceSystem(writer, value, encoderContext, registry);
+        writer.writeEndDocument();
+    }
+
+    private static void encodePoint(final BsonWriter writer, final Point value) {
+        encodePosition(writer, value.getPosition());
+    }
+
+    private static void encodeMultiPoint(final BsonWriter writer, final MultiPoint value) {
+        writer.writeStartArray();
+        for (Position position : value.getCoordinates()) {
+            encodePosition(writer, position);
+        }
+        writer.writeEndArray();
+    }
+
+    private static void encodePolygon(final BsonWriter writer, final Polygon value) {
+        encodePolygonCoordinates(writer, value.getCoordinates());
+    }
+
+    private static void encodeMultiPolygon(final BsonWriter writer, final MultiPolygon value) {
+        writer.writeStartArray();
+        for (PolygonCoordinates polygonCoordinates : value.getCoordinates()) {
+            encodePolygonCoordinates(writer, polygonCoordinates);
+        }
+        writer.writeEndArray();
+    }
+
+    private static void encodeLineString(final BsonWriter writer, final LineString value) {
+        writer.writeStartArray();
+        for (Position position : value.getCoordinates()) {
+            encodePosition(writer, position);
+        }
+        writer.writeEndArray();
+    }
+
+    private static void encodeMultiLineString(final BsonWriter writer, final MultiLineString value) {
+        writer.writeStartArray();
+        for (List<Position> ring : value.getCoordinates()) {
+            writer.writeStartArray();
+            for (Position position : ring) {
+                encodePosition(writer, position);
+            }
+            writer.writeEndArray();
+        }
+        writer.writeEndArray();
+    }
+
+    private static void encodeGeometryCollection(final BsonWriter writer, final GeometryCollection value,
+                                                 final EncoderContext encoderContext, final CodecRegistry registry) {
+        writer.writeStartArray();
+        for (Geometry geometry : value.getGeometries()) {
+            encodeGeometry(writer, geometry, encoderContext, registry);
+        }
+        writer.writeEndArray();
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    static void encodeCoordinateReferenceSystem(final BsonWriter writer, final Geometry geometry,
+                                                final EncoderContext encoderContext, final CodecRegistry registry) {
+        CoordinateReferenceSystem coordinateReferenceSystem = geometry.getCoordinateReferenceSystem();
+        if (coordinateReferenceSystem != null) {
+            writer.writeName("crs");
+            Codec codec = registry.get(coordinateReferenceSystem.getClass());
+            encoderContext.encodeWithChildContext(codec, writer, coordinateReferenceSystem);
+        }
+    }
+
+    static void encodePolygonCoordinates(final BsonWriter writer, final PolygonCoordinates polygonCoordinates) {
+        writer.writeStartArray();
+        encodeLinearRing(polygonCoordinates.getExterior(), writer);
+        for (List<Position> ring : polygonCoordinates.getHoles()) {
+            encodeLinearRing(ring, writer);
+        }
+        writer.writeEndArray();
+    }
+
+    private static void encodeLinearRing(final List<Position> ring, final BsonWriter writer) {
+        writer.writeStartArray();
+        for (Position position : ring) {
+            encodePosition(writer, position);
+        }
+        writer.writeEndArray();
+    }
+
+    static void encodePosition(final BsonWriter writer, final Position value) {
+        writer.writeStartArray();
+
+        for (double number : value.getValues()) {
+            writer.writeDouble(number);
+        }
+
+        writer.writeEndArray();
+    }
+
+    private GeometryEncoderHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/LineStringCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/LineStringCodec.java
index d1efd36d209..e7a9dbb5ae6 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/LineStringCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/LineStringCodec.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,57 +17,20 @@
 package com.mongodb.client.model.geojson.codecs;
 
 import com.mongodb.client.model.geojson.LineString;
-import com.mongodb.client.model.geojson.Position;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeGeometry;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodePosition;
-
 /**
  * A Codec for a GeoJSON LineString.
  *
  * @since 3.1
  */
-public class LineStringCodec implements Codec<LineString> {
-    private final CodecRegistry registry;
+public class LineStringCodec extends AbstractGeometryCodec<LineString> {
 
     /**
-     * Constructs an instance.
-     *
-     * @param registry the registry
+     * Construct a new instance
+     * @param registry the CodecRegistry
      */
     public LineStringCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final LineString value, final EncoderContext encoderContext) {
-        encodeGeometry(writer, value, encoderContext, registry, new Runnable() {
-            @Override
-            @SuppressWarnings({"unchecked", "rawtypes"})
-            public void run() {
-                writer.writeStartArray();
-                for (Position position : value.getCoordinates()) {
-                    encodePosition(writer, position);
-                }
-                writer.writeEndArray();
-            }
-        });
-    }
-
-    @Override
-    public Class<LineString> getEncoderClass() {
-        return LineString.class;
-    }
-
-    @Override
-    public LineString decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, LineString.class);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiLineStringCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiLineStringCodec.java
index 1b7f27cf83a..140783a9410 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiLineStringCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiLineStringCodec.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,27 +17,14 @@
 package com.mongodb.client.model.geojson.codecs;
 
 import com.mongodb.client.model.geojson.MultiLineString;
-import com.mongodb.client.model.geojson.Position;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeGeometry;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodePosition;
-
 /**
  * A Codec for a GeoJSON MultiLineString.
  *
  * @since 3.1
  */
-public class MultiLineStringCodec implements Codec<MultiLineString> {
-    private final CodecRegistry registry;
+public class MultiLineStringCodec extends AbstractGeometryCodec<MultiLineString> {
 
     /**
      * Constructs an instance.
@@ -43,35 +32,6 @@ public class MultiLineStringCodec implements Codec<MultiLineString> {
      * @param registry the registry
      */
     public MultiLineStringCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final MultiLineString value, final EncoderContext encoderContext) {
-        encodeGeometry(writer, value, encoderContext, registry, new Runnable() {
-            @Override
-            @SuppressWarnings({"unchecked", "rawtypes"})
-            public void run() {
-                writer.writeStartArray();
-                for (List<Position> ring : value.getCoordinates()) {
-                    writer.writeStartArray();
-                    for (Position position : ring) {
-                        encodePosition(writer, position);
-                    }
-                    writer.writeEndArray();
-                }
-                writer.writeEndArray();
-            }
-        });
-    }
-
-    @Override
-    public Class<MultiLineString> getEncoderClass() {
-        return MultiLineString.class;
-    }
-
-    @Override
-    public MultiLineString decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, MultiLineString.class);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPointCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPointCodec.java
index 04d634ef5f4..2bd24d43e75 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPointCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPointCodec.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,25 +17,14 @@
 package com.mongodb.client.model.geojson.codecs;
 
 import com.mongodb.client.model.geojson.MultiPoint;
-import com.mongodb.client.model.geojson.Position;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeGeometry;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodePosition;
-
 /**
  * A Codec for a GeoJSON MultiPoint.
  *
  * @since 3.1
  */
-public class MultiPointCodec implements Codec<MultiPoint> {
-    private final CodecRegistry registry;
+public class MultiPointCodec extends AbstractGeometryCodec<MultiPoint> {
 
     /**
      * Constructs an instance.
@@ -41,31 +32,6 @@ public class MultiPointCodec implements Codec<MultiPoint> {
      * @param registry the registry
      */
     public MultiPointCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final MultiPoint value, final EncoderContext encoderContext) {
-        encodeGeometry(writer, value, encoderContext, registry, new Runnable() {
-            @Override
-            @SuppressWarnings({"unchecked", "rawtypes"})
-            public void run() {
-                writer.writeStartArray();
-                for (Position position : value.getCoordinates()) {
-                    encodePosition(writer, position);
-                }
-                writer.writeEndArray();
-            }
-        });
-    }
-
-    @Override
-    public Class<MultiPoint> getEncoderClass() {
-        return MultiPoint.class;
-    }
-
-    @Override
-    public MultiPoint decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, MultiPoint.class);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPolygonCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPolygonCodec.java
index 0c0f697310b..c43a4938421 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPolygonCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/MultiPolygonCodec.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,25 +17,14 @@
 package com.mongodb.client.model.geojson.codecs;
 
 import com.mongodb.client.model.geojson.MultiPolygon;
-import com.mongodb.client.model.geojson.PolygonCoordinates;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeGeometry;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodePolygonCoordinates;
-
 /**
  * A Codec for a GeoJSON MultiPolygon.
  *
  * @since 3.1
  */
-public class MultiPolygonCodec implements Codec<MultiPolygon> {
-    private final CodecRegistry registry;
+public class MultiPolygonCodec extends AbstractGeometryCodec<MultiPolygon> {
 
     /**
      * Constructs an instance.
@@ -41,31 +32,6 @@ public class MultiPolygonCodec implements Codec<MultiPolygon> {
      * @param registry the registry
      */
     public MultiPolygonCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final MultiPolygon value, final EncoderContext encoderContext) {
-        encodeGeometry(writer, value, encoderContext, registry, new Runnable() {
-            @Override
-            @SuppressWarnings({"unchecked", "rawtypes"})
-            public void run() {
-                writer.writeStartArray();
-                for (PolygonCoordinates polygonCoordinates : value.getCoordinates()) {
-                    encodePolygonCoordinates(writer, polygonCoordinates);
-                }
-                writer.writeEndArray();
-            }
-        });
-    }
-
-    @Override
-    public Class<MultiPolygon> getEncoderClass() {
-        return MultiPolygon.class;
-    }
-
-    @Override
-    public MultiPolygon decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, MultiPolygon.class);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/NamedCoordinateReferenceSystemCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/NamedCoordinateReferenceSystemCodec.java
index 5a11392a5a1..e3c8d387385 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/NamedCoordinateReferenceSystemCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/NamedCoordinateReferenceSystemCodec.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,12 +16,16 @@
 
 package com.mongodb.client.model.geojson.codecs;
 
+import com.mongodb.client.model.geojson.CoordinateReferenceSystem;
 import com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem;
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
 import org.bson.codecs.Codec;
 import org.bson.codecs.DecoderContext;
 import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+
+import static com.mongodb.client.model.geojson.codecs.GeometryDecoderHelper.decodeCoordinateReferenceSystem;
 
 /**
  * Codec for a GeoJson Coordinate Reference System of type name.
@@ -47,6 +53,10 @@ public Class<NamedCoordinateReferenceSystem> getEncoderClass() {
 
     @Override
     public NamedCoordinateReferenceSystem decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        CoordinateReferenceSystem crs = decodeCoordinateReferenceSystem(reader);
+        if (crs == null || !(crs instanceof NamedCoordinateReferenceSystem)) {
+            throw new CodecConfigurationException("Invalid NamedCoordinateReferenceSystem.");
+        }
+        return (NamedCoordinateReferenceSystem) crs;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PointCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PointCodec.java
index ab5524d73d3..4fe9ec345b6 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PointCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PointCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,52 +17,21 @@
 package com.mongodb.client.model.geojson.codecs;
 
 import com.mongodb.client.model.geojson.Point;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeGeometry;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodePosition;
-
 /**
  * A Codec for a GeoJSON point.
  *
  * @since 3.1
  */
-public class PointCodec implements Codec<Point> {
-    private final CodecRegistry registry;
+public class PointCodec extends AbstractGeometryCodec<Point> {
 
     /**
-     * Constructs a new instance.
+     * Constructs an instance.
      *
      * @param registry the registry
      */
     public PointCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final Point value, final EncoderContext encoderContext) {
-        encodeGeometry(writer, value, encoderContext, registry, new Runnable() {
-            @Override
-            @SuppressWarnings({"unchecked", "rawtypes"})
-            public void run() {
-                encodePosition(writer, value.getPosition());
-            }
-        });
-    }
-
-    @Override
-    public Class<Point> getEncoderClass() {
-        return Point.class;
-    }
-
-    @Override
-    public Point decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, Point.class);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PolygonCodec.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PolygonCodec.java
index 5ebf02a3851..a0b98d086cc 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PolygonCodec.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/PolygonCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,24 +17,14 @@
 package com.mongodb.client.model.geojson.codecs;
 
 import com.mongodb.client.model.geojson.Polygon;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodeGeometry;
-import static com.mongodb.client.model.geojson.codecs.GeometryCodecHelper.encodePolygonCoordinates;
-
 /**
  * A Codec for a GeoJSON polygon.
  *
  * @since 3.1
  */
-public class PolygonCodec implements Codec<Polygon> {
-    private final CodecRegistry registry;
+public class PolygonCodec extends AbstractGeometryCodec<Polygon> {
 
     /**
      * Constructs an instance.
@@ -42,27 +32,6 @@ public class PolygonCodec implements Codec<Polygon> {
      * @param registry the registry
      */
     public PolygonCodec(final CodecRegistry registry) {
-        this.registry = notNull("registry", registry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final Polygon value, final EncoderContext encoderContext) {
-        encodeGeometry(writer, value, encoderContext, registry, new Runnable() {
-            @Override
-            @SuppressWarnings({"unchecked", "rawtypes"})
-            public void run() {
-                encodePolygonCoordinates(writer, value.getCoordinates());
-            }
-        });
-    }
-
-    @Override
-    public Class<Polygon> getEncoderClass() {
-        return Polygon.class;
-    }
-
-    @Override
-    public Polygon decode(final BsonReader reader, final DecoderContext decoderContext) {
-        throw new UnsupportedOperationException("Not implemented yet!");
+        super(registry, Polygon.class);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/package-info.java b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/package-info.java
index 01a1bcefbab..b640ba2d9eb 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/codecs/package-info.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/codecs/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,4 +17,7 @@
 /**
  * This package contains classes that encode and decode GeoJSON objects.
  */
+@NonNullApi
 package com.mongodb.client.model.geojson.codecs;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/client/model/geojson/package-info.java b/driver-core/src/main/com/mongodb/client/model/geojson/package-info.java
index 4aa57016d97..7fa17603e82 100644
--- a/driver-core/src/main/com/mongodb/client/model/geojson/package-info.java
+++ b/driver-core/src/main/com/mongodb/client/model/geojson/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,4 +17,7 @@
 /**
  * This package contains classes that represent GeoJSON objects.
  */
+@NonNullApi
 package com.mongodb.client.model.geojson;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/client/model/package-info.java b/driver-core/src/main/com/mongodb/client/model/package-info.java
index 0579523db81..5434fa8d4b9 100644
--- a/driver-core/src/main/com/mongodb/client/model/package-info.java
+++ b/driver-core/src/main/com/mongodb/client/model/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,4 +17,7 @@
 /**
  * This package contains models and options that help describe MongoCollection operations
  */
+@NonNullApi
 package com.mongodb.client.model;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/client/model/vault/DataKeyOptions.java b/driver-core/src/main/com/mongodb/client/model/vault/DataKeyOptions.java
new file mode 100644
index 00000000000..725b348d185
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/vault/DataKeyOptions.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.vault;
+
+import org.bson.BsonDocument;
+
+import java.util.List;
+
+/**
+ * The options for creating a data key.
+ *
+ * @since 3.11
+ */
+public class DataKeyOptions {
+    private List<String> keyAltNames;
+    private BsonDocument masterKey;
+
+    /**
+     * Set the alternate key names.
+     *
+     * @param keyAltNames a list of alternate key names
+     * @return this
+     * @see #getKeyAltNames()
+     */
+    public DataKeyOptions keyAltNames(final List<String> keyAltNames) {
+        this.keyAltNames = keyAltNames;
+        return this;
+    }
+
+    /**
+     * Sets the master key document.
+     *
+     * @param masterKey the master key document
+     * @return this
+     * @see #getMasterKey()
+     */
+    public DataKeyOptions masterKey(final BsonDocument masterKey) {
+        this.masterKey = masterKey;
+        return this;
+    }
+
+    /**
+     * Gets the alternate key names.
+     *
+     * <p>
+     * An optional list of alternate names used to reference a key. If a key is created with alternate names, then encryption may refer
+     * to the key by the unique alternate name instead of by _id.
+     * </p>
+     *
+     * @return the list of alternate key names
+     */
+    public List<String> getKeyAltNames() {
+        return keyAltNames;
+    }
+
+    /**
+     * Gets the master key document
+     *
+     * <p>
+     * The masterKey identifies a KMS-specific key used to encrypt the new data key. If the kmsProvider is "aws" it is required and
+     * must have the following fields:
+     * </p>
+     * <ul>
+     *   <li>region: a String containing the AWS region in which to locate the master key</li>
+     *   <li>key: a String containing the Amazon Resource Name (ARN) to the AWS customer master key</li>
+     * </ul>
+     * <p>
+     * If the kmsProvider is "local" the masterKey is not applicable.
+     * </p>
+     * @return the master key document
+     */
+    public BsonDocument getMasterKey() {
+        return masterKey;
+    }
+
+    @Override
+    public String toString() {
+        return "DataKeyOptions{"
+                + "keyAltNames=" + keyAltNames
+                + ", masterKey=" + masterKey
+                + '}';
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java b/driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java
new file mode 100644
index 00000000000..2509d67dc12
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/vault/EncryptOptions.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.vault;
+
+import org.bson.BsonBinary;
+
+/**
+ * The options for explicit encryption.
+ *
+ * @since 3.11
+ */
+public class EncryptOptions {
+    private BsonBinary keyId;
+    private String keyAltName;
+    private final String algorithm;
+
+    /**
+     * Construct an instance with the given algorithm.
+     *
+     * @param algorithm the encryption algorithm
+     * @see #getAlgorithm()
+     */
+    public EncryptOptions(final String algorithm) {
+        this.algorithm = algorithm;
+    }
+
+    /**
+     * Gets the encryption algorithm, which must be either "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic" or
+     * "AEAD_AES_256_CBC_HMAC_SHA_512-Random".
+     *
+     * @return the encryption algorithm
+     */
+    public String getAlgorithm() {
+        return algorithm;
+    }
+
+    /**
+     * Gets the key identifier.
+     *
+     * <p>
+     * Identifies the data key by its _id value. The value is a UUID (binary subtype 4).
+     * </p>
+     *
+     * @return the key identifier
+     */
+    public BsonBinary getKeyId() {
+        return keyId;
+    }
+
+    /**
+     * Gets the alternate name with which to look up the key.
+     *
+     * <p>
+     * Identifies the alternate key name to look up the key by.
+     * </p>
+     *
+     * @return the alternate name
+     */
+    public String getKeyAltName() {
+        return keyAltName;
+    }
+
+    /**
+     * Sets the key identifier
+     *
+     * @param keyId the key identifier
+     * @return this
+     * @see #getKeyId()
+     */
+    public EncryptOptions keyId(final BsonBinary keyId) {
+        this.keyId = keyId;
+        return this;
+    }
+
+    /**
+     * Sets the alternate key name
+     *
+     * @param keyAltName the alternate key name
+     * @return this
+     * @see #getKeyAltName()
+     */
+    public EncryptOptions keyAltName(final String keyAltName) {
+        this.keyAltName = keyAltName;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "EncryptOptions{"
+                + "keyId=" + keyId
+                + ", keyAltName=" + keyAltName
+                + ", algorithm='" + algorithm + "'}";
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/client/model/vault/package-info.java b/driver-core/src/main/com/mongodb/client/model/vault/package-info.java
new file mode 100644
index 00000000000..9bc4adc14e8
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/client/model/vault/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains options classes for the key vault API
+ *
+ * @since 3.11
+ */
+@NonNullApi
+package com.mongodb.client.model.vault;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/client/package-info.java b/driver-core/src/main/com/mongodb/client/package-info.java
deleted file mode 100644
index c9be33605c2..00000000000
--- a/driver-core/src/main/com/mongodb/client/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains classes for the new client api for MongoDatabase and MongoCollection
- */
-package com.mongodb.client;
diff --git a/driver-core/src/main/com/mongodb/client/result/DeleteResult.java b/driver-core/src/main/com/mongodb/client/result/DeleteResult.java
index abfe5369236..103d624a8b7 100644
--- a/driver-core/src/main/com/mongodb/client/result/DeleteResult.java
+++ b/driver-core/src/main/com/mongodb/client/result/DeleteResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ public static DeleteResult unacknowledged() {
     private static class AcknowledgedDeleteResult extends DeleteResult {
         private final long deletedCount;
 
-        public AcknowledgedDeleteResult(final long deletedCount) {
+        AcknowledgedDeleteResult(final long deletedCount) {
             this.deletedCount = deletedCount;
         }
 
diff --git a/driver-core/src/main/com/mongodb/client/result/UpdateResult.java b/driver-core/src/main/com/mongodb/client/result/UpdateResult.java
index c38eb703751..d95981b010c 100644
--- a/driver-core/src/main/com/mongodb/client/result/UpdateResult.java
+++ b/driver-core/src/main/com/mongodb/client/result/UpdateResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client.result;
 
+import com.mongodb.lang.Nullable;
 import org.bson.BsonValue;
 
 /**
@@ -44,10 +45,12 @@ public abstract class UpdateResult {
     /**
      * Gets a value indicating whether the modified count is available.
      * <p>
-     * The modified count is only available when all servers have been upgraded to 2.6 or above.
+     * This method now always returns true, as modified count is available since MongoDB 2.6.
      * </p>
      * @return true if the modified count is available
+     * @deprecated no longer needed since all supported server versions support modified count
      */
+    @Deprecated
     public abstract boolean isModifiedCountAvailable();
 
     /**
@@ -62,6 +65,7 @@ public abstract class UpdateResult {
      *
      * @return if the replace resulted in an inserted document, the _id of the inserted document, otherwise null
      */
+    @Nullable
     public abstract BsonValue getUpsertedId();
 
     /**
@@ -72,7 +76,8 @@ public abstract class UpdateResult {
      * @param upsertedId    if the replace resulted in an inserted document, the id of the inserted document
      * @return an acknowledged UpdateResult
      */
-    public static UpdateResult acknowledged(final long matchedCount, final Long modifiedCount, final BsonValue upsertedId) {
+    public static UpdateResult acknowledged(final long matchedCount, @Nullable final Long modifiedCount,
+                                            @Nullable final BsonValue upsertedId) {
         return new AcknowledgedUpdateResult(matchedCount, modifiedCount, upsertedId);
     }
 
@@ -90,7 +95,7 @@ private static class AcknowledgedUpdateResult extends UpdateResult {
         private final Long modifiedCount;
         private final BsonValue upsertedId;
 
-        public AcknowledgedUpdateResult(final long matchedCount, final Long modifiedCount, final BsonValue upsertedId) {
+        AcknowledgedUpdateResult(final long matchedCount, final Long modifiedCount, @Nullable final BsonValue upsertedId) {
             this.matchedCount = matchedCount;
             this.modifiedCount = modifiedCount;
             this.upsertedId = upsertedId;
@@ -107,20 +112,18 @@ public long getMatchedCount() {
         }
 
         @Override
+        @Deprecated
         public boolean isModifiedCountAvailable() {
-            return modifiedCount != null;
+            return true;
         }
 
         @Override
         public long getModifiedCount() {
-            if (modifiedCount == null) {
-                throw new UnsupportedOperationException("Modified count is only available when connected to MongoDB 2.6 servers or "
-                                                        + "above.");
-            }
             return modifiedCount;
         }
 
         @Override
+        @Nullable
         public BsonValue getUpsertedId() {
             return upsertedId;
         }
@@ -179,6 +182,7 @@ public long getMatchedCount() {
         }
 
         @Override
+        @Deprecated
         public boolean isModifiedCountAvailable() {
             return false;
         }
@@ -189,6 +193,7 @@ public long getModifiedCount() {
         }
 
         @Override
+        @Nullable
         public BsonValue getUpsertedId() {
            throw getUnacknowledgedWriteException();
         }
diff --git a/driver-core/src/main/com/mongodb/client/result/package-info.java b/driver-core/src/main/com/mongodb/client/result/package-info.java
index 5d34da63267..899324b0f07 100644
--- a/driver-core/src/main/com/mongodb/client/result/package-info.java
+++ b/driver-core/src/main/com/mongodb/client/result/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,4 +17,7 @@
 /**
  * This package contains classes representing operation results
  */
+@NonNullApi
 package com.mongodb.client.result;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/connection/AbstractReferenceCounted.java b/driver-core/src/main/com/mongodb/connection/AbstractReferenceCounted.java
deleted file mode 100644
index 187caa23e5f..00000000000
--- a/driver-core/src/main/com/mongodb/connection/AbstractReferenceCounted.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.binding.ReferenceCounted;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-abstract class AbstractReferenceCounted implements ReferenceCounted {
-    private final AtomicInteger referenceCount = new AtomicInteger(1);
-    @Override
-    public int getCount() {
-        return referenceCount.get();
-    }
-
-    @Override
-    public ReferenceCounted retain() {
-        if (referenceCount.incrementAndGet() == 1) {
-            throw new IllegalStateException("Attempted to increment the reference count when it is already 0");
-        }
-        return this;
-    }
-
-    @Override
-    public void release() {
-        if (referenceCount.decrementAndGet() < 0) {
-            throw new IllegalStateException("Attempted to decrement the reference count below 0");
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/AsyncCompletionHandler.java b/driver-core/src/main/com/mongodb/connection/AsyncCompletionHandler.java
index cd88a924681..98f17178430 100644
--- a/driver-core/src/main/com/mongodb/connection/AsyncCompletionHandler.java
+++ b/driver-core/src/main/com/mongodb/connection/AsyncCompletionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/AsyncConnection.java b/driver-core/src/main/com/mongodb/connection/AsyncConnection.java
index a7740ee4785..337cc8bd905 100644
--- a/driver-core/src/main/com/mongodb/connection/AsyncConnection.java
+++ b/driver-core/src/main/com/mongodb/connection/AsyncConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,15 @@
 package com.mongodb.connection;
 
 import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
+import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcernResult;
 import com.mongodb.annotations.ThreadSafe;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.ReferenceCounted;
-import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.bulk.DeleteRequest;
 import com.mongodb.bulk.InsertRequest;
 import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonDocument;
 import org.bson.FieldNameValidator;
 import org.bson.codecs.Decoder;
@@ -42,6 +42,7 @@
  * @since 3.0
  */
 @ThreadSafe
+@Deprecated
 public interface AsyncConnection extends ReferenceCounted {
 
     @Override
@@ -56,112 +57,34 @@ public interface AsyncConnection extends ReferenceCounted {
 
     /**
      * Insert the documents using the insert wire protocol and apply the write concern asynchronously.
-     *
      * @param namespace    the namespace
      * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param inserts      the inserts
+     * @param insertRequest the insert request
      * @param callback     the callback to be passed the write result
      */
-    void insertAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern,
-                     List<InsertRequest> inserts, SingleResultCallback<WriteConcernResult> callback);
+    void insertAsync(MongoNamespace namespace, boolean ordered, InsertRequest insertRequest,
+                     SingleResultCallback<WriteConcernResult> callback);
 
     /**
      * Update the documents using the update wire protocol and apply the write concern asynchronously.
-     *
      * @param namespace    the namespace
      * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param updates      the updates
+     * @param updateRequest the update request
      * @param callback     the callback to be passed the write result
      */
-    void updateAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<UpdateRequest> updates,
+    void updateAsync(MongoNamespace namespace, boolean ordered, UpdateRequest updateRequest,
                      SingleResultCallback<WriteConcernResult> callback);
 
     /**
      * Delete the documents using the delete wire protocol and apply the write concern asynchronously.
-     *
      * @param namespace    the namespace
      * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param deletes      the deletes
+     * @param deleteRequest the delete request
      * @param callback     the callback to be passed the write result
      */
-    void deleteAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<DeleteRequest> deletes,
+    void deleteAsync(MongoNamespace namespace, boolean ordered, DeleteRequest deleteRequest,
                      SingleResultCallback<WriteConcernResult> callback);
 
-    /**
-     * Insert the documents using the insert command asynchronously.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param inserts      the inserts
-     * @param callback     the callback to be passed the bulk write result
-     * @deprecated Replaced by {@link AsyncConnection#insertCommandAsync(MongoNamespace, boolean, WriteConcern, Boolean, List,
-     * SingleResultCallback)}
-     */
-    @Deprecated
-    void insertCommandAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<InsertRequest> inserts,
-                            SingleResultCallback<BulkWriteResult> callback);
-
-    /**
-     * Insert the documents using the insert command asynchronously.
-     *
-     * @param namespace                the namespace
-     * @param ordered                  whether the writes are ordered
-     * @param writeConcern             the write concern
-     * @param bypassDocumentValidation the bypassDocumentValidation flag
-     * @param inserts                  the inserts
-     * @param callback                 the callback to be passed the bulk write result
-     * @since 3.2
-     * @mongodb.driver.manual reference/command/insert/ Insert
-     */
-    void insertCommandAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, Boolean bypassDocumentValidation,
-                            List<InsertRequest> inserts, SingleResultCallback<BulkWriteResult> callback);
-
-    /**
-     * Update the documents using the update command asynchronously.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param updates      the updates
-     * @param callback     the callback to be passed the BulkWriteResult
-     * @deprecated Replaced by {@link AsyncConnection#updateCommandAsync(MongoNamespace, boolean, WriteConcern, Boolean, List,
-     * SingleResultCallback)}
-     */
-    @Deprecated
-    void updateCommandAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<UpdateRequest> updates,
-                            SingleResultCallback<BulkWriteResult> callback);
-
-    /**
-     * Update the documents using the update command asynchronously.
-     *
-     * @param namespace                the namespace
-     * @param ordered                  whether the writes are ordered
-     * @param writeConcern             the write concern
-     * @param bypassDocumentValidation the bypassDocumentValidation flag
-     * @param updates                  the updates
-     * @param callback                 the callback to be passed the BulkWriteResult
-     * @since 3.2
-     * @mongodb.driver.manual reference/command/update/ Update
-     */
-    void updateCommandAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, Boolean bypassDocumentValidation,
-                            List<UpdateRequest> updates, SingleResultCallback<BulkWriteResult> callback);
-
-    /**
-     * Delete the documents using the delete command asynchronously.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param deletes      the deletes
-     * @param callback     the callback to be passed the BulkWriteResult
-     */
-    void deleteCommandAsync(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<DeleteRequest> deletes,
-                            SingleResultCallback<BulkWriteResult> callback);
-
     /**
      * Execute the command asynchronously.
      *
@@ -172,10 +95,50 @@ void deleteCommandAsync(MongoNamespace namespace, boolean ordered, WriteConcern
      * @param commandResultDecoder the decoder for the result
      * @param callback             the callback to be passed the command result
      * @param <T>                  the type of the result
+     * @deprecated Prefer {@link #commandAsync(String, BsonDocument, FieldNameValidator, ReadPreference, Decoder, SessionContext,
+     * SingleResultCallback)}
      */
+    @Deprecated
     <T> void commandAsync(String database, BsonDocument command, boolean slaveOk, FieldNameValidator fieldNameValidator,
                           Decoder<T> commandResultDecoder, SingleResultCallback<T> callback);
 
+    /**
+     * Execute the command.
+     *
+     * @param <T>                  the type of the result
+     * @param database             the database to execute the command in
+     * @param command              the command document
+     * @param fieldNameValidator   the field name validator for the command document
+     * @param readPreference       the read preference that was applied to get this connection, or null if this is a write operation
+     * @param commandResultDecoder the decoder for the result
+     * @param sessionContext       the session context
+     * @param callback             the callback to be passed the write result
+     * @since 3.6
+     */
+    <T> void commandAsync(String database, BsonDocument command, FieldNameValidator fieldNameValidator, ReadPreference readPreference,
+                          Decoder<T> commandResultDecoder, SessionContext sessionContext, SingleResultCallback<T> callback);
+
+    /**
+     * Executes the command, consuming as much of the {@code SplittablePayload} as possible.
+     *
+     * @param <T>                       the type of the result
+     * @param database                  the database to execute the command in
+     * @param command                   the command document
+     * @param commandFieldNameValidator the field name validator for the command document
+     * @param readPreference            the read preference that was applied to get this connection, or null if this is a write operation
+     * @param commandResultDecoder      the decoder for the result
+     * @param sessionContext            the session context
+     * @param responseExpected          true if a response from the server is expected
+     * @param payload                   the splittable payload to incorporate with the command
+     * @param payloadFieldNameValidator the field name validator for the payload documents
+     * @param callback                  the callback to be passed the write result
+     * @since 3.6
+     */
+    <T> void commandAsync(String database, BsonDocument command, FieldNameValidator commandFieldNameValidator,
+                          ReadPreference readPreference, Decoder<T> commandResultDecoder, SessionContext sessionContext,
+                          boolean responseExpected, SplittablePayload payload, FieldNameValidator payloadFieldNameValidator,
+                          SingleResultCallback<T> callback);
+
     /**
      * Execute the query asynchronously.
      *
diff --git a/driver-core/src/main/com/mongodb/connection/AsyncWritableByteChannel.java b/driver-core/src/main/com/mongodb/connection/AsyncWritableByteChannel.java
deleted file mode 100644
index ca6003d4624..00000000000
--- a/driver-core/src/main/com/mongodb/connection/AsyncWritableByteChannel.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import java.nio.ByteBuffer;
-
-/**
- * An asynchronous channel that can write bytes.
- *
- * @since 3.0
- */
-interface AsyncWritableByteChannel {
-    /**
-     * Writes a sequence of bytes to this channel from the given buffer.
-     *
-     * <p> This method initiates an asynchronous write operation to write a
-     * sequence of bytes to this channel from the given buffer. The {@code
-     * handler} parameter is a completion handler that is invoked when the write
-     * operation completes (or fails). The result passed to the completion
-     * handler is the number of bytes written.
-     *
-     * <p> The write operation may write up to <i>r</i> bytes to the channel,
-     * where <i>r</i> is the number of bytes remaining in the buffer, that is,
-     * {@code src.remaining()} at the time that the write is attempted. Where
-     * <i>r</i> is 0, the write operation completes immediately with a result of
-     * {@code 0} without initiating an I/O operation.
-     *
-     * <p> Suppose that a byte sequence of length <i>n</i> is written, where
-     * <tt>0</tt>&nbsp;<tt>&lt;</tt>&nbsp;<i>n</i>&nbsp;<tt>&lt;=</tt>&nbsp;<i>r</i>.
-     * This byte sequence will be transferred from the buffer starting at index
-     * <i>p</i>, where <i>p</i> is the buffer's position at the moment the
-     * write is performed; the index of the last byte written will be
-     * <i>p</i>&nbsp;<tt>+</tt>&nbsp;<i>n</i>&nbsp;<tt>-</tt>&nbsp;<tt>1</tt>.
-     * Upon completion the buffer's position will be equal to
-     * <i>p</i>&nbsp;<tt>+</tt>&nbsp;<i>n</i>; its limit will not have changed.
-     *
-     * <p> Buffers are not safe for use by multiple concurrent threads so care
-     * should be taken to not access the buffer until the operation has
-     * completed.
-     *
-     * <p> This method may be invoked at any time. Some channel types may not
-     * allow more than one write to be outstanding at any given time. If a thread
-     * initiates a write operation before a previous write operation has
-     * completed then a {@link java.nio.channels.WritePendingException} will be thrown.
-     *
-     * @param   src
-     *          The buffer from which bytes are to be retrieved
-     * @param   handler
-     *          The completion handler object
-     *
-     * @throws java.nio.channels.WritePendingException
-     *          If the channel does not allow more than one write to be outstanding
-     *          and a previous write has not completed
-     * @throws java.nio.channels.ShutdownChannelGroupException
-     *          If the channel is associated with a {@link java.nio.channels.AsynchronousChannelGroup
-     *          group} that has terminated
-     */
-    void write(ByteBuffer src, AsyncCompletionHandler<Void> handler);
-}
diff --git a/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStream.java b/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStream.java
deleted file mode 100644
index b03d20fdfda..00000000000
--- a/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStream.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoSocketOpenException;
-import com.mongodb.MongoSocketReadException;
-import com.mongodb.MongoSocketReadTimeoutException;
-import com.mongodb.ServerAddress;
-import org.bson.ByteBuf;
-
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.StandardSocketOptions;
-import java.nio.ByteBuffer;
-import java.nio.channels.AsynchronousSocketChannel;
-import java.nio.channels.CompletionHandler;
-import java.nio.channels.InterruptedByTimeoutException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static com.mongodb.assertions.Assertions.isTrue;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-final class AsynchronousSocketChannelStream implements Stream {
-    private final ServerAddress serverAddress;
-    private final SocketSettings settings;
-    private final BufferProvider bufferProvider;
-    private volatile AsynchronousSocketChannel channel;
-    private volatile boolean isClosed;
-
-    AsynchronousSocketChannelStream(final ServerAddress serverAddress, final SocketSettings settings,
-                                    final BufferProvider bufferProvider) {
-        this.serverAddress = serverAddress;
-        this.settings = settings;
-        this.bufferProvider = bufferProvider;
-    }
-
-    @Override
-    public ByteBuf getBuffer(final int size) {
-        return bufferProvider.getBuffer(size);
-    }
-
-    @Override
-    public void open() throws IOException {
-        FutureAsyncCompletionHandler<Void> handler = new FutureAsyncCompletionHandler<Void>();
-        openAsync(handler);
-        handler.getOpen();
-    }
-
-    @Override
-    public void openAsync(final AsyncCompletionHandler<Void> handler) {
-        isTrue("unopened", channel == null);
-        try {
-            channel = AsynchronousSocketChannel.open();
-            channel.setOption(StandardSocketOptions.TCP_NODELAY, true);
-            channel.setOption(StandardSocketOptions.SO_KEEPALIVE, settings.isKeepAlive());
-            if (settings.getReceiveBufferSize() > 0) {
-                channel.setOption(StandardSocketOptions.SO_RCVBUF, settings.getReceiveBufferSize());
-            }
-            if (settings.getSendBufferSize() > 0) {
-                channel.setOption(StandardSocketOptions.SO_SNDBUF, settings.getSendBufferSize());
-            }
-
-            channel.connect(serverAddress.getSocketAddress(), null, new OpenCompletionHandler(handler));
-        } catch (IOException e) {
-            handler.failed(new MongoSocketOpenException("Exception opening socket", serverAddress, e));
-        } catch (Throwable t) {
-            handler.failed(t);
-        }
-    }
-
-    @Override
-    public void write(final List<ByteBuf> buffers) throws IOException {
-        FutureAsyncCompletionHandler<Void> handler = new FutureAsyncCompletionHandler<Void>();
-        writeAsync(buffers, handler);
-        handler.getWrite();
-    }
-
-    @Override
-    public ByteBuf read(final int numBytes) throws IOException {
-        FutureAsyncCompletionHandler<ByteBuf> handler = new FutureAsyncCompletionHandler<ByteBuf>();
-        readAsync(numBytes, handler);
-        return handler.getRead();
-    }
-
-    @Override
-    public void writeAsync(final List<ByteBuf> buffers, final AsyncCompletionHandler<Void> handler) {
-        final AsyncWritableByteChannel byteChannel = new AsyncWritableByteChannelAdapter();
-        final Iterator<ByteBuf> iter = buffers.iterator();
-        pipeOneBuffer(byteChannel, iter.next(), new AsyncCompletionHandler<Void>() {
-            @Override
-            public void completed(final Void t) {
-                if (iter.hasNext()) {
-                    pipeOneBuffer(byteChannel, iter.next(), this);
-                } else {
-                    handler.completed(null);
-                }
-            }
-
-            @Override
-            public void failed(final Throwable t) {
-                handler.failed(t);
-            }
-        });
-    }
-
-    @Override
-    public void readAsync(final int numBytes, final AsyncCompletionHandler<ByteBuf> handler) {
-        ByteBuf buffer = bufferProvider.getBuffer(numBytes);
-        channel.read(buffer.asNIO(), settings.getReadTimeout(MILLISECONDS), MILLISECONDS, null,
-                     new BasicCompletionHandler(buffer, handler));
-    }
-
-    @Override
-    public ServerAddress getAddress() {
-        return serverAddress;
-    }
-
-    /**
-     * Closes the connection.
-     */
-    @Override
-    public void close() {
-        try {
-            if (channel != null) {
-                channel.close();
-            }
-        } catch (IOException e) { // NOPMD
-            // ignore
-        } finally {
-            channel = null;
-            isClosed = true;
-        }
-    }
-
-    @Override
-    public boolean isClosed() {
-        return isClosed;
-    }
-
-    private void pipeOneBuffer(final AsyncWritableByteChannel byteChannel, final ByteBuf byteBuffer,
-                               final AsyncCompletionHandler<Void> outerHandler) {
-        byteChannel.write(byteBuffer.asNIO(), new AsyncCompletionHandler<Void>() {
-            @Override
-            public void completed(final Void t) {
-                if (byteBuffer.hasRemaining()) {
-                    byteChannel.write(byteBuffer.asNIO(), this);
-                } else {
-                    outerHandler.completed(null);
-                }
-            }
-
-            @Override
-            public void failed(final Throwable t) {
-                outerHandler.failed(t);
-            }
-        });
-    }
-
-    private class AsyncWritableByteChannelAdapter implements AsyncWritableByteChannel {
-        @Override
-        public void write(final ByteBuffer src, final AsyncCompletionHandler<Void> handler) {
-            channel.write(src, null, new WriteCompletionHandler(handler));
-        }
-
-        private class WriteCompletionHandler extends BaseCompletionHandler<Void, Integer, Object> {
-
-            public WriteCompletionHandler(final AsyncCompletionHandler<Void> handler) {
-                super(handler);
-            }
-
-            @Override
-            public void completed(final Integer result, final Object attachment) {
-                AsyncCompletionHandler<Void> localHandler = getHandlerAndClear();
-                localHandler.completed(null);
-            }
-
-            @Override
-            public void failed(final Throwable exc, final Object attachment) {
-                AsyncCompletionHandler<Void> localHandler = getHandlerAndClear();
-                localHandler.failed(exc);
-            }
-        }
-    }
-
-    private final class BasicCompletionHandler extends BaseCompletionHandler<ByteBuf, Integer, Void> {
-        private final AtomicReference<ByteBuf> byteBufReference;
-
-        private BasicCompletionHandler(final ByteBuf dst, final AsyncCompletionHandler<ByteBuf> handler) {
-            super(handler);
-            this.byteBufReference = new AtomicReference<ByteBuf>(dst);
-        }
-
-        @Override
-        public void completed(final Integer result, final Void attachment) {
-            AsyncCompletionHandler<ByteBuf> localHandler = getHandlerAndClear();
-            ByteBuf localByteBuf = byteBufReference.getAndSet(null);
-            if (result == -1) {
-                localByteBuf.release();
-                localHandler.failed(new MongoSocketReadException("Prematurely reached end of stream", serverAddress));
-            } else if (!localByteBuf.hasRemaining()) {
-                localByteBuf.flip();
-                localHandler.completed(localByteBuf);
-            } else {
-                channel.read(localByteBuf.asNIO(), settings.getReadTimeout(MILLISECONDS), MILLISECONDS, null,
-                             new BasicCompletionHandler(localByteBuf, localHandler));
-            }
-        }
-
-        @Override
-        public void failed(final Throwable t, final Void attachment) {
-            AsyncCompletionHandler<ByteBuf> localHandler = getHandlerAndClear();
-            ByteBuf localByteBuf = byteBufReference.getAndSet(null);
-            localByteBuf.release();
-            if (t instanceof InterruptedByTimeoutException) {
-                localHandler.failed(new MongoSocketReadTimeoutException("Timeout while receiving message", serverAddress, t));
-            } else {
-                localHandler.failed(t);
-            }
-        }
-    }
-
-    private class OpenCompletionHandler extends BaseCompletionHandler<Void, Void, Object> {
-        public OpenCompletionHandler(final AsyncCompletionHandler<Void> handler) {
-            super(handler);
-        }
-
-        @Override
-        public void completed(final Void result, final Object attachment) {
-            AsyncCompletionHandler<Void> localHandler = getHandlerAndClear();
-            localHandler.completed(null);
-        }
-
-        @Override
-        public void failed(final Throwable exc, final Object attachment) {
-            AsyncCompletionHandler<Void> localHandler = getHandlerAndClear();
-            if (exc instanceof ConnectException) {
-                localHandler.failed(new MongoSocketOpenException("Exception opening socket", getAddress(), exc));
-            } else {
-                localHandler.failed(exc);
-            }
-        }
-    }
-
-    // Private base class for all CompletionHandler implementors that ensures the upstream handler is
-    // set to null before it is used.  This is to work around an observed issue with implementations of
-    // AsynchronousSocketChannel that fail to clear references to handlers stored in instance fields of
-    // the class.
-    private abstract static class BaseCompletionHandler<T, V, A> implements CompletionHandler<V, A> {
-        private final AtomicReference<AsyncCompletionHandler<T>> handlerReference;
-
-        public BaseCompletionHandler(final AsyncCompletionHandler<T> handler) {
-            this.handlerReference = new AtomicReference<AsyncCompletionHandler<T>>(handler);
-        }
-
-        protected AsyncCompletionHandler<T> getHandlerAndClear() {
-            return handlerReference.getAndSet(null);
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactory.java b/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactory.java
index 5957854f967..ab8fd3b36cd 100644
--- a/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,11 @@
 package com.mongodb.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.internal.connection.AsynchronousSocketChannelStream;
 import com.mongodb.internal.connection.PowerOfTwoBufferPool;
 
+import java.nio.channels.AsynchronousChannelGroup;
+
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -27,27 +30,43 @@
  * @since 3.0
  */
 public class AsynchronousSocketChannelStreamFactory implements StreamFactory {
-    private final SocketSettings settings;
     private final BufferProvider bufferProvider = new PowerOfTwoBufferPool();
+    private final SocketSettings settings;
+    private final AsynchronousChannelGroup group;
 
     /**
-     * Create a new factory.
+     * Create a new factory with the default {@code BufferProvider} and {@code AsynchronousChannelGroup}.
      *
      * @param settings    the settings for the connection to a MongoDB server
      * @param sslSettings the settings for connecting via SSL
      */
     public AsynchronousSocketChannelStreamFactory(final SocketSettings settings, final SslSettings sslSettings) {
+        this(settings, sslSettings, null);
+    }
+
+    /**
+     * Create a new factory.
+     *
+     * @param settings the socket settings
+     * @param sslSettings the SSL settings
+     * @param group the {@code AsynchronousChannelGroup} to use or null for the default group
+     *
+     * @since 3.6
+     */
+    public AsynchronousSocketChannelStreamFactory(final SocketSettings settings, final SslSettings sslSettings,
+                                                  final AsynchronousChannelGroup group) {
         if (sslSettings.isEnabled()) {
             throw new UnsupportedOperationException("No SSL support in java.nio.channels.AsynchronousSocketChannel. For SSL support use "
-                                                    + "com.mongodb.connection.netty.NettyStreamFactoryFactory");
+                    + "com.mongodb.connection.netty.NettyStreamFactoryFactory");
         }
 
         this.settings = notNull("settings", settings);
+        this.group = group;
     }
 
     @Override
     public Stream create(final ServerAddress serverAddress) {
-        return new AsynchronousSocketChannelStream(serverAddress, settings, bufferProvider);
+        return new AsynchronousSocketChannelStream(serverAddress, settings, bufferProvider, group);
     }
 
 }
diff --git a/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactory.java b/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactory.java
index a5c4b5b88c3..aedc34d60da 100644
--- a/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.connection;
 
+import java.nio.channels.AsynchronousChannelGroup;
+
 /**
  * A {@code StreamFactoryFactory} implementation for AsynchronousSocketChannel-based streams.
  *
@@ -23,8 +25,62 @@
  * @since 3.1
  */
 public class AsynchronousSocketChannelStreamFactoryFactory implements StreamFactoryFactory {
+    private final AsynchronousChannelGroup group;
+
+    /**
+     * Construct an instance with the default {@code BufferProvider} and {@code AsynchronousChannelGroup}.
+     *
+     * @deprecated Use {@link AsynchronousSocketChannelStreamFactoryFactory#builder()} instead to construct the
+     * {@code AsynchronousSocketChannelStreamFactoryFactory}.
+     */
+    @Deprecated
+    public AsynchronousSocketChannelStreamFactoryFactory() {
+        this(builder());
+    }
+
+    /**
+     * Gets a builder for an instance of {@code AsynchronousSocketChannelStreamFactoryFactory}.
+     * @return the builder
+     * @since 3.6
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * A builder for an instance of {@code AsynchronousSocketChannelStreamFactoryFactory}.
+     *
+     * @since 3.6
+     */
+    public static final class Builder {
+        private AsynchronousChannelGroup group;
+
+        /**
+         * Sets the {@code AsynchronousChannelGroup}
+         *
+         * @param group the {@code AsynchronousChannelGroup}
+         * @return this
+         */
+        public Builder group(final AsynchronousChannelGroup group) {
+            this.group = group;
+            return this;
+        }
+
+        /**
+         * Build an instance of {@code AsynchronousSocketChannelStreamFactoryFactory}.
+         * @return the AsynchronousSocketChannelStreamFactoryFactory
+         */
+        public AsynchronousSocketChannelStreamFactoryFactory build() {
+            return new AsynchronousSocketChannelStreamFactoryFactory(this);
+        }
+    }
+
     @Override
     public StreamFactory create(final SocketSettings socketSettings, final SslSettings sslSettings) {
-        return new AsynchronousSocketChannelStreamFactory(socketSettings, sslSettings);
+        return new AsynchronousSocketChannelStreamFactory(socketSettings, sslSettings,  group);
+    }
+
+    private AsynchronousSocketChannelStreamFactoryFactory(final Builder builder) {
+        group = builder.group;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/Authenticator.java b/driver-core/src/main/com/mongodb/connection/Authenticator.java
deleted file mode 100644
index ba7b6bb27e0..00000000000
--- a/driver-core/src/main/com/mongodb/connection/Authenticator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.async.SingleResultCallback;
-
-abstract class Authenticator {
-    private final MongoCredential credential;
-
-    Authenticator(final MongoCredential credential) {
-        this.credential = credential;
-    }
-
-    MongoCredential getCredential() {
-        return credential;
-    }
-
-    abstract void authenticate(final InternalConnection connection, final ConnectionDescription connectionDescription);
-
-    abstract void authenticateAsync(final InternalConnection connection, final ConnectionDescription connectionDescription,
-                                    SingleResultCallback<Void> callback);
-}
diff --git a/driver-core/src/main/com/mongodb/connection/Base64Codec.java b/driver-core/src/main/com/mongodb/connection/Base64Codec.java
deleted file mode 100644
index a6aea48a8d6..00000000000
--- a/driver-core/src/main/com/mongodb/connection/Base64Codec.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- * Copyright 1999,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoException;
-
-import java.io.UnsupportedEncodingException;
-
-/**
- * <p>Provides Base64 encoding and decoding.</p>
- * <p>This class implements Base64 encoding</p>
- * <p>Thanks to Apache Commons project. This class refactored from org.apache.commons.codec.binary</p>
- * <p>Original Thanks to <a href="http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/util/">commons</a> project in
- * ws.apache.org for this code. </p>
- */
-class Base64Codec {
-    private static final int BYTES_PER_UNENCODED_BLOCK = 3;
-    private static final int BYTES_PER_ENCODED_BLOCK = 4;
-
-    /**
-     * Mask used to extract 6 bits, used when encoding
-     */
-    private static final int SIX_BIT_MASK = 0x3f;
-
-    /**
-     * padding char
-     */
-    private static final byte PAD = '=';
-
-    /**
-     * This array is a lookup table that translates 6-bit positive integer index values into their "Base64 Alphabet"
-     * equivalents as specified in Table 1 of RFC 2045.
-     */
-    private static final byte[] ENCODE_TABLE = {'A', 'B', 'C', 'D', 'E', 'F',
-            'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
-            'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
-            't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
-            '6', '7', '8', '9', '+', '/'};
-
-    private static final int[] DECODE_TABLE = new int[128];
-
-    static {
-        for (int i = 0; i < ENCODE_TABLE.length; i++) {
-            DECODE_TABLE[ENCODE_TABLE[i]] = i;
-        }
-    }
-
-    public byte[] decode(final String s) {
-        int delta = s.endsWith("==") ? 2 : s.endsWith("=") ? 1 : 0;
-        byte[] buffer = new byte[s.length() * BYTES_PER_UNENCODED_BLOCK / BYTES_PER_ENCODED_BLOCK - delta];
-        int mask = 0xFF;
-        int pos = 0;
-        for (int i = 0; i < s.length(); i += BYTES_PER_ENCODED_BLOCK) {
-            int c0 = DECODE_TABLE[s.charAt(i)];
-            int c1 = DECODE_TABLE[s.charAt(i + 1)];
-            buffer[pos++] = (byte) (((c0 << 2) | (c1 >> 4)) & mask);
-            if (pos >= buffer.length) {
-                return buffer;
-            }
-            int c2 = DECODE_TABLE[s.charAt(i + 2)];
-            buffer[pos++] = (byte) (((c1 << 4) | (c2 >> 2)) & mask);
-            if (pos >= buffer.length) {
-                return buffer;
-            }
-            int c3 = DECODE_TABLE[s.charAt(i + 3)];
-            buffer[pos++] = (byte) (((c2 << 6) | c3) & mask);
-        }
-        return buffer;
-    }
-
-    public String encode(final byte[] in) {
-
-        int modulus = 0;
-        int bitWorkArea = 0;
-        int numEncodedBytes = (in.length / BYTES_PER_UNENCODED_BLOCK) * BYTES_PER_ENCODED_BLOCK
-                + ((in.length % BYTES_PER_UNENCODED_BLOCK == 0) ? 0 : 4);
-
-        byte[] buffer = new byte[numEncodedBytes];
-        int pos = 0;
-
-        for (int b : in) {
-            modulus = (modulus + 1) % BYTES_PER_UNENCODED_BLOCK;
-
-            if (b < 0) {
-                b += 256;
-            }
-
-            bitWorkArea = (bitWorkArea << 8) + b; //  BITS_PER_BYTE
-            if (0 == modulus) { // 3 bytes = 24 bits = 4 * 6 bits to extract
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 18) & SIX_BIT_MASK];
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 12) & SIX_BIT_MASK];
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 6) & SIX_BIT_MASK];
-                buffer[pos++] = ENCODE_TABLE[bitWorkArea & SIX_BIT_MASK];
-            }
-        }
-
-        switch (modulus) { // 0-2
-            case 1: // 8 bits = 6 + 2
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 2) & SIX_BIT_MASK]; // top 6 bits
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea << 4) & SIX_BIT_MASK]; // remaining 2
-                buffer[pos++] = PAD;
-                buffer[pos] = PAD; // Last entry no need to ++
-                break;
-
-            case 2: // 16 bits = 6 + 6 + 4
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 10) & SIX_BIT_MASK];
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea >> 4) & SIX_BIT_MASK];
-                buffer[pos++] = ENCODE_TABLE[(bitWorkArea << 2) & SIX_BIT_MASK];
-                buffer[pos] = PAD; // Last entry no need to ++
-                break;
-            default:
-                break;
-        }
-
-        try {
-            return new String(buffer, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new MongoException("UTF-8 Charset is not available");
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/BaseWriteCommandMessage.java b/driver-core/src/main/com/mongodb/connection/BaseWriteCommandMessage.java
deleted file mode 100644
index 6e54dc10d2b..00000000000
--- a/driver-core/src/main/com/mongodb/connection/BaseWriteCommandMessage.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import org.bson.BsonBinaryWriter;
-import org.bson.BsonBinaryWriterSettings;
-import org.bson.BsonDocument;
-import org.bson.BsonWriterSettings;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.EncoderContext;
-import org.bson.io.BsonOutput;
-
-import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
-
-/**
- * Abstract base class for write command message.  Supports splitting into multiple messages.
- */
-abstract class BaseWriteCommandMessage extends RequestMessage {
-    // Server allows command document to exceed max document size by 16K, so that it can comfortably fit a stored document inside it
-    private static final int HEADROOM = 16 * 1024;
-
-    private final MongoNamespace writeNamespace;
-    private final boolean ordered;
-    private final WriteConcern writeConcern;
-    private final Boolean bypassDocumentValidation;
-
-    /**
-     * Construct an instance.
-     *
-     * @param writeNamespace           the namespace
-     * @param ordered                  whether the writes are ordered
-     * @param writeConcern             the write concern
-     * @param bypassDocumentValidation the bypass documentation validation flag
-     * @param settings                 the message settings
-     */
-    public BaseWriteCommandMessage(final MongoNamespace writeNamespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final Boolean bypassDocumentValidation, final MessageSettings settings) {
-        super(new MongoNamespace(writeNamespace.getDatabaseName(), COMMAND_COLLECTION_NAME).getFullName(), OpCode.OP_QUERY, settings);
-
-        this.writeNamespace = writeNamespace;
-        this.ordered = ordered;
-        this.writeConcern = writeConcern;
-        this.bypassDocumentValidation = bypassDocumentValidation;
-    }
-
-    /**
-     * Gets the namespace to write to.
-     *
-     * @return the namespace
-     */
-    public MongoNamespace getWriteNamespace() {
-        return writeNamespace;
-    }
-
-    /**
-     * Gets the write concern.
-     *
-     * @return the write concern
-     */
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    /**
-     * Gets whether the writes are ordered.
-     *
-     * @return whether the writes are ordered
-     */
-    public boolean isOrdered() {
-        return ordered;
-    }
-
-    /**
-     * Gets the bypass document validation flag
-     *
-     * @return the bypass document validation flag
-     */
-    public Boolean getBypassDocumentValidation() {
-        return bypassDocumentValidation;
-    }
-
-    @Override
-    public BaseWriteCommandMessage encode(final BsonOutput outputStream) {
-        return (BaseWriteCommandMessage) super.encode(outputStream);
-    }
-
-    /**
-     * Gets the number of write requests left to encode.  Note that these may end up being split into multiple messages.
-     *
-     * @return the count of write requests left to encode
-     */
-    public abstract int getItemCount();
-
-    @Override
-    protected BaseWriteCommandMessage encodeMessageBody(final BsonOutput outputStream, final int messageStartPosition) {
-        return (BaseWriteCommandMessage) encodeMessageBodyWithMetadata(outputStream, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput outputStream, final int messageStartPosition) {
-        BaseWriteCommandMessage nextMessage = null;
-
-        writeCommandHeader(outputStream);
-
-        int commandStartPosition = outputStream.getPosition();
-        int firstDocumentStartPosition = outputStream.getPosition();
-        BsonBinaryWriter writer = new BsonBinaryWriter(new BsonWriterSettings(),
-                new BsonBinaryWriterSettings(getSettings().getMaxDocumentSize() + HEADROOM),
-                outputStream, getFieldNameValidator());
-        try {
-            writer.writeStartDocument();
-            writeCommandPrologue(writer);
-            nextMessage = writeTheWrites(outputStream, commandStartPosition, writer);
-            writer.writeEndDocument();
-        } finally {
-            writer.close();
-        }
-        return new EncodingMetadata(nextMessage, firstDocumentStartPosition);
-    }
-
-    /**
-     * Gets the field name validator to apply.
-     *
-     * @return the validator
-     */
-    protected abstract FieldNameValidator getFieldNameValidator();
-
-    private void writeCommandHeader(final BsonOutput outputStream) {
-        outputStream.writeInt32(0);
-        outputStream.writeCString(getCollectionName());
-
-        outputStream.writeInt32(0);
-        outputStream.writeInt32(-1);
-    }
-
-    /**
-     * Gets the name of the write command
-     *
-     * @return the name of the write command
-     */
-    protected abstract String getCommandName();
-
-    /**
-     * Write the list of writes to the output after the write command prologue has been written.
-     *
-     * @param bsonOutput           the BSON output
-     * @param commandStartPosition the position in the output where the command document starts
-     * @param writer               the writer
-     * @return the next message to encode, if this one overflowed.  This may be null, which indicates that we're done
-     */
-    protected abstract BaseWriteCommandMessage writeTheWrites(final BsonOutput bsonOutput, final int commandStartPosition,
-                                                              final BsonBinaryWriter writer);
-
-    boolean exceedsLimits(final int batchLength, final int batchItemCount) {
-        return (exceedsBatchLengthLimit(batchLength, batchItemCount) || exceedsBatchItemCountLimit(batchItemCount));
-    }
-
-    // make a special exception for a command with only a single item added to it.  It's allowed to exceed maximum document size so that
-    // it's possible to, say, send a replacement document that is itself 16MB, which would push the size of the containing command
-    // document to be greater than the maximum document size.
-    private boolean exceedsBatchLengthLimit(final int batchLength, final int batchItemCount) {
-        return batchLength > getSettings().getMaxDocumentSize() && batchItemCount > 1;
-    }
-
-    private boolean exceedsBatchItemCountLimit(final int batchItemCount) {
-        return batchItemCount > getSettings().getMaxBatchCount();
-    }
-
-    private void writeCommandPrologue(final BsonBinaryWriter writer) {
-        writer.writeString(getCommandName(), getWriteNamespace().getCollectionName());
-        writer.writeBoolean("ordered", ordered);
-        if (!getWriteConcern().isServerDefault()) {
-            writer.writeName("writeConcern");
-            BsonDocument document = getWriteConcern().asDocument();
-            getCodec(document).encode(writer, document, EncoderContext.builder().build());
-        }
-        if (getBypassDocumentValidation() != null) {
-            writer.writeBoolean("bypassDocumentValidation", getBypassDocumentValidation());
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/BufferProvider.java b/driver-core/src/main/com/mongodb/connection/BufferProvider.java
index 4eb93dc73d3..711410af8e2 100644
--- a/driver-core/src/main/com/mongodb/connection/BufferProvider.java
+++ b/driver-core/src/main/com/mongodb/connection/BufferProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/BulkWriteBatchCombiner.java b/driver-core/src/main/com/mongodb/connection/BulkWriteBatchCombiner.java
index a14ddae40cf..93e1b5e9361 100644
--- a/driver-core/src/main/com/mongodb/connection/BulkWriteBatchCombiner.java
+++ b/driver-core/src/main/com/mongodb/connection/BulkWriteBatchCombiner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
 /**
  * This class is not part of the public API.  It may be changed or removed at any time.
  */
+@Deprecated
 public class BulkWriteBatchCombiner {
     private final ServerAddress serverAddress;
     private final boolean ordered;
@@ -45,7 +46,7 @@ public class BulkWriteBatchCombiner {
     private int insertedCount;
     private int matchedCount;
     private int deletedCount;
-    private Integer modifiedCount = 0;
+    private int modifiedCount = 0;
     private final Set<BulkWriteUpsert> writeUpserts = new TreeSet<BulkWriteUpsert>(new Comparator<BulkWriteUpsert>() {
         @Override
         public int compare(final BulkWriteUpsert o1, final BulkWriteUpsert o2) {
@@ -83,11 +84,7 @@ public void addResult(final BulkWriteResult result, final IndexMap indexMap) {
         insertedCount += result.getInsertedCount();
         matchedCount += result.getMatchedCount();
         deletedCount += result.getDeletedCount();
-        if (result.isModifiedCountAvailable() && modifiedCount != null) {
-            modifiedCount += result.getModifiedCount();
-        } else {
-            modifiedCount = null;
-        }
+        modifiedCount += result.getModifiedCount();
         mergeUpserts(result.getUpserts(), indexMap);
     }
 
diff --git a/driver-core/src/main/com/mongodb/connection/ByteBufBsonDocument.java b/driver-core/src/main/com/mongodb/connection/ByteBufBsonDocument.java
deleted file mode 100644
index ddb01a1b48c..00000000000
--- a/driver-core/src/main/com/mongodb/connection/ByteBufBsonDocument.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.mongodb.connection;
-
-import org.bson.BsonBinaryReader;
-import org.bson.BsonDocument;
-import org.bson.BsonReader;
-import org.bson.BsonType;
-import org.bson.BsonValue;
-import org.bson.ByteBuf;
-import org.bson.RawBsonDocument;
-import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.io.ByteBufferBsonInput;
-import org.bson.json.JsonWriter;
-import org.bson.json.JsonWriterSettings;
-
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.StringWriter;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.bson.codecs.BsonValueCodecProvider.getClassForBsonType;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
-
-class ByteBufBsonDocument extends BsonDocument implements Cloneable {
-    private static final long serialVersionUID = 1L;
-
-    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
-
-    private final transient ByteBuf byteBuf;
-
-    static List<ByteBufBsonDocument> create(final ResponseBuffers responseBuffers) {
-        int numDocuments = responseBuffers.getReplyHeader().getNumberReturned();
-        ByteBuf documentsBuffer = responseBuffers.getBodyByteBuffer();
-        documentsBuffer.order(ByteOrder.LITTLE_ENDIAN);
-        List<ByteBufBsonDocument> documents = new ArrayList<ByteBufBsonDocument>(numDocuments);
-        while (documents.size() < numDocuments) {
-            int documentSizeInBytes = documentsBuffer.getInt();
-            documentsBuffer.position(documentsBuffer.position() - 4);
-            ByteBuf documentBuffer = documentsBuffer.duplicate();
-            documentBuffer.limit(documentBuffer.position() + documentSizeInBytes);
-            documents.add(new ByteBufBsonDocument(documentBuffer));
-            documentsBuffer.position(documentsBuffer.position() + documentSizeInBytes);
-        }
-
-        return documents;
-    }
-
-    static ByteBufBsonDocument createOne(final ByteBufferBsonOutput bsonOutput, final int startPosition) {
-        return create(bsonOutput, startPosition).get(0);
-    }
-
-    static List<ByteBufBsonDocument> create(final ByteBufferBsonOutput bsonOutput, final int startPosition) {
-        CompositeByteBuf outputByteBuf = new CompositeByteBuf(bsonOutput.getByteBuffers());
-        outputByteBuf.position(startPosition);
-        List<ByteBufBsonDocument> documents = new ArrayList<ByteBufBsonDocument>();
-        int curDocumentStartPosition = startPosition;
-        while (outputByteBuf.hasRemaining()) {
-            int documentSizeInBytes = outputByteBuf.getInt();
-            ByteBuf slice = outputByteBuf.duplicate();
-            slice.position(curDocumentStartPosition);
-            slice.limit(curDocumentStartPosition + documentSizeInBytes);
-            documents.add(new ByteBufBsonDocument(slice));
-            curDocumentStartPosition += documentSizeInBytes;
-            outputByteBuf.position(outputByteBuf.position() + documentSizeInBytes - 4);
-        }
-
-        return documents;
-    }
-
-    @Override
-    public void clear() {
-        throw new UnsupportedOperationException("RawBsonDocument instances are immutable");
-    }
-
-    @Override
-    public BsonValue put(final String key, final BsonValue value) {
-        throw new UnsupportedOperationException("RawBsonDocument instances are immutable");
-    }
-
-    @Override
-    public BsonDocument append(final String key, final BsonValue value) {
-        throw new UnsupportedOperationException("RawBsonDocument instances are immutable");
-    }
-
-    @Override
-    public void putAll(final Map<? extends String, ? extends BsonValue> m) {
-        throw new UnsupportedOperationException("RawBsonDocument instances are immutable");
-    }
-
-    @Override
-    public BsonValue remove(final Object key) {
-        throw new UnsupportedOperationException("RawBsonDocument instances are immutable");
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return findInDocument(new Finder<Boolean>() {
-            @Override
-            public Boolean find(final BsonReader bsonReader) {
-                return false;
-            }
-
-            @Override
-            public Boolean notFound() {
-                return true;
-            }
-        });
-    }
-
-    @Override
-    public int size() {
-        return findInDocument(new Finder<Integer>() {
-            private int size;
-
-            @Override
-            public Integer find(final BsonReader bsonReader) {
-                size++;
-                bsonReader.readName();
-                bsonReader.skipValue();
-                return null;
-            }
-
-            @Override
-            public Integer notFound() {
-                return size;
-            }
-        });
-    }
-
-    @Override
-    public Set<Entry<String, BsonValue>> entrySet() {
-        return toBsonDocument().entrySet();
-    }
-
-    @Override
-    public Collection<BsonValue> values() {
-        return toBsonDocument().values();
-    }
-
-    @Override
-    public Set<String> keySet() {
-        return toBsonDocument().keySet();
-    }
-
-    @Override
-    public boolean containsKey(final Object key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key can not be null");
-        }
-
-        return findInDocument(new Finder<Boolean>() {
-            @Override
-            public Boolean find(final BsonReader bsonReader) {
-                if (bsonReader.readName().equals(key)) {
-                    return true;
-                }
-                bsonReader.skipValue();
-                return null;
-            }
-
-            @Override
-            public Boolean notFound() {
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public boolean containsValue(final Object value) {
-        return findInDocument(new Finder<Boolean>() {
-            @Override
-            public Boolean find(final BsonReader bsonReader) {
-                bsonReader.skipName();
-                if (deserializeBsonValue(bsonReader).equals(value)) {
-                    return true;
-                }
-                return null;
-            }
-
-            @Override
-            public Boolean notFound() {
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public BsonValue get(final Object key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key can not be null");
-        }
-
-        return findInDocument(new Finder<BsonValue>() {
-            @Override
-            public BsonValue find(final BsonReader bsonReader) {
-                if (bsonReader.readName().equals(key)) {
-                    return deserializeBsonValue(bsonReader);
-                }
-                bsonReader.skipValue();
-                return null;
-            }
-
-            @Override
-            public BsonValue notFound() {
-                return null;
-            }
-        });
-    }
-
-    @Override
-    public String toJson() {
-        return toJson(new JsonWriterSettings());
-    }
-
-    @Override
-    public String toJson(final JsonWriterSettings settings) {
-        StringWriter stringWriter = new StringWriter();
-        JsonWriter jsonWriter = new JsonWriter(stringWriter, settings);
-        ByteBuf duplicate = byteBuf.duplicate();
-        BsonBinaryReader reader = new BsonBinaryReader(new ByteBufferBsonInput(duplicate));
-        try {
-            jsonWriter.pipe(reader);
-            return stringWriter.toString();
-        } finally {
-            duplicate.release();
-            reader.close();
-        }
-    }
-
-    /**
-     * Gets the first key in this document, or null if the document is empty.
-     *
-     * @return the first key in this document, or null if the document is empty
-     */
-    public String getFirstKey() {
-        return findInDocument(new Finder<String>() {
-            @Override
-            public String find(final BsonReader bsonReader) {
-                return bsonReader.readName();
-            }
-
-            @Override
-            public String notFound() {
-                return null;
-            }
-        });
-    }
-
-    private interface Finder<T> {
-        T find(BsonReader bsonReader);
-        T notFound();
-    }
-
-    private <T> T findInDocument(final Finder<T> finder) {
-        ByteBuf duplicateByteBuf = byteBuf.duplicate();
-        BsonBinaryReader bsonReader = new BsonBinaryReader(new ByteBufferBsonInput(duplicateByteBuf));
-        try {
-            bsonReader.readStartDocument();
-            while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-                T found = finder.find(bsonReader);
-                if (found != null) {
-                    return found;
-                }
-            }
-            bsonReader.readEndDocument();
-        } finally {
-            duplicateByteBuf.release();
-            bsonReader.close();
-        }
-
-        return finder.notFound();
-    }
-
-    @Override
-    public BsonDocument clone() {
-        byte[] clonedBytes = new byte[byteBuf.remaining()];
-        byteBuf.get(byteBuf.position(), clonedBytes);
-        return new RawBsonDocument(clonedBytes);
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        return toBsonDocument().equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return toBsonDocument().hashCode();
-    }
-
-    private BsonDocument toBsonDocument() {
-        ByteBuf duplicateByteBuf = byteBuf.duplicate();
-        BsonBinaryReader bsonReader = new BsonBinaryReader(new ByteBufferBsonInput(duplicateByteBuf));
-        try {
-            return new BsonDocumentCodec().decode(bsonReader, DecoderContext.builder().build());
-        } finally {
-            duplicateByteBuf.release();
-            bsonReader.close();
-        }
-    }
-
-    private BsonValue deserializeBsonValue(final BsonReader bsonReader) {
-        return REGISTRY.get(getClassForBsonType(bsonReader.getCurrentBsonType())).decode(bsonReader, DecoderContext.builder().build());
-    }
-
-    ByteBufBsonDocument(final ByteBuf byteBuf) {
-        this.byteBuf = byteBuf;
-    }
-
-    // see https://docs.oracle.com/javase/6/docs/platform/serialization/spec/output.html
-    private Object writeReplace() {
-        return toBsonDocument();
-    }
-
-    // see https://docs.oracle.com/javase/6/docs/platform/serialization/spec/input.html
-    private void readObject(final ObjectInputStream stream) throws InvalidObjectException {
-        throw new InvalidObjectException("Proxy required");
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/ByteBufferBsonOutput.java b/driver-core/src/main/com/mongodb/connection/ByteBufferBsonOutput.java
index a8465278d87..d0d2144cf9e 100644
--- a/driver-core/src/main/com/mongodb/connection/ByteBufferBsonOutput.java
+++ b/driver-core/src/main/com/mongodb/connection/ByteBufferBsonOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,6 +31,7 @@
  * This class should not be considered as part of the public API, and it may change or be removed at any time.
  *
  */
+@Deprecated
 public class ByteBufferBsonOutput extends OutputBuffer {
 
     private static final int MAX_SHIFT = 31;
@@ -128,7 +130,7 @@ public List<ByteBuf> getByteBuffers() {
 
         List<ByteBuf> buffers = new ArrayList<ByteBuf>(bufferList.size());
         for (final ByteBuf cur : bufferList) {
-            buffers.add(cur.duplicate().flip());
+            buffers.add(cur.duplicate().order(ByteOrder.LITTLE_ENDIAN).flip());
         }
         return buffers;
     }
diff --git a/driver-core/src/main/com/mongodb/connection/Cluster.java b/driver-core/src/main/com/mongodb/connection/Cluster.java
index ea3befb6bf1..136760d08a4 100644
--- a/driver-core/src/main/com/mongodb/connection/Cluster.java
+++ b/driver-core/src/main/com/mongodb/connection/Cluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@
 
 
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.lang.Nullable;
 import com.mongodb.selector.ServerSelector;
+import org.bson.BsonTimestamp;
 
 import java.io.Closeable;
 
@@ -27,7 +29,16 @@
  *
  * @since 3.0
  */
-public interface Cluster extends Closeable{
+@Deprecated
+public interface Cluster extends Closeable {
+
+    /**
+     * Gets the cluster settings with which this cluster was created.
+     *
+     * @return the cluster settings
+     * @since 3.4
+     */
+    ClusterSettings getSettings();
 
     /**
      * Get the description of this cluster.  This method will not return normally until the cluster type is known.
@@ -37,6 +48,22 @@ public interface Cluster extends Closeable{
      */
     ClusterDescription getDescription();
 
+    /**
+     * Get the current description of this cluster.
+     *
+     * @return the current ClusterDescription representing the current state of the cluster.
+     */
+    ClusterDescription getCurrentDescription();
+
+    /**
+     * Get the last seen cluster time
+     *
+     * @since 3.8
+     * @return the last seen cluster time or null if not set
+     */
+    @Nullable
+    BsonTimestamp getClusterTime();
+
     /**
      * Get a MongoDB server that matches the criteria defined by the serverSelector
      *
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterConnectionMode.java b/driver-core/src/main/com/mongodb/connection/ClusterConnectionMode.java
index e9fe694c307..8335714830d 100644
--- a/driver-core/src/main/com/mongodb/connection/ClusterConnectionMode.java
+++ b/driver-core/src/main/com/mongodb/connection/ClusterConnectionMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterDescription.java b/driver-core/src/main/com/mongodb/connection/ClusterDescription.java
index ebab6ab48c8..6a521ed4bd1 100644
--- a/driver-core/src/main/com/mongodb/connection/ClusterDescription.java
+++ b/driver-core/src/main/com/mongodb/connection/ClusterDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.connection;
 
+import com.mongodb.MongoException;
 import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.mongodb.TagSet;
@@ -43,6 +44,10 @@ public class ClusterDescription {
     private final ClusterConnectionMode connectionMode;
     private final ClusterType type;
     private final List<ServerDescription> serverDescriptions;
+    private final ClusterSettings clusterSettings;
+    private final ServerSettings serverSettings;
+    private final MongoException srvResolutionException;
+
     /**
      * Creates a new ClusterDescription.
      *
@@ -52,19 +57,78 @@ public class ClusterDescription {
      */
     public ClusterDescription(final ClusterConnectionMode connectionMode, final ClusterType type,
                               final List<ServerDescription> serverDescriptions) {
+        this(connectionMode, type, serverDescriptions, null, null);
+    }
+
+    /**
+     * Creates a new ClusterDescription.
+     *
+     * @param connectionMode     whether to connect directly to a single server or to multiple servers
+     * @param type               what sort of cluster this is
+     * @param serverDescriptions the descriptions of all the servers currently in this cluster
+     * @param clusterSettings    the cluster settings
+     * @param serverSettings     the server settings
+     * @since 3.4
+     */
+    public ClusterDescription(final ClusterConnectionMode connectionMode, final ClusterType type,
+                              final List<ServerDescription> serverDescriptions,
+                              final ClusterSettings clusterSettings,
+                              final ServerSettings serverSettings) {
+        this(connectionMode, type, null, serverDescriptions, clusterSettings, serverSettings);
+    }
+
+    /**
+     * Creates a new ClusterDescription.
+     *
+     * @param connectionMode     whether to connect directly to a single server or to multiple servers
+     * @param type               what sort of cluster this is
+     * @param srvResolutionException an exception resolving the SRV record
+     * @param serverDescriptions the descriptions of all the servers currently in this cluster
+     * @param clusterSettings    the cluster settings
+     * @param serverSettings     the server settings
+     * @since 3.10
+     */
+    public ClusterDescription(final ClusterConnectionMode connectionMode, final ClusterType type,
+                              final MongoException srvResolutionException,
+                              final List<ServerDescription> serverDescriptions,
+                              final ClusterSettings clusterSettings,
+                              final ServerSettings serverSettings) {
         notNull("all", serverDescriptions);
         this.connectionMode = notNull("connectionMode", connectionMode);
         this.type = notNull("type", type);
+        this.srvResolutionException = srvResolutionException;
         this.serverDescriptions = new ArrayList<ServerDescription>(serverDescriptions);
+        this.clusterSettings = clusterSettings;
+        this.serverSettings = serverSettings;
+    }
+
+    /**
+     * Gets the cluster settings, which may be null if not provided.
+     *
+     * @return the cluster settings
+     * @since 3.4
+     */
+    public ClusterSettings getClusterSettings() {
+        return clusterSettings;
+    }
+
+    /**
+     * Gets the server settings, which may be null if not provided.
+     *
+     * @return the server settings
+     * @since 3.4
+     */
+    public ServerSettings getServerSettings() {
+        return serverSettings;
     }
 
     /**
-     * Return whether the cluster is compatible with the driver.
+     * Return whether all servers in the cluster are compatible with the driver.
      *
-     * @return true if the cluster is compatible with the driver.
+     * @return true if all servers in the cluster are compatible with the driver
      */
     public boolean isCompatibleWithDriver() {
-        for (final ServerDescription cur : serverDescriptions) {
+        for (ServerDescription cur : serverDescriptions) {
             if (!cur.isCompatibleWithDriver()) {
                 return false;
             }
@@ -72,6 +136,36 @@ public boolean isCompatibleWithDriver() {
         return true;
     }
 
+    /**
+     * Return a server in the cluster that is incompatibly older than the driver.
+     *
+     * @return a server in the cluster that is incompatibly older than the driver, or null if there are none
+     * @since 3.6
+     */
+    public ServerDescription findServerIncompatiblyOlderThanDriver() {
+        for (ServerDescription cur : serverDescriptions) {
+            if (cur.isIncompatiblyOlderThanDriver()) {
+                return cur;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Return a server in the cluster that is incompatibly newer than the driver.
+     *
+     * @return a server in the cluster that is incompatibly newer than the driver, or null if there are none
+     * @since 3.6
+     */
+    public ServerDescription findServerIncompatiblyNewerThanDriver() {
+        for (ServerDescription cur : serverDescriptions) {
+            if (cur.isIncompatiblyNewerThanDriver()) {
+                return cur;
+            }
+        }
+        return null;
+    }
+
     /**
      * Returns true if this cluster has at least one server that satisfies the given read preference.
      *
@@ -114,6 +208,16 @@ public ClusterType getType() {
         return type;
     }
 
+    /**
+     * Gets any exception encountered while resolving the SRV record for the initial host.
+     *
+     * @return any exception encountered while resolving the SRV record for the initial host, or null if none
+     * @since 3.10
+     */
+    public MongoException getSrvResolutionException() {
+        return srvResolutionException;
+    }
+
     /**
      * Returns an unmodifiable list of the server descriptions in this cluster description.
      *
@@ -124,6 +228,33 @@ public List<ServerDescription> getServerDescriptions() {
         return Collections.unmodifiableList(serverDescriptions);
     }
 
+    /**
+     * Gets the logical session timeout in minutes, or null if at least one of the known servers does not support logical sessions.
+     *
+     * @return the logical session timeout in minutes, which may be null
+     * @mongodb.server.release 3.6
+     * @since 3.6
+     */
+    public Integer getLogicalSessionTimeoutMinutes() {
+        Integer retVal = null;
+        for (ServerDescription cur : getServersByPredicate(new Predicate() {
+            @Override
+            public boolean apply(final ServerDescription serverDescription) {
+                return serverDescription.isPrimary() || serverDescription.isSecondary();
+            }
+        })) {
+            if (cur.getLogicalSessionTimeoutMinutes() == null) {
+                return null;
+            }
+            if (retVal == null) {
+                retVal = cur.getLogicalSessionTimeoutMinutes();
+            } else {
+                retVal = Math.min(retVal, cur.getLogicalSessionTimeoutMinutes());
+            }
+        }
+        return retVal;
+    }
+
     /**
      * Returns the Set of all server descriptions in this cluster, sorted by the String value of the ServerAddress of each one.
      *
@@ -285,6 +416,19 @@ public boolean equals(final Object o) {
             return false;
         }
 
+        // Compare class equality and message as exceptions rarely override equals
+        Class<?> thisExceptionClass = srvResolutionException != null ? srvResolutionException.getClass() : null;
+        Class<?> thatExceptionClass = that.srvResolutionException != null ? that.srvResolutionException.getClass() : null;
+        if (thisExceptionClass != null ? !thisExceptionClass.equals(thatExceptionClass) : thatExceptionClass != null) {
+            return false;
+        }
+
+        String thisExceptionMessage = srvResolutionException != null ? srvResolutionException.getMessage() : null;
+        String thatExceptionMessage = that.srvResolutionException != null ? that.srvResolutionException.getMessage() : null;
+        if (thisExceptionMessage != null ? !thisExceptionMessage.equals(thatExceptionMessage) : thatExceptionMessage != null) {
+            return false;
+        }
+
         return true;
     }
 
@@ -292,6 +436,7 @@ public boolean equals(final Object o) {
     public int hashCode() {
         int result = connectionMode.hashCode();
         result = 31 * result + type.hashCode();
+        result = 31 * result + (srvResolutionException == null ? 0 : srvResolutionException.hashCode());
         result = 31 * result + serverDescriptions.hashCode();
         return result;
     }
@@ -300,6 +445,7 @@ public int hashCode() {
     public String toString() {
         return "ClusterDescription{"
                + "type=" + getType()
+               + (srvResolutionException == null ? "" : ", srvResolutionException=" + srvResolutionException)
                + ", connectionMode=" + connectionMode
                + ", serverDescriptions=" + serverDescriptions
                + '}';
@@ -317,7 +463,11 @@ public String getShortDescription() {
             serverDescriptions.append(delimiter).append(cur.getShortDescription());
             delimiter = ", ";
         }
-        return format("{type=%s, servers=[%s]", type, serverDescriptions);
+        if (srvResolutionException == null) {
+            return format("{type=%s, servers=[%s]", type, serverDescriptions);
+        }  else {
+            return format("{type=%s, srvResolutionException=%s, servers=[%s]", type, srvResolutionException, serverDescriptions);
+        }
     }
 
     private interface Predicate {
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterFactory.java b/driver-core/src/main/com/mongodb/connection/ClusterFactory.java
index 0801f8535b7..cc1a1288f81 100644
--- a/driver-core/src/main/com/mongodb/connection/ClusterFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/ClusterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import com.mongodb.MongoCredential;
 import com.mongodb.event.ClusterListener;
-import com.mongodb.event.ConnectionListener;
 import com.mongodb.event.ConnectionPoolListener;
 
 import java.util.List;
@@ -28,6 +27,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public interface ClusterFactory {
 
     // CHECKSTYLE:OFF
@@ -47,6 +47,7 @@ public interface ClusterFactory {
      * @param connectionListener       an optional listener for connection-related events
      * @return the cluster
      */
+    @SuppressWarnings("deprecation")
     Cluster create(ClusterSettings settings,
                    ServerSettings serverSettings,
                    ConnectionPoolSettings connectionPoolSettings,
@@ -55,7 +56,7 @@ Cluster create(ClusterSettings settings,
                    List<MongoCredential> credentialList,
                    ClusterListener clusterListener,
                    ConnectionPoolListener connectionPoolListener,
-                   ConnectionListener connectionListener);
+                   com.mongodb.event.ConnectionListener connectionListener);
 
     // CHECKSTYLE:ON
 }
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterId.java b/driver-core/src/main/com/mongodb/connection/ClusterId.java
index 9e9bf5c8bc4..df23babfce7 100644
--- a/driver-core/src/main/com/mongodb/connection/ClusterId.java
+++ b/driver-core/src/main/com/mongodb/connection/ClusterId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterSettings.java b/driver-core/src/main/com/mongodb/connection/ClusterSettings.java
index 56f4d8c0061..31511841fa3 100644
--- a/driver-core/src/main/com/mongodb/connection/ClusterSettings.java
+++ b/driver-core/src/main/com/mongodb/connection/ClusterSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,17 @@
 package com.mongodb.connection;
 
 import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.ServerAddress;
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
 import com.mongodb.event.ClusterListener;
+import com.mongodb.selector.CompositeServerSelector;
+import com.mongodb.selector.LatencyMinimizingServerSelector;
 import com.mongodb.selector.ServerSelector;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -32,7 +35,12 @@
 
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.connection.ServerAddressHelper.createServerAddress;
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static java.util.Collections.unmodifiableList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * Settings for the cluster.
@@ -41,12 +49,14 @@
  */
 @Immutable
 public final class ClusterSettings {
+    private final String srvHost;
     private final List<ServerAddress> hosts;
     private final ClusterConnectionMode mode;
     private final ClusterType requiredClusterType;
     private final String requiredReplicaSetName;
     private final ServerSelector serverSelector;
     private final String description;
+    private final long localThresholdMS;
     private final long serverSelectionTimeoutMS;
     private final int maxWaitQueueSize;
     private final List<ClusterListener> clusterListeners;
@@ -60,35 +70,90 @@ public static Builder builder() {
         return new Builder();
     }
 
+    /**
+     * Creates a builder instance.
+     *
+     * @param clusterSettings existing ClusterSettings to default the builder settings on.
+     * @return a builder
+     * @since 3.5
+     */
+    public static Builder builder(final ClusterSettings clusterSettings) {
+        return builder().applySettings(clusterSettings);
+    }
+
     /**
      * A builder for the cluster settings.
      */
     @NotThreadSafe
     public static final class Builder {
-        private List<ServerAddress> hosts;
-        private ClusterConnectionMode mode = ClusterConnectionMode.MULTIPLE;
+        private static final List<ServerAddress> DEFAULT_HOSTS = singletonList(new ServerAddress());
+        private String srvHost;
+        private List<ServerAddress> hosts = DEFAULT_HOSTS;
+        private ClusterConnectionMode mode;
         private ClusterType requiredClusterType = ClusterType.UNKNOWN;
         private String requiredReplicaSetName;
         private ServerSelector serverSelector;
         private String description;
-        private long serverSelectionTimeoutMS = TimeUnit.MILLISECONDS.convert(30, TimeUnit.SECONDS);
+        private long serverSelectionTimeoutMS = MILLISECONDS.convert(30, TimeUnit.SECONDS);
+        private long localThresholdMS = MILLISECONDS.convert(15, MILLISECONDS);
         private int maxWaitQueueSize = 500;
-        private final List<ClusterListener> clusterListeners = new ArrayList<ClusterListener>();
+        private List<ClusterListener> clusterListeners = new ArrayList<ClusterListener>();
 
         private Builder() {
         }
 
+        /**
+         * Applies the clusterSettings to the builder
+         *
+         * <p>Note: Overwrites all existing settings</p>
+         *
+         * @param clusterSettings the clusterSettings
+         * @return this
+         * @since 3.7
+         */
+        public Builder applySettings(final ClusterSettings clusterSettings) {
+            notNull("clusterSettings", clusterSettings);
+            description = clusterSettings.description;
+            srvHost = clusterSettings.srvHost;
+            hosts = clusterSettings.hosts;
+            mode = clusterSettings.mode;
+            requiredReplicaSetName = clusterSettings.requiredReplicaSetName;
+            requiredClusterType = clusterSettings.requiredClusterType;
+            localThresholdMS = clusterSettings.localThresholdMS;
+            serverSelectionTimeoutMS = clusterSettings.serverSelectionTimeoutMS;
+            maxWaitQueueSize = clusterSettings.maxWaitQueueSize;
+            clusterListeners = new ArrayList<ClusterListener>(clusterSettings.clusterListeners);
+            serverSelector = unpackServerSelector(clusterSettings.serverSelector);
+            return this;
+        }
+
         /**
          * Sets the user defined description of the MongoClient.
          *
          * @param description the user defined description of the MongoClient
          * @return this
+         * @deprecated Prefer {@link com.mongodb.MongoClientSettings.Builder#applicationName(String)}
          */
+        @Deprecated
         public Builder description(final String description) {
             this.description = description;
             return this;
         }
 
+        /**
+         * Sets the host name to use in order to look up an SRV DNS record to find the MongoDB hosts.
+         *
+         * @param srvHost the SRV host name
+         * @return this
+         */
+        public Builder srvHost(final String srvHost) {
+            if (this.hosts != DEFAULT_HOSTS) {
+                throw new IllegalArgumentException("Can not set both hosts and srvHost");
+            }
+            this.srvHost = srvHost;
+            return this;
+        }
+
         /**
          * Sets the hosts for the cluster. Any duplicate server addresses are removed from the list.
          *
@@ -100,11 +165,15 @@ public Builder hosts(final List<ServerAddress> hosts) {
             if (hosts.isEmpty()) {
                 throw new IllegalArgumentException("hosts list may not be empty");
             }
+            if (srvHost != null) {
+                throw new IllegalArgumentException("srvHost must be null");
+            }
             Set<ServerAddress> hostsSet = new LinkedHashSet<ServerAddress>(hosts.size());
-            for (ServerAddress host : hosts) {
-                hostsSet.add(new ServerAddress(host.getHost(), host.getPort()));
+            for (ServerAddress serverAddress : hosts) {
+                notNull("serverAddress", serverAddress);
+                hostsSet.add(createServerAddress(serverAddress.getHost(), serverAddress.getPort()));
             }
-            this.hosts = Collections.unmodifiableList(new ArrayList<ServerAddress>(hostsSet));
+            this.hosts = unmodifiableList(new ArrayList<ServerAddress>(hostsSet));
             return this;
         }
 
@@ -142,10 +211,26 @@ public Builder requiredClusterType(final ClusterType requiredClusterType) {
         }
 
         /**
-         * Sets the final server selector for the cluster to apply before selecting a server
+         * Sets the local threshold.
+         *
+         * @param localThreshold the acceptable latency difference, in milliseconds, which must be &gt;= 0
+         * @param timeUnit the time unit
+         * @throws IllegalArgumentException if {@code localThreshold < 0}
+         * @return this
+         * @since 3.7
+         */
+        public Builder localThreshold(final long localThreshold, final TimeUnit timeUnit) {
+            isTrueArgument("localThreshold must be >= 0", localThreshold >= 0);
+            this.localThresholdMS = MILLISECONDS.convert(localThreshold, timeUnit);
+            return this;
+        }
+
+        /**
+         * Adds a server selector for the cluster to apply before selecting a server.
          *
-         * @param serverSelector the server selector to apply as the final selector.
+         * @param serverSelector the server selector to apply as selector.
          * @return this
+         * @see #getServerSelector()
          */
         public Builder serverSelector(final ServerSelector serverSelector) {
             this.serverSelector = serverSelector;
@@ -164,7 +249,7 @@ public Builder serverSelector(final ServerSelector serverSelector) {
          * @return this
          */
         public Builder serverSelectionTimeout(final long serverSelectionTimeout, final TimeUnit timeUnit) {
-            this.serverSelectionTimeoutMS = TimeUnit.MILLISECONDS.convert(serverSelectionTimeout, timeUnit);
+            this.serverSelectionTimeoutMS = MILLISECONDS.convert(serverSelectionTimeout, timeUnit);
             return this;
         }
 
@@ -176,7 +261,9 @@ public Builder serverSelectionTimeout(final long serverSelectionTimeout, final T
          *
          * @param maxWaitQueueSize the number of threads that are allowed to be waiting for a connection.
          * @return this
+         * @deprecated in the next major release, wait queue size limitations will be removed
          */
+        @Deprecated
         public Builder maxWaitQueueSize(final int maxWaitQueueSize) {
             this.maxWaitQueueSize = maxWaitQueueSize;
             return this;
@@ -196,36 +283,63 @@ public Builder addClusterListener(final ClusterListener clusterListener) {
         }
 
         /**
-         * Take the settings from the given ConnectionString and add them to the builder
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
          *
-         * @param connectionString a URI containing details of how to connect to MongoDB
+         * @param connectionString the connection string containing details of how to connect to MongoDB
          * @return this
          */
         public Builder applyConnectionString(final ConnectionString connectionString) {
-            if (connectionString.getHosts().size() == 1 && connectionString.getRequiredReplicaSetName() == null) {
+            if (connectionString.isSrvProtocol()) {
+                mode(ClusterConnectionMode.MULTIPLE);
+                srvHost(connectionString.getHosts().get(0));
+            }
+            else if (connectionString.getHosts().size() == 1 && connectionString.getRequiredReplicaSetName() == null) {
                 mode(ClusterConnectionMode.SINGLE)
-                .hosts(singletonList(new ServerAddress(connectionString.getHosts().get(0))));
+                .hosts(singletonList(createServerAddress(connectionString.getHosts().get(0))));
             } else {
                 List<ServerAddress> seedList = new ArrayList<ServerAddress>();
                 for (final String cur : connectionString.getHosts()) {
-                    seedList.add(new ServerAddress(cur));
+                    seedList.add(createServerAddress(cur));
                 }
                 mode(ClusterConnectionMode.MULTIPLE).hosts(seedList);
             }
             requiredReplicaSetName(connectionString.getRequiredReplicaSetName());
 
-            int maxSize = connectionString.getMaxConnectionPoolSize() != null ? connectionString.getMaxConnectionPoolSize() : 100;
-            int waitQueueMultiple = connectionString.getThreadsAllowedToBlockForConnectionMultiplier() != null
-                                    ? connectionString.getThreadsAllowedToBlockForConnectionMultiplier() : 5;
+            Integer maxConnectionPoolSize = connectionString.getMaxConnectionPoolSize();
+            int maxSize = maxConnectionPoolSize != null ? maxConnectionPoolSize : 100;
+
+            Integer threadsAllowedToBlockForConnectionMultiplier = connectionString.getThreadsAllowedToBlockForConnectionMultiplier();
+            int waitQueueMultiple = threadsAllowedToBlockForConnectionMultiplier != null
+                                    ? threadsAllowedToBlockForConnectionMultiplier : 5;
             maxWaitQueueSize(waitQueueMultiple * maxSize);
 
-            if (connectionString.getServerSelectionTimeout() != null) {
-                serverSelectionTimeout(connectionString.getServerSelectionTimeout(), TimeUnit.MILLISECONDS);
+            Integer serverSelectionTimeout = connectionString.getServerSelectionTimeout();
+            if (serverSelectionTimeout != null) {
+                serverSelectionTimeout(serverSelectionTimeout, MILLISECONDS);
             }
 
+            Integer localThreshold = connectionString.getLocalThreshold();
+            if (localThreshold != null) {
+                localThreshold(localThreshold, MILLISECONDS);
+            }
             return this;
         }
 
+        private ServerSelector unpackServerSelector(final ServerSelector serverSelector) {
+            if (serverSelector instanceof CompositeServerSelector) {
+                return ((CompositeServerSelector) serverSelector).getServerSelectors().get(0);
+            }
+            return null;
+        }
+
+        private ServerSelector packServerSelector() {
+            ServerSelector latencyMinimizingServerSelector = new LatencyMinimizingServerSelector(localThresholdMS, MILLISECONDS);
+            if (serverSelector == null) {
+                return latencyMinimizingServerSelector;
+            }
+            return new CompositeServerSelector(asList(serverSelector, latencyMinimizingServerSelector));
+        }
+
         /**
          * Build the settings from the builder.
          *
@@ -240,11 +354,22 @@ public ClusterSettings build() {
      * Gets the user defined description of the MongoClient.
      *
      * @return the user defined description of the MongoClient
+     * @deprecated Prefer {@link MongoClientSettings#getApplicationName()}
      */
+    @Deprecated
     public String getDescription() {
         return description;
     }
 
+    /**
+     * Gets the host name from which to lookup SRV record for the seed list
+     * @return the SRV host, or null if none specified
+     * @since 3.10
+     */
+    public String getSrvHost() {
+        return srvHost;
+    }
+
     /**
      * Gets the seed list of hosts for the cluster.
      *
@@ -264,9 +389,9 @@ public ClusterConnectionMode getMode() {
     }
 
     /**
-     * Get
+     * Gets the required cluster type
      *
-     * @return the cluster type
+     * @return the required cluster type
      */
     public ClusterType getRequiredClusterType() {
         return requiredClusterType;
@@ -282,8 +407,26 @@ public String getRequiredReplicaSetName() {
     }
 
     /**
-     * Gets the {@code ServerSelector} that will be uses as the final server selector that is applied in calls to {@code
-     * Cluster.selectServer}.
+     * Gets the server selector.
+     *
+     * <p>The server selector augments the normal server selection rules applied by the driver when determining
+     * which server to send an operation to.  At the point that it's called by the driver, the
+     * {@link com.mongodb.connection.ClusterDescription} which is passed to it contains a list of
+     * {@link com.mongodb.connection.ServerDescription} instances which satisfy either the configured {@link com.mongodb.ReadPreference}
+     * for any read operation or ones that can take writes (e.g. a standalone, mongos, or replica set primary).
+     * </p>
+     * <p>The server selector can then filter the {@code ServerDescription} list using whatever criteria that is required by the
+     * application.</p>
+     * <p>After this selector executes, two additional selectors are applied by the driver:</p>
+     * <ul>
+     * <li>select from within the latency window</li>
+     * <li>select a random server from those remaining</li>
+     * </ul>
+     * <p>To skip the latency window selector, an application can:</p>
+     * <ul>
+     * <li>configure the local threshold to a sufficiently high value so that it doesn't exclude any servers</li>
+     * <li>return a list containing a single server from this selector (which will also make the random member selector a no-op)</li>
+     * </ul>
      *
      * @return the server selector, which may be null
      * @see Cluster#selectServer(com.mongodb.selector.ServerSelector)
@@ -303,7 +446,29 @@ public ServerSelector getServerSelector() {
      * @return the timeout in the given time unit
      */
     public long getServerSelectionTimeout(final TimeUnit timeUnit) {
-        return timeUnit.convert(serverSelectionTimeoutMS, TimeUnit.MILLISECONDS);
+        return timeUnit.convert(serverSelectionTimeoutMS, MILLISECONDS);
+    }
+
+    /**
+     * Gets the local threshold.  When choosing among multiple MongoDB servers to send a request, the MongoClient will only
+     * send that request to a server whose ping time is less than or equal to the server with the fastest ping time plus the local
+     * threshold.
+     *
+     * <p>For example, let's say that the client is choosing a server to send a query when the read preference is {@code
+     * ReadPreference.secondary()}, and that there are three secondaries, server1, server2, and server3, whose ping times are 10, 15, and 16
+     * milliseconds, respectively.  With a local threshold of 5 milliseconds, the client will send the query to either
+     * server1 or server2 (randomly selecting between the two).
+     * </p>
+     *
+     * <p>Default is 15 milliseconds.</p>
+     *
+     * @param timeUnit the time unit
+     * @return the local threshold in the given timeunit.
+     * @since 3.7
+     * @mongodb.driver.manual reference/program/mongos/#cmdoption--localThreshold Local Threshold
+     */
+    public long getLocalThreshold(final TimeUnit timeUnit) {
+        return timeUnit.convert(localThresholdMS, MILLISECONDS);
     }
 
     /**
@@ -313,7 +478,9 @@ public long getServerSelectionTimeout(final TimeUnit timeUnit) {
      * <p>Default is 500.</p>
      *
      * @return the number of threads that are allowed to be waiting for a connection.
+     * @deprecated in the next major release, wait queue size limitations will be removed
      */
+    @Deprecated
     public int getMaxWaitQueueSize() {
         return maxWaitQueueSize;
     }
@@ -325,7 +492,7 @@ public int getMaxWaitQueueSize() {
      * @since 3.3
      */
     public List<ClusterListener> getClusterListeners() {
-        return Collections.unmodifiableList(clusterListeners);
+        return clusterListeners;
     }
 
     @Override
@@ -345,9 +512,15 @@ public boolean equals(final Object o) {
         if (serverSelectionTimeoutMS != that.serverSelectionTimeoutMS) {
             return false;
         }
+        if (localThresholdMS != that.localThresholdMS) {
+            return false;
+        }
         if (description != null ? !description.equals(that.description) : that.description != null) {
             return false;
         }
+        if (srvHost != null ? !srvHost.equals(that.srvHost) : that.srvHost != null) {
+            return false;
+        }
         if (!hosts.equals(that.hosts)) {
             return false;
         }
@@ -374,12 +547,14 @@ public boolean equals(final Object o) {
     @Override
     public int hashCode() {
         int result = hosts.hashCode();
+        result = 31 * result + (srvHost != null ? srvHost.hashCode() : 0);
         result = 31 * result + mode.hashCode();
         result = 31 * result + requiredClusterType.hashCode();
         result = 31 * result + (requiredReplicaSetName != null ? requiredReplicaSetName.hashCode() : 0);
         result = 31 * result + (serverSelector != null ? serverSelector.hashCode() : 0);
         result = 31 * result + (description != null ? description.hashCode() : 0);
         result = 31 * result + (int) (serverSelectionTimeoutMS ^ (serverSelectionTimeoutMS >>> 32));
+        result = 31 * result + (int) (localThresholdMS ^ (localThresholdMS >>> 32));
         result = 31 * result + maxWaitQueueSize;
         result = 31 * result + clusterListeners.hashCode();
         return result;
@@ -388,13 +563,15 @@ public int hashCode() {
     @Override
     public String toString() {
         return "{"
-               + "hosts=" + hosts
+               + (hosts.isEmpty() ? "" : "hosts=" + hosts)
+               + (srvHost == null ? "" : ", srvHost=" + srvHost)
                + ", mode=" + mode
                + ", requiredClusterType=" + requiredClusterType
                + ", requiredReplicaSetName='" + requiredReplicaSetName + '\''
                + ", serverSelector='" + serverSelector + '\''
                + ", clusterListeners='" + clusterListeners + '\''
                + ", serverSelectionTimeout='" + serverSelectionTimeoutMS + " ms" + '\''
+               + ", localThreshold='" + serverSelectionTimeoutMS + " ms" + '\''
                + ", maxWaitQueueSize=" + maxWaitQueueSize
                + ", description='" + description + '\''
                + '}';
@@ -407,7 +584,8 @@ public String toString() {
      */
     public String getShortDescription() {
         return "{"
-               + "hosts=" + hosts
+                + (hosts.isEmpty() ? "" : "hosts=" + hosts)
+                + (srvHost == null ? "" : ", srvHost=" + srvHost)
                + ", mode=" + mode
                + ", requiredClusterType=" + requiredClusterType
                + ", serverSelectionTimeout='" + serverSelectionTimeoutMS + " ms" + '\''
@@ -418,14 +596,23 @@ public String getShortDescription() {
     }
 
     private ClusterSettings(final Builder builder) {
-        notNull("hosts", builder.hosts);
-        isTrueArgument("hosts size > 0", builder.hosts.size() > 0);
+        // TODO: Unit test this
+        if (builder.srvHost != null) {
+            if (builder.srvHost.contains(":")) {
+                throw new IllegalArgumentException("The srvHost can not contain a host name that specifies a port");
+            }
+
+            if (builder.hosts.get(0).getHost().split("\\.").length < 3) {
+                throw new MongoClientException(format("An SRV host name '%s' was provided that does not contain at least three parts. "
+                        + "It must contain a hostname, domain name and a top level domain.", builder.hosts.get(0).getHost()));
+            }
+        }
 
         if (builder.hosts.size() > 1 && builder.requiredClusterType == ClusterType.STANDALONE) {
             throw new IllegalArgumentException("Multiple hosts cannot be specified when using ClusterType.STANDALONE.");
         }
 
-        if (builder.mode == ClusterConnectionMode.SINGLE && builder.hosts.size() > 1) {
+        if (builder.mode != null && builder.mode == ClusterConnectionMode.SINGLE && builder.hosts.size() > 1) {
             throw new IllegalArgumentException("Can not directly connect to more than one server");
         }
 
@@ -439,13 +626,15 @@ private ClusterSettings(final Builder builder) {
         }
 
         description = builder.description;
+        srvHost = builder.srvHost;
         hosts = builder.hosts;
-        mode = builder.mode;
+        mode = builder.mode != null ? builder.mode : hosts.size() == 1 ? ClusterConnectionMode.SINGLE : ClusterConnectionMode.MULTIPLE;
         requiredReplicaSetName = builder.requiredReplicaSetName;
         requiredClusterType = builder.requiredClusterType;
-        serverSelector = builder.serverSelector;
+        localThresholdMS = builder.localThresholdMS;
+        serverSelector = builder.packServerSelector();
         serverSelectionTimeoutMS = builder.serverSelectionTimeoutMS;
         maxWaitQueueSize = builder.maxWaitQueueSize;
-        clusterListeners = builder.clusterListeners;
+        clusterListeners = unmodifiableList(builder.clusterListeners);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterType.java b/driver-core/src/main/com/mongodb/connection/ClusterType.java
index 118a614e638..ac9ef045101 100644
--- a/driver-core/src/main/com/mongodb/connection/ClusterType.java
+++ b/driver-core/src/main/com/mongodb/connection/ClusterType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterableServerFactory.java b/driver-core/src/main/com/mongodb/connection/ClusterableServerFactory.java
deleted file mode 100644
index 69b9e1cd664..00000000000
--- a/driver-core/src/main/com/mongodb/connection/ClusterableServerFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.ServerAddress;
-import com.mongodb.event.ServerListener;
-
-interface ClusterableServerFactory {
-    ClusterableServer create(ServerAddress serverAddress, final ServerListener serverListener);
-
-    ServerSettings getSettings();
-}
diff --git a/driver-core/src/main/com/mongodb/connection/CommandHelper.java b/driver-core/src/main/com/mongodb/connection/CommandHelper.java
deleted file mode 100644
index cfcd4419203..00000000000
--- a/driver-core/src/main/com/mongodb/connection/CommandHelper.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCommandException;
-import com.mongodb.MongoInternalException;
-import com.mongodb.MongoNamespace;
-import com.mongodb.async.SingleResultCallback;
-import org.bson.BsonDocument;
-import org.bson.BsonValue;
-import org.bson.codecs.BsonDocumentCodec;
-
-import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
-import static java.lang.String.format;
-
-final class CommandHelper {
-    static BsonDocument executeCommand(final String database, final BsonDocument command, final InternalConnection internalConnection) {
-        return receiveCommandResult(internalConnection, sendMessage(database, command, internalConnection));
-    }
-
-    static void executeCommandAsync(final String database, final BsonDocument command, final InternalConnection internalConnection,
-                                    final SingleResultCallback<BsonDocument> callback) {
-        sendMessageAsync(database, command, internalConnection, new SingleResultCallback<CommandMessage>() {
-            @Override
-            public void onResult(final CommandMessage result, final Throwable t) {
-                  if (t != null) {
-                      callback.onResult(null, t);
-                  } else {
-                      receiveReplyAsync(internalConnection, result, new SingleResultCallback<ReplyMessage<BsonDocument>>() {
-                          @Override
-                          public void onResult(final ReplyMessage<BsonDocument> result, final Throwable t) {
-                              if (t != null) {
-                                  callback.onResult(null, t);
-                              } else {
-                                  BsonDocument reply = result.getDocuments().get(0);
-                                  if (!isCommandOk(reply)) {
-                                      callback.onResult(null, createCommandFailureException(reply, internalConnection));
-                                  } else {
-                                      callback.onResult(reply, null);
-                                  }
-                              }
-                          }
-                      });
-                  }
-            }
-        });
-    }
-
-    static BsonDocument executeCommandWithoutCheckingForFailure(final String database, final BsonDocument command,
-                                                                final InternalConnection internalConnection) {
-        return receiveCommandDocument(internalConnection, sendMessage(database, command, internalConnection));
-    }
-
-    static boolean isCommandOk(final BsonDocument response) {
-        if (!response.containsKey("ok")) {
-            return false;
-        }
-        BsonValue okValue = response.get("ok");
-        if (okValue.isBoolean()) {
-            return okValue.asBoolean().getValue();
-        } else if (okValue.isNumber()) {
-            return okValue.asNumber().intValue() == 1;
-        } else {
-            return false;
-        }
-    }
-
-    private static CommandMessage sendMessage(final String database, final BsonDocument command,
-                                              final InternalConnection internalConnection) {
-        ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(internalConnection);
-        try {
-            CommandMessage message = new CommandMessage(new MongoNamespace(database, COMMAND_COLLECTION_NAME).getFullName(),
-                                                        command, false, MessageSettings.builder().build());
-            message.encode(bsonOutput);
-            internalConnection.sendMessage(bsonOutput.getByteBuffers(), message.getId());
-            return message;
-        } finally {
-            bsonOutput.close();
-        }
-    }
-
-    private static void sendMessageAsync(final String database, final BsonDocument command,
-                                         final InternalConnection internalConnection,
-                                         final SingleResultCallback<CommandMessage> callback) {
-        final ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(internalConnection);
-        try {
-            final CommandMessage message = new CommandMessage(new MongoNamespace(database, COMMAND_COLLECTION_NAME).getFullName(),
-                                                              command, false, MessageSettings.builder().build());
-            message.encode(bsonOutput);
-            internalConnection.sendMessageAsync(bsonOutput.getByteBuffers(), message.getId(), new SingleResultCallback<Void>() {
-                @Override
-                public void onResult(final Void result, final Throwable t) {
-                    bsonOutput.close();
-                    if (t != null) {
-                        callback.onResult(null, t);
-                    } else {
-                        callback.onResult(message, null);
-                    }
-                }
-            });
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-        }
-    }
-
-    private static BsonDocument receiveCommandResult(final InternalConnection internalConnection, final CommandMessage message) {
-        BsonDocument result = receiveReply(internalConnection, message).getDocuments().get(0);
-        if (!isCommandOk(result)) {
-            throw createCommandFailureException(result, internalConnection);
-        }
-
-        return result;
-    }
-
-    private static BsonDocument receiveCommandDocument(final InternalConnection internalConnection, final CommandMessage message) {
-        return receiveReply(internalConnection, message).getDocuments().get(0);
-    }
-
-    private static ReplyMessage<BsonDocument> receiveReply(final InternalConnection internalConnection, final CommandMessage message) {
-        ResponseBuffers responseBuffers = internalConnection.receiveMessage(message.getId());
-        if (responseBuffers == null) {
-            throw new MongoInternalException(format("Response buffers received from %s should not be null", internalConnection));
-        }
-        try {
-            return new ReplyMessage<BsonDocument>(responseBuffers, new BsonDocumentCodec(), message.getId());
-        } finally {
-            responseBuffers.close();
-        }
-    }
-
-    private static void receiveReplyAsync(final InternalConnection internalConnection, final CommandMessage message,
-                                          final SingleResultCallback<ReplyMessage<BsonDocument>> callback) {
-        internalConnection.receiveMessageAsync(message.getId(),
-                                               new SingleResultCallback<ResponseBuffers>() {
-                                                   @Override
-                                                   public void onResult(final ResponseBuffers result, final Throwable t) {
-                                                       try {
-                                                           if (t != null) {
-                                                               callback.onResult(null, t);
-                                                           } else {
-                                                               callback.onResult(new ReplyMessage<BsonDocument>(result,
-                                                                                                                new BsonDocumentCodec(),
-                                                                                                                message.getId()), null);
-                                                           }
-                                                       } finally {
-                                                           if (result != null) {
-                                                               result.close();
-                                                           }
-                                                       }
-                                                   }
-                                               });
-    }
-
-    private static MongoCommandException createCommandFailureException(final BsonDocument reply,
-                                                                       final InternalConnection internalConnection) {
-        return new MongoCommandException(reply, internalConnection.getDescription().getServerAddress());
-    }
-
-    private CommandHelper() {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/CommandMessage.java b/driver-core/src/main/com/mongodb/connection/CommandMessage.java
deleted file mode 100644
index cb81e5b2235..00000000000
--- a/driver-core/src/main/com/mongodb/connection/CommandMessage.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import org.bson.BsonDocument;
-import org.bson.FieldNameValidator;
-import org.bson.io.BsonOutput;
-
-/**
- * A command message that uses OP_QUERY to send the command.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
- */
-class CommandMessage extends RequestMessage {
-    private final boolean slaveOk;
-    private final BsonDocument command;
-    private final FieldNameValidator validator;
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection to execute the command in
-     * @param command        the command
-     * @param slaveOk        if querying of non-primary replica set members is allowed
-     * @param settings       the message settings
-     */
-    public CommandMessage(final String collectionName, final BsonDocument command, final boolean slaveOk, final MessageSettings settings) {
-        this(collectionName, command, slaveOk, new NoOpFieldNameValidator(), settings);
-    }
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection to execute the command in
-     * @param command        the command
-     * @param slaveOk        if querying of non-primary replica set members is allowed
-     * @param validator      the field name validator
-     * @param settings       the message settings
-     */
-    public CommandMessage(final String collectionName, final BsonDocument command, final boolean slaveOk,
-                          final FieldNameValidator validator, final MessageSettings settings) {
-        super(collectionName, OpCode.OP_QUERY, settings);
-        this.slaveOk = slaveOk;
-        this.command = command;
-        this.validator = validator;
-    }
-
-    @Override
-    protected RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final int messageStartPosition) {
-        return encodeMessageBodyWithMetadata(bsonOutput, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final int messageStartPosition) {
-        bsonOutput.writeInt32(slaveOk ? 1 << 2 : 0);
-        bsonOutput.writeCString(getCollectionName());
-        bsonOutput.writeInt32(0);
-        bsonOutput.writeInt32(-1);
-        int firstDocumentPosition = bsonOutput.getPosition();
-        addDocument(command, bsonOutput, validator);
-        return new EncodingMetadata(null, firstDocumentPosition);
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/CommandProtocol.java b/driver-core/src/main/com/mongodb/connection/CommandProtocol.java
deleted file mode 100644
index 573f21a564f..00000000000
--- a/driver-core/src/main/com/mongodb/connection/CommandProtocol.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCommandException;
-import com.mongodb.MongoNamespace;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.event.CommandListener;
-import org.bson.BsonBinaryReader;
-import org.bson.BsonDocument;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.Decoder;
-import org.bson.codecs.RawBsonDocumentCodec;
-import org.bson.io.ByteBufferBsonInput;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.connection.ByteBufBsonDocument.createOne;
-import static com.mongodb.connection.ProtocolHelper.getCommandFailureException;
-import static com.mongodb.connection.ProtocolHelper.sendCommandFailedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandStartedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandSucceededEvent;
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-
-/**
- * A protocol for executing a command against a MongoDB server using the OP_QUERY wire protocol message.
- *
- * @param <T> the type returned from execution
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
- */
-class CommandProtocol<T> implements Protocol<T> {
-
-    public static final Logger LOGGER = Loggers.getLogger("protocol.command");
-
-    private static final Set<String> SECURITY_SENSITIVE_COMMANDS = new HashSet<String>(asList("authenticate",
-                                                                                              "saslStart",
-                                                                                              "saslContinue",
-                                                                                              "getnonce",
-                                                                                              "createUser",
-                                                                                              "updateUser",
-                                                                                              "copydbgetnonce",
-                                                                                              "copydbsaslstart",
-                                                                                              "copydb"));
-    private final MongoNamespace namespace;
-    private final BsonDocument command;
-    private final Decoder<T> commandResultDecoder;
-    private final FieldNameValidator fieldNameValidator;
-    private boolean slaveOk;
-    private CommandListener commandListener;
-    private volatile String commandName;
-
-    /**
-     * Construct an instance.
-     * @param database             the database
-     * @param command              the command
-     * @param fieldNameValidator   the field name validator to apply tot the command
-     * @param commandResultDecoder the decoder to use to decode the command result
-     */
-    public CommandProtocol(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
-                           final Decoder<T> commandResultDecoder) {
-        notNull("database", database);
-        this.namespace = new MongoNamespace(database, MongoNamespace.COMMAND_COLLECTION_NAME);
-        this.command = notNull("command", command);
-        this.commandResultDecoder = notNull("commandResultDecoder", commandResultDecoder);
-        this.fieldNameValidator = notNull("fieldNameValidator", fieldNameValidator);
-    }
-
-    public boolean isSlaveOk() {
-        return slaveOk;
-    }
-
-    public CommandProtocol<T> slaveOk(final boolean slaveOk) {
-        this.slaveOk = slaveOk;
-        return this;
-    }
-
-
-    @Override
-    public T execute(final InternalConnection connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(format("Sending command {%s : %s} to database %s on connection [%s] to server %s",
-                                getCommandName(), command.values().iterator().next(),
-                                namespace.getDatabaseName(), connection.getDescription().getConnectionId(),
-                                connection.getDescription().getServerAddress()));
-        }
-        long startTimeNanos = System.nanoTime();
-        CommandMessage commandMessage = new CommandMessage(namespace.getFullName(), command, slaveOk, fieldNameValidator,
-                ProtocolHelper.getMessageSettings(connection.getDescription()));
-        ResponseBuffers responseBuffers = null;
-        try {
-            sendMessage(commandMessage, connection);
-            responseBuffers = connection.receiveMessage(commandMessage.getId());
-            if (!ProtocolHelper.isCommandOk(new BsonBinaryReader(new ByteBufferBsonInput(responseBuffers.getBodyByteBuffer())))) {
-                throw getCommandFailureException(getResponseDocument(responseBuffers, commandMessage, new BsonDocumentCodec()),
-                        connection.getDescription().getServerAddress());
-            }
-
-            T retval = getResponseDocument(responseBuffers, commandMessage, commandResultDecoder);
-
-            if (commandListener != null) {
-                sendSucceededEvent(connection.getDescription(), startTimeNanos, commandMessage,
-                        getResponseDocument(responseBuffers, commandMessage, new RawBsonDocumentCodec()));
-            }
-            LOGGER.debug("Command execution completed");
-            return retval;
-        } catch (RuntimeException e) {
-            sendFailedEvent(connection.getDescription(), startTimeNanos, commandMessage, e);
-            throw e;
-        } finally {
-            if (responseBuffers != null) {
-                responseBuffers.close();
-            }
-        }
-    }
-
-    private static <D> D getResponseDocument(final ResponseBuffers responseBuffers, final CommandMessage commandMessage,
-                                             final Decoder<D> decoder) {
-        responseBuffers.reset();
-        ReplyMessage<D> replyMessage = new ReplyMessage<D>(responseBuffers, decoder, commandMessage.getId());
-
-        return replyMessage.getDocuments().get(0);
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<T> callback) {
-        long startTimeNanos = System.nanoTime();
-        CommandMessage message = new CommandMessage(namespace.getFullName(), command, slaveOk, fieldNameValidator,
-                ProtocolHelper.getMessageSettings(connection.getDescription()));
-        boolean sentStartedEvent = false;
-        try {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Asynchronously sending command {%s : %s} to database %s on connection [%s] to server %s",
-                                    getCommandName(), command.values().iterator().next(),
-                                    namespace.getDatabaseName(), connection.getDescription().getConnectionId(),
-                                    connection.getDescription().getServerAddress()));
-            }
-            ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
-            int documentPosition = ProtocolHelper.encodeMessageWithMetadata(message, bsonOutput).getFirstDocumentPosition();
-            sendStartedEvent(connection, bsonOutput, message, documentPosition);
-            sentStartedEvent = true;
-            SingleResultCallback<ResponseBuffers> receiveCallback = new CommandResultCallback(callback, message,
-                    connection.getDescription(), startTimeNanos);
-            connection.sendMessageAsync(bsonOutput.getByteBuffers(), message.getId(),
-                                        new SendMessageCallback<T>(connection, bsonOutput, message, getCommandName(), startTimeNanos,
-                                                commandListener, callback, receiveCallback));
-        } catch (Throwable t) {
-            if (sentStartedEvent) {
-                sendFailedEvent(connection.getDescription(), startTimeNanos, message, t);
-            }
-            callback.onResult(null, t);
-        }
-    }
-
-    @Override
-    public void setCommandListener(final CommandListener commandListener) {
-        this.commandListener = commandListener;
-    }
-
-    private String getCommandName() {
-        return commandName != null ? commandName : command.keySet().iterator().next();
-    }
-
-    private void sendMessage(final CommandMessage message, final InternalConnection connection) {
-        ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
-        try {
-            int documentPosition = message.encodeWithMetadata(bsonOutput).getFirstDocumentPosition();
-            sendStartedEvent(connection, bsonOutput, message, documentPosition);
-
-            connection.sendMessage(bsonOutput.getByteBuffers(), message.getId());
-        } finally {
-            bsonOutput.close();
-        }
-    }
-
-    private void sendStartedEvent(final InternalConnection connection, final ByteBufferBsonOutput bsonOutput, final CommandMessage message,
-                                  final int documentPosition) {
-        if (commandListener != null) {
-            ByteBufBsonDocument byteBufBsonDocument = createOne(bsonOutput, documentPosition);
-            BsonDocument commandDocument;
-            if (byteBufBsonDocument.containsKey("$query")) {
-                commandDocument = byteBufBsonDocument.getDocument("$query");
-                commandName = commandDocument.keySet().iterator().next();
-            } else {
-                commandDocument = byteBufBsonDocument;
-                commandName = byteBufBsonDocument.getFirstKey();
-            }
-            BsonDocument commandDocumentForEvent = (SECURITY_SENSITIVE_COMMANDS.contains(commandName))
-                                                   ? new BsonDocument() : commandDocument;
-            sendCommandStartedEvent(message, namespace.getDatabaseName(), commandName,
-                                    commandDocumentForEvent, connection.getDescription(), commandListener);
-        }
-    }
-
-    private void sendSucceededEvent(final ConnectionDescription connectionDescription, final long startTimeNanos,
-                                    final CommandMessage commandMessage, final BsonDocument response) {
-        if (commandListener != null) {
-            BsonDocument responseDocumentForEvent = (SECURITY_SENSITIVE_COMMANDS.contains(getCommandName()))
-                    ? new BsonDocument() : response;
-            sendCommandSucceededEvent(commandMessage, getCommandName(), responseDocumentForEvent, connectionDescription,
-                    startTimeNanos, commandListener);
-        }
-    }
-
-    private void sendFailedEvent(final ConnectionDescription connectionDescription, final long startTimeNanos,
-                                 final CommandMessage commandMessage, final Throwable t) {
-        if (commandListener != null) {
-            Throwable commandEventException = t;
-            if (t instanceof MongoCommandException && (SECURITY_SENSITIVE_COMMANDS.contains(getCommandName()))) {
-                commandEventException = new MongoCommandException(new BsonDocument(), connectionDescription.getServerAddress());
-            }
-            sendCommandFailedEvent(commandMessage, getCommandName(), connectionDescription, startTimeNanos, commandEventException,
-                    commandListener);
-        }
-    }
-
-    class CommandResultCallback extends ResponseCallback {
-        private final SingleResultCallback<T> callback;
-        private final CommandMessage message;
-        private final ConnectionDescription connectionDescription;
-        private final long startTimeNanos;
-
-        CommandResultCallback(final SingleResultCallback<T> callback, final CommandMessage message,
-                              final ConnectionDescription connectionDescription, final long startTimeNanos) {
-            super(message.getId(), connectionDescription.getServerAddress());
-            this.callback = callback;
-            this.message = message;
-            this.connectionDescription = connectionDescription;
-            this.startTimeNanos = startTimeNanos;
-        }
-
-        @Override
-        protected void callCallback(final ResponseBuffers responseBuffers, final Throwable throwableFromCallback) {
-            try {
-                if (throwableFromCallback != null) {
-                    throw throwableFromCallback;
-                }
-
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Command execution completed");
-                }
-
-                if (!ProtocolHelper.isCommandOk(new BsonBinaryReader(new ByteBufferBsonInput(responseBuffers.getBodyByteBuffer())))) {
-                    throw getCommandFailureException(getResponseDocument(responseBuffers, message, new BsonDocumentCodec()),
-                            connectionDescription.getServerAddress());
-                }
-
-                if (commandListener != null) {
-                    sendSucceededEvent(connectionDescription, startTimeNanos, message,
-                            getResponseDocument(responseBuffers, message, new RawBsonDocumentCodec()));
-                }
-                callback.onResult(getResponseDocument(responseBuffers, message, commandResultDecoder), null);
-
-            } catch (Throwable t) {
-                sendFailedEvent(connectionDescription, startTimeNanos, message, t);
-                callback.onResult(null, t);
-            } finally {
-                if (responseBuffers != null) {
-                    responseBuffers.close();
-                }
-            }
-
-
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/Connection.java b/driver-core/src/main/com/mongodb/connection/Connection.java
index 82dd1556d0c..e17a6f246a8 100644
--- a/driver-core/src/main/com/mongodb/connection/Connection.java
+++ b/driver-core/src/main/com/mongodb/connection/Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,14 @@
 package com.mongodb.connection;
 
 import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
+import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcernResult;
 import com.mongodb.annotations.ThreadSafe;
 import com.mongodb.binding.ReferenceCounted;
-import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.bulk.DeleteRequest;
 import com.mongodb.bulk.InsertRequest;
 import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonDocument;
 import org.bson.FieldNameValidator;
 import org.bson.codecs.Decoder;
@@ -42,6 +42,7 @@
  * @since 3.0
  */
 @ThreadSafe
+@Deprecated
 public interface Connection extends ReferenceCounted {
 
     @Override
@@ -59,116 +60,82 @@ public interface Connection extends ReferenceCounted {
      *
      * @param namespace    the namespace
      * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param inserts      the inserts
+     * @param insertRequest the insert request
      * @return the write concern result
      */
-    WriteConcernResult insert(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<InsertRequest> inserts);
+    WriteConcernResult insert(MongoNamespace namespace, boolean ordered, InsertRequest insertRequest);
 
     /**
      * Update the documents using the update wire protocol and apply the write concern.
      *
      * @param namespace    the namespace
      * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param updates      the updates
+     * @param updateRequest the update request
      * @return the write concern result
      */
-    WriteConcernResult update(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern,
-                              List<UpdateRequest> updates);
+    WriteConcernResult update(MongoNamespace namespace, boolean ordered, UpdateRequest updateRequest);
 
     /**
      * Delete the documents using the delete wire protocol and apply the write concern.
      *
      * @param namespace    the namespace
      * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param deletes      the deletes
+     * @param deleteRequest the delete request
      * @return the write concern result
      */
-    WriteConcernResult delete(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern,
-                              List<DeleteRequest> deletes);
+    WriteConcernResult delete(MongoNamespace namespace, boolean ordered, DeleteRequest deleteRequest);
 
     /**
-     * Insert the documents using the insert command.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param inserts      the inserts
-     * @return the bulk write result
-     * @deprecated Replaced by {@link Connection#insertCommand(MongoNamespace, boolean, WriteConcern, Boolean, List)}
-     */
-    @Deprecated
-    BulkWriteResult insertCommand(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<InsertRequest> inserts);
-
-    /**
-     * Insert the documents using the insert command.
-     *
-     * @param namespace                 the namespace
-     * @param ordered                   whether the writes are ordered
-     * @param writeConcern              the write concern
-     * @param bypassDocumentValidation  the bypassDocumentValidation flag
-     * @param inserts                   the inserts
-     * @return the bulk write result
-     * @since 3.2
-     * @mongodb.driver.manual reference/command/insert/ Insert
-     */
-    BulkWriteResult insertCommand(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, Boolean bypassDocumentValidation,
-                                  List<InsertRequest> inserts);
-
-    /**
-     * Update the documents using the update command.
+     * Execute the command.
      *
-     * @param namespace    the namespace
-     * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param updates      the updates
-     * @return the bulk write result
-     * @deprecated Replaced by {@link Connection#updateCommand(MongoNamespace, boolean, WriteConcern, Boolean, List)}}
+     * @param database             the database to execute the command in
+     * @param command              the command document
+     * @param slaveOk              whether the command can run on a secondary
+     * @param fieldNameValidator   the field name validator for the command document
+     * @param commandResultDecoder the decoder for the result
+     * @param <T>                  the type of the result
+     * @return the command result
+     * @deprecated Prefer {@link #command(String, BsonDocument, FieldNameValidator, ReadPreference, Decoder, SessionContext)}
      */
     @Deprecated
-    BulkWriteResult updateCommand(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<UpdateRequest> updates);
-
-    /**
-     * Update the documents using the update command.
-     *
-     * @param namespace                 the namespace
-     * @param ordered                   whether the writes are ordered
-     * @param writeConcern              the write concern
-     * @param bypassDocumentValidation  the bypassDocumentValidation flag
-     * @param updates                   the updates
-     * @return the bulk write result
-     * @since 3.2
-     * @mongodb.driver.manual reference/command/update/ Update
-     */
-    BulkWriteResult updateCommand(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, Boolean bypassDocumentValidation,
-                                  List<UpdateRequest> updates);
-
-    /**
-     * Delete the documents using the delete command.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param deletes      the deletes
-     * @return the bulk write result
-     */
-    BulkWriteResult deleteCommand(MongoNamespace namespace, boolean ordered, WriteConcern writeConcern, List<DeleteRequest> deletes);
+    <T> T command(String database, BsonDocument command, boolean slaveOk, FieldNameValidator fieldNameValidator,
+                  Decoder<T> commandResultDecoder);
 
     /**
      * Execute the command.
      *
+     * @param <T>                  the type of the result
      * @param database             the database to execute the command in
      * @param command              the command document
-     * @param slaveOk              whether the command can run on a secondary
      * @param fieldNameValidator   the field name validator for the command document
+     * @param readPreference       the read preference that was applied to get this connection, or null if this is a write operation
      * @param commandResultDecoder the decoder for the result
-     * @param <T>                  the type of the result
+     * @param sessionContext       the session context
      * @return the command result
+     * @since 3.6
      */
-    <T> T command(String database, BsonDocument command, boolean slaveOk, FieldNameValidator fieldNameValidator,
-                  Decoder<T> commandResultDecoder);
+    <T> T command(String database, BsonDocument command, FieldNameValidator fieldNameValidator, ReadPreference readPreference,
+                  Decoder<T> commandResultDecoder, SessionContext sessionContext);
+
+    /**
+     * Executes the command, consuming as much of the {@code SplittablePayload} as possible.
+     *
+     * @param <T>                       the type of the result
+     * @param database                  the database to execute the command in
+     * @param command                   the command document
+     * @param commandFieldNameValidator the field name validator for the command document
+     * @param readPreference            the read preference that was applied to get this connection, or null if this is a write operation
+     * @param commandResultDecoder      the decoder for the result
+     * @param sessionContext            the session context
+     * @param responseExpected          true if a response from the server is expected
+     * @param payload                   the splittable payload to incorporate with the command
+     * @param payloadFieldNameValidator the field name validator for the payload documents
+     * @return the command result
+     * @since 3.6
+     */
+    <T> T command(String database, BsonDocument command, FieldNameValidator commandFieldNameValidator, ReadPreference readPreference,
+                  Decoder<T> commandResultDecoder, SessionContext sessionContext, boolean responseExpected,
+                  SplittablePayload payload, FieldNameValidator payloadFieldNameValidator);
 
     /**
      * Execute the query.
diff --git a/driver-core/src/main/com/mongodb/connection/ConnectionDescription.java b/driver-core/src/main/com/mongodb/connection/ConnectionDescription.java
index 46a978c5e58..7d960a9d872 100644
--- a/driver-core/src/main/com/mongodb/connection/ConnectionDescription.java
+++ b/driver-core/src/main/com/mongodb/connection/ConnectionDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,10 @@
 import com.mongodb.ServerAddress;
 import com.mongodb.annotations.Immutable;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.connection.ServerDescription.getDefaultMaxDocumentSize;
 
@@ -31,10 +35,12 @@
 public class ConnectionDescription {
     private final ConnectionId connectionId;
     private final ServerVersion serverVersion;
+    private final int maxWireVersion;
     private final ServerType serverType;
     private final int maxBatchCount;
     private final int maxDocumentSize;
     private final int maxMessageSize;
+    private final List<String> compressors;
 
     private static final int DEFAULT_MAX_MESSAGE_SIZE = 0x2000000;   // 32MB
     private static final int DEFAULT_MAX_WRITE_BATCH_SIZE = 512;
@@ -45,8 +51,8 @@ public class ConnectionDescription {
      * @param serverId   the server address
      */
     public ConnectionDescription(final ServerId serverId) {
-        this(new ConnectionId(serverId), new ServerVersion(), ServerType.UNKNOWN, DEFAULT_MAX_WRITE_BATCH_SIZE,
-             getDefaultMaxDocumentSize(), DEFAULT_MAX_MESSAGE_SIZE);
+        this(new ConnectionId(serverId), new ServerVersion(), 0, ServerType.UNKNOWN, DEFAULT_MAX_WRITE_BATCH_SIZE,
+             getDefaultMaxDocumentSize(), DEFAULT_MAX_MESSAGE_SIZE, Collections.<String>emptyList());
     }
 
     /**
@@ -58,22 +64,93 @@ public ConnectionDescription(final ServerId serverId) {
      * @param maxBatchCount   the max batch count
      * @param maxDocumentSize the max document size in bytes
      * @param maxMessageSize  the max message size in bytes
+     * @deprecated Prefer {@link #ConnectionDescription(ConnectionId, ServerVersion, int, ServerType, int, int, int, List)}
      */
-    public ConnectionDescription(final ConnectionId connectionId,  final ServerVersion serverVersion,
+    @Deprecated
+    public ConnectionDescription(final ConnectionId connectionId, final ServerVersion serverVersion,
                                  final ServerType serverType, final int maxBatchCount, final int maxDocumentSize,
                                  final int maxMessageSize) {
+
+        this(connectionId, serverVersion, 0, serverType, maxBatchCount, maxDocumentSize, maxMessageSize, Collections.<String>emptyList());
+    }
+
+    /**
+     * Construct an instance.
+     *
+     * @param connectionId    the connection id
+     * @param serverVersion   the server version
+     * @param serverType      the server type
+     * @param maxBatchCount   the max batch count
+     * @param maxDocumentSize the max document size in bytes
+     * @param maxMessageSize  the max message size in bytes
+     * @param compressors     the available compressors on the connection
+     * @since 3.5
+     * @deprecated Prefer {@link #ConnectionDescription(ConnectionId, ServerVersion, int, ServerType, int, int, int, List)}
+     */
+    @Deprecated
+    public ConnectionDescription(final ConnectionId connectionId, final ServerVersion serverVersion,
+                                 final ServerType serverType, final int maxBatchCount, final int maxDocumentSize,
+                                 final int maxMessageSize, final List<String> compressors) {
+        this(connectionId, serverVersion, 0, serverType, maxBatchCount, maxDocumentSize, maxMessageSize, compressors);
+    }
+
+    /**
+     * Construct an instance.
+     *
+     * @param connectionId    the connection id
+     * @param serverVersion   the server version
+     * @param maxWireVersion  the max wire version
+     * @param serverType      the server type
+     * @param maxBatchCount   the max batch count
+     * @param maxDocumentSize the max document size in bytes
+     * @param maxMessageSize  the max message size in bytes
+     * @param compressors     the available compressors on the connection
+     * @since 3.10
+     * @deprecated
+     */
+    @Deprecated
+    public ConnectionDescription(final ConnectionId connectionId, final ServerVersion serverVersion, final int maxWireVersion,
+                                 final ServerType serverType, final int maxBatchCount, final int maxDocumentSize,
+                                 final int maxMessageSize, final List<String> compressors) {
         this.connectionId = connectionId;
         this.serverType = serverType;
         this.maxBatchCount = maxBatchCount;
         this.maxDocumentSize = maxDocumentSize;
         this.maxMessageSize = maxMessageSize;
         this.serverVersion = serverVersion;
+        this.maxWireVersion = maxWireVersion;
+        this.compressors = notNull("compressors", Collections.unmodifiableList(new ArrayList<String>(compressors)));
     }
 
+    /**
+     * Construct an instance.
+     *
+     * @param connectionId    the connection id
+     * @param maxWireVersion  the max wire version
+     * @param serverType      the server type
+     * @param maxBatchCount   the max batch count
+     * @param maxDocumentSize the max document size in bytes
+     * @param maxMessageSize  the max message size in bytes
+     * @param compressors     the available compressors on the connection
+     * @since 3.10
+     */
+    public ConnectionDescription(final ConnectionId connectionId, final int maxWireVersion,
+                                 final ServerType serverType, final int maxBatchCount, final int maxDocumentSize,
+                                 final int maxMessageSize, final List<String> compressors) {
+        this(connectionId, new ServerVersion(), maxWireVersion, serverType, maxBatchCount, maxDocumentSize, maxMessageSize, compressors);
+    }
 
-    ConnectionDescription withConnectionId(final ConnectionId connectionId) {
+    /**
+     * Creates a new connection description with the set connection id
+     *
+     * @param connectionId the connection id
+     * @return the new connection description
+     * @since 3.8
+     */
+    public ConnectionDescription withConnectionId(final ConnectionId connectionId) {
         notNull("connectionId", connectionId);
-        return new ConnectionDescription(connectionId, serverVersion, serverType, maxBatchCount, maxDocumentSize, maxMessageSize);
+        return new ConnectionDescription(connectionId, serverVersion, maxWireVersion, serverType, maxBatchCount, maxDocumentSize,
+                maxMessageSize, compressors);
     }
 
     /**
@@ -98,11 +175,24 @@ public ConnectionId getConnectionId() {
      * Gets the version of the server.
      *
      * @return the server version
+     * @deprecated Use {@link #getMaxWireVersion()} instead
      */
+    @Deprecated
     public ServerVersion getServerVersion() {
         return serverVersion;
     }
 
+    /**
+     * The latest version of the wire protocol that this MongoDB server is capable of using to communicate with clients.
+     *
+     * @return the maximum protocol version supported by this server
+     * @since 3.10
+     * @mongodb.server.release 2.6
+     */
+    public int getMaxWireVersion() {
+        return maxWireVersion;
+    }
+
     /**
      * Gets the server type.
      *
@@ -139,6 +229,15 @@ public int getMaxMessageSize() {
         return maxMessageSize;
     }
 
+    /**
+     * Gets the compressors supported by this connection.
+     *
+     * @return the non-null list of compressors supported by this connection
+     */
+    public List<String> getCompressors() {
+        return compressors;
+    }
+
     /**
      * Get the default maximum message size.
      *
@@ -187,6 +286,12 @@ public boolean equals(final Object o) {
         if (!serverVersion.equals(that.serverVersion)) {
             return false;
         }
+        if (maxWireVersion != that.maxWireVersion) {
+            return false;
+        }
+        if (!compressors.equals(that.compressors)) {
+            return false;
+        }
 
         return true;
     }
@@ -195,11 +300,27 @@ public boolean equals(final Object o) {
     public int hashCode() {
         int result = connectionId.hashCode();
         result = 31 * result + serverVersion.hashCode();
+        result = 31 * result + maxBatchCount;
         result = 31 * result + serverType.hashCode();
         result = 31 * result + maxBatchCount;
         result = 31 * result + maxDocumentSize;
         result = 31 * result + maxMessageSize;
+        result = 31 * result + compressors.hashCode();
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "ConnectionDescription{"
+                + "connectionId=" + connectionId
+                + ", serverVersion=" + serverVersion
+                + ", maxWireVersion=" + maxWireVersion
+                + ", serverType=" + serverType
+                + ", maxBatchCount=" + maxBatchCount
+                + ", maxDocumentSize=" + maxDocumentSize
+                + ", maxMessageSize=" + maxMessageSize
+                + ", compressors=" + compressors
+                + '}';
+    }
 }
 
diff --git a/driver-core/src/main/com/mongodb/connection/ConnectionId.java b/driver-core/src/main/com/mongodb/connection/ConnectionId.java
index 4f613ca49eb..e600f4c3fb9 100644
--- a/driver-core/src/main/com/mongodb/connection/ConnectionId.java
+++ b/driver-core/src/main/com/mongodb/connection/ConnectionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,12 +44,26 @@ public final class ConnectionId {
      * Construct an instance with the given server id.
      *
      * @param serverId the server id
+     * @since 3.8
      */
-    ConnectionId(final ServerId serverId) {
+    public ConnectionId(final ServerId serverId) {
         this(serverId, INCREMENTING_ID.incrementAndGet(), null);
     }
 
-    private ConnectionId(final ServerId serverId, final int localValue, final Integer serverValue) {
+    /**
+     * Construct an instance with the given serverId, localValue, and serverValue.
+     *
+     * <p>
+     *     Useful for testing, but generally prefer {@link #withServerValue(int)}
+     * </p>
+     *
+     * @param serverId the server id
+     * @param localValue the local value
+     * @param serverValue the server value, which may be null
+     * @see #withServerValue(int)
+     * @since 3.11
+     */
+    public ConnectionId(final ServerId serverId, final int localValue, final Integer serverValue) {
         this.serverId = notNull("serverId", serverId);
         this.localValue = localValue;
         this.serverValue = serverValue;
@@ -60,7 +74,14 @@ private ConnectionId(final ServerId serverId, final int localValue, final Intege
         }
     }
 
-    ConnectionId withServerValue(final int serverValue) {
+    /**
+     * Creates a new connectionId with the set server value
+     *
+     * @param serverValue the server value
+     * @return the new connection id
+     * @since 3.8
+     */
+    public ConnectionId withServerValue(final int serverValue) {
         isTrue("server value is null", this.serverValue == null);
         return new ConnectionId(serverId, localValue, serverValue);
     }
diff --git a/driver-core/src/main/com/mongodb/connection/ConnectionPoolSettings.java b/driver-core/src/main/com/mongodb/connection/ConnectionPoolSettings.java
index 1811e440eb2..86c0903a5a1 100644
--- a/driver-core/src/main/com/mongodb/connection/ConnectionPoolSettings.java
+++ b/driver-core/src/main/com/mongodb/connection/ConnectionPoolSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,15 @@
 import com.mongodb.ConnectionString;
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.event.ConnectionPoolListener;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Collections.unmodifiableList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 
@@ -33,6 +38,7 @@
  */
 @Immutable
 public class ConnectionPoolSettings {
+    private final List<ConnectionPoolListener> connectionPoolListeners;
     private final int maxSize;
     private final int minSize;
     private final int maxWaitQueueSize;
@@ -51,11 +57,23 @@ public static Builder builder() {
         return new Builder();
     }
 
+    /**
+     * Gets a Builder for creating a new ConnectionPoolSettings instance.
+     *
+     * @param connectionPoolSettings the existing connection pool settings to configure the builder with
+     * @return a new Builder for ConnectionPoolSettings
+     * @since 3.5
+     */
+    public static Builder builder(final ConnectionPoolSettings connectionPoolSettings) {
+        return builder().applySettings(connectionPoolSettings);
+    }
+
     /**
      * A builder for creating ConnectionPoolSettings.
      */
     @NotThreadSafe
-    public static class Builder {
+    public static final class Builder {
+        private List<ConnectionPoolListener> connectionPoolListeners = new ArrayList<ConnectionPoolListener>();
         private int maxSize = 100;
         private int minSize;
         private int maxWaitQueueSize = 500;
@@ -65,6 +83,32 @@ public static class Builder {
         private long maintenanceInitialDelayMS;
         private long maintenanceFrequencyMS = MILLISECONDS.convert(1, MINUTES);
 
+        Builder() {
+        }
+
+        /**
+         * Applies the connectionPoolSettings to the builder
+         *
+         * <p>Note: Overwrites all existing settings</p>
+         *
+         * @param connectionPoolSettings the connectionPoolSettings
+         * @return this
+         * @since 3.7
+         */
+        public Builder applySettings(final ConnectionPoolSettings connectionPoolSettings) {
+            notNull("connectionPoolSettings", connectionPoolSettings);
+            connectionPoolListeners = new ArrayList<ConnectionPoolListener>(connectionPoolSettings.connectionPoolListeners);
+            maxSize = connectionPoolSettings.maxSize;
+            minSize = connectionPoolSettings.minSize;
+            maxWaitQueueSize = connectionPoolSettings.maxWaitQueueSize;
+            maxWaitTimeMS = connectionPoolSettings.maxWaitTimeMS;
+            maxConnectionLifeTimeMS = connectionPoolSettings.maxConnectionLifeTimeMS;
+            maxConnectionIdleTimeMS = connectionPoolSettings.maxConnectionIdleTimeMS;
+            maintenanceInitialDelayMS = connectionPoolSettings.maintenanceInitialDelayMS;
+            maintenanceFrequencyMS = connectionPoolSettings.maintenanceFrequencyMS;
+            return this;
+        }
+
         /**
          * <p>The maximum number of connections allowed. Those connections will be kept in the pool when idle. Once the pool is exhausted,
          * any operation requiring a connection will block waiting for an available connection.</p>
@@ -101,7 +145,9 @@ public Builder minSize(final int minSize) {
          *
          * @param maxWaitQueueSize the number of threads that are allowed to be waiting for a connection.
          * @return this
+         * @deprecated in the next major release, wait queue size limitations will be removed
          */
+        @Deprecated
         public Builder maxWaitQueueSize(final int maxWaitQueueSize) {
             this.maxWaitQueueSize = maxWaitQueueSize;
             return this;
@@ -171,6 +217,18 @@ public Builder maintenanceFrequency(final long maintenanceFrequency, final TimeU
             return this;
         }
 
+        /**
+         * Adds the given connection pool listener.
+         *
+         * @param connectionPoolListener the non-null connection pool listener
+         * @return this
+         * @since 3.5
+         */
+        public Builder addConnectionPoolListener(final ConnectionPoolListener connectionPoolListener) {
+            connectionPoolListeners.add(notNull("connectionPoolListener", connectionPoolListener));
+            return this;
+        }
+
         /**
          * Creates a new ConnectionPoolSettings object with the settings initialised on this builder.
          *
@@ -181,30 +239,42 @@ public ConnectionPoolSettings build() {
         }
 
         /**
-         * Takes connection pool settings from the given connection string and applies them to this builder.
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
          *
-         * @param connectionString a URL with details of how to connect to MongoDB
+         * @param connectionString the connection string containing details of how to connect to MongoDB
          * @return this
          */
         public Builder applyConnectionString(final ConnectionString connectionString) {
-            if (connectionString.getMaxConnectionPoolSize() != null) {
-                maxSize(connectionString.getMaxConnectionPoolSize());
+            Integer maxConnectionPoolSize = connectionString.getMaxConnectionPoolSize();
+            if (maxConnectionPoolSize != null) {
+                maxSize(maxConnectionPoolSize);
             }
-            if (connectionString.getMinConnectionPoolSize() != null) {
-                minSize(connectionString.getMinConnectionPoolSize());
+
+            Integer minConnectionPoolSize = connectionString.getMinConnectionPoolSize();
+            if (minConnectionPoolSize != null) {
+                minSize(minConnectionPoolSize);
             }
-            if (connectionString.getMaxWaitTime() != null) {
-                maxWaitTime(connectionString.getMaxWaitTime(), MILLISECONDS);
+
+            Integer maxWaitTime = connectionString.getMaxWaitTime();
+            if (maxWaitTime != null) {
+                maxWaitTime(maxWaitTime, MILLISECONDS);
             }
-            if (connectionString.getMaxConnectionIdleTime() != null) {
-                maxConnectionIdleTime(connectionString.getMaxConnectionIdleTime(), MILLISECONDS);
+
+            Integer maxConnectionIdleTime = connectionString.getMaxConnectionIdleTime();
+            if (maxConnectionIdleTime != null) {
+                maxConnectionIdleTime(maxConnectionIdleTime, MILLISECONDS);
             }
-            if (connectionString.getMaxConnectionLifeTime() != null) {
-                maxConnectionLifeTime(connectionString.getMaxConnectionLifeTime(), MILLISECONDS);
+
+            Integer maxConnectionLifeTime = connectionString.getMaxConnectionLifeTime();
+            if (maxConnectionLifeTime != null) {
+                maxConnectionLifeTime(maxConnectionLifeTime, MILLISECONDS);
             }
-            if (connectionString.getThreadsAllowedToBlockForConnectionMultiplier() != null) {
-                maxWaitQueueSize(connectionString.getThreadsAllowedToBlockForConnectionMultiplier() * maxSize);
+
+            Integer threadsAllowedToBlockForConnectionMultiplier = connectionString.getThreadsAllowedToBlockForConnectionMultiplier();
+            if (threadsAllowedToBlockForConnectionMultiplier != null) {
+                maxWaitQueueSize(threadsAllowedToBlockForConnectionMultiplier * maxSize);
             }
+
             return this;
         }
     }
@@ -240,7 +310,9 @@ public int getMinSize() {
      * <p>Default is 500.</p>
      *
      * @return the number of threads that are allowed to be waiting for a connection.
+     * @deprecated in the next major release, wait queue size limitations will be removed
      */
+    @Deprecated
     public int getMaxWaitQueueSize() {
         return maxWaitQueueSize;
     }
@@ -299,6 +371,16 @@ public long getMaintenanceFrequency(final TimeUnit timeUnit) {
         return timeUnit.convert(maintenanceFrequencyMS, MILLISECONDS);
     }
 
+    /**
+     * Gets the list of added {@code ConnectionPoolListener}. The default is an empty list.
+     *
+     * @return the unmodifiable list of connection pool listeners
+     * @since 3.5
+     */
+    public List<ConnectionPoolListener> getConnectionPoolListeners() {
+        return connectionPoolListeners;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
@@ -334,6 +416,9 @@ public boolean equals(final Object o) {
         if (maxWaitTimeMS != that.maxWaitTimeMS) {
             return false;
         }
+        if (!connectionPoolListeners.equals(that.connectionPoolListeners)) {
+            return false;
+        }
 
         return true;
     }
@@ -348,6 +433,7 @@ public int hashCode() {
         result = 31 * result + (int) (maxConnectionIdleTimeMS ^ (maxConnectionIdleTimeMS >>> 32));
         result = 31 * result + (int) (maintenanceInitialDelayMS ^ (maintenanceInitialDelayMS >>> 32));
         result = 31 * result + (int) (maintenanceFrequencyMS ^ (maintenanceFrequencyMS >>> 32));
+        result = 31 * result + connectionPoolListeners.hashCode();
         return result;
     }
 
@@ -362,6 +448,7 @@ public String toString() {
                + ", maxConnectionIdleTimeMS=" + maxConnectionIdleTimeMS
                + ", maintenanceInitialDelayMS=" + maintenanceInitialDelayMS
                + ", maintenanceFrequencyMS=" + maintenanceFrequencyMS
+               + ", connectionPoolListeners=" + connectionPoolListeners
                + '}';
     }
 
@@ -383,5 +470,6 @@ public String toString() {
         maxConnectionIdleTimeMS = builder.maxConnectionIdleTimeMS;
         maintenanceInitialDelayMS = builder.maintenanceInitialDelayMS;
         maintenanceFrequencyMS = builder.maintenanceFrequencyMS;
+        connectionPoolListeners = unmodifiableList(builder.connectionPoolListeners);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultAuthenticator.java b/driver-core/src/main/com/mongodb/connection/DefaultAuthenticator.java
deleted file mode 100644
index 5757e8bcdd1..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DefaultAuthenticator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.async.SingleResultCallback;
-
-import static com.mongodb.assertions.Assertions.isTrueArgument;
-
-class DefaultAuthenticator extends Authenticator {
-    public DefaultAuthenticator(final MongoCredential credential) {
-        super(credential);
-        isTrueArgument("unspecified authentication mechanism", credential.getAuthenticationMechanism() == null);
-    }
-
-    @Override
-    void authenticate(final InternalConnection connection, final ConnectionDescription connectionDescription) {
-        createAuthenticator(connectionDescription).authenticate(connection, connectionDescription);
-    }
-
-    @Override
-    void authenticateAsync(final InternalConnection connection, final ConnectionDescription connectionDescription,
-                           final SingleResultCallback<Void> callback) {
-        createAuthenticator(connectionDescription).authenticateAsync(connection, connectionDescription, callback);
-    }
-
-    Authenticator createAuthenticator(final ConnectionDescription connectionDescription) {
-        if (connectionDescription.getServerVersion().compareTo(new ServerVersion(2, 7)) >= 0) {
-            return new ScramSha1Authenticator(getCredential());
-        } else {
-            return new NativeAuthenticator(getCredential());
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java b/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java
index 55fe37427fb..073a1590b6b 100644
--- a/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/DefaultClusterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,21 @@
 
 package com.mongodb.connection;
 
+import com.mongodb.MongoCompressor;
 import com.mongodb.MongoCredential;
+import com.mongodb.MongoDriverInformation;
 import com.mongodb.event.ClusterListener;
 import com.mongodb.event.CommandListener;
-import com.mongodb.event.ConnectionListener;
 import com.mongodb.event.ConnectionPoolListener;
+import com.mongodb.internal.connection.ClusterableServerFactory;
+import com.mongodb.internal.connection.DefaultClusterableServerFactory;
+import com.mongodb.internal.connection.DefaultDnsSrvRecordMonitorFactory;
+import com.mongodb.internal.connection.DnsMultiServerCluster;
+import com.mongodb.internal.connection.DnsSrvRecordMonitorFactory;
+import com.mongodb.internal.connection.MultiServerCluster;
+import com.mongodb.internal.connection.SingleServerCluster;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -29,6 +38,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public final class DefaultClusterFactory implements ClusterFactory {
 
     @Override
@@ -36,10 +46,14 @@ public Cluster create(final ClusterSettings settings, final ServerSettings serve
                           final ConnectionPoolSettings connectionPoolSettings, final StreamFactory streamFactory,
                           final StreamFactory heartbeatStreamFactory,
                           final List<MongoCredential> credentialList,
-                          final ClusterListener clusterListener, final ConnectionPoolListener connectionPoolListener,
-                          final ConnectionListener connectionListener) {
-        return create(settings, serverSettings, connectionPoolSettings, streamFactory, heartbeatStreamFactory, credentialList,
-                      clusterListener, connectionPoolListener, connectionListener, null);
+                          final ClusterListener clusterListener,
+                          final ConnectionPoolListener connectionPoolListener,
+                          final com.mongodb.event.ConnectionListener connectionListener) {
+
+        return createCluster(getClusterSettings(settings, clusterListener), serverSettings,
+                getConnectionPoolSettings(connectionPoolSettings, connectionPoolListener), streamFactory,
+                heartbeatStreamFactory, credentialList, null, null, null,
+                Collections.<MongoCompressor>emptyList());
     }
 
     /**
@@ -58,38 +72,141 @@ public Cluster create(final ClusterSettings settings, final ServerSettings serve
      * @return the cluster
      *
      * @since 3.1
+     * @deprecated use {@link #createCluster(ClusterSettings, ServerSettings, ConnectionPoolSettings, StreamFactory, StreamFactory,
+     * List, CommandListener, String, MongoDriverInformation, List)} instead
      */
+    @Deprecated
     public Cluster create(final ClusterSettings settings, final ServerSettings serverSettings,
                           final ConnectionPoolSettings connectionPoolSettings, final StreamFactory streamFactory,
                           final StreamFactory heartbeatStreamFactory,
                           final List<MongoCredential> credentialList,
-                          final ClusterListener clusterListener, final ConnectionPoolListener connectionPoolListener,
-                          final ConnectionListener connectionListener,
+                          final ClusterListener clusterListener,
+                          final ConnectionPoolListener connectionPoolListener,
+                          final com.mongodb.event.ConnectionListener connectionListener,
                           final CommandListener commandListener) {
-        if (clusterListener != null) {
-            throw new IllegalArgumentException("Add cluster listener to ClusterSettings");
-        }
-        ClusterId clusterId = new ClusterId(settings.getDescription());
-        ClusterableServerFactory serverFactory = new DefaultClusterableServerFactory(clusterId,
-                                                                                            settings,
-                                                                                            serverSettings,
-                                                                                            connectionPoolSettings,
-                                                                                            streamFactory,
-                                                                                            heartbeatStreamFactory,
-                                                                                            credentialList,
-                                                                                            connectionListener != null ? connectionListener
-                                                                                                    : new NoOpConnectionListener(),
-                                                                                            connectionPoolListener != null
-                                                                                                    ? connectionPoolListener
-                                                                                                    : new NoOpConnectionPoolListener(),
-                                                                                            commandListener);
-
-        if (settings.getMode() == ClusterConnectionMode.SINGLE) {
-            return new SingleServerCluster(clusterId, settings, serverFactory);
-        } else if (settings.getMode() == ClusterConnectionMode.MULTIPLE) {
-            return new MultiServerCluster(clusterId, settings, serverFactory);
+        return createCluster(getClusterSettings(settings, clusterListener), serverSettings,
+                getConnectionPoolSettings(connectionPoolSettings, connectionPoolListener), streamFactory, heartbeatStreamFactory,
+                credentialList, commandListener, null, null, Collections.<MongoCompressor>emptyList());
+    }
+
+    /**
+     * Creates a cluster with the given settings.  The cluster mode will be based on the mode from the settings.
+     *
+     * @param settings               the cluster settings
+     * @param serverSettings         the server settings
+     * @param connectionPoolSettings the connection pool settings
+     * @param streamFactory          the stream factory
+     * @param heartbeatStreamFactory the heartbeat stream factory
+     * @param credentialList         the credential list
+     * @param clusterListener        an optional listener for cluster-related events
+     * @param connectionPoolListener an optional listener for connection pool-related events
+     * @param connectionListener     an optional listener for connection-related events
+     * @param commandListener        an optional listener for command-related events
+     * @param applicationName        an optional application name to associate with connections to the servers in this cluster
+     * @param mongoDriverInformation the optional driver information associate with connections to the servers in this cluster
+     * @return the cluster
+     *
+     * @since 3.4
+     * @deprecated use {@link #createCluster(ClusterSettings, ServerSettings, ConnectionPoolSettings, StreamFactory, StreamFactory,
+     * List, CommandListener, String, MongoDriverInformation, List)} instead
+     */
+    @Deprecated
+    public Cluster create(final ClusterSettings settings, final ServerSettings serverSettings,
+                          final ConnectionPoolSettings connectionPoolSettings, final StreamFactory streamFactory,
+                          final StreamFactory heartbeatStreamFactory,
+                          final List<MongoCredential> credentialList,
+                          final ClusterListener clusterListener,
+                          final ConnectionPoolListener connectionPoolListener,
+                          final com.mongodb.event.ConnectionListener connectionListener,
+                          final CommandListener commandListener,
+                          final String applicationName,
+                          final MongoDriverInformation mongoDriverInformation) {
+        return createCluster(getClusterSettings(settings, clusterListener), serverSettings,
+                getConnectionPoolSettings(connectionPoolSettings, connectionPoolListener), streamFactory, heartbeatStreamFactory,
+                credentialList, commandListener, applicationName, mongoDriverInformation, Collections.<MongoCompressor>emptyList());
+    }
+
+    /**
+     * Creates a cluster with the given settings.  The cluster mode will be based on the mode from the settings.
+     *
+     * @param clusterSettings        the cluster settings
+     * @param serverSettings         the server settings
+     * @param connectionPoolSettings the connection pool settings
+     * @param streamFactory          the stream factory
+     * @param heartbeatStreamFactory the heartbeat stream factory
+     * @param credentialList         the credential list
+     * @param commandListener        an optional listener for command-related events
+     * @param applicationName        an optional application name to associate with connections to the servers in this cluster
+     * @param mongoDriverInformation the optional driver information associate with connections to the servers in this cluster
+     * @return the cluster
+     *
+     * @since 3.5
+     * @deprecated use {@link #createCluster(ClusterSettings, ServerSettings, ConnectionPoolSettings, StreamFactory, StreamFactory,
+     * List, CommandListener, String, MongoDriverInformation, List)} instead
+
+     */
+    @Deprecated
+    public Cluster createCluster(final ClusterSettings clusterSettings, final ServerSettings serverSettings,
+                                 final ConnectionPoolSettings connectionPoolSettings, final StreamFactory streamFactory,
+                                 final StreamFactory heartbeatStreamFactory, final List<MongoCredential> credentialList,
+                                 final CommandListener commandListener, final String applicationName,
+                                 final MongoDriverInformation mongoDriverInformation) {
+        return createCluster(clusterSettings, serverSettings, connectionPoolSettings, streamFactory, heartbeatStreamFactory, credentialList,
+                commandListener, applicationName, mongoDriverInformation, Collections.<MongoCompressor>emptyList());
+    }
+
+    /**
+     * Creates a cluster with the given settings.  The cluster mode will be based on the mode from the settings.
+     *
+     * @param clusterSettings        the cluster settings
+     * @param serverSettings         the server settings
+     * @param connectionPoolSettings the connection pool settings
+     * @param streamFactory          the stream factory
+     * @param heartbeatStreamFactory the heartbeat stream factory
+     * @param credentialList         the credential list
+     * @param commandListener        an optional listener for command-related events
+     * @param applicationName        an optional application name to associate with connections to the servers in this cluster
+     * @param mongoDriverInformation the optional driver information associate with connections to the servers in this cluster
+     * @param compressorList         the list of compressors to request, in priority order
+     * @return the cluster
+     *
+     * @since 3.6
+     */
+    public Cluster createCluster(final ClusterSettings clusterSettings, final ServerSettings serverSettings,
+                                 final ConnectionPoolSettings connectionPoolSettings, final StreamFactory streamFactory,
+                                 final StreamFactory heartbeatStreamFactory, final List<MongoCredential> credentialList,
+                                 final CommandListener commandListener, final String applicationName,
+                                 final MongoDriverInformation mongoDriverInformation,
+                                 final List<MongoCompressor> compressorList) {
+
+        ClusterId clusterId = new ClusterId(clusterSettings.getDescription());
+
+
+        ClusterableServerFactory serverFactory = new DefaultClusterableServerFactory(clusterId, clusterSettings, serverSettings,
+                connectionPoolSettings, streamFactory, heartbeatStreamFactory, credentialList, commandListener, applicationName,
+                mongoDriverInformation != null ? mongoDriverInformation : MongoDriverInformation.builder().build(), compressorList);
+
+        DnsSrvRecordMonitorFactory dnsSrvRecordMonitorFactory = new DefaultDnsSrvRecordMonitorFactory(clusterId, serverSettings);
+
+        if (clusterSettings.getMode() == ClusterConnectionMode.SINGLE) {
+            return new SingleServerCluster(clusterId, clusterSettings, serverFactory);
+        } else if (clusterSettings.getMode() == ClusterConnectionMode.MULTIPLE) {
+            if (clusterSettings.getSrvHost() == null) {
+                return new MultiServerCluster(clusterId, clusterSettings, serverFactory);
+            } else {
+                return new DnsMultiServerCluster(clusterId, clusterSettings, serverFactory, dnsSrvRecordMonitorFactory);
+            }
         } else {
-            throw new UnsupportedOperationException("Unsupported cluster mode: " + settings.getMode());
+            throw new UnsupportedOperationException("Unsupported cluster mode: " + clusterSettings.getMode());
         }
     }
+
+    private ClusterSettings getClusterSettings(final ClusterSettings settings, final ClusterListener clusterListener) {
+        return ClusterSettings.builder(settings).addClusterListener(clusterListener).build();
+    }
+
+    private ConnectionPoolSettings getConnectionPoolSettings(final ConnectionPoolSettings connPoolSettings,
+                                                             final ConnectionPoolListener connPoolListener) {
+        return ConnectionPoolSettings.builder(connPoolSettings).addConnectionPoolListener(connPoolListener).build();
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultClusterableServerFactory.java b/driver-core/src/main/com/mongodb/connection/DefaultClusterableServerFactory.java
deleted file mode 100644
index 103810e68a5..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DefaultClusterableServerFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.event.CommandListener;
-import com.mongodb.event.ConnectionListener;
-import com.mongodb.event.ConnectionPoolListener;
-import com.mongodb.event.ServerListener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class DefaultClusterableServerFactory implements ClusterableServerFactory {
-    private final ClusterId clusterId;
-    private final ClusterSettings clusterSettings;
-    private final ServerSettings settings;
-    private final ConnectionPoolSettings connectionPoolSettings;
-    private final StreamFactory streamFactory;
-    private final List<MongoCredential> credentialList;
-    private final ConnectionPoolListener connectionPoolListener;
-    private final ConnectionListener connectionListener;
-    private final StreamFactory heartbeatStreamFactory;
-    private final CommandListener commandListener;
-
-    public DefaultClusterableServerFactory(final ClusterId clusterId, final ClusterSettings clusterSettings, final ServerSettings settings,
-                                           final ConnectionPoolSettings connectionPoolSettings,
-                                           final StreamFactory streamFactory,
-                                           final StreamFactory heartbeatStreamFactory,
-                                           final List<MongoCredential> credentialList,
-                                           final ConnectionListener connectionListener,
-                                           final ConnectionPoolListener connectionPoolListener, final CommandListener commandListener) {
-        this.clusterId = clusterId;
-        this.clusterSettings = clusterSettings;
-        this.settings = settings;
-        this.connectionPoolSettings = connectionPoolSettings;
-        this.streamFactory = streamFactory;
-        this.credentialList = credentialList;
-        this.connectionPoolListener = connectionPoolListener;
-        this.connectionListener = connectionListener;
-        this.heartbeatStreamFactory = heartbeatStreamFactory;
-        this.commandListener = commandListener;
-    }
-
-    @Override
-    public ClusterableServer create(final ServerAddress serverAddress, final ServerListener serverListener) {
-        ConnectionPool connectionPool = new DefaultConnectionPool(new ServerId(clusterId, serverAddress),
-                                                                  new InternalStreamConnectionFactory(streamFactory,
-                                                                                                      credentialList,
-                                                                                                      connectionListener),
-                                                                  connectionPoolSettings, connectionPoolListener);
-        ServerMonitorFactory serverMonitorFactory =
-            new DefaultServerMonitorFactory(new ServerId(clusterId, serverAddress), settings,
-                                            new InternalStreamConnectionFactory(heartbeatStreamFactory,
-                                                                                credentialList,
-                                                                                connectionListener),
-                                            connectionPool);
-        List<ServerListener> serverListeners = new ArrayList<ServerListener>();
-        if (serverListener != null) {
-            serverListeners.add(serverListener);
-        }
-        serverListeners.addAll(settings.getServerListeners());
-        return new DefaultServer(new ServerId(clusterId, serverAddress), clusterSettings.getMode(), connectionPool,
-                new DefaultConnectionFactory(), serverMonitorFactory, serverListeners, commandListener);
-    }
-
-    @Override
-    public ServerSettings getSettings() {
-        return settings;
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultServer.java b/driver-core/src/main/com/mongodb/connection/DefaultServer.java
deleted file mode 100644
index 3f1566854bc..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DefaultServer.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoException;
-import com.mongodb.MongoNodeIsRecoveringException;
-import com.mongodb.MongoNotPrimaryException;
-import com.mongodb.MongoSecurityException;
-import com.mongodb.MongoSocketException;
-import com.mongodb.MongoSocketReadTimeoutException;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.event.CommandListener;
-import com.mongodb.event.ServerClosedEvent;
-import com.mongodb.event.ServerDescriptionChangedEvent;
-import com.mongodb.event.ServerEventMulticaster;
-import com.mongodb.event.ServerListener;
-import com.mongodb.event.ServerOpeningEvent;
-
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.isTrue;
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.connection.ServerConnectionState.CONNECTING;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-
-class DefaultServer implements ClusterableServer {
-    private static final Logger LOGGER = Loggers.getLogger("connection");
-    private final ServerId serverId;
-    private final ConnectionPool connectionPool;
-    private final ClusterConnectionMode clusterConnectionMode;
-    private final ConnectionFactory connectionFactory;
-    private final ServerMonitor serverMonitor;
-    private final ChangeListener<ServerDescription> serverStateListener;
-    private final ServerListener serverListener;
-    private final CommandListener commandListener;
-    private volatile ServerDescription description;
-    private volatile boolean isClosed;
-
-    public DefaultServer(final ServerId serverId,
-                         final ClusterConnectionMode clusterConnectionMode,
-                         final ConnectionPool connectionPool,
-                         final ConnectionFactory connectionFactory,
-                         final ServerMonitorFactory serverMonitorFactory,
-                         final List<ServerListener> serverListeners,
-                         final CommandListener commandListener) {
-        notNull("serverListeners", serverListeners);
-        serverListener = serverListeners.isEmpty() ? new NoOpServerListener() : new ServerEventMulticaster(serverListeners);
-
-        this.commandListener = commandListener;
-        notNull("serverAddress", serverId);
-        notNull("serverMonitorFactory", serverMonitorFactory);
-        this.clusterConnectionMode = notNull("clusterConnectionMode", clusterConnectionMode);
-        this.connectionFactory = notNull("connectionFactory", connectionFactory);
-        this.connectionPool = notNull("connectionPool", connectionPool);
-        this.serverStateListener = new DefaultServerStateListener();
-
-        this.serverId = serverId;
-
-        serverListener.serverOpening(new ServerOpeningEvent(this.serverId));
-
-        description = ServerDescription.builder().state(CONNECTING).address(serverId.getAddress()).build();
-        serverMonitor = serverMonitorFactory.create(serverStateListener);
-        serverMonitor.start();
-    }
-
-    @Override
-    public Connection getConnection() {
-        isTrue("open", !isClosed());
-        try {
-            return connectionFactory.create(connectionPool.get(), new DefaultServerProtocolExecutor(), clusterConnectionMode);
-        } catch (MongoSecurityException e) {
-            invalidate();
-            throw e;
-        }
-    }
-
-    @Override
-    public void getConnectionAsync(final SingleResultCallback<AsyncConnection> callback) {
-        isTrue("open", !isClosed());
-        connectionPool.getAsync(new SingleResultCallback<InternalConnection>() {
-            @Override
-            public void onResult(final InternalConnection result, final Throwable t) {
-                if (t instanceof MongoSecurityException) {
-                    invalidate();
-                }
-                if (t != null) {
-                    callback.onResult(null, t);
-                } else {
-                    callback.onResult(connectionFactory.createAsync(result, new DefaultServerProtocolExecutor(), clusterConnectionMode),
-                                      null);
-                }
-            }
-        });
-    }
-
-    @Override
-    public ServerDescription getDescription() {
-        isTrue("open", !isClosed());
-
-        return description;
-    }
-
-    @Override
-    public void invalidate() {
-        isTrue("open", !isClosed());
-
-        serverStateListener.stateChanged(new ChangeEvent<ServerDescription>(description, ServerDescription.builder()
-                                                                                                          .state(CONNECTING)
-                                                                                                          .address(serverId.getAddress())
-                .build()));
-        connectionPool.invalidate();
-        connect();
-    }
-
-    @Override
-    public void close() {
-        if (!isClosed()) {
-            connectionPool.close();
-            serverMonitor.close();
-            isClosed = true;
-            serverListener.serverClosed(new ServerClosedEvent(serverId));
-        }
-    }
-
-    @Override
-    public boolean isClosed() {
-        return isClosed;
-    }
-
-    @Override
-    public void connect() {
-        serverMonitor.connect();
-    }
-
-    ConnectionPool getConnectionPool() {
-        return connectionPool;
-    }
-
-    private void handleThrowable(final Throwable t) {
-        if ((t instanceof MongoSocketException && !(t instanceof MongoSocketReadTimeoutException))
-            || t instanceof MongoNotPrimaryException
-            || t instanceof MongoNodeIsRecoveringException) {
-            invalidate();
-        }
-    }
-
-    private class DefaultServerProtocolExecutor implements ProtocolExecutor {
-        @Override
-        public <T> T execute(final Protocol<T> protocol, final InternalConnection connection) {
-            try {
-                protocol.setCommandListener(commandListener);
-                return protocol.execute(connection);
-            } catch (MongoException e) {
-                handleThrowable(e);
-                throw e;
-            }
-        }
-
-        @Override
-        public <T> void executeAsync(final Protocol<T> protocol, final InternalConnection connection,
-                                     final SingleResultCallback<T> callback) {
-            protocol.setCommandListener(commandListener);
-            protocol.executeAsync(connection, errorHandlingCallback(new SingleResultCallback<T>() {
-                @Override
-                public void onResult(final T result, final Throwable t) {
-                    if (t != null) {
-                        handleThrowable(t);
-                    }
-                    callback.onResult(result, t);
-                }
-            }, LOGGER));
-        }
-    }
-
-    private final class DefaultServerStateListener implements ChangeListener<ServerDescription> {
-        @Override
-        public void stateChanged(final ChangeEvent<ServerDescription> event) {
-            ServerDescription oldDescription = description;
-            description = event.getNewValue();
-            serverListener.serverDescriptionChanged(new ServerDescriptionChangedEvent(serverId, description, oldDescription));
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultServerConnection.java b/driver-core/src/main/com/mongodb/connection/DefaultServerConnection.java
deleted file mode 100644
index d377de80960..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DefaultServerConnection.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import org.bson.BsonDocument;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.Decoder;
-
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.isTrue;
-import static com.mongodb.connection.ServerType.SHARD_ROUTER;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-
-@SuppressWarnings("deprecation")  // because this class implements deprecated methods
-class DefaultServerConnection extends AbstractReferenceCounted implements Connection, AsyncConnection {
-    private static final Logger LOGGER = Loggers.getLogger("connection");
-    private final InternalConnection wrapped;
-    private final ProtocolExecutor protocolExecutor;
-    private final ClusterConnectionMode clusterConnectionMode;
-
-    public DefaultServerConnection(final InternalConnection wrapped, final ProtocolExecutor protocolExecutor,
-                                   final ClusterConnectionMode clusterConnectionMode) {
-        this.wrapped = wrapped;
-        this.protocolExecutor = protocolExecutor;
-        this.clusterConnectionMode = clusterConnectionMode;
-    }
-
-    @Override
-    public DefaultServerConnection retain() {
-        super.retain();
-        return this;
-    }
-
-    @Override
-    public void release() {
-        super.release();
-        if (getCount() == 0) {
-            wrapped.close();
-        }
-    }
-
-    @Override
-    public ConnectionDescription getDescription() {
-        isTrue("open", getCount() > 0);
-        return wrapped.getDescription();
-    }
-
-    @Override
-    public WriteConcernResult insert(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                     final List<InsertRequest> inserts) {
-        return executeProtocol(new InsertProtocol(namespace, ordered, writeConcern, inserts));
-    }
-
-    @Override
-    public void insertAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                            final List<InsertRequest> inserts, final SingleResultCallback<WriteConcernResult> callback) {
-        executeProtocolAsync(new InsertProtocol(namespace, ordered, writeConcern, inserts), callback);
-    }
-
-    @Override
-    public WriteConcernResult update(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                     final List<UpdateRequest> updates) {
-        return executeProtocol(new UpdateProtocol(namespace, ordered, writeConcern, updates));
-    }
-
-    @Override
-    public void updateAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                            final List<UpdateRequest> updates, final SingleResultCallback<WriteConcernResult> callback) {
-        executeProtocolAsync(new UpdateProtocol(namespace, ordered, writeConcern, updates), callback);
-    }
-
-    @Override
-    public WriteConcernResult delete(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                     final List<DeleteRequest> deletes) {
-        return executeProtocol(new DeleteProtocol(namespace, ordered, writeConcern, deletes));
-    }
-
-    @Override
-    public void deleteAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                            final List<DeleteRequest> deletes, final SingleResultCallback<WriteConcernResult> callback) {
-        executeProtocolAsync(new DeleteProtocol(namespace, ordered, writeConcern, deletes), callback);
-    }
-
-    @Override
-    public BulkWriteResult insertCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final List<InsertRequest> inserts) {
-        return insertCommand(namespace, ordered, writeConcern, null, inserts);
-    }
-
-    @Override
-    public BulkWriteResult insertCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final Boolean bypassDocumentValidation, final List<InsertRequest> inserts) {
-        return executeProtocol(new InsertCommandProtocol(namespace, ordered, writeConcern, bypassDocumentValidation, inserts));
-    }
-
-    @Override
-    public void insertCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final List<InsertRequest> inserts, final SingleResultCallback<BulkWriteResult> callback) {
-        insertCommandAsync(namespace, ordered, writeConcern, null, inserts, callback);
-    }
-
-    @Override
-    public void insertCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final Boolean bypassDocumentValidation, final List<InsertRequest> inserts,
-                                   final SingleResultCallback<BulkWriteResult> callback) {
-        executeProtocolAsync(new InsertCommandProtocol(namespace, ordered, writeConcern, bypassDocumentValidation, inserts), callback);
-    }
-
-    @Override
-    public BulkWriteResult updateCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final List<UpdateRequest> updates) {
-        return updateCommand(namespace, ordered, writeConcern, null, updates);
-    }
-
-    @Override
-    public BulkWriteResult updateCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final Boolean bypassDocumentValidation, final List<UpdateRequest> updates) {
-        return executeProtocol(new UpdateCommandProtocol(namespace, ordered, writeConcern, bypassDocumentValidation, updates));
-    }
-
-    @Override
-    public void updateCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final List<UpdateRequest> updates, final SingleResultCallback<BulkWriteResult> callback) {
-        updateCommandAsync(namespace, ordered, writeConcern, null, updates, callback);
-    }
-
-    @Override
-    public void updateCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final Boolean bypassDocumentValidation, final List<UpdateRequest> updates,
-                                   final SingleResultCallback<BulkWriteResult> callback) {
-        executeProtocolAsync(new UpdateCommandProtocol(namespace, ordered, writeConcern, bypassDocumentValidation, updates), callback);
-    }
-
-    @Override
-    public BulkWriteResult deleteCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final List<DeleteRequest> deletes) {
-        return executeProtocol(new DeleteCommandProtocol(namespace, ordered, writeConcern, deletes));
-
-    }
-
-    @Override
-    public void deleteCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final List<DeleteRequest> deletes, final SingleResultCallback<BulkWriteResult> callback) {
-        executeProtocolAsync(new DeleteCommandProtocol(namespace, ordered, writeConcern, deletes), callback);
-    }
-
-    @Override
-    public <T> T command(final String database, final BsonDocument command, final boolean slaveOk,
-                         final FieldNameValidator fieldNameValidator,
-                         final Decoder<T> commandResultDecoder) {
-        return executeProtocol(new CommandProtocol<T>(database, command, fieldNameValidator, commandResultDecoder)
-                               .slaveOk(getSlaveOk(slaveOk)));
-    }
-
-    @Override
-    public <T> void commandAsync(final String database, final BsonDocument command, final boolean slaveOk,
-                                           final FieldNameValidator fieldNameValidator,
-                                           final Decoder<T> commandResultDecoder, final SingleResultCallback<T> callback) {
-        executeProtocolAsync(new CommandProtocol<T>(database, command, fieldNameValidator, commandResultDecoder)
-                             .slaveOk(getSlaveOk(slaveOk)),
-                             callback);
-    }
-
-    @Override
-    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
-                                    final int numberToReturn, final int skip,
-                                    final boolean slaveOk, final boolean tailableCursor,
-                                    final boolean awaitData, final boolean noCursorTimeout,
-                                    final boolean partial, final boolean oplogReplay,
-                                    final Decoder<T> resultDecoder) {
-        return executeProtocol(new QueryProtocol<T>(namespace, skip, numberToReturn, queryDocument, fields, resultDecoder)
-                               .tailableCursor(tailableCursor)
-                               .slaveOk(getSlaveOk(slaveOk))
-                               .oplogReplay(oplogReplay)
-                               .noCursorTimeout(noCursorTimeout)
-                               .awaitData(awaitData)
-                               .partial(partial));
-    }
-
-    @Override
-    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
-                                    final int skip, final int limit, final int batchSize,
-                                    final boolean slaveOk, final boolean tailableCursor,
-                                    final boolean awaitData, final boolean noCursorTimeout,
-                                    final boolean partial, final boolean oplogReplay,
-                                    final Decoder<T> resultDecoder) {
-        return executeProtocol(new QueryProtocol<T>(namespace, skip, limit, batchSize, queryDocument, fields, resultDecoder)
-                               .tailableCursor(tailableCursor)
-                               .slaveOk(getSlaveOk(slaveOk))
-                               .oplogReplay(oplogReplay)
-                               .noCursorTimeout(noCursorTimeout)
-                               .awaitData(awaitData)
-                               .partial(partial));
-    }
-
-    @Override
-    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
-                               final int numberToReturn, final int skip,
-                               final boolean slaveOk, final boolean tailableCursor, final boolean awaitData, final boolean noCursorTimeout,
-                               final boolean partial,
-                               final boolean oplogReplay, final Decoder<T> resultDecoder,
-                               final SingleResultCallback<QueryResult<T>> callback) {
-        executeProtocolAsync(new QueryProtocol<T>(namespace, skip, numberToReturn, queryDocument, fields, resultDecoder)
-                             .tailableCursor(tailableCursor)
-                             .slaveOk(getSlaveOk(slaveOk))
-                             .oplogReplay(oplogReplay)
-                             .noCursorTimeout(noCursorTimeout)
-                             .awaitData(awaitData)
-                             .partial(partial), callback);
-    }
-
-    @Override
-    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields, final int skip,
-                               final int limit, final int batchSize, final boolean slaveOk, final boolean tailableCursor,
-                               final boolean awaitData, final boolean noCursorTimeout, final boolean partial, final boolean oplogReplay,
-                               final Decoder<T> resultDecoder, final SingleResultCallback<QueryResult<T>> callback) {
-        executeProtocolAsync(new QueryProtocol<T>(namespace, skip, limit, batchSize, queryDocument, fields, resultDecoder)
-                             .tailableCursor(tailableCursor)
-                             .slaveOk(getSlaveOk(slaveOk))
-                             .oplogReplay(oplogReplay)
-                             .noCursorTimeout(noCursorTimeout)
-                             .awaitData(awaitData)
-                             .partial(partial), callback);
-    }
-
-    @Override
-    public <T> QueryResult<T> getMore(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
-                                      final Decoder<T> resultDecoder) {
-        return executeProtocol(new GetMoreProtocol<T>(namespace, cursorId, numberToReturn, resultDecoder));
-    }
-
-    @Override
-    public <T> void getMoreAsync(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
-                                 final Decoder<T> resultDecoder, final SingleResultCallback<QueryResult<T>> callback) {
-        executeProtocolAsync(new GetMoreProtocol<T>(namespace, cursorId, numberToReturn, resultDecoder), callback);
-    }
-
-    @Override
-    public void killCursor(final List<Long> cursors) {
-        killCursor(null, cursors);
-    }
-
-    @Override
-    public void killCursor(final MongoNamespace namespace, final List<Long> cursors) {
-        executeProtocol(new KillCursorProtocol(namespace, cursors));
-    }
-
-    @Override
-    public void killCursorAsync(final List<Long> cursors, final SingleResultCallback<Void> callback) {
-        killCursorAsync(null, cursors, callback);
-    }
-
-    @Override
-    public void killCursorAsync(final MongoNamespace namespace, final List<Long> cursors, final SingleResultCallback<Void> callback) {
-        executeProtocolAsync(new KillCursorProtocol(namespace, cursors), callback);
-    }
-
-    private boolean getSlaveOk(final boolean slaveOk) {
-        return slaveOk
-               || (clusterConnectionMode == ClusterConnectionMode.SINGLE && wrapped.getDescription().getServerType() != SHARD_ROUTER);
-    }
-
-    private <T> T executeProtocol(final Protocol<T> protocol) {
-        return protocolExecutor.execute(protocol, this.wrapped);
-    }
-
-    private <T> void executeProtocolAsync(final Protocol<T> protocol, final SingleResultCallback<T> callback) {
-        SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-        try {
-            protocolExecutor.executeAsync(protocol, this.wrapped, errHandlingCallback);
-        } catch (Throwable t) {
-            errHandlingCallback.onResult(null, t);
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultServerMonitor.java b/driver-core/src/main/com/mongodb/connection/DefaultServerMonitor.java
deleted file mode 100644
index 4741e3718d3..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DefaultServerMonitor.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoSocketException;
-import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.event.ServerHeartbeatFailedEvent;
-import com.mongodb.event.ServerHeartbeatStartedEvent;
-import com.mongodb.event.ServerHeartbeatSucceededEvent;
-import com.mongodb.event.ServerMonitorEventMulticaster;
-import com.mongodb.event.ServerMonitorListener;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static com.mongodb.connection.CommandHelper.executeCommand;
-import static com.mongodb.connection.DescriptionHelper.createServerDescription;
-import static com.mongodb.connection.ServerConnectionState.CONNECTING;
-import static com.mongodb.connection.ServerType.UNKNOWN;
-import static java.lang.String.format;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-
-@ThreadSafe
-class DefaultServerMonitor implements ServerMonitor {
-
-    private static final Logger LOGGER = Loggers.getLogger("cluster");
-
-    private final ServerId serverId;
-    private final ServerMonitorListener serverMonitorListener;
-    private final ChangeListener<ServerDescription> serverStateListener;
-    private final InternalConnectionFactory internalConnectionFactory;
-    private final ConnectionPool connectionPool;
-    private final ServerSettings settings;
-    private final ServerMonitorRunnable monitor;
-    private final Thread monitorThread;
-    private final Lock lock = new ReentrantLock();
-    private final Condition condition = lock.newCondition();
-    private volatile boolean isClosed;
-
-    DefaultServerMonitor(final ServerId serverId, final ServerSettings settings,
-                         final ChangeListener<ServerDescription> serverStateListener,
-                         final InternalConnectionFactory internalConnectionFactory, final ConnectionPool connectionPool) {
-        this.settings = settings;
-        this.serverId = serverId;
-        this.serverMonitorListener = settings.getServerMonitorListeners().isEmpty()
-                                             ? new NoOpServerMonitorListener()
-                                             : new ServerMonitorEventMulticaster(settings.getServerMonitorListeners());
-        this.serverStateListener = serverStateListener;
-        this.internalConnectionFactory = internalConnectionFactory;
-        this.connectionPool = connectionPool;
-        monitor = new ServerMonitorRunnable();
-        monitorThread = new Thread(monitor, "cluster-" + this.serverId.getClusterId() + "-" + this.serverId.getAddress());
-        monitorThread.setDaemon(true);
-        isClosed = false;
-    }
-
-    @Override
-    public void start() {
-        monitorThread.start();
-    }
-
-    @Override
-    public void connect() {
-        lock.lock();
-        try {
-            condition.signal();
-        } finally {
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void close() {
-        isClosed = true;
-        monitorThread.interrupt();
-    }
-
-    class ServerMonitorRunnable implements Runnable {
-        private final ExponentiallyWeightedMovingAverage averageRoundTripTime = new ExponentiallyWeightedMovingAverage(0.2);
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public synchronized void run() {
-            InternalConnection connection = null;
-            try {
-                ServerDescription currentServerDescription = getConnectingServerDescription(null);
-                Throwable currentException = null;
-                while (!isClosed) {
-                    ServerDescription previousServerDescription = currentServerDescription;
-                    Throwable previousException = currentException;
-                    currentException = null;
-                    try {
-                        if (connection == null) {
-                            connection = internalConnectionFactory.create(serverId);
-                            try {
-                                connection.open();
-                            } catch (Throwable t) {
-                                connection = null;
-                                throw t;
-                            }
-                        }
-                        try {
-                            currentServerDescription = lookupServerDescription(connection);
-                        } catch (MongoSocketException e) {
-                            connectionPool.invalidate();
-                            connection.close();
-                            connection = null;
-                            connection = internalConnectionFactory.create(serverId);
-                            try {
-                                connection.open();
-                            } catch (Throwable t) {
-                                connection = null;
-                                throw t;
-                            }
-                            try {
-                                currentServerDescription = lookupServerDescription(connection);
-                            } catch (MongoSocketException e1) {
-                                connection.close();
-                                connection = null;
-                                throw e1;
-                            }
-                        }
-                    } catch (Throwable t) {
-                        averageRoundTripTime.reset();
-                        currentException = t;
-                        currentServerDescription = getConnectingServerDescription(t);
-                    }
-
-                    if (!isClosed) {
-                        try {
-                            logStateChange(previousServerDescription, previousException, currentServerDescription, currentException);
-                            sendStateChangedEvent(previousServerDescription, currentServerDescription);
-                        } catch (Throwable t) {
-                            LOGGER.warn("Exception in monitor thread during notification of server description state change", t);
-                        }
-                        waitForNext();
-                    }
-                }
-            } finally {
-                if (connection != null) {
-                    connection.close();
-                }
-            }
-        }
-
-        private ServerDescription getConnectingServerDescription(final Throwable exception) {
-            return ServerDescription.builder().type(UNKNOWN).state(CONNECTING).address(serverId.getAddress()).exception(exception).build();
-        }
-
-        private ServerDescription lookupServerDescription(final InternalConnection connection) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Checking status of %s", serverId.getAddress()));
-            }
-            serverMonitorListener.serverHearbeatStarted(new ServerHeartbeatStartedEvent(connection.getDescription().getConnectionId()));
-
-            long start = System.nanoTime();
-            try {
-                BsonDocument isMasterResult = executeCommand("admin", new BsonDocument("ismaster", new BsonInt32(1)), connection);
-                long elapsedTimeNanos = System.nanoTime() - start;
-                averageRoundTripTime.addSample(elapsedTimeNanos);
-
-                serverMonitorListener.serverHeartbeatSucceeded(
-                        new ServerHeartbeatSucceededEvent(connection.getDescription().getConnectionId(), isMasterResult, elapsedTimeNanos));
-
-                return createServerDescription(serverId.getAddress(), isMasterResult, connection.getDescription().getServerVersion(),
-                                               averageRoundTripTime.getAverage());
-            } catch (RuntimeException e) {
-                serverMonitorListener.serverHeartbeatFailed(
-                        new ServerHeartbeatFailedEvent(connection.getDescription().getConnectionId(), System.nanoTime() - start, e));
-                throw e;
-            }
-        }
-
-        private void sendStateChangedEvent(final ServerDescription previousServerDescription,
-                                           final ServerDescription currentServerDescription) {
-            if (stateHasChanged(previousServerDescription, currentServerDescription)) {
-                serverStateListener.stateChanged(new ChangeEvent<ServerDescription>(previousServerDescription,
-                                                                                    currentServerDescription));
-            }
-        }
-
-        private void logStateChange(final ServerDescription previousServerDescription, final Throwable previousException,
-                                    final ServerDescription currentServerDescription, final Throwable currentException) {
-            // Note that the ServerDescription.equals method does not include the average ping time as part of the comparison,
-            // so this will not spam the logs too hard.
-            if (descriptionHasChanged(previousServerDescription, currentServerDescription)
-                || exceptionHasChanged(previousException, currentException)) {
-                if (currentException != null) {
-                    LOGGER.info(format("Exception in monitor thread while connecting to server %s", serverId.getAddress()),
-                                currentException);
-                } else {
-                    LOGGER.info(format("Monitor thread successfully connected to server with description %s", currentServerDescription));
-                }
-            }
-        }
-
-        private void waitForNext() {
-            try {
-                long timeRemaining = waitForSignalOrTimeout();
-                if (timeRemaining > 0) {
-                    long timeWaiting = settings.getHeartbeatFrequency(NANOSECONDS) - timeRemaining;
-                    long minimumNanosToWait = settings.getMinHeartbeatFrequency(NANOSECONDS);
-                    if (timeWaiting < minimumNanosToWait) {
-                        long millisToSleep = MILLISECONDS.convert(minimumNanosToWait - timeWaiting, NANOSECONDS);
-                        if (millisToSleep > 0) {
-                            Thread.sleep(millisToSleep);
-                        }
-                    }
-                }
-            } catch (InterruptedException e) {
-                // fall through
-            }
-        }
-
-        private long waitForSignalOrTimeout() throws InterruptedException {
-            lock.lock();
-            try {
-                return condition.awaitNanos(settings.getHeartbeatFrequency(NANOSECONDS));
-            } finally {
-                lock.unlock();
-            }
-        }
-    }
-
-    static boolean descriptionHasChanged(final ServerDescription previousServerDescription,
-                                         final ServerDescription currentServerDescription) {
-        return !previousServerDescription.equals(currentServerDescription);
-    }
-
-    static boolean stateHasChanged(final ServerDescription previousServerDescription, final ServerDescription currentServerDescription) {
-        return descriptionHasChanged(previousServerDescription, currentServerDescription)
-               || previousServerDescription.getRoundTripTimeNanos() != currentServerDescription.getRoundTripTimeNanos();
-    }
-
-    static boolean exceptionHasChanged(final Throwable previousException, final Throwable currentException) {
-        if (currentException == null) {
-            return previousException != null;
-        } else if (previousException == null) {
-            return true;
-        } else if (!currentException.getClass().equals(previousException.getClass())) {
-            return true;
-        } else if (currentException.getMessage() == null) {
-            return previousException.getMessage() != null;
-        } else {
-            return !currentException.getMessage().equals(previousException.getMessage());
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultServerMonitorFactory.java b/driver-core/src/main/com/mongodb/connection/DefaultServerMonitorFactory.java
deleted file mode 100644
index 694244bda2a..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DefaultServerMonitorFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import static com.mongodb.assertions.Assertions.notNull;
-
-class DefaultServerMonitorFactory implements ServerMonitorFactory {
-    private final ServerId serverId;
-    private final ServerSettings settings;
-    private final InternalConnectionFactory internalConnectionFactory;
-    private final ConnectionPool connectionPool;
-
-    DefaultServerMonitorFactory(final ServerId serverId, final ServerSettings settings,
-                                final InternalConnectionFactory internalConnectionFactory, final ConnectionPool connectionPool) {
-        this.serverId = notNull("serverId", serverId);
-        this.settings = notNull("settings", settings);
-        this.internalConnectionFactory = notNull("internalConnectionFactory", internalConnectionFactory);
-        this.connectionPool = notNull("connectionPool", connectionPool);
-    }
-
-    @Override
-    public ServerMonitor create(final ChangeListener<ServerDescription> serverStateListener) {
-        return new DefaultServerMonitor(serverId, settings, serverStateListener, internalConnectionFactory, connectionPool);
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DeleteCommandMessage.java b/driver-core/src/main/com/mongodb/connection/DeleteCommandMessage.java
deleted file mode 100644
index f31d8309b09..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DeleteCommandMessage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import org.bson.BsonBinaryWriter;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.EncoderContext;
-import org.bson.io.BsonOutput;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * A message for the delete command.
- *
- * @mongodb.driver.manual reference/command/insert/#dbcmd.delete Delete Command
- */
-class DeleteCommandMessage extends BaseWriteCommandMessage {
-    private final List<DeleteRequest> deletes;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace the namespace
-     * @param ordered whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param settings the message settings
-     * @param deletes the list of delete requests
-     */
-    public DeleteCommandMessage(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                final MessageSettings settings, final List<DeleteRequest> deletes) {
-        super(namespace, ordered, writeConcern, null, settings);
-        this.deletes = deletes;
-    }
-
-    @Override
-    public int getItemCount() {
-        return deletes.size();
-    }
-
-    @Override
-    protected FieldNameValidator getFieldNameValidator() {
-        return new NoOpFieldNameValidator();
-    }
-
-    /**
-     * Gets the list of requests.
-     *
-     * @return the list of requests
-     */
-    public List<DeleteRequest> getRequests() {
-        return Collections.unmodifiableList(deletes);
-    }
-
-    @Override
-    protected String getCommandName() {
-        return "delete";
-    }
-
-    @Override
-    protected BaseWriteCommandMessage writeTheWrites(final BsonOutput bsonOutput, final int commandStartPosition,
-                                                     final BsonBinaryWriter writer) {
-        DeleteCommandMessage nextMessage = null;
-        writer.writeStartArray("deletes");
-        for (int i = 0; i < deletes.size(); i++) {
-            writer.mark();
-            DeleteRequest deleteRequest = deletes.get(i);
-            writer.writeStartDocument();
-            writer.pushMaxDocumentSize(getSettings().getMaxDocumentSize());
-            writer.writeName("q");
-            getCodec(deleteRequest.getFilter()).encode(writer, deleteRequest.getFilter(), EncoderContext.builder().build());
-            writer.writeInt32("limit", deleteRequest.isMulti() ? 0 : 1);
-            writer.popMaxDocumentSize();
-            writer.writeEndDocument();
-            if (exceedsLimits(bsonOutput.getPosition() - commandStartPosition, i + 1)) {
-                writer.reset();
-                nextMessage = new DeleteCommandMessage(getWriteNamespace(), isOrdered(), getWriteConcern(), getSettings(),
-                                                       deletes.subList(i, deletes.size()));
-                break;
-            }
-        }
-        writer.writeEndArray();
-        return nextMessage;
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DeleteCommandProtocol.java b/driver-core/src/main/com/mongodb/connection/DeleteCommandProtocol.java
deleted file mode 100644
index caa18b265f0..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DeleteCommandProtocol.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.bulk.WriteRequest;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.lang.String.format;
-
-/**
- * An implementation of the delete command.
- *
- * @mongodb.driver.manual reference/command/insert/#dbcmd.delete Delete Command
- */
-class DeleteCommandProtocol extends WriteCommandProtocol {
-
-    private static final Logger LOGGER = Loggers.getLogger("protocol.delete");
-
-    private final List<DeleteRequest> deleteRequests;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the inserts are ordered
-     * @param writeConcern the write concern
-     * @param deletes      the list of deletes
-     */
-    public DeleteCommandProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                 final List<DeleteRequest> deletes) {
-        super(namespace, ordered, writeConcern, null);
-        this.deleteRequests = notNull("removes", deletes);
-    }
-
-    @Override
-    public BulkWriteResult execute(final InternalConnection connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(format("Deleting documents from namespace %s on connection [%s] to server %s", getNamespace(),
-                                connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-        }
-        BulkWriteResult writeResult = super.execute(connection);
-        LOGGER.debug("Delete completed");
-        return writeResult;
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-        try {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Asynchronously deleting documents from namespace %s on connection [%s] to server %s", getNamespace(),
-                                    connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-            }
-            super.executeAsync(connection, new SingleResultCallback<BulkWriteResult>() {
-                @Override
-                public void onResult(final BulkWriteResult result, final Throwable t) {
-                    if (t != null) {
-                        callback.onResult(null, t);
-                    } else {
-                        LOGGER.debug("Asynchronous delete completed");
-                        callback.onResult(result, null);
-                    }
-                }
-            });
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-        }
-    }
-
-    @Override
-    protected WriteRequest.Type getType() {
-        return WriteRequest.Type.DELETE;
-    }
-
-    @Override
-    protected DeleteCommandMessage createRequestMessage(final MessageSettings messageSettings) {
-        return new DeleteCommandMessage(getNamespace(), isOrdered(), getWriteConcern(), messageSettings, deleteRequests);
-    }
-
-    @Override
-    protected com.mongodb.diagnostics.logging.Logger getLogger() {
-        return LOGGER;
-    }
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DeleteMessage.java b/driver-core/src/main/com/mongodb/connection/DeleteMessage.java
deleted file mode 100644
index 76c5d00fdda..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DeleteMessage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import org.bson.io.BsonOutput;
-
-import java.util.List;
-
-/**
- * An OP_DELETE message.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-delete OP_DELETE
- */
-class DeleteMessage extends RequestMessage {
-    private final List<DeleteRequest> deleteRequests;
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection name
-     * @param deletes        the list of delete requests
-     * @param settings       the message settings
-     */
-    public DeleteMessage(final String collectionName, final List<DeleteRequest> deletes,
-                         final MessageSettings settings) {
-        super(collectionName, OpCode.OP_DELETE, settings);
-        this.deleteRequests = deletes;
-    }
-
-    @Override
-    protected RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final int messageStartPosition) {
-        return encodeMessageBodyWithMetadata(bsonOutput, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final int messageStartPosition) {
-        DeleteRequest deleteRequest = deleteRequests.get(0);
-        bsonOutput.writeInt32(0); // reserved
-        bsonOutput.writeCString(getCollectionName());
-
-        if (deleteRequest.isMulti()) {
-            bsonOutput.writeInt32(0);
-        } else {
-            bsonOutput.writeInt32(1);
-        }
-
-        int firstDocumentStartPosition = bsonOutput.getPosition();
-
-        addDocument(deleteRequest.getFilter(), bsonOutput, new NoOpFieldNameValidator());
-        if (deleteRequests.size() == 1) {
-            return new EncodingMetadata(null, firstDocumentStartPosition);
-        } else {
-            return new EncodingMetadata(new DeleteMessage(getCollectionName(), deleteRequests.subList(1, deleteRequests.size()),
-                                                          getSettings()),
-                                        firstDocumentStartPosition);
-        }
-    }
-
-}
-
diff --git a/driver-core/src/main/com/mongodb/connection/DeleteProtocol.java b/driver-core/src/main/com/mongodb/connection/DeleteProtocol.java
deleted file mode 100644
index 96dfd224e4f..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DeleteProtocol.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import org.bson.BsonArray;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-
-import java.util.List;
-
-import static com.mongodb.connection.ByteBufBsonDocument.createOne;
-import static java.lang.String.format;
-import static java.util.Collections.singletonList;
-
-/**
- * An implementation of the MongoDB OP_DELETE wire protocol.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-delete OP_DELETE
- */
-class DeleteProtocol extends WriteProtocol {
-    private static final Logger LOGGER = Loggers.getLogger("protocol.delete");
-
-    private final List<DeleteRequest> deletes;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the delete are ordered
-     * @param writeConcern the write concern to apply
-     * @param deletes      the deletes
-     */
-    public DeleteProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                          final List<DeleteRequest> deletes) {
-        super(namespace, ordered, writeConcern);
-        this.deletes = deletes;
-    }
-
-    @Override
-    public WriteConcernResult execute(final InternalConnection connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(format("Deleting documents from namespace %s on connection [%s] to server %s", getNamespace(),
-                                connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-        }
-        WriteConcernResult writeConcernResult = super.execute(connection);
-        LOGGER.debug("Delete completed");
-        return writeConcernResult;
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
-        try {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Asynchronously deleting documents in namespace %s on connection [%s] to server %s", getNamespace(),
-                                    connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-            }
-            super.executeAsync(connection, new SingleResultCallback<WriteConcernResult>() {
-                @Override
-                public void onResult(final WriteConcernResult result, final Throwable t) {
-                    if (t != null) {
-                        callback.onResult(null, t);
-                    } else {
-                        LOGGER.debug("Asynchronous delete completed");
-                        callback.onResult(result, null);
-                    }
-                }
-            });
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-        }
-    }
-
-    @Override
-    protected BsonDocument getAsWriteCommand(final ByteBufferBsonOutput bsonOutput, final int firstDocumentPosition) {
-        BsonDocument deleteDocument = new BsonDocument("q", createOne(bsonOutput, firstDocumentPosition))
-                                      .append("limit", deletes.get(0).isMulti() ? new BsonInt32(0) : new BsonInt32(1));
-        return getBaseCommandDocument("delete").append("deletes", new BsonArray(singletonList(deleteDocument)));
-    }
-
-    @Override
-    protected RequestMessage createRequestMessage(final MessageSettings settings) {
-        return new DeleteMessage(getNamespace().getFullName(), deletes, settings);
-    }
-
-    @Override
-    protected void appendToWriteCommandResponseDocument(final RequestMessage curMessage, final RequestMessage nextMessage,
-                                                        final WriteConcernResult writeConcernResult, final BsonDocument response) {
-        response.append("n", new BsonInt32(writeConcernResult.getCount()));
-    }
-
-    @Override
-    protected Logger getLogger() {
-        return LOGGER;
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/DescriptionHelper.java b/driver-core/src/main/com/mongodb/connection/DescriptionHelper.java
deleted file mode 100644
index 5139814d68f..00000000000
--- a/driver-core/src/main/com/mongodb/connection/DescriptionHelper.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.ServerAddress;
-import com.mongodb.Tag;
-import com.mongodb.TagSet;
-import org.bson.BsonArray;
-import org.bson.BsonBoolean;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonString;
-import org.bson.BsonValue;
-import org.bson.types.ObjectId;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize;
-import static com.mongodb.connection.ConnectionDescription.getDefaultMaxWriteBatchSize;
-import static com.mongodb.connection.ServerConnectionState.CONNECTED;
-import static com.mongodb.connection.ServerDescription.getDefaultMaxDocumentSize;
-import static com.mongodb.connection.ServerDescription.getDefaultMaxWireVersion;
-import static com.mongodb.connection.ServerDescription.getDefaultMinWireVersion;
-import static com.mongodb.connection.ServerType.REPLICA_SET_ARBITER;
-import static com.mongodb.connection.ServerType.REPLICA_SET_OTHER;
-import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY;
-import static com.mongodb.connection.ServerType.REPLICA_SET_SECONDARY;
-import static com.mongodb.connection.ServerType.SHARD_ROUTER;
-import static com.mongodb.connection.ServerType.STANDALONE;
-import static com.mongodb.connection.ServerType.UNKNOWN;
-import static java.util.Arrays.asList;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-
-final class DescriptionHelper {
-
-    static ConnectionDescription createConnectionDescription(final ConnectionId connectionId,
-                                                             final BsonDocument isMasterResult,
-                                                             final BsonDocument buildInfoResult) {
-        return new ConnectionDescription(connectionId, getVersion(buildInfoResult), getServerType(isMasterResult),
-                                         getMaxWriteBatchSize(isMasterResult), getMaxBsonObjectSize(isMasterResult),
-                                         getMaxMessageSizeBytes(isMasterResult));
-
-    }
-
-    static ServerDescription createServerDescription(final ServerAddress serverAddress, final BsonDocument isMasterResult,
-                                                     final ServerVersion serverVersion, final long roundTripTime) {
-        return ServerDescription.builder()
-                                .state(CONNECTED)
-                                .version(serverVersion)
-                                .address(serverAddress)
-                                .type(getServerType(isMasterResult))
-                                .canonicalAddress(isMasterResult.containsKey("me") ? isMasterResult.getString("me").getValue() : null)
-                                .hosts(listToSet(isMasterResult.getArray("hosts", new BsonArray())))
-                                .passives(listToSet(isMasterResult.getArray("passives", new BsonArray())))
-                                .arbiters(listToSet(isMasterResult.getArray("arbiters", new BsonArray())))
-                                .primary(getString(isMasterResult, "primary"))
-                                .maxDocumentSize(getMaxBsonObjectSize(isMasterResult))
-                                .tagSet(getTagSetFromDocument(isMasterResult.getDocument("tags", new BsonDocument())))
-                                .setName(getString(isMasterResult, "setName"))
-                                .minWireVersion(isMasterResult.getInt32("minWireVersion",
-                                                                        new BsonInt32(getDefaultMinWireVersion())).getValue())
-                                .maxWireVersion(isMasterResult.getInt32("maxWireVersion",
-                                                                        new BsonInt32(getDefaultMaxWireVersion())).getValue())
-                                .electionId(getElectionId(isMasterResult))
-                                .setVersion(getSetVersion(isMasterResult))
-                                .roundTripTime(roundTripTime, NANOSECONDS)
-                                .ok(CommandHelper.isCommandOk(isMasterResult)).build();
-    }
-
-    private static ObjectId getElectionId(final BsonDocument isMasterResult) {
-        return isMasterResult.containsKey("electionId") ? isMasterResult.getObjectId("electionId").getValue() : null;
-    }
-
-    private static Integer getSetVersion(final BsonDocument isMasterResult) {
-        return isMasterResult.containsKey("setVersion") ? isMasterResult.getNumber("setVersion").intValue() : null;
-    }
-
-    private static int getMaxMessageSizeBytes(final BsonDocument isMasterResult) {
-        return isMasterResult.getInt32("maxMessageSizeBytes", new BsonInt32(getDefaultMaxMessageSize())).getValue();
-    }
-
-    private static int getMaxBsonObjectSize(final BsonDocument isMasterResult) {
-        return isMasterResult.getInt32("maxBsonObjectSize", new BsonInt32(getDefaultMaxDocumentSize())).getValue();
-    }
-
-    private static int getMaxWriteBatchSize(final BsonDocument isMasterResult) {
-        return isMasterResult.getInt32("maxWriteBatchSize", new BsonInt32(getDefaultMaxWriteBatchSize())).getValue();
-    }
-
-    private static String getString(final BsonDocument response, final String key) {
-        if (response.containsKey(key)) {
-            return response.getString(key).getValue();
-        } else {
-            return null;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    static ServerVersion getVersion(final BsonDocument buildInfoResult) {
-        List<BsonValue> versionArray = buildInfoResult.getArray("versionArray").subList(0, 3);
-
-        return new ServerVersion(asList(versionArray.get(0).asInt32().getValue(),
-                                        versionArray.get(1).asInt32().getValue(),
-                                        versionArray.get(2).asInt32().getValue()));
-    }
-
-    private static Set<String> listToSet(final BsonArray array) {
-        if (array == null || array.isEmpty()) {
-            return Collections.emptySet();
-        } else {
-            Set<String> set = new HashSet<String>();
-            for (BsonValue value : array) {
-                set.add(value.asString().getValue());
-            }
-            return set;
-        }
-    }
-
-    private static ServerType getServerType(final BsonDocument isMasterResult) {
-
-        if (!CommandHelper.isCommandOk(isMasterResult)) {
-            return UNKNOWN;
-        }
-
-        if (isReplicaSetMember(isMasterResult)) {
-
-            if (isMasterResult.getBoolean("hidden", BsonBoolean.FALSE).getValue()) {
-                return REPLICA_SET_OTHER;
-            }
-
-            if (isMasterResult.getBoolean("ismaster", BsonBoolean.FALSE).getValue()) {
-                return REPLICA_SET_PRIMARY;
-            }
-
-            if (isMasterResult.getBoolean("secondary", BsonBoolean.FALSE).getValue()) {
-                return REPLICA_SET_SECONDARY;
-            }
-
-            if (isMasterResult.getBoolean("arbiterOnly", BsonBoolean.FALSE).getValue()) {
-                return REPLICA_SET_ARBITER;
-            }
-
-            if (isMasterResult.containsKey("setName") && isMasterResult.containsKey("hosts")) {
-                return ServerType.REPLICA_SET_OTHER;
-            }
-
-            return ServerType.REPLICA_SET_GHOST;
-        }
-
-        if (isMasterResult.containsKey("msg") && isMasterResult.get("msg").equals(new BsonString("isdbgrid"))) {
-            return SHARD_ROUTER;
-        }
-
-        return STANDALONE;
-    }
-
-    private static boolean isReplicaSetMember(final BsonDocument isMasterResult) {
-        return isMasterResult.containsKey("setName") || isMasterResult.getBoolean("isreplicaset", BsonBoolean.FALSE).getValue();
-    }
-
-    private static TagSet getTagSetFromDocument(final BsonDocument tagsDocuments) {
-        List<Tag> tagList = new ArrayList<Tag>();
-        for (final Map.Entry<String, BsonValue> curEntry : tagsDocuments.entrySet()) {
-            tagList.add(new Tag(curEntry.getKey(), curEntry.getValue().asString().getValue()));
-        }
-        return new TagSet(tagList);
-    }
-
-    private DescriptionHelper() {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/GetMoreMessage.java b/driver-core/src/main/com/mongodb/connection/GetMoreMessage.java
deleted file mode 100644
index 5c6595ef909..00000000000
--- a/driver-core/src/main/com/mongodb/connection/GetMoreMessage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import org.bson.io.BsonOutput;
-
-/**
- * An OP_GET_MORE message.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-get-more OP_GET_MORE
- */
-class GetMoreMessage extends RequestMessage {
-    private final long cursorId;
-    private final int numberToReturn;
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection name
-     * @param cursorId       the cursor id
-     * @param numberToReturn the number of documents to return
-     */
-    public GetMoreMessage(final String collectionName, final long cursorId, final int numberToReturn) {
-        super(collectionName, OpCode.OP_GETMORE, MessageSettings.builder().build());
-        this.cursorId = cursorId;
-        this.numberToReturn = numberToReturn;
-    }
-
-    /**
-     * Gets the cursor to get more from.
-     *
-     * @return the cursor id
-     */
-    public long getCursorId() {
-        return cursorId;
-    }
-
-    @Override
-    protected RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final int messageStartPosition) {
-        return encodeMessageBodyWithMetadata(bsonOutput, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final int messageStartPosition) {
-        writeGetMore(bsonOutput);
-        return new EncodingMetadata(null, bsonOutput.getPosition());
-    }
-
-    private void writeGetMore(final BsonOutput buffer) {
-        buffer.writeInt32(0);
-        buffer.writeCString(getCollectionName());
-        buffer.writeInt32(numberToReturn);
-        buffer.writeInt64(cursorId);
-    }
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InsertCommandMessage.java b/driver-core/src/main/com/mongodb/connection/InsertCommandMessage.java
deleted file mode 100644
index 2187f661b1b..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InsertCommandMessage.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
-import com.mongodb.internal.validator.MappedFieldNameValidator;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import org.bson.BsonBinaryWriter;
-import org.bson.BsonDocument;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.EncoderContext;
-import org.bson.io.BsonOutput;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.mongodb.assertions.Assertions.notNull;
-
-/**
- * An insert command message.
- *
- * @mongodb.driver.manual reference/command/insert/#dbcmd.insert Insert Command
- */
-class InsertCommandMessage extends BaseWriteCommandMessage {
-    private final List<InsertRequest> insertRequestList;
-
-    /**
-     * Construct a new instance.
-     *
-     * @param namespace                 the namespace
-     * @param ordered                   whether the inserts are ordered
-     * @param writeConcern              the write concern
-     * @param bypassDocumentValidation  the bypass documentation validation flag
-     * @param settings                  the message settings
-     * @param insertRequestList         the list of inserts
-     */
-    public InsertCommandMessage(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                final Boolean bypassDocumentValidation, final MessageSettings settings,
-                                final List<InsertRequest> insertRequestList) {
-        super(namespace, ordered, writeConcern, bypassDocumentValidation, settings);
-        this.insertRequestList = notNull("insertRequestList", insertRequestList);
-    }
-
-    @Override
-    public int getItemCount() {
-        return insertRequestList.size();
-    }
-
-    @Override
-    protected FieldNameValidator getFieldNameValidator() {
-        Map<String, FieldNameValidator> map = new HashMap<String, FieldNameValidator>();
-        map.put("documents", new CollectibleDocumentFieldNameValidator());
-        return new MappedFieldNameValidator(new NoOpFieldNameValidator(), map);
-    }
-
-    /**
-     * Gets the list of insert requests.
-     *
-     * @return the non-null list of insert requests
-     */
-    public List<InsertRequest> getRequests() {
-        return Collections.unmodifiableList(insertRequestList);
-    }
-
-    /**
-     * Gets the command name, which is "insert".
-     *
-     * @return the command name
-     */
-    protected String getCommandName() {
-        return "insert";
-    }
-
-    protected InsertCommandMessage writeTheWrites(final BsonOutput bsonOutput, final int commandStartPosition,
-                                                  final BsonBinaryWriter writer) {
-        InsertCommandMessage nextMessage = null;
-        writer.writeStartArray("documents");
-        writer.pushMaxDocumentSize(getSettings().getMaxDocumentSize());
-        for (int i = 0; i < insertRequestList.size(); i++) {
-            writer.mark();
-            BsonDocument document = insertRequestList.get(i).getDocument();
-            getCodec(document).encode(writer, document, EncoderContext.builder().isEncodingCollectibleDocument(true).build());
-            if (exceedsLimits(bsonOutput.getPosition() - commandStartPosition, i + 1)) {
-                writer.reset();
-                nextMessage = new InsertCommandMessage(getWriteNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(),
-                        getSettings(), insertRequestList.subList(i, insertRequestList.size()));
-                break;
-            }
-        }
-        writer.popMaxDocumentSize();
-        writer.writeEndArray();
-        return nextMessage;
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InsertCommandProtocol.java b/driver-core/src/main/com/mongodb/connection/InsertCommandProtocol.java
deleted file mode 100644
index 28b224a1605..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InsertCommandProtocol.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.bulk.WriteRequest;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-
-import java.util.List;
-
-import static java.lang.String.format;
-
-/**
- * An implementation of the insert command.
- *
- * @mongodb.driver.manual reference/command/insert/#dbcmd.insert Insert Command
- */
-class InsertCommandProtocol extends WriteCommandProtocol {
-
-    private static final Logger LOGGER = Loggers.getLogger("protocol.insert");
-
-    private final List<InsertRequest> insertRequests;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace                 the namespace
-     * @param ordered                   whether the inserts are ordered
-     * @param writeConcern              the write concern
-     * @param bypassDocumentValidation  the bypass documentation validation flag
-     * @param insertRequests            the list of inserts
-     */
-    public InsertCommandProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                 final Boolean bypassDocumentValidation, final List<InsertRequest> insertRequests) {
-        super(namespace, ordered, writeConcern, bypassDocumentValidation);
-        this.insertRequests = insertRequests;
-    }
-
-    @Override
-    public BulkWriteResult execute(final InternalConnection connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(format("Inserting %d documents into namespace %s on connection [%s] to server %s",
-                                insertRequests.size(),
-                                getNamespace(),
-                                connection.getDescription().getConnectionId(),
-                                connection.getDescription().getServerAddress()));
-        }
-        BulkWriteResult writeResult = super.execute(connection);
-        LOGGER.debug("Insert completed");
-        return writeResult;
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-        try {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Asynchronously inserting %d documents into namespace %s on connection [%s] to server %s",
-                                    insertRequests.size(), getNamespace(), connection.getDescription().getConnectionId(),
-                                    connection.getDescription().getServerAddress()));
-            }
-            super.executeAsync(connection, new SingleResultCallback<BulkWriteResult>() {
-                @Override
-                public void onResult(final BulkWriteResult result, final Throwable t) {
-                    if (t != null) {
-                        callback.onResult(null, t);
-                    } else {
-                        LOGGER.debug("Asynchronous insert completed");
-                        callback.onResult(result, null);
-                    }
-                }
-            });
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-        }
-    }
-
-    @Override
-    protected WriteRequest.Type getType() {
-        return WriteRequest.Type.INSERT;
-    }
-
-    @Override
-    protected InsertCommandMessage createRequestMessage(final MessageSettings messageSettings) {
-        return new InsertCommandMessage(getNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(), messageSettings,
-                insertRequests);
-    }
-
-    @Override
-    protected com.mongodb.diagnostics.logging.Logger getLogger() {
-        return LOGGER;
-    }
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InsertMessage.java b/driver-core/src/main/com/mongodb/connection/InsertMessage.java
deleted file mode 100644
index 41a3819d666..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InsertMessage.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.WriteConcern;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import org.bson.BsonDocument;
-import org.bson.FieldNameValidator;
-import org.bson.io.BsonOutput;
-
-import java.util.List;
-
-/**
- * An insert message.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-insert OP_INSERT
- */
-class InsertMessage extends RequestMessage {
-
-    private final boolean ordered;
-    private final WriteConcern writeConcern;
-    private final List<InsertRequest> insertRequestList;
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName    the full name of the collection
-     * @param ordered           whether the inserts are ordered
-     * @param writeConcern      the write concern
-     * @param insertRequestList the list of insert requests
-     * @param settings          the message settings
-     */
-    public InsertMessage(final String collectionName, final boolean ordered, final WriteConcern writeConcern,
-                         final List<InsertRequest> insertRequestList, final MessageSettings settings) {
-        super(collectionName, OpCode.OP_INSERT, settings);
-        this.ordered = ordered;
-        this.writeConcern = writeConcern;
-        this.insertRequestList = insertRequestList;
-    }
-
-    public List<InsertRequest> getInsertRequestList() {
-        return insertRequestList;
-    }
-
-    @Override
-    protected RequestMessage encodeMessageBody(final BsonOutput outputStream, final int messageStartPosition) {
-        return encodeMessageBodyWithMetadata(outputStream, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput outputStream, final int messageStartPosition) {
-        writeInsertPrologue(outputStream);
-        int firstDocumentPosition = outputStream.getPosition();
-        for (int i = 0; i < insertRequestList.size(); i++) {
-            BsonDocument document = insertRequestList.get(i).getDocument();
-            int pos = outputStream.getPosition();
-            addCollectibleDocument(document, outputStream, createValidator());
-            if (outputStream.getPosition() - messageStartPosition > getSettings().getMaxMessageSize()) {
-                outputStream.truncateToPosition(pos);
-                return new EncodingMetadata(new InsertMessage(getCollectionName(), ordered, writeConcern,
-                                                          insertRequestList.subList(i, insertRequestList.size()), getSettings()),
-                                            firstDocumentPosition);
-            }
-        }
-        return new EncodingMetadata(null, firstDocumentPosition);
-    }
-
-    private FieldNameValidator createValidator() {
-        if (getCollectionName().endsWith(".system.indexes")) {
-            return new NoOpFieldNameValidator();
-        } else {
-            return new CollectibleDocumentFieldNameValidator();
-        }
-    }
-
-    private void writeInsertPrologue(final BsonOutput outputStream) {
-        int flags = 0;
-        if (!ordered) {
-            flags |= 1;
-        }
-        outputStream.writeInt32(flags);
-        outputStream.writeCString(getCollectionName());
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InsertProtocol.java b/driver-core/src/main/com/mongodb/connection/InsertProtocol.java
deleted file mode 100644
index 219d9ddc683..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InsertProtocol.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import org.bson.BsonArray;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-
-import java.util.List;
-
-import static java.lang.String.format;
-
-/**
- * An implementation of the insert wire protocol.  This class also takes care of applying the write concern.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-insert OP_INSERT
- */
-class InsertProtocol extends WriteProtocol {
-
-    private static final Logger LOGGER = Loggers.getLogger("protocol.insert");
-
-    private final List<InsertRequest> insertRequestList;
-
-    /**
-     * Construct a new instance.
-     *
-     * @param namespace         the namespace
-     * @param ordered           whether the inserts are ordered
-     * @param writeConcern      the write concern
-     * @param insertRequestList the list of documents to insert
-     */
-    public InsertProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                          final List<InsertRequest> insertRequestList) {
-        super(namespace, ordered, writeConcern);
-        this.insertRequestList = insertRequestList;
-    }
-
-    @Override
-    public WriteConcernResult execute(final InternalConnection connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(format("Inserting %d documents into namespace %s on connection [%s] to server %s",
-                                insertRequestList.size(),
-                                getNamespace(),
-                                connection.getDescription().getConnectionId(),
-                                connection.getDescription().getServerAddress()));
-        }
-        WriteConcernResult writeConcernResult = super.execute(connection);
-        LOGGER.debug("Insert completed");
-        return writeConcernResult;
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
-        try {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Asynchronously inserting %d documents into namespace %s on connection [%s] to server %s",
-                                    insertRequestList.size(), getNamespace(), connection.getDescription().getConnectionId(),
-                                    connection.getDescription().getServerAddress()));
-            }
-            super.executeAsync(connection, new SingleResultCallback<WriteConcernResult>() {
-                @Override
-                public void onResult(final WriteConcernResult result, final Throwable t) {
-                    if (t != null) {
-                        callback.onResult(null, t);
-                    } else {
-                        LOGGER.debug("Asynchronous insert completed");
-                        callback.onResult(result, null);
-                    }
-                }
-            });
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-        }
-    }
-
-    @Override
-    protected BsonDocument getAsWriteCommand(final ByteBufferBsonOutput bsonOutput, final int firstDocumentPosition) {
-        return getBaseCommandDocument("insert")
-               .append("documents", new BsonArray(ByteBufBsonDocument.create(bsonOutput, firstDocumentPosition)));
-
-    }
-
-    protected RequestMessage createRequestMessage(final MessageSettings settings) {
-        return new InsertMessage(getNamespace().getFullName(), isOrdered(), getWriteConcern(), insertRequestList, settings);
-    }
-
-    @Override
-    protected void appendToWriteCommandResponseDocument(final RequestMessage curMessage, final RequestMessage nextMessage,
-                                                        final WriteConcernResult writeConcernResult, final BsonDocument response) {
-        response.append("n", new BsonInt32(nextMessage == null ? ((InsertMessage) curMessage).getInsertRequestList().size()
-                                                               : ((InsertMessage) curMessage).getInsertRequestList().size()
-                                                                 - ((InsertMessage) nextMessage).getInsertRequestList().size()));
-    }
-
-    @Override
-    protected com.mongodb.diagnostics.logging.Logger getLogger() {
-        return LOGGER;
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InternalConnection.java b/driver-core/src/main/com/mongodb/connection/InternalConnection.java
deleted file mode 100644
index 74902e0031f..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InternalConnection.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.async.SingleResultCallback;
-import org.bson.ByteBuf;
-
-import java.util.List;
-
-@ThreadSafe
-interface InternalConnection extends BufferProvider {
-
-    /**
-     * Gets the description of this connection.
-     *
-     * @return the connection description
-     */
-    ConnectionDescription getDescription();
-
-    /**
-     * Opens the connection so its ready for use
-     */
-    void open();
-
-    /**
-     * Opens the connection so its ready for use
-     *
-     * @param callback the callback to be called once the connection has been opened
-     */
-    void openAsync(SingleResultCallback<Void> callback);
-
-    /**
-     * Closes the connection.
-     */
-    void close();
-
-    /**
-     * Returns if the connection has been opened
-     *
-     * @return true if connection has been opened
-     */
-    boolean opened();
-
-    /**
-     * Returns the closed state of the connection
-     *
-     * @return true if connection is closed
-     */
-    boolean isClosed();
-
-    /**
-     * Send a message to the server. The connection may not make any attempt to validate the integrity of the message.
-     *
-     * @param byteBuffers   the list of byte buffers to send.
-     * @param lastRequestId the request id of the last message in byteBuffers
-     */
-    void sendMessage(List<ByteBuf> byteBuffers, int lastRequestId);
-
-    /**
-     * Receive a response to a sent message from the server.
-     *
-     * @param responseTo the request id that this message is a response to
-     * @return the response
-     */
-    ResponseBuffers receiveMessage(int responseTo);
-
-    /**
-     * Asynchronously send a message to the server. The connection may not make any attempt to validate the integrity of the message.
-     *
-     * @param byteBuffers   the list of byte buffers to send
-     * @param lastRequestId the request id of the last message in byteBuffers
-     * @param callback      the callback to invoke on completion
-     */
-    void sendMessageAsync(List<ByteBuf> byteBuffers, int lastRequestId, SingleResultCallback<Void> callback);
-
-    /**
-     * Asynchronously receive a response to a sent message from the server.
-     *
-     * @param responseTo the request id that this message is a response to
-     * @param callback the callback to invoke on completion
-     */
-    void receiveMessageAsync(int responseTo, SingleResultCallback<ResponseBuffers> callback);
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/connection/InternalStreamConnection.java
deleted file mode 100644
index d4f37c4a3e7..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InternalStreamConnection.java
+++ /dev/null
@@ -1,683 +0,0 @@
-/*
- * Copyright 2013-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoException;
-import com.mongodb.MongoInternalException;
-import com.mongodb.MongoInterruptedException;
-import com.mongodb.MongoSocketClosedException;
-import com.mongodb.MongoSocketReadException;
-import com.mongodb.MongoSocketReadTimeoutException;
-import com.mongodb.MongoSocketWriteException;
-import com.mongodb.ServerAddress;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.event.ConnectionClosedEvent;
-import com.mongodb.event.ConnectionListener;
-import com.mongodb.event.ConnectionMessageReceivedEvent;
-import com.mongodb.event.ConnectionMessagesSentEvent;
-import com.mongodb.event.ConnectionOpenedEvent;
-import org.bson.ByteBuf;
-import org.bson.io.ByteBufferBsonInput;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.SocketTimeoutException;
-import java.nio.channels.ClosedByInterruptException;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static com.mongodb.assertions.Assertions.isTrue;
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.connection.ReplyHeader.REPLY_HEADER_LENGTH;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static java.lang.String.format;
-
-// This class is a bit strange currently.  It supports both concurrent synchronous and asynchronous send and receive, but for simplicity is
-// designed to only handle concurrent synchronous OR concurrent asynchronous requests at any given time.  This works because
-// Server#getConnection returns instances of the synchronous Connection class, which Server#getConnectionAsync returns instances of the
-// asynchronous AsyncConnection class, so at any given time a client's view of a connection is either solely synchronous or solely
-// asynchronous.
-class InternalStreamConnection implements InternalConnection {
-    private final ServerId serverId;
-    private final StreamFactory streamFactory;
-    private final InternalConnectionInitializer connectionInitializer;
-    private final ConnectionListener connectionListener;
-
-    private final Lock writerLock = new ReentrantLock(false);
-    private final Lock readerLock = new ReentrantLock(false);
-
-    private final Deque<SendMessageRequest> writeQueue = new ArrayDeque<SendMessageRequest>();
-    private final Map<Integer, SingleResultCallback<ResponseBuffers>> readQueue =
-    new HashMap<Integer, SingleResultCallback<ResponseBuffers>>();
-    private final Map<Integer, ResponseBuffers> messages = new ConcurrentHashMap<Integer, ResponseBuffers>();
-
-    private boolean isWriting;
-    private boolean isReading;
-
-    private final AtomicReference<CountDownLatch> readingPhase = new AtomicReference<CountDownLatch>(new CountDownLatch(1));
-
-    private volatile MongoException exceptionThatPrecededStreamClosing;
-
-    private volatile ConnectionDescription description;
-    private volatile Stream stream;
-
-    private final AtomicBoolean isClosed = new AtomicBoolean();
-    private final AtomicBoolean opened = new AtomicBoolean();
-
-    static final Logger LOGGER = Loggers.getLogger("connection");
-
-    InternalStreamConnection(final ServerId serverId, final StreamFactory streamFactory,
-                             final InternalConnectionInitializer connectionInitializer,
-                             final ConnectionListener connectionListener) {
-        this.serverId = notNull("serverId", serverId);
-        this.streamFactory = notNull("streamFactory", streamFactory);
-        this.connectionInitializer = notNull("connectionInitializer", connectionInitializer);
-        this.connectionListener = new ErrorHandlingConnectionListener(notNull("connectionListener", connectionListener));
-        description = new ConnectionDescription(serverId);
-    }
-
-    @Override
-    public ConnectionDescription getDescription() {
-        return description;
-    }
-
-    @Override
-    public void open() {
-        isTrue("Open already called", stream == null);
-        stream = streamFactory.create(serverId.getAddress());
-        try {
-            stream.open();
-            description = connectionInitializer.initialize(this);
-            opened.set(true);
-
-            connectionListener.connectionOpened(new ConnectionOpenedEvent(getId()));
-            LOGGER.info(format("Opened connection [%s] to %s", getId(), serverId.getAddress()));
-        } catch (Throwable t) {
-            close();
-            if (t instanceof MongoException) {
-                throw (MongoException) t;
-            } else {
-                throw new MongoException(t.toString(), t);
-            }
-        }
-    }
-
-    @Override
-    public void openAsync(final SingleResultCallback<Void> callback) {
-        isTrue("Open already called", stream == null, callback);
-        try {
-            stream = streamFactory.create(serverId.getAddress());
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-            return;
-        }
-        stream.openAsync(new AsyncCompletionHandler<Void>() {
-            @Override
-            public void completed(final Void aVoid) {
-                connectionInitializer.initializeAsync(InternalStreamConnection.this, new SingleResultCallback<ConnectionDescription>() {
-                    @Override
-                    public void onResult(final ConnectionDescription result, final Throwable t) {
-                        if (t != null) {
-                            close();
-                            callback.onResult(null, t);
-                        } else {
-                            description = result;
-                            opened.set(true);
-                            connectionListener.connectionOpened(new ConnectionOpenedEvent(getId()));
-                            if (LOGGER.isInfoEnabled()) {
-                                LOGGER.info(format("Opened connection [%s] to %s", getId(), serverId.getAddress()));
-                            }
-                            callback.onResult(null, null);
-                        }
-                    }
-                });
-            }
-
-            @Override
-            public void failed(final Throwable t) {
-                callback.onResult(null, t);
-            }
-        });
-    }
-
-    @Override
-    public void close() {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(String.format("Closing connection %s", getId()));
-        }
-        if (stream != null) {
-            stream.close();
-        }
-        isClosed.set(true);
-        connectionListener.connectionClosed(new ConnectionClosedEvent(getId()));
-    }
-
-    @Override
-    public boolean opened() {
-        return opened.get();
-    }
-
-    @Override
-    public boolean isClosed() {
-        return isClosed.get();
-    }
-
-    @Override
-    public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
-        notNull("stream is open", stream);
-
-        if (isClosed()) {
-            throw new MongoSocketClosedException("Cannot write to a closed stream", getServerAddress());
-        }
-
-        writerLock.lock();
-        try {
-            int messageSize = getMessageSize(byteBuffers);
-            stream.write(byteBuffers);
-            connectionListener.messagesSent(new ConnectionMessagesSentEvent(getId(), lastRequestId, messageSize));
-        } catch (Exception e) {
-            close();
-            throw translateWriteException(e);
-        } finally {
-            writerLock.unlock();
-        }
-    }
-
-    @Override
-    public ResponseBuffers receiveMessage(final int responseTo) {
-        notNull("stream is open", stream);
-        if (isClosed()) {
-            throw new MongoSocketClosedException("Cannot read from a closed stream", getServerAddress());
-        }
-
-        CountDownLatch localLatch = new CountDownLatch(1);
-        readerLock.lock();
-        try {
-            ResponseBuffers responseBuffers = receiveResponseBuffers();
-            messages.put(responseBuffers.getReplyHeader().getResponseTo(), responseBuffers);
-            readingPhase.getAndSet(localLatch).countDown();
-        } catch (Throwable t) {
-            exceptionThatPrecededStreamClosing = translateReadException(t);
-            close();
-            readingPhase.getAndSet(localLatch).countDown();
-        } finally {
-            readerLock.unlock();
-        }
-
-        while (true) {
-            if (isClosed()) {
-                if (exceptionThatPrecededStreamClosing != null) {
-                    throw exceptionThatPrecededStreamClosing;
-                } else {
-                    throw new MongoSocketClosedException("Socket has been closed", getServerAddress());
-                }
-            }
-            ResponseBuffers myResponse = messages.remove(responseTo);
-            if (myResponse != null) {
-                connectionListener.messageReceived(new ConnectionMessageReceivedEvent(getId(),
-                                                                                      myResponse.getReplyHeader().getResponseTo(),
-                                                                                      myResponse.getReplyHeader().getMessageLength()));
-                return myResponse;
-            }
-
-            try {
-                localLatch.await();
-            } catch (InterruptedException e) {
-                throw new MongoInterruptedException("Interrupted while reading from stream", e);
-            }
-
-            localLatch = readingPhase.get();
-        }
-    }
-
-    @Override
-    public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
-        notNull("stream is open", stream, callback);
-
-        if (isClosed()) {
-            callback.onResult(null, new MongoSocketClosedException("Can not read from a closed socket", getServerAddress()));
-            return;
-        }
-
-        if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace(format("Queuing send message: %s. ([%s])", lastRequestId, getId()));
-        }
-
-        SendMessageRequest sendMessageRequest = new SendMessageRequest(byteBuffers, lastRequestId, errorHandlingCallback(callback, LOGGER));
-
-        boolean mustWrite = false;
-        writerLock.lock();
-        try {
-            if (isWriting) {
-                writeQueue.add(sendMessageRequest);
-            } else {
-                isWriting = true;
-                mustWrite = true;
-            }
-
-        } finally {
-            writerLock.unlock();
-        }
-
-        if (mustWrite) {
-            writeAsync(sendMessageRequest);
-        }
-    }
-
-    private void writeAsync(final SendMessageRequest request) {
-        final int messageSize = getMessageSize(request.getByteBuffers());
-        stream.writeAsync(request.getByteBuffers(), new AsyncCompletionHandler<Void>() {
-            @Override
-            public void completed(final Void v) {
-                SendMessageRequest nextMessage = null;
-                writerLock.lock();
-                try {
-                    nextMessage = writeQueue.poll();
-                    if (nextMessage == null) {
-                        isWriting = false;
-                    }
-                } finally {
-                    writerLock.unlock();
-                }
-
-                connectionListener.messagesSent(new ConnectionMessagesSentEvent(getId(), request.getMessageId(), messageSize));
-                request.getCallback().onResult(null, null);
-
-                if (nextMessage != null) {
-                    writeAsync(nextMessage);
-                }
-            }
-
-            @Override
-            public void failed(final Throwable t) {
-                writerLock.lock();
-                try {
-                    MongoException translatedWriteException = translateWriteException(t);
-                    request.getCallback().onResult(null, translatedWriteException);
-                    SendMessageRequest nextMessage;
-                    while ((nextMessage = writeQueue.poll()) != null) {
-                        nextMessage.callback.onResult(null, translatedWriteException);
-                    }
-                    isWriting = false;
-                    close();
-                } finally {
-                    writerLock.unlock();
-                }
-            }
-        });
-    }
-
-    @Override
-    public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
-        isTrue("stream is open", stream != null, callback);
-
-        if (isClosed()) {
-            callback.onResult(null, new MongoSocketClosedException("Can not read from a closed socket", getServerAddress()));
-            return;
-        }
-
-        if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace(format("Queuing read message: %s. ([%s])", responseTo, getId()));
-        }
-
-        ResponseBuffers response = null;
-        readerLock.lock();
-        boolean mustRead = false;
-        try {
-            response = messages.remove(responseTo);
-
-            if (response == null) {
-                readQueue.put(responseTo, callback);
-            }
-
-            if (!readQueue.isEmpty() && !isReading) {
-                isReading = true;
-                mustRead = true;
-            }
-        } finally {
-            readerLock.unlock();
-        }
-
-        executeCallbackAndReceiveResponse(callback, response, mustRead);
-    }
-
-    private void executeCallbackAndReceiveResponse(final SingleResultCallback<ResponseBuffers> callback, final ResponseBuffers result,
-                                                   final boolean mustRead) {
-        if (callback != null && result != null) {
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(String.format("Executing callback for %s on %s", result.getReplyHeader().getResponseTo(), getId()));
-            }
-            callback.onResult(result, null);
-        }
-
-        if (mustRead) {
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(String.format("Start receiving response on %s", getId()));
-            }
-            receiveResponseAsync();
-        }
-    }
-
-    private class ResponseBuffersCallback implements SingleResultCallback<ResponseBuffers> {
-        @Override
-        public void onResult(final ResponseBuffers result, final Throwable t) {
-                SingleResultCallback<ResponseBuffers> callback = null;
-                boolean mustRead = false;
-                readerLock.lock();
-                try {
-                    if (t != null) {
-                        failAllQueuedReads(t);
-                        return;
-                    }
-
-                    if (LOGGER.isTraceEnabled()) {
-                        LOGGER.trace(String.format("Read response to message %s on %s", result.getReplyHeader().getResponseTo(), getId()));
-                    }
-
-                    callback = readQueue.remove(result.getReplyHeader().getResponseTo());
-
-                    if (readQueue.isEmpty()) {
-                        isReading = false;
-                    } else {
-                        mustRead = true;
-                    }
-
-                    if (callback == null) {
-                        messages.put(result.getReplyHeader().getResponseTo(), result);
-                    }
-                } finally {
-                    readerLock.unlock();
-                }
-
-                executeCallbackAndReceiveResponse(callback, result, mustRead);
-            }
-    }
-
-    private ConnectionId getId() {
-        return description.getConnectionId();
-    }
-
-    private ServerAddress getServerAddress() {
-        return description.getServerAddress();
-    }
-
-    private void receiveResponseAsync() {
-        readAsync(REPLY_HEADER_LENGTH,
-                  errorHandlingCallback(new ResponseHeaderCallback(new ResponseBuffersCallback()), LOGGER));
-    }
-
-    private void readAsync(final int numBytes, final SingleResultCallback<ByteBuf> callback) {
-        if (isClosed()) {
-            callback.onResult(null, new MongoSocketClosedException("Cannot read from a closed stream", getServerAddress()));
-            return;
-        }
-
-        try {
-            stream.readAsync(numBytes, new AsyncCompletionHandler<ByteBuf>() {
-                @Override
-                public void completed(final ByteBuf buffer) {
-                    callback.onResult(buffer, null);
-                }
-
-                @Override
-                public void failed(final Throwable t) {
-                    close();
-                    callback.onResult(null, translateReadException(t));
-                }
-            });
-        } catch (Exception e) {
-            callback.onResult(null, translateReadException(e));
-        }
-    }
-
-    private MongoException translateWriteException(final Throwable e) {
-        if (e instanceof MongoException) {
-            return (MongoException) e;
-        } else if (e instanceof IOException) {
-            return new MongoSocketWriteException("Exception sending message", getServerAddress(), e);
-        } else if (e instanceof InterruptedException) {
-            return new MongoInternalException("Thread interrupted exception", e);
-        } else {
-            return new MongoInternalException("Unexpected exception", e);
-        }
-    }
-
-    private MongoException translateReadException(final Throwable e) {
-        if (e instanceof MongoException) {
-            return (MongoException) e;
-        } else if (e instanceof SocketTimeoutException) {
-            return new MongoSocketReadTimeoutException("Timeout while receiving message", getServerAddress(), e);
-        } else if (e instanceof InterruptedIOException) {
-            return new MongoInterruptedException("Interrupted while receiving message", (InterruptedIOException) e);
-        } else if (e instanceof ClosedByInterruptException) {
-            return new MongoInterruptedException("Interrupted while receiving message", (ClosedByInterruptException) e);
-        } else if (e instanceof IOException) {
-            return new MongoSocketReadException("Exception receiving message", getServerAddress(), e);
-        } else if (e instanceof RuntimeException) {
-            return new MongoInternalException("Unexpected runtime exception", e);
-        } else if (e instanceof InterruptedException) {
-            return new MongoInternalException("Interrupted exception", e);
-        } else {
-            return new MongoInternalException("Unexpected exception", e);
-        }
-    }
-
-    private ResponseBuffers receiveResponseBuffers() throws IOException {
-        ByteBuf headerByteBuffer = stream.read(REPLY_HEADER_LENGTH);
-        ReplyHeader replyHeader;
-        ByteBufferBsonInput headerInputBuffer = new ByteBufferBsonInput(headerByteBuffer);
-        try {
-            replyHeader = new ReplyHeader(headerInputBuffer, description.getMaxMessageSize());
-        } finally {
-            headerInputBuffer.close();
-        }
-
-        ByteBuf bodyByteBuffer = null;
-
-        if (replyHeader.getNumberReturned() > 0) {
-            bodyByteBuffer = stream.read(replyHeader.getMessageLength() - REPLY_HEADER_LENGTH);
-        }
-        return new ResponseBuffers(replyHeader, bodyByteBuffer);
-    }
-
-    @Override
-    public ByteBuf getBuffer(final int size) {
-        notNull("open", stream);
-        return stream.getBuffer(size);
-    }
-
-    private class ResponseHeaderCallback implements SingleResultCallback<ByteBuf> {
-        private final SingleResultCallback<ResponseBuffers> callback;
-
-        public ResponseHeaderCallback(final SingleResultCallback<ResponseBuffers> callback) {
-            this.callback = callback;
-        }
-
-        @Override
-        public void onResult(final ByteBuf result, final Throwable throwableFromCallback) {
-            if (throwableFromCallback != null) {
-                callback.onResult(null, throwableFromCallback);
-            } else {
-                try {
-                    ReplyHeader replyHeader;
-                    ByteBufferBsonInput headerInputBuffer = new ByteBufferBsonInput(result);
-                    try {
-                        replyHeader = new ReplyHeader(headerInputBuffer, description.getMaxMessageSize());
-                    } finally {
-                        headerInputBuffer.close();
-                    }
-
-                    if (replyHeader.getMessageLength() == REPLY_HEADER_LENGTH) {
-                        onSuccess(new ResponseBuffers(replyHeader, null));
-                    } else {
-                        readAsync(replyHeader.getMessageLength() - REPLY_HEADER_LENGTH,
-                                  new ResponseBodyCallback(replyHeader));
-                    }
-                } catch (Throwable t) {
-                    callback.onResult(null, t);
-                }
-            }
-        }
-
-        private void onSuccess(final ResponseBuffers responseBuffers) {
-
-            if (responseBuffers == null) {
-                callback.onResult(null, new MongoException("Unexpected empty response buffers"));
-                return;
-            }
-
-            connectionListener.messageReceived(new ConnectionMessageReceivedEvent(getId(),
-                                                                                  responseBuffers.getReplyHeader().getResponseTo(),
-                                                                                  responseBuffers.getReplyHeader().getMessageLength()));
-
-            try {
-                callback.onResult(responseBuffers, null);
-            } catch (Throwable t) {
-                LOGGER.warn("Exception calling callback", t);
-            }
-        }
-
-        private class ResponseBodyCallback implements SingleResultCallback<ByteBuf> {
-            private final ReplyHeader replyHeader;
-
-            public ResponseBodyCallback(final ReplyHeader replyHeader) {
-                this.replyHeader = replyHeader;
-            }
-
-            @Override
-            public void onResult(final ByteBuf result, final Throwable t) {
-                if (t != null) {
-                    try {
-                        callback.onResult(new ResponseBuffers(replyHeader, result), t);
-                    } catch (Throwable tr) {
-                        LOGGER.warn("Exception calling callback", tr);
-                    }
-                } else {
-                    onSuccess(new ResponseBuffers(replyHeader, result));
-                }
-            }
-        }
-    }
-
-    private int getMessageSize(final List<ByteBuf> byteBuffers) {
-        int messageSize = 0;
-        for (final ByteBuf cur : byteBuffers) {
-            messageSize += cur.remaining();
-        }
-        return messageSize;
-    }
-
-    private void failAllQueuedReads(final Throwable t) {
-        close();
-        Iterator<Map.Entry<Integer, SingleResultCallback<ResponseBuffers>>> it = readQueue.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry<Integer, SingleResultCallback<ResponseBuffers>> pairs = it.next();
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(format("Processing unknown failed message: %s. ([%s] %s)", pairs.getKey(), getId(), serverId));
-            }
-            SingleResultCallback<ResponseBuffers> callback = pairs.getValue();
-            it.remove();
-            try {
-                callback.onResult(null, t);
-            } catch (Throwable tr) {
-                LOGGER.warn("Exception calling callback", tr);
-            }
-        }
-    }
-
-    private static class SendMessageRequest {
-        private final SingleResultCallback<Void> callback;
-        private final List<ByteBuf> byteBuffers;
-        private final int messageId;
-
-        SendMessageRequest(final List<ByteBuf> byteBuffers, final int messageId, final SingleResultCallback<Void> callback) {
-            this.byteBuffers = byteBuffers;
-            this.messageId = messageId;
-            this.callback = callback;
-        }
-
-        public SingleResultCallback<Void> getCallback() {
-            return callback;
-        }
-
-        public List<ByteBuf> getByteBuffers() {
-            return byteBuffers;
-        }
-
-        public int getMessageId() {
-            return messageId;
-        }
-    }
-
-
-    private static class ErrorHandlingConnectionListener implements ConnectionListener {
-
-        private final ConnectionListener wrapped;
-
-        public ErrorHandlingConnectionListener(final ConnectionListener wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        @Override
-        public void connectionOpened(final ConnectionOpenedEvent event) {
-            try {
-                wrapped.connectionOpened(event);
-            } catch (Throwable t) {
-                LOGGER.warn("Exception when trying to signal connectionOpened to the connectionListener", t);
-            }
-       }
-
-        @Override
-        public void connectionClosed(final ConnectionClosedEvent event) {
-            try {
-                wrapped.connectionClosed(event);
-            } catch (Throwable t) {
-                LOGGER.warn("Exception when trying to signal connectionOpened to the connectionListener", t);
-            }
-        }
-
-        @Override
-        public void messagesSent(final ConnectionMessagesSentEvent event) {
-            try {
-                wrapped.messagesSent(event);
-            } catch (Throwable t) {
-                LOGGER.warn("Exception when trying to signal connectionOpened to the connectionListener", t);
-            }
-        }
-
-        @Override
-        public void messageReceived(final ConnectionMessageReceivedEvent event) {
-            try {
-                wrapped.messageReceived(event);
-            } catch (Throwable t) {
-                LOGGER.warn("Exception when trying to signal connectionOpened to the connectionListener", t);
-            }
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionFactory.java b/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionFactory.java
deleted file mode 100644
index ec11bbcbf0c..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.event.ConnectionListener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.notNull;
-
-class InternalStreamConnectionFactory implements InternalConnectionFactory {
-    private final StreamFactory streamFactory;
-    private final ConnectionListener connectionListener;
-    private final List<Authenticator> authenticators;
-
-    public InternalStreamConnectionFactory(final StreamFactory streamFactory, final List<MongoCredential> credentialList,
-                                           final ConnectionListener connectionListener) {
-        this.streamFactory = notNull("streamFactory", streamFactory);
-        this.connectionListener = notNull("connectionListener", connectionListener);
-        notNull("credentialList", credentialList);
-        this.authenticators = new ArrayList<Authenticator>(credentialList.size());
-        for (MongoCredential credential : credentialList) {
-            authenticators.add(createAuthenticator(credential));
-        }
-    }
-
-    @Override
-    public InternalConnection create(final ServerId serverId) {
-        return new InternalStreamConnection(serverId, streamFactory,
-                                            new InternalStreamConnectionInitializer(authenticators), connectionListener);
-    }
-
-    private Authenticator createAuthenticator(final MongoCredential credential) {
-        if (credential.getAuthenticationMechanism() == null) {
-            return new DefaultAuthenticator(credential);
-        }
-
-        switch (credential.getAuthenticationMechanism()) {
-            case GSSAPI:
-                return new GSSAPIAuthenticator(credential);
-            case PLAIN:
-                return new PlainAuthenticator(credential);
-            case MONGODB_X509:
-                return new X509Authenticator(credential);
-            case SCRAM_SHA_1:
-                return new ScramSha1Authenticator(credential);
-            case MONGODB_CR:
-                return new NativeAuthenticator(credential);
-            default:
-                throw new IllegalArgumentException("Unsupported authentication mechanism " + credential.getAuthenticationMechanism());
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionInitializer.java b/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionInitializer.java
deleted file mode 100644
index 5c3ba3973e5..00000000000
--- a/driver-core/src/main/com/mongodb/connection/InternalStreamConnectionInitializer.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.async.SingleResultCallback;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.connection.CommandHelper.executeCommand;
-import static com.mongodb.connection.CommandHelper.executeCommandAsync;
-import static com.mongodb.connection.CommandHelper.executeCommandWithoutCheckingForFailure;
-import static com.mongodb.connection.DescriptionHelper.createConnectionDescription;
-
-class InternalStreamConnectionInitializer implements InternalConnectionInitializer {
-    private final List<Authenticator> authenticators;
-
-    InternalStreamConnectionInitializer(final List<Authenticator> authenticators) {
-        this.authenticators = notNull("authenticators", authenticators);
-    }
-
-    @Override
-    public ConnectionDescription initialize(final InternalConnection internalConnection) {
-        notNull("internalConnection", internalConnection);
-
-        ConnectionDescription connectionDescription = initializeConnectionDescription(internalConnection);
-        authenticateAll(internalConnection, connectionDescription);
-
-        return completeConnectionDescriptionInitialization(internalConnection, connectionDescription);
-    }
-
-    @Override
-    public void initializeAsync(final InternalConnection internalConnection, final SingleResultCallback<ConnectionDescription> callback) {
-        initializeConnectionDescriptionAsync(internalConnection, createConnectionDescriptionCallback(internalConnection, callback));
-    }
-
-    private SingleResultCallback<ConnectionDescription>
-    createConnectionDescriptionCallback(final InternalConnection internalConnection,
-                                        final SingleResultCallback<ConnectionDescription> callback) {
-        return new SingleResultCallback<ConnectionDescription>() {
-            @Override
-            public void onResult(final ConnectionDescription connectionDescription, final Throwable t) {
-                if (t != null) {
-                    callback.onResult(null, t);
-                } else {
-                    new CompoundAuthenticator(internalConnection, connectionDescription,
-                                              new SingleResultCallback<Void>() {
-                                                  @Override
-                                                  public void onResult(final Void result, final Throwable t) {
-                                                      if (t != null) {
-                                                          callback.onResult(null, t);
-                                                      } else {
-                                                          completeConnectionDescriptionInitializationAsync(internalConnection,
-                                                                                                           connectionDescription,
-                                                                                                           callback);
-                                                      }
-                                                  }
-                                              })
-                    .start();
-                }
-            }
-        };
-    }
-
-    private ConnectionDescription initializeConnectionDescription(final InternalConnection internalConnection) {
-        BsonDocument isMasterResult = executeCommand("admin", new BsonDocument("ismaster", new BsonInt32(1)), internalConnection);
-        BsonDocument buildInfoResult = executeCommand("admin", new BsonDocument("buildinfo", new BsonInt32(1)), internalConnection);
-        return createConnectionDescription(internalConnection.getDescription().getConnectionId(), isMasterResult, buildInfoResult);
-    }
-
-    private ConnectionDescription completeConnectionDescriptionInitialization(final InternalConnection internalConnection,
-                                                                              final ConnectionDescription connectionDescription) {
-        return applyGetLastErrorResult(executeCommandWithoutCheckingForFailure("admin",
-                                                                               new BsonDocument("getlasterror", new BsonInt32(1)),
-                                                                               internalConnection),
-                                       connectionDescription);
-    }
-
-    private void authenticateAll(final InternalConnection internalConnection, final ConnectionDescription connectionDescription) {
-        if (connectionDescription.getServerType() != ServerType.REPLICA_SET_ARBITER) {
-            for (final Authenticator cur : authenticators) {
-                cur.authenticate(internalConnection, connectionDescription);
-            }
-        }
-    }
-
-    private void initializeConnectionDescriptionAsync(final InternalConnection internalConnection,
-                                                      final SingleResultCallback<ConnectionDescription> callback) {
-        executeCommandAsync("admin", new BsonDocument("ismaster", new BsonInt32(1)), internalConnection,
-                            new SingleResultCallback<BsonDocument>() {
-                                @Override
-                                public void onResult(final BsonDocument isMasterResult, final Throwable t) {
-                                    if (t != null) {
-                                        callback.onResult(null, t);
-                                    } else {
-                                        executeCommandAsync("admin", new BsonDocument("buildinfo", new BsonInt32(1)), internalConnection,
-                                                            new SingleResultCallback<BsonDocument>() {
-                                                                @Override
-                                                                public void onResult(final BsonDocument buildInfoResult,
-                                                                                     final Throwable t) {
-                                                                    if (t != null) {
-                                                                        callback.onResult(null, t);
-                                                                    } else {
-                                                                        ConnectionId connectionId = internalConnection.getDescription()
-                                                                                                                      .getConnectionId();
-                                                                        callback.onResult(createConnectionDescription(connectionId,
-                                                                                                                      isMasterResult,
-                                                                                                                      buildInfoResult),
-                                                                                          null);
-                                                                    }
-                                                                }
-                                                            });
-                                    }
-                                }
-                            });
-    }
-
-    private void completeConnectionDescriptionInitializationAsync(final InternalConnection internalConnection,
-                                                                  final ConnectionDescription connectionDescription,
-                                                                  final SingleResultCallback<ConnectionDescription> callback) {
-        executeCommandAsync("admin", new BsonDocument("getlasterror", new BsonInt32(1)),
-                            internalConnection,
-                            new SingleResultCallback<BsonDocument>() {
-                                @Override
-                                public void onResult(final BsonDocument result, final Throwable t) {
-                                    if (result == null) {
-                                        callback.onResult(connectionDescription, null);
-                                    } else {
-                                        callback.onResult(applyGetLastErrorResult(result, connectionDescription), null);
-                                    }
-                                }
-                            });
-    }
-
-    private ConnectionDescription applyGetLastErrorResult(final BsonDocument getLastErrorResult,
-                                                          final ConnectionDescription connectionDescription) {
-        ConnectionId connectionId;
-        if (getLastErrorResult.containsKey("connectionId")) {
-            connectionId = connectionDescription.getConnectionId().withServerValue(getLastErrorResult.getNumber("connectionId").intValue());
-        } else {
-            connectionId =  connectionDescription.getConnectionId();
-        }
-
-        return connectionDescription.withConnectionId(connectionId);
-    }
-
-    private class CompoundAuthenticator implements SingleResultCallback<Void> {
-        private final InternalConnection internalConnection;
-        private final ConnectionDescription connectionDescription;
-        private final SingleResultCallback<Void> callback;
-        private final AtomicInteger currentAuthenticatorIndex = new AtomicInteger(-1);
-
-        public CompoundAuthenticator(final InternalConnection internalConnection, final ConnectionDescription connectionDescription,
-                                     final SingleResultCallback<Void> callback) {
-            this.internalConnection = internalConnection;
-            this.connectionDescription = connectionDescription;
-            this.callback = callback;
-        }
-
-        @Override
-        public void onResult(final Void result, final Throwable t) {
-            if (t != null) {
-                callback.onResult(null, t);
-            } else if (completedAuthentication()) {
-                callback.onResult(null, null);
-            } else {
-                authenticateNext();
-            }
-        }
-
-        public void start() {
-            if (connectionDescription.getServerType() == ServerType.REPLICA_SET_ARBITER || authenticators.isEmpty()) {
-                callback.onResult(null, null);
-            } else {
-                authenticateNext();
-            }
-        }
-
-        private boolean completedAuthentication() {
-            return currentAuthenticatorIndex.get() == authenticators.size() - 1;
-        }
-
-        private void authenticateNext() {
-            authenticators.get(currentAuthenticatorIndex.incrementAndGet())
-                          .authenticateAsync(internalConnection, connectionDescription, this);
-        }
-
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/KillCursorsMessage.java b/driver-core/src/main/com/mongodb/connection/KillCursorsMessage.java
deleted file mode 100644
index 7c2f1dccca0..00000000000
--- a/driver-core/src/main/com/mongodb/connection/KillCursorsMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import org.bson.io.BsonOutput;
-
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.notNull;
-
-/**
- * An OP_KILL_CURSOR message.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-kill-cursors OP_KILL_CURSOR
- */
-class KillCursorsMessage extends RequestMessage {
-    private final List<Long> cursors;
-
-    /**
-     * Construct an instance.
-     *
-     * @param cursors the list of cursors to kill
-     */
-    public KillCursorsMessage(final List<Long> cursors) {
-        super(OpCode.OP_KILL_CURSORS, MessageSettings.builder().build());
-        this.cursors = notNull("cursors", cursors);
-    }
-
-    @Override
-    protected RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final int messageStartPosition) {
-        return encodeMessageBodyWithMetadata(bsonOutput, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final int messageStartPosition) {
-        writeKillCursorsPrologue(cursors.size(), bsonOutput);
-        for (final Long cur : cursors) {
-            bsonOutput.writeInt64(cur);
-        }
-        return new EncodingMetadata(null, bsonOutput.getPosition());
-    }
-
-    private void writeKillCursorsPrologue(final int numCursors, final BsonOutput bsonOutput) {
-        bsonOutput.writeInt32(0); // reserved
-        bsonOutput.writeInt32(numCursors);
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/MultiServerCluster.java b/driver-core/src/main/com/mongodb/connection/MultiServerCluster.java
deleted file mode 100644
index a1e3ce44d71..00000000000
--- a/driver-core/src/main/com/mongodb/connection/MultiServerCluster.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.ServerAddress;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.event.ClusterDescriptionChangedEvent;
-import com.mongodb.event.ServerDescriptionChangedEvent;
-import org.bson.types.ObjectId;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import static com.mongodb.assertions.Assertions.isTrue;
-import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
-import static com.mongodb.connection.ClusterType.UNKNOWN;
-import static com.mongodb.connection.ServerConnectionState.CONNECTING;
-import static com.mongodb.connection.ServerType.REPLICA_SET_GHOST;
-import static com.mongodb.connection.ServerType.SHARD_ROUTER;
-import static com.mongodb.connection.ServerType.STANDALONE;
-import static java.lang.String.format;
-
-/**
- * This class needs to be final because we are leaking a reference to "this" from the constructor
- */
-final class MultiServerCluster extends BaseCluster {
-    private static final Logger LOGGER = Loggers.getLogger("cluster");
-
-    private ClusterType clusterType;
-    private String replicaSetName;
-    private ObjectId maxElectionId;
-    private Integer maxSetVersion;
-
-    private final ConcurrentMap<ServerAddress, ServerTuple> addressToServerTupleMap =
-    new ConcurrentHashMap<ServerAddress, ServerTuple>();
-
-    private static final class ServerTuple {
-        private final ClusterableServer server;
-        private ServerDescription description;
-
-        private ServerTuple(final ClusterableServer server, final ServerDescription description) {
-            this.server = server;
-            this.description = description;
-        }
-    }
-
-    public MultiServerCluster(final ClusterId clusterId, final ClusterSettings settings, final ClusterableServerFactory serverFactory) {
-        super(clusterId, settings, serverFactory);
-        isTrue("connection mode is multiple", settings.getMode() == ClusterConnectionMode.MULTIPLE);
-        clusterType = settings.getRequiredClusterType();
-        replicaSetName = settings.getRequiredReplicaSetName();
-
-        if (LOGGER.isInfoEnabled()) {
-            LOGGER.info(format("Cluster created with settings %s", settings.getShortDescription()));
-        }
-
-        ClusterDescription newDescription;
-
-        // synchronizing this code because addServer registers a callback which is re-entrant to this instance.
-        // In other words, we are leaking a reference to "this" from the constructor.
-        synchronized (this) {
-            for (final ServerAddress serverAddress : settings.getHosts()) {
-                addServer(serverAddress);
-            }
-            newDescription = updateDescription();
-        }
-        fireChangeEvent(new ClusterDescriptionChangedEvent(clusterId, newDescription,
-                new ClusterDescription(settings.getMode(), ClusterType.UNKNOWN, Collections.<ServerDescription>emptyList())));
-    }
-
-    @Override
-    protected void connect() {
-        for (ServerTuple cur : addressToServerTupleMap.values()) {
-            cur.server.connect();
-        }
-    }
-
-    @Override
-    public void close() {
-        synchronized (this) {
-            if (!isClosed()) {
-                for (final ServerTuple serverTuple : addressToServerTupleMap.values()) {
-                    serverTuple.server.close();
-                }
-            }
-            super.close();
-        }
-    }
-
-    @Override
-    protected ClusterableServer getServer(final ServerAddress serverAddress) {
-        isTrue("is open", !isClosed());
-
-        ServerTuple serverTuple = addressToServerTupleMap.get(serverAddress);
-        if (serverTuple == null) {
-            return null;
-        }
-        return serverTuple.server;
-    }
-
-
-    private final class DefaultServerStateListener extends NoOpServerListener {
-        @Override
-        public void serverDescriptionChanged(final ServerDescriptionChangedEvent event) {
-            onChange(event);
-        }
-    }
-
-    private void onChange(final ServerDescriptionChangedEvent event) {
-        ClusterDescription oldClusterDescription = null;
-        ClusterDescription newClusterDescription = null;
-        boolean shouldUpdateDescription = true;
-        synchronized (this) {
-            if (isClosed()) {
-                return;
-            }
-
-            ServerDescription newDescription = event.getNewDescription();
-
-            if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(format("Handling description changed event for server %s with description %s",
-                                    newDescription.getAddress(), newDescription));
-            }
-
-            ServerTuple serverTuple = addressToServerTupleMap.get(newDescription.getAddress());
-            if (serverTuple == null) {
-                if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace(format("Ignoring description changed event for removed server %s",
-                                        newDescription.getAddress()));
-                }
-                return;
-            }
-
-            if (event.getNewDescription().isOk()) {
-                if (clusterType == UNKNOWN && newDescription.getType() != REPLICA_SET_GHOST) {
-                    clusterType = newDescription.getClusterType();
-                    if (LOGGER.isInfoEnabled()) {
-                        LOGGER.info(format("Discovered cluster type of %s", clusterType));
-                    }
-                }
-
-                switch (clusterType) {
-                    case REPLICA_SET:
-                        shouldUpdateDescription = handleReplicaSetMemberChanged(newDescription);
-                        break;
-                    case SHARDED:
-                        shouldUpdateDescription = handleShardRouterChanged(newDescription);
-                        break;
-                    case STANDALONE:
-                        shouldUpdateDescription = handleStandAloneChanged(newDescription);
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            if (shouldUpdateDescription) {
-                serverTuple.description = newDescription;
-                oldClusterDescription = getCurrentDescription();
-                newClusterDescription = updateDescription();
-            }
-        }
-        if (shouldUpdateDescription) {
-            fireChangeEvent(new ClusterDescriptionChangedEvent(getClusterId(), newClusterDescription, oldClusterDescription));
-        }
-    }
-
-    private boolean handleReplicaSetMemberChanged(final ServerDescription newDescription) {
-        if (!newDescription.isReplicaSetMember()) {
-            LOGGER.error(format("Expecting replica set member, but found a %s.  Removing %s from client view of cluster.",
-                                newDescription.getType(), newDescription.getAddress()));
-            removeServer(newDescription.getAddress());
-            return true;
-        }
-
-        if (newDescription.getType() == REPLICA_SET_GHOST) {
-            if (LOGGER.isInfoEnabled()) {
-                LOGGER.info(format("Server %s does not appear to be a member of an initiated replica set.", newDescription.getAddress()));
-            }
-            return true;
-        }
-
-        if (replicaSetName == null) {
-            replicaSetName = newDescription.getSetName();
-        }
-
-        if (!replicaSetName.equals(newDescription.getSetName())) {
-            LOGGER.error(format("Expecting replica set member from set '%s', but found one from set '%s'.  "
-                                 + "Removing %s from client view of cluster.",
-                                 replicaSetName, newDescription.getSetName(), newDescription.getAddress()));
-            removeServer(newDescription.getAddress());
-            return true;
-        }
-
-        ensureServers(newDescription);
-
-        if (newDescription.getCanonicalAddress() != null && !newDescription.getAddress().sameHost(newDescription.getCanonicalAddress())) {
-            if (LOGGER.isInfoEnabled()) {
-                LOGGER.info(format("Canonical address %s does not match server address.  Removing %s from client view of cluster",
-                                   newDescription.getCanonicalAddress(), newDescription.getAddress()));
-            }
-            removeServer(newDescription.getAddress());
-            return true;
-        }
-
-        if (newDescription.isPrimary()) {
-            if (newDescription.getSetVersion() != null && newDescription.getElectionId() != null) {
-                if (isStalePrimary(newDescription)) {
-                    if (LOGGER.isInfoEnabled()) {
-                        LOGGER.info(format("Invalidating potential primary %s whose (set version, election id) tuple of (%d, %s) "
-                                + "is less than one already seen of (%d, %s)",
-                                newDescription.getAddress(),
-                                newDescription.getSetVersion(), newDescription.getElectionId(),
-                                maxSetVersion, maxElectionId));
-                    }
-                    addressToServerTupleMap.get(newDescription.getAddress()).server.invalidate();
-                    return false;
-                }
-
-                if (!newDescription.getElectionId().equals(maxElectionId)) {
-                    if (LOGGER.isInfoEnabled()) {
-                        LOGGER.info(format("Setting max election id to %s from replica set primary %s", newDescription.getElectionId(),
-                                newDescription.getAddress()));
-                    }
-                    maxElectionId = newDescription.getElectionId();
-                }
-            }
-
-            if (newDescription.getSetVersion() != null
-                    && (maxSetVersion == null || newDescription.getSetVersion().compareTo(maxSetVersion) > 0)) {
-                if (LOGGER.isInfoEnabled()) {
-                    LOGGER.info(format("Setting max set version to %d from replica set primary %s", newDescription.getSetVersion(),
-                            newDescription.getAddress()));
-                }
-                maxSetVersion = newDescription.getSetVersion();
-            }
-
-            if (isNotAlreadyPrimary(newDescription.getAddress())) {
-                LOGGER.info(format("Discovered replica set primary %s", newDescription.getAddress()));
-            }
-            invalidateOldPrimaries(newDescription.getAddress());
-        }
-        return true;
-    }
-
-    private boolean isStalePrimary(final ServerDescription newDescription) {
-        if (maxSetVersion == null || maxElectionId == null) {
-            return false;
-        }
-
-        return (maxSetVersion.compareTo(newDescription.getSetVersion()) > 0
-                || (maxSetVersion.equals(newDescription.getSetVersion()) && maxElectionId.compareTo(newDescription.getElectionId()) > 0));
-    }
-
-    private boolean isNotAlreadyPrimary(final ServerAddress address) {
-        ServerTuple serverTuple = addressToServerTupleMap.get(address);
-        return serverTuple == null || !serverTuple.description.isPrimary();
-    }
-
-    private boolean handleShardRouterChanged(final ServerDescription newDescription) {
-        if (!newDescription.isShardRouter()) {
-            LOGGER.error(format("Expecting a %s, but found a %s.  Removing %s from client view of cluster.",
-                                 SHARD_ROUTER, newDescription.getType(), newDescription.getAddress()));
-            removeServer(newDescription.getAddress());
-        }
-        return true;
-    }
-
-    private boolean handleStandAloneChanged(final ServerDescription newDescription) {
-        if (getSettings().getHosts().size() > 1) {
-            LOGGER.error(format("Expecting a single %s, but found more than one.  Removing %s from client view of cluster.",
-                                 STANDALONE, newDescription.getAddress()));
-            clusterType = UNKNOWN;
-            removeServer(newDescription.getAddress());
-        }
-        return true;
-    }
-
-    private void addServer(final ServerAddress serverAddress) {
-        if (!addressToServerTupleMap.containsKey(serverAddress)) {
-            if (LOGGER.isInfoEnabled()) {
-                LOGGER.info(format("Adding discovered server %s to client view of cluster", serverAddress));
-            }
-            ClusterableServer server = createServer(serverAddress, new DefaultServerStateListener());
-            addressToServerTupleMap.put(serverAddress, new ServerTuple(server, getConnectingServerDescription(serverAddress)));
-        }
-    }
-
-    private void removeServer(final ServerAddress serverAddress) {
-        ServerTuple removed = addressToServerTupleMap.remove(serverAddress);
-        if (removed != null) {
-            removed.server.close();
-        }
-    }
-
-    private void invalidateOldPrimaries(final ServerAddress newPrimary) {
-        for (final ServerTuple serverTuple : addressToServerTupleMap.values()) {
-            if (!serverTuple.description.getAddress().equals(newPrimary) && serverTuple.description.isPrimary()) {
-                if (LOGGER.isInfoEnabled()) {
-                    LOGGER.info(format("Rediscovering type of existing primary %s", serverTuple.description.getAddress()));
-                }
-                serverTuple.server.invalidate();
-            }
-        }
-    }
-
-    private ServerDescription getConnectingServerDescription(final ServerAddress serverAddress) {
-        return ServerDescription.builder().state(CONNECTING).address(serverAddress).build();
-    }
-
-    private ClusterDescription updateDescription() {
-        ClusterDescription newDescription = new ClusterDescription(MULTIPLE, clusterType, getNewServerDescriptionList());
-        updateDescription(newDescription);
-        return newDescription;
-    }
-
-    private List<ServerDescription> getNewServerDescriptionList() {
-        List<ServerDescription> serverDescriptions = new ArrayList<ServerDescription>();
-        for (final ServerTuple cur : addressToServerTupleMap.values()) {
-            serverDescriptions.add(cur.description);
-        }
-        return serverDescriptions;
-    }
-
-    private void ensureServers(final ServerDescription description) {
-        if (description.isPrimary() || !hasPrimary()) {
-            addNewHosts(description.getHosts());
-            addNewHosts(description.getPassives());
-            addNewHosts(description.getArbiters());
-        }
-
-        if (description.isPrimary()) {
-            removeExtraHosts(description);
-        }
-    }
-
-    private boolean hasPrimary() {
-        for (ServerTuple serverTuple : addressToServerTupleMap.values()) {
-            if (serverTuple.description.isPrimary()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void addNewHosts(final Set<String> hosts) {
-        for (final String cur : hosts) {
-            addServer(new ServerAddress(cur));
-        }
-    }
-
-    private void removeExtraHosts(final ServerDescription serverDescription) {
-        Set<ServerAddress> allServerAddresses = getAllServerAddresses(serverDescription);
-        for (final ServerTuple cur : addressToServerTupleMap.values()) {
-            if (!allServerAddresses.contains(cur.description.getAddress())) {
-                if (LOGGER.isInfoEnabled()) {
-                    LOGGER.info(format("Server %s is no longer a member of the replica set.  Removing from client view of cluster.",
-                                       cur.description.getAddress()));
-                }
-                removeServer(cur.description.getAddress());
-            }
-        }
-    }
-
-    private Set<ServerAddress> getAllServerAddresses(final ServerDescription serverDescription) {
-        Set<ServerAddress> retVal = new HashSet<ServerAddress>();
-        addHostsToSet(serverDescription.getHosts(), retVal);
-        addHostsToSet(serverDescription.getPassives(), retVal);
-        addHostsToSet(serverDescription.getArbiters(), retVal);
-        return retVal;
-    }
-
-    private void addHostsToSet(final Set<String> hosts, final Set<ServerAddress> retVal) {
-        for (final String host : hosts) {
-            retVal.add(new ServerAddress(host));
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/NoOpClusterListener.java b/driver-core/src/main/com/mongodb/connection/NoOpClusterListener.java
deleted file mode 100644
index 23f10df9fa8..00000000000
--- a/driver-core/src/main/com/mongodb/connection/NoOpClusterListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.event.ClusterListenerAdapter;
-
-class NoOpClusterListener extends ClusterListenerAdapter {
-}
diff --git a/driver-core/src/main/com/mongodb/connection/NoOpConnectionListener.java b/driver-core/src/main/com/mongodb/connection/NoOpConnectionListener.java
deleted file mode 100644
index 668b89cb03e..00000000000
--- a/driver-core/src/main/com/mongodb/connection/NoOpConnectionListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.event.ConnectionListenerAdapter;
-
-class NoOpConnectionListener extends ConnectionListenerAdapter {
-}
diff --git a/driver-core/src/main/com/mongodb/connection/NoOpConnectionPoolListener.java b/driver-core/src/main/com/mongodb/connection/NoOpConnectionPoolListener.java
deleted file mode 100644
index bd5500574ed..00000000000
--- a/driver-core/src/main/com/mongodb/connection/NoOpConnectionPoolListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.event.ConnectionPoolListenerAdapter;
-
-class NoOpConnectionPoolListener extends ConnectionPoolListenerAdapter {
-}
diff --git a/driver-core/src/main/com/mongodb/connection/NoOpServerListener.java b/driver-core/src/main/com/mongodb/connection/NoOpServerListener.java
deleted file mode 100644
index 96515e70299..00000000000
--- a/driver-core/src/main/com/mongodb/connection/NoOpServerListener.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.event.ServerClosedEvent;
-import com.mongodb.event.ServerDescriptionChangedEvent;
-import com.mongodb.event.ServerListener;
-import com.mongodb.event.ServerOpeningEvent;
-
-class NoOpServerListener implements ServerListener {
-    @Override
-    public void serverOpening(final ServerOpeningEvent event) {
-    }
-
-    @Override
-    public void serverClosed(final ServerClosedEvent event) {
-    }
-
-    @Override
-    public void serverDescriptionChanged(final ServerDescriptionChangedEvent event) {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/NoOpServerMonitorListener.java b/driver-core/src/main/com/mongodb/connection/NoOpServerMonitorListener.java
deleted file mode 100644
index 81b1b34d17a..00000000000
--- a/driver-core/src/main/com/mongodb/connection/NoOpServerMonitorListener.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.event.ServerHeartbeatFailedEvent;
-import com.mongodb.event.ServerHeartbeatStartedEvent;
-import com.mongodb.event.ServerHeartbeatSucceededEvent;
-import com.mongodb.event.ServerMonitorListener;
-
-class NoOpServerMonitorListener implements ServerMonitorListener {
-    @Override
-    public void serverHearbeatStarted(final ServerHeartbeatStartedEvent event) {
-    }
-
-    @Override
-    public void serverHeartbeatSucceeded(final ServerHeartbeatSucceededEvent event) {
-    }
-
-    @Override
-    public void serverHeartbeatFailed(final ServerHeartbeatFailedEvent event) {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/Protocol.java b/driver-core/src/main/com/mongodb/connection/Protocol.java
deleted file mode 100644
index dcb4c0541e4..00000000000
--- a/driver-core/src/main/com/mongodb/connection/Protocol.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.event.CommandListener;
-
-/**
- * An interface for the execution of a MongoDB wire protocol conversation
- *
- * @param <T> the return value of the Protocol response message
- */
-interface Protocol<T> {
-    /**
-     * Execute the protocol.
-     *
-     * @param connection the connection to execute the protocol on
-     * @return the response from execution of the protocol
-     */
-    T execute(final InternalConnection connection);
-
-    /**
-     * Execute the protocol asynchronously.
-     *
-     * @param connection the connection to execute the protocol on
-     * @param callback   the callback that is passed the result of the execution
-     */
-    void executeAsync(final InternalConnection connection, SingleResultCallback<T> callback);
-
-    void setCommandListener(CommandListener commandListener);
-}
diff --git a/driver-core/src/main/com/mongodb/connection/ProtocolExecutor.java b/driver-core/src/main/com/mongodb/connection/ProtocolExecutor.java
deleted file mode 100644
index 8b1037f78ab..00000000000
--- a/driver-core/src/main/com/mongodb/connection/ProtocolExecutor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.async.SingleResultCallback;
-
-interface ProtocolExecutor {
-    <T> T execute(final Protocol<T> protocol, InternalConnection connection);
-
-    <T> void executeAsync(final Protocol<T> protocol, InternalConnection connection, SingleResultCallback<T> callback);
-}
diff --git a/driver-core/src/main/com/mongodb/connection/ProtocolHelper.java b/driver-core/src/main/com/mongodb/connection/ProtocolHelper.java
deleted file mode 100644
index a1f1161cc04..00000000000
--- a/driver-core/src/main/com/mongodb/connection/ProtocolHelper.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.DuplicateKeyException;
-import com.mongodb.ErrorCategory;
-import com.mongodb.MongoCommandException;
-import com.mongodb.MongoException;
-import com.mongodb.MongoExecutionTimeoutException;
-import com.mongodb.MongoNodeIsRecoveringException;
-import com.mongodb.MongoNotPrimaryException;
-import com.mongodb.MongoQueryException;
-import com.mongodb.ServerAddress;
-import com.mongodb.WriteConcernException;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.event.CommandFailedEvent;
-import com.mongodb.event.CommandListener;
-import com.mongodb.event.CommandStartedEvent;
-import com.mongodb.event.CommandSucceededEvent;
-import org.bson.BsonBoolean;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonReader;
-import org.bson.BsonString;
-import org.bson.BsonType;
-import org.bson.BsonValue;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.io.BsonOutput;
-
-import static java.lang.String.format;
-import static org.bson.codecs.BsonValueCodecProvider.getClassForBsonType;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
-
-final class ProtocolHelper {
-    private static final Logger PROTOCOL_EVENT_LOGGER = Loggers.getLogger("protocol.event");
-    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
-
-    static WriteConcernResult getWriteResult(final BsonDocument result, final ServerAddress serverAddress) {
-        if (!isCommandOk(result)) {
-            throw getCommandFailureException(result, serverAddress);
-        }
-
-        if (hasWriteError(result)) {
-            throwWriteException(result, serverAddress);
-        }
-
-        return createWriteResult(result);
-    }
-
-    private static WriteConcernResult createWriteResult(final BsonDocument result) {
-        BsonBoolean updatedExisting = result.getBoolean("updatedExisting", BsonBoolean.FALSE);
-
-        return WriteConcernResult.acknowledged(result.getNumber("n", new BsonInt32(0)).intValue(),
-                                               updatedExisting.getValue(), result.get("upserted"));
-    }
-
-
-    static boolean isCommandOk(final BsonDocument response) {
-        BsonValue okValue = response.get("ok");
-        return isCommandOk(okValue);
-    }
-
-    static boolean isCommandOk(final BsonReader bsonReader) {
-        return isCommandOk(getField(bsonReader, "ok"));
-    }
-
-    private static BsonValue getField(final BsonReader bsonReader, final String fieldName) {
-        bsonReader.readStartDocument();
-        while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-            if (bsonReader.readName().equals(fieldName)) {
-                return REGISTRY.get(getClassForBsonType(bsonReader.getCurrentBsonType())).decode(bsonReader,
-                        DecoderContext.builder().build());
-            }
-            bsonReader.skipValue();
-        }
-        bsonReader.readEndDocument();
-        return null;
-    }
-
-    private static boolean isCommandOk(final BsonValue okValue) {
-        if (okValue == null) {
-            return false;
-        } else if (okValue.isBoolean()) {
-            return okValue.asBoolean().getValue();
-        } else if (okValue.isNumber()) {
-            return okValue.asNumber().intValue() == 1;
-        } else {
-            return false;
-        }
-    }
-
-    static MongoException getCommandFailureException(final BsonDocument response, final ServerAddress serverAddress) {
-        MongoException specialException = createSpecialException(response, serverAddress, "errmsg");
-        if (specialException != null) {
-            return specialException;
-        }
-        return new MongoCommandException(response, serverAddress);
-    }
-
-    static int getErrorCode(final BsonDocument response) {
-        return (response.getNumber("code", new BsonInt32(-1)).intValue());
-    }
-
-    static String getErrorMessage(final BsonDocument response, final String errorMessageFieldName) {
-        return response.getString(errorMessageFieldName, new BsonString("")).getValue();
-    }
-
-    static MongoException getQueryFailureException(final BsonDocument errorDocument, final ServerAddress serverAddress) {
-        MongoException specialException = createSpecialException(errorDocument, serverAddress, "$err");
-        if (specialException != null) {
-            return specialException;
-        }
-        return new MongoQueryException(serverAddress, getErrorCode(errorDocument), getErrorMessage(errorDocument, "$err"));
-    }
-
-    static MessageSettings getMessageSettings(final ConnectionDescription connectionDescription) {
-        return MessageSettings.builder()
-                              .maxDocumentSize(connectionDescription.getMaxDocumentSize())
-                              .maxMessageSize(connectionDescription.getMaxMessageSize())
-                              .maxBatchCount(connectionDescription.getMaxBatchCount())
-                              .build();
-    }
-
-    static RequestMessage encodeMessage(final RequestMessage message, final BsonOutput bsonOutput) {
-        try {
-            return message.encode(bsonOutput);
-        } catch (RuntimeException e) {
-            bsonOutput.close();
-            throw e;
-        } catch (Error e) {
-            bsonOutput.close();
-            throw e;
-        }
-    }
-
-    static RequestMessage.EncodingMetadata encodeMessageWithMetadata(final RequestMessage message, final BsonOutput bsonOutput) {
-        try {
-            return message.encodeWithMetadata(bsonOutput);
-        } catch (RuntimeException e) {
-            bsonOutput.close();
-            throw e;
-        } catch (Error e) {
-            bsonOutput.close();
-            throw e;
-        }
-    }
-
-    private static MongoException createSpecialException(final BsonDocument response, final ServerAddress serverAddress,
-                                                         final String errorMessageFieldName) {
-        if (ErrorCategory.fromErrorCode(getErrorCode(response)) == ErrorCategory.EXECUTION_TIMEOUT) {
-            return new MongoExecutionTimeoutException(getErrorCode(response), getErrorMessage(response, errorMessageFieldName));
-        } else if (getErrorMessage(response, errorMessageFieldName).startsWith("not master")) {
-            return new MongoNotPrimaryException(serverAddress);
-        } else if (getErrorMessage(response, errorMessageFieldName).startsWith("node is recovering")) {
-            return new MongoNodeIsRecoveringException(serverAddress);
-        } else {
-            return null;
-        }
-    }
-
-    private static boolean hasWriteError(final BsonDocument response) {
-        String err = WriteConcernException.extractErrorMessage(response);
-        return err != null && err.length() > 0;
-    }
-
-    @SuppressWarnings("deprecation")
-    private static void throwWriteException(final BsonDocument result, final ServerAddress serverAddress) {
-        MongoException specialException = createSpecialException(result, serverAddress, "err");
-        if (specialException != null) {
-            throw specialException;
-        }
-        int code = WriteConcernException.extractErrorCode(result);
-        if (ErrorCategory.fromErrorCode(code) == ErrorCategory.DUPLICATE_KEY) {
-            throw new DuplicateKeyException(result, serverAddress, createWriteResult(result));
-        } else {
-            throw new WriteConcernException(result, serverAddress, createWriteResult(result));
-        }
-    }
-
-    static void sendCommandStartedEvent(final RequestMessage message, final String databaseName, final String commandName,
-                                        final BsonDocument command, final ConnectionDescription connectionDescription,
-                                        final CommandListener commandListener) {
-        try {
-            commandListener.commandStarted(new CommandStartedEvent(message.getId(), connectionDescription,
-                                                                   databaseName, commandName, command));
-        } catch (Exception e) {
-            if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {
-                PROTOCOL_EVENT_LOGGER.warn(format("Exception thrown raising command started event to listener %s", commandListener), e);
-            }
-        }
-    }
-
-    static void sendCommandSucceededEvent(final RequestMessage message, final String commandName, final BsonDocument response,
-                                          final ConnectionDescription connectionDescription, final long startTimeNanos,
-                                          final CommandListener commandListener) {
-        try {
-            commandListener.commandSucceeded(new CommandSucceededEvent(message.getId(), connectionDescription,
-                                                                       commandName,
-                                                                       response, System.nanoTime() - startTimeNanos));
-        } catch (Exception e) {
-            if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {
-                PROTOCOL_EVENT_LOGGER.warn(format("Exception thrown raising command succeeded event to listener %s", commandListener), e);
-            }
-        }
-    }
-
-    static void sendCommandFailedEvent(final RequestMessage message, final String commandName,
-                                       final ConnectionDescription connectionDescription, final long startTimeNanos,
-                                       final Throwable throwable, final CommandListener commandListener) {
-        try {
-            commandListener.commandFailed(new CommandFailedEvent(message.getId(), connectionDescription, commandName,
-                                                                 System.nanoTime() - startTimeNanos, throwable));
-        } catch (Exception e) {
-            if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {
-                PROTOCOL_EVENT_LOGGER.warn(format("Exception thrown raising command failed event to listener %s", commandListener), e);
-            }
-        }
-    }
-
-
-    private ProtocolHelper() {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/QueryMessage.java b/driver-core/src/main/com/mongodb/connection/QueryMessage.java
deleted file mode 100644
index 388209b754c..00000000000
--- a/driver-core/src/main/com/mongodb/connection/QueryMessage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import org.bson.BsonDocument;
-import org.bson.io.BsonOutput;
-
-/**
- * An OP_QUERY message for an actual query (not a command).
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
- */
-class QueryMessage extends BaseQueryMessage {
-    private final BsonDocument queryDocument;
-    private final BsonDocument fields;
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection name
-     * @param skip           the number of documents to skip
-     * @param numberToReturn the number to return
-     * @param queryDocument  the query document
-     * @param fields         the fields to return in the result documents
-     * @param settings       the message settings
-     */
-    public QueryMessage(final String collectionName, final int skip,
-                        final int numberToReturn, final BsonDocument queryDocument,
-                        final BsonDocument fields, final MessageSettings settings) {
-        super(collectionName, skip, numberToReturn, settings);
-        this.queryDocument = queryDocument;
-        this.fields = fields;
-    }
-
-    @Override
-    protected RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final int messageStartPosition) {
-       return encodeMessageBodyWithMetadata(bsonOutput, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final int messageStartPosition) {
-        writeQueryPrologue(bsonOutput);
-        int firstDocumentStartPosition = bsonOutput.getPosition();
-        addDocument(queryDocument, bsonOutput, new NoOpFieldNameValidator());
-        if (fields != null) {
-            addDocument(fields, bsonOutput, new NoOpFieldNameValidator());
-        }
-        return new EncodingMetadata(null, firstDocumentStartPosition);
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/QueryResult.java b/driver-core/src/main/com/mongodb/connection/QueryResult.java
index 8b35b67c5f5..594870ab174 100644
--- a/driver-core/src/main/com/mongodb/connection/QueryResult.java
+++ b/driver-core/src/main/com/mongodb/connection/QueryResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
  * @param <T> the type of document to decode query results to
  * @since 3.0
  */
+@Deprecated
 public class QueryResult<T> {
     private final MongoNamespace namespace;
     private final List<T> results;
@@ -49,18 +50,6 @@ public QueryResult(final MongoNamespace namespace, final List<T> results, final
         this.serverAddress = serverAddress;
     }
 
-    /**
-     * Construct an instance.
-     *
-     * @param namespace    the namespace
-     * @param replyMessage the reply message
-     * @param address      the server address
-     */
-    QueryResult(final MongoNamespace namespace, final ReplyMessage<T> replyMessage, final ServerAddress address) {
-        this(namespace, replyMessage.getDocuments(), replyMessage.getReplyHeader().getCursorId(), address
-            );
-    }
-
     /**
      * Gets the namespace.
      *
diff --git a/driver-core/src/main/com/mongodb/connection/ReplyHeader.java b/driver-core/src/main/com/mongodb/connection/ReplyHeader.java
deleted file mode 100644
index a2e682d7e0e..00000000000
--- a/driver-core/src/main/com/mongodb/connection/ReplyHeader.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoInternalException;
-import org.bson.io.BsonInput;
-
-import static java.lang.String.format;
-
-/**
- * Contains the details of a reply from a MongoDB server.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#database-response-messages Database Response Messages
- */
-class ReplyHeader {
-    /**
-     * The length of the reply header in the MongoDB wire protocol.
-     */
-    public static final int REPLY_HEADER_LENGTH = 36;
-
-    private static final int CURSOR_NOT_FOUND_RESPONSE_FLAG = 1;
-    private static final int QUERY_FAILURE_RESPONSE_FLAG = 2;
-    private static final int OP_REPLY_OP_CODE = 1;
-    private static final int MIN_BSON_DOCUMENT_LENGTH = 5;
-
-    private final int messageLength;
-    private final int requestId;
-    private final int responseTo;
-    private final int responseFlags;
-    private final long cursorId;
-    private final int startingFrom;
-    private final int numberReturned;
-
-    /**
-     * Creates a new {@code ReplyHeader}, populated with values from the {@code headerInputBuffer}.
-     *
-     * @param header the {@code InputBuffer} containing the reply from the MongoDB server.
-     */
-    public ReplyHeader(final BsonInput header, final int maxMessageLength) {
-        messageLength = header.readInt32();
-        requestId = header.readInt32();
-        responseTo = header.readInt32();
-        int opCode = header.readInt32();
-        responseFlags = header.readInt32();
-        cursorId = header.readInt64();
-        startingFrom = header.readInt32();
-        numberReturned = header.readInt32();
-
-        if (opCode != OP_REPLY_OP_CODE) {
-            throw new MongoInternalException(format("The reply message opCode %d does not match the expected opCode %d",
-                    opCode, OP_REPLY_OP_CODE));
-        }
-
-        if (messageLength < REPLY_HEADER_LENGTH) {
-            throw new MongoInternalException(format("The reply message length %d is less than the mimimum message length %d", messageLength,
-                    REPLY_HEADER_LENGTH));
-        }
-
-        if (messageLength > maxMessageLength) {
-            throw new MongoInternalException(String.format("The reply message length %d is less than the maximum message length %d",
-                    messageLength, maxMessageLength));
-        }
-
-        if (numberReturned < 0) {
-            throw new MongoInternalException(format("The reply message number of returned documents, %d, is less than 0", numberReturned));
-        }
-    }
-
-    /**
-     * Gets the total size of the message in bytes. This total includes the 4 bytes that holds the message length.
-     *
-     * @return the total message size, including all of the header
-     */
-    public int getMessageLength() {
-        return messageLength;
-    }
-
-    /**
-     * This is a client or database-generated identifier that uniquely identifies this message. Along with the {@code responseTo} field in
-     * responses, clients can use this to associate query responses with the originating query.
-     *
-     * @return the identifier for this message
-     */
-    public int getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Along with the requestID field in queries, clients can use this to associate query responses with the originating query.
-     *
-     * @return the request ID from the original request
-     */
-    public int getResponseTo() {
-        return responseTo;
-    }
-
-    /**
-     * Gets additional information about the response.
-     * <ul>
-     *     <li>0 - <i>CursorNotFound</i>: Set when getMore is called but the cursor id is not valid at the server. Returned with zero
-     *     results.</li>
-     *     <li>1 - <i>QueryFailure</i>: Set when query failed. Results consist of one document containing an "$err" field describing the
-     *     failure.
-     *     <li>2 - <i>ShardConfigStale</i>: Drivers should ignore this. Only mongos will ever see this set, in which case,
-     *     it needs to update config from the server.
-     *     <li>3 - <i>AwaitCapable</i>: Set when the server supports the AwaitData Query option. If it doesn't,
-     *     a client should sleep a little between getMore's of a Tailable cursor. Mongod version 1.6 supports AwaitData and thus always
-     *     sets AwaitCapable.
-     *     <li>4-31 - <i>Reserved</i>: Ignore
-     * </ul>
-     *
-     * @return bit vector - see details above
-     */
-    public int getResponseFlags() {
-        return responseFlags;
-    }
-
-    /**
-     * Gets the cursor ID that this response is a part of. If there are no more documents to fetch from the server, the cursor ID will be 0.
-     * This cursor ID must be used in any messages used to get more data, and also must be closed by the client when no longer needed.
-     *
-     * @return cursor ID to use if the client needs to fetch more from the server
-     */
-    public long getCursorId() {
-        return cursorId;
-    }
-
-    /**
-     * Returns the position in the cursor that is the start point of this reply.
-     *
-     * @return where in the cursor this reply is starting
-     */
-    public int getStartingFrom() {
-        return startingFrom;
-    }
-
-    /**
-     * Gets the number of documents to expect in the body of this reply.
-     *
-     * @return number of documents in the reply
-     */
-    public int getNumberReturned() {
-        return numberReturned;
-    }
-
-    /**
-     * Gets whether this query was performed with a cursor ID that was not valid on the server.
-     *
-     * @return true if this reply indicates the request to get more data was performed with a cursor ID that's not valid on the server
-     */
-    public boolean isCursorNotFound() {
-        return (responseFlags & CURSOR_NOT_FOUND_RESPONSE_FLAG) == CURSOR_NOT_FOUND_RESPONSE_FLAG;
-    }
-
-    /**
-     * Gets whether the query failed or not.
-     *
-     * @return true if this reply indicates the query failed.
-     */
-    public boolean isQueryFailure() {
-        return (responseFlags & QUERY_FAILURE_RESPONSE_FLAG) == QUERY_FAILURE_RESPONSE_FLAG;
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/RequestMessage.java b/driver-core/src/main/com/mongodb/connection/RequestMessage.java
deleted file mode 100644
index c430a2755b0..00000000000
--- a/driver-core/src/main/com/mongodb/connection/RequestMessage.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import org.bson.BsonBinaryWriter;
-import org.bson.BsonBinaryWriterSettings;
-import org.bson.BsonDocument;
-import org.bson.BsonWriterSettings;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.Codec;
-import org.bson.codecs.Encoder;
-import org.bson.codecs.EncoderContext;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.io.BsonOutput;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
-
-/**
- * Abstract base class for all MongoDB Wire Protocol request messages.
- */
-abstract class RequestMessage {
-
-    static final AtomicInteger REQUEST_ID = new AtomicInteger(1);
-
-    // Allow an extra 16K to the maximum allowed size of a query or command document, so that, for example,
-    // a 16M document can be upserted via findAndModify
-    private static final int QUERY_DOCUMENT_HEADROOM = 16 * 1024;
-
-    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
-
-    private final String collectionName;
-    private final MessageSettings settings;
-    private final int id;
-    private final OpCode opCode;
-
-    static class EncodingMetadata {
-        private final RequestMessage nextMessage;
-        private final int firstDocumentPosition;
-
-        EncodingMetadata(final RequestMessage nextMessage, final int firstDocumentPosition) {
-            this.nextMessage = nextMessage;
-            this.firstDocumentPosition = firstDocumentPosition;
-        }
-
-        public RequestMessage getNextMessage() {
-            return nextMessage;
-        }
-
-        public int getFirstDocumentPosition() {
-            return firstDocumentPosition;
-        }
-    }
-    /**
-     * Gets the next available unique message identifier.
-     *
-     * @return the message identifier
-     */
-    public static int getCurrentGlobalId() {
-        return REQUEST_ID.get();
-    }
-
-    /**
-     * Construct an instance without a collection name
-     *
-     * @param opCode   the op code of the message
-     * @param settings the message settings
-     */
-    public RequestMessage(final OpCode opCode, final MessageSettings settings) {
-        this(null, opCode, settings);
-    }
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection name
-     * @param opCode         the op code of the message
-     * @param settings       the message settings
-     */
-    public RequestMessage(final String collectionName, final OpCode opCode, final MessageSettings settings) {
-        this.collectionName = collectionName;
-        this.settings = settings;
-        id = REQUEST_ID.getAndIncrement();
-        this.opCode = opCode;
-    }
-
-    /**
-     * Gets the message id.
-     *
-     * @return the message id
-     */
-    public int getId() {
-        return id;
-    }
-
-    /**
-     * Gets the op code of the message.
-     *
-     * @return the op code
-     */
-    public OpCode getOpCode() {
-        return opCode;
-    }
-
-    /**
-     * Gets the collection namespace to send the message to.
-     *
-     * @return the namespace, which may be null for some message types
-     */
-    public String getNamespace() {
-        return getCollectionName() != null ? getCollectionName() : null;
-    }
-
-    /**
-     * Gets the message settings.
-     *
-     * @return the message settings
-     */
-    public MessageSettings getSettings() {
-        return settings;
-    }
-
-    /**
-     * Encoded the message to the given output.
-     *
-     * @param bsonOutput the output
-     * @return the next message to encode, if the current message is unable to fit all of its contents in a single message due to limits
-     * being exceeded
-     */
-    public RequestMessage encode(final BsonOutput bsonOutput) {
-        return encodeWithMetadata(bsonOutput).getNextMessage();
-    }
-
-    /**
-     * Encoded the message to the given output.
-     *
-     * @param bsonOutput the output
-     * @return the next message to encode, if the current message is unable to fit all of its contents in a single message due to limits
-     * being exceeded
-     */
-    public EncodingMetadata encodeWithMetadata(final BsonOutput bsonOutput) {
-        int messageStartPosition = bsonOutput.getPosition();
-        writeMessagePrologue(bsonOutput);
-        EncodingMetadata encodingMetadata = encodeMessageBodyWithMetadata(bsonOutput, messageStartPosition);
-        backpatchMessageLength(messageStartPosition, bsonOutput);
-        return encodingMetadata;
-    }
-
-    /**
-     * Writes the message prologue to the given output.
-     *
-     * @param bsonOutput the output
-     */
-    protected void writeMessagePrologue(final BsonOutput bsonOutput) {
-        bsonOutput.writeInt32(0); // length: will set this later
-        bsonOutput.writeInt32(id);
-        bsonOutput.writeInt32(0); // response to
-        bsonOutput.writeInt32(opCode.getValue());
-    }
-
-    /**
-     * Encode the message body to the given output.
-     *
-     * @param bsonOutput the output
-     * @param messageStartPosition the start position of the message
-     * @return the next message to encode, if the contents of this message need to overflow into the next
-     */
-    protected abstract RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final int messageStartPosition);
-
-    /**
-     * Encode the message body to the given output.
-     *
-     * @param bsonOutput the output
-     * @param messageStartPosition the start position of the message
-     * @return the encoding metadata
-     */
-    protected abstract EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final int messageStartPosition);
-
-    /**
-     * Appends a document to the message.
-     *
-     * @param document the document
-     * @param bsonOutput the output
-     * @param validator the field name validator
-     * @param <T> the document type
-     */
-    protected <T> void addDocument(final BsonDocument document, final BsonOutput bsonOutput,
-                                   final FieldNameValidator validator) {
-        addDocument(document, getCodec(document), EncoderContext.builder().build(), bsonOutput, validator,
-                    settings.getMaxDocumentSize() + QUERY_DOCUMENT_HEADROOM);
-    }
-
-
-    /**
-     * Appends a document to the message that is intended for storage in a collection.
-     *
-     * @param document the document
-     * @param bsonOutput the output
-     * @param validator the field name validator
-     */
-    protected void addCollectibleDocument(final BsonDocument document, final BsonOutput bsonOutput,
-                                          final FieldNameValidator validator) {
-        addDocument(document, getCodec(document), EncoderContext.builder().isEncodingCollectibleDocument(true).build(), bsonOutput,
-                    validator, settings.getMaxDocumentSize());
-    }
-
-    /**
-     * Backpatches the message length into the beginning of the message.
-     *
-     * @param startPosition the start position of the message
-     * @param bsonOutput the output
-     */
-    protected void backpatchMessageLength(final int startPosition, final BsonOutput bsonOutput) {
-        int messageLength = bsonOutput.getPosition() - startPosition;
-        bsonOutput.writeInt32(bsonOutput.getPosition() - messageLength, messageLength);
-    }
-
-    /**
-     * Gets the collection name, which may be null for some message types
-     *
-     * @return the collection name
-     */
-    protected String getCollectionName() {
-        return collectionName;
-    }
-
-    @SuppressWarnings("unchecked")
-    Codec<BsonDocument> getCodec(final BsonDocument document) {
-        return (Codec<BsonDocument>) REGISTRY.get(document.getClass());
-    }
-
-    private <T> void addDocument(final T obj, final Encoder<T> encoder, final EncoderContext encoderContext,
-                                 final BsonOutput bsonOutput, final FieldNameValidator validator, final int maxDocumentSize) {
-        BsonBinaryWriter writer = new BsonBinaryWriter(new BsonWriterSettings(),
-                                                       new BsonBinaryWriterSettings(maxDocumentSize), bsonOutput, validator);
-        try {
-            encoder.encode(writer, obj, encoderContext);
-        } finally {
-            writer.close();
-        }
-    }
-
-    enum OpCode {
-        OP_REPLY(1),
-        OP_MSG(1000),
-        OP_UPDATE(2001),
-        OP_INSERT(2002),
-        OP_QUERY(2004),
-        OP_GETMORE(2005),
-        OP_DELETE(2006),
-        OP_KILL_CURSORS(2007);
-
-        OpCode(final int value) {
-            this.value = value;
-        }
-
-        private final int value;
-
-        public int getValue() {
-            return value;
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/ResponseBuffers.java b/driver-core/src/main/com/mongodb/connection/ResponseBuffers.java
deleted file mode 100644
index 9f3ab552bc9..00000000000
--- a/driver-core/src/main/com/mongodb/connection/ResponseBuffers.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import org.bson.ByteBuf;
-
-import java.io.Closeable;
-
-class ResponseBuffers implements Closeable {
-    private final ReplyHeader replyHeader;
-    private final ByteBuf bodyByteBuffer;
-    private volatile boolean isClosed;
-
-    /**
-     * Construct an instance.
-     *
-     * @param replyHeader the reply header
-     * @param bodyByteBuffer a byte buffer containing the message body
-     */
-    public ResponseBuffers(final ReplyHeader replyHeader, final ByteBuf bodyByteBuffer) {
-        this.replyHeader = replyHeader;
-        this.bodyByteBuffer = bodyByteBuffer;
-    }
-
-    /**
-     * Gets the reply header.
-     *
-     * @return the reply header
-     */
-    public ReplyHeader getReplyHeader() {
-        return replyHeader;
-    }
-
-    /**
-     * Returns a read-only buffer containing the response body.  Care should be taken to not use the returned buffer after this instance has
-     * been closed.
-     *
-     * @return a read-only buffer containing the response body
-     */
-    public ByteBuf getBodyByteBuffer() {
-        return bodyByteBuffer.asReadOnly();
-    }
-
-    public void reset() {
-        bodyByteBuffer.position(0);
-    }
-
-    @Override
-    public void close() {
-        if (!isClosed) {
-            if (bodyByteBuffer != null) {
-                bodyByteBuffer.release();
-            }
-            isClosed = true;
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/ScramSha1Authenticator.java b/driver-core/src/main/com/mongodb/connection/ScramSha1Authenticator.java
deleted file mode 100644
index 0ecb30112b1..00000000000
--- a/driver-core/src/main/com/mongodb/connection/ScramSha1Authenticator.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.internal.authentication.NativeAuthenticationHelper;
-
-import javax.crypto.Mac;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-import javax.security.sasl.SaslClient;
-import javax.security.sasl.SaslException;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.spec.InvalidKeySpecException;
-import java.util.HashMap;
-import java.util.Random;
-
-import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
-
-class ScramSha1Authenticator extends SaslAuthenticator {
-
-    private final RandomStringGenerator randomStringGenerator;
-
-    ScramSha1Authenticator(final MongoCredential credential) {
-        this(credential, new DefaultRandomStringGenerator());
-    }
-
-    ScramSha1Authenticator(final MongoCredential credential, final RandomStringGenerator randomStringGenerator) {
-        super(credential);
-
-        this.randomStringGenerator = randomStringGenerator;
-    }
-
-    @Override
-    public String getMechanismName() {
-        return SCRAM_SHA_1.getMechanismName();
-    }
-
-    @Override
-    protected SaslClient createSaslClient(final ServerAddress serverAddress) {
-        return new ScramSha1SaslClient(getCredential(), randomStringGenerator);
-    }
-
-    private static class ScramSha1SaslClient implements SaslClient {
-
-        private static final String GS2_HEADER = "n,,";
-        private static final int RANDOM_LENGTH = 24;
-
-        private final Base64Codec base64Codec;
-        private final MongoCredential credential;
-        private String clientFirstMessageBare;
-        private final RandomStringGenerator randomStringGenerator;
-        private String rPrefix;
-        private byte[] serverSignature;
-        private int step;
-
-        ScramSha1SaslClient(final MongoCredential credential, final RandomStringGenerator randomStringGenerator) {
-            this.credential = credential;
-            this.base64Codec = new Base64Codec();
-            this.randomStringGenerator = randomStringGenerator;
-        }
-
-        public String getMechanismName() {
-            return SCRAM_SHA_1.getMechanismName();
-        }
-
-        public boolean hasInitialResponse() {
-            return true;
-        }
-
-        public byte[] evaluateChallenge(final byte[] challenge) throws SaslException {
-            if (this.step == 0) {
-                this.step++;
-
-                return computeClientFirstMessage();
-            }
-            else if (this.step == 1) {
-                this.step++;
-
-                return computeClientFinalMessage(challenge);
-            }
-            else if (this.step == 2) {
-                this.step++;
-
-                String serverResponse = encodeUTF8(challenge);
-                HashMap<String, String> map = parseServerResponse(serverResponse);
-
-                if (!MessageDigest.isEqual(decodeBase64(map.get("v")), this.serverSignature)) {
-                    throw new SaslException("Server signature was invalid.");
-                }
-
-                return challenge;
-            }
-            else {
-                throw new SaslException("Too many steps involved in the SCRAM-SHA-1 negotiation.");
-            }
-        }
-
-        public boolean isComplete() {
-            return this.step > 2;
-        }
-
-        public byte[] unwrap(final byte[] incoming, final int offset, final int len) throws SaslException {
-            throw new UnsupportedOperationException("Not implemented yet!");
-        }
-
-        public byte[] wrap(final byte[] outgoing, final int offset, final int len) throws SaslException {
-            throw new UnsupportedOperationException("Not implemented yet!");
-        }
-
-        public Object getNegotiatedProperty(final String propName) {
-            throw new UnsupportedOperationException("Not implemented yet!");
-        }
-
-        public void dispose() throws SaslException {
-            // nothing to do
-        }
-
-        private byte[] computeClientFirstMessage() throws SaslException {
-            String userName = "n=" + prepUserName(this.credential.getUserName());
-            this.rPrefix = randomStringGenerator.generate(RANDOM_LENGTH);
-
-            String nonce = "r=" + this.rPrefix;
-
-            this.clientFirstMessageBare = userName + "," + nonce;
-            String clientFirstMessage = GS2_HEADER + this.clientFirstMessageBare;
-
-            return decodeUTF8(clientFirstMessage);
-        }
-
-        private byte[] computeClientFinalMessage(final byte[] challenge) throws SaslException {
-            String serverFirstMessage = encodeUTF8(challenge);
-
-            HashMap<String, String> map = parseServerResponse(serverFirstMessage);
-            String r = map.get("r");
-            if (!r.startsWith(this.rPrefix)) {
-                throw new SaslException("Server sent an invalid nonce.");
-            }
-
-            String s = map.get("s");
-            String i = map.get("i");
-
-            String channelBinding = "c=" + encodeBase64(decodeUTF8(GS2_HEADER));
-            String nonce = "r=" + r;
-            String clientFinalMessageWithoutProof = channelBinding + "," + nonce;
-
-            byte[] saltedPassword = hi(
-                    NativeAuthenticationHelper.createAuthenticationHash(this.credential.getUserName(),
-                                                                        this.credential.getPassword()),
-                    decodeBase64(s),
-                    Integer.parseInt(i)
-            );
-            byte[] clientKey = hmac(saltedPassword, "Client Key");
-            byte[] storedKey = h(clientKey);
-            String authMessage = this.clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
-            byte[] clientSignature = hmac(storedKey, authMessage);
-            byte[] clientProof = xor(clientKey, clientSignature);
-            byte[] serverKey = hmac(saltedPassword, "Server Key");
-            this.serverSignature = hmac(serverKey, authMessage);
-
-            String proof = "p=" + encodeBase64(clientProof);
-            String clientFinalMessage = clientFinalMessageWithoutProof + "," + proof;
-
-            return decodeUTF8(clientFinalMessage);
-        }
-
-        private byte[] decodeBase64(final String str) {
-            return this.base64Codec.decode(str);
-        }
-
-        private byte[] decodeUTF8(final String str) throws SaslException {
-            try {
-                return str.getBytes("UTF-8");
-            }
-            catch (UnsupportedEncodingException e) {
-                throw new SaslException("UTF-8 is not a supported encoding.", e);
-            }
-        }
-
-        private String encodeBase64(final byte[] bytes) {
-            return this.base64Codec.encode(bytes);
-        }
-
-        private String encodeUTF8(final byte[] bytes) throws SaslException {
-            try {
-                return new String(bytes, "UTF-8");
-            }
-            catch (UnsupportedEncodingException e) {
-                throw new SaslException("UTF-8 is not a supported encoding.", e);
-            }
-        }
-
-        private byte[] h(final byte[] data) throws SaslException {
-            try {
-                return MessageDigest.getInstance("SHA-1").digest(data);
-            }
-            catch (NoSuchAlgorithmException e) {
-                throw new SaslException("SHA-1 could not be found.", e);
-            }
-        }
-
-        private byte[] hi(final String password, final byte[] salt, final int iterations) throws SaslException {
-            PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterations, 20 * 8 /* 20 bytes */);
-
-            SecretKeyFactory keyFactory;
-            try {
-                keyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
-            }
-            catch (NoSuchAlgorithmException e) {
-                throw new SaslException("Unable to find PBKDF2WithHmacSHA1.", e);
-            }
-
-            try {
-                return keyFactory.generateSecret(spec).getEncoded();
-            }
-            catch (InvalidKeySpecException e) {
-                throw new SaslException("Invalid key spec for PBKDC2WithHmacSHA1.", e);
-            }
-        }
-
-        private byte[] hmac(final byte[] bytes, final String key) throws SaslException {
-            SecretKeySpec signingKey = new SecretKeySpec(bytes, "HmacSHA1");
-
-            Mac mac;
-            try {
-                mac = Mac.getInstance("HmacSHA1");
-            }
-            catch (NoSuchAlgorithmException e) {
-                throw new SaslException("Could not find HmacSHA1.", e);
-            }
-
-            try {
-                mac.init(signingKey);
-            }
-            catch (InvalidKeyException e) {
-                throw new SaslException("Could not initialize mac.", e);
-            }
-
-            return mac.doFinal(decodeUTF8(key));
-        }
-
-        /**
-         * The server provides back key value pairs using an = sign and delimited
-         * by a command. All keys are also a single character.
-         * For example: a=kg4io3,b=skljsfoiew,c=1203
-         */
-        private HashMap<String, String> parseServerResponse(final String response) {
-            HashMap<String, String> map = new HashMap<String, String>();
-            String[] pairs = response.split(",");
-            for (String pair : pairs) {
-                String[] parts = pair.split("=", 2);
-                map.put(parts[0], parts[1]);
-            }
-
-            return map;
-        }
-
-        private String prepUserName(final String userName) {
-            return userName.replace("=", "=3D").replace(",", "=2D");
-        }
-
-        private byte[] xor(final byte[] a, final byte[] b) {
-            byte[] result = new byte[a.length];
-
-            for (int i = 0; i < a.length; i++) {
-                result[i] = (byte) (a[i] ^ b[i]);
-            }
-
-            return result;
-        }
-    }
-
-    public interface RandomStringGenerator {
-        String generate(int length);
-    }
-
-    public static class DefaultRandomStringGenerator implements RandomStringGenerator {
-        public String generate(final int length) {
-            int comma = 44;
-            int low = 33;
-            int high = 126;
-            int range = high - low;
-
-            Random random = new SecureRandom();
-            char[] text = new char[length];
-            for (int i = 0; i < length; i++) {
-                int next = random.nextInt(range) + low;
-                while (next == comma) {
-                    next = random.nextInt(range) + low;
-                }
-                text[i] = (char) next;
-            }
-            return new String(text);
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/Server.java b/driver-core/src/main/com/mongodb/connection/Server.java
index a88a388f810..65ca32abbb4 100644
--- a/driver-core/src/main/com/mongodb/connection/Server.java
+++ b/driver-core/src/main/com/mongodb/connection/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
  * @since 3.0
  */
 @ThreadSafe
+@Deprecated
 public interface Server {
     /**
      * Gets the description of this server.  Implementations of this method should not block if the server has not yet been successfully
diff --git a/driver-core/src/main/com/mongodb/connection/ServerConnectionState.java b/driver-core/src/main/com/mongodb/connection/ServerConnectionState.java
index 6a4d9cbf7e6..c626b7d4c6a 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerConnectionState.java
+++ b/driver-core/src/main/com/mongodb/connection/ServerConnectionState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/ServerDescription.java b/driver-core/src/main/com/mongodb/connection/ServerDescription.java
index 5c7e1292cac..4e116fe7763 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerDescription.java
+++ b/driver-core/src/main/com/mongodb/connection/ServerDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,13 @@
 import com.mongodb.TagSet;
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.internal.connection.DecimalFormatHelper;
+import com.mongodb.internal.connection.Time;
+import com.mongodb.lang.Nullable;
 import org.bson.types.ObjectId;
 
-import java.text.DecimalFormat;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -44,8 +47,21 @@
 @Immutable
 public class ServerDescription {
 
-    static final int MIN_DRIVER_WIRE_VERSION = 0;
-    static final int MAX_DRIVER_WIRE_VERSION = 3;
+    /**
+     * The minimum supported driver server version
+     * @since 3.8
+     */
+    public static final String MIN_DRIVER_SERVER_VERSION = "2.6";
+    /**
+     * The minimum supported driver wire version
+     * @since 3.8
+     */
+    public static final int MIN_DRIVER_WIRE_VERSION = 2;
+    /**
+     * The maximum supported driver wire version
+     * @since 3.8
+     */
+    public static final int MAX_DRIVER_WIRE_VERSION = 8;
 
     private static final int DEFAULT_MAX_DOCUMENT_SIZE = 0x1000000;  // 16MB
 
@@ -70,6 +86,10 @@ public class ServerDescription {
 
     private final ObjectId electionId;
     private final Integer setVersion;
+    private final Date lastWriteDate;
+    private final long lastUpdateTimeNanos;
+
+    private final Integer logicalSessionTimeoutMinutes;
 
     private final Throwable exception;
 
@@ -92,6 +112,17 @@ public String getCanonicalAddress() {
         return canonicalAddress;
     }
 
+    /**
+     * Gets the session timeout in minutes.
+     *
+     * @return the session timeout in minutes, or null if sessions are not supported by this server
+     * @mongodb.server.release 3.6
+     * @since 3.6
+     */
+    public Integer getLogicalSessionTimeoutMinutes() {
+        return logicalSessionTimeoutMinutes;
+    }
+
     /**
      * A builder for creating ServerDescription.
      */
@@ -115,6 +146,10 @@ public static class Builder {
         private int maxWireVersion = 0;
         private ObjectId electionId;
         private Integer setVersion;
+        private Date lastWriteDate;
+        private long lastUpdateTimeNanos = Time.nanoTime();
+        private Integer logicalSessionTimeoutMinutes;
+
         private Throwable exception;
 
         /**
@@ -271,7 +306,9 @@ public Builder state(final ServerConnectionState state) {
          *
          * @param version a ServerVersion representing which version of MongoDB is running on this server
          * @return this
+         * @deprecated Use {@link #maxWireVersion} instead
          */
+        @Deprecated
         public Builder version(final ServerVersion version) {
             notNull("version", version);
             this.version = version;
@@ -324,6 +361,48 @@ public Builder setVersion(final Integer setVersion) {
             return this;
         }
 
+        /**
+         * Sets the lastWriteDate reported by this server
+         *
+         * @param lastWriteDate the last write date, which may be null for servers prior to 3.4
+         * @return this
+         *
+         * @since 3.4
+         * @mongodb.server.release 3.4
+         */
+        public Builder lastWriteDate(final Date lastWriteDate) {
+            this.lastWriteDate = lastWriteDate;
+            return this;
+        }
+
+        /**
+         * Sets the last update time for this description, which is simply the time that the server description was created.
+         * A monotonic clock such as {@link System#nanoTime()} should be used to initialize this value.
+         *
+         * @param lastUpdateTimeNanos the last update time of this server description
+         * @return this
+         *
+         * @since 3.4
+         */
+        public Builder lastUpdateTimeNanos(final long lastUpdateTimeNanos) {
+            this.lastUpdateTimeNanos = lastUpdateTimeNanos;
+            return this;
+        }
+
+        /**
+         * Sets the session timeout in minutes.
+         *
+         * @param logicalSessionTimeoutMinutes the session timeout in minutes, or null if sessions are not supported by this server
+         * @return this
+         * @mongodb.server.release 3.6
+         * @since 3.6
+         */
+        public Builder logicalSessionTimeoutMinutes(final Integer logicalSessionTimeoutMinutes) {
+            this.logicalSessionTimeoutMinutes = logicalSessionTimeoutMinutes;
+            return this;
+        }
+
+
         /**
          * Sets the exception thrown while attempting to determine the server description.
          *
@@ -352,21 +431,39 @@ public ServerDescription build() {
      * @return true if the server is compatible with the driver.
      */
     public boolean isCompatibleWithDriver() {
-        if (!ok) {
-            return true;
-        }
-
-        if (minWireVersion > MAX_DRIVER_WIRE_VERSION) {
+        if (isIncompatiblyOlderThanDriver()) {
             return false;
         }
 
-        if (maxWireVersion < MIN_DRIVER_WIRE_VERSION) {
+        if (isIncompatiblyNewerThanDriver()) {
             return false;
         }
 
         return true;
     }
 
+    /**
+     * Return whether the server is compatible with the driver. An incompatible server is one that has a min wire version greater that the
+     * driver's max wire version or a max wire version less than the driver's min wire version.
+     *
+     * @return true if the server is compatible with the driver.
+     * @since 3.6
+     */
+    public boolean isIncompatiblyNewerThanDriver() {
+        return ok && minWireVersion > MAX_DRIVER_WIRE_VERSION;
+    }
+
+    /**
+     * Return whether the server is compatible with the driver. An incompatible server is one that has a min wire version greater that the
+     * driver's max wire version or a max wire version less than the driver's min wire version.
+     *
+     * @return true if the server is compatible with the driver.
+     * @since 3.6
+     */
+    public boolean isIncompatiblyOlderThanDriver() {
+        return ok && maxWireVersion < MIN_DRIVER_WIRE_VERSION;
+    }
+
     /**
      * Get the default maximum document size.
      *
@@ -541,6 +638,29 @@ public Integer getSetVersion() {
         return setVersion;
     }
 
+    /**
+     * Gets the last write date.
+     * @return the last write date, which may be null
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Date getLastWriteDate() {
+        return lastWriteDate;
+    }
+
+    /**
+     * Gets the time that this server description was created, using a monotonic clock like {@link System#nanoTime()}.
+     *
+     * @param timeUnit the time unit
+     * @return the last update time in the given unit
+     *
+     * @since 3.4
+     */
+    public long getLastUpdateTime(final TimeUnit timeUnit) {
+        return timeUnit.convert(lastUpdateTimeNanos, TimeUnit.NANOSECONDS);
+    }
+
     /**
      * Returns true if the server has the given tags.  A server of either type {@code ServerType.STANDALONE} or {@code
      * ServerType.SHARD_ROUTER} is considered to have all tags, so this method will always return true for instances of either of those
@@ -610,7 +730,9 @@ public ClusterType getClusterType() {
      * Gets the server version
      *
      * @return a ServerVersion representing which version of MongoDB is running on this server
+     * @deprecated Use {@link #getMaxWireVersion()} instead
      */
+    @Deprecated
     public ServerVersion getVersion() {
         return version;
     }
@@ -702,6 +824,19 @@ public boolean equals(final Object o) {
         if (setVersion != null ? !setVersion.equals(that.setVersion) : that.setVersion != null) {
             return false;
         }
+        if (lastWriteDate != null ? !lastWriteDate.equals(that.lastWriteDate) : that.lastWriteDate != null) {
+            return false;
+        }
+
+        if (lastUpdateTimeNanos != that.lastUpdateTimeNanos) {
+            return false;
+        }
+
+        if (logicalSessionTimeoutMinutes != null
+                    ? !logicalSessionTimeoutMinutes.equals(that.logicalSessionTimeoutMinutes)
+                    : that.logicalSessionTimeoutMinutes != null) {
+            return false;
+        }
 
         // Compare class equality and message as exceptions rarely override equals
         Class<?> thisExceptionClass = exception != null ? exception.getClass() : null;
@@ -733,11 +868,14 @@ public int hashCode() {
         result = 31 * result + (setName != null ? setName.hashCode() : 0);
         result = 31 * result + (electionId != null ? electionId.hashCode() : 0);
         result = 31 * result + (setVersion != null ? setVersion.hashCode() : 0);
+        result = 31 * result + (lastWriteDate != null ? lastWriteDate.hashCode() : 0);
+        result = 31 * result + (int) (lastUpdateTimeNanos ^ (lastUpdateTimeNanos >>> 32));
         result = 31 * result + (ok ? 1 : 0);
         result = 31 * result + state.hashCode();
         result = 31 * result + version.hashCode();
         result = 31 * result + minWireVersion;
         result = 31 * result + maxWireVersion;
+        result = 31 * result + (logicalSessionTimeoutMinutes != null ? logicalSessionTimeoutMinutes.hashCode() : 0);
         result = 31 * result + (exception == null ? 0 : exception.getClass().hashCode());
         result = 31 * result + (exception == null ? 0 : exception.getMessage().hashCode());
         return result;
@@ -756,6 +894,7 @@ public String toString() {
                   + ", minWireVersion=" + minWireVersion
                   + ", maxWireVersion=" + maxWireVersion
                   + ", maxDocumentSize=" + maxDocumentSize
+                  + ", logicalSessionTimeoutMinutes=" + logicalSessionTimeoutMinutes
                   + ", roundTripTimeNanos=" + roundTripTimeNanos
                   : "")
                + (isReplicaSetMember()
@@ -769,6 +908,8 @@ public String toString() {
                   + ", tagSet=" + tagSet
                   + ", electionId=" + electionId
                   + ", setVersion=" + setVersion
+                  + ", lastWriteDate=" + lastWriteDate
+                  + ", lastUpdateTimeNanos=" + lastUpdateTimeNanos
                 : "")
                + (exception == null ? "" : ", exception=" + translateExceptionToString())
                + '}';
@@ -809,7 +950,7 @@ private String translateExceptionToString() {
 
 
     private String getRoundTripFormattedInMilliseconds() {
-        return new DecimalFormat("#0.0").format(roundTripTimeNanos / 1000.0 / 1000.0);
+        return DecimalFormatHelper.format("#0.0", roundTripTimeNanos / 1000.0 / 1000.0);
     }
 
     ServerDescription(final Builder builder) {
@@ -831,6 +972,9 @@ private String getRoundTripFormattedInMilliseconds() {
         maxWireVersion = builder.maxWireVersion;
         electionId = builder.electionId;
         setVersion = builder.setVersion;
+        lastWriteDate = builder.lastWriteDate;
+        lastUpdateTimeNanos = builder.lastUpdateTimeNanos;
+        logicalSessionTimeoutMinutes = builder.logicalSessionTimeoutMinutes;
         exception = builder.exception;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/ServerId.java b/driver-core/src/main/com/mongodb/connection/ServerId.java
index 6b3c8388ab9..b1b0df4e618 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerId.java
+++ b/driver-core/src/main/com/mongodb/connection/ServerId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/ServerSettings.java b/driver-core/src/main/com/mongodb/connection/ServerSettings.java
index 20e2edb6b9d..cc74fbaa50f 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerSettings.java
+++ b/driver-core/src/main/com/mongodb/connection/ServerSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,11 @@
 import com.mongodb.event.ServerMonitorListener;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Collections.unmodifiableList;
 
 /**
  * Settings relating to monitoring of each server.
@@ -50,15 +50,47 @@ public static Builder builder() {
         return new Builder();
     }
 
+    /**
+     * Creates a builder instance.
+     *
+     * @param serverSettings existing ServerSettings to default the builder settings on.
+     * @return a builder
+     * @since 3.5
+     */
+    public static Builder builder(final ServerSettings serverSettings) {
+        return builder().applySettings(serverSettings);
+    }
+
     /**
      * A builder for the settings.
      */
     @NotThreadSafe
-    public static class Builder {
+    public static final class Builder {
         private long heartbeatFrequencyMS = 10000;
         private long minHeartbeatFrequencyMS = 500;
-        private final List<ServerListener> serverListeners = new ArrayList<ServerListener>();
-        private final List<ServerMonitorListener> serverMonitorListeners = new ArrayList<ServerMonitorListener>();
+        private List<ServerListener> serverListeners = new ArrayList<ServerListener>();
+        private List<ServerMonitorListener> serverMonitorListeners = new ArrayList<ServerMonitorListener>();
+
+        private Builder() {
+        }
+
+        /**
+         * Applies the serverSettings to the builder
+         *
+         * <p>Note: Overwrites all existing settings</p>
+         *
+         * @param serverSettings the serverSettings
+         * @return this
+         * @since 3.7
+         */
+        public Builder applySettings(final ServerSettings serverSettings) {
+            notNull("serverSettings", serverSettings);
+            heartbeatFrequencyMS = serverSettings.heartbeatFrequencyMS;
+            minHeartbeatFrequencyMS = serverSettings.minHeartbeatFrequencyMS;
+            serverListeners = new ArrayList<ServerListener>(serverSettings.serverListeners);
+            serverMonitorListeners = new ArrayList<ServerMonitorListener>(serverSettings.serverMonitorListeners);
+            return this;
+        }
 
         /**
          * Sets the frequency that the cluster monitor attempts to reach each server. The default value is 10 seconds.
@@ -112,15 +144,16 @@ public Builder addServerMonitorListener(final ServerMonitorListener serverMonito
         }
 
         /**
-         * Take the settings from the given ConnectionString and add them to the builder
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
          *
-         * @param connectionString a URI containing details of how to connect to MongoDB
+         * @param connectionString the connection string containing details of how to connect to MongoDB
          * @return this
          * @since 3.3
          */
         public Builder applyConnectionString(final ConnectionString connectionString) {
-            if (connectionString.getHeartbeatFrequency() != null) {
-                heartbeatFrequencyMS = connectionString.getHeartbeatFrequency();
+            Integer heartbeatFrequency = connectionString.getHeartbeatFrequency();
+            if (heartbeatFrequency != null) {
+                heartbeatFrequencyMS = heartbeatFrequency;
             }
             return this;
         }
@@ -163,7 +196,7 @@ public long getMinHeartbeatFrequency(final TimeUnit timeUnit) {
      * @since 3.3
      */
     public List<ServerListener> getServerListeners() {
-        return Collections.unmodifiableList(serverListeners);
+        return serverListeners;
     }
 
     /**
@@ -173,7 +206,7 @@ public List<ServerListener> getServerListeners() {
      * @since 3.3
      */
     public List<ServerMonitorListener> getServerMonitorListeners() {
-        return Collections.unmodifiableList(serverMonitorListeners);
+        return serverMonitorListeners;
     }
 
     @Override
@@ -226,7 +259,7 @@ public String toString() {
     ServerSettings(final Builder builder) {
         heartbeatFrequencyMS = builder.heartbeatFrequencyMS;
         minHeartbeatFrequencyMS = builder.minHeartbeatFrequencyMS;
-        serverListeners = builder.serverListeners;
-        serverMonitorListeners = builder.serverMonitorListeners;
+        serverListeners = unmodifiableList(builder.serverListeners);
+        serverMonitorListeners = unmodifiableList(builder.serverMonitorListeners);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/ServerType.java b/driver-core/src/main/com/mongodb/connection/ServerType.java
index 8f6c4a3191c..a39d9856b31 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerType.java
+++ b/driver-core/src/main/com/mongodb/connection/ServerType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/ServerVersion.java b/driver-core/src/main/com/mongodb/connection/ServerVersion.java
index ffcb3a7fdbc..a56f0b8ac7a 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerVersion.java
+++ b/driver-core/src/main/com/mongodb/connection/ServerVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 import static java.util.Arrays.asList;
 
 /**
- * Holds an array of three integers representing the server version, e.g. [2, 4, 1].
+ * Holds an array of three integers representing the server version, e.g. [3, 4, 1].
  *
  * @since 3.0
  */
diff --git a/driver-core/src/main/com/mongodb/connection/SingleServerCluster.java b/driver-core/src/main/com/mongodb/connection/SingleServerCluster.java
deleted file mode 100644
index ae075c14d2c..00000000000
--- a/driver-core/src/main/com/mongodb/connection/SingleServerCluster.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.ServerAddress;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import com.mongodb.event.ClusterDescriptionChangedEvent;
-import com.mongodb.event.ServerClosedEvent;
-import com.mongodb.event.ServerDescriptionChangedEvent;
-import com.mongodb.event.ServerListener;
-import com.mongodb.event.ServerOpeningEvent;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import static com.mongodb.assertions.Assertions.isTrue;
-import static java.lang.String.format;
-
-/**
- * This class needs to be final because we are leaking a reference to "this" from the constructor
- */
-final class SingleServerCluster extends BaseCluster {
-    private static final Logger LOGGER = Loggers.getLogger("cluster");
-
-    private final ClusterableServer server;
-
-    public SingleServerCluster(final ClusterId clusterId, final ClusterSettings settings, final ClusterableServerFactory serverFactory) {
-        super(clusterId, settings, serverFactory);
-        isTrue("one server in a direct cluster", settings.getHosts().size() == 1);
-        isTrue("connection mode is single", settings.getMode() == ClusterConnectionMode.SINGLE);
-
-        if (LOGGER.isInfoEnabled()) {
-            LOGGER.info(format("Cluster created with settings %s", settings.getShortDescription()));
-        }
-
-        // synchronized in the constructor because the change listener is re-entrant to this instance.
-        // In other words, we are leaking a reference to "this" from the constructor.
-        synchronized (this) {
-            this.server = createServer(settings.getHosts().get(0), new ServerListener() {
-                @Override
-                public void serverOpening(final ServerOpeningEvent event) {
-                }
-
-                @Override
-                public void serverClosed(final ServerClosedEvent event) {
-                }
-
-                @Override
-                public void serverDescriptionChanged(final ServerDescriptionChangedEvent event) {
-                    ServerDescription descriptionToPublish = event.getNewDescription();
-                    if (event.getNewDescription().isOk()) {
-                        if (getSettings().getRequiredClusterType() != ClusterType.UNKNOWN
-                            && getSettings().getRequiredClusterType() != event.getNewDescription().getClusterType()) {
-                            descriptionToPublish = null;
-                        } else if (getSettings().getRequiredClusterType() == ClusterType.REPLICA_SET
-                                   && getSettings().getRequiredReplicaSetName() != null) {
-                            if (!getSettings().getRequiredReplicaSetName().equals(event.getNewDescription().getSetName())) {
-                                descriptionToPublish = null;
-                            }
-                        }
-                    }
-                    publishDescription(descriptionToPublish);
-                }
-
-            });
-            publishDescription(server.getDescription());
-        }
-    }
-
-    @Override
-    protected void connect() {
-        server.connect();
-    }
-
-    private void publishDescription(final ServerDescription serverDescription) {
-        ClusterType clusterType = getSettings().getRequiredClusterType();
-        if (clusterType == ClusterType.UNKNOWN && serverDescription != null) {
-            clusterType = serverDescription.getClusterType();
-        }
-        ClusterDescription oldDescription = getCurrentDescription();
-        ClusterDescription description = new ClusterDescription(ClusterConnectionMode.SINGLE, clusterType,
-                                                                serverDescription == null ? Collections.<ServerDescription>emptyList()
-                                                                                          : Arrays.asList(serverDescription));
-
-        updateDescription(description);
-        fireChangeEvent(new ClusterDescriptionChangedEvent(getClusterId(), description,
-                oldDescription == null ? getInitialDescription() : oldDescription));
-    }
-
-    private ClusterDescription getInitialDescription() {
-        return new ClusterDescription(getSettings().getMode(), getSettings().getRequiredClusterType(),
-                Collections.<ServerDescription>emptyList());
-    }
-
-    @Override
-    protected ClusterableServer getServer(final ServerAddress serverAddress) {
-        isTrue("open", !isClosed());
-
-        return server;
-    }
-
-    @Override
-    public void close() {
-        if (!isClosed()) {
-            server.close();
-            super.close();
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/SocketChannelStream.java b/driver-core/src/main/com/mongodb/connection/SocketChannelStream.java
deleted file mode 100644
index 8361ccd768f..00000000000
--- a/driver-core/src/main/com/mongodb/connection/SocketChannelStream.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoSocketOpenException;
-import com.mongodb.MongoSocketReadException;
-import com.mongodb.ServerAddress;
-import org.bson.ByteBuf;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.isTrue;
-import static com.mongodb.assertions.Assertions.notNull;
-
-class SocketChannelStream implements Stream {
-    private final ServerAddress address;
-    private final SocketSettings settings;
-    private final SslSettings sslSettings;
-    private final BufferProvider bufferProvider;
-    private volatile SocketChannel socketChannel;
-    private volatile boolean isClosed;
-
-    public SocketChannelStream(final ServerAddress address, final SocketSettings settings, final SslSettings sslSettings,
-                               final BufferProvider bufferProvider) {
-        this.address = notNull("address", address);
-        this.settings = notNull("settings", settings);
-        this.sslSettings = notNull("sslSettings", sslSettings);
-        this.bufferProvider = notNull("bufferProvider", bufferProvider);
-    }
-
-    @Override
-    public void open() throws IOException {
-        try {
-            socketChannel = SocketChannel.open();
-            SocketStreamHelper.initialize(socketChannel.socket(), address, settings, sslSettings);
-        } catch (IOException e) {
-            close();
-            throw new MongoSocketOpenException("Exception opening socket", getAddress(), e);
-        }
-    }
-
-    @Override
-    public ByteBuf getBuffer(final int size) {
-        return bufferProvider.getBuffer(size);
-    }
-
-    @Override
-    public void write(final List<ByteBuf> buffers) throws IOException {
-        isTrue("open", !isClosed());
-
-        int totalSize = 0;
-        ByteBuffer[] byteBufferArray = new ByteBuffer[buffers.size()];
-        for (int i = 0; i < buffers.size(); i++) {
-            byteBufferArray[i] = buffers.get(i).asNIO();
-            totalSize += byteBufferArray[i].limit();
-        }
-
-        long bytesRead = 0;
-        while (bytesRead < totalSize) {
-            bytesRead += socketChannel.write(byteBufferArray);
-        }
-    }
-
-    @Override
-    public ByteBuf read(final int numBytes) throws IOException {
-        ByteBuf buffer = bufferProvider.getBuffer(numBytes);
-        isTrue("open", !isClosed());
-
-        int totalBytesRead = 0;
-        while (totalBytesRead < buffer.limit()) {
-            int bytesRead = socketChannel.read(buffer.asNIO());
-            if (bytesRead == -1) {
-                buffer.release();
-                throw new MongoSocketReadException("Prematurely reached end of stream", getAddress());
-            }
-            totalBytesRead += bytesRead;
-        }
-        return buffer.flip();
-    }
-
-    @Override
-    public void openAsync(final AsyncCompletionHandler<Void> handler) {
-        throw new UnsupportedOperationException(getClass() + " does not support asynchronous operations.");
-    }
-
-    @Override
-    public void writeAsync(final List<ByteBuf> buffers, final AsyncCompletionHandler<Void> handler) {
-        throw new UnsupportedOperationException(getClass() + " does not support asynchronous operations.");
-    }
-
-    @Override
-    public void readAsync(final int numBytes, final AsyncCompletionHandler<ByteBuf> handler) {
-        throw new UnsupportedOperationException(getClass() + " does not support asynchronous operations.");
-    }
-
-    @Override
-    public ServerAddress getAddress() {
-        return address;
-    }
-
-    /**
-     * Get the settings for this socket.
-     *
-     * @return the settings
-     */
-    SocketSettings getSettings() {
-        return settings;
-    }
-
-    @Override
-    public void close() {
-        try {
-            isClosed = true;
-            if (socketChannel != null) {
-                socketChannel.close();
-            }
-        } catch (IOException e) {
-            // ignore
-        }
-    }
-
-    @Override
-    public boolean isClosed() {
-        return isClosed;
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/SocketSettings.java b/driver-core/src/main/com/mongodb/connection/SocketSettings.java
index 566178c695f..b36b5e9a3f0 100644
--- a/driver-core/src/main/com/mongodb/connection/SocketSettings.java
+++ b/driver-core/src/main/com/mongodb/connection/SocketSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static com.mongodb.assertions.Assertions.notNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -44,16 +45,49 @@ public static Builder builder() {
         return new Builder();
     }
 
+    /**
+     * Creates a builder instance.
+     *
+     * @param socketSettings existing SocketSettings to default the builder settings on.
+     * @return a builder
+     * @since 3.7
+     */
+    public static Builder builder(final SocketSettings socketSettings) {
+        return builder().applySettings(socketSettings);
+    }
+
     /**
      * A builder for an instance of {@code SocketSettings}.
      */
-    public static class Builder {
+    public static final class Builder {
         private long connectTimeoutMS = 10000;
         private long readTimeoutMS;
-        private boolean keepAlive;
+        private boolean keepAlive = true;
         private int receiveBufferSize;
         private int sendBufferSize;
 
+        private Builder() {
+        }
+
+        /**
+         * Applies the socketSettings to the builder
+         *
+         * <p>Note: Overwrites all existing settings</p>
+         *
+         * @param socketSettings the socketSettings
+         * @return this
+         * @since 3.7
+         */
+        public Builder applySettings(final SocketSettings socketSettings) {
+            notNull("socketSettings", socketSettings);
+            connectTimeoutMS = socketSettings.connectTimeoutMS;
+            readTimeoutMS = socketSettings.readTimeoutMS;
+            keepAlive = socketSettings.keepAlive;
+            receiveBufferSize = socketSettings.receiveBufferSize;
+            sendBufferSize = socketSettings.sendBufferSize;
+            return this;
+        }
+
         /**
          * Sets the socket connect timeout.
          *
@@ -81,9 +115,13 @@ public Builder readTimeout(final int readTimeout, final TimeUnit timeUnit) {
         /**
          * Sets keep-alive.
          *
-         * @param keepAlive true if keep-alive should be enabled
+         * @param keepAlive false if keep-alive should be disabled
          * @return this
+         * @deprecated configuring keep-alive has been deprecated. It now defaults to true and disabling it is not recommended.
+         * @see <a href="https://docs.mongodb.com/manual/faq/diagnostics/#does-tcp-keepalive-time-affect-mongodb-deployments">
+         *     Does TCP keep-alive time affect MongoDB Deployments?</a>
          */
+        @Deprecated
         public Builder keepAlive(final boolean keepAlive) {
             this.keepAlive = keepAlive;
             return this;
@@ -112,20 +150,24 @@ public Builder sendBufferSize(final int sendBufferSize) {
         }
 
         /**
-         * Apply any socket settings specified in the connection string to this builder.
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
          *
-         * @param connectionString the connection string
+         * @param connectionString the connection string containing details of how to connect to MongoDB
          * @return this
          * @see com.mongodb.ConnectionString#getConnectTimeout()
          * @see com.mongodb.ConnectionString#getSocketTimeout()
          */
         public Builder applyConnectionString(final ConnectionString connectionString) {
-            if (connectionString.getConnectTimeout() != null) {
-                this.connectTimeout(connectionString.getConnectTimeout(), MILLISECONDS);
+            Integer connectTimeout = connectionString.getConnectTimeout();
+            if (connectTimeout != null) {
+                this.connectTimeout(connectTimeout, MILLISECONDS);
             }
-            if (connectionString.getSocketTimeout() != null) {
-                this.readTimeout(connectionString.getSocketTimeout(), MILLISECONDS);
+
+            Integer socketTimeout = connectionString.getSocketTimeout();
+            if (socketTimeout != null) {
+                this.readTimeout(socketTimeout, MILLISECONDS);
             }
+
             return this;
         }
 
@@ -159,10 +201,14 @@ public int getReadTimeout(final TimeUnit timeUnit) {
     }
 
     /**
-     * Gets whether keep-alive is enabled. Defaults to false.
+     * Gets whether keep-alive is enabled. Defaults to true.
      *
      * @return true if keep-alive is enabled.
+     * @deprecated configuring keep-alive has been deprecated. It now defaults to true and disabling it is not recommended.
+     * @see <a href="https://docs.mongodb.com/manual/faq/diagnostics/#does-tcp-keepalive-time-affect-mongodb-deployments">
+     *     Does TCP keep-alive time affect MongoDB Deployments?</a>
      */
+    @Deprecated
     public boolean isKeepAlive() {
         return keepAlive;
     }
diff --git a/driver-core/src/main/com/mongodb/connection/SocketStreamFactory.java b/driver-core/src/main/com/mongodb/connection/SocketStreamFactory.java
index 13435f26acc..d6685835cc8 100644
--- a/driver-core/src/main/com/mongodb/connection/SocketStreamFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/SocketStreamFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,16 @@
 
 package com.mongodb.connection;
 
+import com.mongodb.MongoClientException;
 import com.mongodb.ServerAddress;
+import com.mongodb.UnixServerAddress;
 import com.mongodb.internal.connection.PowerOfTwoBufferPool;
+import com.mongodb.internal.connection.SocketStream;
+import com.mongodb.internal.connection.UnixSocketChannelStream;
 
 import javax.net.SocketFactory;
-import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.SSLContext;
+import java.security.NoSuchAlgorithmException;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -61,17 +66,28 @@ public SocketStreamFactory(final SocketSettings settings, final SslSettings sslS
     @Override
     public Stream create(final ServerAddress serverAddress) {
         Stream stream;
-        if (socketFactory != null) {
-            stream = new SocketStream(serverAddress, settings, sslSettings, socketFactory, bufferProvider);
-        } else if (sslSettings.isEnabled()) {
-            stream = new SocketStream(serverAddress, settings, sslSettings, SSLSocketFactory.getDefault(), bufferProvider);
-        } else if (System.getProperty("org.mongodb.useSocket", "false").equals("true")) {
-            stream = new SocketStream(serverAddress, settings, sslSettings, SocketFactory.getDefault(), bufferProvider);
+        if (serverAddress instanceof UnixServerAddress) {
+            if (sslSettings.isEnabled()) {
+                throw new MongoClientException("Socket based connections do not support ssl");
+            }
+            stream = new UnixSocketChannelStream((UnixServerAddress) serverAddress, settings, sslSettings, bufferProvider);
         } else {
-            stream = new SocketChannelStream(serverAddress, settings, sslSettings, bufferProvider);
+            if (socketFactory != null) {
+                stream = new SocketStream(serverAddress, settings, sslSettings, socketFactory, bufferProvider);
+            } else if (sslSettings.isEnabled()) {
+                stream = new SocketStream(serverAddress, settings, sslSettings, getSslContext().getSocketFactory(), bufferProvider);
+            } else {
+                stream = new SocketStream(serverAddress, settings, sslSettings, SocketFactory.getDefault(), bufferProvider);
+            }
         }
-
         return stream;
     }
 
+    private SSLContext getSslContext() {
+        try {
+            return (sslSettings.getContext() == null) ? SSLContext.getDefault() : sslSettings.getContext();
+        } catch (NoSuchAlgorithmException e) {
+            throw new MongoClientException("Unable to create default SSLContext", e);
+        }
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/SocketStreamHelper.java b/driver-core/src/main/com/mongodb/connection/SocketStreamHelper.java
deleted file mode 100644
index 81e9e0bafd2..00000000000
--- a/driver-core/src/main/com/mongodb/connection/SocketStreamHelper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoInternalException;
-import com.mongodb.ServerAddress;
-
-import javax.net.ssl.SSLSocket;
-import java.io.IOException;
-import java.net.Socket;
-
-import static com.mongodb.internal.connection.SslHelper.enableHostNameVerification;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-final class SocketStreamHelper {
-    static void initialize(final Socket socket, final ServerAddress address, final SocketSettings settings, final SslSettings sslSettings)
-    throws IOException {
-        socket.setTcpNoDelay(true);
-        socket.setSoTimeout(settings.getReadTimeout(MILLISECONDS));
-        socket.setKeepAlive(settings.isKeepAlive());
-        if (settings.getReceiveBufferSize() > 0) {
-            socket.setReceiveBufferSize(settings.getReceiveBufferSize());
-        }
-        if (settings.getSendBufferSize() > 0) {
-            socket.setSendBufferSize(settings.getSendBufferSize());
-        }
-        if (sslSettings.isEnabled()) {
-            if (!(socket instanceof SSLSocket)) {
-                throw new MongoInternalException("SSL is enabled but the socket is not an instance of javax.net.ssl.SSLSocket");
-            }
-            if (!sslSettings.isInvalidHostNameAllowed()) {
-                SSLSocket sslSocket = (SSLSocket) socket;
-                sslSocket.setSSLParameters(enableHostNameVerification(sslSocket.getSSLParameters()));
-            }
-        }
-        socket.connect(address.getSocketAddress(), settings.getConnectTimeout(MILLISECONDS));
-    }
-
-    private SocketStreamHelper() {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/SplittablePayload.java b/driver-core/src/main/com/mongodb/connection/SplittablePayload.java
new file mode 100644
index 00000000000..ac224ee9541
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/connection/SplittablePayload.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.connection;
+
+import org.bson.BsonDocument;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.connection.SplittablePayload.Type.INSERT;
+import static com.mongodb.connection.SplittablePayload.Type.REPLACE;
+import static com.mongodb.connection.SplittablePayload.Type.UPDATE;
+
+/**
+ * A Splittable payload for write commands.
+ *
+ * <p>The command will consume as much of the payload as possible. The {@link #hasAnotherSplit()} method will return true if there is
+ * another split to consume, {@link #getNextSplit} method will return the next SplittablePayload.</p>
+ *
+ * @see com.mongodb.connection.Connection#command(String, org.bson.BsonDocument, org.bson.FieldNameValidator, com.mongodb.ReadPreference,
+ * org.bson.codecs.Decoder, com.mongodb.session.SessionContext, boolean, com.mongodb.connection.SplittablePayload,
+ * org.bson.FieldNameValidator)
+ * @see com.mongodb.connection.AsyncConnection#commandAsync(String, org.bson.BsonDocument, org.bson.FieldNameValidator,
+ * com.mongodb.ReadPreference, org.bson.codecs.Decoder, com.mongodb.session.SessionContext, boolean,
+ * com.mongodb.connection.SplittablePayload, org.bson.FieldNameValidator, com.mongodb.async.SingleResultCallback)
+ * @since 3.6
+ */
+@Deprecated
+public final class SplittablePayload {
+    private final Type payloadType;
+    private final List<BsonDocument> payload;
+    private int position = 0;
+
+    /**
+     * The type of the payload.
+     */
+    public enum Type {
+        /**
+         * An insert.
+         */
+        INSERT,
+
+        /**
+         * An update that uses update operators.
+         */
+        UPDATE,
+
+        /**
+         * An update that replaces the existing document.
+         */
+        REPLACE,
+
+        /**
+         * A delete.
+         */
+        DELETE
+    }
+
+    /**
+     * Create a new instance
+     *
+     * @param payloadType the payload type
+     * @param payload the payload
+     */
+    public SplittablePayload(final Type payloadType, final List<BsonDocument> payload) {
+        this.payloadType = notNull("batchType", payloadType);
+        this.payload = notNull("payload", payload);
+    }
+
+    /**
+     * @return the payload type
+     */
+    public Type getPayloadType() {
+        return payloadType;
+    }
+
+    /**
+     * @return the payload name
+     */
+    public String getPayloadName() {
+        if (payloadType == INSERT) {
+            return "documents";
+        } else if (payloadType == UPDATE || payloadType == REPLACE) {
+            return "updates";
+        } else {
+            return "deletes";
+        }
+    }
+
+    /**
+     * @return the payload
+     */
+    public List<BsonDocument> getPayload() {
+        return payload;
+    }
+
+    /**
+     * @return the current position in the payload
+     */
+    public int getPosition() {
+        return position;
+    }
+
+    /**
+     * Sets the current position in the payload
+     * @param position the position
+     */
+    public void setPosition(final int position) {
+        this.position = position;
+    }
+
+    /**
+     * @return true if there are more values after the current position
+     */
+    public boolean hasAnotherSplit() {
+        return payload.size() > position;
+    }
+
+    /**
+     * @return a new SplittablePayload containing only the values after the current position.
+     */
+    public SplittablePayload getNextSplit() {
+        isTrue("hasAnotherSplit", hasAnotherSplit());
+        List<BsonDocument> nextPayLoad = payload.subList(position, payload.size());
+        return new SplittablePayload(payloadType, nextPayLoad);
+    }
+
+    /**
+     * @return true if the payload is empty
+     */
+    public boolean isEmpty() {
+        return payload.isEmpty();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/SslSettings.java b/driver-core/src/main/com/mongodb/connection/SslSettings.java
index 830e27d05e3..8cc5f173394 100644
--- a/driver-core/src/main/com/mongodb/connection/SslSettings.java
+++ b/driver-core/src/main/com/mongodb/connection/SslSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,10 @@
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
 
+import javax.net.ssl.SSLContext;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
 /**
  * Settings for connecting to MongoDB via SSL.
  *
@@ -30,6 +34,7 @@
 public class SslSettings {
     private final boolean enabled;
     private final boolean invalidHostNameAllowed;
+    private final SSLContext context;
 
     /**
      * Gets a Builder for creating a new SSLSettings instance.
@@ -40,13 +45,45 @@ public static Builder builder() {
         return new Builder();
     }
 
+    /**
+     * Creates a builder instance.
+     *
+     * @param sslSettings existing SslSettings to default the builder settings on.
+     * @return a builder
+     * @since 3.7
+     */
+    public static Builder builder(final SslSettings sslSettings) {
+        return builder().applySettings(sslSettings);
+    }
+
     /**
      * A builder for creating SSLSettings.
      */
     @NotThreadSafe
-    public static class Builder {
+    public static final class Builder {
         private boolean enabled;
         private boolean invalidHostNameAllowed;
+        private SSLContext context;
+
+        private Builder(){
+        }
+
+        /**
+         * Applies the sslSettings to the builder
+         *
+         * <p>Note: Overwrites all existing settings</p>
+         *
+         * @param sslSettings the sslSettings
+         * @return this
+         * @since 3.7
+         */
+        public Builder applySettings(final SslSettings sslSettings) {
+            notNull("sslSettings", sslSettings);
+            enabled = sslSettings.enabled;
+            invalidHostNameAllowed = sslSettings.invalidHostNameAllowed;
+            context = sslSettings.context;
+            return this;
+        }
 
         /**
          * Define whether SSL should be enabled.
@@ -72,18 +109,34 @@ public Builder invalidHostNameAllowed(final boolean invalidHostNameAllowed) {
         }
 
         /**
-         * Take the settings from the given ConnectionString and set them in this builder.
+         * Sets the SSLContext for use when SSL is enabled.
          *
-         * @param connectionString a URI with details on how to connect to MongoDB.
+         * @param context the SSLContext to use for connections.  Ignored if SSL is not enabled.
+         * @return this
+         * @since 3.5
+         */
+        public Builder context(final SSLContext context) {
+            this.context = context;
+            return this;
+        }
+
+        /**
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
+         *
+         * @param connectionString the connection string containing details of how to connect to MongoDB
          * @return this
          */
         public Builder applyConnectionString(final ConnectionString connectionString) {
-            if (connectionString.getSslEnabled() != null) {
-                this.enabled = connectionString.getSslEnabled();
+            Boolean sslEnabled = connectionString.getSslEnabled();
+            if (sslEnabled != null) {
+                this.enabled = sslEnabled;
             }
-            if (connectionString.getSslInvalidHostnameAllowed() != null) {
-                this.invalidHostNameAllowed = connectionString.getSslInvalidHostnameAllowed();
+
+            Boolean sslInvalidHostnameAllowed = connectionString.getSslInvalidHostnameAllowed();
+            if (sslInvalidHostnameAllowed != null) {
+                this.invalidHostNameAllowed = sslInvalidHostnameAllowed;
             }
+
             return this;
         }
 
@@ -118,16 +171,27 @@ public boolean isInvalidHostNameAllowed() {
         return invalidHostNameAllowed;
     }
 
+    /**
+     * Gets the SSLContext configured for use with SSL connections.
+     *
+     * @return the SSLContext, which defaults to null if not configured.  In that case {@code SSLContext.getDefault()} will be used if SSL
+     * is enabled.
+     * @since 3.5
+     * @see SSLContext#getDefault()
+     */
+    public SSLContext getContext() {
+        return context;
+    }
+
     SslSettings(final Builder builder) {
         enabled = builder.enabled;
         invalidHostNameAllowed = builder.invalidHostNameAllowed;
-        if (enabled && !invalidHostNameAllowed) {
-            if (System.getProperty("java.version").startsWith("1.6.")) {
-                throw new MongoInternalException("By default, SSL connections are only supported on Java 7 or later.  If the application "
-                                                 + "must run on Java 6, you must set the SslSettings.invalidHostNameAllowed property to "
-                                                 + "false");
-            }
+        if (enabled && !invalidHostNameAllowed && System.getProperty("java.version").startsWith("1.6.")) {
+            throw new MongoInternalException("By default, SSL connections are only supported on Java 7 or later.  If the application "
+                                             + "must run on Java 6, you must set the SslSettings.invalidHostNameAllowed property to "
+                                             + "true");
         }
+        context = builder.context;
     }
 
     @Override
@@ -147,14 +211,14 @@ public boolean equals(final Object o) {
         if (invalidHostNameAllowed != that.invalidHostNameAllowed) {
             return false;
         }
-
-        return true;
+        return context != null ? context.equals(that.context) : that.context == null;
     }
 
     @Override
     public int hashCode() {
         int result = (enabled ? 1 : 0);
         result = 31 * result + (invalidHostNameAllowed ? 1 : 0);
+        result = 31 * result + (context != null ? context.hashCode() : 0);
         return result;
     }
 
@@ -163,6 +227,7 @@ public String toString() {
         return "SslSettings{"
                + "enabled=" + enabled
                + ", invalidHostNameAllowed=" + invalidHostNameAllowed
+               + ", context=" + context
                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/connection/Stream.java b/driver-core/src/main/com/mongodb/connection/Stream.java
index dbdb911610b..10128b8a859 100644
--- a/driver-core/src/main/com/mongodb/connection/Stream.java
+++ b/driver-core/src/main/com/mongodb/connection/Stream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/StreamFactory.java b/driver-core/src/main/com/mongodb/connection/StreamFactory.java
index 52ce1e5db6a..0f97a44efe1 100644
--- a/driver-core/src/main/com/mongodb/connection/StreamFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/StreamFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/StreamFactoryFactory.java b/driver-core/src/main/com/mongodb/connection/StreamFactoryFactory.java
index b529fb1d543..7b8f4ffc72c 100644
--- a/driver-core/src/main/com/mongodb/connection/StreamFactoryFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/StreamFactoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java b/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java
new file mode 100644
index 00000000000..10cca7783a9
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/connection/TlsChannelStreamFactoryFactory.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.connection;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoSocketOpenException;
+import com.mongodb.ServerAddress;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.connection.AsynchronousChannelStream;
+import com.mongodb.internal.connection.ConcurrentLinkedDeque;
+import com.mongodb.internal.connection.PowerOfTwoBufferPool;
+import com.mongodb.internal.connection.tlschannel.BufferAllocator;
+import com.mongodb.internal.connection.tlschannel.ClientTlsChannel;
+import com.mongodb.internal.connection.tlschannel.TlsChannel;
+import com.mongodb.internal.connection.tlschannel.async.AsynchronousTlsChannel;
+import com.mongodb.internal.connection.tlschannel.async.AsynchronousTlsChannelGroup;
+import org.bson.ByteBuf;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.StandardSocketOptions;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
+import java.security.NoSuchAlgorithmException;
+import java.util.Iterator;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.internal.connection.SslHelper.enableHostNameVerification;
+import static com.mongodb.internal.connection.SslHelper.enableSni;
+
+/**
+ * A {@code StreamFactoryFactory} that supports TLS/SSL.  The implementation supports asynchronous usage.
+ * <p>
+ * Requires Java 8
+ * </p>
+ *
+ * @since 3.10
+ */
+public class TlsChannelStreamFactoryFactory implements StreamFactoryFactory, Closeable {
+
+    private static final Logger LOGGER = Loggers.getLogger("connection.tls");
+
+    private final SelectorMonitor selectorMonitor;
+    private final AsynchronousTlsChannelGroup group;
+    private final boolean ownsGroup;
+    private final PowerOfTwoBufferPool bufferPool = new PowerOfTwoBufferPool();
+
+    /**
+     * Construct a new instance
+     */
+    public TlsChannelStreamFactoryFactory() {
+        this(new AsynchronousTlsChannelGroup(), true);
+    }
+
+    /**
+     * Construct a new instance with the given {@code AsynchronousTlsChannelGroup}.  Callers are required to close the provided group
+     * in order to free up resources.
+     *
+     * @param group the group
+     * @deprecated Prefer {@link #TlsChannelStreamFactoryFactory()}
+     */
+    @Deprecated
+    public TlsChannelStreamFactoryFactory(final AsynchronousTlsChannelGroup group) {
+        this(group, false);
+    }
+
+    private TlsChannelStreamFactoryFactory(final AsynchronousTlsChannelGroup group, final boolean ownsGroup) {
+        this.group = group;
+        this.ownsGroup = ownsGroup;
+        selectorMonitor = new SelectorMonitor();
+        selectorMonitor.start();
+    }
+
+    @Override
+    public StreamFactory create(final SocketSettings socketSettings, final SslSettings sslSettings) {
+        return new StreamFactory() {
+            @Override
+            public Stream create(final ServerAddress serverAddress) {
+                return new TlsChannelStream(serverAddress, socketSettings, sslSettings, bufferPool, group, selectorMonitor);
+            }
+        };
+    }
+
+    @Override
+    public void close() {
+        selectorMonitor.close();
+        if (ownsGroup) {
+            group.shutdown();
+        }
+    }
+
+    private static class SelectorMonitor implements Closeable {
+
+        private static final class Pair {
+            private final SocketChannel socketChannel;
+            private final Runnable attachment;
+
+            private Pair(final SocketChannel socketChannel, final Runnable attachment) {
+                this.socketChannel = socketChannel;
+                this.attachment = attachment;
+            }
+        }
+
+        private final Selector selector;
+        private volatile boolean isClosed;
+        private final ConcurrentLinkedDeque<Pair> pendingRegistrations = new ConcurrentLinkedDeque<Pair>();
+
+        SelectorMonitor() {
+            try {
+                this.selector = Selector.open();
+            } catch (IOException e) {
+                throw new MongoClientException("Exception opening Selector", e);
+            }
+        }
+
+        void start() {
+            Thread selectorThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        while (!isClosed) {
+                            try {
+                                selector.select();
+
+                                for (SelectionKey selectionKey : selector.selectedKeys()) {
+                                    selectionKey.cancel();
+                                    Runnable runnable = (Runnable) selectionKey.attachment();
+                                    runnable.run();
+                                }
+
+                                for (Iterator<Pair> iter = pendingRegistrations.iterator(); iter.hasNext();) {
+                                    Pair pendingRegistration = iter.next();
+                                    pendingRegistration.socketChannel.register(selector, SelectionKey.OP_CONNECT,
+                                            pendingRegistration.attachment);
+                                    iter.remove();
+                                }
+                            } catch (IOException e) {
+                                LOGGER.warn("Exception in selector loop", e);
+                            } catch (RuntimeException e) {
+                                LOGGER.warn("Exception in selector loop", e);
+                            }
+                        }
+                    } finally {
+                        try {
+                            selector.close();
+                        } catch (IOException e) {
+                            // ignore
+                        }
+                    }
+                }
+            });
+            selectorThread.setDaemon(true);
+            selectorThread.start();
+        }
+
+        void register(final SocketChannel channel, final Runnable attachment) {
+            pendingRegistrations.add(new Pair(channel, attachment));
+            selector.wakeup();
+        }
+
+        @Override
+        public void close() {
+            isClosed = true;
+            selector.wakeup();
+        }
+    }
+
+    private static class TlsChannelStream extends AsynchronousChannelStream implements Stream {
+
+        private final AsynchronousTlsChannelGroup group;
+        private final SelectorMonitor selectorMonitor;
+        private final SslSettings sslSettings;
+
+        TlsChannelStream(final ServerAddress serverAddress, final SocketSettings settings, final SslSettings sslSettings,
+                         final BufferProvider bufferProvider, final AsynchronousTlsChannelGroup group,
+                         final SelectorMonitor selectorMonitor) {
+            super(serverAddress, settings, bufferProvider);
+            this.sslSettings = sslSettings;
+            this.group = group;
+            this.selectorMonitor = selectorMonitor;
+        }
+
+        @Override
+        public void openAsync(final AsyncCompletionHandler<Void> handler) {
+            isTrue("unopened", getChannel() == null);
+            try {
+                final SocketChannel socketChannel = SocketChannel.open();
+                socketChannel.configureBlocking(false);
+
+                socketChannel.setOption(StandardSocketOptions.TCP_NODELAY, true);
+                socketChannel.setOption(StandardSocketOptions.SO_KEEPALIVE, true);
+                if (getSettings().getReceiveBufferSize() > 0) {
+                    socketChannel.setOption(StandardSocketOptions.SO_RCVBUF, getSettings().getReceiveBufferSize());
+                }
+                if (getSettings().getSendBufferSize() > 0) {
+                    socketChannel.setOption(StandardSocketOptions.SO_SNDBUF, getSettings().getSendBufferSize());
+                }
+
+                socketChannel.connect(getServerAddress().getSocketAddress());
+
+                selectorMonitor.register(socketChannel, new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            if (!socketChannel.finishConnect()) {
+                                throw new MongoSocketOpenException("Failed to finish connect", getServerAddress());
+                            }
+
+                            SSLEngine sslEngine = getSslContext().createSSLEngine(getServerAddress().getHost(),
+                                    getServerAddress().getPort());
+                            sslEngine.setUseClientMode(true);
+
+                            SSLParameters sslParameters = sslEngine.getSSLParameters();
+                            enableSni(getServerAddress().getHost(), sslParameters);
+
+                            if (!sslSettings.isInvalidHostNameAllowed()) {
+                                enableHostNameVerification(sslParameters);
+                            }
+                            sslEngine.setSSLParameters(sslParameters);
+
+                            BufferAllocator bufferAllocator = new BufferProviderAllocator();
+
+                            TlsChannel tlsChannel = ClientTlsChannel.newBuilder(socketChannel, sslEngine)
+                                    .withEncryptedBufferAllocator(bufferAllocator)
+                                    .withPlainBufferAllocator(bufferAllocator)
+                                    .build();
+
+                            // build asynchronous channel, based in the TLS channel and associated with the global group.
+                            setChannel(new AsynchronousTlsChannel(group, tlsChannel, socketChannel));
+
+                            handler.completed(null);
+                        } catch (IOException e) {
+                            handler.failed(new MongoSocketOpenException("Exception opening socket", getServerAddress(), e));
+                        } catch (Throwable t) {
+                            handler.failed(t);
+                        }
+                    }
+                });
+            } catch (IOException e) {
+                handler.failed(new MongoSocketOpenException("Exception opening socket", getServerAddress(), e));
+            } catch (Throwable t) {
+                handler.failed(t);
+            }
+        }
+
+        private SSLContext getSslContext() {
+            try {
+                return (sslSettings.getContext() == null) ? SSLContext.getDefault() : sslSettings.getContext();
+            } catch (NoSuchAlgorithmException e) {
+                throw new MongoClientException("Unable to create default SSLContext", e);
+            }
+        }
+
+        private class BufferProviderAllocator implements BufferAllocator {
+            @Override
+            public ByteBuf allocate(final int size) {
+                return getBufferProvider().getBuffer(size);
+            }
+
+            @Override
+            public void free(final ByteBuf buffer) {
+                buffer.release();
+            }
+        }
+    }
+}
+
diff --git a/driver-core/src/main/com/mongodb/connection/UpdateCommandMessage.java b/driver-core/src/main/com/mongodb/connection/UpdateCommandMessage.java
deleted file mode 100644
index 115af58e280..00000000000
--- a/driver-core/src/main/com/mongodb/connection/UpdateCommandMessage.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.bulk.WriteRequest;
-import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
-import com.mongodb.internal.validator.MappedFieldNameValidator;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import com.mongodb.internal.validator.UpdateFieldNameValidator;
-import org.bson.BsonBinaryWriter;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.EncoderContext;
-import org.bson.io.BsonOutput;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A message for the update command.
- *
- * @mongodb.driver.manual reference/command/insert/#dbcmd.update Update Command
- */
-class UpdateCommandMessage extends BaseWriteCommandMessage {
-    private final List<UpdateRequest> updates;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace the namespace
-     * @param ordered whether the writes are ordered
-     * @param writeConcern the write concern
-     * @param settings the message settings
-     * @param updates the list of update requests
-     */
-    public UpdateCommandMessage(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                final Boolean bypassDocumentValidation, final MessageSettings settings, final List<UpdateRequest> updates) {
-        super(namespace, ordered, writeConcern, bypassDocumentValidation, settings);
-        this.updates = updates;
-    }
-
-    /**
-     * Gets the update requests.
-     *
-     * @return the list of update requests
-     */
-    public List<UpdateRequest> getRequests() {
-        return Collections.unmodifiableList(updates);
-    }
-
-    @Override
-    protected UpdateCommandMessage writeTheWrites(final BsonOutput bsonOutput, final int commandStartPosition,
-                                                  final BsonBinaryWriter writer) {
-        UpdateCommandMessage nextMessage = null;
-        writer.writeStartArray("updates");
-        for (int i = 0; i < updates.size(); i++) {
-            writer.mark();
-            UpdateRequest update = updates.get(i);
-            writer.writeStartDocument();
-            writer.pushMaxDocumentSize(getSettings().getMaxDocumentSize());
-            writer.writeName("q");
-            getCodec(update.getFilter()).encode(writer, update.getFilter(), EncoderContext.builder().build());
-            writer.writeName("u");
-
-            int bufferPosition = bsonOutput.getPosition();
-            getCodec(update.getUpdate()).encode(writer, update.getUpdate(), EncoderContext.builder().build());
-            if (update.getType() == WriteRequest.Type.UPDATE && bsonOutput.getPosition() == bufferPosition + 8) {
-                throw new IllegalArgumentException("Invalid BSON document for an update");
-            }
-
-            if (update.isMulti()) {
-                writer.writeBoolean("multi", update.isMulti());
-            }
-            if (update.isUpsert()) {
-                writer.writeBoolean("upsert", update.isUpsert());
-            }
-            writer.popMaxDocumentSize();
-            writer.writeEndDocument();
-            if (exceedsLimits(bsonOutput.getPosition() - commandStartPosition, i + 1)) {
-                writer.reset();
-                nextMessage = new UpdateCommandMessage(getWriteNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(),
-                                                       getSettings(), updates.subList(i, updates.size()));
-                break;
-            }
-        }
-        writer.writeEndArray();
-        return nextMessage;
-    }
-
-    @Override
-    public int getItemCount() {
-        return updates.size();
-    }
-
-    @Override
-    protected FieldNameValidator getFieldNameValidator() {
-        Map<String, FieldNameValidator> rootMap = new HashMap<String, FieldNameValidator>();
-        rootMap.put("updates", new UpdatesValidator());
-
-        return new MappedFieldNameValidator(new NoOpFieldNameValidator(), rootMap);
-    }
-
-    @Override
-    protected String getCommandName() {
-        return "update";
-    }
-
-    private class UpdatesValidator implements FieldNameValidator {
-        private int i = 0;
-
-        @Override
-        public boolean validate(final String fieldName) {
-            return true;
-        }
-
-        @Override
-        public FieldNameValidator getValidatorForField(final String fieldName) {
-            if (!fieldName.equals("u")) {
-                return new NoOpFieldNameValidator();
-            }
-
-            UpdateRequest updateRequest = getRequests().get(i);
-            i++;
-
-            if (updateRequest.getType() == WriteRequest.Type.REPLACE) {
-                return new CollectibleDocumentFieldNameValidator();
-            } else {
-                return new UpdateFieldNameValidator();
-            }
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/UpdateCommandProtocol.java b/driver-core/src/main/com/mongodb/connection/UpdateCommandProtocol.java
deleted file mode 100644
index 312d6d85258..00000000000
--- a/driver-core/src/main/com/mongodb/connection/UpdateCommandProtocol.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.bulk.WriteRequest;
-import com.mongodb.diagnostics.logging.Loggers;
-
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.lang.String.format;
-
-/**
- * An implementation of the update command.
- *
- * @mongodb.driver.manual reference/command/insert/#dbcmd.update Update Command
- */
-class UpdateCommandProtocol extends WriteCommandProtocol {
-
-    private static final com.mongodb.diagnostics.logging.Logger LOGGER = Loggers.getLogger("protocol.update");
-
-    private final List<UpdateRequest> updates;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace                 the namespace
-     * @param ordered                   whether the inserts are ordered
-     * @param writeConcern              the write concern
-     * @param bypassDocumentValidation  the bypass documentation validation flag
-     * @param updates                   the list of updates
-     */
-    public UpdateCommandProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                 final Boolean bypassDocumentValidation, final List<UpdateRequest> updates) {
-        super(namespace, ordered, writeConcern, bypassDocumentValidation);
-        this.updates = notNull("update", updates);
-    }
-
-    @Override
-    public BulkWriteResult execute(final InternalConnection connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(format("Updating documents in namespace %s on connection [%s] to server %s", getNamespace(),
-                                connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-        }
-        BulkWriteResult writeResult = super.execute(connection);
-        LOGGER.debug("Update completed");
-        return writeResult;
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-        try {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Asynchronously updating documents in namespace %s on connection [%s] to server %s", getNamespace(),
-                                    connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-            }
-            super.executeAsync(connection, new SingleResultCallback<BulkWriteResult>() {
-                @Override
-                public void onResult(final BulkWriteResult result, final Throwable t) {
-                    if (t != null) {
-                        callback.onResult(null, t);
-                    } else {
-                        LOGGER.debug("Asynchronous update completed");
-                        callback.onResult(result, null);
-                    }
-                }
-            });
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-        }
-    }
-
-    @Override
-    protected WriteRequest.Type getType() {
-        return WriteRequest.Type.UPDATE;
-    }
-
-    @Override
-    protected UpdateCommandMessage createRequestMessage(final MessageSettings messageSettings) {
-        return new UpdateCommandMessage(getNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(), messageSettings,
-                updates);
-    }
-
-    @Override
-    protected com.mongodb.diagnostics.logging.Logger getLogger() {
-        return LOGGER;
-    }
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/UpdateMessage.java b/driver-core/src/main/com/mongodb/connection/UpdateMessage.java
deleted file mode 100644
index 879971e3874..00000000000
--- a/driver-core/src/main/com/mongodb/connection/UpdateMessage.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
-import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import com.mongodb.internal.validator.UpdateFieldNameValidator;
-import org.bson.io.BsonOutput;
-
-import java.util.List;
-
-import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
-
-/**
- * An OP_UPDATE message.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-update OP_UPDATE
- */
-class UpdateMessage extends RequestMessage {
-    private final List<UpdateRequest> updates;
-
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection name
-     * @param updates the list of update requests
-     * @param settings the message settings
-     */
-    public UpdateMessage(final String collectionName, final List<UpdateRequest> updates, final MessageSettings settings) {
-        super(collectionName, OpCode.OP_UPDATE, settings);
-        this.updates = updates;
-    }
-
-    public List<UpdateRequest> getUpdateRequests() {
-        return updates;
-    }
-
-    @Override
-    protected RequestMessage encodeMessageBody(final BsonOutput bsonOutput, final int messageStartPosition) {
-        return encodeMessageBodyWithMetadata(bsonOutput, messageStartPosition).getNextMessage();
-    }
-
-    @Override
-    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final int messageStartPosition) {
-        bsonOutput.writeInt32(0); // reserved
-        bsonOutput.writeCString(getCollectionName());
-
-        UpdateRequest updateRequest = updates.get(0);
-        int flags = 0;
-        if (updateRequest.isUpsert()) {
-            flags |= 1;
-        }
-        if (updateRequest.isMulti()) {
-            flags |= 2;
-        }
-        bsonOutput.writeInt32(flags);
-
-        int firstDocumentStartPosition = bsonOutput.getPosition();
-
-        addDocument(updateRequest.getFilter(), bsonOutput, new NoOpFieldNameValidator());
-        if (updateRequest.getType() == REPLACE) {
-            addCollectibleDocument(updateRequest.getUpdate(), bsonOutput, new CollectibleDocumentFieldNameValidator());
-        } else {
-            int bufferPosition = bsonOutput.getPosition();
-            addDocument(updateRequest.getUpdate(), bsonOutput, new UpdateFieldNameValidator());
-            if (bsonOutput.getPosition() == bufferPosition + 5) {
-                throw new IllegalArgumentException("Invalid BSON document for an update");
-            }
-        }
-
-        if (updates.size() == 1) {
-            return new EncodingMetadata(null, firstDocumentStartPosition);
-        } else {
-            return new EncodingMetadata(new UpdateMessage(getCollectionName(), updates.subList(1, updates.size()), getSettings()),
-                                    firstDocumentStartPosition);
-        }
-    }
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/UpdateProtocol.java b/driver-core/src/main/com/mongodb/connection/UpdateProtocol.java
deleted file mode 100644
index c54bc7cc85f..00000000000
--- a/driver-core/src/main/com/mongodb/connection/UpdateProtocol.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.diagnostics.logging.Loggers;
-import org.bson.BsonArray;
-import org.bson.BsonBoolean;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonValue;
-
-import java.util.List;
-
-import static java.lang.String.format;
-import static java.util.Collections.singletonList;
-
-/**
- * An implementation of the MongoDB OP_UPDATE wire protocol.
- *
- * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-update OP_UPDATE
- */
-class UpdateProtocol extends WriteProtocol {
-    private static final com.mongodb.diagnostics.logging.Logger LOGGER = Loggers.getLogger("protocol.update");
-
-    private final List<UpdateRequest> updates;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the delete are ordered
-     * @param writeConcern the write concern to apply
-     * @param updates      the updates
-     */
-    public UpdateProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                          final List<UpdateRequest> updates) {
-        super(namespace, ordered, writeConcern);
-        this.updates = updates;
-    }
-
-    @Override
-    public WriteConcernResult execute(final InternalConnection connection) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(format("Updating documents in namespace %s on connection [%s] to server %s", getNamespace(),
-                                connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-        }
-        WriteConcernResult writeConcernResult = super.execute(connection);
-        LOGGER.debug("Update completed");
-        return writeConcernResult;
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
-        try {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(format("Asynchronously updating documents in namespace %s on connection [%s] to server %s", getNamespace(),
-                                    connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
-            }
-            super.executeAsync(connection, new SingleResultCallback<WriteConcernResult>() {
-                @Override
-                public void onResult(final WriteConcernResult result, final Throwable t) {
-                    if (t != null) {
-                        callback.onResult(null, t);
-                    } else {
-                        LOGGER.debug("Asynchronous update completed");
-                        callback.onResult(result, null);
-                    }
-                }
-            });
-        } catch (Throwable t) {
-            callback.onResult(null, t);
-        }
-    }
-
-    @Override
-    protected BsonDocument getAsWriteCommand(final ByteBufferBsonOutput bsonOutput, final int firstDocumentPosition) {
-        List<ByteBufBsonDocument> documents = ByteBufBsonDocument.create(bsonOutput, firstDocumentPosition);
-        BsonDocument updateDocument = new BsonDocument("q", documents.get(0)).append("u", documents.get(1));
-        if (updates.get(0).isMulti()) {
-            updateDocument.append("multi", BsonBoolean.TRUE);
-        }
-        if (updates.get(0).isUpsert()) {
-            updateDocument.append("upsert", BsonBoolean.TRUE);
-        }
-        return getBaseCommandDocument("update").append("updates", new BsonArray(singletonList(updateDocument)));
-    }
-
-
-    @Override
-    protected RequestMessage createRequestMessage(final MessageSettings settings) {
-        return new UpdateMessage(getNamespace().getFullName(), updates, settings);
-    }
-
-    @Override
-    protected void appendToWriteCommandResponseDocument(final RequestMessage curMessage, final RequestMessage nextMessage,
-                                                        final WriteConcernResult writeConcernResult, final BsonDocument response) {
-        response.append("n", new BsonInt32(writeConcernResult.getCount()));
-
-        UpdateMessage updateMessage = (UpdateMessage) curMessage;
-        UpdateRequest updateRequest = updateMessage.getUpdateRequests().get(0);
-        BsonValue upsertedId = null;
-        if (writeConcernResult.getUpsertedId() != null) {
-            upsertedId = writeConcernResult.getUpsertedId();
-        } else if (!writeConcernResult.isUpdateOfExisting() && updateRequest.isUpsert()) {
-            if (updateRequest.getUpdate().containsKey("_id")) {
-                upsertedId = updateRequest.getUpdate().get("_id");
-            } else if (updateRequest.getFilter().containsKey("_id")) {
-                upsertedId = updateRequest.getFilter().get("_id");
-            }
-        }
-        if (upsertedId != null) {
-            response.append("upserted", new BsonArray(singletonList(new BsonDocument("index", new BsonInt32(0))
-                                                                    .append("_id", upsertedId))));
-        }
-    }
-
-    @Override
-    protected Logger getLogger() {
-        return LOGGER;
-    }
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/WriteCommandProtocol.java b/driver-core/src/main/com/mongodb/connection/WriteCommandProtocol.java
deleted file mode 100644
index f5fb1811635..00000000000
--- a/driver-core/src/main/com/mongodb/connection/WriteCommandProtocol.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoBulkWriteException;
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.WriteRequest;
-import com.mongodb.event.CommandListener;
-import com.mongodb.internal.connection.IndexMap;
-import org.bson.BsonDocument;
-import org.bson.codecs.BsonDocumentCodec;
-
-import static com.mongodb.connection.ByteBufBsonDocument.createOne;
-import static com.mongodb.connection.ProtocolHelper.getCommandFailureException;
-import static com.mongodb.connection.ProtocolHelper.getMessageSettings;
-import static com.mongodb.connection.ProtocolHelper.sendCommandFailedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandStartedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandSucceededEvent;
-import static com.mongodb.connection.WriteCommandResultHelper.getBulkWriteException;
-import static com.mongodb.connection.WriteCommandResultHelper.getBulkWriteResult;
-import static java.lang.String.format;
-
-/**
- * A base class for implementations of the bulk write commands.
- */
-abstract class WriteCommandProtocol implements Protocol<BulkWriteResult> {
-    private final MongoNamespace namespace;
-    private final boolean ordered;
-    private final WriteConcern writeConcern;
-    private final Boolean bypassDocumentValidation;
-    private CommandListener commandListener;
-
-    /**
-     * Construct an instance.
-     *
-     * @param namespace                 the namespace
-     * @param ordered                   whether the inserts are ordered
-     * @param writeConcern              the write concern
-     * @param bypassDocumentValidation  the bypass documentation validation flag
-     */
-    public WriteCommandProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                final Boolean bypassDocumentValidation) {
-        this.namespace = namespace;
-        this.ordered = ordered;
-        this.writeConcern = writeConcern;
-        this.bypassDocumentValidation = bypassDocumentValidation;
-    }
-
-    @Override
-    public void setCommandListener(final CommandListener commandListener) {
-        this.commandListener = commandListener;
-    }
-
-    /**
-     * Gets the write concern.
-     *
-     * @return the write concern
-     */
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    /**
-     * Gets the bypass document validation flag
-     *
-     * @return the bypass document validation flag
-     */
-    public Boolean getBypassDocumentValidation() {
-        return bypassDocumentValidation;
-    }
-
-    @Override
-    public BulkWriteResult execute(final InternalConnection connection) {
-        BaseWriteCommandMessage message = createRequestMessage(getMessageSettings(connection.getDescription()));
-        long startTimeNanos = System.nanoTime();
-        try {
-            BulkWriteBatchCombiner bulkWriteBatchCombiner = new BulkWriteBatchCombiner(connection.getDescription().getServerAddress(),
-                                                                                       ordered, writeConcern);
-            int batchNum = 0;
-            int currentRangeStartIndex = 0;
-            do {
-                batchNum++;
-                startTimeNanos = System.nanoTime();
-                BaseWriteCommandMessage nextMessage = sendMessage(connection, message, batchNum);
-                int itemCount = nextMessage != null ? message.getItemCount() - nextMessage.getItemCount() : message.getItemCount();
-                IndexMap indexMap = IndexMap.create(currentRangeStartIndex, itemCount);
-                BsonDocument result = receiveMessage(connection, message);
-
-                if (nextMessage != null || batchNum > 1) {
-                    if (getLogger().isDebugEnabled()) {
-                        getLogger().debug(format("Received response for batch %d", batchNum));
-                    }
-                }
-
-                if (WriteCommandResultHelper.hasError(result)) {
-                    MongoBulkWriteException bulkWriteException = getBulkWriteException(getType(), result,
-                                                                                       connection.getDescription().getServerAddress());
-                    bulkWriteBatchCombiner.addErrorResult(bulkWriteException, indexMap);
-                } else {
-                    bulkWriteBatchCombiner.addResult(getBulkWriteResult(getType(), result), indexMap);
-                }
-
-                sendSucceededEvent(connection, message, startTimeNanos, result);
-
-                currentRangeStartIndex += itemCount;
-                message = nextMessage;
-            } while (message != null && !bulkWriteBatchCombiner.shouldStopSendingMoreBatches());
-
-            return bulkWriteBatchCombiner.getResult();
-        } catch (MongoBulkWriteException e) {
-            throw e;
-        } catch (RuntimeException e) {
-            sendFailedEvent(connection, message, startTimeNanos, e);
-            throw e;
-        }
-    }
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-        executeBatchesAsync(connection, createRequestMessage(getMessageSettings(connection.getDescription())),
-                            new BulkWriteBatchCombiner(connection.getDescription().getServerAddress(), ordered, writeConcern), 0, 0,
-                            callback);
-    }
-
-    private void executeBatchesAsync(final InternalConnection connection, final BaseWriteCommandMessage message,
-                                     final BulkWriteBatchCombiner bulkWriteBatchCombiner, final int batchNum,
-                                     final int currentRangeStartIndex, final SingleResultCallback<BulkWriteResult> callback) {
-        final long startTimeNanos = System.nanoTime();
-        boolean sentStartedEvent = false;
-        try {
-            if (message != null && !bulkWriteBatchCombiner.shouldStopSendingMoreBatches()) {
-                final ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
-                RequestMessage.EncodingMetadata metadata = message.encodeWithMetadata(bsonOutput);
-
-                sendStartedEvent(connection, message, bsonOutput, metadata);
-                sentStartedEvent = true;
-
-                final BaseWriteCommandMessage nextMessage = (BaseWriteCommandMessage) metadata.getNextMessage();
-
-                final int itemCount = nextMessage != null ? message.getItemCount() - nextMessage.getItemCount() : message.getItemCount();
-                final IndexMap indexMap = IndexMap.create(currentRangeStartIndex, itemCount);
-                final int nextBatchNum = batchNum + 1;
-                final int nextRangeStartIndex = currentRangeStartIndex + itemCount;
-
-                if (nextBatchNum > 1) {
-                    if (getLogger().isDebugEnabled()) {
-                        getLogger().debug(format("Asynchronously sending batch %d", batchNum));
-                    }
-                }
-
-                sendMessageAsync(connection, bsonOutput, message, startTimeNanos, callback, new SingleResultCallback<BsonDocument>() {
-                    @Override
-                    public void onResult(final BsonDocument result, final Throwable t) {
-                        bsonOutput.close();
-                        if (t != null) {
-                            sendFailedEvent(connection, message, startTimeNanos, t);
-                            callback.onResult(null, t);
-                        } else {
-                            sendSucceededEvent(connection, message, startTimeNanos, result);
-
-                            if (nextBatchNum > 1) {
-                                if (getLogger().isDebugEnabled()) {
-                                    getLogger().debug(format("Asynchronously received response for batch %d", batchNum));
-                                }
-                            }
-
-                            if (WriteCommandResultHelper.hasError(result)) {
-                                bulkWriteBatchCombiner.addErrorResult(getBulkWriteException(getType(), result,
-                                        connection.getDescription().getServerAddress()),
-                                        indexMap);
-                            } else {
-                                bulkWriteBatchCombiner.addResult(getBulkWriteResult(getType(), result), indexMap);
-                            }
-
-                            executeBatchesAsync(connection, nextMessage, bulkWriteBatchCombiner, nextBatchNum, nextRangeStartIndex,
-                                    callback);
-                        }
-                    }
-                });
-            } else {
-                if (bulkWriteBatchCombiner.hasErrors()) {
-                    callback.onResult(null, bulkWriteBatchCombiner.getError());
-                } else {
-                    callback.onResult(bulkWriteBatchCombiner.getResult(), null);
-                }
-            }
-        } catch (Throwable t) {
-            if (sentStartedEvent) {
-                sendFailedEvent(connection, message, startTimeNanos, t);
-            }
-            callback.onResult(null, t);
-        }
-    }
-
-    protected abstract WriteRequest.Type getType();
-
-    protected abstract BaseWriteCommandMessage createRequestMessage(final MessageSettings messageSettings);
-
-    private BaseWriteCommandMessage sendMessage(final InternalConnection connection, final BaseWriteCommandMessage message,
-                                                final int batchNum) {
-        ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
-        try {
-            RequestMessage.EncodingMetadata encodingMetadata = message.encodeWithMetadata(bsonOutput);
-            BaseWriteCommandMessage nextMessage = (BaseWriteCommandMessage) encodingMetadata.getNextMessage();
-
-            sendStartedEvent(connection, message, bsonOutput, encodingMetadata);
-
-            if (nextMessage != null || batchNum > 1) {
-                if (getLogger().isDebugEnabled()) {
-                    getLogger().debug(format("Sending batch %d", batchNum));
-                }
-            }
-            connection.sendMessage(bsonOutput.getByteBuffers(), message.getId());
-            return nextMessage;
-        } finally {
-            bsonOutput.close();
-        }
-    }
-
-    private void sendStartedEvent(final InternalConnection connection, final BaseWriteCommandMessage message,
-                                  final ByteBufferBsonOutput bsonOutput, final RequestMessage.EncodingMetadata encodingMetadata) {
-        if (commandListener != null) {
-            sendCommandStartedEvent(message, namespace.getDatabaseName(), message.getCommandName(),
-                                    createOne(bsonOutput, encodingMetadata.getFirstDocumentPosition()),
-                                    connection.getDescription(), commandListener);
-        }
-    }
-
-    private void sendSucceededEvent(final InternalConnection connection, final BaseWriteCommandMessage message, final long startTimeNanos,
-                                    final BsonDocument result) {
-        if (commandListener != null) {
-            sendCommandSucceededEvent(message, message.getCommandName(), result, connection.getDescription(),
-                    startTimeNanos, commandListener);
-        }
-    }
-
-    private void sendFailedEvent(final InternalConnection connection, final BaseWriteCommandMessage message, final long startTimeNanos,
-                                 final Throwable t) {
-        if (commandListener != null) {
-            sendCommandFailedEvent(message, message.getCommandName(), connection.getDescription(), startTimeNanos, t, commandListener);
-        }
-    }
-
-    private BsonDocument receiveMessage(final InternalConnection connection, final RequestMessage message) {
-        ResponseBuffers responseBuffers = connection.receiveMessage(message.getId());
-        try {
-            ReplyMessage<BsonDocument> replyMessage = new ReplyMessage<BsonDocument>(responseBuffers, new BsonDocumentCodec(),
-                                                                                     message.getId());
-            BsonDocument result = replyMessage.getDocuments().get(0);
-            if (!ProtocolHelper.isCommandOk(result)) {
-                throw getCommandFailureException(result, connection.getDescription().getServerAddress());
-            }
-
-            return result;
-
-        } finally {
-            responseBuffers.close();
-        }
-    }
-
-    private void sendMessageAsync(final InternalConnection connection, final ByteBufferBsonOutput buffer,
-                                  final BaseWriteCommandMessage message, final long startTimeNanos,
-                                  final SingleResultCallback<BulkWriteResult> clientCallback,
-                                  final SingleResultCallback<BsonDocument> callback) {
-        SingleResultCallback<ResponseBuffers> receiveCallback = new CommandResultCallback<BsonDocument>(callback,
-                                                                                                        new BsonDocumentCodec(),
-                                                                                                        message.getId(),
-                                                                                                        connection.getDescription()
-                                                                                                                  .getServerAddress());
-        connection.sendMessageAsync(buffer.getByteBuffers(), message.getId(),
-                                    new SendMessageCallback<BulkWriteResult>(connection, buffer, message, message.getCommandName(),
-                                            startTimeNanos, commandListener, clientCallback, receiveCallback));
-    }
-
-    /**
-     * Gets the namespace to execute the protocol in.
-     *
-     * @return the namespace
-     */
-    public MongoNamespace getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Gets the logger.
-     *
-     * @return the logger
-     */
-    protected abstract com.mongodb.diagnostics.logging.Logger getLogger();
-
-    /**
-     * Gets whether the writes must be executed in order.
-     *
-     * @return true if the writes must be executed in order
-     */
-    protected boolean isOrdered() {
-        return ordered;
-    }
-
-}
diff --git a/driver-core/src/main/com/mongodb/connection/WriteCommandResultHelper.java b/driver-core/src/main/com/mongodb/connection/WriteCommandResultHelper.java
deleted file mode 100644
index 95d10e0e12a..00000000000
--- a/driver-core/src/main/com/mongodb/connection/WriteCommandResultHelper.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoInternalException;
-import com.mongodb.ServerAddress;
-import com.mongodb.bulk.BulkWriteError;
-import com.mongodb.MongoBulkWriteException;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.BulkWriteUpsert;
-import com.mongodb.bulk.WriteConcernError;
-import com.mongodb.bulk.WriteRequest;
-import org.bson.BsonArray;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonNumber;
-import org.bson.BsonValue;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
-import static com.mongodb.bulk.WriteRequest.Type.UPDATE;
-
-final class WriteCommandResultHelper {
-
-    static boolean hasError(final BsonDocument result) {
-        return result.get("writeErrors") != null || result.get("writeConcernError") != null;
-    }
-
-    static BulkWriteResult getBulkWriteResult(final WriteRequest.Type type, final BsonDocument result) {
-        int count = getCount(result);
-        List<BulkWriteUpsert> upsertedItems = getUpsertedItems(result);
-        return BulkWriteResult.acknowledged(type, count - upsertedItems.size(), getModifiedCount(type, result), upsertedItems);
-    }
-
-    static MongoBulkWriteException getBulkWriteException(final WriteRequest.Type type, final BsonDocument result,
-                                                    final ServerAddress serverAddress) {
-        if (!hasError(result)) {
-            throw new MongoInternalException("This method should not have been called");
-        }
-        return new MongoBulkWriteException(getBulkWriteResult(type, result), getWriteErrors(result),
-                                           getWriteConcernError(result), serverAddress);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<BulkWriteError> getWriteErrors(final BsonDocument result) {
-        List<BulkWriteError> writeErrors = new ArrayList<BulkWriteError>();
-        BsonArray writeErrorsDocuments = (BsonArray) result.get("writeErrors");
-        if (writeErrorsDocuments != null) {
-            for (BsonValue cur : writeErrorsDocuments) {
-                BsonDocument curDocument = (BsonDocument) cur;
-                writeErrors.add(new BulkWriteError(curDocument.getNumber("code").intValue(),
-                                                   curDocument.getString("errmsg").getValue(),
-                                                   curDocument.getDocument("errInfo", new BsonDocument()),
-                                                   curDocument.getNumber("index").intValue()));
-            }
-        }
-        return writeErrors;
-    }
-
-    private static WriteConcernError getWriteConcernError(final BsonDocument result) {
-        BsonDocument writeConcernErrorDocument = (BsonDocument) result.get("writeConcernError");
-        if (writeConcernErrorDocument == null) {
-            return null;
-        } else {
-            return new WriteConcernError(writeConcernErrorDocument.getNumber("code").intValue(),
-                                         writeConcernErrorDocument.getString("errmsg").getValue(),
-                                         writeConcernErrorDocument.getDocument("errInfo", new BsonDocument()));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<BulkWriteUpsert> getUpsertedItems(final BsonDocument result) {
-        BsonValue upsertedValue = result.get("upserted");
-        if (upsertedValue == null) {
-            return Collections.emptyList();
-        } else {
-            List<BulkWriteUpsert> bulkWriteUpsertList = new ArrayList<BulkWriteUpsert>();
-            for (BsonValue upsertedItem : (BsonArray) upsertedValue) {
-                BsonDocument upsertedItemDocument = (BsonDocument) upsertedItem;
-                bulkWriteUpsertList.add(new BulkWriteUpsert(upsertedItemDocument.getNumber("index").intValue(),
-                                                            upsertedItemDocument.get("_id")));
-            }
-            return bulkWriteUpsertList;
-        }
-    }
-
-    private static int getCount(final BsonDocument result) {
-        return result.getNumber("n").intValue();
-    }
-
-    private static Integer getModifiedCount(final WriteRequest.Type type, final BsonDocument result) {
-        BsonNumber modifiedCount = result.getNumber("nModified", (type == UPDATE || type == REPLACE) ? null : new BsonInt32(0));
-        return modifiedCount == null ? null : modifiedCount.intValue();
-
-    }
-
-    private WriteCommandResultHelper() {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/WriteProtocol.java b/driver-core/src/main/com/mongodb/connection/WriteProtocol.java
deleted file mode 100644
index 97d1c415533..00000000000
--- a/driver-core/src/main/com/mongodb/connection/WriteProtocol.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoInternalException;
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernException;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.diagnostics.logging.Logger;
-import com.mongodb.event.CommandListener;
-import org.bson.BsonArray;
-import org.bson.BsonBoolean;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonString;
-import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.Decoder;
-import org.bson.io.OutputBuffer;
-
-import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
-import static com.mongodb.connection.ProtocolHelper.encodeMessage;
-import static com.mongodb.connection.ProtocolHelper.encodeMessageWithMetadata;
-import static com.mongodb.connection.ProtocolHelper.getMessageSettings;
-import static com.mongodb.connection.ProtocolHelper.getWriteResult;
-import static com.mongodb.connection.ProtocolHelper.sendCommandFailedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandStartedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandSucceededEvent;
-import static java.util.Collections.singletonList;
-
-/**
- * Base class for wire protocol messages that perform writes.  In particular, it handles the write followed by the getlasterror command to
- * apply the write concern.
- */
-abstract class WriteProtocol implements Protocol<WriteConcernResult> {
-
-    private final MongoNamespace namespace;
-    private final boolean ordered;
-    private final WriteConcern writeConcern;
-    private CommandListener commandListener;
-
-    /**
-     * Construct a new instance.
-     *
-     * @param namespace    the namespace
-     * @param ordered      whether the inserts are ordered
-     * @param writeConcern the write concern
-     */
-    public WriteProtocol(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern) {
-        this.namespace = namespace;
-        this.ordered = ordered;
-        this.writeConcern = writeConcern;
-    }
-
-    @Override
-    public void setCommandListener(final CommandListener commandListener) {
-        this.commandListener = commandListener;
-    }
-
-    @Override
-    public WriteConcernResult execute(final InternalConnection connection) {
-        WriteConcernResult writeConcernResult = null;
-        RequestMessage requestMessage = null;
-        do {
-            long startTimeNanos = System.nanoTime();
-            RequestMessage.EncodingMetadata encodingMetadata;
-            int messageId;
-            boolean sentCommandStartedEvent = false;
-            ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
-            try {
-                if (requestMessage == null) {
-                    requestMessage = createRequestMessage(getMessageSettings(connection.getDescription()));
-                }
-                encodingMetadata = requestMessage.encodeWithMetadata(bsonOutput);
-
-                sendStartedEvent(connection, requestMessage, encodingMetadata, bsonOutput);
-                sentCommandStartedEvent = true;
-
-                messageId = requestMessage.getId();
-                if (shouldAcknowledge(encodingMetadata.getNextMessage())) {
-                    CommandMessage getLastErrorMessage = new CommandMessage(new MongoNamespace(getNamespace().getDatabaseName(),
-                            COMMAND_COLLECTION_NAME).getFullName(),
-                            createGetLastErrorCommandDocument(), false,
-                            getMessageSettings(connection.getDescription()));
-                    getLastErrorMessage.encode(bsonOutput);
-                    messageId = getLastErrorMessage.getId();
-                }
-
-                connection.sendMessage(bsonOutput.getByteBuffers(), messageId);
-            } catch (RuntimeException e) {
-                sendFailedEvent(connection, requestMessage, sentCommandStartedEvent, e, startTimeNanos);
-                throw e;
-            } finally {
-                bsonOutput.close();
-            }
-
-            if (shouldAcknowledge(encodingMetadata.getNextMessage())) {
-                ResponseBuffers responseBuffers = null;
-                try {
-                    responseBuffers = connection.receiveMessage(messageId);
-                    ReplyMessage<BsonDocument> replyMessage = new ReplyMessage<BsonDocument>(responseBuffers, new BsonDocumentCodec(),
-                            messageId);
-                    writeConcernResult = getWriteResult(replyMessage.getDocuments().get(0),
-                            connection.getDescription().getServerAddress());
-                } catch (WriteConcernException e) {
-                    sendSucceededEvent(connection, requestMessage, encodingMetadata.getNextMessage(), e, startTimeNanos);
-                    if (writeConcern.isAcknowledged()) {
-                        throw e;
-                    } else if (ordered) {
-                        break;
-                    }
-                } catch (RuntimeException e) {
-                    sendFailedEvent(connection, requestMessage, sentCommandStartedEvent, e, startTimeNanos);
-                    throw e;
-                } finally {
-                    if (responseBuffers != null) {
-                        responseBuffers.close();
-                    }
-                }
-            }
-
-            sendSucceededEvent(connection, requestMessage, encodingMetadata.getNextMessage(), writeConcernResult, startTimeNanos);
-
-            requestMessage = encodingMetadata.getNextMessage();
-        } while (requestMessage != null);
-
-        return writeConcern.isAcknowledged() ? writeConcernResult : WriteConcernResult.unacknowledged();
-    }
-
-    protected abstract void appendToWriteCommandResponseDocument(final RequestMessage curMessage, final RequestMessage nextMessage,
-                                                                 final WriteConcernResult writeConcernResult, final BsonDocument response);
-
-    @Override
-    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
-        executeAsync(createRequestMessage(getMessageSettings(connection.getDescription())), connection, callback);
-    }
-
-    private void executeAsync(final RequestMessage requestMessage, final InternalConnection connection,
-                             final SingleResultCallback<WriteConcernResult> callback) {
-        long startTimeNanos = System.nanoTime();
-        boolean sentCommandStartedEvent = false;
-        try {
-            ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
-
-            RequestMessage.EncodingMetadata encodingMetadata = encodeMessageWithMetadata(requestMessage, bsonOutput);
-            sendStartedEvent(connection, requestMessage, encodingMetadata, bsonOutput);
-            sentCommandStartedEvent = true;
-
-            if (shouldAcknowledge(encodingMetadata.getNextMessage())) {
-                CommandMessage getLastErrorMessage = new CommandMessage(new MongoNamespace(getNamespace().getDatabaseName(),
-                        COMMAND_COLLECTION_NAME).getFullName(),
-                        createGetLastErrorCommandDocument(), false,
-                        getMessageSettings(connection.getDescription()));
-                encodeMessage(getLastErrorMessage, bsonOutput);
-                SingleResultCallback<ResponseBuffers> receiveCallback = new WriteResultCallback(callback,
-                        new BsonDocumentCodec(),
-                        requestMessage,
-                        encodingMetadata.getNextMessage(),
-                        getLastErrorMessage.getId(),
-                        connection, startTimeNanos);
-                connection.sendMessageAsync(bsonOutput.getByteBuffers(), getLastErrorMessage.getId(),
-                        new SendMessageCallback<WriteConcernResult>(connection,
-                                bsonOutput,
-                                requestMessage,
-                                getLastErrorMessage.getId(),
-                                getCommandName(requestMessage),
-                                startTimeNanos,
-                                commandListener,
-                                callback,
-                                receiveCallback));
-            } else {
-                connection.sendMessageAsync(bsonOutput.getByteBuffers(), requestMessage.getId(),
-                        new UnacknowledgedWriteResultCallback(callback,
-                                requestMessage,
-                                encodingMetadata.getNextMessage(),
-                                bsonOutput,
-                                connection, startTimeNanos));
-            }
-        } catch (Throwable t) {
-            sendFailedEvent(connection, requestMessage, sentCommandStartedEvent, t, startTimeNanos);
-            callback.onResult(null, t);
-        }
-    }
-
-
-    protected abstract BsonDocument getAsWriteCommand(ByteBufferBsonOutput bsonOutput, int firstDocumentPosition);
-
-    protected BsonDocument getBaseCommandDocument(final String commandName) {
-        BsonDocument baseCommandDocument = new BsonDocument(commandName, new BsonString(getNamespace().getCollectionName()))
-                .append("ordered", BsonBoolean.valueOf(isOrdered()));
-        if (!writeConcern.isServerDefault()) {
-            baseCommandDocument.append("writeConcern", writeConcern.asDocument());
-        }
-        return baseCommandDocument;
-    }
-
-    protected String getCommandName(final RequestMessage message) {
-        switch (message.getOpCode()) {
-            case OP_INSERT:
-                return "insert";
-            case OP_UPDATE:
-                return "update";
-            case OP_DELETE:
-                return "delete";
-            default:
-                throw new MongoInternalException("Unexpected op code for write: " + message.getOpCode());
-        }
-    }
-
-
-    private void sendStartedEvent(final InternalConnection connection, final RequestMessage message,
-                                  final RequestMessage.EncodingMetadata encodingMetadata, final ByteBufferBsonOutput bsonOutput) {
-        if (commandListener != null) {
-            sendCommandStartedEvent(message, namespace.getDatabaseName(), getCommandName(message),
-                    getAsWriteCommand(bsonOutput, encodingMetadata.getFirstDocumentPosition()),
-                    connection.getDescription(), commandListener);
-        }
-    }
-
-    private void sendSucceededEvent(final InternalConnection connection, final RequestMessage message,
-                                    final RequestMessage nextMessage,
-                                    final WriteConcernException e,
-                                    final long startTimeNanos) {
-        if (commandListener != null) {
-            sendSucceededEvent(connection, message,
-                    getResponseDocument(message, nextMessage, e.getWriteConcernResult(), e), startTimeNanos);
-        }
-    }
-
-    private void sendSucceededEvent(final InternalConnection connection, final RequestMessage message,
-                                    final RequestMessage nextMessage,
-                                    final WriteConcernResult writeConcernResult,
-                                    final long startTimeNanos) {
-        if (commandListener != null) {
-            sendSucceededEvent(connection, message,
-                    getResponseDocument(message, nextMessage, writeConcernResult, null), startTimeNanos);
-        }
-    }
-
-    private void sendSucceededEvent(final InternalConnection connection, final RequestMessage message,
-                                    final BsonDocument responseDocument, final long startTimeNanos) {
-        if (commandListener != null) {
-            sendCommandSucceededEvent(message, getCommandName(message), responseDocument, connection.getDescription(), startTimeNanos,
-                    commandListener);
-        }
-    }
-
-    private void sendFailedEvent(final InternalConnection connection, final RequestMessage message,
-                                 final boolean sentCommandStartedEvent, final Throwable t, final long startTimeNanos) {
-        if (commandListener != null && sentCommandStartedEvent) {
-            sendCommandFailedEvent(message, getCommandName(message), connection.getDescription(), startTimeNanos, t, commandListener);
-        }
-    }
-
-    private BsonDocument getResponseDocument(final RequestMessage curMessage, final RequestMessage nextMessage,
-                                             final WriteConcernResult writeConcernResult,
-                                             final WriteConcernException writeConcernException) {
-        BsonDocument response = new BsonDocument("ok", new BsonInt32(1));
-        if (writeConcern.isAcknowledged()) {
-            if (writeConcernException == null) {
-                appendToWriteCommandResponseDocument(curMessage, nextMessage, writeConcernResult, response);
-            } else {
-                response.put("n", new BsonInt32(0));
-                BsonDocument writeErrorDocument = new BsonDocument("index", new BsonInt32(0))
-                        .append("code", new BsonInt32(writeConcernException.getErrorCode()));
-                if (writeConcernException.getErrorMessage() != null) {
-                    writeErrorDocument.append("errmsg", new BsonString(writeConcernException.getErrorMessage()));
-                }
-                response.put("writeErrors", new BsonArray(singletonList(writeErrorDocument)));
-            }
-        }
-        return response;
-    }
-
-    private boolean shouldAcknowledge(final RequestMessage nextMessage) {
-        return writeConcern.isAcknowledged() || (isOrdered() && nextMessage != null);
-    }
-
-    private BsonDocument createGetLastErrorCommandDocument() {
-        BsonDocument command = new BsonDocument("getlasterror", new BsonInt32(1));
-        command.putAll(writeConcern.asDocument());
-        return command;
-    }
-
-    /**
-     * Create the initial request message for the write.
-     *
-     * @param settings the message settings
-     * @return the request message
-     */
-    protected abstract RequestMessage createRequestMessage(MessageSettings settings);
-
-    /**
-     * Gets the namespace.
-     *
-     * @return the namespace
-     */
-    protected MongoNamespace getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Gets whether the writes are ordered.
-     *
-     * @return true if ordered
-     */
-    protected boolean isOrdered() {
-        return ordered;
-    }
-
-    /**
-     * Gets the write concern.
-     *
-     * @return the write concern
-     */
-    protected WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    /**
-     * Gets the logger.
-     *
-     * @return the logger
-     */
-    protected abstract Logger getLogger();
-
-    private final class WriteResultCallback extends CommandResultBaseCallback<BsonDocument> {
-        private final SingleResultCallback<WriteConcernResult> callback;
-        private final RequestMessage message;
-        private final RequestMessage nextMessage;
-        private final InternalConnection connection;
-        private final long startTimeNanos;
-
-        public WriteResultCallback(final SingleResultCallback<WriteConcernResult> callback, final Decoder<BsonDocument> decoder,
-                                   final RequestMessage message, final RequestMessage nextMessage,
-                                   final long requestId, final InternalConnection connection, final long startTimeNanos) {
-            super(decoder, requestId, connection.getDescription().getServerAddress());
-            this.callback = callback;
-            this.message = message;
-            this.nextMessage = nextMessage;
-            this.connection = connection;
-            this.startTimeNanos = startTimeNanos;
-        }
-
-        @Override
-        protected void callCallback(final BsonDocument result, final Throwable throwableFromCallback) {
-            if (throwableFromCallback != null) {
-                sendFailedEvent(connection, message, true, throwableFromCallback, startTimeNanos);
-                callback.onResult(null, throwableFromCallback);
-            } else {
-                try {
-                    try {
-                        WriteConcernResult writeConcernResult = null;
-                        boolean shouldWriteNextMessage = true;
-                        try {
-                            writeConcernResult = getWriteResult(result, connection.getDescription().getServerAddress());
-                        } catch (WriteConcernException e) {
-                            if (writeConcern.isAcknowledged()) {
-                                throw e;
-                            }
-                            if (ordered) {
-                                shouldWriteNextMessage = false;
-                            }
-                        }
-
-                        sendSucceededEvent(connection, message, nextMessage, writeConcernResult, startTimeNanos);
-
-                        if (shouldWriteNextMessage && nextMessage != null) {
-                            executeAsync(nextMessage, connection, callback);
-                        } else {
-                            callback.onResult(writeConcernResult, null);
-                        }
-                    } catch (WriteConcernException e) {
-                        sendSucceededEvent(connection, message, nextMessage, e, startTimeNanos);
-                        throw e;
-                    } catch (RuntimeException e) {
-                        sendFailedEvent(connection, message, true, e, startTimeNanos);
-                        throw e;
-                    }
-                } catch (Throwable t) {
-                    callback.onResult(null, t);
-                }
-            }
-        }
-    }
-
-    private final class UnacknowledgedWriteResultCallback implements SingleResultCallback<Void> {
-        private final SingleResultCallback<WriteConcernResult> callback;
-        private final RequestMessage message;
-        private final RequestMessage nextMessage;
-        private final OutputBuffer writtenBuffer;
-        private final InternalConnection connection;
-        private final long startTimeNanos;
-
-        UnacknowledgedWriteResultCallback(final SingleResultCallback<WriteConcernResult> callback,
-                                          final RequestMessage message,
-                                          final RequestMessage nextMessage,
-                                          final OutputBuffer writtenBuffer,
-                                          final InternalConnection connection, final long startTimeNanos) {
-            this.callback = callback;
-            this.message = message;
-            this.nextMessage = nextMessage;
-            this.connection = connection;
-            this.writtenBuffer = writtenBuffer;
-            this.startTimeNanos = startTimeNanos;
-        }
-
-        @Override
-        public void onResult(final Void result, final Throwable t) {
-            writtenBuffer.close();
-            if (t != null) {
-                sendFailedEvent(connection, message, true, t, startTimeNanos);
-                callback.onResult(null, t);
-            } else {
-                sendSucceededEvent(connection, message, nextMessage, (WriteConcernResult) null, startTimeNanos);
-
-                if (nextMessage != null) {
-                    executeAsync(nextMessage, connection, callback);
-                } else {
-                    callback.onResult(WriteConcernResult.unacknowledged(), null);
-                }
-            }
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/X509Authenticator.java b/driver-core/src/main/com/mongodb/connection/X509Authenticator.java
deleted file mode 100644
index 856639cd858..00000000000
--- a/driver-core/src/main/com/mongodb/connection/X509Authenticator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.AuthenticationMechanism;
-import com.mongodb.MongoCommandException;
-import com.mongodb.MongoCredential;
-import com.mongodb.MongoSecurityException;
-import com.mongodb.async.SingleResultCallback;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonString;
-
-import static com.mongodb.connection.CommandHelper.executeCommand;
-import static com.mongodb.connection.CommandHelper.executeCommandAsync;
-
-class X509Authenticator extends Authenticator {
-    X509Authenticator(final MongoCredential credential) {
-        super(credential);
-    }
-
-    @Override
-    void authenticate(final InternalConnection connection, final ConnectionDescription connectionDescription) {
-        try {
-            BsonDocument authCommand = getAuthCommand(getCredential().getUserName());
-            executeCommand(getCredential().getSource(), authCommand, connection);
-        } catch (MongoCommandException e) {
-            throw new MongoSecurityException(getCredential(), "Exception authenticating", e);
-        }
-    }
-
-    @Override
-    void authenticateAsync(final InternalConnection connection, final ConnectionDescription connectionDescription,
-                           final SingleResultCallback<Void> callback) {
-        executeCommandAsync(getCredential().getSource(), getAuthCommand(getCredential().getUserName()), connection,
-                            new SingleResultCallback<BsonDocument>() {
-                                @Override
-                                public void onResult(final BsonDocument nonceResult, final Throwable t) {
-                                    if (t != null) {
-                                        callback.onResult(null, translateThrowable(t));
-                                    } else {
-                                        callback.onResult(null, null);
-                                    }
-                                }
-                            });
-    }
-
-    private BsonDocument getAuthCommand(final String userName) {
-        BsonDocument cmd = new BsonDocument();
-
-        cmd.put("authenticate", new BsonInt32(1));
-        cmd.put("user", new BsonString(userName));
-        cmd.put("mechanism", new BsonString(AuthenticationMechanism.MONGODB_X509.getMechanismName()));
-
-        return cmd;
-    }
-
-    private Throwable translateThrowable(final Throwable t) {
-        if (t instanceof MongoCommandException) {
-            return new MongoSecurityException(getCredential(), "Exception authenticating", t);
-        } else {
-            return t;
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/connection/netty/NettyBufferProvider.java b/driver-core/src/main/com/mongodb/connection/netty/NettyBufferProvider.java
index fe13110093e..e7adb0e6c20 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/NettyBufferProvider.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/NettyBufferProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@ final class NettyBufferProvider implements BufferProvider {
 
     private final ByteBufAllocator allocator;
 
-    public NettyBufferProvider() {
+    NettyBufferProvider() {
         allocator = PooledByteBufAllocator.DEFAULT;
     }
 
-    public NettyBufferProvider(final ByteBufAllocator allocator) {
+    NettyBufferProvider(final ByteBufAllocator allocator) {
         this.allocator = allocator;
     }
 
diff --git a/driver-core/src/main/com/mongodb/connection/netty/NettyByteBuf.java b/driver-core/src/main/com/mongodb/connection/netty/NettyByteBuf.java
index a25d8c65046..28860e43e1b 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/NettyByteBuf.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/NettyByteBuf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,12 @@ final class NettyByteBuf implements ByteBuf {
     private io.netty.buffer.ByteBuf proxied;
     private boolean isWriting = true;
 
-    public NettyByteBuf(final io.netty.buffer.ByteBuf proxied) {
-        this.proxied = proxied;
+    @SuppressWarnings("deprecation")
+    NettyByteBuf(final io.netty.buffer.ByteBuf proxied) {
+        this.proxied = proxied.order(ByteOrder.LITTLE_ENDIAN);
     }
 
-    public NettyByteBuf(final io.netty.buffer.ByteBuf proxied, final boolean isWriting) {
+    NettyByteBuf(final io.netty.buffer.ByteBuf proxied, final boolean isWriting) {
         this(proxied);
         this.isWriting = isWriting;
     }
@@ -113,6 +114,7 @@ public ByteBuf clear() {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public ByteBuf order(final ByteOrder byteOrder) {
         proxied = proxied.order(byteOrder);
         return this;
diff --git a/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java b/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
index 05cfbc8bae3..9722193f12d 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/NettyStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,11 @@
 
 package com.mongodb.connection.netty;
 
+import com.mongodb.MongoClientException;
 import com.mongodb.MongoException;
 import com.mongodb.MongoInternalException;
 import com.mongodb.MongoInterruptedException;
+import com.mongodb.MongoSocketException;
 import com.mongodb.MongoSocketOpenException;
 import com.mongodb.MongoSocketReadTimeoutException;
 import com.mongodb.ServerAddress;
@@ -47,13 +49,18 @@
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
 import java.io.IOException;
+import java.net.SocketAddress;
+import java.security.NoSuchAlgorithmException;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
 
 import static com.mongodb.internal.connection.SslHelper.enableHostNameVerification;
+import static com.mongodb.internal.connection.SslHelper.enableSni;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -75,9 +82,8 @@ final class NettyStream implements Stream {
     private volatile PendingReader pendingReader;
     private volatile Throwable pendingException;
 
-    public NettyStream(final ServerAddress address, final SocketSettings settings, final SslSettings sslSettings,
-                       final EventLoopGroup workerGroup, final Class<? extends SocketChannel> socketChannelClass,
-                       final ByteBufAllocator allocator) {
+    NettyStream(final ServerAddress address, final SocketSettings settings, final SslSettings sslSettings, final EventLoopGroup workerGroup,
+                final Class<? extends SocketChannel> socketChannelClass, final ByteBufAllocator allocator) {
         this.address = address;
         this.settings = settings;
         this.sslSettings = sslSettings;
@@ -100,52 +106,56 @@ public void open() throws IOException {
 
     @Override
     public void openAsync(final AsyncCompletionHandler<Void> handler) {
-        Bootstrap bootstrap = new Bootstrap();
-        bootstrap.group(workerGroup);
-        bootstrap.channel(socketChannelClass);
+        initializeChannel(handler, new LinkedList<SocketAddress>(address.getSocketAddresses()));
+    }
 
-        bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, settings.getConnectTimeout(MILLISECONDS));
-        bootstrap.option(ChannelOption.TCP_NODELAY, true);
-        bootstrap.option(ChannelOption.SO_KEEPALIVE, settings.isKeepAlive());
+    @SuppressWarnings("deprecation")
+    private void initializeChannel(final AsyncCompletionHandler<Void> handler, final Queue<SocketAddress> socketAddressQueue) {
+        if (socketAddressQueue.isEmpty()) {
+            handler.failed(new MongoSocketException("Exception opening socket", getAddress()));
+        } else {
+            SocketAddress nextAddress = socketAddressQueue.poll();
 
-        if (settings.getReceiveBufferSize() > 0) {
-            bootstrap.option(ChannelOption.SO_RCVBUF, settings.getReceiveBufferSize());
-        }
-        if (settings.getSendBufferSize() > 0) {
-            bootstrap.option(ChannelOption.SO_SNDBUF, settings.getSendBufferSize());
-        }
-        bootstrap.option(ChannelOption.ALLOCATOR, allocator);
+            Bootstrap bootstrap = new Bootstrap();
+            bootstrap.group(workerGroup);
+            bootstrap.channel(socketChannelClass);
 
-        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
-            @Override
-            public void initChannel(final SocketChannel ch) throws Exception {
-                if (sslSettings.isEnabled()) {
-                    SSLEngine engine = SSLContext.getDefault().createSSLEngine(address.getHost(), address.getPort());
-                    engine.setUseClientMode(true);
-                    if (!sslSettings.isInvalidHostNameAllowed()) {
-                        engine.setSSLParameters(enableHostNameVerification(engine.getSSLParameters()));
-                    }
-                    ch.pipeline().addFirst("ssl", new SslHandler(engine, false));
-                }
-                int readTimeout = settings.getReadTimeout(MILLISECONDS);
-                if (readTimeout > 0) {
-                    ch.pipeline().addLast(READ_HANDLER_NAME, new ReadTimeoutHandler(readTimeout));
-                }
-                ch.pipeline().addLast(new InboundBufferHandler());
+            bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, settings.getConnectTimeout(MILLISECONDS));
+            bootstrap.option(ChannelOption.TCP_NODELAY, true);
+            bootstrap.option(ChannelOption.SO_KEEPALIVE, settings.isKeepAlive());
+
+            if (settings.getReceiveBufferSize() > 0) {
+                bootstrap.option(ChannelOption.SO_RCVBUF, settings.getReceiveBufferSize());
             }
-        });
-        final ChannelFuture channelFuture = bootstrap.connect(address.getHost(), address.getPort());
-        channelFuture.addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(final ChannelFuture future) throws Exception {
-                if (future.isSuccess()) {
-                    channel = channelFuture.channel();
-                    handler.completed(null);
-                } else {
-                    handler.failed(new MongoSocketOpenException("Exception opening socket", getAddress(), future.cause()));
-                }
+            if (settings.getSendBufferSize() > 0) {
+                bootstrap.option(ChannelOption.SO_SNDBUF, settings.getSendBufferSize());
             }
-        });
+            bootstrap.option(ChannelOption.ALLOCATOR, allocator);
+
+            bootstrap.handler(new ChannelInitializer<SocketChannel>() {
+                @Override
+                public void initChannel(final SocketChannel ch) {
+                    if (sslSettings.isEnabled()) {
+                        SSLEngine engine = getSslContext().createSSLEngine(address.getHost(), address.getPort());
+                        engine.setUseClientMode(true);
+                        SSLParameters sslParameters = engine.getSSLParameters();
+                        enableSni(address.getHost(), sslParameters);
+                        if (!sslSettings.isInvalidHostNameAllowed()) {
+                            enableHostNameVerification(sslParameters);
+                        }
+                        engine.setSSLParameters(sslParameters);
+                        ch.pipeline().addFirst("ssl", new SslHandler(engine, false));
+                    }
+                    int readTimeout = settings.getReadTimeout(MILLISECONDS);
+                    if (readTimeout > 0) {
+                        ch.pipeline().addLast(READ_HANDLER_NAME, new ReadTimeoutHandler(readTimeout));
+                    }
+                    ch.pipeline().addLast(new InboundBufferHandler());
+                }
+            });
+            final ChannelFuture channelFuture = bootstrap.connect(nextAddress);
+            channelFuture.addListener(new OpenChannelFutureListener(socketAddressQueue, channelFuture, handler));
+        }
     }
 
     @Override
@@ -166,9 +176,7 @@ public ByteBuf read(final int numBytes) throws IOException {
     public void writeAsync(final List<ByteBuf> buffers, final AsyncCompletionHandler<Void> handler) {
         CompositeByteBuf composite = PooledByteBufAllocator.DEFAULT.compositeBuffer();
         for (ByteBuf cur : buffers) {
-            io.netty.buffer.ByteBuf byteBuf = ((NettyByteBuf) cur).asByteBuf();
-            composite.addComponent(byteBuf.retain());
-            composite.writerIndex(composite.writerIndex() + byteBuf.writerIndex());
+            composite.addComponent(true, ((NettyByteBuf) cur).asByteBuf());
         }
 
         channel.writeAndFlush(composite).addListener(new ChannelFutureListener() {
@@ -300,6 +308,14 @@ public ByteBufAllocator getAllocator() {
         return allocator;
     }
 
+    private SSLContext getSslContext() {
+        try {
+            return (sslSettings.getContext() == null) ? SSLContext.getDefault() : sslSettings.getContext();
+        } catch (NoSuchAlgorithmException e) {
+            throw new MongoClientException("Unable to create default SSLContext", e);
+        }
+    }
+
     private class InboundBufferHandler extends SimpleChannelInboundHandler<io.netty.buffer.ByteBuf> {
         @Override
         protected void channelRead0(final ChannelHandlerContext ctx, final io.netty.buffer.ByteBuf buffer) throws Exception {
@@ -332,7 +348,7 @@ private static final class FutureAsyncCompletionHandler<T> implements AsyncCompl
         private volatile T t;
         private volatile Throwable throwable;
 
-        public FutureAsyncCompletionHandler() {
+        FutureAsyncCompletionHandler() {
         }
 
         @Override
@@ -366,6 +382,39 @@ public T get() throws IOException {
         }
     }
 
+    private class OpenChannelFutureListener implements ChannelFutureListener {
+        private final Queue<SocketAddress> socketAddressQueue;
+        private final ChannelFuture channelFuture;
+        private final AsyncCompletionHandler<Void> handler;
+
+        OpenChannelFutureListener(final Queue<SocketAddress> socketAddressQueue, final ChannelFuture channelFuture,
+                                  final AsyncCompletionHandler<Void> handler) {
+            this.socketAddressQueue = socketAddressQueue;
+            this.channelFuture = channelFuture;
+            this.handler = handler;
+        }
+
+        @Override
+        public void operationComplete(final ChannelFuture future) {
+            if (future.isSuccess()) {
+                channel = channelFuture.channel();
+                channel.closeFuture().addListener(new ChannelFutureListener() {
+                    @Override
+                    public void operationComplete(final ChannelFuture future) {
+                        handleReadResponse(null, new IOException("The connection to the server was closed"));
+                    }
+                });
+                handler.completed(null);
+            } else {
+                if (socketAddressQueue.isEmpty()) {
+                    handler.failed(new MongoSocketOpenException("Exception opening socket", getAddress(), future.cause()));
+                } else {
+                    initializeChannel(handler, socketAddressQueue);
+                }
+            }
+        }
+    }
+
     private void scheduleReadTimeout() {
         adjustTimeout(false);
     }
diff --git a/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactory.java b/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactory.java
index aac3b1acd10..a32cab74f7b 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
- * A StreamFactory for Streams based on Netty 4.0
+ * A StreamFactory for Streams based on <a href='http://netty.io/'>Netty</a> 4.x.
  *
  * @since 3.0
  */
@@ -76,6 +76,19 @@ public NettyStreamFactory(final SocketSettings settings, final SslSettings sslSe
         this(settings, sslSettings, eventLoopGroup, NioSocketChannel.class, allocator);
     }
 
+    /**
+     * Construct a new instance of the factory.
+     *
+     * @param settings the socket settings
+     * @param sslSettings the SSL settings
+     * @param eventLoopGroup the event loop group that all channels created by this factory will be a part of
+     *
+     * @since 3.4
+     */
+    public NettyStreamFactory(final SocketSettings settings, final SslSettings sslSettings, final EventLoopGroup eventLoopGroup) {
+        this(settings, sslSettings, eventLoopGroup, PooledByteBufAllocator.DEFAULT);
+    }
+
     /**
      * Construct a new instance of the factory with a default allocator, nio event loop group and nio socket channel.
      *
@@ -83,7 +96,7 @@ public NettyStreamFactory(final SocketSettings settings, final SslSettings sslSe
      * @param sslSettings the SSL settings
      */
     public NettyStreamFactory(final SocketSettings settings, final SslSettings sslSettings) {
-        this(settings, sslSettings, new NioEventLoopGroup(), PooledByteBufAllocator.DEFAULT);
+        this(settings, sslSettings, new NioEventLoopGroup());
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactoryFactory.java b/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactoryFactory.java
index 6fa844b8a2a..c342cf2687d 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactoryFactory.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/NettyStreamFactoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,6 +110,9 @@ public Builder socketChannelClass(final Class<? extends SocketChannel> socketCha
         /**
          * Sets the event loop group.
          *
+         * <p>It is highly recommended to supply your own event loop group and manage its shutdown.  Otherwise, the event
+         * loop group created by default will not be shutdown properly.</p>
+         *
          * @param eventLoopGroup the event loop group that all channels created by this factory will be a part of
          * @return this
          */
diff --git a/driver-core/src/main/com/mongodb/connection/netty/ReadTimeoutHandler.java b/driver-core/src/main/com/mongodb/connection/netty/ReadTimeoutHandler.java
index 689fe2cd34a..4b4533f3cde 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/ReadTimeoutHandler.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/ReadTimeoutHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  * Copyright 2012 The Netty Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,7 @@ final class ReadTimeoutHandler extends ChannelInboundHandlerAdapter {
     private final long readTimeout;
     private volatile ScheduledFuture<?> timeout;
 
-    public ReadTimeoutHandler(final long readTimeout) {
+    ReadTimeoutHandler(final long readTimeout) {
         isTrueArgument("readTimeout must be greater than zero.", readTimeout > 0);
         this.readTimeout = readTimeout;
     }
diff --git a/driver-core/src/main/com/mongodb/connection/netty/package-info.java b/driver-core/src/main/com/mongodb/connection/netty/package-info.java
index 789510f58cb..3d5cdbec184 100644
--- a/driver-core/src/main/com/mongodb/connection/netty/package-info.java
+++ b/driver-core/src/main/com/mongodb/connection/netty/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/connection/package-info.java b/driver-core/src/main/com/mongodb/connection/package-info.java
index 8240a0f0a16..f7030495972 100644
--- a/driver-core/src/main/com/mongodb/connection/package-info.java
+++ b/driver-core/src/main/com/mongodb/connection/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/diagnostics/logging/JULLogger.java b/driver-core/src/main/com/mongodb/diagnostics/logging/JULLogger.java
index 498afe9b4b7..79153a11b61 100644
--- a/driver-core/src/main/com/mongodb/diagnostics/logging/JULLogger.java
+++ b/driver-core/src/main/com/mongodb/diagnostics/logging/JULLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/diagnostics/logging/Logger.java b/driver-core/src/main/com/mongodb/diagnostics/logging/Logger.java
index 015b3611a0d..9debba50778 100644
--- a/driver-core/src/main/com/mongodb/diagnostics/logging/Logger.java
+++ b/driver-core/src/main/com/mongodb/diagnostics/logging/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/diagnostics/logging/Loggers.java b/driver-core/src/main/com/mongodb/diagnostics/logging/Loggers.java
index 294fcfb8bae..4828e9529f3 100644
--- a/driver-core/src/main/com/mongodb/diagnostics/logging/Loggers.java
+++ b/driver-core/src/main/com/mongodb/diagnostics/logging/Loggers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,9 +58,7 @@ private Loggers() {
 
     private static boolean shouldUseSLF4J() {
         try {
-            Class.forName("org.slf4j.LoggerFactory");
-            // Don't use SLF4J unless a logging implementation has been configured for it
-            Class.forName("org.slf4j.impl.StaticLoggerBinder");
+            Class.forName("org.slf4j.Logger");
             return true;
         } catch (ClassNotFoundException e) {
             return false;
diff --git a/driver-core/src/main/com/mongodb/diagnostics/logging/SLF4JLogger.java b/driver-core/src/main/com/mongodb/diagnostics/logging/SLF4JLogger.java
index f06754f36fc..9d50993d4e5 100644
--- a/driver-core/src/main/com/mongodb/diagnostics/logging/SLF4JLogger.java
+++ b/driver-core/src/main/com/mongodb/diagnostics/logging/SLF4JLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/diagnostics/logging/package-info.java b/driver-core/src/main/com/mongodb/diagnostics/logging/package-info.java
index f8ea609bef0..94d5279511a 100644
--- a/driver-core/src/main/com/mongodb/diagnostics/logging/package-info.java
+++ b/driver-core/src/main/com/mongodb/diagnostics/logging/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/event/ClusterClosedEvent.java b/driver-core/src/main/com/mongodb/event/ClusterClosedEvent.java
index 9d91ce1ad51..9b451be4126 100644
--- a/driver-core/src/main/com/mongodb/event/ClusterClosedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ClusterClosedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/event/ClusterDescriptionChangedEvent.java b/driver-core/src/main/com/mongodb/event/ClusterDescriptionChangedEvent.java
index 5b950d906fb..49debf5438a 100644
--- a/driver-core/src/main/com/mongodb/event/ClusterDescriptionChangedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ClusterDescriptionChangedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/event/ClusterEventMulticaster.java b/driver-core/src/main/com/mongodb/event/ClusterEventMulticaster.java
index 729e1a86408..63255bbf1ee 100644
--- a/driver-core/src/main/com/mongodb/event/ClusterEventMulticaster.java
+++ b/driver-core/src/main/com/mongodb/event/ClusterEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,26 @@
 
 package com.mongodb.event;
 
+import com.mongodb.annotations.Immutable;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
 import static java.lang.String.format;
+import static java.util.Collections.unmodifiableList;
 
 /**
  * A multicaster for cluster events.
  *
  * @since 3.3
+ * @deprecated register multiple cluster listeners instead
  */
+@Deprecated
+@Immutable
 public final class ClusterEventMulticaster implements ClusterListener {
     private static final Logger LOGGER = Loggers.getLogger("cluster.event");
 
@@ -54,7 +58,7 @@ public ClusterEventMulticaster(final List<ClusterListener> clusterListeners) {
      * @return the cluster listeners
      */
     public List<ClusterListener> getClusterListeners() {
-        return Collections.unmodifiableList(clusterListeners);
+        return unmodifiableList(clusterListeners);
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/event/ClusterListener.java b/driver-core/src/main/com/mongodb/event/ClusterListener.java
index 2dca8d19946..624a9cbf3f3 100644
--- a/driver-core/src/main/com/mongodb/event/ClusterListener.java
+++ b/driver-core/src/main/com/mongodb/event/ClusterListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/event/ClusterListenerAdapter.java b/driver-core/src/main/com/mongodb/event/ClusterListenerAdapter.java
index 3352b076b80..322f4878e56 100644
--- a/driver-core/src/main/com/mongodb/event/ClusterListenerAdapter.java
+++ b/driver-core/src/main/com/mongodb/event/ClusterListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/event/ClusterOpeningEvent.java b/driver-core/src/main/com/mongodb/event/ClusterOpeningEvent.java
index 978691186ad..d4a6aac2239 100644
--- a/driver-core/src/main/com/mongodb/event/ClusterOpeningEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ClusterOpeningEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/event/CommandEvent.java b/driver-core/src/main/com/mongodb/event/CommandEvent.java
index 9e85bb48001..975cbf751ed 100644
--- a/driver-core/src/main/com/mongodb/event/CommandEvent.java
+++ b/driver-core/src/main/com/mongodb/event/CommandEvent.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/driver-core/src/main/com/mongodb/event/CommandEventMulticaster.java b/driver-core/src/main/com/mongodb/event/CommandEventMulticaster.java
index 5b79aa2399d..59d5683621b 100644
--- a/driver-core/src/main/com/mongodb/event/CommandEventMulticaster.java
+++ b/driver-core/src/main/com/mongodb/event/CommandEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,12 +7,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
@@ -22,12 +21,12 @@
 import com.mongodb.diagnostics.logging.Loggers;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
 import static java.lang.String.format;
+import static java.util.Collections.unmodifiableList;
 
 /**
  * A multicaster for command events. Any exception thrown by one of the listeners will be caught and not re-thrown, but may be
@@ -35,8 +34,10 @@
  *
  * @since 3.3
  *
+ * @deprecated register multiple command listeners instead
  */
 @Immutable
+@Deprecated
 public final class CommandEventMulticaster implements CommandListener {
     private static final Logger LOGGER = Loggers.getLogger("protocol.event");
 
@@ -59,7 +60,7 @@ public CommandEventMulticaster(final List<CommandListener> commandListeners) {
      * @return the unmodifiable set of command listeners
      */
     public List<CommandListener> getCommandListeners() {
-        return Collections.unmodifiableList(commandListeners);
+        return unmodifiableList(commandListeners);
     }
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/event/CommandFailedEvent.java b/driver-core/src/main/com/mongodb/event/CommandFailedEvent.java
index cbc60e84534..fcd28cbda1d 100644
--- a/driver-core/src/main/com/mongodb/event/CommandFailedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/CommandFailedEvent.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,6 +20,8 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+
 /**
  * An event representing the failure of a MongoDB database command.
  *
@@ -33,12 +37,13 @@ public final class CommandFailedEvent extends CommandEvent {
      * @param requestId the requestId
      * @param connectionDescription the connection description
      * @param commandName the command name
-     * @param elapsedTimeNanos the elapsed time in nanoseconds for the operation to complete
+     * @param elapsedTimeNanos the non-negative elapsed time in nanoseconds for the operation to complete
      * @param throwable the throwable cause of the failure
      */
     public CommandFailedEvent(final int requestId, final ConnectionDescription connectionDescription, final String commandName,
                               final long elapsedTimeNanos, final Throwable throwable) {
         super(requestId, connectionDescription, commandName);
+        isTrueArgument("elapsed time is not negative", elapsedTimeNanos >= 0);
         this.elapsedTimeNanos = elapsedTimeNanos;
         this.throwable = throwable;
     }
diff --git a/driver-core/src/main/com/mongodb/event/CommandListener.java b/driver-core/src/main/com/mongodb/event/CommandListener.java
index a174dd606a8..943bce755c9 100644
--- a/driver-core/src/main/com/mongodb/event/CommandListener.java
+++ b/driver-core/src/main/com/mongodb/event/CommandListener.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/driver-core/src/main/com/mongodb/event/CommandListenerMulticaster.java b/driver-core/src/main/com/mongodb/event/CommandListenerMulticaster.java
index 0dc1257f568..8b166ea2bce 100644
--- a/driver-core/src/main/com/mongodb/event/CommandListenerMulticaster.java
+++ b/driver-core/src/main/com/mongodb/event/CommandListenerMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,11 @@
  * logged.
  *
  * @since 3.1
- * @deprecated Prefer {@link CommandEventMulticaster}
+ * @deprecated register multiple command listeners in the settings
  */
 @Immutable
 @Deprecated
+@SuppressWarnings("deprecation")
 public class CommandListenerMulticaster implements CommandListener {
 
     private final CommandEventMulticaster wrapped;
diff --git a/driver-core/src/main/com/mongodb/event/CommandStartedEvent.java b/driver-core/src/main/com/mongodb/event/CommandStartedEvent.java
index 461d3276133..7b79ef0fa3c 100644
--- a/driver-core/src/main/com/mongodb/event/CommandStartedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/CommandStartedEvent.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/driver-core/src/main/com/mongodb/event/CommandSucceededEvent.java b/driver-core/src/main/com/mongodb/event/CommandSucceededEvent.java
index 26953cb6087..4a61895c7f5 100644
--- a/driver-core/src/main/com/mongodb/event/CommandSucceededEvent.java
+++ b/driver-core/src/main/com/mongodb/event/CommandSucceededEvent.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,6 +21,8 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+
 /**
  * An event representing the completion of a MongoDB database command.
  *
@@ -34,12 +38,13 @@ public final class CommandSucceededEvent extends CommandEvent {
      * @param connectionDescription the connection description
      * @param commandName the command name
      * @param response the command response
-     * @param elapsedTimeNanos the elapsed time in nanoseconds for the operation to complete
+     * @param elapsedTimeNanos the non-negative elapsed time in nanoseconds for the operation to complete
      */
     public CommandSucceededEvent(final int requestId, final ConnectionDescription connectionDescription,
                                  final String commandName, final BsonDocument response, final long elapsedTimeNanos) {
         super(requestId, connectionDescription, commandName);
         this.response = response;
+        isTrueArgument("elapsed time is not negative", elapsedTimeNanos >= 0);
         this.elapsedTimeNanos = elapsedTimeNanos;
     }
 
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionAddedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionAddedEvent.java
index bc494262246..22e081ec25f 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionAddedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionAddedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,25 +7,24 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionId;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * An event for adding a new connection to the pool.
+ *
+ * @since 3.5
  */
-@Beta
 public final class ConnectionAddedEvent {
     private final ConnectionId connectionId;
 
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionCheckedInEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionCheckedInEvent.java
index 910fcdf850d..fc9a1772c3c 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionCheckedInEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionCheckedInEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,25 +7,24 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionId;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * An event for checking in a connection to the pool.
+ *
+ * @since 3.5
  */
-@Beta
 public final class ConnectionCheckedInEvent {
     private final ConnectionId connectionId;
 
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionCheckedOutEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionCheckedOutEvent.java
index ef419e6ac73..52555f956da 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionCheckedOutEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionCheckedOutEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,25 +7,24 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionId;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * An event for checking our a connection from the pool.
+ *
+ * @since 3.5
  */
-@Beta
 public final class ConnectionCheckedOutEvent {
     private final ConnectionId connectionId;
 
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionClosedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionClosedEvent.java
index 911d6d25b1f..99fb934cc68 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionClosedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionClosedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,25 +7,26 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionId;
 
 import static org.bson.assertions.Assertions.notNull;
 
 /**
  * A connection closed event.
+ *
+ * @since 3.5
+ * @deprecated there is no replacement for this class
  */
-@Beta
+@Deprecated
 public final class ConnectionClosedEvent {
 
     private final ConnectionId connectionId;
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionEventMulticaster.java b/driver-core/src/main/com/mongodb/event/ConnectionEventMulticaster.java
deleted file mode 100644
index d87b31faa16..00000000000
--- a/driver-core/src/main/com/mongodb/event/ConnectionEventMulticaster.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.event;
-
-import com.mongodb.annotations.Beta;
-
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static java.util.Collections.newSetFromMap;
-
-/**
- * A multicaster for connection events.
- */
-@Beta
-public final class ConnectionEventMulticaster implements ConnectionListener {
-    private final Set<ConnectionListener> connectionListeners = newSetFromMap(new ConcurrentHashMap<ConnectionListener, Boolean>());
-
-    /**
-     * Adds the given connection listener to the list of listeners to invoke on connection events.
-     *
-     * @param connectionListener the connection listener
-     */
-    public void add(final ConnectionListener connectionListener) {
-        connectionListeners.add(connectionListener);
-    }
-
-    /**
-     * Removes the given connection listener from the list of listeners to invoke on connection events.
-     *
-     * @param connectionListener the connection listener
-     */
-    public void remove(final ConnectionListener connectionListener) {
-        connectionListeners.remove(connectionListener);
-    }
-
-    @Override
-    public void connectionOpened(final ConnectionOpenedEvent event) {
-        for (final ConnectionListener cur : connectionListeners) {
-            cur.connectionOpened(event);
-        }
-    }
-
-    @Override
-    public void connectionClosed(final ConnectionClosedEvent event) {
-        for (final ConnectionListener cur : connectionListeners) {
-            cur.connectionClosed(event);
-        }
-    }
-
-    @Override
-    public void messagesSent(final ConnectionMessagesSentEvent event) {
-        for (final ConnectionListener cur : connectionListeners) {
-            cur.messagesSent(event);
-        }
-    }
-
-    @Override
-    public void messageReceived(final ConnectionMessageReceivedEvent event) {
-        for (final ConnectionListener cur : connectionListeners) {
-            cur.messageReceived(event);
-        }
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionListener.java b/driver-core/src/main/com/mongodb/event/ConnectionListener.java
index a8c0ebfc3bb..8999b2794a4 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionListener.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,12 @@
 
 /**
  * A listener for connection-related events.
+ *
+ * @deprecated - No longer used
  */
 @Beta
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ConnectionListener extends EventListener {
 
     /**
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionListenerAdapter.java b/driver-core/src/main/com/mongodb/event/ConnectionListenerAdapter.java
deleted file mode 100644
index 8e7e27aaf6b..00000000000
--- a/driver-core/src/main/com/mongodb/event/ConnectionListenerAdapter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.event;
-
-
-import com.mongodb.annotations.Beta;
-
-/**
- * An adapter for connection listener implementations, for clients that want to listen for a subset of connection events. Extend this class
- * to listen for connection events and override the methods of interest.
- */
-@Beta
-public abstract class ConnectionListenerAdapter implements ConnectionListener {
-    @Override
-    public void connectionOpened(final ConnectionOpenedEvent event) {
-    }
-
-    @Override
-    public void connectionClosed(final ConnectionClosedEvent event) {
-    }
-
-    @Override
-    public void messagesSent(final ConnectionMessagesSentEvent event) {
-    }
-
-    @Override
-    public void messageReceived(final ConnectionMessageReceivedEvent event) {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionMessageReceivedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionMessageReceivedEvent.java
index 04fbe6f94d2..4aa33c3eb80 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionMessageReceivedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionMessageReceivedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,11 @@
 
 /**
  * An event signifying that a message has been received on a connection.
+ *
+ * @deprecated - No longer used
  */
 @Beta
+@Deprecated
 public final class ConnectionMessageReceivedEvent {
     private final int responseTo;
     private final int size;
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionMessagesSentEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionMessagesSentEvent.java
index 4d33d58c314..0c0369cb4fa 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionMessagesSentEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionMessagesSentEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,11 @@
 
 /**
  * An event signifying that a message has been sent on a connection.
+ *
+ * @deprecated - No longer used
  */
 @Beta
+@Deprecated
 public final class ConnectionMessagesSentEvent {
     private final ConnectionId connectionId;
     private final int requestId;
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionOpenedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionOpenedEvent.java
index 7a36b5f80fb..51bbf2bf043 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionOpenedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionOpenedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,25 +7,26 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionId;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * An event for opening a new connection.
+ *
+ * @since 3.5
+ * @deprecated there is no replacement for this class
  */
-@Beta
+@Deprecated
 public final class ConnectionOpenedEvent {
     private final ConnectionId connectionId;
 
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionPoolClosedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionPoolClosedEvent.java
index 864f62aab72..19859a8acac 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionPoolClosedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionPoolClosedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,25 +7,24 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ServerId;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * An event signifying the closing of a connection pool.
+ *
+ * @since 3.5
  */
-@Beta
 public final class ConnectionPoolClosedEvent {
     private final ServerId serverId;
 
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionPoolEventMulticaster.java b/driver-core/src/main/com/mongodb/event/ConnectionPoolEventMulticaster.java
index d567f7daae8..dbb0b3420cc 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionPoolEventMulticaster.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionPoolEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,11 @@
 
 /**
  * A multicaster for connection pool events.
+ *
+ * @deprecated register multiple command listeners instead
  */
 @Beta
+@Deprecated
 public final class ConnectionPoolEventMulticaster implements ConnectionPoolListener {
     private final Set<ConnectionPoolListener> connectionPoolListeners
         = newSetFromMap(new ConcurrentHashMap<ConnectionPoolListener, Boolean>());
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionPoolListener.java b/driver-core/src/main/com/mongodb/event/ConnectionPoolListener.java
index d2683de74e1..cfe32da70f2 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionPoolListener.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionPoolListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
-
 import java.util.EventListener;
 
 /**
  * A listener for connection pool-related events.
+ *
+ * @since 3.5
  */
-@Beta
 public interface ConnectionPoolListener extends EventListener {
     /**
      * Invoked when a connection pool is opened.
@@ -57,14 +56,18 @@ public interface ConnectionPoolListener extends EventListener {
      * Invoked when a connection pool's wait queue is entered.
      *
      * @param event the event
+     * @deprecated In the next major release, this event will no longer be published
      */
+    @Deprecated
     void waitQueueEntered(ConnectionPoolWaitQueueEnteredEvent event);
 
     /**
      * Invoked when a connection pools wait queue is exited.
      *
      * @param event the event
+     * @deprecated In the next major release, this event will no longer be published
      */
+    @Deprecated
     void waitQueueExited(ConnectionPoolWaitQueueExitedEvent event);
 
     /**
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionPoolListenerAdapter.java b/driver-core/src/main/com/mongodb/event/ConnectionPoolListenerAdapter.java
index 2eccaa75eb3..4c662a22b38 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionPoolListenerAdapter.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionPoolListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
-
 /**
  * An adapter for connection pool listener implementations, for clients that want to listen for a subset of connection pool events. Extend
  * this class to listen for connection pool events and override the methods of interest.
+ *
+ * @since 3.5
  */
-@Beta
 public abstract class ConnectionPoolListenerAdapter implements ConnectionPoolListener {
 
     @Override
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionPoolOpenedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionPoolOpenedEvent.java
index 19e33cc1236..9db7d453d11 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionPoolOpenedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionPoolOpenedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionPoolSettings;
 import com.mongodb.connection.ServerId;
 
@@ -24,8 +23,9 @@
 
 /**
  * An event signifying the opening of a connection pool.
+ *
+ * @since 3.5
  */
-@Beta
 public final class ConnectionPoolOpenedEvent {
     private final ServerId serverId;
     private final ConnectionPoolSettings settings;
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueEnteredEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueEnteredEvent.java
index dd0cc4f1983..7f8aef19109 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueEnteredEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueEnteredEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,36 +7,34 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ServerId;
 
 /**
  * An event for entering the wait queue of the connection pool.
+ *
+ * @since 3.5
+ * @deprecated In the next major release, this event will no longer be published
  */
-@Beta
+@Deprecated
 public final class ConnectionPoolWaitQueueEnteredEvent {
     private final ServerId serverId;
-    private final long threadId;
 
     /**
      * Construct an instance.
      *
      * @param serverId the server id
-     * @param threadId the id of the thread that's waiting
      */
-    public ConnectionPoolWaitQueueEnteredEvent(final ServerId serverId, final long threadId) {
+    public ConnectionPoolWaitQueueEnteredEvent(final ServerId serverId) {
         this.serverId = serverId;
-        this.threadId = threadId;
     }
 
     /**
@@ -48,19 +46,10 @@ public ServerId getServerId() {
         return serverId;
     }
 
-    /**
-     * Gets the thread id
-     * @return the thread id
-     */
-    public long getThreadId() {
-        return threadId;
-    }
-
     @Override
     public String toString() {
         return "ConnectionPoolWaitQueueEnteredEvent{"
                        + "serverId=" + serverId
-                       + ", threadId=" + threadId
                        + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueExitedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueExitedEvent.java
index d8d8fe34542..eaabe461ed0 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueExitedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionPoolWaitQueueExitedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,36 +7,34 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ServerId;
 
 /**
  * An event for entering the wait queue of the connection pool.
+ *
+ * @since 3.5
+ * @deprecated In the next major release, this event will no longer be published
  */
-@Beta
+@Deprecated
 public final class ConnectionPoolWaitQueueExitedEvent {
     private final ServerId serverId;
-    private final long threadId;
 
     /**
      * Construct an instance.
      *
      * @param serverId the server id
-     * @param threadId the id of the thread that's waiting
      */
-    public ConnectionPoolWaitQueueExitedEvent(final ServerId serverId, final long threadId) {
+    public ConnectionPoolWaitQueueExitedEvent(final ServerId serverId) {
         this.serverId = serverId;
-        this.threadId = threadId;
     }
 
     /**
@@ -48,19 +46,10 @@ public ServerId getServerId() {
         return serverId;
     }
 
-    /**
-     * Gets the thread id
-     * @return the thread id
-     */
-    public long getThreadId() {
-        return threadId;
-    }
-
     @Override
     public String toString() {
         return "ConnectionPoolWaitQueueExitedEvent{"
                        + "serverId=" + serverId
-                       + ", threadId=" + threadId
                        + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionRemovedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionRemovedEvent.java
index bb90d817c0c..b3d0c0689db 100644
--- a/driver-core/src/main/com/mongodb/event/ConnectionRemovedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ConnectionRemovedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,37 +7,88 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionId;
-
-import static com.mongodb.assertions.Assertions.notNull;
+import org.bson.assertions.Assertions;
 
 /**
  * An event for removing a connection from the pool.
+ *
+ * @since 3.5
  */
-@Beta
 public final class ConnectionRemovedEvent {
+
+    /**
+     * An enumeration of the reasons a connection could be closed
+     * @since 3.11
+     */
+    public enum Reason {
+        /**
+         * Reason unknown
+         */
+        UNKNOWN,
+
+        /**
+         * The pool became stale because the pool has been cleared
+         */
+        STALE,
+
+        /**
+         * The connection became stale by being idle for too long
+         */
+        MAX_IDLE_TIME_EXCEEDED,
+
+        /**
+         * The connection became stale by being open for too long
+         */
+        MAX_LIFE_TIME_EXCEEDED,
+
+        /**
+         * The connection experienced an error, making it no longer valid
+         */
+        ERROR,
+
+        /**
+         * The pool was closed, making the connection no longer valid
+         */
+        POOL_CLOSED,
+   }
+
     private final ConnectionId connectionId;
+    private final Reason reason;
 
     /**
      * Construct an instance
      *
      * @param connectionId the connectionId
+     * @deprecated Prefer {@link #ConnectionRemovedEvent(ConnectionId, Reason)}
      */
+    @Deprecated
     public ConnectionRemovedEvent(final ConnectionId connectionId) {
-        this.connectionId = notNull("connectionId", connectionId);
+        this(connectionId, Reason.UNKNOWN);
     }
 
+    /**
+     * Constructs an instance.
+     *
+     * @param connectionId the connection id
+     * @param reason the reason the connection was closed
+     * @since 3.11
+     */
+    public ConnectionRemovedEvent(final ConnectionId connectionId, final Reason reason) {
+        this.connectionId = Assertions.notNull("connectionId", connectionId);
+        this.reason = Assertions.notNull("reason", reason);
+    }
+
+
     /**
      * Gets the connection id
      *
@@ -47,10 +98,21 @@ public ConnectionId getConnectionId() {
         return connectionId;
     }
 
+    /**
+     * Get the reason the connection was removed.
+     *
+     * @return the reason
+     * @since 3.11
+     */
+    public Reason getReason() {
+        return reason;
+    }
+
     @Override
     public String toString() {
         return "ConnectionRemovedEvent{"
-                       + "connectionId=" + connectionId
-                       + '}';
+                + "connectionId=" + connectionId
+                + ", reason=" + reason
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ServerClosedEvent.java b/driver-core/src/main/com/mongodb/event/ServerClosedEvent.java
index 1ff1aa14e0f..d3eac35c002 100644
--- a/driver-core/src/main/com/mongodb/event/ServerClosedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ServerClosedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.event;
diff --git a/driver-core/src/main/com/mongodb/event/ServerDescriptionChangedEvent.java b/driver-core/src/main/com/mongodb/event/ServerDescriptionChangedEvent.java
index 4650eb7dd3c..14685bdb420 100644
--- a/driver-core/src/main/com/mongodb/event/ServerDescriptionChangedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ServerDescriptionChangedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.event;
diff --git a/driver-core/src/main/com/mongodb/event/ServerEventMulticaster.java b/driver-core/src/main/com/mongodb/event/ServerEventMulticaster.java
index e5a53837af5..a58d95d719b 100644
--- a/driver-core/src/main/com/mongodb/event/ServerEventMulticaster.java
+++ b/driver-core/src/main/com/mongodb/event/ServerEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,12 +7,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
@@ -32,7 +31,9 @@
  * A multicaster for server events.
  *
  * @since 3.3
+ * @deprecated register multiple server listeners instead
  */
+@Deprecated
 public final class ServerEventMulticaster implements ServerListener {
 
     private static final Logger LOGGER = Loggers.getLogger("cluster.event");
diff --git a/driver-core/src/main/com/mongodb/event/ServerHeartbeatFailedEvent.java b/driver-core/src/main/com/mongodb/event/ServerHeartbeatFailedEvent.java
index c22c2f9e23e..9f2d3e30ea7 100644
--- a/driver-core/src/main/com/mongodb/event/ServerHeartbeatFailedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ServerHeartbeatFailedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.event;
@@ -21,7 +20,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -38,12 +37,12 @@ public final class ServerHeartbeatFailedEvent {
      * Construct an instance.
      *
      * @param connectionId the non-null connectionId
-     * @param elapsedTimeNanos the positive elapsed time in nanoseconds
+     * @param elapsedTimeNanos the non-negative elapsed time in nanoseconds
      * @param throwable the non-null exception that caused the failure
      */
     public ServerHeartbeatFailedEvent(final ConnectionId connectionId, final long elapsedTimeNanos, final Throwable throwable) {
         this.connectionId = notNull("connectionId", connectionId);
-        isTrue("elapsed time is positive", elapsedTimeNanos > 0);
+        isTrueArgument("elapsed time is not negative", elapsedTimeNanos >= 0);
         this.elapsedTimeNanos = elapsedTimeNanos;
         this.throwable = notNull("throwable", throwable);
     }
diff --git a/driver-core/src/main/com/mongodb/event/ServerHeartbeatStartedEvent.java b/driver-core/src/main/com/mongodb/event/ServerHeartbeatStartedEvent.java
index ca0716e3462..84e0b42d85f 100644
--- a/driver-core/src/main/com/mongodb/event/ServerHeartbeatStartedEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ServerHeartbeatStartedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.event;
diff --git a/driver-core/src/main/com/mongodb/event/ServerHeartbeatSucceededEvent.java b/driver-core/src/main/com/mongodb/event/ServerHeartbeatSucceededEvent.java
index e26d70ceb7a..f41dc2b68ea 100644
--- a/driver-core/src/main/com/mongodb/event/ServerHeartbeatSucceededEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ServerHeartbeatSucceededEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -39,12 +39,12 @@ public final class ServerHeartbeatSucceededEvent {
      *
      * @param connectionId the non-null connectionId
      * @param reply the non-null reply to an isMaster command
-     * @param elapsedTimeNanos the positive elapsted time in nanoseconds
+     * @param elapsedTimeNanos the non-negative elapsed time in nanoseconds
      */
     public ServerHeartbeatSucceededEvent(final ConnectionId connectionId, final BsonDocument reply, final long elapsedTimeNanos) {
         this.connectionId = notNull("connectionId", connectionId);
         this.reply = notNull("reply", reply);
-        isTrue("elapsed time is positive", elapsedTimeNanos > 0);
+        isTrueArgument("elapsed time is not negative", elapsedTimeNanos >= 0);
         this.elapsedTimeNanos = elapsedTimeNanos;
     }
 
diff --git a/driver-core/src/main/com/mongodb/event/ServerListener.java b/driver-core/src/main/com/mongodb/event/ServerListener.java
index ec13e4da658..cc14c2210d0 100644
--- a/driver-core/src/main/com/mongodb/event/ServerListener.java
+++ b/driver-core/src/main/com/mongodb/event/ServerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.event;
diff --git a/driver-core/src/main/com/mongodb/event/ServerListenerAdapter.java b/driver-core/src/main/com/mongodb/event/ServerListenerAdapter.java
new file mode 100644
index 00000000000..95b3202ebfa
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/event/ServerListenerAdapter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.event;
+
+/**
+ * An adapter for server listener implementations, for clients that want to listen for a subset of server events. Extend
+ * this class to listen for server events and override the methods of interest.
+ *
+ * @since 3.5
+ */
+public abstract class ServerListenerAdapter implements ServerListener {
+    @Override
+    public void serverOpening(final ServerOpeningEvent event) {
+    }
+
+    @Override
+    public void serverClosed(final ServerClosedEvent event) {
+    }
+
+    @Override
+    public void serverDescriptionChanged(final ServerDescriptionChangedEvent event) {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/event/ServerMonitorEventMulticaster.java b/driver-core/src/main/com/mongodb/event/ServerMonitorEventMulticaster.java
index 49262b0247f..634e94ec604 100644
--- a/driver-core/src/main/com/mongodb/event/ServerMonitorEventMulticaster.java
+++ b/driver-core/src/main/com/mongodb/event/ServerMonitorEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,12 +7,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.mongodb.event;
@@ -32,7 +31,9 @@
  * A multicaster for server events.
  *
  * @since 3.3
+ * @deprecated register multiple server monitor listeners instead
  */
+@Deprecated
 public final class ServerMonitorEventMulticaster implements ServerMonitorListener {
     private static final Logger LOGGER = Loggers.getLogger("cluster.event");
 
diff --git a/driver-core/src/main/com/mongodb/event/ServerMonitorListener.java b/driver-core/src/main/com/mongodb/event/ServerMonitorListener.java
index 0102a97530f..680e6db5b28 100644
--- a/driver-core/src/main/com/mongodb/event/ServerMonitorListener.java
+++ b/driver-core/src/main/com/mongodb/event/ServerMonitorListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 
diff --git a/driver-core/src/main/com/mongodb/event/ServerMonitorListenerAdapter.java b/driver-core/src/main/com/mongodb/event/ServerMonitorListenerAdapter.java
new file mode 100644
index 00000000000..a370c9fd17b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/event/ServerMonitorListenerAdapter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.event;
+
+/**
+ * An adapter for server monitor listener implementations, for clients that want to listen for a subset of server monitor-related events.
+ * Extend this class to listen for server monitor-related events and override the methods of interest.
+ *
+ * @since 3.5
+ */
+public abstract class ServerMonitorListenerAdapter implements ServerMonitorListener {
+    @Override
+    public void serverHearbeatStarted(final ServerHeartbeatStartedEvent event) {
+    }
+
+    @Override
+    public void serverHeartbeatSucceeded(final ServerHeartbeatSucceededEvent event) {
+    }
+
+    @Override
+    public void serverHeartbeatFailed(final ServerHeartbeatFailedEvent event) {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/event/ServerOpeningEvent.java b/driver-core/src/main/com/mongodb/event/ServerOpeningEvent.java
index 52ed3f61266..2d13f83cc18 100644
--- a/driver-core/src/main/com/mongodb/event/ServerOpeningEvent.java
+++ b/driver-core/src/main/com/mongodb/event/ServerOpeningEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.event;
diff --git a/driver-core/src/main/com/mongodb/event/package-info.java b/driver-core/src/main/com/mongodb/event/package-info.java
index 9a62d57d238..8e1ece3e4dc 100644
--- a/driver-core/src/main/com/mongodb/event/package-info.java
+++ b/driver-core/src/main/com/mongodb/event/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/internal/HexUtils.java b/driver-core/src/main/com/mongodb/internal/HexUtils.java
index c70c05ae8d2..9f293df916a 100644
--- a/driver-core/src/main/com/mongodb/internal/HexUtils.java
+++ b/driver-core/src/main/com/mongodb/internal/HexUtils.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/main/com/mongodb/internal/async/ErrorHandlingResultCallback.java b/driver-core/src/main/com/mongodb/internal/async/ErrorHandlingResultCallback.java
index 4f588d0a04c..df9e0438d2f 100644
--- a/driver-core/src/main/com/mongodb/internal/async/ErrorHandlingResultCallback.java
+++ b/driver-core/src/main/com/mongodb/internal/async/ErrorHandlingResultCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public void onResult(final T result, final Throwable t) {
         try {
             wrapped.onResult(result, t);
         } catch (Throwable e) {
-            logger.warn("Callback onResult call produced an error", e);
+            logger.error("Callback onResult call produced an error", e);
         }
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/authentication/NativeAuthenticationHelper.java b/driver-core/src/main/com/mongodb/internal/authentication/NativeAuthenticationHelper.java
index 11c5434bfe1..ed1bb2bd6ab 100644
--- a/driver-core/src/main/com/mongodb/internal/authentication/NativeAuthenticationHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/authentication/NativeAuthenticationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/internal/authentication/SaslPrep.java b/driver-core/src/main/com/mongodb/internal/authentication/SaslPrep.java
new file mode 100644
index 00000000000..3ef54fa1142
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/authentication/SaslPrep.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ * Copyright 2017 Tom Bentley
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.authentication;
+
+import java.nio.CharBuffer;
+import java.text.Normalizer;
+
+/**
+ * Utility class for Sasl string preparation.
+ *
+ * <p>This class should not be considered a part of the public API.</p>
+ */
+public final class SaslPrep {
+
+    /**
+     * Return the {@code SASLPrep}-canonicalised version of the given {@code str} for use as a query string.
+     * This implements the {@code SASLPrep} algorithm defined in <a href="https://tools.ietf.org/html/rfc4013">RFC 4013</a>.
+     *
+     * @param str The string to canonicalise.
+     * @return The canonicalised string.
+     * @throws IllegalArgumentException if the string contained prohibited codepoints, or broke the requirements for bidirectional
+     * character handling.
+     * @see <a href="https://tools.ietf.org/html/rfc3454#section-7">RFC 3454, Section 7</a> for discussion of what a query string is.
+     */
+    public static String saslPrepQuery(final String str) {
+        return saslPrep(str, true);
+    }
+
+    /**
+     * Return the {@code SASLPrep}-canonicalised version of the given {@code str} for use as a stored string.
+     * This implements the {@code SASLPrep} algorithm defined in <a href="https://tools.ietf.org/html/rfc4013">RFC 4013</a>.
+     *
+     * @param str The string to canonicalise.
+     * @return The canonicalised string.
+     * @throws IllegalArgumentException if the string contained prohibited codepoints, or broke the requirements for bidirectional
+     * character handling.
+     * @see <a href="https://tools.ietf.org/html/rfc3454#section-7">RFC 3454, Section 7</a> for discussion of what a stored string is.
+     */
+    public static String saslPrepStored(final String str) {
+        return saslPrep(str, false);
+    }
+
+
+    private static String saslPrep(final String str, final boolean allowUnassigned) {
+        char[] chars = str.toCharArray();
+
+        // 1. Map
+
+        // non-ASCII space chars mapped to space
+        for (int i = 0; i < str.length(); i++) {
+            char ch = str.charAt(i);
+            if (nonAsciiSpace(ch)) {
+                chars[i] = ' ';
+            }
+        }
+
+        int length = 0;
+        for (int i = 0; i < str.length(); i++) {
+            char ch = chars[i];
+            if (!mappedToNothing(ch)) {
+                chars[length++] = ch;
+            }
+        }
+
+        // 2. Normalize
+        String normalized = Normalizer.normalize(CharBuffer.wrap(chars, 0, length), Normalizer.Form.NFKC);
+
+        boolean containsRandALCat = false;
+        boolean containsLCat = false;
+        boolean initialRandALCat = false;
+        for (int i = 0; i < normalized.length();) {
+            final int codepoint = normalized.codePointAt(i);
+            // 3. Prohibit
+            if (prohibited(codepoint)) {
+                throw new IllegalArgumentException("Prohibited character at position " + i);
+            }
+
+            // 4. Check bidi
+            final byte directionality = Character.getDirectionality(codepoint);
+            final boolean isRandALcat = directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT
+                    || directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC;
+            containsRandALCat |= isRandALcat;
+            containsLCat |= directionality == Character.DIRECTIONALITY_LEFT_TO_RIGHT;
+
+            initialRandALCat |= i == 0 && isRandALcat;
+            if (!allowUnassigned && !Character.isDefined(codepoint)) {
+                throw new IllegalArgumentException("Character at position " + i + " is unassigned");
+            }
+            i += Character.charCount(codepoint);
+
+            if (initialRandALCat && i >= normalized.length() && !isRandALcat) {
+                throw new IllegalArgumentException("First character is RandALCat, but last character is not");
+            }
+
+        }
+        if (containsRandALCat && containsLCat) {
+            throw new IllegalArgumentException("Contains both RandALCat characters and LCat characters");
+        }
+        return normalized;
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is a prohibited character as defined by
+     * <a href="https://tools.ietf.org/html/rfc4013#section-2.3">RFC 4013, Section 2.3</a>.
+     */
+    static boolean prohibited(final int codepoint) {
+        return nonAsciiSpace((char) codepoint)
+                || asciiControl((char) codepoint)
+                || nonAsciiControl(codepoint)
+                || privateUse(codepoint)
+                || nonCharacterCodePoint(codepoint)
+                || surrogateCodePoint(codepoint)
+                || inappropriateForPlainText(codepoint)
+                || inappropriateForCanonical(codepoint)
+                || changeDisplayProperties(codepoint)
+                || tagging(codepoint);
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is a tagging character as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.9">RFC 3454, Appendix C.9</a>.
+     */
+    private static boolean tagging(final int codepoint) {
+        return codepoint == 0xE0001
+                || 0xE0020 <= codepoint && codepoint <= 0xE007F;
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is change display properties or deprecated characters as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.8">RFC 3454, Appendix C.8</a>.
+     */
+    private static boolean changeDisplayProperties(final int codepoint) {
+        return codepoint == 0x0340
+                || codepoint == 0x0341
+                || codepoint == 0x200E
+                || codepoint == 0x200F
+                || codepoint == 0x202A
+                || codepoint == 0x202B
+                || codepoint == 0x202C
+                || codepoint == 0x202D
+                || codepoint == 0x202E
+                || codepoint == 0x206A
+                || codepoint == 0x206B
+                || codepoint == 0x206C
+                || codepoint == 0x206D
+                || codepoint == 0x206E
+                || codepoint == 0x206F;
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is inappropriate for canonical representation characters as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.7">RFC 3454, Appendix C.7</a>.
+     */
+    private static boolean inappropriateForCanonical(final int codepoint) {
+        return 0x2FF0 <= codepoint && codepoint <= 0x2FFB;
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is inappropriate for plain text characters as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.6">RFC 3454, Appendix C.6</a>.
+     */
+    private static boolean inappropriateForPlainText(final int codepoint) {
+        return codepoint == 0xFFF9
+                || codepoint == 0xFFFA
+                || codepoint == 0xFFFB
+                || codepoint == 0xFFFC
+                || codepoint == 0xFFFD;
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is a surrogate code point as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.5">RFC 3454, Appendix C.5</a>.
+     */
+    private static boolean surrogateCodePoint(final int codepoint) {
+        return 0xD800 <= codepoint && codepoint <= 0xDFFF;
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is a non-character code point as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.4">RFC 3454, Appendix C.4</a>.
+     */
+    private static boolean nonCharacterCodePoint(final int codepoint) {
+        return 0xFDD0 <= codepoint && codepoint <= 0xFDEF
+                || 0xFFFE <= codepoint && codepoint <= 0xFFFF
+                || 0x1FFFE <= codepoint && codepoint <= 0x1FFFF
+                || 0x2FFFE <= codepoint && codepoint <= 0x2FFFF
+                || 0x3FFFE <= codepoint && codepoint <= 0x3FFFF
+                || 0x4FFFE <= codepoint && codepoint <= 0x4FFFF
+                || 0x5FFFE <= codepoint && codepoint <= 0x5FFFF
+                || 0x6FFFE <= codepoint && codepoint <= 0x6FFFF
+                || 0x7FFFE <= codepoint && codepoint <= 0x7FFFF
+                || 0x8FFFE <= codepoint && codepoint <= 0x8FFFF
+                || 0x9FFFE <= codepoint && codepoint <= 0x9FFFF
+                || 0xAFFFE <= codepoint && codepoint <= 0xAFFFF
+                || 0xBFFFE <= codepoint && codepoint <= 0xBFFFF
+                || 0xCFFFE <= codepoint && codepoint <= 0xCFFFF
+                || 0xDFFFE <= codepoint && codepoint <= 0xDFFFF
+                || 0xEFFFE <= codepoint && codepoint <= 0xEFFFF
+                || 0xFFFFE <= codepoint && codepoint <= 0xFFFFF
+                || 0x10FFFE <= codepoint && codepoint <= 0x10FFFF;
+    }
+
+    /**
+     * Return true if the given {@code codepoint} is a private use character as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.3">RFC 3454, Appendix C.3</a>.
+     */
+    private static boolean privateUse(final int codepoint) {
+        return 0xE000 <= codepoint && codepoint <= 0xF8FF
+                || 0xF000 <= codepoint && codepoint <= 0xFFFFD
+                || 0x100000 <= codepoint && codepoint <= 0x10FFFD;
+    }
+
+    /**
+     * Return true if the given {@code ch} is a non-ASCII control character as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.2.2">RFC 3454, Appendix C.2.2</a>.
+     */
+    private static boolean nonAsciiControl(final int codepoint) {
+        return 0x0080 <= codepoint && codepoint <= 0x009F
+                || codepoint == 0x06DD
+                || codepoint == 0x070F
+                || codepoint == 0x180E
+                || codepoint == 0x200C
+                || codepoint == 0x200D
+                || codepoint == 0x2028
+                || codepoint == 0x2029
+                || codepoint == 0x2060
+                || codepoint == 0x2061
+                || codepoint == 0x2062
+                || codepoint == 0x2063
+                || 0x206A <= codepoint && codepoint <= 0x206F
+                || codepoint == 0xFEFF
+                || 0xFFF9 <= codepoint && codepoint <= 0xFFFC
+                || 0x1D173 <= codepoint && codepoint <= 0x1D17A;
+    }
+
+    /**
+     * Return true if the given {@code ch} is an ASCII control character as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.2.1">RFC 3454, Appendix C.2.1</a>.
+     */
+    private static boolean asciiControl(final char ch) {
+        return ch <= '\u001F' || ch == '\u007F';
+    }
+
+    /**
+     * Return true if the given {@code ch} is a non-ASCII space character as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-C.1.2">RFC 3454, Appendix C.1.2</a>.
+     */
+    private static boolean nonAsciiSpace(final char ch) {
+        return ch == '\u00A0'
+                || ch == '\u1680'
+                || '\u2000' <= ch && ch <= '\u200B'
+                || ch == '\u202F'
+                || ch == '\u205F'
+                || ch == '\u3000';
+    }
+
+    /**
+     * Return true if the given {@code ch} is a "commonly mapped to nothing" character as defined by
+     * <a href="https://tools.ietf.org/html/rfc3454#appendix-B.1">RFC 3454,
+     * Appendix B.1</a>.
+     */
+    private static boolean mappedToNothing(final char ch) {
+        return ch == '\u00AD'
+                || ch == '\u034F'
+                || ch == '\u1806'
+                || ch == '\u180B'
+                || ch == '\u180C'
+                || ch == '\u180D'
+                || ch == '\u200B'
+                || ch == '\u200C'
+                || ch == '\u200D'
+                || ch == '\u2060'
+                || '\uFE00' <= ch && ch <= '\uFE0F'
+                || ch == '\uFEFF';
+    }
+
+    private SaslPrep() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AbstractReferenceCounted.java b/driver-core/src/main/com/mongodb/internal/binding/AbstractReferenceCounted.java
new file mode 100644
index 00000000000..e5452ca4b69
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/binding/AbstractReferenceCounted.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.binding;
+
+import com.mongodb.binding.ReferenceCounted;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public abstract class AbstractReferenceCounted implements ReferenceCounted {
+    private final AtomicInteger referenceCount = new AtomicInteger(1);
+    @Override
+    public int getCount() {
+        return referenceCount.get();
+    }
+
+    @Override
+    public ReferenceCounted retain() {
+        if (referenceCount.incrementAndGet() == 1) {
+            throw new IllegalStateException("Attempted to increment the reference count when it is already 0");
+        }
+        return this;
+    }
+
+    @Override
+    public void release() {
+        if (referenceCount.decrementAndGet() < 0) {
+            throw new IllegalStateException("Attempted to decrement the reference count below 0");
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
new file mode 100644
index 00000000000..ec0523f23f7
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.binding;
+
+
+import com.mongodb.binding.AsyncReadWriteBinding;
+import com.mongodb.connection.Cluster;
+
+/**
+ * This interface is not part of the public API and may be removed or changed at any time.
+ */
+public interface AsyncClusterAwareReadWriteBinding extends AsyncReadWriteBinding {
+    Cluster getCluster();
+}
diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java
new file mode 100644
index 00000000000..cc460620957
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.binding;
+
+import com.mongodb.binding.ReadWriteBinding;
+import com.mongodb.connection.Cluster;
+
+/**
+ * This interface is not part of the public API and may be removed or changed at any time.
+ */
+public interface ClusterAwareReadWriteBinding extends ReadWriteBinding {
+    Cluster getCluster();
+}
diff --git a/driver-core/src/main/com/mongodb/internal/capi/MongoCryptOptionsHelper.java b/driver-core/src/main/com/mongodb/internal/capi/MongoCryptOptionsHelper.java
new file mode 100644
index 00000000000..79abbedd39e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/capi/MongoCryptOptionsHelper.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.capi;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.crypt.capi.MongoAwsKmsProviderOptions;
+import com.mongodb.crypt.capi.MongoCryptOptions;
+import com.mongodb.crypt.capi.MongoLocalKmsProviderOptions;
+import org.bson.BsonDocument;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public final class MongoCryptOptionsHelper {
+
+    public static MongoCryptOptions createMongoCryptOptions(final Map<String, Map<String, Object>> kmsProviders,
+                                                            final Map<String, BsonDocument> namespaceToLocalSchemaDocumentMap) {
+        MongoCryptOptions.Builder mongoCryptOptionsBuilder = MongoCryptOptions.builder();
+
+        for (Map.Entry<String, Map<String, Object>> entry : kmsProviders.entrySet()) {
+            if (entry.getKey().equals("aws")) {
+                mongoCryptOptionsBuilder.awsKmsProviderOptions(
+                        MongoAwsKmsProviderOptions.builder()
+                                .accessKeyId((String) entry.getValue().get("accessKeyId"))
+                                .secretAccessKey((String) entry.getValue().get("secretAccessKey"))
+                                .build()
+                );
+            } else if (entry.getKey().equals("local")) {
+                mongoCryptOptionsBuilder.localKmsProviderOptions(
+                        MongoLocalKmsProviderOptions.builder()
+                                .localMasterKey(ByteBuffer.wrap((byte[]) entry.getValue().get("key")))
+                                .build()
+                );
+            } else {
+                throw new MongoClientException("Unrecognized KMS provider key: " + entry.getKey());
+            }
+        }
+        mongoCryptOptionsBuilder.localSchemaMap(namespaceToLocalSchemaDocumentMap);
+        return mongoCryptOptionsBuilder.build();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static List<String> createMongocryptdSpawnArgs(final Map<String, Object> options) {
+        List<String> spawnArgs = new ArrayList<String>();
+
+        String path = options.containsKey("mongocryptdSpawnPath")
+                ? (String) options.get("mongocryptdSpawnPath")
+                : "mongocryptd";
+
+        spawnArgs.add(path);
+        if (options.containsKey("mongocryptdSpawnArgs")) {
+            spawnArgs.addAll((List<String>) options.get("mongocryptdSpawnArgs"));
+        }
+
+        if (!spawnArgs.contains("--idleShutdownTimeoutSecs")) {
+            spawnArgs.add("--idleShutdownTimeoutSecs");
+            spawnArgs.add("60");
+        }
+        return spawnArgs;
+    }
+
+    private MongoCryptOptionsHelper(){
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/client/model/CountOptionsHelper.java b/driver-core/src/main/com/mongodb/internal/client/model/CountOptionsHelper.java
new file mode 100644
index 00000000000..f09d03fe01e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/client/model/CountOptionsHelper.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.client.model;
+
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.EstimatedDocumentCountOptions;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Not part of the public API
+ */
+public final class CountOptionsHelper {
+
+    public static CountOptions fromEstimatedDocumentCountOptions(final EstimatedDocumentCountOptions options) {
+        return new CountOptions().maxTime(options.getMaxTime(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS);
+    }
+
+    private CountOptionsHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/client/model/CountStrategy.java b/driver-core/src/main/com/mongodb/internal/client/model/CountStrategy.java
new file mode 100644
index 00000000000..48ac8e1a1ba
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/client/model/CountStrategy.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.client.model;
+
+/**
+ * Not part of the public API
+ */
+public enum CountStrategy {
+
+    /**
+     * Use the count command
+     */
+    COMMAND,
+
+    /**
+     * Use the Aggregate command
+     */
+    AGGREGATE
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AbstractByteBufBsonDocument.java b/driver-core/src/main/com/mongodb/internal/connection/AbstractByteBufBsonDocument.java
new file mode 100644
index 00000000000..989318b8d0f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/AbstractByteBufBsonDocument.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.BsonDocument;
+import org.bson.BsonReader;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import static org.bson.codecs.BsonValueCodecProvider.getClassForBsonType;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+abstract class AbstractByteBufBsonDocument extends BsonDocument {
+    private static final long serialVersionUID = 1L;
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException("ByteBufBsonDocument instances are immutable");
+    }
+
+    @Override
+    public BsonValue put(final String key, final BsonValue value) {
+        throw new UnsupportedOperationException("ByteBufBsonDocument instances are immutable");
+    }
+
+    @Override
+    public BsonDocument append(final String key, final BsonValue value) {
+        throw new UnsupportedOperationException("ByteBufBsonDocument instances are immutable");
+    }
+
+    @Override
+    public void putAll(final Map<? extends String, ? extends BsonValue> m) {
+        throw new UnsupportedOperationException("ByteBufBsonDocument instances are immutable");
+    }
+
+    @Override
+    public BsonValue remove(final Object key) {
+        throw new UnsupportedOperationException("ByteBufBsonDocument instances are immutable");
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return findInDocument(new Finder<Boolean>() {
+            @Override
+            public Boolean find(final BsonReader bsonReader) {
+                return false;
+            }
+
+            @Override
+            public Boolean notFound() {
+                return true;
+            }
+        });
+    }
+
+    @Override
+    public int size() {
+        return findInDocument(new Finder<Integer>() {
+            private int size;
+
+            @Override
+            public Integer find(final BsonReader bsonReader) {
+                size++;
+                bsonReader.readName();
+                bsonReader.skipValue();
+                return null;
+            }
+
+            @Override
+            public Integer notFound() {
+                return size;
+            }
+        });
+    }
+
+    @Override
+    public Set<Entry<String, BsonValue>> entrySet() {
+        return toBsonDocument().entrySet();
+    }
+
+    @Override
+    public Collection<BsonValue> values() {
+        return toBsonDocument().values();
+    }
+
+    @Override
+    public Set<String> keySet() {
+        return toBsonDocument().keySet();
+    }
+
+    @Override
+    public boolean containsKey(final Object key) {
+        if (key == null) {
+            throw new IllegalArgumentException("key can not be null");
+        }
+
+        Boolean containsKey = findInDocument(new Finder<Boolean>() {
+            @Override
+            public Boolean find(final BsonReader bsonReader) {
+                if (bsonReader.readName().equals(key)) {
+                    return true;
+                }
+                bsonReader.skipValue();
+                return null;
+            }
+
+            @Override
+            public Boolean notFound() {
+                return false;
+            }
+        });
+        return containsKey != null ? containsKey : false;
+    }
+
+    @Override
+    public boolean containsValue(final Object value) {
+        Boolean containsValue = findInDocument(new Finder<Boolean>() {
+            @Override
+            public Boolean find(final BsonReader bsonReader) {
+                bsonReader.skipName();
+                if (deserializeBsonValue(bsonReader).equals(value)) {
+                    return true;
+                }
+                return null;
+            }
+
+            @Override
+            public Boolean notFound() {
+                return false;
+            }
+        });
+        return containsValue != null ? containsValue : false;
+    }
+
+    @Override
+    public BsonValue get(final Object key) {
+        if (key == null) {
+            throw new IllegalArgumentException("key can not be null");
+        }
+
+        return findInDocument(new Finder<BsonValue>() {
+            @Override
+            public BsonValue find(final BsonReader bsonReader) {
+                if (bsonReader.readName().equals(key)) {
+                    return deserializeBsonValue(bsonReader);
+                }
+                bsonReader.skipValue();
+                return null;
+            }
+
+            @Override
+            public BsonValue notFound() {
+                return null;
+            }
+        });
+    }
+
+    /**
+     * Gets the first key in this document, or null if the document is empty.
+     *
+     * @return the first key in this document, or null if the document is empty
+     */
+    public String getFirstKey() {
+        return findInDocument(new Finder<String>() {
+            @Override
+            public String find(final BsonReader bsonReader) {
+                return bsonReader.readName();
+            }
+
+            @Override
+            public String notFound() {
+                throw new NoSuchElementException();
+            }
+        });
+    }
+
+    interface Finder<T> {
+        T find(BsonReader bsonReader);
+        T notFound();
+    }
+
+    abstract <T> T findInDocument(Finder<T> finder);
+
+    //AbstractBsonReader getBsonReader();
+
+    abstract BsonDocument toBsonDocument();
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        return toBsonDocument().equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return toBsonDocument().hashCode();
+    }
+
+    private BsonValue deserializeBsonValue(final BsonReader bsonReader) {
+        return REGISTRY.get(getClassForBsonType(bsonReader.getCurrentBsonType())).decode(bsonReader, DecoderContext.builder().build());
+    }
+
+    // see https://docs.oracle.com/javase/6/docs/platform/serialization/spec/output.html
+    Object writeReplace() {
+        return toBsonDocument();
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java b/driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java
new file mode 100644
index 00000000000..ca2ee607b77
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java
@@ -0,0 +1,448 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.ClusterDescriptionChangedEvent;
+import com.mongodb.event.ServerDescriptionChangedEvent;
+import com.mongodb.event.ServerListenerAdapter;
+import org.bson.BsonDocument;
+import org.bson.types.ObjectId;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
+import static com.mongodb.connection.ClusterType.UNKNOWN;
+import static com.mongodb.connection.ServerConnectionState.CONNECTING;
+import static com.mongodb.connection.ServerType.REPLICA_SET_GHOST;
+import static com.mongodb.connection.ServerType.SHARD_ROUTER;
+import static com.mongodb.connection.ServerType.STANDALONE;
+import static java.lang.String.format;
+
+public abstract class AbstractMultiServerCluster extends BaseCluster {
+    private static final Logger LOGGER = Loggers.getLogger("cluster");
+
+    private ClusterType clusterType;
+    private String replicaSetName;
+    private ObjectId maxElectionId;
+    private Integer maxSetVersion;
+
+    private final ConcurrentMap<ServerAddress, ServerTuple> addressToServerTupleMap =
+    new ConcurrentHashMap<ServerAddress, ServerTuple>();
+
+    private static final class ServerTuple {
+        private final ClusterableServer server;
+        private ServerDescription description;
+
+        private ServerTuple(final ClusterableServer server, final ServerDescription description) {
+            this.server = server;
+            this.description = description;
+        }
+    }
+
+    AbstractMultiServerCluster(final ClusterId clusterId, final ClusterSettings settings, final ClusterableServerFactory serverFactory) {
+        super(clusterId, settings, serverFactory);
+        isTrue("connection mode is multiple", settings.getMode() == ClusterConnectionMode.MULTIPLE);
+        clusterType = settings.getRequiredClusterType();
+        replicaSetName = settings.getRequiredReplicaSetName();
+
+        if (LOGGER.isInfoEnabled()) {
+            LOGGER.info(format("Cluster created with settings %s", settings.getShortDescription()));
+        }
+    }
+
+    ClusterType getClusterType() {
+        return clusterType;
+    }
+
+    MongoException getSrvResolutionException() {
+        return null;
+    }
+
+    protected void initialize(final Collection<ServerAddress> serverAddresses) {
+        ClusterDescription currentDescription = getCurrentDescription();
+        ClusterDescription newDescription;
+
+        // synchronizing this code because addServer registers a callback which is re-entrant to this instance.
+        // In other words, we are leaking a reference to "this" from the constructor.
+        synchronized (this) {
+            for (final ServerAddress serverAddress : serverAddresses) {
+                addServer(serverAddress);
+            }
+            newDescription = updateDescription();
+        }
+        fireChangeEvent(new ClusterDescriptionChangedEvent(getClusterId(), newDescription, currentDescription));
+    }
+
+    @Override
+    protected void connect() {
+        for (ServerTuple cur : addressToServerTupleMap.values()) {
+            cur.server.connect();
+        }
+    }
+
+    @Override
+    public void close() {
+        synchronized (this) {
+            if (!isClosed()) {
+                for (final ServerTuple serverTuple : addressToServerTupleMap.values()) {
+                    serverTuple.server.close();
+                }
+            }
+            super.close();
+        }
+    }
+
+    @Override
+    protected ClusterableServer getServer(final ServerAddress serverAddress) {
+        isTrue("is open", !isClosed());
+
+        ServerTuple serverTuple = addressToServerTupleMap.get(serverAddress);
+        if (serverTuple == null) {
+            return null;
+        }
+        return serverTuple.server;
+    }
+
+
+    private final class DefaultServerStateListener extends ServerListenerAdapter {
+        @Override
+        public void serverDescriptionChanged(final ServerDescriptionChangedEvent event) {
+            onChange(event);
+        }
+    }
+
+    void onChange(final Collection<ServerAddress> newHosts) {
+        synchronized (this) {
+            if (isClosed()) {
+                return;
+            }
+
+            for (ServerAddress cur : newHosts) {
+                addServer(cur);
+            }
+
+            for (Iterator<ServerTuple> iterator = addressToServerTupleMap.values().iterator(); iterator.hasNext();) {
+                ServerTuple cur = iterator.next();
+                if (!newHosts.contains(cur.description.getAddress())) {
+                    if (LOGGER.isInfoEnabled()) {
+                        LOGGER.info(format("Removing %s from client view of cluster.", cur.description.getAddress()));
+                    }
+                    iterator.remove();
+                    cur.server.close();
+                }
+            }
+
+            ClusterDescription oldClusterDescription = getCurrentDescription();
+            ClusterDescription newClusterDescription = updateDescription();
+
+            fireChangeEvent(new ClusterDescriptionChangedEvent(getClusterId(), newClusterDescription, oldClusterDescription));
+        }
+    }
+
+    private void onChange(final ServerDescriptionChangedEvent event) {
+        ClusterDescription oldClusterDescription = null;
+        ClusterDescription newClusterDescription = null;
+        boolean shouldUpdateDescription = true;
+        synchronized (this) {
+            if (isClosed()) {
+                return;
+            }
+
+            ServerDescription newDescription = event.getNewDescription();
+
+            if (LOGGER.isTraceEnabled()) {
+                LOGGER.trace(format("Handling description changed event for server %s with description %s",
+                                    newDescription.getAddress(), newDescription));
+            }
+
+            ServerTuple serverTuple = addressToServerTupleMap.get(newDescription.getAddress());
+            if (serverTuple == null) {
+                if (LOGGER.isTraceEnabled()) {
+                    LOGGER.trace(format("Ignoring description changed event for removed server %s",
+                                        newDescription.getAddress()));
+                }
+                return;
+            }
+
+            if (event.getNewDescription().isOk()) {
+                if (clusterType == UNKNOWN && newDescription.getType() != REPLICA_SET_GHOST) {
+                    clusterType = newDescription.getClusterType();
+                    if (LOGGER.isInfoEnabled()) {
+                        LOGGER.info(format("Discovered cluster type of %s", clusterType));
+                    }
+                }
+
+                switch (clusterType) {
+                    case REPLICA_SET:
+                        shouldUpdateDescription = handleReplicaSetMemberChanged(newDescription);
+                        break;
+                    case SHARDED:
+                        shouldUpdateDescription = handleShardRouterChanged(newDescription);
+                        break;
+                    case STANDALONE:
+                        shouldUpdateDescription = handleStandAloneChanged(newDescription);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            if (shouldUpdateDescription) {
+                serverTuple.description = newDescription;
+                oldClusterDescription = getCurrentDescription();
+                newClusterDescription = updateDescription();
+            }
+        }
+        if (shouldUpdateDescription) {
+            fireChangeEvent(new ClusterDescriptionChangedEvent(getClusterId(), newClusterDescription, oldClusterDescription));
+        }
+    }
+
+    private boolean handleReplicaSetMemberChanged(final ServerDescription newDescription) {
+        if (!newDescription.isReplicaSetMember()) {
+            LOGGER.error(format("Expecting replica set member, but found a %s.  Removing %s from client view of cluster.",
+                                newDescription.getType(), newDescription.getAddress()));
+            removeServer(newDescription.getAddress());
+            return true;
+        }
+
+        if (newDescription.getType() == REPLICA_SET_GHOST) {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info(format("Server %s does not appear to be a member of an initiated replica set.", newDescription.getAddress()));
+            }
+            return true;
+        }
+
+        if (replicaSetName == null) {
+            replicaSetName = newDescription.getSetName();
+        }
+
+        if (!replicaSetName.equals(newDescription.getSetName())) {
+            LOGGER.error(format("Expecting replica set member from set '%s', but found one from set '%s'.  "
+                                 + "Removing %s from client view of cluster.",
+                                 replicaSetName, newDescription.getSetName(), newDescription.getAddress()));
+            removeServer(newDescription.getAddress());
+            return true;
+        }
+
+        ensureServers(newDescription);
+
+        if (newDescription.getCanonicalAddress() != null
+                && !newDescription.getAddress().equals(new ServerAddress(newDescription.getCanonicalAddress()))) {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info(format("Canonical address %s does not match server address.  Removing %s from client view of cluster",
+                                   newDescription.getCanonicalAddress(), newDescription.getAddress()));
+            }
+            removeServer(newDescription.getAddress());
+            return true;
+        }
+
+        if (newDescription.isPrimary()) {
+            if (newDescription.getSetVersion() != null && newDescription.getElectionId() != null) {
+                if (isStalePrimary(newDescription)) {
+                    if (LOGGER.isInfoEnabled()) {
+                        LOGGER.info(format("Invalidating potential primary %s whose (set version, election id) tuple of (%d, %s) "
+                                + "is less than one already seen of (%d, %s)",
+                                newDescription.getAddress(),
+                                newDescription.getSetVersion(), newDescription.getElectionId(),
+                                maxSetVersion, maxElectionId));
+                    }
+                    addressToServerTupleMap.get(newDescription.getAddress()).server.invalidate();
+                    return false;
+                }
+
+                if (!newDescription.getElectionId().equals(maxElectionId)) {
+                    if (LOGGER.isInfoEnabled()) {
+                        LOGGER.info(format("Setting max election id to %s from replica set primary %s", newDescription.getElectionId(),
+                                newDescription.getAddress()));
+                    }
+                    maxElectionId = newDescription.getElectionId();
+                }
+            }
+
+            if (newDescription.getSetVersion() != null
+                    && (maxSetVersion == null || newDescription.getSetVersion().compareTo(maxSetVersion) > 0)) {
+                if (LOGGER.isInfoEnabled()) {
+                    LOGGER.info(format("Setting max set version to %d from replica set primary %s", newDescription.getSetVersion(),
+                            newDescription.getAddress()));
+                }
+                maxSetVersion = newDescription.getSetVersion();
+            }
+
+            if (isNotAlreadyPrimary(newDescription.getAddress())) {
+                LOGGER.info(format("Discovered replica set primary %s", newDescription.getAddress()));
+            }
+            invalidateOldPrimaries(newDescription.getAddress());
+        }
+        return true;
+    }
+
+    private boolean isStalePrimary(final ServerDescription newDescription) {
+        if (maxSetVersion == null || maxElectionId == null) {
+            return false;
+        }
+
+        return (maxSetVersion.compareTo(newDescription.getSetVersion()) > 0
+                || (maxSetVersion.equals(newDescription.getSetVersion()) && maxElectionId.compareTo(newDescription.getElectionId()) > 0));
+    }
+
+    private boolean isNotAlreadyPrimary(final ServerAddress address) {
+        ServerTuple serverTuple = addressToServerTupleMap.get(address);
+        return serverTuple == null || !serverTuple.description.isPrimary();
+    }
+
+    private boolean handleShardRouterChanged(final ServerDescription newDescription) {
+        if (!newDescription.isShardRouter()) {
+            LOGGER.error(format("Expecting a %s, but found a %s.  Removing %s from client view of cluster.",
+                                 SHARD_ROUTER, newDescription.getType(), newDescription.getAddress()));
+            removeServer(newDescription.getAddress());
+        }
+        return true;
+    }
+
+    private boolean handleStandAloneChanged(final ServerDescription newDescription) {
+        if (getSettings().getHosts().size() > 1) {
+            LOGGER.error(format("Expecting a single %s, but found more than one.  Removing %s from client view of cluster.",
+                                 STANDALONE, newDescription.getAddress()));
+            clusterType = UNKNOWN;
+            removeServer(newDescription.getAddress());
+        }
+        return true;
+    }
+
+    private void addServer(final ServerAddress serverAddress) {
+        if (!addressToServerTupleMap.containsKey(serverAddress)) {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info(format("Adding discovered server %s to client view of cluster", serverAddress));
+            }
+            ClusterableServer server = createServer(serverAddress, new DefaultServerStateListener());
+            addressToServerTupleMap.put(serverAddress, new ServerTuple(server, getConnectingServerDescription(serverAddress)));
+        }
+    }
+
+    private void removeServer(final ServerAddress serverAddress) {
+        ServerTuple removed = addressToServerTupleMap.remove(serverAddress);
+        if (removed != null) {
+            removed.server.close();
+        }
+    }
+
+    private void invalidateOldPrimaries(final ServerAddress newPrimary) {
+        for (final ServerTuple serverTuple : addressToServerTupleMap.values()) {
+            if (!serverTuple.description.getAddress().equals(newPrimary) && serverTuple.description.isPrimary()) {
+                if (LOGGER.isInfoEnabled()) {
+                    LOGGER.info(format("Rediscovering type of existing primary %s", serverTuple.description.getAddress()));
+                }
+                serverTuple.server.invalidate(new MongoNotPrimaryException(new BsonDocument(), serverTuple.description.getAddress()));
+            }
+        }
+    }
+
+    private ServerDescription getConnectingServerDescription(final ServerAddress serverAddress) {
+        return ServerDescription.builder().state(CONNECTING).address(serverAddress).build();
+    }
+
+    private ClusterDescription updateDescription() {
+        ClusterDescription newDescription = new ClusterDescription(MULTIPLE, clusterType, getSrvResolutionException(),
+                getNewServerDescriptionList(), getSettings(), getServerFactory().getSettings());
+        updateDescription(newDescription);
+        return newDescription;
+    }
+
+    private List<ServerDescription> getNewServerDescriptionList() {
+        List<ServerDescription> serverDescriptions = new ArrayList<ServerDescription>();
+        for (final ServerTuple cur : addressToServerTupleMap.values()) {
+            serverDescriptions.add(cur.description);
+        }
+        return serverDescriptions;
+    }
+
+    private void ensureServers(final ServerDescription description) {
+        if (description.isPrimary() || !hasPrimary()) {
+            addNewHosts(description.getHosts());
+            addNewHosts(description.getPassives());
+            addNewHosts(description.getArbiters());
+        }
+
+        if (description.isPrimary()) {
+            removeExtraHosts(description);
+        }
+    }
+
+    private boolean hasPrimary() {
+        for (ServerTuple serverTuple : addressToServerTupleMap.values()) {
+            if (serverTuple.description.isPrimary()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void addNewHosts(final Set<String> hosts) {
+        for (final String cur : hosts) {
+            addServer(new ServerAddress(cur));
+        }
+    }
+
+    private void removeExtraHosts(final ServerDescription serverDescription) {
+        Set<ServerAddress> allServerAddresses = getAllServerAddresses(serverDescription);
+        for (Iterator<ServerTuple> iterator = addressToServerTupleMap.values().iterator(); iterator.hasNext();) {
+            ServerTuple cur = iterator.next();
+            if (!allServerAddresses.contains(cur.description.getAddress())) {
+                if (LOGGER.isInfoEnabled()) {
+                    LOGGER.info(format("Server %s is no longer a member of the replica set.  Removing from client view of cluster.",
+                                       cur.description.getAddress()));
+                }
+                iterator.remove();
+                cur.server.close();
+            }
+        }
+    }
+
+    private Set<ServerAddress> getAllServerAddresses(final ServerDescription serverDescription) {
+        Set<ServerAddress> retVal = new HashSet<ServerAddress>();
+        addHostsToSet(serverDescription.getHosts(), retVal);
+        addHostsToSet(serverDescription.getPassives(), retVal);
+        addHostsToSet(serverDescription.getArbiters(), retVal);
+        return retVal;
+    }
+
+    private void addHostsToSet(final Set<String> hosts, final Set<ServerAddress> retVal) {
+        for (final String host : hosts) {
+            retVal.add(new ServerAddress(host));
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AbstractReferenceCounted.java b/driver-core/src/main/com/mongodb/internal/connection/AbstractReferenceCounted.java
new file mode 100644
index 00000000000..073b21bb5a5
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/AbstractReferenceCounted.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.binding.ReferenceCounted;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+abstract class AbstractReferenceCounted implements ReferenceCounted {
+    private final AtomicInteger referenceCount = new AtomicInteger(1);
+    @Override
+    public int getCount() {
+        return referenceCount.get();
+    }
+
+    @Override
+    public ReferenceCounted retain() {
+        if (referenceCount.incrementAndGet() == 1) {
+            throw new IllegalStateException("Attempted to increment the reference count when it is already 0");
+        }
+        return this;
+    }
+
+    @Override
+    public void release() {
+        if (referenceCount.decrementAndGet() < 0) {
+            throw new IllegalStateException("Attempted to decrement the reference count below 0");
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AsyncWritableByteChannel.java b/driver-core/src/main/com/mongodb/internal/connection/AsyncWritableByteChannel.java
new file mode 100644
index 00000000000..c5979821e81
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/AsyncWritableByteChannel.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.AsyncCompletionHandler;
+
+import java.nio.ByteBuffer;
+
+// An asynchronous channel that can write bytes.
+interface AsyncWritableByteChannel {
+     // Writes a sequence of bytes to this channel from the given buffer.
+     //
+     // This method initiates an asynchronous write operation to write a
+     // sequence of bytes to this channel from the given buffer. The
+     // handler parameter is a completion handler that is invoked when the write
+     // operation completes (or fails). The result passed to the completion
+     // handler is the number of bytes written.
+     //
+     // The write operation may write up to r bytes to the channel,
+     // where r is the number of bytes remaining in the buffer, that is,
+     // src.remaining() at the time that the write is attempted. Where
+     // r is 0, the write operation completes immediately with a result of
+     // 0 without initiating an I/O operation.
+     //
+     // Suppose that a byte sequence of length n is written, where 0 < n <= r.
+     // This byte sequence will be transferred from the buffer starting at index
+     // p, where p is the buffer's position at the moment the write is performed;
+     // the index of the last byte written will be p + n - 1}.
+     // Upon completion the buffer's position will be equal to p + n;
+     // its limit will not have changed.
+     //
+     // Buffers are not safe for use by multiple concurrent threads so care
+     // should be taken to not access the buffer until the operation has
+     // completed.
+     //
+     // This method may be invoked at any time. Some channel types may not
+     // allow more than one write to be outstanding at any given time. If a thread
+     // initiates a write operation before a previous write operation has
+     // completed then a java.nio.channels.WritePendingException will be thrown.
+    void write(ByteBuffer src, AsyncCompletionHandler<Void> handler);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AsynchronousChannelStream.java b/driver-core/src/main/com/mongodb/internal/connection/AsynchronousChannelStream.java
new file mode 100644
index 00000000000..b4f18faff8b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/AsynchronousChannelStream.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoInterruptedException;
+import com.mongodb.MongoSocketReadException;
+import com.mongodb.MongoSocketReadTimeoutException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.AsyncCompletionHandler;
+import com.mongodb.connection.BufferProvider;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.Stream;
+import org.bson.ByteBuf;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.CompletionHandler;
+import java.nio.channels.InterruptedByTimeoutException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * Not part of the public API.
+ */
+public abstract class AsynchronousChannelStream implements Stream {
+    private final ServerAddress serverAddress;
+    private final SocketSettings settings;
+    private final BufferProvider bufferProvider;
+    private volatile ExtendedAsynchronousByteChannel channel;
+    private volatile boolean isClosed;
+
+    public AsynchronousChannelStream(final ServerAddress serverAddress, final SocketSettings settings,
+                                     final BufferProvider bufferProvider) {
+        this.serverAddress = serverAddress;
+        this.settings = settings;
+        this.bufferProvider = bufferProvider;
+    }
+
+    public ServerAddress getServerAddress() {
+        return serverAddress;
+    }
+
+    public SocketSettings getSettings() {
+        return settings;
+    }
+
+    public BufferProvider getBufferProvider() {
+        return bufferProvider;
+    }
+
+    public ExtendedAsynchronousByteChannel getChannel() {
+        return channel;
+    }
+
+    protected void setChannel(final ExtendedAsynchronousByteChannel channel) {
+        isTrue("current channel is null", this.channel == null);
+        this.channel = channel;
+    }
+
+    @Override
+    public void writeAsync(final List<ByteBuf> buffers, final AsyncCompletionHandler<Void> handler) {
+        final AsyncWritableByteChannelAdapter byteChannel = new AsyncWritableByteChannelAdapter();
+        final Iterator<ByteBuf> iter = buffers.iterator();
+        pipeOneBuffer(byteChannel, iter.next(), new AsyncCompletionHandler<Void>() {
+            @Override
+            public void completed(final Void t) {
+                if (iter.hasNext()) {
+                    pipeOneBuffer(byteChannel, iter.next(), this);
+                } else {
+                    handler.completed(null);
+                }
+            }
+
+            @Override
+            public void failed(final Throwable t) {
+                handler.failed(t);
+            }
+        });
+    }
+
+    @Override
+    public void readAsync(final int numBytes, final AsyncCompletionHandler<ByteBuf> handler) {
+        ByteBuf buffer = bufferProvider.getBuffer(numBytes);
+        channel.read(buffer.asNIO(), settings.getReadTimeout(MILLISECONDS), MILLISECONDS, null,
+                new BasicCompletionHandler(buffer, handler));
+    }
+
+    @Override
+    public void open() throws IOException {
+        FutureAsyncCompletionHandler<Void> handler = new FutureAsyncCompletionHandler<Void>();
+        openAsync(handler);
+        handler.getOpen();
+    }
+
+    @Override
+    public void write(final List<ByteBuf> buffers) throws IOException {
+        FutureAsyncCompletionHandler<Void> handler = new FutureAsyncCompletionHandler<Void>();
+        writeAsync(buffers, handler);
+        handler.getWrite();
+    }
+
+    @Override
+    public ByteBuf read(final int numBytes) throws IOException {
+        FutureAsyncCompletionHandler<ByteBuf> handler = new FutureAsyncCompletionHandler<ByteBuf>();
+        readAsync(numBytes, handler);
+        return handler.getRead();
+    }
+
+    @Override
+    public ServerAddress getAddress() {
+        return serverAddress;
+    }
+
+    @Override
+    public void close() {
+        try {
+            if (channel != null) {
+                channel.close();
+            }
+        } catch (IOException e) {
+            // ignore
+        } finally {
+            channel = null;
+            isClosed = true;
+        }
+    }
+
+    @Override
+    public boolean isClosed() {
+        return isClosed;
+    }
+
+    @Override
+    public ByteBuf getBuffer(final int size) {
+        return bufferProvider.getBuffer(size);
+    }
+
+    private void pipeOneBuffer(final AsyncWritableByteChannelAdapter byteChannel, final ByteBuf byteBuffer,
+                               final AsyncCompletionHandler<Void> outerHandler) {
+        byteChannel.write(byteBuffer.asNIO(), new AsyncCompletionHandler<Void>() {
+            @Override
+            public void completed(final Void t) {
+                if (byteBuffer.hasRemaining()) {
+                    byteChannel.write(byteBuffer.asNIO(), this);
+                } else {
+                    outerHandler.completed(null);
+                }
+            }
+
+            @Override
+            public void failed(final Throwable t) {
+                outerHandler.failed(t);
+            }
+        });
+    }
+
+    private class AsyncWritableByteChannelAdapter {
+        void write(final ByteBuffer src, final AsyncCompletionHandler<Void> handler) {
+            channel.write(src, null, new AsyncWritableByteChannelAdapter.WriteCompletionHandler(handler));
+        }
+
+        private class WriteCompletionHandler extends BaseCompletionHandler<Void, Integer, Object> {
+
+            WriteCompletionHandler(final AsyncCompletionHandler<Void> handler) {
+                super(handler);
+            }
+
+            @Override
+            public void completed(final Integer result, final Object attachment) {
+                AsyncCompletionHandler<Void> localHandler = getHandlerAndClear();
+                localHandler.completed(null);
+            }
+
+            @Override
+            public void failed(final Throwable exc, final Object attachment) {
+                AsyncCompletionHandler<Void> localHandler = getHandlerAndClear();
+                localHandler.failed(exc);
+            }
+        }
+    }
+
+    private final class BasicCompletionHandler extends BaseCompletionHandler<ByteBuf, Integer, Void> {
+        private final AtomicReference<ByteBuf> byteBufReference;
+
+        private BasicCompletionHandler(final ByteBuf dst, final AsyncCompletionHandler<ByteBuf> handler) {
+            super(handler);
+            this.byteBufReference = new AtomicReference<ByteBuf>(dst);
+        }
+
+        @Override
+        public void completed(final Integer result, final Void attachment) {
+            AsyncCompletionHandler<ByteBuf> localHandler = getHandlerAndClear();
+            ByteBuf localByteBuf = byteBufReference.getAndSet(null);
+            if (result == -1) {
+                localByteBuf.release();
+                localHandler.failed(new MongoSocketReadException("Prematurely reached end of stream", serverAddress));
+            } else if (!localByteBuf.hasRemaining()) {
+                localByteBuf.flip();
+                localHandler.completed(localByteBuf);
+            } else {
+                channel.read(localByteBuf.asNIO(), settings.getReadTimeout(MILLISECONDS), MILLISECONDS, null,
+                        new BasicCompletionHandler(localByteBuf, localHandler));
+            }
+        }
+
+        @Override
+        public void failed(final Throwable t, final Void attachment) {
+            AsyncCompletionHandler<ByteBuf> localHandler = getHandlerAndClear();
+            ByteBuf localByteBuf = byteBufReference.getAndSet(null);
+            localByteBuf.release();
+            if (t instanceof InterruptedByTimeoutException) {
+                localHandler.failed(new MongoSocketReadTimeoutException("Timeout while receiving message", serverAddress, t));
+            } else {
+                localHandler.failed(t);
+            }
+        }
+    }
+
+    // Private base class for all CompletionHandler implementors that ensures the upstream handler is
+    // set to null before it is used.  This is to work around an observed issue with implementations of
+    // AsynchronousSocketChannel that fail to clear references to handlers stored in instance fields of
+    // the class.
+    private abstract static class BaseCompletionHandler<T, V, A> implements CompletionHandler<V, A> {
+        private final AtomicReference<AsyncCompletionHandler<T>> handlerReference;
+
+        BaseCompletionHandler(final AsyncCompletionHandler<T> handler) {
+            this.handlerReference = new AtomicReference<AsyncCompletionHandler<T>>(handler);
+        }
+
+        AsyncCompletionHandler<T> getHandlerAndClear() {
+            return handlerReference.getAndSet(null);
+        }
+    }
+
+    static class FutureAsyncCompletionHandler<T> implements AsyncCompletionHandler<T> {
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private volatile T result;
+        private volatile Throwable error;
+
+        @Override
+        public void completed(final T result) {
+            this.result = result;
+            latch.countDown();
+        }
+
+        @Override
+        public void failed(final Throwable t) {
+            this.error = t;
+            latch.countDown();
+        }
+
+        void getOpen() throws IOException {
+            get("Opening");
+        }
+
+        void getWrite() throws IOException {
+            get("Writing to");
+        }
+
+        T getRead() throws IOException {
+            return get("Reading from");
+        }
+
+        private T get(final String prefix) throws IOException {
+            try {
+                latch.await();
+            } catch (InterruptedException e) {
+                throw new MongoInterruptedException(prefix + " the AsynchronousSocketChannelStream failed", e);
+
+            }
+            if (error != null) {
+                if (error instanceof IOException) {
+                    throw (IOException) error;
+                } else if (error instanceof MongoException) {
+                    throw (MongoException) error;
+                } else {
+                    throw new MongoInternalException(prefix + " the TlsChannelStream failed", error);
+                }
+            }
+            return result;
+        }
+
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStream.java b/driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStream.java
new file mode 100644
index 00000000000..c6bdc4f1b2b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStream.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoSocketException;
+import com.mongodb.MongoSocketOpenException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.AsyncCompletionHandler;
+import com.mongodb.connection.BufferProvider;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.Stream;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.net.StandardSocketOptions;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousChannelGroup;
+import java.nio.channels.AsynchronousSocketChannel;
+import java.nio.channels.CompletionHandler;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+
+public final class AsynchronousSocketChannelStream extends AsynchronousChannelStream implements Stream {
+    private final ServerAddress serverAddress;
+    private final SocketSettings settings;
+    private final AsynchronousChannelGroup group;
+
+    public AsynchronousSocketChannelStream(final ServerAddress serverAddress, final SocketSettings settings,
+                                    final BufferProvider bufferProvider, final AsynchronousChannelGroup group) {
+        super(serverAddress, settings, bufferProvider);
+        this.serverAddress = serverAddress;
+        this.settings = settings;
+        this.group = group;
+    }
+
+    @Override
+    public void openAsync(final AsyncCompletionHandler<Void> handler) {
+        isTrue("unopened", getChannel() == null);
+        initializeSocketChannel(handler, new LinkedList<SocketAddress>(serverAddress.getSocketAddresses()));
+    }
+
+    @SuppressWarnings("deprecation")
+    private void initializeSocketChannel(final AsyncCompletionHandler<Void> handler, final Queue<SocketAddress> socketAddressQueue) {
+        if (socketAddressQueue.isEmpty()) {
+            handler.failed(new MongoSocketException("Exception opening socket", serverAddress));
+        } else {
+            SocketAddress socketAddress = socketAddressQueue.poll();
+
+            try {
+                AsynchronousSocketChannel attemptConnectionChannel = AsynchronousSocketChannel.open(group);
+                attemptConnectionChannel.setOption(StandardSocketOptions.TCP_NODELAY, true);
+                attemptConnectionChannel.setOption(StandardSocketOptions.SO_KEEPALIVE, settings.isKeepAlive());
+                if (settings.getReceiveBufferSize() > 0) {
+                    attemptConnectionChannel.setOption(StandardSocketOptions.SO_RCVBUF, settings.getReceiveBufferSize());
+                }
+                if (settings.getSendBufferSize() > 0) {
+                    attemptConnectionChannel.setOption(StandardSocketOptions.SO_SNDBUF, settings.getSendBufferSize());
+                }
+
+                attemptConnectionChannel.connect(socketAddress, null,
+                        new OpenCompletionHandler(handler, socketAddressQueue, attemptConnectionChannel));
+            } catch (IOException e) {
+                handler.failed(new MongoSocketOpenException("Exception opening socket", serverAddress, e));
+            } catch (Throwable t) {
+                handler.failed(t);
+            }
+        }
+    }
+
+    public AsynchronousChannelGroup getGroup() {
+        return group;
+    }
+
+    private class OpenCompletionHandler implements CompletionHandler<Void, Object>  {
+        private AtomicReference<AsyncCompletionHandler<Void>> handlerReference;
+        private final Queue<SocketAddress> socketAddressQueue;
+        private final AsynchronousSocketChannel attemptConnectionChannel;
+
+        OpenCompletionHandler(final AsyncCompletionHandler<Void> handler, final Queue<SocketAddress> socketAddressQueue,
+                              final AsynchronousSocketChannel attemptConnectionChannel) {
+            this.handlerReference = new AtomicReference<AsyncCompletionHandler<Void>>(handler);
+            this.socketAddressQueue = socketAddressQueue;
+            this.attemptConnectionChannel = attemptConnectionChannel;
+        }
+
+        @Override
+        public void completed(final Void result, final Object attachment) {
+            setChannel(new AsynchronousSocketChannelAdapter(attemptConnectionChannel));
+            handlerReference.getAndSet(null).completed(null);
+        }
+
+        @Override
+        public void failed(final Throwable exc, final Object attachment) {
+            AsyncCompletionHandler<Void> localHandler = handlerReference.getAndSet(null);
+
+            if (socketAddressQueue.isEmpty()) {
+                if (exc instanceof IOException) {
+                    localHandler.failed(new MongoSocketOpenException("Exception opening socket", getAddress(), exc));
+                } else {
+                    localHandler.failed(exc);
+                }
+            } else {
+                initializeSocketChannel(localHandler, socketAddressQueue);
+            }
+        }
+    }
+
+    private static final class AsynchronousSocketChannelAdapter implements ExtendedAsynchronousByteChannel {
+        private final AsynchronousSocketChannel channel;
+
+        private AsynchronousSocketChannelAdapter(final AsynchronousSocketChannel channel) {
+            this.channel = channel;
+        }
+
+        @Override
+        public <A> void read(final ByteBuffer dst, final long timeout, final TimeUnit unit, final A attach,
+                             final CompletionHandler<Integer, ? super A> handler) {
+            channel.read(dst, timeout, unit, attach, handler);
+        }
+
+        @Override
+        public <A> void read(final ByteBuffer[] dsts, final int offset, final int length, final long timeout, final TimeUnit unit,
+                             final A attach, final CompletionHandler<Long, ? super A> handler) {
+            channel.read(dsts, offset, length, timeout, unit, attach, handler);
+        }
+
+        @Override
+        public <A> void write(final ByteBuffer src, final long timeout, final TimeUnit unit, final A attach,
+                              final CompletionHandler<Integer, ? super A> handler) {
+            channel.write(src, timeout, unit, attach, handler);
+        }
+
+        @Override
+        public <A> void write(final ByteBuffer[] srcs, final int offset, final int length, final long timeout, final TimeUnit unit,
+                              final A attach, final CompletionHandler<Long, ? super A> handler) {
+            channel.write(srcs, offset, length, timeout, unit, attach, handler);
+        }
+
+        @Override
+        public <A> void read(final ByteBuffer dst, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
+            channel.read(dst, attachment, handler);
+        }
+
+        @Override
+        public Future<Integer> read(final ByteBuffer dst) {
+            return channel.read(dst);
+        }
+
+        @Override
+        public <A> void write(final ByteBuffer src, final A attachment, final CompletionHandler<Integer, ? super A> handler) {
+            channel.write(src, attachment, handler);
+        }
+
+        @Override
+        public Future<Integer> write(final ByteBuffer src) {
+            return channel.write(src);
+        }
+
+        @Override
+        public boolean isOpen() {
+            return channel.isOpen();
+        }
+
+        @Override
+        public void close() throws IOException {
+            channel.close();
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java b/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java
new file mode 100644
index 00000000000..5e756c6dbef
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoInternalException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.lang.NonNull;
+import com.mongodb.lang.Nullable;
+
+public abstract class Authenticator {
+    private final MongoCredentialWithCache credential;
+
+    Authenticator(@NonNull final MongoCredentialWithCache credential) {
+        this.credential = credential;
+    }
+
+    @NonNull
+    MongoCredentialWithCache getMongoCredentialWithCache() {
+        return credential;
+    }
+
+    @NonNull
+    MongoCredential getMongoCredential() {
+        return credential.getCredential();
+    }
+
+    @NonNull
+    String getUserNameNonNull() {
+        String userName = credential.getCredential().getUserName();
+        if (userName == null) {
+            throw new MongoInternalException("User name can not be null");
+        }
+        return userName;
+    }
+
+    @NonNull
+    char[] getPasswordNonNull() {
+        char[] password = credential.getCredential().getPassword();
+        if (password == null) {
+            throw new MongoInternalException("Password can not be null");
+        }
+        return password;
+    }
+
+    @NonNull
+    <T> T getNonNullMechanismProperty(final String key, @Nullable final T defaultValue) {
+        T mechanismProperty = credential.getCredential().getMechanismProperty(key, defaultValue);
+        if (mechanismProperty == null) {
+            throw new MongoInternalException("Mechanism property can not be null");
+        }
+        return mechanismProperty;
+
+    }
+
+    abstract void authenticate(InternalConnection connection, ConnectionDescription connectionDescription);
+
+    abstract void authenticateAsync(InternalConnection connection, ConnectionDescription connectionDescription,
+                                    SingleResultCallback<Void> callback);
+}
diff --git a/driver-core/src/main/com/mongodb/connection/BaseCluster.java b/driver-core/src/main/com/mongodb/internal/connection/BaseCluster.java
similarity index 81%
rename from driver-core/src/main/com/mongodb/connection/BaseCluster.java
rename to driver-core/src/main/com/mongodb/internal/connection/BaseCluster.java
index 64a13d230ea..e162ee4baf7 100644
--- a/driver-core/src/main/com/mongodb/connection/BaseCluster.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/BaseCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoClientException;
 import com.mongodb.MongoIncompatibleDriverException;
@@ -23,19 +23,26 @@
 import com.mongodb.MongoWaitQueueFullException;
 import com.mongodb.ServerAddress;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
 import com.mongodb.event.ClusterClosedEvent;
 import com.mongodb.event.ClusterDescriptionChangedEvent;
-import com.mongodb.event.ClusterEventMulticaster;
 import com.mongodb.event.ClusterListener;
 import com.mongodb.event.ClusterOpeningEvent;
 import com.mongodb.event.ServerListener;
-import com.mongodb.internal.connection.ConcurrentLinkedDeque;
 import com.mongodb.selector.CompositeServerSelector;
 import com.mongodb.selector.ServerSelector;
+import org.bson.BsonTimestamp;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
@@ -46,6 +53,11 @@
 
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.connection.ServerDescription.MAX_DRIVER_WIRE_VERSION;
+import static com.mongodb.connection.ServerDescription.MIN_DRIVER_SERVER_VERSION;
+import static com.mongodb.connection.ServerDescription.MIN_DRIVER_WIRE_VERSION;
+import static com.mongodb.internal.event.EventListenerHelper.createServerListener;
+import static com.mongodb.internal.event.EventListenerHelper.getClusterListener;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -63,18 +75,25 @@ abstract class BaseCluster implements Cluster {
     private final ClusterListener clusterListener;
     private final Deque<ServerSelectionRequest> waitQueue = new ConcurrentLinkedDeque<ServerSelectionRequest>();
     private final AtomicInteger waitQueueSize = new AtomicInteger(0);
+    private final ClusterClock clusterClock = new ClusterClock();
     private Thread waitQueueHandler;
 
     private volatile boolean isClosed;
     private volatile ClusterDescription description;
 
-    public BaseCluster(final ClusterId clusterId, final ClusterSettings settings, final ClusterableServerFactory serverFactory) {
+    BaseCluster(final ClusterId clusterId, final ClusterSettings settings, final ClusterableServerFactory serverFactory) {
         this.clusterId = notNull("clusterId", clusterId);
         this.settings = notNull("settings", settings);
         this.serverFactory = notNull("serverFactory", serverFactory);
-        this.clusterListener = settings.getClusterListeners().isEmpty()
-                                       ? new NoOpClusterListener() : new ClusterEventMulticaster(settings.getClusterListeners());
+        this.clusterListener = getClusterListener(settings);
         clusterListener.clusterOpening(new ClusterOpeningEvent(clusterId));
+        description = new ClusterDescription(settings.getMode(), ClusterType.UNKNOWN, Collections.<ServerDescription>emptyList(),
+                settings, serverFactory.getSettings());
+    }
+
+    @Override
+    public BsonTimestamp getClusterTime() {
+        return clusterClock.getClusterTime();
     }
 
     @Override
@@ -90,8 +109,8 @@ public Server selectServer(final ServerSelector serverSelector) {
             boolean selectionFailureLogged = false;
 
             long startTimeNanos = System.nanoTime();
-            long endTimeNanos = startTimeNanos + getUseableTimeoutInNanoseconds();
             long curTimeNanos = startTimeNanos;
+            long maxWaitTimeNanos = getMaxWaitTimeNanos();
 
             while (true) {
                 throwIfIncompatible(curDescription);
@@ -100,7 +119,7 @@ public Server selectServer(final ServerSelector serverSelector) {
                     return server;
                 }
 
-                if (curTimeNanos > endTimeNanos) {
+                if (curTimeNanos - startTimeNanos > maxWaitTimeNanos) {
                     throw createTimeoutException(serverSelector, curDescription);
                 }
 
@@ -111,7 +130,7 @@ public Server selectServer(final ServerSelector serverSelector) {
 
                 connect();
 
-                currentPhase.await(Math.min(endTimeNanos - curTimeNanos, getMinWaitTimeNanos()), NANOSECONDS);
+                currentPhase.await(Math.min(maxWaitTimeNanos - (curTimeNanos - startTimeNanos), getMinWaitTimeNanos()), NANOSECONDS);
 
                 curTimeNanos = System.nanoTime();
 
@@ -130,10 +149,10 @@ public void selectServerAsync(final ServerSelector serverSelector, final SingleR
         isTrue("open", !isClosed());
 
         if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace(String.format("Asynchronously selecting server with selector %s", serverSelector));
+            LOGGER.trace(format("Asynchronously selecting server with selector %s", serverSelector));
         }
         ServerSelectionRequest request = new ServerSelectionRequest(serverSelector, getCompositeServerSelector(serverSelector),
-                                                                    getUseableTimeoutInNanoseconds(), callback);
+                                                                    getMaxWaitTimeNanos(), callback);
 
         CountDownLatch currentPhase = phase.get();
         ClusterDescription currentDescription = description;
@@ -154,12 +173,12 @@ public ClusterDescription getDescription() {
             boolean selectionFailureLogged = false;
 
             long startTimeNanos = System.nanoTime();
-            long endTimeNanos = startTimeNanos + getUseableTimeoutInNanoseconds();
             long curTimeNanos = startTimeNanos;
+            long maxWaitTimeNanos = getMaxWaitTimeNanos();
 
             while (curDescription.getType() == ClusterType.UNKNOWN) {
 
-                if (curTimeNanos > endTimeNanos) {
+                if (curTimeNanos - startTimeNanos > maxWaitTimeNanos) {
                     throw new MongoTimeoutException(format("Timed out after %d ms while waiting to connect. Client view of cluster state "
                                                            + "is %s",
                                                            settings.getServerSelectionTimeout(MILLISECONDS),
@@ -169,7 +188,7 @@ public ClusterDescription getDescription() {
                 if (!selectionFailureLogged) {
                     if (LOGGER.isInfoEnabled()) {
                         if (settings.getServerSelectionTimeout(MILLISECONDS) < 0) {
-                            LOGGER.info(format("Cluster description not yet available. Waiting indefinitely."));
+                            LOGGER.info("Cluster description not yet available. Waiting indefinitely.");
                         } else {
                             LOGGER.info(format("Cluster description not yet available. Waiting for %d ms before timing out",
                                                settings.getServerSelectionTimeout(MILLISECONDS)));
@@ -180,9 +199,7 @@ public ClusterDescription getDescription() {
 
                 connect();
 
-                currentPhase.await(Math.min(endTimeNanos - curTimeNanos,
-                                            serverFactory.getSettings().getMinHeartbeatFrequency(NANOSECONDS)),
-                                   NANOSECONDS);
+                currentPhase.await(Math.min(maxWaitTimeNanos - (curTimeNanos - startTimeNanos), getMinWaitTimeNanos()), NANOSECONDS);
 
                 curTimeNanos = System.nanoTime();
 
@@ -191,7 +208,7 @@ public ClusterDescription getDescription() {
             }
             return curDescription;
         } catch (InterruptedException e) {
-            throw new MongoInterruptedException(format("Interrupted while waiting to connect"), e);
+            throw new MongoInterruptedException("Interrupted while waiting to connect", e);
         }
     }
 
@@ -203,6 +220,10 @@ public ClusterSettings getSettings() {
         return settings;
     }
 
+    public ClusterableServerFactory getServerFactory() {
+        return serverFactory;
+    }
+
     protected abstract void connect();
 
     @Override
@@ -234,18 +255,23 @@ protected synchronized void updateDescription(final ClusterDescription newDescri
         }
 
         description = newDescription;
-        phase.getAndSet(new CountDownLatch(1)).countDown();
+        updatePhase();
     }
 
     protected void fireChangeEvent(final ClusterDescriptionChangedEvent event) {
         clusterListener.clusterDescriptionChanged(event);
     }
 
-    ClusterDescription getCurrentDescription() {
+    @Override
+    public ClusterDescription getCurrentDescription() {
         return description;
     }
 
-    private long getUseableTimeoutInNanoseconds() {
+    private synchronized void updatePhase() {
+        phase.getAndSet(new CountDownLatch(1)).countDown();
+    }
+
+    private long getMaxWaitTimeNanos() {
         if (settings.getServerSelectionTimeout(NANOSECONDS) < 0) {
             return Long.MAX_VALUE;
         }
@@ -264,7 +290,7 @@ private boolean handleServerSelectionRequest(final ServerSelectionRequest reques
                 request.phase = currentPhase;
                 if (!description.isCompatibleWithDriver()) {
                     if (LOGGER.isTraceEnabled()) {
-                        LOGGER.trace(String.format("Asynchronously failed server selection due to driver incompatibility with server"));
+                        LOGGER.trace("Asynchronously failed server selection due to driver incompatibility with server");
                     }
                     request.onResult(null, createIncompatibleException(description));
                     return true;
@@ -273,7 +299,7 @@ private boolean handleServerSelectionRequest(final ServerSelectionRequest reques
                 Server server = selectRandomServer(request.compositeSelector, description);
                 if (server != null) {
                     if (LOGGER.isTraceEnabled()) {
-                        LOGGER.trace(String.format("Asynchronously selected server %s", server.getDescription().getAddress()));
+                        LOGGER.trace(format("Asynchronously selected server %s", server.getDescription().getAddress()));
                     }
                     request.onResult(server, null);
                     return true;
@@ -285,7 +311,7 @@ private boolean handleServerSelectionRequest(final ServerSelectionRequest reques
 
             if (request.timedOut()) {
                 if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace(String.format("Asynchronously failed server selection after timeout"));
+                    LOGGER.trace("Asynchronously failed server selection after timeout");
                 }
                 request.onResult(null, createTimeoutException(request.originalSelector, description));
                 return true;
@@ -353,10 +379,8 @@ private Random getRandom() {
         return result;
     }
 
-    protected ClusterableServer createServer(final ServerAddress serverAddress,
-                                             final ServerListener serverListener) {
-        ClusterableServer server = serverFactory.create(serverAddress, serverListener);
-        return server;
+    protected ClusterableServer createServer(final ServerAddress serverAddress, final ServerListener serverListener) {
+        return serverFactory.create(serverAddress, createServerListener(serverFactory.getSettings(), serverListener), clusterClock);
     }
 
     private void throwIfIncompatible(final ClusterDescription curDescription) {
@@ -366,9 +390,18 @@ private void throwIfIncompatible(final ClusterDescription curDescription) {
     }
 
     private MongoIncompatibleDriverException createIncompatibleException(final ClusterDescription curDescription) {
-        return new MongoIncompatibleDriverException(format("This version of the driver is not compatible with one or more of "
-                                                           + "the servers to which it is connected: %s", curDescription),
-                                                    curDescription);
+        String message;
+        ServerDescription incompatibleServer = curDescription.findServerIncompatiblyOlderThanDriver();
+        if (incompatibleServer != null) {
+            message = format("Server at %s reports wire version %d, but this version of the driver requires at least %d (MongoDB %s).",
+                    incompatibleServer.getAddress(), incompatibleServer.getMaxWireVersion(),
+                    MIN_DRIVER_WIRE_VERSION, MIN_DRIVER_SERVER_VERSION);
+        } else {
+            incompatibleServer = curDescription.findServerIncompatiblyNewerThanDriver();
+            message = format("Server at %s requires wire version %d, but this version of the driver only supports up to %d.",
+                    incompatibleServer.getAddress(), incompatibleServer.getMinWireVersion(), MAX_DRIVER_WIRE_VERSION);
+        }
+        return new MongoIncompatibleDriverException(message, curDescription);
     }
 
     private MongoTimeoutException createTimeoutException(final ServerSelector serverSelector, final ClusterDescription curDescription) {
@@ -434,6 +467,8 @@ private synchronized void notifyWaitQueueHandler(final ServerSelectionRequest re
                 waitQueueHandler = new Thread(new WaitQueueHandler(), "cluster-" + clusterId.getValue());
                 waitQueueHandler.setDaemon(true);
                 waitQueueHandler.start();
+            } else {
+                updatePhase();
             }
         }
     }
diff --git a/driver-core/src/main/com/mongodb/connection/BaseQueryMessage.java b/driver-core/src/main/com/mongodb/internal/connection/BaseQueryMessage.java
similarity index 93%
rename from driver-core/src/main/com/mongodb/connection/BaseQueryMessage.java
rename to driver-core/src/main/com/mongodb/internal/connection/BaseQueryMessage.java
index 9ea252355e4..98079a7c06c 100644
--- a/driver-core/src/main/com/mongodb/connection/BaseQueryMessage.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/BaseQueryMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import org.bson.io.BsonOutput;
 
@@ -23,7 +23,7 @@
  *
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
  */
-abstract class BaseQueryMessage extends RequestMessage {
+abstract class BaseQueryMessage extends LegacyMessage {
     private final int skip;
     private final int numberToReturn;
     private boolean tailableCursor;
@@ -33,15 +33,7 @@ abstract class BaseQueryMessage extends RequestMessage {
     private boolean awaitData;
     private boolean partial;
 
-    /**
-     * Construct an instance.
-     *
-     * @param collectionName the collection name
-     * @param skip           the number of documents to skip
-     * @param numberToReturn the number of documents to return
-     * @param settings       the message settings
-     */
-    public BaseQueryMessage(final String collectionName, final int skip, final int numberToReturn, final MessageSettings settings) {
+    BaseQueryMessage(final String collectionName, final int skip, final int numberToReturn, final MessageSettings settings) {
         super(collectionName, OpCode.OP_QUERY, settings);
         this.skip = skip;
         this.numberToReturn = numberToReturn;
diff --git a/driver-core/src/main/com/mongodb/internal/connection/BsonWriterDecorator.java b/driver-core/src/main/com/mongodb/internal/connection/BsonWriterDecorator.java
new file mode 100644
index 00000000000..02cffeeb51f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/BsonWriterDecorator.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.BsonBinary;
+import org.bson.BsonDbPointer;
+import org.bson.BsonReader;
+import org.bson.BsonRegularExpression;
+import org.bson.BsonTimestamp;
+import org.bson.BsonWriter;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+
+import static org.bson.assertions.Assertions.notNull;
+
+public class BsonWriterDecorator implements BsonWriter {
+    private final BsonWriter bsonWriter;
+
+    BsonWriterDecorator(final BsonWriter bsonWriter) {
+        this.bsonWriter = notNull("bsonWriter", bsonWriter);
+    }
+
+    BsonWriter getBsonWriter() {
+        return bsonWriter;
+    }
+
+    @Override
+    public void writeStartDocument(final String name) {
+        bsonWriter.writeStartDocument(name);
+    }
+
+    @Override
+    public void writeStartDocument() {
+        bsonWriter.writeStartDocument();
+    }
+
+    @Override
+    public void writeEndDocument() {
+        bsonWriter.writeEndDocument();
+    }
+
+    @Override
+    public void writeStartArray(final String name) {
+        bsonWriter.writeStartArray(name);
+    }
+
+    @Override
+    public void writeStartArray() {
+        bsonWriter.writeStartArray();
+    }
+
+    @Override
+    public void writeEndArray() {
+        bsonWriter.writeEndArray();
+    }
+
+    @Override
+    public void writeBinaryData(final String name, final BsonBinary binary) {
+        bsonWriter.writeBinaryData(name, binary);
+    }
+
+    @Override
+    public void writeBinaryData(final BsonBinary binary) {
+        bsonWriter.writeBinaryData(binary);
+    }
+
+    @Override
+    public void writeBoolean(final String name, final boolean value) {
+        bsonWriter.writeBoolean(name, value);
+    }
+
+    @Override
+    public void writeBoolean(final boolean value) {
+        bsonWriter.writeBoolean(value);
+    }
+
+    @Override
+    public void writeDateTime(final String name, final long value) {
+        bsonWriter.writeDateTime(name, value);
+    }
+
+    @Override
+    public void writeDateTime(final long value) {
+        bsonWriter.writeDateTime(value);
+    }
+
+    @Override
+    public void writeDBPointer(final String name, final BsonDbPointer value) {
+        bsonWriter.writeDBPointer(name, value);
+    }
+
+    @Override
+    public void writeDBPointer(final BsonDbPointer value) {
+        bsonWriter.writeDBPointer(value);
+    }
+
+    @Override
+    public void writeDouble(final String name, final double value) {
+        bsonWriter.writeDouble(name, value);
+    }
+
+    @Override
+    public void writeDouble(final double value) {
+        bsonWriter.writeDouble(value);
+    }
+
+    @Override
+    public void writeInt32(final String name, final int value) {
+        bsonWriter.writeInt32(name, value);
+    }
+
+    @Override
+    public void writeInt32(final int value) {
+        bsonWriter.writeInt32(value);
+    }
+
+    @Override
+    public void writeInt64(final String name, final long value) {
+        bsonWriter.writeInt64(name, value);
+    }
+
+    @Override
+    public void writeInt64(final long value) {
+        bsonWriter.writeInt64(value);
+    }
+
+    @Override
+    public void writeDecimal128(final Decimal128 value) {
+        bsonWriter.writeDecimal128(value);
+    }
+
+    @Override
+    public void writeDecimal128(final String name, final Decimal128 value) {
+        bsonWriter.writeDecimal128(name, value);
+    }
+
+    @Override
+    public void writeJavaScript(final String name, final String code) {
+        bsonWriter.writeJavaScript(name, code);
+    }
+
+    @Override
+    public void writeJavaScript(final String code) {
+        bsonWriter.writeJavaScript(code);
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(final String name, final String code) {
+        bsonWriter.writeJavaScriptWithScope(name, code);
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(final String code) {
+        bsonWriter.writeJavaScriptWithScope(code);
+    }
+
+    @Override
+    public void writeMaxKey(final String name) {
+        bsonWriter.writeMaxKey(name);
+    }
+
+    @Override
+    public void writeMaxKey() {
+        bsonWriter.writeMaxKey();
+    }
+
+    @Override
+    public void writeMinKey(final String name) {
+        bsonWriter.writeMinKey(name);
+    }
+
+    @Override
+    public void writeMinKey() {
+        bsonWriter.writeMinKey();
+    }
+
+    @Override
+    public void writeName(final String name) {
+        bsonWriter.writeName(name);
+    }
+
+    @Override
+    public void writeNull(final String name) {
+        bsonWriter.writeNull(name);
+    }
+
+    @Override
+    public void writeNull() {
+        bsonWriter.writeNull();
+    }
+
+    @Override
+    public void writeObjectId(final String name, final ObjectId objectId) {
+        bsonWriter.writeObjectId(name, objectId);
+    }
+
+    @Override
+    public void writeObjectId(final ObjectId objectId) {
+        bsonWriter.writeObjectId(objectId);
+    }
+
+    @Override
+    public void writeRegularExpression(final String name, final BsonRegularExpression regularExpression) {
+        bsonWriter.writeRegularExpression(name, regularExpression);
+    }
+
+    @Override
+    public void writeRegularExpression(final BsonRegularExpression regularExpression) {
+        bsonWriter.writeRegularExpression(regularExpression);
+    }
+
+    @Override
+    public void writeString(final String name, final String value) {
+        bsonWriter.writeString(name, value);
+    }
+
+    @Override
+    public void writeString(final String value) {
+        bsonWriter.writeString(value);
+    }
+
+    @Override
+    public void writeSymbol(final String name, final String value) {
+        bsonWriter.writeSymbol(name, value);
+    }
+
+    @Override
+    public void writeSymbol(final String value) {
+        bsonWriter.writeSymbol(value);
+    }
+
+    @Override
+    public void writeTimestamp(final String name, final BsonTimestamp value) {
+        bsonWriter.writeTimestamp(name, value);
+    }
+
+    @Override
+    public void writeTimestamp(final BsonTimestamp value) {
+        bsonWriter.writeTimestamp(value);
+    }
+
+    @Override
+    public void writeUndefined(final String name) {
+        bsonWriter.writeUndefined(name);
+    }
+
+    @Override
+    public void writeUndefined() {
+        bsonWriter.writeUndefined();
+    }
+
+    @Override
+    public void pipe(final BsonReader reader) {
+        bsonWriter.pipe(reader);
+    }
+
+    @Override
+    public void flush() {
+        bsonWriter.flush();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/BsonWriterHelper.java b/driver-core/src/main/com/mongodb/internal/connection/BsonWriterHelper.java
new file mode 100644
index 00000000000..29a363c90bd
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/BsonWriterHelper.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.SplittablePayload;
+import org.bson.BsonDocument;
+import org.bson.BsonElement;
+import org.bson.BsonMaximumSizeExceededException;
+import org.bson.BsonValue;
+import org.bson.BsonWriter;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.io.BsonOutput;
+
+import java.util.List;
+
+import static java.lang.String.format;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+final class BsonWriterHelper {
+    private static final int DOCUMENT_HEADROOM = 1024 * 16;
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+    private static final EncoderContext ENCODER_CONTEXT = EncoderContext.builder().build();
+
+    static void writeElements(final BsonWriter writer, final List<BsonElement> bsonElements) {
+        for (BsonElement bsonElement : bsonElements) {
+            writer.writeName(bsonElement.getName());
+            getCodec(bsonElement.getValue()).encode(writer, bsonElement.getValue(), ENCODER_CONTEXT);
+        }
+    }
+
+    static void writePayloadArray(final BsonWriter writer, final BsonOutput bsonOutput, final MessageSettings settings,
+                                  final int messageStartPosition, final SplittablePayload payload, final int maxSplittableDocumentSize) {
+        writer.writeStartArray(payload.getPayloadName());
+        writePayload(writer, bsonOutput, getDocumentMessageSettings(settings), messageStartPosition, payload, maxSplittableDocumentSize);
+        writer.writeEndArray();
+    }
+
+    static void writePayload(final BsonWriter writer, final BsonOutput bsonOutput, final MessageSettings settings,
+                             final int messageStartPosition, final SplittablePayload payload, final int maxSplittableDocumentSize) {
+        MessageSettings payloadSettings = getPayloadMessageSettings(payload.getPayloadType(), settings);
+        for (int i = 0; i < payload.getPayload().size(); i++) {
+            if (writeDocument(writer, bsonOutput, payloadSettings, payload.getPayload().get(i), messageStartPosition, i + 1,
+                    maxSplittableDocumentSize)) {
+                payload.setPosition(i + 1);
+            } else {
+                break;
+            }
+        }
+
+        if (payload.getPosition() == 0) {
+            throw new BsonMaximumSizeExceededException(format("Payload document size is larger than maximum of %d.",
+                    payloadSettings.getMaxDocumentSize()));
+        }
+    }
+
+    private static boolean writeDocument(final BsonWriter writer, final BsonOutput bsonOutput, final MessageSettings settings,
+                                         final BsonDocument document, final int messageStartPosition, final int batchItemCount,
+                                         final int maxSplittableDocumentSize) {
+        int currentPosition = bsonOutput.getPosition();
+        getCodec(document).encode(writer, document, ENCODER_CONTEXT);
+        int messageSize = bsonOutput.getPosition() - messageStartPosition;
+        int documentSize = bsonOutput.getPosition() - currentPosition;
+        if (exceedsLimits(settings, messageSize, documentSize, batchItemCount)
+                || (batchItemCount > 1 && bsonOutput.getPosition() - messageStartPosition > maxSplittableDocumentSize)) {
+            bsonOutput.truncateToPosition(currentPosition);
+            return false;
+        }
+        return true;
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    private static Codec<BsonValue> getCodec(final BsonValue bsonValue) {
+        return (Codec<BsonValue>) REGISTRY.get(bsonValue.getClass());
+    }
+
+    private static MessageSettings getPayloadMessageSettings(final SplittablePayload.Type type, final MessageSettings settings) {
+        MessageSettings payloadMessageSettings = settings;
+        if (type != SplittablePayload.Type.INSERT) {
+            payloadMessageSettings = createMessageSettingsBuilder(settings)
+                    .maxDocumentSize(settings.getMaxDocumentSize() + DOCUMENT_HEADROOM)
+                    .build();
+        }
+        return payloadMessageSettings;
+    }
+
+    private static MessageSettings getDocumentMessageSettings(final MessageSettings settings) {
+        return createMessageSettingsBuilder(settings)
+                    .maxMessageSize(settings.getMaxDocumentSize() + DOCUMENT_HEADROOM)
+                    .build();
+    }
+
+    private static MessageSettings.Builder createMessageSettingsBuilder(final MessageSettings settings) {
+        return MessageSettings.builder()
+                .maxBatchCount(settings.getMaxBatchCount())
+                .maxMessageSize(settings.getMaxMessageSize())
+                .maxDocumentSize(settings.getMaxDocumentSize())
+                .maxWireVersion(settings.getMaxWireVersion());
+    }
+
+    private static boolean exceedsLimits(final MessageSettings settings, final int messageSize, final int documentSize,
+                                          final int batchItemCount) {
+        if (batchItemCount > settings.getMaxBatchCount()) {
+            return true;
+        } else if (messageSize > settings.getMaxMessageSize()) {
+            return true;
+        } else if (documentSize > settings.getMaxDocumentSize()) {
+            return true;
+        }
+        return false;
+    }
+
+
+    private BsonWriterHelper() {
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ByteBufBsonDocument.java b/driver-core/src/main/com/mongodb/internal/connection/ByteBufBsonDocument.java
new file mode 100644
index 00000000000..50830eed177
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ByteBufBsonDocument.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ByteBufferBsonOutput;
+import org.bson.BsonBinaryReader;
+import org.bson.BsonDocument;
+import org.bson.BsonReader;
+import org.bson.BsonType;
+import org.bson.ByteBuf;
+import org.bson.ByteBufNIO;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.DecoderContext;
+import org.bson.io.ByteBufferBsonInput;
+import org.bson.json.JsonWriter;
+import org.bson.json.JsonWriterSettings;
+
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.StringWriter;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+
+class ByteBufBsonDocument extends AbstractByteBufBsonDocument {
+    private static final long serialVersionUID = 2L;
+
+    private final transient ByteBuf byteBuf;
+
+    static List<ByteBufBsonDocument> createList(final ResponseBuffers responseBuffers) {
+        int numDocuments = responseBuffers.getReplyHeader().getNumberReturned();
+        ByteBuf documentsBuffer = responseBuffers.getBodyByteBuffer();
+        documentsBuffer.order(ByteOrder.LITTLE_ENDIAN);
+        List<ByteBufBsonDocument> documents = new ArrayList<ByteBufBsonDocument>(numDocuments);
+        while (documents.size() < numDocuments) {
+            int documentSizeInBytes = documentsBuffer.getInt();
+            documentsBuffer.position(documentsBuffer.position() - 4);
+            ByteBuf documentBuffer = documentsBuffer.duplicate();
+            documentBuffer.limit(documentBuffer.position() + documentSizeInBytes);
+            documents.add(new ByteBufBsonDocument(new ByteBufNIO(documentBuffer.asNIO())));
+            documentBuffer.release();
+            documentsBuffer.position(documentsBuffer.position() + documentSizeInBytes);
+        }
+        return documents;
+    }
+
+    static List<ByteBufBsonDocument> createList(final ByteBufferBsonOutput bsonOutput, final int startPosition) {
+        List<ByteBuf> duplicateByteBuffers = bsonOutput.getByteBuffers();
+        CompositeByteBuf outputByteBuf = new CompositeByteBuf(duplicateByteBuffers);
+        outputByteBuf.position(startPosition);
+        List<ByteBufBsonDocument> documents = new ArrayList<ByteBufBsonDocument>();
+        int curDocumentStartPosition = startPosition;
+        while (outputByteBuf.hasRemaining()) {
+            int documentSizeInBytes = outputByteBuf.getInt();
+            ByteBuf slice = outputByteBuf.duplicate();
+            slice.position(curDocumentStartPosition);
+            slice.limit(curDocumentStartPosition + documentSizeInBytes);
+            documents.add(new ByteBufBsonDocument(slice));
+            curDocumentStartPosition += documentSizeInBytes;
+            outputByteBuf.position(outputByteBuf.position() + documentSizeInBytes - 4);
+        }
+        for (ByteBuf byteBuffer : duplicateByteBuffers) {
+            byteBuffer.release();
+        }
+        return documents;
+    }
+
+    static ByteBufBsonDocument createOne(final ByteBufferBsonOutput bsonOutput, final int startPosition) {
+        List<ByteBuf> duplicateByteBuffers = bsonOutput.getByteBuffers();
+        CompositeByteBuf outputByteBuf = new CompositeByteBuf(duplicateByteBuffers);
+        outputByteBuf.position(startPosition);
+        int documentSizeInBytes = outputByteBuf.getInt();
+        ByteBuf slice = outputByteBuf.duplicate();
+        slice.position(startPosition);
+        slice.limit(startPosition + documentSizeInBytes);
+        for (ByteBuf byteBuffer : duplicateByteBuffers) {
+            byteBuffer.release();
+        }
+        return new ByteBufBsonDocument(slice);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public String toJson() {
+        return toJson(new JsonWriterSettings());
+    }
+
+    @Override
+    public String toJson(final JsonWriterSettings settings) {
+        StringWriter stringWriter = new StringWriter();
+        JsonWriter jsonWriter = new JsonWriter(stringWriter, settings);
+        ByteBuf duplicate = byteBuf.duplicate();
+        BsonBinaryReader reader = new BsonBinaryReader(new ByteBufferBsonInput(duplicate));
+        try {
+            jsonWriter.pipe(reader);
+            return stringWriter.toString();
+        } finally {
+            duplicate.release();
+            reader.close();
+        }
+    }
+
+    @Override
+    public BsonReader asBsonReader() {
+        return new BsonBinaryReader(new ByteBufferBsonInput(byteBuf.duplicate()));
+    }
+
+    <T> T findInDocument(final Finder<T> finder) {
+        ByteBuf duplicateByteBuf = byteBuf.duplicate();
+        BsonBinaryReader bsonReader = new BsonBinaryReader(new ByteBufferBsonInput(byteBuf.duplicate()));
+        try {
+            bsonReader.readStartDocument();
+            while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+                T found = finder.find(bsonReader);
+                if (found != null) {
+                    return found;
+                }
+            }
+            bsonReader.readEndDocument();
+        } finally {
+            duplicateByteBuf.release();
+            bsonReader.close();
+        }
+
+        return finder.notFound();
+    }
+
+    @Override
+    public BsonDocument clone() {
+        byte[] clonedBytes = new byte[byteBuf.remaining()];
+        byteBuf.get(byteBuf.position(), clonedBytes);
+        return new RawBsonDocument(clonedBytes);
+    }
+
+    int getSizeInBytes() {
+        return byteBuf.getInt(byteBuf.position());
+    }
+
+    BsonDocument toBsonDocument() {
+        ByteBuf duplicateByteBuf = byteBuf.duplicate();
+        BsonBinaryReader bsonReader = new BsonBinaryReader(new ByteBufferBsonInput(duplicateByteBuf));
+        try {
+            return new BsonDocumentCodec().decode(bsonReader, DecoderContext.builder().build());
+        } finally {
+            duplicateByteBuf.release();
+            bsonReader.close();
+        }
+    }
+
+    ByteBufBsonDocument(final ByteBuf byteBuf) {
+        this.byteBuf = byteBuf;
+    }
+
+    // see https://docs.oracle.com/javase/6/docs/platform/serialization/spec/input.html
+    private void readObject(final ObjectInputStream stream) throws InvalidObjectException {
+        throw new InvalidObjectException("Proxy required");
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/ChangeEvent.java b/driver-core/src/main/com/mongodb/internal/connection/ChangeEvent.java
similarity index 89%
rename from driver-core/src/main/com/mongodb/connection/ChangeEvent.java
rename to driver-core/src/main/com/mongodb/internal/connection/ChangeEvent.java
index 1b98ba78802..6063101c84a 100644
--- a/driver-core/src/main/com/mongodb/connection/ChangeEvent.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ChangeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -27,11 +27,7 @@ final class ChangeEvent<T> {
     private final T previousValue;
     private final T newValue;
 
-    /**
-     * @param previousValue the value before the change
-     * @param newValue the value after the change
-     */
-    public ChangeEvent(final T previousValue, final T newValue) {
+    ChangeEvent(final T previousValue, final T newValue) {
         this.previousValue = notNull("oldValue", previousValue);
         this.newValue = notNull("newValue", newValue);
     }
diff --git a/driver-core/src/main/com/mongodb/connection/ChangeListener.java b/driver-core/src/main/com/mongodb/internal/connection/ChangeListener.java
similarity index 92%
rename from driver-core/src/main/com/mongodb/connection/ChangeListener.java
rename to driver-core/src/main/com/mongodb/internal/connection/ChangeListener.java
index 6784c9c94c8..447c7754a27 100644
--- a/driver-core/src/main/com/mongodb/connection/ChangeListener.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ChangeListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 /**
  * Listener for ChangeEvents - classes that implement this will be informed if classes of type {@code T} are changed.
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ClientMetadataHelper.java b/driver-core/src/main/com/mongodb/internal/connection/ClientMetadataHelper.java
new file mode 100644
index 00000000000..a92cd60561b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ClientMetadataHelper.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.internal.build.MongoDriverVersion;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.EncoderContext;
+import org.bson.io.BasicOutputBuffer;
+
+import java.nio.charset.Charset;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static java.lang.String.format;
+import static java.lang.System.getProperty;
+
+public final class ClientMetadataHelper {
+    public static final BsonDocument CLIENT_METADATA_DOCUMENT = new BsonDocument();
+
+    private static final String SEPARATOR = "|";
+
+    private static final String APPLICATION_FIELD = "application";
+    private static final String APPLICATION_NAME_FIELD = "name";
+
+    private static final String DRIVER_FIELD = "driver";
+    private static final String DRIVER_NAME_FIELD = "name";
+    private static final String DRIVER_VERSION_FIELD = "version";
+
+    private static final String PLATFORM_FIELD = "platform";
+
+    private static final String OS_FIELD = "os";
+    private static final String OS_TYPE_FIELD = "type";
+    private static final String OS_NAME_FIELD = "name";
+    private static final String OS_ARCHITECTURE_FIELD = "architecture";
+    private static final String OS_VERSION_FIELD = "version";
+
+    private static final int MAXIMUM_CLIENT_METADATA_ENCODED_SIZE = 512;
+
+    static {
+        BsonDocument driverMetadataDocument = addDriverInformation(null, new BsonDocument());
+        CLIENT_METADATA_DOCUMENT.append(DRIVER_FIELD, driverMetadataDocument.get(DRIVER_FIELD));
+
+        try {
+            String operatingSystemName = getProperty("os.name", "unknown");
+            CLIENT_METADATA_DOCUMENT.append(OS_FIELD, new BsonDocument()
+                                                              .append(OS_TYPE_FIELD,
+                                                                      new BsonString(getOperatingSystemType(operatingSystemName)))
+                                                              .append(OS_NAME_FIELD,
+                                                                      new BsonString(operatingSystemName))
+                                                              .append(OS_ARCHITECTURE_FIELD,
+                                                                      new BsonString(getProperty("os.arch", "unknown")))
+                                                              .append(OS_VERSION_FIELD,
+                                                                      new BsonString(getProperty("os.version", "unknown"))))
+                    .append(PLATFORM_FIELD, driverMetadataDocument.get(PLATFORM_FIELD, new BsonString("")));
+        } catch (SecurityException e) {
+            // do nothing
+        }
+    }
+
+    private static String getOperatingSystemType(final String operatingSystemName) {
+        if (nameMatches(operatingSystemName, "linux")) {
+            return "Linux";
+        } else if (nameMatches(operatingSystemName, "mac")) {
+            return "Darwin";
+        } else if (nameMatches(operatingSystemName, "windows")) {
+            return  "Windows";
+        } else if (nameMatches(operatingSystemName, "hp-ux", "aix", "irix", "solaris", "sunos")) {
+            return "Unix";
+        } else {
+            return  "unknown";
+        }
+    }
+
+    private static boolean nameMatches(final String name, final String... prefixes) {
+        for (String prefix : prefixes) {
+            if (name.toLowerCase().startsWith(prefix.toLowerCase())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static BsonDocument createClientMetadataDocument(final String applicationName) {
+        return createClientMetadataDocument(applicationName, null);
+    }
+
+    public static BsonDocument createClientMetadataDocument(final String applicationName,
+                                                            final MongoDriverInformation mongoDriverInformation) {
+        return createClientMetadataDocument(applicationName, mongoDriverInformation, CLIENT_METADATA_DOCUMENT);
+    }
+
+    static BsonDocument createClientMetadataDocument(final String applicationName, final MongoDriverInformation mongoDriverInformation,
+                                                     final BsonDocument templateDocument) {
+        if (applicationName != null) {
+            isTrueArgument("applicationName UTF-8 encoding length <= 128",
+                    applicationName.getBytes(Charset.forName("UTF-8")).length <= 128);
+        }
+
+        BsonDocument document = templateDocument.clone();
+        if (applicationName != null) {
+            document.append(APPLICATION_FIELD, new BsonDocument(APPLICATION_NAME_FIELD, new BsonString(applicationName)));
+        }
+
+        if (mongoDriverInformation != null) {
+            addDriverInformation(mongoDriverInformation, document);
+        }
+
+        if (clientMetadataDocumentTooLarge(document)) {
+            // first try: remove the three optional fields in the 'os' document, if it exists (may not if the security manager is configured
+            // to disallow access to system properties)
+            BsonDocument operatingSystemDocument = document.getDocument(OS_FIELD, null);
+            if (operatingSystemDocument != null) {
+                operatingSystemDocument.remove(OS_VERSION_FIELD);
+                operatingSystemDocument.remove(OS_ARCHITECTURE_FIELD);
+                operatingSystemDocument.remove(OS_NAME_FIELD);
+            }
+            if (operatingSystemDocument == null || clientMetadataDocumentTooLarge(document)) {
+                // second try: remove the optional 'platform' field
+                document.remove(PLATFORM_FIELD);
+                if (clientMetadataDocumentTooLarge(document)) {
+                    // Third try: Try the minimum required amount of data.
+                    document = new BsonDocument(DRIVER_FIELD, templateDocument.getDocument(DRIVER_FIELD));
+                    document.append(OS_FIELD, new BsonDocument(OS_TYPE_FIELD, new BsonString("unknown")));
+                    if (clientMetadataDocumentTooLarge(document)) {
+                        // Worst case scenario: give up and don't send any client metadata at all
+                        document = null;
+                    }
+                }
+            }
+        }
+        return document;
+    }
+
+    private static BsonDocument addDriverInformation(final MongoDriverInformation mongoDriverInformation, final BsonDocument document) {
+        MongoDriverInformation driverInformation = getDriverInformation(mongoDriverInformation);
+        BsonDocument driverMetadataDocument = new BsonDocument(DRIVER_NAME_FIELD, listToBsonString(driverInformation.getDriverNames()))
+                .append(DRIVER_VERSION_FIELD, listToBsonString(driverInformation.getDriverVersions()));
+        document.append(DRIVER_FIELD, driverMetadataDocument);
+        document.append(PLATFORM_FIELD, listToBsonString(driverInformation.getDriverPlatforms()));
+        return document;
+    }
+
+    static boolean clientMetadataDocumentTooLarge(final BsonDocument document) {
+        BasicOutputBuffer buffer = new BasicOutputBuffer(MAXIMUM_CLIENT_METADATA_ENCODED_SIZE);
+        new BsonDocumentCodec().encode(new BsonBinaryWriter(buffer), document, EncoderContext.builder().build());
+        return buffer.getPosition() > MAXIMUM_CLIENT_METADATA_ENCODED_SIZE;
+    }
+
+    static MongoDriverInformation getDriverInformation(final MongoDriverInformation mongoDriverInformation) {
+        MongoDriverInformation.Builder builder = mongoDriverInformation != null ? MongoDriverInformation.builder(mongoDriverInformation)
+                : MongoDriverInformation.builder();
+        return builder
+                .driverName(MongoDriverVersion.NAME)
+                .driverVersion(MongoDriverVersion.VERSION)
+                .driverPlatform(format("Java/%s/%s", getProperty("java.vendor", "unknown-vendor"),
+                        getProperty("java.runtime.version", "unknown-version")))
+                .build();
+    }
+
+    static BsonString listToBsonString(final List<String> listOfStrings) {
+        StringBuilder stringBuilder = new StringBuilder();
+        int i = 0;
+        for (String val : listOfStrings) {
+            if (i > 0) {
+                stringBuilder.append(SEPARATOR);
+            }
+            stringBuilder.append(val);
+            i++;
+        }
+        return new BsonString(stringBuilder.toString());
+    }
+
+    private ClientMetadataHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ClusterClock.java b/driver-core/src/main/com/mongodb/internal/connection/ClusterClock.java
new file mode 100644
index 00000000000..7886a646f84
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ClusterClock.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+public class ClusterClock {
+    private static final String CLUSTER_TIME_KEY = "clusterTime";
+    private BsonDocument clusterTime;
+
+    public synchronized BsonDocument getCurrent() {
+        return clusterTime;
+    }
+
+    public synchronized BsonTimestamp getClusterTime() {
+        return clusterTime != null ? clusterTime.getTimestamp(CLUSTER_TIME_KEY) : null;
+    }
+
+    public synchronized void advance(final BsonDocument other) {
+        this.clusterTime = greaterOf(other);
+    }
+
+    public synchronized BsonDocument greaterOf(final BsonDocument other) {
+        if (other == null) {
+            return clusterTime;
+        } else if (clusterTime == null) {
+            return other;
+        } else {
+            return other.getTimestamp(CLUSTER_TIME_KEY).compareTo(clusterTime.getTimestamp(CLUSTER_TIME_KEY)) > 0 ? other : clusterTime;
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ClusterClockAdvancingSessionContext.java b/driver-core/src/main/com/mongodb/internal/connection/ClusterClockAdvancingSessionContext.java
new file mode 100644
index 00000000000..0418146f43d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ClusterClockAdvancingSessionContext.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+public final class ClusterClockAdvancingSessionContext implements SessionContext {
+
+    private final SessionContext wrapped;
+    private final ClusterClock clusterClock;
+
+    public ClusterClockAdvancingSessionContext(final SessionContext wrapped, final ClusterClock clusterClock) {
+        this.wrapped = wrapped;
+        this.clusterClock = clusterClock;
+    }
+
+    @Override
+    public boolean hasSession() {
+        return wrapped.hasSession();
+    }
+
+    @Override
+    public boolean isImplicitSession() {
+        return wrapped.isImplicitSession();
+    }
+
+    @Override
+    public BsonDocument getSessionId() {
+        return wrapped.getSessionId();
+    }
+
+    @Override
+    public boolean isCausallyConsistent() {
+        return wrapped.isCausallyConsistent();
+    }
+
+    @Override
+    public long getTransactionNumber() {
+        return wrapped.getTransactionNumber();
+    }
+
+    @Override
+    public long advanceTransactionNumber() {
+        return wrapped.advanceTransactionNumber();
+    }
+
+    @Override
+    public boolean notifyMessageSent() {
+        return wrapped.notifyMessageSent();
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return wrapped.getOperationTime();
+    }
+
+    @Override
+    public void advanceOperationTime(final BsonTimestamp operationTime) {
+        wrapped.advanceOperationTime(operationTime);
+    }
+
+    @Override
+    public BsonDocument getClusterTime() {
+        return clusterClock.greaterOf(wrapped.getClusterTime());
+    }
+
+    @Override
+    public void advanceClusterTime(final BsonDocument clusterTime) {
+        wrapped.advanceClusterTime(clusterTime);
+        clusterClock.advance(clusterTime);
+    }
+
+    @Override
+    public boolean hasActiveTransaction() {
+        return wrapped.hasActiveTransaction();
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return wrapped.getReadConcern();
+    }
+
+    @Override
+    public void setRecoveryToken(final BsonDocument recoveryToken) {
+        wrapped.setRecoveryToken(recoveryToken);
+    }
+
+    @Override
+    public void unpinServerAddress() {
+        wrapped.unpinServerAddress();
+    }
+
+    @Override
+    public void markSessionDirty() {
+        wrapped.markSessionDirty();
+    }
+
+    @Override
+    public boolean isSessionMarkedDirty() {
+        return wrapped.isSessionMarkedDirty();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/ClusterableServer.java b/driver-core/src/main/com/mongodb/internal/connection/ClusterableServer.java
similarity index 82%
rename from driver-core/src/main/com/mongodb/connection/ClusterableServer.java
rename to driver-core/src/main/com/mongodb/internal/connection/ClusterableServer.java
index da8b730b285..c6a1ff042d5 100644
--- a/driver-core/src/main/com/mongodb/connection/ClusterableServer.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ClusterableServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.Server;
 
 /**
  * A logical connection to a MongoDB server that supports clustering along with other servers.
@@ -26,6 +28,12 @@ interface ClusterableServer extends Server {
      */
     void invalidate();
 
+    /**
+     * Invalidate the description of this server due to the passed in reason.
+     * @param reason the reason for invalidation.
+     */
+    void invalidate(Throwable reason);
+
     /**
      * <p>Closes the server.  Instances that have been closed will no longer be available for use.</p>
      *
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ClusterableServerFactory.java b/driver-core/src/main/com/mongodb/internal/connection/ClusterableServerFactory.java
new file mode 100644
index 00000000000..ba207e22d50
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ClusterableServerFactory.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.event.ServerListener;
+
+public interface ClusterableServerFactory {
+    ClusterableServer create(ServerAddress serverAddress, ServerListener serverListener, ClusterClock clusterClock);
+
+    ServerSettings getSettings();
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandEventSender.java b/driver-core/src/main/com/mongodb/internal/connection/CommandEventSender.java
new file mode 100644
index 00000000000..b9aea61cc7a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandEventSender.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+interface CommandEventSender {
+    void sendStartedEvent();
+
+    void sendFailedEvent(Throwable t);
+
+    void sendSucceededEvent(ResponseBuffers responseBuffers);
+
+    void sendSucceededEventForOneWayCommand();
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java b/driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java
new file mode 100644
index 00000000000..d421ffd03ec
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoServerException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+
+import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME;
+import static com.mongodb.ReadPreference.primary;
+
+public final class CommandHelper {
+    static BsonDocument executeCommand(final String database, final BsonDocument command, final InternalConnection internalConnection) {
+        return sendAndReceive(database, command, null, internalConnection);
+    }
+
+    public static BsonDocument executeCommand(final String database, final BsonDocument command, final ClusterClock clusterClock,
+                                              final InternalConnection internalConnection) {
+        return sendAndReceive(database, command, clusterClock, internalConnection);
+    }
+
+    static BsonDocument executeCommandWithoutCheckingForFailure(final String database, final BsonDocument command,
+                                                                final InternalConnection internalConnection) {
+        try {
+            return sendAndReceive(database, command, null, internalConnection);
+        } catch (MongoServerException e) {
+            return new BsonDocument();
+        }
+    }
+
+    static void executeCommandAsync(final String database, final BsonDocument command, final InternalConnection internalConnection,
+                                    final SingleResultCallback<BsonDocument> callback) {
+        internalConnection.sendAndReceiveAsync(getCommandMessage(database, command, internalConnection), new BsonDocumentCodec(),
+                NoOpSessionContext.INSTANCE, new SingleResultCallback<BsonDocument>() {
+                    @Override
+                    public void onResult(final BsonDocument result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            callback.onResult(result, null);
+                        }
+                    }
+        });
+    }
+
+    static boolean isCommandOk(final BsonDocument response) {
+        if (!response.containsKey("ok")) {
+            return false;
+        }
+        BsonValue okValue = response.get("ok");
+        if (okValue.isBoolean()) {
+            return okValue.asBoolean().getValue();
+        } else if (okValue.isNumber()) {
+            return okValue.asNumber().intValue() == 1;
+        } else {
+            return false;
+        }
+    }
+
+    private static BsonDocument sendAndReceive(final String database, final BsonDocument command,
+                                               final ClusterClock clusterClock, final InternalConnection internalConnection) {
+        SessionContext sessionContext = clusterClock == null ? NoOpSessionContext.INSTANCE
+                : new ClusterClockAdvancingSessionContext(NoOpSessionContext.INSTANCE, clusterClock);
+        return internalConnection.sendAndReceive(getCommandMessage(database, command, internalConnection), new BsonDocumentCodec(),
+                sessionContext);
+    }
+
+    private static CommandMessage getCommandMessage(final String database, final BsonDocument command,
+                                                    final InternalConnection internalConnection) {
+        return new CommandMessage(new MongoNamespace(database, COMMAND_COLLECTION_NAME), command, new NoOpFieldNameValidator(), primary(),
+                MessageSettings
+                        .builder()
+                         // Note: server version will be 0.0 at this point when called from InternalConnectionInitializer,
+                         // which means OP_MSG will not be used
+                        .maxWireVersion(internalConnection.getDescription().getMaxWireVersion())
+                        .build()
+        );
+    }
+
+    private CommandHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java b/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java
new file mode 100644
index 00000000000..d3edf6c32bd
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.SplittablePayload;
+import com.mongodb.internal.validator.MappedFieldNameValidator;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonArray;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonElement;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.BsonWriter;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.EncoderContext;
+import org.bson.io.BsonOutput;
+
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mongodb.ReadPreference.primary;
+import static com.mongodb.ReadPreference.primaryPreferred;
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
+import static com.mongodb.connection.ClusterConnectionMode.SINGLE;
+import static com.mongodb.connection.ServerType.SHARD_ROUTER;
+import static com.mongodb.connection.ServerType.STANDALONE;
+import static com.mongodb.internal.connection.BsonWriterHelper.writePayload;
+import static com.mongodb.internal.connection.ReadConcernHelper.getReadConcernDocument;
+import static com.mongodb.internal.operation.ServerVersionHelper.FOUR_DOT_TWO_WIRE_VERSION;
+import static com.mongodb.internal.operation.ServerVersionHelper.FOUR_DOT_ZERO_WIRE_VERSION;
+import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION;
+
+/**
+ * A command message that uses OP_MSG or OP_QUERY to send the command.
+ */
+public final class CommandMessage extends RequestMessage {
+    private final MongoNamespace namespace;
+    private final BsonDocument command;
+    private final FieldNameValidator commandFieldNameValidator;
+    private final ReadPreference readPreference;
+    private final SplittablePayload payload;
+    private final FieldNameValidator payloadFieldNameValidator;
+    private final boolean responseExpected;
+    private final ClusterConnectionMode clusterConnectionMode;
+
+    CommandMessage(final MongoNamespace namespace, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                   final ReadPreference readPreference, final MessageSettings settings) {
+        this(namespace, command, commandFieldNameValidator, readPreference, settings, true, null, null,
+                MULTIPLE);
+    }
+
+    CommandMessage(final MongoNamespace namespace, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                   final ReadPreference readPreference, final MessageSettings settings, final boolean responseExpected,
+                   final SplittablePayload payload, final FieldNameValidator payloadFieldNameValidator,
+                   final ClusterConnectionMode clusterConnectionMode) {
+        super(namespace.getFullName(), getOpCode(settings), settings);
+        this.namespace = namespace;
+        this.command = command;
+        this.commandFieldNameValidator = commandFieldNameValidator;
+        this.readPreference = readPreference;
+        this.responseExpected = responseExpected;
+        this.payload = payload;
+        this.payloadFieldNameValidator = payloadFieldNameValidator;
+        this.clusterConnectionMode = clusterConnectionMode;
+    }
+
+    BsonDocument getCommandDocument(final ByteBufferBsonOutput bsonOutput) {
+        ByteBufBsonDocument byteBufBsonDocument = ByteBufBsonDocument.createOne(bsonOutput,
+                getEncodingMetadata().getFirstDocumentPosition());
+        BsonDocument commandBsonDocument;
+
+        if (useOpMsg() && containsPayload()) {
+            commandBsonDocument = byteBufBsonDocument.toBsonDocument();
+
+            int payloadStartPosition = getEncodingMetadata().getFirstDocumentPosition()
+                    + byteBufBsonDocument.getSizeInBytes()
+                    + 1 // payload type
+                    + 4 // payload size
+                    + payload.getPayloadName().getBytes(Charset.forName("UTF-8")).length + 1;  // null-terminated UTF-8 payload name
+            commandBsonDocument.append(payload.getPayloadName(),
+                    new BsonArray(ByteBufBsonDocument.createList(bsonOutput, payloadStartPosition)));
+        } else {
+            commandBsonDocument = byteBufBsonDocument;
+        }
+
+        if (commandBsonDocument.containsKey("$query")) {
+            commandBsonDocument = commandBsonDocument.getDocument("$query");
+        }
+        return commandBsonDocument;
+    }
+
+    boolean containsPayload() {
+        return payload != null;
+    }
+
+    boolean isResponseExpected() {
+        isTrue("The message must be encoded before determining if a response is expected", getEncodingMetadata() != null);
+        return !useOpMsg() || requireOpMsgResponse();
+    }
+
+    MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final SessionContext sessionContext) {
+        int messageStartPosition = bsonOutput.getPosition() - MESSAGE_PROLOGUE_LENGTH;
+        int commandStartPosition;
+        if (useOpMsg()) {
+            int flagPosition = bsonOutput.getPosition();
+            bsonOutput.writeInt32(0);   // flag bits
+            bsonOutput.writeByte(0);    // payload type
+            commandStartPosition = bsonOutput.getPosition();
+
+            addDocument(getCommandToEncode(), bsonOutput, commandFieldNameValidator, getExtraElements(sessionContext));
+
+            if (payload != null) {
+                bsonOutput.writeByte(1);          // payload type
+                int payloadBsonOutputStartPosition = bsonOutput.getPosition();
+                bsonOutput.writeInt32(0);         // size
+                bsonOutput.writeCString(payload.getPayloadName());
+                writePayload(new BsonBinaryWriter(bsonOutput, payloadFieldNameValidator), bsonOutput, getSettings(),
+                        messageStartPosition, payload, getSettings().getMaxDocumentSize());
+
+                int payloadBsonOutputLength = bsonOutput.getPosition() - payloadBsonOutputStartPosition;
+                bsonOutput.writeInt32(payloadBsonOutputStartPosition, payloadBsonOutputLength);
+            }
+
+            // Write the flag bits
+            bsonOutput.writeInt32(flagPosition, getOpMsgFlagBits());
+        } else {
+            bsonOutput.writeInt32(getOpQueryFlagBits());
+            bsonOutput.writeCString(namespace.getFullName());
+            bsonOutput.writeInt32(0);
+            bsonOutput.writeInt32(-1);
+
+            commandStartPosition = bsonOutput.getPosition();
+
+            if (payload == null) {
+                addDocument(getCommandToEncode(), bsonOutput, commandFieldNameValidator, null);
+            } else {
+                addDocumentWithPayload(bsonOutput, messageStartPosition);
+            }
+        }
+        return new EncodingMetadata(commandStartPosition);
+    }
+
+    private FieldNameValidator getPayloadArrayFieldNameValidator() {
+        Map<String, FieldNameValidator> rootMap = new HashMap<String, FieldNameValidator>();
+        rootMap.put(payload.getPayloadName(), payloadFieldNameValidator);
+        return new MappedFieldNameValidator(commandFieldNameValidator, rootMap);
+    }
+
+    private void addDocumentWithPayload(final BsonOutput bsonOutput, final int messageStartPosition) {
+        BsonBinaryWriter bsonBinaryWriter = new BsonBinaryWriter(bsonOutput, getPayloadArrayFieldNameValidator());
+        BsonWriter bsonWriter = new SplittablePayloadBsonWriter(bsonBinaryWriter, bsonOutput, messageStartPosition, getSettings(), payload);
+        BsonDocument commandToEncode = getCommandToEncode();
+        getCodec(commandToEncode).encode(bsonWriter, commandToEncode, EncoderContext.builder().build());
+    }
+
+    private int getOpMsgFlagBits() {
+        return getOpMsgResponseExpectedFlagBit();
+    }
+
+    private int getOpMsgResponseExpectedFlagBit() {
+        if (requireOpMsgResponse()) {
+            return 0;
+        } else {
+            return 1 << 1;
+        }
+    }
+
+    private boolean requireOpMsgResponse() {
+        if (responseExpected) {
+            return true;
+        } else {
+            return payload != null && payload.hasAnotherSplit();
+        }
+    }
+
+    private int getOpQueryFlagBits() {
+        return getOpQuerySlaveOkFlagBit();
+    }
+
+    private int getOpQuerySlaveOkFlagBit() {
+        if (isSlaveOk()) {
+            return 1 << 2;
+        } else {
+            return 0;
+        }
+    }
+
+    private boolean isSlaveOk() {
+        return (readPreference != null && readPreference.isSlaveOk()) || isDirectConnectionToReplicaSetMember();
+    }
+
+    private boolean isDirectConnectionToReplicaSetMember() {
+        return clusterConnectionMode == SINGLE
+                && getSettings().getServerType() != SHARD_ROUTER
+                && getSettings().getServerType() != STANDALONE;
+    }
+
+    private boolean useOpMsg() {
+        return getOpCode().equals(OpCode.OP_MSG);
+    }
+
+    private BsonDocument getCommandToEncode() {
+        BsonDocument commandToEncode = command;
+        if (!useOpMsg() && readPreference != null && !readPreference.equals(primary())) {
+            commandToEncode = new BsonDocument("$query", command).append("$readPreference", readPreference.toDocument());
+        }
+        return commandToEncode;
+    }
+
+    private List<BsonElement> getExtraElements(final SessionContext sessionContext) {
+        List<BsonElement> extraElements = new ArrayList<BsonElement>();
+        extraElements.add(new BsonElement("$db", new BsonString(new MongoNamespace(getCollectionName()).getDatabaseName())));
+        if (sessionContext.getClusterTime() != null) {
+            extraElements.add(new BsonElement("$clusterTime", sessionContext.getClusterTime()));
+        }
+        if (sessionContext.hasSession() && responseExpected) {
+            extraElements.add(new BsonElement("lsid", sessionContext.getSessionId()));
+        }
+        boolean firstMessageInTransaction = sessionContext.notifyMessageSent();
+        if (sessionContext.hasActiveTransaction()) {
+            checkServerVersionForTransactionSupport();
+            extraElements.add(new BsonElement("txnNumber", new BsonInt64(sessionContext.getTransactionNumber())));
+            if (firstMessageInTransaction) {
+                extraElements.add(new BsonElement("startTransaction", BsonBoolean.TRUE));
+                addReadConcernDocument(extraElements, sessionContext);
+            }
+            extraElements.add(new BsonElement("autocommit", BsonBoolean.FALSE));
+        }
+        if (readPreference != null) {
+            if (!readPreference.equals(primary())) {
+                extraElements.add(new BsonElement("$readPreference", readPreference.toDocument()));
+            } else if (isDirectConnectionToReplicaSetMember()) {
+                extraElements.add(new BsonElement("$readPreference", primaryPreferred().toDocument()));
+            }
+        }
+        return extraElements;
+    }
+
+    private void checkServerVersionForTransactionSupport() {
+        int wireVersion = getSettings().getMaxWireVersion();
+        if (wireVersion < FOUR_DOT_ZERO_WIRE_VERSION
+                || (wireVersion < FOUR_DOT_TWO_WIRE_VERSION && getSettings().getServerType() == SHARD_ROUTER)) {
+            throw new MongoClientException("Transactions are not supported by the MongoDB cluster to which this client is connected.");
+        }
+    }
+
+
+    private void addReadConcernDocument(final List<BsonElement> extraElements, final SessionContext sessionContext) {
+        BsonDocument readConcernDocument = getReadConcernDocument(sessionContext);
+        if (!readConcernDocument.isEmpty()) {
+            extraElements.add(new BsonElement("readConcern", readConcernDocument));
+        }
+    }
+
+    private static OpCode getOpCode(final MessageSettings settings) {
+        return isServerVersionAtLeastThreeDotSix(settings) ? OpCode.OP_MSG : OpCode.OP_QUERY;
+    }
+
+    private static boolean isServerVersionAtLeastThreeDotSix(final MessageSettings settings) {
+          return settings.getMaxWireVersion() >= THREE_DOT_SIX_WIRE_VERSION;
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/CommandProtocol.java
new file mode 100644
index 00000000000..9d5bfe4019c
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandProtocol.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.session.SessionContext;
+
+public interface CommandProtocol<T> {
+
+    T execute(InternalConnection connection);
+
+    void executeAsync(InternalConnection connection, SingleResultCallback<T> callback);
+
+    CommandProtocol<T> sessionContext(SessionContext sessionContext);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CommandProtocolImpl.java b/driver-core/src/main/com/mongodb/internal/connection/CommandProtocolImpl.java
new file mode 100644
index 00000000000..f3c43242085
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandProtocolImpl.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.SplittablePayload;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.Decoder;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.connection.ProtocolHelper.getMessageSettings;
+
+class CommandProtocolImpl<T> implements CommandProtocol<T> {
+    private final MongoNamespace namespace;
+    private final BsonDocument command;
+    private final SplittablePayload payload;
+    private final ReadPreference readPreference;
+    private final FieldNameValidator commandFieldNameValidator;
+    private final FieldNameValidator payloadFieldNameValidator;
+    private final Decoder<T> commandResultDecoder;
+    private final boolean responseExpected;
+    private final ClusterConnectionMode clusterConnectionMode;
+    private SessionContext sessionContext;
+
+    CommandProtocolImpl(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                        final ReadPreference readPreference, final Decoder<T> commandResultDecoder) {
+        this(database, command, commandFieldNameValidator, readPreference, commandResultDecoder, true, null, null,
+                ClusterConnectionMode.MULTIPLE);
+    }
+
+    CommandProtocolImpl(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                        final ReadPreference readPreference, final Decoder<T> commandResultDecoder, final boolean responseExpected,
+                        final SplittablePayload payload, final FieldNameValidator payloadFieldNameValidator,
+                        final ClusterConnectionMode clusterConnectionMode) {
+        notNull("database", database);
+        this.namespace = new MongoNamespace(notNull("database", database), MongoNamespace.COMMAND_COLLECTION_NAME);
+        this.command = notNull("command", command);
+        this.commandFieldNameValidator = notNull("commandFieldNameValidator", commandFieldNameValidator);
+        this.readPreference = readPreference;
+        this.commandResultDecoder = notNull("commandResultDecoder", commandResultDecoder);
+        this.responseExpected = responseExpected;
+        this.payload = payload;
+        this.payloadFieldNameValidator = payloadFieldNameValidator;
+        this.clusterConnectionMode = notNull("clusterConnectionMode", clusterConnectionMode);
+
+        isTrueArgument("payloadFieldNameValidator cannot be null if there is a payload.",
+                payload == null || payloadFieldNameValidator != null);
+    }
+
+    @Override
+    public T execute(final InternalConnection connection) {
+        return connection.sendAndReceive(getCommandMessage(connection), commandResultDecoder, sessionContext);
+    }
+
+    @Override
+    public void executeAsync(final InternalConnection connection, final SingleResultCallback<T> callback) {
+        try {
+            connection.sendAndReceiveAsync(getCommandMessage(connection), commandResultDecoder, sessionContext,
+                    new SingleResultCallback<T>() {
+                        @Override
+                        public void onResult(final T result, final Throwable t) {
+                            if (t != null) {
+                                callback.onResult(null, t);
+                            } else {
+                                callback.onResult(result, null);
+                            }
+                        }
+                    });
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+        }
+    }
+
+    @Override
+    public CommandProtocolImpl<T> sessionContext(final SessionContext sessionContext) {
+        this.sessionContext = sessionContext;
+        return this;
+    }
+
+    private CommandMessage getCommandMessage(final InternalConnection connection) {
+        return new CommandMessage(namespace, command, commandFieldNameValidator, readPreference,
+                    getMessageSettings(connection.getDescription()), responseExpected, payload,
+                payloadFieldNameValidator, clusterConnectionMode);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/CommandResultBaseCallback.java b/driver-core/src/main/com/mongodb/internal/connection/CommandResultBaseCallback.java
similarity index 95%
rename from driver-core/src/main/com/mongodb/connection/CommandResultBaseCallback.java
rename to driver-core/src/main/com/mongodb/internal/connection/CommandResultBaseCallback.java
index 8dcdf19299d..04a86ed3d9e 100644
--- a/driver-core/src/main/com/mongodb/connection/CommandResultBaseCallback.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandResultBaseCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ServerAddress;
 import com.mongodb.diagnostics.logging.Logger;
diff --git a/driver-core/src/main/com/mongodb/connection/CommandResultCallback.java b/driver-core/src/main/com/mongodb/internal/connection/CommandResultCallback.java
similarity index 96%
rename from driver-core/src/main/com/mongodb/connection/CommandResultCallback.java
rename to driver-core/src/main/com/mongodb/internal/connection/CommandResultCallback.java
index cd190ee5645..7438fa1e7d4 100644
--- a/driver-core/src/main/com/mongodb/connection/CommandResultCallback.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/CommandResultCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ServerAddress;
 import com.mongodb.async.SingleResultCallback;
diff --git a/driver-core/src/main/com/mongodb/connection/CompositeByteBuf.java b/driver-core/src/main/com/mongodb/internal/connection/CompositeByteBuf.java
similarity index 96%
rename from driver-core/src/main/com/mongodb/connection/CompositeByteBuf.java
rename to driver-core/src/main/com/mongodb/internal/connection/CompositeByteBuf.java
index d62c0207d7e..48c5f7287ec 100644
--- a/driver-core/src/main/com/mongodb/connection/CompositeByteBuf.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/CompositeByteBuf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import org.bson.ByteBuf;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
@@ -34,14 +35,14 @@ class CompositeByteBuf implements ByteBuf {
     private int position;
     private int limit;
 
-    public CompositeByteBuf(final List<ByteBuf> buffers) {
+    CompositeByteBuf(final List<ByteBuf> buffers) {
         notNull("buffers", buffers);
         isTrueArgument("buffer list not empty", !buffers.isEmpty());
         components = new ArrayList<Component>(buffers.size());
 
         int offset = 0;
         for (ByteBuf cur : buffers) {
-            Component component = new Component(cur.duplicate().order(ByteOrder.LITTLE_ENDIAN), offset);
+            Component component = new Component(cur.asReadOnly().order(ByteOrder.LITTLE_ENDIAN), offset);
             components.add(component);
             offset = component.endOffset;
         }
@@ -255,7 +256,7 @@ public ByteBuf duplicate() {
     public ByteBuffer asNIO() {
         if (components.size() == 1) {
             ByteBuffer byteBuffer = components.get(0).buffer.asNIO().duplicate();
-            byteBuffer.position(position).limit(limit);
+            ((Buffer) byteBuffer).position(position).limit(limit);
             return byteBuffer;
         } else {
            byte[] bytes = new byte[remaining()];
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CompressedHeader.java b/driver-core/src/main/com/mongodb/internal/connection/CompressedHeader.java
new file mode 100644
index 00000000000..cb493b1f451
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/CompressedHeader.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoInternalException;
+import org.bson.ByteBuf;
+
+import static com.mongodb.internal.connection.MessageHeader.MESSAGE_HEADER_LENGTH;
+import static com.mongodb.internal.connection.OpCode.OP_COMPRESSED;
+import static java.lang.String.format;
+
+// Contains the details of an OP_COMPRESSED reply from a MongoDB server.
+class CompressedHeader {
+    /**
+     * The length of the reply header in the MongoDB wire protocol.
+     */
+    public static final int COMPRESSED_HEADER_LENGTH = 9;
+
+    /**
+     * The length of the OP_COMPRESSED header plus the length of the standard message header
+     */
+    public static final int TOTAL_COMPRESSED_HEADER_LENGTH = COMPRESSED_HEADER_LENGTH + MESSAGE_HEADER_LENGTH;
+
+    private final int originalOpcode;
+    private final int uncompressedSize;
+    private final byte compressorId;
+    private final MessageHeader messageHeader;
+
+    CompressedHeader(final ByteBuf header, final MessageHeader messageHeader) {
+        this.messageHeader = messageHeader;
+
+        if (messageHeader.getOpCode() != OP_COMPRESSED.getValue()) {
+            throw new MongoInternalException(format("The reply message opCode %d does not match the expected opCode %d",
+                    messageHeader.getOpCode(), OP_COMPRESSED.getValue()));
+        }
+
+        if (messageHeader.getMessageLength() < TOTAL_COMPRESSED_HEADER_LENGTH) {
+            throw new MongoInternalException(format("The reply message length %d is less than the mimimum message length %d",
+                    messageHeader.getMessageLength(), COMPRESSED_HEADER_LENGTH));
+        }
+
+        originalOpcode = header.getInt();
+        uncompressedSize = header.getInt();
+        compressorId = header.get();
+    }
+
+    /**
+     *
+     * @return the original opcode
+     */
+    public int getOriginalOpcode() {
+        return originalOpcode;
+    }
+
+    /**
+     *
+     * @return the uncompressed size of the wrapped message
+     */
+    public int getUncompressedSize() {
+        return uncompressedSize;
+    }
+
+    /**
+     *
+     * @return the compressor identifier with which the message is compressed
+     */
+    public byte getCompressorId() {
+        return compressorId;
+    }
+
+    /**
+     * @return the size of the compressed message.
+     */
+    public int getCompressedSize() {
+        return messageHeader.getMessageLength() - COMPRESSED_HEADER_LENGTH - MESSAGE_HEADER_LENGTH;
+    }
+
+    public MessageHeader getMessageHeader() {
+        return messageHeader;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/CompressedMessage.java b/driver-core/src/main/com/mongodb/internal/connection/CompressedMessage.java
new file mode 100644
index 00000000000..c505eeb06d3
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/CompressedMessage.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.session.SessionContext;
+import org.bson.ByteBuf;
+import org.bson.io.BsonOutput;
+
+import java.util.List;
+
+import static com.mongodb.internal.connection.MessageHeader.MESSAGE_HEADER_LENGTH;
+
+class CompressedMessage extends RequestMessage {
+    private final OpCode wrappedOpcode;
+    private final List<ByteBuf> wrappedMessageBuffers;
+    private final Compressor compressor;
+
+    CompressedMessage(final OpCode wrappedOpcode, final List<ByteBuf> wrappedMessageBuffers, final Compressor compressor,
+                      final MessageSettings settings) {
+        super(OpCode.OP_COMPRESSED, getWrappedMessageRequestId(wrappedMessageBuffers), settings);
+        this.wrappedOpcode = wrappedOpcode;
+        this.wrappedMessageBuffers = wrappedMessageBuffers;
+        this.compressor = compressor;
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final SessionContext sessionContext) {
+        bsonOutput.writeInt32(wrappedOpcode.getValue());
+        bsonOutput.writeInt32(getWrappedMessageSize(wrappedMessageBuffers) - MESSAGE_HEADER_LENGTH);
+        bsonOutput.writeByte(compressor.getId());
+
+        getFirstWrappedMessageBuffer(wrappedMessageBuffers)
+                .position(getFirstWrappedMessageBuffer(wrappedMessageBuffers).position() + MESSAGE_HEADER_LENGTH);
+
+        compressor.compress(wrappedMessageBuffers, bsonOutput);
+
+        return new EncodingMetadata(0);
+    }
+
+    private static int getWrappedMessageSize(final List<ByteBuf> wrappedMessageBuffers) {
+        ByteBuf first = getFirstWrappedMessageBuffer(wrappedMessageBuffers);
+        return first.getInt(0);
+    }
+
+    private static int getWrappedMessageRequestId(final List<ByteBuf> wrappedMessageBuffers) {
+        ByteBuf first = getFirstWrappedMessageBuffer(wrappedMessageBuffers);
+        return first.getInt(4);
+    }
+
+    private static ByteBuf getFirstWrappedMessageBuffer(final List<ByteBuf> wrappedMessageBuffers) {
+        return wrappedMessageBuffers.get(0);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/Compressor.java b/driver-core/src/main/com/mongodb/internal/connection/Compressor.java
new file mode 100644
index 00000000000..ffe7a00ffa4
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/Compressor.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoInternalException;
+import org.bson.ByteBuf;
+import org.bson.io.BsonOutput;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+abstract class Compressor {
+
+    static final int BUFFER_SIZE = 256;
+
+    abstract String getName();
+
+    abstract byte getId();
+
+    void compress(final List<ByteBuf> source, final BsonOutput target) {
+        BufferExposingByteArrayOutputStream baos = new BufferExposingByteArrayOutputStream(1024);
+        OutputStream outputStream = null;
+        try {
+            outputStream = getOutputStream(baos);
+            byte[] scratch = new byte[BUFFER_SIZE];
+            for (ByteBuf cur : source) {
+                while (cur.hasRemaining()) {
+                    int numBytes = Math.min(cur.remaining(), scratch.length);
+                    cur.get(scratch, 0, numBytes);
+                    outputStream.write(scratch, 0, numBytes);
+                }
+            }
+
+        } catch (IOException e) {
+            throw new MongoInternalException("Unexpected IOException", e);
+        } finally {
+            try {
+                if (outputStream != null) {
+                    outputStream.close();
+                }
+            } catch (IOException e) {
+                // ignore
+            }
+        }
+        target.writeBytes(baos.getInternalBytes(), 0, baos.size());
+    }
+
+    void uncompress(final ByteBuf source, final ByteBuf target) {
+        InputStream inputStream = null;
+
+        try {
+            inputStream = getInputStream(new ByteBufInputStream(source));
+            byte[] scratch = new byte[BUFFER_SIZE];
+            int numBytes = inputStream.read(scratch);
+            while (numBytes != -1) {
+                target.put(scratch, 0, numBytes);
+                numBytes = inputStream.read(scratch);
+            }
+        } catch (IOException e) {
+            throw new MongoInternalException("Unexpected IOException", e);
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                // ignore
+            }
+        }
+    }
+
+    // override this if not overriding the compress method
+    OutputStream getOutputStream(final OutputStream source) throws IOException {
+        throw new UnsupportedEncodingException();
+    }
+
+    // override this if not overriding the uncompress method
+    InputStream getInputStream(final InputStream source) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    private static final class ByteBufInputStream extends InputStream {
+        private final ByteBuf source;
+
+        ByteBufInputStream(final ByteBuf source) {
+            this.source = source;
+        }
+
+        @Override
+        public int read(final byte[] bytes, final int offset, final int length) {
+            if (!source.hasRemaining()) {
+                return -1;
+            }
+
+            int bytesToRead = length > source.remaining() ? source.remaining() : length;
+            source.get(bytes, offset, bytesToRead);
+            return bytesToRead;
+        }
+
+        @Override
+        public int read() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    // Just so we don't have to copy the buffer
+    private static final class BufferExposingByteArrayOutputStream extends ByteArrayOutputStream {
+        BufferExposingByteArrayOutputStream(final int size) {
+            super(size);
+        }
+
+        byte[] getInternalBytes() {
+            return buf;
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ConcurrentLinkedDeque.java b/driver-core/src/main/com/mongodb/internal/connection/ConcurrentLinkedDeque.java
index d6bab4746e5..117851776ac 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/ConcurrentLinkedDeque.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ConcurrentLinkedDeque.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -866,11 +866,11 @@ public <T> T[] toArray(T[] a) {
      *
      * @return an iterator over the elements in this deque in proper sequence
      */
-    public Iterator<E> iterator() {
+    public RemovalReportingIterator<E> iterator() {
         return new CLDIterator();
     }
 
-    final class CLDIterator implements Iterator<E> {
+    final class CLDIterator implements RemovalReportingIterator<E> {
         Node<E> last;
         Node<E> next = header.forward();
 
@@ -887,11 +887,19 @@ public E next() {
         }
 
         public void remove() {
+            reportingRemove();
+        }
+
+        @Override
+        public boolean reportingRemove() {
             Node<E> l = last;
             if (l == null)
                 throw new IllegalStateException();
-            while (!l.delete() && !l.isDeleted())
-                ;
+            boolean successfullyRemoved = l.delete();
+            while (!successfullyRemoved && !l.isDeleted()) {
+                successfullyRemoved = l.delete();
+            }
+            return successfullyRemoved;
         }
     }
 
@@ -901,4 +909,19 @@ public void remove() {
     public Iterator<E> descendingIterator() {
         throw new UnsupportedOperationException();
     }
+
+    public interface RemovalReportingIterator<E> extends Iterator<E> {
+        /**
+         * Removes from the underlying collection the last element returned by this iterator and reports whether the current element was
+         * removed by the call.  This method can be called only once per call to {@link #next}.
+         *
+         * @return true if the element was successfully removed by this call, false if the element had already been removed by a concurrent
+         * removal
+         * @throws IllegalStateException if the {@code next} method has not
+         *         yet been called, or the {@code remove} method has already
+         *         been called after the last call to the {@code next}
+         *         method
+         */
+        boolean reportingRemove();
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ConcurrentPool.java b/driver-core/src/main/com/mongodb/internal/connection/ConcurrentPool.java
index d01f0cc4177..99800b87fa8 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/ConcurrentPool.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ConcurrentPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import com.mongodb.MongoInternalException;
 import com.mongodb.MongoInterruptedException;
 import com.mongodb.MongoTimeoutException;
+import com.mongodb.internal.connection.ConcurrentLinkedDeque.RemovalReportingIterator;
 
-import java.util.Deque;
 import java.util.Iterator;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -35,21 +35,35 @@ public class ConcurrentPool<T> implements Pool<T> {
     private final int maxSize;
     private final ItemFactory<T> itemFactory;
 
-    private final Deque<T> available = new ConcurrentLinkedDeque<T>();
+    private final ConcurrentLinkedDeque<T> available = new ConcurrentLinkedDeque<T>();
     private final Semaphore permits;
     private volatile boolean closed;
 
+    public enum Prune {
+        /**
+         * Prune this element
+         */
+        YES,
+        /**
+         * Don't prone this element
+         */
+        NO,
+        /**
+         * Don't prune this element and stop attempting to prune additional elements
+         */
+        STOP
+    }
     /**
      * Factory for creating and closing pooled items.
      *
      * @param <T>
      */
     public interface ItemFactory<T> {
-        T create(final boolean initialize);
+        T create(boolean initialize);
 
         void close(T t);
 
-        boolean shouldPrune(T t);
+        Prune shouldPrune(T t);
     }
 
     /**
@@ -136,17 +150,20 @@ public T get(final long timeout, final TimeUnit timeUnit) {
     }
 
     public void prune() {
-        int currentAvailableCount = getAvailableCount();
-        for (int numAttempts = 0; numAttempts < currentAvailableCount; numAttempts++) {
-            if (!acquirePermit(10, TimeUnit.MILLISECONDS)) {
+        for (RemovalReportingIterator<T> iter = available.iterator(); iter.hasNext();) {
+            T cur = iter.next();
+            Prune shouldPrune = itemFactory.shouldPrune(cur);
+
+            if (shouldPrune == Prune.STOP) {
                 break;
             }
-            T cur = available.pollFirst();
-            if (cur == null) {
-                releasePermit();
-                break;
+
+            if (shouldPrune == Prune.YES) {
+                boolean removed = iter.reportingRemove();
+                if (removed) {
+                    close(cur);
+                }
             }
-            release(cur, itemFactory.shouldPrune(cur));
         }
     }
 
diff --git a/driver-core/src/main/com/mongodb/connection/ConnectionFactory.java b/driver-core/src/main/com/mongodb/internal/connection/ConnectionFactory.java
similarity index 80%
rename from driver-core/src/main/com/mongodb/connection/ConnectionFactory.java
rename to driver-core/src/main/com/mongodb/internal/connection/ConnectionFactory.java
index 063866e6c67..5c49ab73593 100644
--- a/driver-core/src/main/com/mongodb/connection/ConnectionFactory.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.Connection;
 
 interface ConnectionFactory {
     Connection create(InternalConnection internalConnection, ProtocolExecutor executor, ClusterConnectionMode clusterConnectionMode);
diff --git a/driver-core/src/main/com/mongodb/connection/ConnectionPool.java b/driver-core/src/main/com/mongodb/internal/connection/ConnectionPool.java
similarity index 83%
rename from driver-core/src/main/com/mongodb/connection/ConnectionPool.java
rename to driver-core/src/main/com/mongodb/internal/connection/ConnectionPool.java
index fd0def5f28c..10e739ac8df 100644
--- a/driver-core/src/main/com/mongodb/connection/ConnectionPool.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ConnectionPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.async.SingleResultCallback;
 
@@ -23,6 +23,9 @@
 
 interface ConnectionPool extends Closeable {
 
+    // Start any maintenance task background tasks associated with the connection pool
+    void start();
+
     InternalConnection get();
 
     InternalConnection get(long timeout, TimeUnit timeUnit);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DecimalFormatHelper.java b/driver-core/src/main/com/mongodb/internal/connection/DecimalFormatHelper.java
new file mode 100644
index 00000000000..c92c632192b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DecimalFormatHelper.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mongodb.internal.connection;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+
+public final class DecimalFormatHelper {
+
+    private static final DecimalFormatSymbols DECIMAL_FORMAT_SYMBOLS = initializeDecimalFormatSymbols();
+
+    private DecimalFormatHelper(){
+    }
+
+    private static DecimalFormatSymbols initializeDecimalFormatSymbols() {
+        DecimalFormatSymbols decimalFormatSymbols = new DecimalFormatSymbols();
+        decimalFormatSymbols.setDecimalSeparator('.');
+        return decimalFormatSymbols;
+    }
+
+    public static String format(final String pattern, final double number) {
+        return new DecimalFormat(pattern, DECIMAL_FORMAT_SYMBOLS).format(number);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultAuthenticator.java
new file mode 100644
index 00000000000..b5e163f41e5
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultAuthenticator.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.AuthenticationMechanism;
+import com.mongodb.MongoException;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerVersion;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_256;
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.internal.connection.CommandHelper.executeCommand;
+import static com.mongodb.internal.connection.CommandHelper.executeCommandAsync;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotZero;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotZero;
+import static java.lang.String.format;
+
+class DefaultAuthenticator extends Authenticator {
+    static final int USER_NOT_FOUND_CODE = 11;
+    private static final ServerVersion FOUR_ZERO = new ServerVersion(4, 0);
+    private static final ServerVersion THREE_ZERO = new ServerVersion(3, 0);
+    private static final BsonString DEFAULT_MECHANISM_NAME = new BsonString(SCRAM_SHA_256.getMechanismName());
+
+    DefaultAuthenticator(final MongoCredentialWithCache credential) {
+        super(credential);
+        isTrueArgument("unspecified authentication mechanism", credential.getAuthenticationMechanism() == null);
+    }
+
+    @Override
+    void authenticate(final InternalConnection connection, final ConnectionDescription connectionDescription) {
+        if (serverIsLessThanVersionFourDotZero(connectionDescription)) {
+            getLegacyDefaultAuthenticator(connectionDescription)
+                    .authenticate(connection, connectionDescription);
+        } else {
+            try {
+                BsonDocument isMasterResult = executeCommand("admin", createIsMasterCommand(), connection);
+                getAuthenticatorFromIsMasterResult(isMasterResult, connectionDescription)
+                        .authenticate(connection, connectionDescription);
+            } catch (Exception e) {
+                throw wrapException(e);
+            }
+        }
+    }
+
+    @Override
+    void authenticateAsync(final InternalConnection connection, final ConnectionDescription connectionDescription,
+                           final SingleResultCallback<Void> callback) {
+        if (serverIsLessThanVersionFourDotZero(connectionDescription)) {
+            getLegacyDefaultAuthenticator(connectionDescription)
+                    .authenticateAsync(connection, connectionDescription, callback);
+        } else {
+            executeCommandAsync("admin", createIsMasterCommand(), connection, new SingleResultCallback<BsonDocument>() {
+                @Override
+                public void onResult(final BsonDocument result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, wrapException(t));
+                    } else {
+                        getAuthenticatorFromIsMasterResult(result, connectionDescription)
+                                .authenticateAsync(connection, connectionDescription, callback);
+                    }
+                }
+            });
+        }
+    }
+
+    Authenticator getAuthenticatorFromIsMasterResult(final BsonDocument isMasterResult, final ConnectionDescription connectionDescription) {
+        if (isMasterResult.containsKey("saslSupportedMechs")) {
+            BsonArray saslSupportedMechs = isMasterResult.getArray("saslSupportedMechs");
+            AuthenticationMechanism mechanism = saslSupportedMechs.contains(DEFAULT_MECHANISM_NAME) ? SCRAM_SHA_256 : SCRAM_SHA_1;
+            return new ScramShaAuthenticator(getMongoCredentialWithCache().withMechanism(mechanism));
+        } else {
+            return getLegacyDefaultAuthenticator(connectionDescription);
+        }
+    }
+
+    private Authenticator getLegacyDefaultAuthenticator(final ConnectionDescription connectionDescription) {
+        if (serverIsAtLeastVersionThreeDotZero(connectionDescription)) {
+            return new ScramShaAuthenticator(getMongoCredentialWithCache().withMechanism(SCRAM_SHA_1));
+        } else {
+            return new NativeAuthenticator(getMongoCredentialWithCache());
+        }
+    }
+
+    private BsonDocument createIsMasterCommand() {
+        BsonDocument isMasterCommandDocument = new BsonDocument("ismaster", new BsonInt32(1));
+        isMasterCommandDocument.append("saslSupportedMechs",
+                new BsonString(format("%s.%s", getMongoCredential().getSource(), getMongoCredential().getUserName())));
+        return isMasterCommandDocument;
+    }
+
+    private MongoException wrapException(final Throwable t) {
+        if (t instanceof MongoSecurityException) {
+            return (MongoSecurityException) t;
+        } else if (t instanceof MongoException && ((MongoException) t).getCode() == USER_NOT_FOUND_CODE) {
+            return new MongoSecurityException(getMongoCredential(), format("Exception authenticating %s", getMongoCredential()), t);
+        } else {
+            return MongoException.fromThrowable(t);
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultClusterableServerFactory.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultClusterableServerFactory.java
new file mode 100644
index 00000000000..f2635b4dbcf
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultClusterableServerFactory.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCompressor;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.StreamFactory;
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.ServerListener;
+
+import java.util.Collections;
+import java.util.List;
+
+public class DefaultClusterableServerFactory implements ClusterableServerFactory {
+    private final ClusterId clusterId;
+    private final ClusterSettings clusterSettings;
+    private final ServerSettings serverSettings;
+    private final ConnectionPoolSettings connectionPoolSettings;
+    private final StreamFactory streamFactory;
+    private final List<MongoCredentialWithCache> credentialList;
+    private final StreamFactory heartbeatStreamFactory;
+    private final CommandListener commandListener;
+    private final String applicationName;
+    private final MongoDriverInformation mongoDriverInformation;
+    private final List<MongoCompressor> compressorList;
+
+    public DefaultClusterableServerFactory(final ClusterId clusterId, final ClusterSettings clusterSettings,
+                                           final ServerSettings serverSettings, final ConnectionPoolSettings connectionPoolSettings,
+                                           final StreamFactory streamFactory, final StreamFactory heartbeatStreamFactory,
+                                           final List<MongoCredential> credentialList, final CommandListener commandListener,
+                                           final String applicationName, final MongoDriverInformation mongoDriverInformation,
+                                           final List<MongoCompressor> compressorList) {
+        this.clusterId = clusterId;
+        this.clusterSettings = clusterSettings;
+        this.serverSettings = serverSettings;
+        this.connectionPoolSettings = connectionPoolSettings;
+        this.streamFactory = streamFactory;
+        this.credentialList = MongoCredentialWithCache.wrapCredentialList(credentialList);
+        this.heartbeatStreamFactory = heartbeatStreamFactory;
+        this.commandListener = commandListener;
+        this.applicationName = applicationName;
+        this.mongoDriverInformation = mongoDriverInformation;
+        this.compressorList = compressorList;
+    }
+
+    @Override
+    public ClusterableServer create(final ServerAddress serverAddress, final ServerListener serverListener,
+                                    final ClusterClock clusterClock) {
+        ConnectionPool connectionPool = new DefaultConnectionPool(new ServerId(clusterId, serverAddress),
+                new InternalStreamConnectionFactory(streamFactory, credentialList, applicationName,
+                        mongoDriverInformation, compressorList, commandListener), connectionPoolSettings);
+
+        connectionPool.start();
+
+        // no credentials, compressor list, or command listener for the server monitor factory
+        ServerMonitorFactory serverMonitorFactory =
+            new DefaultServerMonitorFactory(new ServerId(clusterId, serverAddress), serverSettings, clusterClock,
+                    new InternalStreamConnectionFactory(heartbeatStreamFactory, Collections.<MongoCredentialWithCache>emptyList(),
+                            applicationName, mongoDriverInformation, Collections.<MongoCompressor>emptyList(), null), connectionPool);
+
+        return new DefaultServer(new ServerId(clusterId, serverAddress), clusterSettings.getMode(), connectionPool,
+                new DefaultConnectionFactory(), serverMonitorFactory, serverListener, commandListener, clusterClock);
+    }
+
+    @Override
+    public ServerSettings getSettings() {
+        return serverSettings;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultConnectionFactory.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionFactory.java
similarity index 84%
rename from driver-core/src/main/com/mongodb/connection/DefaultConnectionFactory.java
rename to driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionFactory.java
index 3a1f5a31830..17de8c8f75f 100644
--- a/driver-core/src/main/com/mongodb/connection/DefaultConnectionFactory.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.Connection;
 
 class DefaultConnectionFactory implements ConnectionFactory {
     @Override
diff --git a/driver-core/src/main/com/mongodb/connection/DefaultConnectionPool.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
similarity index 75%
rename from driver-core/src/main/com/mongodb/connection/DefaultConnectionPool.java
rename to driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
index 0fb26f6e578..966f77d8578 100644
--- a/driver-core/src/main/com/mongodb/connection/DefaultConnectionPool.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoException;
 import com.mongodb.MongoInternalException;
@@ -24,6 +24,10 @@
 import com.mongodb.MongoTimeoutException;
 import com.mongodb.MongoWaitQueueFullException;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerId;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
 import com.mongodb.event.ConnectionAddedEvent;
@@ -35,53 +39,63 @@
 import com.mongodb.event.ConnectionPoolWaitQueueEnteredEvent;
 import com.mongodb.event.ConnectionPoolWaitQueueExitedEvent;
 import com.mongodb.event.ConnectionRemovedEvent;
-import com.mongodb.internal.connection.ConcurrentPool;
+import com.mongodb.internal.connection.ConcurrentPool.Prune;
 import com.mongodb.internal.thread.DaemonThreadFactory;
+import com.mongodb.session.SessionContext;
 import org.bson.ByteBuf;
+import org.bson.codecs.Decoder;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.event.EventListenerHelper.getConnectionPoolListener;
 import static java.lang.String.format;
-import static java.lang.Thread.currentThread;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 class DefaultConnectionPool implements ConnectionPool {
     private static final Logger LOGGER = Loggers.getLogger("connection");
-    private static final DaemonThreadFactory THREAD_FACTORY = new DaemonThreadFactory();
 
     private final ConcurrentPool<UsageTrackingInternalConnection> pool;
     private final ConnectionPoolSettings settings;
     private final AtomicInteger waitQueueSize = new AtomicInteger(0);
     private final AtomicInteger generation = new AtomicInteger(0);
-    private final ExecutorService sizeMaintenanceTimer;
+    private final AtomicInteger lastPrunedGeneration = new AtomicInteger(0);
+    private final ScheduledExecutorService sizeMaintenanceTimer;
     private ExecutorService asyncGetter;
     private final Runnable maintenanceTask;
     private final ConnectionPoolListener connectionPoolListener;
     private final ServerId serverId;
     private volatile boolean closed;
 
-    public DefaultConnectionPool(final ServerId serverId,
-                                 final InternalConnectionFactory internalConnectionFactory, final ConnectionPoolSettings settings,
-                                 final ConnectionPoolListener connectionPoolListener) {
+    DefaultConnectionPool(final ServerId serverId, final InternalConnectionFactory internalConnectionFactory,
+                          final ConnectionPoolSettings settings) {
         this.serverId = notNull("serverId", serverId);
         this.settings = notNull("settings", settings);
-        UsageTrackingInternalConnectionItemFactory connectionItemFactory
-        = new UsageTrackingInternalConnectionItemFactory(internalConnectionFactory);
+        UsageTrackingInternalConnectionItemFactory connectionItemFactory =
+                new UsageTrackingInternalConnectionItemFactory(internalConnectionFactory);
         pool = new ConcurrentPool<UsageTrackingInternalConnection>(settings.getMaxSize(), connectionItemFactory);
+        this.connectionPoolListener = getConnectionPoolListener(settings);
         maintenanceTask = createMaintenanceTask();
-        sizeMaintenanceTimer = createTimer();
-        this.connectionPoolListener = notNull("connectionPoolListener", connectionPoolListener);
+        sizeMaintenanceTimer = createMaintenanceTimer();
         connectionPoolListener.connectionPoolOpened(new ConnectionPoolOpenedEvent(serverId, settings));
     }
 
+    @Override
+    public void start() {
+        if (sizeMaintenanceTimer != null) {
+            sizeMaintenanceTimer.scheduleAtFixedRate(maintenanceTask, settings.getMaintenanceInitialDelay(MILLISECONDS),
+                    settings.getMaintenanceFrequency(MILLISECONDS), MILLISECONDS);
+        }
+    }
+
     @Override
     public InternalConnection get() {
         return get(settings.getMaxWaitTime(MILLISECONDS), MILLISECONDS);
@@ -94,7 +108,7 @@ public InternalConnection get(final long timeout, final TimeUnit timeUnit) {
                 throw createWaitQueueFullException();
             }
             try {
-                connectionPoolListener.waitQueueEntered(new ConnectionPoolWaitQueueEnteredEvent(serverId, currentThread().getId()));
+                connectionPoolListener.waitQueueEntered(new ConnectionPoolWaitQueueEnteredEvent(serverId));
                 PooledConnection pooledConnection = getPooledConnection(timeout, timeUnit);
                 if (!pooledConnection.opened()) {
                     try {
@@ -111,7 +125,7 @@ public InternalConnection get(final long timeout, final TimeUnit timeUnit) {
 
                 return pooledConnection;
             } finally {
-                connectionPoolListener.waitQueueExited(new ConnectionPoolWaitQueueExitedEvent(serverId, currentThread().getId()));
+                connectionPoolListener.waitQueueExited(new ConnectionPoolWaitQueueExitedEvent(serverId));
             }
         } finally {
             waitQueueSize.decrementAndGet();
@@ -121,7 +135,7 @@ public InternalConnection get(final long timeout, final TimeUnit timeUnit) {
     @Override
     public void getAsync(final SingleResultCallback<InternalConnection> callback) {
         if (LOGGER.isTraceEnabled()) {
-            LOGGER.trace(String.format("Asynchronously getting a connection from the pool for server %s", serverId));
+            LOGGER.trace(format("Asynchronously getting a connection from the pool for server %s", serverId));
         }
 
         final SingleResultCallback<InternalConnection> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -138,20 +152,20 @@ public void getAsync(final SingleResultCallback<InternalConnection> callback) {
 
         if (connection != null) {
             if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(String.format("Asynchronously opening pooled connection %s to server %s",
+                LOGGER.trace(format("Asynchronously opening pooled connection %s to server %s",
                                            connection.getDescription().getConnectionId(), serverId));
             }
             openAsync(connection, errHandlingCallback);
         } else if (waitQueueSize.incrementAndGet() > settings.getMaxWaitQueueSize()) {
             waitQueueSize.decrementAndGet();
             if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(String.format("Asynchronously failing to get a pooled connection to %s because the wait queue is full",
+                LOGGER.trace(format("Asynchronously failing to get a pooled connection to %s because the wait queue is full",
                                            serverId));
             }
             callback.onResult(null, createWaitQueueFullException());
         } else {
             final long startTimeMillis = System.currentTimeMillis();
-            connectionPoolListener.waitQueueEntered(new ConnectionPoolWaitQueueEnteredEvent(serverId, currentThread().getId()));
+            connectionPoolListener.waitQueueEntered(new ConnectionPoolWaitQueueEnteredEvent(serverId));
             getAsyncGetter().submit(new Runnable() {
                 @Override
                 public void run() {
@@ -166,7 +180,7 @@ public void run() {
                         errHandlingCallback.onResult(null, t);
                     } finally {
                         waitQueueSize.decrementAndGet();
-                        connectionPoolListener.waitQueueExited(new ConnectionPoolWaitQueueExitedEvent(serverId, currentThread().getId()));
+                        connectionPoolListener.waitQueueExited(new ConnectionPoolWaitQueueExitedEvent(serverId));
                     }
                 }
 
@@ -181,13 +195,13 @@ private void openAsync(final PooledConnection pooledConnection,
                            final SingleResultCallback<InternalConnection> callback) {
         if (pooledConnection.opened()) {
             if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(String.format("Pooled connection %s to server %s is already open",
+                LOGGER.trace(format("Pooled connection %s to server %s is already open",
                                            pooledConnection.getDescription().getConnectionId(), serverId));
             }
             callback.onResult(pooledConnection, null);
         } else {
             if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace(String.format("Pooled connection %s to server %s is not yet open",
+                LOGGER.trace(format("Pooled connection %s to server %s is not yet open",
                                            pooledConnection.getDescription().getConnectionId(), serverId));
             }
             pooledConnection.openAsync(new SingleResultCallback<Void>() {
@@ -195,14 +209,14 @@ private void openAsync(final PooledConnection pooledConnection,
                 public void onResult(final Void result, final Throwable t) {
                     if (t != null) {
                         if (LOGGER.isTraceEnabled()) {
-                            LOGGER.trace(String.format("Pooled connection %s to server %s failed to open",
+                            LOGGER.trace(format("Pooled connection %s to server %s failed to open",
                                                        pooledConnection.getDescription().getConnectionId(), serverId));
                         }
                         callback.onResult(null, t);
                         pool.release(pooledConnection.wrapped, true);
                     } else {
                         if (LOGGER.isTraceEnabled()) {
-                            LOGGER.trace(String.format("Pooled connection %s to server %s is now open",
+                            LOGGER.trace(format("Pooled connection %s to server %s is now open",
                                                        pooledConnection.getDescription().getConnectionId(), serverId));
                         }
                         callback.onResult(pooledConnection, null);
@@ -214,7 +228,7 @@ public void onResult(final Void result, final Throwable t) {
 
     private synchronized ExecutorService getAsyncGetter() {
         if (asyncGetter == null) {
-            asyncGetter = Executors.newSingleThreadExecutor(THREAD_FACTORY);
+            asyncGetter = Executors.newSingleThreadExecutor(new DaemonThreadFactory("AsyncGetter"));
         }
         return asyncGetter;
     }
@@ -272,8 +286,8 @@ private MongoTimeoutException createTimeoutException() {
     }
 
     private MongoWaitQueueFullException createWaitQueueFullException() {
-        return new MongoWaitQueueFullException(format("Too many threads are already waiting for a connection. "
-                                                      + "Max number of threads (maxWaitQueueSize) of %d has been exceeded.",
+        return new MongoWaitQueueFullException(format("Too many operations are already waiting for a connection. "
+                                                      + "Max number of operations (maxWaitQueueSize) of %d has been exceeded.",
                                                       settings.getMaxWaitQueueSize()));
     }
 
@@ -288,12 +302,14 @@ private Runnable createMaintenanceTask() {
                 @Override
                 public synchronized void run() {
                     try {
-                        if (shouldPrune()) {
+                        int curGeneration = generation.get();
+                        if (shouldPrune() || curGeneration > lastPrunedGeneration.get()) {
                             if (LOGGER.isDebugEnabled()) {
                                 LOGGER.debug(format("Pruning pooled connections to %s", serverId.getAddress()));
                             }
                             pool.prune();
                         }
+                        lastPrunedGeneration.set(curGeneration);
                         if (shouldEnsureMinSize()) {
                             if (LOGGER.isDebugEnabled()) {
                                 LOGGER.debug(format("Ensuring minimum pooled connections to %s", serverId.getAddress()));
@@ -311,14 +327,11 @@ public synchronized void run() {
         return newMaintenanceTask;
     }
 
-    private ExecutorService createTimer() {
+    private ScheduledExecutorService createMaintenanceTimer() {
         if (maintenanceTask == null) {
             return null;
         } else {
-            ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(THREAD_FACTORY);
-            newTimer.scheduleAtFixedRate(maintenanceTask, settings.getMaintenanceInitialDelay(MILLISECONDS),
-                                         settings.getMaintenanceFrequency(MILLISECONDS), MILLISECONDS);
-            return newTimer;
+            return Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory("MaintenanceTimer"));
         }
     }
 
@@ -372,47 +385,46 @@ private ConnectionId getId(final InternalConnection internalConnection) {
     }
 
     private class PooledConnection implements InternalConnection {
-        private volatile UsageTrackingInternalConnection wrapped;
+        private final UsageTrackingInternalConnection wrapped;
+        private final AtomicBoolean isClosed = new AtomicBoolean();
 
-        public PooledConnection(final UsageTrackingInternalConnection wrapped) {
+        PooledConnection(final UsageTrackingInternalConnection wrapped) {
             this.wrapped = notNull("wrapped", wrapped);
         }
 
         @Override
         public void open() {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             wrapped.open();
         }
 
         @Override
         public void openAsync(final SingleResultCallback<Void> callback) {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             wrapped.openAsync(callback);
         }
 
         @Override
         public void close() {
-            if (wrapped != null) {
-                if (!closed) {
-                    connectionPoolListener.connectionCheckedIn(new ConnectionCheckedInEvent(getId(wrapped)));
-                    if (LOGGER.isTraceEnabled()) {
-                        LOGGER.trace(format("Checked in connection [%s] to server %s", getId(wrapped), serverId.getAddress()));
-                    }
+            // All but the first call is a no-op
+            if (!isClosed.getAndSet(true)) {
+                connectionPoolListener.connectionCheckedIn(new ConnectionCheckedInEvent(getId(wrapped)));
+                if (LOGGER.isTraceEnabled()) {
+                    LOGGER.trace(format("Checked in connection [%s] to server %s", getId(wrapped), serverId.getAddress()));
                 }
                 pool.release(wrapped, wrapped.isClosed() || shouldPrune(wrapped));
-                wrapped = null;
             }
         }
 
         @Override
         public boolean opened() {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             return wrapped.opened();
         }
 
         @Override
         public boolean isClosed() {
-            return wrapped == null || wrapped.isClosed();
+            return isClosed.get() || wrapped.isClosed();
         }
 
         @Override
@@ -422,7 +434,7 @@ public ByteBuf getBuffer(final int capacity) {
 
         @Override
         public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             try {
                 wrapped.sendMessage(byteBuffers, lastRequestId);
             } catch (MongoException e) {
@@ -431,9 +443,35 @@ public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId
             }
         }
 
+        @Override
+        public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+            isTrue("open", !isClosed.get());
+            try {
+                return wrapped.sendAndReceive(message, decoder, sessionContext);
+            } catch (MongoException e) {
+                incrementGenerationOnSocketException(this, e);
+                throw e;
+            }
+        }
+
+        @Override
+        public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder,
+                                            final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+            isTrue("open", !isClosed.get());
+            wrapped.sendAndReceiveAsync(message, decoder, sessionContext, new SingleResultCallback<T>() {
+                @Override
+                public void onResult(final T result, final Throwable t) {
+                    if (t != null) {
+                        incrementGenerationOnSocketException(PooledConnection.this, t);
+                    }
+                    callback.onResult(result, t);
+                }
+            });
+        }
+
         @Override
         public ResponseBuffers receiveMessage(final int responseTo) {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             try {
                 return wrapped.receiveMessage(responseTo);
             } catch (MongoException e) {
@@ -444,7 +482,7 @@ public ResponseBuffers receiveMessage(final int responseTo) {
 
         @Override
         public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             wrapped.sendMessageAsync(byteBuffers, lastRequestId, new SingleResultCallback<Void>() {
                 @Override
                 public void onResult(final Void result, final Throwable t) {
@@ -458,7 +496,7 @@ public void onResult(final Void result, final Throwable t) {
 
         @Override
         public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             wrapped.receiveMessageAsync(responseTo, new SingleResultCallback<ResponseBuffers>() {
                 @Override
                 public void onResult(final ResponseBuffers result, final Throwable t) {
@@ -472,7 +510,7 @@ public void onResult(final ResponseBuffers result, final Throwable t) {
 
         @Override
         public ConnectionDescription getDescription() {
-            isTrue("open", wrapped != null);
+            isTrue("open", !isClosed.get());
             return wrapped.getDescription();
         }
     }
@@ -480,7 +518,7 @@ public ConnectionDescription getDescription() {
     private class UsageTrackingInternalConnectionItemFactory implements ConcurrentPool.ItemFactory<UsageTrackingInternalConnection> {
         private final InternalConnectionFactory internalConnectionFactory;
 
-        public UsageTrackingInternalConnectionItemFactory(final InternalConnectionFactory internalConnectionFactory) {
+        UsageTrackingInternalConnectionItemFactory(final InternalConnectionFactory internalConnectionFactory) {
             this.internalConnectionFactory = internalConnectionFactory;
         }
 
@@ -497,17 +535,15 @@ public UsageTrackingInternalConnection create(final boolean initialize) {
 
         @Override
         public void close(final UsageTrackingInternalConnection connection) {
-            if (!closed) {
-                connectionPoolListener.connectionRemoved(new ConnectionRemovedEvent(getId(connection)));
-            }
+            connectionPoolListener.connectionRemoved(new ConnectionRemovedEvent(getId(connection), getReasonForClosing(connection)));
             if (LOGGER.isInfoEnabled()) {
                 LOGGER.info(format("Closed connection [%s] to %s because %s.", getId(connection), serverId.getAddress(),
-                                  getReasonForClosing(connection)));
+                                  getReasonStringForClosing(connection)));
             }
             connection.close();
         }
 
-        private String getReasonForClosing(final UsageTrackingInternalConnection connection) {
+        private String getReasonStringForClosing(final UsageTrackingInternalConnection connection) {
             String reason;
             if (connection.isClosed()) {
                 reason = "there was a socket exception raised by this connection";
@@ -523,9 +559,25 @@ private String getReasonForClosing(final UsageTrackingInternalConnection connect
             return reason;
         }
 
+        private ConnectionRemovedEvent.Reason getReasonForClosing(final UsageTrackingInternalConnection connection) {
+            ConnectionRemovedEvent.Reason reason;
+            if (connection.isClosed()) {
+                reason = ConnectionRemovedEvent.Reason.ERROR;
+            } else if (fromPreviousGeneration(connection)) {
+                reason = ConnectionRemovedEvent.Reason.STALE;
+            } else if (pastMaxLifeTime(connection)) {
+                reason = ConnectionRemovedEvent.Reason.MAX_LIFE_TIME_EXCEEDED;
+            } else if (pastMaxIdleTime(connection)) {
+                reason = ConnectionRemovedEvent.Reason.MAX_IDLE_TIME_EXCEEDED;
+            } else {
+                reason = ConnectionRemovedEvent.Reason.POOL_CLOSED;
+            }
+            return reason;
+        }
+
         @Override
-        public boolean shouldPrune(final UsageTrackingInternalConnection usageTrackingConnection) {
-            return DefaultConnectionPool.this.shouldPrune(usageTrackingConnection);
+        public Prune shouldPrune(final UsageTrackingInternalConnection usageTrackingConnection) {
+            return DefaultConnectionPool.this.shouldPrune(usageTrackingConnection) ? Prune.YES : Prune.NO;
         }
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitor.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitor.java
new file mode 100644
index 00000000000..ca658865d25
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitor.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.dns.DnsResolver;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static com.mongodb.internal.connection.ServerAddressHelper.createServerAddress;
+
+class DefaultDnsSrvRecordMonitor implements DnsSrvRecordMonitor {
+    private static final Logger LOGGER = Loggers.getLogger("cluster");
+
+    private final String hostName;
+    private final long rescanFrequencyMillis;
+    private final long noRecordsRescanFrequencyMillis;
+    private final DnsSrvRecordInitializer dnsSrvRecordInitializer;
+    private final DnsResolver dnsResolver;
+    private final Thread monitorThread;
+    private volatile boolean isClosed;
+
+    DefaultDnsSrvRecordMonitor(final String hostName, final long rescanFrequencyMillis, final long noRecordsRescanFrequencyMillis,
+                               final DnsSrvRecordInitializer dnsSrvRecordInitializer, final ClusterId clusterId,
+                               final DnsResolver dnsResolver) {
+        this.hostName = hostName;
+        this.rescanFrequencyMillis = rescanFrequencyMillis;
+        this.noRecordsRescanFrequencyMillis = noRecordsRescanFrequencyMillis;
+        this.dnsSrvRecordInitializer = dnsSrvRecordInitializer;
+        this.dnsResolver = dnsResolver;
+        monitorThread = new Thread(new DnsSrvRecordMonitorRunnable(), "cluster-" + clusterId + "-srv-" + hostName);
+        monitorThread.setDaemon(true);
+    }
+
+    @Override
+    public void start() {
+        monitorThread.start();
+    }
+
+    @Override
+    public void close() {
+        isClosed = true;
+        monitorThread.interrupt();
+    }
+
+    private class DnsSrvRecordMonitorRunnable implements Runnable {
+        private Set<ServerAddress> currentHosts = Collections.emptySet();
+        private ClusterType clusterType = ClusterType.UNKNOWN;
+
+        @Override
+        public void run() {
+            while (!isClosed && shouldContinueMonitoring()) {
+                try {
+                    List<String> resolvedHostNames = dnsResolver.resolveHostFromSrvRecords(hostName);
+                    Set<ServerAddress> hosts = createServerAddressSet(resolvedHostNames);
+
+                    if (isClosed) {
+                        return;
+                    }
+
+                    if (!hosts.equals(currentHosts)) {
+                        try {
+                            dnsSrvRecordInitializer.initialize(hosts);
+                            currentHosts = hosts;
+                        } catch (RuntimeException e) {
+                            LOGGER.warn("Exception in monitor thread during notification of DNS resolution state change", e);
+                        }
+                    }
+                } catch (MongoException e) {
+                    if (currentHosts.isEmpty()) {
+                        dnsSrvRecordInitializer.initialize(e);
+                    }
+                    LOGGER.info("Exception while resolving SRV records", e);
+                } catch (RuntimeException e) {
+                    if (currentHosts.isEmpty()) {
+                        dnsSrvRecordInitializer.initialize(new MongoInternalException("Unexpected runtime exception", e));
+                    }
+                    LOGGER.info("Unexpected runtime exception while resolving SRV record", e);
+                }
+
+                try {
+                    Thread.sleep(getRescanFrequencyMillis());
+                } catch (InterruptedException e) {
+                    // fall through
+                }
+                clusterType = dnsSrvRecordInitializer.getClusterType();
+            }
+        }
+
+        private boolean shouldContinueMonitoring() {
+            return clusterType == ClusterType.UNKNOWN || clusterType == ClusterType.SHARDED;
+        }
+
+        private long getRescanFrequencyMillis() {
+            return currentHosts.isEmpty() ? noRecordsRescanFrequencyMillis : rescanFrequencyMillis;
+        }
+
+        private Set<ServerAddress> createServerAddressSet(final List<String> resolvedHostNames) {
+            Set<ServerAddress> hosts = new HashSet<ServerAddress>(resolvedHostNames.size());
+            for (String host : resolvedHostNames) {
+                hosts.add(createServerAddress(host));
+            }
+            return hosts;
+        }
+    }
+}
+
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitorFactory.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitorFactory.java
new file mode 100644
index 00000000000..3c0075fa5c6
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitorFactory.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.internal.dns.DefaultDnsResolver;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class DefaultDnsSrvRecordMonitorFactory implements DnsSrvRecordMonitorFactory {
+
+    // JNDI doesn't provide the TTL for DNS records, so we have to hard-code it
+    private static final long DEFAULT_RESCAN_FREQUENCY_MILLIS = 60000;
+
+    private final ClusterId clusterId;
+    private final long noRecordsRescanFrequency;
+
+    public DefaultDnsSrvRecordMonitorFactory(final ClusterId clusterId, final ServerSettings serverSettings) {
+        this.clusterId = clusterId;
+        this.noRecordsRescanFrequency = serverSettings.getHeartbeatFrequency(MILLISECONDS);
+    }
+
+    @Override
+    public DnsSrvRecordMonitor create(final String hostName, final DnsSrvRecordInitializer dnsSrvRecordInitializer) {
+        return new DefaultDnsSrvRecordMonitor(hostName, DEFAULT_RESCAN_FREQUENCY_MILLIS, noRecordsRescanFrequency, dnsSrvRecordInitializer,
+                clusterId, new DefaultDnsResolver());
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultServer.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultServer.java
new file mode 100644
index 00000000000..6732fe1d784
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultServer.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNodeIsRecoveringException;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.MongoSocketReadTimeoutException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerType;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.ServerClosedEvent;
+import com.mongodb.event.ServerDescriptionChangedEvent;
+import com.mongodb.event.ServerListener;
+import com.mongodb.event.ServerOpeningEvent;
+import com.mongodb.session.SessionContext;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.connection.ServerConnectionState.CONNECTING;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.operation.ServerVersionHelper.FOUR_DOT_TWO_WIRE_VERSION;
+import static java.util.Arrays.asList;
+
+class DefaultServer implements ClusterableServer {
+    private static final Logger LOGGER = Loggers.getLogger("connection");
+    private static final List<Integer> SHUTDOWN_CODES = asList(91, 11600);
+    private final ServerId serverId;
+    private final ConnectionPool connectionPool;
+    private final ClusterConnectionMode clusterConnectionMode;
+    private final ConnectionFactory connectionFactory;
+    private final ServerMonitor serverMonitor;
+    private final ChangeListener<ServerDescription> serverStateListener;
+    private final ServerListener serverListener;
+    private final CommandListener commandListener;
+    private final ClusterClock clusterClock;
+    private volatile ServerDescription description;
+    private volatile boolean isClosed;
+
+    DefaultServer(final ServerId serverId, final ClusterConnectionMode clusterConnectionMode, final ConnectionPool connectionPool,
+                  final ConnectionFactory connectionFactory, final ServerMonitorFactory serverMonitorFactory,
+                  final ServerListener serverListener, final CommandListener commandListener, final ClusterClock clusterClock) {
+        this.serverListener = notNull("serverListener", serverListener);
+        this.commandListener = commandListener;
+        this.clusterClock = notNull("clusterClock", clusterClock);
+        notNull("serverAddress", serverId);
+        notNull("serverMonitorFactory", serverMonitorFactory);
+        this.clusterConnectionMode = notNull("clusterConnectionMode", clusterConnectionMode);
+        this.connectionFactory = notNull("connectionFactory", connectionFactory);
+        this.connectionPool = notNull("connectionPool", connectionPool);
+        this.serverStateListener = new DefaultServerStateListener();
+
+        this.serverId = serverId;
+
+        serverListener.serverOpening(new ServerOpeningEvent(this.serverId));
+
+        description = ServerDescription.builder().state(CONNECTING).address(serverId.getAddress()).build();
+        serverMonitor = serverMonitorFactory.create(serverStateListener);
+        serverMonitor.start();
+    }
+
+    @Override
+    public Connection getConnection() {
+        isTrue("open", !isClosed());
+        try {
+            return connectionFactory.create(connectionPool.get(), new DefaultServerProtocolExecutor(), clusterConnectionMode);
+        } catch (MongoSecurityException e) {
+            connectionPool.invalidate();
+            throw e;
+        } catch (MongoSocketException e) {
+            invalidate();
+            throw e;
+        }
+    }
+
+    @Override
+    public void getConnectionAsync(final SingleResultCallback<AsyncConnection> callback) {
+        isTrue("open", !isClosed());
+        connectionPool.getAsync(new SingleResultCallback<InternalConnection>() {
+            @Override
+            public void onResult(final InternalConnection result, final Throwable t) {
+                if (t instanceof MongoSecurityException) {
+                    connectionPool.invalidate();
+                } else if (t instanceof MongoSocketException) {
+                    invalidate();
+                }
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(connectionFactory.createAsync(result, new DefaultServerProtocolExecutor(), clusterConnectionMode),
+                                      null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public ServerDescription getDescription() {
+        isTrue("open", !isClosed());
+        return description;
+    }
+
+    @Override
+    public void invalidate() {
+        if (!isClosed()) {
+            serverStateListener.stateChanged(new ChangeEvent<ServerDescription>(description, ServerDescription.builder()
+                    .state(CONNECTING)
+                    .address(serverId.getAddress())
+                    .build()));
+            connectionPool.invalidate();
+            connect();
+        }
+    }
+
+    @Override
+    public void invalidate(final Throwable t) {
+        if (!isClosed()) {
+            if ((t instanceof MongoSocketException && !(t instanceof MongoSocketReadTimeoutException))) {
+                invalidate();
+            } else if (t instanceof MongoNotPrimaryException || t instanceof MongoNodeIsRecoveringException) {
+                if (description.getMaxWireVersion() < FOUR_DOT_TWO_WIRE_VERSION) {
+                    invalidate();
+                } else if (SHUTDOWN_CODES.contains(((MongoCommandException) t).getErrorCode())) {
+                    invalidate();
+                } else {
+                    ChangeEvent<ServerDescription> event = new ChangeEvent<ServerDescription>(description, ServerDescription.builder()
+                            .state(CONNECTING).type(ServerType.UNKNOWN).address(serverId.getAddress()).exception(t).build());
+                    serverStateListener.stateChanged(event);
+                    connect();
+                }
+            }
+        }
+    }
+
+    public void invalidate(final Throwable t, final SessionContext sessionContext) {
+        notNull("sessionContext", sessionContext);
+        invalidate(t);
+        if (t instanceof MongoSocketException && sessionContext.hasSession()) {
+            sessionContext.markSessionDirty();
+        }
+    }
+
+    @Override
+    public void close() {
+        if (!isClosed()) {
+            connectionPool.close();
+            serverMonitor.close();
+            isClosed = true;
+            serverListener.serverClosed(new ServerClosedEvent(serverId));
+        }
+    }
+
+    @Override
+    public boolean isClosed() {
+        return isClosed;
+    }
+
+    @Override
+    public void connect() {
+        serverMonitor.connect();
+    }
+
+    ConnectionPool getConnectionPool() {
+        return connectionPool;
+    }
+
+    private class DefaultServerProtocolExecutor implements ProtocolExecutor {
+        @Override
+        public <T> T execute(final LegacyProtocol<T> protocol, final InternalConnection connection) {
+            try {
+                protocol.setCommandListener(commandListener);
+                return protocol.execute(connection);
+            } catch (MongoException e) {
+                invalidate(e);
+                throw e;
+            }
+        }
+
+        @Override
+        public <T> void executeAsync(final LegacyProtocol<T> protocol, final InternalConnection connection,
+                                     final SingleResultCallback<T> callback) {
+            protocol.setCommandListener(commandListener);
+            protocol.executeAsync(connection, errorHandlingCallback(new SingleResultCallback<T>() {
+                @Override
+                public void onResult(final T result, final Throwable t) {
+                    if (t != null) {
+                        invalidate(t);
+                    }
+                    callback.onResult(result, t);
+                }
+            }, LOGGER));
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> T execute(final CommandProtocol<T> protocol, final InternalConnection connection,
+                             final SessionContext sessionContext) {
+            try {
+                protocol.sessionContext(new ClusterClockAdvancingSessionContext(sessionContext, clusterClock));
+                return protocol.execute(connection);
+            } catch (MongoWriteConcernWithResponseException e) {
+                invalidate();
+                return (T) e.getResponse();
+            } catch (MongoException e) {
+                invalidate(e, sessionContext);
+                throw e;
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> void executeAsync(final CommandProtocol<T> protocol, final InternalConnection connection,
+                                     final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+            protocol.sessionContext(new ClusterClockAdvancingSessionContext(sessionContext, clusterClock));
+            protocol.executeAsync(connection, errorHandlingCallback(new SingleResultCallback<T>() {
+                @Override
+                public void onResult(final T result, final Throwable t) {
+                    if (t != null) {
+                        if (t instanceof MongoWriteConcernWithResponseException) {
+                            invalidate();
+                            callback.onResult((T) ((MongoWriteConcernWithResponseException) t).getResponse(), null);
+                        } else {
+                            invalidate(t, sessionContext);
+                            callback.onResult(null, t);
+                        }
+                    } else {
+                        callback.onResult(result, null);
+                    }
+                }
+            }, LOGGER));
+        }
+    }
+
+    private final class DefaultServerStateListener implements ChangeListener<ServerDescription> {
+        @Override
+        public void stateChanged(final ChangeEvent<ServerDescription> event) {
+            ServerDescription oldDescription = description;
+            description = event.getNewValue();
+            serverListener.serverDescriptionChanged(new ServerDescriptionChangedEvent(serverId, description, oldDescription));
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultServerConnection.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultServerConnection.java
new file mode 100644
index 00000000000..a51b569a19d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultServerConnection.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.QueryResult;
+import com.mongodb.connection.SplittablePayload;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.Decoder;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.connection.ServerType.SHARD_ROUTER;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+
+@SuppressWarnings("deprecation")  // because this class implements deprecated methods
+public class DefaultServerConnection extends AbstractReferenceCounted implements Connection, AsyncConnection {
+    private static final Logger LOGGER = Loggers.getLogger("connection");
+    private final InternalConnection wrapped;
+    private final ProtocolExecutor protocolExecutor;
+    private final ClusterConnectionMode clusterConnectionMode;
+
+    public DefaultServerConnection(final InternalConnection wrapped, final ProtocolExecutor protocolExecutor,
+                            final ClusterConnectionMode clusterConnectionMode) {
+        this.wrapped = wrapped;
+        this.protocolExecutor = protocolExecutor;
+        this.clusterConnectionMode = clusterConnectionMode;
+    }
+
+    @Override
+    public DefaultServerConnection retain() {
+        super.retain();
+        return this;
+    }
+
+    @Override
+    public void release() {
+        super.release();
+        if (getCount() == 0) {
+            wrapped.close();
+        }
+    }
+
+    @Override
+    public ConnectionDescription getDescription() {
+        isTrue("open", getCount() > 0);
+        return wrapped.getDescription();
+    }
+
+    @Override
+    public WriteConcernResult insert(final MongoNamespace namespace, final boolean ordered, final InsertRequest insertRequest) {
+        return executeProtocol(new InsertProtocol(namespace, ordered, insertRequest));
+    }
+
+    @Override
+    public void insertAsync(final MongoNamespace namespace, final boolean ordered, final InsertRequest insertRequest,
+                            final SingleResultCallback<WriteConcernResult> callback) {
+        executeProtocolAsync(new InsertProtocol(namespace, ordered, insertRequest), callback);
+    }
+
+    @Override
+    public WriteConcernResult update(final MongoNamespace namespace, final boolean ordered, final UpdateRequest updateRequest) {
+        return executeProtocol(new UpdateProtocol(namespace, ordered, updateRequest));
+    }
+
+    @Override
+    public void updateAsync(final MongoNamespace namespace, final boolean ordered, final UpdateRequest updateRequest,
+                            final SingleResultCallback<WriteConcernResult> callback) {
+        executeProtocolAsync(new UpdateProtocol(namespace, ordered, updateRequest), callback);
+    }
+
+    @Override
+    public WriteConcernResult delete(final MongoNamespace namespace, final boolean ordered, final DeleteRequest deleteRequest) {
+        return executeProtocol(new DeleteProtocol(namespace, ordered, deleteRequest));
+    }
+
+    @Override
+    public void deleteAsync(final MongoNamespace namespace, final boolean ordered, final DeleteRequest deleteRequest,
+                            final SingleResultCallback<WriteConcernResult> callback) {
+        executeProtocolAsync(new DeleteProtocol(namespace, ordered, deleteRequest), callback);
+    }
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final boolean slaveOk,
+                         final FieldNameValidator fieldNameValidator,
+                         final Decoder<T> commandResultDecoder) {
+        return command(database, command, fieldNameValidator, getReadPreferenceFromSlaveOk(slaveOk), commandResultDecoder,
+                NoOpSessionContext.INSTANCE);
+    }
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
+                         final ReadPreference readPreference, final Decoder<T> commandResultDecoder, final SessionContext sessionContext) {
+        return command(database, command, fieldNameValidator, readPreference, commandResultDecoder, sessionContext, true, null, null);
+    }
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                         final ReadPreference readPreference, final Decoder<T> commandResultDecoder, final SessionContext sessionContext,
+                         final boolean responseExpected, final SplittablePayload payload,
+                         final FieldNameValidator payloadFieldNameValidator) {
+        return executeProtocol(new CommandProtocolImpl<T>(database, command, commandFieldNameValidator, readPreference,
+                commandResultDecoder, responseExpected, payload, payloadFieldNameValidator, clusterConnectionMode), sessionContext);
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final boolean slaveOk,
+                                 final FieldNameValidator fieldNameValidator, final Decoder<T> commandResultDecoder,
+                                 final SingleResultCallback<T> callback) {
+        commandAsync(database, command, fieldNameValidator, getReadPreferenceFromSlaveOk(slaveOk), commandResultDecoder,
+                NoOpSessionContext.INSTANCE, callback);
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
+                                 final ReadPreference readPreference, final Decoder<T> commandResultDecoder,
+                                 final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+        commandAsync(database, command, fieldNameValidator, readPreference, commandResultDecoder, sessionContext, true, null, null,
+                callback);
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                                 final ReadPreference readPreference, final Decoder<T> commandResultDecoder,
+                                 final SessionContext sessionContext, final boolean responseExpected, final SplittablePayload payload,
+                                 final FieldNameValidator payloadFieldNameValidator, final SingleResultCallback<T> callback) {
+        executeProtocolAsync(new CommandProtocolImpl<T>(database, command, commandFieldNameValidator, readPreference,
+                commandResultDecoder, responseExpected, payload,  payloadFieldNameValidator, clusterConnectionMode),
+                sessionContext, callback);
+    }
+
+    @Override
+    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                                    final int numberToReturn, final int skip,
+                                    final boolean slaveOk, final boolean tailableCursor,
+                                    final boolean awaitData, final boolean noCursorTimeout,
+                                    final boolean partial, final boolean oplogReplay,
+                                    final Decoder<T> resultDecoder) {
+        return executeProtocol(new QueryProtocol<T>(namespace, skip, numberToReturn, queryDocument, fields, resultDecoder)
+                               .tailableCursor(tailableCursor)
+                               .slaveOk(getSlaveOk(slaveOk))
+                               .oplogReplay(oplogReplay)
+                               .noCursorTimeout(noCursorTimeout)
+                               .awaitData(awaitData)
+                               .partial(partial));
+    }
+
+    @Override
+    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                                    final int skip, final int limit, final int batchSize,
+                                    final boolean slaveOk, final boolean tailableCursor,
+                                    final boolean awaitData, final boolean noCursorTimeout,
+                                    final boolean partial, final boolean oplogReplay,
+                                    final Decoder<T> resultDecoder) {
+        return executeProtocol(new QueryProtocol<T>(namespace, skip, limit, batchSize, queryDocument, fields, resultDecoder)
+                               .tailableCursor(tailableCursor)
+                               .slaveOk(getSlaveOk(slaveOk))
+                               .oplogReplay(oplogReplay)
+                               .noCursorTimeout(noCursorTimeout)
+                               .awaitData(awaitData)
+                               .partial(partial));
+    }
+
+    @Override
+    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                               final int numberToReturn, final int skip,
+                               final boolean slaveOk, final boolean tailableCursor, final boolean awaitData, final boolean noCursorTimeout,
+                               final boolean partial,
+                               final boolean oplogReplay, final Decoder<T> resultDecoder,
+                               final SingleResultCallback<QueryResult<T>> callback) {
+        executeProtocolAsync(new QueryProtocol<T>(namespace, skip, numberToReturn, queryDocument, fields, resultDecoder)
+                             .tailableCursor(tailableCursor)
+                             .slaveOk(getSlaveOk(slaveOk))
+                             .oplogReplay(oplogReplay)
+                             .noCursorTimeout(noCursorTimeout)
+                             .awaitData(awaitData)
+                             .partial(partial), callback);
+    }
+
+    @Override
+    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields, final int skip,
+                               final int limit, final int batchSize, final boolean slaveOk, final boolean tailableCursor,
+                               final boolean awaitData, final boolean noCursorTimeout, final boolean partial, final boolean oplogReplay,
+                               final Decoder<T> resultDecoder, final SingleResultCallback<QueryResult<T>> callback) {
+        executeProtocolAsync(new QueryProtocol<T>(namespace, skip, limit, batchSize, queryDocument, fields, resultDecoder)
+                             .tailableCursor(tailableCursor)
+                             .slaveOk(getSlaveOk(slaveOk))
+                             .oplogReplay(oplogReplay)
+                             .noCursorTimeout(noCursorTimeout)
+                             .awaitData(awaitData)
+                             .partial(partial), callback);
+    }
+
+    @Override
+    public <T> QueryResult<T> getMore(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
+                                      final Decoder<T> resultDecoder) {
+        return executeProtocol(new GetMoreProtocol<T>(namespace, cursorId, numberToReturn, resultDecoder));
+    }
+
+    @Override
+    public <T> void getMoreAsync(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
+                                 final Decoder<T> resultDecoder, final SingleResultCallback<QueryResult<T>> callback) {
+        executeProtocolAsync(new GetMoreProtocol<T>(namespace, cursorId, numberToReturn, resultDecoder), callback);
+    }
+
+    @Override
+    public void killCursor(final List<Long> cursors) {
+        killCursor(null, cursors);
+    }
+
+    @Override
+    public void killCursor(final MongoNamespace namespace, final List<Long> cursors) {
+        executeProtocol(new KillCursorProtocol(namespace, cursors));
+    }
+
+    @Override
+    public void killCursorAsync(final List<Long> cursors, final SingleResultCallback<Void> callback) {
+        killCursorAsync(null, cursors, callback);
+    }
+
+    @Override
+    public void killCursorAsync(final MongoNamespace namespace, final List<Long> cursors, final SingleResultCallback<Void> callback) {
+        executeProtocolAsync(new KillCursorProtocol(namespace, cursors), callback);
+    }
+
+    private ReadPreference getReadPreferenceFromSlaveOk(final boolean slaveOk) {
+        return getSlaveOk(slaveOk) ? ReadPreference.secondaryPreferred() : ReadPreference.primary();
+    }
+
+    private boolean getSlaveOk(final boolean slaveOk) {
+        return slaveOk
+               || (clusterConnectionMode == ClusterConnectionMode.SINGLE && wrapped.getDescription().getServerType() != SHARD_ROUTER);
+    }
+
+    private <T> T executeProtocol(final LegacyProtocol<T> protocol) {
+        return protocolExecutor.execute(protocol, this.wrapped);
+    }
+
+    private <T> T executeProtocol(final CommandProtocol<T> protocol, final SessionContext sessionContext) {
+        return protocolExecutor.execute(protocol, this.wrapped, sessionContext);
+    }
+
+    private <T> void executeProtocolAsync(final LegacyProtocol<T> protocol, final SingleResultCallback<T> callback) {
+        SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        try {
+            protocolExecutor.executeAsync(protocol, this.wrapped, errHandlingCallback);
+        } catch (Throwable t) {
+            errHandlingCallback.onResult(null, t);
+        }
+    }
+
+    private <T> void executeProtocolAsync(final CommandProtocol<T> protocol, final SessionContext sessionContext,
+                                          final SingleResultCallback<T> callback) {
+        SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        try {
+            protocolExecutor.executeAsync(protocol, this.wrapped, sessionContext, errHandlingCallback);
+        } catch (Throwable t) {
+            errHandlingCallback.onResult(null, t);
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitor.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitor.java
new file mode 100644
index 00000000000..1a070493737
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitor.java
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoSocketException;
+import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.ServerHeartbeatFailedEvent;
+import com.mongodb.event.ServerHeartbeatStartedEvent;
+import com.mongodb.event.ServerHeartbeatSucceededEvent;
+import com.mongodb.event.ServerMonitorListener;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.connection.ServerConnectionState.CONNECTING;
+import static com.mongodb.connection.ServerType.UNKNOWN;
+import static com.mongodb.internal.connection.CommandHelper.executeCommand;
+import static com.mongodb.internal.connection.DescriptionHelper.createServerDescription;
+import static com.mongodb.internal.event.EventListenerHelper.getServerMonitorListener;
+import static java.lang.String.format;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+@ThreadSafe
+class DefaultServerMonitor implements ServerMonitor {
+
+    private static final Logger LOGGER = Loggers.getLogger("cluster");
+
+    private final ServerId serverId;
+    private final ServerMonitorListener serverMonitorListener;
+    private final ClusterClock clusterClock;
+    private final ChangeListener<ServerDescription> serverStateListener;
+    private final InternalConnectionFactory internalConnectionFactory;
+    private final ConnectionPool connectionPool;
+    private final ServerSettings serverSettings;
+    private final ServerMonitorRunnable monitor;
+    private final Thread monitorThread;
+    private final Lock lock = new ReentrantLock();
+    private final Condition condition = lock.newCondition();
+    private volatile boolean isClosed;
+
+    DefaultServerMonitor(final ServerId serverId, final ServerSettings serverSettings,
+                         final ClusterClock clusterClock, final ChangeListener<ServerDescription> serverStateListener,
+                         final InternalConnectionFactory internalConnectionFactory, final ConnectionPool connectionPool) {
+        this.serverSettings = notNull("serverSettings", serverSettings);
+        this.serverId = notNull("serverId", serverId);
+        this.serverMonitorListener = getServerMonitorListener(serverSettings);
+        this.clusterClock = notNull("clusterClock", clusterClock);
+        this.serverStateListener = serverStateListener;
+        this.internalConnectionFactory = notNull("internalConnectionFactory", internalConnectionFactory);
+        this.connectionPool = connectionPool;
+        monitor = new ServerMonitorRunnable();
+        monitorThread = new Thread(monitor, "cluster-" + this.serverId.getClusterId() + "-" + this.serverId.getAddress());
+        monitorThread.setDaemon(true);
+        isClosed = false;
+    }
+
+    @Override
+    public void start() {
+        monitorThread.start();
+    }
+
+    @Override
+    public void connect() {
+        lock.lock();
+        try {
+            condition.signal();
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void close() {
+        isClosed = true;
+        monitorThread.interrupt();
+    }
+
+    class ServerMonitorRunnable implements Runnable {
+        private final ExponentiallyWeightedMovingAverage averageRoundTripTime = new ExponentiallyWeightedMovingAverage(0.2);
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public synchronized void run() {
+            InternalConnection connection = null;
+            try {
+                ServerDescription currentServerDescription = getConnectingServerDescription(null);
+                while (!isClosed) {
+                    ServerDescription previousServerDescription = currentServerDescription;
+                    try {
+                        if (connection == null) {
+                            connection = internalConnectionFactory.create(serverId);
+                            try {
+                                connection.open();
+                            } catch (Throwable t) {
+                                connection = null;
+                                throw t;
+                            }
+                        }
+                        try {
+                            currentServerDescription = lookupServerDescription(connection);
+                        } catch (MongoSocketException e) {
+                            connectionPool.invalidate();
+                            connection.close();
+                            connection = null;
+                            connection = internalConnectionFactory.create(serverId);
+                            try {
+                                connection.open();
+                            } catch (Throwable t) {
+                                connection = null;
+                                throw t;
+                            }
+                            try {
+                                currentServerDescription = lookupServerDescription(connection);
+                            } catch (MongoSocketException e1) {
+                                connection.close();
+                                connection = null;
+                                throw e1;
+                            }
+                        }
+                    } catch (Throwable t) {
+                        averageRoundTripTime.reset();
+                        currentServerDescription = getConnectingServerDescription(t);
+                    }
+
+                    if (!isClosed) {
+                        try {
+                            logStateChange(previousServerDescription, currentServerDescription);
+                            serverStateListener.stateChanged(new ChangeEvent<ServerDescription>(previousServerDescription,
+                                    currentServerDescription));
+                        } catch (Throwable t) {
+                            LOGGER.warn("Exception in monitor thread during notification of server description state change", t);
+                        }
+                        waitForNext();
+                    }
+                }
+            } finally {
+                if (connection != null) {
+                    connection.close();
+                }
+            }
+        }
+
+        private ServerDescription getConnectingServerDescription(final Throwable exception) {
+            return ServerDescription.builder().type(UNKNOWN).state(CONNECTING).address(serverId.getAddress()).exception(exception).build();
+        }
+
+        private ServerDescription lookupServerDescription(final InternalConnection connection) {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(format("Checking status of %s", serverId.getAddress()));
+            }
+            serverMonitorListener.serverHearbeatStarted(new ServerHeartbeatStartedEvent(connection.getDescription().getConnectionId()));
+
+            long start = System.nanoTime();
+            try {
+                BsonDocument isMasterResult =
+                        executeCommand("admin", new BsonDocument("ismaster", new BsonInt32(1)), clusterClock, connection);
+                long elapsedTimeNanos = System.nanoTime() - start;
+                averageRoundTripTime.addSample(elapsedTimeNanos);
+
+                serverMonitorListener.serverHeartbeatSucceeded(
+                        new ServerHeartbeatSucceededEvent(connection.getDescription().getConnectionId(), isMasterResult, elapsedTimeNanos));
+
+                return createServerDescription(serverId.getAddress(), isMasterResult, connection.getDescription().getServerVersion(),
+                                               averageRoundTripTime.getAverage());
+            } catch (RuntimeException e) {
+                serverMonitorListener.serverHeartbeatFailed(
+                        new ServerHeartbeatFailedEvent(connection.getDescription().getConnectionId(), System.nanoTime() - start, e));
+                throw e;
+            }
+        }
+
+        private void logStateChange(final ServerDescription previousServerDescription,
+                                    final ServerDescription currentServerDescription) {
+            if (shouldLogStageChange(previousServerDescription, currentServerDescription)) {
+                if (currentServerDescription.getException() != null) {
+                    LOGGER.info(format("Exception in monitor thread while connecting to server %s", serverId.getAddress()),
+                                currentServerDescription.getException());
+                } else {
+                    LOGGER.info(format("Monitor thread successfully connected to server with description %s", currentServerDescription));
+                }
+            }
+        }
+
+        private void waitForNext() {
+            try {
+                long timeRemaining = waitForSignalOrTimeout();
+                if (timeRemaining > 0) {
+                    long timeWaiting = serverSettings.getHeartbeatFrequency(NANOSECONDS) - timeRemaining;
+                    long minimumNanosToWait = serverSettings.getMinHeartbeatFrequency(NANOSECONDS);
+                    if (timeWaiting < minimumNanosToWait) {
+                        long millisToSleep = MILLISECONDS.convert(minimumNanosToWait - timeWaiting, NANOSECONDS);
+                        if (millisToSleep > 0) {
+                            Thread.sleep(millisToSleep);
+                        }
+                    }
+                }
+            } catch (InterruptedException e) {
+                // fall through
+            }
+        }
+
+        private long waitForSignalOrTimeout() throws InterruptedException {
+            lock.lock();
+            try {
+                return condition.awaitNanos(serverSettings.getHeartbeatFrequency(NANOSECONDS));
+            } finally {
+                lock.unlock();
+            }
+        }
+    }
+
+    static boolean shouldLogStageChange(final ServerDescription previous, final ServerDescription current) {
+
+        if (previous.isOk() != current.isOk()) {
+            return true;
+        }
+        if (!previous.getAddress().equals(current.getAddress())) {
+            return true;
+        }
+        if (previous.getCanonicalAddress() != null
+                    ? !previous.getCanonicalAddress().equals(current.getCanonicalAddress()) : current.getCanonicalAddress() != null) {
+            return true;
+        }
+        if (!previous.getHosts().equals(current.getHosts())) {
+            return true;
+        }
+        if (!previous.getArbiters().equals(current.getArbiters())) {
+            return true;
+        }
+        if (!previous.getPassives().equals(current.getPassives())) {
+            return true;
+        }
+        if (previous.getPrimary() != null ? !previous.getPrimary().equals(current.getPrimary()) : current.getPrimary() != null) {
+            return true;
+        }
+        if (previous.getSetName() != null ? !previous.getSetName().equals(current.getSetName()) : current.getSetName() != null) {
+            return true;
+        }
+        if (previous.getState() != current.getState()) {
+            return true;
+        }
+        if (!previous.getTagSet().equals(current.getTagSet())) {
+            return true;
+        }
+        if (previous.getType() != current.getType()) {
+            return true;
+        }
+        if (!previous.getVersion().equals(current.getVersion())) {
+            return true;
+        }
+        if (previous.getElectionId() != null
+                    ? !previous.getElectionId().equals(current.getElectionId()) : current.getElectionId() != null) {
+            return true;
+        }
+        if (previous.getSetVersion() != null
+                    ? !previous.getSetVersion().equals(current.getSetVersion()) : current.getSetVersion() != null) {
+            return true;
+        }
+
+        // Compare class equality and message as exceptions rarely override equals
+        Class<?> thisExceptionClass = previous.getException() != null ? previous.getException().getClass() : null;
+        Class<?> thatExceptionClass = current.getException() != null ? current.getException().getClass() : null;
+        if (thisExceptionClass != null ? !thisExceptionClass.equals(thatExceptionClass) : thatExceptionClass != null) {
+            return true;
+        }
+
+        String thisExceptionMessage = previous.getException() != null ? previous.getException().getMessage() : null;
+        String thatExceptionMessage = current.getException() != null ? current.getException().getMessage() : null;
+        if (thisExceptionMessage != null ? !thisExceptionMessage.equals(thatExceptionMessage) : thatExceptionMessage != null) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitorFactory.java b/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitorFactory.java
new file mode 100644
index 00000000000..a9e1d197d8b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitorFactory.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerSettings;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class DefaultServerMonitorFactory implements ServerMonitorFactory {
+    private final ServerId serverId;
+    private final ServerSettings settings;
+    private final ClusterClock clusterClock;
+    private final InternalConnectionFactory internalConnectionFactory;
+    private final ConnectionPool connectionPool;
+
+    DefaultServerMonitorFactory(final ServerId serverId, final ServerSettings settings,
+                                final ClusterClock clusterClock, final InternalConnectionFactory internalConnectionFactory,
+                                final ConnectionPool connectionPool) {
+        this.serverId = notNull("serverId", serverId);
+        this.settings = notNull("settings", settings);
+        this.clusterClock = notNull("clusterClock", clusterClock);
+        this.internalConnectionFactory = notNull("internalConnectionFactory", internalConnectionFactory);
+        this.connectionPool = notNull("connectionPool", connectionPool);
+    }
+
+    @Override
+    public ServerMonitor create(final ChangeListener<ServerDescription> serverStateListener) {
+        return new DefaultServerMonitor(serverId, settings, clusterClock, serverStateListener, internalConnectionFactory, connectionPool);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DeleteMessage.java b/driver-core/src/main/com/mongodb/internal/connection/DeleteMessage.java
new file mode 100644
index 00000000000..025e3ee27c4
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DeleteMessage.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import org.bson.io.BsonOutput;
+
+/**
+ * An OP_DELETE message.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-delete OP_DELETE
+ */
+class DeleteMessage extends LegacyMessage {
+    private final DeleteRequest deleteRequest;
+
+    DeleteMessage(final String collectionName, final DeleteRequest deleteRequest, final MessageSettings settings) {
+        super(collectionName, OpCode.OP_DELETE, settings);
+        this.deleteRequest = deleteRequest;
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput) {
+        bsonOutput.writeInt32(0); // reserved
+        bsonOutput.writeCString(getCollectionName());
+
+        if (deleteRequest.isMulti()) {
+            bsonOutput.writeInt32(0);
+        } else {
+            bsonOutput.writeInt32(1);
+        }
+
+        int firstDocumentStartPosition = bsonOutput.getPosition();
+
+        addDocument(deleteRequest.getFilter(), bsonOutput, new NoOpFieldNameValidator());
+        return new EncodingMetadata(firstDocumentStartPosition);
+    }
+}
+
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DeleteProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/DeleteProtocol.java
new file mode 100644
index 00000000000..d854f5c03c7
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DeleteProtocol.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+
+import static com.mongodb.internal.connection.ByteBufBsonDocument.createOne;
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+
+/**
+ * An implementation of the MongoDB OP_DELETE wire protocol.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-delete OP_DELETE
+ */
+class DeleteProtocol extends WriteProtocol {
+    private static final Logger LOGGER = Loggers.getLogger("protocol.delete");
+
+    private final DeleteRequest deleteRequest;
+
+    DeleteProtocol(final MongoNamespace namespace, final boolean ordered, final DeleteRequest deleteRequest) {
+        super(namespace, ordered);
+        this.deleteRequest = deleteRequest;
+    }
+
+    @Override
+    public WriteConcernResult execute(final InternalConnection connection) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug(format("Deleting documents from namespace %s on connection [%s] to server %s", getNamespace(),
+                                connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
+        }
+        WriteConcernResult writeConcernResult = super.execute(connection);
+        LOGGER.debug("Delete completed");
+        return writeConcernResult;
+    }
+
+    @Override
+    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
+        try {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(format("Asynchronously deleting documents in namespace %s on connection [%s] to server %s", getNamespace(),
+                                    connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
+            }
+            super.executeAsync(connection, new SingleResultCallback<WriteConcernResult>() {
+                @Override
+                public void onResult(final WriteConcernResult result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        LOGGER.debug("Asynchronous delete completed");
+                        callback.onResult(result, null);
+                    }
+                }
+            });
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+        }
+    }
+
+    @Override
+    protected BsonDocument getAsWriteCommand(final ByteBufferBsonOutput bsonOutput, final int firstDocumentPosition) {
+        BsonDocument deleteDocument = new BsonDocument("q", createOne(bsonOutput, firstDocumentPosition))
+                                      .append("limit", deleteRequest.isMulti() ? new BsonInt32(0) : new BsonInt32(1));
+        return getBaseCommandDocument("delete").append("deletes", new BsonArray(singletonList(deleteDocument)));
+    }
+
+    @Override
+    protected RequestMessage createRequestMessage(final MessageSettings settings) {
+        return new DeleteMessage(getNamespace().getFullName(), deleteRequest, settings);
+    }
+
+    @Override
+    protected Logger getLogger() {
+        return LOGGER;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DescriptionHelper.java b/driver-core/src/main/com/mongodb/internal/connection/DescriptionHelper.java
new file mode 100644
index 00000000000..ab03fa58163
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DescriptionHelper.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.Tag;
+import com.mongodb.TagSet;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerType;
+import com.mongodb.connection.ServerVersion;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.types.ObjectId;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize;
+import static com.mongodb.connection.ConnectionDescription.getDefaultMaxWriteBatchSize;
+import static com.mongodb.connection.ServerConnectionState.CONNECTED;
+import static com.mongodb.connection.ServerDescription.getDefaultMaxDocumentSize;
+import static com.mongodb.connection.ServerDescription.getDefaultMaxWireVersion;
+import static com.mongodb.connection.ServerDescription.getDefaultMinWireVersion;
+import static com.mongodb.connection.ServerType.REPLICA_SET_ARBITER;
+import static com.mongodb.connection.ServerType.REPLICA_SET_OTHER;
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY;
+import static com.mongodb.connection.ServerType.REPLICA_SET_SECONDARY;
+import static com.mongodb.connection.ServerType.SHARD_ROUTER;
+import static com.mongodb.connection.ServerType.STANDALONE;
+import static com.mongodb.connection.ServerType.UNKNOWN;
+import static java.util.Arrays.asList;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+public final class DescriptionHelper {
+
+    static ConnectionDescription createConnectionDescription(final ConnectionId connectionId,
+                                                             final BsonDocument isMasterResult,
+                                                             final BsonDocument buildInfoResult) {
+        ConnectionDescription connectionDescription = new ConnectionDescription(connectionId, getVersion(buildInfoResult),
+                getMaxWireVersion(isMasterResult), getServerType(isMasterResult), getMaxWriteBatchSize(isMasterResult),
+                getMaxBsonObjectSize(isMasterResult), getMaxMessageSizeBytes(isMasterResult), getCompressors(isMasterResult));
+        if (isMasterResult.containsKey("connectionId")) {
+            ConnectionId newConnectionId =
+                    connectionDescription.getConnectionId().withServerValue(isMasterResult.getNumber("connectionId").intValue());
+            connectionDescription = connectionDescription.withConnectionId(newConnectionId);
+        }
+        return connectionDescription;
+    }
+
+    public static ServerDescription createServerDescription(final ServerAddress serverAddress, final BsonDocument isMasterResult,
+                                                            final ServerVersion serverVersion, final long roundTripTime) {
+        return ServerDescription.builder()
+                                .state(CONNECTED)
+                                .version(serverVersion)
+                                .address(serverAddress)
+                                .type(getServerType(isMasterResult))
+                                .canonicalAddress(isMasterResult.containsKey("me") ? isMasterResult.getString("me").getValue() : null)
+                                .hosts(listToSet(isMasterResult.getArray("hosts", new BsonArray())))
+                                .passives(listToSet(isMasterResult.getArray("passives", new BsonArray())))
+                                .arbiters(listToSet(isMasterResult.getArray("arbiters", new BsonArray())))
+                                .primary(getString(isMasterResult, "primary"))
+                                .maxDocumentSize(getMaxBsonObjectSize(isMasterResult))
+                                .tagSet(getTagSetFromDocument(isMasterResult.getDocument("tags", new BsonDocument())))
+                                .setName(getString(isMasterResult, "setName"))
+                                .minWireVersion(getMinWireVersion(isMasterResult))
+                                .maxWireVersion(getMaxWireVersion(isMasterResult))
+                                .electionId(getElectionId(isMasterResult))
+                                .setVersion(getSetVersion(isMasterResult))
+                                .lastWriteDate(getLastWriteDate(isMasterResult))
+                                .roundTripTime(roundTripTime, NANOSECONDS)
+                                .logicalSessionTimeoutMinutes(getLogicalSessionTimeoutMinutes(isMasterResult))
+                                .ok(CommandHelper.isCommandOk(isMasterResult)).build();
+    }
+
+    private static int getMinWireVersion(final BsonDocument isMasterResult) {
+        return isMasterResult.getInt32("minWireVersion", new BsonInt32(getDefaultMinWireVersion())).getValue();
+    }
+
+    private static int getMaxWireVersion(final BsonDocument isMasterResult) {
+        return isMasterResult.getInt32("maxWireVersion", new BsonInt32(getDefaultMaxWireVersion())).getValue();
+    }
+
+    private static Date getLastWriteDate(final BsonDocument isMasterResult) {
+        if (!isMasterResult.containsKey("lastWrite")) {
+            return null;
+        }
+        return new Date(isMasterResult.getDocument("lastWrite").getDateTime("lastWriteDate").getValue());
+    }
+
+    private static ObjectId getElectionId(final BsonDocument isMasterResult) {
+        return isMasterResult.containsKey("electionId") ? isMasterResult.getObjectId("electionId").getValue() : null;
+    }
+
+    private static Integer getSetVersion(final BsonDocument isMasterResult) {
+        return isMasterResult.containsKey("setVersion") ? isMasterResult.getNumber("setVersion").intValue() : null;
+    }
+
+    private static int getMaxMessageSizeBytes(final BsonDocument isMasterResult) {
+        return isMasterResult.getInt32("maxMessageSizeBytes", new BsonInt32(getDefaultMaxMessageSize())).getValue();
+    }
+
+    private static int getMaxBsonObjectSize(final BsonDocument isMasterResult) {
+        return isMasterResult.getInt32("maxBsonObjectSize", new BsonInt32(getDefaultMaxDocumentSize())).getValue();
+    }
+
+    private static int getMaxWriteBatchSize(final BsonDocument isMasterResult) {
+        return isMasterResult.getInt32("maxWriteBatchSize", new BsonInt32(getDefaultMaxWriteBatchSize())).getValue();
+    }
+
+    private static Integer getLogicalSessionTimeoutMinutes(final BsonDocument isMasterResult) {
+        return isMasterResult.isNumber("logicalSessionTimeoutMinutes")
+                       ? isMasterResult.getNumber("logicalSessionTimeoutMinutes").intValue() : null;
+    }
+
+    private static String getString(final BsonDocument response, final String key) {
+        if (response.containsKey(key)) {
+            return response.getString(key).getValue();
+        } else {
+            return null;
+        }
+    }
+
+    static ServerVersion getVersion(final BsonDocument buildInfoResult) {
+        List<BsonValue> versionArray = buildInfoResult.getArray("versionArray").subList(0, 3);
+
+        return new ServerVersion(asList(versionArray.get(0).asInt32().getValue(),
+                                        versionArray.get(1).asInt32().getValue(),
+                                        versionArray.get(2).asInt32().getValue()));
+    }
+
+    private static Set<String> listToSet(final BsonArray array) {
+        if (array == null || array.isEmpty()) {
+            return Collections.emptySet();
+        } else {
+            Set<String> set = new HashSet<String>();
+            for (BsonValue value : array) {
+                set.add(value.asString().getValue());
+            }
+            return set;
+        }
+    }
+
+    private static ServerType getServerType(final BsonDocument isMasterResult) {
+
+        if (!CommandHelper.isCommandOk(isMasterResult)) {
+            return UNKNOWN;
+        }
+
+        if (isReplicaSetMember(isMasterResult)) {
+
+            if (isMasterResult.getBoolean("hidden", BsonBoolean.FALSE).getValue()) {
+                return REPLICA_SET_OTHER;
+            }
+
+            if (isMasterResult.getBoolean("ismaster", BsonBoolean.FALSE).getValue()) {
+                return REPLICA_SET_PRIMARY;
+            }
+
+            if (isMasterResult.getBoolean("secondary", BsonBoolean.FALSE).getValue()) {
+                return REPLICA_SET_SECONDARY;
+            }
+
+            if (isMasterResult.getBoolean("arbiterOnly", BsonBoolean.FALSE).getValue()) {
+                return REPLICA_SET_ARBITER;
+            }
+
+            if (isMasterResult.containsKey("setName") && isMasterResult.containsKey("hosts")) {
+                return ServerType.REPLICA_SET_OTHER;
+            }
+
+            return ServerType.REPLICA_SET_GHOST;
+        }
+
+        if (isMasterResult.containsKey("msg") && isMasterResult.get("msg").equals(new BsonString("isdbgrid"))) {
+            return SHARD_ROUTER;
+        }
+
+        return STANDALONE;
+    }
+
+    private static boolean isReplicaSetMember(final BsonDocument isMasterResult) {
+        return isMasterResult.containsKey("setName") || isMasterResult.getBoolean("isreplicaset", BsonBoolean.FALSE).getValue();
+    }
+
+    private static TagSet getTagSetFromDocument(final BsonDocument tagsDocuments) {
+        List<Tag> tagList = new ArrayList<Tag>();
+        for (final Map.Entry<String, BsonValue> curEntry : tagsDocuments.entrySet()) {
+            tagList.add(new Tag(curEntry.getKey(), curEntry.getValue().asString().getValue()));
+        }
+        return new TagSet(tagList);
+    }
+
+    private static List<String> getCompressors(final BsonDocument isMasterResult) {
+        List<String> compressorList = new ArrayList<String>();
+        for (BsonValue compressor : isMasterResult.getArray("compression", new BsonArray())) {
+            compressorList.add(compressor.asString().getValue());
+        }
+        return compressorList;
+    }
+
+    private DescriptionHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DnsMultiServerCluster.java b/driver-core/src/main/com/mongodb/internal/connection/DnsMultiServerCluster.java
new file mode 100644
index 00000000000..9a7d3ef896a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DnsMultiServerCluster.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ClusterType;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+public final class DnsMultiServerCluster extends AbstractMultiServerCluster {
+    private final DnsSrvRecordMonitor dnsSrvRecordMonitor;
+    private volatile MongoException srvResolutionException;
+
+
+    public DnsMultiServerCluster(final ClusterId clusterId, final ClusterSettings settings, final ClusterableServerFactory serverFactory,
+                                 final DnsSrvRecordMonitorFactory dnsSrvRecordMonitorFactory) {
+        super(clusterId, settings, serverFactory);
+        notNull("srvHost", settings.getSrvHost());
+        dnsSrvRecordMonitor = dnsSrvRecordMonitorFactory.create(settings.getSrvHost(), new DnsSrvRecordInitializer() {
+            private volatile boolean initialized;
+
+            @Override
+            public void initialize(final Collection<ServerAddress> hosts) {
+                srvResolutionException = null;
+                if (!initialized) {
+                    initialized = true;
+                    DnsMultiServerCluster.this.initialize(hosts);
+                } else {
+                    DnsMultiServerCluster.this.onChange(hosts);
+                }
+            }
+
+            @Override
+            public void initialize(final MongoException initializationException) {
+                if (!initialized) {
+                    srvResolutionException = initializationException;
+                    DnsMultiServerCluster.this.initialize(Collections.<ServerAddress>emptyList());
+                }
+            }
+
+            @Override
+            public ClusterType getClusterType() {
+                return DnsMultiServerCluster.this.getClusterType();
+            }
+        });
+        dnsSrvRecordMonitor.start();
+    }
+
+    @Override
+    protected MongoException getSrvResolutionException() {
+        return srvResolutionException;
+    }
+
+    @Override
+    public void close() {
+        if (dnsSrvRecordMonitor != null) {
+            dnsSrvRecordMonitor.close();
+        }
+        super.close();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordInitializer.java b/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordInitializer.java
new file mode 100644
index 00000000000..deadf53aba0
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordInitializer.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterType;
+
+import java.util.Collection;
+
+interface DnsSrvRecordInitializer {
+    void initialize(Collection<ServerAddress> hosts);
+
+    void initialize(MongoException initializationException);
+
+    ClusterType getClusterType();
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordMonitor.java b/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordMonitor.java
new file mode 100644
index 00000000000..b20d9599e0c
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordMonitor.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+// Not for public use.
+public interface DnsSrvRecordMonitor {
+    void start();
+
+    void close();
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordMonitorFactory.java b/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordMonitorFactory.java
new file mode 100644
index 00000000000..466237b0987
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/DnsSrvRecordMonitorFactory.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+public interface DnsSrvRecordMonitorFactory {
+    DnsSrvRecordMonitor create(String hostName, DnsSrvRecordInitializer dnsSrvRecordInitializer);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ElementExtendingBsonWriter.java b/driver-core/src/main/com/mongodb/internal/connection/ElementExtendingBsonWriter.java
new file mode 100644
index 00000000000..a3eedad361a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ElementExtendingBsonWriter.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonElement;
+import org.bson.BsonReader;
+
+import java.util.List;
+
+import static com.mongodb.internal.connection.BsonWriterHelper.writeElements;
+
+public class ElementExtendingBsonWriter extends LevelCountingBsonWriter {
+    private final List<BsonElement> extraElements;
+
+    public ElementExtendingBsonWriter(final BsonBinaryWriter writer, final List<BsonElement> extraElements) {
+        super(writer);
+        this.extraElements = extraElements;
+    }
+
+    @Override
+    public void writeEndDocument() {
+        if (getCurrentLevel() == 0) {
+            writeElements(getBsonBinaryWriter(), extraElements);
+        }
+        super.writeEndDocument();
+    }
+
+    @Override
+    public void pipe(final BsonReader reader) {
+        if (getCurrentLevel() == -1) {
+            getBsonBinaryWriter().pipe(reader, extraElements);
+        } else {
+            getBsonBinaryWriter().pipe(reader);
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/ExponentiallyWeightedMovingAverage.java b/driver-core/src/main/com/mongodb/internal/connection/ExponentiallyWeightedMovingAverage.java
similarity index 94%
rename from driver-core/src/main/com/mongodb/connection/ExponentiallyWeightedMovingAverage.java
rename to driver-core/src/main/com/mongodb/internal/connection/ExponentiallyWeightedMovingAverage.java
index 7fd4707981f..03e65b10705 100644
--- a/driver-core/src/main/com/mongodb/connection/ExponentiallyWeightedMovingAverage.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ExponentiallyWeightedMovingAverage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.annotations.NotThreadSafe;
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ExtendedAsynchronousByteChannel.java b/driver-core/src/main/com/mongodb/internal/connection/ExtendedAsynchronousByteChannel.java
new file mode 100644
index 00000000000..2ce07172c22
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ExtendedAsynchronousByteChannel.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection;
+
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousByteChannel;
+import java.nio.channels.CompletionHandler;
+import java.nio.channels.ReadPendingException;
+import java.nio.channels.ShutdownChannelGroupException;
+import java.nio.channels.WritePendingException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This interface extends {@link AsynchronousByteChannel} adding optional timeouts and scattering and gathering methods.
+ * These additions are analogous to the ones made by {@link java.nio.channels.AsynchronousSocketChannel}.
+ */
+public interface ExtendedAsynchronousByteChannel extends AsynchronousByteChannel {
+
+    /**
+     * Reads a sequence of bytes from this channel into the given buffer.
+     *
+     * <p> This method initiates an asynchronous read operation to read a
+     * sequence of bytes from this channel into the given buffer. The {@code
+     * handler} parameter is a completion handler that is invoked when the read
+     * operation completes (or fails). The result passed to the completion
+     * handler is the number of bytes read or {@code -1} if no bytes could be
+     * read because the channel has reached end-of-stream.
+     *
+     * <p> If a timeout is specified and the timeout elapses before the operation
+     * completes then the operation completes with the exception {@link
+     * java.nio.channels.InterruptedByTimeoutException}. Where a timeout occurs, and the
+     * implementation cannot guarantee that bytes have not been read, or will not
+     * be read from the channel into the given buffer, then further attempts to
+     * read from the channel will cause an unspecific runtime exception to be
+     * thrown.
+     *
+     * <p> Otherwise this method works in the same manner as the {@link
+     * AsynchronousByteChannel#read(ByteBuffer, Object, CompletionHandler)}
+     * method.
+     *
+     * @param dst     The buffer into which bytes are to be transferred
+     * @param timeout The maximum time for the I/O operation to complete
+     * @param unit    The time unit of the {@code timeout} argument
+     * @param attach  The object to attach to the I/O operation; can be {@code null}
+     * @param handler The handler for consuming the result
+     * @throws IllegalArgumentException      If the buffer is read-only
+     * @throws ReadPendingException          If a read operation is already in progress on this channel
+     * @throws ShutdownChannelGroupException If the channel group has terminated
+     */
+    <A> void read(
+            ByteBuffer dst,
+            long timeout, TimeUnit unit,
+            A attach, CompletionHandler<Integer, ? super A> handler);
+
+    /**
+     * Reads a sequence of bytes from this channel into a subsequence of the
+     * given buffers. This operation, sometimes called a <em>scattering read</em>,
+     * is often useful when implementing network protocols that group data into
+     * segments consisting of one or more fixed-length headers followed by a
+     * variable-length body. The {@code handler} parameter is a completion
+     * handler that is invoked when the read operation completes (or fails). The
+     * result passed to the completion handler is the number of bytes read or
+     * {@code -1} if no bytes could be read because the channel has reached
+     * end-of-stream.
+     *
+     * <p> This method initiates a read of up to <i>r</i> bytes from this channel,
+     * where <i>r</i> is the total number of bytes remaining in the specified
+     * subsequence of the given buffer array, that is,
+     *
+     * <blockquote><pre>
+     * dsts[offset].remaining()
+     *     + dsts[offset+1].remaining()
+     *     + ... + dsts[offset+length-1].remaining()</pre></blockquote>
+     * <p>
+     * at the moment that the read is attempted.
+     *
+     * <p> Suppose that a byte sequence of length <i>n</i> is read, where
+     * <tt>0</tt>&nbsp;<tt>&lt;</tt>&nbsp;<i>n</i>&nbsp;<tt>&lt;=</tt>&nbsp;<i>r</i>.
+     * Up to the first <tt>dsts[offset].remaining()</tt> bytes of this sequence
+     * are transferred into buffer <tt>dsts[offset]</tt>, up to the next
+     * <tt>dsts[offset+1].remaining()</tt> bytes are transferred into buffer
+     * <tt>dsts[offset+1]</tt>, and so forth, until the entire byte sequence
+     * is transferred into the given buffers.  As many bytes as possible are
+     * transferred into each buffer, hence the final position of each updated
+     * buffer, except the last updated buffer, is guaranteed to be equal to
+     * that buffer's limit. The underlying operating system may impose a limit
+     * on the number of buffers that may be used in an I/O operation. Where the
+     * number of buffers (with bytes remaining), exceeds this limit, then the
+     * I/O operation is performed with the maximum number of buffers allowed by
+     * the operating system.
+     *
+     * <p> If a timeout is specified and the timeout elapses before the operation
+     * completes then it completes with the exception {@link
+     * java.nio.channels.InterruptedByTimeoutException}. Where a timeout occurs, and the
+     * implementation cannot guarantee that bytes have not been read, or will not
+     * be read from the channel into the given buffers, then further attempts to
+     * read from the channel will cause an unspecific runtime exception to be
+     * thrown.
+     *
+     * @param dsts    The buffers into which bytes are to be transferred
+     * @param offset  The offset within the buffer array of the first buffer into which
+     *                bytes are to be transferred; must be non-negative and no larger than
+     *                {@code dsts.length}
+     * @param length  The maximum number of buffers to be accessed; must be non-negative
+     *                and no larger than {@code dsts.length - offset}
+     * @param timeout The maximum time for the I/O operation to complete
+     * @param unit    The time unit of the {@code timeout} argument
+     * @param attach  The object to attach to the I/O operation; can be {@code null}
+     * @param handler The handler for consuming the result
+     * @throws IndexOutOfBoundsException     If the pre-conditions for the {@code offset}  and {@code length}
+     *                                       parameter aren't met
+     * @throws IllegalArgumentException      If the buffer is read-only
+     * @throws ReadPendingException          If a read operation is already in progress on this channel
+     * @throws ShutdownChannelGroupException If the channel group has terminated
+     */
+    <A> void read(
+            ByteBuffer[] dsts, int offset, int length,
+            long timeout, TimeUnit unit,
+            A attach, CompletionHandler<Long, ? super A> handler);
+
+    /**
+     * Writes a sequence of bytes to this channel from the given buffer.
+     *
+     * <p> This method initiates an asynchronous write operation to write a
+     * sequence of bytes to this channel from the given buffer. The {@code
+     * handler} parameter is a completion handler that is invoked when the write
+     * operation completes (or fails). The result passed to the completion
+     * handler is the number of bytes written.
+     *
+     * <p> If a timeout is specified and the timeout elapses before the operation
+     * completes then it completes with the exception {@link
+     * java.nio.channels.InterruptedByTimeoutException}. Where a timeout occurs, and the
+     * implementation cannot guarantee that bytes have not been written, or will
+     * not be written to the channel from the given buffer, then further attempts
+     * to write to the channel will cause an unspecific runtime exception to be
+     * thrown.
+     *
+     * <p> Otherwise this method works in the same manner as the {@link
+     * AsynchronousByteChannel#write(ByteBuffer, Object, CompletionHandler)}
+     * method.
+     *
+     * @param src     The buffer from which bytes are to be retrieved
+     * @param timeout The maximum time for the I/O operation to complete
+     * @param unit    The time unit of the {@code timeout} argument
+     * @param attach  The object to attach to the I/O operation; can be {@code null}
+     * @param handler The handler for consuming the result
+     * @throws WritePendingException         If a write operation is already in progress on this channel
+     * @throws ShutdownChannelGroupException If the channel group has terminated
+     */
+    <A> void write(
+            ByteBuffer src,
+            long timeout, TimeUnit unit,
+            A attach, CompletionHandler<Integer, ? super A> handler);
+
+    /**
+     * Writes a sequence of bytes to this channel from a subsequence of the given
+     * buffers. This operation, sometimes called a <em>gathering write</em>, is
+     * often useful when implementing network protocols that group data into
+     * segments consisting of one or more fixed-length headers followed by a
+     * variable-length body. The {@code handler} parameter is a completion
+     * handler that is invoked when the write operation completes (or fails).
+     * The result passed to the completion handler is the number of bytes written.
+     *
+     * <p> This method initiates a write of up to <i>r</i> bytes to this channel,
+     * where <i>r</i> is the total number of bytes remaining in the specified
+     * subsequence of the given buffer array, that is,
+     *
+     * <blockquote><pre>
+     * srcs[offset].remaining()
+     *     + srcs[offset+1].remaining()
+     *     + ... + srcs[offset+length-1].remaining()</pre></blockquote>
+     * <p>
+     * at the moment that the write is attempted.
+     *
+     * <p> Suppose that a byte sequence of length <i>n</i> is written, where
+     * <tt>0</tt>&nbsp;<tt>&lt;</tt>&nbsp;<i>n</i>&nbsp;<tt>&lt;=</tt>&nbsp;<i>r</i>.
+     * Up to the first <tt>srcs[offset].remaining()</tt> bytes of this sequence
+     * are written from buffer <tt>srcs[offset]</tt>, up to the next
+     * <tt>srcs[offset+1].remaining()</tt> bytes are written from buffer
+     * <tt>srcs[offset+1]</tt>, and so forth, until the entire byte sequence is
+     * written.  As many bytes as possible are written from each buffer, hence
+     * the final position of each updated buffer, except the last updated
+     * buffer, is guaranteed to be equal to that buffer's limit. The underlying
+     * operating system may impose a limit on the number of buffers that may be
+     * used in an I/O operation. Where the number of buffers (with bytes
+     * remaining), exceeds this limit, then the I/O operation is performed with
+     * the maximum number of buffers allowed by the operating system.
+     *
+     * <p> If a timeout is specified and the timeout elapses before the operation
+     * completes then it completes with the exception {@link
+     * java.nio.channels.InterruptedByTimeoutException}. Where a timeout occurs, and the
+     * implementation cannot guarantee that bytes have not been written, or will
+     * not be written to the channel from the given buffers, then further attempts
+     * to write to the channel will cause an unspecific runtime exception to be
+     * thrown.
+     *
+     * @param srcs    The buffers from which bytes are to be retrieved
+     * @param offset  The offset within the buffer array of the first buffer from which
+     *                bytes are to be retrieved; must be non-negative and no larger
+     *                than {@code srcs.length}
+     * @param length  The maximum number of buffers to be accessed; must be non-negative
+     *                and no larger than {@code srcs.length - offset}
+     * @param timeout The maximum time for the I/O operation to complete
+     * @param unit    The time unit of the {@code timeout} argument
+     * @param attach  The object to attach to the I/O operation; can be {@code null}
+     * @param handler The handler for consuming the result
+     * @throws IndexOutOfBoundsException     If the pre-conditions for the {@code offset}  and {@code length}
+     *                                       parameter aren't met
+     * @throws WritePendingException         If a write operation is already in progress on this channel
+     * @throws ShutdownChannelGroupException If the channel group has terminated
+     */
+    <A> void write(
+            ByteBuffer[] srcs, int offset, int length,
+            long timeout, TimeUnit unit,
+            A attach, CompletionHandler<Long, ? super A> handler);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/FieldTrackingBsonWriter.java b/driver-core/src/main/com/mongodb/internal/connection/FieldTrackingBsonWriter.java
new file mode 100644
index 00000000000..ceddef9b7b0
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/FieldTrackingBsonWriter.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.BsonBinary;
+import org.bson.BsonDbPointer;
+import org.bson.BsonReader;
+import org.bson.BsonRegularExpression;
+import org.bson.BsonTimestamp;
+import org.bson.BsonWriter;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+
+// Helper class to help determine when an update document contains any fields
+// It's an imperfect check because we can't tell if the pipe method ended up writing any fields.
+// For the purposes of the check, it's better to assume that pipe does end up writing a field, in order to avoid
+// incorrectly reporting an error any time pipe is used
+public class FieldTrackingBsonWriter extends BsonWriterDecorator {
+
+    private boolean hasWrittenField;
+    private boolean topLevelDocumentWritten;
+
+    public FieldTrackingBsonWriter(final BsonWriter bsonWriter) {
+        super(bsonWriter);
+    }
+
+    public boolean hasWrittenField() {
+        return hasWrittenField;
+    }
+
+    @Override
+    public void writeStartDocument(final String name) {
+        if (topLevelDocumentWritten) {
+            hasWrittenField = true;
+        }
+        super.writeStartDocument(name);
+    }
+
+    @Override
+    public void writeStartDocument() {
+        if (topLevelDocumentWritten) {
+            hasWrittenField = true;
+        }
+        topLevelDocumentWritten = true;
+        super.writeStartDocument();
+    }
+
+    @Override
+    public void writeStartArray(final String name) {
+        hasWrittenField = true;
+        super.writeStartArray(name);
+    }
+
+    @Override
+    public void writeStartArray() {
+        hasWrittenField = true;
+        super.writeStartArray();
+    }
+
+    @Override
+    public void writeBinaryData(final String name, final BsonBinary binary) {
+        hasWrittenField = true;
+        super.writeBinaryData(name, binary);
+    }
+
+    @Override
+    public void writeBinaryData(final BsonBinary binary) {
+        hasWrittenField = true;
+        super.writeBinaryData(binary);
+    }
+
+    @Override
+    public void writeBoolean(final String name, final boolean value) {
+        hasWrittenField = true;
+        super.writeBoolean(name, value);
+    }
+
+    @Override
+    public void writeBoolean(final boolean value) {
+        hasWrittenField = true;
+        super.writeBoolean(value);
+    }
+
+    @Override
+    public void writeDateTime(final String name, final long value) {
+        hasWrittenField = true;
+        super.writeDateTime(name, value);
+    }
+
+    @Override
+    public void writeDateTime(final long value) {
+        hasWrittenField = true;
+        super.writeDateTime(value);
+    }
+
+    @Override
+    public void writeDBPointer(final String name, final BsonDbPointer value) {
+        hasWrittenField = true;
+        super.writeDBPointer(name, value);
+    }
+
+    @Override
+    public void writeDBPointer(final BsonDbPointer value) {
+        hasWrittenField = true;
+        super.writeDBPointer(value);
+    }
+
+    @Override
+    public void writeDouble(final String name, final double value) {
+        hasWrittenField = true;
+        super.writeDouble(name, value);
+    }
+
+    @Override
+    public void writeDouble(final double value) {
+        hasWrittenField = true;
+        super.writeDouble(value);
+    }
+
+    @Override
+    public void writeInt32(final String name, final int value) {
+        hasWrittenField = true;
+        super.writeInt32(name, value);
+    }
+
+    @Override
+    public void writeInt32(final int value) {
+        hasWrittenField = true;
+        super.writeInt32(value);
+    }
+
+    @Override
+    public void writeInt64(final String name, final long value) {
+        super.writeInt64(name, value);
+        hasWrittenField = true;
+    }
+
+    @Override
+    public void writeInt64(final long value) {
+        hasWrittenField = true;
+        super.writeInt64(value);
+    }
+
+    @Override
+    public void writeDecimal128(final Decimal128 value) {
+        hasWrittenField = true;
+        super.writeDecimal128(value);
+    }
+
+    @Override
+    public void writeDecimal128(final String name, final Decimal128 value) {
+        hasWrittenField = true;
+        super.writeDecimal128(name, value);
+    }
+
+    @Override
+    public void writeJavaScript(final String name, final String code) {
+        hasWrittenField = true;
+        super.writeJavaScript(name, code);
+    }
+
+    @Override
+    public void writeJavaScript(final String code) {
+        hasWrittenField = true;
+        super.writeJavaScript(code);
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(final String name, final String code) {
+        super.writeJavaScriptWithScope(name, code);
+        hasWrittenField = true;
+    }
+
+    @Override
+    public void writeJavaScriptWithScope(final String code) {
+        hasWrittenField = true;
+        super.writeJavaScriptWithScope(code);
+    }
+
+    @Override
+    public void writeMaxKey(final String name) {
+        hasWrittenField = true;
+        super.writeMaxKey(name);
+    }
+
+    @Override
+    public void writeMaxKey() {
+        hasWrittenField = true;
+        super.writeMaxKey();
+    }
+
+    @Override
+    public void writeMinKey(final String name) {
+        hasWrittenField = true;
+        super.writeMinKey(name);
+    }
+
+    @Override
+    public void writeMinKey() {
+        hasWrittenField = true;
+        super.writeMinKey();
+    }
+
+    @Override
+    public void writeNull(final String name) {
+        hasWrittenField = true;
+        super.writeNull(name);
+    }
+
+    @Override
+    public void writeNull() {
+        hasWrittenField = true;
+        super.writeNull();
+    }
+
+    @Override
+    public void writeObjectId(final String name, final ObjectId objectId) {
+        hasWrittenField = true;
+        super.writeObjectId(name, objectId);
+    }
+
+    @Override
+    public void writeObjectId(final ObjectId objectId) {
+        hasWrittenField = true;
+        super.writeObjectId(objectId);
+    }
+
+    @Override
+    public void writeRegularExpression(final String name, final BsonRegularExpression regularExpression) {
+        hasWrittenField = true;
+        super.writeRegularExpression(name, regularExpression);
+    }
+
+    @Override
+    public void writeRegularExpression(final BsonRegularExpression regularExpression) {
+        hasWrittenField = true;
+        super.writeRegularExpression(regularExpression);
+    }
+
+    @Override
+    public void writeString(final String name, final String value) {
+        hasWrittenField = true;
+        super.writeString(name, value);
+    }
+
+    @Override
+    public void writeString(final String value) {
+        hasWrittenField = true;
+        super.writeString(value);
+    }
+
+    @Override
+    public void writeSymbol(final String name, final String value) {
+        hasWrittenField = true;
+        super.writeSymbol(name, value);
+    }
+
+    @Override
+    public void writeSymbol(final String value) {
+        hasWrittenField = true;
+        super.writeSymbol(value);
+    }
+
+    @Override
+    public void writeTimestamp(final String name, final BsonTimestamp value) {
+        hasWrittenField = true;
+        super.writeTimestamp(name, value);
+    }
+
+    @Override
+    public void writeTimestamp(final BsonTimestamp value) {
+        hasWrittenField = true;
+        super.writeTimestamp(value);
+    }
+
+    @Override
+    public void writeUndefined(final String name) {
+        hasWrittenField = true;
+        super.writeUndefined(name);
+    }
+
+    @Override
+    public void writeUndefined() {
+        hasWrittenField = true;
+        super.writeUndefined();
+    }
+
+    @Override
+    public void pipe(final BsonReader reader) {
+        // this is a faulty assumption, as we may end up piping an empty document.  But if we don't increment here, we may undercount,
+        // which in this context is worse since we'll thrown an exception when we should not.
+        hasWrittenField = true;
+        super.pipe(reader);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/FutureAsyncCompletionHandler.java b/driver-core/src/main/com/mongodb/internal/connection/FutureAsyncCompletionHandler.java
similarity index 91%
rename from driver-core/src/main/com/mongodb/connection/FutureAsyncCompletionHandler.java
rename to driver-core/src/main/com/mongodb/internal/connection/FutureAsyncCompletionHandler.java
index 71b531ee279..a6faafafa34 100644
--- a/driver-core/src/main/com/mongodb/connection/FutureAsyncCompletionHandler.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/FutureAsyncCompletionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoException;
 import com.mongodb.MongoInternalException;
 import com.mongodb.MongoInterruptedException;
+import com.mongodb.connection.AsyncCompletionHandler;
 
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 
 class FutureAsyncCompletionHandler<T> implements AsyncCompletionHandler<T> {
-    private final CountDownLatch latch = new CountDownLatch(1);;
+    private final CountDownLatch latch = new CountDownLatch(1);
     private volatile T result;
     private volatile Throwable error;
 
diff --git a/driver-core/src/main/com/mongodb/connection/GSSAPIAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/GSSAPIAuthenticator.java
similarity index 81%
rename from driver-core/src/main/com/mongodb/connection/GSSAPIAuthenticator.java
rename to driver-core/src/main/com/mongodb/internal/connection/GSSAPIAuthenticator.java
index 057473febb4..0fcd9059b7b 100644
--- a/driver-core/src/main/com/mongodb/connection/GSSAPIAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/GSSAPIAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoException;
@@ -42,14 +42,14 @@
 class GSSAPIAuthenticator extends SaslAuthenticator {
     private static final String GSSAPI_MECHANISM_NAME = "GSSAPI";
     private static final String GSSAPI_OID = "1.2.840.113554.1.2.2";
-    public static final String SERVICE_NAME_DEFAULT_VALUE = "mongodb";
-    public static final Boolean CANONICALIZE_HOST_NAME_DEFAULT_VALUE = false;
+    private static final String SERVICE_NAME_DEFAULT_VALUE = "mongodb";
+    private static final Boolean CANONICALIZE_HOST_NAME_DEFAULT_VALUE = false;
 
-    GSSAPIAuthenticator(final MongoCredential credential) {
+    GSSAPIAuthenticator(final MongoCredentialWithCache credential) {
         super(credential);
 
-        if (getCredential().getAuthenticationMechanism() != GSSAPI) {
-            throw new MongoException("Incorrect mechanism: " + this.getCredential().getMechanism());
+        if (getMongoCredential().getAuthenticationMechanism() != GSSAPI) {
+            throw new MongoException("Incorrect mechanism: " + getMongoCredential().getMechanism());
         }
     }
 
@@ -60,11 +60,12 @@ public String getMechanismName() {
 
     @Override
     protected SaslClient createSaslClient(final ServerAddress serverAddress) {
-        MongoCredential credential = getCredential();
+        MongoCredential credential = getMongoCredential();
         try {
-            Map<String, Object> saslClientProperties = getCredential().getMechanismProperty(JAVA_SASL_CLIENT_PROPERTIES_KEY, null);
+            Map<String, Object> saslClientProperties = credential.getMechanismProperty(JAVA_SASL_CLIENT_PROPERTIES_KEY, null);
             if (saslClientProperties == null) {
                 saslClientProperties = new HashMap<String, Object>();
+                saslClientProperties.put(Sasl.MAX_BUFFER, "0");
                 saslClientProperties.put(Sasl.CREDENTIALS, getGSSCredential(credential.getUserName()));
             }
 
@@ -93,7 +94,7 @@ private GSSCredential getGSSCredential(final String userName) throws GSSExceptio
     }
 
     private String getHostName(final ServerAddress serverAddress) throws UnknownHostException {
-        return getCredential().getMechanismProperty(CANONICALIZE_HOST_NAME_KEY, CANONICALIZE_HOST_NAME_DEFAULT_VALUE)
+        return getNonNullMechanismProperty(CANONICALIZE_HOST_NAME_KEY, CANONICALIZE_HOST_NAME_DEFAULT_VALUE)
                ? InetAddress.getByName(serverAddress.getHost()).getCanonicalHostName()
                : serverAddress.getHost();
     }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/GetMoreMessage.java b/driver-core/src/main/com/mongodb/internal/connection/GetMoreMessage.java
new file mode 100644
index 00000000000..602985ccbc7
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/GetMoreMessage.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.io.BsonOutput;
+
+/**
+ * An OP_GET_MORE message.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-get-more OP_GET_MORE
+ */
+class GetMoreMessage extends LegacyMessage {
+    private final long cursorId;
+    private final int numberToReturn;
+
+    GetMoreMessage(final String collectionName, final long cursorId, final int numberToReturn) {
+        super(collectionName, OpCode.OP_GETMORE, MessageSettings.builder().build());
+        this.cursorId = cursorId;
+        this.numberToReturn = numberToReturn;
+    }
+
+    /**
+     * Gets the cursor to get more from.
+     *
+     * @return the cursor id
+     */
+    public long getCursorId() {
+        return cursorId;
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput) {
+        writeGetMore(bsonOutput);
+        return new EncodingMetadata(bsonOutput.getPosition());
+    }
+
+    private void writeGetMore(final BsonOutput buffer) {
+        buffer.writeInt32(0);
+        buffer.writeCString(getCollectionName());
+        buffer.writeInt32(numberToReturn);
+        buffer.writeInt64(cursorId);
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/connection/GetMoreProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/GetMoreProtocol.java
similarity index 81%
rename from driver-core/src/main/com/mongodb/connection/GetMoreProtocol.java
rename to driver-core/src/main/com/mongodb/internal/connection/GetMoreProtocol.java
index e44b25b55f0..9c2550754bd 100644
--- a/driver-core/src/main/com/mongodb/connection/GetMoreProtocol.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/GetMoreProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoCursorNotFoundException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.QueryResult;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
 import com.mongodb.event.CommandListener;
@@ -34,10 +37,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.mongodb.connection.ProtocolHelper.getQueryFailureException;
-import static com.mongodb.connection.ProtocolHelper.sendCommandFailedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandStartedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandSucceededEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.getQueryFailureException;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandFailedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandStartedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandSucceededEvent;
 import static java.lang.String.format;
 
 /**
@@ -46,7 +49,7 @@
  * @param <T> the type of document to decode query results to
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
  */
-class GetMoreProtocol<T> implements Protocol<QueryResult<T>> {
+class GetMoreProtocol<T> implements LegacyProtocol<QueryResult<T>> {
 
     public static final Logger LOGGER = Loggers.getLogger("protocol.getmore");
     private static final String COMMAND_NAME = "getMore";
@@ -57,15 +60,7 @@ class GetMoreProtocol<T> implements Protocol<QueryResult<T>> {
     private final int numberToReturn;
     private CommandListener commandListener;
 
-    /**
-     * Construct an instance.
-     *
-     * @param namespace      the namespace
-     * @param cursorId       the cursor id
-     * @param numberToReturn the number of documents to return
-     * @param resultDecoder  the decoder for the result documents.
-     */
-    public GetMoreProtocol(final MongoNamespace namespace, final long cursorId, final int numberToReturn, final Decoder<T> resultDecoder) {
+    GetMoreProtocol(final MongoNamespace namespace, final long cursorId, final int numberToReturn, final Decoder<T> resultDecoder) {
         this.namespace = namespace;
         this.cursorId = cursorId;
         this.numberToReturn = numberToReturn;
@@ -81,7 +76,7 @@ public QueryResult<T> execute(final InternalConnection connection) {
         }
         long startTimeNanos = System.nanoTime();
         GetMoreMessage message = new GetMoreMessage(namespace.getFullName(), cursorId, numberToReturn);
-        QueryResult<T> queryResult = null;
+        QueryResult<T> result = null;
         try {
             sendMessage(message, connection);
             ResponseBuffers responseBuffers = connection.receiveMessage(message.getId());
@@ -97,22 +92,24 @@ public QueryResult<T> execute(final InternalConnection connection) {
                 }
 
 
-                queryResult = new QueryResult<T>(namespace, new ReplyMessage<T>(responseBuffers, resultDecoder, message.getId()),
-                                                 connection.getDescription().getServerAddress());
+                ReplyMessage<T> replyMessage = new ReplyMessage<T>(responseBuffers, resultDecoder, message.getId());
+                result = new QueryResult<T>(namespace, replyMessage.getDocuments(),
+                        replyMessage.getReplyHeader().getCursorId(), connection.getDescription().getServerAddress());
 
                 if (commandListener != null) {
                     sendCommandSucceededEvent(message, COMMAND_NAME,
-                                              asGetMoreCommandResponseDocument(queryResult, responseBuffers), connection.getDescription(),
-                                              startTimeNanos, commandListener);
+                                              asGetMoreCommandResponseDocument(result, responseBuffers), connection.getDescription(),
+                                              System.nanoTime() - startTimeNanos, commandListener);
                 }
             } finally {
                 responseBuffers.close();
             }
             LOGGER.debug("Get-more completed");
-            return queryResult;
+            return result;
         } catch (RuntimeException e) {
             if (commandListener != null) {
-                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), startTimeNanos, e, commandListener);
+                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, e,
+                        commandListener);
             }
             throw e;
         }
@@ -149,7 +146,7 @@ public void executeAsync(final InternalConnection connection, final SingleResult
                                                 startTimeNanos, commandListener, callback, receiveCallback));
         } catch (Throwable t) {
             if (sentStartedEvent) {
-                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), startTimeNanos, t,
+                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, t,
                         commandListener);
             }
             callback.onResult(null, t);
@@ -168,7 +165,7 @@ private void sendMessage(final GetMoreMessage message, final InternalConnection
                 sendCommandStartedEvent(message, namespace.getDatabaseName(), COMMAND_NAME, asGetMoreCommandDocument(),
                                         connection.getDescription(), commandListener);
             }
-            message.encode(bsonOutput);
+            message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
             connection.sendMessage(bsonOutput.getByteBuffers(), message.getId());
         } finally {
             bsonOutput.close();
@@ -185,8 +182,8 @@ private BsonDocument asGetMoreCommandDocument() {
     private BsonDocument asGetMoreCommandResponseDocument(final QueryResult<T> queryResult, final ResponseBuffers responseBuffers) {
         List<ByteBufBsonDocument> rawResultDocuments = Collections.emptyList();
         if (responseBuffers.getReplyHeader().getNumberReturned() != 0) {
-            responseBuffers.getBodyByteBuffer().position(0);
-            rawResultDocuments = ByteBufBsonDocument.create(responseBuffers);
+            responseBuffers.reset();
+            rawResultDocuments = ByteBufBsonDocument.createList(responseBuffers);
         }
 
         BsonDocument cursorDocument = new BsonDocument("id",
@@ -207,9 +204,9 @@ class GetMoreResultCallback extends ResponseCallback {
         private final CommandListener commandListener;
         private final long startTimeNanos;
 
-        public GetMoreResultCallback(final SingleResultCallback<QueryResult<T>> callback,
-                                     final long cursorId, final GetMoreMessage message, final ConnectionDescription connectionDescription,
-                                     final CommandListener commandListener, final long startTimeNanos) {
+        GetMoreResultCallback(final SingleResultCallback<QueryResult<T>> callback, final long cursorId, final GetMoreMessage message,
+                              final ConnectionDescription connectionDescription, final CommandListener commandListener,
+                              final long startTimeNanos) {
             super(message.getId(), connectionDescription.getServerAddress());
             this.callback = callback;
             this.cursorId = cursorId;
@@ -231,13 +228,13 @@ protected void callCallback(final ResponseBuffers responseBuffers, final Throwab
                             message.getId()).getDocuments().get(0);
                     throw getQueryFailureException(errorDocument, connectionDescription.getServerAddress());
                 } else {
-                    QueryResult<T> result = new QueryResult<T>(namespace, new ReplyMessage<T>(responseBuffers, resultDecoder,
-                                                               getRequestId()), getServerAddress());
-
+                    ReplyMessage<T> replyMessage = new ReplyMessage<T>(responseBuffers, resultDecoder, getRequestId());
+                    QueryResult<T> result = new QueryResult<T>(namespace, replyMessage.getDocuments(),
+                            replyMessage.getReplyHeader().getCursorId(), getServerAddress());
                     if (commandListener != null) {
                         sendCommandSucceededEvent(message, COMMAND_NAME,
                                 asGetMoreCommandResponseDocument(result, responseBuffers), connectionDescription,
-                                startTimeNanos, commandListener);
+                                System.nanoTime() - startTimeNanos, commandListener);
                     }
 
                     if (LOGGER.isDebugEnabled()) {
@@ -249,7 +246,7 @@ protected void callCallback(final ResponseBuffers responseBuffers, final Throwab
                 }
             } catch (Throwable t) {
                 if (commandListener != null) {
-                    sendCommandFailedEvent(message, COMMAND_NAME, connectionDescription, startTimeNanos, t,
+                    sendCommandFailedEvent(message, COMMAND_NAME, connectionDescription, System.nanoTime() - startTimeNanos, t,
                             commandListener);
                 }
                 callback.onResult(null, t);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/IndexMap.java b/driver-core/src/main/com/mongodb/internal/connection/IndexMap.java
index 260edc62ff7..051246a2e6e 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/IndexMap.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/IndexMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ public static IndexMap create(final int startIndex, final int count) {
     private static class HashBased extends IndexMap {
         private final Map<Integer, Integer> indexMap = new HashMap<Integer, Integer>();
 
-        public HashBased(final int startIndex, final int count) {
+        HashBased(final int startIndex, final int count) {
             for (int i = startIndex; i < startIndex + count; i++) {
                 indexMap.put(i - startIndex, i);
             }
@@ -98,10 +98,10 @@ private static class RangeBased extends IndexMap {
         private int startIndex;
         private int count;
 
-        public RangeBased() {
+        RangeBased() {
         }
 
-        public RangeBased(final int startIndex, final int count) {
+        RangeBased(final int startIndex, final int count) {
             isTrueArgument("startIndex", startIndex >= 0);
             isTrueArgument("count", count > 0);
             this.startIndex = startIndex;
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InsertMessage.java b/driver-core/src/main/com/mongodb/internal/connection/InsertMessage.java
new file mode 100644
index 00000000000..53ccb5ab24d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/InsertMessage.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
+import org.bson.io.BsonOutput;
+
+/**
+ * An insert message.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-insert OP_INSERT
+ */
+class InsertMessage extends LegacyMessage {
+
+    private final InsertRequest insertRequest;
+
+    InsertMessage(final String collectionName, final InsertRequest insertRequest, final MessageSettings settings) {
+        super(collectionName, OpCode.OP_INSERT, settings);
+        this.insertRequest = insertRequest;
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput outputStream) {
+        writeInsertPrologue(outputStream);
+        int firstDocumentPosition = outputStream.getPosition();
+        addCollectibleDocument(insertRequest.getDocument(), outputStream, new CollectibleDocumentFieldNameValidator());
+        return new EncodingMetadata(firstDocumentPosition);
+    }
+
+    private void writeInsertPrologue(final BsonOutput outputStream) {
+        outputStream.writeInt32(0);  // flags
+        outputStream.writeCString(getCollectionName());
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InsertProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/InsertProtocol.java
new file mode 100644
index 00000000000..4aa3616e76a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/InsertProtocol.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+
+import static java.lang.String.format;
+
+/**
+ * An implementation of the insert wire protocol.  This class also takes care of applying the write concern.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-insert OP_INSERT
+ */
+class InsertProtocol extends WriteProtocol {
+
+    private static final Logger LOGGER = Loggers.getLogger("protocol.insert");
+
+    private final InsertRequest insertRequest;
+
+    InsertProtocol(final MongoNamespace namespace, final boolean ordered, final InsertRequest insertRequest) {
+        super(namespace, ordered);
+        this.insertRequest = insertRequest;
+    }
+
+    @Override
+    public WriteConcernResult execute(final InternalConnection connection) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug(format("Inserting 1 document into namespace %s on connection [%s] to server %s",
+                                getNamespace(),
+                                connection.getDescription().getConnectionId(),
+                                connection.getDescription().getServerAddress()));
+        }
+        WriteConcernResult writeConcernResult = super.execute(connection);
+        LOGGER.debug("Insert completed");
+        return writeConcernResult;
+    }
+
+    @Override
+    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
+        try {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(format("Asynchronously inserting 1 document into namespace %s on connection [%s] to server %s",
+                                    getNamespace(), connection.getDescription().getConnectionId(),
+                                    connection.getDescription().getServerAddress()));
+            }
+            super.executeAsync(connection, new SingleResultCallback<WriteConcernResult>() {
+                @Override
+                public void onResult(final WriteConcernResult result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        LOGGER.debug("Asynchronous insert completed");
+                        callback.onResult(result, null);
+                    }
+                }
+            });
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+        }
+    }
+
+    @Override
+    protected BsonDocument getAsWriteCommand(final ByteBufferBsonOutput bsonOutput, final int firstDocumentPosition) {
+        return getBaseCommandDocument("insert")
+               .append("documents", new BsonArray(ByteBufBsonDocument.createList(bsonOutput, firstDocumentPosition)));
+
+    }
+
+    protected RequestMessage createRequestMessage(final MessageSettings settings) {
+        return new InsertMessage(getNamespace().getFullName(), insertRequest, settings);
+    }
+
+    @Override
+    protected com.mongodb.diagnostics.logging.Logger getLogger() {
+        return LOGGER;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalConnection.java
new file mode 100644
index 00000000000..ab835e625b3
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalConnection.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.BufferProvider;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.session.SessionContext;
+import org.bson.ByteBuf;
+import org.bson.codecs.Decoder;
+
+import java.util.List;
+
+public interface InternalConnection extends BufferProvider {
+
+    /**
+     * Gets the description of this connection.
+     *
+     * @return the connection description
+     */
+    ConnectionDescription getDescription();
+
+    /**
+     * Opens the connection so its ready for use
+     */
+    void open();
+
+    /**
+     * Opens the connection so its ready for use
+     *
+     * @param callback the callback to be called once the connection has been opened
+     */
+    void openAsync(SingleResultCallback<Void> callback);
+
+    /**
+     * Closes the connection.
+     */
+    void close();
+
+    /**
+     * Returns if the connection has been opened
+     *
+     * @return true if connection has been opened
+     */
+    boolean opened();
+
+    /**
+     * Returns the closed state of the connection
+     *
+     * @return true if connection is closed
+     */
+    boolean isClosed();
+
+    /**
+     * Send a command message to the server.
+     *
+     * @param message   the command message to send
+     * @param sessionContext the session context
+     */
+    <T> T sendAndReceive(CommandMessage message, Decoder<T> decoder, SessionContext sessionContext);
+
+    /**
+     * Send a command message to the server.
+     *
+     * @param message   the command message to send
+     * @param sessionContext the session context
+     * @param callback the callback
+     */
+    <T> void sendAndReceiveAsync(CommandMessage message, Decoder<T> decoder, SessionContext sessionContext,
+                                 SingleResultCallback<T> callback);
+
+    /**
+     * Send a message to the server. The connection may not make any attempt to validate the integrity of the message.
+     *
+     * @param byteBuffers   the list of byte buffers to send.
+     * @param lastRequestId the request id of the last message in byteBuffers
+     */
+    void sendMessage(List<ByteBuf> byteBuffers, int lastRequestId);
+
+    /**
+     * Receive a response to a sent message from the server.
+     *
+     * @param responseTo the request id that this message is a response to
+     * @return the response
+     */
+    ResponseBuffers receiveMessage(int responseTo);
+
+    /**
+     * Asynchronously send a message to the server. The connection may not make any attempt to validate the integrity of the message.
+     *
+     * @param byteBuffers   the list of byte buffers to send
+     * @param lastRequestId the request id of the last message in byteBuffers
+     * @param callback      the callback to invoke on completion
+     */
+    void sendMessageAsync(List<ByteBuf> byteBuffers, int lastRequestId, SingleResultCallback<Void> callback);
+
+    /**
+     * Asynchronously receive a response to a sent message from the server.
+     *
+     * @param responseTo the request id that this message is a response to
+     * @param callback the callback to invoke on completion
+     */
+    void receiveMessageAsync(int responseTo, SingleResultCallback<ResponseBuffers> callback);
+
+}
diff --git a/driver-core/src/main/com/mongodb/connection/InternalConnectionFactory.java b/driver-core/src/main/com/mongodb/internal/connection/InternalConnectionFactory.java
similarity index 84%
rename from driver-core/src/main/com/mongodb/connection/InternalConnectionFactory.java
rename to driver-core/src/main/com/mongodb/internal/connection/InternalConnectionFactory.java
index 4192140f456..1725a0e4a76 100644
--- a/driver-core/src/main/com/mongodb/connection/InternalConnectionFactory.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ServerId;
 
 interface InternalConnectionFactory {
     InternalConnection create(ServerId serverId);
diff --git a/driver-core/src/main/com/mongodb/connection/InternalConnectionInitializer.java b/driver-core/src/main/com/mongodb/internal/connection/InternalConnectionInitializer.java
similarity index 86%
rename from driver-core/src/main/com/mongodb/connection/InternalConnectionInitializer.java
rename to driver-core/src/main/com/mongodb/internal/connection/InternalConnectionInitializer.java
index 128ed47d614..fa446f24315 100644
--- a/driver-core/src/main/com/mongodb/connection/InternalConnectionInitializer.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalConnectionInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
 
 interface InternalConnectionInitializer {
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
new file mode 100644
index 00000000000..63d6e05cc22
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
@@ -0,0 +1,695 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoCompressor;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoInterruptedException;
+import com.mongodb.MongoSocketClosedException;
+import com.mongodb.MongoSocketReadException;
+import com.mongodb.MongoSocketReadTimeoutException;
+import com.mongodb.MongoSocketWriteException;
+import com.mongodb.ServerAddress;
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncCompletionHandler;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.Stream;
+import com.mongodb.connection.StreamFactory;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.CommandListener;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonBinaryReader;
+import org.bson.BsonDocument;
+import org.bson.ByteBuf;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.Decoder;
+import org.bson.io.ByteBufferBsonInput;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketTimeoutException;
+import java.nio.channels.ClosedByInterruptException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.connection.MessageHeader.MESSAGE_HEADER_LENGTH;
+import static com.mongodb.internal.connection.OpCode.OP_COMPRESSED;
+import static com.mongodb.internal.connection.ProtocolHelper.createSpecialWriteConcernException;
+import static com.mongodb.internal.connection.ProtocolHelper.getClusterTime;
+import static com.mongodb.internal.connection.ProtocolHelper.getCommandFailureException;
+import static com.mongodb.internal.connection.ProtocolHelper.getMessageSettings;
+import static com.mongodb.internal.connection.ProtocolHelper.getOperationTime;
+import static com.mongodb.internal.connection.ProtocolHelper.getRecoveryToken;
+import static com.mongodb.internal.connection.ProtocolHelper.isCommandOk;
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+
+@NotThreadSafe
+public class InternalStreamConnection implements InternalConnection {
+
+    private static final Set<String> SECURITY_SENSITIVE_COMMANDS = new HashSet<String>(asList(
+            "authenticate",
+            "saslStart",
+            "saslContinue",
+            "getnonce",
+            "createUser",
+            "updateUser",
+            "copydbgetnonce",
+            "copydbsaslstart",
+            "copydb"));
+
+    private static final Logger LOGGER = Loggers.getLogger("connection");
+
+    private final ServerId serverId;
+    private final StreamFactory streamFactory;
+    private final InternalConnectionInitializer connectionInitializer;
+
+    private volatile ConnectionDescription description;
+    private volatile Stream stream;
+
+    private final AtomicBoolean isClosed = new AtomicBoolean();
+    private final AtomicBoolean opened = new AtomicBoolean();
+
+    private final List<MongoCompressor> compressorList;
+    private final CommandListener commandListener;
+    private volatile Compressor sendCompressor;
+    private volatile Map<Byte, Compressor> compressorMap;
+
+    public InternalStreamConnection(final ServerId serverId, final StreamFactory streamFactory,
+                                    final List<MongoCompressor> compressorList, final CommandListener commandListener,
+                                    final InternalConnectionInitializer connectionInitializer) {
+        this.serverId = notNull("serverId", serverId);
+        this.streamFactory = notNull("streamFactory", streamFactory);
+        this.compressorList = notNull("compressorList", compressorList);
+        this.compressorMap = createCompressorMap(compressorList);
+        this.commandListener = commandListener;
+        this.connectionInitializer = notNull("connectionInitializer", connectionInitializer);
+        description = new ConnectionDescription(serverId);
+    }
+
+    @Override
+    public ConnectionDescription getDescription() {
+        return description;
+    }
+
+    @Override
+    public void open() {
+        isTrue("Open already called", stream == null);
+        stream = streamFactory.create(serverId.getAddress());
+        try {
+            stream.open();
+            description = connectionInitializer.initialize(this);
+            opened.set(true);
+            sendCompressor = findSendCompressor(description);
+            LOGGER.info(format("Opened connection [%s] to %s", getId(), serverId.getAddress()));
+        } catch (Throwable t) {
+            close();
+            if (t instanceof MongoException) {
+                throw (MongoException) t;
+            } else {
+                throw new MongoException(t.toString(), t);
+            }
+        }
+    }
+
+    @Override
+    public void openAsync(final SingleResultCallback<Void> callback) {
+        isTrue("Open already called", stream == null, callback);
+        try {
+            stream = streamFactory.create(serverId.getAddress());
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+            return;
+        }
+        stream.openAsync(new AsyncCompletionHandler<Void>() {
+            @Override
+            public void completed(final Void aVoid) {
+                connectionInitializer.initializeAsync(InternalStreamConnection.this, new SingleResultCallback<ConnectionDescription>() {
+                    @Override
+                    public void onResult(final ConnectionDescription result, final Throwable t) {
+                        if (t != null) {
+                            close();
+                            callback.onResult(null, t);
+                        } else {
+                            description = result;
+                            opened.set(true);
+                            sendCompressor = findSendCompressor(description);
+                            if (LOGGER.isInfoEnabled()) {
+                                LOGGER.info(format("Opened connection [%s] to %s", getId(), serverId.getAddress()));
+                            }
+                            callback.onResult(null, null);
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void failed(final Throwable t) {
+                callback.onResult(null, t);
+            }
+        });
+    }
+
+    private Map<Byte, Compressor> createCompressorMap(final List<MongoCompressor> compressorList) {
+        Map<Byte, Compressor> compressorMap = new HashMap<Byte, Compressor>(this.compressorList.size());
+
+        for (MongoCompressor mongoCompressor : compressorList) {
+            Compressor compressor = createCompressor(mongoCompressor);
+            compressorMap.put(compressor.getId(), compressor);
+        }
+        return compressorMap;
+    }
+
+    private Compressor findSendCompressor(final ConnectionDescription description) {
+        if (description.getCompressors().isEmpty()) {
+            return null;
+        }
+
+        String firstCompressorName = description.getCompressors().get(0);
+
+        for (Compressor compressor : compressorMap.values()) {
+            if (compressor.getName().equals(firstCompressorName)) {
+                return compressor;
+            }
+        }
+
+        throw new MongoInternalException("Unexpected compressor negotiated: " + firstCompressorName);
+    }
+
+    private Compressor createCompressor(final MongoCompressor mongoCompressor) {
+        if (mongoCompressor.getName().equals("zlib")) {
+            return new ZlibCompressor(mongoCompressor);
+        } else if (mongoCompressor.getName().equals("snappy")) {
+            return new SnappyCompressor();
+        } else if (mongoCompressor.getName().equals("zstd")) {
+            return new ZstdCompressor();
+        } else {
+            throw new MongoClientException("Unsupported compressor " + mongoCompressor.getName());
+        }
+    }
+
+    @Override
+    public void close() {
+        // All but the first call is a no-op
+        if (!isClosed.getAndSet(true)) {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(String.format("Closing connection %s", getId()));
+            }
+            if (stream != null) {
+                stream.close();
+            }
+        }
+    }
+
+    @Override
+    public boolean opened() {
+        return opened.get();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return isClosed.get();
+    }
+
+    @Override
+    public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+        ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(this);
+        CommandEventSender commandEventSender;
+
+        try {
+            message.encode(bsonOutput, sessionContext);
+            commandEventSender = createCommandEventSender(message, bsonOutput);
+            commandEventSender.sendStartedEvent();
+        } catch (RuntimeException e) {
+            bsonOutput.close();
+            throw e;
+        }
+
+        try {
+            sendCommandMessage(message, bsonOutput, sessionContext);
+            if (message.isResponseExpected()) {
+                return receiveCommandMessageResponse(message, decoder, commandEventSender, sessionContext);
+            } else {
+                commandEventSender.sendSucceededEventForOneWayCommand();
+                return null;
+            }
+        } catch (RuntimeException e) {
+            commandEventSender.sendFailedEvent(e);
+            throw e;
+        }
+    }
+    private void sendCommandMessage(final CommandMessage message,
+                                    final ByteBufferBsonOutput bsonOutput, final SessionContext sessionContext) {
+        if (sendCompressor == null || SECURITY_SENSITIVE_COMMANDS.contains(message.getCommandDocument(bsonOutput).getFirstKey())) {
+            try {
+                sendMessage(bsonOutput.getByteBuffers(), message.getId());
+            } finally {
+                bsonOutput.close();
+            }
+        } else {
+            List<ByteBuf> byteBuffers = bsonOutput.getByteBuffers();
+            ByteBufferBsonOutput compressedBsonOutput;
+            try {
+                CompressedMessage compressedMessage = new CompressedMessage(message.getOpCode(), byteBuffers, sendCompressor,
+                        getMessageSettings(description));
+                compressedBsonOutput = new ByteBufferBsonOutput(this);
+                compressedMessage.encode(compressedBsonOutput, sessionContext);
+            } finally {
+                releaseAllBuffers(byteBuffers);
+                bsonOutput.close();
+            }
+            try {
+                sendMessage(compressedBsonOutput.getByteBuffers(), message.getId());
+            } finally {
+                compressedBsonOutput.close();
+            }
+        }
+    }
+
+    private <T> T receiveCommandMessageResponse(final CommandMessage message, final Decoder<T> decoder,
+                                                final CommandEventSender commandEventSender, final SessionContext sessionContext) {
+        ResponseBuffers responseBuffers = receiveMessage(message.getId());
+        try {
+            updateSessionContext(sessionContext, responseBuffers);
+            if (!isCommandOk(responseBuffers)) {
+                throw getCommandFailureException(responseBuffers.getResponseDocument(message.getId(), new BsonDocumentCodec()),
+                        description.getServerAddress());
+            }
+
+            commandEventSender.sendSucceededEvent(responseBuffers);
+
+            return getCommandResult(decoder, responseBuffers, message.getId());
+        } finally {
+            responseBuffers.close();
+        }
+    }
+
+    @Override
+    public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext,
+                                        final SingleResultCallback<T> callback) {
+        notNull("stream is open", stream, callback);
+
+        if (isClosed()) {
+            callback.onResult(null, new MongoSocketClosedException("Can not read from a closed socket", getServerAddress()));
+            return;
+        }
+
+        ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(this);
+        ByteBufferBsonOutput compressedBsonOutput = new ByteBufferBsonOutput(this);
+
+        try {
+            message.encode(bsonOutput, sessionContext);
+            CommandEventSender commandEventSender = createCommandEventSender(message, bsonOutput);
+            commandEventSender.sendStartedEvent();
+
+            if (sendCompressor == null || SECURITY_SENSITIVE_COMMANDS.contains(message.getCommandDocument(bsonOutput).getFirstKey())) {
+                sendCommandMessageAsync(message.getId(), decoder, sessionContext, callback, bsonOutput, commandEventSender,
+                        message.isResponseExpected());
+            } else {
+                List<ByteBuf> byteBuffers = bsonOutput.getByteBuffers();
+                try {
+                    CompressedMessage compressedMessage = new CompressedMessage(message.getOpCode(), byteBuffers, sendCompressor,
+                            getMessageSettings(description));
+                    compressedMessage.encode(compressedBsonOutput, sessionContext);
+                } finally {
+                    releaseAllBuffers(byteBuffers);
+                    bsonOutput.close();
+                }
+                sendCommandMessageAsync(message.getId(), decoder, sessionContext, callback, compressedBsonOutput, commandEventSender,
+                        message.isResponseExpected());
+            }
+        } catch (Throwable t) {
+            bsonOutput.close();
+            compressedBsonOutput.close();
+            callback.onResult(null, t);
+        }
+    }
+
+    private void releaseAllBuffers(final List<ByteBuf> byteBuffers) {
+        for (ByteBuf cur : byteBuffers) {
+            cur.release();
+        }
+    }
+
+    private <T> void sendCommandMessageAsync(final int messageId, final Decoder<T> decoder, final SessionContext sessionContext,
+                                             final SingleResultCallback<T> callback, final ByteBufferBsonOutput bsonOutput,
+                                             final CommandEventSender commandEventSender, final boolean responseExpected) {
+        sendMessageAsync(bsonOutput.getByteBuffers(), messageId, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                bsonOutput.close();
+                if (t != null) {
+                    commandEventSender.sendFailedEvent(t);
+                    callback.onResult(null, t);
+                } else if (!responseExpected) {
+                    commandEventSender.sendSucceededEventForOneWayCommand();
+                    callback.onResult(null, null);
+                } else {
+                    readAsync(MESSAGE_HEADER_LENGTH, new MessageHeaderCallback(new SingleResultCallback<ResponseBuffers>() {
+                        @Override
+                        public void onResult(final ResponseBuffers responseBuffers, final Throwable t) {
+                            if (t != null) {
+                                commandEventSender.sendFailedEvent(t);
+                                callback.onResult(null, t);
+                                return;
+                            }
+                            try {
+                                updateSessionContext(sessionContext, responseBuffers);
+                                boolean commandOk =
+                                        isCommandOk(new BsonBinaryReader(new ByteBufferBsonInput(responseBuffers.getBodyByteBuffer())));
+                                responseBuffers.reset();
+                                if (!commandOk) {
+                                    MongoException commandFailureException = getCommandFailureException(
+                                            responseBuffers.getResponseDocument(messageId, new BsonDocumentCodec()),
+                                            description.getServerAddress());
+                                    commandEventSender.sendFailedEvent(commandFailureException);
+                                    throw commandFailureException;
+                                }
+                                commandEventSender.sendSucceededEvent(responseBuffers);
+
+                                T result = getCommandResult(decoder, responseBuffers, messageId);
+                                callback.onResult(result, null);
+                            } catch (Throwable localThrowable) {
+                                callback.onResult(null, localThrowable);
+                            } finally {
+                                responseBuffers.close();
+                            }
+                        }
+                    }));
+                }
+            }
+        });
+    }
+
+    private <T> T getCommandResult(final Decoder<T> decoder, final ResponseBuffers responseBuffers, final int messageId) {
+        T result = new ReplyMessage<T>(responseBuffers, decoder, messageId).getDocuments().get(0);
+        MongoException writeConcernBasedError = createSpecialWriteConcernException(responseBuffers, description.getServerAddress());
+        if (writeConcernBasedError != null) {
+            throw new MongoWriteConcernWithResponseException(writeConcernBasedError, result);
+        }
+        return result;
+    }
+
+    @Override
+    public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
+        notNull("stream is open", stream);
+
+        if (isClosed()) {
+            throw new MongoSocketClosedException("Cannot write to a closed stream", getServerAddress());
+        }
+
+        try {
+            stream.write(byteBuffers);
+        } catch (Exception e) {
+            close();
+            throw translateWriteException(e);
+        }
+    }
+
+    @Override
+    public ResponseBuffers receiveMessage(final int responseTo) {
+        notNull("stream is open", stream);
+        if (isClosed()) {
+            throw new MongoSocketClosedException("Cannot read from a closed stream", getServerAddress());
+        }
+
+        try {
+            return receiveResponseBuffers();
+        } catch (Throwable t) {
+            close();
+            throw translateReadException(t);
+        }
+    }
+
+    @Override
+    public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
+        notNull("stream is open", stream, callback);
+
+        if (isClosed()) {
+            callback.onResult(null, new MongoSocketClosedException("Can not read from a closed socket", getServerAddress()));
+            return;
+        }
+
+        writeAsync(byteBuffers, errorHandlingCallback(callback, LOGGER));
+    }
+
+    private void writeAsync(final List<ByteBuf> byteBuffers, final SingleResultCallback<Void> callback) {
+        stream.writeAsync(byteBuffers, new AsyncCompletionHandler<Void>() {
+            @Override
+            public void completed(final Void v) {
+                callback.onResult(null, null);
+            }
+
+            @Override
+            public void failed(final Throwable t) {
+                close();
+                callback.onResult(null, translateWriteException(t));
+            }
+        });
+    }
+
+    @Override
+    public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
+        isTrue("stream is open", stream != null, callback);
+
+        if (isClosed()) {
+            callback.onResult(null, new MongoSocketClosedException("Can not read from a closed socket", getServerAddress()));
+            return;
+        }
+
+        if (LOGGER.isTraceEnabled()) {
+            LOGGER.trace(String.format("Start receiving response on %s", getId()));
+        }
+        readAsync(MESSAGE_HEADER_LENGTH, new MessageHeaderCallback(new SingleResultCallback<ResponseBuffers>() {
+            @Override
+            public void onResult(final ResponseBuffers result, final Throwable t) {
+                if (t != null) {
+                    close();
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(result, null);
+                }
+            }
+        }));
+    }
+
+    private void readAsync(final int numBytes, final SingleResultCallback<ByteBuf> callback) {
+        if (isClosed()) {
+            callback.onResult(null, new MongoSocketClosedException("Cannot read from a closed stream", getServerAddress()));
+            return;
+        }
+
+        try {
+            stream.readAsync(numBytes, new AsyncCompletionHandler<ByteBuf>() {
+                @Override
+                public void completed(final ByteBuf buffer) {
+                    callback.onResult(buffer, null);
+                }
+
+                @Override
+                public void failed(final Throwable t) {
+                    close();
+                    callback.onResult(null, translateReadException(t));
+                }
+            });
+        } catch (Exception e) {
+            callback.onResult(null, translateReadException(e));
+        }
+    }
+
+    private ConnectionId getId() {
+        return description.getConnectionId();
+    }
+
+    private ServerAddress getServerAddress() {
+        return description.getServerAddress();
+    }
+
+    private void updateSessionContext(final SessionContext sessionContext, final ResponseBuffers responseBuffers) {
+        sessionContext.advanceOperationTime(getOperationTime(responseBuffers));
+        sessionContext.advanceClusterTime(getClusterTime(responseBuffers));
+        if (sessionContext.hasActiveTransaction()) {
+            BsonDocument recoveryToken = getRecoveryToken(responseBuffers);
+            if (recoveryToken != null) {
+                sessionContext.setRecoveryToken(recoveryToken);
+            }
+        }
+    }
+
+    private MongoException translateWriteException(final Throwable e) {
+        if (e instanceof MongoException) {
+            return (MongoException) e;
+        } else if (e instanceof IOException) {
+            return new MongoSocketWriteException("Exception sending message", getServerAddress(), e);
+        } else if (e instanceof InterruptedException) {
+            return new MongoInternalException("Thread interrupted exception", e);
+        } else {
+            return new MongoInternalException("Unexpected exception", e);
+        }
+    }
+
+    private MongoException translateReadException(final Throwable e) {
+        if (e instanceof MongoException) {
+            return (MongoException) e;
+        } else if (e instanceof SocketTimeoutException) {
+            return new MongoSocketReadTimeoutException("Timeout while receiving message", getServerAddress(), e);
+        } else if (e instanceof InterruptedIOException) {
+            return new MongoInterruptedException("Interrupted while receiving message", (InterruptedIOException) e);
+        } else if (e instanceof ClosedByInterruptException) {
+            return new MongoInterruptedException("Interrupted while receiving message", (ClosedByInterruptException) e);
+        } else if (e instanceof IOException) {
+            return new MongoSocketReadException("Exception receiving message", getServerAddress(), e);
+        } else if (e instanceof RuntimeException) {
+            return new MongoInternalException("Unexpected runtime exception", e);
+        } else if (e instanceof InterruptedException) {
+            return new MongoInternalException("Interrupted exception", e);
+        } else {
+            return new MongoInternalException("Unexpected exception", e);
+        }
+    }
+
+    private ResponseBuffers receiveResponseBuffers() throws IOException {
+        ByteBuf messageHeaderBuffer = stream.read(MESSAGE_HEADER_LENGTH);
+        MessageHeader messageHeader;
+        try {
+            messageHeader = new MessageHeader(messageHeaderBuffer, description.getMaxMessageSize());
+        } finally {
+            messageHeaderBuffer.release();
+        }
+
+        ByteBuf messageBuffer = stream.read(messageHeader.getMessageLength() - MESSAGE_HEADER_LENGTH);
+
+        if (messageHeader.getOpCode() == OP_COMPRESSED.getValue()) {
+            CompressedHeader compressedHeader = new CompressedHeader(messageBuffer, messageHeader);
+
+            Compressor compressor = getCompressor(compressedHeader);
+
+            ByteBuf buffer = getBuffer(compressedHeader.getUncompressedSize());
+            compressor.uncompress(messageBuffer, buffer);
+
+            buffer.flip();
+            return new ResponseBuffers(new ReplyHeader(buffer, compressedHeader), buffer);
+        } else {
+            return new ResponseBuffers(new ReplyHeader(messageBuffer, messageHeader), messageBuffer);
+        }
+    }
+
+    private Compressor getCompressor(final CompressedHeader compressedHeader) {
+        Compressor compressor = compressorMap.get(compressedHeader.getCompressorId());
+        if (compressor == null) {
+            throw new MongoClientException("Unsupported compressor with identifier " + compressedHeader.getCompressorId());
+        }
+        return compressor;
+    }
+
+    @Override
+    public ByteBuf getBuffer(final int size) {
+        notNull("open", stream);
+        return stream.getBuffer(size);
+    }
+
+    private class MessageHeaderCallback implements SingleResultCallback<ByteBuf> {
+        private final SingleResultCallback<ResponseBuffers> callback;
+
+        MessageHeaderCallback(final SingleResultCallback<ResponseBuffers> callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        public void onResult(final ByteBuf result, final Throwable t) {
+            if (t != null) {
+                callback.onResult(null, t);
+                return;
+            }
+            try {
+                MessageHeader messageHeader = new MessageHeader(result, description.getMaxMessageSize());
+                readAsync(messageHeader.getMessageLength() - MESSAGE_HEADER_LENGTH, new MessageCallback(messageHeader));
+            } catch (Throwable localThrowable) {
+                callback.onResult(null, localThrowable);
+            } finally {
+                if (result != null) {
+                    result.release();
+                }
+            }
+        }
+
+        private class MessageCallback implements SingleResultCallback<ByteBuf> {
+            private final MessageHeader messageHeader;
+
+            MessageCallback(final MessageHeader messageHeader) {
+                this.messageHeader = messageHeader;
+            }
+
+            @Override
+            public void onResult(final ByteBuf result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                    return;
+                }
+                try {
+                    ReplyHeader replyHeader;
+                    ByteBuf responseBuffer;
+                    if (messageHeader.getOpCode() == OP_COMPRESSED.getValue()) {
+                        try {
+                            CompressedHeader compressedHeader = new CompressedHeader(result, messageHeader);
+                            Compressor compressor = getCompressor(compressedHeader);
+                            ByteBuf buffer = getBuffer(compressedHeader.getUncompressedSize());
+                            compressor.uncompress(result, buffer);
+
+                            buffer.flip();
+                            replyHeader = new ReplyHeader(buffer, compressedHeader);
+                            responseBuffer = buffer;
+                        } finally {
+                            result.release();
+                        }
+                    } else {
+                        replyHeader = new ReplyHeader(result, messageHeader);
+                        responseBuffer = result;
+                    }
+                    callback.onResult(new ResponseBuffers(replyHeader, responseBuffer), null);
+                } catch (Throwable localThrowable) {
+                    callback.onResult(null, localThrowable);
+                }
+            }
+        }
+    }
+
+    private static final Logger COMMAND_PROTOCOL_LOGGER = Loggers.getLogger("protocol.command");
+
+    private CommandEventSender createCommandEventSender(final CommandMessage message, final ByteBufferBsonOutput bsonOutput) {
+        if (opened() && (commandListener != null || COMMAND_PROTOCOL_LOGGER.isDebugEnabled())) {
+            return new LoggingCommandEventSender(SECURITY_SENSITIVE_COMMANDS, description, commandListener, message, bsonOutput,
+                    COMMAND_PROTOCOL_LOGGER);
+        } else {
+            return new NoOpCommandEventSender();
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionFactory.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionFactory.java
new file mode 100644
index 00000000000..b8598504b51
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionFactory.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCompressor;
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.StreamFactory;
+import com.mongodb.event.CommandListener;
+import org.bson.BsonDocument;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.connection.ClientMetadataHelper.createClientMetadataDocument;
+
+class InternalStreamConnectionFactory implements InternalConnectionFactory {
+    private final StreamFactory streamFactory;
+    private final BsonDocument clientMetadataDocument;
+    private final List<Authenticator> authenticators;
+    private final List<MongoCompressor> compressorList;
+    private final CommandListener commandListener;
+
+    InternalStreamConnectionFactory(final StreamFactory streamFactory, final List<MongoCredentialWithCache> credentialList,
+                                    final String applicationName, final MongoDriverInformation mongoDriverInformation,
+                                    final List<MongoCompressor> compressorList,
+                                    final CommandListener commandListener) {
+        this.streamFactory = notNull("streamFactory", streamFactory);
+        this.compressorList = notNull("compressorList", compressorList);
+        this.commandListener = commandListener;
+        this.clientMetadataDocument = createClientMetadataDocument(applicationName, mongoDriverInformation);
+        notNull("credentialList", credentialList);
+        this.authenticators = new ArrayList<Authenticator>(credentialList.size());
+        for (MongoCredentialWithCache credential : credentialList) {
+            authenticators.add(createAuthenticator(credential));
+        }
+    }
+
+    @Override
+    public InternalConnection create(final ServerId serverId) {
+        return new InternalStreamConnection(serverId, streamFactory, compressorList, commandListener,
+                                            new InternalStreamConnectionInitializer(authenticators, clientMetadataDocument,
+                                                                                           compressorList));
+    }
+
+    private Authenticator createAuthenticator(final MongoCredentialWithCache credential) {
+        if (credential.getAuthenticationMechanism() == null) {
+            return new DefaultAuthenticator(credential);
+        }
+
+        switch (credential.getAuthenticationMechanism()) {
+            case GSSAPI:
+                return new GSSAPIAuthenticator(credential);
+            case PLAIN:
+                return new PlainAuthenticator(credential);
+            case MONGODB_X509:
+                return new X509Authenticator(credential);
+            case SCRAM_SHA_1:
+            case SCRAM_SHA_256:
+                return new ScramShaAuthenticator(credential);
+            case MONGODB_CR:
+                return new NativeAuthenticator(credential);
+            default:
+                throw new IllegalArgumentException("Unsupported authentication mechanism " + credential.getAuthenticationMechanism());
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java
new file mode 100644
index 00000000000..9c056b88025
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCompressor;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoException;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.connection.ServerType;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.connection.CommandHelper.executeCommand;
+import static com.mongodb.internal.connection.CommandHelper.executeCommandAsync;
+import static com.mongodb.internal.connection.CommandHelper.executeCommandWithoutCheckingForFailure;
+import static com.mongodb.internal.connection.DefaultAuthenticator.USER_NOT_FOUND_CODE;
+import static com.mongodb.internal.connection.DescriptionHelper.createConnectionDescription;
+import static java.lang.String.format;
+
+public class InternalStreamConnectionInitializer implements InternalConnectionInitializer {
+    private final List<Authenticator> authenticators;
+    private final BsonDocument clientMetadataDocument;
+    private final List<MongoCompressor> requestedCompressors;
+    private final boolean checkSaslSupportedMechs;
+
+    public InternalStreamConnectionInitializer(final List<Authenticator> authenticators, final BsonDocument clientMetadataDocument,
+                                               final List<MongoCompressor> requestedCompressors) {
+        this.authenticators = new ArrayList<Authenticator>(notNull("authenticators", authenticators));
+        this.clientMetadataDocument = clientMetadataDocument;
+        this.requestedCompressors = notNull("requestedCompressors", requestedCompressors);
+        this.checkSaslSupportedMechs = this.authenticators.size() > 0 && this.authenticators.get(0) instanceof DefaultAuthenticator;
+    }
+
+    @Override
+    public ConnectionDescription initialize(final InternalConnection internalConnection) {
+        notNull("internalConnection", internalConnection);
+
+        ConnectionDescription connectionDescription = initializeConnectionDescription(internalConnection);
+        authenticateAll(internalConnection, connectionDescription);
+        return completeConnectionDescriptionInitialization(internalConnection, connectionDescription);
+    }
+
+    @Override
+    public void initializeAsync(final InternalConnection internalConnection, final SingleResultCallback<ConnectionDescription> callback) {
+        initializeConnectionDescriptionAsync(internalConnection, createConnectionDescriptionCallback(internalConnection, callback));
+    }
+
+    private SingleResultCallback<ConnectionDescription>
+    createConnectionDescriptionCallback(final InternalConnection internalConnection,
+                                        final SingleResultCallback<ConnectionDescription> callback) {
+        return new SingleResultCallback<ConnectionDescription>() {
+            @Override
+            public void onResult(final ConnectionDescription connectionDescription, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    new CompoundAuthenticator(internalConnection, connectionDescription,
+                                              new SingleResultCallback<Void>() {
+                                                  @Override
+                                                  public void onResult(final Void result, final Throwable t) {
+                                                      if (t != null) {
+                                                          callback.onResult(null, t);
+                                                      } else {
+                                                          completeConnectionDescriptionInitializationAsync(internalConnection,
+                                                                                                           connectionDescription,
+                                                                                                           callback);
+                                                      }
+                                                  }
+                                              })
+                    .start();
+                }
+            }
+        };
+    }
+
+    private ConnectionDescription initializeConnectionDescription(final InternalConnection internalConnection) {
+        BsonDocument isMasterResult;
+        BsonDocument isMasterCommandDocument = createIsMasterCommand();
+
+        try {
+            isMasterResult = executeCommand("admin", isMasterCommandDocument, internalConnection);
+        } catch (MongoException e) {
+            if (checkSaslSupportedMechs && e.getCode() == USER_NOT_FOUND_CODE) {
+                MongoCredential credential = authenticators.get(0).getMongoCredential();
+                throw new MongoSecurityException(credential, format("Exception authenticating %s", credential), e);
+            }
+            throw e;
+        }
+        BsonDocument buildInfoResult = executeCommand("admin", new BsonDocument("buildinfo", new BsonInt32(1)), internalConnection);
+
+        ConnectionDescription connectionDescription = createConnectionDescription(internalConnection.getDescription().getConnectionId(),
+                isMasterResult, buildInfoResult);
+        setFirstAuthenticator(isMasterResult, connectionDescription);
+        return connectionDescription;
+    }
+
+    private BsonDocument createIsMasterCommand() {
+        BsonDocument isMasterCommandDocument = new BsonDocument("ismaster", new BsonInt32(1));
+        if (clientMetadataDocument != null) {
+            isMasterCommandDocument.append("client", clientMetadataDocument);
+        }
+        if (!requestedCompressors.isEmpty()) {
+            BsonArray compressors = new BsonArray();
+            for (MongoCompressor cur : this.requestedCompressors) {
+                compressors.add(new BsonString(cur.getName()));
+            }
+            isMasterCommandDocument.append("compression", compressors);
+        }
+        if (checkSaslSupportedMechs) {
+            MongoCredential credential = authenticators.get(0).getMongoCredential();
+            isMasterCommandDocument.append("saslSupportedMechs",
+                    new BsonString(credential.getSource() + "." + credential.getUserName()));
+        }
+        return isMasterCommandDocument;
+    }
+
+    private ConnectionDescription completeConnectionDescriptionInitialization(final InternalConnection internalConnection,
+                                                                              final ConnectionDescription connectionDescription) {
+        if (connectionDescription.getConnectionId().getServerValue() != null) {
+            return connectionDescription;
+        }
+
+        return applyGetLastErrorResult(executeCommandWithoutCheckingForFailure("admin",
+                                                                               new BsonDocument("getlasterror", new BsonInt32(1)),
+                                                                               internalConnection),
+                                       connectionDescription);
+    }
+
+    private void authenticateAll(final InternalConnection internalConnection, final ConnectionDescription connectionDescription) {
+        if (connectionDescription.getServerType() != ServerType.REPLICA_SET_ARBITER) {
+            for (final Authenticator cur : authenticators) {
+                cur.authenticate(internalConnection, connectionDescription);
+            }
+        }
+    }
+
+    private void initializeConnectionDescriptionAsync(final InternalConnection internalConnection,
+                                                      final SingleResultCallback<ConnectionDescription> callback) {
+        executeCommandAsync("admin", createIsMasterCommand(), internalConnection,
+                            new SingleResultCallback<BsonDocument>() {
+                                @Override
+                                public void onResult(final BsonDocument isMasterResult, final Throwable t) {
+                                    if (t != null) {
+                                        if (checkSaslSupportedMechs && t instanceof MongoException
+                                                && ((MongoException) t).getCode() == USER_NOT_FOUND_CODE) {
+                                            MongoCredential credential = authenticators.get(0).getMongoCredential();
+                                            callback.onResult(null,  new MongoSecurityException(credential,
+                                                    format("Exception authenticating %s", credential), t));
+                                        } else {
+                                            callback.onResult(null, t);
+                                        }
+                                    } else {
+                                        executeCommandAsync("admin", new BsonDocument("buildinfo", new BsonInt32(1)), internalConnection,
+                                                            new SingleResultCallback<BsonDocument>() {
+                                                                @Override
+                                                                public void onResult(final BsonDocument buildInfoResult,
+                                                                                     final Throwable t) {
+                                                                    if (t != null) {
+                                                                        callback.onResult(null, t);
+                                                                    } else {
+                                                                        ConnectionId connectionId = internalConnection.getDescription()
+                                                                                                                      .getConnectionId();
+                                                                        ConnectionDescription connectionDescription =
+                                                                                createConnectionDescription(connectionId, isMasterResult,
+                                                                                        buildInfoResult);
+                                                                        setFirstAuthenticator(isMasterResult, connectionDescription);
+                                                                        callback.onResult(connectionDescription, null);
+                                                                    }
+                                                                }
+                                                            });
+                                    }
+                                }
+                            });
+    }
+
+    @SuppressWarnings("unchecked")
+    private void setFirstAuthenticator(final BsonDocument isMasterResult, final ConnectionDescription connectionDescription) {
+        if (checkSaslSupportedMechs) {
+            authenticators.set(0, ((DefaultAuthenticator) authenticators.get(0))
+                    .getAuthenticatorFromIsMasterResult(isMasterResult, connectionDescription));
+        }
+    }
+
+    private void completeConnectionDescriptionInitializationAsync(final InternalConnection internalConnection,
+                                                                  final ConnectionDescription connectionDescription,
+                                                                  final SingleResultCallback<ConnectionDescription> callback) {
+        if (connectionDescription.getConnectionId().getServerValue() != null) {
+            callback.onResult(connectionDescription, null);
+            return;
+        }
+
+        executeCommandAsync("admin", new BsonDocument("getlasterror", new BsonInt32(1)),
+                            internalConnection,
+                            new SingleResultCallback<BsonDocument>() {
+                                @Override
+                                public void onResult(final BsonDocument result, final Throwable t) {
+                                    if (result == null) {
+                                        callback.onResult(connectionDescription, null);
+                                    } else {
+                                        callback.onResult(applyGetLastErrorResult(result, connectionDescription), null);
+                                    }
+                                }
+                            });
+    }
+
+    private ConnectionDescription applyGetLastErrorResult(final BsonDocument getLastErrorResult,
+                                                          final ConnectionDescription connectionDescription) {
+        ConnectionId connectionId;
+        if (getLastErrorResult.containsKey("connectionId")) {
+            connectionId = connectionDescription.getConnectionId().withServerValue(getLastErrorResult.getNumber("connectionId").intValue());
+        } else {
+            connectionId =  connectionDescription.getConnectionId();
+        }
+
+        return connectionDescription.withConnectionId(connectionId);
+    }
+
+    private class CompoundAuthenticator implements SingleResultCallback<Void> {
+        private final InternalConnection internalConnection;
+        private final ConnectionDescription connectionDescription;
+        private final SingleResultCallback<Void> callback;
+        private final AtomicInteger currentAuthenticatorIndex = new AtomicInteger(-1);
+
+        CompoundAuthenticator(final InternalConnection internalConnection, final ConnectionDescription connectionDescription,
+                                     final SingleResultCallback<Void> callback) {
+            this.internalConnection = internalConnection;
+            this.connectionDescription = connectionDescription;
+            this.callback = callback;
+        }
+
+        @Override
+        public void onResult(final Void result, final Throwable t) {
+            if (t != null) {
+                callback.onResult(null, t);
+            } else if (completedAuthentication()) {
+                callback.onResult(null, null);
+            } else {
+                authenticateNext();
+            }
+        }
+
+        public void start() {
+            if (connectionDescription.getServerType() == ServerType.REPLICA_SET_ARBITER || authenticators.isEmpty()) {
+                callback.onResult(null, null);
+            } else {
+                authenticateNext();
+            }
+        }
+
+        private boolean completedAuthentication() {
+            return currentAuthenticatorIndex.get() == authenticators.size() - 1;
+        }
+
+        private void authenticateNext() {
+            authenticators.get(currentAuthenticatorIndex.incrementAndGet())
+                          .authenticateAsync(internalConnection, connectionDescription, this);
+        }
+
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/Java8SniSslHelper.java b/driver-core/src/main/com/mongodb/internal/connection/Java8SniSslHelper.java
new file mode 100644
index 00000000000..5bd4ee9c91b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/Java8SniSslHelper.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import javax.net.ssl.SNIHostName;
+import javax.net.ssl.SNIServerName;
+import javax.net.ssl.SSLParameters;
+
+import static java.util.Collections.singletonList;
+
+// This class is loaded via Class.forName from SslHelper.
+final class Java8SniSslHelper implements SniSslHelper {
+
+    // if running on Java 8 or above then SNIHostName will be available and initialization will succeed.  Otherwise it will fail.
+    static {
+        try {
+            Class.forName("javax.net.ssl.SNIHostName");
+        } catch (ClassNotFoundException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    @Override
+    public void enableSni(final String host, final SSLParameters sslParameters) {
+        try {
+            SNIServerName sniHostName = new SNIHostName(host);
+            sslParameters.setServerNames(singletonList(sniHostName));
+        } catch (IllegalArgumentException e) {
+            // ignore because SNIHostName will throw this for some legit host names for connecting to MongoDB, e.g an IPV6 literal
+        }
+    }
+
+    Java8SniSslHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/KillCursorProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/KillCursorProtocol.java
similarity index 83%
rename from driver-core/src/main/com/mongodb/connection/KillCursorProtocol.java
rename to driver-core/src/main/com/mongodb/internal/connection/KillCursorProtocol.java
index e8a00aa37d9..82cbcd55b6e 100644
--- a/driver-core/src/main/com/mongodb/connection/KillCursorProtocol.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/KillCursorProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ByteBufferBsonOutput;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
 import com.mongodb.event.CommandListener;
@@ -30,9 +31,9 @@
 
 import java.util.List;
 
-import static com.mongodb.connection.ProtocolHelper.sendCommandFailedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandStartedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandSucceededEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandFailedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandStartedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandSucceededEvent;
 import static java.lang.String.format;
 
 /**
@@ -40,7 +41,7 @@
  *
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-kill-cursors OP_KILL_CURSOR
  */
-class KillCursorProtocol implements Protocol<Void> {
+class KillCursorProtocol implements LegacyProtocol<Void> {
     public static final Logger LOGGER = Loggers.getLogger("protocol.killcursor");
     private static final String COMMAND_NAME = "killCursors";
 
@@ -48,13 +49,7 @@ class KillCursorProtocol implements Protocol<Void> {
     private final List<Long> cursors;
     private CommandListener commandListener;
 
-    /**
-     * Construct an instance.
-     *
-     * @param namespace  the namespace in which all the cursors live
-     * @param cursors the list of cursors to kill
-     */
-    public KillCursorProtocol(final MongoNamespace namespace, final List<Long> cursors) {
+    KillCursorProtocol(final MongoNamespace namespace, final List<Long> cursors) {
         this.namespace = namespace;
         this.cursors = cursors;
     }
@@ -74,17 +69,18 @@ public Void execute(final InternalConnection connection) {
                 sendCommandStartedEvent(message, namespace.getDatabaseName(), COMMAND_NAME, asCommandDocument(),
                                         connection.getDescription(), commandListener);
             }
-            message.encode(bsonOutput);
+            message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
             connection.sendMessage(bsonOutput.getByteBuffers(), message.getId());
             if (commandListener != null && namespace != null) {
                 sendCommandSucceededEvent(message, COMMAND_NAME, asCommandResponseDocument(),
                                           connection.getDescription(),
-                                          startTimeNanos, commandListener);
+                                          System.nanoTime() - startTimeNanos, commandListener);
             }
             return null;
         } catch (RuntimeException e) {
             if (commandListener != null && namespace != null) {
-                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), startTimeNanos, e, commandListener);
+                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, e,
+                        commandListener);
             }
             throw e;
         }
@@ -111,17 +107,18 @@ public void executeAsync(final InternalConnection connection, final SingleResult
                 startEventSent = true;
             }
 
-            message.encode(bsonOutput);
+            message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
             connection.sendMessageAsync(bsonOutput.getByteBuffers(), message.getId(), new SingleResultCallback<Void>() {
                 @Override
                 public void onResult(final Void result, final Throwable t) {
                     if (commandListener != null && namespace != null) {
                         if (t != null) {
-                            sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), startTimeNanos, t, commandListener);
+                            sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(),
+                                    System.nanoTime() - startTimeNanos, t, commandListener);
                         } else {
                             sendCommandSucceededEvent(message, COMMAND_NAME, asCommandResponseDocument(),
                                     connection.getDescription(),
-                                    startTimeNanos, commandListener);
+                                    System.nanoTime() - startTimeNanos, commandListener);
                         }
                     }
 
@@ -131,7 +128,8 @@ public void onResult(final Void result, final Throwable t) {
             });
         } catch (Throwable t) {
             if (startEventSent) {
-                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), startTimeNanos, t, commandListener);
+                sendCommandFailedEvent(message, COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos,
+                        t, commandListener);
             }
             callback.onResult(null, t);
         }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/KillCursorsMessage.java b/driver-core/src/main/com/mongodb/internal/connection/KillCursorsMessage.java
new file mode 100644
index 00000000000..bfc83b56cea
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/KillCursorsMessage.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.io.BsonOutput;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * An OP_KILL_CURSOR message.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-kill-cursors OP_KILL_CURSOR
+ */
+class KillCursorsMessage extends LegacyMessage {
+    private final List<Long> cursors;
+
+    KillCursorsMessage(final List<Long> cursors) {
+        super(OpCode.OP_KILL_CURSORS, MessageSettings.builder().build());
+        this.cursors = notNull("cursors", cursors);
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput) {
+        writeKillCursorsPrologue(cursors.size(), bsonOutput);
+        for (final Long cur : cursors) {
+            bsonOutput.writeInt64(cur);
+        }
+        return new EncodingMetadata(bsonOutput.getPosition());
+    }
+
+    private void writeKillCursorsPrologue(final int numCursors, final BsonOutput bsonOutput) {
+        bsonOutput.writeInt32(0); // reserved
+        bsonOutput.writeInt32(numCursors);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/LegacyMessage.java b/driver-core/src/main/com/mongodb/internal/connection/LegacyMessage.java
new file mode 100644
index 00000000000..64bcf32216a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/LegacyMessage.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.session.SessionContext;
+import org.bson.io.BsonOutput;
+
+abstract class LegacyMessage extends RequestMessage {
+    LegacyMessage(final String collectionName, final OpCode opCode, final MessageSettings settings) {
+        super(collectionName, opCode, settings);
+    }
+
+    LegacyMessage(final OpCode opCode, final MessageSettings settings) {
+        super(opCode, settings);
+    }
+
+    abstract EncodingMetadata encodeMessageBodyWithMetadata(BsonOutput bsonOutput);
+
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput, final SessionContext sessionContext) {
+        return encodeMessageBodyWithMetadata(bsonOutput);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/LegacyProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/LegacyProtocol.java
new file mode 100644
index 00000000000..139d52430af
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/LegacyProtocol.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.event.CommandListener;
+
+public interface LegacyProtocol<T> {
+
+    T execute(InternalConnection connection);
+
+    void executeAsync(InternalConnection connection, SingleResultCallback<T> callback);
+
+    void setCommandListener(CommandListener commandListener);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/LevelCountingBsonWriter.java b/driver-core/src/main/com/mongodb/internal/connection/LevelCountingBsonWriter.java
new file mode 100644
index 00000000000..f9c78cd5d9a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/LevelCountingBsonWriter.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.BsonBinaryWriter;
+
+
+abstract class LevelCountingBsonWriter extends BsonWriterDecorator {
+    private int level = -1;
+
+    LevelCountingBsonWriter(final BsonBinaryWriter bsonBinaryWriter) {
+        super(bsonBinaryWriter);
+    }
+
+    BsonBinaryWriter getBsonBinaryWriter() {
+        return (BsonBinaryWriter) super.getBsonWriter();
+    }
+
+    int getCurrentLevel() {
+        return level;
+    }
+
+    @Override
+    public void writeStartDocument(final String name) {
+        level++;
+        super.writeStartDocument(name);
+    }
+
+    @Override
+    public void writeStartDocument() {
+        level++;
+        super.writeStartDocument();
+    }
+
+    @Override
+    public void writeEndDocument() {
+        level--;
+        super.writeEndDocument();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/LoggingCommandEventSender.java b/driver-core/src/main/com/mongodb/internal/connection/LoggingCommandEventSender.java
new file mode 100644
index 00000000000..15882b16805
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/LoggingCommandEventSender.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCommandException;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.event.CommandListener;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonReader;
+import org.bson.codecs.RawBsonDocumentCodec;
+import org.bson.json.JsonMode;
+import org.bson.json.JsonWriter;
+import org.bson.json.JsonWriterSettings;
+
+import java.io.StringWriter;
+import java.util.Set;
+
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandFailedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandStartedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandSucceededEvent;
+import static java.lang.String.format;
+
+class LoggingCommandEventSender implements CommandEventSender {
+    private static final int MAX_COMMAND_DOCUMENT_LENGTH_TO_LOG = 1000;
+
+    private final Set<String> securitySensitiveCommands;
+    private final ConnectionDescription description;
+    private final CommandListener commandListener;
+    private final Logger logger;
+    private final long startTimeNanos;
+    private final CommandMessage message;
+    private final String commandName;
+    private volatile BsonDocument commandDocument;
+
+    LoggingCommandEventSender(final Set<String> securitySensitiveCommands, final ConnectionDescription description,
+                              final CommandListener commandListener, final CommandMessage message,
+                              final ByteBufferBsonOutput bsonOutput, final Logger logger) {
+        this.securitySensitiveCommands = securitySensitiveCommands;
+        this.description = description;
+        this.commandListener = commandListener;
+        this.logger = logger;
+        this.startTimeNanos = System.nanoTime();
+        this.message = message;
+        this.commandDocument = message.getCommandDocument(bsonOutput);
+        this.commandName = commandDocument.getFirstKey();
+    }
+
+    @Override
+    public void sendStartedEvent() {
+        if (loggingRequired()) {
+            logger.debug(
+                    format("Sending command '%s' with request id %d to database %s on connection [%s] to server %s",
+                            getTruncatedJsonCommand(), message.getId(),
+                            message.getNamespace().getDatabaseName(), description.getConnectionId(), description.getServerAddress()));
+        }
+
+        if (eventRequired()) {
+            BsonDocument commandDocumentForEvent = (securitySensitiveCommands.contains(commandName))
+                    ? new BsonDocument() : commandDocument;
+
+            sendCommandStartedEvent(message, message.getNamespace().getDatabaseName(),
+                    commandName, commandDocumentForEvent, description, commandListener);
+        }
+        // the buffer underlying the command document may be released after the started event, so set to null to ensure it's not used
+        // when sending the failed or succeeded event
+        commandDocument = null;
+    }
+
+    private String getTruncatedJsonCommand() {
+        StringWriter writer = new StringWriter();
+
+        BsonReader bsonReader = commandDocument.asBsonReader();
+        try {
+            JsonWriter jsonWriter = new JsonWriter(writer,
+                    JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).maxLength(MAX_COMMAND_DOCUMENT_LENGTH_TO_LOG).build());
+
+            jsonWriter.pipe(bsonReader);
+
+            if (jsonWriter.isTruncated()) {
+                writer.append(" ...");
+            }
+
+            return writer.toString();
+        } finally {
+            bsonReader.close();
+        }
+    }
+
+    @Override
+    public void sendFailedEvent(final Throwable t) {
+        Throwable commandEventException = t;
+        if (t instanceof MongoCommandException && (securitySensitiveCommands.contains(commandName))) {
+            commandEventException = new MongoCommandException(new BsonDocument(), description.getServerAddress());
+        }
+        long elapsedTimeNanos = System.nanoTime() - startTimeNanos;
+
+        if (loggingRequired()) {
+            logger.debug(
+                    format("Execution of command with request id %d failed to complete successfully in %s ms on connection [%s] "
+                                    + "to server %s",
+                            message.getId(), getElapsedTimeFormattedInMilliseconds(elapsedTimeNanos), description.getConnectionId(),
+                            description.getServerAddress()),
+                    commandEventException);
+        }
+
+        if (eventRequired()) {
+            sendCommandFailedEvent(message, commandName, description, elapsedTimeNanos, commandEventException, commandListener);
+        }
+    }
+
+    @Override
+    public void sendSucceededEvent(final ResponseBuffers responseBuffers) {
+        long elapsedTimeNanos = System.nanoTime() - startTimeNanos;
+
+        if (loggingRequired()) {
+            logger.debug(
+                    format("Execution of command with request id %d completed successfully in %s ms on connection [%s] to server %s",
+                            message.getId(), getElapsedTimeFormattedInMilliseconds(elapsedTimeNanos), description.getConnectionId(),
+                            description.getServerAddress()));
+        }
+
+        if (eventRequired()) {
+            BsonDocument responseDocumentForEvent = (securitySensitiveCommands.contains(commandName))
+                    ? new BsonDocument()
+                    : responseBuffers.getResponseDocument(message.getId(), new RawBsonDocumentCodec());
+            sendCommandSucceededEvent(message, commandName, responseDocumentForEvent, description,
+                    elapsedTimeNanos, commandListener);
+        }
+    }
+
+    @Override
+    public void sendSucceededEventForOneWayCommand() {
+        long elapsedTimeNanos = System.nanoTime() - startTimeNanos;
+
+        if (loggingRequired()) {
+            logger.debug(
+                    format("Execution of one-way command with request id %d completed successfully in %s ms on connection [%s] "
+                                    + "to server %s",
+                            message.getId(), getElapsedTimeFormattedInMilliseconds(elapsedTimeNanos), description.getConnectionId(),
+                            description.getServerAddress()));
+        }
+
+        if (eventRequired()) {
+            BsonDocument responseDocumentForEvent = new BsonDocument("ok", new BsonInt32(1));
+            sendCommandSucceededEvent(message, commandName, responseDocumentForEvent, description,
+                    elapsedTimeNanos, commandListener);
+        }
+    }
+
+    private boolean loggingRequired() {
+        return logger.isDebugEnabled();
+    }
+
+    private boolean eventRequired() {
+        return commandListener != null;
+    }
+
+    private String getElapsedTimeFormattedInMilliseconds(final long elapsedTimeNanos) {
+        return DecimalFormatHelper.format("#0.00", elapsedTimeNanos / 1000000.0);
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/MessageHeader.java b/driver-core/src/main/com/mongodb/internal/connection/MessageHeader.java
new file mode 100644
index 00000000000..52f0677f5c2
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/MessageHeader.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoInternalException;
+import org.bson.ByteBuf;
+
+// Contains the details of an OP_COMPRESSED reply from a MongoDB server.
+class MessageHeader {
+    /**
+     * The length of the standard message header in the MongoDB wire protocol.
+     */
+    public static final int MESSAGE_HEADER_LENGTH = 16;
+
+    private final int messageLength;
+    private final int requestId;
+    private final int responseTo;
+    private final int opCode;
+
+    MessageHeader(final ByteBuf header, final int maxMessageLength) {
+        messageLength = header.getInt();
+        requestId = header.getInt();
+        responseTo = header.getInt();
+        opCode = header.getInt();
+
+        if (messageLength > maxMessageLength) {
+            throw new MongoInternalException(String.format("The reply message length %d is greater than the maximum message length %d",
+                    messageLength, maxMessageLength));
+        }
+    }
+
+    /**
+     * Gets the total size of the message in bytes. This total includes the 4 bytes that holds the message length.
+     *
+     * @return the total message size, including all of the header
+     */
+    public int getMessageLength() {
+        return messageLength;
+    }
+
+    /**
+     * This is a client or database-generated identifier that uniquely identifies this message. Along with the {@code responseTo} field in
+     * responses, clients can use this to associate query responses with the originating query.
+     *
+     * @return the identifier for this message
+     */
+    public int getRequestId() {
+        return requestId;
+    }
+
+    /**
+     * Along with the requestID field in queries, clients can use this to associate query responses with the originating query.
+     *
+     * @return the request ID from the original request
+     */
+    public int getResponseTo() {
+        return responseTo;
+    }
+
+    /**
+     * Gets the opcode
+     *
+     * @return the opcode
+     */
+    public int getOpCode() {
+        return opCode;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/MessageSettings.java b/driver-core/src/main/com/mongodb/internal/connection/MessageSettings.java
similarity index 80%
rename from driver-core/src/main/com/mongodb/connection/MessageSettings.java
rename to driver-core/src/main/com/mongodb/internal/connection/MessageSettings.java
index 4b9ef0bec14..c7a6a6df5b2 100644
--- a/driver-core/src/main/com/mongodb/connection/MessageSettings.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/MessageSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.connection.ServerType;
 
 /**
  * The message settings
@@ -25,7 +26,7 @@
  * @since 3.0
  */
 @Immutable
-final class MessageSettings {
+public final class MessageSettings {
     private static final int DEFAULT_MAX_DOCUMENT_SIZE = 0x1000000;  // 16MB
     private static final int DEFAULT_MAX_MESSAGE_SIZE = 0x2000000;   // 32MB
     private static final int DEFAULT_MAX_BATCH_COUNT = 1000;
@@ -33,6 +34,8 @@ final class MessageSettings {
     private final int maxDocumentSize;
     private final int maxMessageSize;
     private final int maxBatchCount;
+    private final int maxWireVersion;
+    private final ServerType serverType;
 
     /**
      * Gets the builder
@@ -51,6 +54,8 @@ public static final class Builder {
         private int maxDocumentSize = DEFAULT_MAX_DOCUMENT_SIZE;
         private int maxMessageSize = DEFAULT_MAX_MESSAGE_SIZE;
         private int maxBatchCount = DEFAULT_MAX_BATCH_COUNT;
+        private int maxWireVersion;
+        private ServerType serverType;
 
         /**
          * Build it.
@@ -93,6 +98,16 @@ public Builder maxBatchCount(final int maxBatchCount) {
             this.maxBatchCount = maxBatchCount;
             return this;
         }
+
+        public Builder maxWireVersion(final int maxWireVersion) {
+            this.maxWireVersion = maxWireVersion;
+            return this;
+        }
+
+        public Builder serverType(final ServerType serverType) {
+            this.serverType = serverType;
+            return this;
+        }
     }
 
     /**
@@ -122,9 +137,19 @@ public int getMaxBatchCount() {
         return maxBatchCount;
     }
 
+    public int getMaxWireVersion() {
+        return maxWireVersion;
+    }
+
+    public ServerType getServerType() {
+        return serverType;
+    }
+
     private MessageSettings(final Builder builder) {
         this.maxDocumentSize = builder.maxDocumentSize;
         this.maxMessageSize = builder.maxMessageSize;
         this.maxBatchCount = builder.maxBatchCount;
+        this.maxWireVersion = builder.maxWireVersion;
+        this.serverType = builder.serverType;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/MongoCredentialWithCache.java b/driver-core/src/main/com/mongodb/internal/connection/MongoCredentialWithCache.java
new file mode 100644
index 00000000000..b46dfc7583a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/MongoCredentialWithCache.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.AuthenticationMechanism;
+import com.mongodb.MongoCredential;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MongoCredentialWithCache {
+    private final MongoCredential credential;
+    private final Cache cache;
+
+    public static List<MongoCredentialWithCache> wrapCredentialList(final List<MongoCredential> credentialList) {
+        ArrayList<MongoCredentialWithCache> credentialListWithCache = new ArrayList<MongoCredentialWithCache>();
+        for (MongoCredential credential : credentialList) {
+            credentialListWithCache.add(new MongoCredentialWithCache(credential));
+        }
+        return credentialListWithCache;
+    }
+
+    public MongoCredentialWithCache(final MongoCredential credential) {
+        this(credential, null);
+    }
+
+    public MongoCredentialWithCache(final MongoCredential credential, final Cache cache) {
+        this.credential = credential;
+        this.cache = cache != null ? cache : new Cache();
+    }
+
+    public MongoCredentialWithCache withMechanism(final AuthenticationMechanism mechanism) {
+        return new MongoCredentialWithCache(credential.withMechanism(mechanism), cache);
+    }
+
+    public AuthenticationMechanism getAuthenticationMechanism() {
+        return credential.getAuthenticationMechanism();
+    }
+
+    public MongoCredential getCredential() {
+        return credential;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T getFromCache(final Object key, final Class<T> clazz) {
+        return clazz.cast(cache.get(key));
+    }
+
+    public void putInCache(final Object key, final Object value) {
+        cache.set(key, value);
+    }
+
+
+    static class Cache {
+        private Object cacheKey;
+        private Object cacheValue;
+
+        synchronized Object get(final Object key) {
+            if (cacheKey != null && cacheKey.equals(key)) {
+                return cacheValue;
+            }
+            return null;
+        }
+
+        synchronized void set(final Object key, final Object value) {
+            cacheKey = key;
+            cacheValue = value;
+        }
+    }
+}
+
diff --git a/driver-core/src/main/com/mongodb/internal/connection/MongoWriteConcernWithResponseException.java b/driver-core/src/main/com/mongodb/internal/connection/MongoWriteConcernWithResponseException.java
new file mode 100644
index 00000000000..6ce8be7a0aa
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/MongoWriteConcernWithResponseException.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoException;
+
+public class MongoWriteConcernWithResponseException extends MongoException {
+    private static final long serialVersionUID = 1707360842648550287L;
+    private final MongoException cause;
+    private final Object response;
+
+    public MongoWriteConcernWithResponseException(final MongoException exception, final Object response) {
+        super(exception.getCode(), exception.getMessage(), exception);
+        this.cause = exception;
+        this.response = response;
+    }
+
+    @Override
+    public MongoException getCause() {
+        return cause;
+    }
+
+    public Object getResponse() {
+        return response;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/MultiServerCluster.java b/driver-core/src/main/com/mongodb/internal/connection/MultiServerCluster.java
new file mode 100644
index 00000000000..a0547cca868
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/MultiServerCluster.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+
+public final class MultiServerCluster extends AbstractMultiServerCluster {
+    public MultiServerCluster(final ClusterId clusterId, final ClusterSettings settings,
+                              final ClusterableServerFactory serverFactory) {
+        super(clusterId, settings, serverFactory);
+        isTrue("srvHost is null", settings.getSrvHost() == null);
+        initialize(settings.getHosts());
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/NativeAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/NativeAuthenticator.java
similarity index 75%
rename from driver-core/src/main/com/mongodb/connection/NativeAuthenticator.java
rename to driver-core/src/main/com/mongodb/internal/connection/NativeAuthenticator.java
index a9c56839a77..4aedba82d6e 100644
--- a/driver-core/src/main/com/mongodb/connection/NativeAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/NativeAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,53 +14,53 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoCommandException;
-import com.mongodb.MongoCredential;
 import com.mongodb.MongoSecurityException;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 
-import static com.mongodb.connection.CommandHelper.executeCommand;
-import static com.mongodb.connection.CommandHelper.executeCommandAsync;
 import static com.mongodb.internal.authentication.NativeAuthenticationHelper.getAuthCommand;
 import static com.mongodb.internal.authentication.NativeAuthenticationHelper.getNonceCommand;
+import static com.mongodb.internal.connection.CommandHelper.executeCommand;
+import static com.mongodb.internal.connection.CommandHelper.executeCommandAsync;
 
 class NativeAuthenticator extends Authenticator {
-    public NativeAuthenticator(final MongoCredential credential) {
+    NativeAuthenticator(final MongoCredentialWithCache credential) {
         super(credential);
     }
 
     @Override
     public void authenticate(final InternalConnection connection, final ConnectionDescription connectionDescription) {
         try {
-            BsonDocument nonceResponse = executeCommand(getCredential().getSource(),
+            BsonDocument nonceResponse = executeCommand(getMongoCredential().getSource(),
                                                          getNonceCommand(),
                                                          connection);
 
-            BsonDocument authCommand = getAuthCommand(getCredential().getUserName(),
-                                                      getCredential().getPassword(),
+            BsonDocument authCommand = getAuthCommand(getUserNameNonNull(),
+                                                      getPasswordNonNull(),
                                                       ((BsonString) nonceResponse.get("nonce")).getValue());
-            executeCommand(getCredential().getSource(), authCommand, connection);
+            executeCommand(getMongoCredential().getSource(), authCommand, connection);
         } catch (MongoCommandException e) {
-            throw new MongoSecurityException(getCredential(), "Exception authenticating", e);
+            throw new MongoSecurityException(getMongoCredential(), "Exception authenticating", e);
         }
     }
 
     @Override
     void authenticateAsync(final InternalConnection connection, final ConnectionDescription connectionDescription,
                            final SingleResultCallback<Void> callback) {
-        executeCommandAsync(getCredential().getSource(), getNonceCommand(), connection,
+        executeCommandAsync(getMongoCredential().getSource(), getNonceCommand(), connection,
                             new SingleResultCallback<BsonDocument>() {
                                 @Override
                                 public void onResult(final BsonDocument nonceResult, final Throwable t) {
                                     if (t != null) {
                                         callback.onResult(null, translateThrowable(t));
                                     } else {
-                                        executeCommandAsync(getCredential().getSource(),
-                                                            getAuthCommand(getCredential().getUserName(), getCredential().getPassword(),
+                                        executeCommandAsync(getMongoCredential().getSource(),
+                                                            getAuthCommand(getUserNameNonNull(), getPasswordNonNull(),
                                                                            ((BsonString) nonceResult.get("nonce")).getValue()),
                                                             connection,
                                                             new SingleResultCallback<BsonDocument>() {
@@ -80,7 +80,7 @@ public void onResult(final BsonDocument result, final Throwable t) {
 
     private Throwable translateThrowable(final Throwable t) {
         if (t instanceof MongoCommandException) {
-            return new MongoSecurityException(getCredential(), "Exception authenticating", t);
+            return new MongoSecurityException(getMongoCredential(), "Exception authenticating", t);
         } else {
             return t;
         }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/NoOpCommandEventSender.java b/driver-core/src/main/com/mongodb/internal/connection/NoOpCommandEventSender.java
new file mode 100644
index 00000000000..4a9864ca5a8
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/NoOpCommandEventSender.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+class NoOpCommandEventSender implements CommandEventSender {
+    @Override
+    public void sendStartedEvent() {
+    }
+
+    @Override
+    public void sendFailedEvent(final Throwable t) {
+    }
+
+    @Override
+    public void sendSucceededEvent(final ResponseBuffers responseBuffers) {
+    }
+
+    @Override
+    public void sendSucceededEventForOneWayCommand() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/NoOpSessionContext.java b/driver-core/src/main/com/mongodb/internal/connection/NoOpSessionContext.java
new file mode 100644
index 00000000000..e9023f73b94
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/NoOpSessionContext.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+/**
+ * A SessionContext implementation that does nothing and reports that it has no session.
+ *
+ * <p>This class should not be considered a part of the public API.</p>
+ */
+public class NoOpSessionContext implements SessionContext {
+
+    /**
+     * A singleton instance of a NoOpSessionContext
+     */
+    public static final NoOpSessionContext INSTANCE = new NoOpSessionContext();
+
+    @Override
+    public boolean hasSession() {
+        return false;
+    }
+
+    @Override
+    public boolean isImplicitSession() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public BsonDocument getSessionId() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isCausallyConsistent() {
+        return false;
+    }
+
+    @Override
+    public long getTransactionNumber() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long advanceTransactionNumber() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean notifyMessageSent() {
+        return false;
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return null;
+    }
+
+    @Override
+    public void advanceOperationTime(final BsonTimestamp operationTime) {
+    }
+
+    @Override
+    public BsonDocument getClusterTime() {
+        return null;
+    }
+
+    @Override
+    public void advanceClusterTime(final BsonDocument clusterTime) {
+    }
+
+    @Override
+    public boolean hasActiveTransaction() {
+        return false;
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return ReadConcern.DEFAULT;
+    }
+
+    @Override
+    public void setRecoveryToken(final BsonDocument recoveryToken) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void unpinServerAddress() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void markSessionDirty() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isSessionMarkedDirty() {
+        return false;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/OpCode.java b/driver-core/src/main/com/mongodb/internal/connection/OpCode.java
new file mode 100644
index 00000000000..74f271d9c39
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/OpCode.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+enum OpCode {
+    OP_REPLY(1),
+    OP_UPDATE(2001),
+    OP_INSERT(2002),
+    OP_QUERY(2004),
+    OP_GETMORE(2005),
+    OP_DELETE(2006),
+    OP_KILL_CURSORS(2007),
+    OP_COMPRESSED(2012),
+    OP_MSG(2013);
+
+    OpCode(final int value) {
+        this.value = value;
+    }
+
+    private final int value;
+
+    public int getValue() {
+        return value;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/PlainAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/PlainAuthenticator.java
similarity index 93%
rename from driver-core/src/main/com/mongodb/connection/PlainAuthenticator.java
rename to driver-core/src/main/com/mongodb/internal/connection/PlainAuthenticator.java
index a55c4e25e37..5a342acde54 100644
--- a/driver-core/src/main/com/mongodb/connection/PlainAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/PlainAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoSecurityException;
@@ -36,7 +36,7 @@
 class PlainAuthenticator extends SaslAuthenticator {
     private static final String DEFAULT_PROTOCOL = "mongodb";
 
-    PlainAuthenticator(final MongoCredential credential) {
+    PlainAuthenticator(final MongoCredentialWithCache credential) {
         super(credential);
     }
 
@@ -47,7 +47,7 @@ public String getMechanismName() {
 
     @Override
     protected SaslClient createSaslClient(final ServerAddress serverAddress) {
-        final MongoCredential credential = getCredential();
+        final MongoCredential credential = getMongoCredential();
         isTrue("mechanism is PLAIN", credential.getAuthenticationMechanism() == PLAIN);
         try {
             return Sasl.createSaslClient(new String[]{PLAIN.getMechanismName()},
diff --git a/driver-core/src/main/com/mongodb/internal/connection/Pool.java b/driver-core/src/main/com/mongodb/internal/connection/Pool.java
index 32319d9ddfc..2865fc9463c 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/Pool.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/Pool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/internal/connection/PowerOfTwoBufferPool.java b/driver-core/src/main/com/mongodb/internal/connection/PowerOfTwoBufferPool.java
index a6ef143da8c..4fa11269f55 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/PowerOfTwoBufferPool.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/PowerOfTwoBufferPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,11 @@
 package com.mongodb.internal.connection;
 
 import com.mongodb.connection.BufferProvider;
+import com.mongodb.internal.connection.ConcurrentPool.Prune;
 import org.bson.ByteBuf;
 import org.bson.ByteBufNIO;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.HashMap;
@@ -62,8 +64,8 @@ public void close(final ByteBuffer byteBuffer) {
                                                                              }
 
                                                                              @Override
-                                                                             public boolean shouldPrune(final ByteBuffer byteBuffer) {
-                                                                                 return false;
+                                                                             public Prune shouldPrune(final ByteBuffer byteBuffer) {
+                                                                                 return Prune.STOP;
                                                                              }
                                                                          }));
             powerOfTwo = powerOfTwo << 1;
@@ -75,8 +77,8 @@ public ByteBuf getBuffer(final int size) {
         ConcurrentPool<ByteBuffer> pool = powerOfTwoToPoolMap.get(log2(roundUpToNextHighestPowerOfTwo(size)));
         ByteBuffer byteBuffer = (pool == null) ? createNew(size) : pool.get();
 
-        byteBuffer.clear();
-        byteBuffer.limit(size);
+        ((Buffer) byteBuffer).clear();
+        ((Buffer) byteBuffer).limit(size);
         return new PooledByteBufNIO(byteBuffer);
     }
 
@@ -111,7 +113,7 @@ static int roundUpToNextHighestPowerOfTwo(final int size) {
 
     private class PooledByteBufNIO extends ByteBufNIO {
 
-        public PooledByteBufNIO(final ByteBuffer buf) {
+        PooledByteBufNIO(final ByteBuffer buf) {
             super(buf);
         }
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ProtocolExecutor.java b/driver-core/src/main/com/mongodb/internal/connection/ProtocolExecutor.java
new file mode 100644
index 00000000000..18757662770
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ProtocolExecutor.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.session.SessionContext;
+
+public interface ProtocolExecutor {
+    <T> T execute(LegacyProtocol<T> protocol, InternalConnection connection);
+
+    <T> void executeAsync(LegacyProtocol<T> protocol, InternalConnection connection, SingleResultCallback<T> callback);
+
+    <T> T execute(CommandProtocol<T> protocol, InternalConnection connection, SessionContext sessionContext);
+
+    <T> void executeAsync(CommandProtocol<T> protocol, InternalConnection connection, SessionContext sessionContext,
+                          SingleResultCallback<T> callback);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java b/driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java
new file mode 100644
index 00000000000..5fd0124d8b0
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.DuplicateKeyException;
+import com.mongodb.ErrorCategory;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoExecutionTimeoutException;
+import com.mongodb.MongoNodeIsRecoveringException;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.MongoQueryException;
+import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcernException;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.CommandFailedEvent;
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.event.CommandSucceededEvent;
+import org.bson.BsonBinaryReader;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonReader;
+import org.bson.BsonString;
+import org.bson.BsonTimestamp;
+import org.bson.BsonType;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.io.BsonOutput;
+import org.bson.io.ByteBufferBsonInput;
+
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static org.bson.codecs.BsonValueCodecProvider.getClassForBsonType;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+/**
+ * This class is NOT part of the public API. It may change at any time without notification.
+ */
+public final class ProtocolHelper {
+    private static final Logger PROTOCOL_EVENT_LOGGER = Loggers.getLogger("protocol.event");
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+
+    private static WriteConcernResult createWriteResult(final BsonDocument result) {
+        BsonBoolean updatedExisting = result.getBoolean("updatedExisting", BsonBoolean.FALSE);
+
+        return WriteConcernResult.acknowledged(result.getNumber("n", new BsonInt32(0)).intValue(),
+                                               updatedExisting.getValue(), result.get("upserted"));
+    }
+
+
+    static boolean isCommandOk(final BsonDocument response) {
+        BsonValue okValue = response.get("ok");
+        return isCommandOk(okValue);
+    }
+
+    static boolean isCommandOk(final BsonReader bsonReader) {
+        return isCommandOk(getField(bsonReader, "ok"));
+    }
+
+    static boolean isCommandOk(final ResponseBuffers responseBuffers) {
+        try {
+            return isCommandOk(createBsonReader(responseBuffers));
+        } finally {
+            responseBuffers.reset();
+        }
+    }
+
+    static MongoException createSpecialWriteConcernException(final ResponseBuffers responseBuffers, final ServerAddress serverAddress) {
+        BsonValue writeConcernError = getField(createBsonReader(responseBuffers), "writeConcernError");
+        if (writeConcernError == null) {
+            return null;
+        } else {
+            return createSpecialException(writeConcernError.asDocument(), serverAddress, "errmsg");
+        }
+    }
+
+    static BsonTimestamp getOperationTime(final ResponseBuffers responseBuffers) {
+        try {
+            BsonValue operationTime = getField(createBsonReader(responseBuffers), "operationTime");
+            if (operationTime == null) {
+                return null;
+            }
+            return operationTime.asTimestamp();
+        } finally {
+            responseBuffers.reset();
+        }
+    }
+
+    static BsonDocument getClusterTime(final ResponseBuffers responseBuffers) {
+        return getFieldDocument(responseBuffers, "$clusterTime");
+    }
+
+    static BsonDocument getClusterTime(final BsonDocument response) {
+        BsonValue clusterTime = response.get("$clusterTime");
+        if (clusterTime == null) {
+            return null;
+        }
+        return clusterTime.asDocument();
+    }
+
+    static BsonDocument getRecoveryToken(final ResponseBuffers responseBuffers) {
+        return getFieldDocument(responseBuffers, "recoveryToken");
+    }
+
+    private static BsonDocument getFieldDocument(final ResponseBuffers responseBuffers, final String fieldName) {
+        try {
+            BsonValue fieldValue = getField(createBsonReader(responseBuffers), fieldName);
+            if (fieldValue == null) {
+                return null;
+            }
+            return fieldValue.asDocument();
+        } finally {
+            responseBuffers.reset();
+        }
+    }
+
+    private static BsonBinaryReader createBsonReader(final ResponseBuffers responseBuffers) {
+        return new BsonBinaryReader(new ByteBufferBsonInput(responseBuffers.getBodyByteBuffer()));
+    }
+
+
+    private static BsonValue getField(final BsonReader bsonReader, final String fieldName) {
+        bsonReader.readStartDocument();
+        while (bsonReader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+            if (bsonReader.readName().equals(fieldName)) {
+                return REGISTRY.get(getClassForBsonType(bsonReader.getCurrentBsonType())).decode(bsonReader,
+                        DecoderContext.builder().build());
+            }
+            bsonReader.skipValue();
+        }
+        bsonReader.readEndDocument();
+        return null;
+    }
+
+    private static boolean isCommandOk(final BsonValue okValue) {
+        if (okValue == null) {
+            return false;
+        } else if (okValue.isBoolean()) {
+            return okValue.asBoolean().getValue();
+        } else if (okValue.isNumber()) {
+            return okValue.asNumber().intValue() == 1;
+        } else {
+            return false;
+        }
+    }
+
+    static MongoException getCommandFailureException(final BsonDocument response, final ServerAddress serverAddress) {
+        MongoException specialException = createSpecialException(response, serverAddress, "errmsg");
+        if (specialException != null) {
+            return specialException;
+        }
+        return new MongoCommandException(response, serverAddress);
+    }
+
+    static int getErrorCode(final BsonDocument response) {
+        return (response.getNumber("code", new BsonInt32(-1)).intValue());
+    }
+
+    static String getErrorMessage(final BsonDocument response, final String errorMessageFieldName) {
+        return response.getString(errorMessageFieldName, new BsonString("")).getValue();
+    }
+
+    static MongoException getQueryFailureException(final BsonDocument errorDocument, final ServerAddress serverAddress) {
+        MongoException specialException = createSpecialException(errorDocument, serverAddress, "$err");
+        if (specialException != null) {
+            return specialException;
+        }
+        return new MongoQueryException(serverAddress, getErrorCode(errorDocument), getErrorMessage(errorDocument, "$err"));
+    }
+
+    static MessageSettings getMessageSettings(final ConnectionDescription connectionDescription) {
+        return MessageSettings.builder()
+                .maxDocumentSize(connectionDescription.getMaxDocumentSize())
+                .maxMessageSize(connectionDescription.getMaxMessageSize())
+                .maxBatchCount(connectionDescription.getMaxBatchCount())
+                .maxWireVersion(connectionDescription.getMaxWireVersion())
+                .serverType(connectionDescription.getServerType())
+                .build();
+    }
+
+    static void encodeMessage(final RequestMessage message, final BsonOutput bsonOutput) {
+        try {
+            message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
+        } catch (RuntimeException e) {
+            bsonOutput.close();
+            throw e;
+        } catch (Error e) {
+            bsonOutput.close();
+            throw e;
+        }
+    }
+
+    static RequestMessage.EncodingMetadata encodeMessageWithMetadata(final RequestMessage message, final BsonOutput bsonOutput) {
+        try {
+            message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
+            return message.getEncodingMetadata();
+        } catch (RuntimeException e) {
+            bsonOutput.close();
+            throw e;
+        } catch (Error e) {
+            bsonOutput.close();
+            throw e;
+        }
+    }
+
+    private static final List<Integer> NOT_MASTER_CODES = asList(10107, 13435);
+    private static final List<Integer> RECOVERING_CODES = asList(11600, 11602, 13436, 189, 91);
+    public static MongoException createSpecialException(final BsonDocument response, final ServerAddress serverAddress,
+                                                        final String errorMessageFieldName) {
+        if (response == null) {
+            return null;
+        }
+        int errorCode = getErrorCode(response);
+        String errorMessage = getErrorMessage(response, errorMessageFieldName);
+        if (ErrorCategory.fromErrorCode(errorCode) == ErrorCategory.EXECUTION_TIMEOUT) {
+            return new MongoExecutionTimeoutException(errorCode, errorMessage);
+        } else if (errorMessage.contains("not master or secondary") || errorMessage.contains("node is recovering")
+                || RECOVERING_CODES.contains(errorCode)) {
+            return new MongoNodeIsRecoveringException(response, serverAddress);
+        } else if (errorMessage.contains("not master") || NOT_MASTER_CODES.contains(errorCode)) {
+            return new MongoNotPrimaryException(response, serverAddress);
+        } else if (response.containsKey("writeConcernError")) {
+            return createSpecialException(response.getDocument("writeConcernError"), serverAddress, "errmsg");
+        } else {
+            return null;
+        }
+    }
+
+
+
+    private static boolean hasWriteError(final BsonDocument response) {
+        String err = WriteConcernException.extractErrorMessage(response);
+        return err != null && err.length() > 0;
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void throwWriteException(final BsonDocument result, final ServerAddress serverAddress) {
+        MongoException specialException = createSpecialException(result, serverAddress, "err");
+        if (specialException != null) {
+            throw specialException;
+        }
+        int code = WriteConcernException.extractErrorCode(result);
+        if (ErrorCategory.fromErrorCode(code) == ErrorCategory.DUPLICATE_KEY) {
+            throw new DuplicateKeyException(result, serverAddress, createWriteResult(result));
+        } else {
+            throw new WriteConcernException(result, serverAddress, createWriteResult(result));
+        }
+    }
+
+    static void sendCommandStartedEvent(final RequestMessage message, final String databaseName, final String commandName,
+                                        final BsonDocument command, final ConnectionDescription connectionDescription,
+                                        final CommandListener commandListener) {
+        try {
+            commandListener.commandStarted(new CommandStartedEvent(message.getId(), connectionDescription,
+                                                                   databaseName, commandName, command));
+        } catch (Exception e) {
+            if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {
+                PROTOCOL_EVENT_LOGGER.warn(format("Exception thrown raising command started event to listener %s", commandListener), e);
+            }
+        }
+    }
+
+    static void sendCommandSucceededEvent(final RequestMessage message, final String commandName, final BsonDocument response,
+                                          final ConnectionDescription connectionDescription, final long elapsedTimeNanos,
+                                          final CommandListener commandListener) {
+        try {
+            commandListener.commandSucceeded(new CommandSucceededEvent(message.getId(), connectionDescription, commandName, response,
+                    elapsedTimeNanos));
+        } catch (Exception e) {
+            if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {
+                PROTOCOL_EVENT_LOGGER.warn(format("Exception thrown raising command succeeded event to listener %s", commandListener), e);
+            }
+        }
+    }
+
+    static void sendCommandFailedEvent(final RequestMessage message, final String commandName,
+                                       final ConnectionDescription connectionDescription, final long elapsedTimeNanos,
+                                       final Throwable throwable, final CommandListener commandListener) {
+        try {
+            commandListener.commandFailed(new CommandFailedEvent(message.getId(), connectionDescription, commandName, elapsedTimeNanos,
+                    throwable));
+        } catch (Exception e) {
+            if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {
+                PROTOCOL_EVENT_LOGGER.warn(format("Exception thrown raising command failed event to listener %s", commandListener), e);
+            }
+        }
+    }
+
+
+    private ProtocolHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/QueryMessage.java b/driver-core/src/main/com/mongodb/internal/connection/QueryMessage.java
new file mode 100644
index 00000000000..c3ed9f20f17
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/QueryMessage.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import org.bson.BsonDocument;
+import org.bson.io.BsonOutput;
+
+/**
+ * An OP_QUERY message for an actual query (not a command).
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
+ */
+class QueryMessage extends BaseQueryMessage {
+    private final BsonDocument queryDocument;
+    private final BsonDocument fields;
+
+    QueryMessage(final String collectionName, final int skip, final int numberToReturn, final BsonDocument queryDocument,
+                 final BsonDocument fields, final MessageSettings settings) {
+        super(collectionName, skip, numberToReturn, settings);
+        this.queryDocument = queryDocument;
+        this.fields = fields;
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput) {
+        writeQueryPrologue(bsonOutput);
+        int firstDocumentStartPosition = bsonOutput.getPosition();
+        addDocument(queryDocument, bsonOutput, new NoOpFieldNameValidator());
+        if (fields != null) {
+            addDocument(fields, bsonOutput, new NoOpFieldNameValidator());
+        }
+        return new EncodingMetadata(firstDocumentStartPosition);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/QueryProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/QueryProtocol.java
similarity index 88%
rename from driver-core/src/main/com/mongodb/connection/QueryProtocol.java
rename to driver-core/src/main/com/mongodb/internal/connection/QueryProtocol.java
index 356c998bdbd..87df0a6cff4 100644
--- a/driver-core/src/main/com/mongodb/connection/QueryProtocol.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/QueryProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.QueryResult;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
 import com.mongodb.event.CommandListener;
@@ -37,12 +40,12 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.mongodb.connection.ProtocolHelper.encodeMessageWithMetadata;
-import static com.mongodb.connection.ProtocolHelper.getMessageSettings;
-import static com.mongodb.connection.ProtocolHelper.getQueryFailureException;
-import static com.mongodb.connection.ProtocolHelper.sendCommandFailedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandStartedEvent;
-import static com.mongodb.connection.ProtocolHelper.sendCommandSucceededEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.encodeMessageWithMetadata;
+import static com.mongodb.internal.connection.ProtocolHelper.getMessageSettings;
+import static com.mongodb.internal.connection.ProtocolHelper.getQueryFailureException;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandFailedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandStartedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandSucceededEvent;
 import static java.lang.String.format;
 
 /**
@@ -51,7 +54,7 @@
  * @param <T> the type of document to decode query results to
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
  */
-class QueryProtocol<T> implements Protocol<QueryResult<T>> {
+class QueryProtocol<T> implements LegacyProtocol<QueryResult<T>> {
 
     public static final Logger LOGGER = Loggers.getLogger("protocol.query");
     private static final String FIND_COMMAND_NAME = "find";
@@ -73,19 +76,8 @@ class QueryProtocol<T> implements Protocol<QueryResult<T>> {
     private boolean partial;
     private CommandListener commandListener;
 
-    /**
-     * Construct an instance.
-     *
-     * @param namespace      the namespace
-     * @param skip           the number of documents to skip
-     * @param numberToReturn the number to return
-     * @param queryDocument  the query document
-     * @param fields         the fields to return in the result documents
-     * @param resultDecoder  the decoder for the result documents
-     */
-    public QueryProtocol(final MongoNamespace namespace, final int skip,
-                         final int numberToReturn, final BsonDocument queryDocument,
-                         final BsonDocument fields, final Decoder<T> resultDecoder) {
+    QueryProtocol(final MongoNamespace namespace, final int skip, final int numberToReturn, final BsonDocument queryDocument,
+                  final BsonDocument fields, final Decoder<T> resultDecoder) {
         this.namespace = namespace;
         this.skip = skip;
         this.withLimitAndBatchSize = false;
@@ -97,8 +89,8 @@ public QueryProtocol(final MongoNamespace namespace, final int skip,
         this.resultDecoder = resultDecoder;
     }
 
-    public QueryProtocol(final MongoNamespace namespace, final int skip, final int limit, final int batchSize,
-                         final BsonDocument queryDocument, final BsonDocument fields, final Decoder<T> resultDecoder) {
+    QueryProtocol(final MongoNamespace namespace, final int skip, final int limit, final int batchSize,
+                  final BsonDocument queryDocument, final BsonDocument fields, final Decoder<T> resultDecoder) {
         this.namespace = namespace;
         this.skip = skip;
         this.withLimitAndBatchSize = true;
@@ -279,8 +271,8 @@ public QueryResult<T> execute(final InternalConnection connection) {
             ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
             try {
                 message = createQueryMessage(connection.getDescription());
-                RequestMessage.EncodingMetadata metadata = message.encodeWithMetadata(bsonOutput);
-                isExplain = sendQueryStartedEvent(connection, message, bsonOutput, metadata);
+                message.encode(bsonOutput, NoOpSessionContext.INSTANCE);
+                isExplain = sendQueryStartedEvent(connection, message, bsonOutput, message.getEncodingMetadata());
                 connection.sendMessage(bsonOutput.getByteBuffers(), message.getId());
             } finally {
                 bsonOutput.close();
@@ -295,21 +287,22 @@ public QueryResult<T> execute(final InternalConnection connection) {
                     throw getQueryFailureException(errorDocument, connection.getDescription().getServerAddress());
                 }
                 ReplyMessage<T> replyMessage = new ReplyMessage<T>(responseBuffers, resultDecoder, message.getId());
+                QueryResult<T> result = new QueryResult<T>(namespace, replyMessage.getDocuments(),
+                        replyMessage.getReplyHeader().getCursorId(), connection.getDescription().getServerAddress());
 
-                QueryResult<T> queryResult = new QueryResult<T>(namespace, replyMessage, connection.getDescription().getServerAddress());
-
-                sendQuerySucceededEvent(connection.getDescription(), startTimeNanos, message, isExplain, responseBuffers, queryResult);
+                sendQuerySucceededEvent(connection.getDescription(), startTimeNanos, message, isExplain, responseBuffers, result);
 
                 LOGGER.debug("Query completed");
 
-                return queryResult;
+                return result;
             } finally {
                 responseBuffers.close();
             }
 
         } catch (RuntimeException e) {
             if (commandListener != null) {
-                sendCommandFailedEvent(message, FIND_COMMAND_NAME, connection.getDescription(), startTimeNanos, e, commandListener);
+                sendCommandFailedEvent(message, FIND_COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, e,
+                        commandListener);
             }
             throw e;
         }
@@ -337,8 +330,9 @@ public void executeAsync(final InternalConnection connection, final SingleResult
                                                 getCommandName(isExplainEvent), startTimeNanos, commandListener, callback,
                                                 receiveCallback));
         } catch (Throwable t) {
-            if (commandListener != null && sentStartedEvent) {
-                sendCommandFailedEvent(message, FIND_COMMAND_NAME, connection.getDescription(), startTimeNanos, t, commandListener);
+            if (commandListener != null) {
+                sendCommandFailedEvent(message, FIND_COMMAND_NAME, connection.getDescription(), System.nanoTime() - startTimeNanos, t,
+                        commandListener);
             }
             callback.onResult(null, t);
         }
@@ -369,7 +363,7 @@ private void sendQuerySucceededEvent(final ConnectionDescription connectionDescr
         if (commandListener != null) {
             BsonDocument response = asFindCommandResponseDocument(responseBuffers, queryResult, isExplainEvent);
             sendCommandSucceededEvent(message, getCommandName(isExplainEvent), response, connectionDescription,
-                                      startTimeNanos, commandListener);
+                    System.nanoTime() - startTimeNanos, commandListener);
         }
     }
 
@@ -423,7 +417,7 @@ private BsonDocument asFindCommandDocument(final ByteBufferBsonOutput bsonOutput
 
         boolean isExplain = false;
 
-        List<ByteBufBsonDocument> documents = ByteBufBsonDocument.create(bsonOutput, firstDocumentPosition);
+        List<ByteBufBsonDocument> documents = ByteBufBsonDocument.createList(bsonOutput, firstDocumentPosition);
 
         ByteBufBsonDocument rawQueryDocument = documents.get(0);
         for (Map.Entry<String, BsonValue> cur : rawQueryDocument.entrySet()) {
@@ -483,8 +477,8 @@ private BsonDocument asFindCommandResponseDocument(final ResponseBuffers respons
                                                        final boolean isExplain) {
         List<ByteBufBsonDocument> rawResultDocuments = Collections.emptyList();
         if (responseBuffers.getReplyHeader().getNumberReturned() > 0) {
-            responseBuffers.getBodyByteBuffer().position(0);
-            rawResultDocuments = ByteBufBsonDocument.create(responseBuffers);
+            responseBuffers.reset();
+            rawResultDocuments = ByteBufBsonDocument.createList(responseBuffers);
         }
 
         if (isExplain) {
@@ -510,9 +504,8 @@ class QueryResultCallback extends ResponseCallback {
         private final QueryMessage message;
         private final boolean isExplainEvent;
 
-        public QueryResultCallback(final SingleResultCallback<QueryResult<T>> callback, final int requestId, final long startTimeNanos,
-                                   final QueryMessage message, final boolean isExplainEvent,
-                                   final ConnectionDescription connectionDescription) {
+        QueryResultCallback(final SingleResultCallback<QueryResult<T>> callback, final int requestId, final long startTimeNanos,
+                            final QueryMessage message, final boolean isExplainEvent, final ConnectionDescription connectionDescription) {
             super(requestId, connectionDescription.getServerAddress());
             this.callback = callback;
             this.startTimeNanos = startTimeNanos;
@@ -531,21 +524,22 @@ protected void callCallback(final ResponseBuffers responseBuffers, final Throwab
                                                                                 getRequestId()).getDocuments().get(0);
                     throw getQueryFailureException(errorDocument, getServerAddress());
                 } else {
-                    QueryResult<T> result = new QueryResult<T>(namespace, new ReplyMessage<T>(responseBuffers, resultDecoder,
-                                                               getRequestId()), getServerAddress());
+                    ReplyMessage<T> replyMessage = new ReplyMessage<T>(responseBuffers, resultDecoder, getRequestId());
+                    QueryResult<T> result = new QueryResult<T>(namespace, replyMessage.getDocuments(),
+                            replyMessage.getReplyHeader().getCursorId(), getServerAddress());
 
                     sendQuerySucceededEvent(connectionDescription, startTimeNanos, message, isExplainEvent, responseBuffers, result);
 
                     if (LOGGER.isDebugEnabled()) {
                         LOGGER.debug(format("Query results received %s documents with cursor %s",
-                                            result.getResults().size(),
-                                            result.getCursor()));
+                                result.getResults().size(),
+                                result.getCursor()));
                     }
                     callback.onResult(result, null);
                 }
             } catch (Throwable t) {
                 if (commandListener != null) {
-                    sendCommandFailedEvent(message, FIND_COMMAND_NAME, connectionDescription, startTimeNanos, t,
+                    sendCommandFailedEvent(message, FIND_COMMAND_NAME, connectionDescription, System.nanoTime() - startTimeNanos, t,
                             commandListener);
                 }
                 callback.onResult(null, t);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ReadConcernAwareNoOpSessionContext.java b/driver-core/src/main/com/mongodb/internal/connection/ReadConcernAwareNoOpSessionContext.java
new file mode 100644
index 00000000000..0136324c55d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ReadConcernAwareNoOpSessionContext.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ReadConcern;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * A SessionContext implementation that does nothing and reports that it has no session, but does track read concern.
+ *
+ * <p>This class should not be considered a part of the public API.</p>
+ */
+public final class ReadConcernAwareNoOpSessionContext extends NoOpSessionContext {
+
+    private final ReadConcern readConcern;
+
+    /**
+     * Construct an instance.
+     *
+     * @param readConcern the read concern
+     */
+    public ReadConcernAwareNoOpSessionContext(final ReadConcern readConcern) {
+        this.readConcern = notNull("readConcern", readConcern);
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ReadConcernHelper.java b/driver-core/src/main/com/mongodb/internal/connection/ReadConcernHelper.java
new file mode 100644
index 00000000000..21501135639
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ReadConcernHelper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+public final class ReadConcernHelper {
+
+    public static BsonDocument getReadConcernDocument(final SessionContext sessionContext) {
+        notNull("sessionContext", sessionContext);
+
+        BsonDocument readConcernDocument = new BsonDocument();
+
+        ReadConcernLevel level = sessionContext.getReadConcern().getLevel();
+        if (level != null) {
+            readConcernDocument.append("level", new BsonString(level.getValue()));
+        }
+
+        if (shouldAddAfterClusterTime(sessionContext)) {
+            readConcernDocument.append("afterClusterTime", sessionContext.getOperationTime());
+        }
+        return readConcernDocument;
+    }
+
+    private static boolean shouldAddAfterClusterTime(final SessionContext sessionContext) {
+        return sessionContext.isCausallyConsistent() && sessionContext.getOperationTime() != null;
+    }
+
+    private ReadConcernHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ReplyHeader.java b/driver-core/src/main/com/mongodb/internal/connection/ReplyHeader.java
new file mode 100644
index 00000000000..5b2053f9385
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ReplyHeader.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoInternalException;
+import org.bson.ByteBuf;
+
+import static com.mongodb.internal.connection.MessageHeader.MESSAGE_HEADER_LENGTH;
+import static com.mongodb.internal.connection.OpCode.OP_MSG;
+import static com.mongodb.internal.connection.OpCode.OP_REPLY;
+import static java.lang.String.format;
+
+/**
+ * Contains the details of a reply from a MongoDB server.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#database-response-messages Database Response Messages
+ */
+public final class ReplyHeader {
+    /**
+     * The length of the OP_REPLY header in the MongoDB wire protocol.
+     */
+    public static final int REPLY_HEADER_LENGTH = 20;
+
+    /**
+     * The length of the OP_REPLY header plus the length of the standard message header
+     */
+    public static final int TOTAL_REPLY_HEADER_LENGTH = REPLY_HEADER_LENGTH + MESSAGE_HEADER_LENGTH;
+
+    private static final int CURSOR_NOT_FOUND_RESPONSE_FLAG = 1;
+    private static final int QUERY_FAILURE_RESPONSE_FLAG = 2;
+
+    private final int messageLength;
+    private final int requestId;
+    private final int responseTo;
+    private final int responseFlags;
+    private final long cursorId;
+    private final int startingFrom;
+    private final int numberReturned;
+    private final int opMsgFlagBits;
+
+    ReplyHeader(final ByteBuf header, final MessageHeader messageHeader) {
+        this(messageHeader.getMessageLength(), messageHeader.getOpCode(), messageHeader, header);
+    }
+
+    ReplyHeader(final ByteBuf header, final CompressedHeader compressedHeader) {
+        this(compressedHeader.getUncompressedSize() + MESSAGE_HEADER_LENGTH, compressedHeader.getOriginalOpcode(),
+                compressedHeader.getMessageHeader(), header);
+    }
+
+    private ReplyHeader(final int messageLength, final int opCode, final MessageHeader messageHeader, final ByteBuf header) {
+        this.messageLength = messageLength;
+        this.requestId = messageHeader.getRequestId();
+        this.responseTo = messageHeader.getResponseTo();
+        if (opCode == OP_MSG.getValue()) {
+            responseFlags = 0;
+            cursorId = 0;
+            startingFrom = 0;
+            numberReturned = 1;
+
+            opMsgFlagBits = header.getInt();
+            header.get();  // ignore payload type
+        } else if (opCode == OP_REPLY.getValue()) {
+            if (messageLength < TOTAL_REPLY_HEADER_LENGTH) {
+                throw new MongoInternalException(format("The reply message length %d is less than the mimimum message length %d",
+                        messageLength, TOTAL_REPLY_HEADER_LENGTH));
+            }
+
+            responseFlags = header.getInt();
+            cursorId = header.getLong();
+            startingFrom = header.getInt();
+            numberReturned = header.getInt();
+            opMsgFlagBits = 0;
+
+            if (numberReturned < 0) {
+                throw new MongoInternalException(format("The reply message number of returned documents, %d, is less than 0",
+                        numberReturned));
+            }
+        } else {
+            throw new MongoInternalException(format("Unexpected reply message opCode %d", opCode));
+        }
+    }
+
+
+    /**
+     * Gets the total size of the message in bytes. This total includes the 4 bytes that holds the message length.
+     *
+     * @return the total message size, including all of the header
+     */
+    public int getMessageLength() {
+        return messageLength;
+    }
+
+    /**
+     * This is a client or database-generated identifier that uniquely identifies this message. Along with the {@code responseTo} field in
+     * responses, clients can use this to associate query responses with the originating query.
+     *
+     * @return the identifier for this message
+     */
+    public int getRequestId() {
+        return requestId;
+    }
+
+    /**
+     * Along with the requestID field in queries, clients can use this to associate query responses with the originating query.
+     *
+     * @return the request ID from the original request
+     */
+    public int getResponseTo() {
+        return responseTo;
+    }
+
+    /**
+     * Gets additional information about the response.
+     * <ul>
+     *     <li>0 - <i>CursorNotFound</i>: Set when getMore is called but the cursor id is not valid at the server. Returned with zero
+     *     results.</li>
+     *     <li>1 - <i>QueryFailure</i>: Set when query failed. Results consist of one document containing an "$err" field describing the
+     *     failure.
+     *     <li>2 - <i>ShardConfigStale</i>: Drivers should ignore this. Only mongos will ever see this set, in which case,
+     *     it needs to update config from the server.
+     *     <li>3 - <i>AwaitCapable</i>: Set when the server supports the AwaitData Query option. If it doesn't,
+     *     a client should sleep a little between getMore's of a Tailable cursor. Mongod version 1.6 supports AwaitData and thus always
+     *     sets AwaitCapable.
+     *     <li>4-31 - <i>Reserved</i>: Ignore
+     * </ul>
+     *
+     * @return bit vector - see details above
+     */
+    public int getResponseFlags() {
+        return responseFlags;
+    }
+
+    /**
+     * Gets the cursor ID that this response is a part of. If there are no more documents to fetch from the server, the cursor ID will be 0.
+     * This cursor ID must be used in any messages used to get more data, and also must be closed by the client when no longer needed.
+     *
+     * @return cursor ID to use if the client needs to fetch more from the server
+     */
+    public long getCursorId() {
+        return cursorId;
+    }
+
+    /**
+     * Returns the position in the cursor that is the start point of this reply.
+     *
+     * @return where in the cursor this reply is starting
+     */
+    public int getStartingFrom() {
+        return startingFrom;
+    }
+
+    /**
+     * Gets the number of documents to expect in the body of this reply.
+     *
+     * @return number of documents in the reply
+     */
+    public int getNumberReturned() {
+        return numberReturned;
+    }
+
+    /**
+     * Gets whether this query was performed with a cursor ID that was not valid on the server.
+     *
+     * @return true if this reply indicates the request to get more data was performed with a cursor ID that's not valid on the server
+     */
+    public boolean isCursorNotFound() {
+        return (responseFlags & CURSOR_NOT_FOUND_RESPONSE_FLAG) == CURSOR_NOT_FOUND_RESPONSE_FLAG;
+    }
+
+    /**
+     * Gets whether the query failed or not.
+     *
+     * @return true if this reply indicates the query failed.
+     */
+    public boolean isQueryFailure() {
+        return (responseFlags & QUERY_FAILURE_RESPONSE_FLAG) == QUERY_FAILURE_RESPONSE_FLAG;
+    }
+
+    // for unit testing
+    int getOpMsgFlagBits() {
+        return opMsgFlagBits;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/ReplyMessage.java b/driver-core/src/main/com/mongodb/internal/connection/ReplyMessage.java
similarity index 76%
rename from driver-core/src/main/com/mongodb/connection/ReplyMessage.java
rename to driver-core/src/main/com/mongodb/internal/connection/ReplyMessage.java
index 3e3ae846ba2..3038f31c2de 100644
--- a/driver-core/src/main/com/mongodb/connection/ReplyMessage.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ReplyMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoInternalException;
 import org.bson.BsonBinaryReader;
@@ -34,30 +34,28 @@
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-reply OP_REPLY
  * @param <T> the type of the result document
  */
-class ReplyMessage<T> {
+public class ReplyMessage<T> {
 
     private final ReplyHeader replyHeader;
     private final List<T> documents;
 
-    /**
-     * Construct an instance.
-     *
-     * @param responseBuffers the response buffers containing the reply
-     * @param decoder the decoder for the result documents
-     * @param requestId the expected request id that this is a reply to
-     */
     public ReplyMessage(final ResponseBuffers responseBuffers, final Decoder<T> decoder, final long requestId) {
         this(responseBuffers.getReplyHeader(), requestId);
 
         if (replyHeader.getNumberReturned() > 0) {
-            BsonInput bsonInput = new ByteBufferBsonInput(responseBuffers.getBodyByteBuffer());
-            while (documents.size() < replyHeader.getNumberReturned()) {
-                BsonBinaryReader reader = new BsonBinaryReader(bsonInput);
-                try {
-                    documents.add(decoder.decode(reader, DecoderContext.builder().build()));
-                } finally {
-                    reader.close();
+            BsonInput bsonInput = new ByteBufferBsonInput(responseBuffers.getBodyByteBuffer().duplicate());
+            try {
+                while (documents.size() < replyHeader.getNumberReturned()) {
+                    BsonBinaryReader reader = new BsonBinaryReader(bsonInput);
+                    try {
+                        documents.add(decoder.decode(reader, DecoderContext.builder().build()));
+                    } finally {
+                        reader.close();
+                    }
                 }
+            } finally {
+               bsonInput.close();
+               responseBuffers.reset();
             }
         }
     }
@@ -67,7 +65,6 @@ public ReplyMessage(final ResponseBuffers responseBuffers, final Decoder<T> deco
             throw new MongoInternalException(format("The responseTo (%d) in the response does not match the requestId (%d) in the "
                                                     + "request", replyHeader.getResponseTo(), requestId));
         }
-
         this.replyHeader = replyHeader;
 
         documents = new ArrayList<T>(replyHeader.getNumberReturned());
diff --git a/driver-core/src/main/com/mongodb/internal/connection/RequestMessage.java b/driver-core/src/main/com/mongodb/internal/connection/RequestMessage.java
new file mode 100644
index 00000000000..8aff854c9d2
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/RequestMessage.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.session.SessionContext;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonBinaryWriterSettings;
+import org.bson.BsonDocument;
+import org.bson.BsonElement;
+import org.bson.BsonWriter;
+import org.bson.BsonWriterSettings;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.Encoder;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.io.BsonOutput;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+/**
+ * Abstract base class for all MongoDB Wire Protocol request messages.
+ */
+abstract class RequestMessage {
+
+    static final AtomicInteger REQUEST_ID = new AtomicInteger(1);
+
+    static final int MESSAGE_PROLOGUE_LENGTH = 16;
+
+    // Allow an extra 16K to the maximum allowed size of a query or command document, so that, for example,
+    // a 16M document can be upserted via findAndModify
+    private static final int DOCUMENT_HEADROOM = 16 * 1024;
+
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+
+    private final String collectionName;
+    private final MessageSettings settings;
+    private final int id;
+    private final OpCode opCode;
+    private EncodingMetadata encodingMetadata;
+
+    static class EncodingMetadata {
+        private final int firstDocumentPosition;
+
+        EncodingMetadata(final int firstDocumentPosition) {
+            this.firstDocumentPosition = firstDocumentPosition;
+        }
+
+        public int getFirstDocumentPosition() {
+            return firstDocumentPosition;
+        }
+    }
+    /**
+     * Gets the next available unique message identifier.
+     *
+     * @return the message identifier
+     */
+    public static int getCurrentGlobalId() {
+        return REQUEST_ID.get();
+    }
+
+    RequestMessage(final OpCode opCode, final MessageSettings settings) {
+        this(null, opCode, settings);
+    }
+
+    RequestMessage(final OpCode opCode, final int requestId, final MessageSettings settings) {
+        this(null, opCode, requestId, settings);
+    }
+
+
+    RequestMessage(final String collectionName, final OpCode opCode, final MessageSettings settings) {
+        this(collectionName, opCode, REQUEST_ID.getAndIncrement(), settings);
+    }
+
+    private RequestMessage(final String collectionName, final OpCode opCode, final int requestId, final MessageSettings settings) {
+        this.collectionName = collectionName;
+        this.settings = settings;
+        id = requestId;
+        this.opCode = opCode;
+    }
+
+    /**
+     * Gets the message id.
+     *
+     * @return the message id
+     */
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Gets the op code of the message.
+     *
+     * @return the op code
+     */
+    public OpCode getOpCode() {
+        return opCode;
+    }
+
+    /**
+     * Gets the message settings.
+     *
+     * @return the message settings
+     */
+    public MessageSettings getSettings() {
+        return settings;
+    }
+
+    /**
+     * Encoded the message to the given output.
+     *
+     * @param bsonOutput the output
+     * @param sessionContext the session context
+     */
+    public void encode(final BsonOutput bsonOutput, final SessionContext sessionContext) {
+        notNull("sessionContext", sessionContext);
+        int messageStartPosition = bsonOutput.getPosition();
+        writeMessagePrologue(bsonOutput);
+        EncodingMetadata encodingMetadata = encodeMessageBodyWithMetadata(bsonOutput, sessionContext);
+        backpatchMessageLength(messageStartPosition, bsonOutput);
+        this.encodingMetadata = encodingMetadata;
+    }
+
+    /**
+     * Gets the encoding metadata from the last attempt to encode this message.
+     *
+     * @return Get metadata from the last attempt to encode this message. Returns null if there has not yet been an attempt.
+     */
+    public EncodingMetadata getEncodingMetadata() {
+        return encodingMetadata;
+    }
+
+    /**
+     * Writes the message prologue to the given output.
+     *
+     * @param bsonOutput the output
+     */
+    protected void writeMessagePrologue(final BsonOutput bsonOutput) {
+        bsonOutput.writeInt32(0); // length: will set this later
+        bsonOutput.writeInt32(id);
+        bsonOutput.writeInt32(0); // response to
+        bsonOutput.writeInt32(opCode.getValue());
+    }
+
+    /**
+     * Encode the message body to the given output.
+     *
+     * @param bsonOutput the output
+     * @param sessionContext the session context
+     * @return the encoding metadata
+     */
+    protected abstract EncodingMetadata encodeMessageBodyWithMetadata(BsonOutput bsonOutput, SessionContext sessionContext);
+
+    /**
+     * Appends a document to the message.
+     *
+     * @param document the document
+     * @param bsonOutput the output
+     * @param validator the field name validator
+     */
+    protected void addDocument(final BsonDocument document, final BsonOutput bsonOutput,
+                               final FieldNameValidator validator) {
+        addDocument(document, getCodec(document), EncoderContext.builder().build(), bsonOutput, validator,
+                    settings.getMaxDocumentSize() + DOCUMENT_HEADROOM, null);
+    }
+
+    protected void addDocument(final BsonDocument document, final BsonOutput bsonOutput,
+                               final FieldNameValidator validator, final List<BsonElement> extraElements) {
+        addDocument(document, getCodec(document), EncoderContext.builder().build(), bsonOutput, validator,
+                settings.getMaxDocumentSize() + DOCUMENT_HEADROOM, extraElements);
+    }
+
+    /**
+     * Appends a document to the message that is intended for storage in a collection.
+     *
+     * @param document the document
+     * @param bsonOutput the output
+     * @param validator the field name validator
+     */
+    protected void addCollectibleDocument(final BsonDocument document, final BsonOutput bsonOutput, final FieldNameValidator validator) {
+        addDocument(document, getCodec(document), EncoderContext.builder().isEncodingCollectibleDocument(true).build(), bsonOutput,
+                    validator, settings.getMaxDocumentSize(), null);
+    }
+
+    /**
+     * Backpatches the message length into the beginning of the message.
+     *
+     * @param startPosition the start position of the message
+     * @param bsonOutput the output
+     */
+    protected void backpatchMessageLength(final int startPosition, final BsonOutput bsonOutput) {
+        int messageLength = bsonOutput.getPosition() - startPosition;
+        bsonOutput.writeInt32(bsonOutput.getPosition() - messageLength, messageLength);
+    }
+
+    /**
+     * Gets the collection name, which may be null for some message types
+     *
+     * @return the collection name
+     */
+    protected String getCollectionName() {
+        return collectionName;
+    }
+
+    @SuppressWarnings("unchecked")
+    Codec<BsonDocument> getCodec(final BsonDocument document) {
+        return (Codec<BsonDocument>) REGISTRY.get(document.getClass());
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> void addDocument(final T obj, final Encoder<T> encoder, final EncoderContext encoderContext,
+                                 final BsonOutput bsonOutput, final FieldNameValidator validator, final int maxDocumentSize,
+                                 final List<BsonElement> extraElements) {
+        BsonBinaryWriter bsonBinaryWriter = new BsonBinaryWriter(new BsonWriterSettings(), new BsonBinaryWriterSettings(maxDocumentSize),
+                bsonOutput, validator);
+        BsonWriter bsonWriter = extraElements == null
+                ? bsonBinaryWriter
+                : new ElementExtendingBsonWriter(bsonBinaryWriter, extraElements);
+        encoder.encode(bsonWriter, obj, encoderContext);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ResponseBuffers.java b/driver-core/src/main/com/mongodb/internal/connection/ResponseBuffers.java
new file mode 100644
index 00000000000..55c3beb6bd4
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ResponseBuffers.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import org.bson.BsonDocument;
+import org.bson.ByteBuf;
+import org.bson.codecs.Decoder;
+
+import java.io.Closeable;
+
+public class ResponseBuffers implements Closeable {
+    private final ReplyHeader replyHeader;
+    private final ByteBuf bodyByteBuffer;
+    private final int bodyByteBufferStartPosition;
+    private volatile boolean isClosed;
+
+    ResponseBuffers(final ReplyHeader replyHeader, final ByteBuf bodyByteBuffer) {
+        this.replyHeader = replyHeader;
+        this.bodyByteBuffer = bodyByteBuffer;
+        this.bodyByteBufferStartPosition = bodyByteBuffer == null ? 0 : bodyByteBuffer.position();
+    }
+
+    /**
+     * Gets the reply header.
+     *
+     * @return the reply header
+     */
+    public ReplyHeader getReplyHeader() {
+        return replyHeader;
+    }
+
+    <T extends BsonDocument> T getResponseDocument(final int messageId, final Decoder<T> decoder) {
+        ReplyMessage<T> replyMessage = new ReplyMessage<T>(this, decoder, messageId);
+        reset();
+        return replyMessage.getDocuments().get(0);
+    }
+
+    /**
+     * Returns a read-only buffer containing the response body.  Care should be taken to not use the returned buffer after this instance has
+     * been closed.
+     *
+     * @return a read-only buffer containing the response body
+     */
+    public ByteBuf getBodyByteBuffer() {
+        return bodyByteBuffer.asReadOnly();
+    }
+
+    public void reset() {
+        bodyByteBuffer.position(bodyByteBufferStartPosition);
+    }
+
+    @Override
+    public void close() {
+        if (!isClosed) {
+            if (bodyByteBuffer != null) {
+                bodyByteBuffer.release();
+            }
+            isClosed = true;
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/ResponseCallback.java b/driver-core/src/main/com/mongodb/internal/connection/ResponseCallback.java
similarity index 93%
rename from driver-core/src/main/com/mongodb/connection/ResponseCallback.java
rename to driver-core/src/main/com/mongodb/internal/connection/ResponseCallback.java
index 91af8a1c1b6..8cb2308e834 100644
--- a/driver-core/src/main/com/mongodb/connection/ResponseCallback.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ResponseCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoInternalException;
 import com.mongodb.ServerAddress;
@@ -41,7 +41,7 @@ protected long getRequestId() {
     @Override
     public void onResult(final ResponseBuffers responseBuffers, final Throwable t) {
         if (closed) {
-            throw new MongoInternalException("Callback should not be invoked more than once", null);
+            throw new MongoInternalException("Callback should not be invoked more than once");
         }
         closed = true;
         if (responseBuffers != null) {
diff --git a/driver-core/src/main/com/mongodb/connection/SaslAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
similarity index 76%
rename from driver-core/src/main/com/mongodb/connection/SaslAuthenticator.java
rename to driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
index 7f4de80c15c..a0c04640aa9 100644
--- a/driver-core/src/main/com/mongodb/connection/SaslAuthenticator.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
-import com.mongodb.MongoCredential;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInterruptedException;
 import com.mongodb.MongoSecurityException;
 import com.mongodb.ServerAddress;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.lang.Nullable;
+import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonBinary;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -31,12 +34,12 @@
 import java.security.PrivilegedAction;
 
 import static com.mongodb.MongoCredential.JAVA_SUBJECT_KEY;
-import static com.mongodb.connection.CommandHelper.executeCommand;
-import static com.mongodb.connection.CommandHelper.executeCommandAsync;
+import static com.mongodb.internal.connection.CommandHelper.executeCommand;
+import static com.mongodb.internal.connection.CommandHelper.executeCommandAsync;
 
 abstract class SaslAuthenticator extends Authenticator {
 
-    SaslAuthenticator(final MongoCredential credential) {
+    SaslAuthenticator(final MongoCredentialWithCache credential) {
         super(credential);
     }
 
@@ -45,6 +48,7 @@ public void authenticate(final InternalConnection connection, final ConnectionDe
             @Override
             public Void run() {
                 SaslClient saslClient = createSaslClient(connection.getDescription().getServerAddress());
+                throwIfSaslClientIsNull(saslClient);
                 try {
                     byte[] response = (saslClient.hasInitialResponse() ? saslClient.evaluateChallenge(new byte[0]) : null);
                     BsonDocument res = sendSaslStart(response, connection);
@@ -55,15 +59,15 @@ public Void run() {
                         response = saslClient.evaluateChallenge((res.getBinary("payload")).getData());
 
                         if (response == null) {
-                            throw new MongoSecurityException(getCredential(),
+                            throw new MongoSecurityException(getMongoCredential(),
                                     "SASL protocol error: no client response to challenge for credential "
-                                            + getCredential());
+                                            + getMongoCredential());
                         }
 
                         res = sendSaslContinue(conversationId, response, connection);
                     }
                 } catch (Exception e) {
-                    throw wrapInMongoSecurityException(e);
+                    throw wrapException(e);
                 } finally {
                     disposeOfSaslClient(saslClient);
                 }
@@ -80,13 +84,14 @@ void authenticateAsync(final InternalConnection connection, final ConnectionDesc
                 @Override
                 public Void run() {
                     final SaslClient saslClient = createSaslClient(connection.getDescription().getServerAddress());
+                    throwIfSaslClientIsNull(saslClient);
                     try {
                         byte[] response = (saslClient.hasInitialResponse() ? saslClient.evaluateChallenge(new byte[0]) : null);
                         sendSaslStartAsync(response, connection, new SingleResultCallback<BsonDocument>() {
                             @Override
                             public void onResult(final BsonDocument result, final Throwable t) {
                                 if (t != null) {
-                                    callback.onResult(null, wrapInMongoSecurityException(t));
+                                    callback.onResult(null, wrapException(t));
                                 } else if (result.getBoolean("done").getValue()) {
                                     callback.onResult(null, null);
                                 } else {
@@ -95,7 +100,7 @@ public void onResult(final BsonDocument result, final Throwable t) {
                             }
                         });
                     } catch (SaslException e) {
-                        throw wrapInMongoSecurityException(e);
+                        throw wrapException(e);
                     }
                     return null;
                 }
@@ -107,29 +112,37 @@ public void onResult(final BsonDocument result, final Throwable t) {
 
     public abstract String getMechanismName();
 
-    protected abstract SaslClient createSaslClient(final ServerAddress serverAddress);
+    protected abstract SaslClient createSaslClient(ServerAddress serverAddress);
 
+    private void throwIfSaslClientIsNull(final SaslClient saslClient) {
+        if (saslClient == null) {
+            throw new MongoSecurityException(getMongoCredential(),
+                    String.format("This JDK does not support the %s SASL mechanism", getMechanismName()));
+        }
+    }
+
+    @Nullable
     private Subject getSubject() {
-        return getCredential().<Subject>getMechanismProperty(JAVA_SUBJECT_KEY, null);
+        return getMongoCredential().getMechanismProperty(JAVA_SUBJECT_KEY, null);
     }
 
     private BsonDocument sendSaslStart(final byte[] outToken, final InternalConnection connection) {
-        return executeCommand(getCredential().getSource(), createSaslStartCommandDocument(outToken), connection);
+        return executeCommand(getMongoCredential().getSource(), createSaslStartCommandDocument(outToken), connection);
     }
 
     private BsonDocument sendSaslContinue(final BsonInt32 conversationId, final byte[] outToken, final InternalConnection connection) {
-        return executeCommand(getCredential().getSource(), createSaslContinueDocument(conversationId, outToken), connection);
+        return executeCommand(getMongoCredential().getSource(), createSaslContinueDocument(conversationId, outToken), connection);
     }
 
     private void sendSaslStartAsync(final byte[] outToken, final InternalConnection connection,
                                     final SingleResultCallback<BsonDocument> callback) {
-        executeCommandAsync(getCredential().getSource(), createSaslStartCommandDocument(outToken), connection,
+        executeCommandAsync(getMongoCredential().getSource(), createSaslStartCommandDocument(outToken), connection,
                 callback);
     }
 
     private void sendSaslContinueAsync(final BsonInt32 conversationId, final byte[] outToken, final InternalConnection connection,
                                        final SingleResultCallback<BsonDocument> callback) {
-        executeCommandAsync(getCredential().getSource(), createSaslContinueDocument(conversationId, outToken), connection,
+        executeCommandAsync(getMongoCredential().getSource(), createSaslContinueDocument(conversationId, outToken), connection,
                 callback);
     }
 
@@ -151,10 +164,14 @@ private void disposeOfSaslClient(final SaslClient saslClient) {
         }
     }
 
-    private MongoSecurityException wrapInMongoSecurityException(final Throwable t) {
-        return t instanceof MongoSecurityException
-                ? (MongoSecurityException) t
-                : new MongoSecurityException(getCredential(), "Exception authenticating " + getCredential(), t);
+    private MongoException wrapException(final Throwable t) {
+        if (t instanceof MongoInterruptedException) {
+            return (MongoInterruptedException) t;
+        } else if (t instanceof MongoSecurityException) {
+            return (MongoSecurityException) t;
+        } else {
+            return new MongoSecurityException(getMongoCredential(), "Exception authenticating " + getMongoCredential(), t);
+        }
     }
 
     void doAsSubject(final java.security.PrivilegedAction<Void> action) {
@@ -171,7 +188,7 @@ private final class Continuator implements SingleResultCallback<BsonDocument> {
         private final InternalConnection connection;
         private final SingleResultCallback<Void> callback;
 
-        public Continuator(final SaslClient saslClient, final BsonDocument saslStartDocument, final InternalConnection connection,
+        Continuator(final SaslClient saslClient, final BsonDocument saslStartDocument, final InternalConnection connection,
                            final SingleResultCallback<Void> callback) {
             this.saslClient = saslClient;
             this.saslStartDocument = saslStartDocument;
@@ -182,7 +199,7 @@ public Continuator(final SaslClient saslClient, final BsonDocument saslStartDocu
         @Override
         public void onResult(final BsonDocument result, final Throwable t) {
             if (t != null) {
-                callback.onResult(null, wrapInMongoSecurityException(t));
+                callback.onResult(null, wrapException(t));
                 disposeOfSaslClient(saslClient);
             } else if (result.getBoolean("done").getValue()) {
                 callback.onResult(null, null);
@@ -205,7 +222,7 @@ public Void run() {
                             sendSaslContinueAsync(saslStartDocument.getInt32("conversationId"),
                                     saslClient.evaluateChallenge((result.getBinary("payload")).getData()), connection, Continuator.this);
                         } catch (SaslException e) {
-                            throw wrapInMongoSecurityException(e);
+                            throw wrapException(e);
                         }
                         return null;
                     }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ScramShaAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/ScramShaAuthenticator.java
new file mode 100644
index 00000000000..86c59e17b82
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ScramShaAuthenticator.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.AuthenticationMechanism;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
+import com.mongodb.internal.authentication.SaslPrep;
+import org.bson.internal.Base64;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.security.sasl.SaslClient;
+import javax.security.sasl.SaslException;
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.Random;
+
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_256;
+import static com.mongodb.internal.authentication.NativeAuthenticationHelper.createAuthenticationHash;
+import static java.lang.String.format;
+
+class ScramShaAuthenticator extends SaslAuthenticator {
+    private final RandomStringGenerator randomStringGenerator;
+    private final AuthenticationHashGenerator authenticationHashGenerator;
+
+    private static final int MINIMUM_ITERATION_COUNT = 4096;
+    private static final String GS2_HEADER = "n,,";
+    private static final int RANDOM_LENGTH = 24;
+    private static final byte[] INT_1 = new byte[]{0, 0, 0, 1};
+
+    ScramShaAuthenticator(final MongoCredentialWithCache credential) {
+        this(credential, new DefaultRandomStringGenerator(), getAuthenicationHashGenerator(credential.getAuthenticationMechanism()));
+    }
+
+    ScramShaAuthenticator(final MongoCredentialWithCache credential, final RandomStringGenerator randomStringGenerator) {
+        this(credential, randomStringGenerator, getAuthenicationHashGenerator(credential.getAuthenticationMechanism()));
+    }
+
+    ScramShaAuthenticator(final MongoCredentialWithCache credential, final RandomStringGenerator randomStringGenerator,
+                          final AuthenticationHashGenerator authenticationHashGenerator) {
+        super(credential);
+        this.randomStringGenerator = randomStringGenerator;
+        this.authenticationHashGenerator = authenticationHashGenerator;
+    }
+
+    @Override
+    public String getMechanismName() {
+        AuthenticationMechanism authMechanism = getMongoCredential().getAuthenticationMechanism();
+        if (authMechanism == null) {
+            throw new IllegalArgumentException("Authentication mechanism cannot be null");
+        }
+        return authMechanism.getMechanismName();
+    }
+
+    @Override
+    protected SaslClient createSaslClient(final ServerAddress serverAddress) {
+        return new ScramShaSaslClient(getMongoCredentialWithCache(), randomStringGenerator, authenticationHashGenerator);
+    }
+
+    class ScramShaSaslClient implements SaslClient {
+
+        private final MongoCredentialWithCache credential;
+        private final RandomStringGenerator randomStringGenerator;
+        private final AuthenticationHashGenerator authenticationHashGenerator;
+        private final String hAlgorithm;
+        private final String hmacAlgorithm;
+
+        private String clientFirstMessageBare;
+        private String clientNonce;
+
+        private byte[] serverSignature;
+        private int step = -1;
+
+        ScramShaSaslClient(final MongoCredentialWithCache credential, final RandomStringGenerator randomStringGenerator,
+                           final AuthenticationHashGenerator authenticationHashGenerator) {
+            this.credential = credential;
+            this.randomStringGenerator = randomStringGenerator;
+            this.authenticationHashGenerator = authenticationHashGenerator;
+            if (credential.getAuthenticationMechanism().equals(SCRAM_SHA_1)) {
+                hAlgorithm = "SHA-1";
+                hmacAlgorithm = "HmacSHA1";
+            } else {
+                hAlgorithm = "SHA-256";
+                hmacAlgorithm = "HmacSHA256";
+            }
+        }
+
+        public String getMechanismName() {
+            return credential.getAuthenticationMechanism().getMechanismName();
+        }
+
+        public boolean hasInitialResponse() {
+            return true;
+        }
+
+        public byte[] evaluateChallenge(final byte[] challenge) throws SaslException {
+            step++;
+            if (step == 0) {
+                return computeClientFirstMessage();
+            } else if (step == 1) {
+                return computeClientFinalMessage(challenge);
+            } else if (step == 2) {
+                return validateServerSignature(challenge);
+            } else {
+                throw new SaslException(format("Too many steps involved in the %s negotiation.", getMechanismName()));
+            }
+        }
+
+        private byte[] validateServerSignature(final byte[] challenge) throws SaslException {
+            String serverResponse = encodeUTF8(challenge);
+            HashMap<String, String> map = parseServerResponse(serverResponse);
+            if (!MessageDigest.isEqual(decodeBase64(map.get("v")), serverSignature)) {
+                throw new SaslException("Server signature was invalid.");
+            }
+            return challenge;
+        }
+
+        public boolean isComplete() {
+            return step == 2;
+        }
+
+        public byte[] unwrap(final byte[] incoming, final int offset, final int len) {
+            throw new UnsupportedOperationException("Not implemented yet!");
+        }
+
+        public byte[] wrap(final byte[] outgoing, final int offset, final int len) {
+            throw new UnsupportedOperationException("Not implemented yet!");
+        }
+
+        public Object getNegotiatedProperty(final String propName) {
+            throw new UnsupportedOperationException("Not implemented yet!");
+        }
+
+        public void dispose() {
+            // nothing to do
+        }
+
+        private byte[] computeClientFirstMessage() throws SaslException {
+            clientNonce = randomStringGenerator.generate(RANDOM_LENGTH);
+            String clientFirstMessage = "n=" + getUserName() + ",r=" + clientNonce;
+            clientFirstMessageBare = clientFirstMessage;
+            return decodeUTF8(GS2_HEADER + clientFirstMessage);
+        }
+
+        private byte[] computeClientFinalMessage(final byte[] challenge) throws SaslException {
+            String serverFirstMessage = encodeUTF8(challenge);
+            HashMap<String, String> map = parseServerResponse(serverFirstMessage);
+            String serverNonce = map.get("r");
+            if (!serverNonce.startsWith(clientNonce)) {
+                throw new SaslException("Server sent an invalid nonce.");
+            }
+
+            String salt = map.get("s");
+            int iterationCount = Integer.parseInt(map.get("i"));
+            if (iterationCount < MINIMUM_ITERATION_COUNT) {
+                throw new SaslException("Invalid iteration count.");
+            }
+
+            String clientFinalMessageWithoutProof = "c=" + encodeBase64(GS2_HEADER) + ",r=" + serverNonce;
+            String authMessage = clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
+            String clientFinalMessage = clientFinalMessageWithoutProof + ",p="
+                    + getClientProof(getAuthenicationHash(), salt, iterationCount, authMessage);
+            return decodeUTF8(clientFinalMessage);
+        }
+
+        /**
+         * The client Proof:
+         * <p>
+         * AuthMessage     := client-first-message-bare + "," + server-first-message + "," + client-final-message-without-proof
+         * SaltedPassword  := Hi(Normalize(password), salt, i)
+         * ClientKey       := HMAC(SaltedPassword, "Client Key")
+         * ServerKey       := HMAC(SaltedPassword, "Server Key")
+         * StoredKey       := H(ClientKey)
+         * ClientSignature := HMAC(StoredKey, AuthMessage)
+         * ClientProof     := ClientKey XOR ClientSignature
+         * ServerSignature := HMAC(ServerKey, AuthMessage)
+         */
+        String getClientProof(final String password, final String salt, final int iterationCount, final String authMessage)
+                throws SaslException {
+            String hashedPasswordAndSalt = encodeUTF8(h(decodeUTF8(password + salt)));
+
+            CacheKey cacheKey = new CacheKey(hashedPasswordAndSalt, salt, iterationCount);
+            CacheValue cachedKeys = getMongoCredentialWithCache().getFromCache(cacheKey, CacheValue.class);
+            if (cachedKeys == null) {
+                byte[] saltedPassword = hi(decodeUTF8(password), decodeBase64(salt), iterationCount);
+                byte[] clientKey = hmac(saltedPassword, "Client Key");
+                byte[] serverKey = hmac(saltedPassword, "Server Key");
+                cachedKeys = new CacheValue(clientKey, serverKey);
+                getMongoCredentialWithCache().putInCache(cacheKey, new CacheValue(clientKey, serverKey));
+            }
+            serverSignature = hmac(cachedKeys.serverKey, authMessage);
+
+            byte[] storedKey = h(cachedKeys.clientKey);
+            byte[] clientSignature = hmac(storedKey, authMessage);
+            byte[] clientProof = xor(cachedKeys.clientKey, clientSignature);
+            return encodeBase64(clientProof);
+        }
+
+        private byte[] decodeBase64(final String str) {
+            return Base64.decode(str);
+        }
+
+        private byte[] decodeUTF8(final String str) throws SaslException {
+            try {
+                return str.getBytes("UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new SaslException("UTF-8 is not a supported encoding.", e);
+            }
+        }
+
+        private String encodeBase64(final String str) throws SaslException {
+            return Base64.encode(decodeUTF8(str));
+        }
+
+        private String encodeBase64(final byte[] bytes) {
+            return Base64.encode(bytes);
+        }
+
+        private String encodeUTF8(final byte[] bytes) throws SaslException {
+            try {
+                return new String(bytes, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new SaslException("UTF-8 is not a supported encoding.", e);
+            }
+        }
+
+        private byte[] h(final byte[] data) throws SaslException {
+            try {
+                return MessageDigest.getInstance(hAlgorithm).digest(data);
+            } catch (NoSuchAlgorithmException e) {
+                throw new SaslException(format("Algorithm for '%s' could not be found.", hAlgorithm), e);
+            }
+        }
+
+        private byte[] hi(final byte[] password, final byte[] salt, final int iterations) throws SaslException {
+            try {
+                SecretKeySpec key = new SecretKeySpec(password, hmacAlgorithm);
+                Mac mac = Mac.getInstance(hmacAlgorithm);
+                mac.init(key);
+                mac.update(salt);
+                mac.update(INT_1);
+                byte[] result = mac.doFinal();
+                byte[] previous = null;
+                for (int i = 1; i < iterations; i++) {
+                    mac.update(previous != null ? previous : result);
+                    previous = mac.doFinal();
+                    xorInPlace(result, previous);
+                }
+                return result;
+            } catch (NoSuchAlgorithmException e) {
+                throw new SaslException(format("Algorithm for '%s' could not be found.", hmacAlgorithm), e);
+            } catch (InvalidKeyException e) {
+                throw new SaslException(format("Invalid key for %s", hmacAlgorithm), e);
+            }
+        }
+
+        private byte[] hmac(final byte[] bytes, final String key) throws SaslException {
+            try {
+                Mac mac = Mac.getInstance(hmacAlgorithm);
+                mac.init(new SecretKeySpec(bytes, hmacAlgorithm));
+                return mac.doFinal(decodeUTF8(key));
+            } catch (NoSuchAlgorithmException e) {
+                throw new SaslException(format("Algorithm for '%s' could not be found.", hmacAlgorithm), e);
+            } catch (InvalidKeyException e) {
+                throw new SaslException("Could not initialize mac.", e);
+            }
+        }
+
+        /**
+         * The server provides back key value pairs using an = sign and delimited
+         * by a command. All keys are also a single character.
+         * For example: a=kg4io3,b=skljsfoiew,c=1203
+         */
+        private HashMap<String, String> parseServerResponse(final String response) {
+            HashMap<String, String> map = new HashMap<String, String>();
+            String[] pairs = response.split(",");
+            for (String pair : pairs) {
+                String[] parts = pair.split("=", 2);
+                map.put(parts[0], parts[1]);
+            }
+            return map;
+        }
+
+
+        private String getUserName() {
+            String userName = credential.getCredential().getUserName();
+            if (userName == null) {
+                throw new IllegalArgumentException("Username can not be null");
+            }
+            return userName.replace("=", "=3D").replace(",", "=2C");
+        }
+
+        private String getAuthenicationHash() {
+            String password = authenticationHashGenerator.generate(credential.getCredential());
+            if (credential.getAuthenticationMechanism() == SCRAM_SHA_256) {
+                password = SaslPrep.saslPrepStored(password);
+            }
+            return password;
+        }
+
+        private byte[] xorInPlace(final byte[] a, final byte[] b) {
+            for (int i = 0; i < a.length; i++) {
+                a[i] ^= b[i];
+            }
+            return a;
+        }
+
+        private byte[] xor(final byte[] a, final byte[] b) {
+            byte[] result = new byte[a.length];
+            System.arraycopy(a, 0, result, 0, a.length);
+            return xorInPlace(result, b);
+        }
+
+    }
+
+    public interface RandomStringGenerator {
+        String generate(int length);
+    }
+
+    public interface AuthenticationHashGenerator {
+        String generate(MongoCredential credential);
+    }
+
+    private static class DefaultRandomStringGenerator implements RandomStringGenerator {
+        public String generate(final int length) {
+            Random random = new SecureRandom();
+            int comma = 44;
+            int low = 33;
+            int high = 126;
+            int range = high - low;
+
+            char[] text = new char[length];
+            for (int i = 0; i < length; i++) {
+                int next = random.nextInt(range) + low;
+                while (next == comma) {
+                    next = random.nextInt(range) + low;
+                }
+                text[i] = (char) next;
+            }
+            return new String(text);
+        }
+    }
+
+    private static final AuthenticationHashGenerator DEFAULT_AUTHENTICATION_HASH_GENERATOR =  new AuthenticationHashGenerator() {
+        @Override
+        public String generate(final MongoCredential credential) {
+            char[] password = credential.getPassword();
+            if (password == null) {
+                throw new IllegalArgumentException("Password must not be null");
+            }
+            return new String(password);
+        }
+    };
+
+    private static final AuthenticationHashGenerator LEGACY_AUTHENTICATION_HASH_GENERATOR =  new AuthenticationHashGenerator() {
+        @Override
+        public String generate(final MongoCredential credential) {
+            // Username and password must not be modified going into the hash.
+            String username = credential.getUserName();
+            char[] password = credential.getPassword();
+            if (username == null || password == null) {
+                throw new IllegalArgumentException("Username and password must not be null");
+            }
+            return createAuthenticationHash(username, password);
+        }
+    };
+
+    private static AuthenticationHashGenerator getAuthenicationHashGenerator(final AuthenticationMechanism authenticationMechanism) {
+        return authenticationMechanism == SCRAM_SHA_1 ? LEGACY_AUTHENTICATION_HASH_GENERATOR : DEFAULT_AUTHENTICATION_HASH_GENERATOR;
+    }
+
+    private static class CacheKey {
+        private final String hashedPasswordAndSalt;
+        private final String salt;
+        private final int iterationCount;
+
+        CacheKey(final String hashedPasswordAndSalt, final String salt, final int iterationCount) {
+            this.hashedPasswordAndSalt = hashedPasswordAndSalt;
+            this.salt = salt;
+            this.iterationCount = iterationCount;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            CacheKey that = (CacheKey) o;
+
+            if (iterationCount != that.iterationCount) {
+                return false;
+            }
+            if (!hashedPasswordAndSalt.equals(that.hashedPasswordAndSalt)) {
+                return false;
+            }
+            return salt.equals(that.salt);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = hashedPasswordAndSalt.hashCode();
+            result = 31 * result + salt.hashCode();
+            result = 31 * result + iterationCount;
+            return result;
+        }
+    }
+
+    private static class CacheValue {
+        private byte[] clientKey;
+        private byte[] serverKey;
+
+        CacheValue(final byte[] clientKey, final byte[] serverKey) {
+            this.clientKey = clientKey;
+            this.serverKey = serverKey;
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/SendMessageCallback.java b/driver-core/src/main/com/mongodb/internal/connection/SendMessageCallback.java
similarity index 91%
rename from driver-core/src/main/com/mongodb/connection/SendMessageCallback.java
rename to driver-core/src/main/com/mongodb/internal/connection/SendMessageCallback.java
index d84fbc067f0..67a85c16871 100644
--- a/driver-core/src/main/com/mongodb/connection/SendMessageCallback.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SendMessageCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.event.CommandListener;
 import org.bson.io.OutputBuffer;
 
-import static com.mongodb.connection.ProtocolHelper.sendCommandFailedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandFailedEvent;
 
 class SendMessageCallback<T> implements SingleResultCallback<Void> {
     private final OutputBuffer buffer;
@@ -58,7 +58,8 @@ public void onResult(final Void result, final Throwable t) {
         buffer.close();
         if (t != null) {
             if (commandListener != null){
-                sendCommandFailedEvent(message, commandName, connection.getDescription(), startTimeNanos, t, commandListener);
+                sendCommandFailedEvent(message, commandName, connection.getDescription(), System.nanoTime() - startTimeNanos, t,
+                        commandListener);
             }
             callback.onResult(null, t);
         } else {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ServerAddressHelper.java b/driver-core/src/main/com/mongodb/internal/connection/ServerAddressHelper.java
new file mode 100644
index 00000000000..ffad6ed9e4d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ServerAddressHelper.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+
+import com.mongodb.ServerAddress;
+import com.mongodb.UnixServerAddress;
+
+public final class ServerAddressHelper {
+
+    public static ServerAddress createServerAddress(final String host) {
+        return createServerAddress(host, ServerAddress.defaultPort());
+    }
+
+    public static ServerAddress createServerAddress(final String host, final int port) {
+        if (host != null && host.endsWith(".sock")) {
+            return new UnixServerAddress(host);
+        } else {
+            return new ServerAddress(host, port);
+        }
+    }
+
+    private ServerAddressHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/connection/ServerMonitor.java b/driver-core/src/main/com/mongodb/internal/connection/ServerMonitor.java
similarity index 88%
rename from driver-core/src/main/com/mongodb/connection/ServerMonitor.java
rename to driver-core/src/main/com/mongodb/internal/connection/ServerMonitor.java
index 999689988c3..97c5d01f5cd 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerMonitor.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ServerMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 interface ServerMonitor {
 
diff --git a/driver-core/src/main/com/mongodb/connection/ServerMonitorFactory.java b/driver-core/src/main/com/mongodb/internal/connection/ServerMonitorFactory.java
similarity index 83%
rename from driver-core/src/main/com/mongodb/connection/ServerMonitorFactory.java
rename to driver-core/src/main/com/mongodb/internal/connection/ServerMonitorFactory.java
index a1c07abd253..3496775e6a3 100644
--- a/driver-core/src/main/com/mongodb/connection/ServerMonitorFactory.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/ServerMonitorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ServerDescription;
 
 interface ServerMonitorFactory {
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SingleServerCluster.java b/driver-core/src/main/com/mongodb/internal/connection/SingleServerCluster.java
new file mode 100644
index 00000000000..268da02705d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/SingleServerCluster.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.ClusterDescriptionChangedEvent;
+import com.mongodb.event.ServerDescriptionChangedEvent;
+import com.mongodb.event.ServerListenerAdapter;
+
+import java.util.Collections;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+
+/**
+ * This class needs to be final because we are leaking a reference to "this" from the constructor
+ */
+public final class SingleServerCluster extends BaseCluster {
+    private static final Logger LOGGER = Loggers.getLogger("cluster");
+
+    private final ClusterableServer server;
+
+    public SingleServerCluster(final ClusterId clusterId, final ClusterSettings settings, final ClusterableServerFactory serverFactory) {
+        super(clusterId, settings, serverFactory);
+        isTrue("one server in a direct cluster", settings.getHosts().size() == 1);
+        isTrue("connection mode is single", settings.getMode() == ClusterConnectionMode.SINGLE);
+
+        if (LOGGER.isInfoEnabled()) {
+            LOGGER.info(format("Cluster created with settings %s", settings.getShortDescription()));
+        }
+
+        // synchronized in the constructor because the change listener is re-entrant to this instance.
+        // In other words, we are leaking a reference to "this" from the constructor.
+        synchronized (this) {
+            this.server = createServer(settings.getHosts().get(0), new DefaultServerStateListener());
+            publishDescription(server.getDescription());
+        }
+    }
+
+    @Override
+    protected void connect() {
+        server.connect();
+    }
+
+    @Override
+    protected ClusterableServer getServer(final ServerAddress serverAddress) {
+        isTrue("open", !isClosed());
+        return server;
+    }
+
+    @Override
+    public void close() {
+        if (!isClosed()) {
+            server.close();
+            super.close();
+        }
+    }
+
+    private class DefaultServerStateListener extends ServerListenerAdapter {
+        @Override
+        public void serverDescriptionChanged(final ServerDescriptionChangedEvent event) {
+            ServerDescription descriptionToPublish = event.getNewDescription();
+            if (event.getNewDescription().isOk()) {
+                if (getSettings().getRequiredClusterType() != ClusterType.UNKNOWN
+                        && getSettings().getRequiredClusterType() != event.getNewDescription().getClusterType()) {
+                    descriptionToPublish = null;
+                } else if (getSettings().getRequiredClusterType() == ClusterType.REPLICA_SET
+                        && getSettings().getRequiredReplicaSetName() != null) {
+                    if (!getSettings().getRequiredReplicaSetName().equals(event.getNewDescription().getSetName())) {
+                        descriptionToPublish = null;
+                    }
+                }
+            }
+            publishDescription(descriptionToPublish);
+        }
+    }
+
+    private void publishDescription(final ServerDescription serverDescription) {
+        ClusterType clusterType = getSettings().getRequiredClusterType();
+        if (clusterType == ClusterType.UNKNOWN && serverDescription != null) {
+            clusterType = serverDescription.getClusterType();
+        }
+        ClusterDescription currentDescription = getCurrentDescription();
+        ClusterDescription description = new ClusterDescription(ClusterConnectionMode.SINGLE, clusterType,
+                serverDescription == null ? Collections.<ServerDescription>emptyList() : singletonList(serverDescription), getSettings(),
+                getServerFactory().getSettings());
+
+        updateDescription(description);
+        fireChangeEvent(new ClusterDescriptionChangedEvent(getClusterId(), description, currentDescription));
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SnappyCompressor.java b/driver-core/src/main/com/mongodb/internal/connection/SnappyCompressor.java
new file mode 100644
index 00000000000..f9aa1648494
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/SnappyCompressor.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoInternalException;
+import org.bson.ByteBuf;
+import org.bson.io.BsonOutput;
+import org.xerial.snappy.Snappy;
+import org.xerial.snappy.SnappyInputStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+class SnappyCompressor extends Compressor {
+    @Override
+    public String getName() {
+        return "snappy";
+    }
+
+    @Override
+    public byte getId() {
+        return 1;
+    }
+
+    // the server does not support the framing format so SnappyFramedOutputStream can't be used.  The entire source message must first
+    // be copied into a single byte array.  For that reason the compress method defined in the base class can't be used.
+    @Override
+    public void compress(final List<ByteBuf> source, final BsonOutput target) {
+        int uncompressedSize = getUncompressedSize(source);
+
+        byte[] singleByteArraySource = new byte[uncompressedSize];
+        copy(source, singleByteArraySource);
+
+        try {
+            byte[] out = new byte[Snappy.maxCompressedLength(uncompressedSize)];
+            int compressedSize = Snappy.compress(singleByteArraySource, 0, singleByteArraySource.length, out, 0);
+            target.writeBytes(out, 0, compressedSize);
+        } catch (IOException e) {
+            throw new MongoInternalException("Unexpected IOException", e);
+        }
+    }
+
+    private int getUncompressedSize(final List<ByteBuf> source) {
+        int uncompressedSize = 0;
+        for (ByteBuf cur : source) {
+            uncompressedSize += cur.remaining();
+        }
+        return uncompressedSize;
+    }
+
+    private void copy(final List<ByteBuf> source, final byte[] in) {
+        int offset = 0;
+        for (ByteBuf cur : source) {
+            int remaining = cur.remaining();
+            cur.get(in, offset, remaining);
+            offset += remaining;
+        }
+    }
+
+    @Override
+    InputStream getInputStream(final InputStream source) throws IOException {
+        return new SnappyInputStream(source);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SniSslHelper.java b/driver-core/src/main/com/mongodb/internal/connection/SniSslHelper.java
new file mode 100644
index 00000000000..eb9a4f47624
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/SniSslHelper.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import javax.net.ssl.SSLParameters;
+
+interface SniSslHelper {
+
+    /**
+     * Enable SNI.
+     *
+     * @param host          the server host
+     * @param sslParameters the SSL parameters
+     */
+    void enableSni(String host, SSLParameters sslParameters);
+}
diff --git a/driver-core/src/main/com/mongodb/connection/SocketStream.java b/driver-core/src/main/com/mongodb/internal/connection/SocketStream.java
similarity index 75%
rename from driver-core/src/main/com/mongodb/connection/SocketStream.java
rename to driver-core/src/main/com/mongodb/internal/connection/SocketStream.java
index e0626333fda..6b9a7af60ab 100644
--- a/driver-core/src/main/com/mongodb/connection/SocketStream.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SocketStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +14,32 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
+import com.mongodb.MongoSocketException;
 import com.mongodb.MongoSocketOpenException;
 import com.mongodb.MongoSocketReadException;
 import com.mongodb.ServerAddress;
+import com.mongodb.connection.AsyncCompletionHandler;
+import com.mongodb.connection.BufferProvider;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.connection.Stream;
 import org.bson.ByteBuf;
 
 import javax.net.SocketFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.util.Iterator;
 import java.util.List;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
-class SocketStream implements Stream {
+public class SocketStream implements Stream {
     private final ServerAddress address;
     private final SocketSettings settings;
     private final SslSettings sslSettings;
@@ -42,8 +51,7 @@ class SocketStream implements Stream {
     private volatile boolean isClosed;
 
     public SocketStream(final ServerAddress address, final SocketSettings settings, final SslSettings sslSettings,
-                        final SocketFactory socketFactory,
-                        final BufferProvider bufferProvider) {
+                        final SocketFactory socketFactory, final BufferProvider bufferProvider) {
         this.address = notNull("address", address);
         this.settings = notNull("settings", settings);
         this.sslSettings = notNull("sslSettings", sslSettings);
@@ -52,10 +60,9 @@ public SocketStream(final ServerAddress address, final SocketSettings settings,
     }
 
     @Override
-    public void open() throws IOException {
+    public void open() {
         try {
-            socket = socketFactory.createSocket();
-            SocketStreamHelper.initialize(socket, address, settings, sslSettings);
+            socket = initializeSocket();
             outputStream = socket.getOutputStream();
             inputStream = socket.getInputStream();
         } catch (IOException e) {
@@ -64,6 +71,23 @@ public void open() throws IOException {
         }
     }
 
+    protected Socket initializeSocket() throws IOException {
+        Iterator<InetSocketAddress> inetSocketAddresses = address.getSocketAddresses().iterator();
+        while (inetSocketAddresses.hasNext()) {
+            Socket socket = socketFactory.createSocket();
+            try {
+                SocketStreamHelper.initialize(socket, inetSocketAddresses.next(), settings, sslSettings);
+                return socket;
+            } catch (SocketTimeoutException e) {
+                if (!inetSocketAddresses.hasNext()) {
+                    throw e;
+                }
+            }
+        }
+
+        throw new MongoSocketException("Exception opening socket", getAddress());
+    }
+
     @Override
     public ByteBuf getBuffer(final int size) {
         return bufferProvider.getBuffer(size);
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SocketStreamHelper.java b/driver-core/src/main/com/mongodb/internal/connection/SocketStreamHelper.java
new file mode 100644
index 00000000000..46ba850bff4
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/SocketStreamHelper.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoInternalException;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSocket;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+import static com.mongodb.internal.connection.SslHelper.enableHostNameVerification;
+import static com.mongodb.internal.connection.SslHelper.enableSni;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+final class SocketStreamHelper {
+
+    @SuppressWarnings("deprecation")
+    static void initialize(final Socket socket, final InetSocketAddress inetSocketAddress, final SocketSettings settings,
+                           final SslSettings sslSettings) throws IOException {
+        socket.setTcpNoDelay(true);
+        socket.setSoTimeout(settings.getReadTimeout(MILLISECONDS));
+        socket.setKeepAlive(settings.isKeepAlive());
+        if (settings.getReceiveBufferSize() > 0) {
+            socket.setReceiveBufferSize(settings.getReceiveBufferSize());
+        }
+        if (settings.getSendBufferSize() > 0) {
+            socket.setSendBufferSize(settings.getSendBufferSize());
+        }
+        if (sslSettings.isEnabled() || socket instanceof SSLSocket) {
+            if (!(socket instanceof SSLSocket)) {
+                throw new MongoInternalException("SSL is enabled but the socket is not an instance of javax.net.ssl.SSLSocket");
+            }
+            SSLSocket sslSocket = (SSLSocket) socket;
+            SSLParameters sslParameters = sslSocket.getSSLParameters();
+            if (sslParameters == null) {
+                sslParameters = new SSLParameters();
+            }
+
+            enableSni(inetSocketAddress.getHostName(), sslParameters);
+
+            if (!sslSettings.isInvalidHostNameAllowed()) {
+                enableHostNameVerification(sslParameters);
+            }
+            sslSocket.setSSLParameters(sslParameters);
+        }
+        socket.connect(inetSocketAddress, settings.getConnectTimeout(MILLISECONDS));
+    }
+
+    private SocketStreamHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SplittablePayloadBsonWriter.java b/driver-core/src/main/com/mongodb/internal/connection/SplittablePayloadBsonWriter.java
new file mode 100644
index 00000000000..958be12960b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/SplittablePayloadBsonWriter.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.SplittablePayload;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonWriter;
+import org.bson.io.BsonOutput;
+
+import static com.mongodb.internal.connection.BsonWriterHelper.writePayloadArray;
+
+public class SplittablePayloadBsonWriter extends LevelCountingBsonWriter {
+    private final BsonWriter writer;
+    private final BsonOutput bsonOutput;
+    private final SplittablePayload payload;
+    private int maxSplittableDocumentSize;
+    private final MessageSettings settings;
+    private final int messageStartPosition;
+
+    public SplittablePayloadBsonWriter(final BsonBinaryWriter writer, final BsonOutput bsonOutput,
+                                       final MessageSettings settings, final SplittablePayload payload) {
+        this(writer, bsonOutput, settings, payload, settings.getMaxDocumentSize());
+    }
+
+    public SplittablePayloadBsonWriter(final BsonBinaryWriter writer, final BsonOutput bsonOutput,
+                                       final MessageSettings settings, final SplittablePayload payload,
+                                       final int maxSplittableDocumentSize) {
+        this(writer, bsonOutput, 0, settings, payload, maxSplittableDocumentSize);
+    }
+
+    public SplittablePayloadBsonWriter(final BsonBinaryWriter writer, final BsonOutput bsonOutput, final int messageStartPosition,
+                                       final MessageSettings settings, final SplittablePayload payload) {
+        this(writer, bsonOutput, messageStartPosition, settings, payload, settings.getMaxDocumentSize());
+    }
+
+    public SplittablePayloadBsonWriter(final BsonBinaryWriter writer, final BsonOutput bsonOutput, final int messageStartPosition,
+                                       final MessageSettings settings, final SplittablePayload payload,
+                                       final int maxSplittableDocumentSize) {
+        super(writer);
+        this.writer = writer;
+        this.bsonOutput = bsonOutput;
+        this.messageStartPosition = messageStartPosition;
+        this.settings = settings;
+        this.payload = payload;
+        this.maxSplittableDocumentSize = maxSplittableDocumentSize;
+    }
+
+    @Override
+    public void writeStartDocument() {
+        super.writeStartDocument();
+    }
+
+    @Override
+    public void writeEndDocument() {
+        if (getCurrentLevel() == 0 && payload.getPayload().size() > 0) {
+            writePayloadArray(writer, bsonOutput, settings, messageStartPosition, payload, maxSplittableDocumentSize);
+        }
+        super.writeEndDocument();
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/SslHelper.java b/driver-core/src/main/com/mongodb/internal/connection/SslHelper.java
index 8b62ada2966..397e8b8208b 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/SslHelper.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/SslHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,63 @@
 package com.mongodb.internal.connection;
 
 import javax.net.ssl.SSLParameters;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * <p>This class should not be considered a part of the public API.</p>
  */
 public final class SslHelper {
+
+    // this will end up as null if running on a release prior to Java 8, in which case SNI will be silently disabled
+    private static final SniSslHelper SNI_SSL_HELPER;
+
+    static {
+        SniSslHelper sniSslHelper;
+        try {
+            sniSslHelper = (SniSslHelper) Class.forName("com.mongodb.internal.connection.Java8SniSslHelper")
+                                                  .getDeclaredConstructor().newInstance();
+        } catch (ClassNotFoundException e) {
+            // this is unexpected as it means the Java8SniSslHelper class itself is not found
+            throw new ExceptionInInitializerError(e);
+        } catch (InstantiationException e) {
+            // this is unexpected as it means Java8SniSslHelper can't be instantiated
+            throw new ExceptionInInitializerError(e);
+        } catch (IllegalAccessException e) {
+            // this is unexpected as it means Java8SniSslHelper's constructor isn't accessible
+            throw new ExceptionInInitializerError(e);
+        } catch (NoSuchMethodException e) {
+            // this is unexpected as it means Java8SniSslHelper has no no-args constructor
+            throw new ExceptionInInitializerError(e);
+        } catch (InvocationTargetException e) {
+            // this is unexpected as it means Java8SniSslHelper's constructor threw an exception
+            throw new ExceptionInInitializerError(e.getTargetException());
+        } catch (LinkageError t) {
+            // this is expected if running on a release prior to Java 8.  We want to just fail silently here
+            sniSslHelper = null;
+        }
+
+        SNI_SSL_HELPER = sniSslHelper;
+    }
+
     /**
      * Enable HTTP endpoint verification on the given SSL parameters.
      *
      * @param sslParameters The original SSL parameters
-     * @return the new SSL parameers with HTTPS endpoint verification enabled
      */
-    public static SSLParameters enableHostNameVerification(final SSLParameters sslParameters) {
+    public static void enableHostNameVerification(final SSLParameters sslParameters) {
         sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
-        return sslParameters;
+    }
+
+    /**
+     * Enable SNI if running on Java 8 or later.  Otherwise fail silently to enable SNI.
+     *
+     * @param host          the server host
+     * @param sslParameters the SSL parameters
+     */
+    public static void enableSni(final String host, final SSLParameters sslParameters) {
+        if (SNI_SSL_HELPER != null) {
+            SNI_SSL_HELPER.enableSni(host, sslParameters);
+        }
     }
 
     private SslHelper() {
diff --git a/driver-core/src/main/com/mongodb/internal/connection/Time.java b/driver-core/src/main/com/mongodb/internal/connection/Time.java
new file mode 100644
index 00000000000..ab6555fa888
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/Time.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+// to enable unit testing of classes that rely on System.nanoTime
+public final class Time {
+    static final long CONSTANT_TIME = 42;
+
+    private static boolean isConstant;
+
+    public static void makeTimeConstant() {
+        isConstant = true;
+    }
+
+    public static void makeTimeMove() {
+        isConstant = false;
+    }
+
+    public static long nanoTime() {
+        return isConstant ? CONSTANT_TIME : System.nanoTime();
+    }
+
+    private Time() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/UnixSocketChannelStream.java b/driver-core/src/main/com/mongodb/internal/connection/UnixSocketChannelStream.java
new file mode 100644
index 00000000000..d997831ae4b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/UnixSocketChannelStream.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.UnixServerAddress;
+import com.mongodb.connection.BufferProvider;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import jnr.unixsocket.UnixSocketAddress;
+import jnr.unixsocket.UnixSocketChannel;
+
+import javax.net.SocketFactory;
+import java.io.IOException;
+import java.net.Socket;
+
+public class UnixSocketChannelStream extends SocketStream {
+    private final UnixServerAddress address;
+
+    public UnixSocketChannelStream(final UnixServerAddress address, final SocketSettings settings, final SslSettings sslSettings,
+                            final BufferProvider bufferProvider) {
+        super(address, settings, sslSettings, SocketFactory.getDefault(), bufferProvider);
+        this.address = address;
+    }
+
+    @Override
+    protected Socket initializeSocket() throws IOException {
+        return UnixSocketChannel.open((UnixSocketAddress) address.getUnixSocketAddress()).socket();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/UpdateMessage.java b/driver-core/src/main/com/mongodb/internal/connection/UpdateMessage.java
new file mode 100644
index 00000000000..d39582dffa0
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/UpdateMessage.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.internal.validator.UpdateFieldNameValidator;
+import org.bson.BsonValue;
+import org.bson.io.BsonOutput;
+
+import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
+
+/**
+ * An OP_UPDATE message.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-update OP_UPDATE
+ */
+class UpdateMessage extends LegacyMessage {
+    private final UpdateRequest updateRequest;
+
+    UpdateMessage(final String collectionName, final UpdateRequest updateRequest, final MessageSettings settings) {
+        super(collectionName, OpCode.OP_UPDATE, settings);
+        this.updateRequest = updateRequest;
+    }
+
+    @Override
+    protected EncodingMetadata encodeMessageBodyWithMetadata(final BsonOutput bsonOutput) {
+        bsonOutput.writeInt32(0); // reserved
+        bsonOutput.writeCString(getCollectionName());
+
+        int flags = 0;
+        if (updateRequest.isUpsert()) {
+            flags |= 1;
+        }
+        if (updateRequest.isMulti()) {
+            flags |= 2;
+        }
+        bsonOutput.writeInt32(flags);
+
+        int firstDocumentStartPosition = bsonOutput.getPosition();
+
+        addDocument(updateRequest.getFilter(), bsonOutput, new NoOpFieldNameValidator());
+        if (updateRequest.getType() == REPLACE && updateRequest.getUpdateValue().isDocument()) {
+            addDocument(updateRequest.getUpdateValue().asDocument(), bsonOutput, new CollectibleDocumentFieldNameValidator());
+        } else {
+            int bufferPosition = bsonOutput.getPosition();
+            BsonValue update = updateRequest.getUpdateValue();
+            if (update.isDocument()) {
+                addDocument(update.asDocument(), bsonOutput, new UpdateFieldNameValidator());
+            } else {
+                throw new IllegalArgumentException("Invalid update filter in update request. The filter must be a document.");
+            }
+            if (bsonOutput.getPosition() == bufferPosition + 5) {
+                throw new IllegalArgumentException("Invalid BSON document for an update");
+            }
+        }
+
+        return new EncodingMetadata(firstDocumentStartPosition);
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/UpdateProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/UpdateProtocol.java
new file mode 100644
index 00000000000..c3f67c90d17
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/UpdateProtocol.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+
+/**
+ * An implementation of the MongoDB OP_UPDATE wire protocol.
+ *
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-update OP_UPDATE
+ */
+class UpdateProtocol extends WriteProtocol {
+    private static final com.mongodb.diagnostics.logging.Logger LOGGER = Loggers.getLogger("protocol.update");
+
+    private final UpdateRequest updateRequest;
+
+    UpdateProtocol(final MongoNamespace namespace, final boolean ordered, final UpdateRequest updateRequest) {
+        super(namespace, ordered);
+        this.updateRequest = updateRequest;
+    }
+
+    @Override
+    public WriteConcernResult execute(final InternalConnection connection) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug(format("Updating documents in namespace %s on connection [%s] to server %s", getNamespace(),
+                                connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
+        }
+        WriteConcernResult writeConcernResult = super.execute(connection);
+        LOGGER.debug("Update completed");
+        return writeConcernResult;
+    }
+
+    @Override
+    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
+        try {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(format("Asynchronously updating documents in namespace %s on connection [%s] to server %s", getNamespace(),
+                                    connection.getDescription().getConnectionId(), connection.getDescription().getServerAddress()));
+            }
+            super.executeAsync(connection, new SingleResultCallback<WriteConcernResult>() {
+                @Override
+                public void onResult(final WriteConcernResult result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        LOGGER.debug("Asynchronous update completed");
+                        callback.onResult(result, null);
+                    }
+                }
+            });
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+        }
+    }
+
+    @Override
+    protected BsonDocument getAsWriteCommand(final ByteBufferBsonOutput bsonOutput, final int firstDocumentPosition) {
+        List<ByteBufBsonDocument> documents = ByteBufBsonDocument.createList(bsonOutput, firstDocumentPosition);
+        BsonDocument updateDocument = new BsonDocument("q", documents.get(0)).append("u", documents.get(1));
+        if (updateRequest.isMulti()) {
+            updateDocument.append("multi", BsonBoolean.TRUE);
+        }
+        if (updateRequest.isUpsert()) {
+            updateDocument.append("upsert", BsonBoolean.TRUE);
+        }
+        return getBaseCommandDocument("update").append("updates", new BsonArray(singletonList(updateDocument)));
+    }
+
+
+    @Override
+    protected RequestMessage createRequestMessage(final MessageSettings settings) {
+        return new UpdateMessage(getNamespace().getFullName(), updateRequest, settings);
+    }
+
+    @Override
+    protected Logger getLogger() {
+        return LOGGER;
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/connection/UsageTrackingInternalConnection.java b/driver-core/src/main/com/mongodb/internal/connection/UsageTrackingInternalConnection.java
similarity index 80%
rename from driver-core/src/main/com/mongodb/connection/UsageTrackingInternalConnection.java
rename to driver-core/src/main/com/mongodb/internal/connection/UsageTrackingInternalConnection.java
index ce0d83db6ff..bcb58a03a44 100644
--- a/driver-core/src/main/com/mongodb/connection/UsageTrackingInternalConnection.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/UsageTrackingInternalConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.session.SessionContext;
 import org.bson.ByteBuf;
+import org.bson.codecs.Decoder;
 
 import java.util.List;
 
-import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
 
 /**
@@ -34,7 +36,7 @@ class UsageTrackingInternalConnection implements InternalConnection {
     private volatile long openedAt;
     private volatile long lastUsedAt;
     private final int generation;
-    private volatile InternalConnection wrapped;
+    private final InternalConnection wrapped;
 
     UsageTrackingInternalConnection(final InternalConnection wrapped, final int generation) {
         this.wrapped = wrapped;
@@ -45,7 +47,6 @@ class UsageTrackingInternalConnection implements InternalConnection {
 
     @Override
     public void open() {
-        isTrue("open", wrapped != null);
         wrapped.open();
         openedAt = System.currentTimeMillis();
         lastUsedAt = openedAt;
@@ -53,7 +54,6 @@ public void open() {
 
     @Override
     public void openAsync(final SingleResultCallback<Void> callback) {
-        isTrue("open", wrapped != null);
         wrapped.openAsync(new SingleResultCallback<Void>() {
             @Override
             public void onResult(final Void result, final Throwable t) {
@@ -70,38 +70,52 @@ public void onResult(final Void result, final Throwable t) {
 
     @Override
     public void close() {
-        isTrue("open", wrapped != null);
         wrapped.close();
-        wrapped = null;
     }
 
     @Override
     public boolean opened() {
-        isTrue("open", wrapped != null);
         return wrapped.opened();
     }
 
     @Override
     public boolean isClosed() {
-        return wrapped == null || wrapped.isClosed();
+        return wrapped.isClosed();
     }
 
     @Override
     public ByteBuf getBuffer(final int size) {
-        isTrue("open", wrapped != null);
         return wrapped.getBuffer(size);
     }
 
     @Override
     public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
-        isTrue("open", wrapped != null);
         wrapped.sendMessage(byteBuffers, lastRequestId);
         lastUsedAt = System.currentTimeMillis();
     }
 
+    @Override
+    public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+        T result = wrapped.sendAndReceive(message, decoder, sessionContext);
+        lastUsedAt = System.currentTimeMillis();
+        return result;
+    }
+
+    @Override
+    public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder,
+                                        final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+        SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(new SingleResultCallback<T>() {
+            @Override
+            public void onResult(final T result, final Throwable t) {
+                lastUsedAt = System.currentTimeMillis();
+                callback.onResult(result, t);
+            }
+        }, LOGGER);
+        wrapped.sendAndReceiveAsync(message, decoder, sessionContext, errHandlingCallback);
+    }
+
     @Override
     public ResponseBuffers receiveMessage(final int responseTo) {
-        isTrue("open", wrapped != null);
         ResponseBuffers responseBuffers = wrapped.receiveMessage(responseTo);
         lastUsedAt = System.currentTimeMillis();
         return responseBuffers;
@@ -109,7 +123,6 @@ public ResponseBuffers receiveMessage(final int responseTo) {
 
     @Override
     public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
-        isTrue("open", wrapped != null);
         SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(new SingleResultCallback<Void>() {
             @Override
             public void onResult(final Void result, final Throwable t) {
@@ -122,7 +135,6 @@ public void onResult(final Void result, final Throwable t) {
 
     @Override
     public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
-        isTrue("open", wrapped != null);
         SingleResultCallback<ResponseBuffers> errHandlingCallback = errorHandlingCallback(new SingleResultCallback<ResponseBuffers>() {
             @Override
             public void onResult(final ResponseBuffers result, final Throwable t) {
@@ -135,7 +147,6 @@ public void onResult(final ResponseBuffers result, final Throwable t) {
 
     @Override
     public ConnectionDescription getDescription() {
-        isTrue("open", wrapped != null);
         return wrapped.getDescription();
     }
 
diff --git a/driver-core/src/main/com/mongodb/internal/connection/WriteProtocol.java b/driver-core/src/main/com/mongodb/internal/connection/WriteProtocol.java
new file mode 100644
index 00000000000..a06f522d63f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/WriteProtocol.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.event.CommandListener;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+import org.bson.io.OutputBuffer;
+
+import static com.mongodb.internal.connection.ProtocolHelper.encodeMessageWithMetadata;
+import static com.mongodb.internal.connection.ProtocolHelper.getMessageSettings;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandFailedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandStartedEvent;
+import static com.mongodb.internal.connection.ProtocolHelper.sendCommandSucceededEvent;
+
+/**
+ * Base class for legacy wire protocol messages that perform unacknowledged writes.
+ */
+abstract class WriteProtocol implements LegacyProtocol<WriteConcernResult> {
+
+    private final MongoNamespace namespace;
+    private final boolean ordered;
+    private CommandListener commandListener;
+
+    WriteProtocol(final MongoNamespace namespace, final boolean ordered) {
+        this.namespace = namespace;
+        this.ordered = ordered;
+    }
+
+    @Override
+    public void setCommandListener(final CommandListener commandListener) {
+        this.commandListener = commandListener;
+    }
+
+    @Override
+    public WriteConcernResult execute(final InternalConnection connection) {
+        RequestMessage requestMessage = null;
+        long startTimeNanos = System.nanoTime();
+        int messageId;
+        boolean sentCommandStartedEvent = false;
+        ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
+        try {
+            requestMessage = createRequestMessage(getMessageSettings(connection.getDescription()));
+            requestMessage.encode(bsonOutput, NoOpSessionContext.INSTANCE);
+            sendStartedEvent(connection, requestMessage, requestMessage.getEncodingMetadata(), bsonOutput);
+            sentCommandStartedEvent = true;
+
+            messageId = requestMessage.getId();
+            connection.sendMessage(bsonOutput.getByteBuffers(), messageId);
+        } catch (RuntimeException e) {
+            sendFailedEvent(connection, requestMessage, sentCommandStartedEvent, e, startTimeNanos);
+            throw e;
+        } finally {
+            bsonOutput.close();
+        }
+
+        sendSucceededEvent(connection, requestMessage, startTimeNanos);
+
+        return WriteConcernResult.unacknowledged();
+    }
+
+    @Override
+    public void executeAsync(final InternalConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
+        executeAsync(createRequestMessage(getMessageSettings(connection.getDescription())), connection, callback);
+    }
+
+    private void executeAsync(final RequestMessage requestMessage, final InternalConnection connection,
+                              final SingleResultCallback<WriteConcernResult> callback) {
+        long startTimeNanos = System.nanoTime();
+        boolean sentCommandStartedEvent = false;
+        try {
+            ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(connection);
+
+            RequestMessage.EncodingMetadata encodingMetadata = encodeMessageWithMetadata(requestMessage, bsonOutput);
+            sendStartedEvent(connection, requestMessage, encodingMetadata, bsonOutput);
+            sentCommandStartedEvent = true;
+
+            connection.sendMessageAsync(bsonOutput.getByteBuffers(), requestMessage.getId(),
+                    new UnacknowledgedWriteResultCallback(callback, requestMessage, bsonOutput, connection, startTimeNanos));
+        } catch (Throwable t) {
+            sendFailedEvent(connection, requestMessage, sentCommandStartedEvent, t, startTimeNanos);
+            callback.onResult(null, t);
+        }
+    }
+
+    protected abstract BsonDocument getAsWriteCommand(ByteBufferBsonOutput bsonOutput, int firstDocumentPosition);
+
+    protected BsonDocument getBaseCommandDocument(final String commandName) {
+        BsonDocument baseCommandDocument = new BsonDocument(commandName, new BsonString(getNamespace().getCollectionName()))
+                .append("ordered", BsonBoolean.valueOf(isOrdered()));
+        baseCommandDocument.append("writeConcern", WriteConcern.UNACKNOWLEDGED.asDocument());
+        return baseCommandDocument;
+    }
+
+    protected String getCommandName(final RequestMessage message) {
+        switch (message.getOpCode()) {
+            case OP_INSERT:
+                return "insert";
+            case OP_UPDATE:
+                return "update";
+            case OP_DELETE:
+                return "delete";
+            default:
+                throw new MongoInternalException("Unexpected op code for write: " + message.getOpCode());
+        }
+    }
+
+
+    private void sendStartedEvent(final InternalConnection connection, final RequestMessage message,
+                                  final RequestMessage.EncodingMetadata encodingMetadata, final ByteBufferBsonOutput bsonOutput) {
+        if (commandListener != null) {
+            sendCommandStartedEvent(message, namespace.getDatabaseName(), getCommandName(message),
+                    getAsWriteCommand(bsonOutput, encodingMetadata.getFirstDocumentPosition()),
+                    connection.getDescription(), commandListener);
+        }
+    }
+
+    private void sendSucceededEvent(final InternalConnection connection, final RequestMessage message,
+                                    final long startTimeNanos) {
+        if (commandListener != null) {
+            sendSucceededEvent(connection, message, getResponseDocument(), startTimeNanos);
+        }
+    }
+
+    private void sendSucceededEvent(final InternalConnection connection, final RequestMessage message,
+                                    final BsonDocument responseDocument, final long startTimeNanos) {
+        if (commandListener != null) {
+            sendCommandSucceededEvent(message, getCommandName(message), responseDocument, connection.getDescription(),
+                    System.nanoTime() - startTimeNanos, commandListener);
+        }
+    }
+
+    private void sendFailedEvent(final InternalConnection connection, final RequestMessage message,
+                                 final boolean sentCommandStartedEvent, final Throwable t, final long startTimeNanos) {
+        if (commandListener != null && sentCommandStartedEvent) {
+            sendCommandFailedEvent(message, getCommandName(message), connection.getDescription(), System.nanoTime() - startTimeNanos, t,
+                    commandListener);
+        }
+    }
+
+    private BsonDocument getResponseDocument() {
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    /**
+     * Create the initial request message for the write.
+     *
+     * @param settings the message settings
+     * @return the request message
+     */
+    protected abstract RequestMessage createRequestMessage(MessageSettings settings);
+
+    /**
+     * Gets the namespace.
+     *
+     * @return the namespace
+     */
+    protected MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Gets whether the writes are ordered.
+     *
+     * @return true if ordered
+     */
+    protected boolean isOrdered() {
+        return ordered;
+    }
+
+    /**
+     * Gets the logger.
+     *
+     * @return the logger
+     */
+    protected abstract Logger getLogger();
+
+    private final class UnacknowledgedWriteResultCallback implements SingleResultCallback<Void> {
+        private final SingleResultCallback<WriteConcernResult> callback;
+        private final RequestMessage message;
+        private final OutputBuffer writtenBuffer;
+        private final InternalConnection connection;
+        private final long startTimeNanos;
+
+        UnacknowledgedWriteResultCallback(final SingleResultCallback<WriteConcernResult> callback,
+                                          final RequestMessage message,
+                                          final OutputBuffer writtenBuffer,
+                                          final InternalConnection connection, final long startTimeNanos) {
+            this.callback = callback;
+            this.message = message;
+            this.connection = connection;
+            this.writtenBuffer = writtenBuffer;
+            this.startTimeNanos = startTimeNanos;
+        }
+
+        @Override
+        public void onResult(final Void result, final Throwable t) {
+            writtenBuffer.close();
+            if (t != null) {
+                sendFailedEvent(connection, message, true, t, startTimeNanos);
+                callback.onResult(null, t);
+            } else {
+                sendSucceededEvent(connection, message, startTimeNanos);
+                callback.onResult(WriteConcernResult.unacknowledged(), null);
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/X509Authenticator.java b/driver-core/src/main/com/mongodb/internal/connection/X509Authenticator.java
new file mode 100644
index 00000000000..e6921eaebb0
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/X509Authenticator.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.AuthenticationMechanism;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+
+import static com.mongodb.internal.connection.CommandHelper.executeCommand;
+import static com.mongodb.internal.connection.CommandHelper.executeCommandAsync;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionThreeDotFour;
+
+class X509Authenticator extends Authenticator {
+    X509Authenticator(final MongoCredentialWithCache credential) {
+        super(credential);
+    }
+
+    @Override
+    void authenticate(final InternalConnection connection, final ConnectionDescription connectionDescription) {
+        try {
+            validateUserName(connectionDescription);
+            BsonDocument authCommand = getAuthCommand(getMongoCredential().getUserName());
+            executeCommand(getMongoCredential().getSource(), authCommand, connection);
+        } catch (MongoCommandException e) {
+            throw new MongoSecurityException(getMongoCredential(), "Exception authenticating", e);
+        }
+    }
+
+    @Override
+    void authenticateAsync(final InternalConnection connection, final ConnectionDescription connectionDescription,
+                           final SingleResultCallback<Void> callback) {
+        try {
+            validateUserName(connectionDescription);
+            executeCommandAsync(getMongoCredential().getSource(), getAuthCommand(getMongoCredential().getUserName()), connection,
+                                new SingleResultCallback<BsonDocument>() {
+                                    @Override
+                                    public void onResult(final BsonDocument nonceResult, final Throwable t) {
+                                        if (t != null) {
+                                            callback.onResult(null, translateThrowable(t));
+                                        } else {
+                                            callback.onResult(null, null);
+                                        }
+                                    }
+                                });
+        } catch (Throwable t) {
+            callback.onResult(null, t);
+        }
+    }
+
+    private BsonDocument getAuthCommand(final String userName) {
+        BsonDocument cmd = new BsonDocument();
+
+        cmd.put("authenticate", new BsonInt32(1));
+        if (userName != null) {
+            cmd.put("user", new BsonString(userName));
+        }
+        cmd.put("mechanism", new BsonString(AuthenticationMechanism.MONGODB_X509.getMechanismName()));
+
+        return cmd;
+    }
+
+    private Throwable translateThrowable(final Throwable t) {
+        if (t instanceof MongoCommandException) {
+            return new MongoSecurityException(getMongoCredential(), "Exception authenticating", t);
+        } else {
+            return t;
+        }
+    }
+
+    private void validateUserName(final ConnectionDescription connectionDescription) {
+        if (getMongoCredential().getUserName() == null && serverIsLessThanVersionThreeDotFour(connectionDescription)) {
+            throw new MongoSecurityException(getMongoCredential(), "User name is required for the MONGODB-X509 authentication mechanism "
+                                                                      + "on server versions less than 3.4");
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ZlibCompressor.java b/driver-core/src/main/com/mongodb/internal/connection/ZlibCompressor.java
new file mode 100644
index 00000000000..b2f4768b541
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ZlibCompressor.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCompressor;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.Deflater;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.InflaterInputStream;
+
+class ZlibCompressor extends Compressor {
+    private final int level;
+
+    ZlibCompressor(final MongoCompressor mongoCompressor) {
+        this.level = mongoCompressor.getPropertyNonNull(MongoCompressor.LEVEL, Deflater.DEFAULT_COMPRESSION);
+    }
+
+    @Override
+    public String getName() {
+        return "zlib";
+    }
+
+    @Override
+    public byte getId() {
+        return 2;
+    }
+
+    @Override
+    InputStream getInputStream(final InputStream source) {
+        return new InflaterInputStream(source);
+    }
+
+    @Override
+    OutputStream getOutputStream(final OutputStream source) {
+        return new DeflaterOutputStream(source, new Deflater(level));
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ZstdCompressor.java b/driver-core/src/main/com/mongodb/internal/connection/ZstdCompressor.java
new file mode 100644
index 00000000000..b7b595e0328
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/ZstdCompressor.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.github.luben.zstd.Zstd;
+import com.github.luben.zstd.ZstdInputStream;
+import com.mongodb.MongoInternalException;
+import org.bson.ByteBuf;
+import org.bson.io.BsonOutput;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+class ZstdCompressor extends Compressor {
+    @Override
+    public String getName() {
+        return "zstd";
+    }
+
+    @Override
+    public byte getId() {
+        return 3;
+    }
+
+    @Override
+    public void compress(final List<ByteBuf> source, final BsonOutput target) {
+        int uncompressedSize = getUncompressedSize(source);
+
+        byte[] singleByteArraySource = new byte[uncompressedSize];
+        copy(source, singleByteArraySource);
+
+        try {
+            byte[] out = new byte[(int) Zstd.compressBound(uncompressedSize)];
+            int compressedSize = (int) Zstd.compress(out, singleByteArraySource, Zstd.maxCompressionLevel());
+            target.writeBytes(out, 0, compressedSize);
+        } catch (RuntimeException e) {
+            throw new MongoInternalException("Unexpected RuntimeException", e);
+        }
+    }
+
+    private int getUncompressedSize(final List<ByteBuf> source) {
+        int uncompressedSize = 0;
+        for (ByteBuf cur : source) {
+            uncompressedSize += cur.remaining();
+        }
+        return uncompressedSize;
+    }
+
+    private void copy(final List<ByteBuf> source, final byte[] in) {
+        int offset = 0;
+        for (ByteBuf cur : source) {
+            int remaining = cur.remaining();
+            cur.get(in, offset, remaining);
+            offset += remaining;
+        }
+    }
+
+    @Override
+    InputStream getInputStream(final InputStream source) throws IOException {
+        return new ZstdInputStream(source);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/BufferAllocator.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/BufferAllocator.java
new file mode 100644
index 00000000000..a3e322b3f6d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/BufferAllocator.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import org.bson.ByteBuf;
+
+/**
+ * A factory for {@link ByteBuf}s. Implementations are free to return heap or
+ * direct buffers, or to do any kind of pooling. They are also expected to be
+ * thread-safe.
+ */
+public interface BufferAllocator {
+
+    /**
+     * Allocate a {@link ByteBuf} with the given initial capacity.
+     */
+    ByteBuf allocate(int size);
+
+    /**
+     * Deallocate the given {@link ByteBuf}.
+     *
+     * @param buffer the buffer to deallocate, that should have been allocated using
+     *               the same {@link BufferAllocator} instance
+     */
+    void free(ByteBuf buffer);
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/ClientTlsChannel.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/ClientTlsChannel.java
new file mode 100644
index 00000000000..d680e23cf7c
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/ClientTlsChannel.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import com.mongodb.internal.connection.tlschannel.impl.BufferHolder;
+import com.mongodb.internal.connection.tlschannel.impl.ByteBufferSet;
+import com.mongodb.internal.connection.tlschannel.impl.TlsChannelImpl;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSession;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.Channel;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+/**
+ * A client-side {@link TlsChannel}.
+ */
+public final class ClientTlsChannel implements TlsChannel {
+
+    /**
+     * Builder of {@link ClientTlsChannel}
+     */
+    public static final class Builder extends TlsChannelBuilder<Builder> {
+
+        private Supplier<SSLEngine> sslEngineFactory;
+
+        private Builder(final ByteChannel underlying, final SSLEngine sslEngine) {
+            super(underlying);
+            this.sslEngineFactory = new Supplier<SSLEngine>() {
+                @Override
+                public SSLEngine get() {
+                    return sslEngine;
+                }
+            };
+        }
+
+        private Builder(final ByteChannel underlying, final SSLContext sslContext) {
+            super(underlying);
+            this.sslEngineFactory = new Supplier<SSLEngine>() {
+                @Override
+                public SSLEngine get() {
+                    return defaultSSLEngineFactory(sslContext);
+                }
+            };
+        }
+
+        @Override
+        Builder getThis() {
+            return this;
+        }
+
+        public ClientTlsChannel build() {
+            return new ClientTlsChannel(underlying, sslEngineFactory.get(), sessionInitCallback, runTasks,
+                    plainBufferAllocator, encryptedBufferAllocator, releaseBuffers, waitForCloseConfirmation);
+        }
+
+    }
+
+    private static SSLEngine defaultSSLEngineFactory(final SSLContext sslContext) {
+        SSLEngine engine = sslContext.createSSLEngine();
+        engine.setUseClientMode(true);
+        return engine;
+    }
+
+    /**
+     * Create a new {@link Builder}, configured with a underlying
+     * {@link Channel} and a fixed {@link SSLEngine}.
+     *
+     * @param underlying a reference to the underlying {@link ByteChannel}
+     * @param sslEngine  the engine to use with this channel
+     */
+    public static Builder newBuilder(final ByteChannel underlying, final SSLEngine sslEngine) {
+        return new Builder(underlying, sslEngine);
+    }
+
+    /**
+     * Create a new {@link Builder}, configured with a underlying
+     * {@link Channel} and a {@link SSLContext}.
+     *
+     * @param underlying a reference to the underlying {@link ByteChannel}
+     * @param sslContext a context to use with this channel, it will be used to create a client {@link SSLEngine}.
+     */
+    public static Builder newBuilder(final ByteChannel underlying, final SSLContext sslContext) {
+        return new Builder(underlying, sslContext);
+    }
+
+    private final ByteChannel underlying;
+    private final TlsChannelImpl impl;
+
+    private ClientTlsChannel(
+            final ByteChannel underlying,
+            final SSLEngine engine,
+            final Consumer<SSLSession> sessionInitCallback,
+            final boolean runTasks,
+            final BufferAllocator plainBufAllocator,
+            final BufferAllocator encryptedBufAllocator,
+            final boolean releaseBuffers,
+            final boolean waitForCloseNotifyOnClose) {
+        if (!engine.getUseClientMode()) {
+            throw new IllegalArgumentException("SSLEngine must be in client mode");
+        }
+        this.underlying = underlying;
+        TrackingAllocator trackingPlainBufAllocator = new TrackingAllocator(plainBufAllocator);
+        TrackingAllocator trackingEncryptedAllocator = new TrackingAllocator(encryptedBufAllocator);
+        impl = new TlsChannelImpl(underlying, underlying, engine, Optional.<BufferHolder>empty(), sessionInitCallback, runTasks,
+                trackingPlainBufAllocator, trackingEncryptedAllocator, releaseBuffers, waitForCloseNotifyOnClose);
+    }
+
+    @Override
+    public ByteChannel getUnderlying() {
+        return underlying;
+    }
+
+    @Override
+    public SSLEngine getSslEngine() {
+        return impl.engine();
+    }
+
+    @Override
+    public Consumer<SSLSession> getSessionInitCallback() {
+        return impl.getSessionInitCallback();
+    }
+
+    @Override
+    public TrackingAllocator getPlainBufferAllocator() {
+        return impl.getPlainBufferAllocator();
+    }
+
+    @Override
+    public TrackingAllocator getEncryptedBufferAllocator() {
+        return impl.getEncryptedBufferAllocator();
+    }
+
+    @Override
+    public boolean getRunTasks() {
+        return impl.getRunTasks();
+    }
+
+    @Override
+    public long read(final ByteBuffer[] dstBuffers, final int offset, final int length) throws IOException {
+        ByteBufferSet dest = new ByteBufferSet(dstBuffers, offset, length);
+        TlsChannelImpl.checkReadBuffer(dest);
+        return impl.read(dest);
+    }
+
+    @Override
+    public long read(final ByteBuffer[] dstBuffers) throws IOException {
+        return read(dstBuffers, 0, dstBuffers.length);
+    }
+
+    @Override
+    public int read(final ByteBuffer dstBuffer) throws IOException {
+        return (int) read(new ByteBuffer[]{dstBuffer});
+    }
+
+    @Override
+    public long write(final ByteBuffer[] srcBuffers, final int offset, final int length) throws IOException {
+        ByteBufferSet source = new ByteBufferSet(srcBuffers, offset, length);
+        return impl.write(source);
+    }
+
+    @Override
+    public long write(final ByteBuffer[] outs) throws IOException {
+        return write(outs, 0, outs.length);
+    }
+
+    @Override
+    public int write(final ByteBuffer srcBuffer) throws IOException {
+        return (int) write(new ByteBuffer[]{srcBuffer});
+    }
+
+    @Override
+    public void renegotiate() throws IOException {
+        impl.renegotiate();
+    }
+
+    @Override
+    public void handshake() throws IOException {
+        impl.handshake();
+    }
+
+    @Override
+    public void close() throws IOException {
+        impl.close();
+    }
+
+    @Override
+    public boolean isOpen() {
+        return impl.isOpen();
+    }
+
+    @Override
+    public boolean shutdown() throws IOException {
+        return impl.shutdown();
+    }
+
+    @Override
+    public boolean shutdownReceived() {
+        return impl.shutdownReceived();
+    }
+
+    @Override
+    public boolean shutdownSent() {
+        return impl.shutdownSent();
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsReadException.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsReadException.java
new file mode 100644
index 00000000000..f8a4e0e303e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsReadException.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import java.nio.channels.ByteChannel;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
+
+/**
+ * This exception signals the caller that the operation cannot continue because
+ * bytesProduced need to be read from the underlying {@link ByteChannel}, the channel is
+ * non-blocking and there are no bytesProduced available. The caller should try the
+ * operation again, either with the channel in blocking mode of after ensuring
+ * that bytesProduced are ready.
+ * <p>
+ * For {@link SocketChannel}s, a {@link Selector} can be used to find out when
+ * the method should be retried.
+ * <p>
+ * Caveat: Any {@link TlsChannel} I/O method can throw this exception. In
+ * particular, <code>write</code> may want to read data. This is because TLS
+ * handshakes may occur at any time (initiated by either the client or the
+ * server).
+ * <p>
+ * This exception is akin to the SSL_ERROR_WANT_READ error code used by OpenSSL.
+ *
+ * @see <a href="https://www.openssl.org/docs/man1.1.0/ssl/SSL_get_error.html">
+ * OpenSSL error documentation</a>
+ */
+public class NeedsReadException extends WouldBlockException {
+
+    private static final long serialVersionUID = 13846137963119227L;
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsTaskException.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsTaskException.java
new file mode 100644
index 00000000000..fff19f37bf5
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsTaskException.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+/**
+ * This exception signals the caller that the operation could not continue
+ * because a CPU-intensive operation (typically a TLS handshaking) needs to be
+ * executed and the {@link TlsChannel} is configured to not run tasks.
+ * This allows the application to run these tasks in some other threads, in
+ * order to not slow the selection loop. The method that threw the exception
+ * should be retried once the task supplied by {@link #getTask()} is executed
+ * and finished.
+ * <p>
+ * This exception is akin to the SSL_ERROR_WANT_ASYNC error code used by OpenSSL
+ * (but note that in OpenSSL, the task is executed by the library, while with
+ * the {@link TlsChannel}, the calling code is responsible for the
+ * execution).
+ *
+ * @see <a href="https://www.openssl.org/docs/man1.1.0/ssl/SSL_get_error.html">
+ * OpenSSL error documentation</a>
+ */
+public class NeedsTaskException extends TlsChannelFlowControlException {
+
+    private static final long serialVersionUID = -7869448883241411803L;
+
+    private Runnable task;
+
+    public NeedsTaskException(final Runnable task) {
+        this.task = task;
+    }
+
+    public Runnable getTask() {
+        return task;
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsWriteException.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsWriteException.java
new file mode 100644
index 00000000000..74d82fe63fd
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/NeedsWriteException.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import java.nio.channels.ByteChannel;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
+
+/**
+ * This exception signals the caller that the operation cannot continue because
+ * bytesProduced need to be write to the underlying {@link ByteChannel}, the channel is
+ * non-blocking and there are no buffer space available. The caller should try
+ * the operation again, either with the channel in blocking mode of after
+ * ensuring that buffer space exists.
+ * <p>
+ * For {@link SocketChannel}s, a {@link Selector} can be used to find out when
+ * the method should be retried.
+ * <p>
+ * Caveat: Any {@link TlsChannel} I/O method can throw this exception. In
+ * particular, <code>read</code> may want to write data. This is because TLS
+ * handshakes may occur at any time (initiated by either the client or the
+ * server).
+ * <p>
+ * This exception is akin to the SSL_ERROR_WANT_WRITE error code used by
+ * OpenSSL.
+ *
+ * @see <a href="https://www.openssl.org/docs/man1.1.0/ssl/SSL_get_error.html">
+ * OpenSSL error documentation</a>
+ */
+
+public class NeedsWriteException extends WouldBlockException {
+
+    private static final long serialVersionUID = -7789167281232559166L;
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannel.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannel.java
new file mode 100644
index 00000000000..d77f3324719
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannel.java
@@ -0,0 +1,530 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.ScatteringByteChannel;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
+import java.util.function.Consumer;
+
+/**
+ * A ByteChannel interface to a TLS (Transport Layer Security) connection.
+ *
+ * <p>
+ * Instances that implement this interface delegate all cryptographic operations
+ * to the standard Java TLS implementation: SSLEngine; effectively hiding it
+ * behind an easy-to-use streaming API, that allows to securitize JVM
+ * applications with minimal added complexity.
+ *
+ * <p>
+ * In other words, an interface that allows the programmer to have TLS using the
+ * same standard socket API used for plaintext, just like OpenSSL does for C,
+ * only for Java.
+ *
+ * <p>
+ * Note that this is an API adapter, not a cryptographic implementation: with
+ * the exception of a few bytesProduced of parsing at the beginning of the connection,
+ * to look for the SNI, the whole protocol implementation is done by the
+ * SSLEngine. Both the SSLContext and SSLEngine are supplied by the client;
+ * these classes are the ones responsible for protocol configuration, including
+ * hostname validation, client-side authentication, etc.
+ *
+ * <p>
+ * A TLS channel is created by using one of its subclasses. They will
+ * take an existing {@link ByteChannel} (typically, but not necessarily, a
+ * {@link SocketChannel}) and a {@link SSLEngine}.
+ *
+ * <p>
+ * It should be noted that this interface extends {@link ByteChannel} as a
+ * design compromise, but it does not follow its interface completely. In
+ * particular, in case of underlying non-blocking channels, when it is not
+ * possible to complete an operation, no zero is returned, but an
+ * {@link WouldBlockException}. This divergence from the base interface is
+ * needed because both a <code>read</code> and a <code>write</code> operation
+ * can run out of both bytesProduced for reading and buffer space for writing, as a
+ * handshake (a bidirectional operation) can happen at any moment. The user
+ * would use a {@link Selector} to wait for the expected condition
+ * <em>of the underlying channel</em>, and should know which operation to
+ * register.
+ *
+ * <p>
+ * On top of that, operations can also fail to complete due to asynchronous
+ * tasks; this is communicated using a {@link NeedsTaskException}. This behavior
+ * is controlled by the {@link #getRunTasks()} attribute. This allows the user
+ * to execute CPU-intensive tasks out of the selector loop.
+ */
+public interface TlsChannel extends ByteChannel, GatheringByteChannel, ScatteringByteChannel {
+
+    /**
+     * Return a reference to the underlying {@link ByteChannel}.
+     */
+    ByteChannel getUnderlying();
+
+    /**
+     * Return a reference to the {@link SSLEngine} used.
+     *
+     * @return the engine reference if present, or <code>null</code> if unknown
+     * (that can happen in server-side channels before the SNI is
+     * parsed).
+     */
+    SSLEngine getSslEngine();
+
+    /**
+     * Return the callback function to be executed when the TLS session is
+     * established (or re-established).
+     *
+     * @see TlsChannelBuilder#withSessionInitCallback(Consumer)
+     */
+    Consumer<SSLSession> getSessionInitCallback();
+
+    /**
+     * Return the {@link BufferAllocator} to use for unencrypted data. Actually, a decorating subclass is returned,
+     * which contains allocation statistics for this channel.
+     *
+     * @see TlsChannelBuilder#withPlainBufferAllocator(BufferAllocator)
+     * @see TrackingAllocator
+     */
+    TrackingAllocator getPlainBufferAllocator();
+
+    /**
+     * Return the {@link BufferAllocator} to use for encrypted data. Actually, a decorating subclass is returned,
+     * which contains allocation statistics for this channel.
+     *
+     * @see TlsChannelBuilder#withEncryptedBufferAllocator(BufferAllocator)
+     * @see TrackingAllocator
+     */
+    TrackingAllocator getEncryptedBufferAllocator();
+
+    /**
+     * Return whether CPU-intensive tasks are run or not.
+     *
+     * @see TlsChannelBuilder#withRunTasks(boolean)
+     */
+    boolean getRunTasks();
+
+    /**
+     * Reads a sequence of bytesProduced from this channel into the given buffer.
+     *
+     * <p>
+     * An attempt is made to read up to <i>r</i> bytesProduced from the channel, where
+     * <i>r</i> is the number of bytesProduced remaining in the buffer, that is,
+     * <tt>dst.remaining()</tt>, at the moment this method is invoked.
+     *
+     * <p>
+     * Suppose that a byte sequence of length <i>n</i> is read, where <tt>0</tt>
+     * &nbsp;<tt>&lt;=</tt>&nbsp;<i>n</i>&nbsp;<tt>&lt;=</tt>&nbsp;<i>r</i>.
+     * This byte sequence will be transferred into the buffer so that the first
+     * byte in the sequence is at index <i>p</i> and the last byte is at index
+     * <i>p</i>&nbsp;<tt>+</tt>&nbsp;<i>n</i>&nbsp;<tt>-</tt>&nbsp;<tt>1</tt>,
+     * where <i>p</i> is the buffer's position at the moment this method is
+     * invoked. Upon return the buffer's position will be equal to <i>p</i>
+     * &nbsp;<tt>+</tt>&nbsp;<i>n</i>; its limit will not have changed.
+     *
+     * <p>
+     * A read operation might not fill the buffer, and in fact it might not read
+     * any bytesProduced at all. Whether or not it does so depends upon the nature and
+     * state of the underlying channel. It is guaranteed, however, that if a
+     * channel is in blocking mode and there is at least one byte remaining in
+     * the buffer then this method will block until at least one byte is read.
+     * On the other hand, if the underlying channel is in non-blocking mode then
+     * a {@link WouldBlockException} may be thrown. Note that this also includes
+     * the possibility of a {@link NeedsWriteException}, due to the fact that,
+     * during a TLS handshake, bytesProduced need to be written to the underlying
+     * channel. In any case, after a {@link WouldBlockException}, the operation
+     * should be retried when the underlying channel is ready (for reading or
+     * writing, depending on the subclass).
+     *
+     * <p>
+     * If the channel is configured to not run tasks and one is due to run, a
+     * {@link NeedsTaskException} will be thrown. In this case the operation
+     * should be retried after the task is run.
+     *
+     * <p>
+     * This method may be invoked at any time. If another thread has already
+     * initiated a read or handshaking operation upon this channel, however,
+     * then an invocation of this method will block until the first operation is
+     * complete.
+     *
+     * @param dst The buffer into which bytesProduced are to be transferred
+     * @return The number of bytesProduced read, or <tt>-1</tt> if the channel has
+     * reached end-of-stream; contrary to the behavior specified in
+     * {@link ByteChannel}, this method never returns 0, but throws
+     * {@link WouldBlockException}
+     * @throws WouldBlockException if the channel is in non-blocking mode and the IO operation
+     *                             cannot be completed immediately
+     * @throws NeedsTaskException  if the channel is not configured to run tasks automatically
+     *                             and a task needs to be executed to complete the operation
+     * @throws SSLException        if the {@link SSLEngine} throws a SSLException
+     * @throws IOException         if the underlying channel throws an IOException
+     */
+    int read(ByteBuffer dst) throws IOException;
+
+    /**
+     * Writes a sequence of bytesProduced to this channel from the given buffer.
+     *
+     * <p>
+     * An attempt is made to write up to <i>r</i> bytesProduced to the channel, where
+     * <i>r</i> is the number of bytesProduced remaining in the buffer, that is,
+     * <tt>src.remaining()</tt>, at the moment this method is invoked.
+     *
+     * <p>
+     * Suppose that a byte sequence of length <i>n</i> is written, where
+     * <tt>0</tt>&nbsp;<tt>&lt;=</tt>&nbsp;<i>n</i>&nbsp;<tt>&lt;=</tt>&nbsp;
+     * <i>r</i>. This byte sequence will be transferred from the buffer starting
+     * at index <i>p</i>, where <i>p</i> is the buffer's position at the moment
+     * this method is invoked; the index of the last byte written will be
+     * <i>p</i>&nbsp;<tt>+</tt>&nbsp;<i>n</i>&nbsp;<tt>-</tt>&nbsp;<tt>1</tt>.
+     * Upon return the buffer's position will be equal to <i>p</i>&nbsp;
+     * <tt>+</tt>&nbsp;<i>n</i>; its limit will not have changed.
+     *
+     * <p>
+     * If the underlying channel is in blocking mode, a write operation will
+     * return only after writing all of the <i>r</i> requested bytesProduced. On the
+     * other hand, if it is in non-blocking mode, this operation may write only
+     * some of the bytesProduced or possibly none at all, in this case a
+     * {@link WouldBlockException} will be thrown. Note that this also includes
+     * the possibility of a {@link NeedsReadException}, due to the fact that,
+     * during a TLS handshake, bytes need to be read from the underlying channel.
+     * In any case, after a {@link WouldBlockException}, the operation should be
+     * retried when the underlying channel is ready (for reading or writing,
+     * depending on the subclass).
+     *
+     * <p>
+     * If the channel is configured to not run tasks and one is due to run, a
+     * {@link NeedsTaskException} will be thrown. In this case the operation
+     * should be retried after the task is run.
+     *
+     * <p>
+     * This method may be invoked at any time. If another thread has already
+     * initiated a write or handshaking operation upon this channel, however,
+     * then an invocation of this method will block until the first operation is
+     * complete.
+     *
+     * @param src The buffer from which bytesProduced are to be retrieved
+     * @return The number of bytesProduced written, contrary to the behavior specified
+     * in {@link ByteChannel}, this method never returns 0, but throws
+     * {@link WouldBlockException}
+     * @throws WouldBlockException if the channel is in non-blocking mode and the IO operation
+     *                             cannot be completed immediately
+     * @throws NeedsTaskException  if the channel is not configured to run tasks automatically
+     *                             and a task needs to be executed to complete the operation
+     * @throws SSLException        if the {@link SSLEngine} throws a SSLException
+     * @throws IOException         if the underlying channel throws an IOException
+     */
+    int write(ByteBuffer src) throws IOException;
+
+    /**
+     * Initiates a handshake (initial or renegotiation) on this channel. This
+     * method is not needed for the initial handshake, as the
+     * <code>read()</code> and <code>write()</code> methods will implicitly do
+     * the initial handshake if needed.
+     *
+     * <p>
+     * This method may block if the underlying channel if in blocking mode.
+     *
+     * <p>
+     * Note that renegotiation is a problematic feature of the TLS protocol,
+     * that should only be initiated at quiet point of the protocol.
+     *
+     * <p>
+     * This method may block if the underlying channel is in blocking mode,
+     * otherwise a {@link WouldBlockException} can be thrown. In this case the
+     * operation should be retried when the underlying channel is ready (for
+     * reading or writing, depending on the subclass).
+     *
+     * <p>
+     * If the channel is configured to not run tasks and one is due to run, a
+     * {@link NeedsTaskException} will be thrown, with a reference to the task.
+     * In this case the operation should be retried after the task is run.
+     *
+     * <p>
+     * This method may be invoked at any time. If another thread has already
+     * initiated a read, write, or handshaking operation upon this channel,
+     * however, then an invocation of this method will block until the first
+     * operation is complete.
+     *
+     * @throws WouldBlockException if the channel is in non-blocking mode and the IO operation
+     *                             cannot be completed immediately
+     * @throws NeedsTaskException  if the channel is not configured to run tasks automatically
+     *                             and a task needs to be executed to complete the operation
+     * @throws SSLException        if the {@link SSLEngine} throws a SSLException
+     * @throws IOException         if the underlying channel throws an IOException
+     */
+    void renegotiate() throws IOException;
+
+    /**
+     * Forces the initial TLS handshake. Calling this method is usually not
+     * needed, as a handshake will happen automatically when doing the first
+     * <code>read()</code> or <code>write()</code> operation. Calling this
+     * method after the initial handshake has been done has no effect.
+     *
+     * <p>
+     * This method may block if the underlying channel is in blocking mode,
+     * otherwise a {@link WouldBlockException} can be thrown. In this case the
+     * operation should be retried when the underlying channel is ready (for
+     * reading or writing, depending on the subclass).
+     *
+     * <p>
+     * If the channel is configured to not run tasks and one is due to run, a
+     * {@link NeedsTaskException} will be thrown, with a reference to the task.
+     * In this case the operation should be retried after the task is run.
+     *
+     * <p>
+     * This method may be invoked at any time. If another thread has already
+     * initiated a read, write, or handshaking operation upon this channel,
+     * however, then an invocation of this method will block until the first
+     * operation is complete.
+     *
+     * @throws WouldBlockException if the channel is in non-blocking mode and the IO operation
+     *                             cannot be completed immediately
+     * @throws NeedsTaskException  if the channel is not configured to run tasks automatically
+     *                             and a task needs to be executed to complete the operation
+     * @throws SSLException        if the {@link SSLEngine} throws a SSLException
+     * @throws IOException         if the underlying channel throws an IOException
+     */
+    void handshake() throws IOException;
+
+    /**
+     * Writes a sequence of bytesProduced to this channel from a subsequence of the
+     * given buffers.
+     *
+     * <p>
+     * See {@link GatheringByteChannel#write(ByteBuffer[], int, int)} for more
+     * details of the meaning of this signature.
+     *
+     * <p>
+     * This method behaves slightly different than the interface specification,
+     * with respect to non-blocking responses, see {@link #write(ByteBuffer)}
+     * for more details.
+     *
+     * @param srcs   The buffers from which bytesProduced are to be retrieved
+     * @param offset The offset within the buffer array of the first buffer from
+     *               which bytesProduced are to be retrieved; must be non-negative and no
+     *               larger than <tt>srcs.length</tt>
+     * @param length The maximum number of buffers to be accessed; must be
+     *               non-negative and no larger than <tt>srcs.length</tt>
+     *               &nbsp;-&nbsp;<tt>offset</tt>
+     * @return The number of bytesProduced written, contrary to the behavior specified
+     * in {@link ByteChannel}, this method never returns 0, but throws
+     * {@link WouldBlockException}
+     * @throws IndexOutOfBoundsException If the preconditions on the <tt>offset</tt> and
+     *                                   <tt>length</tt> parameters do not hold
+     * @throws WouldBlockException       if the channel is in non-blocking mode and the IO operation
+     *                                   cannot be completed immediately
+     * @throws NeedsTaskException        if the channel is not configured to run tasks automatically
+     *                                   and a task needs to be executed to complete the operation
+     * @throws SSLException              if the {@link SSLEngine} throws a SSLException
+     * @throws IOException               if the underlying channel throws an IOException
+     */
+    long write(ByteBuffer[] srcs, int offset, int length) throws IOException;
+
+    /**
+     * Writes a sequence of bytesProduced to this channel from the given buffers.
+     *
+     * <p>
+     * An invocation of this method of the form <tt>c.write(srcs)</tt> behaves
+     * in exactly the same manner as the invocation
+     *
+     * <blockquote>
+     *
+     * <pre>
+     * c.write(srcs, 0, srcs.length);
+     * </pre>
+     *
+     * </blockquote>
+     * <p>
+     * This method behaves slightly different than the interface specification,
+     * with respect to non-blocking responses, see {@link #write(ByteBuffer)}
+     * for more details.
+     *
+     * @param srcs The buffers from which bytesProduced are to be retrieved
+     * @return The number of bytesProduced written, contrary to the behavior specified
+     * in {@link ByteChannel}, this method never returns 0, but throws
+     * {@link WouldBlockException}
+     * @throws IndexOutOfBoundsException If the preconditions on the <tt>offset</tt> and
+     *                                   <tt>length</tt> parameters do not hold
+     * @throws WouldBlockException       if the channel is in non-blocking mode and the IO operation
+     *                                   cannot be completed immediately
+     * @throws NeedsTaskException        if the channel is not configured to run tasks automatically
+     *                                   and a task needs to be executed to complete the operation
+     * @throws SSLException              if the {@link SSLEngine} throws a SSLException
+     * @throws IOException               if the underlying channel throws an IOExceptions
+     */
+    long write(ByteBuffer[] srcs) throws IOException;
+
+    /**
+     * Reads a sequence of bytesProduced from this channel into a subsequence of the
+     * given buffers.
+     *
+     * <p>
+     * See {@link ScatteringByteChannel#read(ByteBuffer[], int, int)} for more
+     * details of the meaning of this signature.
+     *
+     * <p>
+     * This method behaves slightly different than the interface specification,
+     * with respect to non-blocking responses, see {@link #read(ByteBuffer)} for
+     * more details.
+     *
+     * @param dsts   The buffers into which bytesProduced are to be transferred
+     * @param offset The offset within the buffer array of the first buffer into
+     *               which bytesProduced are to be transferred; must be non-negative and no
+     *               larger than <tt>dsts.length</tt>
+     * @param length The maximum number of buffers to be accessed; must be
+     *               non-negative and no larger than <tt>dsts.length</tt>
+     *               &nbsp;-&nbsp;<tt>offset</tt>
+     * @return The number of bytesProduced read, or <tt>-1</tt> if the channel has
+     * reached end-of-stream; contrary to the behavior specified in
+     * {@link ByteChannel}, this method never returns 0, but throws
+     * {@link WouldBlockException}
+     * @throws IndexOutOfBoundsException If the preconditions on the <tt>offset</tt> and
+     *                                   <tt>length</tt> parameters do not hold
+     * @throws WouldBlockException       if the channel is in non-blocking mode and the IO operation
+     *                                   cannot be completed immediately
+     * @throws NeedsTaskException        if the channel is not configured to run tasks automatically
+     *                                   and a task needs to be executed to complete the operation
+     * @throws SSLException              if the {@link SSLEngine} throws a SSLException
+     * @throws IOException               if the underlying channel throws an IOException
+     */
+    long read(ByteBuffer[] dsts, int offset, int length) throws IOException;
+
+    /**
+     * Reads a sequence of bytesProduced from this channel into the given buffers.
+     *
+     * <p>
+     * An invocation of this method of the form <tt>c.read(dsts)</tt> behaves in
+     * exactly the same manner as the invocation
+     *
+     * <blockquote>
+     *
+     * <pre>
+     * c.read(dsts, 0, dsts.length);
+     * </pre>
+     *
+     * </blockquote>
+     *
+     * <p>
+     * This method behaves slightly different than the interface specification,
+     * with respect to non-blocking responses, see {@link #read(ByteBuffer)} for
+     * more details.
+     *
+     * @param dsts The buffers into which bytesProduced are to be transferred
+     * @return The number of bytesProduced read, or <tt>-1</tt> if the channel has
+     * reached end-of-stream; contrary to the behavior specified in
+     * {@link ByteChannel}, this method never returns 0, but throws
+     * {@link WouldBlockException}
+     * @throws IndexOutOfBoundsException If the preconditions on the <tt>offset</tt> and
+     *                                   <tt>length</tt> parameters do not hold
+     * @throws WouldBlockException       if the channel is in non-blocking mode and the IO operation
+     *                                   cannot be completed immediately
+     * @throws NeedsTaskException        if the channel is not configured to run tasks automatically
+     *                                   and a task needs to be executed to complete the operation
+     * @throws SSLException              if the {@link SSLEngine} throws a SSLException
+     * @throws IOException               if the underlying channel throws an IOException
+     */
+    long read(ByteBuffer[] dsts) throws IOException;
+
+    /**
+     * Closes the underlying channel. This method first does some form of TLS
+     * close if not already done. The exact behavior can be configured using the
+     * {@link TlsChannelBuilder#withWaitForCloseConfirmation}.
+     *
+     * <p>
+     * The default behavior mimics what happens in a normal (that is, non
+     * layered) {@link javax.net.ssl.SSLSocket#close()}.
+     *
+     * <p>
+     * For finer control of the TLS close, use {@link #shutdown()}
+     *
+     * @throws IOException if the underlying channel throws an IOException during close.
+     *                     Exceptions thrown during any previous TLS close are not
+     *                     propagated.
+     */
+    void close() throws IOException;
+
+    /**
+     * <p> Shuts down the TLS connection. This method emulates the behavior of OpenSSL's <a
+     * href="https://wiki.openssl.org/index.php/Manual:SSL_shutdown(3)"> SSL_shutdown()</a>.</p>
+     *
+     * <p> The shutdown procedure consists of two steps: the sending of the "close notify" shutdown alert and the
+     * reception of the peer's "close notify". According to the TLS standard, it is acceptable for an application to
+     * only send its shutdown alert and then close the underlying connection without waiting for the peer's response.
+     * When the underlying connection shall be used for more communications, the complete shutdown procedure
+     * (bidirectional "close notify" alerts) must be performed, so that the peers stay synchronized.</p>
+     *
+     * <p> This class supports both uni- and bidirectional shutdown by its 2 step behavior, using this method.</p>
+     *
+     * <p> When this is the first party to send the "close notify" alert, this method will only send the alert, set the
+     * {@link #shutdownSent()} flag and return <code>false</code>. If a unidirectional shutdown is enough, this first
+     * call is sufficient. In order to complete the bidirectional shutdown handshake, This method must be called again.
+     * The second call will wait for the peer's "close notify" shutdown alert. On success, the second call will return
+     * <code>true</code>.</p>
+     *
+     * <p> If the peer already sent the "close notify" alert and it was already processed implicitly inside a read
+     * operation, the {@link #shutdownReceived()} flag is already set. This method will then send the "close notify"
+     * alert, set the {@link #shutdownSent()} flag and immediately return <code>true</code>. It is therefore recommended
+     * to check the return value of this method and call it again, if the bidirectional shutdown is not yet
+     * complete.</p>
+     *
+     * <p> If the underlying channel is blocking, this method will only return once the handshake step has been finished
+     * or an error occurred.</p>
+     *
+     * <p> If the underlying channel is non-blocking, this method may throw {@link WouldBlockException} if the
+     * underlying channel could not support the continuation of the handshake. The calling process then must repeat the
+     * call after taking appropriate action (like waiting in a selector in case of a {@link SocketChannel}).</p>
+     *
+     * <p> Note that despite not being mandated by the specification, a proper TLS close is important to prevent
+     * truncation attacks, which consists, essentially, of an adversary introducing TCP FIN segments to trick on party
+     * to ignore the final bytes of a secure stream. For more details, see <a href="https://hal.inria.fr/hal-01102013">the
+     * original paper</a>.</p>
+     *
+     * @return whether the closing is finished.
+     * @throws IOException         if the underlying channel throws an IOException
+     * @throws WouldBlockException if the channel is in non-blocking mode and the IO operation cannot be completed
+     *                             immediately
+     * @see TlsChannelBuilder#withWaitForCloseConfirmation(boolean)
+     */
+    boolean shutdown() throws IOException;
+
+    /**
+     * Return whether this side of the connection has already received the close
+     * notification.
+     *
+     * @return <code>true</code> if the close notification was received
+     * @see #shutdown()
+     */
+    boolean shutdownReceived();
+
+    /**
+     * Return whether this side of the connection has already sent the close
+     * notification.
+     *
+     * @return <code>true</code> if the close notification was sent
+     * @see #shutdown()
+     */
+    boolean shutdownSent();
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannelBuilder.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannelBuilder.java
new file mode 100644
index 00000000000..ebaaa466cfe
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannelBuilder.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import java.io.IOException;
+import java.nio.channels.ByteChannel;
+import java.util.function.Consumer;
+
+/**
+ * Base class for builders of {@link TlsChannel}.
+ */
+public abstract class TlsChannelBuilder<T extends TlsChannelBuilder<T>> {
+
+    final ByteChannel underlying;
+
+    // @formatter:off
+    Consumer<SSLSession> sessionInitCallback = new Consumer<SSLSession>() {
+        @Override
+        public void accept(final SSLSession session) {
+        }
+    };
+    // @formatter:on
+    boolean runTasks = true;
+    BufferAllocator plainBufferAllocator = null;
+    BufferAllocator encryptedBufferAllocator = null;
+    boolean releaseBuffers = true;
+    boolean waitForCloseConfirmation = false;
+
+    TlsChannelBuilder(final ByteChannel underlying) {
+        this.underlying = underlying;
+    }
+
+    abstract T getThis();
+
+    /**
+     * Whether CPU-intensive tasks are run or not. Default is to do run them. If
+     * setting this <code>false</code>, the calling code should be prepared to handle
+     * {@link NeedsTaskException}}
+     */
+    public T withRunTasks(final boolean runTasks) {
+        this.runTasks = runTasks;
+        return getThis();
+    }
+
+    /**
+     * Set the {@link BufferAllocator} to use for unencrypted data.
+     */
+    public T withPlainBufferAllocator(final BufferAllocator bufferAllocator) {
+        this.plainBufferAllocator = bufferAllocator;
+        return getThis();
+    }
+
+    /**
+     * Set the {@link BufferAllocator} to use for encrypted data.
+     */
+    public T withEncryptedBufferAllocator(final BufferAllocator bufferAllocator) {
+        this.encryptedBufferAllocator = bufferAllocator;
+        return getThis();
+    }
+
+    /**
+     * Register a callback function to be executed when the TLS session is
+     * established (or re-established). The supplied function will run in the
+     * same thread as the rest of the handshake, so it should ideally run as
+     * fast as possible.
+     */
+    public T withSessionInitCallback(final Consumer<SSLSession> sessionInitCallback) {
+        this.sessionInitCallback = sessionInitCallback;
+        return getThis();
+    }
+
+    /**
+     * Whether to release unused buffers in the mid of connections. Equivalent to
+     * OpenSSL's SSL_MODE_RELEASE_BUFFERS.
+     * <p>
+     * Default is to release. Releasing unused buffers is specially effective
+     * in the case case of idle long-lived connections, when the memory footprint
+     * can be reduced significantly. A potential reason for setting this value
+     * to <code>false</code> is performance, since more releases means more
+     * allocations, which have a cost. This is effectively a memory-time trade-off.
+     * However, in most cases the default behavior makes sense.
+     */
+    public T withReleaseBuffers(final boolean releaseBuffers) {
+        this.releaseBuffers = releaseBuffers;
+        return getThis();
+    }
+
+    /**
+     * <p> Whether to wait for TLS close confirmation when executing a local {@link TlsChannel#close()} on the channel.
+     * If the underlying channel is blocking, setting this to <code>true</code> will block (potentially until it times
+     * out, or indefinitely) the close operation until the counterpart confirms the close on their side (sending a
+     * close_notify alert. If the underlying channel is non-blocking, setting this parameter to true is ineffective.
+     * </p>
+     *
+     * <p> Setting this value to <code>true</code> emulates the behavior of {@link SSLSocket} when used in layered mode
+     * (and without autoClose). </p>
+     *
+     * <p> Even when this behavior is enabled, the close operation will not propagate any {@link IOException} thrown
+     * during the TLS close exchange and just proceed to close the underlying channel. </p>
+     *
+     * <p> Default is to not wait and close immediately. The proper closing procedure can be initiated at any moment
+     * using {@link TlsChannel#shutdown()}.</p>
+     *
+     * @see TlsChannel#shutdown()
+     */
+    public T withWaitForCloseConfirmation(final boolean waitForCloseConfirmation) {
+        this.waitForCloseConfirmation = waitForCloseConfirmation;
+        return getThis();
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannelFlowControlException.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannelFlowControlException.java
new file mode 100644
index 00000000000..bee45881424
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TlsChannelFlowControlException.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import java.io.IOException;
+import java.nio.channels.ByteChannel;
+
+/**
+ * Base class for exceptions used to control flow.
+ * <p>
+ * Because exceptions of this class are not used to signal errors, they don't
+ * contain stack traces, to improve efficiency.
+ * <p>
+ * This class inherits from {@link IOException} as a compromise to allow
+ * {@link TlsChannel} to throw it while still implementing the
+ * {@link ByteChannel} interface.
+ */
+public abstract class TlsChannelFlowControlException extends IOException {
+
+    private static final long serialVersionUID = 6237031103824382007L;
+
+    public TlsChannelFlowControlException() {
+        super();
+    }
+
+    /**
+     * For efficiency, override this method to do nothing.
+     */
+    @Override
+    public Throwable fillInStackTrace() {
+        return this;
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TrackingAllocator.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TrackingAllocator.java
new file mode 100644
index 00000000000..b601cdece4d
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/TrackingAllocator.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+import org.bson.ByteBuf;
+
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAccumulator;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.LongBinaryOperator;
+
+/**
+ * A decorating {@link BufferAllocator} that keeps statistics.
+ */
+public class TrackingAllocator implements BufferAllocator {
+
+    private BufferAllocator impl;
+
+    private LongAdder bytesAllocatedAdder = new LongAdder();
+    private LongAdder bytesDeallocatedAdder = new LongAdder();
+    private AtomicLong currentAllocationSize = new AtomicLong();
+    private LongAccumulator maxAllocationSizeAcc = new LongAccumulator(new LongBinaryOperator() {
+        @Override
+        public long applyAsLong(final long a, final long b) {
+            return Math.max(a, b);
+        }
+    }, 0);
+
+    private LongAdder buffersAllocatedAdder = new LongAdder();
+    private LongAdder buffersDeallocatedAdder = new LongAdder();
+
+    public TrackingAllocator(final BufferAllocator impl) {
+        this.impl = impl;
+    }
+
+    public ByteBuf allocate(final int size) {
+        bytesAllocatedAdder.add(size);
+        currentAllocationSize.addAndGet(size);
+        buffersAllocatedAdder.increment();
+        return impl.allocate(size);
+    }
+
+    public void free(final ByteBuf buffer) {
+        int size = buffer.capacity();
+        bytesDeallocatedAdder.add(size);
+        maxAllocationSizeAcc.accumulate(currentAllocationSize.longValue());
+        currentAllocationSize.addAndGet(-size);
+        buffersDeallocatedAdder.increment();
+        impl.free(buffer);
+    }
+
+    public long bytesAllocated() {
+        return bytesAllocatedAdder.longValue();
+    }
+
+    public long bytesDeallocated() {
+        return bytesDeallocatedAdder.longValue();
+    }
+
+    public long currentAllocation() {
+        return currentAllocationSize.longValue();
+    }
+
+    public long maxAllocation() {
+        return maxAllocationSizeAcc.longValue();
+    }
+
+    public long buffersAllocated() {
+        return buffersAllocatedAdder.longValue();
+    }
+
+    public long buffersDeallocated() {
+        return buffersDeallocatedAdder.longValue();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/WouldBlockException.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/WouldBlockException.java
new file mode 100644
index 00000000000..ee8296c905e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/WouldBlockException.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel;
+
+/**
+ * Signals that some IO operation cannot continue because the channel is in non
+ * blocking mode and some blocking would otherwise happen.
+ */
+public class WouldBlockException extends TlsChannelFlowControlException {
+
+    private static final long serialVersionUID = -165334493836093518L;
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/async/AsynchronousTlsChannel.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/async/AsynchronousTlsChannel.java
new file mode 100644
index 00000000000..76e9eca006b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/async/AsynchronousTlsChannel.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.async;
+
+import com.mongodb.internal.connection.ExtendedAsynchronousByteChannel;
+import com.mongodb.internal.connection.tlschannel.TlsChannel;
+import com.mongodb.internal.connection.tlschannel.impl.ByteBufferSet;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousByteChannel;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.CompletionHandler;
+import java.nio.channels.SocketChannel;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.LongConsumer;
+
+/**
+ * An {@link AsynchronousByteChannel} that works using {@link TlsChannel}s.
+ */
+public class AsynchronousTlsChannel implements ExtendedAsynchronousByteChannel {
+
+    private class FutureReadResult extends CompletableFuture<Integer> {
+        AsynchronousTlsChannelGroup.ReadOperation op;
+
+        @Override
+        public boolean cancel(final boolean mayInterruptIfRunning) {
+            super.cancel(mayInterruptIfRunning);
+            return group.doCancelRead(registeredSocket, op);
+        }
+    }
+
+    private class FutureWriteResult extends CompletableFuture<Integer> {
+        AsynchronousTlsChannelGroup.WriteOperation op;
+
+        @Override
+        public boolean cancel(final boolean mayInterruptIfRunning) {
+            super.cancel(mayInterruptIfRunning);
+            return group.doCancelWrite(registeredSocket, op);
+        }
+    }
+
+    private final AsynchronousTlsChannelGroup group;
+    private final TlsChannel tlsChannel;
+    private final AsynchronousTlsChannelGroup.RegisteredSocket registeredSocket;
+
+    /**
+     * Initializes a new instance of this class.
+     *
+     * @param channelGroup  group to associate new new channel to
+     * @param tlsChannel    existing TLS channel to be used asynchronously
+     * @param socketChannel underlying socket
+     * @throws ClosedChannelException   if any of the underlying channels are closed.
+     * @throws IllegalArgumentException is the socket is in blocking mode
+     */
+    public AsynchronousTlsChannel(
+            final AsynchronousTlsChannelGroup channelGroup,
+            final TlsChannel tlsChannel,
+            final SocketChannel socketChannel) throws ClosedChannelException, IllegalArgumentException {
+        if (!socketChannel.isOpen()) {
+            throw new ClosedChannelException();
+        }
+        if (!tlsChannel.isOpen()) {
+            throw new ClosedChannelException();
+        }
+        if (socketChannel.isBlocking()) {
+            throw new IllegalArgumentException("socket channel must be in non-blocking mode");
+        }
+        this.group = channelGroup;
+        this.tlsChannel = tlsChannel;
+        this.registeredSocket = channelGroup.registerSocket(tlsChannel, socketChannel);
+    }
+
+    @Override
+    public <A> void read(
+            final ByteBuffer dst,
+            final A attach, final CompletionHandler<Integer, ? super A> handler) {
+        checkReadOnly(dst);
+        if (!dst.hasRemaining()) {
+            completeWithZeroInt(attach, handler);
+            return;
+        }
+        group.startRead(
+                registeredSocket,
+                new ByteBufferSet(dst),
+                0, TimeUnit.MILLISECONDS,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.completed((int) c, attach);
+                            }
+                        });
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable e) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.failed(e, attach);
+                            }
+                        });
+                    }
+                });
+    }
+
+    @Override
+    public <A> void read(
+            final ByteBuffer dst,
+            final long timeout, final TimeUnit unit,
+            final A attach, final CompletionHandler<Integer, ? super A> handler) {
+        checkReadOnly(dst);
+        if (!dst.hasRemaining()) {
+            completeWithZeroInt(attach, handler);
+            return;
+        }
+        group.startRead(
+                registeredSocket,
+                new ByteBufferSet(dst),
+                timeout, unit,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.completed((int) c, attach);
+                            }
+                        });
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable e) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.failed(e, attach);
+                            }
+                        });
+                    }
+                });
+    }
+
+    @Override
+    public <A> void read(
+            final ByteBuffer[] dsts, final int offset, final int length,
+            final long timeout, final TimeUnit unit,
+            final A attach, final CompletionHandler<Long, ? super A> handler) {
+        ByteBufferSet bufferSet = new ByteBufferSet(dsts, offset, length);
+        if (bufferSet.isReadOnly()) {
+            throw new IllegalArgumentException("buffer is read-only");
+        }
+        if (!bufferSet.hasRemaining()) {
+            completeWithZeroLong(attach, handler);
+            return;
+        }
+        group.startRead(
+                registeredSocket,
+                bufferSet,
+                timeout, unit,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.completed(c, attach);
+                            }
+                        });
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable e) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.failed(e, attach);
+                            }
+                        });
+                    }
+                });
+    }
+
+    @Override
+    public Future<Integer> read(final ByteBuffer dst) {
+        checkReadOnly(dst);
+        if (!dst.hasRemaining()) {
+            return CompletableFuture.completedFuture(0);
+        }
+        final FutureReadResult future = new FutureReadResult();
+        future.op = group.startRead(
+                registeredSocket,
+                new ByteBufferSet(dst),
+                0, TimeUnit.MILLISECONDS,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        future.complete((int) c);
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable ex) {
+                        future.completeExceptionally(ex);
+                    }
+                });
+        return future;
+    }
+
+    private void checkReadOnly(final ByteBuffer dst) {
+        if (dst.isReadOnly()) {
+            throw new IllegalArgumentException("buffer is read-only");
+        }
+    }
+
+    @Override
+    public <A> void write(final ByteBuffer src, final A attach, final CompletionHandler<Integer, ? super A> handler) {
+        if (!src.hasRemaining()) {
+            completeWithZeroInt(attach, handler);
+            return;
+        }
+        group.startWrite(
+                registeredSocket,
+                new ByteBufferSet(src),
+                0, TimeUnit.MILLISECONDS,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.completed((int) c, attach);
+                            }
+                        });
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable e) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.failed(e, attach);
+                            }
+                        });
+                    }
+                });
+    }
+
+    @Override
+    public <A> void write(
+            final ByteBuffer src,
+            final long timeout, final TimeUnit unit,
+            final A attach, final CompletionHandler<Integer, ? super A> handler) {
+        if (!src.hasRemaining()) {
+            completeWithZeroInt(attach, handler);
+            return;
+        }
+        group.startWrite(
+                registeredSocket,
+                new ByteBufferSet(src),
+                timeout, unit,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.completed((int) c, attach);
+                            }
+                        });
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable e) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.failed(e, attach);
+                            }
+                        });
+                    }
+                });
+    }
+
+    @Override
+    public <A> void write(
+            final ByteBuffer[] srcs, final int offset, final int length,
+            final long timeout, final TimeUnit unit,
+            final A attach, final CompletionHandler<Long, ? super A> handler) {
+        ByteBufferSet bufferSet = new ByteBufferSet(srcs, offset, length);
+        if (!bufferSet.hasRemaining()) {
+            completeWithZeroLong(attach, handler);
+            return;
+        }
+        group.startWrite(
+                registeredSocket,
+                bufferSet,
+                timeout, unit,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.completed(c, attach);
+                            }
+                        });
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable e) {
+                        group.executor.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                handler.failed(e, attach);
+                            }
+                        });
+                    }
+                });
+    }
+
+    @Override
+    public Future<Integer> write(final ByteBuffer src) {
+        if (!src.hasRemaining()) {
+            return CompletableFuture.completedFuture(0);
+        }
+        final FutureWriteResult future = new FutureWriteResult();
+        future.op = group.startWrite(
+                registeredSocket,
+                new ByteBufferSet(src),
+                0, TimeUnit.MILLISECONDS,
+                new LongConsumer() {
+                    @Override
+                    public void accept(final long c) {
+                        future.complete((int) c);
+                    }
+                },
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(final Throwable ex) {
+                        future.completeExceptionally(ex);
+                    }
+                });
+        return future;
+    }
+
+    private <A> void completeWithZeroInt(final A attach, final CompletionHandler<Integer, ? super A> handler) {
+        group.executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                handler.completed(0, attach);
+            }
+        });
+    }
+
+    private <A> void completeWithZeroLong(final A attach, final CompletionHandler<Long, ? super A> handler) {
+        group.executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                handler.completed(0L, attach);
+            }
+        });
+    }
+
+    /**
+     * Tells whether or not this channel is open.
+     *
+     * @return <tt>true</tt> if, and only if, this channel is open
+     */
+    @Override
+    public boolean isOpen() {
+        return tlsChannel.isOpen();
+    }
+
+    /**
+     * Closes this channel.
+     *
+     * <p>This method will close the underlying {@link TlsChannel} and also deregister it from its group.</p>
+     *
+     * @throws IOException If an I/O error occurs
+     */
+    @Override
+    public void close() throws IOException {
+        tlsChannel.close();
+        registeredSocket.close();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/async/AsynchronousTlsChannelGroup.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/async/AsynchronousTlsChannelGroup.java
new file mode 100644
index 00000000000..356d47aaf6b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/async/AsynchronousTlsChannelGroup.java
@@ -0,0 +1,795 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.async;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.connection.tlschannel.NeedsReadException;
+import com.mongodb.internal.connection.tlschannel.NeedsTaskException;
+import com.mongodb.internal.connection.tlschannel.NeedsWriteException;
+import com.mongodb.internal.connection.tlschannel.TlsChannel;
+import com.mongodb.internal.connection.tlschannel.impl.ByteBufferSet;
+import com.mongodb.internal.connection.tlschannel.util.Util;
+
+import java.io.IOException;
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.InterruptedByTimeoutException;
+import java.nio.channels.ReadPendingException;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ShutdownChannelGroupException;
+import java.nio.channels.SocketChannel;
+import java.nio.channels.WritePendingException;
+import java.util.Iterator;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Consumer;
+import java.util.function.IntBinaryOperator;
+import java.util.function.LongConsumer;
+
+import static java.lang.String.format;
+
+/**
+ * This class encapsulates the infrastructure for running {@link AsynchronousTlsChannel}s. Each instance of this class
+ * is a singleton-like object that manages a thread pool that makes it possible to run a group of asynchronous
+ * channels.
+ */
+public class AsynchronousTlsChannelGroup {
+
+    private static final Logger LOGGER = Loggers.getLogger("connection.tls");
+
+    /**
+     * The main executor of the group has a queue, whose size is a multiple of the number of CPUs.
+     */
+    private static final int QUEUE_LENGTH_MULTIPLIER = 32;
+
+    private static AtomicInteger globalGroupCount = new AtomicInteger();
+
+    class RegisteredSocket {
+
+        final TlsChannel tlsChannel;
+        final SocketChannel socketChannel;
+
+        /**
+         * Used to wait until the channel is effectively in the selector (which happens asynchronously to the initial
+         * registration.
+         */
+        final CountDownLatch registered = new CountDownLatch(1);
+
+        SelectionKey key;
+
+        /**
+         * Protects {@link #readOperation} reference and instance.
+         */
+        final Lock readLock = new ReentrantLock();
+
+        /**
+         * Protects {@link #writeOperation} reference and instance.
+         */
+        final Lock writeLock = new ReentrantLock();
+
+        /**
+         * Current read operation, in not null
+         */
+        ReadOperation readOperation;
+
+        /**
+         * Current write operation, if not null
+         */
+        WriteOperation writeOperation;
+
+        /**
+         * Bitwise union of pending operation to be registered in the selector
+         */
+        final AtomicInteger pendingOps = new AtomicInteger();
+
+        RegisteredSocket(final TlsChannel tlsChannel, final SocketChannel socketChannel) {
+            this.tlsChannel = tlsChannel;
+            this.socketChannel = socketChannel;
+        }
+
+        public void close() {
+            doCancelRead(this, null);
+            doCancelWrite(this, null);
+            key.cancel();
+            currentRegistrations.getAndDecrement();
+            /*
+             * Actual de-registration from the selector will happen asynchronously.
+             */
+            selector.wakeup();
+        }
+    }
+
+    private abstract static class Operation {
+        final ByteBufferSet bufferSet;
+        final LongConsumer onSuccess;
+        final Consumer<Throwable> onFailure;
+        Future<?> timeoutFuture;
+
+        Operation(final ByteBufferSet bufferSet, final LongConsumer onSuccess, final Consumer<Throwable> onFailure) {
+            this.bufferSet = bufferSet;
+            this.onSuccess = onSuccess;
+            this.onFailure = onFailure;
+        }
+    }
+
+    static final class ReadOperation extends Operation {
+        ReadOperation(final ByteBufferSet bufferSet, final LongConsumer onSuccess, final Consumer<Throwable> onFailure) {
+            super(bufferSet, onSuccess, onFailure);
+        }
+    }
+
+    static final class WriteOperation extends Operation {
+
+        /**
+         * Because a write operation can flag a block (needs read/write) even after the source buffer was read from, we
+         * need to accumulate consumed bytes.
+         */
+        long consumesBytes = 0;
+
+        WriteOperation(final ByteBufferSet bufferSet, final LongConsumer onSuccess, final Consumer<Throwable> onFailure) {
+            super(bufferSet, onSuccess, onFailure);
+        }
+    }
+
+    private final int id = globalGroupCount.getAndIncrement();
+
+    /**
+     * With the intention of being spacer with warnings, use this flag to ensure that we only log the warning about
+     * needed task once.
+     */
+    private final AtomicBoolean loggedTaskWarning = new AtomicBoolean();
+
+    private final Selector selector;
+
+    final ExecutorService executor;
+
+    private final ScheduledThreadPoolExecutor timeoutExecutor = new ScheduledThreadPoolExecutor(1, new ThreadFactory() {
+        @Override
+        public Thread newThread(final Runnable runnable) {
+            return new Thread(runnable, format("async-channel-group-%d-timeout-thread", id));
+        }
+    }
+    );
+
+    private final Thread selectorThread = new Thread(new Runnable() {
+        @Override
+        public void run() {
+            AsynchronousTlsChannelGroup.this.loop();
+        }
+    }, format("async-channel-group-%d-selector", id));
+
+    private final ConcurrentLinkedQueue<RegisteredSocket> pendingRegistrations = new ConcurrentLinkedQueue<RegisteredSocket>();
+
+    private enum Shutdown {
+        No, Wait, Immediate
+    }
+
+    private volatile Shutdown shutdown = Shutdown.No;
+
+    private LongAdder selectionCount = new LongAdder();
+
+    private LongAdder startedReads = new LongAdder();
+    private LongAdder startedWrites = new LongAdder();
+    private LongAdder successfulReads = new LongAdder();
+    private LongAdder successfulWrites = new LongAdder();
+    private LongAdder failedReads = new LongAdder();
+    private LongAdder failedWrites = new LongAdder();
+    private LongAdder cancelledReads = new LongAdder();
+    private LongAdder cancelledWrites = new LongAdder();
+
+    // used for synchronization
+    private AtomicInteger currentRegistrations = new AtomicInteger();
+
+    private LongAdder currentReads = new LongAdder();
+    private LongAdder currentWrites = new LongAdder();
+
+    /**
+     * Creates an instance of this class.
+     *
+     * @param nThreads number of threads in the executor used to assist the selector loop and run completion handlers.
+     */
+    public AsynchronousTlsChannelGroup(final int nThreads) {
+        try {
+            selector = Selector.open();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        timeoutExecutor.setRemoveOnCancelPolicy(true);
+        this.executor = new ThreadPoolExecutor(
+                nThreads, nThreads,
+                0, TimeUnit.MILLISECONDS,
+                new LinkedBlockingQueue<Runnable>(nThreads * QUEUE_LENGTH_MULTIPLIER),
+                new ThreadFactory() {
+                    @Override
+                    public Thread newThread(final Runnable runnable) {
+                        return new Thread(runnable, format("async-channel-group-%d-handler-executor", id));
+                    }
+                },
+                new ThreadPoolExecutor.CallerRunsPolicy());
+        selectorThread.start();
+    }
+
+    /**
+     * Creates an instance of this class, using as many thread as available processors.
+     */
+    public AsynchronousTlsChannelGroup() {
+        this(Runtime.getRuntime().availableProcessors());
+    }
+
+    RegisteredSocket registerSocket(final TlsChannel reader, final SocketChannel socketChannel) {
+        if (shutdown != Shutdown.No) {
+            throw new ShutdownChannelGroupException();
+        }
+        RegisteredSocket socket = new RegisteredSocket(reader, socketChannel);
+        currentRegistrations.getAndIncrement();
+        pendingRegistrations.add(socket);
+        selector.wakeup();
+        return socket;
+    }
+
+    boolean doCancelRead(final RegisteredSocket socket, final ReadOperation op) {
+        socket.readLock.lock();
+        try {
+            // a null op means cancel any operation
+            if (op != null && socket.readOperation == op || op == null && socket.readOperation != null) {
+                socket.readOperation = null;
+                cancelledReads.increment();
+                currentReads.decrement();
+                return true;
+            } else {
+                return false;
+            }
+        } finally {
+            socket.readLock.unlock();
+        }
+    }
+
+    boolean doCancelWrite(final RegisteredSocket socket, final WriteOperation op) {
+        socket.writeLock.lock();
+        try {
+            // a null op means cancel any operation
+            if (op != null && socket.writeOperation == op || op == null && socket.writeOperation != null) {
+                socket.writeOperation = null;
+                cancelledWrites.increment();
+                currentWrites.decrement();
+                return true;
+            } else {
+                return false;
+            }
+        } finally {
+            socket.writeLock.unlock();
+        }
+    }
+
+    ReadOperation startRead(
+            final RegisteredSocket socket,
+            final ByteBufferSet buffer,
+            final long timeout, final TimeUnit unit,
+            final LongConsumer onSuccess, final Consumer<Throwable> onFailure)
+            throws ReadPendingException {
+        checkTerminated();
+        Util.assertTrue(buffer.hasRemaining());
+        waitForSocketRegistration(socket);
+        ReadOperation op;
+        socket.readLock.lock();
+        try {
+            if (socket.readOperation != null) {
+                throw new ReadPendingException();
+            }
+            op = new ReadOperation(buffer, onSuccess, onFailure);
+            final ReadOperation finalOp = op;
+            /*
+             * we do not try to outsmart the TLS state machine and register for both IO operations for each new socket
+             * operation
+             */
+            socket.pendingOps.set(SelectionKey.OP_WRITE | SelectionKey.OP_READ);
+            if (timeout != 0) {
+                op.timeoutFuture = timeoutExecutor.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        boolean success = AsynchronousTlsChannelGroup.this.doCancelRead(socket, finalOp);
+                        if (success) {
+                            finalOp.onFailure.accept(new InterruptedByTimeoutException());
+                        }
+                    }
+                }, timeout, unit);
+            }
+            socket.readOperation = op;
+        } finally {
+            socket.readLock.unlock();
+        }
+        selector.wakeup();
+        startedReads.increment();
+        currentReads.increment();
+        return op;
+    }
+
+    WriteOperation startWrite(
+            final RegisteredSocket socket,
+            final ByteBufferSet buffer,
+            final long timeout, final TimeUnit unit,
+            final LongConsumer onSuccess, final Consumer<Throwable> onFailure)
+            throws WritePendingException {
+        checkTerminated();
+        Util.assertTrue(buffer.hasRemaining());
+        waitForSocketRegistration(socket);
+        WriteOperation op;
+        socket.writeLock.lock();
+        try {
+            if (socket.writeOperation != null) {
+                throw new WritePendingException();
+            }
+            op = new WriteOperation(buffer, onSuccess, onFailure);
+            final WriteOperation finalOp = op;
+            /*
+             * we do not try to outsmart the TLS state machine and register for both IO operations for each new socket
+             * operation
+             */
+            socket.pendingOps.set(SelectionKey.OP_WRITE | SelectionKey.OP_READ);
+            if (timeout != 0) {
+                op.timeoutFuture = timeoutExecutor.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        boolean success = AsynchronousTlsChannelGroup.this.doCancelWrite(socket, finalOp);
+                        if (success) {
+                            finalOp.onFailure.accept(new InterruptedByTimeoutException());
+                        }
+                    }
+                }, timeout, unit);
+            }
+            socket.writeOperation = op;
+        } finally {
+            socket.writeLock.unlock();
+        }
+        selector.wakeup();
+        startedWrites.increment();
+        currentWrites.increment();
+        return op;
+    }
+
+    private void checkTerminated() {
+        if (isTerminated()) {
+            throw new ShutdownChannelGroupException();
+        }
+    }
+
+    private void waitForSocketRegistration(final RegisteredSocket socket) {
+        try {
+            socket.registered.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void loop() {
+        try {
+            while (shutdown == Shutdown.No || shutdown == Shutdown.Wait && currentRegistrations.intValue() > 0) {
+                int c = selector.select(); // block
+                selectionCount.increment();
+                // avoid unnecessary creation of iterator object
+                if (c > 0) {
+                    Iterator<SelectionKey> it = selector.selectedKeys().iterator();
+                    while (it.hasNext()) {
+                        SelectionKey key = it.next();
+                        it.remove();
+                        try {
+                            key.interestOps(0);
+                        } catch (CancelledKeyException e) {
+                            // can happen when channels are closed with pending operations
+                            continue;
+                        }
+                        RegisteredSocket socket = (RegisteredSocket) key.attachment();
+                        processRead(socket);
+                        processWrite(socket);
+                    }
+                }
+                registerPendingSockets();
+                processPendingInterests();
+            }
+        } catch (Throwable e) {
+            LOGGER.error("error in selector loop", e);
+        } finally {
+            executor.shutdown();
+            // use shutdownNow to stop delayed tasks
+            timeoutExecutor.shutdownNow();
+            if (shutdown == Shutdown.Immediate) {
+                for (SelectionKey key : selector.keys()) {
+                    RegisteredSocket socket = (RegisteredSocket) key.attachment();
+                    socket.close();
+                }
+            }
+            try {
+                selector.close();
+            } catch (IOException e) {
+                LOGGER.warn(format("error closing selector: %s", e.getMessage()));
+            }
+        }
+    }
+
+    private void processPendingInterests() {
+        for (SelectionKey key : selector.keys()) {
+            RegisteredSocket socket = (RegisteredSocket) key.attachment();
+            int pending = socket.pendingOps.getAndSet(0);
+            if (pending != 0) {
+                key.interestOps(key.interestOps() | pending);
+            }
+        }
+    }
+
+    private void processWrite(final RegisteredSocket socket) {
+        socket.writeLock.lock();
+        try {
+            final WriteOperation op = socket.writeOperation;
+            if (op != null) {
+                executor.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            AsynchronousTlsChannelGroup.this.doWrite(socket, op);
+                        } catch (Throwable e) {
+                            LOGGER.error("error in operation", e);
+                        }
+                    }
+                });
+            }
+        } finally {
+            socket.writeLock.unlock();
+        }
+    }
+
+    private void processRead(final RegisteredSocket socket) {
+        socket.readLock.lock();
+        try {
+            final ReadOperation op = socket.readOperation;
+            if (op != null) {
+                executor.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            AsynchronousTlsChannelGroup.this.doRead(socket, op);
+                        } catch (Throwable e) {
+                            LOGGER.error("error in operation", e);
+                        }
+                    }
+                });
+            }
+        } finally {
+            socket.readLock.unlock();
+        }
+    }
+
+    private void doWrite(final RegisteredSocket socket, final WriteOperation op) {
+        socket.writeLock.lock();
+        try {
+            if (socket.writeOperation != op) {
+                return;
+            }
+            try {
+                long before = op.bufferSet.remaining();
+                try {
+                    writeHandlingTasks(socket, op);
+                } finally {
+                    long c = before - op.bufferSet.remaining();
+                    Util.assertTrue(c >= 0);
+                    op.consumesBytes += c;
+                }
+                socket.writeOperation = null;
+                if (op.timeoutFuture != null) {
+                    op.timeoutFuture.cancel(false);
+                }
+                op.onSuccess.accept(op.consumesBytes);
+                successfulWrites.increment();
+                currentWrites.decrement();
+            } catch (NeedsReadException e) {
+                socket.pendingOps.accumulateAndGet(SelectionKey.OP_READ, new IntBinaryOperator() {
+                    @Override
+                    public int applyAsInt(final int a, final int b) {
+                        return a | b;
+                    }
+                });
+                selector.wakeup();
+            } catch (NeedsWriteException e) {
+                socket.pendingOps.accumulateAndGet(SelectionKey.OP_WRITE, new IntBinaryOperator() {
+                    @Override
+                    public int applyAsInt(final int a, final int b) {
+                        return a | b;
+                    }
+                });
+                selector.wakeup();
+            } catch (IOException e) {
+                if (socket.writeOperation == op) {
+                    socket.writeOperation = null;
+                }
+                if (op.timeoutFuture != null) {
+                    op.timeoutFuture.cancel(false);
+                }
+                op.onFailure.accept(e);
+                failedWrites.increment();
+                currentWrites.decrement();
+            }
+        } finally {
+            socket.writeLock.unlock();
+        }
+    }
+
+    /**
+     * Intended use of the channel group is with sockets that run tasks internally, but out of tolerance, run tasks in
+     * thread in case the socket does not.
+     */
+    private void writeHandlingTasks(final RegisteredSocket socket, final WriteOperation op) throws IOException {
+        while (true) {
+            try {
+                socket.tlsChannel.write(op.bufferSet.array, op.bufferSet.offset, op.bufferSet.length);
+                return;
+            } catch (NeedsTaskException e) {
+                warnAboutNeedTask();
+                e.getTask().run();
+            }
+        }
+    }
+
+    private void warnAboutNeedTask() {
+        if (!loggedTaskWarning.getAndSet(true)) {
+            LOGGER.warn(format(
+                    "caught %s; channels used in asynchronous groups should run tasks themselves; "
+                            + "although task is being dealt with anyway, consider configuring channels properly",
+                    NeedsTaskException.class.getName()));
+        }
+    }
+
+    private void doRead(final RegisteredSocket socket, final ReadOperation op) {
+        socket.readLock.lock();
+        try {
+            if (socket.readOperation != op) {
+                return;
+            }
+            try {
+                Util.assertTrue(op.bufferSet.hasRemaining());
+                long c = readHandlingTasks(socket, op);
+                Util.assertTrue(c > 0 || c == -1);
+                socket.readOperation = null;
+                if (op.timeoutFuture != null) {
+                    op.timeoutFuture.cancel(false);
+                }
+                op.onSuccess.accept(c);
+                successfulReads.increment();
+                currentReads.decrement();
+            } catch (NeedsReadException e) {
+                socket.pendingOps.accumulateAndGet(SelectionKey.OP_READ, new IntBinaryOperator() {
+                    @Override
+                    public int applyAsInt(final int a, final int b) {
+                        return a | b;
+                    }
+                });
+                selector.wakeup();
+            } catch (NeedsWriteException e) {
+                socket.pendingOps.accumulateAndGet(SelectionKey.OP_WRITE, new IntBinaryOperator() {
+                    @Override
+                    public int applyAsInt(final int a, final int b) {
+                        return a | b;
+                    }
+                });
+                selector.wakeup();
+            } catch (IOException e) {
+                if (socket.readOperation == op) {
+                    socket.readOperation = null;
+                }
+                if (op.timeoutFuture != null) {
+                    op.timeoutFuture.cancel(false);
+                }
+                op.onFailure.accept(e);
+                failedReads.increment();
+                currentReads.decrement();
+            }
+        } finally {
+            socket.readLock.unlock();
+        }
+    }
+
+    /**
+     * @see #writeHandlingTasks
+     */
+    private long readHandlingTasks(final RegisteredSocket socket, final ReadOperation op) throws IOException {
+        while (true) {
+            try {
+                return socket.tlsChannel.read(op.bufferSet.array, op.bufferSet.offset, op.bufferSet.length);
+            } catch (NeedsTaskException e) {
+                warnAboutNeedTask();
+                e.getTask().run();
+            }
+        }
+    }
+
+    private void registerPendingSockets() throws ClosedChannelException {
+        RegisteredSocket socket;
+        while ((socket = pendingRegistrations.poll()) != null) {
+            socket.key = socket.socketChannel.register(selector, 0, socket);
+            if (LOGGER.isTraceEnabled()) {
+                LOGGER.trace(format("registered key: %ss", socket.key));
+            }
+            socket.registered.countDown();
+        }
+    }
+
+    /**
+     * Whether either {@link #shutdown()} or {@link #shutdownNow()} have been called.
+     *
+     * @return {@code true} if this group has initiated shutdown and {@code false} if the group is active
+     */
+    public boolean isShutdown() {
+        return shutdown != Shutdown.No;
+    }
+
+    /**
+     * Starts the shutdown process. New sockets cannot be registered, already registered one continue operating normally
+     * until they are closed.
+     */
+    public void shutdown() {
+        shutdown = Shutdown.Wait;
+        selector.wakeup();
+    }
+
+    /**
+     * Shuts down this channel group immediately. All registered sockets are closed, pending operations may or may not
+     * finish.
+     */
+    public void shutdownNow() {
+        shutdown = Shutdown.Immediate;
+        selector.wakeup();
+    }
+
+    /**
+     * Whether this channel group was shut down, and all pending tasks have drained.
+     */
+    public boolean isTerminated() {
+        return executor.isTerminated();
+    }
+
+    /**
+     * Blocks until all registers sockets are closed and pending tasks finished execution after a shutdown request, or
+     * the timeout occurs, or the current thread is interrupted, whichever happens first.
+     *
+     * @param timeout the maximum time to wait
+     * @param unit    the time unit of the timeout argument
+     * @return {@code true} if this group terminated and {@code false} if the group elapsed before termination
+     * @throws InterruptedException if interrupted while waiting
+     */
+    public boolean awaitTermination(final long timeout, final TimeUnit unit) throws InterruptedException {
+        return executor.awaitTermination(timeout, unit);
+    }
+
+    long getSelectionCount() {
+        return selectionCount.longValue();
+    }
+
+    /**
+     * Return the total number of read operations that were started.
+     *
+     * @return number of operations
+     */
+    public long getStartedReadCount() {
+        return startedReads.longValue();
+    }
+
+    /**
+     * Return the total number of write operations that were started.
+     *
+     * @return number of operations
+     */
+    public long getStartedWriteCount() {
+        return startedWrites.longValue();
+    }
+
+    /**
+     * Return the total number of read operations that succeeded.
+     *
+     * @return number of operations
+     */
+    public long getSuccessfulReadCount() {
+        return successfulReads.longValue();
+    }
+
+    /**
+     * Return the total number of write operations that succeeded.
+     *
+     * @return number of operations
+     */
+    public long getSuccessfulWriteCount() {
+        return successfulWrites.longValue();
+    }
+
+    /**
+     * Return the total number of read operations that failed.
+     *
+     * @return number of operations
+     */
+    public long getFailedReadCount() {
+        return failedReads.longValue();
+    }
+
+    /**
+     * Return the total number of write operations that failed.
+     *
+     * @return number of operations
+     */
+    public long getFailedWriteCount() {
+        return failedWrites.longValue();
+    }
+
+    /**
+     * Return the total number of read operations that were cancelled.
+     *
+     * @return number of operations
+     */
+    public long getCancelledReadCount() {
+        return cancelledReads.longValue();
+    }
+
+    /**
+     * Return the total number of write operations that were cancelled.
+     *
+     * @return number of operations
+     */
+    public long getCancelledWriteCount() {
+        return cancelledWrites.longValue();
+    }
+
+    /**
+     * Returns the current number of active read operations.
+     *
+     * @return number of operations
+     */
+    public long getCurrentReadCount() {
+        return currentReads.longValue();
+    }
+
+    /**
+     * Returns the current number of active write operations.
+     *
+     * @return number of operations
+     */
+    public long getCurrentWriteCount() {
+        return currentWrites.longValue();
+    }
+
+    /**
+     * Returns the current number of registered sockets.
+     *
+     * @return number of sockets
+     */
+    public long getCurrentRegistrationCount() {
+        return currentRegistrations.longValue();
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/BufferHolder.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/BufferHolder.java
new file mode 100644
index 00000000000..30bcc81ba0e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/BufferHolder.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.impl;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.connection.tlschannel.BufferAllocator;
+import org.bson.ByteBuf;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+
+import static com.mongodb.internal.connection.tlschannel.impl.TlsChannelImpl.MAX_TLS_PACKET_SIZE;
+import static java.lang.String.format;
+
+public class BufferHolder {
+
+    private static final Logger LOGGER = Loggers.getLogger("connection.tls");
+    // Round to next highest power of two to account for PowerOfTwoBufferPool allocation style
+    private static final byte[] ZEROS = new byte[roundUpToNextHighestPowerOfTwo(MAX_TLS_PACKET_SIZE)];
+
+    public final String name;
+    public final BufferAllocator allocator;
+    public final boolean plainData;
+    public final int maxSize;
+    public final boolean opportunisticDispose;
+
+    private ByteBuf byteBuf;
+    public ByteBuffer buffer;
+    public int lastSize;
+
+    public BufferHolder(final String name, final BufferAllocator allocator, final int initialSize,
+                        final int maxSize, final boolean plainData, final boolean opportunisticDispose) {
+        this.name = name;
+        this.allocator = allocator;
+        this.buffer = null;
+        this.maxSize = maxSize;
+        this.plainData = plainData;
+        this.opportunisticDispose = opportunisticDispose;
+        this.lastSize = initialSize;
+    }
+
+    public void prepare() {
+        if (buffer == null) {
+            byteBuf = allocator.allocate(lastSize);
+            buffer = byteBuf.asNIO();
+        }
+    }
+
+    public boolean release() {
+        if (opportunisticDispose && buffer.position() == 0) {
+            return dispose();
+        } else {
+            return false;
+        }
+    }
+
+    public boolean dispose() {
+        if (buffer != null) {
+            allocator.free(byteBuf);
+            buffer = null;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void resize(final int newCapacity) {
+        if (newCapacity > maxSize) {
+            throw new IllegalArgumentException(format("new capacity (%s) bigger than absolute max size (%s)", newCapacity, maxSize));
+        }
+        if (LOGGER.isTraceEnabled()) {
+            LOGGER.trace(format("resizing buffer %s, increasing from %s to %s (manual sizing)", name, buffer.capacity(), newCapacity));
+        }
+        resizeImpl(newCapacity);
+    }
+
+    public void enlarge() {
+        if (buffer.capacity() >= maxSize) {
+            throw new IllegalStateException(
+                    format("%s buffer insufficient despite having capacity of %d", name, buffer.capacity()));
+        }
+        int newCapacity = Math.min(lastSize * 2, maxSize);
+        if (LOGGER.isTraceEnabled()) {
+            LOGGER.trace(format("enlarging buffer %s, increasing from %s to %s (automatic enlarge)", name, buffer.capacity(), newCapacity));
+        }
+        resizeImpl(newCapacity);
+    }
+
+    private void resizeImpl(final int newCapacity) {
+        ByteBuf newByteBuf = allocator.allocate(newCapacity);
+        ByteBuffer newBuffer = newByteBuf.asNIO();
+        ((Buffer) buffer).flip();
+        newBuffer.put(buffer);
+        if (plainData) {
+            zero();
+        }
+        allocator.free(byteBuf);
+        byteBuf = newByteBuf;
+        buffer = newBuffer;
+        lastSize = newCapacity;
+    }
+
+    /**
+     * Fill with zeros the remaining of the supplied buffer. This method does
+     * not change the buffer position.
+     * <p>
+     * Typically used for security reasons, with buffers that contains
+     * now-unused plaintext.
+     */
+    public void zeroRemaining() {
+        ((Buffer) buffer).mark();
+        buffer.put(ZEROS, 0, buffer.remaining());
+        ((Buffer) buffer).reset();
+    }
+
+    /**
+     * Fill the buffer with zeros. This method does not change the buffer position.
+     * <p>
+     * Typically used for security reasons, with buffers that contains
+     * now-unused plaintext.
+     */
+    public void zero() {
+        ((Buffer) buffer).mark();
+        ((Buffer) buffer).position(0);
+        buffer.put(ZEROS, 0, buffer.remaining());
+        ((Buffer) buffer).reset();
+    }
+
+    public boolean nullOrEmpty() {
+        return buffer == null || buffer.position() == 0;
+    }
+
+    private static int roundUpToNextHighestPowerOfTwo(final int size) {
+        int v = size;
+        v--;
+        v |= v >> 1;
+        v |= v >> 2;
+        v |= v >> 4;
+        v |= v >> 8;
+        v |= v >> 16;
+        v++;
+        return v;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/ByteBufferSet.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/ByteBufferSet.java
new file mode 100644
index 00000000000..3c66fef6708
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/ByteBufferSet.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.impl;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+
+public class ByteBufferSet {
+
+    public final ByteBuffer[] array;
+    public final int offset;
+    public final int length;
+
+    public ByteBufferSet(final ByteBuffer[] array, final int offset, final int length) {
+        if (array == null) {
+            throw new NullPointerException();
+        }
+        if (array.length < offset) {
+            throw new IndexOutOfBoundsException();
+        }
+        if (array.length < offset + length) {
+            throw new IndexOutOfBoundsException();
+        }
+        for (int i = offset; i < offset + length; i++) {
+            if (array[i] == null) {
+                throw new NullPointerException();
+            }
+        }
+        this.array = array;
+        this.offset = offset;
+        this.length = length;
+    }
+
+    public ByteBufferSet(final ByteBuffer[] array) {
+        this(array, 0, array.length);
+    }
+
+    public ByteBufferSet(final ByteBuffer buffer) {
+        this(new ByteBuffer[]{buffer});
+    }
+
+    public long remaining() {
+        long ret = 0;
+        for (int i = offset; i < offset + length; i++) {
+            ret += array[i].remaining();
+        }
+        return ret;
+    }
+
+    public int putRemaining(final ByteBuffer from) {
+        int totalBytes = 0;
+        for (int i = offset; i < offset + length; i++) {
+            if (!from.hasRemaining()) {
+                break;
+            }
+            ByteBuffer dstBuffer = array[i];
+            int bytes = Math.min(from.remaining(), dstBuffer.remaining());
+            ByteBufferUtil.copy(from, dstBuffer, bytes);
+            totalBytes += bytes;
+        }
+        return totalBytes;
+    }
+
+
+    public ByteBufferSet put(final ByteBuffer from, final int length) {
+        if (from.remaining() < length) {
+            throw new IllegalArgumentException();
+        }
+        if (remaining() < length) {
+            throw new IllegalArgumentException();
+        }
+        int totalBytes = 0;
+        for (int i = offset; i < offset + this.length; i++) {
+            int pending = length - totalBytes;
+            if (pending == 0) {
+                break;
+            }
+            int bytes = Math.min(pending, (int) remaining());
+            ByteBuffer dstBuffer = array[i];
+            ByteBufferUtil.copy(from, dstBuffer, bytes);
+            totalBytes += bytes;
+        }
+        return this;
+    }
+
+    public int getRemaining(final ByteBuffer dst) {
+        int totalBytes = 0;
+        for (int i = offset; i < offset + length; i++) {
+            if (!dst.hasRemaining()) {
+                break;
+            }
+            ByteBuffer srcBuffer = array[i];
+            int bytes = Math.min(dst.remaining(), srcBuffer.remaining());
+            ByteBufferUtil.copy(srcBuffer, dst, bytes);
+            totalBytes += bytes;
+        }
+        return totalBytes;
+    }
+
+    public ByteBufferSet get(final ByteBuffer dst, final int length) {
+        if (remaining() < length) {
+            throw new IllegalArgumentException();
+        }
+        if (dst.remaining() < length) {
+            throw new IllegalArgumentException();
+        }
+        int totalBytes = 0;
+        for (int i = offset; i < offset + this.length; i++) {
+            int pending = length - totalBytes;
+            if (pending == 0) {
+                break;
+            }
+            ByteBuffer srcBuffer = array[i];
+            int bytes = Math.min(pending, srcBuffer.remaining());
+            ByteBufferUtil.copy(srcBuffer, dst, bytes);
+            totalBytes += bytes;
+        }
+        return this;
+    }
+
+    public boolean hasRemaining() {
+        return remaining() > 0;
+    }
+
+    public boolean isReadOnly() {
+        for (int i = offset; i < offset + length; i++) {
+            if (array[i].isReadOnly()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "ByteBufferSet[array=" + Arrays.toString(array) + ", offset=" + offset + ", length=" + length + "]";
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/ByteBufferUtil.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/ByteBufferUtil.java
new file mode 100644
index 00000000000..e445819d254
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/ByteBufferUtil.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.impl;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+
+public class ByteBufferUtil {
+
+    public static void copy(final ByteBuffer src, final ByteBuffer dst, final int length) {
+        if (length < 0) {
+            throw new IllegalArgumentException("negative length");
+        }
+        if (src.remaining() < length) {
+            throw new IllegalArgumentException(
+                    String.format("source buffer does not have enough remaining capacity (%d < %d)", src.remaining(), length));
+        }
+        if (dst.remaining() < length) {
+            throw new IllegalArgumentException(
+                    String.format("destination buffer does not have enough remaining capacity (%d < %d)", dst.remaining(), length));
+        }
+        if (length == 0) {
+            return;
+        }
+        ByteBuffer tmp = src.duplicate();
+        ((Buffer) tmp).limit(src.position() + length);
+        dst.put(tmp);
+        ((Buffer) src).position(src.position() + length);
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/TlsChannelImpl.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/TlsChannelImpl.java
new file mode 100644
index 00000000000..8ca529ab246
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/impl/TlsChannelImpl.java
@@ -0,0 +1,793 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.impl;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.connection.tlschannel.NeedsReadException;
+import com.mongodb.internal.connection.tlschannel.NeedsTaskException;
+import com.mongodb.internal.connection.tlschannel.NeedsWriteException;
+import com.mongodb.internal.connection.tlschannel.TrackingAllocator;
+import com.mongodb.internal.connection.tlschannel.WouldBlockException;
+import com.mongodb.internal.connection.tlschannel.util.TlsChannelCallbackException;
+import com.mongodb.internal.connection.tlschannel.util.Util;
+
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLEngineResult;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLEngineResult.Status;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLSession;
+import java.io.IOException;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Optional;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import static java.lang.String.format;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
+
+public class TlsChannelImpl implements ByteChannel {
+
+    private static final Logger LOGGER = Loggers.getLogger("connection.tls");
+
+    private static final int BUFFERS_INITIAL_SIZE = 4096;
+
+    /**
+     * Official TLS max data size is 2^14 = 16k. Use 1024 more to account for
+     * the overhead
+     */
+    static final int MAX_TLS_PACKET_SIZE = 17 * 1024;
+
+    private static class UnwrapResult {
+        final int bytesProduced;
+        final HandshakeStatus lastHandshakeStatus;
+        final boolean wasClosed;
+
+        UnwrapResult(final int bytesProduced, final HandshakeStatus lastHandshakeStatus, final boolean wasClosed) {
+            this.bytesProduced = bytesProduced;
+            this.lastHandshakeStatus = lastHandshakeStatus;
+            this.wasClosed = wasClosed;
+        }
+    }
+
+    private static class WrapResult {
+        final int bytesConsumed;
+        final HandshakeStatus lastHandshakeStatus;
+
+        WrapResult(final int bytesConsumed, final HandshakeStatus lastHandshakeStatus) {
+            this.bytesConsumed = bytesConsumed;
+            this.lastHandshakeStatus = lastHandshakeStatus;
+        }
+    }
+
+    /**
+     * Used to signal EOF conditions from the underlying channel
+     */
+    public static class EofException extends Exception {
+
+        private static final long serialVersionUID = -9215047770779892445L;
+
+        /**
+         * For efficiency, override this method to do nothing.
+         */
+        @Override
+        public Throwable fillInStackTrace() {
+            return this;
+        }
+
+    }
+
+    private final ReadableByteChannel readChannel;
+    private final WritableByteChannel writeChannel;
+    private final SSLEngine engine;
+    private BufferHolder inEncrypted;
+    private final Consumer<SSLSession> initSessionCallback;
+
+    private final boolean runTasks;
+    private final TrackingAllocator encryptedBufAllocator;
+    private final TrackingAllocator plainBufAllocator;
+    private final boolean waitForCloseConfirmation;
+
+    // @formatter:off
+    public TlsChannelImpl(
+            final ReadableByteChannel readChannel,
+            final WritableByteChannel writeChannel,
+            final SSLEngine engine,
+            final Optional<BufferHolder> inEncrypted,
+            final Consumer<SSLSession> initSessionCallback,
+            final boolean runTasks,
+            final TrackingAllocator plainBufAllocator,
+            final TrackingAllocator encryptedBufAllocator,
+            final boolean releaseBuffers,
+            final boolean waitForCloseConfirmation) {
+        // @formatter:on
+        this.readChannel = readChannel;
+        this.writeChannel = writeChannel;
+        this.engine = engine;
+        this.inEncrypted = inEncrypted.orElseGet(new Supplier<BufferHolder>() {
+            @Override
+            public BufferHolder get() {
+                return new BufferHolder(
+                        "inEncrypted",
+                        encryptedBufAllocator,
+                        BUFFERS_INITIAL_SIZE,
+                        MAX_TLS_PACKET_SIZE,
+                        false /* plainData */,
+                        releaseBuffers);
+            }
+        });
+        this.initSessionCallback = initSessionCallback;
+        this.runTasks = runTasks;
+        this.plainBufAllocator = plainBufAllocator;
+        this.encryptedBufAllocator = encryptedBufAllocator;
+        this.waitForCloseConfirmation = waitForCloseConfirmation;
+        inPlain = new BufferHolder(
+                "inPlain",
+                plainBufAllocator,
+                BUFFERS_INITIAL_SIZE,
+                MAX_TLS_PACKET_SIZE,
+                true /* plainData */,
+                releaseBuffers);
+        outEncrypted = new BufferHolder(
+                "outEncrypted",
+                encryptedBufAllocator,
+                BUFFERS_INITIAL_SIZE,
+                MAX_TLS_PACKET_SIZE,
+                false /* plainData */,
+                releaseBuffers);
+    }
+
+    private final Lock initLock = new ReentrantLock();
+    private final Lock readLock = new ReentrantLock();
+    private final Lock writeLock = new ReentrantLock();
+
+    private volatile boolean negotiated = false;
+
+    /**
+     * Whether a IOException was received from the underlying channel or from
+     * the {@link SSLEngine}.
+     */
+    private volatile boolean invalid = false;
+
+    /**
+     * Whether a close_notify was already sent.
+     */
+    private volatile boolean shutdownSent = false;
+
+    /**
+     * Whether a close_notify was already received.
+     */
+    private volatile boolean shutdownReceived = false;
+
+    // decrypted data from inEncrypted
+    private BufferHolder inPlain;
+
+    // contains data encrypted to send to the underlying channel
+    private BufferHolder outEncrypted;
+
+    // handshake wrap() method calls need a buffer to read from, even when they
+    // actually do not read anything
+    private final ByteBufferSet dummyOut = new ByteBufferSet(new ByteBuffer[]{});
+
+    public Consumer<SSLSession> getSessionInitCallback() {
+        return initSessionCallback;
+    }
+
+    public TrackingAllocator getPlainBufferAllocator() {
+        return plainBufAllocator;
+    }
+
+    public TrackingAllocator getEncryptedBufferAllocator() {
+        return encryptedBufAllocator;
+    }
+
+    // read
+
+    public long read(final ByteBufferSet dest) throws IOException {
+        checkReadBuffer(dest);
+        if (!dest.hasRemaining()) {
+            return 0;
+        }
+        handshake();
+        readLock.lock();
+        try {
+            if (invalid || shutdownSent) {
+                throw new ClosedChannelException();
+            }
+            HandshakeStatus handshakeStatus = engine.getHandshakeStatus();
+            int bytesToReturn = inPlain.nullOrEmpty() ? 0 : inPlain.buffer.position();
+            while (true) {
+                if (bytesToReturn > 0) {
+                    if (inPlain.nullOrEmpty()) {
+                        return bytesToReturn;
+                    } else {
+                        return transferPendingPlain(dest);
+                    }
+                }
+                if (shutdownReceived) {
+                    return -1;
+                }
+                Util.assertTrue(inPlain.nullOrEmpty());
+                switch (handshakeStatus) {
+                    case NEED_UNWRAP:
+                    case NEED_WRAP:
+                        bytesToReturn = handshake(Optional.of(dest), Optional.of(handshakeStatus));
+                        handshakeStatus = NOT_HANDSHAKING;
+                        break;
+                    case NOT_HANDSHAKING:
+                    case FINISHED:
+                        UnwrapResult res = readAndUnwrap(Optional.of(dest), NOT_HANDSHAKING /* statusCondition */,
+                                false /* closing */);
+                        if (res.wasClosed) {
+                            return -1;
+                        }
+                        bytesToReturn = res.bytesProduced;
+                        handshakeStatus = res.lastHandshakeStatus;
+                        break;
+                    case NEED_TASK:
+                        handleTask();
+                        handshakeStatus = engine.getHandshakeStatus();
+                        break;
+                    default:
+                        throw new SSLHandshakeException("Unsupported handshake status: " + handshakeStatus);
+                }
+            }
+        } catch (EofException e) {
+            return -1;
+        } finally {
+            readLock.unlock();
+        }
+    }
+
+    private void handleTask() throws NeedsTaskException {
+        if (runTasks) {
+            engine.getDelegatedTask().run();
+        } else {
+            throw new NeedsTaskException(engine.getDelegatedTask());
+        }
+    }
+
+    private int transferPendingPlain(final ByteBufferSet dstBuffers) {
+        ((Buffer) inPlain.buffer).flip(); // will read
+        int bytes = dstBuffers.putRemaining(inPlain.buffer);
+        inPlain.buffer.compact(); // will write
+        boolean disposed = inPlain.release();
+        if (!disposed) {
+            inPlain.zeroRemaining();
+        }
+        return bytes;
+    }
+
+    private UnwrapResult unwrapLoop(final Optional<ByteBufferSet> dest, final HandshakeStatus statusCondition, final boolean closing)
+            throws SSLException {
+        ByteBufferSet effDest = dest.orElseGet(new Supplier<ByteBufferSet>() {
+            @Override
+            public ByteBufferSet get() {
+                inPlain.prepare();
+                return new ByteBufferSet(inPlain.buffer);
+            }
+        });
+        while (true) {
+            Util.assertTrue(inPlain.nullOrEmpty());
+            SSLEngineResult result = callEngineUnwrap(effDest);
+            /*
+             * Note that data can be returned even in case of overflow, in that
+             * case, just return the data.
+             */
+            if (result.bytesProduced() > 0 || result.getStatus() == Status.BUFFER_UNDERFLOW
+                    || !closing && result.getStatus() == Status.CLOSED
+                    || result.getHandshakeStatus() != statusCondition) {
+                boolean wasClosed = result.getStatus() == Status.CLOSED;
+                return new UnwrapResult(result.bytesProduced(), result.getHandshakeStatus(), wasClosed);
+            }
+            if (result.getStatus() == Status.BUFFER_OVERFLOW) {
+                if (dest.isPresent() && effDest == dest.get()) {
+                    /*
+                     * The client-supplier buffer is not big enough. Use the
+                     * internal inPlain buffer, also ensure that it is bigger
+                     * than the too-small supplied one.
+                     */
+                    inPlain.prepare();
+                    ensureInPlainCapacity(Math.min(((int) dest.get().remaining()) * 2, MAX_TLS_PACKET_SIZE));
+                } else {
+                    inPlain.enlarge();
+                }
+                // inPlain changed, re-create the wrapper
+                effDest = new ByteBufferSet(inPlain.buffer);
+            }
+        }
+    }
+
+    private SSLEngineResult callEngineUnwrap(final ByteBufferSet dest) throws SSLException {
+        ((Buffer) inEncrypted.buffer).flip();
+        try {
+            SSLEngineResult result = engine.unwrap(inEncrypted.buffer, dest.array, dest.offset, dest.length);
+            if (LOGGER.isTraceEnabled()) {
+                LOGGER.trace(format("engine.unwrap() result [%s]. Engine status: %s; inEncrypted %s; inPlain: %s",
+                        Util.resultToString(result), result.getHandshakeStatus(), inEncrypted, dest));
+            }
+            return result;
+        } catch (SSLException e) {
+            // something bad was received from the underlying channel, we cannot
+            // continue
+            invalid = true;
+            throw e;
+        } finally {
+            inEncrypted.buffer.compact();
+        }
+    }
+
+    private int readFromChannel() throws IOException, EofException {
+        try {
+            return readFromChannel(readChannel, inEncrypted.buffer);
+        } catch (WouldBlockException e) {
+            throw e;
+        } catch (IOException e) {
+            invalid = true;
+            throw e;
+        }
+    }
+
+    public static int readFromChannel(final ReadableByteChannel readChannel, final ByteBuffer buffer)
+            throws IOException, EofException {
+        Util.assertTrue(buffer.hasRemaining());
+        if (LOGGER.isTraceEnabled()) {
+            LOGGER.trace("Reading from channel");
+        }
+        int c = readChannel.read(buffer); // IO block
+        if (LOGGER.isTraceEnabled()) {
+            LOGGER.trace(format("Read from channel; response: %s, buffer: %s", c, buffer));
+        }
+        if (c == -1) {
+            throw new EofException();
+        }
+        if (c == 0) {
+            throw new NeedsReadException();
+        }
+        return c;
+    }
+
+    // write
+
+    public long write(final ByteBufferSet source) throws IOException {
+        /*
+         * Note that we should enter the write loop even in the case that the source buffer has no remaining bytes,
+         * as it could be the case, in non-blocking usage, that the user is forced to call write again after the
+         * underlying channel is available for writing, just to write pending encrypted bytes.
+         */
+        handshake();
+        writeLock.lock();
+        try {
+            if (invalid || shutdownSent) {
+                throw new ClosedChannelException();
+            }
+            return wrapAndWrite(source);
+        } finally {
+            writeLock.unlock();
+        }
+    }
+
+    private long wrapAndWrite(final ByteBufferSet source) throws IOException {
+        long bytesToConsume = source.remaining();
+        long bytesConsumed = 0;
+        outEncrypted.prepare();
+        try {
+            while (true) {
+                writeToChannel();
+                if (bytesConsumed == bytesToConsume) {
+                    return bytesToConsume;
+                }
+                WrapResult res = wrapLoop(source);
+                bytesConsumed += res.bytesConsumed;
+            }
+        } finally {
+            outEncrypted.release();
+        }
+    }
+
+    private WrapResult wrapLoop(final ByteBufferSet source) throws SSLException {
+        while (true) {
+            SSLEngineResult result = callEngineWrap(source);
+            switch (result.getStatus()) {
+                case OK:
+                case CLOSED:
+                    return new WrapResult(result.bytesConsumed(), result.getHandshakeStatus());
+                case BUFFER_OVERFLOW:
+                    Util.assertTrue(result.bytesConsumed() == 0);
+                    outEncrypted.enlarge();
+                    break;
+                case BUFFER_UNDERFLOW:
+                    throw new IllegalStateException();
+                default:
+                    throw new AssertionError("Unexpected status: " + result.getStatus());
+            }
+        }
+    }
+
+    private SSLEngineResult callEngineWrap(final ByteBufferSet source) throws SSLException {
+        try {
+            SSLEngineResult result = engine.wrap(source.array, source.offset, source.length, outEncrypted.buffer);
+            if (LOGGER.isTraceEnabled()) {
+                LOGGER.trace(format("engine.wrap() result: [%s]; engine status: %s; srcBuffer: %s, outEncrypted: %s",
+                        Util.resultToString(result), result.getHandshakeStatus(), source, outEncrypted));
+            }
+            return result;
+        } catch (SSLException e) {
+            invalid = true;
+            throw e;
+        }
+    }
+
+    private void ensureInPlainCapacity(final int newCapacity) {
+        if (inPlain.buffer.capacity() < newCapacity) {
+            if (LOGGER.isTraceEnabled()) {
+                LOGGER.trace(format("inPlain buffer too small, increasing from %s to %s", inPlain.buffer.capacity(), newCapacity));
+            }
+            inPlain.resize(newCapacity);
+        }
+    }
+
+    private void writeToChannel() throws IOException {
+        if (outEncrypted.buffer.position() == 0) {
+            return;
+        }
+        ((Buffer) outEncrypted.buffer).flip();
+        try {
+            try {
+                writeToChannel(writeChannel, outEncrypted.buffer);
+            } catch (WouldBlockException e) {
+                throw e;
+            } catch (IOException e) {
+                invalid = true;
+                throw e;
+            }
+        } finally {
+            outEncrypted.buffer.compact();
+        }
+    }
+
+    private static void writeToChannel(final WritableByteChannel channel, final ByteBuffer src) throws IOException {
+        while (src.hasRemaining()) {
+            LOGGER.trace(format("Writing to channel: %s", src));
+            int c = channel.write(src);
+            if (c == 0) {
+                /*
+                 * If no bytesProduced were written, it means that the socket is
+                 * non-blocking and needs more buffer space, so stop the loop
+                 */
+                throw new NeedsWriteException();
+            }
+            // blocking SocketChannels can write less than all the bytesProduced
+            // just before an error the loop forces the exception
+        }
+    }
+
+    // handshake and close
+
+    /**
+     * Force new negotiation
+     */
+    public void renegotiate() throws IOException {
+        try {
+            doHandshake(true /* force */);
+        } catch (EofException e) {
+            throw new ClosedChannelException();
+        }
+    }
+
+    /**
+     * Do a negotiation if this connection is new and it hasn't been done
+     * already.
+     */
+    public void handshake() throws IOException {
+        try {
+            doHandshake(false /* force */);
+        } catch (EofException e) {
+            throw new ClosedChannelException();
+        }
+    }
+
+    private void doHandshake(final boolean force) throws IOException, EofException {
+        if (!force && negotiated) {
+            return;
+        }
+        if (invalid || shutdownSent) {
+            throw new ClosedChannelException();
+        }
+        initLock.lock();
+        try {
+            if (force || !negotiated) {
+                engine.beginHandshake();
+                LOGGER.trace("Called engine.beginHandshake()");
+                handshake(Optional.<ByteBufferSet>empty(), Optional.<HandshakeStatus>empty());
+                // call client code
+                try {
+                    initSessionCallback.accept(engine.getSession());
+                } catch (Exception e) {
+                    LOGGER.trace("client code threw exception in session initialization callback", e);
+                    throw new TlsChannelCallbackException("session initialization callback failed", e);
+                }
+                negotiated = true;
+            }
+        } finally {
+            initLock.unlock();
+        }
+    }
+
+    private int handshake(final Optional<ByteBufferSet> dest, final Optional<HandshakeStatus> handshakeStatus)
+            throws IOException, EofException {
+        readLock.lock();
+        try {
+            writeLock.lock();
+            try {
+                Util.assertTrue(inPlain.nullOrEmpty());
+                outEncrypted.prepare();
+                try {
+                    writeToChannel(); // IO block
+                    return handshakeLoop(dest, handshakeStatus);
+                } finally {
+                    outEncrypted.release();
+                }
+            } finally {
+                writeLock.unlock();
+            }
+        } finally {
+            readLock.unlock();
+        }
+    }
+
+    private int handshakeLoop(final Optional<ByteBufferSet> dest, final Optional<HandshakeStatus> handshakeStatus)
+            throws IOException, EofException {
+        Util.assertTrue(inPlain.nullOrEmpty());
+        HandshakeStatus status = handshakeStatus.orElseGet(new Supplier<HandshakeStatus>() {
+            @Override
+            public HandshakeStatus get() {
+                return engine.getHandshakeStatus();
+            }
+        });
+        while (true) {
+            switch (status) {
+                case NEED_WRAP:
+                    Util.assertTrue(outEncrypted.nullOrEmpty());
+                    WrapResult wrapResult = wrapLoop(dummyOut);
+                    status = wrapResult.lastHandshakeStatus;
+                    writeToChannel(); // IO block
+                    break;
+                case NEED_UNWRAP:
+                    UnwrapResult res = readAndUnwrap(dest, NEED_UNWRAP /* statusCondition */, false /* closing */);
+                    status = res.lastHandshakeStatus;
+                    if (res.bytesProduced > 0) {
+                        return res.bytesProduced;
+                    }
+                    break;
+                case NOT_HANDSHAKING:
+                    /*
+                     * This should not really happen using SSLEngine, because
+                     * handshaking ends with a FINISHED status. However, we accept
+                     * this value to permit the use of a pass-through stub engine
+                     * with no encryption.
+                     */
+                    return 0;
+                case NEED_TASK:
+                    handleTask();
+                    status = engine.getHandshakeStatus();
+                    break;
+                case FINISHED:
+                    return 0;
+                default:
+                    throw new AssertionError("Unexpected status: " + status);
+            }
+        }
+    }
+
+    private UnwrapResult readAndUnwrap(final Optional<ByteBufferSet> dest, final HandshakeStatus statusCondition, final boolean closing)
+            throws IOException, EofException {
+        inEncrypted.prepare();
+        try {
+            while (true) {
+                Util.assertTrue(inPlain.nullOrEmpty());
+                UnwrapResult res = unwrapLoop(dest, statusCondition, closing);
+                if (res.bytesProduced > 0 || res.lastHandshakeStatus != statusCondition || !closing && res.wasClosed) {
+                    if (res.wasClosed) {
+                        shutdownReceived = true;
+                    }
+                    return res;
+                }
+                if (!inEncrypted.buffer.hasRemaining()) {
+                    inEncrypted.enlarge();
+                }
+                readFromChannel(); // IO block
+            }
+        } finally {
+            inEncrypted.release();
+        }
+    }
+
+    public void close() throws IOException {
+        tryShutdown();
+        writeChannel.close();
+        readChannel.close();
+        /*
+         * After closing the underlying channels, locks should be taken fast.
+         */
+        readLock.lock();
+        try {
+            writeLock.lock();
+            try {
+                freeBuffers();
+            } finally {
+                writeLock.unlock();
+            }
+        } finally {
+            readLock.unlock();
+        }
+    }
+
+    private void tryShutdown() {
+        if (!readLock.tryLock()) {
+            return;
+        }
+        try {
+            if (!writeLock.tryLock()) {
+                return;
+            }
+            try {
+                if (!shutdownSent) {
+                    try {
+                        boolean closed = shutdown();
+                        if (!closed && waitForCloseConfirmation) {
+                            shutdown();
+                        }
+                    } catch (Throwable e) {
+                        LOGGER.debug(format("error doing TLS shutdown on close(), continuing: %s", e.getMessage()));
+                    }
+                }
+            } finally {
+                writeLock.unlock();
+            }
+        } finally {
+            readLock.unlock();
+        }
+    }
+
+    public boolean shutdown() throws IOException {
+        readLock.lock();
+        try {
+            writeLock.lock();
+            try {
+                if (invalid) {
+                    throw new ClosedChannelException();
+                }
+                if (!shutdownSent) {
+                    shutdownSent = true;
+                    outEncrypted.prepare();
+                    try {
+                        writeToChannel(); // IO block
+                        engine.closeOutbound();
+                        wrapLoop(dummyOut);
+                        writeToChannel(); // IO block
+                    } finally {
+                        outEncrypted.release();
+                    }
+                    /*
+                     * If this side is the first to send close_notify, then,
+                     * inbound is not done and false should be returned (so the
+                     * client waits for the response. If this side is the
+                     * second, then inbound was already done, and we can return
+                     * true.
+                     */
+                    if (shutdownReceived) {
+                        freeBuffers();
+                    }
+                    return shutdownReceived;
+                }
+                /*
+                 * If we reach this point, then we just have to read the close
+                 * notification from the client. Only try to do it if necessary,
+                 * to make this method idempotent.
+                 */
+                if (!shutdownReceived) {
+                    try {
+                        // IO block
+                        readAndUnwrap(Optional.<ByteBufferSet>empty(), NEED_UNWRAP /* statusCondition */, true /* closing */);
+                        Util.assertTrue(shutdownReceived);
+                    } catch (EofException e) {
+                        throw new ClosedChannelException();
+                    }
+                }
+                freeBuffers();
+                return true;
+            } finally {
+                writeLock.unlock();
+            }
+        } finally {
+            readLock.unlock();
+        }
+    }
+
+    private void freeBuffers() {
+        if (inEncrypted != null) {
+            inEncrypted.dispose();
+            inEncrypted = null;
+        }
+        if (inPlain != null) {
+            inPlain.dispose();
+            inPlain = null;
+        }
+        if (outEncrypted != null) {
+            outEncrypted.dispose();
+            outEncrypted = null;
+        }
+    }
+
+    public boolean isOpen() {
+        return !invalid && writeChannel.isOpen() && readChannel.isOpen();
+    }
+
+    public static void checkReadBuffer(final ByteBufferSet dest) {
+        if (dest.isReadOnly()) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    public SSLEngine engine() {
+        return engine;
+    }
+
+    public boolean getRunTasks() {
+        return runTasks;
+    }
+
+    @Override
+    public int read(final ByteBuffer dst) throws IOException {
+        return (int) read(new ByteBufferSet(dst));
+    }
+
+    @Override
+    public int write(final ByteBuffer src) throws IOException {
+        return (int) write(new ByteBufferSet(src));
+    }
+
+    public boolean shutdownReceived() {
+        return shutdownReceived;
+    }
+
+    public boolean shutdownSent() {
+        return shutdownSent;
+    }
+
+    public ReadableByteChannel plainReadableChannel() {
+        return readChannel;
+    }
+
+    public WritableByteChannel plainWritableChannel() {
+        return writeChannel;
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/util/TlsChannelCallbackException.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/util/TlsChannelCallbackException.java
new file mode 100644
index 00000000000..c361cf7f6f9
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/util/TlsChannelCallbackException.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.util;
+
+import com.mongodb.internal.connection.tlschannel.TlsChannel;
+
+import javax.net.ssl.SSLException;
+
+/**
+ * Thrown during {@link TlsChannel} handshake to indicate that a user-supplied function threw an exception.
+ */
+public class TlsChannelCallbackException extends SSLException {
+
+    private static final long serialVersionUID = -8618230576763080549L;
+
+    public TlsChannelCallbackException(final String message, final Throwable throwable) {
+        super(message, throwable);
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/connection/tlschannel/util/Util.java b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/util/Util.java
new file mode 100644
index 00000000000..141b9b8770c
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/connection/tlschannel/util/Util.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Original Work: MIT License, Copyright (c) [2015-2018] all contributors
+ * https://github.com/marianobarrios/tls-channel
+ */
+
+package com.mongodb.internal.connection.tlschannel.util;
+
+import javax.net.ssl.SSLEngineResult;
+
+public class Util {
+
+    public static void assertTrue(final boolean condition) {
+        if (!condition) {
+            throw new AssertionError();
+        }
+    }
+
+    /**
+     * Convert a {@link SSLEngineResult} into a {@link String}, this is needed
+     * because the supplied method includes a log-breaking newline.
+     */
+    public static String resultToString(final SSLEngineResult result) {
+        return String.format("status=%s,handshakeStatus=%s,bytesConsumed=%d,bytesConsumed=%d", result.getStatus(),
+                result.getHandshakeStatus(), result.bytesProduced(), result.bytesConsumed());
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/internal/dns/DefaultDnsResolver.java b/driver-core/src/main/com/mongodb/internal/dns/DefaultDnsResolver.java
new file mode 100644
index 00000000000..6b51a8d1677
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/dns/DefaultDnsResolver.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.dns;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoConfigurationException;
+
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.InitialDirContext;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+
+/**
+ * Utility class for resolving SRV and TXT records.
+ *
+ * <p>This class should not be considered a part of the public API.</p>
+ */
+public final class DefaultDnsResolver implements DnsResolver {
+
+    /*
+      The format of SRV record is
+        priority weight port target.
+      e.g.
+        0 5 5060 example.com.
+
+      The priority and weight are ignored, and we just concatenate the host (after removing the ending '.') and port with a
+      ':' in between, as expected by ServerAddress.
+
+      It's required that the srvHost has at least three parts (e.g. foo.bar.baz) and that all of the resolved hosts have a parent
+      domain equal to the domain of the srvHost.
+    */
+    @Override
+    public List<String> resolveHostFromSrvRecords(final String srvHost) {
+        String srvHostDomain = srvHost.substring(srvHost.indexOf('.') + 1);
+        List<String> srvHostDomainParts = asList(srvHostDomain.split("\\."));
+        List<String> hosts = new ArrayList<String>();
+        InitialDirContext dirContext = createDnsDirContext();
+        try {
+            Attributes attributes = dirContext.getAttributes("_mongodb._tcp." + srvHost, new String[]{"SRV"});
+            Attribute attribute = attributes.get("SRV");
+            if (attribute == null) {
+                throw new MongoConfigurationException("No SRV records available for host " + srvHost);
+            }
+            NamingEnumeration<?> srvRecordEnumeration = attribute.getAll();
+            while (srvRecordEnumeration.hasMore()) {
+                String srvRecord = (String) srvRecordEnumeration.next();
+                String[] split = srvRecord.split(" ");
+                String resolvedHost = split[3].endsWith(".") ? split[3].substring(0, split[3].length() - 1) : split[3];
+                String resolvedHostDomain = resolvedHost.substring(resolvedHost.indexOf('.') + 1);
+                if (!sameParentDomain(srvHostDomainParts, resolvedHostDomain)) {
+                    throw new MongoConfigurationException(
+                            format("The SRV host name '%s'resolved to a host '%s 'that is not in a sub-domain of the SRV host.",
+                                    srvHost, resolvedHost));
+                }
+                hosts.add(resolvedHost + ":" + split[2]);
+            }
+
+            if (hosts.isEmpty()) {
+                throw new MongoConfigurationException("Unable to find any SRV records for host " + srvHost);
+            }
+        } catch (NamingException e) {
+            throw new MongoConfigurationException("Unable to look up SRV record for host " + srvHost, e);
+        } finally {
+            try {
+                dirContext.close();
+            } catch (NamingException e) {
+                // ignore
+            }
+        }
+        return hosts;
+    }
+
+    private static boolean sameParentDomain(final List<String> srvHostDomainParts, final String resolvedHostDomain) {
+        List<String> resolvedHostDomainParts = asList(resolvedHostDomain.split("\\."));
+        if (srvHostDomainParts.size() > resolvedHostDomainParts.size()) {
+            return false;
+        }
+        return resolvedHostDomainParts.subList(resolvedHostDomainParts.size() - srvHostDomainParts.size(), resolvedHostDomainParts.size())
+                .equals(srvHostDomainParts);
+    }
+
+    /*
+      A TXT record is just a string
+      We require each to be one or more query parameters for a MongoDB connection string.
+      Here we concatenate TXT records together with a '&' separator as required by connection strings
+    */
+    @Override
+    public String resolveAdditionalQueryParametersFromTxtRecords(final String host) {
+        String additionalQueryParameters = "";
+        InitialDirContext dirContext = createDnsDirContext();
+        try {
+            Attributes attributes = dirContext.getAttributes(host, new String[]{"TXT"});
+            Attribute attribute = attributes.get("TXT");
+            if (attribute != null) {
+                NamingEnumeration<?> txtRecordEnumeration = attribute.getAll();
+                if (txtRecordEnumeration.hasMore()) {
+                    // Remove all space characters, as the DNS resolver for TXT records inserts a space character
+                    // between each character-string in a single TXT record.  That whitespace is spurious in
+                    // this context and must be removed
+                    additionalQueryParameters = ((String) txtRecordEnumeration.next()).replaceAll("\\s", "");
+
+                    if (txtRecordEnumeration.hasMore()) {
+                        throw new MongoConfigurationException(format("Multiple TXT records found for host '%s'.  Only one is permitted",
+                                host));
+                    }
+                }
+            }
+        } catch (NamingException e) {
+            throw new MongoConfigurationException("Unable to look up TXT record for host " + host, e);
+        } finally {
+            try {
+                dirContext.close();
+            } catch (NamingException e) {
+                // ignore
+            }
+        }
+        return additionalQueryParameters;
+    }
+
+    /*
+      It's unfortunate that we take a runtime dependency on com.sun.jndi.dns.DnsContextFactory.
+      This is not guaranteed to work on all JVMs but in practice is expected to work on most.
+    */
+    private static InitialDirContext createDnsDirContext() {
+        Hashtable<String, String> envProps = new Hashtable<String, String>();
+        envProps.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.dns.DnsContextFactory");
+        try {
+            return new InitialDirContext(envProps);
+        } catch (NamingException e) {
+            throw new MongoClientException("Unable to support mongodb+srv// style connections as the 'com.sun.jndi.dns.DnsContextFactory' "
+                    + "class is not available in this JRE. A JNDI context is required for resolving SRV records.", e);
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/dns/DnsResolver.java b/driver-core/src/main/com/mongodb/internal/dns/DnsResolver.java
new file mode 100644
index 00000000000..61048126e4b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/dns/DnsResolver.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.dns;
+
+import java.util.List;
+
+/**
+ * Utility interface for resolving SRV and TXT records.
+ *
+ * <p>This class should not be considered a part of the public API.</p>
+ */
+public interface DnsResolver {
+
+    List<String> resolveHostFromSrvRecords(String srvHost);
+
+    String resolveAdditionalQueryParametersFromTxtRecords(String host);
+}
diff --git a/driver-core/src/main/com/mongodb/internal/event/ClusterListenerMulticaster.java b/driver-core/src/main/com/mongodb/internal/event/ClusterListenerMulticaster.java
new file mode 100644
index 00000000000..75daebfb3b8
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/event/ClusterListenerMulticaster.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.event;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.ClusterClosedEvent;
+import com.mongodb.event.ClusterDescriptionChangedEvent;
+import com.mongodb.event.ClusterListener;
+import com.mongodb.event.ClusterOpeningEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.lang.String.format;
+
+
+final class ClusterListenerMulticaster implements ClusterListener {
+    private static final Logger LOGGER = Loggers.getLogger("cluster.event");
+
+    private final List<ClusterListener> clusterListeners;
+
+    ClusterListenerMulticaster(final List<ClusterListener> clusterListeners) {
+        isTrue("All ClusterListener instances are non-null", !clusterListeners.contains(null));
+        this.clusterListeners = new ArrayList<ClusterListener>(clusterListeners);
+    }
+
+    @Override
+    public void clusterOpening(final ClusterOpeningEvent event) {
+        for (final ClusterListener cur : clusterListeners) {
+            try {
+                cur.clusterOpening(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising cluster opening event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void clusterClosed(final ClusterClosedEvent event) {
+        for (final ClusterListener cur : clusterListeners) {
+            try {
+                cur.clusterClosed(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising cluster closed event to listener %s", cur), e);
+                }
+
+            }
+        }
+    }
+
+    @Override
+    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
+        for (final ClusterListener cur : clusterListeners) {
+            try {
+                cur.clusterDescriptionChanged(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising cluster description changed event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/event/CommandListenerMulticaster.java b/driver-core/src/main/com/mongodb/internal/event/CommandListenerMulticaster.java
new file mode 100644
index 00000000000..f098285a973
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/event/CommandListenerMulticaster.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.event;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.CommandFailedEvent;
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.event.CommandSucceededEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.lang.String.format;
+
+
+final class CommandListenerMulticaster implements CommandListener {
+    private static final Logger LOGGER = Loggers.getLogger("protocol.event");
+
+    private final List<CommandListener> commandListeners;
+
+    CommandListenerMulticaster(final List<CommandListener> commandListeners) {
+        isTrue("All CommandListener instances are non-null", !commandListeners.contains(null));
+        this.commandListeners = new ArrayList<CommandListener>(commandListeners);
+    }
+
+    @Override
+    public void commandStarted(final CommandStartedEvent event) {
+        for (CommandListener cur : commandListeners) {
+            try {
+                cur.commandStarted(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising command started event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void commandSucceeded(final CommandSucceededEvent event) {
+        for (CommandListener cur : commandListeners) {
+            try {
+                cur.commandSucceeded(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising command succeeded event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void commandFailed(final CommandFailedEvent event) {
+        for (CommandListener cur : commandListeners) {
+            try {
+                cur.commandFailed(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising command failed event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/event/ConnectionPoolListenerMulticaster.java b/driver-core/src/main/com/mongodb/internal/event/ConnectionPoolListenerMulticaster.java
new file mode 100644
index 00000000000..95905ffb908
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/event/ConnectionPoolListenerMulticaster.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.event;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.ConnectionAddedEvent;
+import com.mongodb.event.ConnectionCheckedInEvent;
+import com.mongodb.event.ConnectionCheckedOutEvent;
+import com.mongodb.event.ConnectionPoolClosedEvent;
+import com.mongodb.event.ConnectionPoolListener;
+import com.mongodb.event.ConnectionPoolOpenedEvent;
+import com.mongodb.event.ConnectionPoolWaitQueueEnteredEvent;
+import com.mongodb.event.ConnectionPoolWaitQueueExitedEvent;
+import com.mongodb.event.ConnectionRemovedEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.lang.String.format;
+
+
+final class ConnectionPoolListenerMulticaster implements ConnectionPoolListener {
+    private static final Logger LOGGER = Loggers.getLogger("protocol.event");
+
+    private final List<ConnectionPoolListener> connectionPoolListeners;
+
+    ConnectionPoolListenerMulticaster(final List<ConnectionPoolListener> connectionPoolListeners) {
+        isTrue("All ConnectionPoolListener instances are non-null", !connectionPoolListeners.contains(null));
+        this.connectionPoolListeners = new ArrayList<ConnectionPoolListener>(connectionPoolListeners);
+    }
+
+    @Override
+    public void connectionPoolOpened(final ConnectionPoolOpenedEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.connectionPoolOpened(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool opened event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void connectionPoolClosed(final ConnectionPoolClosedEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.connectionPoolClosed(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool closed event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void connectionCheckedOut(final ConnectionCheckedOutEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.connectionCheckedOut(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool checked out event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void connectionCheckedIn(final ConnectionCheckedInEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.connectionCheckedIn(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool checked in event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void waitQueueEntered(final ConnectionPoolWaitQueueEnteredEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.waitQueueEntered(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool wait queue entered event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void waitQueueExited(final ConnectionPoolWaitQueueExitedEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.waitQueueExited(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool wait queue exited event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void connectionAdded(final ConnectionAddedEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.connectionAdded(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool connection added event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void connectionRemoved(final ConnectionRemovedEvent event) {
+        for (ConnectionPoolListener cur : connectionPoolListeners) {
+            try {
+                cur.connectionRemoved(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising connection pool connection removed event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/event/EventListenerHelper.java b/driver-core/src/main/com/mongodb/internal/event/EventListenerHelper.java
new file mode 100644
index 00000000000..ab1a0a60b5e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/event/EventListenerHelper.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.event;
+
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.event.ClusterListener;
+import com.mongodb.event.ClusterListenerAdapter;
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.ConnectionPoolListener;
+import com.mongodb.event.ConnectionPoolListenerAdapter;
+import com.mongodb.event.ServerListener;
+import com.mongodb.event.ServerListenerAdapter;
+import com.mongodb.event.ServerMonitorListener;
+import com.mongodb.event.ServerMonitorListenerAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class EventListenerHelper {
+
+    public static ClusterListener getClusterListener(final ClusterSettings clusterSettings) {
+        switch (clusterSettings.getClusterListeners().size()) {
+            case 0:
+                return NO_OP_CLUSTER_LISTENER;
+            case 1:
+                return clusterSettings.getClusterListeners().get(0);
+            default:
+                return new ClusterListenerMulticaster(clusterSettings.getClusterListeners());
+        }
+    }
+
+    public static CommandListener getCommandListener(final List<CommandListener> commandListeners) {
+        switch (commandListeners.size()) {
+            case 0:
+                return null;
+            case 1:
+                return commandListeners.get(0);
+            default:
+                return new CommandListenerMulticaster(commandListeners);
+        }
+    }
+
+    public static ConnectionPoolListener getConnectionPoolListener(final ConnectionPoolSettings connectionPoolSettings) {
+        switch (connectionPoolSettings.getConnectionPoolListeners().size()) {
+            case 0:
+                return NO_OP_CONNECTION_POOL_LISTENER;
+            case 1:
+                return connectionPoolSettings.getConnectionPoolListeners().get(0);
+            default:
+                return new ConnectionPoolListenerMulticaster(connectionPoolSettings.getConnectionPoolListeners());
+        }
+    }
+
+    public static ServerMonitorListener getServerMonitorListener(final ServerSettings serverSettings) {
+        switch (serverSettings.getServerMonitorListeners().size()) {
+            case 0:
+                return NO_OP_SERVER_MONITOR_LISTENER;
+            case 1:
+                return serverSettings.getServerMonitorListeners().get(0);
+            default:
+                return new ServerMonitorListenerMulticaster(serverSettings.getServerMonitorListeners());
+        }
+    }
+
+    public static ServerListener createServerListener(final ServerSettings serverSettings, final ServerListener additionalServerListener) {
+        List<ServerListener> mergedServerListeners = new ArrayList<ServerListener>();
+        if (additionalServerListener != null) {
+            mergedServerListeners.add(additionalServerListener);
+        }
+        mergedServerListeners.addAll(serverSettings.getServerListeners());
+
+        switch (mergedServerListeners.size()) {
+            case 0:
+                return NO_OP_SERVER_LISTENER;
+            case 1:
+                return mergedServerListeners.get(0);
+            default:
+                return new ServerListenerMulticaster(mergedServerListeners);
+        }
+    }
+
+    public static final ServerListener NO_OP_SERVER_LISTENER = new ServerListenerAdapter() {
+    };
+
+    public static final ServerMonitorListener NO_OP_SERVER_MONITOR_LISTENER = new ServerMonitorListenerAdapter() {
+    };
+
+    public static final ClusterListener NO_OP_CLUSTER_LISTENER = new ClusterListenerAdapter() {
+    };
+
+    public static final ConnectionPoolListener NO_OP_CONNECTION_POOL_LISTENER = new ConnectionPoolListenerAdapter() {
+    };
+
+    private EventListenerHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/event/ServerListenerMulticaster.java b/driver-core/src/main/com/mongodb/internal/event/ServerListenerMulticaster.java
new file mode 100644
index 00000000000..97f7530b1ba
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/event/ServerListenerMulticaster.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.event;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.ServerClosedEvent;
+import com.mongodb.event.ServerDescriptionChangedEvent;
+import com.mongodb.event.ServerListener;
+import com.mongodb.event.ServerOpeningEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.lang.String.format;
+
+
+final class ServerListenerMulticaster implements ServerListener {
+
+    private static final Logger LOGGER = Loggers.getLogger("cluster.event");
+
+    private final List<ServerListener> serverListeners;
+
+    ServerListenerMulticaster(final List<ServerListener> serverListeners) {
+        isTrue("All ServerListener instances are non-null", !serverListeners.contains(null));
+        this.serverListeners = new ArrayList<ServerListener>(serverListeners);
+    }
+
+    @Override
+    public void serverOpening(final ServerOpeningEvent event) {
+        for (ServerListener cur : serverListeners) {
+            try {
+                cur.serverOpening(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising server opening event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void serverClosed(final ServerClosedEvent event) {
+        for (ServerListener cur : serverListeners) {
+            try {
+                cur.serverClosed(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising server opening event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void serverDescriptionChanged(final ServerDescriptionChangedEvent event) {
+        for (ServerListener cur : serverListeners) {
+            try {
+                cur.serverDescriptionChanged(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising server description changed event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/event/ServerMonitorListenerMulticaster.java b/driver-core/src/main/com/mongodb/internal/event/ServerMonitorListenerMulticaster.java
new file mode 100644
index 00000000000..d32d5823559
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/event/ServerMonitorListenerMulticaster.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.event;
+
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.event.ServerHeartbeatFailedEvent;
+import com.mongodb.event.ServerHeartbeatStartedEvent;
+import com.mongodb.event.ServerHeartbeatSucceededEvent;
+import com.mongodb.event.ServerMonitorListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.lang.String.format;
+
+final class ServerMonitorListenerMulticaster implements ServerMonitorListener {
+    private static final Logger LOGGER = Loggers.getLogger("cluster.event");
+
+    private final List<ServerMonitorListener> serverMonitorListeners;
+
+    ServerMonitorListenerMulticaster(final List<ServerMonitorListener> serverMonitorListeners) {
+        isTrue("All ServerMonitorListener instances are non-null", !serverMonitorListeners.contains(null));
+        this.serverMonitorListeners = new ArrayList<ServerMonitorListener>(serverMonitorListeners);
+    }
+
+    @Override
+    public void serverHearbeatStarted(final ServerHeartbeatStartedEvent event) {
+        for (ServerMonitorListener cur : serverMonitorListeners) {
+            try {
+                cur.serverHearbeatStarted(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising server heartbeat started event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void serverHeartbeatSucceeded(final ServerHeartbeatSucceededEvent event) {
+        for (ServerMonitorListener cur : serverMonitorListeners) {
+            try {
+                cur.serverHeartbeatSucceeded(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising server heartbeat succeeded event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void serverHeartbeatFailed(final ServerHeartbeatFailedEvent event) {
+        for (ServerMonitorListener cur : serverMonitorListeners) {
+            try {
+                cur.serverHeartbeatFailed(event);
+            } catch (Exception e) {
+                if (LOGGER.isWarnEnabled()) {
+                    LOGGER.warn(format("Exception thrown raising server heartbeat failed event to listener %s", cur), e);
+                }
+            }
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/management/jmx/JMXMBeanServer.java b/driver-core/src/main/com/mongodb/internal/management/jmx/JMXMBeanServer.java
index 8bdf4a9cfd1..782df8c2da8 100644
--- a/driver-core/src/main/com/mongodb/internal/management/jmx/JMXMBeanServer.java
+++ b/driver-core/src/main/com/mongodb/internal/management/jmx/JMXMBeanServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperations.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperations.java
new file mode 100644
index 00000000000..ddfbeaaefba
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperations.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.internal.client.model.CountStrategy;
+import com.mongodb.client.model.CreateIndexOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropIndexOptions;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.FindOptions;
+import com.mongodb.client.model.IndexModel;
+import com.mongodb.client.model.InsertManyOptions;
+import com.mongodb.client.model.InsertOneOptions;
+import com.mongodb.client.model.MapReduceAction;
+import com.mongodb.client.model.RenameCollectionOptions;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.operation.AsyncReadOperation;
+import com.mongodb.operation.AsyncWriteOperation;
+import com.mongodb.operation.MapReduceAsyncBatchCursor;
+import com.mongodb.operation.MapReduceStatistics;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+/**
+ * This class is NOT part of the public API. It may change at any time without notification.
+ */
+public final class AsyncOperations<TDocument> {
+    private Operations<TDocument> operations;
+
+    public AsyncOperations(final Class<TDocument> documentClass, final ReadPreference readPreference,
+                           final CodecRegistry codecRegistry) {
+        this(null, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, false, true);
+    }
+
+    public AsyncOperations(final Class<TDocument> documentClass, final ReadPreference readPreference,
+                           final CodecRegistry codecRegistry, final boolean retryReads) {
+        this(null, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, false, retryReads);
+    }
+
+    public AsyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                           final CodecRegistry codecRegistry) {
+        this(namespace, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, false, true);
+    }
+
+    public AsyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                           final CodecRegistry codecRegistry, final boolean retryReads) {
+        this(namespace, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, false, retryReads);
+    }
+
+    public AsyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                           final CodecRegistry codecRegistry, final WriteConcern writeConcern) {
+        this(namespace, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, writeConcern, false, true);
+    }
+
+    public AsyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                           final CodecRegistry codecRegistry, final ReadConcern readConcern, final WriteConcern writeConcern) {
+        this(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern, false, true);
+    }
+
+    public AsyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                           final CodecRegistry codecRegistry, final ReadConcern readConcern, final WriteConcern writeConcern,
+                           final boolean retryWrites, final boolean retryReads) {
+        this.operations = new Operations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                retryWrites, retryReads);
+    }
+
+    public AsyncReadOperation<Long> count(final Bson filter, final CountOptions options, final CountStrategy countStrategy) {
+        return operations.count(filter, options, countStrategy);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> findFirst(final Bson filter, final Class<TResult> resultClass,
+                                                                             final FindOptions options) {
+        return operations.findFirst(filter, resultClass, options);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> find(final Bson filter, final Class<TResult> resultClass,
+                                                                        final FindOptions options) {
+        return operations.find(filter, resultClass, options);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> find(final MongoNamespace findNamespace, final Bson filter,
+                                                                        final Class<TResult> resultClass, final FindOptions options) {
+        return operations.find(findNamespace, filter, resultClass, options);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> distinct(final String fieldName, final Bson filter,
+                                                                            final Class<TResult> resultClass, final long maxTimeMS,
+                                                                            final Collation collation) {
+        return operations.distinct(fieldName, filter, resultClass, maxTimeMS, collation);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> aggregate(final List<? extends Bson> pipeline,
+                                                                             final Class<TResult> resultClass,
+                                                                             final long maxTimeMS, final long maxAwaitTimeMS,
+                                                                             final Integer batchSize, final Collation collation,
+                                                                             final Bson hint, final String comment,
+                                                                             final Boolean allowDiskUse, final Boolean useCursor,
+                                                                             final AggregationLevel aggregationLevel) {
+        return operations.aggregate(pipeline, resultClass, maxTimeMS, maxAwaitTimeMS, batchSize, collation, hint, comment, allowDiskUse,
+                useCursor, aggregationLevel);
+    }
+
+    public AsyncWriteOperation<Void> aggregateToCollection(final List<? extends Bson> pipeline, final long maxTimeMS,
+                                                           final Boolean allowDiskUse, final Boolean bypassDocumentValidation,
+                                                           final Collation collation, final Bson hint, final String comment,
+                                                           final AggregationLevel aggregationLevel) {
+        return operations.aggregateToCollection(pipeline, maxTimeMS, allowDiskUse, bypassDocumentValidation, collation, hint, comment,
+                aggregationLevel);
+    }
+
+    public AsyncWriteOperation<MapReduceStatistics> mapReduceToCollection(final String databaseName, final String collectionName,
+                                                                          final String mapFunction, final String reduceFunction,
+                                                                          final String finalizeFunction, final Bson filter, final int limit,
+                                                                          final long maxTimeMS, final boolean jsMode, final Bson scope,
+                                                                          final Bson sort, final boolean verbose,
+                                                                          final MapReduceAction action, final boolean nonAtomic,
+                                                                          final boolean sharded, final Boolean bypassDocumentValidation,
+                                                                          final Collation collation) {
+        return operations.mapReduceToCollection(databaseName, collectionName, mapFunction, reduceFunction, finalizeFunction, filter, limit,
+                maxTimeMS, jsMode, scope, sort, verbose, action, nonAtomic, sharded, bypassDocumentValidation, collation);
+    }
+
+    public <TResult> AsyncReadOperation<MapReduceAsyncBatchCursor<TResult>> mapReduce(final String mapFunction, final String reduceFunction,
+                                                                                      final String finalizeFunction,
+                                                                                      final Class<TResult> resultClass,
+                                                                                      final Bson filter, final int limit,
+                                                                                      final long maxTimeMS, final boolean jsMode,
+                                                                                      final Bson scope, final Bson sort,
+                                                                                      final boolean verbose, final Collation collation) {
+        return operations.mapReduce(mapFunction, reduceFunction, finalizeFunction, resultClass, filter, limit, maxTimeMS, jsMode, scope,
+                sort, verbose, collation);
+    }
+
+    public AsyncWriteOperation<TDocument> findOneAndDelete(final Bson filter, final FindOneAndDeleteOptions options) {
+        return operations.findOneAndDelete(filter, options);
+    }
+
+    public AsyncWriteOperation<TDocument> findOneAndReplace(final Bson filter, final TDocument replacement,
+                                                            final FindOneAndReplaceOptions options) {
+        return operations.findOneAndReplace(filter, replacement, options);
+    }
+
+    public AsyncWriteOperation<TDocument> findOneAndUpdate(final Bson filter, final Bson update, final FindOneAndUpdateOptions options) {
+        return operations.findOneAndUpdate(filter, update, options);
+    }
+
+    public AsyncWriteOperation<TDocument> findOneAndUpdate(final Bson filter, final List<? extends Bson> update,
+                                                           final FindOneAndUpdateOptions options) {
+        return operations.findOneAndUpdate(filter, update, options);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> insertOne(final TDocument document, final InsertOneOptions options) {
+        return operations.insertOne(document, options);
+    }
+
+
+    public AsyncWriteOperation<BulkWriteResult> replaceOne(final Bson filter, final TDocument replacement, final ReplaceOptions options) {
+        return operations.replaceOne(filter, replacement, options);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> deleteOne(final Bson filter, final DeleteOptions options) {
+        return operations.deleteOne(filter, options);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> deleteMany(final Bson filter, final DeleteOptions options) {
+        return operations.deleteMany(filter, options);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> updateOne(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return operations.updateOne(filter, update, updateOptions);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> updateOne(final Bson filter, final List<? extends Bson> update,
+                                                          final UpdateOptions updateOptions) {
+        return operations.updateOne(filter, update, updateOptions);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> updateMany(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return operations.updateMany(filter, update, updateOptions);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> updateMany(final Bson filter, final List<? extends Bson> update,
+                                                           final UpdateOptions updateOptions) {
+        return operations.updateMany(filter, update, updateOptions);
+    }
+
+    public AsyncWriteOperation<BulkWriteResult> insertMany(final List<? extends TDocument> documents,
+                                                           final InsertManyOptions options) {
+        return operations.insertMany(documents, options);
+    }
+
+    @SuppressWarnings("unchecked")
+    public AsyncWriteOperation<BulkWriteResult> bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests,
+                                                          final BulkWriteOptions options) {
+        return operations.bulkWrite(requests, options);
+    }
+
+
+    public AsyncWriteOperation<Void> dropCollection() {
+        return operations.dropCollection();
+    }
+
+    public AsyncWriteOperation<Void> renameCollection(final MongoNamespace newCollectionNamespace,
+                                                      final RenameCollectionOptions options) {
+        return operations.renameCollection(newCollectionNamespace, options);
+    }
+
+    public AsyncWriteOperation<Void> createIndexes(final List<IndexModel> indexes, final CreateIndexOptions options) {
+        return operations.createIndexes(indexes, options);
+    }
+
+    public AsyncWriteOperation<Void> dropIndex(final String indexName, final DropIndexOptions options) {
+        return operations.dropIndex(indexName, options);
+    }
+
+    public AsyncWriteOperation<Void> dropIndex(final Bson keys, final DropIndexOptions options) {
+        return operations.dropIndex(keys, options);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> listCollections(final String databaseName,
+                                                                                   final Class<TResult> resultClass, final Bson filter,
+                                                                                   final boolean collectionNamesOnly,
+                                                                                   final Integer batchSize, final long maxTimeMS) {
+        return operations.listCollections(databaseName, resultClass, filter, collectionNamesOnly, batchSize, maxTimeMS);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> listDatabases(final Class<TResult> resultClass, final Bson filter,
+                                                                                 final Boolean nameOnly, final long maxTimeMS) {
+        return operations.listDatabases(resultClass, filter, nameOnly, maxTimeMS);
+    }
+
+    public <TResult> AsyncReadOperation<AsyncBatchCursor<TResult>> listIndexes(final Class<TResult> resultClass, final Integer batchSize,
+                                                                               final long maxTimeMS) {
+        return operations.listIndexes(resultClass, batchSize, maxTimeMS);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/IndexHelper.java b/driver-core/src/main/com/mongodb/internal/operation/IndexHelper.java
new file mode 100644
index 00000000000..3b78bc5ff15
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/IndexHelper.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.client.model.IndexModel;
+import org.bson.BsonDocument;
+import org.bson.BsonNumber;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class is NOT part of the public API. It may change at any time without notification.
+ */
+public final class IndexHelper {
+
+    /**
+     * Get a list of index names for the given list of index models
+     *
+     * @param indexes the index models
+     * @param codecRegistry the codec registry to convert each Bson key to a BsonDocument
+     * @return the list of index names
+     */
+    public static List<String> getIndexNames(final List<IndexModel> indexes, final CodecRegistry codecRegistry) {
+        List<String> indexNames = new ArrayList<String>(indexes.size());
+        for (IndexModel index : indexes) {
+            String name = index.getOptions().getName();
+            if (name != null) {
+                indexNames.add(name);
+            } else {
+                indexNames.add(IndexHelper.generateIndexName(index.getKeys().toBsonDocument(BsonDocument.class, codecRegistry)));
+            }
+        }
+        return indexNames;
+    }
+
+    /**
+     * Convenience method to generate an index name from the set of fields it is over.
+     *
+     * @return a string representation of this index's fields
+     */
+    public static String generateIndexName(final BsonDocument index) {
+        StringBuilder indexName = new StringBuilder();
+        for (final String keyNames : index.keySet()) {
+            if (indexName.length() != 0) {
+                indexName.append('_');
+            }
+            indexName.append(keyNames).append('_');
+            BsonValue ascOrDescValue = index.get(keyNames);
+            if (ascOrDescValue instanceof BsonNumber) {
+                indexName.append(((BsonNumber) ascOrDescValue).intValue());
+            } else if (ascOrDescValue instanceof BsonString) {
+                indexName.append(((BsonString) ascOrDescValue).getValue().replace(' ', '_'));
+            }
+        }
+        return indexName.toString();
+    }
+
+    private IndexHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/Operations.java b/driver-core/src/main/com/mongodb/internal/operation/Operations.java
new file mode 100644
index 00000000000..5be44a14cb2
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/Operations.java
@@ -0,0 +1,556 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.bulk.IndexRequest;
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.bulk.WriteRequest;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.CreateIndexOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOneModel;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropIndexOptions;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.FindOptions;
+import com.mongodb.client.model.IndexModel;
+import com.mongodb.client.model.InsertManyOptions;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.InsertOneOptions;
+import com.mongodb.client.model.MapReduceAction;
+import com.mongodb.client.model.RenameCollectionOptions;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.model.UpdateManyModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.internal.client.model.CountStrategy;
+import com.mongodb.operation.AggregateOperation;
+import com.mongodb.operation.AggregateToCollectionOperation;
+import com.mongodb.operation.CountOperation;
+import com.mongodb.operation.CreateIndexesOperation;
+import com.mongodb.operation.DistinctOperation;
+import com.mongodb.operation.DropCollectionOperation;
+import com.mongodb.operation.DropIndexOperation;
+import com.mongodb.operation.FindAndDeleteOperation;
+import com.mongodb.operation.FindAndReplaceOperation;
+import com.mongodb.operation.FindAndUpdateOperation;
+import com.mongodb.operation.FindOperation;
+import com.mongodb.operation.ListCollectionsOperation;
+import com.mongodb.operation.ListDatabasesOperation;
+import com.mongodb.operation.ListIndexesOperation;
+import com.mongodb.operation.MapReduceToCollectionOperation;
+import com.mongodb.operation.MapReduceWithInlineResultsOperation;
+import com.mongodb.operation.MixedBulkWriteOperation;
+import com.mongodb.operation.RenameCollectionOperation;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWrapper;
+import org.bson.BsonJavaScript;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.codecs.Codec;
+import org.bson.codecs.CollectibleCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+final class Operations<TDocument> {
+    private final MongoNamespace namespace;
+    private final Class<TDocument> documentClass;
+    private final ReadPreference readPreference;
+    private final CodecRegistry codecRegistry;
+    private final ReadConcern readConcern;
+    private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private boolean retryReads;
+
+    Operations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+               final CodecRegistry codecRegistry, final ReadConcern readConcern, final WriteConcern writeConcern, final boolean retryWrites,
+               final boolean retryReads) {
+        this.namespace = namespace;
+        this.documentClass = documentClass;
+        this.readPreference = readPreference;
+        this.codecRegistry = codecRegistry;
+        this.readConcern = readConcern;
+        this.writeConcern = writeConcern;
+        this.retryWrites = retryWrites;
+        this.retryReads = retryReads;
+    }
+
+    CountOperation count(final Bson filter, final CountOptions options, final CountStrategy countStrategy) {
+        CountOperation operation = new CountOperation(namespace, countStrategy)
+                .retryReads(retryReads)
+                .filter(toBsonDocument(filter))
+                .skip(options.getSkip())
+                .limit(options.getLimit())
+                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                .collation(options.getCollation());
+        if (options.getHint() != null) {
+            operation.hint(toBsonDocument(options.getHint()));
+        } else if (options.getHintString() != null) {
+            operation.hint(new BsonString(options.getHintString()));
+        }
+        return operation;
+    }
+
+    <TResult> FindOperation<TResult> findFirst(final Bson filter, final Class<TResult> resultClass,
+                                                      final FindOptions options) {
+        return createFindOperation(namespace, filter, resultClass, options).batchSize(0).limit(-1);
+    }
+
+    <TResult> FindOperation<TResult> find(final Bson filter, final Class<TResult> resultClass,
+                                                 final FindOptions options) {
+        return createFindOperation(namespace, filter, resultClass, options);
+    }
+
+    <TResult> FindOperation<TResult> find(final MongoNamespace findNamespace, final Bson filter,
+                                                 final Class<TResult> resultClass, final FindOptions options) {
+        return createFindOperation(findNamespace, filter, resultClass, options);
+    }
+
+    @SuppressWarnings("deprecation")
+    private <TResult> FindOperation<TResult> createFindOperation(final MongoNamespace findNamespace, final Bson filter,
+                                                                 final Class<TResult> resultClass, final FindOptions options) {
+        FindOperation<TResult> operation = new FindOperation<TResult>(findNamespace, codecRegistry.get(resultClass))
+                .retryReads(retryReads)
+                .filter(filter == null ? new BsonDocument() : filter.toBsonDocument(documentClass, codecRegistry))
+                .batchSize(options.getBatchSize())
+                .skip(options.getSkip())
+                .limit(options.getLimit())
+                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                .maxAwaitTime(options.getMaxAwaitTime(MILLISECONDS), MILLISECONDS)
+                .modifiers(toBsonDocumentOrNull(options.getModifiers()))
+                .projection(toBsonDocumentOrNull(options.getProjection()))
+                .sort(toBsonDocumentOrNull(options.getSort()))
+                .cursorType(options.getCursorType())
+                .noCursorTimeout(options.isNoCursorTimeout())
+                .oplogReplay(options.isOplogReplay())
+                .partial(options.isPartial())
+                .slaveOk(readPreference.isSlaveOk())
+                .collation(options.getCollation())
+                .comment(options.getComment())
+                .min(toBsonDocumentOrNull(options.getMin()))
+                .max(toBsonDocumentOrNull(options.getMax()))
+                .maxScan(options.getMaxScan())
+                .returnKey(options.isReturnKey())
+                .showRecordId(options.isShowRecordId())
+                .snapshot(options.isSnapshot());
+
+        if (options.getHint() != null) {
+            operation.hint(toBsonDocument(options.getHint()));
+        } else if (options.getHintString() != null) {
+            operation.hint(new BsonString(options.getHintString()));
+        }
+        return operation;
+    }
+
+    <TResult> DistinctOperation<TResult> distinct(final String fieldName, final Bson filter,
+                                                         final Class<TResult> resultClass, final long maxTimeMS,
+                                                         final Collation collation) {
+        return new DistinctOperation<TResult>(namespace, fieldName, codecRegistry.get(resultClass))
+                .retryReads(retryReads)
+                .filter(filter == null ? null : filter.toBsonDocument(documentClass, codecRegistry))
+                .maxTime(maxTimeMS, MILLISECONDS)
+                .collation(collation);
+
+    }
+
+    @SuppressWarnings("deprecation")
+    <TResult> AggregateOperation<TResult> aggregate(final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                    final long maxTimeMS, final long maxAwaitTimeMS, final Integer batchSize,
+                                                    final Collation collation, final Bson hint, final String comment,
+                                                    final Boolean allowDiskUse, final Boolean useCursor,
+                                                    final AggregationLevel aggregationLevel) {
+        return new AggregateOperation<TResult>(namespace, toBsonDocumentList(pipeline), codecRegistry.get(resultClass), aggregationLevel)
+                .retryReads(retryReads)
+                .maxTime(maxTimeMS, MILLISECONDS)
+                .maxAwaitTime(maxAwaitTimeMS, MILLISECONDS)
+                .allowDiskUse(allowDiskUse)
+                .batchSize(batchSize)
+                .useCursor(useCursor)
+                .collation(collation)
+                .hint(hint == null ? null : hint.toBsonDocument(documentClass, codecRegistry))
+                .comment(comment);
+
+    }
+
+    AggregateToCollectionOperation aggregateToCollection(final List<? extends Bson> pipeline, final long maxTimeMS,
+                                                         final Boolean allowDiskUse, final Boolean bypassDocumentValidation,
+                                                         final Collation collation, final Bson hint, final String comment,
+                                                         final AggregationLevel aggregationLevel) {
+        return new AggregateToCollectionOperation(namespace, toBsonDocumentList(pipeline), readConcern, writeConcern, aggregationLevel)
+                .maxTime(maxTimeMS, MILLISECONDS)
+                .allowDiskUse(allowDiskUse)
+                .bypassDocumentValidation(bypassDocumentValidation)
+                .collation(collation)
+                .hint(hint == null ? null : hint.toBsonDocument(documentClass, codecRegistry))
+                .comment(comment);
+    }
+
+    MapReduceToCollectionOperation mapReduceToCollection(final String databaseName, final String collectionName,
+                                                                final String mapFunction, final String reduceFunction,
+                                                                final String finalizeFunction, final Bson filter, final int limit,
+                                                                final long maxTimeMS, final boolean jsMode, final Bson scope,
+                                                                final Bson sort, final boolean verbose, final MapReduceAction action,
+                                                                final boolean nonAtomic, final boolean sharded,
+                                                                final Boolean bypassDocumentValidation, final Collation collation) {
+        MapReduceToCollectionOperation operation = new MapReduceToCollectionOperation(namespace, new BsonJavaScript(mapFunction),
+                new BsonJavaScript(reduceFunction), collectionName, writeConcern)
+                .filter(toBsonDocumentOrNull(filter))
+                .limit(limit)
+                .maxTime(maxTimeMS, MILLISECONDS)
+                .jsMode(jsMode)
+                .scope(toBsonDocumentOrNull(scope))
+                .sort(toBsonDocumentOrNull(sort))
+                .verbose(verbose)
+                .action(action.getValue())
+                .nonAtomic(nonAtomic)
+                .sharded(sharded)
+                .databaseName(databaseName)
+                .bypassDocumentValidation(bypassDocumentValidation)
+                .collation(collation);
+
+        if (finalizeFunction != null) {
+            operation.finalizeFunction(new BsonJavaScript(finalizeFunction));
+        }
+        return operation;
+    }
+
+    <TResult> MapReduceWithInlineResultsOperation<TResult> mapReduce(final String mapFunction, final String reduceFunction,
+                                                                            final String finalizeFunction, final Class<TResult> resultClass,
+                                                                            final Bson filter, final int limit,
+                                                                            final long maxTimeMS, final boolean jsMode, final Bson scope,
+                                                                            final Bson sort, final boolean verbose,
+                                                                            final Collation collation) {
+        MapReduceWithInlineResultsOperation<TResult> operation =
+                new MapReduceWithInlineResultsOperation<TResult>(namespace,
+                        new BsonJavaScript(mapFunction),
+                        new BsonJavaScript(reduceFunction),
+                        codecRegistry.get(resultClass))
+                        .filter(toBsonDocumentOrNull(filter))
+                        .limit(limit)
+                        .maxTime(maxTimeMS, MILLISECONDS)
+                        .jsMode(jsMode)
+                        .scope(toBsonDocumentOrNull(scope))
+                        .sort(toBsonDocumentOrNull(sort))
+                        .verbose(verbose)
+                        .collation(collation);
+        if (finalizeFunction != null) {
+            operation.finalizeFunction(new BsonJavaScript(finalizeFunction));
+        }
+        return operation;
+    }
+
+    FindAndDeleteOperation<TDocument> findOneAndDelete(final Bson filter, final FindOneAndDeleteOptions options) {
+        return new FindAndDeleteOperation<TDocument>(namespace, writeConcern, retryWrites, getCodec())
+                .filter(toBsonDocument(filter))
+                .projection(toBsonDocument(options.getProjection()))
+                .sort(toBsonDocument(options.getSort()))
+                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                .collation(options.getCollation());
+    }
+
+    FindAndReplaceOperation<TDocument> findOneAndReplace(final Bson filter, final TDocument replacement,
+                                                                final FindOneAndReplaceOptions options) {
+        return new FindAndReplaceOperation<TDocument>(namespace, writeConcern, retryWrites, getCodec(),
+                documentToBsonDocument(replacement))
+                .filter(toBsonDocument(filter))
+                .projection(toBsonDocument(options.getProjection()))
+                .sort(toBsonDocument(options.getSort()))
+                .returnOriginal(options.getReturnDocument() == ReturnDocument.BEFORE)
+                .upsert(options.isUpsert())
+                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                .bypassDocumentValidation(options.getBypassDocumentValidation())
+                .collation(options.getCollation());
+    }
+
+    FindAndUpdateOperation<TDocument> findOneAndUpdate(final Bson filter, final Bson update, final FindOneAndUpdateOptions options) {
+        return new FindAndUpdateOperation<TDocument>(namespace, writeConcern, retryWrites, getCodec(),
+                toBsonDocument(update))
+                .filter(toBsonDocument(filter))
+                .projection(toBsonDocument(options.getProjection()))
+                .sort(toBsonDocument(options.getSort()))
+                .returnOriginal(options.getReturnDocument() == ReturnDocument.BEFORE)
+                .upsert(options.isUpsert())
+                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                .bypassDocumentValidation(options.getBypassDocumentValidation())
+                .collation(options.getCollation())
+                .arrayFilters(toBsonDocumentList(options.getArrayFilters()));
+    }
+
+    FindAndUpdateOperation<TDocument> findOneAndUpdate(final Bson filter, final List<? extends Bson> update,
+                                                       final FindOneAndUpdateOptions options) {
+        return new FindAndUpdateOperation<TDocument>(namespace, writeConcern, retryWrites, getCodec(), toBsonDocumentList(update))
+                .filter(toBsonDocument(filter))
+                .projection(toBsonDocument(options.getProjection()))
+                .sort(toBsonDocument(options.getSort()))
+                .returnOriginal(options.getReturnDocument() == ReturnDocument.BEFORE)
+                .upsert(options.isUpsert())
+                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                .bypassDocumentValidation(options.getBypassDocumentValidation())
+                .collation(options.getCollation())
+                .arrayFilters(toBsonDocumentList(options.getArrayFilters()));
+    }
+
+
+    MixedBulkWriteOperation insertOne(final TDocument document, final InsertOneOptions options) {
+        return bulkWrite(singletonList(new InsertOneModel<TDocument>(document)),
+                new BulkWriteOptions().bypassDocumentValidation(options.getBypassDocumentValidation()));
+    }
+
+
+    MixedBulkWriteOperation replaceOne(final Bson filter, final TDocument replacement, final ReplaceOptions options) {
+        return bulkWrite(singletonList(new ReplaceOneModel<TDocument>(filter, replacement, options)),
+                new BulkWriteOptions().bypassDocumentValidation(options.getBypassDocumentValidation()));
+    }
+
+    MixedBulkWriteOperation deleteOne(final Bson filter, final DeleteOptions options) {
+        return bulkWrite(singletonList(new DeleteOneModel<TDocument>(filter, options)), new BulkWriteOptions());
+    }
+
+    MixedBulkWriteOperation deleteMany(final Bson filter, final DeleteOptions options) {
+        return bulkWrite(singletonList(new DeleteManyModel<TDocument>(filter, options)), new BulkWriteOptions());
+    }
+
+    MixedBulkWriteOperation updateOne(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return bulkWrite(singletonList(new UpdateOneModel<TDocument>(filter, update, updateOptions)),
+                new BulkWriteOptions().bypassDocumentValidation(updateOptions.getBypassDocumentValidation()));
+    }
+
+    MixedBulkWriteOperation updateOne(final Bson filter, final List<? extends Bson> update, final UpdateOptions updateOptions) {
+        return bulkWrite(singletonList(new UpdateOneModel<TDocument>(filter, update, updateOptions)),
+                new BulkWriteOptions().bypassDocumentValidation(updateOptions.getBypassDocumentValidation()));
+    }
+
+    MixedBulkWriteOperation updateMany(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return bulkWrite(singletonList(new UpdateManyModel<TDocument>(filter, update, updateOptions)),
+                new BulkWriteOptions().bypassDocumentValidation(updateOptions.getBypassDocumentValidation()));
+    }
+
+    MixedBulkWriteOperation updateMany(final Bson filter, final List<? extends Bson> update, final UpdateOptions updateOptions) {
+        return bulkWrite(singletonList(new UpdateManyModel<TDocument>(filter, update, updateOptions)),
+                new BulkWriteOptions().bypassDocumentValidation(updateOptions.getBypassDocumentValidation()));
+    }
+
+    MixedBulkWriteOperation insertMany(final List<? extends TDocument> documents,
+                                              final InsertManyOptions options) {
+        notNull("documents", documents);
+        List<InsertRequest> requests = new ArrayList<InsertRequest>(documents.size());
+        for (TDocument document : documents) {
+            if (document == null) {
+                throw new IllegalArgumentException("documents can not contain a null value");
+            }
+            if (getCodec() instanceof CollectibleCodec) {
+                document = ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(document);
+            }
+            requests.add(new InsertRequest(documentToBsonDocument(document)));
+        }
+
+        return new MixedBulkWriteOperation(namespace, requests, options.isOrdered(), writeConcern, retryWrites)
+                .bypassDocumentValidation(options.getBypassDocumentValidation());
+    }
+
+    @SuppressWarnings("unchecked")
+    MixedBulkWriteOperation bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests,
+                                             final BulkWriteOptions options) {
+        notNull("requests", requests);
+        List<WriteRequest> writeRequests = new ArrayList<WriteRequest>(requests.size());
+        for (WriteModel<? extends TDocument> writeModel : requests) {
+            WriteRequest writeRequest;
+            if (writeModel == null) {
+                throw new IllegalArgumentException("requests can not contain a null value");
+            } else if (writeModel instanceof InsertOneModel) {
+                TDocument document = ((InsertOneModel<TDocument>) writeModel).getDocument();
+                if (getCodec() instanceof CollectibleCodec) {
+                    document = ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(document);
+                }
+                writeRequest = new InsertRequest(documentToBsonDocument(document));
+            } else if (writeModel instanceof ReplaceOneModel) {
+                ReplaceOneModel<TDocument> replaceOneModel = (ReplaceOneModel<TDocument>) writeModel;
+                writeRequest = new UpdateRequest(toBsonDocument(replaceOneModel.getFilter()), documentToBsonDocument(replaceOneModel
+                        .getReplacement()),
+                        WriteRequest.Type.REPLACE)
+                        .upsert(replaceOneModel.getReplaceOptions().isUpsert())
+                        .collation(replaceOneModel.getReplaceOptions().getCollation());
+            } else if (writeModel instanceof UpdateOneModel) {
+                UpdateOneModel<TDocument> updateOneModel = (UpdateOneModel<TDocument>) writeModel;
+                BsonValue update = updateOneModel.getUpdate() != null ? toBsonDocument(updateOneModel.getUpdate())
+                        : new BsonArray(toBsonDocumentList(updateOneModel.getUpdatePipeline()));
+                writeRequest = new UpdateRequest(toBsonDocument(updateOneModel.getFilter()), update, WriteRequest.Type.UPDATE)
+                        .multi(false)
+                        .upsert(updateOneModel.getOptions().isUpsert())
+                        .collation(updateOneModel.getOptions().getCollation())
+                        .arrayFilters(toBsonDocumentList(updateOneModel.getOptions().getArrayFilters()));
+            } else if (writeModel instanceof UpdateManyModel) {
+                UpdateManyModel<TDocument> updateManyModel = (UpdateManyModel<TDocument>) writeModel;
+                BsonValue update = updateManyModel.getUpdate() != null ? toBsonDocument(updateManyModel.getUpdate())
+                        : new BsonArray(toBsonDocumentList(updateManyModel.getUpdatePipeline()));
+                writeRequest = new UpdateRequest(toBsonDocument(updateManyModel.getFilter()), update, WriteRequest.Type.UPDATE)
+                        .multi(true)
+                        .upsert(updateManyModel.getOptions().isUpsert())
+                        .collation(updateManyModel.getOptions().getCollation())
+                        .arrayFilters(toBsonDocumentList(updateManyModel.getOptions().getArrayFilters()));
+            } else if (writeModel instanceof DeleteOneModel) {
+                DeleteOneModel<TDocument> deleteOneModel = (DeleteOneModel<TDocument>) writeModel;
+                writeRequest = new DeleteRequest(toBsonDocument(deleteOneModel.getFilter())).multi(false)
+                        .collation(deleteOneModel.getOptions().getCollation());
+            } else if (writeModel instanceof DeleteManyModel) {
+                DeleteManyModel<TDocument> deleteManyModel = (DeleteManyModel<TDocument>) writeModel;
+                writeRequest = new DeleteRequest(toBsonDocument(deleteManyModel.getFilter())).multi(true)
+                        .collation(deleteManyModel.getOptions().getCollation());
+            } else {
+                throw new UnsupportedOperationException(format("WriteModel of type %s is not supported", writeModel.getClass()));
+            }
+            writeRequests.add(writeRequest);
+        }
+
+        return new MixedBulkWriteOperation(namespace, writeRequests, options.isOrdered(), writeConcern, retryWrites)
+                .bypassDocumentValidation(options.getBypassDocumentValidation());
+    }
+
+
+    DropCollectionOperation dropCollection() {
+        return new DropCollectionOperation(namespace, writeConcern);
+    }
+
+
+    RenameCollectionOperation renameCollection(final MongoNamespace newCollectionNamespace,
+                                                      final RenameCollectionOptions renameCollectionOptions) {
+        return new RenameCollectionOperation(namespace, newCollectionNamespace, writeConcern)
+                .dropTarget(renameCollectionOptions.isDropTarget());
+    }
+
+    CreateIndexesOperation createIndexes(final List<IndexModel> indexes, final CreateIndexOptions createIndexOptions) {
+        notNull("indexes", indexes);
+        notNull("createIndexOptions", createIndexOptions);
+        List<IndexRequest> indexRequests = new ArrayList<IndexRequest>(indexes.size());
+        for (IndexModel model : indexes) {
+            if (model == null) {
+                throw new IllegalArgumentException("indexes can not contain a null value");
+            }
+            indexRequests.add(new IndexRequest(toBsonDocument(model.getKeys()))
+                    .name(model.getOptions().getName())
+                    .background(model.getOptions().isBackground())
+                    .unique(model.getOptions().isUnique())
+                    .sparse(model.getOptions().isSparse())
+                    .expireAfter(model.getOptions().getExpireAfter(TimeUnit.SECONDS), TimeUnit.SECONDS)
+                    .version(model.getOptions().getVersion())
+                    .weights(toBsonDocument(model.getOptions().getWeights()))
+                    .defaultLanguage(model.getOptions().getDefaultLanguage())
+                    .languageOverride(model.getOptions().getLanguageOverride())
+                    .textVersion(model.getOptions().getTextVersion())
+                    .sphereVersion(model.getOptions().getSphereVersion())
+                    .bits(model.getOptions().getBits())
+                    .min(model.getOptions().getMin())
+                    .max(model.getOptions().getMax())
+                    .bucketSize(model.getOptions().getBucketSize())
+                    .storageEngine(toBsonDocument(model.getOptions().getStorageEngine()))
+                    .partialFilterExpression(toBsonDocument(model.getOptions().getPartialFilterExpression()))
+                    .collation(model.getOptions().getCollation())
+                    .wildcardProjection(toBsonDocument(model.getOptions().getWildcardProjection()))
+            );
+        }
+        return new CreateIndexesOperation(namespace, indexRequests, writeConcern)
+                .maxTime(createIndexOptions.getMaxTime(MILLISECONDS), MILLISECONDS);
+    }
+
+    DropIndexOperation dropIndex(final String indexName, final DropIndexOptions dropIndexOptions) {
+        return new DropIndexOperation(namespace, indexName, writeConcern)
+                .maxTime(dropIndexOptions.getMaxTime(MILLISECONDS), MILLISECONDS);
+    }
+
+    DropIndexOperation dropIndex(final Bson keys, final DropIndexOptions dropIndexOptions) {
+        return new DropIndexOperation(namespace, keys.toBsonDocument(BsonDocument.class, codecRegistry), writeConcern)
+                .maxTime(dropIndexOptions.getMaxTime(MILLISECONDS), MILLISECONDS);
+    }
+
+    <TResult> ListCollectionsOperation<TResult> listCollections(final String databaseName, final Class<TResult> resultClass,
+                                                                final Bson filter, final boolean collectionNamesOnly,
+                                                                final Integer batchSize, final long maxTimeMS) {
+        return new ListCollectionsOperation<TResult>(databaseName, codecRegistry.get(resultClass))
+                .retryReads(retryReads)
+                .filter(toBsonDocumentOrNull(filter))
+                .nameOnly(collectionNamesOnly)
+                .batchSize(batchSize == null ? 0 : batchSize)
+                .maxTime(maxTimeMS, MILLISECONDS);
+    }
+
+    <TResult> ListDatabasesOperation<TResult> listDatabases(final Class<TResult> resultClass, final Bson filter,
+                                                                   final Boolean nameOnly, final long maxTimeMS) {
+        return new ListDatabasesOperation<TResult>(codecRegistry.get(resultClass)).maxTime(maxTimeMS, MILLISECONDS)
+                .retryReads(retryReads)
+                .filter(toBsonDocumentOrNull(filter))
+                .nameOnly(nameOnly);
+    }
+
+    <TResult> ListIndexesOperation<TResult> listIndexes(final Class<TResult> resultClass, final Integer batchSize,
+                                                               final long maxTimeMS) {
+        return new ListIndexesOperation<TResult>(namespace, codecRegistry.get(resultClass))
+                .retryReads(retryReads)
+                .batchSize(batchSize == null ? 0 : batchSize)
+                .maxTime(maxTimeMS, MILLISECONDS);
+    }
+
+    private Codec<TDocument> getCodec() {
+        return codecRegistry.get(documentClass);
+    }
+
+    private BsonDocument documentToBsonDocument(final TDocument document) {
+        return BsonDocumentWrapper.asBsonDocument(document, codecRegistry);
+    }
+
+    private BsonDocument toBsonDocument(final Bson bson) {
+        return bson == null ? null : bson.toBsonDocument(documentClass, codecRegistry);
+    }
+
+    private List<BsonDocument> toBsonDocumentList(final List<? extends Bson> bsonList) {
+        if (bsonList == null) {
+            return null;
+        }
+        List<BsonDocument> bsonDocumentList = new ArrayList<BsonDocument>(bsonList.size());
+        for (Bson cur : bsonList) {
+            bsonDocumentList.add(toBsonDocument(cur));
+        }
+        return bsonDocumentList;
+    }
+
+    BsonDocument toBsonDocumentOrNull(final Bson document) {
+        return document == null ? null : document.toBsonDocument(documentClass, codecRegistry);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/ServerVersionHelper.java b/driver-core/src/main/com/mongodb/internal/operation/ServerVersionHelper.java
new file mode 100644
index 00000000000..25ec2ad5cf7
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/ServerVersionHelper.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+
+import com.mongodb.connection.ConnectionDescription;
+
+/**
+ * This class is NOT part of the public API. It may change at any time without notification.
+ */
+public final class ServerVersionHelper {
+
+    public static final int THREE_DOT_ZERO_WIRE_VERSION = 3;
+    public static final int THREE_DOT_TWO_WIRE_VERSION = 4;
+    public static final int THREE_DOT_FOUR_WIRE_VERSION = 5;
+    public static final int THREE_DOT_SIX_WIRE_VERSION = 6;
+    public static final int FOUR_DOT_ZERO_WIRE_VERSION = 7;
+    public static final int FOUR_DOT_TWO_WIRE_VERSION = 8;
+
+    public static boolean serverIsAtLeastVersionThreeDotZero(final ConnectionDescription description) {
+        return description.getMaxWireVersion() >= THREE_DOT_ZERO_WIRE_VERSION;
+    }
+
+    public static boolean serverIsAtLeastVersionThreeDotTwo(final ConnectionDescription description) {
+        return description.getMaxWireVersion() >= THREE_DOT_TWO_WIRE_VERSION;
+    }
+
+    public static boolean serverIsAtLeastVersionThreeDotFour(final ConnectionDescription description) {
+        return description.getMaxWireVersion() >= THREE_DOT_FOUR_WIRE_VERSION;
+    }
+
+    public static boolean serverIsAtLeastVersionThreeDotSix(final ConnectionDescription description) {
+        return description.getMaxWireVersion() >= THREE_DOT_SIX_WIRE_VERSION;
+    }
+
+    public static boolean serverIsAtLeastVersionFourDotZero(final ConnectionDescription description) {
+        return description.getMaxWireVersion() >= FOUR_DOT_ZERO_WIRE_VERSION;
+    }
+
+    public static boolean serverIsAtLeastVersionFourDotTwo(final ConnectionDescription description) {
+        return description.getMaxWireVersion() >= FOUR_DOT_TWO_WIRE_VERSION;
+    }
+
+    public static boolean serverIsLessThanVersionThreeDotZero(final ConnectionDescription description) {
+        return description.getMaxWireVersion() < THREE_DOT_ZERO_WIRE_VERSION;
+    }
+
+    public static boolean serverIsLessThanVersionThreeDotTwo(final ConnectionDescription description) {
+        return description.getMaxWireVersion() < THREE_DOT_TWO_WIRE_VERSION;
+    }
+
+    public static boolean serverIsLessThanVersionThreeDotFour(final ConnectionDescription description) {
+        return description.getMaxWireVersion() < THREE_DOT_FOUR_WIRE_VERSION;
+    }
+
+    public static boolean serverIsLessThanVersionThreeDotSix(final ConnectionDescription description) {
+        return description.getMaxWireVersion() < THREE_DOT_SIX_WIRE_VERSION;
+    }
+
+    public static boolean serverIsLessThanVersionFourDotZero(final ConnectionDescription description) {
+        return description.getMaxWireVersion() < FOUR_DOT_ZERO_WIRE_VERSION;
+    }
+
+    public static boolean serverIsLessThanVersionFourDotTwo(final ConnectionDescription description) {
+        return description.getMaxWireVersion() < FOUR_DOT_TWO_WIRE_VERSION;
+    }
+
+    private ServerVersionHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/SyncOperations.java b/driver-core/src/main/com/mongodb/internal/operation/SyncOperations.java
new file mode 100644
index 00000000000..5938eb8d42b
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/SyncOperations.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.internal.client.model.CountStrategy;
+import com.mongodb.client.model.CreateIndexOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropIndexOptions;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.FindOptions;
+import com.mongodb.client.model.IndexModel;
+import com.mongodb.client.model.InsertManyOptions;
+import com.mongodb.client.model.InsertOneOptions;
+import com.mongodb.client.model.MapReduceAction;
+import com.mongodb.client.model.RenameCollectionOptions;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.MapReduceBatchCursor;
+import com.mongodb.operation.MapReduceStatistics;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.operation.WriteOperation;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+/**
+ * This class is NOT part of the public API. It may change at any time without notification.
+ */
+public final class SyncOperations<TDocument> {
+    private final Operations<TDocument> operations;
+
+    public SyncOperations(final Class<TDocument> documentClass, final ReadPreference readPreference,
+                          final CodecRegistry codecRegistry) {
+        this(null, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, true, true);
+    }
+
+    public SyncOperations(final Class<TDocument> documentClass, final ReadPreference readPreference,
+                          final CodecRegistry codecRegistry, final boolean retryReads) {
+        this(null, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, true, retryReads);
+    }
+
+    public SyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                          final CodecRegistry codecRegistry) {
+        this(namespace, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, true, true);
+    }
+
+    public SyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                          final CodecRegistry codecRegistry, final boolean retryReads) {
+        this(namespace, documentClass, readPreference, codecRegistry, ReadConcern.DEFAULT, WriteConcern.ACKNOWLEDGED, true, retryReads);
+    }
+
+    public SyncOperations(final MongoNamespace namespace, final Class<TDocument> documentClass, final ReadPreference readPreference,
+                          final CodecRegistry codecRegistry, final ReadConcern readConcern, final WriteConcern writeConcern,
+                          final boolean retryWrites, final boolean retryReads) {
+        this.operations = new Operations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                retryWrites, retryReads);
+    }
+
+    public ReadOperation<Long> count(final Bson filter, final CountOptions options, final CountStrategy countStrategy) {
+        return operations.count(filter, options, countStrategy);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> findFirst(final Bson filter, final Class<TResult> resultClass,
+                                                                   final FindOptions options) {
+        return operations.findFirst(filter, resultClass, options);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> find(final Bson filter, final Class<TResult> resultClass,
+                                                              final FindOptions options) {
+        return operations.find(filter, resultClass, options);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> find(final MongoNamespace findNamespace, final Bson filter,
+                                                              final Class<TResult> resultClass, final FindOptions options) {
+        return operations.find(findNamespace, filter, resultClass, options);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> distinct(final String fieldName, final Bson filter,
+                                                                  final Class<TResult> resultClass, final long maxTimeMS,
+                                                                  final Collation collation) {
+        return operations.distinct(fieldName, filter, resultClass, maxTimeMS, collation);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> aggregate(final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                                   final long maxTimeMS, final long maxAwaitTimeMS, final Integer batchSize,
+                                                                   final Collation collation, final Bson hint, final String comment,
+                                                                   final Boolean allowDiskUse, final Boolean useCursor,
+                                                                   final AggregationLevel aggregationLevel) {
+        return operations.aggregate(pipeline, resultClass, maxTimeMS, maxAwaitTimeMS, batchSize, collation, hint, comment, allowDiskUse,
+                useCursor, aggregationLevel);
+    }
+
+    public WriteOperation<Void> aggregateToCollection(final List<? extends Bson> pipeline, final long maxTimeMS,
+                                                      final Boolean allowDiskUse, final Boolean bypassDocumentValidation,
+                                                      final Collation collation, final Bson hint, final String comment,
+                                                      final AggregationLevel aggregationLevel) {
+        return operations.aggregateToCollection(pipeline, maxTimeMS, allowDiskUse, bypassDocumentValidation, collation, hint, comment,
+                aggregationLevel);
+    }
+
+    public WriteOperation<MapReduceStatistics> mapReduceToCollection(final String databaseName, final String collectionName,
+                                                                     final String mapFunction, final String reduceFunction,
+                                                                     final String finalizeFunction, final Bson filter, final int limit,
+                                                                     final long maxTimeMS, final boolean jsMode, final Bson scope,
+                                                                     final Bson sort, final boolean verbose, final MapReduceAction action,
+                                                                     final boolean nonAtomic, final boolean sharded,
+                                                                     final Boolean bypassDocumentValidation, final Collation collation) {
+        return operations.mapReduceToCollection(databaseName, collectionName, mapFunction, reduceFunction, finalizeFunction, filter, limit,
+                maxTimeMS, jsMode, scope, sort, verbose, action, nonAtomic, sharded, bypassDocumentValidation, collation);
+    }
+
+    public <TResult> ReadOperation<MapReduceBatchCursor<TResult>> mapReduce(final String mapFunction, final String reduceFunction,
+                                                                            final String finalizeFunction, final Class<TResult> resultClass,
+                                                                            final Bson filter, final int limit,
+                                                                            final long maxTimeMS, final boolean jsMode, final Bson scope,
+                                                                            final Bson sort, final boolean verbose,
+                                                                            final Collation collation) {
+        return operations.mapReduce(mapFunction, reduceFunction, finalizeFunction, resultClass, filter, limit, maxTimeMS, jsMode, scope,
+                sort, verbose, collation);
+    }
+
+    public WriteOperation<TDocument> findOneAndDelete(final Bson filter, final FindOneAndDeleteOptions options) {
+        return operations.findOneAndDelete(filter, options);
+    }
+
+    public WriteOperation<TDocument> findOneAndReplace(final Bson filter, final TDocument replacement,
+                                                       final FindOneAndReplaceOptions options) {
+        return operations.findOneAndReplace(filter, replacement, options);
+    }
+
+    public WriteOperation<TDocument> findOneAndUpdate(final Bson filter, final Bson update, final FindOneAndUpdateOptions options) {
+        return operations.findOneAndUpdate(filter, update, options);
+    }
+
+    public WriteOperation<TDocument> findOneAndUpdate(final Bson filter, final List<? extends Bson> update,
+                                                      final FindOneAndUpdateOptions options) {
+        return operations.findOneAndUpdate(filter, update, options);
+    }
+
+    public WriteOperation<BulkWriteResult> insertOne(final TDocument document, final InsertOneOptions options) {
+        return operations.insertOne(document, options);
+    }
+
+
+    public WriteOperation<BulkWriteResult> replaceOne(final Bson filter, final TDocument replacement, final ReplaceOptions options) {
+        return operations.replaceOne(filter, replacement, options);
+    }
+
+    public WriteOperation<BulkWriteResult> deleteOne(final Bson filter, final DeleteOptions options) {
+        return operations.deleteOne(filter, options);
+    }
+
+    public WriteOperation<BulkWriteResult> deleteMany(final Bson filter, final DeleteOptions options) {
+        return operations.deleteMany(filter, options);
+    }
+
+    public WriteOperation<BulkWriteResult> updateOne(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return operations.updateOne(filter, update, updateOptions);
+    }
+
+    public WriteOperation<BulkWriteResult> updateOne(final Bson filter, final List<? extends Bson> update,
+                                                     final UpdateOptions updateOptions) {
+        return operations.updateOne(filter, update, updateOptions);
+    }
+
+    public WriteOperation<BulkWriteResult> updateMany(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return operations.updateMany(filter, update, updateOptions);
+    }
+
+    public WriteOperation<BulkWriteResult> updateMany(final Bson filter, final List<? extends Bson> update,
+                                                      final UpdateOptions updateOptions) {
+        return operations.updateMany(filter, update, updateOptions);
+    }
+
+    public WriteOperation<BulkWriteResult> insertMany(final List<? extends TDocument> documents,
+                                                      final InsertManyOptions options) {
+        return operations.insertMany(documents, options);
+    }
+
+    @SuppressWarnings("unchecked")
+    public WriteOperation<BulkWriteResult> bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests,
+                                                     final BulkWriteOptions options) {
+        return operations.bulkWrite(requests, options);
+    }
+
+
+    public WriteOperation<Void> dropCollection() {
+        return operations.dropCollection();
+    }
+
+    public WriteOperation<Void> renameCollection(final MongoNamespace newCollectionNamespace,
+                                                 final RenameCollectionOptions options) {
+        return operations.renameCollection(newCollectionNamespace, options);
+    }
+
+    public WriteOperation<Void> createIndexes(final List<IndexModel> indexes, final CreateIndexOptions options) {
+        return operations.createIndexes(indexes, options);
+    }
+
+    public WriteOperation<Void> dropIndex(final String indexName, final DropIndexOptions options) {
+        return operations.dropIndex(indexName, options);
+    }
+
+    public WriteOperation<Void> dropIndex(final Bson keys, final DropIndexOptions options) {
+        return operations.dropIndex(keys, options);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> listCollections(final String databaseName, final Class<TResult> resultClass,
+                                                                         final Bson filter, final boolean collectionNamesOnly,
+                                                                         final Integer batchSize, final long maxTimeMS) {
+        return operations.listCollections(databaseName, resultClass, filter, collectionNamesOnly, batchSize, maxTimeMS);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> listDatabases(final Class<TResult> resultClass, final Bson filter,
+                                                                       final Boolean nameOnly, final long maxTimeMS) {
+        return operations.listDatabases(resultClass, filter, nameOnly, maxTimeMS);
+    }
+
+    public <TResult> ReadOperation<BatchCursor<TResult>> listIndexes(final Class<TResult> resultClass, final Integer batchSize,
+                                                                     final long maxTimeMS) {
+        return operations.listIndexes(resultClass, batchSize, maxTimeMS);
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java b/driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java
new file mode 100644
index 00000000000..8d34787fe1a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/operation/WriteConcernHelper.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoWriteConcernException;
+import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcern;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.bulk.WriteConcernError;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.internal.connection.ProtocolHelper;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotFour;
+
+/**
+ * This class is NOT part of the public API. It may change at any time without notification.
+ */
+public final class WriteConcernHelper {
+
+    public static void appendWriteConcernToCommand(final WriteConcern writeConcern, final BsonDocument commandDocument,
+                                                   final ConnectionDescription description) {
+        if (writeConcern != null && !writeConcern.isServerDefault() && serverIsAtLeastVersionThreeDotFour(description)) {
+            commandDocument.put("writeConcern", writeConcern.asDocument());
+        }
+    }
+
+    public static void throwOnWriteConcernError(final BsonDocument result, final ServerAddress serverAddress) {
+        if (hasWriteConcernError(result)) {
+            throwOnSpecialException(result, serverAddress);
+            throw createWriteConcernException(result, serverAddress);
+        }
+    }
+
+    public static void throwOnSpecialException(final BsonDocument result, final ServerAddress serverAddress) {
+        MongoException specialException = ProtocolHelper.createSpecialException(result, serverAddress, "errmsg");
+        if (specialException != null) {
+            throw specialException;
+        }
+    }
+
+    public static boolean hasWriteConcernError(final BsonDocument result) {
+        return result.containsKey("writeConcernError");
+    }
+
+    public static MongoWriteConcernException createWriteConcernException(final BsonDocument result, final ServerAddress serverAddress) {
+        return new MongoWriteConcernException(createWriteConcernError(result.getDocument("writeConcernError")),
+                WriteConcernResult.acknowledged(0, false, null), serverAddress);
+    }
+
+    public static WriteConcernError createWriteConcernError(final BsonDocument writeConcernErrorDocument) {
+        return new WriteConcernError(writeConcernErrorDocument.getNumber("code").intValue(),
+                writeConcernErrorDocument.getString("codeName", new BsonString("")).getValue(),
+                writeConcernErrorDocument.getString("errmsg").getValue(),
+                writeConcernErrorDocument.getDocument("errInfo", new BsonDocument()));
+    }
+
+    private WriteConcernHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/session/BaseClientSessionImpl.java b/driver-core/src/main/com/mongodb/internal/session/BaseClientSessionImpl.java
new file mode 100644
index 00000000000..5c2fc33c886
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/session/BaseClientSessionImpl.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.session;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.lang.Nullable;
+import com.mongodb.session.ClientSession;
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.session.ServerSession;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+
+public class BaseClientSessionImpl implements ClientSession {
+    private static final String CLUSTER_TIME_KEY = "clusterTime";
+
+    private final ServerSessionPool serverSessionPool;
+    private final ServerSession serverSession;
+    private final Object originator;
+    private final ClientSessionOptions options;
+    private BsonDocument clusterTime;
+    private BsonTimestamp operationTime;
+    private ServerAddress pinnedServerAddress;
+    private BsonDocument recoveryToken;
+    private volatile boolean closed;
+
+    public BaseClientSessionImpl(final ServerSessionPool serverSessionPool, final Object originator, final ClientSessionOptions options) {
+        this.serverSessionPool = serverSessionPool;
+        this.serverSession = serverSessionPool.get();
+        this.originator = originator;
+        this.options = options;
+        this.pinnedServerAddress = null;
+        closed = false;
+    }
+
+    @Override
+    @Nullable
+    public ServerAddress getPinnedServerAddress() {
+        return pinnedServerAddress;
+    }
+
+    @Override
+    public void setPinnedServerAddress(@Nullable final ServerAddress address) {
+        isTrue("pinned mongos null check", address == null || pinnedServerAddress == null);
+        pinnedServerAddress = address;
+    }
+
+    @Override
+    public BsonDocument getRecoveryToken() {
+        return recoveryToken;
+    }
+
+    @Override
+    public void setRecoveryToken(final BsonDocument recoveryToken) {
+        this.recoveryToken = recoveryToken;
+    }
+
+    @Override
+    public ClientSessionOptions getOptions() {
+        return options;
+    }
+
+    @Override
+    public boolean isCausallyConsistent() {
+        Boolean causallyConsistent = options.isCausallyConsistent();
+        return causallyConsistent == null ? true : causallyConsistent;
+    }
+
+    @Override
+    public Object getOriginator() {
+        return originator;
+    }
+
+    @Override
+    public BsonDocument getClusterTime() {
+        return clusterTime;
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return operationTime;
+    }
+
+    @Override
+    public ServerSession getServerSession() {
+        isTrue("open", !closed);
+        return serverSession;
+    }
+
+    @Override
+    public void advanceOperationTime(final BsonTimestamp newOperationTime) {
+        isTrue("open", !closed);
+        this.operationTime = greaterOf(newOperationTime);
+    }
+
+    @Override
+    public void advanceClusterTime(final BsonDocument newClusterTime) {
+        isTrue("open", !closed);
+        this.clusterTime = greaterOf(newClusterTime);
+    }
+
+    private BsonDocument greaterOf(final BsonDocument newClusterTime) {
+        if (newClusterTime == null) {
+            return clusterTime;
+        } else if (clusterTime == null) {
+            return newClusterTime;
+        } else {
+            return newClusterTime.getTimestamp(CLUSTER_TIME_KEY).compareTo(clusterTime.getTimestamp(CLUSTER_TIME_KEY)) > 0
+                    ? newClusterTime : clusterTime;
+        }
+    }
+
+    private BsonTimestamp greaterOf(final BsonTimestamp newOperationTime) {
+        if (newOperationTime == null) {
+            return operationTime;
+        } else if (operationTime == null) {
+            return newOperationTime;
+        } else {
+            return newOperationTime.compareTo(operationTime) > 0 ? newOperationTime : operationTime;
+        }
+    }
+
+    @Override
+    public void close() {
+        if (!closed) {
+            closed = true;
+            serverSessionPool.release(serverSession);
+            pinnedServerAddress = null;
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/session/ClientSessionContext.java b/driver-core/src/main/com/mongodb/internal/session/ClientSessionContext.java
new file mode 100644
index 00000000000..c31c61e98e0
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/session/ClientSessionContext.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.session;
+
+import com.mongodb.session.ClientSession;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+public abstract class ClientSessionContext implements SessionContext {
+
+    private ClientSession clientSession;
+
+    public ClientSessionContext(final ClientSession clientSession) {
+        this.clientSession = notNull("clientSession", clientSession);
+    }
+
+    public ClientSession getClientSession() {
+        return clientSession;
+    }
+
+    @Override
+    public boolean hasSession() {
+        return true;
+    }
+
+    @Override
+    public BsonDocument getSessionId() {
+        return clientSession.getServerSession().getIdentifier();
+    }
+
+    @Override
+    public boolean isCausallyConsistent() {
+        return clientSession.isCausallyConsistent();
+    }
+
+    @Override
+    public long getTransactionNumber() {
+        return clientSession.getServerSession().getTransactionNumber();
+    }
+
+    @Override
+    public long advanceTransactionNumber() {
+        return clientSession.getServerSession().advanceTransactionNumber();
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return clientSession.getOperationTime();
+    }
+
+    @Override
+    public void advanceOperationTime(final BsonTimestamp operationTime) {
+        clientSession.advanceOperationTime(operationTime);
+    }
+
+    @Override
+    public BsonDocument getClusterTime() {
+        return clientSession.getClusterTime();
+    }
+
+    @Override
+    public void advanceClusterTime(final BsonDocument clusterTime) {
+        clientSession.advanceClusterTime(clusterTime);
+    }
+
+    @Override
+    public void setRecoveryToken(final BsonDocument recoveryToken) {
+        clientSession.setRecoveryToken(recoveryToken);
+    }
+
+    @Override
+    public void unpinServerAddress() {
+        clientSession.setPinnedServerAddress(null);
+    }
+
+    @Override
+    public void markSessionDirty() {
+        clientSession.getServerSession().markDirty();
+    }
+
+    @Override
+    public boolean isSessionMarkedDirty() {
+        return clientSession.getServerSession().isMarkedDirty();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java b/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java
new file mode 100644
index 00000000000..d73581a4fe6
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/internal/session/ServerSessionPool.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.session;
+
+import com.mongodb.MongoException;
+import com.mongodb.ReadPreference;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.connection.ConcurrentPool;
+import com.mongodb.internal.connection.ConcurrentPool.Prune;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.selector.ReadPreferenceServerSelector;
+import com.mongodb.selector.ServerSelector;
+import com.mongodb.session.ServerSession;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.UuidCodec;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+public class ServerSessionPool {
+    private static final int END_SESSIONS_BATCH_SIZE = 10000;
+
+    private final ConcurrentPool<ServerSessionImpl> serverSessionPool =
+            new ConcurrentPool<ServerSessionImpl>(Integer.MAX_VALUE, new ServerSessionItemFactory());
+    private final Cluster cluster;
+    private final ServerSessionPool.Clock clock;
+    private volatile boolean closing;
+    private volatile boolean closed;
+    private final List<BsonDocument> closedSessionIdentifiers = new ArrayList<BsonDocument>();
+
+    interface Clock {
+        long millis();
+    }
+
+    public ServerSessionPool(final Cluster cluster) {
+        this(cluster, new Clock() {
+            @Override
+            public long millis() {
+                return System.currentTimeMillis();
+            }
+        });
+    }
+
+    public ServerSessionPool(final Cluster cluster, final Clock clock) {
+        this.cluster = cluster;
+        this.clock = clock;
+    }
+
+    public ServerSession get() {
+        isTrue("server session pool is open", !closed);
+        ServerSessionImpl serverSession = serverSessionPool.get();
+        while (shouldPrune(serverSession)) {
+            serverSessionPool.release(serverSession, true);
+            serverSession = serverSessionPool.get();
+        }
+        return serverSession;
+    }
+
+    public void release(final ServerSession serverSession) {
+        serverSessionPool.release((ServerSessionImpl) serverSession);
+        serverSessionPool.prune();
+    }
+
+    public void close() {
+        try {
+            closing = true;
+            serverSessionPool.close();
+
+            List<BsonDocument> identifiers;
+            synchronized (this) {
+                identifiers = new ArrayList<BsonDocument>(closedSessionIdentifiers);
+                closedSessionIdentifiers.clear();
+            }
+            endClosedSessions(identifiers);
+        } finally {
+            closed = true;
+        }
+    }
+
+    public int getInUseCount() {
+        return serverSessionPool.getInUseCount();
+    }
+
+    private void closeSession(final ServerSessionImpl serverSession) {
+        serverSession.close();
+        // only track closed sessions when pool is in the process of closing
+        if (!closing) {
+            return;
+        }
+
+        List<BsonDocument> identifiers = null;
+        synchronized (this) {
+            closedSessionIdentifiers.add(serverSession.getIdentifier());
+            if (closedSessionIdentifiers.size() == END_SESSIONS_BATCH_SIZE) {
+                identifiers = new ArrayList<BsonDocument>(closedSessionIdentifiers);
+                closedSessionIdentifiers.clear();
+            }
+        }
+        if (identifiers != null) {
+            endClosedSessions(identifiers);
+        }
+    }
+
+    private void endClosedSessions(final List<BsonDocument> identifiers) {
+        if (identifiers.isEmpty()) {
+            return;
+        }
+
+        final List<ServerDescription> primaryPreferred = new ReadPreferenceServerSelector(ReadPreference.primaryPreferred())
+                .select(cluster.getCurrentDescription());
+        if (primaryPreferred.isEmpty()) {
+            return;
+        }
+
+        Connection connection = cluster.selectServer(new ServerSelector() {
+            @Override
+            public List<ServerDescription> select(final ClusterDescription clusterDescription) {
+                for (ServerDescription cur : clusterDescription.getServerDescriptions()) {
+                    if (cur.getAddress().equals(primaryPreferred.get(0).getAddress())) {
+                        return Collections.singletonList(cur);
+                    }
+                }
+                return Collections.emptyList();
+            }
+        }).getConnection();
+        try {
+            connection.command("admin",
+                    new BsonDocument("endSessions", new BsonArray(identifiers)), new NoOpFieldNameValidator(),
+                    ReadPreference.primaryPreferred(), new BsonDocumentCodec(), NoOpSessionContext.INSTANCE);
+        } catch (MongoException e) {
+            // ignore exceptions
+        } finally {
+            connection.release();
+        }
+    }
+
+    private boolean shouldPrune(final ServerSessionImpl serverSession) {
+        Integer logicalSessionTimeoutMinutes = cluster.getCurrentDescription().getLogicalSessionTimeoutMinutes();
+        // if the server no longer supports sessions, prune the session
+        if (logicalSessionTimeoutMinutes == null) {
+            return false;
+        }
+        if (serverSession.isMarkedDirty()) {
+            return true;
+        }
+        long currentTimeMillis = clock.millis();
+        final long timeSinceLastUse = currentTimeMillis - serverSession.getLastUsedAtMillis();
+        final long oneMinuteFromTimeout = MINUTES.toMillis(logicalSessionTimeoutMinutes - 1);
+        return timeSinceLastUse > oneMinuteFromTimeout;
+    }
+
+
+    final class ServerSessionImpl implements ServerSession {
+        private final BsonDocument identifier;
+        private long transactionNumber = 0;
+        private volatile long lastUsedAtMillis = clock.millis();
+        private volatile boolean closed;
+        private volatile boolean dirty = false;
+
+        ServerSessionImpl(final BsonBinary identifier) {
+            this.identifier = new BsonDocument("id", identifier);
+        }
+
+        void close() {
+            closed = true;
+        }
+
+        long getLastUsedAtMillis() {
+            return lastUsedAtMillis;
+        }
+
+        @Override
+        public long getTransactionNumber() {
+            return transactionNumber;
+        }
+
+        @Override
+        public BsonDocument getIdentifier() {
+            lastUsedAtMillis = clock.millis();
+            return identifier;
+        }
+
+        @Override
+        public long advanceTransactionNumber() {
+            transactionNumber++;
+            return transactionNumber;
+        }
+
+        @Override
+        public boolean isClosed() {
+            return closed;
+        }
+
+        @Override
+        public void markDirty() {
+            dirty = true;
+        }
+
+        @Override
+        public boolean isMarkedDirty() {
+            return dirty;
+        }
+    }
+
+    private final class ServerSessionItemFactory implements ConcurrentPool.ItemFactory<ServerSessionImpl> {
+        @Override
+        public ServerSessionImpl create(final boolean initialize) {
+            return new ServerSessionImpl(createNewServerSessionIdentifier());
+        }
+
+        @Override
+        public void close(final ServerSessionImpl serverSession) {
+            closeSession(serverSession);
+        }
+
+        @Override
+        public Prune shouldPrune(final ServerSessionImpl serverSession) {
+            return ServerSessionPool.this.shouldPrune(serverSession) ? Prune.YES : Prune.STOP;
+        }
+
+        private BsonBinary createNewServerSessionIdentifier() {
+            UuidCodec uuidCodec = new UuidCodec(UuidRepresentation.STANDARD);
+            BsonDocument holder = new BsonDocument();
+            BsonDocumentWriter bsonDocumentWriter = new BsonDocumentWriter(holder);
+            bsonDocumentWriter.writeStartDocument();
+            bsonDocumentWriter.writeName("id");
+            uuidCodec.encode(bsonDocumentWriter, UUID.randomUUID(), EncoderContext.builder().build());
+            bsonDocumentWriter.writeEndDocument();
+            return holder.getBinary("id");
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/internal/thread/DaemonThreadFactory.java b/driver-core/src/main/com/mongodb/internal/thread/DaemonThreadFactory.java
index 3b52ef8f9bd..2d32765e953 100644
--- a/driver-core/src/main/com/mongodb/internal/thread/DaemonThreadFactory.java
+++ b/driver-core/src/main/com/mongodb/internal/thread/DaemonThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.internal.thread;
@@ -31,10 +30,6 @@ public class DaemonThreadFactory implements ThreadFactory {
     private final AtomicInteger threadNumber = new AtomicInteger(1);
     private final String namePrefix;
 
-    public DaemonThreadFactory() {
-        this("pool");
-    }
-
     public DaemonThreadFactory(final String prefix) {
         namePrefix = prefix + "-" + POOL_NUMBER.getAndIncrement() + "-thread-";
     }
diff --git a/driver-core/src/main/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java b/driver-core/src/main/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java
index 6fde797fa06..bef2351cc1d 100644
--- a/driver-core/src/main/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java
+++ b/driver-core/src/main/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/internal/validator/MappedFieldNameValidator.java b/driver-core/src/main/com/mongodb/internal/validator/MappedFieldNameValidator.java
index 2b0bae8b32a..14183cbad26 100644
--- a/driver-core/src/main/com/mongodb/internal/validator/MappedFieldNameValidator.java
+++ b/driver-core/src/main/com/mongodb/internal/validator/MappedFieldNameValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/internal/validator/NoOpFieldNameValidator.java b/driver-core/src/main/com/mongodb/internal/validator/NoOpFieldNameValidator.java
index f32ce4a4980..35369b42388 100644
--- a/driver-core/src/main/com/mongodb/internal/validator/NoOpFieldNameValidator.java
+++ b/driver-core/src/main/com/mongodb/internal/validator/NoOpFieldNameValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/internal/validator/UpdateFieldNameValidator.java b/driver-core/src/main/com/mongodb/internal/validator/UpdateFieldNameValidator.java
index 55e0ab49ba8..5937a684ed6 100644
--- a/driver-core/src/main/com/mongodb/internal/validator/UpdateFieldNameValidator.java
+++ b/driver-core/src/main/com/mongodb/internal/validator/UpdateFieldNameValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/lang/NonNull.java b/driver-core/src/main/com/mongodb/lang/NonNull.java
new file mode 100644
index 00000000000..de5d99287a8
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/lang/NonNull.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.lang;
+
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierNickname;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A common  annotation to declare that annotated elements cannot be {@code null}. Leverages JSR 305 meta-annotations to indicate
+ * nullability in Java to common tools with JSR 305 support and used by Kotlin to infer nullability of Spring API.
+ *
+ * <p>Should be used at parameter, return value, and field level. Method overrides should repeat parent {@code @NonNull} annotations unless
+ * they behave differently.</p>
+ *
+ * <p>Use {@code @NonNullApi} (scope = parameters + return values) to set the default behavior to non-nullable in order to avoid annotating
+ * your whole codebase with {@code @NonNull}.</p>
+ *
+ * @since 3.7
+ * @see NonNullApi
+ * @see Nullable
+ */
+@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Nonnull
+@TypeQualifierNickname
+public @interface NonNull {
+}
diff --git a/driver-core/src/main/com/mongodb/lang/NonNullApi.java b/driver-core/src/main/com/mongodb/lang/NonNullApi.java
new file mode 100644
index 00000000000..229f89c73a3
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/lang/NonNullApi.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.lang;
+
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierDefault;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A common annotation to declare that parameters and return values are to be considered as non-nullable by default for a given package.
+ *
+ * <p>Leverages JSR-305 meta-annotations to indicate nullability in Java to common tools with JSR-305 support and used by Kotlin to infer
+ * nullability of Spring API.</p>
+ *
+ * <p>Should be used at package level in association with {@link Nullable} annotations at parameter and return value level.</p>
+ *
+ * @since 3.7
+ * @see Nullable
+ * @see NonNull
+ */
+@Target(ElementType.PACKAGE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Nonnull
+@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER})
+public @interface NonNullApi {
+}
diff --git a/driver-core/src/main/com/mongodb/lang/Nullable.java b/driver-core/src/main/com/mongodb/lang/Nullable.java
new file mode 100644
index 00000000000..2c1dd799a6a
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/lang/Nullable.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.lang;
+
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A common annotation to declare that annotated elements can be {@code null} under some circumstance. Leverages JSR 305 meta-annotations to
+ * indicate nullability in Java to common tools with JSR 305 support and used by Kotlin to infer nullability of Spring API.
+ *
+ * <p>Should be used at parameter, return value, and field level. Methods override should repeat parent {@code @Nullable} annotations
+ * unless they behave differently.</p>
+ *
+ * <p>Can be used in association with {@code NonNullApi} to override the default non-nullable semantic to nullable.</p>
+ *
+ * @see NonNullApi
+ * @see NonNull
+ * @since 3.7
+ */
+@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Nonnull(when = When.MAYBE)
+@TypeQualifierNickname
+public @interface Nullable {
+}
diff --git a/driver-core/src/main/com/mongodb/lang/package-info.java b/driver-core/src/main/com/mongodb/lang/package-info.java
new file mode 100644
index 00000000000..05e7e89cffe
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/lang/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains JSR 305-compatible annotations related to nullability.
+ */
+package com.mongodb.lang;
diff --git a/driver-core/src/main/com/mongodb/management/ConnectionPoolStatistics.java b/driver-core/src/main/com/mongodb/management/ConnectionPoolStatistics.java
index ea5a49ee16f..b5373c4bab5 100644
--- a/driver-core/src/main/com/mongodb/management/ConnectionPoolStatistics.java
+++ b/driver-core/src/main/com/mongodb/management/ConnectionPoolStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ final class ConnectionPoolStatistics extends ConnectionPoolListenerAdapter imple
     private final AtomicInteger checkedOutCount = new AtomicInteger();
     private final AtomicInteger waitQueueSize = new AtomicInteger();
 
-    public ConnectionPoolStatistics(final ConnectionPoolOpenedEvent event) {
+    ConnectionPoolStatistics(final ConnectionPoolOpenedEvent event) {
         serverAddress = event.getServerId().getAddress();
         settings = event.getSettings();
     }
diff --git a/driver-core/src/main/com/mongodb/management/ConnectionPoolStatisticsMBean.java b/driver-core/src/main/com/mongodb/management/ConnectionPoolStatisticsMBean.java
index 784b1d2d42b..1104297a0a0 100644
--- a/driver-core/src/main/com/mongodb/management/ConnectionPoolStatisticsMBean.java
+++ b/driver-core/src/main/com/mongodb/management/ConnectionPoolStatisticsMBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,6 +71,8 @@ public interface ConnectionPoolStatisticsMBean {
      * Gets the size of the wait queue for a connection from this pool. *
      *
      * @return size of the wait queue
+     * @deprecated In the next major release, wait queue events will no longer be published so this statistic will be unavailable
      */
+    @Deprecated
     int getWaitQueueSize();
 }
diff --git a/driver-core/src/main/com/mongodb/management/JMXConnectionPoolListener.java b/driver-core/src/main/com/mongodb/management/JMXConnectionPoolListener.java
index d7e4fc320d1..0f0076dd398 100644
--- a/driver-core/src/main/com/mongodb/management/JMXConnectionPoolListener.java
+++ b/driver-core/src/main/com/mongodb/management/JMXConnectionPoolListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package com.mongodb.management;
 
-import com.mongodb.annotations.Beta;
 import com.mongodb.connection.ConnectionId;
 import com.mongodb.connection.ServerId;
 import com.mongodb.event.ConnectionAddedEvent;
@@ -40,9 +39,8 @@
 /**
  * A connection pool listener that manages a set of JMX MBeans, one for each connection pool.
  *
- * @since 3.0
+ * @since 3.5
  */
-@Beta
 public class JMXConnectionPoolListener implements ConnectionPoolListener {
     private final ConcurrentMap<ServerId, ConnectionPoolStatistics> map =
         new ConcurrentHashMap<ServerId, ConnectionPoolStatistics>();
diff --git a/driver-core/src/main/com/mongodb/management/MBeanServer.java b/driver-core/src/main/com/mongodb/management/MBeanServer.java
index bad274666d2..6c721fffda6 100644
--- a/driver-core/src/main/com/mongodb/management/MBeanServer.java
+++ b/driver-core/src/main/com/mongodb/management/MBeanServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 /**
  * This class is NOT part of the public API.  It may change at any time without notification.
  */
+@Deprecated
 public interface MBeanServer {
     /**
      * Unregister the MBean with the given name.
diff --git a/driver-core/src/main/com/mongodb/management/MBeanServerFactory.java b/driver-core/src/main/com/mongodb/management/MBeanServerFactory.java
index f8202f92125..54e9ff7bb70 100644
--- a/driver-core/src/main/com/mongodb/management/MBeanServerFactory.java
+++ b/driver-core/src/main/com/mongodb/management/MBeanServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
  *
  * @since 2.9
  */
+@Deprecated
 public final class MBeanServerFactory {
     private MBeanServerFactory() {
     }
diff --git a/driver-core/src/main/com/mongodb/management/NullMBeanServer.java b/driver-core/src/main/com/mongodb/management/NullMBeanServer.java
index d838fefdf38..ed0d377463a 100644
--- a/driver-core/src/main/com/mongodb/management/NullMBeanServer.java
+++ b/driver-core/src/main/com/mongodb/management/NullMBeanServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 /**
  * This class is NOT part of the public API.  It may change at any time without notification.
  */
+@Deprecated
 public class NullMBeanServer implements MBeanServer {
     @Override
     public void unregisterMBean(final String mBeanName) {
diff --git a/driver-core/src/main/com/mongodb/management/package-info.java b/driver-core/src/main/com/mongodb/management/package-info.java
index 9e78ef1ef1e..b822ae90b89 100644
--- a/driver-core/src/main/com/mongodb/management/package-info.java
+++ b/driver-core/src/main/com/mongodb/management/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/operation/AbortTransactionOperation.java b/driver-core/src/main/com/mongodb/operation/AbortTransactionOperation.java
new file mode 100644
index 00000000000..73a1245344f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/AbortTransactionOperation.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.Function;
+import com.mongodb.WriteConcern;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import org.bson.BsonDocument;
+
+import static com.mongodb.operation.CommandOperationHelper.noOpRetryCommandModifier;
+
+/**
+ * An operation that aborts a transaction.
+ *
+ * @since 3.8
+ */
+@Deprecated
+public class AbortTransactionOperation extends TransactionOperation {
+    private BsonDocument recoveryToken;
+
+    /**
+     * Construct an instance.
+     *
+     * @param writeConcern the write concern
+     */
+    public AbortTransactionOperation(final WriteConcern writeConcern) {
+        super(writeConcern);
+    }
+
+    /**
+     * Set the recovery token.
+     *
+     * @param recoveryToken the recovery token
+     * @return the AbortTransactionOperation
+     * @since 3.11
+     */
+    public AbortTransactionOperation recoveryToken(final BsonDocument recoveryToken) {
+        this.recoveryToken = recoveryToken;
+        return this;
+    }
+
+    @Override
+    protected String getCommandName() {
+        return "abortTransaction";
+    }
+
+    @Override
+    CommandOperationHelper.CommandCreator getCommandCreator() {
+        final CommandOperationHelper.CommandCreator creator = super.getCommandCreator();
+        if (recoveryToken != null) {
+            return new CommandOperationHelper.CommandCreator() {
+                @Override
+                public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                    return creator.create(serverDescription, connectionDescription).append("recoveryToken", recoveryToken);
+                }
+            };
+        }
+        return creator;
+    }
+
+    @Override
+    protected Function<BsonDocument, BsonDocument> getRetryCommandModifier() {
+        return noOpRetryCommandModifier();
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/AggregateExplainOperation.java b/driver-core/src/main/com/mongodb/operation/AggregateExplainOperation.java
index 0a6c4d73e92..9050db748ff 100644
--- a/driver-core/src/main/com/mongodb/operation/AggregateExplainOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/AggregateExplainOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,33 +20,41 @@
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncReadBinding;
 import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.model.Collation;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonInt64;
 import org.bson.BsonString;
+import org.bson.BsonValue;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.IdentityTransformerAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.validateCollation;
+
 
 // an operation that executes an explain on an aggregation pipeline
 class AggregateExplainOperation implements AsyncReadOperation<BsonDocument>, ReadOperation<BsonDocument> {
     private final MongoNamespace namespace;
     private final List<BsonDocument> pipeline;
+    private boolean retryReads;
     private Boolean allowDiskUse;
     private long maxTimeMS;
+    private Collation collation;
+    private BsonValue hint;
 
-    /**
-     * Construct a new instance.
-     *
-     * @param namespace the database and collection namespace for the operation.
-     * @param pipeline the aggregation pipeline.
-     */
-    public AggregateExplainOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline) {
+    AggregateExplainOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline) {
         this.namespace = notNull("namespace", namespace);
         this.pipeline = notNull("pipeline", pipeline);
     }
@@ -78,14 +86,109 @@ public AggregateExplainOperation maxTime(final long maxTime, final TimeUnit time
         return this;
     }
 
+    /**
+     * Enables retryable reads if a read fails due to a network error. A null value indicates that it's unspecified.
+     *
+     * @param retryReads true if retryable reads is enabled
+     * @return this
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     * @mongodb.server.release 3.6
+     * @since 3.11
+     */
+    public AggregateExplainOperation retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     * @mongodb.server.release 3.4
+     */
+    public AggregateExplainOperation collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Returns the hint for which index to use. The default is not to set a hint.
+     *
+     * @return the hint
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public BsonDocument getHint() {
+        if (hint == null) {
+            return null;
+        }
+        if (!hint.isDocument()) {
+            throw new IllegalArgumentException("Hint is not a BsonDocument please use the #getHintBsonValue() method. ");
+        }
+        return hint.asDocument();
+    }
+
+    /**
+     * Returns the hint BsonValue for which index to use. The default is not to set a hint.
+     *
+     * <p>Hints can either be a BsonString or a BsonDocument.</p>
+     *
+     * @return the hint
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    public BsonValue getHintBsonValue() {
+        return hint;
+    }
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public AggregateExplainOperation hint(final BsonValue hint) {
+        isTrueArgument("BsonString or BsonDocument", hint == null || hint.isDocument() || hint.isString());
+        this.hint = hint;
+        return this;
+    }
+
     @Override
     public BsonDocument execute(final ReadBinding binding) {
-        return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand());
+        return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(), retryReads);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<BsonDocument> callback) {
-        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(), callback);
+        SingleResultCallback<BsonDocument> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(),
+                new IdentityTransformerAsync<BsonDocument>(), retryReads, errHandlingCallback);
+    }
+
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateCollation(connectionDescription, collation);
+                return getCommand();
+            }
+        };
     }
 
     private BsonDocument getCommand() {
@@ -98,6 +201,12 @@ private BsonDocument getCommand() {
         if (allowDiskUse != null) {
             commandDocument.put("allowDiskUse", BsonBoolean.valueOf(allowDiskUse));
         }
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
+        if (hint != null) {
+            commandDocument.put("hint", hint);
+        }
         return commandDocument;
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/AggregateOperation.java b/driver-core/src/main/com/mongodb/operation/AggregateOperation.java
index fb037881346..8936e99ae1b 100644
--- a/driver-core/src/main/com/mongodb/operation/AggregateOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/AggregateOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,43 +18,19 @@
 
 import com.mongodb.ExplainVerbosity;
 import com.mongodb.MongoNamespace;
-import com.mongodb.ReadConcern;
-import com.mongodb.ServerAddress;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
-import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncReadBinding;
-import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
-import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
-import org.bson.BsonArray;
-import org.bson.BsonBoolean;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.AggregationLevel;
 import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonInt64;
-import org.bson.BsonString;
+import org.bson.BsonValue;
 import org.bson.codecs.Decoder;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
-import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
-import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
-import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.checkValidReadConcern;
-import static com.mongodb.operation.OperationHelper.cursorDocumentToQueryResult;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
-import static com.mongodb.operation.OperationHelper.withConnection;
-
 /**
  * An operation that executes an aggregation query.
  *
@@ -63,19 +39,9 @@
  * @mongodb.server.release 2.2
  * @since 3.0
  */
+@Deprecated
 public class AggregateOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
-    private static final String RESULT = "result";
-    private static final String FIRST_BATCH = "firstBatch";
-
-    private final MongoNamespace namespace;
-    private final List<BsonDocument> pipeline;
-    private final Decoder<T> decoder;
-    private Boolean allowDiskUse;
-    private Integer batchSize;
-    private long maxTimeMS;
-    private Boolean useCursor;
-    private ReadConcern readConcern = ReadConcern.DEFAULT;
-
+    private final AggregateOperationImpl<T> wrapped;
     /**
      * Construct a new instance.
      *
@@ -84,9 +50,21 @@ public class AggregateOperation<T> implements AsyncReadOperation<AsyncBatchCurso
      * @param decoder the decoder for the result documents.
      */
     public AggregateOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline, final Decoder<T> decoder) {
-        this.namespace = notNull("namespace", namespace);
-        this.pipeline = notNull("pipeline", pipeline);
-        this.decoder = notNull("decoder", decoder);
+        this(namespace, pipeline, decoder, AggregationLevel.COLLECTION);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace the database and collection namespace for the operation.
+     * @param pipeline the aggregation pipeline.
+     * @param decoder the decoder for the result documents.
+     * @param aggregationLevel the aggregation level
+     * @since 3.10
+     */
+    public AggregateOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline, final Decoder<T> decoder,
+                              final AggregationLevel aggregationLevel) {
+        this.wrapped = new AggregateOperationImpl<T>(namespace, pipeline, decoder, aggregationLevel);
     }
 
     /**
@@ -96,7 +74,7 @@ public AggregateOperation(final MongoNamespace namespace, final List<BsonDocumen
      * @mongodb.driver.manual core/aggregation-introduction/#aggregation-pipelines Aggregation Pipeline
      */
     public List<BsonDocument> getPipeline() {
-        return pipeline;
+        return wrapped.getPipeline();
     }
 
     /**
@@ -107,7 +85,7 @@ public List<BsonDocument> getPipeline() {
      * @mongodb.server.release 2.6
      */
     public Boolean getAllowDiskUse() {
-        return allowDiskUse;
+        return wrapped.getAllowDiskUse();
     }
 
     /**
@@ -119,7 +97,7 @@ public Boolean getAllowDiskUse() {
      * @mongodb.server.release 2.6
      */
     public AggregateOperation<T> allowDiskUse(final Boolean allowDiskUse) {
-        this.allowDiskUse = allowDiskUse;
+        wrapped.allowDiskUse(allowDiskUse);
         return this;
     }
 
@@ -130,7 +108,7 @@ public AggregateOperation<T> allowDiskUse(final Boolean allowDiskUse) {
      * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
      */
     public Integer getBatchSize() {
-        return batchSize;
+        return wrapped.getBatchSize();
     }
 
     /**
@@ -141,7 +119,37 @@ public Integer getBatchSize() {
      * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
      */
     public AggregateOperation<T> batchSize(final Integer batchSize) {
-        this.batchSize = batchSize;
+        wrapped.batchSize(batchSize);
+        return this;
+    }
+
+    /**
+     * The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor
+     * query. This only applies to a TAILABLE_AWAIT cursor. When the cursor is not a TAILABLE_AWAIT cursor,
+     * this option is ignored.
+     *
+     * A zero value will be ignored.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum await execution time in the given time unit
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public long getMaxAwaitTime(final TimeUnit timeUnit) {
+        return wrapped.getMaxAwaitTime(timeUnit);
+    }
+
+    /**
+     * Sets the maximum await execution time on the server for this operation.
+     *
+     * @param maxAwaitTime  the max await time.  A value less than one will be ignored, and indicates that the driver should respect the
+     *                      server's default value
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @mongodb.server.release 3.6
+     */
+    public AggregateOperation<T> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        wrapped.maxAwaitTime(maxAwaitTime, timeUnit);
         return this;
     }
 
@@ -153,8 +161,7 @@ public AggregateOperation<T> batchSize(final Integer batchSize) {
      * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
      */
     public long getMaxTime(final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+        return wrapped.getMaxTime(timeUnit);
     }
 
     /**
@@ -166,8 +173,7 @@ public long getMaxTime(final TimeUnit timeUnit) {
      * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
      */
     public AggregateOperation<T> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        wrapped.maxTime(maxTime, timeUnit);
         return this;
     }
 
@@ -178,9 +184,13 @@ public AggregateOperation<T> maxTime(final long maxTime, final TimeUnit timeUnit
      * @return whether the server should use a cursor to return results
      * @mongodb.driver.manual reference/command/aggregate/ Aggregation
      * @mongodb.server.release 2.6
+     * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+     * that support it (&gt;= 2.6).  The driver will ignore this as of MongoDB 3.6, which does not support inline results for the aggregate
+     * command.
      */
+    @Deprecated
     public Boolean getUseCursor() {
-        return useCursor;
+        return wrapped.getUseCursor();
     }
 
     /**
@@ -190,75 +200,142 @@ public Boolean getUseCursor() {
      * @return this
      * @mongodb.driver.manual reference/command/aggregate/ Aggregation
      * @mongodb.server.release 2.6
+     * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+     * that support it (&gt;= 2.6).  The driver will ignore this as of MongoDB 3.6, which does not support inline results for the aggregate
+     * command.
      */
+    @Deprecated
     public AggregateOperation<T> useCursor(final Boolean useCursor) {
-        this.useCursor = useCursor;
+        wrapped.useCursor(useCursor);
+        return this;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return wrapped.getCollation();
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     * @mongodb.server.release 3.4
+     */
+    public AggregateOperation<T> collation(final Collation collation) {
+        wrapped.collation(collation);
+        return this;
+    }
+
+    /**
+     * Returns the comment to send with the aggregate. The default is not to include a comment with the aggregation.
+     *
+     * @return the comment
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public String getComment() {
+        return wrapped.getComment();
+    }
+
+    /**
+     * Sets the comment to the aggregation. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public AggregateOperation<T> comment(final String comment) {
+        wrapped.comment(comment);
+        return this;
+    }
+
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     * @mongodb.server.release 3.6
+     */
+    public AggregateOperation<T> retryReads(final boolean retryReads) {
+        wrapped.retryReads(retryReads);
         return this;
     }
 
     /**
-     * Gets the read concern
+     * Gets the value for retryable reads. The default is true.
      *
-     * @return the read concern
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @return the retryable reads value
+     * @since 3.11
      */
-    public ReadConcern getReadConcern() {
-        return readConcern;
+    public boolean getRetryReads() {
+        return wrapped.getRetryReads();
     }
 
     /**
-     * Sets the read concern
-     * @param readConcern the read concern
+     * Returns the hint for which index to use. The default is not to set a hint.
+     *
+     * @return the hint
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public BsonDocument getHint() {
+        BsonValue hint = wrapped.getHint();
+        if (hint == null) {
+            return null;
+        }
+        if (!hint.isDocument()) {
+            throw new IllegalArgumentException("Hint is not a BsonDocument please use the #getHintBsonValue() method. ");
+        }
+        return hint.asDocument();
+    }
+
+    /**
+     * Returns the hint BsonValue for which index to use. The default is not to set a hint.
+     *
+     * <p>Hints can either be a BsonString or a BsonDocument.</p>
+     *
+     * @return the hint
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    public BsonValue getHintBsonValue() {
+        return wrapped.getHint();
+    }
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
      * @return this
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @since 3.6
+     * @mongodb.server.release 3.6
      */
-    public AggregateOperation<T> readConcern(final ReadConcern readConcern) {
-        this.readConcern = notNull("readConcern", readConcern);
+    public AggregateOperation<T> hint(final BsonValue hint) {
+        wrapped.hint(hint);
         return this;
     }
 
     @Override
     public BatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
-            @Override
-            public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
-                checkValidReadConcern(connection, readConcern);
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                        CommandResultDocumentCodec.create(decoder, getFieldNameWithResults(connection.getDescription())),
-                        connection, transformer(source, connection));
-            }
-        });
+        return wrapped.execute(binding);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnectionAndSource() {
-            @Override
-            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = releasingCallback(errHandlingCallback, source,
-                            connection);
-                    checkValidReadConcern(source, connection, readConcern, new AsyncCallableWithConnectionAndSource() {
-                        @Override
-                        public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                            if (t != null) {
-                                wrappedCallback.onResult(null, t);
-                            } else {
-                                executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(),
-                                        asCommandDocument(connection.getDescription()),
-                                        CommandResultDocumentCodec.create(decoder, getFieldNameWithResults(connection.getDescription())),
-                                        connection, asyncTransformer(source, connection), wrappedCallback);
-                            }
-                        }
-                    });
-                }
-            }
-        });
+        wrapped.executeAsync(binding, callback);
     }
 
     /**
@@ -268,9 +345,11 @@ public void call(final AsyncConnectionSource source, final AsyncConnection conne
      * @return a read operation that when executed will explain this operation
      */
     public ReadOperation<BsonDocument> asExplainableOperation(final ExplainVerbosity explainVerbosity) {
-        return new AggregateExplainOperation(namespace, pipeline)
-               .allowDiskUse(allowDiskUse)
-               .maxTime(maxTimeMS, TimeUnit.MILLISECONDS);
+        return new AggregateExplainOperation(getNamespace(), getPipeline())
+               .allowDiskUse(getAllowDiskUse())
+               .maxTime(getMaxAwaitTime(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)
+               .hint(wrapped.getHint())
+               .retryReads(getRetryReads());
     }
 
     /**
@@ -280,70 +359,36 @@ public ReadOperation<BsonDocument> asExplainableOperation(final ExplainVerbosity
      * @return a read operation that when executed will explain this operation
      */
     public AsyncReadOperation<BsonDocument> asExplainableOperationAsync(final ExplainVerbosity explainVerbosity) {
-        return new AggregateExplainOperation(namespace, pipeline)
-               .allowDiskUse(allowDiskUse)
-               .maxTime(maxTimeMS, TimeUnit.MILLISECONDS);
+        return new AggregateExplainOperation(getNamespace(), getPipeline())
+                .retryReads(getRetryReads())
+                .allowDiskUse(getAllowDiskUse())
+                .maxTime(getMaxAwaitTime(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)
+                .hint(wrapped.getHint());
     }
 
-    private boolean isInline(final ConnectionDescription description) {
-        return (useCursor != null && !useCursor) || !serverIsAtLeastVersionTwoDotSix(description);
-    }
 
-    private BsonDocument asCommandDocument(final ConnectionDescription description) {
-        BsonDocument commandDocument = new BsonDocument("aggregate", new BsonString(namespace.getCollectionName()));
-        commandDocument.put("pipeline", new BsonArray(pipeline));
-        if (maxTimeMS > 0) {
-            commandDocument.put("maxTimeMS", new BsonInt64(maxTimeMS));
-        }
-        if ((useCursor == null || useCursor) && serverIsAtLeastVersionTwoDotSix(description)) {
-            BsonDocument cursor = new BsonDocument();
-            if (batchSize != null) {
-                cursor.put("batchSize", new BsonInt32(batchSize));
-            }
-            commandDocument.put("cursor", cursor);
-        }
-        if (allowDiskUse != null) {
-            commandDocument.put("allowDiskUse", BsonBoolean.valueOf(allowDiskUse));
-        }
-        if (!readConcern.isServerDefault()) {
-            commandDocument.put("readConcern", readConcern.asDocument());
-        }
-
-        return commandDocument;
-    }
-
-    String getFieldNameWithResults(final ConnectionDescription description) {
-        return ((useCursor == null || useCursor) && serverIsAtLeastVersionTwoDotSix(description)) ? FIRST_BATCH : RESULT;
+    MongoNamespace getNamespace() {
+        return wrapped.getNamespace();
     }
 
-    @SuppressWarnings("unchecked")
-    private QueryResult<T> createQueryResult(final BsonDocument result, final ConnectionDescription description) {
-        if (isInline(description)) {
-            return new QueryResult<T>(namespace, BsonDocumentWrapperHelper.<T>toList(result, RESULT), 0L,
-                                      description.getServerAddress());
-        } else {
-            return cursorDocumentToQueryResult(result.getDocument("cursor"), description.getServerAddress());
-        }
+    Decoder<T> getDecoder() {
+        return wrapped.getDecoder();
     }
 
-    private CommandTransformer<BsonDocument, BatchCursor<T>> transformer(final ConnectionSource source, final Connection connection) {
-        return new CommandTransformer<BsonDocument, BatchCursor<T>>() {
-            @Override
-            public BatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
-                QueryResult<T> queryResult = createQueryResult(result, connection.getDescription());
-                return new QueryBatchCursor<T>(queryResult, 0, batchSize != null ? batchSize : 0, decoder, source);
-            }
-        };
-    }
-
-    private CommandTransformer<BsonDocument, AsyncBatchCursor<T>> asyncTransformer(final AsyncConnectionSource source,
-                                                                         final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, AsyncBatchCursor<T>>() {
-            @Override
-            public AsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
-                QueryResult<T> queryResult = createQueryResult(result, connection.getDescription());
-                return new AsyncQueryBatchCursor<T>(queryResult, 0, batchSize != null ? batchSize : 0, 0, decoder, source, connection);
-            }
-        };
+    @Override
+    public String toString() {
+        return "AggregateOperation{"
+                + "namespace=" + getNamespace()
+                + ", pipeline=" + getPipeline()
+                + ", decoder=" + getDecoder()
+                + ", allowDiskUse=" + getAllowDiskUse()
+                + ", batchSize=" + getBatchSize()
+                + ", collation=" + getCollation()
+                + ", comment=" + getComment()
+                + ", hint=" + getHint()
+                + ", maxAwaitTimeMS=" + getMaxAwaitTime(TimeUnit.MILLISECONDS)
+                + ", maxTimeMS=" + getMaxTime(TimeUnit.MILLISECONDS)
+                + ", useCursor=" + wrapped.getUseCursor()
+                + "}";
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/AggregateOperationImpl.java b/driver-core/src/main/com/mongodb/operation/AggregateOperationImpl.java
new file mode 100644
index 00000000000..e4ec9b7b726
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/AggregateOperationImpl.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
+import com.mongodb.binding.AsyncReadBinding;
+import com.mongodb.binding.ConnectionSource;
+import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.client.model.Collation;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.QueryResult;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.codecs.Decoder;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotSix;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.cursorDocumentToQueryResult;
+import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand;
+
+class AggregateOperationImpl<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
+    private static final String RESULT = "result";
+    private static final String CURSOR = "cursor";
+    private static final String FIRST_BATCH = "firstBatch";
+    private static final List<String> FIELD_NAMES_WITH_RESULT = Arrays.asList(RESULT, FIRST_BATCH);
+
+    private final MongoNamespace namespace;
+    private final List<BsonDocument> pipeline;
+    private final Decoder<T> decoder;
+    private final AggregateTarget aggregateTarget;
+    private final PipelineCreator pipelineCreator;
+
+    private boolean retryReads;
+    private Boolean allowDiskUse;
+    private Integer batchSize;
+    private Collation collation;
+    private String comment;
+    private BsonValue hint;
+    private long maxAwaitTimeMS;
+    private long maxTimeMS;
+    private Boolean useCursor;
+
+    AggregateOperationImpl(final MongoNamespace namespace, final List<BsonDocument> pipeline, final Decoder<T> decoder,
+                           final AggregationLevel aggregationLevel) {
+        this(namespace, pipeline, decoder, defaultAggregateTarget(notNull("aggregationLevel", aggregationLevel),
+                notNull("namespace", namespace).getCollectionName()), defaultPipelineCreator(pipeline));
+    }
+
+    AggregateOperationImpl(final MongoNamespace namespace, final List<BsonDocument> pipeline, final Decoder<T> decoder,
+                           final AggregateTarget aggregateTarget, final PipelineCreator pipelineCreator) {
+        this.namespace = notNull("namespace", namespace);
+        this.pipeline = notNull("pipeline", pipeline);
+        this.decoder = notNull("decoder", decoder);
+        this.aggregateTarget = notNull("aggregateTarget", aggregateTarget);
+        this.pipelineCreator = notNull("pipelineCreator", pipelineCreator);
+    }
+
+    MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+    List<BsonDocument> getPipeline() {
+        return pipeline;
+    }
+
+    Decoder<T> getDecoder() {
+        return decoder;
+    }
+
+    Boolean getAllowDiskUse() {
+        return allowDiskUse;
+    }
+
+    AggregateOperationImpl<T> allowDiskUse(final Boolean allowDiskUse) {
+        this.allowDiskUse = allowDiskUse;
+        return this;
+    }
+
+    Integer getBatchSize() {
+        return batchSize;
+    }
+
+    AggregateOperationImpl<T> batchSize(final Integer batchSize) {
+        this.batchSize = batchSize;
+        return this;
+    }
+
+    long getMaxAwaitTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxAwaitTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    AggregateOperationImpl<T> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        isTrueArgument("maxAwaitTime >= 0", maxAwaitTime >= 0);
+        this.maxAwaitTimeMS = TimeUnit.MILLISECONDS.convert(maxAwaitTime, timeUnit);
+        return this;
+    }
+
+    long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    AggregateOperationImpl<T> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        isTrueArgument("maxTime >= 0", maxTime >= 0);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    Boolean getUseCursor() {
+        return useCursor;
+    }
+
+    AggregateOperationImpl<T> useCursor(final Boolean useCursor) {
+        this.useCursor = useCursor;
+        return this;
+    }
+
+    Collation getCollation() {
+        return collation;
+    }
+
+    AggregateOperationImpl<T> collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    String getComment() {
+        return comment;
+    }
+
+    AggregateOperationImpl<T> comment(final String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    AggregateOperationImpl<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    boolean getRetryReads() {
+        return retryReads;
+    }
+
+    BsonValue getHint() {
+        return hint;
+    }
+
+    AggregateOperationImpl<T> hint(final BsonValue hint) {
+        isTrueArgument("BsonString or BsonDocument", hint == null || hint.isDocument() || hint.isString());
+        this.hint = hint;
+        return this;
+    }
+
+    @Override
+    public BatchCursor<T> execute(final ReadBinding binding) {
+        return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()),
+                CommandResultDocumentCodec.create(decoder, FIELD_NAMES_WITH_RESULT), transformer(), retryReads);
+    }
+
+    @Override
+    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
+        SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()),
+                CommandResultDocumentCodec.create(decoder, FIELD_NAMES_WITH_RESULT), asyncTransformer(), retryReads, errHandlingCallback);
+    }
+
+    private boolean isInline(final ConnectionDescription description) {
+        return !serverIsAtLeastVersionThreeDotSix(description) && ((useCursor != null && !useCursor));
+    }
+
+    private CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateReadConcernAndCollation(connectionDescription, sessionContext.getReadConcern(), collation);
+                return getCommand(connectionDescription, sessionContext);
+            }
+        };
+    }
+
+    private BsonDocument getCommand(final ConnectionDescription description, final SessionContext sessionContext) {
+        BsonDocument commandDocument = new BsonDocument("aggregate", aggregateTarget.create());
+
+        appendReadConcernToCommand(sessionContext, commandDocument);
+        commandDocument.put("pipeline", pipelineCreator.create(description, sessionContext));
+        if (maxTimeMS > 0) {
+            commandDocument.put("maxTimeMS", maxTimeMS > Integer.MAX_VALUE
+                    ? new BsonInt64(maxTimeMS) : new BsonInt32((int) maxTimeMS));
+        }
+        if (!isInline(description)) {
+            BsonDocument cursor = new BsonDocument();
+            if (batchSize != null) {
+                cursor.put("batchSize", new BsonInt32(batchSize));
+            }
+            commandDocument.put(CURSOR, cursor);
+        }
+        if (allowDiskUse != null) {
+            commandDocument.put("allowDiskUse", BsonBoolean.valueOf(allowDiskUse));
+        }
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
+        if (comment != null) {
+            commandDocument.put("comment", new BsonString(comment));
+        }
+        if (hint != null) {
+            commandDocument.put("hint", hint);
+        }
+
+        return commandDocument;
+    }
+
+    private QueryResult<T> createQueryResult(final BsonDocument result, final ConnectionDescription description) {
+        if (!isInline(description) || result.containsKey(CURSOR)) {
+            return cursorDocumentToQueryResult(result.getDocument(CURSOR), description.getServerAddress());
+        } else {
+            return new QueryResult<T>(namespace, BsonDocumentWrapperHelper.<T>toList(result, RESULT), 0L,
+                    description.getServerAddress());
+        }
+    }
+
+    private CommandReadTransformer<BsonDocument, AggregateResponseBatchCursor<T>> transformer() {
+        return new CommandReadTransformer<BsonDocument, AggregateResponseBatchCursor<T>>() {
+            @Override
+            public AggregateResponseBatchCursor<T> apply(final BsonDocument result, final ConnectionSource source,
+                                                         final Connection connection) {
+                QueryResult<T> queryResult = createQueryResult(result, connection.getDescription());
+                return new QueryBatchCursor<T>(queryResult, 0, batchSize != null ? batchSize : 0, maxAwaitTimeMS, decoder, source,
+                        connection, result);
+            }
+        };
+    }
+
+    private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>>() {
+            @Override
+            public AsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                             final AsyncConnection connection) {
+                QueryResult<T> queryResult = createQueryResult(result, connection.getDescription());
+                return new AsyncQueryBatchCursor<T>(queryResult, 0, batchSize != null ? batchSize : 0, maxAwaitTimeMS, decoder,
+                        source, connection, result);
+            }
+        };
+    }
+
+    interface AggregateTarget {
+        BsonValue create();
+    }
+
+    interface PipelineCreator {
+        BsonArray create(ConnectionDescription connectionDescription, SessionContext sessionContext);
+    }
+
+    private static AggregateTarget defaultAggregateTarget(final AggregationLevel aggregationLevel, final String collectionName) {
+        return new AggregateTarget() {
+            @Override
+            public BsonValue create() {
+                if (aggregationLevel == AggregationLevel.DATABASE) {
+                    return new BsonInt32(1);
+                } else {
+                    return new BsonString(collectionName);
+                }
+            }
+        };
+    }
+
+    private static PipelineCreator defaultPipelineCreator(final List<BsonDocument> pipeline) {
+        return new PipelineCreator() {
+            @Override
+            public BsonArray create(final ConnectionDescription connectionDescription, final SessionContext sessionContext) {
+                return new BsonArray(pipeline);
+            }
+        };
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/AggregateResponseBatchCursor.java b/driver-core/src/main/com/mongodb/operation/AggregateResponseBatchCursor.java
new file mode 100644
index 00000000000..640a1408f93
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/AggregateResponseBatchCursor.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.annotations.NotThreadSafe;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+/**
+ * Extends the batch cursor interface to include information included in an aggregate or getMore response.
+ *
+ * @param <T> The type of documents the cursor contains
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#wire-op-get-more OP_GET_MORE
+ * @since 3.11
+ */
+@NotThreadSafe
+@Deprecated
+public interface AggregateResponseBatchCursor<T> extends BatchCursor<T> {
+    /**
+     * Returns the postBatchResumeToken.
+     *
+     * @return the postBatchResumeToken
+     */
+    BsonDocument getPostBatchResumeToken();
+
+    /**
+     * Returns the operation time found in the aggregate or getMore response.
+     *
+     * @return the operation time
+     */
+    BsonTimestamp getOperationTime();
+
+    /**
+     * Returns true if the first batch was empty.
+     *
+     * @return true if the first batch was empty
+     */
+    boolean isFirstBatchEmpty();
+}
diff --git a/driver-core/src/main/com/mongodb/operation/AggregateToCollectionOperation.java b/driver-core/src/main/com/mongodb/operation/AggregateToCollectionOperation.java
index 70778991225..009bb300810 100644
--- a/driver-core/src/main/com/mongodb/operation/AggregateToCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/AggregateToCollectionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,25 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.ExplainVerbosity;
 import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
+import org.bson.BsonInt32;
 import org.bson.BsonInt64;
 import org.bson.BsonString;
+import org.bson.BsonValue;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -35,41 +42,133 @@
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotFour;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotSix;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import static com.mongodb.operation.OperationHelper.CallableWithConnection;
 import static com.mongodb.operation.OperationHelper.LOGGER;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.OperationHelper.validateCollation;
 import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation that executes an aggregation that writes its results to a collection (which is what makes this a write operation rather than
  * a read operation).
  *
  * @mongodb.server.release 2.6
+ * @mongodb.driver.manual reference/command/aggregate/ Aggregation
  * @since 3.0
  */
+@Deprecated
 public class AggregateToCollectionOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoNamespace namespace;
     private final List<BsonDocument> pipeline;
+    private final WriteConcern writeConcern;
+    private final ReadConcern readConcern;
+    private final AggregationLevel aggregationLevel;
+
     private Boolean allowDiskUse;
     private long maxTimeMS;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
+    private String comment;
+    private BsonDocument hint;
 
     /**
      * Construct a new instance.
      *
      * @param namespace the database and collection namespace for the operation.
      * @param pipeline the aggregation pipeline.
+     * @deprecated Prefer {@link #AggregateToCollectionOperation(MongoNamespace, List, WriteConcern)}
      */
+    @Deprecated
     public AggregateToCollectionOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline) {
+        this(namespace, pipeline, null, null, AggregationLevel.COLLECTION);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace the database and collection namespace for the operation.
+     * @param pipeline the aggregation pipeline.
+     * @param writeConcern the write concern to apply
+     *
+     * @since 3.4
+     */
+    public AggregateToCollectionOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline,
+                                          final WriteConcern writeConcern) {
+        this(namespace, pipeline, null, writeConcern, AggregationLevel.COLLECTION);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace the database and collection namespace for the operation.
+     * @param pipeline the aggregation pipeline.
+     * @param readConcern the read concern to apply
+     *
+     * @since 3.11
+     */
+    public AggregateToCollectionOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline,
+                                          final ReadConcern readConcern) {
+        this(namespace, pipeline, readConcern, null, AggregationLevel.COLLECTION);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace the database and collection namespace for the operation.
+     * @param pipeline the aggregation pipeline.
+     * @param writeConcern the write concern to apply
+     * @param readConcern the read concern to apply
+     * @since 3.11
+     */
+    public AggregateToCollectionOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline,
+                                          final ReadConcern readConcern, final WriteConcern writeConcern) {
+        this(namespace, pipeline, readConcern, writeConcern, AggregationLevel.COLLECTION);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace the database and collection namespace for the operation.
+     * @param pipeline the aggregation pipeline.
+     * @param writeConcern the write concern to apply
+     * @param aggregationLevel the aggregation level
+     * @since 3.10
+     */
+    public AggregateToCollectionOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline,
+                                          final WriteConcern writeConcern, final AggregationLevel aggregationLevel) {
+        this(namespace, pipeline, ReadConcern.DEFAULT, writeConcern, aggregationLevel);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace the database and collection namespace for the operation.
+     * @param pipeline the aggregation pipeline.
+     * @param readConcern the read concern to apply
+     * @param writeConcern the write concern to apply
+     * @param aggregationLevel the aggregation level
+     * @since 3.11
+     */
+    public AggregateToCollectionOperation(final MongoNamespace namespace, final List<BsonDocument> pipeline,
+                                          final ReadConcern readConcern, final WriteConcern writeConcern,
+                                          final AggregationLevel aggregationLevel) {
         this.namespace = notNull("namespace", namespace);
         this.pipeline = notNull("pipeline", pipeline);
+        this.writeConcern = writeConcern;
+        this.readConcern = readConcern;
+        this.aggregationLevel = notNull("aggregationLevel", aggregationLevel);
 
-        isTrueArgument("pipeline is empty", !pipeline.isEmpty());
-        isTrueArgument("last stage of pipeline does not contain an output collection",
-                       pipeline.get(pipeline.size() - 1).get("$out") != null);
+        isTrueArgument("pipeline is not empty", !pipeline.isEmpty());
     }
 
     /**
@@ -82,6 +181,28 @@ public List<BsonDocument> getPipeline() {
         return pipeline;
     }
 
+    /**
+     * Gets the read concern.
+     *
+     * @return the read concern, which may be null
+     *
+     * @since 3.11
+     */
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     *
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
     /**
      * Whether writing to temporary files is enabled. A null value indicates that it's unspecified.
      *
@@ -145,12 +266,11 @@ public Boolean getBypassDocumentValidation() {
     /**
      * Sets the bypass document level validation flag.
      *
-     * <p>Note: This only applies when an $out stage is specified</p>.
+     * <p>Note: This only applies when an $out or $merge stage is specified</p>.
      *
      * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
      * @return this
      * @since 3.2
-     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
      * @mongodb.server.release 3.2
      */
     public AggregateToCollectionOperation bypassDocumentValidation(final Boolean bypassDocumentValidation) {
@@ -158,35 +278,136 @@ public AggregateToCollectionOperation bypassDocumentValidation(final Boolean byp
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public AggregateToCollectionOperation collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Returns the comment to send with the aggregate. The default is not to include a comment with the aggregation.
+     *
+     * @return the comment
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the comment to the aggregation. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public AggregateToCollectionOperation comment(final String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    /**
+     * Returns the hint for which index to use. The default is not to set a hint.
+     *
+     * @return the hint
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public BsonDocument getHint() {
+        return hint;
+    }
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public AggregateToCollectionOperation hint(final BsonDocument hint) {
+        this.hint = hint;
+        return this;
+    }
+
+    /**
+     * Gets an operation whose execution explains this operation.
+     *
+     * @param explainVerbosity the explain verbosity
+     * @return a read operation that when executed will explain this operation
+     */
+    public ReadOperation<BsonDocument> asExplainableOperation(final ExplainVerbosity explainVerbosity) {
+        return new AggregateExplainOperation(namespace, pipeline)
+                .allowDiskUse(allowDiskUse)
+                .maxTime(maxTimeMS, TimeUnit.MILLISECONDS)
+                .hint(hint);
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
-        return withConnection(binding, new OperationHelper.CallableWithConnection<Void>() {
+        return withConnection(binding, new CallableWithConnection<Void>() {
             @Override
             public Void call(final Connection connection) {
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
-                        connection, new VoidTransformer<BsonDocument>());
+                validateCollation(connection, collation);
+                return executeCommand(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
+                        connection, writeConcernErrorTransformer());
             }
         });
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        withConnection(binding, new OperationHelper.AsyncCallableWithConnection() {
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
             @Override
             public void call(final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
                 if (t != null) {
                     errHandlingCallback.onResult(null, t);
                 } else {
-                    executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
-                            connection, new VoidTransformer<BsonDocument>(), releasingCallback(errHandlingCallback, connection));
+                    final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
+                    validateCollation(connection, collation, new AsyncCallableWithConnection() {
+                        @Override
+                        public void call(final AsyncConnection connection, final Throwable t) {
+                            if (t != null) {
+                                wrappedCallback.onResult(null, t);
+                            } else {
+                                executeCommandAsync(binding, namespace.getDatabaseName(),
+                                        getCommand(connection.getDescription()), connection, writeConcernErrorWriteTransformer(),
+                                        wrappedCallback);
+                            }
+                        }
+                    });
                 }
             }
         });
     }
 
     private BsonDocument getCommand(final ConnectionDescription description) {
-        BsonDocument commandDocument = new BsonDocument("aggregate", new BsonString(namespace.getCollectionName()));
+        BsonValue aggregationTarget = (aggregationLevel == AggregationLevel.DATABASE)
+                ? new BsonInt32(1) : new BsonString(namespace.getCollectionName());
+
+        BsonDocument commandDocument = new BsonDocument("aggregate", aggregationTarget);
         commandDocument.put("pipeline", new BsonArray(pipeline));
         if (maxTimeMS > 0) {
             commandDocument.put("maxTimeMS", new BsonInt64(maxTimeMS));
@@ -197,6 +418,28 @@ private BsonDocument getCommand(final ConnectionDescription description) {
         if (bypassDocumentValidation != null && serverIsAtLeastVersionThreeDotTwo(description)) {
             commandDocument.put("bypassDocumentValidation", BsonBoolean.valueOf(bypassDocumentValidation));
         }
+
+        if (serverIsAtLeastVersionThreeDotSix(description)) {
+            commandDocument.put("cursor", new BsonDocument());
+        }
+
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        if (readConcern != null && !readConcern.isServerDefault() && serverIsAtLeastVersionThreeDotFour(description)) {
+            commandDocument.put("readConcern", readConcern.asDocument());
+        }
+
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
+        if (comment != null) {
+            commandDocument.put("comment", new BsonString(comment));
+        }
+        if (hint != null) {
+            commandDocument.put("hint", hint);
+        }
         return commandDocument;
     }
+
+
+
 }
diff --git a/driver-core/src/main/com/mongodb/operation/AsyncChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/operation/AsyncChangeStreamBatchCursor.java
new file mode 100644
index 00000000000..b1023babebf
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/AsyncChangeStreamBatchCursor.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoChangeStreamException;
+import com.mongodb.async.AsyncAggregateResponseBatchCursor;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
+import com.mongodb.binding.AsyncReadBinding;
+import com.mongodb.operation.OperationHelper.AsyncCallableWithSource;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+import org.bson.RawBsonDocument;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.ChangeStreamBatchCursorHelper.isRetryableError;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
+
+final class AsyncChangeStreamBatchCursor<T> implements AsyncAggregateResponseBatchCursor<T> {
+    private final AsyncReadBinding binding;
+    private final ChangeStreamOperation<T> changeStreamOperation;
+
+    private volatile BsonDocument resumeToken;
+    private volatile AsyncAggregateResponseBatchCursor<RawBsonDocument> wrapped;
+
+    AsyncChangeStreamBatchCursor(final ChangeStreamOperation<T> changeStreamOperation,
+                                 final AsyncAggregateResponseBatchCursor<RawBsonDocument> wrapped,
+                                 final AsyncReadBinding binding,
+                                 final BsonDocument resumeToken) {
+        this.changeStreamOperation = changeStreamOperation;
+        this.wrapped = wrapped;
+        this.binding = binding;
+        binding.retain();
+        this.resumeToken = resumeToken;
+    }
+
+    AsyncAggregateResponseBatchCursor<RawBsonDocument> getWrapped() {
+        return wrapped;
+    }
+
+    @Override
+    public void next(final SingleResultCallback<List<T>> callback) {
+        resumeableOperation(new AsyncBlock() {
+            @Override
+            public void apply(final AsyncAggregateResponseBatchCursor<RawBsonDocument> cursor,
+                              final SingleResultCallback<List<RawBsonDocument>> callback) {
+                cursor.next(callback);
+                cachePostBatchResumeToken(cursor);
+            }
+        }, convertResultsCallback(callback));
+    }
+
+    @Override
+    public void tryNext(final SingleResultCallback<List<T>> callback) {
+        resumeableOperation(new AsyncBlock() {
+            @Override
+            public void apply(final AsyncAggregateResponseBatchCursor<RawBsonDocument> cursor,
+                              final SingleResultCallback<List<RawBsonDocument>> callback) {
+                cursor.tryNext(callback);
+                cachePostBatchResumeToken(cursor);
+            }
+        }, convertResultsCallback(callback));
+    }
+
+    @Override
+    public void close() {
+        if (!isClosed()) {
+            wrapped.close();
+            binding.release();
+        }
+    }
+
+    @Override
+    public void setBatchSize(final int batchSize) {
+        wrapped.setBatchSize(batchSize);
+    }
+
+    @Override
+    public int getBatchSize() {
+        return wrapped.getBatchSize();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return wrapped.isClosed();
+    }
+
+    @Override
+    public BsonDocument getPostBatchResumeToken() {
+        return wrapped.getPostBatchResumeToken();
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return changeStreamOperation.getStartAtOperationTime();
+    }
+
+    @Override
+    public boolean isFirstBatchEmpty() {
+        return wrapped.isFirstBatchEmpty();
+    }
+
+    private void cachePostBatchResumeToken(final AsyncAggregateResponseBatchCursor<RawBsonDocument> queryBatchCursor) {
+        if (queryBatchCursor.getPostBatchResumeToken() != null) {
+            resumeToken = queryBatchCursor.getPostBatchResumeToken();
+        }
+    }
+
+    private SingleResultCallback<List<RawBsonDocument>> convertResultsCallback(final SingleResultCallback<List<T>> callback) {
+        return errorHandlingCallback(new SingleResultCallback<List<RawBsonDocument>>() {
+            @Override
+            public void onResult(final List<RawBsonDocument> rawDocuments, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else if (rawDocuments != null) {
+                    List<T> results = new ArrayList<T>();
+                    for (RawBsonDocument rawDocument : rawDocuments) {
+                        if (!rawDocument.containsKey("_id")) {
+                            callback.onResult(null,
+                                    new MongoChangeStreamException("Cannot provide resume functionality when the resume token is missing.")
+                            );
+                            return;
+                        }
+                        results.add(rawDocument.decode(changeStreamOperation.getDecoder()));
+                    }
+                    resumeToken = rawDocuments.get(rawDocuments.size() - 1).getDocument("_id");
+                    callback.onResult(results, null);
+                } else {
+                    callback.onResult(null, null);
+                }
+            }
+        }, LOGGER);
+    }
+
+    private interface AsyncBlock {
+        void apply(AsyncAggregateResponseBatchCursor<RawBsonDocument> cursor, SingleResultCallback<List<RawBsonDocument>> callback);
+    }
+
+    private void resumeableOperation(final AsyncBlock asyncBlock, final SingleResultCallback<List<RawBsonDocument>> callback) {
+        asyncBlock.apply(wrapped, new SingleResultCallback<List<RawBsonDocument>>() {
+            @Override
+            public void onResult(final List<RawBsonDocument> result, final Throwable t) {
+                if (t == null) {
+                    callback.onResult(result, null);
+                } else if (isRetryableError(t)) {
+                    wrapped.close();
+                    retryOperation(asyncBlock, callback);
+                } else {
+                    callback.onResult(null, t);
+                }
+            }
+        });
+    }
+
+    private void retryOperation(final AsyncBlock asyncBlock, final SingleResultCallback<List<RawBsonDocument>> callback) {
+        withAsyncReadConnection(binding, new AsyncCallableWithSource() {
+            @Override
+            public void call(final AsyncConnectionSource source, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    changeStreamOperation.setChangeStreamOptionsForResume(resumeToken, source.getServerDescription().getMaxWireVersion());
+                    source.release();
+                    changeStreamOperation.executeAsync(binding, new SingleResultCallback<AsyncBatchCursor<T>>() {
+                        @Override
+                        public void onResult(final AsyncBatchCursor<T> result, final Throwable t) {
+                            if (t != null) {
+                                callback.onResult(null, t);
+                            } else {
+                                wrapped = ((AsyncChangeStreamBatchCursor<T>) result).getWrapped();
+                                binding.release(); // release the new change stream batch cursor's reference to the binding
+                                resumeableOperation(asyncBlock, callback);
+                            }
+                        }
+                    });
+                }
+            }
+        });
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/AsyncOperationExecutor.java b/driver-core/src/main/com/mongodb/operation/AsyncOperationExecutor.java
index 61aeb183772..dfd8af935e6 100644
--- a/driver-core/src/main/com/mongodb/operation/AsyncOperationExecutor.java
+++ b/driver-core/src/main/com/mongodb/operation/AsyncOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.session.ClientSession;
 import com.mongodb.ReadPreference;
 import com.mongodb.async.SingleResultCallback;
 
@@ -23,7 +24,9 @@
  * An interface describing the execution of a read or a write operation.
  *
  * @since 3.0
+ * @deprecated there is no replacement for this interface
  */
+@Deprecated
 public interface AsyncOperationExecutor {
     /**
      * Execute the read operation with the given read preference.
@@ -35,6 +38,19 @@ public interface AsyncOperationExecutor {
      */
     <T> void execute(AsyncReadOperation<T> operation, ReadPreference readPreference, SingleResultCallback<T> callback);
 
+    /**
+     * Execute the read operation with the given read preference.
+     *
+     * @param operation the read operation.
+     * @param readPreference the read preference.
+     * @param session the session to associate this operation with
+     * @param callback the callback to be called when the operation has been executed
+     * @param <T> the operations result type.
+     * @since 3.6
+     */
+    <T> void execute(AsyncReadOperation<T> operation, ReadPreference readPreference, ClientSession session,
+                     SingleResultCallback<T> callback);
+
     /**
      * Execute the write operation.
      *
@@ -43,4 +59,15 @@ public interface AsyncOperationExecutor {
      * @param <T> the operations result type.
      */
     <T> void execute(AsyncWriteOperation<T> operation, SingleResultCallback<T> callback);
+
+    /**
+     * Execute the write operation.
+     *
+     * @param operation the write operation.
+     * @param session the session to associate this operation with
+     * @param callback the callback to be called when the operation has been executed
+     * @param <T> the operations result type.
+     * @since 3.6
+     */
+    <T> void execute(AsyncWriteOperation<T> operation, ClientSession session, SingleResultCallback<T> callback);
 }
diff --git a/driver-core/src/main/com/mongodb/operation/AsyncQueryBatchCursor.java b/driver-core/src/main/com/mongodb/operation/AsyncQueryBatchCursor.java
index d017876fc2a..ab52b5cdf76 100644
--- a/driver-core/src/main/com/mongodb/operation/AsyncQueryBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/operation/AsyncQueryBatchCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,21 +17,30 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
 import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
 import com.mongodb.ServerCursor;
-import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.AsyncAggregateResponseBatchCursor;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.QueryResult;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonInt64;
 import org.bson.BsonString;
+import org.bson.BsonTimestamp;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.BsonDocumentCodec;
 import org.bson.codecs.Decoder;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.isTrueArgument;
@@ -40,30 +49,39 @@
 import static com.mongodb.operation.CursorHelper.getNumberToReturn;
 import static com.mongodb.operation.OperationHelper.LOGGER;
 import static com.mongodb.operation.OperationHelper.getMoreCursorDocumentToQueryResult;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
 import static com.mongodb.operation.QueryHelper.translateCommandException;
+import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 
-class AsyncQueryBatchCursor<T> implements AsyncBatchCursor<T> {
+class AsyncQueryBatchCursor<T> implements AsyncAggregateResponseBatchCursor<T> {
+    private static final FieldNameValidator NO_OP_FIELD_NAME_VALIDATOR = new NoOpFieldNameValidator();
+    private static final String CURSOR = "cursor";
+    private static final String POST_BATCH_RESUME_TOKEN = "postBatchResumeToken";
+    private static final String OPERATION_TIME = "operationTime";
 
     private final MongoNamespace namespace;
     private final int limit;
     private final Decoder<T> decoder;
     private final long maxTimeMS;
-    private volatile AsyncConnectionSource connectionSource;
+    private final AsyncConnectionSource connectionSource;
+    private final AtomicBoolean isClosed = new AtomicBoolean();
+    private final AtomicReference<ServerCursor> cursor;
     private volatile QueryResult<T> firstBatch;
     private volatile int batchSize;
-    private volatile ServerCursor cursor;
-    private volatile int count;
-    private volatile boolean closed;
+    private final AtomicInteger count = new AtomicInteger();
+    private volatile BsonDocument postBatchResumeToken;
+    private volatile BsonTimestamp operationTime;
+    private volatile boolean firstBatchEmpty;
 
-    AsyncQueryBatchCursor(final QueryResult<T> firstBatch, final int limit, final int batchSize,
-                          final Decoder<T> decoder) {
-        this(firstBatch, limit, batchSize, 0, decoder, null, null);
+    AsyncQueryBatchCursor(final QueryResult<T> firstBatch, final int limit, final int batchSize, final long maxTimeMS,
+                          final Decoder<T> decoder, final AsyncConnectionSource connectionSource, final AsyncConnection connection) {
+        this(firstBatch, limit, batchSize, maxTimeMS, decoder, connectionSource, connection, null);
     }
 
     AsyncQueryBatchCursor(final QueryResult<T> firstBatch, final int limit, final int batchSize, final long maxTimeMS,
-                          final Decoder<T> decoder, final AsyncConnectionSource connectionSource, final AsyncConnection connection) {
+                          final Decoder<T> decoder, final AsyncConnectionSource connectionSource, final AsyncConnection connection,
+                          final BsonDocument result) {
         isTrueArgument("maxTimeMS >= 0", maxTimeMS >= 0);
         this.maxTimeMS = maxTimeMS;
         this.namespace = firstBatch.getNamespace();
@@ -71,103 +89,130 @@ class AsyncQueryBatchCursor<T> implements AsyncBatchCursor<T> {
         this.limit = limit;
         this.batchSize = batchSize;
         this.decoder = decoder;
-        this.cursor = firstBatch.getCursor();
-        if (this.cursor != null) {
-            notNull("connectionSource", connectionSource);
-            notNull("connection", connection);
-        }
-        if (connectionSource != null) {
-            this.connectionSource = connectionSource.retain();
-        } else {
-            this.connectionSource = null;
+        this.cursor = new AtomicReference<ServerCursor>(firstBatch.getCursor());
+        this.connectionSource = notNull("connectionSource", connectionSource);
+        this.count.addAndGet(firstBatch.getResults().size());
+        if (result != null) {
+            this.operationTime = result.getTimestamp(OPERATION_TIME, null);
+            this.postBatchResumeToken = getPostBatchResumeTokenFromResponse(result);
         }
-        this.count += firstBatch.getResults().size();
-        if (limitReached()) {
-             killCursor(connection);
+
+        firstBatchEmpty = firstBatch.getResults().isEmpty();
+        if (firstBatch.getCursor() != null) {
+            connectionSource.retain();
+            if (limitReached()) {
+                killCursor(connection);
+            }
         }
     }
 
     @Override
     public void close() {
-        if (!closed) {
-            closed = true;
-            killCursor(null);
+        if (!isClosed.getAndSet(true)) {
+            killCursorOnClose();
         }
     }
 
     @Override
     public void next(final SingleResultCallback<List<T>> callback) {
-        isTrue("open", !closed);
-        // may be empty for a tailable cursor
-        if (firstBatch  != null && !firstBatch.getResults().isEmpty()) {
-            List<T> results = firstBatch.getResults();
-            firstBatch = null;
-            callback.onResult(results, null);
-        } else {
-            if (cursor == null) {
-                close();
-                callback.onResult(null, null);
-            } else {
-                getMore(callback);
-            }
-        }
+        next(callback, false);
+    }
+
+    @Override
+    public void tryNext(final SingleResultCallback<List<T>> callback) {
+        next(callback, true);
     }
 
     @Override
     public void setBatchSize(final int batchSize) {
-        isTrue("open", !closed);
+        isTrue("open", !isClosed.get());
         this.batchSize = batchSize;
     }
 
     @Override
     public int getBatchSize() {
-        isTrue("open", !closed);
+        isTrue("open", !isClosed.get());
         return batchSize;
     }
 
     @Override
     public boolean isClosed() {
-        return closed;
+        return isClosed.get();
     }
 
-    ServerCursor getServerCursor() {
-        return cursor;
+    @Override
+    public BsonDocument getPostBatchResumeToken() {
+        return postBatchResumeToken;
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return operationTime;
+    }
+
+    @Override
+    public boolean isFirstBatchEmpty() {
+        return firstBatchEmpty;
+    }
+
+    private void next(final SingleResultCallback<List<T>> callback, final boolean tryNext) {
+        if (isClosed()) {
+            callback.onResult(null, new MongoException(format("%s called after the cursor was closed.",
+                    tryNext ? "tryNext()" : "next()")));
+        } else if (firstBatch != null && (tryNext || !firstBatch.getResults().isEmpty())) {
+            // May be empty for a tailable cursor
+            List<T> results = firstBatch.getResults();
+            if (tryNext && results.isEmpty()) {
+                results = null;
+            }
+            firstBatch = null;
+            callback.onResult(results, null);
+        } else {
+            ServerCursor localCursor = getServerCursor();
+            if (localCursor == null) {
+                isClosed.set(true);
+                callback.onResult(null, null);
+            } else {
+                getMore(localCursor, callback, tryNext);
+            }
+        }
     }
 
     private boolean limitReached() {
-        return Math.abs(limit) != 0 && count >= Math.abs(limit);
+        return Math.abs(limit) != 0 && count.get() >= Math.abs(limit);
     }
 
-    private void getMore(final SingleResultCallback<List<T>> callback) {
+    private void getMore(final ServerCursor cursor, final SingleResultCallback<List<T>> callback, final boolean tryNext) {
         connectionSource.getConnection(new SingleResultCallback<AsyncConnection>() {
             @Override
             public void onResult(final AsyncConnection connection, final Throwable t) {
                 if (t != null) {
                     callback.onResult(null, t);
                 } else {
-                    getMore(connection, callback);
+                    getMore(connection, cursor, callback, tryNext);
                 }
             }
         });
     }
 
-    private void getMore(final AsyncConnection connection, final SingleResultCallback<List<T>> callback) {
+    private void getMore(final AsyncConnection connection, final ServerCursor cursor, final SingleResultCallback<List<T>> callback,
+                         final boolean tryNext) {
         if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
-            connection.commandAsync(namespace.getDatabaseName(), asGetMoreCommandDocument(), false,
-                                    new NoOpFieldNameValidator(), CommandResultDocumentCodec.create(decoder, "nextBatch"),
-                                    new CommandResultSingleResultCallback(connection, callback));
+            connection.commandAsync(namespace.getDatabaseName(), asGetMoreCommandDocument(cursor.getId()), NO_OP_FIELD_NAME_VALIDATOR,
+                    ReadPreference.primary(), CommandResultDocumentCodec.create(decoder, "nextBatch"),
+                    connectionSource.getSessionContext(), new CommandResultSingleResultCallback(connection, cursor, callback, tryNext));
 
         } else {
-            connection.getMoreAsync(namespace, cursor.getId(), getNumberToReturn(limit, batchSize, count),
-                                    decoder, new QueryResultSingleResultCallback(connection, callback));
+            connection.getMoreAsync(namespace, cursor.getId(), getNumberToReturn(limit, batchSize, count.get()),
+                                    decoder, new QueryResultSingleResultCallback(connection, callback, tryNext));
         }
     }
 
-    private BsonDocument asGetMoreCommandDocument() {
-        BsonDocument document = new BsonDocument("getMore", new BsonInt64(cursor.getId()))
-                                .append("collection", new BsonString(namespace.getCollectionName()));
+    private BsonDocument asGetMoreCommandDocument(final long cursorId) {
+        BsonDocument document = new BsonDocument("getMore", new BsonInt64(cursorId))
+                .append("collection", new BsonString(namespace.getCollectionName()));
 
-        int batchSizeForGetMoreCommand = Math.abs(getNumberToReturn(limit, this.batchSize, count));
+        int batchSizeForGetMoreCommand = Math.abs(getNumberToReturn(limit, this.batchSize, count.get()));
         if (batchSizeForGetMoreCommand != 0) {
             document.append("batchSize", new BsonInt32(batchSizeForGetMoreCommand));
         }
@@ -177,53 +222,83 @@ private BsonDocument asGetMoreCommandDocument() {
         return document;
     }
 
-    private void killCursor(final AsyncConnection connection) {
-        if (cursor != null) {
-            final ServerCursor localCursor = cursor;
-            final AsyncConnectionSource localConnectionSource = connectionSource;
-            cursor = null;
-            connectionSource = null;
-            if (connection != null) {
-                connection.retain();
-                killCursorAsynchronouslyAndReleaseConnectionAndSource(connection, localCursor, localConnectionSource);
-            } else {
-                localConnectionSource.getConnection(new SingleResultCallback<AsyncConnection>() {
-                    @Override
-                    public void onResult(final AsyncConnection connection, final Throwable connectionException) {
-                        if (connectionException == null) {
-                            killCursorAsynchronouslyAndReleaseConnectionAndSource(connection, localCursor, localConnectionSource);
-                        }
+    private void killCursorOnClose() {
+        final ServerCursor localCursor = getServerCursor();
+        if (localCursor != null) {
+            connectionSource.getConnection(new SingleResultCallback<AsyncConnection>() {
+                @Override
+                public void onResult(final AsyncConnection connection, final Throwable t) {
+                    if (t != null) {
+                        connectionSource.release();
+                    } else {
+                        killCursorAsynchronouslyAndReleaseConnectionAndSource(connection, localCursor);
                     }
-                });
-            }
-        } else if (connectionSource != null) {
+                }
+            });
+        }
+    }
+
+    private void killCursor(final AsyncConnection connection) {
+        ServerCursor localCursor = cursor.getAndSet(null);
+        if (localCursor != null) {
+            killCursorAsynchronouslyAndReleaseConnectionAndSource(connection.retain(), localCursor);
+        } else {
             connectionSource.release();
-            connectionSource = null;
         }
     }
 
-    private void killCursorAsynchronouslyAndReleaseConnectionAndSource(final AsyncConnection connection, final ServerCursor localCursor,
-                                                                       final AsyncConnectionSource localConnectionSource) {
-        connection.killCursorAsync(namespace, singletonList(localCursor.getId()), new SingleResultCallback<Void>() {
-            @Override
-            public void onResult(final Void result, final Throwable t) {
-                connection.release();
-                localConnectionSource.release();
-            }
-        });
+    private void killCursorAsynchronouslyAndReleaseConnectionAndSource(final AsyncConnection connection, final ServerCursor localCursor) {
+        if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
+            connection.commandAsync(namespace.getDatabaseName(), asKillCursorsCommandDocument(localCursor), NO_OP_FIELD_NAME_VALIDATOR,
+                    ReadPreference.primary(), new BsonDocumentCodec(), connectionSource.getSessionContext(),
+                    new SingleResultCallback<BsonDocument>() {
+                        @Override
+                        public void onResult(final BsonDocument result, final Throwable t) {
+                            connection.release();
+                            connectionSource.release();
+                        }
+                    });
+        } else {
+            connection.killCursorAsync(namespace, singletonList(localCursor.getId()), new SingleResultCallback<Void>() {
+                @Override
+                public void onResult(final Void result, final Throwable t) {
+                    connection.release();
+                    connectionSource.release();
+                }
+            });
+        }
     }
 
+    private BsonDocument asKillCursorsCommandDocument(final ServerCursor localCursor) {
+        return new BsonDocument("killCursors", new BsonString(namespace.getCollectionName()))
+                .append("cursors", new BsonArray(singletonList(new BsonInt64(localCursor.getId()))));
+    }
+
+
     private void handleGetMoreQueryResult(final AsyncConnection connection, final SingleResultCallback<List<T>> callback,
-                                          final QueryResult<T> result) {
-        if (result.getResults().isEmpty() && result.getCursor() != null) {
-            getMore(connection, callback);
+                                          final QueryResult<T> result, final boolean tryNext) {
+        if (isClosed()) {
+            connection.release();
+            callback.onResult(null, new MongoException(format("The cursor was closed before %s completed.",
+                    tryNext ? "tryNext()" : "next()")));
+            return;
+        }
+
+        cursor.getAndSet(result.getCursor());
+        if (!tryNext && result.getResults().isEmpty() && result.getCursor() != null) {
+            getMore(connection, result.getCursor(), callback, false);
         } else {
-            cursor = result.getCursor();
-            count += result.getResults().size();
+            count.addAndGet(result.getResults().size());
             if (limitReached()) {
                 killCursor(connection);
+                connection.release();
+            } else {
+                connection.release();
+                if (result.getCursor() == null) {
+                    connectionSource.release();
+                }
             }
-            connection.release();
+
             if (result.getResults().isEmpty()) {
                 callback.onResult(null, null);
             } else {
@@ -234,26 +309,31 @@ private void handleGetMoreQueryResult(final AsyncConnection connection, final Si
 
     private class CommandResultSingleResultCallback implements SingleResultCallback<BsonDocument> {
         private final AsyncConnection connection;
+        private final ServerCursor cursor;
         private final SingleResultCallback<List<T>> callback;
+        private final boolean tryNext;
 
-        public CommandResultSingleResultCallback(final AsyncConnection connection, final SingleResultCallback<List<T>> callback) {
+        CommandResultSingleResultCallback(final AsyncConnection connection, final ServerCursor cursor,
+                                          final SingleResultCallback<List<T>> callback, final boolean tryNext) {
             this.connection = connection;
+            this.cursor = cursor;
             this.callback = errorHandlingCallback(callback, LOGGER);
+            this.tryNext = tryNext;
         }
 
         @Override
         public void onResult(final BsonDocument result, final Throwable t) {
             if (t != null) {
                 Throwable translatedException = t instanceof MongoCommandException
-                                                ? translateCommandException((MongoCommandException) t, cursor)
-                                                : t;
+                        ? translateCommandException((MongoCommandException) t, cursor)
+                        : t;
                 connection.release();
-                close();
                 callback.onResult(null, translatedException);
             } else {
-                QueryResult<T> queryResult = getMoreCursorDocumentToQueryResult(result.getDocument("cursor"),
-                                                                                connectionSource.getServerDescription().getAddress());
-                handleGetMoreQueryResult(connection, callback, queryResult);
+                QueryResult<T> queryResult = getMoreCursorDocumentToQueryResult(result.getDocument(CURSOR),
+                        connection.getDescription().getServerAddress());
+                postBatchResumeToken = getPostBatchResumeTokenFromResponse(result);
+                handleGetMoreQueryResult(connection, callback, queryResult, tryNext);
             }
         }
     }
@@ -261,21 +341,35 @@ public void onResult(final BsonDocument result, final Throwable t) {
     private class QueryResultSingleResultCallback implements SingleResultCallback<QueryResult<T>> {
         private final AsyncConnection connection;
         private final SingleResultCallback<List<T>> callback;
+        private final boolean tryNext;
 
-        public QueryResultSingleResultCallback(final AsyncConnection connection, final SingleResultCallback<List<T>> callback) {
+        QueryResultSingleResultCallback(final AsyncConnection connection, final SingleResultCallback<List<T>> callback,
+                                        final boolean tryNext) {
             this.connection = connection;
             this.callback = errorHandlingCallback(callback, LOGGER);
+            this.tryNext = tryNext;
         }
 
         @Override
         public void onResult(final QueryResult<T> result, final Throwable t) {
             if (t != null) {
                 connection.release();
-                close();
                 callback.onResult(null, t);
             } else {
-                handleGetMoreQueryResult(connection, callback, result);
+                handleGetMoreQueryResult(connection, callback, result, tryNext);
             }
         }
     }
+
+    ServerCursor getServerCursor() {
+        return cursor.get();
+    }
+
+    private BsonDocument getPostBatchResumeTokenFromResponse(final BsonDocument result) {
+        BsonDocument cursor = result.getDocument(CURSOR, null);
+        if (cursor != null) {
+            return cursor.getDocument(POST_BATCH_RESUME_TOKEN, null);
+        }
+        return null;
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/AsyncReadOperation.java b/driver-core/src/main/com/mongodb/operation/AsyncReadOperation.java
index 41b563b5c44..c02880b18b0 100644
--- a/driver-core/src/main/com/mongodb/operation/AsyncReadOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/AsyncReadOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public interface AsyncReadOperation<T> {
 
     /**
diff --git a/driver-core/src/main/com/mongodb/operation/AsyncSingleBatchQueryCursor.java b/driver-core/src/main/com/mongodb/operation/AsyncSingleBatchQueryCursor.java
new file mode 100644
index 00000000000..7a50d99422e
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/AsyncSingleBatchQueryCursor.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoException;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.QueryResult;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+
+class AsyncSingleBatchQueryCursor<T> implements AsyncBatchCursor<T> {
+    private volatile QueryResult<T> firstBatch;
+    private volatile boolean closed;
+
+    AsyncSingleBatchQueryCursor(final QueryResult<T> firstBatch) {
+        this.firstBatch = firstBatch;
+        isTrue("Empty Cursor", firstBatch.getCursor() == null);
+    }
+
+    @Override
+    public void close() {
+        closed = true;
+    }
+
+    @Override
+    public void next(final SingleResultCallback<List<T>> callback) {
+        if (closed) {
+            callback.onResult(null, new MongoException("next() called after the cursor was closed."));
+        } else if (firstBatch != null && !firstBatch.getResults().isEmpty()) {
+            List<T> results = firstBatch.getResults();
+            firstBatch = null;
+            callback.onResult(results, null);
+        } else {
+            closed = true;
+            callback.onResult(null, null);
+        }
+    }
+
+    @Override
+    public void tryNext(final SingleResultCallback<List<T>> callback) {
+        next(callback);
+    }
+
+    @Override
+    public void setBatchSize(final int batchSize) {
+        // Noop
+    }
+
+    @Override
+    public int getBatchSize() {
+        return 0;
+    }
+
+    @Override
+    public boolean isClosed() {
+        return closed;
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/operation/AsyncWriteOperation.java b/driver-core/src/main/com/mongodb/operation/AsyncWriteOperation.java
index 19fc16193f1..0e34d9db051 100644
--- a/driver-core/src/main/com/mongodb/operation/AsyncWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/AsyncWriteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public interface AsyncWriteOperation<T> {
 
     /**
diff --git a/driver-core/src/main/com/mongodb/operation/BaseFindAndModifyOperation.java b/driver-core/src/main/com/mongodb/operation/BaseFindAndModifyOperation.java
new file mode 100644
index 00000000000..dd1f34ae899
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/BaseFindAndModifyOperation.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.binding.WriteBinding;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonInt64;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.Decoder;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeRetryableCommand;
+import static com.mongodb.operation.OperationHelper.isRetryableWrite;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
+
+/**
+ * Abstract base class for findAndModify-based operations
+ *
+ * @param <T> the document type
+ * @since 3.8
+ */
+@Deprecated
+public abstract class BaseFindAndModifyOperation<T> implements AsyncWriteOperation<T>, WriteOperation<T> {
+
+    private final MongoNamespace namespace;
+    private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private final Decoder<T> decoder;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace   the database and collection namespace for the operation.
+     * @param writeConcern the writeConcern for the operation
+     * @param retryWrites  if writes should be retried if they fail due to a network error.
+     * @param decoder     the decoder for the result documents.
+     */
+    protected BaseFindAndModifyOperation(final MongoNamespace namespace, final WriteConcern writeConcern,
+                                         final boolean retryWrites, final Decoder<T> decoder) {
+        this.namespace = notNull("namespace", namespace);
+        this.writeConcern = notNull("writeConcern", writeConcern);
+        this.retryWrites = retryWrites;
+        this.decoder = notNull("decoder", decoder);
+    }
+
+    @Override
+    public T execute(final WriteBinding binding) {
+        return executeRetryableCommand(binding, getDatabaseName(), null, getFieldNameValidator(),
+                CommandResultDocumentCodec.create(getDecoder(), "value"),
+                getCommandCreator(binding.getSessionContext()),
+                FindAndModifyHelper.<T>transformer());
+    }
+
+    @Override
+    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<T> callback) {
+        executeRetryableCommand(binding, getDatabaseName(), null, getFieldNameValidator(),
+                CommandResultDocumentCodec.create(getDecoder(), "value"),
+                getCommandCreator(binding.getSessionContext()), FindAndModifyHelper.<T>asyncTransformer(), callback);
+    }
+
+    protected abstract String getDatabaseName();
+
+    /**
+     * Gets the namespace.
+     *
+     * @return the namespace
+     */
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Get the write concern for this operation
+     *
+     * @return the {@link WriteConcern}
+     * @mongodb.server.release 3.2
+     * @since 3.2
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Gets the decoder used to decode the result documents.
+     *
+     * @return the decoder
+     */
+    public Decoder<T> getDecoder() {
+        return decoder;
+    }
+
+    /**
+     * Returns true if the operation should be retried.
+     *
+     * @return true if the operation should be retried
+     * @since 3.8
+     */
+    public boolean isRetryWrites() {
+        return retryWrites;
+    }
+
+    protected abstract CommandCreator getCommandCreator(SessionContext sessionContext);
+
+    protected void addTxnNumberToCommand(final ServerDescription serverDescription, final ConnectionDescription connectionDescription,
+                                         final BsonDocument commandDocument, final SessionContext sessionContext) {
+        if (isRetryableWrite(isRetryWrites(), getWriteConcern(), serverDescription, connectionDescription, sessionContext)) {
+            commandDocument.put("txnNumber", new BsonInt64(sessionContext.advanceTransactionNumber()));
+        }
+    }
+
+    protected void addWriteConcernToCommand(final ConnectionDescription connectionDescription, final BsonDocument commandDocument,
+                                            final SessionContext sessionContext) {
+        if (getWriteConcern().isAcknowledged() && !getWriteConcern().isServerDefault()
+                && serverIsAtLeastVersionThreeDotTwo(connectionDescription) && !sessionContext.hasActiveTransaction()) {
+            commandDocument.put("writeConcern", getWriteConcern().asDocument());
+        }
+    }
+
+    protected abstract FieldNameValidator getFieldNameValidator();
+}
diff --git a/driver-core/src/main/com/mongodb/operation/BaseWriteOperation.java b/driver-core/src/main/com/mongodb/operation/BaseWriteOperation.java
index b0cb9819f1d..349971ece63 100644
--- a/driver-core/src/main/com/mongodb/operation/BaseWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/BaseWriteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,27 +30,18 @@
 import com.mongodb.bulk.BulkWriteError;
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.bulk.WriteRequest;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonString;
 
+import java.util.List;
+
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.bulk.WriteRequest.Type.DELETE;
 import static com.mongodb.bulk.WriteRequest.Type.INSERT;
 import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
 import static com.mongodb.bulk.WriteRequest.Type.UPDATE;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
-import static com.mongodb.operation.OperationHelper.CallableWithConnection;
-import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.bypassDocumentValidationNotSupported;
-import static com.mongodb.operation.OperationHelper.getBypassDocumentValidationException;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
-import static com.mongodb.operation.OperationHelper.withConnection;
 
 
 /**
@@ -58,11 +49,12 @@
  *
  * @since 3.0
  */
+@Deprecated
 public abstract class BaseWriteOperation implements AsyncWriteOperation<WriteConcernResult>, WriteOperation<WriteConcernResult> {
-
     private final WriteConcern writeConcern;
     private final MongoNamespace namespace;
     private final boolean ordered;
+    private final boolean retryWrites;
     private Boolean bypassDocumentValidation;
 
     /**
@@ -71,13 +63,34 @@ public abstract class BaseWriteOperation implements AsyncWriteOperation<WriteCon
      * @param namespace    the database and collection namespace for the operation.
      * @param ordered      whether the writes are ordered.
      * @param writeConcern the write concern for the operation.
+     * @deprecated         use {@link #BaseWriteOperation(MongoNamespace, boolean, WriteConcern, boolean)} instead
      */
+    @Deprecated
     public BaseWriteOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern) {
+        this(namespace, ordered, writeConcern, false);
+    }
+
+    /**
+     * Construct an instance
+     *
+     * @param namespace    the database and collection namespace for the operation.
+     * @param ordered      whether the writes are ordered.
+     * @param writeConcern the write concern for the operation.
+     * @param retryWrites   if writes should be retried if they fail due to a network error.
+     * @since 3.6
+     */
+    public BaseWriteOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
+                              final boolean retryWrites) {
         this.ordered = ordered;
         this.namespace = notNull("namespace", namespace);
         this.writeConcern = notNull("writeConcern", writeConcern);
+        this.retryWrites = retryWrites;
     }
 
+    protected abstract List<? extends WriteRequest> getWriteRequests();
+
+    protected abstract WriteRequest.Type getType();
+
     /**
      * Gets the namespace of the collection to write to.
      *
@@ -131,101 +144,42 @@ public BaseWriteOperation bypassDocumentValidation(final Boolean bypassDocumentV
 
     @Override
     public WriteConcernResult execute(final WriteBinding binding) {
-        return withConnection(binding, new CallableWithConnection<WriteConcernResult>() {
-            @Override
-            public WriteConcernResult call(final Connection connection) {
-                try {
-                    if (bypassDocumentValidationNotSupported(bypassDocumentValidation, writeConcern, connection.getDescription())) {
-                        throw getBypassDocumentValidationException();
-                    }
-                    if (writeConcern.isAcknowledged() && serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                        return translateBulkWriteResult(executeCommandProtocol(connection));
-                    } else {
-                        return executeProtocol(connection);
-                    }
-                } catch (MongoBulkWriteException e) {
-                    throw convertBulkWriteException(e);
-                }
+        try {
+            BulkWriteResult result = getMixedBulkOperation().execute(binding);
+            if (result.wasAcknowledged()) {
+                return translateBulkWriteResult(result);
+            } else {
+                return WriteConcernResult.unacknowledged();
             }
-        });
+        } catch (MongoBulkWriteException e) {
+            throw convertBulkWriteException(e);
+        }
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<WriteConcernResult> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
-            @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<WriteConcernResult> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else if (bypassDocumentValidationNotSupported(bypassDocumentValidation, writeConcern, connection.getDescription())) {
-                    releasingCallback(errHandlingCallback, connection).onResult(null, getBypassDocumentValidationException());
-                } else {
-                    final SingleResultCallback<WriteConcernResult> wrappedCallback = releasingCallback(errHandlingCallback, connection);
-                    if (writeConcern.isAcknowledged() && serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                        executeCommandProtocolAsync(connection, new SingleResultCallback<BulkWriteResult>() {
-                            @Override
-                            public void onResult(final BulkWriteResult result, final Throwable t) {
-                                if (t != null) {
-                                    wrappedCallback.onResult(null, translateException(t));
-                                } else {
-                                    wrappedCallback.onResult(translateBulkWriteResult(result), null);
-                                }
-                            }
-                        });
-                    } else {
-                        executeProtocolAsync(connection, new SingleResultCallback<WriteConcernResult>() {
-                            @Override
-                            public void onResult(final WriteConcernResult result, final Throwable t) {
-                                if (t != null) {
-                                    wrappedCallback.onResult(null, translateException(t));
-                                } else {
-                                    wrappedCallback.onResult(result, null);
-                                }
+        getMixedBulkOperation().executeAsync(binding, new SingleResultCallback<BulkWriteResult>() {
+                    @Override
+                    public void onResult(final BulkWriteResult result, final Throwable t) {
+                        if (t != null) {
+                            if (t instanceof MongoBulkWriteException) {
+                                callback.onResult(null, convertBulkWriteException((MongoBulkWriteException) t));
+                            } else {
+                                callback.onResult(null, t);
                             }
-                        });
+                        } else if (result.wasAcknowledged()) {
+                            callback.onResult(translateBulkWriteResult(result), null);
+                        } else {
+                            callback.onResult(WriteConcernResult.unacknowledged(), null);
+                        }
                     }
                 }
-            }
-        });
+        );
     }
 
-    /**
-     * Executes the write protocol
-     *
-     * @param connection the connection
-     * @return the write protocol
-     */
-    protected abstract WriteConcernResult executeProtocol(Connection connection);
-
-    /**
-     * Asynchronously executes the write protocol
-     *  @param connection the connection
-     * @param callback   the callback to be passed the WriteConcernResult
-     */
-    protected abstract void executeProtocolAsync(AsyncConnection connection, SingleResultCallback<WriteConcernResult> callback);
-
-    /**
-     * Executes the write command protocol.
-     *
-     * @param connection the connection
-     * @return the result
-     */
-    protected abstract BulkWriteResult executeCommandProtocol(Connection connection);
-
-    /**
-     * Asynchronously executes the write command protocol.
-     *  @param connection the connection
-     * @param callback   the callback to be passed the BulkWriteResult
-     */
-    protected abstract void executeCommandProtocolAsync(AsyncConnection connection, SingleResultCallback<BulkWriteResult> callback);
-
-    private MongoException translateException(final Throwable t) {
-        MongoException checkedError = MongoException.fromThrowable(t);
-        if (t instanceof MongoBulkWriteException) {
-            checkedError = convertBulkWriteException((MongoBulkWriteException) t);
-        }
-        return checkedError;
+    private MixedBulkWriteOperation getMixedBulkOperation() {
+        return new MixedBulkWriteOperation(namespace, getWriteRequests(), ordered, writeConcern, retryWrites)
+                .bypassDocumentValidation(bypassDocumentValidation);
     }
 
     @SuppressWarnings("deprecation")
@@ -243,7 +197,6 @@ private MongoException convertBulkWriteException(final MongoBulkWriteException e
             return new WriteConcernException(manufactureGetLastErrorResponse(e), e.getServerAddress(),
                                              translateBulkWriteResult(e.getWriteResult()));
         }
-
     }
 
     private BsonDocument manufactureGetLastErrorResponse(final MongoBulkWriteException e) {
@@ -287,11 +240,22 @@ private WriteConcernResult translateBulkWriteResult(final BulkWriteResult bulkWr
                                                ? null : bulkWriteResult.getUpserts().get(0).getId());
     }
 
-    protected abstract WriteRequest.Type getType();
+    private int getCount(final BulkWriteResult bulkWriteResult) {
 
-    protected abstract int getCount(BulkWriteResult bulkWriteResult);
 
-    protected boolean getUpdatedExisting(final BulkWriteResult bulkWriteResult) {
+        int count = 0;
+        if (getType() == UPDATE || getType() == REPLACE) {
+            count = bulkWriteResult.getMatchedCount() + bulkWriteResult.getUpserts().size();
+        } else if (getType() == DELETE) {
+            count = bulkWriteResult.getDeletedCount();
+        }
+        return count;
+    }
+
+    private boolean getUpdatedExisting(final BulkWriteResult bulkWriteResult) {
+        if (getType() == UPDATE) {
+            return bulkWriteResult.getMatchedCount() > 0;
+        }
         return false;
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/BatchCursor.java b/driver-core/src/main/com/mongodb/operation/BatchCursor.java
index b0aed30216b..2df6dd3518c 100644
--- a/driver-core/src/main/com/mongodb/operation/BatchCursor.java
+++ b/driver-core/src/main/com/mongodb/operation/BatchCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
  * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#wire-op-get-more OP_GET_MORE
  */
 @NotThreadSafe
+@Deprecated
 public interface BatchCursor<T> extends Iterator<List<T>>, Closeable {
     @Override
     void close();
diff --git a/driver-core/src/main/com/mongodb/operation/BsonArrayWrapper.java b/driver-core/src/main/com/mongodb/operation/BsonArrayWrapper.java
index 1bc9864bdd2..9d0e2a144b3 100644
--- a/driver-core/src/main/com/mongodb/operation/BsonArrayWrapper.java
+++ b/driver-core/src/main/com/mongodb/operation/BsonArrayWrapper.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -31,12 +31,7 @@ class BsonArrayWrapper<T> extends BsonArray {
 
     private final List<T> wrappedArray;
 
-    /**
-     * Construct a new instance with the given array and encoder for the document.
-     *
-     * @param wrappedArray the wrapped array
-     */
-    public BsonArrayWrapper(final List<T> wrappedArray) {
+    BsonArrayWrapper(final List<T> wrappedArray) {
         this.wrappedArray = notNull("wrappedArray", wrappedArray);
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/BsonDocumentWrapperHelper.java b/driver-core/src/main/com/mongodb/operation/BsonDocumentWrapperHelper.java
index 01b8e95f440..6031e1d415a 100644
--- a/driver-core/src/main/com/mongodb/operation/BsonDocumentWrapperHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/BsonDocumentWrapperHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/operation/BulkWriteBatch.java b/driver-core/src/main/com/mongodb/operation/BulkWriteBatch.java
new file mode 100644
index 00000000000..a37fb507e1f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/BulkWriteBatch.java
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoBulkWriteException;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.bulk.BulkWriteError;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.bulk.BulkWriteUpsert;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.bulk.WriteConcernError;
+import com.mongodb.bulk.WriteRequest;
+import com.mongodb.connection.BulkWriteBatchCombiner;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.SplittablePayload;
+import com.mongodb.internal.connection.FieldTrackingBsonWriter;
+import com.mongodb.internal.connection.IndexMap;
+import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
+import com.mongodb.internal.validator.MappedFieldNameValidator;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.internal.validator.UpdateFieldNameValidator;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWrapper;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.BsonWriter;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.Decoder;
+import org.bson.codecs.Encoder;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mongodb.bulk.WriteRequest.Type.DELETE;
+import static com.mongodb.bulk.WriteRequest.Type.INSERT;
+import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
+import static com.mongodb.bulk.WriteRequest.Type.UPDATE;
+import static com.mongodb.internal.operation.WriteConcernHelper.createWriteConcernError;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.isRetryableWrite;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+final class BulkWriteBatch {
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+    private static final Decoder<BsonDocument> DECODER = REGISTRY.get(BsonDocument.class);
+    private static final FieldNameValidator NO_OP_FIELD_NAME_VALIDATOR = new NoOpFieldNameValidator();
+    private static final WriteRequestEncoder WRITE_REQUEST_ENCODER = new WriteRequestEncoder();
+
+    private final MongoNamespace namespace;
+    private final ConnectionDescription connectionDescription;
+    private final boolean ordered;
+    private final WriteConcern writeConcern;
+    private final Boolean bypassDocumentValidation;
+    private final boolean retryWrites;
+    private final BulkWriteBatchCombiner bulkWriteBatchCombiner;
+    private final IndexMap indexMap;
+    private final WriteRequest.Type batchType;
+    private final BsonDocument command;
+    private final SplittablePayload payload;
+    private final List<WriteRequestWithIndex> unprocessed;
+    private final SessionContext sessionContext;
+
+    public static BulkWriteBatch createBulkWriteBatch(final MongoNamespace namespace,
+                                                      final ServerDescription serverDescription,
+                                                      final ConnectionDescription connectionDescription,
+                                                      final boolean ordered, final WriteConcern writeConcern,
+                                                      final Boolean bypassDocumentValidation, final boolean retryWrites,
+                                                      final List<? extends WriteRequest> writeRequests,
+                                                      final SessionContext sessionContext) {
+        if (sessionContext.hasSession() && !sessionContext.isImplicitSession() && !sessionContext.hasActiveTransaction()
+                && !writeConcern.isAcknowledged()) {
+            throw new MongoClientException("Unacknowledged writes are not supported when using an explicit session");
+        }
+        boolean canRetryWrites = isRetryableWrite(retryWrites, writeConcern, serverDescription, connectionDescription, sessionContext);
+        List<WriteRequestWithIndex> writeRequestsWithIndex = new ArrayList<WriteRequestWithIndex>();
+        boolean writeRequestsAreRetryable = true;
+        for (int i = 0; i < writeRequests.size(); i++) {
+            WriteRequest writeRequest = writeRequests.get(i);
+            writeRequestsAreRetryable = writeRequestsAreRetryable && isRetryable(writeRequest);
+            writeRequestsWithIndex.add(new WriteRequestWithIndex(writeRequest, i));
+        }
+        if (canRetryWrites && !writeRequestsAreRetryable) {
+            canRetryWrites = false;
+            LOGGER.debug("retryWrites set but one or more writeRequests do not support retryable writes");
+        }
+        return new BulkWriteBatch(namespace, connectionDescription, ordered, writeConcern, bypassDocumentValidation,
+                canRetryWrites, new BulkWriteBatchCombiner(connectionDescription.getServerAddress(), ordered, writeConcern),
+                writeRequestsWithIndex, sessionContext);
+    }
+
+    private BulkWriteBatch(final MongoNamespace namespace, final ConnectionDescription connectionDescription,
+                           final boolean ordered, final WriteConcern writeConcern, final Boolean bypassDocumentValidation,
+                           final boolean retryWrites, final BulkWriteBatchCombiner bulkWriteBatchCombiner,
+                           final List<WriteRequestWithIndex> writeRequestsWithIndices, final SessionContext sessionContext) {
+        this.namespace = namespace;
+        this.connectionDescription = connectionDescription;
+        this.ordered = ordered;
+        this.writeConcern = writeConcern;
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        this.bulkWriteBatchCombiner = bulkWriteBatchCombiner;
+        this.batchType = writeRequestsWithIndices.isEmpty() ? INSERT : writeRequestsWithIndices.get(0).writeRequest.getType();
+        this.retryWrites = retryWrites;
+
+        List<BsonDocument> payloadItems = new ArrayList<BsonDocument>();
+        List<WriteRequestWithIndex> unprocessedItems = new ArrayList<WriteRequestWithIndex>();
+
+        IndexMap indexMap = IndexMap.create();
+        for (int i = 0; i < writeRequestsWithIndices.size(); i++) {
+            WriteRequestWithIndex writeRequestWithIndex = writeRequestsWithIndices.get(i);
+            if (writeRequestWithIndex.getType() != batchType) {
+                if (ordered) {
+                    unprocessedItems.addAll(writeRequestsWithIndices.subList(i, writeRequestsWithIndices.size()));
+                    break;
+                } else {
+                    unprocessedItems.add(writeRequestWithIndex);
+                    continue;
+                }
+            }
+
+            indexMap = indexMap.add(payloadItems.size(), writeRequestWithIndex.index);
+            payloadItems.add(new BsonDocumentWrapper<WriteRequest>(writeRequestWithIndex.writeRequest, WRITE_REQUEST_ENCODER));
+        }
+
+        this.indexMap = indexMap;
+        this.unprocessed = unprocessedItems;
+        this.payload = new SplittablePayload(getPayloadType(batchType), payloadItems);
+        this.sessionContext = sessionContext;
+        this.command = new BsonDocument();
+
+        if (!payloadItems.isEmpty()) {
+            command.put(getCommandName(batchType), new BsonString(namespace.getCollectionName()));
+            command.put("ordered", new BsonBoolean(ordered));
+            if (!writeConcern.isServerDefault() && !sessionContext.hasActiveTransaction()) {
+                command.put("writeConcern", writeConcern.asDocument());
+            }
+            if (bypassDocumentValidation != null) {
+                command.put("bypassDocumentValidation", new BsonBoolean(bypassDocumentValidation));
+            }
+            if (retryWrites) {
+                command.put("txnNumber", new BsonInt64(sessionContext.advanceTransactionNumber()));
+            }
+        }
+    }
+
+    private BulkWriteBatch(final MongoNamespace namespace, final ConnectionDescription connectionDescription,
+                           final boolean ordered, final WriteConcern writeConcern, final Boolean bypassDocumentValidation,
+                           final boolean retryWrites, final BulkWriteBatchCombiner bulkWriteBatchCombiner, final IndexMap indexMap,
+                           final WriteRequest.Type batchType, final BsonDocument command, final SplittablePayload payload,
+                           final List<WriteRequestWithIndex> unprocessed, final SessionContext sessionContext) {
+        this.namespace = namespace;
+        this.connectionDescription = connectionDescription;
+        this.ordered = ordered;
+        this.writeConcern = writeConcern;
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        this.bulkWriteBatchCombiner = bulkWriteBatchCombiner;
+        this.indexMap = indexMap;
+        this.batchType = batchType;
+        this.payload = payload;
+        this.unprocessed = unprocessed;
+        this.retryWrites = retryWrites;
+        this.sessionContext = sessionContext;
+        if (retryWrites) {
+            command.put("txnNumber", new BsonInt64(sessionContext.advanceTransactionNumber()));
+        }
+        this.command = command;
+    }
+
+    public void addResult(final BsonDocument result) {
+        if (writeConcern.isAcknowledged()) {
+            if (hasError(result)) {
+                MongoBulkWriteException bulkWriteException = getBulkWriteException(result);
+                bulkWriteBatchCombiner.addErrorResult(bulkWriteException, indexMap);
+            } else {
+                bulkWriteBatchCombiner.addResult(getBulkWriteResult(result), indexMap);
+            }
+        }
+    }
+
+    public boolean getRetryWrites() {
+        return retryWrites;
+    }
+
+    public BsonDocument getCommand() {
+        return command;
+    }
+
+    public SplittablePayload getPayload() {
+        return payload;
+    }
+
+    public Decoder<BsonDocument> getDecoder() {
+        return DECODER;
+    }
+
+    public BulkWriteResult getResult() {
+        return bulkWriteBatchCombiner.getResult();
+    }
+
+    public boolean hasErrors() {
+        return bulkWriteBatchCombiner.hasErrors();
+    }
+
+    public MongoBulkWriteException getError() {
+        return bulkWriteBatchCombiner.getError();
+    }
+
+    public boolean shouldProcessBatch() {
+        return !bulkWriteBatchCombiner.shouldStopSendingMoreBatches() && !payload.isEmpty();
+    }
+
+    public boolean hasAnotherBatch() {
+        return !unprocessed.isEmpty();
+    }
+
+    public BulkWriteBatch getNextBatch() {
+        if (payload.hasAnotherSplit()) {
+            IndexMap nextIndexMap = IndexMap.create();
+            int newIndex = 0;
+            for (int i = payload.getPosition(); i < payload.getPayload().size(); i++) {
+                nextIndexMap = nextIndexMap.add(newIndex, indexMap.map(i));
+                newIndex++;
+            }
+
+
+            return new BulkWriteBatch(namespace, connectionDescription, ordered, writeConcern, bypassDocumentValidation, retryWrites,
+                    bulkWriteBatchCombiner, nextIndexMap, batchType, command, payload.getNextSplit(), unprocessed, sessionContext);
+        } else {
+            return new BulkWriteBatch(namespace, connectionDescription, ordered, writeConcern, bypassDocumentValidation, retryWrites,
+                    bulkWriteBatchCombiner, unprocessed, sessionContext);
+        }
+    }
+
+    public FieldNameValidator getFieldNameValidator() {
+        if (batchType == INSERT) {
+            return new CollectibleDocumentFieldNameValidator();
+        } else if (batchType == UPDATE || batchType == REPLACE) {
+            Map<String, FieldNameValidator> rootMap = new HashMap<String, FieldNameValidator>();
+            if (batchType == WriteRequest.Type.REPLACE) {
+                rootMap.put("u", new CollectibleDocumentFieldNameValidator());
+            } else {
+                rootMap.put("u", new UpdateFieldNameValidator());
+            }
+            return new MappedFieldNameValidator(NO_OP_FIELD_NAME_VALIDATOR, rootMap);
+        } else {
+            return NO_OP_FIELD_NAME_VALIDATOR;
+        }
+    }
+
+    private BulkWriteResult getBulkWriteResult(final BsonDocument result) {
+        int count = result.getNumber("n").intValue();
+        List<BulkWriteUpsert> upsertedItems = getUpsertedItems(result);
+        return BulkWriteResult.acknowledged(batchType, count - upsertedItems.size(), getModifiedCount(result), upsertedItems);
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<BulkWriteUpsert> getUpsertedItems(final BsonDocument result) {
+        BsonArray upsertedValue = result.getArray("upserted", new BsonArray());
+        List<BulkWriteUpsert> bulkWriteUpsertList = new ArrayList<BulkWriteUpsert>();
+        for (BsonValue upsertedItem : upsertedValue) {
+            BsonDocument upsertedItemDocument = (BsonDocument) upsertedItem;
+            bulkWriteUpsertList.add(new BulkWriteUpsert(upsertedItemDocument.getNumber("index").intValue(),
+                    upsertedItemDocument.get("_id")));
+        }
+        return bulkWriteUpsertList;
+    }
+
+    private Integer getModifiedCount(final BsonDocument result) {
+        return result.getNumber("nModified", new BsonInt32(0)).intValue();
+    }
+
+    private boolean hasError(final BsonDocument result) {
+        return result.get("writeErrors") != null || result.get("writeConcernError") != null;
+    }
+
+    private MongoBulkWriteException getBulkWriteException(final BsonDocument result) {
+        if (!hasError(result)) {
+            throw new MongoInternalException("This method should not have been called");
+        }
+        return new MongoBulkWriteException(getBulkWriteResult(result), getWriteErrors(result), getWriteConcernError(result),
+                connectionDescription.getServerAddress());
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<BulkWriteError> getWriteErrors(final BsonDocument result) {
+        List<BulkWriteError> writeErrors = new ArrayList<BulkWriteError>();
+        BsonArray writeErrorsDocuments = (BsonArray) result.get("writeErrors");
+        if (writeErrorsDocuments != null) {
+            for (BsonValue cur : writeErrorsDocuments) {
+                BsonDocument curDocument = (BsonDocument) cur;
+                writeErrors.add(new BulkWriteError(curDocument.getNumber("code").intValue(),
+                        curDocument.getString("errmsg").getValue(),
+                        curDocument.getDocument("errInfo", new BsonDocument()),
+                        curDocument.getNumber("index").intValue()));
+            }
+        }
+        return writeErrors;
+    }
+
+    private WriteConcernError getWriteConcernError(final BsonDocument result) {
+        BsonDocument writeConcernErrorDocument = (BsonDocument) result.get("writeConcernError");
+        if (writeConcernErrorDocument == null) {
+            return null;
+        } else {
+            return createWriteConcernError(writeConcernErrorDocument);
+        }
+    }
+
+    private String getCommandName(final WriteRequest.Type batchType) {
+        if (batchType == INSERT) {
+            return "insert";
+        } else if (batchType == UPDATE || batchType == REPLACE) {
+            return "update";
+        } else {
+            return "delete";
+        }
+    }
+
+    private SplittablePayload.Type getPayloadType(final WriteRequest.Type batchType) {
+        if (batchType == WriteRequest.Type.INSERT) {
+            return SplittablePayload.Type.INSERT;
+        } else if (batchType == WriteRequest.Type.UPDATE) {
+            return SplittablePayload.Type.UPDATE;
+        } else if (batchType == WriteRequest.Type.REPLACE) {
+            return SplittablePayload.Type.REPLACE;
+        } else {
+            return SplittablePayload.Type.DELETE;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Codec<BsonDocument> getCodec(final BsonDocument document) {
+        return (Codec<BsonDocument>) REGISTRY.get(document.getClass());
+    }
+
+    private static boolean isRetryable(final WriteRequest writeRequest) {
+        if (writeRequest.getType() == UPDATE || writeRequest.getType() == REPLACE) {
+            return !((UpdateRequest) writeRequest).isMulti();
+        } else if (writeRequest.getType() == DELETE) {
+            return !((DeleteRequest) writeRequest).isMulti();
+        }
+        return true;
+    }
+
+    static class WriteRequestEncoder implements Encoder<WriteRequest> {
+
+        WriteRequestEncoder() {
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public void encode(final BsonWriter writer, final WriteRequest writeRequest, final EncoderContext encoderContext) {
+            if (writeRequest.getType() == INSERT) {
+                BsonDocument document = ((InsertRequest) writeRequest).getDocument();
+                getCodec(document).encode(writer, document, EncoderContext.builder().isEncodingCollectibleDocument(true).build());
+            } else if (writeRequest.getType() == UPDATE || writeRequest.getType() == REPLACE) {
+                UpdateRequest update = (UpdateRequest) writeRequest;
+                writer.writeStartDocument();
+                writer.writeName("q");
+                getCodec(update.getFilter()).encode(writer, update.getFilter(), EncoderContext.builder().build());
+
+                BsonValue updateValue = update.getUpdateValue();
+                if (!updateValue.isDocument() && !updateValue.isArray()) {
+                    throw new IllegalArgumentException("Invalid BSON value for an update.");
+                }
+                if (updateValue.isArray() && updateValue.asArray().isEmpty()) {
+                    throw new IllegalArgumentException("Invalid pipeline for an update. The pipeline may not be empty.");
+                }
+
+                writer.writeName("u");
+                if (updateValue.isDocument()) {
+                    FieldTrackingBsonWriter fieldTrackingBsonWriter = new FieldTrackingBsonWriter(writer);
+                    getCodec(updateValue.asDocument()).encode(fieldTrackingBsonWriter, updateValue.asDocument(),
+                            EncoderContext.builder().build());
+                    if (writeRequest.getType() == UPDATE && !fieldTrackingBsonWriter.hasWrittenField()) {
+                        throw new IllegalArgumentException("Invalid BSON document for an update. The document may not be empty.");
+                    }
+                } else if (update.getType() == WriteRequest.Type.UPDATE && updateValue.isArray()) {
+                    writer.writeStartArray();
+                    for (BsonValue cur : updateValue.asArray()) {
+                        getCodec(cur.asDocument()).encode(writer, cur.asDocument(), EncoderContext.builder().build());
+                    }
+                    writer.writeEndArray();
+                }
+
+                if (update.isMulti()) {
+                    writer.writeBoolean("multi", update.isMulti());
+                }
+                if (update.isUpsert()) {
+                    writer.writeBoolean("upsert", update.isUpsert());
+                }
+                if (update.getCollation() != null) {
+                    writer.writeName("collation");
+                    BsonDocument collation = update.getCollation().asDocument();
+                    getCodec(collation).encode(writer, collation, EncoderContext.builder().build());
+                }
+                if (update.getArrayFilters() != null) {
+                    writer.writeStartArray("arrayFilters");
+                    for (BsonDocument cur: update.getArrayFilters()) {
+                        getCodec(cur).encode(writer, cur, EncoderContext.builder().build());
+                    }
+                    writer.writeEndArray();
+                }
+                writer.writeEndDocument();
+            } else {
+                DeleteRequest deleteRequest = (DeleteRequest) writeRequest;
+                writer.writeStartDocument();
+                writer.writeName("q");
+                getCodec(deleteRequest.getFilter()).encode(writer, deleteRequest.getFilter(), EncoderContext.builder().build());
+                writer.writeInt32("limit", deleteRequest.isMulti() ? 0 : 1);
+                if (deleteRequest.getCollation() != null) {
+                    writer.writeName("collation");
+                    BsonDocument collation = deleteRequest.getCollation().asDocument();
+                    getCodec(collation).encode(writer, collation, EncoderContext.builder().build());
+                }
+                writer.writeEndDocument();
+            }
+        }
+
+        @Override
+        public Class<WriteRequest> getEncoderClass() {
+            return WriteRequest.class;
+        }
+    }
+
+    static class WriteRequestWithIndex {
+        private final int index;
+        private final WriteRequest writeRequest;
+
+        WriteRequestWithIndex(final WriteRequest writeRequest, final int index) {
+            this.writeRequest = writeRequest;
+            this.index = index;
+        }
+
+        WriteRequest.Type getType() {
+            return writeRequest.getType();
+        }
+    }
+
+}
diff --git a/driver-core/src/main/com/mongodb/operation/ChangeStreamBatchCursor.java b/driver-core/src/main/com/mongodb/operation/ChangeStreamBatchCursor.java
new file mode 100644
index 00000000000..3f553893b71
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/ChangeStreamBatchCursor.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.Function;
+import com.mongodb.MongoChangeStreamException;
+import com.mongodb.MongoException;
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
+import com.mongodb.binding.ConnectionSource;
+import com.mongodb.binding.ReadBinding;
+import com.mongodb.operation.OperationHelper.CallableWithSource;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+import org.bson.RawBsonDocument;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.operation.ChangeStreamBatchCursorHelper.isRetryableError;
+import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
+
+final class ChangeStreamBatchCursor<T> implements AggregateResponseBatchCursor<T> {
+    private final ReadBinding binding;
+    private final ChangeStreamOperation<T> changeStreamOperation;
+
+    private AggregateResponseBatchCursor<RawBsonDocument> wrapped;
+    private BsonDocument resumeToken;
+    private volatile boolean closed;
+
+    ChangeStreamBatchCursor(final ChangeStreamOperation<T> changeStreamOperation,
+                            final AggregateResponseBatchCursor<RawBsonDocument> wrapped,
+                            final ReadBinding binding,
+                            final BsonDocument resumeToken) {
+        this.changeStreamOperation = changeStreamOperation;
+        this.binding = binding.retain();
+        this.wrapped = wrapped;
+        this.resumeToken = resumeToken;
+    }
+
+    AggregateResponseBatchCursor<RawBsonDocument> getWrapped() {
+        return wrapped;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return resumeableOperation(new Function<AggregateResponseBatchCursor<RawBsonDocument>, Boolean>() {
+            @Override
+            public Boolean apply(final AggregateResponseBatchCursor<RawBsonDocument> queryBatchCursor) {
+                return queryBatchCursor.hasNext();
+            }
+        });
+    }
+
+    @Override
+    public List<T> next() {
+        return resumeableOperation(new Function<AggregateResponseBatchCursor<RawBsonDocument>, List<T>>() {
+            @Override
+            public List<T> apply(final AggregateResponseBatchCursor<RawBsonDocument> queryBatchCursor) {
+                List<T> results = convertResults(queryBatchCursor.next());
+                cachePostBatchResumeToken(queryBatchCursor);
+                return results;
+            }
+        });
+    }
+
+    @Override
+    public List<T> tryNext() {
+        return resumeableOperation(new Function<AggregateResponseBatchCursor<RawBsonDocument>, List<T>>() {
+            @Override
+            public List<T> apply(final AggregateResponseBatchCursor<RawBsonDocument> queryBatchCursor) {
+                List<T> results = convertResults(queryBatchCursor.tryNext());
+                cachePostBatchResumeToken(queryBatchCursor);
+                return results;
+            }
+        });
+    }
+
+    @Override
+    public void close() {
+        if (!closed) {
+            closed = true;
+            wrapped.close();
+            binding.release();
+        }
+    }
+
+    @Override
+    public void setBatchSize(final int batchSize) {
+        wrapped.setBatchSize(batchSize);
+    }
+
+    @Override
+    public int getBatchSize() {
+        return wrapped.getBatchSize();
+    }
+
+    @Override
+    public ServerCursor getServerCursor() {
+        return wrapped.getServerCursor();
+    }
+
+    @Override
+    public ServerAddress getServerAddress() {
+        return wrapped.getServerAddress();
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("Not implemented!");
+    }
+
+    @Override
+    public BsonDocument getPostBatchResumeToken() {
+        return wrapped.getPostBatchResumeToken();
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return changeStreamOperation.getStartAtOperationTime();
+    }
+
+    @Override
+    public boolean isFirstBatchEmpty() {
+        return wrapped.isFirstBatchEmpty();
+    }
+
+    private void cachePostBatchResumeToken(final AggregateResponseBatchCursor<RawBsonDocument> queryBatchCursor) {
+        if (queryBatchCursor.getPostBatchResumeToken() != null) {
+            resumeToken = queryBatchCursor.getPostBatchResumeToken();
+        }
+    }
+
+    private List<T> convertResults(final List<RawBsonDocument> rawDocuments) {
+        List<T> results = null;
+        if (rawDocuments != null) {
+            results = new ArrayList<T>();
+            for (RawBsonDocument rawDocument : rawDocuments) {
+                if (!rawDocument.containsKey("_id")) {
+                    throw new MongoChangeStreamException("Cannot provide resume functionality when the resume token is missing.");
+                }
+                results.add(rawDocument.decode(changeStreamOperation.getDecoder()));
+            }
+            resumeToken = rawDocuments.get(rawDocuments.size() - 1).getDocument("_id");
+        }
+        return results;
+    }
+
+    <R> R resumeableOperation(final Function<AggregateResponseBatchCursor<RawBsonDocument>, R> function) {
+        while (true) {
+            try {
+                return function.apply(wrapped);
+            } catch (Throwable t) {
+                if (!isRetryableError(t)) {
+                    throw MongoException.fromThrowableNonNull(t);
+                }
+            }
+            wrapped.close();
+
+            withReadConnectionSource(binding, new CallableWithSource<Void>() {
+                @Override
+                public Void call(final ConnectionSource source) {
+                    changeStreamOperation.setChangeStreamOptionsForResume(resumeToken, source.getServerDescription().getMaxWireVersion());
+                    return null;
+                }
+            });
+            wrapped = ((ChangeStreamBatchCursor<T>) changeStreamOperation.execute(binding)).getWrapped();
+            binding.release(); // release the new change stream batch cursor's reference to the binding
+        }
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/ChangeStreamBatchCursorHelper.java b/driver-core/src/main/com/mongodb/operation/ChangeStreamBatchCursorHelper.java
new file mode 100644
index 00000000000..2e238e37b85
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/ChangeStreamBatchCursorHelper.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoChangeStreamException;
+import com.mongodb.MongoCursorNotFoundException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInterruptedException;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.MongoSocketException;
+
+import java.util.Collections;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+final class ChangeStreamBatchCursorHelper {
+    private static final List<Integer> UNRETRYABLE_SERVER_ERROR_CODES = asList(136, 237, 280, 11601);
+    private static final List<String> NONRESUMABLE_CHANGE_STREAM_ERROR_LABELS = asList("NonResumableChangeStreamError");
+
+    static boolean isRetryableError(final Throwable t) {
+        if (!(t instanceof MongoException) || t instanceof MongoChangeStreamException || t instanceof MongoInterruptedException) {
+            return false;
+        } else if (t instanceof MongoNotPrimaryException || t instanceof MongoCursorNotFoundException
+                || t instanceof MongoSocketException) {
+            return true;
+        } else {
+            return !UNRETRYABLE_SERVER_ERROR_CODES.contains(((MongoException) t).getCode())
+                    && Collections.disjoint(NONRESUMABLE_CHANGE_STREAM_ERROR_LABELS, ((MongoException) t).getErrorLabels());
+        }
+    }
+
+    private ChangeStreamBatchCursorHelper(){
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/ChangeStreamOperation.java b/driver-core/src/main/com/mongodb/operation/ChangeStreamOperation.java
new file mode 100644
index 00000000000..8c96dbf7fe9
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/ChangeStreamOperation.java
@@ -0,0 +1,446 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.async.AsyncAggregateResponseBatchCursor;
+import com.mongodb.async.AsyncBatchCursor;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
+import com.mongodb.binding.AsyncReadBinding;
+import com.mongodb.binding.ConnectionSource;
+import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.operation.OperationHelper.AsyncCallableWithSource;
+import com.mongodb.operation.OperationHelper.CallableWithSource;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+import org.bson.BsonTimestamp;
+import org.bson.BsonValue;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.Decoder;
+import org.bson.codecs.RawBsonDocumentCodec;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
+import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
+
+/**
+ * An operation that executes an {@code $changeStream} aggregation.
+ *
+ * @param <T> the operations result type.
+ * @mongodb.driver.manual aggregation/ Aggregation
+ * @mongodb.server.release 2.6
+ * @since 3.6
+ */
+@Deprecated
+public class ChangeStreamOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
+    private static final RawBsonDocumentCodec RAW_BSON_DOCUMENT_CODEC = new RawBsonDocumentCodec();
+    private final AggregateOperationImpl<RawBsonDocument> wrapped;
+    private final FullDocument fullDocument;
+    private final Decoder<T> decoder;
+    private final ChangeStreamLevel changeStreamLevel;
+
+    private BsonDocument resumeAfter;
+    private BsonDocument startAfter;
+    private BsonTimestamp startAtOperationTime;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace    the database and collection namespace for the operation.
+     * @param fullDocument the fullDocument value
+     * @param pipeline     the aggregation pipeline.
+     * @param decoder      the decoder for the result documents.
+     */
+    public ChangeStreamOperation(final MongoNamespace namespace, final FullDocument fullDocument, final List<BsonDocument> pipeline,
+                                 final Decoder<T> decoder) {
+        this(namespace, fullDocument, pipeline, decoder, ChangeStreamLevel.COLLECTION);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace         the database and collection namespace for the operation.
+     * @param fullDocument      the fullDocument value
+     * @param pipeline          the aggregation pipeline.
+     * @param decoder           the decoder for the result documents.
+     * @param changeStreamLevel the level at which the change stream is observing
+     *
+     * @since 3.8
+     */
+    public ChangeStreamOperation(final MongoNamespace namespace, final FullDocument fullDocument, final List<BsonDocument> pipeline,
+                                 final Decoder<T> decoder, final ChangeStreamLevel changeStreamLevel) {
+        this.wrapped = new AggregateOperationImpl<RawBsonDocument>(namespace, pipeline, RAW_BSON_DOCUMENT_CODEC,
+                getAggregateTarget(), getPipelineCreator());
+        this.fullDocument = notNull("fullDocument", fullDocument);
+        this.decoder = notNull("decoder", decoder);
+        this.changeStreamLevel = notNull("changeStreamLevel", changeStreamLevel);
+    }
+
+    /**
+     * @return the namespace for this operation
+     */
+    public MongoNamespace getNamespace() {
+        return wrapped.getNamespace();
+    }
+
+    /**
+     * @return the decoder for this operation
+     */
+    public Decoder<T> getDecoder() {
+        return decoder;
+    }
+
+    /**
+     * Returns the fullDocument value, in 3.6
+     *
+     * @return the fullDocument value
+     */
+    public FullDocument getFullDocument() {
+        return fullDocument;
+    }
+
+    /**
+     * Returns the logical starting point for the new change stream.
+     *
+     * <p>A null value represents the server default.</p>
+     *
+     * @return the resumeAfter
+     * @deprecated use {@link #getResumeAfter()} instead
+     */
+    @Deprecated
+    public BsonDocument getResumeToken() {
+        return resumeAfter;
+    }
+
+    /**
+     * Returns the logical starting point for the new change stream.
+     *
+     * <p>A null value represents the server default.</p>
+     *
+     * @return the resumeAfter resumeToken
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    public BsonDocument getResumeAfter() {
+        return resumeAfter;
+    }
+
+    /**
+     * Sets the logical starting point for the new change stream.
+     *
+     * @param resumeAfter the resumeToken
+     * @return this
+     */
+    public ChangeStreamOperation<T> resumeAfter(final BsonDocument resumeAfter) {
+        this.resumeAfter = resumeAfter;
+        return this;
+    }
+
+    /**
+     * Returns the logical starting point for the new change stream returning the first notification after the token.
+     *
+     * <p>A null value represents the server default.</p>
+     *
+     * @return the startAfter resumeToken
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    public BsonDocument getStartAfter() {
+        return startAfter;
+    }
+
+    /**
+     * Similar to {@code resumeAfter}, this option takes a resume token and starts a
+     * new change stream returning the first notification after the token.
+     *
+     * <p>This will allow users to watch collections that have been dropped and recreated
+     * or newly renamed collections without missing any notifications.</p>
+     *
+     * <p>Note: The server will report an error if both {@code startAfter} and {@code resumeAfter} are specified.</p>
+     *
+     * @param startAfter the startAfter resumeToken
+     * @return this
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual changeStreams/#change-stream-start-after
+     */
+    public ChangeStreamOperation<T> startAfter(final BsonDocument startAfter) {
+        this.startAfter = startAfter;
+        return this;
+    }
+
+    /**
+     * Gets the aggregation pipeline.
+     *
+     * @return the pipeline
+     * @mongodb.driver.manual core/aggregation-introduction/#aggregation-pipelines Aggregation Pipeline
+     */
+    public List<BsonDocument> getPipeline() {
+        return wrapped.getPipeline();
+    }
+
+    /**
+     * Gets the number of documents to return per batch.  Default to 0, which indicates that the server chooses an appropriate batch size.
+     *
+     * @return the batch size, which may be null
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    public Integer getBatchSize() {
+        return wrapped.getBatchSize();
+    }
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    public ChangeStreamOperation<T> batchSize(final Integer batchSize) {
+        wrapped.batchSize(batchSize);
+        return this;
+    }
+
+    /**
+     * The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor
+     * query. This only applies to a TAILABLE_AWAIT cursor. When the cursor is not a TAILABLE_AWAIT cursor,
+     * this option is ignored.
+     *
+     * A zero value will be ignored.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum await execution time in the given time unit
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public long getMaxAwaitTime(final TimeUnit timeUnit) {
+        return wrapped.getMaxAwaitTime(timeUnit);
+    }
+
+    /**
+     * Sets the maximum await execution time on the server for this operation.
+     *
+     * @param maxAwaitTime the max await time.  A value less than one will be ignored, and indicates that the driver should respect the
+     *                     server's default value
+     * @param timeUnit     the time unit, which may not be null
+     * @return this
+     */
+    public ChangeStreamOperation<T> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        wrapped.maxAwaitTime(maxAwaitTime, timeUnit);
+        return this;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     */
+    public Collation getCollation() {
+        return wrapped.getCollation();
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     *
+     * @param collation the collation options to use
+     * @return this
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     */
+    public ChangeStreamOperation<T> collation(final Collation collation) {
+        wrapped.collation(collation);
+        return this;
+    }
+
+    /**
+     * The change stream will only provides changes that occurred after the specified timestamp.
+     *
+     * <p>Any command run against the server will return an operation time that can be used here.</p>
+     * <p>The default value is an operation time obtained from the server before the change stream was created.</p>
+     *
+     * @param startAtOperationTime the start at operation time
+     * @return this
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.manual reference/method/db.runCommand/
+     */
+    public ChangeStreamOperation<T> startAtOperationTime(final BsonTimestamp startAtOperationTime) {
+        this.startAtOperationTime = startAtOperationTime;
+        return this;
+    }
+
+    /**
+     * Returns the start at operation time
+     *
+     * @return the start at operation time
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    public BsonTimestamp getStartAtOperationTime() {
+        return startAtOperationTime;
+    }
+
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @mongodb.driver.manual reference/method/db.collection.find/ Filter
+     * @since 3.11
+     */
+    public ChangeStreamOperation<T> retryReads(final boolean retryReads) {
+        wrapped.retryReads(retryReads);
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return wrapped.getRetryReads();
+    }
+
+    @Override
+    public BatchCursor<T> execute(final ReadBinding binding) {
+        return withReadConnectionSource(binding, new CallableWithSource<BatchCursor<T>>() {
+            @Override
+            public BatchCursor<T> call(final ConnectionSource source) {
+                AggregateResponseBatchCursor<RawBsonDocument> cursor =
+                        (AggregateResponseBatchCursor<RawBsonDocument>) wrapped.execute(binding);
+                return new ChangeStreamBatchCursor<T>(ChangeStreamOperation.this, cursor, binding,
+                        setChangeStreamOptions(cursor.getPostBatchResumeToken(), cursor.getOperationTime(),
+                                source.getServerDescription().getMaxWireVersion(), cursor.isFirstBatchEmpty()));
+            }
+        });
+    }
+
+    @Override
+    public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
+        wrapped.executeAsync(binding, new SingleResultCallback<AsyncBatchCursor<RawBsonDocument>>() {
+            @Override
+            public void onResult(final AsyncBatchCursor<RawBsonDocument> result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    final AsyncAggregateResponseBatchCursor<RawBsonDocument> cursor =
+                            (AsyncAggregateResponseBatchCursor<RawBsonDocument>) result;
+                    withAsyncReadConnection(binding, new AsyncCallableWithSource() {
+                        @Override
+                        public void call(final AsyncConnectionSource source, final Throwable t) {
+                            if (t != null) {
+                                callback.onResult(null, t);
+                            } else {
+                                callback.onResult(new AsyncChangeStreamBatchCursor<T>(ChangeStreamOperation.this, cursor, binding,
+                                        setChangeStreamOptions(cursor.getPostBatchResumeToken(), cursor.getOperationTime(),
+                                                source.getServerDescription().getMaxWireVersion(), cursor.isFirstBatchEmpty())), null);
+                            }
+                            source.release();
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    private BsonDocument setChangeStreamOptions(final BsonDocument postBatchResumeToken, final BsonTimestamp operationTime,
+                                                final int maxWireVersion, final boolean firstBatchEmpty) {
+        BsonDocument resumeToken = null;
+        if (startAfter != null) {
+            resumeToken = startAfter;
+        } else if (resumeAfter != null) {
+            resumeToken = resumeAfter;
+        } else if (startAtOperationTime == null && postBatchResumeToken == null && firstBatchEmpty && maxWireVersion >= 7) {
+            startAtOperationTime = operationTime;
+        }
+        return resumeToken;
+    }
+
+    /**
+     * Set the change stream operation options for a resumeable operation.
+     *
+     * @param resumeToken the resume token cached prior to resume
+     * @param maxWireVersion the max wire version reported by the server description
+     * @since 3.11
+     */
+    public void setChangeStreamOptionsForResume(final BsonDocument resumeToken, final int maxWireVersion) {
+        startAfter = null;
+        if (resumeToken != null) {
+            startAtOperationTime = null;
+            resumeAfter = resumeToken;
+        } else if (startAtOperationTime != null && maxWireVersion >= 7) {
+            resumeAfter = null;
+        } else {
+            resumeAfter = null;
+            startAtOperationTime = null;
+        }
+    }
+
+    private AggregateOperationImpl.AggregateTarget getAggregateTarget() {
+        return new AggregateOperationImpl.AggregateTarget() {
+            @Override
+            public BsonValue create() {
+                return changeStreamLevel == ChangeStreamLevel.COLLECTION
+                        ? new BsonString(getNamespace().getCollectionName()) : new BsonInt32(1);
+            }
+        };
+    }
+
+    private AggregateOperationImpl.PipelineCreator getPipelineCreator() {
+        return new AggregateOperationImpl.PipelineCreator() {
+            @Override
+            public BsonArray create(final ConnectionDescription description, final SessionContext sessionContext) {
+                List<BsonDocument> changeStreamPipeline = new ArrayList<BsonDocument>();
+                BsonDocument changeStream = new BsonDocument("fullDocument", new BsonString(fullDocument.getValue()));
+
+                if (changeStreamLevel == ChangeStreamLevel.CLIENT) {
+                    changeStream.append("allChangesForCluster", BsonBoolean.TRUE);
+                }
+
+                if (resumeAfter != null) {
+                    changeStream.append("resumeAfter", resumeAfter);
+                }
+                if (startAfter != null) {
+                    changeStream.append("startAfter", startAfter);
+                }
+                if (startAtOperationTime != null) {
+                    changeStream.append("startAtOperationTime", startAtOperationTime);
+                }
+
+                changeStreamPipeline.add(new BsonDocument("$changeStream", changeStream));
+                changeStreamPipeline.addAll(getPipeline());
+                return new BsonArray(changeStreamPipeline);
+            }
+        };
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java b/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java
index a2065e3dcce..4146acfe61a 100644
--- a/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,15 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.Function;
+import com.mongodb.MongoClientException;
 import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNodeIsRecoveringException;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.MongoWriteConcernException;
 import com.mongodb.ReadPreference;
-import com.mongodb.ServerAddress;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncReadBinding;
@@ -29,22 +35,71 @@
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.operation.WriteConcernHelper;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.lang.Nullable;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonDocument;
 import org.bson.FieldNameValidator;
 import org.bson.codecs.BsonDocumentCodec;
 import org.bson.codecs.Decoder;
 
+import java.util.List;
+
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.connection.ServerType.SHARD_ROUTER;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
+import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import static com.mongodb.operation.OperationHelper.CallableWithSource;
 import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.canRetryRead;
+import static com.mongodb.operation.OperationHelper.canRetryWrite;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
+import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
+import static com.mongodb.operation.OperationHelper.withReleasableConnection;
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
 
 final class CommandOperationHelper {
 
-    interface CommandTransformer<T, R> {
+    interface CommandReadTransformer<T, R> {
+
+        /**
+         * Yield an appropriate result object for the input object.
+         *
+         * @param t the input object
+         * @return the function result
+         */
+        R apply(T t, ConnectionSource source, Connection connection);
+    }
+
+    interface CommandWriteTransformer<T, R> {
+
+        /**
+         * Yield an appropriate result object for the input object.
+         *
+         * @param t the input object
+         * @return the function result
+         */
+        R apply(T t, Connection connection);
+    }
+
+    interface CommandWriteTransformerAsync<T, R> {
+
+        /**
+         * Yield an appropriate result object for the input object.
+         *
+         * @param t the input object
+         * @return the function result
+         */
+        R apply(T t, AsyncConnection connection);
+    }
+
+    interface CommandReadTransformerAsync<T, R> {
 
         /**
          * Yield an appropriate result object for the input object.
@@ -52,327 +107,578 @@ interface CommandTransformer<T, R> {
          * @param t the input object
          * @return the function result
          */
-        R apply(T t, ServerAddress serverAddress);
+        R apply(T t, AsyncConnectionSource source, AsyncConnection connection);
     }
 
-    static class IdentityTransformer<T> implements CommandTransformer<T, T> {
+    static class IdentityReadTransformer<T> implements CommandReadTransformer<T, T> {
         @Override
-        public T apply(final T t, final ServerAddress serverAddress) {
+        public T apply(final T t, final ConnectionSource source, final Connection connection) {
             return t;
         }
     }
 
-    static class VoidTransformer<T> implements CommandTransformer<T, Void> {
+    static class IdentityWriteTransformer<T> implements CommandWriteTransformer<T, T> {
         @Override
-        public Void apply(final T t, final ServerAddress serverAddress) {
-            return null;
+        public T apply(final T t, final Connection connection) {
+            return t;
         }
     }
 
-    /* Read Binding Helpers */
+    static class IdentityWriteTransformerAsync<T> implements CommandWriteTransformerAsync<T, T> {
+        @Override
+        public T apply(final T t, final AsyncConnection connection) {
+            return t;
+        }
+    }
 
-    static BsonDocument executeWrappedCommandProtocol(final ReadBinding binding, final String database, final BsonDocument command) {
-        return executeWrappedCommandProtocol(binding, database, command, new BsonDocumentCodec());
+    static class IdentityTransformerAsync<T> implements CommandReadTransformerAsync<T, T> {
+        @Override
+        public T apply(final T t, final AsyncConnectionSource source, final AsyncConnection connection) {
+            return t;
+        }
     }
 
-    static <T> T executeWrappedCommandProtocol(final ReadBinding binding, final String database, final BsonDocument command,
-                                               final CommandTransformer<BsonDocument, T> transformer) {
-        return executeWrappedCommandProtocol(binding, database, command, new BsonDocumentCodec(), transformer);
+    static CommandWriteTransformer<BsonDocument, Void> writeConcernErrorTransformer() {
+        return new CommandWriteTransformer<BsonDocument, Void>() {
+            @Override
+            public Void apply(final BsonDocument result, final Connection connection) {
+                WriteConcernHelper.throwOnWriteConcernError(result, connection.getDescription().getServerAddress());
+                return null;
+            }
+        };
     }
 
-    static <T> T executeWrappedCommandProtocol(final ReadBinding binding, final String database, final BsonDocument command,
-                                               final Decoder<T> decoder) {
-        return executeWrappedCommandProtocol(binding, database, command, decoder, new IdentityTransformer<T>());
+    static CommandWriteTransformerAsync<BsonDocument, Void> writeConcernErrorWriteTransformer() {
+        return new CommandWriteTransformerAsync<BsonDocument, Void>() {
+            @Override
+            public Void apply(final BsonDocument result, final AsyncConnection connection) {
+                WriteConcernHelper.throwOnWriteConcernError(result, connection.getDescription().getServerAddress());
+                return null;
+            }
+        };
     }
 
-    static <D, T> T executeWrappedCommandProtocol(final ReadBinding binding, final String database, final BsonDocument command,
-                                                  final Decoder<D> decoder, final CommandTransformer<D, T> transformer) {
-        ConnectionSource source = binding.getReadConnectionSource();
-        try {
-            return transformer.apply(executeWrappedCommandProtocol(database, command, decoder, source,
-                                                                   binding.getReadPreference()),
-                                     source.getServerDescription().getAddress());
-        } finally {
-            source.release();
-        }
+    static CommandWriteTransformerAsync<BsonDocument, Void> writeConcernErrorTransformerAsync() {
+        return new CommandWriteTransformerAsync<BsonDocument, Void>() {
+            @Override
+            public Void apply(final BsonDocument result, final AsyncConnection connection) {
+                WriteConcernHelper.throwOnWriteConcernError(result, connection.getDescription().getServerAddress());
+                return null;
+            }
+        };
+    }
+
+    static Function<BsonDocument, BsonDocument> noOpRetryCommandModifier() {
+        return new Function<BsonDocument, BsonDocument>() {
+            @Override
+            public BsonDocument apply(final BsonDocument command) {
+                return command;
+            }
+        };
+    }
+
+    interface CommandCreator {
+        BsonDocument create(ServerDescription serverDescription, ConnectionDescription connectionDescription);
+    }
+
+    /* Read Binding Helpers */
+
+    static BsonDocument executeCommand(final ReadBinding binding, final String database, final CommandCreator commandCreator,
+                                       final boolean retryReads) {
+        return executeCommand(binding, database, commandCreator, new BsonDocumentCodec(), retryReads);
     }
 
-    static BsonDocument executeWrappedCommandProtocol(final ReadBinding binding, final String database, final BsonDocument command,
-                                               final Connection connection) {
-        return executeWrappedCommandProtocol(binding, database, command, connection, new IdentityTransformer<BsonDocument>());
+    static <T> T executeCommand(final ReadBinding binding, final String database, final CommandCreator commandCreator,
+                                final CommandReadTransformer<BsonDocument, T> transformer, final boolean retryReads) {
+        return executeCommand(binding, database, commandCreator, new BsonDocumentCodec(), transformer, retryReads);
     }
 
-    static <T> T executeWrappedCommandProtocol(final ReadBinding binding, final String database, final BsonDocument command,
-                                               final Connection connection, final CommandTransformer<BsonDocument, T> transformer) {
-        return executeWrappedCommandProtocol(binding, database, command, new BsonDocumentCodec(), connection, transformer);
+    static <T> T executeCommand(final ReadBinding binding, final String database, final CommandCreator commandCreator,
+                                final Decoder<T> decoder, final boolean retryReads) {
+        return executeCommand(binding, database, commandCreator, decoder, new IdentityReadTransformer<T>(), retryReads);
     }
 
-    static <T> T executeWrappedCommandProtocol(final ReadBinding binding, final String database, final BsonDocument command,
-                                               final Decoder<BsonDocument> decoder, final Connection connection,
-                                               final CommandTransformer<BsonDocument, T> transformer) {
-        return executeWrappedCommandProtocol(database, command, decoder, connection, binding.getReadPreference(), transformer);
+    static <D, T> T executeCommand(final ReadBinding binding, final String database, final CommandCreator commandCreator,
+                                   final Decoder<D> decoder, final CommandReadTransformer<D, T> transformer, final boolean retryReads) {
+        return withReadConnectionSource(binding, new CallableWithSource<T>() {
+            @Override
+            public T call(final ConnectionSource source) {
+                return executeCommandWithConnection(binding, source, database, commandCreator, decoder,
+                        transformer, retryReads, source.getConnection());
+            }
+        });
+    }
+
+    static <D, T> T executeCommandWithConnection(final ReadBinding binding, final ConnectionSource source, final String database,
+                                                 final CommandCreator commandCreator, final Decoder<D> decoder,
+                                                 final CommandReadTransformer<D, T> transformer, final boolean retryReads,
+                                                 final Connection connection) {
+        BsonDocument command = null;
+        MongoException exception;
+        try {
+            command = commandCreator.create(source.getServerDescription(), connection.getDescription());
+            return executeCommand(database, command, decoder, source, connection, binding.getReadPreference(), transformer,
+                    binding.getSessionContext());
+        } catch (MongoException e) {
+            exception = e;
+
+            if (!shouldAttemptToRetryRead(retryReads, e)) {
+                if (retryReads) {
+                    logUnableToRetry(command.getFirstKey(), e);
+                }
+                throw exception;
+            }
+        } finally {
+            connection.release();
+        }
+
+        final MongoException originalException = exception;
+        return withReleasableConnection(binding, originalException, new CallableWithConnectionAndSource<T>() {
+            @Override
+            public T call(final ConnectionSource source, final Connection connection) {
+                try {
+                    if (!canRetryRead(source.getServerDescription(), connection.getDescription(), binding.getSessionContext())) {
+                        throw originalException;
+                    }
+                    BsonDocument retryCommand = commandCreator.create(source.getServerDescription(), connection.getDescription());
+                    logRetryExecute(retryCommand.getFirstKey(), originalException);
+                    return executeCommand(database, retryCommand, decoder, source, connection, binding.getReadPreference(), transformer,
+                            binding.getSessionContext());
+                } finally {
+                    connection.release();
+                }
+            }
+        });
     }
 
     /* Write Binding Helpers */
 
-    static BsonDocument executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command) {
-        return executeWrappedCommandProtocol(binding, database, command, new IdentityTransformer<BsonDocument>());
+    static BsonDocument executeCommand(final WriteBinding binding, final String database, final BsonDocument command) {
+        return executeCommand(binding, database, command, new IdentityWriteTransformer<BsonDocument>());
     }
 
-    static <T> T executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                               final Decoder<T> decoder) {
-        return executeWrappedCommandProtocol(binding, database, command, decoder, new IdentityTransformer<T>());
+    static <T> T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                final Decoder<T> decoder) {
+        return executeCommand(binding, database, command, decoder, new IdentityWriteTransformer<T>());
     }
 
-    static <T> T executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                               final CommandTransformer<BsonDocument, T> transformer) {
-        return executeWrappedCommandProtocol(binding, database, command, new BsonDocumentCodec(), transformer);
+    static <T> T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                final CommandWriteTransformer<BsonDocument, T> transformer) {
+        return executeCommand(binding, database, command, new BsonDocumentCodec(), transformer);
     }
 
-    static <D, T> T executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                                  final Decoder<D> decoder, final CommandTransformer<D, T> transformer) {
-        return executeWrappedCommandProtocol(binding, database, command, new NoOpFieldNameValidator(), decoder, transformer);
+    static <D, T> T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                   final Decoder<D> decoder, final CommandWriteTransformer<D, T> transformer) {
+        return executeCommand(binding, database, command, new NoOpFieldNameValidator(), decoder, transformer);
     }
 
-    static <T> T executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                               final Connection connection, final CommandTransformer<BsonDocument, T> transformer) {
-        return executeWrappedCommandProtocol(binding, database, command, new BsonDocumentCodec(), connection, transformer);
+    static <T> T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                final Connection connection, final CommandWriteTransformer<BsonDocument, T> transformer) {
+        return executeCommand(binding, database, command, new BsonDocumentCodec(), connection, transformer);
     }
 
-    static <T> T executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                               final Decoder<BsonDocument> decoder, final Connection connection,
-                                               final CommandTransformer<BsonDocument, T> transformer) {
+    static <T> T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                final Decoder<BsonDocument> decoder, final Connection connection,
+                                final CommandWriteTransformer<BsonDocument, T> transformer) {
         notNull("binding", binding);
-        return executeWrappedCommandProtocol(database, command, decoder, connection, primary(), transformer);
+        return executeWriteCommand(database, command, decoder, connection, primary(), transformer, binding.getSessionContext());
     }
 
-    static <T> T executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                               final FieldNameValidator fieldNameValidator, final Decoder<BsonDocument> decoder,
-                                               final Connection connection, final CommandTransformer<BsonDocument, T> transformer) {
+    static <T> T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                final FieldNameValidator fieldNameValidator, final Decoder<BsonDocument> decoder,
+                                final Connection connection, final CommandWriteTransformer<BsonDocument, T> transformer) {
         notNull("binding", binding);
-        return executeWrappedCommandProtocol(database, command, fieldNameValidator, decoder, connection, primary(), transformer);
+        return executeWriteCommand(database, command, fieldNameValidator, decoder, connection, primary(), transformer,
+                binding.getSessionContext());
     }
 
-    static <D, T> T executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                                  final FieldNameValidator fieldNameValidator, final Decoder<D> decoder,
-                                                  final CommandTransformer<D, T> transformer) {
-        ConnectionSource source = binding.getWriteConnectionSource();
-        try {
-            return transformer.apply(executeWrappedCommandProtocol(database, command, fieldNameValidator, decoder,
-                    source, primary()), source.getServerDescription().getAddress());
-        } finally {
-            source.release();
-        }
+    static <D, T> T executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                   final FieldNameValidator fieldNameValidator, final Decoder<D> decoder,
+                                   final CommandWriteTransformer<D, T> transformer) {
+        return withReleasableConnection(binding, new CallableWithConnectionAndSource<T>() {
+            @Override
+            public T call(final ConnectionSource source, final Connection connection) {
+                try {
+                    return transformer.apply(executeCommand(database, command, fieldNameValidator, decoder,
+                            source, connection, primary()), connection);
+                } finally {
+                    connection.release();
+                }
+            }
+        });
     }
 
-    static BsonDocument executeWrappedCommandProtocol(final WriteBinding binding, final String database, final BsonDocument command,
-                                                      final Connection connection) {
+    static BsonDocument executeCommand(final WriteBinding binding, final String database, final BsonDocument command,
+                                       final Connection connection) {
         notNull("binding", binding);
-        return executeWrappedCommandProtocol(database, command, new BsonDocumentCodec(), connection, primary());
+        return executeWriteCommand(database, command, new BsonDocumentCodec(), connection, primary(),
+                binding.getSessionContext());
     }
 
-    /* Private Connection Source Helpers */
+    /* Private Read Connection Source Helpers */
 
-    private static <T> T executeWrappedCommandProtocol(final String database, final BsonDocument command,
-                                                       final Decoder<T> decoder, final ConnectionSource source,
-                                                       final ReadPreference readPreference) {
-        return executeWrappedCommandProtocol(database, command, new NoOpFieldNameValidator(), decoder, source, readPreference);
+    private static <T> T executeCommand(final String database, final BsonDocument command,
+                                        final FieldNameValidator fieldNameValidator, final Decoder<T> decoder,
+                                        final ConnectionSource source, final Connection connection,
+                                        final ReadPreference readPreference) {
+        return executeCommand(database, command, fieldNameValidator, decoder, source, connection,
+                readPreference, new IdentityReadTransformer<T>(), source.getSessionContext());
     }
 
-    private static <T> T executeWrappedCommandProtocol(final String database, final BsonDocument command,
-                                                       final FieldNameValidator fieldNameValidator, final Decoder<T> decoder,
-                                                       final ConnectionSource source, final ReadPreference readPreference) {
-        Connection connection = source.getConnection();
-        try {
-            return executeWrappedCommandProtocol(database, command, fieldNameValidator, decoder, connection,
-                    readPreference, new IdentityTransformer<T>());
-        } finally {
-            connection.release();
-        }
+    /* Private Connection Helpers */
+
+    private static <D, T> T executeCommand(final String database, final BsonDocument command,
+                                           final Decoder<D> decoder, final ConnectionSource source, final Connection connection,
+                                           final ReadPreference readPreference,
+                                           final CommandReadTransformer<D, T> transformer, final SessionContext sessionContext) {
+        return executeCommand(database, command, new NoOpFieldNameValidator(), decoder, source, connection,
+                readPreference, transformer, sessionContext);
+    }
+
+    private static <D, T> T executeCommand(final String database, final BsonDocument command,
+                                           final FieldNameValidator fieldNameValidator, final Decoder<D> decoder,
+                                           final ConnectionSource source, final Connection connection, final ReadPreference readPreference,
+                                           final CommandReadTransformer<D, T> transformer, final SessionContext sessionContext) {
+
+        return transformer.apply(connection.command(database, command, fieldNameValidator, readPreference, decoder, sessionContext),
+                source, connection);
     }
 
     /* Private Connection Helpers */
 
-    private static <T> T executeWrappedCommandProtocol(final String database, final BsonDocument command,
-                                                       final Decoder<T> decoder, final Connection connection,
-                                                       final ReadPreference readPreference) {
-        return executeWrappedCommandProtocol(database, command, new NoOpFieldNameValidator(), decoder, connection,
-                readPreference, new IdentityTransformer<T>());
+    private static <T> T executeWriteCommand(final String database, final BsonDocument command,
+                                             final Decoder<T> decoder, final Connection connection,
+                                             final ReadPreference readPreference, final SessionContext sessionContext) {
+        return executeWriteCommand(database, command, new NoOpFieldNameValidator(), decoder, connection,
+                readPreference, new IdentityWriteTransformer<T>(), sessionContext);
     }
 
-    private static <D, T> T executeWrappedCommandProtocol(final String database, final BsonDocument command,
-                                                          final Decoder<D> decoder, final Connection connection,
-                                                          final ReadPreference readPreference,
-                                                          final CommandTransformer<D, T> transformer) {
-        return executeWrappedCommandProtocol(database, command, new NoOpFieldNameValidator(), decoder, connection,
-                readPreference, transformer);
+    private static <D, T> T executeWriteCommand(final String database, final BsonDocument command,
+                                                final Decoder<D> decoder, final Connection connection,
+                                                final ReadPreference readPreference,
+                                                final CommandWriteTransformer<D, T> transformer, final SessionContext sessionContext) {
+        return executeWriteCommand(database, command, new NoOpFieldNameValidator(), decoder, connection,
+                readPreference, transformer, sessionContext);
     }
 
-    private static <D, T> T executeWrappedCommandProtocol(final String database, final BsonDocument command,
-                                                          final FieldNameValidator fieldNameValidator, final Decoder<D> decoder,
-                                                          final Connection connection, final ReadPreference readPreference,
-                                                          final CommandTransformer<D, T> transformer) {
+    private static <D, T> T executeWriteCommand(final String database, final BsonDocument command,
+                                                final FieldNameValidator fieldNameValidator, final Decoder<D> decoder,
+                                                final Connection connection, final ReadPreference readPreference,
+                                                final CommandWriteTransformer<D, T> transformer, final SessionContext sessionContext) {
 
-        return transformer.apply(connection.command(database, wrapCommand(command, readPreference, connection.getDescription()),
-                readPreference.isSlaveOk(), fieldNameValidator, decoder), connection.getDescription().getServerAddress());
+        return transformer.apply(connection.command(database, command, fieldNameValidator, readPreference, decoder, sessionContext),
+                connection);
     }
 
     /* Async Read Binding Helpers */
 
-    static void executeWrappedCommandProtocolAsync(final AsyncReadBinding binding,
-                                                   final String database,
-                                                   final BsonDocument command,
-                                                   final SingleResultCallback<BsonDocument> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, new BsonDocumentCodec(), callback);
-    }
-
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncReadBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final Decoder<T> decoder,
-                                                       final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, decoder, new IdentityTransformer<T>(), callback);
-    }
-
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncReadBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final CommandTransformer<BsonDocument, T> transformer,
-                                                       final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, new BsonDocumentCodec(), transformer, callback);
-    }
-
-    static <D, T> void executeWrappedCommandProtocolAsync(final AsyncReadBinding binding,
-                                                          final String database,
-                                                          final BsonDocument command,
-                                                          final Decoder<D> decoder,
-                                                          final CommandTransformer<D, T> transformer,
-                                                          final SingleResultCallback<T> callback) {
-        binding.getReadConnectionSource(new CommandProtocolExecutingCallback<D, T>(database, command, new NoOpFieldNameValidator(),
-                decoder, binding.getReadPreference(), transformer, errorHandlingCallback(callback, LOGGER)));
-    }
-
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncReadBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final Decoder<BsonDocument> decoder,
-                                                       final AsyncConnection connection,
-                                                       final CommandTransformer<BsonDocument, T> transformer,
-                                                       final SingleResultCallback<T> callback) {
-        notNull("binding", binding);
-        executeWrappedCommandProtocolAsync(database, command, decoder, connection, binding.getReadPreference(), transformer,
-                callback);
+    static void executeCommandAsync(final AsyncReadBinding binding,
+                                    final String database,
+                                    final CommandCreator commandCreator,
+                                    final boolean retryReads,
+                                    final SingleResultCallback<BsonDocument> callback) {
+        executeCommandAsync(binding, database, commandCreator, new BsonDocumentCodec(), retryReads, callback);
+    }
+
+    static <T> void executeCommandAsync(final AsyncReadBinding binding,
+                                        final String database,
+                                        final CommandCreator commandCreator,
+                                        final Decoder<T> decoder,
+                                        final boolean retryReads,
+                                        final SingleResultCallback<T> callback) {
+        executeCommandAsync(binding, database, commandCreator, decoder, new IdentityTransformerAsync<T>(), retryReads, callback);
+    }
+
+    static <T> void executeCommandAsync(final AsyncReadBinding binding,
+                                        final String database,
+                                        final CommandCreator commandCreator,
+                                        final CommandReadTransformerAsync<BsonDocument, T> transformer,
+                                        final boolean retryReads,
+                                        final SingleResultCallback<T> callback) {
+        executeCommandAsync(binding, database, commandCreator, new BsonDocumentCodec(), transformer, retryReads, callback);
+    }
+
+    static <D, T> void executeCommandAsync(final AsyncReadBinding binding,
+                                           final String database,
+                                           final CommandCreator commandCreator,
+                                           final Decoder<D> decoder,
+                                           final CommandReadTransformerAsync<D, T> transformer,
+                                           final boolean retryReads,
+                                           final SingleResultCallback<T> originalCallback) {
+        final SingleResultCallback<T> errorHandlingCallback = errorHandlingCallback(originalCallback, LOGGER);
+        withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
+            @Override
+            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
+                if (t != null) {
+                    releasingCallback(errorHandlingCallback, source, connection).onResult(null, t);
+                } else {
+                    executeCommandAsyncWithConnection(binding, source, database, commandCreator, decoder, transformer,
+                            retryReads, connection, errorHandlingCallback);
+                }
+            }
+        });
+    }
+
+    static <D, T> void executeCommandAsync(final AsyncReadBinding binding,
+                                           final String database,
+                                           final CommandCreator commandCreator,
+                                           final Decoder<D> decoder,
+                                           final CommandReadTransformerAsync<D, T> transformer,
+                                           final boolean retryReads,
+                                           final AsyncConnection connection,
+                                           final SingleResultCallback<T> originalCallback) {
+        final SingleResultCallback<T> errorHandlingCallback = errorHandlingCallback(originalCallback, LOGGER);
+        binding.getReadConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource source, final Throwable t) {
+                executeCommandAsyncWithConnection(binding, source, database, commandCreator, decoder, transformer, retryReads,
+                        connection, errorHandlingCallback);
+            }
+        });
+    }
+
+    static <D, T> void executeCommandAsyncWithConnection(final AsyncReadBinding binding,
+                                                         final AsyncConnectionSource source,
+                                                         final String database,
+                                                         final CommandCreator commandCreator,
+                                                         final Decoder<D> decoder,
+                                                         final CommandReadTransformerAsync<D, T> transformer,
+                                                         final boolean retryReads,
+                                                         final AsyncConnection connection,
+                                                         final SingleResultCallback<T> callback) {
+        try {
+            BsonDocument command = commandCreator.create(source.getServerDescription(), connection.getDescription());
+            connection.commandAsync(database, command, new NoOpFieldNameValidator(), binding.getReadPreference(), decoder,
+                    binding.getSessionContext(),
+                    createCommandCallback(binding, source, connection, database, binding.getReadPreference(),
+                            command, commandCreator, new NoOpFieldNameValidator(), decoder, transformer, retryReads, callback));
+        } catch (IllegalArgumentException e) {
+            connection.release();
+            callback.onResult(null, e);
+        }
+    }
+
+    private static <T, R> SingleResultCallback<T> createCommandCallback(final AsyncReadBinding binding,
+                                                                        final AsyncConnectionSource oldSource,
+                                                                        final AsyncConnection oldConnection,
+                                                                        final String database,
+                                                                        final ReadPreference readPreference,
+                                                                        final BsonDocument originalCommand,
+                                                                        final CommandCreator commandCreator,
+                                                                        final FieldNameValidator fieldNameValidator,
+                                                                        final Decoder<T> commandResultDecoder,
+                                                                        final CommandReadTransformerAsync<T, R> transformer,
+                                                                        final boolean retryReads,
+                                                                        final SingleResultCallback<R> callback) {
+        return new SingleResultCallback<T>() {
+            @Override
+            public void onResult(final T result, final Throwable originalError) {
+                SingleResultCallback<R> releasingCallback = releasingCallback(callback, oldSource, oldConnection);
+                if (originalError != null) {
+                    checkRetryableException(originalError, releasingCallback);
+                } else {
+                    try {
+                        releasingCallback.onResult(transformer.apply(result, oldSource, oldConnection), null);
+                    } catch (Throwable transformError) {
+                        checkRetryableException(transformError, releasingCallback);
+                    }
+                }
+            }
+
+            private void checkRetryableException(final Throwable originalError, final SingleResultCallback<R> callback) {
+                if (!shouldAttemptToRetryRead(retryReads, originalError)) {
+                    if (retryReads) {
+                        logUnableToRetry(originalCommand.getFirstKey(), originalError);
+                    }
+                    callback.onResult(null, originalError);
+                } else {
+                    oldSource.release();
+                    oldConnection.release();
+                    retryableCommand(originalError);
+                }
+            }
+
+            private void retryableCommand(final Throwable originalError) {
+                withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
+                    @Override
+                    public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, originalError);
+                        } else if (!canRetryRead(source.getServerDescription(), connection.getDescription(),
+                                binding.getSessionContext())) {
+                            releasingCallback(callback, source, connection).onResult(null, originalError);
+                        } else {
+                            BsonDocument retryCommand = commandCreator.create(source.getServerDescription(), connection.getDescription());
+                            logRetryExecute(retryCommand.getFirstKey(), originalError);
+                            connection.commandAsync(database, retryCommand, fieldNameValidator, readPreference,
+                                    commandResultDecoder, binding.getSessionContext(),
+                                    new TransformingReadResultCallback<T, R>(transformer, source, connection,
+                                            releasingCallback(callback, source, connection)));
+                        }
+                    }
+                });
+            }
+        };
+    }
+
+    static class TransformingReadResultCallback<T, R> implements SingleResultCallback<T> {
+        private final CommandReadTransformerAsync<T, R> transformer;
+        private final AsyncConnectionSource source;
+        private final AsyncConnection connection;
+        private final SingleResultCallback<R> callback;
+
+        TransformingReadResultCallback(final CommandReadTransformerAsync<T, R> transformer, final AsyncConnectionSource source,
+                                        final AsyncConnection connection, final SingleResultCallback<R> callback) {
+            this.transformer = transformer;
+            this.source = source;
+            this.connection = connection;
+            this.callback = callback;
+        }
+
+        @Override
+        public void onResult(final T result, final Throwable t) {
+            if (t != null) {
+                callback.onResult(null, t);
+            } else {
+                try {
+                    R transformedResult = transformer.apply(result, source, connection);
+                    callback.onResult(transformedResult, null);
+                } catch (Throwable transformError) {
+                    callback.onResult(null, transformError);
+                }
+            }
+        }
     }
 
     /* Async Write Binding Helpers */
 
-    static void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                   final String database,
-                                                   final BsonDocument command,
-                                                   final SingleResultCallback<BsonDocument> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, new BsonDocumentCodec(), callback);
+    static void executeCommandAsync(final AsyncWriteBinding binding,
+                                    final String database,
+                                    final BsonDocument command,
+                                    final SingleResultCallback<BsonDocument> callback) {
+        executeCommandAsync(binding, database, command, new BsonDocumentCodec(), callback);
     }
 
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final Decoder<T> decoder,
-                                                       final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, decoder, new IdentityTransformer<T>(), callback);
+    static <T> void executeCommandAsync(final AsyncWriteBinding binding,
+                                        final String database,
+                                        final BsonDocument command,
+                                        final Decoder<T> decoder,
+                                        final SingleResultCallback<T> callback) {
+        executeCommandAsync(binding, database, command, decoder, new IdentityWriteTransformerAsync<T>(), callback);
     }
 
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final CommandTransformer<BsonDocument, T> transformer,
-                                                       final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, new BsonDocumentCodec(), transformer, callback);
+    static <T> void executeCommandAsync(final AsyncWriteBinding binding,
+                                        final String database,
+                                        final BsonDocument command,
+                                        final CommandWriteTransformerAsync<BsonDocument, T> transformer,
+                                        final SingleResultCallback<T> callback) {
+        executeCommandAsync(binding, database, command, new BsonDocumentCodec(), transformer, callback);
     }
 
-    static <D, T> void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                          final String database, final BsonDocument command,
-                                                          final Decoder<D> decoder,
-                                                          final CommandTransformer<D, T> transformer,
-                                                          final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, new NoOpFieldNameValidator(), decoder, transformer, callback);
+    static <D, T> void executeCommandAsync(final AsyncWriteBinding binding,
+                                           final String database, final BsonDocument command,
+                                           final Decoder<D> decoder,
+                                           final CommandWriteTransformerAsync<D, T> transformer,
+                                           final SingleResultCallback<T> callback) {
+        executeCommandAsync(binding, database, command, new NoOpFieldNameValidator(), decoder, transformer, callback);
     }
 
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final Decoder<BsonDocument> decoder,
-                                                       final AsyncConnection connection,
-                                                       final CommandTransformer<BsonDocument, T> transformer,
-                                                       final SingleResultCallback<T> callback) {
+    static <T> void executeCommandAsync(final AsyncWriteBinding binding,
+                                        final String database,
+                                        final BsonDocument command,
+                                        final Decoder<BsonDocument> decoder,
+                                        final AsyncConnection connection,
+                                        final CommandWriteTransformerAsync<BsonDocument, T> transformer,
+                                        final SingleResultCallback<T> callback) {
         notNull("binding", binding);
-        executeWrappedCommandProtocolAsync(database, command, decoder, connection, primary(), transformer, callback);
+        executeCommandAsync(database, command, decoder, connection, primary(), transformer, binding.getSessionContext(),
+                callback);
     }
 
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final FieldNameValidator fieldNameValidator,
-                                                       final Decoder<BsonDocument> decoder,
-                                                       final AsyncConnection connection,
-                                                       final CommandTransformer<BsonDocument, T> transformer,
-                                                       final SingleResultCallback<T> callback) {
+    static <T> void executeCommandAsync(final AsyncWriteBinding binding,
+                                        final String database,
+                                        final BsonDocument command,
+                                        final FieldNameValidator fieldNameValidator,
+                                        final Decoder<BsonDocument> decoder,
+                                        final AsyncConnection connection,
+                                        final CommandWriteTransformerAsync<BsonDocument, T> transformer,
+                                        final SingleResultCallback<T> callback) {
         notNull("binding", binding);
-        executeWrappedCommandProtocolAsync(database, command, fieldNameValidator, decoder, connection, primary(), transformer, callback);
+        executeCommandAsync(database, command, fieldNameValidator, decoder, connection, primary(), transformer,
+                binding.getSessionContext(), callback);
     }
 
-    static <D, T> void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                          final String database, final BsonDocument command,
-                                                          final FieldNameValidator fieldNameValidator,
-                                                          final Decoder<D> decoder,
-                                                          final CommandTransformer<D, T> transformer,
-                                                          final SingleResultCallback<T> callback) {
+    static <D, T> void executeCommandAsync(final AsyncWriteBinding binding,
+                                           final String database, final BsonDocument command,
+                                           final FieldNameValidator fieldNameValidator,
+                                           final Decoder<D> decoder,
+                                           final CommandWriteTransformerAsync<D, T> transformer,
+                                           final SingleResultCallback<T> callback) {
         binding.getWriteConnectionSource(new CommandProtocolExecutingCallback<D, T>(database, command, fieldNameValidator, decoder,
-                primary(), transformer, errorHandlingCallback(callback, LOGGER)));
+                primary(), transformer, binding.getSessionContext(), errorHandlingCallback(callback, LOGGER)));
     }
 
-    static void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                   final String database,
-                                                   final BsonDocument command,
-                                                   final AsyncConnection connection,
-                                                   final SingleResultCallback<BsonDocument> callback) {
-        executeWrappedCommandProtocolAsync(binding, database, command, connection, new IdentityTransformer<BsonDocument>(), callback);
+    static void executeCommandAsync(final AsyncWriteBinding binding,
+                                    final String database,
+                                    final BsonDocument command,
+                                    final AsyncConnection connection,
+                                    final SingleResultCallback<BsonDocument> callback) {
+        executeCommandAsync(binding, database, command, connection, new IdentityWriteTransformerAsync<BsonDocument>(), callback);
     }
 
-    static <T> void executeWrappedCommandProtocolAsync(final AsyncWriteBinding binding,
-                                                       final String database,
-                                                       final BsonDocument command,
-                                                       final AsyncConnection connection,
-                                                       final CommandTransformer<BsonDocument, T> transformer,
-                                                       final SingleResultCallback<T> callback) {
+    static <T> void executeCommandAsync(final AsyncWriteBinding binding,
+                                        final String database,
+                                        final BsonDocument command,
+                                        final AsyncConnection connection,
+                                        final CommandWriteTransformerAsync<BsonDocument, T> transformer,
+                                        final SingleResultCallback<T> callback) {
         notNull("binding", binding);
-        executeWrappedCommandProtocolAsync(database, command, new BsonDocumentCodec(), connection, primary(), transformer, callback);
+        executeCommandAsync(database, command, new BsonDocumentCodec(), connection, primary(), transformer,
+                binding.getSessionContext(), callback);
     }
 
     /* Async Connection Helpers */
-    private static <D, T> void executeWrappedCommandProtocolAsync(final String database, final BsonDocument command,
-                                                                  final Decoder<D> decoder, final AsyncConnection connection,
-                                                                  final ReadPreference readPreference,
-                                                                  final CommandTransformer<D, T> transformer,
-                                                                  final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(database, command, new NoOpFieldNameValidator(), decoder, connection, readPreference,
-                transformer, callback);
-    }
-
-    private static <D, T> void executeWrappedCommandProtocolAsync(final String database, final BsonDocument command,
-                                                                  final FieldNameValidator fieldNameValidator,
-                                                                  final Decoder<D> decoder, final AsyncConnection connection,
-                                                                  final ReadPreference readPreference,
-                                                                  final CommandTransformer<D, T> transformer,
-                                                                  final SingleResultCallback<T> callback) {
-        connection.commandAsync(database, wrapCommand(command, readPreference, connection.getDescription()),
-                readPreference.isSlaveOk(), fieldNameValidator, decoder, new SingleResultCallback<D>() {
+    private static <D, T> void executeCommandAsync(final String database, final BsonDocument command,
+                                                   final Decoder<D> decoder, final AsyncConnection connection,
+                                                   final ReadPreference readPreference,
+                                                   final CommandWriteTransformerAsync<D, T> transformer,
+                                                   final SessionContext sessionContext,
+                                                   final SingleResultCallback<T> callback) {
+        connection.commandAsync(database, command, new NoOpFieldNameValidator(), readPreference, decoder, sessionContext,
+                new SingleResultCallback<D>() {
+                    @Override
+                    public void onResult(final D result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            try {
+                                T transformedResult = transformer.apply(result, connection);
+                                callback.onResult(transformedResult, null);
+                            } catch (Exception e) {
+                                callback.onResult(null, e);
+                            }
+                        }
+                    }
+                });
+
+    }
+
+    private static <D, T> void executeCommandAsync(final String database, final BsonDocument command,
+                                                   final FieldNameValidator fieldNameValidator,
+                                                   final Decoder<D> decoder, final AsyncConnection connection,
+                                                   final ReadPreference readPreference,
+                                                   final CommandWriteTransformerAsync<D, T> transformer,
+                                                   final SessionContext sessionContext,
+                                                   final SingleResultCallback<T> callback) {
+        connection.commandAsync(database, command, fieldNameValidator, readPreference, decoder, sessionContext, true, null, null,
+                new SingleResultCallback<D>() {
                     @Override
                     public void onResult(final D result, final Throwable t) {
                         if (t != null) {
                             callback.onResult(null, t);
                         } else {
                             try {
-                                T transformedResult = transformer.apply(result, connection.getDescription().getServerAddress());
+                                T transformedResult = transformer.apply(result, connection);
                                 callback.onResult(transformedResult, null);
                             } catch (Exception e) {
                                 callback.onResult(null, e);
@@ -382,6 +688,224 @@ public void onResult(final D result, final Throwable t) {
                 });
     }
 
+    /* Retryable write helpers */
+    static <T, R> R executeRetryableCommand(final WriteBinding binding, final String database, final ReadPreference readPreference,
+                                            final FieldNameValidator fieldNameValidator, final Decoder<T> commandResultDecoder,
+                                            final CommandCreator commandCreator, final CommandWriteTransformer<T, R> transformer) {
+        return executeRetryableCommand(binding, database, readPreference, fieldNameValidator, commandResultDecoder, commandCreator,
+                transformer, noOpRetryCommandModifier());
+    }
+
+    static <T, R> R executeRetryableCommand(final WriteBinding binding, final String database, final ReadPreference readPreference,
+                                            final FieldNameValidator fieldNameValidator, final Decoder<T> commandResultDecoder,
+                                            final CommandCreator commandCreator, final CommandWriteTransformer<T, R> transformer,
+                                            final Function<BsonDocument, BsonDocument> retryCommandModifier) {
+        return withReleasableConnection(binding, new CallableWithConnectionAndSource<R>() {
+            @Override
+            public R call(final ConnectionSource source, final Connection connection) {
+                BsonDocument command = null;
+                MongoException exception;
+                try {
+                    command = commandCreator.create(source.getServerDescription(), connection.getDescription());
+                    return transformer.apply(connection.command(database, command, fieldNameValidator, readPreference,
+                            commandResultDecoder, binding.getSessionContext()), connection);
+                } catch (MongoException e) {
+                    exception = e;
+                    if (!shouldAttemptToRetryWrite(command, e)) {
+                        if (isRetryWritesEnabled(command)) {
+                            logUnableToRetry(command.getFirstKey(), e);
+                        }
+                        throw transformWriteException(exception);
+                    }
+                } finally {
+                    connection.release();
+                }
+
+                if (binding.getSessionContext().hasActiveTransaction()) {
+                    binding.getSessionContext().unpinServerAddress();
+                }
+                final BsonDocument originalCommand = command;
+                final MongoException originalException = exception;
+                return withReleasableConnection(binding, originalException, new CallableWithConnectionAndSource<R>() {
+                    @Override
+                    public R call(final ConnectionSource source, final Connection connection) {
+                        try {
+                            if (!canRetryWrite(source.getServerDescription(), connection.getDescription(), binding.getSessionContext())) {
+                                throw originalException;
+                            }
+                            BsonDocument retryCommand = retryCommandModifier.apply(originalCommand);
+                            logRetryExecute(retryCommand.getFirstKey(), originalException);
+                            return transformer.apply(connection.command(database, retryCommand, fieldNameValidator,
+                                    readPreference, commandResultDecoder, binding.getSessionContext()),
+                                    connection);
+                        } finally {
+                            connection.release();
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    static <T, R> void executeRetryableCommand(final AsyncWriteBinding binding, final String database, final ReadPreference readPreference,
+                                               final FieldNameValidator fieldNameValidator, final Decoder<T> commandResultDecoder,
+                                               final CommandCreator commandCreator,
+                                               final CommandWriteTransformerAsync<T, R> transformer,
+                                               final SingleResultCallback<R> originalCallback) {
+        executeRetryableCommand(binding, database, readPreference, fieldNameValidator, commandResultDecoder, commandCreator, transformer,
+                noOpRetryCommandModifier(), originalCallback);
+    }
+
+    static <T, R> void executeRetryableCommand(final AsyncWriteBinding binding, final String database, final ReadPreference readPreference,
+                                               final FieldNameValidator fieldNameValidator, final Decoder<T> commandResultDecoder,
+                                               final CommandCreator commandCreator,
+                                               final CommandWriteTransformerAsync<T, R> transformer,
+                                               final Function<BsonDocument, BsonDocument> retryCommandModifier,
+                                               final SingleResultCallback<R> originalCallback) {
+        final SingleResultCallback<R> errorHandlingCallback = errorHandlingCallback(originalCallback, LOGGER);
+        binding.getWriteConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource source, final Throwable t) {
+                if (t != null) {
+                    errorHandlingCallback.onResult(null, t);
+                } else {
+                    source.getConnection(new SingleResultCallback<AsyncConnection>() {
+                        @Override
+                        public void onResult(final AsyncConnection connection, final Throwable t) {
+                            if (t != null) {
+                                releasingCallback(errorHandlingCallback, source).onResult(null, t);
+                            } else {
+                                try {
+                                    BsonDocument command = commandCreator.create(source.getServerDescription(),
+                                            connection.getDescription());
+                                    connection.commandAsync(database, command, fieldNameValidator, readPreference,
+                                            commandResultDecoder, binding.getSessionContext(),
+                                            createCommandCallback(binding, source, connection, database, readPreference,
+                                                    command, fieldNameValidator, commandResultDecoder, transformer,
+                                                    retryCommandModifier, errorHandlingCallback));
+                                } catch (Throwable t1) {
+                                    releasingCallback(errorHandlingCallback, source, connection).onResult(null, t1);
+                                }
+                            }
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    private static <T, R> SingleResultCallback<T> createCommandCallback(final AsyncWriteBinding binding,
+                                                                        final AsyncConnectionSource oldSource,
+                                                                        final AsyncConnection oldConnection,
+                                                                        final String database,
+                                                                        final ReadPreference readPreference,
+                                                                        final BsonDocument command,
+                                                                        final FieldNameValidator fieldNameValidator,
+                                                                        final Decoder<T> commandResultDecoder,
+                                                                        final CommandWriteTransformerAsync<T, R> transformer,
+                                                                        final Function<BsonDocument, BsonDocument> retryCommandModifier,
+                                                                        final SingleResultCallback<R> callback) {
+        return new SingleResultCallback<T>() {
+            @Override
+            public void onResult(final T result, final Throwable originalError) {
+                SingleResultCallback<R> releasingCallback = releasingCallback(callback, oldSource, oldConnection);
+                if (originalError != null) {
+                    checkRetryableException(originalError, releasingCallback);
+                } else {
+                    try {
+                        releasingCallback.onResult(transformer.apply(result, oldConnection), null);
+                    } catch (Throwable transformError) {
+                        checkRetryableException(transformError, releasingCallback);
+                    }
+                }
+            }
+
+            private void checkRetryableException(final Throwable originalError, final SingleResultCallback<R> releasingCallback) {
+                if (!shouldAttemptToRetryWrite(command, originalError)) {
+                    if (isRetryWritesEnabled(command)) {
+                        logUnableToRetry(command.getFirstKey(), originalError);
+                    }
+                    releasingCallback.onResult(null, originalError instanceof MongoException
+                            ? transformWriteException((MongoException) originalError) : originalError);
+                } else {
+                    oldConnection.release();
+                    oldSource.release();
+                    if (binding.getSessionContext().hasActiveTransaction()) {
+                        binding.getSessionContext().unpinServerAddress();
+                    }
+                    retryableCommand(originalError);
+                }
+            }
+
+            private void retryableCommand(final Throwable originalError) {
+                final BsonDocument retryCommand = retryCommandModifier.apply(command);
+                logRetryExecute(retryCommand.getFirstKey(), originalError);
+                withAsyncConnection(binding, new AsyncCallableWithConnectionAndSource() {
+                    @Override
+                    public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, originalError);
+                        } else if (!canRetryWrite(source.getServerDescription(), connection.getDescription(),
+                                binding.getSessionContext())) {
+                            releasingCallback(callback, source, connection).onResult(null, originalError);
+                        } else {
+                            connection.commandAsync(database, retryCommand, fieldNameValidator, readPreference,
+                                    commandResultDecoder, binding.getSessionContext(),
+                                    new TransformingWriteResultCallback<T, R>(transformer, connection,
+                                            releasingCallback(callback, source, connection)));
+                        }
+                    }
+                });
+            }
+        };
+    }
+
+    static class TransformingWriteResultCallback<T, R> implements SingleResultCallback<T> {
+        private final CommandWriteTransformerAsync<T, R> transformer;
+        private final AsyncConnection connection;
+        private final SingleResultCallback<R> callback;
+
+        TransformingWriteResultCallback(final CommandWriteTransformerAsync<T, R> transformer,
+                                   final AsyncConnection connection, final SingleResultCallback<R> callback) {
+            this.transformer = transformer;
+            this.connection = connection;
+            this.callback = callback;
+        }
+
+        @Override
+        public void onResult(final T result, final Throwable t) {
+            if (t != null) {
+                callback.onResult(null, t);
+            } else {
+                try {
+                    R transformedResult = transformer.apply(result, connection);
+                    callback.onResult(transformedResult, null);
+                } catch (Throwable transformError) {
+                    callback.onResult(null, transformError);
+                }
+            }
+        }
+    }
+
+    private static final List<Integer> RETRYABLE_ERROR_CODES = asList(6, 7, 89, 91, 189, 9001, 13436, 13435, 11602, 11600, 10107);
+    static boolean isRetryableException(final Throwable t) {
+        if (!(t instanceof MongoException)) {
+            return false;
+        }
+
+        if (t instanceof MongoSocketException || t instanceof MongoNotPrimaryException || t instanceof MongoNodeIsRecoveringException) {
+            return true;
+        }
+        String errorMessage = t.getMessage();
+        if (t instanceof MongoWriteConcernException) {
+            errorMessage = ((MongoWriteConcernException) t).getWriteConcernError().getMessage();
+        }
+        if (errorMessage.contains("not master") || errorMessage.contains("node is recovering")) {
+            return true;
+        }
+        return RETRYABLE_ERROR_CODES.contains(((MongoException) t).getCode());
+    }
+
     /* Misc operation helpers */
 
     static void rethrowIfNotNamespaceError(final MongoCommandException e) {
@@ -404,36 +928,27 @@ static boolean isNamespaceError(final Throwable t) {
         }
     }
 
-    static BsonDocument wrapCommand(final BsonDocument command, final ReadPreference readPreference,
-                                    final ConnectionDescription connectionDescription) {
-        if (connectionDescription.getServerType() == SHARD_ROUTER && !readPreference.equals(primary())) {
-            return new BsonDocument("$query", command).append("$readPreference", readPreference.toDocument());
-        } else {
-            return command;
-        }
-    }
-
     private static class CommandProtocolExecutingCallback<D, R> implements SingleResultCallback<AsyncConnectionSource> {
         private final String database;
         private final BsonDocument command;
         private final Decoder<D> decoder;
         private final ReadPreference readPreference;
         private final FieldNameValidator fieldNameValidator;
-        private final CommandTransformer<D, R> transformer;
+        private final CommandWriteTransformerAsync<D, R> transformer;
         private final SingleResultCallback<R> callback;
+        private final SessionContext sessionContext;
 
-        public CommandProtocolExecutingCallback(final String database, final BsonDocument command,
-                                                final FieldNameValidator fieldNameValidator,
-                                                final Decoder<D> decoder,
-                                                final ReadPreference readPreference,
-                                                final CommandTransformer<D, R> transformer,
-                                                final SingleResultCallback<R> callback) {
+        CommandProtocolExecutingCallback(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
+                                         final Decoder<D> decoder, final ReadPreference readPreference,
+                                         final CommandWriteTransformerAsync<D, R> transformer, final SessionContext sessionContext,
+                                         final SingleResultCallback<R> callback) {
             this.database = database;
             this.command = command;
             this.fieldNameValidator = fieldNameValidator;
             this.decoder = decoder;
             this.readPreference = readPreference;
             this.transformer = transformer;
+            this.sessionContext = sessionContext;
             this.callback = callback;
         }
 
@@ -449,19 +964,17 @@ public void onResult(final AsyncConnection connection, final Throwable t) {
                             callback.onResult(null, t);
                         } else {
                             final SingleResultCallback<R> wrappedCallback = releasingCallback(callback, source, connection);
-                            connection.commandAsync(database, wrapCommand(command, readPreference, connection.getDescription()),
-                                                    readPreference.isSlaveOk(), fieldNameValidator, decoder, new SingleResultCallback<D>() {
-                                @Override
-                                public void onResult(final D response, final Throwable t) {
-                                    if (t != null) {
-                                        wrappedCallback.onResult(null, t);
-                                    } else {
-                                        wrappedCallback.onResult(transformer.apply(response,
-                                                                                   connection.getDescription().getServerAddress()),
-                                                                 null);
-                                    }
-                                }
-                            });
+                            connection.commandAsync(database, command, fieldNameValidator, readPreference, decoder, sessionContext,
+                                    new SingleResultCallback<D>() {
+                                        @Override
+                                        public void onResult(final D response, final Throwable t) {
+                                            if (t != null) {
+                                                wrappedCallback.onResult(null, t);
+                                            } else {
+                                                wrappedCallback.onResult(transformer.apply(response, connection), null);
+                                            }
+                                        }
+                                    });
                         }
                     }
                 });
@@ -469,6 +982,43 @@ public void onResult(final D response, final Throwable t) {
         }
     }
 
+    private static boolean shouldAttemptToRetryRead(final boolean retryReadsEnabled, final Throwable exception) {
+        return retryReadsEnabled && isRetryableException(exception);
+    }
+
+    private static boolean shouldAttemptToRetryWrite(@Nullable final BsonDocument command, final Throwable exception) {
+        return isRetryWritesEnabled(command) && isRetryableException(exception);
+    }
+
+    private static boolean isRetryWritesEnabled(@Nullable final BsonDocument command) {
+        return (command != null && (command.containsKey("txnNumber")
+                || command.getFirstKey().equals("commitTransaction") || command.getFirstKey().equals("abortTransaction")));
+    }
+
+    static boolean shouldAttemptToRetryWrite(final boolean retryWritesEnabled, final Throwable exception) {
+        return retryWritesEnabled && isRetryableException(exception);
+    }
+
+    static void logRetryExecute(final String operation, final Throwable originalError) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug(format("Retrying operation %s due to an error \"%s\"", operation, originalError));
+        }
+    }
+
+    static void logUnableToRetry(final String operation, final Throwable originalError) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug(format("Unable to retry operation %s due to error \"%s\"", operation, originalError));
+        }
+    }
+
+    static MongoException transformWriteException(final MongoException exception) {
+        if (exception.getCode() == 20 && exception.getMessage().contains("Transaction numbers")) {
+            return new MongoClientException("This MongoDB deployment does not support retryable writes. "
+                    + "Please add retryWrites=false to your connection string.", exception);
+        }
+        return exception;
+    }
+
     private CommandOperationHelper() {
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/CommandReadOperation.java b/driver-core/src/main/com/mongodb/operation/CommandReadOperation.java
index 7e1c9a8ab38..b52aae1aa36 100644
--- a/driver-core/src/main/com/mongodb/operation/CommandReadOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/CommandReadOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,15 @@
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncReadBinding;
 import com.mongodb.binding.ReadBinding;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
 import org.bson.BsonDocument;
 import org.bson.codecs.Decoder;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 
 /**
  * An operation that executes an arbitrary command that reads from the server.
@@ -32,6 +35,7 @@
  * @param <T> the operations result type.
  * @since 3.0
  */
+@Deprecated
 public class CommandReadOperation<T> implements AsyncReadOperation<T>, ReadOperation<T> {
     private final String databaseName;
     private final BsonDocument command;
@@ -52,11 +56,20 @@ public CommandReadOperation(final String databaseName, final BsonDocument comman
 
     @Override
     public T execute(final ReadBinding binding) {
-        return executeWrappedCommandProtocol(binding, databaseName, command, decoder);
+        return executeCommand(binding, databaseName, getCommandCreator(), decoder, false);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(binding, databaseName, command, decoder, callback);
+        executeCommandAsync(binding, databaseName, getCommandCreator(), decoder, false, callback);
+    }
+
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return command;
+            }
+        };
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/CommandResultArrayCodec.java b/driver-core/src/main/com/mongodb/operation/CommandResultArrayCodec.java
index ad2a03ca405..3e64a1da276 100644
--- a/driver-core/src/main/com/mongodb/operation/CommandResultArrayCodec.java
+++ b/driver-core/src/main/com/mongodb/operation/CommandResultArrayCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,12 @@ public BsonArray decode(final BsonReader reader, final DecoderContext decoderCon
 
         List<T> list = new ArrayList<T>();
         while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-            list.add(decoder.decode(reader, decoderContext));
+            if (reader.getCurrentBsonType() == BsonType.NULL) {
+                reader.readNull();
+                list.add(null);
+            } else {
+                list.add(decoder.decode(reader, decoderContext));
+            }
         }
         reader.readEndArray();
 
diff --git a/driver-core/src/main/com/mongodb/operation/CommandResultCodecProvider.java b/driver-core/src/main/com/mongodb/operation/CommandResultCodecProvider.java
index 760deb5965b..3e5e6918b7c 100644
--- a/driver-core/src/main/com/mongodb/operation/CommandResultCodecProvider.java
+++ b/driver-core/src/main/com/mongodb/operation/CommandResultCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.bson.codecs.BsonBooleanCodec;
 import org.bson.codecs.BsonDBPointerCodec;
 import org.bson.codecs.BsonDateTimeCodec;
+import org.bson.codecs.BsonDecimal128Codec;
 import org.bson.codecs.BsonDocumentCodec;
 import org.bson.codecs.BsonDoubleCodec;
 import org.bson.codecs.BsonInt32Codec;
@@ -45,22 +46,17 @@
 import org.bson.codecs.configuration.CodecRegistry;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 class CommandResultCodecProvider<P> implements CodecProvider {
     private final Map<Class<?>, Codec<?>> codecs = new HashMap<Class<?>, Codec<?>>();
     private final Decoder<P> payloadDecoder;
-    private final String fieldContainingPayload;
-
-    /**
-     * Construct a new instance. with the default codec for each BSON type.
-     *
-     * @param payloadDecoder the specific decoder to use on the field.
-     * @param fieldContainingPayload the field name to be decoded with the payloadDecoder.
-     */
-    public CommandResultCodecProvider(final Decoder<P> payloadDecoder, final String fieldContainingPayload) {
+    private final List<String> fieldsContainingPayload;
+
+    CommandResultCodecProvider(final Decoder<P> payloadDecoder, final List<String> fieldContainingPayload) {
         this.payloadDecoder = payloadDecoder;
-        this.fieldContainingPayload = fieldContainingPayload;
+        this.fieldsContainingPayload = fieldContainingPayload;
         addCodecs();
     }
 
@@ -76,7 +72,7 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
         }
 
         if (clazz == BsonDocument.class) {
-            return (Codec<T>) new CommandResultDocumentCodec<P>(registry, payloadDecoder, fieldContainingPayload);
+            return (Codec<T>) new CommandResultDocumentCodec<P>(registry, payloadDecoder, fieldsContainingPayload);
         }
 
         return null;
@@ -91,6 +87,7 @@ private void addCodecs() {
         addCodec(new BsonDoubleCodec());
         addCodec(new BsonInt32Codec());
         addCodec(new BsonInt64Codec());
+        addCodec(new BsonDecimal128Codec());
         addCodec(new BsonMinKeyCodec());
         addCodec(new BsonMaxKeyCodec());
         addCodec(new BsonJavaScriptCodec());
@@ -118,7 +115,7 @@ public boolean equals(final Object o) {
 
         CommandResultCodecProvider<?> that = (CommandResultCodecProvider) o;
 
-        if (!fieldContainingPayload.equals(that.fieldContainingPayload)) {
+        if (!fieldsContainingPayload.equals(that.fieldsContainingPayload)) {
             return false;
         }
         if (!payloadDecoder.getClass().equals(that.payloadDecoder.getClass())) {
@@ -131,7 +128,7 @@ public boolean equals(final Object o) {
     @Override
     public int hashCode() {
         int result = payloadDecoder.getClass().hashCode();
-        result = 31 * result + fieldContainingPayload.hashCode();
+        result = 31 * result + fieldsContainingPayload.hashCode();
         return result;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/CommandResultDocumentCodec.java b/driver-core/src/main/com/mongodb/operation/CommandResultDocumentCodec.java
index 53a85569d81..93a1f27c843 100644
--- a/driver-core/src/main/com/mongodb/operation/CommandResultDocumentCodec.java
+++ b/driver-core/src/main/com/mongodb/operation/CommandResultDocumentCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,26 +27,33 @@
 import org.bson.codecs.DecoderContext;
 import org.bson.codecs.configuration.CodecRegistry;
 
+import java.util.Collections;
+import java.util.List;
+
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 
 class CommandResultDocumentCodec<T> extends BsonDocumentCodec {
     private final Decoder<T> payloadDecoder;
-    private final String fieldContainingPayload;
+    private final List<String> fieldsContainingPayload;
 
-    CommandResultDocumentCodec(final CodecRegistry registry, final Decoder<T> payloadDecoder, final String fieldContainingPayload) {
+    CommandResultDocumentCodec(final CodecRegistry registry, final Decoder<T> payloadDecoder, final List<String> fieldsContainingPayload) {
         super(registry);
         this.payloadDecoder = payloadDecoder;
-        this.fieldContainingPayload = fieldContainingPayload;
+        this.fieldsContainingPayload = fieldsContainingPayload;
     }
 
     static <P> Codec<BsonDocument> create(final Decoder<P> decoder, final String fieldContainingPayload) {
-        CodecRegistry registry = fromProviders(new CommandResultCodecProvider<P>(decoder, fieldContainingPayload));
+        return create(decoder, Collections.singletonList(fieldContainingPayload));
+    }
+
+    static <P> Codec<BsonDocument> create(final Decoder<P> decoder, final List<String> fieldsContainingPayload) {
+        CodecRegistry registry = fromProviders(new CommandResultCodecProvider<P>(decoder, fieldsContainingPayload));
         return registry.get(BsonDocument.class);
     }
 
     @Override
     protected BsonValue readValue(final BsonReader reader, final DecoderContext decoderContext) {
-        if (reader.getCurrentName().equals(fieldContainingPayload)) {
+        if (fieldsContainingPayload.contains(reader.getCurrentName())) {
             if (reader.getCurrentBsonType() == BsonType.DOCUMENT) {
                 return new BsonDocumentWrapper<T>(payloadDecoder.decode(reader, decoderContext), null);
             } else if (reader.getCurrentBsonType() == BsonType.ARRAY) {
diff --git a/driver-core/src/main/com/mongodb/operation/CommandWriteOperation.java b/driver-core/src/main/com/mongodb/operation/CommandWriteOperation.java
index 6f646a2102f..d4dd6ae5e95 100644
--- a/driver-core/src/main/com/mongodb/operation/CommandWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/CommandWriteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
 import org.bson.codecs.Decoder;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 
 /**
  * An operation that executes an arbitrary command that writes to the server.
@@ -32,6 +32,7 @@
  * @param <T> the operations result type.
  * @since 3.0
  */
+@Deprecated
 public class CommandWriteOperation<T> implements AsyncWriteOperation<T>, WriteOperation<T> {
     private final String databaseName;
     private final BsonDocument command;
@@ -52,11 +53,11 @@ public CommandWriteOperation(final String databaseName, final BsonDocument comma
 
     @Override
     public T execute(final WriteBinding binding) {
-        return executeWrappedCommandProtocol(binding, databaseName, command, decoder);
+        return executeCommand(binding, databaseName, command, decoder);
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<T> callback) {
-        executeWrappedCommandProtocolAsync(binding, databaseName, command, decoder, callback);
+        executeCommandAsync(binding, databaseName, command, decoder, callback);
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/CommitTransactionOperation.java b/driver-core/src/main/com/mongodb/operation/CommitTransactionOperation.java
new file mode 100644
index 00000000000..56587b0d0dd
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/CommitTransactionOperation.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.Function;
+import com.mongodb.MongoException;
+import com.mongodb.MongoExecutionTimeoutException;
+import com.mongodb.MongoNodeIsRecoveringException;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.MongoTimeoutException;
+import com.mongodb.MongoWriteConcernException;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.binding.WriteBinding;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL;
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Arrays.asList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * An operation that commits a transaction.
+ *
+ * @since 3.8
+ */
+@Deprecated
+public class CommitTransactionOperation extends TransactionOperation {
+    private final boolean alreadyCommitted;
+    private BsonDocument recoveryToken;
+    private Long maxCommitTimeMS;
+
+    /**
+     * Construct an instance.
+     *
+     * @param writeConcern the write concern
+     */
+    public CommitTransactionOperation(final WriteConcern writeConcern) {
+        this(writeConcern, false);
+    }
+
+    /**
+     * Construct an instance.
+     *
+     * @param writeConcern the write concern
+     * @param alreadyCommitted if the transaction has already been committed.
+     * @since 3.11
+     */
+    public CommitTransactionOperation(final WriteConcern writeConcern, final boolean alreadyCommitted) {
+        super(writeConcern);
+        this.alreadyCommitted = alreadyCommitted;
+    }
+
+    /**
+     * Set the recovery token.
+     *
+     * @param recoveryToken the recovery token
+     * @return the CommitTransactionOperation
+     * @since 3.11
+     */
+    public CommitTransactionOperation recoveryToken(final BsonDocument recoveryToken) {
+        this.recoveryToken = recoveryToken;
+        return this;
+    }
+
+    /**
+     * Sets the maximum execution time on the server for the commitTransaction operation.
+     *
+     * @param maxCommitTime  the max commit time, which must be either null or greater than zero, in the given time unit
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    public CommitTransactionOperation maxCommitTime(@Nullable final Long maxCommitTime, final TimeUnit timeUnit) {
+        if (maxCommitTime == null) {
+            this.maxCommitTimeMS = null;
+        } else {
+            notNull("timeUnit", timeUnit);
+            isTrueArgument("maxCommitTime > 0", maxCommitTime > 0);
+            this.maxCommitTimeMS = MILLISECONDS.convert(maxCommitTime, timeUnit);
+        }
+        return this;
+    }
+
+    /**
+     * Gets the maximum amount of time to allow a single commitTransaction command to execute.  The default is 0, which places no limit on
+     * the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    @Nullable
+    public Long getMaxCommitTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        if (maxCommitTimeMS == null) {
+            return null;
+        }
+        return timeUnit.convert(maxCommitTimeMS, MILLISECONDS);
+    }
+
+    @Override
+    public Void execute(final WriteBinding binding) {
+        try {
+            return super.execute(binding);
+        } catch (MongoException e) {
+            addErrorLabels(e);
+            throw e;
+        }
+    }
+
+    @Override
+    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
+        super.executeAsync(binding, new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                 if (t instanceof MongoException) {
+                     addErrorLabels((MongoException) t);
+                 }
+                 callback.onResult(result, t);
+            }
+        });
+    }
+
+    private void addErrorLabels(final MongoException e) {
+        if (shouldAddUnknownTransactionCommitResultLabel(e)) {
+            e.addLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL);
+        }
+    }
+
+    private static final List<Integer> NON_RETRYABLE_WRITE_CONCERN_ERROR_CODES = asList(79, 100);
+
+    private static boolean shouldAddUnknownTransactionCommitResultLabel(final Throwable t) {
+        if (!(t instanceof MongoException)) {
+            return false;
+        }
+
+        MongoException e = (MongoException) t;
+
+        if (e instanceof MongoSocketException || e instanceof MongoTimeoutException
+                || e instanceof MongoNotPrimaryException || e instanceof MongoNodeIsRecoveringException
+                || e instanceof MongoExecutionTimeoutException) {
+            return true;
+        }
+
+        if (e instanceof MongoWriteConcernException) {
+            return !NON_RETRYABLE_WRITE_CONCERN_ERROR_CODES.contains(e.getCode());
+        }
+
+        return false;
+    }
+
+
+    @Override
+    protected String getCommandName() {
+        return "commitTransaction";
+    }
+
+    @Override
+    CommandCreator getCommandCreator() {
+        final CommandCreator creator = new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                BsonDocument command = CommitTransactionOperation.super.getCommandCreator().create(serverDescription,
+                        connectionDescription);
+                if (maxCommitTimeMS != null) {
+                    command.append("maxTimeMS",
+                            maxCommitTimeMS > Integer.MAX_VALUE
+                            ? new BsonInt64(maxCommitTimeMS) : new BsonInt32(maxCommitTimeMS.intValue()));
+                }
+                return command;
+            }
+        };
+        if (alreadyCommitted) {
+            return new CommandCreator() {
+                @Override
+                public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                    return getRetryCommandModifier().apply(creator.create(serverDescription, connectionDescription));
+                }
+            };
+        } else if (recoveryToken != null) {
+                return new CommandCreator() {
+                    @Override
+                    public BsonDocument create(final ServerDescription serverDescription,
+                                               final ConnectionDescription connectionDescription) {
+                        return creator.create(serverDescription, connectionDescription).append("recoveryToken", recoveryToken);
+                    }
+                };
+        }
+        return creator;
+    }
+
+    @Override
+    protected Function<BsonDocument, BsonDocument> getRetryCommandModifier() {
+        return new Function<BsonDocument, BsonDocument>() {
+            @Override
+            public BsonDocument apply(final BsonDocument command) {
+                WriteConcern retryWriteConcern = getWriteConcern().withW("majority");
+                if (retryWriteConcern.getWTimeout(TimeUnit.MILLISECONDS) == null) {
+                    retryWriteConcern = retryWriteConcern.withWTimeout(10000, TimeUnit.MILLISECONDS);
+                }
+                command.put("writeConcern", retryWriteConcern.asDocument());
+                if (recoveryToken != null) {
+                    command.put("recoveryToken", recoveryToken);
+                }
+                return command;
+            }
+        };
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/CountOperation.java b/driver-core/src/main/com/mongodb/operation/CountOperation.java
index 090efa3eb3b..5e480faae72 100644
--- a/driver-core/src/main/com/mongodb/operation/CountOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/CountOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,47 +18,61 @@
 
 import com.mongodb.ExplainVerbosity;
 import com.mongodb.MongoNamespace;
-import com.mongodb.ReadConcern;
-import com.mongodb.ServerAddress;
+import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncReadBinding;
+import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
-import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
-import com.mongodb.operation.OperationHelper.CallableWithConnection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.client.model.CountStrategy;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.Decoder;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
 import static com.mongodb.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
-import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.checkValidReadConcern;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.ExplainHelper.asExplainCommand;
+import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 
 /**
  * An operation that executes a count.
  *
  * @since 3.0
  */
+@Deprecated
 public class CountOperation implements AsyncReadOperation<Long>, ReadOperation<Long> {
+    private static final Decoder<BsonDocument> DECODER = new BsonDocumentCodec();
     private final MongoNamespace namespace;
+    private final CountStrategy countStrategy;
+    private boolean retryReads;
     private BsonDocument filter;
     private BsonValue hint;
     private long skip;
     private long limit;
     private long maxTimeMS;
-    private ReadConcern readConcern = ReadConcern.DEFAULT;
+    private Collation collation;
 
     /**
      * Construct a new instance.
@@ -66,7 +80,18 @@ public class CountOperation implements AsyncReadOperation<Long>, ReadOperation<L
      * @param namespace the database and collection namespace for the operation.
      */
     public CountOperation(final MongoNamespace namespace) {
+        this(namespace, CountStrategy.COMMAND);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace     the database and collection namespace for the operation.
+     * @param countStrategy the strategy to use for calculating the count.
+     */
+    public CountOperation(final MongoNamespace namespace, final CountStrategy countStrategy) {
         this.namespace = notNull("namespace", namespace);
+        this.countStrategy = notNull("countStrategy", countStrategy);
     }
 
     /**
@@ -91,6 +116,28 @@ public CountOperation filter(final BsonDocument filter) {
         return this;
     }
 
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     */
+    public CountOperation retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
     /**
      * Gets the hint to apply.
      *
@@ -180,64 +227,65 @@ public CountOperation maxTime(final long maxTime, final TimeUnit timeUnit) {
     }
 
     /**
-     * Gets the read concern
+     * Returns the collation options
      *
-     * @return the read concern
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
      */
-    public ReadConcern getReadConcern() {
-        return readConcern;
+    public Collation getCollation() {
+        return collation;
     }
 
     /**
-     * Sets the read concern
-     * @param readConcern the read concern
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
      * @return this
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
      */
-    public CountOperation readConcern(final ReadConcern readConcern) {
-        this.readConcern = notNull("readConcern", readConcern);
+    public CountOperation collation(final Collation collation) {
+        this.collation = collation;
         return this;
     }
 
     @Override
     public Long execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnection<Long>() {
-            @Override
-            public Long call(final Connection connection) {
-                checkValidReadConcern(connection, readConcern);
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), new BsonDocumentCodec(),
-                        connection, transformer());
-            }
-        });
+        if (countStrategy.equals(CountStrategy.COMMAND)) {
+            return executeCommand(binding, namespace.getDatabaseName(),
+                    getCommandCreator(binding.getSessionContext()), DECODER, transformer(), retryReads);
+        } else {
+            BatchCursor<BsonDocument> cursor = getAggregateOperation().execute(binding);
+            return cursor.hasNext() ? getCountFromAggregateResults(cursor.next()) : 0;
+        }
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<Long> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
-            @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<Long> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    final SingleResultCallback<Long> wrappedCallback = releasingCallback(errHandlingCallback, connection);
-                    checkValidReadConcern(connection, readConcern, new AsyncCallableWithConnection() {
-                        @Override
-                        public void call(final AsyncConnection connection, final Throwable t) {
-                            if (t != null) {
-                                wrappedCallback.onResult(null, t);
-                            } else {
-                                executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(),
-                                        new BsonDocumentCodec(), connection, transformer(), wrappedCallback);
+        if (countStrategy.equals(CountStrategy.COMMAND)) {
+            executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()),
+                    DECODER, asyncTransformer(), retryReads, callback);
+        } else {
+            getAggregateOperation().executeAsync(binding, new SingleResultCallback<AsyncBatchCursor<BsonDocument>>(){
+                @Override
+                public void onResult(final AsyncBatchCursor<BsonDocument> result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        result.next(new SingleResultCallback<List<BsonDocument>>() {
+                            @Override
+                            public void onResult(final List<BsonDocument> result, final Throwable t) {
+                                if (t != null) {
+                                    callback.onResult(null, t);
+                                } else {
+                                    callback.onResult(getCountFromAggregateResults(result), null);
+                                }
                             }
-                        }
-                    });
+                        });
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     /**
@@ -247,7 +295,11 @@ public void call(final AsyncConnection connection, final Throwable t) {
      * @return a read operation that when executed will explain this operation
      */
     public ReadOperation<BsonDocument> asExplainableOperation(final ExplainVerbosity explainVerbosity) {
-        return createExplainableOperation(explainVerbosity);
+        if (countStrategy.equals(CountStrategy.COMMAND)) {
+            return createExplainableOperation(explainVerbosity);
+        } else {
+            return getAggregateOperation().asExplainableOperation(explainVerbosity);
+        }
     }
 
     /**
@@ -257,34 +309,91 @@ public ReadOperation<BsonDocument> asExplainableOperation(final ExplainVerbosity
      * @return a read operation that when executed will explain this operation
      */
     public AsyncReadOperation<BsonDocument> asExplainableOperationAsync(final ExplainVerbosity explainVerbosity) {
-        return createExplainableOperation(explainVerbosity);
+        if (countStrategy.equals(CountStrategy.COMMAND)) {
+            return createExplainableOperation(explainVerbosity);
+        } else {
+            return getAggregateOperation().asExplainableOperationAsync(explainVerbosity);
+        }
     }
 
     private CommandReadOperation<BsonDocument> createExplainableOperation(final ExplainVerbosity explainVerbosity) {
         return new CommandReadOperation<BsonDocument>(namespace.getDatabaseName(),
-                                                      ExplainHelper.asExplainCommand(getCommand(), explainVerbosity),
-                                                      new BsonDocumentCodec());
+                asExplainCommand(getCommand(NoOpSessionContext.INSTANCE), explainVerbosity),
+                new BsonDocumentCodec());
     }
 
-    private CommandTransformer<BsonDocument, Long> transformer() {
-        return new CommandTransformer<BsonDocument, Long>() {
+    private CommandReadTransformer<BsonDocument, Long> transformer() {
+        return new CommandReadTransformer<BsonDocument, Long>() {
             @Override
-            public Long apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public Long apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 return (result.getNumber("n")).longValue();
             }
         };
     }
 
-    private BsonDocument getCommand() {
+    private CommandReadTransformerAsync<BsonDocument, Long> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, Long>() {
+            @Override
+            public Long apply(final BsonDocument result, final AsyncConnectionSource source, final AsyncConnection connection) {
+                return (result.getNumber("n")).longValue();
+            }
+        };
+    }
+
+    private CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateReadConcernAndCollation(connectionDescription, sessionContext.getReadConcern(), collation);
+                return getCommand(sessionContext);
+            }
+        };
+    }
+
+    private BsonDocument getCommand(final SessionContext sessionContext) {
         BsonDocument document = new BsonDocument("count", new BsonString(namespace.getCollectionName()));
+
+        appendReadConcernToCommand(sessionContext, document);
+
         putIfNotNull(document, "query", filter);
         putIfNotZero(document, "limit", limit);
         putIfNotZero(document, "skip", skip);
         putIfNotNull(document, "hint", hint);
         putIfNotZero(document, "maxTimeMS", maxTimeMS);
-        if (!readConcern.isServerDefault()) {
-            document.put("readConcern", readConcern.asDocument());
+
+        if (collation != null) {
+            document.put("collation", collation.asDocument());
         }
         return document;
     }
+
+    private AggregateOperation<BsonDocument> getAggregateOperation() {
+        return new AggregateOperation<BsonDocument>(namespace, getPipeline(), DECODER)
+                .retryReads(retryReads)
+                .collation(collation)
+                .hint(hint)
+                .maxTime(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    private List<BsonDocument> getPipeline() {
+        ArrayList<BsonDocument> pipeline = new ArrayList<BsonDocument>();
+        pipeline.add(new BsonDocument("$match", filter != null ? filter : new BsonDocument()));
+        if (skip > 0) {
+            pipeline.add(new BsonDocument("$skip", new BsonInt64(skip)));
+        }
+        if (limit > 0) {
+            pipeline.add(new BsonDocument("$limit", new BsonInt64(limit)));
+        }
+        pipeline.add(new BsonDocument("$group", new BsonDocument("_id", new BsonInt32(1))
+                .append("n", new BsonDocument("$sum", new BsonInt32(1)))));
+        return pipeline;
+    }
+
+    private Long getCountFromAggregateResults(final List<BsonDocument> results) {
+        if (results == null || results.isEmpty()) {
+            return 0L;
+        } else {
+            return results.get(0).getNumber("n").longValue();
+        }
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/CreateCollectionOperation.java b/driver-core/src/main/com/mongodb/operation/CreateCollectionOperation.java
index c98e9f6923c..65489b03ed9 100644
--- a/driver-core/src/main/com/mongodb/operation/CreateCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/CreateCollectionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,37 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.ValidationAction;
 import com.mongodb.client.model.ValidationLevel;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.operation.OperationHelper.CallableWithConnection;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
+import org.bson.BsonInt32;
 import org.bson.BsonString;
-import org.bson.codecs.BsonDocumentCodec;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.DocumentHelper.putIfFalse;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.releasingCallback;
+import static com.mongodb.operation.OperationHelper.validateCollation;
+import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation to create a collection
@@ -38,9 +54,11 @@
  * @since 3.0
  * @mongodb.driver.manual reference/method/db.createCollection Create Collection
  */
+@Deprecated
 public class CreateCollectionOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final String databaseName;
     private final String collectionName;
+    private final WriteConcern writeConcern;
     private boolean capped = false;
     private long sizeInBytes = 0;
     private boolean autoIndex = true;
@@ -51,6 +69,7 @@ public class CreateCollectionOperation implements AsyncWriteOperation<Void>, Wri
     private BsonDocument validator;
     private ValidationLevel validationLevel = null;
     private ValidationAction validationAction = null;
+    private Collation collation = null;
 
     /**
      * Construct a new instance.
@@ -59,8 +78,22 @@ public class CreateCollectionOperation implements AsyncWriteOperation<Void>, Wri
      * @param collectionName the name of the collection to be created.
      */
     public CreateCollectionOperation(final String databaseName, final String collectionName) {
+        this(databaseName, collectionName, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param databaseName   the name of the database for the operation.
+     * @param collectionName the name of the collection to be created.
+     * @param writeConcern   the write concern
+     *
+     * @since 3.4
+     */
+    public CreateCollectionOperation(final String databaseName, final String collectionName, final WriteConcern writeConcern) {
         this.databaseName = notNull("databaseName", databaseName);
         this.collectionName = notNull("collectionName", collectionName);
+        this.writeConcern = writeConcern;
     }
 
     /**
@@ -72,6 +105,17 @@ public String getCollectionName() {
         return collectionName;
     }
 
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     *
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
     /**
      * The auto index value.
      *
@@ -162,7 +206,9 @@ public CreateCollectionOperation sizeInBytes(final long sizeInBytes) {
      * @return usePowerOf2Sizes became the default allocation strategy
      * @mongodb.driver.manual reference/command/collMod/#usePowerOf2Sizes usePowerOf2Sizes
      * @mongodb.server.release 2.6
+     * @deprecated As of MongoDB 3.0, power of 2 sizes is ignored by the MongoDB server
      */
+    @Deprecated
     public Boolean isUsePowerOf2Sizes() {
         return usePowerOf2Sizes;
     }
@@ -176,7 +222,9 @@ public Boolean isUsePowerOf2Sizes() {
      * @return this
      * @mongodb.driver.manual reference/command/collMod/#usePowerOf2Sizes usePowerOf2Sizes
      * @mongodb.server.release 2.6
+     * @deprecated As of MongoDB 3.0, power of 2 sizes is ignored by the MongoDB server
      */
+    @Deprecated
     public CreateCollectionOperation usePowerOf2Sizes(final Boolean usePowerOf2Sizes) {
         this.usePowerOf2Sizes = usePowerOf2Sizes;
         return this;
@@ -303,28 +351,80 @@ public CreateCollectionOperation validationAction(final ValidationAction validat
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public CreateCollectionOperation collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
-        executeWrappedCommandProtocol(binding, databaseName, asDocument(), new BsonDocumentCodec());
-        return null;
+        return withConnection(binding, new CallableWithConnection<Void>() {
+            @Override
+            public Void call(final Connection connection) {
+                validateCollation(connection, collation);
+                executeCommand(binding, databaseName, getCommand(connection.getDescription()), connection,
+                        writeConcernErrorTransformer());
+                return null;
+            }
+        });
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        executeWrappedCommandProtocolAsync(binding, databaseName, asDocument(), new BsonDocumentCodec(),
-                                           new VoidTransformer<BsonDocument>(), callback);
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else {
+                    final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
+                    validateCollation(connection, collation, new AsyncCallableWithConnection() {
+                        @Override
+                        public void call(final AsyncConnection connection, final Throwable t) {
+                            if (t != null) {
+                                wrappedCallback.onResult(null, t);
+                            } else {
+                                executeCommandAsync(binding, databaseName, getCommand(connection.getDescription()),
+                                        connection, writeConcernErrorWriteTransformer(), wrappedCallback);
+                            }
+                        }
+                    });
+                }
+            }
+        });
     }
 
-    private BsonDocument asDocument() {
+    private BsonDocument getCommand(final ConnectionDescription description) {
         BsonDocument document = new BsonDocument("create", new BsonString(collectionName));
+        putIfFalse(document, "autoIndexId", autoIndex);
         document.put("capped", BsonBoolean.valueOf(capped));
         if (capped) {
             putIfNotZero(document, "size", sizeInBytes);
-            document.put("autoIndexId", BsonBoolean.valueOf(autoIndex));
             putIfNotZero(document, "max", maxDocuments);
         }
         if (usePowerOf2Sizes != null) {
-            document.put("usePowerOfTwoSizes", BsonBoolean.valueOf(usePowerOf2Sizes));
+            document.put("flags", new BsonInt32(1));
         }
         if (storageEngineOptions != null) {
             document.put("storageEngine", storageEngineOptions);
@@ -341,6 +441,10 @@ private BsonDocument asDocument() {
         if (validationAction != null) {
             document.put("validationAction", new BsonString(validationAction.getValue()));
         }
+        appendWriteConcernToCommand(writeConcern, document, description);
+        if (collation != null) {
+            document.put("collation", collation.asDocument());
+        }
         return document;
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/CreateIndexesOperation.java b/driver-core/src/main/com/mongodb/operation/CreateIndexesOperation.java
index c3941925caf..ea5146d2862 100644
--- a/driver-core/src/main/com/mongodb/operation/CreateIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/CreateIndexesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import com.mongodb.ErrorCategory;
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoException;
-import com.mongodb.MongoInternalException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.WriteConcernResult;
@@ -28,9 +27,10 @@
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
 import com.mongodb.bulk.IndexRequest;
-import com.mongodb.bulk.InsertRequest;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.internal.operation.IndexHelper;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
@@ -43,18 +43,23 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
-import static com.mongodb.operation.IndexHelper.generateIndexName;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.DocumentHelper.putIfNotZero;
+import static com.mongodb.internal.operation.IndexHelper.generateIndexName;
 import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
 import static com.mongodb.operation.OperationHelper.CallableWithConnection;
 import static com.mongodb.operation.OperationHelper.LOGGER;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
+import static com.mongodb.operation.OperationHelper.validateIndexRequestCollations;
 import static com.mongodb.operation.OperationHelper.withConnection;
-import static java.util.Arrays.asList;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation that creates one or more indexes.
@@ -64,21 +69,49 @@
  * @mongodb.driver.manual reference/command/createIndexes/ Create indexes
  * @since 3.0
  */
+@Deprecated
 public class CreateIndexesOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoNamespace namespace;
     private final List<IndexRequest> requests;
-    private final MongoNamespace systemIndexes;
+    private final WriteConcern writeConcern;
+    private long maxTimeMS;
 
     /**
      * Construct a new instance.
      *
      * @param namespace     the database and collection namespace for the operation.
      * @param requests the index request
+     * @deprecated Prefer {@link #CreateIndexesOperation(MongoNamespace, List, WriteConcern)}
      */
+    @Deprecated
     public CreateIndexesOperation(final MongoNamespace namespace, final List<IndexRequest> requests) {
+        this(namespace, requests, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace     the database and collection namespace for the operation.
+     * @param requests the index request
+     * @param writeConcern the write concern
+     *
+     * @since 3.4
+     */
+    public CreateIndexesOperation(final MongoNamespace namespace, final List<IndexRequest> requests, final WriteConcern writeConcern) {
         this.namespace = notNull("namespace", namespace);
-        this.systemIndexes = new MongoNamespace(namespace.getDatabaseName(), "system.indexes");
         this.requests = notNull("indexRequests", requests);
+        this.writeConcern = writeConcern;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     *
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
     }
 
     /**
@@ -107,22 +140,44 @@ public List<String> getIndexNames() {
         return indexNames;
     }
 
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     * @since 3.6
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @since 3.6
+     */
+    public CreateIndexesOperation maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        isTrueArgument("maxTime >= 0", maxTime >= 0);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
     @Override
     public Void execute(final WriteBinding binding) {
         return withConnection(binding, new CallableWithConnection<Void>() {
             @Override
             public Void call(final Connection connection) {
-                if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                    try {
-                        executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), connection);
-                    } catch (MongoCommandException e) {
-                        throw checkForDuplicateKeyError(e);
-                    }
-                } else {
-                    if (requests.size() > 1) {
-                        throw new MongoInternalException("Creation of multiple indexes simultaneously not supported until MongoDB 2.6");
-                    }
-                    connection.insert(systemIndexes, true, WriteConcern.ACKNOWLEDGED, asList(new InsertRequest(getIndex(requests.get(0)))));
+                try {
+                    validateIndexRequestCollations(connection, requests);
+                    executeCommand(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorTransformer());
+                } catch (MongoCommandException e) {
+                    throw checkForDuplicateKeyError(e);
                 }
                 return null;
             }
@@ -131,7 +186,7 @@ public Void call(final Connection connection) {
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
             @Override
             public void call(final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -139,30 +194,23 @@ public void call(final AsyncConnection connection, final Throwable t) {
                     errHandlingCallback.onResult(null, t);
                 } else {
                     final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
-                    if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(), connection,
-                                new SingleResultCallback<BsonDocument>() {
-                                    @Override
-                                    public void onResult(final BsonDocument result, final Throwable t) {
-                                        wrappedCallback.onResult(null, translateException(t));
-                                    }
-                                });
-                    } else {
-                        if (requests.size() > 1) {
-                            wrappedCallback.onResult(null, new MongoInternalException("Creation of multiple indexes simultaneously not "
-                                                                                      + "supported until MongoDB 2.6"));
+                    validateIndexRequestCollations(connection, requests, new AsyncCallableWithConnection() {
+                        @Override
+                        public void call(final AsyncConnection connection, final Throwable t) {
+                            if (t != null) {
+                                wrappedCallback.onResult(null, t);
+                            } else {
+                                executeCommandAsync(binding, namespace.getDatabaseName(),
+                                        getCommand(connection.getDescription()), connection, writeConcernErrorWriteTransformer(),
+                                        new SingleResultCallback<Void>() {
+                                            @Override
+                                            public void onResult(final Void result, final Throwable t) {
+                                                wrappedCallback.onResult(null, translateException(t));
+                                            }
+                                        });
+                            }
                         }
-                        else {
-                            connection.insertAsync(systemIndexes, true, WriteConcern.ACKNOWLEDGED,
-                                                   asList(new InsertRequest(getIndex(requests.get(0)))),
-                                                   new SingleResultCallback<WriteConcernResult>() {
-                                                       @Override
-                                                       public void onResult(final WriteConcernResult result, final Throwable t) {
-                                                           wrappedCallback.onResult(null, translateException(t));
-                                                       }
-                                                   });
-                        }
-                    }
+                    });
                 }
             }
         });
@@ -224,16 +272,24 @@ private BsonDocument getIndex(final IndexRequest request) {
         if (request.getPartialFilterExpression() != null) {
             index.append("partialFilterExpression", request.getPartialFilterExpression());
         }
+        if (request.getCollation() != null) {
+            index.append("collation", request.getCollation().asDocument());
+        }
+        if (request.getWildcardProjection() != null) {
+            index.append("wildcardProjection", request.getWildcardProjection());
+        }
         return index;
     }
 
-    private BsonDocument getCommand() {
+    private BsonDocument getCommand(final ConnectionDescription description) {
         BsonDocument command = new BsonDocument("createIndexes", new BsonString(namespace.getCollectionName()));
         List<BsonDocument> values = new ArrayList<BsonDocument>();
         for (IndexRequest request : requests) {
             values.add(getIndex(request));
         }
         command.put("indexes", new BsonArray(values));
+        putIfNotZero(command, "maxTimeMS", maxTimeMS);
+        appendWriteConcernToCommand(writeConcern, command, description);
         return command;
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/CreateUserOperation.java b/driver-core/src/main/com/mongodb/operation/CreateUserOperation.java
index 492eb579aae..7f2dee1923a 100644
--- a/driver-core/src/main/com/mongodb/operation/CreateUserOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/CreateUserOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,41 +16,45 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.MongoCommandException;
 import com.mongodb.MongoCredential;
-import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
-import com.mongodb.bulk.InsertRequest;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonDocument;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
 import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
 import static com.mongodb.operation.OperationHelper.CallableWithConnection;
 import static com.mongodb.operation.OperationHelper.LOGGER;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
 import static com.mongodb.operation.OperationHelper.withConnection;
-import static com.mongodb.operation.UserOperationHelper.asCollectionInsertDocument;
 import static com.mongodb.operation.UserOperationHelper.asCommandDocument;
-import static java.util.Arrays.asList;
+import static com.mongodb.operation.UserOperationHelper.translateUserCommandException;
+import static com.mongodb.operation.UserOperationHelper.userCommandCallback;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation to create a user.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class CreateUserOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoCredential credential;
     private final boolean readOnly;
+    private final WriteConcern writeConcern;
 
     /**
      * Construct a new instance.
@@ -59,8 +63,22 @@ public class CreateUserOperation implements AsyncWriteOperation<Void>, WriteOper
      * @param readOnly   true if the user is a readOnly user.
      */
     public CreateUserOperation(final MongoCredential credential, final boolean readOnly) {
+        this(credential, readOnly, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param credential the users credentials.
+     * @param readOnly   true if the user is a readOnly user.
+     * @param writeConcern the write concern
+     *
+     * @since 3.4
+     */
+    public CreateUserOperation(final MongoCredential credential, final boolean readOnly, final WriteConcern writeConcern) {
         this.credential = notNull("credential", credential);
         this.readOnly = readOnly;
+        this.writeConcern = writeConcern;
     }
 
     /**
@@ -86,10 +104,11 @@ public Void execute(final WriteBinding binding) {
         return withConnection(binding, new CallableWithConnection<Void>() {
             @Override
             public Void call(final Connection connection) {
-                if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                    executeWrappedCommandProtocol(binding, getCredential().getSource(), getCommand(), connection);
-                } else {
-                    connection.insert(getNamespace(), true, WriteConcern.ACKNOWLEDGED, asList(getInsertRequest()));
+                try {
+                    executeCommand(binding, getCredential().getSource(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorTransformer());
+                } catch (MongoCommandException e) {
+                    translateUserCommandException(e);
                 }
                 return null;
             }
@@ -98,7 +117,7 @@ public Void call(final Connection connection) {
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
             @Override
             public void call(final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -106,32 +125,16 @@ public void call(final AsyncConnection connection, final Throwable t) {
                     errHandlingCallback.onResult(null, t);
                 } else {
                     final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
-                    if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, credential.getSource(), getCommand(), connection,
-                                                           new VoidTransformer<BsonDocument>(), wrappedCallback);
-                    } else {
-                        connection.insertAsync(getNamespace(), true, WriteConcern.ACKNOWLEDGED,
-                                               asList(getInsertRequest()), new SingleResultCallback<WriteConcernResult>() {
-                            @Override
-                            public void onResult(final WriteConcernResult result, final Throwable t) {
-                                wrappedCallback.onResult(null, t);
-                            }
-                        });
-                    }
+                    executeCommandAsync(binding, credential.getSource(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorWriteTransformer(), userCommandCallback(wrappedCallback));
                 }
             }
         });
     }
 
-    private InsertRequest getInsertRequest() {
-        return new InsertRequest(asCollectionInsertDocument(credential, readOnly));
-    }
-
-    private MongoNamespace getNamespace() {
-        return new MongoNamespace(credential.getSource(), "system.users");
-    }
-
-    private BsonDocument getCommand() {
-        return asCommandDocument(credential, readOnly, "createUser");
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument commandDocument = asCommandDocument(credential, description, readOnly, "createUser");
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        return commandDocument;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/CreateViewOperation.java b/driver-core/src/main/com/mongodb/operation/CreateViewOperation.java
new file mode 100644
index 00000000000..d47c63a9978
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/CreateViewOperation.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.binding.WriteBinding;
+import com.mongodb.client.model.Collation;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import com.mongodb.operation.OperationHelper.CallableWithConnection;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.releasingCallback;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotFour;
+import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
+
+/**
+ * An operation to create a view.
+ *
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ * @mongodb.driver.manual reference/command/create Create
+ */
+@Deprecated
+public class CreateViewOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
+    private final String databaseName;
+    private final String viewName;
+    private final String viewOn;
+    private final List<BsonDocument> pipeline;
+    private final WriteConcern writeConcern;
+    private Collation collation;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param databaseName the name of the database for the operation, which may not be null
+     * @param viewName     the name of the collection to be created, which may not be null
+     * @param viewOn       the name of the collection or view that backs this view, which may not be null
+     * @param pipeline     the aggregation pipeline that defines the view, which may not be null
+     * @param writeConcern the write concern, which may not be null
+     */
+    public CreateViewOperation(final String databaseName, final String viewName, final String viewOn, final List<BsonDocument> pipeline,
+                               final WriteConcern writeConcern) {
+        this.databaseName = notNull("databaseName", databaseName);
+        this.viewName = notNull("viewName", viewName);
+        this.viewOn = notNull("viewOn", viewOn);
+        this.pipeline = notNull("pipeline", pipeline);
+        this.writeConcern = notNull("writeConcern", writeConcern);
+    }
+
+    /**
+     * Gets the database name
+     *
+     * @return the database name
+     */
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    /**
+     * Gets the name of the view to create.
+     *
+     * @return the view name
+     */
+    public String getViewName() {
+        return viewName;
+    }
+
+    /**
+     * Gets the name of the collection or view that backs this view.
+     *
+     * @return the name of the collection or view that backs this view
+     */
+    public String getViewOn() {
+        return viewOn;
+    }
+
+    /**
+     * Gets the pipeline that defines the view.
+     *
+     * @return the pipeline that defines the view
+     */
+    public List<BsonDocument> getPipeline() {
+        return pipeline;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Gets the default collation for the view
+     *
+     * @return the collation, which may be null
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the default collation for the view.
+     *
+     * @param collation the collation, which may be null
+     * @return this
+     */
+    public CreateViewOperation collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public Void execute(final WriteBinding binding) {
+        return withConnection(binding, new CallableWithConnection<Void>() {
+            @Override
+            public Void call(final Connection connection) {
+                if (!serverIsAtLeastVersionThreeDotFour(connection.getDescription())) {
+                    throw createExceptionForIncompatibleServerVersion();
+                }
+                executeCommand(binding, databaseName, getCommand(connection.getDescription()), writeConcernErrorTransformer());
+                return null;
+            }
+        });
+    }
+
+    @Override
+    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                }
+                else {
+                    SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
+                    if (!serverIsAtLeastVersionThreeDotFour(connection.getDescription())) {
+                        wrappedCallback.onResult(null, createExceptionForIncompatibleServerVersion());
+                    }
+                    executeCommandAsync(binding, databaseName, getCommand(connection.getDescription()),
+                            connection, writeConcernErrorWriteTransformer(), wrappedCallback);
+                }
+            }
+        });
+    }
+
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument commandDocument = new BsonDocument("create", new BsonString(viewName))
+                                               .append("viewOn", new BsonString(viewOn))
+                                               .append("pipeline", new BsonArray(pipeline));
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
+
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        return commandDocument;
+    }
+
+    private MongoClientException createExceptionForIncompatibleServerVersion() {
+        return new MongoClientException("Can not create view.  The minimum server version that supports view creation is 3.4");
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/CurrentOpOperation.java b/driver-core/src/main/com/mongodb/operation/CurrentOpOperation.java
index bc8a0d959ee..c638532574b 100644
--- a/driver-core/src/main/com/mongodb/operation/CurrentOpOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/CurrentOpOperation.java
@@ -1,14 +1,14 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -19,13 +19,16 @@
 import com.mongodb.MongoNamespace;
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.operation.OperationHelper.CallableWithConnection;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.codecs.BsonDocumentCodec;
 
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
 import static com.mongodb.operation.OperationHelper.withConnection;
 
 /**
@@ -34,6 +37,7 @@
  * @since 3.2
  * @mongodb.driver.manual reference/method/db.currentOp/ Current Op
  */
+@Deprecated
 public class CurrentOpOperation implements ReadOperation<BsonDocument> {
     @Override
     public BsonDocument execute(final ReadBinding binding) {
@@ -41,7 +45,7 @@ public BsonDocument execute(final ReadBinding binding) {
             @Override
             public BsonDocument call(final Connection connection) {
                 if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
-                    return executeWrappedCommandProtocol(binding, "admin", new BsonDocument("currentOp", new BsonInt32(1)), connection);
+                    return executeCommand(binding, "admin", getCommandCreator(), true);
                 } else {
                     return connection.query(new MongoNamespace("admin", "$cmd.sys.inprog"), new BsonDocument(), null, 0, 1, 0,
                                            binding.getReadPreference().isSlaveOk(), false, false, false, false, false,
@@ -51,4 +55,13 @@ public BsonDocument call(final Connection connection) {
             }
         });
     }
+
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return new BsonDocument("currentOp", new BsonInt32(1));
+            }
+        };
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/CursorHelper.java b/driver-core/src/main/com/mongodb/operation/CursorHelper.java
index 67ebe98c325..c810be76f49 100644
--- a/driver-core/src/main/com/mongodb/operation/CursorHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/CursorHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/operation/DeleteOperation.java b/driver-core/src/main/com/mongodb/operation/DeleteOperation.java
index b0b98f3805d..88745d6ad93 100644
--- a/driver-core/src/main/com/mongodb/operation/DeleteOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/DeleteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,12 @@
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.bulk.DeleteRequest;
 import com.mongodb.bulk.WriteRequest;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
 
 import java.util.List;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -35,6 +31,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class DeleteOperation extends BaseWriteOperation {
     private final List<DeleteRequest> deleteRequests;
 
@@ -45,11 +42,29 @@ public class DeleteOperation extends BaseWriteOperation {
      * @param ordered        whether the writes are ordered.
      * @param writeConcern   the write concern for the operation.
      * @param deleteRequests the remove requests.
+     * @deprecated           use {@link #DeleteOperation(MongoNamespace, boolean, WriteConcern, boolean, List)} instead
      */
+    @Deprecated
     public DeleteOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
                            final List<DeleteRequest> deleteRequests) {
-        super(namespace, ordered, writeConcern);
+        this(namespace, ordered, writeConcern, false, deleteRequests);
+    }
+
+    /**
+     * Construct an instance.
+     *
+     * @param namespace      the database and collection namespace for the operation.
+     * @param ordered        whether the writes are ordered.
+     * @param writeConcern   the write concern for the operation.
+     * @param retryWrites   if writes should be retried if they fail due to a network error.
+     * @param deleteRequests the remove requests.
+     * @since 3.6
+     */
+    public DeleteOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
+                           final boolean retryWrites, final List<DeleteRequest> deleteRequests) {
+        super(namespace, ordered, writeConcern, retryWrites);
         this.deleteRequests = notNull("removes", deleteRequests);
+        isTrueArgument("deleteRequests not empty", !deleteRequests.isEmpty());
     }
 
     /**
@@ -62,24 +77,8 @@ public List<DeleteRequest> getDeleteRequests() {
     }
 
     @Override
-    protected WriteConcernResult executeProtocol(final Connection connection) {
-        return connection.delete(getNamespace(), isOrdered(), getWriteConcern(), deleteRequests);
-    }
-
-    @Override
-    protected void executeProtocolAsync(final AsyncConnection connection,
-                                        final SingleResultCallback<WriteConcernResult> callback) {
-        connection.deleteAsync(getNamespace(), isOrdered(), getWriteConcern(), deleteRequests, callback);
-    }
-
-    @Override
-    protected BulkWriteResult executeCommandProtocol(final Connection connection) {
-        return connection.deleteCommand(getNamespace(), isOrdered(), getWriteConcern(), deleteRequests);
-    }
-
-    @Override
-    protected void executeCommandProtocolAsync(final AsyncConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-        connection.deleteCommandAsync(getNamespace(), isOrdered(), getWriteConcern(), deleteRequests, callback);
+    protected List<? extends WriteRequest> getWriteRequests() {
+        return getDeleteRequests();
     }
 
     @Override
@@ -87,9 +86,4 @@ protected WriteRequest.Type getType() {
         return WriteRequest.Type.DELETE;
     }
 
-    @Override
-    protected int getCount(final BulkWriteResult bulkWriteResult) {
-        return bulkWriteResult.getDeletedCount();
-    }
-
 }
diff --git a/driver-core/src/main/com/mongodb/operation/DistinctOperation.java b/driver-core/src/main/com/mongodb/operation/DistinctOperation.java
index 56260aebe9a..7dd2fe10980 100644
--- a/driver-core/src/main/com/mongodb/operation/DistinctOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/DistinctOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,21 +17,21 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoNamespace;
-import com.mongodb.ReadConcern;
-import com.mongodb.ServerAddress;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncReadBinding;
 import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
-import com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
-import com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.codecs.Codec;
@@ -41,14 +41,14 @@
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
-import static com.mongodb.operation.DocumentHelper.putIfNotNull;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.DocumentHelper.putIfNotNullOrEmpty;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.checkValidReadConcern;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 
 /**
  * Finds the distinct values for a specified field across a single collection.
@@ -59,15 +59,17 @@
  * @mongodb.driver.manual reference/command/distinct Distinct Command
  * @since 3.0
  */
+@Deprecated
 public class DistinctOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
     private static final String VALUES = "values";
 
     private final MongoNamespace namespace;
     private final String fieldName;
     private final Decoder<T> decoder;
+    private boolean retryReads;
     private BsonDocument filter;
     private long maxTimeMS;
-    private ReadConcern readConcern = ReadConcern.DEFAULT;
+    private Collation collation;
 
     /**
      * Construct an instance.
@@ -104,6 +106,29 @@ public DistinctOperation<T> filter(final BsonDocument filter) {
         return this;
     }
 
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @mongodb.driver.manual reference/method/db.collection.find/ Filter
+     * @since 3.11
+     */
+    public DistinctOperation<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
     /**
      * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
      *
@@ -129,66 +154,40 @@ public DistinctOperation<T> maxTime(final long maxTime, final TimeUnit timeUnit)
     }
 
     /**
-     * Gets the read concern
+     * Returns the collation options
      *
-     * @return the read concern
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
      */
-    public ReadConcern getReadConcern() {
-        return readConcern;
+    public Collation getCollation() {
+        return collation;
     }
 
     /**
-     * Sets the read concern
-     * @param readConcern the read concern
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
      * @return this
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @since 3.4
+     * @mongodb.server.release 3.4
      */
-    public DistinctOperation<T> readConcern(final ReadConcern readConcern) {
-        this.readConcern = notNull("readConcern", readConcern);
+    public DistinctOperation<T> collation(final Collation collation) {
+        this.collation = collation;
         return this;
     }
 
     @Override
     public BatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
-            @Override
-            public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
-                checkValidReadConcern(connection, readConcern);
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), createCommandDecoder(),
-                        connection, transformer(source, connection));
-            }
-        });
+        return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()), createCommandDecoder(),
+                transformer(), retryReads);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnectionAndSource() {
-            @Override
-            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = releasingCallback(
-                            errHandlingCallback, source, connection);
-                    checkValidReadConcern(source, connection, readConcern, new AsyncCallableWithConnectionAndSource() {
-                        @Override
-                        public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                            if (t != null) {
-                                wrappedCallback.onResult(null, t);
-                            } else {
-                                executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(),
-                                        createCommandDecoder(),
-                                        connection, asyncTransformer(connection.getDescription()), wrappedCallback);
-                            }
-                        }
-                    });
-                }
-            }
-        });
+        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()), createCommandDecoder(),
+                asyncTransformer(), retryReads, errorHandlingCallback(callback, LOGGER));
     }
 
     private Codec<BsonDocument> createCommandDecoder() {
@@ -200,34 +199,46 @@ private QueryResult<T> createQueryResult(final BsonDocument result, final Connec
                 description.getServerAddress());
     }
 
-    private CommandTransformer<BsonDocument, BatchCursor<T>> transformer(final ConnectionSource source, final Connection connection) {
-        return new CommandTransformer<BsonDocument, BatchCursor<T>>() {
+    private CommandReadTransformer<BsonDocument, BatchCursor<T>> transformer() {
+        return new CommandReadTransformer<BsonDocument, BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public BatchCursor<T> apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 QueryResult<T> queryResult = createQueryResult(result, connection.getDescription());
                 return new QueryBatchCursor<T>(queryResult, 0, 0, decoder, source);
             }
         };
     }
 
-    private CommandTransformer<BsonDocument, AsyncBatchCursor<T>> asyncTransformer(final ConnectionDescription connectionDescription) {
-        return new CommandTransformer<BsonDocument, AsyncBatchCursor<T>>() {
+    private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>>() {
+            @Override
+            public AsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                             final AsyncConnection connection) {
+                QueryResult<T> queryResult = createQueryResult(result, connection.getDescription());
+                return new AsyncSingleBatchQueryCursor<T>(queryResult);
+            }
+        };
+    }
+
+    private CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
             @Override
-            public AsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
-                QueryResult<T> queryResult = createQueryResult(result, connectionDescription);
-                return new AsyncQueryBatchCursor<T>(queryResult, 0, 0, null);
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateReadConcernAndCollation(connectionDescription, sessionContext.getReadConcern(), collation);
+                return getCommand(sessionContext);
             }
         };
     }
 
-    private BsonDocument getCommand() {
-        BsonDocument cmd = new BsonDocument("distinct", new BsonString(namespace.getCollectionName()));
-        cmd.put("key", new BsonString(fieldName));
-        putIfNotNull(cmd, "query", filter);
-        putIfNotZero(cmd, "maxTimeMS", maxTimeMS);
-        if (!readConcern.isServerDefault()) {
-            cmd.put("readConcern", readConcern.asDocument());
+    private BsonDocument getCommand(final SessionContext sessionContext) {
+        BsonDocument commandDocument = new BsonDocument("distinct", new BsonString(namespace.getCollectionName()));
+        appendReadConcernToCommand(sessionContext, commandDocument);
+        commandDocument.put("key", new BsonString(fieldName));
+        putIfNotNullOrEmpty(commandDocument, "query", filter);
+        putIfNotZero(commandDocument, "maxTimeMS", maxTimeMS);
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
         }
-        return cmd;
+        return commandDocument;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/DocumentHelper.java b/driver-core/src/main/com/mongodb/operation/DocumentHelper.java
index d8de3b12030..28103f271ce 100644
--- a/driver-core/src/main/com/mongodb/operation/DocumentHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/DocumentHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,18 @@ static void putIfTrue(final BsonDocument command, final String key, final boolea
         }
     }
 
+    static void putIfFalse(final BsonDocument command, final String key, final boolean condition) {
+        if (!condition) {
+            command.put(key, BsonBoolean.FALSE);
+        }
+    }
+
+    static void putIfNotNullOrEmpty(final BsonDocument command, final String key, final BsonDocument documentValue) {
+        if (documentValue != null && !documentValue.isEmpty()) {
+            command.put(key, documentValue);
+        }
+    }
+
     static void putIfNotNull(final BsonDocument command, final String key, final BsonValue value) {
         if (value != null) {
             command.put(key, value);
diff --git a/driver-core/src/main/com/mongodb/operation/DropCollectionOperation.java b/driver-core/src/main/com/mongodb/operation/DropCollectionOperation.java
index fe0856243ef..575c27e2a00 100644
--- a/driver-core/src/main/com/mongodb/operation/DropCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/DropCollectionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,31 @@
 
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import com.mongodb.operation.OperationHelper.CallableWithConnection;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.CommandOperationHelper.isNamespaceError;
+import static com.mongodb.operation.CommandOperationHelper.rethrowIfNotNamespaceError;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.releasingCallback;
+import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * Operation to drop a Collection in MongoDB.  The {@code execute} method throws MongoCommandFailureException if something goes wrong, but
@@ -36,45 +50,90 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class DropCollectionOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoNamespace namespace;
+    private final WriteConcern writeConcern;
 
     /**
      * Construct a new instance.
      *
      * @param namespace the database and collection namespace for the operation.
+     * @deprecated Prefer {@link #DropCollectionOperation(MongoNamespace, WriteConcern)}
      */
+    @Deprecated
     public DropCollectionOperation(final MongoNamespace namespace) {
+        this(namespace, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace    the database and collection namespace for the operation.
+     * @param writeConcern the write concern
+     * @since 3.4
+     */
+    public DropCollectionOperation(final MongoNamespace namespace, final WriteConcern writeConcern) {
         this.namespace = notNull("namespace", namespace);
+        this.writeConcern = writeConcern;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
     }
 
     @Override
     public Void execute(final WriteBinding binding) {
-        try {
-            executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand());
-        } catch (MongoCommandException e) {
-            CommandOperationHelper.rethrowIfNotNamespaceError(e);
-        }
-        return null;
+        return withConnection(binding, new CallableWithConnection<Void>() {
+            @Override
+            public Void call(final Connection connection) {
+                try {
+                    executeCommand(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorTransformer());
+                } catch (MongoCommandException e) {
+                    rethrowIfNotNamespaceError(e);
+                }
+                return null;
+            }
+        });
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(), new VoidTransformer<BsonDocument>(),
-                                           new SingleResultCallback<Void>() {
-                                               @Override
-                                               public void onResult(final Void result, final Throwable t) {
-                                                   if (t != null && !isNamespaceError(t)) {
-                                                       callback.onResult(null, t);
-                                                   } else {
-                                                       callback.onResult(result, null);
-                                                   }
-                                               }
-                                           });
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else {
+                    final SingleResultCallback<Void> releasingCallback = releasingCallback(errHandlingCallback, connection);
+                    executeCommandAsync(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorWriteTransformer(), new SingleResultCallback<Void>() {
+                                @Override
+                                public void onResult(final Void result, final Throwable t) {
+                                    if (t != null && !isNamespaceError(t)) {
+                                        releasingCallback.onResult(null, t);
+                                    } else {
+                                        releasingCallback.onResult(result, null);
+                                    }
+                                }
+                            });
+                }
+            }
+        });
     }
 
-    private BsonDocument getCommand() {
-        return new BsonDocument("drop", new BsonString(namespace.getCollectionName()));
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument commandDocument = new BsonDocument("drop", new BsonString(namespace.getCollectionName()));
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        return commandDocument;
     }
 
 }
diff --git a/driver-core/src/main/com/mongodb/operation/DropDatabaseOperation.java b/driver-core/src/main/com/mongodb/operation/DropDatabaseOperation.java
index 89b147405b2..ad120e6d026 100644
--- a/driver-core/src/main/com/mongodb/operation/DropDatabaseOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/DropDatabaseOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,29 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.releasingCallback;
+import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import static com.mongodb.operation.OperationHelper.CallableWithConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * Operation to drop a database in MongoDB.  The {@code execute} method throws MongoCommandFailureException if something goes wrong, but
@@ -33,26 +46,77 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class DropDatabaseOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private static final BsonDocument DROP_DATABASE = new BsonDocument("dropDatabase", new BsonInt32(1));
     private final String databaseName;
+    private final WriteConcern writeConcern;
 
     /**
      * Construct a new instance.
      *
      * @param databaseName the name of the database for the operation.
      */
+    @Deprecated
     public DropDatabaseOperation(final String databaseName) {
+        this(databaseName, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param databaseName the name of the database for the operation.
+     * @param writeConcern the write concern
+     *
+     * @since 3.4
+     */
+    public DropDatabaseOperation(final String databaseName, final WriteConcern writeConcern) {
         this.databaseName = notNull("databaseName", databaseName);
+        this.writeConcern = writeConcern;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     *
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
     }
 
     @Override
     public Void execute(final WriteBinding binding) {
-        return executeWrappedCommandProtocol(binding, databaseName, DROP_DATABASE, new VoidTransformer<BsonDocument>());
+        return withConnection(binding, new CallableWithConnection<Void>() {
+            @Override
+            public Void call(final Connection connection) {
+                executeCommand(binding, databaseName, getCommand(connection.getDescription()), connection, writeConcernErrorTransformer());
+                return null;
+            }
+        });
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        executeWrappedCommandProtocolAsync(binding, databaseName, DROP_DATABASE, new VoidTransformer<BsonDocument>(), callback);
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else {
+                    executeCommandAsync(binding, databaseName, getCommand(connection.getDescription()), connection,
+                            writeConcernErrorWriteTransformer(), releasingCallback(errHandlingCallback, connection));
+
+                }
+            }
+        });
+    }
+
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument commandDocument = new BsonDocument("dropDatabase", new BsonInt32(1));
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        return commandDocument;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/DropIndexOperation.java b/driver-core/src/main/com/mongodb/operation/DropIndexOperation.java
index f92b8732e77..56e642f2e84 100644
--- a/driver-core/src/main/com/mongodb/operation/DropIndexOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/DropIndexOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,77 +18,193 @@
 
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import com.mongodb.operation.OperationHelper.CallableWithConnection;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.CommandOperationHelper.isNamespaceError;
-import static com.mongodb.operation.IndexHelper.generateIndexName;
+import static com.mongodb.operation.CommandOperationHelper.rethrowIfNotNamespaceError;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.DocumentHelper.putIfNotZero;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.releasingCallback;
+import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation that drops an index.
  *
- * @since 3.0
  * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+ * @since 3.0
  */
+@Deprecated
 public class DropIndexOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoNamespace namespace;
     private final String indexName;
+    private final BsonDocument indexKeys;
+    private final WriteConcern writeConcern;
+    private long maxTimeMS;
 
     /**
      * Construct a new instance.
      *
      * @param namespace the database and collection namespace for the operation.
      * @param indexName the name of the index to be dropped.
+     * @deprecated Prefer {@link #DropIndexOperation(MongoNamespace, String, WriteConcern)}
      */
+    @Deprecated
     public DropIndexOperation(final MongoNamespace namespace, final String indexName) {
-        this.namespace = notNull("namespace", namespace);
-        this.indexName = notNull("indexName", indexName);
+        this(namespace, indexName, null);
     }
 
     /**
      * Construct a new instance.
      *
      * @param namespace the database and collection namespace for the operation.
-     * @param keys the keys of the index to be dropped
+     * @param keys      the keys of the index to be dropped
+     * @deprecated Prefer {@link #DropIndexOperation(MongoNamespace, BsonDocument, WriteConcern)}
      */
+    @Deprecated
     public DropIndexOperation(final MongoNamespace namespace, final BsonDocument keys) {
+        this(namespace, keys, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace    the database and collection namespace for the operation.
+     * @param indexName    the name of the index to be dropped.
+     * @param writeConcern the write concern
+     * @since 3.4
+     */
+    public DropIndexOperation(final MongoNamespace namespace, final String indexName, final WriteConcern writeConcern) {
+        this.namespace = notNull("namespace", namespace);
+        this.indexName = notNull("indexName", indexName);
+        this.indexKeys = null;
+        this.writeConcern = writeConcern;
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace    the database and collection namespace for the operation.
+     * @param indexKeys    the keys of the index to be dropped
+     * @param writeConcern the write concern
+     * @since 3.4
+     */
+    public DropIndexOperation(final MongoNamespace namespace, final BsonDocument indexKeys, final WriteConcern writeConcern) {
         this.namespace = notNull("namespace", namespace);
-        this.indexName = generateIndexName(notNull("keys", keys));
+        this.indexKeys = notNull("indexKeys", indexKeys);
+        this.indexName = null;
+        this.writeConcern = writeConcern;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     * @since 3.6
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @since 3.6
+     */
+    public DropIndexOperation maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        isTrueArgument("maxTime >= 0", maxTime >= 0);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
     }
 
     @Override
     public Void execute(final WriteBinding binding) {
-        try {
-            executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand());
-        } catch (MongoCommandException e) {
-            CommandOperationHelper.rethrowIfNotNamespaceError(e);
-        }
-        return null;
+        return withConnection(binding, new CallableWithConnection<Void>() {
+            @Override
+            public Void call(final Connection connection) {
+                try {
+                    executeCommand(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()), connection,
+                            writeConcernErrorTransformer());
+                } catch (MongoCommandException e) {
+                    rethrowIfNotNamespaceError(e);
+                }
+                return null;
+            }
+        });
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(), new VoidTransformer<BsonDocument>(),
-                                           new SingleResultCallback<Void>() {
-                                               @Override
-                                               public void onResult(final Void result, final Throwable t) {
-                                                   if (t != null && !isNamespaceError(t)) {
-                                                       callback.onResult(null, t);
-                                                   } else {
-                                                       callback.onResult(result, null);
-                                                   }
-                                               }
-                                           });
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else {
+                    final SingleResultCallback<Void> releasingCallback = releasingCallback(errHandlingCallback, connection);
+                    executeCommandAsync(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorWriteTransformer(), new SingleResultCallback<Void>() {
+                                @Override
+                                public void onResult(final Void result, final Throwable t) {
+                                    if (t != null && !isNamespaceError(t)) {
+                                        releasingCallback.onResult(null, t);
+                                    } else {
+                                        releasingCallback.onResult(result, null);
+                                    }
+                                }
+                            });
+                }
+            }
+        });
     }
 
-    private BsonDocument getCommand() {
-        return new BsonDocument("dropIndexes", new BsonString(namespace.getCollectionName())).append("index", new BsonString(indexName));
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument command = new BsonDocument("dropIndexes", new BsonString(namespace.getCollectionName()));
+        if (indexName != null) {
+            command.put("index", new BsonString(indexName));
+        } else {
+            command.put("index", indexKeys);
+        }
+
+        putIfNotZero(command, "maxTimeMS", maxTimeMS);
+        appendWriteConcernToCommand(writeConcern, command, description);
+        return command;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/DropUserOperation.java b/driver-core/src/main/com/mongodb/operation/DropUserOperation.java
index 4a0b684c469..4fc1fe003fb 100644
--- a/driver-core/src/main/com/mongodb/operation/DropUserOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/DropUserOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,39 +16,44 @@
 
 package com.mongodb.operation;
 
-import com.mongodb.MongoNamespace;
+import com.mongodb.MongoCommandException;
 import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
-import com.mongodb.bulk.DeleteRequest;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
-import com.mongodb.operation.CommandOperationHelper.VoidTransformer;
+import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
 import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
 import static com.mongodb.operation.OperationHelper.CallableWithConnection;
 import static com.mongodb.operation.OperationHelper.LOGGER;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
 import static com.mongodb.operation.OperationHelper.withConnection;
-import static java.util.Arrays.asList;
+import static com.mongodb.operation.UserOperationHelper.translateUserCommandException;
+import static com.mongodb.operation.UserOperationHelper.userCommandCallback;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation to remove a user.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class DropUserOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final String databaseName;
     private final String userName;
+    private final WriteConcern writeConcern;
 
     /**
      * Construct a new instance.
@@ -57,8 +62,22 @@ public class DropUserOperation implements AsyncWriteOperation<Void>, WriteOperat
      * @param userName     the name of the user to be dropped.
      */
     public DropUserOperation(final String databaseName, final String userName) {
+        this(databaseName, userName, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param databaseName the name of the database for the operation.
+     * @param userName     the name of the user to be dropped.
+     * @param writeConcern the write concern
+     *
+     * @since 3.4
+     */
+    public DropUserOperation(final String databaseName, final String userName, final WriteConcern writeConcern) {
         this.databaseName = notNull("databaseName", databaseName);
         this.userName = notNull("userName", userName);
+        this.writeConcern = writeConcern;
     }
 
     @Override
@@ -66,10 +85,11 @@ public Void execute(final WriteBinding binding) {
         return withConnection(binding, new CallableWithConnection<Void>() {
             @Override
             public Void call(final Connection connection) {
-                if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                    executeWrappedCommandProtocol(binding, databaseName, getCommand(), connection);
-                } else {
-                    connection.delete(getNamespace(), true, WriteConcern.ACKNOWLEDGED, asList(getDeleteRequest()));
+                try {
+                    executeCommand(binding, databaseName, getCommand(connection.getDescription()), connection,
+                            writeConcernErrorTransformer());
+                } catch (MongoCommandException e) {
+                    translateUserCommandException(e);
                 }
                 return null;
             }
@@ -78,7 +98,7 @@ public Void call(final Connection connection) {
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
             @Override
             public void call(final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -86,33 +106,17 @@ public void call(final AsyncConnection connection, final Throwable t) {
                     errHandlingCallback.onResult(null, t);
                 } else {
                     final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
+                    executeCommandAsync(binding, databaseName, getCommand(connection.getDescription()), connection,
+                            writeConcernErrorWriteTransformer(), userCommandCallback(wrappedCallback));
 
-                    if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, databaseName, getCommand(), connection,
-                                new VoidTransformer<BsonDocument>(), wrappedCallback);
-                    } else {
-                        connection.deleteAsync(getNamespace(), true, WriteConcern.ACKNOWLEDGED, asList(getDeleteRequest()),
-                                               new SingleResultCallback<WriteConcernResult>() {
-                                                   @Override
-                                                   public void onResult(final WriteConcernResult result, final Throwable t) {
-                                                       wrappedCallback.onResult(null, t);
-                                                   }
-                                               });
-                    }
                 }
             }
         });
     }
 
-    private MongoNamespace getNamespace() {
-        return new MongoNamespace(databaseName, "system.users");
-    }
-
-    private DeleteRequest getDeleteRequest() {
-        return new DeleteRequest(new BsonDocument("user", new BsonString(userName)));
-    }
-
-    private BsonDocument getCommand() {
-        return new BsonDocument("dropUser", new BsonString(userName));
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument commandDocument = new BsonDocument("dropUser", new BsonString(userName));
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        return commandDocument;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/ExplainHelper.java b/driver-core/src/main/com/mongodb/operation/ExplainHelper.java
index b4580437657..12cdf9d02d0 100644
--- a/driver-core/src/main/com/mongodb/operation/ExplainHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/ExplainHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/operation/FindAndDeleteOperation.java b/driver-core/src/main/com/mongodb/operation/FindAndDeleteOperation.java
index fabaaf9dfed..e0e6c8bff21 100644
--- a/driver-core/src/main/com/mongodb/operation/FindAndDeleteOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/FindAndDeleteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,102 +18,79 @@
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.binding.AsyncWriteBinding;
-import com.mongodb.binding.WriteBinding;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
-import com.mongodb.operation.OperationHelper.CallableWithConnection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
+import org.bson.FieldNameValidator;
 import org.bson.codecs.Decoder;
 
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
 import static com.mongodb.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
-import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.validateCollation;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
  * An operation that atomically finds and deletes a single document.
  *
  * @param <T> the operations result type.
- * @since 3.0
  * @mongodb.driver.manual reference/command/findAndModify/ findAndModify
+ * @since 3.0
  */
-public class FindAndDeleteOperation<T> implements AsyncWriteOperation<T>, WriteOperation<T> {
-    private final MongoNamespace namespace;
-    private final Decoder<T> decoder;
+@Deprecated
+public class FindAndDeleteOperation<T> extends BaseFindAndModifyOperation<T> {
     private BsonDocument filter;
     private BsonDocument projection;
     private BsonDocument sort;
     private long maxTimeMS;
-    private WriteConcern writeConcern;
+    private Collation collation;
 
     /**
      * Construct a new instance.
      *
      * @param namespace the database and collection namespace for the operation.
-     * @param decoder the decoder for the result documents.
-     * @deprecated use {@link #FindAndDeleteOperation(MongoNamespace, WriteConcern, Decoder)} instead
+     * @param decoder   the decoder for the result documents.
+     * @deprecated      use {@link #FindAndDeleteOperation(MongoNamespace, WriteConcern, boolean, Decoder)} instead
      */
     @Deprecated
     public FindAndDeleteOperation(final MongoNamespace namespace, final Decoder<T> decoder) {
-        this(namespace, WriteConcern.ACKNOWLEDGED, decoder);
+        this(namespace, WriteConcern.ACKNOWLEDGED, false, decoder);
     }
 
     /**
      * Construct a new instance.
      *
-     * @param namespace the database and collection namespace for the operation.
+     * @param namespace    the database and collection namespace for the operation.
      * @param writeConcern the writeConcern for the operation
-     * @param decoder the decoder for the result documents.
+     * @param decoder      the decoder for the result documents.
      * @since 3.2
+     * @deprecated         use {@link #FindAndDeleteOperation(MongoNamespace, WriteConcern, boolean, Decoder)} instead
      */
+    @Deprecated
     public FindAndDeleteOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final Decoder<T> decoder) {
-        this.namespace = notNull("namespace", namespace);
-        this.writeConcern = notNull("writeConcern", writeConcern);
-        this.decoder = notNull("decoder", decoder);
-    }
-
-    /**
-     * Gets the namespace.
-     *
-     * @return the namespace
-     */
-    public MongoNamespace getNamespace() {
-        return namespace;
+        this(namespace, writeConcern, false, decoder);
     }
 
     /**
-     * Get the write concern for this operation
-     *
-     * @return the {@link com.mongodb.WriteConcern}
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     */
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    /**
-     * Gets the decoder used to decode the result documents.
+     * Construct a new instance.
      *
-     * @return the decoder
+     * @param namespace    the database and collection namespace for the operation.
+     * @param writeConcern the writeConcern for the operation
+     * @param retryWrites  if writes should be retried if they fail due to a network error.
+     * @param decoder      the decoder for the result documents.
+     * @since 3.6
      */
-    public Decoder<T> getDecoder() {
-        return decoder;
+    public FindAndDeleteOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites,
+                                  final Decoder<T> decoder) {
+        super(namespace, writeConcern, retryWrites, decoder);
     }
 
     /**
@@ -208,46 +185,66 @@ public FindAndDeleteOperation<T> sort(final BsonDocument sort) {
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public FindAndDeleteOperation<T> collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    protected String getDatabaseName() {
+        return getNamespace().getDatabaseName();
+    }
+
     @Override
-    public T execute(final WriteBinding binding) {
-        return withConnection(binding, new CallableWithConnection<T>() {
+    protected CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
             @Override
-            public T call(final Connection connection) {
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                        CommandResultDocumentCodec.create(decoder, "value"), connection,
-                        FindAndModifyHelper.<T>transformer());
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return createCommand(sessionContext, serverDescription, connectionDescription);
             }
-        });
+        };
+    }
+
+    private BsonDocument createCommand(final SessionContext sessionContext, final ServerDescription serverDescription,
+                                       final ConnectionDescription connectionDescription) {
+        validateCollation(connectionDescription, collation);
+        BsonDocument commandDocument = new BsonDocument("findAndModify", new BsonString(getNamespace().getCollectionName()));
+        putIfNotNull(commandDocument, "query", getFilter());
+        putIfNotNull(commandDocument, "fields", getProjection());
+        putIfNotNull(commandDocument, "sort", getSort());
+        putIfNotZero(commandDocument, "maxTimeMS", getMaxTime(MILLISECONDS));
+        commandDocument.put("remove", BsonBoolean.TRUE);
+        addWriteConcernToCommand(connectionDescription, commandDocument, sessionContext);
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
+        addTxnNumberToCommand(serverDescription, connectionDescription, commandDocument, sessionContext);
+        return commandDocument;
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<T> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
-                    @Override
-                    public void call(final AsyncConnection connection, final Throwable t) {
-                        SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                        if (t != null) {
-                            errHandlingCallback.onResult(null, t);
-                        } else {
-                            executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(),
-                                    asCommandDocument(connection.getDescription()),  CommandResultDocumentCodec.create(decoder, "value"),
-                                    connection, FindAndModifyHelper.<T>transformer(),
-                                    releasingCallback(errHandlingCallback, connection));
-                        }
-                    }
-                });
-    }
-
-    private BsonDocument asCommandDocument(final ConnectionDescription description) {
-        BsonDocument command = new BsonDocument("findandmodify", new BsonString(namespace.getCollectionName()));
-        putIfNotNull(command, "query", getFilter());
-        putIfNotNull(command, "fields", getProjection());
-        putIfNotNull(command, "sort", getSort());
-        putIfNotZero(command, "maxTimeMS", getMaxTime(MILLISECONDS));
-        command.put("remove", BsonBoolean.TRUE);
-        if (serverIsAtLeastVersionThreeDotTwo(description) && writeConcern.isAcknowledged() && !writeConcern.isServerDefault()) {
-            command.put("writeConcern", writeConcern.asDocument());
-        }
-        return command;
+    protected FieldNameValidator getFieldNameValidator() {
+        return new NoOpFieldNameValidator();
     }
+
 }
diff --git a/driver-core/src/main/com/mongodb/operation/FindAndModifyHelper.java b/driver-core/src/main/com/mongodb/operation/FindAndModifyHelper.java
index 7b8796ee232..abdfc7c0705 100644
--- a/driver-core/src/main/com/mongodb/operation/FindAndModifyHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/FindAndModifyHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,38 +19,49 @@
 import com.mongodb.MongoWriteConcernException;
 import com.mongodb.ServerAddress;
 import com.mongodb.WriteConcernResult;
-import com.mongodb.bulk.WriteConcernError;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.operation.CommandOperationHelper.CommandWriteTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandWriteTransformerAsync;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 
+import static com.mongodb.internal.operation.WriteConcernHelper.createWriteConcernError;
+import static com.mongodb.internal.operation.WriteConcernHelper.hasWriteConcernError;
+
 final class FindAndModifyHelper {
 
-    static <T> CommandTransformer<BsonDocument, T> transformer() {
-        return new CommandTransformer<BsonDocument, T>() {
+    static <T> CommandWriteTransformer<BsonDocument, T> transformer() {
+        return new CommandWriteTransformer<BsonDocument, T>() {
             @SuppressWarnings("unchecked")
             @Override
-            public T apply(final BsonDocument result, final ServerAddress serverAddress) {
-                if (result.containsKey("writeConcernError")) {
-                    throw new MongoWriteConcernException(createWriteConcernError(result.getDocument("writeConcernError")),
-                                                         createWriteConcernResult(result.getDocument("lastErrorObject",
-                                                                                                     new BsonDocument())),
-                                                         serverAddress);
-                }
+            public T apply(final BsonDocument result, final Connection connection) {
+                return transformDocument(result, connection.getDescription().getServerAddress());
+            }
+        };
+    }
 
-                if (!result.isDocument("value")) {
-                    return null;
-                }
-                return BsonDocumentWrapperHelper.toDocument(result.getDocument("value", null));
+    static <T> CommandWriteTransformerAsync<BsonDocument, T> asyncTransformer() {
+        return new CommandWriteTransformerAsync<BsonDocument, T>() {
+            @SuppressWarnings("unchecked")
+            @Override
+            public T apply(final BsonDocument result, final AsyncConnection connection) {
+                return transformDocument(result, connection.getDescription().getServerAddress());
             }
         };
     }
 
-    private static WriteConcernError createWriteConcernError(final BsonDocument writeConcernErrorDocument) {
-        return new WriteConcernError(writeConcernErrorDocument.getNumber("code").intValue(),
-                                     writeConcernErrorDocument.getString("errmsg").getValue(),
-                                     writeConcernErrorDocument.getDocument("errInfo", new BsonDocument()));
+    private static <T> T transformDocument(final BsonDocument result, final ServerAddress serverAddress) {
+        if (hasWriteConcernError(result)) {
+            throw new MongoWriteConcernException(createWriteConcernError(result.getDocument("writeConcernError")),
+                    createWriteConcernResult(result.getDocument("lastErrorObject", new BsonDocument())), serverAddress);
+        }
+
+        if (!result.isDocument("value")) {
+            return null;
+        }
+        return BsonDocumentWrapperHelper.toDocument(result.getDocument("value", null));
     }
 
     private static WriteConcernResult createWriteConcernResult(final BsonDocument result) {
diff --git a/driver-core/src/main/com/mongodb/operation/FindAndReplaceOperation.java b/driver-core/src/main/com/mongodb/operation/FindAndReplaceOperation.java
index 2afb18d5a82..aca4f1a62a8 100644
--- a/driver-core/src/main/com/mongodb/operation/FindAndReplaceOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/FindAndReplaceOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,13 @@
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.binding.AsyncWriteBinding;
-import com.mongodb.binding.WriteBinding;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.internal.validator.CollectibleDocumentFieldNameValidator;
 import com.mongodb.internal.validator.MappedFieldNameValidator;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
-import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
-import com.mongodb.operation.OperationHelper.CallableWithConnection;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -40,16 +36,12 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
 import static com.mongodb.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.operation.DocumentHelper.putIfTrue;
-import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.validateCollation;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -59,11 +51,9 @@
  * @since 3.0
  * @mongodb.driver.manual reference/command/findAndModify/ findAndModify
  */
-public class FindAndReplaceOperation<T> implements AsyncWriteOperation<T>, WriteOperation<T> {
-    private final MongoNamespace namespace;
-    private final Decoder<T> decoder;
+@Deprecated
+public class FindAndReplaceOperation<T> extends BaseFindAndModifyOperation<T> {
     private final BsonDocument replacement;
-    private final WriteConcern writeConcern;
     private BsonDocument filter;
     private BsonDocument projection;
     private BsonDocument sort;
@@ -71,6 +61,7 @@ public class FindAndReplaceOperation<T> implements AsyncWriteOperation<T>, Write
     private boolean returnOriginal = true;
     private boolean upsert;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
 
     /**
      * Construct a new instance.
@@ -78,11 +69,11 @@ public class FindAndReplaceOperation<T> implements AsyncWriteOperation<T>, Write
      * @param namespace   the database and collection namespace for the operation.
      * @param decoder     the decoder for the result documents.
      * @param replacement the document that will replace the found document.
-     * @deprecated use {@link #FindAndReplaceOperation(MongoNamespace, WriteConcern, Decoder, BsonDocument)} instead
+     * @deprecated use {@link #FindAndReplaceOperation(MongoNamespace, WriteConcern, boolean, Decoder, BsonDocument)} instead
      */
     @Deprecated
     public FindAndReplaceOperation(final MongoNamespace namespace, final Decoder<T> decoder, final BsonDocument replacement) {
-        this(namespace, WriteConcern.ACKNOWLEDGED, decoder, replacement);
+        this(namespace, WriteConcern.ACKNOWLEDGED, false, decoder, replacement);
     }
 
     /**
@@ -93,42 +84,28 @@ public FindAndReplaceOperation(final MongoNamespace namespace, final Decoder<T>
      * @param decoder     the decoder for the result documents.
      * @param replacement the document that will replace the found document.
      * @since 3.2
+     * @deprecated use {@link #FindAndReplaceOperation(MongoNamespace, WriteConcern, boolean, Decoder, BsonDocument)} instead
      */
+    @Deprecated
     public FindAndReplaceOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final Decoder<T> decoder,
                                    final BsonDocument replacement) {
-        this.namespace = notNull("namespace", namespace);
-        this.writeConcern = notNull("writeConcern", writeConcern);
-        this.decoder = notNull("decoder", decoder);
-        this.replacement = notNull("replacement", replacement);
-    }
-
-    /**
-     * Gets the namespace.
-     *
-     * @return the namespace
-     */
-    public MongoNamespace getNamespace() {
-        return namespace;
+        this(namespace, writeConcern, false, decoder, replacement);
     }
 
     /**
-     * Get the write concern for this operation
-     *
-     * @return the {@link com.mongodb.WriteConcern}
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     */
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    /**
-     * Gets the decoder used to decode the result documents.
+     * Construct a new instance.
      *
-     * @return the decoder
+     * @param namespace   the database and collection namespace for the operation.
+     * @param writeConcern the writeConcern for the operation
+     * @param retryWrites  if writes should be retried if they fail due to a network error.
+     * @param decoder     the decoder for the result documents.
+     * @param replacement the document that will replace the found document.
+     * @since 3.6
      */
-    public Decoder<T> getDecoder() {
-        return decoder;
+    public FindAndReplaceOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites,
+                                   final Decoder<T> decoder, final BsonDocument replacement) {
+        super(namespace, writeConcern, retryWrites, decoder);
+        this.replacement = notNull("replacement", replacement);
     }
 
     /**
@@ -284,8 +261,6 @@ public Boolean getBypassDocumentValidation() {
     /**
      * Sets the bypass document level validation flag.
      *
-     * <p>Note: This only applies when an $out stage is specified</p>.
-     *
      * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
      * @return this
      * @since 3.2
@@ -297,54 +272,71 @@ public FindAndReplaceOperation<T> bypassDocumentValidation(final Boolean bypassD
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public FindAndReplaceOperation<T> collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
     @Override
-    public T execute(final WriteBinding binding) {
-        return withConnection(binding, new CallableWithConnection<T>() {
-            @Override
-            public T call(final Connection connection) {
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                        getValidator(), CommandResultDocumentCodec.create(decoder, "value"), connection,
-                        FindAndModifyHelper.<T>transformer());
-            }
-        });
+    protected String getDatabaseName() {
+        return getNamespace().getDatabaseName();
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<T> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+    protected CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
             @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                            getValidator(), CommandResultDocumentCodec.create(decoder, "value"), connection,
-                            FindAndModifyHelper.<T>transformer(), releasingCallback(errHandlingCallback, connection));
-                }
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return createCommand(sessionContext, serverDescription, connectionDescription);
             }
-        });
+        };
     }
 
-    private BsonDocument asCommandDocument(final ConnectionDescription description) {
-        BsonDocument command = new BsonDocument("findandmodify", new BsonString(namespace.getCollectionName()));
-        putIfNotNull(command, "query", getFilter());
-        putIfNotNull(command, "fields", getProjection());
-        putIfNotNull(command, "sort", getSort());
-        putIfTrue(command, "new", !isReturnOriginal());
-        putIfTrue(command, "upsert", isUpsert());
-        putIfNotZero(command, "maxTimeMS", getMaxTime(MILLISECONDS));
-        command.put("update", getReplacement());
-        if (bypassDocumentValidation != null && serverIsAtLeastVersionThreeDotTwo(description)) {
-            command.put("bypassDocumentValidation", BsonBoolean.valueOf(bypassDocumentValidation));
+    private BsonDocument createCommand(final SessionContext sessionContext, final ServerDescription serverDescription,
+                                       final ConnectionDescription connectionDescription) {
+        validateCollation(connectionDescription, collation);
+
+        BsonDocument commandDocument = new BsonDocument("findAndModify", new BsonString(getNamespace().getCollectionName()));
+        putIfNotNull(commandDocument, "query", getFilter());
+        putIfNotNull(commandDocument, "fields", getProjection());
+        putIfNotNull(commandDocument, "sort", getSort());
+        commandDocument.put("new", new BsonBoolean(!isReturnOriginal()));
+        putIfTrue(commandDocument, "upsert", isUpsert());
+        putIfNotZero(commandDocument, "maxTimeMS", getMaxTime(MILLISECONDS));
+        commandDocument.put("update", getReplacement());
+        if (bypassDocumentValidation != null && serverIsAtLeastVersionThreeDotTwo(connectionDescription)) {
+            commandDocument.put("bypassDocumentValidation", BsonBoolean.valueOf(bypassDocumentValidation));
         }
-        if (serverIsAtLeastVersionThreeDotTwo(description) && writeConcern.isAcknowledged() && !writeConcern.isServerDefault()) {
-            command.put("writeConcern", writeConcern.asDocument());
+        addWriteConcernToCommand(connectionDescription, commandDocument, sessionContext);
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
         }
-        return command;
+        addTxnNumberToCommand(serverDescription, connectionDescription, commandDocument, sessionContext);
+        return commandDocument;
     }
 
-    private FieldNameValidator getValidator() {
+    @Override
+    protected FieldNameValidator getFieldNameValidator() {
         Map<String, FieldNameValidator> map = new HashMap<String, FieldNameValidator>();
         map.put("update", new CollectibleDocumentFieldNameValidator());
         return new MappedFieldNameValidator(new NoOpFieldNameValidator(), map);
diff --git a/driver-core/src/main/com/mongodb/operation/FindAndUpdateOperation.java b/driver-core/src/main/com/mongodb/operation/FindAndUpdateOperation.java
index e6bee0f4000..52d7bd4bac6 100644
--- a/driver-core/src/main/com/mongodb/operation/FindAndUpdateOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/FindAndUpdateOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,15 @@
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.binding.AsyncWriteBinding;
-import com.mongodb.binding.WriteBinding;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.internal.validator.MappedFieldNameValidator;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
 import com.mongodb.internal.validator.UpdateFieldNameValidator;
-import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
-import com.mongodb.operation.OperationHelper.CallableWithConnection;
+import com.mongodb.lang.Nullable;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
@@ -36,20 +34,17 @@
 import org.bson.codecs.Decoder;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
 import static com.mongodb.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.operation.DocumentHelper.putIfTrue;
-import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.validateCollation;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -59,11 +54,10 @@
  * @since 3.0
  * @mongodb.driver.manual reference/command/findAndModify/ findAndModify
  */
-public class FindAndUpdateOperation<T> implements AsyncWriteOperation<T>, WriteOperation<T> {
-    private final MongoNamespace namespace;
-    private final Decoder<T> decoder;
+@Deprecated
+public class FindAndUpdateOperation<T> extends BaseFindAndModifyOperation<T> {
     private final BsonDocument update;
-    private final WriteConcern writeConcern;
+    private final List<BsonDocument> updatePipeline;
     private BsonDocument filter;
     private BsonDocument projection;
     private BsonDocument sort;
@@ -71,73 +65,93 @@ public class FindAndUpdateOperation<T> implements AsyncWriteOperation<T>, WriteO
     private boolean returnOriginal = true;
     private boolean upsert;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
+    private List<BsonDocument> arrayFilters;
 
     /**
      * Construct a new instance.
      *
      * @param namespace the database and collection namespace for the operation.
-     * @param decoder the decoder for the result documents.
-     * @param update the document containing update operators.
-     * @deprecated use {@link #FindAndUpdateOperation(MongoNamespace, WriteConcern, Decoder, BsonDocument)} instead
+     * @param decoder   the decoder for the result documents.
+     * @param update    the document containing update operators.
+     * @deprecated use {@link #FindAndUpdateOperation(MongoNamespace, WriteConcern, boolean, Decoder, BsonDocument)} instead
      */
     @Deprecated
     public FindAndUpdateOperation(final MongoNamespace namespace, final Decoder<T> decoder, final BsonDocument update) {
-        this(namespace, WriteConcern.ACKNOWLEDGED, decoder, update);
+        this(namespace, WriteConcern.ACKNOWLEDGED, false, decoder, update);
     }
 
     /**
      * Construct a new instance.
      *
-     * @param namespace the database and collection namespace for the operation.
+     * @param namespace    the database and collection namespace for the operation.
      * @param writeConcern the writeConcern for the operation
-     * @param decoder the decoder for the result documents.
-     * @param update the document containing update operators.
+     * @param decoder      the decoder for the result documents.
+     * @param update       the document containing update operators.
      * @since 3.2
+     * @deprecated use {@link #FindAndUpdateOperation(MongoNamespace, WriteConcern, boolean, Decoder, BsonDocument)} instead
      */
+    @Deprecated
     public FindAndUpdateOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final Decoder<T> decoder,
                                   final BsonDocument update) {
-        this.namespace = notNull("namespace", namespace);
-        this.writeConcern = notNull("writeConcern", writeConcern);
-        this.decoder = notNull("decoder", decoder);
-        this.update = notNull("decoder", update);
+        this(namespace, writeConcern, false, decoder, update);
     }
 
     /**
-     * Gets the namespace.
+     * Construct a new instance.
      *
-     * @return the namespace
+     * @param namespace    the database and collection namespace for the operation.
+     * @param writeConcern the writeConcern for the operation
+     * @param retryWrites  if writes should be retried if they fail due to a network error.
+     * @param decoder      the decoder for the result documents.
+     * @param update       the document containing update operators.
+     * @since 3.6
      */
-    public MongoNamespace getNamespace() {
-        return namespace;
+    public FindAndUpdateOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites,
+                                  final Decoder<T> decoder, final BsonDocument update) {
+        super(namespace, writeConcern, retryWrites, decoder);
+        this.update = notNull("decoder", update);
+        this.updatePipeline = null;
     }
 
     /**
-     * Get the write concern for this operation
+     * Construct a new instance.
      *
-     * @return the {@link com.mongodb.WriteConcern}
-     * @since 3.2
-     * @mongodb.server.release 3.2
+     * @param namespace    the database and collection namespace for the operation.
+     * @param writeConcern the writeConcern for the operation
+     * @param retryWrites  if writes should be retried if they fail due to a network error.
+     * @param decoder      the decoder for the result documents.
+     * @param update       the pipeline containing update operators.
+     * @since 3.11
+     * @mongodb.server.release 4.2
      */
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
+    public FindAndUpdateOperation(final MongoNamespace namespace, final WriteConcern writeConcern, final boolean retryWrites,
+                                  final Decoder<T> decoder, final List<BsonDocument> update) {
+        super(namespace, writeConcern, retryWrites, decoder);
+        this.updatePipeline = update;
+        this.update = null;
     }
 
     /**
-     * Gets the decoder used to decode the result documents.
+     * Gets the document containing update operators
      *
-     * @return the decoder
+     * @return the update document
      */
-    public Decoder<T> getDecoder() {
-        return decoder;
+    @Nullable
+    public BsonDocument getUpdate() {
+        return update;
     }
 
     /**
-     * Gets the document containing update operators
+     * Gets the pipeline containing update operators
      *
-     * @return the update document
+     * @return the update pipeline
+     * @since 3.11
+     * @mongodb.server.release 4.2
      */
-    public BsonDocument getUpdate() {
-        return update;
+    @Nullable
+    public List<BsonDocument> getUpdatePipeline() {
+        return updatePipeline;
     }
 
     /**
@@ -184,7 +198,6 @@ public FindAndUpdateOperation<T> projection(final BsonDocument projection) {
         return this;
     }
 
-
     /**
      * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
      *
@@ -285,8 +298,6 @@ public Boolean getBypassDocumentValidation() {
     /**
      * Sets the bypass document level validation flag.
      *
-     * <p>Note: This only applies when an $out stage is specified</p>.
-     *
      * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
      * @return this
      * @since 3.2
@@ -298,57 +309,104 @@ public FindAndUpdateOperation<T> bypassDocumentValidation(final Boolean bypassDo
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public FindAndUpdateOperation<T> collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+
+    /**
+     * Sets the array filters option
+     *
+     * @param arrayFilters the array filters, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public FindAndUpdateOperation<T> arrayFilters(final List<BsonDocument> arrayFilters) {
+        this.arrayFilters = arrayFilters;
+        return this;
+    }
+
+    /**
+     * Returns the array filters option
+     *
+     * @return the array filters, which may be null
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public List<BsonDocument> getArrayFilters() {
+        return arrayFilters;
+    }
+
     @Override
-    public T execute(final WriteBinding binding) {
-        return withConnection(binding, new CallableWithConnection<T>() {
-            @Override
-            public T call(final Connection connection) {
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                        getValidator(), CommandResultDocumentCodec.create(decoder, "value"), connection,
-                        FindAndModifyHelper.<T>transformer());
-            }
-        });
+    protected String getDatabaseName() {
+        return getNamespace().getDatabaseName();
+    }
+
+    @Override
+    protected FieldNameValidator getFieldNameValidator() {
+        Map<String, FieldNameValidator> map = new HashMap<String, FieldNameValidator>();
+        map.put("update", new UpdateFieldNameValidator());
+        return new MappedFieldNameValidator(new NoOpFieldNameValidator(), map);
     }
 
     @Override
-    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<T> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+    protected CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
             @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<T> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), asCommandDocument(connection.getDescription()),
-                            getValidator(), CommandResultDocumentCodec.create(decoder, "value"), connection,
-                            FindAndModifyHelper.<T>transformer(), releasingCallback(errHandlingCallback, connection));
-                }
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return createCommand(sessionContext, serverDescription, connectionDescription);
             }
-        });
+        };
     }
 
-    private BsonDocument asCommandDocument(final ConnectionDescription description) {
-        BsonDocument command = new BsonDocument("findandmodify", new BsonString(namespace.getCollectionName()));
-        putIfNotNull(command, "query", getFilter());
-        putIfNotNull(command, "fields", getProjection());
-        putIfNotNull(command, "sort", getSort());
-        putIfTrue(command, "new", !isReturnOriginal());
-        putIfTrue(command, "upsert", isUpsert());
-        putIfNotZero(command, "maxTimeMS", getMaxTime(MILLISECONDS));
-        command.put("update", getUpdate());
-        if (bypassDocumentValidation != null && serverIsAtLeastVersionThreeDotTwo(description)) {
-            command.put("bypassDocumentValidation", BsonBoolean.valueOf(bypassDocumentValidation));
+    private BsonDocument createCommand(final SessionContext sessionContext, final ServerDescription serverDescription,
+                                       final ConnectionDescription connectionDescription) {
+        validateCollation(connectionDescription, collation);
+        BsonDocument commandDocument = new BsonDocument("findAndModify", new BsonString(getNamespace().getCollectionName()));
+        putIfNotNull(commandDocument, "query", getFilter());
+        putIfNotNull(commandDocument, "fields", getProjection());
+        putIfNotNull(commandDocument, "sort", getSort());
+        commandDocument.put("new", new BsonBoolean(!isReturnOriginal()));
+        putIfTrue(commandDocument, "upsert", isUpsert());
+        putIfNotZero(commandDocument, "maxTimeMS", getMaxTime(MILLISECONDS));
+        if (getUpdatePipeline() != null) {
+            commandDocument.put("update", new BsonArray(getUpdatePipeline()));
+        } else {
+            putIfNotNull(commandDocument, "update", getUpdate());
         }
-        if (serverIsAtLeastVersionThreeDotTwo(description) && writeConcern.isAcknowledged() && !writeConcern.isServerDefault()) {
-            command.put("writeConcern", writeConcern.asDocument());
+        if (bypassDocumentValidation != null && serverIsAtLeastVersionThreeDotTwo(connectionDescription)) {
+            commandDocument.put("bypassDocumentValidation", BsonBoolean.valueOf(bypassDocumentValidation));
         }
-        return command;
-    }
-
-    private FieldNameValidator getValidator() {
-        Map<String, FieldNameValidator> map = new HashMap<String, FieldNameValidator>();
-        map.put("update", new UpdateFieldNameValidator());
-
-        return new MappedFieldNameValidator(new NoOpFieldNameValidator(), map);
+        addWriteConcernToCommand(connectionDescription, commandDocument, sessionContext);
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
+        if (arrayFilters != null) {
+            commandDocument.put("arrayFilters", new BsonArray(arrayFilters));
+        }
+        addTxnNumberToCommand(serverDescription, connectionDescription, commandDocument, sessionContext);
+        return commandDocument;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/FindOperation.java b/driver-core/src/main/com/mongodb/operation/FindOperation.java
index 587651fe05c..3f8407a4d69 100644
--- a/driver-core/src/main/com/mongodb/operation/FindOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/FindOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import com.mongodb.MongoInternalException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.MongoQueryException;
-import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.mongodb.async.AsyncBatchCursor;
@@ -33,11 +32,15 @@
 import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.binding.SingleConnectionReadBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import com.mongodb.operation.OperationHelper.CallableWithSource;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentReader;
@@ -60,16 +63,22 @@
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.connection.ServerType.SHARD_ROUTER;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.CommandTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import static com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandWithConnection;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsyncWithConnection;
+import static com.mongodb.operation.DocumentHelper.putIfNotNullOrEmpty;
 import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.checkValidReadConcern;
 import static com.mongodb.operation.OperationHelper.cursorDocumentToQueryResult;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
 import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
+import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 
 /**
  * An operation that queries a collection using the provided criteria.
@@ -77,11 +86,13 @@
  * @param <T> the operations result type.
  * @since 3.0
  */
+@Deprecated
 public class FindOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
     private static final String FIRST_BATCH = "firstBatch";
 
     private final MongoNamespace namespace;
     private final Decoder<T> decoder;
+    private boolean retryReads;
     private BsonDocument filter;
     private int batchSize;
     private int limit;
@@ -96,7 +107,15 @@ public class FindOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>
     private boolean oplogReplay;
     private boolean noCursorTimeout;
     private boolean partial;
-    private ReadConcern readConcern = ReadConcern.DEFAULT;
+    private Collation collation;
+    private String comment;
+    private BsonValue hint;
+    private BsonDocument max;
+    private BsonDocument min;
+    private long maxScan;
+    private boolean returnKey;
+    private boolean showRecordId;
+    private boolean snapshot;
 
     /**
      * Construct a new instance.
@@ -209,7 +228,9 @@ public BsonDocument getModifiers() {
      * @param modifiers the query modifiers to apply, which may be null.
      * @return this
      * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
+     * @deprecated use the individual setters instead
      */
+    @Deprecated
     public FindOperation<T> modifiers(final BsonDocument modifiers) {
         this.modifiers = modifiers;
         return this;
@@ -456,58 +477,283 @@ public FindOperation<T> partial(final boolean partial) {
     }
 
     /**
-     * Gets the read concern
+     * Returns the collation options
      *
-     * @return the read concern
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
      */
-    public ReadConcern getReadConcern() {
-        return readConcern;
+    public Collation getCollation() {
+        return collation;
     }
 
     /**
-     * Sets the read concern
-     * @param readConcern the read concern
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
      * @return this
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public FindOperation<T> collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Returns the comment to send with the query. The default is not to include a comment with the query.
+     *
+     * @return the comment
+     * @since 3.5
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the comment to the query. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.5
+     */
+    public FindOperation<T> comment(final String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    /**
+     * Returns the hint for which index to use. The default is not to set a hint.
+     *
+     * @return the hint
+     * @since 3.5
+     */
+    public BsonValue getHint() {
+        return hint;
+    }
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.5
+     */
+    public FindOperation<T> hint(final BsonValue hint) {
+        this.hint = hint;
+        return this;
+    }
+
+    /**
+     * Returns the exclusive upper bound for a specific index. By default there is no max bound.
+     *
+     * @return the max
+     * @since 3.5
+     */
+    public BsonDocument getMax() {
+        return max;
+    }
+
+    /**
+     * Sets the exclusive upper bound for a specific index. A null value means no max is set.
+     *
+     * @param max the max
+     * @return this
+     * @since 3.5
+     */
+    public FindOperation<T> max(final BsonDocument max) {
+        this.max = max;
+        return this;
+    }
+
+    /**
+     * Returns the minimum inclusive lower bound for a specific index. By default there is no min bound.
+     *
+     * @return the min
+     * @since 3.5
+     */
+    public BsonDocument getMin() {
+        return min;
+    }
+
+    /**
+     * Sets the minimum inclusive lower bound for a specific index. A null value means no max is set.
+     *
+     * @param min the min
+     * @return this
+     * @since 3.5
+     */
+    public FindOperation<T> min(final BsonDocument min) {
+        this.min = min;
+        return this;
+    }
+
+    /**
+     * Returns the maximum number of documents or index keys to scan when executing the query.
+     *
+     * A zero value or less will be ignored, and indicates that the driver should respect the server's default value.
+     *
+     * @return the maxScan
+     * @since 3.5
+     * @deprecated Deprecated as of MongoDB 4.0 release
+     */
+    @Deprecated
+    public long getMaxScan() {
+        return maxScan;
+    }
+
+    /**
+     * Sets the maximum number of documents or index keys to scan when executing the query.
+     *
+     * A zero value or less will be ignored, and indicates that the driver should respect the server's default value.
+     *
+     * @param maxScan the maxScan
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated as of MongoDB 4.0 release
+     */
+    @Deprecated
+    public FindOperation<T> maxScan(final long maxScan) {
+        this.maxScan = maxScan;
+        return this;
+    }
+
+    /**
+     * Returns the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * Default value is false. If returnKey is true and the find command does not use an index, the returned documents will be empty.
+     *
+     * @return the returnKey
+     * @since 3.5
+     */
+    public boolean isReturnKey() {
+        return returnKey;
+    }
+
+    /**
+     * Sets the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * @param returnKey the returnKey
+     * @return this
+     * @since 3.5
+     */
+    public FindOperation<T> returnKey(final boolean returnKey) {
+        this.returnKey = returnKey;
+        return this;
+    }
+
+    /**
+     * Returns the showRecordId.
+     *
+     * Determines whether to return the record identifier for each document. If true, adds a field $recordId to the returned documents.
+     * The default is false.
+     *
+     * @return the showRecordId
+     * @since 3.5
+     */
+    public boolean isShowRecordId() {
+        return showRecordId;
+    }
+
+    /**
+     * Sets the showRecordId. Set to true to add a field {@code $recordId} to the returned documents.
+     *
+     * @param showRecordId the showRecordId
+     * @return this
+     * @since 3.5
+     */
+    public FindOperation<T> showRecordId(final boolean showRecordId) {
+        this.showRecordId = showRecordId;
+        return this;
+    }
+
+    /**
+     * Returns the snapshot.
+     *
+     * Prevents the cursor from returning a document more than once because of an intervening write operation. The default is false.
+     *
+     * @return the snapshot
+     * @since 3.5
+     * @deprecated Deprecated in MongoDB 3.6 release and removed in MongoDB 4.0 release
+     */
+    @Deprecated
+    public boolean isSnapshot() {
+        return snapshot;
+    }
+
+    /**
+     * Sets the snapshot.
+     *
+     * If true it prevents the cursor from returning a document more than once because of an intervening write operation.
+     *
+     * @param snapshot the snapshot
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated in MongoDB 3.6 release and removed in MongoDB 4.0 release
      */
-    public FindOperation<T> readConcern(final ReadConcern readConcern) {
-        this.readConcern = notNull("readConcern", readConcern);
+    @Deprecated
+    public FindOperation<T> snapshot(final boolean snapshot) {
+        this.snapshot = snapshot;
         return this;
     }
 
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     */
+    public FindOperation<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
     @Override
     public BatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
+        return withReadConnectionSource(binding, new CallableWithSource<BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
+            public BatchCursor<T> call(final ConnectionSource source) {
+                Connection connection = source.getConnection();
                 if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
                     try {
-                        return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(),
-                                                             wrapInExplainIfNecessary(asCommandDocument()),
-                                                             CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
-                                                             connection, transformer(source, connection));
+                        return executeCommandWithConnection(binding, source, namespace.getDatabaseName(),
+                                getCommandCreator(binding.getSessionContext()),
+                                CommandResultDocumentCodec.create(decoder, FIRST_BATCH), transformer(), retryReads, connection);
                     } catch (MongoCommandException e) {
-                        throw new MongoQueryException(e.getServerAddress(), e.getErrorCode(), e.getErrorMessage());
+                        throw new MongoQueryException(e);
                     }
                 } else {
-                    checkValidReadConcern(connection, readConcern);
-                    QueryResult<T> queryResult = connection.query(namespace,
-                                                                  asDocument(connection.getDescription(), binding.getReadPreference()),
-                                                                  projection,
-                                                                  skip,
-                                                                  limit,
-                                                                  batchSize,
-                                                                  isSlaveOk() || binding.getReadPreference().isSlaveOk(),
-                                                                  isTailableCursor(),
-                                                                  isAwaitData(),
-                                                                  isNoCursorTimeout(),
-                                                                  isPartial(),
-                                                                  isOplogReplay(),
-                                                                  decoder);
-                    return new QueryBatchCursor<T>(queryResult, limit, batchSize, getMaxTimeForCursor(), decoder, source, connection);
+                    try {
+                        validateReadConcernAndCollation(connection, binding.getSessionContext().getReadConcern(), collation);
+                        QueryResult<T> queryResult = connection.query(namespace,
+                                asDocument(connection.getDescription(), binding.getReadPreference()),
+                                projection,
+                                skip,
+                                limit,
+                                batchSize,
+                                isSlaveOk() || binding.getReadPreference().isSlaveOk(),
+                                isTailableCursor(),
+                                isAwaitData(),
+                                isNoCursorTimeout(),
+                                isPartial(),
+                                isOplogReplay(),
+                                decoder);
+                        return new QueryBatchCursor<T>(queryResult, limit, batchSize, getMaxTimeForCursor(), decoder, source, connection);
+                    } finally {
+                        connection.release();
+                    }
                 }
             }
         });
@@ -515,7 +761,7 @@ public BatchCursor<T> call(final ConnectionSource source, final Connection conne
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnectionAndSource() {
+        withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
             @Override
             public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -523,39 +769,40 @@ public void call(final AsyncConnectionSource source, final AsyncConnection conne
                     errHandlingCallback.onResult(null, t);
                 } else {
                     if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(),
-                                                           wrapInExplainIfNecessary(asCommandDocument()),
-                                                           CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
-                                                           connection, asyncTransformer(source, connection),
-                                                           releasingCallback(exceptionTransformingCallback(errHandlingCallback),
-                                                                             source, connection));
+                        final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback =
+                                exceptionTransformingCallback(errHandlingCallback);
+                        executeCommandAsyncWithConnection(binding, source, namespace.getDatabaseName(),
+                                getCommandCreator(binding.getSessionContext()), CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
+                                asyncTransformer(), retryReads, connection, wrappedCallback);
                     } else {
-                        final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = releasingCallback(errHandlingCallback,
-
-                                source, connection);
-                        checkValidReadConcern(source, connection, readConcern, new AsyncCallableWithConnectionAndSource() {
-                            @Override
-                            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                                if (t != null) {
-                                    wrappedCallback.onResult(null, t);
-                                } else {
-                                    connection.queryAsync(namespace, asDocument(connection.getDescription(), binding.getReadPreference()),
-                                            projection, skip, limit, batchSize, isSlaveOk() || binding.getReadPreference().isSlaveOk(),
-                                            isTailableCursor(), isAwaitData(), isNoCursorTimeout(), isPartial(), isOplogReplay(), decoder,
-                                            new SingleResultCallback<QueryResult<T>>() {
-                                                @Override
-                                                public void onResult(final QueryResult<T> result, final Throwable t) {
-                                                    if (t != null) {
-                                                        wrappedCallback.onResult(null, t);
-                                                    } else {
-                                                        wrappedCallback.onResult(new AsyncQueryBatchCursor<T>(result, limit, batchSize,
-                                                                        getMaxTimeForCursor(),
-                                                                        decoder, source, connection), null);
-                                                    }
-                                                }
-                                            });
-                                }
-                            }
+                        final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback =
+                                releasingCallback(errHandlingCallback, source, connection);
+                        validateReadConcernAndCollation(source, connection, binding.getSessionContext().getReadConcern(), collation,
+                                new AsyncCallableWithConnectionAndSource() {
+                                    @Override
+                                    public void call(final AsyncConnectionSource source, final AsyncConnection connection, final
+                                    Throwable t) {
+                                        if (t != null) {
+                                            wrappedCallback.onResult(null, t);
+                                        } else {
+                                            connection.queryAsync(namespace, asDocument(connection.getDescription(),
+                                                    binding.getReadPreference()), projection, skip, limit, batchSize,
+                                                    isSlaveOk() || binding.getReadPreference().isSlaveOk(),
+                                                    isTailableCursor(), isAwaitData(), isNoCursorTimeout(), isPartial(), isOplogReplay(),
+                                                    decoder, new SingleResultCallback<QueryResult<T>>() {
+                                                        @Override
+                                                        public void onResult(final QueryResult<T> result, final Throwable t) {
+                                                            if (t != null) {
+                                                                wrappedCallback.onResult(null, t);
+                                                            } else {
+                                                                wrappedCallback.onResult(new AsyncQueryBatchCursor<T>(result, limit,
+                                                                        batchSize, getMaxTimeForCursor(), decoder, source, connection),
+                                                                        null);
+                                                            }
+                                                        }
+                                                    });
+                                        }
+                                    }
                         });
                     }
                 }
@@ -572,7 +819,7 @@ public void onResult(final T result, final Throwable t) {
                         MongoCommandException commandException = (MongoCommandException) t;
                         callback.onResult(result, new MongoQueryException(commandException.getServerAddress(),
                                                                           commandException.getErrorCode(),
-                                                                          commandException.getErrorMessage()));
+                                commandException.getErrorMessage()));
                     } else {
                         callback.onResult(result, t);
                     }
@@ -605,10 +852,11 @@ public BsonDocument call(final ConnectionSource connectionSource, final Connecti
                             if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
                                 try {
                                     return new CommandReadOperation<BsonDocument>(getNamespace().getDatabaseName(),
-                                                                                  new BsonDocument("explain", asCommandDocument()),
+                                                                                  new BsonDocument("explain",
+                                                                                                   getCommand(binding.getSessionContext())),
                                                                                   new BsonDocumentCodec()).execute(singleConnectionBinding);
                                 } catch (MongoCommandException e) {
-                                    throw new MongoQueryException(e.getServerAddress(), e.getErrorCode(), e.getErrorMessage());
+                                    throw new MongoQueryException(e);
                                 }
                             } else {
                                 BatchCursor<BsonDocument> cursor = createExplainableQueryOperation().execute(singleConnectionBinding);
@@ -638,7 +886,7 @@ public AsyncReadOperation<BsonDocument> asExplainableOperationAsync(final Explai
         return new AsyncReadOperation<BsonDocument>() {
             @Override
             public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<BsonDocument> callback) {
-                withConnection(binding, new AsyncCallableWithConnectionAndSource() {
+                withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
                     @Override
                     public void call(final AsyncConnectionSource connectionSource, final AsyncConnection connection, final Throwable t) {
                         SingleResultCallback<BsonDocument> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -651,7 +899,7 @@ public void call(final AsyncConnectionSource connectionSource, final AsyncConnec
 
                             if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
                                 new CommandReadOperation<BsonDocument>(namespace.getDatabaseName(),
-                                                                       new BsonDocument("explain", asCommandDocument()),
+                                                                       new BsonDocument("explain", getCommand(binding.getSessionContext())),
                                                                        new BsonDocumentCodec())
                                 .executeAsync(singleConnectionReadBinding,
                                               releasingCallback(exceptionTransformingCallback(errHandlingCallback),
@@ -683,6 +931,9 @@ private FindOperation<BsonDocument> createExplainableQueryOperation() {
                .sort(sort)
                .skip(skip)
                .limit(Math.abs(limit) * -1)
+               .hint(hint)
+               .min(min)
+               .max(max)
                .modifiers(explainModifiers);
 
     }
@@ -693,18 +944,39 @@ private BsonDocument asDocument(final ConnectionDescription connectionDescriptio
         if (modifiers != null) {
             document.putAll(modifiers);
         }
-
         if (sort != null) {
             document.put("$orderby", sort);
         }
-
         if (maxTimeMS > 0) {
             document.put("$maxTimeMS", new BsonInt64(maxTimeMS));
         }
-
         if (connectionDescription.getServerType() == SHARD_ROUTER && !readPreference.equals(primary())) {
             document.put("$readPreference", readPreference.toDocument());
         }
+        if (comment != null) {
+            document.put("$comment", new BsonString(comment));
+        }
+        if (hint != null) {
+            document.put("$hint", hint);
+        }
+        if (max != null) {
+            document.put("$max", max);
+        }
+        if (min != null) {
+            document.put("$min", min);
+        }
+        if (maxScan > 0) {
+            document.put("$maxScan", new BsonInt64(maxScan));
+        }
+        if (returnKey) {
+            document.put("$returnKey", BsonBoolean.TRUE);
+        }
+        if (showRecordId) {
+            document.put("$showDiskLoc", BsonBoolean.TRUE);
+        }
+        if (snapshot) {
+            document.put("$snapshot", BsonBoolean.TRUE);
+        }
 
         if (document.isEmpty()) {
             document = filter != null ? filter : new BsonDocument();
@@ -733,89 +1005,104 @@ private BsonDocument asDocument(final ConnectionDescription connectionDescriptio
         META_OPERATOR_TO_COMMAND_FIELD_MAP.put("$snapshot", "snapshot");
     }
 
-    private BsonDocument asCommandDocument() {
-        BsonDocument document = new BsonDocument("find", new BsonString(namespace.getCollectionName()));
+    private BsonDocument getCommand(final SessionContext sessionContext) {
+        BsonDocument commandDocument = new BsonDocument("find", new BsonString(namespace.getCollectionName()));
+
+        appendReadConcernToCommand(sessionContext, commandDocument);
 
         if (modifiers != null) {
             for (Map.Entry<String, BsonValue> cur : modifiers.entrySet()) {
                 String commandFieldName = META_OPERATOR_TO_COMMAND_FIELD_MAP.get(cur.getKey());
                 if (commandFieldName != null) {
-                    document.append(commandFieldName, cur.getValue());
+                    commandDocument.append(commandFieldName, cur.getValue());
                 }
             }
         }
-
-        if (filter != null) {
-            document.put("filter", filter);
-        }
-
-        if (sort != null) {
-            document.put("sort", sort);
-        }
-
-        if (projection != null) {
-            document.put("projection", projection);
-        }
-
+        putIfNotNullOrEmpty(commandDocument, "filter", filter);
+        putIfNotNullOrEmpty(commandDocument, "sort", sort);
+        putIfNotNullOrEmpty(commandDocument, "projection", projection);
         if (skip > 0) {
-            document.put("skip", new BsonInt32(skip));
+            commandDocument.put("skip", new BsonInt32(skip));
         }
-
         if (limit != 0) {
-            document.put("limit", new BsonInt32(Math.abs(limit)));
+            commandDocument.put("limit", new BsonInt32(Math.abs(limit)));
         }
-
         if (limit >= 0) {
             if (batchSize < 0 && Math.abs(batchSize) < limit) {
-                document.put("limit", new BsonInt32(Math.abs(batchSize)));
+                commandDocument.put("limit", new BsonInt32(Math.abs(batchSize)));
             } else if (batchSize != 0) {
-                document.put("batchSize", new BsonInt32(Math.abs(batchSize)));
+                commandDocument.put("batchSize", new BsonInt32(Math.abs(batchSize)));
             }
         }
-
         if (limit < 0 || batchSize < 0) {
-            document.put("singleBatch", BsonBoolean.TRUE);
+            commandDocument.put("singleBatch", BsonBoolean.TRUE);
         }
-
         if (maxTimeMS > 0) {
-            document.put("maxTimeMS", new BsonInt64(maxTimeMS));
+            commandDocument.put("maxTimeMS", new BsonInt64(maxTimeMS));
         }
-
         if (isTailableCursor()) {
-            document.put("tailable", BsonBoolean.TRUE);
+            commandDocument.put("tailable", BsonBoolean.TRUE);
         }
-
         if (isAwaitData()) {
-            document.put("awaitData", BsonBoolean.TRUE);
+            commandDocument.put("awaitData", BsonBoolean.TRUE);
         }
-
         if (oplogReplay) {
-            document.put("oplogReplay", BsonBoolean.TRUE);
+            commandDocument.put("oplogReplay", BsonBoolean.TRUE);
         }
-
         if (noCursorTimeout) {
-            document.put("noCursorTimeout", BsonBoolean.TRUE);
+            commandDocument.put("noCursorTimeout", BsonBoolean.TRUE);
         }
-
         if (partial) {
-            document.put("allowPartialResults", BsonBoolean.TRUE);
+            commandDocument.put("allowPartialResults", BsonBoolean.TRUE);
         }
-
-        if (!readConcern.isServerDefault()) {
-            document.put("readConcern", readConcern.asDocument());
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
         }
-
-        return document;
+        if (comment != null) {
+            commandDocument.put("comment", new BsonString(comment));
+        }
+        if (hint != null) {
+            commandDocument.put("hint", hint);
+        }
+        if (max != null) {
+            commandDocument.put("max", max);
+        }
+        if (min != null) {
+            commandDocument.put("min", min);
+        }
+        if (maxScan > 0) {
+            commandDocument.put("maxScan", new BsonInt64(maxScan));
+        }
+        if (returnKey) {
+            commandDocument.put("returnKey", BsonBoolean.TRUE);
+        }
+        if (showRecordId) {
+            commandDocument.put("showRecordId", BsonBoolean.TRUE);
+        }
+        if (snapshot) {
+            commandDocument.put("snapshot", BsonBoolean.TRUE);
+        }
+        return commandDocument;
     }
 
-    private BsonDocument wrapInExplainIfNecessary(final BsonDocument findCommandDocument) {
+    private BsonDocument wrapInExplainIfNecessary(final BsonDocument commandDocument) {
         if (isExplain()) {
-            return new BsonDocument("explain", findCommandDocument);
+            return new BsonDocument("explain", commandDocument);
         } else {
-            return findCommandDocument;
+            return commandDocument;
         }
     }
 
+    private CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandOperationHelper.CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateReadConcernAndCollation(connectionDescription, sessionContext.getReadConcern(), collation);
+                return wrapInExplainIfNecessary(getCommand(sessionContext));
+            }
+        };
+    }
+
     private boolean isExplain() {
         return modifiers != null && modifiers.get("$explain", BsonBoolean.FALSE).equals(BsonBoolean.TRUE);
     }
@@ -828,13 +1115,13 @@ private boolean isAwaitData() {
         return cursorType == CursorType.TailableAwait;
     }
 
-    private CommandTransformer<BsonDocument, BatchCursor<T>> transformer(final ConnectionSource source,
-                                                                         final Connection connection) {
-        return new CommandTransformer<BsonDocument, BatchCursor<T>>() {
+    private CommandReadTransformer<BsonDocument, AggregateResponseBatchCursor<T>> transformer() {
+        return new CommandReadTransformer<BsonDocument, AggregateResponseBatchCursor<T>>() {
             @Override
-            public BatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
-                QueryResult<T> queryResult = documentToQueryResult(result, serverAddress);
-                return new QueryBatchCursor<T>(queryResult, limit, batchSize, getMaxTimeForCursor(), decoder, source, connection);
+            public AggregateResponseBatchCursor<T> apply(final BsonDocument result, final ConnectionSource source,
+                                                         final Connection connection) {
+                QueryResult<T> queryResult = documentToQueryResult(result, connection.getDescription().getServerAddress());
+                return new QueryBatchCursor<T>(queryResult, limit, batchSize, getMaxTimeForCursor(), decoder, source, connection, result);
             }
         };
     }
@@ -843,13 +1130,14 @@ private long getMaxTimeForCursor() {
         return cursorType == CursorType.TailableAwait ? maxAwaitTimeMS : 0;
     }
 
-    private CommandTransformer<BsonDocument, AsyncBatchCursor<T>> asyncTransformer(final AsyncConnectionSource source,
-                                                                                   final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, AsyncBatchCursor<T>>() {
+    private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>>() {
             @Override
-            public AsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
-                QueryResult<T> queryResult = documentToQueryResult(result, serverAddress);
-                return new AsyncQueryBatchCursor<T>(queryResult, limit, batchSize, getMaxTimeForCursor(), decoder, source, connection);
+            public AsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                             final AsyncConnection connection) {
+                QueryResult<T> queryResult = documentToQueryResult(result, connection.getDescription().getServerAddress());
+                return new AsyncQueryBatchCursor<T>(queryResult, limit, batchSize, getMaxTimeForCursor(), decoder, source, connection,
+                        result);
             }
         };
     }
@@ -868,7 +1156,7 @@ private QueryResult<T> documentToQueryResult(final BsonDocument result, final Se
     private static class ExplainResultCallback implements SingleResultCallback<AsyncBatchCursor<BsonDocument>> {
         private final SingleResultCallback<BsonDocument> callback;
 
-        public ExplainResultCallback(final SingleResultCallback<BsonDocument> callback) {
+        ExplainResultCallback(final SingleResultCallback<BsonDocument> callback) {
             this.callback = callback;
         }
 
diff --git a/driver-core/src/main/com/mongodb/operation/FsyncUnlockOperation.java b/driver-core/src/main/com/mongodb/operation/FsyncUnlockOperation.java
index 1230ec92e7c..ddbeb73e262 100644
--- a/driver-core/src/main/com/mongodb/operation/FsyncUnlockOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/FsyncUnlockOperation.java
@@ -1,14 +1,14 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -17,15 +17,19 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoNamespace;
+import com.mongodb.binding.ReadBinding;
 import com.mongodb.binding.WriteBinding;
 import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.operation.OperationHelper.CallableWithConnection;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.codecs.BsonDocumentCodec;
 
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
 import static com.mongodb.operation.OperationHelper.withConnection;
 
 /**
@@ -35,20 +39,58 @@
  * @mongodb.driver.manual reference/command/fsyncUnlock/ fsyncUnlock command
  * @since 3.2
  */
-public class FsyncUnlockOperation implements WriteOperation<BsonDocument> {
+@Deprecated
+public class FsyncUnlockOperation implements WriteOperation<BsonDocument>, ReadOperation<BsonDocument> {
+    private static final BsonDocument FSYNC_UNLOCK_COMMAND = new BsonDocument("fsyncUnlock", new BsonInt32(1));
+
+    /**
+     * Unlocks the MongoDB server, allowing write operations to go through.
+     *
+     * @param binding the binding to execute in the context of
+     * @return the result of the operation
+     * @deprecated use {@link #execute(ReadBinding)} instead.
+     */
+    @Deprecated
     @Override
     public BsonDocument execute(final WriteBinding binding) {
         return withConnection(binding, new CallableWithConnection<BsonDocument>() {
             @Override
             public BsonDocument call(final Connection connection) {
                 if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
-                    return executeWrappedCommandProtocol(binding, "admin", new BsonDocument("fsyncUnlock", new BsonInt32(1)), connection);
+                    return executeCommand(binding, "admin", FSYNC_UNLOCK_COMMAND, connection);
+                } else {
+                    return queryUnlock(connection);
+                }
+            }
+        });
+    }
+
+    @Override
+    public BsonDocument execute(final ReadBinding binding) {
+        return withConnection(binding, new CallableWithConnection<BsonDocument>() {
+            @Override
+            public BsonDocument call(final Connection connection) {
+                if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
+                    return executeCommand(binding, "admin", getCommandCreator(), false);
                 } else {
-                    return connection.query(new MongoNamespace("admin", "$cmd.sys.unlock"), new BsonDocument(), null, 0, 1, 0,
-                                           false, false, false, false, false, false,
-                                           new BsonDocumentCodec()).getResults().get(0);
+                    return queryUnlock(connection);
                 }
             }
         });
     }
+
+    private BsonDocument queryUnlock(final Connection connection) {
+        return connection.query(new MongoNamespace("admin", "$cmd.sys.unlock"), new BsonDocument(), null, 0, 1, 0,
+                false, false, false, false, false, false,
+                new BsonDocumentCodec()).getResults().get(0);
+    }
+
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return FSYNC_UNLOCK_COMMAND;
+            }
+        };
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/GroupOperation.java b/driver-core/src/main/com/mongodb/operation/GroupOperation.java
index 61452da1e5a..7abdaffa6de 100644
--- a/driver-core/src/main/com/mongodb/operation/GroupOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/GroupOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,20 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoNamespace;
-import com.mongodb.ServerAddress;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncReadBinding;
 import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
 import org.bson.BsonDocument;
 import org.bson.BsonJavaScript;
 import org.bson.BsonString;
@@ -35,13 +38,11 @@
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
-import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
-import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.validateCollation;
 
 /**
  * Groups documents in a collection by the specified key and performs simple aggregation functions, such as computing counts and sums. The
@@ -51,15 +52,18 @@
  * @mongodb.driver.manual reference/command/group Group Command
  * @since 3.0
  */
+@Deprecated
 public class GroupOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
     private final MongoNamespace namespace;
     private final Decoder<T> decoder;
     private final BsonJavaScript reduceFunction;
     private final BsonDocument initial;
+    private boolean retryReads;
     private BsonDocument key;
     private BsonJavaScript keyFunction;
     private BsonDocument filter;
     private BsonJavaScript finalizeFunction;
+    private Collation collation;
 
     /**
      * Create an operation that will perform a Group on a given collection.
@@ -78,6 +82,27 @@ public GroupOperation(final MongoNamespace namespace, final BsonJavaScript reduc
         this.decoder = notNull("decoder", decoder);
     }
 
+    /**
+     * Gets the namespace.
+     *
+     * @return the namespace
+     * @since 3.4
+     */
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+
+    /**
+     * Gets the decoder used to decode the result documents.
+     *
+     * @return the decoder
+     * @since 3.4
+     */
+    public Decoder<T> getDecoder() {
+        return decoder;
+    }
+
     /**
      * Gets the document containing the field or fields to group.
      *
@@ -176,6 +201,53 @@ public GroupOperation<T> finalizeFunction(final BsonJavaScript finalizeFunction)
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public GroupOperation<T> collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     */
+    public GroupOperation<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
     /**
      * Will return a cursor of Documents containing the results of the group operation.
      *
@@ -184,71 +256,68 @@ public GroupOperation<T> finalizeFunction(final BsonJavaScript finalizeFunction)
      */
     @Override
     public BatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
-            @Override
-            public BatchCursor<T> call(final ConnectionSource connectionSource, final Connection connection) {
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(),
-                                                     CommandResultDocumentCodec.create(decoder, "retval"),
-                                                     connection, transformer(connectionSource, connection));
-            }
-        });
+        return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(),
+                CommandResultDocumentCodec.create(decoder, "retval"),
+                transformer(), retryReads);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(),
+                CommandResultDocumentCodec.create(decoder, "retval"), asyncTransformer(),
+                retryReads, errorHandlingCallback(callback, LOGGER));
+    }
+
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
             @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(),
-                            CommandResultDocumentCodec.create(decoder, "retval"), connection, asyncTransformer(connection),
-                            releasingCallback(errHandlingCallback, connection));
-                }
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateCollation(connectionDescription, collation);
+                return getCommand();
             }
-        });
+        };
     }
 
     private BsonDocument getCommand() {
-        BsonDocument document = new BsonDocument("ns", new BsonString(namespace.getCollectionName()));
+        BsonDocument commandDocument = new BsonDocument("ns", new BsonString(namespace.getCollectionName()));
 
         if (getKey() != null) {
-            document.put("key", getKey());
+            commandDocument.put("key", getKey());
         } else if (getKeyFunction() != null) {
-            document.put("$keyf", getKeyFunction());
+            commandDocument.put("$keyf", getKeyFunction());
         }
 
-        document.put("initial", getInitial());
-        document.put("$reduce", getReduceFunction());
+        commandDocument.put("initial", getInitial());
+        commandDocument.put("$reduce", getReduceFunction());
 
         if (getFinalizeFunction() != null) {
-            document.put("finalize", getFinalizeFunction());
+            commandDocument.put("finalize", getFinalizeFunction());
         }
-
         if (getFilter() != null) {
-            document.put("cond", getFilter());
+            commandDocument.put("cond", getFilter());
         }
-
-        return new BsonDocument("group", document);
+        if (getCollation() != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
+        return new BsonDocument("group", commandDocument);
     }
 
-    private CommandTransformer<BsonDocument, BatchCursor<T>> transformer(final ConnectionSource source, final Connection connection) {
-        return new CommandTransformer<BsonDocument, BatchCursor<T>>() {
+    private CommandReadTransformer<BsonDocument, BatchCursor<T>> transformer() {
+        return new CommandReadTransformer<BsonDocument, BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public BatchCursor<T> apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 return new QueryBatchCursor<T>(createQueryResult(result, connection.getDescription()), 0, 0, decoder, source);
 
             }
         };
     }
 
-    private CommandTransformer<BsonDocument, AsyncBatchCursor<T>> asyncTransformer(final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, AsyncBatchCursor<T>>() {
+    private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>>() {
             @Override
-            public AsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
-                return new AsyncQueryBatchCursor<T>(createQueryResult(result, connection.getDescription()), 0, 0, decoder);
+            public AsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                             final AsyncConnection connection) {
+                return new AsyncSingleBatchQueryCursor<T>(createQueryResult(result, connection.getDescription()));
             }
         };
     }
diff --git a/driver-core/src/main/com/mongodb/operation/IndexHelper.java b/driver-core/src/main/com/mongodb/operation/IndexHelper.java
deleted file mode 100644
index 45361d4d132..00000000000
--- a/driver-core/src/main/com/mongodb/operation/IndexHelper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.operation;
-
-import org.bson.BsonDocument;
-import org.bson.BsonNumber;
-import org.bson.BsonString;
-import org.bson.BsonValue;
-
-final class IndexHelper {
-
-    /**
-     * Convenience method to generate an index name from the set of fields it is over.
-     *
-     * @return a string representation of this index's fields
-     */
-    static String generateIndexName(final BsonDocument index) {
-        StringBuilder indexName = new StringBuilder();
-        for (final String keyNames : index.keySet()) {
-            if (indexName.length() != 0) {
-                indexName.append('_');
-            }
-            indexName.append(keyNames).append('_');
-            BsonValue ascOrDescValue = index.get(keyNames);
-            if (ascOrDescValue instanceof BsonNumber) {
-                indexName.append(((BsonNumber) ascOrDescValue).intValue());
-            } else if (ascOrDescValue instanceof BsonString) {
-                indexName.append(((BsonString) ascOrDescValue).getValue().replace(' ', '_'));
-            }
-        }
-        return indexName.toString();
-    }
-
-    private IndexHelper() {
-    }
-}
diff --git a/driver-core/src/main/com/mongodb/operation/InsertOperation.java b/driver-core/src/main/com/mongodb/operation/InsertOperation.java
index 32a8924c854..ae25dc63140 100644
--- a/driver-core/src/main/com/mongodb/operation/InsertOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/InsertOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,12 @@
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.bulk.InsertRequest;
 import com.mongodb.bulk.WriteRequest;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
 
 import java.util.List;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -35,23 +31,43 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class InsertOperation extends BaseWriteOperation {
     private final List<InsertRequest> insertRequests;
 
+    /**
+     * Construct an instance.
+     *
+     * @param namespace         the database and collection namespace for the operation.
+     * @param ordered           whether the inserts are ordered.
+     * @param writeConcern      the write concern for the operation.
+     * @param insertRequests    the list of inserts.
+     * @deprecated              use {@link #InsertOperation(MongoNamespace, boolean, WriteConcern, boolean, List)} instead
+     */
+    @Deprecated
+    public InsertOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
+                           final List<InsertRequest> insertRequests) {
+        this(namespace, ordered, writeConcern, false, insertRequests);
+    }
+
     /**
      * Construct an instance.
      *
      * @param namespace the database and collection namespace for the operation.
      * @param ordered whether the inserts are ordered.
      * @param writeConcern the write concern for the operation.
+     * @param retryWrites   if writes should be retried if they fail due to a network error.
      * @param insertRequests the list of inserts.
+     * @since 3.6
      */
     public InsertOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                           final List<InsertRequest> insertRequests) {
-        super(namespace, ordered, writeConcern);
+                           final boolean retryWrites, final List<InsertRequest> insertRequests) {
+        super(namespace, ordered, writeConcern, retryWrites);
         this.insertRequests = notNull("insertRequests", insertRequests);
+        isTrueArgument("insertRequests not empty", !insertRequests.isEmpty());
     }
 
+
     /**
      * Gets the list of insert requests.
      *
@@ -61,34 +77,14 @@ public List<InsertRequest> getInsertRequests() {
         return insertRequests;
     }
 
-    @Override
-    protected WriteConcernResult executeProtocol(final Connection connection) {
-        return connection.insert(getNamespace(), isOrdered(), getWriteConcern(), insertRequests);
-    }
-
-    @Override
-    protected void executeProtocolAsync(final AsyncConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
-        connection.insertAsync(getNamespace(), isOrdered(), getWriteConcern(), insertRequests, callback);
-    }
-
-    @Override
-    protected BulkWriteResult executeCommandProtocol(final Connection connection) {
-        return connection.insertCommand(getNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(), insertRequests);
-    }
-
-    @Override
-    protected void executeCommandProtocolAsync(final AsyncConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-        connection.insertCommandAsync(getNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(), insertRequests,
-                callback);
-    }
-
     @Override
     protected WriteRequest.Type getType() {
         return WriteRequest.Type.INSERT;
     }
 
     @Override
-    protected int getCount(final BulkWriteResult bulkWriteResult) {
-        return 0;
+    protected List<? extends WriteRequest> getWriteRequests() {
+        return getInsertRequests();
     }
+
 }
diff --git a/driver-core/src/main/com/mongodb/operation/ListCollectionsOperation.java b/driver-core/src/main/com/mongodb/operation/ListCollectionsOperation.java
index c56c3883d32..8d36b0eca26 100644
--- a/driver-core/src/main/com/mongodb/operation/ListCollectionsOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/ListCollectionsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,11 @@
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
 import org.bson.BsonArray;
+import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentReader;
 import org.bson.BsonInt32;
@@ -52,21 +55,23 @@
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.connection.ServerType.SHARD_ROUTER;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotZero;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandWithConnection;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.CommandOperationHelper.isNamespaceError;
 import static com.mongodb.operation.CommandOperationHelper.rethrowIfNotNamespaceError;
 import static com.mongodb.operation.CursorHelper.getCursorDocumentFromBatchSize;
 import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
-import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import static com.mongodb.operation.OperationHelper.CallableWithSource;
 import static com.mongodb.operation.OperationHelper.LOGGER;
 import static com.mongodb.operation.OperationHelper.createEmptyAsyncBatchCursor;
 import static com.mongodb.operation.OperationHelper.createEmptyBatchCursor;
 import static com.mongodb.operation.OperationHelper.cursorDocumentToAsyncBatchCursor;
 import static com.mongodb.operation.OperationHelper.cursorDocumentToBatchCursor;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotZero;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
+import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 
@@ -78,12 +83,15 @@
  * @param <T> the document type
  * @since 3.0
  */
+@Deprecated
 public class ListCollectionsOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
     private final String databaseName;
     private final Decoder<T> decoder;
+    private boolean retryReads;
     private BsonDocument filter;
     private int batchSize;
     private long maxTimeMS;
+    private boolean nameOnly;
 
     /**
      * Construct a new instance.
@@ -106,6 +114,17 @@ public BsonDocument getFilter() {
         return filter;
     }
 
+    /**
+     * Gets whether only the collection names should be returned.
+     *
+     * @return true if only the collection names should be returned
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    public boolean isNameOnly() {
+        return nameOnly;
+    }
+
     /**
      * Sets the query filter to apply to the query.
      *
@@ -118,6 +137,23 @@ public ListCollectionsOperation<T> filter(final BsonDocument filter) {
         return this;
     }
 
+    /**
+     * Sets the query filter to apply to the query.
+     * <p>
+     *     Note: this is advisory only, and should be considered an optimization.  Server versions prior to MongoDB 4.0 will ignore
+     *     this request.
+     * </p>
+     *
+     * @param nameOnly true if only the collection names should be requested from the server
+     * @return this
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    public ListCollectionsOperation<T> nameOnly(final boolean nameOnly) {
+        this.nameOnly = nameOnly;
+        return this;
+    }
+
     /**
      * Gets the number of documents to return per batch.
      *
@@ -168,24 +204,51 @@ public ListCollectionsOperation<T> maxTime(final long maxTime, final TimeUnit ti
         return this;
     }
 
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     */
+    public ListCollectionsOperation<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
     @Override
     public BatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
+        return withReadConnectionSource(binding, new CallableWithSource<BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
+            public BatchCursor<T> call(final ConnectionSource source) {
+                Connection connection = source.getConnection();
                 if (serverIsAtLeastVersionThreeDotZero(connection.getDescription())) {
                     try {
-                        return executeWrappedCommandProtocol(binding, databaseName, getCommand(), createCommandDecoder(), connection,
-                                commandTransformer(source));
+                        return executeCommandWithConnection(binding, source, databaseName, getCommandCreator(), createCommandDecoder(),
+                                commandTransformer(), retryReads, connection);
                     } catch (MongoCommandException e) {
                         return rethrowIfNotNamespaceError(e, createEmptyBatchCursor(createNamespace(), decoder,
                                 source.getServerDescription().getAddress(), batchSize));
                     }
                 } else {
-                    return new ProjectingBatchCursor(new QueryBatchCursor<BsonDocument>(connection.query(getNamespace(),
-                            asQueryDocument(connection.getDescription(), binding.getReadPreference()), null, 0, 0, batchSize,
-                            binding.getReadPreference().isSlaveOk(), false, false,  false, false, false, new BsonDocumentCodec()), 0,
-                            batchSize, new BsonDocumentCodec(), source));
+                    try {
+                        return new ProjectingBatchCursor(new QueryBatchCursor<BsonDocument>(connection.query(getNamespace(),
+                                asQueryDocument(connection.getDescription(), binding.getReadPreference()), null, 0, 0, batchSize,
+                                binding.getReadPreference().isSlaveOk(), false, false, false, false, false,
+                                new BsonDocumentCodec()), 0, batchSize, new BsonDocumentCodec(), source));
+                    } finally {
+                        connection.release();
+                    }
                 }
             }
         });
@@ -193,7 +256,7 @@ public BatchCursor<T> call(final ConnectionSource source, final Connection conne
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnectionAndSource() {
+        withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
             @Override
             public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -203,8 +266,8 @@ public void call(final AsyncConnectionSource source, final AsyncConnection conne
                     final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = releasingCallback(errHandlingCallback,
                                                                                                         source, connection);
                     if (serverIsAtLeastVersionThreeDotZero(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, databaseName, getCommand(), createCommandDecoder(),
-                                connection, asyncTransformer(source, connection),
+                        executeCommandAsync(binding, databaseName, getCommandCreator(), createCommandDecoder(),
+                                asyncTransformer(), retryReads,
                                 new SingleResultCallback<AsyncBatchCursor<T>>() {
                                     @Override
                                     public void onResult(final AsyncBatchCursor<T> result, final Throwable t) {
@@ -238,27 +301,27 @@ public void onResult(final QueryResult<BsonDocument> result, final Throwable t)
     }
 
     private AsyncBatchCursor<T> emptyAsyncCursor(final AsyncConnectionSource source) {
-        return createEmptyAsyncBatchCursor(createNamespace(), decoder, source.getServerDescription().getAddress(), batchSize);
+        return createEmptyAsyncBatchCursor(createNamespace(), source.getServerDescription().getAddress());
     }
 
     private MongoNamespace createNamespace() {
         return new MongoNamespace(databaseName, "$cmd.listCollections");
     }
 
-    private CommandTransformer<BsonDocument, AsyncBatchCursor<T>> asyncTransformer(final AsyncConnectionSource source,
-                                                                         final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, AsyncBatchCursor<T>>() {
+    private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>>() {
             @Override
-            public AsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public AsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                             final AsyncConnection connection) {
                 return cursorDocumentToAsyncBatchCursor(result.getDocument("cursor"), decoder, source, connection, batchSize);
             }
         };
     }
 
-    private CommandTransformer<BsonDocument, BatchCursor<T>> commandTransformer(final ConnectionSource source) {
-        return new CommandTransformer<BsonDocument, BatchCursor<T>>() {
+    private CommandReadTransformer<BsonDocument, BatchCursor<T>> commandTransformer() {
+        return new CommandReadTransformer<BsonDocument, BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public BatchCursor<T> apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 return cursorDocumentToBatchCursor(result.getDocument("cursor"), decoder, source, batchSize);
             }
         };
@@ -268,12 +331,24 @@ private MongoNamespace getNamespace() {
         return new MongoNamespace(databaseName, "system.namespaces");
     }
 
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return getCommand();
+            }
+        };
+    }
+
     private BsonDocument getCommand() {
         BsonDocument command = new BsonDocument("listCollections", new BsonInt32(1))
-                .append("cursor", getCursorDocumentFromBatchSize(batchSize));
+                .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));
         if (filter != null) {
             command.append("filter", filter);
         }
+        if (nameOnly) {
+            command.append("nameOnly", BsonBoolean.TRUE);
+        }
         if (maxTimeMS > 0) {
             command.put("maxTimeMS", new BsonInt64(maxTimeMS));
         }
@@ -368,7 +443,6 @@ public ServerCursor getServerCursor() {
         public ServerAddress getServerAddress() {
             return delegate.getServerAddress();
         }
-
     }
 
     private final class ProjectingAsyncBatchCursor implements AsyncBatchCursor<T> {
@@ -393,6 +467,20 @@ public void onResult(final List<BsonDocument> result, final Throwable t) {
             });
         }
 
+        @Override
+        public void tryNext(final SingleResultCallback<List<T>> callback) {
+            delegate.tryNext(new SingleResultCallback<List<BsonDocument>>() {
+                @Override
+                public void onResult(final List<BsonDocument> result, final Throwable t) {
+                    if (t != null) {
+                        callback.onResult(null, t);
+                    } else {
+                        callback.onResult(projectFromFullNamespaceToCollectionName(result), null);
+                    }
+                }
+            });
+        }
+
         @Override
         public void setBatchSize(final int batchSize) {
             delegate.setBatchSize(batchSize);
diff --git a/driver-core/src/main/com/mongodb/operation/ListDatabasesOperation.java b/driver-core/src/main/com/mongodb/operation/ListDatabasesOperation.java
index bde39a5d1a7..1c4ae7ca83b 100644
--- a/driver-core/src/main/com/mongodb/operation/ListDatabasesOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/ListDatabasesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package com.mongodb.operation;
 
-import com.mongodb.ServerAddress;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncConnectionSource;
@@ -27,7 +26,10 @@
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonInt64;
@@ -37,12 +39,10 @@
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
-import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.withConnection;
 
 
 /**
@@ -51,10 +51,14 @@
  * @param <T> the document type
  * @since 3.0
  */
+@Deprecated
 public class ListDatabasesOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
     private final Decoder<T> decoder;
+    private boolean retryReads;
 
     private long maxTimeMS;
+    private BsonDocument filter;
+    private Boolean nameOnly;
 
     /**
      * Construct a new instance.
@@ -91,6 +95,78 @@ public ListDatabasesOperation<T> maxTime(final long maxTime, final TimeUnit time
         return this;
     }
 
+    /**
+     * Sets the query filter to apply to the returned database names.
+     *
+     * @param filter the filter, which may be null.
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public ListDatabasesOperation<T> filter(final BsonDocument filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /**
+     * Gets the query filter to apply to the returned database names.
+     *
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public BsonDocument getFilter() {
+        return filter;
+    }
+
+    /**
+     * Sets the nameOnly flag that indicates whether the command should return just the database names or return the database names and
+     * size information.
+     *
+     * @param nameOnly the nameOnly flag, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public ListDatabasesOperation<T> nameOnly(final Boolean nameOnly) {
+        this.nameOnly = nameOnly;
+        return this;
+    }
+
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     */
+    public ListDatabasesOperation<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
+    /**
+     * Gets the nameOnly flag that indicates whether the command should return just the database names or return the database names and
+     * size information.
+     *
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public Boolean getNameOnly() {
+        return nameOnly;
+    }
+
     /**
      * Executing this will return a list of all the databases names in the MongoDB instance.
      *
@@ -99,48 +175,33 @@ public ListDatabasesOperation<T> maxTime(final long maxTime, final TimeUnit time
      */
     @Override
     public BatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new OperationHelper.CallableWithConnectionAndSource<BatchCursor<T>>() {
-            @Override
-            public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
-                return executeWrappedCommandProtocol(binding, "admin", getCommand(),
-                        CommandResultDocumentCodec.create(decoder, "databases"), connection, transformer(source, connection));
-            }
-        });
+        return executeCommand(binding, "admin", getCommandCreator(),
+                CommandResultDocumentCodec.create(decoder, "databases"), transformer(), retryReads);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnectionAndSource() {
-            @Override
-            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    executeWrappedCommandProtocolAsync(binding,  "admin", getCommand(),
-                            CommandResultDocumentCodec.create(decoder, "databases"), connection, asyncTransformer(source, connection),
-                            releasingCallback(errHandlingCallback, connection));
-                }
-            }
-        });
+        executeCommandAsync(binding, "admin", getCommandCreator(),
+                CommandResultDocumentCodec.create(decoder, "databases"), asyncTransformer(),
+                retryReads, errorHandlingCallback(callback, LOGGER));
     }
 
-    private CommandTransformer<BsonDocument, BatchCursor<T>> transformer(final ConnectionSource source, final Connection connection) {
-        return new CommandTransformer<BsonDocument, BatchCursor<T>>() {
+    private CommandReadTransformer<BsonDocument, BatchCursor<T>> transformer() {
+        return new CommandReadTransformer<BsonDocument, BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public BatchCursor<T> apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 return new QueryBatchCursor<T>(createQueryResult(result, connection.getDescription()), 0, 0, decoder, source);
             }
         };
     }
 
-    private CommandTransformer<BsonDocument, AsyncBatchCursor<T>> asyncTransformer(final AsyncConnectionSource source,
-                                                                         final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, AsyncBatchCursor<T>>() {
+    private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>>() {
             @Override
-            public AsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public AsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                             final AsyncConnection connection) {
                 return new AsyncQueryBatchCursor<T>(createQueryResult(result, connection.getDescription()), 0, 0, 0, decoder, source,
-                                                    connection);
+                                                    connection, result);
             }
         };
     }
@@ -151,11 +212,26 @@ private QueryResult<T> createQueryResult(final BsonDocument result, final Connec
                 description.getServerAddress());
     }
 
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return getCommand();
+            }
+        };
+    }
+
     private BsonDocument getCommand() {
         BsonDocument command = new BsonDocument("listDatabases", new BsonInt32(1));
         if (maxTimeMS > 0) {
             command.put("maxTimeMS", new BsonInt64(maxTimeMS));
         }
+        if (filter != null) {
+            command.put("filter", filter);
+        }
+        if (nameOnly != null) {
+            command.put("nameOnly", new BsonBoolean(nameOnly));
+        }
         return command;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/ListIndexesOperation.java b/driver-core/src/main/com/mongodb/operation/ListIndexesOperation.java
index 4795eb7e64e..ea02fb7be41 100644
--- a/driver-core/src/main/com/mongodb/operation/ListIndexesOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/ListIndexesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadPreference;
-import com.mongodb.ServerAddress;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncConnectionSource;
@@ -30,7 +29,10 @@
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import com.mongodb.operation.OperationHelper.CallableWithSource;
 import org.bson.BsonDocument;
 import org.bson.BsonInt64;
 import org.bson.BsonString;
@@ -43,8 +45,9 @@
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.connection.ServerType.SHARD_ROUTER;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandWithConnection;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsyncWithConnection;
 import static com.mongodb.operation.CommandOperationHelper.isNamespaceError;
 import static com.mongodb.operation.CommandOperationHelper.rethrowIfNotNamespaceError;
 import static com.mongodb.operation.CursorHelper.getCursorDocumentFromBatchSize;
@@ -55,8 +58,9 @@
 import static com.mongodb.operation.OperationHelper.cursorDocumentToAsyncBatchCursor;
 import static com.mongodb.operation.OperationHelper.cursorDocumentToBatchCursor;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotZero;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
+import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotZero;
 
 /**
  * An operation that lists the indexes that have been created on a collection.  For flexibility, the type of each document returned is
@@ -66,9 +70,11 @@
  * @since 3.0
  * @mongodb.driver.manual reference/command/listIndexes/ List indexes
  */
+@Deprecated
 public class ListIndexesOperation<T> implements AsyncReadOperation<AsyncBatchCursor<T>>, ReadOperation<BatchCursor<T>> {
     private final MongoNamespace namespace;
     private final Decoder<T> decoder;
+    private boolean retryReads;
     private int batchSize;
     private long maxTimeMS;
 
@@ -133,24 +139,51 @@ public ListIndexesOperation<T> maxTime(final long maxTime, final TimeUnit timeUn
         return this;
     }
 
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     */
+    public ListIndexesOperation<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
     @Override
     public BatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new OperationHelper.CallableWithConnectionAndSource<BatchCursor<T>>() {
+        return withReadConnectionSource(binding, new CallableWithSource<BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
+            public BatchCursor<T> call(final ConnectionSource source) {
+                Connection connection = source.getConnection();
                 if (serverIsAtLeastVersionThreeDotZero(connection.getDescription())) {
                     try {
-                        return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), createCommandDecoder(),
-                                connection, transformer(source));
+                        return executeCommandWithConnection(binding, source, namespace.getDatabaseName(), getCommandCreator(),
+                                createCommandDecoder(), transformer(), retryReads, connection);
                     } catch (MongoCommandException e) {
                         return rethrowIfNotNamespaceError(e, createEmptyBatchCursor(namespace, decoder,
                                                                                     source.getServerDescription().getAddress(), batchSize));
                     }
                 } else {
-                    return new QueryBatchCursor<T>(connection.query(getIndexNamespace(),
-                            asQueryDocument(connection.getDescription(), binding.getReadPreference()), null, 0, 0, batchSize,
-                            binding.getReadPreference().isSlaveOk(), false, false, false, false, false, decoder), 0, batchSize, decoder,
-                            source);
+                    try {
+                        return new QueryBatchCursor<T>(connection.query(getIndexNamespace(),
+                                asQueryDocument(connection.getDescription(), binding.getReadPreference()), null, 0, 0, batchSize,
+                                binding.getReadPreference().isSlaveOk(), false, false, false, false, false, decoder), 0, batchSize, decoder,
+                                source);
+                    } finally {
+                        connection.release();
+                    }
                 }
             }
         });
@@ -158,32 +191,30 @@ public BatchCursor<T> call(final ConnectionSource source, final Connection conne
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<AsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnectionAndSource() {
+        withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
             @Override
             public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                final SingleResultCallback<AsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
                 if (t != null) {
                     errHandlingCallback.onResult(null, t);
                 } else {
-                    final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = releasingCallback(errHandlingCallback,
-                                                                                                        source, connection);
                     if (serverIsAtLeastVersionThreeDotZero(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(), createCommandDecoder(),
-                                connection, asyncTransformer(source, connection),
+                        executeCommandAsyncWithConnection(binding, source, namespace.getDatabaseName(), getCommandCreator(),
+                                createCommandDecoder(), asyncTransformer(), retryReads, connection,
                                 new SingleResultCallback<AsyncBatchCursor<T>>() {
                                     @Override
                                     public void onResult(final AsyncBatchCursor<T> result,
                                                          final Throwable t) {
                                         if (t != null && !isNamespaceError(t)) {
-                                            wrappedCallback.onResult(null, t);
+                                            errHandlingCallback.onResult(null, t);
                                         } else {
-                                            wrappedCallback.onResult(result != null
-                                                                     ? result : emptyAsyncCursor(source),
-                                                                     null);
+                                            errHandlingCallback.onResult(result != null ? result : emptyAsyncCursor(source), null);
                                         }
                                     }
                                 });
                     } else {
+                        final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = releasingCallback(errHandlingCallback,
+                                source, connection);
                         connection.queryAsync(getIndexNamespace(),
                                 asQueryDocument(connection.getDescription(), binding.getReadPreference()), null, 0, 0, batchSize,
                                 binding.getReadPreference().isSlaveOk(), false, false, false, false, false, decoder,
@@ -206,7 +237,7 @@ public void onResult(final QueryResult<T> result, final Throwable t) {
     }
 
     private AsyncBatchCursor<T> emptyAsyncCursor(final AsyncConnectionSource source) {
-        return createEmptyAsyncBatchCursor(namespace, decoder, source.getServerDescription().getAddress(), batchSize);
+        return createEmptyAsyncBatchCursor(namespace, source.getServerDescription().getAddress());
     }
 
     private BsonDocument asQueryDocument(final ConnectionDescription connectionDescription, final ReadPreference readPreference) {
@@ -224,29 +255,38 @@ private MongoNamespace getIndexNamespace() {
         return new MongoNamespace(namespace.getDatabaseName(), "system.indexes");
     }
 
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return getCommand();
+            }
+        };
+    }
+
     private BsonDocument getCommand() {
         BsonDocument command = new BsonDocument("listIndexes", new BsonString(namespace.getCollectionName()))
-                .append("cursor", getCursorDocumentFromBatchSize(batchSize));
+                .append("cursor", getCursorDocumentFromBatchSize(batchSize == 0 ? null : batchSize));
         if (maxTimeMS > 0) {
             command.put("maxTimeMS", new BsonInt64(maxTimeMS));
         }
         return command;
     }
 
-    private CommandTransformer<BsonDocument, BatchCursor<T>> transformer(final ConnectionSource source) {
-        return new CommandTransformer<BsonDocument, BatchCursor<T>>() {
+    private CommandReadTransformer<BsonDocument, BatchCursor<T>> transformer() {
+        return new CommandReadTransformer<BsonDocument, BatchCursor<T>>() {
             @Override
-            public BatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public BatchCursor<T> apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 return cursorDocumentToBatchCursor(result.getDocument("cursor"), decoder, source, batchSize);
             }
         };
     }
 
-    private CommandTransformer<BsonDocument, AsyncBatchCursor<T>> asyncTransformer(final AsyncConnectionSource source,
-                                                                         final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, AsyncBatchCursor<T>>() {
+    private CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, AsyncBatchCursor<T>>() {
             @Override
-            public AsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public AsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                             final AsyncConnection connection) {
                 return cursorDocumentToAsyncBatchCursor(result.getDocument("cursor"), decoder, source, connection, batchSize);
             }
         };
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceAsyncBatchCursor.java b/driver-core/src/main/com/mongodb/operation/MapReduceAsyncBatchCursor.java
index bb71074b3b3..e1bb0c708ff 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceAsyncBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceAsyncBatchCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
  * @param <T> the type of each result, usually some sort of document.
  * @since 3.0
  */
+@Deprecated
 public interface MapReduceAsyncBatchCursor<T> extends AsyncBatchCursor<T> {
     /**
      * Get the statistics for this map-reduce operation
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceBatchCursor.java b/driver-core/src/main/com/mongodb/operation/MapReduceBatchCursor.java
index 9764051ed52..fdf11b41ea2 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceBatchCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
  * @param <T> the operations result type.
  * @since 3.0
  */
+@Deprecated
 public interface MapReduceBatchCursor<T> extends BatchCursor<T> {
     /**
      * Get the statistics for this map-reduce operation
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceHelper.java b/driver-core/src/main/com/mongodb/operation/MapReduceHelper.java
index f060192d703..bfaf8c217e0 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsAsyncCursor.java b/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsAsyncCursor.java
index 2c20e28976c..1ff7ba08e2d 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsAsyncCursor.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsAsyncCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package com.mongodb.operation;
 
 import com.mongodb.connection.QueryResult;
-import org.bson.codecs.Decoder;
 
 /**
  * Cursor representation of the results of an inline map-reduce operation.  This allows users to iterate over the results that were returned
@@ -26,12 +25,12 @@
  * @param <T> the operations result type.
  * @since 3.0
  */
-class MapReduceInlineResultsAsyncCursor<T> extends AsyncQueryBatchCursor<T> implements MapReduceAsyncBatchCursor<T> {
+class MapReduceInlineResultsAsyncCursor<T> extends AsyncSingleBatchQueryCursor<T> implements MapReduceAsyncBatchCursor<T> {
 
     private final MapReduceStatistics statistics;
 
-    MapReduceInlineResultsAsyncCursor(final QueryResult<T> queryResult, final Decoder<T> decoder, final MapReduceStatistics statistics) {
-        super(queryResult, 0, 0, decoder);
+    MapReduceInlineResultsAsyncCursor(final QueryResult<T> queryResult, final MapReduceStatistics statistics) {
+        super(queryResult);
         this.statistics = statistics;
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsCursor.java b/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsCursor.java
index 05d7d4ca2f4..4a1f51ea54b 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsCursor.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceInlineResultsCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceStatistics.java b/driver-core/src/main/com/mongodb/operation/MapReduceStatistics.java
index bdd8756d401..12d0884f2b0 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceStatistics.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class MapReduceStatistics {
 
     private final int inputCount;
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceToCollectionOperation.java b/driver-core/src/main/com/mongodb/operation/MapReduceToCollectionOperation.java
index d3b81f81a26..5979fdc2894 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceToCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceToCollectionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,14 +18,16 @@
 
 import com.mongodb.ExplainVerbosity;
 import com.mongodb.MongoNamespace;
-import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandWriteTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandWriteTransformerAsync;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonJavaScript;
@@ -40,14 +42,20 @@
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.operation.DocumentHelper.putIfTrue;
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
 import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.validateCollation;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.operation.OperationHelper.CallableWithConnection;
 import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.internal.operation.WriteConcernHelper.throwOnWriteConcernError;
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
@@ -61,12 +69,14 @@
  * @mongodb.driver.manual core/map-reduce Map Reduce
  * @since 3.0
  */
+@Deprecated
 public class
 MapReduceToCollectionOperation implements AsyncWriteOperation<MapReduceStatistics>, WriteOperation<MapReduceStatistics> {
     private final MongoNamespace namespace;
     private final BsonJavaScript mapFunction;
     private final BsonJavaScript reduceFunction;
     private final String collectionName;
+    private final WriteConcern writeConcern;
     private BsonJavaScript finalizeFunction;
     private BsonDocument scope;
     private BsonDocument filter;
@@ -80,6 +90,7 @@
     private boolean sharded;
     private boolean nonAtomic;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
     private static final List<String> VALID_ACTIONS = asList("replace", "merge", "reduce");
 
     /**
@@ -93,10 +104,39 @@
      */
     public MapReduceToCollectionOperation(final MongoNamespace namespace, final BsonJavaScript mapFunction,
                                           final BsonJavaScript reduceFunction, final String collectionName) {
+        this(namespace, mapFunction, reduceFunction, collectionName, null);
+    }
+
+    /**
+     * Construct a MapReduceOperation with all the criteria it needs to execute
+     *
+     * @param namespace the database and collection namespace for the operation.
+     * @param mapFunction a JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
+     * @param reduceFunction a JavaScript function that "reduces" to a single object all the values associated with a particular key.
+     * @param collectionName the name of the collection to output the results to.
+     * @param writeConcern the write concern
+     * @mongodb.driver.manual core/map-reduce Map Reduce
+     *
+     * @since 3.4
+     */
+    public MapReduceToCollectionOperation(final MongoNamespace namespace, final BsonJavaScript mapFunction,
+                                          final BsonJavaScript reduceFunction, final String collectionName,
+                                          final WriteConcern writeConcern) {
         this.namespace = notNull("namespace", namespace);
         this.mapFunction = notNull("mapFunction", mapFunction);
         this.reduceFunction = notNull("reduceFunction", reduceFunction);
         this.collectionName = notNull("collectionName", collectionName);
+        this.writeConcern = writeConcern;
+    }
+
+    /**
+     * Gets the namespace.
+     *
+     * @return the namespace
+     * @since 3.4
+     */
+    public MongoNamespace getNamespace() {
+        return namespace;
     }
 
     /**
@@ -126,6 +166,17 @@ public String getCollectionName() {
         return collectionName;
     }
 
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     *
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
     /**
      * Gets the JavaScript function that follows the reduce method and modifies the output. Default is null
      *
@@ -425,6 +476,31 @@ public MapReduceToCollectionOperation bypassDocumentValidation(final Boolean byp
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public MapReduceToCollectionOperation collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
     /**
      * Executing this will return a cursor with your results in.
      *
@@ -433,10 +509,11 @@ public MapReduceToCollectionOperation bypassDocumentValidation(final Boolean byp
      */
     @Override
     public MapReduceStatistics execute(final WriteBinding binding) {
-        return withConnection(binding, new OperationHelper.CallableWithConnection<MapReduceStatistics>() {
+        return withConnection(binding, new CallableWithConnection<MapReduceStatistics>() {
             @Override
             public MapReduceStatistics call(final Connection connection) {
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
+                validateCollation(connection, collation);
+                return executeCommand(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
                         connection, transformer());
             }
         });
@@ -444,15 +521,25 @@ public MapReduceStatistics call(final Connection connection) {
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<MapReduceStatistics> callback) {
-        withConnection(binding, new OperationHelper.AsyncCallableWithConnection() {
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
             @Override
             public void call(final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<MapReduceStatistics> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
                 if (t != null) {
                     errHandlingCallback.onResult(null, t);
                 } else {
-                    executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
-                            connection, transformer(), releasingCallback(errHandlingCallback, connection));
+                    final SingleResultCallback<MapReduceStatistics> wrappedCallback = releasingCallback(errHandlingCallback, connection);
+                    validateCollation(connection, collation, new AsyncCallableWithConnection() {
+                        @Override
+                        public void call(final AsyncConnection connection, final Throwable t) {
+                            if (t != null) {
+                                wrappedCallback.onResult(null, t);
+                            } else {
+                                executeCommandAsync(binding, namespace.getDatabaseName(),
+                                        getCommand(connection.getDescription()), connection, transformerAsync(), wrappedCallback);
+                            }
+                        }
+                    });
                 }
             }
         });
@@ -484,11 +571,23 @@ private CommandReadOperation<BsonDocument> createExplainableOperation(final Expl
                                                       new BsonDocumentCodec());
     }
 
-    private CommandTransformer<BsonDocument, MapReduceStatistics> transformer() {
-        return new CommandTransformer<BsonDocument, MapReduceStatistics>() {
+    private CommandWriteTransformer<BsonDocument, MapReduceStatistics> transformer() {
+        return new CommandWriteTransformer<BsonDocument, MapReduceStatistics>() {
             @SuppressWarnings("unchecked")
             @Override
-            public MapReduceStatistics apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public MapReduceStatistics apply(final BsonDocument result, final Connection connection) {
+                throwOnWriteConcernError(result, connection.getDescription().getServerAddress());
+                return MapReduceHelper.createStatistics(result);
+            }
+        };
+    }
+
+    private CommandWriteTransformerAsync<BsonDocument, MapReduceStatistics> transformerAsync() {
+        return new CommandWriteTransformerAsync<BsonDocument, MapReduceStatistics>() {
+            @SuppressWarnings("unchecked")
+            @Override
+            public MapReduceStatistics apply(final BsonDocument result, final AsyncConnection connection) {
+                throwOnWriteConcernError(result, connection.getDescription().getServerAddress());
                 return MapReduceHelper.createStatistics(result);
             }
         };
@@ -501,7 +600,6 @@ private BsonDocument getCommand(final ConnectionDescription description) {
         if (getDatabaseName() != null) {
             outputDocument.put("db", new BsonString(getDatabaseName()));
         }
-
         BsonDocument commandDocument = new BsonDocument("mapreduce", new BsonString(namespace.getCollectionName()))
                                            .append("map", getMapFunction())
                                            .append("reduce", getReduceFunction())
@@ -517,6 +615,12 @@ private BsonDocument getCommand(final ConnectionDescription description) {
         if (bypassDocumentValidation != null && description != null && serverIsAtLeastVersionThreeDotTwo(description)) {
             commandDocument.put("bypassDocumentValidation", BsonBoolean.valueOf(bypassDocumentValidation));
         }
+        if (description != null) {
+            appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        }
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
+        }
         return commandDocument;
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/MapReduceWithInlineResultsOperation.java b/driver-core/src/main/com/mongodb/operation/MapReduceWithInlineResultsOperation.java
index 21f37885a2a..b953f47b2ed 100644
--- a/driver-core/src/main/com/mongodb/operation/MapReduceWithInlineResultsOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/MapReduceWithInlineResultsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,21 @@
 
 import com.mongodb.ExplainVerbosity;
 import com.mongodb.MongoNamespace;
-import com.mongodb.ReadConcern;
-import com.mongodb.ServerAddress;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncReadBinding;
 import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
-import com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.connection.NoOpSessionContext;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -44,15 +47,15 @@
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.operation.DocumentHelper.putIfTrue;
-import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import static com.mongodb.operation.ExplainHelper.asExplainCommand;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.checkValidReadConcern;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -66,6 +69,7 @@
  * @mongodb.driver.manual core/map-reduce Map-Reduce
  * @since 3.0
  */
+@Deprecated
 public class MapReduceWithInlineResultsOperation<T> implements AsyncReadOperation<MapReduceAsyncBatchCursor<T>>,
                                                                ReadOperation<MapReduceBatchCursor<T>> {
     private final MongoNamespace namespace;
@@ -80,7 +84,7 @@ public class MapReduceWithInlineResultsOperation<T> implements AsyncReadOperatio
     private boolean jsMode;
     private boolean verbose;
     private long maxTimeMS;
-    private ReadConcern readConcern = ReadConcern.DEFAULT;
+    private Collation collation;
 
     /**
      * Construct a MapReduceOperation with all the criteria it needs to execute.
@@ -99,6 +103,26 @@ public MapReduceWithInlineResultsOperation(final MongoNamespace namespace, final
         this.decoder = notNull("decoder", decoder);
     }
 
+    /**
+     * Gets the namespace.
+     *
+     * @return the namespace
+     * @since 3.4
+     */
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Gets the decoder used to decode the result documents.
+     *
+     * @return the decoder
+     * @since 3.4
+     */
+    public Decoder<T> getDecoder() {
+        return decoder;
+    }
+
     /**
      * Gets the JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
      *
@@ -273,6 +297,31 @@ public MapReduceWithInlineResultsOperation<T> verbose(final boolean verbose) {
         return this;
     }
 
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public MapReduceWithInlineResultsOperation<T> collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
     /**
      * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
      *
@@ -299,29 +348,6 @@ public MapReduceWithInlineResultsOperation<T> maxTime(final long maxTime, final
         return this;
     }
 
-    /**
-     * Gets the read concern
-     *
-     * @return the read concern
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    public ReadConcern getReadConcern() {
-        return readConcern;
-    }
-
-    /**
-     * Sets the read concern
-     * @param readConcern the read concern
-     * @return this
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    public MapReduceWithInlineResultsOperation<T> readConcern(final ReadConcern readConcern) {
-        this.readConcern = notNull("readConcern", readConcern);
-        return this;
-    }
-
     /**
      * Executing this will return a cursor with your results and the statistics in.
      *
@@ -331,43 +357,16 @@ public MapReduceWithInlineResultsOperation<T> readConcern(final ReadConcern read
     @Override
     @SuppressWarnings("unchecked")
     public MapReduceBatchCursor<T> execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnectionAndSource<MapReduceBatchCursor<T>>() {
-            @Override
-            public MapReduceBatchCursor<T> call(final ConnectionSource source, final Connection connection) {
-                checkValidReadConcern(connection, readConcern);
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(),
-                                                     CommandResultDocumentCodec.create(decoder, "results"),
-                                                     connection, transformer(source, connection));
-            }
-        });
+        return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()),
+                CommandResultDocumentCodec.create(decoder, "results"), transformer(), false);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<MapReduceAsyncBatchCursor<T>> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
-            @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<MapReduceAsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    final SingleResultCallback<MapReduceAsyncBatchCursor<T>> wrappedCallback = releasingCallback(
-                            errHandlingCallback, connection);
-                    checkValidReadConcern(connection, readConcern, new AsyncCallableWithConnection() {
-                        @Override
-                        public void call(final AsyncConnection connection, final Throwable t) {
-                            if (t != null) {
-                                wrappedCallback.onResult(null, t);
-                            } else {
-                                executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(),
-                                        CommandResultDocumentCodec.create(decoder, "results"), connection, asyncTransformer(connection),
-                                        wrappedCallback);
-                            }
-                        }
-                    });
-                }
-            }
-        });
+        SingleResultCallback<MapReduceAsyncBatchCursor<T>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()),
+                CommandResultDocumentCodec.create(decoder, "results"),
+                asyncTransformer(), false, errHandlingCallback);
     }
 
     /**
@@ -392,32 +391,42 @@ public AsyncReadOperation<BsonDocument> asExplainableOperationAsync(final Explai
 
     private CommandReadOperation<BsonDocument> createExplainableOperation(final ExplainVerbosity explainVerbosity) {
         return new CommandReadOperation<BsonDocument>(namespace.getDatabaseName(),
-                                                      ExplainHelper.asExplainCommand(getCommand(), explainVerbosity),
+                                                      asExplainCommand(getCommand(NoOpSessionContext.INSTANCE), explainVerbosity),
                                                       new BsonDocumentCodec());
     }
 
-    private CommandTransformer<BsonDocument, MapReduceBatchCursor<T>> transformer(final ConnectionSource source,
-                                                                                  final Connection connection) {
-        return new CommandTransformer<BsonDocument, MapReduceBatchCursor<T>>() {
+    private CommandReadTransformer<BsonDocument, MapReduceBatchCursor<T>> transformer() {
+        return new CommandReadTransformer<BsonDocument, MapReduceBatchCursor<T>>() {
             @Override
-            public MapReduceBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public MapReduceBatchCursor<T> apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 return new MapReduceInlineResultsCursor<T>(createQueryResult(result, connection.getDescription()), decoder, source,
                                                            MapReduceHelper.createStatistics(result));
             }
         };
     }
 
-    private CommandTransformer<BsonDocument, MapReduceAsyncBatchCursor<T>> asyncTransformer(final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, MapReduceAsyncBatchCursor<T>>() {
+    private CommandReadTransformerAsync<BsonDocument, MapReduceAsyncBatchCursor<T>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, MapReduceAsyncBatchCursor<T>>() {
             @Override
-            public MapReduceAsyncBatchCursor<T> apply(final BsonDocument result, final ServerAddress serverAddress) {
-                return new MapReduceInlineResultsAsyncCursor<T>(createQueryResult(result, connection.getDescription()), decoder,
+            public MapReduceAsyncBatchCursor<T> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                                      final AsyncConnection connection) {
+                return new MapReduceInlineResultsAsyncCursor<T>(createQueryResult(result, connection.getDescription()),
                                                                 MapReduceHelper.createStatistics(result));
             }
         };
     }
 
-    private BsonDocument getCommand() {
+    private CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateReadConcernAndCollation(connectionDescription, sessionContext.getReadConcern(), collation);
+                return getCommand(sessionContext);
+            }
+        };
+    }
+
+    private BsonDocument getCommand(final SessionContext sessionContext) {
         BsonDocument commandDocument = new BsonDocument("mapreduce", new BsonString(namespace.getCollectionName()))
                                            .append("map", getMapFunction())
                                            .append("reduce", getReduceFunction())
@@ -427,11 +436,13 @@ private BsonDocument getCommand() {
                                            .append("finalize", asValueOrNull(getFinalizeFunction()))
                                            .append("scope", asValueOrNull(getScope()))
                                            .append("verbose", BsonBoolean.valueOf(isVerbose()));
+
+        appendReadConcernToCommand(sessionContext, commandDocument);
         putIfNotZero(commandDocument, "limit", getLimit());
         putIfNotZero(commandDocument, "maxTimeMS", getMaxTime(MILLISECONDS));
         putIfTrue(commandDocument, "jsMode", isJsMode());
-        if (!readConcern.isServerDefault()) {
-            commandDocument.put("readConcern", readConcern.asDocument());
+        if (collation != null) {
+            commandDocument.put("collation", collation.asDocument());
         }
         return commandDocument;
     }
diff --git a/driver-core/src/main/com/mongodb/operation/MixedBulkWriteOperation.java b/driver-core/src/main/com/mongodb/operation/MixedBulkWriteOperation.java
index b5d55a8dd03..22ca4f2e24b 100644
--- a/driver-core/src/main/com/mongodb/operation/MixedBulkWriteOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/MixedBulkWriteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,65 +17,64 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoBulkWriteException;
+import com.mongodb.MongoException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernException;
 import com.mongodb.WriteConcernResult;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.WriteBinding;
-import com.mongodb.bulk.BulkWriteError;
 import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.BulkWriteUpsert;
 import com.mongodb.bulk.DeleteRequest;
 import com.mongodb.bulk.InsertRequest;
 import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.bulk.WriteConcernError;
 import com.mongodb.bulk.WriteRequest;
 import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.BulkWriteBatchCombiner;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.connection.ServerVersion;
-import com.mongodb.internal.connection.IndexMap;
+import com.mongodb.internal.connection.MongoWriteConcernWithResponseException;
+import com.mongodb.internal.connection.ProtocolHelper;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonDocument;
-import org.bson.BsonString;
-import org.bson.BsonValue;
+import org.bson.FieldNameValidator;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.bulk.WriteRequest.Type.DELETE;
 import static com.mongodb.bulk.WriteRequest.Type.INSERT;
 import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
 import static com.mongodb.bulk.WriteRequest.Type.UPDATE;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotSix;
+import static com.mongodb.operation.CommandOperationHelper.logRetryExecute;
+import static com.mongodb.operation.CommandOperationHelper.logUnableToRetry;
+import static com.mongodb.operation.CommandOperationHelper.shouldAttemptToRetryWrite;
+import static com.mongodb.operation.CommandOperationHelper.transformWriteException;
 import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
-import static com.mongodb.operation.OperationHelper.CallableWithConnection;
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
+import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import static com.mongodb.operation.OperationHelper.ConnectionReleasingWrappedCallback;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.bypassDocumentValidationNotSupported;
-import static com.mongodb.operation.OperationHelper.getBypassDocumentValidationException;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.withConnection;
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
+import static com.mongodb.operation.OperationHelper.isRetryableWrite;
+import static com.mongodb.operation.OperationHelper.validateWriteRequests;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
+import static com.mongodb.operation.OperationHelper.withReleasableConnection;
 
 /**
  * An operation to execute a series of write operations in bulk.
  *
  * @since 3.0
  */
+@Deprecated
 public class MixedBulkWriteOperation implements AsyncWriteOperation<BulkWriteResult>, WriteOperation<BulkWriteResult> {
+    private static final FieldNameValidator NO_OP_FIELD_NAME_VALIDATOR = new NoOpFieldNameValidator();
     private final MongoNamespace namespace;
     private final List<? extends WriteRequest> writeRequests;
     private final boolean ordered;
+    private final boolean retryWrites;
     private final WriteConcern writeConcern;
     private Boolean bypassDocumentValidation;
 
@@ -86,17 +85,34 @@ public class MixedBulkWriteOperation implements AsyncWriteOperation<BulkWriteRes
      * @param writeRequests the list of writeRequests to execute.
      * @param ordered       whether the writeRequests must be executed in order.
      * @param writeConcern  the write concern for the operation.
+     * @deprecated          use {@link #MixedBulkWriteOperation(MongoNamespace, List, boolean, WriteConcern, boolean)} instead
      */
-    public MixedBulkWriteOperation(final MongoNamespace namespace, final List<? extends WriteRequest> writeRequests, final boolean ordered,
-                                   final WriteConcern writeConcern) {
+    @Deprecated
+    public MixedBulkWriteOperation(final MongoNamespace namespace, final List<? extends WriteRequest> writeRequests,
+                                   final boolean ordered, final WriteConcern writeConcern) {
+        this(namespace, writeRequests, ordered, writeConcern, false);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param namespace     the database and collection namespace for the operation.
+     * @param writeRequests the list of writeRequests to execute.
+     * @param ordered       whether the writeRequests must be executed in order.
+     * @param writeConcern  the write concern for the operation.
+     * @param retryWrites   if writes should be retried if they fail due to a network error.
+     * @since 3.6
+     */
+    public MixedBulkWriteOperation(final MongoNamespace namespace, final List<? extends WriteRequest> writeRequests,
+                                   final boolean ordered, final WriteConcern writeConcern, final boolean retryWrites) {
         this.ordered = ordered;
         this.namespace = notNull("namespace", namespace);
         this.writeRequests = notNull("writes", writeRequests);
         this.writeConcern = notNull("writeConcern", writeConcern);
+        this.retryWrites = retryWrites;
         isTrueArgument("writes is not an empty list", !writeRequests.isEmpty());
     }
 
-
     /**
      * Gets the namespace of the collection to write to.
      *
@@ -157,595 +173,374 @@ public MixedBulkWriteOperation bypassDocumentValidation(final Boolean bypassDocu
         return this;
     }
 
+    /**
+     * Returns true if writes should be retried if they fail due to a network error.
+     *
+     * @return the retryWrites value
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public Boolean getRetryWrites() {
+        return retryWrites;
+    }
+
     /**
      * Executes a bulk write operation.
      *
      * @param binding the WriteBinding        for the operation
      * @return the bulk write result.
-     * @throws com.mongodb.MongoBulkWriteException if a failure to complete the bulk write is detected based on the server response
+     * @throws MongoBulkWriteException if a failure to complete the bulk write is detected based on the server response
      */
     @Override
     public BulkWriteResult execute(final WriteBinding binding) {
-        return withConnection(binding, new CallableWithConnection<BulkWriteResult>() {
+        return withReleasableConnection(binding, new CallableWithConnectionAndSource<BulkWriteResult>() {
             @Override
-            public BulkWriteResult call(final Connection connection) {
-                if (bypassDocumentValidationNotSupported(bypassDocumentValidation, writeConcern, connection.getDescription())) {
-                    throw getBypassDocumentValidationException();
-                }
-
-                BulkWriteBatchCombiner bulkWriteBatchCombiner = new BulkWriteBatchCombiner(connection.getDescription().getServerAddress(),
-                                                                                           ordered, writeConcern);
-                for (Run run : getRunGenerator(connection.getDescription())) {
-                    try {
-                        BulkWriteResult result = run.execute(connection);
-                        if (result.wasAcknowledged()) {
-                            bulkWriteBatchCombiner.addResult(result, run.indexMap);
-                        }
-                    } catch (MongoBulkWriteException e) {
-                        bulkWriteBatchCombiner.addErrorResult(e, run.indexMap);
-                        if (bulkWriteBatchCombiner.shouldStopSendingMoreBatches()) {
-                            break;
-                        }
-                    }
+            public BulkWriteResult call(final ConnectionSource connectionSource, final Connection connection) {
+                validateWriteRequestsAndReleaseConnectionIfError(binding, connection);
+
+                if (getWriteConcern().isAcknowledged() || serverIsAtLeastVersionThreeDotSix(connection.getDescription())) {
+                    BulkWriteBatch bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, connectionSource.getServerDescription(),
+                            connection.getDescription(), ordered, getAppliedWriteConcern(binding), bypassDocumentValidation, retryWrites,
+                            writeRequests, binding.getSessionContext());
+                    return executeBulkWriteBatch(binding, connection, bulkWriteBatch);
+                } else {
+                    return executeLegacyBatches(connection);
                 }
-                return bulkWriteBatchCombiner.getResult();
             }
         });
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<BulkWriteResult> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+        final SingleResultCallback<BulkWriteResult> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+        withAsyncConnection(binding, new AsyncCallableWithConnectionAndSource() {
             @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<BulkWriteResult> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
                 if (t != null) {
                     errHandlingCallback.onResult(null, t);
-                } else if (bypassDocumentValidationNotSupported(bypassDocumentValidation, writeConcern, connection.getDescription())) {
-                    releasingCallback(errHandlingCallback, connection).onResult(null, getBypassDocumentValidationException());
                 } else {
-                    Iterator<Run> runs = getRunGenerator(connection.getDescription()).iterator();
-                    executeRunsAsync(runs, connection, new BulkWriteBatchCombiner(connection.getDescription().getServerAddress(), ordered,
-                                                                                  writeConcern), errHandlingCallback);
+                    validateWriteRequests(connection, bypassDocumentValidation, writeRequests, getAppliedWriteConcern(binding),
+                            new AsyncCallableWithConnection() {
+                                @Override
+                                public void call(final AsyncConnection connection, final Throwable t1) {
+                                    ConnectionReleasingWrappedCallback<BulkWriteResult> releasingCallback =
+                                            new ConnectionReleasingWrappedCallback<BulkWriteResult>(errHandlingCallback, source,
+                                                    connection);
+                                    if (t1 != null) {
+                                        releasingCallback.onResult(null, t1);
+                                    } else {
+                                        if (getAppliedWriteConcern(binding).isAcknowledged()
+                                                || serverIsAtLeastVersionThreeDotSix(connection.getDescription())) {
+                                            try {
+                                                BulkWriteBatch batch = BulkWriteBatch.createBulkWriteBatch(namespace,
+                                                        source.getServerDescription(), connection.getDescription(), ordered,
+                                                        getAppliedWriteConcern(binding), bypassDocumentValidation,
+                                                        retryWrites, writeRequests, binding.getSessionContext());
+                                                executeBatchesAsync(binding, connection, batch, retryWrites, releasingCallback);
+                                            } catch (Throwable t) {
+                                                releasingCallback.onResult(null, t);
+                                            }
+                                        } else {
+                                            executeLegacyBatchesAsync(connection,  getWriteRequests(), 1, releasingCallback);
+                                        }
+                                    }
+                                }
+                            });
                 }
             }
         });
     }
 
-    private void executeRunsAsync(final Iterator<Run> runs, final AsyncConnection connection,
-                                  final BulkWriteBatchCombiner bulkWriteBatchCombiner,
-                                  final SingleResultCallback<BulkWriteResult> callback) {
+    private BulkWriteResult executeBulkWriteBatch(final WriteBinding binding, final Connection connection,
+                                                  final BulkWriteBatch originalBatch) {
+        BulkWriteBatch currentBatch = originalBatch;
+        MongoException exception = null;
 
-        final Run run = runs.next();
-        final SingleResultCallback<BulkWriteResult> wrappedCallback = releasingCallback(callback, connection);
-        run.executeAsync(connection, new SingleResultCallback<BulkWriteResult>() {
-            @Override
-            public void onResult(final BulkWriteResult result, final Throwable t) {
-                if (t != null) {
-                    if (t instanceof MongoBulkWriteException) {
-                        bulkWriteBatchCombiner.addErrorResult((MongoBulkWriteException) t, run.indexMap);
-                    } else {
-                        wrappedCallback.onResult(null, t);
-                        return;
-                    }
-                } else if (result.wasAcknowledged()) {
-                    bulkWriteBatchCombiner.addResult(result, run.indexMap);
-                }
+        try {
+            while (currentBatch.shouldProcessBatch()) {
+                BsonDocument result = executeCommand(connection, currentBatch, binding);
 
-                // Execute next run or complete
-                if (runs.hasNext() && !bulkWriteBatchCombiner.shouldStopSendingMoreBatches()) {
-                    executeRunsAsync(runs, connection, bulkWriteBatchCombiner, callback);
-                } else {
-                    if (bulkWriteBatchCombiner.hasErrors()) {
-                        wrappedCallback.onResult(null, bulkWriteBatchCombiner.getError());
-                    } else {
-                        wrappedCallback.onResult(bulkWriteBatchCombiner.getResult(), null);
+                if (retryWrites && !binding.getSessionContext().hasActiveTransaction()) {
+                    MongoException writeConcernBasedError = ProtocolHelper.createSpecialException(result,
+                            connection.getDescription().getServerAddress(), "errMsg");
+                    if (writeConcernBasedError != null && shouldAttemptToRetryWrite(true, writeConcernBasedError)) {
+                        throw new MongoWriteConcernWithResponseException(writeConcernBasedError, result);
                     }
                 }
-            }
-        });
-    }
 
-    private boolean shouldUseWriteCommands(final ConnectionDescription description) {
-        return writeConcern.isAcknowledged() && serverSupportsWriteCommands(description);
-    }
-
-    private boolean serverSupportsWriteCommands(final ConnectionDescription connectionDescription) {
-        return connectionDescription.getServerVersion().compareTo(new ServerVersion(2, 6)) >= 0;
-    }
+                currentBatch.addResult(result);
+                currentBatch = currentBatch.getNextBatch();
+            }
+        } catch (MongoException e) {
+            exception = e;
+        } finally {
+            connection.release();
+        }
 
-    private Iterable<Run> getRunGenerator(final ConnectionDescription connectionDescription) {
-        if (ordered) {
-            return new OrderedRunGenerator(connectionDescription, bypassDocumentValidation);
+        if (exception == null) {
+            try {
+                return currentBatch.getResult();
+            } catch (MongoException e) {
+                if (originalBatch.getRetryWrites()) {
+                    logUnableToRetry(originalBatch.getPayload().getPayloadType().toString(), e);
+                }
+                throw e;
+            }
+        } else if (!(exception instanceof MongoWriteConcernWithResponseException)
+                && !shouldAttemptToRetryWrite(originalBatch.getRetryWrites(), exception)) {
+            if (originalBatch.getRetryWrites()) {
+                logUnableToRetry(originalBatch.getPayload().getPayloadType().toString(), exception);
+            }
+            throw transformWriteException(exception);
         } else {
-            return new UnorderedRunGenerator(connectionDescription, bypassDocumentValidation);
+            return retryExecuteBatches(binding, currentBatch, exception);
         }
     }
 
-    private class OrderedRunGenerator implements Iterable<Run> {
-        private final int maxBatchCount;
-        private final Boolean bypassDocumentValidation;
-
-        public OrderedRunGenerator(final ConnectionDescription connectionDescription, final Boolean bypassDocumentValidation) {
-            this.maxBatchCount = connectionDescription.getMaxBatchCount();
-            this.bypassDocumentValidation = bypassDocumentValidation;
-        }
-
-        @Override
-        public Iterator<Run> iterator() {
-            return new Iterator<Run>() {
-                private int curIndex;
-
-                @Override
-                public boolean hasNext() {
-                    return curIndex < writeRequests.size();
-                }
-
-                @Override
-                public Run next() {
-                    Run run = new Run(writeRequests.get(curIndex).getType(), true, bypassDocumentValidation);
-                    int nextIndex = getNextIndex();
-                    for (int i = curIndex; i < nextIndex; i++) {
-                        run.add(writeRequests.get(i), i);
+    private BulkWriteResult retryExecuteBatches(final WriteBinding binding, final BulkWriteBatch retryBatch,
+                                                final MongoException originalError) {
+        logRetryExecute(retryBatch.getPayload().getPayloadType().toString(), originalError);
+        return withReleasableConnection(binding, originalError, new CallableWithConnectionAndSource<BulkWriteResult>() {
+            @Override
+            public BulkWriteResult call(final ConnectionSource source, final Connection connection) {
+                if (!isRetryableWrite(retryWrites, getAppliedWriteConcern(binding), source.getServerDescription(),
+                        connection.getDescription(), binding.getSessionContext())) {
+                    return checkMongoWriteConcernWithResponseException(connection);
+                } else {
+                    try {
+                        retryBatch.addResult(executeCommand(connection, retryBatch, binding));
+                    } catch (Throwable t) {
+                        return checkMongoWriteConcernWithResponseException(connection);
                     }
-                    curIndex = nextIndex;
-                    return run;
+                    return executeBulkWriteBatch(binding, connection, retryBatch.getNextBatch());
                 }
+            }
 
-                private int getNextIndex() {
-                    WriteRequest.Type type = writeRequests.get(curIndex).getType();
-                    for (int i = curIndex; i < writeRequests.size(); i++) {
-                        if (i == curIndex + maxBatchCount || writeRequests.get(i).getType() != type) {
-                            return i;
-                        }
-                    }
-                    return writeRequests.size();
+            private BulkWriteResult checkMongoWriteConcernWithResponseException(final Connection connection) {
+                if (originalError instanceof MongoWriteConcernWithResponseException) {
+                    retryBatch.addResult((BsonDocument) ((MongoWriteConcernWithResponseException) originalError).getResponse());
+                    return executeBulkWriteBatch(binding, connection, retryBatch.getNextBatch());
+                } else {
+                    connection.release();
+                    throw originalError;
                 }
+            }
+        });
+    }
 
-                @Override
-                public void remove() {
-                    throw new UnsupportedOperationException("Not implemented");
+    private BulkWriteResult executeLegacyBatches(final Connection connection) {
+        try {
+            for (WriteRequest writeRequest : getWriteRequests()) {
+                if (writeRequest.getType() == INSERT) {
+                    connection.insert(getNamespace(), isOrdered(), (InsertRequest) writeRequest);
+                } else if (writeRequest.getType() == UPDATE || writeRequest.getType() == REPLACE) {
+                    connection.update(getNamespace(), isOrdered(), (UpdateRequest) writeRequest);
+                } else {
+                    connection.delete(getNamespace(), isOrdered(), (DeleteRequest) writeRequest);
                 }
-            };
+            }
+            return BulkWriteResult.unacknowledged();
+        } finally {
+            connection.release();
         }
     }
 
+    private void executeBatchesAsync(final AsyncWriteBinding binding, final AsyncConnection connection, final BulkWriteBatch batch,
+                                     final boolean retryWrites, final ConnectionReleasingWrappedCallback<BulkWriteResult> callback) {
+        executeCommandAsync(binding, connection, batch, callback, getCommandCallback(binding, connection, batch, retryWrites, false,
+                callback));
+    }
 
-    private class UnorderedRunGenerator implements Iterable<Run> {
-        private final int maxBatchCount;
-        private final Boolean bypassDocumentValidation;
-
-        public UnorderedRunGenerator(final ConnectionDescription connectionDescription, final Boolean bypassDocumentValidation) {
-            this.maxBatchCount = connectionDescription.getMaxBatchCount();
-            this.bypassDocumentValidation = bypassDocumentValidation;
-        }
-
-        @Override
-        public Iterator<Run> iterator() {
-            return new Iterator<Run>() {
-                private final List<Run> runs = new ArrayList<Run>();
-                private int curIndex;
-
-                @Override
-                public boolean hasNext() {
-                    return curIndex < writeRequests.size() || !runs.isEmpty();
-                }
-
-                @Override
-                public Run next() {
-                    while (curIndex < writeRequests.size()) {
-                        WriteRequest writeRequest = writeRequests.get(curIndex);
-                        Run run = findRunOfType(writeRequest.getType());
-                        if (run == null) {
-                            run = new Run(writeRequest.getType(), false, bypassDocumentValidation);
-                            runs.add(run);
-                        }
-                        run.add(writeRequest, curIndex);
-                        curIndex++;
-                        if (run.size() == maxBatchCount) {
-                            runs.remove(run);
-                            return run;
-                        }
-                    }
-
-                    return runs.remove(0);
-                }
-
-                private Run findRunOfType(final WriteRequest.Type type) {
-                    for (Run cur : runs) {
-                        if (cur.type == type) {
-                            return cur;
-                        }
+    private void retryExecuteBatchesAsync(final AsyncWriteBinding binding, final BulkWriteBatch retryBatch,
+                                          final Throwable originalError, final SingleResultCallback<BulkWriteResult> callback) {
+        logRetryExecute(retryBatch.getPayload().getPayloadType().toString(), originalError);
+        withAsyncConnection(binding, new AsyncCallableWithConnectionAndSource() {
+            @Override
+            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, originalError);
+                } else {
+                    final ConnectionReleasingWrappedCallback<BulkWriteResult> releasingCallback =
+                            new ConnectionReleasingWrappedCallback<BulkWriteResult>(callback, source, connection);
+                    if (!isRetryableWrite(retryWrites, getAppliedWriteConcern(binding), source.getServerDescription(),
+                            connection.getDescription(), binding.getSessionContext())) {
+                        checkMongoWriteConcernWithResponseException(connection, releasingCallback);
+                    } else {
+                        executeCommandAsync(binding, connection, retryBatch, releasingCallback,
+                                new SingleResultCallback<BsonDocument>() {
+                                    @Override
+                                    public void onResult(final BsonDocument result, final Throwable t) {
+                                        if (t != null) {
+                                            checkMongoWriteConcernWithResponseException(connection, releasingCallback);
+                                        } else {
+
+
+                                            getCommandCallback(binding, connection, retryBatch, true, true, releasingCallback)
+                                                    .onResult(result, null);
+                                        }
+                                    }
+                                });
                     }
-                    return null;
                 }
+            }
 
-                @Override
-                public void remove() {
-                    throw new UnsupportedOperationException("Not implemented");
+            private void checkMongoWriteConcernWithResponseException(final AsyncConnection connection,
+                              final ConnectionReleasingWrappedCallback<BulkWriteResult> releasingCallback) {
+                if (originalError instanceof MongoWriteConcernWithResponseException) {
+                    retryBatch.addResult((BsonDocument) ((MongoWriteConcernWithResponseException) originalError).getResponse());
+                    BulkWriteBatch nextBatch = retryBatch.getNextBatch();
+                    executeCommandAsync(binding, connection, nextBatch, releasingCallback,
+                            getCommandCallback(binding, connection, nextBatch, true, true, releasingCallback));
+                } else {
+                    releasingCallback.onResult(null, originalError);
                 }
-            };
-        }
+            }
+        });
     }
 
-    private class Run {
-        @SuppressWarnings("rawtypes")
-        private final List runWrites = new ArrayList();
-        private final WriteRequest.Type type;
-        private final boolean ordered;
-        private final Boolean bypassDocumentValidation;
-        private IndexMap indexMap = IndexMap.create();
-
-        Run(final WriteRequest.Type type, final boolean ordered, final Boolean bypassDocumentValidation) {
-            this.type = type;
-            this.ordered = ordered;
-            this.bypassDocumentValidation = bypassDocumentValidation;
-        }
-
-        @SuppressWarnings("unchecked")
-        void add(final WriteRequest writeRequest, final int originalIndex) {
-            indexMap = indexMap.add(runWrites.size(), originalIndex);
-            runWrites.add(writeRequest);
-        }
-
-        public int size() {
-            return runWrites.size();
-        }
-
-        @SuppressWarnings("unchecked")
-        BulkWriteResult execute(final Connection connection) {
-            final BulkWriteResult nextWriteResult;
+    private void executeLegacyBatchesAsync(final AsyncConnection connection, final List<? extends WriteRequest> writeRequests,
+                                           final int batchNum, final SingleResultCallback<BulkWriteResult> callback) {
+        try {
+            if (!writeRequests.isEmpty()) {
+                WriteRequest writeRequest = writeRequests.get(0);
+                final List<? extends WriteRequest> remaining = writeRequests.subList(1, writeRequests.size());
 
-            if (type == UPDATE || type == REPLACE) {
-                nextWriteResult = getUpdatesRunExecutor((List<UpdateRequest>) runWrites, bypassDocumentValidation, connection).execute();
-            } else if (type == INSERT) {
-                nextWriteResult = getInsertsRunExecutor((List<InsertRequest>) runWrites, bypassDocumentValidation, connection).execute();
-            } else if (type == DELETE) {
-                nextWriteResult = getDeletesRunExecutor((List<DeleteRequest>) runWrites, connection).execute();
-            } else {
-                throw new UnsupportedOperationException(format("Unsupported write of type %s", type));
-            }
-            return nextWriteResult;
-        }
+                SingleResultCallback<WriteConcernResult> writeCallback = new SingleResultCallback<WriteConcernResult>() {
+                    @Override
+                    public void onResult(final WriteConcernResult result, final Throwable t) {
+                        if (t != null) {
+                            callback.onResult(null, t);
+                        } else {
+                            executeLegacyBatchesAsync(connection, remaining, batchNum + 1, callback);
+                        }
+                    }
+                };
 
-        @SuppressWarnings("unchecked")
-        void executeAsync(final AsyncConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-            if (type == UPDATE || type == REPLACE) {
-                getUpdatesRunExecutor((List<UpdateRequest>) runWrites, bypassDocumentValidation, connection).executeAsync(callback);
-            } else if (type == INSERT) {
-                getInsertsRunExecutor((List<InsertRequest>) runWrites, bypassDocumentValidation, connection).executeAsync(callback);
-            } else if (type == DELETE) {
-                getDeletesRunExecutor((List<DeleteRequest>) runWrites, connection).executeAsync(callback);
+                if (writeRequest.getType() == INSERT) {
+                    connection.insertAsync(getNamespace(), isOrdered(), (InsertRequest) writeRequest, writeCallback);
+                } else if (writeRequest.getType() == UPDATE || writeRequest.getType() == REPLACE) {
+                    connection.updateAsync(getNamespace(), isOrdered(), (UpdateRequest) writeRequest, writeCallback);
+                } else {
+                    connection.deleteAsync(getNamespace(), isOrdered(), (DeleteRequest) writeRequest, writeCallback);
+                }
             } else {
-                callback.onResult(null, new UnsupportedOperationException(format("Unsupported write of type %s", type)));
+                callback.onResult(BulkWriteResult.unacknowledged(), null);
             }
+        } catch (Throwable t) {
+            callback.onResult(null, t);
         }
+    }
 
-        RunExecutor getDeletesRunExecutor(final List<DeleteRequest> deleteRequests, final Connection connection) {
-            return new RunExecutor(connection) {
-
-                @Override
-                WriteConcernResult executeWriteProtocol(final int index) {
-                    return connection.delete(namespace, ordered, writeConcern, singletonList(deleteRequests.get(index)));
-                }
-
-                @Override
-                BulkWriteResult executeWriteCommandProtocol() {
-                    return connection.deleteCommand(namespace, ordered, writeConcern, deleteRequests);
-                }
-
-                @Override
-                WriteRequest.Type getType() {
-                    return DELETE;
-                }
-            };
-        }
-
-        @SuppressWarnings("unchecked")
-        RunExecutor getInsertsRunExecutor(final List<InsertRequest> insertRequests, final Boolean bypassDocumentValidation,
-                                          final Connection connection) {
-            return new RunExecutor(connection) {
-
-                @Override
-                WriteConcernResult executeWriteProtocol(final int index) {
-                    return connection.insert(namespace, ordered, writeConcern, singletonList(insertRequests.get(index)));
-                }
-
-                @Override
-                BulkWriteResult executeWriteCommandProtocol() {
-                    return connection.insertCommand(namespace, ordered, writeConcern, bypassDocumentValidation, insertRequests);
-                }
-
-                @Override
-                WriteRequest.Type getType() {
-                    return INSERT;
-                }
-
-                int getCount(final WriteConcernResult writeConcernResult) {
-                    return 1;
-                }
-            };
-        }
-
-        RunExecutor getUpdatesRunExecutor(final List<UpdateRequest> updates, final Boolean bypassDocumentValidation,
-                                          final Connection connection) {
-            return new RunExecutor(connection) {
-
-                @Override
-                WriteConcernResult executeWriteProtocol(final int index) {
-                    return connection.update(namespace, ordered, writeConcern, singletonList(updates.get(index)));
-                }
-
-                @Override
-                BulkWriteResult executeWriteCommandProtocol() {
-                    return connection.updateCommand(namespace, ordered, writeConcern, bypassDocumentValidation, updates);
-                }
-
-                @Override
-                WriteRequest.Type getType() {
-                    return UPDATE;
-                }
-
-            };
-        }
-
-        AsyncRunExecutor getDeletesRunExecutor(final List<DeleteRequest> deleteRequests, final AsyncConnection connection) {
-            return new AsyncRunExecutor(connection) {
-
-                @Override
-                void executeWriteProtocolAsync(final int index, final SingleResultCallback<WriteConcernResult> callback) {
-                    connection.deleteAsync(namespace, ordered, writeConcern, singletonList(deleteRequests.get(index)), callback);
-                }
-
-                @Override
-                void executeWriteCommandProtocolAsync(final SingleResultCallback<BulkWriteResult> callback) {
-                    connection.deleteCommandAsync(namespace, ordered, writeConcern, deleteRequests, callback);
-                }
-
-                @Override
-                WriteRequest.Type getType() {
-                    return DELETE;
-                }
-            };
-        }
-
-        @SuppressWarnings("unchecked")
-        AsyncRunExecutor getInsertsRunExecutor(final List<InsertRequest> insertRequests, final Boolean bypassDocumentValidation,
-                                               final AsyncConnection connection) {
-            return new AsyncRunExecutor(connection) {
-
-                @Override
-                void executeWriteProtocolAsync(final int index, final SingleResultCallback<WriteConcernResult> callback) {
-                    connection.insertAsync(namespace, ordered, writeConcern, singletonList(insertRequests.get(index)), callback);
-                }
-
-                @Override
-                void executeWriteCommandProtocolAsync(final SingleResultCallback<BulkWriteResult> callback) {
-                    connection.insertCommandAsync(namespace, ordered, writeConcern, bypassDocumentValidation, insertRequests, callback);
-                }
-
-                @Override
-                WriteRequest.Type getType() {
-                    return INSERT;
-                }
+    private BsonDocument executeCommand(final Connection connection, final BulkWriteBatch batch, final WriteBinding binding) {
+        return connection.command(namespace.getDatabaseName(), batch.getCommand(), NO_OP_FIELD_NAME_VALIDATOR,
+                null, batch.getDecoder(), binding.getSessionContext(), shouldAcknowledge(batch, binding.getSessionContext()),
+                batch.getPayload(), batch.getFieldNameValidator());
+    }
 
-                int getCount(final WriteConcernResult writeConcernResult) {
-                    return 1;
-                }
-            };
+    private void executeCommandAsync(final AsyncWriteBinding binding, final AsyncConnection connection, final BulkWriteBatch batch,
+                                     final ConnectionReleasingWrappedCallback<BulkWriteResult> callback,
+                                     final SingleResultCallback<BsonDocument> commandCallback) {
+        try {
+            connection.commandAsync(namespace.getDatabaseName(), batch.getCommand(), NO_OP_FIELD_NAME_VALIDATOR,
+                    null, batch.getDecoder(), binding.getSessionContext(), shouldAcknowledge(batch, binding.getSessionContext()),
+                    batch.getPayload(), batch.getFieldNameValidator(), commandCallback);
+        } catch (Throwable t) {
+            callback.onResult(null, t);
         }
+    }
 
-        AsyncRunExecutor getUpdatesRunExecutor(final List<UpdateRequest> updates, final Boolean bypassDocumentValidation,
-                                               final AsyncConnection connection) {
-            return new AsyncRunExecutor(connection) {
 
-                @Override
-                void executeWriteProtocolAsync(final int index, final SingleResultCallback<WriteConcernResult> callback) {
-                    connection.updateAsync(namespace, ordered, writeConcern, singletonList(updates.get(index)), callback);
-                }
-
-                @Override
-                void executeWriteCommandProtocolAsync(final SingleResultCallback<BulkWriteResult> callback) {
-                    connection.updateCommandAsync(namespace, ordered, writeConcern, bypassDocumentValidation, updates, callback);
-                }
+    private WriteConcern getAppliedWriteConcern(final WriteBinding binding) {
+        return getAppliedWriteConcern(binding.getSessionContext());
+    }
 
-                @Override
-                WriteRequest.Type getType() {
-                    return UPDATE;
-                }
+    private WriteConcern getAppliedWriteConcern(final AsyncWriteBinding binding) {
+        return getAppliedWriteConcern(binding.getSessionContext());
+    }
 
-            };
+    private WriteConcern getAppliedWriteConcern(final SessionContext sessionContext) {
+        if (sessionContext.hasActiveTransaction()) {
+            return WriteConcern.ACKNOWLEDGED;
+        } else {
+            return writeConcern;
         }
+    }
 
-        private abstract class BaseRunExecutor {
-
-            abstract WriteRequest.Type getType();
-
-            int getCount(final WriteConcernResult writeConcernResult) {
-                return getType() == INSERT ? 1 : writeConcernResult.getCount();
-            }
-
-            BulkWriteResult getResult(final WriteConcernResult writeConcernResult) {
-                return getResult(writeConcernResult, getUpsertedItems(writeConcernResult));
-            }
-
-            BulkWriteResult getResult(final WriteConcernResult writeConcernResult, final UpdateRequest updateRequest) {
-                return getResult(writeConcernResult, getUpsertedItems(writeConcernResult, updateRequest));
-            }
-
-            BulkWriteResult getResult(final WriteConcernResult writeConcernResult, final List<BulkWriteUpsert> upsertedItems) {
-                int count = getCount(writeConcernResult);
-                Integer modifiedCount = (getType() == UPDATE || getType() == REPLACE) ? null : 0;
-                return BulkWriteResult.acknowledged(getType(), count - upsertedItems.size(), modifiedCount, upsertedItems);
-            }
-
-            List<BulkWriteUpsert> getUpsertedItems(final WriteConcernResult writeConcernResult) {
-                return writeConcernResult.getUpsertedId() == null
-                       ? Collections.<BulkWriteUpsert>emptyList()
-                       : singletonList(new BulkWriteUpsert(0, writeConcernResult.getUpsertedId()));
-            }
-
-            @SuppressWarnings("unchecked")
-            List<BulkWriteUpsert> getUpsertedItems(final WriteConcernResult writeConcernResult,
-                                                   final UpdateRequest updateRequest) {
-                if (writeConcernResult.getUpsertedId() == null) {
-                    if (writeConcernResult.isUpdateOfExisting() || !updateRequest.isUpsert()) {
-                        return emptyList();
-                    } else {
-                        BsonDocument update = updateRequest.getUpdate();
-                        BsonDocument filter = updateRequest.getFilter();
+    private boolean shouldAcknowledge(final BulkWriteBatch batch, final SessionContext sessionContext) {
+        return ordered
+                ? batch.hasAnotherBatch() || getAppliedWriteConcern(sessionContext).isAcknowledged()
+                : getAppliedWriteConcern(sessionContext).isAcknowledged();
+    }
 
-                        if (update.containsKey("_id")) {
-                            return singletonList(new BulkWriteUpsert(0, update.get("_id")));
-                        } else if (filter.containsKey("_id")) {
-                            return singletonList(new BulkWriteUpsert(0, filter.get("_id")));
+    private SingleResultCallback<BsonDocument> getCommandCallback(final AsyncWriteBinding binding, final AsyncConnection connection,
+                                                                  final BulkWriteBatch batch, final boolean retryWrites,
+                                                                  final boolean isSecondAttempt,
+                                                                  final ConnectionReleasingWrappedCallback<BulkWriteResult> callback) {
+        return new SingleResultCallback<BsonDocument>() {
+            @Override
+            public void onResult(final BsonDocument result, final Throwable t) {
+                if (t != null) {
+                    if (isSecondAttempt || !shouldAttemptToRetryWrite(retryWrites, t)) {
+                        if (retryWrites && !isSecondAttempt) {
+                            logUnableToRetry(batch.getPayload().getPayloadType().toString(), t);
+                        }
+                        if (t instanceof MongoWriteConcernWithResponseException) {
+                            addBatchResult((BsonDocument) ((MongoWriteConcernWithResponseException) t).getResponse(), binding, connection,
+                                    batch, retryWrites, callback);
                         } else {
-                            return emptyList();
+                            callback.onResult(null, t instanceof MongoException ? transformWriteException((MongoException) t) : t);
                         }
+                    } else {
+                        retryExecuteBatchesAsync(binding, batch, t, callback.releaseConnectionAndGetWrapped());
                     }
                 } else {
-                    return singletonList(new BulkWriteUpsert(0, writeConcernResult.getUpsertedId()));
-                }
-            }
-
-            BulkWriteError getBulkWriteError(final WriteConcernException writeException) {
-                return new BulkWriteError(writeException.getErrorCode(), writeException.getErrorMessage(),
-                                          translateGetLastErrorResponseToErrInfo(writeException.getResponse()), 0);
-            }
-
-            WriteConcernError getWriteConcernError(final WriteConcernException writeException) {
-                return new WriteConcernError(writeException.getErrorCode(),
-                                             ((BsonString) writeException.getResponse().get("err")).getValue(),
-                                             translateGetLastErrorResponseToErrInfo(writeException.getResponse()));
-            }
-
-            private BsonDocument translateGetLastErrorResponseToErrInfo(final BsonDocument response) {
-                BsonDocument errInfo = new BsonDocument();
-                for (Map.Entry<String, BsonValue> entry : response.entrySet()) {
-                    if (IGNORED_KEYS.contains(entry.getKey())) {
-                        continue;
-                    }
-                    errInfo.put(entry.getKey(), entry.getValue());
-                }
-                return errInfo;
-            }
-        }
-
-        private abstract class RunExecutor extends BaseRunExecutor {
-            private final Connection connection;
-
-            RunExecutor(final Connection connection) {
-                this.connection = connection;
-            }
-
-            abstract WriteConcernResult executeWriteProtocol(int index);
-
-            abstract BulkWriteResult executeWriteCommandProtocol();
-
-            BulkWriteResult execute() {
-                if (shouldUseWriteCommands(connection.getDescription())) {
-                    return executeWriteCommandProtocol();
-                } else {
-                    BulkWriteBatchCombiner bulkWriteBatchCombiner = new BulkWriteBatchCombiner(connection.getDescription()
-                                                                                                         .getServerAddress(),
-                                                                                               ordered, writeConcern);
-                    for (int i = 0; i < runWrites.size(); i++) {
-                        IndexMap indexMap = IndexMap.create(i, 1);
-                        indexMap = indexMap.add(0, i);
-                        try {
-                            WriteConcernResult result = executeWriteProtocol(i);
-                            if (result.wasAcknowledged()) {
-                                BulkWriteResult bulkWriteResult;
-                                if (getType() == UPDATE || getType() == REPLACE) {
-                                    bulkWriteResult = getResult(result, (UpdateRequest) runWrites.get(i));
-                                } else {
-                                    bulkWriteResult = getResult(result);
-                                }
-                                bulkWriteBatchCombiner.addResult(bulkWriteResult, indexMap);
-                            }
-                        } catch (WriteConcernException writeException) {
-                            if (writeException.getResponse().get("wtimeout") != null) {
-                                bulkWriteBatchCombiner.addWriteConcernErrorResult(getWriteConcernError(writeException));
-                            } else {
-                                bulkWriteBatchCombiner.addWriteErrorResult(getBulkWriteError(writeException), indexMap);
-                            }
-                            if (bulkWriteBatchCombiner.shouldStopSendingMoreBatches()) {
-                                break;
-                            }
+                    if (retryWrites && !isSecondAttempt) {
+                        MongoException writeConcernBasedError = ProtocolHelper.createSpecialException(result,
+                                connection.getDescription().getServerAddress(), "errMsg");
+                        if (writeConcernBasedError != null && shouldAttemptToRetryWrite(true, writeConcernBasedError)) {
+                            retryExecuteBatchesAsync(binding, batch,
+                                    new MongoWriteConcernWithResponseException(writeConcernBasedError, result),
+                                    callback.releaseConnectionAndGetWrapped());
+                            return;
                         }
                     }
-                    return bulkWriteBatchCombiner.getResult();
+                    addBatchResult(result, binding, connection, batch, retryWrites, callback);
                 }
             }
-        }
-
-        private abstract class AsyncRunExecutor extends BaseRunExecutor {
-            private final AsyncConnection connection;
-
-            AsyncRunExecutor(final AsyncConnection connection) {
-                this.connection = connection;
-            }
-
-            abstract void executeWriteProtocolAsync(int index, SingleResultCallback<WriteConcernResult> callback);
-
-            abstract void executeWriteCommandProtocolAsync(SingleResultCallback<BulkWriteResult> callback);
+        };
+    }
 
-            void executeAsync(final SingleResultCallback<BulkWriteResult> callback) {
-                if (shouldUseWriteCommands(connection.getDescription())) {
-                    executeWriteCommandProtocolAsync(callback);
-                } else {
-                    BulkWriteBatchCombiner bulkWriteBatchCombiner = new BulkWriteBatchCombiner(connection.getDescription()
-                                                                                                         .getServerAddress(),
-                                                                                               ordered, writeConcern);
-                    executeRunWritesAsync(runWrites.size(), 0, bulkWriteBatchCombiner, callback);
+    private void addBatchResult(final BsonDocument result, final AsyncWriteBinding binding, final AsyncConnection connection,
+                                final BulkWriteBatch batch, final boolean retryWrites,
+                                final ConnectionReleasingWrappedCallback<BulkWriteResult> callback) {
+        batch.addResult(result);
+        BulkWriteBatch nextBatch = batch.getNextBatch();
+        if (nextBatch.shouldProcessBatch()) {
+            executeBatchesAsync(binding, connection, nextBatch, retryWrites, callback);
+        } else {
+            if (batch.hasErrors()) {
+                if (retryWrites) {
+                    logUnableToRetry(batch.getPayload().getPayloadType().toString(), batch.getError());
                 }
+                callback.onResult(null, transformWriteException(batch.getError()));
+            } else {
+                callback.onResult(batch.getResult(), null);
             }
-
-            private void executeRunWritesAsync(final int numberOfRuns, final int currentPosition,
-                                               final BulkWriteBatchCombiner bulkWriteBatchCombiner,
-                                               final SingleResultCallback<BulkWriteResult> callback) {
-
-                final IndexMap indexMap = IndexMap.create(currentPosition, 1).add(0, currentPosition);
-                executeWriteProtocolAsync(currentPosition, new SingleResultCallback<WriteConcernResult>() {
-
-                    @Override
-                    public void onResult(final WriteConcernResult result, final Throwable t) {
-                        final int nextRunPosition = currentPosition + 1;
-                        if (t != null) {
-                            if (t instanceof WriteConcernException) {
-                                WriteConcernException writeException = (WriteConcernException) t;
-                                if (writeException.getResponse().get("wtimeout") != null) {
-                                    bulkWriteBatchCombiner.addWriteConcernErrorResult(getWriteConcernError(writeException));
-                                } else {
-                                    bulkWriteBatchCombiner.addWriteErrorResult(getBulkWriteError(writeException), indexMap);
-                                }
-                            } else {
-                                callback.onResult(null, t);
-                                return;
-                            }
-                        } else if (result.wasAcknowledged()) {
-                            BulkWriteResult bulkWriteResult;
-                            if (getType() == UPDATE || getType() == REPLACE) {
-                                bulkWriteResult = getResult(result, (UpdateRequest) runWrites.get(currentPosition));
-                            } else {
-                                bulkWriteResult = getResult(result);
-                            }
-                            bulkWriteBatchCombiner.addResult(bulkWriteResult, indexMap);
-                        }
-
-                        // Execute next run or complete
-                        if (numberOfRuns != nextRunPosition && !bulkWriteBatchCombiner.shouldStopSendingMoreBatches()) {
-                            executeRunWritesAsync(numberOfRuns, nextRunPosition, bulkWriteBatchCombiner, callback);
-                        } else if (bulkWriteBatchCombiner.hasErrors()) {
-                            callback.onResult(null, bulkWriteBatchCombiner.getError());
-                        } else {
-                            callback.onResult(bulkWriteBatchCombiner.getResult(), null);
-                        }
-                    }
-                });
-            }
-       }
+        }
     }
 
-    private static final List<String> IGNORED_KEYS = asList("ok", "err", "code");
+    private void validateWriteRequestsAndReleaseConnectionIfError(final WriteBinding binding, final Connection connection) {
+        try {
+            validateWriteRequests(connection.getDescription(), bypassDocumentValidation, writeRequests, getAppliedWriteConcern(binding));
+        } catch (IllegalArgumentException e) {
+            connection.release();
+            throw e;
+        } catch (MongoException e) {
+            connection.release();
+            throw e;
+        } catch (Throwable t) {
+            connection.release();
+            throw MongoException.fromThrowableNonNull(t);
+        }
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/OperationExecutor.java b/driver-core/src/main/com/mongodb/operation/OperationExecutor.java
index e5619176d5b..4741a6310db 100644
--- a/driver-core/src/main/com/mongodb/operation/OperationExecutor.java
+++ b/driver-core/src/main/com/mongodb/operation/OperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,9 @@
  * An interface describing the execution of a read or a write operation.
  *
  * @since 3.0
+ * @deprecated there is no replacement for this interface
  */
+@Deprecated
 public interface OperationExecutor {
     /**
      * Execute the read operation with the given read preference.
diff --git a/driver-core/src/main/com/mongodb/operation/OperationHelper.java b/driver-core/src/main/com/mongodb/operation/OperationHelper.java
index f7a449c97d5..d186395199c 100644
--- a/driver-core/src/main/com/mongodb/operation/OperationHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/OperationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoClientException;
+import com.mongodb.MongoException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadConcern;
 import com.mongodb.ServerAddress;
@@ -30,13 +31,21 @@
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.binding.ReferenceCounted;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.bulk.IndexRequest;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.bulk.WriteRequest;
+import com.mongodb.client.model.Collation;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.connection.ServerVersion;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerType;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.internal.operation.ServerVersionHelper;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonDocument;
 import org.bson.BsonInt64;
 import org.bson.codecs.Decoder;
@@ -46,6 +55,7 @@
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionThreeDotSix;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -57,6 +67,10 @@ interface CallableWithConnection<T> {
         T call(Connection connection);
     }
 
+    interface CallableWithSource<T> {
+        T call(ConnectionSource source);
+    }
+
     interface CallableWithConnectionAndSource<T> {
         T call(ConnectionSource source, Connection connection);
     }
@@ -65,70 +79,280 @@ interface AsyncCallableWithConnection {
         void call(AsyncConnection connection, Throwable t);
     }
 
+    interface AsyncCallableWithSource {
+        void call(AsyncConnectionSource source, Throwable t);
+    }
+
     interface AsyncCallableWithConnectionAndSource {
         void call(AsyncConnectionSource source, AsyncConnection connection, Throwable t);
     }
 
-    static void checkValidReadConcern(final Connection connection, final ReadConcern readConcern) {
-        if (!serverIsAtLeastVersionThreeDotTwo(connection.getDescription()) && !readConcern.isServerDefault()) {
-            throw new IllegalArgumentException(format("Unsupported ReadConcern : '%s'", readConcern.asDocument().toJson()));
+    static void validateReadConcern(final Connection connection, final ReadConcern readConcern) {
+        validateReadConcern(connection.getDescription(), readConcern);
+    }
+
+    static void validateReadConcern(final ConnectionDescription description, final ReadConcern readConcern) {
+        if (!ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo(description) && !readConcern.isServerDefault()) {
+            throw new IllegalArgumentException(format("ReadConcern not supported by server version: %s",
+                    description.getServerVersion()));
         }
     }
 
-    static void checkValidReadConcern(final AsyncConnection connection, final ReadConcern readConcern,
-                                      final AsyncCallableWithConnection callable) {
+    static void validateReadConcern(final AsyncConnection connection, final ReadConcern readConcern,
+                                    final AsyncCallableWithConnection callable) {
         Throwable throwable = null;
-        if (!serverIsAtLeastVersionThreeDotTwo(connection.getDescription()) && !readConcern.isServerDefault()) {
-            throwable = new IllegalArgumentException(format("Unsupported ReadConcern : '%s'", readConcern.asDocument().toJson()));
+        if (!ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo(connection.getDescription()) && !readConcern.isServerDefault()) {
+            throwable = new IllegalArgumentException(format("ReadConcern not supported by server version: %s",
+                    connection.getDescription().getServerVersion()));
         }
         callable.call(connection, throwable);
     }
 
-    static void checkValidReadConcern(final AsyncConnectionSource source, final AsyncConnection connection, final ReadConcern readConcern,
-                                      final AsyncCallableWithConnectionAndSource callable) {
+    static void validateReadConcern(final AsyncConnectionSource source, final AsyncConnection connection, final ReadConcern readConcern,
+                                    final AsyncCallableWithConnectionAndSource callable) {
+        validateReadConcern(connection, readConcern, new AsyncCallableWithConnection(){
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                callable.call(source, connection, t);
+            }
+        });
+    }
+
+    static void validateCollation(final Connection connection, final Collation collation) {
+        validateCollation(connection.getDescription(), collation);
+    }
+
+    static void validateCollation(final ConnectionDescription connectionDescription, final Collation collation) {
+        if (collation != null && !ServerVersionHelper.serverIsAtLeastVersionThreeDotFour(connectionDescription)) {
+            throw new IllegalArgumentException(format("Collation not supported by server version: %s",
+                    connectionDescription.getServerVersion()));
+        }
+    }
+
+    static void validateCollationAndWriteConcern(final ConnectionDescription connectionDescription, final Collation collation,
+                                                 final WriteConcern writeConcern) {
+        if (collation != null && !ServerVersionHelper.serverIsAtLeastVersionThreeDotFour(connectionDescription)) {
+            throw new IllegalArgumentException(format("Collation not supported by server version: %s",
+                    connectionDescription.getServerVersion()));
+        } else if (collation != null && !writeConcern.isAcknowledged()) {
+            throw new MongoClientException("Specifying collation with an unacknowledged WriteConcern is not supported");
+        }
+    }
+
+    static void validateCollation(final AsyncConnection connection, final Collation collation,
+                                  final AsyncCallableWithConnection callable) {
         Throwable throwable = null;
-        if (!serverIsAtLeastVersionThreeDotTwo(connection.getDescription()) && !readConcern.isServerDefault()) {
-            throwable = new IllegalArgumentException(format("Unsupported ReadConcern : '%s'", readConcern.asDocument().toJson()));
+        if (!ServerVersionHelper.serverIsAtLeastVersionThreeDotFour(connection.getDescription()) && collation != null) {
+            throwable = new IllegalArgumentException(format("Collation not supported by server version: %s",
+                    connection.getDescription().getServerVersion()));
         }
-        callable.call(source, connection, throwable);
+        callable.call(connection, throwable);
     }
 
-    static boolean bypassDocumentValidationNotSupported(final Boolean bypassDocumentValidation, final WriteConcern writeConcern,
-                                                        final ConnectionDescription description) {
-        return bypassDocumentValidation != null && serverIsAtLeastVersionThreeDotTwo(description) && !writeConcern.isAcknowledged();
+    static void validateCollation(final AsyncConnectionSource source, final AsyncConnection connection,
+                                  final Collation collation, final AsyncCallableWithConnectionAndSource callable) {
+        validateCollation(connection, collation, new AsyncCallableWithConnection(){
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                callable.call(source, connection, t);
+            }
+        });
+    }
+
+    static void validateWriteRequestCollations(final ConnectionDescription connectionDescription,
+                                               final List<? extends WriteRequest> requests, final WriteConcern writeConcern) {
+        Collation collation = null;
+        for (WriteRequest request : requests) {
+            if (request instanceof UpdateRequest) {
+                collation = ((UpdateRequest) request).getCollation();
+            } else if (request instanceof DeleteRequest) {
+                collation = ((DeleteRequest) request).getCollation();
+            }
+            if (collation != null) {
+                break;
+            }
+        }
+        validateCollationAndWriteConcern(connectionDescription, collation, writeConcern);
     }
 
-    static MongoClientException getBypassDocumentValidationException() {
-        return new MongoClientException("Specifying bypassDocumentValidation with an unacknowledged WriteConcern "
-                                        + "is not supported");
+    static void validateWriteRequests(final ConnectionDescription connectionDescription, final Boolean bypassDocumentValidation,
+                                      final List<? extends WriteRequest> requests, final WriteConcern writeConcern) {
+        checkBypassDocumentValidationIsSupported(connectionDescription, bypassDocumentValidation, writeConcern);
+        validateWriteRequestCollations(connectionDescription, requests, writeConcern);
+    }
+
+    static void validateWriteRequests(final AsyncConnection connection, final Boolean bypassDocumentValidation,
+                                      final List<? extends WriteRequest> requests, final WriteConcern writeConcern,
+                                      final AsyncCallableWithConnection callable) {
+        try {
+            validateWriteRequests(connection.getDescription(), bypassDocumentValidation, requests, writeConcern);
+            callable.call(connection, null);
+        } catch (Throwable t) {
+            callable.call(connection, t);
+        }
+    }
+    static void validateIndexRequestCollations(final Connection connection, final List<IndexRequest> requests) {
+        for (IndexRequest request : requests) {
+            if (request.getCollation() != null) {
+                validateCollation(connection, request.getCollation());
+                break;
+            }
+        }
+    }
+
+    static void validateIndexRequestCollations(final AsyncConnection connection, final List<IndexRequest> requests,
+                                               final AsyncCallableWithConnection callable) {
+        boolean calledTheCallable = false;
+        for (IndexRequest request : requests) {
+            if (request.getCollation() != null) {
+                calledTheCallable = true;
+                validateCollation(connection, request.getCollation(), new AsyncCallableWithConnection() {
+                    @Override
+                    public void call(final AsyncConnection connection, final Throwable t) {
+                        callable.call(connection, t);
+                    }
+                });
+                break;
+            }
+        }
+        if (!calledTheCallable) {
+            callable.call(connection, null);
+        }
+    }
+
+    static void validateReadConcernAndCollation(final Connection connection, final ReadConcern readConcern,
+                                                final Collation collation) {
+        validateReadConcern(connection, readConcern);
+        validateCollation(connection, collation);
+    }
+
+    static void validateReadConcernAndCollation(final ConnectionDescription description, final ReadConcern readConcern,
+                                                final Collation collation) {
+        validateReadConcern(description, readConcern);
+        validateCollation(description, collation);
+    }
+
+    static void validateReadConcernAndCollation(final AsyncConnection connection, final ReadConcern readConcern,
+                                                final Collation collation,
+                                                final AsyncCallableWithConnection callable) {
+        validateReadConcern(connection, readConcern, new AsyncCallableWithConnection(){
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                if (t != null) {
+                    callable.call(connection, t);
+                } else {
+                    validateCollation(connection, collation, callable);
+                }
+            }
+        });
+    }
+
+    static void validateReadConcernAndCollation(final AsyncConnectionSource source, final AsyncConnection connection,
+                                                final ReadConcern readConcern, final Collation collation,
+                                                final AsyncCallableWithConnectionAndSource callable) {
+        validateReadConcernAndCollation(connection, readConcern, collation, new AsyncCallableWithConnection(){
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                callable.call(source, connection, t);
+            }
+        });
+    }
+
+    static void checkBypassDocumentValidationIsSupported(final ConnectionDescription connectionDescription,
+                                                         final Boolean bypassDocumentValidation, final WriteConcern writeConcern) {
+        if (bypassDocumentValidation != null && ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo(connectionDescription)
+                && !writeConcern.isAcknowledged()) {
+            throw new MongoClientException("Specifying bypassDocumentValidation with an unacknowledged WriteConcern is not supported");
+        }
+    }
+
+    static boolean isRetryableWrite(final boolean retryWrites, final WriteConcern writeConcern,
+                                    final ServerDescription serverDescription, final ConnectionDescription connectionDescription,
+                                    final SessionContext sessionContext) {
+        if (!retryWrites) {
+            return false;
+        } else if (!writeConcern.isAcknowledged()) {
+            LOGGER.debug("retryWrites set to true but the writeConcern is unacknowledged.");
+            return false;
+        } else if (sessionContext.hasActiveTransaction()) {
+            LOGGER.debug("retryWrites set to true but in an active transaction.");
+            return false;
+        } else {
+            return canRetryWrite(serverDescription, connectionDescription, sessionContext);
+        }
+    }
+
+    static boolean canRetryWrite(final ServerDescription serverDescription, final ConnectionDescription connectionDescription,
+                                 final SessionContext sessionContext) {
+        if (serverIsLessThanVersionThreeDotSix(connectionDescription)) {
+            LOGGER.debug("retryWrites set to true but the server does not support retryable writes.");
+            return false;
+        } else if (serverDescription.getLogicalSessionTimeoutMinutes() == null) {
+            LOGGER.debug("retryWrites set to true but the server does not have 3.6 feature compatibility enabled.");
+            return false;
+        } else if (connectionDescription.getServerType().equals(ServerType.STANDALONE)) {
+            LOGGER.debug("retryWrites set to true but the server is a standalone server.");
+            return false;
+        } else if (!sessionContext.hasSession()) {
+            LOGGER.debug("retryWrites set to true but there is no implicit session, likely because the MongoClient was created with "
+                    + "multiple MongoCredential instances and sessions can only be used with a single MongoCredential");
+            return false;
+        }
+        return true;
+    }
+
+    static boolean isRetryableRead(final boolean retryReads, final ServerDescription serverDescription,
+                                   final ConnectionDescription connectionDescription, final SessionContext sessionContext) {
+        if (!retryReads) {
+            return false;
+        } else if (sessionContext.hasActiveTransaction()) {
+            LOGGER.debug("retryReads set to true but in an active transaction.");
+            return false;
+        } else {
+            return canRetryRead(serverDescription, connectionDescription, sessionContext);
+        }
+    }
+
+    static boolean canRetryRead(final ServerDescription serverDescription, final ConnectionDescription connectionDescription,
+                                final SessionContext sessionContext) {
+        if (serverIsLessThanVersionThreeDotSix(connectionDescription)) {
+            LOGGER.debug("retryReads set to true but the server does not support retryable reads.");
+            return false;
+        } else if (serverDescription.getLogicalSessionTimeoutMinutes() == null) {
+            LOGGER.debug("retryReads set to true but the server does not have 3.6 feature compatibility enabled.");
+            return false;
+        } else if (serverDescription.getType() != ServerType.STANDALONE && !sessionContext.hasSession()) {
+            LOGGER.debug("retryReads set to true but there is no implicit session, likely because the MongoClient was created with "
+                    + "multiple MongoCredential instances and sessions can only be used with a single MongoCredential");
+            return false;
+        }
+        return true;
     }
 
     static <T> QueryBatchCursor<T> createEmptyBatchCursor(final MongoNamespace namespace, final Decoder<T> decoder,
                                                           final ServerAddress serverAddress, final int batchSize) {
         return new QueryBatchCursor<T>(new QueryResult<T>(namespace, Collections.<T>emptyList(), 0L,
-                                                          serverAddress),
-                                       0, batchSize, decoder);
+                serverAddress),
+                0, batchSize, decoder);
     }
 
-    static <T> AsyncBatchCursor<T> createEmptyAsyncBatchCursor(final MongoNamespace namespace, final Decoder<T> decoder,
-                                                               final ServerAddress serverAddress, final int batchSize) {
-        return new AsyncQueryBatchCursor<T>(new QueryResult<T>(namespace, Collections.<T>emptyList(), 0L, serverAddress), 0, batchSize,
-                decoder);
+    static <T> AsyncBatchCursor<T> createEmptyAsyncBatchCursor(final MongoNamespace namespace, final ServerAddress serverAddress) {
+        return new AsyncSingleBatchQueryCursor<T>(new QueryResult<T>(namespace, Collections.<T>emptyList(), 0L, serverAddress));
     }
 
     static <T> BatchCursor<T> cursorDocumentToBatchCursor(final BsonDocument cursorDocument, final Decoder<T> decoder,
                                                           final ConnectionSource source, final int batchSize) {
         return new QueryBatchCursor<T>(OperationHelper.<T>cursorDocumentToQueryResult(cursorDocument,
-                                                                                      source.getServerDescription().getAddress()),
-                                       0, batchSize, decoder, source);
+                source.getServerDescription().getAddress()),
+                0, batchSize, decoder, source);
     }
 
     static <T> AsyncBatchCursor<T> cursorDocumentToAsyncBatchCursor(final BsonDocument cursorDocument, final Decoder<T> decoder,
                                                                     final AsyncConnectionSource source, final AsyncConnection connection,
                                                                     final int batchSize) {
         return new AsyncQueryBatchCursor<T>(OperationHelper.<T>cursorDocumentToQueryResult(cursorDocument,
-                                                                                           source.getServerDescription().getAddress()),
-                                            0, batchSize, 0, decoder, source, connection);
+                source.getServerDescription().getAddress()),
+                0, batchSize, 0, decoder, source, connection, cursorDocument);
     }
 
 
@@ -141,11 +365,15 @@ static <T> QueryResult<T> getMoreCursorDocumentToQueryResult(final BsonDocument
     }
 
     private static <T> QueryResult<T> cursorDocumentToQueryResult(final BsonDocument cursorDocument, final ServerAddress serverAddress,
-                                                          final String fieldNameContainingBatch) {
+                                                                  final String fieldNameContainingBatch) {
         long cursorId = ((BsonInt64) cursorDocument.get("id")).getValue();
         MongoNamespace queryResultNamespace = new MongoNamespace(cursorDocument.getString("ns").getValue());
         return new QueryResult<T>(queryResultNamespace, BsonDocumentWrapperHelper.<T>toList(cursorDocument, fieldNameContainingBatch),
-                                  cursorId, serverAddress);
+                cursorId, serverAddress);
+    }
+
+    static <T> SingleResultCallback<T> releasingCallback(final SingleResultCallback<T> wrapped, final AsyncConnectionSource source) {
+        return new ReferenceCountedReleasingWrappedCallback<T>(wrapped, singletonList(source));
     }
 
     static <T> SingleResultCallback<T> releasingCallback(final SingleResultCallback<T> wrapped, final AsyncConnection connection) {
@@ -177,26 +405,38 @@ private static class ReferenceCountedReleasingWrappedCallback<T> implements Sing
         @Override
         public void onResult(final T result, final Throwable t) {
             for (ReferenceCounted cur : referenceCounted) {
-                cur.release();
+                if (cur != null) {
+                    cur.release();
+                }
             }
             wrapped.onResult(result, t);
         }
     }
 
-    static boolean serverIsAtLeastVersionTwoDotSix(final ConnectionDescription description) {
-        return serverIsAtLeastVersion(description, new ServerVersion(2, 6));
-    }
+    static class ConnectionReleasingWrappedCallback<T> implements SingleResultCallback<T> {
+        private final SingleResultCallback<T> wrapped;
+        private final AsyncConnectionSource source;
+        private final AsyncConnection connection;
 
-    static boolean serverIsAtLeastVersionThreeDotZero(final ConnectionDescription description) {
-        return serverIsAtLeastVersion(description, new ServerVersion(asList(3, 0, 0)));
-    }
+        ConnectionReleasingWrappedCallback(final SingleResultCallback<T> wrapped, final AsyncConnectionSource source,
+                                           final AsyncConnection connection) {
+            this.wrapped = wrapped;
+            this.source = notNull("source", source);
+            this.connection = notNull("connection", connection);
+        }
 
-    static boolean serverIsAtLeastVersionThreeDotTwo(final ConnectionDescription description) {
-        return serverIsAtLeastVersion(description, new ServerVersion(asList(3, 1, 9)));
-    }
+        @Override
+        public void onResult(final T result, final Throwable t) {
+            connection.release();
+            source.release();
+            wrapped.onResult(result, t);
+        }
 
-    static boolean serverIsAtLeastVersion(final ConnectionDescription description, final ServerVersion serverVersion) {
-        return description.getServerVersion().compareTo(serverVersion) >= 0;
+        public SingleResultCallback<T> releaseConnectionAndGetWrapped() {
+            connection.release();
+            source.release();
+            return wrapped;
+        }
     }
 
     static <T> T withConnection(final ReadBinding binding, final CallableWithConnection<T> callable) {
@@ -217,6 +457,35 @@ static <T> T withConnection(final ReadBinding binding, final CallableWithConnect
         }
     }
 
+    static <T> T withReadConnectionSource(final ReadBinding binding, final CallableWithSource<T> callable) {
+        ConnectionSource source = binding.getReadConnectionSource();
+        try {
+            return callable.call(source);
+        } finally {
+            source.release();
+        }
+    }
+
+    static <T> T withReleasableConnection(final ReadBinding binding, final MongoException connectionException,
+                                          final CallableWithConnectionAndSource<T> callable) {
+        ConnectionSource source = null;
+        Connection connection;
+        try {
+            source = binding.getReadConnectionSource();
+            connection = source.getConnection();
+        } catch (Throwable t){
+            if (source != null) {
+                source.release();
+            }
+            throw connectionException;
+        }
+        try {
+            return callable.call(source, connection);
+        } finally {
+            source.release();
+        }
+    }
+
     static <T> T withConnection(final WriteBinding binding, final CallableWithConnection<T> callable) {
         ConnectionSource source = binding.getWriteConnectionSource();
         try {
@@ -226,6 +495,35 @@ static <T> T withConnection(final WriteBinding binding, final CallableWithConnec
         }
     }
 
+    static <T> T withReleasableConnection(final WriteBinding binding, final CallableWithConnectionAndSource<T> callable) {
+        ConnectionSource source = binding.getWriteConnectionSource();
+        try {
+            return callable.call(source, source.getConnection());
+        } finally {
+            source.release();
+        }
+    }
+
+    static <T> T withReleasableConnection(final WriteBinding binding, final MongoException connectionException,
+                                          final CallableWithConnectionAndSource<T> callable) {
+        ConnectionSource source = null;
+        Connection connection;
+        try {
+            source = binding.getWriteConnectionSource();
+            connection = source.getConnection();
+        } catch (Throwable t){
+            if (source != null) {
+                source.release();
+            }
+            throw connectionException;
+        }
+        try {
+            return callable.call(source, connection);
+        } finally {
+            source.release();
+        }
+    }
+
     static <T> T withConnectionSource(final ConnectionSource source, final CallableWithConnection<T> callable) {
         Connection connection = source.getConnection();
         try {
@@ -244,21 +542,25 @@ static <T> T withConnectionSource(final ConnectionSource source, final CallableW
         }
     }
 
-    static void withConnection(final AsyncWriteBinding binding, final AsyncCallableWithConnection callable) {
+    static void withAsyncConnection(final AsyncWriteBinding binding, final AsyncCallableWithConnection callable) {
         binding.getWriteConnectionSource(errorHandlingCallback(new AsyncCallableWithConnectionCallback(callable), LOGGER));
     }
 
-    static void withConnection(final AsyncReadBinding binding, final AsyncCallableWithConnection callable) {
-        binding.getReadConnectionSource(errorHandlingCallback(new AsyncCallableWithConnectionCallback(callable), LOGGER));
+    static void withAsyncConnection(final AsyncWriteBinding binding, final AsyncCallableWithConnectionAndSource callable) {
+        binding.getWriteConnectionSource(errorHandlingCallback(new AsyncCallableWithConnectionAndSourceCallback(callable), LOGGER));
     }
 
-    static void withConnection(final AsyncReadBinding binding, final AsyncCallableWithConnectionAndSource callable) {
+    static void withAsyncReadConnection(final AsyncReadBinding binding, final AsyncCallableWithSource callable) {
+        binding.getReadConnectionSource(errorHandlingCallback(new AsyncCallableWithSourceCallback(callable), LOGGER));
+    }
+
+    static void withAsyncReadConnection(final AsyncReadBinding binding, final AsyncCallableWithConnectionAndSource callable) {
         binding.getReadConnectionSource(errorHandlingCallback(new AsyncCallableWithConnectionAndSourceCallback(callable), LOGGER));
     }
 
     private static class AsyncCallableWithConnectionCallback implements SingleResultCallback<AsyncConnectionSource> {
         private final AsyncCallableWithConnection callable;
-        public AsyncCallableWithConnectionCallback(final AsyncCallableWithConnection callable) {
+        AsyncCallableWithConnectionCallback(final AsyncCallableWithConnection callable) {
             this.callable = callable;
         }
         @Override
@@ -266,12 +568,28 @@ public void onResult(final AsyncConnectionSource source, final Throwable t) {
             if (t != null) {
                 callable.call(null, t);
             } else {
-                withConnectionSource(source, callable);
+                withAsyncConnectionSourceCallableConnection(source, callable);
             }
         }
     }
 
-    private static void withConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithConnection callable) {
+    private static class AsyncCallableWithSourceCallback implements SingleResultCallback<AsyncConnectionSource> {
+        private final AsyncCallableWithSource callable;
+        AsyncCallableWithSourceCallback(final AsyncCallableWithSource callable) {
+            this.callable = callable;
+        }
+        @Override
+        public void onResult(final AsyncConnectionSource source, final Throwable t) {
+            if (t != null) {
+                callable.call(null, t);
+            } else {
+                withAsyncConnectionSource(source, callable);
+            }
+        }
+    }
+
+    private static void withAsyncConnectionSourceCallableConnection(final AsyncConnectionSource source,
+                                                                    final AsyncCallableWithConnection callable) {
         source.getConnection(new SingleResultCallback<AsyncConnection>() {
             @Override
             public void onResult(final AsyncConnection connection, final Throwable t) {
@@ -285,7 +603,11 @@ public void onResult(final AsyncConnection connection, final Throwable t) {
         });
     }
 
-    private static void withConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithConnectionAndSource callable) {
+    private static void withAsyncConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithSource callable) {
+        callable.call(source, null);
+    }
+
+    private static void withAsyncConnectionSource(final AsyncConnectionSource source, final AsyncCallableWithConnectionAndSource callable) {
         source.getConnection(new SingleResultCallback<AsyncConnection>() {
             @Override
             public void onResult(final AsyncConnection result, final Throwable t) {
@@ -297,7 +619,7 @@ public void onResult(final AsyncConnection result, final Throwable t) {
     private static class AsyncCallableWithConnectionAndSourceCallback implements SingleResultCallback<AsyncConnectionSource> {
         private final AsyncCallableWithConnectionAndSource callable;
 
-        public AsyncCallableWithConnectionAndSourceCallback(final AsyncCallableWithConnectionAndSource callable) {
+        AsyncCallableWithConnectionAndSourceCallback(final AsyncCallableWithConnectionAndSource callable) {
             this.callable = callable;
         }
 
@@ -306,7 +628,7 @@ public void onResult(final AsyncConnectionSource source, final Throwable t) {
             if (t != null) {
                 callable.call(null, null, t);
             } else {
-                withConnectionSource(source, callable);
+                withAsyncConnectionSource(source, callable);
             }
         }
     }
diff --git a/driver-core/src/main/com/mongodb/operation/OperationReadConcernHelper.java b/driver-core/src/main/com/mongodb/operation/OperationReadConcernHelper.java
new file mode 100644
index 00000000000..527ab2aeae2
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/OperationReadConcernHelper.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.connection.ReadConcernHelper.getReadConcernDocument;
+
+final class OperationReadConcernHelper {
+    static void appendReadConcernToCommand(final SessionContext sessionContext, final BsonDocument commandDocument) {
+        notNull("commandDocument", commandDocument);
+        notNull("sessionContext", sessionContext);
+
+        if (sessionContext.hasActiveTransaction()) {
+            return;
+        }
+
+        BsonDocument readConcernDocument = getReadConcernDocument(sessionContext);
+        if (!readConcernDocument.isEmpty()) {
+            commandDocument.append("readConcern", readConcernDocument);
+        }
+    }
+
+    private OperationReadConcernHelper() {
+    }
+}
diff --git a/driver-core/src/main/com/mongodb/operation/OrderBy.java b/driver-core/src/main/com/mongodb/operation/OrderBy.java
index a55152f6aa0..04f3feeb830 100644
--- a/driver-core/src/main/com/mongodb/operation/OrderBy.java
+++ b/driver-core/src/main/com/mongodb/operation/OrderBy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public enum OrderBy {
     /**
      * Ascending order
diff --git a/driver-core/src/main/com/mongodb/operation/ParallelCollectionScanOperation.java b/driver-core/src/main/com/mongodb/operation/ParallelCollectionScanOperation.java
index 0f3b0bdb330..f848186d4c3 100644
--- a/driver-core/src/main/com/mongodb/operation/ParallelCollectionScanOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/ParallelCollectionScanOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoNamespace;
-import com.mongodb.ReadConcern;
 import com.mongodb.ServerAddress;
 import com.mongodb.async.AsyncBatchCursor;
 import com.mongodb.async.SingleResultCallback;
@@ -27,8 +26,12 @@
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
+import com.mongodb.session.SessionContext;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -42,15 +45,13 @@
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
-import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
-import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.checkValidReadConcern;
 import static com.mongodb.operation.OperationHelper.cursorDocumentToQueryResult;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.operation.OperationHelper.validateReadConcern;
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand;
 
 /**
  * Return a list of cursors over the collection that can be used to scan it in parallel.
@@ -62,14 +63,15 @@
  * @mongodb.server.release 2.6
  * @since 3.0
  */
+@Deprecated
 public class
 ParallelCollectionScanOperation<T> implements AsyncReadOperation<List<AsyncBatchCursor<T>>>,
                                                            ReadOperation<List<BatchCursor<T>>> {
     private final MongoNamespace namespace;
     private final int numCursors;
+    private boolean retryReads;
     private int batchSize = 0;
     private final Decoder<T> decoder;
-    private ReadConcern readConcern = ReadConcern.DEFAULT;
 
     /**
      * Construct a new instance.
@@ -77,7 +79,6 @@
      * @param namespace the database and collection namespace for the operation.
      * @param numCursors The maximum number of cursors to return. Must be between 1 and 10000, inclusive.
      * @param decoder the decoder for the result documents.
-
      */
     public ParallelCollectionScanOperation(final MongoNamespace namespace, final int numCursors, final Decoder<T> decoder) {
         this.namespace = notNull("namespace", namespace);
@@ -119,73 +120,45 @@ public ParallelCollectionScanOperation<T> batchSize(final int batchSize) {
     }
 
     /**
-     * Gets the read concern
+     * Enables retryable reads if a read fails due to a network error.
      *
-     * @return the read concern
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
      */
-    public ReadConcern getReadConcern() {
-        return readConcern;
+    public ParallelCollectionScanOperation<T> retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
     }
 
     /**
-     * Sets the read concern
-     * @param readConcern the read concern
-     * @return this
-     * @since 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
      */
-    public ParallelCollectionScanOperation<T> readConcern(final ReadConcern readConcern) {
-        this.readConcern = notNull("readConcern", readConcern);
-        return this;
+    public boolean getRetryReads() {
+        return retryReads;
     }
 
     @Override
     public List<BatchCursor<T>> execute(final ReadBinding binding) {
-        return withConnection(binding, new CallableWithConnectionAndSource<List<BatchCursor<T>>>() {
-            @Override
-            public List<BatchCursor<T>> call(final ConnectionSource source, final Connection connection) {
-                checkValidReadConcern(connection, readConcern);
-                return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(),
-                                                     CommandResultDocumentCodec.create(decoder, "firstBatch"), connection,
-                                                     transformer(source));
-            }
-        });
+        return executeCommand(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()),
+                CommandResultDocumentCodec.create(decoder, "firstBatch"),
+                transformer(), retryReads);
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<List<AsyncBatchCursor<T>>> callback) {
-        withConnection(binding, new AsyncCallableWithConnectionAndSource() {
-            @Override
-            public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<List<AsyncBatchCursor<T>>> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    final SingleResultCallback<List<AsyncBatchCursor<T>>> wrappedCallback = releasingCallback(
-                            errHandlingCallback, source, connection);
-                    checkValidReadConcern(source, connection, readConcern, new AsyncCallableWithConnectionAndSource() {
-                        @Override
-                        public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
-                            if (t != null) {
-                                wrappedCallback.onResult(null, t);
-                            } else {
-                                executeWrappedCommandProtocolAsync(binding, namespace.getDatabaseName(), getCommand(),
-                                        CommandResultDocumentCodec.create(decoder, "firstBatch"), connection,
-                                        asyncTransformer(source, connection), wrappedCallback);
-                            }
-                        }
-                    });
-                }
-            }
-        });
+        executeCommandAsync(binding, namespace.getDatabaseName(), getCommandCreator(binding.getSessionContext()),
+                CommandResultDocumentCodec.create(decoder, "firstBatch"),
+                asyncTransformer(), retryReads, errorHandlingCallback(callback, LOGGER));
     }
 
-    private CommandTransformer<BsonDocument, List<BatchCursor<T>>> transformer(final ConnectionSource source) {
-        return new CommandTransformer<BsonDocument, List<BatchCursor<T>>>() {
+    private CommandReadTransformer<BsonDocument, List<BatchCursor<T>>> transformer() {
+        return new CommandReadTransformer<BsonDocument, List<BatchCursor<T>>>() {
             @Override
-            public List<BatchCursor<T>> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public List<BatchCursor<T>> apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
                 List<BatchCursor<T>> cursors = new ArrayList<BatchCursor<T>>();
                 for (BsonValue cursorValue : getCursorDocuments(result)) {
                     cursors.add(new QueryBatchCursor<T>(createQueryResult(getCursorDocument(cursorValue.asDocument()),
@@ -197,16 +170,16 @@ public List<BatchCursor<T>> apply(final BsonDocument result, final ServerAddress
         };
     }
 
-    private CommandTransformer<BsonDocument, List<AsyncBatchCursor<T>>> asyncTransformer(final AsyncConnectionSource source,
-                                                                               final AsyncConnection connection) {
-        return new CommandTransformer<BsonDocument, List<AsyncBatchCursor<T>>>() {
+    private CommandReadTransformerAsync<BsonDocument, List<AsyncBatchCursor<T>>> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, List<AsyncBatchCursor<T>>>() {
             @Override
-            public List<AsyncBatchCursor<T>> apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public List<AsyncBatchCursor<T>> apply(final BsonDocument result, final AsyncConnectionSource source,
+                                                   final AsyncConnection connection) {
                 List<AsyncBatchCursor<T>> cursors = new ArrayList<AsyncBatchCursor<T>>();
                 for (BsonValue cursorValue : getCursorDocuments(result)) {
                     cursors.add(new AsyncQueryBatchCursor<T>(createQueryResult(getCursorDocument(cursorValue.asDocument()),
                                                                                           source.getServerDescription().getAddress()),
-                                                             0, getBatchSize(), 0, decoder, source, connection));
+                                                             0, getBatchSize(), 0, decoder, source, connection, result));
                 }
                 return cursors;
             }
@@ -227,12 +200,20 @@ private QueryResult<T> createQueryResult(final BsonDocument cursorDocument, fina
         return cursorDocumentToQueryResult(cursorDocument, serverAddress);
     }
 
-    private BsonDocument getCommand() {
+    private CommandCreator getCommandCreator(final SessionContext sessionContext) {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                validateReadConcern(connectionDescription, sessionContext.getReadConcern());
+                return getCommand(sessionContext);
+            }
+        };
+    }
+
+    private BsonDocument getCommand(final SessionContext sessionContext) {
         BsonDocument document = new BsonDocument("parallelCollectionScan", new BsonString(namespace.getCollectionName()))
                .append("numCursors", new BsonInt32(getNumCursors()));
-        if (!readConcern.isServerDefault()) {
-            document.put("readConcern", readConcern.asDocument());
-        }
+        appendReadConcernToCommand(sessionContext, document);
         return document;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/QueryBatchCursor.java b/driver-core/src/main/com/mongodb/operation/QueryBatchCursor.java
index b34e0bc7794..ba3efdf053e 100644
--- a/driver-core/src/main/com/mongodb/operation/QueryBatchCursor.java
+++ b/driver-core/src/main/com/mongodb/operation/QueryBatchCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,23 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
 import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.mongodb.ServerCursor;
 import com.mongodb.binding.ConnectionSource;
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.QueryResult;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonInt64;
 import org.bson.BsonString;
+import org.bson.BsonTimestamp;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.BsonDocumentCodec;
 import org.bson.codecs.Decoder;
 
 import java.util.List;
@@ -37,39 +43,63 @@
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.operation.CursorHelper.getNumberToReturn;
 import static com.mongodb.operation.OperationHelper.getMoreCursorDocumentToQueryResult;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
 import static com.mongodb.operation.QueryHelper.translateCommandException;
 import static java.util.Collections.singletonList;
 
-class QueryBatchCursor<T> implements BatchCursor<T> {
+class QueryBatchCursor<T> implements AggregateResponseBatchCursor<T> {
+    private static final FieldNameValidator NO_OP_FIELD_NAME_VALIDATOR = new NoOpFieldNameValidator();
+    private static final String CURSOR = "cursor";
+    private static final String POST_BATCH_RESUME_TOKEN = "postBatchResumeToken";
+    private static final String OPERATION_TIME = "operationTime";
+
     private final MongoNamespace namespace;
+    private final ServerAddress serverAddress;
     private final int limit;
     private final Decoder<T> decoder;
-    private final ConnectionSource connectionSource;
     private final long maxTimeMS;
     private int batchSize;
+    private ConnectionSource connectionSource;
     private ServerCursor serverCursor;
     private List<T> nextBatch;
     private int count;
-    private boolean closed;
+    private volatile boolean closed;
+    private BsonDocument postBatchResumeToken;
+    private BsonTimestamp operationTime;
+    private boolean firstBatchEmpty;
 
     QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize, final Decoder<T> decoder) {
-        this(firstQueryResult, limit, batchSize, decoder, (ConnectionSource) null);
+        this(firstQueryResult, limit, batchSize, decoder, null);
     }
 
     QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize,
                      final Decoder<T> decoder, final ConnectionSource connectionSource) {
-        this(firstQueryResult, limit, batchSize, 0, decoder, connectionSource, null);
+        this(firstQueryResult, limit, batchSize, 0, decoder, connectionSource, null, null);
+    }
+
+    QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize,
+                     final Decoder<T> decoder, final ConnectionSource connectionSource, final Connection connection) {
+        this(firstQueryResult, limit, batchSize, 0, decoder, connectionSource, connection, null);
     }
 
     QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize, final long maxTimeMS,
                      final Decoder<T> decoder, final ConnectionSource connectionSource, final Connection connection) {
+        this(firstQueryResult, limit, batchSize, maxTimeMS, decoder, connectionSource, connection, null);
+    }
+
+    QueryBatchCursor(final QueryResult<T> firstQueryResult, final int limit, final int batchSize, final long maxTimeMS,
+                     final Decoder<T> decoder, final ConnectionSource connectionSource, final Connection connection,
+                     final BsonDocument result) {
         isTrueArgument("maxTimeMS >= 0", maxTimeMS >= 0);
         this.maxTimeMS = maxTimeMS;
         this.namespace = firstQueryResult.getNamespace();
+        this.serverAddress = firstQueryResult.getAddress();
         this.limit = limit;
         this.batchSize = batchSize;
         this.decoder = notNull("decoder", decoder);
+        if (result != null) {
+            this.operationTime = result.getTimestamp(OPERATION_TIME, null);
+        }
         if (firstQueryResult.getCursor() != null) {
             notNull("connectionSource", connectionSource);
         }
@@ -80,9 +110,14 @@ class QueryBatchCursor<T> implements BatchCursor<T> {
         }
 
         initFromQueryResult(firstQueryResult);
+        firstBatchEmpty = firstQueryResult.getResults().isEmpty();
         if (limitReached()) {
             killCursor(connection);
         }
+        if (serverCursor == null && this.connectionSource != null) {
+            this.connectionSource.release();
+            this.connectionSource = null;
+        }
     }
 
     @Override
@@ -101,6 +136,9 @@ public boolean hasNext() {
 
         while (serverCursor != null) {
             getMore();
+            if (closed) {
+                throw new IllegalStateException("Cursor has been closed");
+            }
             if (nextBatch != null) {
                 return true;
             }
@@ -141,18 +179,16 @@ public void remove() {
 
     @Override
     public void close() {
-        if (closed) {
-            return;
-        }
-        try {
-            killCursor();
-        } finally {
-            if (connectionSource != null) {
-                connectionSource.release();
+        if (!closed) {
+            closed = true;
+            try {
+                killCursor();
+            } finally {
+                if (connectionSource != null) {
+                    connectionSource.release();
+                }
             }
         }
-
-        closed = true;
     }
 
     @Override
@@ -198,7 +234,22 @@ public ServerAddress getServerAddress() {
             throw new IllegalStateException("Iterator has been closed");
         }
 
-        return connectionSource.getServerDescription().getAddress();
+        return serverAddress;
+    }
+
+    @Override
+    public BsonDocument getPostBatchResumeToken() {
+        return postBatchResumeToken;
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return operationTime;
+    }
+
+    @Override
+    public boolean isFirstBatchEmpty() {
+        return firstBatchEmpty;
     }
 
     private void getMore() {
@@ -208,20 +259,25 @@ private void getMore() {
                 try {
                     initFromCommandResult(connection.command(namespace.getDatabaseName(),
                                                              asGetMoreCommandDocument(),
-                                                             false,
-                                                             new NoOpFieldNameValidator(),
-                                                             CommandResultDocumentCodec.create(decoder, "nextBatch")));
+                                                             NO_OP_FIELD_NAME_VALIDATOR,
+                                                             ReadPreference.primary(),
+                                                             CommandResultDocumentCodec.create(decoder, "nextBatch"),
+                                                             connectionSource.getSessionContext()));
                 } catch (MongoCommandException e) {
                     throw translateCommandException(e, serverCursor);
                 }
             } else {
-                initFromQueryResult(connection.getMore(namespace, serverCursor.getId(),
-                                                       getNumberToReturn(limit, batchSize, count),
-                                                       decoder));
+                QueryResult<T> getMore = connection.getMore(namespace, serverCursor.getId(),
+                        getNumberToReturn(limit, batchSize, count), decoder);
+                initFromQueryResult(getMore);
             }
             if (limitReached()) {
                 killCursor(connection);
             }
+            if (serverCursor == null) {
+                this.connectionSource.release();
+                this.connectionSource = null;
+            }
         } finally {
             connection.release();
         }
@@ -249,8 +305,10 @@ private void initFromQueryResult(final QueryResult<T> queryResult) {
     }
 
     private void initFromCommandResult(final BsonDocument getMoreCommandResultDocument) {
-        QueryResult<T> queryResult = getMoreCursorDocumentToQueryResult(getMoreCommandResultDocument.getDocument("cursor"),
+        QueryResult<T> queryResult = getMoreCursorDocumentToQueryResult(getMoreCommandResultDocument.getDocument(CURSOR),
                                                                         connectionSource.getServerDescription().getAddress());
+        postBatchResumeToken = getPostBatchResumeTokenFromResponse(getMoreCommandResultDocument);
+        operationTime = getMoreCommandResultDocument.getTimestamp(OPERATION_TIME, null);
         initFromQueryResult(queryResult);
     }
 
@@ -260,11 +318,15 @@ private boolean limitReached() {
 
     private void killCursor() {
         if (serverCursor != null) {
-            Connection connection = connectionSource.getConnection();
             try {
-                killCursor(connection);
-            } finally {
-                connection.release();
+                Connection connection = connectionSource.getConnection();
+                try {
+                    killCursor(connection);
+                } finally {
+                    connection.release();
+                }
+            } catch (MongoException e) {
+                // Ignore exceptions from calling killCursor
             }
         }
     }
@@ -272,8 +334,26 @@ private void killCursor() {
     private void killCursor(final Connection connection) {
         if (serverCursor != null) {
             notNull("connection", connection);
-            connection.killCursor(namespace, singletonList(serverCursor.getId()));
+            if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
+                connection.command(namespace.getDatabaseName(), asKillCursorsCommandDocument(), NO_OP_FIELD_NAME_VALIDATOR,
+                        ReadPreference.primary(), new BsonDocumentCodec(), connectionSource.getSessionContext());
+            } else {
+                connection.killCursor(namespace, singletonList(serverCursor.getId()));
+            }
             serverCursor = null;
         }
     }
+
+    private BsonDocument asKillCursorsCommandDocument() {
+        return new BsonDocument("killCursors", new BsonString(namespace.getCollectionName()))
+                       .append("cursors", new BsonArray(singletonList(new BsonInt64(serverCursor.getId()))));
+    }
+
+    private BsonDocument getPostBatchResumeTokenFromResponse(final BsonDocument result) {
+        BsonDocument cursor = result.getDocument(CURSOR, null);
+        if (cursor != null) {
+            return cursor.getDocument(POST_BATCH_RESUME_TOKEN, null);
+        }
+        return null;
+    }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/QueryHelper.java b/driver-core/src/main/com/mongodb/operation/QueryHelper.java
index 01e77247a52..cd50a42cab2 100644
--- a/driver-core/src/main/com/mongodb/operation/QueryHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/QueryHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,7 @@ static MongoQueryException translateCommandException(final MongoCommandException
         if (commandException.getErrorCode() == 43) {
             return new MongoCursorNotFoundException(cursor.getId(), cursor.getAddress());
         } else {
-            return new MongoQueryException(cursor.getAddress(),
-                                           commandException.getErrorCode(),
-                                           commandException.getErrorMessage());
+            return new MongoQueryException(cursor.getAddress(), commandException.getErrorCode(), commandException.getErrorMessage());
         }
     }
 
diff --git a/driver-core/src/main/com/mongodb/operation/ReadOperation.java b/driver-core/src/main/com/mongodb/operation/ReadOperation.java
index 842d7b59915..d8f772371dc 100644
--- a/driver-core/src/main/com/mongodb/operation/ReadOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/ReadOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
  * @param <T> the operations result type.
  * @since 3.0
  */
+@Deprecated
 public interface ReadOperation<T> {
     /**
      * General execute which can return anything of type T
diff --git a/driver-core/src/main/com/mongodb/operation/RenameCollectionOperation.java b/driver-core/src/main/com/mongodb/operation/RenameCollectionOperation.java
index 3f67127ab55..b7d032015f7 100644
--- a/driver-core/src/main/com/mongodb/operation/RenameCollectionOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/RenameCollectionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,30 @@
 package com.mongodb.operation;
 
 import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 
 import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+import static com.mongodb.operation.OperationHelper.releasingCallback;
+import static com.mongodb.operation.OperationHelper.withConnection;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import static com.mongodb.operation.OperationHelper.CallableWithConnection;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation that renames the given collection to the new name.
@@ -38,18 +51,46 @@
  * @mongodb.driver.manual reference/command/renameCollection renameCollection
  * @since 3.0
  */
+@Deprecated
 public class RenameCollectionOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoNamespace originalNamespace;
     private final MongoNamespace newNamespace;
+    private final WriteConcern writeConcern;
     private boolean dropTarget;
 
     /**
      * @param originalNamespace the name of the collection to rename
      * @param newNamespace      the desired new name for the collection
+     * @deprecated Prefer {@link #RenameCollectionOperation(MongoNamespace, MongoNamespace, WriteConcern)}
      */
+    @Deprecated
     public RenameCollectionOperation(final MongoNamespace originalNamespace, final MongoNamespace newNamespace) {
+        this(originalNamespace, newNamespace, null);
+    }
+
+    /**
+     * @param originalNamespace the name of the collection to rename
+     * @param newNamespace      the desired new name for the collection
+     * @param writeConcern      the writeConcern
+     *
+     * @since 3.4
+     */
+    public RenameCollectionOperation(final MongoNamespace originalNamespace, final MongoNamespace newNamespace,
+                                     final WriteConcern writeConcern) {
         this.originalNamespace = notNull("originalNamespace", originalNamespace);
         this.newNamespace = notNull("newNamespace", newNamespace);
+        this.writeConcern = writeConcern;
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern, which may be null
+     *
+     * @since 3.4
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
     }
 
     /**
@@ -82,17 +123,36 @@ public RenameCollectionOperation dropTarget(final boolean dropTarget) {
      */
     @Override
     public Void execute(final WriteBinding binding) {
-        return executeWrappedCommandProtocol(binding, "admin", getCommand(), new VoidTransformer<BsonDocument>());
+        return withConnection(binding, new CallableWithConnection<Void>() {
+            @Override
+            public Void call(final Connection connection) {
+                return executeCommand(binding, "admin", getCommand(connection.getDescription()), connection,
+                        writeConcernErrorTransformer());
+            }
+        });
     }
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        executeWrappedCommandProtocolAsync(binding, "admin", getCommand(), new VoidTransformer<BsonDocument>(), callback);
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
+            @Override
+            public void call(final AsyncConnection connection, final Throwable t) {
+                SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
+                if (t != null) {
+                    errHandlingCallback.onResult(null, t);
+                } else {
+                    executeCommandAsync(binding, "admin", getCommand(connection.getDescription()), connection,
+                            writeConcernErrorWriteTransformer(), releasingCallback(errHandlingCallback, connection));
+                }
+            }
+        });
     }
 
-    private BsonDocument getCommand() {
-        return new BsonDocument("renameCollection", new BsonString(originalNamespace.getFullName()))
-                   .append("to", new BsonString(newNamespace.getFullName()))
-                   .append("dropTarget", BsonBoolean.valueOf(dropTarget));
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument commandDocument = new BsonDocument("renameCollection", new BsonString(originalNamespace.getFullName()))
+                                            .append("to", new BsonString(newNamespace.getFullName()))
+                                            .append("dropTarget", BsonBoolean.valueOf(dropTarget));
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        return commandDocument;
     }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/TransactionOperation.java b/driver-core/src/main/com/mongodb/operation/TransactionOperation.java
new file mode 100644
index 00000000000..66f74286679
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/operation/TransactionOperation.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation;
+
+import com.mongodb.Function;
+import com.mongodb.WriteConcern;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncWriteBinding;
+import com.mongodb.binding.WriteBinding;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.codecs.BsonDocumentCodec;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.operation.CommandOperationHelper.executeRetryableCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformerAsync;
+import static com.mongodb.operation.OperationHelper.LOGGER;
+
+/**
+ * A base class for transaction-related operations
+ *
+ * @since 3.8
+ */
+@Deprecated
+public abstract class TransactionOperation implements WriteOperation<Void>, AsyncWriteOperation<Void> {
+    private final WriteConcern writeConcern;
+
+    /**
+     * Construct an instance.
+     *
+     * @param writeConcern the write concern
+     */
+    TransactionOperation(final WriteConcern writeConcern) {
+        this.writeConcern = notNull("writeConcern", writeConcern);
+    }
+
+    /**
+     * Gets the write concern.
+     *
+     * @return the write concern
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    @Override
+    public Void execute(final WriteBinding binding) {
+        isTrue("in transaction", binding.getSessionContext().hasActiveTransaction());
+        return executeRetryableCommand(binding, "admin", null, new NoOpFieldNameValidator(),
+                new BsonDocumentCodec(), getCommandCreator(), writeConcernErrorTransformer(), getRetryCommandModifier());
+    }
+
+    @Override
+    public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
+        isTrue("in transaction", binding.getSessionContext().hasActiveTransaction());
+        executeRetryableCommand(binding, "admin", null, new NoOpFieldNameValidator(),
+                new BsonDocumentCodec(), getCommandCreator(), writeConcernErrorTransformerAsync(), getRetryCommandModifier(),
+                errorHandlingCallback(callback, LOGGER));
+    }
+
+    CommandCreator getCommandCreator() {
+        return new CommandCreator() {
+            @Override
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                BsonDocument command = new BsonDocument(getCommandName(), new BsonInt32(1));
+                if (!writeConcern.isServerDefault()) {
+                    command.put("writeConcern", writeConcern.asDocument());
+                }
+                return command;
+            }
+        };
+    }
+
+    /**
+     * Gets the command name.
+     *
+     * @return the command name
+     */
+    protected abstract String getCommandName();
+
+    protected abstract Function<BsonDocument, BsonDocument> getRetryCommandModifier();
+}
diff --git a/driver-core/src/main/com/mongodb/operation/UpdateOperation.java b/driver-core/src/main/com/mongodb/operation/UpdateOperation.java
index 10ae9698596..25d9a04c47d 100644
--- a/driver-core/src/main/com/mongodb/operation/UpdateOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/UpdateOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,12 @@
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.bulk.UpdateRequest;
 import com.mongodb.bulk.WriteRequest;
-import com.mongodb.connection.AsyncConnection;
-import com.mongodb.connection.Connection;
 
 import java.util.List;
 
+import static com.mongodb.assertions.Assertions.isTrueArgument;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
@@ -35,21 +31,40 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class UpdateOperation extends BaseWriteOperation {
     private final List<UpdateRequest> updates;
 
+    /**
+     * Construct an instance.
+     *
+     * @param namespace     the database and collection namespace for the operation.
+     * @param ordered       whether the updates are ordered.
+     * @param writeConcern  the write concern for the operation.
+     * @param updates       the update requests.
+     * @deprecated          use {@link #UpdateOperation(MongoNamespace, boolean, WriteConcern, boolean, List)} instead
+     */
+    @Deprecated
+    public UpdateOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
+                           final List<UpdateRequest> updates) {
+        this(namespace, ordered, writeConcern, false, updates);
+    }
+
     /**
      * Construct an instance.
      *
      * @param namespace the database and collection namespace for the operation.
      * @param ordered whether the updates are ordered.
      * @param writeConcern the write concern for the operation.
+     * @param retryWrites   if writes should be retried if they fail due to a network error.
      * @param updates the update requests.
+     * @since 3.6
      */
     public UpdateOperation(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                           final List<UpdateRequest> updates) {
-        super(namespace, ordered, writeConcern);
+                           final boolean retryWrites, final List<UpdateRequest> updates) {
+        super(namespace, ordered, writeConcern, retryWrites);
         this.updates = notNull("update", updates);
+        isTrueArgument("updateRequests not empty", !updates.isEmpty());
     }
 
     /**
@@ -62,23 +77,8 @@ public List<UpdateRequest> getUpdateRequests() {
     }
 
     @Override
-    protected WriteConcernResult executeProtocol(final Connection connection) {
-        return connection.update(getNamespace(), isOrdered(), getWriteConcern(), updates);
-    }
-
-    @Override
-    protected void executeProtocolAsync(final AsyncConnection connection, final SingleResultCallback<WriteConcernResult> callback) {
-        connection.updateAsync(getNamespace(), isOrdered(), getWriteConcern(), updates, callback);
-    }
-
-    @Override
-    protected BulkWriteResult executeCommandProtocol(final Connection connection) {
-        return connection.updateCommand(getNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(), updates);
-    }
-
-    @Override
-    protected void executeCommandProtocolAsync(final AsyncConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
-        connection.updateCommandAsync(getNamespace(), isOrdered(), getWriteConcern(), getBypassDocumentValidation(), updates, callback);
+    protected List<? extends WriteRequest> getWriteRequests() {
+        return getUpdateRequests();
     }
 
     @Override
@@ -86,13 +86,4 @@ protected WriteRequest.Type getType() {
         return WriteRequest.Type.UPDATE;
     }
 
-    @Override
-    protected int getCount(final BulkWriteResult bulkWriteResult) {
-        return bulkWriteResult.getMatchedCount() + bulkWriteResult.getUpserts().size();
-    }
-
-    @Override
-    protected boolean getUpdatedExisting(final BulkWriteResult bulkWriteResult) {
-        return bulkWriteResult.getMatchedCount() > 0;
-    }
 }
diff --git a/driver-core/src/main/com/mongodb/operation/UpdateUserOperation.java b/driver-core/src/main/com/mongodb/operation/UpdateUserOperation.java
index 99ae60d1695..489a85db6d8 100644
--- a/driver-core/src/main/com/mongodb/operation/UpdateUserOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/UpdateUserOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,43 +16,45 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.MongoCommandException;
 import com.mongodb.MongoCredential;
-import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.WriteBinding;
-import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.bulk.WriteRequest;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
 import org.bson.BsonDocument;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.VoidTransformer;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorWriteTransformer;
 import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
 import static com.mongodb.operation.OperationHelper.CallableWithConnection;
 import static com.mongodb.operation.OperationHelper.LOGGER;
 import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
 import static com.mongodb.operation.OperationHelper.withConnection;
-import static com.mongodb.operation.UserOperationHelper.asCollectionQueryDocument;
-import static com.mongodb.operation.UserOperationHelper.asCollectionUpdateDocument;
 import static com.mongodb.operation.UserOperationHelper.asCommandDocument;
-import static java.util.Arrays.asList;
+import static com.mongodb.operation.UserOperationHelper.translateUserCommandException;
+import static com.mongodb.operation.UserOperationHelper.userCommandCallback;
+import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
+import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
+import static com.mongodb.operation.OperationHelper.withAsyncConnection;
 
 /**
  * An operation that updates a user.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class UpdateUserOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoCredential credential;
     private final boolean readOnly;
+    private final WriteConcern writeConcern;
 
     /**
      * Construct a new instance.
@@ -61,8 +63,22 @@ public class UpdateUserOperation implements AsyncWriteOperation<Void>, WriteOper
      * @param readOnly   true if the user is a readOnly user.
      */
     public UpdateUserOperation(final MongoCredential credential, final boolean readOnly) {
+        this(credential, readOnly, null);
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param credential the users credentials.
+     * @param readOnly   true if the user is a readOnly user.
+     * @param writeConcern the write concern
+     *
+     * @since 3.4
+     */
+    public UpdateUserOperation(final MongoCredential credential, final boolean readOnly, final WriteConcern writeConcern) {
         this.credential = notNull("credential", credential);
         this.readOnly = readOnly;
+        this.writeConcern = writeConcern;
     }
 
     /**
@@ -88,10 +104,11 @@ public Void execute(final WriteBinding binding) {
         return withConnection(binding, new CallableWithConnection<Void>() {
             @Override
             public Void call(final Connection connection) {
-                if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                    executeWrappedCommandProtocol(binding, credential.getSource(), getCommand(), connection);
-                } else {
-                    connection.update(getNamespace(), true, WriteConcern.ACKNOWLEDGED, asList(getUpdateRequest()));
+                try {
+                    executeCommand(binding, getCredential().getSource(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorTransformer());
+                } catch (MongoCommandException e) {
+                    translateUserCommandException(e);
                 }
                 return null;
             }
@@ -100,7 +117,7 @@ public Void call(final Connection connection) {
 
     @Override
     public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+        withAsyncConnection(binding, new AsyncCallableWithConnection() {
             @Override
             public void call(final AsyncConnection connection, final Throwable t) {
                 SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
@@ -108,34 +125,17 @@ public void call(final AsyncConnection connection, final Throwable t) {
                     errHandlingCallback.onResult(null, t);
                 } else {
                     final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
-                    if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, credential.getSource(), getCommand(), connection,
-                                                           new VoidTransformer<BsonDocument>(), wrappedCallback);
-                    } else {
-                        connection.updateAsync(getNamespace(), true, WriteConcern.ACKNOWLEDGED, asList(getUpdateRequest()),
-                                               new SingleResultCallback<WriteConcernResult>() {
-                                                   @Override
-                                                   public void onResult(final WriteConcernResult result, final Throwable t) {
-                                                       wrappedCallback.onResult(null, t);
-                                                   }
-                                               });
-                    }
+                    executeCommandAsync(binding, credential.getSource(), getCommand(connection.getDescription()),
+                            connection, writeConcernErrorWriteTransformer(), userCommandCallback(wrappedCallback));
                 }
             }
         });
     }
 
-    private UpdateRequest getUpdateRequest() {
-        return new UpdateRequest(asCollectionQueryDocument(credential), asCollectionUpdateDocument(credential, readOnly),
-                                 WriteRequest.Type.REPLACE);
-    }
-
-    private MongoNamespace getNamespace() {
-        return new MongoNamespace(credential.getSource(), "system.users");
-    }
-
-    private BsonDocument getCommand() {
-        return asCommandDocument(credential, readOnly, "updateUser");
+    private BsonDocument getCommand(final ConnectionDescription description) {
+        BsonDocument commandDocument = asCommandDocument(credential, description, readOnly, "updateUser");
+        appendWriteConcernToCommand(writeConcern, commandDocument, description);
+        return commandDocument;
     }
 
 }
diff --git a/driver-core/src/main/com/mongodb/operation/UserExistsOperation.java b/driver-core/src/main/com/mongodb/operation/UserExistsOperation.java
index 11fd70fc8b2..0de729446c1 100644
--- a/driver-core/src/main/com/mongodb/operation/UserExistsOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/UserExistsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,38 +16,41 @@
 
 package com.mongodb.operation;
 
-import com.mongodb.MongoNamespace;
-import com.mongodb.ServerAddress;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.binding.AsyncConnectionSource;
 import com.mongodb.binding.AsyncReadBinding;
+import com.mongodb.binding.ConnectionSource;
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.Connection;
-import com.mongodb.connection.QueryResult;
-import com.mongodb.operation.CommandOperationHelper.CommandTransformer;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformer;
+import com.mongodb.operation.CommandOperationHelper.CommandReadTransformerAsync;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.codecs.BsonDocumentCodec;
 
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol;
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
-import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
+import static com.mongodb.operation.CommandOperationHelper.CommandCreator;
+import static com.mongodb.operation.CommandOperationHelper.executeCommand;
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync;
 import static com.mongodb.operation.OperationHelper.CallableWithConnection;
 import static com.mongodb.operation.OperationHelper.LOGGER;
-import static com.mongodb.operation.OperationHelper.releasingCallback;
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
 import static com.mongodb.operation.OperationHelper.withConnection;
 
 /**
  * An operation that determines if a user exists.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class UserExistsOperation implements AsyncReadOperation<Boolean>, ReadOperation<Boolean> {
     private final String databaseName;
     private final String userName;
+    private boolean retryReads;
 
     /**
      * Construct a new instance.
@@ -60,81 +63,67 @@ public UserExistsOperation(final String databaseName, final String userName) {
         this.userName = notNull("userName", userName);
     }
 
+    /**
+     * Enables retryable reads if a read fails due to a network error.
+     *
+     * @param retryReads true if reads should be retried
+     * @return this
+     * @since 3.11
+     */
+    public UserExistsOperation retryReads(final boolean retryReads) {
+        this.retryReads = retryReads;
+        return this;
+    }
+
+    /**
+     * Gets the value for retryable reads. The default is true.
+     *
+     * @return the retryable reads value
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
     @Override
     public Boolean execute(final ReadBinding binding) {
         return withConnection(binding, new CallableWithConnection<Boolean>() {
             @Override
             public Boolean call(final Connection connection) {
-                if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                    return executeWrappedCommandProtocol(binding, databaseName, getCommand(), connection, transformer());
-                } else {
-                    return transformQueryResult().apply(connection.query(new MongoNamespace(databaseName, "system.users"),
-                                                                         new BsonDocument("user", new BsonString(userName)), null, 0, 1, 0,
-                                                                         binding.getReadPreference().isSlaveOk(), false,
-                                                                         false, false, false, false,
-                                                                         new BsonDocumentCodec()),
-                                                        connection.getDescription().getServerAddress());
-                }
+                return executeCommand(binding, databaseName, getCommandCreator(), transformer(), retryReads);
             }
         });
     }
 
     @Override
     public void executeAsync(final AsyncReadBinding binding, final SingleResultCallback<Boolean> callback) {
-        withConnection(binding, new AsyncCallableWithConnection() {
+        executeCommandAsync(binding, databaseName, getCommandCreator(), new BsonDocumentCodec(),
+                asyncTransformer(), retryReads, errorHandlingCallback(callback, LOGGER));
+    }
+
+    private CommandReadTransformer<BsonDocument, Boolean> transformer() {
+        return new CommandReadTransformer<BsonDocument, Boolean>() {
             @Override
-            public void call(final AsyncConnection connection, final Throwable t) {
-                SingleResultCallback<Boolean> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
-                if (t != null) {
-                    errHandlingCallback.onResult(null, t);
-                } else {
-                    final SingleResultCallback<Boolean> wrappedCallback = releasingCallback(errHandlingCallback, connection);
-                    if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
-                        executeWrappedCommandProtocolAsync(binding, databaseName, getCommand(), new BsonDocumentCodec(), connection,
-                                transformer(), wrappedCallback);
-                    } else {
-                        connection.queryAsync(new MongoNamespace(databaseName, "system.users"),
-                                              new BsonDocument("user", new BsonString(userName)), null, 0, 1, 0,
-                                              binding.getReadPreference().isSlaveOk(), false,
-                                              false, false, false, false,
-                                              new BsonDocumentCodec(),
-                         new SingleResultCallback<QueryResult<BsonDocument>>() {
-                             @Override
-                             public void onResult(final QueryResult<BsonDocument> result, final Throwable t) {
-                                 if (t != null) {
-                                     wrappedCallback.onResult(null, t);
-                                 } else {
-                                     try {
-                                         wrappedCallback.onResult(transformQueryResult().apply(result,
-                                                                                               connection.getDescription()
-                                                                                               .getServerAddress()),
-                                                                  null);
-                                     } catch (Throwable tr) {
-                                         wrappedCallback.onResult(null, tr);
-                                     }
-                                 }
-                             }
-                         });
-                    }
-                }
+            public Boolean apply(final BsonDocument result, final ConnectionSource source, final Connection connection) {
+                return result.get("users").isArray() && !result.getArray("users").isEmpty();
             }
-        });
+        };
     }
 
-    private CommandTransformer<BsonDocument, Boolean> transformer() {
-        return new CommandTransformer<BsonDocument, Boolean>() {
+    private CommandReadTransformerAsync<BsonDocument, Boolean> asyncTransformer() {
+        return new CommandReadTransformerAsync<BsonDocument, Boolean>() {
             @Override
-            public Boolean apply(final BsonDocument result, final ServerAddress serverAddress) {
+            public Boolean apply(final BsonDocument result, final AsyncConnectionSource source, final AsyncConnection connection) {
                 return result.get("users").isArray() && !result.getArray("users").isEmpty();
             }
         };
     }
 
-    private CommandTransformer<QueryResult<BsonDocument>, Boolean> transformQueryResult() {
-        return new CommandTransformer<QueryResult<BsonDocument>, Boolean>() {
+    private CommandCreator getCommandCreator() {
+        return new CommandCreator() {
             @Override
-            public Boolean apply(final QueryResult<BsonDocument> queryResult, final ServerAddress serverAddress) {
-                return !queryResult.getResults().isEmpty();
+            public BsonDocument create(final ServerDescription serverDescription, final ConnectionDescription connectionDescription) {
+                return getCommand();
             }
         };
     }
diff --git a/driver-core/src/main/com/mongodb/operation/UserOperationHelper.java b/driver-core/src/main/com/mongodb/operation/UserOperationHelper.java
index d48614b1035..8df54a17c36 100644
--- a/driver-core/src/main/com/mongodb/operation/UserOperationHelper.java
+++ b/driver-core/src/main/com/mongodb/operation/UserOperationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +16,41 @@
 
 package com.mongodb.operation;
 
+import com.mongodb.MongoCommandException;
 import com.mongodb.MongoCredential;
+import com.mongodb.MongoInternalException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerVersion;
+import com.mongodb.internal.operation.WriteConcernHelper;
+import com.mongodb.lang.NonNull;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
-import org.bson.BsonObjectId;
 import org.bson.BsonString;
 import org.bson.BsonValue;
-import org.bson.types.ObjectId;
 
-import java.util.Arrays;
+import java.util.Collections;
 
 import static com.mongodb.internal.authentication.NativeAuthenticationHelper.createAuthenticationHash;
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionFourDotZero;
+import static com.mongodb.internal.operation.WriteConcernHelper.hasWriteConcernError;
 
 final class UserOperationHelper {
+    private static final ServerVersion FOUR_ZERO = new ServerVersion(4, 0);
 
-    static BsonDocument asCommandDocument(final MongoCredential credential, final boolean readOnly, final String commandName) {
+    static BsonDocument asCommandDocument(final MongoCredential credential, final ConnectionDescription connectionDescription,
+                                          final boolean readOnly, final String commandName) {
+        boolean serverDigestPassword = serverIsAtLeastVersionFourDotZero(connectionDescription);
         BsonDocument document = new BsonDocument();
-        document.put(commandName, new BsonString(credential.getUserName()));
-        document.put("pwd", new BsonString(createAuthenticationHash(credential.getUserName(),
-                                                                    credential.getPassword())));
-        document.put("digestPassword", BsonBoolean.FALSE);
-        document.put("roles", new BsonArray(Arrays.<BsonValue>asList(new BsonString(getRoleName(credential, readOnly)))));
+        document.put(commandName, new BsonString(getUserNameNonNull(credential)));
+        if (serverDigestPassword) {
+            document.put("pwd", new BsonString(new String(getPasswordNonNull(credential))));
+        } else {
+            document.put("pwd", new BsonString(createAuthenticationHash(getUserNameNonNull(credential), getPasswordNonNull(credential))));
+        }
+        document.put("digestPassword", BsonBoolean.valueOf(serverDigestPassword));
+        document.put("roles", new BsonArray(Collections.<BsonValue>singletonList(new BsonString(getRoleName(credential, readOnly)))));
         return document;
     }
 
@@ -46,19 +59,50 @@ private static String getRoleName(final MongoCredential credential, final boolea
                ? (readOnly ? "readAnyDatabase" : "root") : (readOnly ? "read" : "dbOwner");
     }
 
-    static BsonDocument asCollectionQueryDocument(final MongoCredential credential) {
-        return new BsonDocument("user", new BsonString(credential.getUserName()));
+    static void translateUserCommandException(final MongoCommandException e) {
+        if (e.getErrorCode() == 100 && hasWriteConcernError(e.getResponse())) {
+            throw WriteConcernHelper.createWriteConcernException(e.getResponse(), e.getServerAddress());
+        } else {
+            throw e;
+        }
     }
 
-    static BsonDocument asCollectionUpdateDocument(final MongoCredential credential, final boolean readOnly) {
-        return asCollectionQueryDocument(credential)
-               .append("pwd", new BsonString(createAuthenticationHash(credential.getUserName(), credential.getPassword())))
-               .append("readOnly", BsonBoolean.valueOf(readOnly));
+    static SingleResultCallback<Void> userCommandCallback(final SingleResultCallback<Void> wrappedCallback) {
+        return new SingleResultCallback<Void>() {
+            @Override
+            public void onResult(final Void result, final Throwable t) {
+                if (t != null) {
+                    if (t instanceof MongoCommandException
+                                && hasWriteConcernError(((MongoCommandException) t).getResponse())) {
+                        wrappedCallback.onResult(null,
+                                WriteConcernHelper.createWriteConcernException(((MongoCommandException) t).getResponse(),
+                                        ((MongoCommandException) t).getServerAddress()));
+                    } else {
+                        wrappedCallback.onResult(null, t);
+                    }
+                } else {
+                    wrappedCallback.onResult(null, null);
+                }
+            }
+        };
     }
 
-    static BsonDocument asCollectionInsertDocument(final MongoCredential credential, final boolean readOnly) {
-        return asCollectionUpdateDocument(credential, readOnly)
-               .append("_id", new BsonObjectId(new ObjectId()));
+    @NonNull
+    private static String getUserNameNonNull(final MongoCredential credential) {
+        String userName = credential.getUserName();
+        if (userName == null) {
+            throw new MongoInternalException("User name can not be null");
+        }
+        return userName;
+    }
+
+    @NonNull
+    private static char[] getPasswordNonNull(final MongoCredential credential) {
+        char[] password = credential.getPassword();
+        if (password == null) {
+            throw new MongoInternalException("Password can not be null");
+        }
+        return password;
     }
 
     private UserOperationHelper() {
diff --git a/driver-core/src/main/com/mongodb/operation/WriteOperation.java b/driver-core/src/main/com/mongodb/operation/WriteOperation.java
index a6954e16f47..4cc8d5fe7b7 100644
--- a/driver-core/src/main/com/mongodb/operation/WriteOperation.java
+++ b/driver-core/src/main/com/mongodb/operation/WriteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public interface WriteOperation<T> {
     /**
      * General execute which can return anything of type T
diff --git a/driver-core/src/main/com/mongodb/operation/package-info.java b/driver-core/src/main/com/mongodb/operation/package-info.java
index 71a7d494d46..4408cff0215 100644
--- a/driver-core/src/main/com/mongodb/operation/package-info.java
+++ b/driver-core/src/main/com/mongodb/operation/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,4 +18,5 @@
  * The core of the MongoDB driver works via operations, using the command pattern. The main Operations supported by MongoDB are in this
  * package, as are helpers and infrastructure required for operation functionality.
  */
+@Deprecated
 package com.mongodb.operation;
diff --git a/driver-core/src/main/com/mongodb/package-info.java b/driver-core/src/main/com/mongodb/package-info.java
index ae3558f3604..1effee5f002 100644
--- a/driver-core/src/main/com/mongodb/package-info.java
+++ b/driver-core/src/main/com/mongodb/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,4 +17,7 @@
 /**
  * The core mongodb package
  */
+@NonNullApi
 package com.mongodb;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-core/src/main/com/mongodb/selector/CompositeServerSelector.java b/driver-core/src/main/com/mongodb/selector/CompositeServerSelector.java
index 4affbc42234..1be37bbf8ec 100644
--- a/driver-core/src/main/com/mongodb/selector/CompositeServerSelector.java
+++ b/driver-core/src/main/com/mongodb/selector/CompositeServerSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import com.mongodb.connection.ServerDescription;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static com.mongodb.assertions.Assertions.notNull;
@@ -43,19 +44,25 @@ public CompositeServerSelector(final List<? extends ServerSelector> serverSelect
         if (serverSelectors.isEmpty()) {
             throw new IllegalArgumentException("Server selectors can not be an empty list");
         }
+        ArrayList<ServerSelector> mergedServerSelectors = new ArrayList<ServerSelector>();
         for (ServerSelector cur : serverSelectors) {
             if (cur == null) {
                 throw new IllegalArgumentException("Can not have a null server selector in the list of composed selectors");
             }
-        }
-        this.serverSelectors = new ArrayList<ServerSelector>();
-        for (ServerSelector cur : serverSelectors) {
             if (cur instanceof CompositeServerSelector) {
-                this.serverSelectors.addAll(((CompositeServerSelector) cur).serverSelectors);
+                mergedServerSelectors.addAll(((CompositeServerSelector) cur).serverSelectors);
             } else {
-                this.serverSelectors.add(cur);
+                mergedServerSelectors.add(cur);
             }
         }
+        this.serverSelectors = Collections.unmodifiableList(mergedServerSelectors);
+    }
+
+    /**
+     * @return the server selectors list.
+     */
+    public List<ServerSelector> getServerSelectors() {
+        return serverSelectors;
     }
 
     @Override
@@ -64,12 +71,35 @@ public List<ServerDescription> select(final ClusterDescription clusterDescriptio
         List<ServerDescription> choices = null;
         for (ServerSelector cur : serverSelectors) {
             choices = cur.select(curClusterDescription);
-            curClusterDescription = new ClusterDescription(clusterDescription.getConnectionMode(), clusterDescription.getType(), choices);
+            curClusterDescription = new ClusterDescription(clusterDescription.getConnectionMode(), clusterDescription.getType(), choices,
+                                                                  clusterDescription.getClusterSettings(),
+                                                                  clusterDescription.getServerSettings());
         }
 
         return choices;
     }
 
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CompositeServerSelector that = (CompositeServerSelector) o;
+        if (serverSelectors.size() != that.serverSelectors.size()) {
+            return false;
+        }
+        return serverSelectors.equals(that.serverSelectors);
+    }
+
+    @Override
+    public int hashCode() {
+        return serverSelectors != null ? serverSelectors.hashCode() : 0;
+    }
+
     @Override
     public String toString() {
         return "{"
diff --git a/driver-core/src/main/com/mongodb/selector/LatencyMinimizingServerSelector.java b/driver-core/src/main/com/mongodb/selector/LatencyMinimizingServerSelector.java
index 8245aff5bdf..9f1783a13f6 100644
--- a/driver-core/src/main/com/mongodb/selector/LatencyMinimizingServerSelector.java
+++ b/driver-core/src/main/com/mongodb/selector/LatencyMinimizingServerSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class LatencyMinimizingServerSelector implements ServerSelector {
 
     private final long acceptableLatencyDifferenceNanos;
@@ -74,6 +75,24 @@ public String toString() {
                + '}';
     }
 
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        LatencyMinimizingServerSelector that = (LatencyMinimizingServerSelector) o;
+        return acceptableLatencyDifferenceNanos == that.acceptableLatencyDifferenceNanos;
+    }
+
+    @Override
+    public int hashCode() {
+        return (int) (acceptableLatencyDifferenceNanos ^ (acceptableLatencyDifferenceNanos >>> 32));
+    }
+
     private long getFastestRoundTripTimeNanos(final List<ServerDescription> members) {
         long fastestRoundTripTime = Long.MAX_VALUE;
         for (final ServerDescription cur : members) {
diff --git a/driver-core/src/main/com/mongodb/selector/PrimaryServerSelector.java b/driver-core/src/main/com/mongodb/selector/PrimaryServerSelector.java
index 68374ee9de7..65b59d174fc 100644
--- a/driver-core/src/main/com/mongodb/selector/PrimaryServerSelector.java
+++ b/driver-core/src/main/com/mongodb/selector/PrimaryServerSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/selector/ReadPreferenceServerSelector.java b/driver-core/src/main/com/mongodb/selector/ReadPreferenceServerSelector.java
index 96bc4ae6d86..d82603a3855 100644
--- a/driver-core/src/main/com/mongodb/selector/ReadPreferenceServerSelector.java
+++ b/driver-core/src/main/com/mongodb/selector/ReadPreferenceServerSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class ReadPreferenceServerSelector implements ServerSelector {
     private final ReadPreference readPreference;
 
diff --git a/driver-core/src/main/com/mongodb/selector/ServerAddressSelector.java b/driver-core/src/main/com/mongodb/selector/ServerAddressSelector.java
index aed414698ca..bdaeed9344f 100644
--- a/driver-core/src/main/com/mongodb/selector/ServerAddressSelector.java
+++ b/driver-core/src/main/com/mongodb/selector/ServerAddressSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
  *
  * @since 3.0
  */
+@Deprecated
 public class ServerAddressSelector implements ServerSelector {
     private final ServerAddress serverAddress;
 
diff --git a/driver-core/src/main/com/mongodb/selector/ServerSelector.java b/driver-core/src/main/com/mongodb/selector/ServerSelector.java
index bd9871ff755..c4f32f9bd69 100644
--- a/driver-core/src/main/com/mongodb/selector/ServerSelector.java
+++ b/driver-core/src/main/com/mongodb/selector/ServerSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 import java.util.List;
 
 /**
- * <p>An interface for selecting a server from a cluster according some preference.</p>
+ * <p>An interface for selecting a server from a cluster according to some preference.</p>
  *
  * <p>Implementations of this interface should ensure that their equals and hashCode methods compare equal preferences as equal, as users of
  * this interface may rely on that behavior to efficiently consolidate handling of multiple requests waiting on a server that can satisfy
diff --git a/driver-core/src/main/com/mongodb/selector/WritableServerSelector.java b/driver-core/src/main/com/mongodb/selector/WritableServerSelector.java
index dddc5f11781..0afc360c256 100644
--- a/driver-core/src/main/com/mongodb/selector/WritableServerSelector.java
+++ b/driver-core/src/main/com/mongodb/selector/WritableServerSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.selector;
 
+import com.mongodb.connection.ClusterConnectionMode;
 import com.mongodb.connection.ClusterDescription;
 import com.mongodb.connection.ServerDescription;
 
@@ -26,11 +27,15 @@
  *
  * @since 3.1
  */
+@Deprecated
 public final class WritableServerSelector implements ServerSelector {
 
     @Override
     @SuppressWarnings("deprecation")
     public List<ServerDescription> select(final ClusterDescription clusterDescription) {
+        if (clusterDescription.getConnectionMode() == ClusterConnectionMode.SINGLE) {
+            return clusterDescription.getAny();
+        }
         return clusterDescription.getPrimaries();
     }
 
diff --git a/driver-core/src/main/com/mongodb/selector/package-info.java b/driver-core/src/main/com/mongodb/selector/package-info.java
index 255c6b11f73..0c19d988969 100644
--- a/driver-core/src/main/com/mongodb/selector/package-info.java
+++ b/driver-core/src/main/com/mongodb/selector/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/main/com/mongodb/session/ClientSession.java b/driver-core/src/main/com/mongodb/session/ClientSession.java
new file mode 100644
index 00000000000..7cdf0110597
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/session/ClientSession.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.session;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.ServerAddress;
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+import java.io.Closeable;
+
+/**
+ * A client session.
+ *
+ * @mongodb.server.release 3.6
+ * @since 3.6
+ * @see ClientSessionOptions
+ */
+@NotThreadSafe
+public interface ClientSession extends Closeable {
+
+    /**
+     * Get the server address of the pinned mongos on this session.
+     * For internal use only.
+     *
+     * @return the server address of the pinned mongos
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    @Nullable
+    ServerAddress getPinnedServerAddress();
+
+    /**
+     * Set the server address of the pinned mongos.
+     * For internal use only.
+     *
+     * @param address the server address to pin
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    void setPinnedServerAddress(ServerAddress address);
+
+    /**
+     * Get the recovery token from the latest outcome in a sharded transaction.
+     * For internal use only.
+     *
+     * @return the recovery token
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    @Nullable
+    BsonDocument getRecoveryToken();
+
+    /**
+     * Set the recovery token.
+     * For internal use only.
+     *
+     * @param recoveryToken the recovery token
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    void setRecoveryToken(BsonDocument recoveryToken);
+
+    /**
+     * Get the options for this session.
+     *
+     * @return the options, which may not be null
+     */
+    ClientSessionOptions getOptions();
+
+    /**
+     * Returns true if operations in this session must be causally consistent
+     *
+     * @return whether operations in this session must be causally consistent.
+     */
+    boolean isCausallyConsistent();
+
+    /**
+     * Gets the originator for the session.
+     *
+     * <p>
+     * Important because sessions must only be used by their own originator.
+     * </p>
+     *
+     * @return the sessions originator
+     */
+    Object getOriginator();
+
+    /**
+     *
+     * @return the server session
+     */
+    ServerSession getServerSession();
+
+    /**
+     * Gets the operation time of the last operation executed in this session.
+     *
+     * @return the operation time
+     */
+    BsonTimestamp getOperationTime();
+
+    /**
+     * Set the operation time of the last operation executed in this session.
+     *
+     * @param operationTime the operation time
+     */
+    void advanceOperationTime(BsonTimestamp operationTime);
+
+    /**
+     * @param clusterTime the cluster time to advance to
+     */
+    void advanceClusterTime(BsonDocument clusterTime);
+
+    /**
+     * @return the latest cluster time seen by this session
+     */
+    BsonDocument getClusterTime();
+
+    @Override
+    void close();
+}
diff --git a/driver-core/src/main/com/mongodb/session/ServerSession.java b/driver-core/src/main/com/mongodb/session/ServerSession.java
new file mode 100644
index 00000000000..9d5dab0193f
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/session/ServerSession.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.session;
+
+import org.bson.BsonDocument;
+
+/**
+ * A MongoDB server session.
+ *
+ * @mongodb.server.release 3.6
+ * @since 3.6
+ */
+public interface ServerSession {
+
+    /**
+     * @return the server session identifier
+     */
+    BsonDocument getIdentifier();
+
+    /**
+     * Gets the current transaction number.
+     *
+     * @return the current transaction number
+     * @since 3.8
+     */
+    long getTransactionNumber();
+
+    /**
+     * Return the next available transaction number.
+     *
+     * @return the next transaction number
+     */
+    long advanceTransactionNumber();
+
+    /**
+     * Whether the server session is closed.
+     *
+     * @return true if the session has been closed
+     */
+    boolean isClosed();
+
+    /**
+     * Mark the server session as dirty.
+     *
+     * A server session is marked dirty when a command fails with a network
+     * error. Dirty sessions are later discarded from the server session pool.
+     * @since 3.12
+     */
+    void markDirty();
+
+    /**
+     * Whether the server session is marked dirty.
+     *
+     * @return true if the session has been marked dirty
+     * @since 3.12
+     */
+    boolean isMarkedDirty();
+}
diff --git a/driver-core/src/main/com/mongodb/session/SessionContext.java b/driver-core/src/main/com/mongodb/session/SessionContext.java
new file mode 100644
index 00000000000..1084edcb935
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/session/SessionContext.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.session;
+
+import com.mongodb.ReadConcern;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+/**
+ * The session context.
+ *
+ * @since 3.6
+ * @deprecated there is no replacement for this class
+ */
+@Deprecated
+public interface SessionContext {
+
+    /**
+     * Returns true if there is a true server session associated with this context.
+     *
+     * @return true if there is a true server session associated with this context.
+     */
+    boolean hasSession();
+
+    /**
+     * Returns true if the session is implicit, and false if the application started the session explicity.
+     *
+     * @return true if the session is implicit
+     * @since 3.8
+     */
+    boolean isImplicitSession();
+
+    /**
+     * Gets the session identifier if this context has a session backing it.
+     *
+     * @return the session id
+     */
+    BsonDocument getSessionId();
+
+    /**
+     * Gets whether this context is associated with a causally consistent session.
+     *
+     * @return true ift his context is associated with a causally consistent session
+     */
+    boolean isCausallyConsistent();
+
+    /**
+     * Gets the current transaction number.
+     *
+     * @return the current transaction number
+     * @since 3.8
+     */
+    long getTransactionNumber();
+
+    /**
+     * Advance the transaction number.
+     *
+     * @return the next transaction number for the session
+     */
+    long advanceTransactionNumber();
+
+    /**
+     *  Notify the session context that a message has been sent.
+     *
+     * @return true if this is the first message sent, false otherwise
+     * @since 3.8
+     */
+    boolean notifyMessageSent();
+
+    /**
+     * Gets the current operation time for this session context
+     *
+     * @return the current operation time, which may be null
+     */
+    BsonTimestamp getOperationTime();
+
+    /**
+     * Advance the operation time.  If the current operation time is greater than the given operation time, this method has no effect.
+     *
+     * @param operationTime the new operation time time
+     */
+    void advanceOperationTime(BsonTimestamp operationTime);
+
+    /**
+     * Gets the current cluster time for this session context.
+     *
+     * @return the cluster time, which may be null
+     */
+    BsonDocument getClusterTime();
+
+    /**
+     * Advance the cluster time. If the current cluster time is greater than the given cluster time, this method has no effect.
+     *
+     * @param clusterTime the new cluster time
+     */
+    void advanceClusterTime(BsonDocument clusterTime);
+
+    /**
+     * Gets whether the session has an active transaction
+     *
+     * @return true if the session has an active transaction
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    boolean hasActiveTransaction();
+
+    /**
+     * Gets the read concern to apply to operations on this binding.
+     *
+     * @return the read concern to apply to operations on this binding
+     * @since 3.8
+     */
+    ReadConcern getReadConcern();
+
+    /**
+     * Sets the recovery token in the session.
+     *
+     * @param recoveryToken the recovery token
+     * @since 3.11
+     */
+    void setRecoveryToken(BsonDocument recoveryToken);
+
+    /**
+     * Unpin a mongos from a session.
+     *
+     * @since 3.11
+     */
+    void unpinServerAddress();
+
+    /**
+     * Mark the session as dirty. This happens when a command fails with a network
+     * error. Dirty sessions are later discarded from the server session pool.
+     *
+     * @since 3.12
+     */
+    void markSessionDirty();
+
+    /**
+     * Whether the server session is marked dirty.
+     *
+     * @return true if the session has been marked dirty
+     * @since 3.12
+     */
+    boolean isSessionMarkedDirty();
+}
diff --git a/driver-core/src/main/com/mongodb/session/package-info.java b/driver-core/src/main/com/mongodb/session/package-info.java
new file mode 100644
index 00000000000..485ad2844ca
--- /dev/null
+++ b/driver-core/src/main/com/mongodb/session/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Contains classes related to sessions
+ */
+package com.mongodb.session;
diff --git a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java
index 3797b74cdd4..99b7773a4bc 100644
--- a/driver-core/src/test/functional/com/mongodb/ClusterFixture.java
+++ b/driver-core/src/test/functional/com/mongodb/ClusterFixture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,15 @@
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.binding.AsyncClusterBinding;
 import com.mongodb.binding.AsyncConnectionSource;
+import com.mongodb.binding.AsyncReadBinding;
 import com.mongodb.binding.AsyncReadWriteBinding;
+import com.mongodb.binding.AsyncSessionBinding;
 import com.mongodb.binding.AsyncSingleConnectionBinding;
+import com.mongodb.binding.AsyncWriteBinding;
 import com.mongodb.binding.ClusterBinding;
 import com.mongodb.binding.ReadWriteBinding;
+import com.mongodb.binding.ReferenceCounted;
+import com.mongodb.binding.SessionBinding;
 import com.mongodb.binding.SingleConnectionBinding;
 import com.mongodb.connection.AsyncConnection;
 import com.mongodb.connection.AsynchronousSocketChannelStreamFactory;
@@ -41,32 +46,43 @@
 import com.mongodb.connection.SocketStreamFactory;
 import com.mongodb.connection.SslSettings;
 import com.mongodb.connection.StreamFactory;
+import com.mongodb.connection.TlsChannelStreamFactoryFactory;
 import com.mongodb.connection.netty.NettyStreamFactory;
-import com.mongodb.management.JMXConnectionPoolListener;
+import com.mongodb.lang.Nullable;
 import com.mongodb.operation.AsyncReadOperation;
 import com.mongodb.operation.AsyncWriteOperation;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.CommandReadOperation;
 import com.mongodb.operation.CommandWriteOperation;
 import com.mongodb.operation.DropDatabaseOperation;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.operation.WriteOperation;
+import com.mongodb.selector.ServerSelector;
 import org.bson.BsonDocument;
-import org.bson.BsonDocumentWrapper;
 import org.bson.BsonInt32;
+import org.bson.BsonString;
+import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.codecs.BsonDocumentCodec;
 import org.bson.codecs.DocumentCodec;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
 import static com.mongodb.connection.ClusterType.REPLICA_SET;
 import static com.mongodb.connection.ClusterType.SHARDED;
 import static com.mongodb.connection.ClusterType.STANDALONE;
+import static java.lang.String.format;
 import static java.lang.Thread.sleep;
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * Helper class for the acceptance tests.  Used primarily by DatabaseTestCase and FunctionalSpecification.  This fixture allows Test
@@ -75,18 +91,18 @@
 public final class ClusterFixture {
     public static final String DEFAULT_URI = "mongodb://localhost:27017";
     public static final String MONGODB_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.uri";
+    public static final String MONGODB_TRANSACTION_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.transaction.uri";
     private static final String DEFAULT_DATABASE_NAME = "JavaDriverTest";
+    private static final int COMMAND_NOT_FOUND_ERROR_CODE = 59;
     public static final long TIMEOUT = 60L;
 
     private static ConnectionString connectionString;
     private static Cluster cluster;
     private static Cluster asyncCluster;
+    private static Map<ReadPreference, ReadWriteBinding> bindingMap = new HashMap<ReadPreference, ReadWriteBinding>();
+    private static Map<ReadPreference, AsyncReadWriteBinding> asyncBindingMap = new HashMap<ReadPreference, AsyncReadWriteBinding>();
 
     static {
-        String mongoURIProperty = System.getProperty(MONGODB_URI_SYSTEM_PROPERTY_NAME);
-        String mongoURIString = mongoURIProperty == null || mongoURIProperty.isEmpty()
-                                ? DEFAULT_URI : mongoURIProperty;
-        connectionString = new ConnectionString(mongoURIString);
         Runtime.getRuntime().addShutdownHook(new ShutdownHook());
     }
 
@@ -101,34 +117,54 @@ public static boolean clusterIsType(final ClusterType clusterType) {
         return getCluster().getDescription().getType() == clusterType;
     }
 
-    @SuppressWarnings("deprecation")
     public static ServerVersion getServerVersion() {
-        return getCluster().getDescription().getAny().get(0).getVersion();
+        return getCluster().selectServer(new ServerSelector() {
+            @Override
+            @SuppressWarnings("deprecation")
+            public List<ServerDescription> select(final ClusterDescription clusterDescription) {
+                return clusterDescription.getAny();
+            }
+        }).getDescription().getVersion();
     }
 
     public static boolean serverVersionAtLeast(final List<Integer> versionArray) {
-        return getConnectedServerVersion().compareTo(new ServerVersion(versionArray)) >= 0;
+        return getServerVersion().compareTo(new ServerVersion(versionArray)) >= 0;
     }
 
-    public static Document getBuildInfo() {
-        return new CommandWriteOperation<Document>("admin", new BsonDocument("buildInfo", new BsonInt32(1)), new DocumentCodec())
-                .execute(getBinding());
+    public static boolean serverVersionAtLeast(final int majorVersion, final int minorVersion) {
+        return serverVersionAtLeast(asList(majorVersion, minorVersion, 0));
     }
 
-    public static Document getServerStatus() {
-        return new CommandWriteOperation<Document>("admin", new BsonDocument("serverStatus", new BsonInt32(1)), new DocumentCodec())
-               .execute(getBinding());
+    public static boolean serverVersionLessThan(final List<Integer> versionArray) {
+        return getServerVersion().compareTo(new ServerVersion(versionArray)) < 0;
+    }
+
+    public static boolean serverVersionLessThan(final int majorVersion, final int minorVersion) {
+        return serverVersionLessThan(asList(majorVersion, minorVersion, 0));
     }
 
-    @SuppressWarnings("unchecked")
-    public static boolean isEnterpriseServer() {
-        Document buildInfo = getBuildInfo();
-        List<String> modules = Collections.emptyList();
-        if (buildInfo.containsKey("modules")) {
-            modules = (List<String>) buildInfo.get("modules");
+    public static boolean serverVersionLessThan(final String versionString) {
+        return getServerVersion().compareTo(new ServerVersion(getVersionList(versionString).subList(0, 3))) < 0;
+    }
+
+    public static boolean serverVersionGreaterThan(final String versionString) {
+        return getServerVersion().compareTo(new ServerVersion(getVersionList(versionString).subList(0, 3))) > 0;
+    }
+
+    public static List<Integer> getVersionList(final String versionString) {
+        List<Integer> versionList = new ArrayList<Integer>();
+        for (String s : versionString.split("\\.")) {
+            versionList.add(Integer.valueOf(s));
+        }
+        while (versionList.size() < 3) {
+            versionList.add(0);
         }
+        return versionList;
+    }
 
-        return modules.contains("enterprise");
+    public static Document getServerStatus() {
+        return new CommandWriteOperation<Document>("admin", new BsonDocument("serverStatus", new BsonInt32(1)), new DocumentCodec())
+                .execute(getBinding());
     }
 
     public static boolean supportsFsync() {
@@ -138,53 +174,95 @@ public static boolean supportsFsync() {
         return storageEngine != null && !storageEngine.get("name").equals("inMemory");
     }
 
-    @SuppressWarnings("deprecation")
-    private static ServerVersion getConnectedServerVersion() {
-        ClusterDescription clusterDescription = getCluster().getDescription();
-        int retries = 0;
-        while (clusterDescription.getAny().isEmpty() && retries <= 3) {
-            try {
-                Thread.sleep(1000);
-                retries++;
-            } catch (InterruptedException e) {
-                throw new RuntimeException("Interrupted", e);
-            }
-            clusterDescription = getCluster().getDescription();
-        }
-        if (clusterDescription.getAny().isEmpty()) {
-            throw new RuntimeException("There are no servers available in " + clusterDescription);
-        }
-        return clusterDescription.getAny().get(0).getVersion();
+    public static boolean isNotAtLeastJava7() {
+        return javaVersionStartsWith("1.6");
+    }
+
+    public static boolean isNotAtLeastJava8() {
+        return isNotAtLeastJava7() || javaVersionStartsWith("1.7");
+    }
+
+    private static boolean javaVersionStartsWith(final String versionPrefix) {
+        return System.getProperty("java.version").startsWith(versionPrefix + ".");
     }
 
     static class ShutdownHook extends Thread {
         @Override
         public void run() {
             if (cluster != null) {
-                new DropDatabaseOperation(getDefaultDatabaseName()).execute(getBinding());
+                new DropDatabaseOperation(getDefaultDatabaseName(), WriteConcern.ACKNOWLEDGED).execute(getBinding());
                 cluster.close();
             }
         }
     }
 
+    public static synchronized ConnectionString getMultiMongosConnectionString() {
+        return getConnectionStringFromSystemProperty(MONGODB_TRANSACTION_URI_SYSTEM_PROPERTY_NAME);
+    }
+
     public static synchronized ConnectionString getConnectionString() {
-        return connectionString;
+        if (connectionString != null) {
+            return connectionString;
+        }
+
+        ConnectionString mongoURIProperty = getConnectionStringFromSystemProperty(MONGODB_URI_SYSTEM_PROPERTY_NAME);
+        if (mongoURIProperty != null) {
+            return mongoURIProperty;
+        }
+
+        // Figure out what the connection string should be
+        Cluster cluster = createCluster(new ConnectionString(DEFAULT_URI),
+                new SocketStreamFactory(SocketSettings.builder().build(), SslSettings.builder().build()));
+        try {
+            BsonDocument isMasterResult = new CommandReadOperation<BsonDocument>("admin",
+                    new BsonDocument("ismaster", new BsonInt32(1)), new BsonDocumentCodec()).execute(new ClusterBinding(cluster,
+                    ReadPreference.nearest(), ReadConcern.DEFAULT));
+            if (isMasterResult.containsKey("setName")) {
+                connectionString = new ConnectionString(DEFAULT_URI + "/?replicaSet="
+                        + isMasterResult.getString("setName").getValue());
+            } else {
+                connectionString = new ConnectionString(DEFAULT_URI);
+                ClusterFixture.cluster = cluster;
+            }
+
+            return connectionString;
+        } finally {
+            if (ClusterFixture.cluster == null) {
+                cluster.close();
+            }
+        }
+    }
+
+    @Nullable
+    private static ConnectionString getConnectionStringFromSystemProperty(final String property) {
+        String mongoURIProperty = System.getProperty(property);
+        if (mongoURIProperty != null && !mongoURIProperty.isEmpty()) {
+            return new ConnectionString(mongoURIProperty);
+        }
+        return null;
+    }
+
+    public static ReadWriteBinding getBinding(final Cluster cluster) {
+        return new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT);
     }
 
     public static ReadWriteBinding getBinding() {
-        return getBinding(getCluster());
+        return getBinding(getCluster(), ReadPreference.primary());
     }
 
     public static ReadWriteBinding getBinding(final ReadPreference readPreference) {
         return getBinding(getCluster(), readPreference);
     }
 
-    public static ReadWriteBinding getBinding(final Cluster cluster) {
-        return getBinding(cluster, ReadPreference.primary());
-    }
-
     private static ReadWriteBinding getBinding(final Cluster cluster, final ReadPreference readPreference) {
-        return new ClusterBinding(cluster, readPreference);
+        if (!bindingMap.containsKey(readPreference)) {
+            ReadWriteBinding binding = new ClusterBinding(cluster, readPreference, ReadConcern.DEFAULT);
+            if (serverVersionAtLeast(3, 6)) {
+                binding = new SessionBinding(binding);
+            }
+            bindingMap.put(readPreference, binding);
+        }
+        return bindingMap.get(readPreference);
     }
 
     public static SingleConnectionBinding getSingleConnectionBinding() {
@@ -199,20 +277,27 @@ public static AsyncSingleConnectionBinding getAsyncSingleConnectionBinding(final
         return new AsyncSingleConnectionBinding(cluster, 20, SECONDS);
     }
 
+    public static AsyncReadWriteBinding getAsyncBinding(final Cluster cluster) {
+        return new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT);
+    }
+
     public static AsyncReadWriteBinding getAsyncBinding() {
-        return getAsyncBinding(getAsyncCluster());
+        return getAsyncBinding(getAsyncCluster(), ReadPreference.primary());
     }
 
     public static AsyncReadWriteBinding getAsyncBinding(final ReadPreference readPreference) {
         return getAsyncBinding(getAsyncCluster(), readPreference);
     }
 
-    public static AsyncReadWriteBinding getAsyncBinding(final Cluster cluster) {
-        return getAsyncBinding(cluster, ReadPreference.primary());
-    }
-
     public static AsyncReadWriteBinding getAsyncBinding(final Cluster cluster, final ReadPreference readPreference) {
-        return new AsyncClusterBinding(cluster, readPreference);
+        if (!asyncBindingMap.containsKey(readPreference)) {
+            AsyncReadWriteBinding binding = new AsyncClusterBinding(cluster, readPreference, ReadConcern.DEFAULT);
+            if (serverVersionAtLeast(3, 6)) {
+                binding = new AsyncSessionBinding(binding);
+            }
+            asyncBindingMap.put(readPreference, binding);
+        }
+        return asyncBindingMap.get(readPreference);
     }
 
     public static synchronized Cluster getCluster() {
@@ -230,22 +315,60 @@ public static synchronized Cluster getAsyncCluster() {
     }
 
     public static Cluster createCluster(final StreamFactory streamFactory) {
-        return new DefaultClusterFactory().create(ClusterSettings.builder().applyConnectionString(getConnectionString()).build(),
-                                                  ServerSettings.builder().build(),
-                                                  ConnectionPoolSettings.builder().applyConnectionString(getConnectionString()).build(),
-                                                  streamFactory,
-                                                  new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                  getConnectionString().getCredentialList(), null, new JMXConnectionPoolListener(), null);
+        return createCluster(getConnectionString(), streamFactory);
+    }
+
+
+    public static Cluster createCluster(final List<MongoCredential> credentials) {
+        return createCluster(credentials, getStreamFactory());
+    }
 
+    public static Cluster createAsyncCluster(final List<MongoCredential> credentials) {
+        return createCluster(credentials, getAsyncStreamFactory());
+    }
+
+    private static Cluster createCluster(final List<MongoCredential> credentials, final StreamFactory streamFactory) {
+        return new DefaultClusterFactory().createCluster(ClusterSettings.builder().hosts(asList(getPrimary())).build(),
+                ServerSettings.builder().build(),
+                ConnectionPoolSettings.builder().maxSize(1).maxWaitQueueSize(1).build(),
+                streamFactory, streamFactory, credentials, null, null, null,
+                Collections.<MongoCompressor>emptyList());
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Cluster createCluster(final ConnectionString connectionString, final StreamFactory streamFactory) {
+        return new DefaultClusterFactory().createCluster(ClusterSettings.builder().applyConnectionString(connectionString).build(),
+                ServerSettings.builder().build(),
+                ConnectionPoolSettings.builder().applyConnectionString(connectionString).build(),
+                streamFactory,
+                new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings(connectionString)),
+                connectionString.getCredentialList(), null, null, null,
+                connectionString.getCompressorList());
+    }
+
+    public static StreamFactory getStreamFactory() {
+        return new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings());
     }
 
     public static StreamFactory getAsyncStreamFactory() {
         String streamType = System.getProperty("org.mongodb.async.type", "nio2");
 
-        if (streamType.equals("netty") || getSslSettings().isEnabled()) {
+        if (streamType.equals("netty")) {
             return new NettyStreamFactory(getSocketSettings(), getSslSettings());
         } else if (streamType.equals("nio2")) {
-            return new AsynchronousSocketChannelStreamFactory(getSocketSettings(), getSslSettings());
+            if (getSslSettings().isEnabled()) {
+                if (isNotAtLeastJava8()) {
+                    return new NettyStreamFactory(getSocketSettings(), getSslSettings());
+                } else {
+                    return new TlsChannelStreamFactoryFactory().create(getSocketSettings(), getSslSettings());
+                }
+            } else {
+                if (isNotAtLeastJava7()) {
+                    return new NettyStreamFactory(getSocketSettings(), getSslSettings());
+                } else {
+                    return new AsynchronousSocketChannelStreamFactory(getSocketSettings(), getSslSettings());
+                }
+            }
         } else {
             throw new IllegalArgumentException("Unsupported stream type " + streamType);
         }
@@ -256,7 +379,11 @@ private static SocketSettings getSocketSettings() {
     }
 
     public static SslSettings getSslSettings() {
-        SslSettings.Builder builder = SslSettings.builder().applyConnectionString(getConnectionString());
+        return getSslSettings(getConnectionString());
+    }
+
+    public static SslSettings getSslSettings(final ConnectionString connectionString) {
+        SslSettings.Builder builder = SslSettings.builder().applyConnectionString(connectionString);
         if (System.getProperty("java.version").startsWith("1.6.")) {
             builder.invalidHostNameAllowed(true);
         }
@@ -264,22 +391,41 @@ public static SslSettings getSslSettings() {
     }
 
     @SuppressWarnings("deprecation")
-    public static ServerAddress getPrimary() throws InterruptedException {
+    public static ServerAddress getPrimary() {
         List<ServerDescription> serverDescriptions = getCluster().getDescription().getPrimaries();
         while (serverDescriptions.isEmpty()) {
-            sleep(100);
+            try {
+                sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
             serverDescriptions = getCluster().getDescription().getPrimaries();
         }
         return serverDescriptions.get(0).getAddress();
     }
 
+    @SuppressWarnings("deprecation")
+    public static ServerAddress getSecondary() {
+        List<ServerDescription> serverDescriptions = getCluster().getDescription().getSecondaries();
+        while (serverDescriptions.isEmpty()) {
+            try {
+                sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            serverDescriptions = getCluster().getDescription().getSecondaries();
+        }
+        return serverDescriptions.get(0).getAddress();
+    }
+
+    @SuppressWarnings("deprecation")
     public static List<MongoCredential> getCredentialList() {
         return getConnectionString().getCredentialList();
     }
 
     public static boolean isDiscoverableReplicaSet() {
         return getCluster().getDescription().getType() == REPLICA_SET
-               && getCluster().getDescription().getConnectionMode() == MULTIPLE;
+                && getCluster().getDescription().getConnectionMode() == MULTIPLE;
     }
 
     public static boolean isSharded() {
@@ -291,37 +437,83 @@ public static boolean isStandalone() {
     }
 
     public static boolean isAuthenticated() {
-        return !getConnectionString().getCredentialList().isEmpty();
+        return getConnectionString().getCredential() != null;
     }
 
     public static void enableMaxTimeFailPoint() {
-        assumeThat(isSharded(), is(false));
-        new CommandWriteOperation<BsonDocument>("admin",
-                                                new BsonDocumentWrapper<Document>(new Document("configureFailPoint", "maxTimeAlwaysTimeOut")
-                                                                                  .append("mode", "alwaysOn"),
-                                                                                  new DocumentCodec()),
-                                                new BsonDocumentCodec())
-        .execute(getBinding());
+        configureFailPoint(BsonDocument.parse("{configureFailPoint: 'maxTimeAlwaysTimeOut', mode: 'alwaysOn'}"));
     }
 
     public static void disableMaxTimeFailPoint() {
+        disableFailPoint("maxTimeAlwaysTimeOut");
+    }
+
+    public static void enableOnPrimaryTransactionalWriteFailPoint(final BsonValue failPointData) {
+        BsonDocument command = BsonDocument.parse("{ configureFailPoint: 'onPrimaryTransactionalWrite'}");
+
+        if (failPointData.isDocument() && failPointData.asDocument().containsKey("mode")) {
+            for (Map.Entry<String, BsonValue> keyValue : failPointData.asDocument().entrySet()) {
+                command.append(keyValue.getKey(), keyValue.getValue());
+            }
+        } else {
+            command.append("mode", failPointData);
+        }
+        configureFailPoint(command);
+    }
+
+    public static void disableOnPrimaryTransactionalWriteFailPoint() {
+        disableFailPoint("onPrimaryTransactionalWrite");
+    }
+
+    public static void configureFailPoint(final BsonDocument failPointDocument) {
         assumeThat(isSharded(), is(false));
-        if (serverVersionAtLeast(asList(2, 6, 0)) && !isSharded()) {
-            new CommandWriteOperation<BsonDocument>("admin",
-                                                    new BsonDocumentWrapper<Document>(new Document("configureFailPoint",
-                                                                                                   "maxTimeAlwaysTimeOut")
-                                                                                      .append("mode", "off"),
-                                                                                      new DocumentCodec()),
-                                                    new BsonDocumentCodec())
-            .execute(getBinding());
+        boolean failsPointsSupported = true;
+        if (!isSharded()) {
+            try {
+                new CommandWriteOperation<BsonDocument>("admin", failPointDocument, new BsonDocumentCodec())
+                        .execute(getBinding());
+            } catch (MongoCommandException e) {
+                if (e.getErrorCode() == COMMAND_NOT_FOUND_ERROR_CODE) {
+                    failsPointsSupported = false;
+                }
+            }
+            assumeTrue("configureFailPoint is not enabled", failsPointsSupported);
         }
     }
 
+    public static void disableFailPoint(final String failPoint) {
+        if (!isSharded()) {
+            BsonDocument failPointDocument = new BsonDocument("configureFailPoint", new BsonString(failPoint))
+                    .append("mode", new BsonString("off"));
+            try {
+                new CommandWriteOperation<BsonDocument>("admin", failPointDocument, new BsonDocumentCodec()).execute(getBinding());
+            } catch (MongoCommandException e) {
+                // ignore
+            }
+        }
+    }
+
+    public static <T> T executeSync(final WriteOperation<T> op) {
+        return executeSync(op, getBinding());
+    }
+
+    public static <T> T executeSync(final WriteOperation<T> op, final ReadWriteBinding binding) {
+        return op.execute(binding);
+    }
+
+    public static <T> T executeSync(final ReadOperation<T> op) {
+        return executeSync(op, getBinding());
+    }
+
+    public static <T> T executeSync(final ReadOperation<T> op, final ReadWriteBinding binding) {
+        return op.execute(binding);
+    }
+
     public static <T> T executeAsync(final AsyncWriteOperation<T> op) throws Throwable {
         return executeAsync(op, getAsyncBinding());
     }
 
-    public static <T> T executeAsync(final AsyncWriteOperation<T> op, final AsyncReadWriteBinding binding) throws Throwable {
+    public static <T> T executeAsync(final AsyncWriteOperation<T> op, final AsyncWriteBinding binding) throws Throwable {
         final FutureResultCallback<T> futureResultCallback = new FutureResultCallback<T>();
         op.executeAsync(binding, futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
@@ -331,7 +523,7 @@ public static <T> T executeAsync(final AsyncReadOperation<T> op) throws Throwabl
         return executeAsync(op, getAsyncBinding());
     }
 
-    public static <T> T executeAsync(final AsyncReadOperation<T> op, final AsyncReadWriteBinding binding) throws Throwable {
+    public static <T> T executeAsync(final AsyncReadOperation<T> op, final AsyncReadBinding binding) throws Throwable {
         final FutureResultCallback<T> futureResultCallback = new FutureResultCallback<T>();
         op.executeAsync(binding, futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
@@ -360,24 +552,45 @@ public static <T> void loopCursor(final AsyncBatchCursor<T> batchCursor, final B
         batchCursor.next(new SingleResultCallback<List<T>>() {
             @Override
             public void onResult(final List<T> results, final Throwable t) {
-                    if (t != null || results == null) {
-                        batchCursor.close();
-                        callback.onResult(null, t);
-                    } else {
-                        try {
-                            for (T result : results) {
-                                block.apply(result);
-                            }
-                            loopCursor(batchCursor, block, callback);
-                        } catch (Throwable tr) {
-                            batchCursor.close();
-                            callback.onResult(null, tr);
+                if (t != null || results == null) {
+                    batchCursor.close();
+                    callback.onResult(null, t);
+                } else {
+                    try {
+                        for (T result : results) {
+                            block.apply(result);
                         }
+                        loopCursor(batchCursor, block, callback);
+                    } catch (Throwable tr) {
+                        batchCursor.close();
+                        callback.onResult(null, tr);
                     }
+                }
             }
         });
     }
 
+    public static <T> List<T> collectCursorResults(final AsyncBatchCursor<T> batchCursor) throws Throwable {
+        final List<T> results = new ArrayList<T>();
+        FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
+        loopCursor(batchCursor, new Block<T>() {
+            @Override
+            public void apply(final T t) {
+                results.add(t);
+            }
+        }, futureResultCallback);
+        futureResultCallback.get(TIMEOUT, SECONDS);
+        return results;
+    }
+
+    public static <T> List<T> collectCursorResults(final BatchCursor<T> batchCursor) {
+        List<T> results = new ArrayList<T>();
+        while (batchCursor.hasNext()) {
+            results.addAll(batchCursor.next());
+        }
+        return results;
+    }
+
     public static AsyncConnectionSource getWriteConnectionSource(final AsyncReadWriteBinding binding) throws Throwable {
         final FutureResultCallback<AsyncConnectionSource> futureResultCallback = new FutureResultCallback<AsyncConnectionSource>();
         binding.getWriteConnectionSource(futureResultCallback);
@@ -395,4 +608,30 @@ public static AsyncConnection getConnection(final AsyncConnectionSource source)
         source.getConnection(futureResultCallback);
         return futureResultCallback.get(TIMEOUT, SECONDS);
     }
+
+    public static synchronized void checkReferenceCountReachesTarget(final ReferenceCounted referenceCounted, final int target) {
+        int count = getReferenceCountAfterTimeout(referenceCounted, target);
+        if (count != target) {
+            throw new MongoTimeoutException(
+                    format("Timed out waiting for reference count to drop to %d.  Now at %d for %s", target, count,
+                            referenceCounted));
+        }
+    }
+
+    public static int getReferenceCountAfterTimeout(final ReferenceCounted referenceCounted, final int target) {
+        long startTime = System.currentTimeMillis();
+        int count = referenceCounted.getCount();
+        while (count > target) {
+            try {
+                if (System.currentTimeMillis() > startTime + 5000) {
+                    return count;
+                }
+                sleep(10);
+                count = referenceCounted.getCount();
+            } catch (InterruptedException e) {
+                throw new MongoInterruptedException("Interrupted", e);
+            }
+        }
+        return count;
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/FunctionalTest.java b/driver-core/src/test/functional/com/mongodb/FunctionalTest.java
deleted file mode 100644
index 23dcfef7014..00000000000
--- a/driver-core/src/test/functional/com/mongodb/FunctionalTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.test.CollectionHelper;
-import com.mongodb.connection.ServerHelper;
-import org.bson.Document;
-import org.bson.codecs.DocumentCodec;
-import org.junit.After;
-import org.junit.Before;
-
-import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
-import static com.mongodb.ClusterFixture.getPrimary;
-
-public class FunctionalTest {
-    @Before
-    public void setUp() {
-        CollectionHelper.drop(getNamespace());
-    }
-
-    @After
-    public void tearDown() {
-        CollectionHelper.drop(getNamespace());
-        try {
-            ServerHelper.checkPool(getPrimary());
-        } catch (InterruptedException e) {
-            // ignore
-        }
-    }
-
-    protected String getDatabaseName() {
-        return getDefaultDatabaseName();
-    }
-
-    protected String getCollectionName() {
-        return getClass().getName();
-    }
-
-    protected MongoNamespace getNamespace() {
-        return new MongoNamespace(getDatabaseName(), getCollectionName());
-    }
-
-    protected CollectionHelper<Document> getCollectionHelper() {
-        return new CollectionHelper<Document>(new DocumentCodec(), getNamespace());
-    }
-
-}
diff --git a/driver-core/src/test/functional/com/mongodb/JsonTestServerVersionChecker.java b/driver-core/src/test/functional/com/mongodb/JsonTestServerVersionChecker.java
new file mode 100644
index 00000000000..6ab36ef0b4b
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/JsonTestServerVersionChecker.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mongodb;
+
+import com.mongodb.connection.ServerVersion;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.getServerVersion;
+import static com.mongodb.ClusterFixture.getVersionList;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.isStandalone;
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+
+public final class JsonTestServerVersionChecker {
+    private static final List<String> TOPOLOGY_TYPES = asList("sharded", "replicaset", "single");
+
+    public static boolean skipTest(final BsonDocument testDocument, final BsonDocument testDefinition) {
+        return skipTest(testDocument, testDefinition, getServerVersion());
+    }
+
+    public static boolean skipTest(final BsonDocument testDocument, final BsonDocument testDefinition, final ServerVersion serverVersion) {
+        return !(canRunTest(testDocument, serverVersion) && canRunTest(testDefinition, serverVersion));
+    }
+
+    private static boolean canRunTest(final BsonDocument document, final ServerVersion serverVersion) {
+        if (document.containsKey("minServerVersion")
+                && serverVersion.compareTo(getMinServerVersionForField("minServerVersion", document)) < 0) {
+            return false;
+        }
+        if (document.containsKey("maxServerVersion")
+                && serverVersion.compareTo(getMaxServerVersionForField("maxServerVersion", document)) > 0) {
+            return false;
+        }
+        if (document.containsKey("topology")) {
+            BsonArray topologyTypes = document.getArray("topology");
+            return topologyMatches(topologyTypes);
+        }
+
+        if (document.containsKey("runOn")) {
+            return canRunTest(document.getArray("runOn"), serverVersion);
+        }
+
+        // Ignore certain matching types
+        if (document.containsKey("ignore_if_server_version_less_than")
+                && serverVersion.compareTo(getMinServerVersionForField("ignore_if_server_version_less_than", document)) < 0) {
+            return false;
+        }
+        if (document.containsKey("ignore_if_server_version_greater_than")
+                && serverVersion.compareTo(getMaxServerVersionForField("ignore_if_server_version_greater_than", document)) > 0) {
+            return false;
+        }
+        if (document.containsKey("ignore_if_topology_type")) {
+            return !topologyMatches(document.getArray("ignore_if_topology_type"));
+        }
+
+        return true;
+    }
+
+    private static boolean canRunTest(final BsonArray runOn, final ServerVersion serverVersion) {
+        boolean topologyFound = false;
+        for (BsonValue info : runOn) {
+            topologyFound = canRunTest(info.asDocument(), serverVersion);
+            if (topologyFound) {
+                break;
+            }
+        }
+        return topologyFound;
+    }
+
+    private static boolean topologyMatches(final BsonArray topologyTypes) {
+        for (BsonValue type : topologyTypes) {
+            String typeString = type.asString().getValue();
+            if (typeString.equals("sharded") && isSharded()) {
+                return true;
+            } else if (typeString.equals("replicaset") && isDiscoverableReplicaSet()) {
+                return true;
+            } else if (typeString.equals("single") && isStandalone()) {
+                return true;
+            } else if (!TOPOLOGY_TYPES.contains(typeString)) {
+                throw new IllegalArgumentException(format("Unexpected topology type: '%s'", typeString));
+            }
+        }
+        return false;
+    }
+
+    private static ServerVersion getMinServerVersionForField(final String fieldName, final BsonDocument document) {
+        return new ServerVersion(getVersionList(document.getString(fieldName).getValue()));
+    }
+
+    private static ServerVersion getMaxServerVersionForField(final String fieldName, final BsonDocument document) {
+        List<Integer> versionList = getVersionList(document.getString(fieldName).getValue());
+        if (versionList.size() > 2 && versionList.get(2).equals(0)) {
+            versionList = asList(versionList.get(0), versionList.get(1), Integer.MAX_VALUE);
+        }
+        return new ServerVersion(versionList);
+    }
+
+
+    private JsonTestServerVersionChecker() {
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy
index e0b1b88f070..db9b6d2067d 100644
--- a/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,48 +16,82 @@
 
 package com.mongodb
 
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.binding.AsyncConnectionSource
+import com.mongodb.binding.AsyncReadBinding
+import com.mongodb.binding.AsyncReadWriteBinding
+import com.mongodb.binding.AsyncSessionBinding
 import com.mongodb.binding.AsyncSingleConnectionBinding
+import com.mongodb.binding.AsyncWriteBinding
+import com.mongodb.binding.ConnectionSource
+import com.mongodb.binding.ReadBinding
+import com.mongodb.binding.ReadWriteBinding
+import com.mongodb.binding.SessionBinding
 import com.mongodb.binding.SingleConnectionBinding
+import com.mongodb.binding.WriteBinding
 import com.mongodb.bulk.InsertRequest
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
 import com.mongodb.client.test.CollectionHelper
 import com.mongodb.client.test.Worker
 import com.mongodb.client.test.WorkerCodec
-import com.mongodb.connection.ServerHelper
+import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.Connection
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ServerConnectionState
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import com.mongodb.connection.SplittablePayload
+import com.mongodb.internal.connection.ServerHelper
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import com.mongodb.operation.AsyncReadOperation
+import com.mongodb.operation.AsyncWriteOperation
 import com.mongodb.operation.InsertOperation
+import com.mongodb.operation.ReadOperation
+import com.mongodb.operation.WriteOperation
+import com.mongodb.session.SessionContext
 import org.bson.BsonDocument
 import org.bson.Document
+import org.bson.FieldNameValidator
 import org.bson.codecs.DocumentCodec
+import spock.lang.Shared
 import spock.lang.Specification
 
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.TIMEOUT
+import static com.mongodb.ClusterFixture.checkReferenceCountReachesTarget
 import static com.mongodb.ClusterFixture.executeAsync
+import static com.mongodb.ClusterFixture.getAsyncBinding
+import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.getPrimary
+import static com.mongodb.ClusterFixture.loopCursor
 import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion
 
 class OperationFunctionalSpecification extends Specification {
 
-//    def setupSpec() {
-//        CollectionHelper.dropDatabase(getDatabaseName())
-//    }
-//
-//    def cleanupSpec() {
-//        CollectionHelper.dropDatabase(getDatabaseName())
-//    }
-
     def setup() {
         CollectionHelper.drop(getNamespace())
     }
 
     def cleanup() {
         CollectionHelper.drop(getNamespace())
+        checkReferenceCountReachesTarget(getBinding(), 1)
+        checkReferenceCountReachesTarget(getAsyncBinding(), 1)
         ServerHelper.checkPool(getPrimary())
     }
 
     String getDatabaseName() {
-        ClusterFixture.getDefaultDatabaseName();
+        ClusterFixture.getDefaultDatabaseName()
     }
 
     String getCollectionName() {
-        getClass().getName();
+        getClass().getName()
     }
 
     MongoNamespace getNamespace() {
@@ -65,13 +99,13 @@ class OperationFunctionalSpecification extends Specification {
     }
 
     void acknowledgeWrite(final SingleConnectionBinding binding) {
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, [new InsertRequest(new BsonDocument())]).execute(binding);
-        binding.release();
+        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, [new InsertRequest(new BsonDocument())]).execute(binding)
+        binding.release()
     }
 
     void acknowledgeWrite(final AsyncSingleConnectionBinding binding) {
-        executeAsync(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, [new InsertRequest(new BsonDocument())]), binding);
-        binding.release();
+        executeAsync(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, [new InsertRequest(new BsonDocument())]), binding)
+        binding.release()
     }
 
     CollectionHelper<Document> getCollectionHelper() {
@@ -85,4 +119,408 @@ class OperationFunctionalSpecification extends Specification {
     CollectionHelper<Worker> getWorkerCollectionHelper() {
         new CollectionHelper<Worker>(new WorkerCodec(), getNamespace())
     }
+
+    def execute(operation, boolean async) {
+        def executor = async ? ClusterFixture.&executeAsync : ClusterFixture.&executeSync
+        executor(operation)
+    }
+
+    def executeWithSession(operation, boolean async) {
+        def executor = async ? ClusterFixture.&executeAsync : ClusterFixture.&executeSync
+        def binding = async ? new AsyncSessionBinding(getAsyncBinding()) : new SessionBinding(getBinding())
+        executor(operation, binding)
+    }
+
+    def execute(operation, ReadWriteBinding binding) {
+        ClusterFixture.executeSync(operation, binding)
+    }
+
+    def execute(operation, AsyncReadWriteBinding binding) {
+        ClusterFixture.executeAsync(operation, binding)
+    }
+
+    def executeAndCollectBatchCursorResults(operation, boolean async) {
+        def cursor = execute(operation, async)
+        def results = []
+        if (async) {
+            loopCursor([cursor], new Block<Object>(){
+                void apply(Object batch) {
+                    results.addAll(batch)
+                }
+            })
+        } else {
+            while (cursor.hasNext()) {
+                results.addAll(cursor.next())
+            }
+        }
+        results
+    }
+
+    def next(cursor, boolean async) {
+        if (async) {
+            def futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
+            cursor.next(futureResultCallback)
+            futureResultCallback.get(TIMEOUT, TimeUnit.SECONDS)
+        } else {
+            cursor.next()
+        }
+    }
+
+    def tryNext(cursor, boolean async) {
+        def next
+        if (async) {
+            def futureResultCallback = new FutureResultCallback<List<BsonDocument>>()
+            cursor.tryNext(futureResultCallback)
+            next = futureResultCallback.get(TIMEOUT, TimeUnit.SECONDS)
+        } else {
+            next = cursor.tryNext()
+        }
+        next
+    }
+
+    def consumeAsyncResults(cursor) {
+        def batch = next(cursor, true)
+        while (batch != null) {
+            batch = next(cursor, true)
+        }
+    }
+
+    void testOperation(Map params) {
+        params.async = params.async ?: false
+        params.result = params.result ?: null
+        params.checkCommand = params.checkCommand ?: true
+        params.checkSlaveOk = params.checkSlaveOk ?: false
+        params.readPreference = params.readPreference ?: ReadPreference.primary()
+        params.retryable = params.retryable ?: false
+        params.serverType = params.serverType ?: ServerType.STANDALONE
+        testOperation(params.operation, params.serverVersion, params.expectedCommand, params.async, params.result, params.checkCommand,
+                params.checkSlaveOk, params.readPreference, params.retryable, params.serverType)
+    }
+
+    void testOperationInTransaction(operation, List<Integer> serverVersion, BsonDocument expectedCommand, boolean async, result = null,
+                                    boolean checkCommand = true, boolean checkSlaveOk = false,
+                                    ReadPreference readPreference = ReadPreference.primary(), boolean retryable = false,
+                                    ServerType serverType = ServerType.STANDALONE) {
+        testOperation(operation, serverVersion, ReadConcern.DEFAULT, expectedCommand, async, result, checkCommand, checkSlaveOk,
+                readPreference, retryable, serverType, true)
+    }
+
+    void testOperation(operation, List<Integer> serverVersion, BsonDocument expectedCommand, boolean async, result = null,
+                       boolean checkCommand = true, boolean checkSlaveOk = false, ReadPreference readPreference = ReadPreference.primary(),
+                       boolean retryable = false, ServerType serverType = ServerType.STANDALONE, Boolean activeTransaction = false) {
+        testOperation(operation, serverVersion, ReadConcern.DEFAULT, expectedCommand, async, result, checkCommand, checkSlaveOk,
+        readPreference, retryable, serverType, activeTransaction)
+    }
+
+    void testOperation(operation, List<Integer> serverVersion, ReadConcern readConcern, BsonDocument expectedCommand, boolean async,
+                       result = null, boolean checkCommand = true, boolean checkSlaveOk = false,
+                       ReadPreference readPreference = ReadPreference.primary(), boolean retryable = false,
+                       ServerType serverType = ServerType.STANDALONE, Boolean activeTransaction = false) {
+        def test = async ? this.&testAsyncOperation : this.&testSyncOperation
+        test(operation, serverVersion, readConcern, result, checkCommand, expectedCommand, checkSlaveOk, readPreference, retryable,
+                serverType, activeTransaction)
+    }
+
+    void testOperationRetries(operation, List<Integer> serverVersion, BsonDocument expectedCommand, boolean async, result = null,
+                              Boolean activeTransaction = false) {
+        testOperation(operation, serverVersion, expectedCommand, async, result, true, false, ReadPreference.primary(), true,
+             ServerType.REPLICA_SET_PRIMARY, activeTransaction)
+    }
+
+    void testRetryableOperationThrowsOriginalError(operation, List<List<Integer>> serverVersions, List<ServerType> serverTypes,
+                                                   Throwable exception, boolean async) {
+        def test = async ? this.&testAyncRetryableOperationThrows : this.&testSyncRetryableOperationThrows
+        test(operation, serverVersions as Queue, serverTypes as Queue, exception)
+    }
+
+    void testOperationSlaveOk(operation, List<Integer> serverVersion, ReadPreference readPreference, boolean async, result = null) {
+        def test = async ? this.&testAsyncOperation : this.&testSyncOperation
+        test(operation, serverVersion, ReadConcern.DEFAULT, result, false, null, true, readPreference)
+    }
+
+    void testOperationThrows(operation, List<Integer> serverVersion, boolean async) {
+        testOperationThrows(operation, serverVersion, ReadConcern.DEFAULT, async)
+    }
+
+    void testOperationThrows(operation, List<Integer> serverVersion, ReadConcern readConcern, boolean async) {
+        def test = async ? this.&testAsyncOperation : this.&testSyncOperation
+        test(operation, serverVersion, readConcern, null, false, null, false, ReadPreference.primary(),
+                false, ServerType.STANDALONE, false)
+    }
+
+    def testSyncOperation(operation, List<Integer> serverVersion, ReadConcern readConcern, result, Boolean checkCommand=true,
+                          BsonDocument expectedCommand=null, Boolean checkSlaveOk=false,
+                          ReadPreference readPreference=ReadPreference.primary(), Boolean retryable = false,
+                          ServerType serverType = ServerType.STANDALONE, Boolean activeTransaction = false) {
+        def connection = Mock(Connection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> getMaxWireVersionForServerVersion(serverVersion)
+                getServerType() >> serverType
+            }
+        }
+
+        def connectionSource = Stub(ConnectionSource) {
+            getConnection() >> {
+                connection
+            }
+            getServerDescription() >> {
+                def builder = ServerDescription.builder().address(Stub(ServerAddress)).state(ServerConnectionState.CONNECTED)
+                if (new ServerVersion(serverVersion).compareTo(new ServerVersion(3, 6)) >= 0) {
+                    builder.logicalSessionTimeoutMinutes(42)
+                }
+                builder.build()
+            }
+        }
+        def readBinding = Stub(ReadBinding) {
+            getReadConnectionSource() >> connectionSource
+            getReadPreference() >> readPreference
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> activeTransaction
+                getReadConcern() >> readConcern
+            }
+        }
+        def writeBinding = Stub(WriteBinding) {
+            getWriteConnectionSource() >> connectionSource
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> activeTransaction
+                getReadConcern() >> readConcern
+            }
+        }
+
+        if (retryable) {
+            1 * connection.command(*_) >> { throw new MongoSocketException('Some socket error', Stub(ServerAddress)) }
+        }
+
+        if (checkCommand) {
+            1 * connection.command(*_) >> {
+                assert it[1] == expectedCommand
+                if (it.size() == 9) {
+                    SplittablePayload payload = it[7]
+                    payload.setPosition(payload.getPayload().size())
+                }
+                result
+            }
+        } else if (checkSlaveOk) {
+            1 * connection.command(*_) >> {
+                it[4] == readPreference
+                result
+            }
+        }
+
+        0 * connection.command(_, _, _, _, _, _) >> {
+            // Unexpected Command
+            result
+        }
+
+        if (retryable) {
+            2 * connection.release()
+        } else {
+            1 * connection.release()
+        }
+        if (operation instanceof ReadOperation) {
+            operation.execute(readBinding)
+        } else if (operation instanceof WriteOperation) {
+            operation.execute(writeBinding)
+        }
+    }
+
+    def testAsyncOperation(operation = operation, List<Integer> serverVersion = serverVersion, ReadConcern readConcern, result = null,
+                           Boolean checkCommand = true, BsonDocument expectedCommand = null, Boolean checkSlaveOk = false,
+                           ReadPreference readPreference = ReadPreference.primary(), Boolean retryable = false,
+                           ServerType serverType = ServerType.STANDALONE, Boolean activeTransaction = false) {
+        def connection = Mock(AsyncConnection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> getMaxWireVersionForServerVersion(serverVersion)
+                getServerType() >> serverType
+            }
+        }
+
+        def connectionSource = Stub(AsyncConnectionSource) {
+            getConnection(_) >> { it[0].onResult(connection, null) }
+            getServerDescription() >> {
+                def builder = ServerDescription.builder().address(Stub(ServerAddress)).state(ServerConnectionState.CONNECTED)
+                if (new ServerVersion(serverVersion).compareTo(new ServerVersion(3, 6)) >= 0) {
+                    builder.logicalSessionTimeoutMinutes(42)
+                }
+                builder.build()
+            }
+        }
+        def readBinding = Stub(AsyncReadBinding) {
+            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getReadPreference() >> readPreference
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> activeTransaction
+                getReadConcern() >> readConcern
+            }
+        }
+        def writeBinding = Stub(AsyncWriteBinding) {
+            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> activeTransaction
+                getReadConcern() >> readConcern
+            }
+        }
+        def callback = new FutureResultCallback()
+
+        if (retryable) {
+            1 * connection.commandAsync(*_) >> {
+                it.last().onResult(null, new MongoSocketException('Some socket error', Stub(ServerAddress)))
+            }
+        }
+
+        if (checkCommand) {
+            1 * connection.commandAsync(*_) >> {
+                assert it[1] == expectedCommand
+                if (it.size() == 10) {
+                    SplittablePayload payload = it[7]
+                    payload.setPosition(payload.getPayload().size())
+                }
+                it.last().onResult(result, null)
+            }
+        } else if (checkSlaveOk) {
+            1 * connection.commandAsync(*_) >> {
+                it[4] == readPreference
+                it.last().onResult(result, null)
+            }
+        }
+
+        0 * connection.commandAsync(_, _, _, _, _, _, _) >> {
+            // Unexpected Command
+            it[5].onResult(result, null)
+        }
+
+        if (retryable) {
+            2 * connection.release()
+        } else {
+            1 * connection.release()
+        }
+
+        if (operation instanceof AsyncReadOperation) {
+            operation.executeAsync(readBinding, callback)
+        } else if (operation instanceof AsyncWriteOperation) {
+            operation.executeAsync(writeBinding, callback)
+        }
+         try {
+             callback.get(1000, TimeUnit.MILLISECONDS)
+         } catch (MongoException e) {
+            throw e.cause
+        }
+    }
+
+    def testSyncRetryableOperationThrows(operation, Queue<List<Integer>> serverVersions, Queue<ServerType> serverTypes,
+                                         Throwable exception) {
+        def serverVersionSize = serverVersions.size()
+        def connection = Mock(Connection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> {
+                    getMaxWireVersionForServerVersion(serverVersions.poll())
+                }
+                getServerType() >> {
+                    serverTypes.poll()
+                }
+            }
+        }
+
+        def connectionSource = Stub(ConnectionSource) {
+            getConnection() >> {
+                if (serverVersions.isEmpty()){
+                    throw new MongoSocketOpenException('No Server', new ServerAddress(), new Exception('no server'))
+                } else {
+                    connection
+                }
+            }
+        }
+        def writeBinding = Stub(WriteBinding) {
+            getWriteConnectionSource() >> connectionSource
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+
+        1 * connection.command(*_) >> { throw exception }
+
+        if (serverVersionSize == 1) {
+            1 * connection.release()
+        } else {
+            2 * connection.release()
+        }
+        operation.execute(writeBinding)
+    }
+
+    def testAyncRetryableOperationThrows(operation, Queue<List<Integer>> serverVersions, Queue<ServerType> serverTypes,
+                                         Throwable exception) {
+        def serverVersionSize = serverVersions.size()
+        def connection = Mock(AsyncConnection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> {
+                    getMaxWireVersionForServerVersion(serverVersions.poll())
+                }
+                getServerType() >> {
+                    serverTypes.poll()
+                }
+            }
+        }
+
+        def connectionSource = Stub(AsyncConnectionSource) {
+            getConnection(_) >> {
+                if (serverVersions.isEmpty()) {
+                    it[0].onResult(null,
+                            new MongoSocketOpenException('No Server', new ServerAddress(), new Exception('no server')))
+                } else {
+                    it[0].onResult(connection, null)
+                }
+            }
+        }
+
+        def writeBinding = Stub(AsyncWriteBinding) {
+            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+        def callback = new FutureResultCallback()
+
+        1 * connection.commandAsync(*_) >> { it.last().onResult(null, exception) }
+        if (serverVersionSize == 1) {
+            1 * connection.release()
+        } else {
+            2 * connection.release()
+        }
+
+        operation.executeAsync(writeBinding, callback)
+        callback.get(1000, TimeUnit.MILLISECONDS)
+    }
+
+    @Shared
+    Collation defaultCollation = Collation.builder()
+            .locale('en')
+            .caseLevel(true)
+            .collationCaseFirst(CollationCaseFirst.OFF)
+            .collationStrength(CollationStrength.IDENTICAL)
+            .numericOrdering(true)
+            .collationAlternate(CollationAlternate.SHIFTED)
+            .collationMaxVariable(CollationMaxVariable.SPACE)
+            .normalization(true)
+            .backwards(true)
+            .build()
+
+    @Shared
+    Collation caseInsensitiveCollation = Collation.builder()
+            .locale('en')
+            .collationStrength(CollationStrength.SECONDARY)
+            .build()
+
+    static final FieldNameValidator NO_OP_FIELD_NAME_VALIDATOR = new NoOpFieldNameValidator()
+
+    static boolean serverVersionIsGreaterThan(List<Integer> actualVersion, List<Integer> minVersion) {
+        new ServerVersion(actualVersion).compareTo(new ServerVersion(minVersion)) >= 0
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/binding/AsyncSessionBinding.java b/driver-core/src/test/functional/com/mongodb/binding/AsyncSessionBinding.java
new file mode 100644
index 00000000000..e25615632e7
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/binding/AsyncSessionBinding.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.binding;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.session.SessionContext;
+
+import static org.bson.assertions.Assertions.notNull;
+
+public final class AsyncSessionBinding implements AsyncReadWriteBinding {
+
+    private final AsyncReadWriteBinding wrapped;
+    private final SessionContext sessionContext;
+
+    public AsyncSessionBinding(final AsyncReadWriteBinding wrapped) {
+        this.wrapped = notNull("wrapped", wrapped);
+        this.sessionContext = new SimpleSessionContext();
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return wrapped.getReadPreference();
+    }
+
+    @Override
+    public void getWriteConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        wrapped.getWriteConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(new SessionBindingAsyncConnectionSource(result), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public SessionContext getSessionContext() {
+        return sessionContext;
+    }
+
+    @Override
+    public void getReadConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
+        wrapped.getReadConnectionSource(new SingleResultCallback<AsyncConnectionSource>() {
+            @Override
+            public void onResult(final AsyncConnectionSource result, final Throwable t) {
+                if (t != null) {
+                    callback.onResult(null, t);
+                } else {
+                    callback.onResult(new SessionBindingAsyncConnectionSource(result), null);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public AsyncReadWriteBinding retain() {
+        return wrapped.retain();
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+    }
+
+    private class SessionBindingAsyncConnectionSource implements AsyncConnectionSource {
+        private AsyncConnectionSource wrapped;
+
+        SessionBindingAsyncConnectionSource(final AsyncConnectionSource wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public ServerDescription getServerDescription() {
+            return wrapped.getServerDescription();
+        }
+
+        @Override
+        public SessionContext getSessionContext() {
+            return sessionContext;
+        }
+
+        @Override
+        public void getConnection(final SingleResultCallback<AsyncConnection> callback) {
+            wrapped.getConnection(callback);
+        }
+
+        @Override
+        public int getCount() {
+            return wrapped.getCount();
+        }
+
+        @Override
+        public AsyncConnectionSource retain() {
+            return wrapped.retain();
+        }
+
+        @Override
+        public void release() {
+            wrapped.release();
+        }
+    }
+
+    public AsyncReadWriteBinding getWrapped() {
+        return wrapped;
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/binding/AsyncSessionBindingSpecification.groovy b/driver-core/src/test/functional/com/mongodb/binding/AsyncSessionBindingSpecification.groovy
new file mode 100644
index 00000000000..243adb8f462
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/binding/AsyncSessionBindingSpecification.groovy
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.binding
+
+import com.mongodb.async.SingleResultCallback
+import spock.lang.Specification
+
+class AsyncSessionBindingSpecification extends Specification {
+
+    def 'should wrap the passed in async binding'() {
+        given:
+        def wrapped = Mock(AsyncReadWriteBinding)
+        def binding = new AsyncSessionBinding(wrapped)
+
+        when:
+        binding.getCount()
+
+        then:
+        1 * wrapped.getCount()
+
+        when:
+        binding.getReadPreference()
+
+        then:
+        1 * wrapped.getReadPreference()
+
+        when:
+        binding.retain()
+
+        then:
+        1 * wrapped.retain()
+
+        when:
+        binding.release()
+
+        then:
+        1 * wrapped.release()
+
+        when:
+        binding.getReadConnectionSource(Stub(SingleResultCallback))
+
+        then:
+        1 * wrapped.getReadConnectionSource(_)
+
+        when:
+        binding.getWriteConnectionSource(Stub(SingleResultCallback))
+
+        then:
+        1 * wrapped.getWriteConnectionSource(_)
+
+        when:
+        def context = binding.getSessionContext()
+
+        then:
+        0 * wrapped.getSessionContext()
+        context instanceof SimpleSessionContext
+    }
+
+}
diff --git a/driver-core/src/test/functional/com/mongodb/binding/AsyncSingleConnectionBinding.java b/driver-core/src/test/functional/com/mongodb/binding/AsyncSingleConnectionBinding.java
index 5c0e88600cf..83309ab67ce 100644
--- a/driver-core/src/test/functional/com/mongodb/binding/AsyncSingleConnectionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/binding/AsyncSingleConnectionBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,11 @@
 import com.mongodb.connection.Cluster;
 import com.mongodb.connection.Server;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.AbstractReferenceCounted;
+import com.mongodb.internal.connection.NoOpSessionContext;
 import com.mongodb.selector.ReadPreferenceServerSelector;
 import com.mongodb.selector.WritableServerSelector;
+import com.mongodb.session.SessionContext;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -148,6 +151,11 @@ public ReadPreference getReadPreference() {
         return readPreference;
     }
 
+    @Override
+    public SessionContext getSessionContext() {
+        return NoOpSessionContext.INSTANCE;
+    }
+
     @Override
     public void getReadConnectionSource(final SingleResultCallback<AsyncConnectionSource> callback) {
         isTrue("open", getCount() > 0);
@@ -188,6 +196,11 @@ public ServerDescription getServerDescription() {
             return server.getDescription();
         }
 
+        @Override
+        public SessionContext getSessionContext() {
+            return NoOpSessionContext.INSTANCE;
+        }
+
         @Override
         public void getConnection(final SingleResultCallback<AsyncConnection> callback) {
             isTrue("open", super.getCount() > 0);
diff --git a/driver-core/src/test/functional/com/mongodb/binding/AsyncSingleConnectionBindingTest.java b/driver-core/src/test/functional/com/mongodb/binding/AsyncSingleConnectionBindingTest.java
deleted file mode 100644
index 577c622b757..00000000000
--- a/driver-core/src/test/functional/com/mongodb/binding/AsyncSingleConnectionBindingTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.binding;
-
-import category.ReplicaSet;
-import com.mongodb.ClusterFixture;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.connection.AsyncConnection;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static com.mongodb.ClusterFixture.getAsyncCluster;
-import static com.mongodb.ClusterFixture.getConnection;
-import static com.mongodb.ClusterFixture.getReadConnectionSource;
-import static com.mongodb.ClusterFixture.getWriteConnectionSource;
-import static com.mongodb.ReadPreference.secondary;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-@Category(ReplicaSet.class)
-@Ignore // Ignoring, since this is test of a test class
-public class AsyncSingleConnectionBindingTest  {
-    private AsyncSingleConnectionBinding binding;
-
-    @Before
-    public void setUp() {
-        binding = new AsyncSingleConnectionBinding(getAsyncCluster(), ClusterFixture.TIMEOUT, SECONDS);
-    }
-
-    @After
-    public void tearDown() {
-        binding.release();
-    }
-
-    @Test
-    public void shouldReturnTheSameConnection() throws Throwable {
-        AsyncConnectionSource asyncConnectionSource = getReadConnectionSource(binding);
-        AsyncConnection asyncConnection = getConnection(asyncConnectionSource);
-
-        // Check we get the same connection
-        for (int i = 0; i < 100; i++) {
-            AsyncConnectionSource connectionSource = getReadConnectionSource(binding);
-            AsyncConnection connection = getConnection(connectionSource);
-            assertEquals(connection.getDescription().getConnectionId(), asyncConnection.getDescription().getConnectionId());
-            connection.release();
-            connectionSource.release();
-        }
-
-        asyncConnection.release();
-        asyncConnectionSource.release();
-    }
-
-    @Test
-    public void shouldHaveTheSameConnectionForReadsAndWritesWithPrimaryReadPreference() throws Throwable {
-        AsyncConnectionSource writeSource = getWriteConnectionSource(binding);
-        AsyncConnection writeConnection = getConnection(writeSource);
-
-        AsyncConnectionSource readSource = getReadConnectionSource(binding);
-        AsyncConnection readConnection = getConnection(readSource);
-        assertEquals(writeConnection.getDescription().getConnectionId(), readConnection.getDescription().getConnectionId());
-
-        writeConnection.release();
-        readConnection.release();
-        writeSource.release();
-        readSource.release();
-    }
-
-    @Test
-    public void shouldNotDevourAllConnections() throws Throwable {
-        for (int i = 0; i < 250; i++) {
-            AsyncSingleConnectionBinding binding = new AsyncSingleConnectionBinding(getAsyncCluster(), ClusterFixture.TIMEOUT, SECONDS);
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getWriteConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getWriteConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            binding.release();
-        }
-    }
-
-    @Test
-    public void shouldHaveTheDifferentConnectionForReadsAndWritesWithNonPrimaryReadPreference() throws Throwable {
-        AsyncSingleConnectionBinding binding = new AsyncSingleConnectionBinding(getAsyncCluster(), secondary(), ClusterFixture.TIMEOUT,
-                                                                                SECONDS);
-        AsyncConnectionSource writeSource = getWriteConnectionSource(binding);
-        AsyncConnection writeConnection = getConnection(writeSource);
-
-        AsyncConnectionSource readSource = getReadConnectionSource(binding);
-        AsyncConnection readConnection = getConnection(readSource);
-        assertThat(writeConnection.getDescription().getConnectionId(), is(not(readConnection.getDescription().getConnectionId())));
-
-        writeConnection.release();
-        readConnection.release();
-        writeSource.release();
-        readSource.release();
-        binding.release();
-    }
-
-    @Test
-    public void shouldNotDevourAllConnectionsWhenUsingNonPrimaryReadPreference() throws Throwable {
-        for (int i = 0; i < 500; i++) {
-            AsyncSingleConnectionBinding binding = new AsyncSingleConnectionBinding(getAsyncCluster(), secondary(), ClusterFixture.TIMEOUT,
-                                                                                    SECONDS);
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getWriteConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getWriteConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            getAndReleaseConnectionSourceAndConnection(getReadConnectionSource(binding));
-            binding.release();
-        }
-    }
-
-    private void getAndReleaseConnectionSourceAndConnection(final AsyncConnectionSource connectionSource) {
-        connectionSource.getConnection(new SingleResultCallback<AsyncConnection>() {
-            @Override
-            public void onResult(final AsyncConnection connection, final Throwable t) {
-                connection.release();
-                connectionSource.release();
-            }
-        });
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/binding/SessionBinding.java b/driver-core/src/test/functional/com/mongodb/binding/SessionBinding.java
new file mode 100644
index 00000000000..fbe898a0ca0
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/binding/SessionBinding.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.binding;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.session.SessionContext;
+
+import static org.bson.assertions.Assertions.notNull;
+
+public class SessionBinding implements ReadWriteBinding {
+    private final ReadWriteBinding wrapped;
+    private final SessionContext sessionContext;
+
+    public SessionBinding(final ReadWriteBinding wrapped) {
+        this.wrapped = notNull("wrapped", wrapped);
+        this.sessionContext = new SimpleSessionContext();
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return wrapped.getReadPreference();
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public ReadWriteBinding retain() {
+        wrapped.retain();
+        return this;
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+    }
+
+    @Override
+    public ConnectionSource getReadConnectionSource() {
+        return new SessionBindingConnectionSource(wrapped.getReadConnectionSource());
+    }
+
+    @Override
+    public SessionContext getSessionContext() {
+        return sessionContext;
+    }
+
+    @Override
+    public ConnectionSource getWriteConnectionSource() {
+        return new SessionBindingConnectionSource(wrapped.getWriteConnectionSource());
+    }
+
+    private class SessionBindingConnectionSource implements ConnectionSource {
+        private ConnectionSource wrapped;
+
+        SessionBindingConnectionSource(final ConnectionSource wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public ServerDescription getServerDescription() {
+            return wrapped.getServerDescription();
+        }
+
+        @Override
+        public SessionContext getSessionContext() {
+            return sessionContext;
+        }
+
+        @Override
+        public Connection getConnection() {
+            return wrapped.getConnection();
+        }
+
+        @Override
+        public ConnectionSource retain() {
+            wrapped = wrapped.retain();
+            return this;
+        }
+
+        @Override
+        public int getCount() {
+            return wrapped.getCount();
+        }
+
+        @Override
+        public void release() {
+            wrapped.release();
+        }
+    }
+
+    public ReadWriteBinding getWrapped() {
+        return wrapped;
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/binding/SimpleSessionContext.java b/driver-core/src/test/functional/com/mongodb/binding/SimpleSessionContext.java
new file mode 100644
index 00000000000..fb91269d209
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/binding/SimpleSessionContext.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.binding;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.BsonTimestamp;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.UuidCodec;
+
+import java.util.UUID;
+
+class SimpleSessionContext implements SessionContext {
+    private final BsonDocument sessionId;
+    private BsonTimestamp operationTime;
+    private long counter;
+    private BsonDocument clusterTime;
+
+    SimpleSessionContext() {
+        this.sessionId = createNewServerSessionIdentifier();
+    }
+
+    @Override
+    public boolean hasSession() {
+        return true;
+    }
+
+    @Override
+    public boolean isImplicitSession() {
+        return true;
+    }
+
+    @Override
+    public BsonDocument getSessionId() {
+        return sessionId;
+    }
+
+    @Override
+    public boolean isCausallyConsistent() {
+        return false;
+    }
+
+    @Override
+    public long getTransactionNumber() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long advanceTransactionNumber() {
+        counter++;
+        return counter;
+    }
+
+    @Override
+    public boolean notifyMessageSent() {
+        return false;
+    }
+
+    @Override
+    public BsonTimestamp getOperationTime() {
+        return operationTime;
+    }
+
+    @Override
+    public void advanceOperationTime(final BsonTimestamp operationTime) {
+        this.operationTime = operationTime;
+    }
+
+    @Override
+    public BsonDocument getClusterTime() {
+        return clusterTime;
+    }
+
+    @Override
+    public void advanceClusterTime(final BsonDocument clusterTime) {
+        this.clusterTime = clusterTime;
+    }
+
+    @Override
+    public boolean hasActiveTransaction() {
+        return false;
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return ReadConcern.DEFAULT;
+    }
+
+    @Override
+    public void setRecoveryToken(final BsonDocument recoveryToken) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void unpinServerAddress() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void markSessionDirty() {
+    }
+
+    @Override
+    public boolean isSessionMarkedDirty() {
+        return false;
+    }
+
+    private static BsonDocument createNewServerSessionIdentifier() {
+        UuidCodec uuidCodec = new UuidCodec(UuidRepresentation.STANDARD);
+        BsonDocument holder = new BsonDocument();
+        BsonDocumentWriter bsonDocumentWriter = new BsonDocumentWriter(holder);
+        bsonDocumentWriter.writeStartDocument();
+        bsonDocumentWriter.writeName("id");
+        uuidCodec.encode(bsonDocumentWriter, UUID.randomUUID(), EncoderContext.builder().build());
+        bsonDocumentWriter.writeEndDocument();
+        return holder;
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/binding/SingleConnectionBinding.java b/driver-core/src/test/functional/com/mongodb/binding/SingleConnectionBinding.java
index b68de100d58..dcc4b794acf 100644
--- a/driver-core/src/test/functional/com/mongodb/binding/SingleConnectionBinding.java
+++ b/driver-core/src/test/functional/com/mongodb/binding/SingleConnectionBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,10 @@
 import com.mongodb.connection.Connection;
 import com.mongodb.connection.Server;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.connection.NoOpSessionContext;
 import com.mongodb.selector.ReadPreferenceServerSelector;
 import com.mongodb.selector.WritableServerSelector;
+import com.mongodb.session.SessionContext;
 
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.assertions.Assertions.isTrue;
@@ -102,6 +104,11 @@ public ConnectionSource getReadConnectionSource() {
         }
     }
 
+    @Override
+    public SessionContext getSessionContext() {
+        return NoOpSessionContext.INSTANCE;
+    }
+
     @Override
     public ConnectionSource getWriteConnectionSource() {
         isTrue("open", getCount() > 0);
@@ -113,7 +120,7 @@ private final class SingleConnectionSource implements ConnectionSource {
         private final Server server;
         private int count = 1;
 
-        public SingleConnectionSource(final Server server, final Connection connection) {
+        SingleConnectionSource(final Server server, final Connection connection) {
             this.server = server;
             this.connection = connection;
             SingleConnectionBinding.this.retain();
@@ -124,6 +131,11 @@ public ServerDescription getServerDescription() {
             return server.getDescription();
         }
 
+        @Override
+        public SessionContext getSessionContext() {
+            return NoOpSessionContext.INSTANCE;
+        }
+
         @Override
         public Connection getConnection() {
             isTrue("open", getCount() > 0);
diff --git a/driver-core/src/test/functional/com/mongodb/binding/SingleConnectionBindingTest.java b/driver-core/src/test/functional/com/mongodb/binding/SingleConnectionBindingTest.java
deleted file mode 100644
index 21e9a96fb19..00000000000
--- a/driver-core/src/test/functional/com/mongodb/binding/SingleConnectionBindingTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.binding;
-
-import category.ReplicaSet;
-import com.mongodb.connection.Connection;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import static com.mongodb.ClusterFixture.getCluster;
-import static com.mongodb.ReadPreference.secondary;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-@Category(ReplicaSet.class)
-@Ignore // Ignoring, since this is test of a test class
-public class SingleConnectionBindingTest  {
-    private SingleConnectionBinding binding;
-
-    @Before
-    public void setUp() {
-        binding = new SingleConnectionBinding(getCluster());
-    }
-
-    @After
-    public void tearDown() {
-        binding.release();
-    }
-
-    @Test
-    public void shouldReturnTheSameConnection() throws InterruptedException {
-        ConnectionSource connectionSource = binding.getReadConnectionSource();
-        Connection connection = connectionSource.getConnection();
-
-        // Check we get the same connection
-        for (int i = 0; i < 100; i++) {
-            ConnectionSource connSource = binding.getReadConnectionSource();
-            Connection conn = connSource.getConnection();
-            assertEquals(connection.getDescription().getConnectionId(), connection.getDescription().getConnectionId());
-            conn.release();
-            connSource.release();
-        }
-
-        connection.release();
-        connectionSource.release();
-    }
-
-    @Test
-    public void shouldHaveTheSameConnectionForReadsAndWritesWithPrimaryReadPreference() throws InterruptedException {
-        ConnectionSource writeSource = binding.getWriteConnectionSource();
-        Connection writeConnection = writeSource.getConnection();
-
-        ConnectionSource readSource = binding.getReadConnectionSource();
-        Connection readConnection = readSource.getConnection();
-        assertEquals(writeConnection.getDescription().getConnectionId(), readConnection.getDescription().getConnectionId());
-
-        writeConnection.release();
-        readConnection.release();
-        writeSource.release();
-        readSource.release();
-    }
-
-    @Test
-    public void shouldNotDevourAllConnections() {
-        for (int i = 0; i < 250; i++) {
-            SingleConnectionBinding binding = new SingleConnectionBinding(getCluster());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getWriteConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getWriteConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            binding.release();
-        }
-    }
-
-    @Test
-    public void shouldHaveTheDifferentConnectionForReadsAndWritesWithNonPrimaryReadPreference() throws InterruptedException {
-        // given
-        SingleConnectionBinding binding = new SingleConnectionBinding(getCluster(), secondary());
-        ConnectionSource writeSource = binding.getWriteConnectionSource();
-        Connection writeConnection = writeSource.getConnection();
-
-        ConnectionSource readSource = binding.getReadConnectionSource();
-        Connection readConnection = readSource.getConnection();
-
-        // expect
-        assertThat(writeConnection.getDescription().getConnectionId(), is(not(readConnection.getDescription().getConnectionId())));
-
-        // cleanup
-        writeConnection.release();
-        readConnection.release();
-        writeSource.release();
-        readSource.release();
-        binding.release();
-    }
-
-    @Test
-    public void shouldNotDevourAllConnectionsWhenUsingNonPrimaryReadPreference() {
-        for (int i = 0; i < 500; i++) {
-            SingleConnectionBinding binding = new SingleConnectionBinding(getCluster(), secondary());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getWriteConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getWriteConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            getAndReleaseConnectionSourceAndConnection(binding.getReadConnectionSource());
-            binding.release();
-        }
-    }
-
-    private void getAndReleaseConnectionSourceAndConnection(final ConnectionSource connectionSource) {
-        connectionSource.getConnection().release();
-        connectionSource.release();
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/client/CommandMonitoringTestHelper.java b/driver-core/src/test/functional/com/mongodb/client/CommandMonitoringTestHelper.java
new file mode 100644
index 00000000000..bff39837081
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/client/CommandMonitoringTestHelper.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.ClusterFixture;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.event.CommandFailedEvent;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.event.CommandSucceededEvent;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.BsonDouble;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistries;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.client.CrudTestHelper.replaceTypeAssertionWithActual;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public final class CommandMonitoringTestHelper {
+    private static final CodecRegistry CODEC_REGISTRY_HACK = CodecRegistries.fromProviders(new BsonValueCodecProvider(),
+            new CodecProvider() {
+                @Override
+                @SuppressWarnings("unchecked")
+                public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
+                    // Use BsonDocumentCodec even for a private sub-class of BsonDocument
+                    if (BsonDocument.class.isAssignableFrom(clazz)) {
+                        return (Codec<T>) new BsonDocumentCodec(registry);
+                    }
+                    return null;
+                }
+            });
+
+    public static List<CommandEvent> getExpectedEvents(final BsonArray expectedEventDocuments, final String databaseName,
+                                                       final BsonDocument operation) {
+        List<CommandEvent> expectedEvents = new ArrayList<CommandEvent>(expectedEventDocuments.size());
+        for (BsonValue expectedEventDocument : expectedEventDocuments) {
+            BsonDocument curExpectedEventDocument = expectedEventDocument.asDocument();
+            String eventType = curExpectedEventDocument.keySet().iterator().next();
+            BsonDocument eventDescriptionDocument = curExpectedEventDocument.getDocument(eventType);
+            CommandEvent commandEvent;
+            String commandName = eventDescriptionDocument.getString("command_name", new BsonString("")).getValue();
+            if (eventType.equals("command_started_event")) {
+                BsonDocument commandDocument = eventDescriptionDocument.getDocument("command");
+                String actualDatabaseName = databaseName;
+                // If the spec test supplies a $db field in the command, then use that database.
+                if (commandDocument.containsKey("$db")) {
+                    actualDatabaseName = commandDocument.getString("$db").getValue();
+                }
+                else if (commandName.equals("commitTransaction") || commandName.equals("abortTransaction")) {
+                    actualDatabaseName = "admin";
+                } else if (commandName.equals("")) {
+                    commandName = commandDocument.keySet().iterator().next();
+                }
+                // Not clear whether these global fields should be included, but also not clear how to efficiently exclude them
+                if (ClusterFixture.serverVersionAtLeast(3, 6)) {
+                    commandDocument.put("$db", new BsonString(actualDatabaseName));
+                    if (operation != null && operation.containsKey("read_preference")) {
+                        commandDocument.put("$readPreference", operation.getDocument("read_preference"));
+                    }
+                }
+                commandEvent = new CommandStartedEvent(1, null, actualDatabaseName, commandName,
+                        commandDocument);
+            } else if (eventType.equals("command_succeeded_event")) {
+                BsonDocument replyDocument = eventDescriptionDocument.get("reply").asDocument();
+                commandEvent = new CommandSucceededEvent(1, null, commandName, replyDocument, 1);
+
+            } else if (eventType.equals("command_failed_event")) {
+                commandEvent = new CommandFailedEvent(1, null, commandName, 1, null);
+            } else {
+                throw new UnsupportedOperationException("Unsupported command event type: " + eventType);
+            }
+            expectedEvents.add(commandEvent);
+        }
+        return expectedEvents;
+    }
+
+    static boolean isWriteCommand(final String commandName) {
+        return asList("insert", "update", "delete").contains(commandName);
+    }
+
+    public static void assertEventsEquality(final List<CommandEvent> expectedEvents, final List<CommandEvent> events) {
+        assertEventsEquality(expectedEvents, events, null);
+    }
+
+    public static void assertEventsEquality(final List<CommandEvent> expectedEvents, final List<CommandEvent> events,
+                                            @Nullable final Map<String, BsonDocument> lsidMap) {
+        assertEquals(expectedEvents.size(), events.size());
+
+        for (int i = 0; i < events.size(); i++) {
+            CommandEvent actual = events.get(i);
+            CommandEvent expected = expectedEvents.get(i);
+
+            assertEquals(expected.getClass(), actual.getClass());
+            assertEquals(expected.getCommandName().toLowerCase(), actual.getCommandName().toLowerCase());
+
+            if (actual.getClass().equals(CommandStartedEvent.class)) {
+                CommandStartedEvent expectedCommandStartedEvent = massageExpectedCommandStartedEvent((CommandStartedEvent) expected,
+                        (CommandStartedEvent) actual, lsidMap);
+                CommandStartedEvent actualCommandStartedEvent = massageActualCommandStartedEvent((CommandStartedEvent) actual,
+                        lsidMap, expectedCommandStartedEvent);
+
+                assertEquals(expectedCommandStartedEvent.getDatabaseName(), actualCommandStartedEvent.getDatabaseName());
+                assertEquals(expectedCommandStartedEvent.getCommand(), actualCommandStartedEvent.getCommand());
+                if (((CommandStartedEvent) expected).getCommand().containsKey("recoveryToken")) {
+                    if (((CommandStartedEvent) expected).getCommand().get("recoveryToken").isNull()) {
+                        assertFalse(((CommandStartedEvent) actual).getCommand().containsKey("recoveryToken"));
+                    } else {
+                        assertTrue(((CommandStartedEvent) actual).getCommand().containsKey("recoveryToken"));
+                    }
+                }
+
+            } else if (actual.getClass().equals(CommandSucceededEvent.class)) {
+                CommandSucceededEvent actualCommandSucceededEvent = massageActualCommandSucceededEvent((CommandSucceededEvent) actual);
+                CommandSucceededEvent expectedCommandSucceededEvent = massageExpectedCommandSucceededEvent((CommandSucceededEvent)
+                                                                                                           expected);
+
+                assertEquals(expectedCommandSucceededEvent.getCommandName(), actualCommandSucceededEvent.getCommandName());
+                assertTrue(actualCommandSucceededEvent.getElapsedTime(TimeUnit.NANOSECONDS) > 0);
+
+                if (expectedCommandSucceededEvent.getResponse() == null) {
+                    assertNull(actualCommandSucceededEvent.getResponse());
+                } else {
+                    assertTrue(String.format("\nExpected: %s\nActual:   %s",
+                                             expectedCommandSucceededEvent.getResponse(),
+                                             actualCommandSucceededEvent.getResponse()),
+                              actualCommandSucceededEvent.getResponse().entrySet()
+                                                          .containsAll(expectedCommandSucceededEvent.getResponse().entrySet()));
+                }
+            } else if (actual.getClass().equals(CommandFailedEvent.class)) {
+                // nothing else to assert here
+            } else {
+                throw new UnsupportedOperationException("Unsupported event type: " + actual.getClass());
+            }
+        }
+    }
+
+    private static CommandSucceededEvent massageExpectedCommandSucceededEvent(final CommandSucceededEvent expected) {
+        // massage numbers that are the wrong BSON type
+        expected.getResponse().put("ok", new BsonDouble(expected.getResponse().getNumber("ok").doubleValue()));
+        return expected;
+    }
+
+    private static CommandSucceededEvent massageActualCommandSucceededEvent(final CommandSucceededEvent actual) {
+        BsonDocument response = getWritableCloneOfCommand(actual.getResponse());
+
+        // massage numbers that are the wrong BSON type
+        response.put("ok", new BsonDouble(response.getNumber("ok").doubleValue()));
+        if (response.containsKey("n")) {
+            response.put("n", new BsonInt32(response.getNumber("n").intValue()));
+        }
+
+        if (actual.getCommandName().equals("find") || actual.getCommandName().equals("getMore")) {
+            if (response.containsKey("cursor")) {
+                if (response.getDocument("cursor").containsKey("id")
+                    && !response.getDocument("cursor").getInt64("id").equals(new BsonInt64(0))) {
+                    response.getDocument("cursor").put("id", new BsonInt64(42));
+                }
+            }
+        } else if (actual.getCommandName().equals("killCursors")) {
+            response.getArray("cursorsUnknown").set(0, new BsonInt64(42));
+        } else if (isWriteCommand(actual.getCommandName())) {
+            if (response.containsKey("writeErrors")) {
+                for (BsonValue bsonValue : response.getArray("writeErrors")) {
+                    BsonDocument cur = bsonValue.asDocument();
+                    BsonDocument newWriteErrorDocument =
+                            new BsonDocument().append("index", cur.get("index"))
+                                    .append("code", new BsonInt32(42))
+                                    .append("errmsg", new BsonString(""));
+                    cur.clear();
+                    cur.putAll(newWriteErrorDocument);
+                }
+            }
+            if (actual.getCommandName().equals("update")) {
+                response.remove("nModified");
+            }
+        }
+        return new CommandSucceededEvent(actual.getRequestId(), actual.getConnectionDescription(), actual.getCommandName(), response,
+                actual.getElapsedTime(TimeUnit.NANOSECONDS));
+    }
+
+    private static CommandStartedEvent massageActualCommandStartedEvent(final CommandStartedEvent event,
+                                                                        @Nullable final Map<String, BsonDocument> lsidMap,
+                                                                        final CommandStartedEvent expectedCommandStartedEvent) {
+        BsonDocument command = getWritableCloneOfCommand(event.getCommand());
+
+        massageCommand(event, command);
+
+        if (command.containsKey("readConcern") && (command.getDocument("readConcern").containsKey("afterClusterTime"))) {
+            command.getDocument("readConcern").put("afterClusterTime", new BsonInt32(42));
+        }
+
+        massageActualCommand(command, expectedCommandStartedEvent.getCommand());
+
+        return new CommandStartedEvent(event.getRequestId(), event.getConnectionDescription(), event.getDatabaseName(),
+                event.getCommandName(), command);
+    }
+
+    private static void massageActualCommand(final BsonDocument command, final BsonDocument expectedCommand) {
+        String[] keySet = command.keySet().toArray(new String[command.keySet().size()]);
+        for (String key : keySet) {
+            if (!expectedCommand.containsKey(key)) {
+                command.remove(key);
+            } else if (command.isDocument(key) && expectedCommand.isDocument(key)) {
+                massageActualCommand(command.getDocument(key), expectedCommand.getDocument(key));
+            }
+        }
+
+    }
+
+    private static CommandStartedEvent massageExpectedCommandStartedEvent(final CommandStartedEvent event,
+                                                                          final CommandStartedEvent actualEvent,
+                                                                          @Nullable final Map<String, BsonDocument> lsidMap) {
+        BsonDocument command = getWritableCloneOfCommand(event.getCommand());
+
+        massageCommand(event, command);
+
+        if (lsidMap == null) {
+            command.remove("lsid");
+        } else if (command.containsKey("lsid")) {
+            command.put("lsid", lsidMap.get(command.getString("lsid").getValue()));
+        }
+
+        if (command.containsKey("txnNumber") && command.isNull("txnNumber")) {
+            command.remove("txnNumber");
+        }
+        if (command.containsKey("stmtId") && command.isNull("stmtId")) {
+            command.remove("stmtId");
+        }
+        if (command.containsKey("startTransaction") && command.isNull("startTransaction")) {
+            command.remove("startTransaction");
+        }
+        if (command.containsKey("autocommit") && command.isNull("autocommit")) {
+            command.remove("autocommit");
+        }
+        if (command.containsKey("maxTimeMS") && command.isNull("maxTimeMS")) {
+            command.remove("maxTimeMS");
+        }
+        if (command.containsKey("writeConcern") && command.isNull("writeConcern")) {
+            command.remove("writeConcern");
+        }
+        if (command.containsKey("readConcern")) {
+            if (command.isNull("readConcern")) {
+                command.remove("readConcern");
+            }
+        }
+        if (command.containsKey("recoveryToken")) {
+            command.remove("recoveryToken");
+        }
+        if (command.containsKey("query")) {
+            command.remove("query");
+        }
+        if (command.containsKey("filter") && command.getDocument("filter").isEmpty()) {
+            command.remove("filter");
+        }
+        if (command.containsKey("mapReduce")) {
+            command.remove("mapReduce");
+        }
+
+        replaceTypeAssertionWithActual(command, actualEvent.getCommand());
+
+        return new CommandStartedEvent(event.getRequestId(), event.getConnectionDescription(), event.getDatabaseName(),
+                event.getCommandName(), command);
+    }
+
+    private static void massageCommand(final CommandStartedEvent event, final BsonDocument command) {
+        if (event.getCommandName().equals("update")) {
+            for (BsonValue bsonValue : command.getArray("updates")) {
+                BsonDocument curUpdate = bsonValue.asDocument();
+                if (!curUpdate.containsKey("multi")) {
+                    curUpdate.put("multi", BsonBoolean.FALSE);
+                }
+                if (!curUpdate.containsKey("upsert")) {
+                    curUpdate.put("upsert", BsonBoolean.FALSE);
+                }
+            }
+        } else if (event.getCommandName().equals("getMore")) {
+            command.put("getMore", new BsonInt64(42));
+        } else if (event.getCommandName().equals("killCursors")) {
+            command.getArray("cursors").set(0, new BsonInt64(42));
+        }
+        command.remove("$clusterTime");
+    }
+
+    private static BsonDocument getWritableCloneOfCommand(final BsonDocument original) {
+        BsonDocument clone = new BsonDocument();
+        BsonDocumentWriter writer = new BsonDocumentWriter(clone);
+        new BsonDocumentCodec(CODEC_REGISTRY_HACK).encode(writer, original, EncoderContext.builder().build());
+        return clone;
+    }
+
+    private CommandMonitoringTestHelper() {
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/client/CrudTestHelper.java b/driver-core/src/test/functional/com/mongodb/client/CrudTestHelper.java
new file mode 100644
index 00000000000..3fc58c38598
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/client/CrudTestHelper.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonType;
+import org.bson.BsonValue;
+
+import static org.junit.Assert.assertEquals;
+
+public final class CrudTestHelper {
+
+    public static void replaceTypeAssertionWithActual(final BsonDocument expected, final BsonDocument actual) {
+        for (String key : expected.keySet()) {
+            BsonValue value = expected.get(key);
+            if (value.isDocument()) {
+                BsonDocument valueDocument = value.asDocument();
+                BsonValue actualValue = actual.get(key);
+                if (valueDocument.size() == 1 && valueDocument.getFirstKey().equals("$$type")) {
+                    String type = valueDocument.getString("$$type").getValue();
+                    if (type.equals("binData")) {
+                        assertEquals(BsonType.BINARY, actualValue.getBsonType());
+                        expected.put(key, actualValue);
+                    } else if (type.equals("long")) {
+                        assertEquals(BsonType.INT64, actualValue.getBsonType());
+                        expected.put(key, actualValue);
+                    } else {
+                        throw new UnsupportedOperationException("Unsupported type: " + type);
+                    }
+                } else if (actualValue != null && actualValue.isDocument()) {
+                    replaceTypeAssertionWithActual(valueDocument, actualValue.asDocument());
+                } else {
+                    throw new RuntimeException(String.format("Expecting '%s' as actual value but found '%s' ", valueDocument, actualValue));
+                }
+            } else if (value.isArray()) {
+                replaceTypeAssertionWithActual(value.asArray(), actual.get(key).asArray());
+            }
+        }
+    }
+
+    private static void replaceTypeAssertionWithActual(final BsonArray expected, final BsonArray actual) {
+        for (int i = 0; i < expected.size(); i++) {
+            BsonValue value = expected.get(i);
+            if (value.isDocument()) {
+                replaceTypeAssertionWithActual(value.asDocument(), actual.get(i).asDocument());
+            } else if (value.isArray()) {
+                replaceTypeAssertionWithActual(value.asArray(), actual.get(i).asArray());
+            }
+        }
+    }
+    private CrudTestHelper() {
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/AggregatesFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/AggregatesFunctionalSpecification.groovy
index f2a3703ae9d..71d59e3d9cc 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/AggregatesFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/AggregatesFunctionalSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,13 +16,15 @@
 
 package com.mongodb.client.model
 
+import com.mongodb.MongoCommandException
 import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
+import org.bson.BsonDocument
+import org.bson.BsonString
 import org.bson.Document
 import org.bson.conversions.Bson
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.isEnterpriseServer
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Accumulators.addToSet
 import static com.mongodb.client.model.Accumulators.avg
@@ -32,21 +36,35 @@ import static com.mongodb.client.model.Accumulators.push
 import static com.mongodb.client.model.Accumulators.stdDevPop
 import static com.mongodb.client.model.Accumulators.stdDevSamp
 import static com.mongodb.client.model.Accumulators.sum
+import static com.mongodb.client.model.Aggregates.addFields
+import static com.mongodb.client.model.Aggregates.bucket
+import static com.mongodb.client.model.Aggregates.bucketAuto
+import static com.mongodb.client.model.Aggregates.count
+import static com.mongodb.client.model.Aggregates.facet
+import static com.mongodb.client.model.Aggregates.graphLookup
 import static com.mongodb.client.model.Aggregates.group
 import static com.mongodb.client.model.Aggregates.limit
 import static com.mongodb.client.model.Aggregates.lookup
 import static com.mongodb.client.model.Aggregates.match
+import static com.mongodb.client.model.Aggregates.merge
 import static com.mongodb.client.model.Aggregates.out
 import static com.mongodb.client.model.Aggregates.project
+import static com.mongodb.client.model.Aggregates.replaceRoot
+import static com.mongodb.client.model.Aggregates.replaceWith
 import static com.mongodb.client.model.Aggregates.sample
 import static com.mongodb.client.model.Aggregates.skip
 import static com.mongodb.client.model.Aggregates.sort
+import static com.mongodb.client.model.Aggregates.sortByCount
 import static com.mongodb.client.model.Aggregates.unwind
+import static com.mongodb.client.model.Filters.eq
 import static com.mongodb.client.model.Filters.exists
+import static com.mongodb.client.model.Filters.expr
 import static com.mongodb.client.model.Projections.computed
+import static com.mongodb.client.model.Projections.exclude
 import static com.mongodb.client.model.Projections.excludeId
 import static com.mongodb.client.model.Projections.fields
 import static com.mongodb.client.model.Projections.include
+import static com.mongodb.client.model.Sorts.ascending
 import static com.mongodb.client.model.Sorts.descending
 import static java.util.Arrays.asList
 import static org.spockframework.util.CollectionUtil.containsAny
@@ -90,6 +108,14 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
                                                                             new Document('_id', 3).append('x', 3).append('c', 'c')]
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$project an exclusion'() {
+        expect:
+        aggregate([project(exclude('a', 'a1', 'z'))]) == [new Document('_id', 1).append('x', 1).append('y', 'a'),
+                                                          new Document('_id', 2).append('x', 2).append('y', 'b'),
+                                                          new Document('_id', 3).append('x', 3).append('y', 'c')]
+    }
+
     def '$sort'() {
         expect:
         aggregate([sort(descending('x'))]) == [c, b, a]
@@ -116,7 +142,7 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
                                                                                   new Document('a', 6)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 10)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def '$unwind with UnwindOptions'() {
         given:
         getCollectionHelper().drop()
@@ -143,8 +169,7 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
         expect:
         aggregate([group(null)]) == [new Document('_id', null)]
 
-        aggregate([group('$z')]) == [new Document('_id', true),
-                                     new Document('_id', false)]
+        aggregate([group('$z')]).containsAll([new Document('_id', true), new Document('_id', false)])
 
         aggregate([group(null, sum('acc', '$x'))]) == [new Document('_id', null).append('acc', 6)]
 
@@ -158,14 +183,13 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
 
         aggregate([group(null, min('acc', '$x'))]) == [new Document('_id', null).append('acc', 1)]
 
-        aggregate([group('$z', push('acc', '$z'))]) == [new Document('_id', true).append('acc', [true, true]),
-                                                        new Document('_id', false).append('acc', [false])]
+        aggregate([group('$z', push('acc', '$z'))]).containsAll([new Document('_id', true).append('acc', [true, true]),
+                                                                 new Document('_id', false).append('acc', [false])])
 
-        aggregate([group('$z', addToSet('acc', '$z'))]) == [new Document('_id', true).append('acc', [true]),
-                                                            new Document('_id', false).append('acc', [false])]
+        aggregate([group('$z', addToSet('acc', '$z'))]).containsAll([new Document('_id', true).append('acc', [true]),
+                                                                     new Document('_id', false).append('acc', [false])])
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def '$out'() {
         given:
         def outCollectionName = getCollectionName() + '.out'
@@ -177,7 +201,93 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
         getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+    @IgnoreIf({ !serverVersionAtLeast(4, 2) })
+    def '$merge'() {
+        given:
+        def outCollectionName = getCollectionName() + '.out'
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName))
+                .createUniqueIndex(new Document('x', 1))
+        getCollectionHelper(new MongoNamespace('db1', outCollectionName)).create()
+
+        when:
+        aggregate([merge(outCollectionName)])
+
+        then:
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
+
+        when:
+        aggregate([merge(new MongoNamespace('db1', outCollectionName))])
+
+        then:
+        getCollectionHelper(new MongoNamespace('db1', outCollectionName)).find() == [a, b, c]
+
+        when:
+        aggregate([merge(outCollectionName, new MergeOptions()
+                .uniqueIdentifier('x')
+                .whenMatched(MergeOptions.WhenMatched.REPLACE)
+                .whenNotMatched(MergeOptions.WhenNotMatched.FAIL))])
+
+        then:
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
+
+        when:
+        aggregate([merge(outCollectionName, new MergeOptions()
+                .uniqueIdentifier('x')
+                .whenMatched(MergeOptions.WhenMatched.KEEP_EXISTING))])
+
+        then:
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
+
+        when:
+        aggregate([merge(outCollectionName, new MergeOptions()
+                .uniqueIdentifier('x')
+                .whenMatched(MergeOptions.WhenMatched.MERGE))])
+
+        then:
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
+
+        when:
+        aggregate([merge(outCollectionName, new MergeOptions()
+                .uniqueIdentifier('x')
+                .whenMatched(MergeOptions.WhenMatched.FAIL))])
+
+        then:
+        thrown(MongoCommandException)
+
+        when:
+        aggregate([merge(outCollectionName, new MergeOptions()
+                .uniqueIdentifier('x')
+                .whenMatched(MergeOptions.WhenMatched.REPLACE)
+                .whenNotMatched(MergeOptions.WhenNotMatched.DISCARD))])
+
+        then:
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
+
+        when:
+        aggregate([merge(outCollectionName, new MergeOptions()
+                .uniqueIdentifier('x')
+                .whenMatched(MergeOptions.WhenMatched.REPLACE)
+                .whenNotMatched(MergeOptions.WhenNotMatched.INSERT))])
+
+        then:
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
+
+        when:
+        aggregate([merge(outCollectionName, new MergeOptions()
+                .uniqueIdentifier('x')
+                .whenMatched(MergeOptions.WhenMatched.PIPELINE)
+                .variables([new Variable<Integer>('b', 1)])
+                .whenMatchedPipeline([addFields([new Field<String>('b', '$$b')])])
+                .whenNotMatched(MergeOptions.WhenNotMatched.FAIL))])
+
+        then:
+        a.append('b', 1)
+        b.append('b', 1)
+        c.append('b', 1)
+        getCollectionHelper(new MongoNamespace(getDatabaseName(), outCollectionName)).find() == [a, b, c]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def '$stdDev'() {
         when:
         def results = aggregate([group(null, stdDevPop('stdDevPop', '$x'), stdDevSamp('stdDevSamp', '$x'))]).first()
@@ -189,14 +299,14 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
         results.get('stdDevSamp') == 1.0
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def '$sample'() {
         expect:
         containsAny([a, b, c], aggregate([sample(1)]).first())
     }
 
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) || !isEnterpriseServer() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def '$lookup'() {
         given:
         def fromCollectionName = 'lookupCollection'
@@ -223,4 +333,593 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
         cleanup:
         fromHelper?.drop()
     }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def '$lookup with pipeline'() {
+        given:
+        def fromCollectionName = 'warehouses'
+        def fromHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), fromCollectionName))
+        def collection = getCollectionHelper()
+
+        collection.drop()
+        fromHelper.drop()
+
+        fromHelper.insertDocuments(
+                Document.parse('{ "_id" : 1, "stock_item" : "abc", warehouse: "A", "instock" : 120 }'),
+                Document.parse('{ "_id" : 2, "stock_item" : "abc", warehouse: "B", "instock" : 60 }'),
+                Document.parse('{ "_id" : 3, "stock_item" : "xyz", warehouse: "B", "instock" : 40 }'),
+                Document.parse('{ "_id" : 4, "stock_item" : "xyz", warehouse: "A", "instock" : 80 }'))
+
+        collection.insertDocuments(
+                Document.parse('{ "_id" : 1, "item" : "abc", "price" : 12, "ordered" : 2 }'),
+                Document.parse('{ "_id" : 2, "item" : "xyz", "price" : 10, "ordered" : 60 }')
+        )
+
+        def let = asList(new Variable('order_item', '$item'), new Variable('order_qty', '$ordered'))
+
+        def  pipeline = asList(
+                match(expr(new Document('$and',
+                        asList( new Document('$eq', asList('$stock_item', '$$order_item')),
+                                new Document('$gte', asList('$instock', '$$order_qty')))))),
+                project(fields(exclude('stock_item'), excludeId())))
+
+        def lookupDoc = lookup(fromCollectionName, let, pipeline, 'stockdata')
+
+        when:
+        def results = aggregate([lookupDoc])
+
+        then:
+        results == [
+                Document.parse('{ "_id" : 1.0, "item" : "abc", "price" : 12.0, "ordered" : 2.0, ' +
+                        '"stockdata" : [ { "warehouse" : "A", "instock" : 120.0 }, { "warehouse" : "B", "instock" : 60.0 } ] }'),
+                Document.parse('{ "_id" : 2.0, "item" : "xyz", "price" : 10.0, "ordered" : 60.0, ' +
+                        '"stockdata" : [ { "warehouse" : "A", "instock" : 80.0 } ] }') ]
+
+        cleanup:
+        fromHelper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def '$lookup with pipeline without variables'() {
+        given:
+        def fromCollectionName = 'holidays'
+        def fromCollection = getCollectionHelper(new MongoNamespace(getDatabaseName(), fromCollectionName))
+        def collection = getCollectionHelper()
+
+        collection.drop()
+        fromCollection.drop()
+
+        fromCollection.insertDocuments(
+                Document.parse('{ "_id" : 1, year: 2018, name: "New Years", date: { $date : "2018-01-01T00:00:00Z"} }'),
+                Document.parse('{ "_id" : 2, year: 2018, name: "Pi Day", date: { $date : "2018-03-14T00:00:00Z" } }'),
+                Document.parse('{ "_id" : 3, year: 2018, name: "Ice Cream Day", date: { $date : "2018-07-15T00:00:00Z"} }'),
+                Document.parse('{ "_id" : 4, year: 2017, name: "New Years", date: { $date : "2017-01-01T00:00:00Z" } }'),
+                Document.parse('{ "_id" : 5, year: 2017, name: "Ice Cream Day", date: { $date : "2017-07-16T00:00:00Z" } }')
+        )
+
+        collection.insertDocuments(
+                Document.parse('''{ "_id" : 1, "student" : "Ann Aardvark",
+                            sickdays: [ { $date : "2018-05-01T00:00:00Z" }, { $date : "2018-08-23T00:00:00Z" } ] }'''),
+                Document.parse('''{ "_id" : 2, "student" : "Zoe Zebra",
+                            sickdays: [ { $date : "2018-02-01T00:00:00Z" }, { $date : "2018-05-23T00:00:00Z" } ] }''')
+        )
+
+        def  pipeline = asList(
+                match(eq('year', 2018)),
+                project(fields(excludeId(), computed('date', fields(computed('name', '$name'), computed('date', '$date'))))),
+                replaceRoot('$date')
+        )
+
+        def lookupDoc = lookup(fromCollectionName, pipeline, 'holidays')
+
+        when:
+        def results = aggregate([lookupDoc])
+
+        then:
+        results == [
+                Document.parse(
+                        '''{ '_id' : 1, 'student' : "Ann Aardvark",
+                        'sickdays' : [ ISODate("2018-05-01T00:00:00Z"), ISODate("2018-08-23T00:00:00Z") ],
+                        'holidays' : [  { 'name' : "New Years", 'date' : ISODate ("2018-01-01T00:00:00Z") },
+                                        { 'name' : "Pi Day", 'date' : ISODate("2018-03-14T00:00:00Z") },
+                                        { 'name' : "Ice Cream Day", 'date' : ISODate("2018-07-15T00:00:00Z") } ] }'''),
+                Document.parse(
+                        '''{ '_id' : 2, 'student' : "Zoe Zebra",
+                        'sickdays' : [ ISODate("2018-02-01T00:00:00Z"), ISODate("2018-05-23T00:00:00Z") ],
+                        'holidays' : [  { 'name' : "New Years", 'date' : ISODate("2018-01-01T00:00:00Z") },
+                                        { 'name' : "Pi Day", 'date' : ISODate("2018-03-14T00:00:00Z") },
+                                        { 'name' : "Ice Cream Day", 'date' : ISODate("2018-07-15T00:00:00Z") } ] }''') ]
+
+        cleanup:
+        fromCollection?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$facet'() {
+        given:
+        def helper = getCollectionHelper()
+
+        helper.drop()
+
+        (0..50).each {
+            def size = (35 + it)
+            def manufacturer = ['Sony', 'Samsung', 'Vizio'][it % 3]
+            helper.insertDocuments(Document.parse("""    {
+                  title: "${manufacturer} ${size} inch HDTV",
+                  attributes: {
+                    "type": "HD",
+                    "screen_size": ${size},
+                    "manufacturer": "${manufacturer}",
+                  }
+                }"""))
+        }
+        def stage = facet(
+                new Facet('Manufacturer',
+                        sortByCount('$attributes.manufacturer'),
+                        limit(5)),
+                new Facet('Screen Sizes',
+                          unwind('$attributes'),
+                          bucketAuto('$attributes.screen_size', 5, new BucketAutoOptions()
+                                  .output(sum('count', 1)))))
+
+        when:
+        def results = aggregate([stage,
+                                 unwind('$Manufacturer'),
+                                 sort(ascending('Manufacturer')),
+                                 group('_id', push('Manufacturer', '$Manufacturer'),
+                                         first('Screen Sizes', '$Screen Sizes')),
+                                 project(excludeId())])
+
+        then:
+        results == [
+            Document.parse(
+                    '''{ 'Manufacturer': [
+                        {'_id': "Samsung", 'count': 17},
+                        {'_id': "Sony", 'count': 17},
+                        {'_id': "Vizio", 'count': 17}
+                    ], 'Screen Sizes': [
+                        {'_id': {'min': 35, 'max': 45}, 'count': 10},
+                        {'_id': {'min': 45, 'max': 55}, 'count': 10},
+                        {'_id': {'min': 55, 'max': 65}, 'count': 10},
+                        {'_id': {'min': 65, 'max': 75}, 'count': 10},
+                        {'_id': {'min': 75, 'max': 85}, 'count': 11}
+                    ]}
+                    '''),
+        ]
+
+        cleanup:
+        helper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$graphLookup'() {
+        given:
+        def fromCollectionName = 'contacts'
+        def fromHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), fromCollectionName))
+
+        fromHelper.drop()
+
+        fromHelper.insertDocuments(Document.parse('{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 1, name: "Anna Jones", friends: ["Bob Smith", "Chris Green", "Joe Lee"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 2, name: "Chris Green", friends: ["Anna Jones", "Bob Smith"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 3, name: "Joe Lee", friends: ["Anna Jones", "Fred Brown"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 4, name: "Fred Brown", friends: ["Joe Lee"] }'))
+
+        def lookupDoc = graphLookup('contacts', new BsonString('$friends'), 'friends', 'name', 'socialNetwork')
+
+        when:
+        def results = fromHelper.aggregate([lookupDoc,
+                                            unwind('$socialNetwork'),
+                                            sort(new Document('_id', 1).append('socialNetwork._id', 1))])
+
+        then:
+        results.subList(0, 5) == [
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"] } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 1, name: "Anna Jones", friends: ["Bob Smith", "Chris Green", "Joe Lee"] } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 2, name: "Chris Green", friends: ["Anna Jones", "Bob Smith"] } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 3, name: "Joe Lee", friends: ["Anna Jones", "Fred Brown" ] } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 4, name: "Fred Brown", friends: ["Joe Lee"] } }''')
+        ]
+
+        cleanup:
+        fromHelper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$graphLookup with depth options'() {
+        given:
+        def fromCollectionName = 'contacts'
+        def fromHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), fromCollectionName))
+
+        fromHelper.drop()
+
+        fromHelper.insertDocuments(Document.parse('{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 1, name: "Anna Jones", friends: ["Bob Smith", "Chris Green", "Joe Lee"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 2, name: "Chris Green", friends: ["Anna Jones", "Bob Smith"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 3, name: "Joe Lee", friends: ["Anna Jones", "Fred Brown"] }'))
+        fromHelper.insertDocuments(Document.parse('{ _id: 4, name: "Fred Brown", friends: ["Joe Lee"] }'))
+
+        def lookupDoc = graphLookup('contacts', new BsonString('$friends'), 'friends', 'name', 'socialNetwork',
+                                    new GraphLookupOptions()
+                                        .maxDepth(1)
+                                        .depthField('depth'))
+
+        when:
+        def results = fromHelper.aggregate([lookupDoc,
+                                            unwind('$socialNetwork'),
+                                            sort(new Document('_id', 1)
+                                                         .append('socialNetwork._id', 1))])
+
+        then:
+        results.subList(0, 4) == [
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], depth:1 } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 1, name: "Anna Jones", friends: ["Bob Smith", "Chris Green", "Joe Lee"], depth:0 } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 2, name: "Chris Green", friends: ["Anna Jones", "Bob Smith"], depth:0 } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"], socialNetwork: {
+                    _id: 3, name: "Joe Lee", friends: ["Anna Jones", "Fred Brown" ], depth:1 } }''')
+        ]
+
+        cleanup:
+        fromHelper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$graphLookup with query filter option'() {
+        given:
+        def fromCollectionName = 'contacts'
+        def fromHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), fromCollectionName))
+
+        fromHelper.drop()
+
+        fromHelper.insertDocuments(
+            Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"],
+                hobbies : ["tennis", "unicycling", "golf"] }'''),
+            Document.parse('''{ _id: 1, name: "Anna Jones", friends: ["Bob Smith", "Chris Green", "Joe Lee"],
+                 hobbies : ["archery", "golf", "woodworking"] }'''),
+            Document.parse('''{ _id: 2, name: "Chris Green", friends: ["Anna Jones", "Bob Smith"],
+                hobbies : ["knitting", "frisbee"] }'''),
+            Document.parse('''{ _id: 3, name: "Joe Lee", friends: ["Anna Jones", "Fred Brown"],
+                hobbies : [ "tennis", "golf", "topiary" ] }'''),
+            Document.parse('''{ _id: 4, name: "Fred Brown", friends: ["Joe Lee"],
+                hobbies : [ "travel", "ceramics", "golf" ] }'''))
+
+
+        def lookupDoc = graphLookup('contacts', new BsonString('$friends'), 'friends', 'name', 'golfers',
+                new GraphLookupOptions()
+                        .restrictSearchWithMatch(eq('hobbies', 'golf')))
+
+        when:
+        def results = fromHelper.aggregate([lookupDoc,
+                                            unwind('$golfers'),
+                                            sort(new Document('_id', 1)
+                                                    .append('golfers._id', 1))])
+
+        then:
+        results.subList(0, 4) == [
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"],
+                        hobbies : ["tennis", "unicycling", "golf"], golfers: {_id: 0, name: "Bob Smith",
+                        friends: ["Anna Jones", "Chris Green"], hobbies : ["tennis", "unicycling", "golf"] } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"],
+                       hobbies: ["tennis", "unicycling", "golf"], golfers:{ _id: 1, name: "Anna Jones",
+                       friends: ["Bob Smith", "Chris Green", "Joe Lee"], hobbies : ["archery", "golf", "woodworking"] } } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"],
+                       hobbies: ["tennis", "unicycling", "golf"], golfers: { _id: 3, name: "Joe Lee",
+                       friends: ["Anna Jones", "Fred Brown"], hobbies : [ "tennis", "golf", "topiary" ] } }'''),
+                Document.parse('''{ _id: 0, name: "Bob Smith", friends: ["Anna Jones", "Chris Green"],
+                       hobbies: ["tennis", "unicycling", "golf"], golfers:{ _id: 4, name: "Fred Brown", friends: ["Joe Lee"],
+                       hobbies : [ "travel", "ceramics", "golf" ] } }''')
+        ]
+
+        cleanup:
+        fromHelper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$bucket'() {
+        given:
+        def helper = getCollectionHelper()
+
+        helper.drop()
+
+        helper.insertDocuments(Document.parse('{screenSize: 30}'))
+        helper.insertDocuments(Document.parse('{screenSize: 24}'))
+        helper.insertDocuments(Document.parse('{screenSize: 42}'))
+        helper.insertDocuments(Document.parse('{screenSize: 22}'))
+        helper.insertDocuments(Document.parse('{screenSize: 55}'))
+        helper.insertDocuments(Document.parse('{screenSize: 155}'))
+        helper.insertDocuments(Document.parse('{screenSize: 75}'))
+
+        def bucket = bucket('$screenSize', [0, 24, 32, 50, 70], new BucketOptions()
+                .defaultBucket('monster')
+                .output(sum('count', 1), push('matches', '$screenSize')))
+
+        when:
+        def results = helper.aggregate([sort(new Document('screenSize', 1)), bucket])
+
+        then:
+        results == [
+                Document.parse('{_id: 0, count: 1, matches: [22]}'),
+                Document.parse('{_id: 24, count: 2, matches: [24, 30]}'),
+                Document.parse('{_id: 32, count: 1, matches: [42]}'),
+                Document.parse('{_id: 50, count: 1, matches: [55]}'),
+                Document.parse('{_id: "monster", count: 2, matches: [75, 155]}')
+        ]
+        cleanup:
+        helper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$bucketAuto'() {
+        given:
+        def helper = getCollectionHelper()
+
+        helper.drop()
+
+        (1..100).each {
+            helper.insertDocuments(Document.parse("{price: ${it * 2}}"))
+        }
+
+        when:
+        def results = helper.aggregate([bucketAuto('$price', 10)])
+
+        then:
+        results[0]._id.min == 2
+        results[0].count == 10
+
+        results[-1]._id.max == 200
+
+        when:
+        results = helper.aggregate([bucketAuto('$price', 7)])
+
+        then:
+        results[0]._id.min == 2
+        results[0].count == 14
+
+        results[-1]._id.max == 200
+        results[-1].count == 16
+
+        cleanup:
+        helper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$bucketAuto with options'() {
+        given:
+        def helper = getCollectionHelper()
+
+        helper.drop()
+
+        (0..2000).each {
+            def document = new Document('price', it * 5.01D)
+            helper.insertDocuments(document)
+        }
+
+        when:
+        def results = helper.aggregate([bucketAuto('$price', 10, new BucketAutoOptions()
+            .granularity(BucketGranularity.POWERSOF2)
+            .output(sum('count', 1), avg('avgPrice', '$price')))])
+
+        then:
+        results.size() == 5
+        results[0].count != null
+        results[0].avgPrice != null
+
+        cleanup:
+        helper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$count'() {
+        given:
+        def helper = getCollectionHelper()
+
+        helper.drop()
+
+        def total = 3
+        def documents = []
+        (1..total).each {
+            documents.add(new BsonDocument())
+        }
+        helper.insertDocuments(documents)
+
+        when:
+        def results = helper.aggregate([count()])
+
+        then:
+        results[0].count == total
+
+        when:
+        results = helper.aggregate([count('count')])
+
+        then:
+        results[0].count == total
+
+        when:
+        results = helper.aggregate([count('total')])
+
+        then:
+        results[0].total == total
+
+        cleanup:
+        helper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$sortByCount'() {
+        given:
+        def helper = getCollectionHelper()
+
+        when:
+        helper.drop()
+
+        helper.insertDocuments(Document.parse('{_id: 0, x: 1}'))
+        helper.insertDocuments(Document.parse('{_id: 2, x: 1}'))
+        helper.insertDocuments(Document.parse('{_id: 3, x: 0}'))
+
+        def results = helper.aggregate([sortByCount('$x')])
+
+        then:
+        results == [Document.parse('{_id: 1, count: 2}'),
+                    Document.parse('{_id: 0, count: 1}')]
+
+        when:
+        helper.drop()
+
+        helper.insertDocuments(Document.parse('{_id: 0, x: 1.4}'))
+        helper.insertDocuments(Document.parse('{_id: 2, x: 1.1}'))
+        helper.insertDocuments(Document.parse('{_id: 3, x: 0.5}'))
+
+        results = helper.aggregate([sortByCount(new Document('$floor', '$x'))])
+
+        then:
+        results == [Document.parse('{_id: 1, count: 2}'),
+                    Document.parse('{_id: 0, count: 1}')]
+
+        cleanup:
+        helper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$addFields'() {
+        given:
+        def helper = getCollectionHelper()
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        def results = helper.aggregate([addFields(new Field('newField', null))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: 1, newField: null}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        results = helper.aggregate([addFields(new Field('newField', 'hello'))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: 1, newField: "hello"}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        results = helper.aggregate([addFields(new Field('b', '$a'))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: 1, b: 1}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        results = helper.aggregate([addFields(new Field('this', '$$CURRENT'))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: 1, this: {_id: 0, a: 1}}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        results = helper.aggregate([addFields(new Field('myNewField',
+                                                        new Document('c', 3).append('d', 4)))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: 1, myNewField: {c: 3, d: 4}}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        results = helper.aggregate([addFields(new Field('alt3', new Document('$lt', asList('$a', 3))))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: 1, alt3: true}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        results = helper.aggregate([addFields(new Field('b', 3), new Field('c', 5))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: 1, b: 3, c: 5}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a: 1}'))
+        results = helper.aggregate([addFields(new Field('a', [1, 2, 3]))])
+
+        then:
+        results == [Document.parse('{_id: 0, a: [1, 2, 3]}')]
+
+        cleanup:
+        helper?.drop()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def '$replaceRoot'() {
+        given:
+        def helper = getCollectionHelper()
+        def results = []
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a1: {b: 1}, a2: 2}'))
+        results = helper.aggregate([replaceRoot('$a1')])
+
+        then:
+        results == [Document.parse('{b: 1}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a1: {b: {c1: 4, c2: 5}}, a2: 2}'))
+        results = helper.aggregate([replaceRoot('$a1.b')])
+
+        then:
+        results == [Document.parse('{c1: 4, c2: 5}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a1: {b: 1, _id: 7}, a2: 2}'))
+        results = helper.aggregate([replaceRoot('$a1')])
+
+        then:
+        results == [Document.parse('{b: 1, _id: 7}')]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 2) })
+    def '$replaceWith'() {
+        given:
+        def helper = getCollectionHelper()
+        def results = []
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a1: {b: 1}, a2: 2}'))
+        results = helper.aggregate([replaceWith('$a1')])
+
+        then:
+        results == [Document.parse('{b: 1}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a1: {b: {c1: 4, c2: 5}}, a2: 2}'))
+        results = helper.aggregate([replaceWith('$a1.b')])
+
+        then:
+        results == [Document.parse('{c1: 4, c2: 5}')]
+
+        when:
+        helper.drop()
+        helper.insertDocuments(Document.parse('{_id: 0, a1: {b: 1, _id: 7}, a2: 2}'))
+        results = helper.aggregate([replaceWith('$a1')])
+
+        then:
+        results == [Document.parse('{b: 1, _id: 7}')]
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/ArrayUpdatesFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/ArrayUpdatesFunctionalSpecification.groovy
index 9fb5c569a93..55ceef36fac 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/ArrayUpdatesFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/ArrayUpdatesFunctionalSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +19,7 @@ package com.mongodb.client.model
 import com.mongodb.OperationFunctionalSpecification
 import org.bson.Document
 import org.bson.conversions.Bson
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Updates.addEachToSet
 import static com.mongodb.client.model.Updates.addToSet
 import static com.mongodb.client.model.Updates.combine
@@ -88,10 +88,8 @@ class ArrayUpdatesFunctionalSpecification extends OperationFunctionalSpecificati
 
         then:
         find() == [new Document('_id', 1).append('x', [1, 2, 3, 4, 4])]
-
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'push with each'() {
         when:
         updateOne(pushEach('x', [4, 4, 4, 5, 6], new PushOptions()))
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/BitwiseUpdatesFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/BitwiseUpdatesFunctionalSpecification.groovy
index b9839869d4e..f138c1a836c 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/BitwiseUpdatesFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/BitwiseUpdatesFunctionalSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +19,7 @@ package com.mongodb.client.model
 import com.mongodb.OperationFunctionalSpecification
 import org.bson.Document
 import org.bson.conversions.Bson
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Updates.bitwiseAnd
 import static com.mongodb.client.model.Updates.bitwiseOr
 import static com.mongodb.client.model.Updates.bitwiseXor
@@ -61,7 +61,6 @@ class BitwiseUpdatesFunctionalSpecification extends OperationFunctionalSpecifica
         find() == [new Document('_id', 1).append('x', NUM | INT_MASK)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'integer bitwiseXor'() {
         when:
         updateOne(bitwiseXor('x', INT_MASK))
@@ -78,7 +77,6 @@ class BitwiseUpdatesFunctionalSpecification extends OperationFunctionalSpecifica
         find() == [new Document('_id', 1).append('x', NUM & LONG_MASK)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })     // a bug in the 2.4 server prevents this test from passing
     def 'long bitwiseOr'() {
         when:
         updateOne(bitwiseOr('x', LONG_MASK))
@@ -87,7 +85,6 @@ class BitwiseUpdatesFunctionalSpecification extends OperationFunctionalSpecifica
         find() == [new Document('_id', 1).append('x', NUM | LONG_MASK)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'long bitwiseXor'() {
         when:
         updateOne(bitwiseXor('x', LONG_MASK))
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/FieldSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/FieldSpecification.groovy
new file mode 100644
index 00000000000..bd029c9e491
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/client/model/FieldSpecification.groovy
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+class FieldSpecification extends Specification {
+    def 'should validate name'() {
+        when:
+        new Field(null, [1, 2, 3])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should accept null values'() {
+        when:
+        def field = new Field('name', null)
+
+        then:
+        field.getName() == 'name'
+        field.getValue() == null
+    }
+
+    def 'should accept properties'() {
+        when:
+        def field = new Field('name', [1, 2, 3])
+
+        then:
+        field.getName() == 'name'
+        field.getValue() == [1, 2, 3]
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/FiltersFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/FiltersFunctionalSpecification.groovy
index 123ab066f42..c250014df04 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/FiltersFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/FiltersFunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,7 +9,7 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
@@ -35,8 +35,10 @@ import static com.mongodb.client.model.Filters.bitsAnySet
 import static com.mongodb.client.model.Filters.elemMatch
 import static com.mongodb.client.model.Filters.eq
 import static com.mongodb.client.model.Filters.exists
+import static com.mongodb.client.model.Filters.expr
 import static com.mongodb.client.model.Filters.gt
 import static com.mongodb.client.model.Filters.gte
+import static com.mongodb.client.model.Filters.jsonSchema
 import static com.mongodb.client.model.Filters.lt
 import static com.mongodb.client.model.Filters.lte
 import static com.mongodb.client.model.Filters.mod
@@ -68,7 +70,6 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
 
     def setup() {
         getCollectionHelper().insertDocuments(a, b, c)
-        getCollectionHelper().createIndex(new Document('y', 'text'))
     }
 
     def 'find'(Bson filter) {
@@ -78,6 +79,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
     def 'eq'() {
         expect:
         find(eq('x', 1)) == [a]
+        find(eq(2)) == [b]
     }
 
     def '$ne'() {
@@ -85,7 +87,6 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(ne('x', 1)) == [b, c]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def '$not'() {
         expect:
         find(not(eq('x', 1))) == [b, c]
@@ -93,7 +94,31 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(not(regex('y', 'a.*'))) == [b, c]
 
         when:
-        find(not(and(eq('x', 1), eq('x', 1)))) == [b, c]
+        def dbref = Document.parse('{$ref: "1", $id: "1"}')
+        def dbrefDoc = new Document('_id', 4).append('dbref', dbref)
+        getCollectionHelper().insertDocuments(dbrefDoc)
+
+        then:
+        find(not(eq('dbref', dbref))) == [a, b, c]
+
+        when:
+        getCollectionHelper().deleteOne(dbrefDoc)
+        dbref.put('$db', '1')
+        dbrefDoc.put('dbref', dbref)
+        getCollectionHelper().insertDocuments(dbrefDoc)
+
+        then:
+        find(not(eq('dbref', dbref))) == [a, b, c]
+
+        when:
+        def subDoc = Document.parse('{x: 1, b: 1}')
+        getCollectionHelper().insertDocuments(new Document('subDoc', subDoc))
+
+        then:
+        find(not(eq('subDoc', subDoc))) == [a, b, c, dbrefDoc]
+
+        when:
+        find(not(and(eq('x', 1), eq('x', 1))))
 
         then:
         thrown MongoQueryException
@@ -194,7 +219,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(size('a', 4)) == [b]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([3, 1, 10]) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should render $bitsAllClear'() {
         when:
         def bitDoc = Document.parse('{_id: 1, bits: 20}')
@@ -205,7 +230,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(bitsAllClear('bits', 35)) == [bitDoc]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([3, 1, 10]) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should render $bitsAllSet'() {
         when:
         def bitDoc = Document.parse('{_id: 1, bits: 54}')
@@ -216,7 +241,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(bitsAllSet('bits', 50)) == [bitDoc]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([3, 1, 10]) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should render $bitsAnyClear'() {
         when:
         def bitDoc = Document.parse('{_id: 1, bits: 50}')
@@ -227,7 +252,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(bitsAnyClear('bits', 20)) == [bitDoc]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([3, 1, 10]) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should render $bitsAnySet'() {
         when:
         def bitDoc = Document.parse('{_id: 1, bits: 20}')
@@ -244,7 +269,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(type('x', BsonType.ARRAY)) == []
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([3, 1, 7]) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should render $type with a string type representation'() {
         expect:
         find(type('x', 'number')) == [a, b, c]
@@ -252,8 +277,10 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
     }
 
     @SuppressWarnings('deprecated')
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'should render $text'() {
+        given:
+        getCollectionHelper().createIndex(new Document('y', 'text'))
+
         when:
         def textDocument = new Document('_id', 4).append('y', 'mongoDB for GIANT ideas')
         collectionHelper.insertDocuments(textDocument)
@@ -264,7 +291,7 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         find(text('GIANT', new TextSearchOptions().language('english'))) == [textDocument]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([3, 1, 8]) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should render $text with 3.2 options'() {
         given:
         collectionHelper.drop()
@@ -295,4 +322,17 @@ class FiltersFunctionalSpecification extends OperationFunctionalSpecification {
         expect:
         find(where('Array.isArray(this.a)')) == [a, b]
     }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def '$expr'() {
+        expect:
+        find(expr(Document.parse('{ $eq: [ "$x" , 3 ] } '))) == [c]
+    }
+
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def '$jsonSchema'() {
+        expect:
+        find(jsonSchema(Document.parse('{ bsonType : "object", properties: { x : {type : "number", minimum : 2} } } '))) == [b, c]
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/GeoFiltersFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/GeoFiltersFunctionalSpecification.groovy
index 4ea67df3c64..ccfcf3712fd 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/GeoFiltersFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/GeoFiltersFunctionalSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +19,7 @@ package com.mongodb.client.model
 import com.mongodb.OperationFunctionalSpecification
 import org.bson.Document
 import org.bson.conversions.Bson
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Filters.geoWithinBox
 import static com.mongodb.client.model.Filters.geoWithinCenter
 import static com.mongodb.client.model.Filters.geoWithinCenterSphere
@@ -51,25 +51,21 @@ class GeoFiltersFunctionalSpecification extends OperationFunctionalSpecification
         find(nearSphere('geo', 1.01d, 1.01d, 0.1d, 0.0d)) == [firstPoint, thirdPoint]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
     def '$geoWithin $box'() {
         expect:
         find(geoWithinBox('geo', 0d, 0d, 4d, 4d)) == [firstPoint, thirdPoint]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
     def '$geoWithin $polygon'() {
         expect:
         find(geoWithinPolygon('geo', [[0d, 0d], [0d, 4d], [4d, 4d], [4d, 0d]])) == [firstPoint, thirdPoint]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
     def '$geoWithin $center'() {
         expect:
         find(geoWithinCenter('geo', 2d, 2d, 4d)) == [firstPoint, thirdPoint]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def '$geoWithin $centerSphere'() {
         expect:
         find(geoWithinCenterSphere('geo', 2d, 2d, 4d)) == [firstPoint, secondPoint, thirdPoint]
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/GeoJsonFiltersFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/GeoJsonFiltersFunctionalSpecification.groovy
index 3e124f2329d..6fb0cc9df95 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/GeoJsonFiltersFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/GeoJsonFiltersFunctionalSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,9 +22,7 @@ import com.mongodb.client.model.geojson.Polygon
 import com.mongodb.client.model.geojson.Position
 import org.bson.Document
 import org.bson.conversions.Bson
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Filters.geoIntersects
 import static com.mongodb.client.model.Filters.geoWithin
 import static com.mongodb.client.model.Filters.near
@@ -47,7 +47,6 @@ class GeoJsonFiltersFunctionalSpecification extends OperationFunctionalSpecifica
         getCollectionHelper().find(filter, new Document('_id', 1)) // sort by _id
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
     def '$geoWithin'() {
         given:
         def polygon = new Polygon([new Position(0d, 0d), new Position(4d, 0d), new Position(4d, 4d), new Position(0d, 4d),
@@ -57,7 +56,6 @@ class GeoJsonFiltersFunctionalSpecification extends OperationFunctionalSpecifica
         find(geoWithin('geo', polygon)) == [firstPoint, secondPoint, thirdPoint]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
     def '$geoIntersects'() {
         given:
         def polygon = new Polygon([new Position(0d, 0d), new Position(4d, 0d), new Position(4d, 4d), new Position(0d, 4d),
@@ -67,13 +65,11 @@ class GeoJsonFiltersFunctionalSpecification extends OperationFunctionalSpecifica
         find(geoIntersects('geo', polygon)) == [firstPoint, secondPoint, thirdPoint, firstPolygon]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
     def '$near'() {
         expect:
         find(near('geo', new Point(new Position(1.01d, 1.01d)), 10000d, null)) == [firstPoint]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
     def '$nearSphere'() {
         expect:
         find(nearSphere('geo', new Point(new Position(1.01d, 1.01d)), 10000d, null)) == [firstPoint]
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy
index 8a82c75d739..cc1f05ce364 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/IndexesFunctionalSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,18 +17,15 @@
 package com.mongodb.client.model
 
 import com.mongodb.OperationFunctionalSpecification
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Indexes.ascending
 import static com.mongodb.client.model.Indexes.compoundIndex
 import static com.mongodb.client.model.Indexes.descending
 import static com.mongodb.client.model.Indexes.geo2d
 import static com.mongodb.client.model.Indexes.geo2dsphere
 import static com.mongodb.client.model.Indexes.geoHaystack
-import static com.mongodb.client.model.Indexes.text
 import static com.mongodb.client.model.Indexes.hashed
-import static java.util.Arrays.asList
+import static com.mongodb.client.model.Indexes.text
 import static org.bson.BsonDocument.parse
 
 class IndexesFunctionalSpecification extends OperationFunctionalSpecification {
@@ -109,7 +106,6 @@ class IndexesFunctionalSpecification extends OperationFunctionalSpecification {
         getCollectionHelper().listIndexes()*.get('key').contains(parse('{x : "geoHaystack", b: -1}'))
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 4, 0)) })
     def 'text'() {
         when:
         getCollectionHelper().createIndex(text('x'))
@@ -118,7 +114,14 @@ class IndexesFunctionalSpecification extends OperationFunctionalSpecification {
         getCollectionHelper().listIndexes()*.get('key').contains(parse('{_fts: "text", _ftsx: 1}'))
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 4, 0)) })
+    def 'text wildcard'() {
+        when:
+        getCollectionHelper().createIndex(text())
+
+        then:
+        getCollectionHelper().listIndexes()*.get('key').contains(parse('{_fts: "text", _ftsx: 1}'))
+    }
+
     def 'hashed'() {
         when:
         getCollectionHelper().createIndex(hashed('x'))
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/ProjectionFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/ProjectionFunctionalSpecification.groovy
index 367b27043c5..f083b20fe30 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/ProjectionFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/ProjectionFunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,22 +9,22 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 package com.mongodb.client.model
 
+
 import com.mongodb.MongoQueryException
 import com.mongodb.OperationFunctionalSpecification
 import org.bson.Document
 import org.bson.conversions.Bson
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Filters.and
 import static com.mongodb.client.model.Filters.eq
+import static com.mongodb.client.model.Filters.text
 import static com.mongodb.client.model.Projections.elemMatch
 import static com.mongodb.client.model.Projections.exclude
 import static com.mongodb.client.model.Projections.excludeId
@@ -34,25 +34,24 @@ import static com.mongodb.client.model.Projections.metaTextScore
 import static com.mongodb.client.model.Projections.slice
 
 class ProjectionFunctionalSpecification extends OperationFunctionalSpecification {
-    def a = new Document('_id', 1).append('x', 1).append('y', [new Document('a', 1).append('b', 2),
+    def a = new Document('_id', 1).append('x', 'coffee').append('y', [new Document('a', 1).append('b', 2),
                                                                new Document('a', 2).append('b', 3),
                                                                new Document('a', 3).append('b', 4)])
-    def aYSlice1 = new Document('_id', 1).append('x', 1).append('y', [new Document('a', 1).append('b', 2)])
-    def aYSlice12 = new Document('_id', 1).append('x', 1).append('y', [new Document('a', 2).append('b', 3),
+    def aYSlice1 = new Document('_id', 1).append('x', 'coffee').append('y', [new Document('a', 1).append('b', 2)])
+    def aYSlice12 = new Document('_id', 1).append('x', 'coffee').append('y', [new Document('a', 2).append('b', 3),
                                                                        new Document('a', 3).append('b', 4)])
-    def aNoY = new Document('_id', 1).append('x', 1)
+    def aNoY = new Document('_id', 1).append('x', 'coffee')
     def aId = new Document('_id', 1)
-    def aNoId = new Document().append('x', 1).append('y', [new Document('a', 1).append('b', 2),
+    def aNoId = new Document().append('x', 'coffee').append('y', [new Document('a', 1).append('b', 2),
                                                            new Document('a', 2).append('b', 3),
                                                            new Document('a', 3).append('b', 4)])
-    def aWithScore = new Document('_id', 1).append('x', 1).append('y', [new Document('a', 1).append('b', 2),
+    def aWithScore = new Document('_id', 1).append('x', 'coffee').append('y', [new Document('a', 1).append('b', 2),
                                                                         new Document('a', 2).append('b', 3),
                                                                         new Document('a', 3).append('b', 4)])
-                                           .append('score', 0.0)
+                                           .append('score', 1.0)
 
     def setup() {
         getCollectionHelper().insertDocuments(a)
-        getCollectionHelper().createIndex(new Document('y', 'text'))
     }
 
     def 'find'(Bson projection) {
@@ -99,10 +98,12 @@ class ProjectionFunctionalSpecification extends OperationFunctionalSpecification
         find(slice('y', 1, 2)) == [aYSlice12]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'metaTextScore'() {
+        given:
+        getCollectionHelper().createIndex(new Document('x', 'text'))
+
         expect:
-        find(metaTextScore('score')) == [aWithScore]
+        find(text('coffee'), metaTextScore('score')) == [aWithScore]
     }
 
     def 'combine fields'() {
@@ -117,4 +118,4 @@ class ProjectionFunctionalSpecification extends OperationFunctionalSpecification
         then:
         thrown(MongoQueryException)
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/SortsFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/SortsFunctionalSpecification.groovy
index a850e28a365..fd78a97fef5 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/SortsFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/SortsFunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,7 +9,7 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
@@ -19,9 +19,7 @@ package com.mongodb.client.model
 import com.mongodb.OperationFunctionalSpecification
 import org.bson.Document
 import org.bson.conversions.Bson
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Sorts.ascending
 import static com.mongodb.client.model.Sorts.descending
 import static com.mongodb.client.model.Sorts.metaTextScore
@@ -39,7 +37,6 @@ class SortsFunctionalSpecification extends OperationFunctionalSpecification {
 
     def setup() {
         getCollectionHelper().insertDocuments(a, b, c)
-        getCollectionHelper().createIndex(new Document('y', 'text'))
     }
 
     def 'find'(Bson sort) {
@@ -64,8 +61,10 @@ class SortsFunctionalSpecification extends OperationFunctionalSpecification {
         find(descending('x', 'y')) == [c, a, b]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'metaTextScore'() {
+        given:
+        getCollectionHelper().createIndex(new Document('y', 'text'))
+
         expect:
         find(metaTextScore('score'), new Document('score', new Document('$meta', 'textScore')))*.containsKey('score')
     }
@@ -76,4 +75,4 @@ class SortsFunctionalSpecification extends OperationFunctionalSpecification {
         find(orderBy(ascending('x'), descending('y'), descending('x'))) == [c, a, b]
     }
 
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/functional/com/mongodb/client/model/UpdatesFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/client/model/UpdatesFunctionalSpecification.groovy
index 7dbf17f74ee..17dfa35c5ec 100644
--- a/driver-core/src/test/functional/com/mongodb/client/model/UpdatesFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/client/model/UpdatesFunctionalSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,18 +20,16 @@ import com.mongodb.OperationFunctionalSpecification
 import org.bson.BsonTimestamp
 import org.bson.Document
 import org.bson.conversions.Bson
-import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Updates.combine
 import static com.mongodb.client.model.Updates.currentDate
 import static com.mongodb.client.model.Updates.currentTimestamp
+import static com.mongodb.client.model.Updates.inc
 import static com.mongodb.client.model.Updates.max
 import static com.mongodb.client.model.Updates.min
 import static com.mongodb.client.model.Updates.mul
 import static com.mongodb.client.model.Updates.rename
 import static com.mongodb.client.model.Updates.set
-import static com.mongodb.client.model.Updates.inc
 import static com.mongodb.client.model.Updates.setOnInsert
 import static com.mongodb.client.model.Updates.unset
 
@@ -65,7 +65,6 @@ class UpdatesFunctionalSpecification extends OperationFunctionalSpecification {
         find() == [new Document('_id', 1).append('x', 5)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'setOnInsert'() {
         when:
         updateOne(setOnInsert('y', 5))
@@ -78,6 +77,18 @@ class UpdatesFunctionalSpecification extends OperationFunctionalSpecification {
 
         then:
         find(new Document('_id', 2)) == [new Document('_id', 2).append('y', 5)]
+
+        when:
+        updateOne(new Document('_id', 3), setOnInsert(Document.parse('{a: 1, b: "two"}')), true)
+
+        then:
+        find(new Document('_id', 3)) == [Document.parse('{_id: 3, a: 1, b: "two"}')]
+
+        when:
+        updateOne(new Document('_id', 3), setOnInsert(null), true)
+
+        then:
+        thrown IllegalArgumentException
     }
 
     def 'unset'() {
@@ -116,7 +127,6 @@ class UpdatesFunctionalSpecification extends OperationFunctionalSpecification {
         find() == [new Document('_id', 1).append('x', 14.4)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'mul'() {
         when:
         updateOne(mul('x', 5))
@@ -137,7 +147,6 @@ class UpdatesFunctionalSpecification extends OperationFunctionalSpecification {
         find() == [new Document('_id', 1).append('x', 87.5)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'min'() {
         when:
         updateOne(min('x', -1))
@@ -146,7 +155,6 @@ class UpdatesFunctionalSpecification extends OperationFunctionalSpecification {
         find() == [new Document('_id', 1).append('x', -1)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'max'() {
         when:
         updateOne(max('x', 5))
@@ -155,7 +163,6 @@ class UpdatesFunctionalSpecification extends OperationFunctionalSpecification {
         find() == [new Document('_id', 1).append('x', 5)]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'currentDate'() {
         when:
         updateOne(currentDate('y'))
diff --git a/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java b/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java
index beaf9ef34ed..634e4c51b56 100644
--- a/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java
+++ b/driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,12 @@
 
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoNamespace;
+import com.mongodb.ServerCursor;
 import com.mongodb.WriteConcern;
 import com.mongodb.binding.AsyncReadWriteBinding;
 import com.mongodb.binding.ReadBinding;
 import com.mongodb.binding.WriteBinding;
+import com.mongodb.bulk.DeleteRequest;
 import com.mongodb.bulk.IndexRequest;
 import com.mongodb.bulk.InsertRequest;
 import com.mongodb.bulk.UpdateRequest;
@@ -32,6 +34,8 @@
 import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider;
 import com.mongodb.operation.AggregateOperation;
 import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.CommandReadOperation;
+import com.mongodb.operation.CommandWriteOperation;
 import com.mongodb.operation.CountOperation;
 import com.mongodb.operation.CreateCollectionOperation;
 import com.mongodb.operation.CreateIndexesOperation;
@@ -41,16 +45,19 @@
 import com.mongodb.operation.InsertOperation;
 import com.mongodb.operation.ListIndexesOperation;
 import com.mongodb.operation.MixedBulkWriteOperation;
+import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWrapper;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
 import org.bson.Document;
 import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.BsonTypeClassMap;
 import org.bson.codecs.BsonValueCodecProvider;
 import org.bson.codecs.Codec;
 import org.bson.codecs.Decoder;
 import org.bson.codecs.DocumentCodec;
 import org.bson.codecs.DocumentCodecProvider;
+import org.bson.codecs.IterableCodecProvider;
 import org.bson.codecs.ValueCodecProvider;
 import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.codecs.configuration.CodecRegistry;
@@ -68,6 +75,7 @@ public final class CollectionHelper<T> {
 
     private Codec<T> codec;
     private CodecRegistry registry = CodecRegistries.fromProviders(new BsonValueCodecProvider(),
+                                                                   new IterableCodecProvider(),
                                                                    new ValueCodecProvider(),
                                                                    new DocumentCodecProvider(),
                                                                    new GeoJsonCodecProvider());
@@ -78,16 +86,28 @@ public CollectionHelper(final Codec<T> codec, final MongoNamespace namespace) {
         this.namespace = namespace;
     }
 
+    public T isMaster() {
+        return new CommandReadOperation<T>("admin", BsonDocument.parse("{isMaster: 1}"), codec).execute(getBinding());
+    }
+
     public static void drop(final MongoNamespace namespace) {
-        new DropCollectionOperation(namespace).execute(getBinding());
+        drop(namespace, WriteConcern.ACKNOWLEDGED);
+    }
+
+    public static void drop(final MongoNamespace namespace, final WriteConcern writeConcern) {
+        new DropCollectionOperation(namespace, writeConcern).execute(getBinding());
     }
 
     public static void dropDatabase(final String name) {
+        dropDatabase(name, WriteConcern.ACKNOWLEDGED);
+    }
+
+    public static void dropDatabase(final String name, final WriteConcern writeConcern) {
         if (name == null) {
             return;
         }
         try {
-            new DropDatabaseOperation(name).execute(getBinding());
+            new DropDatabaseOperation(name, writeConcern).execute(getBinding());
         } catch (MongoCommandException e) {
             if (!e.getErrorMessage().contains("ns not found")) {
                 throw e;
@@ -95,18 +115,34 @@ public static void dropDatabase(final String name) {
         }
     }
 
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
     public void drop() {
-        new DropCollectionOperation(namespace).execute(getBinding());
+        drop(WriteConcern.ACKNOWLEDGED);
+    }
+
+    public void drop(final WriteConcern writeConcern) {
+        drop(namespace, writeConcern);
+    }
+
+    public void create() {
+        create(namespace.getCollectionName(), new CreateCollectionOptions(), WriteConcern.ACKNOWLEDGED);
     }
 
     public void create(final String collectionName, final CreateCollectionOptions options) {
-        drop(namespace);
-        CreateCollectionOperation operation = new CreateCollectionOperation(namespace.getDatabaseName(), collectionName)
+        create(collectionName, options, WriteConcern.ACKNOWLEDGED);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void create(final String collectionName, final CreateCollectionOptions options, final WriteConcern writeConcern) {
+        drop(namespace, writeConcern);
+        CreateCollectionOperation operation = new CreateCollectionOperation(namespace.getDatabaseName(), collectionName, writeConcern)
                 .capped(options.isCapped())
                 .sizeInBytes(options.getSizeInBytes())
                 .autoIndex(options.isAutoIndex())
-                .maxDocuments(options.getMaxDocuments())
-                .usePowerOf2Sizes(options.isUsePowerOf2Sizes());
+                .maxDocuments(options.getMaxDocuments());
 
         IndexOptionDefaults indexOptionDefaults = options.getIndexOptionDefaults();
         if (indexOptionDefaults.getStorageEngine() != null) {
@@ -125,35 +161,45 @@ public void create(final String collectionName, final CreateCollectionOptions op
         operation.execute(getBinding());
     }
 
-    @SuppressWarnings("unchecked")
-    public void insertDocuments(final BsonDocument... documents) {
-        for (BsonDocument document : documents) {
-            new InsertOperation(namespace, true, WriteConcern.ACKNOWLEDGED,
-                                asList(new InsertRequest(document))).execute(getBinding());
+    public void killCursor(final MongoNamespace namespace, final ServerCursor serverCursor) {
+        if (serverCursor != null) {
+            BsonDocument command = new BsonDocument("killCursors", new BsonString(namespace.getCollectionName()))
+                    .append("cursors", new BsonArray(singletonList(new BsonInt64(serverCursor.getId()))));
+            try {
+                new CommandWriteOperation<BsonDocument>(namespace.getDatabaseName(), command, new BsonDocumentCodec())
+                        .execute(getBinding());
+            } catch (Exception e) {
+                // Ignore any exceptions killing old cursors
+            }
         }
     }
 
-    @SuppressWarnings("unchecked")
+    public void insertDocuments(final BsonDocument... documents) {
+        insertDocuments(asList(documents));
+    }
+
     public void insertDocuments(final List<BsonDocument> documents) {
         insertDocuments(documents, getBinding());
     }
 
+    public void insertDocuments(final List<BsonDocument> documents, final WriteConcern writeConcern) {
+        insertDocuments(documents, writeConcern, getBinding());
+    }
 
-    @SuppressWarnings("unchecked")
     public void insertDocuments(final List<BsonDocument> documents, final WriteBinding binding) {
         insertDocuments(documents, WriteConcern.ACKNOWLEDGED, binding);
     }
 
-    @SuppressWarnings("unchecked")
     public void insertDocuments(final List<BsonDocument> documents, final WriteConcern writeConcern, final WriteBinding binding) {
+        List<InsertRequest> insertRequests = new ArrayList<InsertRequest>(documents.size());
         for (BsonDocument document : documents) {
-            new InsertOperation(namespace, true, writeConcern,
-                                singletonList(new InsertRequest(document))).execute(binding);
+            insertRequests.add(new InsertRequest(document));
         }
+        new InsertOperation(namespace, true, writeConcern, false, insertRequests).execute(binding);
     }
 
     public void insertDocuments(final Document... documents) {
-        insertDocuments(new DocumentCodec(registry, new BsonTypeClassMap()), asList(documents));
+        insertDocuments(new DocumentCodec(registry), asList(documents));
     }
 
     public <I> void insertDocuments(final Codec<I> iCodec, final I... documents) {
@@ -199,10 +245,27 @@ public void updateOne(final Bson filter, final Bson update, final boolean isUpse
                                                                     update.toBsonDocument(Document.class, registry),
                                                                     WriteRequest.Type.UPDATE)
                                                   .upsert(isUpsert)),
-                                    true, WriteConcern.ACKNOWLEDGED)
+                                    true, WriteConcern.ACKNOWLEDGED, false)
         .execute(getBinding());
     }
 
+    public void replaceOne(final Bson filter, final Bson update, final boolean isUpsert) {
+        new MixedBulkWriteOperation(namespace,
+                singletonList(new UpdateRequest(filter.toBsonDocument(Document.class, registry),
+                        update.toBsonDocument(Document.class, registry),
+                        WriteRequest.Type.REPLACE)
+                        .upsert(isUpsert)),
+                true, WriteConcern.ACKNOWLEDGED, false)
+                .execute(getBinding());
+    }
+
+    public void deleteOne(final Bson filter) {
+        new MixedBulkWriteOperation(namespace,
+                singletonList(new DeleteRequest(filter.toBsonDocument(Document.class, registry))),
+                true, WriteConcern.ACKNOWLEDGED, false)
+                .execute(getBinding());
+    }
+
     public List<T> find(final Bson filter) {
         return find(filter, null);
     }
@@ -281,24 +344,31 @@ public BsonDocument toBsonDocument(final Bson document) {
     }
 
     public void createIndex(final BsonDocument key) {
-        new CreateIndexesOperation(namespace, asList(new IndexRequest(key))).execute(getBinding());
+        new CreateIndexesOperation(namespace, asList(new IndexRequest(key)), WriteConcern.ACKNOWLEDGED).execute(getBinding());
     }
 
     public void createIndex(final Document key) {
-        new CreateIndexesOperation(namespace, asList(new IndexRequest(wrap(key)))).execute(getBinding());
+        new CreateIndexesOperation(namespace, asList(new IndexRequest(wrap(key))), WriteConcern.ACKNOWLEDGED).execute(getBinding());
+    }
+
+    public void createUniqueIndex(final Document key) {
+        new CreateIndexesOperation(namespace, asList(new IndexRequest(wrap(key)).unique(true)), WriteConcern.ACKNOWLEDGED)
+                .execute(getBinding());
     }
 
     public void createIndex(final Document key, final String defaultLanguage) {
-        new CreateIndexesOperation(namespace, asList(new IndexRequest(wrap(key)).defaultLanguage(defaultLanguage))).execute(getBinding());
+        new CreateIndexesOperation(namespace, asList(new IndexRequest(wrap(key)).defaultLanguage(defaultLanguage)),
+                                          WriteConcern.ACKNOWLEDGED).execute(getBinding());
     }
 
     public void createIndex(final Bson key) {
-        new CreateIndexesOperation(namespace, asList(new IndexRequest(key.toBsonDocument(Document.class, registry)))).execute(getBinding());
+        new CreateIndexesOperation(namespace, asList(new IndexRequest(key.toBsonDocument(Document.class, registry))),
+                                          WriteConcern.ACKNOWLEDGED).execute(getBinding());
     }
 
     public void createIndex(final Bson key, final Double bucketSize) {
         new CreateIndexesOperation(namespace, asList(new IndexRequest(key.toBsonDocument(Document.class, registry))
-                .bucketSize(bucketSize))).execute(getBinding());
+                .bucketSize(bucketSize)), WriteConcern.ACKNOWLEDGED).execute(getBinding());
     }
 
     public List<BsonDocument> listIndexes(){
@@ -309,4 +379,32 @@ public List<BsonDocument> listIndexes(){
         }
         return indexes;
     }
+
+    public void killAllSessions() {
+        try {
+            new CommandWriteOperation<BsonDocument>("admin", new BsonDocument("killAllSessions", new BsonArray()),
+                    new BsonDocumentCodec()).execute(getBinding());
+        } catch (MongoCommandException e) {
+            // ignore exception caused by killing the implicit session that the killAllSessions command itself is running in
+        }
+    }
+
+    public void renameCollection(final MongoNamespace newNamespace) {
+        try {
+            new CommandWriteOperation<BsonDocument>("admin",
+                    new BsonDocument("renameCollection", new BsonString(getNamespace().getFullName()))
+                                .append("to", new BsonString(newNamespace.getFullName())),
+                    new BsonDocumentCodec()).execute(getBinding());
+        } catch (MongoCommandException e) {
+            // do nothing
+        }
+    }
+
+    public void runAdminCommand(final String command) {
+        runAdminCommand(BsonDocument.parse(command));
+    }
+
+    public void runAdminCommand(final BsonDocument command) {
+        new CommandWriteOperation<BsonDocument>("admin", command, new BsonDocumentCodec()).execute(getBinding());
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/client/test/Worker.java b/driver-core/src/test/functional/com/mongodb/client/test/Worker.java
index 8e37f97ab83..f7cdb4c9ed7 100644
--- a/driver-core/src/test/functional/com/mongodb/client/test/Worker.java
+++ b/driver-core/src/test/functional/com/mongodb/client/test/Worker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodec.java b/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodec.java
index b741fda0f21..300608b9e7b 100644
--- a/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodec.java
+++ b/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodecProvider.java b/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodecProvider.java
index 37a4b32a440..e0f721ef283 100644
--- a/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodecProvider.java
+++ b/driver-core/src/test/functional/com/mongodb/client/test/WorkerCodecProvider.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/test/functional/com/mongodb/connection/AsyncStreamTimeoutsSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/AsyncStreamTimeoutsSpecification.groovy
deleted file mode 100644
index 7fc97de34cd..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/AsyncStreamTimeoutsSpecification.groovy
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import category.SlowUnit
-import com.mongodb.MongoSocketOpenException
-import com.mongodb.MongoSocketReadTimeoutException
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.ServerAddress
-import com.mongodb.connection.netty.NettyStreamFactory
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonString
-import org.junit.experimental.categories.Category
-import spock.lang.IgnoreIf
-
-import java.util.concurrent.TimeUnit
-
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.connection.CommandHelper.executeCommand
-
-@IgnoreIf({ System.getProperty('ignoreSlowUnitTests') == 'true' })
-@Category(SlowUnit)
-class AsyncStreamTimeoutsSpecification extends OperationFunctionalSpecification {
-
-    static SocketSettings openSocketSettings = SocketSettings.builder().connectTimeout(1, TimeUnit.MILLISECONDS).build();
-    static SocketSettings readSocketSettings = SocketSettings.builder().readTimeout(5, TimeUnit.SECONDS).build();
-
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') || getSslSettings().isEnabled() })
-    def 'should throw a MongoSocketOpenException when the AsynchronousSocket Stream fails to open'() {
-        given:
-        def connection = new InternalStreamConnectionFactory(
-                new AsynchronousSocketChannelStreamFactory(openSocketSettings, getSslSettings()), getCredentialList(),
-                new NoOpConnectionListener()
-        ).create(new ServerId(new ClusterId(), new ServerAddress(new InetSocketAddress('192.168.255.255', 27017))));
-
-        when:
-        connection.open()
-
-        then:
-        thrown(MongoSocketOpenException)
-    }
-
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') || getSslSettings().isEnabled() })
-    def 'should throw a MongoSocketReadTimeoutException with the AsynchronousSocket stream'() {
-        given:
-        def connection = new InternalStreamConnectionFactory(
-                new AsynchronousSocketChannelStreamFactory(readSocketSettings, getSslSettings()), getCredentialList(),
-                new NoOpConnectionListener()
-        ).create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open()
-
-        getCollectionHelper().insertDocuments(new BsonDocument('_id', new BsonInt32(1)));
-        def countCommand = new BsonDocument('count', new BsonString(getCollectionName()))
-        countCommand.put('query', new BsonDocument('$where', new BsonString('sleep(5050); return true;')))
-
-        when:
-        executeCommand(getDatabaseName(), countCommand, connection)
-
-        then:
-        thrown(MongoSocketReadTimeoutException)
-
-        cleanup:
-        connection?.close()
-    }
-
-    def 'should throw a MongoSocketOpenException when the Netty Stream fails to open'() {
-        given:
-        def connection = new InternalStreamConnectionFactory(
-                new NettyStreamFactory(openSocketSettings, getSslSettings()), getCredentialList(), new NoOpConnectionListener()
-        ).create(new ServerId(new ClusterId(), new ServerAddress(new InetSocketAddress('192.168.255.255', 27017))));
-
-        when:
-        connection.open()
-
-        then:
-        thrown(MongoSocketOpenException)
-    }
-
-
-    def 'should throw a MongoSocketReadTimeoutException with the Netty stream'() {
-        given:
-        def connection = new InternalStreamConnectionFactory(
-                new NettyStreamFactory(readSocketSettings, getSslSettings()), getCredentialList(), new NoOpConnectionListener()
-        ).create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open()
-
-        getCollectionHelper().insertDocuments(new BsonDocument('_id', new BsonInt32(1)));
-        def countCommand = new BsonDocument('count', new BsonString(getCollectionName()))
-        countCommand.put('query', new BsonDocument('$where', new BsonString('sleep(5050); return true;')))
-
-        when:
-        executeCommand(getDatabaseName(), countCommand, connection)
-
-        then:
-        thrown(MongoSocketReadTimeoutException)
-
-        cleanup:
-        connection?.close()
-    }
-
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/AuthenticatingConnectionTest.java b/driver-core/src/test/functional/com/mongodb/connection/AuthenticatingConnectionTest.java
deleted file mode 100644
index dc0ef59cc67..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/AuthenticatingConnectionTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Collections;
-
-import static com.mongodb.ClusterFixture.getPrimary;
-import static com.mongodb.ClusterFixture.getSslSettings;
-import static java.util.Arrays.asList;
-
-public class AuthenticatingConnectionTest {
-    private InternalConnection internalConnection;
-    private String userName;
-    private String password;
-    private String source;
-    private ServerAddress serverAddress;
-
-    @Before
-    public void setUp() throws Exception {
-        userName = System.getProperty("org.mongodb.test.userName", "bob");
-        password = System.getProperty("org.mongodb.test.password", "pwd123");
-        source = System.getProperty("org.mongodb.test.source", "admin");
-        serverAddress = new ServerAddress(System.getProperty("org.mongodb.test.serverAddress", getPrimary().toString()));
-
-        InternalConnectionFactory internalConnectionFactory =
-            new InternalStreamConnectionFactory(new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                Collections.<MongoCredential>emptyList(),
-                                                new NoOpConnectionListener());
-        internalConnection = internalConnectionFactory.create(new ServerId(new ClusterId(), serverAddress));
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        internalConnection.close();
-    }
-
-    @Test
-    @Ignore
-    public void testMongoCRAuthentication() throws InterruptedException {
-        InternalConnectionFactory internalConnectionFactory =
-            new InternalStreamConnectionFactory(new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                asList(MongoCredential.createMongoCRCredential(userName, source,
-                                                                                               password.toCharArray())),
-                                                new NoOpConnectionListener());
-        internalConnection = internalConnectionFactory.create(new ServerId(new ClusterId(), serverAddress));
-    }
-
-    @Test
-    @Ignore
-    public void testPlainAuthentication() throws InterruptedException {
-        InternalConnectionFactory internalConnectionFactory =
-            new InternalStreamConnectionFactory(new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                asList(MongoCredential.createPlainCredential(userName, source,
-                                                                                             password.toCharArray())),
-                                                new NoOpConnectionListener());
-        internalConnection = internalConnectionFactory.create(new ServerId(new ClusterId(), serverAddress));
-    }
-
-    @Test
-    @Ignore
-    public void testGSSAPIAuthentication() throws InterruptedException {
-        InternalConnectionFactory internalConnectionFactory =
-            new InternalStreamConnectionFactory(new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                asList(MongoCredential.createGSSAPICredential(userName)),
-                                                new NoOpConnectionListener());
-        internalConnection = internalConnectionFactory.create(new ServerId(new ClusterId(), serverAddress));
-    }
-
-    @Test
-    @Ignore
-    public void testMongoX509Authentication() throws InterruptedException {
-        InternalConnectionFactory internalConnectionFactory =
-            new InternalStreamConnectionFactory(new SocketStreamFactory(SocketSettings.builder().build(),
-                                                                        getSslSettings()),
-                                                asList(MongoCredential.createMongoX509Credential("CN=client,OU=kerneluser,"
-                                                                                                 + "O=10Gen,L=New York City,"
-                                                                                                 + "ST=New York,C=US")),
-                                                new NoOpConnectionListener());
-        internalConnection = internalConnectionFactory.create(new ServerId(new ClusterId(), serverAddress));
-
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/CommandHelperSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/CommandHelperSpecification.groovy
deleted file mode 100644
index e952da731ca..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/CommandHelperSpecification.groovy
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mongodb.connection
-
-import category.Async
-import com.mongodb.MongoCommandException
-import com.mongodb.MongoException
-import com.mongodb.connection.netty.NettyStreamFactory
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.junit.experimental.categories.Category
-import spock.lang.Specification
-
-import java.util.concurrent.CountDownLatch
-
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.connection.CommandHelper.executeCommandAsync
-
-class CommandHelperSpecification extends Specification {
-    InternalConnection connection
-
-    def setup() {
-        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
-                .create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open()
-    }
-    def cleanup() {
-        connection?.close()
-    }
-
-    @Category(Async)
-    def 'should execute command asynchronously'() {
-        when:
-        BsonDocument receivedDocument
-        MongoException receivedException
-        def latch1 = new CountDownLatch(1)
-        executeCommandAsync('admin', new BsonDocument('ismaster', new BsonInt32(1)), connection)
-                { document, exception -> receivedDocument = document; receivedException = exception; latch1.countDown() }
-        latch1.await()
-
-        then:
-        receivedDocument
-        receivedDocument.containsKey('ok')
-        !receivedException
-
-        when:
-        def latch2 = new CountDownLatch(1)
-        executeCommandAsync('admin', new BsonDocument('non-existent-command', new BsonInt32(1)), connection)
-                { document, exception -> receivedDocument = document; receivedException = exception; latch2.countDown() }
-        latch2.await()
-
-        then:
-        !receivedDocument
-        receivedException instanceof MongoCommandException
-    }
-
-}
\ No newline at end of file
diff --git a/driver-core/src/test/functional/com/mongodb/connection/CommandProtocolCommandEventSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/CommandProtocolCommandEventSpecification.groovy
deleted file mode 100644
index 10175cc617d..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/CommandProtocolCommandEventSpecification.groovy
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoCommandException
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.connection.netty.NettyStreamFactory
-import com.mongodb.event.CommandFailedEvent
-import com.mongodb.event.CommandStartedEvent
-import com.mongodb.event.CommandSucceededEvent
-import com.mongodb.internal.validator.NoOpFieldNameValidator
-import org.bson.BsonDocument
-import org.bson.BsonDouble
-import org.bson.BsonInt32
-import org.bson.codecs.DocumentCodec
-import spock.lang.Shared
-
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.ReadPreference.secondary
-import static com.mongodb.connection.ProtocolTestHelper.execute
-
-class CommandProtocolCommandEventSpecification extends OperationFunctionalSpecification {
-    @Shared
-    InternalStreamConnection connection;
-
-    def setupSpec() {
-        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
-                .create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open();
-    }
-
-    def cleanupSpec() {
-        connection?.close()
-    }
-
-    def 'should deliver start and completed command events'() {
-        given:
-        def pingCommand = new BsonDocument('ping', new BsonInt32(1))
-        def protocol = new CommandProtocol('admin', pingCommand, new NoOpFieldNameValidator(), new DocumentCodec())
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
-                                                                     pingCommand),
-                                             new CommandSucceededEvent(1, connection.getDescription(), 'ping',
-                                                                       new BsonDocument('ok', new BsonDouble(1)), 1000)])
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver start and failed command events'() {
-        given:
-        def unknownCommand = new BsonDocument('unknown', new BsonInt32(1))
-        def protocol = new CommandProtocol('admin', unknownCommand, new NoOpFieldNameValidator(), new DocumentCodec())
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoCommandException)
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), 'admin', 'unknown',
-                                                                     unknownCommand),
-                                             new CommandFailedEvent(1, connection.getDescription(), 'unknown', 0, e)])
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver start and completed command events for wrapped commands'() {
-        given:
-        def pingCommand = new BsonDocument('ping', new BsonInt32(1))
-        def wrappedCommand = new BsonDocument('$query', pingCommand)
-                .append('$readPreference', secondary().toDocument())
-        def protocol = new CommandProtocol('admin', wrappedCommand, new NoOpFieldNameValidator(), new DocumentCodec())
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
-                                                                     pingCommand),
-                                             new CommandSucceededEvent(1, connection.getDescription(), 'ping',
-                                                                       new BsonDocument('ok', new BsonDouble(1)), 1000)])
-
-        where:
-        async << [false, true]
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/ConnectionFixture.groovy b/driver-core/src/test/functional/com/mongodb/connection/ConnectionFixture.groovy
new file mode 100644
index 00000000000..2dfac5fcbb1
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/connection/ConnectionFixture.groovy
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.connection
+
+import com.mongodb.internal.connection.MongoCredentialWithCache
+
+import static com.mongodb.ClusterFixture.getCredentialList
+
+class ConnectionFixture {
+
+    static List<MongoCredentialWithCache> getCredentialListWithCache() {
+        getCredentialList().collect { new MongoCredentialWithCache(it) }
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy
index 94b493d0cac..90c7a0f31cf 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/connection/ConnectionSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,4 +68,4 @@ class ConnectionSpecification extends OperationFunctionalSpecification {
         new CommandReadOperation<BsonDocument>('admin', new BsonDocument('ismaster', new BsonInt32(1)),
                                                new BsonDocumentCodec()).execute(getBinding())
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/PlainAuthenticationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/PlainAuthenticationSpecification.groovy
deleted file mode 100644
index 6d096e2e3c5..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/PlainAuthenticationSpecification.groovy
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *  Copyright 2016 MongoDB, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.ClusterFixture
-import com.mongodb.MongoCommandException
-import com.mongodb.MongoCredential
-import com.mongodb.MongoSecurityException
-import com.mongodb.ServerAddress
-import com.mongodb.async.FutureResultCallback
-import com.mongodb.connection.netty.NettyStreamFactory
-import org.bson.BsonDocument
-import org.bson.BsonString
-import spock.lang.IgnoreIf
-import spock.lang.Specification
-
-import static com.mongodb.AuthenticationMechanism.PLAIN
-import static com.mongodb.ClusterFixture.getConnectionString
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.MongoCredential.createPlainCredential
-import static com.mongodb.connection.CommandHelper.executeCommand
-import static java.util.concurrent.TimeUnit.SECONDS
-
-@IgnoreIf({ getCredentialList().isEmpty() || getCredentialList().get(0).getAuthenticationMechanism() != PLAIN })
-class PlainAuthenticationSpecification extends Specification {
-
-    def 'should not authorize when not authenticated'() {
-        given:
-        def connection = createConnection(async, null)
-
-        when:
-        openConnection(connection, async)
-        executeCommand(getConnectionString().getDatabase(), new BsonDocument('count', new BsonString('test')), connection)
-
-        then:
-        thrown(MongoCommandException)
-
-        cleanup:
-        connection?.close()
-
-        where:
-        async << [true, false]
-    }
-
-    def 'should authorize when successfully authenticated'() {
-        given:
-        def connection = createConnection(async, getMongoCredential())
-
-        when:
-        openConnection(connection, async)
-        executeCommand(getConnectionString().getDatabase(), new BsonDocument('count', new BsonString('test')), connection)
-
-        then:
-        true
-
-        cleanup:
-        connection?.close()
-
-        where:
-        async << [true, false]
-    }
-
-    def 'should throw MongoSecurityException when authentication fails'() {
-        given:
-        def connection = createConnection(async, createPlainCredential('wrongUserName', '$external', 'wrongPassword'.toCharArray()))
-
-        when:
-        openConnection(connection, async)
-        executeCommand(getConnectionString().getDatabase(), new BsonDocument('count', new BsonString('test')), connection)
-
-        then:
-        thrown(MongoSecurityException)
-
-        cleanup:
-        connection?.close()
-
-        where:
-        async << [true, false]
-    }
-
-    private static MongoCredential getMongoCredential() {
-        getCredentialList().get(0);
-    }
-
-    private static InternalStreamConnection createConnection(final boolean async, final MongoCredential credential) {
-        new InternalStreamConnection(
-                new ServerId(new ClusterId(), new ServerAddress(getConnectionString().getHosts().get(0))),
-                async ? new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings())
-                        : new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                new InternalStreamConnectionInitializer(credential == null ? [] : [new PlainAuthenticator(credential)]),
-                new NoOpConnectionListener())
-    }
-
-    private static void openConnection(final InternalConnection connection, final boolean async) {
-        if (async) {
-            FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
-            connection.openAsync(futureResultCallback)
-            futureResultCallback.get(ClusterFixture.TIMEOUT, SECONDS);
-
-        } else {
-            connection.open()
-        }
-    }
-}
-
-
diff --git a/driver-core/src/test/functional/com/mongodb/connection/PlainAuthenticatorTest.java b/driver-core/src/test/functional/com/mongodb/connection/PlainAuthenticatorTest.java
deleted file mode 100644
index d3f42b5db4f..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/PlainAuthenticatorTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.MongoSecurityException;
-import com.mongodb.ServerAddress;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Collections;
-
-import static com.mongodb.ClusterFixture.getSslSettings;
-
-@Ignore
-public class PlainAuthenticatorTest {
-    private InternalConnection internalConnection;
-    private ConnectionDescription connectionDescription;
-    private String userName;
-    private String source;
-    private String password;
-    private StreamFactory streamFactory = new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings());
-
-    @Before
-    public void setUp() throws Exception {
-        String host = System.getProperty("org.mongodb.test.host");
-        userName = System.getProperty("org.mongodb.test.userName");
-        source = System.getProperty("org.mongod.test.source");
-        password = System.getProperty("org.mongodb.test.password");
-        internalConnection = new InternalStreamConnectionFactory(streamFactory, Collections.<MongoCredential>emptyList(),
-                                                                 new NoOpConnectionListener())
-                             .create(new ServerId(new ClusterId(), new ServerAddress(host)));
-        connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()));
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        internalConnection.close();
-    }
-
-    @Test
-    public void testSuccessfulAuthentication() {
-        PlainAuthenticator authenticator = new PlainAuthenticator(MongoCredential.createPlainCredential(userName, source,
-                                                                                                        password.toCharArray())
-        );
-        authenticator.authenticate(internalConnection, connectionDescription);
-    }
-
-    @Test(expected = MongoSecurityException.class)
-    public void testUnsuccessfulAuthentication() {
-        PlainAuthenticator authenticator = new PlainAuthenticator(MongoCredential.createPlainCredential(userName, source,
-                                                                                                        "wrong".toCharArray())
-        );
-        authenticator.authenticate(internalConnection, connectionDescription);
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/ProtocolTestHelper.java b/driver-core/src/test/functional/com/mongodb/connection/ProtocolTestHelper.java
deleted file mode 100644
index ac90ef076dc..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/ProtocolTestHelper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.ClusterFixture;
-import com.mongodb.async.FutureResultCallback;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-final class ProtocolTestHelper {
-    public static <T> T execute(final Protocol<T> protocol, final InternalConnection connection, final boolean async) throws Throwable{
-        if (async) {
-            final FutureResultCallback<T> futureResultCallback = new FutureResultCallback<T>();
-            protocol.executeAsync(connection, futureResultCallback);
-            return futureResultCallback.get(ClusterFixture.TIMEOUT, SECONDS);
-        } else {
-            return protocol.execute(connection);
-        }
-    }
-
-    private ProtocolTestHelper() {}
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/ReplyHeaderSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/ReplyHeaderSpecification.groovy
deleted file mode 100644
index e36dd5000c6..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/ReplyHeaderSpecification.groovy
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package com.mongodb.connection
-
-import com.mongodb.MongoInternalException
-import org.bson.io.BasicOutputBuffer
-import org.bson.io.BsonInput
-import org.bson.io.ByteBufferBsonInput
-import spock.lang.Specification
-
-class ReplyHeaderSpecification extends Specification {
-
-    def 'should parse reply header'() {
-        def outputBuffer = new BasicOutputBuffer();
-        outputBuffer.with {
-            writeInt(186)
-            writeInt(45)
-            writeInt(23)
-            writeInt(1)
-            writeInt(responseFlags)
-            writeLong(9000)
-            writeInt(4)
-            writeInt(30)
-        }
-        BsonInput buffer = new ByteBufferBsonInput(outputBuffer.byteBuffers.get(0));
-
-        when:
-        def replyHeader = new ReplyHeader(buffer, ConnectionDescription.defaultMaxMessageSize);
-
-        then:
-        replyHeader.messageLength == 186
-        replyHeader.requestId == 45
-        replyHeader.responseTo == 23
-        replyHeader.responseFlags == responseFlags
-        replyHeader.cursorId == 9000
-        replyHeader.startingFrom == 4
-        replyHeader.numberReturned == 30
-        replyHeader.cursorNotFound == cursorNotFound
-        replyHeader.queryFailure == queryFailure
-
-        where:
-        responseFlags << [0, 1, 2, 3]
-        cursorNotFound << [false, true, false, true]
-        queryFailure << [false, false, true, true]
-    }
-
-    def 'should throw MongoInternalException on incorrect opCode'() {
-        def outputBuffer = new BasicOutputBuffer();
-        outputBuffer.with {
-            writeInt(36)
-            writeInt(45)
-            writeInt(23)
-            writeInt(2)
-            writeInt(0)
-            writeLong(2)
-            writeInt(0)
-            writeInt(0)
-        }
-        BsonInput buffer = new ByteBufferBsonInput(outputBuffer.byteBuffers.get(0));
-
-        when:
-        new ReplyHeader(buffer, ConnectionDescription.defaultMaxMessageSize);
-
-        then:
-        def ex = thrown(MongoInternalException)
-        ex.getMessage() == 'The reply message opCode 2 does not match the expected opCode 1'
-    }
-
-    def 'should throw MongoInternalException on message size < 36'() {
-        def outputBuffer = new BasicOutputBuffer();
-        outputBuffer.with {
-            writeInt(35)
-            writeInt(45)
-            writeInt(23)
-            writeInt(1)
-            writeInt(0)
-            writeLong(2)
-            writeInt(0)
-            writeInt(0)
-        }
-        BsonInput buffer = new ByteBufferBsonInput(outputBuffer.byteBuffers.get(0));
-
-        when:
-        new ReplyHeader(buffer, ConnectionDescription.defaultMaxMessageSize);
-
-        then:
-        def ex = thrown(MongoInternalException)
-        ex.getMessage() == 'The reply message length 35 is less than the mimimum message length 36'
-    }
-
-    def 'should throw MongoInternalException on message size > max message size'() {
-        def outputBuffer = new BasicOutputBuffer();
-        outputBuffer.with {
-            writeInt(400)
-            writeInt(45)
-            writeInt(23)
-            writeInt(1)
-            writeInt(0)
-            writeLong(2)
-            writeInt(0)
-            writeInt(0)
-        }
-        BsonInput buffer = new ByteBufferBsonInput(outputBuffer.byteBuffers.get(0));
-
-        when:
-        new ReplyHeader(buffer, 399);
-
-        then:
-        def ex = thrown(MongoInternalException)
-        ex.getMessage() == 'The reply message length 400 is less than the maximum message length 399'
-    }
-
-    def 'should throw MongoInternalException on num documents < 0'() {
-        def outputBuffer = new BasicOutputBuffer();
-        outputBuffer.with {
-            writeInt(186)
-            writeInt(45)
-            writeInt(23)
-            writeInt(1)
-            writeInt(1)
-            writeLong(9000)
-            writeInt(4)
-            writeInt(-1)
-        }
-        BsonInput buffer = new ByteBufferBsonInput(outputBuffer.byteBuffers.get(0));
-
-        when:
-        new ReplyHeader(buffer, ConnectionDescription.defaultMaxMessageSize);
-
-        then:
-        def ex = thrown(MongoInternalException)
-        ex.getMessage() == 'The reply message number of returned documents, -1, is less than 0'
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/ServerMonitorSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/ServerMonitorSpecification.groovy
deleted file mode 100644
index 4fb27885462..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/ServerMonitorSpecification.groovy
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoException
-import com.mongodb.MongoSocketException
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.ServerAddress
-import com.mongodb.operation.CommandReadOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.codecs.BsonDocumentCodec
-
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-import static DefaultServerMonitor.exceptionHasChanged
-import static DefaultServerMonitor.stateHasChanged
-import static com.mongodb.ClusterFixture.getBinding
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-
-class ServerMonitorSpecification extends OperationFunctionalSpecification {
-    ServerDescription newDescription
-    ServerMonitor serverMonitor
-    CountDownLatch latch = new CountDownLatch(1)
-
-    def cleanup() {
-        serverMonitor?.close();
-    }
-
-    def 'should have positive round trip time'() {
-        given:
-        initializeServerMonitor(getPrimary())
-
-        when:
-        latch.await()
-
-        then:
-        newDescription.roundTripTimeNanos > 0
-    }
-
-    def 'should return server version'() {
-        given:
-        initializeServerMonitor(getPrimary())
-
-        def commandResult = new CommandReadOperation<BsonDocument>('admin', new BsonDocument('buildinfo', new BsonInt32(1)),
-                                                                   new BsonDocumentCodec())
-                .execute(getBinding())
-        def expectedVersion = new ServerVersion(commandResult.getArray('versionArray')[0..2]*.value)
-        when:
-        latch.await()
-
-        then:
-        newDescription.version == expectedVersion
-
-        cleanup:
-        serverMonitor.close()
-    }
-
-    def 'should report current exception'() {
-        given:
-        initializeServerMonitor(new ServerAddress('some_unknown_server_name:34567'))
-
-        when:
-        latch.await()
-
-        then:
-        newDescription.exception instanceof MongoSocketException
-    }
-
-    def 'should report exception has changed when the current and previous are different'() {
-        expect:
-        exceptionHasChanged(null, new NullPointerException())
-        exceptionHasChanged(new NullPointerException(), null)
-        exceptionHasChanged(new SocketException(), new SocketException('A message'))
-        exceptionHasChanged(new SocketException('A message'), new SocketException())
-        exceptionHasChanged(new SocketException('A message'), new MongoException('A message'))
-        exceptionHasChanged(new SocketException('A message'), new SocketException('A different message'))
-    }
-
-    def 'should report exception has not changed when the current and previous are the same'() {
-        expect:
-        !exceptionHasChanged(null, null)
-        !exceptionHasChanged(new NullPointerException(), new NullPointerException())
-        !exceptionHasChanged(new MongoException('A message'), new MongoException('A message'))
-    }
-
-    def 'should report state has changed if descriptions are different'() {
-        expect:
-        stateHasChanged(ServerDescription.builder()
-                                         .type(ServerType.UNKNOWN)
-                                         .state(ServerConnectionState.CONNECTING)
-                                         .address(new ServerAddress())
-                                         .build(),
-                        ServerDescription.builder()
-                                         .type(ServerType.STANDALONE)
-                                         .state(ServerConnectionState.CONNECTED)
-                                         .address(new ServerAddress())
-                                         .roundTripTime(5, TimeUnit.MILLISECONDS)
-                                         .build());
-    }
-
-    def 'should report state has changed if latencies are different'() {
-        expect:
-        stateHasChanged(ServerDescription.builder()
-                                         .type(ServerType.STANDALONE)
-                                         .state(ServerConnectionState.CONNECTED)
-                                         .address(new ServerAddress())
-                                         .roundTripTime(5, TimeUnit.MILLISECONDS)
-                                         .build(),
-                        ServerDescription.builder()
-                                         .type(ServerType.STANDALONE)
-                                         .state(ServerConnectionState.CONNECTED)
-                                         .address(new ServerAddress())
-                                         .roundTripTime(6, TimeUnit.MILLISECONDS)
-                                         .build());
-    }
-
-    def 'should report state has not changed if descriptions and latencies are the same'() {
-        expect:
-        !stateHasChanged(ServerDescription.builder()
-                                          .type(ServerType.STANDALONE)
-                                          .state(ServerConnectionState.CONNECTED)
-                                          .address(new ServerAddress())
-                                          .roundTripTime(5, TimeUnit.MILLISECONDS)
-                                          .build(),
-                         ServerDescription.builder()
-                                          .type(ServerType.STANDALONE)
-                                          .state(ServerConnectionState.CONNECTED)
-                                          .address(new ServerAddress())
-                                          .roundTripTime(5, TimeUnit.MILLISECONDS)
-                                          .build());
-    }
-
-    def initializeServerMonitor(ServerAddress address) {
-        serverMonitor = new DefaultServerMonitor(new ServerId(new ClusterId(), address), ServerSettings.builder().build(),
-                new ChangeListener<ServerDescription>() {
-                    @Override
-                    void stateChanged(final ChangeEvent<ServerDescription> event) {
-                        newDescription = event.newValue
-                        latch.countDown()
-                    }
-                },
-                new InternalStreamConnectionFactory(new SocketStreamFactory(SocketSettings.builder().build(),
-                        getSslSettings()),
-                        getCredentialList(),
-                        new NoOpConnectionListener()),
-                new TestConnectionPool())
-        serverMonitor.start()
-        serverMonitor
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/SingleServerClusterTest.java b/driver-core/src/test/functional/com/mongodb/connection/SingleServerClusterTest.java
deleted file mode 100644
index bb2202cbff1..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/SingleServerClusterTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.selector.ServerSelector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static com.mongodb.ClusterFixture.getCredentialList;
-import static com.mongodb.ClusterFixture.getPrimary;
-import static com.mongodb.ClusterFixture.getSslSettings;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class SingleServerClusterTest {
-    private SingleServerCluster cluster;
-
-    @Before
-    public void setUp() throws Exception {
-        SocketStreamFactory streamFactory = new SocketStreamFactory(SocketSettings.builder().build(),
-                                                                    getSslSettings());
-        ClusterId clusterId = new ClusterId();
-        ClusterSettings clusterSettings = ClusterSettings.builder()
-                                               .mode(ClusterConnectionMode.SINGLE)
-                                               .hosts(Arrays.asList(getPrimary()))
-                                               .build();
-        cluster = new SingleServerCluster(clusterId,
-                                          clusterSettings,
-                                          new DefaultClusterableServerFactory(clusterId, clusterSettings, ServerSettings.builder().build(),
-                                                                              ConnectionPoolSettings.builder().maxSize(1).build(),
-                                                                              streamFactory,
-                                                                              streamFactory,
-                                                                              getCredentialList(),
-                                                                                     new NoOpConnectionListener(),
-                                                                              new NoOpConnectionPoolListener(), null)
-        );
-    }
-
-    @After
-    public void tearDown() {
-        cluster.close();
-    }
-
-    @Test
-    public void shouldGetDescription() {
-        assertNotNull(cluster.getDescription());
-    }
-
-    @Test
-    @SuppressWarnings("deprecation")
-    public void shouldGetServerWithOkDescription() throws InterruptedException {
-        Server server = cluster.selectServer(new ServerSelector() {
-            @Override
-            public List<ServerDescription> select(final ClusterDescription clusterDescription) {
-                return clusterDescription.getPrimaries();
-            }
-        });
-        assertTrue(server.getDescription().isOk());
-    }
-
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/WriteCommandProtocolCommandEventSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/WriteCommandProtocolCommandEventSpecification.groovy
deleted file mode 100644
index b9eb83867cc..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/WriteCommandProtocolCommandEventSpecification.groovy
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoBulkWriteException
-import com.mongodb.MongoCommandException
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.ServerAddress
-import com.mongodb.bulk.DeleteRequest
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.bulk.UpdateRequest
-import com.mongodb.bulk.WriteRequest
-import com.mongodb.connection.netty.NettyStreamFactory
-import com.mongodb.event.CommandFailedEvent
-import com.mongodb.event.CommandStartedEvent
-import com.mongodb.event.CommandSucceededEvent
-import org.bson.BsonArray
-import org.bson.BsonBoolean
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonString
-import spock.lang.IgnoreIf
-import spock.lang.Shared
-
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply
-import static com.mongodb.connection.ProtocolTestHelper.execute
-
-@IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
-class WriteCommandProtocolCommandEventSpecification extends OperationFunctionalSpecification {
-    @Shared
-    InternalStreamConnection connection;
-
-    def setupSpec() {
-        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
-                .create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open();
-    }
-
-    def cleanupSpec() {
-        connection?.close()
-    }
-
-    def 'should deliver start and completed insert command events'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, insertRequest)
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                                                                     new BsonDocument('insert', new BsonString(getCollectionName()))
-                                                                             .append('ordered', BsonBoolean.TRUE)
-                                                                             .append('documents', new BsonArray(
-                                                                             [new BsonDocument('_id', new BsonInt32(1))]))),
-                                             new CommandSucceededEvent(1, connection.getDescription(), 'insert',
-                                                                       new BsonDocument('ok', new BsonInt32(1))
-                                                                               .append('n', new BsonInt32(1)),
-                                                                       0)])
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver start and completed delete command events'() {
-        given:
-        def filter = new BsonDocument('_id', new BsonInt32(1))
-
-        def deleteRequest = [new DeleteRequest(filter)]
-        def protocol = new DeleteCommandProtocol(getNamespace(), true, ACKNOWLEDGED, deleteRequest)
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'delete',
-                                                                     new BsonDocument('delete', new BsonString(getCollectionName()))
-                                                                             .append('ordered', BsonBoolean.TRUE)
-                                                                             .append('deletes', new BsonArray(
-                                                                             [new BsonDocument('q', filter)
-                                                                                      .append('limit', new BsonInt32(0))]))),
-                                             new CommandSucceededEvent(1, connection.getDescription(), 'delete',
-                                                                       new BsonDocument('ok', new BsonInt32(1))
-                                                                               .append('n', new BsonInt32(0)),
-                                                                       0)])
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver start and completed update command events'() {
-        given:
-        def filter = new BsonDocument('_id', new BsonInt32(1))
-        def update = new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1)))
-        def updateRequest = [new UpdateRequest(filter, update, WriteRequest.Type.UPDATE)]
-        def protocol = new UpdateCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, updateRequest)
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'update',
-                                                                     new BsonDocument('update', new BsonString(getCollectionName()))
-                                                                             .append('ordered', BsonBoolean.TRUE)
-                                                                             .append('updates', new BsonArray(
-                                                                             [new BsonDocument('q', filter)
-                                                                                      .append('u', update)
-                                                                                      .append('multi', BsonBoolean.TRUE)]))),
-                                             new CommandSucceededEvent(1, connection.getDescription(), 'update',
-                                                                       new BsonDocument('ok', new BsonInt32(1))
-                                                                               .append('nModified', new BsonInt32(0))
-                                                                               .append('n', new BsonInt32(0)),
-                                                                       0)])
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver start and completed command events when there is a write error'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, insertRequest)
-        protocol.execute(connection)  // insert here, to force a duplicate key error on the second time
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoBulkWriteException)
-        def writeError = e.getWriteErrors()[0]
-        def writeErrorDocument = new BsonDocument('index', new BsonInt32(writeError.getIndex()))
-                .append('code', new BsonInt32(writeError.getCode()))
-                .append('errmsg', new BsonString(writeError.getMessage()))
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                                                                     new BsonDocument('insert', new BsonString(getCollectionName()))
-                                                                             .append('ordered', BsonBoolean.TRUE)
-                                                                             .append('documents', new BsonArray(
-                                                                             [new BsonDocument('_id', new BsonInt32(1))]))),
-                                             new CommandSucceededEvent(1, connection.getDescription(), 'insert',
-                                                                       new BsonDocument('ok', new BsonInt32(1))
-                                                                               .append('n', new BsonInt32(0))
-                                                                               .append('writeErrors', new BsonArray([writeErrorDocument])),
-                                                                       0)])
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver start and failed command events'() {
-        given:
-        // need a test connection to generate an ok : 0 response
-        def connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress('localhost', 27017)));
-        connection.enqueueReply(buildSuccessfulReply('{ ok : 0, errmsg : "some error"}'))
-        def filter = new BsonDocument('_id', new BsonInt32(1))
-
-        def deleteRequest = [new DeleteRequest(filter)]
-        def protocol = new DeleteCommandProtocol(getNamespace(), true, ACKNOWLEDGED, deleteRequest)
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoCommandException)
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'delete',
-                                                                     new BsonDocument('delete', new BsonString(getCollectionName()))
-                                                                             .append('ordered', BsonBoolean.TRUE)
-                                                                             .append('deletes', new BsonArray(
-                                                                             [new BsonDocument('q', filter)
-                                                                                      .append('limit', new BsonInt32(0))]))),
-                                             new CommandFailedEvent(1, connection.getDescription(),
-                                                                    'delete', 0, e)])
-
-        where:
-        async << [false, true]
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/WriteCommandProtocolSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/WriteCommandProtocolSpecification.groovy
deleted file mode 100644
index a0d0f33f1de..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/WriteCommandProtocolSpecification.groovy
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package com.mongodb.connection
-
-import category.Slow
-import com.mongodb.MongoBulkWriteException
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.bulk.BulkWriteUpsert
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.bulk.UpdateRequest
-import com.mongodb.bulk.WriteRequest
-import com.mongodb.connection.netty.NettyStreamFactory
-import org.bson.BsonBinary
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.codecs.BsonDocumentCodec
-import org.junit.experimental.categories.Category
-import spock.lang.IgnoreIf
-import spock.lang.Shared
-
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.connection.ProtocolTestHelper.execute
-
-@IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
-class WriteCommandProtocolSpecification extends OperationFunctionalSpecification {
-
-    @Shared
-    InternalStreamConnection connection;
-
-    def setupSpec() {
-        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                getCredentialList(), new NoOpConnectionListener())
-                .create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open();
-    }
-
-    def cleanupSpec() {
-        connection?.close()
-    }
-
-    def 'should insert a document'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, insertRequest)
-
-        when:
-        def result = execute(protocol, connection, async)
-
-        then:
-        result.insertedCount == 1
-        result.upserts == []
-        collectionHelper.find(document, new BsonDocumentCodec()).first() == document
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should insert documents'() {
-        def requests = [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                        new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))]
-        given:
-        def protocol = new InsertCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, requests)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        collectionHelper.count() == 2
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should throw exception'() {
-        given:
-        def protocol = new InsertCommandProtocol(getNamespace(), false, ACKNOWLEDGED, false,
-                [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                 new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))]
-        )
-        protocol.execute(connection)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoBulkWriteException)
-        e.serverAddress == connection.getServerAddress()
-        e.writeErrors.size() == 2
-        e.writeResult != null
-        e.writeResult.insertedCount == 0;
-        e.writeResult.upserts == []
-        with(e.writeErrors[0]) {
-            index == 0
-            code == 11000
-            message != null
-        }
-        with(e.writeErrors[1]) {
-            index == 1
-            code == 11000
-            message != null
-        }
-
-        where:
-        async << [false, true]
-    }
-
-    @Category(Slow)
-    def 'should split a large batch'() {
-        given:
-        def hugeBinary = new BsonBinary(new byte[1024 * 1024 * 16 - 100]);
-
-        def documents = [
-                new BsonDocument('_id', new BsonInt32(1)).append('bytes', hugeBinary),
-                new BsonDocument('_id', new BsonInt32(2)).append('bytes', hugeBinary),
-                new BsonDocument('_id', new BsonInt32(3)).append('bytes', hugeBinary),
-                new BsonDocument('_id', new BsonInt32(4)).append('bytes', hugeBinary)
-        ]
-
-        List<InsertRequest> insertList = new ArrayList<InsertRequest>(documents.size());
-        for (def cur : documents) {
-            insertList.add(new InsertRequest(cur));
-        }
-        def protocol = new InsertCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, insertList)
-
-        when:
-        def result = execute(protocol, connection, async)
-
-        then:
-        result.insertedCount == 4
-        documents.size() == collectionHelper.count()
-
-        where:
-        async << [false, true]
-    }
-
-    @Category(Slow)
-    def 'should have correct list of processed and unprocessed requests after error on split'() {
-        given:
-        def hugeBinary = new BsonBinary(new byte[1024 * 1024 * 16 - 100]);
-
-        def documents = [
-                new BsonDocument('_id', new BsonInt32(1)).append('bytes', hugeBinary),
-                new BsonDocument('_id', new BsonInt32(2)).append('bytes', hugeBinary),
-                new BsonDocument('_id', new BsonInt32(3)).append('bytes', hugeBinary),
-                new BsonDocument('_id', new BsonInt32(4)).append('bytes', hugeBinary)
-        ]
-
-        List<InsertRequest> insertList = new ArrayList<InsertRequest>(documents.size());
-        for (def cur : documents) {
-            insertList.add(new InsertRequest(cur));
-        }
-
-        // Force a duplicate key error in the second insert request
-        new InsertCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, [new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))])
-                .execute(connection)
-
-        def protocol = new InsertCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null, insertList)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def exception = thrown(MongoBulkWriteException)
-        exception.writeResult.insertedCount == 1
-
-        where:
-        async << [false, true]
-    }
-
-    @Category(Slow)
-    def 'should map indices in exception when split is required'() {
-        given:
-        def hugeBinary = new BsonBinary(new byte[1024 * 1024 * 16 - 100]);
-
-        def documents = [
-                new BsonDocument('_id', new BsonInt32(1)),
-                new BsonDocument('_id', new BsonInt32(2)),
-                new BsonDocument('_id', new BsonInt32(3)),
-                new BsonDocument('_id', new BsonInt32(4))
-        ]
-
-        List<InsertRequest> insertList = new ArrayList<InsertRequest>(documents.size());
-        for (def cur : documents) {
-            insertList.add(new InsertRequest(cur));
-        }
-        new InsertCommandProtocol(getNamespace(), false, ACKNOWLEDGED, null, insertList).execute(connection)
-
-        // add a large byte array to each document to force a split after each
-        for (def document : documents) {
-            document.append('bytes', hugeBinary);
-        }
-        documents[1].put('_id', new BsonInt32(5))  // Make the second document a new one
-
-        def protocol = new InsertCommandProtocol(getNamespace(), false, ACKNOWLEDGED, null, insertList)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoBulkWriteException)
-        e.serverAddress == connection.getServerAddress()
-        e.writeErrors.size() == 3
-        e.writeErrors[0].index == 0
-        e.writeErrors[1].index == 2
-        e.writeErrors[2].index == 3
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should upsert items'() {
-        given:
-        def protocol = new UpdateCommandProtocol(getNamespace(), true, ACKNOWLEDGED, null,
-                [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                        new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))),
-                        WriteRequest.Type.UPDATE)
-                         .upsert(true),
-                 new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
-                         new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
-                         WriteRequest.Type.UPDATE)
-                         .upsert(true)]
-        );
-
-        when:
-        def result = execute(protocol, connection, async)
-
-
-        then:
-        result.matchedCount == 0;
-        result.upserts == [new BulkWriteUpsert(0, new BsonInt32(1)), new BulkWriteUpsert(1, new BsonInt32(2))]
-
-        where:
-        async << [false, true]
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/WriteProtocolCommandEventSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/WriteProtocolCommandEventSpecification.groovy
deleted file mode 100644
index 36429b13f5c..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/WriteProtocolCommandEventSpecification.groovy
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.mongodb.connection
-
-import com.mongodb.DuplicateKeyException
-import com.mongodb.MongoCommandException
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.ServerAddress
-import com.mongodb.bulk.DeleteRequest
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.bulk.UpdateRequest
-import com.mongodb.connection.netty.NettyStreamFactory
-import com.mongodb.event.CommandFailedEvent
-import com.mongodb.event.CommandStartedEvent
-import com.mongodb.event.CommandSucceededEvent
-import com.mongodb.internal.validator.NoOpFieldNameValidator
-import org.bson.BsonArray
-import org.bson.BsonBinary
-import org.bson.BsonBoolean
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonString
-import org.bson.codecs.BsonDocumentCodec
-import spock.lang.IgnoreIf
-import spock.lang.Shared
-
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.WriteConcern.UNACKNOWLEDGED
-import static com.mongodb.bulk.WriteRequest.Type.UPDATE
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply
-import static com.mongodb.connection.ProtocolTestHelper.execute
-
-class WriteProtocolCommandEventSpecification extends OperationFunctionalSpecification {
-    @Shared
-    InternalStreamConnection connection;
-
-    def setupSpec() {
-        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
-                .create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open();
-    }
-
-    def cleanupSpec() {
-        connection?.close()
-    }
-
-    def 'should deliver started and completed command events for a single unacknowleded insert'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertProtocol(getNamespace(), true, UNACKNOWLEDGED, insertRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        def expectedEvents = [
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                        new BsonDocument('insert', new BsonString(getCollectionName()))
-                                .append('ordered', BsonBoolean.TRUE)
-                                .append('writeConcern',
-                                new BsonDocument('w', new BsonInt32(0)))
-                                .append('documents', new BsonArray(
-                                [new BsonDocument('_id', new BsonInt32(1))]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'insert',
-                        new BsonDocument('ok', new BsonInt32(1)), 0)]
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        cleanup:
-        // force acknowledgement
-        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
-                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
-
-        where:
-        async << [false, true]
-    }
-
-    @IgnoreIf({ !serverVersionAtLeast([2, 4, 0]) })
-    def 'should deliver started and completed command events for split unacknowleded inserts'() {
-        given:
-        def binary = new BsonBinary(new byte[15000000])
-        def documentOne = new BsonDocument('_id', new BsonInt32(1)).append('b', binary)
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2)).append('b', binary)
-        def documentThree = new BsonDocument('_id', new BsonInt32(3)).append('b', binary)
-        def documentFour = new BsonDocument('_id', new BsonInt32(4)).append('b', binary)
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, UNACKNOWLEDGED, insertRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                                        new BsonDocument('insert', new BsonString(getCollectionName()))
-                                                .append('ordered', BsonBoolean.TRUE)
-                                                .append('writeConcern',
-                                                        new BsonDocument('w', new BsonInt32(0)))
-                                                .append('documents',
-                                                        new BsonArray([documentOne, documentTwo,
-                                                                       documentThree]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'insert',
-                                          new BsonDocument('ok', new BsonInt32(1)), 0),
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                                        new BsonDocument('insert', new BsonString(getCollectionName()))
-                                                .append('ordered', BsonBoolean.TRUE)
-                                                .append('writeConcern',
-                                                        new BsonDocument('w', new BsonInt32(0)))
-                                                .append('documents', new BsonArray([documentFour]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'insert',
-                                          new BsonDocument('ok', new BsonInt32(1)), 0)])
-
-        cleanup:
-        // force acknowledgement
-        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
-                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver started and completed command events when there is a write error'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-        protocol.execute(connection)  // insert here, to force a duplicate key error on the second time
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(DuplicateKeyException)
-
-        and:
-        def expectedEvents = [
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                        new BsonDocument('insert', new BsonString(getCollectionName()))
-                                .append('ordered', BsonBoolean.TRUE)
-                                .append('documents', new BsonArray(
-                                [new BsonDocument('_id', new BsonInt32(1))]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'insert',
-                        new BsonDocument('ok', new BsonInt32(1)).append('n', new BsonInt32(0))
-                                .append('writeErrors', new BsonArray([
-                                new BsonDocument().append('index', new BsonInt32(0))
-                                        .append('code', new BsonInt32(e.getCode()))
-                                        .append('errmsg', new BsonString(e.getErrorMessage()))])), 0)]
-
-        then:
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver started and failed command events when there is a command failure'() {
-        given:
-        // need a test connection to generate an ok : 0 response
-        def connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress('localhost', 27017)));
-        connection.enqueueReply(buildSuccessfulReply('{ ok : 0, errmsg : "some error"}'))
-
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoCommandException)
-
-        and:
-        def expectedEvents = [
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                        new BsonDocument('insert', new BsonString(getCollectionName()))
-                                .append('ordered', BsonBoolean.TRUE)
-                                .append('documents', new BsonArray(
-                                [new BsonDocument('_id', new BsonInt32(1))]))),
-                new CommandFailedEvent(1, connection.getDescription(), 'insert', 0, e)]
-
-        then:
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        where:
-        async << [false, true]
-    }
-
-
-
-    def 'should deliver started and completed command events for a single unacknowleded update'() {
-        given:
-        def filter = new BsonDocument('_id', new BsonInt32(1))
-        def update = new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1)))
-        def updateRequest = [new UpdateRequest(filter, update, UPDATE).multi(true).upsert(true)]
-        def protocol = new UpdateProtocol(getNamespace(), true, UNACKNOWLEDGED, updateRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'update',
-                                                                     new BsonDocument('update', new BsonString(getCollectionName()))
-                                                                             .append('ordered', BsonBoolean.TRUE)
-                                                                             .append('writeConcern',
-                                                                                     new BsonDocument('w', new BsonInt32(0)))
-                                                                             .append('updates', new BsonArray(
-                                                                             [new BsonDocument('q', filter)
-                                                                                      .append('u', update)
-                                                                                      .append('multi', BsonBoolean.TRUE)
-                                                                                      .append('upsert', BsonBoolean.TRUE)]))),
-                                             new CommandSucceededEvent(1, connection.getDescription(), 'update',
-                                                                       new BsonDocument('ok', new BsonInt32(1)), 0)])
-
-        cleanup:
-        // force acknowledgement
-        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
-                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver started and completed command events for a single unacknowleded delete'() {
-        given:
-        def filter = new BsonDocument('_id', new BsonInt32(1))
-        def deleteRequest = [new DeleteRequest(filter).multi(true)]
-        def protocol = new DeleteProtocol(getNamespace(), true, UNACKNOWLEDGED, deleteRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        def expectedEvents = [
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'delete',
-                        new BsonDocument('delete', new BsonString(getCollectionName()))
-                                .append('ordered', BsonBoolean.TRUE)
-                                .append('writeConcern',
-                                new BsonDocument('w', new BsonInt32(0)))
-                                .append('deletes', new BsonArray(
-                                [new BsonDocument('q', filter)
-                                         .append('limit', new BsonInt32(0))]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'delete',
-                        new BsonDocument('ok', new BsonInt32(1)), 0)]
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver started and completed command events for a single acknowleded insert'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        def expectedEvents = [
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
-                        new BsonDocument('insert', new BsonString(getCollectionName()))
-                                .append('ordered', BsonBoolean.TRUE)
-                                .append('documents', new BsonArray(
-                                [new BsonDocument('_id', new BsonInt32(1))]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'insert',
-                        new BsonDocument('ok', new BsonInt32(1))
-                                .append('n', new BsonInt32(1)), 0)]
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver started and completed command events for a single acknowleded delete'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-
-        def insertRequest = [new InsertRequest(document)]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-        protocol.execute(connection)
-
-        def deleteRequest = [new DeleteRequest(document)]
-        protocol = new DeleteProtocol(getNamespace(), true, ACKNOWLEDGED, deleteRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        def expectedEvents = [
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'delete',
-                        new BsonDocument('delete', new BsonString(getCollectionName()))
-                                .append('ordered', BsonBoolean.TRUE)
-                                .append('deletes', new BsonArray(
-                                [new BsonDocument('q', document)
-                                         .append('limit', new BsonInt32(0))]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'delete',
-                        new BsonDocument('ok', new BsonInt32(1))
-                                .append('n', new BsonInt32(1)), 0)]
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should deliver started and completed command events for a single acknowleded update'() {
-        given:
-        def filter = new BsonDocument('_id', new BsonInt32(1))
-        def update = new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1)))
-        def updateRequest = [new UpdateRequest(filter, update, UPDATE).multi(true).upsert(true)]
-        def protocol = new UpdateProtocol(getNamespace(), true, ACKNOWLEDGED, updateRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        def expectedEvents = [
-                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'update',
-                        new BsonDocument('update', new BsonString(getCollectionName()))
-                                .append('ordered', BsonBoolean.TRUE)
-                                .append('updates', new BsonArray(
-                                [new BsonDocument('q', filter)
-                                         .append('u', update)
-                                         .append('multi', BsonBoolean.TRUE)
-                                         .append('upsert', BsonBoolean.TRUE)]))),
-                new CommandSucceededEvent(1, connection.getDescription(), 'update',
-                        new BsonDocument('ok', new BsonInt32(1))
-                                .append('n', new BsonInt32(1))
-                                .append('upserted',
-                                new BsonArray([new BsonDocument('index',
-                                        new BsonInt32(0)).append('_id', filter.get('_id'))])), 0)]
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should not deliver any events if encoding fails'() {
-        given:
-        def insertRequest = [new InsertRequest(new BsonDocument('$set', new BsonInt32(1)))]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-
-        def expectedEvents = []
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        thrown(IllegalArgumentException)
-        commandListener.eventsWereDelivered(expectedEvents)
-
-        where:
-        async << [false, true]
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/WriteProtocolSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/WriteProtocolSpecification.groovy
deleted file mode 100644
index 31d3457d026..00000000000
--- a/driver-core/src/test/functional/com/mongodb/connection/WriteProtocolSpecification.groovy
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package com.mongodb.connection
-
-import com.mongodb.DuplicateKeyException
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.connection.netty.NettyStreamFactory
-import com.mongodb.internal.validator.NoOpFieldNameValidator
-import org.bson.BsonBinary
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonString
-import org.bson.codecs.BsonDocumentCodec
-import spock.lang.IgnoreIf
-import spock.lang.Shared
-
-import static com.mongodb.ClusterFixture.getCredentialList
-import static com.mongodb.ClusterFixture.getPrimary
-import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.ClusterFixture.isSharded
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.WriteConcern.UNACKNOWLEDGED
-import static com.mongodb.connection.ProtocolTestHelper.execute
-
-class WriteProtocolSpecification extends OperationFunctionalSpecification {
-    @Shared
-    InternalStreamConnection connection;
-
-    def setupSpec() {
-        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
-                .create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open();
-    }
-
-    def cleanupSpec() {
-        connection?.close()
-    }
-
-    def 'should ignore write errors on unacknowledged inserts'() {
-        given:
-        def documentOne = new BsonDocument('_id', new BsonInt32(1))
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2))
-        def documentThree = new BsonDocument('_id', new BsonInt32(3))
-        def documentFour = new BsonDocument('_id', new BsonInt32(4))
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, UNACKNOWLEDGED, insertRequest)
-
-        getCollectionHelper().insertDocuments(documentOne)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        getCollectionHelper().find(new BsonDocumentCodec()) == [documentOne]
-
-        cleanup:
-        // force acknowledgement
-        new CommandProtocol(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
-                            new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should report write errors on acknowledged inserts'() {
-        given:
-        def documentOne = new BsonDocument('_id', new BsonInt32(1))
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2))
-        def documentThree = new BsonDocument('_id', new BsonInt32(3))
-        def documentFour = new BsonDocument('_id', new BsonInt32(4))
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-
-        getCollectionHelper().insertDocuments(documentOne)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        thrown(DuplicateKeyException)
-        getCollectionHelper().count() == 1
-
-        where:
-        async << [false, true]
-    }
-
-    @IgnoreIf({ isSharded() })
-    def 'should execute split unacknowledged inserts'() {
-        given:
-        def binary = new BsonBinary(new byte[15000000])
-        def documentOne = new BsonDocument('_id', new BsonInt32(1)).append('b', binary)
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2)).append('b', binary)
-        def documentThree = new BsonDocument('_id', new BsonInt32(3)).append('b', binary)
-        def documentFour = new BsonDocument('_id', new BsonInt32(4)).append('b', binary)
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, UNACKNOWLEDGED, insertRequest)
-
-        when:
-        execute(protocol, connection, async)
-        // force acknowledgement
-        new CommandProtocol(getDatabaseName(), new BsonDocument('ping', new BsonInt32(1)),
-                new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
-
-        then:
-        getCollectionHelper().count() == 4
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should execute split acknowledged inserts'() {
-        given:
-        def binary = new BsonBinary(new byte[15000000])
-        def documentOne = new BsonDocument('_id', new BsonInt32(1)).append('b', binary)
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2)).append('b', binary)
-        def documentThree = new BsonDocument('_id', new BsonInt32(3)).append('b', binary)
-        def documentFour = new BsonDocument('_id', new BsonInt32(4)).append('b', binary)
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        getCollectionHelper().count() == 4
-
-        where:
-        async << [false, true]
-    }
-
-    @IgnoreIf({ isSharded() })
-    def 'should stop writing on write error when an ordered unacknowledged inserts must be split'() {
-        given:
-        def binary = new BsonBinary(new byte[15000000])
-        def documentOne = new BsonDocument('_id', new BsonInt32(1)).append('b', binary)
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2)).append('b', binary)
-        def documentThree = new BsonDocument('_id', new BsonInt32(3)).append('b', binary)
-        def documentFour = new BsonDocument('_id', new BsonInt32(4)).append('b', binary)
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, UNACKNOWLEDGED, insertRequest)
-
-        getCollectionHelper().insertDocuments(documentOne)
-
-        when:
-        execute(protocol, connection, async)
-        // force acknowledgement
-        new CommandProtocol(getDatabaseName(), new BsonDocument('ping', new BsonInt32(1)),
-                new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
-
-        then:
-        getCollectionHelper().count() == 1
-
-        where:
-        async << [false, true]
-    }
-
-    @IgnoreIf({ isSharded() })
-    def 'should continue writing on write error when an unordered unacknowledged inserts must be split'() {
-        given:
-        def binary = new BsonBinary(new byte[15000000])
-        def documentOne = new BsonDocument('_id', new BsonInt32(1)).append('b', binary)
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2)).append('b', binary)
-        def documentThree = new BsonDocument('_id', new BsonInt32(3)).append('b', binary)
-        def documentFour = new BsonDocument('_id', new BsonInt32(4)).append('b', binary)
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), false, UNACKNOWLEDGED, insertRequest)
-
-        getCollectionHelper().insertDocuments(documentOne)
-
-        when:
-        execute(protocol, connection, async)
-        // force acknowledgement
-        new CommandProtocol(getDatabaseName(), new BsonDocument('ping', new BsonInt32(1)),
-                new NoOpFieldNameValidator(), new BsonDocumentCodec()).execute(connection)
-
-        then:
-        getCollectionHelper().count() == 4
-
-        where:
-        async << [false, true]
-    }
-
-    def 'should report write errors on split acknowledged inserts'() {
-        given:
-        def binary = new BsonBinary(new byte[15000000])
-        def documentOne = new BsonDocument('_id', new BsonInt32(1)).append('b', binary)
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2)).append('b', binary)
-        def documentThree = new BsonDocument('_id', new BsonInt32(3)).append('b', binary)
-        def documentFour = new BsonDocument('_id', new BsonInt32(4)).append('b', binary)
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, ACKNOWLEDGED, insertRequest)
-
-        getCollectionHelper().insertDocuments(documentOne)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        thrown(DuplicateKeyException)
-        getCollectionHelper().count() == 1
-
-        where:
-        async << [false, true]
-    }
-
-    @IgnoreIf({ isSharded() })
-    def 'should not report write errors on split unacknowledged inserts'() {
-        given:
-        def binary = new BsonBinary(new byte[15000000])
-        def documentOne = new BsonDocument('_id', new BsonInt32(1)).append('b', binary)
-        def documentTwo = new BsonDocument('_id', new BsonInt32(2)).append('b', binary)
-        def documentThree = new BsonDocument('_id', new BsonInt32(3)).append('b', binary)
-        def documentFour = new BsonDocument('_id', new BsonInt32(4)).append('b', binary)
-
-        def insertRequest = [new InsertRequest(documentOne), new InsertRequest(documentTwo),
-                             new InsertRequest(documentThree), new InsertRequest(documentFour)]
-        def protocol = new InsertProtocol(getNamespace(), true, UNACKNOWLEDGED, insertRequest)
-
-        getCollectionHelper().insertDocuments(documentOne)
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        getCollectionHelper().count() == 1
-
-        where:
-        async << [false, true]
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/netty/NettyStreamSpecification.groovy b/driver-core/src/test/functional/com/mongodb/connection/netty/NettyStreamSpecification.groovy
new file mode 100644
index 00000000000..38bed365aae
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/connection/netty/NettyStreamSpecification.groovy
@@ -0,0 +1,67 @@
+package com.mongodb.connection.netty
+
+import category.Slow
+import com.mongodb.MongoSocketOpenException
+import com.mongodb.ServerAddress
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SslSettings
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.getSslSettings
+
+class NettyStreamSpecification extends Specification {
+
+    @Category(Slow)
+    @IgnoreIf({ getSslSettings().isEnabled() })
+    def 'should successfully connect with working ip address group'() {
+        given:
+        def port = 27017
+        SocketSettings socketSettings = SocketSettings.builder().connectTimeout(1000, TimeUnit.MILLISECONDS).build()
+        SslSettings sslSettings = SslSettings.builder().build()
+        def factory = new NettyStreamFactory(socketSettings, sslSettings)
+
+        def inetAddresses = [new InetSocketAddress(InetAddress.getByName('192.168.255.255'), port),
+                             new InetSocketAddress(InetAddress.getByName('1.2.3.4'), port),
+                             new InetSocketAddress(InetAddress.getByName('127.0.0.1'), port)]
+
+        def serverAddress = Stub(ServerAddress)
+        serverAddress.getSocketAddresses() >> inetAddresses
+
+        def stream = factory.create(serverAddress)
+
+        when:
+        stream.open()
+
+        then:
+        !stream.isClosed()
+    }
+
+    @Category(Slow)
+    @IgnoreIf({ getSslSettings().isEnabled() })
+    def 'should throw exception with non-working ip address group'() {
+        given:
+        def port = 27017
+        SocketSettings socketSettings = SocketSettings.builder().connectTimeout(1000, TimeUnit.MILLISECONDS).build()
+        SslSettings sslSettings = SslSettings.builder().build()
+        def factory = new NettyStreamFactory(socketSettings, sslSettings)
+
+        def inetAddresses = [new InetSocketAddress(InetAddress.getByName('192.168.255.255'), port),
+                             new InetSocketAddress(InetAddress.getByName('1.2.3.4'), port),
+                             new InetSocketAddress(InetAddress.getByName('1.2.3.5'), port)]
+
+        def serverAddress = Stub(ServerAddress)
+        serverAddress.getSocketAddresses() >> inetAddresses
+
+        def stream = factory.create(serverAddress)
+
+        when:
+        stream.open()
+
+        then:
+        thrown(MongoSocketOpenException)
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/AsyncSocketChannelStreamSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/AsyncSocketChannelStreamSpecification.groovy
new file mode 100644
index 00000000000..2c7effd35e0
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/AsyncSocketChannelStreamSpecification.groovy
@@ -0,0 +1,76 @@
+package com.mongodb.internal.connection
+
+import category.Slow
+import com.mongodb.MongoSocketOpenException
+import com.mongodb.ServerAddress
+import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SslSettings
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import java.nio.channels.AsynchronousChannelGroup
+import java.util.concurrent.Executors
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+
+import static com.mongodb.ClusterFixture.getSslSettings
+
+@IgnoreIf({ isNotAtLeastJava7() })
+class AsyncSocketChannelStreamSpecification extends Specification {
+
+    @Category(Slow)
+    @IgnoreIf({ getSslSettings().isEnabled() })
+    def 'should successfully connect with working ip address list'() {
+        given:
+        def port = 27017
+        def socketSettings = SocketSettings.builder().connectTimeout(100, MILLISECONDS).build()
+        def sslSettings = SslSettings.builder().build()
+        def channelGroup = AsynchronousChannelGroup.withThreadPool(Executors.newFixedThreadPool(5))
+        def factoryFactory = AsynchronousSocketChannelStreamFactoryFactory.builder().group(channelGroup).build()
+        def factory = factoryFactory.create(socketSettings, sslSettings)
+        def inetAddresses = [new InetSocketAddress(InetAddress.getByName('192.168.255.255'), port),
+                             new InetSocketAddress(InetAddress.getByName('127.0.0.1'), port)]
+
+        def serverAddress = Stub(ServerAddress)
+        serverAddress.getSocketAddresses() >> inetAddresses
+
+        def stream = factory.create(serverAddress)
+
+        when:
+        stream.open()
+
+        then:
+        !stream.isClosed()
+    }
+
+    @Category(Slow)
+    @IgnoreIf({ getSslSettings().isEnabled() })
+    def 'should fail to connect with non-working ip address list'() {
+        given:
+        def port = 27017
+        def socketSettings = SocketSettings.builder().connectTimeout(100, MILLISECONDS).build()
+        def sslSettings = SslSettings.builder().build()
+        def factoryFactory = AsynchronousSocketChannelStreamFactoryFactory.builder()
+                .group(AsynchronousChannelGroup.withThreadPool(Executors.newFixedThreadPool(5)))
+                .build()
+
+        def factory = factoryFactory.create(socketSettings, sslSettings)
+
+        def inetAddresses = [new InetSocketAddress(InetAddress.getByName('192.168.255.255'), port),
+                             new InetSocketAddress(InetAddress.getByName('1.2.3.4'), port)]
+
+        def serverAddress = Stub(ServerAddress)
+        serverAddress.getSocketAddresses() >> inetAddresses
+
+        def stream = factory.create(serverAddress)
+
+        when:
+        stream.open()
+
+        then:
+        thrown(MongoSocketOpenException)
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/AsyncStreamTimeoutsSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/AsyncStreamTimeoutsSpecification.groovy
new file mode 100644
index 00000000000..496f09a7de3
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/AsyncStreamTimeoutsSpecification.groovy
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import category.Slow
+import com.mongodb.MongoSocketOpenException
+import com.mongodb.MongoSocketReadTimeoutException
+import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ServerAddress
+import com.mongodb.connection.AsynchronousSocketChannelStreamFactory
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.netty.NettyStreamFactory
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.getPrimary
+import static com.mongodb.ClusterFixture.getSslSettings
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.internal.connection.CommandHelper.executeCommand
+
+@IgnoreIf({ System.getProperty('ignoreSlowUnitTests') == 'true' })
+@Category(Slow)
+class AsyncStreamTimeoutsSpecification extends OperationFunctionalSpecification {
+
+    static SocketSettings openSocketSettings = SocketSettings.builder().connectTimeout(1, TimeUnit.MILLISECONDS).build()
+    static SocketSettings readSocketSettings = SocketSettings.builder().readTimeout(5, TimeUnit.SECONDS).build()
+
+    @IgnoreIf({ isNotAtLeastJava7() || getSslSettings().isEnabled() })
+    def 'should throw a MongoSocketOpenException when the AsynchronousSocket Stream fails to open'() {
+        given:
+        def connection = new InternalStreamConnectionFactory(
+                new AsynchronousSocketChannelStreamFactory(openSocketSettings, getSslSettings()), getCredentialListWithCache(), null, null,
+                [], null).create(new ServerId(new ClusterId(), new ServerAddress(new InetSocketAddress('192.168.255.255', 27017))))
+
+        when:
+        connection.open()
+
+        then:
+        thrown(MongoSocketOpenException)
+    }
+
+    @IgnoreIf({ isNotAtLeastJava7() || getSslSettings().isEnabled() })
+    def 'should throw a MongoSocketReadTimeoutException with the AsynchronousSocket stream'() {
+        given:
+        def connection = new InternalStreamConnectionFactory(
+                new AsynchronousSocketChannelStreamFactory(readSocketSettings, getSslSettings()), getCredentialListWithCache(), null, null,
+                [], null).create(new ServerId(new ClusterId(), getPrimary()))
+        connection.open()
+
+        getCollectionHelper().insertDocuments(new BsonDocument('_id', new BsonInt32(1)));
+        def countCommand = new BsonDocument('count', new BsonString(getCollectionName()))
+        countCommand.put('query', new BsonDocument('$where', new BsonString('sleep(5050); return true;')))
+
+        when:
+        executeCommand(getDatabaseName(), countCommand, connection)
+
+        then:
+        thrown(MongoSocketReadTimeoutException)
+
+        cleanup:
+        connection?.close()
+    }
+
+    def 'should throw a MongoSocketOpenException when the Netty Stream fails to open'() {
+        given:
+        def connection = new InternalStreamConnectionFactory(
+                new NettyStreamFactory(openSocketSettings, getSslSettings()), getCredentialListWithCache(), null, null, [], null
+        ).create(new ServerId(new ClusterId(), new ServerAddress(new InetSocketAddress('192.168.255.255', 27017))))
+
+        when:
+        connection.open()
+
+        then:
+        thrown(MongoSocketOpenException)
+    }
+
+
+    def 'should throw a MongoSocketReadTimeoutException with the Netty stream'() {
+        given:
+        def connection = new InternalStreamConnectionFactory(
+                new NettyStreamFactory(readSocketSettings, getSslSettings()), getCredentialListWithCache(), null, null, [], null
+        ).create(new ServerId(new ClusterId(), getPrimary()))
+        connection.open()
+
+        getCollectionHelper().insertDocuments(new BsonDocument('_id', new BsonInt32(1)));
+        def countCommand = new BsonDocument('count', new BsonString(getCollectionName()))
+        countCommand.put('query', new BsonDocument('$where', new BsonString('sleep(5050); return true;')))
+
+        when:
+        executeCommand(getDatabaseName(), countCommand, connection)
+
+        then:
+        thrown(MongoSocketReadTimeoutException)
+
+        cleanup:
+        connection?.close()
+    }
+
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy
new file mode 100644
index 00000000000..2441c27929f
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/CommandHelperSpecification.groovy
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import category.Async
+import com.mongodb.MongoCommandException
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.netty.NettyStreamFactory
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonTimestamp
+import org.junit.experimental.categories.Category
+import spock.lang.Specification
+
+import java.util.concurrent.CountDownLatch
+
+import static com.mongodb.ClusterFixture.getPrimary
+import static com.mongodb.ClusterFixture.getSslSettings
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.internal.connection.CommandHelper.executeCommand
+import static com.mongodb.internal.connection.CommandHelper.executeCommandAsync
+
+class CommandHelperSpecification extends Specification {
+    InternalConnection connection
+
+    def setup() {
+        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
+                getCredentialListWithCache(), null, null, [], null)
+                .create(new ServerId(new ClusterId(), getPrimary()))
+        connection.open()
+    }
+
+    def cleanup() {
+        connection?.close()
+    }
+
+    def 'should gossip cluster time'() {
+        given:
+        def connection = Mock(InternalStreamConnection) {
+            getDescription() >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                    new ServerVersion(3, 6), 6, ServerType.REPLICA_SET_PRIMARY, 1000, 1000, 1000, [])
+        }
+        def clusterClock = new ClusterClock()
+        clusterClock.advance(new BsonDocument('clusterTime', new BsonTimestamp(42L)))
+
+        when:
+        executeCommand('admin', new BsonDocument('ismaster', new BsonInt32(1)), clusterClock, connection)
+
+        then:
+        1 * connection.sendAndReceive(_, _, ) { it instanceof ClusterClockAdvancingSessionContext }
+    }
+
+    @Category(Async)
+    def 'should execute command asynchronously'() {
+        when:
+        BsonDocument receivedDocument = null
+        Throwable receivedException = null
+        def latch1 = new CountDownLatch(1)
+        executeCommandAsync('admin', new BsonDocument('ismaster', new BsonInt32(1)), connection)
+                { document, exception -> receivedDocument = document; receivedException = exception; latch1.countDown() }
+        latch1.await()
+
+        then:
+        !receivedDocument.isEmpty()
+        receivedDocument.containsKey('ok')
+        !receivedException
+
+        when:
+        def latch2 = new CountDownLatch(1)
+        executeCommandAsync('admin', new BsonDocument('non-existent-command', new BsonInt32(1)), connection)
+                { document, exception -> receivedDocument = document; receivedException = exception; latch2.countDown() }
+        latch2.await()
+
+        then:
+        !receivedDocument
+        receivedException instanceof MongoCommandException
+    }
+
+}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/DefaultConnectionPoolTest.java b/driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java
similarity index 90%
rename from driver-core/src/test/functional/com/mongodb/connection/DefaultConnectionPoolTest.java
rename to driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java
index fc60338e8bd..fe3c4271dc9 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/DefaultConnectionPoolTest.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoWaitQueueFullException;
 import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerId;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -58,8 +61,9 @@ public void shouldThrowOnTimeout() throws InterruptedException {
                                                                    .maxSize(1)
                                                                    .maxWaitQueueSize(1)
                                                                    .maxWaitTime(50, MILLISECONDS)
-                                                                   .build(),
-                                             new NoOpConnectionPoolListener());
+                                                                   .build());
+        provider.start();
+
         provider.get();
 
         // when
@@ -80,8 +84,8 @@ public void shouldThrowOnWaitQueueFull() throws InterruptedException {
                                                                    .maxSize(1)
                                                                    .maxWaitQueueSize(1)
                                                                    .maxWaitTime(500, MILLISECONDS)
-                                                                   .build(),
-                                             new NoOpConnectionPoolListener());
+                                                                   .build());
+        provider.start();
 
         provider.get();
 
@@ -107,8 +111,8 @@ public void shouldExpireConnectionAfterMaxLifeTime() throws InterruptedException
                                                                    .maxWaitQueueSize(1)
                                                                    .maintenanceInitialDelay(5, MINUTES)
                                                                    .maxConnectionLifeTime(50, MILLISECONDS)
-                                                                   .build(),
-                                             new NoOpConnectionPoolListener());
+                                                                   .build());
+        provider.start();
 
         // when
         provider.get().close();
@@ -128,8 +132,8 @@ public void shouldExpireConnectionAfterLifeTimeOnClose() throws InterruptedExcep
                                              ConnectionPoolSettings.builder()
                                                                    .maxSize(1)
                                                                    .maxWaitQueueSize(1)
-                                                                   .maxConnectionLifeTime(20, MILLISECONDS).build(),
-                                             new NoOpConnectionPoolListener());
+                                                                   .maxConnectionLifeTime(20, MILLISECONDS).build());
+        provider.start();
 
         // when
         InternalConnection connection = provider.get();
@@ -149,8 +153,8 @@ public void shouldExpireConnectionAfterMaxIdleTime() throws InterruptedException
                                                                    .maxSize(1)
                                                                    .maxWaitQueueSize(1)
                                                                    .maintenanceInitialDelay(5, MINUTES)
-                                                                   .maxConnectionIdleTime(50, MILLISECONDS).build(),
-                                             new NoOpConnectionPoolListener());
+                                                                   .maxConnectionIdleTime(50, MILLISECONDS).build());
+        provider.start();
 
         // when
         provider.get().close();
@@ -171,8 +175,8 @@ public void shouldCloseConnectionAfterExpiration() throws InterruptedException {
                                                                    .maxSize(1)
                                                                    .maxWaitQueueSize(1)
                                                                    .maintenanceInitialDelay(5, MINUTES)
-                                                                   .maxConnectionLifeTime(20, MILLISECONDS).build(),
-                                             new NoOpConnectionPoolListener());
+                                                                   .maxConnectionLifeTime(20, MILLISECONDS).build());
+        provider.start();
 
         // when
         provider.get().close();
@@ -193,8 +197,8 @@ public void shouldCreateNewConnectionAfterExpiration() throws InterruptedExcepti
                                                                    .maxSize(1)
                                                                    .maxWaitQueueSize(1)
                                                                    .maintenanceInitialDelay(5, MINUTES)
-                                                                   .maxConnectionLifeTime(20, MILLISECONDS).build(),
-                                             new NoOpConnectionPoolListener());
+                                                                   .maxConnectionLifeTime(20, MILLISECONDS).build());
+        provider.start();
 
         // when
         provider.get().close();
@@ -217,9 +221,9 @@ public void shouldPruneAfterMaintenanceTaskRuns() throws InterruptedException {
                                                                    .maxConnectionLifeTime(1, MILLISECONDS)
                                                                    .maintenanceInitialDelay(5, MINUTES)
                                                                    .maxWaitQueueSize(1)
-                                                                   .build(),
-                                             new NoOpConnectionPoolListener());
-        provider.get().close();
+                                                                   .build());
+        provider.get().close();                                                  provider.start();
+
 
         // when
         Thread.sleep(10);
@@ -234,35 +238,40 @@ public void shouldNotCallWaitQueueExitedIfWaitQueueEnteredWasNotCalled() throws
         // given
         QueueEventsConnectionPoolListener listener = new QueueEventsConnectionPoolListener();
 
+        // when
         provider = new DefaultConnectionPool(SERVER_ID, connectionFactory,
                                              ConnectionPoolSettings.builder()
                                                                    .maxSize(1)
                                                                    .maxWaitQueueSize(1)
                                                                    .maxWaitTime(5, SECONDS)
-                                                                   .build(),
-                                             listener);
+                                                                   .addConnectionPoolListener(listener)
+                                                                   .build());
+        provider.start();
+
+        // then
+        assertEquals(0, listener.getWaitQueueSize());
 
         // when
         InternalConnection connection = provider.get();
-
         TimeoutTrackingConnectionGetter timeoutTrackingConnectionGetter = new TimeoutTrackingConnectionGetter(provider);
         new Thread(timeoutTrackingConnectionGetter).start();
         Thread.sleep(100);
 
+        // then
         try {
             provider.get();
             fail();
         } catch (MongoWaitQueueFullException e) {
-            // all good
+            assertEquals(1, listener.getWaitQueueSize());
         }
 
         // when
         connection.close();
-
         timeoutTrackingConnectionGetter.getLatch().await();
+        connection = provider.get();
 
         // then
-        connection = provider.get();
+        assertEquals(0, listener.getWaitQueueSize());
 
         // cleanup
         connection.close();
diff --git a/driver-core/src/test/functional/com/mongodb/connection/GSSAPIAuthenticationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/GSSAPIAuthenticationSpecification.groovy
similarity index 89%
rename from driver-core/src/test/functional/com/mongodb/connection/GSSAPIAuthenticationSpecification.groovy
rename to driver-core/src/test/functional/com/mongodb/internal/connection/GSSAPIAuthenticationSpecification.groovy
index 9f2a4247927..ebc63dffd02 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/GSSAPIAuthenticationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/GSSAPIAuthenticationSpecification.groovy
@@ -1,21 +1,20 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.ClusterFixture
 import com.mongodb.MongoCommandException
@@ -23,6 +22,10 @@ import com.mongodb.MongoCredential
 import com.mongodb.MongoSecurityException
 import com.mongodb.ServerAddress
 import com.mongodb.async.FutureResultCallback
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SocketStreamFactory
 import com.mongodb.connection.netty.NettyStreamFactory
 import org.bson.BsonDocument
 import org.bson.BsonString
@@ -38,7 +41,7 @@ import static com.mongodb.ClusterFixture.getConnectionString
 import static com.mongodb.ClusterFixture.getCredentialList
 import static com.mongodb.ClusterFixture.getSslSettings
 import static com.mongodb.MongoCredential.createGSSAPICredential
-import static com.mongodb.connection.CommandHelper.executeCommand
+import static com.mongodb.internal.connection.CommandHelper.executeCommand
 import static java.util.concurrent.TimeUnit.SECONDS
 
 @IgnoreIf({ getCredentialList().isEmpty() || getCredentialList().get(0).getAuthenticationMechanism() != GSSAPI })
@@ -181,16 +184,19 @@ class GSSAPIAuthenticationSpecification extends Specification {
     }
 
     private static MongoCredential getMongoCredential() {
-        getCredentialList().get(0);
+        getCredentialList().get(0)
     }
 
     private static InternalStreamConnection createConnection(final boolean async, final MongoCredential credential) {
         new InternalStreamConnection(
                 new ServerId(new ClusterId(), new ServerAddress(getConnectionString().getHosts().get(0))),
                 async ? new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings())
-                        : new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                new InternalStreamConnectionInitializer(credential == null ? [] : [new GSSAPIAuthenticator(credential)]),
-                new NoOpConnectionListener())
+                        : new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()), [], null,
+                new InternalStreamConnectionInitializer(createAuthenticators(credential), null, []))
+    }
+
+    private static List<Authenticator> createAuthenticators(final MongoCredential credential) {
+        credential == null ? [] : [new GSSAPIAuthenticator(new MongoCredentialWithCache(credential))]
     }
 
     private static void openConnection(final InternalConnection connection, final boolean async) {
@@ -198,7 +204,6 @@ class GSSAPIAuthenticationSpecification extends Specification {
             FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
             connection.openAsync(futureResultCallback)
             futureResultCallback.get(ClusterFixture.TIMEOUT, SECONDS);
-
         } else {
             connection.open()
         }
diff --git a/driver-core/src/test/functional/com/mongodb/connection/GetMoreProtocolCommandEventSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/GetMoreProtocolCommandEventSpecification.groovy
similarity index 92%
rename from driver-core/src/test/functional/com/mongodb/connection/GetMoreProtocolCommandEventSpecification.groovy
rename to driver-core/src/test/functional/com/mongodb/internal/connection/GetMoreProtocolCommandEventSpecification.groovy
index 23770159bc8..92f39556b9c 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/GetMoreProtocolCommandEventSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/GetMoreProtocolCommandEventSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,14 +12,15 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- *
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.MongoQueryException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
 import com.mongodb.connection.netty.NettyStreamFactory
 import com.mongodb.event.CommandFailedEvent
 import com.mongodb.event.CommandStartedEvent
@@ -34,18 +35,19 @@ import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import spock.lang.Shared
 
-import static com.mongodb.ClusterFixture.getCredentialList
 import static com.mongodb.ClusterFixture.getPrimary
 import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.connection.ProtocolTestHelper.execute
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.internal.connection.ProtocolTestHelper.execute
+
 
 class GetMoreProtocolCommandEventSpecification extends OperationFunctionalSpecification {
     @Shared
-    InternalStreamConnection connection;
+    InternalStreamConnection connection
 
     def setupSpec() {
         connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
+                getCredentialListWithCache(), null, null, [], null)
                 .create(new ServerId(new ClusterId(), getPrimary()))
         connection.open();
     }
diff --git a/driver-core/src/test/functional/com/mongodb/connection/KillCursorProtocolCommandEventSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/KillCursorProtocolCommandEventSpecification.groovy
similarity index 87%
rename from driver-core/src/test/functional/com/mongodb/connection/KillCursorProtocolCommandEventSpecification.groovy
rename to driver-core/src/test/functional/com/mongodb/internal/connection/KillCursorProtocolCommandEventSpecification.groovy
index 6d82c165dd6..73db97c39fb 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/KillCursorProtocolCommandEventSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/KillCursorProtocolCommandEventSpecification.groovy
@@ -1,24 +1,25 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- *
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
 import com.mongodb.connection.netty.NettyStreamFactory
 import com.mongodb.event.CommandStartedEvent
 import com.mongodb.event.CommandSucceededEvent
@@ -31,10 +32,11 @@ import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import spock.lang.Shared
 
-import static com.mongodb.ClusterFixture.getCredentialList
 import static com.mongodb.ClusterFixture.getPrimary
 import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.connection.ProtocolTestHelper.execute
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.internal.connection.ProtocolTestHelper.execute
+
 
 class KillCursorProtocolCommandEventSpecification extends OperationFunctionalSpecification {
     @Shared
@@ -42,7 +44,7 @@ class KillCursorProtocolCommandEventSpecification extends OperationFunctionalSpe
 
     def setupSpec() {
         connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
+                getCredentialListWithCache(), null, null, [], null)
                 .create(new ServerId(new ClusterId(), getPrimary()))
         connection.open();
     }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/PlainAuthenticationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/PlainAuthenticationSpecification.groovy
new file mode 100644
index 00000000000..8892a4c383f
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/PlainAuthenticationSpecification.groovy
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.ClusterFixture
+import com.mongodb.MongoCommandException
+import com.mongodb.MongoCredential
+import com.mongodb.MongoSecurityException
+import com.mongodb.ServerAddress
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SocketStreamFactory
+import com.mongodb.connection.netty.NettyStreamFactory
+import org.bson.BsonDocument
+import org.bson.BsonString
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.AuthenticationMechanism.PLAIN
+import static com.mongodb.ClusterFixture.getConnectionString
+import static com.mongodb.ClusterFixture.getCredentialList
+import static com.mongodb.ClusterFixture.getSslSettings
+import static com.mongodb.MongoCredential.createPlainCredential
+import static com.mongodb.internal.connection.CommandHelper.executeCommand
+import static java.util.concurrent.TimeUnit.SECONDS
+
+@IgnoreIf({ getCredentialList().isEmpty() || getCredentialList().get(0).getAuthenticationMechanism() != PLAIN })
+class PlainAuthenticationSpecification extends Specification {
+
+    def 'should not authorize when not authenticated'() {
+        given:
+        def connection = createConnection(async, null)
+
+        when:
+        openConnection(connection, async)
+        executeCommand(getConnectionString().getDatabase(), new BsonDocument('count', new BsonString('test')), connection)
+
+        then:
+        thrown(MongoCommandException)
+
+        cleanup:
+        connection?.close()
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should authorize when successfully authenticated'() {
+        given:
+        def connection = createConnection(async, getMongoCredential())
+
+        when:
+        openConnection(connection, async)
+        executeCommand(getConnectionString().getDatabase(), new BsonDocument('count', new BsonString('test')), connection)
+
+        then:
+        true
+
+        cleanup:
+        connection?.close()
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw MongoSecurityException when authentication fails'() {
+        given:
+        def connection = createConnection(async, createPlainCredential('wrongUserName', '$external', 'wrongPassword'.toCharArray()))
+
+        when:
+        openConnection(connection, async)
+        executeCommand(getConnectionString().getDatabase(), new BsonDocument('count', new BsonString('test')), connection)
+
+        then:
+        thrown(MongoSecurityException)
+
+        cleanup:
+        connection?.close()
+
+        where:
+        async << [true, false]
+    }
+
+    private static MongoCredential getMongoCredential() {
+        getCredentialList().get(0);
+    }
+
+    private static InternalStreamConnection createConnection(final boolean async, final MongoCredential credential) {
+        new InternalStreamConnection(
+                new ServerId(new ClusterId(), new ServerAddress(getConnectionString().getHosts().get(0))),
+                async ? new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings())
+                        : new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings()), [], null,
+                new InternalStreamConnectionInitializer(createAuthenticators(credential), null, []))
+    }
+
+    private static List<Authenticator> createAuthenticators(final MongoCredential credential) {
+        credential == null ? [] : [new PlainAuthenticator(new MongoCredentialWithCache(credential))]
+    }
+
+    private static void openConnection(final InternalConnection connection, final boolean async) {
+        if (async) {
+            FutureResultCallback<Void> futureResultCallback = new FutureResultCallback<Void>();
+            connection.openAsync(futureResultCallback)
+            futureResultCallback.get(ClusterFixture.TIMEOUT, SECONDS);
+        } else {
+            connection.open()
+        }
+    }
+}
+
+
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/PlainAuthenticatorTest.java b/driver-core/src/test/functional/com/mongodb/internal/connection/PlainAuthenticatorTest.java
new file mode 100644
index 00000000000..cece39c9844
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/PlainAuthenticatorTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCompressor;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SocketStreamFactory;
+import com.mongodb.connection.StreamFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static com.mongodb.ClusterFixture.getSslSettings;
+
+@Ignore
+public class PlainAuthenticatorTest {
+    private InternalConnection internalConnection;
+    private ConnectionDescription connectionDescription;
+    private String userName;
+    private String source;
+    private String password;
+    private StreamFactory streamFactory = new SocketStreamFactory(SocketSettings.builder().build(), getSslSettings());
+
+    @Before
+    public void setUp() {
+        String host = System.getProperty("org.mongodb.test.host");
+        userName = System.getProperty("org.mongodb.test.userName");
+        source = System.getProperty("org.mongod.test.source");
+        password = System.getProperty("org.mongodb.test.password");
+        internalConnection = new InternalStreamConnectionFactory(streamFactory, Collections.<MongoCredentialWithCache>emptyList(), null,
+                null, Collections.<MongoCompressor>emptyList(), null).create(new ServerId(new ClusterId(), new ServerAddress(host)));
+        connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()));
+    }
+
+    @After
+    public void tearDown() {
+        internalConnection.close();
+    }
+
+    @Test
+    public void testSuccessfulAuthentication() {
+        PlainAuthenticator authenticator = new PlainAuthenticator(getCredentialWithCache(userName, source, password.toCharArray()));
+        authenticator.authenticate(internalConnection, connectionDescription);
+    }
+
+    @Test(expected = MongoSecurityException.class)
+    public void testUnsuccessfulAuthentication() {
+        PlainAuthenticator authenticator = new PlainAuthenticator(getCredentialWithCache(userName, source, "wrong".toCharArray()));
+        authenticator.authenticate(internalConnection, connectionDescription);
+    }
+
+    private static MongoCredentialWithCache getCredentialWithCache(final String userName, final String source, final char[] password) {
+        return new MongoCredentialWithCache(MongoCredential.createPlainCredential(userName, source, password));
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/ProtocolTestHelper.java b/driver-core/src/test/functional/com/mongodb/internal/connection/ProtocolTestHelper.java
new file mode 100644
index 00000000000..333cda9341a
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/ProtocolTestHelper.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ClusterFixture;
+import com.mongodb.async.FutureResultCallback;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+final class ProtocolTestHelper {
+    public static <T> T execute(final LegacyProtocol<T> protocol, final InternalConnection connection, final boolean async)
+            throws Throwable{
+        if (async) {
+            final FutureResultCallback<T> futureResultCallback = new FutureResultCallback<T>();
+            protocol.executeAsync(connection, futureResultCallback);
+            return futureResultCallback.get(ClusterFixture.TIMEOUT, SECONDS);
+        } else {
+            return protocol.execute(connection);
+        }
+    }
+
+    public static <T> T execute(final CommandProtocol<T> protocol, final InternalConnection connection, final boolean async)
+            throws Throwable{
+        if (async) {
+            final FutureResultCallback<T> futureResultCallback = new FutureResultCallback<T>();
+            protocol.executeAsync(connection, futureResultCallback);
+            return futureResultCallback.get(ClusterFixture.TIMEOUT, SECONDS);
+        } else {
+            return protocol.execute(connection);
+        }
+    }
+
+    private ProtocolTestHelper() {}
+}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/QueryProtocolCommandEventSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/QueryProtocolCommandEventSpecification.groovy
similarity index 90%
rename from driver-core/src/test/functional/com/mongodb/connection/QueryProtocolCommandEventSpecification.groovy
rename to driver-core/src/test/functional/com/mongodb/internal/connection/QueryProtocolCommandEventSpecification.groovy
index 76cb4997631..6adbedc4276 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/QueryProtocolCommandEventSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/QueryProtocolCommandEventSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,15 +12,17 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- *
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.MongoQueryException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.connection.AsynchronousSocketChannelStreamFactory
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
 import com.mongodb.connection.netty.NettyStreamFactory
 import com.mongodb.event.CommandFailedEvent
 import com.mongodb.event.CommandStartedEvent
@@ -37,26 +39,35 @@ import org.bson.codecs.BsonDocumentCodec
 import spock.lang.IgnoreIf
 import spock.lang.Shared
 
-import static com.mongodb.ClusterFixture.getCredentialList
 import static com.mongodb.ClusterFixture.getPrimary
 import static com.mongodb.ClusterFixture.getSslSettings
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static com.mongodb.connection.ProtocolTestHelper.execute
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.internal.connection.ProtocolTestHelper.execute
 import static org.bson.BsonDocument.parse
 
+@IgnoreIf({ isNotAtLeastJava7() || getSslSettings().isEnabled() })
 class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecification {
     @Shared
-    InternalStreamConnection connection;
+    InternalStreamConnection nettyConnection
+    @Shared
+    InternalStreamConnection nioConnection
 
     def setupSpec() {
-        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
-                                                         getCredentialList(), new NoOpConnectionListener())
+        nettyConnection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
+                getCredentialListWithCache(), null, null, [], null)
+                .create(new ServerId(new ClusterId(), getPrimary()))
+        nettyConnection.open()
+
+        nioConnection = new InternalStreamConnectionFactory(new AsynchronousSocketChannelStreamFactory(SocketSettings.builder().build(),
+                getSslSettings()), getCredentialListWithCache(), null, null, [], null)
                 .create(new ServerId(new ClusterId(), getPrimary()))
-        connection.open();
+        nioConnection.open()
     }
 
     def cleanupSpec() {
-        connection?.close()
+        nettyConnection?.close()
+        nioConnection?.close()
     }
 
     def 'should deliver start and completed command events with numberToReturn'() {
@@ -93,7 +104,7 @@ class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                              new CommandSucceededEvent(1, connection.getDescription(), 'find', response, 0)])
 
         where:
-        async << [false, true]
+        [async, connection] << [[false, true], [nettyConnection, nioConnection]].combinations()
     }
 
     def 'should deliver start and completed command events with limit and batchSize'() {
@@ -134,7 +145,7 @@ class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                              new CommandSucceededEvent(1, connection.getDescription(), 'find', response, 0)])
 
         where:
-        async << [false, true]
+        [async, connection] << [[false, true], [nettyConnection, nioConnection]].combinations()
     }
 
     def 'should deliver start and completed command events when there is no projection'() {
@@ -164,7 +175,7 @@ class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                              new CommandSucceededEvent(1, connection.getDescription(), 'find', response, 0)])
 
         where:
-        async << [false, true]
+        [async, connection] << [[false, true], [nettyConnection, nioConnection]].combinations()
     }
 
     def 'should deliver start and completed command events when there are boolean options'() {
@@ -206,10 +217,9 @@ class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                              new CommandSucceededEvent(1, connection.getDescription(), 'find', response, 0)])
 
         where:
-        async << [false, true]
+        [async, connection] << [[false, true], [nettyConnection, nioConnection]].combinations()
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'should deliver start and completed command events with meta operators'() {
         given:
         def documents = [new BsonDocument('_id', new BsonInt32(1)),
@@ -280,7 +290,7 @@ class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                              new CommandSucceededEvent(1, connection.getDescription(), 'find', response, 0)])
 
         where:
-        async << [false, true]
+        [async, connection] << [[false, true], [nettyConnection, nioConnection]].combinations()
     }
 
     def 'should deliver start and completed command events for an explain command when there is a $explain meta operator'() {
@@ -313,7 +323,7 @@ class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                              new CommandSucceededEvent(1, connection.getDescription(), 'explain', expectedResponse, 0)])
 
         where:
-        async << [false, true]
+        [async, connection] << [[false, true], [nettyConnection, nioConnection]].combinations()
     }
 
     def 'should deliver start and failed command events'() {
@@ -339,6 +349,6 @@ class QueryProtocolCommandEventSpecification extends OperationFunctionalSpecific
                                              new CommandFailedEvent(1, connection.getDescription(), 'find', 0, e)])
 
         where:
-        async << [false, true]
+        [async, connection] << [[false, true], [nettyConnection, nioConnection]].combinations()
     }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/connection/QueueEventsConnectionPoolListener.java b/driver-core/src/test/functional/com/mongodb/internal/connection/QueueEventsConnectionPoolListener.java
similarity index 94%
rename from driver-core/src/test/functional/com/mongodb/connection/QueueEventsConnectionPoolListener.java
rename to driver-core/src/test/functional/com/mongodb/internal/connection/QueueEventsConnectionPoolListener.java
index a9369d32069..2cc924f17a6 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/QueueEventsConnectionPoolListener.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/QueueEventsConnectionPoolListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.event.ConnectionPoolListenerAdapter;
 import com.mongodb.event.ConnectionPoolWaitQueueEnteredEvent;
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/ReplyHeaderSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/ReplyHeaderSpecification.groovy
new file mode 100644
index 00000000000..2164a78b321
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/ReplyHeaderSpecification.groovy
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoInternalException
+import org.bson.io.BasicOutputBuffer
+import spock.lang.Specification
+
+import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize
+
+class ReplyHeaderSpecification extends Specification {
+
+    def 'should parse reply header'() {
+        def outputBuffer = new BasicOutputBuffer();
+        outputBuffer.with {
+            writeInt(186)
+            writeInt(45)
+            writeInt(23)
+            writeInt(1)
+            writeInt(responseFlags)
+            writeLong(9000)
+            writeInt(4)
+            writeInt(30)
+        }
+        def byteBuf = outputBuffer.byteBuffers.get(0)
+
+        when:
+        def replyHeader = new ReplyHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()));
+
+        then:
+        replyHeader.messageLength == 186
+        replyHeader.requestId == 45
+        replyHeader.responseTo == 23
+        replyHeader.responseFlags == responseFlags
+        replyHeader.cursorId == 9000
+        replyHeader.startingFrom == 4
+        replyHeader.numberReturned == 30
+        replyHeader.cursorNotFound == cursorNotFound
+        replyHeader.queryFailure == queryFailure
+
+        where:
+        responseFlags << [0, 1, 2, 3]
+        cursorNotFound << [false, true, false, true]
+        queryFailure << [false, false, true, true]
+    }
+
+    def 'should parse reply header with compressed header'() {
+        def outputBuffer = new BasicOutputBuffer();
+        outputBuffer.with {
+            writeInt(186)
+            writeInt(45)
+            writeInt(23)
+            writeInt(2012)
+            writeInt(1)
+            writeInt(258)
+            writeByte(2)
+            writeInt(responseFlags)
+            writeLong(9000)
+            writeInt(4)
+            writeInt(30)
+        }
+        def byteBuf = outputBuffer.byteBuffers.get(0)
+        def compressedHeader = new CompressedHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()))
+
+        when:
+        def replyHeader = new ReplyHeader(byteBuf, compressedHeader);
+
+        then:
+        replyHeader.messageLength == 274
+        replyHeader.requestId == 45
+        replyHeader.responseTo == 23
+        replyHeader.responseFlags == responseFlags
+        replyHeader.cursorId == 9000
+        replyHeader.startingFrom == 4
+        replyHeader.numberReturned == 30
+        replyHeader.cursorNotFound == cursorNotFound
+        replyHeader.queryFailure == queryFailure
+
+        where:
+        responseFlags << [0, 1, 2, 3]
+        cursorNotFound << [false, true, false, true]
+        queryFailure << [false, false, true, true]
+    }
+
+    def 'should throw MongoInternalException on incorrect opCode'() {
+        def outputBuffer = new BasicOutputBuffer();
+        outputBuffer.with {
+            writeInt(36)
+            writeInt(45)
+            writeInt(23)
+            writeInt(2)
+            writeInt(0)
+            writeLong(2)
+            writeInt(0)
+            writeInt(0)
+        }
+        def byteBuf = outputBuffer.byteBuffers.get(0)
+
+        when:
+        new ReplyHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()));
+
+        then:
+        def ex = thrown(MongoInternalException)
+        ex.getMessage() == 'Unexpected reply message opCode 2'
+    }
+
+    def 'should throw MongoInternalException on message size < 36'() {
+        def outputBuffer = new BasicOutputBuffer();
+        outputBuffer.with {
+            writeInt(35)
+            writeInt(45)
+            writeInt(23)
+            writeInt(1)
+            writeInt(0)
+            writeLong(2)
+            writeInt(0)
+            writeInt(0)
+        }
+        def byteBuf = outputBuffer.byteBuffers.get(0)
+
+        when:
+        new ReplyHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()));
+
+        then:
+        def ex = thrown(MongoInternalException)
+        ex.getMessage() == 'The reply message length 35 is less than the mimimum message length 36'
+    }
+
+    def 'should throw MongoInternalException on message size > max message size'() {
+        def outputBuffer = new BasicOutputBuffer();
+        outputBuffer.with {
+            writeInt(400)
+            writeInt(45)
+            writeInt(23)
+            writeInt(1)
+            writeInt(0)
+            writeLong(2)
+            writeInt(0)
+            writeInt(0)
+        }
+        def byteBuf = outputBuffer.byteBuffers.get(0)
+
+        when:
+        new ReplyHeader(byteBuf, new MessageHeader(byteBuf, 399));
+
+        then:
+        def ex = thrown(MongoInternalException)
+        ex.getMessage() == 'The reply message length 400 is greater than the maximum message length 399'
+    }
+
+    def 'should throw MongoInternalException on num documents < 0'() {
+        def outputBuffer = new BasicOutputBuffer();
+        outputBuffer.with {
+            writeInt(186)
+            writeInt(45)
+            writeInt(23)
+            writeInt(1)
+            writeInt(1)
+            writeLong(9000)
+            writeInt(4)
+            writeInt(-1)
+        }
+        def byteBuf = outputBuffer.byteBuffers.get(0)
+
+        when:
+        new ReplyHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()));
+
+        then:
+        def ex = thrown(MongoInternalException)
+        ex.getMessage() == 'The reply message number of returned documents, -1, is less than 0'
+    }
+
+    def 'should throw MongoInternalException on num documents < 0 with compressed header'() {
+        def outputBuffer = new BasicOutputBuffer();
+        outputBuffer.with {
+            writeInt(186)
+            writeInt(45)
+            writeInt(23)
+            writeInt(2012)
+            writeInt(1)
+            writeInt(258)
+            writeByte(2)
+            writeInt(1)
+            writeLong(9000)
+            writeInt(4)
+            writeInt(-1)
+        }
+        def byteBuf = outputBuffer.byteBuffers.get(0)
+        def compressedHeader = new CompressedHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()))
+
+        when:
+        new ReplyHeader(byteBuf, compressedHeader);
+
+        then:
+        def ex = thrown(MongoInternalException)
+        ex.getMessage() == 'The reply message number of returned documents, -1, is less than 0'
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/ScramSha256AuthenticationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/ScramSha256AuthenticationSpecification.groovy
new file mode 100644
index 00000000000..eca1742320c
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/ScramSha256AuthenticationSpecification.groovy
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.ClusterFixture
+import com.mongodb.MongoCredential
+import com.mongodb.MongoSecurityException
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.binding.AsyncClusterBinding
+import com.mongodb.binding.ClusterBinding
+import com.mongodb.operation.CommandReadOperation
+import com.mongodb.operation.CommandWriteOperation
+import com.mongodb.operation.DropUserOperation
+import org.bson.BsonDocumentWrapper
+import org.bson.Document
+import org.bson.codecs.DocumentCodec
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.createAsyncCluster
+import static com.mongodb.ClusterFixture.createCluster
+import static com.mongodb.ClusterFixture.isAuthenticated
+import static com.mongodb.MongoCredential.createCredential
+import static com.mongodb.MongoCredential.createScramSha1Credential
+import static com.mongodb.MongoCredential.createScramSha256Credential
+
+@IgnoreIf({ !ClusterFixture.serverVersionAtLeast(4, 0) || !isAuthenticated() })
+class ScramSha256AuthenticationSpecification extends Specification {
+
+    static MongoCredential sha1Implicit = createCredential('sha1', 'admin', 'sha1'.toCharArray())
+    static MongoCredential sha1Explicit = createScramSha1Credential('sha1', 'admin', 'sha1'.toCharArray())
+    static MongoCredential sha256Implicit = createCredential('sha256', 'admin', 'sha256'.toCharArray())
+    static MongoCredential sha256Explicit = createScramSha256Credential('sha256', 'admin', 'sha256'.toCharArray())
+    static MongoCredential bothImplicit = createCredential('both', 'admin', 'both'.toCharArray())
+    static MongoCredential bothExplicitSha1 = createScramSha1Credential('both', 'admin', 'both'.toCharArray())
+    static MongoCredential bothExplicitSha256 = createScramSha256Credential('both', 'admin', 'both'.toCharArray())
+
+    static MongoCredential sha1AsSha256 = createScramSha256Credential('sha1', 'admin', 'sha1'.toCharArray())
+    static MongoCredential sha256AsSha1 = createScramSha1Credential('sha256', 'admin', 'sha256'.toCharArray())
+    static MongoCredential nonExistentUserImplicit = createCredential('nonexistent', 'admin', 'pwd'.toCharArray())
+
+    static MongoCredential userNinePrepped = createScramSha256Credential('IX', 'admin', 'IX'.toCharArray())
+    static MongoCredential userNineUnprepped = createScramSha256Credential('IX', 'admin', 'I\u00ADX'.toCharArray())
+
+    static MongoCredential userFourPrepped = createScramSha256Credential('\u2168', 'admin', 'IV'.toCharArray())
+    static MongoCredential userFourUnprepped = createScramSha256Credential('\u2168', 'admin', 'I\u00ADV'.toCharArray())
+
+    def setupSpec() {
+        createUser('sha1', 'sha1', ['SCRAM-SHA-1'])
+        createUser('sha256', 'sha256', ['SCRAM-SHA-256'])
+        createUser('both', 'both', ['SCRAM-SHA-1', 'SCRAM-SHA-256'])
+        createUser('IX', 'IX', ['SCRAM-SHA-256'])
+        createUser('\u2168', '\u2163', ['SCRAM-SHA-256'])
+    }
+
+
+    def cleanupSpec() {
+        dropUser('sha1')
+        dropUser('sha256')
+        dropUser('both')
+        dropUser('IX')
+        dropUser('\u2168')
+    }
+
+    def createUser(final String userName, final String password, final List<String> mechanisms) {
+        def createUserCommand = new Document('createUser', userName)
+                .append('pwd', password)
+                .append('roles', ['root'])
+                .append('mechanisms', mechanisms)
+        new CommandWriteOperation<Document>('admin',
+                new BsonDocumentWrapper<Document>(createUserCommand, new DocumentCodec()), new DocumentCodec())
+                .execute(getBinding())
+    }
+
+    def dropUser(final String userName) {
+        new DropUserOperation('admin', userName).execute(getBinding())
+    }
+
+    def 'test authentication and authorization'() {
+        given:
+        def cluster = createCluster(credentials)
+
+        when:
+        new CommandReadOperation<Document>('admin',
+                new BsonDocumentWrapper<Document>(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
+                .execute(new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT))
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        cluster.close()
+
+        where:
+        credentials << [[sha1Implicit],
+                        [sha1Explicit],
+                        [sha256Implicit],
+                        [sha256Explicit],
+                        [bothImplicit],
+                        [bothExplicitSha1],
+                        [bothExplicitSha256],
+                        [sha1Implicit, sha1Explicit, sha256Implicit, sha256Explicit, bothImplicit, bothExplicitSha1, bothExplicitSha256]
+        ]
+    }
+
+    def 'test authentication and authorization async'() {
+        given:
+        def cluster = createAsyncCluster(credentials)
+        def callback = new FutureResultCallback()
+
+        when:
+        // make this synchronous
+        new CommandReadOperation<Document>('admin',
+                new BsonDocumentWrapper<Document>(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
+                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT), callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        cluster.close()
+
+        where:
+        credentials << [[sha1Implicit],
+                        [sha1Explicit],
+                        [sha256Implicit],
+                        [sha256Explicit],
+                        [bothImplicit],
+                        [bothExplicitSha1],
+                        [bothExplicitSha256],
+                        [sha1Implicit, sha1Explicit, sha256Implicit, sha256Explicit, bothImplicit, bothExplicitSha1, bothExplicitSha256]
+        ]
+    }
+
+    def 'test authentication and authorization failure with wrong mechanism'() {
+        given:
+        def cluster = createCluster(credentials)
+
+        when:
+        new CommandReadOperation<Document>('admin',
+                new BsonDocumentWrapper<Document>(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
+                .execute(new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT))
+
+        then:
+        thrown(MongoSecurityException)
+
+        cleanup:
+        cluster.close()
+
+        where:
+        credentials << [[sha1AsSha256], [sha256AsSha1], [nonExistentUserImplicit]]
+    }
+
+    def 'test authentication and authorization failure with wrong mechanism async'() {
+        given:
+        def cluster = createAsyncCluster(credentials)
+        def callback = new FutureResultCallback()
+
+        when:
+        new CommandReadOperation<Document>('admin',
+                new BsonDocumentWrapper<Document>(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
+                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT), callback)
+        callback.get()
+
+        then:
+        thrown(MongoSecurityException)
+
+        cleanup:
+        cluster.close()
+
+        where:
+        credentials << [[sha1AsSha256], [sha256AsSha1], [nonExistentUserImplicit]]
+    }
+
+    def 'test SASL Prep'() {
+        given:
+        def cluster = createCluster(credentials)
+
+        when:
+        new CommandReadOperation<Document>('admin',
+                new BsonDocumentWrapper<Document>(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
+                .execute(new ClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT))
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        cluster.close()
+
+        where:
+        credentials << [[userNinePrepped], [userNineUnprepped], [userFourPrepped], [userFourUnprepped]]
+    }
+
+    def 'test SASL Prep async'() {
+        given:
+        def cluster = createAsyncCluster(credentials)
+        def callback = new FutureResultCallback()
+
+        when:
+        new CommandReadOperation<Document>('admin',
+                new BsonDocumentWrapper<Document>(new Document('dbstats', 1), new DocumentCodec()), new DocumentCodec())
+                .executeAsync(new AsyncClusterBinding(cluster, ReadPreference.primary(), ReadConcern.DEFAULT), callback)
+        callback.get()
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        cluster.close()
+
+        where:
+        credentials << [[userNinePrepped], [userNineUnprepped], [userFourPrepped], [userFourUnprepped]]
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/ServerHelper.java b/driver-core/src/test/functional/com/mongodb/internal/connection/ServerHelper.java
similarity index 78%
rename from driver-core/src/test/functional/com/mongodb/connection/ServerHelper.java
rename to driver-core/src/test/functional/com/mongodb/internal/connection/ServerHelper.java
index 0985238c3dc..bdb0afd3397 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/ServerHelper.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/ServerHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ClusterFixture;
 import com.mongodb.MongoInterruptedException;
 import com.mongodb.MongoTimeoutException;
 import com.mongodb.ServerAddress;
 import com.mongodb.binding.AsyncConnectionSource;
-import com.mongodb.internal.connection.ConcurrentPool;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.selector.ServerAddressSelector;
 
 import static com.mongodb.ClusterFixture.getAsyncCluster;
@@ -34,13 +35,26 @@ public static void checkPool(final ServerAddress address) {
         checkPool(address, getAsyncCluster());
     }
 
+    public static void waitForLastRelease(final Cluster cluster) {
+        for (ServerDescription cur : cluster.getCurrentDescription().getServerDescriptions()) {
+            if (cur.isOk()) {
+                waitForLastRelease(cur.getAddress(), cluster);
+            }
+        }
+    }
+
     public static void waitForLastRelease(final ServerAddress address, final Cluster cluster) {
         DefaultServer server = (DefaultServer) cluster.selectServer(new ServerAddressSelector(address));
         DefaultConnectionPool connectionProvider = (DefaultConnectionPool) server.getConnectionPool();
         ConcurrentPool<UsageTrackingInternalConnection> pool = connectionProvider.getPool();
+        long startTime = System.currentTimeMillis();
         while (pool.getInUseCount() > 0) {
             try {
                 sleep(10);
+                if (System.currentTimeMillis() > startTime + ClusterFixture.TIMEOUT * 1000) {
+                    throw new MongoTimeoutException("Timed out waiting for pool in use count to drop to 0.  Now at: "
+                                                            + pool.getInUseCount());
+                }
             } catch (InterruptedException e) {
                 throw new MongoInterruptedException("Interrupted", e);
             }
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/ServerMonitorSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/ServerMonitorSpecification.groovy
new file mode 100644
index 00000000000..5bcab74a167
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/ServerMonitorSpecification.groovy
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoSocketException
+import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ServerAddress
+import com.mongodb.Tag
+import com.mongodb.TagSet
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerSettings
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SocketStreamFactory
+import com.mongodb.operation.CommandReadOperation
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.types.ObjectId
+
+import java.util.concurrent.CountDownLatch
+
+import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.getPrimary
+import static com.mongodb.ClusterFixture.getSslSettings
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.connection.ServerConnectionState.CONNECTED
+import static com.mongodb.connection.ServerConnectionState.CONNECTING
+import static com.mongodb.connection.ServerDescription.builder
+import static com.mongodb.internal.connection.DefaultServerMonitor.shouldLogStageChange
+import static java.util.Arrays.asList
+
+class ServerMonitorSpecification extends OperationFunctionalSpecification {
+    ServerDescription newDescription
+    ServerMonitor serverMonitor
+    CountDownLatch latch = new CountDownLatch(1)
+
+    def cleanup() {
+        serverMonitor?.close()
+    }
+
+    def 'should have positive round trip time'() {
+        given:
+        initializeServerMonitor(getPrimary())
+
+        when:
+        latch.await()
+
+        then:
+        newDescription.roundTripTimeNanos > 0
+    }
+
+    def 'should return server version'() {
+        given:
+        initializeServerMonitor(getPrimary())
+
+        def commandResult = new CommandReadOperation<BsonDocument>('admin', new BsonDocument('buildinfo', new BsonInt32(1)),
+                                                                   new BsonDocumentCodec())
+                .execute(getBinding())
+        def expectedVersion = new ServerVersion(commandResult.getArray('versionArray')[0..2]*.value)
+        when:
+        latch.await()
+
+        then:
+        newDescription.version == expectedVersion
+
+        cleanup:
+        serverMonitor.close()
+    }
+
+    def 'should report current exception'() {
+        given:
+        initializeServerMonitor(new ServerAddress('some_unknown_server_name:34567'))
+
+        when:
+        latch.await()
+
+        then:
+        newDescription.exception instanceof MongoSocketException
+    }
+
+    def 'should log state change if significant properties have changed'() {
+        given:
+        ServerDescription.Builder builder = createBuilder();
+        ServerDescription description = builder.build();
+        ServerDescription otherDescription
+
+        expect:
+        !shouldLogStageChange(description, builder.build())
+
+        when:
+        otherDescription = createBuilder().address(new ServerAddress('localhost:27018')).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().type(ServerType.STANDALONE).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().tagSet(null).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().setName('test2').build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().primary('localhost:27018').build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().canonicalAddress('localhost:27018').build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().hosts(new HashSet<String>(asList('localhost:27018'))).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().arbiters(new HashSet<String>(asList('localhost:27018'))).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().passives(new HashSet<String>(asList('localhost:27018'))).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().ok(false).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().state(CONNECTING).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().version(new ServerVersion(asList(2, 6, 1))).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().electionId(new ObjectId()).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        when:
+        otherDescription = createBuilder().setVersion(3).build();
+
+        then:
+        shouldLogStageChange(description, otherDescription)
+
+        // test exception state changes
+        shouldLogStageChange(createBuilder().exception(new IOException()).build(),
+                createBuilder().exception(new RuntimeException()).build())
+        shouldLogStageChange(createBuilder().exception(new IOException('message one')).build(),
+                createBuilder().exception(new IOException('message two')).build())
+    }
+
+    private static ServerDescription.Builder createBuilder() {
+        builder().ok(true)
+                .state(CONNECTED)
+                .address(new ServerAddress())
+                .type(ServerType.SHARD_ROUTER)
+                .tagSet(new TagSet(asList(new Tag('dc', 'ny'))))
+                .setName('test')
+                .primary('localhost:27017')
+                .canonicalAddress('localhost:27017')
+                .hosts(new HashSet<String>(asList('localhost:27017', 'localhost:27018')))
+                .passives(new HashSet<String>(asList('localhost:27019')))
+                .arbiters(new HashSet<String>(asList('localhost:27020')))
+                .version(new ServerVersion(asList(3, 4, 1)))
+                .electionId(new ObjectId('abcdabcdabcdabcdabcdabcd'))
+                .setVersion(2)
+    }
+
+    def initializeServerMonitor(ServerAddress address) {
+        serverMonitor = new DefaultServerMonitor(new ServerId(new ClusterId(), address), ServerSettings.builder().build(),
+                new ClusterClock(),
+                new ChangeListener<ServerDescription>() {
+                    @Override
+                    void stateChanged(final ChangeEvent<ServerDescription> event) {
+                        newDescription = event.newValue
+                        latch.countDown()
+                    }
+                },
+                new InternalStreamConnectionFactory(new SocketStreamFactory(SocketSettings.builder().build(),
+                        getSslSettings()), getCredentialListWithCache(), null, null, [], null),
+                new TestConnectionPool())
+        serverMonitor.start()
+        serverMonitor
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/SingleServerClusterTest.java b/driver-core/src/test/functional/com/mongodb/internal/connection/SingleServerClusterTest.java
new file mode 100644
index 00000000000..42d5cd21b8e
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/SingleServerClusterTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCompressor;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SocketStreamFactory;
+import com.mongodb.internal.validator.NoOpFieldNameValidator;
+import com.mongodb.selector.ServerSelector;
+import org.bson.BsonDocument;
+import org.bson.BsonDouble;
+import org.bson.BsonString;
+import org.bson.codecs.BsonDocumentCodec;
+import org.junit.After;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.getCredentialList;
+import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.getPrimary;
+import static com.mongodb.ClusterFixture.getSecondary;
+import static com.mongodb.ClusterFixture.getSslSettings;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class SingleServerClusterTest {
+    private SingleServerCluster cluster;
+
+
+    private void setUpCluster(final ServerAddress serverAddress) {
+        SocketStreamFactory streamFactory = new SocketStreamFactory(SocketSettings.builder().build(),
+                getSslSettings());
+        ClusterId clusterId = new ClusterId();
+        ClusterSettings clusterSettings = ClusterSettings.builder()
+                .mode(ClusterConnectionMode.SINGLE)
+                .hosts(singletonList(serverAddress))
+                .build();
+        cluster = new SingleServerCluster(clusterId,
+                clusterSettings,
+                new DefaultClusterableServerFactory(clusterId, clusterSettings, ServerSettings.builder().build(),
+                        ConnectionPoolSettings.builder().maxSize(1).build(),
+                        streamFactory, streamFactory, getCredentialList(),
+
+                        null, null, null,
+                        Collections.<MongoCompressor>emptyList()));
+    }
+
+    @After
+    public void tearDown() {
+        cluster.close();
+    }
+
+    @Test
+    public void shouldGetDescription() {
+        // given
+        setUpCluster(getPrimary());
+
+        // expect
+        assertNotNull(cluster.getDescription());
+    }
+
+    @Test
+    public void descriptionShouldIncludeSettings() {
+        // given
+        setUpCluster(getPrimary());
+
+        // expect
+        assertNotNull(cluster.getDescription().getClusterSettings());
+        assertNotNull(cluster.getDescription().getServerSettings());
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void shouldGetServerWithOkDescription() {
+        // given
+        setUpCluster(getPrimary());
+
+        // when
+        Server server = cluster.selectServer(new ServerSelector() {
+            @Override
+            public List<ServerDescription> select(final ClusterDescription clusterDescription) {
+                return clusterDescription.getPrimaries();
+            }
+        });
+
+        // then
+        assertTrue(server.getDescription().isOk());
+    }
+
+    @Test
+    public void shouldSuccessfullyQueryASecondaryWithPrimaryReadPreference() {
+        // given
+        ServerAddress secondary = getSecondary();
+        setUpCluster(secondary);
+        String collectionName = getClass().getName();
+        Connection connection = cluster.getServer(secondary).getConnection();
+
+        // when
+        BsonDocument result = connection.command(getDefaultDatabaseName(), new BsonDocument("count", new BsonString(collectionName)),
+                new NoOpFieldNameValidator(), ReadPreference.primary(), new BsonDocumentCodec(), NoOpSessionContext.INSTANCE);
+
+        // then
+        assertEquals(new BsonDouble(1.0).intValue(), result.getNumber("ok").intValue());
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/SocketStreamHelperSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/SocketStreamHelperSpecification.groovy
new file mode 100644
index 00000000000..90dcdf4b223
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/SocketStreamHelperSpecification.groovy
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.ClusterFixture
+import com.mongodb.MongoInternalException
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SslSettings
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import javax.net.SocketFactory
+import javax.net.ssl.SNIHostName
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+
+import static com.mongodb.ClusterFixture.getPrimary
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class SocketStreamHelperSpecification extends Specification {
+
+    def 'should configure socket with settings()'() {
+        given:
+        Socket socket = SocketFactory.default.createSocket()
+        def socketSettings = SocketSettings.builder()
+                .readTimeout(10, SECONDS)
+                .keepAlive(true)
+                .build()
+
+        when:
+        SocketStreamHelper.initialize(socket, getPrimary().getSocketAddress(), socketSettings, SslSettings.builder().build())
+
+        then:
+        socket.getTcpNoDelay()
+        socket.getKeepAlive()
+        socket.getSoTimeout() == socketSettings.getReadTimeout(MILLISECONDS)
+
+        cleanup:
+        socket?.close()
+    }
+
+    def 'should connect socket()'() {
+        given:
+        Socket socket = SocketFactory.default.createSocket()
+
+        when:
+        SocketStreamHelper.initialize(socket, getPrimary().getSocketAddress(),
+                SocketSettings.builder().build(), SslSettings.builder().build())
+
+        then:
+        socket.isConnected()
+
+        cleanup:
+        socket?.close()
+    }
+
+    @IgnoreIf({ !ClusterFixture.sslSettings.enabled || isNotAtLeastJava7() })
+    def 'should enable host name verification if socket is an instance of SSLSocket'() {
+        given:
+        SSLSocket socket = SSLSocketFactory.default.createSocket()
+
+        when:
+        SocketStreamHelper.initialize(socket, getPrimary().getSocketAddress(), SocketSettings.builder().build(), sslSettings)
+
+        then:
+        socket.getSSLParameters().endpointIdentificationAlgorithm == (sslSettings.invalidHostNameAllowed ? null : 'HTTPS')
+
+        cleanup:
+        socket?.close()
+
+        where:
+        sslSettings << [SslSettings.builder().enabled(true).build(),
+                        SslSettings.builder().enabled(false).build(),
+                        SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build()]
+    }
+
+    @IgnoreIf({ !ClusterFixture.sslSettings.enabled || isNotAtLeastJava8() })
+    def 'should enable SNI if socket is an instance of SSLSocket'() {
+        given:
+        SSLSocket socket = SSLSocketFactory.default.createSocket()
+
+        when:
+        SocketStreamHelper.initialize(socket, getPrimary().getSocketAddress(), SocketSettings.builder().build(), sslSettings)
+
+        then:
+        socket.getSSLParameters().getServerNames() == [new SNIHostName(getPrimary().getHost())]
+
+        cleanup:
+        socket?.close()
+
+        where:
+        sslSettings << [SslSettings.builder().enabled(true).build(),
+                        SslSettings.builder().enabled(false).build()]
+    }
+
+    def 'should throw MongoInternalException is ssl is enabled and the socket is not an instance of SSLSocket'() {
+        given:
+        Socket socket = SocketFactory.default.createSocket()
+
+        when:
+        SocketStreamHelper.initialize(socket, getPrimary().getSocketAddress(), SocketSettings.builder().build(),
+                SslSettings.builder().enabled(true).build())
+
+        then:
+        thrown(MongoInternalException)
+
+        cleanup:
+        socket?.close()
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/StreamSocketAddressSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/StreamSocketAddressSpecification.groovy
new file mode 100644
index 00000000000..18ee945f7e8
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/StreamSocketAddressSpecification.groovy
@@ -0,0 +1,95 @@
+package com.mongodb.internal.connection
+
+import category.Slow
+import com.mongodb.MongoSocketOpenException
+import com.mongodb.ServerAddress
+import com.mongodb.connection.BufferProvider
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SslSettings
+import org.junit.experimental.categories.Category
+import spock.lang.Ignore
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import javax.net.SocketFactory
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.getSslSettings
+
+class StreamSocketAddressSpecification extends Specification {
+
+    @Category(Slow)
+    @Ignore
+    def 'should successfully connect with working ip address group'() {
+        given:
+        def port = 27017
+        def socketSettings = SocketSettings.builder().connectTimeout(100, TimeUnit.MILLISECONDS).build()
+        def sslSettings = SslSettings.builder().build()
+        def bufferProvider = Stub(BufferProvider)
+
+        def inetAddresses = new InetSocketAddress[3]
+        inetAddresses[0] = new InetSocketAddress(InetAddress.getByName('1.2.3.4'), port)
+        inetAddresses[1] = new InetSocketAddress(InetAddress.getByName('2.3.4.5'), port)
+        inetAddresses[2] = new InetSocketAddress(InetAddress.getByName('127.0.0.1'), port)
+
+        def serverAddress = Stub(ServerAddress)
+        serverAddress.getSocketAddresses() >> inetAddresses
+
+        def socketFactory = Stub(SocketFactory)
+        def socket0 = SocketFactory.default.createSocket()
+        def socket1 = SocketFactory.default.createSocket()
+        def socket2 = SocketFactory.default.createSocket()
+        socketFactory.createSocket() >>> [socket0, socket1, socket2]
+
+        def socketStream = new SocketStream(serverAddress, socketSettings, sslSettings, socketFactory, bufferProvider)
+
+        when:
+        socketStream.open()
+
+        then:
+        !socket0.isConnected()
+        !socket1.isConnected()
+        socket2.isConnected()
+
+        cleanup:
+        socketStream?.close()
+    }
+
+    @Category(Slow)
+    @IgnoreIf({ getSslSettings().isEnabled() })
+    def 'should throw exception when attempting to connect with incorrect ip address group'() {
+        given:
+        def port = 27017
+        def socketSettings = SocketSettings.builder().connectTimeout(100, TimeUnit.MILLISECONDS).build()
+        def sslSettings = SslSettings.builder().build()
+        def bufferProvider = Stub(BufferProvider)
+        def inetAddresses = new InetSocketAddress[3]
+
+        inetAddresses[0] = new InetSocketAddress(InetAddress.getByName('1.2.3.4'), port)
+        inetAddresses[1] = new InetSocketAddress(InetAddress.getByName('2.3.4.5'), port)
+        inetAddresses[2] = new InetSocketAddress(InetAddress.getByName('1.2.3.5'), port)
+
+        def serverAddress = Stub(ServerAddress)
+        serverAddress.getSocketAddresses() >> inetAddresses
+
+        def socketFactory = Stub(SocketFactory)
+        def socket0 = SocketFactory.default.createSocket()
+        def socket1 = SocketFactory.default.createSocket()
+        def socket2 = SocketFactory.default.createSocket()
+        socketFactory.createSocket() >>> [socket0, socket1, socket2]
+
+        def socketStream = new SocketStream(serverAddress, socketSettings, sslSettings, socketFactory, bufferProvider)
+
+        when:
+        socketStream.open()
+
+        then:
+        thrown(MongoSocketOpenException)
+        !socket0.isConnected()
+        !socket1.isConnected()
+        !socket2.isConnected()
+
+        cleanup:
+        socketStream?.close()
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/connection/TestCommandListener.java b/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
similarity index 94%
rename from driver-core/src/test/functional/com/mongodb/connection/TestCommandListener.java
rename to driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
index 13cf3e35da1..0d511e7dbcd 100644
--- a/driver-core/src/test/functional/com/mongodb/connection/TestCommandListener.java
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,11 +12,9 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- *
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.event.CommandEvent;
 import com.mongodb.event.CommandFailedEvent;
@@ -45,6 +43,7 @@
 
 public class TestCommandListener implements CommandListener {
     private final List<CommandEvent> events = new ArrayList<CommandEvent>();
+
     private static final CodecRegistry CODEC_REGISTRY_HACK;
 
     static {
@@ -70,6 +69,17 @@ public List<CommandEvent> getEvents() {
         return events;
     }
 
+    public List<CommandEvent> getCommandStartedEvents() {
+        List<CommandEvent> commandStartedEvents = new ArrayList<CommandEvent>();
+        for (CommandEvent cur : getEvents()) {
+            if (cur instanceof CommandStartedEvent) {
+                commandStartedEvents.add(cur);
+            }
+        }
+        return commandStartedEvents;
+    }
+
+
     @Override
     public void commandStarted(final CommandStartedEvent event) {
         events.add(new CommandStartedEvent(event.getRequestId(), event.getConnectionDescription(), event.getDatabaseName(),
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/WriteProtocolCommandEventSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/WriteProtocolCommandEventSpecification.groovy
new file mode 100644
index 00000000000..f95e9bb404f
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/WriteProtocolCommandEventSpecification.groovy
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ReadPreference
+import com.mongodb.bulk.DeleteRequest
+import com.mongodb.bulk.InsertRequest
+import com.mongodb.bulk.UpdateRequest
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.netty.NettyStreamFactory
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.event.CommandSucceededEvent
+import org.bson.BsonArray
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
+import spock.lang.Shared
+
+import static com.mongodb.ClusterFixture.getPrimary
+import static com.mongodb.ClusterFixture.getSslSettings
+import static com.mongodb.bulk.WriteRequest.Type.REPLACE
+import static com.mongodb.bulk.WriteRequest.Type.UPDATE
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.internal.connection.ProtocolTestHelper.execute
+
+
+class WriteProtocolCommandEventSpecification extends OperationFunctionalSpecification {
+    @Shared
+    InternalStreamConnection connection
+
+    def setupSpec() {
+        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
+                getCredentialListWithCache(), null, null, [], null)
+                .create(new ServerId(new ClusterId(), getPrimary()))
+        connection.open()
+    }
+
+    def cleanupSpec() {
+        connection?.close()
+    }
+
+    def 'should deliver started and completed command events for a single unacknowledged insert'() {
+        given:
+        def document = new BsonDocument('_id', new BsonInt32(1))
+
+        def insertRequest = new InsertRequest(document)
+        def protocol = new InsertProtocol(getNamespace(), true, insertRequest)
+        def commandListener = new TestCommandListener()
+        protocol.commandListener = commandListener
+
+        def expectedEvents = [
+                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'insert',
+                        new BsonDocument('insert', new BsonString(getCollectionName()))
+                                .append('ordered', BsonBoolean.TRUE)
+                                .append('writeConcern',
+                                new BsonDocument('w', new BsonInt32(0)))
+                                .append('documents', new BsonArray(
+                                [new BsonDocument('_id', new BsonInt32(1))]))),
+                new CommandSucceededEvent(1, connection.getDescription(), 'insert',
+                        new BsonDocument('ok', new BsonInt32(1)), 0)]
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        commandListener.eventsWereDelivered(expectedEvents)
+
+        cleanup:
+        // force acknowledgement
+        new CommandProtocolImpl(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                            NO_OP_FIELD_NAME_VALIDATOR, ReadPreference.primary(), new BsonDocumentCodec())
+                .sessionContext(NoOpSessionContext.INSTANCE)
+                .execute(connection)
+
+        where:
+        async << [false, true]
+    }
+
+    def 'should deliver started and completed command events for a update'() {
+        given:
+        def filter = new BsonDocument('_id', new BsonInt32(1))
+        def update = new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1)))
+        def updateRequest = new UpdateRequest(filter, update, UPDATE).multi(true).upsert(true)
+        def protocol = new UpdateProtocol(getNamespace(), true, updateRequest)
+        def commandListener = new TestCommandListener()
+        protocol.commandListener = commandListener
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'update',
+                                                                     new BsonDocument('update', new BsonString(getCollectionName()))
+                                                                             .append('ordered', BsonBoolean.TRUE)
+                                                                             .append('writeConcern',
+                                                                                     new BsonDocument('w', new BsonInt32(0)))
+                                                                             .append('updates', new BsonArray(
+                                                                             [new BsonDocument('q', filter)
+                                                                                      .append('u', update)
+                                                                                      .append('multi', BsonBoolean.TRUE)
+                                                                                      .append('upsert', BsonBoolean.TRUE)]))),
+                                             new CommandSucceededEvent(1, connection.getDescription(), 'update',
+                                                                       new BsonDocument('ok', new BsonInt32(1)), 0)])
+
+        cleanup:
+        // force acknowledgement
+        new CommandProtocolImpl(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                NO_OP_FIELD_NAME_VALIDATOR, ReadPreference.primary(), new BsonDocumentCodec())
+                .sessionContext(NoOpSessionContext.INSTANCE)
+                .execute(connection)
+
+        where:
+        async << [false, true]
+    }
+
+    def 'should deliver started and completed command events for a replace'() {
+        given:
+        def filter = new BsonDocument('_id', new BsonInt32(1))
+        def update = new BsonDocument('x', new BsonInt32(1))
+        def updateRequest = new UpdateRequest(filter, update, REPLACE).multi(false).upsert(true)
+        def protocol = new UpdateProtocol(getNamespace(), true, updateRequest)
+        def commandListener = new TestCommandListener()
+        protocol.commandListener = commandListener
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'update',
+                new BsonDocument('update', new BsonString(getCollectionName()))
+                        .append('ordered', BsonBoolean.TRUE)
+                        .append('writeConcern',
+                        new BsonDocument('w', new BsonInt32(0)))
+                        .append('updates', new BsonArray(
+                        [new BsonDocument('q', filter)
+                                 .append('u', update)
+                                 .append('upsert', BsonBoolean.TRUE)]))),
+                                             new CommandSucceededEvent(1, connection.getDescription(), 'update',
+                                                     new BsonDocument('ok', new BsonInt32(1)), 0)])
+
+        cleanup:
+        // force acknowledgement
+        new CommandProtocolImpl(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                NO_OP_FIELD_NAME_VALIDATOR, ReadPreference.primary(), new BsonDocumentCodec())
+                .sessionContext(NoOpSessionContext.INSTANCE)
+                .execute(connection)
+
+        where:
+        async << [false, true]
+    }
+
+    def 'should deliver started and completed command events for a delete'() {
+        given:
+        def filter = new BsonDocument('_id', new BsonInt32(1))
+        def deleteRequest = new DeleteRequest(filter).multi(true)
+        def protocol = new DeleteProtocol(getNamespace(), true, deleteRequest)
+        def commandListener = new TestCommandListener()
+        protocol.commandListener = commandListener
+
+        def expectedEvents = [
+                new CommandStartedEvent(1, connection.getDescription(), getDatabaseName(), 'delete',
+                        new BsonDocument('delete', new BsonString(getCollectionName()))
+                                .append('ordered', BsonBoolean.TRUE)
+                                .append('writeConcern',
+                                new BsonDocument('w', new BsonInt32(0)))
+                                .append('deletes', new BsonArray(
+                                [new BsonDocument('q', filter)
+                                         .append('limit', new BsonInt32(0))]))),
+                new CommandSucceededEvent(1, connection.getDescription(), 'delete',
+                        new BsonDocument('ok', new BsonInt32(1)), 0)]
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        commandListener.eventsWereDelivered(expectedEvents)
+
+        where:
+        async << [false, true]
+    }
+
+    def 'should not deliver any events if encoding fails'() {
+        given:
+        def insertRequest = new InsertRequest(new BsonDocument('$set', new BsonInt32(1)))
+        def protocol = new InsertProtocol(getNamespace(), true, insertRequest)
+        def commandListener = new TestCommandListener()
+        protocol.commandListener = commandListener
+
+        def expectedEvents = []
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        thrown(IllegalArgumentException)
+        commandListener.eventsWereDelivered(expectedEvents)
+
+        where:
+        async << [false, true]
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/WriteProtocolSpecification.groovy b/driver-core/src/test/functional/com/mongodb/internal/connection/WriteProtocolSpecification.groovy
new file mode 100644
index 00000000000..296ffb3f5d1
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/internal/connection/WriteProtocolSpecification.groovy
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ReadPreference
+import com.mongodb.bulk.InsertRequest
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.netty.NettyStreamFactory
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
+import spock.lang.Shared
+
+import static com.mongodb.ClusterFixture.getPrimary
+import static com.mongodb.ClusterFixture.getSslSettings
+import static com.mongodb.connection.ConnectionFixture.getCredentialListWithCache
+import static com.mongodb.internal.connection.ProtocolTestHelper.execute
+
+
+class WriteProtocolSpecification extends OperationFunctionalSpecification {
+    @Shared
+    InternalStreamConnection connection;
+
+    def setupSpec() {
+        connection = new InternalStreamConnectionFactory(new NettyStreamFactory(SocketSettings.builder().build(), getSslSettings()),
+                getCredentialListWithCache(), null, null, [], null)
+                .create(new ServerId(new ClusterId(), getPrimary()))
+        connection.open();
+    }
+
+    def cleanupSpec() {
+        connection?.close()
+    }
+
+    def 'should ignore write errors on unacknowledged inserts'() {
+        given:
+        def documentOne = new BsonDocument('_id', new BsonInt32(1))
+
+        def protocol = new InsertProtocol(getNamespace(), true, new InsertRequest(documentOne))
+
+        getCollectionHelper().insertDocuments(documentOne)
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        getCollectionHelper().find(new BsonDocumentCodec()) == [documentOne]
+
+        cleanup:
+        // force acknowledgement
+        new CommandProtocolImpl(getDatabaseName(), new BsonDocument('drop', new BsonString(getCollectionName())),
+                NO_OP_FIELD_NAME_VALIDATOR, ReadPreference.primary(), new BsonDocumentCodec())
+                .sessionContext(NoOpSessionContext.INSTANCE)
+                .execute(connection)
+
+        where:
+        async << [false, true]
+    }
+
+
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/AbortTransactionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/AbortTransactionOperationSpecification.groovy
new file mode 100644
index 00000000000..0ededa1fe2f
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/operation/AbortTransactionOperationSpecification.groovy
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.OperationFunctionalSpecification
+import org.bson.BsonDocument
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.MAJORITY
+
+
+class AbortTransactionOperationSpecification extends OperationFunctionalSpecification {
+
+    def 'should produce the expected command'() {
+        given:
+        def cannedResult = BsonDocument.parse('{value: {}}')
+        def expectedCommand = BsonDocument.parse('{abortTransaction: 1}')
+
+        when:
+        def operation = new AbortTransactionOperation(ACKNOWLEDGED)
+
+        then:
+        testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult)
+
+        when:
+        operation = new AbortTransactionOperation(MAJORITY)
+        expectedCommand.put('writeConcern', MAJORITY.asDocument())
+
+        then:
+        testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should retry if the connection initially fails'() {
+        given:
+        def cannedResult = BsonDocument.parse('{value: {}}')
+        def expectedCommand = BsonDocument.parse('{abortTransaction: 1, writeConcern: {w: "majority", wtimeout: 10}}')
+
+        when:
+        def writeConcern = MAJORITY.withWTimeout(10, TimeUnit.MILLISECONDS)
+        def operation = new AbortTransactionOperation(writeConcern)
+
+        then:
+        testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        when:
+        writeConcern = MAJORITY
+        operation = new AbortTransactionOperation(writeConcern)
+        expectedCommand.put('writeConcern', writeConcern.asDocument())
+
+        then:
+        testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        when:
+        writeConcern = ACKNOWLEDGED
+        operation = new AbortTransactionOperation(writeConcern)
+        expectedCommand.remove('writeConcern')
+
+        then:
+        testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        where:
+        async << [true, false]
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/AggregateOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/AggregateOperationSpecification.groovy
index 14ffd073758..2a3e1d70991 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/AggregateOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/AggregateOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,42 +16,56 @@
 
 package com.mongodb.operation
 
-import category.Async
-import com.mongodb.Block
 import com.mongodb.ExplainVerbosity
 import com.mongodb.MongoExecutionTimeoutException
 import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
-import com.mongodb.async.SingleResultCallback
+import com.mongodb.ServerAddress
+import com.mongodb.WriteConcern
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
 import com.mongodb.binding.ConnectionSource
 import com.mongodb.binding.ReadBinding
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.Filters
 import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
 import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
 import org.bson.BsonArray
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
 import org.bson.BsonString
+import org.bson.BsonTimestamp
 import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
+import static com.mongodb.ClusterFixture.collectCursorResults
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
+import static com.mongodb.ClusterFixture.getAsyncCluster
 import static com.mongodb.ClusterFixture.getBinding
-import static com.mongodb.ClusterFixture.loopCursor
+import static com.mongodb.ClusterFixture.getCluster
+import static com.mongodb.ClusterFixture.isSharded
+import static com.mongodb.ClusterFixture.isStandalone
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
+import static com.mongodb.ExplainVerbosity.QUERY_PLANNER
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.internal.connection.ServerHelper.waitForLastRelease
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand
+import static com.mongodb.operation.QueryOperationHelper.getKeyPattern
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 
@@ -71,185 +85,222 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         then:
         operation.getAllowDiskUse() == null
         operation.getBatchSize() == null
+        operation.getCollation() == null
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
         operation.getMaxTime(MILLISECONDS) == 0
         operation.getPipeline() == []
         operation.getUseCursor() == null
-        operation.getReadConcern() == ReadConcern.DEFAULT
     }
 
     def 'should set optional values correctly'(){
+        given:
+        def hint = BsonDocument.parse('{a: 1}')
+
         when:
         AggregateOperation operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec())
                 .allowDiskUse(true)
                 .batchSize(10)
+                .collation(defaultCollation)
+                .hint(hint)
+                .maxAwaitTime(10, MILLISECONDS)
                 .maxTime(10, MILLISECONDS)
                 .useCursor(true)
-                .readConcern(ReadConcern.MAJORITY)
-
 
         then:
         operation.getAllowDiskUse()
         operation.getBatchSize() == 10
+        operation.getCollation() == defaultCollation
+        operation.getMaxAwaitTime(MILLISECONDS) == 10
         operation.getMaxTime(MILLISECONDS) == 10
         operation.getUseCursor()
-        operation.getReadConcern() == ReadConcern.MAJORITY
+        operation.getHint() == hint
     }
 
-    def 'should create the expected command'() {
+    def 'should throw when using invalid hint'() {
         given:
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-        }
+        def hint = new BsonString('ok')
+        def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec()).hint(hint)
+
+        when:
+        operation.getHint()
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def result = operation.getHintBsonValue()
+
+        then:
+        result == hint
+
+        when:
+        operation.hint(new BsonInt32(1))
+
+        then:
+        thrown(IllegalArgumentException)
+    }
 
+    def 'should create the expected command'() {
+        when:
         def pipeline = [new BsonDocument('$match', new BsonDocument('a', new BsonString('A')))]
         def operation = new AggregateOperation<Document>(helper.namespace, pipeline, new DocumentCodec())
                 .allowDiskUse(true)
                 .batchSize(10)
+                .collation(defaultCollation)
+                .maxAwaitTime(15, MILLISECONDS)
                 .maxTime(10, MILLISECONDS)
                 .useCursor(true)
-                .readConcern(ReadConcern.MAJORITY)
 
         def expectedCommand = new BsonDocument('aggregate', new BsonString(helper.namespace.getCollectionName()))
                 .append('pipeline', new BsonArray(pipeline))
-                .append('cursor', new BsonDocument('batchSize', new BsonInt32(10)))
-                .append('maxTimeMS', new BsonInt64(10))
                 .append('allowDiskUse', new BsonBoolean(true))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
+                .append('collation', defaultCollation.asDocument())
+                .append('cursor', new BsonDocument('batchSize', new BsonInt32(10)))
+                .append('maxTimeMS', new BsonInt32(10))
+
+        then:
+        testOperation(operation, [3, 4, 0], expectedCommand, async, helper.cursorResult)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw an exception when using an unsupported ReadConcern'() {
+        given:
+        def pipeline = [new BsonDocument('$match', new BsonDocument('a', new BsonString('A')))]
+        def operation = new AggregateOperation<Document>(helper.namespace, pipeline, new DocumentCodec())
 
         when:
-        operation.execute(readBinding)
+        testOperationThrows(operation, [3, 0, 0], readConcern, async)
 
         then:
-        1 * connection.command(helper.dbName, expectedCommand, _, _, _) >> { helper.cursorResult }
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('ReadConcern not supported by server version:')
+
+        where:
+        [async, readConcern] << [[true, false], [ReadConcern.MAJORITY, ReadConcern.LOCAL]].combinations()
     }
 
-    def 'should create the expected command asynchronously'() {
+    def 'should throw an exception when using an unsupported Collation'() {
         given:
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-
         def pipeline = [new BsonDocument('$match', new BsonDocument('a', new BsonString('A')))]
         def operation = new AggregateOperation<Document>(helper.namespace, pipeline, new DocumentCodec())
-                .allowDiskUse(true)
-                .batchSize(10)
-                .maxTime(10, MILLISECONDS)
-                .useCursor(true)
-                .readConcern(ReadConcern.MAJORITY)
+                .collation(defaultCollation)
 
-        def expectedCommand = new BsonDocument('aggregate', new BsonString(helper.namespace.getCollectionName()))
-                .append('pipeline', new BsonArray(pipeline))
-                .append('cursor', new BsonDocument('batchSize', new BsonInt32(10)))
-                .append('maxTimeMS', new BsonInt64(10))
-                .append('allowDiskUse', new BsonBoolean(true))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
+        when:
+        testOperationThrows(operation, [3, 2, 0], async)
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        def document = BsonDocument.parse('{_id: 1, str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def pipeline = [BsonDocument.parse('{$match: {str: "FOO"}}')]
+        def operation = new AggregateOperation<BsonDocument>(namespace, pipeline, new BsonDocumentCodec())
+                .collation(caseInsensitiveCollation)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        def result = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.cursorResult, null) }
-        1 * connection.release()
+        result == [document]
+
+        where:
+        async << [true, false]
     }
 
-    def 'should be able to aggregate'() {
+    @IgnoreIf({ !(serverVersionAtLeast(3, 6) && !isStandalone()) })
+    def 'should support changeStreams'() {
+        given:
+        def expected = [createExpectedChangeNotification(namespace, 0), createExpectedChangeNotification(namespace, 1)]
+        def pipeline = ['{$changeStream: {}}', '{$project: {"_id.clusterTime": 0, "_id.uuid": 0}}'].collect { BsonDocument.parse(it) }
+        def operation = new AggregateOperation<BsonDocument>(namespace, pipeline, new BsonDocumentCodec())
+        def helper = getCollectionHelper()
+
         when:
-        AggregateOperation operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec()).useCursor(useCursor)
-        def result = operation.execute(getBinding());
+        helper.create(helper.getNamespace().getCollectionName(), new CreateCollectionOptions())
+        def cursor = execute(operation, async)
+        helper.insertDocuments(['{_id: 0, a: 0}', '{_id: 1, a: 1}'].collect { BsonDocument.parse(it) })
 
         then:
-        List<String> results = result.iterator().next()*.getString('name')
-        results.size() == 3
-        results.containsAll(['Pete', 'Sam'])
+        def next = next(cursor, async).collect { doc ->
+            doc.remove('_id')
+            doc.remove('clusterTime')
+            doc
+        }
+        next == expected
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
 
         where:
-        useCursor << useCursorOptions()
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should be able to aggregate asynchronously'() {
+    def 'should be able to aggregate'() {
         when:
         AggregateOperation operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec()).useCursor(useCursor)
-        List<Document> docList = []
-        loopCursor(operation, new Block<Document>() {
-            @Override
-            void apply(final Document value) {
-                if (value != null) {
-                    docList += value
-                }
-            }
-        });
+        def batchCursor = execute(operation, async)
+        def results = collectCursorResults(batchCursor)*.getString('name')
 
         then:
-        List<String> results = docList.iterator()*.getString('name')
         results.size() == 3
         results.containsAll(['Pete', 'Sam'])
 
         where:
-        useCursor << useCursorOptions()
+        [async, useCursor] << [[true, false], useCursorOptions()].combinations()
     }
 
-    def 'should be able to aggregate with pipeline'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should be able to aggregate on a view'() {
+        given:
+        def viewSuffix = '-view'
+        def viewName = getCollectionName() + viewSuffix
+        def viewNamespace = new MongoNamespace(getDatabaseName(), viewName)
+        new CreateViewOperation(getDatabaseName(), viewName, getCollectionName(), [], WriteConcern.ACKNOWLEDGED)
+                .execute(getBinding(getCluster()))
+
         when:
-        AggregateOperation operation = new AggregateOperation<Document>(getNamespace(),
-                                                                 [new BsonDocument('$match',
-                                                                                   new BsonDocument('job', new BsonString('plumber')))],
-                                                                 new DocumentCodec()).useCursor(useCursor)
-        def result = operation.execute(getBinding());
+        AggregateOperation operation = new AggregateOperation<Document>(viewNamespace, [], new DocumentCodec())
+                .useCursor(useCursor)
+        def batchCursor = execute(operation, async)
+        def results = collectCursorResults(batchCursor)*.getString('name')
 
         then:
-        List<String> results = result.iterator().next()*.getString('name')
-        results.size() == 1
-        results == ['Sam']
+        results.size() == 3
+        results.containsAll(['Pete', 'Sam'])
+
+        cleanup:
+        new DropCollectionOperation(viewNamespace, WriteConcern.ACKNOWLEDGED).execute(getBinding(getCluster()))
 
         where:
-        useCursor << useCursorOptions()
+        [async, useCursor] << [[true, false], useCursorOptions()].combinations()
     }
 
-    @Category(Async)
-    def 'should be able to aggregate with pipeline asynchronously'() {
+    def 'should be able to aggregate with pipeline'() {
         when:
         AggregateOperation operation = new AggregateOperation<Document>(getNamespace(),
-                                                                 [new BsonDocument('$match',
-                                                                                   new BsonDocument('job', new BsonString('plumber')))],
-                                                                 new DocumentCodec()).useCursor(useCursor)
-        List<Document> docList = []
-        loopCursor(operation, new Block<Document>() {
-            @Override
-            void apply(final Document value) {
-                if (value != null) {
-                    docList += value
-                }
-            }
-        });
+                [new BsonDocument('$match', new BsonDocument('job', new BsonString('plumber')))], new DocumentCodec()).useCursor(useCursor)
+        def batchCursor = execute(operation, async)
+        def results = collectCursorResults(batchCursor)*.getString('name')
 
         then:
-        List<String> results = docList.iterator()*.getString('name')
         results.size() == 1
         results == ['Sam']
 
         where:
-        useCursor << useCursorOptions()
+        [async, useCursor] << [[true, false], useCursorOptions()].combinations()
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should allow disk usage'() {
         when:
         AggregateOperation operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec()).allowDiskUse(allowDiskUse)
@@ -262,7 +313,6 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         allowDiskUse << [null, true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should allow batch size'() {
         when:
         AggregateOperation operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec()).batchSize(batchSize)
@@ -275,183 +325,243 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
         batchSize << [null, 0, 10]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from execute'() {
         given:
         def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec()).maxTime(1, SECONDS)
         enableMaxTimeFailPoint()
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoExecutionTimeoutException)
 
         cleanup:
         disableMaxTimeFailPoint()
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw execution timeout exception from executeAsync'() {
+    def 'should be able to explain an empty pipeline'() {
         given:
-        def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec()).maxTime(1, SECONDS)
-        enableMaxTimeFailPoint()
+        def operation = new AggregateOperation(getNamespace(), [], new BsonDocumentCodec())
+        operation = async ? operation.asExplainableOperationAsync(ExplainVerbosity.QUERY_PLANNER) :
+                            operation.asExplainableOperation(ExplainVerbosity.QUERY_PLANNER)
 
         when:
-        executeAsync(operation.asExplainableOperationAsync(ExplainVerbosity.QUERY_PLANNER))
+        def result = execute(operation, async)
 
         then:
-        thrown(MongoExecutionTimeoutException)
+        result.containsKey('stages') || result.containsKey('queryPlanner')
 
-        cleanup:
-        disableMaxTimeFailPoint()
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
-    def 'should be able to explain an empty pipeline'() {
-        given:
-        AggregateOperation operation = new AggregateOperation(getNamespace(), [], new BsonDocumentCodec())
-
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should be able to aggregate with collation'() {
         when:
-        def result = operation.asExplainableOperation(ExplainVerbosity.QUERY_PLANNER).execute(getBinding());
+        AggregateOperation operation = new AggregateOperation<Document>(getNamespace(),
+                [BsonDocument.parse('{$match: {job : "plumber"}}')], new DocumentCodec()
+        ).collation(options)
+        def batchCursor = execute(operation, async)
+        def results = collectCursorResults(batchCursor)*.getString('name')
 
         then:
-        result.containsKey('stages')
+        results.size() == 1
+        results == ['Sam']
+
+        where:
+        [async, options] << [[true, false], [defaultCollation, null, Collation.builder().build()]].combinations()
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
-    def 'should be able to explain an empty pipeline asynchronously'() {
+    // Explain output keeps changing so only testing this in the range where the assertion still works
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || serverVersionAtLeast(4, 1) })
+    def 'should apply $hint'() {
         given:
-        AggregateOperation operation = new AggregateOperation(getNamespace(), [], new BsonDocumentCodec())
+        def index = new BsonDocument('a', new BsonInt32(1))
+        collectionHelper.createIndex(index)
+
+        def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec())
+                .hint(hint)
 
         when:
-        def result = executeAsync(operation.asExplainableOperationAsync(ExplainVerbosity.QUERY_PLANNER));
+        execute(operation, async)
+        BsonDocument explainPlan = execute(operation.asExplainableOperation(QUERY_PLANNER), async)
 
         then:
-        result.containsKey('stages')
+        getKeyPattern(explainPlan.getArray('stages').get(0).asDocument().getDocument('$cursor')) == index
+
+        where:
+        [async, hint] << [[true, false], [BsonDocument.parse('{a: 1}'), new BsonString('a_1')]].combinations()
     }
 
-    def 'should use the ReadBindings readPreference to set slaveOK'() {
+    @IgnoreIf({ isSharded() || !serverVersionAtLeast(3, 6) })
+    def 'should apply comment'() {
         given:
-        def connection = Mock(Connection)
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-            getReadPreference() >> readPreference
-        }
-        def operation = new AggregateOperation(helper.namespace, [], new BsonDocumentCodec())
+        def profileCollectionHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'system.profile'))
+        new CommandWriteOperation(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)), new BsonDocumentCodec())
+                .execute(getBinding())
+        def expectedComment = 'this is a comment'
+        def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec())
+                .comment(expectedComment)
 
         when:
-        operation.execute(readBinding)
+        execute(operation, async)
 
         then:
-        _ * connection.getDescription() >> helper.twoFourConnectionDescription
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.inlineResult
-        1 * connection.release()
-
-        when: '2.6.0'
-        operation.execute(readBinding)
+        Document profileDocument = profileCollectionHelper.find(Filters.exists('command.aggregate')).get(0)
+        ((Document) profileDocument.get('command')).get('comment') == expectedComment
 
-        then:
-        _ * connection.getDescription() >> helper.twoSixConnectionDescription
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.cursorResult
-        1 * connection.release()
+        cleanup:
+        new CommandWriteOperation(getDatabaseName(), new BsonDocument('profile', new BsonInt32(0)), new BsonDocumentCodec())
+                .execute(getBinding())
+        profileCollectionHelper.drop();
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        async << [true, false]
     }
 
-    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
+    @IgnoreIf({ isSharded() || !serverVersionAtLeast(3, 2) })
+    def 'should be able to respect maxTime with pipeline'() {
         given:
-        def connection = Mock(AsyncConnection)
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadPreference() >> readPreference
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new AggregateOperation(helper.namespace, [], new BsonDocumentCodec())
+        enableMaxTimeFailPoint()
+        AggregateOperation operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec())
+                .maxTime(10, MILLISECONDS)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        execute(operation, async)
 
         then:
-        _ * connection.getDescription() >> helper.twoFourConnectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> { it[5].onResult(helper.inlineResult, null) }
-        1 * connection.release()
+        thrown(MongoExecutionTimeoutException)
+
+        cleanup:
+        disableMaxTimeFailPoint()
+
+        where:
+        async << [true, false]
+    }
 
-        when: '2.6.0'
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+    @IgnoreIf({ isStandalone() || !serverVersionAtLeast(3, 6) })
+    def 'should be able to respect maxAwaitTime with pipeline'() {
+        given:
+        AggregateOperation operation = new AggregateOperation<Document>(getNamespace(), [
+                new BsonDocument('$changeStream', new BsonDocument())
+        ], new DocumentCodec())
+                .batchSize(2)
+                .maxAwaitTime(10, MILLISECONDS)
+
+        when:
+        def cursor = execute(operation, async)
+        tryNext(cursor, async)
 
         then:
-        _ * connection.getDescription() >> helper.twoSixConnectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> { it[5].onResult(helper.cursorResult, null) }
-        1 * connection.release()
+        noExceptionThrown()
+
+        cleanup:
+        cursor?.close()
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        async << [true, false]
     }
 
-    def 'should validate the ReadConcern'() {
+    def 'should add read concern to command'() {
         given:
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> Stub(ConnectionSource) {
-                getConnection() >> Stub(Connection) {
-                    getDescription() >> Stub(ConnectionDescription) {
-                        getServerVersion() >> new ServerVersion([3, 0, 0])
-                    }
-                }
-            }
-        }
-        def operation = new AggregateOperation(helper.namespace, [], new BsonDocumentCodec()).readConcern(readConcern)
+        def binding = Stub(ReadBinding)
+        def source = Stub(ConnectionSource)
+        def connection = Mock(Connection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.readConnectionSource >> source
+        binding.sessionContext >> sessionContext
+        source.connection >> connection
+        source.retain() >> source
+        def commandDocument = new BsonDocument('aggregate', new BsonString(getCollectionName()))
+                .append('pipeline', new BsonArray())
+                .append('cursor', new BsonDocument())
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec())
 
         when:
-        operation.execute(readBinding)
+        operation.execute(binding)
 
         then:
-        thrown(IllegalArgumentException)
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.command(_, commandDocument, _, _, _, sessionContext) >>
+                new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                        .append('ns', new BsonString(getNamespace().getFullName()))
+                        .append('firstBatch', new BsonArrayWrapper([])))
+        1 * connection.release()
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
     }
 
-    def 'should validate the ReadConcern asynchronously'() {
+    def 'should add read concern to command asynchronously'() {
         given:
-        def connection = Stub(AsyncConnection) {
-            getDescription() >>  Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 0, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+        def binding = Stub(AsyncReadBinding)
+        def source = Stub(AsyncConnectionSource)
+        def connection = Mock(AsyncConnection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
+        binding.sessionContext >> sessionContext
+        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        source.retain() >> source
+        def commandDocument = new BsonDocument('aggregate', new BsonString(getCollectionName()))
+                .append('pipeline', new BsonArray())
+                .append('cursor', new BsonDocument())
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec())
+
+        when:
+        executeAsync(operation, binding)
+
+        then:
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.commandAsync(_, commandDocument, _, _, _, sessionContext, _) >> {
+            it[6].onResult(new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                    .append('ns', new BsonString(getNamespace().getFullName()))
+                    .append('firstBatch', new BsonArrayWrapper([]))), null)
         }
-        def operation = new AggregateOperation(helper.namespace, [], new BsonDocumentCodec()).readConcern(readConcern)
-        def callback = Mock(SingleResultCallback)
+        1 * connection.release()
 
+        where:
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
+    }
+
+    def 'should use the ReadBindings readPreference to set slaveOK'() {
         when:
-        operation.executeAsync(readBinding, callback)
+        def operation = new AggregateOperation(helper.namespace, [], new BsonDocumentCodec())
 
         then:
-        1 * callback.onResult(null, _ as IllegalArgumentException)
+        testOperationSlaveOk(operation, [2, 6, 0], readPreference, async, helper.cursorResult)
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        [async, readPreference] << [[true, false], [ReadPreference.primary(), ReadPreference.secondary()]].combinations()
     }
 
     def helper = [
             dbName: 'db',
             namespace: new MongoNamespace('db', 'coll'),
-            twoFourConnectionDescription: Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([2, 4, 0])
-            },
             twoSixConnectionDescription : Stub(ConnectionDescription) {
                 getServerVersion() >> new ServerVersion([2, 6, 0])
             },
@@ -464,4 +574,13 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
     private static List<Boolean> useCursorOptions() {
         [null, true, false]
     }
+
+    private static BsonDocument createExpectedChangeNotification(MongoNamespace namespace, int idValue) {
+        BsonDocument.parse("""{
+            "operationType": "insert",
+            "fullDocument": {"_id": $idValue, "a": $idValue},
+            "ns": {"coll": "${namespace.getCollectionName()}", "db": "${namespace.getDatabaseName()}"},
+            "documentKey": {"_id": $idValue}
+        }""")
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/AggregateToCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/AggregateToCollectionOperationSpecification.groovy
index 508fbdfef17..2b7d0beb0a1 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/AggregateToCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/AggregateToCollectionOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,40 +16,39 @@
 
 package com.mongodb.operation
 
-import category.Async
+import com.mongodb.ExplainVerbosity
 import com.mongodb.MongoCommandException
 import com.mongodb.MongoExecutionTimeoutException
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.binding.AsyncConnectionSource
-import com.mongodb.binding.AsyncWriteBinding
-import com.mongodb.binding.ConnectionSource
-import com.mongodb.binding.WriteBinding
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import com.mongodb.WriteConcern
+import com.mongodb.client.model.Aggregates
 import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.Filters
 import com.mongodb.client.model.ValidationOptions
 import com.mongodb.client.test.CollectionHelper
-import com.mongodb.connection.AsyncConnection
-import com.mongodb.connection.Connection
-import com.mongodb.connection.ConnectionDescription
-import com.mongodb.connection.ServerVersion
 import org.bson.BsonArray
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
-import org.bson.BsonInt64
+import org.bson.BsonInt32
 import org.bson.BsonString
 import org.bson.Document
+import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Filters.gte
-import static java.util.Arrays.asList
+import static com.mongodb.operation.QueryOperationHelper.getKeyPattern
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 
@@ -77,96 +76,101 @@ class AggregateToCollectionOperationSpecification extends OperationFunctionalSpe
         operation.getMaxTime(MILLISECONDS) == 0
         operation.getPipeline() == pipeline
         operation.getBypassDocumentValidation() == null
+        operation.getWriteConcern() == null
+        operation.getCollation() == null
     }
 
-    def 'should set optional values correctly'(){
+    def 'should set optional values correctly (with write concern)'(){
         given:
         def pipeline = [new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))]
 
         when:
-        AggregateToCollectionOperation operation = new AggregateToCollectionOperation(getNamespace(), pipeline)
+        AggregateToCollectionOperation operation = new AggregateToCollectionOperation(getNamespace(), pipeline, WriteConcern.MAJORITY)
                 .allowDiskUse(true)
                 .maxTime(10, MILLISECONDS)
                 .bypassDocumentValidation(true)
+                .collation(defaultCollation)
 
         then:
         operation.getAllowDiskUse()
         operation.getMaxTime(MILLISECONDS) == 10
         operation.getBypassDocumentValidation() == true
+        operation.getWriteConcern() == WriteConcern.MAJORITY
+        operation.getCollation() == defaultCollation
     }
 
-    def 'should not accept an empty pipeline'() {
-        when:
-        new AggregateToCollectionOperation(getNamespace(), [])
+    def 'should set optional values correctly (with read concern)'(){
+        given:
+        def pipeline = [new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))]
 
+        when:
+        AggregateToCollectionOperation operation = new AggregateToCollectionOperation(getNamespace(), pipeline, ReadConcern.DEFAULT)
+                .allowDiskUse(true)
+                .maxTime(10, MILLISECONDS)
+                .bypassDocumentValidation(true)
+                .collation(defaultCollation)
 
         then:
-        thrown(IllegalArgumentException)
+        operation.getAllowDiskUse()
+        operation.getMaxTime(MILLISECONDS) == 10
+        operation.getBypassDocumentValidation() == true
+        operation.getReadConcern() == ReadConcern.DEFAULT
+        operation.getCollation() == defaultCollation
     }
 
-    def 'should not accept a pipeline without the last stage specifying an output-collection'() {
+    def 'should not accept an empty pipeline'() {
         when:
-        new AggregateToCollectionOperation(getNamespace(), [new BsonDocument('$match', new BsonDocument('job', new BsonString('plumber')))])
+        new AggregateToCollectionOperation(getNamespace(), [])
 
 
         then:
         thrown(IllegalArgumentException)
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
     def 'should be able to output to a collection'() {
         when:
         AggregateToCollectionOperation operation =
                 new AggregateToCollectionOperation(getNamespace(),
                                                    [new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))])
-        operation.execute(getBinding());
+        execute(operation, async);
 
         then:
         getCollectionHelper(aggregateCollectionNamespace).count() == 3
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast([2, 6, 0]) })
-    def 'should be able to output to a collection asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(4, 2) })
+    def 'should be able to merge into a collection'() {
         when:
         AggregateToCollectionOperation operation =
                 new AggregateToCollectionOperation(getNamespace(),
-                                                   [new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))])
-        executeAsync(operation);
+                        [new BsonDocument('$merge', new BsonDocument('into', new BsonString(aggregateCollectionNamespace.collectionName)))])
+        execute(operation, async);
 
         then:
         getCollectionHelper(aggregateCollectionNamespace).count() == 3
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should be able to match then output to a collection'() {
         when:
         AggregateToCollectionOperation operation =
                 new AggregateToCollectionOperation(getNamespace(),
                                                    [new BsonDocument('$match', new BsonDocument('job', new BsonString('plumber'))),
                                                     new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))])
-        operation.execute(getBinding());
+        execute(operation, async);
 
         then:
         getCollectionHelper(aggregateCollectionNamespace).count() == 1
-    }
-
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should be able to match then output to a collection asynchronously'() {
-        when:
-        AggregateToCollectionOperation operation =
-                new AggregateToCollectionOperation(getNamespace(),
-                                                   [new BsonDocument('$match', new BsonDocument('job', new BsonString('plumber'))),
-                                                    new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))])
-        executeAsync(operation);
 
-        then:
-        getCollectionHelper(aggregateCollectionNamespace).count() == 1
+        where:
+        async << [true, false]
     }
 
-
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should throw execution timeout exception from execute'() {
         given:
         AggregateToCollectionOperation operation =
@@ -177,37 +181,39 @@ class AggregateToCollectionOperationSpecification extends OperationFunctionalSpe
         enableMaxTimeFailPoint()
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async);
 
         then:
         thrown(MongoExecutionTimeoutException)
 
         cleanup:
         disableMaxTimeFailPoint()
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw execution timeout exception from executeAsync'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
         given:
         AggregateToCollectionOperation operation =
                 new AggregateToCollectionOperation(getNamespace(),
-                                                   [new BsonDocument('$match', new BsonDocument('job', new BsonString('plumber'))),
-                                                    new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))])
-                        .maxTime(1, SECONDS)
-        enableMaxTimeFailPoint()
+                        [new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))],
+                        new WriteConcern(5))
 
         when:
-        executeAsync(operation)
+        async ? executeAsync(operation) : operation.execute(getBinding())
 
         then:
-        thrown(MongoExecutionTimeoutException)
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
 
-        cleanup:
-        disableMaxTimeFailPoint()
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should support bypassDocumentValidation'() {
         given:
         def collectionOutHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'collectionOut'))
@@ -217,155 +223,149 @@ class AggregateToCollectionOperationSpecification extends OperationFunctionalSpe
 
         when:
         def operation = new AggregateToCollectionOperation(getNamespace(), [BsonDocument.parse('{$out: "collectionOut"}')])
-        operation.execute(getBinding())
+        execute(operation, async);
 
         then:
         thrown(MongoCommandException)
 
         when:
-        operation.bypassDocumentValidation(false).execute(getBinding())
+        execute(operation.bypassDocumentValidation(false), async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        operation.bypassDocumentValidation(true).execute(getBinding())
+        execute(operation.bypassDocumentValidation(true), async)
 
         then:
         notThrown(MongoCommandException)
 
         cleanup:
         collectionOutHelper?.drop()
-    }
-
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should support bypassDocumentValidation asynchronously'() {
-        given:
-        def collectionOutHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'collectionOut'))
-        collectionOutHelper.create('collectionOut', new CreateCollectionOptions().validationOptions(
-                new ValidationOptions().validator(gte('level', 10))))
-        getCollectionHelper().insertDocuments(BsonDocument.parse('{ level: 9 }'))
 
-        when:
-        def operation = new AggregateToCollectionOperation(getNamespace(), [BsonDocument.parse('{$out: "collectionOut"}')])
-        executeAsync(operation)
-
-        then:
-        thrown(MongoCommandException)
+        where:
+        async << [true, false]
+    }
 
+    def 'should create the expected command'() {
         when:
-        executeAsync(operation.bypassDocumentValidation(false))
-
-        then:
-        thrown(MongoCommandException)
+        def pipeline = [BsonDocument.parse('{$out: "collectionOut"}')]
+        def operation = new AggregateToCollectionOperation(getNamespace(), pipeline, ReadConcern.MAJORITY, WriteConcern.MAJORITY)
+                .bypassDocumentValidation(true)
+        def expectedCommand = new BsonDocument('aggregate', new BsonString(getNamespace().getCollectionName()))
+                .append('pipeline', new BsonArray(pipeline))
 
-        when:
-        executeAsync(operation.bypassDocumentValidation(true))
+        if (includeBypassValidation) {
+            expectedCommand.put('bypassDocumentValidation', BsonBoolean.TRUE)
+        }
+        if (includeReadConcern) {
+            expectedCommand.append('readConcern', new BsonDocument('level', new BsonString('majority')))
+        }
+        if (includeWriteConcern) {
+            expectedCommand.append('writeConcern', new BsonDocument('w', new BsonString('majority')))
+        }
+        if (includeCollation) {
+            operation.collation(defaultCollation)
+            expectedCommand.append('collation', defaultCollation.asDocument())
+        }
+        if (useCursor) {
+            expectedCommand.append('cursor', new BsonDocument())
+        }
 
         then:
-        notThrown(MongoCommandException)
+        testOperation(operation, serverVersion, expectedCommand, false, BsonDocument.parse('{ok: 1}'),
+                true, false, ReadPreference.primary(), false)
 
-        cleanup:
-        collectionOutHelper?.drop()
+        where:
+        serverVersion | includeBypassValidation | includeReadConcern | includeWriteConcern | includeCollation | async  | useCursor
+        [3, 6, 0]     | true                    | true               | true                | true             | true   | true
+        [3, 6, 0]     | true                    | true               | true                | true             | false  | true
+        [3, 4, 0]     | true                    | true               | true                | true             | true   | false
+        [3, 4, 0]     | true                    | true               | true                | true             | false  | false
+        [3, 2, 0]     | true                    | false              | false               | false            | true   | false
+        [3, 2, 0]     | true                    | false              | false               | false            | false  | false
+        [3, 0, 0]     | false                   | false              | false               | false            | true   | false
+        [3, 0, 0]     | false                   | false              | false               | false            | false  | false
     }
 
-    def 'should create the expected command'() {
+    def 'should throw an exception when passing an unsupported collation'() {
         given:
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-        }
-
         def pipeline = [BsonDocument.parse('{$out: "collectionOut"}')]
-        def operation = new AggregateToCollectionOperation(getNamespace(), pipeline)
-        def expectedCommand = new BsonDocument('aggregate', new BsonString(getNamespace().getCollectionName()))
-                .append('pipeline', new BsonArray(pipeline))
+        def operation = new AggregateToCollectionOperation(getNamespace(), pipeline).collation(defaultCollation)
 
         when:
-        operation.execute(writeBinding)
+        testOperationThrows(operation, [3, 2, 0], async)
 
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _)
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
 
-        when:
-        operation.allowDiskUse(true)
-                .maxTime(10, MILLISECONDS)
-                .bypassDocumentValidation(true)
+        where:
+        async << [false, false]
+    }
 
-        expectedCommand.append('maxTimeMS', new BsonInt64(10))
-                .append('allowDiskUse', new BsonBoolean(true))
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        getCollectionHelper().insertDocuments(BsonDocument.parse('{_id: 1, str: "foo"}'))
+        def pipeline = [BsonDocument.parse('{$match: {str: "FOO"}}'),
+                        new BsonDocument('$out', new BsonString(aggregateCollectionNamespace.collectionName))]
+        def operation = new AggregateToCollectionOperation(getNamespace(), pipeline).collation(defaultCollation)
+                .collation(caseInsensitiveCollation)
 
-        if (includeBypassValidation) {
-            expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
-        }
-        operation.execute(writeBinding)
+        when:
+        execute(operation, async)
 
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _)
-        1 * connection.release()
+        getCollectionHelper(aggregateCollectionNamespace).count() == 1
 
         where:
-        serverVersion                    | includeBypassValidation
-        new ServerVersion([3, 2, 0])    | true
-        new ServerVersion([3, 0, 0])    | false
+        async << [true, false]
     }
 
-    def 'should create the expected command asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || (serverVersionAtLeast(4, 1) && isSharded()) })
+    def 'should apply $hint'() {
         given:
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def pipeline = [BsonDocument.parse('{$out: "collectionOut"}')]
-        def operation = new AggregateToCollectionOperation(getNamespace(), pipeline)
-        def expectedCommand = new BsonDocument('aggregate', new BsonString(getNamespace().getCollectionName()))
-                .append('pipeline', new BsonArray(pipeline))
+        def hint = new BsonDocument('a', new BsonInt32(1))
+        collectionHelper.createIndex(hint)
+
+        def operation = new AggregateToCollectionOperation(getNamespace(), [Aggregates.out('outputCollection')])
+                .hint(hint)
 
         when:
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        execute(operation, async)
+        BsonDocument explainPlan = execute(operation.asExplainableOperation(ExplainVerbosity.QUERY_PLANNER), async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(null, null) }
-        1 * connection.release()
+        getKeyPattern(explainPlan.getArray('stages').get(0).asDocument().getDocument('$cursor')) == hint
 
-        when:
-        operation.allowDiskUse(true)
-                .maxTime(10, MILLISECONDS)
-                .bypassDocumentValidation(true)
-
-        expectedCommand.append('maxTimeMS', new BsonInt64(10))
-                .append('allowDiskUse', new BsonBoolean(true))
+        where:
+        async << [true, false]
+    }
 
-        if (includeBypassValidation) {
-            expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
-        }
+    @IgnoreIf({ isSharded() || !serverVersionAtLeast(3, 6) })
+    def 'should apply comment'() {
+        given:
+        def profileCollectionHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'system.profile'))
+        new CommandWriteOperation(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)), new BsonDocumentCodec())
+                .execute(getBinding())
+        def expectedComment = 'this is a comment'
+        def operation = new AggregateToCollectionOperation(getNamespace(), [Aggregates.out('outputCollection')])
+                .comment(expectedComment)
 
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        when:
+        execute(operation, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(null, null) }
-        1 * connection.release()
+        Document profileDocument = profileCollectionHelper.find(Filters.exists('command.aggregate')).get(0)
+        ((Document) profileDocument.get('command')).get('comment') == expectedComment
+
+        cleanup:
+        new CommandWriteOperation(getDatabaseName(), new BsonDocument('profile', new BsonInt32(0)), new BsonDocumentCodec())
+                .execute(getBinding())
+        profileCollectionHelper.drop();
 
         where:
-        serverVersion                   | includeBypassValidation
-        new ServerVersion([3, 2, 0])    | true
-        new ServerVersion([3, 0, 0])    | false
+        async << [true, false]
     }
-
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/AsyncQueryBatchCursorFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/AsyncQueryBatchCursorFunctionalSpecification.groovy
index 72af2da0089..889db1b78e1 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/AsyncQueryBatchCursorFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/AsyncQueryBatchCursorFunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,11 @@ package com.mongodb.operation
 
 import category.Slow
 import com.mongodb.MongoCursorNotFoundException
+import com.mongodb.MongoException
 import com.mongodb.MongoTimeoutException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ReadPreference
+import com.mongodb.ServerCursor
 import com.mongodb.WriteConcern
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
@@ -27,8 +30,8 @@ import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
 import com.mongodb.client.model.CreateCollectionOptions
 import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.Connection
 import com.mongodb.connection.QueryResult
-import com.mongodb.internal.validator.NoOpFieldNameValidator
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -46,13 +49,13 @@ import static com.mongodb.ClusterFixture.getAsyncCluster
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.getConnection
 import static com.mongodb.ClusterFixture.getReadConnectionSource
+import static com.mongodb.ClusterFixture.getReferenceCountAfterTimeout
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.isSharded
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static com.mongodb.connection.ServerHelper.waitForLastRelease
-import static com.mongodb.connection.ServerHelper.waitForRelease
+import static com.mongodb.internal.connection.ServerHelper.waitForLastRelease
+import static com.mongodb.internal.connection.ServerHelper.waitForRelease
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo
 import static com.mongodb.operation.OperationHelper.cursorDocumentToQueryResult
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo
 import static java.util.Arrays.asList
 import static java.util.concurrent.TimeUnit.SECONDS
 import static org.junit.Assert.assertEquals
@@ -86,7 +89,7 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
 
     private void cleanupConnectionAndSource() {
         connection?.release()
-        connectionSource?.release();
+        connectionSource?.release()
         waitForLastRelease(connectionSource.getServerDescription().getAddress(), getAsyncCluster())
         waitForRelease(connectionSource, 0)
     }
@@ -100,6 +103,40 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
         !nextBatch()
     }
 
+    def 'should not retain connection and source after cursor is exhausted on first batch'() {
+        given:
+        cursor = new AsyncQueryBatchCursor<Document>(executeQuery(), 0, 0, 0, new DocumentCodec(), connectionSource, connection)
+
+        when:
+        nextBatch()
+
+        then:
+        connection.count == 1
+        connectionSource.count == 1
+    }
+
+    def 'should not retain connection and source after cursor is exhausted on getMore'() {
+        given:
+        cursor = new AsyncQueryBatchCursor<Document>(executeQuery(1, 0), 1, 1, 0, new DocumentCodec(), connectionSource, connection)
+
+        when:
+        nextBatch()
+
+        then:
+        getReferenceCountAfterTimeout(connection, 1) == 1
+        getReferenceCountAfterTimeout(connectionSource, 1) == 1
+    }
+
+    def 'should not retain connection and source after cursor is exhausted after first batch'() {
+        when:
+        cursor = new AsyncQueryBatchCursor<Document>(executeQuery(10, 10), 10, 10, 0, new DocumentCodec(), connectionSource,
+                connection)
+
+        then:
+        getReferenceCountAfterTimeout(connection, 1) == 1
+        getReferenceCountAfterTimeout(connectionSource, 1) == 1
+    }
+
     def 'should exhaust single batch with limit'() {
         given:
         cursor = new AsyncQueryBatchCursor<Document>(executeQuery(1, 0), 1, 0, 0, new DocumentCodec(), connectionSource, connection)
@@ -177,10 +214,10 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
         connectionSource.count == 1
 
         when:
-        cursor.next { }
+        nextBatch()
 
         then:
-        thrown(IllegalStateException)
+        thrown(MongoException)
     }
 
     def 'should close when not exhausted'() {
@@ -275,9 +312,26 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
         nextBatch().size() == 1
         !nextBatch()
     }
-    // 2.2 does not properly detect cursor not found, so ignoring
+
+    @IgnoreIf({ isSharded() })
+    def 'should kill cursor if limit is reached on initial query'() throws InterruptedException {
+        given:
+        def firstBatch = executeQuery(5)
+
+        cursor = new AsyncQueryBatchCursor<Document>(firstBatch, 5, 0, 0, new DocumentCodec(), connectionSource, connection)
+
+        when:
+        while (connection.getCount() > 1) {
+            Thread.sleep(5)
+        }
+        makeAdditionalGetMoreCall(firstBatch.cursor, connection)
+
+        then:
+        thrown(MongoCursorNotFoundException)
+    }
+
     @SuppressWarnings('BracesForTryCatchFinally')
-    @IgnoreIf({ isSharded() && !serverVersionAtLeast([2, 4, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw cursor not found exception'() {
         given:
         def firstBatch = executeQuery(2)
@@ -287,7 +341,7 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
 
         def latch = new CountDownLatch(1)
         def connection = getConnection(connectionSource)
-        def serverCursor = cursor.serverCursor
+        def serverCursor = cursor.cursor.get()
         connection.killCursorAsync(getNamespace(), asList(serverCursor.id), new SingleResultCallback<Void>() {
             @Override
             void onResult(final Void result, final Throwable t) {
@@ -324,24 +378,11 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
         executeQuery(0, batchSize)
     }
 
-    private QueryResult<Document> executeQuery(int batchSize, boolean slaveOk) {
-        executeQuery(0, batchSize, slaveOk)
-    }
-
     private QueryResult<Document> executeQuery(int limit, int batchSize) {
         executeQuery(new BsonDocument(), limit, batchSize, false, false)
     }
 
-    private QueryResult<Document> executeQuery(int limit, int batchSize, boolean slaveOk) {
-        executeQuery(new BsonDocument(), limit, batchSize, false, false, slaveOk)
-    }
-
     private QueryResult<Document> executeQuery(BsonDocument filter, int limit, int batchSize, boolean tailable, boolean awaitData) {
-        executeQuery(filter, limit, batchSize, tailable, awaitData, true)
-    }
-
-    private QueryResult<Document> executeQuery(BsonDocument filter, int limit, int batchSize, boolean tailable, boolean awaitData,
-                                               boolean slaveOk) {
         if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
             def findCommand = new BsonDocument('find', new BsonString(getCollectionName()))
                     .append('filter', filter)
@@ -359,17 +400,21 @@ class AsyncQueryBatchCursorFunctionalSpecification extends OperationFunctionalSp
             }
 
             def futureResultCallback = new FutureResultCallback<BsonDocument>();
-            connection.commandAsync(getDatabaseName(), findCommand,
-                                    slaveOk, new NoOpFieldNameValidator(),
-                                    CommandResultDocumentCodec.create(new DocumentCodec(), 'firstBatch'), futureResultCallback)
+            connection.commandAsync(getDatabaseName(), findCommand, NO_OP_FIELD_NAME_VALIDATOR, ReadPreference.primary(),
+                    CommandResultDocumentCodec.create(new DocumentCodec(), 'firstBatch'),
+                    connectionSource.sessionContext, futureResultCallback)
             def response = futureResultCallback.get(60, SECONDS)
             cursorDocumentToQueryResult(response.getDocument('cursor'), connection.getDescription().getServerAddress())
         } else {
             def futureResultCallback = new FutureResultCallback<QueryResult<Document>>();
             connection.queryAsync(getNamespace(), filter, null, 0, limit, batchSize,
-                                  slaveOk, tailable, awaitData, false, false, false,
+                                  true, tailable, awaitData, false, false, false,
                                   new DocumentCodec(), futureResultCallback);
             futureResultCallback.get(60, SECONDS);
         }
     }
+
+    private void makeAdditionalGetMoreCall(ServerCursor serverCursor, Connection connection) {
+        connection.getMore(getNamespace(), serverCursor.getId(), 1, new DocumentCodec())
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/ChangeStreamOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/ChangeStreamOperationSpecification.groovy
new file mode 100644
index 00000000000..80bf8ec1eb5
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/operation/ChangeStreamOperationSpecification.groovy
@@ -0,0 +1,771 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.binding.AsyncConnectionSource
+import com.mongodb.binding.AsyncReadBinding
+import com.mongodb.binding.ConnectionSource
+import com.mongodb.binding.ReadBinding
+import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.changestream.ChangeStreamDocument
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import com.mongodb.client.model.changestream.FullDocument
+import com.mongodb.client.model.changestream.OperationType
+import com.mongodb.client.model.changestream.UpdateDescription
+import com.mongodb.client.test.CollectionHelper
+import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.Connection
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.session.SessionContext
+import org.bson.BsonArray
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonInt64
+import org.bson.BsonString
+import org.bson.BsonTimestamp
+import org.bson.Document
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.ValueCodecProvider
+import spock.lang.IgnoreIf
+
+import static com.mongodb.ClusterFixture.getAsyncCluster
+import static com.mongodb.ClusterFixture.getCluster
+import static com.mongodb.ClusterFixture.isStandalone
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.internal.connection.ServerHelper.waitForLastRelease
+import static com.mongodb.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+
+@IgnoreIf({ !(serverVersionAtLeast(3, 6) && !isStandalone()) })
+class ChangeStreamOperationSpecification extends OperationFunctionalSpecification {
+
+    def 'should have the correct defaults'() {
+        when:
+        ChangeStreamOperation operation = new ChangeStreamOperation<Document>(getNamespace(), FullDocument.DEFAULT, [], new DocumentCodec())
+
+        then:
+        operation.getBatchSize() == null
+        operation.getCollation() == null
+        operation.getFullDocument() == FullDocument.DEFAULT
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getPipeline() == []
+        operation.getStartAtOperationTime() == null
+    }
+
+    def 'should set optional values correctly'() {
+        when:
+        ChangeStreamOperation operation = new ChangeStreamOperation<Document>(getNamespace(), FullDocument.UPDATE_LOOKUP, [],
+                new DocumentCodec())
+                .batchSize(5)
+                .collation(defaultCollation)
+                .maxAwaitTime(15, MILLISECONDS)
+                .startAtOperationTime(new BsonTimestamp(99))
+
+        then:
+        operation.getBatchSize() == 5
+        operation.getCollation() == defaultCollation
+        operation.getFullDocument() == FullDocument.UPDATE_LOOKUP
+        operation.getMaxAwaitTime(MILLISECONDS) == 15
+        operation.getStartAtOperationTime() == new BsonTimestamp(99)
+    }
+
+    def 'should create the expected command'() {
+        given:
+        def aggregate = changeStreamLevel == ChangeStreamLevel.COLLECTION ? new BsonString(namespace.getCollectionName()) : new BsonInt32(1)
+        def pipeline = [BsonDocument.parse('{$match: {a: "A"}}')]
+        def resumeToken = BsonDocument.parse('{_id: 1}')
+
+        when:
+        def changeStream = BsonDocument.parse('''{$changeStream: {fullDocument: "default", startAtOperationTime:
+                    { "$timestamp" : { "t" : 0, "i" : 0 }}}}''')
+        if (changeStreamLevel == ChangeStreamLevel.CLIENT) {
+            changeStream.getDocument('$changeStream').put('allChangesForCluster', BsonBoolean.TRUE)
+        }
+
+        def cursorResult = BsonDocument.parse('{ok: 1.0}')
+                .append('cursor', new BsonDocument('id', new BsonInt64(0)).append('ns', new BsonString('db.coll'))
+                .append('firstBatch', new BsonArrayWrapper([])))
+
+        def operation = new ChangeStreamOperation<Document>(namespace, FullDocument.DEFAULT, pipeline, new DocumentCodec(),
+                changeStreamLevel)
+                .batchSize(5)
+                .collation(defaultCollation)
+                .maxAwaitTime(15, MILLISECONDS)
+                .startAtOperationTime(new BsonTimestamp())
+
+        def expectedCommand = new BsonDocument('aggregate', aggregate)
+                .append('collation', defaultCollation.asDocument())
+                .append('cursor', new BsonDocument('batchSize', new BsonInt32(5)))
+                .append('pipeline', new BsonArray([changeStream, *pipeline]))
+                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
+
+        then:
+        testOperation(operation, [4, 0, 0], ReadConcern.MAJORITY, expectedCommand, async, cursorResult)
+
+        when: 'resumeAfter & startAfter & startAtOperationTime'
+        def changeStreamDoc = changeStream.getDocument('$changeStream')
+        changeStreamDoc.put('resumeAfter', resumeToken)
+        changeStreamDoc.put('startAfter', resumeToken)
+
+        operation.resumeAfter(resumeToken)
+                .startAfter(resumeToken)
+
+        then:
+        testOperation(operation, [4, 0, 0], ReadConcern.MAJORITY, expectedCommand, async, cursorResult)
+
+        where:
+        [async, changeStreamLevel] << [[true, false],
+                                       [ChangeStreamLevel.CLIENT, ChangeStreamLevel.DATABASE, ChangeStreamLevel.COLLECTION]].combinations()
+    }
+
+    def 'should return the expected results'() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "insert"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline, CODEC)
+
+        when:
+        def cursor = execute(operation, async)
+        def expected = insertDocuments(helper, [1, 2])
+
+        then:
+        def next = nextAndClean(cursor, async)
+        next == expected
+
+        when:
+        expected = insertDocuments(helper, [3, 4, 5, 6, 7])
+        cursor.setBatchSize(5)
+
+        then:
+        cursor.getBatchSize() == 5
+        nextAndClean(cursor, async) == expected
+
+        then:
+        if (async) {
+            !cursor.isClosed()
+        } else {
+            cursor.getServerCursor() == cursor.getWrapped().getServerCursor()
+            cursor.getServerAddress() == cursor.getWrapped().getServerAddress()
+        }
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should decode insert to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "insert"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2 }'))
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == BsonDocument.parse('{ _id : 2 }')
+        next.getFullDocument() == BsonDocument.parse('{ _id : 2, x : 2 }')
+        next.getNamespace() == helper.getNamespace()
+        next.getOperationType() == OperationType.INSERT
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    def 'should decode update to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "update"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.updateOne(BsonDocument.parse('{ _id : 2}'), BsonDocument.parse('{ $set : {x : 3}, $unset : {y : 1}}'))
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == BsonDocument.parse('{ _id : 2 }')
+        next.getFullDocument() == BsonDocument.parse('{ _id : 2, x : 3 }')
+        next.getNamespace() == helper.getNamespace()
+        next.getOperationType() == OperationType.UPDATE
+        next.getUpdateDescription() == new UpdateDescription(['y'], BsonDocument.parse('{x : 3}'))
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    def 'should decode replace to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "replace"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.replaceOne(BsonDocument.parse('{ _id : 2}'), BsonDocument.parse('{ _id : 2, x : 3}'), false)
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == BsonDocument.parse('{ _id : 2 }')
+        next.getFullDocument() == BsonDocument.parse('{ _id : 2, x : 3 }')
+        next.getNamespace() == helper.getNamespace()
+        next.getOperationType() == OperationType.REPLACE
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    def 'should decode delete to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "delete"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.deleteOne(BsonDocument.parse('{ _id : 2}'))
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == BsonDocument.parse('{ _id : 2 }')
+        next.getFullDocument() == null
+        next.getNamespace() == helper.getNamespace()
+        next.getOperationType() == OperationType.DELETE
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    def 'should decode invalidate to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "invalidate"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.drop()
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == null
+        next.getFullDocument() == null
+        next.getNamespace() == null
+        next.getOperationType() == OperationType.INVALIDATE
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast([4, 0, 1]) })
+    def 'should decode drop to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "drop"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.drop()
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == null
+        next.getFullDocument() == null
+        next.getNamespace() == helper.getNamespace()
+        next.getOperationType() == OperationType.DROP
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast([4, 0, 1]) })
+    def 'should decode dropDatabase to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "dropDatabase"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())),
+                ChangeStreamLevel.DATABASE)
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.dropDatabase('JavaDriverTest')
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == null
+        next.getFullDocument() == null
+        next.getDatabaseName() == 'JavaDriverTest'
+        next.getOperationType() == OperationType.DROP_DATABASE
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast([4, 0, 1]) })
+    def 'should decode rename to ChangeStreamDocument '() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "rename"}}')]
+        def operation = new ChangeStreamOperation<ChangeStreamDocument>(helper.getNamespace(), FullDocument.UPDATE_LOOKUP, pipeline,
+                ChangeStreamDocument.createCodec(BsonDocument, fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider())))
+        def newNamespace = new MongoNamespace('JavaDriverTest', 'newCollectionName')
+        helper.insertDocuments(BsonDocument.parse('{ _id : 2, x : 2, y : 3 }'))
+
+        when:
+        def cursor = execute(operation, false)
+        helper.renameCollection(newNamespace)
+        ChangeStreamDocument<BsonDocument> next = next(cursor, false).get(0)
+
+        then:
+        next.getResumeToken() != null
+        next.getDocumentKey() == null
+        next.getFullDocument() == null
+        next.getNamespace() == helper.getNamespace()
+        next.getDestinationNamespace() == newNamespace
+        next.getOperationType() == OperationType.RENAME
+        next.getUpdateDescription() == null
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    def 'should throw if the _id field is projected out'() {
+        given:
+        def helper = getHelper()
+        def pipeline = [BsonDocument.parse('{$project: {"_id": 0}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline, CODEC)
+
+        when:
+        def cursor = execute(operation, async)
+        insertDocuments(helper, [11, 22])
+        nextAndClean(cursor, async)
+
+        then:
+        thrown(MongoException)
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should act like a tailable cursor'() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "insert"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline, CODEC)
+
+        when:
+        def cursor = execute(operation, async)
+
+        then:
+        tryNextAndClean(cursor, async) == null
+
+        when:
+        def expected = insertDocuments(helper, [1, 2])
+
+        then:
+        nextAndClean(cursor, async) == expected
+
+        then:
+        tryNextAndClean(cursor, async) == null
+
+        when:
+        expected = insertDocuments(helper, [3, 4])
+
+        then:
+        nextAndClean(cursor, async) == expected
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should be resumable'() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "insert"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline, CODEC)
+
+        when:
+        def cursor = execute(operation, async)
+        def expected = insertDocuments(helper, [1, 2])
+
+        then:
+        nextAndClean(cursor, async) == expected
+
+        when:
+        helper.killCursor(helper.getNamespace(), cursor.getWrapped().getServerCursor())
+        expected = insertDocuments(helper, [3, 4])
+
+        then:
+        nextAndClean(cursor, async) == expected
+
+        then:
+        tryNextAndClean(cursor, async) == null
+
+        when:
+        expected = insertDocuments(helper, [5, 6])
+        helper.killCursor(helper.getNamespace(), cursor.getWrapped().getServerCursor())
+
+        then:
+        nextAndClean(cursor, async) == expected
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast([4, 0, 0]) })
+    def 'should work with a startAtOperationTime'() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "insert"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline, CODEC)
+
+        def cursor = execute(operation, async)
+
+        when:
+        def expected = insertDocuments(helper, [1, 2])
+        def result = next(cursor, async)
+
+        then:
+        result.size() == 2
+
+        when:
+        cursor.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        operation.startAtOperationTime(result.last().getTimestamp('clusterTime'))
+        cursor = execute(operation, async)
+        result = nextAndClean(cursor, async)
+
+        then:
+        result == expected.tail()
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should work with a resumeAfter resumeToken'() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "insert"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline, CODEC)
+
+        def cursor = execute(operation, async)
+
+        when:
+        def expected = insertDocuments(helper, [1, 2])
+        def result = next(cursor, async)
+
+        then:
+        result.size() == 2
+
+        when:
+        cursor.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        operation.resumeAfter(result.head().getDocument('_id')).startAtOperationTime(null)
+        cursor = execute(operation, async)
+        result = nextAndClean(cursor, async)
+
+        then:
+        result == expected.tail()
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast([4, 1, 0]) })
+    def 'should work with a startAfter resumeToken'() {
+        given:
+        def helper = getHelper()
+
+        def pipeline = [BsonDocument.parse('{$match: {operationType: "insert"}}')]
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, pipeline, CODEC)
+
+        def cursor = execute(operation, async)
+
+        when:
+        def expected = insertDocuments(helper, [1, 2])
+        def result = next(cursor, async)
+
+        then:
+        result.size() == 2
+
+        when:
+        cursor.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        cursor = execute(operation.startAfter(result.head().getDocument('_id')).startAtOperationTime(null), async)
+        result = nextAndClean(cursor, async)
+
+        then:
+        result == expected.tail()
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(async ? getAsyncCluster() : getCluster())
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should support hasNext on the sync API'() {
+        given:
+        def helper = getHelper()
+        def operation = new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, [], CODEC)
+
+        when:
+        def cursor = execute(operation, false)
+        insertDocuments(helper, [1])
+
+        then:
+        cursor.hasNext()
+
+        cleanup:
+        cursor?.close()
+        waitForLastRelease(getCluster())
+    }
+
+    def 'should set the startAtOperationTime on the sync cursor'() {
+        given:
+        def changeStream
+        def binding = Stub(ReadBinding) {
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> ReadConcern.DEFAULT
+                getOperationTime() >> new BsonTimestamp()
+            }
+            getReadConnectionSource() >> Stub(ConnectionSource) {
+                getConnection() >> Stub(Connection) {
+                     command(*_) >> {
+                         changeStream = getChangeStream(it[1])
+                         new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                                 .append('ns', new BsonString(getNamespace().getFullName()))
+                                 .append('firstBatch', new BsonArrayWrapper([])))
+                     }
+                    getDescription() >> Stub(ConnectionDescription) {
+                        getMaxWireVersion() >> getMaxWireVersionForServerVersion([4, 0])
+                    }
+                }
+            }
+        }
+
+        when: 'set resumeAfter'
+        new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, [], CODEC)
+                .resumeAfter(new BsonDocument())
+                .execute(binding)
+
+        then:
+        changeStream.containsKey('resumeAfter')
+        !changeStream.containsKey('startAtOperationTime')
+
+        when: 'set startAfter'
+        new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, [], CODEC)
+                .startAfter(new BsonDocument())
+                .execute(binding)
+
+        then:
+        changeStream.containsKey('startAfter')
+        !changeStream.containsKey('startAtOperationTime')
+
+        when: 'set startAtOperationTime'
+        def startAtTime = new BsonTimestamp(42)
+        new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, [], CODEC)
+                .startAtOperationTime(startAtTime)
+                .execute(binding)
+
+        then:
+        changeStream.getTimestamp('startAtOperationTime') == startAtTime
+    }
+
+    def 'should set the startAtOperationTime on the async cursor'() {
+        given:
+        def changeStream
+        def binding = Stub(AsyncReadBinding) {
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> ReadConcern.DEFAULT
+                getOperationTime() >> new BsonTimestamp()
+            }
+            getReadConnectionSource(_) >> {
+                it.last().onResult(Stub(AsyncConnectionSource) {
+                    getConnection(_) >> {
+                        it.last().onResult(Stub(AsyncConnection) {
+                            commandAsync(*_) >> {
+                                changeStream = getChangeStream(it[1])
+                                it.last().onResult(new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                                        .append('ns', new BsonString(getNamespace().getFullName()))
+                                        .append('firstBatch', new BsonArrayWrapper([]))), null)
+                            }
+                            getDescription() >> Stub(ConnectionDescription) {
+                                getMaxWireVersion() >> getMaxWireVersionForServerVersion([4, 0])
+                            }
+                        }, null)
+                    }
+                }, null)
+            }
+        }
+
+        when: 'set resumeAfter'
+        new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, [], CODEC)
+                .resumeAfter(new BsonDocument())
+                .executeAsync(binding, Stub(SingleResultCallback))
+
+        then:
+        changeStream.containsKey('resumeAfter')
+        !changeStream.containsKey('startAtOperationTime')
+
+        when: 'set startAfter'
+        new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, [], CODEC)
+                .startAfter(new BsonDocument())
+                .executeAsync(binding, Stub(SingleResultCallback))
+
+        then:
+        changeStream.containsKey('startAfter')
+        !changeStream.containsKey('startAtOperationTime')
+
+        when: 'set startAtOperationTime'
+        def startAtTime = new BsonTimestamp(42)
+        new ChangeStreamOperation<BsonDocument>(helper.getNamespace(), FullDocument.DEFAULT, [], CODEC)
+                .startAtOperationTime(startAtTime)
+                .executeAsync(binding, Stub(SingleResultCallback))
+
+        then:
+        changeStream.getTimestamp('startAtOperationTime') == startAtTime
+    }
+
+    private final static CODEC = new BsonDocumentCodec()
+
+    private CollectionHelper<Document> getHelper() {
+        def helper = getCollectionHelper()
+        helper.create(helper.getNamespace().getCollectionName(), new CreateCollectionOptions())
+        helper
+    }
+
+    private static List<BsonDocument> insertDocuments(final CollectionHelper<?> helper, final List<Integer> docs) {
+        helper.insertDocuments(docs.collect { BsonDocument.parse("{_id: $it, a: $it}") }, WriteConcern.MAJORITY)
+        docs.collect {
+            BsonDocument.parse("""{
+                "operationType": "insert",
+                "fullDocument": {"_id": $it, "a": $it},
+                "ns": {"db": "${helper.getNamespace().getDatabaseName()}", "coll": "${helper.getNamespace().getCollectionName()}"},
+                "documentKey": {"_id": $it}
+            }""")
+        }
+    }
+
+    def tryNextAndClean(cursor, boolean async) {
+        removeExtra(tryNext(cursor, async))
+    }
+
+    def nextAndClean(cursor, boolean async) {
+        removeExtra(next(cursor, async))
+    }
+
+    def removeExtra(List<BsonDocument> next) {
+        next?.collect { doc ->
+            doc.remove('_id')
+            doc.remove('clusterTime')
+            doc
+        }
+    }
+
+    def getChangeStream(BsonDocument command) {
+        command.getArray('pipeline').head().getDocument('$changeStream')
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/CommandOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CommandOperationSpecification.groovy
index 5f044033318..c2bd762f829 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/CommandOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/CommandOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,8 +33,6 @@ import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isSharded
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
 
 class CommandOperationSpecification extends OperationFunctionalSpecification {
 
@@ -61,7 +59,6 @@ class CommandOperationSpecification extends OperationFunctionalSpecification {
 
         then:
         result.getNumber('n').intValue() == 0
-
     }
 
     def 'should execute write command'() {
@@ -111,7 +108,7 @@ class CommandOperationSpecification extends OperationFunctionalSpecification {
         result.containsKey('value')
     }
 
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast(asList(2, 6, 0)) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from execute'() {
         given:
         def commandOperation = new CommandReadOperation<BsonDocument>(getNamespace().databaseName,
@@ -131,7 +128,7 @@ class CommandOperationSpecification extends OperationFunctionalSpecification {
     }
 
     @Category(Async)
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast(asList(2, 6, 0)) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from executeAsync'() {
         given:
         def commandOperation = new CommandReadOperation<BsonDocument>(getNamespace().databaseName,
diff --git a/driver-core/src/test/functional/com/mongodb/operation/CommitTransactionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CommitTransactionOperationSpecification.groovy
new file mode 100644
index 00000000000..d7fafbd4b6b
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/operation/CommitTransactionOperationSpecification.groovy
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.OperationFunctionalSpecification
+import org.bson.BsonDocument
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.MAJORITY
+
+
+class CommitTransactionOperationSpecification extends OperationFunctionalSpecification {
+
+    def 'should produce the expected command'() {
+        given:
+        def cannedResult = BsonDocument.parse('{value: {}}')
+        def expectedCommand = BsonDocument.parse('{commitTransaction: 1}')
+
+        when:
+        def operation = new CommitTransactionOperation(ACKNOWLEDGED)
+
+        then:
+        testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult)
+
+        when:
+        operation = new CommitTransactionOperation(MAJORITY)
+        expectedCommand.put('writeConcern', MAJORITY.asDocument())
+
+        then:
+        testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should retry if the connection initially fails'() {
+        given:
+        def cannedResult = BsonDocument.parse('{value: {}}')
+        def expectedCommand = BsonDocument.parse('{commitTransaction: 1, writeConcern: {w: "majority", wtimeout: 10}}')
+
+        when:
+        def writeConcern = MAJORITY.withWTimeout(10, TimeUnit.MILLISECONDS)
+        def operation = new CommitTransactionOperation(writeConcern)
+
+        then:
+        testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        when:
+        writeConcern = MAJORITY
+        operation = new CommitTransactionOperation(writeConcern)
+        expectedCommand.put('writeConcern', writeConcern.withWTimeout(10000, TimeUnit.MILLISECONDS).asDocument())
+
+        then:
+        testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        when:
+        writeConcern = ACKNOWLEDGED
+        operation = new CommitTransactionOperation(writeConcern)
+        expectedCommand.put('writeConcern', writeConcern.withW('majority').withWTimeout(10000, TimeUnit.MILLISECONDS).asDocument())
+
+        then:
+        testOperationRetries(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should set writeconcern on second commit'() {
+        given:
+        def cannedResult = BsonDocument.parse('{value: {}}')
+        def expectedCommand = BsonDocument.parse('{commitTransaction: 1, writeConcern: {w: "majority", wtimeout: 10000}}')
+
+        when:
+        def operation = new CommitTransactionOperation(ACKNOWLEDGED, true)
+
+        then:
+        testOperationInTransaction(operation, [4, 0, 0], expectedCommand, async, cannedResult, true)
+
+        where:
+        async << [true, false]
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/CountOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CountOperationSpecification.groovy
index 3ee61ace91d..31a71949a14 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/CountOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/CountOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package com.mongodb.operation
 
-import category.Async
 import com.mongodb.ExplainVerbosity
 import com.mongodb.MongoException
 import com.mongodb.MongoExecutionTimeoutException
@@ -24,23 +23,29 @@ import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
-import com.mongodb.async.SingleResultCallback
+import com.mongodb.ServerAddress
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
 import com.mongodb.binding.ConnectionSource
 import com.mongodb.binding.ReadBinding
 import com.mongodb.bulk.IndexRequest
+import com.mongodb.internal.client.model.CountStrategy
 import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
 import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
+import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
 import org.bson.BsonString
+import org.bson.BsonTimestamp
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint
@@ -49,13 +54,14 @@ import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 
 class CountOperationSpecification extends OperationFunctionalSpecification {
 
-    private documents;
+    private documents
 
     def setup() {
         documents = [
@@ -63,7 +69,7 @@ class CountOperationSpecification extends OperationFunctionalSpecification {
                 new Document('x', 2),
                 new Document('x', 3),
                 new Document('x', 4),
-                new Document('x', 5)
+                new Document('x', 5).append('y', 1)
         ]
         getCollectionHelper().insertDocuments(new DocumentCodec(), documents)
     }
@@ -78,7 +84,6 @@ class CountOperationSpecification extends OperationFunctionalSpecification {
         operation.getHint() == null
         operation.getLimit() == 0
         operation.getSkip() == 0
-        operation.getReadConcern() == ReadConcern.DEFAULT
     }
 
     def 'should set optional values correctly'(){
@@ -93,7 +98,6 @@ class CountOperationSpecification extends OperationFunctionalSpecification {
                 .hint(hint)
                 .limit(20)
                 .skip(30)
-                .readConcern(ReadConcern.MAJORITY)
 
         then:
         operation.getFilter() == filter
@@ -101,274 +105,159 @@ class CountOperationSpecification extends OperationFunctionalSpecification {
         operation.getHint() == hint
         operation.getLimit() == 20
         operation.getSkip() == 30
-        operation.getReadConcern() == ReadConcern.MAJORITY
     }
 
     def 'should get the count'() {
         expect:
-        new CountOperation(getNamespace()).execute(getBinding()) == documents.size()
-    }
+        execute(new CountOperation(getNamespace(), strategy), async) == documents.size()
 
-    @Category(Async)
-    def 'should get the count asynchronously'() {
-        expect:
-        executeAsync(new CountOperation(getNamespace())) ==
-        documents.size()
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw execution timeout exception from execute'() {
-        given:
-        def countOperation = new CountOperation(getNamespace())
-                .maxTime(1, SECONDS)
-        enableMaxTimeFailPoint()
+    def 'should return 0 if no collection'() {
+        when:
+        getCollectionHelper().drop()
+
+        then:
+        execute(new CountOperation(getNamespace(), strategy), async) == 0
 
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
+    }
+
+    def 'should return 0 if empty collection'() {
         when:
-        countOperation.execute(getBinding())
+        getCollectionHelper().drop()
+        getCollectionHelper().create()
 
         then:
-        thrown(MongoExecutionTimeoutException)
+        execute(new CountOperation(getNamespace(), strategy), async) == 0
 
-        cleanup:
-        disableMaxTimeFailPoint()
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw execution timeout exception from executeAsync'() {
+    def 'should throw execution timeout exception from execute'() {
         given:
-        def countOperation = new CountOperation(getNamespace())
-                .maxTime(1, SECONDS)
+        def operation = new CountOperation(getNamespace(), strategy).maxTime(1, SECONDS)
         enableMaxTimeFailPoint()
 
         when:
-        executeAsync(countOperation)
+        execute(operation, async)
 
         then:
         thrown(MongoExecutionTimeoutException)
 
         cleanup:
         disableMaxTimeFailPoint()
-    }
 
-    def 'should use limit with the count'() {
-        when:
-        def countOperation = new CountOperation(getNamespace())
-                .limit(1)
-        then:
-        countOperation.execute(getBinding()) == 1
+        where:
+        [async, strategy] << [[false, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
-    @Category(Async)
-    def 'should use limit with the count asynchronously'() {
+    def 'should use limit with the count'() {
         when:
-        def countOperation = new CountOperation(getNamespace())
-                .limit(1)
+        def operation = new CountOperation(getNamespace(), strategy).limit(1)
 
         then:
-        executeAsync(countOperation) == 1
+        execute(operation, async) == 1
+
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
     def 'should use skip with the count'() {
         when:
-        def countOperation = new CountOperation(getNamespace()).skip(documents.size() - 2)
+        def operation = new CountOperation(getNamespace(), strategy).skip(documents.size() - 2)
 
         then:
-        countOperation.execute(getBinding()) == 2
-    }
+        execute(operation, async)
 
-    @Category(Async)
-    def 'should use skip with the count asynchronously'() {
-        when:
-        def countOperation = new CountOperation(getNamespace()).skip(documents.size() - 2)
-
-        then:
-        executeAsync(countOperation)  == 2
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
     def 'should use hint with the count'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('x', new BsonInt32(1))).sparse(true)])
-        def countOperation = new CountOperation(getNamespace()).hint(new BsonString('x_1'))
+        def indexDefinition = new BsonDocument('y', new BsonInt32(1))
+        new CreateIndexesOperation(getNamespace(), [new IndexRequest(indexDefinition).sparse(true)])
+                .execute(getBinding())
+        def operation = new CountOperation(getNamespace(), strategy).hint(indexDefinition)
 
         when:
-        createIndexOperation.execute(getBinding())
+        def count = execute(operation, async)
 
         then:
-        countOperation.execute(getBinding()) == serverVersionAtLeast(asList(2, 6, 0)) ? 1 : documents.size()
-    }
+        count == 1
 
-    @Category(Async)
-    def 'should use hint with the count asynchronously'() {
-        given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('x', new BsonInt32(1))).sparse(true)])
-        def countOperation = new CountOperation(getNamespace()).hint(new BsonString('x_1'))
-
-        when:
-        executeAsync(createIndexOperation)
-
-        then:
-        executeAsync(countOperation) == serverVersionAtLeast(asList(2, 6, 0)) ? 1 : documents.size()
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw with bad hint with mongod 2.6+'() {
-        given:
-        def countOperation = new CountOperation(getNamespace())
-                .filter(new BsonDocument('a', new BsonInt32(1)))
-                .hint(new BsonString('BAD HINT'))
-
-        when:
-        countOperation.execute(getBinding())
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def 'should support hints that are bson documents or strings'() {
+        expect:
+        execute(new CountOperation(getNamespace(), strategy).hint(hint), async) == 5
 
-        then:
-        thrown(MongoException)
+        where:
+        [async, strategy, hint] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND],
+                                    [new BsonString('_id_'), BsonDocument.parse('{_id: 1}')]].combinations()
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw with bad hint with mongod 2.6+ asynchronously'() {
+    def 'should throw with bad hint'() {
         given:
-        def countOperation = new CountOperation(getNamespace())
+        def operation = new CountOperation(getNamespace(), strategy)
                 .filter(new BsonDocument('a', new BsonInt32(1)))
                 .hint(new BsonString('BAD HINT'))
 
         when:
-        executeAsync(countOperation)
+        execute(operation, async)
 
         then:
         thrown(MongoException)
-    }
-
-    @IgnoreIf({ serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should ignore with bad hint with mongod < 2.6'() {
-        given:
-        def countOperation = new CountOperation(getNamespace())
-                .filter(new BsonDocument('a', new BsonInt32(1)))
-                .hint(new BsonString('BAD HINT'))
-
-        when:
-        countOperation.execute(getBinding())
-
-        then:
-        notThrown(MongoException)
-    }
-
-    @Category(Async)
-    @IgnoreIf({ serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should ignore with bad hint with mongod < 2.6 asynchronously'() {
-        given:
-        def countOperation = new CountOperation(getNamespace())
-                .filter(new BsonDocument('a', new BsonInt32(1)))
-                .hint(new BsonString('BAD HINT'))
-
-        when:
-        executeAsync(countOperation)
 
-        then:
-        notThrown(MongoException)
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 0, 0)) || isSharded() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) || isSharded() })
     def 'should explain'() {
-        given:
-        def countOperation = new CountOperation(getNamespace())
-                .filter(new BsonDocument('a', new BsonInt32(1)))
-
         when:
-        BsonDocument result = countOperation.asExplainableOperation(ExplainVerbosity.QUERY_PLANNER).execute(getBinding())
-
-        then:
-        result.getNumber('ok').intValue() == 1
-    }
-
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 0, 0)) || isSharded() })
-    def 'should explain asynchronously'() {
-        given:
-        def countOperation = new CountOperation(getNamespace())
+        def operation = new CountOperation(getNamespace(), strategy)
                 .filter(new BsonDocument('a', new BsonInt32(1)))
-
-        when:
-        BsonDocument result = executeAsync(countOperation.asExplainableOperationAsync(ExplainVerbosity.QUERY_PLANNER))
-
-        then:
-        result.getNumber('ok').intValue() == 1
-    }
-
-    def 'should use the ReadBindings readPreference to set slaveOK'() {
-        given:
-        def connection = Mock(Connection)
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-            getReadPreference() >> readPreference
-        }
-        def operation = new CountOperation(helper.namespace).filter(BsonDocument.parse('{a: 1}'))
-
-        when:
-        operation.execute(readBinding)
+                .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER)
 
         then:
-        _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
-        1 * connection.release()
+        execute(operation, async).getNumber('ok').intValue() == 1
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
-    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
-        given:
-        def connection = Mock(AsyncConnection)
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadPreference() >> readPreference
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new CountOperation(helper.namespace).filter(BsonDocument.parse('{a: 1}'))
 
+    def 'should use the ReadBindings readPreference to set slaveOK'() {
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        def operation = new CountOperation(helper.namespace, CountStrategy.COMMAND)
+                .filter(BsonDocument.parse('{a: 1}'))
 
         then:
-        _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        testOperationSlaveOk(operation, [3, 4, 0], readPreference, async, helper.commandResult)
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        [async, readPreference] << [[true, false], [ReadPreference.primary(), ReadPreference.secondary()]].combinations()
     }
 
     def 'should create the expected command'() {
-        given:
+        when:
         def filter = new BsonDocument('filter', new BsonInt32(1))
-        def hint = new BsonString('hint')
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-        }
-        def operation = new CountOperation(helper.namespace)
+        def hint = new BsonDocument('hint', new BsonInt32(1))
+        def operation = new CountOperation(helper.namespace, CountStrategy.COMMAND)
         def expectedCommand = new BsonDocument('count', new BsonString(helper.namespace.getCollectionName()))
-        when:
-        operation.execute(readBinding)
 
         then:
-        1 * connection.command(helper.dbName, expectedCommand, _, _, _) >> { helper.commandResult }
-        1 * connection.release()
+        testOperation(operation, [3, 4, 0], expectedCommand, async, helper.commandResult)
 
         when:
         operation.filter(filter)
@@ -376,46 +265,33 @@ class CountOperationSpecification extends OperationFunctionalSpecification {
                 .skip(30)
                 .hint(hint)
                 .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
+                .collation(defaultCollation)
 
          expectedCommand.append('query', filter)
                 .append('limit', new BsonInt64(20))
                 .append('skip', new BsonInt64(30))
                 .append('hint', hint)
                 .append('maxTimeMS', new BsonInt64(10))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
-
-        operation.execute(readBinding)
+                .append('collation', defaultCollation.asDocument())
 
         then:
-        1 * connection.command(helper.dbName, expectedCommand, _, _, _) >> { helper.commandResult }
-        1 * connection.release()
-    }
+        testOperation(operation, [3, 4, 0], expectedCommand, async, helper.commandResult)
 
-    def 'should create the expected command asynchronously'() {
-        given:
-        def filter = new BsonDocument('filter', new BsonInt32(1))
-        def hint = new BsonString('hint')
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new CountOperation(helper.namespace)
-        def expectedCommand = new BsonDocument('count', new BsonString(helper.namespace.getCollectionName()))
+        where:
+        async << [true, false]
+    }
 
+    def 'should create the expected aggregation command'() {
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        def filter = new BsonDocument('filter', new BsonInt32(1))
+        def operation = new CountOperation(helper.namespace, CountStrategy.AGGREGATE)
+        def pipeline = [BsonDocument.parse('{ $match: {}}'), BsonDocument.parse('{$group: {_id: 1, n: {$sum: 1}}}')]
+        def expectedCommand = new BsonDocument('aggregate', new BsonString(helper.namespace.getCollectionName()))
+                .append('pipeline', new BsonArray(pipeline))
+                .append('cursor', new BsonDocument())
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        testOperation(operation, [3, 4, 0], expectedCommand, async, helper.cursorResult)
 
         when:
         operation.filter(filter)
@@ -423,75 +299,151 @@ class CountOperationSpecification extends OperationFunctionalSpecification {
                 .skip(30)
                 .hint(hint)
                 .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
-
-        expectedCommand.append('query', filter)
-                .append('limit', new BsonInt64(20))
-                .append('skip', new BsonInt64(30))
+                .collation(defaultCollation)
+
+        expectedCommand = expectedCommand
+                .append('pipeline', new BsonArray([new BsonDocument('$match', filter),
+                                                   new BsonDocument('$skip', new BsonInt64(30)),
+                                                   new BsonDocument('$limit', new BsonInt64(20)),
+                                                   pipeline.last()]))
+                .append('maxTimeMS', new BsonInt32(10))
+                .append('collation', defaultCollation.asDocument())
                 .append('hint', hint)
-                .append('maxTimeMS', new BsonInt64(10))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
 
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        then:
+        testOperation(operation, [3, 4, 0], expectedCommand, async, helper.cursorResult)
+
+        where:
+        [async, hint] << [[true, false], [new BsonString('hint_1'), BsonDocument.parse('{hint: 1}')]].combinations()
+    }
+
+    def 'should throw an exception when using an unsupported ReadConcern'() {
+        given:
+        def operation = new CountOperation(helper.namespace, strategy)
+
+        when:
+        testOperationThrows(operation, [3, 0, 0], readConcern, async)
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('ReadConcern not supported by server version:')
+
+        where:
+        [async, strategy, readConcern] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND],
+                                           [ReadConcern.MAJORITY, ReadConcern.LOCAL]].combinations()
     }
 
-    def 'should validate the ReadConcern'() {
+    def 'should throw an exception when using an unsupported Collation'() {
         given:
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> Stub(ConnectionSource) {
-                getConnection() >> Stub(Connection) {
-                    getDescription() >> Stub(ConnectionDescription) {
-                        getServerVersion() >> new ServerVersion([3, 0, 0])
-                    }
-                }
-            }
-        }
-        def operation = new CountOperation(helper.namespace).readConcern(readConcern)
+        def operation = new CountOperation(helper.namespace, strategy).collation(defaultCollation)
 
         when:
-        operation.execute(readBinding)
+        testOperationThrows(operation, [3, 2, 0], async)
 
         then:
-        thrown(IllegalArgumentException)
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
     }
 
-    def 'should validate the ReadConcern asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
         given:
-        def connection = Stub(AsyncConnection) {
-            getDescription() >>  Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 0, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new CountOperation(helper.namespace).readConcern(readConcern)
-        def callback = Mock(SingleResultCallback)
+        getCollectionHelper().insertDocuments(BsonDocument.parse('{str: "foo"}'))
+        def operation = new CountOperation(namespace, strategy).filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(caseInsensitiveCollation)
+
+        when:
+        def result = execute(operation, async)
+
+        then:
+        result == 1
+
+        where:
+        [async, strategy] << [[true, false], [CountStrategy.AGGREGATE, CountStrategy.COMMAND]].combinations()
+    }
+
+    def 'should add read concern to command'() {
+        given:
+        def binding = Stub(ReadBinding)
+        def source = Stub(ConnectionSource)
+        def connection = Mock(Connection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.readConnectionSource >> source
+        binding.sessionContext >> sessionContext
+        source.connection >> connection
+        source.retain() >> source
+        def commandDocument = new BsonDocument('count', new BsonString(getCollectionName()))
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new CountOperation(getNamespace())
 
         when:
-        operation.executeAsync(readBinding, callback)
+        operation.execute(binding)
 
         then:
-        1 * callback.onResult(null, _ as IllegalArgumentException)
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.command(_, commandDocument, _, _, _, sessionContext) >>
+                new BsonDocument('n', new BsonInt64(42))
+        1 * connection.release()
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
     }
 
+    def 'should add read concern to command asynchronously'() {
+        given:
+        def binding = Stub(AsyncReadBinding)
+        def source = Stub(AsyncConnectionSource)
+        def connection = Mock(AsyncConnection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
+        binding.sessionContext >> sessionContext
+        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        source.retain() >> source
+        def commandDocument = new BsonDocument('count', new BsonString(getCollectionName()))
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new CountOperation(getNamespace())
+
+        when:
+        executeAsync(operation, binding)
+
+        then:
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.commandAsync(_, commandDocument, _, _, _, sessionContext, _) >> {
+            it[6].onResult(new BsonDocument('n', new BsonInt64(42)), null)
+        }
+        1 * connection.release()
+
+        where:
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
+    }
     def helper = [
         dbName: 'db',
         namespace: new MongoNamespace('db', 'coll'),
         commandResult: BsonDocument.parse('{ok: 1.0, n: 10}'),
+        cursorResult: BsonDocument.parse('{ok: 1.0}')
+                .append('cursor', new BsonDocument('id', new BsonInt64(0)).append('ns', new BsonString('db.coll'))
+                .append('firstBatch', new BsonArrayWrapper([ BsonDocument.parse('{n: 10}') ]))),
         connectionDescription: Stub(ConnectionDescription)
     ]
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/CreateCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CreateCollectionOperationSpecification.groovy
index c049b1deb99..d1500e92e41 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/CreateCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/CreateCollectionOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,24 +16,23 @@
 
 package com.mongodb.operation
 
-import category.Async
-import com.mongodb.MongoServerException
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
 import com.mongodb.WriteConcernException
 import com.mongodb.client.model.ValidationAction
 import com.mongodb.client.model.ValidationLevel
 import org.bson.BsonDocument
+import org.bson.BsonInt32
 import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
 
 class CreateCollectionOperationSpecification extends OperationFunctionalSpecification {
 
@@ -52,12 +51,14 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
         operation.getValidator() == null
         operation.getValidationLevel() == null
         operation.getValidationAction() == null
+        operation.getCollation() == null
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
     def 'should set optional values correctly'(){
         given:
-        def storageEngineOptions = BsonDocument.parse('{ mmapv1 : {}}')
-        def indexOptionDefaults = BsonDocument.parse('{ storageEngine: { mmapv1 : {} }}')
+        def storageEngineOptions = BsonDocument.parse('{ wiredTiger : {}}')
+        def indexOptionDefaults = BsonDocument.parse('{ storageEngine: { wiredTiger : {} }}')
         def validator = BsonDocument.parse('{ level: { $gte : 10 }}')
 
         when:
@@ -72,6 +73,7 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
             .validator(validator)
             .validationLevel(ValidationLevel.MODERATE)
             .validationAction(ValidationAction.WARN)
+            .collation(defaultCollation)
 
         then:
         operation.isCapped()
@@ -84,6 +86,7 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
         operation.getValidator() == validator
         operation.getValidationLevel() == ValidationLevel.MODERATE
         operation.getValidationAction() == ValidationAction.WARN
+        operation.getCollation() == defaultCollation
     }
 
     def 'should create a collection'() {
@@ -91,128 +94,164 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
         assert !collectionNameExists(getCollectionName())
 
         when:
-        new CreateCollectionOperation(getDatabaseName(), getCollectionName()).execute(getBinding())
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
+        execute(operation, async)
 
         then:
         collectionNameExists(getCollectionName())
-    }
-
-    @Category(Async)
-    def 'should create a collection asynchronously'() {
-        given:
-        assert !collectionNameExists(getCollectionName())
 
-        when:
-        executeAsync(new CreateCollectionOperation(getDatabaseName(), getCollectionName()))
-
-        then:
-        collectionNameExists(getCollectionName())
+        where:
+        async << [true, false]
     }
 
-    def 'should error when creating a collection that already exists'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
+    def 'should pass through storage engine options'() {
         given:
-        assert !collectionNameExists(getCollectionName())
+        def storageEngineOptions = new BsonDocument('wiredTiger', new BsonDocument('configString', new BsonString('block_compressor=zlib')))
+        if (!serverVersionAtLeast(4, 1)) {
+            storageEngineOptions.append('mmapv1', new BsonDocument())
+        }
         def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
-        operation.execute(getBinding())
+                .storageEngineOptions(storageEngineOptions)
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
-        thrown(MongoServerException)
-        !collectionNameExists('nonExistingCollection')
+        new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec()).execute(getBinding()).next().find {
+            it -> it.getString('name').value == getCollectionName()
+        }.getDocument('options').getDocument('storageEngine') == operation.storageEngineOptions
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 0, 0)) })
-    def 'should pass through storage engine options'() {
+    @IgnoreIf({ !serverVersionAtLeast(4, 1) })
+    def 'should pass through storage engine options- zstd compression'() {
         given:
+        def storageEngineOptions = new BsonDocument('wiredTiger', new BsonDocument('configString', new BsonString('block_compressor=zstd')))
+        if (!serverVersionAtLeast(4, 1)) {
+            storageEngineOptions.append('mmapv1', new BsonDocument())
+        }
         def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
-                .storageEngineOptions(new BsonDocument('wiredTiger',
-                                                       new BsonDocument('configString', new BsonString('block_compressor=zlib')))
-                                              .append('mmapv1', new BsonDocument()))
+                .storageEngineOptions(storageEngineOptions)
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec()).execute(getBinding()).next().find {
             it -> it.getString('name').value == getCollectionName()
         }.getDocument('options').getDocument('storageEngine') == operation.storageEngineOptions
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should error when creating a collection that already exists asynchronously'() {
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should set flags for use power of two sizes'() {
         given:
         assert !collectionNameExists(getCollectionName())
         def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
-        operation.execute(getBinding())
+                .usePowerOf2Sizes(true)
 
         when:
-        executeAsync(operation)
+        execute(operation, async)
 
         then:
-        thrown(MongoServerException)
-        !collectionNameExists('nonExistingCollection')
+        new ListCollectionsOperation(getDatabaseName(), new BsonDocumentCodec()).execute(getBinding()).next().find {
+            it -> it.getString('name').value == getCollectionName()
+        }.getDocument('options').getNumber('flags').intValue() == 1
+
+        where:
+        async << [true, false]
     }
 
     def 'should create capped collection'() {
         given:
         assert !collectionNameExists(getCollectionName())
-
-        when:
-        new CreateCollectionOperation(getDatabaseName(), getCollectionName())
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
                 .capped(true)
-                .autoIndex(false)
                 .maxDocuments(100)
                 .sizeInBytes(40 * 1024)
-                .usePowerOf2Sizes(true)
-                .execute(getBinding())
+
+        when:
+        execute(operation, async)
 
         then:
         collectionNameExists(getCollectionName())
 
         when:
-        def stats = new CommandWriteOperation<Document>(getDatabaseName(),
-                                                        new BsonDocument('collStats', new BsonString(getCollectionName())),
-                                                        new DocumentCodec()).execute(getBinding())
+        def stats = new CommandWriteOperation<BsonDocument>(getDatabaseName(),
+                new BsonDocument('collStats', new BsonString(getCollectionName())),
+                new BsonDocumentCodec()).execute(getBinding())
+
         then:
-        stats.getBoolean('capped')
-        stats.getInteger('max') == 100
-        if (serverVersionAtLeast([2, 4, 0])) {
-            stats.getInteger('storageSize') == 40 * 1024
-        } else {
-            stats.getInteger('storageSize') >= 40 * 1024 && stats.getInteger('storageSize') <= 41 * 1024
-        }
+        stats.getBoolean('capped').getValue()
+        stats.getNumber('max').intValue() == 100
+        // Starting in 3.0, the size in bytes moved from storageSize to maxSize
+        stats.getNumber('maxSize', new BsonInt32(0)).intValue() == 40 * 1024 ||
+                stats.getNumber('storageSize', new BsonInt32(0)).intValue() == 40 * 1024
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should allow indexOptionDefaults'() {
+    @IgnoreIf({ serverVersionAtLeast(4, 0) })
+    def 'should create collection in respect to the autoIndex option'() {
         given:
         assert !collectionNameExists(getCollectionName())
-        def indexOptionDefaults = BsonDocument.parse('{ storageEngine: { mmapv1 : {} }}')
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
+                .autoIndex(autoIndex)
 
         when:
-        new CreateCollectionOperation(getDatabaseName(), getCollectionName())
+        execute(operation, async)
+
+        then:
+        new CommandWriteOperation<Document>(getDatabaseName(),
+                new BsonDocument('collStats', new BsonString(getCollectionName())),
+                new DocumentCodec()).execute(getBinding())
+                .getInteger('nindexes') == expectedNumberOfIndexes
+
+        where:
+        autoIndex | expectedNumberOfIndexes | async
+        true      | 1                       | true
+        true      | 1                       | false
+        false     | 0                       | true
+        false     | 0                       | false
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
+    def 'should allow indexOptionDefaults'() {
+        given:
+        assert !collectionNameExists(getCollectionName())
+        def indexOptionDefaults = BsonDocument.parse('{ storageEngine: { wiredTiger : {} }}')
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
                 .indexOptionDefaults(indexOptionDefaults)
-                .execute(getBinding())
+
+        when:
+        execute(operation, async)
 
         then:
         getCollectionInfo(getCollectionName()).get('options').get('indexOptionDefaults') == indexOptionDefaults
+
+        where:
+        async << [true, false]
     }
 
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should allow validator'() {
         given:
         assert !collectionNameExists(getCollectionName())
         def validator = BsonDocument.parse('{ level: { $gte : 10 }}')
-
-        when:
-        new CreateCollectionOperation(getDatabaseName(), getCollectionName())
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName())
                 .validator(validator)
                 .validationLevel(ValidationLevel.MODERATE)
                 .validationAction(ValidationAction.ERROR)
-                .execute(getBinding())
+
+        when:
+        execute(operation, async)
 
         then:
         def options = getCollectionInfo(getCollectionName()).get('options')
@@ -226,6 +265,59 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
         then:
         WriteConcernException writeConcernException = thrown()
         writeConcernException.getErrorCode() == 121
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
+        given:
+        assert !collectionNameExists(getCollectionName())
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName(), new WriteConcern(5))
+
+        when:
+        execute(operation, async)
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw an exception when passing an unsupported collation'() {
+        given:
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName()).collation(defaultCollation)
+
+        when:
+        testOperationThrows(operation, [3, 2, 0], async)
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        async << [false, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should be able to create a collection with a collation'() {
+        given:
+        def operation = new CreateCollectionOperation(getDatabaseName(), getCollectionName()).collation(defaultCollation)
+
+        when:
+        execute(operation, async)
+        def collectionCollation = getCollectionInfo(getCollectionName()).get('options').get('collation')
+        collectionCollation.remove('version')
+
+        then:
+        collectionCollation == defaultCollation.asDocument()
+
+        where:
+        async << [true, false]
     }
 
     def getCollectionInfo(String collectionName) {
diff --git a/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy
index 5af6030cf65..91652a664e3 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/CreateIndexesOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,12 @@
 
 package com.mongodb.operation
 
-import category.Async
 import com.mongodb.DuplicateKeyException
 import com.mongodb.MongoCommandException
-import com.mongodb.MongoException
+import com.mongodb.MongoExecutionTimeoutException
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
 import com.mongodb.bulk.IndexRequest
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWrapper
@@ -29,13 +30,14 @@ import org.bson.BsonInt64
 import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.executeAsync
+import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint
+import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
 import static java.util.concurrent.TimeUnit.SECONDS
 
 class CreateIndexesOperationSpecification extends OperationFunctionalSpecification {
@@ -47,7 +49,6 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati
 
     def 'should get index names'() {
         when:
-
         def createIndexOperation = new CreateIndexesOperation(getNamespace(),
                                                               [new IndexRequest(new BsonDocument('field1', new BsonInt32(1))),
                                                                new IndexRequest(new BsonDocument('field2', new BsonInt32(-1))),
@@ -58,411 +59,463 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati
                                                               ])
         then:
         createIndexOperation.indexNames == ['field1_1', 'field2_-1', 'field3_1_field4_-1', 'customName']
-
     }
 
     def 'should be able to create a single index'() {
         given:
         def keys = new BsonDocument('field', new BsonInt32(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [field1Index]
-    }
 
-    @Category(Async)
-    def 'should be able to create a single index asynchronously'() {
+        where:
+        async << [true, false]
+    }
 
+    @IgnoreIf({ isSharded() })
+    def 'should throw execution timeout exception from execute'() {
         given:
         def keys = new BsonDocument('field', new BsonInt32(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)]).maxTime(30, SECONDS)
+
+        enableMaxTimeFailPoint()
 
         when:
-        executeAsync(createIndexOperation)
+        execute(operation, async)
 
         then:
-        getUserCreatedIndexes('key') == [field1Index]
-    }
+        thrown(MongoExecutionTimeoutException)
 
+        cleanup:
+        disableMaxTimeFailPoint()
 
-    def 'should be able to create a single index with a BsonInt64'() {
-        given:
-        def keys = new BsonDocument('field', new BsonInt64(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
-
-        when:
-        createIndexOperation.execute(getBinding())
-
-        then:
-        getUserCreatedIndexes('key') == [field1Index]
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should be able to create a single index with a BsonInt64 asynchronously'() {
-
+    def 'should be able to create a single index with a BsonInt64'() {
         given:
         def keys = new BsonDocument('field', new BsonInt64(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
 
         when:
-        executeAsync(createIndexOperation)
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [field1Index]
-    }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should be able to create multiple indexes'() {
-        given:
-        def keysForFirstIndex = new BsonDocument('field', new BsonInt32(1))
-        def keysForSecondIndex = new BsonDocument('field2', new BsonInt32(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keysForFirstIndex),
-                                                                               new IndexRequest(keysForSecondIndex)])
-
-        when:
-        createIndexOperation.execute(getBinding())
-
-        then:
-        getUserCreatedIndexes('key') == [field1Index, field2Index]
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should be able to create multiple indexes asynchronously'() {
+    def 'should be able to create multiple indexes'() {
         given:
         def keysForFirstIndex = new BsonDocument('field', new BsonInt32(1))
         def keysForSecondIndex = new BsonDocument('field2', new BsonInt32(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keysForFirstIndex),
-                                                                               new IndexRequest(keysForSecondIndex)])
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keysForFirstIndex),
+                                                                    new IndexRequest(keysForSecondIndex)])
 
         when:
-        executeAsync(createIndexOperation)
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [field1Index, field2Index]
-    }
-
-    @IgnoreIf({ serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should fail to create multiple indexes with server that does not support createIndexesCommand'() {
-        given:
-        def keysForFirstIndex = new BsonDocument('field', new BsonInt32(1))
-        def keysForSecondIndex = new BsonDocument('field2', new BsonInt32(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keysForFirstIndex),
-                                                                               new IndexRequest(keysForSecondIndex)])
 
-        when:
-        createIndexOperation.execute(getBinding())
-
-        then:
-        thrown(MongoException)
-    }
-
-    @IgnoreIf({ serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should fail to create multiple indexes with server that does not support createIndexesCommand asynchronously'() {
-        given:
-        def keysForFirstIndex = new BsonDocument('field', new BsonInt32(1))
-        def keysForSecondIndex = new BsonDocument('field2', new BsonInt32(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keysForFirstIndex),
-                                                                               new IndexRequest(keysForSecondIndex)])
-
-        when:
-        executeAsync(createIndexOperation)
-
-        then:
-        thrown(MongoException)
+        where:
+        async << [true, false]
     }
 
     def 'should be able to create a single index on a nested field'() {
         given:
         def keys = new BsonDocument('x.y', new BsonInt32(1))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [xyIndex]
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to handle duplicate key errors when indexing'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), x1, x1)
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('x', new BsonInt32(1))).unique(true)])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('x', new BsonInt32(1))).unique(true)])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(DuplicateKeyException)
-    }
-
-    @Category(Async)
-    def 'should be able to handle duplicate key errors when indexing asynchronously'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), x1, x1)
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('x', new BsonInt32(1))).unique(true)])
-
-        when:
-        executeAsync(createIndexOperation)
 
-        then:
-        thrown(DuplicateKeyException)
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ serverVersionAtLeast(3, 0) })
     def 'should drop duplicates'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), x1, x1)
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('x', new BsonInt32(1)))
-                                                                       .unique(true).dropDups(true)])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('x', new BsonInt32(1))).unique(true).dropDups(true)])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getCollectionHelper().count() == 1
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should throw when trying to build an invalid index'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(new BsonDocument())])
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(new BsonDocument())])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
-    }
-
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    @Category(Async)
-    def 'should throw when trying to build an invalid index asynchronously'() {
-        given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(new BsonDocument())])
-
-        when:
-        executeAsync(createIndexOperation)
 
-        then:
-        thrown(MongoCommandException)
+        where:
+        async << [true, false]
     }
 
     def 'should be able to create a unique index'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonInt32(1)))])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonInt32(1)))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('unique').size() == 0
 
         when:
         getCollectionHelper().drop(getNamespace())
-        new CreateIndexesOperation(getNamespace(),
-                                   [new IndexRequest(new BsonDocument('field', new BsonInt32(1))).unique(true)]).execute(getBinding())
+        operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonInt32(1))).unique(true)])
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('unique').size() == 1
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to create a sparse index'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonInt32(1)))])
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(new BsonDocument('field', new BsonInt32(1)))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('sparse').size() == 0
 
         when:
         getCollectionHelper().drop(getNamespace())
-        new CreateIndexesOperation(getNamespace(),
-                                   [new IndexRequest(new BsonDocument('field', new BsonInt32(1))).sparse(true)])
-                .execute(getBinding())
+        operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonInt32(1))).sparse(true)])
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('sparse').size() == 1
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to create a TTL indexes'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonInt32(1)))])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonInt32(1)))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('expireAfterSeconds').size() == 0
 
         when:
         getCollectionHelper().drop(getNamespace())
-        new CreateIndexesOperation(getNamespace(),
-                                   [new IndexRequest(new BsonDocument('field', new BsonInt32(1))).expireAfter(100, SECONDS)])
-                .execute(getBinding())
+        operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonInt32(1))).expireAfter(100, SECONDS)])
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('expireAfterSeconds').size() == 1
         getUserCreatedIndexes('expireAfterSeconds') == [100]
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to create a 2d indexes'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonString('2d')))])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('2d')))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [['field': '2d']]
 
         when:
         getCollectionHelper().drop(getNamespace())
-        new CreateIndexesOperation(getNamespace(),
-                                   [new IndexRequest(new BsonDocument('field', new BsonString('2d'))).bits(2).min(1.0).max(2.0)])
-                .execute(getBinding())
+        operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('2d'))).bits(2).min(1.0).max(2.0)])
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [['field': '2d']]
         getUserCreatedIndexes('bits') == [2]
         getUserCreatedIndexes('min') == [1.0]
         getUserCreatedIndexes('max') == [2.0]
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to create a geoHaystack indexes'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonString('geoHaystack'))
-                                                                                        .append('field1', new BsonInt32(1)))
-                                                                       .bucketSize(10.0)])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('geoHaystack')).append('field1', new BsonInt32(1)))
+                         .bucketSize(10.0)])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [[field: 'geoHaystack', field1: 1]]
         getUserCreatedIndexes('bucketSize') == [10.0]
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 4, 0)) })
     def 'should be able to create a 2dSphereIndex'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonString('2dsphere')))])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('2dsphere')))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('key') == [['field' :'2dsphere']]
-        if (serverVersionAtLeast(asList(2, 6, 0))) { getUserCreatedIndexes('2dsphereIndexVersion') == [2] }
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should be able to create a 2dSphereIndex with version 1'() {
-            given:
-            def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                                  [new IndexRequest(new BsonDocument('field', new BsonString('2dsphere')))
-                                                                           .sphereVersion(1)])
+        given:
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('2dsphere'))).sphereVersion(1)])
 
-            when:
-            createIndexOperation.execute(getBinding())
+        when:
+        execute(operation, async)
 
-            then:
-            getUserCreatedIndexes('key') == [['field' :'2dsphere']]
-            getUserCreatedIndexes('2dsphereIndexVersion') == [1]
+        then:
+        getUserCreatedIndexes('key') == [['field' :'2dsphere']]
+        getUserCreatedIndexes('2dsphereIndexVersion') == [1]
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 4, 0)) })
     def 'should be able to create a textIndex'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonString('text')))
-                                                                       .defaultLanguage('es')
-                                                                       .languageOverride('language')
-                                                                       .weights(new BsonDocument('field', new BsonInt32(100)))])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('text')))
+                         .defaultLanguage('es')
+                         .languageOverride('language')
+                         .weights(new BsonDocument('field', new BsonInt32(100)))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes().size() == 1
         getUserCreatedIndexes('weights') == [['field': 100]]
         getUserCreatedIndexes('default_language') == ['es']
         getUserCreatedIndexes('language_override') == ['language']
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 4, 0)) })
     def 'should be able to create a textIndexVersion'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonString('text')))])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('text')))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes().size() == 1
-        if (serverVersionAtLeast(asList(2, 6, 0))) { getUserCreatedIndexes('textIndexVersion') == [2] }
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should be able to create a textIndexVersion with version 1'() {
         given:
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
-                                                              [new IndexRequest(new BsonDocument('field', new BsonString('text')))
-                                                                       .textVersion(1)])
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('field', new BsonString('text'))).textVersion(1)])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('textIndexVersion') == [1]
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
     def 'should pass through storage engine options'() {
         given:
         def storageEngineOptions = new Document('wiredTiger', new Document('configString', 'block_compressor=zlib'))
-                .append('mmapv1', new Document())
         def operation = new CreateIndexesOperation(getNamespace(),
-                                                   [new IndexRequest(new BsonDocument('a', new BsonInt32(1)))
-                                                            .storageEngine(new BsonDocumentWrapper(storageEngineOptions,
-                                                                                                   new DocumentCodec()))])
+                [new IndexRequest(new BsonDocument('a', new BsonInt32(1)))
+                         .storageEngine(new BsonDocumentWrapper(storageEngineOptions, new DocumentCodec()))])
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getIndex('a_1').get('storageEngine') == storageEngineOptions
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should be able to create a partially filtered index'() {
         given:
         def partialFilterExpression = new Document('a', new Document('$gte', 10))
-        def createIndexOperation = new CreateIndexesOperation(getNamespace(),
+        def operation = new CreateIndexesOperation(getNamespace(),
                 [new IndexRequest(new BsonDocument('field', new BsonInt32(1)))
                          .partialFilterExpression(new BsonDocumentWrapper(partialFilterExpression, new DocumentCodec()))])
 
         when:
-        createIndexOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getUserCreatedIndexes('partialFilterExpression').head() == partialFilterExpression
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
+        given:
+        def keys = new BsonDocument('field', new BsonInt32(1))
+        def operation = new CreateIndexesOperation(getNamespace(), [new IndexRequest(keys)], new WriteConcern(5))
+
+        when:
+        execute(operation, async)
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw an exception when using an unsupported Collation'() {
+        given:
+        def operation = new CreateIndexesOperation(getNamespace(), requests)
+
+        when:
+        testOperationThrows(operation, [3, 2, 0], async)
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        [async, requests] << [
+                [true, false],
+                [[new IndexRequest(BsonDocument.parse('{field: 1}}')).collation(defaultCollation)],
+                 [new IndexRequest(BsonDocument.parse('{field: 1}}')),
+                  new IndexRequest(BsonDocument.parse('{field: 2}}')).collation(defaultCollation)]]
+        ].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should be able to create an index with collation'() {
+        given:
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('a', new BsonInt32(1))).collation(defaultCollation)])
+
+        when:
+        execute(operation, async)
+        def indexCollation = new BsonDocumentWrapper<Document>(getIndex('a_1').get('collation'), new DocumentCodec())
+        indexCollation.remove('version')
+
+        then:
+        indexCollation == defaultCollation.asDocument()
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 1) })
+    def 'should be able to create wildcard indexes'() {
+        given:
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('$**', new BsonInt32(1))),
+                 new IndexRequest(new BsonDocument('tags.$**', new BsonInt32(1)))])
+
+        when:
+        execute(operation, async)
+
+        then:
+        getUserCreatedIndexes('key').contains(['$**': 1])
+        getUserCreatedIndexes('key').contains(['tags.$**': 1])
+
+        where:
+        async << [true, false]
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(4, 1) })
+    def 'should be able to create wildcard index with projection'() {
+        given:
+        def operation = new CreateIndexesOperation(getNamespace(),
+                [new IndexRequest(new BsonDocument('$**', new BsonInt32(1)))
+                        .wildcardProjection(new BsonDocument('a', new BsonInt32(1)).append('b.c', new BsonInt32(1)))])
+
+        when:
+        execute(operation, async)
+
+        then:
+        getUserCreatedIndexes('key').contains(['$**': 1])
+        getUserCreatedIndexes('wildcardProjection').contains(['a': 1, 'b.c': 1])
+
+        where:
+        async << [true, false]
+    }
 
     Document getIndex(final String indexName) {
         getIndexes().find {
@@ -470,7 +523,7 @@ class CreateIndexesOperationSpecification extends OperationFunctionalSpecificati
         }
     }
 
-    def List<Document> getIndexes() {
+    List<Document> getIndexes() {
         def indexes = []
         def cursor = new ListIndexesOperation(getNamespace(), new DocumentCodec()).execute(getBinding())
         while (cursor.hasNext()) {
diff --git a/driver-core/src/test/functional/com/mongodb/operation/CreateViewOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CreateViewOperationSpecification.groovy
new file mode 100644
index 00000000000..5bfbb050afd
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/operation/CreateViewOperationSpecification.groovy
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.MongoClientException
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoWriteConcernException
+import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
+import org.bson.BsonArray
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
+import spock.lang.IgnoreIf
+
+import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+
+class CreateViewOperationSpecification extends OperationFunctionalSpecification {
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should create view'() {
+        given:
+        def viewOn = getCollectionName();
+        def viewName = getCollectionName() + '-view'
+        def viewNamespace = new MongoNamespace(getDatabaseName(), viewName)
+
+        assert !collectionNameExists(viewOn)
+        assert !collectionNameExists(viewName)
+
+        def trueXDocument = new BsonDocument('_id', new BsonInt32(1)).append('x', BsonBoolean.TRUE)
+        def falseXDocument = new BsonDocument('_id', new BsonInt32(2)).append('x', BsonBoolean.FALSE)
+        getCollectionHelper().insertDocuments([trueXDocument, falseXDocument])
+
+        def pipeline = [new BsonDocument('$match', trueXDocument)]
+        def operation = new CreateViewOperation(getDatabaseName(), viewName, viewOn, pipeline, WriteConcern.ACKNOWLEDGED)
+
+        when:
+        execute(operation, async)
+
+        then:
+        def options = getCollectionInfo(viewName).get('options')
+        options.get('viewOn') == new BsonString(viewOn)
+        options.get('pipeline') == new BsonArray(pipeline)
+        getCollectionHelper(viewNamespace).find(new BsonDocumentCodec()) == [trueXDocument]
+
+        cleanup:
+        getCollectionHelper(viewNamespace).drop()
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should create view with collation'() {
+        given:
+        def viewOn = getCollectionName();
+        def viewName = getCollectionName() + '-view'
+        def viewNamespace = new MongoNamespace(getDatabaseName(), viewName)
+
+        assert !collectionNameExists(viewOn)
+        assert !collectionNameExists(viewName)
+
+        def operation = new CreateViewOperation(getDatabaseName(), viewName, viewOn, [], WriteConcern.ACKNOWLEDGED)
+                .collation(defaultCollation)
+
+        when:
+        execute(operation, async)
+        def collectionCollation = getCollectionInfo(viewName).get('options').get('collation')
+        collectionCollation.remove('version')
+
+        then:
+        collectionCollation == defaultCollation.asDocument()
+
+        cleanup:
+        getCollectionHelper(viewNamespace).drop()
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 4) })
+    def 'should throw if server version is not 3.4 or greater'() {
+        given:
+        def operation = new CreateViewOperation(getDatabaseName(), getCollectionName() + '-view',
+                getCollectionName(), [], WriteConcern.ACKNOWLEDGED)
+
+        when:
+        execute(operation, async)
+
+        then:
+        thrown(MongoClientException)
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
+        given:
+        def viewName = getCollectionName() + '-view'
+        def viewNamespace = new MongoNamespace(getDatabaseName(), viewName)
+        assert !collectionNameExists(viewName)
+
+        def operation = new CreateViewOperation(getDatabaseName(), viewName, getCollectionName(), [], new WriteConcern(5))
+
+        when:
+        execute(operation, async)
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
+
+        cleanup:
+        getCollectionHelper(viewNamespace).drop()
+
+        where:
+        async << [true, false]
+    }
+
+    def getCollectionInfo(String collectionName) {
+        new ListCollectionsOperation(databaseName, new BsonDocumentCodec()).filter(new BsonDocument('name',
+                new BsonString(collectionName))).execute(getBinding()).tryNext()?.head()
+    }
+
+    def collectionNameExists(String collectionName) {
+        getCollectionInfo(collectionName) != null
+    }
+
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/CurrentOpOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/CurrentOpOperationSpecification.groovy
index 3fddd56756a..b2e18436e83 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/CurrentOpOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/CurrentOpOperationSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -28,7 +28,7 @@ class CurrentOpOperationSpecification extends Specification {
         def op = new CurrentOpOperation().execute(getBinding())
 
         then:
-        op
+        !op.isEmpty()
         op.containsKey('inprog')
     }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/DeleteOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/DeleteOperationSpecification.groovy
index c73707fec63..d22b67c41cf 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/DeleteOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/DeleteOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,10 @@
 
 package com.mongodb.operation
 
-import category.Async
 import category.Slow
+import com.mongodb.MongoClientException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcernResult
 import com.mongodb.bulk.DeleteRequest
 import org.bson.BsonBinary
 import org.bson.BsonDocument
@@ -27,39 +28,37 @@ import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
 import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
 
 class DeleteOperationSpecification extends OperationFunctionalSpecification {
-    def 'should remove a document'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1))
-        def op = new DeleteOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))]
-        )
 
+    def 'should throw IllegalArgumentException for empty list of requests'() {
         when:
-        op.execute(getBinding())
+        new DeleteOperation(getNamespace(), true, ACKNOWLEDGED, true, [])
 
         then:
-        getCollectionHelper().count() == 0
+        thrown(IllegalArgumentException)
     }
 
-    @Category(Async)
-    def 'should remove a document asynchronously'() {
+    def 'should remove a document'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1))
-        def op = new DeleteOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))]
-        )
+        def operation = new DeleteOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))])
 
         when:
-        executeAsync(op)
+        execute(operation, async)
 
         then:
         getCollectionHelper().count() == 0
+
+        where:
+        async << [true, false]
     }
 
     @Category(Slow)
@@ -69,33 +68,89 @@ class DeleteOperationSpecification extends OperationFunctionalSpecification {
         def smallerDoc = new BsonDocument('bytes', new BsonBinary(new byte[1024 * 16 + 1980]))
         def simpleDoc = new BsonDocument('_id', new BsonInt32(1))
         getCollectionHelper().insertDocuments(new BsonDocumentCodec(), simpleDoc)
-        def op = new DeleteOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     [new DeleteRequest(bigDoc), new DeleteRequest(smallerDoc), new DeleteRequest(simpleDoc)]
-        )
+        def operation = new DeleteOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                [new DeleteRequest(bigDoc), new DeleteRequest(smallerDoc), new DeleteRequest(simpleDoc)])
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         getCollectionHelper().count() == 0
+
+        where:
+        async << [true, false]
     }
 
-    @Category([Slow, Async])
-    def 'should split removes into batches asynchronously'() {
+    @IgnoreIf({ serverVersionAtLeast(3, 4) })
+    def 'should throw an exception when using an unsupported Collation'() {
         given:
-        def bigDoc = new BsonDocument('bytes', new BsonBinary(new byte[1024 * 1024 * 16 - 2127]))
-        def smallerDoc = new BsonDocument('bytes', new BsonBinary(new byte[1024 * 16 + 1980]))
-        def simpleDoc = new BsonDocument('_id', new BsonInt32(1))
-        getCollectionHelper().insertDocuments(new BsonDocumentCodec(), simpleDoc)
-        def op = new DeleteOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     [new DeleteRequest(bigDoc), new DeleteRequest(smallerDoc), new DeleteRequest(simpleDoc)]
-        )
+        def operation = new DeleteOperation(getNamespace(), false, ACKNOWLEDGED, false, requests)
 
         when:
-        executeAsync(op)
+        execute(operation, async)
 
         then:
-        getCollectionHelper().count() == 0
+        def exception = thrown(Exception)
+        exception instanceof IllegalArgumentException
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        [async, requests] << [
+                [true, false],
+                [[new DeleteRequest(BsonDocument.parse('{x: 1}}')).collation(defaultCollation)],
+                 [new DeleteRequest(BsonDocument.parse('{x: 1}}')),
+                  new DeleteRequest(BsonDocument.parse('{y: 1}}')).collation(defaultCollation)]]
+        ].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        getCollectionHelper().insertDocuments(Document.parse('{str: "foo"}'))
+        def requests = [new DeleteRequest(BsonDocument.parse('{str: "FOO"}}')).collation(caseInsensitiveCollation)]
+        def operation = new DeleteOperation(getNamespace(), false, ACKNOWLEDGED, false, requests)
+
+        when:
+        WriteConcernResult result = execute(operation, async)
+
+        then:
+        result.getCount() == 1
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should throw if collation is set and write is unacknowledged'() {
+        given:
+        def requests = [new DeleteRequest(BsonDocument.parse('{str: "FOO"}}')).collation(caseInsensitiveCollation)]
+        def operation = new DeleteOperation(getNamespace(), false, UNACKNOWLEDGED, false, requests)
+
+        when:
+        execute(operation, async)
+
+        then:
+        thrown(MongoClientException)
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should support retryable writes'() {
+        given:
+        getCollectionHelper().insertDocuments(Document.parse('{str: "foo"}'))
+        def requests = [new DeleteRequest(BsonDocument.parse('{str: "foo"}}'))]
+        def operation = new DeleteOperation(getNamespace(), false, ACKNOWLEDGED, true, requests)
+
+        when:
+        WriteConcernResult result = executeWithSession(operation, async)
+
+        then:
+        result.getCount() == 1
+
+        where:
+        async << [true, false]
     }
 
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/DistinctOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/DistinctOperationSpecification.groovy
index e05448d8b63..c588164bea2 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/DistinctOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/DistinctOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,12 @@
 
 package com.mongodb.operation
 
-import category.Async
 import com.mongodb.MongoExecutionTimeoutException
 import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
-import com.mongodb.async.FutureResultCallback
-import com.mongodb.async.SingleResultCallback
+import com.mongodb.ServerAddress
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
 import com.mongodb.binding.ConnectionSource
@@ -31,31 +29,37 @@ import com.mongodb.binding.ReadBinding
 import com.mongodb.client.test.Worker
 import com.mongodb.client.test.WorkerCodec
 import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
 import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
 import org.bson.BsonInvalidOperationException
 import org.bson.BsonString
+import org.bson.BsonTimestamp
 import org.bson.Document
+import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.Decoder
 import org.bson.codecs.DocumentCodec
 import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.StringCodec
 import org.bson.codecs.ValueCodecProvider
 import org.bson.types.ObjectId
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
@@ -77,7 +81,7 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         then:
         operation.getFilter() == null
         operation.getMaxTime(MILLISECONDS) == 0
-        operation.getReadConcern() == ReadConcern.DEFAULT
+        operation.getCollation() == null
     }
 
     def 'should set optional values correctly'(){
@@ -88,12 +92,12 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
                 .maxTime(10, MILLISECONDS)
                 .filter(filter)
-                .readConcern(ReadConcern.MAJORITY)
+                .collation(defaultCollation)
 
         then:
         operation.getFilter() == filter
         operation.getMaxTime(MILLISECONDS) == 10
-        operation.getReadConcern() == ReadConcern.MAJORITY
+        operation.getCollation() == defaultCollation
     }
 
     def 'should be able to distinct by name'() {
@@ -102,31 +106,16 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         Document sam = new Document('name', 'Sam').append('age', 21)
         Document pete2 = new Document('name', 'Pete').append('age', 25)
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
-
-        when:
         DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
-        def result = operation.execute(getBinding()).next();
-
-        then:
-        result == ['Pete', 'Sam']
-    }
-
-    @Category(Async)
-    def 'should be able to distinct by name asynchronously'() {
-        given:
-        Document pete = new Document('name', 'Pete').append('age', 38)
-        Document sam = new Document('name', 'Sam').append('age', 21)
-        Document pete2 = new Document('name', 'Pete').append('age', 25)
-        getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
 
         when:
-        DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
-        def futureResult = new FutureResultCallback()
-        executeAsync(operation).next(futureResult)
-        def result = futureResult.get(60, SECONDS)
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        result == ['Pete', 'Sam']
+        results  == ['Pete', 'Sam']
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to distinct by name with find'() {
@@ -135,33 +124,17 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
         Document sam = new Document('name', 'Sam').append('age', 21)
         Document pete2 = new Document('name', 'Pete').append('age', 25)
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
-
-        when:
-        DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
+        def operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
                 .filter(new BsonDocument('age', new BsonInt32(25)))
-        def result = operation.execute(getBinding());
-
-        then:
-        result.next() == ['Pete']
-    }
-
-    @Category(Async)
-    def 'should be able to distinct by name with find asynchronously'() {
-        given:
-        Document pete = new Document('name', 'Pete').append('age', 38)
-        Document sam = new Document('name', 'Sam').append('age', 21)
-        Document pete2 = new Document('name', 'Pete').append('age', 25)
-        getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
 
         when:
-        DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
-                .filter(new BsonDocument('age', new BsonInt32(25)))
-        def futureResult = new FutureResultCallback()
-        executeAsync(operation).next(futureResult)
-        def result = futureResult.get(60, SECONDS)
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        result == ['Pete']
+        results  == ['Pete']
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to distinct with custom codecs'() {
@@ -182,294 +155,215 @@ class DistinctOperationSpecification extends OperationFunctionalSpecification {
                 .append('numberOfJobs', sam.numberOfJobs)
 
         getCollectionHelper().insertDocuments(new Document('worker', peteDocument), new Document('worker', samDocument));
-
-        when:
         DistinctOperation operation = new DistinctOperation(getNamespace(), 'worker', new WorkerCodec())
-        def result = operation.execute(getBinding()).next();
-
-        then:
-        result == [pete, sam]
-    }
-
-    @Category(Async)
-    def 'should be able to distinct with custom codecs asynchronously'() {
-        given:
-        Worker pete = new Worker(new ObjectId(), 'Pete', 'handyman', new Date(), 3)
-        Worker sam = new Worker(new ObjectId(), 'Sam', 'plumber', new Date(), 7)
-
-        Document peteDocument = new Document('_id', pete.id)
-                .append('name', pete.name)
-                .append('jobTitle', pete.jobTitle)
-                .append('dateStarted', pete.dateStarted)
-                .append('numberOfJobs', pete.numberOfJobs)
-
-        Document samDocument = new Document('_id', sam.id)
-                .append('name', sam.name)
-                .append('jobTitle', sam.jobTitle)
-                .append('dateStarted', sam.dateStarted)
-                .append('numberOfJobs', sam.numberOfJobs)
-
-        getCollectionHelper().insertDocuments(new Document('worker', peteDocument), new Document('worker', samDocument));
 
         when:
-        DistinctOperation operation = new DistinctOperation(getNamespace(), 'worker', new WorkerCodec())
-        def futureResult = new FutureResultCallback()
-        executeAsync(operation).next(futureResult)
-        def result = futureResult.get(60, SECONDS)
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        result == [pete, sam]
+        results  == [pete, sam]
+
+        where:
+        async << [true, false]
     }
 
+
     def 'should throw if invalid decoder passed to distinct'() {
         given:
         Document pete = new Document('name', 'Pete')
         Document sam = new Document('name', 1)
         Document pete2 = new Document('name', new Document('earle', 'Jones'))
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
-
-        when:
         DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
-        operation.execute(getBinding()).next();
-
-        then:
-        thrown(BsonInvalidOperationException)
-    }
-
-    @Category(Async)
-    def 'should throw if invalid decoder passed to distinct asynchronously'() {
-        given:
-        Document pete = new Document('name', 'Pete')
-        Document sam = new Document('name', 1)
-        Document pete2 = new Document('name', new Document('earle', 'Jones'))
-        getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
 
         when:
-        DistinctOperation operation = new DistinctOperation(getNamespace(), 'name', stringDecoder)
-        def futureResult = new FutureResultCallback()
-        executeAsync(operation).next(futureResult)
-        futureResult.get(5, SECONDS)
+        execute(operation, async)
 
         then:
         thrown(BsonInvalidOperationException)
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     def 'should throw execution timeout exception from execute'() {
         given:
         def operation = new DistinctOperation(getNamespace(), 'name', stringDecoder).maxTime(1, SECONDS)
         enableMaxTimeFailPoint()
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoExecutionTimeoutException)
 
         cleanup:
         disableMaxTimeFailPoint()
-    }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw execution timeout exception from executeAsync'() {
-        given:
-        def operation = new DistinctOperation(getNamespace(), 'name', stringDecoder).maxTime(1, SECONDS)
-        enableMaxTimeFailPoint()
+        where:
+        async << [true, false]
+    }
 
+    def 'should use the ReadBindings readPreference to set slaveOK'() {
         when:
-        executeAsync(operation)
+        def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder)
 
         then:
-        thrown(MongoExecutionTimeoutException)
+        testOperationSlaveOk(operation, [3, 4, 0], readPreference, async, helper.commandResult)
 
-        cleanup:
-        disableMaxTimeFailPoint()
+        where:
+        [async, readPreference] << [[true, false], [ReadPreference.primary(), ReadPreference.secondary()]].combinations()
     }
 
-    def 'should use the ReadBindings readPreference to set slaveOK'() {
-        given:
-        def connection = Mock(Connection) {
-            _ * getDescription() >> helper.connectionDescription
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> Stub(ConnectionSource) {
-                getConnection() >> connection
-            }
-            getReadPreference() >> readPreference
-        }
-        def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder)
-
+    def 'should create the expected command'() {
         when:
-        operation.execute(readBinding)
+        def operation = new DistinctOperation(helper.namespace, 'name', new BsonDocumentCodec())
+                .filter(new BsonDocument('a', BsonBoolean.TRUE))
+                .maxTime(10, MILLISECONDS)
+                .collation(defaultCollation)
+
+        def expectedCommand = new BsonDocument('distinct', new BsonString(helper.namespace.getCollectionName()))
+                .append('key', new BsonString('name'))
+                .append('query', operation.getFilter())
+                .append('maxTimeMS', new BsonInt64(operation.getMaxTime(MILLISECONDS)))
+                .append('collation', defaultCollation.asDocument())
 
         then:
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
-        1 * connection.release()
+        testOperation(operation, [3, 4, 0], expectedCommand, async, helper.commandResult)
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        async << [false, false]
     }
 
-    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
+
+    def 'should throw an exception when using an unsupported ReadConcern'() {
         given:
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> helper.connectionDescription
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadPreference() >> readPreference
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
         def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        testOperationThrows(operation, [3, 0, 0], readConcern, async)
 
         then:
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('ReadConcern not supported by server version:')
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        [async, readConcern] << [[true, false], [ReadConcern.MAJORITY, ReadConcern.LOCAL]].combinations()
     }
 
-    def 'should create the expected command'() {
-        given:
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-        }
+    def 'should throw an exception when using an unsupported Collation'() {
         def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder)
-        def expectedCommand = new BsonDocument('distinct', new BsonString(helper.namespace.getCollectionName()))
-                .append('key', new BsonString('name'))
+                .collation(defaultCollation)
 
         when:
-        operation.execute(readBinding)
+        testOperationThrows(operation, [3, 2, 0], async)
 
         then:
-        1 * connection.command(helper.dbName, expectedCommand, _, _, _) >> {  helper.commandResult }
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
 
-        when:
-        operation.filter(new BsonDocument('a', BsonBoolean.TRUE))
-                .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
-
-        expectedCommand.append('filter', operation.getFilter())
-                .append('maxTimeMS', new BsonInt64(operation.getMaxTime(MILLISECONDS)))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
-
-        operation.execute(readBinding)
-
-        then:
-        1 * connection.command(helper.dbName, _, _, _, _) >> { helper.commandResult }
-        1 * connection.release()
+        where:
+        async << [false, false]
     }
 
-    def 'should create the expected command asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
         given:
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder)
-        def expectedCommand = new BsonDocument('distinct', new BsonString(helper.namespace.getCollectionName()))
-                .append('key', new BsonString('name'))
+        def document = Document.parse('{str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def operation = new DistinctOperation(namespace, 'str', stringDecoder).filter(BsonDocument.parse('{str: "FOO"}}'))
+                .collation(caseInsensitiveCollation)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        def result = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
-
-        when:
-        operation.filter(new BsonDocument('a', BsonBoolean.TRUE))
-                .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
-
-        expectedCommand.append('filter', operation.getFilter())
-                .append('maxTimeMS', new BsonInt64(operation.getMaxTime(MILLISECONDS)))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
+        result == ['foo']
 
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
-
-        then:
-        1 * connection.commandAsync(helper.dbName, _, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        where:
+        async << [true, false]
     }
 
-    def 'should validate the ReadConcern'() {
+    def 'should add read concern to command'() {
         given:
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> Stub(ConnectionSource) {
-                getConnection() >> Stub(Connection) {
-                    getDescription() >> Stub(ConnectionDescription) {
-                        getServerVersion() >> new ServerVersion([3, 0, 0])
-                    }
-                }
-            }
-        }
-        def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder).readConcern(readConcern)
+        def binding = Stub(ReadBinding)
+        def source = Stub(ConnectionSource)
+        def connection = Mock(Connection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.readConnectionSource >> source
+        binding.sessionContext >> sessionContext
+        source.connection >> connection
+        source.retain() >> source
+        def commandDocument = new BsonDocument('distinct', new BsonString(getCollectionName()))
+                .append('key', new BsonString('str'))
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new DistinctOperation<String>(getNamespace(), 'str', new StringCodec())
 
         when:
-        operation.execute(readBinding)
+        operation.execute(binding)
 
         then:
-        thrown(IllegalArgumentException)
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.command(_, commandDocument, _, _, _, sessionContext) >>
+                new BsonDocument('values', new BsonArrayWrapper([]))
+        1 * connection.release()
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
     }
 
-    def 'should validate the ReadConcern asynchronously'() {
+    def 'should add read concern to command asynchronously'() {
         given:
-        def connection = Stub(AsyncConnection) {
-            getDescription() >>  Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 0, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new DistinctOperation(helper.namespace, 'name', helper.decoder).readConcern(readConcern)
-        def callback = Mock(SingleResultCallback)
+        def binding = Stub(AsyncReadBinding)
+        def source = Stub(AsyncConnectionSource)
+        def connection = Mock(AsyncConnection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
+        binding.sessionContext >> sessionContext
+        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        source.retain() >> source
+        def commandDocument = new BsonDocument('distinct', new BsonString(getCollectionName()))
+                .append('key', new BsonString('str'))
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new DistinctOperation<String>(getNamespace(), 'str', new StringCodec())
 
         when:
-        operation.executeAsync(readBinding, callback)
+        executeAsync(operation, binding)
 
         then:
-        1 * callback.onResult(null, _ as IllegalArgumentException)
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.commandAsync(_, commandDocument, _, _, _, sessionContext, _) >> {
+            it[6].onResult(new BsonDocument('values', new BsonArrayWrapper([])), null)
+        }
+        1 * connection.release()
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
     }
 
+
     def helper = [
         dbName: 'db',
         namespace: new MongoNamespace('db', 'coll'),
         decoder: Stub(Decoder),
-        commandResult: BsonDocument.parse('{ok: 1.0}').append('values', new BsonArrayWrapper([])),
-        connectionDescription: Stub(ConnectionDescription)
+        commandResult: BsonDocument.parse('{ok: 1.0}').append('values', new BsonArrayWrapper([]))
     ]
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/DropCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/DropCollectionOperationSpecification.groovy
index a127897c65f..9fdf7fdf095 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/DropCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/DropCollectionOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,18 @@ package com.mongodb.operation
 
 import category.Async
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
 import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 
 class DropCollectionOperationSpecification extends OperationFunctionalSpecification {
 
@@ -76,6 +81,25 @@ class DropCollectionOperationSpecification extends OperationFunctionalSpecificat
         !collectionNameExists('nonExistingCollection')
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
+        given:
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentTo', 'createTheCollection'))
+        assert collectionNameExists(getCollectionName())
+        def operation = new DropCollectionOperation(getNamespace(), new WriteConcern(5))
+
+        when:
+        async ? executeAsync(operation) : operation.execute(getBinding())
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
+
+        where:
+        async << [true, false]
+    }
+
     def collectionNameExists(String collectionName) {
         def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()).execute(getBinding())
         if (!cursor.hasNext()) {
diff --git a/driver-core/src/test/functional/com/mongodb/operation/DropDatabaseOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/DropDatabaseOperationSpecification.groovy
index d8c9ebfd184..c7e7517800e 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/DropDatabaseOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/DropDatabaseOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,21 @@
 package com.mongodb.operation
 
 import category.Async
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
+import org.bson.BsonDocument
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
 import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
+import static com.mongodb.ClusterFixture.configureFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.isSharded
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 
 class DropDatabaseOperationSpecification extends OperationFunctionalSpecification {
 
@@ -79,6 +85,33 @@ class DropDatabaseOperationSpecification extends OperationFunctionalSpecificatio
         !databaseNameExists(dbName)
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
+        given:
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentTo', 'createTheCollection'))
+
+        // On servers older than 4.0 that don't support this failpoint, use a crazy w value instead
+        def w = serverVersionAtLeast(4, 0) ? 2 : 5
+        def operation = new DropDatabaseOperation(databaseName, new WriteConcern(w))
+        if (serverVersionAtLeast(4, 0)) {
+            configureFailPoint(BsonDocument.parse('{ configureFailPoint: "failCommand", ' +
+                    'mode : {times : 1}, ' +
+                    'data : {failCommands : ["dropDatabase"], ' +
+                    'writeConcernError : {code : 100, errmsg : "failed"}}}'))
+        }
+
+        when:
+        async ? executeAsync(operation) : operation.execute(getBinding())
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
+
+        where:
+        async << [true, false]
+    }
+
     def databaseNameExists(String databaseName) {
         new ListDatabasesOperation(new DocumentCodec()).execute(getBinding()).next()*.name.contains(databaseName);
     }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/DropIndexOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/DropIndexOperationSpecification.groovy
index 838c26ed5b4..795c728d4a9 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/DropIndexOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/DropIndexOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,36 +16,39 @@
 
 package com.mongodb.operation
 
-import category.Async
 import com.mongodb.MongoException
+import com.mongodb.MongoExecutionTimeoutException
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
+import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+import spock.lang.Unroll
 
-import static com.mongodb.ClusterFixture.executeAsync
+import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint
+import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.isSharded
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static java.util.concurrent.TimeUnit.SECONDS
 
 class DropIndexOperationSpecification extends OperationFunctionalSpecification {
 
     def 'should not error when dropping non-existent index on non-existent collection'() {
         when:
-        new DropIndexOperation(getNamespace(), 'made_up_index_1').execute(getBinding())
+        execute(new DropIndexOperation(getNamespace(), 'made_up_index_1'), async)
 
         then:
         getIndexes().size() == 0
-    }
-
-    @Category(Async)
-    def 'should not error when dropping non-existent index on non-existent collection asynchronously'() {
-        when:
-        executeAsync(new DropIndexOperation(getNamespace(), 'made_up_index_1'))
 
-        then:
-        getIndexes().size() == 0
+        where:
+        async << [true, false]
     }
 
     def 'should error when dropping non-existent index on existing collection'() {
@@ -53,22 +56,13 @@ class DropIndexOperationSpecification extends OperationFunctionalSpecification {
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentThat', 'forces creation of the Collection'))
 
         when:
-        new DropIndexOperation(getNamespace(), 'made_up_index_1').execute(getBinding())
+        execute(new DropIndexOperation(getNamespace(), 'made_up_index_1'), async)
 
         then:
         thrown(MongoException)
-    }
-
-    @Category(Async)
-    def 'should error when dropping non-existent index  on existing collection asynchronously'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentThat', 'forces creation of the Collection'))
-
-        when:
-        executeAsync(new DropIndexOperation(getNamespace(), 'made_up_index_1'))
 
-        then:
-        thrown(MongoException)
+        where:
+        async << [true, false]
     }
 
     def 'should drop existing index by name'() {
@@ -76,73 +70,78 @@ class DropIndexOperationSpecification extends OperationFunctionalSpecification {
         collectionHelper.createIndex(new BsonDocument('theField', new BsonInt32(1)))
 
         when:
-        new DropIndexOperation(getNamespace(), 'theField_1').execute(getBinding())
+        execute(new DropIndexOperation(getNamespace(), 'theField_1'), async)
         List<Document> indexes = getIndexes()
 
         then:
         indexes.size() == 1
         indexes[0].name == '_id_'
+
+        where:
+        async << [true, false]
     }
 
+    @Unroll
     def 'should drop existing index by keys'() {
         given:
-        def keys = new BsonDocument('theField', new BsonInt32(1))
         collectionHelper.createIndex(keys)
 
         when:
-        new DropIndexOperation(getNamespace(), keys).execute(getBinding())
+        execute(new DropIndexOperation(getNamespace(), keys), async)
         List<Document> indexes = getIndexes()
 
         then:
         indexes.size() == 1
         indexes[0].name == '_id_'
+
+        where:
+        [keys, async] << [
+                [new BsonDocument('theField', new BsonInt32(1)),
+                 new BsonDocument('theField', new BsonInt32(1)).append('theSecondField', new BsonInt32(-1)),
+                 new BsonDocument('theField', new BsonString('2d')),
+                 new BsonDocument('theField', new BsonString('hashed')),
+                ],
+                [true, false]
+        ].combinations()
     }
 
-    @Category(Async)
-    def 'should drop existing index asynchronously'() {
+    @IgnoreIf({ isSharded() })
+    def 'should throw execution timeout exception from execute'() {
         given:
         def keys = new BsonDocument('theField', new BsonInt32(1))
         collectionHelper.createIndex(keys)
-        def operation = new DropIndexOperation(getNamespace(), keys);
+        def operation = new DropIndexOperation(getNamespace(), keys).maxTime(30, SECONDS)
+
+        enableMaxTimeFailPoint()
 
         when:
-        executeAsync(operation)
-        List<Document> indexes = getIndexes()
+        execute(operation, async)
 
         then:
-        indexes.size() == 1
-        indexes[0].name == '_id_'
-    }
-
-
-    def 'should drop existing index by key when using BsonInt64'() {
-        given:
-        def keys = new BsonDocument('theField', new BsonInt32(1))
-        collectionHelper.createIndex(keys)
+        thrown(MongoExecutionTimeoutException)
 
-        when:
-        new DropIndexOperation(getNamespace(), new BsonDocument('theField', new BsonInt64(1))).execute(getBinding())
-        List<Document> indexes = getIndexes()
+        cleanup:
+        disableMaxTimeFailPoint()
 
-        then:
-        indexes.size() == 1
-        indexes[0].name == '_id_'
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should drop existing index by key when using BsonInt64 asynchronously'() {
+    def 'should drop existing index by key when using BsonInt64'() {
         given:
         def keys = new BsonDocument('theField', new BsonInt32(1))
         collectionHelper.createIndex(keys)
-        def operation = new DropIndexOperation(getNamespace(), new BsonDocument('theField', new BsonInt64(1)));
 
         when:
-        executeAsync(operation)
+        execute(new DropIndexOperation(getNamespace(), new BsonDocument('theField', new BsonInt64(1))), async)
         List<Document> indexes = getIndexes()
 
         then:
         indexes.size() == 1
         indexes[0].name == '_id_'
+
+        where:
+        async << [true, false]
     }
 
     def 'should drop all indexes when passed *'() {
@@ -151,27 +150,33 @@ class DropIndexOperationSpecification extends OperationFunctionalSpecification {
         collectionHelper.createIndex(new BsonDocument('theOtherField', new BsonInt32(1)))
 
         when:
-        new DropIndexOperation(getNamespace(), '*').execute(getBinding())
+        execute(new DropIndexOperation(getNamespace(), '*'), async)
         List<Document> indexes = getIndexes()
 
         then:
         indexes.size() == 1
         indexes[0].name == '_id_'
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should drop all indexes when passed * asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
         given:
         collectionHelper.createIndex(new BsonDocument('theField', new BsonInt32(1)))
-        collectionHelper.createIndex(new BsonDocument('theOtherField', new BsonInt32(1)))
+        def operation = new DropIndexOperation(getNamespace(), 'theField_1', new WriteConcern(5))
 
         when:
-        executeAsync(new DropIndexOperation(getNamespace(), '*'))
-        List<Document> indexes = getIndexes()
+        execute(operation, async)
 
         then:
-        indexes.size() == 1
-        indexes[0].name == '_id_'
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
+
+        where:
+        async << [true, false]
     }
 
     def getIndexes() {
diff --git a/driver-core/src/test/functional/com/mongodb/operation/DropUserOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/DropUserOperationSpecification.groovy
index 8328f92e91c..81efb8f2401 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/DropUserOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/DropUserOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,23 +17,70 @@
 package com.mongodb.operation
 
 import com.mongodb.MongoException
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
+import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.MongoCredential.createMongoCRCredential
+import static com.mongodb.MongoCredential.createScramSha1Credential
+import static com.mongodb.MongoCredential.createScramSha256Credential
+
 
 class DropUserOperationSpecification extends OperationFunctionalSpecification {
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
     def 'should delete user without error'() {
         given:
-        def credential = createMongoCRCredential('userToDrop', databaseName, '123'.toCharArray())
+        def credential = createScramSha1Credential('userToDrop', databaseName, '123'.toCharArray())
         new CreateUserOperation(credential, true).execute(getBinding())
+        DropUserOperation operation = new DropUserOperation(databaseName, credential.userName)
 
         when:
+        execute(operation, async)
+
+        then:
+        notThrown(MongoException)
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 0) })
+    def 'should delete user without error SHA_256'() {
+        given:
+        def credential = createScramSha256Credential('userToDrop', databaseName, '123'.toCharArray())
+        new CreateUserOperation(credential, true).execute(getBinding())
         DropUserOperation operation = new DropUserOperation(databaseName, credential.userName)
-        operation.execute(getBinding())
+
+        when:
+        execute(operation, async)
 
         then:
         notThrown(MongoException)
+
+        where:
+        async << [true, false]
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw MongoCommandException on write concern error'() {
+        given:
+        def credential = createMongoCRCredential('userToDrop', databaseName, '123'.toCharArray())
+        new CreateUserOperation(credential, true).execute(getBinding())
+        def operation = new DropUserOperation(databaseName, credential.userName, new WriteConcern(5))
+
+        when:
+        execute(operation, async)
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.code == 100
+
+        where:
+        async << [true, false]
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/FindAndDeleteOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/FindAndDeleteOperationSpecification.groovy
index 31fc8c7303e..580959466d9 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/FindAndDeleteOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/FindAndDeleteOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,14 @@
 
 package com.mongodb.operation
 
-import category.Async
+import com.mongodb.MongoSocketException
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ServerAddress
 import com.mongodb.WriteConcern
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.binding.AsyncConnectionSource
-import com.mongodb.binding.AsyncWriteBinding
-import com.mongodb.binding.ConnectionSource
-import com.mongodb.binding.WriteBinding
 import com.mongodb.client.test.CollectionHelper
 import com.mongodb.client.test.Worker
 import com.mongodb.client.test.WorkerCodec
-import com.mongodb.connection.AsyncConnection
-import com.mongodb.connection.Connection
-import com.mongodb.connection.ConnectionDescription
-import com.mongodb.connection.ServerVersion
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWrapper
@@ -40,35 +32,39 @@ import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
 import java.util.concurrent.TimeUnit
 
-import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.configureFailPoint
+import static com.mongodb.ClusterFixture.disableFailPoint
+import static com.mongodb.ClusterFixture.disableOnPrimaryTransactionalWriteFailPoint
+import static com.mongodb.ClusterFixture.enableOnPrimaryTransactionalWriteFailPoint
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
+import static com.mongodb.WriteConcern.W1
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
+import static com.mongodb.connection.ServerType.STANDALONE
 
 class FindAndDeleteOperationSpecification extends OperationFunctionalSpecification {
     private final DocumentCodec documentCodec = new DocumentCodec()
     private final WorkerCodec workerCodec = new WorkerCodec()
-    def writeConcern = WriteConcern.ACKNOWLEDGED
-
 
     def 'should have the correct defaults'() {
         when:
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, documentCodec)
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec)
 
         then:
         operation.getNamespace() == getNamespace()
-        operation.getWriteConcern() == writeConcern
+        operation.getWriteConcern() == ACKNOWLEDGED
         operation.getDecoder() == documentCodec
         operation.getFilter() == null
         operation.getSort() == null
         operation.getProjection() == null
         operation.getMaxTime(TimeUnit.MILLISECONDS) == 0
+        operation.getCollation() == null
     }
 
     def 'should set optional values correctly'(){
@@ -78,21 +74,22 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati
         def projection = BsonDocument.parse('{ projection : 1}')
 
         when:
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, documentCodec)
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec)
             .filter(filter)
             .sort(sort)
             .projection(projection)
             .maxTime(10, TimeUnit.MILLISECONDS)
+            .collation(defaultCollation)
 
         then:
         operation.getFilter() == filter
         operation.getSort() == sort
         operation.getProjection() == projection
         operation.getMaxTime(TimeUnit.MILLISECONDS) == 10
+        operation.getCollation() == defaultCollation
     }
 
     def 'should remove single document'() {
-
         given:
         Document pete = new Document('name', 'Pete').append('job', 'handyman')
         Document sam = new Document('name', 'Sam').append('job', 'plumber')
@@ -100,36 +97,20 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam)
 
         when:
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, documentCodec)
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = operation.execute(getBinding())
+        Document returnedDocument = execute(operation, async)
 
         then:
         getCollectionHelper().find().size() == 1;
         getCollectionHelper().find().first().getString('name') == 'Sam'
         returnedDocument.getString('name') == 'Pete'
-    }
-
-
-    @Category(Async)
-    def 'should remove single document asynchronously'() {
-        given:
-        Document pete = new Document('name', 'Pete').append('job', 'handyman')
-        Document sam = new Document('name', 'Sam').append('job', 'plumber')
 
-        getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam)
-
-        when:
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, documentCodec)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = executeAsync(operation)
-
-        then:
-        getCollectionHelper().find().size() == 1;
-        getCollectionHelper().find().first().getString('name') == 'Sam'
-        returnedDocument.getString('name') == 'Pete'
+        where:
+        async << [true, false]
     }
 
+
     def 'should remove single document when using custom codecs'() {
         given:
         Worker pete = new Worker('Pete', 'handyman', new Date(), 3)
@@ -137,45 +118,31 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati
         getWorkerCollectionHelper().insertDocuments(new WorkerCodec(), pete, sam)
 
         when:
-        FindAndDeleteOperation<Worker> operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, workerCodec)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Worker returnedDocument = operation.execute(getBinding())
+        FindAndDeleteOperation<Worker> operation = new FindAndDeleteOperation<Worker>(getNamespace(), ACKNOWLEDGED, false,
+                workerCodec).filter(new BsonDocument('name', new BsonString('Pete')))
+        Worker returnedDocument = execute(operation, async)
 
         then:
         getWorkerCollectionHelper().find().size() == 1;
         getWorkerCollectionHelper().find().first() == sam
         returnedDocument == pete
-    }
 
-    @Category(Async)
-    def 'should remove single document when using custom codecs asynchronously'() {
-        given:
-        Worker pete = new Worker('Pete', 'handyman', new Date(), 3)
-        Worker sam = new Worker('Sam', 'plumber', new Date(), 7)
-        getWorkerCollectionHelper().insertDocuments(new WorkerCodec(), pete, sam)
-
-        when:
-        FindAndDeleteOperation<Worker> operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, workerCodec)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Worker returnedDocument = operation.execute(getBinding())
-
-        then:
-        getWorkerCollectionHelper().find().size() == 1;
-        getWorkerCollectionHelper().find().first() == sam
-        returnedDocument == pete
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) || !isDiscoverableReplicaSet() })
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) || !isDiscoverableReplicaSet() })
     def 'should throw on write concern error'() {
         given:
         CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
         Document pete = new Document('name', 'Pete').append('job', 'handyman')
         helper.insertDocuments(new DocumentCodec(), pete)
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), new WriteConcern(5, 1), false,
+                documentCodec).filter(new BsonDocument('name', new BsonString('Pete')))
 
         when:
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -184,64 +151,74 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati
         ex.writeResult.count == 1
         !ex.writeResult.updateOfExisting
         ex.writeResult.upsertedId == null
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) || !isDiscoverableReplicaSet() })
-    def 'should throw on write concern error asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 8) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error on multiple failpoint'() {
         given:
         CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
         Document pete = new Document('name', 'Pete').append('job', 'handyman')
         helper.insertDocuments(new DocumentCodec(), pete)
 
+        def failPoint = BsonDocument.parse('''{
+            "configureFailPoint": "failCommand",
+            "mode": {"times": 2 },
+            "data": { "failCommands": ["findAndModify"],
+                      "writeConcernError": {"code": 91, "errmsg": "Replication is being shut down"}}}''')
+        configureFailPoint(failPoint)
+
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, false,
+                documentCodec).filter(new BsonDocument('name', new BsonString('Pete')))
+
         when:
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        executeAsync(operation)
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoWriteConcernException)
-        ex.writeConcernError.code == 100
+        ex.writeConcernError.code == 91
         !ex.writeConcernError.message.isEmpty()
         ex.writeResult.count == 1
         !ex.writeResult.updateOfExisting
         ex.writeResult.upsertedId == null
+
+        cleanup:
+        disableFailPoint('failCommand')
+
+        where:
+        async << [true, false]
     }
 
     def 'should create the expected command'() {
-        given:
+        when:
+        def includeCollation = serverVersionIsGreaterThan(serverVersion, [3, 4, 0])
+        def includeTxnNumber = (serverVersionIsGreaterThan(serverVersion, [3, 6, 0]) && retryWrites
+                && writeConcern.isAcknowledged() && serverType != STANDALONE)
+        def includeWriteConcern = (writeConcern.isAcknowledged() && !writeConcern.isServerDefault()
+                && serverVersionIsGreaterThan(serverVersion, [3, 4, 0]))
         def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec()))
-        def filter = BsonDocument.parse('{ filter : 1}')
-        def sort = BsonDocument.parse('{ sort : 1}')
-        def projection = BsonDocument.parse('{ projection : 1}')
-
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-
-        def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-        }
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, documentCodec)
-        def expectedCommand = new BsonDocument('findandmodify', new BsonString(getNamespace().getCollectionName()))
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, retryWrites, documentCodec)
+        def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName()))
                 .append('remove', BsonBoolean.TRUE)
 
         if (includeWriteConcern) {
             expectedCommand.put('writeConcern', writeConcern.asDocument())
         }
-
-        when:
-        operation.execute(writeBinding)
+        if (includeTxnNumber) {
+            expectedCommand.put('txnNumber', new BsonInt64(0))
+        }
 
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _) >> cannedResult
-        1 * connection.release()
+        testOperation([operation: operation, serverVersion: serverVersion, expectedCommand: expectedCommand, async: async,
+                       result: cannedResult, serverType: serverType])
 
         when:
+        def filter = BsonDocument.parse('{ filter : 1}')
+        def sort = BsonDocument.parse('{ sort : 1}')
+        def projection = BsonDocument.parse('{ projection : 1}')
+
         operation.filter(filter)
                 .sort(sort)
                 .projection(projection)
@@ -252,78 +229,131 @@ class FindAndDeleteOperationSpecification extends OperationFunctionalSpecificati
                 .append('fields', projection)
                 .append('maxTimeMS', new BsonInt64(10))
 
-        operation.execute(writeBinding)
+        if (includeCollation) {
+            operation.collation(defaultCollation)
+            expectedCommand.append('collation', defaultCollation.asDocument())
+        }
 
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _) >> cannedResult
-        1 * connection.release()
+        testOperation([operation: operation, serverVersion: serverVersion, expectedCommand: expectedCommand, async: async,
+                       result: cannedResult, serverType: serverType])
 
         where:
-        serverVersion                | writeConcern                 | includeWriteConcern
-        new ServerVersion([3, 2, 0]) | WriteConcern.W1              | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.ACKNOWLEDGED    | false
-        new ServerVersion([3, 2, 0]) | WriteConcern.UNACKNOWLEDGED  | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.ACKNOWLEDGED    | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.UNACKNOWLEDGED  | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.W1              | false
+        [serverVersion, serverType, writeConcern, async, retryWrites] << [
+                [[3, 6, 0], [3, 4, 0], [3, 0, 0]],
+                [REPLICA_SET_PRIMARY, STANDALONE],
+                [ACKNOWLEDGED, W1, UNACKNOWLEDGED],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
-    def 'should create the expected command asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should support retryable writes'() {
         given:
+        Document pete = new Document('name', 'Pete').append('job', 'handyman')
+        Document sam = new Document('name', 'Sam').append('job', 'plumber')
+
+        getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam)
+
+        when:
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec)
+                .filter(new BsonDocument('name', new BsonString('Pete')))
+        enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse('{times: 1}'))
+
+        Document returnedDocument = executeWithSession(operation, async)
+
+        then:
+        getCollectionHelper().find().size() == 1
+        getCollectionHelper().find().first().getString('name') == 'Sam'
+        returnedDocument.getString('name') == 'Pete'
+
+        cleanup:
+        disableOnPrimaryTransactionalWriteFailPoint()
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should retry if the connection initially fails'() {
+        when:
         def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec()))
-        def filter = BsonDocument.parse('{ filter : 1}')
-        def sort = BsonDocument.parse('{ sort : 1}')
-        def projection = BsonDocument.parse('{ projection : 1}')
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new FindAndDeleteOperation<Document>(getNamespace(), writeConcern, documentCodec)
-        def expectedCommand = new BsonDocument('findandmodify', new BsonString(getNamespace().getCollectionName()))
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec)
+        def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName()))
                 .append('remove', BsonBoolean.TRUE)
+                .append('txnNumber', new BsonInt64(0))
 
-        if (includeWriteConcern) {
-            expectedCommand.put('writeConcern', writeConcern.asDocument())
-        }
+        then:
+        testOperationRetries(operation, [3, 6, 0], expectedCommand, async, cannedResult)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw original error when retrying and failing'() {
+        given:
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec)
+        def originalException = new MongoSocketException('Some failure', new ServerAddress())
 
         when:
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 4, 0]],
+                [REPLICA_SET_PRIMARY, REPLICA_SET_PRIMARY], originalException, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(cannedResult, null) }
-        1 * connection.release()
+        Exception commandException = thrown()
+        commandException == originalException
 
         when:
-        operation.filter(filter)
-                .sort(sort)
-                .projection(projection)
-                .maxTime(10, TimeUnit.MILLISECONDS)
-        expectedCommand.append('query', filter)
-                .append('sort', sort)
-                .append('fields', projection)
-                .append('maxTimeMS', new BsonInt64(10))
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 6, 0]],
+                [REPLICA_SET_PRIMARY, STANDALONE], originalException, async)
+
+        then:
+        commandException = thrown()
+        commandException == originalException
 
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        when:
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0]],
+                [REPLICA_SET_PRIMARY], originalException, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(cannedResult, null) }
-        1 * connection.release()
+        commandException = thrown()
+        commandException == originalException
 
         where:
-        serverVersion                | writeConcern                 | includeWriteConcern
-        new ServerVersion([3, 2, 0]) | WriteConcern.W1              | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.ACKNOWLEDGED    | false
-        new ServerVersion([3, 2, 0]) | WriteConcern.UNACKNOWLEDGED  | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.ACKNOWLEDGED    | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.UNACKNOWLEDGED  | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.W1              | false
+        async << [true, false]
     }
 
+    def 'should throw an exception when passing an unsupported collation'() {
+        given:
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec).collation(defaultCollation)
+
+        when:
+        testOperationThrows(operation, [3, 2, 0], async)
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        async << [false, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        def document = Document.parse('{_id: 1, str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def operation = new FindAndDeleteOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec)
+                .filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(caseInsensitiveCollation)
+
+        when:
+        def result = execute(operation, async)
+
+        then:
+        result == document
+
+        where:
+        async << [true, false]
+    }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/FindAndReplaceOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/FindAndReplaceOperationSpecification.groovy
index e0874ea5f1e..7a62f9f0855 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/FindAndReplaceOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/FindAndReplaceOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,26 +16,18 @@
 
 package com.mongodb.operation
 
-import category.Async
 import com.mongodb.MongoCommandException
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoSocketException
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ServerAddress
 import com.mongodb.WriteConcern
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.binding.AsyncConnectionSource
-import com.mongodb.binding.AsyncWriteBinding
-import com.mongodb.binding.ConnectionSource
-import com.mongodb.binding.WriteBinding
 import com.mongodb.client.model.CreateCollectionOptions
 import com.mongodb.client.model.ValidationOptions
 import com.mongodb.client.test.CollectionHelper
 import com.mongodb.client.test.Worker
 import com.mongodb.client.test.WorkerCodec
-import com.mongodb.connection.AsyncConnection
-import com.mongodb.connection.Connection
-import com.mongodb.connection.ConnectionDescription
-import com.mongodb.connection.ServerVersion
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWrapper
@@ -46,32 +38,35 @@ import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
 import java.util.concurrent.TimeUnit
 
-import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.configureFailPoint
+import static com.mongodb.ClusterFixture.disableFailPoint
+import static com.mongodb.ClusterFixture.disableOnPrimaryTransactionalWriteFailPoint
+import static com.mongodb.ClusterFixture.enableOnPrimaryTransactionalWriteFailPoint
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
+import static com.mongodb.WriteConcern.W1
 import static com.mongodb.client.model.Filters.gte
-import static java.util.Arrays.asList
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
+import static com.mongodb.connection.ServerType.STANDALONE
 
 class FindAndReplaceOperationSpecification extends OperationFunctionalSpecification {
     private final DocumentCodec documentCodec = new DocumentCodec()
     private final WorkerCodec workerCodec = new WorkerCodec()
-    def writeConcern = WriteConcern.ACKNOWLEDGED
-
 
     def 'should have the correct defaults and passed values'() {
         when:
         def replacement = new BsonDocument('replace', new BsonInt32(1))
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, replacement)
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, replacement)
 
         then:
         operation.getNamespace() == getNamespace()
-        operation.getWriteConcern() == writeConcern
+        operation.getWriteConcern() == ACKNOWLEDGED
         operation.getDecoder() == documentCodec
         operation.getReplacement() == replacement
         operation.getFilter() == null
@@ -79,6 +74,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
         operation.getProjection() == null
         operation.getMaxTime(TimeUnit.SECONDS) == 0
         operation.getBypassDocumentValidation() == null
+        operation.getCollation() == null
     }
 
     def 'should set optional values correctly'(){
@@ -88,9 +84,10 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
         def projection = new BsonDocument('projection', new BsonInt32(1))
 
         when:
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec,
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec,
                 new BsonDocument('replace', new BsonInt32(1))).filter(filter).sort(sort).projection(projection)
                 .bypassDocumentValidation(true).maxTime(1, TimeUnit.SECONDS).upsert(true).returnOriginal(false)
+                .collation(defaultCollation)
 
         then:
         operation.getFilter() == filter
@@ -100,6 +97,7 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
         operation.getMaxTime(TimeUnit.SECONDS) == 1
         operation.getBypassDocumentValidation()
         !operation.isReturnOriginal()
+        operation.getCollation() == defaultCollation
     }
 
     def 'should replace single document'() {
@@ -107,60 +105,32 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
         CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
         Document pete = new Document('name', 'Pete').append('job', 'handyman')
         Document sam = new Document('name', 'Sam').append('job', 'plumber')
-        BsonDocument jordan = new BsonDocumentWrapper<Document>([name: 'Jordan', job: 'sparky'] as Document, documentCodec)
+        BsonDocument jordan = BsonDocument.parse('{name: "Jordan", job: "sparky"}')
 
         helper.insertDocuments(new DocumentCodec(), pete, sam)
 
         when:
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, jordan)
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, jordan)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = operation.execute(getBinding())
+        Document returnedDocument = execute(operation, async)
 
         then:
         returnedDocument.getString('name') == 'Pete'
-        helper.find().size() == 2;
+        helper.find().size() == 2
         helper.find().get(0).getString('name') == 'Jordan'
 
         when:
-        operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec,
+        operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec,
                                                           new BsonDocumentWrapper<Document>(pete, documentCodec))
                 .filter(new BsonDocument('name', new BsonString('Jordan')))
                 .returnOriginal(false)
-        returnedDocument = operation.execute(getBinding())
-
-        then:
-        returnedDocument.getString('name') == 'Pete'
-    }
-
-    @Category(Async)
-    def 'should replace single document asynchronously'() {
-        given:
-        CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
-        Document pete = new Document('name', 'Pete').append('job', 'handyman')
-        Document sam = new Document('name', 'Sam').append('job', 'plumber')
-        BsonDocument jordan = new BsonDocumentWrapper<Document>([name: 'Jordan', job: 'sparky'] as Document, documentCodec)
-
-        helper.insertDocuments(new DocumentCodec(), pete, sam)
-
-        when:
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, jordan)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = executeAsync(operation)
+        returnedDocument = execute(operation, async)
 
         then:
         returnedDocument.getString('name') == 'Pete'
-        helper.find().size() == 2;
-        helper.find().get(0).getString('name') == 'Jordan'
 
-        when:
-        operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec,
-                                                          new BsonDocumentWrapper<Document>(pete, documentCodec))
-                .filter(new BsonDocument('name', new BsonString('Jordan')))
-                .returnOriginal(false)
-        returnedDocument = executeAsync(operation)
-
-        then:
-        returnedDocument.getString('name') == 'Pete'
+        where:
+        async << [true, false]
     }
 
     def 'should replace single document when using custom codecs'() {
@@ -174,9 +144,9 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
         helper.insertDocuments(new WorkerCodec(), pete, sam)
 
         when:
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, workerCodec,
+        def operation = new FindAndReplaceOperation<Worker>(getNamespace(), ACKNOWLEDGED, false, workerCodec,
                 replacement).filter(new BsonDocument('name', new BsonString('Pete')))
-        Worker returnedDocument = operation.execute(getBinding())
+        Worker returnedDocument = execute(operation, async)
 
         then:
         returnedDocument == pete
@@ -184,89 +154,48 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
 
         when:
         replacement = new BsonDocumentWrapper<Worker>(pete, workerCodec)
-        operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, workerCodec, replacement)
+        operation = new FindAndReplaceOperation<Worker>(getNamespace(), ACKNOWLEDGED, false, workerCodec, replacement)
                 .filter(new BsonDocument('name', new BsonString('Jordan')))
                 .returnOriginal(false)
-        returnedDocument = operation.execute(getBinding())
+        returnedDocument = execute(operation, async)
 
         then:
         returnedDocument == pete
-    }
 
-    @Category(Async)
-    def 'should replace single document when using custom codecs asynchronously'() {
-        given:
-        CollectionHelper<Worker> helper = new CollectionHelper<Worker>(workerCodec, getNamespace())
-        Worker pete = new Worker('Pete', 'handyman', new Date(), 3)
-        Worker sam = new Worker('Sam', 'plumber', new Date(), 5)
-        Worker jordan = new Worker(pete.id, 'Jordan', 'sparky', new Date(), 7)
-        BsonDocument replacement = new BsonDocumentWrapper<Worker>(jordan, workerCodec)
-
-        helper.insertDocuments(new WorkerCodec(), pete, sam)
-
-        when:
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, workerCodec, replacement)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Worker returnedDocument = executeAsync(operation)
-
-        then:
-        returnedDocument == pete
-        helper.find().get(0) == jordan
-
-        when:
-        replacement = new BsonDocumentWrapper<Worker>(pete, workerCodec)
-        operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, workerCodec, replacement)
-                .filter(new BsonDocument('name', new BsonString('Jordan')))
-                .returnOriginal(false)
-        returnedDocument = executeAsync(operation)
-
-        then:
-        returnedDocument == pete
+        where:
+        async << [true, false]
     }
 
     def 'should return null if query fails to match'() {
         when:
-        BsonDocument jordan = new BsonDocumentWrapper<Document>([name: 'Jordan', job: 'sparky'] as Document, documentCodec)
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, jordan)
+        BsonDocument jordan = BsonDocument.parse('{name: "Jordan", job: "sparky"}')
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, jordan)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = operation.execute(getBinding())
+        Document returnedDocument = execute(operation, async)
 
         then:
         returnedDocument == null
-    }
-
-    @Category(Async)
-    def 'should return null if query fails to match asynchronously'() {
-        when:
-        BsonDocument jordan = new BsonDocumentWrapper<Document>([name: 'Jordan', job: 'sparky'] as Document, documentCodec)
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, jordan)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = executeAsync(operation)
 
-        then:
-        returnedDocument == null
+        where:
+        async << [true, false]
     }
 
     def 'should throw an exception if replacement contains update operators'() {
-        when:
+        given:
         def replacement = new BsonDocumentWrapper<Document>(['$inc': 1] as Document, documentCodec)
-        new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, replacement).execute(getBinding())
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, replacement)
 
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-    @Category(Async)
-    def 'should throw an exception if replacement contains update operators asynchronously'() {
         when:
-        def replacement = new BsonDocumentWrapper<Document>(['$inc': 1] as Document, documentCodec)
-        executeAsync(new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, replacement))
+        execute(operation, async)
 
         then:
         thrown(IllegalArgumentException)
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should support bypassDocumentValidation'() {
         given:
         def namespace = new MongoNamespace(getDatabaseName(), 'collectionOut')
@@ -277,20 +206,22 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
 
         when:
         def replacement = new BsonDocument('level', new BsonInt32(9))
-        def operation = new FindAndReplaceOperation<Document>(namespace, writeConcern, documentCodec, replacement)
-        operation.execute(getBinding())
+        def operation = new FindAndReplaceOperation<Document>(namespace, ACKNOWLEDGED, false, documentCodec, replacement)
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        operation.bypassDocumentValidation(false).execute(getBinding())
+        operation.bypassDocumentValidation(false)
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        Document returnedDocument = operation.bypassDocumentValidation(true).returnOriginal(false).execute(getBinding())
+        operation.bypassDocumentValidation(true).returnOriginal(false)
+        Document returnedDocument = execute(operation, async)
 
         then:
         notThrown(MongoCommandException)
@@ -298,56 +229,24 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
 
         cleanup:
         collectionHelper?.drop()
-    }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should support bypassDocumentValidation asynchronously'() {
-        given:
-        def namespace = new MongoNamespace(getDatabaseName(), 'collectionOut')
-        def collectionHelper = getCollectionHelper(namespace)
-        collectionHelper.create('collectionOut', new CreateCollectionOptions().validationOptions(
-                new ValidationOptions().validator(gte('level', 10))))
-        collectionHelper.insertDocuments(BsonDocument.parse('{ level: 10 }'))
-
-        when:
-        def replacement = new BsonDocument('level', new BsonInt32(9))
-        def operation = new FindAndReplaceOperation<Document>(namespace, writeConcern, documentCodec, replacement)
-        executeAsync(operation)
-
-        then:
-        thrown(MongoCommandException)
-
-        when:
-        executeAsync(operation.bypassDocumentValidation(false))
-
-        then:
-        thrown(MongoCommandException)
-
-        when:
-        Document returnedDocument = executeAsync(operation.bypassDocumentValidation(true).returnOriginal(false))
-
-        then:
-        notThrown(MongoCommandException)
-        returnedDocument.getInteger('level') == 9
-
-        cleanup:
-        collectionHelper?.drop()
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) || !isDiscoverableReplicaSet() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) || !isDiscoverableReplicaSet() })
     def 'should throw on write concern error'() {
         given:
         CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
         Document pete = new Document('name', 'Pete').append('job', 'handyman')
         helper.insertDocuments(new DocumentCodec(), pete)
 
-        BsonDocument jordan = new BsonDocumentWrapper<Document>([name: 'Jordan', job: 'sparky'] as Document, documentCodec)
+        BsonDocument jordan = BsonDocument.parse('{name: "Jordan", job: "sparky"}')
 
         when:
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, jordan)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        operation.execute(getBinding())
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), new WriteConcern(5, 1),
+                false, documentCodec, jordan).filter(new BsonDocument('name', new BsonString('Pete')))
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -358,10 +257,10 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
         ex.writeResult.upsertedId == null
 
         when:
-        operation = new FindAndReplaceOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, jordan)
-                .filter(new BsonDocument('name', new BsonString('Bob')))
+        operation = new FindAndReplaceOperation<Document>(getNamespace(), new WriteConcern(5, 1),
+                false,  documentCodec, jordan).filter(new BsonDocument('name', new BsonString('Bob')))
                 .upsert(true)
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         ex = thrown(MongoWriteConcernException)
@@ -370,80 +269,79 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
         ex.writeResult.count == 1
         !ex.writeResult.updateOfExisting
         ex.writeResult.upsertedId instanceof BsonObjectId
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) || !isDiscoverableReplicaSet() })
-    def 'should throw on write concern error asynchronously'() {
-        given:
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 8) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error on multiple failpoint'() {
         CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
         Document pete = new Document('name', 'Pete').append('job', 'handyman')
         helper.insertDocuments(new DocumentCodec(), pete)
 
-        BsonDocument jordan = new BsonDocumentWrapper<Document>([name: 'Jordan', job: 'sparky'] as Document, documentCodec)
+        def failPoint = BsonDocument.parse('''{
+            "configureFailPoint": "failCommand",
+            "mode": {"times": 2 },
+            "data": { "failCommands": ["findAndModify"],
+                      "writeConcernError": {"code": 91, "errmsg": "Replication is being shut down"}}}''')
+        configureFailPoint(failPoint)
+
+        BsonDocument jordan = BsonDocument.parse('{name: "Jordan", job: "sparky"}')
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED,
+                false, documentCodec, jordan).filter(new BsonDocument('name', new BsonString('Pete')))
 
         when:
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, jordan)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        executeAsync(operation)
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoWriteConcernException)
-        ex.writeConcernError.code == 100
+        ex.writeConcernError.code == 91
         !ex.writeConcernError.message.isEmpty()
         ex.writeResult.count == 1
         ex.writeResult.updateOfExisting
         ex.writeResult.upsertedId == null
 
-        when:
-        operation = new FindAndReplaceOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, jordan)
-                .filter(new BsonDocument('name', new BsonString('Bob')))
-                .upsert(true)
-        executeAsync(operation)
+        cleanup:
+        disableFailPoint('failCommand')
 
-        then:
-        ex = thrown(MongoWriteConcernException)
-        ex.writeConcernError.code == 100
-        !ex.writeConcernError.message.isEmpty()
-        ex.writeResult.count == 1
-        !ex.writeResult.updateOfExisting
-        ex.writeResult.upsertedId instanceof BsonObjectId
+        where:
+        async << [true, false]
     }
 
     def 'should create the expected command'() {
-        given:
-        def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec()))
-        def replacement = BsonDocument.parse('{ replacement: 1}')
-        def filter = BsonDocument.parse('{ filter : 1}')
-        def sort = BsonDocument.parse('{ sort : 1}')
-        def projection = BsonDocument.parse('{ projection : 1}')
+        when:
+        def includeBypassValidation = serverVersionIsGreaterThan(serverVersion, [3, 4, 0])
+        def includeCollation = serverVersionIsGreaterThan(serverVersion, [3, 4, 0])
+        def includeTxnNumber = (serverVersionIsGreaterThan(serverVersion, [3, 6, 0]) && retryWrites
+                && writeConcern.isAcknowledged() && serverType != STANDALONE)
+        def includeWriteConcern = (writeConcern.isAcknowledged() && !writeConcern.isServerDefault()
+                && serverVersionIsGreaterThan(serverVersion, [3, 4, 0]))
 
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
 
-        def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-        }
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, replacement)
-        def expectedCommand = new BsonDocument('findandmodify', new BsonString(getNamespace().getCollectionName()))
+        def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec()))
+        def replacement = BsonDocument.parse('{ replacement: 1}')
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, retryWrites, documentCodec, replacement)
+        def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName()))
                 .append('update', replacement)
         if (includeWriteConcern) {
             expectedCommand.put('writeConcern', writeConcern.asDocument())
         }
-
-        when:
-        operation.execute(writeBinding)
+        if (includeTxnNumber) {
+            expectedCommand.put('txnNumber', new BsonInt64(0))
+        }
+        expectedCommand.put('new', BsonBoolean.FALSE)
 
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _) >> cannedResult
-        1 * connection.release()
+        testOperation([operation: operation, serverVersion: serverVersion, expectedCommand: expectedCommand, async: async,
+                       result: cannedResult, serverType: serverType])
 
         when:
+        def filter = BsonDocument.parse('{ filter : 1}')
+        def sort = BsonDocument.parse('{ sort : 1}')
+        def projection = BsonDocument.parse('{ projection : 1}')
+
         operation.filter(filter)
                 .sort(sort)
                 .projection(projection)
@@ -455,87 +353,143 @@ class FindAndReplaceOperationSpecification extends OperationFunctionalSpecificat
                 .append('fields', projection)
                 .append('maxTimeMS', new BsonInt64(10))
 
+        if (includeCollation) {
+            operation.collation(defaultCollation)
+            expectedCommand.append('collation', defaultCollation.asDocument())
+        }
         if (includeBypassValidation) {
             expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
         }
 
-        operation.execute(writeBinding)
-
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _) >> cannedResult
-        1 * connection.release()
+        testOperation([operation: operation, serverVersion: serverVersion, expectedCommand: expectedCommand, async: async,
+                       result: cannedResult, serverType: serverType])
 
         where:
-        serverVersion                | writeConcern                 | includeWriteConcern   | includeBypassValidation
-        new ServerVersion([3, 2, 0]) | WriteConcern.W1              | true                  | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | true
-        new ServerVersion([3, 0, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.W1              | false                 | false
+        [serverVersion, serverType, writeConcern, async, retryWrites] << [
+                [[3, 6, 0], [3, 4, 0], [3, 0, 0]],
+                [REPLICA_SET_PRIMARY, STANDALONE],
+                [ACKNOWLEDGED, W1, UNACKNOWLEDGED],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
-    def 'should create the expected command asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should support retryable writes'() {
         given:
+        CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
+        Document pete = new Document('name', 'Pete').append('job', 'handyman')
+        Document sam = new Document('name', 'Sam').append('job', 'plumber')
+        BsonDocument jordan = BsonDocument.parse('{name: "Jordan", job: "sparky"}')
+
+        helper.insertDocuments(new DocumentCodec(), pete, sam)
+
+        when:
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec, jordan)
+                .filter(new BsonDocument('name', new BsonString('Pete')))
+
+        enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse('{times: 1}'))
+        Document returnedDocument = executeWithSession(operation, async)
+
+        then:
+        returnedDocument.getString('name') == 'Pete'
+        helper.find().size() == 2
+        helper.find().get(0).getString('name') == 'Jordan'
+
+        cleanup:
+        disableOnPrimaryTransactionalWriteFailPoint()
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should retry if the connection initially fails'() {
+        when:
         def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec()))
         def replacement = BsonDocument.parse('{ replacement: 1}')
-        def filter = BsonDocument.parse('{ filter : 1}')
-        def sort = BsonDocument.parse('{ sort : 1}')
-        def projection = BsonDocument.parse('{ projection : 1}')
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new FindAndReplaceOperation<Document>(getNamespace(), writeConcern, documentCodec, replacement)
-        def expectedCommand = new BsonDocument('findandmodify', new BsonString(getNamespace().getCollectionName()))
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec, replacement)
+        def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName()))
                 .append('update', replacement)
-        if (includeWriteConcern) {
-            expectedCommand.put('writeConcern', writeConcern.asDocument())
-        }
+                .append('txnNumber', new BsonInt64(0))
+                .append('new', BsonBoolean.FALSE)
+
+        then:
+        testOperationRetries(operation, [3, 6, 0], expectedCommand, async, cannedResult)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw original error when retrying and failing'() {
+        given:
+        def replacement = BsonDocument.parse('{ replacement: 1}')
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec, replacement)
+        def originalException = new MongoSocketException('Some failure', new ServerAddress())
 
         when:
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 4, 0]],
+                [REPLICA_SET_PRIMARY, REPLICA_SET_PRIMARY], originalException, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(cannedResult, null) }
-        1 * connection.release()
+        Exception commandException = thrown()
+        commandException == originalException
 
         when:
-        operation.filter(filter)
-                .sort(sort)
-                .projection(projection)
-                .bypassDocumentValidation(true)
-                .maxTime(10, TimeUnit.MILLISECONDS)
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 6, 0]],
+                [REPLICA_SET_PRIMARY, STANDALONE], originalException, async)
 
-        expectedCommand.append('query', filter)
-                .append('sort', sort)
-                .append('fields', projection)
-                .append('maxTimeMS', new BsonInt64(10))
+        then:
+        commandException = thrown()
+        commandException == originalException
 
-        if (includeBypassValidation) {
-            expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
-        }
+        when:
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0]],
+                [REPLICA_SET_PRIMARY], originalException, async)
 
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        then:
+        commandException = thrown()
+        commandException == originalException
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw an exception when passing an unsupported collation'() {
+        given:
+        def replacement = BsonDocument.parse('{ replacement: 1}')
+        def operation =  new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, replacement)
+                .collation(defaultCollation)
+
+        when:
+        testOperationThrows(operation, [3, 2, 0], async)
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        async << [false, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        def document = Document.parse('{_id: 1, str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def replacement = BsonDocument.parse('{str: "bar"}')
+        def operation = new FindAndReplaceOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, replacement)
+                .filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(caseInsensitiveCollation)
+
+        when:
+        def result = execute(operation, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(cannedResult, null) }
-        1 * connection.release()
+        result == document
 
         where:
-        serverVersion                | writeConcern                 | includeWriteConcern   | includeBypassValidation
-        new ServerVersion([3, 2, 0]) | WriteConcern.W1              | true                  | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | true
-        new ServerVersion([3, 0, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.W1              | false                 | false
+        async << [true, false]
     }
+
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/FindAndUpdateOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/FindAndUpdateOperationSpecification.groovy
index 47435800110..3d382e9285c 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/FindAndUpdateOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/FindAndUpdateOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,26 +16,19 @@
 
 package com.mongodb.operation
 
-import category.Async
 import com.mongodb.MongoCommandException
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoSocketException
 import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.ServerAddress
 import com.mongodb.WriteConcern
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.binding.AsyncConnectionSource
-import com.mongodb.binding.AsyncWriteBinding
-import com.mongodb.binding.ConnectionSource
-import com.mongodb.binding.WriteBinding
 import com.mongodb.client.model.CreateCollectionOptions
 import com.mongodb.client.model.ValidationOptions
 import com.mongodb.client.test.CollectionHelper
 import com.mongodb.client.test.Worker
 import com.mongodb.client.test.WorkerCodec
-import com.mongodb.connection.AsyncConnection
-import com.mongodb.connection.Connection
-import com.mongodb.connection.ConnectionDescription
-import com.mongodb.connection.ServerVersion
+import org.bson.BsonArray
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWrapper
@@ -46,31 +39,37 @@ import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
 import java.util.concurrent.TimeUnit
 
-import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.configureFailPoint
+import static com.mongodb.ClusterFixture.disableFailPoint
+import static com.mongodb.ClusterFixture.disableOnPrimaryTransactionalWriteFailPoint
+import static com.mongodb.ClusterFixture.enableOnPrimaryTransactionalWriteFailPoint
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
+import static com.mongodb.WriteConcern.W1
 import static com.mongodb.client.model.Filters.gte
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
+import static com.mongodb.connection.ServerType.STANDALONE
 import static java.util.Arrays.asList
+import static java.util.Collections.singletonList
 
 class FindAndUpdateOperationSpecification extends OperationFunctionalSpecification {
     private final DocumentCodec documentCodec = new DocumentCodec()
     private final WorkerCodec workerCodec = new WorkerCodec()
-    def writeConcern = WriteConcern.ACKNOWLEDGED
 
     def 'should have the correct defaults and passed values'() {
         when:
         def update = new BsonDocument('update', new BsonInt32(1))
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
 
         then:
         operation.getNamespace() == getNamespace()
-        operation.getWriteConcern() == writeConcern
+        operation.getWriteConcern() == ACKNOWLEDGED
         operation.getDecoder() == documentCodec
         operation.getUpdate() == update
         operation.getFilter() == null
@@ -78,19 +77,40 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
         operation.getProjection() == null
         operation.getMaxTime(TimeUnit.SECONDS) == 0
         operation.getBypassDocumentValidation() == null
+        operation.getCollation() == null
     }
 
-    def 'should set optional values correctly'(){
+    @IgnoreIf({ !serverVersionAtLeast(asList(4, 1, 11)) })
+    def 'should have the correct defaults and passed values using update pipelines'() {
+        when:
+        def updatePipeline = new BsonArray(singletonList(new BsonDocument('update', new BsonInt32(1))))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, updatePipeline)
+
+        then:
+        operation.getNamespace() == getNamespace()
+        operation.getWriteConcern() == ACKNOWLEDGED
+        operation.getDecoder() == documentCodec
+        operation.getUpdatePipeline() == updatePipeline
+        operation.getFilter() == null
+        operation.getSort() == null
+        operation.getProjection() == null
+        operation.getMaxTime(TimeUnit.SECONDS) == 0
+        operation.getBypassDocumentValidation() == null
+        operation.getCollation() == null
+    }
+
+    def 'should set optional values correctly'() {
         given:
         def filter = new BsonDocument('filter', new BsonInt32(1))
         def sort = new BsonDocument('sort', new BsonInt32(1))
         def projection = new BsonDocument('projection', new BsonInt32(1))
 
         when:
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec,
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec,
                 new BsonDocument('update', new BsonInt32(1))).filter(filter).sort(sort).projection(projection)
                 .bypassDocumentValidation(true).maxTime(1, TimeUnit.SECONDS).upsert(true)
                 .returnOriginal(false)
+                .collation(defaultCollation)
 
         then:
         operation.getFilter() == filter
@@ -100,10 +120,36 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
         operation.getMaxTime(TimeUnit.SECONDS) == 1
         operation.getBypassDocumentValidation()
         !operation.isReturnOriginal()
+        operation.getCollation() == defaultCollation
     }
 
-    def 'should update single document'() {
+    @IgnoreIf({ !serverVersionAtLeast(asList(4, 1, 11)) })
+    def 'should set optional values correctly when using update pipelines'(){
+        given:
+        def filter = new BsonDocument('filter', new BsonInt32(1))
+        def sort = new BsonDocument('sort', new BsonInt32(1))
+        def projection = new BsonDocument('projection', new BsonInt32(1))
+
+        when:
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec,
+                new BsonArray(singletonList(new BsonDocument('update', new BsonInt32(1)))))
+                        .filter(filter).sort(sort).projection(projection)
+                .bypassDocumentValidation(true).maxTime(1, TimeUnit.SECONDS).upsert(true)
+                .returnOriginal(false)
+                .collation(defaultCollation)
+
+        then:
+        operation.getFilter() == filter
+        operation.getSort() == sort
+        operation.getProjection() == projection
+        operation.upsert == true
+        operation.getMaxTime(TimeUnit.SECONDS) == 1
+        operation.getBypassDocumentValidation()
+        !operation.isReturnOriginal()
+        operation.getCollation() == defaultCollation
+    }
 
+    def 'should update single document'() {
         given:
         CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
         Document pete = new Document('name', 'Pete').append('numberOfJobs', 3)
@@ -113,9 +159,9 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
 
         when:
         def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = operation.execute(getBinding())
+        Document returnedDocument = execute(operation, async)
 
         then:
         returnedDocument.getInteger('numberOfJobs') == 3
@@ -124,17 +170,20 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
 
         when:
         update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
+        operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
                 .returnOriginal(false)
-        returnedDocument = operation.execute(getBinding())
+        returnedDocument = execute(operation, async)
 
         then:
         returnedDocument.getInteger('numberOfJobs') == 5
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should update single document asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(asList(4, 1, 11)) })
+    def 'should add field using update pipeline'() {
         given:
         CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
         Document pete = new Document('name', 'Pete').append('numberOfJobs', 3)
@@ -143,26 +192,26 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
         helper.insertDocuments(new DocumentCodec(), pete, sam)
 
         when:
-        def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
+        def update = new BsonArray(singletonList(new BsonDocument('$addFields', new BsonDocument('foo', new BsonInt32(1)))))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-                .returnOriginal(true)
-        Document returnedDocument = executeAsync(operation)
+                .returnOriginal(false)
+        Document returnedDocument = execute(operation, false)
 
         then:
         returnedDocument.getInteger('numberOfJobs') == 3
-        helper.find().size() == 2;
-        helper.find().get(0).getInteger('numberOfJobs') == 4
+        helper.find().get(0).getInteger('foo') == 1
 
         when:
-        update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
+        update = new BsonArray(singletonList(new BsonDocument('$addFields', new BsonDocument('foo', new BsonInt32(1)))))
+        operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
                 .returnOriginal(false)
-        returnedDocument = executeAsync(operation)
+        returnedDocument = execute(operation, false)
 
         then:
-        returnedDocument.getInteger('numberOfJobs') == 5
+        returnedDocument.getInteger('numberOfJobs') == 3
+        helper.find().get(0).getInteger('foo') == 1
     }
 
     def 'should update single document when using custom codecs'() {
@@ -175,9 +224,9 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
 
         when:
         def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        def operation = new FindAndUpdateOperation<Worker>(getNamespace(), writeConcern, workerCodec, update)
+        def operation = new FindAndUpdateOperation<Worker>(getNamespace(), ACKNOWLEDGED, false, workerCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-        Worker returnedDocument = operation.execute(getBinding())
+        Worker returnedDocument = execute(operation, async)
 
         then:
         returnedDocument.numberOfJobs == 3
@@ -186,125 +235,95 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
 
         when:
         update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        operation = new FindAndUpdateOperation<Worker>(getNamespace(), writeConcern, workerCodec, update)
+        operation = new FindAndUpdateOperation<Worker>(getNamespace(), ACKNOWLEDGED, false, workerCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
                 .returnOriginal(false)
-        returnedDocument = operation.execute(getBinding())
+        returnedDocument = execute(operation, async)
 
         then:
         returnedDocument.numberOfJobs == 5
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should update single document when using custom codecs asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(asList(4, 1, 11)) })
+    def 'should update using pipeline when using custom codecs'() {
         given:
-        CollectionHelper<Worker> helper = new CollectionHelper<Worker>(workerCodec, getNamespace())
-        Worker pete = new Worker('Pete', 'handyman', new Date(), 3)
-        Worker sam = new Worker('Sam', 'plumber', new Date(), 5)
-
-        helper.insertDocuments(new WorkerCodec(), pete, sam)
-
-        when:
-        def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        def operation = new FindAndUpdateOperation<Worker>(getNamespace(), writeConcern, workerCodec, update)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Worker returnedDocument = executeAsync(operation)
+        CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
+        Document pete = new Document('name', 'Pete').append('numberOfJobs', 3)
+        Document sam = new Document('name', 'Sam').append('numberOfJobs', 5)
 
-        then:
-        returnedDocument.numberOfJobs == 3
-        helper.find().size() == 2;
-        helper.find().get(0).numberOfJobs == 4
+        helper.insertDocuments(new DocumentCodec(), pete, sam)
 
         when:
-        update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        operation = new FindAndUpdateOperation<Worker>(getNamespace(), workerCodec, update)
+        def update = new BsonArray(singletonList(new BsonDocument('$project', new BsonDocument('name', new BsonInt32(1)))))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
                 .returnOriginal(false)
-        returnedDocument = executeAsync(operation)
+        Document returnedDocument = execute(operation, async)
 
         then:
-        returnedDocument.numberOfJobs == 5
+        returnedDocument.getString('name') == 'Pete'
+        !returnedDocument.containsKey('numberOfJobs')
+
+        where:
+        async << [true, false]
     }
 
     def 'should return null if query fails to match'() {
         when:
         def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = operation.execute(getBinding())
+        Document returnedDocument = execute(operation, async)
 
         then:
         returnedDocument == null
-    }
 
-    @Category(Async)
-    def 'should return null if query fails to match asynchronously'() {
-        when:
-        def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        Document returnedDocument = executeAsync(operation)
-
-        then:
-        returnedDocument == null
+        where:
+        async << [true, false]
     }
 
     def 'should throw an exception if update contains fields that are not update operators'() {
-        when:
+        given:
         def update = new BsonDocument('x', new BsonInt32(1))
-        new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update).execute(getBinding())
-
-        then:
-        thrown(IllegalArgumentException)
-    }
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
 
-    @Category(Async)
-    def 'should throw an exception if update contains fields that are not update operators asynchronously'() {
         when:
-        def update = new BsonDocument('x', new BsonInt32(1))
-        executeAsync(new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update))
+        execute(operation, async)
 
         then:
         thrown(IllegalArgumentException)
-    }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should support bypassDocumentValidation'() {
-        given:
-        def namespace = new MongoNamespace(getDatabaseName(), 'collectionOut')
-        def collectionHelper = getCollectionHelper(namespace)
-        collectionHelper.create('collectionOut', new CreateCollectionOptions().validationOptions(
-                new ValidationOptions().validator(gte('level', 10))))
-        collectionHelper.insertDocuments(BsonDocument.parse('{ level: 10 }'))
+        where:
+        async << [true, false]
+    }
 
+    @IgnoreIf({ !serverVersionAtLeast(asList(4, 1, 11)) })
+    def 'should throw an exception if update pipeline contains operations that are not supported'() {
         when:
-        def update = new BsonDocument('$inc', new BsonDocument('level', new BsonInt32(-1)))
-        def operation = new FindAndUpdateOperation<Document>(namespace, writeConcern, documentCodec, update)
-        operation.execute(getBinding())
+        def update = new BsonArray(singletonList(new BsonDocument('$foo', new BsonDocument('x', new BsonInt32(1)))))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        operation.bypassDocumentValidation(false).execute(getBinding())
+        update = singletonList(new BsonInt32(1))
+        operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
-        when:
-        Document returnedDocument = operation.bypassDocumentValidation(true).returnOriginal(false).execute(getBinding())
-
-        then:
-        notThrown(MongoCommandException)
-        returnedDocument.getInteger('level') == 9
-
-        cleanup:
-        collectionHelper?.drop()
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should support bypassDocumentValidation asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
+    def 'should support bypassDocumentValidation'() {
         given:
         def namespace = new MongoNamespace(getDatabaseName(), 'collectionOut')
         def collectionHelper = getCollectionHelper(namespace)
@@ -314,20 +333,22 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
 
         when:
         def update = new BsonDocument('$inc', new BsonDocument('level', new BsonInt32(-1)))
-        def operation = new FindAndUpdateOperation<Document>(namespace, writeConcern, documentCodec, update)
-        executeAsync(operation)
+        def operation = new FindAndUpdateOperation<Document>(namespace, ACKNOWLEDGED, false, documentCodec, update)
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        executeAsync(operation.bypassDocumentValidation(false))
+        operation.bypassDocumentValidation(false)
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        Document returnedDocument = executeAsync(operation.bypassDocumentValidation(true).returnOriginal(false))
+        operation.bypassDocumentValidation(true).returnOriginal(false)
+        Document returnedDocument = execute(operation, async)
 
         then:
         notThrown(MongoCommandException)
@@ -335,18 +356,21 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
 
         cleanup:
         collectionHelper?.drop()
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) || !isDiscoverableReplicaSet() })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) || !isDiscoverableReplicaSet() })
     def 'should throw on write concern error'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('name', 'Pete'))
         def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
 
         when:
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, update)
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), new WriteConcern(5, 1), false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Pete')))
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoWriteConcernException)
@@ -357,85 +381,86 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
         ex.writeResult.upsertedId == null
 
         when:
-        operation = new FindAndUpdateOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, update)
+        operation = new FindAndUpdateOperation<Document>(getNamespace(), new WriteConcern(5, 1), false, documentCodec, update)
                 .filter(new BsonDocument('name', new BsonString('Bob')))
                 .upsert(true)
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         ex = thrown(MongoWriteConcernException)
         ex.writeResult.count == 1
         !ex.writeResult.updateOfExisting
         ex.writeResult.upsertedId instanceof BsonObjectId
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) || !isDiscoverableReplicaSet() })
-    def 'should throw on write concern error asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 8) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error on multiple failpoint'() {
         given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('name', 'Pete'))
+        CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
+        helper.insertDocuments(new DocumentCodec(), new Document('name', 'Pete'))
+
+        def failPoint = BsonDocument.parse('''{
+            "configureFailPoint": "failCommand",
+            "mode": {"times": 2 },
+            "data": { "failCommands": ["findAndModify"],
+                      "writeConcernError": {"code": 91, "errmsg": "Replication is being shut down"}}}''')
+        configureFailPoint(failPoint)
+
         def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
+                .filter(new BsonDocument('name', new BsonString('Pete')))
 
         when:
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, update)
-                .filter(new BsonDocument('name', new BsonString('Pete')))
-        executeAsync(operation)
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoWriteConcernException)
-        ex.writeConcernError.code == 100
+        ex.writeConcernError.code == 91
         !ex.writeConcernError.message.isEmpty()
         ex.writeResult.count == 1
         ex.writeResult.updateOfExisting
         ex.writeResult.upsertedId == null
 
-        when:
-        operation = new FindAndUpdateOperation<Document>(getNamespace(), new WriteConcern(5, 1), documentCodec, update)
-                .filter(new BsonDocument('name', new BsonString('Bob')))
-                .upsert(true)
-        executeAsync(operation)
+        cleanup:
+        disableFailPoint('failCommand')
 
-        then:
-        ex = thrown(MongoWriteConcernException)
-        ex.writeResult.count == 1
-        !ex.writeResult.updateOfExisting
-        ex.writeResult.upsertedId instanceof BsonObjectId
+        where:
+        async << [true, false]
     }
 
     def 'should create the expected command'() {
-        given:
+        when:
+        def includeBypassValidation = serverVersionIsGreaterThan(serverVersion, [3, 4, 0])
+        def includeCollation = serverVersionIsGreaterThan(serverVersion, [3, 4, 0])
+        def includeTxnNumber = (serverVersionIsGreaterThan(serverVersion, [3, 6, 0]) && retryWrites
+                && writeConcern.isAcknowledged() && serverType != STANDALONE)
+        def includeWriteConcern = (writeConcern.isAcknowledged() && !writeConcern.isServerDefault()
+                && serverVersionIsGreaterThan(serverVersion, [3, 4, 0]))
         def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec()))
         def update = BsonDocument.parse('{ update: 1}')
-        def filter = BsonDocument.parse('{ filter : 1}')
-        def sort = BsonDocument.parse('{ sort : 1}')
-        def projection = BsonDocument.parse('{ projection : 1}')
-
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-
-        def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-        }
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
-        def expectedCommand = new BsonDocument('findandmodify', new BsonString(getNamespace().getCollectionName()))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, retryWrites, documentCodec, update)
+        def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName()))
                 .append('update', update)
         if (includeWriteConcern) {
             expectedCommand.put('writeConcern', writeConcern.asDocument())
         }
-
-        when:
-        operation.execute(writeBinding)
+        if (includeTxnNumber) {
+            expectedCommand.put('txnNumber', new BsonInt64(0))
+        }
+        expectedCommand.put('new', BsonBoolean.FALSE)
 
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), _, _, _, _) >> cannedResult
-        1 * connection.release()
+        testOperation([operation: operation, serverVersion: serverVersion, expectedCommand: expectedCommand, async: async,
+                       result: cannedResult, serverType: serverType])
 
         when:
+        def filter = BsonDocument.parse('{ filter : 1}')
+        def sort = BsonDocument.parse('{ sort : 1}')
+        def projection = BsonDocument.parse('{ projection : 1}')
+
         operation.filter(filter)
                 .sort(sort)
                 .projection(projection)
@@ -447,86 +472,165 @@ class FindAndUpdateOperationSpecification extends OperationFunctionalSpecificati
                 .append('fields', projection)
                 .append('maxTimeMS', new BsonInt64(10))
 
+        if (includeCollation) {
+            operation.collation(defaultCollation)
+            expectedCommand.append('collation', defaultCollation.asDocument())
+        }
         if (includeBypassValidation) {
             expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
         }
 
-        operation.execute(writeBinding)
-
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _) >> cannedResult
-        1 * connection.release()
+        testOperation([operation: operation, serverVersion: serverVersion, expectedCommand: expectedCommand, async: async,
+                       result: cannedResult, serverType: serverType])
 
         where:
-        serverVersion                | writeConcern                 | includeWriteConcern   | includeBypassValidation
-        new ServerVersion([3, 2, 0]) | WriteConcern.W1              | true                  | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | true
-        new ServerVersion([3, 0, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.W1              | false                 | false
+        [serverVersion, serverType, writeConcern, async, retryWrites] << [
+                [[3, 6, 0], [3, 4, 0], [3, 0, 0]],
+                [REPLICA_SET_PRIMARY, STANDALONE],
+                [ACKNOWLEDGED, W1, UNACKNOWLEDGED],
+                [true, false],
+                [true, false]
+        ].combinations()
     }
 
-    def 'should create the expected command asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should support retryable writes'() {
         given:
+        CollectionHelper<Document> helper = new CollectionHelper<Document>(documentCodec, getNamespace())
+        Document pete = new Document('name', 'Pete').append('numberOfJobs', 3)
+        Document sam = new Document('name', 'Sam').append('numberOfJobs', 5)
+
+        helper.insertDocuments(new DocumentCodec(), pete, sam)
+
+        when:
+        def update = new BsonDocument('$inc', new BsonDocument('numberOfJobs', new BsonInt32(1)))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec, update)
+                .filter(new BsonDocument('name', new BsonString('Pete')))
+
+        enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse('{times: 1}'))
+
+        Document returnedDocument = executeWithSession(operation, async)
+
+        then:
+        returnedDocument.getInteger('numberOfJobs') == 3
+        helper.find().size() == 2;
+        helper.find().get(0).getInteger('numberOfJobs') == 4
+
+        cleanup:
+        disableOnPrimaryTransactionalWriteFailPoint()
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should retry if the connection initially fails'() {
+        when:
         def cannedResult = new BsonDocument('value', new BsonDocumentWrapper(BsonDocument.parse('{}'), new BsonDocumentCodec()))
         def update = BsonDocument.parse('{ update: 1}')
-        def filter = BsonDocument.parse('{ filter : 1}')
-        def sort = BsonDocument.parse('{ sort : 1}')
-        def projection = BsonDocument.parse('{ projection : 1}')
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new FindAndUpdateOperation<Document>(getNamespace(), writeConcern, documentCodec, update)
-        def expectedCommand = new BsonDocument('findandmodify', new BsonString(getNamespace().getCollectionName()))
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec, update)
+        def expectedCommand = new BsonDocument('findAndModify', new BsonString(getNamespace().getCollectionName()))
                 .append('update', update)
-        if (includeWriteConcern) {
-            expectedCommand.put('writeConcern', writeConcern.asDocument())
-        }
+                .append('txnNumber', new BsonInt64(0))
+                .append('new', BsonBoolean.FALSE)
+
+        then:
+        testOperationRetries(operation, [3, 6, 0], expectedCommand, async, cannedResult)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw original error when retrying and failing'() {
+        given:
+        def update = BsonDocument.parse('{ update: 1}')
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, true, documentCodec, update)
+        def originalException = new MongoSocketException('Some failure', new ServerAddress())
 
         when:
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 4, 0]],
+                [REPLICA_SET_PRIMARY, REPLICA_SET_PRIMARY], originalException, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(cannedResult, null) }
-        1 * connection.release()
+        Exception commandException = thrown()
+        commandException == originalException
 
         when:
-        operation.filter(filter)
-                .sort(sort)
-                .projection(projection)
-                .bypassDocumentValidation(true)
-                .maxTime(10, TimeUnit.MILLISECONDS)
-        expectedCommand.append('query', filter)
-                .append('sort', sort)
-                .append('fields', projection)
-                .append('maxTimeMS', new BsonInt64(10))
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 6, 0]],
+                [REPLICA_SET_PRIMARY, STANDALONE], originalException, async)
 
-        if (includeBypassValidation) {
-            expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
-        }
+        then:
+        commandException = thrown()
+        commandException == originalException
+
+        when:
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0]],
+                [REPLICA_SET_PRIMARY], originalException, async)
 
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        then:
+        commandException = thrown()
+        commandException == originalException
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw an exception when passing an unsupported collation'() {
+        given:
+        def update = BsonDocument.parse('{ $set: {x: 1}}')
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
+                .collation(defaultCollation)
+
+        when:
+        testOperationThrows(operation, [3, 2, 0], async)
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        async << [false, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        def document = Document.parse('{_id: 1, str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def update = BsonDocument.parse('{ $set: {str: "bar"}}')
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
+                .filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(caseInsensitiveCollation)
+
+        when:
+        def result = execute(operation, async)
+
+        then:
+        result == document
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def 'should support array filters'() {
+        given:
+        def documentOne = Document.parse('{_id: 1, y: [ {b: 3}, {b: 1}]}')
+        def documentTwo = Document.parse('{_id: 2, y: [ {b: 0}, {b: 1}]}')
+        getCollectionHelper().insertDocuments(documentOne, documentTwo)
+        def update = BsonDocument.parse('{ $set: {"y.$[i].b": 2}}')
+        def arrayFilters = [BsonDocument.parse('{"i.b": 3}')]
+        def operation = new FindAndUpdateOperation<Document>(getNamespace(), ACKNOWLEDGED, false, documentCodec, update)
+                .returnOriginal(false)
+                .arrayFilters(arrayFilters)
+
+        when:
+        def result = execute(operation, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> { it[5].onResult(cannedResult, null) }
-        1 * connection.release()
+        result == Document.parse('{_id: 1, y: [ {b: 2}, {b: 1}]}')
 
         where:
-        serverVersion                | writeConcern                 | includeWriteConcern   | includeBypassValidation
-        new ServerVersion([3, 2, 0]) | WriteConcern.W1              | true                  | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | true
-        new ServerVersion([3, 2, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | true
-        new ServerVersion([3, 0, 0]) | WriteConcern.ACKNOWLEDGED    | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.UNACKNOWLEDGED  | false                 | false
-        new ServerVersion([3, 0, 0]) | WriteConcern.W1              | false                 | false
+        async << [true, false]
     }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/FindOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/FindOperationSpecification.groovy
index 7484c5446bc..15a91b5eead 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/FindOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/FindOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package com.mongodb.operation
 
-import category.Async
-import category.Slow
-import com.mongodb.Block
 import com.mongodb.ClusterFixture
 import com.mongodb.MongoExecutionTimeoutException
 import com.mongodb.MongoNamespace
@@ -27,7 +24,8 @@ import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
 import com.mongodb.ServerAddress
-import com.mongodb.async.SingleResultCallback
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.binding.AsyncClusterBinding
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
 import com.mongodb.binding.ClusterBinding
@@ -42,32 +40,33 @@ import com.mongodb.connection.ConnectionId
 import com.mongodb.connection.QueryResult
 import com.mongodb.connection.ServerId
 import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
 import org.bson.BsonString
+import org.bson.BsonTimestamp
 import org.bson.Document
 import org.bson.codecs.BsonDocumentCodec
-import org.bson.codecs.Decoder
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
+import static com.mongodb.ClusterFixture.executeSync
+import static com.mongodb.ClusterFixture.getAsyncCluster
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.getCluster
 import static com.mongodb.ClusterFixture.isSharded
-import static com.mongodb.ClusterFixture.loopCursor
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.CursorType.NonTailable
 import static com.mongodb.CursorType.Tailable
 import static com.mongodb.CursorType.TailableAwait
 import static com.mongodb.ExplainVerbosity.QUERY_PLANNER
 import static com.mongodb.connection.ServerType.STANDALONE
-import static java.util.Arrays.asList
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 import static org.junit.Assert.assertEquals
@@ -87,23 +86,25 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         operation.getFilter() == null
         operation.getMaxTime(MILLISECONDS) == 0
         operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getHint() == null
         operation.getLimit() == 0
         operation.getSkip() == 0
         operation.getBatchSize() == 0
         operation.getModifiers() == null
         operation.getProjection() == null
-        operation.getReadConcern() == ReadConcern.DEFAULT
+        operation.getCollation() == null
         !operation.isNoCursorTimeout()
         !operation.isOplogReplay()
         !operation.isPartial()
         !operation.isSlaveOk()
     }
 
-    def 'should set optional values correctly'(){
+    def 'should set optional values correctly'() {
         given:
         def filter = new BsonDocument('filter', new BsonInt32(1))
         def projection = new BsonDocument('projection', new BsonInt32(1))
         def modifiers = new BsonDocument('modifiers', new BsonInt32(1))
+        def hint = new BsonString('a_1')
 
         when:
         FindOperation operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
@@ -112,11 +113,12 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
                 .filter(filter)
                 .limit(20)
                 .skip(30)
+                .hint(hint)
                 .batchSize(40)
                 .projection(projection)
                 .modifiers(modifiers)
                 .cursorType(Tailable)
-                .readConcern(ReadConcern.MAJORITY)
+                .collation(defaultCollation)
                 .partial(true)
                 .slaveOk(true)
                 .oplogReplay(true)
@@ -128,10 +130,11 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         operation.getMaxAwaitTime(MILLISECONDS) == 20000
         operation.getLimit() == 20
         operation.getSkip() == 30
+        operation.getHint() == hint
         operation.getBatchSize() == 40
         operation.getProjection() == projection
         operation.getModifiers() == modifiers
-        operation.getReadConcern() == ReadConcern.MAJORITY
+        operation.getCollation() == defaultCollation
         operation.isNoCursorTimeout()
         operation.isOplogReplay()
         operation.isPartial()
@@ -139,16 +142,19 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
     }
 
     def 'should query with default values'() {
-        def document = new Document('_id', 1)
         given:
+        def document = new Document('_id', 1)
         getCollectionHelper().insertDocuments(new DocumentCodec(), document);
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
 
         when:
-        def cursor = findOperation.execute(getBinding())
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        cursor.next()[0] == document
+        results == [document]
+
+        where:
+        async << [true, false]
     }
 
     def 'should apply filter'() {
@@ -157,19 +163,18 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         getCollectionHelper().insertDocuments(new DocumentCodec(), document, new Document());
 
         when:
-        def cursor = operation.execute(getBinding())
-        def nextBatch = cursor.next()
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        nextBatch.size() == 1
-        nextBatch[0] == document
-        !cursor.hasNext()
+        results == [document]
 
         where:
-        operation << [new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                              .filter(new BsonDocument('_id', new BsonInt32(1))),
-                      new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                              .modifiers(new BsonDocument('$query', new BsonDocument('_id', new BsonInt32(1))))]
+        [async, operation] << [
+                [true, false],
+                [new FindOperation<Document>(getNamespace(), new DocumentCodec()).filter(new BsonDocument('_id', new BsonInt32(1))),
+                 new FindOperation<Document>(getNamespace(), new DocumentCodec())
+                         .modifiers(new BsonDocument('$query', new BsonDocument('_id', new BsonInt32(1))))]
+        ].combinations()
     }
 
     def 'should apply sort'() {
@@ -180,35 +185,35 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
 
 
         when: 'ascending'
-        def cursor = operation.execute(getBinding())
-        def list = []
-        while (cursor.hasNext()) {
-            list += cursor.next()
-        }
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        list == [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3), new Document('_id', 4), new Document('_id', 5)]
+        results == [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3), new Document('_id', 4), new Document('_id', 5)]
 
         where:
-        operation << [new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                                  .sort(new BsonDocument('_id', new BsonInt32(1))),
-                      new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                              .modifiers(new BsonDocument('$orderby', new BsonDocument('_id', new BsonInt32(1))))]
+        [async, operation] << [
+                [true, false],
+                [new FindOperation<Document>(getNamespace(), new DocumentCodec()).sort(new BsonDocument('_id', new BsonInt32(1))),
+                 new FindOperation<Document>(getNamespace(), new DocumentCodec())
+                         .modifiers(new BsonDocument('$orderby', new BsonDocument('_id', new BsonInt32(1))))]
+        ].combinations()
     }
 
     def 'should apply projection'() {
         given:
-        def document = new Document('_id', 1).append('x', 5).append('y', 10)
-        getCollectionHelper().insertDocuments(new DocumentCodec(), document, new Document());
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        getCollectionHelper().insertDocuments(new DocumentCodec(),
+                new Document('x', 5).append('y', 10), new Document('_id', 1).append('x', 10));
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .projection(new BsonDocument('_id', new BsonInt32(0)).append('x', new BsonInt32(1)))
 
         when:
-        def cursor = findOperation.execute(getBinding())
-        def nextBatch = cursor.next()
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        nextBatch[0] == new Document('x', 5)
+        results == [new Document('x', 5), new Document('x', 10)]
+
+        where:
+        async << [true, false]
     }
 
     def 'should apply skip'() {
@@ -217,16 +222,18 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
                          new Document('_id', 5)]
         getCollectionHelper().insertDocuments(new DocumentCodec(), documents);
 
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .sort(new BsonDocument('_id', new BsonInt32(1)))
                 .skip(3)
 
         when:
-        def cursor = findOperation.execute(getBinding())
-        def nextBatch = cursor.next()
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        nextBatch == [new Document('_id', 4), new Document('_id', 5)]
+        results == [new Document('_id', 4), new Document('_id', 5)]
+
+        where:
+        async << [true, false]
     }
 
     def 'should apply limit'() {
@@ -235,20 +242,18 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
                          new Document('_id', 5)]
         getCollectionHelper().insertDocuments(new DocumentCodec(), documents);
 
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .sort(new BsonDocument('_id', new BsonInt32(1)))
                 .limit(limit)
 
         when:
-        def cursor = findOperation.execute(getBinding())
-        def firstBatch = cursor.next()
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        firstBatch == [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        !cursor.hasNext()
+        results == [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
 
         where:
-        limit << [3, -3]
+        [async, limit] << [[true, false], [3, -3]].combinations()
     }
 
     def 'should apply batch size'() {
@@ -256,23 +261,41 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         def documents = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3), new Document('_id', 4),
                          new Document('_id', 5)]
         getCollectionHelper().insertDocuments(new DocumentCodec(), documents);
-
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .sort(new BsonDocument('_id', new BsonInt32(1)))
                 .batchSize(batchSize)
 
         when:
-        def cursor = findOperation.execute(getBinding())
-        def firstBatch = cursor.next()
+        def cursor = execute(operation, async)
+        def firstBatch = {
+            if (async) {
+                def futureResultCallback = new FutureResultCallback()
+                cursor.next(futureResultCallback)
+                futureResultCallback.get(5, SECONDS)
+            } else {
+                cursor.next()
+            }
+        }()
+        def hasAnotherBatch = {
+            if (async) {
+                def futureResultCallback = new FutureResultCallback()
+                cursor.next(futureResultCallback)
+                futureResultCallback.get(5, SECONDS) != null
+            } else {
+                cursor.hasNext()
+            }
+        }()
 
         then:
         firstBatch == [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        cursor.hasNext() == hasNext
+        hasAnotherBatch == hasNext
 
         where:
-        batchSize | hasNext
-        3         | true
-        -3        | false
+        batchSize | hasNext | async
+        3         | true    | true
+        3         | true    | false
+        -3        | false   | true
+        -3        | false   | false
     }
 
     def 'should throw query exception'() {
@@ -281,7 +304,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
                 .filter(new BsonDocument('x', new BsonDocument('$thisIsNotAnOperator', BsonBoolean.TRUE)))
 
         when:
-        async ? executeAsync(operation) : operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoQueryException)
@@ -294,10 +317,11 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         given:
         def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .filter(new BsonDocument('x', new BsonDocument('$thisIsNotAnOperator', BsonBoolean.TRUE)))
+        operation = async ? operation.asExplainableOperationAsync(QUERY_PLANNER) :
+                operation.asExplainableOperation(QUERY_PLANNER)
 
         when:
-        async ? executeAsync(operation.asExplainableOperationAsync(QUERY_PLANNER))
-              : operation.asExplainableOperation(QUERY_PLANNER).execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoQueryException)
@@ -306,7 +330,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         async << [true, false]
     }
 
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from execute'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document())
@@ -314,7 +338,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         enableMaxTimeFailPoint()
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoExecutionTimeoutException)
@@ -323,34 +347,12 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         disableMaxTimeFailPoint()
 
         where:
-        operation << [new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                              .maxTime(1000, MILLISECONDS),
-                      new FindOperation<Document>(getNamespace(), new DocumentCodec()).
-                              modifiers(new BsonDocument('$maxTimeMS', new BsonInt32(1000)))]
-    }
-
-    @Category(Async)
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
-    def 'should throw execution timeout exception from executeAsync'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document())
-
-        enableMaxTimeFailPoint()
-
-        when:
-        executeAsync(operation);
-
-        then:
-        thrown(MongoExecutionTimeoutException)
-
-        cleanup:
-        disableMaxTimeFailPoint()
-
-        where:
-        operation << [new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                              .maxTime(1000, MILLISECONDS),
-                      new FindOperation<Document>(getNamespace(), new DocumentCodec()).
-                              modifiers(new BsonDocument('$maxTimeMS', new BsonInt32(1000)))]
+        [async, operation] << [
+                [true, false],
+                [new FindOperation<Document>(getNamespace(), new DocumentCodec()).maxTime(1000, MILLISECONDS),
+                 new FindOperation<Document>(getNamespace(), new DocumentCodec()).
+                         modifiers(new BsonDocument('$maxTimeMS', new BsonInt32(1000)))]
+        ].combinations()
     }
 
     def '$max should limit items returned'() {
@@ -359,19 +361,18 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
             collectionHelper.insertDocuments(new DocumentCodec(), new Document('x', 'y').append('count', it))
         }
         collectionHelper.createIndex(new BsonDocument('count', new BsonInt32(1)))
-        def count = 0;
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .modifiers(new BsonDocument('$max', new BsonDocument('count', new BsonInt32(11))))
+                .hint(new BsonDocument('count', new BsonInt32(1)))
 
         when:
-        findOperation.execute(getBinding()).each {
-            it.each {
-                count++
-            }
-        }
+        def count = executeAndCollectBatchCursorResults(operation, async).size()
 
         then:
         count == 10
+
+        where:
+        async << [true, false]
     }
 
     def '$min should limit items returned'() {
@@ -380,39 +381,37 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
             collectionHelper.insertDocuments(new DocumentCodec(), new Document('x', 'y').append('count', it))
         }
         collectionHelper.createIndex(new BsonDocument('count', new BsonInt32(1)))
-        def count = 0;
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .modifiers(new BsonDocument('$min', new BsonDocument('count', new BsonInt32(10))))
+                .hint(new BsonDocument('count', new BsonInt32(1)))
 
         when:
-        findOperation.execute(getBinding()).each {
-            it.each {
-                count++
-            }
-        }
+        def count = executeAndCollectBatchCursorResults(operation, async).size()
 
         then:
         count == 91
+
+        where:
+        async << [true, false]
     }
 
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
     def '$maxScan should limit items returned'() {
         given:
         (1..100).each {
             collectionHelper.insertDocuments(new DocumentCodec(), new Document('x', 'y'))
         }
-        def count = 0;
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .modifiers(new BsonDocument('$maxScan', new BsonInt32(34)))
 
         when:
-        findOperation.execute(getBinding()).each {
-            it.each {
-                count++
-            }
-        }
+        def count = executeAndCollectBatchCursorResults(operation, async).size()
 
         then:
         count == 34
+
+        where:
+        async << [true, false]
     }
 
     def '$returnKey should only return the field that was in an index used to perform the find'() {
@@ -422,41 +421,47 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         }
         collectionHelper.createIndex(new BsonDocument('x', new BsonInt32(1)))
 
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .filter(new BsonDocument('x', new BsonInt32(7)))
                 .modifiers(new BsonDocument('$returnKey', BsonBoolean.TRUE))
 
         when:
-        def cursor = findOperation.execute(getBinding())
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        def batch = cursor.next()
-        batch[0].keySet().size() == 1
-        batch[0]['x'] == 7
+        results == [new Document('x', 7)]
+
+        where:
+        async << [true, false]
     }
 
     def 'should apply $hint'() {
         given:
-        def hint = new BsonDocument('a', new BsonInt32(1))
-        collectionHelper.createIndex(hint)
+        def index = new BsonDocument('a', new BsonInt32(1))
+        collectionHelper.createIndex(index)
 
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                .modifiers(new BsonDocument('$hint', hint))
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        if (useModifer) {
+            operation.modifiers(new BsonDocument('$hint', hint))
+        } else {
+            operation.hint(hint)
+        }
+        operation = async ? operation.asExplainableOperationAsync(QUERY_PLANNER) :
+                operation.asExplainableOperation(QUERY_PLANNER)
 
         when:
-        def explainPlan = async ?
-                          executeAsync(findOperation.asExplainableOperationAsync(QUERY_PLANNER)) :
-                          findOperation.asExplainableOperation(QUERY_PLANNER).execute(getBinding())
+        def explainPlan = execute(operation, async)
 
         then:
-        if (serverVersionAtLeast(asList(3, 0, 0))) {
-            assertEquals(hint, getKeyPattern(explainPlan))
+        if (serverVersionAtLeast(3, 0)) {
+            assertEquals(index, QueryOperationHelper.getKeyPattern(explainPlan))
         } else {
             assertEquals(new BsonString('BtreeCursor a_1'), explainPlan.cursor)
         }
 
         where:
-        async << [true, false]
+        [async, useModifer, hint] << [[true, false], [true, false], [new BsonDocument('a', new BsonInt32(1)),
+                                                                     new BsonString('a_1')]].combinations()
     }
 
     @IgnoreIf({ isSharded() })
@@ -466,20 +471,20 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         new CommandWriteOperation(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)), new BsonDocumentCodec())
                 .execute(getBinding())
         def expectedComment = 'this is a comment'
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .modifiers(new BsonDocument('$comment', new BsonString(expectedComment)))
 
         when:
-        async ?
-        executeAsync(findOperation) :
-        findOperation.execute(getBinding())
+        execute(operation, async)
 
         then:
         Document profileDocument = profileCollectionHelper.find().get(0)
-        if (serverVersionAtLeast(asList(3, 1, 8))) {
-            assertEquals(expectedComment, ((Document) profileDocument.get('query')).get('comment'));
+        if (serverVersionAtLeast(3, 6)) {
+            assertEquals(expectedComment, ((Document) profileDocument.get('command')).get('comment'))
+        } else if (serverVersionAtLeast(3, 2)) {
+            assertEquals(expectedComment, ((Document) profileDocument.get('query')).get('comment'))
         } else {
-            assertEquals(expectedComment, ((Document) profileDocument.get('query')).get('$comment'));
+            assertEquals(expectedComment, ((Document) profileDocument.get('query')).get('$comment'))
         }
 
         cleanup:
@@ -493,55 +498,127 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
 
     def 'should apply $showDiskLoc'() {
         given:
-        String fieldName = serverVersionAtLeast([3, 1, 8]) ? '$recordId' : '$diskLoc';
+        String fieldName = serverVersionAtLeast(3, 2) ? '$recordId' : '$diskLoc';
         collectionHelper.insertDocuments(new BsonDocument())
 
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .modifiers(new BsonDocument('$showDiskLoc', BsonBoolean.TRUE))
 
         when:
-        def result = findOperation.execute(getBinding())
+        def result = executeAndCollectBatchCursorResults(operation, async).head()
 
         then:
-        result.next().get(0)[fieldName]
+        result[fieldName]
+
+        where:
+        async << [true, false]
     }
 
     @IgnoreIf({ !ClusterFixture.isDiscoverableReplicaSet() })
     def 'should read from a secondary'() {
+        given:
         collectionHelper.insertDocuments(new DocumentCodec(), new Document())
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
-        def binding = new ClusterBinding(getCluster(), ReadPreference.secondary())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def syncBinding = new ClusterBinding(getCluster(), ReadPreference.secondary())
+        def asyncBinding = new AsyncClusterBinding(getAsyncCluster(), ReadPreference.secondary())
 
-        expect:
-        findOperation.execute(binding) != null // if it didn't throw, the query was executed
+        when:
+        def result = async ? executeAsync(operation, asyncBinding) : executeSync(operation, syncBinding)
+
+        then:
+        result != null // if it didn't throw, the query was executed
+
+        where:
+        async << [true, false]
     }
 
-    @Category([Async, Slow])
-    @IgnoreIf({ isSharded() })
-    def 'should iterate asynchronously'() {
+    def 'should add read concern to command'() {
         given:
-        collectionHelper.insertDocuments(new DocumentCodec(), (1..500).collect { new Document('_id', it) })
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def binding = Stub(ReadBinding)
+        def source = Stub(ConnectionSource)
+        def connection = Mock(Connection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.readConnectionSource >> source
+        binding.sessionContext >> sessionContext
+        source.connection >> connection
+        source.retain() >> source
+        def commandDocument = new BsonDocument('find', new BsonString(getCollectionName()))
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
 
         when:
-        def count = 0;
-        loopCursor(findOperation, new Block<Document>() {
-            @Override
-            void apply(final Document value) {
-                count++
-            }
-        });
+        operation.execute(binding)
+
+        then:
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.command(_, commandDocument, _, _, _, sessionContext) >>
+                new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                        .append('ns', new BsonString(getNamespace().getFullName()))
+                        .append('firstBatch', new BsonArrayWrapper([])))
+        1 * connection.release()
+
+        where:
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
+    }
+
+    def 'should add read concern to command asynchronously'() {
+        given:
+        def binding = Stub(AsyncReadBinding)
+        def source = Stub(AsyncConnectionSource)
+        def connection = Mock(AsyncConnection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
+        binding.sessionContext >> sessionContext
+        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        source.retain() >> source
+        def commandDocument = new BsonDocument('find', new BsonString(getCollectionName()))
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+
+        when:
+        executeAsync(operation, binding)
 
         then:
-        count == 500
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.commandAsync(_, commandDocument, _, _, _, sessionContext, _) >> {
+            it[6].onResult(new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(1))
+                    .append('ns', new BsonString(getNamespace().getFullName()))
+                    .append('firstBatch', new BsonArrayWrapper([]))), null)
+        }
+        1 * connection.release()
+
+        where:
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
     }
 
     def 'should call query on Connection with no $query when there are no other meta operators'() {
         given:
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .projection(new BsonDocument('x', new BsonInt32(1)))
                 .filter(new BsonDocument('z', new BsonString('val')))
-        def binding = Stub(ReadBinding)
+        def binding = Stub(ReadBinding) {
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
         binding.readPreference >> ReadPreference.primary()
@@ -550,27 +627,29 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         source.retain() >> source
 
         when:
-        findOperation.execute(binding)
+        operation.execute(binding)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                                new ServerVersion(2, 6), STANDALONE, 1000, 100000, 100000)
+                new ServerVersion(2, 6), 2, STANDALONE, 1000, 100000, 100000, [])
 
-        1 * connection.query(getNamespace(), findOperation.filter,
-                             findOperation.projection, 0, 0, 0, false, false, false, false, false, false, _) >>
-        new QueryResult(getNamespace(), [new BsonDocument('n', new BsonInt32(1))], 0, new ServerAddress())
 
+        1 * connection.query(getNamespace(), operation.filter, operation.projection, 0, 0, 0, false, false, false, false,
+                false, false, _) >> new QueryResult(getNamespace(), [new BsonDocument('n', new BsonInt32(1))], 0, new ServerAddress())
         1 * connection.release()
     }
 
     def 'should call query on Connection with correct arguments for an explain'() {
         given:
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .limit(20)
                 .batchSize(2)
                 .projection(new BsonDocument('x', new BsonInt32(1)))
                 .sort(new BsonDocument('y', new BsonInt32(-1)))
                 .filter(new BsonDocument('z', new BsonString('val')))
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .min(new BsonDocument('min', new BsonInt32(1)))
+                .max(new BsonDocument('max', new BsonInt32(1)))
         def binding = Stub(ReadBinding)
         def source = Stub(ConnectionSource)
         def connection = Mock(Connection)
@@ -580,17 +659,19 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
         source.retain() >> source
 
         when:
-        findOperation.asExplainableOperation(QUERY_PLANNER).execute(binding)
+        operation.asExplainableOperation(QUERY_PLANNER).execute(binding)
 
         then:
         _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                                new ServerVersion(2, 6), STANDALONE, 1000, 100000, 100000)
+                new ServerVersion(2, 6), 2, STANDALONE, 1000, 100000, 100000, [])
 
-        1 * connection.query(getNamespace(),
-                             new BsonDocument('$query', findOperation.filter).append('$explain', BsonBoolean.TRUE)
-                                                                             .append('$orderby', findOperation.sort),
-                             findOperation.projection, 0, -20, 0, false, false, false, false, false, false, _) >>
-        new QueryResult(getNamespace(), [new BsonDocument('n', new BsonInt32(1))], 0, new ServerAddress())
+        1 * connection.query(getNamespace(), new BsonDocument('$query', operation.filter)
+                .append('$explain', BsonBoolean.TRUE).append('$orderby', operation.sort)
+                .append('$hint', operation.hint)
+                .append('$min', operation.min)
+                .append('$max', operation.max),
+                operation.projection, 0, -20, 0, false, false, false, false, false, false, _) >>
+                new QueryResult(getNamespace(), [new BsonDocument('n', new BsonInt32(1))], 0, new ServerAddress())
 
         _ * connection.retain() >> connection
         _ * connection.release()
@@ -598,122 +679,64 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
 
     def 'should explain'() {
         given:
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
                 .modifiers(modifiers)
+        operation = async ? operation.asExplainableOperationAsync(QUERY_PLANNER) :
+                operation.asExplainableOperation(QUERY_PLANNER)
 
         when:
-        BsonDocument result = findOperation.asExplainableOperation(QUERY_PLANNER).execute(getBinding())
+        BsonDocument result = execute(operation, async)
 
         then:
-        result
+        !result.isEmpty()
 
         where:
-        modifiers << [null, new BsonDocument('$explain', BsonBoolean.TRUE), new BsonDocument('$explain', BsonBoolean.FALSE)]
+        [async, modifiers] << [
+                [true, false],
+                [null, new BsonDocument('$explain', BsonBoolean.TRUE), new BsonDocument('$explain', BsonBoolean.FALSE)]
+        ].combinations()
     }
 
-    @Category(Async)
-    def 'should explain asynchronously'() {
-        given:
-        def findOperation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
-                .modifiers(modifiers)
-
-        when:
-        BsonDocument result = executeAsync(findOperation.asExplainableOperationAsync(QUERY_PLANNER))
-
-        then:
-        result
-
-        where:
-        modifiers << [null, new BsonDocument('$explain', BsonBoolean.TRUE), new BsonDocument('$explain', BsonBoolean.FALSE)]
-    }
 
     def 'should explain with $explain modifier'() {
         given:
-        def findOperation = new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec())
+        def operation = new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec())
                 .modifiers(new BsonDocument('$explain', BsonBoolean.TRUE))
+        def explainOperation = async ?
+                new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec()).asExplainableOperationAsync(QUERY_PLANNER) :
+                new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec()).asExplainableOperation(QUERY_PLANNER)
 
         when:
-        def explainResult = findOperation.execute(getBinding()).next().get(0)
+        def cursorResult = executeAndCollectBatchCursorResults(operation, async).head()
+        def explainResult = execute(explainOperation, async)
 
         then:
-        sanitizeExplainResult(explainResult) ==
-                sanitizeExplainResult(new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec())
-                        .asExplainableOperation(QUERY_PLANNER).execute(getBinding()))
-    }
+        QueryOperationHelper.sanitizeExplainResult(cursorResult) == QueryOperationHelper.sanitizeExplainResult(explainResult)
 
-    @Category(Async)
-    def 'should explain asynchronously with $explain modifier'() {
-        given:
-        def findOperation = new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec())
-                .modifiers(new BsonDocument('$explain', BsonBoolean.TRUE))
-
-        when:
-        def explainResult
-        loopCursor(findOperation, new Block<BsonDocument>() {
-            @Override
-            void apply(final BsonDocument document) {
-                explainResult = document
-            }
-        })
-
-        then:
-        sanitizeExplainResult(explainResult) ==
-                sanitizeExplainResult(new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec())
-                        .asExplainableOperation(QUERY_PLANNER).execute(getBinding()))
+        where:
+        async << [true, false]
     }
 
     //  sanity check that the server accepts tailable and await data flags
     def 'should pass tailable and await data flags through'() {
         given:
-        collectionHelper.create(getCollectionName(), new CreateCollectionOptions().capped(true).sizeInBytes(1000))
-        def operation = new FindOperation<BsonDocument>(namespace, new BsonDocumentCodec())
-                .cursorType(TailableAwait)
-
-        when:
-        operation.execute(getBinding())
-
-        then:
-        true
-    }
-
-    def 'should apply maxAwaitTime'() {
-        given:
-        collectionHelper.create(getCollectionName(), new CreateCollectionOptions().capped(true).sizeInBytes(1000))
-        def operation = new FindOperation<BsonDocument>(namespace, new BsonDocumentCodec())
-                .cursorType(cursorType)
-                .maxAwaitTime(maxAwaitTimeMS, MILLISECONDS)
-
-        when:
-        def cursor = operation.execute(getBinding()) as QueryBatchCursor
-
-        then:
-        cursor.maxTimeMS == maxTimeMSForCursor
-
-        where:
-        cursorType    |  maxAwaitTimeMS  | maxTimeMSForCursor
-        NonTailable   |  100             | 0
-        Tailable      |  100             | 0
-        TailableAwait |  100             | 100
-    }
-
-    def 'should apply maxAwaitTime asynchronously'() {
-        given:
+        def (cursorType, maxAwaitTimeMS, maxTimeMSForCursor) = cursorDetails
         collectionHelper.create(getCollectionName(), new CreateCollectionOptions().capped(true).sizeInBytes(1000))
         def operation = new FindOperation<BsonDocument>(namespace, new BsonDocumentCodec())
                 .cursorType(cursorType)
                 .maxAwaitTime(maxAwaitTimeMS, MILLISECONDS)
 
         when:
-        def cursor = executeAsync(operation) as AsyncQueryBatchCursor
+        def cursor = execute(operation, async)
 
         then:
         cursor.maxTimeMS == maxTimeMSForCursor
 
         where:
-        cursorType    |  maxAwaitTimeMS  | maxTimeMSForCursor
-        NonTailable   |  100             | 0
-        Tailable      |  100             | 0
-        TailableAwait |  100             | 100
+        [async, cursorDetails] << [
+                [true, false],
+                [[NonTailable, 100, 0], [Tailable, 100, 0], [TailableAwait, 100, 100]]
+        ].combinations()
     }
 
     // sanity check that the server accepts the miscallaneous flags
@@ -725,242 +748,33 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
                 .oplogReplay(true)
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         true
-    }
-
-    // Note that this is a unit test
-    def 'should query with correct arguments'() {
-        given:
-        def serverVersion = new ServerVersion(3, 0)
-        def dbName = 'db'
-        def collectionName = 'coll'
-        def namespace = new MongoNamespace(dbName, collectionName)
-        def decoder = new BsonDocumentCodec()
-        def readPreference = ReadPreference.secondary()
-        def connectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                              serverVersion, STANDALONE, 1000, 16000000, 48000000)
-        def connection = Mock(Connection)
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadPreference() >> readPreference
-            getReadConnectionSource() >> connectionSource
-        }
-        def queryResult = new QueryResult(namespace, [], 0, new ServerAddress());
-        def operation = new FindOperation<BsonDocument>(namespace, decoder)
-                .filter(new BsonDocument('a', BsonBoolean.TRUE))
-                .projection(new BsonDocument('x', new BsonInt32(1)))
-                .skip(2)
-                .limit(100)
-                .batchSize(10)
-                .cursorType(TailableAwait)
-                .oplogReplay(true)
-                .noCursorTimeout(true)
-                .partial(true)
-                .oplogReplay(true)
-
-        when:
-        operation.execute(readBinding)
-
-        then:
-        _ * connection.getDescription() >> connectionDescription
-        1 * connection.query(namespace,
-                             operation.getFilter(),
-                             operation.getProjection(),
-                             operation.getSkip(),
-                             operation.getLimit(),
-                             operation.getBatchSize(),
-                             readPreference.isSlaveOk(),
-                             true, true, true, true, true,
-                             decoder) >> queryResult
-        1 * connection.release()
-    }
-
-    // Note that this is a unit test
-    def 'should find with correct command'() {
-        given:
-        def serverVersion = new ServerVersion(3, 2)
-        def dbName = 'db'
-        def collectionName = 'coll'
-        def namespace = new MongoNamespace(dbName, collectionName)
-        def decoder = new BsonDocumentCodec()
-        def readPreference = ReadPreference.secondary()
-        def connectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                              serverVersion, STANDALONE, 1000, 16000000, 48000000)
-        def connection = Mock(Connection) {
-            _ * getDescription() >> connectionDescription
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadPreference() >> readPreference
-            getReadConnectionSource() >> connectionSource
-        }
-        def cannedResult = new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(0))
-                .append('ns', new BsonString('db.coll'))
-                .append('firstBatch', new BsonArrayWrapper([])))
-        def operation = new FindOperation<BsonDocument>(namespace, decoder)
-        def expectedCommand = new BsonDocument('find', new BsonString(collectionName))
-
-        when:
-        operation.execute(readBinding)
-
-        then:
-        1 * connection.command(namespace.getDatabaseName(), expectedCommand, readPreference.isSlaveOk(), _, _) >> cannedResult
-        1 * connection.release()
-
-        when:
-        operation.filter(new BsonDocument('a', BsonBoolean.TRUE))
-                .projection(new BsonDocument('x', new BsonInt32(1)))
-                .skip(2)
-                .limit(limit)
-                .batchSize(batchSize)
-                .cursorType(TailableAwait)
-                .oplogReplay(true)
-                .noCursorTimeout(true)
-                .partial(true)
-                .oplogReplay(true)
-                .modifiers(new BsonDocument('$snapshot', BsonBoolean.TRUE))
-                .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
-
-        expectedCommand.append('filter', operation.getFilter())
-                .append('projection', operation.getProjection())
-                .append('skip', new BsonInt32(operation.getSkip()))
-                .append('tailable', BsonBoolean.TRUE)
-                .append('awaitData', BsonBoolean.TRUE)
-                .append('allowPartialResults', BsonBoolean.TRUE)
-                .append('noCursorTimeout', BsonBoolean.TRUE)
-                .append('oplogReplay', BsonBoolean.TRUE)
-                .append('snapshot', BsonBoolean.TRUE)
-                .append('maxTimeMS', new BsonInt64(operation.getMaxTime(MILLISECONDS)))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
-
-        if (commandLimit != null) {
-            expectedCommand.append('limit', new BsonInt32(commandLimit))
-        }
-        if (commandBatchSize != null) {
-            expectedCommand.append('batchSize', new BsonInt32(commandBatchSize))
-        }
-        if (commandSingleBatch != null) {
-            expectedCommand.append('singleBatch', BsonBoolean.valueOf(commandSingleBatch))
-        }
-
-        operation.execute(readBinding)
-
-        then:
-        1 * connection.command(namespace.getDatabaseName(), expectedCommand, readPreference.isSlaveOk(), _, _) >> cannedResult
-        1 * connection.release()
-
-        where:
-        limit << [100, -100, 100, 0, 100]
-        batchSize << [10, 10, -10, 10, 0]
-        commandLimit << [100, 100, 10, null, 100]
-        commandBatchSize << [10, null, null, 10, null]
-        commandSingleBatch << [null, true, true, null, null]
-    }
-
-    def 'should use the ReadBindings readPreference to set slaveOK'() {
-        given:
-        def dbName = 'db'
-        def collectionName = 'coll'
-        def namespace = new MongoNamespace(dbName, collectionName)
-        def decoder = Stub(Decoder)
-        def connectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                              new ServerVersion(3, 0), STANDALONE, 1000, 16000000, 48000000)
-        def connection = Mock(Connection) {
-            _ * getDescription() >> connectionDescription
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> Stub(ConnectionSource) {
-                getConnection() >> connection
-            }
-            getReadPreference() >> Stub(ReadPreference) {
-                isSlaveOk() >> slaveOk
-            }
-        }
-        def queryResult = Mock(QueryResult) {
-            _ * getNamespace() >> namespace
-            _ * getResults() >> []
-        }
-        def operation = new FindOperation<BsonDocument>(namespace, decoder)
-
-        when:
-        operation.execute(readBinding)
-
-        then:
-        1 * connection.query(namespace, _, _, _, _, _, slaveOk, _, _, _, _, _, _) >> queryResult
-        1 * connection.release()
 
         where:
-        slaveOk << [true, false]
+        async << [true, false]
     }
 
-    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
         given:
-        def dbName = 'db'
-        def collectionName = 'coll'
-        def namespace = new MongoNamespace(dbName, collectionName)
-        def decoder = Stub(Decoder)
-        def connectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                              new ServerVersion(3, 0), STANDALONE, 1000, 16000000, 48000000)
-
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> connectionDescription
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >>  { it[0].onResult(connectionSource, null) }
-            getReadPreference() >> Stub(ReadPreference) {
-                isSlaveOk() >> slaveOk
-            }
-        }
-        def queryResult = Mock(QueryResult) {
-            _ * getNamespace() >> namespace
-            _ * getResults() >> []
-        }
-        def operation = new FindOperation<BsonDocument>(namespace, decoder)
+        def document = BsonDocument.parse('{_id: 1, str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def operation = new FindOperation<BsonDocument>(getNamespace(), new BsonDocumentCodec())
+                .filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(caseInsensitiveCollation)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        def result = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        1 * connection.queryAsync(namespace, _, _, _, _, _, slaveOk, _, _, _, _, _, _, _) >> { it[13].onResult(queryResult, null) }
-        1 * connection.release()
+        result == [document]
 
         where:
-        slaveOk << [true, false]
-    }
-
-    def helper = [
-        namespace: new MongoNamespace('db', 'coll'),
-        queryResult: Stub(QueryResult),
-        connectionDescription: Stub(ConnectionDescription)
-    ]
-
-    static BsonDocument sanitizeExplainResult(BsonDocument document) {
-        document.remove('ok')
-        document.remove('millis')
-        document.remove('executionStats')
-        document.remove('serverInfo')
-        document
+        async << [true, false]
     }
 
-    static BsonDocument getKeyPattern(BsonDocument explainPlan) {
-        def winningPlan = explainPlan.getDocument('queryPlanner').getDocument('winningPlan')
-        if (winningPlan.containsKey('inputStage')) {
-            return winningPlan.getDocument('inputStage').getDocument('keyPattern')
-        } else if (winningPlan.containsKey('shards')) {
-            return winningPlan.getArray('shards')[0].asDocument().getDocument('winningPlan')
-                              .getDocument('inputStage').getDocument('keyPattern')
-        }
-    }
 
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/FsyncUnlockOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/FsyncUnlockOperationSpecification.groovy
index f3279c62a14..49abfb1d73d 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/FsyncUnlockOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/FsyncUnlockOperationSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.operation
 
+import com.mongodb.binding.ReadBinding
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -36,10 +37,10 @@ class FsyncUnlockOperationSpecification extends Specification {
                 .execute(getBinding())
 
         when:
-        def result = new FsyncUnlockOperation().execute(getBinding())
+        def result = new FsyncUnlockOperation().execute(getBinding() as ReadBinding)
 
         then:
-        result
+        !result.isEmpty()
         result.containsKey('ok')
         result.containsKey('info')
         !new CurrentOpOperation().execute(getBinding()).getBoolean('fsyncLock', BsonBoolean.FALSE).getValue()
diff --git a/driver-core/src/test/functional/com/mongodb/operation/GroupOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/GroupOperationSpecification.groovy
index 02dcde73be9..0e07478a875 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/GroupOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/GroupOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,19 +16,9 @@
 
 package com.mongodb.operation
 
-import category.Async
-import com.mongodb.Block
 import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadPreference
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.binding.AsyncConnectionSource
-import com.mongodb.binding.AsyncReadBinding
-import com.mongodb.binding.ConnectionSource
-import com.mongodb.binding.ReadBinding
-import com.mongodb.connection.AsyncConnection
-import com.mongodb.connection.Connection
-import com.mongodb.connection.ConnectionDescription
 import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -36,29 +26,84 @@ import org.bson.BsonJavaScript
 import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.getBinding
-import static com.mongodb.ClusterFixture.loopCursor
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 
+@IgnoreIf({ serverVersionAtLeast(4, 1) })
 class GroupOperationSpecification extends OperationFunctionalSpecification {
 
+    def reduceFunction = new BsonJavaScript('''
+            function ( curr, result ) {
+                if (result.name.indexOf(curr.name) == -1) { result.name.push(curr.name); }
+            }
+    ''')
+    def initial() {
+        new BsonDocument('name': new BsonArray())
+    }
+    def documentCodec = new DocumentCodec()
+
+    def 'should have the correct defaults and passed values'() {
+        when:
+        def initial = initial()
+        def operation = new GroupOperation(getNamespace(), reduceFunction, initial, documentCodec)
+
+        then:
+        operation.getNamespace() == getNamespace()
+        operation.getDecoder() == documentCodec
+        operation.getReduceFunction() == reduceFunction
+        operation.getInitial() == initial
+        operation.getKey() == null
+        operation.getKeyFunction() == null
+        operation.getFinalizeFunction() == null
+        operation.getFilter() == null
+        operation.getCollation() == null
+    }
+
+    def 'should set optional values correctly'(){
+        given:
+        def filter = new BsonDocument('filter', new BsonInt32(1))
+        def key = new BsonDocument('a', new BsonInt32(1))
+        def keyFunction = new BsonJavaScript('function(doc){ return {name: doc.name}; }')
+        def finalizeFunction = new BsonJavaScript('function(key, value) { return value }')
+        def initial = initial()
+
+        when:
+        def operation = new GroupOperation(getNamespace(), reduceFunction, initial, documentCodec)
+                .filter(filter)
+                .key(key)
+                .keyFunction(keyFunction)
+                .finalizeFunction(finalizeFunction)
+                .collation(defaultCollation)
+
+        then:
+        operation.getNamespace() == getNamespace()
+        operation.getDecoder() == documentCodec
+        operation.getReduceFunction() == reduceFunction
+        operation.getInitial() == initial
+        operation.getFilter() == filter
+        operation.getKey() == key
+        operation.getKeyFunction() == keyFunction
+        operation.getFinalizeFunction() == finalizeFunction
+        operation.getCollation() == defaultCollation
+    }
+
     def 'should be able to group by inferring from the reduce function'() {
         given:
         Document pete = new Document('name', 'Pete').append('job', 'handyman')
         Document sam = new Document('name', 'Sam').append('job', 'plumber')
         Document pete2 = new Document('name', 'Pete').append('job', 'electrician')
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
+        def operation = new GroupOperation(getNamespace(), reduceFunction, initial(), documentCodec)
 
         when:
-        def result = new GroupOperation(getNamespace(),
-                                        new BsonJavaScript('function ( curr, result ) { if (result.name.indexOf(curr.name) == -1) { ' +
-                                                           'result.name.push(curr.name); }}'),
-                                        new BsonDocument('name': new BsonArray()), new DocumentCodec())
-                .execute(getBinding());
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        result.next()[0].name == ['Pete', 'Sam']
+        results.head().name == ['Pete', 'Sam']
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to group by name'() {
@@ -68,16 +113,17 @@ class GroupOperationSpecification extends OperationFunctionalSpecification {
         Document pete2 = new Document('name', 'Pete').append('job', 'electrician')
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
 
+        def operation = new GroupOperation(getNamespace(), new BsonJavaScript('function ( curr, result ) {}'), new BsonDocument(),
+                documentCodec).key(new BsonDocument('name', new BsonInt32(1)))
+
         when:
-        def result = new GroupOperation(getNamespace(),
-                                        new BsonJavaScript('function ( curr, result ) {}'),
-                                        new BsonDocument(), new DocumentCodec())
-                .key(new BsonDocument('name', new BsonInt32(1)))
-                .execute(getBinding());
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        List<String> results = result.iterator().next()*.getString('name')
-        results.containsAll(['Pete', 'Sam'])
+        results*.getString('name').containsAll(['Pete', 'Sam'])
+
+        where:
+        async << [true, false]
     }
 
     def 'should be able to group by key function'() {
@@ -86,17 +132,17 @@ class GroupOperationSpecification extends OperationFunctionalSpecification {
         Document sam = new Document('name', 'Sam').append('job', 'plumber')
         Document pete2 = new Document('name', 'Pete').append('job', 'electrician')
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
+        def operation = new GroupOperation(getNamespace(),  new BsonJavaScript('function ( curr, result ) { }'), new BsonDocument(),
+                documentCodec).keyFunction(new BsonJavaScript('function(doc){ return {name: doc.name}; }'))
 
         when:
-        def result = new GroupOperation(getNamespace(),
-                                        new BsonJavaScript('function ( curr, result ) { }'),
-                                        new BsonDocument(), new DocumentCodec())
-                .keyFunction(new BsonJavaScript('function(doc){ return {name: doc.name}; }'))
-                .execute(getBinding());
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        List<String> results = result.iterator().next()*.getString('name')
-        results.containsAll(['Pete', 'Sam'])
+        results*.getString('name').containsAll(['Pete', 'Sam'])
+
+        where:
+        async << [true, false]
     }
 
 
@@ -106,103 +152,66 @@ class GroupOperationSpecification extends OperationFunctionalSpecification {
         Document sam = new Document('name', 'Sam').append('job', 'plumber')
         Document pete2 = new Document('name', 'Pete').append('job', 'electrician')
         getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
-
-        when:
-        def result = new GroupOperation(getNamespace(),
+        def operation = new GroupOperation(getNamespace(),
                                         new BsonJavaScript('function ( curr, result ) { }'),
-                                        new BsonDocument(), new DocumentCodec())
+                                        new BsonDocument(), documentCodec)
                 .key(new BsonDocument('name', new BsonInt32(1)))
                 .filter(new BsonDocument('name': new BsonString('Pete')))
-                .execute(getBinding());
+
+        when:
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        List<String> results = result.iterator().next()*.getString('name')
-        results == ['Pete']
-    }
+        results*.getString('name') == ['Pete']
 
-    @Category(Async)
-    def 'should be able to group by name asynchronously'() {
-        given:
-        Document pete = new Document('name', 'Pete').append('job', 'handyman')
-        Document sam = new Document('name', 'Sam').append('job', 'plumber')
-        Document pete2 = new Document('name', 'Pete').append('job', 'electrician')
-        getCollectionHelper().insertDocuments(new DocumentCodec(), pete, sam, pete2)
+        where:
+        async << [true, false]
+    }
 
+    def 'should use the ReadBindings readPreference to set slaveOK'() {
         when:
-        def operation = new GroupOperation(getNamespace(),
-                                        new BsonJavaScript('function ( curr, result ) {}'),
-                                        new BsonDocument(), new DocumentCodec())
-                .key(new BsonDocument('name', new BsonInt32(1)))
-
-        List<Document> docList = []
-        loopCursor(operation, new Block<Document>() {
-            @Override
-            void apply(final Document value) {
-                if (value != null) {
-                    docList += value
-                }
-            }
-        });
+        def commandResult = BsonDocument.parse('{ok: 1.0}').append('retval', new BsonArrayWrapper([]))
+        def namespace = new MongoNamespace('db', 'coll')
+        def operation = new GroupOperation(namespace, new BsonJavaScript('function ( curr, result ) { }'), new BsonDocument(),
+                documentCodec).key(BsonDocument.parse('{name: 1}'))
 
         then:
-        docList.iterator()*.getString('name') containsAll(['Pete', 'Sam'])
+        testOperationSlaveOk(operation, [3, 2, 0], readPreference, async, commandResult)
+
+        where:
+        [async, readPreference] << [[true, false], [ReadPreference.primary(), ReadPreference.secondary()]].combinations()
     }
 
-    def 'should use the ReadBindings readPreference to set slaveOK'() {
-        given:
-        def connection = Mock(Connection)
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-            getReadPreference() >> readPreference
-        }
-        def operation = new GroupOperation(helper.namespace, new BsonJavaScript('function ( curr, result ) { }'), new BsonDocument(),
-                new DocumentCodec()).key(BsonDocument.parse('{name: 1}'))
+    def 'should throw an exception when using an unsupported Collation'() {
+        def operation = new GroupOperation(namespace, new BsonJavaScript('function ( curr, result ) { }'), new BsonDocument(),
+                documentCodec).key(BsonDocument.parse('{str: 1}')).collation(caseInsensitiveCollation)
 
         when:
-        operation.execute(readBinding)
+        testOperationThrows(operation, [3, 2, 0], async)
 
         then:
-        _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        async << [false, false]
     }
 
-    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
         given:
-        def connection = Mock(AsyncConnection)
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadPreference() >> readPreference
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new GroupOperation(helper.namespace, new BsonJavaScript('function ( curr, result ) { }'), new BsonDocument(),
-                new DocumentCodec()).key(BsonDocument.parse('{name: 1}'))
+        def document = Document.parse('{str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def operation = new GroupOperation(namespace, new BsonJavaScript('function ( curr, result ) { }'), new BsonDocument(),
+                documentCodec).key(BsonDocument.parse('{str: 1}')).collation(caseInsensitiveCollation)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        def result = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _)  >> {
-            it[5].onResult(helper.commmandResult, null) }
-        1 * connection.release()
+        result == [document]
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        async << [true, false]
     }
-
-    def helper = [
-        dbName: 'db',
-        namespace: new MongoNamespace('db', 'coll'),
-        commandResult:  BsonDocument.parse('{ok: 1.0}').append('retval', new BsonArrayWrapper([])),
-        connectionDescription: Stub(ConnectionDescription)
-    ]
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/InsertOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/InsertOperationSpecification.groovy
index ae2d1a7a9b0..e550d33ce33 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/InsertOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/InsertOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,9 @@
 
 package com.mongodb.operation
 
-import category.Async
 import category.Slow
 import com.mongodb.DuplicateKeyException
 import com.mongodb.MongoClientException
-import com.mongodb.MongoException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.bulk.InsertRequest
 import org.bson.BsonBinary
@@ -31,70 +29,58 @@ import org.bson.codecs.BsonDocumentCodec
 import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getAsyncSingleConnectionBinding
-import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.getSingleConnectionBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.WriteConcern.ACKNOWLEDGED
 import static com.mongodb.WriteConcern.UNACKNOWLEDGED
 import static java.util.Arrays.asList
 
 class InsertOperationSpecification extends OperationFunctionalSpecification {
-    def 'should return correct result'() {
-        given:
-        def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
-        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert))
 
+    def 'should throw IllegalArgumentException for empty list of requests'() {
         when:
-        def result = operation.execute(getBinding())
+        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, true, [])
 
         then:
-        result.wasAcknowledged()
-        result.count == 0
-        result.upsertedId == null
-        !result.isUpdateOfExisting()
+        thrown(IllegalArgumentException)
     }
 
-    @Category(Async)
-    def 'should return correct result asynchronously'() {
+    def 'should return correct result'() {
         given:
-        def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
-        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert))
+        def inserts = [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
+                       new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))]
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, inserts)
 
         when:
-        def result = executeAsync(operation)
+        def result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
         result.count == 0
         result.upsertedId == null
         !result.isUpdateOfExisting()
-    }
 
-    def 'should insert a single document'() {
-        given:
-        def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
-        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert))
+        inserts*.getDocument() == getCollectionHelper().find(new BsonDocumentCodec())
 
-        when:
-        operation.execute(getBinding())
-
-        then:
-        asList(insert.getDocument()) == getCollectionHelper().find(new BsonDocumentCodec())
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'should insert a single document asynchronously'() {
+    def 'should insert a single document'() {
         given:
         def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
-        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert))
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(insert))
 
         when:
-        executeAsync(operation)
+        execute(operation, async)
 
         then:
         asList(insert.getDocument()) == getCollectionHelper().find(new BsonDocumentCodec())
+
+        where:
+        async << [true, false]
     }
 
     def 'should insert a large number of documents'() {
@@ -103,101 +89,59 @@ class InsertOperationSpecification extends OperationFunctionalSpecification {
         for (i in 1..1001) {
             inserts += new InsertRequest(new BsonDocument('_id', new BsonInt32(i)))
         }
-        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, inserts.toList())
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, inserts.toList())
 
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getCollectionHelper().count() == 1001
-    }
 
-    @Category(Async)
-    def 'should insert a large number of documents asynchronously'() {
-        given:
-        def inserts = []
-        for (i in 1..1001) {
-            inserts += new InsertRequest(new BsonDocument('_id', new BsonInt32(i)))
-        }
-        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, inserts.toList())
-
-
-        when:
-        executeAsync(operation)
-
-        then:
-        getCollectionHelper().count() == 1001
+        where:
+        async << [true, false]
     }
 
     def 'should execute unacknowledged write'() {
         given:
-        def binding = getSingleConnectionBinding()
+        def binding = async ? getAsyncSingleConnectionBinding() : getSingleConnectionBinding()
+        def operation = new InsertOperation(getNamespace(), true, UNACKNOWLEDGED, false,
+                [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
+                 new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))])
 
         when:
-        def result = new InsertOperation(getNamespace(), true, UNACKNOWLEDGED,
-                                         [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))])
-                .execute(binding)
+        def result = execute(operation, binding)
 
         then:
         !result.wasAcknowledged()
-        getCollectionHelper().count(binding) == 1
+        getCollectionHelper().count(binding) == 2
 
         cleanup:
         binding?.release()
-    }
-
-    @Category(Async)
-    def 'should execute unacknowledged write asynchronously'() {
-        given:
-        def binding = getAsyncSingleConnectionBinding()
-
-        when:
-        def result = executeAsync(new InsertOperation(getNamespace(), true, UNACKNOWLEDGED,
-                                                      [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))]), binding)
-
-        then:
-        !result.wasAcknowledged()
-        getCollectionHelper().count(binding) == 1
 
-        cleanup:
-        binding?.release()
+        where:
+        async << [true, false]
     }
 
     @Category(Slow)
     def 'should insert a batch at The limit of the batch size'() {
         given:
-        byte[] hugeByteArray = new byte[1024 * 1024 * 16 - 2127];
-        byte[] smallerByteArray = new byte[1024 * 16 + 1980];
-
+        byte[] hugeByteArray = new byte[1024 * 1024 * 16 - 2127]
+        byte[] smallerByteArray = new byte[1024 * 16 + 1980]
         def documents = [
                 new InsertRequest(new BsonDocument('bytes', new BsonBinary(hugeByteArray))),
                 new InsertRequest(new BsonDocument('bytes', new BsonBinary(smallerByteArray)))
         ]
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, documents.toList())
 
         when:
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, documents.toList()).execute(getBinding())
+        execute(operation, async)
 
         then:
         getCollectionHelper().count() == 2
-    }
 
-    @Category([Async, Slow])
-    def 'should insert a batch at The limit of the batch size asynchronously'() {
-        given:
-        byte[] hugeByteArray = new byte[1024 * 1024 * 16 - 2127];
-        byte[] smallerByteArray = new byte[1024 * 16 + 1980];
-
-        def documents = [
-                new InsertRequest(new BsonDocument('bytes', new BsonBinary(hugeByteArray))),
-                new InsertRequest(new BsonDocument('bytes', new BsonBinary(smallerByteArray)))
-        ]
-
-        when:
-        executeAsync(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, documents.toList()))
-
-        then:
-        getCollectionHelper().count() == 2
+        where:
+        async << [true, false]
     }
 
     def 'should continue on error when continuing on error'() {
@@ -207,30 +151,17 @@ class InsertOperationSpecification extends OperationFunctionalSpecification {
                 new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
                 new InsertRequest(new BsonDocument('_id', new BsonInt32(2))),
         ]
+        def operation = new InsertOperation(getNamespace(), false, ACKNOWLEDGED, false, documents)
 
         when:
-        new InsertOperation(getNamespace(), false, ACKNOWLEDGED, documents).execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(DuplicateKeyException)
         getCollectionHelper().count() == 2
-    }
-
-    @Category(Async)
-    def 'should continue on error when continuing on error asynchronously'() {
-        given:
-        def documents = [
-                new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                new InsertRequest(new BsonDocument('_id', new BsonInt32(2))),
-        ]
-
-        when:
-        executeAsync(new InsertOperation(getNamespace(), false, ACKNOWLEDGED, documents))
 
-        then:
-        thrown(DuplicateKeyException)
-        getCollectionHelper().count() == 2
+        where:
+        async << [true, false]
     }
 
     def 'should not continue on error when not continuing on error'() {
@@ -240,88 +171,79 @@ class InsertOperationSpecification extends OperationFunctionalSpecification {
                 new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
                 new InsertRequest(new BsonDocument('_id', new BsonInt32(2))),
         ]
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, documents)
 
         when:
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, documents).execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(DuplicateKeyException)
         getCollectionHelper().count() == 1
-    }
-
-    @Category(Async)
-    def 'should not continue on error when not continuing on error asynchronously'() {
-        given:
-        def documents = [
-                new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                new InsertRequest(new BsonDocument('_id', new BsonInt32(2))),
-        ]
-
-        when:
-        executeAsync(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, documents))
 
-        then:
-        thrown(DuplicateKeyException)
-        getCollectionHelper().count() == 1
+        where:
+        async << [true, false]
     }
 
     def 'should throw exception if document is too large'() {
         given:
-        byte[] hugeByteArray = new byte[1024 * 1024 * 16];
+        byte[] hugeByteArray = new byte[1024 * 1024 * 16]
         def documents = [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)).append('b', new BsonBinary(hugeByteArray)))]
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, documents)
 
         when:
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, documents).execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(BsonSerializationException)
-    }
-
-    def 'should throw exception if document is too large asynchronously'() {
-        given:
-        byte[] hugeByteArray = new byte[1024 * 1024 * 16];
-        def documents = [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)).append('b', new BsonBinary(hugeByteArray)))]
-
-        when:
-        executeAsync(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, documents))
 
-        then:
-        def ex = thrown(MongoException)
-        ex.getCause() instanceof BsonSerializationException
+        where:
+        async << [true, false]
     }
 
     def 'should move _id to the beginning'() {
         given:
         def insert = new InsertRequest(new BsonDocument('x', new BsonInt32(1)).append('_id', new BsonInt32(1)))
-        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert))
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(insert))
 
         when:
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         getCollectionHelper().find().get(0).keySet() as List == ['_id', 'x']
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should throw if bypassDocumentValidation is set and write is unacknowledged'() {
         given:
-        def op = new InsertOperation(getNamespace(), true,  UNACKNOWLEDGED, [new InsertRequest(new BsonDocument())])
+        def operation = new InsertOperation(getNamespace(), true,  UNACKNOWLEDGED, false, [new InsertRequest(new BsonDocument())])
                 .bypassDocumentValidation(bypassDocumentValidation)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoClientException)
 
+        where:
+        [async, bypassDocumentValidation] << [[true, false], [true, false]].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should support retryable writes'() {
+        given:
+        def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
+        def operation = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, true, asList(insert))
+
         when:
-        executeAsync(op)
+        executeWithSession(operation, async)
 
         then:
-        thrown(MongoClientException)
+        asList(insert.getDocument()) == getCollectionHelper().find(new BsonDocumentCodec())
 
         where:
-        bypassDocumentValidation << [true, false]
+        async << [true, false]
     }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/ListCollectionsOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/ListCollectionsOperationSpecification.groovy
index 4900d72cc5f..80b1fdd30e5 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/ListCollectionsOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/ListCollectionsOperationSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -35,7 +35,6 @@ import com.mongodb.connection.AsyncConnection
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.QueryResult
-import com.mongodb.connection.ServerVersion
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonDouble
@@ -54,9 +53,9 @@ import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
+
 class ListCollectionsOperationSpecification extends OperationFunctionalSpecification {
 
     def madeUpDatabase = 'MadeUpDatabase'
@@ -86,7 +85,15 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         cursor.next(callback)
 
         then:
-        !callback.get()
+        callback.get() == null
+
+        when:
+        cursor = executeAsync(operation)
+        callback = new FutureResultCallback()
+        cursor.tryNext(callback)
+
+        then:
+        callback.get() == null
 
         cleanup:
         collectionHelper.dropDatabase(madeUpDatabase)
@@ -112,7 +119,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         names.findAll { it.contains('$') }.isEmpty()
     }
 
-    @IgnoreIf({ serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ serverVersionAtLeast(3, 0) })
     def 'should throw if filtering on name with something other than a string'() {
         given:
         def operation = new ListCollectionsOperation(databaseName, new DocumentCodec())
@@ -164,6 +171,49 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         !names.contains(collectionName)
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || serverVersionAtLeast(4, 0) })
+    def 'should get all fields when nameOnly is not requested'() {
+        given:
+        def operation = new ListCollectionsOperation(databaseName, new DocumentCodec())
+        getCollectionHelper().create('collection4', new CreateCollectionOptions())
+
+        when:
+        def cursor = operation.execute(getBinding())
+        def collection = cursor.next()[0]
+
+        then:
+        collection.size() > 2
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 0) })
+    def 'should only get collection names when nameOnly is requested'() {
+        given:
+        def operation = new ListCollectionsOperation(databaseName, new DocumentCodec())
+                .nameOnly(true)
+        getCollectionHelper().create('collection5', new CreateCollectionOptions())
+
+        when:
+        def cursor = operation.execute(getBinding())
+        def collection = cursor.next()[0]
+
+        then:
+        collection.size() == 2
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || serverVersionAtLeast(4, 0) })
+    def 'should only get all field names when nameOnly is requested on server versions that do not support nameOnly'() {
+        given:
+        def operation = new ListCollectionsOperation(databaseName, new DocumentCodec())
+                .nameOnly(true)
+        getCollectionHelper().create('collection6', new CreateCollectionOptions())
+
+        when:
+        def cursor = operation.execute(getBinding())
+        def collection = cursor.next()[0]
+
+        then:
+        collection.size() > 2
+    }
 
     @Category(Async)
     def 'should return collection names if a collection exists asynchronously'() {
@@ -305,6 +355,9 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         collections.size() <= 2 // pre 3.0 items may be filtered out the batch by the driver
         cursor.hasNext()
         cursor.getBatchSize() == 2
+
+        cleanup:
+        cursor?.close()
     }
 
     @Category(Async)
@@ -334,9 +387,12 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         then:
         callback.get().size() <= 2 // pre 3.0 items may be filtered out the batch by the driver
         cursor.getBatchSize() == 2
+
+        cleanup:
+        consumeAsyncResults(cursor)
     }
 
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from execute'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document())
@@ -355,7 +411,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
     }
 
     @Category(Async)
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from executeAsync'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document())
@@ -398,7 +454,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
 
         then:
         _ * connection.getDescription() >> helper.threeZeroConnectionDescription
-        1 * connection.command(_, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
+        1 * connection.command(_, _, _, readPreference, _, _) >> helper.commandResult
         1 * connection.release()
 
         where:
@@ -430,7 +486,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
 
         then:
         _ * connection.getDescription() >> helper.threeZeroConnectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> { it[6].onResult(helper.commandResult, _) }
+        1 * connection.commandAsync(helper.dbName, _, _, readPreference, _, _, _) >> { it[6].onResult(helper.commandResult, null) }
 
         where:
         readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
@@ -440,10 +496,10 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
         dbName: 'db',
         decoder: Stub(Decoder),
         twoSixConnectionDescription : Stub(ConnectionDescription) {
-            getServerVersion() >> new ServerVersion([2, 6, 0])
+            getMaxWireVersion() >> 2
         },
         threeZeroConnectionDescription : Stub(ConnectionDescription) {
-            getServerVersion() >> new ServerVersion([3, 0, 0])
+            getMaxWireVersion() >> 3
         },
         queryResult: Stub(QueryResult) {
             getNamespace() >> new MongoNamespace('db', 'coll')
diff --git a/driver-core/src/test/functional/com/mongodb/operation/ListDatabasesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/ListDatabasesOperationSpecification.groovy
index 5ef28deafc1..2673946ee11 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/ListDatabasesOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/ListDatabasesOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import category.Async
 import com.mongodb.MongoExecutionTimeoutException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadPreference
-import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.SingleResultCallback
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
@@ -30,6 +29,7 @@ import com.mongodb.connection.AsyncConnection
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
 import org.bson.BsonDocument
+import org.bson.BsonRegularExpression
 import org.bson.Document
 import org.bson.codecs.Decoder
 import org.bson.codecs.DocumentCodec
@@ -41,7 +41,6 @@ import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isSharded
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
 class ListDatabasesOperationSpecification extends OperationFunctionalSpecification {
@@ -53,30 +52,23 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati
         def operation = new ListDatabasesOperation(codec)
 
         when:
-        def names = operation.execute(getBinding()).next()*.get('name')
-
+        def names = executeAndCollectBatchCursorResults(operation, async)*.get('name')
 
         then:
         names.contains(getDatabaseName())
-    }
-
-    @Category(Async)
-    def 'should return a list of database names asynchronously'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1))
-        def operation = new ListDatabasesOperation(codec)
 
         when:
-        def callback = new FutureResultCallback()
-        def cursor = executeAsync(operation)
-        cursor.next(callback)
-        def names = callback.get()*.get('name')
+        operation = operation.nameOnly(true).filter(new BsonDocument('name',  new BsonRegularExpression("^${getDatabaseName()}")))
+        names = executeAndCollectBatchCursorResults(operation, async)*.get('name')
 
         then:
         names.contains(getDatabaseName())
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from execute'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document())
@@ -95,7 +87,7 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati
     }
 
     @Category(Async)
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from executeAsync'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document())
@@ -130,7 +122,7 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati
 
         then:
         _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.command(_, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
+        1 * connection.command(_, _, _, readPreference, _, _) >> helper.commandResult
         1 * connection.release()
 
         where:
@@ -154,7 +146,7 @@ class ListDatabasesOperationSpecification extends OperationFunctionalSpecificati
 
         then:
         _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.commandAsync(_, _, readPreference.isSlaveOk(), _, _, _) >> { it[5].onResult(helper.commandResult, null) }
+        1 * connection.commandAsync(_, _, _, readPreference, _, _, _) >> { it[6].onResult(helper.commandResult, null) }
         1 * connection.release()
 
         where:
diff --git a/driver-core/src/test/functional/com/mongodb/operation/ListIndexesOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/ListIndexesOperationSpecification.groovy
index 58f4197b080..e1b1f0e79a6 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/ListIndexesOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/ListIndexesOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@ import com.mongodb.connection.AsyncConnection
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.QueryResult
-import com.mongodb.connection.ServerVersion
 import org.bson.BsonDocument
 import org.bson.BsonDouble
 import org.bson.BsonInt32
@@ -52,9 +51,9 @@ import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isSharded
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
+
 class ListIndexesOperationSpecification extends OperationFunctionalSpecification {
 
     def 'should return empty list for nonexistent collection'() {
@@ -180,6 +179,9 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         collections.size() <= 2 // pre 3.0 items may be filtered out the batch by the driver
         cursor.hasNext()
         cursor.getBatchSize() == 2
+
+        cleanup:
+        cursor?.close()
     }
 
     @Category(Async)
@@ -208,9 +210,12 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         then:
         callback.get().size() <= 2 // pre 3.0 items may be filtered out the batch by the driver
         cursor.getBatchSize() == 2
+
+        cleanup:
+        consumeAsyncResults(cursor)
     }
 
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from execute'() {
         given:
         def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()).maxTime(1000, MILLISECONDS)
@@ -229,7 +234,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
     }
 
     @Category(Async)
-    @IgnoreIf({ isSharded() || !serverVersionAtLeast([2, 6, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw execution timeout exception from executeAsync'() {
         given:
         def operation = new ListIndexesOperation(getNamespace(), new DocumentCodec()).maxTime(1000, MILLISECONDS)
@@ -273,7 +278,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
 
         then:
         _ * connection.getDescription() >> helper.threeZeroConnectionDescription
-        1 * connection.command(_, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
+        1 * connection.command(_, _, _, readPreference, _, _) >> helper.commandResult
         1 * connection.release()
 
         where:
@@ -305,7 +310,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
 
         then:
         _ * connection.getDescription() >> helper.threeZeroConnectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> { it[6].onResult(helper.commandResult, _) }
+        1 * connection.commandAsync(helper.dbName, _, _, readPreference, _, _, _) >> { it[6].onResult(helper.commandResult, null) }
 
         where:
         readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
@@ -316,10 +321,10 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
         namespace: new MongoNamespace('db', 'coll'),
         decoder: Stub(Decoder),
         twoSixConnectionDescription : Stub(ConnectionDescription) {
-            getServerVersion() >> new ServerVersion([2, 6, 0])
+            getMaxWireVersion() >> 2
         },
         threeZeroConnectionDescription : Stub(ConnectionDescription) {
-            getServerVersion() >> new ServerVersion([3, 0, 0])
+            getMaxWireVersion() >> 3
         },
         queryResult: Stub(QueryResult) {
             getNamespace() >> new MongoNamespace('db', 'coll')
diff --git a/driver-core/src/test/functional/com/mongodb/operation/MapReduceToCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/MapReduceToCollectionOperationSpecification.groovy
index 88d5929968c..9fbede92c42 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/MapReduceToCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/MapReduceToCollectionOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,15 @@
 
 package com.mongodb.operation
 
-import category.Async
 import com.mongodb.MongoCommandException
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.binding.AsyncConnectionSource
-import com.mongodb.binding.AsyncWriteBinding
-import com.mongodb.binding.ConnectionSource
-import com.mongodb.binding.WriteBinding
+import com.mongodb.ReadPreference
+import com.mongodb.WriteConcern
 import com.mongodb.client.model.CreateCollectionOptions
 import com.mongodb.client.model.ValidationOptions
 import com.mongodb.client.test.CollectionHelper
-import com.mongodb.connection.AsyncConnection
-import com.mongodb.connection.Connection
-import com.mongodb.connection.ConnectionDescription
-import com.mongodb.connection.ServerVersion
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -41,14 +34,12 @@ import org.bson.BsonNull
 import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Filters.gte
-import static java.util.Arrays.asList
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
 class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpecification {
@@ -89,6 +80,7 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         operation.getReduceFunction() == reduceF
         operation.getAction() == 'replace'
         operation.getCollectionName() == out
+        operation.getWriteConcern() == null
         operation.getDatabaseName() == null
         operation.getFilter() == null
         operation.getFinalizeFunction() == null
@@ -97,6 +89,7 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         operation.getSort() == null
         operation.getMaxTime(MILLISECONDS) == 0
         operation.getBypassDocumentValidation() == null
+        operation.getCollation() == null
         !operation.isJsMode()
         !operation.isVerbose()
         !operation.isSharded()
@@ -114,17 +107,27 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         def out = 'outCollection'
         def action = 'merge'
         def dbName = 'dbName'
+        def writeConcern = WriteConcern.MAJORITY
 
         when:
-        def operation =  new MapReduceToCollectionOperation(getNamespace(), mapF, reduceF, out).action(action).databaseName(dbName)
-                .finalizeFunction(finalizeF).filter(filter).limit(10).scope(scope).sort(sort).maxTime(1, MILLISECONDS)
+        def operation =  new MapReduceToCollectionOperation(getNamespace(), mapF, reduceF, out, writeConcern)
+                .action(action)
+                .databaseName(dbName)
+                .finalizeFunction(finalizeF)
+                .filter(filter)
+                .limit(10)
+                .scope(scope)
+                .sort(sort)
+                .maxTime(1, MILLISECONDS)
                 .bypassDocumentValidation(true)
+                .collation(defaultCollation)
 
         then:
         operation.getMapFunction() == mapF
         operation.getReduceFunction() == reduceF
         operation.getAction() == action
         operation.getCollectionName() == out
+        operation.getWriteConcern() == writeConcern
         operation.getDatabaseName() == dbName
         operation.getFilter() == filter
         operation.getLimit() == 10
@@ -132,11 +135,12 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         operation.getSort() == sort
         operation.getMaxTime(MILLISECONDS) == 1
         operation.getBypassDocumentValidation() == true
+        operation.getCollation() == defaultCollation
     }
 
     def 'should return the correct statistics and save the results'() {
         when:
-        MapReduceStatistics results = mapReduceOperation.execute(getBinding())
+        MapReduceStatistics results = execute(mapReduceOperation, async)
 
         then:
         results.emitCount == 3
@@ -144,23 +148,13 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         results.outputCount == 2
         helper.count() == 2
         helper.find() == expectedResults
-    }
 
-    @Category(Async)
-    def 'should return the correct statistics and save the results asynchronously'() {
-
-        when:
-        MapReduceStatistics results = executeAsync(mapReduceOperation)
-
-        then:
-        results.emitCount == 3
-        results.inputCount == 3
-        results.outputCount == 2
-        helper.count() == 2
-        helper.find() == expectedResults
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should support bypassDocumentValidation'() {
         given:
         def collectionOutHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'collectionOut'))
@@ -173,77 +167,55 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
                 new BsonJavaScript('function(){ emit( "level" , 1 ); }'),
                 new BsonJavaScript('function(key, values){ return values.length; }'),
                 'collectionOut')
-        operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        operation.bypassDocumentValidation(false).execute(getBinding())
+        operation.bypassDocumentValidation(false)
+        execute(operation, async)
 
         then:
         thrown(MongoCommandException)
 
         when:
-        operation.bypassDocumentValidation(true).execute(getBinding())
+        operation.bypassDocumentValidation(true)
+        execute(operation, async)
 
         then:
         notThrown(MongoCommandException)
 
         cleanup:
         collectionOutHelper?.drop()
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should support bypassDocumentValidation asynchronously'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
         given:
-        def collectionOutHelper = getCollectionHelper(new MongoNamespace(getDatabaseName(), 'collectionOut'))
-        collectionOutHelper.create('collectionOut', new CreateCollectionOptions().validationOptions(
-                new ValidationOptions().validator(gte('level', 10))))
         getCollectionHelper().insertDocuments(new BsonDocument())
-
-        when:
         def operation = new MapReduceToCollectionOperation(mapReduceInputNamespace,
                 new BsonJavaScript('function(){ emit( "level" , 1 ); }'),
                 new BsonJavaScript('function(key, values){ return values.length; }'),
-                'collectionOut')
-        executeAsync(operation)
-
-        then:
-        thrown(MongoCommandException)
+                'collectionOut', new WriteConcern(5))
 
         when:
-        executeAsync(operation.bypassDocumentValidation(false))
+        execute(operation, async)
 
         then:
-        thrown(MongoCommandException)
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
 
-        when:
-        executeAsync(operation.bypassDocumentValidation(true))
-
-        then:
-        notThrown(MongoCommandException)
-
-        cleanup:
-        collectionOutHelper?.drop()
+        where:
+        async << [true, false]
     }
 
-
     def 'should create the expected command'() {
         given:
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def writeBinding = Stub(WriteBinding) {
-            getWriteConnectionSource() >> connectionSource
-        }
-
         def cannedResults = BsonDocument.parse('''{result : "outCollection", timeMillis: 11,
                                                    counts: {input: 3, emit: 3, reduce: 1, output: 2 }, ok: 1.0 }''')
         def mapF = new BsonJavaScript('function(){ emit( "level" , 1 ); }')
@@ -256,6 +228,8 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         def action = 'merge'
         def dbName = 'dbName'
 
+        when:
+        def operation =  new MapReduceToCollectionOperation(getNamespace(), mapF, reduceF, out, WriteConcern.MAJORITY)
         def expectedCommand = new BsonDocument('mapreduce', new BsonString(getCollectionName()))
                 .append('map', mapF)
                 .append('reduce', reduceF)
@@ -266,14 +240,13 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
                 .append('scope', BsonNull.VALUE)
                 .append('verbose', BsonBoolean.FALSE)
 
-        def operation =  new MapReduceToCollectionOperation(getNamespace(), mapF, reduceF, out)
-
-        when:
-        operation.execute(writeBinding)
+        if (includeWriteConcern) {
+            expectedCommand.append('writeConcern', WriteConcern.MAJORITY.asDocument())
+        }
 
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _) >> cannedResults
-        1 * connection.release()
+        testOperation(operation, serverVersion, expectedCommand, async, cannedResults, true, false,
+                ReadPreference.primary(), false)
 
         when:
         operation.action(action)
@@ -296,105 +269,66 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
                 .append('limit', new BsonInt32(10))
                 .append('maxTimeMS', new BsonInt64(10))
 
+        if (includeCollation) {
+            operation.collation(defaultCollation)
+            expectedCommand.append('collation', defaultCollation.asDocument())
+        }
         if (includeBypassValidation) {
             expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
         }
 
-        operation.execute(writeBinding)
-
         then:
-        1 * connection.command(getNamespace().getDatabaseName(), expectedCommand, _, _, _) >> cannedResults
-        1 * connection.release()
+        testOperation(operation, serverVersion, expectedCommand, async, cannedResults, true, false,
+                ReadPreference.primary(), false)
 
         where:
-        serverVersion                   | includeBypassValidation
-        new ServerVersion([3, 2, 0])    | true
-        new ServerVersion([3, 0, 0])    | false
+        serverVersion | includeBypassValidation | includeWriteConcern | includeCollation | async
+        [3, 4, 0]     | true                    | true                | true             | true
+        [3, 4, 0]     | true                    | true                | true             | false
+        [3, 2, 0]     | true                    | false               | false            | true
+        [3, 2, 0]     | true                    | false               | false            | false
+        [3, 0, 0]     | false                   | false               | false            | true
+        [3, 0, 0]     | false                   | false               | false            | false
     }
 
-    def 'should create the expected command asynchronously'() {
+    def 'should throw an exception when passing an unsupported collation'() {
         given:
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> serverVersion
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def writeBinding = Stub(AsyncWriteBinding) {
-            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def cannedResults = BsonDocument.parse('''{result : "outCollection", timeMillis: 11,
-                                                   counts: {input: 3, emit: 3, reduce: 1, output: 2 }, ok: 1.0 }''')
-        def mapF = new BsonJavaScript('function(){ emit( "level" , 1 ); }')
-        def reduceF = new BsonJavaScript('function(key, values){ return values.length; }')
-        def finalizeF = new BsonJavaScript('function(key, value) { return value }')
-        def filter = BsonDocument.parse('{level: {$gte: 5}}')
-        def sort = BsonDocument.parse('{level: 1}')
-        def scope = BsonDocument.parse('{level: 1}')
-        def out = 'outCollection'
-        def action = 'merge'
-        def dbName = 'dbName'
-
-        def expectedCommand = new BsonDocument('mapreduce', new BsonString(getCollectionName()))
-                .append('map', mapF)
-                .append('reduce', reduceF)
-                .append('out', BsonDocument.parse('{replace: "outCollection", sharded: false, nonAtomic: false}'))
-                .append('query', BsonNull.VALUE)
-                .append('sort', BsonNull.VALUE)
-                .append('finalize', BsonNull.VALUE)
-                .append('scope', BsonNull.VALUE)
-                .append('verbose', BsonBoolean.FALSE)
-
-        def operation =  new MapReduceToCollectionOperation(getNamespace(), mapF, reduceF, out)
+        def operation = mapReduceOperation.collation(defaultCollation)
 
         when:
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        testOperationThrows(operation, [3, 2, 0], async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> {
-            it[5].onResult(cannedResults, null)
-        }
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
 
-        when:
-        operation.action(action)
-                .databaseName(dbName)
-                .finalizeFunction(finalizeF)
-                .filter(filter)
-                .limit(10)
-                .scope(scope)
-                .sort(sort)
-                .maxTime(10, MILLISECONDS)
-                .bypassDocumentValidation(true)
-                .verbose(true)
+        where:
+        async << [false, false]
+    }
 
-        expectedCommand.append('out', BsonDocument.parse('{merge: "outCollection", sharded: false, nonAtomic: false, db: "dbName"}'))
-                .append('query', filter)
-                .append('sort', sort)
-                .append('finalize', finalizeF)
-                .append('scope', scope)
-                .append('verbose', BsonBoolean.TRUE)
-                .append('limit', new BsonInt32(10))
-                .append('maxTimeMS', new BsonInt64(10))
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        def outCollectionHelper = getCollectionHelper(new MongoNamespace(mapReduceInputNamespace.getDatabaseName(), 'collectionOut'))
+        outCollectionHelper.drop()
 
-        if (includeBypassValidation) {
-            expectedCommand.append('bypassDocumentValidation', BsonBoolean.TRUE)
-        }
+        def document = Document.parse('{_id: 1, str: "foo"}')
+        getCollectionHelper(mapReduceInputNamespace).insertDocuments(document)
+        def operation = new MapReduceToCollectionOperation(mapReduceInputNamespace,
+                new BsonJavaScript('function(){ emit( this._id, this.str ); }'),
+                new BsonJavaScript('function(key, values){ return values; }'),
+                'collectionOut')
+                .filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(caseInsensitiveCollation)
 
-        operation.executeAsync(writeBinding, Stub(SingleResultCallback))
+        when:
+        execute(operation, async)
 
         then:
-        1 * connection.commandAsync(getNamespace().getDatabaseName(), expectedCommand, _, _, _, _) >> {
-            it[5].onResult(cannedResults, null)
-        }
-        1 * connection.release()
+        outCollectionHelper.count() == 1
 
         where:
-        serverVersion                   | includeBypassValidation
-        new ServerVersion([3, 2, 0])    | true
-        new ServerVersion([3, 0, 0])    | false
+        async << [true, false]
     }
 
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/MapReduceWithInlineResultsOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/MapReduceWithInlineResultsOperationSpecification.groovy
index adc63d1b027..d16936d7d79 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/MapReduceWithInlineResultsOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/MapReduceWithInlineResultsOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,24 @@
 
 package com.mongodb.operation
 
-import category.Async
-import com.mongodb.Block
 import com.mongodb.MongoNamespace
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
-import com.mongodb.async.SingleResultCallback
+import com.mongodb.ServerAddress
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
 import com.mongodb.binding.ConnectionSource
 import com.mongodb.binding.ReadBinding
 import com.mongodb.client.test.CollectionHelper
 import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
 import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -39,13 +41,15 @@ import org.bson.BsonInt64
 import org.bson.BsonJavaScript
 import org.bson.BsonNull
 import org.bson.BsonString
+import org.bson.BsonTimestamp
 import org.bson.Document
-import org.bson.codecs.Decoder
 import org.bson.codecs.DocumentCodec
-import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.getBinding
-import static com.mongodb.ClusterFixture.loopCursor
+import static com.mongodb.ClusterFixture.executeAsync
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
 class MapReduceWithInlineResultsOperationSpecification extends OperationFunctionalSpecification {
@@ -71,7 +75,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         when:
         def mapF = new BsonJavaScript('function(){ }')
         def reduceF = new BsonJavaScript('function(key, values){ }')
-        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, mapF, reduceF, helper.decoder)
+        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, mapF, reduceF, documentCodec)
 
         then:
         operation.getMapFunction() == mapF
@@ -82,7 +86,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         operation.getSort() == null
         operation.getMaxTime(MILLISECONDS) == 0
         operation.getLimit() == 0
-        operation.getReadConcern() == ReadConcern.DEFAULT
+        operation.getCollation() == null
         !operation.isJsMode()
         !operation.isVerbose()
     }
@@ -95,7 +99,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         def finalizeF = new BsonJavaScript('function(key, value){}')
         def mapF = new BsonJavaScript('function(){ }')
         def reduceF = new BsonJavaScript('function(key, values){ }')
-        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, mapF, reduceF, helper.decoder)
+        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, mapF, reduceF, documentCodec)
                 .filter(filter)
                 .finalizeFunction(finalizeF)
                 .scope(scope)
@@ -104,7 +108,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
                 .verbose(true)
                 .limit(20)
                 .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
+                .collation(defaultCollation)
 
         then:
         operation.getMapFunction() == mapF
@@ -115,102 +119,41 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         operation.getSort() == sort
         operation.getMaxTime(MILLISECONDS) == 10
         operation.getLimit() == 20
-        operation.getReadConcern() == ReadConcern.MAJORITY
+        operation.getCollation() == defaultCollation
         operation.isJsMode()
         operation.isVerbose()
     }
 
     def 'should return the correct results'() {
-        when:
-        MapReduceBatchCursor<Document> results = mapReduceOperation.execute(getBinding())
-
-        then:
-        results.iterator().next() == expectedResults
-    }
-
-    @Category(Async)
-    def 'should return the correct results asynchronously'() {
-        when:
-        List<Document> docList = []
-        loopCursor(mapReduceOperation, new Block<Document>() {
-            @Override
-            void apply(final Document value) {
-                if (value != null) {
-                    docList += value
-                }
-            }
-        });
-
-        then:
-        docList.iterator().toList() == expectedResults
-    }
-
-    def 'should use the ReadBindings readPreference to set slaveOK'() {
         given:
-        def connection = Mock(Connection)
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-            getReadPreference() >> readPreference
-        }
-        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
-                new BsonJavaScript('function(key, values){ }'), helper.decoder)
+        def operation = mapReduceOperation
 
         when:
-        operation.execute(readBinding)
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
-        1 * connection.release()
+        results == expectedResults
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        async << [true, false]
     }
 
-    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
-        given:
-        def connection = Mock(AsyncConnection)
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadPreference() >> readPreference
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
-                new BsonJavaScript('function(key, values){ }'), helper.decoder)
-
+    def 'should use the ReadBindings readPreference to set slaveOK'() {
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
+                new BsonJavaScript('function(key, values){ }'), documentCodec)
 
         then:
-        _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> {
-            it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        testOperationSlaveOk(operation, [3, 4, 0], readPreference, async, helper.commandResult)
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        [async, readPreference] << [[true, false], [ReadPreference.primary(), ReadPreference.secondary()]].combinations()
     }
 
     def 'should create the expected command'() {
-        given:
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(ConnectionSource) {
-            getConnection() >> connection
-        }
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> connectionSource
-        }
+        when:
         def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
-                new BsonJavaScript('function(key, values){ }'), helper.decoder)
+                new BsonJavaScript('function(key, values){ }'), documentCodec)
         def expectedCommand = new BsonDocument('mapreduce', new BsonString(helper.namespace.getCollectionName()))
             .append('map', operation.getMapFunction())
             .append('reduce', operation.getReduceFunction())
@@ -221,12 +164,8 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
             .append('scope', new BsonNull())
             .append('verbose', BsonBoolean.FALSE)
 
-        when:
-        operation.execute(readBinding)
-
         then:
-        1 * connection.command(helper.dbName, expectedCommand, _, _, _) >> { helper.commandResult }
-        1 * connection.release()
+        testOperation(operation, serverVersion, expectedCommand, async, helper.commandResult)
 
         when:
         operation.filter(new BsonDocument('filter', new BsonInt32(1)))
@@ -237,7 +176,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
                 .verbose(true)
                 .limit(20)
                 .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
+
 
         expectedCommand.append('query', operation.getFilter())
                 .append('scope', operation.getScope())
@@ -247,130 +186,187 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
                 .append('verbose', BsonBoolean.TRUE)
                 .append('maxTimeMS', new BsonInt64(10))
                 .append('limit', new BsonInt32(20))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
 
-        operation.execute(readBinding)
+        if (includeCollation) {
+            operation.collation(defaultCollation)
+            expectedCommand.append('collation', defaultCollation.asDocument())
+        }
 
         then:
-        1 * connection.command(helper.dbName, _, _, _, _) >> { helper.commandResult }
-        1 * connection.release()
+        testOperation(operation, serverVersion, expectedCommand, async, helper.commandResult)
+
+        where:
+        serverVersion | includeCollation | async
+        [3, 4, 0]     | true             | true
+        [3, 4, 0]     | true             | false
+        [3, 0, 0]     | false            | true
+        [3, 0, 0]     | false            | false
     }
 
-    def 'should create the expected command asynchronously'() {
+    def 'should throw an exception when using an unsupported ReadConcern'() {
         given:
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
         def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
-                new BsonJavaScript('function(key, values){ }'), helper.decoder)
-        def expectedCommand = new BsonDocument('mapreduce', new BsonString(helper.namespace.getCollectionName()))
-                .append('map', operation.getMapFunction())
-                .append('reduce', operation.getReduceFunction())
-                .append('out', new BsonDocument('inline', new BsonInt32(1)))
-                .append('query', new BsonNull())
-                .append('sort', new BsonNull())
-                .append('finalize', new BsonNull())
-                .append('scope', new BsonNull())
-                .append('verbose', BsonBoolean.FALSE)
+                new BsonJavaScript('function(key, values){ }'), documentCodec)
 
         when:
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        testOperationThrows(operation, [3, 0, 0], readConcern, async)
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('ReadConcern not supported by server version:')
+
+        where:
+        [async, readConcern] << [[true, false], [ReadConcern.MAJORITY, ReadConcern.LOCAL]].combinations()
+    }
+
+    def 'should throw an exception when using an unsupported Collation'() {
+        given:
+        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
+                new BsonJavaScript('function(key, values){ }'), documentCodec).collation(defaultCollation)
 
         when:
-        operation.filter(new BsonDocument('filter', new BsonInt32(1)))
-                .scope(new BsonDocument('scope', new BsonInt32(1)))
-                .sort(new BsonDocument('sort', new BsonInt32(1)))
-                .finalizeFunction(new BsonJavaScript('function(key, value){}'))
-                .jsMode(true)
-                .verbose(true)
-                .limit(20)
-                .maxTime(10, MILLISECONDS)
-                .readConcern(ReadConcern.MAJORITY)
+        testOperationThrows(operation, [3, 2, 0], async)
 
-        expectedCommand.append('query', operation.getFilter())
-                .append('scope', operation.getScope())
-                .append('sort', operation.getSort())
-                .append('finalize', operation.getFinalizeFunction())
-                .append('jsMode', BsonBoolean.TRUE)
-                .append('verbose', BsonBoolean.TRUE)
-                .append('maxTimeMS', new BsonInt64(10))
-                .append('limit', new BsonInt32(20))
-                .append('readConcern', new BsonDocument('level', new BsonString('majority')))
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        async << [false, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        def document = Document.parse('{_id: 1, str: "foo"}')
+        getCollectionHelper().insertDocuments(document)
+        def operation = new MapReduceWithInlineResultsOperation<Document>(
+                namespace,
+                new BsonJavaScript('function(){ emit( this._id, this.str ); }'),
+                new BsonJavaScript('function(key, values){ return key, values; }'),
+                documentCodec)
+                .filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(caseInsensitiveCollation)
 
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+        when:
+        def results = executeAndCollectBatchCursorResults(operation, async)
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
-        1 * connection.release()
+        results == [Document.parse('{_id: 1.0, value: "foo"}')]
+
+        where:
+        async << [true, false]
     }
 
-    def 'should validate the ReadConcern'() {
+    def 'should add read concern to command'() {
         given:
-        def readBinding = Stub(ReadBinding) {
-            getReadConnectionSource() >> Stub(ConnectionSource) {
-                getConnection() >> Stub(Connection) {
-                    getDescription() >> Stub(ConnectionDescription) {
-                        getServerVersion() >> new ServerVersion([3, 0, 0])
-                    }
-                }
-            }
-        }
-        def operation = new CountOperation(helper.namespace).readConcern(readConcern)
+        def binding = Stub(ReadBinding)
+        def source = Stub(ConnectionSource)
+        def connection = Mock(Connection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.readConnectionSource >> source
+        binding.sessionContext >> sessionContext
+        source.connection >> connection
+        source.retain() >> source
+        def commandDocument = BsonDocument.parse('''
+            { "mapreduce" : "coll",
+              "map" : { "$code" : "function(){ }" },
+              "reduce" : { "$code" : "function(key, values){ }" },
+              "out" : { "inline" : 1 },
+              "query" : null,
+              "sort" : null,
+              "finalize" : null,
+              "scope" : null,
+              "verbose" : false,
+              }''')
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
+                new BsonJavaScript('function(key, values){ }'), documentCodec)
 
         when:
-        operation.execute(readBinding)
+        operation.execute(binding)
 
         then:
-        thrown(IllegalArgumentException)
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.command(_, commandDocument, _, _, _, sessionContext) >>
+                new BsonDocument('results', new BsonArrayWrapper([]))
+                        .append('counts',
+                        new BsonDocument('input', new BsonInt32(0))
+                                .append('output', new BsonInt32(0))
+                                .append('emit', new BsonInt32(0)))
+                        .append('timeMillis', new BsonInt32(0))
+        1 * connection.release()
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
     }
 
-    def 'should validate the ReadConcern asynchronously'() {
+    def 'should add read concern to command asynchronously'() {
         given:
-        def connection = Stub(AsyncConnection) {
-            getDescription() >>  Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 0, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        def readBinding = Stub(AsyncReadBinding) {
-            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
-        }
-        def operation = new CountOperation(helper.namespace).readConcern(readConcern)
-        def callback = Mock(SingleResultCallback)
+        def binding = Stub(AsyncReadBinding)
+        def source = Stub(AsyncConnectionSource)
+        def connection = Mock(AsyncConnection)
+        binding.readPreference >> ReadPreference.primary()
+        binding.getReadConnectionSource(_) >> { it[0].onResult(source, null) }
+        binding.sessionContext >> sessionContext
+        source.getConnection(_) >> { it[0].onResult(connection, null) }
+        source.retain() >> source
+        def commandDocument = BsonDocument.parse('''
+            { "mapreduce" : "coll",
+              "map" : { "$code" : "function(){ }" },
+              "reduce" : { "$code" : "function(key, values){ }" },
+              "out" : { "inline" : 1 },
+              "query" : null,
+              "sort" : null,
+              "finalize" : null,
+              "scope" : null,
+              "verbose" : false,
+              }''')
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
+                new BsonJavaScript('function(key, values){ }'), documentCodec)
 
         when:
-        operation.executeAsync(readBinding, callback)
+        executeAsync(operation, binding)
 
         then:
-        1 * callback.onResult(null, _ as IllegalArgumentException)
+        _ * connection.description >> new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 6), 6, STANDALONE, 1000, 100000, 100000, [])
+        1 * connection.commandAsync(_, commandDocument, _, _, _, sessionContext, _) >> {
+            it[6].onResult(new BsonDocument('results', new BsonArrayWrapper([]))
+                    .append('counts',
+                    new BsonDocument('input', new BsonInt32(0))
+                            .append('output', new BsonInt32(0))
+                            .append('emit', new BsonInt32(0)))
+                    .append('timeMillis', new BsonInt32(0)),
+                    null)
+        }
+        1 * connection.release()
 
         where:
-        readConcern << [ReadConcern.MAJORITY, ReadConcern.LOCAL]
+        sessionContext << [
+                Stub(SessionContext) {
+                    isCausallyConsistent() >> true
+                    getOperationTime() >> new BsonTimestamp(42, 0)
+                    hasActiveTransaction() >> false
+                    getReadConcern() >> ReadConcern.MAJORITY
+                }
+        ]
     }
 
     def helper = [
-            dbName: 'db',
             namespace: new MongoNamespace('db', 'coll'),
-            decoder: Stub(Decoder),
             commandResult: BsonDocument.parse('{ok: 1.0, counts: {input: 1, emit: 1, output: 1}, timeMillis: 1}')
-                    .append('results', new BsonArrayWrapper([])),
-            connectionDescription: Stub(ConnectionDescription)
+                    .append('results', new BsonArrayWrapper([]))
     ]
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationAsyncSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationAsyncSpecification.groovy
deleted file mode 100644
index e1ea84f24f0..00000000000
--- a/driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationAsyncSpecification.groovy
+++ /dev/null
@@ -1,759 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.operation
-
-import category.Async
-import category.Slow
-import com.mongodb.ClusterFixture
-import com.mongodb.MongoBulkWriteException
-import com.mongodb.MongoClientException
-import com.mongodb.MongoNamespace
-import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.WriteConcern
-import com.mongodb.bulk.BulkWriteResult
-import com.mongodb.bulk.BulkWriteUpsert
-import com.mongodb.bulk.DeleteRequest
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.bulk.UpdateRequest
-import com.mongodb.bulk.WriteRequest
-import com.mongodb.client.model.CreateCollectionOptions
-import com.mongodb.client.model.ValidationOptions
-import org.bson.BsonBinary
-import org.bson.BsonBoolean
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonObjectId
-import org.bson.Document
-import org.bson.codecs.DocumentCodec
-import org.bson.types.ObjectId
-import org.junit.experimental.categories.Category
-import spock.lang.IgnoreIf
-
-import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getAsyncSingleConnectionBinding
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.WriteConcern.UNACKNOWLEDGED
-import static com.mongodb.bulk.WriteRequest.Type.DELETE
-import static com.mongodb.bulk.WriteRequest.Type.INSERT
-import static com.mongodb.bulk.WriteRequest.Type.REPLACE
-import static com.mongodb.bulk.WriteRequest.Type.UPDATE
-import static com.mongodb.client.model.Filters.eq
-import static com.mongodb.client.model.Filters.gte
-import static java.util.Arrays.asList
-
-@Category(Async)
-class MixedBulkWriteOperationAsyncSpecification extends OperationFunctionalSpecification {
-
-    def 'when no document with the same id exists, should insert the document'() {
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))], ordered,
-                                             ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result.insertedCount == 1
-        result.upserts == []
-        getCollectionHelper().count() == 1
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when a document with the same id exists, should throw an exception'() {
-        given:
-        def document = new BsonDocument('_id', new BsonInt32(1))
-        getCollectionHelper().insertDocuments(document)
-        def op = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(document)], ordered, ACKNOWLEDGED)
-
-        when:
-        executeAsync(op)
-
-        then:
-        def ex = thrown(MongoBulkWriteException)
-        ex.getWriteErrors().get(0).code == 11000
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when documents match the query, a remove of one should remove one of them'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new DeleteRequest(new BsonDocument('x', BsonBoolean.TRUE)).multi(false)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(DELETE, 1, [])
-        getCollectionHelper().count() == 1
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when documents match the query, a remove should remove all of them'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(),
-                                              new Document('x', true),
-                                              new Document('x', true),
-                                              new Document('x', false))
-
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new DeleteRequest(new BsonDocument('x', BsonBoolean.TRUE))],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(DELETE, 2, [])
-        getCollectionHelper().count() == 1
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when multiple document match the query, update of one should update only one of them'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
-                                                                new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .multi(false)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
-        getCollectionHelper().count(new Document('y', 1)) == 1
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when documents match the query, update multi should update all of them'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
-                                                                new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .multi(true)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 2, expectedModifiedCount(2), [])
-        getCollectionHelper().count(new Document('y', 1)) == 2
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when no document matches the query, an update of one with upsert should insert a document'() {
-        def id = new ObjectId()
-        def query = new BsonDocument('_id', new BsonObjectId(id))
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(query, new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
-                                                                UPDATE)
-                                                      .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonObjectId(id))])
-        getCollectionHelper().find().first() == new Document('_id', query.getObjectId('_id').getValue()).append('x', 2)
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when no document matches the query, an update multi with upsert should insert a document'() {
-        def id = new ObjectId()
-        def query = new BsonDocument('_id', new BsonObjectId(id))
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(query, new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
-                                                                UPDATE)
-                                                      .upsert(true).multi(true)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonObjectId(id))])
-        getCollectionHelper().find().first() == new Document('_id', query.getObjectId('_id').getValue()).append('x', 2)
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when documents matches the query, update one with upsert should update only one of them'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
-                                                                new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .multi(false)
-                                                      .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
-        getCollectionHelper().count(new Document('y', 1)) == 1
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when documents match the query, update multi with upsert should update all of them'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
-                                                                new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .upsert(true).multi(true)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 2, expectedModifiedCount(2), [])
-        getCollectionHelper().count(new Document('y', 1)) == 2
-
-        where:
-        ordered << [true, false]
-    }
-
-
-    def 'when updating with an empty document, update should throw IllegalArgumentException'() {
-        given:
-        def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument(), UPDATE)],
-                true, ACKNOWLEDGED)
-
-        when:
-        executeAsync(op)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when updating with an invalid document, update should throw IllegalArgumentException'() {
-        given:
-        def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument('a', new BsonInt32(1)), UPDATE)],
-                true, ACKNOWLEDGED)
-
-        when:
-        executeAsync(op)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        where:
-        ordered << [true, false]
-    }
-
-
-    def 'when a document contains a key with an illegal character, replacing a document with it should throw IllegalArgumentException'() {
-        given:
-        def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
-                                                                new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))),
-                                                                REPLACE)
-                                                      .upsert(true)],
-                                             true, ACKNOWLEDGED)
-
-        when:
-        executeAsync(op)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when no document matches the query, a replace with upsert should insert a document'() {
-        given:
-        def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
-                                                                new BsonDocument('_id', new BsonObjectId(id)).append('x', new BsonInt32(2)),
-                                                                REPLACE)
-                                                      .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonObjectId(id))])
-        getCollectionHelper().find().first() == new Document('_id', id).append('x', 2)
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when a custom _id is upserted it should be in the write result'() {
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('_id', new BsonInt32(0)),
-                                                                new BsonDocument('$set', new BsonDocument('a', new BsonInt32(0))),
-                                                                UPDATE)
-                                                      .upsert(true),
-                                              new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                                                                new BsonDocument('_id', new BsonInt32(1)),
-                                                                REPLACE)
-                                                      .upsert(true),
-                                              new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
-                                                                new BsonDocument('_id', new BsonInt32(2)),
-                                                                REPLACE)
-                                                      .upsert(true)
-                                             ],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonInt32(0)),
-                                                                                        new BulkWriteUpsert(1, new BsonInt32(1)),
-                                                                                        new BulkWriteUpsert(2, new BsonInt32(2))])
-        getCollectionHelper().count() == 3
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'unacknowledged upserts with custom _id should not error'() {
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('_id', new BsonInt32(0)),
-                                                                new BsonDocument('$set', new BsonDocument('a', new BsonInt32(0))),
-                                                                UPDATE)
-                                                      .upsert(true),
-                                              new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                                                                new BsonDocument('_id', new BsonInt32(1)),
-                                                                REPLACE)
-                                                      .upsert(true),
-                                              new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
-                                                                new BsonDocument('_id', new BsonInt32(2)),
-                                                                REPLACE)
-                                                      .upsert(true)
-                                             ],
-                                             ordered, UNACKNOWLEDGED)
-
-        when:
-        def binding = getAsyncSingleConnectionBinding()
-        def result = executeAsync(op, binding)
-
-        then:
-        !result.wasAcknowledged()
-        acknowledgeWrite(binding)
-        getCollectionHelper().count() == 4
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'when multiple documents match the query, replace should replace only one of them'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
-
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
-                                                                new BsonDocument('y', new BsonInt32(1)).append('x', BsonBoolean.FALSE),
-                                                                REPLACE)
-                                                      .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
-        getCollectionHelper().count(new Document('x', false)) == 1
-
-        where:
-        ordered << [true, false]
-    }
-
-    @Category([Async, Slow])
-    def 'when a replacement document is 16MB, the document is still replaced'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1))
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                                                new BsonDocument('_id', new BsonInt32(1))
-                                                                        .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])),
-                                                                REPLACE)
-                                                      .upsert(true)],
-                                             true, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
-        getCollectionHelper().count() == 1
-    }
-
-    @Category([Async, Slow])
-    def 'when two update documents together exceed 16MB, the documents are still updated'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1), new Document('_id', 2))
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                                                new BsonDocument('_id', new BsonInt32(1))
-                                                                        .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])),
-                                                                REPLACE),
-                                              new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
-                                                                new BsonDocument('_id', new BsonInt32(2))
-                                                                        .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])),
-                                                                REPLACE)],
-                                             true, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 2, expectedModifiedCount(2), [])
-        getCollectionHelper().count() == 2
-    }
-
-    def 'should handle multi-length runs of ordered insert, update, replace, and remove'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(), getTestWrites(), ordered, ACKNOWLEDGED)
-
-        when:
-        def result = executeAsync(op)
-
-        then:
-        result.wasAcknowledged()
-        getCollectionHelper().find(new Document('_id', 1)).first() == new Document('_id', 1).append('x', 2)
-        getCollectionHelper().find(new Document('_id', 2)).first() == new Document('_id', 2).append('x', 3)
-        getCollectionHelper().find(new Document('_id', 3)).isEmpty()
-        getCollectionHelper().find(new Document('_id', 4)).isEmpty()
-        getCollectionHelper().find(new Document('_id', 5)).first() == new Document('_id', 5).append('x', 4)
-        getCollectionHelper().find(new Document('_id', 6)).first() == new Document('_id', 6).append('x', 5)
-        getCollectionHelper().find(new Document('_id', 7)).first() == new Document('_id', 7)
-        getCollectionHelper().find(new Document('_id', 8)).first() == new Document('_id', 8)
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'should handle multi-length runs of unacknowledged insert, update, replace, and remove'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(), getTestWrites(), ordered, UNACKNOWLEDGED)
-
-        when:
-        def binding = getAsyncSingleConnectionBinding()
-        def result = executeAsync(op, binding)
-
-        then:
-        !result.wasAcknowledged()
-        acknowledgeWrite(binding)
-        getCollectionHelper().find(new Document('_id', 1)).first() == new Document('_id', 1).append('x', 2)
-        getCollectionHelper().find(new Document('_id', 2)).first() == new Document('_id', 2).append('x', 3)
-        getCollectionHelper().find(new Document('_id', 3)).isEmpty()
-        getCollectionHelper().find(new Document('_id', 4)).isEmpty()
-        getCollectionHelper().find(new Document('_id', 5)).first() == new Document('_id', 5).append('x', 4)
-        getCollectionHelper().find(new Document('_id', 6)).first() == new Document('_id', 6).append('x', 5)
-        getCollectionHelper().find(new Document('_id', 7)).first() == new Document('_id', 7)
-        getCollectionHelper().find(new Document('_id', 8)).first() == new Document('_id', 8)
-
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'should split the number of writes is larger than the match write batch size'() {
-        given:
-        def writes = []
-        (0..2000).each {
-            writes.add(new InsertRequest(new BsonDocument()))
-        }
-
-        when:
-        executeAsync(new MixedBulkWriteOperation(getNamespace(), writes, ordered, ACKNOWLEDGED))
-
-        then:
-        getCollectionHelper().count() == 2001
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'should be able to merge upserts across batches'() {
-        given:
-        def writeOperations = [];
-        (0..1002).each {
-            def upsert = new UpdateRequest(new BsonDocument('key', new BsonInt32(it)),
-                    new BsonDocument('$set', new BsonDocument('key', new BsonInt32(it))),
-                    UPDATE).upsert(true)
-            writeOperations.add(upsert);
-            writeOperations.add(new DeleteRequest(new BsonDocument('key', new BsonInt32(it))));
-        }
-
-        when:
-        def result = executeAsync(new MixedBulkWriteOperation(getNamespace(), writeOperations, ordered, ACKNOWLEDGED))
-
-        then:
-        result.deletedCount == result.upserts.size()
-        getCollectionHelper().count() == 0
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'error details should have correct index on ordered write failure'() {
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                                              new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                                                new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))),
-                                                                UPDATE),
-                                              new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) // this should fail with index 2
-                                             ], true, ACKNOWLEDGED)
-        when:
-        executeAsync(op)
-
-        then:
-        def ex = thrown(MongoBulkWriteException)
-        ex.writeErrors.size() == 1
-        ex.writeErrors[0].index == 2
-        ex.writeErrors[0].code == 11000
-    }
-
-    def 'error details should have correct index on unordered write failure'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                                              new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
-                                                                new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))),
-                                                                UPDATE),
-                                              new InsertRequest(new BsonDocument('_id', new BsonInt32(3))) // this should fail with index 2
-                                             ], false, ACKNOWLEDGED)
-        when:
-        executeAsync(op)
-
-        then:
-        def ex = thrown(MongoBulkWriteException)
-        ex.writeErrors.size() == 2
-        ex.writeErrors[0].index == 0
-        ex.writeErrors[0].code == 11000
-        ex.writeErrors[1].index == 2
-        ex.writeErrors[1].code == 11000
-    }
-
-    // using w = 5 to force a timeout
-    @IgnoreIf({ !ClusterFixture.isDiscoverableReplicaSet() })
-    def 'should throw bulk write exception with a write concern error when wtimeout is exceeded'() {
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))],
-                                             false, new WriteConcern(5, 1)
-        )
-        when:
-        executeAsync(op)
-
-        then:
-        def ex = thrown(MongoBulkWriteException)
-        ex.getWriteConcernError() != null
-    }
-
-    @IgnoreIf({ !ClusterFixture.isDiscoverableReplicaSet() })
-    def 'when there is a duplicate key error and a write concern error, both should be reported'() {
-        given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new InsertRequest(new BsonDocument('_id', new BsonInt32(7))),
-                                              new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))   // duplicate key
-                                             ], ordered, new WriteConcern(4, 1))
-
-        when:
-        executeAsync(op)  // This is assuming that it won't be able to replicate to 4 servers in 1 ms
-
-        then:
-        def ex = thrown(MongoBulkWriteException)
-        ex.writeErrors.size() == 1
-        ex.writeErrors[0].index == 1
-        ex.writeErrors[0].code == 11000
-        ex.writeConcernError != null
-
-        where:
-        ordered << [false]
-    }
-
-    def 'should throw IllegalArgumentException when passed an empty bulk operation'() {
-
-        when:
-        new MixedBulkWriteOperation(getNamespace(), [], ordered, UNACKNOWLEDGED)
-
-        then:
-        thrown(IllegalArgumentException)
-
-        where:
-        ordered << [true, false]
-    }
-
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should honour the bypass validation flag for inserts'() {
-        given:
-        def namespace = new MongoNamespace(getDatabaseName(), 'collection')
-        def collectionHelper = getCollectionHelper(namespace)
-        collectionHelper.create(namespace.getCollectionName(), new CreateCollectionOptions().validationOptions(
-                new ValidationOptions().validator(gte('level', 10))))
-        def op = new MixedBulkWriteOperation(namespace, [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], ordered,
-                ACKNOWLEDGED)
-
-        when:
-        executeAsync(op)
-
-        then:
-        def ex = thrown(MongoBulkWriteException)
-        ex.getWriteErrors().get(0).code == 121
-
-        when:
-        def result = executeAsync(op.bypassDocumentValidation(true))
-
-        then:
-        notThrown(MongoBulkWriteException)
-        result == BulkWriteResult.acknowledged(INSERT, 1, 0, [])
-
-        cleanup:
-        collectionHelper?.drop()
-
-        where:
-        ordered << [true, false]
-    }
-
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
-    def 'should honour the bypass validation flag for updates'() {
-        given:
-        def namespace = new MongoNamespace(getDatabaseName(), 'collection')
-        def collectionHelper = getCollectionHelper(namespace)
-        collectionHelper.create(namespace.getCollectionName(), new CreateCollectionOptions().validationOptions(
-                new ValidationOptions().validator(gte('level', 10))))
-
-        collectionHelper.insertDocuments(BsonDocument.parse('{ x: true, level: 10}'))
-        def op = new MixedBulkWriteOperation(namespace,
-                [new UpdateRequest(BsonDocument.parse ('{x: true}'), BsonDocument.parse ('{$inc: {level: -1}}'),  UPDATE).multi(false)],
-                ordered, ACKNOWLEDGED)
-
-        when:
-        executeAsync(op)
-
-        then:
-        def ex = thrown(MongoBulkWriteException)
-        ex.getWriteErrors().get(0).code == 121
-
-        when:
-        def result = executeAsync(op.bypassDocumentValidation(true))
-
-        then:
-        result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
-        collectionHelper.count(eq('level', 9)) == 1
-
-        where:
-        ordered << [true, false]
-    }
-
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) })
-    def 'should throw if bypassDocumentValidation is set and write is unacknowledged'() {
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, UNACKNOWLEDGED)
-                .bypassDocumentValidation(bypassDocumentValidation)
-
-        when:
-        executeAsync(op)
-
-        then:
-        thrown(MongoClientException)
-
-        where:
-        bypassDocumentValidation << [true, false]
-    }
-
-    private static List<WriteRequest> getTestWrites() {
-        [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                           new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
-                           UPDATE),
-         new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
-                           new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))),
-                           UPDATE),
-         new DeleteRequest(new BsonDocument('_id', new BsonInt32(3))),
-         new DeleteRequest(new BsonDocument('_id', new BsonInt32(4))),
-         new UpdateRequest(new BsonDocument('_id', new BsonInt32(5)),
-                           new BsonDocument('_id', new BsonInt32(5)).append('x', new BsonInt32(4)),
-                           REPLACE),
-         new UpdateRequest(new BsonDocument('_id', new BsonInt32(6)),
-                           new BsonDocument('_id', new BsonInt32(6)).append('x', new BsonInt32(5)),
-                           REPLACE),
-         new InsertRequest(new BsonDocument('_id', new BsonInt32(7))),
-         new InsertRequest(new BsonDocument('_id', new BsonInt32(8)))
-        ]
-    }
-
-    private static Document[] getTestInserts() {
-
-
-        [new Document('_id', 1),
-         new Document('_id', 2),
-         new Document('_id', 3),
-         new Document('_id', 4),
-         new Document('_id', 5),
-         new Document('_id', 6)]
-    }
-
-    private static Integer expectedModifiedCount(final int expectedCountForServersThatSupportIt) {
-        (serverVersionAtLeast([2, 6, 0])) ? expectedCountForServersThatSupportIt : null
-    }
-}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationSpecification.groovy
index ca562d707f4..ac1b31cd597 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/MixedBulkWriteOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,14 +17,14 @@
 package com.mongodb.operation
 
 import category.Slow
-import com.mongodb.ClusterFixture
 import com.mongodb.MongoBulkWriteException
 import com.mongodb.MongoClientException
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoSocketException
+import com.mongodb.MongoSocketReadException
 import com.mongodb.OperationFunctionalSpecification
-import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
 import com.mongodb.WriteConcern
-import com.mongodb.binding.SingleConnectionBinding
 import com.mongodb.bulk.BulkWriteResult
 import com.mongodb.bulk.BulkWriteUpsert
 import com.mongodb.bulk.DeleteRequest
@@ -37,55 +37,73 @@ import org.bson.BsonBinary
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
+import org.bson.BsonInt64
 import org.bson.BsonObjectId
+import org.bson.BsonString
 import org.bson.Document
+import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.DocumentCodec
 import org.bson.types.ObjectId
 import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
-import static ClusterFixture.getBinding
-import static ClusterFixture.getSingleConnectionBinding
-import static ClusterFixture.serverVersionAtLeast
-import static WriteConcern.ACKNOWLEDGED
-import static WriteConcern.UNACKNOWLEDGED
-import static com.mongodb.ClusterFixture.getCluster
+import static com.mongodb.ClusterFixture.configureFailPoint
+import static com.mongodb.ClusterFixture.disableFailPoint
+import static com.mongodb.ClusterFixture.disableOnPrimaryTransactionalWriteFailPoint
+import static com.mongodb.ClusterFixture.enableOnPrimaryTransactionalWriteFailPoint
+import static com.mongodb.ClusterFixture.getAsyncSingleConnectionBinding
+import static com.mongodb.ClusterFixture.getSingleConnectionBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
 import static com.mongodb.bulk.WriteRequest.Type.DELETE
 import static com.mongodb.bulk.WriteRequest.Type.INSERT
 import static com.mongodb.bulk.WriteRequest.Type.REPLACE
 import static com.mongodb.bulk.WriteRequest.Type.UPDATE
 import static com.mongodb.client.model.Filters.eq
 import static com.mongodb.client.model.Filters.gte
-import static java.util.Arrays.asList
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
+import static com.mongodb.connection.ServerType.STANDALONE
 
+@SuppressWarnings('ClassSize')
 class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecification {
 
+    def 'should throw IllegalArgumentException for empty list of requests'() {
+        when:
+        new MixedBulkWriteOperation(getNamespace(), [], true, ACKNOWLEDGED, false)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
     def 'should have the expected passed values'() {
         when:
-        def operation = new MixedBulkWriteOperation(getNamespace(), requests, ordered, writeConcern)
+        def operation = new MixedBulkWriteOperation(getNamespace(), requests, ordered, writeConcern, retryWrites)
                 .bypassDocumentValidation(bypassValidation)
 
         then:
         operation.isOrdered() == ordered
         operation.getNamespace() == getNamespace()
         operation.getWriteRequests() == requests
+        operation.getRetryWrites() == retryWrites
         operation.getWriteConcern() == writeConcern
         operation.getBypassDocumentValidation() == bypassValidation
 
         where:
-        ordered | writeConcern   | bypassValidation | requests
-        true    | ACKNOWLEDGED   | null             | [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))]
-        false   | UNACKNOWLEDGED | true             | [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))]
-        false   | UNACKNOWLEDGED | false            | [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))]
+        ordered | writeConcern   | bypassValidation | retryWrites | requests
+        true    | ACKNOWLEDGED   | null             | true        | [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))]
+        false   | UNACKNOWLEDGED | true             | false       | [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))]
+        false   | UNACKNOWLEDGED | false            | false       | [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))]
     }
 
     def 'when no document with the same id exists, should insert the document'() {
         given:
-        def op = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))], ordered,
-                                             ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))],
+                ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result.insertedCount == 1
@@ -93,271 +111,277 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         getCollectionHelper().count() == 1
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when a document with the same id exists, should throw an exception'() {
         given:
         def document = new BsonDocument('_id', new BsonInt32(1))
         getCollectionHelper().insertDocuments(document)
-        def op = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(document)], ordered,
-                                             ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(document)], ordered, ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
         ex.getWriteErrors().get(0).code == 11000
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when documents match the query, a remove of one should remove one of them'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new DeleteRequest(new BsonDocument('x', BsonBoolean.TRUE)).multi(false)],
-                                             ordered, ACKNOWLEDGED)
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(DELETE, 1, [])
         getCollectionHelper().count() == 1
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when documents match the query, a remove should remove all of them'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true),
                                               new Document('x', false))
-
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new DeleteRequest(new BsonDocument('x', BsonBoolean.TRUE))],
-                                             ordered, ACKNOWLEDGED)
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(DELETE, 2, [])
         getCollectionHelper().count() == 1
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when multiple document match the query, update of one should update only one of them'() {
         given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
                                                                 new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .multi(false)],
-                                             ordered, ACKNOWLEDGED)
+                                                                UPDATE).multi(false)],
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
         getCollectionHelper().count(new Document('y', 1)) == 1
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when documents match the query, update multi should update all of them'() {
         given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
-                                                                new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .multi(true)],
-                                             ordered, ACKNOWLEDGED)
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
+                        new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
+                        UPDATE).multi(true)], ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 2, expectedModifiedCount(2), [])
         getCollectionHelper().count(new Document('y', 1)) == 2
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when no document matches the query, an update of one with upsert should insert a document'() {
+        given:
         def id = new ObjectId()
         def query = new BsonDocument('_id', new BsonObjectId(id))
-        given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(query, new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
-                                                                UPDATE)
-                                                      .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(query, new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
+                        UPDATE).upsert(true)], ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonObjectId(id))])
         getCollectionHelper().find().first() == new Document('_id', query.getObjectId('_id').getValue()).append('x', 2)
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when no document matches the query, an update multi with upsert should insert a document'() {
         def id = new ObjectId()
         def query = new BsonDocument('_id', new BsonObjectId(id))
         given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(query, new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
-                                                                UPDATE)
-                                                      .upsert(true).multi(true)],
-                                             ordered, ACKNOWLEDGED)
+                                                                UPDATE).upsert(true).multi(true)],
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonObjectId(id))])
         getCollectionHelper().find().first() == new Document('_id', query.getObjectId('_id').getValue()).append('x', 2)
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when documents matches the query, update one with upsert should update only one of them'() {
         given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
                                                                 new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .multi(false)
-                                                      .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
+                                                                UPDATE).multi(false).upsert(true)],
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
         getCollectionHelper().count(new Document('y', 1)) == 1
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when documents match the query, update multi with upsert should update all of them'() {
         given:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true));
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
                                                                 new BsonDocument('$set', new BsonDocument('y', new BsonInt32(1))),
-                                                                UPDATE)
-                                                      .upsert(true).multi(true)],
-                                             ordered, ACKNOWLEDGED)
+                                                                UPDATE).upsert(true).multi(true)],
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 2, expectedModifiedCount(2), [])
         getCollectionHelper().count(new Document('y', 1)) == 2
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when updating with an empty document, update should throw IllegalArgumentException'() {
         given:
         def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                 [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument(), UPDATE)],
-                true, ACKNOWLEDGED)
+                true, ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(IllegalArgumentException)
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
+    }
+
+    def 'when replacing with an empty document, update should not throw IllegalArgumentException'() {
+        given:
+        def id = new ObjectId()
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument(), REPLACE)],
+                true, ACKNOWLEDGED, false)
+
+        when:
+        execute(operation, async)
+
+        then:
+        noExceptionThrown()
+
+        where:
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when updating with an invalid document, update should throw IllegalArgumentException'() {
         given:
         def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                 [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)), new BsonDocument('a', new BsonInt32(1)), UPDATE)],
-                true, ACKNOWLEDGED)
+                true, ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(IllegalArgumentException)
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when a document contains a key with an illegal character, replacing a document with it should throw IllegalArgumentException'() {
         given:
         def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
                                                                 new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))),
                                                                 REPLACE)
                                                       .upsert(true)],
-                                             true, ACKNOWLEDGED)
+                                             true, ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(IllegalArgumentException)
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when no document matches the query, a replace with upsert should insert a document'() {
         given:
         def id = new ObjectId()
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
                                                                 new BsonDocument('_id', new BsonObjectId(id))
                                                                         .append('x', new BsonInt32(2)),
                                                                 REPLACE)
                                                       .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonObjectId(id))])
         getCollectionHelper().find().first() == new Document('_id', id).append('x', 2)
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when a custom _id is upserted it should be in the write result'() {
         given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('_id', new BsonInt32(0)),
                                                                 new BsonDocument('$set', new BsonDocument('a', new BsonInt32(0))),
                                                                 UPDATE)
@@ -371,10 +395,10 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
                                                                 REPLACE)
                                                       .upsert(true)
                                              ],
-                                             ordered, ACKNOWLEDGED)
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 0, expectedModifiedCount(0), [new BulkWriteUpsert(0, new BsonInt32(0)),
@@ -383,13 +407,13 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         getCollectionHelper().count() == 3
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'unacknowledged upserts with custom _id should not error'() {
         given:
-        def binding = new SingleConnectionBinding(getCluster(), ReadPreference.primary())
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def binding = async ? getAsyncSingleConnectionBinding() : getSingleConnectionBinding()
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('_id', new BsonInt32(0)),
                                                                 new BsonDocument('$set', new BsonDocument('a', new BsonInt32(0))),
                                                                 UPDATE)
@@ -403,70 +427,67 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
                                                                 REPLACE)
                                                       .upsert(true)
                                              ],
-                                             ordered, UNACKNOWLEDGED)
+                                             ordered, UNACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(binding)
-        getCollectionHelper().insertDocuments(new DocumentCodec(), binding, new Document('_id', 4))
+        def result = execute(operation, binding)
+        acknowledgeWrite(binding)
 
         then:
         !result.wasAcknowledged()
         getCollectionHelper().count() == 4
 
-        cleanup:
-        binding?.release()
-
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     def 'when multiple documents match the query, replace should replace only one of them'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', true), new Document('x', true))
 
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('x', BsonBoolean.TRUE),
                                                                 new BsonDocument('y', new BsonInt32(1)).append('x', BsonBoolean.FALSE),
-                                                                REPLACE)
-                                                      .upsert(true)],
-                                             ordered, ACKNOWLEDGED)
+                                                                REPLACE).upsert(true)],
+                                             ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
         getCollectionHelper().count(new Document('x', false)) == 1
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
     @Category(Slow)
     def 'when a replacement document is 16MB, the document is still replaced'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1))
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                                                new BsonDocument('_id', new BsonInt32(1))
-                                                                        .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])),
-                                                                REPLACE)
-                                                      .upsert(true)],
-                                             true, ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
+                        new BsonDocument('_id', new BsonInt32(1))
+                                .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])),
+                        REPLACE).upsert(true)], true, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
         getCollectionHelper().count() == 1
+
+        where:
+        async << [true, false]
     }
 
     @Category(Slow)
     def 'when two update documents together exceed 16MB, the documents are still updated'() {
         given:
         getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1), new Document('_id', 2))
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                                                                 new BsonDocument('_id', new BsonInt32(1))
                                                                         .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])),
@@ -475,25 +496,67 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
                                                                 new BsonDocument('_id', new BsonInt32(2))
                                                                         .append('x', new BsonBinary(new byte[1024 * 1024 * 16 - 30])),
                                                                 REPLACE)],
-                                             true, ACKNOWLEDGED)
+                                             true, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 2, expectedModifiedCount(2), [])
         getCollectionHelper().count() == 2
+
+        where:
+        async << [true, false]
+    }
+
+    @Category(Slow)
+    def 'when documents together are just below the max message size, the documents are still inserted'() {
+        given:
+        def bsonBinary = new BsonBinary(new byte[16 * 1000 * 1000 - (getCollectionName().length() + 33)])
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [
+                        new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)),
+                        new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)),
+                        new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary))
+                ],
+                true, ACKNOWLEDGED, false)
+
+        when:
+        BulkWriteResult result = execute(operation, true)
+
+        then:
+        result == BulkWriteResult.acknowledged(INSERT, 3, [])
+        getCollectionHelper().count() == 3
     }
 
+    @Category(Slow)
+    def 'when documents together are just above the max message size, the documents are still inserted'() {
+        given:
+        def bsonBinary = new BsonBinary(new byte[16 * 1000 * 1000 - (getCollectionName().length() + 32)])
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [
+                        new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)),
+                        new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary)),
+                        new InsertRequest(new BsonDocument('_id', new BsonObjectId()).append('b', bsonBinary))
+                ],
+                true, ACKNOWLEDGED, false)
+
+        when:
+        BulkWriteResult result = execute(operation, true)
+
+        then:
+        result == BulkWriteResult.acknowledged(INSERT, 3, [])
+        getCollectionHelper().count() == 3
+    }
+
+
     def 'should handle multi-length runs of ordered insert, update, replace, and remove'() {
         given:
         getCollectionHelper().insertDocuments(getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             getTestWrites(), ordered,
-                                             ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(), getTestWrites(), ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = op.execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
@@ -507,21 +570,19 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         getCollectionHelper().find(new Document('_id', 8)).first() == new Document('_id', 8)
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
-    def 'should handle multi-length runs of unacknowledged insert, update, replace, and remove'() {
+    def 'should handle multi-length runs of UNACKNOWLEDGED insert, update, replace, and remove'() {
         given:
         getCollectionHelper().insertDocuments(getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(),
-                                             getTestWrites(), ordered,
-                                             UNACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(),  getTestWrites(), ordered, UNACKNOWLEDGED, false)
+        def binding = async ? getAsyncSingleConnectionBinding() : getSingleConnectionBinding()
 
         when:
-        def binding = getSingleConnectionBinding()
-        def result = op.execute(binding)
-        new InsertOperation(namespace, true, ACKNOWLEDGED, [new InsertRequest(new BsonDocument('_id', new BsonInt32(9)))])
-                .execute(binding);
+        def result = execute(operation, binding)
+        execute(new InsertOperation(namespace, true, ACKNOWLEDGED, false,
+                [new InsertRequest(new BsonDocument('_id', new BsonInt32(9)))]), binding)
 
         then:
         !result.wasAcknowledged()
@@ -535,81 +596,91 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         getCollectionHelper().find(new Document('_id', 7)).first() == new Document('_id', 7)
         getCollectionHelper().find(new Document('_id', 8)).first() == new Document('_id', 8)
 
-
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
+    @Category(Slow)
     def 'should split the number of writes is larger than the match write batch size'() {
         given:
+        def binding = async ? getAsyncSingleConnectionBinding() : getSingleConnectionBinding()
+        def maxWriteBatchSize = getCollectionHelper().isMaster().getInteger('maxWriteBatchSize').intValue()
+        def numberOfWrites = maxWriteBatchSize + 100
         def writes = []
-        (0..2000).each {
+
+        (1..numberOfWrites).each {
             writes.add(new InsertRequest(new BsonDocument()))
         }
+        def operation = new MixedBulkWriteOperation(getNamespace(), writes, ordered, ACKNOWLEDGED, false)
 
         when:
-        new MixedBulkWriteOperation(getNamespace(), writes, ordered, ACKNOWLEDGED).execute(getBinding())
+        execute(operation, binding)
+        acknowledgeWrite(binding)
 
         then:
-        getCollectionHelper().count() == 2001
+        getCollectionHelper().count() == numberOfWrites + 1
 
         where:
-        ordered << [true, false]
+        [async, ordered, writeConcern] << [[true, false], [true, false], [ACKNOWLEDGED, UNACKNOWLEDGED]].combinations()
     }
 
     def 'should be able to merge upserts across batches'() {
         given:
-        def writeOperations = [];
+        def writeOperations = []
         (0..1002).each {
             def upsert = new UpdateRequest(new BsonDocument('key', new BsonInt32(it)),
                                            new BsonDocument('$set', new BsonDocument('key', new BsonInt32(it))),
                         UPDATE).upsert(true)
-            writeOperations.add(upsert);
-            writeOperations.add(new DeleteRequest(new BsonDocument('key', new BsonInt32(it))));
+            writeOperations.add(upsert)
+            writeOperations.add(new DeleteRequest(new BsonDocument('key', new BsonInt32(it))))
         }
+        def operation = new MixedBulkWriteOperation(getNamespace(), writeOperations, ordered, ACKNOWLEDGED, false)
 
         when:
-        def result = new MixedBulkWriteOperation(getNamespace(), writeOperations, ordered, ACKNOWLEDGED).execute(getBinding())
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result.deletedCount == result.upserts.size()
         getCollectionHelper().count() == 0
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[false], [true]].combinations()
     }
 
     def 'error details should have correct index on ordered write failure'() {
         given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
                                               new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                                                                 new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))),
                                                                 UPDATE),
                                               new InsertRequest(new BsonDocument('_id', new BsonInt32(1))) // this should fail with index 2
-                                             ], true, ACKNOWLEDGED)
+                                             ], true, ACKNOWLEDGED, false)
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
         ex.writeErrors.size() == 1
         ex.writeErrors[0].index == 2
         ex.writeErrors[0].code == 11000
+
+        where:
+        async << [true, false]
     }
 
     def 'error details should have correct index on unordered write failure'() {
         given:
         getCollectionHelper().insertDocuments(getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
                                               new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
                                                                 new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))),
                                                                 UPDATE),
                                               new InsertRequest(new BsonDocument('_id', new BsonInt32(3))) // this should fail with index 2
-                                             ], false, ACKNOWLEDGED)
+                                             ], false, ACKNOWLEDGED, false)
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
@@ -618,6 +689,9 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         ex.writeErrors[0].code == 11000
         ex.writeErrors[1].index == 2
         ex.writeErrors[1].code == 11000
+
+        where:
+        async << [true, false]
     }
 
     def 'should continue to execute batches after a failure if writes are unordered'() {
@@ -627,16 +701,19 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         for (int i = 0; i < 2000; i++) {
             inserts.add(new InsertRequest(new BsonDocument('_id', new BsonInt32(i))))
         }
-        def op = new MixedBulkWriteOperation(getNamespace(), inserts, false, ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(), inserts, false, ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
         ex.writeErrors.size() == 2
         ex.getWriteResult().getInsertedCount() == 1998
         getCollectionHelper().count() == 2000
+
+        where:
+        async << [true, false]
     }
 
     def 'should stop executing batches after a failure if writes are ordered'() {
@@ -646,46 +723,52 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         for (int i = 0; i < 2000; i++) {
             inserts.add(new InsertRequest(new BsonDocument('_id', new BsonInt32(i))))
         }
-        def op = new MixedBulkWriteOperation(getNamespace(), inserts, true, ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(), inserts, true, ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
         ex.writeErrors.size() == 1
         ex.getWriteResult().getInsertedCount() == 500
         getCollectionHelper().count() == 502
-    }
 
 
+        where:
+        async << [true, false]
+    }
+
     // using w = 5 to force a timeout
-    @IgnoreIf({ !ClusterFixture.isDiscoverableReplicaSet() })
+    @IgnoreIf({ !isDiscoverableReplicaSet() })
     def 'should throw bulk write exception with a write concern error when wtimeout is exceeded'() {
         given:
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))],
-                                             false, new WriteConcern(5, 1)
-        )
+                                             false, new WriteConcern(5, 1), false)
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
         ex.getWriteConcernError() != null
+
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !ClusterFixture.isDiscoverableReplicaSet() })
+    @IgnoreIf({ !isDiscoverableReplicaSet() })
     def 'when there is a duplicate key error and a write concern error, both should be reported'() {
         given:
         getCollectionHelper().insertDocuments(getTestInserts())
-        def op = new MixedBulkWriteOperation(getNamespace(),
+        def operation = new MixedBulkWriteOperation(getNamespace(),
                                              [new InsertRequest(new BsonDocument('_id', new BsonInt32(7))),
                                               new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))   // duplicate key
-                                             ], ordered, new WriteConcern(4, 1))
+                                             ], false, new WriteConcern(4, 1), false)
 
         when:
-        op.execute(getBinding())  // This is assuming that it won't be able to replicate to 4 servers in 1 ms
+        execute(operation, async)  // This is assuming that it won't be able to replicate to 4 servers in 1 ms
 
         then:
         def ex = thrown(MongoBulkWriteException)
@@ -695,13 +778,46 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         ex.writeConcernError != null
 
         where:
-        ordered << [false]
+        async << [true, false]
     }
 
-    def 'should throw IllegalArgumentException when passed an empty bulk operation'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 8) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error on multiple failpoint'() {
+        given:
+        getCollectionHelper().insertDocuments(getTestInserts())
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new InsertRequest(new BsonDocument('_id', new BsonInt32(7))),
+                 new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))   // duplicate key
+                ], false, ACKNOWLEDGED, true)
+
+        def failPoint = BsonDocument.parse('''{
+            "configureFailPoint": "failCommand",
+            "mode": {"times": 2 },
+            "data": { "failCommands": ["insert"],
+                      "writeConcernError": {"code": 91, "errmsg": "Replication is being shut down"}}}''')
+        configureFailPoint(failPoint)
 
         when:
-        new MixedBulkWriteOperation(getNamespace(), [], ordered, UNACKNOWLEDGED)
+        execute(operation, async)  // This is assuming that it won't be able to replicate to 4 servers in 1 ms
+
+        then:
+        def ex = thrown(MongoBulkWriteException)
+        ex.writeErrors.size() == 1
+        ex.writeErrors[0].index == 1
+        ex.writeErrors[0].code == 11000
+        ex.writeConcernError != null
+        ex.writeConcernError.code == 91
+
+        cleanup:
+        disableFailPoint('failCommand')
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw IllegalArgumentException when passed an empty bulk operation'() {
+        when:
+        new MixedBulkWriteOperation(getNamespace(), [], ordered, UNACKNOWLEDGED, false)
 
         then:
         thrown(IllegalArgumentException)
@@ -710,41 +826,59 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         ordered << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) })
-    def 'should throw if bypassDocumentValidation is set and write is unacknowledged'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
+    def 'should throw if bypassDocumentValidation is set and writeConcern is UNACKNOWLEDGED'() {
         given:
-        def op = new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, UNACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, UNACKNOWLEDGED, false)
                 .bypassDocumentValidation(bypassDocumentValidation)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(MongoClientException)
 
         where:
-        bypassDocumentValidation << [true, false]
+        [async, bypassDocumentValidation] << [[false, false], [true, false]].combinations()
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 2, 0)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should throw if collation is set and write is UNACKNOWLEDGED'() {
+        given:
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new DeleteRequest(BsonDocument.parse('{ level: 9 }')).collation(defaultCollation)], true, UNACKNOWLEDGED, false)
+
+        when:
+        execute(operation, async)
+
+        then:
+        thrown(MongoClientException)
+
+        where:
+        [async, bypassDocumentValidation] << [[true, false], [true, false]].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should honour the bypass validation flag for inserts'() {
         given:
         def namespace = new MongoNamespace(getDatabaseName(), 'collection')
         def collectionHelper = getCollectionHelper(namespace)
         collectionHelper.create(namespace.getCollectionName(), new CreateCollectionOptions().validationOptions(
                 new ValidationOptions().validator(gte('level', 10))))
-        def op = new MixedBulkWriteOperation(namespace, [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], ordered,
-                ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(namespace, [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], ordered,
+                ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
         ex.getWriteErrors().get(0).code == 121
 
         when:
-        def result = op.bypassDocumentValidation(true).execute(getBinding())
+        operation.bypassDocumentValidation(true)
+        BulkWriteResult result = execute(operation, async)
 
         then:
         notThrown(MongoBulkWriteException)
@@ -754,10 +888,10 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
         collectionHelper?.drop()
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 1, 8)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) })
     def 'should honour the bypass validation flag for updates'() {
         given:
         def namespace = new MongoNamespace(getDatabaseName(), 'collection')
@@ -766,43 +900,304 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
                 new ValidationOptions().validator(gte('level', 10))))
 
         collectionHelper.insertDocuments(BsonDocument.parse('{ x: true, level: 10}'))
-        def op = new MixedBulkWriteOperation(namespace,
-                [new UpdateRequest(BsonDocument.parse ('{x: true}'), BsonDocument.parse ('{$inc: {level: -1}}'),  UPDATE).multi(false)],
-                ordered, ACKNOWLEDGED)
+        def operation = new MixedBulkWriteOperation(namespace,
+                [new UpdateRequest(BsonDocument.parse('{x: true}'), BsonDocument.parse('{$inc: {level: -1}}'), UPDATE).multi(false)],
+                ordered, ACKNOWLEDGED, false)
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoBulkWriteException)
         ex.getWriteErrors().get(0).code == 121
 
         when:
-        def result = op.bypassDocumentValidation(true).execute(getBinding())
+        operation.bypassDocumentValidation(true)
+        BulkWriteResult result = execute(operation, async)
 
         then:
         result == BulkWriteResult.acknowledged(UPDATE, 1, expectedModifiedCount(1), [])
         collectionHelper.count(eq('level', 9)) == 1
 
         where:
-        ordered << [true, false]
+        [async, ordered] << [[true, false], [true, false]].combinations()
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 4) })
+    def 'should throw an exception when using an unsupported Collation'() {
+        given:
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('x', 1), new Document('y', 1),
+                new Document('z', 1))
+        def operation = new MixedBulkWriteOperation(namespace, requests, false, ACKNOWLEDGED, false)
+
+        when:
+        execute(operation, async)
+
+        then:
+        def exception = thrown(Exception)
+        exception instanceof IllegalArgumentException
+        exception.getMessage().startsWith('Collation not supported by server version:')
+        getCollectionHelper().count() == 3
+
+        where:
+        [async, requests] << [
+                [true, false],
+                [[new DeleteRequest(BsonDocument.parse('{x: 1}}')).collation(defaultCollation)],
+                 [new UpdateRequest(BsonDocument.parse('{x: 1}}'), BsonDocument.parse('{x: 10}}'), REPLACE),
+                  new UpdateRequest(BsonDocument.parse('{y: 1}}'), BsonDocument.parse('{x: 10}}'), REPLACE).collation(defaultCollation)],
+                 [new DeleteRequest(BsonDocument.parse('{x: 1}}')),
+                  new DeleteRequest(BsonDocument.parse('{y: 1}}')).collation(defaultCollation)],
+                 [new DeleteRequest(BsonDocument.parse('{x: 1}}')),
+                  new UpdateRequest(BsonDocument.parse('{y: 1}}'), BsonDocument.parse('{x: 10}}'), REPLACE).collation(defaultCollation)]]
+        ].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        getCollectionHelper().insertDocuments(Document.parse('{str: "foo"}'), Document.parse('{str: "bar"}'))
+        def requests = [new DeleteRequest(BsonDocument.parse('{str: "FOO"}}')).collation(caseInsensitiveCollation),
+                        new UpdateRequest(BsonDocument.parse('{str: "BAR"}}'), BsonDocument.parse('{str: "bar"}}'), REPLACE)
+                                .collation(caseInsensitiveCollation)]
+        def operation = new MixedBulkWriteOperation(namespace, requests, false, ACKNOWLEDGED, false)
+
+        when:
+        BulkWriteResult result = execute(operation, async)
+
+        then:
+        result.getDeletedCount() == 1
+        result.getModifiedCount() == 1
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should support retryWrites=true'() {
+        given:
+        def testWrites = getTestWrites()
+        Collections.shuffle(testWrites)
+        getCollectionHelper().insertDocuments(getTestInserts())
+        def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, ACKNOWLEDGED, true)
+
+        when:
+        if (serverVersionAtLeast(3, 6) && isDiscoverableReplicaSet()) {
+            enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse(failPoint))
+        }
+        BulkWriteResult result = executeWithSession(operation, async)
+
+        then:
+        result.wasAcknowledged()
+        result.getInsertedCount() == 2
+        result.getDeletedCount() == 2
+        result.getMatchedCount() == 4
+        result.getModifiedCount() == 4
+        result.getUpserts().isEmpty()
+
+        then:
+        getCollectionHelper().find(new Document('_id', 1)).first() == new Document('_id', 1).append('x', 2)
+        getCollectionHelper().find(new Document('_id', 2)).first() == new Document('_id', 2).append('x', 3)
+        getCollectionHelper().find(new Document('_id', 3)).isEmpty()
+        getCollectionHelper().find(new Document('_id', 4)).isEmpty()
+        getCollectionHelper().find(new Document('_id', 5)).first() == new Document('_id', 5).append('x', 4)
+        getCollectionHelper().find(new Document('_id', 6)).first() == new Document('_id', 6).append('x', 5)
+        getCollectionHelper().find(new Document('_id', 7)).first() == new Document('_id', 7)
+        getCollectionHelper().find(new Document('_id', 8)).first() == new Document('_id', 8)
+
+        cleanup:
+        disableOnPrimaryTransactionalWriteFailPoint()
+
+        where:
+        [async, ordered, failPoint] << [
+            [true, false],
+            [true, false],
+            ['{mode: {times: 5}}', // SDAM will retry multiple times to find a server
+             '{mode: {times: 1}, data: {failBeforeCommitExceptionCode : 1}}']
+        ].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should fail as expected with retryWrites and failPoints'() {
+        given:
+        def testWrites = getTestWrites()
+        getCollectionHelper().insertDocuments(getTestInserts())
+        def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, ACKNOWLEDGED, true)
+
+        when:
+        enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse(failPoint))
+        executeWithSession(operation, async)
+
+        then:
+        thrown(MongoSocketReadException)
+
+        cleanup:
+        disableOnPrimaryTransactionalWriteFailPoint()
+
+        where:
+        [async, failPoint] << [
+                [true, false],
+                ['{mode: {times: 2}, data: {failBeforeCommitExceptionCode : 1}}',
+                 '{mode: {skip: 2}, data: {failBeforeCommitExceptionCode : 1}}']
+        ].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should not fail with unacknowledged writes, retryWrites and failPoints'() {
+        given:
+        def testWrites = getTestWrites()
+        getCollectionHelper().insertDocuments(getTestInserts())
+        def operation = new MixedBulkWriteOperation(getNamespace(), testWrites, true, UNACKNOWLEDGED, true)
+
+        when:
+        enableOnPrimaryTransactionalWriteFailPoint(BsonDocument.parse(failPoint))
+        def result = executeWithSession(operation, async)
+
+        then:
+        result == BulkWriteResult.unacknowledged()
+
+        cleanup:
+        disableOnPrimaryTransactionalWriteFailPoint()
+
+        where:
+        [async, failPoint] << [
+                [true, false],
+                ['{mode: {times: 2}, data: {failBeforeCommitExceptionCode : 1}}',
+                 '{mode: {skip: 2}, data: {failBeforeCommitExceptionCode : 1}}']
+        ].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def 'should retry if the connection initially fails'() {
+        when:
+        def cannedResult = BsonDocument.parse('{ok: 1.0, n: 1}')
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, ACKNOWLEDGED, true)
+        def expectedCommand = new BsonDocument('insert', new BsonString(getNamespace().getCollectionName()))
+                .append('ordered', BsonBoolean.TRUE)
+                .append('txnNumber', new BsonInt64(0))
+
+        then:
+        testOperationRetries(operation, [3, 6, 0], expectedCommand, async, cannedResult)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw original error when retrying and failing'() {
+        given:
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                [new InsertRequest(BsonDocument.parse('{ level: 9 }'))], true, ACKNOWLEDGED, true)
+        def originalException = new MongoSocketException('Some failure', new ServerAddress())
+
+        when:
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 4, 0]],
+                [REPLICA_SET_PRIMARY, REPLICA_SET_PRIMARY], originalException, async)
+
+        then:
+        Exception commandException = thrown()
+        commandException == originalException
+
+        when:
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0], [3, 6, 0]],
+                [REPLICA_SET_PRIMARY, STANDALONE], originalException, async)
+
+        then:
+        commandException = thrown()
+        commandException == originalException
+
+        when:
+        testRetryableOperationThrowsOriginalError(operation, [[3, 6, 0]],
+                [REPLICA_SET_PRIMARY], originalException, async)
+
+        then:
+        commandException = thrown()
+        commandException == originalException
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def 'should not request retryable write for multi updates or deletes'() {
+        given:
+        def operation = new MixedBulkWriteOperation(getNamespace(),
+                writes, true, ACKNOWLEDGED, true)
+
+        when:
+        executeWithSession(operation, async)
+
+        then:
+        noExceptionThrown()
+
+        where:
+        [async, writes] << [
+                [true, false],
+                // Test scenarios where the multi:true request is at the beginning and at the end of the list
+                [
+                        [
+                                new DeleteRequest(new BsonDocument()).multi(true),
+                                new InsertRequest(new BsonDocument())
+                        ],
+                        [
+                                new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
+                                        new BsonDocument('$set', new BsonDocument('_id', new BsonInt32(1))), UPDATE).multi(true),
+                                new InsertRequest(new BsonDocument())
+                        ],
+                        [
+                                new InsertRequest(new BsonDocument()),
+                                new DeleteRequest(new BsonDocument()).multi(true)
+                        ],
+                        [
+                                new InsertRequest(new BsonDocument()),
+                                new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
+                                        new BsonDocument('$set', new BsonDocument('_id', new BsonInt32(1))), UPDATE).multi(true)
+                        ]
+                ]
+        ].combinations()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def 'should support array filters'() {
+        given:
+        def documentOne = BsonDocument.parse('{_id: 1, y: [ {b: 3}, {b: 1}]}')
+        def documentTwo = BsonDocument.parse('{_id: 2, y: [ {b: 0}, {b: 1}]}')
+        getCollectionHelper().insertDocuments(documentOne, documentTwo)
+        def requests = [
+                new UpdateRequest(new BsonDocument(), BsonDocument.parse('{ $set: {"y.$[i].b": 2}}'), UPDATE)
+                        .arrayFilters([BsonDocument.parse('{"i.b": 3}')]),
+                new UpdateRequest(new BsonDocument(), BsonDocument.parse('{ $set: {"y.$[i].b": 4}}'), UPDATE)
+                        .multi(true)
+                        .arrayFilters([BsonDocument.parse('{"i.b": 1}')]),
+        ]
+        def operation = new MixedBulkWriteOperation(namespace, requests, true, ACKNOWLEDGED, false)
+
+        when:
+        execute(operation, async)
+
+        then:
+        getCollectionHelper().find(new BsonDocumentCodec()) == [
+                BsonDocument.parse('{_id: 1, y: [ {b: 2}, {b: 4}]}'),
+                BsonDocument.parse('{_id: 2, y: [ {b: 0}, {b: 4}]}')
+        ]
+
+        where:
+        async << [true, false]
     }
 
     private static List<WriteRequest> getTestWrites() {
         [new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                            new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2))),
-                           UPDATE),
+                           UPDATE).multi(false),
          new UpdateRequest(new BsonDocument('_id', new BsonInt32(2)),
                            new BsonDocument('$set', new BsonDocument('x', new BsonInt32(3))),
-                           UPDATE),
-         new DeleteRequest(new BsonDocument('_id', new BsonInt32(3))),
-         new DeleteRequest(new BsonDocument('_id', new BsonInt32(4))),
+                           UPDATE).multi(false),
+         new DeleteRequest(new BsonDocument('_id', new BsonInt32(3))).multi(false),
+         new DeleteRequest(new BsonDocument('_id', new BsonInt32(4))).multi(false),
          new UpdateRequest(new BsonDocument('_id', new BsonInt32(5)),
                            new BsonDocument('_id', new BsonInt32(5)).append('x', new BsonInt32(4)),
-                           REPLACE),
+                           REPLACE).multi(false),
          new UpdateRequest(new BsonDocument('_id', new BsonInt32(6)),
                            new BsonDocument('_id', new BsonInt32(6)).append('x', new BsonInt32(5)),
-                           REPLACE),
+                           REPLACE).multi(false),
          new InsertRequest(new BsonDocument('_id', new BsonInt32(7))),
          new InsertRequest(new BsonDocument('_id', new BsonInt32(8)))
         ]
@@ -818,6 +1213,6 @@ class MixedBulkWriteOperationSpecification extends OperationFunctionalSpecificat
     }
 
     private static Integer expectedModifiedCount(final int expectedCountForServersThatSupportIt) {
-        (serverVersionAtLeast([2, 6, 0])) ? expectedCountForServersThatSupportIt : null
+        expectedCountForServersThatSupportIt
     }
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/OperationReadConcernHelperSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/OperationReadConcernHelperSpecification.groovy
new file mode 100644
index 00000000000..ebd89fc6f73
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/operation/OperationReadConcernHelperSpecification.groovy
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.ReadConcern
+import com.mongodb.session.SessionContext
+import org.bson.BsonDocument
+import org.bson.BsonString
+import org.bson.BsonTimestamp
+import spock.lang.Specification
+
+import static com.mongodb.operation.OperationReadConcernHelper.appendReadConcernToCommand
+
+
+class OperationReadConcernHelperSpecification extends Specification {
+
+    def 'should throw IllegalArgumentException if command document is null'() {
+        when:
+        appendReadConcernToCommand(Stub(SessionContext), null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should throw IllegalArgumentException if session context is null'() {
+        when:
+        appendReadConcernToCommand(null, new BsonDocument())
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should add afterClusterTime to majority read concern when session is causally consistent'() {
+        given:
+        def operationTime = new BsonTimestamp(42, 1)
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> true
+            getOperationTime() >> operationTime
+            getReadConcern() >> ReadConcern.MAJORITY
+        }
+        def commandDocument = new BsonDocument()
+
+        when:
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        then:
+        commandDocument == new BsonDocument('readConcern',
+                new BsonDocument('level', new BsonString('majority')).append('afterClusterTime', operationTime))
+    }
+
+    def 'should add afterClusterTime to default read concern when session is causally consistent'() {
+        given:
+        def operationTime = new BsonTimestamp(42, 1)
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> true
+            getOperationTime() >> operationTime
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+        def commandDocument = new BsonDocument()
+
+        when:
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        then:
+        commandDocument == new BsonDocument('readConcern',
+                new BsonDocument(new BsonDocument('afterClusterTime', operationTime)))
+    }
+
+    def 'should not add afterClusterTime to ReadConcern when session is not causally consistent'() {
+        given:
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> false
+            getOperationTime() >> { throw new UnsupportedOperationException() }
+            getReadConcern() >> ReadConcern.MAJORITY
+        }
+        def commandDocument = new BsonDocument()
+
+        when:
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        then:
+        commandDocument == new BsonDocument('readConcern',
+                new BsonDocument('level', new BsonString('majority')))
+    }
+
+    def 'should not add the default read concern to the command document'() {
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> false
+            getOperationTime() >> { throw new UnsupportedOperationException() }
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+        def commandDocument = new BsonDocument()
+
+        when:
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        then:
+        commandDocument == new BsonDocument()
+    }
+
+    def 'should not add afterClusterTime to ReadConcern when operation time is null'() {
+        given:
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> true
+            getOperationTime() >> null
+            getReadConcern() >> ReadConcern.MAJORITY
+        }
+        def commandDocument = new BsonDocument()
+
+        when:
+        appendReadConcernToCommand(sessionContext, commandDocument)
+
+        then:
+        commandDocument == new BsonDocument('readConcern',
+                new BsonDocument('level', new BsonString('majority')))
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/ParallelCollectionScanOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/ParallelCollectionScanOperationSpecification.groovy
index ddff11ce7c4..497c811fdcd 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/ParallelCollectionScanOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/ParallelCollectionScanOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import com.mongodb.connection.AsyncConnection
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonJavaScript
@@ -49,10 +50,9 @@ import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.loopCursor
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
 import static org.junit.Assert.assertTrue
 
-@IgnoreIf({ isSharded() || !serverVersionAtLeast(asList(2, 6, 0)) })
+@IgnoreIf({ isSharded() || serverVersionAtLeast(4, 1) })
 @Category(Slow)
 class ParallelCollectionScanOperationSpecification extends OperationFunctionalSpecification {
     Map<Integer, Boolean> ids = [] as ConcurrentHashMap
@@ -73,19 +73,16 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         then:
         operation.getBatchSize() == 0
         operation.getNumCursors() == 3
-        operation.getReadConcern() == ReadConcern.DEFAULT
     }
 
     def 'should set optional values correctly'(){
         when:
         def operation = new ParallelCollectionScanOperation<Document>(getNamespace(), 3, new DocumentCodec())
             .batchSize(10)
-            .readConcern(ReadConcern.MAJORITY)
 
         then:
         operation.getBatchSize() == 10
         operation.getNumCursors() == 3
-        operation.getReadConcern() == ReadConcern.MAJORITY
     }
 
     def 'should visit all documents'() {
@@ -132,6 +129,10 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         def readBinding = Stub(ReadBinding) {
             getReadConnectionSource() >> connectionSource
             getReadPreference() >> readPreference
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
         }
         def operation = new ParallelCollectionScanOperation<Document>(helper.namespace, 2, helper.decoder)
 
@@ -140,7 +141,7 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
 
         then:
         _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.commandResult
+        1 * connection.command(helper.dbName, _, _, readPreference, _, _) >> helper.commandResult
         1 * connection.release()
 
         where:
@@ -156,6 +157,10 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         def readBinding = Stub(AsyncReadBinding) {
             getReadPreference() >> readPreference
             getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
         }
         def operation = new ParallelCollectionScanOperation<Document>(helper.namespace, 2, helper.decoder)
 
@@ -164,8 +169,8 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
 
         then:
         _ * connection.getDescription() >> helper.connectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> {
-            it[5].onResult(helper.commandResult, null) }
+        1 * connection.commandAsync(helper.dbName, _, _, readPreference, _, _, _) >> {
+            it[6].onResult(helper.commandResult, null) }
         1 * connection.release()
 
         where:
@@ -184,6 +189,10 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         }
         def readBinding = Stub(ReadBinding) {
             getReadConnectionSource() >> connectionSource
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
         }
 
         def operation = new ParallelCollectionScanOperation<Document>(helper.namespace, 2, helper.decoder)
@@ -194,17 +203,16 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         operation.execute(readBinding)
 
         then:
-        1 * connection.command(helper.dbName, expectedCommand, _, _, _) >> { helper.commandResult }
+        1 * connection.command(helper.dbName, expectedCommand, _, _, _, _) >> { helper.commandResult }
         1 * connection.release()
 
         when:
-        operation.batchSize(10).readConcern(ReadConcern.MAJORITY)
-        expectedCommand.append('readConcern', new BsonDocument('level', new BsonString('majority')))
+        operation.batchSize(10)
 
         operation.execute(readBinding)
 
         then:
-        1 * connection.command(helper.dbName, expectedCommand, _, _, _) >> { helper.commandResult }
+        1 * connection.command(helper.dbName, expectedCommand, _, _, _, _) >> { helper.commandResult }
         1 * connection.release()
     }
 
@@ -220,6 +228,10 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         }
         def readBinding = Stub(AsyncReadBinding) {
             getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
         }
         def operation = new ParallelCollectionScanOperation<Document>(helper.namespace, 2, helper.decoder)
         def expectedCommand = new BsonDocument('parallelCollectionScan', new BsonString(helper.namespace.getCollectionName()))
@@ -229,17 +241,16 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         operation.executeAsync(readBinding, Stub(SingleResultCallback))
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
+        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _, _) >> { it[6].onResult(helper.commandResult, null) }
         1 * connection.release()
 
         when:
-        operation.batchSize(10).readConcern(ReadConcern.MAJORITY)
-        expectedCommand.append('readConcern', new BsonDocument('level', new BsonString('majority')))
+        operation.batchSize(10)
 
         operation.executeAsync(readBinding, Stub(SingleResultCallback))
 
         then:
-        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _) >> { it[5].onResult(helper.commandResult, null) }
+        1 * connection.commandAsync(helper.dbName, expectedCommand, _, _, _, _, _) >> { it[6].onResult(helper.commandResult, null) }
         1 * connection.release()
     }
 
@@ -253,9 +264,12 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
                     }
                 }
             }
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> readConcern
+            }
         }
         def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
-                new BsonJavaScript('function(key, values){ }'), helper.decoder).readConcern(readConcern)
+                new BsonJavaScript('function(key, values){ }'), helper.decoder)
 
         when:
         operation.execute(readBinding)
@@ -279,9 +293,12 @@ class ParallelCollectionScanOperationSpecification extends OperationFunctionalSp
         }
         def readBinding = Stub(AsyncReadBinding) {
             getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> readConcern
+            }
         }
         def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
-                new BsonJavaScript('function(key, values){ }'), helper.decoder).readConcern(readConcern)
+                new BsonJavaScript('function(key, values){ }'), helper.decoder)
         def callback = Mock(SingleResultCallback)
 
         when:
diff --git a/driver-core/src/test/functional/com/mongodb/operation/QueryBatchCursorFunctionalSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/QueryBatchCursorFunctionalSpecification.groovy
index 661c0c372e8..8c3f1649c05 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/QueryBatchCursorFunctionalSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/QueryBatchCursorFunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import com.mongodb.binding.ConnectionSource
 import com.mongodb.client.model.CreateCollectionOptions
 import com.mongodb.connection.Connection
 import com.mongodb.connection.QueryResult
-import com.mongodb.internal.validator.NoOpFieldNameValidator
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -41,12 +40,13 @@ import spock.lang.IgnoreIf
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
+import static com.mongodb.ClusterFixture.checkReferenceCountReachesTarget
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.isSharded
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.operation.OperationHelper.cursorDocumentToQueryResult
-import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo
 import static java.util.Arrays.asList
 import static org.junit.Assert.assertEquals
 import static org.junit.Assert.fail
@@ -68,6 +68,7 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
 
     def cleanup() {
         cursor?.close()
+        connectionSource?.release()
     }
 
     def 'server cursor should not be null'() {
@@ -206,7 +207,7 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
             try {
                 sleep(500)
                 collectionHelper.insertDocuments(new DocumentCodec(), new Document('_id', 2).append('ts', new BsonTimestamp(6, 0)))
-            } catch (interrupt) {
+            } catch (ignored) {
                 //pass
             } finally {
                 latch.countDown()
@@ -245,6 +246,8 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
 
         then:
         cursor.tryNext().iterator().next().get('_id') == 1
+
+        then:
         !cursor.tryNext()
 
         when:
@@ -256,7 +259,33 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
         nextBatch.iterator().next().get('_id') == 2
     }
 
-    @IgnoreIf({ !serverVersionAtLeast([3, 2, 0]) || isSharded() })
+    @Category(Slow)
+    def 'hasNext should throw when cursor is closed in another thread'() {
+        collectionHelper.create(collectionName, new CreateCollectionOptions().capped(true).sizeInBytes(1000))
+        collectionHelper.insertDocuments(new DocumentCodec(), new Document('_id', 1).append('ts', new BsonTimestamp(5, 0)))
+        def firstBatch = executeQuery(new BsonDocument('ts', new BsonDocument('$gte', new BsonTimestamp(5, 0))), 0, 2, true, true);
+        cursor = new QueryBatchCursor<Document>(firstBatch, 0, 2, new DocumentCodec(), connectionSource)
+        cursor.next()
+        def latch = new CountDownLatch(1)
+
+        // wait a second then close the cursor
+        new Thread({
+            sleep(1000)
+            cursor.close()
+            latch.countDown()
+        } as Runnable).start()
+
+        when:
+        cursor.hasNext()
+
+        then:
+        thrown(Exception)
+
+        cleanup:
+        latch.await(5, TimeUnit.SECONDS)  // wait for cursor.close to complete
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 2) || isSharded() })
     @Category(Slow)
     def 'test maxTimeMS'() {
         collectionHelper.create(collectionName, new CreateCollectionOptions().capped(true).sizeInBytes(1000))
@@ -293,14 +322,14 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
         cursor = new QueryBatchCursor<Document>(firstBatch, 0, 2, new DocumentCodec(), connectionSource)
 
         CountDownLatch latch = new CountDownLatch(1)
-        def seen;
+        def seen = 0
         def thread = Thread.start {
             try {
                 cursor.next()
                 seen = 1
                 cursor.next()
                 seen = 2
-            } catch (interrupt) {
+            } catch (ignored) {
                 // pass
             } finally {
                 latch.countDown()
@@ -315,8 +344,7 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
         seen == 1
     }
 
-    // 2.2 does not properly detect cursor not found, so ignoring
-    @IgnoreIf({ isSharded() && !serverVersionAtLeast([2, 4, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should kill cursor if limit is reached on initial query'() throws InterruptedException {
         given:
         def firstBatch = executeQuery(5)
@@ -334,8 +362,7 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
         connection?.release()
     }
 
-    @IgnoreIf({ isSharded() && !serverVersionAtLeast([2, 4, 0]) })
-    // 2.2 does not properly detect cursor not found, so ignoring
+    @IgnoreIf({ isSharded() })
     @Category(Slow)
     def 'should kill cursor if limit is reached on get more'() throws InterruptedException {
         given:
@@ -355,6 +382,35 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
         thrown(MongoCursorNotFoundException)
     }
 
+    def 'should release connection source if limit is reached on initial query'() throws InterruptedException {
+        given:
+        def firstBatch = executeQuery(5)
+        def connection = connectionSource.getConnection()
+
+        when:
+        cursor = new QueryBatchCursor<Document>(firstBatch, 5, 0, 0, new DocumentCodec(), connectionSource, connection)
+
+        then:
+        checkReferenceCountReachesTarget(connectionSource, 1)
+
+        cleanup:
+        connection?.release()
+    }
+
+    def 'should release connection source if limit is reached on get more'() throws InterruptedException {
+        given:
+        def firstBatch = executeQuery(3)
+
+        cursor = new QueryBatchCursor<Document>(firstBatch, 5, 3, new DocumentCodec(), connectionSource)
+
+        when:
+        cursor.next()
+        cursor.next()
+
+        then:
+        checkReferenceCountReachesTarget(connectionSource, 1)
+    }
+
     def 'test limit with get more'() {
         given:
         def firstBatch = executeQuery(2)
@@ -454,9 +510,8 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
         thrown(NoSuchElementException)
     }
 
-    // 2.2 does not properly detect cursor not found, so ignoring
     @SuppressWarnings('BracesForTryCatchFinally')
-    @IgnoreIf({ isSharded() && !serverVersionAtLeast([2, 4, 0]) })
+    @IgnoreIf({ isSharded() })
     def 'should throw cursor not found exception'() {
         given:
         def firstBatch = executeQuery(2)
@@ -480,53 +535,29 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
         }
     }
 
-    // More of an integration test to ensure proper server behavior, as there is no specific driver code in the cursor implementation to
-    // enable reading from a secondary.  But since the cursor, as per spec, does not set the slaveOk flag for the getMore command, this
-    // test ensures that the server does not require it.
-    @IgnoreIf({ !isDiscoverableReplicaSet() })
-    def 'should get more from a secondary'() {
-        given:
-        connectionSource = getBinding(ReadPreference.secondary()).getReadConnectionSource()
-
-        def firstBatch = executeQuery(2, true)
-
-        // wait for replication
-        while (firstBatch.cursor == null ) {
-            firstBatch = executeQuery(2, true)
-        }
-
-        when:
-        cursor = new QueryBatchCursor<Document>(firstBatch, 0, 2, new DocumentCodec(), connectionSource)
-        cursor.next()
-
-        then:
-        cursor.next()
-    }
-
-
     private QueryResult<Document> executeQuery() {
         executeQuery(0)
     }
 
     private QueryResult<Document> executeQuery(int batchSize) {
-        executeQuery(new BsonDocument(), 0, batchSize, false, false, false)
+        executeQuery(new BsonDocument(), 0, batchSize, false, false, ReadPreference.primary())
     }
 
-    private QueryResult<Document> executeQuery(int batchSize, boolean slaveOk) {
-        executeQuery(new BsonDocument(), 0, batchSize, false, false, slaveOk)
+    private QueryResult<Document> executeQuery(int batchSize, ReadPreference readPreference) {
+        executeQuery(new BsonDocument(), 0, batchSize, false, false, readPreference)
     }
 
     private QueryResult<Document> executeQuery(int limit, int batchSize) {
-        executeQuery(new BsonDocument(), limit, batchSize, false, false, false)
+        executeQuery(new BsonDocument(), limit, batchSize, false, false, ReadPreference.primary())
     }
 
 
     private QueryResult<Document> executeQuery(BsonDocument filter, int limit, int batchSize, boolean tailable, boolean awaitData) {
-        executeQuery(filter, limit, batchSize, tailable, awaitData, false)
+        executeQuery(filter, limit, batchSize, tailable, awaitData, ReadPreference.primary())
     }
 
     private QueryResult<Document> executeQuery(BsonDocument filter, int limit, int batchSize, boolean tailable, boolean awaitData,
-                                               boolean slaveOk) {
+                                               ReadPreference readPreference) {
         def connection = connectionSource.getConnection()
         try {
             if (serverIsAtLeastVersionThreeDotTwo(connection.getDescription())) {
@@ -546,12 +577,13 @@ class QueryBatchCursorFunctionalSpecification extends OperationFunctionalSpecifi
                 }
 
                 def response = connection.command(getDatabaseName(), findCommand,
-                                                  slaveOk, new NoOpFieldNameValidator(),
-                                                  CommandResultDocumentCodec.create(new DocumentCodec(), 'firstBatch'))
+                        NO_OP_FIELD_NAME_VALIDATOR, readPreference,
+                        CommandResultDocumentCodec.create(new DocumentCodec(), 'firstBatch'),
+                        connectionSource.sessionContext)
                 cursorDocumentToQueryResult(response.getDocument('cursor'), connection.getDescription().getServerAddress())
             } else {
                 connection.query(getNamespace(), filter, null, 0, limit, batchSize,
-                                 slaveOk, tailable, awaitData, false, false, false,
+                                 readPreference.isSlaveOk(), tailable, awaitData, false, false, false,
                                  new DocumentCodec());
             }
         } finally {
diff --git a/driver-core/src/test/functional/com/mongodb/operation/QueryOperationHelper.groovy b/driver-core/src/test/functional/com/mongodb/operation/QueryOperationHelper.groovy
new file mode 100644
index 00000000000..18b4d4d2fd4
--- /dev/null
+++ b/driver-core/src/test/functional/com/mongodb/operation/QueryOperationHelper.groovy
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import org.bson.BsonDocument
+
+class QueryOperationHelper {
+    static BsonDocument sanitizeExplainResult(BsonDocument document) {
+        document.remove('ok')
+        document.remove('millis')
+        document.remove('executionStats')
+        document.remove('serverInfo')
+        document.remove('executionTimeMillis')
+        document.remove('operationTime')
+        document.remove('$clusterTime')
+        document
+    }
+
+    static BsonDocument getKeyPattern(BsonDocument explainPlan) {
+        BsonDocument winningPlan = explainPlan.getDocument('queryPlanner').getDocument('winningPlan')
+        if (winningPlan.containsKey('inputStage')) {
+            return winningPlan.getDocument('inputStage').getDocument('keyPattern')
+        } else if (winningPlan.containsKey('shards')) {
+            return winningPlan.getArray('shards')[0].asDocument().getDocument('winningPlan')
+                    .getDocument('inputStage').getDocument('keyPattern')
+        }
+    }
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/RenameCollectionOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/RenameCollectionOperationSpecification.groovy
index 9b815c0306f..4f67f4dc9a3 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/RenameCollectionOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/RenameCollectionOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@ package com.mongodb.operation
 import category.Async
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoServerException
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcern
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
 import org.junit.experimental.categories.Category
@@ -27,7 +29,9 @@ import spock.lang.IgnoreIf
 
 import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.isSharded
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 
 @IgnoreIf( { isSharded() } )  // these tests don't reliably pass against mongos
 class RenameCollectionOperationSpecification extends OperationFunctionalSpecification {
@@ -90,6 +94,27 @@ class RenameCollectionOperationSpecification extends OperationFunctionalSpecific
         collectionNameExists(getCollectionName())
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error'() {
+        given:
+        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('documentThat', 'forces creation of the Collection'))
+        assert collectionNameExists(getCollectionName())
+        def operation = new RenameCollectionOperation(getNamespace(), new MongoNamespace(getDatabaseName(), 'newCollection'),
+                new WriteConcern(5))
+
+        when:
+        async ? executeAsync(operation) : operation.execute(getBinding())
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == 100
+        ex.writeResult.wasAcknowledged()
+
+        where:
+        async << [true, false]
+    }
+
+
     def collectionNameExists(String collectionName) {
         def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()).execute(getBinding())
         if (!cursor.hasNext()) {
diff --git a/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationForReplacementSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationForReplacementSpecification.groovy
index 96117d87308..cf807bc7b81 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationForReplacementSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationForReplacementSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package com.mongodb.operation
 
-import category.Async
 import category.Slow
-import com.mongodb.MongoException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.bulk.InsertRequest
 import com.mongodb.bulk.UpdateRequest
@@ -29,85 +27,53 @@ import org.bson.BsonSerializationException
 import org.bson.codecs.BsonDocumentCodec
 import org.junit.experimental.categories.Category
 
-import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.WriteConcern.ACKNOWLEDGED
 import static com.mongodb.bulk.WriteRequest.Type.REPLACE
 import static java.util.Arrays.asList
 
 class UpdateOperationForReplacementSpecification extends OperationFunctionalSpecification {
+
     def 'should return correct result'() {
         given:
         def replacement = new UpdateRequest(new BsonDocument(), new BsonDocument('_id', new BsonInt32(1)), REPLACE)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(replacement))
 
         when:
-        def result = op.execute(getBinding())
+        def result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
         result.count == 0
         result.upsertedId == null
         !result.isUpdateOfExisting()
-    }
-
-    @Category(Async)
-    def 'should return correct result asynchronously'() {
-        given:
-        def replacement = new UpdateRequest(new BsonDocument(), new BsonDocument('_id', new BsonInt32(1)), REPLACE)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
-
-        when:
-        def result = executeAsync(op)
 
-        then:
-        result.wasAcknowledged()
-        result.count == 0
-        result.upsertedId == null
-        !result.isUpdateOfExisting()
+        where:
+        async << [true, false]
     }
 
     def 'should replace a single document'() {
         given:
         def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert)).execute(getBinding())
+        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(insert)).execute(getBinding())
 
         def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                                             new BsonDocument('_id', new BsonInt32(1)).append('x', new BsonInt32(1)), REPLACE)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(replacement))
 
         when:
-        def result = op.execute(getBinding())
+        def result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
         result.count == 1
         result.upsertedId == null
         result.isUpdateOfExisting()
-        asList(replacement.getUpdate()) == getCollectionHelper().find(new BsonDocumentCodec())
+        asList(replacement.getUpdateValue()) == getCollectionHelper().find(new BsonDocumentCodec())
         getCollectionHelper().find().get(0).keySet().iterator().next() == '_id'
-    }
-
-    @Category(Async)
-    def 'should replace a single document asynchronously'() {
-        given:
-        def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert)).execute(getBinding())
-
-        def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                            new BsonDocument('_id', new BsonInt32(1)).append('x', new BsonInt32(1)), REPLACE)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
-
-
-        when:
-        def result = executeAsync(op)
 
-        then:
-        result.wasAcknowledged()
-        result.count == 1
-        result.upsertedId == null
-        result.isUpdateOfExisting()
-        asList(replacement.getUpdate()) == getCollectionHelper().find(new BsonDocumentCodec())
+        where:
+        async << [true, false]
     }
 
     def 'should upsert a single document'() {
@@ -115,27 +81,16 @@ class UpdateOperationForReplacementSpecification extends OperationFunctionalSpec
         def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                                             new BsonDocument('_id', new BsonInt32(1)).append('x', new BsonInt32(1)), REPLACE)
                 .upsert(true)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(replacement))
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
-        asList(replacement.getUpdate()) == getCollectionHelper().find(new BsonDocumentCodec())
-    }
-
-    def 'should upsert a single document asynchronously'() {
-        given:
-        def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                            new BsonDocument('_id', new BsonInt32(1)).append('x', new BsonInt32(1)), REPLACE)
-                .upsert(true)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
+        asList(replacement.getUpdateValue()) == getCollectionHelper().find(new BsonDocumentCodec())
 
-        when:
-        executeAsync(op)
-
-        then:
-        asList(replacement.getUpdate()) == getCollectionHelper().find(new BsonDocumentCodec())
+        where:
+        async << [true, false]
     }
 
     def 'should fail if replacement contains an update operator'() {
@@ -143,58 +98,52 @@ class UpdateOperationForReplacementSpecification extends OperationFunctionalSpec
         def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                                             new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))), REPLACE)
                 .upsert(true)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(replacement))
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(IllegalArgumentException)
+
+        where:
+        async << [true, false]
     }
 
     @Category(Slow)
     def 'should throw exception if document is too large'() {
         given:
-        byte[] hugeByteArray = new byte[1024 * 1024 * 16];
+        byte[] hugeByteArray = new byte[(1024 * 1024 * 16) + 16 * 1024]
         def replacements = [new UpdateRequest(new BsonDocument(),
                                               new BsonDocument('_id', new BsonInt32(1)).append('b', new BsonBinary(hugeByteArray)),
                                               REPLACE)]
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false, replacements)
 
         when:
-        new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, replacements).execute(getBinding())
+        execute(operation, async)
 
         then:
         thrown(BsonSerializationException)
-    }
-
-    @Category(Slow)
-    def 'should throw exception if document is too large asynchronously'() {
-        given:
-        byte[] hugeByteArray = new byte[1024 * 1024 * 16];
-        def replacements = [new UpdateRequest(new BsonDocument(),
-                                              new BsonDocument('_id', new BsonInt32(1)).append('b', new BsonBinary(hugeByteArray)),
-                                              REPLACE)]
-
-        when:
-        executeAsync(new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, replacements))
 
-        then:
-        def ex = thrown(MongoException)
-        ex.getCause() instanceof BsonSerializationException
+        where:
+        async << [true, false]
     }
 
     def 'should move _id to the beginning'() {
         def insert = new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(insert)).execute(getBinding())
+        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(insert)).execute(getBinding())
 
         def replacement = new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
                                             new BsonDocument('x', new BsonInt32(1)).append('_id', new BsonInt32(1)), REPLACE)
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, asList(replacement))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(replacement))
 
         when:
-        op.execute(getBinding())
+        execute(operation, async)
 
         then:
         getCollectionHelper().find().get(0).keySet() as List == ['_id', 'x']
+
+        where:
+        async << [true, false]
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationSpecification.groovy
index c9ca52d2fb2..0e507f01d43 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/UpdateOperationSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,12 @@
 
 package com.mongodb.operation
 
-import category.Async
 import category.Slow
+import com.mongodb.MongoClientException
+import com.mongodb.MongoException
 import com.mongodb.OperationFunctionalSpecification
+import com.mongodb.WriteConcernResult
 import com.mongodb.bulk.UpdateRequest
-import com.mongodb.bulk.WriteRequest
 import org.bson.BsonBinary
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -31,24 +32,31 @@ import org.bson.types.ObjectId
 import org.junit.experimental.categories.Category
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.executeAsync
-import static com.mongodb.ClusterFixture.getBinding
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
+import static com.mongodb.bulk.WriteRequest.Type.UPDATE
 import static java.util.Arrays.asList
 
 class UpdateOperationSpecification extends OperationFunctionalSpecification {
 
+    def 'should throw IllegalArgumentException for empty list of requests'() {
+        when:
+        new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false, [])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
     def 'should update nothing if no documents match'() {
         given:
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)),
-                                                              new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))),
-                                                              WriteRequest.Type.UPDATE)
-                                                    .multi(false)))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)),
+                        new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).multi(false)))
 
         when:
-        def result = op.execute(getBinding())
+        WriteConcernResult result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
@@ -56,6 +64,9 @@ class UpdateOperationSpecification extends OperationFunctionalSpecification {
         result.upsertedId == null
         !result.isUpdateOfExisting()
         getCollectionHelper().count() == 0
+
+        where:
+        async << [true, false]
     }
 
     def 'when multi is false should update one matching document'() {
@@ -63,13 +74,12 @@ class UpdateOperationSpecification extends OperationFunctionalSpecification {
         getCollectionHelper().insertDocuments(new DocumentCodec(),
                                               new Document('x', 1),
                                               new Document('x', 1))
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)),
-                                                              new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))),
-                                                              WriteRequest.Type.UPDATE)
-                                                    .multi(false)))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)),
+                        new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).multi(false)))
+
         when:
-        def result = op.execute(getBinding())
+        WriteConcernResult result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
@@ -77,6 +87,9 @@ class UpdateOperationSpecification extends OperationFunctionalSpecification {
         result.upsertedId == null
         result.isUpdateOfExisting()
         getCollectionHelper().count(new Document('y', 2)) == 1
+
+        where:
+        async << [true, false]
     }
 
     def 'when multi is true should update all matching documents'() {
@@ -84,13 +97,12 @@ class UpdateOperationSpecification extends OperationFunctionalSpecification {
         getCollectionHelper().insertDocuments(new DocumentCodec(),
                                               new Document('x', 1),
                                               new Document('x', 1))
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)),
-                                                              new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))),
-                                                              WriteRequest.Type.UPDATE)
-                                                    .multi(true)))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                asList(new UpdateRequest(new BsonDocument('x', new BsonInt32(1)),
+                        new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).multi(true)))
+
         when:
-        def result = op.execute(getBinding())
+        WriteConcernResult result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
@@ -98,39 +110,42 @@ class UpdateOperationSpecification extends OperationFunctionalSpecification {
         result.upsertedId == null
         result.isUpdateOfExisting()
         getCollectionHelper().count(new Document('y', 2)) == 2
+
+        where:
+        async << [true, false]
     }
 
     def 'when upsert is true should insert a document if there are no matching documents'() {
         given:
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                                              new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))),
-                                                              WriteRequest.Type.UPDATE)
-                                                    .upsert(true)))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                asList(new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
+                        new BsonDocument('$set', new BsonDocument('y', new BsonInt32(2))), UPDATE).upsert(true)))
+
         when:
-        def result = op.execute(getBinding())
+        WriteConcernResult result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
         result.count == 1
-        result.upsertedId == (serverVersionAtLeast(asList(2, 6, 0)) ? new BsonInt32(1) : null)
+        result.upsertedId == new BsonInt32(1)
         !result.isUpdateOfExisting()
         getCollectionHelper().count(new Document('y', 2)) == 1
+
+        where:
+        async << [true, false]
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
     @Category(Slow)
     def 'should allow update larger than 16MB'() {
         // small enough so the update document is 16MB, but enough to push the the request as a whole over 16MB
         def binary = new BsonBinary(new byte[16 * 1024 * 1024 - 24])
         given:
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                                              new BsonDocument('$set', new BsonDocument('y', binary)),
-                                                              WriteRequest.Type.UPDATE)
-                                                    .upsert(true)))
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                asList(new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
+                        new BsonDocument('$set', new BsonDocument('y', binary)), UPDATE).upsert(true)))
+
         when:
-        def result = op.execute(getBinding())
+        WriteConcernResult result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
@@ -138,104 +153,153 @@ class UpdateOperationSpecification extends OperationFunctionalSpecification {
         result.upsertedId == new BsonInt32(1)
         !result.isUpdateOfExisting()
         getCollectionHelper().count(new Document('_id', 1)) == 1
+
+        where:
+        async << [true, false]
     }
 
 
-    @Category(Async)
-    def 'should return correct result for update asynchronously'() {
+    def 'should return correct result for upsert'() {
         given:
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('_id', new BsonInt32(1)),
-                                                              new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))),
-                                                              WriteRequest.Type.UPDATE)))
+        def id = new ObjectId()
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                asList(new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
+                        new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))), UPDATE).upsert(true)))
 
         when:
-        def result = executeAsync(op)
+        WriteConcernResult result = execute(operation, async)
 
         then:
         result.wasAcknowledged()
-        result.count == 0
-        result.upsertedId == null
+        result.count == 1
+        result.upsertedId == new BsonObjectId(id)
         !result.isUpdateOfExisting()
 
+        where:
+        async << [true, false]
+    }
+
+    def 'when an update request document contains a non $-prefixed key, update should throw IllegalArgumentException'() {
+        given:
+        def operation = new UpdateOperation(getNamespace(), ordered, ACKNOWLEDGED, false,
+                [new UpdateRequest(new BsonDocument(), new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2)))
+                        .append('y', new BsonInt32(2)), UPDATE)])
+
         when:
-        getCollectionHelper().insertDocuments(new DocumentCodec(), new Document('_id', 1))
-        result = op.execute(getBinding())
+        execute(operation, async)
 
         then:
-        result.wasAcknowledged()
-        result.count == 1
-        result.upsertedId == null
-        result.isUpdateOfExisting()
+        def ex = thrown(Exception)
+        if (async) {
+            ex instanceof MongoException
+            ex.cause instanceof IllegalArgumentException
+        } else {
+            ex instanceof IllegalArgumentException
+        }
+
+        where:
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
-    def 'should return correct result for upsert'() {
+    def 'when an update document is empty, update should throw IllegalArgumentException'() {
         given:
-        def id = new ObjectId()
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
-                                                              new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))),
-                                                              WriteRequest.Type.UPDATE).
-                                                    upsert(true)))
+        def operation =  new UpdateOperation(getNamespace(), ordered, ACKNOWLEDGED, false,
+                [new UpdateRequest(new BsonDocument(), new BsonDocument(), UPDATE)])
 
         when:
-        def result = op.execute(getBinding())
+        execute(operation, async)
 
         then:
-        result.wasAcknowledged()
-        result.count == 1
-        result.upsertedId == new BsonObjectId(id)
-        !result.isUpdateOfExisting()
+        def ex = thrown(Exception)
+        if (async) {
+            ex instanceof MongoException
+            ex.cause instanceof IllegalArgumentException
+        } else {
+            ex instanceof IllegalArgumentException
+        }
+
+        where:
+        [async, ordered] << [[true, false], [true, false]].combinations()
     }
 
-    @Category(Async)
-    def 'should return correct result for upsert asynchronously'() {
+    @IgnoreIf({ serverVersionAtLeast(3, 4) })
+    def 'should throw an exception when using an unsupported Collation'() {
         given:
-        def id = new ObjectId()
-        def op = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED,
-                                     asList(new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
-                                                              new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))),
-                                                              WriteRequest.Type.UPDATE).
-                                                    upsert(true)))
+        def operation = new UpdateOperation(getNamespace(), false, ACKNOWLEDGED, false, requests)
 
         when:
-        def result = executeAsync(op)
+        execute(operation, async)
 
         then:
-        result.wasAcknowledged()
-        result.count == 1
-        result.upsertedId == new BsonObjectId(id)
-        !result.isUpdateOfExisting()
+        def exception = thrown(Exception)
+        exception instanceof IllegalArgumentException
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        [async, requests] << [
+                [true, false],
+                [[new UpdateRequest(new BsonDocument(), BsonDocument.parse('{$set: {x: 1}}'), UPDATE)
+                         .collation(defaultCollation)],
+                 [new UpdateRequest(new BsonDocument(), BsonDocument.parse('{$set: {y: 1}}'), UPDATE),
+                  new UpdateRequest(new BsonDocument(), BsonDocument.parse('{$set: {a: 1}}'), UPDATE)
+                          .collation(defaultCollation)]]
+        ].combinations()
     }
 
-    def 'when an update request document contains a non $-prefixed key, update should throw IllegalArgumentException'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        given:
+        getCollectionHelper().insertDocuments(Document.parse('{str: "foo"}'))
+        def requests = [new UpdateRequest(BsonDocument.parse('{str: "FOO"}}'), BsonDocument.parse('{$set: {str: "bar"}}'), UPDATE)
+                                .collation(caseInsensitiveCollation)]
+        def operation = new UpdateOperation(getNamespace(), false, ACKNOWLEDGED, false, requests)
+
         when:
-        new UpdateOperation(getNamespace(), ordered, ACKNOWLEDGED,
-                            [new UpdateRequest(new BsonDocument(),
-                                               new BsonDocument('$set', new BsonDocument('x', new BsonInt32(2)))
-                                                       .append('y', new BsonInt32(2)), WriteRequest.Type.UPDATE)])
-                .execute(getBinding())
+        WriteConcernResult result = execute(operation, async)
 
         then:
-        thrown(IllegalArgumentException)
+        result.getCount() == 1
 
         where:
-        ordered << [true, false]
+        async << [true, false]
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should throw if collation is set and write is unacknowledged'() {
+        given:
+        def requests = [new UpdateRequest(BsonDocument.parse('{str: "FOO"}}'), BsonDocument.parse('{$set: {str: "bar"}}'), UPDATE)
+                                .collation(caseInsensitiveCollation)]
+        def operation = new UpdateOperation(getNamespace(), false, UNACKNOWLEDGED, false, requests)
 
-    def 'when an update document is empty, update should throw IllegalArgumentException'() {
         when:
-        new UpdateOperation(getNamespace(), ordered, ACKNOWLEDGED,
-                [new UpdateRequest(new BsonDocument(),
-                        new BsonDocument(), WriteRequest.Type.UPDATE)])
-                .execute(getBinding())
+        execute(operation, async)
 
         then:
-        thrown(IllegalArgumentException)
+        thrown(MongoClientException)
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isDiscoverableReplicaSet() })
+    def 'should support retryable writes'() {
+        given:
+        def id = new ObjectId()
+        def operation = new UpdateOperation(getNamespace(), true, ACKNOWLEDGED, true,
+                asList(new UpdateRequest(new BsonDocument('_id', new BsonObjectId(id)),
+                        new BsonDocument('$set', new BsonDocument('x', new BsonInt32(1))), UPDATE).upsert(true)))
+
+        when:
+        WriteConcernResult result = executeWithSession(operation, async)
+
+        then:
+        result.wasAcknowledged()
+        result.count == 1
+        result.upsertedId == new BsonObjectId(id)
+        !result.isUpdateOfExisting()
 
         where:
-        ordered << [true, false]
+        async << [true, false]
     }
 
 }
diff --git a/driver-core/src/test/functional/com/mongodb/operation/UserOperationsSpecification.groovy b/driver-core/src/test/functional/com/mongodb/operation/UserOperationsSpecification.groovy
index 585c4dc5a1e..91f51f007b6 100644
--- a/driver-core/src/test/functional/com/mongodb/operation/UserOperationsSpecification.groovy
+++ b/driver-core/src/test/functional/com/mongodb/operation/UserOperationsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,15 @@
 
 package com.mongodb.operation
 
-import category.Async
 import category.Slow
 import com.mongodb.MongoCredential
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoSecurityException
 import com.mongodb.MongoServerException
-import com.mongodb.MongoTimeoutException
+import com.mongodb.MongoWriteConcernException
 import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.ReadPreference
+import com.mongodb.WriteConcern
 import com.mongodb.async.SingleResultCallback
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.binding.AsyncReadBinding
@@ -42,7 +43,7 @@ import com.mongodb.connection.ServerVersion
 import com.mongodb.connection.SocketSettings
 import com.mongodb.connection.SocketStreamFactory
 import com.mongodb.connection.StreamFactory
-import com.mongodb.internal.validator.NoOpFieldNameValidator
+import com.mongodb.internal.connection.NoOpSessionContext
 import com.mongodb.selector.WritableServerSelector
 import org.bson.BsonDocument
 import org.bson.BsonInt32
@@ -52,14 +53,15 @@ import spock.lang.IgnoreIf
 
 import java.util.concurrent.TimeUnit
 
-import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getAsyncBinding
 import static com.mongodb.ClusterFixture.getAsyncStreamFactory
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.getPrimary
 import static com.mongodb.ClusterFixture.getSslSettings
 import static com.mongodb.ClusterFixture.isAuthenticated
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.isSharded
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.MongoCredential.createCredential
 import static com.mongodb.WriteConcern.ACKNOWLEDGED
 import static java.util.Arrays.asList
@@ -68,112 +70,83 @@ class UserOperationsSpecification extends OperationFunctionalSpecification {
     def credential = createCredential('\u53f0\u5317', databaseName, 'Ta\u0301ibe\u030Ci'.toCharArray())
 
     def 'an added user should be found'() {
-        given:
-        new CreateUserOperation(credential, true).execute(getBinding())
-
         when:
-        def found = new UserExistsOperation(databaseName, credential.userName).execute(getBinding())
+        execute(new CreateUserOperation(credential, true), async)
 
         then:
-        found
+        execute(new UserExistsOperation(databaseName, credential.userName), async)
 
         cleanup:
-        new DropUserOperation(databaseName, credential.userName).execute(getBinding())
-    }
-
-    @Category(Async)
-    def 'an added user should be found asynchronously'() {
-        given:
-        executeAsync(new CreateUserOperation(credential, true))
-
-        when:
-        def found = executeAsync(new UserExistsOperation(databaseName, credential.userName))
+        execute(new DropUserOperation(databaseName, credential.userName), async)
 
-        then:
-        found
-
-        cleanup:
-        executeAsync(new DropUserOperation(databaseName, credential.userName))
+        where:
+        async << [true, false]
     }
 
     def 'an added user should authenticate'() {
-        given:
-        new CreateUserOperation(credential, true).execute(getBinding())
-        def cluster = getCluster()
-
         when:
+        execute(new CreateUserOperation(credential, true), async)
+        def cluster = getCluster()
         def server = cluster.selectServer(new WritableServerSelector())
         def connection = server.getConnection()
-        testConnection(connection)
 
         then:
-        connection
+        !testConnection(connection).isEmpty()
 
         cleanup:
         connection?.release()
-        new DropUserOperation(databaseName, credential.userName).execute(getBinding())
+        execute(new DropUserOperation(databaseName, credential.userName), async)
         cluster?.close()
+
+        where:
+        async << [true, false]
     }
 
-    @Category(Async)
-    def 'an added user should authenticate asynchronously'() {
+    def 'should handle user not found'() {
         given:
-        executeAsync(new CreateUserOperation(credential, true))
-        def cluster = getCluster()
+        def credential = createCredential('user', databaseName, 'pencil' as char[])
+        def cluster = getCluster(credential, ClusterSettings.builder().serverSelectionTimeout(1, TimeUnit.SECONDS))
+        def server = cluster.selectServer(new WritableServerSelector())
 
         when:
-        def server = cluster.selectServer(new WritableServerSelector())
-        def connection = server.getConnection()
-        testConnection(connection)
+        server.getConnection()
 
         then:
-        connection
+        thrown(MongoSecurityException)
 
         cleanup:
-        connection?.release()
         cluster?.close()
-        executeAsync(new DropUserOperation(databaseName, credential.userName))
+
+        where:
+        async << [true, false]
     }
 
     @Category(Slow)
     def 'a removed user should not authenticate'() {
         given:
-        new CreateUserOperation(credential, true).execute(getBinding())
-        new DropUserOperation(databaseName, credential.userName).execute(getBinding())
+        execute(new CreateUserOperation(credential, true), async)
+        execute(new DropUserOperation(databaseName, credential.userName), async)
         def cluster = getCluster(ClusterSettings.builder().serverSelectionTimeout(1, TimeUnit.SECONDS))
+        def server = cluster.selectServer(new WritableServerSelector())
 
         when:
-        cluster.selectServer(new WritableServerSelector())
+        server.getConnection()
 
         then:
-        thrown(MongoTimeoutException)
+        thrown(MongoSecurityException)
 
         cleanup:
         cluster?.close()
-    }
-
-    @Category([Async, Slow])
-    def 'a removed user should not authenticate asynchronously'() {
-        given:
-        executeAsync(new CreateUserOperation(credential, true))
-        executeAsync(new DropUserOperation(databaseName, credential.userName))
-        def cluster = getCluster(ClusterSettings.builder().serverSelectionTimeout(1, TimeUnit.SECONDS))
 
-        when:
-        cluster.selectServer(new WritableServerSelector())
-
-        then:
-        thrown(MongoTimeoutException)
-
-        cleanup:
-        cluster?.close()
+        where:
+        async << [true, false]
     }
 
     def 'a replaced user should authenticate with its new password'() {
         given:
-        new CreateUserOperation(credential, true).execute(getBinding())
+        execute(new CreateUserOperation(credential, true), async)
         def newCredentials = createCredential(credential.userName, credential.source, '234'.toCharArray())
-        new UpdateUserOperation(newCredentials, true).execute(getBinding())
+                execute(new UpdateUserOperation(newCredentials, true), async)
         def cluster = getCluster(newCredentials)
 
         when:
@@ -187,138 +160,140 @@ class UserOperationsSpecification extends OperationFunctionalSpecification {
         cleanup:
         connection?.release()
         cluster?.close()
-        new DropUserOperation(databaseName, credential.userName).execute(getBinding())
-    }
-
-    @Category(Async)
-    def 'a replaced user should authenticate with its new password asynchronously'() {
-        given:
-        executeAsync(new CreateUserOperation(credential, true))
-        def newCredentials = createCredential(credential.userName, credential.source, '234'.toCharArray())
-        executeAsync(new UpdateUserOperation(newCredentials, true))
-        def cluster = getAsyncCluster(newCredentials)
-
-        when:
-        def server = cluster.selectServer(new WritableServerSelector())
-        def connection = server.getConnection()
-        testConnection(connection)
-
-        then:
-        connection
+        execute(new DropUserOperation(databaseName, credential.userName), async)
 
-        cleanup:
-        connection?.release()
-        cluster?.close()
-        executeAsync(new DropUserOperation(databaseName, credential.userName))
+        where:
+        async << [true, false]
     }
 
     def 'a read write user should be able to write'() {
-        given:
-        new CreateUserOperation(credential, false).execute(getBinding())
-        def cluster = getCluster()
-
         when:
-        def result = new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())))
-                .execute(getBinding(cluster))
-        then:
-        result.getCount() == 0
-
-        cleanup:
-        new DropUserOperation(databaseName, credential.userName).execute(getBinding(cluster))
-        cluster?.close()
-    }
+        execute(new CreateUserOperation(credential, false), async)
+        def cluster = async ? getAsyncCluster() : getCluster()
+        def binding = async ? getAsyncBinding(cluster) : getBinding(cluster)
 
-    @Category(Async)
-    def 'a read write user should be able to write asynchronously'() {
-        given:
-        executeAsync(new CreateUserOperation(credential, false))
-        def cluster = getAsyncCluster()
-
-        when:
-        def result = executeAsync(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument()))),
-                                  getAsyncBinding(cluster))
         then:
-        result.getCount() == 0
+        execute(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(new InsertRequest(new BsonDocument()))),
+                binding).getCount() == 0
 
         cleanup:
-        executeAsync(new DropUserOperation(databaseName, credential.userName))
+        execute(new DropUserOperation(databaseName, credential.userName), async)
         cluster?.close()
+
+        where:
+        async << [true, false]
     }
 
     @IgnoreIf({ !isAuthenticated() || isSharded()  })
     def 'a read only user should not be able to write'() {
         given:
-        new CreateUserOperation(credential, true).execute(getBinding())
+        execute(new CreateUserOperation(credential, true), async)
         def cluster = getCluster(credential)
 
         when:
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED,
-                            asList(new InsertRequest(new BsonDocument()))).execute(getBinding(cluster))
+        new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false,
+                asList(new InsertRequest(new BsonDocument()))).execute(getBinding(cluster))
 
         then:
         thrown(MongoServerException)
 
         cleanup:
-        new DropUserOperation(databaseName, credential.userName).execute(getBinding())
+        execute(new DropUserOperation(databaseName, credential.userName), async)
         cluster?.close()
+
+        where:
+        async << [true, false]
     }
 
     @IgnoreIf({ !isAuthenticated() })
     def 'a read write admin user should be able to write to a different database'() {
         given:
-        def rwCredential = createCredential('jeff-rw-admin', 'admin', '123'.toCharArray());
-        new CreateUserOperation(rwCredential, false).execute(getBinding())
-        def cluster = getCluster(rwCredential)
+        def rwCredential = createCredential('jeff-rw-admin', 'admin', '123'.toCharArray())
+        execute(new CreateUserOperation(rwCredential, false), async)
+        def cluster = async ? getAsyncCluster(rwCredential) : getCluster(rwCredential)
+        def binding = async ? getAsyncBinding(cluster) : getBinding(cluster)
 
         when:
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED,
-                            asList(new InsertRequest(new BsonDocument()))).execute(getBinding(cluster))
+        execute(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(new InsertRequest(new BsonDocument()))), binding)
 
         then:
-        new CountOperation(getNamespace()).execute(getBinding(cluster)) == 1L
+        execute(new CountOperation(getNamespace()), binding) == 1L
 
         cleanup:
-        new DropUserOperation('admin', rwCredential.userName).execute(getBinding())
+        execute(new DropUserOperation('admin', rwCredential.userName), async)
         cluster?.close()
+
+        where:
+        async << [true, false]
     }
 
     @IgnoreIf({ !isAuthenticated() || isSharded() })
     def 'a read only admin user should not be able to write to a different database'() {
         given:
-        def roCredential = createCredential('jeff-ro-admin', 'admin', '123'.toCharArray());
-        new CreateUserOperation(roCredential, true).execute(getBinding())
-        def cluster = getCluster(roCredential)
+        def roCredential = createCredential('jeff-ro-admin', 'admin', '123'.toCharArray())
+        execute(new CreateUserOperation(roCredential, true), async)
+        def cluster = async ? getAsyncCluster(roCredential) : getCluster(roCredential)
+        def binding = async ? getAsyncBinding(cluster) : getBinding(cluster)
 
         when:
-        new InsertOperation(getNamespace(), true, ACKNOWLEDGED,
-                            asList(new InsertRequest(new BsonDocument()))).execute(getBinding(cluster))
+        execute(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, asList(new InsertRequest(new BsonDocument()))), binding)
 
         then:
         thrown(MongoServerException)
 
         cleanup:
-        new DropUserOperation('admin', roCredential.userName).execute(getBinding())
+        execute(new DropUserOperation('admin', roCredential.userName), async)
         cluster?.close()
+
+        where:
+        async << [true, false]
     }
 
     @IgnoreIf({ !isAuthenticated() })
     def 'a read only admin user should be able to read from a different database'() {
-        given:
-        def roCredential = createCredential('jeff-ro-admin', 'admin', '123'.toCharArray());
-        new CreateUserOperation(roCredential, true).execute(getBinding())
-        def cluster = getCluster(roCredential)
-
         when:
-        def count = new CountOperation(getNamespace()).execute(getBinding())
+        def roCredential = createCredential('jeff-ro-admin', 'admin', '123'.toCharArray())
+        execute(new CreateUserOperation(roCredential, true), async)
+        def cluster = async ? getAsyncCluster(roCredential) : getCluster(roCredential)
+        def binding = async ? getAsyncBinding(cluster) : getBinding(cluster)
 
         then:
-        count == 0L
+        execute(new CountOperation(getNamespace()), binding) == 0L
 
         cleanup:
-        new DropUserOperation('admin', roCredential.userName).execute(getBinding())
+        execute(new DropUserOperation('admin', roCredential.userName), async)
         cluster?.close()
+
+        where:
+        async << [true, false]
     }
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw on write concern error when creating a user'() {
+        given:
+        def operation = new CreateUserOperation(credential, false, new WriteConcern(5))
+
+        when:
+        execute(operation, async)
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.code == 100
+
+        when:
+        operation = new UpdateUserOperation(credential, true, new WriteConcern(5))
+        execute(operation, async)
+
+        then:
+        ex = thrown(MongoWriteConcernException)
+        ex.code == 100
+
+        cleanup:
+        execute(new DropUserOperation(databaseName, credential.userName), async)
+
+        where:
+        async << [true, false]
+    }
 
     def 'should use the ReadBindings readPreference to set slaveOK'() {
         given:
@@ -335,17 +310,9 @@ class UserOperationsSpecification extends OperationFunctionalSpecification {
         when:
         operation.execute(readBinding)
 
-        then:
-        _ * connection.getDescription() >> helper.twoFourConnectionDescription
-        1 * connection.query(_, _, _, _, _, _, readPreference.isSlaveOk(), _, _, _, _, _, _) >>  helper.queryResult
-        1 * connection.release()
-
-        when: '2.6.0'
-        operation.execute(readBinding)
-
         then:
         _ * connection.getDescription() >> helper.twoSixConnectionDescription
-        1 * connection.command(helper.dbName, _, readPreference.isSlaveOk(), _, _) >> helper.cursorResult
+        1 * connection.command(helper.dbName, _, _, readPreference, _, _) >> helper.cursorResult
 
         where:
         readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
@@ -366,18 +333,10 @@ class UserOperationsSpecification extends OperationFunctionalSpecification {
         when:
         operation.executeAsync(readBinding, Stub(SingleResultCallback))
 
-        then:
-        _ * connection.getDescription() >> helper.twoFourConnectionDescription
-        1 * connection.queryAsync(_, _, _, _, _, _, readPreference.isSlaveOk(), _, _, _, _, _, _, _) >> {
-            it[13].onResult(helper.queryResult, null) }
-
-        when: '2.6.0'
-        operation.executeAsync(readBinding, Stub(SingleResultCallback))
-
         then:
         _ * connection.getDescription() >> helper.twoSixConnectionDescription
-        1 * connection.commandAsync(helper.dbName, _, readPreference.isSlaveOk(), _, _, _) >> {
-            it[5].onResult(helper.cursorResult, null) }
+        1 * connection.commandAsync(helper.dbName, _, _, readPreference, _, _, _) >> {
+            it[6].onResult(helper.cursorResult, null) }
 
         where:
         readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
@@ -386,9 +345,6 @@ class UserOperationsSpecification extends OperationFunctionalSpecification {
     def helper = [
             dbName: 'db',
             namespace: new MongoNamespace('db', 'coll'),
-            twoFourConnectionDescription: Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([2, 4, 0])
-            },
             twoSixConnectionDescription : Stub(ConnectionDescription) {
                 getServerVersion() >> new ServerVersion([2, 6, 0])
             },
@@ -421,14 +377,14 @@ class UserOperationsSpecification extends OperationFunctionalSpecification {
     }
 
     def getCluster(MongoCredential credential, StreamFactory streamFactory, ClusterSettings.Builder builder) {
-        new DefaultClusterFactory().create(builder.hosts(asList(getPrimary())).build(),
+        new DefaultClusterFactory().createCluster(builder.hosts(asList(getPrimary())).build(),
                                            ServerSettings.builder().build(),
                                            ConnectionPoolSettings.builder().maxSize(1).maxWaitQueueSize(1).build(),
-                                           streamFactory, streamFactory, asList(credential), null, null, null)
+                                           streamFactory, streamFactory, asList(credential), null, null, null, [])
     }
 
     def testConnection(Connection connection) {
-        connection.command('admin', new BsonDocument('ismaster', new BsonInt32(1)), false, new NoOpFieldNameValidator(),
-                           new BsonDocumentCodec())
+        connection.command('admin', new BsonDocument('ismaster', new BsonInt32(1)), NO_OP_FIELD_NAME_VALIDATOR,
+                ReadPreference.primaryPreferred(), new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
     }
 }
diff --git a/driver-core/src/test/resources/auth/connection-string.json b/driver-core/src/test/resources/auth/connection-string.json
new file mode 100644
index 00000000000..6ae9491d610
--- /dev/null
+++ b/driver-core/src/test/resources/auth/connection-string.json
@@ -0,0 +1,452 @@
+{
+  "tests": [
+    {
+      "description": "should use the default source and mechanism",
+      "uri": "mongodb://user:password@localhost",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "should use the database when no authSource is specified",
+      "uri": "mongodb://user:password@localhost/foo",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "foo"
+      },
+      "options": null
+    },
+    {
+      "description": "should use the authSource when specified",
+      "uri": "mongodb://user:password@localhost/foo?authSource=bar",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "bar"
+      },
+      "options": null
+    },
+    {
+      "description": "should recognise the mechanism (GSSAPI)",
+      "uri": "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user@DOMAIN.COM",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "GSSAPI"
+      }
+    },
+    {
+      "description": "should ignore the database (GSSAPI)",
+      "uri": "mongodb://user%40DOMAIN.COM@localhost/foo?authMechanism=GSSAPI",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user@DOMAIN.COM",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "GSSAPI"
+      }
+    },
+    {
+      "description": "should accept valid authSource (GSSAPI)",
+      "uri": "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI&authSource=$external",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user@DOMAIN.COM",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "GSSAPI"
+      }
+    },
+    {
+      "description": "should accept generic mechanism property (GSSAPI)",
+      "uri": "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user@DOMAIN.COM",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "GSSAPI",
+        "authmechanismproperties": {
+          "SERVICE_NAME": "other",
+          "CANONICALIZE_HOST_NAME": true
+        }
+      }
+    },
+    {
+      "description": "should accept the password (GSSAPI)",
+      "uri": "mongodb://user%40DOMAIN.COM:password@localhost/?authMechanism=GSSAPI&authSource=$external",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user@DOMAIN.COM",
+        "password": "password",
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "GSSAPI"
+      }
+    },
+    {
+      "description": "may support deprecated gssapiServiceName option (GSSAPI)",
+      "uri": "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI&gssapiServiceName=other",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user@DOMAIN.COM",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "GSSAPI",
+        "authmechanismproperties": {
+          "SERVICE_NAME": "other"
+        }
+      }
+    },
+    {
+      "description": "should throw an exception if authSource is invalid (GSSAPI)",
+      "uri": "mongodb://user%40DOMAIN.COM@localhost/?authMechanism=GSSAPI&authSource=foo",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "should throw an exception if no username (GSSAPI)",
+      "uri": "mongodb://localhost/?authMechanism=GSSAPI",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "should recognize the mechanism (MONGODB-CR)",
+      "uri": "mongodb://user:password@localhost/?authMechanism=MONGODB-CR",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "admin"
+      },
+      "options": {
+        "authmechanism": "MONGODB-CR"
+      }
+    },
+    {
+      "description": "should use the database when no authSource is specified (MONGODB-CR)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "foo"
+      },
+      "options": {
+        "authmechanism": "MONGODB-CR"
+      }
+    },
+    {
+      "description": "should use the authSource when specified (MONGODB-CR)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR&authSource=bar",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "bar"
+      },
+      "options": {
+        "authmechanism": "MONGODB-CR"
+      }
+    },
+    {
+      "description": "should throw an exception if no username is supplied (MONGODB-CR)",
+      "uri": "mongodb://localhost/?authMechanism=MONGODB-CR",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "should recognize the mechanism (MONGODB-X509)",
+      "uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "MONGODB-X509"
+      }
+    },
+    {
+      "description": "should ignore the database (MONGODB-X509)",
+      "uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/foo?authMechanism=MONGODB-X509",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "MONGODB-X509"
+      }
+    },
+    {
+      "description": "should accept valid authSource (MONGODB-X509)",
+      "uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509&authSource=$external",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry",
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "MONGODB-X509"
+      }
+    },
+    {
+      "description": "should recognize the mechanism with no username (MONGODB-X509)",
+      "uri": "mongodb://localhost/?authMechanism=MONGODB-X509",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "MONGODB-X509"
+      }
+    },
+    {
+      "description": "should throw an exception if supplied a password (MONGODB-X509)",
+      "uri": "mongodb://user:password@localhost/?authMechanism=MONGODB-X509",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "should throw an exception if authSource is invalid (MONGODB-X509)",
+      "uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/foo?authMechanism=MONGODB-X509&authSource=bar",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "should recognize the mechanism (PLAIN)",
+      "uri": "mongodb://user:password@localhost/?authMechanism=PLAIN",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "$external"
+      },
+      "options": {
+        "authmechanism": "PLAIN"
+      }
+    },
+    {
+      "description": "should use the database when no authSource is specified (PLAIN)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=PLAIN",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "foo"
+      },
+      "options": {
+        "authmechanism": "PLAIN"
+      }
+    },
+    {
+      "description": "should use the authSource when specified (PLAIN)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=PLAIN&authSource=bar",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "bar"
+      },
+      "options": {
+        "authmechanism": "PLAIN"
+      }
+    },
+    {
+      "description": "should throw an exception if no username (PLAIN)",
+      "uri": "mongodb://localhost/?authMechanism=PLAIN",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "should recognize the mechanism (SCRAM-SHA-1)",
+      "uri": "mongodb://user:password@localhost/?authMechanism=SCRAM-SHA-1",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "admin"
+      },
+      "options": {
+        "authmechanism": "SCRAM-SHA-1"
+      }
+    },
+    {
+      "description": "should use the database when no authSource is specified (SCRAM-SHA-1)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-1",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "foo"
+      },
+      "options": {
+        "authmechanism": "SCRAM-SHA-1"
+      }
+    },
+    {
+      "description": "should accept valid authSource (SCRAM-SHA-1)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-1&authSource=bar",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "bar"
+      },
+      "options": {
+        "authmechanism": "SCRAM-SHA-1"
+      }
+    },
+    {
+      "description": "should throw an exception if no username (SCRAM-SHA-1)",
+      "uri": "mongodb://localhost/?authMechanism=SCRAM-SHA-1",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "should recognize the mechanism (SCRAM-SHA-256)",
+      "uri": "mongodb://user:password@localhost/?authMechanism=SCRAM-SHA-256",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "admin"
+      },
+      "options": {
+        "authmechanism": "SCRAM-SHA-256"
+      }
+    },
+    {
+      "description": "should use the database when no authSource is specified (SCRAM-SHA-256)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-256",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "foo"
+      },
+      "options": {
+        "authmechanism": "SCRAM-SHA-256"
+      }
+    },
+    {
+      "description": "should accept valid authSource (SCRAM-SHA-256)",
+      "uri": "mongodb://user:password@localhost/foo?authMechanism=SCRAM-SHA-256&authSource=bar",
+      "hosts": null,
+      "valid": true,
+      "warning": false,
+      "auth": {
+        "username": "user",
+        "password": "password",
+        "db": "bar"
+      },
+      "options": {
+        "authmechanism": "SCRAM-SHA-256"
+      }
+    },
+    {
+      "description": "should throw an exception if no username (SCRAM-SHA-256)",
+      "uri": "mongodb://localhost/?authMechanism=SCRAM-SHA-256",
+      "hosts": null,
+      "valid": false,
+      "warning": false,
+      "auth": null,
+      "options": null
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/change-streams/README.rst b/driver-core/src/test/resources/change-streams/README.rst
new file mode 100644
index 00000000000..0e84416b23b
--- /dev/null
+++ b/driver-core/src/test/resources/change-streams/README.rst
@@ -0,0 +1,161 @@
+.. role:: javascript(code)
+  :language: javascript
+
+==============
+Change Streams
+==============
+
+.. contents::
+
+--------
+
+Introduction
+============
+
+The YAML and JSON files in this directory are platform-independent tests that
+drivers can use to prove their conformance to the Change Streams Spec.
+
+Several prose tests, which are not easily expressed in YAML, are also presented
+in this file. Those tests will need to be manually implemented by each driver.
+
+Spec Test Format
+================
+
+Each YAML file has the following keys:
+
+- ``database_name``: The default database
+- ``collection_name``: The default collection
+- ``database2_name``: Another database
+- ``collection2_name``: Another collection
+- ``tests``: An array of tests that are to be run independently of each other.
+  Each test will have some of the following fields:
+
+  - ``description``: The name of the test.
+  - ``minServerVersion``: The minimum server version to run this test against. If not present, assume there is no minimum server version.
+  - ``maxServerVersion``: Reserved for later use
+  - ``failPoint``(optional): The configureFailPoint command document to run to configure a fail point on the primary server.
+  - ``target``: The entity on which to run the change stream. Valid values are:
+  
+    - ``collection``: Watch changes on collection ``database_name.collection_name``
+    - ``database``: Watch changes on database ``database_name``
+    - ``client``: Watch changes on entire clusters
+  - ``topology``: An array of server topologies against which to run the test.
+    Valid topologies are ``single``, ``replicaset``, and ``sharded``.
+  - ``changeStreamPipeline``: An array of additional aggregation pipeline stages to add to the change stream
+  - ``changeStreamOptions``: Additional options to add to the changeStream
+  - ``operations``: Array of documents, each describing an operation. Each document has the following fields:
+
+    - ``database``: Database against which to run the operation
+    - ``collection``: Collection against which to run the operation
+    - ``name``: Name of the command to run
+    - ``arguments`` (optional): Object of arguments for the command (ex: document to insert)
+
+  - ``expectations``: Optional list of command-started events in Extended JSON format
+  - ``result``: Document with ONE of the following fields:
+
+    - ``error``: Describes an error received during the test
+    - ``success``: An Extended JSON array of documents expected to be received from the changeStream
+
+Spec Test Match Function
+========================
+
+The definition of MATCH or MATCHES in the Spec Test Runner is as follows:
+
+- MATCH takes two values, ``expected`` and ``actual``
+- Notation is "Assert [actual] MATCHES [expected]
+- Assertion passes if ``expected`` is a subset of ``actual``, with the values ``42`` and ``"42"`` acting as placeholders for "any value"
+
+Pseudocode implementation of ``actual`` MATCHES ``expected``:
+
+::
+  
+  If expected is "42" or 42:
+    Assert that actual exists (is not null or undefined)
+  Else:
+    Assert that actual is of the same JSON type as expected
+    If expected is a JSON array:
+      For every idx/value in expected:
+        Assert that actual[idx] MATCHES value
+    Else if expected is a JSON object:
+      For every key/value in expected
+        Assert that actual[key] MATCHES value
+    Else:
+      Assert that expected equals actual
+
+The expected values for ``result.success`` and ``expectations`` are written in Extended JSON. Drivers may adopt any of the following approaches to comparisons, as long as they are consistent:
+
+- Convert ``actual`` to Extended JSON and compare to ``expected``
+- Convert ``expected`` and ``actual`` to BSON, and compare them
+- Convert ``expected`` and ``actual`` to native equivalents of JSON, and compare them
+
+Spec Test Runner
+================
+
+Before running the tests
+
+- Create a MongoClient ``globalClient``, and connect to the server
+
+For each YAML file, for each element in ``tests``:
+
+- If ``topology`` does not include the topology of the server instance(s), skip this test.
+- Use ``globalClient`` to
+
+  - Drop the database ``database_name``
+  - Drop the database ``database2_name``
+  - Create the database ``database_name`` and the collection ``database_name.collection_name``
+  - Create the database ``database2_name`` and the collection ``database2_name.collection2_name``
+  - If the the ``failPoint`` field is present, configure the fail point on the primary server. See
+    `Server Fail Point <../../transactions/tests#server-fail-point>`_ in the
+    Transactions spec test documentation for more information.
+
+- Create a new MongoClient ``client``
+- Begin monitoring all APM events for ``client``. (If the driver uses global listeners, filter out all events that do not originate with ``client``). Filter out any "internal" commands (e.g. ``isMaster``)
+- Using ``client``, create a changeStream ``changeStream`` against the specified ``target``. Use ``changeStreamPipeline`` and ``changeStreamOptions`` if they are non-empty
+- Using ``globalClient``, run every operation in ``operations`` in serial against the server
+- Wait until either:
+
+  - An error occurs
+  - All operations have been successful AND the changeStream has received as many changes as there are in ``result.success``
+
+- Close ``changeStream``
+- If there was an error:
+
+  - Assert that an error was expected for the test.
+  - Assert that the error MATCHES ``result.error``
+
+- Else:
+
+  - Assert that no error was expected for the test
+  - Assert that the changes received from ``changeStream`` MATCH the results in ``result.success``
+
+- If there are any ``expectations``
+
+  - For each (``expected``, ``idx``) in ``expectations``
+
+    - Assert that ``actual[idx]`` MATCHES ``expected``
+
+- Close the MongoClient ``client``
+
+After running all tests
+
+- Close the MongoClient ``globalClient``
+- Drop database ``database_name``
+- Drop database ``database2_name``
+
+
+Prose Tests
+===========
+
+The following tests have not yet been automated, but MUST still be tested
+
+#. ``ChangeStream`` must continuously track the last seen ``resumeToken``
+#. ``ChangeStream`` will throw an exception if the server response is missing the resume token
+#. ``ChangeStream`` will automatically resume one time on a resumable error (including `not master`) with the initial pipeline and options, except for the addition/update of a ``resumeToken``.
+#. ``ChangeStream`` will not attempt to resume on any error encountered while executing an ``aggregate`` command.
+#. ``ChangeStream`` will not attempt to resume after encountering error code 11601 (Interrupted), 136 (CappedPositionLost), or 237 (CursorKilled) while executing a ``getMore`` command.
+#. ``ChangeStream`` will perform server selection before attempting to resume, using initial ``readPreference``
+#. Ensure that a cursor returned from an aggregate command with a cursor id and an initial empty batch is not closed on the driver side.
+#. The ``killCursors`` command sent during the "Resume Process" must not be allowed to throw an exception.
+#. ``$changeStream`` stage for ``ChangeStream`` against a server ``>=4.0`` that has not received any results yet MUST include a ``startAtOperationTime`` option when resuming a changestream.
+#. ``ChangeStream`` will resume after a ``killCursors`` command is issued for its child cursor.
+
diff --git a/driver-core/src/test/resources/change-streams/change-streams-errors.json b/driver-core/src/test/resources/change-streams/change-streams-errors.json
new file mode 100644
index 00000000000..00f51eb47ec
--- /dev/null
+++ b/driver-core/src/test/resources/change-streams/change-streams-errors.json
@@ -0,0 +1,113 @@
+{
+  "collection_name": "test",
+  "database_name": "change-stream-tests",
+  "collection2_name": "test2",
+  "database2_name": "change-stream-tests-2",
+  "tests": [
+    {
+      "description": "The watch helper must not throw a custom exception when executed against a single server topology, but instead depend on a server error",
+      "minServerVersion": "3.6.0",
+      "target": "collection",
+      "topology": [
+        "single"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [],
+      "expectations": [],
+      "result": {
+        "error": {
+          "code": 40573
+        }
+      }
+    },
+    {
+      "description": "Change Stream should error when an invalid aggregation stage is passed in",
+      "minServerVersion": "3.6.0",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [
+        {
+          "$unsupported": "foo"
+        }
+      ],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {}
+                },
+                {
+                  "$unsupported": "foo"
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "error": {
+          "code": 40324
+        }
+      }
+    },
+    {
+      "description": "Change Stream should error when _id is projected out",
+      "minServerVersion": "4.1.11",
+      "target": "collection",
+      "topology": [
+        "replicaset",
+        "sharded"
+      ],
+      "changeStreamPipeline": [
+        {
+          "$project": {
+            "_id": 0
+          }
+        }
+      ],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        }
+      ],
+      "result": {
+        "error": {
+          "code": 280,
+          "errorLabels": [
+            "NonResumableChangeStreamError"
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/change-streams/change-streams.json b/driver-core/src/test/resources/change-streams/change-streams.json
new file mode 100644
index 00000000000..34371ced099
--- /dev/null
+++ b/driver-core/src/test/resources/change-streams/change-streams.json
@@ -0,0 +1,812 @@
+{
+  "collection_name": "test",
+  "database_name": "change-stream-tests",
+  "collection2_name": "test2",
+  "database2_name": "change-stream-tests-2",
+  "tests": [
+    {
+      "description": "$changeStream must be the first stage in a change stream pipeline sent to the server",
+      "minServerVersion": "3.6.0",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "_id": "42",
+            "documentKey": "42",
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "1"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "description": "The server returns change stream responses in the specified server response format",
+      "minServerVersion": "3.6.0",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        }
+      ],
+      "expectations": [],
+      "result": {
+        "success": [
+          {
+            "_id": "42",
+            "documentKey": "42",
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "1"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "description": "Executing a watch helper on a Collection results in notifications for changes to the specified collection",
+      "minServerVersion": "3.6.0",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test2",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests-2",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "y": 2
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "z": {
+                "$numberInt": "3"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "description": "Change Stream should allow valid aggregate pipeline stages",
+      "minServerVersion": "3.6.0",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [
+        {
+          "$match": {
+            "fullDocument.z": 3
+          }
+        }
+      ],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "y": 2
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                },
+                {
+                  "$match": {
+                    "fullDocument.z": {
+                      "$numberInt": "3"
+                    }
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "z": {
+                "$numberInt": "3"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "description": "Executing a watch helper on a Database results in notifications for changes to all collections in the specified database.",
+      "minServerVersion": "3.8.0",
+      "target": "database",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test2",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests-2",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "y": 2
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": {
+                "$numberInt": "1"
+              },
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test2"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "1"
+              }
+            }
+          },
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "z": {
+                "$numberInt": "3"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "description": "Executing a watch helper on a MongoClient results in notifications for changes to all collections in all databases in the cluster.",
+      "minServerVersion": "3.8.0",
+      "target": "client",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test2",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests-2",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "y": 2
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "z": 3
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": {
+                "$numberInt": "1"
+              },
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test2"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "1"
+              }
+            }
+          },
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests-2",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "y": {
+                "$numberInt": "2"
+              }
+            }
+          },
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "z": {
+                "$numberInt": "3"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "description": "Test insert, update, replace, and delete event types",
+      "minServerVersion": "3.6.0",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "updateOne",
+          "arguments": {
+            "filter": {
+              "x": 1
+            },
+            "update": {
+              "$set": {
+                "x": 2
+              }
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "replaceOne",
+          "arguments": {
+            "filter": {
+              "x": 2
+            },
+            "replacement": {
+              "x": 3
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "deleteOne",
+          "arguments": {
+            "filter": {
+              "x": 3
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "1"
+              }
+            }
+          },
+          {
+            "operationType": "update",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "updateDescription": {
+              "updatedFields": {
+                "x": {
+                  "$numberInt": "2"
+                }
+              }
+            }
+          },
+          {
+            "operationType": "replace",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "3"
+              }
+            }
+          },
+          {
+            "operationType": "delete",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "description": "Test rename and invalidate event types",
+      "minServerVersion": "4.0.1",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "rename",
+          "arguments": {
+            "to": "test2"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "rename",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "to": {
+              "db": "change-stream-tests",
+              "coll": "test2"
+            }
+          },
+          {
+            "operationType": "invalidate"
+          }
+        ]
+      }
+    },
+    {
+      "description": "Test drop and invalidate event types",
+      "minServerVersion": "4.0.1",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {},
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "drop"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "drop",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            }
+          },
+          {
+            "operationType": "invalidate"
+          }
+        ]
+      }
+    },
+    {
+      "description": "Test consecutive resume",
+      "minServerVersion": "4.1.7",
+      "target": "collection",
+      "topology": [
+        "replicaset"
+      ],
+      "changeStreamPipeline": [],
+      "changeStreamOptions": {
+        "batchSize": 1
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "getMore"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 1
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 2
+            }
+          }
+        },
+        {
+          "database": "change-stream-tests",
+          "collection": "test",
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "x": 3
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "cursor": {
+                "batchSize": 1
+              },
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "change-stream-tests"
+          }
+        }
+      ],
+      "result": {
+        "success": [
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "1"
+              }
+            }
+          },
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "2"
+              }
+            }
+          },
+          {
+            "operationType": "insert",
+            "ns": {
+              "db": "change-stream-tests",
+              "coll": "test"
+            },
+            "fullDocument": {
+              "x": {
+                "$numberInt": "3"
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption-corpus/corpus-encrypted.json b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-encrypted.json
new file mode 100644
index 00000000000..998b058b0f6
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-encrypted.json
@@ -0,0 +1,4025 @@
+{
+  "_id": "client_side_encryption_corpus",
+  "altname_aws": "aws",
+  "altname_local": "local",
+  "aws_double_rand_auto_id": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAABchrWPF5OPeuFpk4tUV325TmoNpGW+L5iPSXcLQIr319WJFIp3EDy5QiAHBfz2rThI7imU4eLXndIUrsjM0S/vg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_double_rand_auto_altname": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAABga5hXFiFvH/wOr0wOHSHFWRZ4pEs/UCC1XJWf46Dod3GY9Ry5j1ZyzeHueJxc4Ym5M8UHKSmJuXmNo9m9ZnkiA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_double_rand_explicit_id": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAABjTYZbsro/YxLWBb88qPXEIDQdzY7UZyK4UaZZ8h62OTxp43Zp9j6WvOEzKhXt4oJPMxlAxyTdqO6MllX5bsDrw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_double_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAABqkyXdeS3aWH2tRFoKxsIIL3ZH05gkiAEbutrjrdfw0b110iPhuCCOb0gP/nX/NRNCg1kCFZ543Vu0xZ0BRXlvQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_double_det_explicit_id": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_double_det_explicit_altname": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_string_rand_auto_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAACAsI5E0rVT8TpIONY3TnbRvIxUjKsiy9ynVd/fE7U1lndE7KR6dTzs8QWK13kdKxO+njKPeC2ObBX904QmJ65Sw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_string_rand_auto_altname": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAACgBE6J6MRxPSDe+gfJPL8nBvuEIRBYxNS/73LqBTDJYyN/lsHQ6UlFDT5B4EkIPmHPTe+UBMOhZQ1bsP+DK8Aog==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_string_rand_explicit_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAACbdTVDBWn35M5caKZgLFoiSVeFGKRj5K/QtupKNc8/dPIyCE+/a4PU51G/YIzFpYmp91nLpyq7lD/eJ/V0q66Zw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_string_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAACa4O+kE2BaqM0E+yiBrbCuE0YEGTrZ7L/+SuWm9gN3UupxwAQpRfxXAuUCTc9u1CXnvL+ga+VJMcWD2bawnn/Rg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_string_det_auto_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAACyvOW8NcqRkZYzujivwVmYptJkic27PWr3Nq3Yv5Njz8cJdoyesVaQan6mn+U3wdfGEH8zbUUISdCx5qgvXEpvw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_string_det_explicit_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAACyvOW8NcqRkZYzujivwVmYptJkic27PWr3Nq3Yv5Njz8cJdoyesVaQan6mn+U3wdfGEH8zbUUISdCx5qgvXEpvw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_string_det_explicit_altname": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAACyvOW8NcqRkZYzujivwVmYptJkic27PWr3Nq3Yv5Njz8cJdoyesVaQan6mn+U3wdfGEH8zbUUISdCx5qgvXEpvw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_object_rand_auto_id": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAADI+/afY6Eka8j1VNThWIeGkDZ7vo4/l66a01Z+lVUFFnVLeUV/nz9kM6uTTplNRUa+RXmNmwkoR/BHRnGc7wRNA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_object_rand_auto_altname": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAADzN4hVXWXKerhggRRtwWnDu2W2wQ5KIWb/X1WCZJKTjQSQ5LNHVasabBCa4U1q46PQ5pDDM1PkVjW6o+zzl/4xw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_object_rand_explicit_id": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAADhSs5zKFMuuux3fqFFuPito3N+bp5TgmkUtJtFXjmA/EnLuexGARvEeGUsMJ/n0VzKbbsiE8+AsUNY3o9YXutqQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_object_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAADpj8MSov16h26bFDrHepsNkW+tOLOjRP7oj1Tnj75qZ+uqxxVkQ5B/t/Ihk5fikHTJGAcRBR5Vv6kJ/ulMaDnvQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_object_det_explicit_id": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_object_det_explicit_altname": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_array_rand_auto_id": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAETWDOZ6zV39H2+W+BkwZIoxI3BNF6phKoiBZ9+i4T9uEoyU3TmoTPjuI0YNwR1v/p5/9rlVCG0KLZd16eeMb3zxZXjqh6IAJqfhsBQ7bzBYI=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_array_rand_auto_altname": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAE1xeHbld2JjUiPB1k+xMZuIzNSai7mv1iusCswxKEfYCZ7YtR0GDQTxN4676CwhcodSDiysjgOxSFIGlptKCvl0k46LNq0EGypP9yWBLvdjQ=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_array_rand_explicit_id": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAEFVa4U2uW65MGihhdOmpZFgnwGTs3VeN5TXXbXJ5cfm0CwXF3EPlzAVjy5WO/+lbvFufpQnIiLH59/kVygmwn+2P9zPNJnSGIJW9gaV8Vye8=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_array_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAE11VXbfg7DJQ5/CB9XdBO0hCrxOkK3RrEjPGJ0FXlUo76IMna1uo+NVmDnM63CRlGE3/TEbZPpp0w0jn4vZLKvBmGr7o7WQusRY4jnRf5oH4=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_array_det_explicit_id": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_array_det_explicit_altname": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_binData=00_rand_auto_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFpZYSktIHzGLZ6mcBFxywICqxdurqLVJcQR34ngix5YIOOulCYEhBSDzzSEyixEPCuU6cEzeuafpZRHX4qgcr9Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=00_rand_auto_altname": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFshzESR9SyR++9r2yeaEjJYScMDez414s8pZkB3C8ihDa+rsyaxNy4yrF7qNEWjFrdFaH7zD2LdlPx+TKZgROlg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=00_rand_explicit_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFpYwZRPDom7qyAe5WW/QNSq97/OYgRT8xUEaaR5pkbQEFd/Cwtl8Aib/3Bs1CT3MVaHVWna2u5Gcc4s/v18zLhg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=00_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFBq1RIU1YGHKAS1SAtS42fKtQBHQ/BCQzRutirNdvWlrXxF81LSaS7QgQyycZ2ePiOLsSm2vZS4xaQETeCgRC4g==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=00_det_auto_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAF6SJGmfD3hLVc4tLPm4v2zFuHoRxUDLumBR8Q0AlKK2nQPyvuHEPVBD3vQdDi+Q7PwFxmovJsHccr59VnzvpJeg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=00_det_explicit_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAF6SJGmfD3hLVc4tLPm4v2zFuHoRxUDLumBR8Q0AlKK2nQPyvuHEPVBD3vQdDi+Q7PwFxmovJsHccr59VnzvpJeg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=00_det_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAF6SJGmfD3hLVc4tLPm4v2zFuHoRxUDLumBR8Q0AlKK2nQPyvuHEPVBD3vQdDi+Q7PwFxmovJsHccr59VnzvpJeg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=04_rand_auto_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFM5685zqlM8pc3xubtCFuf724g/bWXsebpNzw5E5HrxUqSBBVOvjs3IJH74+Supe169qejY358nOG41mLZvO2wJByvT14qmgUGpgBaLaxPR0=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=04_rand_auto_altname": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFfLqOzpfjz/XYHDLnliUAA5ehi6s+OIjvrLa59ubqEf8DuoCEWlO13Dl8X42IBB4hoSsO2RUeWtc9MeH4SdIUh/xJN3qS7qzjh/H+GvZRdAM=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=04_rand_explicit_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFkmKfKAbz9tqVaiM9MRhYttiY3vgDwXpdYLQ4uUgWX89KRayLADWortYL+Oq+roFhO3oiwB9vjeWGIdgbj5wSh/50JT/2Gs85TXFe1GFjfWs=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=04_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAFKbufv83ddN+07Q5Ocq0VxUEV+BesSrVM7Bol3cMlWjHi7P+MrdwhNEa94xlxlDwU3b+RD6kW+AuNEQ2byA3CX2JjZE1gHwN7l0ukXuqpD0A=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=04_det_auto_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAFlg7ceq9w/JMhHcNzQks6UrKYAffpUyeWuBIpcuLoB7YbFO61Dphseh77pzZbk3OvmveUq6EtCP2pmsq7hA+QV4hkv6BTn4m6wnXw6ss/qfE=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=04_det_explicit_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAFlg7ceq9w/JMhHcNzQks6UrKYAffpUyeWuBIpcuLoB7YbFO61Dphseh77pzZbk3OvmveUq6EtCP2pmsq7hA+QV4hkv6BTn4m6wnXw6ss/qfE=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_binData=04_det_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAFlg7ceq9w/JMhHcNzQks6UrKYAffpUyeWuBIpcuLoB7YbFO61Dphseh77pzZbk3OvmveUq6EtCP2pmsq7hA+QV4hkv6BTn4m6wnXw6ss/qfE=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_undefined_rand_explicit_id": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_undefined_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_undefined_det_explicit_id": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_undefined_det_explicit_altname": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_objectId_rand_auto_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAHASE+V+LlkmwgF9QNjBK8QBvC973NaTMk6wbd57VB2EpQzrgxMtR5gYzVeqq4xaaHqrncyZCOIxDJkFlaim2NqA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_objectId_rand_auto_altname": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAHf/+9Qj/ozcDoUb8RNBnajU1d9hJ/6fE17IEZnw+ma6v5yH8LqZk9w3dtm6Sfw1unMhcMKrmIgs6kxqRWhNREJg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_objectId_rand_explicit_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAHzX8ejVLhoarQ5xgWsJitU/9eBm/Hlt2IIbZtS0SBc80qzkkWTaP9Zl9wrILH/Hwwx8RFnts855eKII3NJFa3BA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_objectId_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAHG5l6nUCY8f/6xO6TsPDrZHcdPRyMe3muMlY2DxHwv9GJNDR5Ne5VEAzUjnbgoy+B29SX4oY8cXJ6XhVz8mt3Eg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_objectId_det_auto_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAHTMY2l+gY8glm4HeSsGfCSfOsTVTzYU8qnQV8iqEFHrO5SBJac59gv3N/jukMwAnt0j6vIIQrROkVetU24YY7sQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_objectId_det_explicit_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAHTMY2l+gY8glm4HeSsGfCSfOsTVTzYU8qnQV8iqEFHrO5SBJac59gv3N/jukMwAnt0j6vIIQrROkVetU24YY7sQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_objectId_det_explicit_altname": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAHTMY2l+gY8glm4HeSsGfCSfOsTVTzYU8qnQV8iqEFHrO5SBJac59gv3N/jukMwAnt0j6vIIQrROkVetU24YY7sQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_bool_rand_auto_id": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAISm4UFt1HC2j0ObpTBg7SvF2Dq31i9To2ED4F3JcTihhq0fVzaSCsUz9VTJ0ziHmeNPNdfPPZO6qA/CDEZBO4jg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_bool_rand_auto_altname": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAIj93KeAa96DmZXdB8boFvW19jhJSMmtSs5ag5FDSkH8MdKG2d2VoBOdUlBrL+LHYELqeDHCszY7qCirvb5mIgZg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_bool_rand_explicit_id": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAIMbDFEuHIl5MNEsWnYLIand1vpK6EMv7Mso6qxrN4wHSVVwmxK+GCPgrKoUQsNuTssFWNCu0IhwrXOagDEfmlxw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_bool_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAIkIaWfmPdxgAV5Rtb6on6T0NGt9GPFDScQD5I/Ch0ngiTCCKceJOjU0ljd3YTgfWRA1p/MlMIV0I5YAWZXKTHlg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_bool_det_explicit_id": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": true
+  },
+  "aws_bool_det_explicit_altname": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": true
+  },
+  "aws_date_rand_auto_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAJz1VG4+QnQXEE+TGu/pzfPugGMVTiC1xnenG1ByRdPvsERVw9WComWl1tb9tt9oblD7H/q0y1+y8HevkDqohB2Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_date_rand_auto_altname": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAJa1kI2mIIYWjf7zjf5dD9+psvAQpjZ3nnsoXA5upcIwEtZaC8bxKKHVpOLOP3rTbvT5EV6vLhXkferGoyaqd/8w==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_date_rand_explicit_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAJ9Q5Xe4UuOLQTUwosk47A6xx40XJcNoICCNtKrHqsUYy0QLCFRc5v4nA0160BVghURizbUtX8iuIp11pnsDyRtA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_date_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAJkHOdUc/4U82wxWJZ0SYABkJjQqNApkH2Iy/5S+PoatPgynoeSFTU9FmAbuWV/gbtIfBiaCOIjlsdonl/gf9+5w==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_date_det_auto_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAJEEpQNsiqMWPqD4lhMkiOJHGE8FxOeYrKPiiAp/bZTrLKyCSS0ZL1WT9H3cGzxWPm5veihCjKqWhjatC/pjtzbQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_date_det_explicit_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAJEEpQNsiqMWPqD4lhMkiOJHGE8FxOeYrKPiiAp/bZTrLKyCSS0ZL1WT9H3cGzxWPm5veihCjKqWhjatC/pjtzbQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_date_det_explicit_altname": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAJEEpQNsiqMWPqD4lhMkiOJHGE8FxOeYrKPiiAp/bZTrLKyCSS0ZL1WT9H3cGzxWPm5veihCjKqWhjatC/pjtzbQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_null_rand_explicit_id": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "aws_null_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "aws_null_det_explicit_id": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "aws_null_det_explicit_altname": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "aws_regex_rand_auto_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAALnhViSt3HqTDzyLN4mWO9srBU8TjRvPWsAJYfj/5sgI/yFuWdrggMs3Aq6G+K3tRrX3Yb+osy5CLiFCxq9WIvAA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_regex_rand_auto_altname": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAALbL2RS2tGQLBZ+6LtXLKAWFKcoKui+u4+gMIlFemLgpdO2eLqrMJB53ccqZImX8ons9UgAwDkiD68hWy8e7KHfg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_regex_rand_explicit_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAALa0+ftF6W/0Ul4J9VT/3chXFktE1o+OK4S14h2kyOqDVNA8yMKuyCK5nWl1yZvjJ76TuhEABte23oxcBP5QwalQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_regex_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAALS4Yo9Fwk6OTx2CWdnObFT2L4rHngeIbdCyT4/YMJYd+jLU3mph14M1ptZZg+TBIgSPHq+BkvpRDifbMmOVr/Hg==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_regex_det_auto_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAALpwNlokiTCUtTa2Kx9NVGvXR/aKPGhR5iaCT7nHEk4BOiZ9Kr4cRHdPCeZ7A+gjG4cKoT62sm3Fj1FwSOl8J8aQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_regex_det_explicit_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAALpwNlokiTCUtTa2Kx9NVGvXR/aKPGhR5iaCT7nHEk4BOiZ9Kr4cRHdPCeZ7A+gjG4cKoT62sm3Fj1FwSOl8J8aQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_regex_det_explicit_altname": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAALpwNlokiTCUtTa2Kx9NVGvXR/aKPGhR5iaCT7nHEk4BOiZ9Kr4cRHdPCeZ7A+gjG4cKoT62sm3Fj1FwSOl8J8aQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_dbPointer_rand_auto_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAMfCVAnMNbRGsThnoVGb2KDsCIU2ehcPtebk/TFG4GZvEmculscLLih813lEz5NHS2sAXBn721EzUS7d0TKAPbmEYFwUBnijIQIPvUoUO8AQM=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_dbPointer_rand_auto_altname": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAMvYJ5BtaMLVXV+qj85q5WqKRlzlHOBIIxZfUE/BBXUwqSTpJLdQQD++DDh6F2dtorBeYa3oUv2ef3ImASk5j23joU35Pm3Zt9Ci1pMNGodWs=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_dbPointer_rand_explicit_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAMdsmYtPDw8kKjfB2kWfx5W1oNEkWWct1lRpesN303pUWsawDJpfBx40lg18So2X/g4yGIwpY3qfEKQZA4vCJeT+MTjhRXFjXA7eS/mxv8f3E=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_dbPointer_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAM0hcvS5zmY3mlTp0SfME/rINlflF/sx2KvP0eJTdH+Uk0WHuTkFIJAza+bXvV/gB7iNC350qyzUX3M6NHx/9s/5yBpY8MawTZTZ7WCQIA+ZI=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_dbPointer_det_auto_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAMp4QxbaEOij66L+RtaMekrDSm6QbfJBTQ8lQFhxfq9n7SVuQ9Zwdy14Ja8tyI3cGgQzQ/73rHUJ3CKA4+OYr63skYUkkkdlHxUrIMd5j5woc=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_dbPointer_det_explicit_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAMp4QxbaEOij66L+RtaMekrDSm6QbfJBTQ8lQFhxfq9n7SVuQ9Zwdy14Ja8tyI3cGgQzQ/73rHUJ3CKA4+OYr63skYUkkkdlHxUrIMd5j5woc=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_dbPointer_det_explicit_altname": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAMp4QxbaEOij66L+RtaMekrDSm6QbfJBTQ8lQFhxfq9n7SVuQ9Zwdy14Ja8tyI3cGgQzQ/73rHUJ3CKA4+OYr63skYUkkkdlHxUrIMd5j5woc=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascript_rand_auto_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAN3HzAC9BTD7Jgi0PR4RS/Z6L6QtAQ7VhbKRbX+1smmnYniH6jVBM6zyxMDM8h9YjMPNs8EJrGDnisuf33w5KI/A==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascript_rand_auto_altname": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAANJpw+znlu3ecSiNyZ0EerVsow4aDRF2auI3Wy69EVexJkQlHO753PjRn8hG/x2kY8ROy5IUU43jaugP5AN1bwNQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascript_rand_explicit_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAANzoDiq8uI0+l8COY8YdM9S3rpLvPOHOWmJqJNtOyS0ZXUx1SB5paRJ4W3Eg8KuXEeoFwvBDe9cW9YT66CzkjlBw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascript_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAN/JhtRongJweLC5SdrXHhsFz3p82q3cwXf8Sru21DK6S39S997y3uhVLn0xlX5d94PxK1XVYSjz1oVuMxZouZ7Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascript_det_auto_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAANE39aEGiuUZ1WyakVEBgkGzLp5whkIjJ4uiaFLXniRszJL70FRkcf+aFXlA5Y4So9/ODKF76qbSsH4Jk6L+3mog==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascript_det_explicit_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAANE39aEGiuUZ1WyakVEBgkGzLp5whkIjJ4uiaFLXniRszJL70FRkcf+aFXlA5Y4So9/ODKF76qbSsH4Jk6L+3mog==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascript_det_explicit_altname": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAANE39aEGiuUZ1WyakVEBgkGzLp5whkIjJ4uiaFLXniRszJL70FRkcf+aFXlA5Y4So9/ODKF76qbSsH4Jk6L+3mog==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_symbol_rand_auto_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAOBv1T9tleM0xwNe7efg/MlShyzvXe3Pmg1GzPl3gjFRHZGWXR578KqX+8oiz65eXGzNuyOFvcpnR2gYCs3NeKeQfctO5plEiIva6nzCI5SK8=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_symbol_rand_auto_altname": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAOwLgGws8CMh+GgkEJFAx8tDIflyjsgG+/1FmZZobKAg8NOKqfXjtbnNCbvR28OCk6g/8SqBm8m53G6JciwvthJ0DirdfEexiUqu7IPtaeeyw=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_symbol_rand_explicit_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAORQi3dNkXzZeruWu19kEhDu6fFD/h47ILzk+OVKQMoriAQC5YFyVRp1yAkIaWsrsPcyCHlfZ99FySSQeqSYbZZNj5FqyonWvDuPTduHDy3CI=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_symbol_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAOj+Yl1pQPiJ6mESOISOyUYsKN/VIvC8f0derhxIPakXkwn57U0sxv+geUkrl3JZDxY3+cX5M1JZmY+PfjaYQhbTorf9RZaVC2Wwo2lMftWi0=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_symbol_det_auto_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAO5IHripygBGEsVK8RFWZ1rIIVUap8KVDuqOspZpERaj+5ZEfqIcyrP/WK9KdvwOfdOWXfP/mOwuImYgNdbaQe+ejkYe4W0Y0uneCuw88k95Q=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_symbol_det_explicit_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAO5IHripygBGEsVK8RFWZ1rIIVUap8KVDuqOspZpERaj+5ZEfqIcyrP/WK9KdvwOfdOWXfP/mOwuImYgNdbaQe+ejkYe4W0Y0uneCuw88k95Q=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_symbol_det_explicit_altname": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAO5IHripygBGEsVK8RFWZ1rIIVUap8KVDuqOspZpERaj+5ZEfqIcyrP/WK9KdvwOfdOWXfP/mOwuImYgNdbaQe+ejkYe4W0Y0uneCuw88k95Q=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascriptWithScope_rand_auto_id": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAPT31GSNkY1RM43miv1XPYtDX1vU/xORiM3U0pumjqA+JLU/HMhH++75OcMhcAQqMjm2nZtZScxdGJsJJPEEzqjbFNMJgYc9sqR5uLnzk+2dg=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascriptWithScope_rand_auto_altname": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAPUxgaKAxSQ1uzOZtzsbtrxtDT2P/zWY6lYsbChXuRUooqvyjXSkNDqKBBA7Gp5BdGiVB/JLR47Tihpbcw1s1yGhwQRvnqeDvPrf91nvElXRY=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascriptWithScope_rand_explicit_id": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAPv8W0ZtquFCLTG0TqvRjdzKa/4mvqT2FuEGQ0mXG2k2BZh2LY5APr/kgW0tP4eLjHzVld6OLiM9ZKAvENCZ6/fKOvqSwpIfkdLWUIeB4REQg=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascriptWithScope_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAPMVhWjaxLffdAOkVgIJpjgNIldMS451NQs3C1jb+pzopHp3DlfZ+AHQpK9reMVVKjaqanhWBpL25q+feA60XVgZPCUDroiRYqMFqU//y0amw=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_javascriptWithScope_det_explicit_id": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_javascriptWithScope_det_explicit_altname": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_int_rand_auto_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAQFV5b3vsoZe+MT4z8soetpmrWJpm7be41FNu/rdEqHWTG32jCym6762PCNYH5+vA7ldCWQkdt+ncneHsxzPrm9w==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_int_rand_auto_altname": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAQY9+QenvU1Tk/dEGZP11uOZJLHAJ9hWHbEhxbtxItt1LsdU/8gOZfypilIO5BUkLT/15PUuXV28GISNh6yIuWhw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_int_rand_explicit_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAQruCugbneumhcinuXm89WW1PXVuSOewttp9cpsPPsCRVqe/uAkZOdJnZ2KaEZ9zki2GeqaJTs1qDmaJofc6GMEA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_int_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAQb15qXl/tejk4pmgkc4pUxzt4eJrv/cetgzgcPVaROAQSzd8ptbgCjaV8vP46uqozRoaDFZbQ06t65c3f0x/Ucw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_int_det_auto_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAQCXo6ieWvfoqkG+rP7J2BV013AVf/oNMmmGWe44VEHahF+qZHzW5I/F2qIA+xgKkk172pFq0iTSOpe+K2WHMKFw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_int_det_explicit_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAQCXo6ieWvfoqkG+rP7J2BV013AVf/oNMmmGWe44VEHahF+qZHzW5I/F2qIA+xgKkk172pFq0iTSOpe+K2WHMKFw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_int_det_explicit_altname": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAAQCXo6ieWvfoqkG+rP7J2BV013AVf/oNMmmGWe44VEHahF+qZHzW5I/F2qIA+xgKkk172pFq0iTSOpe+K2WHMKFw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_timestamp_rand_auto_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAR63xXG8mrlixkQzD5VBIPE6NHicaWcS5CBhiIJDcZ0x8D9c5TgRJUfCeWhKvWFD4o0DoxcBQ2opPormFDpvmq/g==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_timestamp_rand_auto_altname": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAARAgY9LsUxP6gP4gYRvvzZ4iaHVQRNbycATiVag1YNSiDmEr4LYserYuBscdrIy4v3zgGaulFM9KV86bx0ItycZA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_timestamp_rand_explicit_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAARLneAZqPcHdzGGnXz2Ne5E7HP9cDC1+yoIwcA8OSF/IlzEjrrMAi3z6Izol6gWDlD7VOh7QYL3sASJOXyzF1hPQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_timestamp_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAARH2bU7KNo5SHxiO8JFEcT9wryuHNXyM7ADop1oPcESyay1Nc0WHPD3nr0yMAK481NxOkE3qXyaslu7bcP/744WA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_timestamp_det_auto_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAARG7kGfx0ky+d4Hl/fRBu8oUR1Mph26Dkv3J7fxGYanpzOFMiHIfVO0uwYMvsfzG54y0DDNlS3FmmS13DzepbzGQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_timestamp_det_explicit_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAARG7kGfx0ky+d4Hl/fRBu8oUR1Mph26Dkv3J7fxGYanpzOFMiHIfVO0uwYMvsfzG54y0DDNlS3FmmS13DzepbzGQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_timestamp_det_explicit_altname": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAARG7kGfx0ky+d4Hl/fRBu8oUR1Mph26Dkv3J7fxGYanpzOFMiHIfVO0uwYMvsfzG54y0DDNlS3FmmS13DzepbzGQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_long_rand_auto_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAASZbes2EdR78crt2pXVElW2YwAQh8HEBapYYeav2VQeg2syXaV/qZuD8ofnAVn4v/DydTTMVMmK+sVU/TlnAu2eA==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_long_rand_auto_altname": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAASt+7fmMYH+fLHgybc+sng8/UmKP3YPUEPCz1SXVQljQp6orsCILSgtgGPsdeGnN5NSxh3XzerHs6zlR92fWpZCw==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_long_rand_explicit_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAS01fF1uo6zYDToJnOT/EbDipzk7YZ6I+IspZF+avjU3XYfpRxT9NdAgKr0euWJwyAsdpWqqCwFummfrPeZOy04A==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_long_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAS6tpH796bqy58mXf38rJvVtA1uBcxBE5yIGQ4RN44oypc/pvw0ouhFI1dkoneKMtAFU/5RygZV+RvQhRtgKn76A==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_long_det_auto_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAASC7O/8JeB4WTqQFPuMpFRsAuonPS3yu7IAPZeRPIr03CmM6HNndYIKMoFM13eELNZTdJSgg9u9ItGqRw+/XMHzQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_long_det_explicit_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAASC7O/8JeB4WTqQFPuMpFRsAuonPS3yu7IAPZeRPIr03CmM6HNndYIKMoFM13eELNZTdJSgg9u9ItGqRw+/XMHzQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_long_det_explicit_altname": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AQFkgAAAAAAAAAAAAAAAAAASC7O/8JeB4WTqQFPuMpFRsAuonPS3yu7IAPZeRPIr03CmM6HNndYIKMoFM13eELNZTdJSgg9u9ItGqRw+/XMHzQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_decimal_rand_auto_id": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAATgf5zW9EgnWHPxj4HAGt472eN9UXP41TaF8V2J7S2zqSpiBZGKDuOIjw2FBSqaNp53vvfl9HpwAuQBJZhrwkBCKRkKV/AAR3/pTpuoqhSKaM=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_decimal_rand_auto_altname": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAATPRfvZWdupE2N0W1DXUx7X8Zz7g43jawJL7PbQtTYetI78xRETkMdygwSEHgs+cvnUBBtYIeKRVkOGZQkwf568OclhDiPxUeD38cR5blBq/U=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_decimal_rand_explicit_id": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAAT+ZnCg2lSMIohZ9RJ4CNs3LZ0g+nV04cYAmrxTSrTSBPGlZ7Ywh5A2rCss7AUijYZiKiYyZbuAzukbOuVRhdCtm+xo9+DyLAwTezF18okk6Y=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_decimal_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AgFkgAAAAAAAAAAAAAAAAAATlnQYASsTZRRHzFjcbCClXartcXBVRrYv7JImMkDmAj6EAjf/ZqpjeykkS/wohMhXaNwyZBdREr+n+GDV7imYoL4WRBOLnqB6hrYidlWqNzE=",
+        "subType": "06"
+      }
+    }
+  },
+  "aws_decimal_det_explicit_id": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_decimal_det_explicit_altname": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_minKey_rand_explicit_id": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_minKey_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_minKey_det_explicit_id": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_minKey_det_explicit_altname": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_maxKey_rand_explicit_id": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "aws_maxKey_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "aws_maxKey_det_explicit_id": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "aws_maxKey_det_explicit_altname": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_double_rand_auto_id": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAABGF195CB8nRmK9+KxYO7T96MeXucC/ILQtEEQAS4zrwj3Qz7YEQrf/apvbKTCkn3siN2XSDLQ/7dmddZa9xa9yQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_double_rand_auto_altname": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAABY8g18z6ZOjGtfNxaAmU95tXMdoM6qbtDMpB72paqiHZTW1UGB22HPXiEnVz05JTBzzX4fc6tOldX6aJel812Zg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_double_rand_explicit_id": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAABDlHwN8hYyScEhhx64TdJ2Qp2rmKRg8983zdqIL1914tyPwRQq7ySCOhmFif2S7v4KT+r0uOfimYvKD1n9rKHlg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_double_rand_explicit_altname": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAB2VnTFlaCRzAZZTQiMWQORFNgXIuAJlHJXIHiYow2eO6JbVghWTpH+MsdafBNPVnc0zKuZBL0Qs2Nuk1xiQaqhA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_double_det_explicit_id": {
+    "kms": "local",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_double_det_explicit_altname": {
+    "kms": "local",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_string_rand_auto_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAC5NBAPM8q2n9fnkwQfE9so/XcO51plPBNs5VlBRbDw68k9T6/uZ2TWsAvTYtVooY59zHHr2QS3usKbGQB6J61rA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_string_rand_auto_altname": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACM/EjGMrkYHvSZra26m74upuvLkfKXTs+tTWquGzrgWYLnLt8I6XBIwx1VymS9EybrCU/ewmtgjLUNUFQacIeXA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_string_rand_explicit_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACn4tD26UG8lO9gTZaxen6yXzHo/a2lokeY1ClxHMtJODoJr2JZzIDHP3A9aZ8L4+Vu+nyqphaWyGaGONKu8gpcQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_string_rand_explicit_altname": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACZfoO2LjY+IB31FZ1Tq7pHr0DCFKGJqWcXcOrnZ7bV9Euc9f101motJc31sp8nF5CTCfd83VQE0319eQrxDDaSw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_string_det_auto_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACW0cZMYWOY3eoqQQkSdBtS9iHC4CSQA27dy6XJGcmTV8EDuhGNnPmbx0EKFTDb0PCSyCjMyuE4nsgmNYgjTaSuw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_string_det_explicit_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACW0cZMYWOY3eoqQQkSdBtS9iHC4CSQA27dy6XJGcmTV8EDuhGNnPmbx0EKFTDb0PCSyCjMyuE4nsgmNYgjTaSuw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_string_det_explicit_altname": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACW0cZMYWOY3eoqQQkSdBtS9iHC4CSQA27dy6XJGcmTV8EDuhGNnPmbx0EKFTDb0PCSyCjMyuE4nsgmNYgjTaSuw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_object_rand_auto_id": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAADlekcUsETAkkKTjCVx5EISJN+sftrQax/VhaWXLyRgRz97adXXmwZkMyt+035SHZsF91i2LaXziMA4RHoP+nKFw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_object_rand_auto_altname": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAADpaQmy5r6q9gLqEm+FIi/OyQgcuUnrICCP9rC4S3wR6qUHd82IW/3dFQUzwTkaXxgStjopamQMuZ4ESRj0xx0bA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_object_rand_explicit_id": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAADCHRJCINzWY0u4gZPWEmHg/JoQ8IW4yMfUyzYJCQrEMp4rUeupIuxqSuq2QyLBYZBBv0r7t3lNH49I5qDeav2vA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_object_rand_explicit_altname": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAADrHQQUnLF1jdNmFY/V266cS28XAB4nOKetHAcSbwkeUxNzgZT1g+XMQaYfcNMMv/ywypKU1KpgLMsEOpm4qcPkQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_object_det_explicit_id": {
+    "kms": "local",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_object_det_explicit_altname": {
+    "kms": "local",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_array_rand_auto_id": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAEXa7bQ5vGPNsLdklM/H+sop8aCL4vlDiVUoVjTAGjTngn2WLcdKLWxaNSyMdJpsI/NsxQJ58YrcwP+yHzi9rZVtRdbg7m8p+CYcq1vUm6UoQ=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_array_rand_auto_altname": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAEVlZlOvtRmGIhcYi/qPl3HKi/qf0yRQrkbVo9rScYkxDCBN9wA55pAWHDQ/5Sjy4d0DwL57k+M1G9e7xSIrv8xXKwoIuuabhSWaIX2eJHroY=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_array_rand_explicit_id": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAEYBLSYHHt2rohezMF4lMjNdqy9CY33EHf+pgRbJwVXZScLDgn9CcqeRsdU8bW5h2qgNpQvoSMBB7pW+Dgp1RauTHZSOd4PcZpAGjwoFDWSSM=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_array_rand_explicit_altname": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAES1IJ8S2NxWekolQockxLJvzFSGfKQ9Xbi55vO8LyWo0sIG9ZgPQXtVQkZ301CsdFduvx9A0vDqQ0MGYc4plxNnpUTizJPRUDyez5dOgZ9tI=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_array_det_explicit_id": {
+    "kms": "local",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_array_det_explicit_altname": {
+    "kms": "local",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_binData=00_rand_auto_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAF+hgWs4ZCo9GnmhSM9SDSWzWX4E7Tlp4TwlEy3zfO/rrMREECGB4u8LD8Ju9b8YP+xcZhMI1tcz/vrQS87NffUg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=00_rand_auto_altname": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAFtEvaXWpGfXC1GlKu0AeRDaeBKHryGoS0tAUr48vfYk7umCr+fJKyXCY9vSv7wCiQxWLe8V/EZWkHsu0zqhJw9w==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=00_rand_explicit_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAF/1L5bvmMX3Bk2nAw8KvvRd/7nZ82XHVasT0jrlPhSiJU7ehJMeUCOb7HCHU6KgCzZB9C2W3NoVhLKIhE9ZnYdg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=00_rand_explicit_altname": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAFK0W5IWKzggR4UU+fhwA2p8YCHLfmx5y1OEtHc/9be9eEYTORACDmWY6207Vd4LhBJCedd+Q5qMm7NRZjjhyLEQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=00_det_auto_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAF1ofBnK9+ERP29P/i14GQ/y3muic6tNKY532zCkzQkJSktYCOeXS8DdY1DdaOP/asZWzPTdgwby6/iZcAxJU+xQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=00_det_explicit_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAF1ofBnK9+ERP29P/i14GQ/y3muic6tNKY532zCkzQkJSktYCOeXS8DdY1DdaOP/asZWzPTdgwby6/iZcAxJU+xQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=00_det_explicit_altname": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAF1ofBnK9+ERP29P/i14GQ/y3muic6tNKY532zCkzQkJSktYCOeXS8DdY1DdaOP/asZWzPTdgwby6/iZcAxJU+xQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=04_rand_auto_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAFxq38aA4k/tYHPwJFRK0pahlo/3zjCe3VHJRqURRA+04lbJCvdkQTawxWlf8o+3Pcetl1UcPTQigdYp5KbIkstuPstLbT+TZXHVD1os9LTRw=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=04_rand_auto_altname": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAFTXNWchCPmCSY0+AL22/kCBmAoDJDX5T18jpJHLdvZtHs0zwD64b9hLvfRK268BlNu4P37KDFE6LT0QzjG7brqzFJf3ZaadDCKeIw1q7DWQs=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=04_rand_explicit_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAF7XgMgKjQmWYWmobrYWKiGYCKsy5kTgVweFBuzvFISaZjFsq2hrZB2DwUaOeT6XUPH/Onrdjc3fNElf3FdQDHif4rt+1lh9jEX+nMbRw9i3s=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=04_rand_explicit_altname": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAFGoA/1H0waFLor6LbkUCLC2Wm9j/ZT7yifPbf0G7WvO0+gBLlffr3aJIQ9ik5vxPbmDDMCoYlbEYgb8i9I5tKC17WPhjVH2N2+4l9y7aEmS4=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=04_det_auto_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAFwO3hsD8ee/uwgUiHWem8fGe54LsTJWqgbRCacIe6sxrsyLT6EsVIqg4Sn7Ou+FC3WJbFld5kx8euLe/MHa8FGYjxD97z5j+rUx5tt3T6YbA=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=04_det_explicit_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAFwO3hsD8ee/uwgUiHWem8fGe54LsTJWqgbRCacIe6sxrsyLT6EsVIqg4Sn7Ou+FC3WJbFld5kx8euLe/MHa8FGYjxD97z5j+rUx5tt3T6YbA=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_binData=04_det_explicit_altname": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAFwO3hsD8ee/uwgUiHWem8fGe54LsTJWqgbRCacIe6sxrsyLT6EsVIqg4Sn7Ou+FC3WJbFld5kx8euLe/MHa8FGYjxD97z5j+rUx5tt3T6YbA=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_undefined_rand_explicit_id": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_undefined_rand_explicit_altname": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_undefined_det_explicit_id": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_undefined_det_explicit_altname": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_objectId_rand_auto_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAHfvxWRZOzfao3faE3RglL0IcDpBcNwqiGL5KgSokmRxWjjWeiel88Mbo5Plo0SswwNQ2H7C5GVG21L+UbvcW63g==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_objectId_rand_auto_altname": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAHhd9lSOO7bHE7PM+Uxa2v3X1FF66IwyEr0wqnyTaOM+cHQLmec/RlEaRIQ1x2AiW7LwmmVgZ0xBMK9CMh0Lhbyw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_objectId_rand_explicit_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAHETwT9bo+JtboBVW/8GzzMQCpn22iiNJnlxYfyO45jvYJQRs29RRIouCsnFkmC7cfAO3GlVxv113euYjIO7AlAg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_objectId_rand_explicit_altname": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAHhsguAMBzQUFBAitpJDzKEaMDGUGfvCzmUUhf4rnp8xeall/p91TUudaSMcU11XEgJ0Mym4IbYRd8+TfUai0nvw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_objectId_det_auto_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAH4ElF4AvQ+kkGfhadgKNy3GcYrDZPN6RpzaMYIhcCGDvC9W+cIS9dH1aJbPU7vTPmEZnnynPTDWjw3rAj2+9mOA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_objectId_det_explicit_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAH4ElF4AvQ+kkGfhadgKNy3GcYrDZPN6RpzaMYIhcCGDvC9W+cIS9dH1aJbPU7vTPmEZnnynPTDWjw3rAj2+9mOA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_objectId_det_explicit_altname": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAH4ElF4AvQ+kkGfhadgKNy3GcYrDZPN6RpzaMYIhcCGDvC9W+cIS9dH1aJbPU7vTPmEZnnynPTDWjw3rAj2+9mOA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_bool_rand_auto_id": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAIxGld4J/2vSWg5tjQulpkm9C6WeUcLbv2yfKRXPAbmLpv3u4Yrmr5qisJtqmDPTcb993WosvCYAh0UGW+zpsdEg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_bool_rand_auto_altname": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAIpUFPiS2uoW1Aqs0WQkBa201OBmsuJ8WUKcv5aBPASkcwfaw9qSWs3QrbEDR2GyoU4SeYOByCAQMzXCPoIYAFdQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_bool_rand_explicit_id": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAIJuzu1a60meYlU3LMjw/7G4Vh/lqKopxdpGWoLXEmY/NoHgX6Fkv9iTwxv/Nv8rZwtawpFV+mQUG/6A1IHMBASQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_bool_rand_explicit_altname": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAIn9VjxL5TdGgJLckNHRrIaL32L31q5OERRZG2M5OYKk66TnrlfEs+ykcDvGwMGKpr/PYjY5kBHDc/oELGJJbWRQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_bool_det_explicit_id": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": true
+  },
+  "local_bool_det_explicit_altname": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": true
+  },
+  "local_date_rand_auto_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAJPPv4MC5xzt2uxPGBHH9g2z03o9SQjjmuxt97Ub1UcKCCHsGED3bx6YSrocuEMiFFI4d5Fqgl8HNeS4j0PR0tYA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_date_rand_auto_altname": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAJ6i2A9Hi4xWlOMjFMGpwaRctR1VFnb4El166n18RvjKic46V+WoadvLHS32RhPOvkLVYwIeU4C+vrO5isBNoUdw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_date_rand_explicit_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAJHcniV7Q0C8ZTWrE0hp5i5bUPlrrRdNLZckfODw8XNVtVPDjbznglccQmI7w1t8kOVp65eKzVzUOXN0YkqA+1QA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_date_rand_explicit_altname": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAJKCUCjC3hsmEKKYwGP3ceh3zR+ArE8LYFOQfN87aEsTr60VrzHXmsE8PvizRhhMnrp07ljzQkuat39L+0QSR2qQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_date_det_auto_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAJ1GMYQTruoKr6fv9XCbcVkx/3yivymPSMEkPCRDYxQv45w4TqBKMDfpRd1TOLOv1qvcb+gjH+z5IfVBMp2IpG/Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_date_det_explicit_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAJ1GMYQTruoKr6fv9XCbcVkx/3yivymPSMEkPCRDYxQv45w4TqBKMDfpRd1TOLOv1qvcb+gjH+z5IfVBMp2IpG/Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_date_det_explicit_altname": {
+    "kms": "local",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAJ1GMYQTruoKr6fv9XCbcVkx/3yivymPSMEkPCRDYxQv45w4TqBKMDfpRd1TOLOv1qvcb+gjH+z5IfVBMp2IpG/Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_null_rand_explicit_id": {
+    "kms": "local",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "local_null_rand_explicit_altname": {
+    "kms": "local",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "local_null_det_explicit_id": {
+    "kms": "local",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "local_null_det_explicit_altname": {
+    "kms": "local",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "local_regex_rand_auto_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAALXKw7zSgqQj1AKoWO0MoMxsBuu0cMB6KdJQCRKdupoLV/Y22owwsVpDDMv5sgUpkG5YIV+Fz7taHodXE07qHopw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_regex_rand_auto_altname": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAALntOLXq7VW1+jwba/dSbidMo2bewNo7AtK9A1CPwk9XrjUQaEOQxfRpho3BYQEo2U67fQdsY/tyhaj4jduHn9JQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_regex_rand_explicit_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAALlMMG2iS/gEOEsVKR7sxBJP2IUzZ+aRbozDSkqADncresBvaPBSE17lng5NG7H1JRCAcP1rH/Te+0CrMd7JpRAQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_regex_rand_explicit_altname": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAL1YNnlVu5+njDLxh1LMhIPOH19RykAXhxrUbCy6TI5MLQsAOSgAJbXOTXeKr0D8/Ff0phToWOKl193gOOIp8yZQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_regex_det_auto_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAALiZbL5nFIZl7cSLH5E3wK3jJeAeFc7hLHNITtLAu+o10raEs5i/UCihMHmkf8KHZxghs056pfm5BjPzlL9x7IHQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_regex_det_explicit_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAALiZbL5nFIZl7cSLH5E3wK3jJeAeFc7hLHNITtLAu+o10raEs5i/UCihMHmkf8KHZxghs056pfm5BjPzlL9x7IHQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_regex_det_explicit_altname": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAALiZbL5nFIZl7cSLH5E3wK3jJeAeFc7hLHNITtLAu+o10raEs5i/UCihMHmkf8KHZxghs056pfm5BjPzlL9x7IHQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_dbPointer_rand_auto_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAMUdAA9uOSk1tXJVe/CG3Ps6avYTEF1eHj1wSlCHkFxqlMtTO+rIQpikpjH0MrcXvEEdAO8g5hFZ01I7DWyK5AAxTxDqVF+kOaQ2VfKs6hyuo=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_dbPointer_rand_auto_altname": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAMiNqvqLwZrPnsF235z+Obl1K9iEXdJ5GucMGpJdRG4lRvRE0Oy1vh6ztNTpYPY/tXyUFTBWlzl/lITalSEm/dT1Bnlh0iPAFrAiNySf662og=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_dbPointer_rand_explicit_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAM+Tn31YcKiowBTJWRYCYAEO7UARDE2/jTVGEKXCpiwEqqP3JSAS0b80zYt8dxo5mVhUo2a02ClKrB8vs+B6sU1kXrahSaVSEHZlRSGN9fWgo=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_dbPointer_rand_explicit_altname": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAMdOZZUvpJIqG9qiOLy5x4BdftyHipPDZn/eeLEc7ir3v4jJsY3dsv6fQERo5U9lMynNGA9PJePVzq5tWsIMX0EcCQcMfGmosfkYDzN1OX99A=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_dbPointer_det_auto_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAMQWace2C1w3yqtmo/rgz3YtIDnx1Ia/oDsoHnnMZlEy5RoK3uosi1hvNAZCSg3Sen0H7MH3XVhGGMCL4cS69uJ0ENSvh+K6fiZzAXCKUPfvM=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_dbPointer_det_explicit_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAMQWace2C1w3yqtmo/rgz3YtIDnx1Ia/oDsoHnnMZlEy5RoK3uosi1hvNAZCSg3Sen0H7MH3XVhGGMCL4cS69uJ0ENSvh+K6fiZzAXCKUPfvM=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_dbPointer_det_explicit_altname": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAMQWace2C1w3yqtmo/rgz3YtIDnx1Ia/oDsoHnnMZlEy5RoK3uosi1hvNAZCSg3Sen0H7MH3XVhGGMCL4cS69uJ0ENSvh+K6fiZzAXCKUPfvM=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascript_rand_auto_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAANNL2AMKwTDyMIvxLKhBxZKx50C0tBdkLwuXmuMcrUqZeH8bsvjtttoM9LWkkileMyeTWgxblJ1b+uQ+V+4VT6fA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascript_rand_auto_altname": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAANBjBlHGw3K3TWQHpvfa1z0bKhNnVFC/lZArIexo3wjdGq3MdkGA5cuBIp87HHmOIv6o/pvQ9K74v48RQl+JH44A==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascript_rand_explicit_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAANjvM7u3vNVyKpyI7g5kbzBpHPzXzOQToDSng5/c9yjMG+qi4TPtOyassobJOnMmDYBLyqRXCl/GsDLprbg5jxuA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascript_rand_explicit_altname": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAANMtO7KneuVx4gSOjX4MQjKL80zJhnt+efDBylkpNsqKyxBXB60nkiredGzwaK3/4QhIfGJrC1fQpwUwu/v1L17g==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascript_det_auto_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAANmQsg9E/BzGJVNVhSNyunS/TH0332oVFdPS6gjX0Cp/JC0YhB97DLz3N4e/q8ECaz7tTdQt9JacNUgxo+YCULUA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascript_det_explicit_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAANmQsg9E/BzGJVNVhSNyunS/TH0332oVFdPS6gjX0Cp/JC0YhB97DLz3N4e/q8ECaz7tTdQt9JacNUgxo+YCULUA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascript_det_explicit_altname": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAANmQsg9E/BzGJVNVhSNyunS/TH0332oVFdPS6gjX0Cp/JC0YhB97DLz3N4e/q8ECaz7tTdQt9JacNUgxo+YCULUA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_symbol_rand_auto_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAOOuO2b23mekwI8b6gWeEgRy1lLOCsNyBKvdmizK7/oOVKCvd+3kwUn9a6TxygooiVAN/Aohr1cjb8jRlMPWpkP0iO0+Tt6+vkizgFsQW4iio=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_symbol_rand_auto_altname": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAOhN4QPOcmGnFKGvTfhz6TQleDA02X6oWULLHTnOUJYfE3OUSyf2ULEQh1yhdKdwXMuYVgGl28pMosiwkBShrXYe5ZlMjiZCIMZWSdUMV0tXk=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_symbol_rand_explicit_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAO9aWi9RliwQHdXHoJME9VyN6XgyGd95Eclx+ZFYfLxBGAuUnPNjSfVuNZwYdyKC8JX79+mYhk7IXmcGV4z+4486sxyLk3idi4Kmpz2ESqV5g=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_symbol_rand_explicit_altname": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAO/qev3DPfpkQoSW9aHOyalwfI/VYDQVN5VMINx4kw2vEqHiI1HRdZRPOz3q74TlQEy3TMNMTYdCvh5bpN/PptRZCTQbzP6ugz9dTp79w5/Ok=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_symbol_det_auto_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAOsg5cs6VpZWoTOFg4ztZmpj8kSTeCArVcI1Zz2pOnmMqNv/vcKQGhKSBbfniMripr7iuiYtlgkHGsdO2FqUp6Jb8NEWm5uWqdNU21zR9SRkE=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_symbol_det_explicit_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAOsg5cs6VpZWoTOFg4ztZmpj8kSTeCArVcI1Zz2pOnmMqNv/vcKQGhKSBbfniMripr7iuiYtlgkHGsdO2FqUp6Jb8NEWm5uWqdNU21zR9SRkE=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_symbol_det_explicit_altname": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAOsg5cs6VpZWoTOFg4ztZmpj8kSTeCArVcI1Zz2pOnmMqNv/vcKQGhKSBbfniMripr7iuiYtlgkHGsdO2FqUp6Jb8NEWm5uWqdNU21zR9SRkE=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascriptWithScope_rand_auto_id": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAP5gLMvLOAc6vGAvC7bGmEC4eweptAiX3A7L0iCoHps/wm0FBLkfpF6F4pCjVYiY1lTID38wliRLPyhntCj+cfvlMfKSjouNgXMIWyQ8GKZ2c=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascriptWithScope_rand_auto_altname": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAPVsw9Opn/P5SAdJhX4MTxIcsmaG8isIN4NKPi9k1u/Vj7AVkcxYqwurAghaJpmfoAgMruvzi1hcKvd05yHd9Nk0vkvODwDgnjJB6QO+qUce8=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascriptWithScope_rand_explicit_id": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAPLUa+nsrqiHkVdE5K1xl/ZsiZqQznG2yVXyA3b3loBylbcL2NEBp1JUeGnPZ0y5ZK4AmoL6NMH2Io313rW3V8FTArs/OOQWPRJSe6h0M3wXk=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascriptWithScope_rand_explicit_altname": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAPzUKaXCH0JImSlY73HVop9g9c0YssNEiA7Dy7Vji61avxvnuJJfghDchdwwaY7Vc8+0bymoanUWcErRctLzjm+1uKeMnFQokR8wFtnS3PgpQ=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_javascriptWithScope_det_explicit_id": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_javascriptWithScope_det_explicit_altname": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_int_rand_auto_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAQHXpXb3KlHA2KFTBgl0VoLCu0CUf1ae4DckkwDorbredVSqxvA5e+NvVudY5yuea6bC9F57JlbjI8NWYAUw4q0Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_int_rand_auto_altname": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAQSxXMF4+TKV+a3lcxXky8VepEqdg5wI/jg+C4CAUgNurq2XhgrxyqiMjkU8z07tfyoLYyX6P+dTrwj6nzvvchCw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_int_rand_explicit_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAQmzteYnshCI8HBGd7UYUKvcg4xl6M8PRyi1xX/WHbjyQkAJXxczS8hO91wuqStE3tBNSmulUejz9S691ufTd6ZA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_int_rand_explicit_altname": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAQLCHLru//++QSoWVEyw2v6TUfCnlrPJXrpLLezWf16vK85jTfm8vJbb2X2UzX04wGzVL9tCFFsWX6Z5gHXhgSBg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_int_det_auto_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAQIxWjLBromNUgiOoeoZ4RUJUYIfhfOmab0sa4qYlS9bgYI41FU6BtzaOevR16O9i+uACbiHL0X6FMXKjOmiRAug==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_int_det_explicit_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAQIxWjLBromNUgiOoeoZ4RUJUYIfhfOmab0sa4qYlS9bgYI41FU6BtzaOevR16O9i+uACbiHL0X6FMXKjOmiRAug==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_int_det_explicit_altname": {
+    "kms": "local",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAQIxWjLBromNUgiOoeoZ4RUJUYIfhfOmab0sa4qYlS9bgYI41FU6BtzaOevR16O9i+uACbiHL0X6FMXKjOmiRAug==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_timestamp_rand_auto_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAARntIycg0Xkd16GEa//VSJI4Rkl7dT6MpRa+D3MiTEeio5Yy8zGK0u2BtEP/9MCRQw2hJDYj5znVqwhdduM0OTiA==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_timestamp_rand_auto_altname": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAARWA9Ox5ejDPeWxfjbRgcGCtF/G5yrPMbBJD9ESDFc0NaVe0sdNNTisEVxsSkn7M/S4FCibKh+C8femr7xhu1iTw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_timestamp_rand_explicit_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAARrEfOL4+4Qh7IkhHnHcBEANGfMF8n2wUDnsZ0lXEb0fACKzaN5OKaxMIQBs/3pFBw721qRfCHY+ByKeaQuABbzg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_timestamp_rand_explicit_altname": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAARW8nwmnBt+LFIAcFWvOzX8llrGcveQKFhyYUIth9d7wtpTyc9myFp8GBQCnjDpKzA6lPmbqVYeLU0L9q0h6SHGQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_timestamp_det_auto_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAR6uMylGytMq8QDr5Yz3w9HlW2MkGt6yIgUKcXYSaXru8eer+EkLv66/vy5rHqTfV0+8ryoi+d+PWO5U6b3Ng5Gg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_timestamp_det_explicit_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAR6uMylGytMq8QDr5Yz3w9HlW2MkGt6yIgUKcXYSaXru8eer+EkLv66/vy5rHqTfV0+8ryoi+d+PWO5U6b3Ng5Gg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_timestamp_det_explicit_altname": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAR6uMylGytMq8QDr5Yz3w9HlW2MkGt6yIgUKcXYSaXru8eer+EkLv66/vy5rHqTfV0+8ryoi+d+PWO5U6b3Ng5Gg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_long_rand_auto_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAASrinKUOpHIB7MNRmCAPWcP4CjZwfr5JaRT3G/GqY9B/6csj3+N9jmo1fYvM8uHcnmf5hzDDOamaE2FF1jDKkrHw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_long_rand_auto_altname": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAShWMPYDkCpTC2XLYyykPJMihASLKn6HHcB2Eh7jFwQb/8D1HCQoPmOHMyXaN4AtIKm1oqEfma6FSnEPENQoledQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_long_rand_explicit_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAASd2h34ZLib+GiYayrm/FIZ/weg8wF41T0PfF8NCLTJCoT7gIkdpNRz2zkkQgZMR31efNKtsM8Bs4wgZbkrXsXWg==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_long_rand_explicit_altname": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAASPAvdjz+a3FvXqDSjazaGqwZxrfXlfFB5/VjQFXQB0gpodCEaz1qaLSKfCWBg83ftrYKa/1sa44gU5NBthDfDwQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_long_det_auto_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAASQk372m/hW3WX82/GH+ikPv3QUwK7Hh/RBpAguiNxMdNhkgA/y2gznVNm17t6djyub7+d5zN4P5PLS/EOm2kjtw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_long_det_explicit_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAASQk372m/hW3WX82/GH+ikPv3QUwK7Hh/RBpAguiNxMdNhkgA/y2gznVNm17t6djyub7+d5zN4P5PLS/EOm2kjtw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_long_det_explicit_altname": {
+    "kms": "local",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAASQk372m/hW3WX82/GH+ikPv3QUwK7Hh/RBpAguiNxMdNhkgA/y2gznVNm17t6djyub7+d5zN4P5PLS/EOm2kjtw==",
+        "subType": "06"
+      }
+    }
+  },
+  "local_decimal_rand_auto_id": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAATLnMMDZhnGSn5F5xHhsJXxiTGXd61Eq6fgppOlxUNVlsZNYyr5tZ3owfTTqRuD9yRg97x65WiHewBBnJJSeirCTAy9zZxWPVlJSiC0gO7rbM=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_decimal_rand_auto_altname": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAATenMh7NKQioGjpuEojIrYKFaJhbuGxUgu2yTTbe3TndhgHryhW9GXiUqo8WTpnXqpC5E/z03ZYLWfCbe7qGdL6T7bbrTpaTaWZnnAm3XaCqY=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_decimal_rand_explicit_id": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAT9vqXuKRh+2HxeCMr+pQYdhYNw7xrTdU4dySWz0X6tCK7LZO5AV72utmRJxID7Bqv1ZlXAk00V92oDLyKG9kHeG5+S34QE/aLCPsAWcppfxY=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_decimal_rand_explicit_altname": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAATtqOCFMbOkls3LikQNXlnlkRr5gJns1+5Kvbt7P7texMa/QlXkYSHhtwESyfOcCQ2sw1T0eZ9DDuNaznpdK2KIqZBkVEC9iMoxqIqXF7Nab0=",
+        "subType": "06"
+      }
+    }
+  },
+  "local_decimal_det_explicit_id": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_decimal_det_explicit_altname": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_minKey_rand_explicit_id": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_minKey_rand_explicit_altname": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_minKey_det_explicit_id": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_minKey_det_explicit_altname": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_maxKey_rand_explicit_id": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_maxKey_rand_explicit_altname": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_maxKey_det_explicit_id": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_maxKey_det_explicit_altname": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "payload=0,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACcsBdT93ivCyvtkfQz9qb1A9Ll+I6hnGE0kFy3rmVG6xAvipmRJSoVq3iv7iUEDvaqmPXfjeH8h8cPYT86v3XSg==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=1,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACQOzpNBEGSrANr3Wl8uYpqeIc7pjc8e2LS2FaSrb8tM9F3mR1FqGgfJtn3eD+HZf3Y3WEDGK8975a/1BufkMqIQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=2,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACyGJEcuN1pG5oSEyxuKFwqddGHVU5Untbib7LkmtoJe9HngTofkOpeHZH/hV6Z3CFxLu6WFliJoySsFFbnFy9ag==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=3,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACLbp4w6mx45lR1vvgmeRja/y8U+WnR2oH4IpfrDi4lKM+JPVnJweiN3/1wAy+sXSy0S1Yh9yxmhh9ISoTkAuVxw==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=4,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACG0qMY/GPZ/2CR61cxbuizywefyMZVdeTCn5KFjqwejgxeBwX0JmGNHKKWbQIDQykRFv0q0WHUgsRmRhaotNCyQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=5,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACJI1onNpQfZhaYWrPEzHvNaJRqUDZK2xoyonB5E473BPgp3zvn0Jmz1deL8GzS+HlkjCrx39OvHyVt3+3S0kYYw==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=6,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAClyKY9tZBjl7SewSXr3MdoWRDUNgLaXDUjENpjyYvi/54EQ9a+J/LAAh1892i+mLpYxEUAmcftPyfX3VhbCgUQw==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=7,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACAMbEA+kNvnVV7B//ds2/QoVot061kbazoMwB/psB5eFdLVB5qApAXEWgQEMwkNnsTUYbtSduQz6uGwdagtNBRw==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=8,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACzdSK/d7Ni6D8qUgNopnEU5ia1K5llhBGk3O1Tf71t4ThnQjYW9eI/rIohWmev5CGWLHhwuvvKUtFcTAe+NMQww==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=9,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACzQcEa+ktF2EZf35TtyatnSGGaIVvFhZNuo5P3VwQvoONJrK2cSad7PBDAv3xDAB+VPZAigXAGQvd051sHooOHg==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=10,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACpfoDmApsR5xOD3TDhcHeD7Jco3kPFuuWjDpHtMepMOJ3S0c+ngGGhzPGZtEz2xuD/E7AQn1ryp/WAQ+WwkaJkQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=11,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACICMRXmx3oKqYv0IpmzkSMBIGT4Li3MPBF4Lw1s5F69WvZApD58glIKB6b7koIrF5qc2Wrb1/Nw+stRv0zvQ8Y9CcFV4OHm6WoEw+XDlWXJ4=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=12,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACTArUn0WUTojQC4fSvq3TwJVTsZNhWAK2WB057u2EnkUzMC0xsbU6611W6Okx6idZ7pMudXpBC34fRDrJPXOu3BxK+ZLCOWS2FqsvWq3HeTY=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=13,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACU1Ojn7EM2i+5KK2Beh1gPLhryK3Y7PtaZ/v4JvstxuAV4OHOR9yROP7pwenHXxczkWXvcyMY9OCdmHO8pkQkXO21798IPkDDN/ejJUFI0Uw=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=14,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAAC0ZLwSliCbcr/e1uiYWk6gRuD/5qiyulQ7IUNWjhpBR6SLUfX2+yExLzps9hoOp53j9zRSKIzyleZ8yGLTLeN+Lz9BUe2ZT+sV8NiqZz3pkA=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=15,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACQ9pmlQeFDr+jEhFwjL/eGVxdv70JdnkLaKdJ3/jkvCX1VPU5HmQIi+JWY3Rrw844E/6sBR6zIODn5aM0WfyP8a2zKRAWaVQZ7n+QE9hDN/8=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=16,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "AizggCwAAAAAAAAAAAAAAAACiOcItInDGHqvkH0I3udp5nnX32XzDeqya/3KDjgZPT5GHek1vFTZ4924JVxFqFQz+No9rOVmyxm8O2fxjTK2vsjtADzKGnMTtFYZqghYCuc=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=0,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACijFptWQy7a1Y0rpXEvamXWI9v9dnx0Qj84/mKUsVpc3agkQ0B04uPYeROdt2MeEeiZoEKVWV0NjBocAQCEz7dw==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=1,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAChR90taVWsZk+++sgibX6CnFeQQHNoB8V+n2gmDe3CIT/t+WvhMf9D+mQipbAlrUyHgGihKMHcvAZ5RZ/spaH4Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=2,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAC67wemDv1Xdu7+EMR9LMBTOxfyAqsGaxQibwamZItzplslL/Dp3t9g9vPuNzq0dWwhnfxQ9GBe8OA3dtRaifYCA==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=3,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACVLxch+uC7weXrbtylCo1m4HYZmh0sd9JCrlTECO2M56JK1X9a30i2BDUdhPuoTvvODv74CGXkZKdist3o0mGAQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=4,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACexfIZGkOYaCGktOUc6cgAYg7Bd/C5ZYmdb7b8+rd5BKWbthW6N6CxhDIyh/DHvkPAeIzfTYA2/9w6tsjfD/TPQ==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=5,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACjUH/dPW4egOvFMJJnpWK8v27MeLkbXC4GFl1j+wPqTsIEeIWkzEmcXjHLTQGE2GplHHc/zxwRwD2dXdbzvsCDw==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=6,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACzvS+QkGlvb05pNn+vBMml09yKmE8yM6lwccNIST5uZSsUxXf2hrxPtO7Ylc4lmBAJt/9bcM59JIeT9fpYMc75w==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=7,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACSf2RxHJpRuh4j8nS1dfonUtsJEwgqfWrwOsfuT/tAGXgDN0ObUpzL2K7G2vmePjP4dwycCSIL3+2j34bqBJK1Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=8,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACu96YYeLXXoYdEZYNU9UAZjSd6G4fOE1edrA6/RjZKVGWKxftmvj5g1VAOiom0XuTZUe1ihbnwhvKexeoa3Vc8Q==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=9,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACX+UjBKo9+N0Z+mbyqZqkQv2ETMSn6aPTONWgJtw5nWklcxKjUSSLI+8LW/6M6Xf9a7177GsqmV2f/yCRF58Xtw==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=10,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACL6TVscFzIJ9+Zj6LsCZ9xhaZuTZdvz1nJe4l69nKyj9hCjnyuiV6Ve4AXwQ5W1wiPfkJ0fCZS33NwiHw7QQ/vg==",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=11,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACPLq7IcWhTVwkKmy0flN7opoQzx7tTe1eD9JIc25FC9B6KGQkdcRDglDDR7/m6+kBtTnq88y63vBgomTxA8ZxQE+3pB7zCiBhX0QznuXvP44=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=12,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACxv7v4pKtom5z1g9FUuyjEWAbdzJ3ytPNZlOfVr6KZnUPhIH7PfCz3/lTdYYWBTj01+SUZiC/7ruof9QDhsSiNWP7nUyHpQ/C3joI/BBjtDA=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=13,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACZhiElQ/MvyVMwMkZPu8pT54Ap6TlpVSEbE4nIQzzeU3XKVuspMdI5IXvvgfULXKXc+AOu6oQXZ+wAJ1tErVOsb48HF1g0wbXbBA31C5qLEM=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=14,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACdp8mDOeDuDLhE0LzTOT2p0CMaUsAQrGCzmiK6Ab9xvaIcPPcejUcpdO3XXAS/pPab4+TUwO5GbI5pDJ29zwaOiOz2H3OJ2m2p5BHQp9mCys=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=15,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAACmtLohoP/gotuon2IvnGeLEfCWHRMhG9Wp4tPu/vbJJkJkbQTP35HRG9VrMV7KKrEQbOsJ2Y6UDBra4tyjn0fIkwwc/0X9i+xaP+TrwpNabE=",
+        "subType": "06"
+      }
+    }
+  },
+  "payload=16,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": {
+        "base64": "ASzggCwAAAAAAAAAAAAAAAAC6s9eUtSneKWj3/A7S+bPZLj3t1WtUh7ltW80b8jCRzA+kOI26j1MEb1tt68HgcnH1IJ3YQ/+UHlV95OgwSnIxlib/HJn3U0s8mpuCWe1Auo=",
+        "subType": "06"
+      }
+    }
+  }
+}
diff --git a/driver-core/src/test/resources/client-side-encryption-corpus/corpus-key-aws.json b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-key-aws.json
new file mode 100644
index 00000000000..eca6cf912ef
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-key-aws.json
@@ -0,0 +1,33 @@
+{
+    "status": {
+        "$numberInt": "1"
+    }, 
+    "_id": {
+        "$binary": {
+            "base64": "AWSAAAAAAAAAAAAAAAAAAA==", 
+            "subType": "04"
+        }
+    }, 
+    "masterKey": {
+        "region": "us-east-1", 
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0", 
+        "provider": "aws"
+    }, 
+    "updateDate": {
+        "$date": {
+            "$numberLong": "1557827033449"
+        }
+    }, 
+    "keyMaterial": {
+        "$binary": {
+            "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO", 
+            "subType": "00"
+        }
+    }, 
+    "creationDate": {
+        "$date": {
+            "$numberLong": "1557827033449"
+        }
+    },
+    "keyAltNames": ["aws"]
+}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/client-side-encryption-corpus/corpus-key-local.json b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-key-local.json
new file mode 100644
index 00000000000..b3fe0723b06
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-key-local.json
@@ -0,0 +1,31 @@
+{
+    "status": {
+        "$numberInt": "1"
+    }, 
+    "_id": {
+        "$binary": {
+            "base64": "LOCALAAAAAAAAAAAAAAAAA==", 
+            "subType": "04"
+        }
+    }, 
+    "masterKey": {
+        "provider": "local"
+    }, 
+    "updateDate": {
+        "$date": {
+            "$numberLong": "1557827033449"
+        }
+    }, 
+    "keyMaterial": {
+        "$binary": {
+            "base64": "Ce9HSz/HKKGkIt4uyy+jDuKGA+rLC2cycykMo6vc8jXxqa1UVDYHWq1r+vZKbnnSRBfB981akzRKZCFpC05CTyFqDhXv6OnMjpG97OZEREGIsHEYiJkBW0jJJvfLLgeLsEpBzsro9FztGGXASxyxFRZFhXvHxyiLOKrdWfs7X1O/iK3pEoHMx6uSNSfUOgbebLfIqW7TO++iQS5g1xovXA==", 
+            "subType": "00"
+        }
+    }, 
+    "creationDate": {
+        "$date": {
+            "$numberLong": "1557827033449"
+        }
+    },
+    "keyAltNames": [ "local" ]
+}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/client-side-encryption-corpus/corpus-schema.json b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-schema.json
new file mode 100644
index 00000000000..e4838d8aaea
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-corpus/corpus-schema.json
@@ -0,0 +1,2057 @@
+{
+  "bsonType": "object",
+  "properties": {
+    "aws_double_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "double"
+          }
+        }
+      }
+    },
+    "aws_double_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "double"
+          }
+        }
+      }
+    },
+    "aws_double_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_double_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_string_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "string"
+          }
+        }
+      }
+    },
+    "aws_string_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "string"
+          }
+        }
+      }
+    },
+    "aws_string_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_string_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_string_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "string"
+          }
+        }
+      }
+    },
+    "aws_string_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_string_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_object_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "object"
+          }
+        }
+      }
+    },
+    "aws_object_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "object"
+          }
+        }
+      }
+    },
+    "aws_object_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_object_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_array_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "array"
+          }
+        }
+      }
+    },
+    "aws_array_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "array"
+          }
+        }
+      }
+    },
+    "aws_array_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_array_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=00_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "aws_binData=00_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "aws_binData=00_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=00_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=00_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "aws_binData=00_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=00_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=04_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "aws_binData=04_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "aws_binData=04_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=04_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=04_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "aws_binData=04_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_binData=04_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_objectId_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "objectId"
+          }
+        }
+      }
+    },
+    "aws_objectId_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "objectId"
+          }
+        }
+      }
+    },
+    "aws_objectId_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_objectId_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_objectId_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "objectId"
+          }
+        }
+      }
+    },
+    "aws_objectId_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_objectId_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_bool_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "bool"
+          }
+        }
+      }
+    },
+    "aws_bool_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "bool"
+          }
+        }
+      }
+    },
+    "aws_bool_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_bool_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_date_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "date"
+          }
+        }
+      }
+    },
+    "aws_date_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "date"
+          }
+        }
+      }
+    },
+    "aws_date_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_date_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_date_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "date"
+          }
+        }
+      }
+    },
+    "aws_date_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_date_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_regex_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "regex"
+          }
+        }
+      }
+    },
+    "aws_regex_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "regex"
+          }
+        }
+      }
+    },
+    "aws_regex_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_regex_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_regex_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "regex"
+          }
+        }
+      }
+    },
+    "aws_regex_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_regex_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_dbPointer_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "dbPointer"
+          }
+        }
+      }
+    },
+    "aws_dbPointer_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "dbPointer"
+          }
+        }
+      }
+    },
+    "aws_dbPointer_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_dbPointer_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_dbPointer_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "dbPointer"
+          }
+        }
+      }
+    },
+    "aws_dbPointer_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_dbPointer_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_javascript_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascript"
+          }
+        }
+      }
+    },
+    "aws_javascript_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascript"
+          }
+        }
+      }
+    },
+    "aws_javascript_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_javascript_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_javascript_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "javascript"
+          }
+        }
+      }
+    },
+    "aws_javascript_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_javascript_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_symbol_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "symbol"
+          }
+        }
+      }
+    },
+    "aws_symbol_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "symbol"
+          }
+        }
+      }
+    },
+    "aws_symbol_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_symbol_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_symbol_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "symbol"
+          }
+        }
+      }
+    },
+    "aws_symbol_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_symbol_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_javascriptWithScope_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascriptWithScope"
+          }
+        }
+      }
+    },
+    "aws_javascriptWithScope_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascriptWithScope"
+          }
+        }
+      }
+    },
+    "aws_javascriptWithScope_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_javascriptWithScope_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_int_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "int"
+          }
+        }
+      }
+    },
+    "aws_int_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "int"
+          }
+        }
+      }
+    },
+    "aws_int_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_int_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_int_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "int"
+          }
+        }
+      }
+    },
+    "aws_int_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_int_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_timestamp_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "timestamp"
+          }
+        }
+      }
+    },
+    "aws_timestamp_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "timestamp"
+          }
+        }
+      }
+    },
+    "aws_timestamp_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_timestamp_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_timestamp_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "timestamp"
+          }
+        }
+      }
+    },
+    "aws_timestamp_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_timestamp_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_long_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "long"
+          }
+        }
+      }
+    },
+    "aws_long_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "long"
+          }
+        }
+      }
+    },
+    "aws_long_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_long_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_long_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "long"
+          }
+        }
+      }
+    },
+    "aws_long_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_long_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_decimal_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "decimal"
+          }
+        }
+      }
+    },
+    "aws_decimal_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_aws",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "decimal"
+          }
+        }
+      }
+    },
+    "aws_decimal_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "aws_decimal_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_double_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "double"
+          }
+        }
+      }
+    },
+    "local_double_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "double"
+          }
+        }
+      }
+    },
+    "local_double_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_double_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_string_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "string"
+          }
+        }
+      }
+    },
+    "local_string_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "string"
+          }
+        }
+      }
+    },
+    "local_string_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_string_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_string_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "string"
+          }
+        }
+      }
+    },
+    "local_string_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_string_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_object_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "object"
+          }
+        }
+      }
+    },
+    "local_object_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "object"
+          }
+        }
+      }
+    },
+    "local_object_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_object_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_array_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "array"
+          }
+        }
+      }
+    },
+    "local_array_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "array"
+          }
+        }
+      }
+    },
+    "local_array_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_array_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=00_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "local_binData=00_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "local_binData=00_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=00_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=00_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "local_binData=00_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=00_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=04_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "local_binData=04_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "local_binData=04_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=04_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=04_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "binData"
+          }
+        }
+      }
+    },
+    "local_binData=04_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_binData=04_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_objectId_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "objectId"
+          }
+        }
+      }
+    },
+    "local_objectId_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "objectId"
+          }
+        }
+      }
+    },
+    "local_objectId_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_objectId_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_objectId_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "objectId"
+          }
+        }
+      }
+    },
+    "local_objectId_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_objectId_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_bool_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "bool"
+          }
+        }
+      }
+    },
+    "local_bool_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "bool"
+          }
+        }
+      }
+    },
+    "local_bool_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_bool_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_date_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "date"
+          }
+        }
+      }
+    },
+    "local_date_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "date"
+          }
+        }
+      }
+    },
+    "local_date_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_date_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_date_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "date"
+          }
+        }
+      }
+    },
+    "local_date_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_date_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_regex_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "regex"
+          }
+        }
+      }
+    },
+    "local_regex_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "regex"
+          }
+        }
+      }
+    },
+    "local_regex_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_regex_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_regex_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "regex"
+          }
+        }
+      }
+    },
+    "local_regex_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_regex_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_dbPointer_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "dbPointer"
+          }
+        }
+      }
+    },
+    "local_dbPointer_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "dbPointer"
+          }
+        }
+      }
+    },
+    "local_dbPointer_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_dbPointer_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_dbPointer_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "dbPointer"
+          }
+        }
+      }
+    },
+    "local_dbPointer_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_dbPointer_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_javascript_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascript"
+          }
+        }
+      }
+    },
+    "local_javascript_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascript"
+          }
+        }
+      }
+    },
+    "local_javascript_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_javascript_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_javascript_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "javascript"
+          }
+        }
+      }
+    },
+    "local_javascript_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_javascript_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_symbol_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "symbol"
+          }
+        }
+      }
+    },
+    "local_symbol_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "symbol"
+          }
+        }
+      }
+    },
+    "local_symbol_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_symbol_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_symbol_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "symbol"
+          }
+        }
+      }
+    },
+    "local_symbol_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_symbol_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_javascriptWithScope_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascriptWithScope"
+          }
+        }
+      }
+    },
+    "local_javascriptWithScope_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "javascriptWithScope"
+          }
+        }
+      }
+    },
+    "local_javascriptWithScope_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_javascriptWithScope_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_int_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "int"
+          }
+        }
+      }
+    },
+    "local_int_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "int"
+          }
+        }
+      }
+    },
+    "local_int_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_int_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_int_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "int"
+          }
+        }
+      }
+    },
+    "local_int_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_int_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_timestamp_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "timestamp"
+          }
+        }
+      }
+    },
+    "local_timestamp_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "timestamp"
+          }
+        }
+      }
+    },
+    "local_timestamp_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_timestamp_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_timestamp_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "timestamp"
+          }
+        }
+      }
+    },
+    "local_timestamp_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_timestamp_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_long_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "long"
+          }
+        }
+      }
+    },
+    "local_long_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "long"
+          }
+        }
+      }
+    },
+    "local_long_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_long_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_long_det_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+            "bsonType": "long"
+          }
+        }
+      }
+    },
+    "local_long_det_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_long_det_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_decimal_rand_auto_id": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": [
+              {
+                "$binary": {
+                  "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+                  "subType": "04"
+                }
+              }
+            ],
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "decimal"
+          }
+        }
+      }
+    },
+    "local_decimal_rand_auto_altname": {
+      "bsonType": "object",
+      "properties": {
+        "value": {
+          "encrypt": {
+            "keyId": "/altname_local",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random",
+            "bsonType": "decimal"
+          }
+        }
+      }
+    },
+    "local_decimal_rand_explicit_id": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    },
+    "local_decimal_rand_explicit_altname": {
+      "bsonType": "object",
+      "properties": { "value": { "bsonType": "binData" } }
+    }
+  }
+}
diff --git a/driver-core/src/test/resources/client-side-encryption-corpus/corpus.json b/driver-core/src/test/resources/client-side-encryption-corpus/corpus.json
new file mode 100644
index 00000000000..cbf7a091a1a
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-corpus/corpus.json
@@ -0,0 +1,2905 @@
+{
+  "_id": "client_side_encryption_corpus",
+  "altname_aws": "aws",
+  "altname_local": "local",
+  "aws_double_rand_auto_id": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_double_rand_auto_altname": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_double_rand_explicit_id": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_double_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_double_det_explicit_id": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_double_det_explicit_altname": {
+    "kms": "aws",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "aws_string_rand_auto_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "aws_string_rand_auto_altname": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "aws_string_rand_explicit_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "aws_string_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "aws_string_det_auto_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "aws_string_det_explicit_id": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "aws_string_det_explicit_altname": {
+    "kms": "aws",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "aws_object_rand_auto_id": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_object_rand_auto_altname": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_object_rand_explicit_id": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_object_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_object_det_explicit_id": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_object_det_explicit_altname": {
+    "kms": "aws",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "aws_array_rand_auto_id": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_array_rand_auto_altname": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_array_rand_explicit_id": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_array_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_array_det_explicit_id": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_array_det_explicit_altname": {
+    "kms": "aws",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "aws_binData=00_rand_auto_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "aws_binData=00_rand_auto_altname": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "aws_binData=00_rand_explicit_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "aws_binData=00_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "aws_binData=00_det_auto_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "aws_binData=00_det_explicit_id": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "aws_binData=00_det_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "aws_binData=04_rand_auto_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "aws_binData=04_rand_auto_altname": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "aws_binData=04_rand_explicit_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "aws_binData=04_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "aws_binData=04_det_auto_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "aws_binData=04_det_explicit_id": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "aws_binData=04_det_explicit_altname": {
+    "kms": "aws",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "aws_undefined_rand_explicit_id": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_undefined_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_undefined_det_explicit_id": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_undefined_det_explicit_altname": {
+    "kms": "aws",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "aws_objectId_rand_auto_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "aws_objectId_rand_auto_altname": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "aws_objectId_rand_explicit_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "aws_objectId_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "aws_objectId_det_auto_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "aws_objectId_det_explicit_id": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "aws_objectId_det_explicit_altname": {
+    "kms": "aws",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "aws_bool_rand_auto_id": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": true
+  },
+  "aws_bool_rand_auto_altname": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": true
+  },
+  "aws_bool_rand_explicit_id": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": true
+  },
+  "aws_bool_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": true
+  },
+  "aws_bool_det_explicit_id": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": true
+  },
+  "aws_bool_det_explicit_altname": {
+    "kms": "aws",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": true
+  },
+  "aws_date_rand_auto_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "aws_date_rand_auto_altname": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "aws_date_rand_explicit_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "aws_date_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "aws_date_det_auto_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "aws_date_det_explicit_id": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "aws_date_det_explicit_altname": {
+    "kms": "aws",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "aws_null_rand_explicit_id": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "aws_null_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "aws_null_det_explicit_id": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "aws_null_det_explicit_altname": {
+    "kms": "aws",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "aws_regex_rand_auto_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "aws_regex_rand_auto_altname": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "aws_regex_rand_explicit_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "aws_regex_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "aws_regex_det_auto_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "aws_regex_det_explicit_id": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "aws_regex_det_explicit_altname": {
+    "kms": "aws",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "aws_dbPointer_rand_auto_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "aws_dbPointer_rand_auto_altname": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "aws_dbPointer_rand_explicit_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "aws_dbPointer_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "aws_dbPointer_det_auto_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "aws_dbPointer_det_explicit_id": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "aws_dbPointer_det_explicit_altname": {
+    "kms": "aws",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "aws_javascript_rand_auto_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "aws_javascript_rand_auto_altname": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "aws_javascript_rand_explicit_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "aws_javascript_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "aws_javascript_det_auto_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "aws_javascript_det_explicit_id": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "aws_javascript_det_explicit_altname": {
+    "kms": "aws",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "aws_symbol_rand_auto_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "aws_symbol_rand_auto_altname": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "aws_symbol_rand_explicit_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "aws_symbol_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "aws_symbol_det_auto_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "aws_symbol_det_explicit_id": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "aws_symbol_det_explicit_altname": {
+    "kms": "aws",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "aws_javascriptWithScope_rand_auto_id": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_javascriptWithScope_rand_auto_altname": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_javascriptWithScope_rand_explicit_id": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_javascriptWithScope_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_javascriptWithScope_det_explicit_id": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_javascriptWithScope_det_explicit_altname": {
+    "kms": "aws",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "aws_int_rand_auto_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "aws_int_rand_auto_altname": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "aws_int_rand_explicit_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "aws_int_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "aws_int_det_auto_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "aws_int_det_explicit_id": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "aws_int_det_explicit_altname": {
+    "kms": "aws",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "aws_timestamp_rand_auto_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "aws_timestamp_rand_auto_altname": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "aws_timestamp_rand_explicit_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "aws_timestamp_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "aws_timestamp_det_auto_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "aws_timestamp_det_explicit_id": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "aws_timestamp_det_explicit_altname": {
+    "kms": "aws",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "aws_long_rand_auto_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "aws_long_rand_auto_altname": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "aws_long_rand_explicit_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "aws_long_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "aws_long_det_auto_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "aws_long_det_explicit_id": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "aws_long_det_explicit_altname": {
+    "kms": "aws",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "aws_decimal_rand_auto_id": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_decimal_rand_auto_altname": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_decimal_rand_explicit_id": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_decimal_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_decimal_det_explicit_id": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_decimal_det_explicit_altname": {
+    "kms": "aws",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "aws_minKey_rand_explicit_id": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_minKey_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_minKey_det_explicit_id": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_minKey_det_explicit_altname": {
+    "kms": "aws",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "aws_maxKey_rand_explicit_id": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "aws_maxKey_rand_explicit_altname": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "aws_maxKey_det_explicit_id": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "aws_maxKey_det_explicit_altname": {
+    "kms": "aws",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_double_rand_auto_id": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_double_rand_auto_altname": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_double_rand_explicit_id": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_double_rand_explicit_altname": {
+    "kms": "local",
+    "type": "double",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_double_det_explicit_id": {
+    "kms": "local",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_double_det_explicit_altname": {
+    "kms": "local",
+    "type": "double",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDouble": "1.234" }
+  },
+  "local_string_rand_auto_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "local_string_rand_auto_altname": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "local_string_rand_explicit_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "local_string_rand_explicit_altname": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "local_string_det_auto_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "local_string_det_explicit_id": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "local_string_det_explicit_altname": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": "mongodb"
+  },
+  "local_object_rand_auto_id": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_object_rand_auto_altname": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_object_rand_explicit_id": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_object_rand_explicit_altname": {
+    "kms": "local",
+    "type": "object",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_object_det_explicit_id": {
+    "kms": "local",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_object_det_explicit_altname": {
+    "kms": "local",
+    "type": "object",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "x": { "$numberInt": "1" } }
+  },
+  "local_array_rand_auto_id": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_array_rand_auto_altname": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_array_rand_explicit_id": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_array_rand_explicit_altname": {
+    "kms": "local",
+    "type": "array",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_array_det_explicit_id": {
+    "kms": "local",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_array_det_explicit_altname": {
+    "kms": "local",
+    "type": "array",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": [
+      { "$numberInt": "1" },
+      { "$numberInt": "2" },
+      { "$numberInt": "3" }
+    ]
+  },
+  "local_binData=00_rand_auto_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "local_binData=00_rand_auto_altname": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "local_binData=00_rand_explicit_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "local_binData=00_rand_explicit_altname": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "local_binData=00_det_auto_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "local_binData=00_det_explicit_id": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "local_binData=00_det_explicit_altname": {
+    "kms": "local",
+    "type": "binData=00",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$binary": { "base64": "AQIDBA==", "subType": "00" } }
+  },
+  "local_binData=04_rand_auto_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "local_binData=04_rand_auto_altname": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "local_binData=04_rand_explicit_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "local_binData=04_rand_explicit_altname": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "local_binData=04_det_auto_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "local_binData=04_det_explicit_id": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "local_binData=04_det_explicit_altname": {
+    "kms": "local",
+    "type": "binData=04",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$binary": { "base64": "AAECAwQFBgcICQoLDA0ODw==", "subType": "04" }
+    }
+  },
+  "local_undefined_rand_explicit_id": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_undefined_rand_explicit_altname": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_undefined_det_explicit_id": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_undefined_det_explicit_altname": {
+    "kms": "local",
+    "type": "undefined",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$undefined": true }
+  },
+  "local_objectId_rand_auto_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "local_objectId_rand_auto_altname": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "local_objectId_rand_explicit_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "local_objectId_rand_explicit_altname": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "local_objectId_det_auto_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "local_objectId_det_explicit_id": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "local_objectId_det_explicit_altname": {
+    "kms": "local",
+    "type": "objectId",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$oid": "01234567890abcdef0123456" }
+  },
+  "local_bool_rand_auto_id": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": true
+  },
+  "local_bool_rand_auto_altname": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": true
+  },
+  "local_bool_rand_explicit_id": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": true
+  },
+  "local_bool_rand_explicit_altname": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": true
+  },
+  "local_bool_det_explicit_id": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": true
+  },
+  "local_bool_det_explicit_altname": {
+    "kms": "local",
+    "type": "bool",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": true
+  },
+  "local_date_rand_auto_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "local_date_rand_auto_altname": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "local_date_rand_explicit_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "local_date_rand_explicit_altname": {
+    "kms": "local",
+    "type": "date",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "local_date_det_auto_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "local_date_det_explicit_id": {
+    "kms": "local",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "local_date_det_explicit_altname": {
+    "kms": "local",
+    "type": "date",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$date": { "$numberLong": "12345" } }
+  },
+  "local_null_rand_explicit_id": {
+    "kms": "local",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "local_null_rand_explicit_altname": {
+    "kms": "local",
+    "type": "null",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "local_null_det_explicit_id": {
+    "kms": "local",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": null
+  },
+  "local_null_det_explicit_altname": {
+    "kms": "local",
+    "type": "null",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": null
+  },
+  "local_regex_rand_auto_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "local_regex_rand_auto_altname": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "local_regex_rand_explicit_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "local_regex_rand_explicit_altname": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "local_regex_det_auto_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "local_regex_det_explicit_id": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "local_regex_det_explicit_altname": {
+    "kms": "local",
+    "type": "regex",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$regularExpression": { "pattern": ".*", "options": "" } }
+  },
+  "local_dbPointer_rand_auto_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "local_dbPointer_rand_auto_altname": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "local_dbPointer_rand_explicit_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "local_dbPointer_rand_explicit_altname": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "local_dbPointer_det_auto_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "local_dbPointer_det_explicit_id": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "local_dbPointer_det_explicit_altname": {
+    "kms": "local",
+    "type": "dbPointer",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": {
+      "$dbPointer": {
+        "$ref": "db.example",
+        "$id": { "$oid": "01234567890abcdef0123456" }
+      }
+    }
+  },
+  "local_javascript_rand_auto_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "local_javascript_rand_auto_altname": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "local_javascript_rand_explicit_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "local_javascript_rand_explicit_altname": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "local_javascript_det_auto_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "local_javascript_det_explicit_id": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "local_javascript_det_explicit_altname": {
+    "kms": "local",
+    "type": "javascript",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1" }
+  },
+  "local_symbol_rand_auto_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "local_symbol_rand_auto_altname": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "local_symbol_rand_explicit_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "local_symbol_rand_explicit_altname": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "local_symbol_det_auto_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "local_symbol_det_explicit_id": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "local_symbol_det_explicit_altname": {
+    "kms": "local",
+    "type": "symbol",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$symbol": "mongodb-symbol" }
+  },
+  "local_javascriptWithScope_rand_auto_id": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_javascriptWithScope_rand_auto_altname": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_javascriptWithScope_rand_explicit_id": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_javascriptWithScope_rand_explicit_altname": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_javascriptWithScope_det_explicit_id": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_javascriptWithScope_det_explicit_altname": {
+    "kms": "local",
+    "type": "javascriptWithScope",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$code": "x=1", "$scope": {} }
+  },
+  "local_int_rand_auto_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "local_int_rand_auto_altname": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "local_int_rand_explicit_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "local_int_rand_explicit_altname": {
+    "kms": "local",
+    "type": "int",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "local_int_det_auto_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "local_int_det_explicit_id": {
+    "kms": "local",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "local_int_det_explicit_altname": {
+    "kms": "local",
+    "type": "int",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberInt": "123" }
+  },
+  "local_timestamp_rand_auto_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "local_timestamp_rand_auto_altname": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "local_timestamp_rand_explicit_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "local_timestamp_rand_explicit_altname": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "local_timestamp_det_auto_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "local_timestamp_det_explicit_id": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "local_timestamp_det_explicit_altname": {
+    "kms": "local",
+    "type": "timestamp",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$timestamp": { "t": 0, "i": 12345 } }
+  },
+  "local_long_rand_auto_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "local_long_rand_auto_altname": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "local_long_rand_explicit_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "local_long_rand_explicit_altname": {
+    "kms": "local",
+    "type": "long",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "local_long_det_auto_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "det",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "local_long_det_explicit_id": {
+    "kms": "local",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "local_long_det_explicit_altname": {
+    "kms": "local",
+    "type": "long",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberLong": "456" }
+  },
+  "local_decimal_rand_auto_id": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_decimal_rand_auto_altname": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "auto",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_decimal_rand_explicit_id": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_decimal_rand_explicit_altname": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": true,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_decimal_det_explicit_id": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_decimal_det_explicit_altname": {
+    "kms": "local",
+    "type": "decimal",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$numberDecimal": "1.234" }
+  },
+  "local_minKey_rand_explicit_id": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_minKey_rand_explicit_altname": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_minKey_det_explicit_id": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_minKey_det_explicit_altname": {
+    "kms": "local",
+    "type": "minKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$minKey": 1 }
+  },
+  "local_maxKey_rand_explicit_id": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_maxKey_rand_explicit_altname": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_maxKey_det_explicit_id": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "local_maxKey_det_explicit_altname": {
+    "kms": "local",
+    "type": "maxKey",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "altname",
+    "allowed": false,
+    "value": { "$maxKey": 1 }
+  },
+  "payload=0,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": ""
+  },
+  "payload=1,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "a"
+  },
+  "payload=2,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aa"
+  },
+  "payload=3,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaa"
+  },
+  "payload=4,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaa"
+  },
+  "payload=5,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaa"
+  },
+  "payload=6,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaa"
+  },
+  "payload=7,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaa"
+  },
+  "payload=8,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaa"
+  },
+  "payload=9,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaa"
+  },
+  "payload=10,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaa"
+  },
+  "payload=11,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaa"
+  },
+  "payload=12,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaa"
+  },
+  "payload=13,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaa"
+  },
+  "payload=14,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaaa"
+  },
+  "payload=15,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaaaa"
+  },
+  "payload=16,algo=rand": {
+    "kms": "local",
+    "type": "string",
+    "algo": "rand",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaaaaa"
+  },
+  "payload=0,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": ""
+  },
+  "payload=1,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "a"
+  },
+  "payload=2,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aa"
+  },
+  "payload=3,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaa"
+  },
+  "payload=4,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaa"
+  },
+  "payload=5,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaa"
+  },
+  "payload=6,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaa"
+  },
+  "payload=7,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaa"
+  },
+  "payload=8,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaa"
+  },
+  "payload=9,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaa"
+  },
+  "payload=10,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaa"
+  },
+  "payload=11,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaa"
+  },
+  "payload=12,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaa"
+  },
+  "payload=13,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaa"
+  },
+  "payload=14,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaaa"
+  },
+  "payload=15,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaaaa"
+  },
+  "payload=16,algo=det": {
+    "kms": "local",
+    "type": "string",
+    "algo": "det",
+    "method": "explicit",
+    "identifier": "id",
+    "allowed": true,
+    "value": "aaaaaaaaaaaaaaaa"
+  }
+}
diff --git a/driver-core/src/test/resources/client-side-encryption-external/external-key.json b/driver-core/src/test/resources/client-side-encryption-external/external-key.json
new file mode 100644
index 00000000000..b3fe0723b06
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-external/external-key.json
@@ -0,0 +1,31 @@
+{
+    "status": {
+        "$numberInt": "1"
+    }, 
+    "_id": {
+        "$binary": {
+            "base64": "LOCALAAAAAAAAAAAAAAAAA==", 
+            "subType": "04"
+        }
+    }, 
+    "masterKey": {
+        "provider": "local"
+    }, 
+    "updateDate": {
+        "$date": {
+            "$numberLong": "1557827033449"
+        }
+    }, 
+    "keyMaterial": {
+        "$binary": {
+            "base64": "Ce9HSz/HKKGkIt4uyy+jDuKGA+rLC2cycykMo6vc8jXxqa1UVDYHWq1r+vZKbnnSRBfB981akzRKZCFpC05CTyFqDhXv6OnMjpG97OZEREGIsHEYiJkBW0jJJvfLLgeLsEpBzsro9FztGGXASxyxFRZFhXvHxyiLOKrdWfs7X1O/iK3pEoHMx6uSNSfUOgbebLfIqW7TO++iQS5g1xovXA==", 
+            "subType": "00"
+        }
+    }, 
+    "creationDate": {
+        "$date": {
+            "$numberLong": "1557827033449"
+        }
+    },
+    "keyAltNames": [ "local" ]
+}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/client-side-encryption-external/external-schema.json b/driver-core/src/test/resources/client-side-encryption-external/external-schema.json
new file mode 100644
index 00000000000..7d8cad8c33d
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-external/external-schema.json
@@ -0,0 +1,19 @@
+{
+    "properties": {
+       "encrypted": {
+           "encrypt": {
+               "keyId": [
+                   {
+                       "$binary": {
+                           "base64": "LOCALAAAAAAAAAAAAAAAAA==", 
+                           "subType": "04"
+                       }
+                   }
+               ], 
+               "bsonType": "string", 
+               "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+           }
+       }
+    },
+    "bsonType": "object"
+}
diff --git a/driver-core/src/test/resources/client-side-encryption-limits/limits-doc.json b/driver-core/src/test/resources/client-side-encryption-limits/limits-doc.json
new file mode 100644
index 00000000000..4deb0baabf9
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-limits/limits-doc.json
@@ -0,0 +1,102 @@
+{
+  "00": "a",
+  "01": "a",
+  "02": "a",
+  "03": "a",
+  "04": "a",
+  "05": "a",
+  "06": "a",
+  "07": "a",
+  "08": "a",
+  "09": "a",
+  "10": "a",
+  "11": "a",
+  "12": "a",
+  "13": "a",
+  "14": "a",
+  "15": "a",
+  "16": "a",
+  "17": "a",
+  "18": "a",
+  "19": "a",
+  "20": "a",
+  "21": "a",
+  "22": "a",
+  "23": "a",
+  "24": "a",
+  "25": "a",
+  "26": "a",
+  "27": "a",
+  "28": "a",
+  "29": "a",
+  "30": "a",
+  "31": "a",
+  "32": "a",
+  "33": "a",
+  "34": "a",
+  "35": "a",
+  "36": "a",
+  "37": "a",
+  "38": "a",
+  "39": "a",
+  "40": "a",
+  "41": "a",
+  "42": "a",
+  "43": "a",
+  "44": "a",
+  "45": "a",
+  "46": "a",
+  "47": "a",
+  "48": "a",
+  "49": "a",
+  "50": "a",
+  "51": "a",
+  "52": "a",
+  "53": "a",
+  "54": "a",
+  "55": "a",
+  "56": "a",
+  "57": "a",
+  "58": "a",
+  "59": "a",
+  "60": "a",
+  "61": "a",
+  "62": "a",
+  "63": "a",
+  "64": "a",
+  "65": "a",
+  "66": "a",
+  "67": "a",
+  "68": "a",
+  "69": "a",
+  "70": "a",
+  "71": "a",
+  "72": "a",
+  "73": "a",
+  "74": "a",
+  "75": "a",
+  "76": "a",
+  "77": "a",
+  "78": "a",
+  "79": "a",
+  "80": "a",
+  "81": "a",
+  "82": "a",
+  "83": "a",
+  "84": "a",
+  "85": "a",
+  "86": "a",
+  "87": "a",
+  "88": "a",
+  "89": "a",
+  "90": "a",
+  "91": "a",
+  "92": "a",
+  "93": "a",
+  "94": "a",
+  "95": "a",
+  "96": "a",
+  "97": "a",
+  "98": "a",
+  "99": "a"
+}
diff --git a/driver-core/src/test/resources/client-side-encryption-limits/limits-key.json b/driver-core/src/test/resources/client-side-encryption-limits/limits-key.json
new file mode 100644
index 00000000000..0d928fc5417
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-limits/limits-key.json
@@ -0,0 +1,31 @@
+{
+  "status": {
+    "$numberInt": "1"
+  },
+  "_id": {
+    "$binary": {
+      "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+      "subType": "04"
+    }
+  },
+  "masterKey": {
+    "provider": "local"
+  },
+  "updateDate": {
+    "$date": {
+      "$numberLong": "1557827033449"
+    }
+  },
+  "keyMaterial": {
+    "$binary": {
+      "base64": "Ce9HSz/HKKGkIt4uyy+jDuKGA+rLC2cycykMo6vc8jXxqa1UVDYHWq1r+vZKbnnSRBfB981akzRKZCFpC05CTyFqDhXv6OnMjpG97OZEREGIsHEYiJkBW0jJJvfLLgeLsEpBzsro9FztGGXASxyxFRZFhXvHxyiLOKrdWfs7X1O/iK3pEoHMx6uSNSfUOgbebLfIqW7TO++iQS5g1xovXA==",
+      "subType": "00"
+    }
+  },
+  "creationDate": {
+    "$date": {
+      "$numberLong": "1557827033449"
+    }
+  },
+  "keyAltNames": [ "local" ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption-limits/limits-schema.json b/driver-core/src/test/resources/client-side-encryption-limits/limits-schema.json
new file mode 100644
index 00000000000..cd4cda847f3
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption-limits/limits-schema.json
@@ -0,0 +1,1405 @@
+{
+  "properties": {
+    "00": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "01": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "02": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "03": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "04": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "05": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "06": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "07": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "08": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "09": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "10": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "11": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "12": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "13": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "14": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "15": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "16": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "17": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "18": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "19": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "20": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "21": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "22": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "23": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "24": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "25": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "26": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "27": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "28": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "29": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "30": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "31": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "32": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "33": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "34": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "35": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "36": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "37": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "38": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "39": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "40": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "41": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "42": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "43": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "44": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "45": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "46": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "47": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "48": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "49": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "50": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "51": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "52": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "53": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "54": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "55": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "56": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "57": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "58": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "59": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "60": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "61": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "62": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "63": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "64": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "65": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "66": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "67": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "68": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "69": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "70": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "71": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "72": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "73": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "74": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "75": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "76": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "77": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "78": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "79": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "80": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "81": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "82": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "83": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "84": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "85": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "86": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "87": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "88": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "89": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "90": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "91": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "92": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "93": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "94": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "95": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "96": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "97": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "98": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    },
+    "99": {
+      "encrypt": {
+        "keyId": [
+          {
+            "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+            }
+          }
+        ],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    }
+  },
+  "bsonType": "object"
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/README.rst b/driver-core/src/test/resources/client-side-encryption/README.rst
new file mode 100644
index 00000000000..c43c7f47378
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/README.rst
@@ -0,0 +1,596 @@
+============================
+Client Side Encryption Tests
+============================
+
+.. contents::
+
+----
+
+Introduction
+============
+
+This document describes the format of the driver spec tests included in the JSON
+and YAML files included in this directory.
+
+Additional prose tests, that are not represented in the spec tests, are described
+and MUST be implemented by all drivers.
+
+Spec Test Format
+================
+
+The spec tests format is an extension of `transactions spec tests <https://github.com/mongodb/specifications/blob/master/source/transactions/tests/README.rst>`_ with some additions:
+
+- A ``json_schema`` to set on the collection used for operations.
+
+- A ``key_vault_data`` of data that should be inserted in the key vault collection before each test.
+
+- Introduction ``autoEncryptOpts`` to `clientOptions`
+
+- Addition of `$db` to command in `command_started_event`
+
+- Addition of `$$type` to command_started_event and outcome.
+
+The semantics of `$$type` is that any actual value matching the BSON type indicated by the BSON type string is considered a match.
+
+For example, the following matches a command_started_event for an insert of a document where `random` must be of type ``binData``::
+
+  - command_started_event:
+      command:
+        insert: *collection_name
+        documents:
+          - { random: { $$type: "binData" } }
+        ordered: true
+      command_name: insert
+
+
+The values of `$$type` correspond to `these documented string representations of BSON types <https://docs.mongodb.com/manual/reference/bson-types/>`_.
+
+
+Each YAML file has the following keys:
+
+.. |txn| replace:: Unchanged from Transactions spec tests.
+
+- ``runOn`` |txn|
+
+- ``database_name`` |txn|
+
+- ``collection_name`` |txn|
+
+- ``data`` |txn|
+
+- ``json_schema`` A JSON Schema that should be set on the collection (using ``createCollection``) before each test run.
+
+- ``key_vault_data`` The data that should exist in the key vault collection under test before each test run.
+
+- ``tests``: An array of tests that are to be run independently of each other.
+  Each test will have some or all of the following fields:
+
+  - ``description``: |txn|
+
+  - ``skipReason``: |txn|
+
+  - ``clientOptions``: Optional, parameters to pass to MongoClient().
+
+    - ``autoEncryptOpts``: Optional
+
+      - ``kmsProviders`` A dictionary of KMS providers to set on the key vault ("aws" or "local")
+
+        - ``aws`` The AWS KMS provider. An empty object. Drivers MUST fill in AWS credentials from the environment.
+
+        - ``local`` The local KMS provider.
+
+          - ``key`` A 96 byte local key.
+
+      - ``schemaMap``: Optional, a map from namespaces to local JSON schemas.
+
+      - ``keyVaultNamespace``: Optional, a namespace to the key vault collection. Defaults to "admin.datakeys".
+
+      - ``bypassAutoEncryption``: Optional, a boolean to indicate whether or not auto encryption should be bypassed. Defaults to ``false``.
+
+  - ``operations``: Array of documents, each describing an operation to be
+    executed. Each document has the following fields:
+
+    - ``name``: |txn|
+
+    - ``object``: |txn|. Defaults to "collection" if omitted.
+
+    - ``collectionOptions``: |txn|
+
+    - ``command_name``: |txn|
+
+    - ``arguments``: |txn|
+
+    - ``result``: |txn|
+
+  - ``expectations``: |txn|
+
+  - ``outcome``: |txn|
+
+
+
+Use as integration tests
+========================
+
+Do the following before running spec tests:
+
+- Start the mongocryptd process.
+- Start a mongod process with **server version 4.1.9 or later**.
+- Place credentials to an AWS IAM user (access key ID + secret access key) somewhere in the environment outside of tracked code. (If testing on evergreen, project variables are a good place).
+
+Load each YAML (or JSON) file using a Canonical Extended JSON parser.
+
+Then for each element in ``tests``:
+
+#. If the ``skipReason`` field is present, skip this test completely.
+#. If the ``key_vault_data`` field is present:
+
+   #. Drop the ``admin.datakeys`` collection using writeConcern "majority".
+   #. Insert the data specified into the ``admin.datakeys`` with write concern "majority".
+
+#. Create a MongoClient.
+
+#. Create a collection object from the MongoClient, using the ``database_name``
+   and ``collection_name`` fields from the YAML file. Drop the collection 
+   with writeConcern "majority". If a ``json_schema`` is defined in the test,
+   use the ``createCollection`` command to explicitly create the collection:
+
+   .. code:: typescript
+
+      {"create": <collection>, "validator": {"$jsonSchema": <json_schema>}}
+
+#. If the YAML file contains a ``data`` array, insert the documents in ``data``
+   into the test collection, using writeConcern "majority".
+
+#. Create a **new** MongoClient using ``clientOptions``.
+
+   #. If ``autoEncryptOpts`` includes ``aws`` as a KMS provider, pass in AWS credentials from the environment.
+   #. If ``autoEncryptOpts`` does not include ``keyVaultNamespace``, default it to ``admin.datakeys``.
+
+#. For each element in ``operations``:
+
+   - Enter a "try" block or your programming language's closest equivalent.
+   - Create a Database object from the MongoClient, using the ``database_name``
+     field at the top level of the test file.
+   - Create a Collection object from the Database, using the
+     ``collection_name`` field at the top level of the test file.
+     If ``collectionOptions`` is present create the Collection object with the
+     provided options. Otherwise create the object with the default options.
+   - Execute the named method on the provided ``object``, passing the
+     arguments listed.
+   - If the driver throws an exception / returns an error while executing this
+     series of operations, store the error message and server error code.
+   - If the result document has an "errorContains" field, verify that the
+     method threw an exception or returned an error, and that the value of the
+     "errorContains" field matches the error string. "errorContains" is a
+     substring (case-insensitive) of the actual error message.
+
+     If the result document has an "errorCodeName" field, verify that the
+     method threw a command failed exception or returned an error, and that
+     the value of the "errorCodeName" field matches the "codeName" in the
+     server error response.
+
+     If the result document has an "errorLabelsContain" field, verify that the
+     method threw an exception or returned an error. Verify that all of the
+     error labels in "errorLabelsContain" are present in the error or exception
+     using the ``hasErrorLabel`` method.
+
+     If the result document has an "errorLabelsOmit" field, verify that the
+     method threw an exception or returned an error. Verify that none of the
+     error labels in "errorLabelsOmit" are present in the error or exception
+     using the ``hasErrorLabel`` method.
+   - If the operation returns a raw command response, eg from ``runCommand``,
+     then compare only the fields present in the expected result document.
+     Otherwise, compare the method's return value to ``result`` using the same
+     logic as the CRUD Spec Tests runner.
+
+#. If the test includes a list of command-started events in ``expectations``,
+   compare them to the actual command-started events using the
+   same logic as the Command Monitoring Spec Tests runner.
+
+#. For each element in ``outcome``:
+
+   - If ``name`` is "collection", create a new MongoClient *without encryption*
+     and verify that the test collection contains exactly the documents in the 
+     ``data`` array. Ensure this find reads the latest data by using
+     **primary read preference** with **local read concern** even when the
+     MongoClient is configured with another read preference or read concern.
+
+The spec test MUST be run with *and* without auth.
+
+Prose Tests
+===========
+
+Tests for the ClientEncryption type are not included as part of the YAML tests.
+
+In the prose tests LOCAL_MASTERKEY refers to the following base64:
+
+.. code:: javascript
+
+  Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk
+
+Data key and double encryption
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, perform the setup.
+
+#. Create a MongoClient without encryption enabled (referred to as ``client``). Enable command monitoring to listen for command_started events.
+
+#. Using ``client``, drop the collections ``admin.datakeys`` and ``db.coll``.
+
+#. Create the following:
+
+   - A MongoClient configured with auto encryption (referred to as ``client_encrypted``)
+   - A ``ClientEncryption`` object (referred to as ``client_encryption``)
+
+   Configure both objects with ``aws`` and the ``local`` KMS providers as follows:
+
+   .. code:: javascript
+
+      {
+          "aws": { <AWS credentials> },
+          "local": { "key": <base64 decoding of LOCAL_MASTERKEY> }
+      }
+
+   Configure both objects with ``keyVaultNamespace`` set to ``admin.datakeys``.
+
+   Configure the ``MongoClient`` with the following ``schema_map``:
+
+   .. code:: javascript
+
+      {
+        "db.coll": {
+          "bsonType": "object",
+          "properties": {
+            "encrypted_placeholder": {
+              "encrypt": {
+                "keyId": "/placeholder",
+                "bsonType": "string",
+                "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+              }
+            }
+          }
+        }
+      }
+
+   Configure ``client_encryption`` with the ``keyVaultClient`` of the previously created ``client``.
+
+Then, test creating and using data keys from a ``local`` KMS provider:
+
+#. Call ``client_encryption.createDataKey()`` with the ``local`` KMS provider and keyAltNames set to ``["local_altname"]``.
+
+   - Expect a BSON binary with subtype 4 to be returned, referred to as ``local_datakey_id``.
+   - Use ``client`` to run a ``find`` on ``admin.datakeys`` by querying with the ``_id`` set to the ``local_datakey_id``.
+   - Expect that exactly one document is returned with the "masterKey.provider" equal to "local".
+   - Check that ``client`` captured a command_started event for the ``insert`` command containing a majority writeConcern.
+
+#. Call ``client_encryption.encrypt()`` with the value "hello local", the algorithm ``AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic``, and the ``key_id`` of ``local_datakey_id``.
+
+   - Expect the return value to be a BSON binary subtype 6, referred to as ``local_encrypted``.
+   - Use ``client_encrypted`` to insert ``{ _id: "local", "value": <local_encrypted> }`` into ``db.coll``.
+   - Use ``client_encrypted`` to run a find querying with ``_id`` of "local" and expect ``value`` to be "hello local".
+
+#. Call ``client_encryption.encrypt()`` with the value "hello local", the algorithm ``AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic``, and the ``key_alt_name`` of ``local_altname``.
+
+   - Expect the return value to be a BSON binary subtype 6. Expect the value to exactly match the value of ``local_encrypted``.
+
+Then, repeat the above tests with the ``aws`` KMS provider:
+
+#. Call ``client_encryption.createDataKey()`` with the ``aws`` KMS provider, keyAltNames set to ``["aws_altname"]``, and ``masterKey`` as follows:
+
+   .. code:: javascript
+
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
+      }
+
+
+   - Expect a BSON binary with subtype 4 to be returned, referred to as ``aws_datakey_id``.
+   - Use ``client`` to run a ``find`` on ``admin.datakeys`` by querying with the ``_id`` set to the ``aws_datakey_id``.
+   - Expect that exactly one document is returned with the "masterKey.provider" equal to "aws".
+   - Check that ``client`` captured a command_started event for the ``insert`` command containing a majority writeConcern.
+
+#. Call ``client_encryption.encrypt()`` with the value "hello aws", the algorithm ``AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic``, and the ``key_id`` of ``aws_datakey_id``.
+
+   - Expect the return value to be a BSON binary subtype 6, referred to as ``aws_encrypted``.
+   - Use ``client_encrypted`` to insert ``{ _id: "aws", "value": <aws_encrypted> }`` into ``db.coll``.
+   - Use ``client_encrypted`` to run a find querying with ``_id`` of "aws" and expect ``value`` to be "hello aws".
+
+#. Call ``client_encryption.encrypt()`` with the value "hello aws", the algorithm ``AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic``, and the ``key_alt_name`` of ``aws_altname``.
+
+   - Expect the return value to be a BSON binary subtype 6. Expect the value to exactly match the value of ``aws_encrypted``.
+
+
+Then, run the following final tests:
+
+#. Test explicit encrypting an auto encrypted field.
+
+   - Use ``client_encrypted`` to attempt to insert ``{ "encrypted_placeholder": (local_encrypted) }``
+   - Expect an exception to be thrown, since this is an attempt to auto encrypt an already encrypted value.
+
+
+
+External Key Vault Test
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Run the following tests twice, parameterized by a boolean ``withExternalKeyVault``.
+
+#. Create a MongoClient without encryption enabled (referred to as ``client``).
+
+#. Using ``client``, drop the collections ``admin.datakeys`` and ``db.coll``.
+   Insert the document `external/external-key.json <../external/external-key.json>`_ into ``admin.datakeys``.
+
+#. Create the following:
+
+   - A MongoClient configured with auto encryption (referred to as ``client_encrypted``)
+   - A ``ClientEncryption`` object (referred to as ``client_encryption``)
+
+   Configure both objects with the ``local`` KMS providers as follows:
+
+   .. code:: javascript
+
+      { "local": { "key": <base64 decoding of LOCAL_MASTERKEY> } }
+
+   Configure both objects with ``keyVaultNamespace`` set to ``admin.datakeys``.
+
+   Configure ``client_encrypted`` to use the schema `external/external-schema.json <../external/external-schema.json>`_  for ``db.coll`` by setting a schema map like: ``{ "db.coll": <contents of external-schema.json>}``
+
+   If ``withExternalKeyVault == true``, configure both objects with an external key vault client. The external client MUST connect to the same
+   MongoDB cluster that is being tested against, except it MUST use the username ``fake-user`` and password ``fake-pwd``.
+
+#. Use ``client_encrypted`` to insert the document ``{"encrypted": "test"}`` into ``db.coll``.
+   If ``withExternalKeyVault == true``, expect an authentication exception to be thrown. Otherwise, expect the insert to succeed.
+
+#. Use ``client_encryption`` to explicitly encrypt the string ``"test"`` with key ID ``LOCALAAAAAAAAAAAAAAAAA==`` and deterministic algorithm.
+   If ``withExternalKeyVault == true``, expect an authentication exception to be thrown. Otherwise, expect the insert to succeed.
+
+
+BSON size limits and batch splitting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, perform the setup.
+
+#. Create a MongoClient without encryption enabled (referred to as ``client``).
+
+#. Using ``client``, drop and create the collection ``db.coll`` configured with the included JSON schema `limits/limits-schema.json <../limits/limits-schema.json>`_.
+
+#. Using ``client``, drop the collection ``admin.datakeys``. Insert the document `limits/limits-key.json <../limits/limits-key.json>`_
+
+#. Create a MongoClient configured with auto encryption (referred to as ``client_encrypted``)
+
+   Configure with the ``local`` KMS provider as follows:
+
+   .. code:: javascript
+
+      { "local": { "key": <base64 decoding of LOCAL_MASTERKEY> } }
+
+   Configure with the ``keyVaultNamespace`` set to ``admin.datakeys``.
+
+Using ``client_encrypted`` perform the following operations:
+
+#. Insert ``{ "_id": "over_2mib_under_16mib", "unencrypted": <the string "a" repeated 2097152 times> }``.
+
+   Expect this to succeed since this is still under the ``maxBsonObjectSize`` limit.
+
+#. Insert the document `limits/limits-doc.json <../limits/limits-doc.json>`_ concatenated with ``{ "_id": "encryption_exceeds_2mib", "unencrypted": < the string "a" repeated (2097152 - 2000) times > }``
+   Note: limits-doc.json is a 1005 byte BSON document that encrypts to a ~10,000 byte document.
+
+   Expect this to succeed since after encryption this still is below the normal maximum BSON document size.
+   Note, before auto encryption this document is under the 2 MiB limit. After encryption it exceeds the 2 MiB limit, but does NOT exceed the 16 MiB limit.
+
+#. Bulk insert the following:
+
+   - ``{ "_id": "over_2mib_1", "unencrypted": <the string "a" repeated (2097152) times> }``
+
+   - ``{ "_id": "over_2mib_2", "unencrypted": <the string "a" repeated (2097152) times> }``
+
+   Expect the bulk write to succeed and split after first doc (i.e. two inserts occur). This may be verified using `command monitoring <https://github.com/mongodb/specifications/tree/master/source/command-monitoring/command-monitoring.rst>`_.
+
+#. Bulk insert the following:
+
+   - The document `limits/limits-doc.json <../limits/limits-doc.json>`_ concatenated with ``{ "_id": "encryption_exceeds_2mib_1", "unencrypted": < the string "a" repeated (2097152 - 2000) times > }``
+
+   - The document `limits/limits-doc.json <../limits/limits-doc.json>`_ concatenated with ``{ "_id": "encryption_exceeds_2mib_2", "unencrypted": < the string "a" repeated (2097152 - 2000) times > }``
+
+   Expect the bulk write to succeed and split after first doc (i.e. two inserts occur). This may be verified using `command monitoring <https://github.com/mongodb/specifications/tree/master/source/command-monitoring/command-monitoring.rst>`_.
+
+#. Insert ``{ "_id": "under_16mib", "unencrypted": <the string "a" repeated 16777216 - 2000 times>``.
+
+   Expect this to succeed since this is still (just) under the ``maxBsonObjectSize`` limit.
+
+#. Insert the document `limits/limits-doc.json <../limits/limits-doc.json>`_ concatenated with ``{ "_id": "encryption_exceeds_16mib", "unencrypted": < the string "a" repeated (16777216 - 2000) times > }``
+
+   Expect this to fail since encryption results in a document exceeding the ``maxBsonObjectSize`` limit.
+
+Optionally, if it is possible to mock the maxWriteBatchSize (i.e. the maximum number of documents in a batch) test that setting maxWriteBatchSize=1 and inserting the two documents ``{ "_id": "a" }, { "_id": "b" }`` with ``client_encrypted`` splits the operation into two inserts.
+
+
+Views are prohibited
+~~~~~~~~~~~~~~~~~~~~
+
+#. Create a MongoClient without encryption enabled (referred to as ``client``).
+
+#. Using ``client``, drop and create a view named ``db.view`` with an empty pipeline. E.g. using the command ``{ "create": "view", "viewOn": "coll" }``.
+
+#. Create a MongoClient configured with auto encryption (referred to as ``client_encrypted``)
+
+   Configure with the ``local`` KMS provider as follows:
+
+   .. code:: javascript
+
+      { "local": { "key": <base64 decoding of LOCAL_MASTERKEY> } }
+
+   Configure with the ``keyVaultNamespace`` set to ``admin.datakeys``.
+
+#. Using ``client_encrypted``, attempt to insert a document into ``db.view``. Expect an exception to be thrown containing the message: "cannot auto encrypt a view".
+
+
+Corpus Test
+===========
+
+The corpus test exhaustively enumerates all ways to encrypt all BSON value types. Note, the test data includes BSON binary subtype 4 (or standard UUID), which MUST be decoded and encoded as subtype 4. Run the test as follows.
+
+1. Create a MongoClient without encryption enabled (referred to as ``client``).
+
+2. Using ``client``, drop and create the collection ``db.coll`` configured with the included JSON schema `corpus/corpus-schema.json <../corpus/corpus-schema.json>`_.
+
+3. Using ``client``, drop the collection ``admin.datakeys``. Insert the documents `corpus/corpus-key-local.json <../corpus/corpus-key-local.json>`_ and `corpus/corpus-key-aws.json <../corpus/corpus-key-aws.json>`_.
+
+4. Create the following:
+
+   - A MongoClient configured with auto encryption (referred to as ``client_encrypted``)
+   - A ``ClientEncryption`` object (referred to as ``client_encryption``)
+
+   Configure both objects with ``aws`` and the ``local`` KMS providers as follows:
+
+   .. code:: javascript
+
+      {
+          "aws": { <AWS credentials> },
+          "local": { "key": <base64 decoding of LOCAL_MASTERKEY> }
+      }
+
+   Where LOCAL_MASTERKEY is the following base64:
+
+   .. code:: javascript
+
+      Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk
+
+   Configure both objects with ``keyVaultNamespace`` set to ``admin.datakeys``.
+
+5. Load `corpus/corpus.json <../corpus/corpus.json>`_ to a variable named ``corpus``. The corpus contains subdocuments with the following fields:
+
+   - ``kms`` is either ``aws`` or ``local``
+   - ``type`` is a BSON type string `names coming from here <https://docs.mongodb.com/manual/reference/operator/query/type/>`_)
+   - ``algo`` is either ``rand`` or ``det`` for random or deterministic encryption
+   - ``method`` is either ``auto``, for automatic encryption or ``explicit`` for  explicit encryption
+   - ``identifier`` is either ``id`` or ``altname`` for the key identifier
+   - ``allowed`` is a boolean indicating whether the encryption for the given parameters is permitted.
+   - ``value`` is the value to be tested.
+
+   Create a new BSON document, named ``corpus_copied``.
+   Iterate over each field of ``corpus``.
+
+   - If the field name is ``_id``, ``altname_aws`` and ``altname_local``, copy the field to ``corpus_copied``.
+   - If ``method`` is ``auto``, copy the field to ``corpus_copied``.
+   - If ``method`` is ``explicit``, use ``client_encryption`` to explicitly encrypt the value.
+
+     - Encrypt with the algorithm described by ``algo``.
+     - If ``identifier`` is ``id``
+
+       - If ``kms`` is ``local`` set the key_id to the UUID with base64 value ``LOCALAAAAAAAAAAAAAAAAA==``.
+       - If ``kms`` is ``aws`` set the key_id to the UUID with base64 value ``AWSAAAAAAAAAAAAAAAAAAA==``.
+
+     - If ``identifier`` is ``altname``
+
+       - If ``kms`` is ``local`` set the key_alt_name to "local".
+       - If ``kms`` is ``aws`` set the key_alt_name to "aws".
+
+     If ``allowed`` is true, copy the field and encrypted value to ``corpus_copied``.
+     If ``allowed`` is false. verify that an exception is thrown. Copy the unencrypted value to to ``corpus_copied``.
+
+
+6. Using ``client_encrypted``, insert ``corpus_copied`` into ``db.coll``.
+
+7. Using ``client_encrypted``, find the inserted document from ``db.coll`` to a variable named ``corpus_decrypted``. Since it should have been automatically decrypted, assert the document exactly matches ``corpus``.
+
+8. Load `corpus/corpus_encrypted.json <../corpus/corpus-encrypted.json>`_ to a variable named ``corpus_encrypted_expected``.
+   Using ``client`` find the inserted document from ``db.coll`` to a variable named ``corpus_encrypted_actual``.
+
+   Iterate over each field of ``corpus_encrypted_expected`` and check the following:
+
+   - If the ``algo`` is ``det``, that the value equals the value of the corresponding field in ``corpus_encrypted_actual``.
+   - If the ``algo`` is ``rand`` and ``allowed`` is true, that the value does not equal the value of the corresponding field in ``corpus_encrypted_actual``.
+   - If ``allowed`` is true, decrypt the value with ``client_encryption``. Decrypt the value of the corresponding field of ``corpus_encrypted`` and validate that they are both equal.
+   - If ``allowed`` is false, validate the value exactly equals the value of the corresponding field of ``corpus`` (neither was encrypted).
+
+9. Repeat steps 1-8 with a local JSON schema. I.e. amend step 4 to configure the schema on ``client_encrypted`` with the ``schema_map`` option.
+
+Custom Endpoint Test
+====================
+
+Data keys created with AWS KMS may specify a custom endpoint to contact (instead of the default endpoint derived from the AWS region).
+
+1. Create a ``ClientEncryption`` object (referred to as ``client_encryption``)
+
+   Configure with ``aws`` KMS providers as follows:
+
+   .. code:: javascript
+
+      {
+          "aws": { <AWS credentials> }
+      }
+
+   Configure with ``keyVaultNamespace`` set to ``admin.datakeys``, and a default MongoClient as the ``keyVaultClient``.
+
+2. Call `client_encryption.createDataKey()` with "aws" as the provider and the following masterKey:
+
+   .. code:: javascript
+
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
+      }
+
+   Expect this to succeed. Use the returned UUID of the key to explicitly encrypt and decrypt the string "test" to validate it works.
+
+3. Call `client_encryption.createDataKey()` with "aws" as the provider and the following masterKey:
+
+   .. code:: javascript
+
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        endpoint: "kms.us-east-1.amazonaws.com"
+      }
+
+   Expect this to succeed. Use the returned UUID of the key to explicitly encrypt and decrypt the string "test" to validate it works.
+
+4. Call `client_encryption.createDataKey()` with "aws" as the provider and the following masterKey:
+
+   .. code:: javascript
+
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        endpoint: "kms.us-east-1.amazonaws.com:443"
+      }
+
+   Expect this to succeed. Use the returned UUID of the key to explicitly encrypt and decrypt the string "test" to validate it works.
+
+5. Call `client_encryption.createDataKey()` with "aws" as the provider and the following masterKey:
+
+   .. code:: javascript
+
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        endpoint: "kms.us-east-1.amazonaws.com:12345"
+      }
+
+   Expect this to fail with a socket connection error.
+
+6. Call `client_encryption.createDataKey()` with "aws" as the provider and the following masterKey:
+
+   .. code:: javascript
+
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        endpoint: "kms.us-east-2.amazonaws.com"
+      }
+
+   Expect this to fail with an exception with a message containing the string: "us-east-1"
+
+7. Call `client_encryption.createDataKey()` with "aws" as the provider and the following masterKey:
+
+   .. code:: javascript
+
+      {
+        region: "us-east-1",
+        key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        endpoint: "example.com"
+      }
+
+   Expect this to fail with an exception with a message containing the string: "parse error"
+
diff --git a/driver-core/src/test/resources/client-side-encryption/aggregate.json b/driver-core/src/test/resources/client-side-encryption/aggregate.json
new file mode 100644
index 00000000000..6bc92427178
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/aggregate.json
@@ -0,0 +1,414 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Aggregate with deterministic encryption",
+      "skipReason": "SERVER-39395",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "encrypted_string": "457-55-5642"
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "default",
+              "pipeline": [
+                {
+                  "$match": {
+                    "encrypted_string": "457-55-5642"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Aggregate with empty pipeline",
+      "skipReason": "SERVER-40829 hides agg support behind enableTestCommands flag.",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "arguments": {
+            "pipeline": []
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "default",
+              "pipeline": [],
+              "cursor": {}
+            },
+            "command_name": "aggregate"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Aggregate should fail with random encryption",
+      "skipReason": "SERVER-39395",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "random": "abc"
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorContains": "Cannot query on fields encrypted with the randomized encryption"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Database aggregate should fail",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "database",
+          "arguments": {
+            "pipeline": [
+              {
+                "$currentOp": {
+                  "allUsers": false,
+                  "idleConnections": false,
+                  "localOps": true
+                }
+              },
+              {
+                "$match": {
+                  "command.aggregate": {
+                    "$eq": 1
+                  }
+                }
+              },
+              {
+                "$project": {
+                  "command": 1
+                }
+              },
+              {
+                "$project": {
+                  "command.lsid": 0
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorContains": "non-collection command not supported for auto encryption: aggregate"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/badQueries.json b/driver-core/src/test/resources/client-side-encryption/badQueries.json
new file mode 100644
index 00000000000..824a53c00b1
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/badQueries.json
@@ -0,0 +1,1446 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "$text unconditionally fails",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "$text": {
+                "$search": "search text"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Unsupported match expression operator for encryption"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$where unconditionally fails",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "$where": {
+                "$code": "function() { return true }"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Unsupported match expression operator for encryption"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$bit operators succeed on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$bitsAllClear": 35
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$bitsAllClear": 35
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$bitsAllSet": 35
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$bitsAllSet": 35
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$bitsAnyClear": 35
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$bitsAnyClear": 35
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$bitsAnySet": 35
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$bitsAnySet": 35
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        }
+      ]
+    },
+    {
+      "description": "geo operators succeed on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$near": [
+                  0,
+                  0
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "unable to find index"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$near": [
+                  0,
+                  0
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$nearSphere": [
+                  0,
+                  0
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "unable to find index"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$nearSphere": [
+                  0,
+                  0
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$geoIntersects": {
+                  "$geometry": {
+                    "type": "Polygon",
+                    "coordinates": [
+                      [
+                        [
+                          0,
+                          0
+                        ],
+                        [
+                          1,
+                          0
+                        ],
+                        [
+                          1,
+                          1
+                        ],
+                        [
+                          0,
+                          0
+                        ]
+                      ]
+                    ]
+                  }
+                }
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$geoIntersects": {
+                  "$geometry": {
+                    "type": "Polygon",
+                    "coordinates": [
+                      [
+                        [
+                          0,
+                          0
+                        ],
+                        [
+                          1,
+                          0
+                        ],
+                        [
+                          1,
+                          1
+                        ],
+                        [
+                          0,
+                          0
+                        ]
+                      ]
+                    ]
+                  }
+                }
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$geoWithin": {
+                  "$geometry": {
+                    "type": "Polygon",
+                    "coordinates": [
+                      [
+                        [
+                          0,
+                          0
+                        ],
+                        [
+                          1,
+                          0
+                        ],
+                        [
+                          1,
+                          1
+                        ],
+                        [
+                          0,
+                          0
+                        ]
+                      ]
+                    ]
+                  }
+                }
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$geoWithin": {
+                  "$geometry": {
+                    "type": "Polygon",
+                    "coordinates": [
+                      [
+                        [
+                          0,
+                          0
+                        ],
+                        [
+                          1,
+                          0
+                        ],
+                        [
+                          1,
+                          1
+                        ],
+                        [
+                          0,
+                          0
+                        ]
+                      ]
+                    ]
+                  }
+                }
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        }
+      ]
+    },
+    {
+      "description": "inequality operators succeed on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$lt": 1
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$lt": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$gte": 1
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$gte": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$lte": 1
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$lte": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        }
+      ]
+    },
+    {
+      "description": "other misc operators succeed on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$mod": [
+                  3,
+                  1
+                ]
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$mod": [
+                  3,
+                  1
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$regex": "pattern",
+                "$options": ""
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$regex": "pattern",
+                "$options": ""
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$size": 2
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$size": 2
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$type": 2
+              }
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$type": 2
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Invalid match expression operator on encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$eq": null
+              }
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string1"
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$eq": null
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Illegal equality to null predicate for encrypted field"
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "unencrypted": {
+                "$in": [
+                  null
+                ]
+              }
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string1"
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$in": [
+                  null
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Illegal equality to null inside $in against an encrypted field"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$addToSet succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$addToSet": {
+                "unencrypted": [
+                  "a"
+                ]
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$addToSet": {
+                "encrypted_string": [
+                  "a"
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$addToSet not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$inc succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$inc": {
+                "unencrypted": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$inc": {
+                "encrypted_string": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$inc and $mul not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$mul succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$mul": {
+                "unencrypted": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$mul": {
+                "encrypted_string": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$inc and $mul not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$max succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$max": {
+                "unencrypted": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$max": {
+                "encrypted_string": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$max and $min not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$min succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$min": {
+                "unencrypted": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$min": {
+                "encrypted_string": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$max and $min not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$currentDate succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$currentDate": {
+                "unencrypted": true
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$currentDate": {
+                "encrypted_string": true
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$currentDate not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$pop succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$pop": {
+                "unencrypted": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 0,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$pop": {
+                "encrypted_string": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$pop not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$pull succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$pull": {
+                "unencrypted": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 0,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$pull": {
+                "encrypted_string": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$pull not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$pullAll succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$pullAll": {
+                "unencrypted": [
+                  1
+                ]
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 0,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$pullAll": {
+                "encrypted_string": [
+                  1
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$pullAll not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$push succeeds on unencrypted, error on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$push": {
+                "unencrypted": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$push": {
+                "encrypted_string": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$push not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "array filters on encrypted fields does not error in mongocryptd, but errors in mongod",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$set": {
+                "encrypted_string.$[i].x": 1
+              }
+            },
+            "arrayFilters": [
+              {
+                "i.x": 1
+              }
+            ]
+          },
+          "result": {
+            "errorContains": "Array update operations not allowed on encrypted values"
+          }
+        }
+      ]
+    },
+    {
+      "description": "positional operator succeeds on unencrypted, errors on encrypted",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {
+              "unencrypted": 1
+            },
+            "update": {
+              "$set": {
+                "unencrypted.$": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 0,
+            "modifiedCount": 0,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "abc"
+            },
+            "update": {
+              "$set": {
+                "encrypted_string.$": "abc"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot encrypt fields below '$' positional update operator"
+          }
+        }
+      ]
+    },
+    {
+      "description": "an update that would produce an array on an encrypted field errors",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$set": {
+                "encrypted_string": [
+                  1,
+                  2
+                ]
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot encrypt element of type array"
+          }
+        }
+      ]
+    },
+    {
+      "description": "an insert with encrypted field on _id errors",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          },
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "_id": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorContains": "Invalid schema containing the 'encrypt' keyword."
+          }
+        }
+      ]
+    },
+    {
+      "description": "an insert with an array value for an encrypted field fails",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "encrypted_string": [
+                "123",
+                "456"
+              ]
+            }
+          },
+          "result": {
+            "errorContains": "Cannot encrypt element of type array"
+          }
+        }
+      ]
+    },
+    {
+      "description": "an insert with a Timestamp(0,0) value in the top-level fails",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "random": {
+                "$timestamp": {
+                  "t": 0,
+                  "i": 0
+                }
+              }
+            }
+          },
+          "result": {
+            "errorContains": "A command that inserts cannot supply Timestamp(0, 0) for an encrypted"
+          }
+        }
+      ]
+    },
+    {
+      "description": "distinct with the key referring to a field where the keyID is a JSON Pointer errors",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "arguments": {
+            "filter": {},
+            "fieldName": "encrypted_w_altname"
+          },
+          "result": {
+            "errorContains": "The distinct key is not allowed to be marked for encryption with a non-UUID keyId"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/badSchema.json b/driver-core/src/test/resources/client-side-encryption/badSchema.json
new file mode 100644
index 00000000000..1fd0f8ed3f9
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/badSchema.json
@@ -0,0 +1,254 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Schema with an encrypted field in an array",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_string": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                }
+              },
+              "bsonType": "array"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          },
+          "result": {
+            "errorContains": "Invalid schema"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "Schema without specifying parent object types",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "foo": {
+                  "properties": {
+                    "bar": {
+                      "encrypt": {
+                        "keyId": [
+                          {
+                            "$binary": {
+                              "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                              "subType": "04"
+                            }
+                          }
+                        ],
+                        "bsonType": "string",
+                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          },
+          "result": {
+            "errorContains": "Invalid schema"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "Schema with siblings of encrypt document",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_string": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  },
+                  "bsonType": "object"
+                }
+              }
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          },
+          "result": {
+            "errorContains": "'encrypt' cannot be used in conjunction with 'bsonType'"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "Schema with logical keywords",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "anyOf": [
+                {
+                  "properties": {
+                    "encrypted_string": {
+                      "encrypt": {
+                        "keyId": [
+                          {
+                            "$binary": {
+                              "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                              "subType": "04"
+                            }
+                          }
+                        ],
+                        "bsonType": "string",
+                        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          },
+          "result": {
+            "errorContains": "Invalid schema"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/basic.json b/driver-core/src/test/resources/client-side-encryption/basic.json
new file mode 100644
index 00000000000..371894e8ca2
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/basic.json
@@ -0,0 +1,374 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Insert with deterministic encryption, then find it",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Insert with randomized encryption, then find it",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "random": "123"
+            }
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "random": "123"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "random": {
+                    "$$type": "binData"
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "random": {
+                "$$type": "binData"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/bulk.json b/driver-core/src/test/resources/client-side-encryption/bulk.json
new file mode 100644
index 00000000000..7a401d5e8ee
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/bulk.json
@@ -0,0 +1,345 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Bulk write with encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "bulkWrite",
+          "arguments": {
+            "requests": [
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 1,
+                    "encrypted_string": "string0",
+                    "random": "abc"
+                  }
+                }
+              },
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 2,
+                    "encrypted_string": "string1"
+                  }
+                }
+              },
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {
+                    "encrypted_string": "string0"
+                  },
+                  "update": {
+                    "$set": {
+                      "encrypted_string": "string1"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "deleteOne",
+                "arguments": {
+                  "filter": {
+                    "$and": [
+                      {
+                        "encrypted_string": "string1"
+                      },
+                      {
+                        "_id": 2
+                      }
+                    ]
+                  }
+                }
+              }
+            ],
+            "options": {
+              "ordered": true
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  },
+                  "random": {
+                    "$$type": "binData"
+                  }
+                },
+                {
+                  "_id": 2,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "default",
+              "updates": [
+                {
+                  "q": {
+                    "encrypted_string": {
+                      "$eq": {
+                        "$binary": {
+                          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                          "subType": "06"
+                        }
+                      }
+                    }
+                  },
+                  "u": {
+                    "$set": {
+                      "encrypted_string": {
+                        "$binary": {
+                          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                          "subType": "06"
+                        }
+                      }
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "update"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "default",
+              "deletes": [
+                {
+                  "q": {
+                    "$and": [
+                      {
+                        "encrypted_string": {
+                          "$eq": {
+                            "$binary": {
+                              "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                              "subType": "06"
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "_id": {
+                          "$eq": 2
+                        }
+                      }
+                    ]
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "delete"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/bypassAutoEncryption.json b/driver-core/src/test/resources/client-side-encryption/bypassAutoEncryption.json
new file mode 100644
index 00000000000..42f44732235
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/bypassAutoEncryption.json
@@ -0,0 +1,402 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Insert with bypassAutoEncryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "bypassAutoEncryption": true,
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 2,
+              "encrypted_string": "string0"
+            },
+            "bypassDocumentValidation": true
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {}
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 2,
+                  "encrypted_string": "string0"
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {}
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Insert with bypassAutoEncryption for local schema",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_w_altname": {
+                  "encrypt": {
+                    "keyId": "/altname",
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                },
+                "random": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string_equivalent": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "bypassAutoEncryption": true,
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 2,
+              "encrypted_string": "string0"
+            },
+            "bypassDocumentValidation": true
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {}
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 2,
+                  "encrypted_string": "string0"
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {}
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/bypassedCommand.json b/driver-core/src/test/resources/client-side-encryption/bypassedCommand.json
new file mode 100644
index 00000000000..bd0b1c565d7
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/bypassedCommand.json
@@ -0,0 +1,106 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {},
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "ping is bypassed",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "ping",
+          "arguments": {
+            "command": {
+              "ping": 1
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "ping": 1
+            },
+            "command_name": "ping"
+          }
+        }
+      ]
+    },
+    {
+      "description": "current op is not bypassed",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "currentOp",
+          "arguments": {
+            "command": {
+              "currentOp": 1
+            }
+          },
+          "result": {
+            "errorContains": "command not supported for auto encryption: currentOp"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/count.json b/driver-core/src/test/resources/client-side-encryption/count.json
new file mode 100644
index 00000000000..9ac5104a09b
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/count.json
@@ -0,0 +1,241 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Count with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            }
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "default",
+              "query": {
+                "encrypted_string": {
+                  "$eq": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              }
+            },
+            "command_name": "count"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count fails when filtering on a random encrypted field",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "arguments": {
+            "filter": {
+              "random": "abc"
+            }
+          },
+          "result": {
+            "errorContains": "Cannot query on fields encrypted with the randomized encryption"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/countDocuments.json b/driver-core/src/test/resources/client-side-encryption/countDocuments.json
new file mode 100644
index 00000000000..d4ae0aeb469
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/countDocuments.json
@@ -0,0 +1,253 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "countDocuments with deterministic encryption",
+      "skipReason": "waiting on SERVER-39395",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            }
+          },
+          "result": 1
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "default",
+              "pipeline": [
+                {
+                  "$match": {
+                    "encrypted_string": {
+                      "$binary": {
+                        "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                        "subType": "06"
+                      }
+                    }
+                  }
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/delete.json b/driver-core/src/test/resources/client-side-encryption/delete.json
new file mode 100644
index 00000000000..bb9c0615560
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/delete.json
@@ -0,0 +1,364 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "deleteOne with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "deleteOne",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            }
+          },
+          "result": {
+            "deletedCount": 1
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "default",
+              "deletes": [
+                {
+                  "q": {
+                    "encrypted_string": {
+                      "$eq": {
+                        "$binary": {
+                          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                          "subType": "06"
+                        }
+                      }
+                    }
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "delete"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "deleteMany with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "deleteMany",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$in": [
+                  "string0",
+                  "string1"
+                ]
+              }
+            }
+          },
+          "result": {
+            "deletedCount": 2
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "default",
+              "deletes": [
+                {
+                  "q": {
+                    "encrypted_string": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                            "subType": "06"
+                          }
+                        },
+                        {
+                          "$binary": {
+                            "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                            "subType": "06"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  "limit": 0
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "delete"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/distinct.json b/driver-core/src/test/resources/client-side-encryption/distinct.json
new file mode 100644
index 00000000000..c473030580e
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/distinct.json
@@ -0,0 +1,288 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 3,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "distinct with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            },
+            "fieldName": "encrypted_string"
+          },
+          "result": [
+            "string0"
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "default",
+              "key": "encrypted_string",
+              "query": {
+                "encrypted_string": {
+                  "$eq": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              }
+            },
+            "command_name": "distinct"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 3,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Distinct fails when filtering on a random encrypted field",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "arguments": {
+            "filter": {
+              "random": "abc"
+            },
+            "fieldName": "encrypted_string"
+          },
+          "result": {
+            "errorContains": "Cannot query on fields encrypted with the randomized encryption"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/explain.json b/driver-core/src/test/resources/client-side-encryption/explain.json
new file mode 100644
index 00000000000..6872cedf2b0
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/explain.json
@@ -0,0 +1,251 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Explain a find with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "explain",
+          "arguments": {
+            "command": {
+              "explain": {
+                "find": "default",
+                "filter": {
+                  "encrypted_string": "string1"
+                }
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "explain": {
+                "find": "default",
+                "filter": {
+                  "encrypted_string": {
+                    "$eq": {
+                      "$binary": {
+                        "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                        "subType": "06"
+                      }
+                    }
+                  }
+                }
+              },
+              "verbosity": "allPlansExecution"
+            },
+            "command_name": "explain"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/find.json b/driver-core/src/test/resources/client-side-encryption/find.json
new file mode 100644
index 00000000000..93cef311c08
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/find.json
@@ -0,0 +1,432 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      },
+      "random": {
+        "$binary": {
+          "base64": "AgAAAAAAAAAAAAAAAAAAAAACyfp+lXvKOi7f5vh6ZsCijLEaXFKq1X06RmyS98ZvmMQGixTw8HM1f/bGxZjGwvYwjXOkIEb7Exgb8p2KCDI5TQ==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Find with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "encrypted_string": {
+                  "$eq": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$binary": {
+                  "base64": "AgAAAAAAAAAAAAAAAAAAAAACyfp+lXvKOi7f5vh6ZsCijLEaXFKq1X06RmyS98ZvmMQGixTw8HM1f/bGxZjGwvYwjXOkIEb7Exgb8p2KCDI5TQ==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Find with $in with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$in": [
+                  "string0",
+                  "string1"
+                ]
+              }
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string1",
+              "random": "abc"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "encrypted_string": {
+                  "$in": [
+                    {
+                      "$binary": {
+                        "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                        "subType": "06"
+                      }
+                    },
+                    {
+                      "$binary": {
+                        "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                        "subType": "06"
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$binary": {
+                  "base64": "AgAAAAAAAAAAAAAAAAAAAAACyfp+lXvKOi7f5vh6ZsCijLEaXFKq1X06RmyS98ZvmMQGixTw8HM1f/bGxZjGwvYwjXOkIEb7Exgb8p2KCDI5TQ==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Find fails when filtering on a random encrypted field",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "random": "abc"
+            }
+          },
+          "result": {
+            "errorContains": "Cannot query on fields encrypted with the randomized encryption"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/findOneAndDelete.json b/driver-core/src/test/resources/client-side-encryption/findOneAndDelete.json
new file mode 100644
index 00000000000..2d9f963f23d
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/findOneAndDelete.json
@@ -0,0 +1,233 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "findOneAndDelete with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "findOneAndDelete",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "default",
+              "query": {
+                "encrypted_string": {
+                  "$eq": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              },
+              "remove": true
+            },
+            "command_name": "findAndModify"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/findOneAndReplace.json b/driver-core/src/test/resources/client-side-encryption/findOneAndReplace.json
new file mode 100644
index 00000000000..1512fb95525
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/findOneAndReplace.json
@@ -0,0 +1,239 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "findOneAndReplace with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "findOneAndReplace",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            },
+            "replacement": {
+              "encrypted_string": "string1"
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_string": "string0"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "default",
+              "query": {
+                "encrypted_string": {
+                  "$eq": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              },
+              "update": {
+                "encrypted_string": {
+                  "$binary": {
+                    "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                    "subType": "06"
+                  }
+                }
+              }
+            },
+            "command_name": "findAndModify"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/findOneAndUpdate.json b/driver-core/src/test/resources/client-side-encryption/findOneAndUpdate.json
new file mode 100644
index 00000000000..a5b41f84558
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/findOneAndUpdate.json
@@ -0,0 +1,243 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "findOneAndUpdate with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "findOneAndUpdate",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            },
+            "update": {
+              "$set": {
+                "encrypted_string": "string1"
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_string": "string0"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "default",
+              "query": {
+                "encrypted_string": {
+                  "$eq": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              },
+              "update": {
+                "$set": {
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              }
+            },
+            "command_name": "findAndModify"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/getMore.json b/driver-core/src/test/resources/client-side-encryption/getMore.json
new file mode 100644
index 00000000000..637f69d5094
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/getMore.json
@@ -0,0 +1,275 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 3,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACQ76HWOut3DZtQuV90hp1aaCpZn95vZIaWmn+wrBehcEtcFwyJlBdlyzDzZTWPZCPgiFq72Wvh6Y7VbpU9NAp3A==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "getMore with encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "batchSize": 2,
+            "filter": {}
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            },
+            {
+              "_id": 2,
+              "encrypted_string": "string1"
+            },
+            {
+              "_id": 3,
+              "encrypted_string": "string2"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "batchSize": 2
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$$type": "long"
+              },
+              "collection": "default",
+              "batchSize": 2
+            },
+            "command_name": "getMore"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            },
+            {
+              "_id": 3,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACQ76HWOut3DZtQuV90hp1aaCpZn95vZIaWmn+wrBehcEtcFwyJlBdlyzDzZTWPZCPgiFq72Wvh6Y7VbpU9NAp3A==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/insert.json b/driver-core/src/test/resources/client-side-encryption/insert.json
new file mode 100644
index 00000000000..beb98c5eb00
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/insert.json
@@ -0,0 +1,368 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "insertOne with encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0",
+              "random": "abc"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  },
+                  "random": {
+                    "$$type": "binData"
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "insertMany with encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertMany",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 1,
+                "encrypted_string": "string0",
+                "random": "abc"
+              },
+              {
+                "_id": 2,
+                "encrypted_string": "string1"
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  },
+                  "random": {
+                    "$$type": "binData"
+                  }
+                },
+                {
+                  "_id": 2,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/keyAltName.json b/driver-core/src/test/resources/client-side-encryption/keyAltName.json
new file mode 100644
index 00000000000..7088d0b0be3
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/keyAltName.json
@@ -0,0 +1,240 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Insert with encryption using key alt name",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_w_altname": "string0",
+              "altname": "altname"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": []
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": [
+                        "altname"
+                      ]
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_w_altname": {
+                    "$$type": "binData"
+                  },
+                  "altname": "altname"
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_w_altname": {
+                "$$type": "binData"
+              },
+              "altname": "altname"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Replace with key alt name fails",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$set": {
+                "encrypted_w_altname": "string0"
+              }
+            },
+            "upsert": true
+          },
+          "result": {
+            "errorContains": "A non-static (JSONPointer) keyId is not supported"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/localKMS.json b/driver-core/src/test/resources/client-side-encryption/localKMS.json
new file mode 100644
index 00000000000..febc1ccfc88
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/localKMS.json
@@ -0,0 +1,203 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {
+    "properties": {
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "Ce9HSz/HKKGkIt4uyy+jDuKGA+rLC2cycykMo6vc8jXxqa1UVDYHWq1r+vZKbnnSRBfB981akzRKZCFpC05CTyFqDhXv6OnMjpG97OZEREGIsHEYiJkBW0jJJvfLLgeLsEpBzsro9FztGGXASxyxFRZFhXvHxyiLOKrdWfs7X1O/iK3pEoHMx6uSNSfUOgbebLfIqW7TO++iQS5g1xovXA==",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "status": {
+        "$numberInt": "0"
+      },
+      "masterKey": {
+        "provider": "local"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "Insert a document with auto encryption using local KMS provider",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {},
+            "local": {
+              "key": {
+                "$binary": {
+                  "base64": "Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk",
+                  "subType": "00"
+                }
+              }
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0",
+              "random": "abc"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin"
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACV/+zJmpqMU47yxS/xIVAviGi7wHDuFwaULAixEAoIh0xHz73UYOM3D8D44gcJn67EROjbz4ITpYzzlCJovDL0Q==",
+                      "subType": "06"
+                    }
+                  },
+                  "random": {
+                    "$$type": "binData"
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACV/+zJmpqMU47yxS/xIVAviGi7wHDuFwaULAixEAoIh0xHz73UYOM3D8D44gcJn67EROjbz4ITpYzzlCJovDL0Q==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/localSchema.json b/driver-core/src/test/resources/client-side-encryption/localSchema.json
new file mode 100644
index 00000000000..f939dbc1234
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/localSchema.json
@@ -0,0 +1,270 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {},
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "A local schema should override",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_w_altname": {
+                  "encrypt": {
+                    "keyId": "/altname",
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                },
+                "random": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string_equivalent": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          }
+        },
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_string": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "A local schema with no encryption is an error",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "test": {
+                  "bsonType": "string"
+                }
+              },
+              "bsonType": "object",
+              "required": [
+                "test"
+              ]
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0"
+            }
+          },
+          "result": {
+            "errorContains": "JSON schema keyword 'required' is only allowed with a remote schema"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/malformedCiphertext.json b/driver-core/src/test/resources/client-side-encryption/malformedCiphertext.json
new file mode 100644
index 00000000000..c81330ce833
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/malformedCiphertext.json
@@ -0,0 +1,321 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "00"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQ==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 3,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAa2V2aW4gYWxiZXJ0c29uCg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Wrong subtype",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_w_altname": {
+                  "encrypt": {
+                    "keyId": "/altname",
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                },
+                "random": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string_equivalent": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "00"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "Empty data",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_w_altname": {
+                  "encrypt": {
+                    "keyId": "/altname",
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                },
+                "random": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string_equivalent": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "errorContains": "malformed ciphertext"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Malformed data",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_w_altname": {
+                  "encrypt": {
+                    "keyId": "/altname",
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                },
+                "random": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+                  }
+                },
+                "encrypted_string_equivalent": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "string",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "arguments": {
+            "filter": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "errorContains": "not all keys requested were satisfied"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/maxWireVersion.json b/driver-core/src/test/resources/client-side-encryption/maxWireVersion.json
new file mode 100644
index 00000000000..39d8c6485c1
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/maxWireVersion.json
@@ -0,0 +1,72 @@
+{
+  "runOn": [
+    {
+      "maxServerVersion": "4.0"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "operation fails with maxWireVersion < 8",
+      "skipReason": "waiting on SPEC-1403",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "encrypted_string": "string0"
+            }
+          },
+          "result": {
+            "errorContains": "Auto-encryption requires a minimum MongoDB version of 4.2"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/missingKey.json b/driver-core/src/test/resources/client-side-encryption/missingKey.json
new file mode 100644
index 00000000000..a7237f17924
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/missingKey.json
@@ -0,0 +1,191 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "Insert with encryption on a missing key",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "keyVaultNamespace": "admin.different",
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_string": "string0",
+              "random": "abc"
+            }
+          },
+          "result": {
+            "errorContains": "not all keys requested were satisfied"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      },
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "different"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "different",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/replaceOne.json b/driver-core/src/test/resources/client-side-encryption/replaceOne.json
new file mode 100644
index 00000000000..1287fdea14a
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/replaceOne.json
@@ -0,0 +1,251 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "replaceOne with encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "replaceOne",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            },
+            "replacement": {
+              "encrypted_string": "string1",
+              "random": "abc"
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "default",
+              "updates": [
+                {
+                  "q": {
+                    "encrypted_string": {
+                      "$eq": {
+                        "$binary": {
+                          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                          "subType": "06"
+                        }
+                      }
+                    }
+                  },
+                  "u": {
+                    "encrypted_string": {
+                      "$binary": {
+                        "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                        "subType": "06"
+                      }
+                    },
+                    "random": {
+                      "$$type": "binData"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "update"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/types.json b/driver-core/src/test/resources/client-side-encryption/types.json
new file mode 100644
index 00000000000..08928381e15
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/types.json
@@ -0,0 +1,1742 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [],
+  "json_schema": {},
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "type=objectId",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_objectId": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "objectId",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_objectId": {
+                "$oid": "AAAAAAAAAAAAAAAAAAAAAAAA"
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_objectId": {
+              "$oid": "AAAAAAAAAAAAAAAAAAAAAAAA"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_objectId": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAAHmkTPqvzfHMWpvS1mEsrjOxVQ2dyihEgIFWD5E0eNEsiMBQsC0GuvjdqYRL5DHLFI1vKuGek7EYYp0Qyii/tHqA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_objectId": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAAHmkTPqvzfHMWpvS1mEsrjOxVQ2dyihEgIFWD5E0eNEsiMBQsC0GuvjdqYRL5DHLFI1vKuGek7EYYp0Qyii/tHqA==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=symbol",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_symbol": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "symbol",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_symbol": {
+                "$symbol": "test"
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_symbol": {
+              "$symbol": "test"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_symbol": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAAOOmvDmWjcuKsSCO7U/7t9HJ8eI73B6wduyMbdkvn7n7V4uTJes/j+BTtneSdyG2JHKHGkevWAJSIU2XoO66BSXw==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_symbol": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAAOOmvDmWjcuKsSCO7U/7t9HJ8eI73B6wduyMbdkvn7n7V4uTJes/j+BTtneSdyG2JHKHGkevWAJSIU2XoO66BSXw==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=int",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_int": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "int",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_int": {
+                "$numberInt": "123"
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_int": {
+              "$numberInt": "123"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_int": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAAQPNXJVXMEjGZnftMuf2INKufXCtQIRHdw5wTgn6QYt3ejcoAXyiwI4XIUizkpsob494qpt2in4tWeiO7b9zkA8Q==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_int": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAAQPNXJVXMEjGZnftMuf2INKufXCtQIRHdw5wTgn6QYt3ejcoAXyiwI4XIUizkpsob494qpt2in4tWeiO7b9zkA8Q==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=double",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_double": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "double",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_double": {
+                "$numberDouble": "1.23"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot use deterministic encryption for element of type: double"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=decimal",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_decimal": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "decimal",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_decimal": {
+                "$numberDecimal": "1.23"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot use deterministic encryption for element of type: decimal"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=binData",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_binData": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "binData",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_binData": {
+                "$binary": {
+                  "base64": "AAAA",
+                  "subType": "00"
+                }
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_binData": {
+              "$binary": {
+                "base64": "AAAA",
+                "subType": "00"
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_binData": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAAFB/KHZQHaHHo8fctcl7v6kR+sLkJoTRx2cPSSck9ya+nbGROSeFhdhDRHaCzhV78fDEqnMDSVPNi+ZkbaIh46GQ==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_binData": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAAFB/KHZQHaHHo8fctcl7v6kR+sLkJoTRx2cPSSck9ya+nbGROSeFhdhDRHaCzhV78fDEqnMDSVPNi+ZkbaIh46GQ==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=javascript",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_javascript": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "javascript",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_javascript": {
+                "$code": "var x = 1;"
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_javascript": {
+              "$code": "var x = 1;"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_javascript": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAANrvMgJkTKWGMc9wt3E2RBR2Hu5gL9p+vIIdHe9FcOm99t1W480/oX1Gnd87ON3B399DuFaxi/aaIiQSo7gTX6Lw==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_javascript": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAANrvMgJkTKWGMc9wt3E2RBR2Hu5gL9p+vIIdHe9FcOm99t1W480/oX1Gnd87ON3B399DuFaxi/aaIiQSo7gTX6Lw==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=javascriptWithScope",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_javascriptWithScope": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "javascriptWithScope",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_javascriptWithScope": {
+                "$code": "var x = 1;",
+                "$scope": {}
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot use deterministic encryption for element of type: javascriptWithScope"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=object",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_object": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "object",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_object": {}
+            }
+          },
+          "result": {
+            "errorContains": "Cannot use deterministic encryption for element of type: object"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=timestamp",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_timestamp": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "timestamp",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_timestamp": {
+                "$timestamp": {
+                  "t": 123,
+                  "i": 456
+                }
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_timestamp": {
+              "$timestamp": {
+                "t": 123,
+                "i": 456
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_timestamp": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAARJHaM4Gq3MpDTdBasBsEolQaOmxJQU1wsZVaSFAOLpEh1QihDglXI95xemePFMKhg+KNpFg7lw1ChCs2Wn/c26Q==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_timestamp": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAARJHaM4Gq3MpDTdBasBsEolQaOmxJQU1wsZVaSFAOLpEh1QihDglXI95xemePFMKhg+KNpFg7lw1ChCs2Wn/c26Q==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=regex",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_regex": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "regex",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_regex": {
+                "$regularExpression": {
+                  "pattern": "test",
+                  "options": ""
+                }
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_regex": {
+              "$regularExpression": {
+                "pattern": "test",
+                "options": ""
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_regex": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAALVnxM4UqGhqf5eXw6nsS08am3YJrTf1EvjKitT8tyyMAbHsICIU3GUjuC7EBofCHbusvgo7pDyaClGostFz44nA==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_regex": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAALVnxM4UqGhqf5eXw6nsS08am3YJrTf1EvjKitT8tyyMAbHsICIU3GUjuC7EBofCHbusvgo7pDyaClGostFz44nA==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=date",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_date": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "date",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_date": {
+                "$date": {
+                  "$numberLong": "123"
+                }
+              }
+            }
+          }
+        },
+        {
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "encrypted_date": {
+              "$date": {
+                "$numberLong": "123"
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "default",
+              "documents": [
+                {
+                  "_id": 1,
+                  "encrypted_date": {
+                    "$binary": {
+                      "base64": "AQAAAAAAAAAAAAAAAAAAAAAJ5sN7u6l97+DswfKTqZAijSTSOo5htinGKQKUD7pHNJYlLXGOkB4glrCu7ibu0g3344RHQ5yUp4YxMEa8GD+Snw==",
+                      "subType": "06"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "default",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "command_name": "find"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_date": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAAJ5sN7u6l97+DswfKTqZAijSTSOo5htinGKQKUD7pHNJYlLXGOkB4glrCu7ibu0g3344RHQ5yUp4YxMEa8GD+Snw==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "type=minKey",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_minKey": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "minKey",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_minKey": {
+                "$minKey": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot encrypt element of type: minKey"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=maxKey",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_maxKey": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "maxKey",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_maxKey": {
+                "$maxKey": 1
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot encrypt element of type: maxKey"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=undefined",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_undefined": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "undefined",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_undefined": {
+                "$undefined": true
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot encrypt element of type: undefined"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=array",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_array": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "array",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_array": []
+            }
+          },
+          "result": {
+            "errorContains": "Cannot use deterministic encryption for element of type: array"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=bool",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_bool": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "bool",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_bool": true
+            }
+          },
+          "result": {
+            "errorContains": "Cannot use deterministic encryption for element of type: bool"
+          }
+        }
+      ]
+    },
+    {
+      "description": "type=null",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "schemaMap": {
+            "default.default": {
+              "properties": {
+                "encrypted_null": {
+                  "encrypt": {
+                    "keyId": [
+                      {
+                        "$binary": {
+                          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                          "subType": "04"
+                        }
+                      }
+                    ],
+                    "bsonType": "null",
+                    "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+                  }
+                }
+              },
+              "bsonType": "object"
+            }
+          },
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "arguments": {
+            "document": {
+              "_id": 1,
+              "encrypted_null": true
+            }
+          },
+          "result": {
+            "errorContains": "Cannot encrypt element of type: null"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/unsupportedCommand.json b/driver-core/src/test/resources/client-side-encryption/unsupportedCommand.json
new file mode 100644
index 00000000000..31887151150
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/unsupportedCommand.json
@@ -0,0 +1,152 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "x": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "x": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "mapReduce deterministic encryption (unsupported)",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "mapReduce",
+          "arguments": {
+            "map": {
+              "$code": "function inc() { return emit(0, this.x + 1) }"
+            },
+            "reduce": {
+              "$code": "function sum(key, values) { return values.reduce((acc, x) => acc + x); }"
+            },
+            "out": {
+              "inline": 1
+            }
+          },
+          "result": {
+            "errorContains": "command not supported for auto encryption: mapreduce"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/updateMany.json b/driver-core/src/test/resources/client-side-encryption/updateMany.json
new file mode 100644
index 00000000000..43c6dd717c9
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/updateMany.json
@@ -0,0 +1,319 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "updateMany with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateMany",
+          "arguments": {
+            "filter": {
+              "encrypted_string": {
+                "$in": [
+                  "string0",
+                  "string1"
+                ]
+              }
+            },
+            "update": {
+              "$set": {
+                "encrypted_string": "string2",
+                "random": "abc"
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 2,
+            "modifiedCount": 2,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "default",
+              "updates": [
+                {
+                  "q": {
+                    "encrypted_string": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                            "subType": "06"
+                          }
+                        },
+                        {
+                          "$binary": {
+                            "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                            "subType": "06"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  "u": {
+                    "$set": {
+                      "encrypted_string": {
+                        "$binary": {
+                          "base64": "AQAAAAAAAAAAAAAAAAAAAAACQ76HWOut3DZtQuV90hp1aaCpZn95vZIaWmn+wrBehcEtcFwyJlBdlyzDzZTWPZCPgiFq72Wvh6Y7VbpU9NAp3A==",
+                          "subType": "06"
+                        }
+                      },
+                      "random": {
+                        "$$type": "binData"
+                      }
+                    }
+                  },
+                  "multi": true,
+                  "upsert": false
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "update"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACQ76HWOut3DZtQuV90hp1aaCpZn95vZIaWmn+wrBehcEtcFwyJlBdlyzDzZTWPZCPgiFq72Wvh6Y7VbpU9NAp3A==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            },
+            {
+              "_id": 2,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACQ76HWOut3DZtQuV90hp1aaCpZn95vZIaWmn+wrBehcEtcFwyJlBdlyzDzZTWPZCPgiFq72Wvh6Y7VbpU9NAp3A==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "updateMany fails when filtering on a random field",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateMany",
+          "arguments": {
+            "filter": {
+              "random": "abc"
+            },
+            "update": {
+              "$set": {
+                "encrypted_string": "string1"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot query on fields encrypted with the randomized encryption"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/client-side-encryption/updateOne.json b/driver-core/src/test/resources/client-side-encryption/updateOne.json
new file mode 100644
index 00000000000..d6a6de79e2e
--- /dev/null
+++ b/driver-core/src/test/resources/client-side-encryption/updateOne.json
@@ -0,0 +1,477 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.10"
+    }
+  ],
+  "database_name": "default",
+  "collection_name": "default",
+  "data": [
+    {
+      "_id": 1,
+      "encrypted_string": {
+        "$binary": {
+          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+          "subType": "06"
+        }
+      }
+    }
+  ],
+  "json_schema": {
+    "properties": {
+      "encrypted_w_altname": {
+        "encrypt": {
+          "keyId": "/altname",
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      },
+      "random": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+        }
+      },
+      "encrypted_string_equivalent": {
+        "encrypt": {
+          "keyId": [
+            {
+              "$binary": {
+                "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                "subType": "04"
+              }
+            }
+          ],
+          "bsonType": "string",
+          "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+        }
+      }
+    },
+    "bsonType": "object"
+  },
+  "key_vault_data": [
+    {
+      "status": 1,
+      "_id": {
+        "$binary": {
+          "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+          "subType": "04"
+        }
+      },
+      "masterKey": {
+        "provider": "aws",
+        "key": "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0",
+        "region": "us-east-1"
+      },
+      "updateDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyMaterial": {
+        "$binary": {
+          "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEqnsxXlR51T5EbEVezUqqKAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHa4jo6yp0Z18KgbUgIBEIB74sKxWtV8/YHje5lv5THTl0HIbhSwM6EqRlmBiFFatmEWaeMk4tO4xBX65eq670I5TWPSLMzpp8ncGHMmvHqRajNBnmFtbYxN3E3/WjxmdbOOe+OXpnGJPcGsftc7cB2shRfA4lICPnE26+oVNXT6p0Lo20nY5XC7jyCO",
+          "subType": "00"
+        }
+      },
+      "creationDate": {
+        "$date": {
+          "$numberLong": "1552949630483"
+        }
+      },
+      "keyAltNames": [
+        "altname",
+        "another_altname"
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "updateOne with deterministic encryption",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {
+              "encrypted_string": "string0"
+            },
+            "update": {
+              "$set": {
+                "encrypted_string": "string1",
+                "random": "abc"
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "datakeys"
+              },
+              "$db": "admin"
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "datakeys",
+              "filter": {
+                "$or": [
+                  {
+                    "_id": {
+                      "$in": [
+                        {
+                          "$binary": {
+                            "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                            "subType": "04"
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "keyAltNames": {
+                      "$in": []
+                    }
+                  }
+                ]
+              },
+              "$db": "admin",
+              "readConcern": {
+                "level": "majority"
+              }
+            },
+            "command_name": "find"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "default",
+              "updates": [
+                {
+                  "q": {
+                    "encrypted_string": {
+                      "$eq": {
+                        "$binary": {
+                          "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                          "subType": "06"
+                        }
+                      }
+                    }
+                  },
+                  "u": {
+                    "$set": {
+                      "encrypted_string": {
+                        "$binary": {
+                          "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                          "subType": "06"
+                        }
+                      },
+                      "random": {
+                        "$$type": "binData"
+                      }
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "update"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACDdw4KFz3ZLquhsbt7RmDjD0N67n0uSXx7IGnQNCLeIKvot6s/ouI21Eo84IOtb6lhwUNPlSEBNY0/hbszWAKJg==",
+                  "subType": "06"
+                }
+              },
+              "random": {
+                "$$type": "binData"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "updateOne fails when filtering on a random field",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {
+              "random": "abc"
+            },
+            "update": {
+              "$set": {
+                "encrypted_string": "string1"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "Cannot query on fields encrypted with the randomized encryption"
+          }
+        }
+      ]
+    },
+    {
+      "description": "$unset works with an encrypted field",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$unset": {
+                "encrypted_string": ""
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "default",
+              "updates": [
+                {
+                  "q": {},
+                  "u": {
+                    "$unset": {
+                      "encrypted_string": ""
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "update"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "$rename works if target value has same encryption options",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$rename": {
+                "encrypted_string": "encrypted_string_equivalent"
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1,
+              "filter": {
+                "name": "default"
+              }
+            },
+            "command_name": "listCollections"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "default",
+              "updates": [
+                {
+                  "q": {},
+                  "u": {
+                    "$rename": {
+                      "encrypted_string": "encrypted_string_equivalent"
+                    }
+                  }
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "update"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "encrypted_string_equivalent": {
+                "$binary": {
+                  "base64": "AQAAAAAAAAAAAAAAAAAAAAACwj+3zkv2VM+aTfk60RqhXq6a/77WlLwu/BxXFkL7EppGsju/m8f0x5kBDD3EZTtGALGXlym5jnpZAoSIkswHoA==",
+                  "subType": "06"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "$rename fails if target value has different encryption options",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "$rename": {
+                "encrypted_string": "random"
+              }
+            }
+          },
+          "result": {
+            "errorContains": "$rename between two encrypted fields must have the same metadata or both be unencrypted"
+          }
+        }
+      ]
+    },
+    {
+      "description": "an invalid update (no $ operators) is validated and errors",
+      "clientOptions": {
+        "autoEncryptOpts": {
+          "kmsProviders": {
+            "aws": {}
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {},
+            "update": {
+              "encrypted_string": "random"
+            }
+          },
+          "result": {
+            "errorContains": ""
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/command-monitoring/bulkWrite.json b/driver-core/src/test/resources/command-monitoring/bulkWrite.json
index 97fcd8e8b3a..ca5a9a105cd 100644
--- a/driver-core/src/test/resources/command-monitoring/bulkWrite.json
+++ b/driver-core/src/test/resources/command-monitoring/bulkWrite.json
@@ -23,7 +23,8 @@
         "arguments": {
           "requests": [
             {
-              "insertOne": {
+              "name": "insertOne",
+              "arguments": {
                 "document": {
                   "_id": 4,
                   "x": 44
@@ -31,7 +32,8 @@
               }
             },
             {
-              "updateOne": {
+              "name": "updateOne",
+              "arguments": {
                 "filter": {
                   "_id": 3
                 },
@@ -65,7 +67,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1
             },
             "command_name": "insert"
@@ -84,9 +86,7 @@
                     "$set": {
                       "x": 333
                     }
-                  },
-                  "upsert": false,
-                  "multi": false
+                  }
                 }
               ],
               "ordered": true
@@ -98,64 +98,13 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1
             },
             "command_name": "update"
           }
         }
       ]
-    },
-    {
-      "description": "A successful unordered bulk write with an unacknowledged write concern",
-      "operation": {
-        "name": "bulkWrite",
-        "arguments": {
-          "requests": [
-            {
-              "insertOne": {
-                "document": {
-                  "_id": 1000,
-                  "x": 44
-                }
-              }
-            }
-          ],
-          "ordered": false,
-          "writeConcern": {
-            "w": 0
-          }
-        }
-      },
-      "expectations": [
-        {
-          "command_started_event": {
-            "command": {
-              "insert": "test",
-              "documents": [
-                {
-                  "_id": 1000,
-                  "x": 44
-                }
-              ],
-              "ordered": false,
-              "writeConcern": {
-                "w": 0
-              }
-            },
-            "command_name": "insert",
-            "database_name": "command-monitoring-tests"
-          }
-        },
-        {
-          "command_succeeded_event": {
-            "reply": {
-              "ok": 1.0
-            },
-            "command_name": "insert"
-          }
-        }
-      ]
     }
   ]
 }
diff --git a/driver-core/src/test/resources/command-monitoring/find.json b/driver-core/src/test/resources/command-monitoring/find.json
index 2d7953123b8..33b6e4fc73b 100644
--- a/driver-core/src/test/resources/command-monitoring/find.json
+++ b/driver-core/src/test/resources/command-monitoring/find.json
@@ -95,14 +95,12 @@
             "$max": {
               "_id": 6
             },
-            "$maxScan": 5000,
             "$maxTimeMS": 6000,
             "$min": {
               "_id": 0
             },
             "$returnKey": false,
             "$showDiskLoc": false,
-            "$snapshot": false
           }
         }
       },
@@ -127,14 +125,12 @@
               "max": {
                 "_id": 6
               },
-              "maxScan": 5000,
               "maxTimeMS": 6000,
               "min": {
                 "_id": 0
               },
               "returnKey": false,
               "showRecordId": false,
-              "snapshot": false
             },
             "command_name": "find",
             "database_name": "command-monitoring-tests"
diff --git a/driver-core/src/test/resources/command-monitoring/insertMany.json b/driver-core/src/test/resources/command-monitoring/insertMany.json
index 19605365829..0becf928e4d 100644
--- a/driver-core/src/test/resources/command-monitoring/insertMany.json
+++ b/driver-core/src/test/resources/command-monitoring/insertMany.json
@@ -41,7 +41,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1
             },
             "command_name": "insert"
@@ -82,7 +82,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 0,
               "writeErrors": [
                 {
@@ -108,7 +108,9 @@
               "x": 22
             }
           ],
-          "ordered": false
+          "options": {
+            "ordered": false
+          }
         }
       },
       "expectations": [
@@ -131,7 +133,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1
             },
             "command_name": "insert"
diff --git a/driver-core/src/test/resources/command-monitoring/unacknowledgedBulkWrite.json b/driver-core/src/test/resources/command-monitoring/unacknowledgedBulkWrite.json
new file mode 100644
index 00000000000..ae116289eba
--- /dev/null
+++ b/driver-core/src/test/resources/command-monitoring/unacknowledgedBulkWrite.json
@@ -0,0 +1,69 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "collection_name": "test-unacknowledged-bulk-write",
+  "database_name": "command-monitoring-tests",
+  "tests": [
+    {
+      "description": "A successful unordered bulk write with an unacknowledged write concern",
+      "comment": "On a 2.4 server, no GLE is sent and requires a client-side manufactured reply",
+      "operation": {
+        "name": "bulkWrite",
+        "collectionOptions": {
+          "writeConcern": {
+            "w": 0
+          }
+        },
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": "unorderedBulkWriteInsertW0",
+                  "x": 44
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test-unacknowledged-bulk-write",
+              "documents": [
+                {
+                  "_id": "unorderedBulkWriteInsertW0",
+                  "x": 44
+                }
+              ],
+              "ordered": false,
+              "writeConcern": {
+                "w": 0
+              }
+            },
+            "command_name": "insert",
+            "database_name": "command-monitoring-tests"
+          }
+        },
+        {
+          "command_succeeded_event": {
+            "reply": {
+              "ok": 1
+            },
+            "command_name": "insert"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/command-monitoring/updateMany.json b/driver-core/src/test/resources/command-monitoring/updateMany.json
index f7e5e894351..d82792fc4e4 100644
--- a/driver-core/src/test/resources/command-monitoring/updateMany.json
+++ b/driver-core/src/test/resources/command-monitoring/updateMany.json
@@ -51,8 +51,7 @@
                       "x": 1
                     }
                   },
-                  "multi": true,
-                  "upsert": false
+                  "multi": true
                 }
               ]
             },
@@ -63,7 +62,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 2
             },
             "command_name": "update"
@@ -106,8 +105,7 @@
                       "x": 1
                     }
                   },
-                  "multi": true,
-                  "upsert": false
+                  "multi": true
                 }
               ]
             },
@@ -118,7 +116,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 0,
               "writeErrors": [
                 {
diff --git a/driver-core/src/test/resources/command-monitoring/updateOne.json b/driver-core/src/test/resources/command-monitoring/updateOne.json
index dcc8abc579d..ba41dbb0c0a 100644
--- a/driver-core/src/test/resources/command-monitoring/updateOne.json
+++ b/driver-core/src/test/resources/command-monitoring/updateOne.json
@@ -50,9 +50,7 @@
                     "$inc": {
                       "x": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ]
             },
@@ -63,7 +61,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1
             },
             "command_name": "update"
@@ -103,7 +101,6 @@
                       "x": 1
                     }
                   },
-                  "multi": false,
                   "upsert": true
                 }
               ]
@@ -115,7 +112,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1,
               "upserted": [
                 {
@@ -163,9 +160,7 @@
                     "$nothing": {
                       "x": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ]
             },
@@ -176,7 +171,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 0,
               "writeErrors": [
                 {
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/README.rst b/driver-core/src/test/resources/connection-monitoring-and-pooling/README.rst
new file mode 100644
index 00000000000..b1605c14f0e
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/README.rst
@@ -0,0 +1,156 @@
+.. role:: javascript(code)
+  :language: javascript
+
+========================================
+Connection Monitoring and Pooling (CMAP)
+========================================
+
+.. contents::
+
+--------
+
+Introduction
+============
+
+The YAML and JSON files in this directory are platform-independent tests that
+drivers can use to prove their conformance to the Connection Monitoring and Pooling (CMAP) Spec.
+
+Several prose tests, which are not easily expressed in YAML, are also presented
+in this file. Those tests will need to be manually implemented by each driver.
+
+Common Test Format
+==================
+
+Each YAML file has the following keys:
+
+- ``version``: A version number indicating the expected format of the spec tests (current version = 1)
+- ``style``: A string indicating what style of tests this file contains. Currently ``unit`` is the only valid value
+- ``description``: A text description of what the test is meant to assert
+
+Unit Test Format:
+=================
+
+All Unit Tests have some of the following fields:
+
+- ``poolOptions``: if present, connection pool options to use when creating a pool
+- ``operations``: A list of operations to perform. All operations support the following fields:
+
+  - ``name``: A string describing which operation to issue.
+  - ``thread``: The name of the thread in which to run this operation. If not specified, runs in the default thread
+
+- ``error``: Indicates that the main thread is expected to error during this test. An error may include of the following fields:
+
+  - ``type``: the type of error emitted
+  - ``message``: the message associated with that error
+  - ``address``: Address of pool emitting error
+
+- ``events``: An array of all connection monitoring events expected to occur while running ``operations``. An event may contain any of the following fields
+
+  - ``type``: The type of event emitted
+  - ``address``: The address of the pool emitting the event
+  - ``connectionId``: The id of a connection associated with the event
+  - ``options``: Options used to create the pool
+  - ``reason``: A reason giving mroe information on why the event was emitted
+
+- ``ignore``: An array of event names to ignore
+
+Valid Unit Test Operations are the following:
+
+- ``start(target)``: Starts a new thread named ``target``
+
+  - ``target``: The name of the new thread to start
+
+- ``wait(ms)``: Sleep the current thread for ``ms`` milliseconds
+
+  - ``ms``: The number of milliseconds to sleep the current thread for
+
+- ``waitForThread(target)``: wait for thread ``target`` to finish executing. Propagate any errors to the main thread.
+
+  - ``target``: The name of the thread to wait for.
+
+- ``waitForEvent(event, count)``: block the current thread until ``event`` has occurred ``count`` times
+
+  - ``event``: The name of the event
+  - ``count``: The number of times the event must occur (counting from the start of the test)
+
+- ``label = pool.checkOut()``: call ``checkOut`` on pool, returning the checked out connection
+
+  - ``label``: If specified, associate this label with the returned connection, so that it may be referenced in later operations
+
+- ``pool.checkIn(connection)``: call ``checkIn`` on pool
+
+  - ``connection``: A string label identifying which connection to check in. Should be a label that was previously set with ``checkOut``
+
+- ``pool.clear()``: call ``clear`` on Pool
+- ``pool.close()``: call ``close`` on Pool
+
+Spec Test Match Function
+========================
+
+The definition of MATCH or MATCHES in the Spec Test Runner is as follows:
+
+- MATCH takes two values, ``expected`` and ``actual``
+- Notation is "Assert [actual] MATCHES [expected]
+- Assertion passes if ``expected`` is a subset of ``actual``, with the values ``42`` and ``"42"`` acting as placeholders for "any value"
+
+Pseudocode implementation of ``actual`` MATCHES ``expected``:
+
+::
+  
+  If expected is "42" or 42:
+    Assert that actual exists (is not null or undefined)
+  Else:
+    Assert that actual is of the same JSON type as expected
+    If expected is a JSON array:
+      For every idx/value in expected:
+        Assert that actual[idx] MATCHES value
+    Else if expected is a JSON object:
+      For every key/value in expected
+        Assert that actual[key] MATCHES value
+    Else:
+      Assert that expected equals actual
+
+Unit Test Runner:
+=================
+
+For the unit tests, the behavior of a Connection is irrelevant beyond the need to asserting ``connection.id``. Drivers MAY use a mock connection class for testing the pool behavior in unit tests
+
+For each YAML file with ``style: unit``:
+
+- Create a Pool ``pool``, subscribe and capture any Connection Monitoring events emitted in order.
+
+  - If ``poolOptions`` is specified, use those options to initialize both pools
+  - The returned pool must have an ``address`` set as a string value.
+
+- Execute each ``operation`` in ``operations``
+
+  - If a ``thread`` is specified, execute in that corresponding thread. Otherwise, execute in the main thread.
+
+- Wait for the main thread to finish executing all of its operations
+- If ``error`` is presented
+
+  - Assert that an actual error ``actualError`` was thrown by the main thread
+  - Assert that ``actualError`` MATCHES ``error``
+
+- Else: 
+
+  - Assert that no errors were thrown by the main thread
+
+- calculate ``actualEvents`` as every Connection Event emitted whose ``type`` is not in ``ignore``
+- if ``events`` is not empty, then for every ``idx``/``expectedEvent`` in ``events``
+
+  - Assert that ``actualEvents[idx]`` exists
+  - Assert that ``actualEvents[idx]`` MATCHES ``expectedEvent``
+
+
+It is important to note that the ``ignore`` list is used for calculating ``actualEvents``, but is NOT used for the ``waitForEvent`` command
+
+Prose Tests
+===========
+
+The following tests have not yet been automated, but MUST still be tested
+
+#. All ConnectionPoolOptions MUST be specified at the MongoClient level
+#. All ConnectionPoolOptions MUST be the same for all pools created by a MongoClient
+#. A user MUST be able to specify all ConnectionPoolOptions via a URI string
+#. A user MUST be able to subscribe to Connection Monitoring Events in a manner idiomatic to their language and driver
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/connection-must-have-id.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/connection-must-have-id.json
new file mode 100644
index 00000000000..487a5979d08
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/connection-must-have-id.json
@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must have an ID number associated with it",
+  "operations": [
+    {
+      "name": "checkOut"
+    },
+    {
+      "name": "checkOut"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated",
+    "ConnectionPoolClosed",
+    "ConnectionReady"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/connection-must-order-ids.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/connection-must-order-ids.json
new file mode 100644
index 00000000000..dda515c1a91
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/connection-must-order-ids.json
@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must have IDs assigned in order of creation",
+  "operations": [
+    {
+      "name": "checkOut"
+    },
+    {
+      "name": "checkOut"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 2
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 2
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated",
+    "ConnectionPoolClosed",
+    "ConnectionReady"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-destroy-closed.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-destroy-closed.json
new file mode 100644
index 00000000000..3b6f1d24840
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-destroy-closed.json
@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must destroy checked in connection if pool has been closed",
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn"
+    },
+    {
+      "name": "close"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionPoolClosed",
+      "address": 42
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionClosed",
+      "connectionId": 1,
+      "reason": "poolClosed"
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated",
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionCheckOutStarted"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-destroy-stale.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-destroy-stale.json
new file mode 100644
index 00000000000..7faa44d33cb
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-destroy-stale.json
@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must destroy checked in connection if it is stale",
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn"
+    },
+    {
+      "name": "clear"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionPoolCleared",
+      "address": 42
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionClosed",
+      "connectionId": 1,
+      "reason": "stale"
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated",
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionCheckOutStarted"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-make-available.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-make-available.json
new file mode 100644
index 00000000000..838194fe8eb
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin-make-available.json
@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must make valid checked in connection available",
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn"
+    },
+    {
+      "name": "checkOut"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated",
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionCheckOutStarted"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin.json
new file mode 100644
index 00000000000..5e93c207a9e
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkin.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must have a method of allowing the driver to check in a connection",
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated",
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionClosed",
+    "ConnectionCheckOutStarted",
+    "ConnectionCheckedOut"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-connection.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-connection.json
new file mode 100644
index 00000000000..e6e108ce58e
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-connection.json
@@ -0,0 +1,24 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must be able to check out a connection",
+  "operations": [
+    {
+      "name": "checkOut"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated",
+    "ConnectionCreated",
+    "ConnectionReady"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-error-closed.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-error-closed.json
new file mode 100644
index 00000000000..4b32ecb55d8
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-error-closed.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must throw error if checkOut is called on a closed pool",
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn1"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn1"
+    },
+    {
+      "name": "close"
+    },
+    {
+      "name": "checkOut"
+    }
+  ],
+  "error": {
+    "type": "PoolClosedError",
+    "message": "Attempted to check out a connection from closed connection pool"
+  },
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionPoolClosed",
+      "address": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionClosed",
+    "ConnectionCheckOutStarted"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-multiple.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-multiple.json
new file mode 100644
index 00000000000..f3ecdb9be90
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-multiple.json
@@ -0,0 +1,63 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must be able to check out multiple connections at the same time",
+  "operations": [
+    {
+      "name": "start",
+      "target": "thread1"
+    },
+    {
+      "name": "start",
+      "target": "thread2"
+    },
+    {
+      "name": "start",
+      "target": "thread3"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread1"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread2"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread3"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread1"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread2"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread3"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionPoolCreated",
+    "ConnectionCheckOutStarted"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-no-idle.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-no-idle.json
new file mode 100644
index 00000000000..77ce40deacf
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-no-idle.json
@@ -0,0 +1,54 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must destroy and must not check out an idle connection if found while iterating available connections",
+  "poolOptions": {
+    "maxIdleTimeMS": 10
+  },
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn"
+    },
+    {
+      "name": "wait",
+      "ms": 50
+    },
+    {
+      "name": "checkOut"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionClosed",
+      "connectionId": 1,
+      "reason": "idle"
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 2
+    }
+  ],
+  "ignore": [
+    "ConnectionReady",
+    "ConnectionCreated",
+    "ConnectionCheckOutStarted"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-no-stale.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-no-stale.json
new file mode 100644
index 00000000000..e99ca0b6e4f
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-checkout-no-stale.json
@@ -0,0 +1,54 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must destroy and must not check out a stale connection if found while iterating available connections",
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn"
+    },
+    {
+      "name": "clear"
+    },
+    {
+      "name": "checkOut"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 1
+    },
+    {
+      "type": "ConnectionPoolCleared",
+      "address": 42
+    },
+    {
+      "type": "ConnectionClosed",
+      "connectionId": 1,
+      "reason": "stale"
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 2
+    }
+  ],
+  "ignore": [
+    "ConnectionReady",
+    "ConnectionCreated",
+    "ConnectionCheckOutStarted"
+  ]
+}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-close-destroy-conns.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-close-destroy-conns.json
new file mode 100644
index 00000000000..2bc50419b47
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-close-destroy-conns.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "When a pool is closed, it MUST first destroy all available connections in that pool",
+  "operations": [
+    {
+      "name": "checkOut"
+    },
+    {
+      "name": "checkOut",
+      "label": "conn"
+    },
+    {
+      "name": "checkOut"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn"
+    },
+    {
+      "name": "close"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 2
+    },
+    {
+      "type": "ConnectionClosed",
+      "connectionId": 2,
+      "reason": "poolClosed"
+    },
+    {
+      "type": "ConnectionPoolClosed",
+      "address": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionPoolCreated",
+    "ConnectionCheckOutStarted",
+    "ConnectionCheckedOut"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-close.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-close.json
new file mode 100644
index 00000000000..fe083d73e63
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-close.json
@@ -0,0 +1,21 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must be able to manually close a pool",
+  "operations": [
+    {
+      "name": "close"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": 42
+    },
+    {
+      "type": "ConnectionPoolClosed",
+      "address": 42
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-max-size.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-max-size.json
new file mode 100644
index 00000000000..2ba7bdf62bf
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-max-size.json
@@ -0,0 +1,114 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must never exceed maxPoolSize total connections",
+  "poolOptions": {
+    "maxPoolSize": 3
+  },
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn1"
+    },
+    {
+      "name": "checkOut"
+    },
+    {
+      "name": "checkOut",
+      "label": "conn2"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn2"
+    },
+    {
+      "name": "checkOut"
+    },
+    {
+      "name": "start",
+      "target": "thread1"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread1"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckOutStarted",
+      "count": 5
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn1"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread1"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionReady"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-min-size.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-min-size.json
new file mode 100644
index 00000000000..470988043f3
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-min-size.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must be able to start a pool with minPoolSize connections",
+  "poolOptions": {
+    "minPoolSize": 3
+  },
+  "operations": [
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCreated",
+      "count": 3
+    },
+    {
+      "name": "checkOut"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": 42
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionReady",
+    "ConnectionClosed",
+    "ConnectionCheckOutStarted"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-with-options.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-with-options.json
new file mode 100644
index 00000000000..ab689448f4e
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create-with-options.json
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must be able to start a pool with various options set",
+  "poolOptions": {
+    "maxPoolSize": 50,
+    "minPoolSize": 5,
+    "maxIdleTimeMS": 100
+  },
+  "operations": [
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionPoolCreated",
+      "count": 1
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": {
+        "maxPoolSize": 50,
+        "minPoolSize": 5,
+        "maxIdleTimeMS": 100
+      }
+    }
+  ],
+  "ignore": [
+    "ConnectionCreated"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create.json
new file mode 100644
index 00000000000..8c1f85537f9
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/pool-create.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must be able to create a pool",
+  "operations": [
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionPoolCreated",
+      "count": 1
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolCreated",
+      "address": 42,
+      "options": 42
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/wait-queue-fairness.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/wait-queue-fairness.json
new file mode 100644
index 00000000000..36c8a6dc1ba
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/wait-queue-fairness.json
@@ -0,0 +1,162 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must issue Connections to threads in the order that the threads entered the queue",
+  "poolOptions": {
+    "maxPoolSize": 1,
+    "waitQueueTimeoutMS": 1000
+  },
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn0"
+    },
+    {
+      "name": "start",
+      "target": "thread1"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread1",
+      "label": "conn1"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckOutStarted",
+      "count": 2
+    },
+    {
+      "name": "start",
+      "target": "thread2"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread2",
+      "label": "conn2"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckOutStarted",
+      "count": 3
+    },
+    {
+      "name": "start",
+      "target": "thread3"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread3",
+      "label": "conn3"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckOutStarted",
+      "count": 4
+    },
+    {
+      "name": "start",
+      "target": "thread4"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread4",
+      "label": "conn4"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckOutStarted",
+      "count": 5
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn0"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread1"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn1"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread2"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn2"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread3"
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn3"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread4"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionClosed",
+    "ConnectionPoolCreated"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-monitoring-and-pooling/wait-queue-timeout.json b/driver-core/src/test/resources/connection-monitoring-and-pooling/wait-queue-timeout.json
new file mode 100644
index 00000000000..90ec2f62d95
--- /dev/null
+++ b/driver-core/src/test/resources/connection-monitoring-and-pooling/wait-queue-timeout.json
@@ -0,0 +1,66 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "must aggressively timeout threads enqueued longer than waitQueueTimeoutMS",
+  "poolOptions": {
+    "maxPoolSize": 1,
+    "waitQueueTimeoutMS": 20
+  },
+  "operations": [
+    {
+      "name": "checkOut",
+      "label": "conn0"
+    },
+    {
+      "name": "start",
+      "target": "thread1"
+    },
+    {
+      "name": "checkOut",
+      "thread": "thread1"
+    },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionCheckOutFailed",
+      "count": 1
+    },
+    {
+      "name": "checkIn",
+      "connection": "conn0"
+    },
+    {
+      "name": "waitForThread",
+      "target": "thread1"
+    }
+  ],
+  "error": {
+    "type": "WaitQueueTimeoutError",
+    "message": "Timed out while checking out a connection from connection pool"
+  },
+  "events": [
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckedOut",
+      "connectionId": 42
+    },
+    {
+      "type": "ConnectionCheckOutStarted"
+    },
+    {
+      "type": "ConnectionCheckOutFailed",
+      "reason": "timeout"
+    },
+    {
+      "type": "ConnectionCheckedIn",
+      "connectionId": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionCreated",
+    "ConnectionReady",
+    "ConnectionClosed",
+    "ConnectionPoolCreated"
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-string/invalid-uris.json b/driver-core/src/test/resources/connection-string/invalid-uris.json
index e47a52a9242..2a182fac7e2 100644
--- a/driver-core/src/test/resources/connection-string/invalid-uris.json
+++ b/driver-core/src/test/resources/connection-string/invalid-uris.json
@@ -1,220 +1,274 @@
 {
-    "tests": [
-        {
-            "auth": null, 
-            "description": "Empty string", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid scheme", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongo://localhost:27017", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Missing host", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Double colon in host identifier", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost::27017", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Double colon in host identifier and trailing slash", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost::27017/", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Double colon in host identifier with missing host and port", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://::", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Double colon in host identifier with missing port", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost,localhost::", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Double colon in host identifier and second host", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost::27017,abc", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (negative number) with hostname", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost:-1", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (zero) with hostname", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost:0/", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (positive number) with hostname", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost:65536", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (positive number) with hostname and trailing slash", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost:65536/", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (non-numeric string) with hostname", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://localhost:foo", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (negative number) with IP literal", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://[::1]:-1", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (zero) with IP literal", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://[::1]:0/", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (positive number) with IP literal", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://[::1]:65536", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (positive number) with IP literal and trailing slash", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://[::1]:65536/", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Invalid port (non-numeric string) with IP literal", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://[::1]:foo", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Missing delimiting slash between hosts and options", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://example.com?w=1", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Incomplete key value pair for option", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://example.com/?w", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Username with password containing an unescaped colon", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://alice:foo:bar@127.0.0.1", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Username containing an unescaped at-sign", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://alice@@127.0.0.1", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Username with password containing an unescaped at-sign", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb://alice@foo:bar@127.0.0.1", 
-            "valid": false, 
-            "warning": null
-        }, 
-        {
-            "auth": null, 
-            "description": "Host with unescaped slash", 
-            "hosts": null, 
-            "options": null, 
-            "uri": "mongodb:///tmp/mongodb-27017.sock/", 
-            "valid": false, 
-            "warning": null
-        }
-    ]
+  "tests": [
+    {
+      "description": "Empty string",
+      "uri": "",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid scheme",
+      "uri": "mongo://localhost:27017",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Missing host",
+      "uri": "mongodb://",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Double colon in host identifier",
+      "uri": "mongodb://localhost::27017",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Double colon in host identifier and trailing slash",
+      "uri": "mongodb://localhost::27017/",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Double colon in host identifier with missing host and port",
+      "uri": "mongodb://::",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Double colon in host identifier with missing port",
+      "uri": "mongodb://localhost,localhost::",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Double colon in host identifier and second host",
+      "uri": "mongodb://localhost::27017,abc",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (negative number) with hostname",
+      "uri": "mongodb://localhost:-1",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (zero) with hostname",
+      "uri": "mongodb://localhost:0/",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (positive number) with hostname",
+      "uri": "mongodb://localhost:65536",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (positive number) with hostname and trailing slash",
+      "uri": "mongodb://localhost:65536/",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (non-numeric string) with hostname",
+      "uri": "mongodb://localhost:foo",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (negative number) with IP literal",
+      "uri": "mongodb://[::1]:-1",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (zero) with IP literal",
+      "uri": "mongodb://[::1]:0/",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (positive number) with IP literal",
+      "uri": "mongodb://[::1]:65536",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (positive number) with IP literal and trailing slash",
+      "uri": "mongodb://[::1]:65536/",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Invalid port (non-numeric string) with IP literal",
+      "uri": "mongodb://[::1]:foo",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Missing delimiting slash between hosts and options",
+      "uri": "mongodb://example.com?w=1",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Incomplete key value pair for option",
+      "uri": "mongodb://example.com/?w",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username with password containing an unescaped colon",
+      "uri": "mongodb://alice:foo:bar@127.0.0.1",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username containing an unescaped at-sign",
+      "uri": "mongodb://alice@@127.0.0.1",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username with password containing an unescaped at-sign",
+      "uri": "mongodb://alice@foo:bar@127.0.0.1",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username containing an unescaped slash",
+      "uri": "mongodb://alice/@localhost/db",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username containing unescaped slash with password",
+      "uri": "mongodb://alice/bob:foo@localhost/db",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username with password containing an unescaped slash",
+      "uri": "mongodb://alice:foo/bar@localhost/db",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Host with unescaped slash",
+      "uri": "mongodb:///tmp/mongodb-27017.sock/",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "mongodb+srv with multiple service names",
+      "uri": "mongodb+srv://test5.test.mongodb.com,test6.test.mongodb.com",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "mongodb+srv with port number",
+      "uri": "mongodb+srv://test7.test.mongodb.com:27018",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Username with password containing an unescaped percent sign",
+      "uri": "mongodb://alice%foo:bar@127.0.0.1",
+      "valid": false,
+      "warning": null,
+      "hosts": null,
+      "auth": null,
+      "options": null
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/connection-string/valid-auth.json b/driver-core/src/test/resources/connection-string/valid-auth.json
index b3aa7f9cfd2..d3cafb029b9 100644
--- a/driver-core/src/test/resources/connection-string/valid-auth.json
+++ b/driver-core/src/test/resources/connection-string/valid-auth.json
@@ -1,330 +1,332 @@
 {
-    "tests": [
+  "tests": [
+    {
+      "description": "User info for single IPv4 host without database",
+      "uri": "mongodb://alice:foo@127.0.0.1",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": null, 
-                "password": "foo", 
-                "username": "alice"
-            }, 
-            "description": "User info for single IPv4 host without database", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice:foo@127.0.0.1", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "foo",
+        "db": null
+      },
+      "options": null
+    },
+    {
+      "description": "User info for single IPv4 host with database",
+      "uri": "mongodb://alice:foo@127.0.0.1/test",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "test", 
-                "password": "foo", 
-                "username": "alice"
-            }, 
-            "description": "User info for single IPv4 host with database", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice:foo@127.0.0.1/test", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "foo",
+        "db": "test"
+      },
+      "options": null
+    },
+    {
+      "description": "User info for single IP literal host without database",
+      "uri": "mongodb://bob:bar@[::1]:27018",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "t\u0000est", 
-                "password": "f\u0000oo", 
-                "username": "a\u0000lice"
-            }, 
-            "description": "User info for single IPv4 host with database (escaped null bytes)", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://a%00lice:f%00oo@127.0.0.1/t%00est", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ip_literal",
+          "host": "::1",
+          "port": 27018
+        }
+      ],
+      "auth": {
+        "username": "bob",
+        "password": "bar",
+        "db": null
+      },
+      "options": null
+    },
+    {
+      "description": "User info for single IP literal host with database",
+      "uri": "mongodb://bob:bar@[::1]:27018/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": null, 
-                "password": "bar", 
-                "username": "bob"
-            }, 
-            "description": "User info for single IP literal host without database", 
-            "hosts": [
-                {
-                    "host": "::1", 
-                    "port": 27018, 
-                    "type": "ip_literal"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://bob:bar@[::1]:27018", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ip_literal",
+          "host": "::1",
+          "port": 27018
+        }
+      ],
+      "auth": {
+        "username": "bob",
+        "password": "bar",
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "User info for single hostname without database",
+      "uri": "mongodb://eve:baz@example.com",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin", 
-                "password": "bar", 
-                "username": "bob"
-            }, 
-            "description": "User info for single IP literal host with database", 
-            "hosts": [
-                {
-                    "host": "::1", 
-                    "port": 27018, 
-                    "type": "ip_literal"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://bob:bar@[::1]:27018/admin", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "eve",
+        "password": "baz",
+        "db": null
+      },
+      "options": null
+    },
+    {
+      "description": "User info for single hostname with database",
+      "uri": "mongodb://eve:baz@example.com/db2",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": null, 
-                "password": "baz", 
-                "username": "eve"
-            }, 
-            "description": "User info for single hostname without database", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://eve:baz@example.com", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "eve",
+        "password": "baz",
+        "db": "db2"
+      },
+      "options": null
+    },
+    {
+      "description": "User info for multiple hosts without database",
+      "uri": "mongodb://alice:secret@127.0.0.1,example.com:27018",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        },
+        {
+          "type": "hostname",
+          "host": "example.com",
+          "port": 27018
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "secret",
+        "db": null
+      },
+      "options": null
+    },
+    {
+      "description": "User info for multiple hosts with database",
+      "uri": "mongodb://alice:secret@example.com,[::1]:27019/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "db2", 
-                "password": "baz", 
-                "username": "eve"
-            }, 
-            "description": "User info for single hostname with database", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://eve:baz@example.com/db2", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        },
         {
-            "auth": {
-                "db": null, 
-                "password": "secret", 
-                "username": "alice"
-            }, 
-            "description": "User info for multiple hosts without database", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }, 
-                {
-                    "host": "example.com", 
-                    "port": 27018, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice:secret@127.0.0.1,example.com:27018", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ip_literal",
+          "host": "::1",
+          "port": 27019
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "secret",
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Username without password",
+      "uri": "mongodb://alice@127.0.0.1",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin", 
-                "password": "secret", 
-                "username": "alice"
-            }, 
-            "description": "User info for multiple hosts with database", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }, 
-                {
-                    "host": "::1", 
-                    "port": 27019, 
-                    "type": "ip_literal"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice:secret@example.com,[::1]:27019/admin", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": null,
+        "db": null
+      },
+      "options": null
+    },
+    {
+      "description": "Username with empty password",
+      "uri": "mongodb://alice:@127.0.0.1",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": null, 
-                "password": null, 
-                "username": "alice"
-            }, 
-            "description": "Username without password", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice@127.0.0.1", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "",
+        "db": null
+      },
+      "options": null
+    },
+    {
+      "description": "Escaped username and database without password",
+      "uri": "mongodb://%40l%3Ace%2F%3D@example.com/my%3Ddb",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": null, 
-                "password": "", 
-                "username": "alice"
-            }, 
-            "description": "Username with empty password", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice:@127.0.0.1", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "@l:ce/=",
+        "password": null,
+        "db": "my=db"
+      },
+      "options": null
+    },
+    {
+      "description": "Escaped user info and database (MONGODB-CR)",
+      "uri": "mongodb://%24am:f%3Azzb%40z%2Fz%3D@127.0.0.1/admin%3F?authMechanism=MONGODB-CR",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "my=db", 
-                "password": null, 
-                "username": "@l:ce"
-            }, 
-            "description": "Escaped username and database without password", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%40l%3Ace@example.com/my%3Ddb", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "$am",
+        "password": "f:zzb@z/z=",
+        "db": "admin?"
+      },
+      "options": {
+        "authmechanism": "MONGODB-CR"
+      }
+    },
+    {
+      "description": "Subdelimiters in user/pass don't need escaping (MONGODB-CR)",
+      "uri": "mongodb://!$&'()*,;=:!$&'()*,;=@127.0.0.1/admin?authMechanism=MONGODB-CR",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin?", 
-                "password": "f:zzb@zz", 
-                "username": "$am"
-            }, 
-            "description": "Escaped user info and database (MONGODB-CR)", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": {
-                "authmechanism": "MONGODB-CR"
-            }, 
-            "uri": "mongodb://%24am:f%3Azzb%40zz@127.0.0.1/admin%3F?authMechanism=MONGODB-CR", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "!$&'()*,;=",
+        "password": "!$&'()*,;=",
+        "db": "admin"
+      },
+      "options": {
+        "authmechanism": "MONGODB-CR"
+      }
+    },
+    {
+      "description": "Escaped username (MONGODB-X509)",
+      "uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": null, 
-                "password": null, 
-                "username": "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry"
-            }, 
-            "description": "Escaped username (MONGODB-X509)", 
-            "hosts": [
-                {
-                    "host": "localhost", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": {
-                "authmechanism": "MONGODB-X509"
-            }, 
-            "uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "localhost",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry",
+        "password": null,
+        "db": null
+      },
+      "options": {
+        "authmechanism": "MONGODB-X509"
+      }
+    },
+    {
+      "description": "Escaped username (GSSAPI)",
+      "uri": "mongodb://user%40EXAMPLE.COM:secret@localhost/?authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true&authMechanism=GSSAPI",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": null, 
-                "password": "secret", 
-                "username": "user@EXAMPLE.COM"
-            }, 
-            "description": "Escaped username (GSSAPI)", 
-            "hosts": [
-                {
-                    "host": "localhost", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": {
-                "authmechanism": "GSSAPI", 
-                "authmechanismproperties": {
-                    "CANONICALIZE_HOST_NAME": true, 
-                    "SERVICE_NAME": "other"
-                }
-            }, 
-            "uri": "mongodb://user%40EXAMPLE.COM:secret@localhost/?authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true&authMechanism=GSSAPI", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "localhost",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "user@EXAMPLE.COM",
+        "password": "secret",
+        "db": null
+      },
+      "options": {
+        "authmechanism": "GSSAPI",
+        "authmechanismproperties": {
+          "SERVICE_NAME": "other",
+          "CANONICALIZE_HOST_NAME": true
+        }
+      }
+    },
+    {
+      "description": "At-signs in options aren't part of the userinfo",
+      "uri": "mongodb://alice:secret@example.com/admin?replicaset=my@replicaset",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin", 
-                "password": "secret", 
-                "username": "alice"
-            }, 
-            "description": "At-signs in options aren't part of the userinfo", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": {
-                "replicaset": "my@replicaset"
-            }, 
-            "uri": "mongodb://alice:secret@example.com/admin?replicaset=my@replicaset", 
-            "valid": true, 
-            "warning": false
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
         }
-    ]
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "secret",
+        "db": "admin"
+      },
+      "options": {
+        "replicaset": "my@replicaset"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/connection-string/valid-db-with-dotted-name.json b/driver-core/src/test/resources/connection-string/valid-db-with-dotted-name.json
new file mode 100644
index 00000000000..5b5aaa5ee3b
--- /dev/null
+++ b/driver-core/src/test/resources/connection-string/valid-db-with-dotted-name.json
@@ -0,0 +1,100 @@
+{
+  "tests": [
+    {
+      "description": "Multiple Unix domain sockets and auth DB resembling a socket (relative path)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin.sock"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets with auth DB resembling a path (relative path)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin.shoe",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin.shoe"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets and auth DB resembling a socket (absolute path)",
+      "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin.sock"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets with auth DB resembling a path (absolute path)",
+      "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin.shoe",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin.shoe"
+      },
+      "options": null
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/connection-string/valid-host_identifiers.json b/driver-core/src/test/resources/connection-string/valid-host_identifiers.json
index 0a69dd97d57..e8833b4af29 100644
--- a/driver-core/src/test/resources/connection-string/valid-host_identifiers.json
+++ b/driver-core/src/test/resources/connection-string/valid-host_identifiers.json
@@ -1,154 +1,154 @@
 {
-    "tests": [
+  "tests": [
+    {
+      "description": "Single IPv4 host without port",
+      "uri": "mongodb://127.0.0.1",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Single IPv4 host without port", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://127.0.0.1", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Single IPv4 host with port",
+      "uri": "mongodb://127.0.0.1:27018",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Single IPv4 host with port", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": 27018, 
-                    "type": "ipv4"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://127.0.0.1:27018", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": 27018
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Single IP literal host without port",
+      "uri": "mongodb://[::1]",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Single IP literal host without port", 
-            "hosts": [
-                {
-                    "host": "::1", 
-                    "port": null, 
-                    "type": "ip_literal"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://[::1]", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ip_literal",
+          "host": "::1",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Single IP literal host with port",
+      "uri": "mongodb://[::1]:27019",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Single IP literal host with port", 
-            "hosts": [
-                {
-                    "host": "::1", 
-                    "port": 27019, 
-                    "type": "ip_literal"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://[::1]:27019", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ip_literal",
+          "host": "::1",
+          "port": 27019
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Single hostname without port",
+      "uri": "mongodb://example.com",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Single hostname without port", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://example.com", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Single hostname with port",
+      "uri": "mongodb://example.com:27020",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Single hostname with port", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": 27020, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://example.com:27020", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": 27020
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Single hostname (resembling IPv4) without port",
+      "uri": "mongodb://256.0.0.1",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Single hostname (resembling IPv4) without port", 
-            "hosts": [
-                {
-                    "host": "256.0.0.1", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://256.0.0.1", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "256.0.0.1",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple hosts (mixed formats)",
+      "uri": "mongodb://127.0.0.1,[::1]:27018,example.com:27019",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": null
+        },
+        {
+          "type": "ip_literal",
+          "host": "::1",
+          "port": 27018
+        },
+        {
+          "type": "hostname",
+          "host": "example.com",
+          "port": 27019
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "UTF-8 hosts",
+      "uri": "mongodb://bücher.example.com,umläut.example.com/",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Multiple hosts (mixed formats)", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": null, 
-                    "type": "ipv4"
-                }, 
-                {
-                    "host": "::1", 
-                    "port": 27018, 
-                    "type": "ip_literal"
-                }, 
-                {
-                    "host": "example.com", 
-                    "port": 27019, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://127.0.0.1,[::1]:27018,example.com:27019", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "bücher.example.com",
+          "port": null
+        },
         {
-            "auth": null, 
-            "description": "UTF-8 hosts", 
-            "hosts": [
-                {
-                    "host": "b\u00fccher.example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }, 
-                {
-                    "host": "uml\u00e4ut.example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://b\u00fccher.example.com,uml\u00e4ut.example.com/", 
-            "valid": true, 
-            "warning": false
+          "type": "hostname",
+          "host": "umläut.example.com",
+          "port": null
         }
-    ]
+      ],
+      "auth": null,
+      "options": null
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/connection-string/valid-options.json b/driver-core/src/test/resources/connection-string/valid-options.json
index 01f44bce54a..4c2bded9e72 100644
--- a/driver-core/src/test/resources/connection-string/valid-options.json
+++ b/driver-core/src/test/resources/connection-string/valid-options.json
@@ -1,42 +1,25 @@
 {
-    "tests": [
+  "tests": [
+    {
+      "description": "Option names are normalized to lowercase",
+      "uri": "mongodb://alice:secret@example.com/admin?AUTHMechanism=MONGODB-CR",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin", 
-                "password": "secret", 
-                "username": "alice"
-            }, 
-            "description": "Option names are normalized to lowercase", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": {
-                "authmechanism": "MONGODB-CR"
-            }, 
-            "uri": "mongodb://alice:secret@example.com/admin?AUTHMechanism=MONGODB-CR", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Option key and value (escaped null bytes)", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": {
-                "replicaset": "my\u0000rs"
-            }, 
-            "uri": "mongodb://example.com/?replicaSet=my%00rs", 
-            "valid": true, 
-            "warning": false
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
         }
-    ]
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "secret",
+        "db": "admin"
+      },
+      "options": {
+        "authmechanism": "MONGODB-CR"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/connection-string/valid-unix_socket-absolute.json b/driver-core/src/test/resources/connection-string/valid-unix_socket-absolute.json
index dbf5f59eb53..5bb02476eb7 100644
--- a/driver-core/src/test/resources/connection-string/valid-unix_socket-absolute.json
+++ b/driver-core/src/test/resources/connection-string/valid-unix_socket-absolute.json
@@ -1,251 +1,251 @@
 {
-    "tests": [
-        {
-            "auth": null, 
-            "description": "Unix domain socket (absolute path with trailing slash)", 
-            "hosts": [
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock/", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Unix domain socket (absolute path without trailing slash)", 
-            "hosts": [
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Unix domain socket (absolute path with spaces in path)", 
-            "hosts": [
-                {
-                    "host": "/tmp/ /mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2F %2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Multiple Unix domain sockets (absolute paths)", 
-            "hosts": [
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "/tmp/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Multiple hosts (absolute path and ipv4)", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": 27017, 
-                    "type": "ipv4"
-                }, 
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://127.0.0.1:27017,%2Ftmp%2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Multiple hosts (absolute path and hostname resembling relative path)", 
-            "hosts": [
-                {
-                    "host": "mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "hostname"
-                }, 
-                {
-                    "host": "/tmp/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://mongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": {
-                "db": "admin", 
-                "password": "foo", 
-                "username": "alice"
-            }, 
-            "description": "Unix domain socket with auth database (absolute path)", 
-            "hosts": [
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice:foo@%2Ftmp%2Fmongodb-27017.sock/admin", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Unix domain socket with path resembling socket file (absolute path with trailing slash)", 
-            "hosts": [
-                {
-                    "host": "/tmp/path.to.sock/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock/", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": null, 
-            "description": "Unix domain socket with path resembling socket file (absolute path without trailing slash)", 
-            "hosts": [
-                {
-                    "host": "/tmp/path.to.sock/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": {
-                "db": "admin", 
-                "password": "bar", 
-                "username": "bob"
-            }, 
-            "description": "Unix domain socket with path resembling socket file and auth (absolute path)", 
-            "hosts": [
-                {
-                    "host": "/tmp/path.to.sock/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://bob:bar@%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock/admin", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": {
-                "db": "admin.sock", 
-                "password": null, 
-                "username": null
-            }, 
-            "description": "Multiple Unix domain sockets and auth DB resembling a socket (absolute path)", 
-            "hosts": [
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "/tmp/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": {
-                "db": "admin.shoe", 
-                "password": null, 
-                "username": null
-            }, 
-            "description": "Multiple Unix domain sockets with auth DB resembling a path (absolute path)", 
-            "hosts": [
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "/tmp/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin.shoe", 
-            "valid": true, 
-            "warning": false
-        }, 
-        {
-            "auth": {
-                "db": "admin", 
-                "password": "bar", 
-                "username": "bob"
-            }, 
-            "description": "Multiple Unix domain sockets with auth and query string (absolute path)", 
-            "hosts": [
-                {
-                    "host": "/tmp/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "/tmp/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": {
-                "w": 1
-            }, 
-            "uri": "mongodb://bob:bar@%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin?w=1", 
-            "valid": true, 
-            "warning": false
+  "tests": [
+    {
+      "description": "Unix domain socket (absolute path with trailing slash)",
+      "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock/",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket (absolute path without trailing slash)",
+      "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket (absolute path with spaces in path)",
+      "uri": "mongodb://%2Ftmp%2F %2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/ /mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets (absolute paths)",
+      "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple hosts (absolute path and ipv4)",
+      "uri": "mongodb://127.0.0.1:27017,%2Ftmp%2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": 27017
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple hosts (absolute path and hostname resembling relative path)",
+      "uri": "mongodb://mongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "hostname",
+          "host": "mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with auth database (absolute path)",
+      "uri": "mongodb://alice:foo@%2Ftmp%2Fmongodb-27017.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "foo",
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with path resembling socket file (absolute path with trailing slash)",
+      "uri": "mongodb://%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock/",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/path.to.sock/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with path resembling socket file (absolute path without trailing slash)",
+      "uri": "mongodb://%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/path.to.sock/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with path resembling socket file and auth (absolute path)",
+      "uri": "mongodb://bob:bar@%2Ftmp%2Fpath.to.sock%2Fmongodb-27017.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/path.to.sock/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "bob",
+        "password": "bar",
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets and auth DB (absolute path)",
+      "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets with auth DB (absolute path)",
+      "uri": "mongodb://%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets with auth and query string (absolute path)",
+      "uri": "mongodb://bob:bar@%2Ftmp%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock/admin?w=1",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
         }
-    ]
+      ],
+      "auth": {
+        "username": "bob",
+        "password": "bar",
+        "db": "admin"
+      },
+      "options": {
+        "w": 1
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/connection-string/valid-unix_socket-relative.json b/driver-core/src/test/resources/connection-string/valid-unix_socket-relative.json
index 00b699eab0e..2ce649ffc23 100644
--- a/driver-core/src/test/resources/connection-string/valid-unix_socket-relative.json
+++ b/driver-core/src/test/resources/connection-string/valid-unix_socket-relative.json
@@ -1,271 +1,271 @@
 {
-    "tests": [
+  "tests": [
+    {
+      "description": "Unix domain socket (relative path with trailing slash)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock/",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Unix domain socket (relative path with trailing slash)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fmongodb-27017.sock/", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket (relative path without trailing slash)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket (relative path with spaces)",
+      "uri": "mongodb://rel%2F %2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "rel/ /mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets (relative paths)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets (relative and absolute paths)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        },
+        {
+          "type": "unix",
+          "host": "/tmp/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple hosts (relative path and ipv4)",
+      "uri": "mongodb://127.0.0.1:27017,rel%2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Unix domain socket (relative path without trailing slash)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "ipv4",
+          "host": "127.0.0.1",
+          "port": 27017
+        },
         {
-            "auth": null, 
-            "description": "Unix domain socket (relative path with spaces)", 
-            "hosts": [
-                {
-                    "host": "rel/ /mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2F %2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Multiple hosts (relative path and hostname resembling relative path)",
+      "uri": "mongodb://mongodb-27017.sock,rel%2Fmongodb-27018.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Multiple Unix domain sockets (relative paths)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "rel/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "hostname",
+          "host": "mongodb-27017.sock",
+          "port": null
+        },
         {
-            "auth": null, 
-            "description": "Multiple Unix domain sockets (relative and absolute paths)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "/tmp/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fmongodb-27017.sock,%2Ftmp%2Fmongodb-27018.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with auth database (relative path)",
+      "uri": "mongodb://alice:foo@rel%2Fmongodb-27017.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
+        {
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "alice",
+        "password": "foo",
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with path resembling socket file (relative path with trailing slash)",
+      "uri": "mongodb://rel%2Fpath.to.sock%2Fmongodb-27017.sock/",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Multiple hosts (relative path and ipv4)", 
-            "hosts": [
-                {
-                    "host": "127.0.0.1", 
-                    "port": 27017, 
-                    "type": "ipv4"
-                }, 
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://127.0.0.1:27017,rel%2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/path.to.sock/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with path resembling socket file (relative path without trailing slash)",
+      "uri": "mongodb://rel%2Fpath.to.sock%2Fmongodb-27017.sock",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Multiple hosts (relative path and hostname resembling relative path)", 
-            "hosts": [
-                {
-                    "host": "mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "hostname"
-                }, 
-                {
-                    "host": "rel/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://mongodb-27017.sock,rel%2Fmongodb-27018.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/path.to.sock/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unix domain socket with path resembling socket file and auth (relative path)",
+      "uri": "mongodb://bob:bar@rel%2Fpath.to.sock%2Fmongodb-27017.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin", 
-                "password": "foo", 
-                "username": "alice"
-            }, 
-            "description": "Unix domain socket with auth database (relative path)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://alice:foo@rel%2Fmongodb-27017.sock/admin", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/path.to.sock/mongodb-27017.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": "bob",
+        "password": "bar",
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets and auth DB resembling a socket (relative path)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Unix domain socket with path resembling socket file (relative path with trailing slash)", 
-            "hosts": [
-                {
-                    "host": "rel/path.to.sock/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fpath.to.sock%2Fmongodb-27017.sock/", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        },
         {
-            "auth": null, 
-            "description": "Unix domain socket with path resembling socket file (relative path without trailing slash)", 
-            "hosts": [
-                {
-                    "host": "rel/path.to.sock/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fpath.to.sock%2Fmongodb-27017.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets with auth DB resembling a path (relative path)",
+      "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin", 
-                "password": "bar", 
-                "username": "bob"
-            }, 
-            "description": "Unix domain socket with path resembling socket file and auth (relative path)", 
-            "hosts": [
-                {
-                    "host": "rel/path.to.sock/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://bob:bar@rel%2Fpath.to.sock%2Fmongodb-27017.sock/admin", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        },
         {
-            "auth": {
-                "db": "admin.sock", 
-                "password": null, 
-                "username": null
-            }, 
-            "description": "Multiple Unix domain sockets and auth DB resembling a socket (relative path)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "rel/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin.sock", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27018.sock",
+          "port": null
+        }
+      ],
+      "auth": {
+        "username": null,
+        "password": null,
+        "db": "admin"
+      },
+      "options": null
+    },
+    {
+      "description": "Multiple Unix domain sockets with auth and query string (relative path)",
+      "uri": "mongodb://bob:bar@rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin?w=1",
+      "valid": true,
+      "warning": false,
+      "hosts": [
         {
-            "auth": {
-                "db": "admin.shoe", 
-                "password": null, 
-                "username": null
-            }, 
-            "description": "Multiple Unix domain sockets with auth DB resembling a path (relative path)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "rel/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin.shoe", 
-            "valid": true, 
-            "warning": false
-        }, 
+          "type": "unix",
+          "host": "rel/mongodb-27017.sock",
+          "port": null
+        },
         {
-            "auth": {
-                "db": "admin", 
-                "password": "bar", 
-                "username": "bob"
-            }, 
-            "description": "Multiple Unix domain sockets with auth and query string (relative path)", 
-            "hosts": [
-                {
-                    "host": "rel/mongodb-27017.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }, 
-                {
-                    "host": "rel/mongodb-27018.sock", 
-                    "port": null, 
-                    "type": "unix"
-                }
-            ], 
-            "options": {
-                "w": 1
-            }, 
-            "uri": "mongodb://bob:bar@rel%2Fmongodb-27017.sock,rel%2Fmongodb-27018.sock/admin?w=1", 
-            "valid": true, 
-            "warning": false
+          "type": "unix",
+          "host": "rel/mongodb-27018.sock",
+          "port": null
         }
-    ]
+      ],
+      "auth": {
+        "username": "bob",
+        "password": "bar",
+        "db": "admin"
+      },
+      "options": {
+        "w": 1
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/connection-string/valid-warnings.json b/driver-core/src/test/resources/connection-string/valid-warnings.json
index 05ab214cc71..87f7248f21e 100644
--- a/driver-core/src/test/resources/connection-string/valid-warnings.json
+++ b/driver-core/src/test/resources/connection-string/valid-warnings.json
@@ -1,68 +1,68 @@
 {
-    "tests": [
+  "tests": [
+    {
+      "description": "Unrecognized option keys are ignored",
+      "uri": "mongodb://example.com/?foo=bar",
+      "valid": true,
+      "warning": true,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Unrecognized option keys are ignored", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://example.com/?foo=bar", 
-            "valid": true, 
-            "warning": true
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Unsupported option values are ignored",
+      "uri": "mongodb://example.com/?fsync=ifPossible",
+      "valid": true,
+      "warning": true,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Unsupported option values are ignored", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": null, 
-            "uri": "mongodb://example.com/?fsync=ifPossible", 
-            "valid": true, 
-            "warning": true
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": null
+    },
+    {
+      "description": "Repeated option keys",
+      "uri": "mongodb://example.com/?replicaSet=test&replicaSet=test",
+      "valid": true,
+      "warning": true,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Repeated option keys", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": {
-                "replicaset": "test"
-            }, 
-            "uri": "mongodb://example.com/?replicaSet=test&replicaSet=test", 
-            "valid": true, 
-            "warning": true
-        }, 
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
+        }
+      ],
+      "auth": null,
+      "options": {
+        "replicaset": "test"
+      }
+    },
+    {
+      "description": "Deprecated (or unknown) options are ignored if replacement exists",
+      "uri": "mongodb://example.com/?wtimeout=5&wtimeoutMS=10",
+      "valid": true,
+      "warning": true,
+      "hosts": [
         {
-            "auth": null, 
-            "description": "Deprecated (or unknown) options are ignored if replacement exists", 
-            "hosts": [
-                {
-                    "host": "example.com", 
-                    "port": null, 
-                    "type": "hostname"
-                }
-            ], 
-            "options": {
-                "wtimeoutms": 10
-            }, 
-            "uri": "mongodb://example.com/?wtimeout=5&wtimeoutMS=10", 
-            "valid": true, 
-            "warning": true
+          "type": "hostname",
+          "host": "example.com",
+          "port": null
         }
-    ]
+      ],
+      "auth": null,
+      "options": {
+        "wtimeoutms": 10
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/crud/read/aggregate.json b/driver-core/src/test/resources/crud/read/aggregate.json
deleted file mode 100755
index cbda0483c91..00000000000
--- a/driver-core/src/test/resources/crud/read/aggregate.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "Aggregate with multiple stages",
-      "operation": {
-        "name": "aggregate",
-        "arguments": {
-          "pipeline": [
-            {
-              "$sort": {
-                "x": 1
-              }
-            },
-            {
-              "$match": {
-                "_id": {
-                  "$gt": 1
-                }
-              }
-            }
-          ],
-          "batchSize": 2
-        }
-      },
-      "outcome": {
-        "result": [
-          {
-            "_id": 2,
-            "x": 22
-          },
-          {
-            "_id": 3,
-            "x": 33
-          }
-        ]
-      }
-    },
-    {
-      "description": "Aggregate with $out",
-      "operation": {
-        "name": "aggregate",
-        "arguments": {
-          "pipeline": [
-            {
-              "$sort": {
-                "x": 1
-              }
-            },
-            {
-              "$match": {
-                "_id": {
-                  "$gt": 1
-                }
-              }
-            },
-            {
-              "$out": "other_test_collection"
-            }
-          ],
-          "batchSize": 2
-        }
-      },
-      "outcome": {
-        "result": [
-          {
-            "_id": 2,
-            "x": 22
-          },
-          {
-            "_id": 3,
-            "x": 33
-          }
-        ],
-        "collection": {
-          "name": "other_test_collection",
-          "data": [
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/read/count.json b/driver-core/src/test/resources/crud/read/count.json
deleted file mode 100755
index 85c17e11a2e..00000000000
--- a/driver-core/src/test/resources/crud/read/count.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "Count without a filter",
-      "operation": {
-        "name": "count",
-        "arguments": {
-          "filter": {}
-        }
-      },
-      "outcome": {
-        "result": 3
-      }
-    },
-    {
-      "description": "Count with a filter",
-      "operation": {
-        "name": "count",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": 2
-      }
-    },
-    {
-      "description": "Count with skip and limit",
-      "operation": {
-        "name": "count",
-        "arguments": {
-          "filter": {},
-          "skip": 1,
-          "limit": 3
-        }
-      },
-      "outcome": {
-        "result": 2
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/read/distinct.json b/driver-core/src/test/resources/crud/read/distinct.json
deleted file mode 100755
index 408d8a48051..00000000000
--- a/driver-core/src/test/resources/crud/read/distinct.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "Distinct without a filter",
-      "operation": {
-        "name": "distinct",
-        "arguments": {
-          "fieldName": "x",
-          "filter": {}
-        }
-      },
-      "outcome": {
-        "result": [
-          11,
-          22,
-          33
-        ]
-      }
-    },
-    {
-      "description": "Distinct with a filter",
-      "operation": {
-        "name": "distinct",
-        "arguments": {
-          "fieldName": "x",
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": [
-          22,
-          33
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/read/find.json b/driver-core/src/test/resources/crud/read/find.json
deleted file mode 100755
index d92081d551d..00000000000
--- a/driver-core/src/test/resources/crud/read/find.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    },
-    {
-      "_id": 4,
-      "x": 44
-    },
-    {
-      "_id": 5,
-      "x": 55
-    }
-  ],
-  "tests": [
-    {
-      "description": "Find with filter",
-      "operation": {
-        "name": "find",
-        "arguments": {
-          "filter": {
-            "_id": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": [
-          {
-            "_id": 1,
-            "x": 11
-          }
-        ]
-      }
-    },
-    {
-      "description": "Find with filter, sort, skip, and limit",
-      "operation": {
-        "name": "find",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 2
-            }
-          },
-          "sort": {
-            "_id": 1
-          },
-          "skip": 2,
-          "limit": 2
-        }
-      },
-      "outcome": {
-        "result": [
-          {
-            "_id": 5,
-            "x": 55
-          }
-        ]
-      }
-    },
-    {
-      "description": "Find with limit, sort, and batchsize",
-      "operation": {
-        "name": "find",
-        "arguments": {
-          "filter": {},
-          "sort": {
-            "_id": 1
-          },
-          "limit": 4,
-          "batchSize": 2
-        }
-      },
-      "outcome": {
-        "result": [
-          {
-            "_id": 1,
-            "x": 11
-          },
-          {
-            "_id": 2,
-            "x": 22
-          },
-          {
-            "_id": 3,
-            "x": 33
-          },
-          {
-            "_id": 4,
-            "x": 44
-          }
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/v1/read/aggregate-collation.json b/driver-core/src/test/resources/crud/v1/read/aggregate-collation.json
new file mode 100644
index 00000000000..85662a442fb
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/aggregate-collation.json
@@ -0,0 +1,38 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": "ping"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "Aggregate with collation",
+      "operation": {
+        "name": "aggregate",
+        "arguments": {
+          "pipeline": [
+            {
+              "$match": {
+                "x": "PING"
+              }
+            }
+          ],
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": [
+          {
+            "_id": 1,
+            "x": "ping"
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/aggregate-out.json b/driver-core/src/test/resources/crud/v1/read/aggregate-out.json
new file mode 100644
index 00000000000..4e33f9288f0
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/aggregate-out.json
@@ -0,0 +1,101 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "minServerVersion": "2.6",
+  "tests": [
+    {
+      "description": "Aggregate with $out",
+      "operation": {
+        "name": "aggregate",
+        "arguments": {
+          "pipeline": [
+            {
+              "$sort": {
+                "x": 1
+              }
+            },
+            {
+              "$match": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            {
+              "$out": "other_test_collection"
+            }
+          ],
+          "batchSize": 2
+        }
+      },
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Aggregate with $out and batch size of 0",
+      "operation": {
+        "name": "aggregate",
+        "arguments": {
+          "pipeline": [
+            {
+              "$sort": {
+                "x": 1
+              }
+            },
+            {
+              "$match": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            {
+              "$out": "other_test_collection"
+            }
+          ],
+          "batchSize": 0
+        }
+      },
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/aggregate.json b/driver-core/src/test/resources/crud/v1/read/aggregate.json
new file mode 100644
index 00000000000..797a922395a
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/aggregate.json
@@ -0,0 +1,53 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Aggregate with multiple stages",
+      "operation": {
+        "name": "aggregate",
+        "arguments": {
+          "pipeline": [
+            {
+              "$sort": {
+                "x": 1
+              }
+            },
+            {
+              "$match": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            }
+          ],
+          "batchSize": 2
+        }
+      },
+      "outcome": {
+        "result": [
+          {
+            "_id": 2,
+            "x": 22
+          },
+          {
+            "_id": 3,
+            "x": 33
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/count-collation.json b/driver-core/src/test/resources/crud/v1/read/count-collation.json
new file mode 100644
index 00000000000..6f75282fe0f
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/count-collation.json
@@ -0,0 +1,47 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": "PING"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "Count documents with collation",
+      "operation": {
+        "name": "countDocuments",
+        "arguments": {
+          "filter": {
+            "x": "ping"
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": 1
+      }
+    },
+    {
+      "description": "Deprecated count with collation",
+      "operation": {
+        "name": "count",
+        "arguments": {
+          "filter": {
+            "x": "ping"
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": 1
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/count-empty.json b/driver-core/src/test/resources/crud/v1/read/count-empty.json
new file mode 100644
index 00000000000..2b8627e0c69
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/count-empty.json
@@ -0,0 +1,39 @@
+{
+  "data": [],
+  "tests": [
+    {
+      "description": "Estimated document count with empty collection",
+      "operation": {
+        "name": "estimatedDocumentCount",
+        "arguments": {}
+      },
+      "outcome": {
+        "result": 0
+      }
+    },
+    {
+      "description": "Count documents with empty collection",
+      "operation": {
+        "name": "countDocuments",
+        "arguments": {
+          "filter": {}
+        }
+      },
+      "outcome": {
+        "result": 0
+      }
+    },
+    {
+      "description": "Deprecated count with empty collection",
+      "operation": {
+        "name": "count",
+        "arguments": {
+          "filter": {}
+        }
+      },
+      "outcome": {
+        "result": 0
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/count.json b/driver-core/src/test/resources/crud/v1/read/count.json
new file mode 100644
index 00000000000..9642b2fbd08
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/count.json
@@ -0,0 +1,112 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Estimated document count",
+      "operation": {
+        "name": "estimatedDocumentCount",
+        "arguments": {}
+      },
+      "outcome": {
+        "result": 3
+      }
+    },
+    {
+      "description": "Count documents without a filter",
+      "operation": {
+        "name": "countDocuments",
+        "arguments": {
+          "filter": {}
+        }
+      },
+      "outcome": {
+        "result": 3
+      }
+    },
+    {
+      "description": "Count documents with a filter",
+      "operation": {
+        "name": "countDocuments",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": 2
+      }
+    },
+    {
+      "description": "Count documents with skip and limit",
+      "operation": {
+        "name": "countDocuments",
+        "arguments": {
+          "filter": {},
+          "skip": 1,
+          "limit": 3
+        }
+      },
+      "outcome": {
+        "result": 2
+      }
+    },
+    {
+      "description": "Deprecated count without a filter",
+      "operation": {
+        "name": "count",
+        "arguments": {
+          "filter": {}
+        }
+      },
+      "outcome": {
+        "result": 3
+      }
+    },
+    {
+      "description": "Deprecated count with a filter",
+      "operation": {
+        "name": "count",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": 2
+      }
+    },
+    {
+      "description": "Deprecated count with skip and limit",
+      "operation": {
+        "name": "count",
+        "arguments": {
+          "filter": {},
+          "skip": 1,
+          "limit": 3
+        }
+      },
+      "outcome": {
+        "result": 2
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/distinct-collation.json b/driver-core/src/test/resources/crud/v1/read/distinct-collation.json
new file mode 100644
index 00000000000..0af0c67cb70
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/distinct-collation.json
@@ -0,0 +1,33 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "string": "PING"
+    },
+    {
+      "_id": 2,
+      "string": "ping"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "Distinct with a collation",
+      "operation": {
+        "name": "distinct",
+        "arguments": {
+          "fieldName": "string",
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": [
+          "PING"
+        ]
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/distinct.json b/driver-core/src/test/resources/crud/v1/read/distinct.json
new file mode 100644
index 00000000000..a57ee36a834
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/distinct.json
@@ -0,0 +1,55 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Distinct without a filter",
+      "operation": {
+        "name": "distinct",
+        "arguments": {
+          "fieldName": "x",
+          "filter": {}
+        }
+      },
+      "outcome": {
+        "result": [
+          11,
+          22,
+          33
+        ]
+      }
+    },
+    {
+      "description": "Distinct with a filter",
+      "operation": {
+        "name": "distinct",
+        "arguments": {
+          "fieldName": "x",
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": [
+          22,
+          33
+        ]
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/find-collation.json b/driver-core/src/test/resources/crud/v1/read/find-collation.json
new file mode 100644
index 00000000000..53d0e94900d
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/find-collation.json
@@ -0,0 +1,34 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": "ping"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "Find with a collation",
+      "operation": {
+        "name": "find",
+        "arguments": {
+          "filter": {
+            "x": "PING"
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": [
+          {
+            "_id": 1,
+            "x": "ping"
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/read/find.json b/driver-core/src/test/resources/crud/v1/read/find.json
new file mode 100644
index 00000000000..3597e37be6f
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/read/find.json
@@ -0,0 +1,105 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    },
+    {
+      "_id": 4,
+      "x": 44
+    },
+    {
+      "_id": 5,
+      "x": 55
+    }
+  ],
+  "tests": [
+    {
+      "description": "Find with filter",
+      "operation": {
+        "name": "find",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": [
+          {
+            "_id": 1,
+            "x": 11
+          }
+        ]
+      }
+    },
+    {
+      "description": "Find with filter, sort, skip, and limit",
+      "operation": {
+        "name": "find",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 2
+            }
+          },
+          "sort": {
+            "_id": 1
+          },
+          "skip": 2,
+          "limit": 2
+        }
+      },
+      "outcome": {
+        "result": [
+          {
+            "_id": 5,
+            "x": 55
+          }
+        ]
+      }
+    },
+    {
+      "description": "Find with limit, sort, and batchsize",
+      "operation": {
+        "name": "find",
+        "arguments": {
+          "filter": {},
+          "sort": {
+            "_id": 1
+          },
+          "limit": 4,
+          "batchSize": 2
+        }
+      },
+      "outcome": {
+        "result": [
+          {
+            "_id": 1,
+            "x": 11
+          },
+          {
+            "_id": 2,
+            "x": 22
+          },
+          {
+            "_id": 3,
+            "x": 33
+          },
+          {
+            "_id": 4,
+            "x": 44
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/bulkWrite-arrayFilters.json b/driver-core/src/test/resources/crud/v1/write/bulkWrite-arrayFilters.json
new file mode 100644
index 00000000000..99e73f5d755
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/bulkWrite-arrayFilters.json
@@ -0,0 +1,111 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "y": [
+        {
+          "b": 3
+        },
+        {
+          "b": 1
+        }
+      ]
+    },
+    {
+      "_id": 2,
+      "y": [
+        {
+          "b": 0
+        },
+        {
+          "b": 1
+        }
+      ]
+    }
+  ],
+  "minServerVersion": "3.5.6",
+  "tests": [
+    {
+      "description": "BulkWrite with arrayFilters",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {},
+                "update": {
+                  "$set": {
+                    "y.$[i].b": 2
+                  }
+                },
+                "arrayFilters": [
+                  {
+                    "i.b": 3
+                  }
+                ]
+              }
+            },
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {},
+                "update": {
+                  "$set": {
+                    "y.$[i].b": 2
+                  }
+                },
+                "arrayFilters": [
+                  {
+                    "i.b": 1
+                  }
+                ]
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 3,
+          "modifiedCount": 3,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 2
+                },
+                {
+                  "b": 2
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 2
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/bulkWrite-collation.json b/driver-core/src/test/resources/crud/v1/write/bulkWrite-collation.json
new file mode 100644
index 00000000000..8e9d1bcb1ac
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/bulkWrite-collation.json
@@ -0,0 +1,217 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    },
+    {
+      "_id": 3,
+      "x": "pINg"
+    },
+    {
+      "_id": 4,
+      "x": "pong"
+    },
+    {
+      "_id": 5,
+      "x": "pONg"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "BulkWrite with delete operations and collation",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "x": "PING"
+                },
+                "collation": {
+                  "locale": "en_US",
+                  "strength": 2
+                }
+              }
+            },
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "x": "PING"
+                },
+                "collation": {
+                  "locale": "en_US",
+                  "strength": 2
+                }
+              }
+            },
+            {
+              "name": "deleteMany",
+              "arguments": {
+                "filter": {
+                  "x": "PONG"
+                },
+                "collation": {
+                  "locale": "en_US",
+                  "strength": 2
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 4,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with update operations and collation",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "x": "ping"
+                },
+                "update": {
+                  "$set": {
+                    "x": "PONG"
+                  }
+                },
+                "collation": {
+                  "locale": "en_US",
+                  "strength": 3
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "x": "ping"
+                },
+                "update": {
+                  "$set": {
+                    "x": "PONG"
+                  }
+                },
+                "collation": {
+                  "locale": "en_US",
+                  "strength": 2
+                }
+              }
+            },
+            {
+              "name": "replaceOne",
+              "arguments": {
+                "filter": {
+                  "x": "ping"
+                },
+                "replacement": {
+                  "_id": 6,
+                  "x": "ping"
+                },
+                "upsert": true,
+                "collation": {
+                  "locale": "en_US",
+                  "strength": 3
+                }
+              }
+            },
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "x": "pong"
+                },
+                "update": {
+                  "$set": {
+                    "x": "PONG"
+                  }
+                },
+                "collation": {
+                  "locale": "en_US",
+                  "strength": 2
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 6,
+          "modifiedCount": 4,
+          "upsertedCount": 1,
+          "upsertedIds": {
+            "2": 6
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": "PONG"
+            },
+            {
+              "_id": 3,
+              "x": "PONG"
+            },
+            {
+              "_id": 4,
+              "x": "PONG"
+            },
+            {
+              "_id": 5,
+              "x": "PONG"
+            },
+            {
+              "_id": 6,
+              "x": "ping"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/bulkWrite.json b/driver-core/src/test/resources/crud/v1/write/bulkWrite.json
new file mode 100644
index 00000000000..dc00da28add
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/bulkWrite.json
@@ -0,0 +1,778 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "minServerVersion": "2.6",
+  "tests": [
+    {
+      "description": "BulkWrite with deleteOne operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 3
+                }
+              }
+            },
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with deleteMany operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "deleteMany",
+              "arguments": {
+                "filter": {
+                  "x": {
+                    "$lt": 11
+                  }
+                }
+              }
+            },
+            {
+              "name": "deleteMany",
+              "arguments": {
+                "filter": {
+                  "x": {
+                    "$lte": 22
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 2,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with insertOne operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 4,
+                  "x": 44
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 2,
+          "insertedIds": {
+            "0": 3,
+            "1": 4
+          },
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with replaceOne operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "replaceOne",
+              "arguments": {
+                "filter": {
+                  "_id": 3
+                },
+                "replacement": {
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "replaceOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                },
+                "replacement": {
+                  "x": 12
+                }
+              }
+            },
+            {
+              "name": "replaceOne",
+              "arguments": {
+                "filter": {
+                  "_id": 3
+                },
+                "replacement": {
+                  "x": 33
+                },
+                "upsert": true
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 1,
+          "upsertedIds": {
+            "2": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with updateOne operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 0
+                },
+                "update": {
+                  "$set": {
+                    "x": 0
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                },
+                "update": {
+                  "$set": {
+                    "x": 11
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 3
+                },
+                "update": {
+                  "$set": {
+                    "x": 33
+                  }
+                },
+                "upsert": true
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 2,
+          "modifiedCount": 1,
+          "upsertedCount": 1,
+          "upsertedIds": {
+            "3": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with updateMany operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "x": {
+                    "$lt": 11
+                  }
+                },
+                "update": {
+                  "$set": {
+                    "x": 0
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "x": {
+                    "$lte": 22
+                  }
+                },
+                "update": {
+                  "$unset": {
+                    "y": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "x": {
+                    "$lte": 22
+                  }
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "_id": 3
+                },
+                "update": {
+                  "$set": {
+                    "x": 33
+                  }
+                },
+                "upsert": true
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 4,
+          "modifiedCount": 2,
+          "upsertedCount": 1,
+          "upsertedIds": {
+            "3": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with mixed ordered operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 4,
+                  "x": 44
+                }
+              }
+            },
+            {
+              "name": "deleteMany",
+              "arguments": {
+                "filter": {
+                  "x": {
+                    "$nin": [
+                      24,
+                      34
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              "name": "replaceOne",
+              "arguments": {
+                "filter": {
+                  "_id": 4
+                },
+                "replacement": {
+                  "_id": 4,
+                  "x": 44
+                },
+                "upsert": true
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 2,
+          "insertedCount": 2,
+          "insertedIds": {
+            "0": 3,
+            "3": 4
+          },
+          "matchedCount": 3,
+          "modifiedCount": 3,
+          "upsertedCount": 1,
+          "upsertedIds": {
+            "5": 4
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 24
+            },
+            {
+              "_id": 3,
+              "x": 34
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with mixed unordered operations",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "replaceOne",
+              "arguments": {
+                "filter": {
+                  "_id": 3
+                },
+                "replacement": {
+                  "_id": 3,
+                  "x": 33
+                },
+                "upsert": true
+              }
+            },
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 1,
+          "upsertedIds": {
+            "0": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite continue-on-error behavior with unordered (preexisting duplicate key)",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 4,
+                  "x": 44
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 2,
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite continue-on-error behavior with unordered (duplicate key in requests)",
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 4,
+                  "x": 44
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 2,
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/deleteMany-collation.json b/driver-core/src/test/resources/crud/v1/write/deleteMany-collation.json
new file mode 100644
index 00000000000..d17bf3bcb9e
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/deleteMany-collation.json
@@ -0,0 +1,47 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    },
+    {
+      "_id": 3,
+      "x": "pINg"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "DeleteMany when many documents match with collation",
+      "operation": {
+        "name": "deleteMany",
+        "arguments": {
+          "filter": {
+            "x": "PING"
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 2
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/deleteMany.json b/driver-core/src/test/resources/crud/v1/write/deleteMany.json
new file mode 100644
index 00000000000..7eee85e77f4
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/deleteMany.json
@@ -0,0 +1,76 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "DeleteMany when many documents match",
+      "operation": {
+        "name": "deleteMany",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 2
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "DeleteMany when no document matches",
+      "operation": {
+        "name": "deleteMany",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/deleteOne-collation.json b/driver-core/src/test/resources/crud/v1/write/deleteOne-collation.json
new file mode 100644
index 00000000000..2f7f9211300
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/deleteOne-collation.json
@@ -0,0 +1,51 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    },
+    {
+      "_id": 3,
+      "x": "pINg"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "DeleteOne when many documents matches with collation",
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "x": "PING"
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 3,
+              "x": "pINg"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/deleteOne.json b/driver-core/src/test/resources/crud/v1/write/deleteOne.json
new file mode 100644
index 00000000000..a1106deae36
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/deleteOne.json
@@ -0,0 +1,96 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "DeleteOne when many documents match",
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1
+        }
+      }
+    },
+    {
+      "description": "DeleteOne when one document matches",
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "DeleteOne when no documents match",
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndDelete-collation.json b/driver-core/src/test/resources/crud/v1/write/findOneAndDelete-collation.json
new file mode 100644
index 00000000000..1ff37d2e88a
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndDelete-collation.json
@@ -0,0 +1,59 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    },
+    {
+      "_id": 3,
+      "x": "pINg"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "FindOneAndDelete when one document matches with collation",
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "_id": 2,
+            "x": "PING"
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": "ping"
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 3,
+              "x": "pINg"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndDelete.json b/driver-core/src/test/resources/crud/v1/write/findOneAndDelete.json
new file mode 100644
index 00000000000..e424e2aad10
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndDelete.json
@@ -0,0 +1,127 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndDelete when many documents match",
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 22
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndDelete when one document matches",
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "_id": 2
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 22
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndDelete when no documents match",
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndReplace-collation.json b/driver-core/src/test/resources/crud/v1/write/findOneAndReplace-collation.json
new file mode 100644
index 00000000000..babb2f7c11f
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndReplace-collation.json
@@ -0,0 +1,58 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "FindOneAndReplace when one document matches with collation returning the document after modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "x": "PING"
+          },
+          "replacement": {
+            "x": "pong"
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": "pong"
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": "pong"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndReplace-upsert.json b/driver-core/src/test/resources/crud/v1/write/findOneAndReplace-upsert.json
new file mode 100644
index 00000000000..0f07bf9c18d
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndReplace-upsert.json
@@ -0,0 +1,201 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "minServerVersion": "2.6",
+  "tests": [
+    {
+      "description": "FindOneAndReplace when no documents match without id specified with upsert returning the document before modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "x": 44
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when no documents match without id specified with upsert returning the document after modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "x": 44
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 44
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when no documents match with id specified with upsert returning the document before modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "_id": 4,
+            "x": 44
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when no documents match with id specified with upsert returning the document after modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "_id": 4,
+            "x": 44
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 44
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndReplace.json b/driver-core/src/test/resources/crud/v1/write/findOneAndReplace.json
new file mode 100644
index 00000000000..70e5c3df4e9
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndReplace.json
@@ -0,0 +1,273 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndReplace when many documents match returning the document before modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "replacement": {
+            "x": 32
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 22
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 32
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when many documents match returning the document after modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "replacement": {
+            "x": 32
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 32
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 32
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when one document matches returning the document before modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 2
+          },
+          "replacement": {
+            "x": 32
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 22
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 32
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when one document matches returning the document after modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 2
+          },
+          "replacement": {
+            "x": 32
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 32
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 32
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when no documents match returning the document before modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "x": 44
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace when no documents match returning the document after modification",
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "x": 44
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate-arrayFilters.json b/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate-arrayFilters.json
new file mode 100644
index 00000000000..1aa13b863e7
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate-arrayFilters.json
@@ -0,0 +1,203 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "y": [
+        {
+          "b": 3
+        },
+        {
+          "b": 1
+        }
+      ]
+    },
+    {
+      "_id": 2,
+      "y": [
+        {
+          "b": 0
+        },
+        {
+          "b": 1
+        }
+      ]
+    }
+  ],
+  "minServerVersion": "3.5.6",
+  "tests": [
+    {
+      "description": "FindOneAndUpdate when no document matches arrayFilters",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 4
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "y": [
+            {
+              "b": 3
+            },
+            {
+              "b": 1
+            }
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when one document matches arrayFilters",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 3
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "y": [
+            {
+              "b": 3
+            },
+            {
+              "b": 1
+            }
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 2
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when multiple documents match arrayFilters",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 1
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "y": [
+            {
+              "b": 3
+            },
+            {
+              "b": 1
+            }
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 2
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate-collation.json b/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate-collation.json
new file mode 100644
index 00000000000..04c1fe73ec5
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate-collation.json
@@ -0,0 +1,67 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    },
+    {
+      "_id": 3,
+      "x": "pINg"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "FindOneAndUpdate when many documents match with collation returning the document before modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "x": "PING"
+          },
+          "update": {
+            "$set": {
+              "x": "pong"
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "_id": 1
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": "ping"
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": "pong"
+            },
+            {
+              "_id": 3,
+              "x": "pINg"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate.json b/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate.json
new file mode 100644
index 00000000000..6da8325273b
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/findOneAndUpdate.json
@@ -0,0 +1,379 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndUpdate when many documents match returning the document before modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 22
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when many documents match returning the document after modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 23
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when one document matches returning the document before modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 2
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 22
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when one document matches returning the document after modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 2
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 23
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when no documents match returning the document before modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when no documents match with upsert returning the document before modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when no documents match returning the document after modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": null,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate when no documents match with upsert returning the document after modification",
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "projection": {
+            "x": 1,
+            "_id": 0
+          },
+          "returnDocument": "After",
+          "sort": {
+            "x": 1
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "x": 1
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/insertMany.json b/driver-core/src/test/resources/crud/v1/write/insertMany.json
new file mode 100644
index 00000000000..6a2e5261b74
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/insertMany.json
@@ -0,0 +1,159 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "InsertMany with non-existing documents",
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedIds": {
+            "0": 2,
+            "1": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertMany continue-on-error behavior with unordered (preexisting duplicate key)",
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 2,
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertMany continue-on-error behavior with unordered (duplicate key in requests)",
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 2,
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/insertOne.json b/driver-core/src/test/resources/crud/v1/write/insertOne.json
new file mode 100644
index 00000000000..525de75e078
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/insertOne.json
@@ -0,0 +1,39 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "InsertOne with a non-existing document",
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 2,
+            "x": 22
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 2
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/replaceOne-collation.json b/driver-core/src/test/resources/crud/v1/write/replaceOne-collation.json
new file mode 100644
index 00000000000..a668fe73831
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/replaceOne-collation.json
@@ -0,0 +1,53 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "ReplaceOne when one document matches with collation",
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "x": "PING"
+          },
+          "replacement": {
+            "_id": 2,
+            "x": "pong"
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": "pong"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/replaceOne.json b/driver-core/src/test/resources/crud/v1/write/replaceOne.json
new file mode 100644
index 00000000000..101af25c7c5
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/replaceOne.json
@@ -0,0 +1,205 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "minServerVersion": "2.6",
+  "tests": [
+    {
+      "description": "ReplaceOne when many documents match",
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "replacement": {
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne when one document matches",
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne when no documents match",
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "_id": 4,
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne with upsert when no documents match without an id specified",
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "x": 1
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 1,
+          "upsertedId": 4
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne with upsert when no documents match with an id specified",
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "replacement": {
+            "_id": 4,
+            "x": 1
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 1,
+          "upsertedId": 4
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/updateMany-arrayFilters.json b/driver-core/src/test/resources/crud/v1/write/updateMany-arrayFilters.json
new file mode 100644
index 00000000000..ae4c123ea51
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/updateMany-arrayFilters.json
@@ -0,0 +1,185 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "y": [
+        {
+          "b": 3
+        },
+        {
+          "b": 1
+        }
+      ]
+    },
+    {
+      "_id": 2,
+      "y": [
+        {
+          "b": 0
+        },
+        {
+          "b": 1
+        }
+      ]
+    }
+  ],
+  "minServerVersion": "3.5.6",
+  "tests": [
+    {
+      "description": "UpdateMany when no documents match arrayFilters",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 4
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 2,
+          "modifiedCount": 0,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateMany when one document matches arrayFilters",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 3
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 2,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 2
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateMany when multiple documents match arrayFilters",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 1
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 2,
+          "modifiedCount": 2,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 2
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 2
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/updateMany-collation.json b/driver-core/src/test/resources/crud/v1/write/updateMany-collation.json
new file mode 100644
index 00000000000..3cb49f22981
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/updateMany-collation.json
@@ -0,0 +1,62 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    },
+    {
+      "_id": 3,
+      "x": "pINg"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "UpdateMany when many documents match with collation",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {
+            "x": "ping"
+          },
+          "update": {
+            "$set": {
+              "x": "pong"
+            }
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 2,
+          "modifiedCount": 2,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": "pong"
+            },
+            {
+              "_id": 3,
+              "x": "pong"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/updateMany.json b/driver-core/src/test/resources/crud/v1/write/updateMany.json
new file mode 100644
index 00000000000..a3c339987d9
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/updateMany.json
@@ -0,0 +1,183 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "minServerVersion": "2.6",
+  "tests": [
+    {
+      "description": "UpdateMany when many documents match",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 2,
+          "modifiedCount": 2,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 34
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateMany when one document matches",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateMany when no documents match",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateMany with upsert when no documents match",
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 1,
+          "upsertedId": 4
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/updateOne-arrayFilters.json b/driver-core/src/test/resources/crud/v1/write/updateOne-arrayFilters.json
new file mode 100644
index 00000000000..087ed4b82fc
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/updateOne-arrayFilters.json
@@ -0,0 +1,395 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "y": [
+        {
+          "b": 3
+        },
+        {
+          "b": 1
+        }
+      ]
+    },
+    {
+      "_id": 2,
+      "y": [
+        {
+          "b": 0
+        },
+        {
+          "b": 1
+        }
+      ]
+    },
+    {
+      "_id": 3,
+      "y": [
+        {
+          "b": 5,
+          "c": [
+            {
+              "d": 2
+            },
+            {
+              "d": 1
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "minServerVersion": "3.5.6",
+  "tests": [
+    {
+      "description": "UpdateOne when no document matches arrayFilters",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 4
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 0,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 3,
+              "y": [
+                {
+                  "b": 5,
+                  "c": [
+                    {
+                      "d": 2
+                    },
+                    {
+                      "d": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne when one document matches arrayFilters",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 3
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 2
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 3,
+              "y": [
+                {
+                  "b": 5,
+                  "c": [
+                    {
+                      "d": 2
+                    },
+                    {
+                      "d": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne when multiple documents match arrayFilters",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$set": {
+              "y.$[i].b": 2
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 1
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 2
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 3,
+              "y": [
+                {
+                  "b": 5,
+                  "c": [
+                    {
+                      "d": 2
+                    },
+                    {
+                      "d": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne when no documents match multiple arrayFilters",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 3
+          },
+          "update": {
+            "$set": {
+              "y.$[i].c.$[j].d": 0
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 5
+            },
+            {
+              "j.d": 3
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 0,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 3,
+              "y": [
+                {
+                  "b": 5,
+                  "c": [
+                    {
+                      "d": 2
+                    },
+                    {
+                      "d": 1
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne when one document matches multiple arrayFilters",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 3
+          },
+          "update": {
+            "$set": {
+              "y.$[i].c.$[j].d": 0
+            }
+          },
+          "arrayFilters": [
+            {
+              "i.b": 5
+            },
+            {
+              "j.d": 1
+            }
+          ]
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 3
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 1
+                }
+              ]
+            },
+            {
+              "_id": 3,
+              "y": [
+                {
+                  "b": 5,
+                  "c": [
+                    {
+                      "d": 2
+                    },
+                    {
+                      "d": 0
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/updateOne-collation.json b/driver-core/src/test/resources/crud/v1/write/updateOne-collation.json
new file mode 100644
index 00000000000..c49112d519c
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/updateOne-collation.json
@@ -0,0 +1,54 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": "ping"
+    }
+  ],
+  "minServerVersion": "3.4",
+  "tests": [
+    {
+      "description": "UpdateOne when one document matches with collation",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "x": "PING"
+          },
+          "update": {
+            "$set": {
+              "x": "pong"
+            }
+          },
+          "collation": {
+            "locale": "en_US",
+            "strength": 2
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": "pong"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v1/write/updateOne.json b/driver-core/src/test/resources/crud/v1/write/updateOne.json
new file mode 100644
index 00000000000..76d2086bdb9
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v1/write/updateOne.json
@@ -0,0 +1,167 @@
+{
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "minServerVersion": "2.6",
+  "tests": [
+    {
+      "description": "UpdateOne when many documents match",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": {
+              "$gt": 1
+            }
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        }
+      }
+    },
+    {
+      "description": "UpdateOne when one document matches",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne when no documents match",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne with upsert when no documents match",
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 4
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 1,
+          "upsertedId": 4
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v2/aggregate-merge.json b/driver-core/src/test/resources/crud/v2/aggregate-merge.json
new file mode 100644
index 00000000000..c61736a0bbf
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v2/aggregate-merge.json
@@ -0,0 +1,415 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.11"
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "collection_name": "test_aggregate_merge",
+  "tests": [
+    {
+      "description": "Aggregate with $merge",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$merge": {
+                  "into": "other_test_collection"
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_merge",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$merge": {
+                    "into": "other_test_collection"
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Aggregate with $merge and batch size of 0",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$merge": {
+                  "into": "other_test_collection"
+                }
+              }
+            ],
+            "batchSize": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_merge",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$merge": {
+                    "into": "other_test_collection"
+                  }
+                }
+              ],
+              "cursor": {}
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Aggregate with $merge and majority readConcern",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$merge": {
+                  "into": "other_test_collection"
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_merge",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$merge": {
+                    "into": "other_test_collection"
+                  }
+                }
+              ],
+              "readConcern": {
+                "level": "majority"
+              }
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Aggregate with $merge and local readConcern",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "local"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$merge": {
+                  "into": "other_test_collection"
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_merge",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$merge": {
+                    "into": "other_test_collection"
+                  }
+                }
+              ],
+              "readConcern": {
+                "level": "local"
+              }
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Aggregate with $merge and available readConcern",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "available"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$merge": {
+                  "into": "other_test_collection"
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_merge",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$merge": {
+                    "into": "other_test_collection"
+                  }
+                }
+              ],
+              "readConcern": {
+                "level": "available"
+              }
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v2/aggregate-out-readConcern.json b/driver-core/src/test/resources/crud/v2/aggregate-out-readConcern.json
new file mode 100644
index 00000000000..1cc8d69ac30
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v2/aggregate-out-readConcern.json
@@ -0,0 +1,356 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.0",
+      "topology": [
+        "replicaset",
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "collection_name": "test_aggregate_out_readconcern",
+  "tests": [
+    {
+      "description": "readConcern majority with out stage",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$out": "other_test_collection"
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_out_readconcern",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$out": "other_test_collection"
+                }
+              ],
+              "readConcern": {
+                "level": "majority"
+              }
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "readConcern local with out stage",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "local"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$out": "other_test_collection"
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_out_readconcern",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$out": "other_test_collection"
+                }
+              ],
+              "readConcern": {
+                "level": "local"
+              }
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "readConcern available with out stage",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "available"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$out": "other_test_collection"
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_out_readconcern",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$out": "other_test_collection"
+                }
+              ],
+              "readConcern": {
+                "level": "available"
+              }
+            }
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "name": "other_test_collection",
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "readConcern linearizable with out stage",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "linearizable"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$out": "other_test_collection"
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test_aggregate_out_readconcern",
+              "pipeline": [
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$out": "other_test_collection"
+                }
+              ],
+              "readConcern": {
+                "level": "linearizable"
+              }
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "invalid readConcern with out stage",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "!invalid123"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$out": "other_test_collection"
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v2/bulkWrite-arrayFilters.json b/driver-core/src/test/resources/crud/v2/bulkWrite-arrayFilters.json
new file mode 100644
index 00000000000..be26a337a5a
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v2/bulkWrite-arrayFilters.json
@@ -0,0 +1,160 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.5.6"
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "y": [
+        {
+          "b": 3
+        },
+        {
+          "b": 1
+        }
+      ]
+    },
+    {
+      "_id": 2,
+      "y": [
+        {
+          "b": 0
+        },
+        {
+          "b": 1
+        }
+      ]
+    }
+  ],
+  "collection_name": "test",
+  "database_name": "crud-tests",
+  "tests": [
+    {
+      "description": "BulkWrite with arrayFilters",
+      "operations": [
+        {
+          "name": "bulkWrite",
+          "arguments": {
+            "requests": [
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {},
+                  "update": {
+                    "$set": {
+                      "y.$[i].b": 2
+                    }
+                  },
+                  "arrayFilters": [
+                    {
+                      "i.b": 3
+                    }
+                  ]
+                }
+              },
+              {
+                "name": "updateMany",
+                "arguments": {
+                  "filter": {},
+                  "update": {
+                    "$set": {
+                      "y.$[i].b": 2
+                    }
+                  },
+                  "arrayFilters": [
+                    {
+                      "i.b": 1
+                    }
+                  ]
+                }
+              }
+            ],
+            "options": {
+              "ordered": true
+            }
+          },
+          "result": {
+            "deletedCount": 0,
+            "insertedCount": 0,
+            "insertedIds": {},
+            "matchedCount": 3,
+            "modifiedCount": 3,
+            "upsertedCount": 0,
+            "upsertedIds": {}
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {},
+                  "u": {
+                    "$set": {
+                      "y.$[i].b": 2
+                    }
+                  },
+                  "arrayFilters": [
+                    {
+                      "i.b": 3
+                    }
+                  ]
+                },
+                {
+                  "q": {},
+                  "u": {
+                    "$set": {
+                      "y.$[i].b": 2
+                    }
+                  },
+                  "multi": true,
+                  "arrayFilters": [
+                    {
+                      "i.b": 1
+                    }
+                  ]
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "update",
+            "database_name": "crud-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": [
+                {
+                  "b": 2
+                },
+                {
+                  "b": 2
+                }
+              ]
+            },
+            {
+              "_id": 2,
+              "y": [
+                {
+                  "b": 0
+                },
+                {
+                  "b": 2
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v2/db-aggregate.json b/driver-core/src/test/resources/crud/v2/db-aggregate.json
new file mode 100644
index 00000000000..d88b9e18197
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v2/db-aggregate.json
@@ -0,0 +1,81 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6.0"
+    }
+  ],
+  "database_name": "admin",
+  "tests": [
+    {
+      "description": "Aggregate with $listLocalSessions",
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "database",
+          "arguments": {
+            "pipeline": [
+              {
+                "$listLocalSessions": {}
+              },
+              {
+                "$limit": 1
+              },
+              {
+                "$addFields": {
+                  "dummy": "dummy field"
+                }
+              },
+              {
+                "$project": {
+                  "_id": 0,
+                  "dummy": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "dummy": "dummy field"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "Aggregate with $listLocalSessions and allowDiskUse",
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "database",
+          "arguments": {
+            "pipeline": [
+              {
+                "$listLocalSessions": {}
+              },
+              {
+                "$limit": 1
+              },
+              {
+                "$addFields": {
+                  "dummy": "dummy field"
+                }
+              },
+              {
+                "$project": {
+                  "_id": 0,
+                  "dummy": 1
+                }
+              }
+            ],
+            "allowDiskUse": true
+          },
+          "result": [
+            {
+              "dummy": "dummy field"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/v2/updateWithPipelines.json b/driver-core/src/test/resources/crud/v2/updateWithPipelines.json
new file mode 100644
index 00000000000..a310f2825f2
--- /dev/null
+++ b/driver-core/src/test/resources/crud/v2/updateWithPipelines.json
@@ -0,0 +1,408 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.11"
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 1,
+      "y": 1,
+      "t": {
+        "u": {
+          "v": 1
+        }
+      }
+    },
+    {
+      "_id": 2,
+      "x": 2,
+      "y": 1
+    }
+  ],
+  "collection_name": "test",
+  "database_name": "crud-tests",
+  "tests": [
+    {
+      "description": "UpdateOne using pipelines",
+      "operations": [
+        {
+          "name": "updateOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": [
+              {
+                "$replaceRoot": {
+                  "newRoot": "$t"
+                }
+              },
+              {
+                "$addFields": {
+                  "foo": 1
+                }
+              }
+            ]
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "u": [
+                    {
+                      "$replaceRoot": {
+                        "newRoot": "$t"
+                      }
+                    },
+                    {
+                      "$addFields": {
+                        "foo": 1
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            "command_name": "update",
+            "database_name": "crud-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "u": {
+                "v": 1
+              },
+              "foo": 1
+            },
+            {
+              "_id": 2,
+              "x": 2,
+              "y": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateMany using pipelines",
+      "operations": [
+        {
+          "name": "updateMany",
+          "arguments": {
+            "filter": {},
+            "update": [
+              {
+                "$project": {
+                  "x": 1
+                }
+              },
+              {
+                "$addFields": {
+                  "foo": 1
+                }
+              }
+            ]
+          },
+          "result": {
+            "matchedCount": 2,
+            "modifiedCount": 2,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {},
+                  "u": [
+                    {
+                      "$project": {
+                        "x": 1
+                      }
+                    },
+                    {
+                      "$addFields": {
+                        "foo": 1
+                      }
+                    }
+                  ],
+                  "multi": true
+                }
+              ]
+            },
+            "command_name": "update",
+            "database_name": "crud-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 1,
+              "foo": 1
+            },
+            {
+              "_id": 2,
+              "x": 2,
+              "foo": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate using pipelines",
+      "operations": [
+        {
+          "name": "findOneAndUpdate",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": [
+              {
+                "$project": {
+                  "x": 1
+                }
+              },
+              {
+                "$addFields": {
+                  "foo": 1
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "update": [
+                {
+                  "$project": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$addFields": {
+                    "foo": 1
+                  }
+                }
+              ]
+            },
+            "command_name": "findAndModify",
+            "database_name": "crud-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 1,
+              "foo": 1
+            },
+            {
+              "_id": 2,
+              "x": 2,
+              "y": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne in bulk write using pipelines",
+      "operations": [
+        {
+          "name": "bulkWrite",
+          "arguments": {
+            "requests": [
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  },
+                  "update": [
+                    {
+                      "$replaceRoot": {
+                        "newRoot": "$t"
+                      }
+                    },
+                    {
+                      "$addFields": {
+                        "foo": 1
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "u": [
+                    {
+                      "$replaceRoot": {
+                        "newRoot": "$t"
+                      }
+                    },
+                    {
+                      "$addFields": {
+                        "foo": 1
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            "command_name": "update",
+            "database_name": "crud-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "u": {
+                "v": 1
+              },
+              "foo": 1
+            },
+            {
+              "_id": 2,
+              "x": 2,
+              "y": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateMany in bulk write using pipelines",
+      "operations": [
+        {
+          "name": "bulkWrite",
+          "arguments": {
+            "requests": [
+              {
+                "name": "updateMany",
+                "arguments": {
+                  "filter": {},
+                  "update": [
+                    {
+                      "$project": {
+                        "x": 1
+                      }
+                    },
+                    {
+                      "$addFields": {
+                        "foo": 1
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          },
+          "result": {
+            "matchedCount": 2,
+            "modifiedCount": 2,
+            "upsertedCount": 0
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {},
+                  "u": [
+                    {
+                      "$project": {
+                        "x": 1
+                      }
+                    },
+                    {
+                      "$addFields": {
+                        "foo": 1
+                      }
+                    }
+                  ],
+                  "multi": true
+                }
+              ]
+            },
+            "command_name": "update",
+            "database_name": "crud-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 1,
+              "foo": 1
+            },
+            {
+              "_id": 2,
+              "x": 2,
+              "foo": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/crud/write/deleteMany.json b/driver-core/src/test/resources/crud/write/deleteMany.json
deleted file mode 100755
index 885ebd200a5..00000000000
--- a/driver-core/src/test/resources/crud/write/deleteMany.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "DeleteMany when many documents match",
-      "operation": {
-        "name": "deleteMany",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "deletedCount": 2
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "DeleteMany when no document matches",
-      "operation": {
-        "name": "deleteMany",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "deletedCount": 0
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/deleteOne.json b/driver-core/src/test/resources/crud/write/deleteOne.json
deleted file mode 100755
index 50226bdd5ee..00000000000
--- a/driver-core/src/test/resources/crud/write/deleteOne.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "DeleteOne when many documents match",
-      "operation": {
-        "name": "deleteOne",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "deletedCount": 1
-        }
-      }
-    },
-    {
-      "description": "DeleteOne when one document matches",
-      "operation": {
-        "name": "deleteOne",
-        "arguments": {
-          "filter": {
-            "_id": 2
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "deletedCount": 1
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "DeleteOne when no documents match",
-      "operation": {
-        "name": "deleteOne",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "deletedCount": 0
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/findOneAndDelete.json b/driver-core/src/test/resources/crud/write/findOneAndDelete.json
deleted file mode 100755
index 2bfcc32c69f..00000000000
--- a/driver-core/src/test/resources/crud/write/findOneAndDelete.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "FindOneAndDelete when many documents match",
-      "operation": {
-        "name": "findOneAndDelete",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 22
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndDelete when one document matches",
-      "operation": {
-        "name": "findOneAndDelete",
-        "arguments": {
-          "filter": {
-            "_id": 2
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 22
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndDelete when no documents match",
-      "operation": {
-        "name": "findOneAndDelete",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": null,
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/findOneAndReplace.json b/driver-core/src/test/resources/crud/write/findOneAndReplace.json
deleted file mode 100755
index c24100614f1..00000000000
--- a/driver-core/src/test/resources/crud/write/findOneAndReplace.json
+++ /dev/null
@@ -1,366 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "FindOneAndReplace when many documents match returning the document before modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "replacement": {
-            "x": 32
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 22
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 32
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndReplace when many documents match returning the document after modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "replacement": {
-            "x": 32
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 32
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 32
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndReplace when one document matches returning the document before modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": 2
-          },
-          "replacement": {
-            "x": 32
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 22
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 32
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndReplace when one document matches returning the document after modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": 2
-          },
-          "replacement": {
-            "x": 32
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 32
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 32
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndReplace when no documents match returning the document before modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "replacement": {
-            "x": 44
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": null,
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndReplace when no documents match with upsert returning the document before modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "replacement": {
-            "x": 44
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": null,
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 44
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndReplace when no documents match returning the document after modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "replacement": {
-            "x": 44
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": null,
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndReplace when no documents match with upsert returning the document after modification",
-      "operation": {
-        "name": "findOneAndReplace",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "replacement": {
-            "x": 44
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 44
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 44
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/findOneAndUpdate.json b/driver-core/src/test/resources/crud/write/findOneAndUpdate.json
deleted file mode 100755
index df973110deb..00000000000
--- a/driver-core/src/test/resources/crud/write/findOneAndUpdate.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "FindOneAndUpdate when many documents match returning the document before modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 22
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 23
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndUpdate when many documents match returning the document after modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 23
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 23
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndUpdate when one document matches returning the document before modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": 2
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 22
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 23
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndUpdate when one document matches returning the document after modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": 2
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 23
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 23
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndUpdate when no documents match returning the document before modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": null,
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndUpdate when no documents match with upsert returning the document before modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "sort": {
-            "x": 1
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": null,
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 1
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndUpdate when no documents match returning the document after modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": null,
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "FindOneAndUpdate when no documents match with upsert returning the document after modification",
-      "operation": {
-        "name": "findOneAndUpdate",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "projection": {
-            "x": 1,
-            "_id": 0
-          },
-          "returnDocument": "After",
-          "sort": {
-            "x": 1
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": {
-          "x": 1
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 1
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/insertMany.json b/driver-core/src/test/resources/crud/write/insertMany.json
deleted file mode 100755
index f604ef75fcf..00000000000
--- a/driver-core/src/test/resources/crud/write/insertMany.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    }
-  ],
-  "tests": [
-    {
-      "description": "InsertMany with non-existing documents",
-      "operation": {
-        "name": "insertMany",
-        "arguments": {
-          "documents": [
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      },
-      "outcome": {
-        "result": {
-          "insertedIds": [
-            2,
-            3
-          ]
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/insertOne.json b/driver-core/src/test/resources/crud/write/insertOne.json
deleted file mode 100755
index 83597fca8c0..00000000000
--- a/driver-core/src/test/resources/crud/write/insertOne.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    }
-  ],
-  "tests": [
-    {
-      "description": "InsertOne with a non-existing document",
-      "operation": {
-        "name": "insertOne",
-        "arguments": {
-          "document": {
-            "_id": 2,
-            "x": 22
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "insertedId": 2
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/replaceOne.json b/driver-core/src/test/resources/crud/write/replaceOne.json
deleted file mode 100755
index d079c8800d9..00000000000
--- a/driver-core/src/test/resources/crud/write/replaceOne.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "ReplaceOne when many documents match",
-      "operation": {
-        "name": "replaceOne",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "replacement": {
-            "x": 111
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 1,
-          "modifiedCount": 1
-        }
-      }
-    },
-    {
-      "description": "ReplaceOne when one document matches",
-      "operation": {
-        "name": "replaceOne",
-        "arguments": {
-          "filter": {
-            "_id": 1
-          },
-          "replacement": {
-            "_id": 1,
-            "x": 111
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 1,
-          "modifiedCount": 1
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 111
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "ReplaceOne when no documents match",
-      "operation": {
-        "name": "replaceOne",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "replacement": {
-            "_id": 4,
-            "x": 1
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 0,
-          "modifiedCount": 0
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "ReplaceOne with upsert when no documents match without an id specified",
-      "operation": {
-        "name": "replaceOne",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "replacement": {
-            "x": 1
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 0,
-          "modifiedCount": 0,
-          "upsertedId": 4
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 1
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "ReplaceOne with upsert when no documents match with an id specified",
-      "operation": {
-        "name": "replaceOne",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "replacement": {
-            "_id": 4,
-            "x": 1
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 0,
-          "modifiedCount": 0,
-          "upsertedId": 4
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 1
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/updateMany.json b/driver-core/src/test/resources/crud/write/updateMany.json
deleted file mode 100755
index b601c6d1f13..00000000000
--- a/driver-core/src/test/resources/crud/write/updateMany.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "UpdateMany when many documents match",
-      "operation": {
-        "name": "updateMany",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 2,
-          "modifiedCount": 2
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 23
-            },
-            {
-              "_id": 3,
-              "x": 34
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "UpdateMany when one document matches",
-      "operation": {
-        "name": "updateMany",
-        "arguments": {
-          "filter": {
-            "_id": 1
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 1,
-          "modifiedCount": 1
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 12
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "UpdateMany when no documents match",
-      "operation": {
-        "name": "updateMany",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 0,
-          "modifiedCount": 0
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "UpdateMany with upsert when no documents match",
-      "operation": {
-        "name": "updateMany",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 0,
-          "modifiedCount": 0,
-          "upsertedId": 4
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 1
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/crud/write/updateOne.json b/driver-core/src/test/resources/crud/write/updateOne.json
deleted file mode 100755
index cf4b13d8d98..00000000000
--- a/driver-core/src/test/resources/crud/write/updateOne.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-  "data": [
-    {
-      "_id": 1,
-      "x": 11
-    },
-    {
-      "_id": 2,
-      "x": 22
-    },
-    {
-      "_id": 3,
-      "x": 33
-    }
-  ],
-  "tests": [
-    {
-      "description": "UpdateOne when many documents match",
-      "operation": {
-        "name": "updateOne",
-        "arguments": {
-          "filter": {
-            "_id": {
-              "$gt": 1
-            }
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 1,
-          "modifiedCount": 1
-        }
-      }
-    },
-    {
-      "description": "UpdateOne when one document matches",
-      "operation": {
-        "name": "updateOne",
-        "arguments": {
-          "filter": {
-            "_id": 1
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 1,
-          "modifiedCount": 1
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 12
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "UpdateOne when no documents match",
-      "operation": {
-        "name": "updateOne",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          }
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 0,
-          "modifiedCount": 0
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            }
-          ]
-        }
-      }
-    },
-    {
-      "description": "UpdateOne with upsert when no documents match",
-      "operation": {
-        "name": "updateOne",
-        "arguments": {
-          "filter": {
-            "_id": 4
-          },
-          "update": {
-            "$inc": {
-              "x": 1
-            }
-          },
-          "upsert": true
-        }
-      },
-      "outcome": {
-        "result": {
-          "matchedCount": 0,
-          "modifiedCount": 0,
-          "upsertedId": 4
-        },
-        "collection": {
-          "data": [
-            {
-              "_id": 1,
-              "x": 11
-            },
-            {
-              "_id": 2,
-              "x": 22
-            },
-            {
-              "_id": 3,
-              "x": 33
-            },
-            {
-              "_id": 4,
-              "x": 1
-            }
-          ]
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/gridfs-tests/delete.json b/driver-core/src/test/resources/gridfs-tests/delete.json
index cb92bc3d5f3..d74e49284bd 100644
--- a/driver-core/src/test/resources/gridfs-tests/delete.json
+++ b/driver-core/src/test/resources/gridfs-tests/delete.json
@@ -13,11 +13,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -31,11 +28,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0-with-empty-chunk",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -49,11 +43,8 @@
         "md5": "c700ed4fdb1d27055aa3faa2c2432283",
         "filename": "length-2",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -67,29 +58,8 @@
         "md5": "dd254cdc958e53abaa67da9f797125f5",
         "filename": "length-8",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
-      },
-      {
-        "_id": {
-          "$oid": "000000000000000000000005"
-        },
-        "length": 8,
-        "chunkSize": 4,
-        "uploadDate": {
-          "$date": "1970-01-01T00:00:00.000Z"
-        },
-        "md5": "dd254cdc958e53abaa67da9f797125f5",
-        "filename": "length-8-with-empty-chunk",
-        "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       }
     ],
     "chunks": [
@@ -140,42 +110,6 @@
         "data": {
           "$hex": "55667788"
         }
-      },
-      {
-        "_id": {
-          "$oid": "000000000000000000000005"
-        },
-        "files_id": {
-          "$oid": "000000000000000000000005"
-        },
-        "n": 0,
-        "data": {
-          "$hex": "11223344"
-        }
-      },
-      {
-        "_id": {
-          "$oid": "000000000000000000000006"
-        },
-        "files_id": {
-          "$oid": "000000000000000000000005"
-        },
-        "n": 1,
-        "data": {
-          "$hex": "55667788"
-        }
-      },
-      {
-        "_id": {
-          "$oid": "000000000000000000000007"
-        },
-        "files_id": {
-          "$oid": "000000000000000000000005"
-        },
-        "n": 2,
-        "data": {
-          "$hex": ""
-        }
       }
     ]
   },
@@ -293,48 +227,6 @@
         ]
       }
     },
-    {
-      "description": "Delete when length is 8 and there is one extra empty chunk",
-      "act": {
-        "operation": "delete",
-        "arguments": {
-          "id": {
-            "$oid": "000000000000000000000005"
-          }
-        }
-      },
-      "assert": {
-        "result": "void",
-        "data": [
-          {
-            "delete": "expected.files",
-            "deletes": [
-              {
-                "q": {
-                  "_id": {
-                    "$oid": "000000000000000000000005"
-                  }
-                },
-                "limit": 1
-              }
-            ]
-          },
-          {
-            "delete": "expected.chunks",
-            "deletes": [
-              {
-                "q": {
-                  "files_id": {
-                    "$oid": "000000000000000000000005"
-                  }
-                },
-                "limit": 0
-              }
-            ]
-          }
-        ]
-      }
-    },
     {
       "description": "Delete when files entry does not exist",
       "act": {
@@ -359,7 +251,7 @@
               {
                 "q": {
                   "_id": {
-                    "$oid": "000000000000000000000005"
+                    "$oid": "000000000000000000000004"
                   }
                 },
                 "limit": 1
@@ -372,7 +264,7 @@
         "operation": "delete",
         "arguments": {
           "id": {
-            "$oid": "000000000000000000000005"
+            "$oid": "000000000000000000000004"
           }
         }
       },
@@ -385,28 +277,15 @@
               {
                 "q": {
                   "_id": {
-                    "$oid": "000000000000000000000005"
+                    "$oid": "000000000000000000000004"
                   }
                 },
                 "limit": 1
               }
             ]
-          },
-          {
-            "delete": "expected.chunks",
-            "deletes": [
-              {
-                "q": {
-                  "files_id": {
-                    "$oid": "000000000000000000000005"
-                  }
-                },
-                "limit": 0
-              }
-            ]
           }
         ]
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/resources/gridfs-tests/download.json b/driver-core/src/test/resources/gridfs-tests/download.json
index 74b6afb9811..5092fba981a 100644
--- a/driver-core/src/test/resources/gridfs-tests/download.json
+++ b/driver-core/src/test/resources/gridfs-tests/download.json
@@ -13,11 +13,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -31,11 +28,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0-with-empty-chunk",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -49,11 +43,8 @@
         "md5": "c700ed4fdb1d27055aa3faa2c2432283",
         "filename": "length-2",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -67,11 +58,8 @@
         "md5": "dd254cdc958e53abaa67da9f797125f5",
         "filename": "length-8",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -85,29 +73,22 @@
         "md5": "57d83cd477bfb1ccd975ab33d827a92b",
         "filename": "length-10",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
           "$oid": "000000000000000000000006"
         },
-        "length": 12,
+        "length": 2,
         "chunkSize": 4,
         "uploadDate": {
           "$date": "1970-01-01T00:00:00.000Z"
         },
-        "md5": "6289ac1db331d1c7677a4b7e123178f9",
-        "filename": "length-12-with-empty-chunk",
+        "md5": "c700ed4fdb1d27055aa3faa2c2432283",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       }
     ],
     "chunks": [
@@ -204,43 +185,7 @@
         },
         "n": 0,
         "data": {
-          "$hex": "11223344"
-        }
-      },
-      {
-        "_id": {
-          "$oid": "000000000000000000000009"
-        },
-        "files_id": {
-          "$oid": "000000000000000000000006"
-        },
-        "n": 1,
-        "data": {
-          "$hex": "55667788"
-        }
-      },
-      {
-        "_id": {
-          "$oid": "000000000000000000000010"
-        },
-        "files_id": {
-          "$oid": "000000000000000000000006"
-        },
-        "n": 2,
-        "data": {
-          "$hex": "99aabbcc"
-        }
-      },
-      {
-        "_id": {
-          "$oid": "000000000000000000000011"
-        },
-        "files_id": {
-          "$oid": "000000000000000000000006"
-        },
-        "n": 3,
-        "data": {
-          "$hex": ""
+          "$hex": "1122"
         }
       }
     ]
@@ -254,8 +199,7 @@
           "id": {
             "$oid": "000000000000000000000001"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -272,8 +216,7 @@
           "id": {
             "$oid": "000000000000000000000002"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -290,8 +233,7 @@
           "id": {
             "$oid": "000000000000000000000003"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -308,8 +250,7 @@
           "id": {
             "$oid": "000000000000000000000004"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -326,8 +267,7 @@
           "id": {
             "$oid": "000000000000000000000005"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -336,24 +276,6 @@
         }
       }
     },
-    {
-      "description": "Download when there are three chunks and one extra empty chunk at the end",
-      "act": {
-        "operation": "download",
-        "arguments": {
-          "id": {
-            "$oid": "000000000000000000000006"
-          },
-          "options": {
-          }
-        }
-      },
-      "assert": {
-        "result": {
-          "$hex": "112233445566778899aabbcc"
-        }
-      }
-    },
     {
       "description": "Download when files entry does not exist",
       "act": {
@@ -362,8 +284,7 @@
           "id": {
             "$oid": "000000000000000000000000"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -524,6 +445,23 @@
       "assert": {
         "error": "ChunkIsWrongSize"
       }
+    },
+    {
+      "description": "Download legacy file with no name",
+      "act": {
+        "operation": "download",
+        "arguments": {
+          "id": {
+            "$oid": "000000000000000000000006"
+          },
+          "options": {}
+        }
+      },
+      "assert": {
+        "result": {
+          "$hex": "1122"
+        }
+      }
     }
   ]
 }
diff --git a/driver-core/src/test/resources/gridfs-tests/download_by_name.json b/driver-core/src/test/resources/gridfs-tests/download_by_name.json
index 7f4d46bb3d4..ecc8c9e2cca 100644
--- a/driver-core/src/test/resources/gridfs-tests/download_by_name.json
+++ b/driver-core/src/test/resources/gridfs-tests/download_by_name.json
@@ -13,11 +13,8 @@
         "md5": "47ed733b8d10be225eceba344d533586",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -31,11 +28,8 @@
         "md5": "b15835f133ff2e27c7cb28117bfae8f4",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -49,11 +43,8 @@
         "md5": "eccbc87e4b5ce2fe28308fd9f2a7baf3",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -67,11 +58,8 @@
         "md5": "f623e75af30e62bbd73d6df5b50bb7b5",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -85,11 +73,8 @@
         "md5": "4c614360da93c0a041b22e537de151eb",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       }
     ],
     "chunks": [
@@ -252,4 +237,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/resources/gridfs-tests/upload.json b/driver-core/src/test/resources/gridfs-tests/upload.json
index 95dfd79e3da..ecec0c54884 100644
--- a/driver-core/src/test/resources/gridfs-tests/upload.json
+++ b/driver-core/src/test/resources/gridfs-tests/upload.json
@@ -1,11 +1,7 @@
 {
   "data": {
-    "files": [
-
-    ],
-    "chunks": [
-
-    ]
+    "files": [],
+    "chunks": []
   },
   "tests": [
     {
@@ -386,6 +382,85 @@
           }
         ]
       }
+    },
+    {
+      "description": "Upload when length is 0 sans MD5",
+      "act": {
+        "operation": "upload",
+        "arguments": {
+          "filename": "filename",
+          "source": {
+            "$hex": ""
+          },
+          "options": {
+            "chunkSizeBytes": 4,
+            "disableMD5": true
+          }
+        }
+      },
+      "assert": {
+        "result": "&result",
+        "data": [
+          {
+            "insert": "expected.files",
+            "documents": [
+              {
+                "_id": "*result",
+                "length": 0,
+                "chunkSize": 4,
+                "uploadDate": "*actual",
+                "filename": "filename"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "description": "Upload when length is 1 sans MD5",
+      "act": {
+        "operation": "upload",
+        "arguments": {
+          "filename": "filename",
+          "source": {
+            "$hex": "11"
+          },
+          "options": {
+            "chunkSizeBytes": 4,
+            "disableMD5": true
+          }
+        }
+      },
+      "assert": {
+        "result": "&result",
+        "data": [
+          {
+            "insert": "expected.files",
+            "documents": [
+              {
+                "_id": "*result",
+                "length": 1,
+                "chunkSize": 4,
+                "uploadDate": "*actual",
+                "filename": "filename"
+              }
+            ]
+          },
+          {
+            "insert": "expected.chunks",
+            "documents": [
+              {
+                "_id": "*actual",
+                "files_id": "*result",
+                "n": 0,
+                "data": {
+                  "$hex": "11"
+                }
+              }
+            ]
+          }
+        ]
+      }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/README.rst b/driver-core/src/test/resources/initial-dns-seedlist-discovery/README.rst
new file mode 100644
index 00000000000..5b093e19dff
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/README.rst
@@ -0,0 +1,87 @@
+====================================
+Initial DNS Seedlist Discovery tests
+====================================
+
+This directory contains platform-independent tests that drivers can use
+to prove their conformance to the Initial DNS Seedlist Discovery spec.
+
+Test Setup
+----------
+
+Start a three-node replica set on localhost, on ports 27017, 27018, and 27019,
+with replica set name "repl0". The replica set MUST be started with SSL
+enabled.
+
+To run the tests that accompany this spec, you need to configure the SRV and
+TXT records with a real name server. The following records are required for
+these tests::
+
+  Record                                    TTL    Class   Address
+  localhost.test.build.10gen.cc.            86400  IN A    127.0.0.1
+  localhost.sub.test.build.10gen.cc.        86400  IN A    127.0.0.1
+
+  Record                                    TTL    Class   Port   Target
+  _mongodb._tcp.test1.test.build.10gen.cc.  86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test1.test.build.10gen.cc.  86400  IN SRV  27018  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test2.test.build.10gen.cc.  86400  IN SRV  27018  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test2.test.build.10gen.cc.  86400  IN SRV  27019  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test3.test.build.10gen.cc.  86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test5.test.build.10gen.cc.  86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test6.test.build.10gen.cc.  86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test7.test.build.10gen.cc.  86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test8.test.build.10gen.cc.  86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test10.test.build.10gen.cc. 86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test11.test.build.10gen.cc. 86400  IN SRV  27017  localhost.test.build.10gen.cc.
+  _mongodb._tcp.test12.test.build.10gen.cc. 86400  IN SRV  27017  localhost.build.10gen.cc.
+  _mongodb._tcp.test13.test.build.10gen.cc. 86400  IN SRV  27017  test.build.10gen.cc.
+  _mongodb._tcp.test14.test.build.10gen.cc. 86400  IN SRV  27017  localhost.not-test.build.10gen.cc.
+  _mongodb._tcp.test15.test.build.10gen.cc. 86400  IN SRV  27017  localhost.test.not-build.10gen.cc.
+  _mongodb._tcp.test16.test.build.10gen.cc. 86400  IN SRV  27017  localhost.test.build.not-10gen.cc.
+  _mongodb._tcp.test17.test.build.10gen.cc. 86400  IN SRV  27017  localhost.test.build.10gen.not-cc.
+  _mongodb._tcp.test18.test.build.10gen.cc. 86400  IN SRV  27017  localhost.sub.test.build.10gen.cc.
+  _mongodb._tcp.test19.test.build.10gen.cc. 86400  IN SRV  27017  localhost.evil.build.10gen.cc.
+  _mongodb._tcp.test19.test.build.10gen.cc. 86400  IN SRV  27017  localhost.test.build.10gen.cc.
+
+  Record                                    TTL    Class   Text
+  test5.test.build.10gen.cc.                86400  IN TXT  "replicaSet=repl0&authSource=thisDB"
+  test6.test.build.10gen.cc.                86400  IN TXT  "replicaSet=repl0"
+  test6.test.build.10gen.cc.                86400  IN TXT  "authSource=otherDB"
+  test7.test.build.10gen.cc.                86400  IN TXT  "ssl=false"
+  test8.test.build.10gen.cc.                86400  IN TXT  "authSource"
+  test10.test.build.10gen.cc.               86400  IN TXT  "socketTimeoutMS=500"
+  test11.test.build.10gen.cc.               86400  IN TXT  "replicaS" "et=rep" "l0"
+
+Note that ``test4`` is omitted deliberately to test what happens with no SRV
+record. ``test9`` is missing because it was deleted during the development of
+the tests. The missing ``test.`` sub-domain in the SRV record target for
+``test12`` is deliberate.
+
+In our tests we have used ``localhost.test.build.10gen.cc`` as the domain, and
+then configured ``localhost.test.build.10gen.cc`` to resolve to 127.0.0.1.
+
+You need to adapt the records shown above to replace ``test.build.10gen.cc``
+with your own domain name, and update the "uri" field in the YAML or JSON files
+in this directory with the actual domain.
+
+Test Format and Use
+-------------------
+
+These YAML and JSON files contain the following fields:
+
+- ``uri``: a mongodb+srv connection string
+- ``seeds``: the expected set of initial seeds discovered from the SRV record
+- ``hosts``: the discovered topology's list of hosts once SDAM completes a scan
+- ``options``: the parsed connection string options as discovered from URI and
+  TXT records
+- ``error``: indicates that the parsing of the URI, or the resolving or
+  contents of the SRV or TXT records included errors.
+- ``comment``: a comment to indicate why a test would fail.
+
+For each file, create MongoClient initialized with the mongodb+srv connection
+string. You SHOULD verify that the client's initial seed list matches the list of
+seeds. You MUST verify that the set of ServerDescriptions in the client's
+TopologyDescription eventually matches the list of hosts. You MUST verify that
+each of the values of the Connection String Options under ``options`` match the
+Client's parsed value for that option. There may be other options parsed by
+the Client as well, which a test does not verify. You MUST verify that an
+error has been thrown if ``error`` is present.
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/longer-parent-in-return.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/longer-parent-in-return.json
new file mode 100644
index 00000000000..9a8267eaeb1
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/longer-parent-in-return.json
@@ -0,0 +1,16 @@
+{
+  "uri": "mongodb+srv://test18.test.build.10gen.cc/?replicaSet=repl0",
+  "seeds": [
+    "localhost.sub.test.build.10gen.cc:27017"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  },
+  "comment": "Is correct, as returned host name shared the URI root \"test.build.10gen.cc\"."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/misformatted-option.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/misformatted-option.json
new file mode 100644
index 00000000000..3c8c29ace68
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/misformatted-option.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test8.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because the options in the TXT record are incorrectly formatted (misses value)."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/no-results.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/no-results.json
new file mode 100644
index 00000000000..c1dc02d281d
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/no-results.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test4.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because no SRV records are present for this URI."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/not-enough-parts.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/not-enough-parts.json
new file mode 100644
index 00000000000..7cfce2ec57e
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/not-enough-parts.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because host in URI does not have {hostname}, {domainname} and {tld}."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-result-default-port.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-result-default-port.json
new file mode 100644
index 00000000000..cebb3b1ec32
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-result-default-port.json
@@ -0,0 +1,15 @@
+{
+  "uri": "mongodb+srv://test3.test.build.10gen.cc/?replicaSet=repl0",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  }
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-txt-record-multiple-strings.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-txt-record-multiple-strings.json
new file mode 100644
index 00000000000..622668c351f
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-txt-record-multiple-strings.json
@@ -0,0 +1,15 @@
+{
+  "uri": "mongodb+srv://test11.test.build.10gen.cc/",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  }
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-txt-record.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-txt-record.json
new file mode 100644
index 00000000000..2385021ad4b
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/one-txt-record.json
@@ -0,0 +1,16 @@
+{
+  "uri": "mongodb+srv://test5.test.build.10gen.cc/",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "authSource": "thisDB",
+    "ssl": true
+  }
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch1.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch1.json
new file mode 100644
index 00000000000..8d0147a48b8
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch1.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test14.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because returned host name's part \"not-test\" mismatches URI parent part \"test\"."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch2.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch2.json
new file mode 100644
index 00000000000..996249eb99d
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch2.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test15.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because returned host name's part \"not-build\" mismatches URI parent part \"build\"."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch3.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch3.json
new file mode 100644
index 00000000000..69e724af6c7
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch3.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test16.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because returned host name's part \"not-10gen\" mismatches URI parent part \"10gen\"."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch4.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch4.json
new file mode 100644
index 00000000000..254168e34ca
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch4.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test17.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because returned host name's TLD \"not-cc\" mismatches URI TLD \"cc\"."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch5.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch5.json
new file mode 100644
index 00000000000..92c024b4f34
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/parent-part-mismatch5.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test19.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because one of the returned host names' domain name parts \"evil\" mismatches \"test\"."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/returned-parent-too-short.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/returned-parent-too-short.json
new file mode 100644
index 00000000000..676eb0c0d09
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/returned-parent-too-short.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test13.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because returned host name's parent (build.10gen.cc) misses \"test.\""
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/returned-parent-wrong.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/returned-parent-wrong.json
new file mode 100644
index 00000000000..3aabfd81962
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/returned-parent-wrong.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test12.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because returned host name is too short and mismatches a parent."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-results-default-port.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-results-default-port.json
new file mode 100644
index 00000000000..66028310a6d
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-results-default-port.json
@@ -0,0 +1,16 @@
+{
+  "uri": "mongodb+srv://test1.test.build.10gen.cc/?replicaSet=repl0",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017",
+    "localhost.test.build.10gen.cc:27018"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  }
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-results-nonstandard-port.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-results-nonstandard-port.json
new file mode 100644
index 00000000000..4900f7cff1c
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-results-nonstandard-port.json
@@ -0,0 +1,16 @@
+{
+  "uri": "mongodb+srv://test2.test.build.10gen.cc/?replicaSet=repl0",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27018",
+    "localhost.test.build.10gen.cc:27019"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "ssl": true
+  }
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-txt-records.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-txt-records.json
new file mode 100644
index 00000000000..f0654ef6cb2
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/two-txt-records.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test6.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because there are two TXT records."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-not-allowed-option.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-not-allowed-option.json
new file mode 100644
index 00000000000..2a5cf2f0070
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-not-allowed-option.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test10.test.build.10gen.cc/?replicaSet=repl0",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because socketTimeoutMS is not an allowed option."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-overridden-ssl-option.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-overridden-ssl-option.json
new file mode 100644
index 00000000000..0ebc737bd5f
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-overridden-ssl-option.json
@@ -0,0 +1,16 @@
+{
+  "uri": "mongodb+srv://test5.test.build.10gen.cc/?ssl=false",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "authSource": "thisDB",
+    "ssl": false
+  }
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-overridden-uri-option.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-overridden-uri-option.json
new file mode 100644
index 00000000000..2626ba60839
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-overridden-uri-option.json
@@ -0,0 +1,16 @@
+{
+  "uri": "mongodb+srv://test5.test.build.10gen.cc/?authSource=otherDB",
+  "seeds": [
+    "localhost.test.build.10gen.cc:27017"
+  ],
+  "hosts": [
+    "localhost:27017",
+    "localhost:27018",
+    "localhost:27019"
+  ],
+  "options": {
+    "replicaSet": "repl0",
+    "authSource": "otherDB",
+    "ssl": true
+  }
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-unallowed-option.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-unallowed-option.json
new file mode 100644
index 00000000000..0d333a459dd
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/txt-record-with-unallowed-option.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test7.test.build.10gen.cc/",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because \"ssl\" is not an allowed option."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/uri-with-port.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/uri-with-port.json
new file mode 100644
index 00000000000..b981e2a1bfc
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/uri-with-port.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test5.test.build.10gen.cc:8123/?replicaSet=repl0",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because the mongodb+srv URI includes a port."
+}
diff --git a/driver-core/src/test/resources/initial-dns-seedlist-discovery/uri-with-two-hosts.json b/driver-core/src/test/resources/initial-dns-seedlist-discovery/uri-with-two-hosts.json
new file mode 100644
index 00000000000..5261a39cfa7
--- /dev/null
+++ b/driver-core/src/test/resources/initial-dns-seedlist-discovery/uri-with-two-hosts.json
@@ -0,0 +1,7 @@
+{
+  "uri": "mongodb+srv://test5.test.build.10gen.cc,test6.test.build.10gen.cc/?replicaSet=repl0",
+  "seeds": [],
+  "hosts": [],
+  "error": true,
+  "comment": "Should fail because the mongodb+srv URI includes two host names."
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/README.rst b/driver-core/src/test/resources/max-staleness/server_selection/README.rst
new file mode 100644
index 00000000000..b6d6f2c9781
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/README.rst
@@ -0,0 +1,72 @@
+===================
+Max Staleness Tests
+===================
+
+This directory contains platform-independent tests that drivers can use
+to prove their conformance to the Max Staleness Spec. The tests
+are provided in both YAML and JSON formats, and drivers may test against
+whichever format is more convenient for them.
+
+Test Format and Use
+-------------------
+
+YAML files contain the following setup for each test:
+
+- ``heartbeatFrequencyMS``: optional int
+
+- ``topology_description``: the state of a mocked cluster
+
+  - ``type``: the TopologyType
+
+  - ``servers``: a list of ServerDescriptions, each with:
+
+    - ``address``: a "host:port"
+
+    - ``type``: a ServerType
+
+    - ``avg_rtt_ms``: average round trip time in milliseconds [1]_
+
+    - ``lastWrite``: subdocument
+
+      - ``lastWriteDate``: nonzero int64, milliseconds since some past time
+
+    - ``maxWireVersion``: an int
+
+    - ``lastUpdateTime``: milliseconds since the Unix epoch
+
+- ``read_preference``: a read preference document
+
+For each test, create a MongoClient.
+Configure it with the heartbeatFrequencyMS specified by the test,
+or accept the driver's default heartbeatFrequencyMS if the test omits this field.
+
+(Single-threaded and multi-threaded clients now make heartbeatFrequencyMS configurable.
+This is a change in Server Discovery and Monitoring to support maxStalenessSeconds.
+Before, multi-threaded clients were allowed to make it configurable or not.)
+
+For each test, create a new TopologyDescription object initialized with the
+values from ``topology_description``. Initialize ServerDescriptions from the
+provided data. Create a ReadPreference object initialized with the values
+from ``read_preference``. Select servers that match the ReadPreference.
+
+Each test specifies that it expects an error, or specifies two sets of servers:
+
+- ``error: true``
+- ``suitable_servers``: the set of servers in the TopologyDescription
+  that are suitable for the ReadPreference, without taking ``avg_rtt_ms``
+  into account.
+- ``in_latency_window``: the set of suitable servers whose round trip time
+  qualifies them according to the default latency threshold of 15ms.
+  In each test there is one server in the latency window, to ensure
+  tests pass or fail deterministically.
+
+If the file contains ``error: true``, drivers MUST test that they throw an
+error during server selection, due to an invalid read preference or
+incompatible wire versions. For other files, drivers MUST test that they
+correctly select the set of servers in ``in_latency_window``.
+
+Drivers MAY also test that before filtration by latency, they select the
+specified set of "suitable" servers.
+
+.. [1] ``avg_rtt_ms`` is included merely for consistency with
+   Server Selection tests. It is not significant in Max Staleness tests.
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json
new file mode 100644
index 00000000000..1e3dd0bfd94
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json
@@ -0,0 +1,74 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1000001"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest"
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Incompatible.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Incompatible.json
new file mode 100644
index 00000000000..7f9fa764c7c
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Incompatible.json
@@ -0,0 +1,36 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 4,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 120
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/LastUpdateTime.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/LastUpdateTime.json
new file mode 100644
index 00000000000..e1abef2844b
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/LastUpdateTime.json
@@ -0,0 +1,88 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 1,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 25002,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 25001,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 150
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 1,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 25002,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 1,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Nearest.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Nearest.json
new file mode 100644
index 00000000000..53549e64317
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Nearest.json
@@ -0,0 +1,88 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "type": "RSSecondary",
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 150
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Nearest2.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Nearest2.json
new file mode 100644
index 00000000000..e2768c7fb8a
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Nearest2.json
@@ -0,0 +1,88 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "type": "RSSecondary",
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 150
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/NoKnownServers.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/NoKnownServers.json
new file mode 100644
index 00000000000..28e5e2aa4a5
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/NoKnownServers.json
@@ -0,0 +1,20 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "Unknown"
+      },
+      {
+        "address": "b:27017",
+        "type": "Unknown"
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 1
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/PrimaryPreferred.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/PrimaryPreferred.json
new file mode 100644
index 00000000000..8c6be6886a7
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/PrimaryPreferred.json
@@ -0,0 +1,64 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1000001"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "maxStalenessSeconds": 90
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/PrimaryPreferred_tags.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/PrimaryPreferred_tags.json
new file mode 100644
index 00000000000..26007c026ee
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/PrimaryPreferred_tags.json
@@ -0,0 +1,84 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "tokyo"
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      },
+      {
+        "data_center": "tokyo"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Secondary.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Secondary.json
new file mode 100644
index 00000000000..7d5eb58f4da
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/Secondary.json
@@ -0,0 +1,111 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "tags": {
+          "data_center": "tokyo"
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "d:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "tokyo"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Secondary",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/SecondaryPreferred.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/SecondaryPreferred.json
new file mode 100644
index 00000000000..df0bb5d77f0
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/SecondaryPreferred.json
@@ -0,0 +1,63 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1000001"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "maxStalenessSeconds": 120
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/SecondaryPreferred_tags.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/SecondaryPreferred_tags.json
new file mode 100644
index 00000000000..1ac3ea0aed9
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/SecondaryPreferred_tags.json
@@ -0,0 +1,111 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "tags": {
+          "data_center": "tokyo"
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "d:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "tokyo"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/ZeroMaxStaleness.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/ZeroMaxStaleness.json
new file mode 100644
index 00000000000..cb5dc5175a9
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetNoPrimary/ZeroMaxStaleness.json
@@ -0,0 +1,36 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 4,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 0
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json
new file mode 100644
index 00000000000..ed18d5837ec
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json
@@ -0,0 +1,74 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1000001"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest"
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Incompatible.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Incompatible.json
new file mode 100644
index 00000000000..d27ea11202c
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Incompatible.json
@@ -0,0 +1,36 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 4,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 120
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LastUpdateTime.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LastUpdateTime.json
new file mode 100644
index 00000000000..bbd8238e8a9
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LastUpdateTime.json
@@ -0,0 +1,88 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 1,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 125001,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 125001,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 150
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 1,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 125001,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 125001,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LongHeartbeat.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LongHeartbeat.json
new file mode 100644
index 00000000000..cb05f52aa26
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LongHeartbeat.json
@@ -0,0 +1,76 @@
+{
+  "heartbeatFrequencyMS": 120000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 130
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LongHeartbeat2.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LongHeartbeat2.json
new file mode 100644
index 00000000000..be169a3dcb6
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/LongHeartbeat2.json
@@ -0,0 +1,37 @@
+{
+  "heartbeatFrequencyMS": 120000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 129
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/MaxStalenessTooSmall.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/MaxStalenessTooSmall.json
new file mode 100644
index 00000000000..173f5742a20
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/MaxStalenessTooSmall.json
@@ -0,0 +1,37 @@
+{
+  "heartbeatFrequencyMS": 500,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 89
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json
new file mode 100644
index 00000000000..eee34627831
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json
@@ -0,0 +1,35 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "maxStalenessSeconds": 120
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest.json
new file mode 100644
index 00000000000..753fb82ca32
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest.json
@@ -0,0 +1,88 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "type": "RSSecondary",
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 150
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest2.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest2.json
new file mode 100644
index 00000000000..6233c0815aa
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest2.json
@@ -0,0 +1,88 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "type": "RSSecondary",
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 150
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5
+    },
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest_tags.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest_tags.json
new file mode 100644
index 00000000000..9a1cd3bb124
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Nearest_tags.json
@@ -0,0 +1,84 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "tokyo"
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      },
+      {
+        "data_center": "tokyo"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "125002"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/PrimaryPreferred.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/PrimaryPreferred.json
new file mode 100644
index 00000000000..107ae2755e2
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/PrimaryPreferred.json
@@ -0,0 +1,64 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "maxStalenessSeconds": 150
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.json
new file mode 100644
index 00000000000..a6681f6a130
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.json
@@ -0,0 +1,36 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 4,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "maxStalenessSeconds": 150
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred.json
new file mode 100644
index 00000000000..5f8a21f15c9
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred.json
@@ -0,0 +1,63 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1000001"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "maxStalenessSeconds": 120
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "RSPrimary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred_tags.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred_tags.json
new file mode 100644
index 00000000000..09ce6d6bd0a
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred_tags.json
@@ -0,0 +1,138 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 1,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1000001"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "d:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "e:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "tokyo"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 1,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json
new file mode 100644
index 00000000000..3700c30453e
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json
@@ -0,0 +1,96 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "tokyo"
+        }
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      },
+      {
+        "data_center": "tokyo"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Secondary_tags.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Secondary_tags.json
new file mode 100644
index 00000000000..f117159f64d
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Secondary_tags.json
@@ -0,0 +1,138 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 1,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1000001"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "d:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "e:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "tags": {
+          "data_center": "tokyo"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Secondary",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 1,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1000001"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Secondary_tags2.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Secondary_tags2.json
new file mode 100644
index 00000000000..b739c6141bf
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/Secondary_tags2.json
@@ -0,0 +1,96 @@
+{
+  "heartbeatFrequencyMS": 25000,
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "125002"
+          }
+        },
+        "maxWireVersion": 5
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "tokyo"
+        }
+      },
+      {
+        "address": "c:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        },
+        "maxWireVersion": 5,
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Secondary",
+    "maxStalenessSeconds": 150,
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      },
+      {
+        "data_center": "tokyo"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "type": "RSSecondary",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "2"
+        }
+      },
+      "maxWireVersion": 5,
+      "tags": {
+        "data_center": "tokyo"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/ZeroMaxStaleness.json b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/ZeroMaxStaleness.json
new file mode 100644
index 00000000000..f17aa93a3fb
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/ReplicaSetWithPrimary/ZeroMaxStaleness.json
@@ -0,0 +1,36 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "RSPrimary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "2"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "RSSecondary",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 4,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 0
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/Sharded/Incompatible.json b/driver-core/src/test/resources/max-staleness/server_selection/Sharded/Incompatible.json
new file mode 100644
index 00000000000..c261383f4a6
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/Sharded/Incompatible.json
@@ -0,0 +1,36 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "Mongos",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "Mongos",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 4,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 120
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/Sharded/SmallMaxStaleness.json b/driver-core/src/test/resources/max-staleness/server_selection/Sharded/SmallMaxStaleness.json
new file mode 100644
index 00000000000..27b9f1c12fd
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/Sharded/SmallMaxStaleness.json
@@ -0,0 +1,76 @@
+{
+  "heartbeatFrequencyMS": 10000,
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "Mongos",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      },
+      {
+        "address": "b:27017",
+        "type": "Mongos",
+        "avg_rtt_ms": 50,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 1
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "Mongos",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    },
+    {
+      "address": "b:27017",
+      "type": "Mongos",
+      "avg_rtt_ms": 50,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "Mongos",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/Single/Incompatible.json b/driver-core/src/test/resources/max-staleness/server_selection/Single/Incompatible.json
new file mode 100644
index 00000000000..b37fec7c1ac
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/Single/Incompatible.json
@@ -0,0 +1,24 @@
+{
+  "topology_description": {
+    "type": "Single",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "Standalone",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 4,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 120
+  },
+  "error": true
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/Single/SmallMaxStaleness.json b/driver-core/src/test/resources/max-staleness/server_selection/Single/SmallMaxStaleness.json
new file mode 100644
index 00000000000..c6b10231b87
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/Single/SmallMaxStaleness.json
@@ -0,0 +1,52 @@
+{
+  "heartbeatFrequencyMS": 10000,
+  "topology_description": {
+    "type": "Single",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "Standalone",
+        "avg_rtt_ms": 5,
+        "lastUpdateTime": 0,
+        "maxWireVersion": 5,
+        "lastWrite": {
+          "lastWriteDate": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 1
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "type": "Standalone",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "type": "Standalone",
+      "avg_rtt_ms": 5,
+      "lastUpdateTime": 0,
+      "maxWireVersion": 5,
+      "lastWrite": {
+        "lastWriteDate": {
+          "$numberLong": "1"
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/max-staleness/server_selection/Unknown/SmallMaxStaleness.json b/driver-core/src/test/resources/max-staleness/server_selection/Unknown/SmallMaxStaleness.json
new file mode 100644
index 00000000000..73957ab6e88
--- /dev/null
+++ b/driver-core/src/test/resources/max-staleness/server_selection/Unknown/SmallMaxStaleness.json
@@ -0,0 +1,18 @@
+{
+  "heartbeatFrequencyMS": 10000,
+  "topology_description": {
+    "type": "Unknown",
+    "servers": [
+      {
+        "address": "a:27017",
+        "type": "Unknown"
+      }
+    ]
+  },
+  "read_preference": {
+    "mode": "Nearest",
+    "maxStalenessSeconds": 1
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
+}
diff --git a/driver-core/src/test/resources/read-concern/connection-string/read-concern.json b/driver-core/src/test/resources/read-concern/connection-string/read-concern.json
new file mode 100644
index 00000000000..1ecad8c268d
--- /dev/null
+++ b/driver-core/src/test/resources/read-concern/connection-string/read-concern.json
@@ -0,0 +1,47 @@
+{
+  "tests": [
+    {
+      "description": "Default",
+      "uri": "mongodb://localhost/",
+      "valid": true,
+      "warning": false,
+      "readConcern": {}
+    },
+    {
+      "description": "local specified",
+      "uri": "mongodb://localhost/?readConcernLevel=local",
+      "valid": true,
+      "warning": false,
+      "readConcern": {
+        "level": "local"
+      }
+    },
+    {
+      "description": "majority specified",
+      "uri": "mongodb://localhost/?readConcernLevel=majority",
+      "valid": true,
+      "warning": false,
+      "readConcern": {
+        "level": "majority"
+      }
+    },
+    {
+      "description": "linearizable specified",
+      "uri": "mongodb://localhost/?readConcernLevel=linearizable",
+      "valid": true,
+      "warning": false,
+      "readConcern": {
+        "level": "linearizable"
+      }
+    },
+    {
+      "description": "available specified",
+      "uri": "mongodb://localhost/?readConcernLevel=available",
+      "valid": true,
+      "warning": false,
+      "readConcern": {
+        "level": "available"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/read-concern/document/read-concern.json b/driver-core/src/test/resources/read-concern/document/read-concern.json
new file mode 100644
index 00000000000..187397dae57
--- /dev/null
+++ b/driver-core/src/test/resources/read-concern/document/read-concern.json
@@ -0,0 +1,66 @@
+{
+  "tests": [
+    {
+      "description": "Default",
+      "valid": true,
+      "readConcern": {},
+      "readConcernDocument": {},
+      "isServerDefault": true
+    },
+    {
+      "description": "Majority",
+      "valid": true,
+      "readConcern": {
+        "level": "majority"
+      },
+      "readConcernDocument": {
+        "level": "majority"
+      },
+      "isServerDefault": false
+    },
+    {
+      "description": "Local",
+      "valid": true,
+      "readConcern": {
+        "level": "local"
+      },
+      "readConcernDocument": {
+        "level": "local"
+      },
+      "isServerDefault": false
+    },
+    {
+      "description": "Linearizable",
+      "valid": true,
+      "readConcern": {
+        "level": "linearizable"
+      },
+      "readConcernDocument": {
+        "level": "linearizable"
+      },
+      "isServerDefault": false
+    },
+    {
+      "description": "Snapshot",
+      "valid": true,
+      "readConcern": {
+        "level": "snapshot"
+      },
+      "readConcernDocument": {
+        "level": "snapshot"
+      },
+      "isServerDefault": false
+    },
+    {
+      "description": "Available",
+      "valid": true,
+      "readConcern": {
+        "level": "available"
+      },
+      "readConcernDocument": {
+        "level": "available"
+      },
+      "isServerDefault": false
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/read-concern/read-concern.json b/driver-core/src/test/resources/read-concern/read-concern.json
deleted file mode 100644
index 68349555563..00000000000
--- a/driver-core/src/test/resources/read-concern/read-concern.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "tests": [
-    {
-      "description": "Default",
-      "readConcern": {},
-      "uri": "mongodb://localhost/"
-    },
-    {
-      "description": "local specified",
-      "readConcern": {
-        "level": "local"
-      },
-      "uri": "mongodb://localhost/?readConcernLevel=local"
-    },
-    {
-      "description": "majority specified",
-      "readConcern": {
-        "level": "majority"
-      },
-      "uri": "mongodb://localhost/?readConcernLevel=majority"
-    }
-  ]
-}
diff --git a/driver-core/src/test/resources/retryable-reads/README.rst b/driver-core/src/test/resources/retryable-reads/README.rst
new file mode 100644
index 00000000000..99636fb0413
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/README.rst
@@ -0,0 +1,167 @@
+=====================
+Retryable Reads Tests
+=====================
+
+.. contents::
+
+----
+
+Introduction
+============
+
+The YAML and JSON files in this directory tree are platform-independent tests
+that drivers can use to prove their conformance to the Retryable Reads spec.
+
+Prose tests, which are not easily expressed in YAML, are also presented
+in this file. Those tests will need to be manually implemented by each driver.
+
+Tests will require a MongoClient created with options defined in the tests.
+Integration tests will require a running MongoDB cluster with server versions
+4.0 or later.
+
+N.B. The spec specifies 3.6 as the minimum server version: however,
+``failCommand`` is not supported on 3.6, so for now, testing requires MongoDB
+4.0. Once `DRIVERS-560`_ is resolved, we will attempt to adapt its live failure
+integration tests to test Retryable Reads on MongoDB 3.6.
+
+.. _DRIVERS-560: https://jira.mongodb.org/browse/DRIVERS-560
+
+Server Fail Point
+=================
+
+See: `Server Fail Point`_ in the Transactions spec test suite.
+
+.. _Server Fail Point: ../../transactions/tests#server-fail-point
+
+Disabling Fail Point after Test Execution
+-----------------------------------------
+
+After each test that configures a fail point, drivers should disable the
+``failCommand`` fail point to avoid spurious failures in
+subsequent tests. The fail point may be disabled like so::
+
+    db.runCommand({
+        configureFailPoint: "failCommand",
+        mode: "off"
+    });
+
+Network Error Tests
+===================
+
+Network error tests are expressed in YAML and should be run against a standalone,
+shard cluster, or single-node replica set.
+
+
+Test Format
+-----------
+
+Each YAML file has the following keys:
+
+- ``runOn`` (optional): An array of server version and/or topology requirements
+  for which the tests can be run. If the test environment satisfies one or more
+  of these requirements, the tests may be executed; otherwise, this file should
+  be skipped. If this field is omitted, the tests can be assumed to have no
+  particular requirements and should be executed. Each element will have some or
+  all of the following fields:
+
+  - ``minServerVersion`` (optional): The minimum server version (inclusive)
+    required to successfully run the tests. If this field is omitted, it should
+    be assumed that there is no lower bound on the required server version.
+
+  - ``maxServerVersion`` (optional): The maximum server version (inclusive)
+    against which the tests can be run successfully. If this field is omitted,
+    it should be assumed that there is no upper bound on the required server
+    version.
+
+  - ``topology`` (optional): An array of server topologies against which the
+    tests can be run successfully. Valid topologies are "single", "replicaset",
+    and "sharded". If this field is omitted, the default is all topologies (i.e.
+    ``["single", "replicaset", "sharded"]``).
+
+- ``database_name`` and ``collection_name``: Optional. The database and
+  collection to use for testing.
+  
+- ``bucket_name``: Optional. The GridFS bucket name to use for testing.
+
+- ``data``: The data that should exist in the collection(s) under test before
+  each test run.
+    
+- ``tests``: An array of tests that are to be run independently of each other.
+  Each test will have some or all of the following fields:
+
+  - ``description``: The name of the test.
+    
+  - ``clientOptions``: Optional, parameters to pass to MongoClient().
+
+  - ``useMultipleMongoses`` (optional): If ``true``, the MongoClient for this
+    test should be initialized with multiple mongos seed addresses. If ``false``
+    or omitted, only a single mongos address should be specified. This field has
+    no effect for non-sharded topologies.
+    
+  - ``skipReason``: Optional, string describing why this test should be skipped.
+
+  - ``failPoint``: Optional, a server fail point to enable, expressed as the
+    configureFailPoint command to run on the admin database.
+
+  - ``operations``: An array of documents describing an operation to be
+    executed. Each document has the following fields:
+
+    - ``name``: The name of the operation on ``object``.
+
+    - ``object``: The name of the object to perform the operation on. Can be
+      "database", "collection", "client", or "gridfsbucket."
+
+    - ``arguments``: Optional, the names and values of arguments.
+
+    - ``result``: Optional. The return value from the operation, if any. This
+      field may be a scalar (e.g. in the case of a count), a single document, or
+      an array of documents in the case of a multi-document read.
+      
+    - ``error``: Optional. If ``true``, the test should expect an error or
+      exception.
+        
+  - ``expectations``: Optional list of command-started events.
+
+GridFS Tests
+------------
+
+GridFS tests are denoted by when the YAML file contains ``bucket_name``.
+
+``fs.files`` and ``fs.chunks`` should be created in the database
+specified by ``database_name``. This could be done via inserts or by
+creating GridFSBuckets—using the GridFS ``bucketName`` (see
+`GridFSBucket spec`_) specified by ``bucket_name`` field in the YAML
+file—and calling ``upload_from_stream_with_id`` with the appropriate
+data.
+
+``Download`` tests should be tested against ``GridFS.download_to_stream``.
+``DownloadByName`` tests should be tested against
+``GridFS.download_to_stream_by_name``.
+
+
+.. _GridFSBucket spec: https://github.com/mongodb/specifications/blob/master/source/gridfs/gridfs-spec.rst#configurable-gridfsbucket-class
+    
+Speeding Up Tests
+-----------------
+
+Drivers may benefit reducing `minHeartbeatFrequencyMS`_ in order to speed up
+tests. Python was able to decrease the run time of the tests greatly by lowering
+the SDAM's ``minHeartbeatFrequencyMS`` from 500ms to 50ms, thus decreasing the
+waiting time after a "not master" error:
+
+.. _minHeartbeatFrequencyMS: https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring.rst#minheartbeatfrequencyms
+Optional Enumeration Commands
+=============================
+
+A driver only needs to test the optional enumeration commands it has chosen to
+implement (e.g. ``Database.listCollectionNames()``).
+
+Changelog
+=========
+
+:2019-03-19: Add top-level ``runOn`` field to denote server version and/or
+             topology requirements requirements for the test file. Removes the
+             ``minServerVersion`` and ``topology`` top-level fields, which are
+             now expressed within ``runOn`` elements.
+
+             Add test-level ``useMultipleMongoses`` field.
diff --git a/driver-core/src/test/resources/retryable-reads/aggregate-serverErrors.json b/driver-core/src/test/resources/retryable-reads/aggregate-serverErrors.json
new file mode 100644
index 00000000000..211c318613c
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/aggregate-serverErrors.json
@@ -0,0 +1,1207 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Aggregate succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/aggregate.json b/driver-core/src/test/resources/retryable-reads/aggregate.json
new file mode 100644
index 00000000000..30a6e05e695
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/aggregate.json
@@ -0,0 +1,405 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Aggregate succeeds on first attempt",
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "result": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Aggregate with $out does not retry",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$out": "output-collection"
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$out": "output-collection"
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/changeStreams-client.watch-serverErrors.json b/driver-core/src/test/resources/retryable-reads/changeStreams-client.watch-serverErrors.json
new file mode 100644
index 00000000000..2ac543169e0
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/changeStreams-client.watch-serverErrors.json
@@ -0,0 +1,763 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "client.watch succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/changeStreams-client.watch.json b/driver-core/src/test/resources/retryable-reads/changeStreams-client.watch.json
new file mode 100644
index 00000000000..18ff019e1b6
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/changeStreams-client.watch.json
@@ -0,0 +1,213 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "client.watch succeeds on first attempt",
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "client.watch fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default",
+                    "allChangesForCluster": true
+                  }
+                }
+              ]
+            },
+            "database_name": "admin"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/changeStreams-db.coll.watch-serverErrors.json b/driver-core/src/test/resources/retryable-reads/changeStreams-db.coll.watch-serverErrors.json
new file mode 100644
index 00000000000..a612b496b80
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/changeStreams-db.coll.watch-serverErrors.json
@@ -0,0 +1,738 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "db.coll.watch succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/changeStreams-db.coll.watch.json b/driver-core/src/test/resources/retryable-reads/changeStreams-db.coll.watch.json
new file mode 100644
index 00000000000..67d56b2cd05
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/changeStreams-db.coll.watch.json
@@ -0,0 +1,207 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "db.coll.watch succeeds on first attempt",
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.coll.watch fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/changeStreams-db.watch-serverErrors.json b/driver-core/src/test/resources/retryable-reads/changeStreams-db.watch-serverErrors.json
new file mode 100644
index 00000000000..3f77c501fea
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/changeStreams-db.watch-serverErrors.json
@@ -0,0 +1,738 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "db.watch succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/changeStreams-db.watch.json b/driver-core/src/test/resources/retryable-reads/changeStreams-db.watch.json
new file mode 100644
index 00000000000..8f1099bc7a2
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/changeStreams-db.watch.json
@@ -0,0 +1,207 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "db.watch succeeds on first attempt",
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "db.watch fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "watch",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": 1,
+              "cursor": {},
+              "pipeline": [
+                {
+                  "$changeStream": {
+                    "fullDocument": "default"
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/count-serverErrors.json b/driver-core/src/test/resources/retryable-reads/count-serverErrors.json
new file mode 100644
index 00000000000..b13bb893dc5
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/count-serverErrors.json
@@ -0,0 +1,585 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "Count succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/count.json b/driver-core/src/test/resources/retryable-reads/count.json
new file mode 100644
index 00000000000..0ccf4982ba6
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/count.json
@@ -0,0 +1,178 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "Count succeeds on first attempt",
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Count fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/countDocuments-serverErrors.json b/driver-core/src/test/resources/retryable-reads/countDocuments-serverErrors.json
new file mode 100644
index 00000000000..641fdc908a5
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/countDocuments-serverErrors.json
@@ -0,0 +1,910 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "CountDocuments succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/countDocuments.json b/driver-core/src/test/resources/retryable-reads/countDocuments.json
new file mode 100644
index 00000000000..b4ccf36684d
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/countDocuments.json
@@ -0,0 +1,256 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "CountDocuments succeeds on first attempt",
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "CountDocuments fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {}
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ]
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/distinct-serverErrors.json b/driver-core/src/test/resources/retryable-reads/distinct-serverErrors.json
new file mode 100644
index 00000000000..533a38c942e
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/distinct-serverErrors.json
@@ -0,0 +1,837 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Distinct succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/distinct.json b/driver-core/src/test/resources/retryable-reads/distinct.json
new file mode 100644
index 00000000000..b5885e27eb7
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/distinct.json
@@ -0,0 +1,244 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Distinct succeeds on first attempt",
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "result": [
+            22,
+            33
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Distinct fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "distinct"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "x",
+            "filter": {
+              "_id": {
+                "$gt": 1
+              }
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "coll",
+              "key": "x",
+              "query": {
+                "_id": {
+                  "$gt": 1
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/estimatedDocumentCount-serverErrors.json b/driver-core/src/test/resources/retryable-reads/estimatedDocumentCount-serverErrors.json
new file mode 100644
index 00000000000..fd94d2183d9
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/estimatedDocumentCount-serverErrors.json
@@ -0,0 +1,546 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "EstimatedDocumentCount succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/estimatedDocumentCount.json b/driver-core/src/test/resources/retryable-reads/estimatedDocumentCount.json
new file mode 100644
index 00000000000..8dfa15a2cdb
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/estimatedDocumentCount.json
@@ -0,0 +1,166 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "EstimatedDocumentCount succeeds on first attempt",
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "result": 2
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "EstimatedDocumentCount fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "count"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "estimatedDocumentCount",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "count": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/find-serverErrors.json b/driver-core/src/test/resources/retryable-reads/find-serverErrors.json
new file mode 100644
index 00000000000..e7d49f6eaac
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/find-serverErrors.json
@@ -0,0 +1,961 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    },
+    {
+      "_id": 4,
+      "x": 44
+    },
+    {
+      "_id": 5,
+      "x": 55
+    }
+  ],
+  "tests": [
+    {
+      "description": "Find succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/find.json b/driver-core/src/test/resources/retryable-reads/find.json
new file mode 100644
index 00000000000..56479ff1d87
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/find.json
@@ -0,0 +1,347 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    },
+    {
+      "_id": 4,
+      "x": 44
+    },
+    {
+      "_id": 5,
+      "x": 55
+    }
+  ],
+  "tests": [
+    {
+      "description": "Find succeeds on first attempt",
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds on second attempt with explicit clientOptions",
+      "clientOptions": {
+        "retryReads": true
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "result": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Find fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {},
+            "sort": {
+              "_id": 1
+            },
+            "limit": 4
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {},
+              "sort": {
+                "_id": 1
+              },
+              "limit": 4
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/findOne-serverErrors.json b/driver-core/src/test/resources/retryable-reads/findOne-serverErrors.json
new file mode 100644
index 00000000000..7c235ef32c8
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/findOne-serverErrors.json
@@ -0,0 +1,731 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    },
+    {
+      "_id": 4,
+      "x": 44
+    },
+    {
+      "_id": 5,
+      "x": 55
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOne succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/findOne.json b/driver-core/src/test/resources/retryable-reads/findOne.json
new file mode 100644
index 00000000000..d296a9cdb5e
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/findOne.json
@@ -0,0 +1,222 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    },
+    {
+      "_id": 4,
+      "x": 44
+    },
+    {
+      "_id": 5,
+      "x": 55
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOne succeeds on first attempt",
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "FindOne fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "findOne",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "coll",
+              "filter": {
+                "_id": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/gridfs-download-serverErrors.json b/driver-core/src/test/resources/retryable-reads/gridfs-download-serverErrors.json
new file mode 100644
index 00000000000..ae1c3c6919a
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/gridfs-download-serverErrors.json
@@ -0,0 +1,924 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "bucket_name": "fs",
+  "data": {
+    "fs.files": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "length": 1,
+        "chunkSize": 4,
+        "uploadDate": {
+          "$date": "1970-01-01T00:00:00.000Z"
+        },
+        "filename": "abc",
+        "metadata": {}
+      }
+    ],
+    "fs.chunks": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000002"
+        },
+        "files_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "n": 0,
+        "data": {
+          "$binary": {
+            "base64": "EQ==",
+            "subType": "00"
+          }
+        }
+      }
+    ]
+  },
+  "tests": [
+    {
+      "description": "Download succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/gridfs-download.json b/driver-core/src/test/resources/retryable-reads/gridfs-download.json
new file mode 100644
index 00000000000..a5c5ef4d559
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/gridfs-download.json
@@ -0,0 +1,269 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "bucket_name": "fs",
+  "data": {
+    "fs.files": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "length": 1,
+        "chunkSize": 4,
+        "uploadDate": {
+          "$date": "1970-01-01T00:00:00.000Z"
+        },
+        "filename": "abc",
+        "metadata": {}
+      }
+    ],
+    "fs.chunks": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000002"
+        },
+        "files_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "n": 0,
+        "data": {
+          "$binary": {
+            "base64": "EQ==",
+            "subType": "00"
+          }
+        }
+      }
+    ]
+  },
+  "tests": [
+    {
+      "description": "Download succeeds on first attempt",
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Download fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "download",
+          "object": "gridfsbucket",
+          "arguments": {
+            "id": {
+              "$oid": "000000000000000000000001"
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/gridfs-downloadByName-serverErrors.json b/driver-core/src/test/resources/retryable-reads/gridfs-downloadByName-serverErrors.json
new file mode 100644
index 00000000000..4e2441e7471
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/gridfs-downloadByName-serverErrors.json
@@ -0,0 +1,848 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "bucket_name": "fs",
+  "data": {
+    "fs.files": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "length": 1,
+        "chunkSize": 4,
+        "uploadDate": {
+          "$date": "1970-01-01T00:00:00.000Z"
+        },
+        "filename": "abc",
+        "metadata": {}
+      }
+    ],
+    "fs.chunks": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000002"
+        },
+        "files_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "n": 0,
+        "data": {
+          "$binary": {
+            "base64": "EQ==",
+            "subType": "00"
+          }
+        }
+      }
+    ]
+  },
+  "tests": [
+    {
+      "description": "DownloadByName succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/gridfs-downloadByName.json b/driver-core/src/test/resources/retryable-reads/gridfs-downloadByName.json
new file mode 100644
index 00000000000..0634a09bff4
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/gridfs-downloadByName.json
@@ -0,0 +1,249 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "bucket_name": "fs",
+  "data": {
+    "fs.files": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "length": 1,
+        "chunkSize": 4,
+        "uploadDate": {
+          "$date": "1970-01-01T00:00:00.000Z"
+        },
+        "filename": "abc",
+        "metadata": {}
+      }
+    ],
+    "fs.chunks": [
+      {
+        "_id": {
+          "$oid": "000000000000000000000002"
+        },
+        "files_id": {
+          "$oid": "000000000000000000000001"
+        },
+        "n": 0,
+        "data": {
+          "$binary": {
+            "base64": "EQ==",
+            "subType": "00"
+          }
+        }
+      }
+    ]
+  },
+  "tests": [
+    {
+      "description": "DownloadByName succeeds on first attempt",
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.chunks",
+              "filter": {
+                "files_id": {
+                  "$oid": "000000000000000000000001"
+                }
+              },
+              "sort": {
+                "n": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "DownloadByName fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "find"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "download_by_name",
+          "object": "gridfsbucket",
+          "arguments": {
+            "filename": "abc"
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "fs.files",
+              "filter": {
+                "filename": "abc"
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listCollectionNames-serverErrors.json b/driver-core/src/test/resources/retryable-reads/listCollectionNames-serverErrors.json
new file mode 100644
index 00000000000..48a5db5ef50
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listCollectionNames-serverErrors.json
@@ -0,0 +1,501 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListCollectionNames succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listCollectionNames.json b/driver-core/src/test/resources/retryable-reads/listCollectionNames.json
new file mode 100644
index 00000000000..437fc36a40e
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listCollectionNames.json
@@ -0,0 +1,149 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListCollectionNames succeeds on first attempt",
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionNames fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionNames",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listCollectionObjects-serverErrors.json b/driver-core/src/test/resources/retryable-reads/listCollectionObjects-serverErrors.json
new file mode 100644
index 00000000000..8ce6a27c501
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listCollectionObjects-serverErrors.json
@@ -0,0 +1,501 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListCollectionObjects succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listCollectionObjects.json b/driver-core/src/test/resources/retryable-reads/listCollectionObjects.json
new file mode 100644
index 00000000000..1f537b743f0
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listCollectionObjects.json
@@ -0,0 +1,149 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListCollectionObjects succeeds on first attempt",
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollectionObjects fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollectionObjects",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listCollections-serverErrors.json b/driver-core/src/test/resources/retryable-reads/listCollections-serverErrors.json
new file mode 100644
index 00000000000..a2abf4acff3
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listCollections-serverErrors.json
@@ -0,0 +1,501 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListCollections succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listCollections.json b/driver-core/src/test/resources/retryable-reads/listCollections.json
new file mode 100644
index 00000000000..a6b452e64f0
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listCollections.json
@@ -0,0 +1,149 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListCollections succeeds on first attempt",
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListCollections fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listCollections"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listCollections",
+          "object": "database",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listCollections": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listDatabaseNames-serverErrors.json b/driver-core/src/test/resources/retryable-reads/listDatabaseNames-serverErrors.json
new file mode 100644
index 00000000000..e7b5311a54a
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listDatabaseNames-serverErrors.json
@@ -0,0 +1,501 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListDatabaseNames succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listDatabaseNames.json b/driver-core/src/test/resources/retryable-reads/listDatabaseNames.json
new file mode 100644
index 00000000000..d4f24ec7f9a
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listDatabaseNames.json
@@ -0,0 +1,149 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListDatabaseNames succeeds on first attempt",
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseNames fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseNames",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listDatabaseObjects-serverErrors.json b/driver-core/src/test/resources/retryable-reads/listDatabaseObjects-serverErrors.json
new file mode 100644
index 00000000000..085c9a899f2
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listDatabaseObjects-serverErrors.json
@@ -0,0 +1,501 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListDatabaseObjects succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listDatabaseObjects.json b/driver-core/src/test/resources/retryable-reads/listDatabaseObjects.json
new file mode 100644
index 00000000000..cb6029dcb76
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listDatabaseObjects.json
@@ -0,0 +1,149 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListDatabaseObjects succeeds on first attempt",
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabaseObjects fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabaseObjects",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listDatabases-serverErrors.json b/driver-core/src/test/resources/retryable-reads/listDatabases-serverErrors.json
new file mode 100644
index 00000000000..fd10af962d8
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listDatabases-serverErrors.json
@@ -0,0 +1,501 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListDatabases succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listDatabases.json b/driver-core/src/test/resources/retryable-reads/listDatabases.json
new file mode 100644
index 00000000000..8dff53ce8e5
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listDatabases.json
@@ -0,0 +1,149 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "admin",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListDatabases succeeds on first attempt",
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListDatabases fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listDatabases"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listDatabases",
+          "object": "client",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listDatabases": 1
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listIndexes-serverErrors.json b/driver-core/src/test/resources/retryable-reads/listIndexes-serverErrors.json
new file mode 100644
index 00000000000..b1043310f87
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listIndexes-serverErrors.json
@@ -0,0 +1,526 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListIndexes succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 11600
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after InterruptedDueToStepDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 13435
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 13436
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 91
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 7
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 6
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 89
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 9001
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes fails after two NotMaster errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes fails after NotMaster when retryReads is false",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/listIndexes.json b/driver-core/src/test/resources/retryable-reads/listIndexes.json
new file mode 100644
index 00000000000..f460ea7684f
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/listIndexes.json
@@ -0,0 +1,155 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [],
+  "tests": [
+    {
+      "description": "ListIndexes succeeds on first attempt",
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes succeeds on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes fails on first attempt",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "ListIndexes fails on second attempt",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "listIndexes"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "listIndexes",
+          "object": "collection",
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "listIndexes": "coll"
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-reads/mapReduce.json b/driver-core/src/test/resources/retryable-reads/mapReduce.json
new file mode 100644
index 00000000000..9dc7a56f3c2
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-reads/mapReduce.json
@@ -0,0 +1,187 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "single",
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 0
+    },
+    {
+      "_id": 2,
+      "x": 1
+    },
+    {
+      "_id": 3,
+      "x": 2
+    }
+  ],
+  "tests": [
+    {
+      "description": "MapReduce succeeds with retry on",
+      "operations": [
+        {
+          "name": "mapReduce",
+          "object": "collection",
+          "arguments": {
+            "map": {
+              "$code": "function inc() { return emit(0, this.x + 1) }"
+            },
+            "reduce": {
+              "$code": "function sum(key, values) { return values.reduce((acc, x) => acc + x); }"
+            },
+            "out": {
+              "inline": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 0,
+              "value": 6
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "mapReduce": "coll",
+              "map": {
+                "$code": "function inc() { return emit(0, this.x + 1) }"
+              },
+              "reduce": {
+                "$code": "function sum(key, values) { return values.reduce((acc, x) => acc + x); }"
+              },
+              "out": {
+                "inline": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "MapReduce fails with retry on",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "mapReduce"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "mapReduce",
+          "object": "collection",
+          "arguments": {
+            "map": {
+              "$code": "function inc() { return emit(0, this.x + 1) }"
+            },
+            "reduce": {
+              "$code": "function sum(key, values) { return values.reduce((acc, x) => acc + x); }"
+            },
+            "out": {
+              "inline": 1
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "mapReduce": "coll",
+              "map": {
+                "$code": "function inc() { return emit(0, this.x + 1) }"
+              },
+              "reduce": {
+                "$code": "function sum(key, values) { return values.reduce((acc, x) => acc + x); }"
+              },
+              "out": {
+                "inline": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    },
+    {
+      "description": "MapReduce fails with retry off",
+      "clientOptions": {
+        "retryReads": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "mapReduce"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "mapReduce",
+          "object": "collection",
+          "arguments": {
+            "map": {
+              "$code": "function inc() { return emit(0, this.x + 1) }"
+            },
+            "reduce": {
+              "$code": "function sum(key, values) { return values.reduce((acc, x) => acc + x); }"
+            },
+            "out": {
+              "inline": 1
+            }
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "mapReduce": "coll",
+              "map": {
+                "$code": "function inc() { return emit(0, this.x + 1) }"
+              },
+              "reduce": {
+                "$code": "function sum(key, values) { return values.reduce((acc, x) => acc + x); }"
+              },
+              "out": {
+                "inline": 1
+              }
+            },
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/bulkWrite-serverErrors.json b/driver-core/src/test/resources/retryable-writes/bulkWrite-serverErrors.json
new file mode 100644
index 00000000000..54cd0bcebb4
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/bulkWrite-serverErrors.json
@@ -0,0 +1,266 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "BulkWrite succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1,
+          "insertedCount": 1,
+          "insertedIds": {
+            "1": 3
+          },
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1,
+          "insertedCount": 1,
+          "insertedIds": {
+            "1": 3
+          },
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/bulkWrite.json b/driver-core/src/test/resources/retryable-writes/bulkWrite.json
new file mode 100644
index 00000000000..72a8d018939
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/bulkWrite.json
@@ -0,0 +1,806 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "First command is retried",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1,
+          "insertedCount": 1,
+          "insertedIds": {
+            "0": 2
+          },
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 23
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "All commands are retried",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 7
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 4,
+                  "x": 44
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                },
+                "upsert": true
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 5,
+                  "x": 55
+                }
+              }
+            },
+            {
+              "name": "replaceOne",
+              "arguments": {
+                "filter": {
+                  "_id": 3
+                },
+                "replacement": {
+                  "_id": 3,
+                  "x": 333
+                }
+              }
+            },
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1,
+          "insertedCount": 3,
+          "insertedIds": {
+            "0": 2,
+            "2": 3,
+            "4": 5
+          },
+          "matchedCount": 2,
+          "modifiedCount": 2,
+          "upsertedCount": 1,
+          "upsertedIds": {
+            "3": 4
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 23
+            },
+            {
+              "_id": 3,
+              "x": 333
+            },
+            {
+              "_id": 4,
+              "x": 45
+            },
+            {
+              "_id": 5,
+              "x": 55
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Both commands are retried after their first statement fails",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 1,
+          "insertedIds": {
+            "0": 2
+          },
+          "matchedCount": 2,
+          "modifiedCount": 2,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 23
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Second command is retried after its second statement fails",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "skip": 2
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 1,
+          "insertedIds": {
+            "0": 2
+          },
+          "matchedCount": 2,
+          "modifiedCount": 2,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 23
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "BulkWrite with unordered execution",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 3,
+                  "x": 33
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 2,
+          "insertedIds": {
+            "0": 2,
+            "1": 3
+          },
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "First insertOne is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 0,
+          "insertedIds": {},
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Second updateOne is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "skip": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "deleteOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 1,
+          "insertedIds": {
+            "0": 2
+          },
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Third updateOne is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "skip": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 1
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            },
+            {
+              "name": "updateOne",
+              "arguments": {
+                "filter": {
+                  "_id": 2
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 1,
+          "insertedIds": {
+            "1": 2
+          },
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Single-document write following deleteMany is retried",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "deleteMany",
+              "arguments": {
+                "filter": {
+                  "x": 11
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1,
+          "insertedCount": 1,
+          "insertedIds": {
+            "1": 2
+          },
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Single-document write following updateMany is retried",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "bulkWrite",
+        "arguments": {
+          "requests": [
+            {
+              "name": "updateMany",
+              "arguments": {
+                "filter": {
+                  "x": 11
+                },
+                "update": {
+                  "$inc": {
+                    "x": 1
+                  }
+                }
+              }
+            },
+            {
+              "name": "insertOne",
+              "arguments": {
+                "document": {
+                  "_id": 2,
+                  "x": 22
+                }
+              }
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 0,
+          "insertedCount": 1,
+          "insertedIds": {
+            "1": 2
+          },
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0,
+          "upsertedIds": {}
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/deleteMany.json b/driver-core/src/test/resources/retryable-writes/deleteMany.json
new file mode 100644
index 00000000000..642ad11fb47
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/deleteMany.json
@@ -0,0 +1,41 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset",
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "DeleteMany ignores retryWrites",
+      "useMultipleMongoses": true,
+      "operation": {
+        "name": "deleteMany",
+        "arguments": {
+          "filter": {}
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 2
+        },
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/deleteOne-serverErrors.json b/driver-core/src/test/resources/retryable-writes/deleteOne-serverErrors.json
new file mode 100644
index 00000000000..912f65d9b38
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/deleteOne-serverErrors.json
@@ -0,0 +1,146 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "DeleteOne succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "delete"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "DeleteOne succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "delete"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "DeleteOne fails with RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "delete"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/deleteOne.json b/driver-core/src/test/resources/retryable-writes/deleteOne.json
new file mode 100644
index 00000000000..592937acedd
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/deleteOne.json
@@ -0,0 +1,120 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "DeleteOne is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "DeleteOne is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "deletedCount": 1
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "DeleteOne is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "deleteOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/findOneAndDelete-serverErrors.json b/driver-core/src/test/resources/retryable-writes/findOneAndDelete-serverErrors.json
new file mode 100644
index 00000000000..41d46d9a866
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/findOneAndDelete-serverErrors.json
@@ -0,0 +1,163 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndDelete succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "x": {
+              "$gte": 11
+            }
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndDelete succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "x": {
+              "$gte": 11
+            }
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndDelete fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "x": {
+              "$gte": 11
+            }
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/findOneAndDelete.json b/driver-core/src/test/resources/retryable-writes/findOneAndDelete.json
new file mode 100644
index 00000000000..0cbe18108bd
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/findOneAndDelete.json
@@ -0,0 +1,137 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndDelete is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "x": {
+              "$gte": 11
+            }
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndDelete is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "x": {
+              "$gte": 11
+            }
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndDelete is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndDelete",
+        "arguments": {
+          "filter": {
+            "x": {
+              "$gte": 11
+            }
+          },
+          "sort": {
+            "x": 1
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/findOneAndReplace-serverErrors.json b/driver-core/src/test/resources/retryable-writes/findOneAndReplace-serverErrors.json
new file mode 100644
index 00000000000..8fb9f0887d1
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/findOneAndReplace-serverErrors.json
@@ -0,0 +1,171 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndReplace succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/findOneAndReplace.json b/driver-core/src/test/resources/retryable-writes/findOneAndReplace.json
new file mode 100644
index 00000000000..e1f9ab7f8c3
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/findOneAndReplace.json
@@ -0,0 +1,145 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndReplace is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndReplace is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndReplace",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/findOneAndUpdate-serverErrors.json b/driver-core/src/test/resources/retryable-writes/findOneAndUpdate-serverErrors.json
new file mode 100644
index 00000000000..7ceeb8f2f15
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/findOneAndUpdate-serverErrors.json
@@ -0,0 +1,174 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndUpdate succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/findOneAndUpdate.json b/driver-core/src/test/resources/retryable-writes/findOneAndUpdate.json
new file mode 100644
index 00000000000..9ae2d87d821
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/findOneAndUpdate.json
@@ -0,0 +1,147 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOneAndUpdate is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "returnDocument": "Before"
+        }
+      },
+      "outcome": {
+        "result": {
+          "_id": 1,
+          "x": 11
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "FindOneAndUpdate is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "findOneAndUpdate",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/insertMany-serverErrors.json b/driver-core/src/test/resources/retryable-writes/insertMany-serverErrors.json
new file mode 100644
index 00000000000..793c24c460a
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/insertMany-serverErrors.json
@@ -0,0 +1,190 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "InsertMany succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedIds": {
+            "0": 2,
+            "1": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertMany succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedIds": {
+            "0": 2,
+            "1": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertMany fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/insertMany.json b/driver-core/src/test/resources/retryable-writes/insertMany.json
new file mode 100644
index 00000000000..0ad326e2dc9
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/insertMany.json
@@ -0,0 +1,163 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    }
+  ],
+  "tests": [
+    {
+      "description": "InsertMany succeeds after one network error",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedIds": {
+            "0": 2,
+            "1": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertMany with unordered execution",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ],
+          "options": {
+            "ordered": false
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedIds": {
+            "0": 2,
+            "1": 3
+          }
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertMany fails after multiple network errors",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": "alwaysOn",
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "insertMany",
+        "arguments": {
+          "documents": [
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            },
+            {
+              "_id": 4,
+              "x": 44
+            }
+          ],
+          "options": {
+            "ordered": true
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/insertOne-serverErrors.json b/driver-core/src/test/resources/retryable-writes/insertOne-serverErrors.json
new file mode 100644
index 00000000000..586aa13f204
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/insertOne-serverErrors.json
@@ -0,0 +1,1017 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "InsertOne succeeds after connection failure",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 10107,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 13436,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 13435,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after InterruptedDueToReplStateChange",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 11602,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 11600,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 189,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 91,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 7,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 6,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 9001,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 89,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne fails after Interrupted",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 11601,
+          "closeConnection": false
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsOmit": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after WriteConcernError InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 11600,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after WriteConcernError InterruptedDueToReplStateChange",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 11602,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after WriteConcernError PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 189,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne fails after multiple retryable writeConcernErrors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne fails after WriteConcernError Interrupted",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 11601,
+            "errmsg": "operation was interrupted"
+          }
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsOmit": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne fails after WriteConcernError WriteConcernFailed",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "writeConcernError": {
+            "code": 64,
+            "codeName": "WriteConcernFailed",
+            "errmsg": "waiting for replication timed out",
+            "errInfo": {
+              "wtimeout": true
+            }
+          }
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsOmit": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/insertOne.json b/driver-core/src/test/resources/retryable-writes/insertOne.json
new file mode 100644
index 00000000000..04dee6dd68a
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/insertOne.json
@@ -0,0 +1,139 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "InsertOne is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "insertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 33
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "InsertOne is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "insertOne",
+        "arguments": {
+          "document": {
+            "_id": 3,
+            "x": 33
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/replaceOne-serverErrors.json b/driver-core/src/test/resources/retryable-writes/replaceOne-serverErrors.json
new file mode 100644
index 00000000000..27448d16a01
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/replaceOne-serverErrors.json
@@ -0,0 +1,170 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "ReplaceOne succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/replaceOne.json b/driver-core/src/test/resources/retryable-writes/replaceOne.json
new file mode 100644
index 00000000000..e5b8cf8eabb
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/replaceOne.json
@@ -0,0 +1,144 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "ReplaceOne is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 111
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "ReplaceOne is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "replaceOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "replacement": {
+            "_id": 1,
+            "x": 111
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/updateMany.json b/driver-core/src/test/resources/retryable-writes/updateMany.json
new file mode 100644
index 00000000000..14288c2860d
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/updateMany.json
@@ -0,0 +1,57 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset",
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "UpdateMany ignores retryWrites",
+      "useMultipleMongoses": true,
+      "operation": {
+        "name": "updateMany",
+        "arguments": {
+          "filter": {},
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 2,
+          "modifiedCount": 2,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 23
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/updateOne-serverErrors.json b/driver-core/src/test/resources/retryable-writes/updateOne-serverErrors.json
new file mode 100644
index 00000000000..fcb6ec91915
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/updateOne-serverErrors.json
@@ -0,0 +1,173 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.7",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "UpdateOne succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "errorCode": 189
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne fails with a RetryableWriteError label after two connection failures",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "update"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "result": {
+          "errorLabelsContain": [
+            "RetryableWriteError"
+          ]
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/retryable-writes/updateOne.json b/driver-core/src/test/resources/retryable-writes/updateOne.json
new file mode 100644
index 00000000000..0f806dc3d84
--- /dev/null
+++ b/driver-core/src/test/resources/retryable-writes/updateOne.json
@@ -0,0 +1,288 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "3.6",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    }
+  ],
+  "tests": [
+    {
+      "description": "UpdateOne is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 1,
+          "modifiedCount": 1,
+          "upsertedCount": 0
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 12
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 1
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          }
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne with upsert is committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 3,
+            "x": 33
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 1,
+          "upsertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 34
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne with upsert is not committed on first attempt",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 3,
+            "x": 33
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "result": {
+          "matchedCount": 0,
+          "modifiedCount": 0,
+          "upsertedCount": 1,
+          "upsertedId": 3
+        },
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            },
+            {
+              "_id": 3,
+              "x": 34
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "UpdateOne with upsert is never committed",
+      "failPoint": {
+        "configureFailPoint": "onPrimaryTransactionalWrite",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failBeforeCommitExceptionCode": 1
+        }
+      },
+      "operation": {
+        "name": "updateOne",
+        "arguments": {
+          "filter": {
+            "_id": 3,
+            "x": 33
+          },
+          "update": {
+            "$inc": {
+              "x": 1
+            }
+          },
+          "upsert": true
+        }
+      },
+      "outcome": {
+        "error": true,
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": 2,
+              "x": 22
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_no_primary.json b/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_no_primary.json
index 2f398a85f00..74b2fd3ba40 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_no_primary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_no_primary.json
@@ -134,7 +134,7 @@
                     "arbiters": [],
                     "hosts": [],
                     "passives": [],
-                    "type": "Unknown"
+                    "type": "PossiblePrimary"
                   }
                 ]
               }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_primary.json b/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_primary.json
index 6c0d8819d02..d7bc920f892 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_primary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring-monitoring/replica_set_with_primary.json
@@ -121,8 +121,7 @@
                     "address": "a:27017",
                     "arbiters": [],
                     "hosts": [
-                      "a:27017",
-                      "b:27017"
+                      "a:27017", "b:27017"
                     ],
                     "passives": [],
                     "primary": "a:27017",
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/README.rst b/driver-core/src/test/resources/server-discovery-and-monitoring/README.rst
new file mode 100644
index 00000000000..d184d1d5498
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/README.rst
@@ -0,0 +1,135 @@
+=====================================
+Server Discovery And Monitoring Tests
+=====================================
+
+The YAML and JSON files in this directory tree are platform-independent tests
+that drivers can use to prove their conformance to the
+Server Discovery And Monitoring Spec.
+
+Version
+-------
+
+Files in the "specifications" repository have no version scheme. They are not
+tied to a MongoDB server version.
+
+Format
+------
+
+Each YAML file has the following keys:
+
+- description: A textual description of the test.
+- uri: A connection string.
+- phases: An array of "phase" objects.
+  A phase of the test optionally sends inputs to the client,
+  then tests the client's resulting TopologyDescription.
+
+Each phase object has two keys:
+
+- responses: (optional) An array of "response" objects. If not provided,
+  the test runner should construct the client and perform assertions specified
+  in the outcome object without processing any responses.
+- outcome: An "outcome" object representing the TopologyDescription.
+
+A response is a pair of values:
+
+- The source, for example "a:27017".
+  This is the address the client sent the "ismaster" command to.
+- An ismaster response, for example `{ok: 1, ismaster: true}`.
+  If the response includes an electionId it is shown in extended JSON like
+  `{"$oid": "000000000000000000000002"}`.
+  The empty response `{}` indicates a network error
+  when attempting to call "ismaster".
+
+In non-monitoring tests, an "outcome" represents the correct
+TopologyDescription that results from processing the responses in the phases
+so far. It has the following keys:
+
+- topologyType: A string like "ReplicaSetNoPrimary".
+- setName: A string with the expected replica set name, or null.
+- servers: An object whose keys are addresses like "a:27017", and whose values
+  are "server" objects.
+- logicalSessionTimeoutMinutes: null or an integer.
+- maxSetVersion: absent or an integer.
+- maxElectionId: absent or a BSON ObjectId.
+- compatible: absent or a bool.
+
+A "server" object represents a correct ServerDescription within the client's
+current TopologyDescription. It has the following keys:
+
+- type: A ServerType name, like "RSSecondary".
+- setName: A string with the expected replica set name, or null.
+- setVersion: absent or an integer.
+- electionId: absent, null, or an ObjectId.
+- logicalSessionTimeoutMinutes: absent, null, or an integer.
+- minWireVersion: absent or an integer.
+- maxWireVersion: absent or an integer.
+
+In monitoring tests, an "outcome" contains a list of SDAM events that should
+have been published by the client as a result of processing ismaster responses
+in the current phase. Any SDAM events published by the client during its
+construction (that is, prior to processing any of the responses) should be
+combined with the events published during processing of ismaster responses
+of the first phase of the test. A test MAY explicitly verify events published
+during client construction by providing an empty responses array for the
+first phase.
+
+
+Use as unittests
+----------------
+
+Mocking
+~~~~~~~
+
+Drivers should be able to test their server discovery and monitoring logic
+without any network I/O, by parsing ismaster responses from the test file
+and passing them into the driver code. Parts of the client and monitoring
+code may need to be mocked or subclassed to achieve this. `A reference
+implementation for PyMongo 3.x is available here
+<https://github.com/mongodb/mongo-python-driver/blob/3.0-dev/test/test_discovery_and_monitoring.py>`_.
+
+Initialization
+~~~~~~~~~~~~~~
+
+For each file, create a fresh client object initialized with the file's "uri".
+
+All files in the "single" directory include a connection string with one host
+and no "replicaSet" option.
+Set the client's initial TopologyType to Single, however that is achieved using the client's API.
+(The spec says "The user MUST be able to set the initial TopologyType to Single"
+without specifying how.)
+
+All files in the "sharded" directory include a connection string with multiple hosts
+and no "replicaSet" option.
+Set the client's initial TopologyType to Unknown or Sharded, depending on the client's API.
+
+All files in the "rs" directory include a connection string with a "replicaSet" option.
+Set the client's initial TopologyType to ReplicaSetNoPrimary.
+(For most clients, parsing a connection string with a "replicaSet" option
+automatically sets the TopologyType to ReplicaSetNoPrimary.)
+
+Set up a listener to collect SDAM events published by the client, including
+events published during client construction.
+
+Test Phases
+~~~~~~~~~~~
+
+For each phase in the file, parse the "responses" array.
+Pass in the responses in order to the driver code.
+If a response is the empty object `{}`, simulate a network error.
+
+For non-monitoring tests,
+once all responses are processed, assert that the phase's "outcome" object
+is equivalent to the driver's current TopologyDescription.
+
+For monitoring tests, once all responses are processed, assert that the
+events collected so far by the SDAM event listener are equivalent to the
+events specified in the phase.
+
+Some fields such as "logicalSessionTimeoutMinutes" or "compatible" were added
+later and haven't been added to all test files. If these fields are present,
+test that they are equivalent to the fields of the driver's current
+TopologyDescription.
+
+For monitoring tests, clear the list of events collected so far.
+
+Continue until all phases have been executed.
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/compatible.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/compatible.json
new file mode 100644
index 00000000000..d670770f6d1
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/compatible.json
@@ -0,0 +1,55 @@
+{
+  "description": "Replica set member with large maxWireVersion",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 1000
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "setName": "rs",
+        "logicalSessionTimeoutMinutes": null,
+        "compatible": true
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/compatible_unknown.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/compatible_unknown.json
new file mode 100644
index 00000000000..1105da8764a
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/compatible_unknown.json
@@ -0,0 +1,39 @@
+{
+  "description": "Replica set member and an unknown server",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "setName": "rs",
+        "logicalSessionTimeoutMinutes": null,
+        "compatible": true
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_arbiters.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_arbiters.json
index 6703186839c..ced7baeb653 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_arbiters.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_arbiters.json
@@ -1,38 +1,41 @@
 {
-    "description": "Discover arbiters", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "arbiters": [
-                            "b:27017"
-                        ], 
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Discover arbiters",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "arbiters": [
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_passives.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_passives.json
index 20fbe6ce45f..e46249d6686 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_passives.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_passives.json
@@ -1,72 +1,78 @@
 {
-    "description": "Discover passives", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "passives": [
-                            "b:27017"
-                        ], 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "passive": true, 
-                        "passives": [
-                            "b:27017"
-                        ], 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Discover passives",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "passives": [
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "passive": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "passives": [
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_primary.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_primary.json
index 97a24666327..ea2cce9b72b 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_primary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_primary.json
@@ -1,36 +1,39 @@
 {
-    "description": "Replica set discovery from primary", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Replica set discovery from primary",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_secondary.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_secondary.json
index b18fe87dc3e..7210b3845c7 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_secondary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discover_secondary.json
@@ -1,37 +1,40 @@
 {
-    "description": "Replica set discovery from secondary", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://b/?replicaSet=rs"
+  "description": "Replica set discovery from secondary",
+  "uri": "mongodb://b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discovery.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discovery.json
index a73fb820b11..57ed568e3b0 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discovery.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/discovery.json
@@ -1,163 +1,175 @@
 {
-    "description": "Replica set discovery", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "c:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }, 
-                    "c:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "d:27017": {
-                        "setName": null, 
-                        "type": "PossiblePrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "b:27017", 
-                            "c:27017", 
-                            "d:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "primary": "d:27017", 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }, 
-                    "c:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "d:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "e:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "d:27017", 
-                    {
-                        "hosts": [
-                            "b:27017", 
-                            "c:27017", 
-                            "d:27017", 
-                            "e:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }, 
-                    "c:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }, 
-                    "d:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "e:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "c:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Replica set discovery",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "primary": "d:27017",
+            "hosts": [
+              "b:27017",
+              "c:27017",
+              "d:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "d:27017": {
+            "type": "PossiblePrimary",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "d:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "b:27017",
+              "c:27017",
+              "d:27017",
+              "e:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "d:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "e:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "c:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "d:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "e:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/equal_electionids.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/equal_electionids.json
index 2a79de5bc1b..f8d20b350df 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/equal_electionids.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/equal_electionids.json
@@ -1,62 +1,71 @@
 {
-    "description": "New primary with equal electionId", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "setVersion": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
+  "description": "New primary with equal electionId",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "setVersion": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
         }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ghost_discovered.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ghost_discovered.json
index bb3189e5af5..bf22cbb0eb5 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ghost_discovered.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ghost_discovered.json
@@ -1,32 +1,35 @@
 {
-    "description": "Ghost discovered", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "RSGhost"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "ismaster": false, 
-                        "isreplicaset": true, 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "Ghost discovered",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "isreplicaset": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "RSGhost",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json
index 29e01a96b85..a67db57d0cb 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json
@@ -1,31 +1,34 @@
 {
-    "description": "Host list differs from seeds", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Host list differs from seeds",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ignore_secondary_electionid.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ignore_secondary_electionid.json
deleted file mode 100644
index 3ef3c5c0c71..00000000000
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ignore_secondary_electionid.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "description": "Ignore a secondary's electionId", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
-}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_arbiter.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_arbiter.json
new file mode 100644
index 00000000000..aa582208d6b
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_arbiter.json
@@ -0,0 +1,54 @@
+{
+  "description": "Incompatible arbiter",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "arbiterOnly": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 1
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSArbiter",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "setName": "rs",
+        "logicalSessionTimeoutMinutes": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_ghost.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_ghost.json
new file mode 100644
index 00000000000..088159c3aba
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_ghost.json
@@ -0,0 +1,49 @@
+{
+  "description": "Incompatible ghost",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "isreplicaset": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 1
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSGhost",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "setName": "rs",
+        "logicalSessionTimeoutMinutes": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_other.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_other.json
new file mode 100644
index 00000000000..b65d674b42b
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/incompatible_other.json
@@ -0,0 +1,54 @@
+{
+  "description": "Incompatible other",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "hidden": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 1
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSOther",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "setName": "rs",
+        "logicalSessionTimeoutMinutes": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ls_timeout.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ls_timeout.json
new file mode 100644
index 00000000000..6860742c9e9
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/ls_timeout.json
@@ -0,0 +1,273 @@
+{
+  "description": "Parse logicalSessionTimeoutMinutes from replica set",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017",
+              "d:27017",
+              "e:27017"
+            ],
+            "setName": "rs",
+            "logicalSessionTimeoutMinutes": 3,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown"
+          },
+          "c:27017": {
+            "type": "Unknown"
+          },
+          "d:27017": {
+            "type": "Unknown"
+          },
+          "e:27017": {
+            "type": "Unknown"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": 3,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "d:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "isreplicaset": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown"
+          },
+          "c:27017": {
+            "type": "Unknown"
+          },
+          "d:27017": {
+            "type": "RSGhost"
+          },
+          "e:27017": {
+            "type": "Unknown"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": 3,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "e:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017",
+              "d:27017",
+              "e:27017"
+            ],
+            "setName": "rs",
+            "arbiterOnly": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown"
+          },
+          "c:27017": {
+            "type": "Unknown"
+          },
+          "d:27017": {
+            "type": "RSGhost"
+          },
+          "e:27017": {
+            "type": "RSArbiter",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": 3,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017",
+              "d:27017",
+              "e:27017"
+            ],
+            "setName": "rs",
+            "logicalSessionTimeoutMinutes": 2,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "Unknown"
+          },
+          "d:27017": {
+            "type": "RSGhost"
+          },
+          "e:27017": {
+            "type": "RSArbiter",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": 2,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "c:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "setName": "rs",
+            "hidden": true,
+            "logicalSessionTimeoutMinutes": 1,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "RSOther",
+            "setName": "rs"
+          },
+          "d:27017": {
+            "type": "RSGhost"
+          },
+          "e:27017": {
+            "type": "RSArbiter",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": 2,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017",
+              "d:27017",
+              "e:27017"
+            ],
+            "setName": "rs",
+            "logicalSessionTimeoutMinutes": null,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "RSOther",
+            "setName": "rs"
+          },
+          "d:27017": {
+            "type": "RSGhost"
+          },
+          "e:27017": {
+            "type": "RSArbiter",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_reconfig.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_reconfig.json
index 3f927b945e9..336acff0236 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_reconfig.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_reconfig.json
@@ -1,61 +1,67 @@
 {
-    "description": "Member removed by reconfig", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "Member removed by reconfig",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_standalone.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_standalone.json
index 832e28761c5..a97dfabf52e 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_standalone.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/member_standalone.json
@@ -1,52 +1,58 @@
 {
-    "description": "Member brought up as standalone", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Unknown"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "ismaster": true, 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b"
+  "description": "Member brought up as standalone",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "Unknown",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary.json
index fb0e5e877ed..eb73b304bd9 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary.json
@@ -1,66 +1,72 @@
 {
-    "description": "New primary", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "New primary",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_electionid.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_electionid.json
index 12c2c98cb00..67f314b1edc 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_electionid.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_electionid.json
@@ -1,123 +1,144 @@
 {
-    "description": "New primary with greater setVersion and electionId", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
+  "description": "New primary with greater setVersion and electionId",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            }
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
         }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            }
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            }
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_setversion.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_setversion.json
index 6bd1e1d86a4..c1ec50c845c 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_setversion.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_new_setversion.json
@@ -1,123 +1,144 @@
 {
-    "description": "New primary with greater setVersion", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 2
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
+  "description": "New primary with greater setVersion",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            }
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
         }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
+        }
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json
index ab6fd32e6f9..7be79d2d3c9 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json
@@ -1,61 +1,67 @@
 {
-    "description": "New primary with wrong setName", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "wrong"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "New primary with wrong setName",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "wrong",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/non_rs_member.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/non_rs_member.json
index 703df441a8f..907c1651e02 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/non_rs_member.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/non_rs_member.json
@@ -1,26 +1,29 @@
 {
-    "description": "Non replicaSet member responds", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "Non replicaSet member responds",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/normalize_case.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/normalize_case.json
index 0253ea3a494..4d0b0ae629b 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/normalize_case.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/normalize_case.json
@@ -1,45 +1,48 @@
 {
-    "description": "Replica set case normalization", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "c:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "arbiters": [
-                            "C:27017"
-                        ], 
-                        "hosts": [
-                            "A:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "passives": [
-                            "B:27017"
-                        ], 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://A/?replicaSet=rs"
+  "description": "Replica set case normalization",
+  "uri": "mongodb://A/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "A:27017"
+            ],
+            "passives": [
+              "B:27017"
+            ],
+            "arbiters": [
+              "C:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/normalize_case_me.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/normalize_case_me.json
new file mode 100644
index 00000000000..e854e7fb432
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/normalize_case_me.json
@@ -0,0 +1,93 @@
+{
+  "description": "Replica set mixed case normalization",
+  "uri": "mongodb://A/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "me": "A:27017",
+            "hosts": [
+              "A:27017"
+            ],
+            "passives": [
+              "B:27017"
+            ],
+            "arbiters": [
+              "C:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "me": "B:27017",
+            "hosts": [
+              "A:27017"
+            ],
+            "passives": [
+              "B:27017"
+            ],
+            "arbiters": [
+              "C:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/null_election_id.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/null_election_id.json
index abab1f29423..3de0a74e413 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/null_election_id.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/null_election_id.json
@@ -1,174 +1,199 @@
 {
-    "description": "Primaries with and without electionIds", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "c:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "c:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "c:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": "rs",
-                        "setVersion": 1,
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "c:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "c:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
+  "description": "Primaries with and without electionIds",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "setVersion": 1,
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            }
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
         }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "setVersion": 1,
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "c:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_ghost.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_ghost.json
new file mode 100644
index 00000000000..897120f1fbc
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_ghost.json
@@ -0,0 +1,59 @@
+{
+  "description": "Primary becomes ghost",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "isreplicaset": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSGhost",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_mongos.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_mongos.json
new file mode 100644
index 00000000000..8d4967b7ddb
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_mongos.json
@@ -0,0 +1,54 @@
+{
+  "description": "Primary becomes mongos",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {},
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_standalone.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_standalone.json
index 28ad345df45..e35c75f4bc0 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_standalone.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_becomes_standalone.json
@@ -1,46 +1,52 @@
 {
-    "description": "Primary becomes standalone", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {}, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Primary becomes standalone",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {},
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_changes_set_name.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_changes_set_name.json
index 16bff4bcf65..d008326123b 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_changes_set_name.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_changes_set_name.json
@@ -1,51 +1,57 @@
 {
-    "description": "Primary changes setName", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {}, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "wrong"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Primary changes setName",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "wrong",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {},
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect.json
index 3e657f8e462..271ca5874e5 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect.json
@@ -1,49 +1,53 @@
 {
-    "description": "Disconnected from primary", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {}
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Disconnected from primary",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {}
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json
index 7771758dfe3..59c8faf1805 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json
@@ -1,197 +1,230 @@
 {
-    "description": "Disconnected from primary, reject primary with stale electionId", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {}
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000003"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000003"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000003"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs",
-                        "setVersion": 2,
-                        "type": "RSSecondary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs", 
-                        "setVersion": 2
-                    }
-                ]
-            ]
+  "description": "Disconnected from primary, reject primary with stale electionId",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            }
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
         }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {}
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000003"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000003"
+            }
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000003"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000003"
+            }
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000003"
+        }
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json
index 87246bb0724..beb023e4f41 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json
@@ -1,197 +1,230 @@
 {
-    "description": "Disconnected from primary, reject primary with stale setVersion", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 2
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {}
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 2
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs",
-                        "setVersion": 2,
-                        "type": "RSSecondary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs", 
-                        "setVersion": 2
-                    }
-                ]
-            ]
+  "description": "Disconnected from primary, reject primary with stale setVersion",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            }
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
         }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {}
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            }
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            }
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000002"
+        }
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json
new file mode 100644
index 00000000000..806fda37c3b
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json
@@ -0,0 +1,66 @@
+{
+  "description": "Secondary with mismatched 'me' tells us who the primary is",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "me": "c:27017",
+            "hosts": [
+              "b:27017"
+            ],
+            "setName": "rs",
+            "primary": "b:27017",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "b:27017": {
+            "type": "PossiblePrimary",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "me": "b:27017",
+            "hosts": [
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_mismatched_me.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_mismatched_me.json
index 13435eaed2b..8d18a6971f5 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_mismatched_me.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_mismatched_me.json
@@ -1,37 +1,40 @@
 {
-    "description": "Primary mismatched me", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "localhost:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "me": "a:27017", 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://localhost:27017/?replicaSet=rs"
+  "description": "Primary mismatched me",
+  "phases": [
+    {
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "setName": null,
+            "type": "Unknown"
+          },
+          "b:27017": {
+            "setName": null,
+            "type": "Unknown"
+          }
+        },
+        "setName": "rs",
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null
+      },
+      "responses": [
+        [
+          "localhost:27017",
+          {
+            "me": "a:27017",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "ismaster": true,
+            "ok": 1,
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ]
+    }
+  ],
+  "uri": "mongodb://localhost:27017/?replicaSet=rs"
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_reports_new_member.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_reports_new_member.json
new file mode 100644
index 00000000000..6ed55ab3d19
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_reports_new_member.json
@@ -0,0 +1,151 @@
+{
+  "description": "Primary reports a new member",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "c:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "primary": "b:27017",
+            "hosts": [
+              "a:27017",
+              "b:27017",
+              "c:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json
index 952b292670d..fdb250ffef4 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json
@@ -1,68 +1,74 @@
 {
-    "description": "Primary to no primary with mismatched me", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "me": "a:27017", 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "c:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "d:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "c:27017", 
-                            "d:27017"
-                        ], 
-                        "ismaster": true, 
-                        "me": "c:27017", 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Primary to no primary with mismatched me",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "me": "a:27017",
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "c:27017",
+              "d:27017"
+            ],
+            "me": "c:27017",
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "d:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_wrong_set_name.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_wrong_set_name.json
index e037b8ac177..eda47871730 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_wrong_set_name.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/primary_wrong_set_name.json
@@ -1,26 +1,29 @@
 {
-    "description": "Primary wrong setName", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {}, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "wrong"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Primary wrong setName",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "wrong",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {},
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/response_from_removed.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/response_from_removed.json
index eaaf786e96f..dd3562d7fc9 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/response_from_removed.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/response_from_removed.json
@@ -1,58 +1,64 @@
 {
-    "description": "Response from removed server", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "Response from removed server",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/rsother_discovered.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/rsother_discovered.json
index 230f52991b9..c575501d803 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/rsother_discovered.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/rsother_discovered.json
@@ -1,59 +1,64 @@
 {
-    "description": "RSOther discovered", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSOther"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSOther"
-                    }, 
-                    "c:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "d:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hidden": true, 
-                        "hosts": [
-                            "c:27017", 
-                            "d:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "c:27017", 
-                            "d:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": false, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "RSOther discovered",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hidden": true,
+            "hosts": [
+              "c:27017",
+              "d:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": false,
+            "hosts": [
+              "c:27017",
+              "d:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSOther",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSOther",
+            "setName": "rs"
+          },
+          "c:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "d:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/sec_not_auth.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/sec_not_auth.json
index e3c5154fe10..7d5e7000357 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/sec_not_auth.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/sec_not_auth.json
@@ -1,49 +1,54 @@
 {
-    "description": "Secondary's host list is not authoritative", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Secondary's host list is not authoritative",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "b:27017",
+              "c:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json
new file mode 100644
index 00000000000..6d3033eeeee
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json
@@ -0,0 +1,81 @@
+{
+  "description": "New primary",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 0,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_mismatched_me.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_mismatched_me.json
index 9b83f549992..d2a70f67889 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_mismatched_me.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_mismatched_me.json
@@ -1,37 +1,40 @@
 {
-    "description": "Secondary mismatched me", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "localhost:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": false, 
-                        "me": "a:27017", 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://localhost:27017/?replicaSet=rs"
+  "description": "Secondary mismatched me",
+  "phases": [
+    {
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "setName": null,
+            "type": "Unknown"
+          },
+          "b:27017": {
+            "setName": null,
+            "type": "Unknown"
+          }
+        },
+        "setName": "rs",
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null
+      },
+      "responses": [
+        [
+          "localhost:27017",
+          {
+            "me": "a:27017",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "ismaster": false,
+            "ok": 1,
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ]
+    }
+  ],
+  "uri": "mongodb://localhost:27017/?replicaSet=rs"
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json
index e1fd83981ce..4c132b633e1 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json
@@ -1,27 +1,30 @@
 {
-    "description": "Secondary wrong setName", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {}, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "wrong"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Secondary wrong setName",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "wrong",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {},
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json
index 6962177af54..73cbab7c5d5 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json
@@ -1,63 +1,69 @@
 {
-    "description": "Secondary wrong setName with primary", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "wrong"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "Secondary wrong setName with primary",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "wrong",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/setversion_without_electionid.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/setversion_without_electionid.json
index 0b7fe45a742..0500c6d1575 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/setversion_without_electionid.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/setversion_without_electionid.json
@@ -1,74 +1,82 @@
 {
-    "description": "setVersion is ignored if there is no electionId", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 2
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "setVersion is ignored if there is no electionId",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 2,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/stepdown_change_set_name.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/stepdown_change_set_name.json
index ed1caa2b826..39a4f532ddb 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/stepdown_change_set_name.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/stepdown_change_set_name.json
@@ -1,52 +1,58 @@
 {
-    "description": "Primary becomes a secondary with wrong setName", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {}, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "wrong"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+  "description": "Primary becomes a secondary with wrong setName",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017"
+            ],
+            "setName": "wrong",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {},
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/too_new.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/too_new.json
new file mode 100644
index 00000000000..945145af885
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/too_new.json
@@ -0,0 +1,55 @@
+{
+  "description": "Replica set member with large minWireVersion",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 999,
+            "maxWireVersion": 1000
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "setName": "rs",
+        "logicalSessionTimeoutMinutes": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/too_old.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/too_old.json
new file mode 100644
index 00000000000..3f9eadc4bca
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/too_old.json
@@ -0,0 +1,53 @@
+{
+  "description": "Replica set member with default maxWireVersion of 0",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "setName": "rs",
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ]
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          },
+          "b:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "setName": "rs",
+        "logicalSessionTimeoutMinutes": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/unexpected_mongos.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/unexpected_mongos.json
index 4b930b3bfc8..95c7aa9dce2 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/unexpected_mongos.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/unexpected_mongos.json
@@ -1,23 +1,26 @@
 {
-    "description": "Unexpected mongos", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {}, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://b/?replicaSet=rs"
+  "description": "Unexpected mongos",
+  "uri": "mongodb://b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {},
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json
index 913bbba80ad..16225d6b83f 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json
@@ -1,114 +1,135 @@
 {
-    "description": "Record max setVersion, even from primary without electionId", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "setName": "rs", 
-                        "setVersion": 1, 
-                        "type": "RSPrimary"
-                    }, 
-                    "b:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000001"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 2
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "electionId": null, 
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": "rs", 
-                        "setVersion": 2, 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetWithPrimary"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "electionId": {
-                            "$oid": "000000000000000000000002"
-                        }, 
-                        "hosts": [
-                            "a:27017", 
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs", 
-                        "setVersion": 1
-                    }
-                ]
-            ]
+  "description": "Record max setVersion, even from primary without electionId",
+  "uri": "mongodb://a/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000001"
+            }
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 1,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
         }
-    ], 
-    "uri": "mongodb://a/?replicaSet=rs"
+      }
+    },
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 2,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
+        }
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "setVersion": 1,
+            "electionId": {
+              "$oid": "000000000000000000000002"
+            },
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null,
+            "electionId": null
+          },
+          "b:27017": {
+            "type": "RSPrimary",
+            "setName": "rs",
+            "setVersion": 2
+          }
+        },
+        "topologyType": "ReplicaSetWithPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs",
+        "maxSetVersion": 2,
+        "maxElectionId": {
+          "$oid": "000000000000000000000001"
+        }
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/wrong_set_name.json b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/wrong_set_name.json
index 5c2c44ef61a..45be2f502b2 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/rs/wrong_set_name.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/rs/wrong_set_name.json
@@ -1,33 +1,36 @@
 {
-    "description": "Wrong setName", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": "rs", 
-                "topologyType": "ReplicaSetNoPrimary"
-            }, 
-            "responses": [
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "b:27017", 
-                            "c:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "wrong"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b/?replicaSet=rs"
+  "description": "Wrong setName",
+  "uri": "mongodb://a,b/?replicaSet=rs",
+  "phases": [
+    {
+      "responses": [
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "b:27017",
+              "c:27017"
+            ],
+            "setName": "wrong",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "ReplicaSetNoPrimary",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": "rs"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/compatible.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/compatible.json
new file mode 100644
index 00000000000..3dae1f7ea1e
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/compatible.json
@@ -0,0 +1,46 @@
+{
+  "description": "Multiple mongoses with large maxWireVersion",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 1000
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null,
+        "compatible": true
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json
new file mode 100644
index 00000000000..96f8dec17ac
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json
@@ -0,0 +1,87 @@
+{
+  "description": "Parse logicalSessionTimeoutMinutes from mongoses",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "logicalSessionTimeoutMinutes": 1,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "logicalSessionTimeoutMinutes": 2,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": 1,
+        "setName": null
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "logicalSessionTimeoutMinutes": 1,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/mongos_disconnect.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/mongos_disconnect.json
index f3beb558e49..04015694a8d 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/mongos_disconnect.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/mongos_disconnect.json
@@ -1,88 +1,97 @@
 {
-    "description": "Mongos disconnect", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Sharded"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Sharded"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {}
-                ]
-            ]
-        }, 
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Sharded"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b"
+  "description": "Mongos disconnect",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {}
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    },
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/multiple_mongoses.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/multiple_mongoses.json
index 345c503e5b3..6e60fd05c7d 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/multiple_mongoses.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/multiple_mongoses.json
@@ -1,40 +1,45 @@
 {
-    "description": "Multiple mongoses", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Sharded"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b"
+  "description": "Multiple mongoses",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/non_mongos_removed.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/non_mongos_removed.json
index 67651f9ae9f..58cf7c07d78 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/non_mongos_removed.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/non_mongos_removed.json
@@ -1,39 +1,44 @@
 {
-    "description": "Non-Mongos server in sharded cluster", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Sharded"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ], 
-                [
-                    "b:27017", 
-                    {
-                        "hosts": [
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b"
+  "description": "Non-Mongos server in sharded cluster",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/normalize_uri_case.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/normalize_uri_case.json
index be886b29cca..4aa7cb08b61 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/normalize_uri_case.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/normalize_uri_case.json
@@ -1,23 +1,24 @@
 {
-    "description": "Normalize URI case", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }, 
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Unknown"
-            }, 
-            "responses": []
-        }
-    ], 
-    "uri": "mongodb://A,B"
+  "description": "Normalize URI case",
+  "uri": "mongodb://A,B",
+  "phases": [
+    {
+      "responses": [],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "Unknown",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/too_new.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/too_new.json
new file mode 100644
index 00000000000..9521e117899
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/too_new.json
@@ -0,0 +1,44 @@
+{
+  "description": "Multiple mongoses with large minWireVersion",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 999,
+            "maxWireVersion": 1000
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid"
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/too_old.json b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/too_old.json
new file mode 100644
index 00000000000..6bd187f61db
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/sharded/too_old.json
@@ -0,0 +1,44 @@
+{
+  "description": "Multiple mongoses with default maxWireVersion of 0",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 2,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "b:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid"
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          },
+          "b:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Sharded",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/compatible.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/compatible.json
new file mode 100644
index 00000000000..ee6b847ade7
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/compatible.json
@@ -0,0 +1,31 @@
+{
+  "description": "Standalone with large maxWireVersion",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Standalone",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null,
+        "compatible": true
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_external_ip.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_external_ip.json
index 7ef5c6226e5..44581501862 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_external_ip.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_external_ip.json
@@ -1,31 +1,34 @@
 {
-    "description": "Direct connection to RSPrimary via external IP", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "b:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Direct connection to RSPrimary via external IP",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_mongos.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_mongos.json
index 51a396c0e82..a7fa0794901 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_mongos.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_mongos.json
@@ -1,28 +1,31 @@
 {
-    "description": "Connect to mongos", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Mongos"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "msg": "isdbgrid", 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Connect to mongos",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "msg": "isdbgrid",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Mongos",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json
index 3c3219b0b29..3ef374d6f1e 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json
@@ -1,32 +1,36 @@
 {
-    "description": "Connect to RSArbiter", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSArbiter"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "arbiterOnly": true, 
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Connect to RSArbiter",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "arbiterOnly": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSArbiter",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsprimary.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsprimary.json
index f864c0e0467..bd5aaf7f044 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsprimary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rsprimary.json
@@ -1,31 +1,35 @@
 {
-    "description": "Connect to RSPrimary", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSPrimary"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": true, 
-                        "ok": 1, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Connect to RSPrimary",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSPrimary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rssecondary.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rssecondary.json
index d23833f1f5f..3b4f3c8c5ad 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rssecondary.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_rssecondary.json
@@ -1,32 +1,36 @@
 {
-    "description": "Connect to RSSecondary", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": "rs", 
-                        "type": "RSSecondary"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "hosts": [
-                            "a:27017"
-                        ], 
-                        "ismaster": false, 
-                        "ok": 1, 
-                        "secondary": true, 
-                        "setName": "rs"
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Connect to RSSecondary",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "secondary": true,
+            "hosts": [
+              "a:27017",
+              "b:27017"
+            ],
+            "setName": "rs",
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "RSSecondary",
+            "setName": "rs"
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_slave.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_slave.json
index 912e514a8d1..a40debd1838 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_slave.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_slave.json
@@ -1,27 +1,30 @@
 {
-    "description": "Direct connection to slave", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Standalone"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": false, 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Direct connection to slave",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": false,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Standalone",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_standalone.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_standalone.json
index f4c40b13fcb..2ecff9b9ae2 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_standalone.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/direct_connection_standalone.json
@@ -1,27 +1,30 @@
 {
-    "description": "Connect to standalone", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Standalone"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Connect to standalone",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Standalone",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/ls_timeout_standalone.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/ls_timeout_standalone.json
new file mode 100644
index 00000000000..ae6c8ba11be
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/ls_timeout_standalone.json
@@ -0,0 +1,31 @@
+{
+  "description": "Parse logicalSessionTimeoutMinutes from standalone",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "logicalSessionTimeoutMinutes": 7,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Standalone",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": 7,
+        "setName": null
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/not_ok_response.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/not_ok_response.json
index 2b25cdcc78c..06f71305dc0 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/not_ok_response.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/not_ok_response.json
@@ -1,34 +1,39 @@
 {
-    "description": "Handle a not-ok ismaster response", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "ok": 1
-                    }
-                ], 
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "ok": 0
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Handle a not-ok ismaster response",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ],
+        [
+          "a:27017",
+          {
+            "ok": 0,
+            "ismaster": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/standalone_removed.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/standalone_removed.json
index eebb0dd72fd..4c363ffffb8 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/standalone_removed.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/standalone_removed.json
@@ -1,27 +1,30 @@
 {
-    "description": "Standalone removed from multi-server topology", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "b:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Unknown"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {
-                        "ismaster": true, 
-                        "ok": 1
-                    }
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a,b"
+  "description": "Standalone removed from multi-server topology",
+  "uri": "mongodb://a,b",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "minWireVersion": 0,
+            "maxWireVersion": 6
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "b:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "Unknown",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/too_new.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/too_new.json
new file mode 100644
index 00000000000..38e4621d60f
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/too_new.json
@@ -0,0 +1,31 @@
+{
+  "description": "Standalone with large minWireVersion",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true,
+            "minWireVersion": 999,
+            "maxWireVersion": 1000
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Standalone",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/too_old.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/too_old.json
new file mode 100644
index 00000000000..fbf68262c02
--- /dev/null
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/too_old.json
@@ -0,0 +1,29 @@
+{
+  "description": "Standalone with default maxWireVersion of 0",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {
+            "ok": 1,
+            "ismaster": true
+          }
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Standalone",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null,
+        "compatible": false
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-discovery-and-monitoring/single/unavailable_seed.json b/driver-core/src/test/resources/server-discovery-and-monitoring/single/unavailable_seed.json
index 09eb7fda1ce..e9cce02ebfd 100644
--- a/driver-core/src/test/resources/server-discovery-and-monitoring/single/unavailable_seed.json
+++ b/driver-core/src/test/resources/server-discovery-and-monitoring/single/unavailable_seed.json
@@ -1,24 +1,25 @@
 {
-    "description": "Unavailable seed", 
-    "phases": [
-        {
-            "outcome": {
-                "servers": {
-                    "a:27017": {
-                        "setName": null, 
-                        "type": "Unknown"
-                    }
-                }, 
-                "setName": null, 
-                "topologyType": "Single"
-            }, 
-            "responses": [
-                [
-                    "a:27017", 
-                    {}
-                ]
-            ]
-        }
-    ], 
-    "uri": "mongodb://a"
+  "description": "Unavailable seed",
+  "uri": "mongodb://a",
+  "phases": [
+    {
+      "responses": [
+        [
+          "a:27017",
+          {}
+        ]
+      ],
+      "outcome": {
+        "servers": {
+          "a:27017": {
+            "type": "Unknown",
+            "setName": null
+          }
+        },
+        "topologyType": "Single",
+        "logicalSessionTimeoutMinutes": null,
+        "setName": null
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/rtt/first_value.json b/driver-core/src/test/resources/server-selection/rtt/first_value.json
index 2e921956068..421944da366 100755
--- a/driver-core/src/test/resources/server-selection/rtt/first_value.json
+++ b/driver-core/src/test/resources/server-selection/rtt/first_value.json
@@ -1,5 +1,5 @@
 {
-    "avg_rtt_ms": "NULL", 
-    "new_avg_rtt": 10, 
-    "new_rtt_ms": 10
+  "avg_rtt_ms": "NULL",
+  "new_rtt_ms": 10,
+  "new_avg_rtt": 10
 }
diff --git a/driver-core/src/test/resources/server-selection/rtt/first_value_zero.json b/driver-core/src/test/resources/server-selection/rtt/first_value_zero.json
index 1953a742a4c..d5bfc41b25d 100755
--- a/driver-core/src/test/resources/server-selection/rtt/first_value_zero.json
+++ b/driver-core/src/test/resources/server-selection/rtt/first_value_zero.json
@@ -1,5 +1,5 @@
 {
-    "avg_rtt_ms": "NULL", 
-    "new_avg_rtt": 0, 
-    "new_rtt_ms": 0
+  "avg_rtt_ms": "NULL",
+  "new_rtt_ms": 0,
+  "new_avg_rtt": 0
 }
diff --git a/driver-core/src/test/resources/server-selection/rtt/value_test_1.json b/driver-core/src/test/resources/server-selection/rtt/value_test_1.json
index bfa3eb32bf0..ed6a80ce29b 100755
--- a/driver-core/src/test/resources/server-selection/rtt/value_test_1.json
+++ b/driver-core/src/test/resources/server-selection/rtt/value_test_1.json
@@ -1,5 +1,5 @@
 {
-    "avg_rtt_ms": 0, 
-    "new_avg_rtt": 1.0, 
-    "new_rtt_ms": 5
+  "avg_rtt_ms": 0,
+  "new_rtt_ms": 5,
+  "new_avg_rtt": 1
 }
diff --git a/driver-core/src/test/resources/server-selection/rtt/value_test_2.json b/driver-core/src/test/resources/server-selection/rtt/value_test_2.json
index 0614cc3f031..ccb5a0173b6 100755
--- a/driver-core/src/test/resources/server-selection/rtt/value_test_2.json
+++ b/driver-core/src/test/resources/server-selection/rtt/value_test_2.json
@@ -1,5 +1,5 @@
 {
-    "avg_rtt_ms": 3.1, 
-    "new_avg_rtt": 9.68, 
-    "new_rtt_ms": 36
+  "avg_rtt_ms": 3.1,
+  "new_rtt_ms": 36,
+  "new_avg_rtt": 9.68
 }
diff --git a/driver-core/src/test/resources/server-selection/rtt/value_test_3.json b/driver-core/src/test/resources/server-selection/rtt/value_test_3.json
index c42edc1087b..6921c94d36c 100755
--- a/driver-core/src/test/resources/server-selection/rtt/value_test_3.json
+++ b/driver-core/src/test/resources/server-selection/rtt/value_test_3.json
@@ -1,5 +1,5 @@
 {
-    "avg_rtt_ms": 9.12, 
-    "new_avg_rtt": 9.12, 
-    "new_rtt_ms": 9.12
+  "avg_rtt_ms": 9.12,
+  "new_rtt_ms": 9.12,
+  "new_avg_rtt": 9.12
 }
diff --git a/driver-core/src/test/resources/server-selection/rtt/value_test_4.json b/driver-core/src/test/resources/server-selection/rtt/value_test_4.json
index f65b362eca1..d9ce3800b82 100755
--- a/driver-core/src/test/resources/server-selection/rtt/value_test_4.json
+++ b/driver-core/src/test/resources/server-selection/rtt/value_test_4.json
@@ -1,5 +1,5 @@
 {
-    "avg_rtt_ms": 1, 
-    "new_avg_rtt": 200.8, 
-    "new_rtt_ms": 1000
+  "avg_rtt_ms": 1,
+  "new_rtt_ms": 1000,
+  "new_avg_rtt": 200.8
 }
diff --git a/driver-core/src/test/resources/server-selection/rtt/value_test_5.json b/driver-core/src/test/resources/server-selection/rtt/value_test_5.json
index 4c86e05a24a..9ae33bc1434 100755
--- a/driver-core/src/test/resources/server-selection/rtt/value_test_5.json
+++ b/driver-core/src/test/resources/server-selection/rtt/value_test_5.json
@@ -1,5 +1,5 @@
 {
-    "avg_rtt_ms": 0, 
-    "new_avg_rtt": 0.05, 
-    "new_rtt_ms": 0.25
+  "avg_rtt_ms": 0,
+  "new_rtt_ms": 0.25,
+  "new_avg_rtt": 0.05
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json
index 9677494ad64..aa48679e866 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest.json
@@ -1,60 +1,60 @@
 {
-    "in_latency_window": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Nearest", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
-        }, 
-        {
-            "address": "c:27017", 
-            "avg_rtt_ms": 100, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.json
new file mode 100644
index 00000000000..1fcfd52a477
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_multiple.json
@@ -0,0 +1,68 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 10,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 20,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 10,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 20,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 10,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 20,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_no_tag_set.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_no_tag_set.json
new file mode 100644
index 00000000000..7c3d9bef12b
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_no_tag_set.json
@@ -0,0 +1,71 @@
+{
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "tags": {
+        "data_center": "nyc"
+      },
+      "type": "RSSecondary"
+    }
+  ],
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "tags": {
+        "data_center": "nyc"
+      },
+      "type": "RSSecondary"
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "tags": {
+        "data_center": "nyc"
+      },
+      "type": "RSSecondary"
+    }
+  ],
+  "topology_description": {
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "tags": {
+          "data_center": "nyc"
+        },
+        "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "tags": {
+          "data_center": "nyc"
+        },
+        "type": "RSSecondary"
+      },
+      {
+        "address": "d:27017",
+        "avg_rtt_ms": 5,
+        "tags": {
+          "data_center": "nyc"
+        },
+        "type": "RSArbiter"
+      },
+      {
+        "address": "e:27017",
+        "avg_rtt_ms": 5,
+        "tags": {
+          "data_center": "nyc"
+        },
+        "type": "RSGhost"
+      }
+    ],
+    "type": "ReplicaSetNoPrimary"
+  }
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json
index 9aac3327d15..b72895d8a83 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Nearest_non_matching.json
@@ -1,34 +1,34 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Nearest", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.json
new file mode 100644
index 00000000000..4d286af830f
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimary.json
@@ -0,0 +1,21 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "PossiblePrimary"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Primary",
+    "tag_sets": [
+      {}
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.json
new file mode 100644
index 00000000000..bf9c70b420e
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.json
@@ -0,0 +1,21 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "PossiblePrimary"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {}
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json
index a4102fe8235..f0f3fa9ea15 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Primary.json
@@ -1,32 +1,29 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Primary", 
-        "tag_sets": [
-            {}
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Primary"
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json
index 53b66c0b82d..f87ef4f6170 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred.json
@@ -1,58 +1,58 @@
 {
-    "in_latency_window": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "PrimaryPreferred", 
-        "tag_sets": [
-            {}
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
-        }, 
-        {
-            "address": "c:27017", 
-            "avg_rtt_ms": 100, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "tag_sets": [
+      {}
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json
index 6a3702d00db..ee962299270 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.json
@@ -1,34 +1,34 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "PrimaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json
index 325a7550bb3..3b8f1e97cd6 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary.json
@@ -1,60 +1,60 @@
 {
-    "in_latency_window": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Secondary", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
-        }, 
-        {
-            "address": "c:27017", 
-            "avg_rtt_ms": 100, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json
index 9012b76111d..c3142ec1154 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred.json
@@ -1,60 +1,60 @@
 {
-    "in_latency_window": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
-        }, 
-        {
-            "address": "c:27017", 
-            "avg_rtt_ms": 100, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json
index bad36648bfc..a2c18bb7d22 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.json
@@ -1,34 +1,34 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.json
new file mode 100644
index 00000000000..b319918e926
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags.json
@@ -0,0 +1,60 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "rack": "one",
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "rack": "two",
+          "data_center": "sf"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "nyc",
+        "rack": "one"
+      },
+      {
+        "other_tag": "doesntexist"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "rack": "one",
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "rack": "one",
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.json
new file mode 100644
index 00000000000..8f64d95ecb8
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_multi_tags2.json
@@ -0,0 +1,60 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "rack": "one",
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "rack": "two",
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "nyc",
+        "rack": "one"
+      },
+      {
+        "other_tag": "doesntexist"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "rack": "one",
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "rack": "one",
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json
index 4d8bd189177..4931e1019a4 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/read/Secondary_non_matching.json
@@ -1,34 +1,34 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Secondary", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json
index db2fb398d15..e136cf12a4f 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetNoPrimary/write/SecondaryPreferred.json
@@ -1,34 +1,34 @@
 {
-    "in_latency_window": [], 
-    "operation": "write", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }
-        ], 
-        "type": "ReplicaSetNoPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetNoPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json
index 5975f770ce7..cfe4965938d 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest.json
@@ -1,76 +1,76 @@
 {
-    "in_latency_window": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Nearest", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
-        }, 
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
-        }, 
-        {
-            "address": "c:27017", 
-            "avg_rtt_ms": 100, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.json
new file mode 100644
index 00000000000..67296d434fe
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_multiple.json
@@ -0,0 +1,84 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 10,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 20,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 10,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 20,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 10,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 20,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json
index af890cd596d..a3a85c9a83e 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Nearest_non_matching.json
@@ -1,42 +1,42 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Nearest", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json
index de001ca0bc8..8da1482e967 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Primary.json
@@ -1,58 +1,55 @@
 {
-    "in_latency_window": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Primary", 
-        "tag_sets": [
-            {}
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Primary"
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json
index b413745dd28..306171f3a20 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred.json
@@ -1,58 +1,58 @@
 {
-    "in_latency_window": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "PrimaryPreferred", 
-        "tag_sets": [
-            {}
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "tag_sets": [
+      {}
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json
index 12b20040a8b..722f1cfb1a9 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.json
@@ -1,60 +1,60 @@
 {
-    "in_latency_window": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "PrimaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json
index faf3b70a6bb..23864a278c4 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary.json
@@ -1,68 +1,68 @@
 {
-    "in_latency_window": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Secondary", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
-        }, 
-        {
-            "address": "c:27017", 
-            "avg_rtt_ms": 100, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json
index fd549a23271..d07c24218d3 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred.json
@@ -1,68 +1,68 @@
 {
-    "in_latency_window": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "b:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
-        }, 
-        {
-            "address": "c:27017", 
-            "avg_rtt_ms": 100, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSSecondary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    },
+    {
+      "address": "c:27017",
+      "avg_rtt_ms": 100,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "b:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSSecondary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json
index 948a7286336..f893cc9f828 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.json
@@ -1,60 +1,60 @@
 {
-    "in_latency_window": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.json
new file mode 100644
index 00000000000..a74a2dbf33b
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/SecondaryPreferred_tags.json
@@ -0,0 +1,52 @@
+{
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "sf"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 5,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json
index 27213d35918..12721806665 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/read/Secondary_non_matching.json
@@ -1,42 +1,42 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "Secondary", 
-        "tag_sets": [
-            {
-                "data_center": "sf"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
-    }
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "sf"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json
index a57ee31be9b..65ab3dc6404 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/ReplicaSetWithPrimary/write/SecondaryPreferred.json
@@ -1,60 +1,60 @@
 {
-    "in_latency_window": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+  "topology_description": {
+    "type": "ReplicaSetWithPrimary",
+    "servers": [
+      {
+        "address": "b:27017",
+        "avg_rtt_ms": 5,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "operation": "write", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 26, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "RSPrimary"
+      },
+      {
+        "address": "c:27017",
+        "avg_rtt_ms": 100,
+        "type": "RSSecondary",
+        "tags": {
+          "data_center": "nyc"
         }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "b:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "c:27017", 
-                "avg_rtt_ms": 100, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSSecondary"
-            }, 
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 26, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "RSPrimary"
-            }
-        ], 
-        "type": "ReplicaSetWithPrimary"
+      },
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 26,
+        "type": "RSPrimary",
+        "tags": {
+          "data_center": "nyc"
+        }
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 26,
+      "type": "RSPrimary",
+      "tags": {
+        "data_center": "nyc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Nearest.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Nearest.json
new file mode 100644
index 00000000000..705a784a0b1
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Nearest.json
@@ -0,0 +1,45 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Primary.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Primary.json
new file mode 100644
index 00000000000..7a321be2bbd
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Primary.json
@@ -0,0 +1,40 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Primary"
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/PrimaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/PrimaryPreferred.json
new file mode 100644
index 00000000000..e9bc1421f95
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/PrimaryPreferred.json
@@ -0,0 +1,45 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Secondary.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Secondary.json
new file mode 100644
index 00000000000..49813f7b9e3
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/Secondary.json
@@ -0,0 +1,45 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/SecondaryPreferred.json
index e45556f4cbd..62fa13f297d 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/read/SecondaryPreferred.json
@@ -1,60 +1,45 @@
 {
-    "in_latency_window": [
-        {
-            "address": "g:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "Mongos"
-        }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "g:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "Mongos"
-        }, 
-        {
-            "address": "h:27017", 
-            "avg_rtt_ms": 35, 
-            "tags": {
-                "data_center": "dc"
-            }, 
-            "type": "Mongos"
-        }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "g:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "Mongos"
-            }, 
-            {
-                "address": "h:27017", 
-                "avg_rtt_ms": 35, 
-                "tags": {
-                    "data_center": "dc"
-                }, 
-                "type": "Mongos"
-            }
-        ], 
-        "type": "Sharded"
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
     }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Nearest.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Nearest.json
new file mode 100644
index 00000000000..aef7f02ec70
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Nearest.json
@@ -0,0 +1,45 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "Nearest",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Primary.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Primary.json
new file mode 100644
index 00000000000..f6ce2e75c1b
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Primary.json
@@ -0,0 +1,40 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "Primary"
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/PrimaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/PrimaryPreferred.json
new file mode 100644
index 00000000000..25f56a53596
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/PrimaryPreferred.json
@@ -0,0 +1,45 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "PrimaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Secondary.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Secondary.json
new file mode 100644
index 00000000000..1fa026f716f
--- /dev/null
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/Secondary.json
@@ -0,0 +1,45 @@
+{
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "Secondary",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/SecondaryPreferred.json
index 4262ce2efb1..f9467472aa8 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/Sharded/write/SecondaryPreferred.json
@@ -1,60 +1,45 @@
 {
-    "in_latency_window": [
-        {
-            "address": "g:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "Mongos"
-        }
-    ], 
-    "operation": "write", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "g:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "nyc"
-            }, 
-            "type": "Mongos"
-        }, 
-        {
-            "address": "h:27017", 
-            "avg_rtt_ms": 35, 
-            "tags": {
-                "data_center": "dc"
-            }, 
-            "type": "Mongos"
-        }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "g:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "nyc"
-                }, 
-                "type": "Mongos"
-            }, 
-            {
-                "address": "h:27017", 
-                "avg_rtt_ms": 35, 
-                "tags": {
-                    "data_center": "dc"
-                }, 
-                "type": "Mongos"
-            }
-        ], 
-        "type": "Sharded"
+  "topology_description": {
+    "type": "Sharded",
+    "servers": [
+      {
+        "address": "g:27017",
+        "avg_rtt_ms": 5,
+        "type": "Mongos"
+      },
+      {
+        "address": "h:27017",
+        "avg_rtt_ms": 35,
+        "type": "Mongos"
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    },
+    {
+      "address": "h:27017",
+      "avg_rtt_ms": 35,
+      "type": "Mongos"
     }
+  ],
+  "in_latency_window": [
+    {
+      "address": "g:27017",
+      "avg_rtt_ms": 5,
+      "type": "Mongos"
+    }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Single/read/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Single/read/SecondaryPreferred.json
index 86c704c1470..e60496dfdfe 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/Single/read/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/Single/read/SecondaryPreferred.json
@@ -1,44 +1,44 @@
 {
-    "in_latency_window": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "dc"
-            }, 
-            "type": "Standalone"
+  "topology_description": {
+    "type": "Single",
+    "servers": [
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 5,
+        "type": "Standalone",
+        "tags": {
+          "data_center": "dc"
         }
-    ], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "dc"
-            }, 
-            "type": "Standalone"
-        }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "dc"
-                }, 
-                "type": "Standalone"
-            }
-        ], 
-        "type": "Single"
+      }
+    ]
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 5,
+      "type": "Standalone",
+      "tags": {
+        "data_center": "dc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 5,
+      "type": "Standalone",
+      "tags": {
+        "data_center": "dc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Single/write/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Single/write/SecondaryPreferred.json
index be8771caeba..34fe91d5a21 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/Single/write/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/Single/write/SecondaryPreferred.json
@@ -1,44 +1,44 @@
 {
-    "in_latency_window": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "dc"
-            }, 
-            "type": "Standalone"
+  "topology_description": {
+    "type": "Single",
+    "servers": [
+      {
+        "address": "a:27017",
+        "avg_rtt_ms": 5,
+        "type": "Standalone",
+        "tags": {
+          "data_center": "dc"
         }
-    ], 
-    "operation": "write", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [
-        {
-            "address": "a:27017", 
-            "avg_rtt_ms": 5, 
-            "tags": {
-                "data_center": "dc"
-            }, 
-            "type": "Standalone"
-        }
-    ], 
-    "topology_description": {
-        "servers": [
-            {
-                "address": "a:27017", 
-                "avg_rtt_ms": 5, 
-                "tags": {
-                    "data_center": "dc"
-                }, 
-                "type": "Standalone"
-            }
-        ], 
-        "type": "Single"
+      }
+    ]
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 5,
+      "type": "Standalone",
+      "tags": {
+        "data_center": "dc"
+      }
+    }
+  ],
+  "in_latency_window": [
+    {
+      "address": "a:27017",
+      "avg_rtt_ms": 5,
+      "type": "Standalone",
+      "tags": {
+        "data_center": "dc"
+      }
     }
+  ]
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Unknown/read/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Unknown/read/SecondaryPreferred.json
index ce0d8376b3f..0ae8075fba3 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/Unknown/read/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/Unknown/read/SecondaryPreferred.json
@@ -1,17 +1,17 @@
 {
-    "in_latency_window": [], 
-    "operation": "read", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [], 
-        "type": "Unknown"
-    }
+  "topology_description": {
+    "type": "Unknown",
+    "servers": []
+  },
+  "operation": "read",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/server-selection/server_selection/Unknown/write/SecondaryPreferred.json b/driver-core/src/test/resources/server-selection/server_selection/Unknown/write/SecondaryPreferred.json
index 4d6f79b46b0..a70eece62cd 100755
--- a/driver-core/src/test/resources/server-selection/server_selection/Unknown/write/SecondaryPreferred.json
+++ b/driver-core/src/test/resources/server-selection/server_selection/Unknown/write/SecondaryPreferred.json
@@ -1,17 +1,17 @@
 {
-    "in_latency_window": [], 
-    "operation": "write", 
-    "read_preference": {
-        "mode": "SecondaryPreferred", 
-        "tag_sets": [
-            {
-                "data_center": "nyc"
-            }
-        ]
-    }, 
-    "suitable_servers": [], 
-    "topology_description": {
-        "servers": [], 
-        "type": "Unknown"
-    }
+  "topology_description": {
+    "type": "Unknown",
+    "servers": []
+  },
+  "operation": "write",
+  "read_preference": {
+    "mode": "SecondaryPreferred",
+    "tag_sets": [
+      {
+        "data_center": "nyc"
+      }
+    ]
+  },
+  "suitable_servers": [],
+  "in_latency_window": []
 }
diff --git a/driver-core/src/test/resources/sessions/dirty-session-errors.json b/driver-core/src/test/resources/sessions/dirty-session-errors.json
new file mode 100644
index 00000000000..a964b208c51
--- /dev/null
+++ b/driver-core/src/test/resources/sessions/dirty-session-errors.json
@@ -0,0 +1,836 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "session-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    }
+  ],
+  "tests": [
+    {
+      "description": "Clean explicit session is not discarded",
+      "operations": [
+        {
+          "name": "assertSessionNotDirty",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "assertSessionNotDirty",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "endSession",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertSameLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0"
+            },
+            "command_name": "insert",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "filter": {
+                "_id": -1
+              },
+              "lsid": "session0"
+            },
+            "command_name": "find",
+            "database_name": "session-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Clean implicit session is not discarded",
+      "operations": [
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertSameLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true
+            },
+            "command_name": "insert",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "filter": {
+                "_id": -1
+              }
+            },
+            "command_name": "find",
+            "database_name": "session-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Dirty explicit session is discarded",
+      "clientOptions": {
+        "retryWrites": true
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "assertSessionNotDirty",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "assertSessionDirty",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "assertSessionDirty",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "endSession",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertDifferentLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              }
+            },
+            "command_name": "insert",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              }
+            },
+            "command_name": "insert",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              }
+            },
+            "command_name": "insert",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "filter": {
+                "_id": -1
+              }
+            },
+            "command_name": "find",
+            "database_name": "session-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Dirty explicit session is discarded (non-bulk write)",
+      "clientOptions": {
+        "retryWrites": true
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "assertSessionNotDirty",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 1
+          }
+        },
+        {
+          "name": "assertSessionDirty",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "endSession",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertDifferentLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 1
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 1
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "filter": {
+                "_id": -1
+              }
+            },
+            "command_name": "find",
+            "database_name": "session-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Dirty implicit session is discarded (write)",
+      "clientOptions": {
+        "retryWrites": true
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertDifferentLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "txnNumber": {
+                "$numberLong": "1"
+              }
+            },
+            "command_name": "insert",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "txnNumber": {
+                "$numberLong": "1"
+              }
+            },
+            "command_name": "insert",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "filter": {
+                "_id": -1
+              }
+            },
+            "command_name": "find",
+            "database_name": "session-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Dirty implicit session is discarded (non-bulk write)",
+      "clientOptions": {
+        "retryWrites": true
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "findAndModify"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 1
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertDifferentLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 1
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 1
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "session-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "filter": {
+                "_id": -1
+              }
+            },
+            "command_name": "find",
+            "database_name": "session-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Dirty implicit session is discarded (read)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ]
+          },
+          "error": true
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertDifferentLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "Dirty implicit session is discarded (non-cursor returning read)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "error": true
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": -1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "assertDifferentLsidOnLastTwoCommands",
+          "object": "testRunner"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/driver-core/src/test/resources/transactions-convenient-api/README.rst b/driver-core/src/test/resources/transactions-convenient-api/README.rst
new file mode 100644
index 00000000000..eabf244a6e3
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/README.rst
@@ -0,0 +1,220 @@
+=====================================
+Convenient API for Transactions Tests
+=====================================
+
+.. contents::
+
+----
+
+Introduction
+============
+
+The YAML and JSON files in this directory are platform-independent tests that
+drivers can use to prove their conformance to the Convenient API for
+Transactions spec.  They are designed with the intention of sharing some
+test-runner code with the CRUD, Command Monitoring, and Transaction spec tests.
+
+Several prose tests, which are not easily expressed in YAML, are also presented
+in this file. Those tests will need to be manually implemented by each driver.
+
+Server Fail Point
+=================
+
+See: `Server Fail Point <../../transactions/tests#server-fail-point>`_ in the
+Transactions spec test suite.
+
+Test Format
+===========
+
+Each YAML file has the following keys:
+
+- ``runOn`` (optional): An array of server version and/or topology requirements
+  for which the tests can be run. If the test environment satisfies one or more
+  of these requirements, the tests may be executed; otherwise, this file should
+  be skipped. If this field is omitted, the tests can be assumed to have no
+  particular requirements and should be executed. Each element will have some or
+  all of the following fields:
+
+  - ``minServerVersion`` (optional): The minimum server version (inclusive)
+    required to successfully run the tests. If this field is omitted, it should
+    be assumed that there is no lower bound on the required server version.
+
+  - ``maxServerVersion`` (optional): The maximum server version (inclusive)
+    against which the tests can be run successfully. If this field is omitted,
+    it should be assumed that there is no upper bound on the required server
+    version.
+
+  - ``topology`` (optional): An array of server topologies against which the
+    tests can be run successfully. Valid topologies are "single", "replicaset",
+    and "sharded". If this field is omitted, the default is all topologies (i.e.
+    ``["single", "replicaset", "sharded"]``).
+
+- ``database_name`` and ``collection_name``: The database and collection to use
+  for testing.
+
+- ``data``: The data that should exist in the collection under test before each
+  test run.
+
+- ``tests``: An array of tests that are to be run independently of each other.
+  Each test will have some or all of the following fields:
+
+  - ``description``: The name of the test.
+
+  - ``skipReason`` (optional): If present, the test should be skipped and the
+    string value will specify a reason.
+
+  - ``failPoint`` (optional): The ``configureFailPoint`` command document to run
+    to configure a fail point on the primary server. This option and
+    ``useMultipleMongoses: true`` are mutually exclusive.
+
+  - ``useMultipleMongoses`` (optional): If ``true``, the MongoClient for this
+    test should be initialized with multiple mongos seed addresses. If ``false``
+    or omitted, only a single mongos address should be specified. This field has
+    no effect for non-sharded topologies.
+
+  - ``clientOptions`` (optional): Names and values of options to pass to
+    ``MongoClient()``.
+
+  - ``sessionOptions`` (optional): Names and values of options to pass to
+    ``MongoClient.startSession()``.
+
+  - ``operations``: Array of documents, each describing an operation to be
+    executed. Each document has the following fields:
+
+    - ``name``: The name of the operation on ``object``.
+
+    - ``object``: The name of the object on which to perform the operation. The
+      value will be either "collection" or "session0".
+
+    - ``arguments`` (optional): Names and values of arguments to pass to the
+      operation.
+
+    - ``result`` (optional): The return value from the operation. This will
+      correspond to an operation's result object as defined in the CRUD
+      specification. If the operation is expected to return an error, the
+      ``result`` is a single document that has one or more of the following
+      fields:
+
+      - ``errorContains``: A substring of the expected error message.
+
+      - ``errorCodeName``: The expected "codeName" field in the server
+        error response.
+
+      - ``errorLabelsContain``: A list of error label strings that the
+        error is expected to have.
+
+      - ``errorLabelsOmit``: A list of error label strings that the
+        error is expected not to have.
+
+  - ``expectations`` (optional): List of command-started events.
+
+  - ``outcome``: Document describing the return value and/or expected state of
+    the collection after the operation is executed. Contains the following
+    fields:
+
+    - ``collection``:
+
+      - ``data``: The data that should exist in the collection after the
+        operations have run.
+
+``withTransaction`` Operation
+`````````````````````````````
+
+These tests introduce a ``withTransaction`` operation, which may have the
+following fields:
+
+- ``callback``: Document containing the following field:
+
+  - ``operations``: Array of documents, each describing an operation to be
+    executed. Elements in this array will follow the same structure as the
+    ``operations`` field defined above (and in the CRUD and Transactions specs).
+
+    Note that drivers are expected to evaluate ``error`` and ``result``
+    assertions when executing operations within ``callback.operations``.
+
+- ``options`` (optional): Names and values of options to pass to
+  ``withTransaction()``, which will in turn be used for ``startTransaction()``.
+
+Use as Integration Tests
+========================
+
+Testing against a replica set will require server version 4.0.0 or later. The
+replica set should include a primary, a secondary, and an arbiter. Including a
+secondary ensures that server selection in a transaction works properly.
+Including an arbiter helps ensure that no new bugs have been introduced related
+to arbiters.
+
+Testing against a sharded cluster will require server version 4.1.6 or later.
+A driver that implements support for sharded transactions MUST also run these
+tests against a MongoDB sharded cluster with multiple mongoses. Including
+multiple mongoses (and initializing the MongoClient with multiple mongos seeds!)
+ensures that mongos transaction pinning works properly.
+
+See: `Use as Integration Tests <../../transactions/tests#use-as-integration-tests>`_
+in the Transactions spec test suite for instructions on executing each test.
+
+Take note of the following:
+
+- Most tests will consist of a single "withTransaction" operation to be invoked
+  on the "session0" object. The ``callback`` argument of that operation will
+  resemble the ``operations`` array found in transaction spec tests.
+
+Command-Started Events
+``````````````````````
+
+See: `Command-Started Events <../../transactions/tests#command-started-events>`_
+in the Transactions spec test suite for instructions on asserting
+command-started events.
+
+Prose Tests
+===========
+
+Callback Raises a Custom Error
+``````````````````````````````
+
+Write a callback that raises a custom exception or error that does not include
+either UnknownTransactionCommitResult or TransientTransactionError error labels.
+Execute this callback using ``withTransaction`` and assert that the callback's
+error bypasses any retry logic within ``withTransaction`` and is propagated to
+the caller of ``withTransaction``.
+
+Callback Returns a Value
+````````````````````````
+
+Write a callback that returns a custom value (e.g. boolean, string, object).
+Execute this callback using ``withTransaction`` and assert that the callback's
+return value is propagated to the caller of ``withTransaction``.
+
+Retry Timeout is Enforced
+`````````````````````````
+
+Drivers should test that ``withTransaction`` enforces a non-configurable timeout
+before retrying both commits and entire transactions. Specifically, three cases
+should be checked:
+
+ * If the callback raises an error with the TransientTransactionError label and
+   the retry timeout has been exceeded, ``withTransaction`` should propagate the
+   error to its caller.
+ * If committing raises an error with the UnknownTransactionCommitResult label,
+   the error is not a write concern timeout, and the retry timeout has been
+   exceeded, ``withTransaction`` should propagate the error to its caller.
+ * If committing raises an error with the TransientTransactionError label and
+   the retry timeout has been exceeded, ``withTransaction`` should propagate the
+   error to its caller. This case may occur if the commit was internally retried
+   against a new primary after a failover and the second primary returned a
+   NoSuchTransaction error response.
+
+ If possible, drivers should implement these tests without requiring the test
+ runner to block for the full duration of the retry timeout. This might be done
+ by internally modifying the timeout value used by ``withTransaction`` with some
+ private API or using a mock timer.
+
+Changelog
+=========
+
+:2019-03-01: Add top-level ``runOn`` field to denote server version and/or
+             topology requirements requirements for the test file. Removes the
+             ``minServerVersion`` top-level field, which is now expressed within
+             ``runOn`` elements.
+
+             Add test-level ``useMultipleMongoses`` field.
diff --git a/driver-core/src/test/resources/transactions-convenient-api/callback-aborts.json b/driver-core/src/test/resources/transactions-convenient-api/callback-aborts.json
new file mode 100644
index 00000000000..2a3038e8baa
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/callback-aborts.json
@@ -0,0 +1,244 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "withTransaction succeeds if callback aborts",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                },
+                {
+                  "name": "abortTransaction",
+                  "object": "session0"
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "withTransaction succeeds if callback aborts with no ops",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "abortTransaction",
+                  "object": "session0"
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "withTransaction still succeeds if callback aborts and runs extra op",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                },
+                {
+                  "name": "abortTransaction",
+                  "object": "session0"
+                },
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 2
+                    }
+                  },
+                  "result": {
+                    "insertedId": 2
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "autocommit": null,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/callback-commits.json b/driver-core/src/test/resources/transactions-convenient-api/callback-commits.json
new file mode 100644
index 00000000000..4abbbdd0e63
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/callback-commits.json
@@ -0,0 +1,303 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "withTransaction succeeds if callback commits",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                },
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 2
+                    }
+                  },
+                  "result": {
+                    "insertedId": 2
+                  }
+                },
+                {
+                  "name": "commitTransaction",
+                  "object": "session0"
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "withTransaction still succeeds if callback commits and runs extra op",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                },
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 2
+                    }
+                  },
+                  "result": {
+                    "insertedId": 2
+                  }
+                },
+                {
+                  "name": "commitTransaction",
+                  "object": "session0"
+                },
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 3
+                    }
+                  },
+                  "result": {
+                    "insertedId": 3
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "autocommit": null,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/callback-retry.json b/driver-core/src/test/resources/transactions-convenient-api/callback-retry.json
new file mode 100644
index 00000000000..a0391c1b5d0
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/callback-retry.json
@@ -0,0 +1,315 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "callback succeeds after multiple connection errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "callback is not retried after non-transient error (DuplicateKeyError)",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                },
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "errorLabelsOmit": [
+                      "TransientTransactionError",
+                      "UnknownTransactionCommitResult"
+                    ]
+                  }
+                }
+              ]
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ],
+            "errorContains": "E11000"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/commit-retry.json b/driver-core/src/test/resources/transactions-convenient-api/commit-retry.json
new file mode 100644
index 00000000000..d4b948ce1a5
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/commit-retry.json
@@ -0,0 +1,528 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "commitTransaction succeeds after multiple connection errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction retry only overwrites write concern w option",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            },
+            "options": {
+              "writeConcern": {
+                "w": 2,
+                "j": true,
+                "wtimeout": 5000
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": 2,
+                "j": true,
+                "wtimeout": 5000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "j": true,
+                "wtimeout": 5000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "j": true,
+                "wtimeout": 5000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commit is retried after commitTransaction UnknownTransactionCommitResult (NotMaster)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 10107,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commit is not retried after MaxTimeMSExpired error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 50
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            },
+            "options": {
+              "maxCommitTimeMS": 60000
+            }
+          },
+          "result": {
+            "errorCodeName": "MaxTimeMSExpired",
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "maxTimeMS": 60000,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/commit-transienttransactionerror-4.2.json b/driver-core/src/test/resources/transactions-convenient-api/commit-transienttransactionerror-4.2.json
new file mode 100644
index 00000000000..7663bb54e18
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/commit-transienttransactionerror-4.2.json
@@ -0,0 +1,197 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.6",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "transaction is retried after commitTransaction TransientTransactionError (PreparedTransactionInProgress)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 267,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/commit-transienttransactionerror.json b/driver-core/src/test/resources/transactions-convenient-api/commit-transienttransactionerror.json
new file mode 100644
index 00000000000..18becbe09c6
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/commit-transienttransactionerror.json
@@ -0,0 +1,725 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "transaction is retried after commitTransaction TransientTransactionError (LockTimeout)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 24,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "transaction is retried after commitTransaction TransientTransactionError (WriteConflict)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 112,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "transaction is retried after commitTransaction TransientTransactionError (SnapshotUnavailable)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 246,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "transaction is retried after commitTransaction TransientTransactionError (NoSuchTransaction)",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 251,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/commit-writeconcernerror.json b/driver-core/src/test/resources/transactions-convenient-api/commit-writeconcernerror.json
new file mode 100644
index 00000000000..fbad6455465
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/commit-writeconcernerror.json
@@ -0,0 +1,602 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "commitTransaction is retried after WriteConcernFailed timeout error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 64,
+            "codeName": "WriteConcernFailed",
+            "errmsg": "waiting for replication timed out",
+            "errInfo": {
+              "wtimeout": true
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction is retried after WriteConcernFailed non-timeout error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 64,
+            "codeName": "WriteConcernFailed",
+            "errmsg": "multiple errors reported"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction is not retried after UnknownReplWriteConcern error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 79,
+            "codeName": "UnknownReplWriteConcern",
+            "errmsg": "No write concern mode named 'foo' found in replica set configuration"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          },
+          "result": {
+            "errorCodeName": "UnknownReplWriteConcern",
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction is not retried after UnsatisfiableWriteConcern error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 100,
+            "codeName": "UnsatisfiableWriteConcern",
+            "errmsg": "Not enough data-bearing nodes"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          },
+          "result": {
+            "errorCodeName": "UnsatisfiableWriteConcern",
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction is not retried after MaxTimeMSExpired error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 50,
+            "codeName": "MaxTimeMSExpired",
+            "errmsg": "operation exceeded time limit"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          },
+          "result": {
+            "errorCodeName": "MaxTimeMSExpired",
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/commit.json b/driver-core/src/test/resources/transactions-convenient-api/commit.json
new file mode 100644
index 00000000000..0a7451db952
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/commit.json
@@ -0,0 +1,286 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "withTransaction commits after callback returns",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                },
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 2
+                    }
+                  },
+                  "result": {
+                    "insertedId": 2
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "withTransaction commits after callback returns (second transaction)",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                },
+                {
+                  "name": "commitTransaction",
+                  "object": "session0"
+                },
+                {
+                  "name": "startTransaction",
+                  "object": "session0"
+                },
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 2
+                    }
+                  },
+                  "result": {
+                    "insertedId": 2
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions-convenient-api/transaction-options.json b/driver-core/src/test/resources/transactions-convenient-api/transaction-options.json
new file mode 100644
index 00000000000..6deff43cf45
--- /dev/null
+++ b/driver-core/src/test/resources/transactions-convenient-api/transaction-options.json
@@ -0,0 +1,577 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "withTransaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "withTransaction and no transaction options set",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "readConcern": null,
+              "startTransaction": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "withTransaction inherits transaction options from client",
+      "useMultipleMongoses": true,
+      "clientOptions": {
+        "readConcernLevel": "local",
+        "w": 1
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "local"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": 1
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "withTransaction inherits transaction options from defaultTransactionOptions",
+      "useMultipleMongoses": true,
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readConcern": {
+              "level": "majority"
+            },
+            "writeConcern": {
+              "w": 1
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": 1
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "withTransaction explicit transaction options",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            },
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": {
+                "w": 1
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": 1
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "withTransaction explicit transaction options override defaultTransactionOptions",
+      "useMultipleMongoses": true,
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readConcern": {
+              "level": "snapshot"
+            },
+            "writeConcern": {
+              "w": "majority"
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            },
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": {
+                "w": 1
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": 1
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "withTransaction explicit transaction options override client options",
+      "useMultipleMongoses": true,
+      "clientOptions": {
+        "readConcernLevel": "local",
+        "w": "majority"
+      },
+      "operations": [
+        {
+          "name": "withTransaction",
+          "object": "session0",
+          "arguments": {
+            "callback": {
+              "operations": [
+                {
+                  "name": "insertOne",
+                  "object": "collection",
+                  "arguments": {
+                    "session": "session0",
+                    "document": {
+                      "_id": 1
+                    }
+                  },
+                  "result": {
+                    "insertedId": 1
+                  }
+                }
+              ]
+            },
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": {
+                "w": 1
+              }
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "withTransaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": {
+                "w": 1
+              },
+              "readConcern": null,
+              "startTransaction": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/README.rst b/driver-core/src/test/resources/transactions/README.rst
new file mode 100644
index 00000000000..7b4f6ee8398
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/README.rst
@@ -0,0 +1,570 @@
+==================
+Transactions Tests
+==================
+
+.. contents::
+
+----
+
+Introduction
+============
+
+The YAML and JSON files in this directory are platform-independent tests that
+drivers can use to prove their conformance to the Transactions Spec. They are
+designed with the intention of sharing some test-runner code with the CRUD Spec
+tests and the Command Monitoring Spec tests.
+
+Several prose tests, which are not easily expressed in YAML, are also presented
+in this file. Those tests will need to be manually implemented by each driver.
+
+Server Fail Point
+=================
+
+failCommand
+```````````
+
+Some tests depend on a server fail point, expressed in the ``failPoint`` field.
+For example the ``failCommand`` fail point allows the client to force the
+server to return an error. Keep in mind that the fail point only triggers for
+commands listed in the "failCommands" field. See `SERVER-35004`_ and
+`SERVER-35083`_ for more information.
+
+.. _SERVER-35004: https://jira.mongodb.org/browse/SERVER-35004
+.. _SERVER-35083: https://jira.mongodb.org/browse/SERVER-35083
+
+The ``failCommand`` fail point may be configured like so::
+
+    db.adminCommand({
+        configureFailPoint: "failCommand",
+        mode: <string|document>,
+        data: {
+          failCommands: ["commandName", "commandName2"],
+          closeConnection: <true|false>,
+          errorCode: <Number>,
+          writeConcernError: <document>
+        }
+    });
+
+``mode`` is a generic fail point option and may be assigned a string or document
+value. The string values ``"alwaysOn"`` and ``"off"`` may be used to enable or
+disable the fail point, respectively. A document may be used to specify either
+``times`` or ``skip``, which are mutually exclusive:
+
+- ``{ times: <integer> }`` may be used to limit the number of times the fail
+  point may trigger before transitioning to ``"off"``.
+- ``{ skip: <integer> }`` may be used to defer the first trigger of a fail
+  point, after which it will transition to ``"alwaysOn"``.
+
+The ``data`` option is a document that may be used to specify options that
+control the fail point's behavior. ``failCommand`` supports the following
+``data`` options, which may be combined if desired:
+
+- ``failCommands``: Required, the list of command names to fail.
+- ``closeConnection``: Boolean option, which defaults to ``false``. If
+  ``true``, the command will not be executed, the connection will be closed, and
+  the client will see a network error.
+- ``errorCode``: Integer option, which is unset by default. If set, the command
+  will not be executed and the specified command error code will be returned as
+  a command error.
+- ``writeConcernError``: A document, which is unset by default. If set, the
+  server will return this document in the "writeConcernError" field. This
+  failure response only applies to commands that support write concern and
+  happens *after* the command finishes (regardless of success or failure).
+
+Test Format
+===========
+
+Each YAML file has the following keys:
+
+- ``runOn`` (optional): An array of server version and/or topology requirements
+  for which the tests can be run. If the test environment satisfies one or more
+  of these requirements, the tests may be executed; otherwise, this file should
+  be skipped. If this field is omitted, the tests can be assumed to have no
+  particular requirements and should be executed. Each element will have some or
+  all of the following fields:
+
+  - ``minServerVersion`` (optional): The minimum server version (inclusive)
+    required to successfully run the tests. If this field is omitted, it should
+    be assumed that there is no lower bound on the required server version.
+
+  - ``maxServerVersion`` (optional): The maximum server version (inclusive)
+    against which the tests can be run successfully. If this field is omitted,
+    it should be assumed that there is no upper bound on the required server
+    version.
+
+  - ``topology`` (optional): An array of server topologies against which the
+    tests can be run successfully. Valid topologies are "single", "replicaset",
+    and "sharded". If this field is omitted, the default is all topologies (i.e.
+    ``["single", "replicaset", "sharded"]``).
+
+- ``database_name`` and ``collection_name``: The database and collection to use
+  for testing.
+
+- ``data``: The data that should exist in the collection under test before each
+  test run.
+
+- ``tests``: An array of tests that are to be run independently of each other.
+  Each test will have some or all of the following fields:
+
+  - ``description``: The name of the test.
+
+  - ``skipReason``: Optional, string describing why this test should be
+    skipped.
+
+  - ``useMultipleMongoses`` (optional): If ``true``, the MongoClient for this
+    test should be initialized with multiple mongos seed addresses. If ``false``
+    or omitted, only a single mongos address should be specified. This field has
+    no effect for non-sharded topologies.
+
+  - ``clientOptions``: Optional, parameters to pass to MongoClient().
+
+  - ``failPoint``: Optional, a server failpoint to enable expressed as the
+    configureFailPoint command to run on the admin database. This option and
+    ``useMultipleMongoses: true`` are mutually exclusive.
+
+  - ``sessionOptions``: Optional, map of session names (e.g. "session0") to
+    parameters to pass to MongoClient.startSession() when creating that session.
+
+  - ``operations``: Array of documents, each describing an operation to be
+    executed. Each document has the following fields:
+
+    - ``name``: The name of the operation on ``object``.
+
+    - ``object``: The name of the object to perform the operation on. Can be
+      "database", "collection", "session0", "session1", or "testRunner". See
+      the "targetedFailPoint" operation in `Special Test Operations`_.
+
+    - ``collectionOptions``: Optional, parameters to pass to the Collection()
+      used for this operation.
+
+    - ``databaseOptions``: Optional, parameters to pass to the Database()
+      used for this operation.
+
+    - ``command_name``: Present only when ``name`` is "runCommand". The name
+      of the command to run. Required for languages that are unable preserve
+      the order keys in the "command" argument when parsing JSON/YAML.
+
+    - ``arguments``: Optional, the names and values of arguments.
+
+    - ``error``: Optional. If true, the test should expect an error or
+      exception. This could be a server-generated or a driver-generated error.
+
+    - ``result``: The return value from the operation, if any. This field may
+      be a single document or an array of documents in the case of a
+      multi-document read. If the operation is expected to return an error, the
+      ``result`` is a single document that has one or more of the following
+      fields:
+
+      - ``errorContains``: A substring of the expected error message.
+
+      - ``errorCodeName``: The expected "codeName" field in the server
+        error response.
+
+      - ``errorLabelsContain``: A list of error label strings that the
+        error is expected to have.
+
+      - ``errorLabelsOmit``: A list of error label strings that the
+        error is expected not to have.
+
+  - ``expectations``: Optional list of command-started events.
+
+  - ``outcome``: Document describing the return value and/or expected state of
+    the collection after the operation is executed. Contains the following
+    fields:
+
+    - ``collection``:
+
+      - ``data``: The data that should exist in the collection after the
+        operations have run.
+
+Use as Integration Tests
+========================
+
+Run a MongoDB replica set with a primary, a secondary, and an arbiter,
+**server version 4.0.0 or later**. (Including a secondary ensures that
+server selection in a transaction works properly. Including an arbiter helps
+ensure that no new bugs have been introduced related to arbiters.)
+
+A driver that implements support for sharded transactions MUST also run these
+tests against a MongoDB sharded cluster with multiple mongoses and
+**server version 4.2 or later**. Some tests require
+initializing the MongoClient with multiple mongos seeds to ensures that mongos
+transaction pinning and the recoveryToken works properly.
+
+Load each YAML (or JSON) file using a Canonical Extended JSON parser.
+
+Then for each element in ``tests``:
+
+#. If the ``skipReason`` field is present, skip this test completely.
+#. Create a MongoClient and call
+   ``client.admin.runCommand({killAllSessions: []})`` to clean up any open
+   transactions from previous test failures. Ignore a command failure with
+   error code 11601 ("Interrupted") to work around `SERVER-38335`_.
+
+   - Running ``killAllSessions`` cleans up any open transactions from
+     a previously failed test to prevent the current test from blocking.
+     It is sufficient to run this command once before starting the test suite
+     and once after each failed test.
+   - When testing against a sharded cluster run this command on ALL mongoses.
+
+#. Create a collection object from the MongoClient, using the ``database_name``
+   and ``collection_name`` fields of the YAML file.
+#. Drop the test collection, using writeConcern "majority".
+#. Execute the "create" command to recreate the collection, using writeConcern
+   "majority". (Creating the collection inside a transaction is prohibited, so
+   create it explicitly.)
+#. If the YAML file contains a ``data`` array, insert the documents in ``data``
+   into the test collection, using writeConcern "majority".
+#. When testing against a sharded cluster run a ``distinct`` command on the
+   newly created collection on all mongoses. For an explanation see,
+   `Why do tests that run distinct sometimes fail with StaleDbVersion?`_
+#. If ``failPoint`` is specified, its value is a configureFailPoint command.
+   Run the command on the admin database to enable the fail point.
+#. Create a **new** MongoClient ``client``, with Command Monitoring listeners
+   enabled. (Using a new MongoClient for each test ensures a fresh session pool
+   that hasn't executed any transactions previously, so the tests can assert
+   actual txnNumbers, starting from 1.) Pass this test's ``clientOptions`` if
+   present.
+
+   - When testing against a sharded cluster and ``useMultipleMongoses`` is
+     ``true`` the client MUST be created with multiple (valid) mongos seed
+     addreses.
+
+#. Call ``client.startSession`` twice to create ClientSession objects
+   ``session0`` and ``session1``, using the test's "sessionOptions" if they
+   are present. Save their lsids so they are available after calling
+   ``endSession``, see `Logical Session Id`_.
+#. For each element in ``operations``:
+
+   - If the operation ``name`` is a special test operation type, execute it and
+     go to the next operation, otherwise proceed to the next step.
+   - Enter a "try" block or your programming language's closest equivalent.
+   - Create a Database object from the MongoClient, using the ``database_name``
+     field at the top level of the test file.
+   - Create a Collection object from the Database, using the
+     ``collection_name`` field at the top level of the test file.
+     If ``collectionOptions`` or ``databaseOptions`` is present, create the
+     Collection or Database object with the provided options, respectively.
+     Otherwise create the object with the default options.
+   - Execute the named method on the provided ``object``, passing the
+     arguments listed. Pass ``session0`` or ``session1`` to the method,
+     depending on which session's name is in the arguments list.
+     If ``arguments`` contains no "session", pass no explicit session to the
+     method.
+   - If the driver throws an exception / returns an error while executing this
+     series of operations, store the error message and server error code.
+   - If the operation's ``error`` field is ``true``, verify that the method
+     threw an exception or returned an error.
+   - If the result document has an "errorContains" field, verify that the
+     method threw an exception or returned an error, and that the value of the
+     "errorContains" field matches the error string. "errorContains" is a
+     substring (case-insensitive) of the actual error message.
+
+     If the result document has an "errorCodeName" field, verify that the
+     method threw a command failed exception or returned an error, and that
+     the value of the "errorCodeName" field matches the "codeName" in the
+     server error response.
+
+     If the result document has an "errorLabelsContain" field, verify that the
+     method threw an exception or returned an error. Verify that all of the
+     error labels in "errorLabelsContain" are present in the error or exception
+     using the ``hasErrorLabel`` method.
+
+     If the result document has an "errorLabelsOmit" field, verify that the
+     method threw an exception or returned an error. Verify that none of the
+     error labels in "errorLabelsOmit" are present in the error or exception
+     using the ``hasErrorLabel`` method.
+   - If the operation returns a raw command response, eg from ``runCommand``,
+     then compare only the fields present in the expected result document.
+     Otherwise, compare the method's return value to ``result`` using the same
+     logic as the CRUD Spec Tests runner.
+
+#. Call ``session0.endSession()`` and ``session1.endSession``.
+#. If the test includes a list of command-started events in ``expectations``,
+   compare them to the actual command-started events using the
+   same logic as the Command Monitoring Spec Tests runner, plus the rules in
+   the Command-Started Events instructions below.
+#. If ``failPoint`` is specified, disable the fail point to avoid spurious
+   failures in subsequent tests. The fail point may be disabled like so::
+
+    db.adminCommand({
+        configureFailPoint: <fail point name>,
+        mode: "off"
+    });
+
+#. For each element in ``outcome``:
+
+   - If ``name`` is "collection", verify that the test collection contains
+     exactly the documents in the ``data`` array. Ensure this find reads the
+     latest data by using **primary read preference** with
+     **local read concern** even when the MongoClient is configured with
+     another read preference or read concern.
+
+.. _SERVER-38335: https://jira.mongodb.org/browse/SERVER-38335
+
+Special Test Operations
+```````````````````````
+
+Certain operations that appear in the "operations" array do not correspond to
+API methods but instead represent special test operations. Such operations are
+defined on the "testRunner" object and documented here:
+
+targetedFailPoint
+~~~~~~~~~~~~~~~~~
+
+The "targetedFailPoint" operation instructs the test runner to configure a fail
+point on a specific mongos. The mongos to run the ``configureFailPoint`` is
+determined by the "session" argument (either "session0" or "session1").
+The session must already be pinned to a mongos server. The "failPoint" argument
+is the ``configureFailPoint`` command to run.
+
+If a test uses ``targetedFailPoint``, disable the fail point after running
+all ``operations`` to avoid spurious failures in subsequent tests. The fail
+point may be disabled like so::
+
+    db.adminCommand({
+        configureFailPoint: <fail point name>,
+        mode: "off"
+    });
+
+Here is an example which instructs the test runner to enable the failCommand
+fail point on the mongos server which "session0" is pinned to::
+
+      # Enable the fail point only on the Mongos that session0 is pinned to.
+      - name: targetedFailPoint
+        object: testRunner
+        arguments:
+          session: session0
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: ["commitTransaction"]
+              closeConnection: true
+
+Tests that use the "targetedFailPoint" operation do not include
+``configureFailPoint`` commands in their command expectations. Drivers MUST
+ensure that ``configureFailPoint`` commands do not appear in the list of logged
+commands, either by manually filtering it from the list of observed commands or
+by using a different MongoClient to execute ``configureFailPoint``.
+
+assertSessionTransactionState
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The "assertSessionTransactionState" operation instructs the test runner to
+assert that the transaction state of the given session is equal to the
+specified value. The possible values are as follows: ``none``, ``starting``,
+``in_progress``, ``committed``, ``aborted``::
+
+      - name: assertSessionTransactionState
+        object: testRunner
+        arguments:
+          session: session0
+          state: in_progress
+
+assertSessionPinned
+~~~~~~~~~~~~~~~~~~~
+
+The "assertSessionPinned" operation instructs the test runner to assert that
+the given session is pinned to a mongos::
+
+      - name: assertSessionPinned
+        object: testRunner
+        arguments:
+          session: session0
+
+assertSessionUnpinned
+~~~~~~~~~~~~~~~~~~~~~
+
+The "assertSessionUnpinned" operation instructs the test runner to assert that
+the given session is not pinned to a mongos::
+
+      - name: assertSessionPinned
+        object: testRunner
+        arguments:
+          session: session0
+
+Command-Started Events
+``````````````````````
+
+The event listener used for these tests MUST ignore the security commands
+listed in the Command Monitoring Spec.
+
+Logical Session Id
+~~~~~~~~~~~~~~~~~~
+
+Each command-started event in ``expectations`` includes an ``lsid`` with the
+value "session0" or "session1". Tests MUST assert that the command's actual
+``lsid`` matches the id of the correct ClientSession named ``session0`` or
+``session1``.
+
+Null Values
+~~~~~~~~~~~
+
+Some command-started events in ``expectations`` include ``null`` values for
+fields such as ``txnNumber``, ``autocommit``, and ``writeConcern``.
+Tests MUST assert that the actual command **omits** any field that has a
+``null`` value in the expected command.
+
+Cursor Id
+^^^^^^^^^
+
+A ``getMore`` value of ``"42"`` in a command-started event is a fake cursorId
+that MUST be ignored. (In the Command Monitoring Spec tests, fake cursorIds are
+correlated with real ones, but that is not necessary for Transactions Spec
+tests.)
+
+afterClusterTime
+^^^^^^^^^^^^^^^^
+
+A ``readConcern.afterClusterTime`` value of ``42`` in a command-started event
+is a fake cluster time. Drivers MUST assert that the actual command includes an
+afterClusterTime.
+
+recoveryToken
+^^^^^^^^^^^^^
+
+A ``recoveryToken`` value of ``42`` in a command-started event is a
+placeholder for an arbitrary recovery token. Drivers MUST assert that the
+actual command includes a "recoveryToken" field and SHOULD assert that field
+is a BSON document.
+
+Mongos Pinning Prose Tests
+==========================
+
+The following tests ensure that a ClientSession is properly unpinned after
+a sharded transaction. Initialize these tests with a MongoClient connected
+to multiple mongoses.
+
+These tests use a cursor's address field to track which server an operation
+was run on. If this is not possible in your driver, use command monitoring
+instead.
+
+#. Test that starting a new transaction on a pinned ClientSession unpins the
+   session and normal server selection is performed for the next operation.
+
+   .. code:: python
+
+      @require_server_version(4, 1, 6)
+      @require_mongos_count_at_least(2)
+      def test_unpin_for_next_transaction(self):
+        # Increase localThresholdMS and wait until both nodes are discovered
+        # to avoid false positives.
+        client = MongoClient(mongos_hosts, localThresholdMS=1000)
+        wait_until(lambda: len(client.nodes) > 1)
+        # Create the collection.
+        client.test.test.insert_one({})
+        with client.start_session() as s:
+          # Session is pinned to Mongos.
+          with s.start_transaction():
+            client.test.test.insert_one({}, session=s)
+
+          addresses = set()
+          for _ in range(50):
+            with s.start_transaction():
+              cursor = client.test.test.find({}, session=s)
+              assert next(cursor)
+              addresses.add(cursor.address)
+
+          assert len(addresses) > 1
+
+#. Test non-transaction operations using a pinned ClientSession unpins the
+   session and normal server selection is performed.
+
+   .. code:: python
+
+      @require_server_version(4, 1, 6)
+      @require_mongos_count_at_least(2)
+      def test_unpin_for_non_transaction_operation(self):
+        # Increase localThresholdMS and wait until both nodes are discovered
+        # to avoid false positives.
+        client = MongoClient(mongos_hosts, localThresholdMS=1000)
+        wait_until(lambda: len(client.nodes) > 1)
+        # Create the collection.
+        client.test.test.insert_one({})
+        with client.start_session() as s:
+          # Session is pinned to Mongos.
+          with s.start_transaction():
+            client.test.test.insert_one({}, session=s)
+
+          addresses = set()
+          for _ in range(50):
+            cursor = client.test.test.find({}, session=s)
+            assert next(cursor)
+            addresses.add(cursor.address)
+
+          assert len(addresses) > 1
+
+Q & A
+=====
+
+Why do some tests appear to hang for 60 seconds on a sharded cluster?
+`````````````````````````````````````````````````````````````````````
+
+There are two cases where this can happen. When the initial commitTransaction
+attempt fails on mongos A and is retried on mongos B, mongos B will block
+waiting for the transaction to complete. However because the initial commit
+attempt failed, the command will only complete after the transaction is
+automatically aborted for exceeding the shard's
+transactionLifetimeLimitSeconds setting. `SERVER-39726`_ requests that
+recovering the outcome of an uncommitted transaction should immediately abort
+the transaction.
+
+The second case is when a *single-shard* transaction is committed successfully
+on mongos A and then explicitly committed again on mongos B. Mongos B will also
+block until the transactionLifetimeLimitSeconds timeout is hit at which point
+``{ok:1}`` will be returned. `SERVER-39349`_ requests that recovering the
+outcome of a completed single-shard transaction should not block.
+Note that this test suite only includes single shard transactions.
+
+To workaround these issues, drivers SHOULD decrease the transaction timeout
+setting by running setParameter **on each shard**. Setting the timeout to 3
+seconds significantly speeds up the test suite without a high risk of
+prematurely timing out any tests' transactions. To decrease the timeout, run::
+
+  db.adminCommand( { setParameter: 1, transactionLifetimeLimitSeconds: 3 } )
+
+Note that mongo-orchestration >=0.6.13 automatically sets this timeout to 3
+seconds so drivers using mongo-orchestration do not need to run these commands
+manually.
+
+.. _SERVER-39726: https://jira.mongodb.org/browse/SERVER-39726
+
+.. _SERVER-39349: https://jira.mongodb.org/browse/SERVER-39349
+
+Why do tests that run distinct sometimes fail with StaleDbVersion?
+``````````````````````````````````````````````````````````````````
+
+When a shard receives its first command that contains a dbVersion, the shard
+returns a StaleDbVersion error and the Mongos retries the operation. In a
+sharded transaction, Mongos does not retry these operations and instead returns
+the error to the client. For example::
+
+  Command distinct failed: Transaction aa09e296-472a-494f-8334-48d57ab530b6:1 was aborted on statement 0 due to: an error from cluster data placement change :: caused by :: got stale databaseVersion response from shard sh01 at host localhost:27217 :: caused by :: don't know dbVersion.
+
+To workaround this limitation, a driver test runner MUST run a
+non-transactional ``distinct`` command on each Mongos before running any test
+that uses ``distinct``. To ease the implementation drivers can simply run
+``distinct`` before *every* test.
+
+Note that drivers can remove this workaround once `SERVER-39704`_ is resolved
+so that mongos retries this operation transparently. The ``distinct`` command
+is the only command allowed in a sharded transaction that uses the
+``dbVersion`` concept so it is the only command affected.
+
+.. _SERVER-39704: https://jira.mongodb.org/browse/SERVER-39704
+
+Changelog
+=========
+
+:2019-05-15: Add operation level ``error`` field to assert any error.
+:2019-03-25: Add workaround for StaleDbVersion on distinct.
+:2019-03-01: Add top-level ``runOn`` field to denote server version and/or
+             topology requirements requirements for the test file. Removes the
+             ``topology`` top-level field, which is now expressed within
+             ``runOn`` elements.
+:2019-02-28: ``useMultipleMongoses: true`` and non-targeted fail points are
+             mutually exclusive.
+:2019-02-13: Modify test format for 4.2 sharded transactions, including
+             "useMultipleMongoses", ``object: testRunner``, the
+             ``targetedFailPoint`` operation, and recoveryToken assertions.
diff --git a/driver-core/src/test/resources/transactions/abort.json b/driver-core/src/test/resources/transactions/abort.json
new file mode 100644
index 00000000000..3729a982985
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/abort.json
@@ -0,0 +1,621 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "abort",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "implicit abort",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "two aborts",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "cannot call abortTransaction twice"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abort without start",
+      "operations": [
+        {
+          "name": "abortTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "no transaction started"
+          }
+        }
+      ],
+      "expectations": [],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abort directly after no-op commit",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "Cannot call abortTransaction after calling commitTransaction"
+          }
+        }
+      ],
+      "expectations": [],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abort directly after commit",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "Cannot call abortTransaction after calling commitTransaction"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "abort ignores TransactionAborted",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ],
+            "errorContains": "E11000"
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorCodeName": "NoSuchTransaction",
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abort does not apply writeConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": 10
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/bulk.json b/driver-core/src/test/resources/transactions/bulk.json
new file mode 100644
index 00000000000..8a9793b8b38
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/bulk.json
@@ -0,0 +1,531 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "bulk",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "deletedCount": 1
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 1
+                  }
+                }
+              },
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  },
+                  "update": {
+                    "$set": {
+                      "x": 1
+                    }
+                  }
+                }
+              },
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 2
+                  },
+                  "update": {
+                    "$set": {
+                      "x": 2
+                    }
+                  },
+                  "upsert": true
+                }
+              },
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 3
+                  }
+                }
+              },
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 4
+                  }
+                }
+              },
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 5
+                  }
+                }
+              },
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 6
+                  }
+                }
+              },
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 7
+                  }
+                }
+              },
+              {
+                "name": "replaceOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  },
+                  "replacement": {
+                    "y": 1
+                  }
+                }
+              },
+              {
+                "name": "replaceOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 2
+                  },
+                  "replacement": {
+                    "y": 2
+                  }
+                }
+              },
+              {
+                "name": "deleteOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 3
+                  }
+                }
+              },
+              {
+                "name": "deleteOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 4
+                  }
+                }
+              },
+              {
+                "name": "updateMany",
+                "arguments": {
+                  "filter": {
+                    "_id": {
+                      "$gte": 2
+                    }
+                  },
+                  "update": {
+                    "$set": {
+                      "z": 1
+                    }
+                  }
+                }
+              },
+              {
+                "name": "deleteMany",
+                "arguments": {
+                  "filter": {
+                    "_id": {
+                      "$gte": 6
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "deletedCount": 4,
+            "insertedCount": 6,
+            "insertedIds": {
+              "0": 1,
+              "3": 3,
+              "4": 4,
+              "5": 5,
+              "6": 6,
+              "7": 7
+            },
+            "matchedCount": 7,
+            "modifiedCount": 7,
+            "upsertedCount": 1,
+            "upsertedIds": {
+              "2": 2
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "u": {
+                    "$set": {
+                      "x": 1
+                    }
+                  }
+                },
+                {
+                  "q": {
+                    "_id": 2
+                  },
+                  "u": {
+                    "$set": {
+                      "x": 2
+                    }
+                  },
+                  "upsert": true
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                },
+                {
+                  "_id": 4
+                },
+                {
+                  "_id": 5
+                },
+                {
+                  "_id": 6
+                },
+                {
+                  "_id": 7
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "u": {
+                    "y": 1
+                  }
+                },
+                {
+                  "q": {
+                    "_id": 2
+                  },
+                  "u": {
+                    "y": 2
+                  }
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": 3
+                  },
+                  "limit": 1
+                },
+                {
+                  "q": {
+                    "_id": 4
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": {
+                      "$gte": 2
+                    }
+                  },
+                  "u": {
+                    "$set": {
+                      "z": 1
+                    }
+                  },
+                  "multi": true
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": {
+                      "$gte": 6
+                    }
+                  },
+                  "limit": 0
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "y": 1
+            },
+            {
+              "_id": 2,
+              "y": 2,
+              "z": 1
+            },
+            {
+              "_id": 5,
+              "z": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/causal-consistency.json b/driver-core/src/test/resources/transactions/causal-consistency.json
new file mode 100644
index 00000000000..0e81bf2ff2b
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/causal-consistency.json
@@ -0,0 +1,305 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1,
+      "count": 0
+    }
+  ],
+  "tests": [
+    {
+      "description": "causal consistency",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "operations": [
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "count": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "count": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "u": {
+                    "$inc": {
+                      "count": 1
+                    }
+                  }
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": null,
+              "startTransaction": null,
+              "autocommit": null,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "u": {
+                    "$inc": {
+                      "count": 1
+                    }
+                  }
+                }
+              ],
+              "ordered": true,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "count": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "causal consistency disabled",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "sessionOptions": {
+        "session0": {
+          "causalConsistency": false
+        }
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "count": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": null,
+              "autocommit": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "u": {
+                    "$inc": {
+                      "count": 1
+                    }
+                  }
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1,
+              "count": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/commit.json b/driver-core/src/test/resources/transactions/commit.json
new file mode 100644
index 00000000000..faa39a65f18
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/commit.json
@@ -0,0 +1,925 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "commit",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "rerun commit after empty transaction",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "multiple commits in a row",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "write concern error on commit",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": 10
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commit without start",
+      "operations": [
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "no transaction started"
+          }
+        }
+      ],
+      "expectations": [],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "commit after no-op abort",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "Cannot call commitTransaction after calling abortTransaction"
+          }
+        }
+      ],
+      "expectations": [],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "commit after abort",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "Cannot call commitTransaction after calling abortTransaction"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "multiple commits after empty transaction",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "reset session state commit",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "no transaction started"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": null,
+              "startTransaction": null,
+              "autocommit": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "reset session state abort",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "no transaction started"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": null,
+              "startTransaction": null,
+              "autocommit": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/count.json b/driver-core/src/test/resources/transactions/count.json
new file mode 100644
index 00000000000..169296416a4
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/count.json
@@ -0,0 +1,120 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0.2",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    },
+    {
+      "_id": 4
+    }
+  ],
+  "tests": [
+    {
+      "description": "count",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "count",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorCodeName": "OperationNotSupportedInTransaction",
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "test",
+              "query": {
+                "_id": 1
+              },
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "count",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/delete.json b/driver-core/src/test/resources/transactions/delete.json
new file mode 100644
index 00000000000..65b83270392
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/delete.json
@@ -0,0 +1,327 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    },
+    {
+      "_id": 4
+    },
+    {
+      "_id": 5
+    }
+  ],
+  "tests": [
+    {
+      "description": "delete",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "deletedCount": 1
+          }
+        },
+        {
+          "name": "deleteMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$lte": 3
+              }
+            }
+          },
+          "result": {
+            "deletedCount": 2
+          }
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "deletedCount": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": {
+                      "$lte": 3
+                    }
+                  },
+                  "limit": 0
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": 4
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 5
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "collection writeConcern ignored for delete",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "deletedCount": 1
+          }
+        },
+        {
+          "name": "deleteMany",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$lte": 3
+              }
+            }
+          },
+          "result": {
+            "deletedCount": 2
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": 1
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": {
+                      "$lte": 3
+                    }
+                  },
+                  "limit": 0
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/error-labels.json b/driver-core/src/test/resources/transactions/error-labels.json
new file mode 100644
index 00000000000..8662b6d76d8
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/error-labels.json
@@ -0,0 +1,1964 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "DuplicateKey errors do not contain transient label",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "documents": [
+              {
+                "_id": 1
+              },
+              {
+                "_id": 1
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ],
+            "errorContains": "E11000"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                },
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "NotMaster errors contain transient label",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 10107
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "WriteConflict errors contain transient label",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 112
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "NoSuchTransaction errors contain transient label",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "errorCode": 251
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "NoSuchTransaction errors on commit contain transient label",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 251
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "add transient label to connection errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 4
+        },
+        "data": {
+          "failCommands": [
+            "insert",
+            "find",
+            "aggregate",
+            "distinct"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {},
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "test",
+              "key": "_id",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "distinct",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "add unknown commit label to connection errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "add unknown commit label to retryable commit errors",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 11602
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "add unknown commit label to writeConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "add unknown commit label to writeConcernError WriteConcernFailed",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 64,
+            "errmsg": "multiple errors reported"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "add unknown commit label to writeConcernError WriteConcernFailed with wtimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 64,
+            "codeName": "WriteConcernFailed",
+            "errmsg": "waiting for replication timed out",
+            "errInfo": {
+              "wtimeout": true
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "omit unknown commit label to writeConcernError UnsatisfiableWriteConcern",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 100,
+            "errmsg": "Not enough data-bearing nodes"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "omit unknown commit label to writeConcernError UnknownReplWriteConcern",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 79,
+            "errmsg": "No write concern mode named 'blah' found in replica set configuration"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "do not add unknown commit label to MaxTimeMSExpired inside transactions",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "errorCode": 50
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "maxTimeMS": 60000,
+            "session": "session0"
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult",
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {},
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "maxTimeMS": 60000
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "add unknown commit label to MaxTimeMSExpired",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 50
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxCommitTimeMS": 60000
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxTimeMS": 60000
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "maxTimeMS": 60000
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "add unknown commit label to writeConcernError MaxTimeMSExpired",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 50,
+            "errmsg": "operation exceeded time limit"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxCommitTimeMS": 60000
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxTimeMS": 60000
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "maxTimeMS": 60000
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/errors-client.json b/driver-core/src/test/resources/transactions/errors-client.json
new file mode 100644
index 00000000000..4bd1c0eb321
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/errors-client.json
@@ -0,0 +1,94 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "Client side error in command starting transaction",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": {
+                ".": "."
+              }
+            }
+          },
+          "error": true
+        },
+        {
+          "name": "assertSessionTransactionState",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "state": "starting"
+          }
+        }
+      ]
+    },
+    {
+      "description": "Client side error when transaction is in progress",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "insertedId": 4
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": {
+                ".": "."
+              }
+            }
+          },
+          "error": true
+        },
+        {
+          "name": "assertSessionTransactionState",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "state": "in_progress"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/errors.json b/driver-core/src/test/resources/transactions/errors.json
new file mode 100644
index 00000000000..5fc4905e8c3
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/errors.json
@@ -0,0 +1,222 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "start insert start",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "transaction already in progress"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ]
+    },
+    {
+      "description": "start twice",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "transaction already in progress"
+          }
+        }
+      ]
+    },
+    {
+      "description": "commit and start twice",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "transaction already in progress"
+          }
+        }
+      ]
+    },
+    {
+      "description": "write conflict commit",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session1"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorCodeName": "WriteConflict",
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session1",
+          "result": {
+            "errorCodeName": "NoSuchTransaction",
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "description": "write conflict abort",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session1"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorCodeName": "WriteConflict",
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session1"
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/findOneAndDelete.json b/driver-core/src/test/resources/transactions/findOneAndDelete.json
new file mode 100644
index 00000000000..d82657a9f53
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/findOneAndDelete.json
@@ -0,0 +1,221 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    }
+  ],
+  "tests": [
+    {
+      "description": "findOneAndDelete",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndDelete",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "_id": 3
+          }
+        },
+        {
+          "name": "findOneAndDelete",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 4
+            }
+          },
+          "result": null
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "remove": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 4
+              },
+              "remove": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "collection writeConcern ignored for findOneAndDelete",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndDelete",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "_id": 3
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "remove": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/findOneAndReplace.json b/driver-core/src/test/resources/transactions/findOneAndReplace.json
new file mode 100644
index 00000000000..7a54ca3433e
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/findOneAndReplace.json
@@ -0,0 +1,255 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    }
+  ],
+  "tests": [
+    {
+      "description": "findOneAndReplace",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndReplace",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            },
+            "replacement": {
+              "x": 1
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 3
+          }
+        },
+        {
+          "name": "findOneAndReplace",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 4
+            },
+            "replacement": {
+              "x": 1
+            },
+            "upsert": true,
+            "returnDocument": "After"
+          },
+          "result": {
+            "_id": 4,
+            "x": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "update": {
+                "x": 1
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 4
+              },
+              "update": {
+                "x": 1
+              },
+              "new": true,
+              "upsert": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3,
+              "x": 1
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "collection writeConcern ignored for findOneAndReplace",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndReplace",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            },
+            "replacement": {
+              "x": 1
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 3
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "update": {
+                "x": 1
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/findOneAndUpdate.json b/driver-core/src/test/resources/transactions/findOneAndUpdate.json
new file mode 100644
index 00000000000..7af54ba8081
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/findOneAndUpdate.json
@@ -0,0 +1,413 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    }
+  ],
+  "tests": [
+    {
+      "description": "findOneAndUpdate",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 3
+          }
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 4
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "upsert": true,
+            "returnDocument": "After"
+          },
+          "result": {
+            "_id": 4,
+            "x": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 3,
+            "x": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 3,
+            "x": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 4
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": true,
+              "upsert": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3,
+              "x": 2
+            },
+            {
+              "_id": 4,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "collection writeConcern ignored for findOneAndUpdate",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 3
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 3
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 3
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/insert.json b/driver-core/src/test/resources/transactions/insert.json
new file mode 100644
index 00000000000..f26e7c2a763
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/insert.json
@@ -0,0 +1,648 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "insert",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 2,
+              "1": 3
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "insertedId": 4
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 5
+            }
+          },
+          "result": {
+            "insertedId": 5
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                },
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 4
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 5
+                }
+              ],
+              "ordered": true,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            },
+            {
+              "_id": 5
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "insert with session1",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session1"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              }
+            ],
+            "session": "session1"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 2,
+              "1": 3
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session1"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session1"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "insertedId": 4
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session1"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session1",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                },
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "lsid": "session1",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session1",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 4
+                }
+              ],
+              "ordered": true,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "lsid": "session1",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session1",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "collection writeConcern without transaction",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "operations": [
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": null,
+              "startTransaction": null,
+              "autocommit": null,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "collection writeConcern ignored for insert",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "documents": [
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 2,
+              "1": 3
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                },
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/isolation.json b/driver-core/src/test/resources/transactions/isolation.json
new file mode 100644
index 00000000000..f16b28a5e6c
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/isolation.json
@@ -0,0 +1,225 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "one transaction",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "two transactions",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session1"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session1",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": []
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": [
+            {
+              "_id": 1
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session1"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/mongos-pin-auto.json b/driver-core/src/test/resources/transactions/mongos-pin-auto.json
new file mode 100644
index 00000000000..f6ede52687c
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/mongos-pin-auto.json
@@ -0,0 +1,4814 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    }
+  ],
+  "tests": [
+    {
+      "description": "remain pinned after non-transient Interrupted error on insertOne",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError",
+              "UnknownTransactionCommitResult"
+            ],
+            "errorCodeName": "Interrupted"
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 4
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient error within a transaction",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 4
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on insertOne insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on insertMany insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "documents": [
+              {
+                "_id": 4
+              },
+              {
+                "_id": 5
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on updateOne update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on replaceOne update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "replaceOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "replacement": {
+              "y": 1
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on updateMany update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "updateMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 1
+              }
+            },
+            "update": {
+              "$set": {
+                "z": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on deleteOne delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on deleteMany delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "deleteMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on findOneAndDelete findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndDelete",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on findOneAndUpdate findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on findOneAndReplace findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndReplace",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "replacement": {
+              "y": 1
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on bulkWrite insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 1
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on bulkWrite update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  },
+                  "update": {
+                    "$set": {
+                      "x": 1
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on bulkWrite delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "deleteOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on find find",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "find"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on countDocuments aggregate",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "aggregate"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {}
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on aggregate aggregate",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "aggregate"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "pipeline": []
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on distinct distinct",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "distinct"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient Interrupted error on runCommand insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 11601
+              }
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "insert",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ]
+            }
+          },
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on insertOne insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on insertOne insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on insertMany insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "documents": [
+              {
+                "_id": 4
+              },
+              {
+                "_id": 5
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on insertMany insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "documents": [
+              {
+                "_id": 4
+              },
+              {
+                "_id": 5
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on updateOne update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on updateOne update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on replaceOne update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "replaceOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "replacement": {
+              "y": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on replaceOne update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "replaceOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "replacement": {
+              "y": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on updateMany update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "updateMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 1
+              }
+            },
+            "update": {
+              "$set": {
+                "z": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on updateMany update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "updateMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 1
+              }
+            },
+            "update": {
+              "$set": {
+                "z": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on deleteOne delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on deleteOne delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on deleteMany delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "deleteMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on deleteMany delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "deleteMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 1
+              }
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on findOneAndDelete findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndDelete",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on findOneAndDelete findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndDelete",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on findOneAndUpdate findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on findOneAndUpdate findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on findOneAndReplace findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndReplace",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "replacement": {
+              "y": 1
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on findOneAndReplace findAndModify",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "findAndModify"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "findOneAndReplace",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            },
+            "replacement": {
+              "y": 1
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on bulkWrite insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 1
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on bulkWrite insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 1
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on bulkWrite update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  },
+                  "update": {
+                    "$set": {
+                      "x": 1
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on bulkWrite update",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "update"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "updateOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  },
+                  "update": {
+                    "$set": {
+                      "x": 1
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on bulkWrite delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "deleteOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on bulkWrite delete",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "delete"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "deleteOne",
+                "arguments": {
+                  "filter": {
+                    "_id": 1
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on find find",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "find"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on find find",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "find"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on countDocuments aggregate",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "aggregate"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {}
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on countDocuments aggregate",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "aggregate"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {}
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on aggregate aggregate",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "aggregate"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "pipeline": []
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on aggregate aggregate",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "aggregate"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "pipeline": []
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on distinct distinct",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "distinct"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on distinct distinct",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "distinct"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient connection error on runCommand insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "insert",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ]
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient ShutdownInProgress error on runCommand insert",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "errorCode": 91
+              }
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "insert",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ]
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "assertSessionUnpinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/mongos-recovery-token.json b/driver-core/src/test/resources/transactions/mongos-recovery-token.json
new file mode 100644
index 00000000000..50c7349c1e6
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/mongos-recovery-token.json
@@ -0,0 +1,506 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "commitTransaction explicit retries include recoveryToken",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction retry succeeds on new mongos",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "commitTransaction"
+                ],
+                "writeConcernError": {
+                  "code": 91,
+                  "errmsg": "Replication is being shut down"
+                }
+              }
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              },
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction retry fails on new mongos",
+      "useMultipleMongoses": true,
+      "clientOptions": {
+        "heartbeatFrequencyMS": 30000
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 7
+              },
+              "data": {
+                "failCommands": [
+                  "commitTransaction",
+                  "isMaster"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorCodeName": "NoSuchTransaction"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              },
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction sends recoveryToken",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "abortTransaction"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/pin-mongos.json b/driver-core/src/test/resources/transactions/pin-mongos.json
new file mode 100644
index 00000000000..8e9d049d048
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/pin-mongos.json
@@ -0,0 +1,1227 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    }
+  ],
+  "tests": [
+    {
+      "description": "countDocuments",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "distinct",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "fieldName": "_id",
+            "session": "session0"
+          },
+          "result": [
+            1,
+            2
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "find",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 2
+            },
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 2
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "insertOne",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 3
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 4
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 4
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 5
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 5
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 6
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 6
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 7
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 7
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 8
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 8
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 9
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 9
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 10
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 10
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            },
+            {
+              "_id": 5
+            },
+            {
+              "_id": 6
+            },
+            {
+              "_id": 7
+            },
+            {
+              "_id": 8
+            },
+            {
+              "_id": 9
+            },
+            {
+              "_id": 10
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "mixed read write operations",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 3
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 3
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 3
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 3
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 3
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "arguments": {
+            "filter": {
+              "_id": 3
+            },
+            "session": "session0"
+          },
+          "result": 1
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 4
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 4
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 5
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 5
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 6
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 6
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {
+              "_id": 7
+            },
+            "session": "session0"
+          },
+          "result": {
+            "insertedId": 7
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            },
+            {
+              "_id": 5
+            },
+            {
+              "_id": 6
+            },
+            {
+              "_id": 7
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "multiple commits",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 3
+              },
+              {
+                "_id": 4
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 3,
+              "1": 4
+            }
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "remain pinned after non-transient error on commit",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 3
+              },
+              {
+                "_id": 4
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 3,
+              "1": 4
+            }
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "commitTransaction"
+                ],
+                "errorCode": 51
+              }
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ],
+            "errorCode": 51
+          }
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "assertSessionPinned",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient error within a transaction",
+      "useMultipleMongoses": true,
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 1
+              },
+              "data": {
+                "failCommands": [
+                  "insert"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 4
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unpin after transient error within a transaction and commit",
+      "useMultipleMongoses": true,
+      "clientOptions": {
+        "heartbeatFrequencyMS": 30000
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "targetedFailPoint",
+          "object": "testRunner",
+          "arguments": {
+            "session": "session0",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": {
+                "times": 7
+              },
+              "data": {
+                "failCommands": [
+                  "insert",
+                  "isMaster"
+                ],
+                "closeConnection": true
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 4
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ],
+            "errorLabelsOmit": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorCodeName": "NoSuchTransaction"
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 4
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null,
+              "recoveryToken": 42
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/read-concern.json b/driver-core/src/test/resources/transactions/read-concern.json
new file mode 100644
index 00000000000..dd9243e2f74
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/read-concern.json
@@ -0,0 +1,1628 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    },
+    {
+      "_id": 4
+    }
+  ],
+  "tests": [
+    {
+      "description": "only first countDocuments includes readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 2
+              }
+            }
+          },
+          "result": 3
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 2
+              }
+            }
+          },
+          "result": 3
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gte": 2
+                    }
+                  }
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ],
+              "cursor": {},
+              "lsid": "session0",
+              "readConcern": {
+                "level": "majority"
+              },
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gte": 2
+                    }
+                  }
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ],
+              "cursor": {},
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "only first find includes readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": {
+                "level": "majority"
+              },
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "only first aggregate includes readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {
+                "batchSize": 3
+              },
+              "lsid": "session0",
+              "readConcern": {
+                "level": "majority"
+              },
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {
+                "batchSize": 3
+              },
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "only first distinct includes readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": [
+            1,
+            2,
+            3,
+            4
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": [
+            1,
+            2,
+            3,
+            4
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "test",
+              "key": "_id",
+              "lsid": "session0",
+              "readConcern": {
+                "level": "majority"
+              },
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "distinct",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "test",
+              "key": "_id",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "distinct",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "only first runCommand includes readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "find",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "find": "test"
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "find",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "find": "test"
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "lsid": "session0",
+              "readConcern": {
+                "level": "majority"
+              },
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "countDocuments ignores collection readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 2
+              }
+            }
+          },
+          "result": 3
+        },
+        {
+          "name": "countDocuments",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 2
+              }
+            }
+          },
+          "result": 3
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gte": 2
+                    }
+                  }
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ],
+              "cursor": {},
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gte": 2
+                    }
+                  }
+                },
+                {
+                  "$group": {
+                    "_id": 1,
+                    "n": {
+                      "$sum": 1
+                    }
+                  }
+                }
+              ],
+              "cursor": {},
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "find ignores collection readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "aggregate ignores collection readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {
+                "batchSize": 3
+              },
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {
+                "batchSize": 3
+              },
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "distinct ignores collection readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": [
+            1,
+            2,
+            3,
+            4
+          ]
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": [
+            1,
+            2,
+            3,
+            4
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "test",
+              "key": "_id",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "distinct",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "test",
+              "key": "_id",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "distinct",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "runCommand ignores database readConcern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "databaseOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "command_name": "find",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "find": "test"
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "find",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "find": "test"
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/read-pref.json b/driver-core/src/test/resources/transactions/read-pref.json
new file mode 100644
index 00000000000..bf1f1970eb6
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/read-pref.json
@@ -0,0 +1,720 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "default readPreference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 1
+              },
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              },
+              {
+                "_id": 4
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 1,
+              "1": 2,
+              "2": 3,
+              "3": 4
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": 1
+                }
+              },
+              {
+                "$count": "count"
+              }
+            ]
+          },
+          "result": [
+            {
+              "count": 1
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "primary readPreference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "Primary"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 1
+              },
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              },
+              {
+                "_id": 4
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 1,
+              "1": 2,
+              "2": 3,
+              "3": 4
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": 1
+                }
+              },
+              {
+                "$count": "count"
+              }
+            ]
+          },
+          "result": [
+            {
+              "count": 1
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "secondary readPreference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "Secondary"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 1
+              },
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              },
+              {
+                "_id": 4
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 1,
+              "1": 2,
+              "2": 3,
+              "3": 4
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": 1
+                }
+              },
+              {
+                "$count": "count"
+              }
+            ]
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "primaryPreferred readPreference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "PrimaryPreferred"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 1
+              },
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              },
+              {
+                "_id": 4
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 1,
+              "1": 2,
+              "2": 3,
+              "3": 4
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": 1
+                }
+              },
+              {
+                "$count": "count"
+              }
+            ]
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "nearest readPreference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "Nearest"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 1
+              },
+              {
+                "_id": 2
+              },
+              {
+                "_id": 3
+              },
+              {
+                "_id": 4
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 1,
+              "1": 2,
+              "2": 3,
+              "3": 4
+            }
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": 1
+                }
+              },
+              {
+                "$count": "count"
+              }
+            ]
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "collectionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "secondary write only",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "Secondary"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/reads.json b/driver-core/src/test/resources/transactions/reads.json
new file mode 100644
index 00000000000..9fc587f482d
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/reads.json
@@ -0,0 +1,543 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    },
+    {
+      "_id": 4
+    }
+  ],
+  "tests": [
+    {
+      "description": "collection readConcern without transaction",
+      "operations": [
+        {
+          "name": "find",
+          "object": "collection",
+          "collectionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "readConcern": {
+                "level": "majority"
+              },
+              "lsid": "session0",
+              "txnNumber": null,
+              "startTransaction": null,
+              "autocommit": null
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "find",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "batchSize": 3
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "batchSize": 3,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "find": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "find",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "aggregate",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 1
+                }
+              }
+            ],
+            "batchSize": 3,
+            "session": "session0"
+          },
+          "result": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {
+                "batchSize": 3
+              },
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "test",
+              "pipeline": [
+                {
+                  "$project": {
+                    "_id": 1
+                  }
+                }
+              ],
+              "cursor": {
+                "batchSize": 3
+              },
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "aggregate",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "getMore": {
+                "$numberLong": "42"
+              },
+              "collection": "test",
+              "batchSize": 3,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false
+            },
+            "command_name": "getMore",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "distinct",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "distinct",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "fieldName": "_id"
+          },
+          "result": [
+            1,
+            2,
+            3,
+            4
+          ]
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "distinct": "test",
+              "key": "_id",
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "distinct",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "readConcern": null,
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3
+            },
+            {
+              "_id": 4
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/retryable-abort.json b/driver-core/src/test/resources/transactions/retryable-abort.json
new file mode 100644
index 00000000000..f6b7b0e49a1
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/retryable-abort.json
@@ -0,0 +1,1972 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "abortTransaction only performs a single retry",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction does not retry after Interrupted",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 11601,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction does not retry after WriteConcernError Interrupted",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "writeConcernError": {
+            "code": 11601,
+            "errmsg": "operation was interrupted"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after connection error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 10107,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 13436,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 13435,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after InterruptedDueToReplStateChange",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 11602,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 11600,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 189,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 91,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 7,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 6,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 9001,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "errorCode": 89,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after WriteConcernError InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "writeConcernError": {
+            "code": 11600,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after WriteConcernError InterruptedDueToReplStateChange",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "writeConcernError": {
+            "code": 11602,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after WriteConcernError PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "writeConcernError": {
+            "code": 189,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "abortTransaction succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "abortTransaction"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/retryable-commit.json b/driver-core/src/test/resources/transactions/retryable-commit.json
new file mode 100644
index 00000000000..b17438b7001
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/retryable-commit.json
@@ -0,0 +1,2285 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "commitTransaction fails after two errors",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction applies majority write concern on retries",
+      "clientOptions": {
+        "retryWrites": false
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 2
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": 2,
+                "j": true,
+                "wtimeout": 5000
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsContain": [
+              "UnknownTransactionCommitResult"
+            ],
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": 2,
+                "j": true,
+                "wtimeout": 5000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "j": true,
+                "wtimeout": 5000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "j": true,
+                "wtimeout": 5000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction fails after Interrupted",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 11601,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorCodeName": "Interrupted",
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "commitTransaction fails after WriteConcernError Interrupted",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 11601,
+            "errmsg": "operation was interrupted"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0",
+          "result": {
+            "errorLabelsOmit": [
+              "TransientTransactionError"
+            ]
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after connection error",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after NotMaster",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 10107,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after NotMasterOrSecondary",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 13436,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after NotMasterNoSlaveOk",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 13435,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after InterruptedDueToReplStateChange",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 11602,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 11600,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 189,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 91,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after HostNotFound",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 7,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after HostUnreachable",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 6,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after SocketException",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 9001,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after NetworkTimeout",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "errorCode": 89,
+          "closeConnection": false
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after WriteConcernError InterruptedAtShutdown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 11600,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after WriteConcernError InterruptedDueToReplStateChange",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 11602,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after WriteConcernError PrimarySteppedDown",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 189,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commitTransaction succeeds after WriteConcernError ShutdownInProgress",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "commitTransaction"
+          ],
+          "writeConcernError": {
+            "code": 91,
+            "errmsg": "Replication is being shut down"
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority",
+                "wtimeout": 10000
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/retryable-writes.json b/driver-core/src/test/resources/transactions/retryable-writes.json
new file mode 100644
index 00000000000..c932893b5bc
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/retryable-writes.json
@@ -0,0 +1,343 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "increment txnNumber",
+      "clientOptions": {
+        "retryWrites": true
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 3
+            }
+          },
+          "result": {
+            "insertedId": 3
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "arguments": {
+            "documents": [
+              {
+                "_id": 4
+              },
+              {
+                "_id": 5
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "insertedIds": {
+              "0": 4,
+              "1": 5
+            }
+          }
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 3
+                }
+              ],
+              "ordered": true,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "3"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 4
+                },
+                {
+                  "_id": 5
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "4"
+              },
+              "startTransaction": null,
+              "autocommit": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 4
+            },
+            {
+              "_id": 5
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "writes are not retried",
+      "clientOptions": {
+        "retryWrites": true
+      },
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "insert"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorLabelsContain": [
+              "TransientTransactionError"
+            ]
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/run-command.json b/driver-core/src/test/resources/transactions/run-command.json
new file mode 100644
index 00000000000..2f2a3a88158
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/run-command.json
@@ -0,0 +1,306 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "run command with default read preference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "insert",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ]
+            }
+          },
+          "result": {
+            "n": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "run command with secondary read preference in client option and primary read preference in transaction options",
+      "clientOptions": {
+        "readPreference": "secondary"
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "Primary"
+              }
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "insert",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ]
+            }
+          },
+          "result": {
+            "n": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "run command with explicit primary read preference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "insert",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ]
+            },
+            "readPreference": {
+              "mode": "Primary"
+            }
+          },
+          "result": {
+            "n": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    },
+    {
+      "description": "run command fails with explicit secondary read preference",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "find",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "find": "test"
+            },
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        }
+      ]
+    },
+    {
+      "description": "run command fails with secondary read preference from transaction options",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "Secondary"
+              }
+            }
+          }
+        },
+        {
+          "name": "runCommand",
+          "object": "database",
+          "command_name": "find",
+          "arguments": {
+            "session": "session0",
+            "command": {
+              "find": "test"
+            }
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/transaction-options-repl.json b/driver-core/src/test/resources/transactions/transaction-options-repl.json
new file mode 100644
index 00000000000..33324debb8a
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/transaction-options-repl.json
@@ -0,0 +1,181 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "readConcern snapshot in startTransaction options",
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readConcern": {
+              "level": "majority"
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "snapshot"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "snapshot"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "snapshot"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "snapshot",
+                "afterClusterTime": 42
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/transaction-options.json b/driver-core/src/test/resources/transactions/transaction-options.json
new file mode 100644
index 00000000000..25d245dca56
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/transaction-options.json
@@ -0,0 +1,1404 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [],
+  "tests": [
+    {
+      "description": "no transaction options set",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "afterClusterTime": 42
+              },
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "transaction options inherited from client",
+      "clientOptions": {
+        "w": 1,
+        "readConcernLevel": "local"
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "local"
+              },
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": 1
+              },
+              "maxTimeMS": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "local",
+                "afterClusterTime": 42
+              },
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": 1
+              },
+              "maxTimeMS": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "transaction options inherited from defaultTransactionOptions",
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readConcern": {
+              "level": "majority"
+            },
+            "writeConcern": {
+              "w": 1
+            },
+            "maxCommitTimeMS": 60000
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": 1
+              },
+              "maxTimeMS": 60000
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority",
+                "afterClusterTime": 42
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": 1
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "startTransaction options override defaults",
+      "clientOptions": {
+        "readConcernLevel": "local",
+        "w": 1
+      },
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readConcern": {
+              "level": "snapshot"
+            },
+            "writeConcern": {
+              "w": 1
+            },
+            "maxCommitTimeMS": 30000
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxCommitTimeMS": 60000
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxTimeMS": 60000
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority",
+                "afterClusterTime": 42
+              },
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxTimeMS": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "defaultTransactionOptions override client options",
+      "clientOptions": {
+        "readConcernLevel": "local",
+        "w": 1
+      },
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readConcern": {
+              "level": "majority"
+            },
+            "writeConcern": {
+              "w": "majority"
+            },
+            "maxCommitTimeMS": 60000
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority"
+              },
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxTimeMS": 60000
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "majority",
+                "afterClusterTime": 42
+              },
+              "writeConcern": null,
+              "maxTimeMS": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": "majority"
+              },
+              "maxTimeMS": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "readConcern local in defaultTransactionOptions",
+      "clientOptions": {
+        "w": 1
+      },
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readConcern": {
+              "level": "local"
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 2
+            }
+          },
+          "result": {
+            "insertedId": 2
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "local"
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": 1
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": {
+                "level": "local",
+                "afterClusterTime": 42
+              },
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "2"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": {
+                "w": 1
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "client writeConcern ignored for bulk",
+      "clientOptions": {
+        "w": "majority"
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": 1
+              }
+            }
+          }
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "arguments": {
+            "requests": [
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 1
+                  }
+                }
+              }
+            ],
+            "session": "session0"
+          },
+          "result": {
+            "deletedCount": 0,
+            "insertedCount": 1,
+            "insertedIds": {
+              "0": 1
+            },
+            "matchedCount": 0,
+            "modifiedCount": 0,
+            "upsertedCount": 0,
+            "upsertedIds": {}
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": 1
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "readPreference inherited from client",
+      "clientOptions": {
+        "readPreference": "secondary"
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "readPreference inherited from defaultTransactionOptions",
+      "clientOptions": {
+        "readPreference": "primary"
+      },
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "startTransaction overrides readPreference",
+      "clientOptions": {
+        "readPreference": "primary"
+      },
+      "sessionOptions": {
+        "session0": {
+          "defaultTransactionOptions": {
+            "readPreference": {
+              "mode": "Primary"
+            }
+          }
+        }
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "readPreference": {
+                "mode": "Secondary"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "errorContains": "read preference in a transaction must be primary"
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/update.json b/driver-core/src/test/resources/transactions/update.json
new file mode 100644
index 00000000000..e33bf5b8106
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/update.json
@@ -0,0 +1,442 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 1
+    },
+    {
+      "_id": 2
+    },
+    {
+      "_id": 3
+    }
+  ],
+  "tests": [
+    {
+      "description": "update",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 4
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "upsert": true
+          },
+          "result": {
+            "matchedCount": 0,
+            "modifiedCount": 0,
+            "upsertedCount": 1,
+            "upsertedId": 4
+          }
+        },
+        {
+          "name": "replaceOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "x": 1
+            },
+            "replacement": {
+              "y": 1
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateMany",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 3
+              }
+            },
+            "update": {
+              "$set": {
+                "z": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 2,
+            "modifiedCount": 2,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 4
+                  },
+                  "u": {
+                    "$inc": {
+                      "x": 1
+                    }
+                  },
+                  "upsert": true
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "x": 1
+                  },
+                  "u": {
+                    "y": 1
+                  }
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": {
+                      "$gte": 3
+                    }
+                  },
+                  "u": {
+                    "$set": {
+                      "z": 1
+                    }
+                  },
+                  "multi": true
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            },
+            {
+              "_id": 3,
+              "z": 1
+            },
+            {
+              "_id": 4,
+              "y": 1,
+              "z": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "collections writeConcern ignored for update",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 4
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "upsert": true
+          },
+          "result": {
+            "matchedCount": 0,
+            "modifiedCount": 0,
+            "upsertedCount": 1,
+            "upsertedId": 4
+          }
+        },
+        {
+          "name": "replaceOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "x": 1
+            },
+            "replacement": {
+              "y": 1
+            }
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "updateMany",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": "majority"
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": {
+                "$gte": 3
+              }
+            },
+            "update": {
+              "$set": {
+                "z": 1
+              }
+            }
+          },
+          "result": {
+            "matchedCount": 2,
+            "modifiedCount": 2,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 4
+                  },
+                  "u": {
+                    "$inc": {
+                      "x": 1
+                    }
+                  },
+                  "upsert": true
+                }
+              ],
+              "ordered": true,
+              "readConcern": null,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "x": 1
+                  },
+                  "u": {
+                    "y": 1
+                  }
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": {
+                      "$gte": 3
+                    }
+                  },
+                  "u": {
+                    "$set": {
+                      "z": 1
+                    }
+                  },
+                  "multi": true
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/transactions/write-concern.json b/driver-core/src/test/resources/transactions/write-concern.json
new file mode 100644
index 00000000000..84b1ea3650e
--- /dev/null
+++ b/driver-core/src/test/resources/transactions/write-concern.json
@@ -0,0 +1,1278 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.0",
+      "topology": [
+        "replicaset"
+      ]
+    },
+    {
+      "minServerVersion": "4.1.8",
+      "topology": [
+        "sharded"
+      ]
+    }
+  ],
+  "database_name": "transaction-tests",
+  "collection_name": "test",
+  "data": [
+    {
+      "_id": 0
+    }
+  ],
+  "tests": [
+    {
+      "description": "commit with majority",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0
+            },
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "commit with default",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0
+            },
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "abort with majority",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": "majority"
+              }
+            }
+          }
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": {
+                "w": "majority"
+              }
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "abort with default",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "abortTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "abortTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "abortTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "start with unacknowledged write concern",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "arguments": {
+            "options": {
+              "writeConcern": {
+                "w": 0
+              }
+            }
+          },
+          "result": {
+            "errorContains": "transactions do not support unacknowledged write concern"
+          }
+        }
+      ]
+    },
+    {
+      "description": "start with implicit unacknowledged write concern",
+      "clientOptions": {
+        "w": 0
+      },
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0",
+          "result": {
+            "errorContains": "transactions do not support unacknowledged write concern"
+          }
+        }
+      ]
+    },
+    {
+      "description": "unacknowledged write concern coll insertOne",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "document": {
+              "_id": 1
+            }
+          },
+          "result": {
+            "insertedId": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0
+            },
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll insertMany",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "insertMany",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "documents": [
+              {
+                "_id": 1
+              },
+              {
+                "_id": 2
+              }
+            ]
+          },
+          "result": {
+            "insertedIds": {
+              "0": 1,
+              "1": 2
+            }
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                },
+                {
+                  "_id": 2
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0
+            },
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll bulkWrite",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "bulkWrite",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "requests": [
+              {
+                "name": "insertOne",
+                "arguments": {
+                  "document": {
+                    "_id": 1
+                  }
+                }
+              }
+            ]
+          },
+          "result": {
+            "deletedCount": 0,
+            "insertedCount": 1,
+            "insertedIds": {
+              "0": 1
+            },
+            "matchedCount": 0,
+            "modifiedCount": 0,
+            "upsertedCount": 0,
+            "upsertedIds": {}
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "insert": "test",
+              "documents": [
+                {
+                  "_id": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "insert",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0
+            },
+            {
+              "_id": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll deleteOne",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "deleteOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 0
+            }
+          },
+          "result": {
+            "deletedCount": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": 0
+                  },
+                  "limit": 1
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll deleteMany",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "deleteMany",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 0
+            }
+          },
+          "result": {
+            "deletedCount": 1
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "delete": "test",
+              "deletes": [
+                {
+                  "q": {
+                    "_id": 0
+                  },
+                  "limit": 0
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "delete",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll updateOne",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "updateOne",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 0
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "upsert": true
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 0
+                  },
+                  "u": {
+                    "$inc": {
+                      "x": 1
+                    }
+                  },
+                  "upsert": true
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll updateMany",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "updateMany",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 0
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "upsert": true
+          },
+          "result": {
+            "matchedCount": 1,
+            "modifiedCount": 1,
+            "upsertedCount": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "update": "test",
+              "updates": [
+                {
+                  "q": {
+                    "_id": 0
+                  },
+                  "u": {
+                    "$inc": {
+                      "x": 1
+                    }
+                  },
+                  "multi": true,
+                  "upsert": true
+                }
+              ],
+              "ordered": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "update",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll findOneAndDelete",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndDelete",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 0
+            }
+          },
+          "result": {
+            "_id": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 0
+              },
+              "remove": true,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": []
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll findOneAndReplace",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndReplace",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 0
+            },
+            "replacement": {
+              "x": 1
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 0
+              },
+              "update": {
+                "x": 1
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0,
+              "x": 1
+            }
+          ]
+        }
+      }
+    },
+    {
+      "description": "unacknowledged write concern coll findOneAndUpdate",
+      "operations": [
+        {
+          "name": "startTransaction",
+          "object": "session0"
+        },
+        {
+          "name": "findOneAndUpdate",
+          "object": "collection",
+          "collectionOptions": {
+            "writeConcern": {
+              "w": 0
+            }
+          },
+          "arguments": {
+            "session": "session0",
+            "filter": {
+              "_id": 0
+            },
+            "update": {
+              "$inc": {
+                "x": 1
+              }
+            },
+            "returnDocument": "Before"
+          },
+          "result": {
+            "_id": 0
+          }
+        },
+        {
+          "name": "commitTransaction",
+          "object": "session0"
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "findAndModify": "test",
+              "query": {
+                "_id": 0
+              },
+              "update": {
+                "$inc": {
+                  "x": 1
+                }
+              },
+              "new": false,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": true,
+              "autocommit": false,
+              "readConcern": null,
+              "writeConcern": null
+            },
+            "command_name": "findAndModify",
+            "database_name": "transaction-tests"
+          }
+        },
+        {
+          "command_started_event": {
+            "command": {
+              "commitTransaction": 1,
+              "lsid": "session0",
+              "txnNumber": {
+                "$numberLong": "1"
+              },
+              "startTransaction": null,
+              "autocommit": false,
+              "writeConcern": null
+            },
+            "command_name": "commitTransaction",
+            "database_name": "admin"
+          }
+        }
+      ],
+      "outcome": {
+        "collection": {
+          "data": [
+            {
+              "_id": 0,
+              "x": 1
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/README.rst b/driver-core/src/test/resources/uri-options/README.rst
new file mode 100644
index 00000000000..b1b4877cd64
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/README.rst
@@ -0,0 +1,52 @@
+=======================
+URI Options Tests
+=======================
+
+The YAML and JSON files in this directory tree are platform-independent tests
+that drivers can use to prove their conformance to the URI Options spec.
+
+These tests use the same format as the Connection String spec tests.
+
+Version
+-------
+
+Files in the "specifications" repository have no version scheme. They are not
+tied to a MongoDB server version.
+
+Format
+------
+
+Each YAML file contains an object with a single ``tests`` key. This key is an
+array of test case objects, each of which have the following keys:
+
+- ``description``: A string describing the test.
+- ``uri``: A string containing the URI to be parsed.
+- ``valid``: A boolean indicating if the URI should be considered valid. 
+  This will always be true, as the Connection String spec tests the validity of the structure, but 
+  it's still included to make it easier to reuse the connection string spec test runners that 
+  drivers already have.
+- ``warning``: A boolean indicating whether URI parsing should emit a warning.
+- ``hosts``: Included for compatibility with the Connection String spec tests. This will always be ``~``.
+- ``auth``: Included for compatibility with the Connection String spec tests. This will always be ``~``.
+- ``options``: An object containing key/value pairs for each parsed query string
+  option.
+
+If a test case includes a null value for one of these keys (e.g. ``auth: ~``,
+``hosts: ~``), no assertion is necessary. This both simplifies parsing of the
+test files (keys should always exist) and allows flexibility for drivers that
+might substitute default values *during* parsing (e.g. omitted ``hosts`` could be
+parsed as ``["localhost"]``).
+
+The ``valid`` and ``warning`` fields are boolean in order to keep the tests
+flexible. We are not concerned with asserting the format of specific error or
+warnings messages strings.
+
+Use as unit tests
+=================
+
+Testing whether a URI is valid or not requires testing whether URI parsing (or
+MongoClient construction) causes a warning due to a URI option being invalid and asserting that the
+options parsed from the URI match those listed in the ``options`` field.
+
+Note that there are tests for each of the options marked as optional; drivers will need to implement
+logic to skip over the optional tests that they don’t implement.
diff --git a/driver-core/src/test/resources/uri-options/auth-options.json b/driver-core/src/test/resources/uri-options/auth-options.json
new file mode 100644
index 00000000000..65a168b3341
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/auth-options.json
@@ -0,0 +1,20 @@
+{
+  "tests": [
+    {
+      "description": "Valid auth options are parsed correctly",
+      "uri": "mongodb://foo:bar@example.com/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true&authSource=$external",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "authMechanism": "GSSAPI",
+        "authMechanismProperties": {
+          "SERVICE_NAME": "other",
+          "CANONICALIZE_HOST_NAME": true
+        },
+        "authSource": "$external"
+      }
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/compression-options.json b/driver-core/src/test/resources/uri-options/compression-options.json
new file mode 100644
index 00000000000..c3297b254ba
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/compression-options.json
@@ -0,0 +1,59 @@
+{
+  "tests": [
+    {
+      "description": "Valid compression options are parsed correctly",
+      "uri": "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=9",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "compressors": [
+          "zlib"
+        ],
+        "zlibCompressionLevel": 9
+      }
+    },
+    {
+      "description": "Multiple compressors are parsed correctly",
+      "uri": "mongodb://example.com/?compressors=snappy,zlib",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "compressors": [
+          "snappy",
+          "zlib"
+        ]
+      }
+    },
+    {
+      "description": "Non-numeric zlibCompressionLevel causes a warning",
+      "uri": "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low zlibCompressionLevel causes a warning",
+      "uri": "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too high zlibCompressionLevel causes a warning",
+      "uri": "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=10",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/concern-options.json b/driver-core/src/test/resources/uri-options/concern-options.json
new file mode 100644
index 00000000000..2b3783746c3
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/concern-options.json
@@ -0,0 +1,76 @@
+{
+  "tests": [
+    {
+      "description": "Valid read and write concern are parsed correctly",
+      "uri": "mongodb://example.com/?readConcernLevel=majority&w=5&wTimeoutMS=30000&journal=false",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "readConcernLevel": "majority",
+        "w": 5,
+        "wTimeoutMS": 30000,
+        "journal": false
+      }
+    },
+    {
+      "description": "Arbitrary string readConcernLevel does not cause a warning",
+      "uri": "mongodb://example.com/?readConcernLevel=arbitraryButStillValid",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "readConcernLevel": "arbitraryButStillValid"
+      }
+    },
+    {
+      "description": "Arbitrary string w doesn't cause a warning",
+      "uri": "mongodb://example.com/?w=arbitraryButStillValid",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "w": "arbitraryButStillValid"
+      }
+    },
+    {
+      "description": "Too low w causes a warning",
+      "uri": "mongodb://example.com/?w=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Non-numeric wTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?wTimeoutMS=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low wTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?wTimeoutMS=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Invalid journal causes a warning",
+      "uri": "mongodb://example.com/?journal=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/connection-options.json b/driver-core/src/test/resources/uri-options/connection-options.json
new file mode 100644
index 00000000000..1e2dccd6e29
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/connection-options.json
@@ -0,0 +1,122 @@
+{
+  "tests": [
+    {
+      "description": "Valid connection and timeout options are parsed correctly",
+      "uri": "mongodb://example.com/?appname=URI-OPTIONS-SPEC-TEST&connectTimeoutMS=20000&heartbeatFrequencyMS=5000&localThresholdMS=3000&maxIdleTimeMS=50000&replicaSet=uri-options-spec&retryWrites=true&serverSelectionTimeoutMS=15000&socketTimeoutMS=7500",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "appname": "URI-OPTIONS-SPEC-TEST",
+        "connectTimeoutMS": 20000,
+        "heartbeatFrequencyMS": 5000,
+        "localThresholdMS": 3000,
+        "maxIdleTimeMS": 50000,
+        "replicaSet": "uri-options-spec",
+        "retryWrites": true,
+        "serverSelectionTimeoutMS": 15000,
+        "socketTimeoutMS": 7500
+      }
+    },
+    {
+      "description": "Non-numeric connectTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?connectTimeoutMS=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low connectTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?connectTimeoutMS=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Non-numeric heartbeatFrequencyMS causes a warning",
+      "uri": "mongodb://example.com/?heartbeatFrequencyMS=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low heartbeatFrequencyMS causes a warning",
+      "uri": "mongodb://example.com/?heartbeatFrequencyMS=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Non-numeric localThresholdMS causes a warning",
+      "uri": "mongodb://example.com/?localThresholdMS=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low localThresholdMS causes a warning",
+      "uri": "mongodb://example.com/?localThresholdMS=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Invalid retryWrites causes a warning",
+      "uri": "mongodb://example.com/?retryWrites=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Non-numeric serverSelectionTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?serverSelectionTimeoutMS=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low serverSelectionTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?serverSelectionTimeoutMS=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Non-numeric socketTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?socketTimeoutMS=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low socketTimeoutMS causes a warning",
+      "uri": "mongodb://example.com/?socketTimeoutMS=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/connection-pool-options.json b/driver-core/src/test/resources/uri-options/connection-pool-options.json
new file mode 100644
index 00000000000..be401f55d5d
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/connection-pool-options.json
@@ -0,0 +1,33 @@
+{
+  "tests": [
+    {
+      "description": "Valid connection pool options are parsed correctly",
+      "uri": "mongodb://example.com/?maxIdleTimeMS=50000",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "maxIdleTimeMS": 50000
+      }
+    },
+    {
+      "description": "Non-numeric maxIdleTimeMS causes a warning",
+      "uri": "mongodb://example.com/?maxIdleTimeMS=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low maxIdleTimeMS causes a warning",
+      "uri": "mongodb://example.com/?maxIdleTimeMS=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/read-preference-options.json b/driver-core/src/test/resources/uri-options/read-preference-options.json
new file mode 100644
index 00000000000..e62ce4fa75c
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/read-preference-options.json
@@ -0,0 +1,52 @@
+{
+  "tests": [
+    {
+      "description": "Valid read preference options are parsed correctly",
+      "uri": "mongodb://example.com/?readPreference=primaryPreferred&readPreferenceTags=dc:ny,rack:1&maxStalenessSeconds=120&readPreferenceTags=dc:ny",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "readPreference": "primaryPreferred",
+        "readPreferenceTags": [
+          {
+            "dc": "ny",
+            "rack": "1"
+          },
+          {
+            "dc": "ny"
+          }
+        ],
+        "maxStalenessSeconds": 120
+      }
+    },
+    {
+      "description": "Invalid readPreferenceTags causes a warning",
+      "uri": "mongodb://example.com/?readPreferenceTags=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Non-numeric maxStalenessSeconds causes a warning",
+      "uri": "mongodb://example.com/?maxStalenessSeconds=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "Too low maxStalenessSeconds causes a warning",
+      "uri": "mongodb://example.com/?maxStalenessSeconds=-2",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/single-threaded-options.json b/driver-core/src/test/resources/uri-options/single-threaded-options.json
new file mode 100644
index 00000000000..fcd24fb8803
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/single-threaded-options.json
@@ -0,0 +1,24 @@
+{
+  "tests": [
+    {
+      "description": "Valid options specific to single-threaded drivers are parsed correctly",
+      "uri": "mongodb://example.com/?serverSelectionTryOnce=false",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "serverSelectionTryOnce": false
+      }
+    },
+    {
+      "description": "Invalid serverSelectionTryOnce causes a warning",
+      "uri": "mongodb://example.com/?serverSelectionTryOnce=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/uri-options/tls-options.json b/driver-core/src/test/resources/uri-options/tls-options.json
new file mode 100644
index 00000000000..6db80ed6235
--- /dev/null
+++ b/driver-core/src/test/resources/uri-options/tls-options.json
@@ -0,0 +1,231 @@
+{
+  "tests": [
+    {
+      "description": "Valid required tls options are parsed correctly",
+      "uri": "mongodb://example.com/?tls=true&tlsCAFile=ca.pem&tlsCertificateKeyFile=cert.pem&tlsCertificateKeyFilePassword=hunter2",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "tls": true,
+        "tlsCAFile": "ca.pem",
+        "tlsCertificateKeyFile": "cert.pem",
+        "tlsCertificateKeyFilePassword": "hunter2"
+      }
+    },
+    {
+      "description": "Invalid tlsAllowInvalidCertificates causes a warning",
+      "uri": "mongodb://example.com/?tlsAllowInvalidCertificates=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsAllowInvalidCertificates is parsed correctly",
+      "uri": "mongodb://example.com/?tlsAllowInvalidCertificates=true",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "tlsAllowInvalidCertificates": true
+      }
+    },
+    {
+      "description": "Invalid tlsAllowInvalidCertificates causes a warning",
+      "uri": "mongodb://example.com/?tlsAllowInvalidCertificates=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsAllowInvalidHostnames is parsed correctly",
+      "uri": "mongodb://example.com/?tlsAllowInvalidHostnames=true",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "tlsAllowInvalidHostnames": true
+      }
+    },
+    {
+      "description": "Invalid tlsAllowInvalidHostnames causes a warning",
+      "uri": "mongodb://example.com/?tlsAllowInvalidHostnames=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsInsecure is parsed correctly",
+      "uri": "mongodb://example.com/?tlsInsecure=true",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "tlsInsecure": true
+      }
+    },
+    {
+      "description": "Invalid tlsAllowInsecure causes a warning",
+      "uri": "mongodb://example.com/?tlsAllowInsecure=invalid",
+      "valid": true,
+      "warning": true,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsInsecure and tlsAllowInvalidCertificates both present (and true) raises an error",
+      "uri": "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidCertificates=true",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsInsecure and tlsAllowInvalidCertificates both present (and false) raises an error",
+      "uri": "mongodb://example.com/?tlsInsecure=false&tlsAllowInvalidCertificates=false",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsAllowInvalidCertificates and tlsInsecure both present (and true) raises an error",
+      "uri": "mongodb://example.com/?tlsAllowInvalidCertificates=true&tlsInsecure=true",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsAllowInvalidCertificates and tlsInsecure both present (and false) raises an error",
+      "uri": "mongodb://example.com/?tlsAllowInvalidCertificates=false&tlsInsecure=false",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsInsecure and tlsAllowInvalidHostnames both present (and true) raises an error",
+      "uri": "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidHostnames=true",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsInsecure and tlsAllowInvalidHostnames both present (and false) raises an error",
+      "uri": "mongodb://example.com/?tlsInsecure=false&tlsAllowInvalidHostnames=false",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsAllowInvalidHostnames and tlsInsecure both present (and true) raises an error",
+      "uri": "mongodb://example.com/?tlsAllowInvalidHostnames=true&tlsInsecure=true",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tlsAllowInvalidHostnames and tlsInsecure both present (and false) raises an error",
+      "uri": "mongodb://example.com/?tlsAllowInvalidHostnames=false&tlsInsecure=false",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tls=true and ssl=true doesn't warn",
+      "uri": "mongodb://example.com/?tls=true&ssl=true",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tls=false and ssl=false doesn't warn",
+      "uri": "mongodb://example.com/?tls=false&ssl=false",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "ssl=true and tls=true doesn't warn",
+      "uri": "mongodb://example.com/?ssl=true&tls=true",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "ssl=false and tls=false doesn't warn",
+      "uri": "mongodb://example.com/?ssl=false&tls=false",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tls=false and ssl=true raises error",
+      "uri": "mongodb://example.com/?tls=false&ssl=true",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "tls=true and ssl=false raises error",
+      "uri": "mongodb://example.com/?tls=true&ssl=false",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "ssl=false and tls=true raises error",
+      "uri": "mongodb://example.com/?ssl=false&tls=true",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    },
+    {
+      "description": "ssl=true and tls=false raises error",
+      "uri": "mongodb://example.com/?ssl=true&tls=false",
+      "valid": false,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {}
+    }
+  ]
+}
diff --git a/driver-core/src/test/resources/write-concern/connection-string/write-concern.json b/driver-core/src/test/resources/write-concern/connection-string/write-concern.json
index b2f8e2ed3d4..51bdf821c34 100644
--- a/driver-core/src/test/resources/write-concern/connection-string/write-concern.json
+++ b/driver-core/src/test/resources/write-concern/connection-string/write-concern.json
@@ -107,12 +107,12 @@
     {
       "description": "Acknowledged with w as 0 and journal true",
       "uri": "mongodb://localhost/?w=0&journal=true",
-      "valid": true,
-      "warning": true,
+      "valid": false,
+      "warning": false,
       "writeConcern": {
         "w": 0,
         "journal": true
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/resources/write-concern/document/write-concern.json b/driver-core/src/test/resources/write-concern/document/write-concern.json
index 54f83930a06..64cd5d0eae2 100644
--- a/driver-core/src/test/resources/write-concern/document/write-concern.json
+++ b/driver-core/src/test/resources/write-concern/document/write-concern.json
@@ -142,7 +142,7 @@
     },
     {
       "description": "W is 0 with journal true",
-      "valid": true,
+      "valid": false,
       "writeConcern": {
         "w": 0,
         "journal": true
@@ -171,4 +171,4 @@
       "isAcknowledged": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/AbstractConnectionStringTest.java b/driver-core/src/test/unit/com/mongodb/AbstractConnectionStringTest.java
new file mode 100644
index 00000000000..572334a6dee
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/AbstractConnectionStringTest.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import junit.framework.TestCase;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.Arrays.asList;
+
+@RunWith(Parameterized.class)
+public abstract class AbstractConnectionStringTest extends TestCase {
+    private static final Set<String> UNSUPPORTED_OPTIONS =
+            new HashSet<String>(asList(
+                    "tlsallowinvalidcertificates",
+                    "tlsallowinvalidhostnames",
+                    "tlscafile",
+                    "tlscertificatekeyfile",
+                    "tlscertificatekeyfilepassword",
+                    "serverselectiontryonce"));
+    private final String filename;
+    private final String description;
+    private final String input;
+    private final BsonDocument definition;
+
+    public AbstractConnectionStringTest(final String filename, final String description, final String input,
+                                        final BsonDocument definition) {
+        this.filename = filename;
+        this.description = description;
+        this.input = input;
+        this.definition = definition;
+    }
+
+    protected String getFilename() {
+        return filename;
+    }
+
+    protected BsonDocument getDefinition() {
+        return definition;
+    }
+
+    protected String getDescription() {
+        return description;
+    }
+
+    protected void testInvalidUris() {
+        Throwable expectedError = null;
+
+        try {
+            new ConnectionString(input);
+        } catch (Throwable t) {
+            expectedError = t;
+        }
+
+        assertNotNull(String.format("Connection string '%s' should have thrown an exception", input), expectedError);
+        assertTrue(String.format("Connection string '%s' should have thrown an IllegalArgumentException", input),
+                expectedError instanceof IllegalArgumentException);
+    }
+
+    protected void testValidHostIdentifiers() {
+        ConnectionString connectionString = null;
+        try {
+            connectionString = new ConnectionString(input);
+        } catch (Throwable t) {
+            assertTrue(String.format("Connection string '%s' should not have thrown an exception: %s", input, t.toString()), false);
+        }
+
+        assertExpectedHosts(connectionString.getHosts());
+    }
+
+    protected void testValidOptions() {
+        ConnectionString connectionString = null;
+
+        try {
+            connectionString = new ConnectionString(input);
+        } catch (Throwable t) {
+            assertTrue(String.format("Connection string '%s' should not have thrown an exception: %s", input, t.toString()), false);
+        }
+
+        for (Map.Entry<String, BsonValue> option : definition.getDocument("options").entrySet()) {
+            if (UNSUPPORTED_OPTIONS.contains(option.getKey().toLowerCase())) {
+                continue;
+            }
+
+            if (option.getKey().equals("authmechanism")) {
+                String expected = option.getValue().asString().getValue();
+                String actual = connectionString.getCredential().getAuthenticationMechanism().getMechanismName();
+                assertEquals(expected, actual);
+            } else if (option.getKey().toLowerCase().equals("retrywrites")) {
+                boolean expected = option.getValue().asBoolean().getValue();
+                assertEquals(expected, connectionString.getRetryWritesValue().booleanValue());
+            } else if (option.getKey().toLowerCase().equals("replicaset")) {
+                String expected = option.getValue().asString().getValue();
+                assertEquals(expected, connectionString.getRequiredReplicaSetName());
+            } else if (option.getKey().toLowerCase().equals("serverselectiontimeoutms")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getServerSelectionTimeout().intValue());
+            } else if (option.getKey().toLowerCase().equals("sockettimeoutms")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getSocketTimeout().intValue());
+            } else if (option.getKey().equals("wtimeoutms")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getWriteConcern().getWTimeout(TimeUnit.MILLISECONDS).intValue());
+            } else if (option.getKey().toLowerCase().equals("connecttimeoutms")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getConnectTimeout().intValue());
+            } else if (option.getKey().toLowerCase().equals("heartbeatfrequencyms")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getHeartbeatFrequency().intValue());
+            } else if (option.getKey().toLowerCase().equals("localthresholdms")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getLocalThreshold().intValue());
+            } else if (option.getKey().toLowerCase().equals("maxidletimems")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getMaxConnectionIdleTime().intValue());
+            } else if (option.getKey().toLowerCase().equals("tls")) {
+                boolean expected = option.getValue().asBoolean().getValue();
+                assertEquals(expected, connectionString.getSslEnabled().booleanValue());
+            } else if (option.getKey().toLowerCase().equals("tlsinsecure")) {
+                boolean expected = option.getValue().asBoolean().getValue();
+                assertEquals(expected, connectionString.getSslInvalidHostnameAllowed().booleanValue());
+            } else if (option.getKey().toLowerCase().equals("readconcernlevel")) {
+                String expected = option.getValue().asString().getValue();
+                assertEquals(expected, connectionString.getReadConcern().getLevel().getValue());
+            } else if (option.getKey().toLowerCase().equals("w")) {
+                if (option.getValue().isString()) {
+                    String expected = option.getValue().asString().getValue();
+                    assertEquals(expected, connectionString.getWriteConcern().getWString());
+                } else {
+                    int expected = option.getValue().asNumber().intValue();
+                    assertEquals(expected, connectionString.getWriteConcern().getW());
+                }
+            } else if (option.getKey().toLowerCase().equals("wtimeoutms")) {
+                int expected = option.getValue().asInt32().getValue();
+                assertEquals(expected, connectionString.getWriteConcern().getWTimeout(TimeUnit.MILLISECONDS).intValue());
+            } else if (option.getKey().toLowerCase().equals("journal")) {
+                boolean expected = option.getValue().asBoolean().getValue();
+                assertEquals(expected, connectionString.getWriteConcern().getJournal().booleanValue());
+            } else if (option.getKey().toLowerCase().equals("readpreference")) {
+                String expected = option.getValue().asString().getValue();
+                assertEquals(expected, connectionString.getReadPreference().getName());
+            } else if (option.getKey().toLowerCase().equals("readpreferencetags")) {
+                BsonArray expected = option.getValue().asArray();
+                assertEquals(expected, connectionString.getReadPreference().toDocument().getArray("tags"));
+            } else if (option.getKey().toLowerCase().equals("maxstalenessseconds")) {
+                int expected = option.getValue().asNumber().intValue();
+                assertEquals(expected, connectionString.getReadPreference().toDocument().getNumber("maxStalenessSeconds").intValue());
+            } else if (option.getKey().equals("compressors")) {
+                BsonArray expectedCompressorList = option.getValue().asArray();
+                assertEquals(expectedCompressorList.size(), connectionString.getCompressorList().size());
+                for (int i = 0; i < expectedCompressorList.size(); i++) {
+                    String expected = expectedCompressorList.get(i).asString().getValue();
+                    assertEquals(expected, connectionString.getCompressorList().get(i).getName());
+                }
+            } else if (option.getKey().toLowerCase().equals("zlibcompressionlevel")) {
+                int expected = option.getValue().asNumber().intValue();
+                assertEquals(expected, connectionString.getCompressorList().get(0).getProperty("level", 0).intValue());
+            } else if (option.getKey().toLowerCase().equals("appname")) {
+                String expected = option.getValue().asString().getValue();
+                assertEquals(expected, connectionString.getApplicationName());
+            } else if (option.getKey().toLowerCase().equals("authmechanism")) {
+                String expected = option.getValue().asString().getValue();
+                assertEquals(expected, connectionString.getCredential().getMechanism());
+            } else if (option.getKey().toLowerCase().equals("authsource")) {
+                String expected = option.getValue().asString().getValue();
+                assertEquals(expected, connectionString.getCredential().getSource());
+            } else if (option.getKey().toLowerCase().equals("authmechanismproperties")) {
+                BsonDocument properties = option.getValue().asDocument();
+                for (String cur : properties.keySet()) {
+                    if (properties.get(cur).isString()) {
+                        String expected = properties.getString(cur).getValue();
+                        assertEquals(expected, connectionString.getCredential().getMechanismProperty(cur, null));
+                    } else {
+                        boolean expected = properties.getBoolean(cur).getValue();
+                        assertEquals(expected, connectionString.getCredential().getMechanismProperty(cur, (Boolean) null).booleanValue());
+                    }
+                }
+            } else {
+                assertTrue(String.format("Unsupported option '%s' in '%s'", option.getKey(), input), false);
+            }
+        }
+    }
+
+    protected void testValidAuth() {
+        ConnectionString connectionString = null;
+
+        try {
+            connectionString = new ConnectionString(input);
+        } catch (Throwable t) {
+            if (description.contains("without password")) {
+                // We don't allow null passwords without setting the authentication mechanism.
+                return;
+            } else {
+                assertTrue(String.format("Connection string '%s' should not have throw an exception: %s", input, t.toString()), false);
+            }
+        }
+
+        assertString("auth.db", getAuthDB(connectionString));
+        assertString("auth.username", connectionString.getUsername());
+
+        // Passwords for certain auth mechanisms are ignored.
+        String password = null;
+        if (connectionString.getPassword() != null) {
+            password = new String(connectionString.getPassword());
+        }
+        if (connectionString.getCredential() != null) {
+            AuthenticationMechanism mechanism = connectionString.getCredential().getAuthenticationMechanism();
+            if (mechanism == null) {
+                assertString("auth.password", password);
+            } else {
+                switch (mechanism) {
+                    case PLAIN:
+                    case MONGODB_CR:
+                    case SCRAM_SHA_1:
+                    case SCRAM_SHA_256:
+                        assertString("auth.password", password);
+                        break;
+                    default:
+                        // Ignore the password field.
+                }
+            }
+
+        } else {
+            assertString("auth.password", password);
+        }
+    }
+
+    private void assertString(final String key, final String actual) {
+        BsonValue expected = definition;
+        if (key.contains(".")) {
+            for (String subKey : key.split("\\.")) {
+                expected = expected.asDocument().get(subKey);
+            }
+        } else {
+            expected = expected.asDocument().get(key);
+        }
+
+        if (expected.isNull()) {
+            assertTrue(String.format("%s should be null", key), actual == null);
+        } else if (expected.isString()) {
+            String expectedString = expected.asString().getValue();
+            assertTrue(String.format("%s should be %s but was %s", key, actual, expectedString), actual.equals(expectedString));
+        } else {
+            assertTrue(String.format("%s should be %s but was %s", key, actual, expected), false);
+        }
+    }
+
+    private void assertExpectedHosts(final List<String> hosts) {
+        List<String> cleanedHosts = new ArrayList<String>();
+        for (String host : hosts) {
+            if (host.startsWith("[")) {
+                int idx = host.indexOf("]");
+                cleanedHosts.add(host.substring(1, idx) + host.substring(idx + 1));
+            } else {
+                cleanedHosts.add(host);
+            }
+        }
+
+
+        List<String> expectedHosts = new ArrayList<String>();
+        for (BsonValue rawHost : definition.getArray("hosts")) {
+            BsonDocument hostDoc = rawHost.asDocument();
+            String host = hostDoc.getString("host").getValue();
+            String port = "";
+            if (!hostDoc.get("port").isNull()) {
+                port = ":" + hostDoc.getInt32("port").getValue();
+            }
+            expectedHosts.add(host + port);
+        }
+        Collections.sort(expectedHosts);
+        assertEquals(expectedHosts, cleanedHosts);
+    }
+
+    private String getAuthDB(final ConnectionString connectionString) {
+        if (connectionString.getCollection() != null) {
+            return connectionString.getDatabase() + "." + connectionString.getCollection();
+        }
+        return connectionString.getDatabase();
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/AuthConnectionStringTest.java b/driver-core/src/test/unit/com/mongodb/AuthConnectionStringTest.java
new file mode 100644
index 00000000000..109739f50a4
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/AuthConnectionStringTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import junit.framework.TestCase;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+// See https://github.com/mongodb/specifications/tree/master/source/auth/tests
+@RunWith(Parameterized.class)
+public class AuthConnectionStringTest extends TestCase {
+    private final String filename;
+    private final String description;
+    private final String input;
+    private final BsonDocument definition;
+
+    public AuthConnectionStringTest(final String filename, final String description, final String input,
+                                    final BsonDocument definition) {
+        this.filename = filename;
+        this.description = description;
+        this.input = input;
+        this.definition = definition;
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        if (definition.getBoolean("valid").getValue()) {
+            testValidUris();
+        } else {
+            testInvalidUris();
+        }
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/auth")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        test.asDocument().getString("uri").getValue(), test.asDocument()});
+            }
+        }
+        return data;
+    }
+
+    private void testInvalidUris() {
+        Throwable expectedError = null;
+
+        try {
+            new ConnectionString(input);
+        } catch (Throwable t) {
+            expectedError = t;
+        }
+
+        assertTrue(String.format("Connection string '%s' should have throw an exception", input),
+                expectedError instanceof IllegalArgumentException);
+    }
+
+    private void testValidUris() {
+        ConnectionString connectionString = null;
+
+        try {
+            connectionString = new ConnectionString(input);
+        } catch (Throwable t) {
+            assertTrue(String.format("Connection string '%s' should not have throw an exception: %s", input, t.toString()), false);
+        }
+
+        MongoCredential credential = connectionString.getCredential();
+        assertString("auth.db", credential.getSource());
+        assertString("auth.username", credential.getUserName());
+
+        // Passwords for certain auth mechanisms are ignored.
+        String password = credential.getPassword() != null ? new String(credential.getPassword()) : null;
+        if (password != null) {
+            assertString("auth.password", password);
+        }
+        if (definition.get("options").isDocument()) {
+            for (Map.Entry<String, BsonValue> option : definition.getDocument("options").entrySet()) {
+                if (option.getKey().equals("authmechanism")) {
+                    String expected = option.getValue().asString().getValue();
+                    String actual = connectionString.getCredential().getAuthenticationMechanism().getMechanismName();
+                    assertEquals(expected, actual);
+                }
+            }
+        }
+    }
+
+    private void assertString(final String key, final String actual) {
+        BsonValue expected = definition;
+        if (key.contains(".")) {
+            for (String subKey : key.split("\\.")) {
+                expected = expected.asDocument().get(subKey);
+            }
+        } else {
+            expected = expected.asDocument().get(key);
+        }
+
+        if (expected.isNull()) {
+            assertTrue(String.format("%s should be null", key), actual == null);
+        } else if (expected.isString()) {
+            String expectedString = expected.asString().getValue();
+            assertTrue(String.format("%s should be %s but was %s", key, actual, expectedString), actual.equals(expectedString));
+        } else {
+            assertTrue(String.format("%s should be %s but was %s", key, actual, expected), false);
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/BasicDBObjectTest.java b/driver-core/src/test/unit/com/mongodb/BasicDBObjectTest.java
new file mode 100644
index 00000000000..bc26cb46346
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/BasicDBObjectTest.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import org.bson.BSONObject;
+import org.bson.BasicBSONObject;
+import org.bson.codecs.Codec;
+import org.bson.json.JsonMode;
+import org.bson.json.JsonWriterSettings;
+import org.bson.types.BasicBSONList;
+import org.bson.types.ObjectId;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
+public class BasicDBObjectTest {
+
+    private static final Codec<BasicDBObject> DECODER = DBObjectCodec.getDefaultRegistry().get(BasicDBObject.class);
+
+    @Test
+    public void testParse() {
+        BasicDBObject document = BasicDBObject.parse("{ 'int' : 1, 'string' : 'abc' }");
+        assertEquals(new BasicDBObject("int", 1).append("string", "abc"), document);
+
+        document = BasicDBObject.parse("{ 'int' : 1, 'string' : 'abc' }", DECODER);
+        assertEquals(new BasicDBObject("int", 1).append("string", "abc"), document);
+
+        document = BasicDBObject.parse("{_id : ObjectId('5524094c2cf8fb61dede210c')}");
+        assertEquals(new BasicDBObject("_id", new ObjectId("5524094c2cf8fb61dede210c")), document);
+
+        document = BasicDBObject.parse("{dbRef : {$ref: 'collection', $id: {$oid: '01234567890123456789abcd'}, $db: 'db'}}");
+        assertEquals(new BasicDBObject("dbRef", new DBRef("db", "collection", new ObjectId("01234567890123456789abcd"))), document);
+    }
+
+    @Test
+    public void testToJson() {
+        BasicDBObject document = BasicDBObject.parse("{ 'int' : 1, 'string' : 'abc', '_id' : { '$oid' : '000000000000000000000000' }, "
+                + "'dbRef' : { $ref: 'collection', $id: { $oid: '01234567890123456789abcd' }, $db: 'db' } }");
+
+        assertEquals("{\"int\": 1, \"string\": \"abc\", \"_id\": {\"$oid\": \"000000000000000000000000\"}, "
+                + "\"dbRef\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"01234567890123456789abcd\"}, \"$db\": \"db\"}}",
+                document.toJson());
+        assertEquals("{\"int\": 1, \"string\": \"abc\", \"_id\": ObjectId(\"000000000000000000000000\"), "
+                + "\"dbRef\": {\"$ref\": \"collection\", \"$id\": ObjectId(\"01234567890123456789abcd\"), \"$db\": \"db\"}}",
+                document.toJson(JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build()));
+        assertEquals("{\"int\": 1, \"string\": \"abc\", \"_id\": {\"$oid\": \"000000000000000000000000\"}, "
+                + "\"dbRef\": {\"$ref\": \"collection\", \"$id\": {\"$oid\": \"01234567890123456789abcd\"}, \"$db\": \"db\"}}",
+                document.toJson(DECODER));
+        assertEquals("{\"int\": 1, \"string\": \"abc\", \"_id\": ObjectId(\"000000000000000000000000\"), "
+                + "\"dbRef\": {\"$ref\": \"collection\", \"$id\": ObjectId(\"01234567890123456789abcd\"), \"$db\": \"db\"}}",
+                document.toJson(JsonWriterSettings.builder().outputMode(JsonMode.SHELL).build(), DECODER));
+    }
+
+    @Test
+    public void testGetDate() {
+        final Date date = new Date();
+        BasicDBObject doc = new BasicDBObject("foo", date);
+        assertTrue(doc.getDate("foo").equals(date));
+    }
+
+    @Test
+    public void testGetDateWithDefault() {
+        final Date date = new Date();
+        BasicDBObject doc = new BasicDBObject("foo", date);
+        assertTrue(doc.getDate("foo", new Date()).equals(date));
+        assertTrue(doc.getDate("bar", date).equals(date));
+    }
+
+    @Test
+    public void testGetObjectId() {
+        final ObjectId objId = ObjectId.get();
+        BasicDBObject doc = new BasicDBObject("foo", objId);
+        assertTrue(doc.getObjectId("foo").equals(objId));
+    }
+
+    @Test
+    public void testGetObjectIdWithDefault() {
+        final ObjectId objId = ObjectId.get();
+        BasicDBObject doc = new BasicDBObject("foo", objId);
+        assertTrue(doc.getObjectId("foo", ObjectId.get()).equals(objId));
+        assertTrue(doc.getObjectId("bar", objId).equals(objId));
+    }
+
+    @Test
+    public void testGetLongWithDefault() {
+        final long test = 100;
+        BasicDBObject doc = new BasicDBObject("foo", test);
+        assertTrue(doc.getLong("foo", 0L) == test);
+        assertTrue(doc.getLong("bar", 0L) == 0L);
+    }
+
+    @Test
+    public void testGetDoubleWithDefault() {
+        BasicDBObject doc = new BasicDBObject("foo", Double.MAX_VALUE);
+        assertTrue(doc.getDouble("foo", (double) 0) == Double.MAX_VALUE);
+        assertTrue(doc.getDouble("bar", Double.MIN_VALUE) == Double.MIN_VALUE);
+    }
+
+    @Test
+    public void testGetStringWithDefault() {
+        BasicDBObject doc = new BasicDBObject("foo", "badmf");
+        assertTrue(doc.getString("foo", "ID").equals("badmf"));
+        assertTrue(doc.getString("bar", "DEFAULT").equals("DEFAULT"));
+    }
+
+    @Test
+    public void testBuilderIsEmpty() {
+        BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
+        assertTrue(b.isEmpty());
+        b.append("a", 1);
+        assertFalse(b.isEmpty());
+        Assert.assertEquals(b.get(), new BasicDBObject("a", 1));
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void testBuilderNested() {
+        BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
+        b.add("a", 1);
+        b.push("b").append("c", 2).pop();
+        DBObject a = b.get();
+        Assert.assertEquals(a, new BasicDBObject("a", 1).append("b", new BasicDBObject("c", 2)));
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void testDown1() {
+        BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
+        b.append("x", 1);
+        b.push("y");
+        b.append("a", 2);
+        b.pop();
+        b.push("z");
+        b.append("b", 3);
+
+        Assert.assertEquals(b.get(),
+                new BasicDBObject("x", 1).append("y", new BasicDBObject("a", 2)).append("z", new BasicDBObject("b", 3)));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        assertEquality(new BasicDBObject(), new BasicDBObject());
+
+        assertEquality(new BasicDBObject("x", 1), new BasicDBObject("x", 1));
+        assertEquality(new BasicDBObject("x", 1), new BasicBSONObject("x", 1));
+
+        assertInequality(new BasicDBObject("x", 1), new BasicDBObject("x", 2));
+        assertInequality(new BasicDBObject("x", 1), new BasicBSONObject("x", 2));
+
+        assertInequality(new BasicDBObject("x", 1), new BasicDBObject("y", 1));
+        assertInequality(new BasicDBObject("x", 1), new BasicBSONObject("y", 1));
+
+        assertEquality(new BasicDBObject("x", asList(1, 2, 3)), new BasicDBObject("x", new int[]{1, 2, 3}));
+        assertEquality(new BasicDBObject("x", asList(1, 2, 3)), new BasicBSONObject("x", asList(1, 2, 3)));
+
+        BasicDBList list = new BasicDBList();
+        list.put(0, 1);
+        list.put(1, 2);
+        list.put(2, 3);
+
+        assertEquality(new BasicDBObject("x", asList(1, 2, 3)), new BasicDBObject("x", list));
+        assertEquality(new BasicDBObject("x", asList(1, 2, 3)), new BasicBSONObject("x", list));
+
+
+        assertEquality(new BasicDBObject("x", 1).append("y", 2), new BasicDBObject("y", 2).append("x", 1));
+        assertEquality(new BasicDBObject("x", 1).append("y", 2), new BasicBSONObject("y", 2).append("x", 1));
+
+        assertEquality(new BasicDBObject("a", new BasicDBObject("y", 2).append("x", 1)),
+                       new BasicDBObject("a", new BasicDBObject("x", 1).append("y", 2)));
+        assertEquality(new BasicDBObject("a", new BasicDBObject("y", 2).append("x", 1)),
+                       new BasicBSONObject("a", new BasicBSONObject("x", 1).append("y", 2)));
+
+        assertEquality(new BasicDBObject("a", asList(new BasicDBObject("y", 2).append("x", 1))),
+                       new BasicDBObject("a", asList(new BasicDBObject("x", 1).append("y", 2))));
+        assertEquality(new BasicDBObject("a", asList(new BasicDBObject("y", 2).append("x", 1))),
+                       new BasicBSONObject("a", asList(new BasicBSONObject("x", 1).append("y", 2))));
+
+        assertEquality(new BasicDBObject("a", new BasicDBList().put(1, new BasicDBObject("y", 2).append("x", 1))),
+                       new BasicDBObject("a", new BasicDBList().put(1, new BasicDBObject("x", 1).append("y", 2))));
+        assertEquality(new BasicDBObject("a", new BasicDBList().put(1, new BasicDBObject("y", 2).append("x", 1))),
+                       new BasicBSONObject("a", new BasicBSONList().put(1, new BasicBSONObject("x", 1).append("y", 2))));
+
+        Map<String, Object> first = new HashMap<String, Object>();
+        first.put("1", new BasicDBObject("y", 2).append("x", 1));
+        first.put("2", new BasicDBObject("a", 2).append("b", 1));
+        Map<String, Object> second = new TreeMap<String, Object>();
+        second.put("2", new BasicDBObject("b", 1).append("a", 2));
+        second.put("1", new BasicDBObject("x", 1).append("y", 2));
+        Map<String, Object> third = new TreeMap<String, Object>();
+        third.put("2", new BasicBSONObject("a", 2).append("b", 1));
+        third.put("1", new BasicBSONObject("x", 1).append("y", 2));
+
+        assertEquality(new BasicDBObject("a", first), new BasicDBObject("a", second));
+        assertEquality(new BasicDBObject("a", first), new BasicBSONObject("a", third));
+    }
+
+    void assertEquality(final BSONObject x, final BSONObject y) {
+        assertEquals(x, y);
+        assertEquals(y, x);
+        assertEquals(x.hashCode(), y.hashCode());
+    }
+
+    void assertInequality(final BSONObject x, final BSONObject y) {
+        assertThat(x, not(y));
+        assertThat(y, not(x));
+        assertThat(x.hashCode(), not(y.hashCode()));
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy
index 09bcdffbebb..9f1448142f3 100644
--- a/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,22 @@
 
 package com.mongodb
 
+import org.bson.UuidRepresentation
 import spock.lang.Specification
 import spock.lang.Unroll
 
+import static com.mongodb.MongoCompressor.LEVEL
+import static com.mongodb.MongoCompressor.createZlibCompressor
+import static com.mongodb.MongoCompressor.createZstdCompressor
 import static com.mongodb.MongoCredential.createCredential
 import static com.mongodb.MongoCredential.createGSSAPICredential
 import static com.mongodb.MongoCredential.createMongoCRCredential
 import static com.mongodb.MongoCredential.createMongoX509Credential
 import static com.mongodb.MongoCredential.createPlainCredential
 import static com.mongodb.MongoCredential.createScramSha1Credential
+import static com.mongodb.MongoCredential.createScramSha256Credential
 import static com.mongodb.ReadPreference.primary
+import static com.mongodb.ReadPreference.secondary
 import static com.mongodb.ReadPreference.secondaryPreferred
 import static java.util.Arrays.asList
 import static java.util.concurrent.TimeUnit.MILLISECONDS
@@ -35,21 +41,27 @@ class ConnectionStringSpecification extends Specification {
     @Unroll
     def 'should parse #connectionString into correct components'() {
         expect:
-        connectionString.getHosts().size() == num;
-        connectionString.getHosts() == hosts;
-        connectionString.getDatabase() == database;
-        connectionString.getCollection() == collection;
-        connectionString.getUsername() == username;
-        connectionString.getPassword() == password;
+        connectionString.getHosts().size() == num
+        connectionString.getHosts() == hosts
+        connectionString.getDatabase() == database
+        connectionString.getCollection() == collection
+        connectionString.getUsername() == username
+        connectionString.getPassword() == password
 
         where:
         connectionString                                 | num | hosts              | database | collection | username | password
         new ConnectionString('mongodb://db.example.com') | 1   | ['db.example.com'] | null     | null       | null     | null
         new ConnectionString('mongodb://10.0.0.1')       | 1   | ['10.0.0.1']       | null     | null       | null     | null
         new ConnectionString('mongodb://[::1]')          | 1   | ['[::1]']          | null     | null       | null     | null
+        new ConnectionString('mongodb://%2Ftmp%2Fmongo'
+                + 'db-27017.sock')                       | 1   | ['/tmp/mongodb'
+                                                                  + '-27017.sock']  | null     | null       | null     | null
         new ConnectionString('mongodb://foo/bar')        | 1   | ['foo']            | 'bar'    | null       | null     | null
         new ConnectionString('mongodb://10.0.0.1/bar')   | 1   | ['10.0.0.1']       | 'bar'    | null       | null     | null
         new ConnectionString('mongodb://[::1]/bar')      | 1   | ['[::1]']          | 'bar'    | null       | null     | null
+        new ConnectionString('mongodb://%2Ftmp%2Fmongo'
+                + 'db-27017.sock/bar')                   | 1   | ['/tmp/mongodb'
+                                                                  + '-27017.sock']  | 'bar'    | null       | null     | null
         new ConnectionString('mongodb://localhost/' +
                                    'test.my.coll')       | 1   | ['localhost']      | 'test'   | 'my.coll'  | null     | null
         new ConnectionString('mongodb://foo/bar.goo')    | 1   | ['foo']            | 'bar'    | 'goo'      | null     | null
@@ -68,16 +80,39 @@ class ConnectionStringSpecification extends Specification {
                                                                 'host3:9',
                                                                 'host:7']          | 'bar'    | null       | 'user'   | 'pass' as char[]
         new ConnectionString('mongodb://user:pass@' +
-                           '10.0.0.1:7,' +
-                           '[::1]:8,' +
-                           'host3:9/bar')                | 3   | ['10.0.0.1:7',
+                '10.0.0.1:7,' +
+                '[::1]:8,' +
+                'host3:9/bar')                          | 3   | ['10.0.0.1:7',
                                                                 '[::1]:8',
                                                                 'host3:9']          | 'bar'    | null       | 'user'   | 'pass' as char[]
+        new ConnectionString('mongodb://user:pass@'
+                + '%2Ftmp%2Fmongodb-27017.sock,'
+                + '%2Ftmp%2Fmongodb-27018.sock,'
+                + '%2Ftmp%2Fmongodb-27019.sock/bar')    | 3   | ['/tmp/mongodb-27017.sock',
+                                                                 '/tmp/mongodb-27018.sock',
+                                                                 '/tmp/mongodb-27019.sock'
+                                                                ]                   | 'bar'    | null       | 'user'   | 'pass' as char[]
+    }
+
+    def 'should throw exception if mongod+srv host contains a port'() {
+        when:
+        new ConnectionString('mongodb+srv://host1:27017')
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should throw exception if mongod+srv contains multiple hosts'() {
+        when:
+        new ConnectionString('mongodb+srv://host1,host2')
+
+        then:
+        thrown(IllegalArgumentException)
     }
 
     def 'should correctly parse different write concerns'() {
         expect:
-        uri.getWriteConcern() == writeConcern;
+        uri.getWriteConcern() == writeConcern
 
         where:
         uri                                                                                  | writeConcern
@@ -92,6 +127,64 @@ class ConnectionStringSpecification extends Specification {
         new ConnectionString('mongodb://localhost/?w=majority&wtimeout=5&fsync=true&j=true') | new WriteConcern('majority', 5, true, true)
     }
 
+    def 'should correctly parse different UUID representations'() {
+        expect:
+        uri.getUuidRepresentation() == uuidRepresentation
+
+        where:
+        uri                                                                           | uuidRepresentation
+        new ConnectionString('mongodb://localhost')                                   | null
+        new ConnectionString('mongodb://localhost/?uuidRepresentation=unspecified')   | UuidRepresentation.UNSPECIFIED
+        new ConnectionString('mongodb://localhost/?uuidRepresentation=javaLegacy')    | UuidRepresentation.JAVA_LEGACY
+        new ConnectionString('mongodb://localhost/?uuidRepresentation=csharpLegacy')  | UuidRepresentation.C_SHARP_LEGACY
+        new ConnectionString('mongodb://localhost/?uuidRepresentation=pythonLegacy')  | UuidRepresentation.PYTHON_LEGACY
+        new ConnectionString('mongodb://localhost/?uuidRepresentation=standard')      | UuidRepresentation.STANDARD
+    }
+
+    @Unroll
+    def 'should correctly parse retryWrites'() {
+        expect:
+        uri.getRetryWrites() == retryWrites
+        uri.getRetryWritesValue() == retryWritesValue
+
+        where:
+        uri                                                                            | retryWrites | retryWritesValue
+        new ConnectionString('mongodb://localhost/')                    | true        | null
+        new ConnectionString('mongodb://localhost/?retryWrites=false')  | false       | false
+        new ConnectionString('mongodb://localhost/?retryWrites=true')   | true        | true
+        new ConnectionString('mongodb://localhost/?retryWrites=foos')   | true        | null
+    }
+
+    @Unroll
+    def 'should parse range of boolean values'() {
+        expect:
+        uri.getSslEnabled() == value
+
+        where:
+        uri                                                                   | value
+        new ConnectionString('mongodb://localhost/?tls=true')  | true
+        new ConnectionString('mongodb://localhost/?tls=yes')   | true
+        new ConnectionString('mongodb://localhost/?tls=1')     | true
+        new ConnectionString('mongodb://localhost/?tls=false') | false
+        new ConnectionString('mongodb://localhost/?tls=no')    | false
+        new ConnectionString('mongodb://localhost/?tls=0')     | false
+        new ConnectionString('mongodb://localhost/?tls=foo')   | null
+        new ConnectionString('mongodb://localhost')            | null
+    }
+
+    @Unroll
+    def 'should correct parse retryReads'() {
+        expect:
+        uri.getRetryReads() == retryReads
+
+        where:
+        uri                                                                           | retryReads
+        new ConnectionString('mongodb://localhost/')                    | null
+        new ConnectionString('mongodb://localhost/?retryReads=false')   | false
+        new ConnectionString('mongodb://localhost/?retryReads=true')    | true
+        new ConnectionString('mongodb://localhost/?retryReads=foos')    | null
+    }
+
     @Unroll
     def 'should correctly parse URI options for #type'() {
         expect:
@@ -112,6 +205,7 @@ class ConnectionStringSpecification extends Specification {
         connectionString.getLocalThreshold() == 30
         connectionString.getHeartbeatFrequency() == 20000
         connectionString.getStreamType() == 'netty'
+        connectionString.getApplicationName() == 'app1'
 
         where:
         connectionString <<
@@ -122,7 +216,8 @@ class ConnectionStringSpecification extends Specification {
                                             + 'sslInvalidHostNameAllowed=true&'
                                             + 'serverSelectionTimeoutMS=25000&'
                                             + 'localThresholdMS=30&'
-                                            + 'heartbeatFrequencyMS=20000'),
+                                            + 'heartbeatFrequencyMS=20000&'
+                                            + 'appName=app1'),
                  new ConnectionString('mongodb://localhost/?minPoolSize=5;maxPoolSize=10;waitQueueMultiple=7;waitQueueTimeoutMS=150;'
                                             + 'maxIdleTimeMS=200;maxLifeTimeMS=300;replicaSet=test;'
                                             + 'connectTimeoutMS=2500;socketTimeoutMS=5500;'
@@ -130,7 +225,8 @@ class ConnectionStringSpecification extends Specification {
                                             + 'sslInvalidHostNameAllowed=true;'
                                             + 'serverSelectionTimeoutMS=25000;'
                                             + 'localThresholdMS=30;'
-                                            + 'heartbeatFrequencyMS=20000'),
+                                            + 'heartbeatFrequencyMS=20000;'
+                                            + 'appName=app1'),
                  new ConnectionString('mongodb://localhost/test?minPoolSize=5;maxPoolSize=10&waitQueueMultiple=7;waitQueueTimeoutMS=150;'
                                             + 'maxIdleTimeMS=200&maxLifeTimeMS=300&replicaSet=test;'
                                             + 'connectTimeoutMS=2500;'
@@ -139,13 +235,142 @@ class ConnectionStringSpecification extends Specification {
                                             + 'sslInvalidHostNameAllowed=true;'
                                             + 'serverSelectionTimeoutMS=25000&'
                                             + 'localThresholdMS=30;'
-                                            + 'heartbeatFrequencyMS=20000')]
+                                            + 'heartbeatFrequencyMS=20000&'
+                                            + 'appName=app1')]
         //for documentation, i.e. the Unroll description for each type
         type << ['amp', 'semi', 'mixed']
     }
 
+    def 'should parse options to enable TLS'() {
+        when:
+        def connectionString = new ConnectionString('mongodb://localhost/?ssl=false')
+
+        then:
+        connectionString.getSslEnabled() == false
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?ssl=true')
+
+        then:
+        connectionString.getSslEnabled()
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?ssl=foo')
+
+        then:
+        connectionString.getSslEnabled() == null
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=false')
+
+        then:
+        connectionString.getSslEnabled() == false
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true')
+
+        then:
+        connectionString.getSslEnabled()
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=foo')
+
+        then:
+        connectionString.getSslEnabled() == null
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true&ssl=false')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=false&ssl=true')
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should parse options to enable TLS invalid host names'() {
+        when:
+        def connectionString = new ConnectionString('mongodb://localhost/?ssl=true&sslInvalidHostNameAllowed=false')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed() == false
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?ssl=true&sslInvalidHostNameAllowed=true')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed()
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?ssl=true&sslInvalidHostNameAllowed=foo')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed() == null
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true&tlsAllowInvalidHostnames=false')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed() == false
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true&tlsAllowInvalidHostnames=true')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed()
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true&tlsAllowInvalidHostnames=foo')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed() == null
+
+        when:
+        connectionString = new ConnectionString(
+                'mongodb://localhost/?tls=true&tlsAllowInvalidHostnames=false&sslInvalidHostNameAllowed=true')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed() == false
+
+        when:
+        connectionString = new ConnectionString(
+                'mongodb://localhost/?tls=true&tlsAllowInvalidHostnames=true&sslInvalidHostNameAllowed=false')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed()
+    }
+
+    def 'should parse options to enable unsecured TLS'() {
+        when:
+        def connectionString = new ConnectionString('mongodb://localhost/?tls=true&tlsInsecure=true')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed()
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true&tlsInsecure=false')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed() == false
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true&tlsAllowInvalidHostnames=false')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed() == false
+
+        when:
+        connectionString = new ConnectionString('mongodb://localhost/?tls=true&tlsAllowInvalidHostnames=true')
+
+        then:
+        connectionString.getSslInvalidHostnameAllowed()
+    }
+
     @Unroll
-    def 'should throw Exception when the string #cause'() {
+    def 'should throw IllegalArgumentException when the string #cause'() {
         when:
         new ConnectionString(connectionString);
 
@@ -156,7 +381,6 @@ class ConnectionStringSpecification extends Specification {
 
         cause                                       | connectionString
         'is not a connection string'                | 'hello world'
-        'is a unix socket'                          | 'mongodb://%2Ftmp%2Fmongodb-27017.sock'
         'is missing a host'                         | 'mongodb://'
         'has an empty host'                         | 'mongodb://localhost:27017,,localhost:27019'
         'has an malformed IPv6 host'                | 'mongodb://[::1'
@@ -171,12 +395,20 @@ class ConnectionStringSpecification extends Specification {
         'has incomplete options'                    | 'mongodb://localhost/?wTimeout'
         'has an unknown auth mechanism'             | 'mongodb://user:password@localhost/?authMechanism=postItNote'
         'invalid readConcern'                       | 'mongodb://localhost:27017/?readConcernLevel=pickThree'
-
+        'contains tags but no mode'                 | 'mongodb://localhost:27017/?readPreferenceTags=dc:ny'
+        'contains max staleness but no mode'        | 'mongodb://localhost:27017/?maxStalenessSeconds=100.5'
+        'contains tags and primary mode'            | 'mongodb://localhost:27017/?readPreference=primary&readPreferenceTags=dc:ny'
+        'contains max staleness and primary mode'   | 'mongodb://localhost:27017/?readPreference=primary&maxStalenessSeconds=100'
+        'contains non-integral max staleness'       | 'mongodb://localhost:27017/?readPreference=secondary&maxStalenessSeconds=100.0'
+        'contains GSSAPI mechanism with no user'    | 'mongodb://localhost:27017/?authMechanism=GSSAPI'
+        'contains SCRAM mechanism with no user'     | 'mongodb://localhost:27017/?authMechanism=SCRAM-SHA-1'
+        'contains MONGODB mechanism with no user'   | 'mongodb://localhost:27017/?authMechanism=MONGODB-CR'
+        'contains PLAIN mechanism with no user'     | 'mongodb://localhost:27017/?authMechanism=PLAIN'
     }
 
     def 'should have correct defaults for options'() {
         when:
-        def connectionString = new ConnectionString('mongodb://localhost');
+        def connectionString = new ConnectionString('mongodb://localhost')
 
         then:
         connectionString.getMaxConnectionPoolSize() == null;
@@ -189,58 +421,94 @@ class ConnectionStringSpecification extends Specification {
         connectionString.getReadPreference() == null;
         connectionString.getRequiredReplicaSetName() == null
         connectionString.getSslEnabled() == null
+        connectionString.getSslInvalidHostnameAllowed() == null
         connectionString.getStreamType() == null
+        connectionString.getApplicationName() == null
+        connectionString.getCompressorList() == []
+        connectionString.getRetryWrites()
+        connectionString.getRetryWritesValue() == null
+        connectionString.getRetryReads() == null
     }
 
     @Unroll
     def 'should support all credential types'() {
         expect:
-        uri.credentialList == credentialList
+        uri.credential == credential
+        uri.credentialList == [credential]
 
         where:
-        uri                                                   | credentialList
-        new ConnectionString('mongodb://jeff:123@localhost')  | asList(createCredential('jeff', 'admin', '123'.toCharArray()))
+        uri                                                   | credential
+        new ConnectionString('mongodb://jeff:123@localhost')  | createCredential('jeff', 'admin', '123'.toCharArray())
         new ConnectionString('mongodb://jeff:123@localhost/?' +
-                           '&authSource=test')                | asList(createCredential('jeff', 'test', '123'.toCharArray()))
+                           '&authSource=test')                | createCredential('jeff', 'test', '123'.toCharArray())
         new ConnectionString('mongodb://jeff:123@localhost/?' +
-                           'authMechanism=MONGODB-CR')        | asList(createMongoCRCredential('jeff', 'admin', '123'.toCharArray()))
+                           'authMechanism=MONGODB-CR')        | createMongoCRCredential('jeff', 'admin', '123'.toCharArray())
         new ConnectionString('mongodb://jeff:123@localhost/?' +
                            'authMechanism=MONGODB-CR' +
-                           '&authSource=test')                | asList(createMongoCRCredential('jeff', 'test', '123'.toCharArray()))
+                           '&authSource=test')                | createMongoCRCredential('jeff', 'test', '123'.toCharArray())
         new ConnectionString('mongodb://jeff:123@localhost/?' +
-                             'authMechanism=SCRAM-SHA-1')     | asList(createScramSha1Credential('jeff', 'admin', '123'.toCharArray()))
+                             'authMechanism=SCRAM-SHA-1')     | createScramSha1Credential('jeff', 'admin', '123'.toCharArray())
         new ConnectionString('mongodb://jeff:123@localhost/?' +
                              'authMechanism=SCRAM-SHA-1' +
-                             '&authSource=test')              | asList(createScramSha1Credential('jeff', 'test', '123'.toCharArray()))
+                             '&authSource=test')              | createScramSha1Credential('jeff', 'test', '123'.toCharArray())
+        new ConnectionString('mongodb://jeff:123@localhost/?' +
+                'authMechanism=SCRAM-SHA-256')                | createScramSha256Credential('jeff', 'admin', '123'.toCharArray())
+        new ConnectionString('mongodb://jeff:123@localhost/?' +
+                'authMechanism=SCRAM-SHA-256' +
+                '&authSource=test')                           | createScramSha256Credential('jeff', 'test', '123'.toCharArray())
         new ConnectionString('mongodb://jeff@localhost/?' +
-                           'authMechanism=GSSAPI')            | asList(createGSSAPICredential('jeff'))
+                           'authMechanism=GSSAPI')            | createGSSAPICredential('jeff')
         new ConnectionString('mongodb://jeff:123@localhost/?' +
-                           'authMechanism=PLAIN')             | asList(createPlainCredential('jeff', 'admin', '123'.toCharArray()))
+                           'authMechanism=PLAIN')             | createPlainCredential('jeff', '$external', '123'.toCharArray())
         new ConnectionString('mongodb://jeff@localhost/?' +
-                           'authMechanism=MONGODB-X509')      | asList(createMongoX509Credential('jeff'))
+                           'authMechanism=MONGODB-X509')      | createMongoX509Credential('jeff')
+        new ConnectionString('mongodb://localhost/?' +
+                           'authMechanism=MONGODB-X509')      | createMongoX509Credential()
         new ConnectionString('mongodb://jeff@localhost/?' +
                            'authMechanism=GSSAPI' +
-                           '&gssapiServiceName=foo')          | asList(createGSSAPICredential('jeff')
-                                                                            .withMechanismProperty('SERVICE_NAME', 'foo'))
+                           '&gssapiServiceName=foo')          | createGSSAPICredential('jeff')
+                                                                            .withMechanismProperty('SERVICE_NAME', 'foo')
         new ConnectionString('mongodb://jeff@localhost/?' +
                              'authMechanism=GSSAPI' +
                              '&authMechanismProperties=' +
-                             'SERVICE_NAME:foo')              | asList(createGSSAPICredential('jeff')
-                                                                            .withMechanismProperty('SERVICE_NAME', 'foo'))
+                             'SERVICE_NAME:foo')              | createGSSAPICredential('jeff')
+                                                                            .withMechanismProperty('SERVICE_NAME', 'foo')
         new ConnectionString('mongodb://jeff@localhost/?' +
                              'authMechanism=GSSAPI' +
                              '&authMechanismProperties=' +
-                             'SERVICE_NAME :foo')              | asList(createGSSAPICredential('jeff')
-                                                                            .withMechanismProperty('SERVICE_NAME', 'foo'))
+                             'SERVICE_NAME :foo')              | createGSSAPICredential('jeff')
+                                                                            .withMechanismProperty('SERVICE_NAME', 'foo')
         new ConnectionString('mongodb://jeff@localhost/?' +
                              'authMechanism=GSSAPI' +
                              '&authMechanismProperties=' +
                              'SERVICE_NAME:foo,' +
                              'CANONICALIZE_HOST_NAME:true,' +
-                             'SERVICE_REALM:AWESOME')        | asList(createGSSAPICredential('jeff')
+                             'SERVICE_REALM:AWESOME')        | createGSSAPICredential('jeff')
                                                                           .withMechanismProperty('SERVICE_NAME', 'foo')
                                                                           .withMechanismProperty('CANONICALIZE_HOST_NAME', true)
-                                                                          .withMechanismProperty('SERVICE_REALM', 'AWESOME'))
+                                                                          .withMechanismProperty('SERVICE_REALM', 'AWESOME')
+    }
+
+    def 'should ignore authSource if there is no credential'() {
+        expect:
+        new ConnectionString('mongodb://localhost/?authSource=test').credentialList == []
+    }
+
+    def 'should ignore authMechanismProperties if there is no credential'() {
+        expect:
+        new ConnectionString('mongodb://localhost/?&authMechanismProperties=SERVICE_REALM:AWESOME').credentialList == []
+    }
+
+    @Unroll
+    def 'should create immutable credential list'() {
+        when:
+        uri.credentialList.add(createGSSAPICredential('user'))
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        where:
+        uri << [new ConnectionString('mongodb://jeff:123@localhost'), new ConnectionString('mongodb://localhost')]
     }
 
     def 'should support thrown an IllegalArgumentException when given invalid authMechanismProperties'() {
@@ -272,10 +540,16 @@ class ConnectionStringSpecification extends Specification {
 
         where:
         uri                                                              | readPreference
+        new ConnectionString('mongodb://localhost')                      | null
+        new ConnectionString('mongodb://localhost/' +
+                '?readPreference=primary')                               | primary()
+        new ConnectionString('mongodb://localhost/' +
+                '?readPreference=secondary')                             | secondary()
         new ConnectionString('mongodb://localhost/' +
                                    '?readPreference=secondaryPreferred') | secondaryPreferred()
         new ConnectionString('mongodb://localhost/?slaveOk=true')        | secondaryPreferred()
         new ConnectionString('mongodb://localhost/?slaveOk=false')       | primary()
+        new ConnectionString('mongodb://localhost/?slaveOk=foo')         | primary()
         new ConnectionString('mongodb://localhost/' +
                                    '?readPreference=secondaryPreferred' +
                                    '&readPreferenceTags=dc:ny,rack:1' +
@@ -284,6 +558,18 @@ class ConnectionStringSpecification extends Specification {
                                                                                                                  new Tag('rack', '1'))),
                                                                                                new TagSet(asList(new Tag('dc', 'ny'))),
                                                                                                new TagSet()])
+        new ConnectionString('mongodb://localhost/' +
+                '?readPreference=secondary' +
+                '&maxStalenessSeconds=120')                              | secondary(120000, MILLISECONDS)
+        new ConnectionString('mongodb://localhost/' +
+                '?readPreference=secondary' +
+                '&maxStalenessSeconds=0')                                | secondary(0, MILLISECONDS)
+        new ConnectionString('mongodb://localhost/' +
+                '?readPreference=secondary' +
+                '&maxStalenessSeconds=-1')                               | secondary()
+        new ConnectionString('mongodb://localhost/' +
+                '?readPreference=primary' +
+                '&maxStalenessSeconds=-1')                               | primary()
     }
 
     @Unroll
@@ -298,6 +584,19 @@ class ConnectionStringSpecification extends Specification {
         new ConnectionString('mongodb://localhost/?readConcernLevel=majority')  | ReadConcern.MAJORITY
     }
 
+    @Unroll
+    def 'should parse compressors'() {
+        expect:
+        uri.getCompressorList() == [compressor]
+
+        where:
+        uri                                                                          | compressor
+        new ConnectionString('mongodb://localhost/?compressors=zlib') | createZlibCompressor()
+        new ConnectionString('mongodb://localhost/?compressors=zlib' +
+                '&zlibCompressionLevel=5')                                           | createZlibCompressor().withProperty(LEVEL, 5)
+        new ConnectionString('mongodb://localhost/?compressors=zstd') | createZstdCompressor()
+    }
+
     def 'should be equal to another instance with the same string values'() {
         expect:
         uri1 == uri2
@@ -324,7 +623,7 @@ class ConnectionStringSpecification extends Specification {
         new ConnectionString('mongodb://ross:123@localhost/?'
                              + 'authMechanism=SCRAM-SHA-1')         | new ConnectionString('mongodb://ross:123@localhost/?'
                                                                                            + 'authMechanism=SCRAM-SHA-1')
-        new ConnectionString('mongodb://localhost/db/coll'
+        new ConnectionString('mongodb://localhost/db.coll'
                              + '?minPoolSize=5;'
                              + 'maxPoolSize=10;waitQueueMultiple=7;'
                              + 'waitQueueTimeoutMS=150;'
@@ -334,7 +633,7 @@ class ConnectionStringSpecification extends Specification {
                              + 'socketTimeoutMS=5500;'
                              + 'safe=false;w=1;wtimeout=2500;'
                              + 'fsync=true;readPreference=primary;'
-                             + 'ssl=true')                           |  new ConnectionString('mongodb://localhost/db/coll?minPoolSize=5;'
+                             + 'ssl=true')                           |  new ConnectionString('mongodb://localhost/db.coll?minPoolSize=5;'
                                                                                              + 'maxPoolSize=10&waitQueueMultiple=7;'
                                                                                              + 'waitQueueTimeoutMS=150;'
                                                                                              + 'maxIdleTimeMS=200&maxLifeTimeMS=300'
@@ -347,6 +646,7 @@ class ConnectionStringSpecification extends Specification {
     def 'should be not equal to another ConnectionString with the different string values'() {
         expect:
         uri1 != uri2
+        uri1.hashCode() != uri2.hashCode()
 
         where:
         uri1                                                        | uri2
@@ -370,4 +670,35 @@ class ConnectionStringSpecification extends Specification {
                            + 'authMechanism=SCRAM-SHA-1')            | new ConnectionString('mongodb://ross:123@localhost/?'
                                                                                           + 'authMechanism=GSSAPI')
     }
+
+    def 'should recognize SRV protocol'() {
+        when:
+        def connectionString = new ConnectionString('mongodb+srv://test5.test.build.10gen.cc')
+
+        then:
+        connectionString.isSrvProtocol()
+        connectionString.hosts == ['test5.test.build.10gen.cc']
+    }
+
+
+    // these next two tests are functionally part of the initial-dns-seedlist-discovery specification tests, but since those
+    // tests require that the driver connects to an actual replica set, it isn't possible to create specification tests
+    // with URIs containing user names, since connection to a replica set that doesn't have that user defined would fail.
+    // So to ensure there is proper test coverage of an authSource property specified in a TXT record, adding those tests here.
+
+    def 'should use authSource from TXT record'() {
+        given:
+        def uri = new ConnectionString('mongodb+srv://bob:pwd@test5.test.build.10gen.cc/')
+
+        expect:
+        uri.credential == createCredential('bob', 'thisDB', 'pwd'.toCharArray())
+    }
+
+    def 'should override authSource from TXT record with authSource from connectionString'() {
+        given:
+        def uri = new ConnectionString('mongodb+srv://bob:pwd@test5.test.build.10gen.cc/?authSource=otherDB')
+
+        expect:
+        uri.credential == createCredential('bob', 'otherDB', 'pwd'.toCharArray())
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java b/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
index 047b44797b4..c18220676c4 100644
--- a/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
+++ b/driver-core/src/test/unit/com/mongodb/ConnectionStringTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,16 +14,11 @@
  * limitations under the License.
  */
 
-package com.mongodb.client;
+package com.mongodb;
 
-import com.mongodb.AuthenticationMechanism;
-import com.mongodb.ConnectionString;
-import com.mongodb.MongoCredential;
-import junit.framework.TestCase;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import util.JsonPoweredTestHelper;
 
@@ -33,49 +28,41 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
-// See https://github.com/mongodb/specifications/tree/master/source/crud/tests
-@RunWith(Parameterized.class)
-public class ConnectionStringTest extends TestCase {
-    private final String filename;
-    private final String description;
-    private final String input;
-    private final BsonDocument definition;
-
-    public ConnectionStringTest(final String filename, final String description, final String input,
-                                final BsonDocument definition) {
-        this.filename = filename;
-        this.description = description;
-        this.input = input;
-        this.definition = definition;
+// See https://github.com/mongodb/specifications/tree/master/source/connection-string/tests
+public class ConnectionStringTest extends AbstractConnectionStringTest {
+    public ConnectionStringTest(final String filename, final String description, final String input, final BsonDocument definition) {
+        super(filename, description, input, definition);
     }
 
     @Test
     public void shouldPassAllOutcomes() {
-        if (filename.equals("invalid-uris.json")) {
+        if (getFilename().equals("invalid-uris.json")) {
             testInvalidUris();
-        } else if (filename.equals("valid-auth.json")) {
+        } else if (getFilename().equals("valid-auth.json")) {
+            testValidAuth();
+        } else if (getFilename().equals("valid-db-with-dotted-name.json")) {
+            testValidHostIdentifiers();
             testValidAuth();
-        } else if (filename.equals("valid-host_identifiers.json")) {
+        } else if (getFilename().equals("valid-host_identifiers.json")) {
             testValidHostIdentifiers();
-        } else if (filename.equals("valid-options.json")) {
+        } else if (getFilename().equals("valid-options.json")) {
             testValidOptions();
-        } else if (filename.equals("valid-unix_socket-absolute.json")) {
-            testInvalidUris();  // Sockets aren't supported
-        } else if (filename.equals("valid-unix_socket-relative.json")) {
-            testInvalidUris();  // Sockets aren't supported
-        } else if (filename.equals("valid-warnings.json")) {
+        } else if (getFilename().equals("valid-unix_socket-absolute.json")) {
+            testValidHostIdentifiers();
+        } else if (getFilename().equals("valid-unix_socket-relative.json")) {
             testValidHostIdentifiers();
-            if (!definition.get("options").isNull()) {
+        } else if (getFilename().equals("valid-warnings.json")) {
+            testValidHostIdentifiers();
+            if (!getDefinition().get("options").isNull()) {
                 testValidOptions();
             }
         } else {
-            throw new IllegalArgumentException("Unsupported file: " + filename);
+            throw new IllegalArgumentException("Unsupported file: " + getFilename());
         }
     }
 
+
     @Parameterized.Parameters(name = "{1}")
     public static Collection<Object[]> data() throws URISyntaxException, IOException {
         List<Object[]> data = new ArrayList<Object[]>();
@@ -88,150 +75,4 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
         }
         return data;
     }
-
-    private void testInvalidUris() {
-        Throwable expectedError = null;
-
-        try {
-            new ConnectionString(input);
-        } catch (Throwable t) {
-            expectedError = t;
-        }
-
-        assertTrue(String.format("Connection string '%s' should have throw an exception", input),
-                expectedError instanceof IllegalArgumentException);
-    }
-
-    private void testValidHostIdentifiers() {
-        ConnectionString connectionString = null;
-        try {
-            connectionString = new ConnectionString(input);
-        } catch (Throwable t) {
-            assertTrue(String.format("Connection string '%s' should not have throw an exception: %s", input, t.toString()), false);
-        }
-
-        assertExpectedHosts(connectionString.getHosts());
-    }
-
-    private void testValidOptions() {
-        ConnectionString connectionString = null;
-
-        try {
-            connectionString = new ConnectionString(input);
-        } catch (Throwable t) {
-            assertTrue(String.format("Connection string '%s' should not have throw an exception: %s", input, t.toString()), false);
-        }
-
-        for (Map.Entry<String, BsonValue> option : definition.getDocument("options").entrySet()) {
-            if (option.getKey().equals("authmechanism")) {
-                String expected = option.getValue().asString().getValue();
-                String actual = connectionString.getCredentialList().get(0).getAuthenticationMechanism().getMechanismName();
-                assertEquals(expected, actual);
-            } else if (option.getKey().equals("replicaset")) {
-                String expected = option.getValue().asString().getValue();
-                assertEquals(expected, connectionString.getRequiredReplicaSetName());
-            } else if (option.getKey().equals("wtimeoutms")) {
-                int expected = option.getValue().asInt32().getValue();
-                assertEquals(expected, connectionString.getWriteConcern().getWTimeout(TimeUnit.MILLISECONDS).intValue());
-            } else {
-                assertTrue(String.format("Unsupported option '%s' in '%s'", option.getKey(), input), false);
-            }
-        }
-    }
-
-    private void testValidAuth() {
-        ConnectionString connectionString = null;
-
-        try {
-            connectionString = new ConnectionString(input);
-        } catch (Throwable t) {
-            if (description.contains("without password")) {
-                // We don't allow null passwords without setting the authentication mechanism.
-                return;
-            } else {
-                assertTrue(String.format("Connection string '%s' should not have throw an exception: %s", input, t.toString()), false);
-            }
-        }
-
-        assertString("auth.db", getAuthDB(connectionString));
-        assertString("auth.username", connectionString.getUsername());
-
-        // Passwords for certain auth mechanisms are ignored.
-        String password = null;
-        if (connectionString.getPassword() != null) {
-            password = new String(connectionString.getPassword());
-        }
-        List<MongoCredential> credentials = connectionString.getCredentialList();
-        if (credentials.size() > 0) {
-            AuthenticationMechanism mechanism = credentials.get(0).getAuthenticationMechanism();
-            if (mechanism == null) {
-                assertString("auth.password", password);
-            } else {
-                switch (mechanism) {
-                    case PLAIN:
-                    case MONGODB_CR:
-                    case SCRAM_SHA_1:
-                        assertString("auth.password", password);
-                        break;
-                    default:
-                        // Ignore the password field.
-                }
-            }
-
-        } else {
-            assertString("auth.password", password);
-        }
-    }
-
-    private void assertString(final String key, final String actual) {
-        BsonValue expected = definition;
-        if (key.contains(".")) {
-            for (String subKey : key.split("\\.")) {
-                expected = expected.asDocument().get(subKey);
-            }
-        } else {
-            expected = expected.asDocument().get(key);
-        }
-
-        if (expected.isNull()) {
-            assertTrue(String.format("%s should be null", key), actual == null);
-        } else if (expected.isString()) {
-            String expectedString = expected.asString().getValue();
-            assertTrue(String.format("%s should be %s but was %s", key, actual, expectedString), actual.equals(expectedString));
-        } else {
-            assertTrue(String.format("%s should be %s but was %s", key, actual, expected), false);
-        }
-    }
-
-    private void assertExpectedHosts(final List<String> hosts) {
-        List<String> cleanedHosts = new ArrayList<String>();
-        for (String host : hosts) {
-            if (host.startsWith("[")) {
-                int idx = host.indexOf("]");
-                cleanedHosts.add(host.substring(1, idx) + host.substring(idx + 1));
-            } else {
-                cleanedHosts.add(host);
-            }
-        }
-
-
-        List<String> expectedHosts = new ArrayList<String>();
-        for (BsonValue rawHost : definition.getArray("hosts")) {
-            BsonDocument hostDoc = rawHost.asDocument();
-            String host = hostDoc.getString("host").getValue();
-            String port = "";
-            if (!hostDoc.get("port").isNull()) {
-                port = ":" + hostDoc.getInt32("port").getValue();
-            }
-            expectedHosts.add(host + port);
-        }
-        assertEquals(expectedHosts, cleanedHosts);
-    }
-
-    private String getAuthDB(final ConnectionString connectionString) {
-        if (connectionString.getCollection() != null) {
-            return connectionString.getDatabase() + "." + connectionString.getCollection();
-        }
-        return connectionString.getDatabase();
-    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/CustomMatchers.groovy b/driver-core/src/test/unit/com/mongodb/CustomMatchers.groovy
index 003c469852b..105efb86b22 100644
--- a/driver-core/src/test/unit/com/mongodb/CustomMatchers.groovy
+++ b/driver-core/src/test/unit/com/mongodb/CustomMatchers.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@ package com.mongodb
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
 
+import java.lang.reflect.Field
+import java.lang.reflect.Modifier
+
 @SuppressWarnings('NoDef')
 class CustomMatchers {
 
@@ -55,18 +58,24 @@ class CustomMatchers {
         if (actual.class.name != expected.class.name) {
             return false
         }
-        getFieldNames(actual.class).findAll { !ignoreNames.contains(it) } .collect {
-            if (nominallyTheSame(it)) {
-                return actual."$it".class == expected."$it".class
-            } else if (actual."$it" != expected."$it") {
-                def (a1, e1) = [actual."$it", expected."$it"]
-                if ([a1, e1].contains(null) && [a1, e1] != nullList) {
+        getFields(actual.class).findAll { !ignoreNames.contains(it.name) } .collect {
+            it.setAccessible(true)
+            def actualPropertyValue = it.get(actual)
+            def expectedPropertyValue = it.get(expected)
+
+            if (nominallyTheSame(it.name)) {
+                return actualPropertyValue.class == expectedPropertyValue.class
+            } else if (actualPropertyValue != expectedPropertyValue) {
+                if ([actualPropertyValue, expectedPropertyValue].contains(null)
+                        && [actualPropertyValue, expectedPropertyValue] != nullList) {
                     return false
-                } else if (List.isCase(a1) && List.isCase(e1) && (a1.size() == e1.size())) {
+                } else if (List.isCase(actualPropertyValue) && List.isCase(expectedPropertyValue)
+                        && (actualPropertyValue.size() == expectedPropertyValue.size())) {
                     def i = -1
-                    return a1.collect { a -> i++; compare(a, e1[i]) }.every { it }
-                } else if (a1.class != null && a1.class.name.startsWith('com.mongodb') && a1.class == e1.class) {
-                    return compare(a1, e1)
+                    return actualPropertyValue.collect { a -> i++; compare(a, expectedPropertyValue[i]) }.every { it }
+                } else if (actualPropertyValue.class != null && actualPropertyValue.class.name.startsWith('com.mongodb')
+                        && actualPropertyValue.class == expectedPropertyValue.class) {
+                    return compare(actualPropertyValue, expectedPropertyValue)
                 }
                 return false
             }
@@ -74,6 +83,7 @@ class CustomMatchers {
         }.every { it }
     }
 
+
     static describer(expected, actual, description) {
         describer(expected, actual, [], description)
     }
@@ -91,48 +101,52 @@ class CustomMatchers {
             return false
         }
 
-        getFieldNames(actual.class).findAll { !ignoreNames.contains(it) } .collect {
-            if (nominallyTheSame(it)) {
-                if (actual."$it".class != expected."$it".class) {
-                    description.appendText("different classes $it :" +
-                            " ${expected."$it".class.name} != ${actual."$it".class.name}, ")
+        getFields(actual.class).findAll { !ignoreNames.contains(it.name) } .collect {
+            it.setAccessible(true)
+            def actualPropertyValue = it.get(actual)
+            def expectedPropertyValue = it.get(expected)
+            if (nominallyTheSame(it.name)) {
+                if (actualPropertyValue.class != expectedPropertyValue.class) {
+                    description.appendText("different classes in $it.name :" +
+                            " ${expectedPropertyValue.class.name} != ${actualPropertyValue.class.name}, ")
                     return false
                 }
-            } else if (actual."$it" != expected."$it") {
-                def (a1, e1) = [actual."$it", expected."$it"]
-                if (([a1, e1].contains(null) || [a1.class, e1.class].contains(null)) && [a1, e1] != nullList) {
-                    description.appendText("different values in $it : $e1 != $a1\n")
+            } else if (actualPropertyValue != expectedPropertyValue) {
+                if (([actualPropertyValue, expectedPropertyValue].contains(null)
+                        || [actualPropertyValue.class, expectedPropertyValue.class].contains(null))
+                        && [actualPropertyValue, expectedPropertyValue] != nullList) {
+                    description.appendText("different values in $it.name : ${expectedPropertyValue} != ${actualPropertyValue}\n")
                     return false
-                } else if (List.isCase(a1) && List.isCase(e1) && (a1.size() == e1.size())) {
+                } else if (List.isCase(actualPropertyValue) && List.isCase(expectedPropertyValue)
+                        && (actualPropertyValue.size() == expectedPropertyValue.size())) {
                     def i = -1
-                    a1.each { a ->
-                        i++; if (!compare(a, e1[i])) {
-                            describer(a, e1[i], description)
+                    actualPropertyValue.each { a ->
+                        i++; if (!compare(a, expectedPropertyValue[i])) {
+                            describer(a, expectedPropertyValue[i], description)
                         }
                     }.every { it }
-                } else if (a1.class.name.startsWith('com.mongodb') && a1.class == e1.class) {
-                    return describer(a1, e1, description)
+                } else if (actualPropertyValue.class.name.startsWith('com.mongodb')
+                        && actualPropertyValue.class == expectedPropertyValue.class) {
+                    return describer(actualPropertyValue, expectedPropertyValue, description)
                 }
-                description.appendText("different values in $it : $e1 != $a1\n")
+                description.appendText("different values in $it.name : ${expectedPropertyValue} != ${actualPropertyValue}\n")
                 return false
             }
             true
         }
     }
 
-    static List<String> getFieldNames(Class curClass) {
-        getFieldNames(curClass, [])
-    }
-
-    static List<String> getFieldNames(Class curClass, names) {
-        if (curClass != Object) {
-            getFieldNames(curClass.getSuperclass(), names += curClass.declaredFields.findAll { !it.synthetic }*.name)
+    static List<Field> getFields(Class curClass) {
+        if (curClass == Object) {
+            return []
         }
-        names
+        def fields = getFields(curClass.getSuperclass())
+        fields.addAll(curClass.declaredFields.findAll { !it.synthetic && !Modifier.isStatic(it.modifiers) })
+        fields
     }
 
-    static nominallyTheSame(String className ) {
-        className in ['decoder', 'executor']
-    }
 
+    static nominallyTheSame(String propertyName ) {
+        propertyName in ['decoder', 'executor']
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/DBObjectCodecProviderSpecification.groovy b/driver-core/src/test/unit/com/mongodb/DBObjectCodecProviderSpecification.groovy
new file mode 100644
index 00000000000..8e9f46255bd
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/DBObjectCodecProviderSpecification.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import org.bson.codecs.DateCodec
+import org.bson.codecs.configuration.CodecRegistries
+import org.bson.types.BSONTimestamp
+import spock.lang.Specification
+
+class DBObjectCodecProviderSpecification extends Specification {
+    def provider = new DBObjectCodecProvider()
+    def registry = CodecRegistries.fromProviders(provider)
+
+    def 'should provide codec for BSONTimestamp'() {
+        expect:
+        provider.get(BSONTimestamp, registry).class == BSONTimestampCodec
+    }
+
+    def 'should provide codec for Date'() {
+        expect:
+        provider.get(Date, registry).class == DateCodec
+    }
+
+    def 'should provide codec for class assignable to DBObject'() {
+        expect:
+        provider.get(BasicDBObject, registry).class == DBObjectCodec
+    }
+
+    def 'should not provide codec for class assignable to DBObject that is also assignable to List'() {
+        expect:
+        provider.get(BasicDBList, registry) == null
+    }
+
+    def 'should not provide codec for unexpected class'() {
+        expect:
+        provider.get(Integer, registry) == null
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/DBObjectCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/DBObjectCodecSpecification.groovy
new file mode 100644
index 00000000000..22b0336b543
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/DBObjectCodecSpecification.groovy
@@ -0,0 +1,324 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import org.bson.BsonArray
+import org.bson.BsonBinary
+import org.bson.BsonBinaryReader
+import org.bson.BsonBinarySubType
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.BsonInt32
+import org.bson.BsonJavaScriptWithScope
+import org.bson.BsonNull
+import org.bson.BsonObjectId
+import org.bson.BsonString
+import org.bson.BsonSymbol
+import org.bson.BsonTimestamp
+import org.bson.codecs.BinaryCodec
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.UuidCodec
+import org.bson.codecs.ValueCodecProvider
+import org.bson.types.BSONTimestamp
+import org.bson.types.Binary
+import org.bson.types.CodeWScope
+import org.bson.types.ObjectId
+import org.bson.types.Symbol
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import java.nio.ByteBuffer
+import java.sql.Timestamp
+
+import static org.bson.UuidRepresentation.C_SHARP_LEGACY
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.PYTHON_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.UuidRepresentation.UNSPECIFIED
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
+
+class DBObjectCodecSpecification extends Specification {
+
+    def bsonDoc = new BsonDocument()
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DBObjectCodecProvider(), new BsonValueCodecProvider()])
+    def dbObjectCodec = new DBObjectCodec(codecRegistry)
+
+    def 'default registry should include necessary providers'() {
+        when:
+        def registry = DBObjectCodec.getDefaultRegistry()
+
+        then:
+        registry.get(Integer) != null
+        registry.get(BsonInt32) != null
+        registry.get(BSONTimestamp) != null
+        registry.get(BasicDBObject) != null
+    }
+
+    def 'should encode with default registry'() {
+        given:
+        def document = new BsonDocument()
+        def dBObject = new BasicDBObject('a', 0).append('b', new BsonInt32(1)).append('c', new BSONTimestamp())
+
+        when:
+         new DBObjectCodec().encode(new BsonDocumentWriter(document), dBObject, EncoderContext.builder().build())
+
+        then:
+        document == new BsonDocument('a', new BsonInt32(0)).append('b', new BsonInt32(1)).append('c', new BsonTimestamp())
+    }
+
+    def 'should encode and decode UUID as UUID'() {
+        given:
+        def uuid = UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')
+        def doc = new BasicDBObject('uuid', uuid)
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        bsonDoc.getBinary('uuid') == new BsonBinary(BsonBinarySubType.UUID_LEGACY,
+                                                    [8, 7, 6, 5, 4, 3, 2, 1, 16, 15, 14, 13, 12, 11, 10, 9] as byte[])
+        when:
+        def decodedUuid = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
+
+        then:
+        decodedUuid.get('uuid') == uuid
+    }
+
+    def 'should decode binary subtypes for UUID that are not 16 bytes into Binary'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def document = new DBObjectCodec().decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == document.get('f')
+
+        where:
+        value                                            | bytes
+        new Binary((byte) 0x03, (byte[]) [115, 116, 11]) | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 3, 115, 116, 11, 0]
+        new Binary((byte) 0x04, (byte[]) [115, 116, 11]) | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 4, 115, 116, 11, 0]
+    }
+
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 3 for UUID'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def document = new DBObjectCodec(fromCodecs(new UuidCodec(representation), new BinaryCodec()))
+                .withUuidRepresentation(representation)
+                .decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == document.get('f')
+
+        where:
+        representation | value                                                   | bytes
+        JAVA_LEGACY    | UUID.fromString('08070605-0403-0201-100f-0e0d0c0b0a09') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        C_SHARP_LEGACY | UUID.fromString('04030201-0605-0807-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        PYTHON_LEGACY  | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        STANDARD       | new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        UNSPECIFIED    | new Binary((byte) 3, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+    }
+
+    def 'should encode and decode UUID as UUID with alternate UUID Codec'() {
+        given:
+        def codecWithAlternateUUIDCodec = new DBObjectCodec(fromRegistries(fromCodecs(new UuidCodec(STANDARD)), codecRegistry))
+        def uuid = UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')
+        def doc = new BasicDBObject('uuid', uuid)
+
+        when:
+        codecWithAlternateUUIDCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        bsonDoc.getBinary('uuid') == new BsonBinary(BsonBinarySubType.UUID_STANDARD,
+                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[])
+
+        when:
+        def decodedDoc = codecWithAlternateUUIDCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
+
+        then:
+        decodedDoc.get('uuid') == uuid
+    }
+
+    @SuppressWarnings(['LineLength'])
+    @Unroll
+    def 'should decode binary subtype 4 for UUID'() {
+        given:
+        def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
+
+        when:
+        def document = new DBObjectCodec().withUuidRepresentation(representation)
+                .decode(reader, DecoderContext.builder().build())
+
+        then:
+        value == document.get('f')
+
+        where:
+        representation | value                                                   | bytes
+        STANDARD       | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        JAVA_LEGACY    | UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10') | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        C_SHARP_LEGACY | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        PYTHON_LEGACY  | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+        UNSPECIFIED    | new Binary((byte) 4, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[]) | [29, 0, 0, 0, 5, 102, 0, 16, 0, 0, 0, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0]
+    }
+
+    def 'should encode and decode byte array value as binary'() {
+        given:
+        def array = [0, 1, 2, 4, 4] as byte[]
+        def doc = new BasicDBObject('byteArray', array)
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        bsonDoc.getBinary('byteArray') == new BsonBinary(array)
+
+        when:
+        DBObject decodedUuid = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
+
+        then:
+        decodedUuid.get('byteArray') == array
+    }
+
+    def 'should encode and decode Binary value as binary'() {
+        given:
+        def subType = (byte) 42
+        def array = [0, 1, 2, 4, 4] as byte[]
+        def doc = new BasicDBObject('byteArray', new Binary(subType, array))
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        bsonDoc.getBinary('byteArray') == new BsonBinary(subType, array)
+
+        when:
+        DBObject decodedUuid = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
+
+        then:
+        decodedUuid.get('byteArray') == new Binary(subType, array)
+    }
+
+    def 'should encode Symbol to BsonSymbol and decode BsonSymbol to String'() {
+        given:
+        def symbol = new Symbol('symbol')
+        def doc = new BasicDBObject('symbol', symbol)
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        bsonDoc.get('symbol') == new BsonSymbol('symbol')
+
+        when:
+        def decodedSymbol = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
+
+        then:
+        decodedSymbol.get('symbol') == symbol.toString()
+    }
+
+    def 'should encode java.sql.Date as date'() {
+        given:
+        def sqlDate = new java.sql.Date(System.currentTimeMillis())
+        def doc = new BasicDBObject('d', sqlDate)
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        def decodededDoc = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
+
+        then:
+        ((Date) decodededDoc.get('d')).getTime() == sqlDate.getTime()
+    }
+
+    def 'should encode java.sql.Timestamp as date'() {
+        given:
+        def sqlTimestamp = new Timestamp(System.currentTimeMillis())
+        def doc = new BasicDBObject('d', sqlTimestamp)
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        def decodededDoc = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
+
+        then:
+        ((Date) decodededDoc.get('d')).getTime() == sqlTimestamp.getTime()
+    }
+
+    def 'should encode collectible document with _id'() {
+        given:
+        def doc = new BasicDBObject('y', 1).append('_id', new BasicDBObject('x', 1))
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc,
+                EncoderContext.builder().isEncodingCollectibleDocument(true).build())
+
+        then:
+        bsonDoc == new BsonDocument('_id', new BsonDocument('x', new BsonInt32(1))).append('y', new BsonInt32(1))
+    }
+
+    def 'should encode collectible document without _id'() {
+        given:
+        def doc = new BasicDBObject('y', 1)
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc,
+                EncoderContext.builder().isEncodingCollectibleDocument(true).build())
+
+        then:
+        bsonDoc == new BsonDocument('y', new BsonInt32(1))
+    }
+
+    def 'should encode all types'() {
+        given:
+        def id = new ObjectId()
+        def dbRef = new DBRef('c', 1)
+        def doc = new BasicDBObject('_id', id)
+                .append('n', null)
+                .append('r', dbRef)
+                .append('m', ['f': 1])
+                .append('i', [1, 2])
+                .append('c', new CodeWScope('c', new BasicDBObject('f', 1)))
+                .append('b', new byte[0])
+                .append('a', [1, 2].toArray())
+                .append('s', new Symbol('s'))
+
+        when:
+        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
+
+        then:
+        bsonDoc == new BsonDocument('_id', new BsonObjectId(id))
+                .append('n', new BsonNull())
+                .append('r', new BsonDocument('$ref', new BsonString('c')).append('$id', new BsonInt32(1)))
+                .append('m', new BsonDocument('f', new BsonInt32(1)))
+                .append('i', new BsonArray([new BsonInt32(1), new BsonInt32(2)]))
+                .append('c', new BsonJavaScriptWithScope('c', new BsonDocument('f', new BsonInt32(1))))
+                .append('b', new BsonBinary(new byte[0]))
+                .append('a', new BsonArray([new BsonInt32(1), new BsonInt32(2)]))
+                .append('s', new BsonSymbol('s'))
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/DBRefCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/DBRefCodecSpecification.groovy
similarity index 98%
rename from driver/src/test/unit/com/mongodb/DBRefCodecSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/DBRefCodecSpecification.groovy
index e6846b70ef5..e0fbe2f72e1 100644
--- a/driver/src/test/unit/com/mongodb/DBRefCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/DBRefCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/DBRefSpecification.groovy b/driver-core/src/test/unit/com/mongodb/DBRefSpecification.groovy
new file mode 100644
index 00000000000..f6dcfe3bfe1
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/DBRefSpecification.groovy
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import spock.lang.Specification
+
+class DBRefSpecification extends Specification {
+
+    def 'should set properties'() {
+        when:
+        DBRef referenceA = new DBRef('foo.bar', 5)
+        DBRef referenceB = new DBRef('mydb', 'foo.bar', 5)
+        DBRef referenceC = new DBRef(null, 'foo.bar', 5)
+
+        then:
+        referenceA.databaseName == null
+        referenceA.collectionName == 'foo.bar'
+        referenceA.id == 5
+        referenceB.databaseName == 'mydb'
+        referenceB.collectionName == 'foo.bar'
+        referenceB.id == 5
+        referenceC.databaseName == null
+        referenceC.collectionName == 'foo.bar'
+        referenceC.id == 5
+    }
+
+    def 'constructor should throw if collection name is null'() {
+        when:
+        new DBRef(null, 5)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'constructor should throw if id is null'() {
+        when:
+        new DBRef('foo.bar', null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'equivalent instances should be equal and have the same hash code'() {
+        given:
+        DBRef referenceA = new DBRef('foo.bar', 4)
+        DBRef referenceB = new DBRef('foo.bar', 4)
+        DBRef referenceC = new DBRef('mydb', 'foo.bar', 4)
+        DBRef referenceD = new DBRef('mydb', 'foo.bar', 4)
+
+        expect:
+        referenceA.equals(referenceA)
+        referenceA.equals(referenceB)
+        referenceC.equals(referenceD)
+        referenceA.hashCode() == referenceB.hashCode()
+        referenceC.hashCode() == referenceD.hashCode()
+    }
+
+    def 'non-equivalent instances should not be equal and have different hash codes'() {
+        given:
+        DBRef referenceA = new DBRef('foo.bar', 4)
+        DBRef referenceB = new DBRef('foo.baz', 4)
+        DBRef referenceC = new DBRef('foo.bar', 5)
+        DBRef referenceD = new DBRef('mydb', 'foo.bar', 4)
+        DBRef referenceE = new DBRef('yourdb', 'foo.bar', 4)
+
+        expect:
+        !referenceA.equals(null)
+        !referenceA.equals('some other class instance')
+        !referenceA.equals(referenceB)
+        referenceA.hashCode() != referenceB.hashCode()
+        !referenceA.equals(referenceC)
+        referenceA.hashCode() != referenceC.hashCode()
+        !referenceA.equals(referenceD)
+        referenceA.hashCode() != referenceD.hashCode()
+        !referenceD.equals(referenceE)
+        referenceD.hashCode() != referenceE.hashCode()
+    }
+
+    def 'should stringify'() {
+        expect:
+        new DBRef('foo.bar', 4).toString() == '{ "$ref" : "foo.bar", "$id" : "4" }'
+        new DBRef('mydb', 'foo.bar', 4).toString() == '{ "$ref" : "foo.bar", "$id" : "4", "$db" : "mydb" }'
+    }
+
+    def 'testSerialization'() throws Exception {
+        given:
+        DBRef originalDBRef = new DBRef('col', 42)
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream()
+        ObjectOutputStream objectOutputStream = new ObjectOutputStream(outputStream)
+
+        when:
+        objectOutputStream.writeObject(originalDBRef)
+        ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(outputStream.toByteArray()))
+        DBRef deserializedDBRef = (DBRef) objectInputStream.readObject()
+
+        then:
+        originalDBRef == deserializedDBRef
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/DocumentToDBRefTransformerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/DocumentToDBRefTransformerSpecification.groovy
similarity index 98%
rename from driver/src/test/unit/com/mongodb/DocumentToDBRefTransformerSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/DocumentToDBRefTransformerSpecification.groovy
index fd1745ea7ae..34c2ebfa43e 100644
--- a/driver/src/test/unit/com/mongodb/DocumentToDBRefTransformerSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/DocumentToDBRefTransformerSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/ErrorCategorySpecification.groovy b/driver-core/src/test/unit/com/mongodb/ErrorCategorySpecification.groovy
index 3b0aab0e748..2904b75d8f4 100644
--- a/driver-core/src/test/unit/com/mongodb/ErrorCategorySpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/ErrorCategorySpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,4 +42,4 @@ class ErrorCategorySpecification extends Specification {
         fromErrorCode(0) == UNCATEGORIZED
     }
 
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/IndexRequestSpecification.groovy b/driver-core/src/test/unit/com/mongodb/IndexRequestSpecification.groovy
index 28011099e6b..4aa0122c9fe 100644
--- a/driver-core/src/test/unit/com/mongodb/IndexRequestSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/IndexRequestSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,11 @@
 package com.mongodb
 
 import com.mongodb.bulk.IndexRequest
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import spock.lang.Specification
@@ -49,12 +54,25 @@ class IndexRequestSpecification extends Specification {
         !request.getDropDups()
         request.getStorageEngine() == null
         request.getPartialFilterExpression() == null
+        request.getCollation() == null
+        request.getWildcardProjection() == null
 
         when:
         def keys = BsonDocument.parse('{ a: 1 }')
         def weights = BsonDocument.parse('{ a: 1000 }')
         def storageEngine = BsonDocument.parse('{ wiredTiger : { configString : "block_compressor=zlib" }}')
         def partialFilterExpression = BsonDocument.parse('{ a: { $gte: 10 } }')
+        def collation = Collation.builder()
+                .locale('en')
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .backwards(true)
+                .build()
+        def wildcardProjection = BsonDocument.parse('{a  : 1}')
         def request2 = new IndexRequest(keys)
                 .background(true)
                 .unique(true)
@@ -74,6 +92,8 @@ class IndexRequestSpecification extends Specification {
                 .dropDups(true)
                 .storageEngine(storageEngine)
                 .partialFilterExpression(partialFilterExpression)
+                .collation(collation)
+                .wildcardProjection(wildcardProjection)
 
         then:
         request2.getKeys() == keys
@@ -95,6 +115,8 @@ class IndexRequestSpecification extends Specification {
         request2.getDropDups()
         request2.getStorageEngine() == storageEngine
         request2.getPartialFilterExpression() == partialFilterExpression
+        request2.getCollation() == collation
+        request2.getWildcardProjection() == wildcardProjection
     }
 
 
@@ -147,6 +169,12 @@ class IndexRequestSpecification extends Specification {
         when:
         options.sphereVersion(3)
 
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        options.sphereVersion(4)
+
         then:
         thrown(IllegalArgumentException)
     }
diff --git a/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy
new file mode 100644
index 00000000000..2fae99af61d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/MongoClientSettingsSpecification.groovy
@@ -0,0 +1,450 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.connection.ClusterConnectionMode
+import com.mongodb.connection.ClusterSettings
+import com.mongodb.connection.ConnectionPoolSettings
+import com.mongodb.connection.ServerSettings
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SslSettings
+import com.mongodb.connection.netty.NettyStreamFactoryFactory
+import com.mongodb.event.CommandListener
+import org.bson.UuidRepresentation
+import org.bson.codecs.configuration.CodecRegistry
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MongoClientSettingsSpecification extends Specification {
+
+    def 'should set the correct default values'() {
+        given:
+        def settings = MongoClientSettings.builder().build()
+
+        expect:
+        settings.getWriteConcern() == WriteConcern.ACKNOWLEDGED
+        settings.getRetryWrites()
+        settings.getRetryReads()
+        settings.getReadConcern() == ReadConcern.DEFAULT
+        settings.getReadPreference() == ReadPreference.primary()
+        settings.getCommandListeners().isEmpty()
+        settings.getApplicationName() == null
+        settings.clusterSettings == ClusterSettings.builder().build()
+        settings.connectionPoolSettings == ConnectionPoolSettings.builder().build()
+        settings.socketSettings == SocketSettings.builder().build()
+        settings.heartbeatSocketSettings == SocketSettings.builder().readTimeout(10000, TimeUnit.MILLISECONDS).build()
+        settings.serverSettings == ServerSettings.builder().build()
+        settings.streamFactoryFactory == null
+        settings.compressorList == []
+        settings.credential == null
+        settings.uuidRepresentation == UuidRepresentation.JAVA_LEGACY
+    }
+
+    @SuppressWarnings('UnnecessaryObjectReferences')
+    def 'should handle illegal arguments'() {
+        given:
+        def builder = MongoClientSettings.builder()
+
+        when:
+        builder.readPreference(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.writeConcern(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.credential(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.credential(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.codecRegistry(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.streamFactoryFactory(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.addCommandListener(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.compressorList(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.uuidRepresentation(null)
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should build with set configuration'() {
+        given:
+        def streamFactoryFactory = NettyStreamFactoryFactory.builder().build()
+        def credential = MongoCredential.createMongoX509Credential('test')
+        def codecRegistry = Stub(CodecRegistry)
+        def commandListener = Stub(CommandListener)
+        def clusterSettings = ClusterSettings.builder().hosts([new ServerAddress('localhost')]).requiredReplicaSetName('test').build()
+
+        when:
+        def settings = MongoClientSettings.builder()
+                .readPreference(ReadPreference.secondary())
+                .writeConcern(WriteConcern.JOURNALED)
+                .retryWrites(true)
+                .retryReads(true)
+                .readConcern(ReadConcern.LOCAL)
+                .applicationName('app1')
+                .addCommandListener(commandListener)
+                .credential(credential)
+                .codecRegistry(codecRegistry)
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    void apply(final ClusterSettings.Builder builder) {
+                        builder.applySettings(clusterSettings)
+                    }
+                })
+                .streamFactoryFactory(streamFactoryFactory)
+                .compressorList([MongoCompressor.createZlibCompressor()])
+                .uuidRepresentation(UuidRepresentation.STANDARD)
+                .build()
+
+        then:
+        settings.getReadPreference() == ReadPreference.secondary()
+        settings.getWriteConcern() == WriteConcern.JOURNALED
+        settings.getRetryWrites()
+        settings.getRetryReads()
+        settings.getReadConcern() == ReadConcern.LOCAL
+        settings.getApplicationName() == 'app1'
+        settings.getSocketSettings() == SocketSettings.builder().build()
+        settings.getHeartbeatSocketSettings() == SocketSettings.builder().readTimeout(10000, TimeUnit.MILLISECONDS).keepAlive(true).build()
+        settings.getCommandListeners().get(0) == commandListener
+        settings.getCodecRegistry() == codecRegistry
+        settings.getCredential() == credential
+        settings.getClusterSettings() == clusterSettings
+        settings.getStreamFactoryFactory() == streamFactoryFactory
+        settings.getCompressorList() == [MongoCompressor.createZlibCompressor()]
+        settings.getUuidRepresentation() == UuidRepresentation.STANDARD
+    }
+
+    def 'should be easy to create new settings from existing'() {
+        when:
+        def settings = MongoClientSettings.builder().build()
+
+        then:
+        expect settings, isTheSameAs(MongoClientSettings.builder(settings).build())
+
+        when:
+        def credential = MongoCredential.createMongoX509Credential('test')
+        def codecRegistry = Stub(CodecRegistry)
+        def commandListener = Stub(CommandListener)
+        def compressorList = [MongoCompressor.createZlibCompressor()]
+
+        settings = MongoClientSettings.builder()
+                .readPreference(ReadPreference.secondary())
+                .writeConcern(WriteConcern.JOURNALED)
+                .retryWrites(true)
+                .retryReads(false)
+                .readConcern(ReadConcern.LOCAL)
+                .applicationName('app1')
+                .addCommandListener(commandListener)
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    void apply(final ClusterSettings.Builder builder) {
+                           builder.hosts([new ServerAddress('localhost')])
+                                   .requiredReplicaSetName('test')
+                    }
+                })
+                .credential(credential)
+                .codecRegistry(codecRegistry)
+                .compressorList(compressorList)
+                .build()
+
+        then:
+        expect settings, isTheSameAs(MongoClientSettings.builder(settings).build())
+    }
+
+    def 'applicationName can be 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 126 + '\u00A0'
+
+        when:
+        def settings = MongoClientSettings.builder().applicationName(applicationName).build()
+
+        then:
+        settings.applicationName == applicationName
+    }
+
+    def 'should throw IllegalArgumentException if applicationName exceeds 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 127 + '\u00A0'
+
+        when:
+        MongoClientSettings.builder().applicationName(applicationName)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should add command listeners'() {
+        given:
+        CommandListener commandListenerOne = Mock(CommandListener)
+        CommandListener commandListenerTwo = Mock(CommandListener)
+        CommandListener commandListenerThree = Mock(CommandListener)
+
+        when:
+        def settings = MongoClientSettings.builder()
+                .build()
+
+        then:
+        settings.commandListeners.size() == 0
+
+        when:
+        settings = MongoClientSettings.builder()
+                .addCommandListener(commandListenerOne)
+                .build()
+
+        then:
+        settings.commandListeners.size() == 1
+        settings.commandListeners[0].is commandListenerOne
+
+        when:
+        settings = MongoClientSettings.builder()
+                .addCommandListener(commandListenerOne)
+                .addCommandListener(commandListenerTwo)
+                .build()
+
+        then:
+        settings.commandListeners.size() == 2
+        settings.commandListeners[0].is commandListenerOne
+        settings.commandListeners[1].is commandListenerTwo
+
+        when:
+        def copied = MongoClientSettings.builder(settings).addCommandListener(commandListenerThree).build()
+
+        then:
+        copied.commandListeners.size() == 3
+        copied.commandListeners[0].is commandListenerOne
+        copied.commandListeners[1].is commandListenerTwo
+        copied.commandListeners[2].is commandListenerThree
+        settings.commandListeners.size() == 2
+        settings.commandListeners[0].is commandListenerOne
+        settings.commandListeners[1].is commandListenerTwo
+    }
+
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should build settings from a connection string'() {
+        when:
+        ConnectionString connectionString = new ConnectionString('mongodb://user:pass@host1:1,host2:2/'
+                + '?authMechanism=SCRAM-SHA-1&authSource=test'
+                + '&minPoolSize=5&maxPoolSize=10&waitQueueMultiple=7'
+                + '&waitQueueTimeoutMS=150&maxIdleTimeMS=200&maxLifeTimeMS=300'
+                + '&connectTimeoutMS=2500'
+                + '&socketTimeoutMS=5500'
+                + '&serverSelectionTimeoutMS=25000'
+                + '&localThresholdMS=30'
+                + '&heartbeatFrequencyMS=20000'
+                + '&appName=MyApp'
+                + '&replicaSet=test'
+                + '&retryWrites=true'
+                + '&retryReads=true'
+                + '&ssl=true&sslInvalidHostNameAllowed=true'
+                + '&w=majority&wTimeoutMS=2500'
+                + '&readPreference=secondary'
+                + '&readConcernLevel=majority'
+                + '&compressors=zlib&zlibCompressionLevel=5'
+                + '&uuidRepresentation=standard'
+        )
+        MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(connectionString).build()
+        MongoClientSettings expected = MongoClientSettings.builder()
+            .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+            @Override
+            void apply(final ClusterSettings.Builder builder) {
+                builder.hosts([new ServerAddress('host1', 1), new ServerAddress('host2', 2)])
+                        .mode(ClusterConnectionMode.MULTIPLE)
+                        .requiredReplicaSetName('test')
+                        .serverSelectionTimeout(25000, TimeUnit.MILLISECONDS)
+                        .maxWaitQueueSize(10 * 7) // maxPoolSize * waitQueueMultiple
+                        .localThreshold(30, TimeUnit.MILLISECONDS)
+            }
+        })
+            .applyToConnectionPoolSettings(new Block<ConnectionPoolSettings.Builder>() {
+            @Override
+            void apply(final ConnectionPoolSettings.Builder builder) {
+                builder.minSize(5)
+                        .maxSize(10)
+                        .maxWaitQueueSize(10 * 7) // maxPoolSize * waitQueueMultiple
+                        .maxWaitTime(150, TimeUnit.MILLISECONDS)
+                        .maxConnectionLifeTime(300, TimeUnit.MILLISECONDS)
+                        .maxConnectionIdleTime(200, TimeUnit.MILLISECONDS)
+            }
+        })
+            .applyToServerSettings(new Block<ServerSettings.Builder>() {
+            @Override
+            void apply(final ServerSettings.Builder builder) {
+                builder.heartbeatFrequency(20000, TimeUnit.MILLISECONDS)
+            }
+        })
+            .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+            @Override
+            void apply(final SocketSettings.Builder builder) {
+                builder.connectTimeout(2500, TimeUnit.MILLISECONDS)
+                        .readTimeout(5500, TimeUnit.MILLISECONDS)
+            }
+        })
+            .applyToSslSettings(new Block<SslSettings.Builder>() {
+            @Override
+            void apply(final SslSettings.Builder builder) {
+                builder.enabled(true)
+                        .invalidHostNameAllowed(true)
+            }
+        })
+            .readConcern(ReadConcern.MAJORITY)
+            .readPreference(ReadPreference.secondary())
+            .writeConcern(WriteConcern.MAJORITY.withWTimeout(2500, TimeUnit.MILLISECONDS))
+            .applicationName('MyApp')
+            .credential(MongoCredential.createScramSha1Credential('user', 'test', 'pass'.toCharArray()))
+            .compressorList([MongoCompressor.createZlibCompressor().withProperty(MongoCompressor.LEVEL, 5)])
+            .retryWrites(true)
+            .retryReads(true)
+            .uuidRepresentation(UuidRepresentation.STANDARD)
+            .build()
+
+        then:
+        expect expected, isTheSameAs(settings)
+    }
+
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should build settings from a connection string with default values'() {
+        when:
+        def builder = MongoClientSettings.builder()
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+            @Override
+            void apply(final ClusterSettings.Builder builder) {
+                builder.hosts([new ServerAddress('localhost', 27017)])
+                        .mode(ClusterConnectionMode.SINGLE)
+                        .serverSelectionTimeout(25000, TimeUnit.MILLISECONDS)
+                        .localThreshold(30, TimeUnit.MILLISECONDS)
+            }
+        })
+                .applyToConnectionPoolSettings(new Block<ConnectionPoolSettings.Builder>() {
+            @Override
+            void apply(final ConnectionPoolSettings.Builder builder) {
+                builder.minSize(5)
+                        .maxSize(10)
+                        .maxWaitQueueSize(10 * 7) // maxPoolSize * waitQueueMultiple
+                        .maxWaitTime(150, TimeUnit.MILLISECONDS)
+                        .maxConnectionLifeTime(300, TimeUnit.MILLISECONDS)
+                        .maxConnectionIdleTime(200, TimeUnit.MILLISECONDS)
+            }
+        })
+                .applyToServerSettings(new Block<ServerSettings.Builder>() {
+            @Override
+            void apply(final ServerSettings.Builder builder) {
+                builder.heartbeatFrequency(20000, TimeUnit.MILLISECONDS)
+            }
+        })
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+            @Override
+            void apply(final SocketSettings.Builder builder) {
+                builder.connectTimeout(2500, TimeUnit.MILLISECONDS)
+                        .readTimeout(5500, TimeUnit.MILLISECONDS)
+            }
+        })
+                .applyToSslSettings(new Block<SslSettings.Builder>() {
+            @Override
+            void apply(final SslSettings.Builder builder) {
+                builder.enabled(true)
+                        .invalidHostNameAllowed(true)
+            }
+        })
+                .readConcern(ReadConcern.MAJORITY)
+                .readPreference(ReadPreference.secondary())
+                .writeConcern(WriteConcern.MAJORITY.withWTimeout(2500, TimeUnit.MILLISECONDS))
+                .applicationName('MyApp')
+                .credential(MongoCredential.createScramSha1Credential('user', 'test', 'pass'.toCharArray()))
+                .compressorList([MongoCompressor.createZlibCompressor().withProperty(MongoCompressor.LEVEL, 5)])
+                .retryWrites(true)
+                .retryReads(true)
+
+        def expectedSettings = builder.build()
+        def settingsWithDefaultConnectionStringApplied = builder
+                .applyConnectionString(new ConnectionString('mongodb://localhost'))
+                .build()
+
+        then:
+        expect expectedSettings, isTheSameAs(settingsWithDefaultConnectionStringApplied)
+    }
+
+    def 'should use the socket settings connectionTime out for the heartbeat settings'() {
+        when:
+        def settings = MongoClientSettings.builder().applyToSocketSettings(new Block<SocketSettings.Builder>() {
+            @Override
+            void apply(final SocketSettings.Builder builder) {
+                builder.connectTimeout(42, TimeUnit.SECONDS).readTimeout(60, TimeUnit.SECONDS).receiveBufferSize(22).sendBufferSize(10)
+            }
+        }).build()
+        def expected = SocketSettings.builder().connectTimeout(42, TimeUnit.SECONDS).readTimeout(42, TimeUnit.SECONDS).build()
+
+        then:
+        settings.getHeartbeatSocketSettings() == expected
+    }
+
+    def 'should only have the following fields in the builder'() {
+        when:
+        // A regression test so that if anymore fields are added then the builder(final MongoClientSettings settings) should be updated
+        def actual = MongoClientSettings.Builder.declaredFields.grep {  !it.synthetic } *.name.sort()
+        def expected = ['applicationName', 'autoEncryptionSettings', 'clusterSettingsBuilder', 'codecRegistry', 'commandListeners',
+                        'compressorList', 'connectionPoolSettingsBuilder', 'credential', 'readConcern', 'readPreference', 'retryReads',
+                        'retryWrites', 'serverSettingsBuilder', 'socketSettingsBuilder', 'sslSettingsBuilder', 'streamFactoryFactory',
+                        'uuidRepresentation', 'writeConcern']
+
+        then:
+        actual == expected
+    }
+
+    def 'should only have the following methods in the builder'() {
+        when:
+        // A regression test so that if anymore methods are added then the builder(final MongoClientSettings settings) should be updated
+        def actual = MongoClientSettings.Builder.declaredMethods.grep {  !it.synthetic } *.name.sort()
+        def expected = ['addCommandListener', 'applicationName', 'applyConnectionString', 'applyToClusterSettings',
+                        'applyToConnectionPoolSettings', 'applyToServerSettings', 'applyToSocketSettings', 'applyToSslSettings',
+                        'autoEncryptionSettings', 'build', 'codecRegistry', 'commandListenerList', 'compressorList', 'credential',
+                        'readConcern', 'readPreference', 'retryReads', 'retryWrites', 'streamFactoryFactory', 'uuidRepresentation',
+                        'writeConcern']
+        then:
+        actual == expected
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/MongoCommandExceptionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoCommandExceptionSpecification.groovy
index 5c5c56192aa..35db7001a06 100644
--- a/driver-core/src/test/unit/com/mongodb/MongoCommandExceptionSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/MongoCommandExceptionSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,4 +44,23 @@ class MongoCommandExceptionSpecification extends Specification {
                 .getErrorCode() == -1
     }
 
+    def 'should extract error code name'() {
+        expect:
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE).append('code', new BsonInt32(26))
+                .append('codeName', new BsonString('TimeoutError')), new ServerAddress()).getErrorCodeName() == 'TimeoutError'
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE), new ServerAddress()).getErrorCodeName() == ''
+    }
+
+    def 'should create message'() {
+        expect:
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE).append('code', new BsonInt32(26))
+                .append('codeName', new BsonString('TimeoutError')).append('errmsg', new BsonString('the error message')),
+                new ServerAddress())
+                .getMessage() == 'Command failed with error 26 (TimeoutError): \'the error message\' on server 127.0.0.1:27017. ' +
+                'The full response is {"ok": false, "code": 26, "codeName": "TimeoutError", "errmsg": "the error message"}'
+        new MongoCommandException(new BsonDocument('ok', BsonBoolean.FALSE).append('code', new BsonInt32(26))
+                .append('errmsg', new BsonString('the error message')), new ServerAddress())
+                .getMessage() == 'Command failed with error 26: \'the error message\' on server 127.0.0.1:27017. ' +
+                'The full response is {"ok": false, "code": 26, "errmsg": "the error message"}'
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/MongoCompressorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoCompressorSpecification.groovy
new file mode 100644
index 00000000000..bfd19bb8022
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/MongoCompressorSpecification.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import spock.lang.Specification
+
+class MongoCompressorSpecification extends Specification {
+    def 'should create zlib compressor'() {
+        when:
+        def compressor = MongoCompressor.createZlibCompressor()
+
+        then:
+        compressor.getName() == 'zlib'
+        compressor.getProperty(MongoCompressor.LEVEL, -1) == -1
+    }
+
+    def 'should create zstd compressor'() {
+        when:
+        def compressor = MongoCompressor.createZstdCompressor()
+
+        then:
+        compressor.getName() == 'zstd'
+        compressor.getProperty(MongoCompressor.LEVEL, -1) == -1
+    }
+
+    def 'should set property'() {
+        when:
+        def compressor = MongoCompressor.createZlibCompressor()
+        def newCompressor = compressor.withProperty(MongoCompressor.LEVEL, 5)
+
+        then:
+        compressor != newCompressor
+        compressor.getProperty(MongoCompressor.LEVEL, -1) == -1
+        compressor.getProperty(MongoCompressor.LEVEL, 5) == 5
+    }
+
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/MongoCredentialSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoCredentialSpecification.groovy
index aeab3ce0c14..8968af794c1 100644
--- a/driver-core/src/test/unit/com/mongodb/MongoCredentialSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/MongoCredentialSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-
-
 package com.mongodb
 
 import spock.lang.Specification
@@ -23,16 +21,17 @@ import spock.lang.Specification
 import static com.mongodb.AuthenticationMechanism.MONGODB_CR
 import static com.mongodb.AuthenticationMechanism.PLAIN
 import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_256
 
 class MongoCredentialSpecification extends Specification {
     def 'creating a credential with an unspecified mechanism should populate correct fields'() {
         given:
-        String userName = 'user';
-        String database = 'test';
-        char[] password = 'pwd'.toCharArray();
+        String userName = 'user'
+        String database = 'test'
+        char[] password = 'pwd'.toCharArray()
 
         when:
-        MongoCredential credential = MongoCredential.createCredential(userName, database, password);
+        MongoCredential credential = MongoCredential.createCredential(userName, database, password)
 
         then:
         userName == credential.getUserName()
@@ -44,13 +43,13 @@ class MongoCredentialSpecification extends Specification {
 
     def 'creating a challenge-response credential should populate correct fields'() {
         given:
-        AuthenticationMechanism mechanism = MONGODB_CR;
-        String userName = 'user';
-        String database = 'test';
-        char[] password = 'pwd'.toCharArray();
+        AuthenticationMechanism mechanism = MONGODB_CR
+        String userName = 'user'
+        String database = 'test'
+        char[] password = 'pwd'.toCharArray()
 
         when:
-        MongoCredential credential = MongoCredential.createMongoCRCredential(userName, database, password);
+        MongoCredential credential = MongoCredential.createMongoCRCredential(userName, database, password)
 
         then:
         userName == credential.getUserName()
@@ -62,30 +61,30 @@ class MongoCredentialSpecification extends Specification {
 
     def 'should throw IllegalArgumentException when required parameter is not supplied for challenge-response'() {
         when:
-        MongoCredential.createMongoCRCredential(null, 'test', 'pwd'.toCharArray());
+        MongoCredential.createMongoCRCredential(null, 'test', 'pwd'.toCharArray())
         then:
         thrown(IllegalArgumentException)
 
         when:
-        MongoCredential.createMongoCRCredential('user', null, 'pwd'.toCharArray());
+        MongoCredential.createMongoCRCredential('user', null, 'pwd'.toCharArray())
         then:
         thrown(IllegalArgumentException)
 
         when:
-        MongoCredential.createMongoCRCredential('user', 'test', null);
+        MongoCredential.createMongoCRCredential('user', 'test', null)
         then:
         thrown(IllegalArgumentException)
     }
 
     def 'creating a Plain credential should populate all required fields'() {
         given:
-        AuthenticationMechanism mechanism = PLAIN;
-        String userName = 'user';
-        String source = '$external';
-        char[] password = 'pwd'.toCharArray();
+        AuthenticationMechanism mechanism = PLAIN
+        String userName = 'user'
+        String source = '$external'
+        char[] password = 'pwd'.toCharArray()
 
         when:
-        MongoCredential credential = MongoCredential.createPlainCredential(userName, source, password);
+        MongoCredential credential = MongoCredential.createPlainCredential(userName, source, password)
 
         then:
         userName == credential.getUserName()
@@ -97,30 +96,30 @@ class MongoCredentialSpecification extends Specification {
 
     def 'should throw IllegalArgumentException when a required field is not passed in'() {
         when:
-        MongoCredential.createPlainCredential(null, '$external', 'pwd'.toCharArray());
+        MongoCredential.createPlainCredential(null, '$external', 'pwd'.toCharArray())
         then:
         thrown(IllegalArgumentException)
 
         when:
-        MongoCredential.createPlainCredential('user', '$external', null);
+        MongoCredential.createPlainCredential('user', '$external', null)
         then:
         thrown(IllegalArgumentException)
 
         when:
-        MongoCredential.createPlainCredential('user', null, 'pwd'.toCharArray());
+        MongoCredential.createPlainCredential('user', null, 'pwd'.toCharArray())
         then:
         thrown(IllegalArgumentException)
     }
 
     def 'creating a SCRAM_SHA_1 credential should populate all required fields'() {
         given:
-        AuthenticationMechanism mechanism = SCRAM_SHA_1;
-        String userName = 'user';
-        String source = 'admin';
-        char[] password = 'pwd'.toCharArray();
+        AuthenticationMechanism mechanism = SCRAM_SHA_1
+        String userName = 'user'
+        String source = 'admin'
+        char[] password = 'pwd'.toCharArray()
 
         when:
-        MongoCredential credential = MongoCredential.createScramSha1Credential(userName, source, password);
+        MongoCredential credential = MongoCredential.createScramSha1Credential(userName, source, password)
 
         then:
         userName == credential.getUserName()
@@ -130,30 +129,48 @@ class MongoCredentialSpecification extends Specification {
         MongoCredential.SCRAM_SHA_1_MECHANISM == credential.getMechanism()
     }
 
+    def 'creating a SCRAM_SHA_256 credential should populate all required fields'() {
+        given:
+        AuthenticationMechanism mechanism = SCRAM_SHA_256
+        String userName = 'user'
+        String source = 'admin'
+        char[] password = 'pwd'.toCharArray()
+
+        when:
+        MongoCredential credential = MongoCredential.createScramSha256Credential(userName, source, password)
+
+        then:
+        userName == credential.getUserName()
+        source == credential.getSource()
+        password == credential.getPassword()
+        mechanism == credential.getAuthenticationMechanism()
+        MongoCredential.SCRAM_SHA_256_MECHANISM == credential.getMechanism()
+    }
+
     def 'should throw IllegalArgumentException when a required field is not passed in for the SCRAM_SHA_1 mechanism'() {
         when:
-        MongoCredential.createScramSha1Credential(null, 'admin', 'pwd'.toCharArray());
+        MongoCredential.createScramSha1Credential(null, 'admin', 'pwd'.toCharArray())
         then:
         thrown(IllegalArgumentException)
 
         when:
-        MongoCredential.createScramSha1Credential('user', 'admin', null);
+        MongoCredential.createScramSha1Credential('user', 'admin', null)
         then:
         thrown(IllegalArgumentException)
 
         when:
-        MongoCredential.createScramSha1Credential('user', null, 'pwd'.toCharArray());
+        MongoCredential.createScramSha1Credential('user', null, 'pwd'.toCharArray())
         then:
         thrown(IllegalArgumentException)
     }
 
     def 'creating a GSSAPI Credential should populate the correct fields'() {
         given:
-        AuthenticationMechanism mechanism = AuthenticationMechanism.GSSAPI;
-        String userName = 'user';
+        AuthenticationMechanism mechanism = AuthenticationMechanism.GSSAPI
+        String userName = 'user'
 
         when:
-        MongoCredential credential = MongoCredential.createGSSAPICredential(userName);
+        MongoCredential credential = MongoCredential.createGSSAPICredential(userName)
 
         then:
         userName == credential.getUserName()
@@ -179,6 +196,21 @@ class MongoCredentialSpecification extends Specification {
         MongoCredential.MONGODB_X509_MECHANISM == credential.getMechanism()
     }
 
+    def 'creating an X.509 Credential without a username should populate the correct fields'() {
+        given:
+        AuthenticationMechanism mechanism = AuthenticationMechanism.MONGODB_X509
+
+        when:
+        MongoCredential credential = MongoCredential.createMongoX509Credential()
+
+        then:
+        null == credential.getUserName()
+        '$external' == credential.getSource()
+        null == credential.getPassword()
+        mechanism == credential.getAuthenticationMechanism()
+        MongoCredential.MONGODB_X509_MECHANISM == credential.getMechanism()
+    }
+
     def 'should get default value of mechanism property when there is no mapping'() {
         when:
         def credential = MongoCredential.createGSSAPICredential('user')
@@ -225,7 +257,7 @@ class MongoCredentialSpecification extends Specification {
 
     def 'should throw IllegalArgumentException if username is not provided to a GSSAPI credential'() {
         when:
-        MongoCredential.createGSSAPICredential(null);
+        MongoCredential.createGSSAPICredential(null)
 
         then:
         thrown(IllegalArgumentException)
@@ -264,5 +296,34 @@ class MongoCredentialSpecification extends Specification {
         credentialOne.hashCode() != credentialTwo.hashCode()
 
         !credentialOne.toString().contains(password)
+        credentialOne.toString().contains('password=<hidden>')
+
+        !credentialTwo.toString().contains(propertyKey.toLowerCase())
+        !credentialTwo.toString().contains(propertyValue)
+        credentialTwo.toString().contains('mechanismProperties=<hidden>')
+    }
+
+    def 'testEqualsAndHashCode'() {
+        expect:
+        credential() == credential()
+        credential().hashCode() == credential().hashCode()
+
+        where:
+        credential << [
+            { MongoCredential.createCredential('user', 'database', 'pwd'.toCharArray()) },
+            { MongoCredential.createCredential('user', 'database', 'pwd'.toCharArray()).withMechanismProperty('foo', 'bar') },
+            { MongoCredential.createMongoCRCredential('user', 'database', 'pwd'.toCharArray()) },
+            { MongoCredential.createMongoCRCredential('user', 'database', 'pwd'.toCharArray()).withMechanismProperty('foo', 'bar') },
+            { MongoCredential.createPlainCredential('user', '$external', 'pwd'.toCharArray()) },
+            { MongoCredential.createPlainCredential('user', '$external', 'pwd'.toCharArray()).withMechanismProperty('foo', 'bar') },
+            { MongoCredential.createScramSha1Credential('user', '$external', 'pwd'.toCharArray()) },
+            { MongoCredential.createScramSha1Credential('user', '$external', 'pwd'.toCharArray()).withMechanismProperty('foo', 'bar') },
+            { MongoCredential.createGSSAPICredential('user') },
+            { MongoCredential.createGSSAPICredential('user').withMechanismProperty('foo', 'bar') },
+            { MongoCredential.createMongoX509Credential('user') },
+            { MongoCredential.createMongoX509Credential('user').withMechanismProperty('foo', 'bar') },
+            { MongoCredential.createMongoX509Credential() },
+            { MongoCredential.createMongoX509Credential().withMechanismProperty('foo', 'bar') },
+        ]
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/MongoDriverInformationSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoDriverInformationSpecification.groovy
new file mode 100644
index 00000000000..cd2815bf773
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/MongoDriverInformationSpecification.groovy
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import spock.lang.Specification
+
+class MongoDriverInformationSpecification extends Specification {
+
+    def 'should set the correct default values'() {
+        given:
+        def options = MongoDriverInformation.builder().build()
+
+        expect:
+        options.getDriverNames() ==  []
+        options.getDriverVersions() ==  []
+        options.getDriverPlatforms() ==  []
+    }
+
+    def 'should not prepend data if none has been added'() {
+        given:
+        def options = MongoDriverInformation.builder(MongoDriverInformation.builder().build()).build()
+
+        expect:
+        options.getDriverNames() ==  []
+        options.getDriverVersions() ==  []
+        options.getDriverPlatforms() ==  []
+    }
+
+    def 'should prepend data to the list'() {
+        given:
+        def scalaDriverInfo = MongoDriverInformation.builder()
+                .driverName('mongo-scala-driver')
+                .driverVersion('1.2.0')
+                .driverPlatform('Scala 2.11')
+                .build()
+
+        def options = MongoDriverInformation.builder(scalaDriverInfo)
+                .driverName('mongo-java-driver')
+                .driverVersion('3.4.0')
+                .driverPlatform('Java oracle64-1.8.0.31')
+                .build()
+
+        expect:
+        options.getDriverNames() == ['mongo-java-driver', 'mongo-scala-driver']
+        options.getDriverVersions() == ['3.4.0', '1.2.0']
+        options.getDriverPlatforms() == ['Java oracle64-1.8.0.31', 'Scala 2.11']
+    }
+
+    def 'should only prepend data that has been set'() {
+        given:
+        def scalaDriverInfo = MongoDriverInformation.builder().driverName('mongo-scala-driver').build()
+
+        def options = MongoDriverInformation.builder(scalaDriverInfo)
+                .driverName('mongo-java-driver')
+                .driverVersion('3.4.0')
+                .driverPlatform('Java oracle64-1.8.0.31')
+                .build()
+
+        expect:
+        options.getDriverNames() == ['mongo-java-driver', 'mongo-scala-driver']
+        options.getDriverVersions() == ['3.4.0']
+        options.getDriverPlatforms() == ['Java oracle64-1.8.0.31']
+    }
+
+    def 'should error if trying to set a version without setting a name'() {
+        when:
+        MongoDriverInformation.builder().driverVersion('0.21.1-alpha').build()
+
+        then:
+        thrown IllegalStateException
+    }
+
+    def 'should null check the passed MongoDriverInformation'() {
+        when:
+        MongoDriverInformation.builder(null).build()
+
+        then:
+        thrown IllegalArgumentException
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/MongoNamespaceSpecification.groovy b/driver-core/src/test/unit/com/mongodb/MongoNamespaceSpecification.groovy
index ac2908ef243..4f07d59cd00 100644
--- a/driver-core/src/test/unit/com/mongodb/MongoNamespaceSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/MongoNamespaceSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,28 +19,38 @@ package com.mongodb
 import spock.lang.Specification
 
 class MongoNamespaceSpecification extends Specification {
-    def 'null database name should throw IllegalArgumentException'() {
+    def 'invalid database name should throw IllegalArgumentException'() {
         when:
-        new MongoNamespace(null, 'test');
+        new MongoNamespace(databaseName, 'test');
 
         then:
         thrown(IllegalArgumentException)
-    }
 
-    def 'null collection name should throw IllegalArgumentException'() {
         when:
-        new MongoNamespace('test', null);
+        MongoNamespace.checkDatabaseNameValidity(databaseName)
 
         then:
         thrown(IllegalArgumentException)
+
+        where:
+        databaseName << [null, '', 'a\0b', 'a b', 'a.b', 'a/b', 'a\\b', 'a"b']
     }
 
-    def 'null full name should throw IllegalArgumentException'() {
+    def 'invalid collection name should throw IllegalArgumentException'() {
+        when:
+        new MongoNamespace('test', collectionName);
+
+        then:
+        thrown(IllegalArgumentException)
+
         when:
-        new MongoNamespace(null)
+        MongoNamespace.checkCollectionNameValidity(collectionName)
 
         then:
         thrown(IllegalArgumentException)
+
+        where:
+        collectionName << [null, '']
     }
 
     def 'invalid full name should throw IllegalArgumentException'() {
@@ -51,7 +61,7 @@ class MongoNamespaceSpecification extends Specification {
         thrown(IllegalArgumentException)
 
         where:
-        fullName << ['db', '.db', 'db.', 'db..coll', 'db.coll.']
+        fullName << [null, '', 'db', '.db', 'db.', 'a .b']
     }
 
     def 'test getters'() {
diff --git a/driver-core/src/test/unit/com/mongodb/ReadConcernConnectionStringTest.java b/driver-core/src/test/unit/com/mongodb/ReadConcernConnectionStringTest.java
new file mode 100644
index 00000000000..edb7989d1f4
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/ReadConcernConnectionStringTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import junit.framework.TestCase;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+// See https://github.com/mongodb/specifications/tree/master/source/read-write-concern/tests/
+@RunWith(Parameterized.class)
+public class ReadConcernConnectionStringTest extends TestCase {
+    private final String description;
+    private final String input;
+    private final BsonDocument definition;
+
+    public ReadConcernConnectionStringTest(final String description, final String input, final BsonDocument definition) {
+        this.description = description;
+        this.input = input;
+        this.definition = definition;
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        boolean valid = definition.getBoolean("valid", BsonBoolean.TRUE).getValue();
+        try {
+            ConnectionString connectionString = new ConnectionString(input);
+            assertTrue(valid);
+            ReadConcern readConcern = connectionString.getReadConcern() != null ? connectionString.getReadConcern() : ReadConcern.DEFAULT;
+            assertEquals(definition.getDocument("readConcern"), readConcern.asDocument());
+        } catch (IllegalArgumentException e) {
+            assertFalse(valid);
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/read-concern/connection-string")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{test.asDocument().getString("description").getValue(),
+                        test.asDocument().getString("uri").getValue(),
+                        test.asDocument()});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/ReadConcernDocumentTest.java b/driver-core/src/test/unit/com/mongodb/ReadConcernDocumentTest.java
new file mode 100644
index 00000000000..443481c4f12
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/ReadConcernDocumentTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import junit.framework.TestCase;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+// See https://github.com/mongodb/specifications/tree/master/source/read-write-concern/tests/connection-string
+@RunWith(Parameterized.class)
+public class ReadConcernDocumentTest extends TestCase {
+    private final String description;
+    private final BsonDocument definition;
+
+    public ReadConcernDocumentTest(final String description, final BsonDocument definition) {
+        this.description = description;
+        this.definition = definition;
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        final boolean valid = definition.getBoolean("valid", BsonBoolean.TRUE).getValue();
+        try {
+            ReadConcern readConcern = getReadConcern(definition.getDocument("readConcern"));
+            ReadConcern expectedReadConcern = getReadConcern(definition.getDocument("readConcernDocument"));
+
+            // just a sanity check of the tests. These should be equal by definition
+            assertEquals(expectedReadConcern, readConcern);
+            assertEquals(definition.getBoolean("isServerDefault").getValue(), readConcern.isServerDefault());
+            assertTrue(valid);
+        } catch (IllegalArgumentException e) {
+            assertFalse(valid);
+        }
+    }
+
+    private ReadConcern getReadConcern(final BsonDocument readConcernDocument) {
+        ReadConcern readConcern;
+        if (readConcernDocument.containsKey("level")) {
+            readConcern = new ReadConcern(ReadConcernLevel.fromString(readConcernDocument.getString("level").getValue()));
+        } else {
+            readConcern = ReadConcern.DEFAULT;
+        }
+
+        return readConcern;
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/read-concern/document")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{test.asDocument().getString("description").getValue(),
+                                      test.asDocument()});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/ReadConcernLevelSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ReadConcernLevelSpecification.groovy
index ea1d61c1614..3c8718aff8e 100644
--- a/driver-core/src/test/unit/com/mongodb/ReadConcernLevelSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/ReadConcernLevelSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -25,9 +25,12 @@ class ReadConcernLevelSpecification extends Specification {
         readConcernLevel.getValue() == expectedString
 
         where:
-        readConcernLevel             | expectedString
-        ReadConcernLevel.LOCAL       | 'local'
-        ReadConcernLevel.MAJORITY    | 'majority'
+        readConcernLevel              | expectedString
+        ReadConcernLevel.LOCAL        | 'local'
+        ReadConcernLevel.MAJORITY     | 'majority'
+        ReadConcernLevel.LINEARIZABLE | 'linearizable'
+        ReadConcernLevel.SNAPSHOT     | 'snapshot'
+        ReadConcernLevel.AVAILABLE    | 'available'
     }
 
     def 'should support valid string representations'() {
@@ -35,7 +38,8 @@ class ReadConcernLevelSpecification extends Specification {
         ReadConcernLevel.fromString(readConcernLevel) instanceof ReadConcernLevel
 
         where:
-        readConcernLevel << ['local', 'majority', 'LOCAL', 'MAJORITY']
+        readConcernLevel << ['local', 'majority', 'linearizable', 'snapshot', 'available', 'LOCAL', 'MAJORITY',
+                             'LINEARIZABLE', 'SNAPSHOT', 'AVAILABLE']
     }
 
     def 'should throw an illegal Argument exception for invalid values'() {
diff --git a/driver-core/src/test/unit/com/mongodb/ReadConcernSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ReadConcernSpecification.groovy
index 17eabf3138e..9b8641b50f5 100644
--- a/driver-core/src/test/unit/com/mongodb/ReadConcernSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/ReadConcernSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,13 +23,17 @@ class ReadConcernSpecification extends Specification {
 
     def 'should have the expected read concern levels'() {
         expect:
-        staticValue == expected
+        staticValue == expectedReadConcern
+        staticValue.getLevel() == expectedLevel
 
         where:
-        staticValue             | expected
-        ReadConcern.DEFAULT     | new ReadConcern()
-        ReadConcern.LOCAL       | new ReadConcern(ReadConcernLevel.LOCAL)
-        ReadConcern.MAJORITY    | new ReadConcern(ReadConcernLevel.MAJORITY)
+        staticValue              | expectedLevel                 | expectedReadConcern
+        ReadConcern.DEFAULT      | null                          | new ReadConcern()
+        ReadConcern.LOCAL        | ReadConcernLevel.LOCAL        | new ReadConcern(ReadConcernLevel.LOCAL)
+        ReadConcern.MAJORITY     | ReadConcernLevel.MAJORITY     | new ReadConcern(ReadConcernLevel.MAJORITY)
+        ReadConcern.LINEARIZABLE | ReadConcernLevel.LINEARIZABLE | new ReadConcern(ReadConcernLevel.LINEARIZABLE)
+        ReadConcern.SNAPSHOT     | ReadConcernLevel.SNAPSHOT     | new ReadConcern(ReadConcernLevel.SNAPSHOT)
+        ReadConcern.AVAILABLE    | ReadConcernLevel.AVAILABLE    | new ReadConcern(ReadConcernLevel.AVAILABLE)
     }
 
     def 'should create the expected Documents'() {
@@ -37,10 +41,13 @@ class ReadConcernSpecification extends Specification {
         staticValue.asDocument() == expected
 
         where:
-        staticValue             | expected
-        ReadConcern.DEFAULT     | BsonDocument.parse('{}')
-        ReadConcern.LOCAL       | BsonDocument.parse('{level: "local"}')
-        ReadConcern.MAJORITY    | BsonDocument.parse('{level: "majority"}')
+        staticValue              | expected
+        ReadConcern.DEFAULT      | BsonDocument.parse('{}')
+        ReadConcern.LOCAL        | BsonDocument.parse('{level: "local"}')
+        ReadConcern.MAJORITY     | BsonDocument.parse('{level: "majority"}')
+        ReadConcern.LINEARIZABLE | BsonDocument.parse('{level: "linearizable"}')
+        ReadConcern.SNAPSHOT     | BsonDocument.parse('{level: "snapshot"}')
+        ReadConcern.AVAILABLE    | BsonDocument.parse('{level: "available"}')
     }
 
     def 'should have the correct value for isServerDefault'() {
@@ -48,9 +55,12 @@ class ReadConcernSpecification extends Specification {
         staticValue.isServerDefault() == expected
 
         where:
-        staticValue             | expected
-        ReadConcern.DEFAULT     | true
-        ReadConcern.LOCAL       | false
-        ReadConcern.MAJORITY    | false
+        staticValue              | expected
+        ReadConcern.DEFAULT      | true
+        ReadConcern.LOCAL        | false
+        ReadConcern.MAJORITY     | false
+        ReadConcern.LINEARIZABLE | false
+        ReadConcern.SNAPSHOT     | false
+        ReadConcern.AVAILABLE    | false
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/ReadConcernTest.java b/driver-core/src/test/unit/com/mongodb/ReadConcernTest.java
deleted file mode 100644
index 9ccac67fe76..00000000000
--- a/driver-core/src/test/unit/com/mongodb/ReadConcernTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import junit.framework.TestCase;
-import org.bson.BsonDocument;
-import org.bson.BsonValue;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import util.JsonPoweredTestHelper;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-// See https://github.com/mongodb/specifications/tree/master/source/read-write-concern/tests/
-@RunWith(Parameterized.class)
-public class ReadConcernTest extends TestCase {
-    private final String description;
-    private final String input;
-    private final BsonDocument definition;
-
-    public ReadConcernTest(final String description, final String input, final BsonDocument definition) {
-        this.description = description;
-        this.input = input;
-        this.definition = definition;
-    }
-
-    @Test
-    public void shouldPassAllOutcomes() {
-        ConnectionString connectionString = new ConnectionString(input);
-        ReadConcern readConcern = connectionString.getReadConcern() != null ? connectionString.getReadConcern() : ReadConcern.DEFAULT;
-        assertEquals(definition.getDocument("readConcern"), readConcern.asDocument());
-    }
-
-    @Parameterized.Parameters(name = "{0}: {1}")
-    public static Collection<Object[]> data() throws URISyntaxException, IOException {
-        List<Object[]> data = new ArrayList<Object[]>();
-        for (File file : JsonPoweredTestHelper.getTestFiles("/read-concern")) {
-            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
-            for (BsonValue test : testDocument.getArray("tests")) {
-                data.add(new Object[]{test.asDocument().getString("description").getValue(),
-                        test.asDocument().getString("uri").getValue(),
-                        test.asDocument()});
-            }
-        }
-        return data;
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/ReadPreferenceChooseServersTest.java b/driver-core/src/test/unit/com/mongodb/ReadPreferenceChooseServersTest.java
index ededfbe4c91..5eee986708e 100644
--- a/driver-core/src/test/unit/com/mongodb/ReadPreferenceChooseServersTest.java
+++ b/driver-core/src/test/unit/com/mongodb/ReadPreferenceChooseServersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,21 +104,31 @@ public void testPrimaryReadPreference() {
 
     @Test
     public void testSecondaryReadPreference() {
+        TaggableReadPreference pref = (TaggableReadPreference) ReadPreference.secondary();
+        List<ServerDescription> candidates = pref.choose(set);
+        assertEquals(2, candidates.size());
+        assertTrue(candidates.contains(secondary));
+        assertTrue(candidates.contains(otherSecondary));
+
         List<TagSet> tagSetList = asList(new TagSet(new Tag("foo", "1")), new TagSet(new Tag("bar", "2")));
-        TaggableReadPreference pref = ReadPreference.secondary(tagSetList);
+        pref = ReadPreference.secondary(tagSetList);
         assertEquals(tagSetList, pref.getTagSetList());
 
         pref = ReadPreference.secondary(new TagSet(new Tag("baz", "1")));
         assertTrue(pref.choose(set).isEmpty());
 
         pref = ReadPreference.secondary(new TagSet(new Tag("baz", "2")));
-        assertTrue(pref.choose(set).get(0).equals(secondary));
+        candidates = pref.choose(set);
+        assertEquals(1, candidates.size());
+        assertTrue(candidates.contains(secondary));
 
         pref = ReadPreference.secondary(new TagSet(new Tag("unknown", "1")));
         assertTrue(pref.choose(set).isEmpty());
 
         pref = ReadPreference.secondary(asList(new TagSet(new Tag("unknown", "1")), new TagSet(new Tag("baz", "2"))));
-        assertTrue(pref.choose(set).get(0).equals(secondary));
+        candidates = pref.choose(set);
+        assertEquals(1, candidates.size());
+        assertTrue(candidates.contains(secondary));
     }
 
     @Test
@@ -143,14 +153,16 @@ public void testPrimaryPreferredMode() {
     @Test
     public void testSecondaryPreferredMode() {
         ReadPreference pref = ReadPreference.secondary(new TagSet(new Tag("baz", "2")));
-        assertTrue(pref.choose(set).get(0).equals(secondary));
+        List<ServerDescription> candidates = pref.choose(set);
+        assertEquals(1, candidates.size());
+        assertTrue(candidates.contains(secondary));
 
         // test that the primary is returned if no secondaries match the tag
         pref = ReadPreference.secondaryPreferred(new TagSet(new Tag("unknown", "2")));
         assertTrue(pref.choose(set).get(0).equals(primary));
 
         pref = ReadPreference.secondaryPreferred();
-        List<ServerDescription> candidates = pref.choose(set);
+        candidates = pref.choose(set);
         assertEquals(2, candidates.size());
         assertTrue(candidates.contains(secondary));
         assertTrue(candidates.contains(otherSecondary));
diff --git a/driver-core/src/test/unit/com/mongodb/ReadPreferenceSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ReadPreferenceSpecification.groovy
index 0fe0ca9311f..12c3370e48d 100644
--- a/driver-core/src/test/unit/com/mongodb/ReadPreferenceSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/ReadPreferenceSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,10 @@ import org.bson.BsonString
 import spock.lang.Specification
 
 import static java.util.Arrays.asList
+import static java.util.Collections.emptyList
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+import static org.bson.BsonDocument.parse
 
 @SuppressWarnings(['DuplicateMapLiteral', 'LineLength'])
 class ReadPreferenceSpecification extends Specification {
@@ -39,6 +43,44 @@ class ReadPreferenceSpecification extends Specification {
         ReadPreference.nearest()            | 'nearest'
     }
 
+    static final TAG_SET = new TagSet(new Tag('rack', '1'))
+    static final TAG_SET_LIST = [TAG_SET]
+
+    def 'should have correct max staleness and tag set list'() {
+        given:
+
+        expect:
+        ((TaggableReadPreference) readPreference).getMaxStaleness(MILLISECONDS) == (Long) maxStalenessMS
+        ((TaggableReadPreference) readPreference).getTagSetList() == tagSetList
+
+        where:
+        readPreference                                                 | maxStalenessMS | tagSetList
+        ReadPreference.primaryPreferred()                              | null           | emptyList()
+        ReadPreference.secondary()                                     | null           | emptyList()
+        ReadPreference.secondaryPreferred()                            | null           | emptyList()
+        ReadPreference.nearest()                                       | null           | emptyList()
+        ReadPreference.secondary(10, SECONDS)                          | 10000          | emptyList()
+        ReadPreference.secondaryPreferred(10, SECONDS)                 | 10000          | emptyList()
+        ReadPreference.primaryPreferred(10, SECONDS)                   | 10000          | emptyList()
+        ReadPreference.nearest(10, SECONDS)                            | 10000          | emptyList()
+        ReadPreference.secondary(TAG_SET, 10, SECONDS)                 | 10000          | TAG_SET_LIST
+        ReadPreference.secondaryPreferred(TAG_SET, 10, SECONDS)        | 10000          | TAG_SET_LIST
+        ReadPreference.primaryPreferred(TAG_SET, 10, SECONDS)          | 10000          | TAG_SET_LIST
+        ReadPreference.nearest(TAG_SET, 10, SECONDS)                   | 10000          | TAG_SET_LIST
+        ReadPreference.secondary(TAG_SET_LIST, 10, SECONDS)            | 10000          | TAG_SET_LIST
+        ReadPreference.secondaryPreferred(TAG_SET_LIST, 10, SECONDS)   | 10000          | TAG_SET_LIST
+        ReadPreference.primaryPreferred(TAG_SET_LIST, 10, SECONDS)     | 10000          | TAG_SET_LIST
+        ReadPreference.nearest(TAG_SET_LIST, 10, SECONDS)              | 10000          | TAG_SET_LIST
+    }
+
+    def 'should throw if max staleness is negative'() {
+        when:
+        ReadPreference.secondary(-1, SECONDS)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
     def 'should have correct valueOf'() {
         expect:
         ReadPreference.primary() == ReadPreference.valueOf('primary')
@@ -92,17 +134,35 @@ class ReadPreferenceSpecification extends Specification {
         ReadPreference.nearest(tags) == ReadPreference.valueOf('nearest', tags)
     }
 
+    def 'should have correct valueOf with max staleness'() {
+        expect:
+        ReadPreference.secondary(10, SECONDS) == ReadPreference.valueOf('secondary', [], 10, SECONDS)
+    }
+
+    def 'should convert read preference with max staleness to correct documents'() {
+        expect:
+        readPreference.toDocument() == document
+
+        where:
+        readPreference                                 | document
+        ReadPreference.primaryPreferred(10, SECONDS)   | parse('{mode : "primaryPreferred", maxStalenessSeconds : {$numberLong : "10" }}}')
+        ReadPreference.secondary(10, SECONDS)          | parse('{mode : "secondary", maxStalenessSeconds : {$numberLong : "10" }}}')
+        ReadPreference.secondaryPreferred(10, SECONDS) | parse('{mode : "secondaryPreferred", maxStalenessSeconds : {$numberLong : "10" }}}')
+        ReadPreference.nearest(10, SECONDS)            | parse('{mode : "nearest", maxStalenessSeconds : {$numberLong : "10" }}}')
+        ReadPreference.nearest(10005, MILLISECONDS)    | parse('{mode : "nearest", maxStalenessSeconds : {$numberLong : "10" }}}')
+    }
+
     def 'should convert read preferences with a single tag set to correct documents'() {
         expect:
         readPreference.toDocument() == document
 
         where:
-        readPreference                                                     | document
-        ReadPreference.primary()                                           | new BsonDocument('mode', new BsonString('primary'))
-        ReadPreference.primaryPreferred()                                  | new BsonDocument('mode', new BsonString('primaryPreferred'))
-        ReadPreference.secondary()                                         | new BsonDocument('mode', new BsonString('secondary'))
-        ReadPreference.secondaryPreferred()                                | new BsonDocument('mode', new BsonString('secondaryPreferred'))
-        ReadPreference.nearest()                                           | new BsonDocument('mode', new BsonString('nearest'))
+        readPreference                                                   | document
+        ReadPreference.primary()                                         | new BsonDocument('mode', new BsonString('primary'))
+        ReadPreference.primaryPreferred()                                | new BsonDocument('mode', new BsonString('primaryPreferred'))
+        ReadPreference.secondary()                                       | new BsonDocument('mode', new BsonString('secondary'))
+        ReadPreference.secondaryPreferred()                              | new BsonDocument('mode', new BsonString('secondaryPreferred'))
+        ReadPreference.nearest()                                         | new BsonDocument('mode', new BsonString('nearest'))
         ReadPreference.primaryPreferred(
                 new TagSet([new Tag('dc', 'ny'), new Tag('rack', '1')])) | new BsonDocument('mode', new BsonString('primaryPreferred'))
                 .append('tags', new BsonArray([new BsonDocument('dc', new BsonString('ny')).append('rack', new BsonString('1'))]))
@@ -158,4 +218,17 @@ class ReadPreferenceSpecification extends Specification {
                 .append('tags', new BsonArray([new BsonDocument('dc', new BsonString('ny')).append('rack', new BsonString('1')),
                                                new BsonDocument('dc', new BsonString('ca')).append('rack', new BsonString('2'))]))
     }
+
+    def 'different read preferences should have different hash codes'() {
+        expect:
+        first.hashCode() != second.hashCode()
+
+        where:
+        first                                                         | second
+        ReadPreference.primary()                                      | ReadPreference.secondary()
+        ReadPreference.secondary()                                    | ReadPreference.nearest()
+        ReadPreference.secondary()                                    | ReadPreference.secondary([new TagSet([new Tag('dc', 'ny')])])
+        ReadPreference.secondary([new TagSet([new Tag('dc', 'ny')])]) | ReadPreference.secondary([new TagSet([new Tag('dc', 'la')])])
+        ReadPreference.secondary()                                    | ReadPreference.secondary(1000, MILLISECONDS)
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/ServerAddressSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ServerAddressSpecification.groovy
index c0159a4452b..920d3528916 100644
--- a/driver-core/src/test/unit/com/mongodb/ServerAddressSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/ServerAddressSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,9 @@ class ServerAddressSpecification extends Specification {
     @Unroll
     def 'constructors should parse hostname and port correctly'() {
         expect:
-        address.getHost() == host;
-        address.getPort() == port;
+        address.getHost() == host
+        address.getPort() == port
+        address == new ServerAddress(host, port)
 
         where:
         address                                                 | host                           | port
@@ -37,10 +38,11 @@ class ServerAddressSpecification extends Specification {
         new ServerAddress('SOMEWHERE')                          | 'somewhere'                    | ServerAddress.defaultPort()
         new ServerAddress('somewhere:1000')                     | 'somewhere'                    | 1000
         new ServerAddress('somewhere', 1000)                    | 'somewhere'                    | 1000
-        new ServerAddress('[2010:836b:4179::836b:4179]')        | '[2010:836b:4179::836b:4179]'  | ServerAddress.defaultPort()
-        new ServerAddress('[2010:836B:4179::836B:4179]')        | '[2010:836b:4179::836b:4179]'  | ServerAddress.defaultPort()
-        new ServerAddress('[2010:836B:4179::836B:4179]:1000')   | '[2010:836b:4179::836b:4179]'  | 1000
-        new ServerAddress('[2010:836B:4179::836B:4179]', 1000)  | '[2010:836b:4179::836b:4179]'  | 1000
+        new ServerAddress('[2010:836B:4179::836B:4179]')        | '2010:836b:4179::836b:4179'    | ServerAddress.defaultPort()
+        new ServerAddress('[2010:836B:4179::836B:4179]:1000')   | '2010:836b:4179::836b:4179'    | 1000
+        new ServerAddress('[2010:836B:4179::836B:4179]', 1000)  | '2010:836b:4179::836b:4179'    | 1000
+        new ServerAddress('2010:836B:4179::836B:4179')          | '2010:836b:4179::836b:4179'    | ServerAddress.defaultPort()
+        new ServerAddress('2010:836B:4179::836B:4179', 1000)    | '2010:836b:4179::836b:4179'    | 1000
     }
 
     def 'ipv4 host with a port specified should throw when a port is also specified as an argument'() {
@@ -57,19 +59,19 @@ class ServerAddressSpecification extends Specification {
 
     def 'ipv6 host with a port specified should throw when a port is also specified as an argument'() {
         when:
-        new ServerAddress('[2010:836B:4179::836B:4179]:80', 80);
+        new ServerAddress('[2010:836B:4179::836B:4179]:80', 80)
         then:
         thrown(IllegalArgumentException);
 
         when:
-        new ServerAddress('[2010:836B:4179::836B:4179]:1000', 80);
+        new ServerAddress('[2010:836B:4179::836B:4179]:1000', 80)
         then:
         thrown(IllegalArgumentException);
     }
 
     def 'ipv6 host should throw when terminating ] is not specified'() {
         when:
-        new ServerAddress('[2010:836B:4179::836B:4179');
+        new ServerAddress('[2010:836B:4179::836B:4179')
         then:
         thrown(IllegalArgumentException);
     }
@@ -81,7 +83,7 @@ class ServerAddressSpecification extends Specification {
         thrown(IllegalArgumentException);
 
         when:
-        new ServerAddress('somewhere:1000', 80);
+        new ServerAddress('somewhere:1000', 80)
         then:
         thrown(IllegalArgumentException);
     }
@@ -92,4 +94,23 @@ class ServerAddressSpecification extends Specification {
         then:
         thrown(MongoException);
     }
-}
\ No newline at end of file
+
+    @Unroll
+    @SuppressWarnings('deprecated')
+    def 'sameHost should parse hosts correctly'() {
+        expect:
+        new ServerAddress(host).sameHost(host)
+
+        where:
+        host << [
+            '10.0.0.1:1000',
+            '10.0.0.1',
+            'somewhere',
+            'SOMEWHERE',
+            'somewhere:1000',
+            '[2010:836B:4179::836B:4179]',
+            '[2010:836B:4179::836B:4179]:1000',
+            '2010:836B:4179::836B:4179'
+        ]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/TagSetSpecification.groovy b/driver-core/src/test/unit/com/mongodb/TagSetSpecification.groovy
index bf67541bdfd..f92fee847f9 100644
--- a/driver-core/src/test/unit/com/mongodb/TagSetSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/TagSetSpecification.groovy
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.mongodb
 
 import spock.lang.Specification
@@ -68,4 +84,17 @@ class TagSetSpecification extends Specification {
         thrown(IllegalArgumentException)
     }
 
-}
\ No newline at end of file
+    def 'should alphabetically order tags'() {
+        when:
+        def pTag = new Tag('p', '1')
+        def dcTag = new Tag('dc', 'ny')
+        def tagSet = new TagSet([pTag, dcTag])
+        def iter = tagSet.iterator()
+
+        then:
+        iter.next() == dcTag
+        iter.next() == pTag
+        !iter.hasNext()
+        tagSet == new TagSet([dcTag, pTag])
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/TransactionOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/TransactionOptionsSpecification.groovy
new file mode 100644
index 00000000000..b8055416894
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/TransactionOptionsSpecification.groovy
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+class TransactionOptionsSpecification extends Specification {
+    def 'should have correct defaults'() {
+        when:
+        def options = TransactionOptions.builder().build()
+
+        then:
+        options.getReadConcern() == null
+        options.getWriteConcern() == null
+        options.getReadPreference() == null
+        options.getMaxCommitTime(TimeUnit.MILLISECONDS) == null
+    }
+
+    def 'should apply options set in builder'() {
+        when:
+        def options = TransactionOptions.builder()
+                .readConcern(ReadConcern.LOCAL)
+                .writeConcern(WriteConcern.JOURNALED)
+                .readPreference(ReadPreference.secondary())
+                .maxCommitTime(5, TimeUnit.SECONDS)
+                .build()
+
+        then:
+        options.readConcern == ReadConcern.LOCAL
+        options.writeConcern == WriteConcern.JOURNALED
+        options.readPreference == ReadPreference.secondary()
+        options.getMaxCommitTime(TimeUnit.MILLISECONDS) == 5000
+        options.getMaxCommitTime(TimeUnit.SECONDS) == 5
+    }
+
+    def 'should merge'() {
+        given:
+        def first = TransactionOptions.builder().build();
+        def second = TransactionOptions.builder().readConcern(ReadConcern.MAJORITY)
+                .writeConcern(WriteConcern.MAJORITY)
+                .readPreference(ReadPreference.secondary())
+                .maxCommitTime(5, TimeUnit.SECONDS)
+                .build()
+        def third = TransactionOptions.builder()
+                .readConcern(ReadConcern.LOCAL)
+                .writeConcern(WriteConcern.W2)
+                .readPreference(ReadPreference.nearest())
+                .maxCommitTime(10, TimeUnit.SECONDS)
+                .build()
+
+        expect:
+        TransactionOptions.merge(first, second) == second
+        TransactionOptions.merge(second, first) == second
+        TransactionOptions.merge(second, third) == second
+        TransactionOptions.merge(third, second) == third
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/UnixServerAddressSpecification.groovy b/driver-core/src/test/unit/com/mongodb/UnixServerAddressSpecification.groovy
new file mode 100644
index 00000000000..5f33534a228
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/UnixServerAddressSpecification.groovy
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+@IgnoreIf({ javaVersion < 1.7 })
+class UnixServerAddressSpecification extends Specification {
+
+    def 'should return the path for the host'() {
+        when:
+        def path = '/tmp/mongodb.sock'
+
+        then:
+        new UnixServerAddress(path).getHost() == path
+    }
+
+    def 'should throw if the path does not end with .sock'() {
+        when:
+        new UnixServerAddress('localhost').getSocketAddress()
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should throw when trying to get a InetSocketAddress'() {
+        when:
+        new UnixServerAddress('/tmp/mongodb.sock').getSocketAddress()
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/UriOptionsTest.java b/driver-core/src/test/unit/com/mongodb/UriOptionsTest.java
new file mode 100644
index 00000000000..c573487b898
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/UriOptionsTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.Test;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/uri-options/tests
+public class UriOptionsTest extends AbstractConnectionStringTest {
+    public UriOptionsTest(final String filename, final String description, final String input, final BsonDocument definition) {
+        super(filename, description, input, definition);
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        assumeFalse(getDefinition().getBoolean("warning", BsonBoolean.FALSE).getValue());
+        assumeFalse(getDescription().equals("Arbitrary string readConcernLevel does not cause a warning"));
+        // Skip because Java driver does not support the tlsAllowInvalidCertificates option
+        assumeFalse(getDescription().startsWith("tlsInsecure and tlsAllowInvalidCertificates both present"));
+        assumeFalse(getDescription().startsWith("tlsAllowInvalidCertificates and tlsInsecure both present"));
+
+        if (getDefinition().getBoolean("valid", BsonBoolean.TRUE).getValue()) {
+            testValidOptions();
+        } else {
+            testInvalidUris();
+        }
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/uri-options")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        test.asDocument().getString("uri").getValue(), test.asDocument()});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/WriteConcernConnectionStringTest.java b/driver-core/src/test/unit/com/mongodb/WriteConcernConnectionStringTest.java
index 4984984667f..e8994bc921c 100644
--- a/driver-core/src/test/unit/com/mongodb/WriteConcernConnectionStringTest.java
+++ b/driver-core/src/test/unit/com/mongodb/WriteConcernConnectionStringTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -51,14 +51,16 @@ public WriteConcernConnectionStringTest(final String description, final String i
 
     @Test
     public void shouldPassAllOutcomes() {
+        boolean valid = definition.getBoolean("valid", BsonBoolean.TRUE).getValue();
         try {
             ConnectionString connectionString = new ConnectionString(input);
             WriteConcern writeConcern = connectionString.getWriteConcern() != null
                                         ? connectionString.getWriteConcern()
                                         : WriteConcern.ACKNOWLEDGED;
+            assertTrue(valid);
             assertEquals(getExpectedWriteConcern(), writeConcern);
-        } catch (Throwable t) {
-            assertFalse(definition.getBoolean("valid", BsonBoolean.TRUE).getValue());
+        } catch (IllegalArgumentException e) {
+            assertFalse(valid);
         }
     }
 
diff --git a/driver-core/src/test/unit/com/mongodb/WriteConcernDocumentTest.java b/driver-core/src/test/unit/com/mongodb/WriteConcernDocumentTest.java
index 7a0a3e78dec..1adc3c10475 100644
--- a/driver-core/src/test/unit/com/mongodb/WriteConcernDocumentTest.java
+++ b/driver-core/src/test/unit/com/mongodb/WriteConcernDocumentTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -51,13 +51,15 @@ public WriteConcernDocumentTest(final String description, final BsonDocument wri
 
     @Test
     public void shouldPassAllOutcomes() {
+        boolean valid = definition.getBoolean("valid", BsonBoolean.TRUE).getValue();
         try {
             WriteConcern writeConcern = getWriteConcern(writeConcernDocument);
+            assertTrue(valid);
             assertEquals(writeConcern.isAcknowledged(), definition.getBoolean("isAcknowledged").getValue());
             assertEquals(writeConcern.isServerDefault(), definition.getBoolean("isServerDefault").getValue());
             assertEquals(writeConcern.asDocument(), definition.getDocument("writeConcernDocument"));
-        } catch (Exception e) {
-            assertFalse(definition.getBoolean("valid", BsonBoolean.TRUE).getValue());
+        } catch (IllegalArgumentException e) {
+            assertFalse(valid);
         }
     }
 
diff --git a/driver-core/src/test/unit/com/mongodb/WriteConcernSpecification.groovy b/driver-core/src/test/unit/com/mongodb/WriteConcernSpecification.groovy
index 97ac419661f..866f2d5ea8a 100644
--- a/driver-core/src/test/unit/com/mongodb/WriteConcernSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/WriteConcernSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,6 +165,18 @@ class WriteConcernSpecification extends Specification {
 
         then:
         thrown(IllegalArgumentException)
+
+        when:
+        WriteConcern.UNACKNOWLEDGED.withFsync(true)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        WriteConcern.UNACKNOWLEDGED.withJournal(true)
+
+        then:
+        thrown(IllegalArgumentException)
     }
 
     def 'test withFsync methods'() {
@@ -293,10 +305,8 @@ class WriteConcernSpecification extends Specification {
         WriteConcern.MAJORITY                                      | true
         WriteConcern.UNACKNOWLEDGED                                | false
         WriteConcern.UNACKNOWLEDGED.withWTimeout(10, MILLISECONDS) | false
-        WriteConcern.UNACKNOWLEDGED.withFsync(true)                | true
-        WriteConcern.UNACKNOWLEDGED.withJournal(true)              | true
-        WriteConcern.UNACKNOWLEDGED.withFsync(false)               | false
-        WriteConcern.UNACKNOWLEDGED.withJournal(false)             | false
+        WriteConcern.UNACKNOWLEDGED.withFsync(false)         | false
+        WriteConcern.UNACKNOWLEDGED.withJournal(false)      | false
     }
 
     def 'test value of'() {
diff --git a/driver-core/src/test/unit/com/mongodb/async/CallbackResultHolder.java b/driver-core/src/test/unit/com/mongodb/async/CallbackResultHolder.java
index b8f71d5884e..9ff863cf11a 100644
--- a/driver-core/src/test/unit/com/mongodb/async/CallbackResultHolder.java
+++ b/driver-core/src/test/unit/com/mongodb/async/CallbackResultHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,9 @@
 
 package com.mongodb.async;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 /**
  * A SingleResultCallback implementation that saves the result of the callback.
  *
@@ -35,13 +38,21 @@ class CallbackResultHolder<T> implements SingleResultCallback<T> {
      */
     public void onResult(final T result, final Throwable error) {
         if (isDone) {
-            throw new IllegalStateException("The CallbackResult cannot be initialized multiple times.");
+            throw new IllegalStateException("The CallbackResult cannot be initialized multiple times.  The first time it was initialized "
+                    + "with " + (this.error != null ? getErrorString(this.error) : this.result) + "\n The second time it was initialized "
+                    + "with " + (error != null ? getErrorString(error) : result));
         }
         this.result = result;
         this.error = error;
         this.isDone = true;
     }
 
+    private String getErrorString(final Throwable error) {
+        StringWriter writer = new StringWriter();
+        error.printStackTrace(new PrintWriter(writer));
+        return writer.toString();
+    }
+
     /**
      * Returns the result of the callback or null.
      *
@@ -81,9 +92,9 @@ public boolean isDone() {
     @Override
     public String toString() {
         return "CallbackResultHolder{"
-               + "result=" + result
-               + ", error=" + error
-               + ", isDone=" + isDone
-               + '}';
+                + "result=" + result
+                + ", error=" + error
+                + ", isDone=" + isDone
+                + '}';
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/async/FutureResultCallback.java b/driver-core/src/test/unit/com/mongodb/async/FutureResultCallback.java
index d11b3209b08..c790477878c 100644
--- a/driver-core/src/test/unit/com/mongodb/async/FutureResultCallback.java
+++ b/driver-core/src/test/unit/com/mongodb/async/FutureResultCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,8 @@
 import com.mongodb.MongoTimeoutException;
 
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 /**
  * A SingleResultCallback Future implementation.
@@ -59,22 +57,28 @@ public boolean isDone() {
     }
 
     @Override
-    public T get() throws InterruptedException, ExecutionException {
-        latch.await();
-        if (result.hasError()) {
-            throw MongoException.fromThrowable(result.getError());
-        } else {
-            return result.getResult();
-        }
+    public T get() {
+        return get(5, TimeUnit.MINUTES);
     }
 
     @Override
-    public T get(final long timeout, final TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-        if (!latch.await(timeout, unit)) {
-            throw new MongoTimeoutException("Callback timed out");
+    public T get(final long timeout, final TimeUnit unit) {
+        try {
+            if (!latch.await(timeout, unit)) {
+                throw new MongoTimeoutException("Callback timed out");
+            }
+        } catch (InterruptedException e) {
+            throw new MongoException("Latch interrupted");
         }
+
         if (result.hasError()) {
-            throw (RuntimeException) result.getError();
+            if (result.getError() instanceof RuntimeException) {
+                throw (RuntimeException) result.getError();
+            } else if (result.getError() instanceof Error) {
+                throw (Error) result.getError();
+            } else {
+                throw new RuntimeException("Wrapping unexpected Throwable", result.getError());
+            }
         } else {
             return result.getResult();
         }
diff --git a/driver-core/src/test/unit/com/mongodb/binding/AsyncSingleConnectionReadBindingSpecification.groovy b/driver-core/src/test/unit/com/mongodb/binding/AsyncSingleConnectionReadBindingSpecification.groovy
index 54276d55f99..261274a93a7 100644
--- a/driver-core/src/test/unit/com/mongodb/binding/AsyncSingleConnectionReadBindingSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/binding/AsyncSingleConnectionReadBindingSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/binding/SingleConnectionReadBindingSpecification.groovy b/driver-core/src/test/unit/com/mongodb/binding/SingleConnectionReadBindingSpecification.groovy
index fb0b31d1da8..996f01c818e 100644
--- a/driver-core/src/test/unit/com/mongodb/binding/SingleConnectionReadBindingSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/binding/SingleConnectionReadBindingSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/binding/SingleServerBindingSpecification.groovy b/driver-core/src/test/unit/com/mongodb/binding/SingleServerBindingSpecification.groovy
new file mode 100644
index 00000000000..3e1bd23a2cf
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/binding/SingleServerBindingSpecification.groovy
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.binding
+
+import com.mongodb.ServerAddress
+import com.mongodb.connection.Cluster
+import spock.lang.Specification
+
+class SingleServerBindingSpecification extends Specification {
+
+    def 'should increment and decrement reference counts'() {
+        given:
+        def cluster = Mock(Cluster)
+        def address = new ServerAddress()
+
+        when:
+        def binding = new SingleServerBinding(cluster, address)
+
+        then:
+        binding.count == 1
+
+        when:
+        def source = binding.getReadConnectionSource()
+
+        then:
+        source.count == 1
+        binding.count == 2
+
+        when:
+        source.retain()
+
+        then:
+        source.count == 2
+        binding.count == 2
+
+        when:
+        source.release()
+
+        then:
+        source.count == 1
+        binding.count == 2
+
+        when:
+        source.release()
+
+        then:
+        source.count == 0
+        binding.count == 1
+
+        when:
+        source = binding.getWriteConnectionSource()
+
+        then:
+        source.count == 1
+        binding.count == 2
+
+        when:
+        source.retain()
+
+        then:
+        source.count == 2
+        binding.count == 2
+
+        when:
+        source.release()
+
+        then:
+        source.count == 1
+        binding.count == 2
+
+        when:
+        source.release()
+
+        then:
+        source.count == 0
+        binding.count == 1
+
+        when:
+        binding.release()
+
+        then:
+        binding.count == 0
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/ImmutableDocument.java b/driver-core/src/test/unit/com/mongodb/client/ImmutableDocument.java
new file mode 100644
index 00000000000..5b33a083265
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/ImmutableDocument.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWrapper;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+public final class ImmutableDocument implements Map<String, Object>, Bson {
+    private final Map<String, Object> immutableDocument;
+
+    /**
+     * Creates a Document instance initialized with the given map.
+     *
+     * @param map initial map
+     */
+    public ImmutableDocument(final Map<String, Object> map) {
+        immutableDocument = Collections.unmodifiableMap(new LinkedHashMap<String, Object>(map));
+    }
+
+
+    @Override
+    public int size() {
+        return immutableDocument.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return immutableDocument.isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(final Object key) {
+        return immutableDocument.containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(final Object value) {
+        return immutableDocument.containsValue(value);
+    }
+
+    @Override
+    public Object get(final Object key) {
+        return immutableDocument.get(key);
+    }
+
+    @Override
+    public Object put(final String key, final Object value) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Object remove(final Object key) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void putAll(final Map<? extends String, ?> m) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Set<String> keySet() {
+        return immutableDocument.keySet();
+    }
+
+    @Override
+    public Collection<Object> values() {
+        return immutableDocument.values();
+    }
+
+    @Override
+    public Set<Entry<String, Object>> entrySet() {
+        return immutableDocument.entrySet();
+    }
+
+    @Override
+    public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> tDocumentClass, final CodecRegistry codecRegistry) {
+        return new BsonDocumentWrapper<ImmutableDocument>(this, codecRegistry.get(ImmutableDocument.class));
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/ImmutableDocumentCodec.java b/driver-core/src/test/unit/com/mongodb/client/ImmutableDocumentCodec.java
new file mode 100644
index 00000000000..ff09e94697e
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/ImmutableDocumentCodec.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonReader;
+import org.bson.BsonValue;
+import org.bson.BsonWriter;
+import org.bson.Document;
+import org.bson.codecs.CollectibleCodec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.types.ObjectId;
+
+import java.util.LinkedHashMap;
+
+import static java.lang.String.format;
+
+public final class ImmutableDocumentCodec implements CollectibleCodec<ImmutableDocument> {
+    private final CodecRegistry codecRegistry;
+    private static final String ID_FIELD_NAME = "_id";
+
+    public ImmutableDocumentCodec(final CodecRegistry codecRegistry) {
+        this.codecRegistry = codecRegistry;
+    }
+
+    @Override
+    public ImmutableDocument generateIdIfAbsentFromDocument(final ImmutableDocument document) {
+        LinkedHashMap<String, Object> mutable = new LinkedHashMap<String, Object>(document);
+        mutable.put(ID_FIELD_NAME, new ObjectId());
+        return new ImmutableDocument(mutable);
+    }
+
+    @Override
+    public boolean documentHasId(final ImmutableDocument document) {
+        return document.containsKey(ID_FIELD_NAME);
+    }
+
+    @Override
+    public BsonValue getDocumentId(final ImmutableDocument document) {
+        if (!documentHasId(document)) {
+            throw new IllegalStateException(format("The document does not contain an %s", ID_FIELD_NAME));
+        }
+        return document.toBsonDocument(ImmutableDocument.class, codecRegistry).get(ID_FIELD_NAME);
+    }
+
+    @Override
+    public void encode(final BsonWriter writer, final ImmutableDocument value, final EncoderContext encoderContext) {
+        codecRegistry.get(Document.class).encode(writer, new Document(value), encoderContext);
+    }
+
+    @Override
+    public Class<ImmutableDocument> getEncoderClass() {
+        return ImmutableDocument.class;
+    }
+
+    @Override
+    public ImmutableDocument decode(final BsonReader reader, final DecoderContext decoderContext) {
+        Document document = codecRegistry.get(Document.class).decode(reader, decoderContext);
+        return new ImmutableDocument(document);
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/ImmutableDocumentCodecProvider.java b/driver-core/src/test/unit/com/mongodb/client/ImmutableDocumentCodecProvider.java
new file mode 100644
index 00000000000..9df1f8cf1f0
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/ImmutableDocumentCodecProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.codecs.Codec;
+import org.bson.codecs.configuration.CodecProvider;
+import org.bson.codecs.configuration.CodecRegistry;
+
+public final class ImmutableDocumentCodecProvider implements CodecProvider {
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
+        if (clazz.equals(ImmutableDocument.class)) {
+            return (Codec<T>) new ImmutableDocumentCodec(registry);
+        }
+        return null;
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/async/FutureResultCallbackSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/async/FutureResultCallbackSpecification.groovy
index 1df0c7e8a75..82e23c913e8 100644
--- a/driver-core/src/test/unit/com/mongodb/client/async/FutureResultCallbackSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/async/FutureResultCallbackSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,4 +100,4 @@ class FutureResultCallbackSpecification extends Specification {
         then:
         thrown IllegalStateException
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecProviderSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecProviderSpecification.groovy
index 7911778e748..6796d8323a9 100644
--- a/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecProviderSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecProviderSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecSpecification.groovy
index 8b61cd94a68..90f02ce0855 100644
--- a/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/gridfs/codecs/GridFSFileCodecSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -63,12 +63,13 @@ class GridFSFileCodecSpecification extends Specification {
 
         where:
         original << [
+            new GridFSFile(ID, FILENAME, LENGTH, CHUNKSIZE, UPLOADDATE, null, null, null),
             new GridFSFile(ID, FILENAME, LENGTH, CHUNKSIZE, UPLOADDATE, MD5, null, null),
             new GridFSFile(ID, FILENAME, LENGTH, CHUNKSIZE, UPLOADDATE, MD5, METADATA, null),
             new GridFSFile(ID, FILENAME, LENGTH, CHUNKSIZE, UPLOADDATE, MD5, null, EXTRAELEMENTS),
+            new GridFSFile(ID, FILENAME, LENGTH, CHUNKSIZE, UPLOADDATE, null, METADATA, EXTRAELEMENTS),
             new GridFSFile(ID, FILENAME, LENGTH, CHUNKSIZE, UPLOADDATE, MD5, METADATA, EXTRAELEMENTS)
         ]
-
     }
 
     def 'it should decode extra elements'() {
diff --git a/driver-core/src/test/unit/com/mongodb/client/gridfs/model/GridFSFileSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/gridfs/model/GridFSFileSpecification.groovy
index 3bdcd2b2960..e154177a0f4 100644
--- a/driver-core/src/test/unit/com/mongodb/client/gridfs/model/GridFSFileSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/gridfs/model/GridFSFileSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,6 +23,7 @@ import org.bson.Document
 import org.bson.types.ObjectId
 import spock.lang.Specification
 
+@SuppressWarnings('deprecation')
 class GridFSFileSpecification extends Specification {
 
     def 'should return the expected valued'() {
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/AggregatesSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/AggregatesSpecification.groovy
index fb851e5b8f4..4503d083ee7 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/AggregatesSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/AggregatesSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,14 +16,16 @@
 
 package com.mongodb.client.model
 
-import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider
+import com.mongodb.MongoNamespace
 import org.bson.BsonDocument
 import org.bson.BsonInt32
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.ValueCodecProvider
+import org.bson.Document
 import org.bson.conversions.Bson
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 
+import static BucketGranularity.R5
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.client.model.Accumulators.addToSet
 import static com.mongodb.client.model.Accumulators.avg
 import static com.mongodb.client.model.Accumulators.first
@@ -32,26 +36,128 @@ import static com.mongodb.client.model.Accumulators.push
 import static com.mongodb.client.model.Accumulators.stdDevPop
 import static com.mongodb.client.model.Accumulators.stdDevSamp
 import static com.mongodb.client.model.Accumulators.sum
+import static com.mongodb.client.model.Aggregates.addFields
+import static com.mongodb.client.model.Aggregates.bucket
+import static com.mongodb.client.model.Aggregates.bucketAuto
+import static com.mongodb.client.model.Aggregates.count
+import static com.mongodb.client.model.Aggregates.facet
+import static com.mongodb.client.model.Aggregates.graphLookup
 import static com.mongodb.client.model.Aggregates.group
 import static com.mongodb.client.model.Aggregates.limit
 import static com.mongodb.client.model.Aggregates.lookup
 import static com.mongodb.client.model.Aggregates.match
+import static com.mongodb.client.model.Aggregates.merge
 import static com.mongodb.client.model.Aggregates.out
 import static com.mongodb.client.model.Aggregates.project
+import static com.mongodb.client.model.Aggregates.replaceRoot
+import static com.mongodb.client.model.Aggregates.replaceWith
 import static com.mongodb.client.model.Aggregates.sample
 import static com.mongodb.client.model.Aggregates.skip
 import static com.mongodb.client.model.Aggregates.sort
+import static com.mongodb.client.model.Aggregates.sortByCount
 import static com.mongodb.client.model.Aggregates.unwind
+import static com.mongodb.client.model.BsonHelper.toBson
 import static com.mongodb.client.model.Filters.eq
+import static com.mongodb.client.model.Filters.expr
 import static com.mongodb.client.model.Projections.computed
 import static com.mongodb.client.model.Projections.fields
 import static com.mongodb.client.model.Projections.include
 import static com.mongodb.client.model.Sorts.ascending
+import static com.mongodb.client.model.Sorts.descending
+import static java.util.Arrays.asList
 import static org.bson.BsonDocument.parse
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class AggregatesSpecification extends Specification {
-    def registry = fromProviders([new BsonValueCodecProvider(), new ValueCodecProvider(), new GeoJsonCodecProvider()])
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should render $addFields'() {
+        expect:
+        toBson(addFields(new Field('newField', null))) == parse('{$addFields: {newField: null}}')
+        toBson(addFields(new Field('newField', 'hello'))) == parse('{$addFields: {newField: "hello"}}')
+        toBson(addFields(new Field('this', '$$CURRENT'))) == parse('{$addFields: {this: "$$CURRENT"}}')
+        toBson(addFields(new Field('myNewField', new Document('c', 3)
+                .append('d', 4)))) == parse('{$addFields: {myNewField: {c: 3, d: 4}}}')
+        toBson(addFields(new Field('alt3', new Document('$lt', asList('$a', 3))))) == parse(
+                '{$addFields: {alt3: {$lt: ["$a", 3]}}}')
+        toBson(addFields(new Field('b', 3), new Field('c', 5))) == parse('{$addFields: {b: 3, c: 5}}')
+        toBson(addFields(asList(new Field('b', 3), new Field('c', 5)))) == parse('{$addFields: {b: 3, c: 5}}')
+    }
+
+    def 'should render $bucket'() {
+        expect:
+        toBson(bucket('$screenSize', [0, 24, 32, 50, 100000])) == parse('''{
+            $bucket: {
+              groupBy: "$screenSize",
+              boundaries: [0, 24, 32, 50, 100000]
+            }
+          }''')
+        toBson(bucket('$screenSize', [0, 24, 32, 50, 100000],
+                      new BucketOptions()
+                              .defaultBucket('other'))) == parse('''{
+            $bucket: {
+              groupBy: "$screenSize",
+              boundaries: [0, 24, 32, 50, 100000],
+              default: "other"
+            }
+          }''')
+        toBson(bucket('$screenSize', [0, 24, 32, 50, 100000],
+                      new BucketOptions()
+                              .defaultBucket('other')
+                              .output(sum('count', 1), push('matches', '$screenSize')))) == parse('''{
+            $bucket: {
+                groupBy: "$screenSize",
+                boundaries: [0, 24, 32, 50, 100000],
+                default: "other",
+                output: {
+                    count: {$sum: 1},
+                    matches: {$push: "$screenSize"}
+                }
+            }
+        }''')
+    }
+
+    def 'should render $bucketAuto'() {
+        expect:
+        toBson(bucketAuto('$price', 4)) == parse('''{
+            $bucketAuto: {
+              groupBy: "$price",
+              buckets: 4
+            }
+          }''')
+        toBson(bucketAuto('$price', 4, new BucketAutoOptions()
+                .output(sum('count', 1),
+                        avg('avgPrice', '$price')))) == parse('''{
+                                              $bucketAuto: {
+                                                groupBy: "$price",
+                                                buckets: 4,
+                                                output: {
+                                                  count: {$sum: 1},
+                                                  avgPrice: {$avg: "$price"},
+                                                }
+                                              }
+                                            }''')
+        toBson(bucketAuto('$price', 4, new BucketAutoOptions()
+                .granularity(R5)
+                .output(sum('count', 1),
+                        avg('avgPrice', '$price')))) == parse('''{
+                                              $bucketAuto: {
+                                                groupBy: "$price",
+                                                buckets: 4,
+                                                output: {
+                                                  count: {$sum: 1},
+                                                  avgPrice: {$avg: "$price"},
+                                                },
+                                                granularity: "R5"
+                                              }
+                                            }''')
+    }
+
+    def 'should render $count'() {
+        expect:
+        toBson(count()) == parse('{$count: "count"}')
+        toBson(count('count')) == parse('{$count: "count"}')
+        toBson(count('total')) == parse('{$count: "total"}')
+    }
 
     def 'should render $match'() {
         expect:
@@ -64,11 +170,31 @@ class AggregatesSpecification extends Specification {
         parse('{ $project : { title : 1 , author : 1, lastName : "$author.last" } }')
     }
 
+    def 'should render $replaceRoot'() {
+        expect:
+        toBson(replaceRoot('$a1')) == parse('{$replaceRoot: {newRoot: "$a1"}}')
+        toBson(replaceRoot('$a1.b')) == parse('{$replaceRoot: {newRoot: "$a1.b"}}')
+        toBson(replaceRoot('$a1')) == parse('{$replaceRoot: {newRoot: "$a1"}}')
+    }
+
+    def 'should render $replaceWith'() {
+        expect:
+        toBson(replaceWith('$a1')) == parse('{$replaceWith: "$a1"}')
+        toBson(replaceWith('$a1.b')) == parse('{$replaceWith: "$a1.b"}')
+        toBson(replaceWith('$a1')) == parse('{$replaceWith: "$a1"}')
+    }
+
     def 'should render $sort'() {
         expect:
         toBson(sort(ascending('title', 'author'))) == parse('{ $sort : { title : 1 , author : 1 } }')
     }
 
+    def 'should render $sortByCount'() {
+        expect:
+        toBson(sortByCount('someField')) == parse('{$sortByCount: "someField"}')
+        toBson(sortByCount(new Document('$floor', '$x'))) == parse('{$sortByCount: {$floor: "$x"}}')
+    }
+
     def 'should render $limit'() {
         expect:
         toBson(limit(5)) == parse('{ $limit : 5 }')
@@ -78,6 +204,86 @@ class AggregatesSpecification extends Specification {
         expect:
         toBson(lookup('from', 'localField', 'foreignField', 'as')) == parse('''{ $lookup : { from: "from", localField: "localField",
             foreignField: "foreignField", as: "as" } }''')
+
+        List<Bson> pipeline = asList(match(expr(new Document('$eq', asList('x', '1')))))
+        toBson(lookup('from', asList(new Variable('var1', 'expression1')), pipeline, 'as')) ==
+                parse('''{ $lookup : { from: "from",
+                                            let: { var1: "expression1" },
+                                            pipeline : [{ $match : { $expr: { $eq : [ "x" , "1" ]}}}],
+                                            as: "as" }}''')
+
+        // without variables
+        toBson(lookup('from', pipeline, 'as')) ==
+                parse('''{ $lookup : { from: "from",
+                                            pipeline : [{ $match : { $expr: { $eq : [ "x" , "1" ]}}}],
+                                            as: "as" }}''')
+    }
+
+    def 'should render $facet'() {
+        expect:
+        toBson(facet(
+                new Facet('Screen Sizes',
+                               unwind('$attributes'),
+                               match(eq('attributes.name', 'screen size')),
+                               group(null, sum('count', 1 ))),
+                new Facet('Manufacturer',
+                          match(eq('attributes.name', 'manufacturer')),
+                          group('$attributes.value', sum('count', 1)),
+                          sort(descending('count')),
+                          limit(5)))) ==
+        parse('''{$facet: {
+          "Screen Sizes": [
+             {$unwind: "$attributes"},
+             {$match: {"attributes.name": "screen size"}},
+             {$group: {
+                 _id: null,
+                 count: {$sum: 1}
+             }}
+           ],
+
+           "Manufacturer": [
+             {$match: {"attributes.name": "manufacturer"}},
+             {$group: {_id: "$attributes.value", count: {$sum: 1}}},
+             {$sort: {count: -1}}
+             {$limit: 5}
+           ]
+        }} ''')
+    }
+
+    def 'should render $graphLookup'() {
+        expect:
+        //without options
+        toBson(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork')) ==
+        parse('''{ $graphLookup: { from: "contacts", startWith: "$friends", connectFromField: "friends", connectToField: "name",
+            as: "socialNetwork" } }''')
+
+        //with maxDepth
+        toBson(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions().maxDepth(1))) ==
+        parse('''{ $graphLookup: { from: "contacts", startWith: "$friends", connectFromField: "friends", connectToField: "name",
+            as: "socialNetwork", maxDepth: 1 } }''')
+
+        // with depthField
+        toBson(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions().depthField('master'))) ==
+                parse('''{ $graphLookup: { from: "contacts", startWith: "$friends", connectFromField: "friends", connectToField: "name",
+            as: "socialNetwork", depthField: "master" } }''')
+
+        // with restrictSearchWithMatch
+        toBson(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .restrictSearchWithMatch(eq('hobbies', 'golf')))) ==
+                parse('''{ $graphLookup: { from: "contacts", startWith: "$friends", connectFromField: "friends", connectToField: "name",
+            as: "socialNetwork", restrictSearchWithMatch : { "hobbies" : "golf" } } }''')
+
+        // with maxDepth and depthField
+        toBson(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master'))) ==
+        parse('''{ $graphLookup: { from: "contacts", startWith: "$friends", connectFromField: "friends", connectToField: "name",
+            as: "socialNetwork", maxDepth: 1, depthField: "master" } }''')
+
+        // with all options
+        toBson(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master').restrictSearchWithMatch(eq('hobbies', 'golf')))) ==
+                parse('''{ $graphLookup: { from: "contacts", startWith: "$friends", connectFromField: "friends", connectToField: "name",
+            as: "socialNetwork", maxDepth: 1, depthField: "master", restrictSearchWithMatch : { "hobbies" : "golf" } } }''')
     }
 
     def 'should render $skip'() {
@@ -105,6 +311,50 @@ class AggregatesSpecification extends Specification {
         toBson(out('authors')) == parse('{ $out : "authors" }')
     }
 
+    def 'should render merge'() {
+        expect:
+        toBson(merge('authors')) == parse('{ $merge : {into: "authors" }}')
+        toBson(merge(new MongoNamespace('db1', 'authors'))) ==
+                parse('{ $merge : {into: {db: "db1", coll: "authors" }}}')
+
+        toBson(merge('authors',
+                new MergeOptions().uniqueIdentifier('ssn'))) ==
+                parse('{ $merge : {into: "authors", on: "ssn" }}')
+
+        toBson(merge('authors',
+                new MergeOptions().uniqueIdentifier(['ssn', 'otherId']))) ==
+                parse('{ $merge : {into: "authors", on: ["ssn", "otherId"] }}')
+
+        toBson(merge('authors',
+                new MergeOptions().whenMatched(MergeOptions.WhenMatched.REPLACE))) ==
+                parse('{ $merge : {into: "authors", whenMatched: "replace" }}')
+        toBson(merge('authors',
+                new MergeOptions().whenMatched(MergeOptions.WhenMatched.KEEP_EXISTING))) ==
+                parse('{ $merge : {into: "authors", whenMatched: "keepExisting" }}')
+        toBson(merge('authors',
+                new MergeOptions().whenMatched(MergeOptions.WhenMatched.MERGE))) ==
+                parse('{ $merge : {into: "authors", whenMatched: "merge" }}')
+        toBson(merge('authors',
+                new MergeOptions().whenMatched(MergeOptions.WhenMatched.FAIL))) ==
+                parse('{ $merge : {into: "authors", whenMatched: "fail" }}')
+
+        toBson(merge('authors',
+                new MergeOptions().whenNotMatched(MergeOptions.WhenNotMatched.INSERT))) ==
+                parse('{ $merge : {into: "authors", whenNotMatched: "insert" }}')
+        toBson(merge('authors',
+                new MergeOptions().whenNotMatched(MergeOptions.WhenNotMatched.DISCARD))) ==
+                parse('{ $merge : {into: "authors", whenNotMatched: "discard" }}')
+        toBson(merge('authors',
+                new MergeOptions().whenNotMatched(MergeOptions.WhenNotMatched.FAIL))) ==
+                parse('{ $merge : {into: "authors", whenNotMatched: "fail" }}')
+
+        toBson(merge('authors',
+                new MergeOptions().whenMatched(MergeOptions.WhenMatched.PIPELINE)
+                .variables([new Variable<Integer>('y', 2), new Variable<Integer>('z', 3)])
+                .whenMatchedPipeline([addFields([new Field('x', 1)])]))) ==
+                parse('{ $merge : {into: "authors", let: {y: 2, z: 3}, whenMatched: [{$addFields: {x: 1}}]}}')
+    }
+
     def 'should render $group'() {
         expect:
         toBson(group('$customerId')) == parse('{ $group : { _id : "$customerId" } }')
@@ -145,7 +395,7 @@ class AggregatesSpecification extends Specification {
 
     def 'should create string representation for simple stages'() {
         expect:
-        match(new BsonDocument('x', new BsonInt32(1))).toString() == 'Stage{name=\'$match\', value={ "x" : 1 }}'
+        match(new BsonDocument('x', new BsonInt32(1))).toString() == 'Stage{name=\'$match\', value={"x": 1}}'
     }
 
     def 'should create string representation for group stage'() {
@@ -153,11 +403,11 @@ class AggregatesSpecification extends Specification {
         group('_id', avg('avg', '$quantity')).toString() ==
                 'Stage{name=\'$group\', id=_id, ' +
                 'fieldAccumulators=[' +
-                'Field{name=\'avg\', value=Expression{name=\'$avg\', expression=$quantity}}]}'
+                'BsonField{name=\'avg\', value=Expression{name=\'$avg\', expression=$quantity}}]}'
         group(null, avg('avg', '$quantity')).toString() ==
                 'Stage{name=\'$group\', id=null, ' +
                 'fieldAccumulators=[' +
-                'Field{name=\'avg\', value=Expression{name=\'$avg\', expression=$quantity}}]}'
+                'BsonField{name=\'avg\', value=Expression{name=\'$avg\', expression=$quantity}}]}'
     }
 
     def 'should render $sample'() {
@@ -165,7 +415,324 @@ class AggregatesSpecification extends Specification {
         toBson(sample(5)) == parse('{ $sample : { size: 5} }')
     }
 
-    def toBson(Bson bson) {
-        bson.toBsonDocument(BsonDocument, registry)
+    def 'should test equals for SimplePipelineStage'() {
+        expect:
+        match(eq('author', 'dave')).equals(match(eq('author', 'dave')))
+        project(fields(include('title', 'author'), computed('lastName', '$author.last')))
+                .equals(project(fields(include('title', 'author'), computed('lastName', '$author.last'))))
+        sort(ascending('title', 'author')).equals(sort(ascending('title', 'author')))
+        !sort(ascending('title', 'author')).equals(sort(descending('title', 'author')))
+    }
+
+    def 'should test hashCode for SimplePipelineStage'() {
+        expect:
+        match(eq('author', 'dave')).hashCode() == match(eq('author', 'dave')).hashCode()
+        project(fields(include('title', 'author'), computed('lastName', '$author.last'))).hashCode() ==
+                project(fields(include('title', 'author'), computed('lastName', '$author.last'))).hashCode()
+        sort(ascending('title', 'author')).hashCode() == sort(ascending('title', 'author')).hashCode()
+        sort(ascending('title', 'author')).hashCode() != sort(descending('title', 'author')).hashCode()
+    }
+
+    def 'should test equals for BucketStage'() {
+        expect:
+        bucket('$screenSize', [0, 24, 32, 50, 100000]).equals(bucket('$screenSize', [0, 24, 32, 50, 100000]))
+    }
+
+    def 'should test hashCode for BucketStage'() {
+        expect:
+        bucket('$screenSize', [0, 24, 32, 50, 100000]).hashCode() == bucket('$screenSize', [0, 24, 32, 50, 100000]).hashCode()
+        bucket('$screenSize', [0, 24, 32, 50, 100000]).hashCode() != bucket('$screenSize', [0, 24, 32, 50, 10000]).hashCode()
+    }
+
+    def 'should test equals for BucketAutoStage'() {
+        expect:
+        bucketAuto('$price', 4).equals(bucketAuto('$price', 4))
+        bucketAuto('$price', 4, new BucketAutoOptions()
+                .output(sum('count', 1),
+                        avg('avgPrice', '$price')))
+                .equals(bucketAuto('$price', 4, new BucketAutoOptions()
+                .output(sum('count', 1),
+                avg('avgPrice', '$price'))))
+        bucketAuto('$price', 4, new BucketAutoOptions()
+                .granularity(R5)
+                .output(sum('count', 1),
+                avg('avgPrice', '$price')))
+                .equals(bucketAuto('$price', 4, new BucketAutoOptions()
+                .granularity(R5)
+                .output(sum('count', 1),
+                avg('avgPrice', '$price'))))
+    }
+
+    def 'should test hashCode for BucketAutoStage'() {
+        expect:
+        bucketAuto('$price', 4).hashCode() == bucketAuto('$price', 4).hashCode()
+        bucketAuto('$price', 4, new BucketAutoOptions()
+                .output(sum('count', 1),
+                avg('avgPrice', '$price'))).hashCode() ==
+                bucketAuto('$price', 4, new BucketAutoOptions()
+                .output(sum('count', 1),
+                avg('avgPrice', '$price'))).hashCode()
+        bucketAuto('$price', 4, new BucketAutoOptions()
+                .granularity(R5)
+                .output(sum('count', 1),
+                avg('avgPrice', '$price'))).hashCode() ==
+                bucketAuto('$price', 4, new BucketAutoOptions()
+                .granularity(R5)
+                .output(sum('count', 1),
+                avg('avgPrice', '$price'))).hashCode()
+    }
+
+    def 'should test equals for LookupStage'() {
+        expect:
+        lookup('from', 'localField', 'foreignField', 'as')
+                .equals(lookup('from', 'localField', 'foreignField', 'as'))
+
+        List<Bson> pipeline = asList(match(expr(new Document('$eq', asList('x', '1')))))
+        lookup('from', asList(new Variable('var1', 'expression1')), pipeline, 'as')
+                .equals(lookup('from', asList(new Variable('var1', 'expression1')), pipeline, 'as'))
+
+        lookup('from', pipeline, 'as').equals(lookup('from', pipeline, 'as'))
+    }
+
+    def 'should test hashCode for LookupStage'() {
+        expect:
+        lookup('from', 'localField', 'foreignField', 'as').hashCode() ==
+                lookup('from', 'localField', 'foreignField', 'as').hashCode()
+
+        List<Bson> pipeline = asList(match(expr(new Document('$eq', asList('x', '1')))))
+        lookup('from', asList(new Variable('var1', 'expression1')), pipeline, 'as').hashCode() ==
+                lookup('from', asList(new Variable('var1', 'expression1')), pipeline, 'as').hashCode()
+
+        lookup('from', pipeline, 'as').hashCode() == lookup('from', pipeline, 'as').hashCode()
+    }
+
+    def 'should test equals for GraphLookupStage'() {
+        expect:
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork')
+                .equals(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork'))
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions().maxDepth(1))
+                .equals(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork',
+                new GraphLookupOptions().maxDepth(1)))
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions().depthField('master'))
+                .equals(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork',
+                new GraphLookupOptions().depthField('master')))
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .restrictSearchWithMatch(eq('hobbies', 'golf')))
+                .equals(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .restrictSearchWithMatch(eq('hobbies', 'golf'))))
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master'))
+                .equals(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master')))
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master').restrictSearchWithMatch(eq('hobbies', 'golf')))
+                .equals(graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master').restrictSearchWithMatch(eq('hobbies', 'golf'))))
+    }
+
+    def 'should test hashCode for GraphLookupStage'() {
+        expect:
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork').hashCode() ==
+                graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork').hashCode()
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions().maxDepth(1))
+                .hashCode() ==
+                graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork',
+                new GraphLookupOptions().maxDepth(1)).hashCode()
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions().depthField('master'))
+                .hashCode() ==
+                graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork',
+                new GraphLookupOptions().depthField('master')).hashCode()
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .restrictSearchWithMatch(eq('hobbies', 'golf'))).hashCode() ==
+                graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .restrictSearchWithMatch(eq('hobbies', 'golf'))).hashCode()
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master')).hashCode() ==
+                graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master')).hashCode()
+
+        graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master').restrictSearchWithMatch(eq('hobbies', 'golf'))).hashCode() ==
+                graphLookup('contacts', '$friends', 'friends', 'name', 'socialNetwork', new GraphLookupOptions()
+                .maxDepth(1).depthField('master').restrictSearchWithMatch(eq('hobbies', 'golf'))).hashCode()
+    }
+
+    def 'should test equals for GroupStage'() {
+        expect:
+        group('$customerId').equals(group('$customerId'))
+        group(null).equals(group(null))
+
+        group(parse('{ month: { $month: "$date" }, day: { $dayOfMonth: "$date" }, year: { $year: "$date" } }'))
+                .equals(group(parse('{ month: { $month: "$date" }, day: { $dayOfMonth: "$date" }, year: { $year: "$date" } }')))
+
+        group(null,
+                sum('sum', parse('{ $multiply: [ "$price", "$quantity" ] }')),
+                avg('avg', '$quantity'),
+                min('min', '$quantity'),
+                max('max', '$quantity'),
+                first('first', '$quantity'),
+                last('last', '$quantity'),
+                push('all', '$quantity'),
+                addToSet('unique', '$quantity'),
+                stdDevPop('stdDevPop', '$quantity'),
+                stdDevSamp('stdDevSamp', '$quantity')
+        ).equals(group(null,
+                sum('sum', parse('{ $multiply: [ "$price", "$quantity" ] }')),
+                avg('avg', '$quantity'),
+                min('min', '$quantity'),
+                max('max', '$quantity'),
+                first('first', '$quantity'),
+                last('last', '$quantity'),
+                push('all', '$quantity'),
+                addToSet('unique', '$quantity'),
+                stdDevPop('stdDevPop', '$quantity'),
+                stdDevSamp('stdDevSamp', '$quantity')
+        ))
+    }
+
+    def 'should test hashCode for GroupStage'() {
+        expect:
+        group('$customerId').hashCode() == group('$customerId').hashCode()
+        group(null).hashCode() == group(null).hashCode()
+
+        group(parse('{ month: { $month: "$date" }, day: { $dayOfMonth: "$date" }, year: { $year: "$date" } }')).hashCode() ==
+                group(parse('{ month: { $month: "$date" }, day: { $dayOfMonth: "$date" }, year: { $year: "$date" } }')).hashCode()
+
+        group(null,
+                sum('sum', parse('{ $multiply: [ "$price", "$quantity" ] }')),
+                avg('avg', '$quantity'),
+                min('min', '$quantity'),
+                max('max', '$quantity'),
+                first('first', '$quantity'),
+                last('last', '$quantity'),
+                push('all', '$quantity'),
+                addToSet('unique', '$quantity'),
+                stdDevPop('stdDevPop', '$quantity'),
+                stdDevSamp('stdDevSamp', '$quantity')
+        ).hashCode() ==
+                group(null,
+                sum('sum', parse('{ $multiply: [ "$price", "$quantity" ] }')),
+                avg('avg', '$quantity'),
+                min('min', '$quantity'),
+                max('max', '$quantity'),
+                first('first', '$quantity'),
+                last('last', '$quantity'),
+                push('all', '$quantity'),
+                addToSet('unique', '$quantity'),
+                stdDevPop('stdDevPop', '$quantity'),
+                stdDevSamp('stdDevSamp', '$quantity')).hashCode()
+    }
+
+    def 'should test equals for SortByCountStage'() {
+        expect:
+        sortByCount('someField').equals(sortByCount('someField'))
+        sortByCount(new Document('$floor', '$x')).equals(sortByCount(new Document('$floor', '$x')))
+    }
+
+    def 'should test hashCode for SortByCountStage'() {
+        expect:
+        sortByCount('someField').hashCode() == sortByCount('someField').hashCode()
+        sortByCount(new Document('$floor', '$x')).hashCode() == sortByCount(new Document('$floor', '$x')).hashCode()
+    }
+
+    def 'should test equals for FacetStage'() {
+        expect:
+        facet(
+                new Facet('Screen Sizes',
+                        unwind('$attributes'),
+                        match(eq('attributes.name', 'screen size')),
+                        group(null, sum('count', 1 ))),
+                new Facet('Manufacturer',
+                        match(eq('attributes.name', 'manufacturer')),
+                        group('$attributes.value', sum('count', 1)),
+                        sort(descending('count')),
+                        limit(5)))
+                .equals(facet(
+                new Facet('Screen Sizes',
+                        unwind('$attributes'),
+                        match(eq('attributes.name', 'screen size')),
+                        group(null, sum('count', 1 ))),
+                new Facet('Manufacturer',
+                        match(eq('attributes.name', 'manufacturer')),
+                        group('$attributes.value', sum('count', 1)),
+                        sort(descending('count')),
+                        limit(5))))
+    }
+
+    def 'should test hashCode for FacetStage'() {
+        expect:
+        facet(
+                new Facet('Screen Sizes',
+                        unwind('$attributes'),
+                        match(eq('attributes.name', 'screen size')),
+                        group(null, sum('count', 1 ))),
+                new Facet('Manufacturer',
+                        match(eq('attributes.name', 'manufacturer')),
+                        group('$attributes.value', sum('count', 1)),
+                        sort(descending('count')),
+                        limit(5))).hashCode() ==
+                facet(
+                new Facet('Screen Sizes',
+                        unwind('$attributes'),
+                        match(eq('attributes.name', 'screen size')),
+                        group(null, sum('count', 1 ))),
+                new Facet('Manufacturer',
+                        match(eq('attributes.name', 'manufacturer')),
+                        group('$attributes.value', sum('count', 1)),
+                        sort(descending('count')),
+                        limit(5))).hashCode()
+    }
+
+    def 'should test equals for AddFieldsStage'() {
+        expect:
+        addFields(new Field('newField', null)).equals(addFields(new Field('newField', null)))
+        addFields(new Field('newField', 'hello')).equals(addFields(new Field('newField', 'hello')))
+        addFields(new Field('this', '$$CURRENT')).equals(addFields(new Field('this', '$$CURRENT')))
+        addFields(new Field('myNewField', new Document('c', 3).append('d', 4)))
+                .equals(addFields(new Field('myNewField', new Document('c', 3).append('d', 4))))
+        addFields(new Field('alt3', new Document('$lt', asList('$a', 3))))
+                .equals(addFields(new Field('alt3', new Document('$lt', asList('$a', 3)))))
+        addFields(new Field('b', 3), new Field('c', 5))
+                .equals(addFields(new Field('b', 3), new Field('c', 5)))
+        addFields(asList(new Field('b', 3), new Field('c', 5)))
+                .equals(addFields(asList(new Field('b', 3), new Field('c', 5))))
+    }
+
+    def 'should test hashCode for AddFieldsStage'() {
+        expect:
+        addFields(new Field('newField', null)).hashCode() == addFields(new Field('newField', null)).hashCode()
+        addFields(new Field('newField', 'hello')).hashCode() == addFields(new Field('newField', 'hello')).hashCode()
+        addFields(new Field('this', '$$CURRENT')).hashCode() == addFields(new Field('this', '$$CURRENT')).hashCode()
+        addFields(new Field('myNewField', new Document('c', 3).append('d', 4))).hashCode() ==
+                addFields(new Field('myNewField', new Document('c', 3).append('d', 4))).hashCode()
+        addFields(new Field('alt3', new Document('$lt', asList('$a', 3)))).hashCode() ==
+                addFields(new Field('alt3', new Document('$lt', asList('$a', 3)))).hashCode()
+        addFields(new Field('b', 3), new Field('c', 5)).hashCode() ==
+                addFields(new Field('b', 3), new Field('c', 5)).hashCode()
+        addFields(asList(new Field('b', 3), new Field('c', 5))).hashCode() ==
+                addFields(asList(new Field('b', 3), new Field('c', 5))).hashCode()
+    }
+
+    def 'should test equals for ReplaceRootStage'() {
+        expect:
+        replaceRoot('$a1').equals(replaceRoot('$a1'))
+        replaceRoot('$a1.b').equals(replaceRoot('$a1.b'))
+        replaceRoot('$a1').equals(replaceRoot('$a1'))
+    }
+
+    def 'should test hashCode for ReplaceRootStage'() {
+        expect:
+        replaceRoot('$a1').hashCode() == replaceRoot('$a1').hashCode()
+        replaceRoot('$a1.b').hashCode() == replaceRoot('$a1.b').hashCode()
+        replaceRoot('$a1').hashCode() == replaceRoot('$a1').hashCode()
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/BsonHelper.java b/driver-core/src/test/unit/com/mongodb/client/model/BsonHelper.java
new file mode 100644
index 00000000000..402b12f4a28
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/BsonHelper.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWriter;
+import org.bson.codecs.Codec;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import static com.mongodb.MongoClientSettings.getDefaultCodecRegistry;
+
+final class BsonHelper {
+    private static final CodecRegistry CODEC_REGISTRY = getDefaultCodecRegistry();
+
+    @SuppressWarnings("unchecked")
+    static BsonDocument toBson(final Bson bson) {
+        BsonDocumentWriter writer = new BsonDocumentWriter(new BsonDocument());
+        ((Codec<Bson>) CODEC_REGISTRY.get(bson.getClass())).encode(writer, bson, EncoderContext.builder().build());
+        return writer.getDocument();
+    }
+
+    private BsonHelper() {
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/BucketAutoOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/BucketAutoOptionsSpecification.groovy
new file mode 100644
index 00000000000..08b5f69ee07
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/BucketAutoOptionsSpecification.groovy
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+import static com.mongodb.client.model.Accumulators.sum
+
+class BucketAutoOptionsSpecification extends Specification {
+    def 'defaults should be null'() {
+        when:
+        def options = new BucketAutoOptions()
+
+        then:
+        options.granularity == null
+        options.output == null
+    }
+
+    def "should return new options with the same property values"() {
+        when:
+        def options = new BucketAutoOptions()
+            .granularity(BucketGranularity.E96)
+                .output(sum('count', 1))
+
+        then:
+        def sum = sum('count', 1)
+        options.granularity == BucketGranularity.E96
+        options.output.size() == 1
+        options.output[0].name == sum.name
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/BucketGranularitySpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/BucketGranularitySpecification.groovy
new file mode 100644
index 00000000000..a9f8f4bbade
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/BucketGranularitySpecification.groovy
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+class BucketGranularitySpecification extends Specification {
+    def 'should return the expected string value'() {
+        expect:
+        granularity.getValue() == expectedString
+
+        where:
+        granularity                  | expectedString
+        BucketGranularity.R5         | 'R5'
+        BucketGranularity.R10        | 'R10'
+        BucketGranularity.R20        | 'R20'
+        BucketGranularity.R40        | 'R40'
+        BucketGranularity.R80        | 'R80'
+        BucketGranularity.SERIES_125 | '1-2-5'
+        BucketGranularity.E6         | 'E6'
+        BucketGranularity.E12        | 'E12'
+        BucketGranularity.E24        | 'E24'
+        BucketGranularity.E48        | 'E48'
+        BucketGranularity.E96        | 'E96'
+        BucketGranularity.E192       | 'E192'
+        BucketGranularity.POWERSOF2  | 'POWERSOF2'
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/BucketOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/BucketOptionsSpecification.groovy
new file mode 100644
index 00000000000..49d500d5135
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/BucketOptionsSpecification.groovy
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+import static com.mongodb.client.model.Accumulators.sum
+
+class BucketOptionsSpecification extends Specification {
+    def 'defaults should be null'() {
+        when:
+        def options = new BucketOptions()
+
+        then:
+        options.defaultBucket == null
+        options.output == null
+    }
+
+    def "should return new options with the same property values"() {
+        when:
+        def options = new BucketOptions()
+                .defaultBucket('other')
+                .output(sum('count', 1))
+
+        then:
+        def sum = sum('count', 1)
+        options.defaultBucket == 'other'
+        options.output.size() == 1
+        options.output[0].name == sum.name
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/BulkWriteOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/BulkWriteOptionsSpecification.groovy
index 86f3cf9a77b..bb74c67e51b 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/BulkWriteOptionsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/BulkWriteOptionsSpecification.groovy
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.mongodb.client.model
 
 import spock.lang.Specification
@@ -16,4 +32,4 @@ class BulkWriteOptionsSpecification extends Specification {
         where:
         ordered << [true, false]
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/CollationAlternateSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/CollationAlternateSpecification.groovy
new file mode 100644
index 00000000000..a57a7003104
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/CollationAlternateSpecification.groovy
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+class CollationAlternateSpecification extends Specification {
+
+    def 'should return the expected string value'() {
+        expect:
+        collationAlternate.getValue() == expectedString
+
+        where:
+        collationAlternate                  | expectedString
+        CollationAlternate.SHIFTED          | 'shifted'
+        CollationAlternate.NON_IGNORABLE    | 'non-ignorable'
+    }
+
+    def 'should support valid string representations'() {
+        expect:
+        CollationAlternate.fromString(stringValue) == collationAlternate
+
+        where:
+        collationAlternate                  | stringValue
+        CollationAlternate.SHIFTED          | 'shifted'
+        CollationAlternate.NON_IGNORABLE    | 'non-ignorable'
+    }
+
+    def 'should throw an illegal Argument exception for invalid values'() {
+        when:
+        CollationAlternate.fromString(stringValue)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        stringValue << [null, 'info']
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/CollationCaseFirstSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/CollationCaseFirstSpecification.groovy
new file mode 100644
index 00000000000..126bf5d52a8
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/CollationCaseFirstSpecification.groovy
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+class CollationCaseFirstSpecification extends Specification {
+
+    def 'should return the expected string value'() {
+        expect:
+        collationCaseFirst.getValue() == expectedString
+
+        where:
+        collationCaseFirst         | expectedString
+        CollationCaseFirst.LOWER   | 'lower'
+        CollationCaseFirst.OFF     | 'off'
+        CollationCaseFirst.UPPER   | 'upper'
+    }
+
+    def 'should support valid string representations'() {
+        expect:
+        CollationCaseFirst.fromString(stringValue) == collationCaseFirst
+
+        where:
+        collationCaseFirst         | stringValue
+        CollationCaseFirst.LOWER   | 'lower'
+        CollationCaseFirst.OFF     | 'off'
+        CollationCaseFirst.UPPER   | 'upper'
+    }
+
+    def 'should throw an illegal Argument exception for invalid values'() {
+        when:
+        CollationCaseFirst.fromString(stringValue)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        stringValue << [null, 'info']
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/CollationMaxVariableSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/CollationMaxVariableSpecification.groovy
new file mode 100644
index 00000000000..fa3624b8e5f
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/CollationMaxVariableSpecification.groovy
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+class CollationMaxVariableSpecification extends Specification {
+
+    def 'should return the expected string value'() {
+        expect:
+        collationMaxVariable.getValue() == expectedString
+
+        where:
+        collationMaxVariable          | expectedString
+        CollationMaxVariable.PUNCT    | 'punct'
+        CollationMaxVariable.SPACE    | 'space'
+    }
+
+    def 'should support valid string representations'() {
+        expect:
+        CollationMaxVariable.fromString(stringValue) == collationMaxVariable
+
+        where:
+        collationMaxVariable          | stringValue
+        CollationMaxVariable.PUNCT    | 'punct'
+        CollationMaxVariable.SPACE    | 'space'
+    }
+
+    def 'should throw an illegal Argument exception for invalid values'() {
+        when:
+        CollationMaxVariable.fromString(stringValue)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        stringValue << [null, 'info']
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/CollationSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/CollationSpecification.groovy
new file mode 100644
index 00000000000..aa8758a70d0
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/CollationSpecification.groovy
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import org.bson.BsonDocument
+import spock.lang.Specification
+
+class CollationSpecification extends Specification {
+
+    def 'should have null values as default'() {
+        when:
+        def options = Collation.builder().build()
+
+        then:
+        options.getAlternate() == null
+        options.getBackwards() == null
+        options.getCaseFirst() == null
+        options.getCaseLevel() == null
+        options.getLocale() == null
+        options.getMaxVariable() == null
+        options.getNormalization() == null
+        options.getNumericOrdering() == null
+        options.getStrength() == null
+    }
+
+    def 'should have the set values as passed to the builder'() {
+        when:
+        def options = Collation.builder()
+                .locale('en')
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .backwards(true)
+                .normalization(true)
+                .build()
+
+        then:
+        options.getAlternate() == CollationAlternate.SHIFTED
+        options.getBackwards() == true
+        options.getCaseFirst() == CollationCaseFirst.OFF
+        options.getCaseLevel() == true
+        options.getLocale() == 'en'
+        options.getMaxVariable() == CollationMaxVariable.SPACE
+        options.getNormalization() == true
+        options.getNumericOrdering() == true
+        options.getStrength() == CollationStrength.IDENTICAL
+    }
+
+    def 'should create the expected BsonDocument'() {
+        expect:
+        collation.asDocument() == BsonDocument.parse(json)
+
+        where:
+        collation                                | json
+        Collation.builder().build()              | '{}'
+        Collation.builder().locale('en').build() | '{locale: "en"}'
+        Collation.builder()
+                .locale('en')
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .normalization(true)
+                .backwards(true)
+                .build()                         | '''{locale: "en", caseLevel: true, caseFirst: "off", strength: 5,
+                                                       numericOrdering: true, alternate: "shifted",
+                                                       maxVariable: "space", normalization: true, backwards: true}'''
+    }
+
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/CollationStrengthSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/CollationStrengthSpecification.groovy
new file mode 100644
index 00000000000..d502bf0d45a
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/CollationStrengthSpecification.groovy
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+class CollationStrengthSpecification extends Specification {
+
+    def 'should return the expected string value'() {
+        expect:
+        collationStrength.getIntRepresentation() == expectedInt
+
+        where:
+        collationStrength                  | expectedInt
+        CollationStrength.PRIMARY          | 1
+        CollationStrength.SECONDARY        | 2
+        CollationStrength.TERTIARY         | 3
+        CollationStrength.QUATERNARY       | 4
+        CollationStrength.IDENTICAL        | 5
+    }
+
+    def 'should support valid string representations'() {
+        expect:
+        CollationStrength.fromInt(intValue) == collationStrength
+
+        where:
+        collationStrength                  | intValue
+        CollationStrength.PRIMARY          | 1
+        CollationStrength.SECONDARY        | 2
+        CollationStrength.TERTIARY         | 3
+        CollationStrength.QUATERNARY       | 4
+        CollationStrength.IDENTICAL        | 5
+    }
+
+    def 'should throw an illegal Argument exception for invalid values'() {
+        when:
+        CollationStrength.fromInt(intValue)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        intValue << [0, 6]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/CountOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/CountOptionsSpecification.groovy
new file mode 100644
index 00000000000..55b3ecb0a09
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/CountOptionsSpecification.groovy
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import org.bson.BsonDocument
+import org.bson.Document
+import spock.lang.Specification
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class CountOptionsSpecification extends Specification {
+
+    def 'should have the expected defaults'() {
+        when:
+        def options = new CountOptions()
+
+        then:
+        options.getCollation() == null
+        options.getHint() == null
+        options.getHintString() == null
+        options.getLimit() == 0
+        options.getMaxTime(MILLISECONDS) == 0
+        options.getSkip() == 0
+    }
+
+    def 'should set collation'() {
+        expect:
+        new CountOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+
+    def 'should set hint'() {
+        expect:
+        new CountOptions().hint(hint).getHint() == hint
+
+        where:
+        hint << [null, new BsonDocument(), new Document('a', 1)]
+    }
+
+    def 'should set hintString'() {
+        expect:
+        new CountOptions().hintString(hintString).getHintString() == hintString
+
+        where:
+        hintString << [null, 'a_1']
+    }
+
+    def 'should set limit'() {
+        expect:
+        new CountOptions().limit(limit).getLimit() == limit
+
+        where:
+        limit << [-1, 0, 1]
+    }
+
+    def 'should set skip'() {
+        expect:
+        new CountOptions().skip(skip).getSkip() == skip
+
+        where:
+        skip << [-1, 0, 1]
+    }
+
+    def 'should convert maxTime'() {
+        when:
+        def options = new CountOptions()
+
+        then:
+        options.getMaxTime(SECONDS) == 0
+
+        when:
+        options.maxTime(100, MILLISECONDS)
+
+        then:
+        options.getMaxTime(MILLISECONDS) == 100
+
+        when:
+        options.maxTime(1004, MILLISECONDS)
+
+        then:
+        options.getMaxTime(SECONDS) == 1
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/CreateCollectionOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/CreateCollectionOptionsSpecification.groovy
new file mode 100644
index 00000000000..29c69120cf4
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/CreateCollectionOptionsSpecification.groovy
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import org.bson.BsonDocument
+import spock.lang.Specification
+
+class CreateCollectionOptionsSpecification extends Specification {
+
+    def 'should have the expected defaults'() {
+        when:
+        def options = new CreateCollectionOptions()
+
+        then:
+        options.getCollation() == null
+        options.getIndexOptionDefaults().getStorageEngine() == null
+        options.getMaxDocuments() == 0
+        options.getSizeInBytes() == 0
+        options.getStorageEngineOptions() == null
+        options.getValidationOptions().getValidator() == null
+        options.isAutoIndex()
+        !options.isCapped()
+        !options.isUsePowerOf2Sizes()
+   }
+
+    def 'should set collation'() {
+        expect:
+        new CreateCollectionOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+
+    def 'should set indexOptionDefaults'() {
+        expect:
+        new CreateCollectionOptions().indexOptionDefaults(indexOptionDefaults).getIndexOptionDefaults() == indexOptionDefaults
+
+        where:
+        indexOptionDefaults << [new IndexOptionDefaults().storageEngine(BsonDocument.parse('{ storageEngine: { mmapv1 : {} }}'))]
+    }
+
+    def 'should set maxDocuments'() {
+        expect:
+        new CreateCollectionOptions().maxDocuments(maxDocuments).getMaxDocuments() == maxDocuments
+
+        where:
+        maxDocuments << [-1, 0, 1]
+    }
+
+    def 'should set sizeInBytes'() {
+        expect:
+        new CreateCollectionOptions().sizeInBytes(sizeInBytes).getSizeInBytes() == sizeInBytes
+
+        where:
+        sizeInBytes << [-1, 0, 1]
+    }
+
+    def 'should set storageEngineOptions'() {
+        expect:
+        new CreateCollectionOptions().storageEngineOptions(storageEngineOptions).getStorageEngineOptions() == storageEngineOptions
+
+        where:
+        storageEngineOptions << [null, BsonDocument.parse('{ mmapv1 : {} }')]
+    }
+
+    def 'should set validationOptions'() {
+        expect:
+        new CreateCollectionOptions().validationOptions(validationOptions).getValidationOptions() == validationOptions
+
+        where:
+        validationOptions << [new ValidationOptions(), new ValidationOptions().validationAction(ValidationAction.ERROR)]
+    }
+
+    def 'should set autoIndex'() {
+        expect:
+        new CreateCollectionOptions().autoIndex(autoIndex).isAutoIndex() == autoIndex
+
+        where:
+        autoIndex << [true, false]
+    }
+
+    def 'should set capped'() {
+        expect:
+        new CreateCollectionOptions().capped(capped).isCapped() == capped
+
+        where:
+        capped << [true, false]
+    }
+
+    def 'should set usePowerOf2Sizes'() {
+        expect:
+        new CreateCollectionOptions().usePowerOf2Sizes(usePowerOf2Sizes).isUsePowerOf2Sizes() == usePowerOf2Sizes
+
+        where:
+        usePowerOf2Sizes << [true, false]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/DeleteOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/DeleteOptionsSpecification.groovy
new file mode 100644
index 00000000000..8b066b61827
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/DeleteOptionsSpecification.groovy
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import spock.lang.Specification;
+
+class DeleteOptionsSpecification extends Specification {
+
+    def 'should have the expected defaults'() {
+        when:
+        def options = new DeleteOptions()
+
+        then:
+        options.getCollation() == null
+    }
+
+    def 'should set collation'() {
+        expect:
+        new DeleteOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/FiltersSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/FiltersSpecification.groovy
index c945cca0ec8..61b233b3130 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/FiltersSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/FiltersSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,7 +9,7 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
@@ -19,18 +19,13 @@ package com.mongodb.client.model
 import com.mongodb.client.model.geojson.Point
 import com.mongodb.client.model.geojson.Polygon
 import com.mongodb.client.model.geojson.Position
-import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider
 import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
+import org.bson.BsonString
 import org.bson.BsonType
 import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.IterableCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.conversions.Bson
 import spock.lang.Specification
 
 import java.util.regex.Pattern
@@ -38,6 +33,7 @@ import java.util.regex.Pattern
 import static Filters.and
 import static Filters.exists
 import static Filters.or
+import static com.mongodb.client.model.BsonHelper.toBson
 import static com.mongodb.client.model.Filters.all
 import static com.mongodb.client.model.Filters.bitsAllClear
 import static com.mongodb.client.model.Filters.bitsAllSet
@@ -45,6 +41,7 @@ import static com.mongodb.client.model.Filters.bitsAnyClear
 import static com.mongodb.client.model.Filters.bitsAnySet
 import static com.mongodb.client.model.Filters.elemMatch
 import static com.mongodb.client.model.Filters.eq
+import static com.mongodb.client.model.Filters.expr
 import static com.mongodb.client.model.Filters.geoIntersects
 import static com.mongodb.client.model.Filters.geoWithin
 import static com.mongodb.client.model.Filters.geoWithinBox
@@ -53,6 +50,7 @@ import static com.mongodb.client.model.Filters.geoWithinCenterSphere
 import static com.mongodb.client.model.Filters.geoWithinPolygon
 import static com.mongodb.client.model.Filters.gt
 import static com.mongodb.client.model.Filters.gte
+import static com.mongodb.client.model.Filters.jsonSchema
 import static com.mongodb.client.model.Filters.lt
 import static com.mongodb.client.model.Filters.lte
 import static com.mongodb.client.model.Filters.mod
@@ -67,19 +65,15 @@ import static com.mongodb.client.model.Filters.size
 import static com.mongodb.client.model.Filters.text
 import static com.mongodb.client.model.Filters.type
 import static com.mongodb.client.model.Filters.where
-import static java.util.Arrays.asList
 import static org.bson.BsonDocument.parse
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class FiltersSpecification extends Specification {
-    def registry = fromProviders([new BsonValueCodecProvider(), new ValueCodecProvider(), new GeoJsonCodecProvider(),
-                                  new DocumentCodecProvider(),
-                                  new IterableCodecProvider()])
 
     def 'eq should render without $eq'() {
         expect:
         toBson(eq('x', 1)) == parse('{x : 1}')
         toBson(eq('x', null)) == parse('{x : null}')
+        toBson(eq(1)) == parse('{_id : 1}')
     }
 
     def 'should render $ne'() {
@@ -102,7 +96,11 @@ class FiltersSpecification extends Specification {
         toBson(not(or(eq('x', 1), eq('x', 2)))) == parse('{$not: {$or: [{x: 1}, {x: 2}]}}')
         toBson(not(or(Filters.in('x', 1, 2), eq('x', 3)))) == parse('{$not: {$or: [{x: {$in: [1, 2]}}, {x: 3}]}}')
 
-        toBson(not(new BsonDocument('$in', new BsonArray(asList(new BsonInt32(1)))))) == parse('{$not: {$in: [1]}}')
+        toBson(not(parse('{$in: [1]}'))) == parse('{$not: {$in: [1]}}')
+
+        toBson(not(eq('x', parse('{a: 1, b: 1}')))) == parse('{x: {$not: {$eq: {"a": 1, "b": 1}}}}')
+        toBson(not(eq('x', parse('{$ref: "1", $id: "1"}')))) == parse('{x: {$not: {$eq: {"$ref": "1", "$id": "1"}}}}')
+        toBson(not(eq('x', parse('{$ref: "1", $id: "1", $db: "db"}')))) == parse('{x: {$not: {$eq: {"$ref": "1", "$id": "1", $db: "db"}}}}')
     }
 
     def 'should render $nor'() {
@@ -264,9 +262,9 @@ class FiltersSpecification extends Specification {
 
     def 'should render $regex'() {
         expect:
-        toBson(regex('name', 'acme.*corp')) == parse('{name : {$regex : "acme.*corp"}}')
+        toBson(regex('name', 'acme.*corp')) == parse('{name : {$regex : "acme.*corp", $options : ""}}')
         toBson(regex('name', 'acme.*corp', 'si')) == parse('{name : {$regex : "acme.*corp", $options : "si"}}')
-        toBson(regex('name', Pattern.compile('acme.*corp'))) == parse('{name : {$regex : "acme.*corp"}}')
+        toBson(regex('name', Pattern.compile('acme.*corp'))) == parse('{name : {$regex : "acme.*corp", $options : ""}}')
     }
 
     def 'should render $where'() {
@@ -274,6 +272,12 @@ class FiltersSpecification extends Specification {
         toBson(where('this.credits == this.debits')) == parse('{$where: "this.credits == this.debits"}')
     }
 
+    def 'should render $expr'() {
+        expect:
+        toBson(expr(new BsonDocument('$gt', new BsonArray([new BsonString('$spent'), new BsonString('$budget')])))) ==
+                parse('{$expr: { $gt: [ "$spent" , "$budget" ] } }')
+    }
+
     def 'should render $geoWithin'() {
         given:
         def polygon = new Polygon([new Position([40.0d, 18.0d]),
@@ -614,6 +618,15 @@ class FiltersSpecification extends Specification {
                                                                                     }''')
     }
 
+    def 'should render $jsonSchema'() {
+        expect:
+        toBson(jsonSchema(new BsonDocument('bsonType', new BsonString('object')))) == parse( '''{
+                                                                                       $jsonSchema : {
+                                                                                          bsonType : "object"
+                                                                                       }
+                                                                                    }''')
+    }
+
     def 'should render with iterable value'() {
         expect:
         toBson(eq('x', new Document())) == parse('''{
@@ -669,7 +682,149 @@ class FiltersSpecification extends Specification {
         all('x', [1, 2, 3]).toString() == 'Operator Filter{fieldName=\'x\', operator=\'$all\', value=[1, 2, 3]}'
     }
 
-    def toBson(Bson bson) {
-        bson.toBsonDocument(BsonDocument, registry)
+    def 'should test equals for SimpleFilter'() {
+        expect:
+        regex('x', 'acme.*corp').equals(regex('x', 'acme.*corp'))
+    }
+
+    def 'should test hashCode for SimpleFilter'() {
+        expect:
+        regex('x', 'acme.*corp').hashCode() == regex('x', 'acme.*corp').hashCode()
+    }
+
+    def 'should test equals for OperatorFilter'() {
+        expect:
+        ne('x', 1).equals(ne('x', 1))
+        exists('x').equals(exists('x', true))
+        exists('x', false).equals(exists('x', false))
+        type('a', BsonType.ARRAY).equals(type('a', BsonType.ARRAY))
+        !type('a', 'number').equals(type('a', BsonType.ARRAY))
+    }
+
+    def 'should test hashCode for OperatorFilter'() {
+        expect:
+        ne('x', 1).hashCode() == ne('x', 1).hashCode()
+        exists('x').hashCode() == exists('x', true).hashCode()
+        exists('x', false).hashCode() == exists('x', false).hashCode()
+        type('a', BsonType.ARRAY).hashCode() == type('a', BsonType.ARRAY).hashCode()
+        type('a', 'number').hashCode() != type('a', BsonType.ARRAY).hashCode()
+    }
+
+    def 'should test equals for AndFilter'() {
+        expect:
+        and([]).equals(and())
+        and([eq('x', 1), eq('y', 2)])
+                .equals(and(eq('x', 1), eq('y', 2)))
+    }
+
+    def 'should test hashCode for AndFilter'() {
+        expect:
+        and([]).hashCode() == and().hashCode()
+        and([eq('x', 1), eq('y', 2)]).hashCode() ==
+                and(eq('x', 1), eq('y', 2)).hashCode()
+    }
+
+    def 'should test equals for OrNorFilter'() {
+        expect:
+        or([]).equals(or())
+        nor(eq('x', 1), eq('x', 2)).equals(nor(eq('x', 1), eq('x', 2)))
+        !nor(eq('x', 1), eq('x', 2)).equals(or(eq('x', 1), eq('x', 2)))
+    }
+
+    def 'should test hashCode for OrNorFilter'() {
+        expect:
+        or([]).hashCode() == or().hashCode()
+        nor(eq('x', 1), eq('x', 2)).hashCode() == nor(eq('x', 1), eq('x', 2)).hashCode()
+        nor(eq('x', 1), eq('x', 2)).hashCode() != or(eq('x', 1), eq('x', 2)).hashCode()
+    }
+
+    def 'should test equals for IterableOperatorFilter'() {
+        expect:
+        Filters.in('a', [1, 2, 3]).equals(Filters.in('a', 1, 2, 3))
+        !nin('a', [1, 2, 3]).equals(nin('a', 1, 2))
+        !all('a', [1, 2, 3]).equals(nin('a', 1, 2, 3))
+        all('a', []).equals(all('a'))
+    }
+
+    def 'should test hashCode for IterableOperatorFilter'() {
+        expect:
+        Filters.in('a', [1, 2, 3]).hashCode() == Filters.in('a', 1, 2, 3).hashCode()
+        nin('a', [1, 2, 3]).hashCode() != nin('a', 1, 2).hashCode()
+        all('a', [1, 2, 3]).hashCode() != nin('a', 1, 2, 3).hashCode()
+        all('a', []).hashCode() == all('a').hashCode()
+    }
+
+    def 'should test equals for SimpleEncodingFilter'() {
+        expect:
+        eq('x', 1).equals(eq('x', 1))
+        !eq('x', 1).equals(ne('x', 1))
+        !eq('x', 1).equals(eq('x', 2))
+        !eq('y', 1).equals(eq('x', 1))
+        !eq('x', 1).equals(parse('{x : 1}'))
+        expr(new BsonDocument('$gt', new BsonArray([new BsonString('$spent'), new BsonString('$budget')])))
+                .equals(expr(new BsonDocument('$gt', new BsonArray([new BsonString('$spent'), new BsonString('$budget')]))))
+    }
+
+    def 'should test hashCode for SimpleEncodingFilter'() {
+        expect:
+        eq('x', 1).hashCode() == eq('x', 1).hashCode()
+        eq('x', 1).hashCode() != ne('x', 1).hashCode()
+        eq('x', 1).hashCode() != eq('x', 2).hashCode()
+        eq('y', 1).hashCode() != eq('x', 1).hashCode()
+        eq('x', 1).hashCode() != parse('{x : 1}').hashCode()
+        expr(new BsonDocument('$gt', new BsonArray([new BsonString('$spent'), new BsonString('$budget')]))).hashCode() ==
+                expr(new BsonDocument('$gt', new BsonArray([new BsonString('$spent'), new BsonString('$budget')]))).hashCode()
+    }
+
+    def 'should test equals for NotFilter'() {
+        expect:
+        not(eq('x', 1)).equals(not(eq('x', 1)))
+    }
+
+    def 'should test hashCode for NotFilter'() {
+        expect:
+        not(eq('x', 1)).hashCode() == not(eq('x', 1)).hashCode()
+    }
+
+    def 'should test equals for GeometryOperatorFilter'() {
+        def polygon = new Polygon([new Position([40.0d, 18.0d]),
+                                   new Position([40.0d, 19.0d]),
+                                   new Position([41.0d, 19.0d]),
+                                   new Position([40.0d, 18.0d])])
+        expect:
+        geoWithin('loc', polygon).equals(geoWithin('loc', polygon))
+        !geoWithinBox('loc', 1d, 2d, 3d, 4d)
+                .equals(geoWithinBox('loc', 1d, 2d, 3d, 5d))
+
+        geoWithinPolygon('loc', [[0d, 0d], [3d, 6d], [6d, 0d]])
+                .equals(geoWithinPolygon('loc', [[0d, 0d], [3d, 6d], [6d, 0d]]))
+    }
+
+    def 'should test hashCode for GeometryOperatorFilter'() {
+        def polygon = new Polygon([new Position([40.0d, 18.0d]),
+                                   new Position([40.0d, 19.0d]),
+                                   new Position([41.0d, 19.0d]),
+                                   new Position([40.0d, 18.0d])])
+        expect:
+        geoWithin('loc', polygon).hashCode() == geoWithin('loc', polygon).hashCode()
+        geoWithinBox('loc', 1d, 2d, 3d, 4d).hashCode() !=
+                geoWithinBox('loc', 1d, 2d, 3d, 5d).hashCode()
+
+        geoWithinPolygon('loc', [[0d, 0d], [3d, 6d], [6d, 0d]]).hashCode() ==
+                geoWithinPolygon('loc', [[0d, 0d], [3d, 6d], [6d, 0d]]).hashCode()
+    }
+
+    def 'should test equals for TextFilter'() {
+        expect:
+        text('mongoDB for GIANT ideas').equals(text('mongoDB for GIANT ideas'))
+        text('mongoDB for GIANT ideas', 'english')
+                .equals(text('mongoDB for GIANT ideas', new TextSearchOptions().language('english')))
+    }
+
+    def 'should test hashCode for TextFilter'() {
+        expect:
+        text('mongoDB for GIANT ideas').hashCode() == text('mongoDB for GIANT ideas').hashCode()
+        text('mongoDB for GIANT ideas', 'english').hashCode() ==
+                text('mongoDB for GIANT ideas', new TextSearchOptions().language('english')).hashCode()
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndDeleteOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndDeleteOptionsSpecification.groovy
new file mode 100644
index 00000000000..e4344cabbb9
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndDeleteOptionsSpecification.groovy
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import org.bson.BsonDocument
+import spock.lang.Specification
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class FindOneAndDeleteOptionsSpecification extends Specification {
+
+    def 'should have the expected defaults'() {
+        when:
+        def options = new FindOneAndDeleteOptions()
+
+        then:
+        options.getCollation() == null
+        options.getMaxTime(MILLISECONDS) == 0
+        options.getProjection() == null
+        options.getSort() == null
+    }
+
+    def 'should set collation'() {
+        expect:
+        new FindOneAndDeleteOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+
+    def 'should set projection'() {
+        expect:
+        new FindOneAndDeleteOptions().projection(projection).getProjection() == projection
+
+        where:
+        projection << [null, BsonDocument.parse('{ a: 1}')]
+    }
+
+    def 'should set sort'() {
+        expect:
+        new FindOneAndDeleteOptions().sort(sort).getSort() == sort
+
+        where:
+        sort << [null, BsonDocument.parse('{ a: 1}')]
+    }
+
+    def 'should convert maxTime'() {
+        when:
+        def options = new FindOneAndDeleteOptions()
+
+        then:
+        options.getMaxTime(SECONDS) == 0
+
+        when:
+        options.maxTime(100, MILLISECONDS)
+
+        then:
+        options.getMaxTime(MILLISECONDS) == 100
+
+        when:
+        options.maxTime(1004, MILLISECONDS)
+
+        then:
+        options.getMaxTime(SECONDS) == 1
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndReplaceOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndReplaceOptionsSpecification.groovy
new file mode 100644
index 00000000000..67d027be3d3
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndReplaceOptionsSpecification.groovy
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import org.bson.BsonDocument
+import spock.lang.Specification
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class FindOneAndReplaceOptionsSpecification extends Specification {
+
+    def 'should have the expected defaults'() {
+        when:
+        def options = new FindOneAndReplaceOptions()
+
+        then:
+        options.getCollation() == null
+        options.getMaxTime(MILLISECONDS) == 0
+        options.getProjection() == null
+        options.getSort() == null
+        options.getBypassDocumentValidation() == null
+        options.getReturnDocument() ==  ReturnDocument.BEFORE
+        options.isUpsert() == false
+    }
+
+    def 'should set collation'() {
+        expect:
+        new FindOneAndReplaceOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+
+    def 'should set projection'() {
+        expect:
+        new FindOneAndReplaceOptions().projection(projection).getProjection() == projection
+
+        where:
+        projection << [null, BsonDocument.parse('{ a: 1}')]
+    }
+
+    def 'should set sort'() {
+        expect:
+        new FindOneAndReplaceOptions().sort(sort).getSort() == sort
+
+        where:
+        sort << [null, BsonDocument.parse('{ a: 1}')]
+    }
+
+    def 'should convert maxTime'() {
+        when:
+        def options = new FindOneAndReplaceOptions()
+
+        then:
+        options.getMaxTime(SECONDS) == 0
+
+        when:
+        options.maxTime(100, MILLISECONDS)
+
+        then:
+        options.getMaxTime(MILLISECONDS) == 100
+
+        when:
+        options.maxTime(1004, MILLISECONDS)
+
+        then:
+        options.getMaxTime(SECONDS) == 1
+    }
+
+    def 'should set upsert'() {
+        expect:
+        new FindOneAndReplaceOptions().upsert(upsert).isUpsert() == upsert
+
+        where:
+        upsert << [true, false]
+    }
+
+    def 'should set bypassDocumentValidation'() {
+        expect:
+        new FindOneAndReplaceOptions().bypassDocumentValidation(bypassValidation).getBypassDocumentValidation() == bypassValidation
+
+        where:
+        bypassValidation << [null, true, false]
+    }
+
+    def 'should set returnDocument'() {
+        expect:
+        new FindOneAndReplaceOptions().returnDocument(returnDocument).getReturnDocument() == returnDocument
+
+        where:
+        returnDocument << [ReturnDocument.BEFORE, ReturnDocument.AFTER]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndUpdateOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndUpdateOptionsSpecification.groovy
new file mode 100644
index 00000000000..3b915eaf42c
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/FindOneAndUpdateOptionsSpecification.groovy
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import spock.lang.Specification
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class FindOneAndUpdateOptionsSpecification extends Specification {
+
+    def 'should have the expected defaults'() {
+        when:
+        def options = new FindOneAndUpdateOptions()
+
+        then:
+        options.getCollation() == null
+        options.getMaxTime(MILLISECONDS) == 0
+        options.getProjection() == null
+        options.getSort() == null
+        options.getBypassDocumentValidation() == null
+        options.getReturnDocument() ==  ReturnDocument.BEFORE
+        options.isUpsert() == false
+    }
+
+    def 'should set collation'() {
+        expect:
+        new FindOneAndUpdateOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+
+    def 'should set projection'() {
+        expect:
+        new FindOneAndUpdateOptions().projection(projection).getProjection() == projection
+
+        where:
+        projection << [null, BsonDocument.parse('{ a: 1}')]
+    }
+
+    def 'should set sort'() {
+        expect:
+        new FindOneAndUpdateOptions().sort(sort).getSort() == sort
+
+        where:
+        sort << [null, BsonDocument.parse('{ a: 1}')]
+    }
+
+    def 'should convert maxTime'() {
+        when:
+        def options = new FindOneAndUpdateOptions()
+
+        then:
+        options.getMaxTime(SECONDS) == 0
+
+        when:
+        options.maxTime(100, MILLISECONDS)
+
+        then:
+        options.getMaxTime(MILLISECONDS) == 100
+
+        when:
+        options.maxTime(1004, MILLISECONDS)
+
+        then:
+        options.getMaxTime(SECONDS) == 1
+    }
+
+    def 'should set upsert'() {
+        expect:
+        new FindOneAndUpdateOptions().upsert(upsert).isUpsert() == upsert
+
+        where:
+        upsert << [true, false]
+    }
+
+    def 'should set bypassDocumentValidation'() {
+        expect:
+        new FindOneAndUpdateOptions().bypassDocumentValidation(bypassValidation).getBypassDocumentValidation() == bypassValidation
+
+        where:
+        bypassValidation << [null, true, false]
+    }
+
+    def 'should set returnDocument'() {
+        expect:
+        new FindOneAndUpdateOptions().returnDocument(returnDocument).getReturnDocument() == returnDocument
+
+        where:
+        returnDocument << [ReturnDocument.BEFORE, ReturnDocument.AFTER]
+    }
+
+
+    def 'should set array filters'() {
+        expect:
+        new UpdateOptions().arrayFilters(arrayFilters).getArrayFilters() == arrayFilters
+
+        where:
+        arrayFilters << [null, [], [new BsonDocument('a.b', new BsonInt32(1))]]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/FindOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/FindOptionsSpecification.groovy
new file mode 100644
index 00000000000..b9521e4e8c5
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/FindOptionsSpecification.groovy
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import com.mongodb.CursorType
+import org.bson.BsonDocument
+import org.bson.Document
+import spock.lang.Specification
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class FindOptionsSpecification extends Specification {
+
+    def 'should have the expected defaults'() {
+        when:
+        def options = new FindOptions()
+
+        then:
+        options.getCollation() == null
+        options.getMaxTime(MILLISECONDS) == 0
+        options.getMaxAwaitTime(MILLISECONDS) == 0
+        options.getProjection() == null
+        options.getSort() == null
+        options.getHint() == null
+        options.getHintString() == null
+        options.getLimit() == 0
+        options.getSkip() == 0
+        options.getBatchSize() == 0
+        options.getCursorType() == CursorType.NonTailable
+        options.getModifiers() == null
+        !options.isNoCursorTimeout()
+        !options.isOplogReplay()
+        !options.isPartial()
+    }
+
+    def 'should set collation'() {
+        expect:
+        new FindOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+
+    def 'should set projection'() {
+        expect:
+        new FindOptions().projection(projection).getProjection() == projection
+
+        where:
+        projection << [null, BsonDocument.parse('{a: 1}')]
+    }
+
+    def 'should set sort'() {
+        expect:
+        new FindOptions().sort(sort).getSort() == sort
+
+        where:
+        sort << [null, BsonDocument.parse('{a: 1}')]
+    }
+
+    def 'should set limit'() {
+        expect:
+        new FindOptions().limit(limit).getLimit() == limit
+
+        where:
+        limit << [-1, 0, 1]
+    }
+
+    def 'should set skip'() {
+        expect:
+        new FindOptions().skip(skip).getSkip() == skip
+
+        where:
+        skip << [-1, 0, 1]
+    }
+
+    def 'should set batchSize'() {
+        expect:
+        new FindOptions().batchSize(batchSize).getBatchSize() == batchSize
+
+        where:
+        batchSize << [-1, 0, 1]
+    }
+
+    def 'should set cursorType'() {
+        expect:
+        new FindOptions().cursorType(cursorType).getCursorType() == cursorType
+
+        where:
+        cursorType << [CursorType.NonTailable, CursorType.TailableAwait, CursorType.Tailable]
+    }
+
+    def 'should set modifiers'() {
+        expect:
+        new FindOptions().modifiers(modifiers).getModifiers() == modifiers
+
+        where:
+        modifiers << [null, BsonDocument.parse('{$comment: "my find"}')]
+    }
+
+    def 'should set partial'() {
+        expect:
+        new FindOptions().partial(partial).isPartial() == partial
+
+        where:
+        partial << [true, false]
+    }
+
+    def 'should set oplogReplay'() {
+        expect:
+        new FindOptions().oplogReplay(oplogReplay).isOplogReplay() == oplogReplay
+
+        where:
+        oplogReplay << [true, false]
+    }
+
+    def 'should set noCursorTimeout'() {
+        expect:
+        new FindOptions().noCursorTimeout(noCursorTimeout).isNoCursorTimeout() == noCursorTimeout
+
+        where:
+        noCursorTimeout << [true, false]
+    }
+
+    def 'should convert maxTime'() {
+        when:
+        def options = new FindOptions()
+
+        then:
+        options.getMaxTime(SECONDS) == 0
+
+        when:
+        options.maxTime(100, MILLISECONDS)
+
+        then:
+        options.getMaxTime(MILLISECONDS) == 100
+
+        when:
+        options.maxTime(1004, MILLISECONDS)
+
+        then:
+        options.getMaxTime(SECONDS) == 1
+    }
+
+    def 'should convert maxAwaitTime'() {
+        when:
+        def options = new FindOptions()
+
+        then:
+        options.getMaxAwaitTime(SECONDS) == 0
+
+        when:
+        options.maxAwaitTime(100, MILLISECONDS)
+
+        then:
+        options.getMaxAwaitTime(MILLISECONDS) == 100
+
+        when:
+        options.maxAwaitTime(1004, MILLISECONDS)
+
+        then:
+        options.getMaxAwaitTime(SECONDS) == 1
+    }
+
+    def 'should set hint'() {
+        expect:
+        new FindOptions().hint(hint).getHint() == hint
+
+        where:
+        hint << [null, new BsonDocument(), new Document('a', 1)]
+    }
+
+    def 'should set hintString'() {
+        expect:
+        new FindOptions().hintString(hintString).getHintString() == hintString
+
+        where:
+        hintString << [null, 'a_1']
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/GraphLookupOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/GraphLookupOptionsSpecification.groovy
new file mode 100644
index 00000000000..fdf3700ce6d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/GraphLookupOptionsSpecification.groovy
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import spock.lang.Specification
+
+import static org.bson.BsonDocument.parse
+
+class GraphLookupOptionsSpecification extends Specification {
+    def "should return new options with the same property values"() {
+        when:
+        def options = new GraphLookupOptions()
+                .maxDepth(10)
+                .depthField('field')
+                .restrictSearchWithMatch(parse('{x : 1}'))
+
+        then:
+        options.maxDepth == 10
+        options.depthField == 'field'
+        options.restrictSearchWithMatch == parse('{x : 1}')
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/IndexOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/IndexOptionsSpecification.groovy
index ac2b6479fb9..2ed931f2193 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/IndexOptionsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/IndexOptionsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,13 +45,16 @@ class IndexOptionsSpecification extends Specification {
         options.getBucketSize() == null
         options.getStorageEngine() == null
         options.getPartialFilterExpression() == null
+        options.getCollation() == null
+        options.getWildcardProjection() == null
+        def wildcardProjection = BsonDocument.parse('{a  : 1}')
 
         when:
         def weights = BsonDocument.parse('{ a: 1000 }')
         def storageEngine = BsonDocument.parse('{ wiredTiger : { configString : "block_compressor=zlib" }}')
         def partialFilterExpression = BsonDocument.parse('{ a: { $gte: 10 } }')
-        def options2 = new IndexOptions()
-                .background(true)
+        def collation = Collation.builder().locale('en').build()
+        options.background(true)
                 .unique(true)
                 .sparse(true)
                 .name('aIndex')
@@ -68,25 +71,29 @@ class IndexOptionsSpecification extends Specification {
                 .bucketSize(200.0)
                 .storageEngine(storageEngine)
                 .partialFilterExpression(partialFilterExpression)
+                .collation(collation)
+                .wildcardProjection(wildcardProjection)
 
         then:
-        options2.isBackground()
-        options2.isUnique()
-        options2.isSparse()
-        options2.getName() == 'aIndex'
-        options2.getExpireAfter(TimeUnit.SECONDS) == 100
-        options2.getVersion() == 1
-        options2.getWeights() == weights
-        options2.getDefaultLanguage() == 'es'
-        options2.getLanguageOverride() == 'language'
-        options2.getTextVersion() == 1
-        options2.getSphereVersion() == 2
-        options2.getBits() == 1
-        options2.getMin() == -180.0
-        options2.getMax() == 180.0
-        options2.getBucketSize() == 200.0
-        options2.getStorageEngine() == storageEngine
-        options2.getPartialFilterExpression() == partialFilterExpression
+        options.isBackground()
+        options.isUnique()
+        options.isSparse()
+        options.getName() == 'aIndex'
+        options.getExpireAfter(TimeUnit.SECONDS) == 100
+        options.getVersion() == 1
+        options.getWeights() == weights
+        options.getDefaultLanguage() == 'es'
+        options.getLanguageOverride() == 'language'
+        options.getTextVersion() == 1
+        options.getSphereVersion() == 2
+        options.getBits() == 1
+        options.getMin() == -180.0
+        options.getMax() == 180.0
+        options.getBucketSize() == 200.0
+        options.getStorageEngine() == storageEngine
+        options.getPartialFilterExpression() == partialFilterExpression
+        options.getCollation() == collation
+        options.getWildcardProjection() == wildcardProjection
     }
 
     def 'should convert expireAfter'() {
@@ -113,6 +120,5 @@ class IndexOptionsSpecification extends Specification {
 
         then:
         options.getExpireAfter(TimeUnit.SECONDS) == 1
-
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/IndexesSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/IndexesSpecification.groovy
index 055f2202e18..29e7ad74839 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/IndexesSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/IndexesSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,32 +9,28 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 package com.mongodb.client.model
 
-import org.bson.BsonDocument
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.conversions.Bson
+
 import spock.lang.Specification
 
+import static com.mongodb.client.model.BsonHelper.toBson
 import static com.mongodb.client.model.Indexes.ascending
 import static com.mongodb.client.model.Indexes.compoundIndex
 import static com.mongodb.client.model.Indexes.descending
 import static com.mongodb.client.model.Indexes.geo2d
 import static com.mongodb.client.model.Indexes.geo2dsphere
 import static com.mongodb.client.model.Indexes.geoHaystack
-import static com.mongodb.client.model.Indexes.text
 import static com.mongodb.client.model.Indexes.hashed
+import static com.mongodb.client.model.Indexes.text
 import static org.bson.BsonDocument.parse
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class IndexesSpecification extends Specification {
-    def registry = fromProviders([new BsonValueCodecProvider(), new ValueCodecProvider()])
 
     def 'ascending'() {
         expect:
@@ -69,7 +65,8 @@ class IndexesSpecification extends Specification {
 
     def 'text'() {
         expect:
-        toBson(text('x',)) == parse('{x : "text"}')
+        toBson(text('x')) == parse('{x : "text"}')
+        toBson(text()) == parse('{ "$**" : "text"}')
     }
 
     def 'hashed'() {
@@ -85,7 +82,27 @@ class IndexesSpecification extends Specification {
         toBson(compoundIndex(ascending('x', 'y'), descending('a', 'b'))) == parse('{x : 1, y : 1, a : -1, b : -1}')
     }
 
-    def toBson(Bson bson) {
-        bson.toBsonDocument(BsonDocument, registry)
+    def 'should test equals on CompoundIndex'() {
+        expect:
+        compoundIndex([ascending('x'), descending('y')])
+                .equals(compoundIndex([ascending('x'), descending('y')]))
+        compoundIndex(ascending('x'), descending('y'))
+                .equals(compoundIndex(ascending('x'), descending('y')))
+        compoundIndex(ascending('x'), descending('y'), descending('x'))
+                .equals(compoundIndex(ascending('x'), descending('y'), descending('x')))
+        compoundIndex(ascending('x', 'y'), descending('a', 'b'))
+                .equals(compoundIndex(ascending('x', 'y'), descending('a', 'b')))
+    }
+
+    def 'should test hashCode on CompoundIndex'() {
+        expect:
+        compoundIndex([ascending('x'), descending('y')]).hashCode() ==
+                compoundIndex([ascending('x'), descending('y')]).hashCode()
+        compoundIndex(ascending('x'), descending('y')).hashCode() ==
+                compoundIndex(ascending('x'), descending('y')).hashCode()
+        compoundIndex(ascending('x'), descending('y'), descending('x')).hashCode() ==
+                compoundIndex(ascending('x'), descending('y'), descending('x')).hashCode()
+        compoundIndex(ascending('x', 'y'), descending('a', 'b')).hashCode() ==
+                compoundIndex(ascending('x', 'y'), descending('a', 'b')).hashCode()
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/InsertManyOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/InsertManyOptionsSpecification.groovy
index fac2144eab3..033ebf36a0f 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/InsertManyOptionsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/InsertManyOptionsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/InsertOneOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/InsertOneOptionsSpecification.groovy
index 9b9f035f917..482e58faa0a 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/InsertOneOptionsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/InsertOneOptionsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/ProjectionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/ProjectionsSpecification.groovy
index 975009371a8..60d40d4ff4e 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/ProjectionsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/ProjectionsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,19 +9,17 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 package com.mongodb.client.model
 
-import org.bson.BsonDocument
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.conversions.Bson
+
 import spock.lang.Specification
 
+import static com.mongodb.client.model.BsonHelper.toBson
 import static com.mongodb.client.model.Filters.and
 import static com.mongodb.client.model.Filters.eq
 import static com.mongodb.client.model.Projections.computed
@@ -33,10 +31,8 @@ import static com.mongodb.client.model.Projections.include
 import static com.mongodb.client.model.Projections.metaTextScore
 import static com.mongodb.client.model.Projections.slice
 import static org.bson.BsonDocument.parse
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class ProjectionsSpecification extends Specification {
-    def registry = fromProviders([new BsonValueCodecProvider(), new ValueCodecProvider()])
 
     def 'include'() {
         expect:
@@ -93,9 +89,9 @@ class ProjectionsSpecification extends Specification {
 
     def 'should create string representation for include and exclude'() {
         expect:
-        include(['x', 'y', 'x']).toString() == '{ "y" : 1, "x" : 1 }'
-        exclude(['x', 'y', 'x']).toString() == '{ "y" : 0, "x" : 0 }'
-        excludeId().toString() == '{ "_id" : 0 }'
+        include(['x', 'y', 'x']).toString() == '{"y": 1, "x": 1}'
+        exclude(['x', 'y', 'x']).toString() == '{"y": 0, "x": 0}'
+        excludeId().toString() == '{"_id": 0}'
     }
 
     def 'should create string representation for computed'() {
@@ -112,10 +108,6 @@ class ProjectionsSpecification extends Specification {
 
     def 'should create string representation for fields'() {
         expect:
-        fields(include('x', 'y'), exclude('_id')).toString() == 'Projections{projections=[{ "x" : 1, "y" : 1 }, { "_id" : 0 }]}'
-    }
-
-    def toBson(Bson bson) {
-        bson.toBsonDocument(BsonDocument, registry)
+        fields(include('x', 'y'), exclude('_id')).toString() == 'Projections{projections=[{"x": 1, "y": 1}, {"_id": 0}]}'
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/SortsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/SortsSpecification.groovy
index 9d06cd9d79a..395bce497a8 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/SortsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/SortsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,28 +9,24 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONObjectITIONS OF ANY KINObject, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 package com.mongodb.client.model
 
-import org.bson.BsonDocument
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.conversions.Bson
+
 import spock.lang.Specification
 
+import static com.mongodb.client.model.BsonHelper.toBson
 import static com.mongodb.client.model.Sorts.ascending
 import static com.mongodb.client.model.Sorts.descending
 import static com.mongodb.client.model.Sorts.metaTextScore
 import static com.mongodb.client.model.Sorts.orderBy
 import static org.bson.BsonDocument.parse
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class SortsSpecification extends Specification {
-    def registry = fromProviders([new BsonValueCodecProvider(), new ValueCodecProvider()])
 
     def 'ascending'() {
         expect:
@@ -61,18 +57,38 @@ class SortsSpecification extends Specification {
 
     def 'should create string representation for simple sorts'() {
         expect:
-        ascending('x', 'y').toString() == '{ "x" : 1, "y" : 1 }'
-        descending('x', 'y').toString() == '{ "x" : -1, "y" : -1 }'
-        metaTextScore('x').toString() == '{ "x" : { "$meta" : "textScore" } }'
+        ascending('x', 'y').toString() == '{"x": 1, "y": 1}'
+        descending('x', 'y').toString() == '{"x": -1, "y": -1}'
+        metaTextScore('x').toString() == '{"x": {"$meta": "textScore"}}'
     }
 
     def 'should create string representation for compound sorts'() {
         expect:
         orderBy(ascending('x', 'y'), descending('a', 'b')).toString() ==
-                'Compound Sort{sorts=[{ "x" : 1, "y" : 1 }, { "a" : -1, "b" : -1 }]}'
+                'Compound Sort{sorts=[{"x": 1, "y": 1}, {"a": -1, "b": -1}]}'
     }
 
-    def toBson(Bson bson) {
-        bson.toBsonDocument(BsonDocument, registry)
+    def 'should test equals for CompoundSort'() {
+        expect:
+        orderBy([ascending('x'), descending('y')])
+                .equals(orderBy([ascending('x'), descending('y')]))
+        orderBy(ascending('x'), descending('y'))
+                .equals(orderBy(ascending('x'), descending('y')))
+        orderBy(ascending('x'), descending('y'), descending('x'))
+                .equals(orderBy(ascending('x'), descending('y'), descending('x')))
+        orderBy(ascending('x', 'y'), descending('a', 'b'))
+                .equals(orderBy(ascending('x', 'y'), descending('a', 'b')))
+    }
+
+    def 'should test hashCode for CompoundSort'() {
+        expect:
+        orderBy([ascending('x'), descending('y')]).hashCode() ==
+                orderBy([ascending('x'), descending('y')]).hashCode()
+        orderBy(ascending('x'), descending('y')).hashCode() ==
+                orderBy(ascending('x'), descending('y')).hashCode()
+        orderBy(ascending('x'), descending('y'), descending('x')).hashCode() ==
+                orderBy(ascending('x'), descending('y'), descending('x')).hashCode()
+        orderBy(ascending('x', 'y'), descending('a', 'b')).hashCode() ==
+                orderBy(ascending('x', 'y'), descending('a', 'b')).hashCode()
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/UpdateOptionsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/UpdateOptionsSpecification.groovy
index 28d8914a93e..eaa7482d591 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/UpdateOptionsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/UpdateOptionsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb.client.model
 
+import org.bson.BsonDocument
+import org.bson.BsonInt32
 import spock.lang.Specification
 
 class UpdateOptionsSpecification extends Specification {
@@ -26,6 +28,7 @@ class UpdateOptionsSpecification extends Specification {
         then:
         !options.isUpsert()
         options.getBypassDocumentValidation() == null
+        options.getCollation() == null
     }
 
     def 'should set upsert'() {
@@ -43,4 +46,20 @@ class UpdateOptionsSpecification extends Specification {
         where:
         bypassValidation << [null, true, false]
     }
+
+    def 'should set collation'() {
+        expect:
+        new UpdateOptions().collation(collation).getCollation() == collation
+
+        where:
+        collation << [null, Collation.builder().locale('en').build()]
+    }
+
+    def 'should set array filters'() {
+        expect:
+        new UpdateOptions().arrayFilters(arrayFilters).getArrayFilters() == arrayFilters
+
+        where:
+        arrayFilters << [null, [], [new BsonDocument('a.b', new BsonInt32(1))]]
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/UpdatesSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/UpdatesSpecification.groovy
index f01be1da572..4f5e88cdf7a 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/UpdatesSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/UpdatesSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,12 +16,9 @@
 
 package com.mongodb.client.model
 
-import org.bson.BsonDocument
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.conversions.Bson
 import spock.lang.Specification
 
+import static com.mongodb.client.model.BsonHelper.toBson
 import static com.mongodb.client.model.Updates.addEachToSet
 import static com.mongodb.client.model.Updates.addToSet
 import static com.mongodb.client.model.Updates.bitwiseAnd
@@ -44,10 +43,8 @@ import static com.mongodb.client.model.Updates.set
 import static com.mongodb.client.model.Updates.setOnInsert
 import static com.mongodb.client.model.Updates.unset
 import static org.bson.BsonDocument.parse
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 
 class UpdatesSpecification extends Specification {
-    def registry = fromProviders([new BsonValueCodecProvider(), new ValueCodecProvider()])
 
     def 'should render $set'() {
         expect:
@@ -59,6 +56,13 @@ class UpdatesSpecification extends Specification {
         expect:
         toBson(setOnInsert('x', 1)) == parse('{$setOnInsert : { x : 1} }')
         toBson(setOnInsert('x', null)) == parse('{$setOnInsert : { x : null } }')
+        toBson(setOnInsert(parse('{ a : 1, b: "two"}'))) == parse('{$setOnInsert : {a: 1, b: "two"} }')
+
+        when:
+        toBson(setOnInsert(null))
+
+        then:
+        thrown IllegalArgumentException
     }
 
     def 'should render $unset'() {
@@ -186,7 +190,7 @@ class UpdatesSpecification extends Specification {
                 'options=Push Options{position=0, slice=3, sort=-1}}'
         pushEach('x', [89, 65], new PushOptions().position(0).slice(3).sortDocument(parse('{x : 1}'))).toString() ==
                 'Each Update{fieldName=\'x\', operator=\'$push\', values=[89, 65], ' +
-                'options=Push Options{position=0, slice=3, sortDocument={ "x" : 1 }}}'
+                'options=Push Options{position=0, slice=3, sortDocument={"x": 1}}}'
     }
 
     def 'should create string representation for pull all update'() {
@@ -202,8 +206,146 @@ class UpdatesSpecification extends Specification {
                 'Update{fieldName=\'z\', operator=\'$inc\', value=3}]}'
     }
 
-    def toBson(Bson bson) {
-        bson.toBsonDocument(BsonDocument, registry)
+    def 'should test equals for SimpleBsonKeyValue'() {
+        expect:
+        setOnInsert('x', 1).equals(setOnInsert('x', 1))
+        setOnInsert('x', null).equals(setOnInsert('x', null))
+        setOnInsert(parse('{ a : 1, b: "two"}')).equals(setOnInsert(parse('{ a : 1, b: "two"}')))
+    }
+
+    def 'should test hashCode for SimpleBsonKeyValue'() {
+        expect:
+        setOnInsert('x', 1).hashCode() == setOnInsert('x', 1).hashCode()
+        setOnInsert('x', null).hashCode() == setOnInsert('x', null).hashCode()
+        setOnInsert(parse('{ a : 1, b: "two"}')).hashCode() == setOnInsert(parse('{ a : 1, b: "two"}')).hashCode()
+    }
+
+    def 'should test equals for SimpleUpdate'() {
+        expect:
+        setOnInsert('x', 1).equals(setOnInsert('x', 1))
+        setOnInsert('x', null).equals(setOnInsert('x', null))
+        setOnInsert(parse('{ a : 1, b: "two"}')).equals(setOnInsert(parse('{ a : 1, b: "two"}')))
+        rename('x', 'y').equals(rename('x', 'y'))
+        inc('x', 1).equals(inc('x', 1))
+        inc('x', 5L).equals(inc('x', 5L))
+        inc('x', 3.4d).equals(inc('x', 3.4d))
+        mul('x', 1).equals(mul('x', 1))
+        mul('x', 5L).equals(mul('x', 5L))
+        mul('x', 3.4d).equals(mul('x', 3.4d))
+        min('x', 42).equals(min('x', 42))
+        max('x', 42).equals(max('x', 42))
+        currentDate('x').equals(currentDate('x'))
+        currentTimestamp('x').equals(currentTimestamp('x'))
+        addToSet('x', 1).equals(addToSet('x', 1))
+        addEachToSet('x', [1, 2, 3]).equals(addEachToSet('x', [1, 2, 3]))
+        push('x', 1).equals(push('x', 1))
+        pull('x', 1).equals(pull('x', 1))
+        popFirst('x').equals(popFirst('x'))
+        popLast('x').equals(popLast('x'))
+    }
+
+    def 'should test hashCode for SimpleUpdate'() {
+        expect:
+        setOnInsert('x', 1).hashCode() == setOnInsert('x', 1).hashCode()
+        setOnInsert('x', null).hashCode() == setOnInsert('x', null).hashCode()
+        setOnInsert(parse('{ a : 1, b: "two"}')).hashCode() == setOnInsert(parse('{ a : 1, b: "two"}')).hashCode()
+        rename('x', 'y').hashCode() == rename('x', 'y').hashCode()
+        inc('x', 1).hashCode() == inc('x', 1).hashCode()
+        inc('x', 5L).hashCode() == inc('x', 5L).hashCode()
+        inc('x', 3.4d).hashCode() == inc('x', 3.4d).hashCode()
+        mul('x', 1).hashCode() == mul('x', 1).hashCode()
+        mul('x', 5L).hashCode() == mul('x', 5L).hashCode()
+        mul('x', 3.4d).hashCode() == mul('x', 3.4d).hashCode()
+        min('x', 42).hashCode() == min('x', 42).hashCode()
+        max('x', 42).hashCode() == max('x', 42).hashCode()
+        currentDate('x').hashCode() == currentDate('x').hashCode()
+        currentTimestamp('x').hashCode() == currentTimestamp('x').hashCode()
+        addToSet('x', 1).hashCode() == addToSet('x', 1).hashCode()
+        addEachToSet('x', [1, 2, 3]).hashCode() == addEachToSet('x', [1, 2, 3]).hashCode()
+        push('x', 1).hashCode() == push('x', 1).hashCode()
+        pull('x', 1).hashCode() == pull('x', 1).hashCode()
+        popFirst('x').hashCode() == popFirst('x').hashCode()
+        popLast('x').hashCode() == popLast('x').hashCode()
+    }
+
+    def 'should test equals for WithEachUpdate'() {
+        expect:
+        addEachToSet('x', [1, 2, 3]).equals(addEachToSet('x', [1, 2, 3]))
+    }
+
+    def 'should test hashCode for WithEachUpdate'() {
+        expect:
+        addEachToSet('x', [1, 2, 3]).hashCode() == addEachToSet('x', [1, 2, 3]).hashCode()
+    }
+
+    def 'should test equals for PushUpdate'() {
+        expect:
+        pushEach('x', [1, 2, 3], new PushOptions()).equals(pushEach('x', [1, 2, 3], new PushOptions()))
+        pushEach('x', [parse('{score : 89}'), parse('{score : 65}')],
+                new PushOptions().position(0).slice(3).sortDocument(parse('{score : -1}')))
+        .equals(pushEach('x', [parse('{score : 89}'), parse('{score : 65}')],
+                new PushOptions().position(0).slice(3).sortDocument(parse('{score : -1}'))))
+
+        pushEach('x', [89, 65],
+                new PushOptions().position(0).slice(3).sort(-1))
+        .equals(pushEach('x', [89, 65],
+                new PushOptions().position(0).slice(3).sort(-1)))
+    }
+
+    def 'should test hashCode for PushUpdate'() {
+        expect:
+        pushEach('x', [1, 2, 3], new PushOptions()).hashCode() == pushEach('x', [1, 2, 3], new PushOptions()).hashCode()
+        pushEach('x', [parse('{score : 89}'), parse('{score : 65}')],
+                new PushOptions().position(0).slice(3).sortDocument(parse('{score : -1}'))).hashCode() ==
+                pushEach('x', [parse('{score : 89}'), parse('{score : 65}')],
+                new PushOptions().position(0).slice(3).sortDocument(parse('{score : -1}'))).hashCode()
+
+        pushEach('x', [89, 65],
+                new PushOptions().position(0).slice(3).sort(-1)).hashCode() ==
+                pushEach('x', [89, 65], new PushOptions().position(0).slice(3).sort(-1)).hashCode()
     }
 
+    def 'should test equals for PullAllUpdate'() {
+        expect:
+        pullAll('x', []).equals(pullAll('x', []))
+        pullAll('x', [1, 2, 3]).equals(pullAll('x', [1, 2, 3]))
+    }
+
+    def 'should test hashCode for PullAllUpdate'() {
+        expect:
+        pullAll('x', []).hashCode() == pullAll('x', []).hashCode()
+        pullAll('x', [1, 2, 3]).hashCode() == pullAll('x', [1, 2, 3]).hashCode()
+    }
+
+    def 'should test equals for CompositeUpdate'() {
+        expect:
+        combine(set('x', 1)).equals(combine(set('x', 1)))
+        combine(set('x', 1), set('y', 2)).equals(combine(set('x', 1), set('y', 2)))
+        combine(set('x', 1), set('x', 2)).equals(combine(set('x', 1), set('x', 2)))
+        combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4))
+                .equals(combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4)))
+
+        combine(combine(set('x', 1))).equals(combine(combine(set('x', 1))))
+        combine(combine(set('x', 1), set('y', 2))).equals(combine(combine(set('x', 1), set('y', 2))))
+        combine(combine(set('x', 1), set('x', 2))).equals(combine(combine(set('x', 1), set('x', 2))))
+
+        combine(combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4)))
+                .equals(combine(combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4))))
+    }
+
+    def 'should test hashCode for CompositeUpdate'() {
+        expect:
+        combine(set('x', 1)).hashCode() == combine(set('x', 1)).hashCode()
+        combine(set('x', 1), set('y', 2)).hashCode() == combine(set('x', 1), set('y', 2)).hashCode()
+        combine(set('x', 1), set('x', 2)).equals(combine(set('x', 1), set('x', 2)))
+        combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4)).hashCode() ==
+                combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4)).hashCode()
+
+        combine(combine(set('x', 1))).hashCode() == combine(combine(set('x', 1))).hashCode()
+        combine(combine(set('x', 1), set('y', 2))).hashCode() == combine(combine(set('x', 1), set('y', 2))).hashCode()
+        combine(combine(set('x', 1), set('x', 2))).hashCode() == combine(combine(set('x', 1), set('x', 2))).hashCode()
+
+        combine(combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4))).hashCode() ==
+                combine(combine(set('x', 1), inc('z', 3), set('y', 2), inc('a', 4))).hashCode()
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/ValidationActionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/ValidationActionSpecification.groovy
index 24487a11d93..e3378507c3b 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/ValidationActionSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/ValidationActionSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/ValidationLevelSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/ValidationLevelSpecification.groovy
index ed68b04a625..86cbfc6f88d 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/ValidationLevelSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/ValidationLevelSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/changestream/ChangeStreamDocumentCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/changestream/ChangeStreamDocumentCodecSpecification.groovy
new file mode 100644
index 00000000000..6bcf81be2e0
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/changestream/ChangeStreamDocumentCodecSpecification.groovy
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream
+
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.BsonInt64
+import org.bson.BsonReader
+import org.bson.BsonTimestamp
+import org.bson.Document
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.ValueCodecProvider
+import spock.lang.Specification
+
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+
+class ChangeStreamDocumentCodecSpecification extends Specification {
+
+    def 'should round trip ChangeStreamDocument successfully'() {
+        given:
+        def codecRegistry = fromProviders([new DocumentCodecProvider(), new ValueCodecProvider()])
+        def codec = new ChangeStreamDocumentCodec(clazz, codecRegistry)
+
+        when:
+        def writer = new BsonDocumentWriter(new BsonDocument())
+        codec.encode(writer, changeStreamDocument, EncoderContext.builder().build())
+
+        then:
+        BsonDocument.parse(json) == writer.getDocument()
+
+        BsonReader bsonReader = new BsonDocumentReader(writer.getDocument())
+        ChangeStreamDocument actual = codec.decode(bsonReader, DecoderContext.builder().build())
+
+        then:
+        changeStreamDocument == actual
+
+        where:
+        changeStreamDocument << [
+                new ChangeStreamDocument<Document>(OperationType.INSERT,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        null,
+                        Document.parse('{_id: 1, userName: "alice123", name: "Alice"}'),
+                        BsonDocument.parse('{userName: "alice123", _id: 1}'),
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        null
+                ),
+                new ChangeStreamDocument<Document>(OperationType.UPDATE,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        null,
+                        null,
+                        BsonDocument.parse('{_id: 1}'),
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        new UpdateDescription(['phoneNumber'], BsonDocument.parse('{email: "alice@10gen.com"}'))
+                ),
+                new ChangeStreamDocument<Document>(OperationType.UPDATE,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        null,
+                        Document.parse('{_id: 1, userName: "alice123", name: "Alice"}'),
+                        BsonDocument.parse('{_id: 1}'),
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        new UpdateDescription(['phoneNumber'], BsonDocument.parse('{email: "alice@10gen.com"}'))
+                ),
+                new ChangeStreamDocument<Document>(OperationType.REPLACE,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        null,
+                        Document.parse('{_id: 1, userName: "alice123", name: "Alice"}'),
+                        BsonDocument.parse('{_id: 1}'),
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        null
+                ),
+                new ChangeStreamDocument<Document>(OperationType.DELETE,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        null,
+                        null,
+                        BsonDocument.parse('{_id: 1}'),
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        null
+                ),
+                new ChangeStreamDocument<Document>(OperationType.DROP,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        null,
+                        null,
+                        null,
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        null
+                ),
+                new ChangeStreamDocument<Document>(OperationType.RENAME,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        BsonDocument.parse('{db: "engineering", coll: "people"}'),
+                        null,
+                        null,
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        null
+                ),
+                new ChangeStreamDocument<Document>(OperationType.DROP_DATABASE,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering"}'),
+                        null,
+                        null,
+                        null,
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        null
+                ),
+                new ChangeStreamDocument<Document>(OperationType.INVALIDATE,
+                        BsonDocument.parse('{token: true}'),
+                        null,
+                        null,
+                        null,
+                        null,
+                        new BsonTimestamp(1234, 2)
+                        ,
+                        null
+                ),
+                new ChangeStreamDocument<Document>(OperationType.INSERT,
+                        BsonDocument.parse('{token: true}'),
+                        BsonDocument.parse('{db: "engineering", coll: "users"}'),
+                        null,
+                        Document.parse('{_id: 1, userName: "alice123", name: "Alice"}'),
+                        BsonDocument.parse('{userName: "alice123", _id: 1}'),
+                        new BsonTimestamp(1234, 2),
+                        null,
+                        new BsonInt64(1),
+                        BsonDocument.parse('{id: 1, uid: 2}')
+                ),
+        ]
+        clazz << [Document, Document, Document, Document, Document, Document, Document, Document, Document, Document
+        ]
+        json << [
+                '''
+{
+   _id: { token : true },
+   operationType: 'insert',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   },
+   documentKey: {
+      userName: 'alice123',
+      _id: 1
+   },
+   fullDocument: {
+      _id: 1,
+      userName: 'alice123',
+      name: 'Alice'
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'update',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   },
+   documentKey: {
+      _id: 1
+   },
+   updateDescription: {
+      updatedFields: {
+         email: 'alice@10gen.com'
+      },
+      removedFields: ['phoneNumber']
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'update',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   },
+   documentKey: {
+      _id: 1
+   },
+   updateDescription: {
+      updatedFields: {
+         email: 'alice@10gen.com'
+      },
+      removedFields: ['phoneNumber']
+   },
+   fullDocument: {
+      _id: 1,
+      name: 'Alice',
+      userName: 'alice123'
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'replace',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   },
+   documentKey: {
+      _id: 1
+   },
+   fullDocument: {
+      _id: 1,
+      userName: 'alice123',
+      name: 'Alice'
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'delete',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   },
+   documentKey: {
+      _id: 1
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'drop',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'rename',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   },
+   to: {
+      db: 'engineering',
+      coll: 'people'
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'dropDatabase',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering'
+   }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'invalidate',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } }
+}
+''',
+                '''
+{
+   _id: { token : true },
+   operationType: 'insert',
+   clusterTime: { "$timestamp" : { "t" : 1234, "i" : 2 } },
+   ns: {
+      db: 'engineering',
+      coll: 'users'
+   },
+   documentKey: {
+      userName: 'alice123',
+      _id: 1
+   },
+   fullDocument: {
+      _id: 1,
+      userName: 'alice123',
+      name: 'Alice'
+   },
+   txnNumber: NumberLong('1'),
+   lsid: {
+      id: 1,
+      uid: 2
+   }
+}
+''',
+        ]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/changestream/ChangeStreamDocumentSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/changestream/ChangeStreamDocumentSpecification.groovy
new file mode 100644
index 00000000000..a89494160ad
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/changestream/ChangeStreamDocumentSpecification.groovy
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream
+
+import com.mongodb.MongoNamespace
+import org.bson.BsonDocument
+import org.bson.BsonInt64
+import org.bson.BsonTimestamp
+import org.bson.RawBsonDocument
+import spock.lang.Specification
+
+class ChangeStreamDocumentSpecification extends Specification {
+
+    def 'should initialize correctly'() {
+        given:
+        def resumeToken = RawBsonDocument.parse('{token: true}')
+        def namespaceDocument = BsonDocument.parse('{db: "databaseName", coll: "collectionName"}')
+        def namespace = new MongoNamespace('databaseName.collectionName')
+        def destinationNamespaceDocument = BsonDocument.parse('{db: "databaseName2", coll: "collectionName2"}')
+        def destinationNamespace = new MongoNamespace('databaseName2.collectionName2')
+        def fullDocument = BsonDocument.parse('{key: "value for fullDocument"}')
+        def documentKey = BsonDocument.parse('{_id : 1}')
+        def clusterTime = new BsonTimestamp(1234, 2)
+        def operationType = OperationType.UPDATE
+        def updateDesc = new UpdateDescription(['a', 'b'], BsonDocument.parse('{c: 1}'))
+        def txnNumber = new BsonInt64(1);
+        def lsid = BsonDocument.parse('{id: 1, uid: 1}');
+
+        when:
+        def changeStreamDocument = new ChangeStreamDocument<BsonDocument>(operationType, resumeToken, namespaceDocument,
+                destinationNamespaceDocument, fullDocument, documentKey, clusterTime, updateDesc)
+
+        then:
+        changeStreamDocument.getResumeToken() == resumeToken
+        changeStreamDocument.getFullDocument() == fullDocument
+        changeStreamDocument.getDocumentKey() == documentKey
+        changeStreamDocument.getClusterTime() == clusterTime
+        changeStreamDocument.getNamespace() == namespace
+        changeStreamDocument.getNamespaceDocument() == namespaceDocument
+        changeStreamDocument.getDestinationNamespace() == destinationNamespace
+        changeStreamDocument.getDestinationNamespaceDocument() == destinationNamespaceDocument
+        changeStreamDocument.getOperationType() == operationType
+        changeStreamDocument.getUpdateDescription() == updateDesc
+        changeStreamDocument.getDatabaseName() == namespace.getDatabaseName()
+        changeStreamDocument.getTxnNumber() == null
+        changeStreamDocument.getLsid() == null
+
+        when:
+        def changeStreamDocumentWithTxnInfo = new ChangeStreamDocument<BsonDocument>(operationType, resumeToken,
+                namespaceDocument, destinationNamespaceDocument, fullDocument, documentKey, clusterTime, updateDesc,
+                txnNumber, lsid)
+
+        then:
+        changeStreamDocumentWithTxnInfo.getResumeToken() == resumeToken
+        changeStreamDocumentWithTxnInfo.getFullDocument() == fullDocument
+        changeStreamDocumentWithTxnInfo.getDocumentKey() == documentKey
+        changeStreamDocumentWithTxnInfo.getClusterTime() == clusterTime
+        changeStreamDocumentWithTxnInfo.getNamespace() == namespace
+        changeStreamDocumentWithTxnInfo.getNamespaceDocument() == namespaceDocument
+        changeStreamDocumentWithTxnInfo.getDestinationNamespace() == destinationNamespace
+        changeStreamDocumentWithTxnInfo.getDestinationNamespaceDocument() == destinationNamespaceDocument
+        changeStreamDocumentWithTxnInfo.getOperationType() == operationType
+        changeStreamDocumentWithTxnInfo.getUpdateDescription() == updateDesc
+        changeStreamDocumentWithTxnInfo.getDatabaseName() == namespace.getDatabaseName()
+        changeStreamDocumentWithTxnInfo.getTxnNumber() == txnNumber
+        changeStreamDocumentWithTxnInfo.getLsid() == lsid
+
+        when:
+        def changeStreamDocumentFromNamespace = new ChangeStreamDocument<BsonDocument>(resumeToken, namespace, fullDocument,
+                documentKey, clusterTime, operationType, updateDesc)
+
+        then:
+        changeStreamDocumentFromNamespace.getResumeToken() == resumeToken
+        changeStreamDocumentFromNamespace.getFullDocument() == fullDocument
+        changeStreamDocumentFromNamespace.getDocumentKey() == documentKey
+        changeStreamDocumentFromNamespace.getClusterTime() == clusterTime
+        changeStreamDocumentFromNamespace.getNamespace() == namespace
+        changeStreamDocumentFromNamespace.getOperationType() == operationType
+        changeStreamDocumentFromNamespace.getUpdateDescription() == updateDesc
+        changeStreamDocumentFromNamespace.getDatabaseName() == namespace.getDatabaseName()
+        changeStreamDocumentFromNamespace.getNamespaceDocument() == namespaceDocument
+        changeStreamDocumentFromNamespace.getDestinationNamespaceDocument() == null
+        changeStreamDocumentFromNamespace.getTxnNumber() == null
+        changeStreamDocumentFromNamespace.getLsid() == null
+    }
+
+    def 'should handle null namespace correctly'() {
+        given:
+        def resumeToken = RawBsonDocument.parse('{token: true}')
+        def fullDocument = BsonDocument.parse('{key: "value for fullDocument"}')
+        def documentKey = BsonDocument.parse('{_id : 1}')
+        def clusterTime = new BsonTimestamp(1234, 2)
+        def operationType = OperationType.DROP_DATABASE
+        def updateDesc = new UpdateDescription(['a', 'b'], BsonDocument.parse('{c: 1}'))
+        def changeStreamDocumentNullNamespace = new ChangeStreamDocument<BsonDocument>(operationType, resumeToken, (BsonDocument) null,
+                (BsonDocument) null, fullDocument, documentKey, clusterTime, updateDesc)
+
+        expect:
+        changeStreamDocumentNullNamespace.getDatabaseName() == null
+        changeStreamDocumentNullNamespace.getNamespace() == null
+        changeStreamDocumentNullNamespace.getNamespaceDocument() == null
+        changeStreamDocumentNullNamespace.getDestinationNamespace() == null
+        changeStreamDocumentNullNamespace.getDestinationNamespaceDocument() == null
+    }
+
+    def 'should return null on missing BsonDocument elements'() {
+        given:
+        def resumeToken = RawBsonDocument.parse('{token: true}')
+        def namespaceDocument = BsonDocument.parse('{db: "databaseName"}')
+        def namespaceDocumentEmpty = new BsonDocument()
+        def fullDocument = BsonDocument.parse('{key: "value for fullDocument"}')
+        def documentKey = BsonDocument.parse('{_id : 1}')
+        def clusterTime = new BsonTimestamp(1234, 2)
+        def operationType = OperationType.DROP_DATABASE
+        def updateDesc = new UpdateDescription(['a', 'b'], BsonDocument.parse('{c: 1}'))
+
+        def changeStreamDocument = new ChangeStreamDocument<BsonDocument>(operationType, resumeToken, namespaceDocument,
+                (BsonDocument) null, fullDocument, documentKey, clusterTime, updateDesc)
+        def changeStreamDocumentEmptyNamespace = new ChangeStreamDocument<BsonDocument>(operationType, resumeToken,
+                namespaceDocumentEmpty, (BsonDocument) null, fullDocument, documentKey, clusterTime, updateDesc)
+
+        expect:
+        changeStreamDocument.getNamespace() == null
+        changeStreamDocument.getDatabaseName() == 'databaseName'
+
+        changeStreamDocumentEmptyNamespace.getNamespace() == null
+        changeStreamDocumentEmptyNamespace.getDatabaseName() == null
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/changestream/FullDocumentSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/changestream/FullDocumentSpecification.groovy
new file mode 100644
index 00000000000..07cbc04b3ea
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/changestream/FullDocumentSpecification.groovy
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream
+
+import spock.lang.Specification
+
+class FullDocumentSpecification extends Specification {
+
+    def 'should return the expected string value'() {
+        expect:
+        fullDocument.getValue() == expectedString
+
+        where:
+        fullDocument               | expectedString
+        FullDocument.DEFAULT       | 'default'
+        FullDocument.UPDATE_LOOKUP | 'updateLookup'
+    }
+
+    def 'should support valid string representations'() {
+        expect:
+        FullDocument.fromString(stringValue) == fullDocument
+
+        where:
+        fullDocument               | stringValue
+        FullDocument.DEFAULT       | 'default'
+        FullDocument.UPDATE_LOOKUP | 'updateLookup'
+    }
+
+    def 'should throw an illegal argument exception for invalid values'() {
+        when:
+        FullDocument.fromString(stringValue)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        stringValue << [null, 'info']
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/changestream/OperationTypeCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/changestream/OperationTypeCodecSpecification.groovy
new file mode 100644
index 00000000000..ff3e88eaf7b
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/changestream/OperationTypeCodecSpecification.groovy
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream
+
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.BsonReader
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import spock.lang.Specification
+
+class OperationTypeCodecSpecification extends Specification {
+
+    def 'should round trip OperationType successfully'() {
+        when:
+        def codec = new OperationTypeCodec()
+
+        then:
+        codec.getEncoderClass() == OperationType
+
+        when:
+        def writer = new BsonDocumentWriter(new BsonDocument())
+        writer.writeStartDocument()
+        writer.writeName('operationType')
+        codec.encode(writer, operationType, EncoderContext.builder().build())
+        writer.writeEndDocument()
+
+        then:
+        operationType.getValue() == writer.getDocument().getString('operationType').getValue()
+
+        when:
+        BsonReader bsonReader = new BsonDocumentReader(writer.getDocument())
+        bsonReader.readStartDocument()
+        bsonReader.readName()
+        OperationType actual = codec.decode(bsonReader, DecoderContext.builder().build())
+
+        then:
+        operationType == actual
+
+        where:
+        operationType << [
+                OperationType.DELETE,
+                OperationType.INSERT,
+                OperationType.INVALIDATE,
+                OperationType.REPLACE,
+                OperationType.UPDATE
+        ]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/changestream/OperationTypeSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/changestream/OperationTypeSpecification.groovy
new file mode 100644
index 00000000000..b659e00f725
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/changestream/OperationTypeSpecification.groovy
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream
+
+import spock.lang.Specification
+
+class OperationTypeSpecification extends Specification {
+
+    def 'should return the expected string value'() {
+        expect:
+        operationType.getValue() == expectedString
+
+        where:
+        operationType               | expectedString
+        OperationType.DELETE        | 'delete'
+        OperationType.DROP          | 'drop'
+        OperationType.DROP_DATABASE | 'dropDatabase'
+        OperationType.INSERT        | 'insert'
+        OperationType.INVALIDATE    | 'invalidate'
+        OperationType.OTHER         | 'other'
+        OperationType.RENAME        | 'rename'
+        OperationType.REPLACE       | 'replace'
+        OperationType.UPDATE        | 'update'
+    }
+
+    def 'should support valid string representations'() {
+        expect:
+        OperationType.fromString(stringValue) == operationType
+
+        where:
+        operationType               | stringValue
+        OperationType.DELETE        | 'delete'
+        OperationType.DROP          | 'drop'
+        OperationType.DROP_DATABASE | 'dropDatabase'
+        OperationType.INSERT        | 'insert'
+        OperationType.INVALIDATE    | 'invalidate'
+        OperationType.OTHER         | 'other'
+        OperationType.REPLACE       | 'replace'
+        OperationType.UPDATE        | 'update'
+    }
+
+    def 'should return UNKNOWN for new / unknown values'() {
+        expect:
+        OperationType.fromString(stringValue) == OperationType.OTHER
+
+        where:
+        stringValue << [null, 'info', 'reIndex']
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/changestream/UpdateDescriptionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/changestream/UpdateDescriptionSpecification.groovy
new file mode 100644
index 00000000000..e25e4a44df2
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/changestream/UpdateDescriptionSpecification.groovy
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.changestream
+
+import org.bson.BsonDocument
+import spock.lang.Specification
+
+class UpdateDescriptionSpecification extends Specification {
+
+    def 'should create the expected UpdateDescription'() {
+       when:
+       def description = new UpdateDescription(removedFields, updatedFields)
+
+        then:
+        description.getRemovedFields() == removedFields
+        description.getUpdatedFields() == updatedFields
+
+        where:
+        removedFields | updatedFields
+        ['a', 'b']    | null
+        null          | BsonDocument.parse('{c: 1}')
+        ['a', 'b']    | BsonDocument.parse('{c: 1}')
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/GeometryCollectionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/GeometryCollectionSpecification.groovy
index 93f4054d4f3..eebf63b71d1 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/GeometryCollectionSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/GeometryCollectionSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,6 +59,5 @@ class GeometryCollectionSpecification extends Specification {
         new GeometryCollection(geometries).hashCode() == new GeometryCollection(geometries).hashCode()
         new GeometryCollection(geometries).toString() ==
         'GeometryCollection{geometries=[Point{coordinate=Position{values=[1.0, 2.0]}}, Point{coordinate=Position{values=[2.0, 2.0]}}]}'
-
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/LineStringSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/LineStringSpecification.groovy
index 6ac346fa5b4..410ea241f13 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/LineStringSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/LineStringSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiLineStringSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiLineStringSpecification.groovy
index fe290c61720..e5119c58cf7 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiLineStringSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiLineStringSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,6 +69,5 @@ class MultiLineStringSpecification extends Specification {
         'MultiLineString{coordinates=[' +
         '[Position{values=[1.0, 1.0]}, Position{values=[2.0, 2.0]}, Position{values=[3.0, 4.0]}], ' +
         '[Position{values=[2.0, 3.0]}, Position{values=[3.0, 2.0]}, Position{values=[4.0, 4.0]}]]}'
-
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPointSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPointSpecification.groovy
index a4c5d3b443a..3c93dea30ab 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPointSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPointSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPolygonSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPolygonSpecification.groovy
index 4c2d24111d7..4877339286e 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPolygonSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/MultiPolygonSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/PointSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/PointSpecification.groovy
index b0ac1c04169..af4762f760d 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/PointSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/PointSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/PolygonSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/PolygonSpecification.groovy
index a34a7546764..4eaa6bc5689 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/PolygonSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/PolygonSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/PositionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/PositionSpecification.groovy
index 019489ec209..d1ea6ab9147 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/PositionSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/PositionSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCodecSpecification.groovy
new file mode 100644
index 00000000000..6891a71fe0d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCodecSpecification.groovy
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs
+
+import com.mongodb.client.model.geojson.GeoJsonObjectType
+import com.mongodb.client.model.geojson.Geometry
+import com.mongodb.client.model.geojson.GeometryCollection
+import com.mongodb.client.model.geojson.LineString
+import com.mongodb.client.model.geojson.MultiLineString
+import com.mongodb.client.model.geojson.MultiPoint
+import com.mongodb.client.model.geojson.MultiPolygon
+import com.mongodb.client.model.geojson.Point
+import com.mongodb.client.model.geojson.Polygon
+import com.mongodb.client.model.geojson.PolygonCoordinates
+import com.mongodb.client.model.geojson.Position
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static org.bson.BsonDocument.parse
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+
+class GeometryCodecSpecification extends Specification {
+    def registry = fromProviders([new GeoJsonCodecProvider()])
+    def codec = registry.get(Geometry)
+    def writer = new BsonDocumentWriter(new BsonDocument())
+    def context = EncoderContext.builder().build()
+
+    def 'should round trip known geometries'() {
+        when:
+        codec.encode(writer, geometry, context)
+
+        then:
+        writer.document == parse(geoJson)
+
+        when:
+        def decodedGeometry = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        geometry == decodedGeometry
+
+        where:
+        geometry << [
+                new LineString([new Position(101d, 0d), new Position(102d, 1d)]),
+                new MultiLineString([[new Position([1.0d, 1.0d]), new Position([2.0d, 2.0d]), new Position([3.0d, 4.0d])],
+                                     [new Position([2.0d, 3.0d]), new Position([3.0d, 2.0d]), new Position([4.0d, 4.0d])]]),
+                new Point(new Position(100d, 0d)),
+                new MultiPoint([new Position([40.0d, 18.0d]), new Position([40.0d, 19.0d]), new Position([41.0d, 19.0d])]),
+                new Polygon([new Position([40.0d, 18.0d]), new Position([40.0d, 19.0d]), new Position([41.0d, 19.0d]),
+                             new Position([40.0d, 18.0d])]),
+                new MultiPolygon([new PolygonCoordinates([new Position(102.0, 2.0), new Position(103.0, 2.0),
+                                                          new Position(103.0, 3.0), new Position(102.0, 3.0),
+                                                          new Position(102.0, 2.0)]),
+                                  new PolygonCoordinates([new Position(100.0, 0.0), new Position(101.0, 0.0),
+                                                          new Position(101.0, 1.0), new Position(100.0, 1.0),
+                                                          new Position(100.0, 0.0)],
+                                          [new Position(100.2, 0.2), new Position(100.8, 0.2),
+                                           new Position(100.8, 0.8), new Position(100.2, 0.8),
+                                           new Position(100.2, 0.2)])]),
+                new GeometryCollection([new Point(new Position(100d, 0d)),
+                                        new LineString([new Position(101d, 0d), new Position(102d, 1d)])])
+        ]
+
+        geoJson << [
+                '{type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}',
+                '{type: "MultiLineString", coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]]}',
+                '{type: "Point", coordinates: [100.0, 0.0]}',
+                '{type: "MultiPoint", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]]}',
+                '{type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]}',
+                '''{type: "MultiPolygon", coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                                                     [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                                                      [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]}''',
+                '''{ type: "GeometryCollection", geometries: [{ type: "Point", coordinates: [100.0, 0.0]},
+                                                           { type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}]}'''
+        ]
+    }
+
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "GeoShard", coordinates: [100.0, 0.0]}',
+                '{coordinates: [100.0, 0.0]}',
+                '{type: "Point", coordinates: [40.0, 18.0], crs : {type: "link", properties: {href: "http://example.com/crs/42"}}}',
+        ]
+    }
+
+    def 'should not support unknown geometries'() {
+        given:
+        def geometry = new Geometry() {
+            @Override
+            GeoJsonObjectType getType() {
+                GeoJsonObjectType.POINT
+            }
+        }
+
+
+        when:
+        codec.encode(writer, geometry, context)
+
+        then:
+        thrown(CodecConfigurationException)
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodecSpecification.groovy
index b6a422d5583..1ccb978781b 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/GeometryCollectionCodecSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,11 +18,19 @@ package com.mongodb.client.model.geojson.codecs
 
 import com.mongodb.client.model.geojson.GeometryCollection
 import com.mongodb.client.model.geojson.LineString
+import com.mongodb.client.model.geojson.MultiLineString
+import com.mongodb.client.model.geojson.MultiPoint
+import com.mongodb.client.model.geojson.MultiPolygon
 import com.mongodb.client.model.geojson.Point
+import com.mongodb.client.model.geojson.Polygon
+import com.mongodb.client.model.geojson.PolygonCoordinates
 import com.mongodb.client.model.geojson.Position
 import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -33,37 +43,146 @@ class GeometryCollectionCodecSpecification extends Specification {
     def writer = new BsonDocumentWriter(new BsonDocument())
     def context = EncoderContext.builder().build()
 
-    def 'should encode'() {
+    def 'should accept empty geometries'() {
+        def geometryCollection = new GeometryCollection([])
+
+        when:
+        codec.encode(writer, geometryCollection, context)
+
+        then:
+        writer.document == parse('{ type: "GeometryCollection", geometries: []}')
+
+        when:
+        def decodedGeometryCollection = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        geometryCollection == decodedGeometryCollection
+    }
+
+    def 'should round trip'() {
         given:
-        def geometryCollection = new GeometryCollection([new Point(new Position(100d, 0d)),
-                                                         new LineString([new Position(101d, 0d), new Position(102d, 1d)])])
+        def geometryCollection = new GeometryCollection([
+                new LineString([new Position(101d, 0d), new Position(102d, 1d)]),
+                new MultiLineString([[new Position([1.0d, 1.0d]), new Position([2.0d, 2.0d]), new Position([3.0d, 4.0d])],
+                                     [new Position([2.0d, 3.0d]), new Position([3.0d, 2.0d]), new Position([4.0d, 4.0d])]]),
+                new Point(new Position(100d, 0d)),
+                new MultiPoint([new Position([40.0d, 18.0d]), new Position([40.0d, 19.0d]), new Position([41.0d, 19.0d])]),
+                new Polygon([new Position([40.0d, 18.0d]), new Position([40.0d, 19.0d]), new Position([41.0d, 19.0d]),
+                             new Position([40.0d, 18.0d])]),
+                new MultiPolygon([new PolygonCoordinates([new Position(102.0, 2.0), new Position(103.0, 2.0),
+                                                          new Position(103.0, 3.0), new Position(102.0, 3.0),
+                                                          new Position(102.0, 2.0)]),
+                                  new PolygonCoordinates([new Position(100.0, 0.0), new Position(101.0, 0.0),
+                                                          new Position(101.0, 1.0), new Position(100.0, 1.0),
+                                                          new Position(100.0, 0.0)],
+                                          [new Position(100.2, 0.2), new Position(100.8, 0.2),
+                                           new Position(100.8, 0.8), new Position(100.2, 0.8),
+                                           new Position(100.2, 0.2)])]),
+                new GeometryCollection([new Point(new Position(100d, 0d)),
+                                        new LineString([new Position(101d, 0d), new Position(102d, 1d)])])
+        ])
 
         when:
         codec.encode(writer, geometryCollection, context)
 
         then:
-        writer.document == parse('{ type: "GeometryCollection",' +
-                                 '    geometries: [' +
-                                 '      { type: "Point", coordinates: [100.0, 0.0]},' +
-                                 '      { type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}' +
-                                 '    ]}')
+        writer.document == parse('''{ type: "GeometryCollection", geometries: [
+                {type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]},
+                {type: "MultiLineString", coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]]},
+                {type: "Point", coordinates: [100.0, 0.0]},
+                {type: "MultiPoint", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]]},
+                {type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]},
+                {type: "MultiPolygon", coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                                                     [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                                                     [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]},
+                { type: "GeometryCollection", geometries: [{ type: "Point", coordinates: [100.0, 0.0]},
+                    { type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}]}
+         ]}''')
+
+
+        when:
+        def decodedGeometryCollection = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        geometryCollection == decodedGeometryCollection
     }
 
-    def 'should encode with coordinate reference system'() {
+    def 'should round trip with coordinate reference system'() {
         given:
-        def geometryCollection = new GeometryCollection(EPSG_4326_STRICT_WINDING,
-                                                        [new Point(new Position(100d, 0d)),
-                                                         new LineString([new Position(101d, 0d), new Position(102d, 1d)])])
+        def geometryCollection = new GeometryCollection(EPSG_4326_STRICT_WINDING, [
+                new LineString([new Position(101d, 0d), new Position(102d, 1d)]),
+                new MultiLineString([[new Position([1.0d, 1.0d]), new Position([2.0d, 2.0d]), new Position([3.0d, 4.0d])],
+                                     [new Position([2.0d, 3.0d]), new Position([3.0d, 2.0d]), new Position([4.0d, 4.0d])]]),
+                new Point(new Position(100d, 0d)),
+                new MultiPoint([new Position([40.0d, 18.0d]), new Position([40.0d, 19.0d]), new Position([41.0d, 19.0d])]),
+                new Polygon([new Position([40.0d, 18.0d]), new Position([40.0d, 19.0d]), new Position([41.0d, 19.0d]),
+                             new Position([40.0d, 18.0d])]),
+                new MultiPolygon([new PolygonCoordinates([new Position(102.0, 2.0), new Position(103.0, 2.0),
+                                                          new Position(103.0, 3.0), new Position(102.0, 3.0),
+                                                          new Position(102.0, 2.0)]),
+                                  new PolygonCoordinates([new Position(100.0, 0.0), new Position(101.0, 0.0),
+                                                          new Position(101.0, 1.0), new Position(100.0, 1.0),
+                                                          new Position(100.0, 0.0)],
+                                          [new Position(100.2, 0.2), new Position(100.8, 0.2),
+                                           new Position(100.8, 0.8), new Position(100.2, 0.8),
+                                           new Position(100.2, 0.2)])]),
+                new GeometryCollection([new Point(new Position(100d, 0d)),
+                                        new LineString([new Position(101d, 0d), new Position(102d, 1d)])])
+        ])
 
         when:
         codec.encode(writer, geometryCollection, context)
 
         then:
-        writer.document == parse('{ type: "GeometryCollection",' +
-                                 '    geometries: [' +
-                                 '      { type: "Point", coordinates: [100.0, 0.0]},' +
-                                 '      { type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}, ' +
-                                 '    ]' +
-                                 "   crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}")
+        writer.document == parse("""{ type: "GeometryCollection", geometries: [
+                {type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]},
+                {type: "MultiLineString", coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]]},
+                {type: "Point", coordinates: [100.0, 0.0]},
+                {type: "MultiPoint", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]]},
+                {type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]},
+                {type: "MultiPolygon", coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                                                     [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                                                     [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]},
+                { type: "GeometryCollection", geometries: [{ type: "Point", coordinates: [100.0, 0.0]},
+                    { type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}]}],
+            crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}""")
+
+        when:
+        def decodedGeometryCollection = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        geometryCollection == decodedGeometryCollection
+    }
+
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{ type: "GeometryCollect"}',
+                '''{ geometries: [{ type: "Point", coordinates: [100.0, 0.0]},
+                                  { type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}]}''',
+                '''{ type: "GeometryCollect",
+                     geometries: [{ type: "Point", coordinates: [100.0, 0.0]},
+                                  { type: "LineString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}]}''',
+                '''{ type: "GeometryCollection", geometries: [[]]}''',
+                '''{ type: "GeometryCollect",
+                     geometries: [{ type: "Paint", coordinates: [100.0, 0.0]},
+                                  { type: "LaneString", coordinates: [ [101.0, 0.0], [102.0, 1.0] ]}]}''',
+                '''{ type: "GeometryCollect",
+                     geometries: [{ coordinates: [100.0, 0.0]}]}''',
+                "{type: 'GeometryCollection', crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}",
+                '''{ type: "GeometryCollection",
+                     geometries: [{ type: "Point", coordinates: [100.0, 0.0]}],
+                     crs : {type: "something"}}''',
+                '''{ type: "GeometryCollection",
+                     geometries: [{ type: "Point", coordinates: [100.0, 0.0]}],
+                     crs : {type: "link", properties: {href: "http://example.com/crs/42"}}}''',
+                '''{ type: "GeometryCollection", geometries: [], abc: 123}'''
+        ]
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/LineStringCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/LineStringCodecSpecification.groovy
index fe45045bb94..ead23f88259 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/LineStringCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/LineStringCodecSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +19,11 @@ package com.mongodb.client.model.geojson.codecs
 import com.mongodb.client.model.geojson.LineString
 import com.mongodb.client.model.geojson.Position
 import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -31,33 +36,68 @@ class LineStringCodecSpecification extends Specification {
     def writer = new BsonDocumentWriter(new BsonDocument())
     def context = EncoderContext.builder().build()
 
-    def 'should encode'() {
+    def 'should round trip'() {
         given:
-        def polygon = new LineString([new Position([40.0d, 18.0d]),
-                                      new Position([40.0d, 19.0d]),
-                                      new Position([41.0d, 19.0d])])
+        def lineString = new LineString([new Position([40.0d, 18.0d]),
+                                         new Position([40.0d, 19.0d]),
+                                         new Position([41.0d, 19.0d])])
+
+        when:
+        codec.encode(writer, lineString, context)
+
+        then:
+        writer.document == parse('{type: "LineString", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]]}')
 
         when:
-        codec.encode(writer, polygon, context)
+        def decodedLineString = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
 
         then:
-        writer.document == parse('{type: \'LineString\', coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]]}')
+        lineString == decodedLineString
     }
 
-    def 'should encode with coordinate reference system'() {
+    def 'should round trip with coordinate reference system'() {
         given:
-        def polygon = new LineString(EPSG_4326_STRICT_WINDING,
-                                     [new Position([40.0d, 20.0d]),
-                                      new Position([40.0d, 40.0d]),
-                                      new Position([20.0d, 40.0d])])
+        def lineString = new LineString(EPSG_4326_STRICT_WINDING,
+                                        [new Position([40.0d, 20.0d]),
+                                         new Position([40.0d, 40.0d]),
+                                         new Position([20.0d, 40.0d])])
 
         when:
-        codec.encode(writer, polygon, context)
+        codec.encode(writer, lineString, context)
 
         then:
-        writer.document == parse('{type: \'LineString\', ' +
-                                 'coordinates: ' +
-                                 '[[40.0, 20.0], [40.0, 40.0], [20.0, 40.0]],' +
-                                 "crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}")
+        writer.document == parse("""{type: "LineString",
+                                 coordinates: [[40.0, 20.0], [40.0, 40.0], [20.0, 40.0]]
+                                 crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}""")
+
+        when:
+        def decodedLineString = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        lineString == decodedLineString
+    }
+
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "lineString"}',
+                '{coordinates: [[40.0, 18.0], [40.0, 19.0]]}',
+                '{type: "lineStr", coordinates: [[40.0, 18.0], [40.0, 19.0]]}',
+                '{type: "lineString", coordinates: [40.0, 18.0]}',
+                '{type: "lineString", coordinates: []}',
+                '{type: "lineString", coordinates: [[]]}',
+                '{type: "lineString", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]}',
+                "{type: 'lineString', crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}",
+                '{type: "lineString", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]], crs : {type: "something"}}',
+                '''{type: "lineString", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]],
+                    crs : {type: "link", properties: {href: "http://example.com/crs/42"}}}''',
+                '{type: "lineString", coordinates: [[40.0, 18.0], [40.0, 19.0]], abc: 123}'
+        ]
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiLineStringCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiLineStringCodecSpecification.groovy
index 0cdcf4c9b3f..5015c387c13 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiLineStringCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiLineStringCodecSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +19,11 @@ package com.mongodb.client.model.geojson.codecs
 import com.mongodb.client.model.geojson.MultiLineString
 import com.mongodb.client.model.geojson.Position
 import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -31,7 +36,7 @@ class MultiLineStringCodecSpecification extends Specification {
     def writer = new BsonDocumentWriter(new BsonDocument())
     def context = EncoderContext.builder().build()
 
-    def 'should encode'() {
+    def 'should round trip'() {
         given:
         def multiLineString = new MultiLineString([[new Position([1.0d, 1.0d]), new Position([2.0d, 2.0d]), new Position([3.0d, 4.0d])],
                                                    [new Position([2.0d, 3.0d]), new Position([3.0d, 2.0d]), new Position([4.0d, 4.0d])]])
@@ -40,12 +45,17 @@ class MultiLineStringCodecSpecification extends Specification {
         codec.encode(writer, multiLineString, context)
 
         then:
-        writer.document == parse('{type: \'MultiLineString\', coordinates: [' +
-                                 '[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], ' +
-                                 '[[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]]}')
+        writer.document == parse('''{type: "MultiLineString",
+            coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]]}''')
+
+        when:
+        def decodedMultiLineString = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        multiLineString == decodedMultiLineString
     }
 
-    def 'should encode with coordinate reference system'() {
+    def 'should round trip with coordinate reference system'() {
         given:
         def multiLineString = new MultiLineString(EPSG_4326_STRICT_WINDING,
                                                   [[new Position([1.0d, 1.0d]), new Position([2.0d, 2.0d]), new Position([3.0d, 4.0d])],
@@ -55,10 +65,34 @@ class MultiLineStringCodecSpecification extends Specification {
         codec.encode(writer, multiLineString, context)
 
         then:
-        writer.document == parse('{type: \'MultiLineString\', ' +
-                                 'coordinates: [' +
-                                 '[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], ' +
-                                 '[[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]], ' +
-                                 "crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}")
+        writer.document == parse("""{type: "MultiLineString",
+            coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]],
+            crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}""")
+
+        when:
+        def decodedMultiLineString = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        multiLineString == decodedMultiLineString
+    }
+
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "MultiLineString"}',
+                '{coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]]}',
+                '{type: "MultiLineStr", coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]]}',
+                '{type: "MultiLineString", coordinates: [40.0, 18.0]}',
+                '{type: "MultiLineString", coordinates: [[[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]]}',
+                "{type: 'MultiLineString', crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}",
+                '{type: "MultiLineString", coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]]], crs : {type: "something"}}',
+                '{type: "MultiLineString", coordinates: [[[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], [[2.0, 3.0], [3.0, 2.0], [4.0, 4.0]]], a: 1}'
+        ]
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPointCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPointCodecSpecification.groovy
index 278d254ae5d..7bf468a2577 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPointCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPointCodecSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +19,11 @@ package com.mongodb.client.model.geojson.codecs
 import com.mongodb.client.model.geojson.MultiPoint
 import com.mongodb.client.model.geojson.Position
 import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -31,33 +36,64 @@ class MultiPointCodecSpecification extends Specification {
     def writer = new BsonDocumentWriter(new BsonDocument())
     def context = EncoderContext.builder().build()
 
-    def 'should encode'() {
+    def 'should round trip'() {
         given:
-        def polygon = new MultiPoint([new Position([40.0d, 18.0d]),
-                                      new Position([40.0d, 19.0d]),
-                                      new Position([41.0d, 19.0d])])
+        def multiPoint = new MultiPoint([new Position([40.0d, 18.0d]),
+                                         new Position([40.0d, 19.0d]),
+                                         new Position([41.0d, 19.0d])])
+
+        when:
+        codec.encode(writer, multiPoint, context)
+
+        then:
+        writer.document == parse('{type: "MultiPoint", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]]}')
 
         when:
-        codec.encode(writer, polygon, context)
+        def decodedMultiPoint = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
 
         then:
-        writer.document == parse('{type: \'MultiPoint\', coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]]}')
+        multiPoint == decodedMultiPoint
     }
 
-    def 'should encode with coordinate reference system'() {
+    def 'should round trip with coordinate reference system'() {
         given:
-        def polygon = new MultiPoint(EPSG_4326_STRICT_WINDING,
-                                     [new Position([40.0d, 20.0d]),
-                                      new Position([40.0d, 40.0d]),
-                                      new Position([20.0d, 40.0d])])
+        def multiPoint = new MultiPoint(EPSG_4326_STRICT_WINDING,
+                                        [new Position([40.0d, 18.0d]),
+                                         new Position([40.0d, 19.0d]),
+                                         new Position([41.0d, 19.0d])])
+
+        when:
+        codec.encode(writer, multiPoint, context)
+
+        then:
+        writer.document == parse("""{type: "MultiPoint", coordinates: [[40.0, 18.0], [40.0, 19.0], [41.0, 19.0]],
+                                           crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}""")
+
+        when:
+        def decodedMultiPoint = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        multiPoint == decodedMultiPoint
+    }
 
+
+    def 'should throw when decoding invalid documents'() {
         when:
-        codec.encode(writer, polygon, context)
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
 
         then:
-        writer.document == parse('{type: \'MultiPoint\', ' +
-                                 'coordinates: ' +
-                                 '[[40.0, 20.0], [40.0, 40.0], [20.0, 40.0]],' +
-                                 "crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}")
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "MultiPoint"}',
+                '{coordinates: [[40.0, 20.0], [40.0, 40.0], [20.0, 40.0]]}',
+                '{type: "MultiPoit", coordinates: [[40.0, 20.0], [40.0, 40.0], [20.0, 40.0]]}',
+                '{type: "MultiPoint", coordinates: [40.0, 18.0]}',
+                '{type: "MultiPoint", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]}',
+                "{type: 'MultiPoint', crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}",
+                '{type: "MultiPoint", coordinates: [[1.0, 1.0], [2.0, 2.0], [3.0, 4.0]], crs : {type: "something"}}',
+                '{type: "MultiPoint", coordinates: [[40.0, 20.0], [40.0, 40.0], [20.0, 40.0]], abc: 123}'
+        ]
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPolygonCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPolygonCodecSpecification.groovy
index 7f5956f8130..2b1351ad1f4 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPolygonCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/MultiPolygonCodecSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,8 +20,11 @@ import com.mongodb.client.model.geojson.MultiPolygon
 import com.mongodb.client.model.geojson.PolygonCoordinates
 import com.mongodb.client.model.geojson.Position
 import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -32,7 +37,7 @@ class MultiPolygonCodecSpecification extends Specification {
     def writer = new BsonDocumentWriter(new BsonDocument())
     def context = EncoderContext.builder().build()
 
-    def 'should encode'() {
+    def 'should round trip'() {
         given:
         def multiMultiPolygon = new MultiPolygon([new PolygonCoordinates([new Position(102.0, 2.0), new Position(103.0, 2.0),
                                                                           new Position(103.0, 3.0), new Position(102.0, 3.0),
@@ -48,16 +53,20 @@ class MultiPolygonCodecSpecification extends Specification {
         codec.encode(writer, multiMultiPolygon, context)
 
         then:
-        writer.document == parse('{ "type": "MultiPolygon",' +
-                                 '    "coordinates": [' +
-                                 '      [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],' +
-                                 '      [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],' +
-                                 '       [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]' +
-                                 '      ]' +
-                                 '    }')
+        writer.document == parse('''{type: "MultiPolygon",
+                coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                              [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                              [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]}''')
+
+
+        when:
+        def decodedMultiMultiPolygon = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        multiMultiPolygon == decodedMultiMultiPolygon
     }
 
-    def 'should encode with coordinate reference system'() {
+    def 'should round trip with coordinate reference system'() {
         given:
         def multiMultiPolygon = new MultiPolygon(EPSG_4326_STRICT_WINDING,
                                                  [new PolygonCoordinates([new Position(102.0, 2.0), new Position(103.0, 2.0),
@@ -74,14 +83,56 @@ class MultiPolygonCodecSpecification extends Specification {
         codec.encode(writer, multiMultiPolygon, context)
 
         then:
-        writer.document == parse('{ "type": "MultiPolygon",' +
-                                 '    "coordinates": [' +
-                                 '      [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],' +
-                                 '      [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],' +
-                                 '       [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]' +
-                                 '      ]' +
-                                 "    \"crs\" : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}" +
-                                 '    }')
+        writer.document == parse("""{ "type": "MultiPolygon",
+                coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                              [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                              [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]],
+                crs: {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}""")
+
+        when:
+        def decodedMultiMultiPolygon = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        multiMultiPolygon == decodedMultiMultiPolygon
+    }
+
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "MultiPolygon"}',
+                '''{coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                              [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                              [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]}''',
+                '''{type: "MultiPolygot",
+                    coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                              [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                              [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]}''',
+                '{type: "MultiPolygon", coordinates: [[[40.0, 18.0], [40.0, 19.0]]]}',
+                '{type: "MultiPolygon", coordinates: []}',
+                '{type: "MultiPolygon", coordinates: [[]]}',
+                '{type: "MultiPolygon", coordinates: [[[]]]}',
+                '{type: "MultiPolygon", coordinates: [[[[]]]]}',
+                '{type: "MultiPolygon", coordinates: [[[[[]]]]]}',
+                "{type: 'MultiPolygon', crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}",
+                '''{type: "MultiPolygot", crs : {type: "something"},
+                    coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                              [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                              [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]}''',
+                '''{type: "MultiPolygot", crs : {type: "link", properties: {href: "http://example.com/crs/42"}},
+                    coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                              [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                              [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]}''',
+                '''{type: "MultiPolygon", abc: 123,
+                    coordinates: [[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                              [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                              [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]]}'''
+        ]
     }
 
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/NamedCoordinateReferenceSystemSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/NamedCoordinateReferenceSystemSpecification.groovy
new file mode 100644
index 00000000000..5f07fa60f55
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/NamedCoordinateReferenceSystemSpecification.groovy
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.geojson.codecs
+
+import com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.CRS_84
+import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326
+import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
+import static org.bson.BsonDocument.parse
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+
+final class NamedCoordinateReferenceSystemSpecification extends Specification {
+    def registry = fromProviders([new GeoJsonCodecProvider()])
+    def codec = registry.get(NamedCoordinateReferenceSystem)
+    def writer = new BsonDocumentWriter(new BsonDocument())
+    def context = EncoderContext.builder().build()
+
+    def 'should round trip'() {
+        when:
+        codec.encode(writer, crs, context)
+
+        then:
+        writer.document == parse( "{type: 'name', properties : {name : '$crs.name'}}")
+
+        when:
+        def decodeCRS = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        crs == decodeCRS
+
+        where:
+        crs << [CRS_84, EPSG_4326, EPSG_4326_STRICT_WINDING]
+    }
+
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "name"}',
+                '{type: "name",  properties : {}}',
+                '{type: "name",  properties : {type: "link", properties: {href: "http://example.com/crs/42"}}}',
+        ]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PointCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PointCodecSpecification.groovy
index d9b64882fd3..1e0924d6fad 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PointCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PointCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,11 @@ package com.mongodb.client.model.geojson.codecs
 import com.mongodb.client.model.geojson.Point
 import com.mongodb.client.model.geojson.Position
 import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -33,7 +36,7 @@ class PointCodecSpecification extends Specification {
     def writer = new BsonDocumentWriter(new BsonDocument())
     def context = EncoderContext.builder().build()
 
-    def 'should encode'() {
+    def 'should round trip'() {
         given:
         def point = new Point(new Position([40.0d, 18.0d]))
 
@@ -41,10 +44,16 @@ class PointCodecSpecification extends Specification {
         codec.encode(writer, point, context)
 
         then:
-        writer.document == parse('{type: \'Point\', coordinates: [40.0, 18.0]}')
+        writer.document == parse('{type: "Point", coordinates: [40.0, 18.0]}')
+
+        when:
+        def decodedPoint = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        point == decodedPoint
     }
 
-    def 'should encode with coordinate reference system'() {
+    def 'should round trip with coordinate reference system'() {
         given:
         def point = new Point(EPSG_4326_STRICT_WINDING, new Position([40.0d, 18.0d]))
 
@@ -52,7 +61,32 @@ class PointCodecSpecification extends Specification {
         codec.encode(writer, point, context)
 
         then:
-        writer.document == parse('{type: \'Point\', coordinates: [40.0, 18.0], ' +
+        writer.document == parse('{type: "Point", coordinates: [40.0, 18.0], ' +
                                  "crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}")
+
+        when:
+        def decodedPoint = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        point == decodedPoint
+    }
+
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "Point"}',
+                '{coordinates: [40.0, 18.0]}',
+                '{type: "Pointer", coordinates: [40.0, 18.0]}',
+                "{type: 'Point', crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}",
+                '{type: "Point", coordinates: [40.0, 18.0], crs : {type: "link", properties: {href: "http://example.com/crs/42"}}}',
+                '{type: "Point", coordinates: [40.0, 18.0], crs : {type: "name", properties: {}}}',
+                '{type: "Point", coordinates: [40.0, 18.0], abc: 123}'
+        ]
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PolygonCodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PolygonCodecSpecification.groovy
index 574a95a5506..5f2e4559700 100644
--- a/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PolygonCodecSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/client/model/geojson/codecs/PolygonCodecSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,11 @@ import com.mongodb.client.model.geojson.Polygon
 import com.mongodb.client.model.geojson.PolygonCoordinates
 import com.mongodb.client.model.geojson.Position
 import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
+import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
+import org.bson.codecs.configuration.CodecConfigurationException
 import spock.lang.Specification
 
 import static com.mongodb.client.model.geojson.NamedCoordinateReferenceSystem.EPSG_4326_STRICT_WINDING
@@ -34,7 +37,7 @@ class PolygonCodecSpecification extends Specification {
     def writer = new BsonDocumentWriter(new BsonDocument())
     def context = EncoderContext.builder().build()
 
-    def 'should encode'() {
+    def 'should round trip'() {
         given:
         def polygon = new Polygon([new Position([40.0d, 18.0d]),
                                    new Position([40.0d, 19.0d]),
@@ -45,10 +48,16 @@ class PolygonCodecSpecification extends Specification {
         codec.encode(writer, polygon, context)
 
         then:
-        writer.document == parse('{type: \'Polygon\', coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]}')
+        writer.document == parse('{type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]}')
+
+        when:
+        def decodedPolygon = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        polygon == decodedPolygon
     }
 
-    def 'should encode with coordinate reference system'() {
+    def 'should round trip with coordinate reference system'() {
         given:
         def polygon = new Polygon(EPSG_4326_STRICT_WINDING,
                                   new PolygonCoordinates([new Position([40.0d, 20.0d]),
@@ -60,13 +69,17 @@ class PolygonCodecSpecification extends Specification {
         codec.encode(writer, polygon, context)
 
         then:
-        writer.document == parse('{type: \'Polygon\', ' +
-                                 'coordinates: [' +
-                                 '[[40.0, 20.0], [40.0, 40.0], [20.0, 40.0], [40.0, 20.0]]],' +
-                                 "crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}")
+        writer.document == parse("""{type: 'Polygon', coordinates: [[[40.0, 20.0], [40.0, 40.0], [20.0, 40.0], [40.0, 20.0]]],
+                                     crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}""")
+
+        when:
+        def decodedPolygon = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        polygon == decodedPolygon
     }
 
-    def 'should encode with holes'() {
+    def 'should round trip with holes'() {
         given:
         def polygon = new Polygon([new Position([40.0d, 20.0d]),
                                    new Position([40.0d, 40.0d]),
@@ -75,17 +88,49 @@ class PolygonCodecSpecification extends Specification {
                                   [new Position([30.0d, 25.0d]),
                                    new Position([30.0d, 35.0d]),
                                    new Position([25.0d, 25.0d]),
-                                   new Position([30.0d, 25.0d])])
+                                   new Position([30.0d, 25.0d])],
+                                  [new Position([36.0d, 37.0d]),
+                                   new Position([36.0d, 37.0d]),
+                                   new Position([37.0d, 37.0d]),
+                                   new Position([36.0d, 37.0d])])
 
         when:
         codec.encode(writer, polygon, context)
 
         then:
-        writer.document == parse('{type: \'Polygon\', ' +
-                                 'coordinates: [' +
-                                 '[[40.0, 20.0], [40.0, 40.0], [20.0, 40.0], [40.0, 20.0]],' +
-                                 '[[30.0, 25.0], [30.0, 35.0], [25.0, 25.0], [30.0, 25.0]]' +
-                                 ']}')
+        writer.document == parse('''{type: 'Polygon', coordinates:
+            [[[40.0, 20.0], [40.0, 40.0], [20.0, 40.0], [40.0, 20.0]],
+             [[30.0, 25.0], [30.0, 35.0], [25.0, 25.0], [30.0, 25.0]],
+             [[36.0, 37.0], [36.0, 37.0], [37.0, 37.0], [36.0, 37.0]]]}''')
+
+        when:
+        def decodedPolygon = codec.decode(new BsonDocumentReader(writer.document), DecoderContext.builder().build())
+
+        then:
+        polygon == decodedPolygon
     }
 
+    def 'should throw when decoding invalid documents'() {
+        when:
+        codec.decode(new BsonDocumentReader(parse(invalidJson)), DecoderContext.builder().build())
+
+        then:
+        thrown(CodecConfigurationException)
+
+        where:
+        invalidJson << [
+                '{type: "Polygon"}',
+                '{coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]}',
+                '{type: "Polygot", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]]}',
+                '{type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0]]]}',
+                '{type: "Polygon", coordinates: []}',
+                '{type: "Polygon", coordinates: [[]]}',
+                '{type: "Polygon", coordinates: [[[]]]}',
+                "{type: 'Polygon', crs : {type: 'name', properties : {name : '$EPSG_4326_STRICT_WINDING.name'}}}",
+                '{type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]], crs : {type: "something"}}',
+                '''{type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]],
+                    crs : {type: "link", properties: {href: "http://example.com/crs/42"}}}''',
+                '{type: "Polygon", coordinates: [[[40.0, 18.0], [40.0, 19.0], [41.0, 19.0], [40.0, 18.0]]], abc: 123}'
+        ]
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactorySpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactorySpecification.groovy
new file mode 100644
index 00000000000..a469600e830
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactorySpecification.groovy
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.connection
+
+import com.mongodb.ServerAddress
+import com.mongodb.internal.connection.AsynchronousSocketChannelStream
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+
+@IgnoreIf({ isNotAtLeastJava7() })
+class AsynchronousSocketChannelStreamFactoryFactorySpecification extends Specification {
+
+    @Unroll
+    def 'should create the expected #description AsynchronousSocketChannelStream'() {
+        given:
+        def factory = factoryFactory.create(socketSettings, sslSettings)
+
+        when:
+        AsynchronousSocketChannelStream stream = factory.create(serverAddress)
+
+        then:
+        stream.getSettings() == socketSettings
+        stream.getAddress() == serverAddress
+        (stream.getGroup() == null) == hasCustomGroup
+
+        cleanup:
+        stream.getGroup()?.shutdown()
+
+        where:
+        description | factoryFactory  | hasCustomGroup
+        'default'   | DEFAULT_FACTORY | true
+        'custom'    | CUSTOM_FACTORY  | false
+    }
+
+    SocketSettings socketSettings = SocketSettings.builder().build()
+    SslSettings sslSettings = SslSettings.builder().build()
+    ServerAddress serverAddress = new ServerAddress()
+    ExecutorService service = Executors.newFixedThreadPool(1)
+    static final DEFAULT_FACTORY = AsynchronousSocketChannelStreamFactoryFactory.builder().build()
+    static final CUSTOM_FACTORY = AsynchronousSocketChannelStreamFactoryFactory.builder()
+            .group(java.nio.channels.AsynchronousChannelGroup.withThreadPool(Executors.newFixedThreadPool(5)))
+            .build()
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/Base64CodecSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/Base64CodecSpecification.groovy
deleted file mode 100644
index 6974cc3e0cf..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/Base64CodecSpecification.groovy
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import spock.lang.Specification
-import spock.lang.Unroll
-
-class Base64CodecSpecification extends Specification {
-
-    @Unroll
-    def 'encodes #encoded into #decoded'() {
-        given:
-        def subject = new Base64Codec();
-
-        expect:
-        subject.encode(encoded.getBytes()) == decoded
-        subject.decode(decoded) == encoded.getBytes()
-
-        where:
-        encoded  | decoded
-        ''       | ''
-        'f'      | 'Zg=='
-        'fo'     | 'Zm8='
-        'foo'    | 'Zm9v'
-        'foob'   | 'Zm9vYg=='
-        'fooba'  | 'Zm9vYmE='
-        'foobar' | 'Zm9vYmFy'
-    }
-
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/BaseClusterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/BaseClusterSpecification.groovy
deleted file mode 100644
index 38dd21a7471..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/BaseClusterSpecification.groovy
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoClientException
-import com.mongodb.MongoException
-import com.mongodb.MongoInternalException
-import com.mongodb.MongoTimeoutException
-import com.mongodb.MongoWaitQueueFullException
-import com.mongodb.ReadPreference
-import com.mongodb.ServerAddress
-import com.mongodb.selector.ReadPreferenceServerSelector
-import com.mongodb.selector.ServerAddressSelector
-import com.mongodb.selector.WritableServerSelector
-import spock.lang.Specification
-
-import java.util.concurrent.CountDownLatch
-
-import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
-import static com.mongodb.connection.ClusterSettings.builder
-import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
-import static com.mongodb.connection.ServerType.REPLICA_SET_SECONDARY
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static java.util.concurrent.TimeUnit.SECONDS
-
-class BaseClusterSpecification extends Specification {
-
-    private final ServerAddress firstServer = new ServerAddress('localhost:27017')
-    private final ServerAddress secondServer = new ServerAddress('localhost:27018')
-    private final ServerAddress thirdServer = new ServerAddress('localhost:27019')
-    private final List<ServerAddress> allServers = [firstServer, secondServer, thirdServer]
-    private final TestClusterableServerFactory factory = new TestClusterableServerFactory()
-
-    def 'should compose server selector passed to selectServer with server selector in cluster settings'() {
-        given:
-        def cluster = new MultiServerCluster(new ClusterId(),
-                builder().mode(MULTIPLE)
-                        .hosts([firstServer, secondServer, thirdServer])
-                        .serverSelectionTimeout(1, SECONDS)
-                        .serverSelector(new ServerAddressSelector(firstServer))
-                        .build(),
-                factory)
-        factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, allServers)
-        factory.sendNotification(secondServer, REPLICA_SET_SECONDARY, allServers)
-        factory.sendNotification(thirdServer, REPLICA_SET_PRIMARY, allServers)
-
-        expect:
-        cluster.selectServer(new ReadPreferenceServerSelector(ReadPreference.secondary())).description.address == firstServer
-    }
-
-    def 'should use server selector passed to selectServer if server selector in cluster settings is null'() {
-        given:
-        def cluster = new MultiServerCluster(new ClusterId(),
-                builder().mode(MULTIPLE)
-                        .serverSelectionTimeout(1, SECONDS)
-                        .hosts([firstServer, secondServer, thirdServer])
-                        .build(),
-                factory)
-        factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, allServers)
-        factory.sendNotification(secondServer, REPLICA_SET_SECONDARY, allServers)
-        factory.sendNotification(thirdServer, REPLICA_SET_PRIMARY, allServers)
-
-        expect:
-        cluster.selectServer(new ServerAddressSelector(firstServer)).description.address == firstServer
-    }
-
-    def 'should timeout with useful message'() {
-        given:
-        def cluster = new MultiServerCluster(new ClusterId(),
-                builder().mode(MULTIPLE)
-                        .hosts([firstServer, secondServer])
-                        .serverSelectionTimeout(1, MILLISECONDS)
-                        .build(),
-                factory)
-
-        when:
-        factory.sendNotification(firstServer, ServerDescription.builder().type(ServerType.UNKNOWN)
-                                                               .state(ServerConnectionState.CONNECTING)
-                                                               .address(firstServer)
-                                                               .exception(new MongoInternalException('oops'))
-                                                               .build())
-
-        cluster.getDescription()
-
-        then:
-        def e = thrown(MongoTimeoutException)
-        e.getMessage().startsWith('Timed out after 1 ms while waiting to connect. Client view of cluster state is {type=UNKNOWN')
-        e.getMessage().contains('{address=localhost:27017, type=UNKNOWN, state=CONNECTING, ' +
-                'exception={com.mongodb.MongoInternalException: oops}}');
-        e.getMessage().contains('{address=localhost:27018, type=UNKNOWN, state=CONNECTING}');
-
-        when:
-        cluster.selectServer(new WritableServerSelector())
-
-        then:
-        e = thrown(MongoTimeoutException)
-        e.getMessage().startsWith('Timed out after 1 ms while waiting for a server that matches WritableServerSelector. ' +
-                'Client view of cluster state is {type=UNKNOWN')
-        e.getMessage().contains('{address=localhost:27017, type=UNKNOWN, state=CONNECTING, ' +
-                'exception={com.mongodb.MongoInternalException: oops}}');
-        e.getMessage().contains('{address=localhost:27018, type=UNKNOWN, state=CONNECTING}');
-    }
-
-    def 'should select server asynchronously'() {
-        given:
-        def cluster = new MultiServerCluster(new ClusterId(),
-                builder().mode(MULTIPLE)
-                        .hosts([firstServer, secondServer, thirdServer])
-                        .build(),
-                factory)
-        factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, allServers)
-
-        when:
-        def server = selectServerAsyncAndGet(cluster, firstServer)
-
-        then:
-        server.description.address == firstServer
-
-        when:
-        def secondServerLatch = selectServerAsync(cluster, secondServer)
-        def thirdServerLatch = selectServerAsync(cluster, thirdServer)
-        factory.sendNotification(secondServer, REPLICA_SET_SECONDARY, allServers)
-        factory.sendNotification(thirdServer, REPLICA_SET_SECONDARY, allServers)
-        secondServerLatch.latch.await()
-        thirdServerLatch.latch.await()
-
-        then:
-        secondServerLatch.server.description.address == secondServer
-        thirdServerLatch.server.description.address == thirdServer
-
-        cleanup:
-        cluster?.close()
-    }
-
-    def 'when selecting server asynchronously should send MongoClientException to callback if cluster is closed before success'() {
-        given:
-        def cluster = new MultiServerCluster(new ClusterId(),
-                builder().mode(MULTIPLE)
-                        .hosts([firstServer, secondServer, thirdServer])
-                        .build(),
-                factory)
-
-        when:
-        def serverLatch = selectServerAsync(cluster, firstServer)
-        cluster.close()
-        serverLatch.get()
-
-        then:
-        thrown(MongoClientException)
-
-        cleanup:
-        cluster?.close()
-    }
-
-    def 'when selecting server asynchronously should send MongoTimeoutException to callback after timeout period'() {
-        given:
-        def cluster = new MultiServerCluster(new ClusterId(),
-                builder().mode(MULTIPLE)
-                        .hosts([firstServer, secondServer, thirdServer])
-                        .serverSelectionTimeout(100, MILLISECONDS)
-                        .build(),
-                factory)
-
-        when:
-        selectServerAsyncAndGet(cluster, firstServer)
-
-        then:
-        thrown(MongoTimeoutException)
-
-        cleanup:
-        cluster?.close()
-    }
-
-    def 'when selecting server asynchronously should send MongoWaitQueueFullException to callback if there are too many waiters'() {
-        given:
-        def cluster = new MultiServerCluster(new ClusterId(),
-                builder().mode(MULTIPLE)
-                        .hosts([firstServer, secondServer, thirdServer])
-                        .serverSelectionTimeout(1, SECONDS)
-                        .maxWaitQueueSize(1)
-                        .build(),
-                factory)
-
-        when:
-        selectServerAsync(cluster, firstServer)
-        selectServerAsyncAndGet(cluster, firstServer)
-
-        then:
-        thrown(MongoWaitQueueFullException)
-
-        cleanup:
-        cluster?.close()
-    }
-
-    def selectServerAsyncAndGet(BaseCluster cluster, ServerAddress serverAddress) {
-        selectServerAsync(cluster, serverAddress).get()
-    }
-
-    def selectServerAsync(BaseCluster cluster, ServerAddress serverAddress) {
-        def serverLatch = new ServerLatch()
-        cluster.selectServerAsync(new ServerAddressSelector(serverAddress)) { Server result, MongoException e ->
-            serverLatch.server = result
-            serverLatch.throwable = e
-            serverLatch.latch.countDown()
-        }
-        serverLatch
-    }
-
-    class ServerLatch {
-        CountDownLatch latch = new CountDownLatch(1)
-        Server server
-        Throwable throwable
-
-        def get() {
-            latch.await()
-            if (throwable != null) {
-                throw throwable
-            }
-            server
-        }
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/BulkWriteBatchCombinerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/BulkWriteBatchCombinerSpecification.groovy
index 5d13f7010a2..317f02f4377 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/BulkWriteBatchCombinerSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/BulkWriteBatchCombinerSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,18 +57,6 @@ class BulkWriteBatchCombinerSpecification extends Specification {
         result == BulkWriteResult.acknowledged(INSERT, 1, 0, [])
     }
 
-    def 'should handle null modifiedCount'() {
-        def combiner = new BulkWriteBatchCombiner(new ServerAddress(), true, ACKNOWLEDGED)
-        combiner.addResult(BulkWriteResult.acknowledged(UPDATE, 1, null, []), new IndexMap.RangeBased().add(0, 0))
-        combiner.addResult(BulkWriteResult.acknowledged(INSERT, 1, 0, []), new IndexMap.RangeBased().add(0, 0))
-
-        when:
-        def result = combiner.getResult()
-
-        then:
-        result == BulkWriteResult.acknowledged(1, 1, 0, null, [])
-    }
-
     def 'should sort upserts'() {
         given:
         def combiner = new BulkWriteBatchCombiner(new ServerAddress(), true, ACKNOWLEDGED)
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ByteBufBsonDocumentSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ByteBufBsonDocumentSpecification.groovy
deleted file mode 100644
index fa9386d1c3f..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/ByteBufBsonDocumentSpecification.groovy
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import org.bson.BsonArray
-import org.bson.BsonBinaryWriter
-import org.bson.BsonBoolean
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonNull
-import org.bson.BsonValue
-import org.bson.ByteBuf
-import org.bson.ByteBufNIO
-import org.bson.codecs.BsonDocumentCodec
-import org.bson.codecs.EncoderContext
-import org.bson.io.BasicOutputBuffer
-import org.bson.json.JsonMode
-import org.bson.json.JsonWriterSettings
-import spock.lang.Specification
-
-import java.nio.ByteBuffer
-
-import static java.util.Arrays.asList
-import static util.GroovyHelpers.areEqual
-
-class ByteBufBsonDocumentSpecification extends Specification {
-    def emptyDocumentByteBuf = new ByteBufNIO(ByteBuffer.wrap([5, 0, 0, 0, 0] as byte[]))
-    ByteBuf documentByteBuf
-    ByteBufBsonDocument emptyRawDocument = new ByteBufBsonDocument(emptyDocumentByteBuf);
-    def document = new BsonDocument()
-            .append('a', new BsonInt32(1))
-            .append('b', new BsonInt32(2))
-            .append('c', new BsonDocument('x', BsonBoolean.TRUE))
-            .append('d', new BsonArray(asList(new BsonDocument('y', BsonBoolean.FALSE), new BsonInt32(1))))
-
-    ByteBufBsonDocument rawDocument
-
-    def setup() {
-        def buffer = new BasicOutputBuffer()
-        new BsonDocumentCodec().encode(new BsonBinaryWriter(buffer), document, EncoderContext.builder().build());
-        ByteArrayOutputStream baos = new ByteArrayOutputStream()
-        buffer.pipe(baos)
-        documentByteBuf = new ByteBufNIO(ByteBuffer.wrap(baos.toByteArray()))
-        rawDocument = new ByteBufBsonDocument(documentByteBuf);
-    }
-
-    def 'get should get the value of the given key'() {
-        expect:
-        emptyRawDocument.get('a') == null
-        rawDocument.get('z') == null
-        rawDocument.get('a') == new BsonInt32(1)
-        rawDocument.get('b') == new BsonInt32(2)
-
-    }
-
-    def 'get should throw if the key is null'() {
-        when:
-        rawDocument.get(null)
-
-        then:
-        thrown(IllegalArgumentException)
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'containKey should throw if the key name is null'() {
-        when:
-        rawDocument.containsKey(null)
-
-        then:
-        thrown(IllegalArgumentException)
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'containsKey should find an existing key'() {
-        expect:
-        rawDocument.containsKey('a')
-        rawDocument.containsKey('b')
-        rawDocument.containsKey('c')
-        rawDocument.containsKey('d')
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'containsKey should not find a non-existing key'() {
-        expect:
-        !rawDocument.containsKey('e')
-        !rawDocument.containsKey('x')
-        !rawDocument.containsKey('y')
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'containValue should find an existing value'() {
-        expect:
-        rawDocument.containsValue(document.get('a'))
-        rawDocument.containsValue(document.get('b'))
-        rawDocument.containsValue(document.get('c'))
-        rawDocument.containsValue(document.get('d'))
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'containValue should not find a non-existing value'() {
-        expect:
-        !rawDocument.containsValue(new BsonInt32(3))
-        !rawDocument.containsValue(new BsonDocument('e', BsonBoolean.FALSE))
-        !rawDocument.containsValue(new BsonArray(asList(new BsonInt32(2), new BsonInt32(4))))
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'isEmpty should return false when the document is not empty'() {
-        expect:
-        !rawDocument.isEmpty()
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'isEmpty should return true when the document is empty'() {
-        expect:
-        emptyRawDocument.isEmpty()
-        emptyDocumentByteBuf.referenceCount == 1
-    }
-
-    def 'should get correct size'() {
-        expect:
-        emptyRawDocument.size() == 0
-        rawDocument.size() == 4
-        documentByteBuf.referenceCount == 1
-        emptyDocumentByteBuf.referenceCount == 1
-    }
-
-    def 'should get correct key set'() {
-        expect:
-        emptyRawDocument.keySet().isEmpty()
-        rawDocument.keySet() == ['a', 'b', 'c', 'd'] as Set
-        documentByteBuf.referenceCount == 1
-        emptyDocumentByteBuf.referenceCount == 1
-    }
-
-    def 'should get correct values set'() {
-        expect:
-        emptyRawDocument.values().isEmpty()
-        rawDocument.values() as Set == [document.get('a'), document.get('b'), document.get('c'), document.get('d')] as Set
-        documentByteBuf.referenceCount == 1
-        emptyDocumentByteBuf.referenceCount == 1
-    }
-
-    def 'should get correct entry set'() {
-        expect:
-        emptyRawDocument.entrySet().isEmpty()
-        rawDocument.entrySet() == [new TestEntry('a', document.get('a')),
-                                   new TestEntry('b', document.get('b')),
-                                   new TestEntry('c', document.get('c')),
-                                   new TestEntry('d', document.get('d'))] as Set
-        documentByteBuf.referenceCount == 1
-        emptyDocumentByteBuf.referenceCount == 1
-    }
-
-    def 'all write methods should throw UnsupportedOperationException'() {
-        when:
-        rawDocument.clear()
-
-        then:
-        thrown(UnsupportedOperationException)
-
-        when:
-        rawDocument.put('x', BsonNull.VALUE)
-
-        then:
-        thrown(UnsupportedOperationException)
-
-        when:
-        rawDocument.append('x', BsonNull.VALUE)
-
-        then:
-        thrown(UnsupportedOperationException)
-
-        when:
-        rawDocument.putAll(new BsonDocument('x', BsonNull.VALUE))
-
-        then:
-        thrown(UnsupportedOperationException)
-
-        when:
-        rawDocument.remove(BsonNull.VALUE)
-
-        then:
-        thrown(UnsupportedOperationException)
-    }
-
-    def 'should get first key'() {
-        expect:
-        rawDocument.getFirstKey() == document.keySet().iterator().next()
-        emptyRawDocument.getFirstKey() == null
-        documentByteBuf.referenceCount == 1
-        emptyDocumentByteBuf.referenceCount == 1
-    }
-
-    def 'hashCode should equal hash code of identical BsonDocument'() {
-        expect:
-        rawDocument.hashCode() == document.hashCode()
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'equals should equal identical BsonDocument'() {
-        expect:
-        areEqual(rawDocument, document)
-        areEqual(document, rawDocument)
-        areEqual(rawDocument, rawDocument)
-        !areEqual(rawDocument, emptyRawDocument)
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'clone should make a deep copy'() {
-        when:
-        BsonDocument cloned = rawDocument.clone()
-
-        then:
-        cloned == rawDocument
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'should serialize and deserialize'() {
-        given:
-        def baos = new ByteArrayOutputStream()
-        def oos = new ObjectOutputStream(baos)
-
-        when:
-        oos.writeObject(rawDocument)
-        def bais = new ByteArrayInputStream(baos.toByteArray())
-        def ois = new ObjectInputStream(bais)
-        def deserializedDocument = ois.readObject()
-
-        then:
-        rawDocument == deserializedDocument
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'toJson should return equivalent'() {
-        expect:
-        document.toJson() == rawDocument.toJson()
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'toJson should be callable multiple times'() {
-        expect:
-        rawDocument.toJson()
-        rawDocument.toJson()
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'size should be callable multiple times'() {
-        expect:
-        rawDocument.size()
-        rawDocument.size()
-        documentByteBuf.referenceCount == 1
-    }
-
-    def 'toJson should respect JsonWriteSettings'() {
-        given:
-        def settings = new JsonWriterSettings(JsonMode.SHELL);
-
-        expect:
-        document.toJson(settings) == rawDocument.toJson(settings)
-    }
-
-    def 'toJson should return equivalent when a ByteBufBsonDocument is nested in a BsonDocument'() {
-        given:
-        def topLevel = new BsonDocument('nested', rawDocument)
-
-        expect:
-        new BsonDocument('nested', document).toJson() == topLevel.toJson()
-    }
-
-    class TestEntry implements Map.Entry<String, BsonValue> {
-
-        private final String key;
-        private BsonValue value
-
-        TestEntry(String key, BsonValue value) {
-            this.key = key
-            this.value = value
-        }
-
-        @Override
-        String getKey() {
-            key
-        }
-
-        @Override
-        BsonValue getValue() {
-            value
-        }
-
-        @Override
-        BsonValue setValue(final BsonValue value) {
-            this.value = value
-        }
-    }
-
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ByteBufferBsonOutputSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ByteBufferBsonOutputSpecification.groovy
index 89248674843..98bdab11403 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ByteBufferBsonOutputSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ByteBufferBsonOutputSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.mongodb.connection
 
 import category.Slow
+import com.mongodb.internal.connection.SimpleBufferProvider
 import org.bson.BsonSerializationException
 import org.bson.types.ObjectId
 import org.junit.experimental.categories.Category
@@ -212,6 +213,17 @@ class ByteBufferBsonOutputSpecification extends Specification {
         bsonOutput.size == 4
     }
 
+    def 'should get byte buffers as little endian'() {
+        given:
+        def bsonOutput = new ByteBufferBsonOutput(new SimpleBufferProvider())
+
+        when:
+        bsonOutput.writeBytes([1, 0, 0, 0] as byte[])
+
+        then:
+        bsonOutput.getByteBuffers()[0].getInt() == 1
+    }
+
     def 'null character in CString should throw SerializationException'() {
         given:
         def bsonOutput = new ByteBufferBsonOutput(new SimpleBufferProvider())
@@ -407,4 +419,4 @@ class ByteBufferBsonOutputSpecification extends Specification {
 
         baos.toByteArray()
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ClusterDescriptionTest.java b/driver-core/src/test/unit/com/mongodb/connection/ClusterDescriptionTest.java
index fefc8600f69..b4aa9a008a2 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ClusterDescriptionTest.java
+++ b/driver-core/src/test/unit/com/mongodb/connection/ClusterDescriptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,11 +31,15 @@
 import java.util.List;
 
 import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
+import static com.mongodb.connection.ClusterConnectionMode.SINGLE;
 import static com.mongodb.connection.ClusterType.REPLICA_SET;
+import static com.mongodb.connection.ClusterType.SHARDED;
+import static com.mongodb.connection.ClusterType.STANDALONE;
 import static com.mongodb.connection.ClusterType.UNKNOWN;
 import static com.mongodb.connection.ServerConnectionState.CONNECTED;
 import static com.mongodb.connection.ServerConnectionState.CONNECTING;
 import static com.mongodb.connection.ServerDescription.MAX_DRIVER_WIRE_VERSION;
+import static com.mongodb.connection.ServerDescription.MIN_DRIVER_WIRE_VERSION;
 import static com.mongodb.connection.ServerDescription.builder;
 import static com.mongodb.connection.ServerType.REPLICA_SET_OTHER;
 import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY;
@@ -43,6 +47,7 @@
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -96,6 +101,21 @@ public void testMode() {
         assertEquals(MULTIPLE, description.getConnectionMode());
     }
 
+    @Test
+    public void testSettings() {
+        ClusterDescription description = new ClusterDescription(MULTIPLE, UNKNOWN, Collections.<ServerDescription>emptyList());
+        assertNull(description.getClusterSettings());
+        assertNull(description.getServerSettings());
+
+        ClusterDescription descriptionWithSettings = new ClusterDescription(MULTIPLE, UNKNOWN, Collections.<ServerDescription>emptyList(),
+                                                                                   ClusterSettings.builder()
+                                                                                           .hosts(asList(new ServerAddress()))
+                                                                                           .build(),
+                                                                                   ServerSettings.builder().build());
+        assertNotNull(descriptionWithSettings.getClusterSettings());
+        assertNotNull(descriptionWithSettings.getServerSettings());
+    }
+
     @Test
     @SuppressWarnings("deprecation")
     public void testAll() {
@@ -173,7 +193,7 @@ public void testSortingOfAll() throws UnknownHostException {
     }
 
     @Test
-    public void clusterDescriptionWithAnIncompatibleServerShouldBeIncompatible() throws UnknownHostException {
+    public void clusterDescriptionWithAnIncompatiblyNewServerShouldBeIncompatible() throws UnknownHostException {
         ClusterDescription description =
         new ClusterDescription(MULTIPLE, UNKNOWN, asList(
                                                         builder()
@@ -193,6 +213,33 @@ public void clusterDescriptionWithAnIncompatibleServerShouldBeIncompatible() thr
                                                         .build())
         );
         assertFalse(description.isCompatibleWithDriver());
+        assertEquals(new ServerAddress("loc:27018"), description.findServerIncompatiblyNewerThanDriver().getAddress());
+        assertNull(description.findServerIncompatiblyOlderThanDriver());
+    }
+
+    @Test
+    public void clusterDescriptionWithAnIncompatiblyOlderServerShouldBeIncompatible() throws UnknownHostException {
+        ClusterDescription description =
+                new ClusterDescription(MULTIPLE, UNKNOWN, asList(
+                        builder()
+                                .state(CONNECTING)
+                                .address(new ServerAddress("loc:27019"))
+                                .build(),
+                        builder()
+                                .state(CONNECTED)
+                                .ok(true)
+                                .address(new ServerAddress("loc:27018"))
+                                .minWireVersion(0)
+                                .maxWireVersion(MIN_DRIVER_WIRE_VERSION - 1)
+                                .build(),
+                        builder()
+                                .state(CONNECTING)
+                                .address(new ServerAddress("loc:27017"))
+                                .build())
+                );
+        assertFalse(description.isCompatibleWithDriver());
+        assertEquals(new ServerAddress("loc:27018"), description.findServerIncompatiblyOlderThanDriver().getAddress());
+        assertNull(description.findServerIncompatiblyNewerThanDriver());
     }
 
     @Test
@@ -213,6 +260,132 @@ public void clusterDescriptionWithCompatibleServerShouldBeCompatible() throws Un
                                                         .build())
         );
         assertTrue(description.isCompatibleWithDriver());
+        assertNull(description.findServerIncompatiblyNewerThanDriver());
+        assertNull(description.findServerIncompatiblyOlderThanDriver());
+    }
+
+    @Test
+    public void testLogicalSessionTimeoutMinutes() {
+        ClusterDescription description = new ClusterDescription(MULTIPLE, REPLICA_SET, asList(
+                builder().state(CONNECTING)
+                        .address(new ServerAddress("loc:27017")).build()
+        ));
+        assertEquals(null, description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(MULTIPLE, REPLICA_SET, asList(
+                builder().state(CONNECTED)
+                        .address(new ServerAddress("loc:27017"))
+                        .build()
+        ));
+        assertEquals(null, description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(MULTIPLE, REPLICA_SET, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .build()
+        ));
+        assertEquals(null, description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(SINGLE, STANDALONE, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .type(ServerType.STANDALONE)
+                        .logicalSessionTimeoutMinutes(5)
+                        .build()
+        ));
+        assertEquals(Integer.valueOf(5), description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(SINGLE, SHARDED, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .type(ServerType.SHARD_ROUTER)
+                        .logicalSessionTimeoutMinutes(5)
+                        .build()
+        ));
+        assertEquals(Integer.valueOf(5), description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(MULTIPLE, SHARDED, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .type(ServerType.SHARD_ROUTER)
+                        .logicalSessionTimeoutMinutes(5)
+                        .build(),
+                builder().state(CONNECTING)
+                        .address(new ServerAddress("loc:27018"))
+                        .build()
+        ));
+        assertEquals(Integer.valueOf(5), description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(MULTIPLE, SHARDED, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .type(ServerType.SHARD_ROUTER)
+                        .logicalSessionTimeoutMinutes(5)
+                        .build(),
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27018"))
+                        .type(ServerType.SHARD_ROUTER)
+                        .logicalSessionTimeoutMinutes(3)
+                        .build()
+        ));
+        assertEquals(Integer.valueOf(3), description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(MULTIPLE, REPLICA_SET, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .type(ServerType.REPLICA_SET_PRIMARY)
+                        .logicalSessionTimeoutMinutes(5)
+                        .build(),
+                builder().state(CONNECTING)
+                        .address(new ServerAddress("loc:27018"))
+                        .build()
+        ));
+        assertEquals(Integer.valueOf(5), description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(MULTIPLE, REPLICA_SET, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .type(REPLICA_SET_PRIMARY)
+                        .logicalSessionTimeoutMinutes(5)
+                        .build(),
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27018"))
+                        .type(REPLICA_SET_SECONDARY)
+                        .logicalSessionTimeoutMinutes(3)
+                        .build(),
+                builder().state(CONNECTING)
+                        .address(new ServerAddress("loc:27019"))
+                        .build()
+        ));
+        assertEquals(Integer.valueOf(3), description.getLogicalSessionTimeoutMinutes());
+
+        description = new ClusterDescription(MULTIPLE, REPLICA_SET, asList(
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27017"))
+                        .type(REPLICA_SET_PRIMARY)
+                        .logicalSessionTimeoutMinutes(3)
+                        .build(),
+                builder().state(CONNECTED)
+                        .ok(true)
+                        .address(new ServerAddress("loc:27018"))
+                        .type(REPLICA_SET_SECONDARY)
+                        .logicalSessionTimeoutMinutes(5)
+                        .build(),
+                builder().state(CONNECTING)
+                        .address(new ServerAddress("loc:27019"))
+                        .build()
+        ));
+        assertEquals(Integer.valueOf(3), description.getLogicalSessionTimeoutMinutes());
     }
 
     @Test
@@ -222,14 +395,17 @@ public void testObjectOverrides() throws UnknownHostException {
                                                         builder()
                                                         .state(CONNECTING)
                                                         .address(new ServerAddress("loc:27019"))
+                                                        .lastUpdateTimeNanos(42L)
                                                         .build(),
                                                         builder()
                                                         .state(CONNECTING)
                                                         .address(new ServerAddress("loc:27018"))
+                                                        .lastUpdateTimeNanos(42L)
                                                         .build(),
                                                         builder()
                                                         .state(CONNECTING)
                                                         .address(new ServerAddress("loc:27017"))
+                                                        .lastUpdateTimeNanos(42L)
                                                         .build())
         );
         ClusterDescription descriptionTwo =
@@ -237,14 +413,17 @@ public void testObjectOverrides() throws UnknownHostException {
                                                         builder()
                                                         .state(CONNECTING)
                                                         .address(new ServerAddress("loc:27019"))
+                                                        .lastUpdateTimeNanos(42L)
                                                         .build(),
                                                         builder()
                                                         .state(CONNECTING)
                                                         .address(new ServerAddress("loc:27018"))
+                                                        .lastUpdateTimeNanos(42L)
                                                         .build(),
                                                         builder()
                                                         .state(CONNECTING)
                                                         .address(new ServerAddress("loc:27017"))
+                                                        .lastUpdateTimeNanos(42L)
                                                         .build())
         );
         assertEquals(description, descriptionTwo);
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ClusterIdSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ClusterIdSpecification.groovy
index cf8d6733000..8a3f2e4568a 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ClusterIdSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ClusterIdSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,4 +47,4 @@ class ClusterIdSpecification extends Specification {
         'id2' | 'my server'
     }
 
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ClusterSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ClusterSettingsSpecification.groovy
index 4ab5e387af2..2313c72211f 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ClusterSettingsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ClusterSettingsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,48 +18,56 @@ package com.mongodb.connection
 
 import com.mongodb.ConnectionString
 import com.mongodb.ServerAddress
+import com.mongodb.UnixServerAddress
+import com.mongodb.event.ClusterListener
+import com.mongodb.selector.CompositeServerSelector
+import com.mongodb.selector.LatencyMinimizingServerSelector
 import com.mongodb.selector.WritableServerSelector
+import spock.lang.IgnoreIf
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit
 
+// TODO: add SRV tests
 class ClusterSettingsSpecification extends Specification {
     def hosts = [new ServerAddress('localhost'), new ServerAddress('localhost', 30000)]
     def serverSelector = new WritableServerSelector()
+    def defaultServerSelector = new LatencyMinimizingServerSelector(15, TimeUnit.MILLISECONDS)
 
     def 'should set all default values'() {
         when:
-        def settings = ClusterSettings.builder()
-                                      .hosts(hosts)
-                                      .build();
+        def settings = ClusterSettings.builder().build()
 
         then:
-        settings.hosts == hosts
-        settings.mode == ClusterConnectionMode.MULTIPLE
+        settings.hosts == [new ServerAddress()]
+        settings.mode == ClusterConnectionMode.SINGLE
         settings.requiredClusterType == ClusterType.UNKNOWN
         settings.requiredReplicaSetName == null
-        settings.serverSelector == null
+        settings.serverSelector == defaultServerSelector
         settings.getServerSelectionTimeout(TimeUnit.SECONDS) == 30
         settings.maxWaitQueueSize == 500
         settings.clusterListeners == []
     }
 
     def 'should set all properties'() {
+        given:
+        def oneSecondLatencySelector = new LatencyMinimizingServerSelector(1, TimeUnit.SECONDS)
         when:
-        def listenerOne = new NoOpClusterListener()
-        def listenerTwo = new NoOpClusterListener()
+        def listenerOne = Mock(ClusterListener)
+        def listenerTwo = Mock(ClusterListener)
         def settings = ClusterSettings.builder()
                                       .hosts(hosts)
                                       .mode(ClusterConnectionMode.MULTIPLE)
                                       .description('my cluster')
                                       .requiredClusterType(ClusterType.REPLICA_SET)
                                       .requiredReplicaSetName('foo')
+                                      .localThreshold(1, TimeUnit.SECONDS)
                                       .serverSelector(serverSelector)
                                       .serverSelectionTimeout(1, TimeUnit.SECONDS)
                                       .addClusterListener(listenerOne)
                                       .addClusterListener(listenerTwo)
                                       .maxWaitQueueSize(100)
-                                      .build();
+                                      .build()
 
         then:
         settings.hosts == hosts
@@ -67,12 +75,59 @@ class ClusterSettingsSpecification extends Specification {
         settings.mode == ClusterConnectionMode.MULTIPLE
         settings.requiredClusterType == ClusterType.REPLICA_SET
         settings.requiredReplicaSetName == 'foo'
-        settings.serverSelector == serverSelector
+        settings.serverSelector == new CompositeServerSelector([serverSelector, oneSecondLatencySelector])
         settings.getServerSelectionTimeout(TimeUnit.MILLISECONDS) == 1000
         settings.maxWaitQueueSize == 100
         settings.clusterListeners == [listenerOne, listenerTwo]
     }
 
+    def 'should apply settings'() {
+        given:
+        def listenerOne = Mock(ClusterListener)
+        def listenerTwo = Mock(ClusterListener)
+        def defaultSettings = ClusterSettings.builder().build()
+        def customSettings = ClusterSettings.builder()
+                .hosts(hosts)
+                .mode(ClusterConnectionMode.MULTIPLE)
+                .description('my cluster')
+                .requiredClusterType(ClusterType.REPLICA_SET)
+                .requiredReplicaSetName('foo')
+                .serverSelector(serverSelector)
+                .localThreshold(10, TimeUnit.MILLISECONDS)
+                .serverSelectionTimeout(1, TimeUnit.SECONDS)
+                .addClusterListener(listenerOne)
+                .addClusterListener(listenerTwo)
+                .maxWaitQueueSize(100)
+                .build()
+
+        expect:
+        ClusterSettings.builder().applySettings(customSettings).build() == customSettings
+        ClusterSettings.builder(customSettings).applySettings(defaultSettings).build() == defaultSettings
+    }
+
+    def 'should allow configure serverSelectors correctly'() {
+        given:
+        def latMinServerSelector = new LatencyMinimizingServerSelector(10, TimeUnit.MILLISECONDS)
+
+        when:
+        def settings = ClusterSettings.builder().build()
+
+        then:
+        settings.serverSelector == defaultServerSelector
+
+        when:
+        settings = ClusterSettings.builder().serverSelector(serverSelector).build()
+
+        then:
+        settings.serverSelector == new CompositeServerSelector([serverSelector, defaultServerSelector])
+
+        when:
+        settings = ClusterSettings.builder().localThreshold(10, TimeUnit.MILLISECONDS).serverSelector(serverSelector).build()
+
+        then:
+        settings.serverSelector == new CompositeServerSelector([serverSelector, latMinServerSelector])
+    }
+
     def 'when connection string is applied to builder, all properties should be set'() {
         when:
         def settings = ClusterSettings.builder().applyConnectionString(new ConnectionString('mongodb://example.com:27018'))
@@ -146,6 +201,12 @@ class ClusterSettingsSpecification extends Specification {
 
         then:
         settings.getServerSelectionTimeout(TimeUnit.MILLISECONDS) == 50000
+
+        when:
+        settings = ClusterSettings.builder().applyConnectionString(new ConnectionString('mongodb://localhost/?localThresholdMS=99')).build()
+
+        then:
+        settings.serverSelector == new LatencyMinimizingServerSelector(99, TimeUnit.MILLISECONDS)
     }
 
     def 'when cluster type is unknown and replica set name is specified, should set cluster type to ReplicaSet'() {
@@ -156,26 +217,31 @@ class ClusterSettingsSpecification extends Specification {
         ClusterType.REPLICA_SET == settings.requiredClusterType
     }
 
-    def 'connection mode should default to Multiple regardless of hosts count'() {
+    def 'connection mode should default to single if one host or multiple if more'() {
         when:
         def settings = ClusterSettings.builder().hosts([new ServerAddress()]).build()
 
+        then:
+        settings.mode == ClusterConnectionMode.SINGLE
+
+        when:
+        settings = ClusterSettings.builder().hosts(hosts).build()
+
         then:
         settings.mode == ClusterConnectionMode.MULTIPLE
     }
 
     def 'when mode is Single and hosts size is greater than one, should throw'() {
         when:
-        ClusterSettings.builder().hosts([new ServerAddress(), new ServerAddress('other')]).mode(ClusterConnectionMode.SINGLE).build();
+        ClusterSettings.builder().hosts([new ServerAddress(), new ServerAddress('other')]).mode(ClusterConnectionMode.SINGLE).build()
         then:
         thrown(IllegalArgumentException)
-
     }
 
     def 'when cluster type is Standalone and multiple hosts are specified, should throw'() {
         when:
         ClusterSettings.builder().hosts([new ServerAddress(), new ServerAddress('other')]).requiredClusterType(ClusterType.STANDALONE)
-                       .build();
+                       .build()
         then:
         thrown(IllegalArgumentException)
     }
@@ -183,7 +249,7 @@ class ClusterSettingsSpecification extends Specification {
     def 'when a replica set name is specified and type is Standalone, should throw'() {
         when:
         ClusterSettings.builder().hosts([new ServerAddress(), new ServerAddress('other')]).requiredReplicaSetName('foo')
-                       .requiredClusterType(ClusterType.STANDALONE).build();
+                       .requiredClusterType(ClusterType.STANDALONE).build()
         then:
         thrown(IllegalArgumentException)
     }
@@ -191,7 +257,7 @@ class ClusterSettingsSpecification extends Specification {
     def 'when a replica set name is specified and type is Sharded, should throw'() {
         when:
         ClusterSettings.builder().hosts([new ServerAddress(), new ServerAddress('other')]).requiredReplicaSetName('foo')
-                       .requiredClusterType(ClusterType.SHARDED).build();
+                       .requiredClusterType(ClusterType.SHARDED).build()
         then:
         thrown(IllegalArgumentException)
     }
@@ -199,7 +265,7 @@ class ClusterSettingsSpecification extends Specification {
 
     def 'should throws if hosts list is null'() {
         when:
-        ClusterSettings.builder().hosts(null).build();
+        ClusterSettings.builder().hosts(null).build()
 
         then:
         thrown(IllegalArgumentException)
@@ -207,7 +273,15 @@ class ClusterSettingsSpecification extends Specification {
 
     def 'should throws if hosts list is empty'() {
         when:
-        ClusterSettings.builder().hosts([]).build();
+        ClusterSettings.builder().hosts([]).build()
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should throws if hosts list contains null value'() {
+        when:
+        ClusterSettings.builder().hosts([null]).build()
 
         then:
         thrown(IllegalArgumentException)
@@ -217,7 +291,7 @@ class ClusterSettingsSpecification extends Specification {
         when:
         def settings = ClusterSettings.builder().hosts([new ServerAddress('server1'),
                                                         new ServerAddress('server2'),
-                                                        new ServerAddress('server1')]).build();
+                                                        new ServerAddress('server1')]).build()
 
         then:
         settings.getHosts() == [new ServerAddress('server1'), new ServerAddress('server2')]
@@ -295,13 +369,15 @@ class ClusterSettingsSpecification extends Specification {
                        .build().hashCode() != ClusterSettings.builder().hosts(hosts).build().hashCode()
     }
 
-    def 'should replace ServerAddress subclass instances with ServerAddress'() {
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'should replace unknown ServerAddress subclass instances with ServerAddress'() {
         when:
-        def settings = ClusterSettings.builder().hosts([new ServerAddressSubclass('server1'),
-                                                        new ServerAddressSubclass('server2')]).build();
+        def settings = ClusterSettings.builder().hosts([new ServerAddress('server1'),
+                                                        new ServerAddressSubclass('server2'),
+                                                        new UnixServerAddress('mongodb.sock')]).build()
 
         then:
-        settings.getHosts() == [new ServerAddress('server1'), new ServerAddress('server2')]
+        settings.getHosts() == [new ServerAddress('server1'), new ServerAddress('server2'), new UnixServerAddress('mongodb.sock')]
     }
 
     def 'list of cluster listeners should be unmodifiable'() {
@@ -309,7 +385,7 @@ class ClusterSettingsSpecification extends Specification {
         def settings = ClusterSettings.builder().hosts(hosts).build()
 
         when:
-        settings.clusterListeners.add(new NoOpClusterListener())
+        settings.clusterListeners.add(Mock(ClusterListener))
 
         then:
         thrown(UnsupportedOperationException)
diff --git a/driver-core/src/test/unit/com/mongodb/connection/CommandEventOnConnectionFailureSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/CommandEventOnConnectionFailureSpecification.groovy
deleted file mode 100644
index 25c71bd3f6d..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/CommandEventOnConnectionFailureSpecification.groovy
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoNamespace
-import com.mongodb.MongoSocketReadException
-import com.mongodb.MongoSocketWriteException
-import com.mongodb.ServerAddress
-import com.mongodb.bulk.DeleteRequest
-import com.mongodb.event.CommandFailedEvent
-import com.mongodb.internal.validator.NoOpFieldNameValidator
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.codecs.DocumentCodec
-import spock.lang.Shared
-import spock.lang.Specification
-
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.WriteConcern.UNACKNOWLEDGED
-import static com.mongodb.connection.ProtocolTestHelper.execute
-
-class CommandEventOnConnectionFailureSpecification extends Specification {
-
-    @Shared
-    def namespace = new MongoNamespace('test.test')
-    private TestInternalConnection connection;
-
-    def setup() {
-        connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress()));
-    }
-
-    def 'should publish failed command event when sendMessage throws exception'() {
-        String commandName = protocolInfo[0]
-        Protocol protocol = protocolInfo[1]
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-        connection.enqueueSendMessageException(new MongoSocketWriteException('Failure', new ServerAddress(), new IOException()));
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoSocketWriteException)
-        commandListener.events.size() == 2
-        commandListener.eventWasDelivered(new CommandFailedEvent(1, connection.getDescription(), commandName, 0, e), 1)
-
-        where:
-        [protocolInfo, async] << [[['ping',
-                                    new CommandProtocol('admin', new BsonDocument('ping', new BsonInt32(1)),
-                                            new NoOpFieldNameValidator(), new DocumentCodec())],
-                                   ['killCursors',
-                                    new KillCursorProtocol(namespace, [42L])],
-                                   ['getMore',
-                                    new GetMoreProtocol(namespace, 42L, 1, new DocumentCodec())],
-                                   ['find',
-                                    new QueryProtocol(namespace, 0, 1, 1, new BsonDocument(), new BsonDocument(), new DocumentCodec())],
-                                   ['delete',
-                                    new DeleteCommandProtocol(namespace, true, ACKNOWLEDGED,
-                                            [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))])],
-                                   ['delete',
-                                    new DeleteProtocol(namespace, true, ACKNOWLEDGED,
-                                            [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))])],
-                                   ['delete',
-                                    new DeleteProtocol(namespace, true, UNACKNOWLEDGED,
-                                            [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))])],
-                                  ],
-                                  [false, true]].combinations()
-    }
-
-    def 'should publish failed command event when receiveMessage throws exception'() {
-        String commandName = protocolInfo[0]
-        Protocol protocol = protocolInfo[1]
-
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-        connection.enqueueReceiveMessageException(new MongoSocketReadException('Failure', new ServerAddress(), new IOException()));
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoSocketReadException)
-        commandListener.events.size() == 2
-        commandListener.eventWasDelivered(new CommandFailedEvent(1, connection.getDescription(), commandName, 0, e), 1)
-
-        where:
-        [protocolInfo, async] << [[['ping',
-                                    new CommandProtocol('admin', new BsonDocument('ping', new BsonInt32(1)),
-                                            new NoOpFieldNameValidator(), new DocumentCodec())],
-                                   ['getMore',
-                                    new GetMoreProtocol(namespace, 42L, 1, new DocumentCodec())],
-                                   ['find',
-                                    new QueryProtocol(namespace, 0, 1, 1, new BsonDocument(), new BsonDocument(), new DocumentCodec())],
-                                   ['delete',
-                                    new DeleteCommandProtocol(namespace, true, ACKNOWLEDGED,
-                                            [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))])],
-                                   ['delete',
-                                    new DeleteProtocol(namespace, true, ACKNOWLEDGED,
-                                            [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))])],
-                                  ],
-                                  [false, true]].combinations()
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/CommandProtocolCommandEventElisionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/CommandProtocolCommandEventElisionSpecification.groovy
deleted file mode 100644
index efcb2040146..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/CommandProtocolCommandEventElisionSpecification.groovy
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoCommandException
-import com.mongodb.ServerAddress
-import com.mongodb.event.CommandFailedEvent
-import com.mongodb.event.CommandStartedEvent
-import com.mongodb.event.CommandSucceededEvent
-import com.mongodb.internal.validator.NoOpFieldNameValidator
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.codecs.DocumentCodec
-import spock.lang.Specification
-
-import static com.mongodb.connection.MessageHelper.buildFailedReply
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply
-import static com.mongodb.connection.ProtocolTestHelper.execute
-
-// Testing security-senstive command elision with a unit test to avoid having to actually execute the commands without error, which can
-// get complicated
-class CommandProtocolCommandEventElisionSpecification extends Specification {
-    private TestInternalConnection connection;
-
-    def setup() {
-        connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress('localhost', 27017)));
-    }
-
-    def 'should elide command and response successful security-sensitive commands'() {
-        given:
-        def securitySensitiveCommandName = securitySensitiveCommand.keySet().iterator().next()
-        def protocol = new CommandProtocol('admin', securitySensitiveCommand, new NoOpFieldNameValidator(), new DocumentCodec())
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-        connection.enqueueReply(buildSuccessfulReply('{ok: 1}'));
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), 'admin', securitySensitiveCommandName,
-                                                                     new BsonDocument()),
-                                             new CommandSucceededEvent(1, connection.getDescription(), securitySensitiveCommandName,
-                                                                       new BsonDocument(), 1)])
-        where:
-        [securitySensitiveCommand, async] << [[new BsonDocument('authenticate', new BsonInt32(1)),
-                                               new BsonDocument('saslStart', new BsonInt32(1)),
-                                               new BsonDocument('saslContinue', new BsonInt32(1)),
-                                               new BsonDocument('getnonce', new BsonInt32(1)),
-                                               new BsonDocument('createUser', new BsonInt32(1)),
-                                               new BsonDocument('updateUser', new BsonInt32(1)),
-                                               new BsonDocument('copydbgetnonce', new BsonInt32(1)),
-                                               new BsonDocument('copydbsaslstart', new BsonInt32(1)),
-                                               new BsonDocument('copydb', new BsonInt32(1))
-                                              ],
-                                              [false, true]].combinations()
-    }
-
-    def 'should elide response in MongoCommandException in failed security-sensitive commands'() {
-        given:
-        def protocol = new CommandProtocol('admin', securitySensitiveCommand, new NoOpFieldNameValidator(), new DocumentCodec())
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-        connection.enqueueReply(buildFailedReply('{ok: 0}'));
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        thrown(MongoCommandException)
-
-        def commandFailedEvent = commandListener.events[1] as CommandFailedEvent
-        commandFailedEvent.throwable instanceof MongoCommandException
-        def commandException = commandFailedEvent.throwable as MongoCommandException
-        commandException.response == new BsonDocument()
-
-        where:
-        [securitySensitiveCommand, async] << [[new BsonDocument('authenticate', new BsonInt32(1)),
-                                               new BsonDocument('saslStart', new BsonInt32(1)),
-                                               new BsonDocument('saslContinue', new BsonInt32(1)),
-                                               new BsonDocument('getnonce', new BsonInt32(1)),
-                                               new BsonDocument('createUser', new BsonInt32(1)),
-                                               new BsonDocument('updateUser', new BsonInt32(1)),
-                                               new BsonDocument('copydbgetnonce', new BsonInt32(1)),
-                                               new BsonDocument('copydbsaslstart', new BsonInt32(1)),
-                                               new BsonDocument('copydb', new BsonInt32(1))
-                                              ],
-                                              [false, true]].combinations()
-    }
-
-    def 'should not elide command or response in successful normal commands'() {
-        given:
-        def commandName = command.keySet().iterator().next()
-        def protocol = new CommandProtocol('admin', command, new NoOpFieldNameValidator(), new DocumentCodec())
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-        connection.enqueueReply(buildSuccessfulReply('{ok: 1}'));
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        commandListener.eventsWereDelivered([new CommandStartedEvent(1, connection.getDescription(), 'admin', commandName,
-                                                                     command),
-                                             new CommandSucceededEvent(1, connection.getDescription(), commandName,
-                                                                       new BsonDocument('ok', new BsonInt32(1)), 1)])
-        where:
-        [command, async] << [[new BsonDocument('isMaster', new BsonInt32(1)),
-                              new BsonDocument('ping', new BsonInt32(1))
-                             ],
-                             [false, true]].combinations()
-    }
-
-    def 'should not elide response in MongoCommandException in failed normal commands'() {
-        given:
-        def protocol = new CommandProtocol('admin', command, new NoOpFieldNameValidator(), new DocumentCodec())
-        def commandListener = new TestCommandListener()
-        protocol.commandListener = commandListener
-        connection.enqueueReply(buildFailedReply('{ok: 0}'));
-
-        when:
-        execute(protocol, connection, async)
-
-        then:
-        def e = thrown(MongoCommandException)
-
-        def commandFailedEvent = commandListener.events[1] as CommandFailedEvent
-        commandFailedEvent.throwable == e
-
-        where:
-        [command, async] << [[new BsonDocument('isMaster', new BsonInt32(1)),
-                              new BsonDocument('ping', new BsonInt32(1))
-                             ],
-                             [false, true]].combinations()
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ConnectionDescriptionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ConnectionDescriptionSpecification.groovy
index 11e9e31514c..ba3f2bdbb7a 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ConnectionDescriptionSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ConnectionDescriptionSpecification.groovy
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.mongodb.connection
 
 import com.mongodb.ServerAddress
@@ -6,16 +22,19 @@ import spock.lang.Specification
 class ConnectionDescriptionSpecification extends Specification {
     private final id = new ConnectionId(new ServerId(new ClusterId(), new ServerAddress()))
     private final version = new ServerVersion(3, 0)
-    private final description = new ConnectionDescription(id, version, ServerType.STANDALONE, 1, 2, 3)
+    private final description = new ConnectionDescription(id, version, 5, ServerType.STANDALONE, 1, 2, 3,
+    ['zlib'])
 
     def 'should initialize all values'() {
         expect:
         description.connectionId == id
         description.serverVersion == version
+        description.maxWireVersion == 5
         description.serverType == ServerType.STANDALONE
         description.maxBatchCount == 1
         description.maxDocumentSize == 2
         description.maxMessageSize == 3
+        description.compressors == ['zlib']
     }
 
     def 'withConnectionId should return a new instance with the given connectionId and preserve the rest'() {
@@ -27,9 +46,11 @@ class ConnectionDescriptionSpecification extends Specification {
         !newDescription.is(description)
         newDescription.connectionId == newId
         newDescription.serverVersion == version
+        newDescription.maxWireVersion == 5
         newDescription.serverType == ServerType.STANDALONE
         newDescription.maxBatchCount == 1
         newDescription.maxDocumentSize == 2
         newDescription.maxMessageSize == 3
+        newDescription.compressors == ['zlib']
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ConnectionIdSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ConnectionIdSpecification.groovy
index 652c05633a2..d48a104a6ba 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ConnectionIdSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ConnectionIdSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,4 +77,4 @@ class ConnectionIdSpecification extends Specification {
         id2 != id1
         id2.hashCode() != id1.hashCode()
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ConnectionPoolSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ConnectionPoolSettingsSpecification.groovy
index 3c20700a677..220e024e470 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ConnectionPoolSettingsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ConnectionPoolSettingsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 package com.mongodb.connection
 
 import com.mongodb.ConnectionString
+import com.mongodb.event.ConnectionPoolListener
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -58,6 +59,29 @@ class ConnectionPoolSettingsSpecification extends Specification {
                 .maintenanceFrequency(
                 1000, SECONDS)
                 .build()                      | 5000 | 75 | 11 | 101000 | 51000 | 1 | 5000 | 1000000
+        ConnectionPoolSettings
+                .builder(ConnectionPoolSettings.builder()
+                    .maxWaitTime(5, SECONDS)
+                    .maxSize(75)
+                    .maxWaitQueueSize(11)
+                    .maxConnectionLifeTime(101, SECONDS)
+                    .maxConnectionIdleTime(51, SECONDS)
+                    .minSize(1)
+                    .maintenanceInitialDelay(5, SECONDS)
+                    .maintenanceFrequency(1000, SECONDS)
+                    .build())
+                .build()                      | 5000 | 75 | 11 | 101000 | 51000 | 1 | 5000 | 1000000
+        ConnectionPoolSettings
+                .builder(ConnectionPoolSettings.builder().build())
+                .maxWaitTime(5, SECONDS)
+                .maxSize(75)
+                .maxWaitQueueSize(11)
+                .maxConnectionLifeTime(101, SECONDS)
+                .maxConnectionIdleTime(51, SECONDS)
+                .minSize(1)
+                .maintenanceInitialDelay(5, SECONDS)
+                .maintenanceFrequency(1000, SECONDS)
+                .build()                      | 5000 | 75 | 11 | 101000 | 51000 | 1 | 5000 | 1000000
     }
 
     def 'should throw exception on invalid argument'() {
@@ -132,6 +156,27 @@ class ConnectionPoolSettingsSpecification extends Specification {
         settings.getMaxWaitQueueSize() == 70
     }
 
+    def 'should apply settings'() {
+        given:
+        def defaultSettings = ConnectionPoolSettings.builder().build()
+        def customSettings = ConnectionPoolSettings
+                .builder()
+                .addConnectionPoolListener(Stub(ConnectionPoolListener))
+                .maxWaitTime(5, SECONDS)
+                .maxSize(75)
+                .maxWaitQueueSize(11)
+                .maxConnectionLifeTime(101, SECONDS)
+                .maxConnectionIdleTime(51, SECONDS)
+                .minSize(1)
+                .maintenanceInitialDelay(5, SECONDS)
+                .maintenanceFrequency(1000, SECONDS)
+                .build()
+
+        expect:
+        ConnectionPoolSettings.builder().applySettings(customSettings).build() == customSettings
+        ConnectionPoolSettings.builder(customSettings).applySettings(defaultSettings).build() == defaultSettings
+    }
+
     def 'toString should be overridden'() {
         when:
         def settings = ConnectionPoolSettings.builder().maxSize(1).build()
diff --git a/driver-core/src/test/unit/com/mongodb/connection/DefaultConnectionPoolSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/DefaultConnectionPoolSpecification.groovy
deleted file mode 100644
index df01760a73d..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/DefaultConnectionPoolSpecification.groovy
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import category.Slow
-import com.mongodb.MongoException
-import com.mongodb.MongoSocketReadException
-import com.mongodb.MongoSocketWriteException
-import com.mongodb.MongoTimeoutException
-import com.mongodb.MongoWaitQueueFullException
-import com.mongodb.ServerAddress
-import com.mongodb.event.ConnectionPoolListener
-import org.bson.ByteBuf
-import org.junit.experimental.categories.Category
-import spock.lang.Specification
-import spock.lang.Subject
-
-import java.util.concurrent.CountDownLatch
-
-import static com.mongodb.connection.ConnectionPoolSettings.builder
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static java.util.concurrent.TimeUnit.MINUTES
-
-class DefaultConnectionPoolSpecification extends Specification {
-    private static final ServerId SERVER_ID = new ServerId(new ClusterId(), new ServerAddress())
-
-    private final TestInternalConnectionFactory connectionFactory = Spy(TestInternalConnectionFactory)
-
-    @Subject
-    private DefaultConnectionPool pool
-
-    def cleanup() {
-        pool.close()
-    }
-
-    def 'should get non null connection'() throws InterruptedException {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).build(),
-                                         new NoOpConnectionPoolListener())
-
-        expect:
-        pool.get() != null
-    }
-
-    def 'should reuse released connection'() throws InterruptedException {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).build(),
-                                         new NoOpConnectionPoolListener())
-
-        when:
-        pool.get().close()
-        pool.get()
-
-        then:
-        1 * connectionFactory.create(SERVER_ID)
-    }
-
-    def 'should release a connection back into the pool on close, not close the underlying connection'() throws InterruptedException {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).build(),
-                                         new NoOpConnectionPoolListener())
-
-        when:
-        pool.get().close()
-
-        then:
-        !connectionFactory.getCreatedConnections().get(0).isClosed()
-    }
-
-    def 'should throw if pool is exhausted'() throws InterruptedException {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).maxWaitTime(1, MILLISECONDS).build(),
-                                         new NoOpConnectionPoolListener())
-
-        when:
-        def first = pool.get()
-
-        then:
-        first != null
-
-        when:
-        pool.get()
-
-        then:
-        thrown(MongoTimeoutException)
-    }
-
-    def 'should throw on timeout'() throws InterruptedException {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).maxWaitTime(50, MILLISECONDS).build(),
-                                         new NoOpConnectionPoolListener())
-        pool.get()
-
-        when:
-        TimeoutTrackingConnectionGetter connectionGetter = new TimeoutTrackingConnectionGetter(pool)
-        new Thread(connectionGetter).start()
-
-        connectionGetter.latch.await()
-
-        then:
-        connectionGetter.gotTimeout
-    }
-
-    def 'should expire all connection after exception'() throws InterruptedException {
-        given:
-        int numberOfConnectionsCreated = 0
-
-        def mockConnectionFactory = Mock(InternalConnectionFactory)
-        mockConnectionFactory.create(_) >> {
-            numberOfConnectionsCreated++
-            Mock(InternalConnection) {
-                sendMessage(_, _) >> { throw new MongoSocketWriteException('', SERVER_ID.address, new IOException()) }
-                receiveMessage(_) >> { throw new MongoSocketReadException('', SERVER_ID.address, new IOException()) }
-                getDescription() >> {
-                    new ConnectionDescription(SERVER_ID);
-                }
-            }
-        }
-
-        pool = new DefaultConnectionPool(SERVER_ID, mockConnectionFactory, builder().maxSize(2).maxWaitQueueSize(1).build(),
-                                         new NoOpConnectionPoolListener())
-        when:
-        def c1 = pool.get()
-        def c2 = pool.get()
-
-        and:
-        c2.sendMessage(Collections.<ByteBuf> emptyList(), 1)
-
-        then:
-        thrown(MongoSocketWriteException)
-
-        and:
-        c1.close()
-        c2.close()
-        pool.get().close()
-
-        then:
-        numberOfConnectionsCreated == 3
-
-        when:
-        c1 = pool.get()
-        c2 = pool.get()
-
-        and:
-        c2.receiveMessage(1)
-
-        then:
-        thrown(MongoSocketReadException)
-
-        and:
-        c1.close()
-        c2.close()
-        pool.get().close()
-
-        then:
-        numberOfConnectionsCreated == 5
-    }
-
-    def 'should expire all connection after exception asynchronously'() {
-        given:
-        int numberOfConnectionsCreated = 0
-
-        def mockConnectionFactory = Mock(InternalConnectionFactory)
-        mockConnectionFactory.create(_) >> {
-            numberOfConnectionsCreated++
-            Mock(InternalConnection) {
-                sendMessageAsync(_, _, _) >> {
-                    it[2].onResult(null, new MongoSocketWriteException('', SERVER_ID.address, new IOException()))
-                };
-                receiveMessageAsync(_, _) >> {
-                    it[1].onResult(null, new MongoSocketReadException('', SERVER_ID.address, new IOException()))
-                };
-                getDescription() >> {
-                    new ConnectionDescription(SERVER_ID);
-                }
-            }
-        }
-
-        pool = new DefaultConnectionPool(SERVER_ID, mockConnectionFactory,
-                                         builder().maxSize(2).maxWaitQueueSize(1).build(),
-                                         new NoOpConnectionPoolListener())
-        when:
-        def c1 = pool.get()
-        def c2 = pool.get()
-
-        and:
-        def e;
-        c2.sendMessageAsync(Collections.<ByteBuf> emptyList(), 1) {
-            result, t -> e = t
-        }
-
-        then:
-        e instanceof MongoSocketWriteException
-
-        and:
-        c1.close()
-        c2.close()
-        pool.get().close()
-
-        then:
-        numberOfConnectionsCreated == 3
-
-        when:
-        c1 = pool.get()
-        c2 = pool.get()
-
-        and:
-        c2.receiveMessageAsync(1) {
-            result, t -> e = t
-        }
-
-        then:
-        e instanceof MongoSocketReadException
-
-        and:
-        c1.close()
-        c2.close()
-        pool.get().close()
-
-        then:
-        numberOfConnectionsCreated == 5
-    }
-
-    def 'should have size of 0 with default settings'() {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(10).maintenanceInitialDelay(5, MINUTES).build(),
-                                         new NoOpConnectionPoolListener())
-
-        when:
-        pool.doMaintenance()
-
-        then:
-        connectionFactory.createdConnections.size() == 0
-    }
-
-    @Category(Slow)
-    def 'should ensure min pool size after maintenance task runs'() {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(10).minSize(5).maintenanceInitialDelay(5, MINUTES).build(),
-                                         new NoOpConnectionPoolListener())
-
-        when:
-        pool.doMaintenance()
-        //not cool - but we have no way of being notified that the maintenance task has finished
-        Thread.sleep(500)
-
-        then:
-        connectionFactory.createdConnections.size() == 5
-        connectionFactory.createdConnections.get(0).opened()  // if the first one is opened, they all should be
-    }
-
-    def 'should invoke connection pool opened event'() {
-        given:
-        def listener = Mock(ConnectionPoolListener)
-        def settings = builder().maxSize(10).minSize(5).build()
-
-        when:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, settings, listener)
-
-        then:
-        1 * listener.connectionPoolOpened { it.serverId == SERVER_ID && it.settings == settings }
-    }
-
-    def 'should invoke connection pool closed event'() {
-        given:
-        def listener = Mock(ConnectionPoolListener)
-        def settings = builder().maxSize(10).minSize(5).build()
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, settings, listener)
-        when:
-        pool.close()
-
-        then:
-        1 * listener.connectionPoolClosed { it.serverId == SERVER_ID }
-    }
-
-    def 'should fire connection added to pool event'() {
-        given:
-        def listener = Mock(ConnectionPoolListener)
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(10).maxWaitQueueSize(1).build(), listener)
-
-        when:
-        pool.get()
-
-        then:
-        1 * listener.connectionAdded { it.connectionId.serverId == SERVER_ID }
-    }
-
-    def 'should fire connection removed from pool event'() {
-        given:
-        def listener = Mock(ConnectionPoolListener)
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(10).maxWaitQueueSize(1).build(), listener)
-        def connection = pool.get()
-        connection.close()
-
-        when:
-        pool.close()
-
-        then:
-        1 * listener.connectionRemoved { it.connectionId.serverId == SERVER_ID }
-    }
-
-    def 'should fire connection pool events on check out and check in'() {
-        given:
-        def listener = Mock(ConnectionPoolListener)
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(1).maxWaitQueueSize(1).build(), listener)
-        def connection = pool.get()
-        connection.close()
-
-        when:
-        connection = pool.get()
-
-        then:
-        1 * listener.waitQueueEntered { it.serverId == SERVER_ID && it.threadId == Thread.currentThread().getId() }
-        1 * listener.connectionCheckedOut { it.connectionId.serverId == SERVER_ID }
-        1 * listener.waitQueueExited { it.serverId == SERVER_ID && it.threadId == Thread.currentThread().getId() }
-
-        when:
-        connection.close()
-
-        then:
-        1 * listener.connectionCheckedIn { it.connectionId.serverId == SERVER_ID }
-    }
-
-    def 'should not fire any more events after pool is closed'() {
-        def listener = Mock(ConnectionPoolListener)
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(1).maxWaitQueueSize(1).build(), listener)
-        def connection = pool.get()
-        pool.close()
-
-        when:
-        connection.close()
-
-        then:
-        0 * listener.connectionCheckedIn { it.connectionId.serverId == SERVER_ID && it.clusterId == SERVER_ID.clusterId }
-        0 * listener.connectionRemoved { it.connectionId.serverId == SERVER_ID && it.clusterId == SERVER_ID.clusterId }
-    }
-
-    def 'should select connection asynchronously if one is immediately available'() {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).build(), new NoOpConnectionPoolListener())
-
-        expect:
-        selectConnectionAsyncAndGet(pool).opened()
-    }
-
-    def 'should select connection asynchronously if one is not immediately available'() {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).build(), new NoOpConnectionPoolListener())
-
-        when:
-        def connection = pool.get()
-        def connectionLatch = selectConnectionAsync(pool)
-        connection.close()
-
-        then:
-        connectionLatch.get()
-    }
-
-    def 'when getting a connection asynchronously should send MongoTimeoutException to callback after timeout period'() {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(2).maxWaitTime(5, MILLISECONDS).build(),
-                                         new NoOpConnectionPoolListener())
-
-        pool.get()
-        def firstConnectionLatch = selectConnectionAsync(pool)
-        def secondConnectionLatch = selectConnectionAsync(pool)
-
-        when:
-        firstConnectionLatch.get()
-
-        then:
-        thrown(MongoTimeoutException)
-
-        when:
-        secondConnectionLatch.get()
-
-        then:
-        thrown(MongoTimeoutException)
-    }
-
-    def 'when getting a connection asynchronously should send MongoWaitQueueFullException to callback if there are too many waiters'() {
-        given:
-        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                                         builder().maxSize(1).maxWaitQueueSize(1).build(), new NoOpConnectionPoolListener())
-
-        when:
-        pool.get()
-        selectConnectionAsync(pool)
-        selectConnectionAsyncAndGet(pool)
-
-        then:
-        thrown(MongoWaitQueueFullException)
-    }
-
-    def selectConnectionAsyncAndGet(DefaultConnectionPool pool) {
-        selectConnectionAsync(pool).get()
-    }
-
-    def selectConnectionAsync(DefaultConnectionPool pool) {
-        def serverLatch = new ConnectionLatch()
-        pool.getAsync { InternalConnection result, MongoException e ->
-            serverLatch.connection = result
-            serverLatch.throwable = e
-            serverLatch.latch.countDown()
-        }
-        serverLatch
-    }
-
-    class ConnectionLatch {
-        CountDownLatch latch = new CountDownLatch(1)
-        InternalConnection connection
-        Throwable throwable
-
-        def get() {
-            latch.await()
-            if (throwable != null) {
-                throw throwable
-            }
-            connection
-        }
-    }
-
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/DefaultServerConnectionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/DefaultServerConnectionSpecification.groovy
deleted file mode 100644
index e5bd8df3aa1..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/DefaultServerConnectionSpecification.groovy
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoNamespace
-import com.mongodb.ServerAddress
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.bulk.DeleteRequest
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.bulk.UpdateRequest
-import com.mongodb.bulk.WriteRequest
-import com.mongodb.diagnostics.logging.Logger
-import com.mongodb.internal.validator.NoOpFieldNameValidator
-import org.bson.BsonBoolean
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.codecs.BsonDocumentCodec
-import spock.lang.Shared
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.compare
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.connection.ServerType.SHARD_ROUTER
-import static com.mongodb.connection.ServerType.STANDALONE
-import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback
-import static java.util.Arrays.asList
-
-class DefaultServerConnectionSpecification extends Specification {
-    def namespace = new MongoNamespace('test', 'test')
-    def internalConnection = Mock(InternalConnection)
-    def callback = errorHandlingCallback(Mock(SingleResultCallback), Mock(Logger))
-    def executor = Mock(ProtocolExecutor)
-    @Shared
-    def standaloneConnectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                                    new ServerVersion(3, 0), STANDALONE, 100, 100, 100)
-    @Shared
-    def mongosConnectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
-                                                                new ServerVersion(3, 0), SHARD_ROUTER, 100, 100, 100)
-    def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
-
-    def 'should execute insert protocol'() {
-        given:
-        def inserts = asList(new InsertRequest(new BsonDocument()))
-
-        when:
-        connection.insert(namespace, true, ACKNOWLEDGED, inserts)
-
-        then:
-        1 * executor.execute({ compare(new InsertProtocol(namespace, true, ACKNOWLEDGED, inserts), it) }, internalConnection)
-    }
-
-    def 'should execute update protocol'() {
-        given:
-        def updates = asList(new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.REPLACE))
-
-        when:
-        connection.update(namespace, true, ACKNOWLEDGED, updates)
-
-        then:
-        1 * executor.execute({ compare(new UpdateProtocol(namespace, true, ACKNOWLEDGED, updates), it) }, internalConnection)
-    }
-
-    def 'should execute delete protocol'() {
-        given:
-        def deletes = asList(new DeleteRequest(new BsonDocument()))
-
-        when:
-        connection.delete(namespace, true, ACKNOWLEDGED, deletes)
-
-        then:
-        1 * executor.execute({ compare(new DeleteProtocol(namespace, true, ACKNOWLEDGED, deletes), it) }, internalConnection)
-    }
-
-    def 'should execute insert command protocol'() {
-        given:
-        def inserts = asList(new InsertRequest(new BsonDocument()))
-
-        when:
-        connection.insertCommand(namespace, true, ACKNOWLEDGED, inserts)
-
-        then:
-        1 * executor.execute({ compare(new InsertCommandProtocol(namespace, true, ACKNOWLEDGED, null, inserts), it) }, internalConnection)
-    }
-
-    def 'should execute update command protocol'() {
-        given:
-        def updates = asList(new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.REPLACE))
-
-        when:
-        connection.updateCommand(namespace, true, ACKNOWLEDGED, updates)
-
-        then:
-        1 * executor.execute({ compare(new UpdateCommandProtocol(namespace, true, ACKNOWLEDGED, null, updates), it) }, internalConnection)
-    }
-
-    def 'should execute delete command protocol'() {
-        given:
-        def deletes = asList(new DeleteRequest(new BsonDocument()))
-
-        when:
-        connection.deleteCommand(namespace, true, ACKNOWLEDGED, deletes)
-
-        then:
-        1 * executor.execute({ compare(new DeleteCommandProtocol(namespace, true, ACKNOWLEDGED, deletes), it) }, internalConnection)
-    }
-
-    def 'should execute command protocol'() {
-        given:
-        def command = new BsonDocument('ismaster', new BsonInt32(1))
-        def validator = new NoOpFieldNameValidator()
-        def codec = new BsonDocumentCodec()
-
-        when:
-        connection.command('test', command, slaveOk, validator, codec)
-
-        then:
-        1 * executor.execute({ compare(new CommandProtocol('test', command, validator, codec).slaveOk(slaveOk), it) }, internalConnection)
-
-        where:
-        slaveOk << [true, false]
-    }
-
-    def 'should set slaveOk when executing command protocol on connection in SINGLE connection mode'() {
-        given:
-        def command = new BsonDocument('ismaster', new BsonInt32(1))
-        def validator = new NoOpFieldNameValidator()
-        def codec = new BsonDocumentCodec()
-        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
-        internalConnection.description >> connectionDescription
-
-        when:
-        connection.command('test', command, false, validator, codec)
-
-        then:
-        1 * executor.execute({ compare(new CommandProtocol('test', command, validator, codec).slaveOk(expectedSlaveOk), it) },
-                             internalConnection)
-
-        where:
-        connectionDescription           | expectedSlaveOk
-        standaloneConnectionDescription | true
-        mongosConnectionDescription     | false
-    }
-
-    def 'should execute query protocol'() {
-        given:
-        def decoder = new BsonDocumentCodec()
-        def query = new BsonDocument('x', BsonBoolean.TRUE)
-        def fields = new BsonDocument('y', new BsonInt32(1))
-
-        when:
-        connection.query(namespace, query, fields, 1, 2, slaveOk, false, true, false, true, false, decoder)
-
-        then:
-        1 * executor.execute({
-                                 compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
-                                                 .slaveOk(slaveOk)
-                                                 .tailableCursor(false)
-                                                 .awaitData(true)
-                                                 .noCursorTimeout(false)
-                                                 .partial(true)
-                                                 .oplogReplay(false)
-                                         , it)
-                             }, internalConnection)
-
-        where:
-        slaveOk << [true, false]
-    }
-
-    def 'should set slaveOk when executing query protocol on connection in SINGLE connection mode'() {
-        given:
-        def decoder = new BsonDocumentCodec()
-        def query = new BsonDocument('x', BsonBoolean.TRUE)
-        def fields = new BsonDocument('y', new BsonInt32(1))
-        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
-        internalConnection.description >> connectionDescription
-
-        when:
-        connection.query(namespace, query, fields, 1, 2, false, false, true, false, true, false, decoder)
-
-        then:
-        1 * executor.execute({
-                                 compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
-                                               .slaveOk(expectedSlaveOk)
-                                               .tailableCursor(false)
-                                               .awaitData(true)
-                                               .noCursorTimeout(false)
-                                               .partial(true)
-                                               .oplogReplay(false)
-                                       , it)
-                             }, internalConnection)
-
-        where:
-        connectionDescription           | expectedSlaveOk
-        standaloneConnectionDescription | true
-        mongosConnectionDescription     | false
-    }
-
-    def 'should execute getmore protocol'() {
-        given:
-        def codec = new BsonDocumentCodec()
-
-        when:
-        connection.getMore(namespace, 1000L, 1, codec)
-
-        then:
-        1 * executor.execute({ compare(new GetMoreProtocol(namespace, 1000L, 1, codec), it) }, internalConnection)
-    }
-
-    def 'should execute kill cursor protocol'() {
-        when:
-        connection.killCursor([5])
-
-        then:
-        1 * executor.execute({ compare(new KillCursorProtocol(null, [5]), it) }, internalConnection)
-
-        when:
-        connection.killCursor(namespace, [5])
-
-        then:
-        1 * executor.execute({ compare(new KillCursorProtocol(namespace, [5]), it) }, internalConnection)
-    }
-
-    def 'should execute insert protocol asynchronously'() {
-        given:
-        def inserts = asList(new InsertRequest(new BsonDocument()))
-
-        when:
-        connection.insertAsync(namespace, true, ACKNOWLEDGED, inserts, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new InsertProtocol(namespace, true, ACKNOWLEDGED, inserts), it) }, internalConnection, callback)
-    }
-
-    def 'should execute update protocol asynchronously'() {
-        given:
-        def updates = asList(new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.REPLACE))
-
-        when:
-        connection.updateAsync(namespace, true, ACKNOWLEDGED, updates, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new UpdateProtocol(namespace, true, ACKNOWLEDGED, updates), it) },
-                                  internalConnection, callback)
-    }
-
-    def 'should execute delete protocol asynchronously'() {
-        given:
-        def deletes = asList(new DeleteRequest(new BsonDocument()))
-
-        when:
-        connection.deleteAsync(namespace, true, ACKNOWLEDGED, deletes, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new DeleteProtocol(namespace, true, ACKNOWLEDGED, deletes), it) }, internalConnection, callback)
-    }
-
-    def 'should execute insert command protocol asynchronously'() {
-        given:
-        def inserts = asList(new InsertRequest(new BsonDocument()))
-
-        when:
-        connection.insertCommandAsync(namespace, true, ACKNOWLEDGED, inserts, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new InsertCommandProtocol(namespace, true, ACKNOWLEDGED, null, inserts), it) },
-                                  internalConnection, callback)
-    }
-
-    def 'should execute update command protocol asynchronously'() {
-        given:
-        def updates = asList(new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.REPLACE))
-
-        when:
-        connection.updateCommandAsync(namespace, true, ACKNOWLEDGED, updates, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new UpdateCommandProtocol(namespace, true, ACKNOWLEDGED, null, updates), it) },
-                                  internalConnection, callback)
-    }
-
-    def 'should execute delete command protocol asynchronously'() {
-        given:
-        def deletes = asList(new DeleteRequest(new BsonDocument()))
-
-        when:
-        connection.deleteCommandAsync(namespace, true, ACKNOWLEDGED, deletes, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new DeleteCommandProtocol(namespace, true, ACKNOWLEDGED, deletes), it) },
-                                  internalConnection, callback)
-    }
-
-    def 'should execute command protocol asynchronously'() {
-        given:
-        def command = new BsonDocument('ismaster', new BsonInt32(1))
-        def validator = new NoOpFieldNameValidator()
-        def codec = new BsonDocumentCodec()
-
-        when:
-        connection.commandAsync('test', command, slaveOk, validator, codec, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new CommandProtocol('test', command, validator, codec).slaveOk(slaveOk), it) },
-                                  internalConnection, callback)
-
-        where:
-        slaveOk << [true, false]
-    }
-
-    def 'should set slaveOk when executing command protocol on connection in SINGLE connection mode asynchronously'() {
-        given:
-        def command = new BsonDocument('ismaster', new BsonInt32(1))
-        def validator = new NoOpFieldNameValidator()
-        def codec = new BsonDocumentCodec()
-        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
-        internalConnection.description >> connectionDescription
-
-        when:
-        connection.commandAsync('test', command, false, validator, codec, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new CommandProtocol('test', command, validator, codec).slaveOk(expectedSlaveOk), it) },
-                                  internalConnection, callback)
-
-        where:
-        connectionDescription           | expectedSlaveOk
-        standaloneConnectionDescription | true
-        mongosConnectionDescription     | false
-    }
-
-    def 'should execute query protocol asynchronously'() {
-        given:
-        def decoder = new BsonDocumentCodec()
-        def query = new BsonDocument('x', BsonBoolean.TRUE)
-        def fields = new BsonDocument('y', new BsonInt32(1))
-
-        when:
-        connection.queryAsync(namespace, query, fields, 1, 2, slaveOk, false, true, false, true, false, decoder, callback)
-
-        then:
-        1 * executor.executeAsync({
-                                      compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
-                                               .slaveOk(slaveOk)
-                                               .tailableCursor(false)
-                                               .awaitData(true)
-                                               .noCursorTimeout(false)
-                                               .partial(true)
-                                               .oplogReplay(false)
-                                       , it)
-                             }, internalConnection, callback)
-
-        where:
-        slaveOk << [true, false]
-    }
-
-    def 'should set slaveOk when executing query protocol on connection in SINGLE connection mode asynchronously'() {
-        given:
-        def decoder = new BsonDocumentCodec()
-        def query = new BsonDocument('x', BsonBoolean.TRUE)
-        def fields = new BsonDocument('y', new BsonInt32(1))
-        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
-        internalConnection.description >> connectionDescription
-
-        when:
-        connection.queryAsync(namespace, query, fields, 1, 2, false, false, true, false, true, false, decoder, callback)
-
-        then:
-        1 * executor.executeAsync({
-                                      compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
-                                               .slaveOk(expectedSlaveOk)
-                                               .tailableCursor(false)
-                                               .awaitData(true)
-                                               .noCursorTimeout(false)
-                                               .partial(true)
-                                               .oplogReplay(false)
-                                       , it)
-                             }, internalConnection, callback)
-
-        where:
-        connectionDescription           | expectedSlaveOk
-        standaloneConnectionDescription | true
-        mongosConnectionDescription     | false
-    }
-
-    def 'should execute getmore protocol asynchronously'() {
-        given:
-        def codec = new BsonDocumentCodec()
-
-        when:
-        connection.getMoreAsync(namespace, 1000L, 1, codec, callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new GetMoreProtocol(namespace, 1000L, 1, codec), it) }, internalConnection, callback)
-    }
-
-    def 'should execute kill cursor protocol asynchronously'() {
-        when:
-        connection.killCursorAsync([5], callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new KillCursorProtocol(null, [5]), it) }, internalConnection, callback)
-
-        when:
-        connection.killCursorAsync(namespace, [5], callback)
-
-        then:
-        1 * executor.executeAsync({ compare(new KillCursorProtocol(namespace, [5]), it) }, internalConnection, callback)
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/DefaultServerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/DefaultServerSpecification.groovy
deleted file mode 100644
index 9cdfbe9ac8a..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/DefaultServerSpecification.groovy
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * Copyright 2008-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoException
-import com.mongodb.MongoNamespace
-import com.mongodb.MongoNodeIsRecoveringException
-import com.mongodb.MongoNotPrimaryException
-import com.mongodb.MongoSecurityException
-import com.mongodb.MongoSocketException
-import com.mongodb.MongoSocketReadTimeoutException
-import com.mongodb.ServerAddress
-import com.mongodb.WriteConcernResult
-import com.mongodb.async.FutureResultCallback
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.event.CommandListener
-import com.mongodb.event.ServerListener
-import com.mongodb.internal.validator.NoOpFieldNameValidator
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.codecs.BsonDocumentCodec
-import spock.lang.Specification
-
-import java.util.concurrent.CountDownLatch
-
-import static com.mongodb.MongoCredential.createCredential
-import static com.mongodb.WriteConcern.ACKNOWLEDGED
-import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
-import static com.mongodb.connection.ClusterConnectionMode.SINGLE
-import static java.util.Arrays.asList
-import static java.util.concurrent.TimeUnit.SECONDS
-
-class DefaultServerSpecification extends Specification {
-
-    def serverId = new ServerId(new ClusterId(), new ServerAddress())
-
-    def 'should get a connection'() {
-        given:
-        def connectionPool = Stub(ConnectionPool)
-        def connectionFactory = Mock(ConnectionFactory)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Stub(ServerMonitor)
-        def internalConnection = Stub(InternalConnection)
-        def connection = Stub(Connection)
-
-        serverMonitorFactory.create(_, _) >> { serverMonitor }
-        connectionPool.get() >> { internalConnection }
-        def server = new DefaultServer(serverId, mode, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], null)
-
-        when:
-        def receivedConnection = server.getConnection()
-
-        then:
-        receivedConnection
-        1 * connectionFactory.create(internalConnection, _, mode) >> connection
-
-        where:
-        mode << [SINGLE, MULTIPLE]
-    }
-
-    def 'should get a connection asynchronously'() {
-        given:
-        def connectionPool = Stub(ConnectionPool)
-        def connectionFactory = Mock(ConnectionFactory)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Stub(ServerMonitor)
-        def internalConnection = Stub(InternalConnection)
-        def connection = Stub(AsyncConnection)
-
-        connectionPool.getAsync(_) >> {
-            it[0].onResult(internalConnection, null)
-        }
-        serverMonitorFactory.create(_, _) >> { serverMonitor }
-
-        def server = new DefaultServer(serverId, mode, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], null)
-
-        when:
-        def latch = new CountDownLatch(1)
-        def receivedConnection
-        def receivedThrowable
-        server.getConnectionAsync { result, throwable -> receivedConnection = result; receivedThrowable = throwable; latch.countDown() }
-        latch.await()
-
-        then:
-        receivedConnection
-        !receivedThrowable
-        1 * connectionFactory.createAsync(_, _, mode) >> connection
-
-        where:
-        mode << [SINGLE, MULTIPLE]
-    }
-
-    def 'invalidate should invoke server listeners'() {
-        given:
-        def serverListener = Mock(ServerListener)
-
-        def connectionFactory = Mock(ConnectionFactory)
-        def server = new DefaultServer(serverId, SINGLE, new TestConnectionPool(), connectionFactory,
-                new TestServerMonitorFactory(serverId),
-                [serverListener], null)
-
-        when:
-        server.invalidate();
-
-        then:
-        1 * serverListener.serverDescriptionChanged(_)
-
-        cleanup:
-        server?.close()
-    }
-
-    def 'failed open should invalidate the server'() {
-        given:
-        def connectionPool = Mock(ConnectionPool)
-        def connectionFactory = Mock(ConnectionFactory)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Mock(ServerMonitor)
-        connectionPool.get() >> { throw new MongoSecurityException(createCredential('jeff', 'admin', '123'.toCharArray()), 'Auth failed') }
-        serverMonitorFactory.create(_) >> { serverMonitor }
-
-        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], null)
-
-        when:
-        server.getConnection()
-
-        then:
-        thrown(MongoSecurityException)
-        1 * connectionPool.invalidate()
-        1 * serverMonitor.connect()
-    }
-
-    def 'failed open should invalidate the server asychronously'() {
-        given:
-        def connectionFactory = Mock(ConnectionFactory)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Mock(ServerMonitor)
-        serverMonitorFactory.create(_) >> { serverMonitor }
-
-        def exceptionToThrow = new MongoSecurityException(createCredential('jeff', 'admin',
-                '123'.toCharArray()),
-                'Auth failed')
-        def server = new DefaultServer(serverId, SINGLE, new TestConnectionPool(exceptionToThrow), connectionFactory,
-                serverMonitorFactory, [new NoOpServerListener()], null)
-
-        when:
-        def latch = new CountDownLatch(1)
-        def receivedConnection
-        def receivedThrowable
-        server.getConnectionAsync { result, throwable -> receivedConnection = result; receivedThrowable = throwable; latch.countDown() }
-        latch.await()
-
-        then:
-        !receivedConnection
-        receivedThrowable.is(exceptionToThrow)
-        1 * serverMonitor.connect()
-    }
-
-    def 'should invalidate on MongoNotPrimaryException'() {
-        given:
-        def connectionPool = Mock(ConnectionPool)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Mock(ServerMonitor)
-        def internalConnection = Mock(InternalConnection)
-        connectionPool.get() >> { internalConnection }
-        serverMonitorFactory.create(_) >> { serverMonitor }
-
-        TestConnectionFactory connectionFactory = new TestConnectionFactory()
-
-        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], null)
-        def testConnection = (TestConnection) server.getConnection()
-
-        when:
-        testConnection.enqueueProtocol(new TestProtocol(new MongoNotPrimaryException(serverId.address)))
-
-        testConnection.insert(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())))
-
-        then:
-        thrown(MongoNotPrimaryException)
-        1 * connectionPool.invalidate()
-        1 * serverMonitor.connect()
-
-        when:
-        def futureResultCallback = new FutureResultCallback()
-        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())),
-                futureResultCallback);
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        thrown(MongoNotPrimaryException)
-        1 * connectionPool.invalidate()
-        1 * serverMonitor.connect()
-
-        when:
-        futureResultCallback = new FutureResultCallback()
-        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())),
-                futureResultCallback);
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        thrown(MongoNotPrimaryException)
-        1 * connectionPool.invalidate()
-        1 * serverMonitor.connect()
-    }
-
-    def 'should invalidate on MongoNodeIsRecoveringException'() {
-        given:
-        def connectionPool = Mock(ConnectionPool)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Mock(ServerMonitor)
-        def internalConnection = Mock(InternalConnection)
-        connectionPool.get() >> { internalConnection }
-        serverMonitorFactory.create(_) >> { serverMonitor }
-
-        TestConnectionFactory connectionFactory = new TestConnectionFactory()
-
-        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], null)
-        def testConnection = (TestConnection) server.getConnection()
-
-        when:
-        testConnection.enqueueProtocol(new TestProtocol(new MongoNodeIsRecoveringException(new ServerAddress())))
-
-        testConnection.insert(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())))
-
-        then:
-        thrown(MongoNodeIsRecoveringException)
-        1 * connectionPool.invalidate()
-        1 * serverMonitor.connect()
-    }
-
-
-    def 'should invalidate on MongoSocketException'() {
-        given:
-        def connectionPool = Mock(ConnectionPool)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Mock(ServerMonitor)
-        def internalConnection = Mock(InternalConnection)
-        connectionPool.get() >> { internalConnection }
-        serverMonitorFactory.create(_) >> { serverMonitor }
-
-        TestConnectionFactory connectionFactory = new TestConnectionFactory()
-
-        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], null)
-        def testConnection = (TestConnection) server.getConnection()
-
-        when:
-        testConnection.enqueueProtocol(new TestProtocol(new MongoSocketException('socket error', new ServerAddress())))
-
-        testConnection.insert(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())))
-
-        then:
-        thrown(MongoSocketException)
-        1 * connectionPool.invalidate()
-        1 * serverMonitor.connect()
-
-        when:
-        def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
-        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())),
-                futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        thrown(MongoSocketException)
-        1 * connectionPool.invalidate()
-        1 * serverMonitor.connect()
-    }
-
-    def 'should not invalidate on MongoSocketReadTimeoutException'() {
-        given:
-        def connectionPool = Mock(ConnectionPool)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Mock(ServerMonitor)
-        def internalConnection = Mock(InternalConnection)
-        connectionPool.get() >> { internalConnection }
-        serverMonitorFactory.create(_, _) >> { serverMonitor }
-
-        TestConnectionFactory connectionFactory = new TestConnectionFactory()
-
-        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], null)
-        def testConnection = (TestConnection) server.getConnection()
-
-        when:
-        testConnection.enqueueProtocol(new TestProtocol(new MongoSocketReadTimeoutException('socket timeout', new ServerAddress(),
-                new IOException())))
-
-        testConnection.insert(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())))
-
-        then:
-        thrown(MongoSocketReadTimeoutException)
-        0 * connectionPool.invalidate()
-        0 * serverMonitor.connect()
-
-        when:
-        def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
-        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, ACKNOWLEDGED, asList(new InsertRequest(new BsonDocument())),
-                futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        thrown(MongoSocketReadTimeoutException)
-        0 * connectionPool.invalidate()
-        0 * serverMonitor.connect()
-    }
-
-    def 'should enable command listener'() {
-        given:
-        def protocol = new TestProtocol()
-        def commandListener = Stub(CommandListener)
-        def connectionPool = Mock(ConnectionPool)
-        def serverMonitorFactory = Stub(ServerMonitorFactory)
-        def serverMonitor = Mock(ServerMonitor)
-        def internalConnection = Mock(InternalConnection)
-        connectionPool.get() >> { internalConnection }
-        serverMonitorFactory.create(_, _) >> { serverMonitor }
-
-        TestConnectionFactory connectionFactory = new TestConnectionFactory()
-
-        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
-                [new NoOpServerListener()], commandListener)
-        def testConnection = (TestConnection) server.getConnection()
-
-        testConnection.enqueueProtocol(protocol)
-
-        when:
-        if (async) {
-            CountDownLatch latch = new CountDownLatch(1)
-            testConnection.commandAsync('admin', new BsonDocument('ping', new BsonInt32(1)), false, new NoOpFieldNameValidator(),
-                    new BsonDocumentCodec()) {
-                BsonDocument result, Throwable t -> latch.countDown()
-            }
-            latch.await()
-
-        } else {
-            testConnection.command('admin', new BsonDocument('ping', new BsonInt32(1)), false, new NoOpFieldNameValidator(),
-                    new BsonDocumentCodec())
-        }
-
-        then:
-        protocol.commandListener == commandListener
-
-        where:
-        async << [false, true]
-    }
-
-    class TestProtocol implements Protocol {
-        private MongoException mongoException
-        private CommandListener commandListener
-
-        TestProtocol() {
-            this(null)
-        }
-
-        TestProtocol(MongoException mongoException) {
-            this.mongoException = mongoException
-        }
-
-        @Override
-        Object execute(final InternalConnection connection) {
-            if (mongoException != null) {
-                throw mongoException;
-            }
-        }
-
-        @Override
-        void executeAsync(final InternalConnection connection, final SingleResultCallback callback) {
-            callback.onResult(null, mongoException);
-        }
-
-        @Override
-        void setCommandListener(final CommandListener commandListener) {
-            this.commandListener = commandListener
-        }
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/DefaultTestClusterableServerFactory.java b/driver-core/src/test/unit/com/mongodb/connection/DefaultTestClusterableServerFactory.java
deleted file mode 100644
index 7a5301cfe10..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/DefaultTestClusterableServerFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.ServerAddress;
-import com.mongodb.event.ServerListener;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static java.util.Arrays.asList;
-
-public class DefaultTestClusterableServerFactory implements ClusterableServerFactory {
-    private final ServerSettings settings = ServerSettings.builder().build();
-    private final ClusterId clusterId;
-    private final ClusterConnectionMode clusterConnectionMode;
-    private final ServerListenerFactory serverListenerFactory;
-    private final Map<ServerAddress, TestServerMonitorFactory> serverAddressToServerMonitorFactoryMap =
-            new HashMap<ServerAddress, TestServerMonitorFactory>();
-
-    public DefaultTestClusterableServerFactory(final ClusterId clusterId, final ClusterConnectionMode clusterConnectionMode,
-                                               final ServerListenerFactory serverListenerFactory) {
-        this.clusterId = clusterId;
-        this.clusterConnectionMode = clusterConnectionMode;
-        this.serverListenerFactory = serverListenerFactory;
-    }
-
-    @Override
-    public ClusterableServer create(final ServerAddress serverAddress, final ServerListener serverListener) {
-        TestServerMonitorFactory serverMonitorFactory = new TestServerMonitorFactory(new ServerId(clusterId, serverAddress));
-        serverAddressToServerMonitorFactoryMap.put(serverAddress, serverMonitorFactory);
-
-
-
-        return new DefaultServer(new ServerId(clusterId, serverAddress), clusterConnectionMode, new TestConnectionPool(),
-                new TestConnectionFactory(), serverMonitorFactory,
-                                        asList(serverListener, serverListenerFactory.create(serverAddress)), null);
-    }
-
-    @Override
-    public ServerSettings getSettings() {
-        return settings;
-    }
-
-
-    public void sendNotification(final ServerAddress serverAddress, final ServerDescription serverDescription) {
-        serverAddressToServerMonitorFactoryMap.get(serverAddress).sendNotification(serverDescription);
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/DescriptionHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/DescriptionHelperSpecification.groovy
deleted file mode 100644
index 7eb5b52a491..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/DescriptionHelperSpecification.groovy
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright 2015-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.ServerAddress
-import com.mongodb.Tag
-import com.mongodb.TagSet
-import org.bson.types.ObjectId
-import spock.lang.Specification
-
-import java.util.concurrent.TimeUnit
-
-import static com.mongodb.connection.DescriptionHelper.createConnectionDescription
-import static com.mongodb.connection.DescriptionHelper.createServerDescription
-import static org.bson.BsonDocument.parse
-
-class DescriptionHelperSpecification extends Specification {
-    private final ServerAddress serverAddress = new ServerAddress('localhost', 27018)
-    private final ServerVersion serverVersion = new ServerVersion([3, 0, 0])
-    private final int roundTripTime = 5000
-
-    def 'connection description should reflect ismaster result'() {
-        def connectionId = new ConnectionId(new ServerId(new ClusterId(), serverAddress))
-        expect:
-        createConnectionDescription(connectionId,
-                                    parse('{' +
-                                          'ismaster : true,' +
-                                          'maxBsonObjectSize : 16777216,' +
-                                          'maxMessageSizeBytes : 48000000,' +
-                                          'maxWriteBatchSize : 1000,' +
-                                          'localTime : ISODate("2015-03-04T23:03:45.848Z"),' +
-                                          'maxWireVersion : 3,' +
-                                          'minWireVersion : 0,' +
-                                          'ok : 1' +
-                                          '}'),
-                                    parse('{' +
-                                          '"version" : "2.6.1",' +
-                                          '"gitVersion" : "nogitversion",' +
-                                          '"OpenSSLVersion" : "",' +
-                                          '"loaderFlags" : "-fPIC -pthread -Wl,-bind_at_load -m64 -mmacosx-version-min=10.9",' +
-                                          '"allocator" : "tcmalloc",' +
-                                          '"versionArray" : [' +
-                                          '2,' +
-                                          '6,' +
-                                          '1,' +
-                                          '0' +
-                                          '],' +
-                                          '"javascriptEngine" : "V8",' +
-                                          '"bits" : 64,' +
-                                          '"debug" : false,' +
-                                          '"maxBsonObjectSize" : 16777216,' +
-                                          '"ok" : 1' +
-                                          '}'))
-        new ConnectionDescription(connectionId, serverVersion, ServerType.STANDALONE, 1000, 16777216, 48000000)
-    }
-
-    def 'server description should reflect not ok ismaster result'() {
-        expect:
-        createServerDescription(serverAddress,
-                                parse('{' +
-                                      'ok : 0' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(false)
-                         .address(serverAddress)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .type(ServerType.UNKNOWN)
-                         .build()
-    }
-
-    def 'server description should reflect roundTripNanos'() {
-        expect:
-        createServerDescription(serverAddress,
-                                parse('{' +
-                                      'ismaster : true,' +
-                                      'maxBsonObjectSize : 16777216,' +
-                                      'maxMessageSizeBytes : 48000000,' +
-                                      'maxWriteBatchSize : 1000,' +
-                                      'localTime : ISODate("2015-03-04T23:03:45.848Z"),' +
-                                      'maxWireVersion : 3,' +
-                                      'minWireVersion : 0,' +
-                                      'ok : 1' +
-                                      '}'), serverVersion, roundTripTime).roundTripTimeNanos ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddress)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.STANDALONE)
-                         .roundTripTime(roundTripTime, TimeUnit.NANOSECONDS)
-                         .build().roundTripTimeNanos
-    }
-
-    def 'server description should reflect ismaster result from standalone'() {
-        expect:
-        createServerDescription(serverAddress,
-                                parse('{' +
-                                      'ismaster : true,' +
-                                      'maxBsonObjectSize : 16777216,' +
-                                      'maxMessageSizeBytes : 48000000,' +
-                                      'maxWriteBatchSize : 1000,' +
-                                      'localTime : ISODate("2015-03-04T23:03:45.848Z"),' +
-                                      'maxWireVersion : 3,' +
-                                      'minWireVersion : 0,' +
-                                      'ok : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddress)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.STANDALONE)
-                         .build()
-    }
-
-    def 'server description should reflect ismaster result from secondary'() {
-        expect:
-        createServerDescription(new ServerAddress('localhost', 27018),
-                                parse('{' +
-                                      '"setName" : "replset",' +
-                                      '"ismaster" : false,' +
-                                      '"secondary" : true,' +
-                                      '"hosts" : [' +
-                                      '"localhost:27017",' +
-                                      '"localhost:27019",' +
-                                      '"localhost:27018"' +
-                                      '],' +
-                                      '"arbiters" : [' +
-                                      '"localhost:27020"' +
-                                      '],' +
-                                      '"me" : "localhost:27017",' +
-                                      '"maxBsonObjectSize" : 16777216,' +
-                                      '"maxMessageSizeBytes" : 48000000,' +
-                                      '"maxWriteBatchSize" : 1000,' +
-                                      '"localTime" : ISODate("2015-03-04T23:14:07.338Z"),' +
-                                      '"maxWireVersion" : 3,' +
-                                      '"minWireVersion" : 0,' +
-                                      '"ok" : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(new ServerAddress('localhost', 27018))
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.REPLICA_SET_SECONDARY)
-                         .setName('replset')
-                         .canonicalAddress('localhost:27017')
-                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
-                         .arbiters(['localhost:27020'] as Set)
-                         .build()
-    }
-
-    def 'server description should reflect ismaster result from primary'() {
-        expect:
-        ObjectId electionId = new ObjectId();
-        createServerDescription(serverAddress,
-                                parse('{' +
-                                      '"setName" : "replset",' +
-                                      '"setVersion" : 1,' +
-                                      '"ismaster" : true,' +
-                                      '"secondary" : false,' +
-                                      '"hosts" : [' +
-                                      '"localhost:27017",' +
-                                      '"localhost:27019",' +
-                                      '"localhost:27018"' +
-                                      '],' +
-                                      '"arbiters" : [' +
-                                      '"localhost:27020"' +
-                                      '],' +
-                                      '"primary" : "localhost:27017",' +
-                                      '"me" : "localhost:27017",' +
-                                      '"maxBsonObjectSize" : 16777216,' +
-                                      '"maxMessageSizeBytes" : 48000000,' +
-                                      '"maxWriteBatchSize" : 1000,' +
-                                      '"localTime" : ISODate("2015-03-04T23:24:18.452Z"),' +
-                                      '"maxWireVersion" : 3,' +
-                                      '"minWireVersion" : 0,' +
-                                      '"electionId" : {$oid : "' + electionId.toHexString() + '" },' +
-                                      '"setVersion" : 2,' +
-                                      'tags : { "dc" : "east", "use" : "production" }' +
-                                      '"ok" : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddress)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .electionId(electionId)
-                         .setVersion(2)
-                         .type(ServerType.REPLICA_SET_PRIMARY)
-                         .setName('replset')
-                         .primary('localhost:27017')
-                         .canonicalAddress('localhost:27017')
-                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
-                         .arbiters(['localhost:27020'] as Set)
-                         .tagSet(new TagSet([new Tag('dc', 'east'), new Tag('use', 'production')]))
-                         .build()
-    }
-
-    def 'server description should reflect ismaster result from arbiter'() {
-        expect:
-        createServerDescription(serverAddress,
-                                parse('{' +
-                                      '"setName" : "replset",' +
-                                      '"ismaster" : false,' +
-                                      '"secondary" : false,' +
-                                      '"hosts" : [' +
-                                      '"localhost:27019",' +
-                                      '"localhost:27018",' +
-                                      '"localhost:27017"' +
-                                      '],' +
-                                      '"arbiters" : [' +
-                                      '"localhost:27020"' +
-                                      '],' +
-                                      '"primary" : "localhost:27017",' +
-                                      '"arbiterOnly" : true,' +
-                                      '"me" : "localhost:27020",' +
-                                      '"maxBsonObjectSize" : 16777216,' +
-                                      '"maxMessageSizeBytes" : 48000000,' +
-                                      '"maxWriteBatchSize" : 1000,' +
-                                      '"localTime" : ISODate("2015-03-04T23:27:55.568Z"),' +
-                                      '"maxWireVersion" : 3,' +
-                                      '"minWireVersion" : 0,' +
-                                      '"ok" : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddress)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.REPLICA_SET_ARBITER)
-                         .setName('replset')
-                         .primary('localhost:27017')
-                         .canonicalAddress('localhost:27020' )
-                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
-                         .arbiters(['localhost:27020'] as Set)
-                         .build()
-    }
-
-    def 'server description should reflect ismaster result from other'() {
-        given:
-        def serverAddressOfHidden = new ServerAddress('localhost', 27020)
-
-        expect:
-        createServerDescription(serverAddressOfHidden,
-                                parse('{' +
-                                      '"setName" : "replset",' +
-                                      '"ismaster" : false,' +
-                                      '"secondary" : false,' +
-                                      '"hosts" : [' +
-                                      '"localhost:27019",' +
-                                      '"localhost:27018",' +
-                                      '"localhost:27017"' +
-                                      '],' +
-                                      '"arbiters" : [' +
-                                      '"localhost:27021"' +
-                                      '],' +
-                                      '"primary" : "localhost:27017",' +
-                                      '"arbiterOnly" : false,' +
-                                      '"me" : "localhost:27020",' +
-                                      '"maxBsonObjectSize" : 16777216,' +
-                                      '"maxMessageSizeBytes" : 48000000,' +
-                                      '"maxWriteBatchSize" : 1000,' +
-                                      '"localTime" : ISODate("2015-03-04T23:27:55.568Z"),' +
-                                      '"maxWireVersion" : 3,' +
-                                      '"minWireVersion" : 0,' +
-                                      '"ok" : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddressOfHidden)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.REPLICA_SET_OTHER)
-                         .setName('replset')
-                         .primary('localhost:27017')
-                         .canonicalAddress('localhost:27020')
-                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
-                         .arbiters(['localhost:27021'] as Set)
-                         .build()
-    }
-
-    def 'server description should reflect ismaster result from hidden'() {
-        given:
-        def serverAddressOfHidden = new ServerAddress('localhost', 27020)
-
-        expect:
-        createServerDescription(serverAddressOfHidden,
-                                parse('{' +
-                                      '"setName" : "replset",' +
-                                      '"ismaster" : false,' +
-                                      '"secondary" : true,' +
-                                      '"hidden" : true,' +
-                                      '"hosts" : [' +
-                                      '"localhost:27019",' +
-                                      '"localhost:27018",' +
-                                      '"localhost:27017"' +
-                                      '],' +
-                                      '"arbiters" : [' +
-                                      '"localhost:27021"' +
-                                      '],' +
-                                      '"primary" : "localhost:27017",' +
-                                      '"arbiterOnly" : false,' +
-                                      '"me" : "localhost:27020",' +
-                                      '"maxBsonObjectSize" : 16777216,' +
-                                      '"maxMessageSizeBytes" : 48000000,' +
-                                      '"maxWriteBatchSize" : 1000,' +
-                                      '"localTime" : ISODate("2015-03-04T23:27:55.568Z"),' +
-                                      '"maxWireVersion" : 3,' +
-                                      '"minWireVersion" : 0,' +
-                                      '"ok" : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddressOfHidden)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.REPLICA_SET_OTHER)
-                         .setName('replset')
-                         .primary('localhost:27017')
-                         .canonicalAddress('localhost:27020')
-                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
-                         .arbiters(['localhost:27021'] as Set)
-                         .build()
-    }
-
-
-    def 'server description should reflect ismaster result from ghost'() {
-        expect:
-        createServerDescription(serverAddress,
-                                parse('{' +
-                                      '"setName" : "replset",' +
-                                      '"ismaster" : false,' +
-                                      '"secondary" : false,' +
-                                      '"arbiterOnly" : false,' +
-                                      '"me" : "localhost:27020",' +
-                                      '"maxBsonObjectSize" : 16777216,' +
-                                      '"maxMessageSizeBytes" : 48000000,' +
-                                      '"maxWriteBatchSize" : 1000,' +
-                                      '"localTime" : ISODate("2015-03-04T23:27:55.568Z"),' +
-                                      '"maxWireVersion" : 3,' +
-                                      '"minWireVersion" : 0,' +
-                                      '"ok" : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddress)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .canonicalAddress('localhost:27020' )
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.REPLICA_SET_GHOST)
-                         .setName('replset')
-                         .build()
-    }
-
-    def 'server description should reflect ismaster result from shard router'() {
-        expect:
-        createServerDescription(serverAddress,
-                                parse('{' +
-                                      '"ismaster" : true,' +
-                                      '"msg" : "isdbgrid",' +
-                                      '"maxBsonObjectSize" : 16777216,' +
-                                      '"maxMessageSizeBytes" : 48000000,' +
-                                      '"maxWriteBatchSize" : 1000,' +
-                                      '"localTime" : ISODate("2015-03-04T23:55:18.505Z"),' +
-                                      '"maxWireVersion" : 3,' +
-                                      '"minWireVersion" : 0,' +
-                                      '"ok" : 1' +
-                                      '}'), serverVersion, roundTripTime) ==
-        ServerDescription.builder()
-                         .ok(true)
-                         .address(serverAddress)
-                         .state(ServerConnectionState.CONNECTED)
-                         .version(serverVersion)
-                         .maxWireVersion(3)
-                         .maxDocumentSize(16777216)
-                         .type(ServerType.SHARD_ROUTER)
-                         .build()
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ExponentiallyWeightedMovingAverageSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ExponentiallyWeightedMovingAverageSpecification.groovy
deleted file mode 100644
index f11d9c0d6c7..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/ExponentiallyWeightedMovingAverageSpecification.groovy
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.mongodb.connection
-
-import spock.lang.Specification
-
-
-class ExponentiallyWeightedMovingAverageSpecification extends Specification {
-
-    def 'constructor should throw if alpha is not between 0.0 and 1.0'() {
-        when:
-        new ExponentiallyWeightedMovingAverage(alpha);
-
-        then:
-        thrown(IllegalArgumentException)
-
-        where:
-        alpha << [-0.001, -0.01, -0.1, -1, 1.001, 1.01, 1.1]
-    }
-
-    def 'constructor should not throw if alpha is between 0.0 and 1.0'() {
-        when:
-        new ExponentiallyWeightedMovingAverage(alpha);
-
-        then:
-        true
-
-        where:
-        alpha << [-0.0, 0.01, 0.1, 0.001, 0.01, 0.1, 0.2, 1.0]
-    }
-
-    def 'the average should be exponentially weighted'() {
-        when:
-        def average = new ExponentiallyWeightedMovingAverage(alpha)
-        for (def sample : samples) {
-            average.addSample(sample)
-        }
-
-        then:
-        average.getAverage() == result
-
-        where:
-        alpha << [0.2, 0.2, 0.2, 0.2, 0.2]
-        samples << [[], [10], [10, 20], [10, 20, 12], [10, 20, 12, 17]]
-        result << [0, 10, 12, 12, 13]
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/InternalStreamConnectionInitializerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/InternalStreamConnectionInitializerSpecification.groovy
deleted file mode 100644
index c67aa5301d5..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/InternalStreamConnectionInitializerSpecification.groovy
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.mongodb.connection
-
-import com.mongodb.ServerAddress
-import com.mongodb.async.FutureResultCallback
-import spock.lang.Specification
-
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply
-
-
-class InternalStreamConnectionInitializerSpecification extends Specification {
-
-    def serverId = new ServerId(new ClusterId(), new ServerAddress())
-    def internalConnection = new TestInternalConnection(serverId)
-
-    def 'should create correct description'() {
-        given:
-        def initializer = new InternalStreamConnectionInitializer([])
-
-        when:
-        enqueueSuccessfulReplies(false, null)
-        def description = initializer.initialize(internalConnection)
-
-        then:
-        description == getExpectedDescription(description.connectionId.localValue, null)
-    }
-
-    def 'should create correct description asynchronously'() {
-        given:
-        def initializer = new InternalStreamConnectionInitializer([])
-
-        when:
-        enqueueSuccessfulReplies(false, null)
-        def futureCallback = new FutureResultCallback<ConnectionDescription>()
-        initializer.initializeAsync(internalConnection, futureCallback)
-        def description = futureCallback.get()
-
-        then:
-        description == getExpectedDescription(description.connectionId.localValue, null)
-    }
-
-    def 'should create correct description with server connection id'() {
-        given:
-        def initializer = new InternalStreamConnectionInitializer([])
-
-        when:
-        enqueueSuccessfulReplies(false, 123)
-        def description = initializer.initialize(internalConnection)
-
-        then:
-        description == getExpectedDescription(description.connectionId.localValue, 123)
-    }
-
-    def 'should create correct description with server connection id asynchronously'() {
-        given:
-        def initializer = new InternalStreamConnectionInitializer([])
-
-        when:
-        enqueueSuccessfulReplies(false, 123)
-        def futureCallback = new FutureResultCallback<ConnectionDescription>()
-        initializer.initializeAsync(internalConnection, futureCallback)
-        def description = futureCallback.get()
-
-        then:
-        description == getExpectedDescription(description.connectionId.localValue, 123)
-    }
-
-    def 'should authenticate multiple credentials'() {
-        given:
-        def firstAuthenticator = Mock(Authenticator)
-        def secondAuthenticator = Mock(Authenticator)
-        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator, secondAuthenticator])
-
-        when:
-        enqueueSuccessfulReplies(false, null)
-
-        def description = initializer.initialize(internalConnection)
-
-        then:
-        description
-        1 * firstAuthenticator.authenticate(internalConnection, _)
-        1 * secondAuthenticator.authenticate(internalConnection, _)
-    }
-
-    def 'should authenticate multiple credentials asynchronously'() {
-        given:
-        def firstAuthenticator = Mock(Authenticator)
-        def secondAuthenticator = Mock(Authenticator)
-        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator, secondAuthenticator])
-
-        when:
-        enqueueSuccessfulReplies(false, null)
-
-        def futureCallback = new FutureResultCallback<ConnectionDescription>()
-        initializer.initializeAsync(internalConnection, futureCallback)
-        def description = futureCallback.get()
-
-        then:
-        description
-        1 * firstAuthenticator.authenticateAsync(internalConnection, _, _) >> { it[2].onResult(null, null) }
-        1 * secondAuthenticator.authenticateAsync(internalConnection, _, _) >> { it[2].onResult(null, null) }
-    }
-
-    def 'should not authenticate if server is an arbiter'() {
-        given:
-        def firstAuthenticator = Mock(Authenticator)
-        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator])
-
-        when:
-        enqueueSuccessfulReplies(true, null)
-
-        def description = initializer.initialize(internalConnection)
-
-        then:
-        description
-        0 * firstAuthenticator.authenticate(internalConnection, _)
-    }
-
-    def 'should not authenticate asynchronously if server is an arbiter asynchronously'() {
-        given:
-        def firstAuthenticator = Mock(Authenticator)
-        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator])
-
-        when:
-        enqueueSuccessfulReplies(true, null)
-
-        def futureCallback = new FutureResultCallback<ConnectionDescription>()
-        initializer.initializeAsync(internalConnection, futureCallback)
-        def description = futureCallback.get()
-
-        then:
-        description
-        0 * firstAuthenticator.authenticateAsync(internalConnection, _, _)
-    }
-
-    private ConnectionDescription getExpectedDescription(final Integer localValue, final Integer serverValue) {
-        new ConnectionDescription(new ConnectionId(serverId, localValue, serverValue),
-                                  new ServerVersion(3, 0), ServerType.STANDALONE, 512, 16777216, 33554432)
-    }
-
-    def enqueueSuccessfulReplies(final boolean isArbiter, final Integer serverConnectionId) {
-        internalConnection.enqueueReply(buildSuccessfulReply(
-                '{ok: 1' +
-                (isArbiter ? ', isreplicaset: true, arbiterOnly: true' : '') +
-                '}'))
-        internalConnection.enqueueReply(buildSuccessfulReply('{ok: 1, versionArray : [3, 0, 0]}'))
-        internalConnection.enqueueReply(buildSuccessfulReply(
-                '{ok: 1 ' +
-                (serverConnectionId == null ? '' : ', connectionId: ' + serverConnectionId) +
-                '}'))
-    }
-}
\ No newline at end of file
diff --git a/driver-core/src/test/unit/com/mongodb/connection/InternalStreamConnectionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/InternalStreamConnectionSpecification.groovy
deleted file mode 100644
index 5f7011b61a7..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/InternalStreamConnectionSpecification.groovy
+++ /dev/null
@@ -1,801 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import category.Async
-import category.SlowUnit
-import com.mongodb.MongoInternalException
-import com.mongodb.MongoNamespace
-import com.mongodb.MongoSocketClosedException
-import com.mongodb.MongoSocketReadException
-import com.mongodb.MongoSocketWriteException
-import com.mongodb.ServerAddress
-import com.mongodb.async.FutureResultCallback
-import com.mongodb.async.SingleResultCallback
-import com.mongodb.event.ConnectionListener
-import com.mongodb.event.ConnectionMessageReceivedEvent
-import com.mongodb.event.ConnectionMessagesSentEvent
-import org.bson.BsonBinaryWriter
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.ByteBuf
-import org.bson.ByteBufNIO
-import org.bson.Document
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.EncoderContext
-import org.bson.io.BasicOutputBuffer
-import org.bson.io.OutputBuffer
-import org.junit.experimental.categories.Category
-import spock.lang.IgnoreIf
-import spock.lang.Specification
-import spock.util.concurrent.AsyncConditions
-
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-import java.security.SecureRandom
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-
-import static MongoNamespace.COMMAND_COLLECTION_NAME
-import static com.mongodb.CustomMatchers.compare
-import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize
-import static com.mongodb.connection.ConnectionDescription.getDefaultMaxWriteBatchSize
-import static com.mongodb.connection.ServerDescription.getDefaultMaxDocumentSize
-import static java.util.concurrent.TimeUnit.SECONDS
-
-@SuppressWarnings(['UnusedVariable'])
-class InternalStreamConnectionSpecification extends Specification {
-    private static final ServerId SERVER_ID = new ServerId(new ClusterId(), new ServerAddress())
-
-    def helper = new StreamHelper()
-    def serverAddress = new ServerAddress()
-    def connectionId = new ConnectionId(SERVER_ID, 1, 1)
-
-    def connectionDescription = new ConnectionDescription(connectionId, new ServerVersion(), ServerType.STANDALONE,
-                                                          getDefaultMaxWriteBatchSize(), getDefaultMaxDocumentSize(),
-                                                          getDefaultMaxMessageSize())
-    def stream = Mock(Stream) {
-        openAsync(_) >> { it[0].completed(null) }
-    }
-    def streamFactory = Mock(StreamFactory) {
-        create(_) >> { stream }
-    }
-    def initializer = Mock(InternalConnectionInitializer) {
-        initialize(_) >> { connectionDescription }
-        initializeAsync(_, _) >> { it[1].onResult(connectionDescription, null) }
-    }
-    def listener = Mock(ConnectionListener)
-
-    def getConnection() {
-        new InternalStreamConnection(SERVER_ID, streamFactory, initializer, listener)
-    }
-
-    def getOpenedConnection() {
-        def connection = getConnection();
-        connection.open()
-        connection
-    }
-
-    def 'should fire connection opened event'() {
-        when:
-        getConnection().open()
-
-        then:
-        1 * listener.connectionOpened(_)
-    }
-
-    def 'should fire connection closed event'() {
-        when:
-        getOpenedConnection().close()
-
-        then:
-        1 * listener.connectionClosed(_)
-    }
-
-    def 'should fire messages sent event'() {
-        given:
-        def connection = getOpenedConnection()
-        def (buffers1, messageId1) = helper.isMaster()
-        def messageSize = helper.remaining(buffers1)
-        stream.write(_) >> {
-            helper.write(buffers1)
-        }
-        when:
-        connection.sendMessage(buffers1, messageId1)
-
-
-        then:
-        1 * listener.messagesSent {
-            compare(new ConnectionMessagesSentEvent(connectionId, messageId1, messageSize), it)
-        }
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should fire message sent event asynchronously'() {
-        def (buffers1, messageId1) = helper.isMaster()
-        def messageSize = helper.remaining(buffers1)
-        def connection = getOpenedConnection()
-        def latch = new CountDownLatch(1);
-        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
-            helper.write(buffers1)
-            callback.completed(null)
-        }
-
-        when:
-        connection.sendMessageAsync(buffers1, messageId1, new SingleResultCallback<Void>() {
-            @Override
-            void onResult(final Void result, final Throwable t) {
-                latch.countDown();
-            }
-        })
-        latch.await()
-
-        then:
-        1 * listener.messagesSent {
-            compare(new ConnectionMessagesSentEvent(connectionId, messageId1, messageSize), it)
-        }
-    }
-
-    def 'should fire message received event'() {
-        given:
-        def connection = getOpenedConnection()
-        def (buffers1, messageId1) = helper.isMaster()
-        stream.read(_) >>> helper.read([messageId1])
-
-        when:
-        connection.receiveMessage(messageId1)
-
-        then:
-        1 * listener.messageReceived {
-            compare(new ConnectionMessageReceivedEvent(connectionId, messageId1, 110), it)
-        }
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should fire message received event asynchronously'() {
-        given:
-        def (buffers1, messageId1) = helper.isMaster()
-        stream.readAsync(36, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.completed(helper.header(messageId1))
-        }
-        stream.readAsync(74, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.completed(helper.body())
-        }
-        def connection = getOpenedConnection()
-        def latch = new CountDownLatch(1);
-
-        when:
-        connection.receiveMessageAsync(messageId1, new SingleResultCallback<ResponseBuffers>() {
-            @Override
-            void onResult(final ResponseBuffers result, final Throwable t) {
-                latch.countDown();
-            }
-        })
-        latch.await()
-
-        then:
-        1 * listener.messageReceived {
-            compare(new ConnectionMessageReceivedEvent(connectionId, messageId1, 110), it)
-        }
-    }
-
-    def 'should change the connection description when opened'() {
-        when:
-        def connection = getConnection()
-
-        then:
-        connection.getDescription().getServerType() == ServerType.UNKNOWN
-        connection.getDescription().getConnectionId().getServerValue() == null
-
-        when:
-        connection.open()
-
-        then:
-        connection.opened()
-        connection.getDescription().getServerType() == ServerType.STANDALONE
-        connection.getDescription().getConnectionId().getServerValue() == 1
-
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should change the connection description when opened asynchronously'() {
-        when:
-        def connection = getConnection()
-        def futureResultCallback = new FutureResultCallback<Void>()
-
-        then:
-        connection.getDescription().getServerType() == ServerType.UNKNOWN
-        connection.getDescription().getConnectionId().getServerValue() == null
-
-        when:
-        connection.openAsync(futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        connection.opened()
-        connection.getDescription().getServerType() == ServerType.STANDALONE
-        connection.getDescription().getConnectionId().getServerValue() == 1
-
-    }
-
-    def 'should handle out of order messages on the stream'() {
-        // Connect then: Send(1), Send(2), Send(3), Receive(3), Receive(2), Receive(1)
-        given:
-        ExecutorService pool = Executors.newFixedThreadPool(3)
-        def connection = getOpenedConnection()
-        def (buffers1, messageId1) = helper.isMaster()
-        def (buffers2, messageId2) = helper.isMaster()
-        def (buffers3, messageId3) = helper.isMaster()
-        stream.read(_) >>> helper.read([messageId1, messageId2, messageId3], ordered)
-
-        when:
-        connection.sendMessage(buffers1, messageId1)
-        connection.sendMessage(buffers2, messageId2)
-        connection.sendMessage(buffers3, messageId3)
-
-        then:
-        def conds = new AsyncConditions()
-        [messageId1, messageId2, messageId3].each { messageId ->
-            pool.submit({
-                            conds.evaluate {
-                                assert connection.receiveMessage(messageId).replyHeader.responseTo == messageId
-                            }
-                        } as Runnable)
-
-        }
-        conds.await(10000)
-
-        cleanup:
-        pool.shutdown()
-
-        where:
-        ordered << [true, false]
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should handle out of order messages on the stream asynchronously'() {
-        // Connect then: SendAsync(1), SendAsync(2), SendAsync(3), ReceiveAsync(3), ReceiveAsync(2), ReceiveAsync(1)
-        given:
-        def (buffers1, messageId1, sndCallbck1, rcvdCallbck1) = helper.isMasterAsync()
-        def (buffers2, messageId2, sndCallbck2, rcvdCallbck2) = helper.isMasterAsync()
-        def (buffers3, messageId3, sndCallbck3, rcvdCallbck3) = helper.isMasterAsync()
-        def headers = helper.generateHeaders([messageId1, messageId2, messageId3], ordered)
-
-        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
-            callback.completed(null)
-        }
-
-        stream.readAsync(36, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.completed(headers.pop())
-        }
-        stream.readAsync(74, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.completed(helper.body())
-        }
-
-        def connection = getOpenedConnection()
-
-        when:
-        connection.sendMessageAsync(buffers1, messageId1, sndCallbck1)
-        connection.sendMessageAsync(buffers2, messageId2, sndCallbck2)
-        connection.sendMessageAsync(buffers3, messageId3, sndCallbck3)
-        connection.receiveMessageAsync(messageId3, rcvdCallbck3)
-        connection.receiveMessageAsync(messageId2, rcvdCallbck2)
-        connection.receiveMessageAsync(messageId1, rcvdCallbck1)
-
-        then:
-        rcvdCallbck1.get().replyHeader.responseTo == messageId1
-        rcvdCallbck2.get().replyHeader.responseTo == messageId2
-        rcvdCallbck3.get().replyHeader.responseTo == messageId3
-
-        where:
-        ordered << [true, false]
-    }
-
-    def 'should close the stream when initialization throws an exception'() {
-        given:
-        def failedInitializer = Mock(InternalConnectionInitializer) {
-            initialize(_) >> { throw new MongoInternalException('Something went wrong') }
-        }
-        def connection = new InternalStreamConnection(SERVER_ID, streamFactory, failedInitializer, listener)
-
-        when:
-        connection.open()
-
-        then:
-        thrown MongoInternalException
-        connection.isClosed()
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should close the stream when initialization throws an exception asynchronously'() {
-        given:
-        def failedInitializer = Mock(InternalConnectionInitializer) {
-            initializeAsync(_, _) >> { it[1].onResult(null, new MongoInternalException('Something went wrong')); }
-        }
-        def connection = new InternalStreamConnection(SERVER_ID, streamFactory, failedInitializer, listener)
-
-        when:
-        def futureResultCallback = new FutureResultCallback<Void>()
-        connection.openAsync(futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        thrown MongoInternalException
-        connection.isClosed()
-    }
-
-    def 'should close the stream when writing a message throws an exception'() {
-        given:
-        stream.write(_) >> { throw new IOException('Something went wrong') }
-
-        def connection = getOpenedConnection()
-        def (buffers1, messageId1) = helper.isMaster()
-        def (buffers2, messageId2) = helper.isMaster()
-
-        when:
-        connection.sendMessage(buffers1, messageId1)
-
-        then:
-        connection.isClosed()
-        thrown MongoSocketWriteException
-
-        when:
-        connection.sendMessage(buffers2, messageId2)
-
-        then:
-        thrown MongoSocketClosedException
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should close the stream when writing a message throws an exception asynchronously'() {
-        given:
-        def (buffers1, messageId1, sndCallbck1, rcvdCallbck1) = helper.isMasterAsync()
-        def (buffers2, messageId2, sndCallbck2, rcvdCallbck2) = helper.isMasterAsync()
-        def headers = helper.generateHeaders([messageId1, messageId2])
-        int seen = 0
-
-        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
-            if (seen == 0) {
-                seen += 1
-                return callback.failed(new IOException('Something went wrong'))
-            }
-            callback.completed(null)
-        }
-
-        def connection = getOpenedConnection()
-
-        when:
-        connection.sendMessageAsync(buffers1, messageId1, sndCallbck1)
-        sndCallbck1.get(10, SECONDS)
-
-        then:
-        thrown MongoSocketWriteException
-        connection.isClosed()
-
-        when:
-        connection.sendMessageAsync(buffers2, messageId2, sndCallbck2)
-        sndCallbck2.get(10, SECONDS)
-
-        then:
-        thrown MongoSocketClosedException
-    }
-
-    def 'should close the stream when reading the message header throws an exception'() {
-        given:
-        stream.read(36) >> { throw new IOException('Something went wrong') }
-        stream.read(74) >> helper.body()
-
-        def connection = getOpenedConnection()
-        def (buffers1, messageId1) = helper.isMaster()
-        def (buffers2, messageId2) = helper.isMaster()
-
-        when:
-        connection.sendMessage(buffers1, messageId1)
-        connection.sendMessage(buffers2, messageId2)
-        connection.receiveMessage(messageId1)
-
-        then:
-        connection.isClosed()
-        thrown MongoSocketReadException
-
-        when:
-        connection.receiveMessage(messageId2)
-
-        then:
-        thrown MongoSocketClosedException
-    }
-
-    def 'should throw MongoInternalException when reply header message length > max message length'() {
-        given:
-        stream.read(36) >> { helper.headerWithMessageSizeGreaterThanMax(1) }
-
-        def connection = getOpenedConnection()
-
-        when:
-        connection.receiveMessage(1)
-
-        then:
-        thrown(MongoInternalException)
-        connection.isClosed()
-    }
-
-    def 'should throw MongoInternalException when reply header message length > max message length asynchronously'() {
-        given:
-        stream.readAsync(36, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.completed(helper.headerWithMessageSizeGreaterThanMax(1))
-        }
-
-        def connection = getOpenedConnection()
-        def callback = new FutureResultCallback()
-
-        when:
-        connection.receiveMessageAsync(1, callback)
-        callback.get()
-
-        then:
-        thrown(MongoInternalException)
-        connection.isClosed()
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should close the stream when reading the message header throws an exception asynchronously'() {
-        given:
-        int seen = 0
-        def (buffers1, messageId1, sndCallbck1, rcvdCallbck1) = helper.isMasterAsync()
-        def (buffers2, messageId2, sndCallbck2, rcvdCallbck2) = helper.isMasterAsync()
-        def headers = helper.generateHeaders([messageId1, messageId2])
-
-        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
-            callback.completed(null)
-        }
-        stream.readAsync(36, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            if (seen == 0) {
-                seen += 1
-                return handler.failed(new IOException('Something went wrong'))
-            }
-            handler.completed(headers.pop())
-        }
-        stream.readAsync(74, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.completed(helper.body())
-        }
-        def connection = getOpenedConnection()
-
-        when:
-        connection.sendMessageAsync(buffers1, messageId1, sndCallbck1)
-        connection.sendMessageAsync(buffers2, messageId2, sndCallbck2)
-        connection.receiveMessageAsync(messageId1, rcvdCallbck1)
-        connection.receiveMessageAsync(messageId2, rcvdCallbck2)
-        rcvdCallbck1.get(10, SECONDS)
-
-        then:
-        thrown MongoSocketReadException
-        connection.isClosed()
-
-        when:
-        rcvdCallbck2.get(10, SECONDS)
-
-        then:
-        thrown MongoSocketClosedException
-    }
-
-    def 'should close the stream when reading the message body throws an exception'() {
-        given:
-        def (buffers1, messageId1) = helper.isMaster()
-        def (buffers2, messageId2) = helper.isMaster()
-        def headers = helper.generateHeaders([messageId1, messageId2])
-
-        stream.read(36) >> { headers.pop() }
-        stream.read(74) >> { throw new IOException('Something went wrong') }
-
-        def connection = getOpenedConnection()
-
-        when:
-        connection.sendMessage(buffers1, messageId1)
-        connection.sendMessage(buffers2, messageId2)
-        connection.receiveMessage(messageId1)
-
-        then:
-        connection.isClosed()
-        thrown MongoSocketReadException
-
-        when:
-        connection.receiveMessage(messageId2)
-
-        then:
-        thrown MongoSocketClosedException
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'should close the stream when reading the message body throws an exception asynchronously'() {
-        given:
-        def (buffers1, messageId1, sndCallbck1, rcvdCallbck1) = helper.isMasterAsync()
-        def (buffers2, messageId2, sndCallbck2, rcvdCallbck2) = helper.isMasterAsync()
-        def headers = helper.generateHeaders([messageId1, messageId2])
-
-        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
-            callback.completed(null)
-        }
-        stream.readAsync(36, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.completed(headers.remove(0))
-        }
-        stream.readAsync(74, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            handler.failed(new IOException('Something went wrong'))
-        }
-        def connection = getOpenedConnection()
-
-        when:
-        connection.sendMessageAsync(buffers1, messageId1, sndCallbck1)
-        connection.sendMessageAsync(buffers2, messageId2, sndCallbck2)
-        connection.receiveMessageAsync(messageId1, rcvdCallbck1)
-        rcvdCallbck1.get(10, SECONDS)
-
-        then:
-        thrown MongoSocketReadException
-        connection.isClosed()
-
-        when:
-        connection.receiveMessageAsync(messageId2, rcvdCallbck2)
-        rcvdCallbck2.get(10, SECONDS)
-
-        then:
-        thrown MongoSocketClosedException
-    }
-
-    def 'should notify all asynchronous writers of an exception'() {
-        given:
-        int numberOfOperations = 3
-        ExecutorService streamPool = Executors.newFixedThreadPool(1)
-
-        def messages = (1..numberOfOperations).collect { helper.isMasterAsync() }
-        def headers = messages.collect { buffers, messageId, sndCallbck, rcvdCallbck -> helper.header(messageId) }
-
-        def streamLatch = new CountDownLatch(1)
-        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
-            streamPool.submit {
-                streamLatch.await()
-                callback.failed(new IOException())
-            }
-        }
-
-        when:
-        def connection = getOpenedConnection()
-        def callbacks = []
-        (1..numberOfOperations).each { n ->
-            def (buffers, messageId, sndCallbck, rcvdCallbck) = messages.pop()
-            connection.sendMessageAsync(buffers, messageId, sndCallbck)
-            callbacks.add(sndCallbck)
-        }
-        streamLatch.countDown()
-
-        then:
-        expectException(callbacks.pop())
-        expectException(callbacks.pop())
-        expectException(callbacks.pop())
-
-        cleanup:
-        streamPool.shutdown()
-    }
-
-    private static boolean expectException(rcvdCallbck) {
-        try {
-            rcvdCallbck.get()
-            false
-        } catch (MongoSocketWriteException e) {
-            true
-        }
-    }
-
-    @IgnoreIf({ System.getProperty('ignoreSlowUnitTests') == 'true' })
-    @Category(SlowUnit)
-    def 'should have threadsafe connection pipelining'() {
-        given:
-        int threads = 10
-        int numberOfOperations = 10000
-        ExecutorService pool = Executors.newFixedThreadPool(threads)
-        def messages = (1..numberOfOperations).collect { helper.isMaster() }
-        def headers = helper.generateHeaders(messages.collect { buffer, messageId -> messageId })
-        stream.read(36) >> { headers.pop() }
-        stream.read(74) >> { helper.body() }
-
-        when:
-        def connection = getOpenedConnection()
-
-        then:
-        def conds = new AsyncConditions()
-        def latch = new CountDownLatch(numberOfOperations)
-        (1..numberOfOperations).each { n ->
-            def (buffers, messageId) = messages.pop()
-            pool.submit({ connection.sendMessage(buffers, messageId) } as Runnable)
-            pool.submit({
-                            conds.evaluate {
-                                assert connection.receiveMessage(messageId).replyHeader.responseTo == messageId
-                            }
-                            latch.countDown()
-                        } as Runnable)
-
-        }
-        latch.await(10, SECONDS)
-        conds.await(10)
-
-        cleanup:
-        pool.shutdown()
-    }
-
-    @Category([Async, SlowUnit])
-    @IgnoreIf({ System.getProperty('ignoreSlowUnitTests') == 'true' || javaVersion < 1.7 })
-    def 'should have threadsafe connection pipelining asynchronously'() {
-        given:
-        int threads = 10
-        int numberOfOperations = 10000
-        ExecutorService pool = Executors.newFixedThreadPool(threads)
-        ExecutorService streamPool = Executors.newFixedThreadPool(4)
-
-        def messages = (1..numberOfOperations).collect { helper.isMasterAsync() }
-        def headers = messages.collect { buffers, messageId, sndCallbck, rcvdCallbck -> helper.header(messageId) }
-
-        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
-            streamPool.submit {
-                callback.completed(null)
-            }
-        }
-        stream.readAsync(36, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            streamPool.submit {
-                handler.completed(headers.pop())
-            }
-        }
-        stream.readAsync(74, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
-            streamPool.submit {
-                handler.completed(helper.body())
-            }
-        }
-
-        when:
-        def connection = getOpenedConnection()
-
-        then:
-        def latch = new CountDownLatch(numberOfOperations)
-        def conds = new AsyncConditions()
-        (1..numberOfOperations).each { n ->
-            def (buffers, messageId, sndCallbck, rcvdCallbck) = messages.pop()
-
-            pool.submit {
-                connection.sendMessageAsync(buffers, messageId, sndCallbck)
-            }
-            pool.submit {
-                            connection.receiveMessageAsync(messageId, rcvdCallbck)
-                            conds.evaluate {
-                                assert rcvdCallbck.get().replyHeader.responseTo == messageId
-                            }
-                            latch.countDown()
-                        }
-        }
-
-        latch.await(10, SECONDS)
-        conds.await(10)
-
-        cleanup:
-        pool.shutdown()
-        streamPool.shutdown()
-    }
-
-    class StreamHelper {
-        int nextMessageId = 900000 // Generates a message then adds one to the id
-
-        def remaining(List<ByteBuf> buffers) {
-            int remaining = 0
-            buffers.each {
-                remaining += it.remaining()
-            }
-            remaining
-        }
-
-        def write(List<ByteBuf> buffers) {
-            buffers.each {
-                it.get(new byte[it.remaining()])
-            }
-        }
-
-
-        def read(List<Integer> messageIds) {
-            read(messageIds, true)
-        }
-
-        def read(List<Integer> messageIds, boolean ordered) {
-            List<ByteBuf> headers = messageIds.collect { header(it) }
-            List<ByteBuf> bodies = messageIds.collect { body() }
-            if (!ordered) {
-                Collections.shuffle(headers, new SecureRandom())
-            }
-            [headers, bodies].transpose().flatten()
-        }
-
-        def header(messageId) {
-            ByteBuffer headerByteBuffer = ByteBuffer.allocate(36).with {
-                order(ByteOrder.LITTLE_ENDIAN);
-                putInt(110);           // messageLength
-                putInt(4);             // requestId
-                putInt(messageId);     // responseTo
-                putInt(1);             // opCode
-                putInt(0);             // responseFlags
-                putLong(0);            // cursorId
-                putInt(0);             // starting from
-                putInt(1);             // number returned
-            }
-            headerByteBuffer.flip()
-            new ByteBufNIO(headerByteBuffer)
-        }
-
-        def headerWithMessageSizeGreaterThanMax(messageId) {
-            ByteBuffer headerByteBuffer = ByteBuffer.allocate(36).with {
-                order(ByteOrder.LITTLE_ENDIAN);
-                putInt(connectionDescription.maxMessageSize + 1);   // messageLength
-                putInt(4);             // requestId
-                putInt(messageId);     // responseTo
-                putInt(1);             // opCode
-                putInt(0);             // responseFlags
-                putLong(0);            // cursorId
-                putInt(0);             // starting from
-                putInt(1);             // number returned
-            }
-            headerByteBuffer.flip()
-            new ByteBufNIO(headerByteBuffer)
-        }
-
-        def body() {
-            def okResponse = ['connectionId': 1, 'n': 0, 'syncMillis': 0, 'writtenTo': null, 'err': null, 'ok': 1] as Document
-            OutputBuffer outputBuffer = new BasicOutputBuffer()
-            BsonBinaryWriter binaryResponse = new BsonBinaryWriter(outputBuffer)
-            new DocumentCodec().encode(binaryResponse, okResponse, EncoderContext.builder().build())
-            new ByteBufNIO(ByteBuffer.allocate(outputBuffer.size()).put(outputBuffer.toByteArray()))
-        }
-
-        def generateHeaders(List<Integer> messageIds) {
-            generateHeaders(messageIds, true)
-        }
-
-        def generateHeaders(List<Integer> messageIds, boolean ordered) {
-            List<ByteBuf> headers = messageIds.collect { header(it) }
-            if (!ordered) {
-                Collections.shuffle(headers, new SecureRandom())
-            }
-            headers
-        }
-
-        def isMaster() {
-            def command = new CommandMessage(new MongoNamespace('admin', COMMAND_COLLECTION_NAME).getFullName(),
-                                             new BsonDocument('ismaster', new BsonInt32(1)),
-                                             false, MessageSettings.builder().build());
-            OutputBuffer outputBuffer = new BasicOutputBuffer();
-            command.encode(outputBuffer);
-            nextMessageId++
-            [outputBuffer.byteBuffers, nextMessageId]
-        }
-
-        def isMasterAsync() {
-            isMaster() + [new FutureResultCallback<Void>(), new FutureResultCallback<ResponseBuffers>()]
-        }
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/MaxDocumentSizeTest.java b/driver-core/src/test/unit/com/mongodb/connection/MaxDocumentSizeTest.java
deleted file mode 100644
index cada3037fb5..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/MaxDocumentSizeTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.bulk.InsertRequest;
-import org.bson.BsonBinary;
-import org.bson.BsonDocument;
-import org.bson.BsonSerializationException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static com.mongodb.WriteConcern.ACKNOWLEDGED;
-import static java.util.Arrays.asList;
-
-@SuppressWarnings("unchecked")
-public class MaxDocumentSizeTest {
-    private ByteBufferBsonOutput buffer;
-    private InsertMessage message;
-
-    @Before
-    public void setUp() {
-        message = new InsertMessage("test.test", true, ACKNOWLEDGED,
-                                              asList(new InsertRequest(new BsonDocument("bytes", new BsonBinary(new byte[2048])))),
-                                              MessageSettings.builder().maxDocumentSize(1024).build());
-        buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-    }
-
-    @After
-    public void tearDown() {
-        buffer.close();
-    }
-
-    @Test(expected = BsonSerializationException.class)
-    public void testMaxDocumentSize() {
-        message.encode(buffer);
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/MaxMessageSizeTest.java b/driver-core/src/test/unit/com/mongodb/connection/MaxMessageSizeTest.java
deleted file mode 100644
index 1c184768fd3..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/MaxMessageSizeTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.bulk.InsertRequest;
-import org.bson.BsonBinary;
-import org.bson.BsonDocument;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static com.mongodb.WriteConcern.ACKNOWLEDGED;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-public class MaxMessageSizeTest {
-    private ByteBufferBsonOutput buffer;
-    private InsertMessage message;
-
-    @Before
-    @SuppressWarnings("unchecked")
-    public void setUp() {
-        BsonBinary binary = new BsonBinary(new byte[2048]);
-        message = new InsertMessage("test.test", true, ACKNOWLEDGED,
-                                    Arrays.asList(new InsertRequest(new BsonDocument("bytes", binary)),
-                                                  new InsertRequest(new BsonDocument("bytes", binary)),
-                                                  new InsertRequest(new BsonDocument("bytes", binary))),
-                                    MessageSettings.builder().maxMessageSize(4500).build());
-        buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-    }
-
-    @After
-    public void tearDown() {
-        buffer.close();
-    }
-
-    @Test
-    public void testMaxDocumentSize() {
-        RequestMessage next = message.encode(buffer);
-        assertNotNull(next);
-        assertNull(next.encode(buffer));
-    }
-
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ProtocolHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ProtocolHelperSpecification.groovy
deleted file mode 100644
index 3f46b669451..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/ProtocolHelperSpecification.groovy
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2014-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoCommandException
-import com.mongodb.DuplicateKeyException
-import com.mongodb.MongoExecutionTimeoutException
-import com.mongodb.MongoNodeIsRecoveringException
-import com.mongodb.MongoNotPrimaryException
-import com.mongodb.MongoQueryException
-import com.mongodb.WriteConcernException
-import com.mongodb.ServerAddress
-import com.mongodb.WriteConcernResult
-import org.bson.BsonBoolean
-import org.bson.BsonDocument
-import org.bson.BsonDouble
-import org.bson.BsonInt32
-import org.bson.BsonInt64
-import org.bson.BsonNull
-import org.bson.BsonString
-import spock.lang.Specification
-
-import static com.mongodb.connection.ProtocolHelper.getCommandFailureException
-import static com.mongodb.connection.ProtocolHelper.getQueryFailureException
-import static com.mongodb.connection.ProtocolHelper.getWriteResult
-import static com.mongodb.connection.ProtocolHelper.isCommandOk
-
-class ProtocolHelperSpecification extends Specification {
-
-    def 'isCommandOk should be false if ok field is missing'() {
-        expect:
-        !isCommandOk(new BsonDocument())
-    }
-
-    def 'isCommandOk should be false for numbers that are 0'() {
-        expect:
-        !isCommandOk(new BsonDocument('ok', new BsonInt32(0)))
-        !isCommandOk(new BsonDocument('ok', new BsonInt64(0)))
-        !isCommandOk(new BsonDocument('ok', new BsonDouble(0.0)))
-    }
-
-    def 'isCommandOk should be true for numbers that are not 0'() {
-        expect:
-        !isCommandOk(new BsonDocument('ok', new BsonInt32(10)))
-        !isCommandOk(new BsonDocument('ok', new BsonInt64(10)))
-        !isCommandOk(new BsonDocument('ok', new BsonDouble(10.0)))
-    }
-
-    def 'isCommandOk should equal the boolean value'() {
-        expect:
-        isCommandOk(new BsonDocument('ok', BsonBoolean.TRUE))
-        !isCommandOk(new BsonDocument('ok', BsonBoolean.FALSE))
-    }
-
-    def 'isCommandOk should be false of ok is not a number or a boolean'() {
-        expect:
-        !isCommandOk(new BsonDocument('ok', new BsonNull()))
-    }
-
-    def 'command failure exception should be MongoExecutionTimeoutException if error code is 50'() {
-        expect:
-        getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('code', new BsonInt32(50)),
-                                   new ServerAddress()) instanceof MongoExecutionTimeoutException
-    }
-
-    def 'query failure exception should be MongoExecutionTimeoutException if error code is 50'() {
-        expect:
-        getQueryFailureException(new BsonDocument('code', new BsonInt32(50)),
-                                 new ServerAddress()) instanceof MongoExecutionTimeoutException
-    }
-
-    def 'command failure exception should be MongoNotPrimaryException if errmsg starts with not master'() {
-        expect:
-        getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('errmsg', new BsonString('not master server')),
-                                   new ServerAddress()) instanceof MongoNotPrimaryException
-    }
-
-    def 'query failure exception should be MongoNotPrimaryException if $err starts with not master'() {
-        expect:
-        getQueryFailureException(new BsonDocument('$err', new BsonString('not master server')),
-                                 new ServerAddress()) instanceof MongoNotPrimaryException
-    }
-
-    def 'command failure exception should be MongoNodeIsRecoveringException if errmsg starts with node is recovering'() {
-        expect:
-        getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('errmsg', new BsonString('node is recovering now')),
-                                   new ServerAddress()) instanceof MongoNodeIsRecoveringException
-    }
-
-    def 'query failure exception should be MongoNodeIsRecoveringException if $err starts with node is recovering'() {
-        expect:
-        getQueryFailureException(new BsonDocument('$err', new BsonString('node is recovering now')),
-                                 new ServerAddress()) instanceof MongoNodeIsRecoveringException
-    }
-
-    def 'command failure exception should be MongoCommandException'() {
-        expect:
-        getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('errmsg', new BsonString('some other problem')),
-                                   new ServerAddress()) instanceof MongoCommandException
-    }
-
-    def 'query failure exception should be MongoQueryException'() {
-        expect:
-        getQueryFailureException(new BsonDocument('$err', new BsonString('some other problem')),
-                                 new ServerAddress()) instanceof MongoQueryException
-    }
-
-    def 'getWriteResult should return write result'() {
-        when:
-        def res = getWriteResult(new BsonDocument('ok', BsonBoolean.TRUE).append('n', new BsonInt32(1))
-                                                                         .append('updatedExisting', BsonBoolean.TRUE).
-                                         append('upserted', new BsonInt64(5)),
-                                 new ServerAddress())
-
-        then:
-        res == WriteConcernResult.acknowledged(1, true, new BsonInt64(5))
-    }
-
-    def 'getWriteResult should throw MongoCommandException if ok is false'() {
-        when:
-        getWriteResult(new BsonDocument('ok', BsonBoolean.FALSE).append('errmsg', new BsonString('something wrong')),
-                       new ServerAddress())
-
-        then:
-        thrown(MongoCommandException)
-    }
-
-    def 'getWriteResult should throw MongoNotPrimaryException if err starts with not master'() {
-        when:
-        getWriteResult(new BsonDocument('ok', BsonBoolean.TRUE).append('err', new BsonString('not master here')),
-                       new ServerAddress())
-
-        then:
-        thrown(MongoNotPrimaryException)
-    }
-
-    def 'getWriteResult should throw MongoNodeIsRecoveringException if err starts with node is recovering'() {
-        when:
-        getWriteResult(new BsonDocument('ok', BsonBoolean.TRUE).append('err', new BsonString('node is recovering here')),
-                       new ServerAddress())
-
-        then:
-        thrown(MongoNodeIsRecoveringException)
-    }
-
-    def 'getWriteResult should throw MongoDuplicateKeyException if code is one of the duplicate key error codes'() {
-        when:
-        getWriteResult(new BsonDocument('ok', BsonBoolean.TRUE).append('err', new BsonString('dup key'))
-                                                               .append('code', new BsonInt32(code)),
-                       new ServerAddress())
-
-        then:
-        thrown(DuplicateKeyException)
-
-        where:
-        code << [11000, 11001, 12582]
-    }
-
-    def 'getWriteResult should throw MongoWriteConcernException if err field is present'() {
-        when:
-        getWriteResult(new BsonDocument('ok', BsonBoolean.TRUE).append('err', new BsonString('dup key'))
-                                                               .append('code', new BsonInt32(42)),
-                       new ServerAddress())
-
-        then:
-        thrown(WriteConcernException)
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ScramSha1SaslAuthenticatorTest.java b/driver-core/src/test/unit/com/mongodb/connection/ScramSha1SaslAuthenticatorTest.java
deleted file mode 100644
index 5f140497b94..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/ScramSha1SaslAuthenticatorTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.MongoSecurityException;
-import com.mongodb.ServerAddress;
-import com.mongodb.async.FutureResultCallback;
-import org.bson.io.BsonInput;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class ScramSha1SaslAuthenticatorTest {
-    private TestInternalConnection connection;
-    private MongoCredential credential;
-    private ScramSha1Authenticator subject;
-    private ConnectionDescription connectionDescription;
-
-    @Before
-    public void before() {
-        this.connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress("localhost", 27017)));
-        connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()));
-        this.credential = MongoCredential.createScramSha1Credential("user", "database", "pencil".toCharArray());
-        ScramSha1Authenticator.RandomStringGenerator randomStringGenerator = new ScramSha1Authenticator.RandomStringGenerator() {
-            @Override
-            public String generate(final int length) {
-                return "fyko+d2lbbFgONRv9qkxdawL";
-            }
-        };
-        this.subject = new ScramSha1Authenticator(this.credential, randomStringGenerator);
-    }
-
-    @Test
-    public void testAuthenticateThrowsWhenServerProvidesAnInvalidRValue() {
-        enqueueInvalidRValueReply();
-
-        try {
-            this.subject.authenticate(connection, connectionDescription);
-            fail();
-        } catch (MongoSecurityException e) {
-            // all good
-        }
-    }
-
-    @Test
-    public void testAuthenticateThrowsWhenServerProvidesAnInvalidRValueAsync() throws InterruptedException {
-        enqueueInvalidRValueReply();
-
-        try {
-            FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>();
-            this.subject.authenticateAsync(connection, connectionDescription, futureCallback);
-            futureCallback.get();
-            fail();
-        } catch (Throwable t) {
-            if (!(t instanceof MongoSecurityException)) {
-                fail();
-            }
-        }
-    }
-
-    private void enqueueInvalidRValueReply() {
-        ResponseBuffers invalidRValueReply =
-        buildSuccessfulReply("{conversationId: 1, "
-                             + "payload: BinData(0,cj1meWtvLWQybGJiRmdPTlJ2OXFreGRhd0xIbytWZ2s3cXZVT0t"
-                             + "Vd3VXTElXZzRsLzlTcmFHTUhFRSxzPXJROVpZM01udEJldVAzRTFURFZDNHc9PSxpPTEwMDAw), "
-                             + "done: false, "
-                             + "ok: 1}");
-        this.connection.enqueueReply(invalidRValueReply);
-    }
-
-    @Test
-    public void testAuthenticateThrowsWhenServerProvidesInvalidServerSignature() {
-        enqueueInvalidServerSignature();
-
-        try {
-            this.subject.authenticate(connection, connectionDescription);
-            fail();
-        } catch (MongoSecurityException e) {
-            // all good
-        }
-    }
-
-    @Test
-    public void testAuthenticateThrowsWhenServerProvidesInvalidServerSignatureAsync() throws InterruptedException {
-        enqueueInvalidServerSignature();
-
-        try {
-            FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>();
-            this.subject.authenticateAsync(connection, connectionDescription, futureCallback);
-            futureCallback.get();
-            fail();
-        } catch (Throwable t) {
-            if (!(t instanceof MongoSecurityException)) {
-                fail();
-            }
-        }
-    }
-
-    private void enqueueInvalidServerSignature() {
-        ResponseBuffers firstReply =
-        buildSuccessfulReply("{conversationId: 1, "
-                             + "payload: BinData(0,cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0xIbytWZ2s3cXZVT0tVd3"
-                             + "VXTElXZzRsLzlTcmFHTUhFRSxzPXJROVpZM01udEJldVAzRTFURFZDNHc9PSxpPTEwMDAw), "
-                             + "done: false, "
-                             + "ok: 1}");
-        ResponseBuffers invalidServerSignatureReply =
-        buildSuccessfulReply("{conversationId: 1, "
-                             + "payload: BinData(0,dj1VTVdlSTI1SkQxeU5ZWlJNcFo0Vkh2aFo5ZTBh), "
-                             + "done: false, "
-                             + "ok: 1}");
-
-        this.connection.enqueueReply(firstReply);
-        this.connection.enqueueReply(invalidServerSignatureReply);
-    }
-
-    @Test
-    public void testSuccessfulAuthentication() {
-        enqueueSuccessfulReplies();
-
-        this.subject.authenticate(connection, connectionDescription);
-
-        validateMessages();
-    }
-
-    @Test
-    public void testSuccessfulAuthenticationAsync() throws ExecutionException, InterruptedException {
-        enqueueSuccessfulReplies();
-
-        FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>();
-        this.subject.authenticateAsync(connection, connectionDescription, futureCallback);
-        futureCallback.get();
-
-        validateMessages();
-    }
-
-    private void validateMessages() {
-        List<BsonInput> sent = connection.getSent();
-        String firstCommand = MessageHelper.decodeCommandAsJson(sent.get(0));
-        String expectedFirstCommand = "{ \"saslStart\" : 1, "
-                + "\"mechanism\" : \"SCRAM-SHA-1\", "
-                + "\"payload\" : { \"$binary\" : \"biwsbj11c2VyLHI9ZnlrbytkMmxiYkZnT05Sdjlxa3hkYXdM\", "
-                + "\"$type\" : \"0\" } }";
-
-        String secondCommand = MessageHelper.decodeCommandAsJson(sent.get(1));
-        String expectedSecondCommand = "{ \"saslContinue\" : 1, "
-                + "\"conversationId\" : 1, "
-                + "\"payload\" : { \"$binary\" : \"Yz1iaXdzLHI9ZnlrbytkMmxiYkZnT05Sdjlxa3hkYXdMSG8rVmdrN3F2VU9LVXd"
-                + "1V0xJV2c0bC85U3JhR01IRUUscD1NQzJUOEJ2Ym1XUmNrRHc4b1dsNUlWZ2h3Q1k9\", \"$type\" : \"0\" } }";
-
-        String thirdCommand = MessageHelper.decodeCommandAsJson(sent.get(2));
-        String expectedThirdCommand = "{ \"saslContinue\" : 1, "
-                + "\"conversationId\" : 1, "
-                + "\"payload\" : { \"$binary\" : \"dj1VTVdlSTI1SkQxeU5ZWlJNcFo0Vkh2aFo5ZTA9\", \"$type\" : \"0\" } }";
-
-        assertEquals(expectedFirstCommand, firstCommand);
-        assertEquals(expectedSecondCommand, secondCommand);
-        assertEquals(expectedThirdCommand, thirdCommand);
-    }
-
-    private void enqueueSuccessfulReplies() {
-        ResponseBuffers firstReply =
-        buildSuccessfulReply("{conversationId: 1, "
-                             + "payload: BinData(0,"
-                             + "cj1meWtvK2QybGJiRmdPTlJ2OXFreGRhd0xIbytWZ2s3cXZVT0tVd3VXTE"
-                             + "lXZzRsLzlTcmFHTUhFRSxzPXJROVpZM01udEJldVAzRTFURFZDNHc9PSxpPTEwMDAw), "
-                             + "done: false, "
-                             + "ok: 1}");
-        ResponseBuffers secondReply =
-        buildSuccessfulReply("{conversationId: 1, "
-                             + "payload: BinData(0,dj1VTVdlSTI1SkQxeU5ZWlJNcFo0Vkh2aFo5ZTA9), "
-                             + "done: false, "
-                             + "ok: 1}");
-        ResponseBuffers thirdReply =
-        buildSuccessfulReply("{conversationId: 1, "
-                             + "done: true, "
-                             + "ok: 1}");
-
-        connection.enqueueReply(firstReply);
-        connection.enqueueReply(secondReply);
-        connection.enqueueReply(thirdReply);
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerDescriptionTest.java b/driver-core/src/test/unit/com/mongodb/connection/ServerDescriptionTest.java
index da820824b34..b065ae29952 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerDescriptionTest.java
+++ b/driver-core/src/test/unit/com/mongodb/connection/ServerDescriptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,10 @@
 import org.bson.types.ObjectId;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
 
@@ -35,9 +37,11 @@
 import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY;
 import static com.mongodb.connection.ServerType.UNKNOWN;
 import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -58,6 +62,8 @@ public void testMissingAddress() throws UnknownHostException {
 
     @Test
     public void testDefaults() throws UnknownHostException {
+        long currentNanoTime = System.nanoTime();
+
         ServerDescription serverDescription = builder().address(new ServerAddress())
                                                                .state(CONNECTED)
                                                                .build();
@@ -90,6 +96,9 @@ public void testDefaults() throws UnknownHostException {
         assertEquals(0, serverDescription.getMaxWireVersion());
         assertNull(serverDescription.getElectionId());
         assertNull(serverDescription.getSetVersion());
+        assertNull(serverDescription.getLastWriteDate());
+        assertTrue(serverDescription.getLastUpdateTime(TimeUnit.NANOSECONDS) > currentNanoTime);
+        assertNull(serverDescription.getLogicalSessionTimeoutMinutes());
         assertNull(serverDescription.getException());
     }
 
@@ -109,15 +118,18 @@ public void testBuilder() throws UnknownHostException {
                                                                                 "localhost:27018",
                                                                                 "localhost:27019",
                                                                                 "localhost:27020")))
-                                              .arbiters(new HashSet<String>(asList("localhost:27019")))
-                                              .passives(new HashSet<String>(asList("localhost:27020")))
+                                              .arbiters(new HashSet<String>(singletonList("localhost:27019")))
+                                              .passives(new HashSet<String>(singletonList("localhost:27020")))
                                               .ok(true)
                                               .state(CONNECTED)
-                                              .version(new ServerVersion(asList(2, 4, 1)))
+                                              .version(new ServerVersion(asList(3, 4, 1)))
                                               .minWireVersion(1)
                                               .maxWireVersion(2)
                                               .electionId(new ObjectId("123412341234123412341234"))
-                                              .setVersion(new Integer(2))
+                                              .setVersion(2)
+                                              .lastWriteDate(new Date(1234L))
+                                              .lastUpdateTimeNanos(40000L)
+                                              .logicalSessionTimeoutMinutes(30)
                                               .exception(exception)
                                               .build();
 
@@ -143,41 +155,130 @@ public void testBuilder() throws UnknownHostException {
         assertEquals(new HashSet<String>(asList("localhost:27017", "localhost:27018", "localhost:27019", "localhost:27020")),
                      serverDescription.getHosts());
         assertEquals(new TagSet(new Tag("dc", "ny")), serverDescription.getTagSet());
-        assertEquals(new HashSet<String>(asList("localhost:27019")), serverDescription.getArbiters());
-        assertEquals(new HashSet<String>(asList("localhost:27020")), serverDescription.getPassives());
+        assertEquals(new HashSet<String>(singletonList("localhost:27019")), serverDescription.getArbiters());
+        assertEquals(new HashSet<String>(singletonList("localhost:27020")), serverDescription.getPassives());
         assertEquals("test", serverDescription.getSetName());
-        assertEquals(new ServerVersion(asList(2, 4, 1)), serverDescription.getVersion());
+        assertEquals(new ServerVersion(asList(3, 4, 1)), serverDescription.getVersion());
         assertEquals(1, serverDescription.getMinWireVersion());
         assertEquals(2, serverDescription.getMaxWireVersion());
         assertEquals(new ObjectId("123412341234123412341234"), serverDescription.getElectionId());
-        assertEquals(new Integer(2), serverDescription.getSetVersion());
+        assertEquals(Integer.valueOf(2), serverDescription.getSetVersion());
+        assertEquals(new Date(1234), serverDescription.getLastWriteDate());
+        assertEquals(40000L, serverDescription.getLastUpdateTime(TimeUnit.NANOSECONDS));
+        assertEquals((Integer) 30, serverDescription.getLogicalSessionTimeoutMinutes());
         assertEquals(exception, serverDescription.getException());
     }
 
     @Test
     public void testObjectOverrides() throws UnknownHostException {
-        ServerDescription.Builder builder = builder()
-                                                             .address(new ServerAddress())
-                                                             .type(ServerType.SHARD_ROUTER)
-                                                             .tagSet(new TagSet(asList(new Tag("dc", "ny"))))
-                                                                     .setName("test")
-                                                                     .maxDocumentSize(100)
-                                                                     .roundTripTime(50000, java.util.concurrent.TimeUnit.NANOSECONDS)
-                                                                     .primary("localhost:27017")
-                                                                     .canonicalAddress("localhost:27017")
-                                                                     .hosts(new HashSet<String>(asList("localhost:27017",
-                                                                                                       "localhost:27018")))
-                                                                     .passives(new HashSet<String>(asList("localhost:27019")))
-                                                                     .ok(true)
-                                                                     .state(CONNECTED)
-                                                                     .version(new ServerVersion(asList(2, 4, 1)))
-                                                                     .minWireVersion(1)
-                                                             .maxWireVersion(2)
-                                                             .electionId(new ObjectId())
-                                                             .setVersion(new Integer(2));
-        assertEquals(builder.build(), builder.build());
-        assertEquals(builder.build().hashCode(), builder.build().hashCode());
-        assertTrue(builder.build().toString().startsWith("ServerDescription"));
+        ServerDescription.Builder builder = createBuilder();
+        ServerDescription description = builder.build();
+
+        assertEquals(description.hashCode(), builder.build().hashCode());
+        assertTrue(description.toString().startsWith("ServerDescription"));
+
+        assertEquals(description, description);
+
+        assertNotEquals(description, null);
+        assertNotEquals(description, "not a ServerDescription instance");
+        assertEquals(description, builder.build());
+
+        ServerDescription otherDescription = createBuilder().address(new ServerAddress("localhost:27018")).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().type(ServerType.STANDALONE).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().tagSet(null).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().setName("test2").build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().maxDocumentSize(200).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().primary("localhost:27018").build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().canonicalAddress("localhost:27018").build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().hosts(new HashSet<String>(singletonList("localhost:27018"))).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().arbiters(new HashSet<String>(singletonList("localhost:27018"))).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().passives(new HashSet<String>(singletonList("localhost:27018"))).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().ok(false).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().state(CONNECTING).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().version(new ServerVersion(asList(2, 6, 1))).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().minWireVersion(2).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().maxWireVersion(5).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().electionId(new ObjectId()).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().setVersion(3).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        // test exception state changes
+        assertNotEquals(createBuilder().exception(new IOException()).build(),
+                createBuilder().exception(new RuntimeException()).build());
+        assertNotEquals(createBuilder().exception(new IOException("message one")).build(),
+                createBuilder().exception(new IOException("message two")).build());
+
+        // different lastUpdateTime and lastWriteDate are considered not equal but equivalent state
+        otherDescription = createBuilder().lastUpdateTimeNanos(Long.MAX_VALUE).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().lastWriteDate(new Date()).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        otherDescription = createBuilder().logicalSessionTimeoutMinutes(32).build();
+        assertNotEquals(builder.build(), otherDescription);
+
+        // roundTripTime is considered equals and equivalent state
+        otherDescription = createBuilder().roundTripTime(62, TimeUnit.MILLISECONDS).build();
+        assertEquals(builder.build(), otherDescription);
+    }
+
+    private ServerDescription.Builder createBuilder() {
+        return builder().address(new ServerAddress())
+                       .type(ServerType.SHARD_ROUTER)
+                       .tagSet(new TagSet(singletonList(new Tag("dc", "ny"))))
+                       .setName("test")
+                       .maxDocumentSize(100)
+                       .roundTripTime(50000, TimeUnit.NANOSECONDS)
+                       .primary("localhost:27017")
+                       .canonicalAddress("localhost:27017")
+                       .hosts(new HashSet<String>(asList("localhost:27017", "localhost:27018")))
+                       .passives(new HashSet<String>(singletonList("localhost:27019")))
+                       .arbiters(new HashSet<String>(singletonList("localhost:27020")))
+                       .ok(true)
+                       .state(CONNECTED)
+                       .version(new ServerVersion(asList(3, 4, 1)))
+                       .minWireVersion(1)
+                       .lastWriteDate(new Date())
+                       .maxWireVersion(2)
+                       .electionId(new ObjectId("abcdabcdabcdabcdabcdabcd"))
+                       .setVersion(2)
+                       .lastUpdateTimeNanos(1)
+                       .lastWriteDate(new Date(42))
+                       .logicalSessionTimeoutMinutes(25)
+                       .roundTripTime(56, TimeUnit.MILLISECONDS);
     }
 
     @Test
@@ -280,7 +381,7 @@ public void testHasTags() throws UnknownHostException {
                                                                .ok(false)
                                                                .state(CONNECTED)
                                                                .build();
-        assertFalse(serverDescription.hasTags(new TagSet(asList(new Tag("dc", "ny")))));
+        assertFalse(serverDescription.hasTags(new TagSet(singletonList(new Tag("dc", "ny")))));
 
         serverDescription = builder()
                                              .address(new ServerAddress())
@@ -288,7 +389,7 @@ public void testHasTags() throws UnknownHostException {
                                              .ok(true)
                                              .state(CONNECTED)
                                              .build();
-        assertTrue(serverDescription.hasTags(new TagSet(asList(new Tag("dc", "ny")))));
+        assertTrue(serverDescription.hasTags(new TagSet(singletonList(new Tag("dc", "ny")))));
 
         serverDescription = builder()
                                              .address(new ServerAddress())
@@ -296,7 +397,7 @@ public void testHasTags() throws UnknownHostException {
                                              .ok(true)
                                              .state(CONNECTED)
                                              .build();
-        assertTrue(serverDescription.hasTags(new TagSet(asList(new Tag("dc", "ny")))));
+        assertTrue(serverDescription.hasTags(new TagSet(singletonList(new Tag("dc", "ny")))));
 
         serverDescription = builder()
                                              .address(new ServerAddress())
@@ -310,89 +411,95 @@ public void testHasTags() throws UnknownHostException {
                                              .address(new ServerAddress())
                                              .type(REPLICA_SET_PRIMARY)
                                              .ok(true)
-                                             .tagSet(new TagSet(asList(new Tag("dc", "ca"))))
+                                             .tagSet(new TagSet(singletonList(new Tag("dc", "ca"))))
                                              .state(CONNECTED)
                                              .build();
-        assertFalse(serverDescription.hasTags(new TagSet(asList(new Tag("dc", "ny")))));
+        assertFalse(serverDescription.hasTags(new TagSet(singletonList(new Tag("dc", "ny")))));
 
         serverDescription = builder()
                                              .address(new ServerAddress())
                                              .type(REPLICA_SET_PRIMARY)
                                              .ok(true)
-                                             .tagSet(new TagSet(asList(new Tag("rack", "1"))))
+                                             .tagSet(new TagSet(singletonList(new Tag("rack", "1"))))
                                              .state(CONNECTED)
                                              .build();
-        assertFalse(serverDescription.hasTags(new TagSet(asList(new Tag("rack", "2")))));
+        assertFalse(serverDescription.hasTags(new TagSet(singletonList(new Tag("rack", "2")))));
 
         serverDescription = builder()
                                              .address(new ServerAddress())
                                              .type(REPLICA_SET_PRIMARY)
                                              .ok(true)
-                                             .tagSet(new TagSet(asList(new Tag("rack", "1"))))
+                                             .tagSet(new TagSet(singletonList(new Tag("rack", "1"))))
                                              .state(CONNECTED)
                                              .build();
-        assertTrue(serverDescription.hasTags(new TagSet(asList(new Tag("rack", "1")))));
+        assertTrue(serverDescription.hasTags(new TagSet(singletonList(new Tag("rack", "1")))));
     }
 
     @Test
     public void notOkServerShouldBeCompatible() throws UnknownHostException {
-        assertTrue(builder()
-                                    .address(new ServerAddress())
-                                    .state(CONNECTING)
-                                    .ok(false)
-                                    .build()
-                                    .isCompatibleWithDriver());
+        ServerDescription serverDescription = builder()
+                .address(new ServerAddress())
+                .state(CONNECTING)
+                .ok(false)
+                .build();
+        assertTrue(serverDescription.isCompatibleWithDriver());
+        assertFalse(serverDescription.isIncompatiblyNewerThanDriver());
+        assertFalse(serverDescription.isIncompatiblyOlderThanDriver());
     }
 
     @Test
     public void serverWithMinWireVersionEqualToDriverMaxWireVersionShouldBeCompatible() throws UnknownHostException {
-        assertTrue(builder()
-                                    .address(new ServerAddress())
-                                    .state(CONNECTING)
-                                    .ok(true)
-                                    .minWireVersion(MAX_DRIVER_WIRE_VERSION)
-                                    .maxWireVersion(MAX_DRIVER_WIRE_VERSION + 1)
-                                    .build()
-                                    .isCompatibleWithDriver());
-
+        ServerDescription serverDescription = builder()
+                .address(new ServerAddress())
+                .state(CONNECTING)
+                .ok(true)
+                .minWireVersion(MAX_DRIVER_WIRE_VERSION)
+                .maxWireVersion(MAX_DRIVER_WIRE_VERSION + 1)
+                .build();
+        assertTrue(serverDescription.isCompatibleWithDriver());
+        assertFalse(serverDescription.isIncompatiblyNewerThanDriver());
+        assertFalse(serverDescription.isIncompatiblyOlderThanDriver());
     }
 
     @Test
     public void serverWithMaxWireVersionEqualToDriverMinWireVersionShouldBeCompatible() throws UnknownHostException {
-        assertTrue(builder()
-                                    .address(new ServerAddress())
-                                    .state(CONNECTING)
-                                    .ok(true)
-                                    .minWireVersion(MIN_DRIVER_WIRE_VERSION - 1)
-                                    .maxWireVersion(MIN_DRIVER_WIRE_VERSION)
-                                    .build()
-                                    .isCompatibleWithDriver());
-
+        ServerDescription serverDescription = builder()
+                .address(new ServerAddress())
+                .state(CONNECTING)
+                .ok(true)
+                .minWireVersion(MIN_DRIVER_WIRE_VERSION - 1)
+                .maxWireVersion(MIN_DRIVER_WIRE_VERSION)
+                .build();
+        assertTrue(serverDescription.isCompatibleWithDriver());
+        assertFalse(serverDescription.isIncompatiblyNewerThanDriver());
+        assertFalse(serverDescription.isIncompatiblyOlderThanDriver());
     }
 
     @Test
     public void serverWithMinWireVersionGreaterThanDriverMaxWireVersionShouldBeIncompatible() throws UnknownHostException {
-        assertFalse(builder()
-                                     .address(new ServerAddress())
-                                     .state(CONNECTING)
-                                     .ok(true)
-                                     .minWireVersion(MAX_DRIVER_WIRE_VERSION + 1)
-                                     .maxWireVersion(MAX_DRIVER_WIRE_VERSION + 1)
-                                     .build()
-                                     .isCompatibleWithDriver());
-
+        ServerDescription serverDescription = builder()
+                .address(new ServerAddress())
+                .state(CONNECTING)
+                .ok(true)
+                .minWireVersion(MAX_DRIVER_WIRE_VERSION + 1)
+                .maxWireVersion(MAX_DRIVER_WIRE_VERSION + 1)
+                .build();
+        assertFalse(serverDescription.isCompatibleWithDriver());
+        assertTrue(serverDescription.isIncompatiblyNewerThanDriver());
+        assertFalse(serverDescription.isIncompatiblyOlderThanDriver());
     }
 
     @Test
     public void serverWithMaxWireVersionLessThanDriverMinWireVersionShouldBeIncompatible() throws UnknownHostException {
-        assertFalse(builder()
-                                     .address(new ServerAddress())
-                                     .state(CONNECTING)
-                                     .ok(true)
-                                     .minWireVersion(MIN_DRIVER_WIRE_VERSION - 1)
-                                     .maxWireVersion(MIN_DRIVER_WIRE_VERSION - 1)
-                                     .build()
-                                     .isCompatibleWithDriver());
-
+        ServerDescription serverDescription = builder()
+                .address(new ServerAddress())
+                .state(CONNECTING)
+                .ok(true)
+                .minWireVersion(MIN_DRIVER_WIRE_VERSION - 1)
+                .maxWireVersion(MIN_DRIVER_WIRE_VERSION - 1)
+                .build();
+        assertFalse(serverDescription.isCompatibleWithDriver());
+        assertFalse(serverDescription.isIncompatiblyNewerThanDriver());
+        assertTrue(serverDescription.isIncompatiblyOlderThanDriver());
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerIdSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ServerIdSpecification.groovy
index 18955c8301a..d22fbb65a2c 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerIdSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ServerIdSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,4 +41,4 @@ class ServerIdSpecification extends Specification {
         id1 == id2
         id1.hashCode() == id2.hashCode()
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerListenerFactory.java b/driver-core/src/test/unit/com/mongodb/connection/ServerListenerFactory.java
deleted file mode 100644
index fbe30087899..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerListenerFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.ServerAddress;
-import com.mongodb.event.ServerListener;
-
-interface ServerListenerFactory {
-    ServerListener create(ServerAddress serverAddress);
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerSelectionSelectionTest.java b/driver-core/src/test/unit/com/mongodb/connection/ServerSelectionSelectionTest.java
index 6300bae8393..21f21a24b46 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerSelectionSelectionTest.java
+++ b/driver-core/src/test/unit/com/mongodb/connection/ServerSelectionSelectionTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,6 +16,7 @@
 
 package com.mongodb.connection;
 
+import com.mongodb.MongoConfigurationException;
 import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.mongodb.Tag;
@@ -26,7 +27,10 @@
 import com.mongodb.selector.ServerSelector;
 import com.mongodb.selector.WritableServerSelector;
 import org.bson.BsonArray;
+import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,30 +42,53 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 // See https://github.com/mongodb/specifications/tree/master/source/server-selection/tests
 @RunWith(Parameterized.class)
 public class ServerSelectionSelectionTest {
+    private final String description;
     private final BsonDocument definition;
     private final ClusterDescription clusterDescription;
+    private final long heartbeatFrequencyMS;
+    private final boolean error;
 
     public ServerSelectionSelectionTest(final String description, final BsonDocument definition) {
+        this.description = description;
         this.definition = definition;
+        this.heartbeatFrequencyMS = definition.getNumber("heartbeatFrequencyMS", new BsonInt64(10000)).longValue();
+        this.error = definition.getBoolean("error", BsonBoolean.FALSE).getValue();
         this.clusterDescription = buildClusterDescription(definition.getDocument("topology_description"));
     }
 
     @Test
     public void shouldPassAllOutcomes() {
-        ServerSelector serverSelector = getServerSelector();
-
-        List<ServerDescription> suitableServers = buildServerDescriptions(definition.getArray("suitable_servers"));
-        List<ServerDescription> selectedServers = serverSelector.select(clusterDescription);
+        // skip this test because the driver prohibits maxStaleness or tagSets with mode of primary at a much lower level
+        assumeTrue(!description.equals("max-staleness/server_selection/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json"));
+
+        ServerSelector serverSelector = null;
+        List<ServerDescription> suitableServers = buildServerDescriptions(definition.getArray("suitable_servers", new BsonArray()));
+        List<ServerDescription> selectedServers = null;
+        try {
+            serverSelector = getServerSelector();
+            selectedServers = serverSelector.select(clusterDescription);
+            if (error) {
+                fail("Should have thrown exception");
+            }
+        } catch (MongoConfigurationException e) {
+            if (!error) {
+                fail("Should not have thrown exception: " + e);
+            }
+            return;
+        }
         assertServers(selectedServers, suitableServers);
 
         ServerSelector latencyBasedServerSelector = new CompositeServerSelector(asList(serverSelector,
@@ -75,17 +102,26 @@ public void shouldPassAllOutcomes() {
     public static Collection<Object[]> data() throws URISyntaxException, IOException {
         List<Object[]> data = new ArrayList<Object[]>();
         for (File file : JsonPoweredTestHelper.getTestFiles("/server-selection/server_selection")) {
-            data.add(new Object[]{file.getName(), JsonPoweredTestHelper.getTestDocument(file)});
+            data.add(new Object[]{getDescription("server-selection/server_selection", file), JsonPoweredTestHelper.getTestDocument(file)});
+        }
+        for (File file : JsonPoweredTestHelper.getTestFiles("/max-staleness/server_selection")) {
+            data.add(new Object[]{getDescription("max-staleness/server_selection", file), JsonPoweredTestHelper.getTestDocument(file)});
         }
         return data;
     }
 
+    private static String getDescription(final String root, final File file) {
+        return root + "/" + file.getParentFile().getName() + "/" + file.getName();
+    }
+
     private ClusterDescription buildClusterDescription(final BsonDocument topologyDescription) {
         ClusterType clusterType = getClusterType(topologyDescription.getString("type").getValue());
-        ClusterConnectionMode connectionMode = clusterType == ClusterType.STANDALONE ? ClusterConnectionMode.SINGLE
-                : ClusterConnectionMode.MULTIPLE;
+        ClusterConnectionMode connectionMode = ClusterConnectionMode.MULTIPLE;
         List<ServerDescription> servers = buildServerDescriptions(topologyDescription.getArray("servers"));
-        return new ClusterDescription(connectionMode, clusterType, servers);
+        return new ClusterDescription(connectionMode, clusterType, servers, null,
+                                             ServerSettings.builder()
+                                                     .heartbeatFrequency(heartbeatFrequencyMS, TimeUnit.MILLISECONDS)
+                                                     .build());
     }
 
     private ClusterType getClusterType(final String type) {
@@ -113,11 +149,27 @@ private List<ServerDescription> buildServerDescriptions(final BsonArray serverDe
     private ServerDescription buildServerDescription(final BsonDocument serverDescription) {
         ServerDescription.Builder builder = ServerDescription.builder();
         builder.address(new ServerAddress(serverDescription.getString("address").getValue()));
-        builder.type(getServerType(serverDescription.getString("type").getValue()));
-        builder.tagSet(buildTagSet(serverDescription.getDocument("tags")));
-        builder.roundTripTime(serverDescription.getNumber("avg_rtt_ms").asInt32().getValue(), TimeUnit.MILLISECONDS);
+        ServerType serverType = getServerType(serverDescription.getString("type").getValue());
+        builder.ok(serverType != ServerType.UNKNOWN);
+        builder.type(serverType);
+        if (serverDescription.containsKey("tags")) {
+            builder.tagSet(buildTagSet(serverDescription.getDocument("tags")));
+        }
+        if (serverDescription.containsKey("avg_rtt_ms")) {
+            builder.roundTripTime(serverDescription.getNumber("avg_rtt_ms").asInt32().getValue(), TimeUnit.MILLISECONDS);
+        }
         builder.state(ServerConnectionState.CONNECTED);
-        builder.ok(true);
+        if (serverDescription.containsKey("lastWrite")) {
+            builder.lastWriteDate(new Date(serverDescription.getDocument("lastWrite").getNumber("lastWriteDate").longValue()));
+        }
+        if (serverDescription.containsKey("lastUpdateTime")) {
+            builder.lastUpdateTimeNanos(serverDescription.getNumber("lastUpdateTime").longValue() * 1000000);  // convert to nanos
+        } else {
+            builder.lastUpdateTimeNanos(42L);
+        }
+        if (serverDescription.containsKey("maxWireVersion")) {
+            builder.maxWireVersion(serverDescription.getNumber("maxWireVersion").intValue());
+        }
         return builder.build();
     }
 
@@ -158,30 +210,34 @@ private List<TagSet> buildTagSets(final BsonArray tags) {
 
     private TagSet buildTagSet(final BsonDocument tags) {
         List<Tag> tagsSetTags = new ArrayList<Tag>();
-        for (String key: tags.keySet()) {
+        for (String key : tags.keySet()) {
             tagsSetTags.add(new Tag(key, tags.getString(key).getValue()));
         }
         return new TagSet(tagsSetTags);
     }
 
     private ServerSelector getServerSelector() {
-        if (definition.getString("operation").getValue().equals("write")) {
+        if (definition.getString("operation", new BsonString("read")).getValue().equals("write")) {
             return new WritableServerSelector();
         } else {
             BsonDocument readPreferenceDefinition = definition.getDocument("read_preference");
             ReadPreference readPreference;
             if (readPreferenceDefinition.getString("mode").getValue().equals("Primary")) {
                 readPreference = ReadPreference.valueOf("Primary");
+            } else if (readPreferenceDefinition.containsKey("maxStalenessSeconds")) {
+                readPreference = ReadPreference.valueOf(readPreferenceDefinition.getString("mode", new BsonString("Primary")).getValue(),
+                        buildTagSets(readPreferenceDefinition.getArray("tag_sets", new BsonArray())),
+                        Math.round(readPreferenceDefinition.getNumber("maxStalenessSeconds").doubleValue() * 1000), TimeUnit.MILLISECONDS);
             } else {
-                readPreference = ReadPreference.valueOf(readPreferenceDefinition.getString("mode").getValue(),
-                        buildTagSets(readPreferenceDefinition.getArray("tag_sets")));
+                readPreference = ReadPreference.valueOf(readPreferenceDefinition.getString("mode", new BsonString("Primary")).getValue(),
+                        buildTagSets(readPreferenceDefinition.getArray("tag_sets", new BsonArray())));
             }
             return new ReadPreferenceServerSelector(readPreference);
         }
     }
 
     private void assertServers(final List<ServerDescription> actual, final List<ServerDescription> expected) {
-        assertEquals(actual.size(), expected.size());
+        assertEquals(expected.size(), actual.size());
         assertTrue(actual.containsAll(expected));
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ServerSettingsSpecification.groovy
index 1daf6eb9df7..e4d094ba48a 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerSettingsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ServerSettingsSpecification.groovy
@@ -1,11 +1,30 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.mongodb.connection
 
 import com.mongodb.ConnectionString
+import com.mongodb.event.ServerListenerAdapter
+import com.mongodb.event.ServerMonitorListenerAdapter
 import spock.lang.Specification
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 import static java.util.concurrent.TimeUnit.SECONDS
 
+@SuppressWarnings('deprecation')
 class ServerSettingsSpecification extends Specification {
     def 'should have correct defaults'() {
         when:
@@ -20,10 +39,10 @@ class ServerSettingsSpecification extends Specification {
 
     def 'should apply builder settings'() {
         given:
-        def serverListenerOne = new NoOpServerListener()
-        def serverListenerTwo = new NoOpServerListener()
-        def serverMonitorListenerOne = new NoOpServerMonitorListener()
-        def serverMonitorListenerTwo = new NoOpServerMonitorListener()
+        def serverListenerOne = new ServerListenerAdapter() { }
+        def serverListenerTwo = new ServerListenerAdapter() { }
+        def serverMonitorListenerOne = new ServerMonitorListenerAdapter() { }
+        def serverMonitorListenerTwo = new ServerMonitorListenerAdapter() { }
 
         when:
         def settings = ServerSettings.builder()
@@ -53,18 +72,35 @@ class ServerSettingsSpecification extends Specification {
         settings.getHeartbeatFrequency(MILLISECONDS) == 20000
     }
 
+    def 'should apply settings'() {
+        given:
+        def serverListenerOne = new ServerListenerAdapter() { }
+        def serverMonitorListenerOne = new ServerMonitorListenerAdapter() { }
+        def defaultSettings = ServerSettings.builder().build()
+        def customSettings = ServerSettings.builder()
+                .heartbeatFrequency(4, SECONDS)
+                .minHeartbeatFrequency(1, SECONDS)
+                .addServerListener(serverListenerOne)
+                .addServerMonitorListener(serverMonitorListenerOne)
+                .build()
+
+        expect:
+        ServerSettings.builder().applySettings(customSettings).build() == customSettings
+        ServerSettings.builder(customSettings).applySettings(defaultSettings).build() == defaultSettings
+    }
+
     def 'lists of listeners should be unmodifiable'() {
         given:
         def settings = ServerSettings.builder().build()
 
         when:
-        settings.serverListeners.add(new NoOpServerListener())
+        settings.serverListeners.add(new ServerListenerAdapter() { })
 
         then:
         thrown(UnsupportedOperationException)
 
         when:
-        settings.serverMonitorListeners.add(new NoOpServerMonitorListener())
+        settings.serverMonitorListeners.add(new ServerMonitorListenerAdapter() { })
 
         then:
         thrown(UnsupportedOperationException)
@@ -86,8 +122,8 @@ class ServerSettingsSpecification extends Specification {
 
     def 'identical settings should be equal'() {
         given:
-        def serverListenerOne = new NoOpServerListener()
-        def serverMonitorListenerOne = new NoOpServerMonitorListener()
+        def serverListenerOne = new ServerListenerAdapter() { }
+        def serverMonitorListenerOne = new ServerMonitorListenerAdapter() { }
 
         expect:
         ServerSettings.builder().build() == ServerSettings.builder().build()
@@ -112,8 +148,8 @@ class ServerSettingsSpecification extends Specification {
 
     def 'identical settings should have same hash code'() {
         given:
-        def serverListenerOne = new NoOpServerListener()
-        def serverMonitorListenerOne = new NoOpServerMonitorListener()
+        def serverListenerOne = new ServerListenerAdapter() { }
+        def serverMonitorListenerOne = new ServerMonitorListenerAdapter() { }
 
         expect:
         ServerSettings.builder().build().hashCode() == ServerSettings.builder().build().hashCode()
@@ -136,4 +172,4 @@ class ServerSettingsSpecification extends Specification {
         ServerSettings.builder().heartbeatFrequency(4, SECONDS).build().hashCode() !=
         ServerSettings.builder().heartbeatFrequency(3, SECONDS).build().hashCode()
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerVersionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/ServerVersionSpecification.groovy
index 1d082c6f4d2..a6a3e45bd41 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerVersionSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/ServerVersionSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,15 +53,15 @@ class ServerVersionSpecification extends Specification {
 
     def 'should have same version array as when constructed'() {
         when:
-        def version = new ServerVersion([2, 4, 1])
+        def version = new ServerVersion([3, 4, 1])
 
         then:
-        version.versionList == [2, 4, 1]
+        version.versionList == [3, 4, 1]
     }
 
     def 'should have immutable version array'() {
         given:
-        def version = new ServerVersion([2, 4, 1])
+        def version = new ServerVersion([3, 4, 1])
 
         when:
         version.versionList[0] = 1
@@ -72,23 +72,23 @@ class ServerVersionSpecification extends Specification {
 
     def 'identical versions should be equal'() {
         when:
-        def version = new ServerVersion([2, 4, 1])
+        def version = new ServerVersion([3, 4, 1])
 
         then:
-        version == new ServerVersion([2, 4, 1])
+        version == new ServerVersion([3, 4, 1])
     }
 
     def 'identical versions should have the same hash code'() {
         when:
-        def version = new ServerVersion([2, 4, 1])
+        def version = new ServerVersion([3, 4, 1])
 
         then:
-        version.hashCode() == new ServerVersion([2, 4, 1]).hashCode()
+        version.hashCode() == new ServerVersion([3, 4, 1]).hashCode()
     }
 
     def 'different versions should not be equal'() {
         when:
-        def version = new ServerVersion([2, 4, 1])
+        def version = new ServerVersion([3, 4, 1])
 
         then:
         version != new ServerVersion([2, 5, 1])
@@ -116,29 +116,29 @@ class ServerVersionSpecification extends Specification {
 
     def 'higher version should compare greater than'() {
         when:
-        def version = new ServerVersion([3, 4, 1])
+        def version = new ServerVersion([3, 6, 0])
 
         then:
-        version.compareTo(new ServerVersion([2, 4, 1])) > 0
+        version.compareTo(new ServerVersion([3, 4, 1])) > 0
 
         when:
-        version = new ServerVersion([2, 5, 1])
+        version = new ServerVersion([3, 5, 1])
 
         then:
-        version.compareTo(new ServerVersion([2, 4, 1])) > 0
+        version.compareTo(new ServerVersion([3, 4, 1])) > 0
 
         when:
-        version = new ServerVersion([2, 4, 2])
+        version = new ServerVersion([3, 4, 2])
 
         then:
-        version.compareTo(new ServerVersion([2, 4, 1])) > 0
+        version.compareTo(new ServerVersion([3, 4, 1])) > 0
     }
 
     def 'same version should compare equal'() {
         when:
-        def version = new ServerVersion([2, 4, 1])
+        def version = new ServerVersion([3, 4, 1])
 
         then:
-        version.compareTo(new ServerVersion([2, 4, 1])) == 0
+        version.compareTo(new ServerVersion([3, 4, 1])) == 0
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/connection/SocketSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/SocketSettingsSpecification.groovy
index d13852451a9..0f5341de611 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/SocketSettingsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/SocketSettingsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,9 @@ import spock.lang.Specification
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS
 
+@SuppressWarnings('deprecation')
 class SocketSettingsSpecification extends Specification {
+
     def 'should have correct defaults'() {
         when:
         def settings = SocketSettings.builder().build()
@@ -29,27 +31,46 @@ class SocketSettingsSpecification extends Specification {
         then:
         settings.getConnectTimeout(MILLISECONDS) == 10000
         settings.getReadTimeout(MILLISECONDS) == 0
-        !settings.keepAlive
+        settings.keepAlive
         settings.receiveBufferSize == 0
         settings.sendBufferSize == 0
     }
 
-    def 'should apply builder settings'() {
+    def 'should set settings'() {
         when:
         def settings = SocketSettings.builder()
                                      .connectTimeout(5000, MILLISECONDS)
                                      .readTimeout(2000, MILLISECONDS)
-                                     .keepAlive(true)
+                                     .keepAlive(false)
                                      .sendBufferSize(1000)
                                      .receiveBufferSize(1500)
-                                     .keepAlive(true)
                                      .build()
 
 
         then:
         settings.getConnectTimeout(MILLISECONDS) == 5000
         settings.getReadTimeout(MILLISECONDS) == 2000
-        settings.keepAlive
+        !settings.keepAlive
+        settings.sendBufferSize == 1000
+        settings.receiveBufferSize == 1500
+    }
+
+    def 'should apply builder settings'() {
+        when:
+        def original = SocketSettings.builder()
+                .connectTimeout(5000, MILLISECONDS)
+                .readTimeout(2000, MILLISECONDS)
+                .keepAlive(false)
+                .sendBufferSize(1000)
+                .receiveBufferSize(1500)
+                .build()
+
+        def settings = SocketSettings.builder(original).build()
+
+        then:
+        settings.getConnectTimeout(MILLISECONDS) == 5000
+        settings.getReadTimeout(MILLISECONDS) == 2000
+        !settings.keepAlive
         settings.sendBufferSize == 1000
         settings.receiveBufferSize == 1500
     }
@@ -65,11 +86,27 @@ class SocketSettingsSpecification extends Specification {
         then:
         settings.getConnectTimeout(MILLISECONDS) == 5000
         settings.getReadTimeout(MILLISECONDS) == 2000
-        !settings.keepAlive
+        settings.keepAlive
         settings.sendBufferSize == 0
         settings.receiveBufferSize == 0
     }
 
+    def 'should apply settings'() {
+        given:
+        def defaultSettings = SocketSettings.builder().build()
+        def customSettings = SocketSettings.builder()
+                .connectTimeout(5000, MILLISECONDS)
+                .readTimeout(2000, MILLISECONDS)
+                .keepAlive(false)
+                .sendBufferSize(1000)
+                .receiveBufferSize(1500)
+                .build()
+
+        expect:
+        SocketSettings.builder().applySettings(customSettings).build() == customSettings
+        SocketSettings.builder(customSettings).applySettings(defaultSettings).build() == defaultSettings
+    }
+
     def 'identical settings should be equal'() {
         expect:
         SocketSettings.builder().build() == SocketSettings.builder().build()
@@ -79,7 +116,6 @@ class SocketSettingsSpecification extends Specification {
                       .keepAlive(true)
                       .sendBufferSize(1000)
                       .receiveBufferSize(1500)
-                      .keepAlive(true)
                       .build() ==
         SocketSettings.builder()
                       .connectTimeout(5000, MILLISECONDS)
@@ -87,7 +123,6 @@ class SocketSettingsSpecification extends Specification {
                       .keepAlive(true)
                       .sendBufferSize(1000)
                       .receiveBufferSize(1500)
-                      .keepAlive(true)
                       .build()
     }
 
@@ -105,7 +140,6 @@ class SocketSettingsSpecification extends Specification {
                       .keepAlive(true)
                       .sendBufferSize(1000)
                       .receiveBufferSize(1500)
-                      .keepAlive(true)
                       .build().hashCode() ==
         SocketSettings.builder()
                       .connectTimeout(5000, MILLISECONDS)
@@ -113,7 +147,6 @@ class SocketSettingsSpecification extends Specification {
                       .keepAlive(true)
                       .sendBufferSize(1000)
                       .receiveBufferSize(1500)
-                      .keepAlive(true)
                       .build().hashCode()
     }
 
@@ -121,4 +154,4 @@ class SocketSettingsSpecification extends Specification {
         expect:
         SocketSettings.builder().keepAlive(true).build().hashCode() != SocketSettings.builder().keepAlive(false).build().hashCode()
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/SslSettingsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/SslSettingsSpecification.groovy
index 074b9a87345..3cf1c258725 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/SslSettingsSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/SslSettingsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,38 +21,44 @@ import com.mongodb.MongoInternalException
 import spock.lang.IgnoreIf
 import spock.lang.Specification
 
-import static com.mongodb.connection.SslSettings.builder
+import javax.net.ssl.SSLContext
 
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
 
 class SslSettingsSpecification extends Specification {
-    def 'should default to disabled'() {
-        expect:
-        !builder().build().enabled
-    }
 
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
-    def 'should enable'() {
-        expect:
-        builder().enabled(true).build().enabled
-    }
+    def 'should have the expected defaults'() {
+        when:
+        def settings = SslSettings.builder().build()
 
-    def 'should default to disallow invalid host name'() {
-        expect:
-        !builder().build().invalidHostNameAllowed
+        then:
+        settings.context == null
+        !settings.enabled
+        !settings.invalidHostNameAllowed
     }
 
-    def 'should allow invalid host name'() {
-        expect:
-        builder().invalidHostNameAllowed(true).build().invalidHostNameAllowed
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should set settings'() {
+        when:
+        def settings = SslSettings.builder()
+                .context(SSLContext.getDefault())
+                .enabled(true)
+                .invalidHostNameAllowed(true)
+                .build()
+
+        then:
+        settings.context == SSLContext.getDefault()
+        settings.enabled
+        settings.invalidHostNameAllowed
     }
 
     def 'should not allow invalid host name on Java 6'() {
         given:
         String javaVersion = System.getProperty('java.version')
-        when:
 
+        when:
         System.setProperty('java.version', '1.6.0_45')
-        builder().enabled(true).build()
+        SslSettings.builder().enabled(true).build()
 
         then:
         def e = thrown(MongoInternalException)
@@ -62,48 +68,76 @@ class SslSettingsSpecification extends Specification {
         System.setProperty('java.version', javaVersion)
     }
 
+    @IgnoreIf({ isNotAtLeastJava7() })
     def 'should apply connection string without ssl'() {
         expect:
-        !builder().applyConnectionString(new ConnectionString('mongodb://localhost')).build().enabled
-        !builder().applyConnectionString(new ConnectionString('mongodb://localhost/?ssl=false')).build().enabled
-        !builder().applyConnectionString(new ConnectionString('mongodb://localhost')).build().invalidHostNameAllowed
-        !builder().applyConnectionString(new ConnectionString('mongodb://localhost/?ssl=false')).build().invalidHostNameAllowed
+        builder.applyConnectionString(new ConnectionString(connectionString)).build() == expected
+
+        where:
+        connectionString                        | builder                               | expected
+        'mongodb://localhost'                   | SslSettings.builder()                 | SslSettings.builder().build()
+        'mongodb://localhost/?ssl=false'        | SslSettings.builder()                 | SslSettings.builder().build()
+        'mongodb://localhost/?ssl=true'         | SslSettings.builder()                 | SslSettings.builder().enabled(true).build()
+        'mongodb://localhost/?ssl=true' +
+            '&sslInvalidHostNameAllowed=true'   | SslSettings.builder()                 | SslSettings.builder().enabled(true)
+                                                                                            .invalidHostNameAllowed(true).build()
+        'mongodb://localhost/?ssl=true' +
+            '&sslInvalidHostNameAllowed=true'   | SslSettings.builder()
+                                                    .context(SSLContext.getDefault())    | SslSettings.builder().enabled(true)
+                                                                                                .context(SSLContext.getDefault())
+                                                                                                .invalidHostNameAllowed(true).build()
     }
 
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
-    def 'should apply connection string with ssl'() {
-        expect:
-        builder().applyConnectionString(new ConnectionString('mongodb://localhost/?ssl=true')).build().enabled
-        !builder().applyConnectionString(new ConnectionString('mongodb://localhost/?ssl=true')).build().invalidHostNameAllowed
-    }
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should apply settings'() {
+        given:
+        def defaultSettings = SslSettings.builder().build()
+        def customSettings = SslSettings.builder()
+                .context(SSLContext.getDefault())
+                .enabled(true)
+                .invalidHostNameAllowed(true)
+                .build()
 
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
-    def 'should apply connection string with ssl and sslInvalidHostNameAllowed'() {
         expect:
-        builder().applyConnectionString(new ConnectionString('mongodb://localhost/?ssl=true&sslInvalidHostNameAllowed=true'))
-                .build().enabled
-        builder().applyConnectionString(new ConnectionString('mongodb://localhost/?ssl=true&sslInvalidHostNameAllowed=true'))
-                .build().invalidHostNameAllowed
+        SslSettings.builder().applySettings(customSettings).build() == customSettings
+        SslSettings.builder(customSettings).applySettings(defaultSettings).build() == defaultSettings
     }
 
-    def 'should apply connection string with ssl and invalidHostNameAllowed'() {
-        expect:
-        builder().applyConnectionString(new ConnectionString('mongodb://localhost/?ssl=true')).invalidHostNameAllowed(true).build().enabled
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should apply builder settings'() {
+        when:
+        def original = SslSettings.builder().enabled(true)
+                .context(SSLContext.getDefault())
+                .invalidHostNameAllowed(true).build()
+
+        def settings = SslSettings.builder(original).build()
+
+        then:
+        original == settings
     }
 
     def 'equivalent settings should be equal and have the same hash code'() {
         expect:
-        builder().build() == builder().build()
-        builder().build().hashCode() == builder().build().hashCode()
-        builder().enabled(true).invalidHostNameAllowed(true).build() == builder().enabled(true).invalidHostNameAllowed(true).build()
-        builder().enabled(true).invalidHostNameAllowed(true).build().hashCode() ==
-        builder().enabled(true).invalidHostNameAllowed(true).build().hashCode()
+        SslSettings.builder().build() == SslSettings.builder().build()
+        SslSettings.builder().build().hashCode() == SslSettings.builder().build().hashCode()
+        SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build() ==
+                SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build()
+        SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build().hashCode() ==
+                SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build().hashCode()
+        SslSettings.builder().enabled(true).invalidHostNameAllowed(true).context(SSLContext.getDefault()).build() ==
+                SslSettings.builder().enabled(true).invalidHostNameAllowed(true)
+                        .context(SSLContext.getDefault()).build()
+        SslSettings.builder().enabled(true).invalidHostNameAllowed(true)
+                .context(SSLContext.getDefault()).build().hashCode() ==
+                SslSettings.builder().enabled(true).invalidHostNameAllowed(true)
+                        .context(SSLContext.getDefault()).build().hashCode()
     }
 
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
+    @IgnoreIf({ isNotAtLeastJava7() })
     def 'unequivalent settings should not be equal or have the same hash code'() {
         expect:
-        builder().build() != builder().enabled(true).build()
-        builder().build() != builder().invalidHostNameAllowed(true).build()
+        SslSettings.builder().build() != SslSettings.builder().enabled(true).build()
+        SslSettings.builder().build() != SslSettings.builder().invalidHostNameAllowed(true).build()
+        SslSettings.builder().build() != SslSettings.builder().context(SSLContext.getDefault()).build()
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestConnection.java b/driver-core/src/test/unit/com/mongodb/connection/TestConnection.java
deleted file mode 100644
index 4a353d8d488..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/TestConnection.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteConcernResult;
-import com.mongodb.async.SingleResultCallback;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.bulk.UpdateRequest;
-import org.bson.BsonDocument;
-import org.bson.FieldNameValidator;
-import org.bson.codecs.Decoder;
-
-import java.util.List;
-
-@SuppressWarnings({"rawtypes", "unchecked", "deprecation"})
-class TestConnection implements Connection, AsyncConnection {
-    private final InternalConnection internalConnection;
-    private final ProtocolExecutor executor;
-    private Protocol enqueuedProtocol;
-
-    public TestConnection(final InternalConnection internalConnection, final ProtocolExecutor executor) {
-        this.internalConnection = internalConnection;
-        this.executor = executor;
-    }
-
-    @Override
-    public int getCount() {
-        return 1;
-    }
-
-    @Override
-    public TestConnection retain() {
-        return this;
-    }
-
-    @Override
-    public void release() {
-
-    }
-
-    @Override
-    public ConnectionDescription getDescription() {
-        throw new UnsupportedOperationException("Not implemented yet!");
-    }
-
-    @Override
-    public WriteConcernResult insert(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                     final List<InsertRequest> inserts) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void insertAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                            final List<InsertRequest> inserts, final SingleResultCallback<WriteConcernResult> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public WriteConcernResult update(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                     final List<UpdateRequest> updates) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void updateAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                            final List<UpdateRequest> updates, final SingleResultCallback<WriteConcernResult> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public WriteConcernResult delete(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                     final List<DeleteRequest> deletes) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void deleteAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                            final List<DeleteRequest> deletes,
-                            final SingleResultCallback<WriteConcernResult> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public BulkWriteResult insertCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final List<InsertRequest> inserts) {
-        throw new UnsupportedOperationException("Deprecated method called directly - this should have been updated");
-    }
-
-    @Override
-    public BulkWriteResult insertCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final Boolean bypassDocumentValidation, final List<InsertRequest> inserts) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void insertCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final List<InsertRequest> inserts, final SingleResultCallback<BulkWriteResult> callback) {
-        throw new UnsupportedOperationException("Deprecated method called directly - this should have been updated");
-    }
-
-    @Override
-    public void insertCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final Boolean bypassDocumentValidation, final List<InsertRequest> inserts,
-                                   final SingleResultCallback<BulkWriteResult> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public BulkWriteResult updateCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final List<UpdateRequest> updates) {
-        throw new UnsupportedOperationException("Deprecated method called directly - this should have been updated");
-    }
-
-    @Override
-    public BulkWriteResult updateCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final Boolean bypassDocumentValidation, final List<UpdateRequest> updates) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void updateCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final List<UpdateRequest> updates, final SingleResultCallback<BulkWriteResult> callback) {
-        throw new UnsupportedOperationException("Deprecated method called directly - this should have been updated");
-    }
-
-    @Override
-    public void updateCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final Boolean bypassDocumentValidation, final List<UpdateRequest> updates,
-                                   final SingleResultCallback<BulkWriteResult> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public BulkWriteResult deleteCommand(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                         final List<DeleteRequest> deletes) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void deleteCommandAsync(final MongoNamespace namespace, final boolean ordered, final WriteConcern writeConcern,
-                                   final List<DeleteRequest> deletes,
-                                   final SingleResultCallback<BulkWriteResult> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public <T> T command(final String database, final BsonDocument command, final boolean slaveOk,
-                         final FieldNameValidator fieldNameValidator,
-                         final Decoder<T> commandResultDecoder) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public <T> void commandAsync(final String database, final BsonDocument command, final boolean slaveOk,
-                                 final FieldNameValidator fieldNameValidator,
-                                 final Decoder<T> commandResultDecoder, final SingleResultCallback<T> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
-                                    final int numberToReturn, final int skip,
-                                    final boolean slaveOk, final boolean tailableCursor, final boolean awaitData,
-                                    final boolean noCursorTimeout,
-                                    final boolean partial, final boolean oplogReplay, final Decoder<T> resultDecoder) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
-                                    final int skip, final int limit,
-                                    final int batchSize, final boolean slaveOk, final boolean tailableCursor, final boolean awaitData,
-                                    final boolean noCursorTimeout,
-                                    final boolean partial, final boolean oplogReplay, final Decoder<T> resultDecoder) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
-                               final int numberToReturn, final int skip,
-                               final boolean slaveOk, final boolean tailableCursor, final boolean awaitData, final boolean noCursorTimeout,
-                               final boolean partial,
-                               final boolean oplogReplay, final Decoder<T> resultDecoder,
-                               final SingleResultCallback<QueryResult<T>> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields, final int skip,
-                               final int limit,
-                               final int batchSize, final boolean slaveOk, final boolean tailableCursor, final boolean awaitData,
-                               final boolean noCursorTimeout,
-                               final boolean partial, final boolean oplogReplay, final Decoder<T> resultDecoder,
-                               final SingleResultCallback<QueryResult<T>> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public <T> QueryResult<T> getMore(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
-                                      final Decoder<T> resultDecoder) {
-        return executeEnqueuedProtocol();
-    }
-
-    @Override
-    public <T> void getMoreAsync(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
-                                 final Decoder<T> resultDecoder,
-                                 final SingleResultCallback<QueryResult<T>> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public void killCursor(final List<Long> cursors) {
-        executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void killCursor(final MongoNamespace namespace, final List<Long> cursors) {
-        executeEnqueuedProtocol();
-    }
-
-    @Override
-    public void killCursorAsync(final List<Long> cursors, final SingleResultCallback<Void> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @Override
-    public void killCursorAsync(final MongoNamespace namespace, final List<Long> cursors, final SingleResultCallback<Void> callback) {
-        executeEnqueuedProtocolAsync(callback);
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> T executeEnqueuedProtocol() {
-        return (T) executor.execute(enqueuedProtocol, internalConnection);
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> void executeEnqueuedProtocolAsync(final SingleResultCallback<T> callback) {
-        executor.executeAsync(enqueuedProtocol, internalConnection, callback);
-    }
-
-    void enqueueProtocol(final Protocol protocol) {
-        enqueuedProtocol = protocol;
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnection.java b/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnection.java
deleted file mode 100644
index f1a1b4bde14..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnection.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.MongoException;
-import com.mongodb.async.SingleResultCallback;
-import org.bson.ByteBuf;
-import org.bson.ByteBufNIO;
-import org.bson.io.BsonInput;
-import org.bson.io.ByteBufferBsonInput;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.List;
-
-class TestInternalConnection implements InternalConnection {
-
-    private static class Interaction {
-        private ResponseBuffers responseBuffers;
-        private RuntimeException receiveException;
-        private RuntimeException sendException;
-    }
-
-    private final ConnectionDescription description;
-    private final BufferProvider bufferProvider;
-    private final Deque<Interaction> replies;
-    private final List<BsonInput> sent;
-    private boolean opened;
-    private boolean closed;
-
-    public TestInternalConnection(final ServerId serverId) {
-        this.description = new ConnectionDescription(serverId);
-        this.bufferProvider = new SimpleBufferProvider();
-
-        this.replies = new LinkedList<Interaction>();
-        this.sent = new LinkedList<BsonInput>();
-    }
-
-    public void enqueueReply(final ResponseBuffers responseBuffers) {
-        Interaction interaction = new Interaction();
-        interaction.responseBuffers = responseBuffers;
-        replies.add(interaction);
-    }
-
-    public void enqueueSendMessageException(final RuntimeException e) {
-        Interaction interaction = new Interaction();
-        interaction.sendException = e;
-        replies.add(interaction);
-    }
-
-    public void enqueueReceiveMessageException(final RuntimeException e) {
-        Interaction interaction = new Interaction();
-        interaction.receiveException = e;
-        replies.add(interaction);
-    }
-
-    public List<BsonInput> getSent() {
-        return sent;
-    }
-
-    @Override
-    public ConnectionDescription getDescription() {
-        return description;
-    }
-
-    public void open() {
-        opened = true;
-    }
-
-    @Override
-    public void openAsync(final SingleResultCallback<Void> callback) {
-        opened = true;
-        callback.onResult(null, null);
-    }
-
-    @Override
-    public void close() {
-        closed = true;
-    }
-
-    @Override
-    public boolean opened() {
-        return opened;
-    }
-
-    @Override
-    public boolean isClosed() {
-        return closed;
-    }
-
-    @Override
-    public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
-        // repackage all byte buffers into a single byte buffer...
-        int totalSize = 0;
-        for (ByteBuf buf : byteBuffers) {
-            totalSize += buf.remaining();
-        }
-
-        ByteBuffer combined = ByteBuffer.allocate(totalSize);
-        for (ByteBuf buf : byteBuffers) {
-            combined.put(buf.array(), 0, buf.remaining());
-        }
-
-        combined.flip();
-
-        Interaction interaction = replies.getFirst();
-        if (interaction.responseBuffers != null) {
-            ReplyHeader header = replaceResponseTo(interaction.responseBuffers.getReplyHeader(), lastRequestId);
-            interaction.responseBuffers = (new ResponseBuffers(header, interaction.responseBuffers.getBodyByteBuffer()));
-
-            sent.add(new ByteBufferBsonInput(new ByteBufNIO(combined)));
-        } else if (interaction.sendException != null) {
-            replies.removeFirst();
-            throw interaction.sendException;
-        }
-    }
-
-    private ReplyHeader replaceResponseTo(final ReplyHeader header, final int responseTo) {
-        ByteBuffer headerByteBuffer = ByteBuffer.allocate(36);
-        headerByteBuffer.order(ByteOrder.LITTLE_ENDIAN);
-        headerByteBuffer.putInt(header.getMessageLength());
-        headerByteBuffer.putInt(header.getRequestId());
-        headerByteBuffer.putInt(responseTo);
-        headerByteBuffer.putInt(1);
-        headerByteBuffer.putInt(header.getResponseFlags());
-        headerByteBuffer.putLong(header.getCursorId());
-        headerByteBuffer.putInt(header.getStartingFrom());
-        headerByteBuffer.putInt(header.getNumberReturned());
-        headerByteBuffer.flip();
-
-        ByteBufferBsonInput headerInputBuffer = new ByteBufferBsonInput(new ByteBufNIO(headerByteBuffer));
-        return new ReplyHeader(headerInputBuffer, ConnectionDescription.getDefaultMaxMessageSize());
-    }
-
-    @Override
-    public ResponseBuffers receiveMessage(final int responseTo) {
-        if (this.replies.isEmpty()) {
-            throw new MongoException("Test was not setup properly as too many calls to receiveMessage occured.");
-        }
-
-        Interaction interaction = replies.removeFirst();
-        if (interaction.responseBuffers != null) {
-            return interaction.responseBuffers;
-        } else {
-            throw interaction.receiveException;
-        }
-    }
-
-    @Override
-    public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
-        try {
-            sendMessage(byteBuffers, lastRequestId);
-            callback.onResult(null, null);
-        } catch (RuntimeException e) {
-            callback.onResult(null, e);
-        }
-    }
-
-    @Override
-    public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
-        try {
-            ResponseBuffers buffers = receiveMessage(responseTo);
-            callback.onResult(buffers, null);
-        } catch (MongoException ex) {
-            callback.onResult(null, ex);
-        }
-    }
-
-    @Override
-    public ByteBuf getBuffer(final int size) {
-        return this.bufferProvider.getBuffer(size);
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnectionFactory.java b/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnectionFactory.java
deleted file mode 100644
index 654122b1d85..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/TestInternalConnectionFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection;
-
-import com.mongodb.async.SingleResultCallback;
-import org.bson.ByteBuf;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class TestInternalConnectionFactory implements InternalConnectionFactory {
-    private final List<TestInternalConnection> createdConnections = new ArrayList<TestInternalConnection>();
-
-    @Override
-    public InternalConnection create(final ServerId serverId) {
-        TestInternalConnection connection = new TestInternalConnection(serverId);
-        createdConnections.add(connection);
-        return connection;
-    }
-
-    List<TestInternalConnection> getCreatedConnections() {
-        return createdConnections;
-    }
-
-    int getNumCreatedConnections() {
-        return createdConnections.size();
-    }
-
-    public static class TestInternalConnection implements InternalConnection {
-        private final ServerId serverId;
-        private boolean closed;
-        private boolean opened;
-
-        public TestInternalConnection(final ServerId serverId) {
-            this.serverId = serverId;
-        }
-
-        public void open() {
-            opened = true;
-        }
-
-        @Override
-        public void openAsync(final SingleResultCallback<Void> callback) {
-            opened = true;
-            callback.onResult(null, null);
-        }
-
-        @Override
-        public void close() {
-            closed = true;
-        }
-
-        @Override
-        public boolean opened() {
-            return opened;
-        }
-
-        @Override
-        public boolean isClosed() {
-            return closed;
-        }
-
-        @Override
-        public ByteBuf getBuffer(final int size) {
-            return null;
-        }
-
-        @Override
-        public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
-        }
-
-        @Override
-        public ResponseBuffers receiveMessage(final int responseTo) {
-            return null;
-        }
-
-        @Override
-        public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
-            callback.onResult(null, null);
-        }
-
-        @Override
-        public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
-            callback.onResult(null, null);
-        }
-
-        @Override
-        public ConnectionDescription getDescription() {
-            return new ConnectionDescription(serverId);
-        }
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestServerMonitorFactory.java b/driver-core/src/test/unit/com/mongodb/connection/TestServerMonitorFactory.java
deleted file mode 100644
index 7ca787d317a..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/TestServerMonitorFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package com.mongodb.connection;
-
-class TestServerMonitorFactory implements ServerMonitorFactory {
-
-    private final TestServerMonitor monitor;
-
-    public TestServerMonitorFactory(final ServerId serverId) {
-        this.monitor = new TestServerMonitor(serverId);
-    }
-
-    @Override
-    public TestServerMonitor create(final ChangeListener<ServerDescription> serverStateListener) {
-        monitor.setServerStateListener(serverStateListener);
-        return monitor;
-    }
-
-    public void sendNotification(final ServerDescription serverDescription) {
-        monitor.sendNotification(serverDescription);
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/UsageTrackingConnectionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/UsageTrackingConnectionSpecification.groovy
deleted file mode 100644
index 4f7778902cd..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/UsageTrackingConnectionSpecification.groovy
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import category.Async
-import com.mongodb.ServerAddress
-import com.mongodb.async.FutureResultCallback
-import org.junit.experimental.categories.Category
-import spock.lang.IgnoreIf
-import spock.lang.Specification
-
-import static java.util.concurrent.TimeUnit.SECONDS
-
-class UsageTrackingConnectionSpecification extends Specification {
-    private static final ServerId SERVER_ID = new ServerId(new ClusterId(), new ServerAddress())
-
-    def 'generation is initialized'() {
-        when:
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 1);
-
-        then:
-        connection.generation == 1
-    }
-
-    def 'openAt should be set on open'() {
-        when:
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-
-        then:
-        connection.openedAt == Long.MAX_VALUE
-
-        when:
-        connection.open()
-
-        then:
-        connection.openedAt <= System.currentTimeMillis()
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'openAt should be set on open asynchronously'() {
-        when:
-        def futureResultCallback = new FutureResultCallback<Void>()
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-
-        then:
-        connection.openedAt == Long.MAX_VALUE
-
-        when:
-        connection.openAsync(futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        connection.openedAt <= System.currentTimeMillis()
-    }
-
-    def 'lastUsedAt should be set on open'() {
-        when:
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-
-        then:
-        connection.lastUsedAt == Long.MAX_VALUE
-
-        when:
-        connection.open()
-
-        then:
-        connection.lastUsedAt <= System.currentTimeMillis()
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'lastUsedAt should be set on open asynchronously'() {
-        when:
-        def futureResultCallback = new FutureResultCallback<Void>()
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-
-        then:
-        connection.lastUsedAt == Long.MAX_VALUE
-
-        when:
-        connection.openAsync(futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        connection.lastUsedAt <= System.currentTimeMillis()
-    }
-
-    def 'lastUsedAt should be set on sendMessage'() {
-        given:
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-        connection.open()
-        def openedLastUsedAt = connection.lastUsedAt
-
-        when:
-        connection.sendMessage(Arrays.asList(), 1)
-
-        then:
-        connection.lastUsedAt >= openedLastUsedAt
-        connection.lastUsedAt <= System.currentTimeMillis()
-    }
-
-    @Category(Async)
-    @IgnoreIf({ javaVersion < 1.7 })
-    def 'lastUsedAt should be set on sendMessage asynchronously'() {
-        given:
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-        connection.open()
-        def openedLastUsedAt = connection.lastUsedAt
-        def futureResultCallback = new FutureResultCallback<Void>()
-
-        when:
-        connection.sendMessageAsync(Arrays.asList(), 1, futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        connection.lastUsedAt >= openedLastUsedAt
-        connection.lastUsedAt <= System.currentTimeMillis()
-    }
-
-    def 'lastUsedAt should be set on receiveMessage'() {
-        given:
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-        connection.open()
-        def openedLastUsedAt = connection.lastUsedAt
-        when:
-        connection.receiveMessage(1)
-
-        then:
-        connection.lastUsedAt >= openedLastUsedAt
-        connection.lastUsedAt <= System.currentTimeMillis()
-    }
-
-    def 'lastUsedAt should be set on receiveMessage asynchronously'() {
-        given:
-        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
-        connection.open()
-        def openedLastUsedAt = connection.lastUsedAt
-        def futureResultCallback = new FutureResultCallback<Void>()
-
-        when:
-        connection.receiveMessageAsync(1, futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
-
-        then:
-        connection.lastUsedAt >= openedLastUsedAt
-        connection.lastUsedAt <= System.currentTimeMillis()
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/WriteCommandHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/WriteCommandHelperSpecification.groovy
deleted file mode 100644
index 89c01dd6200..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/WriteCommandHelperSpecification.groovy
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoInternalException
-import com.mongodb.ServerAddress
-import com.mongodb.bulk.BulkWriteError
-import com.mongodb.bulk.BulkWriteResult
-import com.mongodb.bulk.BulkWriteUpsert
-import com.mongodb.bulk.WriteConcernError
-import org.bson.BsonArray
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonString
-import spock.lang.Specification
-
-import static com.mongodb.bulk.WriteRequest.Type.DELETE
-import static com.mongodb.bulk.WriteRequest.Type.INSERT
-import static com.mongodb.bulk.WriteRequest.Type.REPLACE
-import static com.mongodb.bulk.WriteRequest.Type.UPDATE
-import static com.mongodb.connection.WriteCommandResultHelper.getBulkWriteException
-import static com.mongodb.connection.WriteCommandResultHelper.getBulkWriteResult
-import static com.mongodb.connection.WriteCommandResultHelper.hasError
-
-class WriteCommandHelperSpecification extends Specification {
-
-    def 'should get bulk write result from with a count matching the n field'() {
-        expect:
-        getBulkWriteResult(INSERT, new BsonDocument('n', new BsonInt32(1))) == BulkWriteResult.acknowledged(INSERT, 1, [])
-    }
-
-
-    def 'should get bulk write result with upserts matching the upserted field'() {
-        expect:
-        [new BulkWriteUpsert(0, new BsonString('id1')), new BulkWriteUpsert(2, new BsonString('id2'))] ==
-        getBulkWriteResult(UPDATE, new BsonDocument('n', new BsonInt32(1))
-                .append('upserted', new BsonArray([new BsonDocument('index', new BsonInt32(0))
-                                                           .
-                                                           append('_id', new BsonString('id1')),
-                                                   new BsonDocument('index', new BsonInt32(2))
-                                                           .append('_id',
-                                                                   new BsonString('id2'))])))
-                .getUpserts()
-    }
-
-
-    def 'should not have modified count for update with no nModified field in the result'() {
-        expect:
-        !getBulkWriteResult(UPDATE, new BsonDocument('n', new BsonInt32(1))).isModifiedCountAvailable()
-    }
-
-    def 'should not have modified count for replace with no nModified field in the result'() {
-        expect:
-        !getBulkWriteResult(REPLACE, new BsonDocument('n', new BsonInt32(1))).isModifiedCountAvailable()
-    }
-
-    def 'should have modified count of 0 for insert with no nModified field in the result'() {
-        expect:
-        0 == getBulkWriteResult(INSERT, new BsonDocument('n', new BsonInt32(1))).getModifiedCount()
-    }
-
-    def 'should have modified count of 0 for remove with no nModified field in the result'() {
-        expect:
-        0 == getBulkWriteResult(DELETE, new BsonDocument('n', new BsonInt32(1))).getModifiedCount()
-    }
-
-    def 'should not have error if writeErrors is empty and writeConcernError is missing'() {
-        expect:
-        !hasError(new BsonDocument());
-    }
-
-    def 'should have error if writeErrors is not empty'() {
-        expect:
-        hasError(new BsonDocument('writeErrors',
-                                  new BsonArray([new BsonDocument('index', new BsonInt32(3))
-                                                         .append('code', new BsonInt32(100))
-                                                         .append('errmsg', new BsonString('some error'))])));
-    }
-
-    def 'should have error if writeConcernError is present'() {
-        expect:
-        hasError(new BsonDocument('writeConcernError',
-                                  new BsonDocument('code', new BsonInt32(75))
-                                          .append('errmsg', new BsonString('wtimeout'))
-                                          .append('errInfo', new BsonDocument('wtimeout', new BsonString('0')))))
-    }
-
-    def 'getting bulk write exception should throw if there are no errors'() {
-        when:
-        getBulkWriteException(INSERT, new BsonDocument(), new ServerAddress())
-
-        then:
-        thrown(MongoInternalException)
-    }
-
-    def 'should get write errors from the writeErrors field'() {
-        expect:
-        [new BulkWriteError(100, 'some error', new BsonDocument(), 3),
-         new BulkWriteError(11000, 'duplicate key', new BsonDocument('_id', new BsonString('id1')), 5)] ==
-        getBulkWriteException(INSERT, new BsonDocument('ok', new BsonInt32(0))
-                .append('n', new BsonInt32(1))
-                .append('code', new BsonInt32(65))
-                .append('errmsg', new BsonString('bulk op errors'))
-                .append('writeErrors', new BsonArray(
-                [new BsonDocument('index', new BsonInt32(3))
-                         .append('code', new BsonInt32(100))
-                         .append('errmsg', new BsonString('some error')),
-                 new BsonDocument('index', new BsonInt32(5))
-                         .append('code', new BsonInt32(11000))
-                         .append('errmsg', new BsonString('duplicate key'))
-                         .append('errInfo',
-                                 new BsonDocument('_id',
-                                                  new BsonString('id1')))])),
-                              new ServerAddress())
-                .writeErrors
-
-    }
-
-    def 'should get write concern error from writeConcernError field'() {
-        expect:
-        new WriteConcernError(75, 'wtimeout', new BsonDocument('wtimeout', new BsonString('0'))) ==
-        getBulkWriteException(INSERT, new BsonDocument('n', new BsonInt32(1))
-                .append('writeConcernError',
-                        new BsonDocument('code', new BsonInt32(75))
-                                .append('errmsg', new BsonString('wtimeout'))
-                                .append('errInfo', new BsonDocument('wtimeout',
-                                                                    new BsonString('0')))),
-                              new ServerAddress())
-                .writeConcernError
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/WriteCommandLimitsSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/WriteCommandLimitsSpecification.groovy
deleted file mode 100644
index 76a39b762d2..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/WriteCommandLimitsSpecification.groovy
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package com.mongodb.connection
-
-import com.mongodb.MongoNamespace
-import com.mongodb.WriteConcern
-import com.mongodb.bulk.DeleteRequest
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.bulk.UpdateRequest
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import spock.lang.Specification
-
-import static com.mongodb.bulk.WriteRequest.Type.REPLACE
-
-class WriteCommandLimitsSpecification extends Specification {
-    def 'should split an insert command when the number of items exceeds the maximum'() {
-        given:
-        def inserts = []
-        (1..4).each {
-            inserts.add(new InsertRequest(new BsonDocument()))
-        }
-
-        def buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-        def message = new InsertCommandMessage(new MongoNamespace('test', 'test'), true, WriteConcern.ACKNOWLEDGED, null,
-                                               MessageSettings.builder().maxBatchCount(3).build(), inserts);
-
-        when:
-        def nextMessage = message.encode(buffer)
-
-        then:
-        nextMessage != null
-        nextMessage.requests == inserts.subList(3, 4)
-    }
-
-    def 'should split an insert command when the number of bytes exceeds the maximum'() {
-        given:
-        def inserts = []
-        (1..4).each {
-            inserts.add(new InsertRequest(new BsonDocument('_id', new BsonInt32(it))))
-        }
-
-        def buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-        def message = new InsertCommandMessage(new MongoNamespace('test', 'test'), true, WriteConcern.ACKNOWLEDGED, null,
-                                               MessageSettings.builder().maxDocumentSize(113).build(), inserts);
-
-        when:
-        def nextMessage = message.encode(buffer)
-
-        then:
-        nextMessage != null
-        nextMessage.requests == inserts.subList(3, 4)
-    }
-
-    def 'should split a delete command when the number of items exceeds the maximum'() {
-        given:
-        def deletes = []
-        (1..4).each {
-            deletes.add(new DeleteRequest(new BsonDocument()))
-        }
-
-        def buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-        def message = new DeleteCommandMessage(new MongoNamespace('test', 'test'), true, WriteConcern.ACKNOWLEDGED,
-                                               MessageSettings.builder().maxBatchCount(3).build(), deletes);
-
-        when:
-        def nextMessage = message.encode(buffer)
-
-        then:
-        nextMessage != null
-        nextMessage.requests == deletes.subList(3, 4)
-    }
-
-    def 'should split a delete command when the number of bytes exceeds the maximum'() {
-        given:
-        def deletes = []
-        (1..4).each {
-            deletes.add(new DeleteRequest(new BsonDocument('_id', new BsonInt32(it))))
-        }
-
-        def buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-        def message = new DeleteCommandMessage(new MongoNamespace('test', 'test'), true, WriteConcern.ACKNOWLEDGED,
-                                               MessageSettings.builder().maxDocumentSize(187).build(), deletes);
-
-        when:
-        def nextMessage = message.encode(buffer)
-
-        then:
-        nextMessage != null
-        nextMessage.requests == deletes.subList(3, 4)
-    }
-
-    def 'should split an update command when the number of items exceeds the maximum'() {
-        given:
-        def replaces = []
-        (1..4).each {
-            replaces.add(new UpdateRequest(new BsonDocument('_id', new BsonInt32(it)), new BsonDocument(), REPLACE))
-        }
-
-        def buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-        def message = new UpdateCommandMessage(new MongoNamespace('test', 'test'), true, WriteConcern.ACKNOWLEDGED, null,
-                                               MessageSettings.builder().maxBatchCount(3).build(), replaces);
-
-        when:
-        def nextMessage = message.encode(buffer)
-
-        then:
-        nextMessage != null
-        nextMessage.requests == replaces.subList(3, 4)
-    }
-
-    def 'should split a replace command when the number of bytes exceeds the maximum'() {
-        given:
-        def replaces = []
-        (1..4).each {
-            replaces.add(new UpdateRequest(new BsonDocument('_id', new BsonInt32(it)), new BsonDocument(), REPLACE))
-        }
-
-        def buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
-        def message = new UpdateCommandMessage(new MongoNamespace('test', 'test'), true, WriteConcern.ACKNOWLEDGED, null,
-                                               MessageSettings.builder().maxDocumentSize(175).build(), replaces);
-
-        when:
-        def nextMessage = message.encode(buffer)
-
-        then:
-        nextMessage != null
-        nextMessage.requests == replaces.subList(3, 4)
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/WriteResultProtocolHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/WriteResultProtocolHelperSpecification.groovy
deleted file mode 100644
index bee1a80934c..00000000000
--- a/driver-core/src/test/unit/com/mongodb/connection/WriteResultProtocolHelperSpecification.groovy
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.connection
-
-import com.mongodb.MongoCommandException
-import com.mongodb.DuplicateKeyException
-import com.mongodb.ServerAddress
-import com.mongodb.WriteConcernResult
-import org.bson.BsonArray
-import org.bson.BsonBoolean
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonObjectId
-import org.bson.BsonString
-import org.bson.types.ObjectId
-import spock.lang.Specification
-
-import static java.util.Arrays.asList
-
-class WriteResultProtocolHelperSpecification extends Specification {
-
-    def 'should return a write result for an insert'() {
-        given:
-        def result = new BsonDocument('ok', new BsonInt32(1)).append('n', new BsonInt32(0))
-        when:
-        def writeResult = ProtocolHelper.getWriteResult(result, new ServerAddress())
-
-        then:
-        writeResult == WriteConcernResult.acknowledged(0, false, null)
-
-    }
-
-    def 'should return a write result for an upsert'() {
-        given:
-        def id = new ObjectId()
-        def result = new BsonDocument('ok', new BsonInt32(1)).append('n', new BsonInt32(1))
-                                                             .append('updatedExisting', BsonBoolean.FALSE)
-                                                             .append('upserted', new BsonObjectId(id))
-        when:
-        def writeResult = ProtocolHelper.getWriteResult(result, new ServerAddress())
-
-        then:
-        writeResult == WriteConcernResult.acknowledged(1, false, new BsonObjectId(id))
-
-    }
-
-    def 'should throw command failure if result is not ok'() {
-        given:
-        def result = new BsonDocument('ok', new BsonInt32(0)).append('errmsg', new BsonString('Something is very wrong'))
-                                                             .append('code', new BsonInt32(14))
-        when:
-        ProtocolHelper.getWriteResult(result, new ServerAddress())
-
-        then:
-        def e = thrown(MongoCommandException)
-        e.getCode() == 14
-    }
-
-    def 'should throw duplicate key when response has a duplicate key error code'() {
-        given:
-        def result = new BsonDocument('ok', new BsonInt32(1)).append('err', new BsonString('E11000 duplicate key error index 1'))
-                                                             .append('code', new BsonInt32(11000))
-
-        when:
-        ProtocolHelper.getWriteResult(result, new ServerAddress())
-
-        then:
-        def e = thrown(DuplicateKeyException)
-        e.getCode() == 11000
-    }
-
-    def 'should throw duplicate key when errObjects has a duplicate key error code'() {
-        given:
-        def result = new BsonDocument('ok', new BsonInt32(1))
-                .append('err', new BsonString('E11000 duplicate key error index 1'))
-                .append('errObjects',
-                        new BsonArray(asList(new BsonDocument('ok', new BsonInt32(1))
-                                                     .append('err', new BsonString('E11000 duplicate key error ' +
-                                                                                   'index 1'))
-                                                     .append('code', new BsonInt32(11000)),
-                                             new BsonDocument('ok', new BsonInt32(1))
-                                                     .append('err', new BsonString('E11000 duplicate key error ' +
-                                                                                   'index 2'))
-                                                     .append('code', new BsonInt32(11000)))))
-
-        when:
-        ProtocolHelper.getWriteResult(result, new ServerAddress())
-
-        then:
-        def e = thrown(DuplicateKeyException)
-        e.getCode() == 11000
-    }
-
-
-    def 'should support duplicate key errors from sharded servers in extractErrorCode'() {
-        given:
-        def result = new BsonDocument('ok', new BsonInt32(1))
-                .append('err', new BsonString('error inserting 1 documents to shard shard0001:localhost:27021 at version '
-                                                      + '2|1||542e97e306f81b0cb5d8d78e :: caused by :: E11000 duplicate key error index: '
-                                                      + 'test.t.$_id_  dup key: { : 2 }'))
-                .append('code', new BsonInt32(16460))
-                .append('n', new BsonInt32(0))
-
-        when:
-        ProtocolHelper.getWriteResult(result, new ServerAddress())
-
-        then:
-        def e = thrown(DuplicateKeyException)
-        e.getCode() == 11000
-    }
-}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/netty/ByteBufSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/netty/ByteBufSpecification.groovy
index 4956e15361f..35026ba5724 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/netty/ByteBufSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/netty/ByteBufSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
diff --git a/driver-core/src/test/unit/com/mongodb/connection/netty/NettyStreamFactoryFactorySpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/netty/NettyStreamFactoryFactorySpecification.groovy
index b42e2fa6ad5..2cc3123e4d3 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/netty/NettyStreamFactoryFactorySpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/connection/netty/NettyStreamFactoryFactorySpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-core/src/test/unit/com/mongodb/connection/netty/NettyStreamFactorySpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/netty/NettyStreamFactorySpecification.groovy
new file mode 100644
index 00000000000..bb8b2aea7bb
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/connection/netty/NettyStreamFactorySpecification.groovy
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.connection.netty
+
+import com.mongodb.ClusterFixture
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SslSettings
+import io.netty.buffer.PooledByteBufAllocator
+import io.netty.buffer.UnpooledByteBufAllocator
+import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.oio.OioEventLoopGroup
+import io.netty.channel.socket.nio.NioSocketChannel
+import io.netty.channel.socket.oio.OioSocketChannel
+import spock.lang.Specification
+
+class NettyStreamFactorySpecification extends Specification {
+
+    private static final SOCKET_SETTINGS = SocketSettings.builder().keepAlive(true).build()
+    private static final SSL_SETTINGS = SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build()
+    private static final EVENT_LOOP_GROUP = new OioEventLoopGroup()
+    private static final SOCKET_CHANNEL_CLASS = OioSocketChannel
+    private static final ALLOCATOR = UnpooledByteBufAllocator.DEFAULT
+
+    def cleanupSpec() {
+        EVENT_LOOP_GROUP.shutdownGracefully().awaitUninterruptibly()
+    }
+
+    def 'should use arguments to create NettyStream'() {
+        when:
+        NettyStream stream = factory.create(ClusterFixture.getPrimary()) as NettyStream
+
+        then:
+        stream.address == ClusterFixture.getPrimary()
+        stream.settings == SOCKET_SETTINGS
+        stream.sslSettings == SSL_SETTINGS
+        stream.socketChannelClass == socketChannelClass
+        stream.getWorkerGroup().class == eventLoopGroupClass
+        stream.allocator == allocator
+
+        cleanup:
+        stream?.close()
+        if (stream.getWorkerGroup().class != eventLoopGroupClass) {
+            stream.getWorkerGroup().shutdownGracefully().awaitUninterruptibly()
+        }
+
+        where:
+        eventLoopGroupClass  | socketChannelClass   | allocator                      | factory
+        NioEventLoopGroup    | NioSocketChannel     | PooledByteBufAllocator.DEFAULT | new NettyStreamFactory(SOCKET_SETTINGS, SSL_SETTINGS)
+        OioEventLoopGroup    | NioSocketChannel     | PooledByteBufAllocator.DEFAULT | new NettyStreamFactory(SOCKET_SETTINGS, SSL_SETTINGS,
+                EVENT_LOOP_GROUP)
+        OioEventLoopGroup    | NioSocketChannel     | ALLOCATOR                      | new NettyStreamFactory(SOCKET_SETTINGS, SSL_SETTINGS,
+                EVENT_LOOP_GROUP, ALLOCATOR)
+        OioEventLoopGroup    | SOCKET_CHANNEL_CLASS | ALLOCATOR                      | new NettyStreamFactory(SOCKET_SETTINGS, SSL_SETTINGS,
+                EVENT_LOOP_GROUP, SOCKET_CHANNEL_CLASS, ALLOCATOR)
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/event/CommandEventMulticasterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/event/CommandEventMulticasterSpecification.groovy
index fa80df529be..a929c9cb87c 100644
--- a/driver-core/src/test/unit/com/mongodb/event/CommandEventMulticasterSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/event/CommandEventMulticasterSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ class CommandEventMulticasterSpecification extends Specification {
 
         expect:
         multicaster.commandListeners == [first, second]
-
     }
 
     def 'should multicast command started event'() {
diff --git a/driver-core/src/test/unit/com/mongodb/event/CommandEventSpecification.groovy b/driver-core/src/test/unit/com/mongodb/event/CommandEventSpecification.groovy
new file mode 100644
index 00000000000..eb9dd19ce4b
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/event/CommandEventSpecification.groovy
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.event
+
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ServerId
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import spock.lang.Specification
+
+class CommandEventSpecification extends Specification {
+    def 'should fail if elapsed time is negative'() {
+        when:
+        new CommandSucceededEvent(1, new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress())), 'ping',
+                new BsonDocument('ok', new BsonInt32(1)), -1)
+
+        then:
+        def e = thrown(IllegalArgumentException)
+        e.getMessage() == 'state should be: elapsed time is not negative'
+
+        when:
+        new CommandFailedEvent(1, new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress())), 'ping', -1,
+                new Throwable())
+
+        then:
+        e = thrown(IllegalArgumentException)
+        e.getMessage() == 'state should be: elapsed time is not negative'
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/event/CommandListenerMulticasterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/event/CommandListenerMulticasterSpecification.groovy
index 96d9f80f183..f3b98c0ab89 100644
--- a/driver-core/src/test/unit/com/mongodb/event/CommandListenerMulticasterSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/event/CommandListenerMulticasterSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@ class CommandListenerMulticasterSpecification extends Specification {
 
         expect:
         multicaster.commandListeners == [first, second]
-
     }
 
     def 'should multicast command started event'() {
diff --git a/driver-core/src/test/unit/com/mongodb/event/ServerHeartbeatEventSpecification.groovy b/driver-core/src/test/unit/com/mongodb/event/ServerHeartbeatEventSpecification.groovy
new file mode 100644
index 00000000000..8ea7145b0e2
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/event/ServerHeartbeatEventSpecification.groovy
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.event
+
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import spock.lang.Specification
+
+class ServerHeartbeatEventSpecification extends Specification {
+    def 'should fail if elapsed time is negative'() {
+        when:
+        new ServerHeartbeatSucceededEvent(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new BsonDocument('ok', new BsonInt32(1)), -1)
+
+        then:
+        def e = thrown(IllegalArgumentException)
+        e.getMessage() == 'state should be: elapsed time is not negative'
+
+        when:
+        new ServerHeartbeatFailedEvent(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())), -1, new Throwable())
+
+        then:
+        e = thrown(IllegalArgumentException)
+        e.getMessage() == 'state should be: elapsed time is not negative'
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/SslHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/SslHelperSpecification.groovy
index 2d49beb2051..815d6c2b9c8 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/SslHelperSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/SslHelperSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,40 @@
 
 package com.mongodb.internal
 
+import com.mongodb.ServerAddress
 import com.mongodb.internal.connection.SslHelper
 import spock.lang.IgnoreIf
 import spock.lang.Specification
 
+import javax.net.ssl.SNIHostName
 import javax.net.ssl.SSLParameters
 
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8
 
-@IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
+@IgnoreIf({ isNotAtLeastJava7() })
 class SslHelperSpecification extends Specification {
     def 'should enable HTTPS host name verification'() {
+        given:
+        def sslParameters = new SSLParameters()
+
+        when:
+        SslHelper.enableHostNameVerification(sslParameters)
+
+        then:
+        sslParameters.getEndpointIdentificationAlgorithm() == 'HTTPS'
+    }
+
+    @IgnoreIf({ isNotAtLeastJava8() })
+    def 'should enable server name indicator'() {
+        given:
+        def serverName = 'server.me'
+        def sslParameters = new SSLParameters()
+
         when:
-        def sllParameters = SslHelper.enableHostNameVerification(new SSLParameters())
+        SslHelper.enableSni(new ServerAddress(serverName).getHost(), sslParameters)
 
         then:
-        sllParameters.getEndpointIdentificationAlgorithm() == 'HTTPS'
+        sslParameters.getServerNames() == [new SNIHostName(serverName)]
     }
-}
\ No newline at end of file
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/authentication/SaslPrepTest.java b/driver-core/src/test/unit/com/mongodb/internal/authentication/SaslPrepTest.java
new file mode 100644
index 00000000000..0f48f05d7ef
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/authentication/SaslPrepTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.authentication;
+
+import org.junit.Test;
+
+import static com.mongodb.internal.authentication.SaslPrep.saslPrepQuery;
+import static com.mongodb.internal.authentication.SaslPrep.saslPrepStored;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class SaslPrepTest {
+
+    @Test
+    public void rfc4013Examples() {
+        // Taken from https://tools.ietf.org/html/rfc4013#section-3
+        assertEquals("IX", saslPrepStored("I\u00ADX"));
+        assertEquals("user", saslPrepStored("user"));
+        assertEquals("user=", saslPrepStored("user="));
+        assertEquals("USER", saslPrepStored("USER"));
+        assertEquals("a", saslPrepStored("\u00AA"));
+        assertEquals("IX", saslPrepStored("\u2168"));
+        try {
+            saslPrepStored("\u0007");
+            fail("Should throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertEquals("Prohibited character at position 0", e.getMessage());
+        }
+        try {
+            saslPrepStored("\u0627\u0031");
+            fail("Should thow IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertEquals("First character is RandALCat, but last character is not", e.getMessage());
+        }
+    }
+
+    @Test
+    public void mappedToSpace() {
+        assertEquals("A B", saslPrepStored("A\u00A0B"));
+    }
+
+    @Test
+    public void bidi2() {
+        // RandALCat character first *and* last is OK
+        assertEquals("\u0627\u0031\u0627", saslPrepStored("\u0627\u0031\u0627"));
+        // Both RandALCat character and LCat is not allowed
+        try {
+            saslPrepStored("\u0627\u0041\u0627");
+            fail("Should thow IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertEquals("Contains both RandALCat characters and LCat characters", e.getMessage());
+        }
+    }
+
+    @Test
+    public void unassigned() {
+        int unassignedCodepoint;
+        for (unassignedCodepoint = Character.MAX_CODE_POINT;
+             unassignedCodepoint >= Character.MIN_CODE_POINT;
+             unassignedCodepoint--) {
+            if (!Character.isDefined(unassignedCodepoint)
+                    && !SaslPrep.prohibited(unassignedCodepoint)) {
+                break;
+            }
+        }
+        String withUnassignedChar = "abc" + new String(Character.toChars(unassignedCodepoint));
+        assertEquals(withUnassignedChar, saslPrepQuery(withUnassignedChar));
+        try {
+            saslPrepStored(withUnassignedChar);
+        } catch (IllegalArgumentException e) {
+            assertEquals("Character at position 3 is unassigned", e.getMessage());
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/AbstractServerDiscoveryAndMonitoringTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/AbstractServerDiscoveryAndMonitoringTest.java
similarity index 84%
rename from driver-core/src/test/unit/com/mongodb/connection/AbstractServerDiscoveryAndMonitoringTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/AbstractServerDiscoveryAndMonitoringTest.java
index 3d757391cc1..4ec32732bfb 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/AbstractServerDiscoveryAndMonitoringTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/AbstractServerDiscoveryAndMonitoringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,18 +7,23 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ConnectionString;
 import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerType;
 import com.mongodb.event.ClusterListener;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
@@ -34,9 +39,9 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.connection.DescriptionHelper.createServerDescription;
-import static com.mongodb.connection.DescriptionHelper.getVersion;
 import static com.mongodb.connection.ServerConnectionState.CONNECTING;
+import static com.mongodb.internal.connection.DescriptionHelper.createServerDescription;
+import static com.mongodb.internal.connection.DescriptionHelper.getVersion;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 
@@ -130,17 +135,19 @@ protected void init(final ServerListenerFactory serverListenerFactory, final Clu
                                            .hosts(getHosts(connectionString))
                                            .mode(mode)
                                            .requiredReplicaSetName(connectionString.getRequiredReplicaSetName())
-                                           .addClusterListener(clusterListener)
                                            .build();
 
         ClusterId clusterId = new ClusterId();
 
         factory = new DefaultTestClusterableServerFactory(clusterId, mode, serverListenerFactory);
 
+        ClusterSettings clusterSettings = settings.getClusterListeners().contains(clusterListener) ? settings
+                : ClusterSettings.builder(settings).addClusterListener(clusterListener).build();
+
         if (settings.getMode() == ClusterConnectionMode.SINGLE) {
-            cluster = new SingleServerCluster(clusterId, settings, factory);
+            cluster = new SingleServerCluster(clusterId, clusterSettings, factory);
         } else {
-            cluster = new MultiServerCluster(clusterId, settings, factory);
+            cluster = new MultiServerCluster(clusterId, clusterSettings, factory);
         }
     }
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/BaseClusterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/BaseClusterSpecification.groovy
new file mode 100644
index 00000000000..9216d2ccbbe
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/BaseClusterSpecification.groovy
@@ -0,0 +1,405 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import category.Slow
+import com.mongodb.ClusterFixture
+import com.mongodb.MongoClientException
+import com.mongodb.MongoException
+import com.mongodb.MongoInternalException
+import com.mongodb.MongoInterruptedException
+import com.mongodb.MongoTimeoutException
+import com.mongodb.MongoWaitQueueFullException
+import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterDescription
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ClusterType
+import com.mongodb.connection.Server
+import com.mongodb.connection.ServerConnectionState
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerType
+import com.mongodb.selector.ReadPreferenceServerSelector
+import com.mongodb.selector.ServerAddressSelector
+import com.mongodb.selector.WritableServerSelector
+import org.junit.experimental.categories.Category
+import spock.lang.Specification
+
+import java.util.concurrent.CountDownLatch
+
+import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
+import static com.mongodb.connection.ClusterSettings.builder
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
+import static com.mongodb.connection.ServerType.REPLICA_SET_SECONDARY
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class BaseClusterSpecification extends Specification {
+
+    private final ServerAddress firstServer = new ServerAddress('localhost:27017')
+    private final ServerAddress secondServer = new ServerAddress('localhost:27018')
+    private final ServerAddress thirdServer = new ServerAddress('localhost:27019')
+    private final List<ServerAddress> allServers = [firstServer, secondServer, thirdServer]
+    private final TestClusterableServerFactory factory = new TestClusterableServerFactory()
+
+    def 'should have current description immediately after construction'() {
+        given:
+        def clusterSettings = builder().mode(MULTIPLE)
+                .hosts([firstServer, secondServer, thirdServer])
+                .serverSelectionTimeout(1, MILLISECONDS)
+                .serverSelector(new ServerAddressSelector(firstServer))
+                .build()
+        def cluster = new BaseCluster(new ClusterId(), clusterSettings, factory) {
+            @Override
+            protected void connect() {
+            }
+
+            @Override
+            protected ClusterableServer getServer(final ServerAddress serverAddress) {
+                throw new UnsupportedOperationException()
+            }
+        }
+
+        expect: 'the description is initialized after construction'
+        cluster.getCurrentDescription() == new ClusterDescription(clusterSettings.getMode(), ClusterType.UNKNOWN, [], clusterSettings,
+                factory.getSettings())
+
+        when: 'the description is accessed before initialization'
+        cluster.getDescription()
+
+        then: 'a MongoTimeoutException is thrown'
+        thrown(MongoTimeoutException)
+
+        when: 'a server is selected before initialization'
+        cluster.selectServer { def clusterDescription -> [] }
+
+        then: 'a MongoTimeoutException is thrown'
+        thrown(MongoTimeoutException)
+    }
+
+    def 'should get cluster settings'() {
+        given:
+        def clusterSettings = builder().mode(MULTIPLE)
+                .hosts([firstServer, secondServer, thirdServer])
+                .serverSelectionTimeout(1, SECONDS)
+                .serverSelector(new ServerAddressSelector(firstServer))
+                .build()
+        def cluster = new MultiServerCluster(new ClusterId(), clusterSettings, factory)
+
+        expect:
+        cluster.getSettings() == clusterSettings
+    }
+
+    def 'should compose server selector passed to selectServer with server selector in cluster settings'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .serverSelectionTimeout(1, SECONDS)
+                        .serverSelector(new ServerAddressSelector(firstServer))
+                        .build(),
+                factory)
+        factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, allServers)
+        factory.sendNotification(secondServer, REPLICA_SET_SECONDARY, allServers)
+        factory.sendNotification(thirdServer, REPLICA_SET_PRIMARY, allServers)
+
+        expect:
+        cluster.selectServer(new ReadPreferenceServerSelector(ReadPreference.secondary())).description.address == firstServer
+    }
+
+    def 'should use server selector passed to selectServer if server selector in cluster settings is null'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .serverSelectionTimeout(1, SECONDS)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .build(),
+                factory)
+        factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, allServers)
+        factory.sendNotification(secondServer, REPLICA_SET_SECONDARY, allServers)
+        factory.sendNotification(thirdServer, REPLICA_SET_PRIMARY, allServers)
+
+        expect:
+        cluster.selectServer(new ServerAddressSelector(firstServer)).description.address == firstServer
+    }
+
+    def 'should timeout with useful message'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer])
+                        .serverSelectionTimeout(serverSelectionTimeoutMS, MILLISECONDS)
+                        .build(),
+                factory)
+
+        when:
+        factory.sendNotification(firstServer, ServerDescription.builder().type(ServerType.UNKNOWN)
+                                                               .state(ServerConnectionState.CONNECTING)
+                                                               .address(firstServer)
+                                                               .exception(new MongoInternalException('oops'))
+                                                               .build())
+
+        cluster.getDescription()
+
+        then:
+        def e = thrown(MongoTimeoutException)
+        e.getMessage().startsWith("Timed out after ${serverSelectionTimeoutMS} ms while waiting to connect. " +
+                'Client view of cluster state is {type=UNKNOWN')
+        e.getMessage().contains('{address=localhost:27017, type=UNKNOWN, state=CONNECTING, ' +
+                'exception={com.mongodb.MongoInternalException: oops}}');
+        e.getMessage().contains('{address=localhost:27018, type=UNKNOWN, state=CONNECTING}');
+
+        when:
+        cluster.selectServer(new WritableServerSelector())
+
+        then:
+        e = thrown(MongoTimeoutException)
+        e.getMessage().startsWith("Timed out after ${serverSelectionTimeoutMS} ms while waiting for a server " +
+                'that matches WritableServerSelector. Client view of cluster state is {type=UNKNOWN')
+        e.getMessage().contains('{address=localhost:27017, type=UNKNOWN, state=CONNECTING, ' +
+                'exception={com.mongodb.MongoInternalException: oops}}');
+        e.getMessage().contains('{address=localhost:27018, type=UNKNOWN, state=CONNECTING}');
+
+        where:
+        serverSelectionTimeoutMS << [1, 0]
+    }
+
+    def 'should select server'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .serverSelectionTimeout(serverSelectionTimeoutMS, SECONDS)
+                        .build(),
+                factory)
+        factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, allServers)
+        factory.sendNotification(secondServer, REPLICA_SET_SECONDARY, allServers)
+        factory.sendNotification(thirdServer, REPLICA_SET_PRIMARY, allServers)
+
+        expect:
+        cluster.selectServer(new ReadPreferenceServerSelector(ReadPreference.primary())).description.address == thirdServer
+
+        cleanup:
+        cluster?.close()
+
+        where:
+        serverSelectionTimeoutMS << [30, 0, -1]
+    }
+
+    @Category(Slow)
+    def 'should wait indefinitely for a server until interrupted'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .serverSelectionTimeout(-1, SECONDS)
+                        .build(),
+                factory)
+
+        when:
+        def latch = new CountDownLatch(1)
+        def thread = new Thread({
+            try {
+                cluster.selectServer(new ReadPreferenceServerSelector(ReadPreference.primary()))
+            } catch (MongoInterruptedException e) {
+                latch.countDown()
+            }
+        })
+        thread.start()
+        sleep(1000)
+        thread.interrupt()
+        latch.await(ClusterFixture.TIMEOUT, SECONDS)
+
+        then:
+        true
+
+        cleanup:
+        cluster?.close()
+    }
+
+    @Category(Slow)
+    def 'should wait indefinitely for a cluster description until interrupted'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .serverSelectionTimeout(-1, SECONDS)
+                        .build(),
+                factory)
+
+        when:
+        def latch = new CountDownLatch(1)
+        def thread = new Thread({
+            try {
+                cluster.getDescription()
+            } catch (MongoInterruptedException e) {
+                latch.countDown()
+            }
+        })
+        thread.start()
+        sleep(1000)
+        thread.interrupt()
+        latch.await(ClusterFixture.TIMEOUT, SECONDS)
+
+        then:
+        true
+
+        cleanup:
+        cluster?.close()
+    }
+
+    def 'should select server asynchronously when server is already available'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .serverSelectionTimeout(serverSelectionTimeoutMS, MILLISECONDS)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .build(),
+                factory)
+        factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, allServers)
+
+        when:
+        def server = selectServerAsyncAndGet(cluster, firstServer)
+
+        then:
+        server.description.address == firstServer
+
+        cleanup:
+        cluster?.close()
+
+        where:
+        serverSelectionTimeoutMS << [30, 0, -1]
+    }
+
+    def 'should select server asynchronously when server is not yet available'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .serverSelectionTimeout(serverSelectionTimeoutMS, MILLISECONDS)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .build(),
+                factory)
+
+        when:
+        def secondServerLatch = selectServerAsync(cluster, secondServer)
+        def thirdServerLatch = selectServerAsync(cluster, thirdServer)
+        factory.sendNotification(secondServer, REPLICA_SET_SECONDARY, allServers)
+        factory.sendNotification(thirdServer, REPLICA_SET_SECONDARY, allServers)
+
+        then:
+        secondServerLatch.get().description.address == secondServer
+        thirdServerLatch.get().description.address == thirdServer
+
+        cleanup:
+        cluster?.close()
+
+        where:
+        serverSelectionTimeoutMS << [500, -1]
+    }
+
+    def 'when selecting server asynchronously should send MongoClientException to callback if cluster is closed before success'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .build(),
+                factory)
+
+        when:
+        def serverLatch = selectServerAsync(cluster, firstServer)
+        cluster.close()
+        serverLatch.get()
+
+        then:
+        thrown(MongoClientException)
+
+        cleanup:
+        cluster?.close()
+    }
+
+    def 'when selecting server asynchronously should send MongoTimeoutException to callback after timeout period'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .serverSelectionTimeout(serverSelectionTimeoutMS, MILLISECONDS)
+                        .build(),
+                factory)
+
+        when:
+        selectServerAsyncAndGet(cluster, firstServer)
+
+        then:
+        thrown(MongoTimeoutException)
+
+        cleanup:
+        cluster?.close()
+
+
+        where:
+        serverSelectionTimeoutMS << [100, 0]
+    }
+
+    def 'when selecting server asynchronously should send MongoWaitQueueFullException to callback if there are too many waiters'() {
+        given:
+        def cluster = new MultiServerCluster(new ClusterId(),
+                builder().mode(MULTIPLE)
+                        .hosts([firstServer, secondServer, thirdServer])
+                        .serverSelectionTimeout(1, SECONDS)
+                        .maxWaitQueueSize(1)
+                        .build(),
+                factory)
+
+        when:
+        selectServerAsync(cluster, firstServer)
+        selectServerAsyncAndGet(cluster, firstServer)
+
+        then:
+        thrown(MongoWaitQueueFullException)
+
+        cleanup:
+        cluster?.close()
+    }
+
+    def selectServerAsyncAndGet(BaseCluster cluster, ServerAddress serverAddress) {
+        selectServerAsync(cluster, serverAddress).get()
+    }
+
+    def selectServerAsync(BaseCluster cluster, ServerAddress serverAddress) {
+        def serverLatch = new ServerLatch()
+        cluster.selectServerAsync(new ServerAddressSelector(serverAddress)) { Server result, MongoException e ->
+            serverLatch.server = result
+            serverLatch.throwable = e
+            serverLatch.latch.countDown()
+        }
+        serverLatch
+    }
+
+    class ServerLatch {
+        CountDownLatch latch = new CountDownLatch(1)
+        Server server
+        Throwable throwable
+
+        def get() {
+            latch.await()
+            if (throwable != null) {
+                throw throwable
+            }
+            server
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ByteBufBsonDocumentSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ByteBufBsonDocumentSpecification.groovy
new file mode 100644
index 00000000000..4dce95e4921
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ByteBufBsonDocumentSpecification.groovy
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import org.bson.BsonArray
+import org.bson.BsonBinaryWriter
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonNull
+import org.bson.BsonValue
+import org.bson.ByteBuf
+import org.bson.ByteBufNIO
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import org.bson.io.BasicOutputBuffer
+import org.bson.json.JsonMode
+import org.bson.json.JsonWriterSettings
+import spock.lang.Specification
+
+import java.nio.ByteBuffer
+
+import static java.util.Arrays.asList
+import static util.GroovyHelpers.areEqual
+
+class ByteBufBsonDocumentSpecification extends Specification {
+    def emptyDocumentByteBuf = new ByteBufNIO(ByteBuffer.wrap([5, 0, 0, 0, 0] as byte[]))
+    ByteBuf documentByteBuf
+    ByteBufBsonDocument emptyByteBufDocument = new ByteBufBsonDocument(emptyDocumentByteBuf)
+    def document = new BsonDocument()
+            .append('a', new BsonInt32(1))
+            .append('b', new BsonInt32(2))
+            .append('c', new BsonDocument('x', BsonBoolean.TRUE))
+            .append('d', new BsonArray(asList(new BsonDocument('y', BsonBoolean.FALSE), new BsonInt32(1))))
+
+    ByteBufBsonDocument byteBufDocument
+
+    def setup() {
+        def buffer = new BasicOutputBuffer()
+        new BsonDocumentCodec().encode(new BsonBinaryWriter(buffer), document, EncoderContext.builder().build())
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+        buffer.pipe(baos)
+        documentByteBuf = new ByteBufNIO(ByteBuffer.wrap(baos.toByteArray()))
+        byteBufDocument = new ByteBufBsonDocument(documentByteBuf)
+    }
+
+    def 'get should get the value of the given key'() {
+        expect:
+        emptyByteBufDocument.get('a') == null
+        byteBufDocument.get('z') == null
+        byteBufDocument.get('a') == new BsonInt32(1)
+        byteBufDocument.get('b') == new BsonInt32(2)
+    }
+
+    def 'get should throw if the key is null'() {
+        when:
+        byteBufDocument.get(null)
+
+        then:
+        thrown(IllegalArgumentException)
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'containKey should throw if the key name is null'() {
+        when:
+        byteBufDocument.containsKey(null)
+
+        then:
+        thrown(IllegalArgumentException)
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'containsKey should find an existing key'() {
+        expect:
+        byteBufDocument.containsKey('a')
+        byteBufDocument.containsKey('b')
+        byteBufDocument.containsKey('c')
+        byteBufDocument.containsKey('d')
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'containsKey should not find a non-existing key'() {
+        expect:
+        !byteBufDocument.containsKey('e')
+        !byteBufDocument.containsKey('x')
+        !byteBufDocument.containsKey('y')
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'containValue should find an existing value'() {
+        expect:
+        byteBufDocument.containsValue(document.get('a'))
+        byteBufDocument.containsValue(document.get('b'))
+        byteBufDocument.containsValue(document.get('c'))
+        byteBufDocument.containsValue(document.get('d'))
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'containValue should not find a non-existing value'() {
+        expect:
+        !byteBufDocument.containsValue(new BsonInt32(3))
+        !byteBufDocument.containsValue(new BsonDocument('e', BsonBoolean.FALSE))
+        !byteBufDocument.containsValue(new BsonArray(asList(new BsonInt32(2), new BsonInt32(4))))
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'isEmpty should return false when the document is not empty'() {
+        expect:
+        !byteBufDocument.isEmpty()
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'isEmpty should return true when the document is empty'() {
+        expect:
+        emptyByteBufDocument.isEmpty()
+        emptyDocumentByteBuf.referenceCount == 1
+    }
+
+    def 'should get correct size'() {
+        expect:
+        emptyByteBufDocument.size() == 0
+        byteBufDocument.size() == 4
+        documentByteBuf.referenceCount == 1
+        emptyDocumentByteBuf.referenceCount == 1
+    }
+
+    def 'should get correct key set'() {
+        expect:
+        emptyByteBufDocument.keySet().isEmpty()
+        byteBufDocument.keySet() == ['a', 'b', 'c', 'd'] as Set
+        documentByteBuf.referenceCount == 1
+        emptyDocumentByteBuf.referenceCount == 1
+    }
+
+    def 'should get correct values set'() {
+        expect:
+        emptyByteBufDocument.values().isEmpty()
+        byteBufDocument.values() as Set == [document.get('a'), document.get('b'), document.get('c'), document.get('d')] as Set
+        documentByteBuf.referenceCount == 1
+        emptyDocumentByteBuf.referenceCount == 1
+    }
+
+    def 'should get correct entry set'() {
+        expect:
+        emptyByteBufDocument.entrySet().isEmpty()
+        byteBufDocument.entrySet() == [new TestEntry('a', document.get('a')),
+                                       new TestEntry('b', document.get('b')),
+                                       new TestEntry('c', document.get('c')),
+                                       new TestEntry('d', document.get('d'))] as Set
+        documentByteBuf.referenceCount == 1
+        emptyDocumentByteBuf.referenceCount == 1
+    }
+
+    def 'all write methods should throw UnsupportedOperationException'() {
+        when:
+        byteBufDocument.clear()
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        byteBufDocument.put('x', BsonNull.VALUE)
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        byteBufDocument.append('x', BsonNull.VALUE)
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        byteBufDocument.putAll(new BsonDocument('x', BsonNull.VALUE))
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        byteBufDocument.remove(BsonNull.VALUE)
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    def 'should get first key'() {
+        expect:
+        byteBufDocument.getFirstKey() == document.keySet().iterator().next()
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'getFirstKey should throw NoSuchElementException if the document is empty'() {
+        when:
+        emptyByteBufDocument.getFirstKey()
+
+        then:
+        thrown(NoSuchElementException)
+        emptyDocumentByteBuf.referenceCount == 1
+    }
+
+    def 'should create BsonReader'() {
+        when:
+        def reader = document.asBsonReader()
+
+        then:
+        new BsonDocumentCodec().decode(reader, DecoderContext.builder().build()) == document
+
+        cleanup:
+        reader.close()
+    }
+
+   def 'hashCode should equal hash code of identical BsonDocument'() {
+        expect:
+        byteBufDocument.hashCode() == document.hashCode()
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'equals should equal identical BsonDocument'() {
+        expect:
+        areEqual(byteBufDocument, document)
+        areEqual(document, byteBufDocument)
+        areEqual(byteBufDocument, byteBufDocument)
+        !areEqual(byteBufDocument, emptyByteBufDocument)
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'clone should make a deep copy'() {
+        when:
+        BsonDocument cloned = byteBufDocument.clone()
+
+        then:
+        cloned == byteBufDocument
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'should serialize and deserialize'() {
+        given:
+        def baos = new ByteArrayOutputStream()
+        def oos = new ObjectOutputStream(baos)
+
+        when:
+        oos.writeObject(byteBufDocument)
+        def bais = new ByteArrayInputStream(baos.toByteArray())
+        def ois = new ObjectInputStream(bais)
+        def deserializedDocument = ois.readObject()
+
+        then:
+        byteBufDocument == deserializedDocument
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'toJson should return equivalent'() {
+        expect:
+        document.toJson() == byteBufDocument.toJson()
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'toJson should be callable multiple times'() {
+        expect:
+        byteBufDocument.toJson()
+        byteBufDocument.toJson()
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'size should be callable multiple times'() {
+        expect:
+        byteBufDocument.size()
+        byteBufDocument.size()
+        documentByteBuf.referenceCount == 1
+    }
+
+    def 'toJson should respect JsonWriteSettings'() {
+        given:
+        def settings = new JsonWriterSettings(JsonMode.SHELL)
+
+        expect:
+        document.toJson(settings) == byteBufDocument.toJson(settings)
+    }
+
+    def 'toJson should return equivalent when a ByteBufBsonDocument is nested in a BsonDocument'() {
+        given:
+        def topLevel = new BsonDocument('nested', byteBufDocument)
+
+        expect:
+        new BsonDocument('nested', document).toJson() == topLevel.toJson()
+    }
+
+    class TestEntry implements Map.Entry<String, BsonValue> {
+
+        private final String key
+        private BsonValue value
+
+        TestEntry(String key, BsonValue value) {
+            this.key = key
+            this.value = value
+        }
+
+        @Override
+        String getKey() {
+            key
+        }
+
+        @Override
+        BsonValue getValue() {
+            value
+        }
+
+        @Override
+        BsonValue setValue(final BsonValue value) {
+            this.value = value
+        }
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ByteBufSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ByteBufSpecification.groovy
similarity index 98%
rename from driver-core/src/test/unit/com/mongodb/connection/ByteBufSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/internal/connection/ByteBufSpecification.groovy
index 88b4b93c909..55520dd0d7d 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ByteBufSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ByteBufSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.connection.netty.NettyBufferProvider
 import spock.lang.Specification
@@ -233,6 +233,5 @@ class ByteBufSpecification extends Specification {
 
         where:
         provider << [new NettyBufferProvider(), new SimpleBufferProvider()]
-
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ChangeEventTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ChangeEventTest.java
similarity index 94%
rename from driver-core/src/test/unit/com/mongodb/connection/ChangeEventTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/ChangeEventTest.java
index 4422f3ccfea..093051ed45c 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ChangeEventTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ChangeEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import org.junit.Test;
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ClientMetadataHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ClientMetadataHelperSpecification.groovy
new file mode 100644
index 00000000000..68e3d2d9027
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ClientMetadataHelperSpecification.groovy
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoDriverInformation
+import com.mongodb.internal.build.MongoDriverVersion
+import org.bson.BsonBinaryWriter
+import org.bson.BsonDocument
+import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.EncoderContext
+import org.bson.io.BasicOutputBuffer
+import spock.lang.Specification
+
+import static com.mongodb.internal.connection.ClientMetadataHelper.createClientMetadataDocument
+
+class ClientMetadataHelperSpecification extends Specification {
+
+    def 'applicationName can be 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 126 + '\u00A0'
+
+        when:
+        def clientMetadataDocument = createClientMetadataDocument(applicationName)
+
+        then:
+        clientMetadataDocument.getDocument('application').getString('name').getValue() == applicationName
+    }
+
+    def 'should throw IllegalArgumentException if applicationName exceeds 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 127 + '\u00A0'
+
+        when:
+        createClientMetadataDocument(applicationName)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should create client metadata document'() {
+        expect:
+        createClientMetadataDocument(applicationName) == createExpectedClientMetadataDocument(applicationName)
+
+        where:
+        applicationName << ['appName', null]
+    }
+
+    def 'should create client metadata document including driver info'() {
+        given:
+        def applicationName = 'appName'
+        def driverInfo = MongoDriverInformation.builder().driverName('mongo-spark').driverVersion('2.0.0')
+                        .driverPlatform('Scala 2.10 / Spark 2.0.0').build()
+
+        expect:
+        createClientMetadataDocument(applicationName, driverInfo) == createExpectedClientMetadataDocument(applicationName, driverInfo)
+    }
+
+    def 'should create client metadata document and exclude the extra driver info if its too verbose'() {
+        given:
+        def driverInfo = MongoDriverInformation.builder()
+                .driverName('mongo-spark')
+                .driverVersion('a' * 512)
+                .driverPlatform('Scala 2.10 / Spark 2.0.0').build()
+        def expected = createExpectedClientMetadataDocument(null).append('os', BsonDocument.parse('{ type: "unknown" }'))
+        expected.remove('platform')
+
+        expect:
+        createClientMetadataDocument(null, driverInfo) == expected
+    }
+
+    def 'should return null when even the required data is too verbose'() {
+        given:
+        def template = BsonDocument.parse("{ driver: { name: 'mongo-java-driver', version: '${'a' * 512 }' }, os: {type: 'unknown'} }")
+
+        expect:
+        createClientMetadataDocument(null, null, template) == null
+    }
+
+    def 'should create client metadata document with the correct fields removed to fit within 512 byte limit '() {
+        when:
+        def clientMetadataDocument = createClientMetadataDocument(null, null, templateDocument)
+
+        then:
+        clientMetadataDocument == expectedDocument
+
+        where:
+        [templateDocument, expectedDocument] << [
+                [
+                        new BsonDocument('os',
+                                new BsonDocument('type', new BsonString('unknown'))
+                                        .append('name', new BsonString('a' * 512))
+                                        .append('architecture', new BsonString('arch1'))
+                                        .append('version', new BsonString('1.0')))
+                                .append('platform', new BsonString('platform1')),
+
+                        new BsonDocument('os', new BsonDocument('type', new BsonString('unknown')))
+                                .append('platform', new BsonString('platform1'))
+                ],
+
+                [
+                        new BsonDocument('os',
+                                new BsonDocument('type', new BsonString('unknown'))
+                                        .append('name', new BsonString('name1'))
+                                        .append('architecture', new BsonString('arch1'))
+                                        .append('version', new BsonString('1.0')))
+                                .append('platform', new BsonString('a' * 512)),
+
+                        new BsonDocument('os', new BsonDocument('type', new BsonString('unknown')))
+                ]
+        ]
+    }
+
+    def 'should get operating system type from name'() {
+        expect:
+        ClientMetadataHelper.getOperatingSystemType(name) == type
+
+        where:
+        name            | type
+        'unknown'       | 'unknown'
+        'Linux OS'      | 'Linux'
+        'Mac OS X'      | 'Darwin'
+        'Windows 10'    | 'Windows'
+        'HP-UX OS'      | 'Unix'
+        'AIX OS'        | 'Unix'
+        'Irix OS'       | 'Unix'
+        'Solaris OS'    | 'Unix'
+        'SunOS'         | 'Unix'
+        'Some Other OS' | 'unknown'
+    }
+
+    def encode(final BsonDocument document) {
+        BasicOutputBuffer buffer = new BasicOutputBuffer();
+        new BsonDocumentCodec().encode(new BsonBinaryWriter(buffer), document, EncoderContext.builder().build());
+        buffer.toByteArray()
+    }
+
+    static BsonDocument createExpectedClientMetadataDocument(String appName) {
+        def expectedDriverDocument = new BsonDocument('name', new BsonString(MongoDriverVersion.NAME))
+                .append('version', new BsonString(MongoDriverVersion.VERSION))
+        def expectedOperatingSystemDocument = new BsonDocument('type',
+                new BsonString(ClientMetadataHelper.getOperatingSystemType(System.getProperty('os.name'))))
+                .append('name', new BsonString(System.getProperty('os.name')))
+                .append('architecture', new BsonString(System.getProperty('os.arch')))
+                .append('version', new BsonString(System.getProperty('os.version')))
+        def expectedClientDocument = new BsonDocument('driver', expectedDriverDocument)
+                .append('os', expectedOperatingSystemDocument)
+                .append('platform', new BsonString('Java/' + System.getProperty('java.vendor') + '/'
+                + System.getProperty('java.runtime.version')))
+        if (appName != null) {
+            expectedClientDocument.append('application', new BsonDocument('name', new BsonString('appName')))
+        }
+        expectedClientDocument
+    }
+
+    static BsonDocument createExpectedClientMetadataDocument(String appName, MongoDriverInformation driverInformation) {
+        String separator = '|'
+        def expectedClientDocument = createExpectedClientMetadataDocument(appName).clone()
+
+        def expectedDriverDocument = expectedClientDocument.getDocument('driver')
+        def names = [expectedDriverDocument.getString('name').getValue(), *driverInformation.getDriverNames()].join(separator)
+        def versions = [expectedDriverDocument.getString('version').getValue(), *driverInformation.getDriverVersions()].join(separator)
+
+        expectedDriverDocument.append('name', new BsonString(names))
+        expectedDriverDocument.append('version', new BsonString(versions))
+
+        def platforms = [expectedClientDocument.getString('platform').getValue(), *driverInformation.getDriverPlatforms()].join(separator)
+        expectedClientDocument.append('platform', new BsonString(platforms))
+        expectedClientDocument
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ClusterClockSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ClusterClockSpecification.groovy
new file mode 100644
index 00000000000..efc84ddc619
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ClusterClockSpecification.groovy
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import org.bson.BsonDocument
+import org.bson.BsonTimestamp
+import spock.lang.Specification
+
+
+class ClusterClockSpecification extends Specification {
+    def 'should advance cluster time'() {
+        given:
+        def firstClusterTime = new BsonDocument('clusterTime', new BsonTimestamp(42, 1))
+        def secondClusterTime = new BsonDocument('clusterTime', new BsonTimestamp(52, 1))
+        def olderClusterTime = new BsonDocument('clusterTime', new BsonTimestamp(22, 1))
+
+        when:
+        def clock = new ClusterClock()
+
+        then:
+        clock.getCurrent() == null
+
+        when:
+        clock.advance(null)
+
+        then:
+        clock.getCurrent() == null
+        clock.greaterOf(firstClusterTime) == firstClusterTime
+
+        when:
+        clock.advance(firstClusterTime)
+
+        then:
+        clock.getCurrent() == firstClusterTime
+        clock.greaterOf(secondClusterTime) == secondClusterTime
+
+        when:
+        clock.advance(secondClusterTime)
+
+        then:
+        clock.getCurrent() == secondClusterTime
+        clock.greaterOf(olderClusterTime) == secondClusterTime
+
+        when:
+        clock.advance(olderClusterTime)
+
+        then:
+        clock.getCurrent() == secondClusterTime
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandEventOnConnectionFailureSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandEventOnConnectionFailureSpecification.groovy
new file mode 100644
index 00000000000..4781f45755f
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandEventOnConnectionFailureSpecification.groovy
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoSocketReadException
+import com.mongodb.MongoSocketWriteException
+import com.mongodb.ServerAddress
+import com.mongodb.bulk.DeleteRequest
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.event.CommandFailedEvent
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.codecs.DocumentCodec
+import spock.lang.Shared
+import spock.lang.Specification
+
+import static com.mongodb.internal.connection.ProtocolTestHelper.execute
+
+class CommandEventOnConnectionFailureSpecification extends Specification {
+
+    @Shared
+    def namespace = new MongoNamespace('test.test')
+    private TestInternalConnection connection;
+
+    def setup() {
+        connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress()));
+    }
+
+    def 'should publish failed command event when sendMessage throws exception'() {
+        String commandName = protocolInfo[0]
+        LegacyProtocol protocol = protocolInfo[1]
+
+        def commandListener = new TestCommandListener()
+        protocol.commandListener = commandListener
+        connection.enqueueSendMessageException(new MongoSocketWriteException('Failure', new ServerAddress(), new IOException()));
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        def e = thrown(MongoSocketWriteException)
+        commandListener.events.size() == 2
+        commandListener.eventWasDelivered(new CommandFailedEvent(1, connection.getDescription(), commandName, 0, e), 1)
+
+        where:
+        [protocolInfo, async] << [[
+                                   ['killCursors',
+                                    new KillCursorProtocol(namespace, [42L])],
+                                   ['getMore',
+                                    new GetMoreProtocol(namespace, 42L, 1, new DocumentCodec())],
+                                   ['find',
+                                    new QueryProtocol(namespace, 0, 1, 1, new BsonDocument(), new BsonDocument(), new DocumentCodec())],
+                                   ['delete',
+                                    new DeleteProtocol(namespace, true, new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))))],
+                                  ],
+                                  [false, true]].combinations()
+    }
+
+    def 'should publish failed command event when receiveMessage throws exception'() {
+        String commandName = protocolInfo[0]
+        LegacyProtocol protocol = protocolInfo[1]
+
+        def commandListener = new TestCommandListener()
+        protocol.commandListener = commandListener
+        connection.enqueueReceiveMessageException(new MongoSocketReadException('Failure', new ServerAddress(), new IOException()));
+
+        when:
+        execute(protocol, connection, async)
+
+        then:
+        def e = thrown(MongoSocketReadException)
+        commandListener.events.size() == 2
+        commandListener.eventWasDelivered(new CommandFailedEvent(1, connection.getDescription(), commandName, 0, e), 1)
+
+        where:
+        [protocolInfo, async] << [[
+                                   ['getMore',
+                                    new GetMoreProtocol(namespace, 42L, 1, new DocumentCodec())],
+                                   ['find',
+                                    new QueryProtocol(namespace, 0, 1, 1, new BsonDocument(), new BsonDocument(), new DocumentCodec())],
+                                  ],
+                                  [false, true]].combinations()
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageSpecification.groovy
new file mode 100644
index 00000000000..e7fb8a0995e
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageSpecification.groovy
@@ -0,0 +1,440 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoClientException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import com.mongodb.connection.ByteBufferBsonOutput
+import com.mongodb.connection.ClusterConnectionMode
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.SplittablePayload
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import com.mongodb.session.SessionContext
+import org.bson.BsonArray
+import org.bson.BsonBinary
+import org.bson.BsonBinaryReader
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonMaximumSizeExceededException
+import org.bson.BsonString
+import org.bson.BsonTimestamp
+import org.bson.ByteBuf
+import org.bson.ByteBufNIO
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.DecoderContext
+import org.bson.io.BasicOutputBuffer
+import org.bson.io.BsonInput
+import org.bson.io.ByteBufferBsonInput
+import spock.lang.Specification
+
+import java.nio.ByteBuffer
+
+import static com.mongodb.connection.SplittablePayload.Type.INSERT
+import static com.mongodb.internal.operation.ServerVersionHelper.FOUR_DOT_ZERO_WIRE_VERSION
+import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_FOUR_WIRE_VERSION
+import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION
+
+class CommandMessageSpecification extends Specification {
+
+    def namespace = new MongoNamespace('db.test')
+    def command = new BsonDocument('find', new BsonString(namespace.collectionName))
+    def fieldNameValidator = new NoOpFieldNameValidator()
+
+    def 'should encode command message with OP_MSG when server version is >= 3.6'() {
+        given:
+        def message = new CommandMessage(namespace, command, fieldNameValidator, readPreference,
+                MessageSettings.builder()
+                        .maxWireVersion(THREE_DOT_SIX_WIRE_VERSION)
+                        .serverType(serverType)
+                        .build(),
+                responseExpected, null, null, clusterConnectionMode)
+        def output = new BasicOutputBuffer()
+
+        when:
+        message.encode(output, sessionContext)
+
+        then:
+        def byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        def messageHeader = new MessageHeader(byteBuf, 512)
+        def replyHeader = new ReplyHeader(byteBuf, messageHeader)
+        messageHeader.opCode == OpCode.OP_MSG.value
+        replyHeader.requestId < RequestMessage.currentGlobalId
+        replyHeader.responseTo == 0
+        replyHeader.opMsgFlagBits == (responseExpected ? 0 : 2)
+
+        def expectedCommandDocument = command.clone()
+                .append('$db', new BsonString(namespace.databaseName))
+
+        if (sessionContext.clusterTime != null) {
+            expectedCommandDocument.append('$clusterTime', sessionContext.clusterTime)
+        }
+        if (sessionContext.hasSession() && responseExpected) {
+            expectedCommandDocument.append('lsid', sessionContext.sessionId)
+        }
+
+        if (readPreference != ReadPreference.primary()) {
+            expectedCommandDocument.append('$readPreference', readPreference.toDocument())
+        } else if (clusterConnectionMode == ClusterConnectionMode.SINGLE && serverType != ServerType.SHARD_ROUTER) {
+            expectedCommandDocument.append('$readPreference', ReadPreference.primaryPreferred().toDocument())
+        }
+        getCommandDocument(byteBuf, replyHeader) == expectedCommandDocument
+
+        where:
+        [readPreference, serverType, clusterConnectionMode, sessionContext, responseExpected] << [
+                [ReadPreference.primary(), ReadPreference.secondary()],
+                [ServerType.REPLICA_SET_PRIMARY, ServerType.SHARD_ROUTER],
+                [ClusterConnectionMode.SINGLE, ClusterConnectionMode.MULTIPLE],
+                [
+                        Stub(SessionContext) {
+                            hasSession() >> false
+                            getClusterTime() >> null
+                            getSessionId() >> new BsonDocument('id', new BsonBinary([1, 2, 3] as byte[]))
+                            getReadConcern() >> ReadConcern.DEFAULT
+                        },
+                        Stub(SessionContext) {
+                            hasSession() >> false
+                            getClusterTime() >> new BsonDocument('clusterTime', new BsonTimestamp(42, 1))
+                            getReadConcern() >> ReadConcern.DEFAULT
+                        },
+                        Stub(SessionContext) {
+                            hasSession() >> true
+                            getClusterTime() >> null
+                            getSessionId() >> new BsonDocument('id', new BsonBinary([1, 2, 3] as byte[]))
+                            getReadConcern() >> ReadConcern.DEFAULT
+                        },
+                        Stub(SessionContext) {
+                            hasSession() >> true
+                            getClusterTime() >> new BsonDocument('clusterTime', new BsonTimestamp(42, 1))
+                            getSessionId() >> new BsonDocument('id', new BsonBinary([1, 2, 3] as byte[]))
+                            getReadConcern() >> ReadConcern.DEFAULT
+                            }
+                ],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'should encode command message with OP_QUERY when server version is < 3.6'() {
+        given:
+        def message = new CommandMessage(namespace, command, fieldNameValidator, readPreference,
+                MessageSettings.builder()
+                        .maxWireVersion(THREE_DOT_FOUR_WIRE_VERSION)
+                        .serverType(serverType)
+                        .build(),
+                responseExpected, null, null, clusterConnectionMode)
+        def output = new BasicOutputBuffer()
+        def expectedFlagBits = 0
+        if (readPreference.isSlaveOk()) {
+            expectedFlagBits = 4
+        } else if (clusterConnectionMode == ClusterConnectionMode.SINGLE && serverType != ServerType.SHARD_ROUTER) {
+            expectedFlagBits = 4
+        }
+        BsonDocument expectedCommand
+        if (readPreference.isSlaveOk()) {
+            expectedCommand = new BsonDocument('$query', command).append('$readPreference', readPreference.toDocument())
+        } else {
+            expectedCommand = command
+        }
+
+        when:
+        message.encode(output, NoOpSessionContext.INSTANCE)
+
+        then:
+        def byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        def messageHeader = new MessageHeader(byteBuf, 512)
+        messageHeader.opCode == OpCode.OP_QUERY.value
+        messageHeader.requestId < RequestMessage.currentGlobalId
+        messageHeader.responseTo == 0
+        def flagBits = byteBuf.getInt()
+        flagBits == expectedFlagBits
+        def collectionName = getString(byteBuf)
+        collectionName == 'db.test'
+        def numberToSkip = byteBuf.getInt()
+        numberToSkip == 0
+        def numberToReturn = byteBuf.getInt()
+        numberToReturn == -1
+
+        getCommandDocument(byteBuf) == expectedCommand
+
+        where:
+        [readPreference, serverType, clusterConnectionMode, responseExpected] << [
+                [ReadPreference.primary(), ReadPreference.secondary()],
+                [ServerType.REPLICA_SET_PRIMARY, ServerType.SHARD_ROUTER],
+                [ClusterConnectionMode.SINGLE, ClusterConnectionMode.MULTIPLE],
+                [true, false]
+        ].combinations()
+    }
+
+    String getString(final ByteBuf byteBuf) {
+        def byteArrayOutputStream = new ByteArrayOutputStream()
+        def cur = byteBuf.get()
+        while (cur != 0) {
+            byteArrayOutputStream.write(cur)
+            cur = byteBuf.get()
+        }
+        new String(byteArrayOutputStream.toByteArray(), 'UTF-8')
+    }
+
+    def 'should get command document'() {
+        given:
+        def message = new CommandMessage(namespace, originalCommandDocument, fieldNameValidator, ReadPreference.primary(),
+                MessageSettings.builder().maxWireVersion(maxWireVersion).build(), true, payload, new NoOpFieldNameValidator(),
+                ClusterConnectionMode.MULTIPLE)
+        def output = new ByteBufferBsonOutput(new SimpleBufferProvider())
+        message.encode(output, NoOpSessionContext.INSTANCE)
+
+        when:
+        def commandDocument = message.getCommandDocument(output)
+
+        def expectedCommandDocument = new BsonDocument('insert', new BsonString('coll')).append('documents',
+                new BsonArray([new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('_id', new BsonInt32(2))]))
+        if (maxWireVersion == THREE_DOT_SIX_WIRE_VERSION) {
+            expectedCommandDocument.append('$db', new BsonString(namespace.getDatabaseName()))
+        }
+        then:
+        commandDocument == expectedCommandDocument
+
+
+        where:
+        [maxWireVersion, originalCommandDocument, payload] << [
+                [
+                        THREE_DOT_FOUR_WIRE_VERSION,
+                        new BsonDocument('insert', new BsonString('coll')),
+                        new SplittablePayload(INSERT, [new BsonDocument('_id', new BsonInt32(1)),
+                                                       new BsonDocument('_id', new BsonInt32(2))]),
+                ],
+                [
+                        THREE_DOT_FOUR_WIRE_VERSION,
+                        new BsonDocument('insert', new BsonString('coll')).append('documents',
+                                new BsonArray([new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('_id', new BsonInt32(2))])),
+                        null
+                ],
+                [
+                        THREE_DOT_SIX_WIRE_VERSION,
+                        new BsonDocument('insert', new BsonString('coll')),
+                        new SplittablePayload(INSERT, [new BsonDocument('_id', new BsonInt32(1)),
+                                                       new BsonDocument('_id', new BsonInt32(2))]),
+                ],
+                [
+                        THREE_DOT_SIX_WIRE_VERSION,
+                        new BsonDocument('insert', new BsonString('coll')).append('documents',
+                                new BsonArray([new BsonDocument('_id', new BsonInt32(1)), new BsonDocument('_id', new BsonInt32(2))])),
+                        null
+                ]
+        ]
+    }
+
+    def 'should respect the max message size'() {
+        given:
+        def maxMessageSize = 1024
+        def messageSettings = MessageSettings.builder().maxMessageSize(maxMessageSize).maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def insertCommand = new BsonDocument('insert', new BsonString(namespace.collectionName))
+        def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonBinary(new byte[922])),
+                                                     new BsonDocument('b', new BsonBinary(new byte[450])),
+                                                     new BsonDocument('c', new BsonBinary(new byte[459])),
+                                                     new BsonDocument('b', new BsonBinary(new byte[450])),
+                                                     new BsonDocument('c', new BsonBinary(new byte[460]))])
+        def message = new CommandMessage(namespace, insertCommand, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        def output = new BasicOutputBuffer()
+        def sessionContext = Stub(SessionContext) {
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+
+        when:
+        message.encode(output, sessionContext)
+        def byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        def messageHeader = new MessageHeader(byteBuf, maxMessageSize)
+
+        then:
+        messageHeader.opCode == OpCode.OP_MSG.value
+        messageHeader.requestId < RequestMessage.currentGlobalId
+        messageHeader.responseTo == 0
+        messageHeader.messageLength == 1024
+        byteBuf.getInt() == 0
+        payload.getPosition() == 1
+        payload.hasAnotherSplit()
+
+        when:
+        payload = payload.getNextSplit()
+        message = new CommandMessage(namespace, insertCommand, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        output.truncateToPosition(0)
+        message.encode(output, sessionContext)
+        byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        messageHeader = new MessageHeader(byteBuf, maxMessageSize)
+
+        then:
+        messageHeader.opCode == OpCode.OP_MSG.value
+        messageHeader.requestId < RequestMessage.currentGlobalId
+        messageHeader.responseTo == 0
+        messageHeader.messageLength == 1024
+        byteBuf.getInt() == 0
+        payload.getPosition() == 2
+        payload.hasAnotherSplit()
+
+        when:
+        payload = payload.getNextSplit()
+        message = new CommandMessage(namespace, insertCommand, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        output.truncateToPosition(0)
+        message.encode(output, sessionContext)
+        byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        messageHeader = new MessageHeader(byteBuf, maxMessageSize)
+
+        then:
+        messageHeader.opCode == OpCode.OP_MSG.value
+        messageHeader.requestId < RequestMessage.currentGlobalId
+        messageHeader.responseTo == 0
+        messageHeader.messageLength == 552
+        byteBuf.getInt() == 0
+        payload.getPosition() == 1
+        payload.hasAnotherSplit()
+
+        when:
+        payload = payload.getNextSplit()
+        message = new CommandMessage(namespace, insertCommand, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        output.truncateToPosition(0)
+        message.encode(output, sessionContext)
+        byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        messageHeader = new MessageHeader(byteBuf, maxMessageSize)
+
+        then:
+        messageHeader.opCode == OpCode.OP_MSG.value
+        messageHeader.requestId < RequestMessage.currentGlobalId
+        messageHeader.responseTo == 0
+        messageHeader.messageLength == 562
+        byteBuf.getInt() == 1 << 1
+        payload.getPosition() == 1
+        !payload.hasAnotherSplit()
+    }
+
+    def 'should respect the max batch count'() {
+        given:
+        def messageSettings = MessageSettings.builder().maxBatchCount(2).maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonBinary(new byte[900])),
+                                                     new BsonDocument('b', new BsonBinary(new byte[450])),
+                                                     new BsonDocument('c', new BsonBinary(new byte[450]))])
+        def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        def output = new BasicOutputBuffer()
+        def sessionContext = Stub(SessionContext) {
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+
+        when:
+        message.encode(output, sessionContext)
+        def byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        def messageHeader = new MessageHeader(byteBuf, 2048)
+
+        then:
+        messageHeader.opCode == OpCode.OP_MSG.value
+        messageHeader.requestId < RequestMessage.currentGlobalId
+        messageHeader.responseTo == 0
+        messageHeader.messageLength == 1463
+        byteBuf.getInt() == 0
+        payload.getPosition() == 2
+        payload.hasAnotherSplit()
+
+        when:
+        payload = payload.getNextSplit()
+        message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        output.truncateToPosition(0)
+        message.encode(output, sessionContext)
+        byteBuf = new ByteBufNIO(ByteBuffer.wrap(output.toByteArray()))
+        messageHeader = new MessageHeader(byteBuf, 1024)
+
+        then:
+        messageHeader.opCode == OpCode.OP_MSG.value
+        messageHeader.requestId < RequestMessage.currentGlobalId
+        messageHeader.responseTo == 0
+        byteBuf.getInt() == 1 << 1
+        payload.getPosition() == 1
+        !payload.hasAnotherSplit()
+    }
+
+    def 'should throw if payload document bigger than max document size'() {
+        given:
+        def messageSettings = MessageSettings.builder().maxDocumentSize(900)
+                .maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonBinary(new byte[900]))])
+        def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        def output = new BasicOutputBuffer()
+        def sessionContext = Stub(SessionContext) {
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+
+        when:
+        message.encode(output, sessionContext)
+
+        then:
+        thrown(BsonMaximumSizeExceededException)
+    }
+
+    def 'should throw if wire version does not support transactions'() {
+        given:
+        def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonInt32(1))])
+        def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        def output = new BasicOutputBuffer()
+        def sessionContext = Stub(SessionContext) {
+            getReadConcern() >> ReadConcern.DEFAULT
+            hasActiveTransaction() >> true
+        }
+
+        when:
+        message.encode(output, sessionContext)
+
+        then:
+        thrown(MongoClientException)
+    }
+
+    def 'should throw if wire version and sharded cluster does not support transactions'() {
+        given:
+        def messageSettings = MessageSettings.builder().serverType(ServerType.SHARD_ROUTER)
+                .maxWireVersion(FOUR_DOT_ZERO_WIRE_VERSION).build()
+        def payload = new SplittablePayload(INSERT, [new BsonDocument('a', new BsonInt32(1))])
+        def message = new CommandMessage(namespace, command, fieldNameValidator, ReadPreference.primary(), messageSettings,
+                false, payload, fieldNameValidator, ClusterConnectionMode.MULTIPLE)
+        def output = new BasicOutputBuffer()
+        def sessionContext = Stub(SessionContext) {
+            getReadConcern() >> ReadConcern.DEFAULT
+            hasActiveTransaction() >> true
+        }
+
+        when:
+        message.encode(output, sessionContext)
+
+        then:
+        thrown(MongoClientException)
+    }
+
+    private static BsonDocument getCommandDocument(ByteBufNIO byteBuf, ReplyHeader replyHeader) {
+        new ReplyMessage<BsonDocument>(new ResponseBuffers(replyHeader, byteBuf), new BsonDocumentCodec(), 0).documents.get(0)
+    }
+
+    private static BsonDocument getCommandDocument(ByteBufNIO byteBuf) {
+        BsonInput bsonInput = new ByteBufferBsonInput(byteBuf);
+        BsonBinaryReader reader = new BsonBinaryReader(bsonInput);
+        new BsonDocumentCodec().decode(reader, DecoderContext.builder().build())
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/CompositeByteBufSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/CompositeByteBufSpecification.groovy
similarity index 99%
rename from driver-core/src/test/unit/com/mongodb/connection/CompositeByteBufSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/internal/connection/CompositeByteBufSpecification.groovy
index 88684df36c1..c96694b4158 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/CompositeByteBufSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/CompositeByteBufSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import org.bson.ByteBufNIO
 import spock.lang.Specification
@@ -76,7 +76,6 @@ class CompositeByteBufSpecification extends Specification {
 
         then:
         thrown(IllegalStateException)
-
     }
 
     def 'order should throw if not little endian'() {
@@ -500,7 +499,6 @@ class CompositeByteBufSpecification extends Specification {
         def bytes = new byte[5]
         nio.get(bytes)
         bytes == [2, 3, 4, 5, 6] as byte[]
-
     }
 
     def 'should throw IndexOutOfBoundsException if reading out of bounds'() {
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ConcurrentLinkedDequeSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ConcurrentLinkedDequeSpecification.groovy
new file mode 100644
index 00000000000..bef9823b8da
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ConcurrentLinkedDequeSpecification.groovy
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import spock.lang.Specification
+
+// Mostly untested since it was a straight copy from an existing high-quality open source implementation
+class ConcurrentLinkedDequeSpecification extends Specification {
+    def 'should report successful removal from iterator'() {
+        given:
+        def deque = new ConcurrentLinkedDeque<Integer>()
+        deque.add(1)
+        deque.add(2)
+        deque.add(3)
+        def iter = deque.iterator()
+
+        when:
+        def next = iter.next()
+        def successfullyRemoved = iter.reportingRemove()
+
+        then:
+        next == 1
+        successfullyRemoved
+
+        when:
+        next = iter.next()
+        successfullyRemoved = iter.reportingRemove()
+
+        then:
+        next == 2
+        successfullyRemoved
+
+        when:
+        next = iter.next()
+        successfullyRemoved = iter.reportingRemove()
+
+        then:
+        next == 3
+        successfullyRemoved
+    }
+
+    def 'should report unsuccessful removal from iterator'() {
+        given:
+        def deque = new ConcurrentLinkedDeque<Integer>()
+        deque.add(1)
+        deque.add(2)
+        deque.add(3)
+        def iter = deque.iterator()
+
+        when:
+        def next = iter.next()
+        deque.remove(next)
+        def successfullyRemoved = iter.reportingRemove()
+
+        then:
+        next == 1
+        !successfullyRemoved
+
+        when:
+        next = iter.next()
+        deque.remove(next)
+        successfullyRemoved = iter.reportingRemove()
+
+        then:
+        next == 2
+        !successfullyRemoved
+
+        when:
+        next = iter.next()
+        deque.remove(next)
+        successfullyRemoved = iter.reportingRemove()
+
+        then:
+        next == 3
+        !successfullyRemoved
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ConcurrentPoolTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ConcurrentPoolTest.java
index feb736be3af..f0e347c1c47 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/connection/ConcurrentPoolTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ConcurrentPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -190,21 +190,34 @@ public void testThatEnsuringMinSizeReleasesPermitIfCreateFails() {
 
     @Test
     public void testPrune() {
-        pool = new ConcurrentPool<TestCloseable>(3, new TestItemFactory());
+        pool = new ConcurrentPool<TestCloseable>(5, new TestItemFactory());
 
         TestCloseable t1 = pool.get();
         TestCloseable t2 = pool.get();
-        t1.shouldPrune = true;
-        t2.shouldPrune = true;
+        TestCloseable t3 = pool.get();
+        TestCloseable t4 = pool.get();
+        TestCloseable t5 = pool.get();
+        t1.shouldPrune = ConcurrentPool.Prune.YES;
+        t2.shouldPrune = ConcurrentPool.Prune.NO;
+        t3.shouldPrune = ConcurrentPool.Prune.YES;
+        t4.shouldPrune = ConcurrentPool.Prune.STOP;
+        t5.shouldPrune = null;
 
         pool.release(t1);
         pool.release(t2);
+        pool.release(t3);
+        pool.release(t4);
+        pool.release(t5);
 
         pool.prune();
-        assertEquals(0, pool.getAvailableCount());
+
+        assertEquals(3, pool.getAvailableCount());
         assertEquals(0, pool.getInUseCount());
         assertTrue(t1.isClosed());
-        assertTrue(t2.isClosed());
+        assertTrue(!t2.isClosed());
+        assertTrue(t3.isClosed());
+        assertTrue(!t4.isClosed());
+        assertTrue(!t5.isClosed());
     }
 
     class TestItemFactory implements ConcurrentPool.ItemFactory<TestCloseable> {
@@ -232,17 +245,17 @@ public void close(final TestCloseable closeable) {
         }
 
         @Override
-        public boolean shouldPrune(final TestCloseable testCloseable) {
+        public ConcurrentPool.Prune shouldPrune(final TestCloseable testCloseable) {
             return testCloseable.shouldPrune();
         }
     }
 
     static class TestCloseable implements Closeable {
         private boolean closed;
-        private boolean shouldPrune;
+        private ConcurrentPool.Prune shouldPrune;
         private final boolean initialized;
 
-        public TestCloseable(final boolean initialize) {
+        TestCloseable(final boolean initialize) {
             this.initialized = initialize;
         }
 
@@ -259,7 +272,7 @@ public boolean isInitialized() {
             return initialized;
         }
 
-        public boolean shouldPrune() {
+        public ConcurrentPool.Prune shouldPrune() {
             return shouldPrune;
         }
     }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ConnectionPoolTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ConnectionPoolTest.java
new file mode 100644
index 00000000000..d0792ef112d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ConnectionPoolTest.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoTimeoutException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerId;
+import com.mongodb.event.ConnectionAddedEvent;
+import com.mongodb.event.ConnectionCheckedInEvent;
+import com.mongodb.event.ConnectionCheckedOutEvent;
+import com.mongodb.event.ConnectionPoolClosedEvent;
+import com.mongodb.event.ConnectionPoolOpenedEvent;
+import com.mongodb.event.ConnectionPoolWaitQueueEnteredEvent;
+import com.mongodb.event.ConnectionPoolWaitQueueExitedEvent;
+import com.mongodb.event.ConnectionRemovedEvent;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeNotNull;
+
+// Implementation of
+// https://github.com/mongodb/specifications/blob/master/source/connection-monitoring-and-pooling/connection-monitoring-and-pooling.rst
+// specification tests
+@RunWith(Parameterized.class)
+public class ConnectionPoolTest {
+    private final String fileName;
+    private final String description;
+    private final BsonDocument definition;
+    private final TestConnectionPoolListener listener;
+    private final ServerAddress serverAddress = new ServerAddress("host1");
+    private final DefaultConnectionPool pool;
+    private ConnectionPoolSettings settings;
+    private final Map<String, ExecutorService> executorServiceMap = new HashMap<String, ExecutorService>();
+    private final Map<String, Future<Exception>> futureMap = new HashMap<String, Future<Exception>>();
+    private final Map<String, InternalConnection> connectionMap = new HashMap<String, InternalConnection>();
+
+    public ConnectionPoolTest(final String fileName, final String description, final BsonDocument definition) {
+        this.fileName = fileName;
+        this.description = description;
+        this.definition = definition;
+
+        ConnectionPoolSettings.Builder settingsBuilder = ConnectionPoolSettings.builder()
+                .maintenanceFrequency(1, TimeUnit.MILLISECONDS);
+        BsonDocument poolOptions = definition.getDocument("poolOptions", new BsonDocument());
+
+        if (poolOptions.containsKey("maxPoolSize")) {
+            settingsBuilder.maxSize(poolOptions.getNumber("maxPoolSize").intValue());
+        }
+        if (poolOptions.containsKey("minPoolSize")) {
+            settingsBuilder.minSize(poolOptions.getNumber("minPoolSize").intValue());
+        }
+        if (poolOptions.containsKey("maxIdleTimeMS")) {
+            settingsBuilder.maxConnectionIdleTime(poolOptions.getNumber("maxIdleTimeMS").intValue(), TimeUnit.MILLISECONDS);
+        }
+        if (poolOptions.containsKey("waitQueueTimeoutMS")) {
+            settingsBuilder.maxWaitTime(poolOptions.getNumber("waitQueueTimeoutMS").intValue(), TimeUnit.MILLISECONDS);
+        }
+
+        listener = new TestConnectionPoolListener();
+        settingsBuilder.addConnectionPoolListener(listener);
+        settings = settingsBuilder.build();
+
+        pool = new DefaultConnectionPool(new ServerId(new ClusterId(), serverAddress), new TestInternalConnectionFactory(),
+                settings);
+        pool.start();
+    }
+
+    @After
+    public void tearDown() {
+        for (ExecutorService cur : executorServiceMap.values()) {
+            cur.shutdownNow();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() throws Exception {
+        try {
+            for (BsonValue cur : definition.getArray("operations")) {
+                final BsonDocument operation = cur.asDocument();
+                String name = operation.getString("name").getValue();
+
+                if (name.equals("start")) {
+                    String target = operation.getString("target", new BsonString("")).getValue();
+                    executorServiceMap.put(target, Executors.newSingleThreadExecutor());
+                } else if (name.equals("wait")) {
+                    Thread.sleep(operation.getNumber("ms").intValue());
+                } else if (name.equals("waitForThread")) {
+                    String target = operation.getString("target", new BsonString("")).getValue();
+                    Exception exceptionFromFuture = futureMap.remove(target).get(5, TimeUnit.SECONDS);
+                    if (exceptionFromFuture != null) {
+                        throw exceptionFromFuture;
+                    }
+                } else if (name.equals("waitForEvent")) {
+                    Class<?> eventClass = getEventClass(operation.getString("event").getValue());
+                    // TODO: In 4.0 we will support all event classes.  Until then, skipping tests where we need to wait on an
+                    // unsupported one
+                    assumeNotNull(eventClass);
+                    listener.waitForEvent(eventClass, operation.getNumber("count").intValue(), 5, TimeUnit.SECONDS);
+                } else if (name.equals("clear")) {
+                    pool.invalidate();
+                } else if (name.equals("close")) {
+                    pool.close();
+                } else if (name.equals("checkOut") || name.equals("checkIn")) {
+                    Callable<Exception> callable = createCallable(operation);
+                    if (operation.containsKey("thread")) {
+                        String threadTarget = operation.getString("thread").getValue();
+                        ExecutorService executorService = executorServiceMap.get(threadTarget);
+                        futureMap.put(threadTarget, executorService.submit(callable));
+                    } else {
+                        callable.call();
+                    }
+                } else {
+                    throw new UnsupportedOperationException("No support for " + name);
+                }
+            }
+        } catch (Exception e) {
+            if (!definition.containsKey("error")) {
+                throw e;
+            }
+            BsonDocument errorDocument = definition.getDocument("error");
+            String exceptionType = errorDocument.getString("type").getValue();
+            if (exceptionType.equals("PoolClosedError")) {
+                assertEquals(IllegalStateException.class, e.getClass());
+            } else if (exceptionType.equals("WaitQueueTimeoutError")) {
+                if (e.getClass() != MongoTimeoutException.class) {
+                    throw e;
+                }
+            } else {
+                throw e;
+            }
+        }
+
+        if (definition.containsKey("events")) {
+            Iterator<Object> actualEventsIterator = getNonIgnoredActualEvents().iterator();
+            BsonArray expectedEvents = definition.getArray("events");
+            for (BsonValue cur : expectedEvents) {
+                BsonDocument expectedEvent = cur.asDocument();
+                String type = expectedEvent.getString("type").getValue();
+                if (type.equals("ConnectionPoolCreated")) {
+                    ConnectionPoolOpenedEvent actualEvent = getNextEvent(actualEventsIterator, ConnectionPoolOpenedEvent.class);
+                    assertEquals(serverAddress, actualEvent.getServerId().getAddress());
+                    assertEquals(settings, actualEvent.getSettings());
+                } else if (type.equals("ConnectionPoolClosed")) {
+                    ConnectionPoolClosedEvent actualEvent = getNextEvent(actualEventsIterator, ConnectionPoolClosedEvent.class);
+                    assertEquals(serverAddress, actualEvent.getServerId().getAddress());
+                } else if (type.equals("ConnectionPoolCleared")) {
+                    // TODO in 4.0, when this event will be implemented
+                } else if (type.equals("ConnectionReady")) {
+                    // TODO in 4.0, when this event will be implemented
+                } else if (type.equals("ConnectionCheckOutStarted")) {
+                    // TODO in 4.0, when this event will be implemented
+                } else if (type.equals("ConnectionCheckOutFailed")) {
+                    // TODO in 4.0, when this event will be implemented
+                } else if (type.equals("ConnectionCreated")) {
+                    ConnectionAddedEvent actualEvent = getNextEvent(actualEventsIterator, ConnectionAddedEvent.class);
+                    assertConnectionIdMatch(expectedEvent, actualEvent.getConnectionId());
+                } else if (type.equals("ConnectionCheckedOut")) {
+                    ConnectionCheckedOutEvent actualEvent = getNextEvent(actualEventsIterator, ConnectionCheckedOutEvent.class);
+                    assertConnectionIdMatch(expectedEvent, actualEvent.getConnectionId());
+                } else if (type.equals("ConnectionCheckedIn")) {
+                    ConnectionCheckedInEvent actualEvent = getNextEvent(actualEventsIterator, ConnectionCheckedInEvent.class);
+                    assertConnectionIdMatch(expectedEvent, actualEvent.getConnectionId());
+                } else if (type.equals("ConnectionClosed")) {
+                    ConnectionRemovedEvent actualEvent = getNextEvent(actualEventsIterator, ConnectionRemovedEvent.class);
+                    assertConnectionIdMatch(expectedEvent, actualEvent.getConnectionId());
+                    assertReasonMatch(expectedEvent, actualEvent);
+                } else {
+                    throw new UnsupportedOperationException("Unsupported event type " + type);
+                }
+            }
+        }
+    }
+
+    private void assertReasonMatch(final BsonDocument expectedEvent, final ConnectionRemovedEvent connectionRemovedEvent) {
+        if (!expectedEvent.containsKey("reason")) {
+            return;
+        }
+
+        String expectedReason = expectedEvent.getString("reason").getValue();
+        switch (connectionRemovedEvent.getReason()) {
+            case STALE:
+                assertEquals(expectedReason, "stale");
+                break;
+            case MAX_IDLE_TIME_EXCEEDED:
+                assertEquals(expectedReason, "idle");
+                break;
+            case ERROR:
+                assertEquals(expectedReason, "error");
+                break;
+            case POOL_CLOSED:
+                assertEquals(expectedReason, "poolClosed");
+                break;
+            default:
+                fail("Unexpected reason to close connection " + connectionRemovedEvent.getReason());
+        }
+    }
+
+    private void assertConnectionIdMatch(final BsonDocument expectedEvent, final ConnectionId actualConnectionId) {
+        int expectedConnectionId = expectedEvent.getNumber("connectionId").intValue();
+        if (expectedConnectionId != 42) {
+            assertEquals("Connection id does not match", expectedConnectionId, actualConnectionId.getLocalValue());
+        }
+    }
+
+    private List<Object> getNonIgnoredActualEvents() {
+        List<Object> nonIgnoredActualEvents = new ArrayList<Object>();
+        Set<Class<?>> ignoredEventClasses = getIgnoredEventClasses();
+        for (Object cur : listener.getEvents()) {
+            if (!ignoredEventClasses.contains(cur.getClass())) {
+                nonIgnoredActualEvents.add(cur);
+            }
+        }
+        return nonIgnoredActualEvents;
+    }
+
+    private Set<Class<?>> getIgnoredEventClasses() {
+        Set<Class<?>> ignoredEventClasses = new HashSet<Class<?>>();
+        ignoredEventClasses.add(ConnectionPoolWaitQueueEnteredEvent.class);
+        ignoredEventClasses.add(ConnectionPoolWaitQueueExitedEvent.class);
+        for (BsonValue cur : definition.getArray("ignore", new BsonArray())) {
+            String type = cur.asString().getValue();
+            Class<?> eventClass = getEventClass(type);
+            if (eventClass != null) {
+                ignoredEventClasses.add(eventClass);
+            }
+        }
+        return ignoredEventClasses;
+    }
+
+    private Class<?> getEventClass(final String type) {
+        if (type.equals("ConnectionPoolCreated")) {
+             return ConnectionPoolOpenedEvent.class;
+        } else if (type.equals("ConnectionPoolClosed")) {
+            return ConnectionPoolClosedEvent.class;
+        } else if (type.equals("ConnectionCreated")) {
+            return ConnectionAddedEvent.class;
+        } else if (type.equals("ConnectionCheckedOut")) {
+            return ConnectionCheckedOutEvent.class;
+        } else if (type.equals("ConnectionCheckedIn")) {
+            return ConnectionCheckedInEvent.class;
+        } else if (type.equals("ConnectionClosed")) {
+            return ConnectionRemovedEvent.class;
+        } else if (type.equals("ConnectionPoolCleared")) {
+            return null;
+        } else if (type.equals("ConnectionReady")) {
+            return null;
+        } else if (type.equals("ConnectionCheckOutStarted")) {
+            return null;
+        } else if (type.equals("ConnectionCheckOutFailed")) {
+            return null;
+        } else {
+            throw new UnsupportedOperationException("Unsupported event type " + type);
+        }
+    }
+
+
+    private <Event> Event getNextEvent(final Iterator<Object> eventsIterator, final Class<Event> expectedType) {
+        if (!eventsIterator.hasNext()) {
+           fail("Expected event of type " + expectedType + " but there are no more events");
+        }
+        Object next = eventsIterator.next();
+        assertEquals(expectedType, next.getClass());
+        return expectedType.cast(next);
+    }
+
+    private Callable<Exception> createCallable(final BsonDocument operation) {
+        String name = operation.getString("name").getValue();
+        if (name.equals("checkOut")) {
+            return new Callable<Exception>() {
+                @Override
+                public Exception call() {
+                    try {
+                        InternalConnection connection = pool.get();
+                        if (operation.containsKey("label")) {
+                            connectionMap.put(operation.getString("label").getValue(), connection);
+                        }
+                        return null;
+                    } catch (Exception e) {
+                        return e;
+                    }
+                }
+            };
+        } else if (name.equals("checkIn")) {
+            return new Callable<Exception>() {
+                @Override
+                public Exception call() {
+                    try {
+                        InternalConnection connection = connectionMap.get(operation.getString("connection").getValue());
+                        connection.close();
+                        return null;
+                    } catch (Exception e) {
+                        return e;
+                    }
+                }
+            };
+        } else {
+            throw new UnsupportedOperationException("Operation " + name + " not supported");
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/connection-monitoring-and-pooling")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            data.add(new Object[]{file.getName(), testDocument.getString("description").getValue(), testDocument});
+        }
+        return data;
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultConnectionPoolSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultConnectionPoolSpecification.groovy
new file mode 100644
index 00000000000..8dde923e84e
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultConnectionPoolSpecification.groovy
@@ -0,0 +1,532 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import category.Slow
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoSocketReadException
+import com.mongodb.MongoSocketWriteException
+import com.mongodb.MongoTimeoutException
+import com.mongodb.MongoWaitQueueFullException
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ServerId
+import com.mongodb.event.ConnectionPoolListener
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.ByteBuf
+import org.bson.codecs.BsonDocumentCodec
+import org.junit.experimental.categories.Category
+import spock.lang.Specification
+import spock.lang.Subject
+
+import java.util.concurrent.CountDownLatch
+
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.connection.ConnectionPoolSettings.builder
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.MINUTES
+
+class DefaultConnectionPoolSpecification extends Specification {
+    private static final ServerId SERVER_ID = new ServerId(new ClusterId(), new ServerAddress())
+
+    private final TestInternalConnectionFactory connectionFactory = Spy(TestInternalConnectionFactory)
+
+    @Subject
+    private DefaultConnectionPool pool
+
+    def cleanup() {
+        pool.close()
+    }
+
+    def 'should get non null connection'() throws InterruptedException {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).build())
+        pool.start();
+
+        expect:
+        pool.get() != null
+    }
+
+    def 'should reuse released connection'() throws InterruptedException {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).build())
+        pool.start();
+
+        when:
+        pool.get().close()
+        pool.get()
+
+        then:
+        1 * connectionFactory.create(SERVER_ID)
+    }
+
+    def 'should release a connection back into the pool on close, not close the underlying connection'() throws InterruptedException {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).build())
+        pool.start();
+
+        when:
+        pool.get().close()
+
+        then:
+        !connectionFactory.getCreatedConnections().get(0).isClosed()
+    }
+
+    def 'should throw if pool is exhausted'() throws InterruptedException {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).maxWaitTime(1, MILLISECONDS).build())
+        pool.start();
+
+        when:
+        def first = pool.get()
+
+        then:
+        first != null
+
+        when:
+        pool.get()
+
+        then:
+        thrown(MongoTimeoutException)
+    }
+
+    def 'should throw on timeout'() throws InterruptedException {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).maxWaitTime(50, MILLISECONDS).build())
+        pool.start();
+
+        pool.get()
+
+        when:
+        TimeoutTrackingConnectionGetter connectionGetter = new TimeoutTrackingConnectionGetter(pool)
+        new Thread(connectionGetter).start()
+
+        connectionGetter.latch.await()
+
+        then:
+        connectionGetter.gotTimeout
+    }
+
+    def 'should expire all connection after exception'() throws InterruptedException {
+        given:
+        int numberOfConnectionsCreated = 0
+
+        def mockConnectionFactory = Mock(InternalConnectionFactory)
+        mockConnectionFactory.create(_) >> {
+            numberOfConnectionsCreated++
+            Mock(InternalConnection) {
+                sendMessage(_, _) >> { throw new MongoSocketWriteException('', SERVER_ID.address, new IOException()) }
+                receiveMessage(_) >> { throw new MongoSocketReadException('', SERVER_ID.address, new IOException()) }
+                sendAndReceive(_, _, _) >> { throw new MongoSocketReadException('', SERVER_ID.address, new IOException()) }
+                getDescription() >> {
+                    new ConnectionDescription(SERVER_ID);
+                }
+            }
+        }
+
+        pool = new DefaultConnectionPool(SERVER_ID, mockConnectionFactory, builder().maxSize(2).maxWaitQueueSize(1).build())
+        pool.start();
+
+        when:
+        def c1 = pool.get()
+        def c2 = pool.get()
+
+        and:
+        c2.sendMessage(Collections.<ByteBuf> emptyList(), 1)
+
+        then:
+        thrown(MongoSocketWriteException)
+
+        and:
+        c1.close()
+        c2.close()
+        pool.get().close()
+
+        then:
+        numberOfConnectionsCreated == 3
+
+        when:
+        c1 = pool.get()
+        c2 = pool.get()
+
+        and:
+        c2.receiveMessage(1)
+
+        then:
+        thrown(MongoSocketReadException)
+
+        and:
+        c1.close()
+        c2.close()
+        pool.get().close()
+
+        then:
+        numberOfConnectionsCreated == 5
+
+        when:
+        c1 = pool.get()
+        c2 = pool.get()
+
+        and:
+        c2.sendAndReceive(new CommandMessage(new MongoNamespace('test.coll'), new BsonDocument('ping', new BsonInt32(1)),
+                new NoOpFieldNameValidator(), primary(), MessageSettings.builder().build()),
+                new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        thrown(MongoSocketReadException)
+
+        and:
+        c1.close()
+        c2.close()
+        pool.get().close()
+
+        then:
+        numberOfConnectionsCreated == 7
+    }
+
+    def 'should expire all connection after exception asynchronously'() {
+        given:
+        int numberOfConnectionsCreated = 0
+
+        def mockConnectionFactory = Mock(InternalConnectionFactory)
+        mockConnectionFactory.create(_) >> {
+            numberOfConnectionsCreated++
+            Mock(InternalConnection) {
+                sendMessageAsync(_, _, _) >> {
+                    it[2].onResult(null, new MongoSocketWriteException('', SERVER_ID.address, new IOException()))
+                };
+                receiveMessageAsync(_, _) >> {
+                    it[1].onResult(null, new MongoSocketReadException('', SERVER_ID.address, new IOException()))
+                };
+                sendAndReceiveAsync(_, _, _, _) >> {
+                    it[3].onResult(null, new MongoSocketReadException('', SERVER_ID.address, new IOException()))
+                };
+                getDescription() >> {
+                    new ConnectionDescription(SERVER_ID);
+                }
+            }
+        }
+
+        pool = new DefaultConnectionPool(SERVER_ID, mockConnectionFactory,
+                                         builder().maxSize(2).maxWaitQueueSize(1).build())
+        pool.start();
+
+        when:
+        def c1 = pool.get()
+        def c2 = pool.get()
+
+        and:
+        def e;
+        c2.sendMessageAsync(Collections.<ByteBuf> emptyList(), 1) {
+            result, t -> e = t
+        }
+
+        then:
+        e instanceof MongoSocketWriteException
+
+        and:
+        c1.close()
+        c2.close()
+        pool.get().close()
+
+        then:
+        numberOfConnectionsCreated == 3
+
+        when:
+        c1 = pool.get()
+        c2 = pool.get()
+
+        and:
+        c2.receiveMessageAsync(1) {
+            result, t -> e = t
+        }
+
+        then:
+        e instanceof MongoSocketReadException
+
+        and:
+        c1.close()
+        c2.close()
+        pool.get().close()
+
+        then:
+        numberOfConnectionsCreated == 5
+
+        when:
+        c1 = pool.get()
+        c2 = pool.get()
+
+        and:
+        c2.sendAndReceiveAsync(new CommandMessage(new MongoNamespace('test.coll'),
+                new BsonDocument('ping', new BsonInt32(1)), new NoOpFieldNameValidator(), primary(),
+                MessageSettings.builder().build()),
+                new BsonDocumentCodec(), NoOpSessionContext.INSTANCE) {
+            result, t -> e = t
+        }
+
+        then:
+        e instanceof MongoSocketReadException
+
+        and:
+        c1.close()
+        c2.close()
+        pool.get().close()
+
+        then:
+        numberOfConnectionsCreated == 7
+    }
+
+    def 'should have size of 0 with default settings'() {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(10).maintenanceInitialDelay(5, MINUTES).build())
+        pool.start();
+
+        when:
+        pool.doMaintenance()
+
+        then:
+        connectionFactory.createdConnections.size() == 0
+    }
+
+    @Category(Slow)
+    def 'should ensure min pool size after maintenance task runs'() {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(10).minSize(5).maintenanceInitialDelay(5, MINUTES).build())
+        pool.start();
+
+        when: 'the maintenance tasks runs'
+        pool.doMaintenance()
+        //not cool - but we have no way of being notified that the maintenance task has finished
+        Thread.sleep(500)
+
+        then: 'it ensures the minimum size of the pool'
+        connectionFactory.createdConnections.size() == 5
+        connectionFactory.createdConnections.get(0).opened()  // if the first one is opened, they all should be
+
+        when: 'the pool is invalidated and the maintenance tasks runs'
+        pool.invalidate()
+        pool.doMaintenance()
+        //not cool - but we have no way of being notified that the maintenance task has finished
+        Thread.sleep(500)
+
+        then: 'it prunes the existing connections and again ensures the minimum size of the pool'
+        connectionFactory.createdConnections.size() == 10
+        connectionFactory.createdConnections.get(0).opened()  // if the first one is opened, they all should be
+    }
+
+    def 'should invoke connection pool opened event'() {
+        given:
+        def listener = Mock(ConnectionPoolListener)
+        def settings = builder().maxSize(10).minSize(5).addConnectionPoolListener(listener).build()
+
+        when:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, settings)
+
+        then:
+        1 * listener.connectionPoolOpened { it.serverId == SERVER_ID && it.settings == settings }
+    }
+
+    def 'should invoke connection pool closed event'() {
+        given:
+        def listener = Mock(ConnectionPoolListener)
+        def settings = builder().maxSize(10).minSize(5).addConnectionPoolListener(listener).build()
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, settings)
+        when:
+        pool.close()
+
+        then:
+        1 * listener.connectionPoolClosed { it.serverId == SERVER_ID }
+    }
+
+    def 'should fire connection added to pool event'() {
+        given:
+        def listener = Mock(ConnectionPoolListener)
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(10).maxWaitQueueSize(1)
+                .addConnectionPoolListener(listener).build())
+
+        when:
+        pool.get()
+
+        then:
+        1 * listener.connectionAdded { it.connectionId.serverId == SERVER_ID }
+    }
+
+    def 'should fire connection removed from pool event'() {
+        given:
+        def listener = Mock(ConnectionPoolListener)
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(10).maxWaitQueueSize(1)
+                .addConnectionPoolListener(listener).build())
+        def connection = pool.get()
+        connection.close()
+
+        when:
+        pool.close()
+
+        then:
+        1 * listener.connectionRemoved { it.connectionId.serverId == SERVER_ID }
+    }
+
+    def 'should fire connection pool events on check out and check in'() {
+        given:
+        def listener = Mock(ConnectionPoolListener)
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(1).maxWaitQueueSize(1)
+                .addConnectionPoolListener(listener).build())
+        def connection = pool.get()
+        connection.close()
+
+        when:
+        connection = pool.get()
+
+        then:
+        1 * listener.waitQueueEntered { it.serverId == SERVER_ID }
+        1 * listener.connectionCheckedOut { it.connectionId.serverId == SERVER_ID }
+        1 * listener.waitQueueExited { it.serverId == SERVER_ID }
+
+        when:
+        connection.close()
+
+        then:
+        1 * listener.connectionCheckedIn { it.connectionId.serverId == SERVER_ID }
+    }
+
+    def 'should continue to fire events after pool is closed'() {
+        def listener = Mock(ConnectionPoolListener)
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory, builder().maxSize(1).maxWaitQueueSize(1)
+                .addConnectionPoolListener(listener).build())
+        def connection = pool.get()
+        pool.close()
+
+        when:
+        connection.close()
+
+        then:
+        1 * listener.connectionCheckedIn { it.connectionId.serverId == SERVER_ID }
+        1 * listener.connectionRemoved { it.connectionId.serverId == SERVER_ID }
+    }
+
+    def 'should select connection asynchronously if one is immediately available'() {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).build())
+
+        expect:
+        selectConnectionAsyncAndGet(pool).opened()
+    }
+
+    def 'should select connection asynchronously if one is not immediately available'() {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).build())
+
+        when:
+        def connection = pool.get()
+        def connectionLatch = selectConnectionAsync(pool)
+        connection.close()
+
+        then:
+        connectionLatch.get()
+    }
+
+    def 'when getting a connection asynchronously should send MongoTimeoutException to callback after timeout period'() {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(2).maxWaitTime(5, MILLISECONDS).build())
+
+        pool.get()
+        def firstConnectionLatch = selectConnectionAsync(pool)
+        def secondConnectionLatch = selectConnectionAsync(pool)
+
+        when:
+        firstConnectionLatch.get()
+
+        then:
+        thrown(MongoTimeoutException)
+
+        when:
+        secondConnectionLatch.get()
+
+        then:
+        thrown(MongoTimeoutException)
+    }
+
+    def 'when getting a connection asynchronously should send MongoWaitQueueFullException to callback if there are too many waiters'() {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                                         builder().maxSize(1).maxWaitQueueSize(1).build())
+
+        when:
+        pool.get()
+        selectConnectionAsync(pool)
+        selectConnectionAsyncAndGet(pool)
+
+        then:
+        thrown(MongoWaitQueueFullException)
+    }
+
+    def 'invalidate should do nothing when pool is closed'() {
+        given:
+        pool = new DefaultConnectionPool(SERVER_ID, connectionFactory,
+                builder().maxSize(1).maxWaitQueueSize(1).build())
+        pool.close()
+
+        when:
+        pool.invalidate()
+
+        then:
+        noExceptionThrown()
+    }
+
+    def selectConnectionAsyncAndGet(DefaultConnectionPool pool) {
+        selectConnectionAsync(pool).get()
+    }
+
+    def selectConnectionAsync(DefaultConnectionPool pool) {
+        def serverLatch = new ConnectionLatch()
+        pool.getAsync { InternalConnection result, MongoException e ->
+            serverLatch.connection = result
+            serverLatch.throwable = e
+            serverLatch.latch.countDown()
+        }
+        serverLatch
+    }
+
+    class ConnectionLatch {
+        CountDownLatch latch = new CountDownLatch(1)
+        InternalConnection connection
+        Throwable throwable
+
+        def get() {
+            latch.await()
+            if (throwable != null) {
+                throw throwable
+            }
+            connection
+        }
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitorSpecification.groovy
new file mode 100644
index 00000000000..bca5aee9494
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultDnsSrvRecordMonitorSpecification.groovy
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoConfigurationException
+import com.mongodb.MongoException
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ClusterType
+import com.mongodb.internal.dns.DnsResolver
+import spock.lang.Specification
+
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class DefaultDnsSrvRecordMonitorSpecification extends Specification {
+    def 'should resolve initial hosts'() {
+        given:
+        def hostName = 'test1.test.build.10gen.cc'
+        def resolvedHostOne = 'localhost.test.build.10gen.cc:27017'
+        def resolvedHostTwo = 'localhost.test.build.10gen.cc:27018'
+        def expectedResolvedHosts = [resolvedHostOne, resolvedHostTwo]
+        def dnsSrvRecordInitializer = new TestDnsSrvRecordInitializer(ClusterType.REPLICA_SET, 1)
+        def dnsResolver = Mock(DnsResolver) {
+            1 * resolveHostFromSrvRecords(hostName) >> expectedResolvedHosts
+        }
+        def monitor = new DefaultDnsSrvRecordMonitor(hostName, 1, 10000, dnsSrvRecordInitializer, new ClusterId(), dnsResolver)
+
+        when:
+        monitor.start()
+        def hostsLists = dnsSrvRecordInitializer.waitForInitializedHosts()
+
+        then:
+        hostsLists == [[new ServerAddress(resolvedHostOne), new ServerAddress(resolvedHostTwo)] as Set]
+
+        cleanup:
+        monitor.close()
+    }
+
+    def 'should discover new resolved hosts'() {
+        given:
+        def hostName = 'test1.test.build.10gen.cc'
+        def resolvedHostOne = 'localhost.test.build.10gen.cc:27017'
+        def resolvedHostTwo = 'localhost.test.build.10gen.cc:27018'
+        def resolvedHostThree = 'localhost.test.build.10gen.cc:27019'
+        def expectedResolvedHostsOne = [resolvedHostOne, resolvedHostTwo]
+        def expectedResolvedHostsTwo = [resolvedHostTwo, resolvedHostThree]
+        def dnsSrvRecordInitializer = new TestDnsSrvRecordInitializer(ClusterType.SHARDED, 2)
+        def dnsResolver = Mock(DnsResolver) {
+            _ * resolveHostFromSrvRecords(hostName) >>> [expectedResolvedHostsOne, expectedResolvedHostsTwo]
+        }
+        def monitor = new DefaultDnsSrvRecordMonitor(hostName, 1, 1, dnsSrvRecordInitializer, new ClusterId(), dnsResolver)
+
+        when:
+        monitor.start()
+        def hostsLists = dnsSrvRecordInitializer.waitForInitializedHosts()
+
+        then:
+        hostsLists == [[new ServerAddress(resolvedHostOne), new ServerAddress(resolvedHostTwo)] as Set,
+                       [new ServerAddress(resolvedHostTwo), new ServerAddress(resolvedHostThree)] as Set]
+
+        cleanup:
+        monitor.close()
+    }
+
+    def 'should initialize listener with exception'() {
+        given:
+        def hostName = 'test1.test.build.10gen.cc'
+        def dnsSrvRecordInitializer = new TestDnsSrvRecordInitializer(ClusterType.UNKNOWN, 1)
+        def dnsResolver = Mock(DnsResolver) {
+            _ * resolveHostFromSrvRecords(hostName) >> {
+                throw initializationException
+            }
+        }
+        def monitor = new DefaultDnsSrvRecordMonitor(hostName, 1, 10000, dnsSrvRecordInitializer, new ClusterId(), dnsResolver)
+
+        when:
+        monitor.start()
+        def initializationExceptionList = dnsSrvRecordInitializer.waitForInitializedException()
+        if (!(initializationException instanceof MongoException)) {
+            initializationExceptionList[0] = initializationExceptionList[0].getCause()
+        }
+
+        then:
+        initializationExceptionList == [initializationException]
+
+        cleanup:
+        monitor.close()
+
+        where:
+        initializationException << [new MongoConfigurationException('test'), new NullPointerException()]
+    }
+
+    def 'should not initialize listener with exception after successful initialization'() {
+        given:
+        def hostName = 'test1.test.build.10gen.cc'
+        def resolvedHostListOne = ['localhost.test.build.10gen.cc:27017']
+        def resolvedHostListTwo = ['localhost.test.build.10gen.cc:27018']
+        def dnsSrvRecordInitializer = new TestDnsSrvRecordInitializer(ClusterType.SHARDED, 2)
+        def dnsResolver = Mock(DnsResolver) {
+            _ * resolveHostFromSrvRecords(hostName) >> resolvedHostListOne >> { throw initializationException } >> resolvedHostListTwo
+        }
+        def monitor = new DefaultDnsSrvRecordMonitor(hostName, 1, 1, dnsSrvRecordInitializer, new ClusterId(), dnsResolver)
+
+        when:
+        monitor.start()
+        def initializedExceptionList = dnsSrvRecordInitializer.waitForInitializedException()
+
+        then:
+        initializedExceptionList == []
+
+        cleanup:
+        monitor.close()
+
+        where:
+        initializationException << [new MongoConfigurationException('test'), new NullPointerException()]
+    }
+
+    // Can't use a mock because we need to coordinate the monitor thread with the test via thread synchronization
+    static class TestDnsSrvRecordInitializer implements DnsSrvRecordInitializer {
+
+        ClusterType clusterType
+        List<Collection<ServerAddress>> hostsList = []
+        List<MongoException> initializationExceptionList = []
+        CountDownLatch latch
+
+        TestDnsSrvRecordInitializer(ClusterType clusterType, int expectedInitializations) {
+            this.clusterType = clusterType
+            latch = new CountDownLatch(expectedInitializations)
+        }
+
+        List<Collection<ServerAddress>> waitForInitializedHosts() {
+            if (!latch.await(5, TimeUnit.SECONDS)) {
+                throw new AssertionError('Timeout waiting for latch')
+            }
+            hostsList
+        }
+
+        List<MongoException> waitForInitializedException() {
+            if (!latch.await(5, TimeUnit.SECONDS)) {
+                throw new AssertionError('Timeout waiting for latch')
+            }
+            initializationExceptionList
+        }
+
+        @Override
+        void initialize(final Collection<ServerAddress> hosts) {
+            if (latch.count > 0) {
+                hostsList.add(hosts)
+                latch.countDown()
+            }
+        }
+
+        @Override
+        void initialize(final MongoException initializationException) {
+            if (latch.count > 0) {
+                initializationExceptionList.add(initializationException)
+                latch.countDown()
+            }
+        }
+
+        @Override
+        ClusterType getClusterType() {
+            clusterType
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerConnectionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerConnectionSpecification.groovy
new file mode 100644
index 00000000000..333d5b65681
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerConnectionSpecification.groovy
@@ -0,0 +1,439 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
+import com.mongodb.WriteConcernResult
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.bulk.DeleteRequest
+import com.mongodb.bulk.InsertRequest
+import com.mongodb.bulk.UpdateRequest
+import com.mongodb.bulk.WriteRequest
+import com.mongodb.connection.ClusterConnectionMode
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.QueryResult
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerVersion
+import com.mongodb.diagnostics.logging.Logger
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.codecs.BsonDocumentCodec
+import spock.lang.Shared
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.compare
+import static com.mongodb.connection.ServerType.SHARD_ROUTER
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback
+
+class DefaultServerConnectionSpecification extends Specification {
+    def namespace = new MongoNamespace('test', 'test')
+    def internalConnection = Mock(InternalConnection)
+    def callback = errorHandlingCallback(Mock(SingleResultCallback), Mock(Logger))
+    @Shared
+    def standaloneConnectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+            new ServerVersion(3, 0), 3, STANDALONE, 100, 100, 100, [])
+    @Shared
+    def mongosConnectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+            new ServerVersion(3, 0), 3, SHARD_ROUTER, 100, 100, 100, [])
+
+    def 'should execute insert protocol'() {
+        given:
+        def insertRequest = new InsertRequest(new BsonDocument())
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({ compare(new InsertProtocol(namespace, true, insertRequest), it) }, internalConnection) >> {
+                WriteConcernResult.unacknowledged()
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        def result = connection.insert(namespace, true, insertRequest)
+
+        then:
+        result == WriteConcernResult.unacknowledged()
+    }
+
+    def 'should execute update protocol'() {
+        given:
+        def updateRequest = new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.REPLACE)
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({ compare(new UpdateProtocol(namespace, true, updateRequest), it) }, internalConnection) >> {
+                WriteConcernResult.unacknowledged()
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        def result = connection.update(namespace, true,  updateRequest)
+
+        then:
+        result == WriteConcernResult.unacknowledged()
+    }
+
+    def 'should execute delete protocol'() {
+        given:
+        def deleteRequest = new DeleteRequest(new BsonDocument())
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({ compare(new DeleteProtocol(namespace, true, deleteRequest), it) }, internalConnection) >> {
+                WriteConcernResult.unacknowledged()
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        def result = connection.delete(namespace, true, deleteRequest)
+
+        then:
+        result == WriteConcernResult.unacknowledged()
+    }
+
+    def 'should execute command protocol with slaveok'() {
+        given:
+        def command = new BsonDocument('ismaster', new BsonInt32(1))
+        def validator = new NoOpFieldNameValidator()
+        def codec = new BsonDocumentCodec()
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({
+                compare(new CommandProtocolImpl('test', command, validator, expectedReadPreference, codec), it) },
+                    internalConnection, NoOpSessionContext.INSTANCE) >> {
+                new BsonDocument()
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        def result = connection.command('test', command, slaveOk, validator, codec)
+
+        then:
+        result == new BsonDocument()
+
+        where:
+        slaveOk  | expectedReadPreference
+        true     | ReadPreference.secondaryPreferred()
+        false    | ReadPreference.primary()
+    }
+
+    def 'should set slaveOk when executing command protocol on connection in SINGLE connection mode'() {
+        given:
+        def command = new BsonDocument('ismaster', new BsonInt32(1))
+        def validator = new NoOpFieldNameValidator()
+        def codec = new BsonDocumentCodec()
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({
+                compare(new CommandProtocolImpl('test', command, validator, expectedReadPreference, codec, true, null, null,
+                        ClusterConnectionMode.SINGLE), it) },
+                    internalConnection, NoOpSessionContext.INSTANCE) >> {
+                new BsonDocument()
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
+        internalConnection.description >> connectionDescription
+
+        when:
+        def result = connection.command('test', command, false, validator, codec)
+
+        then:
+        result == new BsonDocument()
+
+        where:
+        connectionDescription           | expectedSlaveOk | expectedReadPreference
+        standaloneConnectionDescription | true            | ReadPreference.secondaryPreferred()
+        mongosConnectionDescription     | false           | ReadPreference.primary()
+    }
+
+    def 'should execute query protocol'() {
+        given:
+        def decoder = new BsonDocumentCodec()
+        def query = new BsonDocument('x', BsonBoolean.TRUE)
+        def fields = new BsonDocument('y', new BsonInt32(1))
+        def expectedResult = new QueryResult<>(namespace, [], 0, new ServerAddress())
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({
+                compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
+                    .slaveOk(slaveOk)
+                    .tailableCursor(false)
+                    .awaitData(true)
+                    .noCursorTimeout(false)
+                    .partial(true)
+                    .oplogReplay(false), it) }, internalConnection) >> {
+                expectedResult
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        def result = connection.query(namespace, query, fields, 1, 2, slaveOk, false, true, false, true, false, decoder)
+
+        then:
+        result == expectedResult
+
+        where:
+        slaveOk << [true, false]
+    }
+
+    def 'should set slaveOk when executing query protocol on connection in SINGLE connection mode'() {
+        given:
+        def decoder = new BsonDocumentCodec()
+        def query = new BsonDocument('x', BsonBoolean.TRUE)
+        def fields = new BsonDocument('y', new BsonInt32(1))
+        def expectedResult = new QueryResult<>(namespace, [], 0, new ServerAddress())
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({
+                compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
+                    .slaveOk(expectedSlaveOk)
+                    .tailableCursor(false)
+                    .awaitData(true)
+                    .noCursorTimeout(false)
+                    .partial(true)
+                    .oplogReplay(false), it) }, internalConnection) >> {
+                expectedResult
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
+        internalConnection.description >> connectionDescription
+
+        when:
+        def result = connection.query(namespace, query, fields, 1, 2, false, false, true, false, true, false, decoder)
+
+        then:
+        result == expectedResult
+
+        where:
+        connectionDescription           | expectedSlaveOk
+        standaloneConnectionDescription | true
+        mongosConnectionDescription     | false
+    }
+
+    def 'should execute getmore protocol'() {
+        given:
+        def codec = new BsonDocumentCodec()
+        def expectedResult = new QueryResult<>(namespace, [], 0, new ServerAddress())
+        def executor = Mock(ProtocolExecutor) {
+            1 * execute({ compare(new GetMoreProtocol(namespace, 1000L, 1, codec), it) }, internalConnection) >> {
+                expectedResult
+            }
+        }
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        def result = connection.getMore(namespace, 1000L, 1, codec)
+
+        then:
+        result == expectedResult
+    }
+
+    def 'should execute kill cursor protocol'() {
+        given:
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.killCursor([5])
+
+        then:
+        1 * executor.execute({ compare(new KillCursorProtocol(null, [5]), it) }, internalConnection)
+
+        when:
+        connection.killCursor(namespace, [5])
+
+        then:
+        1 * executor.execute({ compare(new KillCursorProtocol(namespace, [5]), it) }, internalConnection)
+    }
+
+    def 'should execute insert protocol asynchronously'() {
+        given:
+        def insertRequest = new InsertRequest(new BsonDocument())
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.insertAsync(namespace, true, insertRequest, callback)
+
+        then:
+        1 * executor.executeAsync({ compare(new InsertProtocol(namespace, true, insertRequest), it) }, internalConnection,
+                callback)
+    }
+
+    def 'should execute update protocol asynchronously'() {
+        given:
+        def updateRequest = new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.REPLACE)
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.updateAsync(namespace, true, updateRequest, callback)
+
+        then:
+        1 * executor.executeAsync({ compare(new UpdateProtocol(namespace, true, updateRequest), it) },
+                                  internalConnection, callback)
+    }
+
+    def 'should execute delete protocol asynchronously'() {
+        given:
+        def deleteRequest = new DeleteRequest(new BsonDocument())
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.deleteAsync(namespace, true, deleteRequest, callback)
+
+        then:
+        1 * executor.executeAsync({ compare(new DeleteProtocol(namespace, true, deleteRequest), it) }, internalConnection,
+                callback)
+    }
+
+    def 'should execute command protocol asynchronously'() {
+        given:
+        def command = new BsonDocument('ismaster', new BsonInt32(1))
+        def validator = new NoOpFieldNameValidator()
+        def codec = new BsonDocumentCodec()
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.commandAsync('test', command, slaveOk, validator, codec, callback)
+
+        then:
+        1 * executor.executeAsync({
+            compare(new CommandProtocolImpl('test', command, validator, expectedReadPreference, codec), it)
+        }, internalConnection, NoOpSessionContext.INSTANCE, callback)
+
+        where:
+        slaveOk  | expectedReadPreference
+        true     | ReadPreference.secondaryPreferred()
+        false    | ReadPreference.primary()
+    }
+
+    def 'should set slaveOk when executing command protocol on connection in SINGLE connection mode asynchronously'() {
+        given:
+        def command = new BsonDocument('ismaster', new BsonInt32(1))
+        def validator = new NoOpFieldNameValidator()
+        def codec = new BsonDocumentCodec()
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
+        internalConnection.description >> connectionDescription
+
+        when:
+        connection.commandAsync('test', command, false, validator, codec, callback)
+
+        then:
+        1 * executor.executeAsync({
+            compare(new CommandProtocolImpl('test', command, validator, expectedReadPreference, codec, true, null, null,
+                    ClusterConnectionMode.SINGLE), it)
+        }, internalConnection, NoOpSessionContext.INSTANCE, callback)
+
+        where:
+        connectionDescription           | expectedSlaveOk  | expectedReadPreference
+        standaloneConnectionDescription | true             | ReadPreference.secondaryPreferred()
+        mongosConnectionDescription     | false            | ReadPreference.primary()
+    }
+
+    def 'should execute query protocol asynchronously'() {
+        given:
+        def decoder = new BsonDocumentCodec()
+        def query = new BsonDocument('x', BsonBoolean.TRUE)
+        def fields = new BsonDocument('y', new BsonInt32(1))
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.queryAsync(namespace, query, fields, 1, 2, slaveOk, false, true, false, true, false, decoder, callback)
+
+        then:
+        1 * executor.executeAsync({
+                                      compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
+                                               .slaveOk(slaveOk)
+                                               .tailableCursor(false)
+                                               .awaitData(true)
+                                               .noCursorTimeout(false)
+                                               .partial(true)
+                                               .oplogReplay(false)
+                                       , it)
+                             }, internalConnection, callback)
+
+        where:
+        slaveOk << [true, false]
+    }
+
+    def 'should set slaveOk when executing query protocol on connection in SINGLE connection mode asynchronously'() {
+        given:
+        def decoder = new BsonDocumentCodec()
+        def query = new BsonDocument('x', BsonBoolean.TRUE)
+        def fields = new BsonDocument('y', new BsonInt32(1))
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.SINGLE)
+        internalConnection.description >> connectionDescription
+
+        when:
+        connection.queryAsync(namespace, query, fields, 1, 2, false, false, true, false, true, false, decoder, callback)
+
+        then:
+        1 * executor.executeAsync({
+                                      compare(new QueryProtocol(namespace, 2, 1, query, fields, decoder)
+                                               .slaveOk(expectedSlaveOk)
+                                               .tailableCursor(false)
+                                               .awaitData(true)
+                                               .noCursorTimeout(false)
+                                               .partial(true)
+                                               .oplogReplay(false)
+                                       , it)
+                             }, internalConnection, callback)
+
+        where:
+        connectionDescription           | expectedSlaveOk
+        standaloneConnectionDescription | true
+        mongosConnectionDescription     | false
+    }
+
+    def 'should execute getmore protocol asynchronously'() {
+        given:
+        def codec = new BsonDocumentCodec()
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.getMoreAsync(namespace, 1000L, 1, codec, callback)
+
+        then:
+        1 * executor.executeAsync({ compare(new GetMoreProtocol(namespace, 1000L, 1, codec), it) }, internalConnection, callback)
+    }
+
+    def 'should execute kill cursor protocol asynchronously'() {
+        given:
+        def executor = Mock(ProtocolExecutor)
+        def connection = new DefaultServerConnection(internalConnection, executor, ClusterConnectionMode.MULTIPLE)
+
+        when:
+        connection.killCursorAsync([5], callback)
+
+        then:
+        1 * executor.executeAsync({ compare(new KillCursorProtocol(null, [5]), it) }, internalConnection, callback)
+
+        when:
+        connection.killCursorAsync(namespace, [5], callback)
+
+        then:
+        1 * executor.executeAsync({ compare(new KillCursorProtocol(namespace, [5]), it) }, internalConnection, callback)
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/DefaultServerMonitorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerMonitorSpecification.groovy
similarity index 86%
rename from driver-core/src/test/unit/com/mongodb/connection/DefaultServerMonitorSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerMonitorSpecification.groovy
index 6552167a1da..443d09e23a2 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/DefaultServerMonitorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerMonitorSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,15 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.MongoSocketReadTimeoutException
 import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerSettings
 import com.mongodb.event.ServerHeartbeatFailedEvent
 import com.mongodb.event.ServerHeartbeatStartedEvent
 import com.mongodb.event.ServerHeartbeatSucceededEvent
@@ -30,8 +35,6 @@ import java.nio.ByteBuffer
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply
-
 @SuppressWarnings('BusyWait')
 class DefaultServerMonitorSpecification extends Specification {
 
@@ -43,24 +46,23 @@ class DefaultServerMonitorSpecification extends Specification {
         def changeListener = new ChangeListener<ServerDescription>() {
             @Override
             void stateChanged(final ChangeEvent<ServerDescription> event) {
-                stateChanged = true;
+                stateChanged = true
             }
         }
         def internalConnectionFactory = Mock(InternalConnectionFactory) {
             create(_) >> {
                 Mock(InternalConnection) {
-                    open() >> { sleep(100); }
+                    open() >> { sleep(100) }
                 }
             }
         }
-        monitor = new DefaultServerMonitor(new ServerId(new ClusterId(), new ServerAddress()),
-                ServerSettings.builder().addServerListener(new NoOpServerListener()).build(), changeListener, internalConnectionFactory,
-                new TestConnectionPool())
+        monitor = new DefaultServerMonitor(new ServerId(new ClusterId(), new ServerAddress()), ServerSettings.builder().build(),
+                new ClusterClock(), changeListener, internalConnectionFactory, new TestConnectionPool())
         monitor.start()
 
         when:
         monitor.close()
-        monitor.monitorThread.join();
+        monitor.monitorThread.join()
 
         then:
         !stateChanged
@@ -76,8 +78,8 @@ class DefaultServerMonitorSpecification extends Specification {
 
         def latch = new CountDownLatch(1)
         def startedEvent
-        def succeededEvent;
-        def failedEvent;
+        def succeededEvent
+        def failedEvent
 
         def serverMonitorListener = new ServerMonitorListener() {
             @Override
@@ -126,15 +128,15 @@ class DefaultServerMonitorSpecification extends Specification {
 
                     sendMessage(_, _) >> { }
 
-                    receiveMessage(_) >> { int responseTo ->
-                        buildSuccessfulReply(responseTo, isMasterResponse)
+                    sendAndReceive(_, _, _) >> {
+                        BsonDocument.parse(isMasterResponse)
                     }
                 }
             }
         }
         monitor = new DefaultServerMonitor(new ServerId(new ClusterId(), new ServerAddress()),
                 ServerSettings.builder().heartbeatFrequency(1, TimeUnit.HOURS).addServerMonitorListener(serverMonitorListener).build(),
-                changeListener, internalConnectionFactory, new TestConnectionPool())
+                new ClusterClock(), changeListener, internalConnectionFactory, new TestConnectionPool())
 
         when:
         monitor.start()
@@ -161,8 +163,8 @@ class DefaultServerMonitorSpecification extends Specification {
 
         def latch = new CountDownLatch(1)
         def startedEvent
-        def succeededEvent;
-        def failedEvent;
+        def succeededEvent
+        def failedEvent
 
         def serverMonitorListener = new ServerMonitorListener() {
             @Override
@@ -199,9 +201,7 @@ class DefaultServerMonitorSpecification extends Specification {
                         connectionDescription
                     }
 
-                    sendMessage(_, _) >> { }
-
-                    receiveMessage(_) >> {
+                    sendAndReceive(_, _, _) >> {
                         throw exception
                     }
                 }
@@ -209,7 +209,7 @@ class DefaultServerMonitorSpecification extends Specification {
         }
         monitor = new DefaultServerMonitor(new ServerId(new ClusterId(), new ServerAddress()),
                 ServerSettings.builder().heartbeatFrequency(1, TimeUnit.HOURS).addServerMonitorListener(serverMonitorListener).build(),
-                changeListener, internalConnectionFactory, new TestConnectionPool())
+                new ClusterClock(), changeListener, internalConnectionFactory, new TestConnectionPool())
 
         when:
         monitor.start()
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy
new file mode 100644
index 00000000000..3ffe7aa4247
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultServerSpecification.groovy
@@ -0,0 +1,599 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoNodeIsRecoveringException
+import com.mongodb.MongoNotPrimaryException
+import com.mongodb.MongoSecurityException
+import com.mongodb.MongoSocketException
+import com.mongodb.MongoSocketOpenException
+import com.mongodb.MongoSocketReadException
+import com.mongodb.MongoSocketReadTimeoutException
+import com.mongodb.MongoSocketWriteException
+import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
+import com.mongodb.WriteConcernResult
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.bulk.InsertRequest
+import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.Connection
+import com.mongodb.connection.ServerId
+import com.mongodb.event.CommandListener
+import com.mongodb.event.ServerListener
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import com.mongodb.session.SessionContext
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.FieldNameValidator
+import org.bson.codecs.BsonDocumentCodec
+import spock.lang.Specification
+
+import java.util.concurrent.CountDownLatch
+
+import static com.mongodb.MongoCredential.createCredential
+import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
+import static com.mongodb.connection.ClusterConnectionMode.SINGLE
+import static com.mongodb.internal.event.EventListenerHelper.NO_OP_SERVER_LISTENER
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class DefaultServerSpecification extends Specification {
+    private static final FieldNameValidator NO_OP_FIELD_NAME_VALIDATOR = new NoOpFieldNameValidator()
+    def serverId = new ServerId(new ClusterId(), new ServerAddress())
+
+    def 'should get a connection'() {
+        given:
+        def connectionPool = Stub(ConnectionPool)
+        def connectionFactory = Mock(ConnectionFactory)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Stub(ServerMonitor)
+        def internalConnection = Stub(InternalConnection)
+        def connection = Stub(Connection)
+        def clusterTime = new ClusterClock()
+
+        serverMonitorFactory.create(_, _) >> { serverMonitor }
+        connectionPool.get() >> { internalConnection }
+        def server = new DefaultServer(serverId, mode, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+
+        when:
+        def receivedConnection = server.getConnection()
+
+        then:
+        receivedConnection
+        1 * connectionFactory.create(internalConnection, _, mode) >> connection
+
+        where:
+        mode << [SINGLE, MULTIPLE]
+    }
+
+    def 'should get a connection asynchronously'() {
+        given:
+        def connectionPool = Stub(ConnectionPool)
+        def connectionFactory = Mock(ConnectionFactory)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Stub(ServerMonitor)
+        def internalConnection = Stub(InternalConnection)
+        def connection = Stub(AsyncConnection)
+        def clusterTime = new ClusterClock()
+
+        connectionPool.getAsync(_) >> {
+            it[0].onResult(internalConnection, null)
+        }
+        serverMonitorFactory.create(_, _) >> { serverMonitor }
+
+        def server = new DefaultServer(serverId, mode, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+
+        when:
+        def latch = new CountDownLatch(1)
+        def receivedConnection = null
+        def receivedThrowable = null
+        server.getConnectionAsync { result, throwable -> receivedConnection = result; receivedThrowable = throwable; latch.countDown() }
+        latch.await()
+
+        then:
+        receivedConnection
+        !receivedThrowable
+        1 * connectionFactory.createAsync(_, _, mode) >> connection
+
+        where:
+        mode << [SINGLE, MULTIPLE]
+    }
+
+    def 'invalidate should invoke server listeners'() {
+        given:
+        def serverListener = Mock(ServerListener)
+        def clusterTime = new ClusterClock()
+        def connectionFactory = Mock(ConnectionFactory)
+        def server = new DefaultServer(serverId, SINGLE, new TestConnectionPool(), connectionFactory,
+                new TestServerMonitorFactory(serverId), serverListener, null, clusterTime)
+
+        when:
+        server.invalidate()
+
+        then:
+        1 * serverListener.serverDescriptionChanged(_)
+
+        cleanup:
+        server?.close()
+    }
+
+    def 'invalidate should do nothing when server is closed'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def connectionFactory = Mock(ConnectionFactory)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        connectionPool.get() >> { throw exceptionToThrow }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+        server.close()
+
+        when:
+        server.invalidate()
+
+        then:
+        0 * connectionPool.invalidate()
+        0 * serverMonitor.connect()
+    }
+
+    def 'failed open should invalidate the server'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def connectionFactory = Mock(ConnectionFactory)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        connectionPool.get() >> { throw exceptionToThrow }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+
+        when:
+        server.getConnection()
+
+        then:
+        def e = thrown(MongoException)
+        e.is(exceptionToThrow)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+
+        where:
+        exceptionToThrow << [
+                new MongoSocketOpenException('open failed', new ServerAddress(), new IOException()),
+                new MongoSocketWriteException('Write failed', new ServerAddress(), new IOException()),
+                new MongoSocketReadException('Read failed', new ServerAddress(), new IOException()),
+                new MongoSocketReadTimeoutException('Read timed out', new ServerAddress(), new IOException()),
+        ]
+    }
+
+    def 'failed authentication should invalidate the connection pool'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def connectionFactory = Mock(ConnectionFactory)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        connectionPool.get() >> { throw exceptionToThrow }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+
+        when:
+        server.getConnection()
+
+        then:
+        def e = thrown(MongoSecurityException)
+        e.is(exceptionToThrow)
+        1 * connectionPool.invalidate()
+        0 * serverMonitor.connect()
+
+        where:
+        exceptionToThrow << [
+                new MongoSecurityException(createCredential('jeff', 'admin', '123'.toCharArray()), 'Auth failed'),
+        ]
+    }
+
+    def 'failed open should invalidate the server asynchronously'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def connectionFactory = Mock(ConnectionFactory)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        connectionPool.getAsync(_) >> { it[0].onResult(null, exceptionToThrow) }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory,
+                serverMonitorFactory, NO_OP_SERVER_LISTENER, null, clusterTime)
+
+        when:
+        def latch = new CountDownLatch(1)
+        def receivedConnection = null
+        def receivedThrowable = null
+        server.getConnectionAsync { result, throwable -> receivedConnection = result; receivedThrowable = throwable; latch.countDown() }
+        latch.await()
+
+        then:
+        !receivedConnection
+        receivedThrowable.is(exceptionToThrow)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+
+
+        where:
+        exceptionToThrow << [
+                new MongoSocketOpenException('open failed', new ServerAddress(), new IOException()),
+                new MongoSocketWriteException('Write failed', new ServerAddress(), new IOException()),
+                new MongoSocketReadException('Read failed', new ServerAddress(), new IOException()),
+                new MongoSocketReadTimeoutException('Read timed out', new ServerAddress(), new IOException()),
+        ]
+    }
+
+    def 'failed auth should invalidate the connection pool asynchronously'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def connectionFactory = Mock(ConnectionFactory)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        connectionPool.getAsync(_) >> { it[0].onResult(null, exceptionToThrow) }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory,
+                serverMonitorFactory, NO_OP_SERVER_LISTENER, null, clusterTime)
+
+        when:
+        def latch = new CountDownLatch(1)
+        def receivedConnection = null
+        def receivedThrowable = null
+        server.getConnectionAsync { result, throwable -> receivedConnection = result; receivedThrowable = throwable; latch.countDown() }
+        latch.await()
+
+        then:
+        !receivedConnection
+        receivedThrowable.is(exceptionToThrow)
+        1 * connectionPool.invalidate()
+        0 * serverMonitor.connect()
+
+
+        where:
+        exceptionToThrow << [
+                new MongoSecurityException(createCredential('jeff', 'admin', '123'.toCharArray()), 'Auth failed'),
+        ]
+    }
+
+    def 'should invalidate on MongoNotPrimaryException'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        def internalConnection = Mock(InternalConnection)
+        connectionPool.get() >> { internalConnection }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+
+        TestConnectionFactory connectionFactory = new TestConnectionFactory()
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+        def testConnection = (TestConnection) server.getConnection()
+
+        when:
+        testConnection.enqueueProtocol(new TestLegacyProtocol(new MongoNotPrimaryException(serverId.address)))
+
+        testConnection.insert(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()))
+
+        then:
+        thrown(MongoNotPrimaryException)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+
+        when:
+        def futureResultCallback = new FutureResultCallback()
+        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
+                futureResultCallback);
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        thrown(MongoNotPrimaryException)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+
+        when:
+        futureResultCallback = new FutureResultCallback()
+        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
+                futureResultCallback);
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        thrown(MongoNotPrimaryException)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+    }
+
+    def 'should invalidate on MongoNodeIsRecoveringException'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        def internalConnection = Mock(InternalConnection)
+        connectionPool.get() >> { internalConnection }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+
+        TestConnectionFactory connectionFactory = new TestConnectionFactory()
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+        def testConnection = (TestConnection) server.getConnection()
+
+        when:
+        testConnection.enqueueProtocol(new TestLegacyProtocol(new MongoNodeIsRecoveringException(new ServerAddress())))
+
+        testConnection.insert(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()))
+
+        then:
+        thrown(MongoNodeIsRecoveringException)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+    }
+
+
+    def 'should invalidate on MongoSocketException'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        def internalConnection = Mock(InternalConnection)
+        connectionPool.get() >> { internalConnection }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+
+        TestConnectionFactory connectionFactory = new TestConnectionFactory()
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+        def testConnection = (TestConnection) server.getConnection()
+
+        when:
+        testConnection.enqueueProtocol(new TestLegacyProtocol(new MongoSocketException('socket error', new ServerAddress())))
+
+        testConnection.insert(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()))
+
+        then:
+        thrown(MongoSocketException)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+
+        when:
+        def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
+        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
+                futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        thrown(MongoSocketException)
+        1 * connectionPool.invalidate()
+        1 * serverMonitor.connect()
+    }
+
+    def 'should not invalidate on MongoSocketReadTimeoutException'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def connectionPool = Mock(ConnectionPool)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        def internalConnection = Mock(InternalConnection)
+        connectionPool.get() >> { internalConnection }
+        serverMonitorFactory.create(_, _) >> { serverMonitor }
+
+        TestConnectionFactory connectionFactory = new TestConnectionFactory()
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterTime)
+        def testConnection = (TestConnection) server.getConnection()
+
+        when:
+        testConnection.enqueueProtocol(new TestLegacyProtocol(new MongoSocketReadTimeoutException('socket timeout', new ServerAddress(),
+                new IOException())))
+
+        testConnection.insert(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()))
+
+        then:
+        thrown(MongoSocketReadTimeoutException)
+        0 * connectionPool.invalidate()
+        0 * serverMonitor.connect()
+
+        when:
+        def futureResultCallback = new FutureResultCallback<WriteConcernResult>()
+        testConnection.insertAsync(new MongoNamespace('test', 'test'), true, new InsertRequest(new BsonDocument()),
+                futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        thrown(MongoSocketReadTimeoutException)
+        0 * connectionPool.invalidate()
+        0 * serverMonitor.connect()
+    }
+
+    def 'should enable command listener'() {
+        given:
+        def clusterTime = new ClusterClock()
+        def protocol = new TestLegacyProtocol()
+        def commandListener = Stub(CommandListener)
+        def connectionPool = Mock(ConnectionPool)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        def internalConnection = Mock(InternalConnection)
+        connectionPool.get() >> { internalConnection }
+        serverMonitorFactory.create(_, _) >> { serverMonitor }
+
+        TestConnectionFactory connectionFactory = new TestConnectionFactory()
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, commandListener, clusterTime)
+        def testConnection = (TestConnection) server.getConnection()
+
+        testConnection.enqueueProtocol(protocol)
+
+        when:
+        if (async) {
+            CountDownLatch latch = new CountDownLatch(1)
+            testConnection.killCursorAsync(new MongoNamespace('test.test'), []) {
+                BsonDocument result, Throwable t -> latch.countDown()
+            }
+            latch.await()
+        } else {
+            testConnection.killCursor(new MongoNamespace('test.test'), [])
+        }
+
+        then:
+        protocol.commandListener == commandListener
+
+        where:
+        async << [false, true]
+    }
+
+    def 'should propagate cluster time'() {
+        given:
+        def clusterClock = new ClusterClock()
+        clusterClock.advance(clusterClockClusterTime)
+        def connectionPool = Mock(ConnectionPool)
+        def serverMonitorFactory = Stub(ServerMonitorFactory)
+        def serverMonitor = Mock(ServerMonitor)
+        def internalConnection = Mock(InternalConnection)
+        connectionPool.get() >> { internalConnection }
+        serverMonitorFactory.create(_) >> { serverMonitor }
+
+        TestConnectionFactory connectionFactory = new TestConnectionFactory()
+
+        def server = new DefaultServer(serverId, SINGLE, connectionPool, connectionFactory, serverMonitorFactory,
+                NO_OP_SERVER_LISTENER, null, clusterClock)
+        def testConnection = (TestConnection) server.getConnection()
+        def sessionContext = new TestSessionContext(initialClusterTime)
+        def response = BsonDocument.parse(
+                '''{
+                           ok : 1,
+                           operationTime : { $timestamp : { "t" : 50, "i" : 20 } },
+                           $clusterTime :  { clusterTime : { $timestamp : { "t" : 42, "i" : 21 } } }
+                          }
+                          ''')
+        def protocol = new TestCommandProtocol(response)
+        testConnection.enqueueProtocol(protocol)
+
+        when:
+        if (async) {
+            CountDownLatch latch = new CountDownLatch(1)
+            testConnection.commandAsync('admin', new BsonDocument('ping', new BsonInt32(1)), NO_OP_FIELD_NAME_VALIDATOR,
+                    ReadPreference.primary(), new BsonDocumentCodec(), sessionContext) {
+                BsonDocument result, Throwable t -> latch.countDown()
+            }
+            latch.await()
+        } else {
+            testConnection.command('admin', new BsonDocument('ping', new BsonInt32(1)), NO_OP_FIELD_NAME_VALIDATOR,
+                    ReadPreference.primary(), new BsonDocumentCodec(), sessionContext)
+        }
+
+        then:
+        clusterClock.getCurrent() == response.getDocument('$clusterTime')
+        protocol.contextClusterTime == (initialClusterTime.getTimestamp('clusterTime')
+                .compareTo(clusterClockClusterTime.getTimestamp('clusterTime')) > 0 ? initialClusterTime : clusterClockClusterTime)
+        sessionContext.clusterTime == response.getDocument('$clusterTime')
+        sessionContext.operationTime == response.getTimestamp('operationTime')
+
+        where:
+        [async, initialClusterTime, clusterClockClusterTime] << [
+                [false, true],
+                [
+                        BsonDocument.parse('{clusterTime : {$timestamp : {"t" : 21, "i" : 11 } } }'),
+                        BsonDocument.parse('{clusterTime : {$timestamp : {"t" : 42, "i" : 11 } } }')
+                ],
+                [
+                        BsonDocument.parse('{clusterTime : {$timestamp : {"t" : 21, "i" : 11 } } }'),
+                        BsonDocument.parse('{clusterTime : {$timestamp : {"t" : 42, "i" : 11 } } }')
+                ]
+        ].combinations()
+    }
+
+    class TestLegacyProtocol implements LegacyProtocol {
+        private MongoException mongoException
+        private CommandListener commandListener
+
+        TestLegacyProtocol() {
+            this(null)
+        }
+
+        TestLegacyProtocol(MongoException mongoException) {
+            this.mongoException = mongoException
+        }
+
+        @Override
+        Object execute(final InternalConnection connection) {
+            if (mongoException != null) {
+                throw mongoException
+            }
+            null
+        }
+
+        @Override
+        void executeAsync(final InternalConnection connection, final SingleResultCallback callback) {
+            callback.onResult(null, mongoException)
+        }
+
+        @Override
+        void setCommandListener(final CommandListener commandListener) {
+            this.commandListener = commandListener
+        }
+    }
+
+    class TestCommandProtocol implements CommandProtocol<BsonDocument> {
+        private final BsonDocument commandResult
+        private final BsonDocument responseDocument
+        private BsonDocument contextClusterTime
+
+        TestCommandProtocol(BsonDocument result) {
+            this.commandResult = result
+            this.responseDocument = result
+        }
+
+        @Override
+        BsonDocument execute(final InternalConnection connection) {
+            commandResult
+        }
+
+        @Override
+        void executeAsync(final InternalConnection connection, final SingleResultCallback callback) {
+            callback.onResult(commandResult, null)
+        }
+
+        @Override
+        TestCommandProtocol sessionContext(final SessionContext sessionContext) {
+            contextClusterTime = sessionContext.clusterTime
+            sessionContext.advanceClusterTime(responseDocument.getDocument('$clusterTime'))
+            sessionContext.advanceOperationTime(responseDocument.getTimestamp('operationTime'))
+            this
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultTestClusterableServerFactory.java b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultTestClusterableServerFactory.java
new file mode 100644
index 00000000000..421cf34d96a
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DefaultTestClusterableServerFactory.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.event.ServerListener;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.internal.event.EventListenerHelper.createServerListener;
+
+public class DefaultTestClusterableServerFactory implements ClusterableServerFactory {
+    private final ServerSettings settings = ServerSettings.builder().build();
+    private final ClusterId clusterId;
+    private final ClusterConnectionMode clusterConnectionMode;
+    private final ServerListenerFactory serverListenerFactory;
+    private final Map<ServerAddress, TestServerMonitorFactory> serverAddressToServerMonitorFactoryMap =
+            new HashMap<ServerAddress, TestServerMonitorFactory>();
+
+    public DefaultTestClusterableServerFactory(final ClusterId clusterId, final ClusterConnectionMode clusterConnectionMode,
+                                               final ServerListenerFactory serverListenerFactory) {
+        this.clusterId = clusterId;
+        this.clusterConnectionMode = clusterConnectionMode;
+        this.serverListenerFactory = serverListenerFactory;
+    }
+
+    @Override
+    public ClusterableServer create(final ServerAddress serverAddress, final ServerListener serverListener,
+                                    final ClusterClock clusterClock) {
+        TestServerMonitorFactory serverMonitorFactory = new TestServerMonitorFactory(new ServerId(clusterId, serverAddress));
+        serverAddressToServerMonitorFactoryMap.put(serverAddress, serverMonitorFactory);
+
+        return new DefaultServer(new ServerId(clusterId, serverAddress), clusterConnectionMode, new TestConnectionPool(),
+                new TestConnectionFactory(), serverMonitorFactory,
+                createServerListener(ServerSettings.builder().addServerListener(serverListener).build(),
+                        serverListenerFactory.create(serverAddress)), null, clusterClock);
+    }
+
+    @Override
+    public ServerSettings getSettings() {
+        return settings;
+    }
+
+
+    public void sendNotification(final ServerAddress serverAddress, final ServerDescription serverDescription) {
+        serverAddressToServerMonitorFactoryMap.get(serverAddress).sendNotification(serverDescription);
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DescriptionHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DescriptionHelperSpecification.groovy
new file mode 100644
index 00000000000..5b339bcc858
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DescriptionHelperSpecification.groovy
@@ -0,0 +1,550 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.ServerAddress
+import com.mongodb.Tag
+import com.mongodb.TagSet
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerConnectionState
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import org.bson.types.ObjectId
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.internal.connection.DescriptionHelper.createConnectionDescription
+import static com.mongodb.internal.connection.DescriptionHelper.createServerDescription
+import static org.bson.BsonDocument.parse
+
+class DescriptionHelperSpecification extends Specification {
+    private final ServerAddress serverAddress = new ServerAddress('localhost', 27018)
+    private final ServerVersion serverVersion = new ServerVersion([3, 0, 0])
+    private final int roundTripTime = 5000
+
+    def setup() {
+        Time.makeTimeConstant()
+    }
+
+    def cleanup() {
+        Time.makeTimeMove()
+    }
+
+    def 'connection description should reflect ismaster result'() {
+        def connectionId = new ConnectionId(new ServerId(new ClusterId(), serverAddress))
+        expect:
+        createConnectionDescription(connectionId,
+                                    parse('''{
+                                          ismaster : true,
+                                          maxBsonObjectSize : 16777216,
+                                          maxMessageSizeBytes : 48000000,
+                                          maxWriteBatchSize : 1000,
+                                          localTime : ISODate("2015-03-04T23:03:45.848Z"),
+                                          maxWireVersion : 6,
+                                          minWireVersion : 0,
+                                          ok : 1
+                                          }'''),
+                                    parse('''{
+                                          "version" : "2.6.1",
+                                          "gitVersion" : "nogitversion",
+                                          "OpenSSLVersion" : "",
+                                          "loaderFlags" : "-fPIC -pthread -Wl,-bind_at_load -m64 -mmacosx-version-min=10.9",
+                                          "allocator" : "tcmalloc",
+                                          "versionArray" : [
+                                          3,
+                                          0,
+                                          0,
+                                          1
+                                          ],
+                                          "javascriptEngine" : "V8",
+                                          "bits" : 64,
+                                          "debug" : false,
+                                          "maxBsonObjectSize" : 16777216,
+                                          "ok" : 1
+                                          }''')) ==
+        new ConnectionDescription(connectionId, serverVersion, 6, ServerType.STANDALONE, 1000, 16777216, 48000000, [])
+
+        createConnectionDescription(connectionId,
+                parse('''{
+                                          ismaster : true,
+                                          maxBsonObjectSize : 16777216,
+                                          maxMessageSizeBytes : 48000000,
+                                          maxWriteBatchSize : 1000,
+                                          localTime : ISODate("2015-03-04T23:03:45.848Z"),
+                                          maxWireVersion : 6,
+                                          minWireVersion : 0,
+                                          connectionId : 1004
+                                          ok : 1
+                                          }'''),
+                parse('''{
+                                          "version" : "2.6.1",
+                                          "gitVersion" : "nogitversion",
+                                          "OpenSSLVersion" : "",
+                                          "loaderFlags" : "-fPIC -pthread -Wl,-bind_at_load -m64 -mmacosx-version-min=10.9",
+                                          "allocator" : "tcmalloc",
+                                          "versionArray" : [
+                                          3,
+                                          0,
+                                          0,
+                                          1
+                                          ],
+                                          "javascriptEngine" : "V8",
+                                          "bits" : 64,
+                                          "debug" : false,
+                                          "maxBsonObjectSize" : 16777216,
+                                          "ok" : 1
+                                          }''')) ==
+                new ConnectionDescription(connectionId, serverVersion, 6, ServerType.STANDALONE, 1000, 16777216, 48000000, [])
+                    .withConnectionId(connectionId.withServerValue(1004))
+    }
+
+    def 'connection description should reflect ismaster result with compressors'() {
+        def connectionId = new ConnectionId(new ServerId(new ClusterId(), serverAddress))
+        expect:
+        createConnectionDescription(connectionId,
+                parse('''{
+                                          ismaster : true,
+                                          maxBsonObjectSize : 16777216,
+                                          maxMessageSizeBytes : 48000000,
+                                          maxWriteBatchSize : 1000,
+                                          localTime : ISODate("2015-03-04T23:03:45.848Z"),
+                                          maxWireVersion : 6,
+                                          minWireVersion : 0,
+                                          compression : ["zlib", "snappy"],
+                                          ok : 1
+                                          }'''),
+                parse('''{
+                                          "version" : "2.6.1",
+                                          "gitVersion" : "nogitversion",
+                                          "OpenSSLVersion" : "",
+                                          "loaderFlags" : "-fPIC -pthread -Wl,-bind_at_load -m64 -mmacosx-version-min=10.9",
+                                          "allocator" : "tcmalloc",
+                                          "versionArray" : [
+                                          3,
+                                          0,
+                                          0,
+                                          1
+                                          ],
+                                          "javascriptEngine" : "V8",
+                                          "bits" : 64,
+                                          "debug" : false,
+                                          "maxBsonObjectSize" : 16777216,
+                                          "ok" : 1
+                                          }''')) ==
+        new ConnectionDescription(connectionId, serverVersion, 6, ServerType.STANDALONE, 1000, 16777216, 48000000,
+                ['zlib', 'snappy'])
+    }
+
+    def 'server description should reflect not ok ismaster result'() {
+        expect:
+        createServerDescription(serverAddress,
+                                parse('{ok : 0}'), serverVersion, roundTripTime) ==
+                ServerDescription.builder()
+                         .ok(false)
+                         .address(serverAddress)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .type(ServerType.UNKNOWN)
+                         .build()
+    }
+
+    def 'server description should reflect last update time'() {
+        expect:
+        createServerDescription(serverAddress,
+                parse('{ ok : 1 }'), serverVersion, roundTripTime).getLastUpdateTime(TimeUnit.NANOSECONDS) == Time.CONSTANT_TIME
+    }
+
+    def 'server description should reflect roundTripNanos'() {
+        expect:
+        createServerDescription(serverAddress,
+                                parse('''{
+                                      ismaster : true,
+                                      maxBsonObjectSize : 16777216,
+                                      maxMessageSizeBytes : 48000000,
+                                      maxWriteBatchSize : 1000,
+                                      localTime : ISODate("2015-03-04T23:03:45.848Z"),
+                                      maxWireVersion : 3,
+                                      minWireVersion : 0,
+                                      ok : 1
+                                      }'''), serverVersion, roundTripTime).roundTripTimeNanos ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddress)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.STANDALONE)
+                         .roundTripTime(roundTripTime, TimeUnit.NANOSECONDS)
+                         .build().roundTripTimeNanos
+    }
+
+    def 'server description should reflect ismaster result from standalone'() {
+        expect:
+        createServerDescription(serverAddress,
+                parse('''{
+                        ismaster : true,
+                        maxBsonObjectSize : 16777216,
+                        maxMessageSizeBytes : 48000000,
+                        maxWriteBatchSize : 1000,
+                        localTime : ISODate("2015-03-04T23:03:45.848Z"),
+                        maxWireVersion : 3,
+                        minWireVersion : 0,
+                        ok : 1
+                        }'''), serverVersion, roundTripTime) ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddress)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.STANDALONE)
+                         .build()
+    }
+
+    def 'server description should reflect ismaster result from secondary'() {
+        expect:
+        createServerDescription(new ServerAddress('localhost', 27018),
+                parse('''{
+                        "setName" : "replset",
+                        "ismaster" : false,
+                        "secondary" : true,
+                        "hosts" : [
+                        "localhost:27017",
+                        "localhost:27019",
+                        "localhost:27018"
+                        ],
+                        "arbiters" : [
+                        "localhost:27020"
+                        ],
+                        "me" : "localhost:27017",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:14:07.338Z"),
+                        "maxWireVersion" : 3,
+                        "minWireVersion" : 0,
+                        "ok" : 1
+                        }'''), serverVersion, roundTripTime) ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(new ServerAddress('localhost', 27018))
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.REPLICA_SET_SECONDARY)
+                         .setName('replset')
+                         .canonicalAddress('localhost:27017')
+                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
+                         .arbiters(['localhost:27020'] as Set)
+                         .build()
+    }
+
+    def 'server description should reflect ismaster result with lastWriteDate'() {
+        expect:
+        createServerDescription(new ServerAddress('localhost', 27018),
+                parse('''{
+                        "setName" : "replset",
+                        "ismaster" : false,
+                        "secondary" : true,
+                        "hosts" : [
+                        "localhost:27017",
+                        "localhost:27019",
+                        "localhost:27018"
+                        ],
+                        "arbiters" : [
+                        "localhost:27020"
+                        ],
+                        "me" : "localhost:27017",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:14:07.338Z"),
+                        "maxWireVersion" : 5,
+                        "minWireVersion" : 0,
+                        "lastWrite" : { "lastWriteDate" : ISODate("2016-03-04T23:14:07.338Z") }
+                        "ok" : 1
+                        }'''), serverVersion, roundTripTime) ==
+                ServerDescription.builder()
+                        .ok(true)
+                        .address(new ServerAddress('localhost', 27018))
+                        .state(ServerConnectionState.CONNECTED)
+                        .version(serverVersion)
+                        .maxWireVersion(5)
+                        .lastWriteDate(new Date(1457133247338L))
+                        .maxDocumentSize(16777216)
+                        .type(ServerType.REPLICA_SET_SECONDARY)
+                        .setName('replset')
+                        .canonicalAddress('localhost:27017')
+                        .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
+                        .arbiters(['localhost:27020'] as Set)
+                        .build()
+    }
+
+    def 'server description should reflect ismaster result from primary'() {
+        given:
+        ObjectId electionId = new ObjectId();
+
+        when:
+        def serverDescription = createServerDescription(serverAddress,
+                parse("""{
+                        "setName" : "replset",
+                        "setVersion" : 1,
+                        "ismaster" : true,
+                        "secondary" : false,
+                        "hosts" : [
+                        "localhost:27017",
+                        "localhost:27019",
+                        "localhost:27018"
+                        ],
+                        "arbiters" : [
+                        "localhost:27020"
+                        ],
+                        "primary" : "localhost:27017",
+                        "me" : "localhost:27017",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:24:18.452Z"),
+                        "maxWireVersion" : 3,
+                        "minWireVersion" : 0,
+                        "electionId" : {\$oid : "${electionId.toHexString()}" },
+                        "setVersion" : 2,
+                        tags : { "dc" : "east", "use" : "production" }
+                        "ok" : 1
+                        }"""), serverVersion, roundTripTime)
+
+        then:
+        serverDescription ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddress)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .electionId(electionId)
+                         .setVersion(2)
+                         .type(ServerType.REPLICA_SET_PRIMARY)
+                         .setName('replset')
+                         .primary('localhost:27017')
+                         .canonicalAddress('localhost:27017')
+                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
+                         .arbiters(['localhost:27020'] as Set)
+                         .tagSet(new TagSet([new Tag('dc', 'east'), new Tag('use', 'production')]))
+                         .build()
+    }
+
+    def 'server description should reflect ismaster result from arbiter'() {
+        expect:
+        createServerDescription(serverAddress,
+                parse('''{
+                        "setName" : "replset",
+                        "ismaster" : false,
+                        "secondary" : false,
+                        "hosts" : [
+                        "localhost:27019",
+                        "localhost:27018",
+                        "localhost:27017"
+                        ],
+                        "arbiters" : [
+                        "localhost:27020"
+                        ],
+                        "primary" : "localhost:27017",
+                        "arbiterOnly" : true,
+                        "me" : "localhost:27020",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:27:55.568Z"),
+                        "maxWireVersion" : 3,
+                        "minWireVersion" : 0,
+                        "ok" : 1
+                        }'''), serverVersion, roundTripTime) ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddress)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.REPLICA_SET_ARBITER)
+                         .setName('replset')
+                         .primary('localhost:27017')
+                         .canonicalAddress('localhost:27020' )
+                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
+                         .arbiters(['localhost:27020'] as Set)
+                         .build()
+    }
+
+    def 'server description should reflect ismaster result from other'() {
+        given:
+        def serverAddressOfHidden = new ServerAddress('localhost', 27020)
+
+        when:
+        def serverDescription = createServerDescription(serverAddressOfHidden,
+                parse('''{
+                        "setName" : "replset",
+                        "ismaster" : false,
+                        "secondary" : false,
+                        "hosts" : [
+                        "localhost:27019",
+                        "localhost:27018",
+                        "localhost:27017"
+                        ],
+                        "arbiters" : [
+                        "localhost:27021"
+                        ],
+                        "primary" : "localhost:27017",
+                        "arbiterOnly" : false,
+                        "me" : "localhost:27020",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:27:55.568Z"),
+                        "maxWireVersion" : 3,
+                        "minWireVersion" : 0,
+                        "ok" : 1
+                        }'''), serverVersion, roundTripTime)
+
+        then:
+        serverDescription ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddressOfHidden)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.REPLICA_SET_OTHER)
+                         .setName('replset')
+                         .primary('localhost:27017')
+                         .canonicalAddress('localhost:27020')
+                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
+                         .arbiters(['localhost:27021'] as Set)
+                         .build()
+    }
+
+    def 'server description should reflect ismaster result from hidden'() {
+        given:
+        def serverAddressOfHidden = new ServerAddress('localhost', 27020)
+
+        expect:
+        createServerDescription(serverAddressOfHidden,
+                parse('''{
+                        "setName" : "replset",
+                        "ismaster" : false,
+                        "secondary" : true,
+                        "hidden" : true,
+                        "hosts" : [
+                        "localhost:27019",
+                        "localhost:27018",
+                        "localhost:27017"
+                        ],
+                        "arbiters" : [
+                        "localhost:27021"
+                        ],
+                        "primary" : "localhost:27017",
+                        "arbiterOnly" : false,
+                        "me" : "localhost:27020",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:27:55.568Z"),
+                        "maxWireVersion" : 3,
+                        "minWireVersion" : 0,
+                        "ok" : 1
+                        }'''), serverVersion, roundTripTime) ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddressOfHidden)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.REPLICA_SET_OTHER)
+                         .setName('replset')
+                         .primary('localhost:27017')
+                         .canonicalAddress('localhost:27020')
+                         .hosts(['localhost:27017', 'localhost:27018', 'localhost:27019'] as Set)
+                         .arbiters(['localhost:27021'] as Set)
+                         .build()
+    }
+
+
+    def 'server description should reflect ismaster result from ghost'() {
+        expect:
+        createServerDescription(serverAddress,
+                parse('''{
+                        "setName" : "replset",
+                        "ismaster" : false,
+                        "secondary" : false,
+                        "arbiterOnly" : false,
+                        "me" : "localhost:27020",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:27:55.568Z"),
+                        "maxWireVersion" : 3,
+                        "minWireVersion" : 0,
+                        "ok" : 1
+                        }'''), serverVersion, roundTripTime) ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddress)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .canonicalAddress('localhost:27020' )
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.REPLICA_SET_GHOST)
+                         .setName('replset')
+                         .build()
+    }
+
+    def 'server description should reflect ismaster result from shard router'() {
+        expect:
+        createServerDescription(serverAddress,
+                parse('''{
+                        "ismaster" : true,
+                        "msg" : "isdbgrid",
+                        "maxBsonObjectSize" : 16777216,
+                        "maxMessageSizeBytes" : 48000000,
+                        "maxWriteBatchSize" : 1000,
+                        "localTime" : ISODate("2015-03-04T23:55:18.505Z"),
+                        "maxWireVersion" : 3,
+                        "minWireVersion" : 0,
+                        "ok" : 1
+                        }'''), serverVersion, roundTripTime) ==
+        ServerDescription.builder()
+                         .ok(true)
+                         .address(serverAddress)
+                         .state(ServerConnectionState.CONNECTED)
+                         .version(serverVersion)
+                         .maxWireVersion(3)
+                         .maxDocumentSize(16777216)
+                         .type(ServerType.SHARD_ROUTER)
+                         .build()
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/DnsMultiServerClusterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/DnsMultiServerClusterSpecification.groovy
new file mode 100644
index 00000000000..486ddd37f32
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/DnsMultiServerClusterSpecification.groovy
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoConfigurationException
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ClusterSettings
+import com.mongodb.event.ClusterListener
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
+import static com.mongodb.connection.ClusterType.SHARDED
+import static com.mongodb.connection.ServerType.SHARD_ROUTER
+
+class DnsMultiServerClusterSpecification extends Specification {
+
+    private final ServerAddress firstServer = new ServerAddress('localhost:27017')
+    private final ServerAddress secondServer = new ServerAddress('localhost:27018')
+    private final ServerAddress thirdServer = new ServerAddress('localhost:27019')
+
+    private final TestClusterableServerFactory factory = new TestClusterableServerFactory()
+
+    def setup() {
+        Time.makeTimeConstant()
+    }
+
+    def cleanup() {
+        Time.makeTimeMove()
+    }
+
+    def 'should initialize from DNS SRV monitor'() {
+        given:
+        def srvHost = 'test1.test.build.10gen.cc'
+        def clusterListener = Mock(ClusterListener)
+        def dnsSrvRecordMonitor = Mock(DnsSrvRecordMonitor)
+        def exception = new MongoConfigurationException('test')
+        DnsSrvRecordInitializer initializer
+        def dnsSrvRecordMonitorFactory = new DnsSrvRecordMonitorFactory() {
+            @Override
+            DnsSrvRecordMonitor create(final String hostName, final DnsSrvRecordInitializer dnsSrvRecordListener) {
+                initializer = dnsSrvRecordListener
+                dnsSrvRecordMonitor
+            }
+        }
+        when: 'the cluster is constructed'
+        def cluster = new DnsMultiServerCluster(new ClusterId(),
+                ClusterSettings.builder()
+                        .addClusterListener(clusterListener)
+                        .serverSelectionTimeout(1, TimeUnit.MILLISECONDS)
+                        .srvHost(srvHost)
+                        .mode(MULTIPLE)
+                        .build(),
+                factory, dnsSrvRecordMonitorFactory)
+
+        then: 'the monitor is created and started'
+        initializer != null
+        1 * dnsSrvRecordMonitor.start()
+
+        when: 'the current description is accessed before initialization'
+        def description = cluster.getCurrentDescription()
+
+        then: 'the description is not null'
+        description != null
+
+        when: 'the listener is initialized with an exception'
+        initializer.initialize(exception)
+        description = cluster.getCurrentDescription()
+
+        then: 'the description includes the exception'
+        description.getServerDescriptions() == []
+        description.getSrvResolutionException() == exception
+
+        when: 'the listener is initialized with servers'
+        initializer.initialize([firstServer, secondServer] as Set)
+
+        then: 'an event is generated'
+        1 * clusterListener.clusterDescriptionChanged(_)
+
+        when: 'the servers notify'
+        factory.sendNotification(firstServer, SHARD_ROUTER)
+        factory.sendNotification(secondServer, SHARD_ROUTER)
+        def firstTestServer = factory.getServer(firstServer)
+        def secondTestServer = factory.getServer(secondServer)
+        def clusterDescription = cluster.getDescription()
+
+        then: 'events are generated, description includes hosts, exception is cleared, and servers are open'
+        2 * clusterListener.clusterDescriptionChanged(_)
+        clusterDescription.getType() == SHARDED
+        clusterDescription.getAll() == factory.getDescriptions(firstServer, secondServer)
+        clusterDescription.getSrvResolutionException() == null
+        !firstTestServer.isClosed()
+        !secondTestServer.isClosed()
+
+        when: 'the listener is initialized with a different server'
+        initializer.initialize([secondServer, thirdServer])
+        factory.sendNotification(secondServer, SHARD_ROUTER)
+        def thirdTestServer = factory.getServer(thirdServer)
+        clusterDescription = cluster.getDescription()
+
+        then: 'events are generated, description is updated, and the removed server is closed'
+        2 * clusterListener.clusterDescriptionChanged(_)
+        clusterDescription.getType() == SHARDED
+        clusterDescription.getAll() == factory.getDescriptions(secondServer, thirdServer)
+        clusterDescription.getSrvResolutionException() == null
+        firstTestServer.isClosed()
+        !secondTestServer.isClosed()
+        !thirdTestServer.isClosed()
+
+        when: 'the listener is initialized with another exception'
+        initializer.initialize(exception)
+        clusterDescription = cluster.getDescription()
+
+        then: 'the exception is ignored'
+        0 * clusterListener.clusterDescriptionChanged(_)
+        clusterDescription.getType() == SHARDED
+        clusterDescription.getAll() == factory.getDescriptions(secondServer, thirdServer)
+        clusterDescription.getSrvResolutionException() == null
+        firstTestServer.isClosed()
+        !secondTestServer.isClosed()
+        !thirdTestServer.isClosed()
+
+        when: 'the cluster is closed'
+        cluster.close()
+
+        then: 'the monitor is closed'
+        1 * dnsSrvRecordMonitor.close()
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ElementExtendingBsonWriterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ElementExtendingBsonWriterSpecification.groovy
new file mode 100644
index 00000000000..f96e11acece
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ElementExtendingBsonWriterSpecification.groovy
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import org.bson.BsonBinaryReader
+import org.bson.BsonBinaryWriter
+import org.bson.BsonDocument
+import org.bson.BsonDocumentReader
+import org.bson.BsonElement
+import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.EncoderContext
+import org.bson.io.BasicOutputBuffer
+import org.bson.io.BsonOutput
+import spock.lang.Specification
+
+import static org.bson.BsonHelper.documentWithValuesOfEveryType
+
+class ElementExtendingBsonWriterSpecification extends Specification {
+
+    def 'should write all types'() {
+        given:
+        def binaryWriter = new BsonBinaryWriter(new BasicOutputBuffer())
+
+        when:
+        new BsonDocumentCodec().encode(new ElementExtendingBsonWriter(binaryWriter, []), documentWithValuesOfEveryType(),
+                EncoderContext.builder().build())
+
+        then:
+        getEncodedDocument(binaryWriter.getBsonOutput()) == documentWithValuesOfEveryType()
+    }
+
+    def 'should extend with extra elements'() {
+        given:
+        def extraElements = [
+                new BsonElement('$db', new BsonString('test')),
+                new BsonElement('$readPreference', new BsonDocument('mode', new BsonString('primary')))
+        ]
+        def expectedDocument = documentWithValuesOfEveryType()
+        for (def cur : extraElements) {
+            expectedDocument.put(cur.name, cur.value)
+        }
+        def binaryWriter = new BsonBinaryWriter(new BasicOutputBuffer())
+        def writer = new ElementExtendingBsonWriter(binaryWriter, extraElements)
+
+        when:
+        new BsonDocumentCodec().encode(writer, documentWithValuesOfEveryType(), EncoderContext.builder().build())
+
+        then:
+        getEncodedDocument(binaryWriter.getBsonOutput()) == expectedDocument
+    }
+
+    def 'should extend with extra elements when piping a reader at the top level'() {
+        given:
+        def extraElements = [
+                new BsonElement('$db', new BsonString('test')),
+                new BsonElement('$readPreference', new BsonDocument('mode', new BsonString('primary')))
+        ]
+        def expectedDocument = documentWithValuesOfEveryType()
+        for (def cur : extraElements) {
+            expectedDocument.put(cur.name, cur.value)
+        }
+        def binaryWriter = new BsonBinaryWriter(new BasicOutputBuffer())
+        def writer = new ElementExtendingBsonWriter(binaryWriter, extraElements)
+
+        when:
+        writer.pipe(new BsonDocumentReader(documentWithValuesOfEveryType()))
+
+        then:
+        getEncodedDocument(binaryWriter.getBsonOutput()) == expectedDocument
+    }
+
+    def 'should not extend with extra elements when piping a reader at nested level'() {
+        given:
+        def extraElements = [
+                new BsonElement('$db', new BsonString('test')),
+                new BsonElement('$readPreference', new BsonDocument('mode', new BsonString('primary')))
+        ]
+        def expectedDocument = new BsonDocument('pipedDocument', new BsonDocument())
+        for (def cur : extraElements) {
+            expectedDocument.put(cur.name, cur.value)
+        }
+
+        def binaryWriter = new BsonBinaryWriter(new BasicOutputBuffer())
+
+        def writer = new ElementExtendingBsonWriter(binaryWriter, extraElements)
+
+        when:
+        writer.writeStartDocument()
+        writer.writeName('pipedDocument')
+        writer.pipe(new BsonDocumentReader(new BsonDocument()))
+        writer.writeEndDocument()
+
+        then:
+        getEncodedDocument(binaryWriter.getBsonOutput()) == expectedDocument
+    }
+
+    private static BsonDocument getEncodedDocument(BsonOutput buffer) {
+        new BsonDocumentCodec().decode(new BsonBinaryReader(buffer.getByteBuffers().get(0).asNIO()),
+                DecoderContext.builder().build())
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ExponentiallyWeightedMovingAverageSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ExponentiallyWeightedMovingAverageSpecification.groovy
new file mode 100644
index 00000000000..d9ef0e39c5e
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ExponentiallyWeightedMovingAverageSpecification.groovy
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import spock.lang.Specification
+
+
+class ExponentiallyWeightedMovingAverageSpecification extends Specification {
+
+    def 'constructor should throw if alpha is not between 0.0 and 1.0'() {
+        when:
+        new ExponentiallyWeightedMovingAverage(alpha);
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        alpha << [-0.001, -0.01, -0.1, -1, 1.001, 1.01, 1.1]
+    }
+
+    def 'constructor should not throw if alpha is between 0.0 and 1.0'() {
+        when:
+        new ExponentiallyWeightedMovingAverage(alpha);
+
+        then:
+        true
+
+        where:
+        alpha << [-0.0, 0.01, 0.1, 0.001, 0.01, 0.1, 0.2, 1.0]
+    }
+
+    def 'the average should be exponentially weighted'() {
+        when:
+        def average = new ExponentiallyWeightedMovingAverage(alpha)
+        for (def sample : samples) {
+            average.addSample(sample)
+        }
+
+        then:
+        average.getAverage() == result
+
+        where:
+        alpha << [0.2, 0.2, 0.2, 0.2, 0.2]
+        samples << [[], [10], [10, 20], [10, 20, 12], [10, 20, 12, 17]]
+        result << [0, 10, 12, 12, 13]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/GetMoreProtocolSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/GetMoreProtocolSpecification.groovy
similarity index 85%
rename from driver-core/src/test/unit/com/mongodb/connection/GetMoreProtocolSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/internal/connection/GetMoreProtocolSpecification.groovy
index cc551836443..982ea166066 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/GetMoreProtocolSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/GetMoreProtocolSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,20 +12,21 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.MongoCursorNotFoundException
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoQueryException
 import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
 import org.bson.codecs.BsonDocumentCodec
 import spock.lang.Specification
 
-import static com.mongodb.connection.MessageHelper.buildReply
-import static com.mongodb.connection.ProtocolTestHelper.execute
+import static com.mongodb.internal.connection.MessageHelper.buildReply
+import static com.mongodb.internal.connection.ProtocolTestHelper.execute
 
 // unit test failure cases that are difficult to reproduce in integration tests
 class GetMoreProtocolSpecification extends Specification {
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/IndexMapSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/IndexMapSpecification.groovy
index 8b4c75ad1ab..60bf1cb7f9a 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/connection/IndexMapSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/IndexMapSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,6 @@ class IndexMapSpecification extends Specification {
     }
 
     def 'should throw on unmapped index'() {
-
         when:
         indexMap.map(-1)
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/InternalStreamConnectionInitializerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/InternalStreamConnectionInitializerSpecification.groovy
new file mode 100644
index 00000000000..6455c587327
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/InternalStreamConnectionInitializerSpecification.groovy
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoCompressor
+import com.mongodb.ServerAddress
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import org.bson.BsonArray
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import spock.lang.Specification
+
+import java.util.concurrent.CountDownLatch
+
+import static com.mongodb.internal.connection.ClientMetadataHelperSpecification.createExpectedClientMetadataDocument
+import static com.mongodb.internal.connection.MessageHelper.buildSuccessfulReply
+import static com.mongodb.internal.connection.MessageHelper.decodeCommand
+
+class InternalStreamConnectionInitializerSpecification extends Specification {
+
+    def serverId = new ServerId(new ClusterId(), new ServerAddress())
+    def internalConnection = new TestInternalConnection(serverId)
+
+    def 'should create correct description'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], null, [])
+
+        when:
+        enqueueSuccessfulReplies(false, null)
+        def description = initializer.initialize(internalConnection)
+
+        then:
+        description == getExpectedDescription(description.connectionId.localValue, null)
+    }
+
+    def 'should create correct description asynchronously'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], null, [])
+
+        when:
+        enqueueSuccessfulReplies(false, null)
+        def futureCallback = new FutureResultCallback<ConnectionDescription>()
+        initializer.initializeAsync(internalConnection, futureCallback)
+        def description = futureCallback.get()
+
+        then:
+        description == getExpectedDescription(description.connectionId.localValue, null)
+    }
+
+    def 'should create correct description with server connection id'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], null, [])
+
+        when:
+        enqueueSuccessfulReplies(false, 123)
+        def description = initializer.initialize(internalConnection)
+
+        then:
+        description == getExpectedDescription(description.connectionId.localValue, 123)
+    }
+
+    def 'should create correct description with server connection id from isMaster'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], null, [])
+
+        when:
+        enqueueSuccessfulRepliesWithConnectionIdIsIsMasterResponse(false, 123)
+        def description = initializer.initialize(internalConnection)
+
+        then:
+        description == getExpectedDescription(description.connectionId.localValue, 123)
+    }
+
+    def 'should create correct description with server connection id asynchronously'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], null, [])
+
+        when:
+        enqueueSuccessfulReplies(false, 123)
+        def futureCallback = new FutureResultCallback<ConnectionDescription>()
+        initializer.initializeAsync(internalConnection, futureCallback)
+        def description = futureCallback.get()
+
+        then:
+        description == getExpectedDescription(description.connectionId.localValue, 123)
+    }
+
+    def 'should create correct description with server connection id from isMaster asynchronously'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], null, [])
+
+        when:
+        enqueueSuccessfulRepliesWithConnectionIdIsIsMasterResponse(false, 123)
+        def futureCallback = new FutureResultCallback<ConnectionDescription>()
+        initializer.initializeAsync(internalConnection, futureCallback)
+        def description = futureCallback.get()
+
+        then:
+        description == getExpectedDescription(description.connectionId.localValue, 123)
+    }
+
+    def 'should authenticate multiple credentials'() {
+        given:
+        def firstAuthenticator = Mock(Authenticator)
+        def secondAuthenticator = Mock(Authenticator)
+        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator, secondAuthenticator], null, [])
+
+        when:
+        enqueueSuccessfulReplies(false, null)
+
+        def description = initializer.initialize(internalConnection)
+
+        then:
+        description
+        1 * firstAuthenticator.authenticate(internalConnection, _)
+        1 * secondAuthenticator.authenticate(internalConnection, _)
+    }
+
+    def 'should authenticate multiple credentials asynchronously'() {
+        given:
+        def firstAuthenticator = Mock(Authenticator)
+        def secondAuthenticator = Mock(Authenticator)
+        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator, secondAuthenticator], null, [])
+
+        when:
+        enqueueSuccessfulReplies(false, null)
+
+        def futureCallback = new FutureResultCallback<ConnectionDescription>()
+        initializer.initializeAsync(internalConnection, futureCallback)
+        def description = futureCallback.get()
+
+        then:
+        description
+        1 * firstAuthenticator.authenticateAsync(internalConnection, _, _) >> { it[2].onResult(null, null) }
+        1 * secondAuthenticator.authenticateAsync(internalConnection, _, _) >> { it[2].onResult(null, null) }
+    }
+
+    def 'should not authenticate if server is an arbiter'() {
+        given:
+        def firstAuthenticator = Mock(Authenticator)
+        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator], null, [])
+
+        when:
+        enqueueSuccessfulReplies(true, null)
+
+        def description = initializer.initialize(internalConnection)
+
+        then:
+        description
+        0 * firstAuthenticator.authenticate(internalConnection, _)
+    }
+
+    def 'should not authenticate asynchronously if server is an arbiter asynchronously'() {
+        given:
+        def firstAuthenticator = Mock(Authenticator)
+        def initializer = new InternalStreamConnectionInitializer([firstAuthenticator], null, [])
+
+        when:
+        enqueueSuccessfulReplies(true, null)
+
+        def futureCallback = new FutureResultCallback<ConnectionDescription>()
+        initializer.initializeAsync(internalConnection, futureCallback)
+        def description = futureCallback.get()
+
+        then:
+        description
+        0 * firstAuthenticator.authenticateAsync(internalConnection, _, _)
+    }
+
+    def 'should add client metadata document to isMaster command'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], clientMetadataDocument, [])
+        def expectedIsMasterCommandDocument = new BsonDocument('ismaster', new BsonInt32(1))
+        if (clientMetadataDocument != null) {
+            expectedIsMasterCommandDocument.append('client', clientMetadataDocument)
+        }
+
+        when:
+        enqueueSuccessfulReplies(false, null)
+        if (async) {
+            def latch = new CountDownLatch(1)
+            def callback = { result, t -> latch.countDown() } as SingleResultCallback
+            initializer.initializeAsync(internalConnection, callback)
+            latch.await()
+        } else {
+            initializer.initialize(internalConnection)
+        }
+
+        then:
+        decodeCommand(internalConnection.getSent()[0]) == expectedIsMasterCommandDocument
+
+        where:
+        [clientMetadataDocument, async] << [[createExpectedClientMetadataDocument('appName'), null],
+                                            [true, false]].combinations()
+    }
+
+    def 'should add compression to isMaster command'() {
+        given:
+        def initializer = new InternalStreamConnectionInitializer([], null, compressors)
+        def expectedIsMasterCommandDocument = new BsonDocument('ismaster', new BsonInt32(1))
+
+        def compressionArray = new BsonArray()
+        for (def compressor : compressors) {
+            compressionArray.add(new BsonString(compressor.getName()))
+        }
+        if (!compressionArray.isEmpty()) {
+            expectedIsMasterCommandDocument.append('compression', compressionArray)
+        }
+
+        when:
+        enqueueSuccessfulReplies(false, null)
+        if (async) {
+            def latch = new CountDownLatch(1)
+            def callback = { result, t -> latch.countDown() } as SingleResultCallback
+            initializer.initializeAsync(internalConnection, callback)
+            latch.await()
+        } else {
+            initializer.initialize(internalConnection)
+        }
+
+        then:
+        decodeCommand(internalConnection.getSent()[0]) == expectedIsMasterCommandDocument
+
+        where:
+        [compressors, async] << [[[], [MongoCompressor.createZlibCompressor()]],
+                                 [true, false]].combinations()
+    }
+
+    private ConnectionDescription getExpectedDescription(final Integer localValue, final Integer serverValue) {
+        new ConnectionDescription(new ConnectionId(serverId, localValue, serverValue),
+                new ServerVersion(3, 0), 3, ServerType.STANDALONE, 512, 16777216, 33554432, [])
+    }
+
+    def enqueueSuccessfulReplies(final boolean isArbiter, final Integer serverConnectionId) {
+        internalConnection.enqueueReply(buildSuccessfulReply(
+                '{ok: 1, ' +
+                'maxWireVersion: 3' +
+                (isArbiter ? ', isreplicaset: true, arbiterOnly: true' : '') +
+                '}'))
+        internalConnection.enqueueReply(buildSuccessfulReply('{ok: 1, versionArray : [3, 0, 0]}'))
+        internalConnection.enqueueReply(buildSuccessfulReply(
+                '{ok: 1 ' +
+                (serverConnectionId == null ? '' : ', connectionId: ' + serverConnectionId) +
+                '}'))
+    }
+
+    def enqueueSuccessfulRepliesWithConnectionIdIsIsMasterResponse(final boolean isArbiter, final Integer serverConnectionId) {
+        internalConnection.enqueueReply(buildSuccessfulReply(
+                '{ok: 1, ' +
+                        'maxWireVersion: 3,' +
+                        'connectionId: ' + serverConnectionId +
+                        (isArbiter ? ', isreplicaset: true, arbiterOnly: true' : '') +
+                        '}'))
+        internalConnection.enqueueReply(buildSuccessfulReply('{ok: 1, versionArray : [3, 0, 0]}'))
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/InternalStreamConnectionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/InternalStreamConnectionSpecification.groovy
new file mode 100644
index 00000000000..9ac9ad81cf0
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/InternalStreamConnectionSpecification.groovy
@@ -0,0 +1,884 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import category.Async
+import com.mongodb.MongoCommandException
+import com.mongodb.MongoInternalException
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoSocketClosedException
+import com.mongodb.MongoSocketException
+import com.mongodb.MongoSocketReadException
+import com.mongodb.MongoSocketWriteException
+import com.mongodb.ReadConcern
+import com.mongodb.ServerAddress
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.connection.AsyncCompletionHandler
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import com.mongodb.connection.Stream
+import com.mongodb.connection.StreamFactory
+import com.mongodb.event.CommandFailedEvent
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.event.CommandSucceededEvent
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import com.mongodb.session.SessionContext
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.ByteBuf
+import org.bson.ByteBufNIO
+import org.bson.codecs.BsonDocumentCodec
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import java.nio.ByteBuffer
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize
+import static com.mongodb.connection.ConnectionDescription.getDefaultMaxWriteBatchSize
+import static com.mongodb.connection.ServerDescription.getDefaultMaxDocumentSize
+import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION
+import static java.util.concurrent.TimeUnit.SECONDS
+
+@SuppressWarnings(['UnusedVariable'])
+class InternalStreamConnectionSpecification extends Specification {
+    private static final ServerId SERVER_ID = new ServerId(new ClusterId(), new ServerAddress())
+
+    def cmdNamespace = new MongoNamespace('admin.$cmd')
+    def fieldNameValidator = new NoOpFieldNameValidator()
+    def helper = new StreamHelper()
+    def serverAddress = new ServerAddress()
+    def connectionId = new ConnectionId(SERVER_ID, 1, 1)
+    def commandListener = new TestCommandListener()
+    def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+
+    def connectionDescription = new ConnectionDescription(connectionId, new ServerVersion(3, 6), 3,
+            ServerType.STANDALONE, getDefaultMaxWriteBatchSize(), getDefaultMaxDocumentSize(), getDefaultMaxMessageSize(), [])
+    def stream = Mock(Stream) {
+        openAsync(_) >> { it[0].completed(null) }
+    }
+    def streamFactory = Mock(StreamFactory) {
+        create(_) >> { stream }
+    }
+    def initializer = Mock(InternalConnectionInitializer) {
+        initialize(_) >> { connectionDescription }
+        initializeAsync(_, _) >> { it[1].onResult(connectionDescription, null) }
+    }
+
+    def getConnection() {
+        new InternalStreamConnection(SERVER_ID, streamFactory, [], commandListener, initializer)
+    }
+
+    def getOpenedConnection() {
+        def connection = getConnection();
+        connection.open()
+        connection
+    }
+
+    def 'should change the connection description when opened'() {
+        when:
+        def connection = getConnection()
+
+        then:
+        connection.getDescription().getServerType() == ServerType.UNKNOWN
+        connection.getDescription().getConnectionId().getServerValue() == null
+
+        when:
+        connection.open()
+
+        then:
+        connection.opened()
+        connection.getDescription().getServerType() == ServerType.STANDALONE
+        connection.getDescription().getConnectionId().getServerValue() == 1
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'should change the connection description when opened asynchronously'() {
+        when:
+        def connection = getConnection()
+        def futureResultCallback = new FutureResultCallback<Void>()
+
+        then:
+        connection.getDescription().getServerType() == ServerType.UNKNOWN
+        connection.getDescription().getConnectionId().getServerValue() == null
+
+        when:
+        connection.openAsync(futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        connection.opened()
+        connection.getDescription().getServerType() == ServerType.STANDALONE
+        connection.getDescription().getConnectionId().getServerValue() == 1
+    }
+
+    def 'should close the stream when initialization throws an exception'() {
+        given:
+        def failedInitializer = Mock(InternalConnectionInitializer) {
+            initialize(_) >> { throw new MongoInternalException('Something went wrong') }
+        }
+        def connection = new InternalStreamConnection(SERVER_ID, streamFactory, [], null, failedInitializer)
+
+        when:
+        connection.open()
+
+        then:
+        thrown MongoInternalException
+        connection.isClosed()
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'should close the stream when initialization throws an exception asynchronously'() {
+        given:
+        def failedInitializer = Mock(InternalConnectionInitializer) {
+            initializeAsync(_, _) >> { it[1].onResult(null, new MongoInternalException('Something went wrong')); }
+        }
+        def connection = new InternalStreamConnection(SERVER_ID, streamFactory, [], null, failedInitializer)
+
+        when:
+        def futureResultCallback = new FutureResultCallback<Void>()
+        connection.openAsync(futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        thrown MongoInternalException
+        connection.isClosed()
+    }
+
+    def 'should close the stream when writing a message throws an exception'() {
+        given:
+        stream.write(_) >> { throw new IOException('Something went wrong') }
+
+        def connection = getOpenedConnection()
+        def (buffers1, messageId1) = helper.isMaster()
+        def (buffers2, messageId2) = helper.isMaster()
+
+        when:
+        connection.sendMessage(buffers1, messageId1)
+
+        then:
+        connection.isClosed()
+        thrown MongoSocketWriteException
+
+        when:
+        connection.sendMessage(buffers2, messageId2)
+
+        then:
+        thrown MongoSocketClosedException
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'should close the stream when writing a message throws an exception asynchronously'() {
+        given:
+        def (buffers1, messageId1, sndCallbck1, rcvdCallbck1) = helper.isMasterAsync()
+        def (buffers2, messageId2, sndCallbck2, rcvdCallbck2) = helper.isMasterAsync()
+        int seen = 0
+
+        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
+            if (seen == 0) {
+                seen += 1
+                return callback.failed(new IOException('Something went wrong'))
+            }
+            callback.completed(null)
+        }
+
+        def connection = getOpenedConnection()
+
+        when:
+        connection.sendMessageAsync(buffers1, messageId1, sndCallbck1)
+        sndCallbck1.get(10, SECONDS)
+
+        then:
+        thrown MongoSocketWriteException
+        connection.isClosed()
+
+        when:
+        connection.sendMessageAsync(buffers2, messageId2, sndCallbck2)
+        sndCallbck2.get(10, SECONDS)
+
+        then:
+        thrown MongoSocketClosedException
+    }
+
+    def 'should close the stream when reading the message header throws an exception'() {
+        given:
+        stream.read(16) >> { throw new IOException('Something went wrong') }
+
+        def connection = getOpenedConnection()
+        def (buffers1, messageId1) = helper.isMaster()
+        def (buffers2, messageId2) = helper.isMaster()
+
+        when:
+        connection.sendMessage(buffers1, messageId1)
+        connection.sendMessage(buffers2, messageId2)
+        connection.receiveMessage(messageId1)
+
+        then:
+        connection.isClosed()
+        thrown MongoSocketReadException
+
+        when:
+        connection.receiveMessage(messageId2)
+
+        then:
+        thrown MongoSocketClosedException
+    }
+
+    def 'should throw MongoInternalException when reply header message length > max message length'() {
+        given:
+        stream.read(36) >> { helper.headerWithMessageSizeGreaterThanMax(1) }
+
+        def connection = getOpenedConnection()
+
+        when:
+        connection.receiveMessage(1)
+
+        then:
+        thrown(MongoInternalException)
+        connection.isClosed()
+    }
+
+    def 'should throw MongoInternalException when reply header message length > max message length asynchronously'() {
+        given:
+        stream.readAsync(16, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
+            handler.completed(helper.headerWithMessageSizeGreaterThanMax(1, connectionDescription.maxMessageSize))
+        }
+
+        def connection = getOpenedConnection()
+        def callback = new FutureResultCallback()
+
+        when:
+        connection.receiveMessageAsync(1, callback)
+        callback.get()
+
+        then:
+        thrown(MongoInternalException)
+        connection.isClosed()
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'should close the stream when reading the message header throws an exception asynchronously'() {
+        given:
+        int seen = 0
+        def (buffers1, messageId1, sndCallbck1, rcvdCallbck1) = helper.isMasterAsync()
+        def (buffers2, messageId2, sndCallbck2, rcvdCallbck2) = helper.isMasterAsync()
+        def headers = helper.generateHeaders([messageId1, messageId2])
+
+        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
+            callback.completed(null)
+        }
+        stream.readAsync(16, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
+            if (seen == 0) {
+                seen += 1
+                return handler.failed(new IOException('Something went wrong'))
+            }
+            handler.completed(headers.pop())
+        }
+        stream.readAsync(94, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
+            handler.completed(helper.defaultBody())
+        }
+        def connection = getOpenedConnection()
+
+        when:
+        connection.sendMessageAsync(buffers1, messageId1, sndCallbck1)
+        connection.sendMessageAsync(buffers2, messageId2, sndCallbck2)
+        connection.receiveMessageAsync(messageId1, rcvdCallbck1)
+        connection.receiveMessageAsync(messageId2, rcvdCallbck2)
+        rcvdCallbck1.get(1, SECONDS)
+
+        then:
+        thrown MongoSocketReadException
+        connection.isClosed()
+
+        when:
+        rcvdCallbck2.get(1, SECONDS)
+
+        then:
+        thrown MongoSocketClosedException
+    }
+
+    def 'should close the stream when reading the message body throws an exception'() {
+        given:
+        stream.read(16) >> helper.defaultMessageHeader(1)
+        stream.read(90) >> { throw new IOException('Something went wrong') }
+
+        def connection = getOpenedConnection()
+
+        when:
+        connection.receiveMessage(1)
+
+        then:
+        connection.isClosed()
+        thrown MongoSocketReadException
+
+        when:
+        connection.receiveMessage(1)
+
+        then:
+        thrown MongoSocketClosedException
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'should close the stream when reading the message body throws an exception asynchronously'() {
+        given:
+        def (buffers1, messageId1, sndCallbck1, rcvdCallbck1) = helper.isMasterAsync()
+        def (buffers2, messageId2, sndCallbck2, rcvdCallbck2) = helper.isMasterAsync()
+        def headers = helper.generateHeaders([messageId1, messageId2])
+
+        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
+            callback.completed(null)
+        }
+        stream.readAsync(16, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
+            handler.completed(headers.remove(0))
+        }
+        stream.readAsync(_, _) >> { int numBytes, AsyncCompletionHandler<ByteBuf> handler ->
+            handler.failed(new IOException('Something went wrong'))
+        }
+        def connection = getOpenedConnection()
+
+        when:
+        connection.sendMessageAsync(buffers1, messageId1, sndCallbck1)
+        connection.sendMessageAsync(buffers2, messageId2, sndCallbck2)
+        connection.receiveMessageAsync(messageId1, rcvdCallbck1)
+        rcvdCallbck1.get(1, SECONDS)
+
+        then:
+        thrown MongoSocketReadException
+        connection.isClosed()
+
+        when:
+        connection.receiveMessageAsync(messageId2, rcvdCallbck2)
+        rcvdCallbck2.get(1, SECONDS)
+
+        then:
+        thrown MongoSocketClosedException
+    }
+
+    def 'should not close the stream on a command exception'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def response = '{ok : 0, errmsg : "failed"}'
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> helper.messageHeader(commandMessage.getId(), response)
+        stream.read(_) >> helper.reply(response)
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        thrown(MongoCommandException)
+        !connection.isClosed()
+    }
+
+    def 'should not close the stream on an asynchronous command exception'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+        def response = '{ok : 0, errmsg : "failed"}'
+
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.completed(null)
+        }
+        stream.readAsync(16, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultMessageHeader(commandMessage.getId()))
+        }
+        stream.readAsync(_, _) >> { numBytes, handler ->
+            handler.completed(helper.reply(response))
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, callback)
+        callback.get()
+
+        then:
+        thrown(MongoCommandException)
+        !connection.isClosed()
+    }
+
+    def 'should notify all asynchronous writers of an exception'() {
+        given:
+        int numberOfOperations = 3
+        ExecutorService streamPool = Executors.newFixedThreadPool(1)
+
+        def messages = (1..numberOfOperations).collect { helper.isMasterAsync() }
+
+        def streamLatch = new CountDownLatch(1)
+        stream.writeAsync(_, _) >> { List<ByteBuf> buffers, AsyncCompletionHandler<Void> callback ->
+            streamPool.submit {
+                streamLatch.await()
+                callback.failed(new IOException())
+            }
+        }
+
+        when:
+        def connection = getOpenedConnection()
+        def callbacks = []
+        (1..numberOfOperations).each { n ->
+            def (buffers, messageId, sndCallbck, rcvdCallbck) = messages.pop()
+            connection.sendMessageAsync(buffers, messageId, sndCallbck)
+            callbacks.add(sndCallbck)
+        }
+        streamLatch.countDown()
+
+        then:
+        expectException(callbacks.pop())
+        expectException(callbacks.pop())
+        expectException(callbacks.pop())
+
+        cleanup:
+        streamPool.shutdown()
+    }
+
+    def 'should send events for successful command'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> helper.defaultMessageHeader(commandMessage.getId())
+        stream.read(90) >> helper.defaultReply()
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandSucceededEvent(1, connection.getDescription(), 'ping',
+                        new BsonDocument('ok', new BsonInt32(1)), 1000)])
+    }
+
+    def 'should extract cluster and operation time into session context'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def response = '''{
+                            ok : 1,
+                            operationTime : { $timestamp : { "t" : 40, "i" : 20 } },
+                            $clusterTime :  { clusterTime : { $timestamp : { "t" : 42, "i" : 21 } } }
+                          }'''
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> helper.defaultMessageHeader(commandMessage.getId())
+        stream.read(_) >> helper.reply(response)
+        def sessionContext = Mock(SessionContext) {
+            1 * advanceOperationTime(BsonDocument.parse(response).getTimestamp('operationTime'))
+            1 * advanceClusterTime(BsonDocument.parse(response).getDocument('$clusterTime'))
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), sessionContext)
+
+        then:
+        true
+    }
+
+    def 'should extract cluster and operation time into session context asynchronously'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+        def response = '''{
+                            ok : 1,
+                            operationTime : { $timestamp : { "t" : 40, "i" : 20 } },
+                            $clusterTime :  { clusterTime : { $timestamp : { "t" : 42, "i" : 21 } } }
+                          }'''
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.completed(null)
+        }
+        stream.readAsync(16, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultMessageHeader(commandMessage.getId()))
+        }
+        stream.readAsync(_, _) >> { numBytes, handler ->
+            handler.completed(helper.reply(response))
+        }
+        def sessionContext = Mock(SessionContext) {
+            1 * advanceOperationTime(BsonDocument.parse(response).getTimestamp('operationTime'))
+            1 * advanceClusterTime(BsonDocument.parse(response).getDocument('$clusterTime'))
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), sessionContext, callback)
+        callback.get()
+
+        then:
+        true
+    }
+
+    def 'should send events for command failure with exception writing message'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.write(_) >> { throw new MongoSocketWriteException('Failed to write', serverAddress, new IOException()) }
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        def e = thrown(MongoSocketWriteException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events for command failure with exception reading header'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> { throw new MongoSocketReadException('Failed to read', serverAddress) }
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        def e = thrown(MongoSocketReadException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events for command failure with exception reading body'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> helper.defaultMessageHeader(commandMessage.getId())
+        stream.read(90) >> { throw new MongoSocketReadException('Failed to read', serverAddress) }
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        def e = thrown(MongoSocketException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events for command failure with exception from failed command'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def response = '{ok : 0, errmsg : "failed"}'
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> helper.messageHeader(commandMessage.getId(), response)
+        stream.read(_) >> helper.reply(response)
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        def e = thrown(MongoCommandException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events with elided command and response in successful security-sensitive commands'() {
+        given:
+        def securitySensitiveCommandName = securitySensitiveCommand.keySet().iterator().next()
+        def connection = getOpenedConnection()
+        def commandMessage = new CommandMessage(cmdNamespace, securitySensitiveCommand, fieldNameValidator, primary(), messageSettings)
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> helper.defaultMessageHeader(commandMessage.getId())
+        stream.read(90) >> helper.defaultReply()
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', securitySensitiveCommandName,
+                        new BsonDocument()),
+                new CommandSucceededEvent(1, connection.getDescription(), securitySensitiveCommandName,
+                        new BsonDocument(), 1)])
+
+        where:
+        securitySensitiveCommand << [
+                new BsonDocument('authenticate', new BsonInt32(1)),
+                new BsonDocument('saslStart', new BsonInt32(1)),
+                new BsonDocument('saslContinue', new BsonInt32(1)),
+                new BsonDocument('getnonce', new BsonInt32(1)),
+                new BsonDocument('createUser', new BsonInt32(1)),
+                new BsonDocument('updateUser', new BsonInt32(1)),
+                new BsonDocument('copydbgetnonce', new BsonInt32(1)),
+                new BsonDocument('copydbsaslstart', new BsonInt32(1)),
+                new BsonDocument('copydb', new BsonInt32(1))
+        ]
+    }
+
+    def 'should send failed event with elided exception in failed security-sensitive commands'() {
+        given:
+        def connection = getOpenedConnection()
+        def commandMessage = new CommandMessage(cmdNamespace, securitySensitiveCommand, fieldNameValidator, primary(), messageSettings)
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.read(16) >> helper.defaultMessageHeader(commandMessage.getId())
+        stream.read(_) >> helper.reply('{ok : 0, errmsg : "failed"}')
+
+        when:
+        connection.sendAndReceive(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        thrown(MongoCommandException)
+        CommandFailedEvent failedEvent = commandListener.getEvents().get(1)
+        failedEvent.throwable.class == MongoCommandException
+        MongoCommandException e = failedEvent.throwable
+        e.response == new BsonDocument()
+
+        where:
+        securitySensitiveCommand << [
+                new BsonDocument('authenticate', new BsonInt32(1)),
+                new BsonDocument('saslStart', new BsonInt32(1)),
+                new BsonDocument('saslContinue', new BsonInt32(1)),
+                new BsonDocument('getnonce', new BsonInt32(1)),
+                new BsonDocument('createUser', new BsonInt32(1)),
+                new BsonDocument('updateUser', new BsonInt32(1)),
+                new BsonDocument('copydbgetnonce', new BsonInt32(1)),
+                new BsonDocument('copydbsaslstart', new BsonInt32(1)),
+                new BsonDocument('copydb', new BsonInt32(1))
+        ]
+    }
+
+    def 'should send events for successful asynchronous command'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.completed(null)
+        }
+        stream.readAsync(16, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultMessageHeader(commandMessage.getId()))
+        }
+        stream.readAsync(90, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultReply())
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, callback)
+        callback.get()
+
+        then:
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandSucceededEvent(1, connection.getDescription(), 'ping',
+                        new BsonDocument('ok', new BsonInt32(1)), 1000)])
+    }
+
+
+    def 'should send events for asynchronous command failure with exception writing message'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.failed(new MongoSocketWriteException('failed', serverAddress, new IOException()))
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, callback)
+        callback.get()
+
+        then:
+        def e = thrown(MongoSocketWriteException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events for asynchronous command failure with exception reading header'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.completed(null)
+        }
+        stream.readAsync(16, _) >> { numBytes, handler ->
+            handler.failed(new MongoSocketReadException('Failed to read', serverAddress))
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, callback)
+        callback.get()
+
+        then:
+        def e = thrown(MongoSocketReadException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events for asynchronous command failure with exception reading body'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.completed(null)
+        }
+        stream.readAsync(16, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultMessageHeader(commandMessage.getId()))
+        }
+        stream.readAsync(90, _) >> { numBytes, handler ->
+            handler.failed(new MongoSocketReadException('Failed to read', serverAddress))
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, callback)
+        callback.get()
+
+        then:
+        def e = thrown(MongoSocketReadException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events for asynchronous command failure with exception from failed command'() {
+        given:
+        def connection = getOpenedConnection()
+        def pingCommandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def commandMessage = new CommandMessage(cmdNamespace, pingCommandDocument, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+        def response = '{ok : 0, errmsg : "failed"}'
+
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.completed(null)
+        }
+        stream.readAsync(16, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultMessageHeader(commandMessage.getId()))
+        }
+        stream.readAsync(_, _) >> { numBytes, handler ->
+            handler.completed(helper.reply(response))
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, callback)
+        callback.get()
+
+        then:
+        def e = thrown(MongoCommandException)
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', 'ping',
+                        pingCommandDocument.append('$db', new BsonString('admin'))),
+                new CommandFailedEvent(1, connection.getDescription(), 'ping', 0, e)])
+    }
+
+    def 'should send events with elided command and response in successful security-sensitive asynchronous commands'() {
+        given:
+        def securitySensitiveCommandName = securitySensitiveCommand.keySet().iterator().next()
+        def connection = getOpenedConnection()
+        def commandMessage = new CommandMessage(cmdNamespace, securitySensitiveCommand, fieldNameValidator, primary(), messageSettings)
+        def callback = new FutureResultCallback()
+
+        stream.getBuffer(1024) >> { new ByteBufNIO(ByteBuffer.wrap(new byte[1024])) }
+        stream.writeAsync(_, _) >> { buffers, handler ->
+            handler.completed(null)
+        }
+        stream.readAsync(16, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultMessageHeader(commandMessage.getId()))
+        }
+        stream.readAsync(90, _) >> { numBytes, handler ->
+            handler.completed(helper.defaultReply())
+        }
+
+        when:
+        connection.sendAndReceiveAsync(commandMessage, new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, callback)
+        callback.get()
+
+        then:
+        commandListener.eventsWereDelivered([
+                new CommandStartedEvent(1, connection.getDescription(), 'admin', securitySensitiveCommandName,
+                        new BsonDocument()),
+                new CommandSucceededEvent(1, connection.getDescription(), securitySensitiveCommandName,
+                        new BsonDocument(), 1)])
+
+        where:
+        securitySensitiveCommand << [
+                new BsonDocument('authenticate', new BsonInt32(1)),
+                new BsonDocument('saslStart', new BsonInt32(1)),
+                new BsonDocument('saslContinue', new BsonInt32(1)),
+                new BsonDocument('getnonce', new BsonInt32(1)),
+                new BsonDocument('createUser', new BsonInt32(1)),
+                new BsonDocument('updateUser', new BsonInt32(1)),
+                new BsonDocument('copydbgetnonce', new BsonInt32(1)),
+                new BsonDocument('copydbsaslstart', new BsonInt32(1)),
+                new BsonDocument('copydb', new BsonInt32(1))
+        ]
+    }
+
+    private static boolean expectException(rcvdCallbck) {
+        try {
+            rcvdCallbck.get()
+            false
+        } catch (MongoSocketWriteException) {
+            true
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/JMXConnectionPoolListenerSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/JMXConnectionPoolListenerSpecification.groovy
similarity index 90%
rename from driver-core/src/test/unit/com/mongodb/connection/JMXConnectionPoolListenerSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/internal/connection/JMXConnectionPoolListenerSpecification.groovy
index 3cd98561308..f5d68872599 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/JMXConnectionPoolListenerSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/JMXConnectionPoolListenerSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionPoolSettings
+import com.mongodb.connection.ServerId
 import com.mongodb.management.JMXConnectionPoolListener
 import spock.lang.Specification
 import spock.lang.Subject
@@ -38,8 +41,9 @@ class JMXConnectionPoolListenerSpecification extends Specification {
     def 'statistics should reflect values from the provider'() {
         given:
         provider = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                ConnectionPoolSettings.builder().minSize(0).maxSize(5).maxWaitQueueSize(1).build(),
-                jmxListener)
+                ConnectionPoolSettings.builder().minSize(0).maxSize(5).maxWaitQueueSize(1)
+                        .addConnectionPoolListener(jmxListener).build())
+        provider.start();
 
         when:
         provider.get()
@@ -63,8 +67,9 @@ class JMXConnectionPoolListenerSpecification extends Specification {
     def 'should add MBean'() {
         when:
         provider = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                ConnectionPoolSettings.builder().minSize(0).maxSize(5).maxWaitQueueSize(1).build(),
-                jmxListener)
+                ConnectionPoolSettings.builder().minSize(0).maxSize(5).maxWaitQueueSize(1)
+                        .addConnectionPoolListener(jmxListener).build())
+        provider.start();
 
         then:
         ManagementFactory.getPlatformMBeanServer().isRegistered(
@@ -77,8 +82,10 @@ class JMXConnectionPoolListenerSpecification extends Specification {
     def 'should remove MBean'() {
         given:
         provider = new DefaultConnectionPool(SERVER_ID, connectionFactory,
-                ConnectionPoolSettings.builder().minSize(0).maxSize(5).maxWaitQueueSize(1).build(),
-                jmxListener)
+                ConnectionPoolSettings.builder().minSize(0).maxSize(5).maxWaitQueueSize(1)
+                        .addConnectionPoolListener(jmxListener).build())
+        provider.start();
+
         when:
         provider.close()
 
@@ -120,7 +127,7 @@ class JMXConnectionPoolListenerSpecification extends Specification {
         ObjectName objectName = new ObjectName(beanName)
 
         then:
-        objectName.toString() == "org.mongodb.driver:type=ConnectionPool,clusterId=${serverId.clusterId.value},host=\"[::1]\",port=27017"
+        objectName.toString() == "org.mongodb.driver:type=ConnectionPool,clusterId=${serverId.clusterId.value},host=\"::1\",port=27017"
     }
 
     def 'should include the description in the object name if set'() {
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy
new file mode 100644
index 00000000000..46077f2424c
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoInternalException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ByteBufferBsonOutput
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ServerId
+import com.mongodb.diagnostics.logging.Logger
+import com.mongodb.event.CommandFailedEvent
+import com.mongodb.event.CommandListener
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.event.CommandSucceededEvent
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonBinary
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import spock.lang.Specification
+
+import static com.mongodb.internal.operation.ServerVersionHelper.THREE_DOT_SIX_WIRE_VERSION
+
+class LoggingCommandEventSenderSpecification extends Specification {
+
+    def 'should send events'() {
+        given:
+        def connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()))
+        def namespace = new MongoNamespace('test.driver')
+        def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def commandListener = new TestCommandListener()
+        def commandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def replyDocument = new BsonDocument('ok', new BsonInt32(1))
+        def failureException = new MongoInternalException('failure!')
+        def message = new CommandMessage(namespace, commandDocument,
+                new NoOpFieldNameValidator(), ReadPreference.primary(), messageSettings)
+        def bsonOutput = new ByteBufferBsonOutput(new SimpleBufferProvider())
+        message.encode(bsonOutput, NoOpSessionContext.INSTANCE)
+        def logger = Stub(Logger) {
+            isDebugEnabled() >> debugLoggingEnabled
+        }
+        def sender = new LoggingCommandEventSender([] as Set, connectionDescription, commandListener, message, bsonOutput, logger)
+
+        when:
+        sender.sendStartedEvent()
+        sender.sendSucceededEventForOneWayCommand()
+        sender.sendSucceededEvent(MessageHelper.buildSuccessfulReply(message.getId(), replyDocument.toJson()))
+        sender.sendFailedEvent(failureException)
+
+        then:
+        commandListener.eventsWereDelivered(
+                [
+                        new CommandStartedEvent(message.getId(), connectionDescription, namespace.databaseName,
+                                commandDocument.getFirstKey(), commandDocument.append('$db', new BsonString(namespace.databaseName))),
+                        new CommandSucceededEvent(message.getId(), connectionDescription, commandDocument.getFirstKey(),
+                                new BsonDocument(), 1),
+                        new CommandSucceededEvent(message.getId(), connectionDescription, commandDocument.getFirstKey(),
+                                replyDocument, 1),
+                        new CommandFailedEvent(message.getId(), connectionDescription, commandDocument.getFirstKey(), 1, failureException)
+                ])
+
+        where:
+        debugLoggingEnabled << [true, false]
+    }
+
+    def 'should log events'() {
+        given:
+        def connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()))
+        def namespace = new MongoNamespace('test.driver')
+        def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def commandDocument = new BsonDocument('ping', new BsonInt32(1))
+        def replyDocument = new BsonDocument('ok', new BsonInt32(1))
+        def failureException = new MongoInternalException('failure!')
+        def message = new CommandMessage(namespace, commandDocument, new NoOpFieldNameValidator(), ReadPreference.primary(),
+                messageSettings)
+        def bsonOutput = new ByteBufferBsonOutput(new SimpleBufferProvider())
+        message.encode(bsonOutput, NoOpSessionContext.INSTANCE)
+        def logger = Mock(Logger) {
+            isDebugEnabled() >> true
+        }
+        def sender = new LoggingCommandEventSender([] as Set, connectionDescription, commandListener, message, bsonOutput, logger)
+        when:
+        sender.sendStartedEvent()
+        sender.sendSucceededEventForOneWayCommand()
+        sender.sendSucceededEvent(MessageHelper.buildSuccessfulReply(message.getId(), replyDocument.toJson()))
+        sender.sendFailedEvent(failureException)
+
+        then:
+        1 * logger.debug {
+            it == "Sending command \'{\"ping\": 1, \"\$db\": \"test\"}\' with request id ${message.getId()} to database test " +
+                    "on connection [connectionId{localValue:${connectionDescription.connectionId.localValue}}] " +
+                    'to server 127.0.0.1:27017'
+        }
+        1 * logger.debug {
+            it.matches("Execution of one-way command with request id ${message.getId()} completed successfully in \\d+\\.\\d+ ms " +
+                    "on connection \\[connectionId\\{localValue:${connectionDescription.connectionId.localValue}\\}] " +
+                    'to server 127\\.0\\.0\\.1:27017')
+        }
+        1 * logger.debug {
+            it.matches("Execution of command with request id ${message.getId()} completed successfully in \\d+\\.\\d+ ms " +
+                    "on connection \\[connectionId\\{localValue:${connectionDescription.connectionId.localValue}\\}] " +
+                    'to server 127\\.0\\.0\\.1:27017')
+        }
+        1 * logger.debug({
+            it.matches("Execution of command with request id ${message.getId()} failed to complete successfully in \\d+\\.\\d+ ms " +
+                    "on connection \\[connectionId\\{localValue:${connectionDescription.connectionId.localValue}\\}] " +
+                    'to server 127\\.0\\.0\\.1:27017')
+        }, failureException)
+
+        where:
+        commandListener << [null, Stub(CommandListener)]
+    }
+
+    def 'should log large command with ellipses'() {
+        given:
+        def connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()))
+        def namespace = new MongoNamespace('test.driver')
+        def messageSettings = MessageSettings.builder().maxWireVersion(THREE_DOT_SIX_WIRE_VERSION).build()
+        def commandDocument = new BsonDocument('fake', new BsonBinary(new byte[2048]))
+        def message = new CommandMessage(namespace, commandDocument, new NoOpFieldNameValidator(), ReadPreference.primary(),
+                messageSettings)
+        def bsonOutput = new ByteBufferBsonOutput(new SimpleBufferProvider())
+        message.encode(bsonOutput, NoOpSessionContext.INSTANCE)
+        def logger = Mock(Logger) {
+            isDebugEnabled() >> true
+        }
+        def sender = new LoggingCommandEventSender([] as Set, connectionDescription, null, message, bsonOutput, logger)
+
+        when:
+        sender.sendStartedEvent()
+
+        then:
+        1 * logger.debug {
+            it == "Sending command \'{\"fake\": {\"\$binary\": {\"base64\": \"${'A' * 967} ...\' " +
+                    "with request id ${message.getId()} to database test " +
+                    "on connection [connectionId{localValue:${connectionDescription.connectionId.localValue}}] " +
+                    'to server 127.0.0.1:27017'
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/MaxDocumentSizeTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/MaxDocumentSizeTest.java
new file mode 100644
index 00000000000..431489e192b
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/MaxDocumentSizeTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonMaximumSizeExceededException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+@SuppressWarnings("unchecked")
+public class MaxDocumentSizeTest {
+    private ByteBufferBsonOutput buffer;
+    private InsertMessage message;
+
+    @Before
+    public void setUp() {
+        message = new InsertMessage("test.test",
+                                           new InsertRequest(new BsonDocument("bytes", new BsonBinary(new byte[2048]))),
+                                           MessageSettings.builder().maxDocumentSize(1024).build());
+        buffer = new ByteBufferBsonOutput(new SimpleBufferProvider());
+    }
+
+    @After
+    public void tearDown() {
+        buffer.close();
+    }
+
+    @Test(expected = BsonMaximumSizeExceededException.class)
+    public void testMaxDocumentSize() {
+        message.encode(buffer, NoOpSessionContext.INSTANCE);
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/MessageHelper.java b/driver-core/src/test/unit/com/mongodb/internal/connection/MessageHelper.java
similarity index 83%
rename from driver-core/src/test/unit/com/mongodb/connection/MessageHelper.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/MessageHelper.java
index cd401d1ff2d..675ba95f757 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/MessageHelper.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/MessageHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import org.bson.BsonBinaryReader;
 import org.bson.BsonBinaryWriter;
@@ -26,15 +26,15 @@
 import org.bson.codecs.EncoderContext;
 import org.bson.io.BasicOutputBuffer;
 import org.bson.io.BsonInput;
-import org.bson.io.ByteBufferBsonInput;
 import org.bson.io.OutputBuffer;
 import org.bson.json.JsonReader;
-import org.bson.json.JsonWriter;
 
-import java.io.StringWriter;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize;
+
 final class MessageHelper {
 
     private MessageHelper() {
@@ -76,13 +76,13 @@ private static ReplyHeader buildReplyHeader(final int responseTo, final int numD
         headerByteBuffer.putLong(0); // cursorId
         headerByteBuffer.putInt(0); // startingFrom
         headerByteBuffer.putInt(numDocuments); //numberReturned
-        headerByteBuffer.flip();
+        ((Buffer) headerByteBuffer).flip();
 
-        ByteBufferBsonInput headerInputBuffer = new ByteBufferBsonInput(new ByteBufNIO(headerByteBuffer));
-        return new ReplyHeader(headerInputBuffer, ConnectionDescription.getDefaultMaxMessageSize());
+        ByteBufNIO buffer = new ByteBufNIO(headerByteBuffer);
+        return new ReplyHeader(buffer, new MessageHeader(buffer, getDefaultMaxMessageSize()));
     }
 
-    public static String decodeCommandAsJson(final BsonInput bsonInput) {
+    public static BsonDocument decodeCommand(final BsonInput bsonInput) {
         bsonInput.readInt32(); // length
         bsonInput.readInt32(); //requestId
         bsonInput.readInt32(); //responseTo
@@ -93,12 +93,11 @@ public static String decodeCommandAsJson(final BsonInput bsonInput) {
         bsonInput.readInt32(); // numToReturn
 
         BsonBinaryReader reader = new BsonBinaryReader(bsonInput);
-        BsonDocumentCodec codec = new BsonDocumentCodec();
-        BsonDocument document = codec.decode(reader, DecoderContext.builder().build());
-        StringWriter writer = new StringWriter();
-        JsonWriter jsonWriter = new JsonWriter(writer);
-        codec.encode(jsonWriter, document, EncoderContext.builder().build());
-        return writer.toString();
+        return new BsonDocumentCodec().decode(reader, DecoderContext.builder().build());
+    }
+
+    public static String decodeCommandAsJson(final BsonInput bsonInput) {
+        return decodeCommand(bsonInput).toJson();
     }
 
     private static ByteBuf encodeJson(final String json) {
diff --git a/driver-core/src/test/unit/com/mongodb/connection/MultiServerClusterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/MultiServerClusterSpecification.groovy
similarity index 86%
rename from driver-core/src/test/unit/com/mongodb/connection/MultiServerClusterSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/internal/connection/MultiServerClusterSpecification.groovy
index 7f3a1490c81..8f2e887d02a 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/MultiServerClusterSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/MultiServerClusterSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,17 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
+
 
 import com.mongodb.MongoTimeoutException
 import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterDescription
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ClusterSettings
+import com.mongodb.connection.ClusterType
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerType
 import com.mongodb.event.ClusterListener
 import com.mongodb.selector.WritableServerSelector
 import org.bson.types.ObjectId
@@ -29,6 +36,7 @@ import static com.mongodb.connection.ClusterType.SHARDED
 import static com.mongodb.connection.ClusterType.UNKNOWN
 import static com.mongodb.connection.ServerConnectionState.CONNECTED
 import static com.mongodb.connection.ServerConnectionState.CONNECTING
+import static com.mongodb.connection.ServerDescription.MAX_DRIVER_WIRE_VERSION
 import static com.mongodb.connection.ServerType.REPLICA_SET_GHOST
 import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
 import static com.mongodb.connection.ServerType.REPLICA_SET_SECONDARY
@@ -46,12 +54,31 @@ class MultiServerClusterSpecification extends Specification {
 
     private final TestClusterableServerFactory factory = new TestClusterableServerFactory()
 
+    def setup() {
+        Time.makeTimeConstant()
+    }
+
+    def cleanup() {
+        Time.makeTimeMove()
+    }
+
+    def 'should include settings in cluster description'() {
+        given:
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE)
+                .serverSelectionTimeout(1, MILLISECONDS)
+                .hosts([firstServer]).build(), factory)
+        sendNotification(firstServer, REPLICA_SET_PRIMARY)
+
+        expect:
+        cluster.getDescription().clusterSettings != null
+        cluster.getDescription().serverSettings != null
+    }
+
     def 'should timeout waiting for description if no servers connect'() {
         given:
         def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE)
                 .serverSelectionTimeout(1, MILLISECONDS)
-                .hosts([firstServer]).build(), factory
-        )
+                .hosts([firstServer]).build(), factory)
 
         when:
         cluster.getDescription()
@@ -62,8 +89,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should correct report description when connected to a primary'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(),
+                factory)
 
         when:
         sendNotification(firstServer, REPLICA_SET_PRIMARY)
@@ -71,13 +98,12 @@ class MultiServerClusterSpecification extends Specification {
         then:
         cluster.getDescription().type == REPLICA_SET
         cluster.getDescription().connectionMode == MULTIPLE
-
     }
 
     def 'should not get server when closed'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts(Arrays.asList(firstServer)).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts(Arrays.asList(firstServer)).mode(MULTIPLE).build(),
+                factory)
         cluster.close()
 
         when:
@@ -89,8 +115,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should discover all hosts in the cluster when notified by the primary'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(),
+                factory)
 
         when:
         factory.sendNotification(firstServer, REPLICA_SET_PRIMARY, [firstServer, secondServer, thirdServer])
@@ -101,8 +127,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should discover all hosts in the cluster when notified by a secondary and there is no primary'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(),
+                factory)
 
         when:
         factory.sendNotification(firstServer, REPLICA_SET_SECONDARY, [firstServer, secondServer, thirdServer])
@@ -113,8 +139,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should discover all passives in the cluster'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(),
+                factory)
 
         when:
         factory.sendNotification(firstServer, REPLICA_SET_PRIMARY, [firstServer], [secondServer, thirdServer])
@@ -126,9 +152,8 @@ class MultiServerClusterSpecification extends Specification {
     def 'should remove a secondary server whose reported host name does not match the address connected to'() {
         given:
         def seedListAddress = new ServerAddress('127.0.0.1:27017')
-        def cluster = new MultiServerCluster(CLUSTER_ID,
-                ClusterSettings.builder().hosts([seedListAddress]).build(), factory
-        );
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([seedListAddress]).mode(MULTIPLE).build(),
+                factory)
 
         when:
         factory.sendNotification(seedListAddress, REPLICA_SET_SECONDARY, [firstServer, secondServer], firstServer)
@@ -141,8 +166,7 @@ class MultiServerClusterSpecification extends Specification {
         given:
         def seedListAddress = new ServerAddress('127.0.0.1:27017')
         def cluster = new MultiServerCluster(CLUSTER_ID,
-                ClusterSettings.builder().hosts([seedListAddress]).build(), factory
-        );
+                ClusterSettings.builder().hosts([seedListAddress]).mode(MULTIPLE).build(), factory)
 
         when:
         factory.sendNotification(seedListAddress, REPLICA_SET_PRIMARY, [firstServer, secondServer], firstServer)
@@ -154,7 +178,7 @@ class MultiServerClusterSpecification extends Specification {
     def 'should remove a server when it no longer appears in hosts reported by the primary'() {
         given:
         def cluster = new MultiServerCluster(CLUSTER_ID,
-                ClusterSettings.builder().hosts([firstServer, secondServer, thirdServer]).build(), factory);
+                ClusterSettings.builder().hosts([firstServer, secondServer, thirdServer]).build(), factory)
         sendNotification(firstServer, REPLICA_SET_PRIMARY)
         sendNotification(secondServer, REPLICA_SET_SECONDARY)
         sendNotification(thirdServer, REPLICA_SET_SECONDARY)
@@ -164,13 +188,14 @@ class MultiServerClusterSpecification extends Specification {
 
         then:
         cluster.getDescription().all == factory.getDescriptions(firstServer, secondServer)
+        factory.getServer(thirdServer).isClosed()
     }
 
     def 'should remove a server of the wrong type when type is replica set'() {
         given:
         def cluster = new MultiServerCluster(
-                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(REPLICA_SET).hosts([firstServer, secondServer]).build(), factory
-        )
+                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(REPLICA_SET).hosts([firstServer, secondServer]).build(),
+                factory)
 
         when:
         sendNotification(secondServer, SHARD_ROUTER)
@@ -184,8 +209,8 @@ class MultiServerClusterSpecification extends Specification {
     def 'should ignore an empty list of hosts when type is replica set'() {
         given:
         def cluster = new MultiServerCluster(
-                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(REPLICA_SET).hosts([firstServer, secondServer]).build(), factory
-        )
+                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(REPLICA_SET).hosts([firstServer, secondServer]).build(),
+                factory)
 
         when:
         factory.sendNotification(secondServer, REPLICA_SET_GHOST, [])
@@ -200,8 +225,8 @@ class MultiServerClusterSpecification extends Specification {
     def 'should ignore a host without a replica set name when type is replica set'() {
         given:
         def cluster = new MultiServerCluster(
-                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(REPLICA_SET).hosts([firstServer, secondServer]).build(), factory
-        )
+                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(REPLICA_SET).hosts([firstServer, secondServer]).build(),
+                factory)
 
         when:
         factory.sendNotification(secondServer, REPLICA_SET_GHOST, [firstServer, secondServer], (String) null)  // null replica set name
@@ -215,8 +240,8 @@ class MultiServerClusterSpecification extends Specification {
     def 'should remove a server of the wrong type when type is sharded'() {
         given:
         def cluster = new MultiServerCluster(
-                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(SHARDED).hosts([firstServer, secondServer]).build(), factory
-        )
+                CLUSTER_ID, ClusterSettings.builder().requiredClusterType(SHARDED).hosts([firstServer, secondServer]).build(),
+                factory)
         sendNotification(firstServer, SHARD_ROUTER)
 
         when:
@@ -282,8 +307,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should invalidate existing primary when a new primary notifies'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(),
+                factory)
         sendNotification(firstServer, REPLICA_SET_PRIMARY)
 
         when:
@@ -296,8 +321,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should invalidate new primary if its electionId is less than the previously reported electionId'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(),
+                factory)
         factory.sendNotification(firstServer, REPLICA_SET_PRIMARY, [firstServer, secondServer, thirdServer], new ObjectId(new Date(1000)))
 
         when:
@@ -324,8 +349,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should retain a Standalone server given a hosts list of size 1'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer]).build(),
+                factory)
 
         when:
         sendNotification(firstServer, STANDALONE)
@@ -337,8 +362,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should remove any Standalone server given a hosts list of size greater than one'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(),
+                factory)
 
         when:
         sendNotification(firstServer, STANDALONE)
@@ -353,8 +378,8 @@ class MultiServerClusterSpecification extends Specification {
     def 'should remove a member whose replica set name does not match the required one'() {
         given:
         def cluster = new MultiServerCluster(
-                CLUSTER_ID, ClusterSettings.builder().hosts([secondServer]).requiredReplicaSetName('test1').build(), factory
-        )
+                CLUSTER_ID, ClusterSettings.builder().hosts([secondServer]).mode(MULTIPLE).requiredReplicaSetName('test1').build(),
+                factory)
         when:
         factory.sendNotification(secondServer, REPLICA_SET_PRIMARY, [firstServer, secondServer, thirdServer], 'test2')
 
@@ -365,10 +390,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should throw from getServer if cluster is closed'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder()
-                .serverSelectionTimeout(100, MILLISECONDS)
-                .hosts([firstServer])
-                .build(),
+        def cluster = new MultiServerCluster(CLUSTER_ID,
+                ClusterSettings.builder().serverSelectionTimeout(100, MILLISECONDS).hosts([firstServer]).mode(MULTIPLE).build(),
                 factory)
         cluster.close()
 
@@ -381,8 +404,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should ignore a notification from a server that has been removed'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(),
+                factory)
         factory.sendNotification(firstServer, REPLICA_SET_PRIMARY, [firstServer, thirdServer])
 
         when:
@@ -408,8 +431,7 @@ class MultiServerClusterSpecification extends Specification {
     def 'should add and removes servers from a primary host list when there is a primary'() {
         given:
         def cluster = new MultiServerCluster(CLUSTER_ID,
-                ClusterSettings.builder().hosts([firstServer, secondServer, thirdServer]).build(), factory
-        )
+                ClusterSettings.builder().hosts([firstServer, secondServer, thirdServer]).build(), factory)
         factory.sendNotification(firstServer, REPLICA_SET_PRIMARY, [firstServer, secondServer])
 
         when:
@@ -428,8 +450,7 @@ class MultiServerClusterSpecification extends Specification {
     def 'should ignore a secondary host list when there is a primary'() {
         given:
         def cluster = new MultiServerCluster(CLUSTER_ID,
-                ClusterSettings.builder().hosts([firstServer, secondServer, thirdServer]).build(), factory
-        )
+                ClusterSettings.builder().hosts([firstServer, secondServer, thirdServer]).build(), factory)
         factory.sendNotification(firstServer, REPLICA_SET_PRIMARY, [firstServer, secondServer])
 
         when:
@@ -441,8 +462,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should ignore a notification from a server that is not ok'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(),
+                factory)
         factory.sendNotification(firstServer, REPLICA_SET_PRIMARY, [firstServer, secondServer, thirdServer])
 
         when:
@@ -462,16 +483,12 @@ class MultiServerClusterSpecification extends Specification {
                 .setName('test')
                 .canonicalAddress(firstServer.toString())
                 .setVersion(1)
+                .maxWireVersion(MAX_DRIVER_WIRE_VERSION)
                 .build()
 
         when:
-        def cluster = new MultiServerCluster(CLUSTER_ID,
-                ClusterSettings.builder()
-                        .mode(MULTIPLE)
-                        .hosts([firstServer])
-                        .addClusterListener(clusterListener)
-                        .build(),
-                factory)
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(MULTIPLE).hosts([firstServer])
+                .addClusterListener(clusterListener).build(), factory)
 
         then:
         1 * clusterListener.clusterOpening { it.clusterId == CLUSTER_ID }
@@ -503,8 +520,8 @@ class MultiServerClusterSpecification extends Specification {
 
     def 'should connect to all servers'() {
         given:
-        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(), factory
-        )
+        def cluster = new MultiServerCluster(CLUSTER_ID, ClusterSettings.builder().hosts([firstServer, secondServer]).build(),
+                factory)
 
         when:
         cluster.connect()
diff --git a/driver-core/src/test/unit/com/mongodb/connection/NativeAuthenticatorUnitTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/NativeAuthenticatorUnitTest.java
similarity index 79%
rename from driver-core/src/test/unit/com/mongodb/connection/NativeAuthenticatorUnitTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/NativeAuthenticatorUnitTest.java
index d7e95b8cd78..d27266b1e96 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/NativeAuthenticatorUnitTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/NativeAuthenticatorUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoSecurityException;
 import com.mongodb.ServerAddress;
 import com.mongodb.async.FutureResultCallback;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerId;
 import org.bson.io.BsonInput;
 import org.junit.Before;
 import org.junit.Test;
@@ -27,22 +30,23 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply;
+import static com.mongodb.internal.connection.MessageHelper.buildSuccessfulReply;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class NativeAuthenticatorUnitTest {
     private TestInternalConnection connection;
-    private MongoCredential credential;
     private NativeAuthenticator subject;
     private ConnectionDescription connectionDescription;
 
+    @SuppressWarnings("deprecation")
     @Before
     public void before() {
         connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress("localhost", 27017)));
         connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()));
-        credential = MongoCredential.createMongoCRCredential("\u53f0\u5317", "database", "Ta\u0301ibe\u030Ci".toCharArray());
-        subject = new NativeAuthenticator(this.credential);
+        MongoCredential credential = MongoCredential.createMongoCRCredential("\u53f0\u5317", "database",
+                "Ta\u0301ibe\u030Ci".toCharArray());
+        subject = new NativeAuthenticator(new MongoCredentialWithCache(credential));
     }
 
     @Test
@@ -58,7 +62,7 @@ public void testFailedAuthentication()  {
     }
 
     @Test
-    public void testFailedAuthenticationAsync() throws InterruptedException {
+    public void testFailedAuthenticationAsync() {
         enqueueUnsuccessfulReplies();
 
         FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>();
@@ -113,9 +117,9 @@ private void validateMessages() {
 
         String secondCommand = MessageHelper.decodeCommandAsJson(sent.get(1));
 
-        assertEquals("{ \"getnonce\" : 1 }", firstCommand);
-        assertEquals("{ \"authenticate\" : 1, \"user\" : \"\u53f0\u5317\", "
-                     + "\"nonce\" : \"2375531c32080ae8\", "
-                     + "\"key\" : \"4fb55df196e38eea50d2b8b200acfa8b\" }", secondCommand);
+        assertEquals("{\"getnonce\": 1}", firstCommand);
+        assertEquals("{\"authenticate\": 1, \"user\": \"\u53f0\u5317\", "
+                     + "\"nonce\": \"2375531c32080ae8\", "
+                     + "\"key\": \"4fb55df196e38eea50d2b8b200acfa8b\"}", secondCommand);
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/NoOpSessionContextSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/NoOpSessionContextSpecification.groovy
new file mode 100644
index 00000000000..0eb5fd3e3af
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/NoOpSessionContextSpecification.groovy
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.ReadConcern
+import org.bson.BsonDocument
+import org.bson.BsonTimestamp
+import spock.lang.Specification
+
+class NoOpSessionContextSpecification extends Specification {
+    def 'should be a no-op'() {
+        given:
+        def sessionContext = NoOpSessionContext.INSTANCE
+
+        expect:
+        !sessionContext.hasSession()
+        sessionContext.getClusterTime() == null
+        sessionContext.getOperationTime() == null
+        !sessionContext.isCausallyConsistent()
+        sessionContext.readConcern == ReadConcern.DEFAULT
+
+        when:
+        sessionContext.advanceOperationTime(new BsonTimestamp(42, 1))
+
+        then:
+        true
+
+        when:
+        sessionContext.advanceClusterTime(new BsonDocument())
+
+        then:
+        true
+
+        when:
+        sessionContext.getSessionId()
+
+        then:
+        thrown(UnsupportedOperationException)
+
+        when:
+        sessionContext.advanceTransactionNumber()
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    def 'should provide given read concern for ReadConcernAwareNoOpSessionContext'() {
+        given:
+        def sessionContext = new ReadConcernAwareNoOpSessionContext(ReadConcern.MAJORITY)
+
+        expect:
+        sessionContext.readConcern == ReadConcern.MAJORITY
+    }
+}
\ No newline at end of file
diff --git a/driver-core/src/test/unit/com/mongodb/connection/PlainAuthenticatorUnitTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/PlainAuthenticatorUnitTest.java
similarity index 83%
rename from driver-core/src/test/unit/com/mongodb/connection/PlainAuthenticatorUnitTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/PlainAuthenticatorUnitTest.java
index a082a25aee4..1034a452eef 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/PlainAuthenticatorUnitTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/PlainAuthenticatorUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
 import com.mongodb.async.FutureResultCallback;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerId;
 import org.bson.io.BsonInput;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +42,7 @@ public void before() {
         connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress("localhost", 27017)));
         connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()));
         credential = MongoCredential.createPlainCredential("user", "$external", "pencil".toCharArray());
-        subject = new PlainAuthenticator(this.credential);
+        subject = new PlainAuthenticator(new MongoCredentialWithCache(credential));
     }
 
     @Test
@@ -65,9 +68,9 @@ public void testSuccessfulAuthenticationAsync() throws ExecutionException, Inter
     private void validateMessages() {
         List<BsonInput> sent = connection.getSent();
         String command = MessageHelper.decodeCommandAsJson(sent.get(0));
-        String expectedCommand = "{ \"saslStart\" : 1, "
-                                 + "\"mechanism\" : \"PLAIN\", "
-                                 + "\"payload\" : { \"$binary\" : \"dXNlcgB1c2VyAHBlbmNpbA==\", \"$type\" : \"0\" } }";
+        String expectedCommand = "{\"saslStart\": 1, "
+                                 + "\"mechanism\": \"PLAIN\", "
+                                 + "\"payload\": {\"$binary\": \"dXNlcgB1c2VyAHBlbmNpbA==\", \"$type\": \"00\"}}";
 
         assertEquals(expectedCommand, command);
     }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/PowerOfTwoBufferPoolTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/PowerOfTwoBufferPoolTest.java
index c9dcea1efb0..eecab43427a 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/connection/PowerOfTwoBufferPoolTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/PowerOfTwoBufferPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ProtocolHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ProtocolHelperSpecification.groovy
new file mode 100644
index 00000000000..0bf71212f10
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ProtocolHelperSpecification.groovy
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+
+import com.mongodb.MongoCommandException
+import com.mongodb.MongoExecutionTimeoutException
+import com.mongodb.MongoNodeIsRecoveringException
+import com.mongodb.MongoNotPrimaryException
+import com.mongodb.MongoQueryException
+import com.mongodb.ServerAddress
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonDouble
+import org.bson.BsonInt32
+import org.bson.BsonInt64
+import org.bson.BsonNull
+import org.bson.BsonString
+import spock.lang.Specification
+
+import static com.mongodb.internal.connection.ProtocolHelper.getCommandFailureException
+import static com.mongodb.internal.connection.ProtocolHelper.getQueryFailureException
+import static com.mongodb.internal.connection.ProtocolHelper.isCommandOk
+
+class ProtocolHelperSpecification extends Specification {
+
+    def 'isCommandOk should be false if ok field is missing'() {
+        expect:
+        !isCommandOk(new BsonDocument())
+    }
+
+    def 'isCommandOk should be false for numbers that are 0'() {
+        expect:
+        !isCommandOk(new BsonDocument('ok', new BsonInt32(0)))
+        !isCommandOk(new BsonDocument('ok', new BsonInt64(0)))
+        !isCommandOk(new BsonDocument('ok', new BsonDouble(0.0)))
+    }
+
+    def 'isCommandOk should be true for numbers that are not 0'() {
+        expect:
+        !isCommandOk(new BsonDocument('ok', new BsonInt32(10)))
+        !isCommandOk(new BsonDocument('ok', new BsonInt64(10)))
+        !isCommandOk(new BsonDocument('ok', new BsonDouble(10.0)))
+    }
+
+    def 'isCommandOk should equal the boolean value'() {
+        expect:
+        isCommandOk(new BsonDocument('ok', BsonBoolean.TRUE))
+        !isCommandOk(new BsonDocument('ok', BsonBoolean.FALSE))
+    }
+
+    def 'isCommandOk should be false of ok is not a number or a boolean'() {
+        expect:
+        !isCommandOk(new BsonDocument('ok', new BsonNull()))
+    }
+
+    def 'command failure exception should be MongoExecutionTimeoutException if error code is 50'() {
+        expect:
+        getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('code', new BsonInt32(50)),
+                                   new ServerAddress()) instanceof MongoExecutionTimeoutException
+    }
+
+    def 'query failure exception should be MongoExecutionTimeoutException if error code is 50'() {
+        expect:
+        getQueryFailureException(new BsonDocument('code', new BsonInt32(50)),
+                                 new ServerAddress()) instanceof MongoExecutionTimeoutException
+    }
+
+    def 'command failure exceptions should handle MongoNotPrimaryException scenarios'() {
+        expect:
+        getCommandFailureException(exception, new ServerAddress()) instanceof MongoNotPrimaryException
+
+        where:
+        exception << [
+                BsonDocument.parse('{ok: 0, errmsg: "not master server"}'),
+                BsonDocument.parse('{ok: 0, code: 10107}'),
+                BsonDocument.parse('{ok: 0, code: 13435}')
+        ]
+    }
+
+    def 'query failure exceptions should handle MongoNotPrimaryException scenarios'() {
+        expect:
+        getQueryFailureException(exception, new ServerAddress()) instanceof MongoNotPrimaryException
+
+        where:
+        exception << [
+                BsonDocument.parse('{$err: "not master server"}'),
+                BsonDocument.parse('{code: 10107}'),
+                BsonDocument.parse('{code: 13435}')
+        ]
+    }
+
+    def 'command failure exceptions should handle MongoNodeIsRecoveringException scenarios'() {
+        expect:
+        getCommandFailureException(exception, new ServerAddress()) instanceof MongoNodeIsRecoveringException
+
+        where:
+        exception << [
+                BsonDocument.parse('{ok: 0, errmsg: "node is recovering now"}'),
+                BsonDocument.parse('{ok: 0, code: 11600}'),
+                BsonDocument.parse('{ok: 0, code: 11602}'),
+                BsonDocument.parse('{ok: 0, code: 13436}'),
+                BsonDocument.parse('{ok: 0, code: 189}'),
+                BsonDocument.parse('{ok: 0, code: 91}'),
+        ]
+    }
+
+    def 'query failure exceptions should handle MongoNodeIsRecoveringException scenarios'() {
+        expect:
+        getQueryFailureException(exception, new ServerAddress()) instanceof MongoNodeIsRecoveringException
+
+        where:
+        exception << [
+                BsonDocument.parse('{$err: "node is recovering now"}'),
+                BsonDocument.parse('{code: 11600}'),
+                BsonDocument.parse('{code: 11602}'),
+                BsonDocument.parse('{code: 13436}'),
+                BsonDocument.parse('{code: 189}'),
+                BsonDocument.parse('{code: 91}'),
+        ]
+    }
+
+    def 'command failure exception should be MongoCommandException'() {
+        expect:
+        getCommandFailureException(new BsonDocument('ok', new BsonInt32(0)).append('errmsg', new BsonString('some other problem')),
+                                   new ServerAddress()) instanceof MongoCommandException
+    }
+
+    def 'query failure exception should be MongoQueryException'() {
+        expect:
+        getQueryFailureException(new BsonDocument('$err', new BsonString('some other problem')),
+                                 new ServerAddress()) instanceof MongoQueryException
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ReadConcernHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ReadConcernHelperSpecification.groovy
new file mode 100644
index 00000000000..043c8d0a6ac
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ReadConcernHelperSpecification.groovy
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.ReadConcern
+import com.mongodb.session.SessionContext
+import org.bson.BsonDocument
+import org.bson.BsonString
+import org.bson.BsonTimestamp
+import spock.lang.Specification
+
+import static com.mongodb.internal.connection.ReadConcernHelper.getReadConcernDocument
+
+class ReadConcernHelperSpecification extends Specification {
+
+    def 'should throw IllegalArgumentException if session context is null'() {
+        when:
+        getReadConcernDocument(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should add afterClusterTime to majority read concern when session is causally consistent'() {
+        given:
+        def operationTime = new BsonTimestamp(42, 1)
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> true
+            getOperationTime() >> operationTime
+            getReadConcern() >> ReadConcern.MAJORITY
+        }
+
+        expect:
+        getReadConcernDocument(sessionContext) == new BsonDocument('level', new BsonString('majority'))
+                .append('afterClusterTime', operationTime)
+    }
+
+    def 'should add afterClusterTime to default read concern when session is causally consistent'() {
+        given:
+        def operationTime = new BsonTimestamp(42, 1)
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> true
+            getOperationTime() >> operationTime
+            getReadConcern() >> ReadConcern.DEFAULT
+        }
+
+        expect:
+        getReadConcernDocument(sessionContext) == new BsonDocument(new BsonDocument('afterClusterTime', operationTime))
+    }
+
+    def 'should not add afterClusterTime to ReadConcern when session is not causally consistent'() {
+        given:
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> false
+            getOperationTime() >> { throw new UnsupportedOperationException() }
+            getReadConcern() >> ReadConcern.MAJORITY
+        }
+
+        expect:
+        getReadConcernDocument(sessionContext) == new BsonDocument('level', new BsonString('majority'))
+    }
+
+    def 'should not add afterClusterTime to ReadConcern when operation time is null'() {
+        given:
+        def sessionContext = Stub(SessionContext) {
+            isCausallyConsistent() >> true
+            getOperationTime() >> null
+            getReadConcern() >> ReadConcern.MAJORITY
+        }
+
+        expect:
+        getReadConcernDocument(sessionContext) == new BsonDocument('level', new BsonString('majority'))
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ReplyMessageTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ReplyMessageTest.java
similarity index 76%
rename from driver-core/src/test/unit/com/mongodb/connection/ReplyMessageTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/ReplyMessageTest.java
index cbf02f4dbfe..7432ad713e9 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ReplyMessageTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ReplyMessageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,21 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoInternalException;
 import org.bson.ByteBufNIO;
 import org.bson.Document;
-import org.bson.io.ByteBufferBsonInput;
 import org.junit.Test;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize;
+
 public class ReplyMessageTest {
+
     @Test(expected = MongoInternalException.class)
     public void shouldThrowExceptionIfRequestIdDoesNotMatchResponseTo() {
         int badResponseTo = 34565;
@@ -41,10 +44,10 @@ public void shouldThrowExceptionIfRequestIdDoesNotMatchResponseTo() {
         headerByteBuffer.putLong(0);
         headerByteBuffer.putInt(0);
         headerByteBuffer.putInt(0);
-        headerByteBuffer.flip();
+        ((Buffer) headerByteBuffer).flip();
 
-        ByteBufferBsonInput headerInputBuffer = new ByteBufferBsonInput(new ByteBufNIO(headerByteBuffer));
-        ReplyHeader replyHeader = new ReplyHeader(headerInputBuffer, ConnectionDescription.getDefaultMaxMessageSize());
+        ByteBufNIO byteBuf = new ByteBufNIO(headerByteBuffer);
+        ReplyHeader replyHeader = new ReplyHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()));
         new ReplyMessage<Document>(replyHeader, expectedResponseTo);
     }
 
@@ -62,10 +65,10 @@ public void shouldThrowExceptionIfOpCodeIsIncorrect() {
         headerByteBuffer.putLong(0);
         headerByteBuffer.putInt(0);
         headerByteBuffer.putInt(0);
-        headerByteBuffer.flip();
+        ((Buffer) headerByteBuffer).flip();
 
-        ByteBufferBsonInput headerInputBuffer = new ByteBufferBsonInput(new ByteBufNIO(headerByteBuffer));
-        ReplyHeader replyHeader = new ReplyHeader(headerInputBuffer, ConnectionDescription.getDefaultMaxMessageSize());
+        ByteBufNIO byteBuf = new ByteBufNIO(headerByteBuffer);
+        ReplyHeader replyHeader = new ReplyHeader(byteBuf, new MessageHeader(byteBuf, getDefaultMaxMessageSize()));
         new ReplyMessage<Document>(replyHeader, 5);
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ScramShaAuthenticatorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/ScramShaAuthenticatorSpecification.groovy
new file mode 100644
index 00000000000..7cb475245a9
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ScramShaAuthenticatorSpecification.groovy
@@ -0,0 +1,424 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoSecurityException
+import com.mongodb.ServerAddress
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ServerId
+import org.bson.BsonDocument
+import org.bson.internal.Base64
+import spock.lang.Specification
+
+import javax.security.sasl.SaslException
+import java.nio.charset.Charset
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.MongoCredential.createScramSha1Credential
+import static com.mongodb.MongoCredential.createScramSha256Credential
+import static org.junit.Assert.assertEquals
+import static com.mongodb.internal.connection.MessageHelper.buildSuccessfulReply
+
+class ScramShaAuthenticatorSpecification extends Specification {
+    def serverId = new ServerId(new ClusterId(), new ServerAddress('localhost', 27017))
+    def connectionDescription = new ConnectionDescription(serverId)
+    private final static MongoCredentialWithCache SHA1_CREDENTIAL =
+            new MongoCredentialWithCache(createScramSha1Credential('user', 'database', 'pencil' as char[]))
+    private final static MongoCredentialWithCache SHA256_CREDENTIAL =
+            new MongoCredentialWithCache(createScramSha256Credential('user', 'database', 'pencil' as char[]))
+
+    def 'should successfully authenticate with sha1 as per RFC spec'() {
+        given:
+        def user = 'user'
+        def password = 'pencil'
+        def preppedPassword = 'pencil'
+        def payloads = '''
+            C: n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL
+            S: r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096
+            C: c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=
+            S: v=rmF9pqV8S7suAoZWja4dJRkFsKQ=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha1Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'fyko+d2lbbFgONRv9qkxdawL' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with sha256 as per RFC spec'() {
+        given:
+        def user = 'user'
+        def password = 'pencil'
+        def preppedPassword = 'pencil'
+        def payloads = '''
+            C: n,,n=user,r=rOprNGfwEbeRWgbNEkqO
+            S: r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,s=W22ZaJ0SNY7soEsUEjb6gQ==,i=4096
+            C: c=biws,r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,p=dHzbZapWIk4jUhN+Ute9ytag9zjfMHgsqmmiz7AndVQ=
+            S: v=6rriTRBi23WpRR/wtup+mMhUZUn/dB5nLTJRsjl95G4=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha256Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'rOprNGfwEbeRWgbNEkqO' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+
+    def 'should successfully authenticate with SHA-1 ASCII'() {
+        given:
+        def user = 'user'
+        def password = 'pencil'
+        def preppedPassword = 'pencil'
+        def payloads = '''
+            C: n,,n=user,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=I4oktcY7BOL0Agn0NlWRXlRP1mg=
+            S: v=oKPvB1bE/9ydptJ+kohMgL+NdM0=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha1Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with SHA-1 ASCII user'() {
+        given:
+        def user = 'user'
+        def password = 'p\u00e8ncil'
+        def preppedPassword = 'p\u00e8ncil'
+        def payloads = '''
+            C: n,,n=user,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=yn797N2/XhIwZBB29LhEs6D6XVw=
+            S: v=a6QRQikpGygizEM4/rCOvkgdglI=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha1Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with SHA-1 ASCII pass'() {
+        given:
+        def user = 'ram\u00f5n'
+        def password = 'pencil'
+        def preppedPassword = 'pencil'
+        def payloads = '''
+            C: n,,n=ram\u00f5n,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=kvH02DJiH7oHwk+SKpN4plfpF04=
+            S: v=BoA2mAPlV/b9A5WPDbHmHZi3EGc=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha1Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with SHA-256 ASCII'(){
+        given:
+        def user ='user'
+        def password ='pencil'
+        def preppedPassword ='pencil'
+        def payloads = '''
+            C: n,,n=user,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=ItXnHvCDW7VGij6H+4rv2o93HvkLwrQaLkfVjeSMfrc=
+            S: v=P61v8wxOu6B9J7Uij+Sk4zewSK1e6en6f5rCFO4OUNE=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha256Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with SHA-256 ASCII user'(){
+        given:
+        def user ='user'
+        def password ='p\u00e8ncil'
+        def preppedPassword ='p\u00e8ncil'
+        def payloads = '''
+            C: n,,n=user,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=o6rKPfQCKSGHClFxHjdSeiVCPA6K53++gpY3XlP8lI8=
+            S: v=rsyNAwnHfclZKxAKx1tKfInH3xPVAzCy237DQo5n/N8=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha256Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with SHA-256 ASCII pass'(){
+        given:
+        def user ='ram\u00f5n'
+        def password ='pencil'
+        def preppedPassword ='pencil'
+        def payloads = '''
+            C: n,,n=ram\u00f5n,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=vRdD7SqiY5kMyAFX2enPOJK9BL+3YIVyuzCt1H2qc4o=
+            S: v=sh7QPwVuquMatYobYpYOaPiNS+lqwTCmy3rdexRDDkE=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha256Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with SHA-256 SASLprep normal'(){
+        given:
+        def user ='ram\u00f5n'
+        def password ='p\u00c5assword'
+        def preppedPassword ='p\u00c5assword'
+        def payloads = '''
+            C: n,,n=ram\u00f5n,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=Km2zqmf/GbLdkItzscNI5D0c1f+GmLDi2fScTPm6d4k=
+            S: v=30soY0l2BiInoDyrHxIuamz2LBvci1lFKo/tOMpqo98=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha256Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should successfully authenticate with SHA-256 SASLprep non-normal'(){
+        given:
+        def user ='ramo\u0301n'
+        def password ='p\u212bssword'
+        def preppedPassword ='p\u00c5ssword'
+        def payloads = '''
+            C: n,,n=ramo\u0301n,r=clientNONCE
+            S: r=clientNONCEserverNONCE,s=c2FsdFNBTFRzYWx0,i=4096
+            C: c=biws,r=clientNONCEserverNONCE,p=KkLV/eEHHw0LrTlnmElWuTiL0RxDa8lF/RqzsDP04sE=
+            S: v=eLTDerRxJFOBV8+/9xOcIkv4PezVAcNAarSyqa5mQyI=
+        '''
+
+        when:
+        def credential = new MongoCredentialWithCache(createScramSha256Credential(user, 'database', password as char[]))
+        def authenticator = new ScramShaAuthenticator(credential, { 'clientNONCE' }, { preppedPassword })
+
+        then:
+        validateAuthentication(payloads, authenticator, async)
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw if invalid r value from server'() {
+        when:
+        def serverResponses = ['r=InvalidRValue,s=MYSALT,i=4096']
+        def authenticator = new ScramShaAuthenticator(credential, { 'rOprNGfwEbeRWgbNEkqO' }, { 'pencil' })
+        authenticate(createConnection(serverResponses), authenticator, async)
+
+        then:
+        def e = thrown(MongoSecurityException)
+        e.getCause() instanceof SaslException
+        e.getCause().getMessage() == 'Server sent an invalid nonce.'
+
+        where:
+        [async, credential] << [[true, false], [SHA1_CREDENTIAL, SHA256_CREDENTIAL]].combinations()
+    }
+
+    def 'should throw if iteration count is below the minimium allowed count'() {
+        when:
+        def serverResponses = createMessages('S: r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,s=QSXCR+Q6sek8bf92,i=4095').first()
+        def authenticator = new ScramShaAuthenticator(credential, { 'rOprNGfwEbeRWgbNEkqO' }, { 'pencil' })
+        authenticate(createConnection(serverResponses), authenticator, async)
+
+        then:
+        def e = thrown(MongoSecurityException)
+        e.getCause() instanceof SaslException
+        e.getCause().getMessage() == 'Invalid iteration count.'
+
+        where:
+        [async, credential] << [[true, false], [SHA1_CREDENTIAL, SHA256_CREDENTIAL]].combinations()
+    }
+
+    def 'should throw if invalid server signature'() {
+        when:
+        def serverResponses = createMessages('''
+            S: r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,s=QSXCR+Q6sek8bf92,i=4096
+            S: v=InvalidServerSignature
+        ''').last()
+        def authenticator = new ScramShaAuthenticator(credential, { 'rOprNGfwEbeRWgbNEkqO' }, { 'pencil' })
+        authenticate(createConnection(serverResponses), authenticator, async)
+
+        then:
+        def e = thrown(MongoSecurityException)
+        e.getCause() instanceof SaslException
+        e.getCause().getMessage() == 'Server signature was invalid.'
+
+        where:
+        [async, credential] << [[true, false], [SHA1_CREDENTIAL, SHA256_CREDENTIAL]].combinations()
+    }
+
+    def 'should throw if too many steps SHA-1'() {
+        when:
+        def serverResponses = createMessages('''
+            S: r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096
+            S: v=rmF9pqV8S7suAoZWja4dJRkFsKQ=
+            S: z=ExtraStep
+        ''').last()
+        def authenticator = new ScramShaAuthenticator(SHA1_CREDENTIAL, { 'fyko+d2lbbFgONRv9qkxdawL' }, { 'pencil' })
+        authenticate(createConnection(serverResponses), authenticator, async)
+
+        then:
+        def e = thrown(MongoSecurityException)
+        e.getCause() instanceof SaslException
+        e.getCause().getMessage() == 'Too many steps involved in the SCRAM-SHA-1 negotiation.'
+
+        where:
+        async << [true, false]
+    }
+
+    def 'should throw if too many steps SHA-256'() {
+        when:
+        def serverResponses = createMessages('''
+            S: r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,s=W22ZaJ0SNY7soEsUEjb6gQ==,i=4096
+            S: v=6rriTRBi23WpRR/wtup+mMhUZUn/dB5nLTJRsjl95G4=
+            S: z=ExtraStep
+        ''').last()
+        def authenticator = new ScramShaAuthenticator(SHA256_CREDENTIAL, { 'rOprNGfwEbeRWgbNEkqO' }, { 'pencil' })
+        authenticate(createConnection(serverResponses), authenticator, async)
+
+        then:
+        def e = thrown(MongoSecurityException)
+        e.getCause() instanceof SaslException
+        e.getCause().getMessage() == 'Too many steps involved in the SCRAM-SHA-256 negotiation.'
+
+        where:
+        async << [true, false]
+    }
+
+    def createConnection(List<String> serverResponses) {
+        TestInternalConnection connection = new TestInternalConnection(serverId)
+        serverResponses.each {
+            connection.enqueueReply(
+                    buildSuccessfulReply("{conversationId: 1, payload: BinData(0, '${encode64(it)}'), done: false, ok: 1}")
+            ) }
+        connection.enqueueReply(buildSuccessfulReply('{conversationId: 1, done: true, ok: 1}'))
+        connection
+    }
+
+    def validateClientMessages(TestInternalConnection connection, List<String> clientMessages, String mechanism) {
+        def sent = connection.getSent().collect { MessageHelper.decodeCommand( it ) }
+        assert(clientMessages.size() == sent.size())
+        sent.indices.each {
+            def sentMessage = sent.get(it)
+            def messageStart = it == 0 ? "saslStart: 1, mechanism:'$mechanism'" : 'saslContinue: 1, conversationId: 1'
+            def expectedMessage = BsonDocument.parse("{$messageStart, payload: BinData(0, '${encode64(clientMessages.get(it))}')}")
+            assertEquals(expectedMessage, sentMessage)
+        }
+    }
+
+    def validateAuthentication(String payloads, ScramShaAuthenticator authenticator, boolean async) {
+        def (clientMessages, serverResponses) = createMessages(payloads)
+        def connection = createConnection(serverResponses)
+        authenticate(connection, authenticator, async)
+        validateClientMessages(connection, clientMessages, authenticator.getMechanismName())
+    }
+
+    def authenticate(TestInternalConnection connection, ScramShaAuthenticator authenticator, boolean async) {
+        if (async) {
+            FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>()
+            authenticator.authenticateAsync(connection, connectionDescription, futureCallback)
+            futureCallback.get(5, TimeUnit.SECONDS)
+        } else {
+            authenticator.authenticate(connection, connectionDescription)
+        }
+    }
+
+
+    def encode64(String string) {
+        Base64.encode(string.getBytes(Charset.forName('UTF-8')))
+    }
+
+    def createMessages(String messages) {
+        def (clientMessages, serverResponses) = [[], []]
+        def payloads = messages.stripMargin().readLines()*.trim().findAll { it.length() > 0 }
+        payloads.each {
+            def type = it[0..1]
+            def message = it[2..-1].trim()
+
+            if (type == 'C:') {
+                clientMessages += message
+            } else if (type == 'S:') {
+                serverResponses += message
+            } else {
+                throw new IllegalArgumentException("Invalid message: $message")
+            }
+        }
+        clientMessages += serverResponses.last()
+        [clientMessages, serverResponses]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerDiscoveryAndMonitoringMonitoringTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerDiscoveryAndMonitoringMonitoringTest.java
similarity index 95%
rename from driver-core/src/test/unit/com/mongodb/connection/ServerDiscoveryAndMonitoringMonitoringTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/ServerDiscoveryAndMonitoringMonitoringTest.java
index 56e92130449..24c89c59177 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerDiscoveryAndMonitoringMonitoringTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerDiscoveryAndMonitoringMonitoringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,17 +7,21 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerType;
+import com.mongodb.connection.ServerVersion;
 import com.mongodb.event.ClusterDescriptionChangedEvent;
 import com.mongodb.event.ClusterOpeningEvent;
 import com.mongodb.event.ServerClosedEvent;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerDiscoveryAndMonitoringTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerDiscoveryAndMonitoringTest.java
similarity index 80%
rename from driver-core/src/test/unit/com/mongodb/connection/ServerDiscoveryAndMonitoringTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/ServerDiscoveryAndMonitoringTest.java
index ff7f94f5fca..31c2f9c78e0 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerDiscoveryAndMonitoringTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerDiscoveryAndMonitoringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.connection.ServerDescription;
 import com.mongodb.event.ServerListener;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
@@ -28,6 +29,8 @@
 import java.net.URISyntaxException;
 import java.util.Collection;
 
+import static com.mongodb.internal.event.EventListenerHelper.NO_OP_CLUSTER_LISTENER;
+import static com.mongodb.internal.event.EventListenerHelper.NO_OP_SERVER_LISTENER;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -42,9 +45,9 @@ public ServerDiscoveryAndMonitoringTest(final String description, final BsonDocu
         init(new ServerListenerFactory() {
             @Override
             public ServerListener create(final ServerAddress serverAddress) {
-                return new NoOpServerListener();
+                return NO_OP_SERVER_LISTENER;
             }
-        }, new NoOpClusterListener());
+        }, NO_OP_CLUSTER_LISTENER);
     }
 
     @Test
@@ -54,11 +57,17 @@ public void shouldPassAllOutcomes() {
                 applyResponse(response.asArray());
             }
             BsonDocument outcome = phase.asDocument().getDocument("outcome");
-            assertTopologyType(outcome.getString("topologyType").getValue());
+            assertTopology(outcome);
             assertServers(outcome.getDocument("servers"));
         }
     }
 
+    private void assertTopology(final BsonDocument outcome) {
+        assertTopologyType(outcome.getString("topologyType").getValue());
+        assertLogicalSessionTimeout(outcome.get("logicalSessionTimeoutMinutes"));
+        assertDriverCompatibility(outcome.get("compatible"));
+    }
+
     @Parameterized.Parameters(name = "{0}")
     public static Collection<Object[]> data() throws URISyntaxException, IOException {
         return data("/server-discovery-and-monitoring");
@@ -137,4 +146,19 @@ private void assertTopologyType(final String topologyType) {
             throw new UnsupportedOperationException("No handler for topology type " + topologyType);
         }
     }
+
+    private void assertLogicalSessionTimeout(final BsonValue logicalSessionTimeoutMinutes) {
+        if (logicalSessionTimeoutMinutes.isNull()) {
+            assertNull(getCluster().getCurrentDescription().getLogicalSessionTimeoutMinutes());
+        } else if (logicalSessionTimeoutMinutes.isNumber()) {
+            assertEquals((Integer) logicalSessionTimeoutMinutes.asNumber().intValue(),
+                    getCluster().getCurrentDescription().getLogicalSessionTimeoutMinutes());
+        }
+    }
+
+    private void assertDriverCompatibility(final BsonValue compatible) {
+        if (compatible != null) {
+            assertEquals(compatible.asBoolean().getValue(), getCluster().getCurrentDescription().isCompatibleWithDriver());
+        }
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/ServerListenerFactory.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerListenerFactory.java
new file mode 100644
index 00000000000..f0b14296d7b
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerListenerFactory.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.event.ServerListener;
+
+interface ServerListenerFactory {
+    ServerListener create(ServerAddress serverAddress);
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/ServerSelectionRttTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerSelectionRttTest.java
similarity index 96%
rename from driver-core/src/test/unit/com/mongodb/connection/ServerSelectionRttTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/ServerSelectionRttTest.java
index 72c420863f6..6fbd97a2faa 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/ServerSelectionRttTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/ServerSelectionRttTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/SimpleBufferProvider.java b/driver-core/src/test/unit/com/mongodb/internal/connection/SimpleBufferProvider.java
similarity index 86%
rename from driver-core/src/test/unit/com/mongodb/connection/SimpleBufferProvider.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/SimpleBufferProvider.java
index 92b36bdec9f..aa7dd203931 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/SimpleBufferProvider.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/SimpleBufferProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
+import com.mongodb.connection.BufferProvider;
 import org.bson.ByteBuf;
 import org.bson.ByteBufNIO;
 
diff --git a/driver-core/src/test/unit/com/mongodb/connection/SingleServerClusterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/SingleServerClusterSpecification.groovy
similarity index 89%
rename from driver-core/src/test/unit/com/mongodb/connection/SingleServerClusterSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/internal/connection/SingleServerClusterSpecification.groovy
index e724dcf423d..381817c196d 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/SingleServerClusterSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/SingleServerClusterSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,16 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection
+package com.mongodb.internal.connection
 
 import com.mongodb.MongoIncompatibleDriverException
 import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterDescription
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ClusterSettings
+import com.mongodb.connection.ClusterType
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerType
 import com.mongodb.event.ClusterListener
 import com.mongodb.selector.WritableServerSelector
 import spock.lang.Specification
@@ -37,6 +43,14 @@ class SingleServerClusterSpecification extends Specification {
 
     private final TestClusterableServerFactory factory = new TestClusterableServerFactory()
 
+    def setup() {
+        Time.makeTimeConstant()
+    }
+
+    def cleanup() {
+        Time.makeTimeMove()
+    }
+
     def 'should update description when the server connects'() {
         given:
         def cluster = new SingleServerCluster(CLUSTER_ID,
@@ -139,11 +153,8 @@ class SingleServerClusterSpecification extends Specification {
 
     def 'getServer should throw when cluster is incompatible'() {
         given:
-        def cluster = new SingleServerCluster(CLUSTER_ID,
-                ClusterSettings.builder().mode(SINGLE).hosts(Arrays.asList(firstServer))
-                        .serverSelectionTimeout(1, SECONDS)
-                        .build(),
-                factory)
+        def cluster = new SingleServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(SINGLE).hosts(Arrays.asList(firstServer))
+                        .serverSelectionTimeout(1, SECONDS).build(), factory)
         sendNotification(firstServer, getBuilder(firstServer).minWireVersion(1000).maxWireVersion(1000).build())
 
         when:
@@ -158,10 +169,7 @@ class SingleServerClusterSpecification extends Specification {
 
     def 'should connect to server'() {
         given:
-        def cluster = new SingleServerCluster(CLUSTER_ID,
-                ClusterSettings.builder()
-                        .mode(SINGLE)
-                        .hosts([firstServer]).build(),
+        def cluster = new SingleServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(SINGLE).hosts([firstServer]).build(),
                 factory)
 
         when:
@@ -184,10 +192,8 @@ class SingleServerClusterSpecification extends Specification {
                 [ServerDescription.builder().state(CONNECTING).address(firstServer).build()])
         def listener = Mock(ClusterListener)
         when:
-        def cluster = new SingleServerCluster(CLUSTER_ID,
-                ClusterSettings.builder().mode(SINGLE).hosts([firstServer])
-                        .addClusterListener(listener)
-                        .build(),
+        def cluster = new SingleServerCluster(CLUSTER_ID, ClusterSettings.builder().mode(SINGLE).hosts([firstServer])
+                .addClusterListener(listener).build(),
                 factory)
 
         then:
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/StreamHelper.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/StreamHelper.groovy
new file mode 100644
index 00000000000..fd09137b41e
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/StreamHelper.groovy
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadPreference
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonBinaryWriter
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonReader
+import org.bson.BsonWriter
+import org.bson.ByteBuf
+import org.bson.ByteBufNIO
+import org.bson.io.BasicOutputBuffer
+import org.bson.io.OutputBuffer
+import org.bson.json.JsonReader
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.security.SecureRandom
+
+import static com.mongodb.MongoNamespace.COMMAND_COLLECTION_NAME
+
+class StreamHelper {
+    private static int nextMessageId = 900000 // Generates a message then adds one to the id
+    private static final DEFAULT_JSON_RESPONSE = '{connectionId: 1,   n: 0,   syncMillis: 0,   writtenTo:  null,  err: null,   ok: 1 }'
+
+
+    private static defaultHeader(messageId) {
+        header(messageId, DEFAULT_JSON_RESPONSE)
+    }
+
+    static defaultMessageHeader(messageId) {
+        messageHeader(messageId, DEFAULT_JSON_RESPONSE)
+    }
+
+    static defaultReply() {
+        ByteBuf header = replyHeader()
+        ByteBuf body = defaultBody()
+        ByteBuffer reply = ByteBuffer.allocate(header.remaining() + body.remaining())
+        append(reply, header)
+        append(reply, body)
+        reply.flip()
+        new ByteBufNIO(reply)
+    }
+
+    private static append(final ByteBuffer to, final ByteBuf from) {
+        byte[] bytes = new byte[from.remaining()]
+        from.get(bytes)
+        to.put(bytes)
+    }
+
+    private static defaultReplyHeader() {
+        replyHeader()
+    }
+
+    static messageHeader(messageId, json) {
+        ByteBuffer headerByteBuffer = ByteBuffer.allocate(16).with {
+            order(ByteOrder.LITTLE_ENDIAN)
+            putInt(36 + body(json).remaining()) // messageLength
+            putInt(4)                     // requestId
+            putInt(messageId)                   // responseTo
+            putInt(1)                     // opCode
+        }
+        headerByteBuffer.flip()
+        new ByteBufNIO(headerByteBuffer)
+    }
+
+    private static replyHeader() {
+        ByteBuffer headerByteBuffer = ByteBuffer.allocate(20).with {
+            order(ByteOrder.LITTLE_ENDIAN)
+            putInt(0)                     // responseFlags
+            putLong(0)                    // cursorId
+            putInt(0)                     // starting from
+            putInt(1)                     // number returned
+        }
+        headerByteBuffer.flip()
+        new ByteBufNIO(headerByteBuffer)
+    }
+
+    private static header(messageId, json) {
+        ByteBuffer headerByteBuffer = ByteBuffer.allocate(36).with {
+            order(ByteOrder.LITTLE_ENDIAN)
+            putInt(36 + body(json).remaining()) // messageLength
+            putInt(4)                     // requestId
+            putInt(messageId)                   // responseTo
+            putInt(1)                     // opCode
+            putInt(0)                     // responseFlags
+            putLong(0)                    // cursorId
+            putInt(0)                     // starting from
+            putInt(1)                     // number returned
+        }
+        headerByteBuffer.flip()
+        new ByteBufNIO(headerByteBuffer)
+    }
+
+    static headerWithMessageSizeGreaterThanMax(messageId, maxMessageSize) {
+        ByteBuffer headerByteBuffer = ByteBuffer.allocate(36).with {
+            order(ByteOrder.LITTLE_ENDIAN)
+            putInt(maxMessageSize + 1)  // messageLength
+            putInt(4)             // requestId
+            putInt(messageId)           // responseTo
+            putInt(1)             // opCode
+            putInt(0)             // responseFlags
+            putLong(0)            // cursorId
+            putInt(0)             // starting from
+            putInt(1)             // number returned
+        }
+        headerByteBuffer.flip()
+        new ByteBufNIO(headerByteBuffer)
+    }
+
+    static defaultBody() {
+        body(DEFAULT_JSON_RESPONSE)
+    }
+
+    static reply(json) {
+        ByteBuf replyHeader = defaultReplyHeader()
+        BsonReader reader = new JsonReader(json)
+        BasicOutputBuffer outputBuffer = new BasicOutputBuffer()
+        BsonWriter writer = new BsonBinaryWriter(outputBuffer)
+        writer.pipe(reader)
+
+        ByteBuffer buffer = ByteBuffer.allocate(replyHeader.remaining() +  outputBuffer.size())
+        append(buffer, replyHeader)
+        buffer.put(outputBuffer.toByteArray())
+        buffer.flip()
+        new ByteBufNIO(buffer)
+    }
+
+    private static body(json) {
+        BsonReader reader = new JsonReader(json)
+        BasicOutputBuffer outputBuffer = new BasicOutputBuffer()
+        BsonWriter writer = new BsonBinaryWriter(outputBuffer)
+        writer.pipe(reader)
+        new ByteBufNIO(ByteBuffer.allocate(outputBuffer.size()).put(outputBuffer.toByteArray())).flip()
+    }
+
+    static generateHeaders(List<Integer> messageIds) {
+        boolean ordered = true
+        List<ByteBuf> headers = messageIds.collect { defaultHeader(it) }
+        if (!ordered) {
+            Collections.shuffle(headers, new SecureRandom())
+        }
+        headers
+    }
+
+    static isMaster() {
+        CommandMessage command = new CommandMessage(new MongoNamespace('admin', COMMAND_COLLECTION_NAME),
+                new BsonDocument('ismaster', new BsonInt32(1)), new NoOpFieldNameValidator(), ReadPreference.primary(),
+                MessageSettings.builder().build())
+        OutputBuffer outputBuffer = new BasicOutputBuffer()
+        command.encode(outputBuffer, NoOpSessionContext.INSTANCE)
+        nextMessageId++
+        [outputBuffer.byteBuffers, nextMessageId]
+    }
+
+    static isMasterAsync() {
+        isMaster() + [new FutureResultCallback<Void>(), new FutureResultCallback<ResponseBuffers>()]
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestClusterListener.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestClusterListener.java
similarity index 82%
rename from driver-core/src/test/unit/com/mongodb/connection/TestClusterListener.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TestClusterListener.java
index 8caed26c343..26569abb58d 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TestClusterListener.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestClusterListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,15 +7,14 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.event.ClusterClosedEvent;
 import com.mongodb.event.ClusterDescriptionChangedEvent;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestClusterableServerFactory.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestClusterableServerFactory.java
similarity index 89%
rename from driver-core/src/test/unit/com/mongodb/connection/TestClusterableServerFactory.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TestClusterableServerFactory.java
index ecad30f4700..f460d7e4b4d 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TestClusterableServerFactory.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestClusterableServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ServerAddress;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.ServerType;
 import com.mongodb.event.ServerListener;
 import org.bson.types.ObjectId;
 
@@ -28,12 +31,14 @@
 import java.util.Set;
 
 import static com.mongodb.connection.ServerConnectionState.CONNECTED;
+import static com.mongodb.connection.ServerDescription.MAX_DRIVER_WIRE_VERSION;
 
 public class TestClusterableServerFactory implements ClusterableServerFactory {
     private final Map<ServerAddress, TestServer> addressToServerMap = new HashMap<ServerAddress, TestServer>();
 
     @Override
-    public ClusterableServer create(final ServerAddress serverAddress, final ServerListener serverListener) {
+    public ClusterableServer create(final ServerAddress serverAddress, final ServerListener serverListener,
+                                    final ClusterClock clusterClock) {
         addressToServerMap.put(serverAddress, new TestServer(serverAddress, serverListener));
         return addressToServerMap.get(serverAddress);
     }
@@ -51,6 +56,14 @@ public void sendNotification(final ServerAddress serverAddress, final ServerDesc
         getServer(serverAddress).sendNotification(serverDescription);
     }
 
+    public void sendNotification(final ServerAddress serverAddress, final ServerType serverType) {
+        getServer(serverAddress).sendNotification(ServerDescription.builder()
+                .ok(true)
+                .address(serverAddress)
+                .type(serverType)
+                .state(CONNECTED)
+                .build());
+    }
 
     public void sendNotification(final ServerAddress serverAddress, final ServerType serverType, final List<ServerAddress> hosts) {
         sendNotification(serverAddress, serverType, hosts, "test");
@@ -143,6 +156,7 @@ private ServerDescription.Builder getBuilder(final ServerAddress serverAddress,
                                 .passives(passivesSet)
                                 .setName(setName)
                                 .electionId(electionId)
+                                .maxWireVersion(MAX_DRIVER_WIRE_VERSION)
                                 .setVersion(1);
     }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnection.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnection.java
new file mode 100644
index 00000000000..dd1d606127d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnection.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.QueryResult;
+import com.mongodb.connection.SplittablePayload;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.FieldNameValidator;
+import org.bson.codecs.Decoder;
+
+import java.util.List;
+
+@SuppressWarnings({"rawtypes", "unchecked", "deprecation"})
+class TestConnection implements Connection, AsyncConnection {
+    private final InternalConnection internalConnection;
+    private final ProtocolExecutor executor;
+    private LegacyProtocol enqueuedLegacyProtocol;
+    private CommandProtocol enqueuedCommandProtocol;
+
+    TestConnection(final InternalConnection internalConnection, final ProtocolExecutor executor) {
+        this.internalConnection = internalConnection;
+        this.executor = executor;
+    }
+
+    @Override
+    public int getCount() {
+        return 1;
+    }
+
+    @Override
+    public TestConnection retain() {
+        return this;
+    }
+
+    @Override
+    public void release() {
+    }
+
+    @Override
+    public ConnectionDescription getDescription() {
+        throw new UnsupportedOperationException("Not implemented yet!");
+    }
+
+    @Override
+    public WriteConcernResult insert(final MongoNamespace namespace, final boolean ordered,
+                                     final InsertRequest insertRequest) {
+        return executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public void insertAsync(final MongoNamespace namespace, final boolean ordered,
+                            final InsertRequest insertRequest, final SingleResultCallback<WriteConcernResult> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+    @Override
+    public WriteConcernResult update(final MongoNamespace namespace, final boolean ordered,
+                                     final UpdateRequest updateRequest) {
+        return executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public void updateAsync(final MongoNamespace namespace, final boolean ordered,
+                            final UpdateRequest updateRequest, final SingleResultCallback<WriteConcernResult> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+    @Override
+    public WriteConcernResult delete(final MongoNamespace namespace, final boolean ordered,
+                                     final DeleteRequest deleteRequest) {
+        return executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public void deleteAsync(final MongoNamespace namespace, final boolean ordered,
+                            final DeleteRequest deleteRequest,
+                            final SingleResultCallback<WriteConcernResult> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final boolean slaveOk,
+                         final FieldNameValidator fieldNameValidator,
+                         final Decoder<T> commandResultDecoder) {
+        return executeEnqueuedCommandBasedProtocol(null);
+    }
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
+                         final ReadPreference readPreference, final Decoder<T> commandResultDecoder, final SessionContext sessionContext) {
+        return executeEnqueuedCommandBasedProtocol(sessionContext);
+    }
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                         final ReadPreference readPreference, final Decoder<T> commandResultDecoder, final SessionContext sessionContext,
+                         final boolean responseExpected, final SplittablePayload payload,
+                         final FieldNameValidator payloadFieldNameValidator) {
+        return executeEnqueuedCommandBasedProtocol(sessionContext);
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final boolean slaveOk,
+                                 final FieldNameValidator fieldNameValidator,
+                                 final Decoder<T> commandResultDecoder, final SingleResultCallback<T> callback) {
+        executeEnqueuedCommandBasedProtocolAsync(null, callback);
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
+                                 final ReadPreference readPreference, final Decoder<T> commandResultDecoder,
+                                 final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+        executeEnqueuedCommandBasedProtocolAsync(sessionContext, callback);
+    }
+
+    @Override
+    public <T> void commandAsync(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                                 final ReadPreference readPreference, final Decoder<T> commandResultDecoder,
+                                 final SessionContext sessionContext, final boolean responseExpected, final SplittablePayload payload,
+                                 final FieldNameValidator payloadFieldNameValidator, final SingleResultCallback<T> callback) {
+        executeEnqueuedCommandBasedProtocolAsync(sessionContext, callback);
+    }
+
+    @Override
+    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                                    final int numberToReturn, final int skip,
+                                    final boolean slaveOk, final boolean tailableCursor, final boolean awaitData,
+                                    final boolean noCursorTimeout,
+                                    final boolean partial, final boolean oplogReplay, final Decoder<T> resultDecoder) {
+        return executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                                    final int skip, final int limit,
+                                    final int batchSize, final boolean slaveOk, final boolean tailableCursor, final boolean awaitData,
+                                    final boolean noCursorTimeout,
+                                    final boolean partial, final boolean oplogReplay, final Decoder<T> resultDecoder) {
+        return executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                               final int numberToReturn, final int skip,
+                               final boolean slaveOk, final boolean tailableCursor, final boolean awaitData, final boolean noCursorTimeout,
+                               final boolean partial,
+                               final boolean oplogReplay, final Decoder<T> resultDecoder,
+                               final SingleResultCallback<QueryResult<T>> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+    @Override
+    public <T> void queryAsync(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields, final int skip,
+                               final int limit,
+                               final int batchSize, final boolean slaveOk, final boolean tailableCursor, final boolean awaitData,
+                               final boolean noCursorTimeout,
+                               final boolean partial, final boolean oplogReplay, final Decoder<T> resultDecoder,
+                               final SingleResultCallback<QueryResult<T>> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+    @Override
+    public <T> QueryResult<T> getMore(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
+                                      final Decoder<T> resultDecoder) {
+        return executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public <T> void getMoreAsync(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
+                                 final Decoder<T> resultDecoder,
+                                 final SingleResultCallback<QueryResult<T>> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+    @Override
+    public void killCursor(final List<Long> cursors) {
+        executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public void killCursor(final MongoNamespace namespace, final List<Long> cursors) {
+        executeEnqueuedLegacyProtocol();
+    }
+
+    @Override
+    public void killCursorAsync(final List<Long> cursors, final SingleResultCallback<Void> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+    @Override
+    public void killCursorAsync(final MongoNamespace namespace, final List<Long> cursors, final SingleResultCallback<Void> callback) {
+        executeEnqueuedLegacyProtocolAsync(callback);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T executeEnqueuedLegacyProtocol() {
+        return (T) executor.execute(enqueuedLegacyProtocol, internalConnection);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> void executeEnqueuedLegacyProtocolAsync(final SingleResultCallback<T> callback) {
+        executor.executeAsync(enqueuedLegacyProtocol, internalConnection, callback);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T executeEnqueuedCommandBasedProtocol(final SessionContext sessionContext) {
+        return (T) executor.execute(enqueuedCommandProtocol, internalConnection, sessionContext);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> void executeEnqueuedCommandBasedProtocolAsync(final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+        executor.executeAsync(enqueuedCommandProtocol, internalConnection, sessionContext, callback);
+    }
+
+    void enqueueProtocol(final LegacyProtocol protocol) {
+        enqueuedLegacyProtocol = protocol;
+    }
+
+    void enqueueProtocol(final CommandProtocol protocol) {
+        enqueuedCommandProtocol = protocol;
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestConnectionFactory.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionFactory.java
similarity index 78%
rename from driver-core/src/test/unit/com/mongodb/connection/TestConnectionFactory.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionFactory.java
index 42fd26c95e4..484092814bd 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TestConnectionFactory.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.Connection;
 
 class TestConnectionFactory implements ConnectionFactory {
     @Override
     public Connection create(final InternalConnection internalConnection, final ProtocolExecutor executor,
-                                 final ClusterConnectionMode clusterConnectionMode) {
+                             final ClusterConnectionMode clusterConnectionMode) {
         return new TestConnection(internalConnection, executor);
     }
 
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestConnectionPool.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionPool.java
similarity index 81%
rename from driver-core/src/test/unit/com/mongodb/connection/TestConnectionPool.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionPool.java
index c5deb3c5cdc..671f3e7dbd8 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TestConnectionPool.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoException;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.session.SessionContext;
 import org.bson.ByteBuf;
+import org.bson.codecs.Decoder;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +38,10 @@ public TestConnectionPool(final MongoException exceptionToThrow) {
         this.exceptionToThrow = exceptionToThrow;
     }
 
+    @Override
+    public void start() {
+    }
+
     @Override
     public InternalConnection get() {
         return new InternalConnection() {
@@ -48,6 +55,17 @@ public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId
                 throw new UnsupportedOperationException("Not implemented yet!");
             }
 
+            @Override
+            public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+                throw new UnsupportedOperationException("Not implemented yet!");
+            }
+
+            @Override
+            public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder,
+                                                final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+                throw new UnsupportedOperationException("Not implemented yet!");
+            }
+
             @Override
             public ResponseBuffers receiveMessage(final int responseTo) {
                 throw new UnsupportedOperationException("Not implemented yet!");
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionPoolListener.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionPoolListener.java
new file mode 100644
index 00000000000..4ef723f6c63
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestConnectionPoolListener.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.event.ConnectionAddedEvent;
+import com.mongodb.event.ConnectionCheckedInEvent;
+import com.mongodb.event.ConnectionCheckedOutEvent;
+import com.mongodb.event.ConnectionPoolClosedEvent;
+import com.mongodb.event.ConnectionPoolListener;
+import com.mongodb.event.ConnectionPoolOpenedEvent;
+import com.mongodb.event.ConnectionPoolWaitQueueEnteredEvent;
+import com.mongodb.event.ConnectionPoolWaitQueueExitedEvent;
+import com.mongodb.event.ConnectionRemovedEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class TestConnectionPoolListener implements ConnectionPoolListener {
+
+    private final List<Object> events = new ArrayList<Object>();
+    private final Lock lock = new ReentrantLock();
+    private final Condition condition = lock.newCondition();
+    private volatile Class<?> waitingForEventClass;
+    private volatile int waitingForEventCount;
+
+    public TestConnectionPoolListener() {
+    }
+
+    public List<Object> getEvents() {
+        lock.lock();
+        try {
+            return new ArrayList<Object>(events);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public <T> int countEvents(final Class<T> eventClass) {
+        int eventCount = 0;
+        for (Object event : getEvents()) {
+            if (event.getClass().equals(eventClass)) {
+                eventCount++;
+            }
+        }
+        return eventCount;
+    }
+
+    public <T> void waitForEvent(final Class<T> eventClass, final int count, final long time, final TimeUnit unit)
+            throws InterruptedException, TimeoutException {
+        lock.lock();
+        try {
+            if (waitingForEventClass != null) {
+                throw new IllegalStateException("Already waiting for events of class " + waitingForEventClass);
+            }
+            waitingForEventClass = eventClass;
+            waitingForEventCount = count;
+            if (containsEvent(eventClass, count)) {
+                return;
+            }
+            if (!condition.await(time, unit)) {
+                throw new TimeoutException("Timed out waiting for " + count + " events of type " + eventClass);
+            }
+        } finally {
+            waitingForEventClass = null;
+            lock.unlock();
+        }
+    }
+
+    private <T> boolean containsEvent(final Class<T> eventClass, final int expectedEventCount) {
+        return countEvents(eventClass) == expectedEventCount;
+    }
+
+    private void addEvent(final Object event) {
+        lock.lock();
+        try {
+            events.add(event);
+            if (containsEvent(waitingForEventClass, waitingForEventCount)) {
+                if (waitingForEventClass != null) {
+                    waitingForEventClass = null;
+                    condition.signalAll();
+                }
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    @Override
+    public void connectionPoolOpened(final ConnectionPoolOpenedEvent event) {
+        addEvent(event);
+    }
+
+    @Override
+    public void connectionPoolClosed(final ConnectionPoolClosedEvent event) {
+        addEvent(event);
+    }
+
+    @Override
+    public void connectionCheckedOut(final ConnectionCheckedOutEvent event) {
+        addEvent(event);
+    }
+
+    @Override
+    public void connectionCheckedIn(final ConnectionCheckedInEvent event) {
+        addEvent(event);
+    }
+
+    @Override
+    public void waitQueueEntered(final ConnectionPoolWaitQueueEnteredEvent event) {
+        addEvent(event);
+    }
+
+    @Override
+    public void waitQueueExited(final ConnectionPoolWaitQueueExitedEvent event) {
+        addEvent(event);
+    }
+
+    @Override
+    public void connectionAdded(final ConnectionAddedEvent event) {
+        addEvent(event);
+    }
+
+    @Override
+    public void connectionRemoved(final ConnectionRemovedEvent event) {
+        addEvent(event);
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnection.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnection.java
new file mode 100644
index 00000000000..096a7da3f5e
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnection.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoException;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.BufferProvider;
+import com.mongodb.connection.ByteBufferBsonOutput;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonBinaryReader;
+import org.bson.BsonDocument;
+import org.bson.ByteBuf;
+import org.bson.ByteBufNIO;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.Decoder;
+import org.bson.io.BsonInput;
+import org.bson.io.ByteBufferBsonInput;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.mongodb.internal.connection.ProtocolHelper.getCommandFailureException;
+import static com.mongodb.internal.connection.ProtocolHelper.isCommandOk;
+
+class TestInternalConnection implements InternalConnection {
+
+    private static class Interaction {
+        private ResponseBuffers responseBuffers;
+        private RuntimeException receiveException;
+        private RuntimeException sendException;
+    }
+
+    private final ConnectionDescription description;
+    private final BufferProvider bufferProvider;
+    private final Deque<Interaction> replies;
+    private final List<BsonInput> sent;
+    private boolean opened;
+    private boolean closed;
+
+    TestInternalConnection(final ServerId serverId) {
+        this.description = new ConnectionDescription(serverId);
+        this.bufferProvider = new SimpleBufferProvider();
+
+        this.replies = new LinkedList<Interaction>();
+        this.sent = new LinkedList<BsonInput>();
+    }
+
+    public void enqueueReply(final ResponseBuffers responseBuffers) {
+        Interaction interaction = new Interaction();
+        interaction.responseBuffers = responseBuffers;
+        replies.add(interaction);
+    }
+
+    public void enqueueSendMessageException(final RuntimeException e) {
+        Interaction interaction = new Interaction();
+        interaction.sendException = e;
+        replies.add(interaction);
+    }
+
+    public void enqueueReceiveMessageException(final RuntimeException e) {
+        Interaction interaction = new Interaction();
+        interaction.receiveException = e;
+        replies.add(interaction);
+    }
+
+    public List<BsonInput> getSent() {
+        return sent;
+    }
+
+    @Override
+    public ConnectionDescription getDescription() {
+        return description;
+    }
+
+    public void open() {
+        opened = true;
+    }
+
+    @Override
+    public void openAsync(final SingleResultCallback<Void> callback) {
+        opened = true;
+        callback.onResult(null, null);
+    }
+
+    @Override
+    public void close() {
+        closed = true;
+    }
+
+    @Override
+    public boolean opened() {
+        return opened;
+    }
+
+    @Override
+    public boolean isClosed() {
+        return closed;
+    }
+
+    @Override
+    public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
+        // repackage all byte buffers into a single byte buffer...
+        int totalSize = 0;
+        for (ByteBuf buf : byteBuffers) {
+            totalSize += buf.remaining();
+        }
+
+        ByteBuffer combined = ByteBuffer.allocate(totalSize);
+        for (ByteBuf buf : byteBuffers) {
+            combined.put(buf.array(), 0, buf.remaining());
+        }
+
+        ((Buffer) combined).flip();
+
+        Interaction interaction = replies.getFirst();
+        if (interaction.responseBuffers != null) {
+            ReplyHeader header = replaceResponseTo(interaction.responseBuffers.getReplyHeader(), lastRequestId);
+            interaction.responseBuffers = (new ResponseBuffers(header, interaction.responseBuffers.getBodyByteBuffer()));
+
+            sent.add(new ByteBufferBsonInput(new ByteBufNIO(combined)));
+        } else if (interaction.sendException != null) {
+            replies.removeFirst();
+            throw interaction.sendException;
+        }
+    }
+
+    @Override
+    public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+        ByteBufferBsonOutput bsonOutput = new ByteBufferBsonOutput(this);
+        try {
+            message.encode(bsonOutput, sessionContext);
+            sendMessage(bsonOutput.getByteBuffers(), message.getId());
+        } finally {
+            bsonOutput.close();
+        }
+        ResponseBuffers responseBuffers = receiveMessage(message.getId());
+        try {
+            boolean commandOk = isCommandOk(new BsonBinaryReader(new ByteBufferBsonInput(responseBuffers.getBodyByteBuffer())));
+            responseBuffers.reset();
+            if (!commandOk) {
+                throw getCommandFailureException(getResponseDocument(responseBuffers, message, new BsonDocumentCodec()),
+                        description.getServerAddress());
+            }
+            return new ReplyMessage<T>(responseBuffers, decoder, message.getId()).getDocuments().get(0);
+        } finally {
+            responseBuffers.close();
+        }
+    }
+
+    private <T extends BsonDocument> T getResponseDocument(final ResponseBuffers responseBuffers,
+                                                           final CommandMessage commandMessage, final Decoder<T> decoder) {
+        ReplyMessage<T> replyMessage = new ReplyMessage<T>(responseBuffers, decoder, commandMessage.getId());
+        responseBuffers.reset();
+        return replyMessage.getDocuments().get(0);
+    }
+
+    @Override
+    public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder,
+                                        final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+        try {
+            T result = sendAndReceive(message, decoder, sessionContext);
+            callback.onResult(result, null);
+        } catch (MongoException ex) {
+            callback.onResult(null, ex);
+        }
+    }
+
+    private ReplyHeader replaceResponseTo(final ReplyHeader header, final int responseTo) {
+        ByteBuffer headerByteBuffer = ByteBuffer.allocate(36);
+        headerByteBuffer.order(ByteOrder.LITTLE_ENDIAN);
+        headerByteBuffer.putInt(header.getMessageLength());
+        headerByteBuffer.putInt(header.getRequestId());
+        headerByteBuffer.putInt(responseTo);
+        headerByteBuffer.putInt(1);
+        headerByteBuffer.putInt(header.getResponseFlags());
+        headerByteBuffer.putLong(header.getCursorId());
+        headerByteBuffer.putInt(header.getStartingFrom());
+        headerByteBuffer.putInt(header.getNumberReturned());
+        ((Buffer) headerByteBuffer).flip();
+
+        ByteBufNIO buffer = new ByteBufNIO(headerByteBuffer);
+        MessageHeader messageHeader = new MessageHeader(buffer, ConnectionDescription.getDefaultMaxMessageSize());
+        return new ReplyHeader(buffer, messageHeader);    }
+
+    @Override
+    public ResponseBuffers receiveMessage(final int responseTo) {
+        if (this.replies.isEmpty()) {
+            throw new MongoException("Test was not setup properly as too many calls to receiveMessage occured.");
+        }
+
+        Interaction interaction = replies.removeFirst();
+        if (interaction.responseBuffers != null) {
+            return interaction.responseBuffers;
+        } else {
+            throw interaction.receiveException;
+        }
+    }
+
+    @Override
+    public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
+        try {
+            sendMessage(byteBuffers, lastRequestId);
+            callback.onResult(null, null);
+        } catch (RuntimeException e) {
+            callback.onResult(null, e);
+        }
+    }
+
+    @Override
+    public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
+        try {
+            ResponseBuffers buffers = receiveMessage(responseTo);
+            callback.onResult(buffers, null);
+        } catch (MongoException ex) {
+            callback.onResult(null, ex);
+        }
+    }
+
+    @Override
+    public ByteBuf getBuffer(final int size) {
+        return this.bufferProvider.getBuffer(size);
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnectionFactory.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnectionFactory.java
new file mode 100644
index 00000000000..5e0b3d01474
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestInternalConnectionFactory.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerType;
+import com.mongodb.session.SessionContext;
+import org.bson.ByteBuf;
+import org.bson.codecs.Decoder;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.mongodb.connection.ServerDescription.getDefaultMaxDocumentSize;
+
+class TestInternalConnectionFactory implements InternalConnectionFactory {
+    private final AtomicInteger incrementingId = new AtomicInteger();
+    private final List<TestInternalConnection> createdConnections = new ArrayList<TestInternalConnection>();
+
+    @Override
+    public InternalConnection create(final ServerId serverId) {
+        TestInternalConnection connection = new TestInternalConnection(serverId);
+        createdConnections.add(connection);
+        return connection;
+    }
+
+    List<TestInternalConnection> getCreatedConnections() {
+        return createdConnections;
+    }
+
+    int getNumCreatedConnections() {
+        return createdConnections.size();
+    }
+
+    class TestInternalConnection implements InternalConnection {
+        private final ConnectionId connectionId;
+        private boolean closed;
+        private boolean opened;
+
+        TestInternalConnection(final ServerId serverId) {
+            this.connectionId = new ConnectionId(serverId, incrementingId.incrementAndGet(), null);
+        }
+
+        public void open() {
+            opened = true;
+        }
+
+        @Override
+        public void openAsync(final SingleResultCallback<Void> callback) {
+            opened = true;
+            callback.onResult(null, null);
+        }
+
+        @Override
+        public void close() {
+            closed = true;
+        }
+
+        @Override
+        public boolean opened() {
+            return opened;
+        }
+
+        @Override
+        public boolean isClosed() {
+            return closed;
+        }
+
+        @Override
+        public ByteBuf getBuffer(final int size) {
+            return null;
+        }
+
+        @Override
+        public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
+        }
+
+        @Override
+        public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+            return null;
+        }
+
+        @Override
+        public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder,
+                                            final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+            callback.onResult(null, null);
+        }
+
+        @Override
+        public ResponseBuffers receiveMessage(final int responseTo) {
+            return null;
+        }
+
+        @Override
+        public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
+            callback.onResult(null, null);
+        }
+
+        @Override
+        public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
+            callback.onResult(null, null);
+        }
+
+        @Override
+        public ConnectionDescription getDescription() {
+            return new ConnectionDescription(connectionId, 7, ServerType.UNKNOWN, 1000,
+                    getDefaultMaxDocumentSize(), 100000, Collections.<String>emptyList());
+
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestServer.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServer.java
similarity index 86%
rename from driver-core/src/test/unit/com/mongodb/connection/TestServer.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TestServer.java
index d5d976de0bf..cfe1c8a345b 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TestServer.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,15 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ServerAddress;
 import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
 import com.mongodb.event.ServerDescriptionChangedEvent;
 import com.mongodb.event.ServerListener;
 
@@ -50,6 +55,11 @@ public void invalidate() {
         sendNotification(ServerDescription.builder().state(CONNECTING).address(serverId.getAddress()).build());
     }
 
+    @Override
+    public void invalidate(final Throwable reason) {
+        invalidate();
+    }
+
     @Override
     public void close() {
         isClosed = true;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestServerListener.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServerListener.java
similarity index 81%
rename from driver-core/src/test/unit/com/mongodb/connection/TestServerListener.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TestServerListener.java
index 19896b4181a..9d3acb7774b 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TestServerListener.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7,15 +7,14 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.event.ServerClosedEvent;
 import com.mongodb.event.ServerDescriptionChangedEvent;
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TestServerMonitor.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServerMonitor.java
similarity index 87%
rename from driver-core/src/test/unit/com/mongodb/connection/TestServerMonitor.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TestServerMonitor.java
index cbd1599ad49..de2364941c5 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TestServerMonitor.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServerMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
 
 import static com.mongodb.connection.ServerConnectionState.CONNECTING;
 import static com.mongodb.connection.ServerType.UNKNOWN;
@@ -23,7 +26,7 @@ class TestServerMonitor implements ServerMonitor {
     private ServerDescription currentDescription;
     private ChangeListener<ServerDescription> serverStateListener;
 
-    public TestServerMonitor(final ServerId serverId) {
+    TestServerMonitor(final ServerId serverId) {
         currentDescription = ServerDescription.builder().type(UNKNOWN).state(CONNECTING).address(serverId.getAddress()).build();
     }
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TestServerMonitorFactory.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServerMonitorFactory.java
new file mode 100644
index 00000000000..39fd59bdd2b
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestServerMonitorFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerId;
+
+class TestServerMonitorFactory implements ServerMonitorFactory {
+
+    private final TestServerMonitor monitor;
+
+    TestServerMonitorFactory(final ServerId serverId) {
+        this.monitor = new TestServerMonitor(serverId);
+    }
+
+    @Override
+    public TestServerMonitor create(final ChangeListener<ServerDescription> serverStateListener) {
+        monitor.setServerStateListener(serverStateListener);
+        return monitor;
+    }
+
+    public void sendNotification(final ServerDescription serverDescription) {
+        monitor.sendNotification(serverDescription);
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TestSessionContext.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TestSessionContext.java
new file mode 100644
index 00000000000..4654780a6cb
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TestSessionContext.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+class TestSessionContext implements SessionContext {
+
+    private BsonDocument clusterTime;
+    private BsonTimestamp operationTime;
+
+    TestSessionContext(final BsonDocument initialClusterTime) {
+        this.clusterTime = initialClusterTime;
+    }
+
+    public BsonTimestamp getOperationTime() {
+        return operationTime;
+    }
+
+    @Override
+    public boolean hasSession() {
+        return false;
+    }
+
+    @Override
+    public boolean isImplicitSession() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public BsonDocument getSessionId() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isCausallyConsistent() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long getTransactionNumber() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long advanceTransactionNumber() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean notifyMessageSent() {
+        return false;
+    }
+
+    @Override
+    public void advanceOperationTime(final BsonTimestamp operationTime) {
+        this.operationTime = operationTime;
+    }
+
+    @Override
+    public BsonDocument getClusterTime() {
+        return clusterTime;
+    }
+
+    @Override
+    public void advanceClusterTime(final BsonDocument clusterTime) {
+        this.clusterTime = clusterTime;
+    }
+
+    @Override
+    public boolean hasActiveTransaction() {
+        return false;
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return ReadConcern.DEFAULT;
+    }
+
+    @Override
+    public void setRecoveryToken(final BsonDocument recoveryToken) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void unpinServerAddress() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void markSessionDirty() {
+    }
+
+    @Override
+    public boolean isSessionMarkedDirty() {
+        return false;
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/TimeSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/TimeSpecification.groovy
new file mode 100644
index 00000000000..3ba0e1c6d37
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TimeSpecification.groovy
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import spock.lang.Specification
+
+class TimeSpecification extends Specification {
+
+    def 'should get the real and frozen time'() {
+        given:
+        def now = System.nanoTime()
+
+        expect:
+        Time.nanoTime() > now
+
+        when:
+        Time.makeTimeConstant()
+
+        then:
+        Time.nanoTime() == Time.CONSTANT_TIME
+
+        when:
+        Time.makeTimeMove()
+
+        then:
+        Time.nanoTime() > now
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/TimeoutTrackingConnectionGetter.java b/driver-core/src/test/unit/com/mongodb/internal/connection/TimeoutTrackingConnectionGetter.java
similarity index 94%
rename from driver-core/src/test/unit/com/mongodb/connection/TimeoutTrackingConnectionGetter.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/TimeoutTrackingConnectionGetter.java
index 397f9663eee..04759a513dd 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/TimeoutTrackingConnectionGetter.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/TimeoutTrackingConnectionGetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoTimeoutException;
 
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/UsageTrackingConnectionSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/connection/UsageTrackingConnectionSpecification.groovy
new file mode 100644
index 00000000000..6dfeb7fcb7d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/UsageTrackingConnectionSpecification.groovy
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection
+
+import category.Async
+import com.mongodb.MongoNamespace
+import com.mongodb.ServerAddress
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ServerId
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.codecs.BsonDocumentCodec
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.ReadPreference.primary
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class UsageTrackingConnectionSpecification extends Specification {
+    private static final ServerId SERVER_ID = new ServerId(new ClusterId(), new ServerAddress())
+
+    def 'generation is initialized'() {
+        when:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 1);
+
+        then:
+        connection.generation == 1
+    }
+
+    def 'openAt should be set on open'() {
+        when:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+
+        then:
+        connection.openedAt == Long.MAX_VALUE
+
+        when:
+        connection.open()
+
+        then:
+        connection.openedAt <= System.currentTimeMillis()
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'openAt should be set on open asynchronously'() {
+        when:
+        def futureResultCallback = new FutureResultCallback<Void>()
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+
+        then:
+        connection.openedAt == Long.MAX_VALUE
+
+        when:
+        connection.openAsync(futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        connection.openedAt <= System.currentTimeMillis()
+    }
+
+    def 'lastUsedAt should be set on open'() {
+        when:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+
+        then:
+        connection.lastUsedAt == Long.MAX_VALUE
+
+        when:
+        connection.open()
+
+        then:
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'lastUsedAt should be set on open asynchronously'() {
+        when:
+        def futureResultCallback = new FutureResultCallback<Void>()
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+
+        then:
+        connection.lastUsedAt == Long.MAX_VALUE
+
+        when:
+        connection.openAsync(futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+
+    def 'lastUsedAt should be set on sendMessage'() {
+        given:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+        connection.open()
+        def openedLastUsedAt = connection.lastUsedAt
+
+        when:
+        connection.sendMessage(Arrays.asList(), 1)
+
+        then:
+        connection.lastUsedAt >= openedLastUsedAt
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+
+    @Category(Async)
+    @IgnoreIf({ javaVersion < 1.7 })
+    def 'lastUsedAt should be set on sendMessage asynchronously'() {
+        given:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+        connection.open()
+        def openedLastUsedAt = connection.lastUsedAt
+        def futureResultCallback = new FutureResultCallback<Void>()
+
+        when:
+        connection.sendMessageAsync(Arrays.asList(), 1, futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        connection.lastUsedAt >= openedLastUsedAt
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+
+    def 'lastUsedAt should be set on receiveMessage'() {
+        given:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+        connection.open()
+        def openedLastUsedAt = connection.lastUsedAt
+        when:
+        connection.receiveMessage(1)
+
+        then:
+        connection.lastUsedAt >= openedLastUsedAt
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+
+    def 'lastUsedAt should be set on receiveMessage asynchronously'() {
+        given:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+        connection.open()
+        def openedLastUsedAt = connection.lastUsedAt
+        def futureResultCallback = new FutureResultCallback<Void>()
+
+        when:
+        connection.receiveMessageAsync(1, futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        connection.lastUsedAt >= openedLastUsedAt
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+
+    def 'lastUsedAt should be set on sendAndReceive'() {
+        given:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+        connection.open()
+        def openedLastUsedAt = connection.lastUsedAt
+
+        when:
+        connection.sendAndReceive(new CommandMessage(new MongoNamespace('test.coll'),
+                new BsonDocument('ping', new BsonInt32(1)), new NoOpFieldNameValidator(), primary(),
+                MessageSettings.builder().build()),
+                new BsonDocumentCodec(), NoOpSessionContext.INSTANCE)
+
+        then:
+        connection.lastUsedAt >= openedLastUsedAt
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+
+    def 'lastUsedAt should be set on sendAndReceive asynchronously'() {
+        given:
+        def connection = new UsageTrackingInternalConnection(new TestInternalConnectionFactory().create(SERVER_ID), 0);
+        connection.open()
+        def openedLastUsedAt = connection.lastUsedAt
+        def futureResultCallback = new FutureResultCallback<Void>()
+
+        when:
+        connection.sendAndReceiveAsync(new CommandMessage(new MongoNamespace('test.coll'),
+                new BsonDocument('ping', new BsonInt32(1)), new NoOpFieldNameValidator(), primary(),
+                MessageSettings.builder().build()),
+                new BsonDocumentCodec(), NoOpSessionContext.INSTANCE, futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+
+        then:
+        connection.lastUsedAt >= openedLastUsedAt
+        connection.lastUsedAt <= System.currentTimeMillis()
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/connection/X509AuthenticatorNoUserNameTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/X509AuthenticatorNoUserNameTest.java
new file mode 100644
index 00000000000..4b36eb51fea
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/X509AuthenticatorNoUserNameTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.connection;
+
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.FutureResultCallback;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.ServerType;
+import com.mongodb.connection.ServerVersion;
+import org.bson.io.BsonInput;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+import static com.mongodb.internal.connection.MessageHelper.buildSuccessfulReply;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class X509AuthenticatorNoUserNameTest {
+    private TestInternalConnection connection;
+    private ConnectionDescription connectionDescriptionThreeTwo;
+    private ConnectionDescription connectionDescriptionThreeFour;
+
+    @Before
+    public void before() {
+        connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress("localhost", 27017)));
+        connectionDescriptionThreeTwo = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                                                                         new ServerVersion(3, 2), 4, ServerType.STANDALONE, 1000, 16000,
+                                                                         48000, Collections.<String>emptyList());
+        connectionDescriptionThreeFour = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                                                                          new ServerVersion(3, 4), 5, ServerType.STANDALONE, 1000, 16000,
+                                                                          48000, Collections.<String>emptyList());
+    }
+
+    @Test
+    public void testSuccessfulAuthentication() {
+        enqueueSuccessfulAuthenticationReply();
+
+        new X509Authenticator(getCredentialWithCache()).authenticate(connection, connectionDescriptionThreeFour);
+
+        validateMessages();
+    }
+
+    @Test
+    public void testUnsuccessfulAuthenticationWhenServerVersionLessThanThreeFour() {
+        try {
+            new X509Authenticator(getCredentialWithCache()).authenticate(connection, connectionDescriptionThreeTwo);
+            fail();
+        } catch (MongoSecurityException e) {
+            assertEquals("User name is required for the MONGODB-X509 authentication mechanism on server versions less than 3.4",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    public void testSuccessfulAuthenticationAsync() throws ExecutionException, InterruptedException {
+        enqueueSuccessfulAuthenticationReply();
+
+        FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>();
+        new X509Authenticator(getCredentialWithCache()).authenticateAsync(connection, connectionDescriptionThreeFour, futureCallback);
+
+        futureCallback.get();
+
+        validateMessages();
+    }
+
+    @Test
+    public void testUnsuccessfulAuthenticationWhenServerVersionLessThanThreeFourAsync() throws ExecutionException, InterruptedException {
+        FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>();
+        new X509Authenticator(getCredentialWithCache()).authenticateAsync(connection, connectionDescriptionThreeTwo, futureCallback);
+
+        try {
+            futureCallback.get();
+        } catch (MongoSecurityException e) {
+            assertEquals("User name is required for the MONGODB-X509 authentication mechanism on server versions less than 3.4",
+                    e.getMessage());
+        }
+    }
+
+    private void enqueueSuccessfulAuthenticationReply() {
+        connection.enqueueReply(buildSuccessfulReply("{ok: 1}"));
+    }
+
+    private void validateMessages() {
+        List<BsonInput> sent = connection.getSent();
+        String command = MessageHelper.decodeCommandAsJson(sent.get(0));
+        assertEquals("{\"authenticate\": 1, \"mechanism\": \"MONGODB-X509\"}", command);
+    }
+
+    private MongoCredentialWithCache getCredentialWithCache() {
+        return new MongoCredentialWithCache(MongoCredential.createMongoX509Credential());
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/connection/X509AuthenticatorUnitTest.java b/driver-core/src/test/unit/com/mongodb/internal/connection/X509AuthenticatorUnitTest.java
similarity index 79%
rename from driver-core/src/test/unit/com/mongodb/connection/X509AuthenticatorUnitTest.java
rename to driver-core/src/test/unit/com/mongodb/internal/connection/X509AuthenticatorUnitTest.java
index 3ff8193d30a..fb5c6420745 100644
--- a/driver-core/src/test/unit/com/mongodb/connection/X509AuthenticatorUnitTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/connection/X509AuthenticatorUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoSecurityException;
 import com.mongodb.ServerAddress;
 import com.mongodb.async.FutureResultCallback;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerId;
 import org.bson.io.BsonInput;
 import org.junit.Before;
 import org.junit.Test;
@@ -27,7 +30,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-import static com.mongodb.connection.MessageHelper.buildSuccessfulReply;
+import static com.mongodb.internal.connection.MessageHelper.buildSuccessfulReply;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -41,13 +44,12 @@ public class X509AuthenticatorUnitTest {
     public void before() {
         connection = new TestInternalConnection(new ServerId(new ClusterId(), new ServerAddress("localhost", 27017)));
         connectionDescription = new ConnectionDescription(new ServerId(new ClusterId(), new ServerAddress()));
-        credential = MongoCredential.createMongoX509Credential(
-                "CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US");
-        subject = new X509Authenticator(this.credential);
+        credential = MongoCredential.createMongoX509Credential("CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US");
+        subject = new X509Authenticator(new MongoCredentialWithCache(credential));
     }
 
     @Test
-    public void testFailedAuthentication() throws InterruptedException {
+    public void testFailedAuthentication() {
         enqueueFailedAuthenticationReply();
 
         try {
@@ -59,7 +61,7 @@ public void testFailedAuthentication() throws InterruptedException {
     }
 
     @Test
-    public void testFailedAuthenticationAsync() throws InterruptedException {
+    public void testFailedAuthenticationAsync() {
         enqueueFailedAuthenticationReply();
 
         FutureResultCallback<Void> futureCallback = new FutureResultCallback<Void>();
@@ -109,9 +111,9 @@ private void enqueueSuccessfulAuthenticationReply() {
     private void validateMessages() {
         List<BsonInput> sent = connection.getSent();
         String command = MessageHelper.decodeCommandAsJson(sent.get(0));
-        String expectedCommand = "{ \"authenticate\" : 1, "
-                + "\"user\" : \"CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US\", "
-                + "\"mechanism\" : \"MONGODB-X509\" }";
+        String expectedCommand = "{\"authenticate\": 1, "
+                + "\"user\": \"CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US\", "
+                + "\"mechanism\": \"MONGODB-X509\"}";
 
         assertEquals(expectedCommand, command);
     }
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/WriteConcernHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/operation/WriteConcernHelperSpecification.groovy
new file mode 100644
index 00000000000..cbef728a564
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/operation/WriteConcernHelperSpecification.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.operation
+
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import spock.lang.Specification
+
+import static com.mongodb.internal.operation.WriteConcernHelper.createWriteConcernError
+
+class WriteConcernHelperSpecification extends Specification {
+
+    def 'should create write concern error'() {
+        when:
+        def writeConcernError = createWriteConcernError(new BsonDocument('code', new BsonInt32(42))
+                .append('errmsg', new BsonString('a timeout'))
+                .append('errInfo', new BsonDocument('wtimeout', new BsonInt32(1))))
+
+        then:
+        writeConcernError.getCode() == 42
+        writeConcernError.getCodeName() == ''
+        writeConcernError.getMessage() == 'a timeout'
+        writeConcernError.getDetails() == new BsonDocument('wtimeout', new BsonInt32(1))
+
+        when:
+        writeConcernError = createWriteConcernError(new BsonDocument('code', new BsonInt32(42))
+                .append('codeName', new BsonString('TimeoutError'))
+                .append('errmsg', new BsonString('a timeout'))
+                .append('errInfo', new BsonDocument('wtimeout', new BsonInt32(1))))
+
+        then:
+        writeConcernError.getCode() == 42
+        writeConcernError.getCodeName() == 'TimeoutError'
+        writeConcernError.getMessage() == 'a timeout'
+        writeConcernError.getDetails() == new BsonDocument('wtimeout', new BsonInt32(1))
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/session/ClientSessionContextSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/session/ClientSessionContextSpecification.groovy
new file mode 100644
index 00000000000..1a063e4913d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/session/ClientSessionContextSpecification.groovy
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.session
+
+import com.mongodb.ReadConcern
+import com.mongodb.session.ClientSession
+import com.mongodb.session.ServerSession
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonTimestamp
+import spock.lang.Specification
+
+class ClientSessionContextSpecification extends Specification {
+
+    class TestClientSessionContext extends ClientSessionContext {
+
+        TestClientSessionContext(final ClientSession clientSession) {
+            super(clientSession)
+        }
+
+        @Override
+        boolean hasActiveTransaction() {
+            false;
+        }
+
+        @Override
+        boolean isImplicitSession() {
+            throw new UnsupportedOperationException()
+        }
+
+        @Override
+        boolean notifyMessageSent() {
+            false
+        }
+
+        @Override
+        ReadConcern getReadConcern() {
+            ReadConcern.DEFAULT;
+        }
+    }
+
+    def 'should have session'() {
+        given:
+        def clientSession = Mock(ClientSession)
+        def context = new TestClientSessionContext(clientSession)
+
+        expect:
+        context.hasSession()
+    }
+
+    def 'should forward all methods to wrapped session'() {
+        given:
+        def expectedSessionId = new BsonDocument('id', new BsonInt32(1))
+        def expectedClusterTime = new BsonDocument('x', BsonBoolean.TRUE)
+        def expectedOperationTime = new BsonTimestamp(42, 1)
+        def expectedTransactionNumber = 2
+
+        def serverSession = Mock(ServerSession)
+        def clientSession = Mock(ClientSession) {
+            _ * getServerSession() >> {
+                serverSession
+            }
+        }
+        def context = new TestClientSessionContext(clientSession)
+
+        when:
+        def sessionId = context.getSessionId()
+
+        then:
+        sessionId == expectedSessionId
+        1 * serverSession.getIdentifier() >> {
+            expectedSessionId
+        }
+
+        when:
+        context.isCausallyConsistent()
+
+        then:
+        1 * clientSession.isCausallyConsistent()
+
+        when:
+        context.advanceClusterTime(expectedClusterTime)
+
+        then:
+        1 * clientSession.advanceClusterTime(expectedClusterTime)
+
+        when:
+        context.getOperationTime()
+
+        then:
+        1 * clientSession.getOperationTime()
+
+        when:
+        context.advanceOperationTime(expectedOperationTime)
+
+        then:
+        1 * clientSession.advanceOperationTime(expectedOperationTime)
+
+        when:
+        context.advanceTransactionNumber()
+
+        then:
+        1 * serverSession.advanceTransactionNumber()
+
+        when:
+        def transactionNumber = context.getTransactionNumber()
+
+        then:
+        transactionNumber == expectedTransactionNumber
+        1 * serverSession.getTransactionNumber() >> {
+            expectedTransactionNumber
+        }
+
+        when:
+        def clusterTime = context.getClusterTime()
+
+        then:
+        clusterTime == expectedClusterTime
+        1 * clientSession.getClusterTime() >> {
+            expectedClusterTime
+        }
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/session/ServerSessionPoolSpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/session/ServerSessionPoolSpecification.groovy
new file mode 100644
index 00000000000..7129a02e66a
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/internal/session/ServerSessionPoolSpecification.groovy
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.internal.session
+
+import com.mongodb.ServerAddress
+import com.mongodb.connection.Cluster
+import com.mongodb.connection.ClusterDescription
+import com.mongodb.connection.ClusterSettings
+import com.mongodb.connection.Connection
+import com.mongodb.connection.Server
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerSettings
+import com.mongodb.internal.connection.NoOpSessionContext
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonArray
+import org.bson.BsonBinarySubType
+import org.bson.BsonDocument
+import org.bson.codecs.BsonDocumentCodec
+import spock.lang.Specification
+
+import static com.mongodb.ReadPreference.primaryPreferred
+import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
+import static com.mongodb.connection.ClusterType.REPLICA_SET
+import static com.mongodb.connection.ServerConnectionState.CONNECTED
+import static com.mongodb.connection.ServerConnectionState.CONNECTING
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
+import static com.mongodb.connection.ServerType.UNKNOWN
+import static java.util.concurrent.TimeUnit.MINUTES
+
+class ServerSessionPoolSpecification extends Specification {
+
+    def connectedDescription = new ClusterDescription(MULTIPLE, REPLICA_SET,
+            [
+                    ServerDescription.builder().ok(true)
+                            .state(CONNECTED)
+                            .address(new ServerAddress())
+                            .type(REPLICA_SET_PRIMARY)
+                            .logicalSessionTimeoutMinutes(30)
+                            .build()
+            ], ClusterSettings.builder().hosts([new ServerAddress()]).build(), ServerSettings.builder().build())
+
+    def unconnectedDescription = new ClusterDescription(MULTIPLE, REPLICA_SET,
+            [
+                    ServerDescription.builder().ok(true)
+                            .state(CONNECTING)
+                            .address(new ServerAddress())
+                            .type(UNKNOWN)
+                            .logicalSessionTimeoutMinutes(null)
+                            .build()
+            ], ClusterSettings.builder().hosts([new ServerAddress()]).build(), ServerSettings.builder().build())
+
+    def 'should get session'() {
+        given:
+        def cluster = Stub(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def pool = new ServerSessionPool(cluster)
+
+        when:
+        def session = pool.get()
+
+        then:
+        session != null
+    }
+
+    def 'should throw IllegalStateException if pool is closed'() {
+        given:
+        def cluster = Stub(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def pool = new ServerSessionPool(cluster)
+        pool.close()
+
+        when:
+        pool.get()
+
+        then:
+        thrown(IllegalStateException)
+    }
+
+    def 'should pool session'() {
+        given:
+        def cluster = Stub(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def pool = new ServerSessionPool(cluster)
+        def session = pool.get()
+
+        when:
+        pool.release(session)
+        def pooledSession = pool.get()
+
+        then:
+        session == pooledSession
+    }
+
+    def 'should prune sessions on release'() {
+        given:
+        def cluster = Mock(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def clock = Stub(ServerSessionPool.Clock) {
+            millis() >>> [0, 0,                          // first get
+                          1, 1,                          // second get
+                          2, 2,                          // third get
+                          3,                             // first release
+                          MINUTES.toMillis(29),       // second release
+                          MINUTES.toMillis(29) + 2,   // third release
+                          MINUTES.toMillis(29) + 2,
+                          MINUTES.toMillis(29) + 2
+            ]
+        }
+        def pool = new ServerSessionPool(cluster, clock)
+        def sessionOne = pool.get()
+        def sessionTwo = pool.get()
+        def sessionThree = pool.get()
+
+        when:
+        pool.release(sessionOne)
+
+        then:
+        !sessionOne.closed
+
+        when:
+        pool.release(sessionTwo)
+
+        then:
+        !sessionOne.closed
+        !sessionTwo.closed
+
+        when:
+        pool.release(sessionThree)
+
+        then:
+        sessionOne.closed
+        sessionTwo.closed
+        !sessionThree.closed
+        0 * cluster.selectServer(_)
+    }
+
+    def 'should prune sessions when getting'() {
+        given:
+        def cluster = Mock(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def clock = Stub(ServerSessionPool.Clock) {
+            millis() >>> [0, 0,                          // first get
+                          0,                             // first release
+                          MINUTES.toMillis(29) + 1,   // second get
+            ]
+        }
+        def pool = new ServerSessionPool(cluster, clock)
+        def sessionOne = pool.get()
+
+        when:
+        pool.release(sessionOne)
+
+        then:
+        !sessionOne.closed
+
+        when:
+        def sessionTwo = pool.get()
+
+        then:
+        sessionTwo != sessionOne
+        sessionOne.closed
+        0 * cluster.selectServer(_)
+    }
+
+    def 'should not prune session when timeout is null'() {
+        given:
+        def cluster = Stub(Cluster) {
+            getCurrentDescription() >> unconnectedDescription
+        }
+        def clock = Stub(ServerSessionPool.Clock) {
+            millis() >>> [0, 0, 0]
+        }
+        def pool = new ServerSessionPool(cluster, clock)
+        def session = pool.get()
+
+        when:
+        pool.release(session)
+        def newSession = pool.get()
+
+        then:
+        session == newSession
+    }
+
+    def 'should initialize session'() {
+        given:
+        def cluster = Stub(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def clock = Stub(ServerSessionPool.Clock) {
+            millis() >> 42
+        }
+        def pool = new ServerSessionPool(cluster, clock)
+
+        when:
+        def session = pool.get() as ServerSessionPool.ServerSessionImpl
+
+        then:
+        session.lastUsedAtMillis == 42
+        session.transactionNumber == 0
+        def uuid = session.identifier.getBinary('id')
+        uuid != null
+        uuid.type == BsonBinarySubType.UUID_STANDARD.value
+        uuid.data.length == 16
+    }
+
+    def 'should advance transaction number'() {
+        given:
+        def cluster = Stub(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def clock = Stub(ServerSessionPool.Clock) {
+            millis() >> 42
+        }
+        def pool = new ServerSessionPool(cluster, clock)
+
+        when:
+        def session = pool.get() as ServerSessionPool.ServerSessionImpl
+
+        then:
+        session.transactionNumber == 0
+        session.advanceTransactionNumber() == 1
+        session.transactionNumber == 1
+    }
+
+    def 'should end pooled sessions when pool is closed'() {
+        given:
+        def connection = Mock(Connection)
+        def server = Stub(Server) {
+            getConnection() >> connection
+        }
+        def cluster = Mock(Cluster) {
+            getCurrentDescription() >> connectedDescription
+        }
+        def pool = new ServerSessionPool(cluster)
+        // check out sessions up the the endSessions batch size
+        def sessions = []
+        10000.times { sessions.add(pool.get()) }
+        // and then check out one more
+        def oneOverBatchSizeSession = pool.get()
+
+        // now release them all before closing the pool
+        for (def cur : sessions) {
+            pool.release(cur)
+        }
+        pool.release(oneOverBatchSizeSession)
+
+        when:
+        pool.close()
+
+        then:
+        // first batch is the first 10K sessions, final batch is the last one
+        1 * cluster.selectServer(_)  >> server
+        1 * connection.command('admin',
+                new BsonDocument('endSessions', new BsonArray(sessions*.getIdentifier())),
+                { it instanceof NoOpFieldNameValidator }, primaryPreferred(),
+                { it instanceof BsonDocumentCodec }, NoOpSessionContext.INSTANCE) >> new BsonDocument()
+        1 * connection.release()
+
+        1 * cluster.selectServer(_)  >> server
+        1 * connection.command('admin',
+                new BsonDocument('endSessions', new BsonArray([oneOverBatchSizeSession.getIdentifier()])),
+                { it instanceof NoOpFieldNameValidator }, primaryPreferred(),
+                { it instanceof BsonDocumentCodec }, NoOpSessionContext.INSTANCE) >> new BsonDocument()
+        1 * connection.release()
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/internal/thread/DaemonThreadFactorySpecification.groovy b/driver-core/src/test/unit/com/mongodb/internal/thread/DaemonThreadFactorySpecification.groovy
index 1debc059520..4f60bb22a82 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/thread/DaemonThreadFactorySpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/internal/thread/DaemonThreadFactorySpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.mongodb.internal.thread
diff --git a/driver-core/src/test/unit/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidatorTest.java b/driver-core/src/test/unit/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidatorTest.java
index 574232a5a50..e35ab9f0075 100644
--- a/driver-core/src/test/unit/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidatorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/operation/AsyncChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/AsyncChangeStreamBatchCursorSpecification.groovy
new file mode 100644
index 00000000000..977e33ebe58
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/AsyncChangeStreamBatchCursorSpecification.groovy
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.binding.AsyncReadBinding
+import spock.lang.Specification
+
+class AsyncChangeStreamBatchCursorSpecification extends Specification {
+
+    def 'should call the underlying AsyncQueryBatchCursor'() {
+        given:
+        def changeStreamOpertation = Stub(ChangeStreamOperation)
+        def binding = Mock(AsyncReadBinding)
+        def wrapped = Mock(AsyncQueryBatchCursor)
+        def callback = Stub(SingleResultCallback)
+        def cursor = new AsyncChangeStreamBatchCursor(changeStreamOpertation, wrapped, binding, null)
+
+        when:
+        cursor.setBatchSize(10)
+
+        then:
+        1 * wrapped.setBatchSize(10)
+
+        when:
+        cursor.tryNext(callback)
+
+        then:
+        1 * wrapped.tryNext(_) >> { it[0].onResult(null, null) }
+
+        when:
+        cursor.next(callback)
+
+        then:
+        1 * wrapped.next(_) >> { it[0].onResult(null, null) }
+
+        when:
+        cursor.close()
+
+        then:
+        1 * wrapped.isClosed() >> {
+            false
+        }
+        1 * wrapped.close()
+        1 * binding.release()
+
+        when:
+        cursor.close()
+
+        then:
+        1 * wrapped.isClosed() >> {
+            true
+        }
+        0 * wrapped.close()
+        0 * binding.release()
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/operation/AsyncQueryBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/AsyncQueryBatchCursorSpecification.groovy
index 73ae70c5d45..3ee04dd887e 100644
--- a/driver-core/src/test/unit/com/mongodb/operation/AsyncQueryBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/operation/AsyncQueryBatchCursorSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,18 @@
 
 package com.mongodb.operation
 
+import com.mongodb.MongoCommandException
+import com.mongodb.MongoException
 import com.mongodb.MongoNamespace
 import com.mongodb.ServerAddress
+import com.mongodb.ServerCursor
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.binding.AsyncConnectionSource
 import com.mongodb.connection.AsyncConnection
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.QueryResult
 import com.mongodb.connection.ServerVersion
+import org.bson.BsonArray
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
@@ -32,31 +36,22 @@ import org.bson.Document
 import org.bson.codecs.DocumentCodec
 import spock.lang.Specification
 
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion
 import static java.util.concurrent.TimeUnit.SECONDS
 
 class AsyncQueryBatchCursorSpecification extends Specification {
+
     def 'should generate expected command with batchSize and maxTimeMS'() {
         given:
-        def connection = Mock(AsyncConnection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
-            }
-        }
-        def connectionSource = Stub(AsyncConnectionSource) {
-            getConnection(_) >> { it[0].onResult(connection, null) }
-        }
-        connectionSource.retain() >> connectionSource
+        def connection = referenceCountedAsyncConnection()
+        def connectionSource = getAsyncConnectionSource(connection)
 
-        def database = 'test'
-        def collection = 'AsyncQueryBatchCursorSpecification'
-        def cursorId = 42
-
-        def namespace = new MongoNamespace(database, collection)
-        def firstBatch = new QueryResult(namespace, [], cursorId, new ServerAddress())
-        def cursor = new AsyncQueryBatchCursor<Document>(firstBatch, 0, batchSize, maxTimeMS, new DocumentCodec(), connectionSource,
-                                                         connection)
-        def expectedCommand = new BsonDocument('getMore': new BsonInt64(cursorId))
-                .append('collection', new BsonString(collection))
+        def firstBatch = new QueryResult(NAMESPACE, [], 42, SERVER_ADDRESS)
+        def cursor = new AsyncQueryBatchCursor<Document>(firstBatch, 0, batchSize, maxTimeMS, CODEC, connectionSource,
+                null)
+        def expectedCommand = new BsonDocument('getMore': new BsonInt64(CURSOR_ID))
+                .append('collection', new BsonString(NAMESPACE.getCollectionName()))
         if (batchSize != 0) {
             expectedCommand.append('batchSize', new BsonInt32(batchSize))
         }
@@ -64,32 +59,625 @@ class AsyncQueryBatchCursorSpecification extends Specification {
             expectedCommand.append('maxTimeMS', new BsonInt64(expectedMaxTimeFieldValue))
         }
 
-        def reply = new BsonDocument('ok', new BsonInt32(1))
-                .append('cursor',
-                        new BsonDocument('id', new BsonInt64(0))
-                                .append('ns', new BsonString(namespace.getFullName()))
-                                .append('nextBatch', new BsonArrayWrapper([])))
+        def reply =  documentResponse([], 0)
+
+        when:
+        def batch = nextBatch(cursor)
+
+        then:
+        1 * connection.commandAsync(NAMESPACE.getDatabaseName(), expectedCommand, _, _, _, _, _) >> {
+            it[6].onResult(reply, null)
+        }
+        batch == null
+
+        then:
+        !cursor.isClosed()
+
+        then:
+        cursor.close()
+
+        then:
+        connection.getCount() == 0
+        connectionSource.getCount() == 0
+
+        where:
+        batchSize | maxTimeMS | expectedMaxTimeFieldValue
+        0         | 0         | null
+        2         | 0         | null
+        0         | 100       | 100
+    }
+
+    def 'should close the cursor'() {
+        given:
+        def connection = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connection)
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(firstBatch, 0, 0, 0, CODEC, connectionSource, null)
+        cursor.close()
+
+        then:
+        if (firstBatch.getCursor() != null) {
+            if (serverVersion.compareTo(new ServerVersion(3, 2)) >= 0) {
+                1 * connection.commandAsync(NAMESPACE.databaseName, createKillCursorsDocument(firstBatch.cursor), _, primary(),
+                        _, _, _) >> {
+                    it[6].onResult(null, null)
+                }
+            } else {
+                1 * connection.killCursorAsync(NAMESPACE, [42], _) >> {
+                    it[2].onResult(null, null)
+                }
+            }
+        } else {
+            0 * connection._
+        }
+
+        then:
+        connection.getCount() == 0
+        connectionSource.getCount() == 0
+
+        where:
+        serverVersion                | firstBatch
+        new ServerVersion([3, 2, 0]) |  queryResult()
+        new ServerVersion([3, 2, 0]) |  queryResult(FIRST_BATCH, 0)
+        new ServerVersion([3, 0, 0]) |  queryResult()
+        new ServerVersion([3, 0, 0]) |  queryResult(FIRST_BATCH, 0)
+    }
+
+    def 'should return the expected results from next'() {
+        given:
+        def connectionSource = getAsyncConnectionSource(referenceCountedAsyncConnection())
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult(FIRST_BATCH, 0), 0, 0, 0, CODEC, connectionSource, null)
+
+        then:
+        nextBatch(cursor) == FIRST_BATCH
+
+        then:
+        connectionSource.getCount() == 0
+
+        then:
+        nextBatch(cursor) == null
+
+        then:
+        connectionSource.getCount() == 0
+
+        when:
+        nextBatch(cursor)
+
+        then:
+        thrown(MongoException)
+    }
+
+    def 'should return the expected results from tryNext'() {
+        given:
+        def connectionA = referenceCountedAsyncConnection(serverVersion)
+        def connectionB = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connectionA, connectionB)
+
+        def firstBatch = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def secondBatch = []
+        def thirdBatch = [new Document('_id', 4), new Document('_id', 5)]
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult(firstBatch), 6, 2, 0, CODEC, connectionSource, null)
+        def batch = nextBatch(cursor)
+
+        then:
+        batch == firstBatch
+
+        when:
+        batch = tryNextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connectionA.commandAsync(_, _, _, _, _, _, _) >> { it[6].onResult(documentResponse(secondBatch), null) }
+        } else {
+            1 * connectionA.getMoreAsync(_, _, _, _, _) >> { it[4].onResult(queryResult(secondBatch), null) }
+        }
+
+        then:
+        batch == null
+        connectionA.getCount() == 0
+        connectionSource.getCount() == 1
+
+        when:
+        batch = tryNextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connectionB.commandAsync(_, _, _, _, _, _, _) >> {
+                connectionB.getCount() == 1
+                connectionSource.getCount() == 1
+                it[6].onResult(documentResponse(thirdBatch, 0), null)
+            }
+        } else {
+            1 * connectionB.getMoreAsync(_, _, _, _, _) >> {
+                connectionB.getCount() == 1
+                connectionSource.getCount() == 1
+                it[4].onResult(queryResult(thirdBatch, 0), null)
+            }
+        }
+        0 * connectionB.killCursorAsync(_, _, _) >> { it[2].onResult(null, null) }
+
+        then:
+        batch == thirdBatch
+        connectionB.getCount() == 0
+        connectionSource.getCount() == 0
+
+        when:
+        batch = tryNextBatch(cursor)
+
+        then:
+        batch == null
+        connectionSource.getCount() == 0
+
+        where:
+        serverVersion                | commandAsync
+        new ServerVersion([3, 2, 0]) | true
+        new ServerVersion([3, 0, 0]) | false
+    }
+
+    def 'should respect the limit'() {
+        given:
+        def connectionA = referenceCountedAsyncConnection(serverVersion)
+        def connectionB = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connectionA, connectionB)
+
+        def firstBatch = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def secondBatch = [new Document('_id', 4), new Document('_id', 5)]
+        def thirdBatch = [new Document('_id', 6)]
 
         when:
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult(firstBatch), 6, 2, 0, CODEC, connectionSource, null)
         def batch = nextBatch(cursor)
 
         then:
-        1 * connection.commandAsync(database, expectedCommand, _, _, _, _) >> {
-            it[5].onResult(reply, null)
+        batch == firstBatch
+
+        when:
+        batch = nextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connectionA.commandAsync(_, _, _, _, _, _, _) >> { it[6].onResult(documentResponse(secondBatch), null) }
+        } else {
+            1 * connectionA.getMoreAsync(_, _, _, _, _) >> { it[4].onResult(queryResult(secondBatch), null) }
         }
-        1 * connection.release()
+
+        then:
+        batch == secondBatch
+        connectionA.getCount() == 0
+        connectionSource.getCount() == 1
+
+        when:
+        batch = nextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connectionB.commandAsync(_, _, _, _, _, _, _) >> {
+                connectionB.getCount() == 1
+                connectionSource.getCount() == 1
+                it[6].onResult(documentResponse(thirdBatch, 0), null)
+            }
+        } else {
+            1 * connectionB.getMoreAsync(_, _, _, _, _) >> {
+                connectionB.getCount() == 1
+                connectionSource.getCount() == 1
+                it[4].onResult(queryResult(thirdBatch, 0), null)
+            }
+        }
+        0 * connectionB.killCursorAsync(_, _, _) >> { it[2].onResult(null, null) }
+
+        then:
+        batch == thirdBatch
+        connectionB.getCount() == 0
+        connectionSource.getCount() == 0
+
+        when:
+        batch = nextBatch(cursor)
+
+        then:
         batch == null
+        connectionSource.getCount() == 0
+
+        where:
+        serverVersion                | commandAsync
+        new ServerVersion([3, 2, 0]) | true
+        new ServerVersion([3, 0, 0]) | false
+    }
+
+
+    def 'should close the cursor immediately if the limit has been reached'() {
+        given:
+        def connection = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connection)
+        def queryResult = queryResult()
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult, 1, 0, 0, CODEC, connectionSource, connection)
+
+        then:
+        if (serverVersion.compareTo(new ServerVersion(3, 2)) >= 0) {
+            1 * connection.commandAsync(NAMESPACE.databaseName, createKillCursorsDocument(queryResult.cursor), _, primary(), _, _, _) >> {
+                it[6].onResult(null, null)
+            }
+        } else {
+            1 * connection.killCursorAsync(NAMESPACE, [42], _) >> {
+                it[2].onResult(null, null)
+            }
+        }
+
+        when:
+        cursor.close()
+
+        then:
+        0 * connection.killCursorAsync(_, _, _)
+
+        then:
+        connection.getCount() == 0
+        connectionSource.getCount() == 0
+
+        where:
+        serverVersion << [new ServerVersion([3, 2, 0]), new ServerVersion([3, 0, 0])]
+    }
+
+    def 'should handle getMore when there are empty results but there is a cursor'() {
+        given:
+        def connection = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connection)
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult([], 42), 3, 0, 0, CODEC, connectionSource, null)
+        def batch = nextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connection.commandAsync(_, _, _, _, _, _, _) >> {
+                connection.getCount() == 1
+                connectionSource.getCount() == 1
+                it[6].onResult(response, null)
+            }
+
+            1 * connection.commandAsync(_, _, _, _, _, _, _) >> {
+                connection.getCount() == 1
+                connectionSource.getCount() == 1
+                it[6].onResult(response2, null)
+            }
+        } else {
+            1 * connection.getMoreAsync(_, _, _, _, _) >> {
+                connection.getCount() == 1
+                connectionSource.getCount() == 1
+                it[4].onResult(response, null)
+            }
+
+            1 * connection.getMoreAsync(_, _, _, _, _) >> {
+                connection.getCount() == 1
+                connectionSource.getCount() == 1
+                it[4].onResult(response2, null)
+            }
+        }
+        0 * connection.killCursorAsync(_, _, _)
+
+        then:
+        batch == SECOND_BATCH
+
+        then:
+        connection.getCount() == 0
+        connectionSource.getCount() == 0
+
+        when:
+        cursor.close()
+
+        then:
+        0 * connection._
+        connectionSource.getCount() == 0
+
+        where:
+        serverVersion                | commandAsync | response              | response2
+        new ServerVersion([3, 2, 0]) | true         | documentResponse([])  | documentResponse(SECOND_BATCH, 0)
+        new ServerVersion([3, 0, 0]) | false        | queryResult([])       | queryResult(SECOND_BATCH, 0)
+    }
+
+    def 'should kill the cursor in the getMore if limit is reached'() {
+        given:
+        def connection = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connection)
+        def initialResult = queryResult()
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(initialResult, 3, 0, 0, CODEC, connectionSource, null)
+        def batch = nextBatch(cursor)
+
+        then:
+        batch == FIRST_BATCH
+
+        when:
+        batch = nextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connection.commandAsync(_, _, _, _, _, _, _) >> {
+                it[6].onResult(response, null)
+            }
+            1 * connection.commandAsync(NAMESPACE.databaseName, createKillCursorsDocument(initialResult.cursor), _, primary(), _, _, _) >> {
+                it[6].onResult(null, null)
+            }
+        } else {
+            1 * connection.getMoreAsync(_, _, _, _, _) >> {
+                it[4].onResult(response, null)
+            }
+            1 * connection.killCursorAsync(NAMESPACE, [initialResult.cursor.id], _) >> { it[2].onResult(null, null) }
+        }
+
+        then:
+        connection.getCount() == 0
+        connectionSource.getCount() == 0
+
+        when:
+        cursor.close()
+
+        then:
+        0 * connection.killCursorAsync(_, _, _)
+        0 * connection.commandAsync(_, _, _, _, _)
+        connectionSource.getCount() == 0
+
+        where:
+        serverVersion                | commandAsync         | response
+        new ServerVersion([3, 2, 0]) | true                 | documentResponse(SECOND_BATCH)
+        new ServerVersion([3, 0, 0]) | false                | queryResult(SECOND_BATCH)
+    }
+
+    def 'should kill the cursor in the getMore callback if it was closed before getMore returned'() {
+        given:
+        def connectionA = referenceCountedAsyncConnection(serverVersion)
+        def connectionB = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connectionA, connectionB)
+        def initialResult = queryResult()
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(initialResult, 0, 0, 0, CODEC, connectionSource, null)
+        def batch = nextBatch(cursor)
+
+        then:
+        batch == FIRST_BATCH
+
+        when:
+        batch = nextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connectionA.commandAsync(_, _, _, _, _, _, _) >> {
+                // Simulate the user calling close while the getMore is in flight
+                cursor.close()
+                it[6].onResult(response, null)
+            }
+            1 * connectionB.commandAsync(NAMESPACE.databaseName, createKillCursorsDocument(initialResult.cursor), _, primary(),
+                    _, _, _) >> {
+                it[6].onResult(null, null)
+            }
+        } else {
+            1 * connectionA.getMoreAsync(_, _, _, _, _) >> {
+                // Simulate the user calling close while the getMore is in flight
+                cursor.close()
+                it[4].onResult(response, null)
+            }
+            1 * connectionB.killCursorAsync(NAMESPACE, [initialResult.cursor.id], _) >> {
+                it[2].onResult(null, null)
+            }
+        }
+
+        then:
+        thrown(MongoException)
+
+        then:
+        connectionA.getCount() == 0
+        connectionB.getCount() == 0
+        connectionSource.getCount() == 0
+
+        where:
+        serverVersion                | commandAsync         | response
+        new ServerVersion([3, 2, 0]) | true                 | documentResponse([])
+        new ServerVersion([3, 0, 0]) | false                | new QueryResult(NAMESPACE, [], 42, SERVER_ADDRESS)
+    }
+
+    def 'should handle errors when calling close'() {
+        given:
+        def connectionSource = getAsyncConnectionSourceWithResult { [null, MONGO_EXCEPTION] }
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult(), 0, 0, 0, CODEC, connectionSource, null)
+
+        when:
+        cursor.close()
+        nextBatch(cursor)
+
+        then:
+        thrown(MongoException)
+
+        then:
+        cursor.isClosed()
+        connectionSource.getCount() == 0
+    }
+
+
+    def 'should handle errors when getting a connection for getMore'() {
+        given:
+        def connectionSource = getAsyncConnectionSourceWithResult { [null, MONGO_EXCEPTION] }
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult(), 0, 0, 0, CODEC, connectionSource, null)
+
+        then:
+        nextBatch(cursor)
+
+        when:
+        nextBatch(cursor)
+
+        then:
+        thrown(MongoException)
+
+        then:
+        connectionSource.getCount() == 1
+
+        when:
+        cursor.close()
+
+        then:
+        connectionSource.getCount() == 0
+    }
+
+    def 'should handle errors when calling getMore'() {
+        given:
+        def connectionA = referenceCountedAsyncConnection(serverVersion)
+        def connectionB = referenceCountedAsyncConnection(serverVersion)
+        def connectionSource = getAsyncConnectionSource(connectionA, connectionB)
+
+        when:
+        def cursor = new AsyncQueryBatchCursor<Document>(queryResult([]), 0, 0, 0, CODEC, connectionSource, null)
+
+        then:
+        connectionSource.getCount() == 1
+
+        when:
+        nextBatch(cursor)
+
+        then:
+        if (commandAsync) {
+            1 * connectionA.commandAsync(_, _, _, _, _, _, _) >> {
+                connectionA.getCount() == 1
+                connectionSource.getCount() == 1
+                it[6].onResult(null, exception)
+            }
+        } else {
+            1 * connectionA.getMoreAsync(_, _, _, _, _) >> {
+                connectionA.getCount() == 1
+                connectionSource.getCount() == 1
+                it[4].onResult(null, exception)
+            }
+        }
+
+        then:
+        thrown(MongoException)
+
+        then:
+        connectionA.getCount() == 0
+        connectionSource.getCount() == 1
+
+        when:
+        cursor.close()
+
+        then:
+        connectionSource.getCount() == 1
 
         where:
-        batchSize  | maxTimeMS  | expectedMaxTimeFieldValue
-        0          | 0          | null
-        2          | 0          | null
-        0          | 100        | 100
+        serverVersion                | commandAsync | exception
+        new ServerVersion([3, 2, 0]) | true         | COMMAND_EXCEPTION
+        new ServerVersion([3, 2, 0]) | true         | MONGO_EXCEPTION
+        new ServerVersion([3, 0, 0]) | false        | COMMAND_EXCEPTION
+        new ServerVersion([3, 0, 0]) | false        | MONGO_EXCEPTION
     }
 
     List<Document> nextBatch(AsyncQueryBatchCursor cursor) {
         def futureResultCallback = new FutureResultCallback()
         cursor.next(futureResultCallback)
-        futureResultCallback.get(60, SECONDS)
+        futureResultCallback.get(1, SECONDS)
+    }
+
+    List<Document> tryNextBatch(AsyncQueryBatchCursor cursor) {
+        def futureResultCallback = new FutureResultCallback()
+        cursor.tryNext(futureResultCallback)
+        futureResultCallback.get(1, SECONDS)
+    }
+
+    private static final MongoNamespace NAMESPACE = new MongoNamespace('db', 'coll')
+    private static final ServerAddress SERVER_ADDRESS = new ServerAddress()
+    private static final CURSOR_ID = 42
+    private static final FIRST_BATCH = [new Document('_id', 1), new Document('_id', 2)]
+    private static final SECOND_BATCH = [new Document('_id', 3), new Document('_id', 4)]
+    private static final CODEC = new DocumentCodec()
+    private static final MONGO_EXCEPTION = new MongoException('error')
+    private static final COMMAND_EXCEPTION = new MongoCommandException(BsonDocument.parse('{"ok": false, "errmsg": "error"}'),
+            SERVER_ADDRESS)
+
+    def documentResponse(results, cursorId = 42) {
+        new BsonDocument('ok', new BsonInt32(1)).append('cursor',
+                new BsonDocument('id', new BsonInt64(cursorId)).append('ns',
+                        new BsonString(NAMESPACE.getFullName()))
+                        .append('nextBatch', new BsonArrayWrapper(results)))
+    }
+
+    def queryResult(results = FIRST_BATCH, cursorId = 42) {
+        new QueryResult(NAMESPACE, results, cursorId, SERVER_ADDRESS)
+    }
+
+    def referenceCountedAsyncConnection() {
+        referenceCountedAsyncConnection(new ServerVersion([3, 2, 0]))
     }
+
+    def referenceCountedAsyncConnection(ServerVersion serverVersion) {
+        def released = false
+        def counter = 0
+        def mock = Mock(AsyncConnection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> getMaxWireVersionForServerVersion(serverVersion.getVersionList())
+            }
+        }
+        mock.retain() >> {
+            if (released) {
+                throw new IllegalStateException('Tried to retain AsyncConnection when already released')
+            } else {
+                counter += 1
+            }
+            mock
+        }
+        mock.release() >> {
+            counter -= 1
+            if (counter == 0) {
+                released = true
+            } else if (counter < 0) {
+                throw new IllegalStateException('Tried to release AsyncConnection below 0')
+            }
+        }
+        mock.getCount() >> { counter }
+        mock
+    }
+
+    def getAsyncConnectionSource(AsyncConnection... connections) {
+        def index = -1
+        getAsyncConnectionSourceWithResult { index += 1; [connections.toList().get(index).retain(), null] }
+    }
+
+    def getAsyncConnectionSourceWithResult(connectionCallbackResults) {
+        def released = false
+        int counter = 0
+        def mock = Mock(AsyncConnectionSource)
+        mock.getConnection(_) >> {
+            def (result, error) = connectionCallbackResults()
+            it[0].onResult(result, error)
+        }
+        mock.retain() >> {
+            if (released) {
+                throw new IllegalStateException('Tried to retain AsyncConnectionSource when already released')
+            } else {
+                counter += 1
+            }
+            mock
+        }
+        mock.release() >> {
+            counter -= 1
+            if (counter == 0) {
+                released = true
+            } else if (counter < 0) {
+                throw new IllegalStateException('Tried to release AsyncConnectionSource below 0')
+            }
+        }
+        mock.getCount() >> { counter }
+        mock
+    }
+
+    BsonDocument createKillCursorsDocument(ServerCursor serverCursor) {
+        new BsonDocument('killCursors', new BsonString(NAMESPACE.getCollectionName()))
+                .append('cursors', new BsonArray(Collections.singletonList(new BsonInt64(serverCursor.id))))
+    }
+
 }
diff --git a/driver-core/src/test/unit/com/mongodb/operation/AsyncSingleBatchQueryCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/AsyncSingleBatchQueryCursorSpecification.groovy
new file mode 100644
index 00000000000..42abfad5eb0
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/AsyncSingleBatchQueryCursorSpecification.groovy
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.ServerAddress
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.connection.QueryResult
+import org.bson.Document
+import spock.lang.Specification
+
+import static java.util.concurrent.TimeUnit.SECONDS
+
+class AsyncSingleBatchQueryCursorSpecification extends Specification {
+
+    def 'should work as expected'() {
+        given:
+        def cursor = new AsyncSingleBatchQueryCursor<Document>(firstBatch)
+
+        when:
+        def batch = nextBatch(cursor)
+
+        then:
+        batch == firstBatch.getResults()
+
+        then:
+        nextBatch(cursor) == null
+
+        when:
+        nextBatch(cursor)
+
+        then:
+        thrown(MongoException)
+    }
+
+    def 'should work as with tryNext'() {
+        given:
+        def cursor = new AsyncSingleBatchQueryCursor<Document>(firstBatch)
+
+        when:
+        def batch = tryNextBatch(cursor)
+
+        then:
+        batch == firstBatch.getResults()
+
+        then:
+        tryNextBatch(cursor) == null
+
+        when:
+        tryNextBatch(cursor)
+
+        then:
+        thrown(MongoException)
+    }
+
+    def 'should not support setting batchsize'() {
+        given:
+        def cursor = new AsyncSingleBatchQueryCursor<Document>(firstBatch)
+
+        when:
+        cursor.setBatchSize(1)
+
+        then:
+        cursor.getBatchSize() == 0
+    }
+
+
+    List<Document> nextBatch(AsyncSingleBatchQueryCursor cursor) {
+        def futureResultCallback = new FutureResultCallback()
+        cursor.next(futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+    }
+    List<Document> tryNextBatch(AsyncSingleBatchQueryCursor cursor) {
+        def futureResultCallback = new FutureResultCallback()
+        cursor.tryNext(futureResultCallback)
+        futureResultCallback.get(60, SECONDS)
+    }
+
+
+    def firstBatch = new QueryResult(new MongoNamespace('db', 'coll'), [new Document('a', 1)], 0, new ServerAddress())
+}
diff --git a/driver-core/src/test/unit/com/mongodb/operation/BulkWriteBatchSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/BulkWriteBatchSpecification.groovy
new file mode 100644
index 00000000000..ff5e75f30fa
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/BulkWriteBatchSpecification.groovy
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.ServerAddress
+import com.mongodb.WriteConcern
+import com.mongodb.bulk.BulkWriteResult
+import com.mongodb.bulk.BulkWriteUpsert
+import com.mongodb.bulk.DeleteRequest
+import com.mongodb.bulk.InsertRequest
+import com.mongodb.bulk.UpdateRequest
+import com.mongodb.bulk.WriteRequest
+import com.mongodb.client.model.Collation
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import spock.lang.Specification
+
+import static com.mongodb.bulk.WriteRequest.Type.REPLACE
+import static com.mongodb.bulk.WriteRequest.Type.UPDATE
+import static com.mongodb.connection.ServerConnectionState.CONNECTED
+
+class BulkWriteBatchSpecification extends Specification {
+    def namespace = new MongoNamespace('db.coll')
+    def serverDescription = ServerDescription.builder().address(new ServerAddress()).state(CONNECTED)
+            .version(new ServerVersion(3, 6))
+            .logicalSessionTimeoutMinutes(30)
+            .build()
+    def connectionDescription = new ConnectionDescription(
+            new ConnectionId(new ServerId(new ClusterId(), serverDescription.getAddress())), new ServerVersion(3, 6), 6,
+            ServerType.REPLICA_SET_PRIMARY, 1000, 16000, 48000, [])
+    def sessionContext = new ReadConcernAwareNoOpSessionContext(ReadConcern.DEFAULT)
+
+    def 'should split payloads by type when ordered'() {
+        when:
+        def bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, serverDescription, connectionDescription, true,
+                WriteConcern.ACKNOWLEDGED, null, false, getWriteRequests(), sessionContext)
+        def payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'documents'
+        payload.getPayload() == getWriteRequestsAsDocuments()[0..0]
+        bulkWriteBatch.getCommand() == toBsonDocument('{ "insert" : "coll", "ordered" : true }')
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'updates'
+        payload.getPayload() == getWriteRequestsAsDocuments()[1..2]
+        bulkWriteBatch.getCommand() == toBsonDocument('{ "update" : "coll", "ordered" : true }')
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'documents'
+        payload.getPayload() == getWriteRequestsAsDocuments()[3..4]
+        bulkWriteBatch.getCommand() == toBsonDocument('{ "insert" : "coll", "ordered" : true }')
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'updates'
+        payload.getPayload() == getWriteRequestsAsDocuments()[5..5]
+        bulkWriteBatch.getCommand() == toBsonDocument('{ "update" : "coll", "ordered" : true }')
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'deletes'
+        payload.getPayload() == getWriteRequestsAsDocuments()[6..7]
+        bulkWriteBatch.getCommand() == toBsonDocument('{ "delete" : "coll", "ordered" : true }')
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'documents'
+        payload.getPayload() == getWriteRequestsAsDocuments()[8..8]
+        bulkWriteBatch.getCommand() == toBsonDocument('{ "insert" : "coll", "ordered" : true }')
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'deletes'
+        payload.getPayload() == getWriteRequestsAsDocuments()[9..9]
+        bulkWriteBatch.getCommand() == toBsonDocument('{ "delete" : "coll", "ordered" : true }')
+        !bulkWriteBatch.hasAnotherBatch()
+    }
+
+    def 'should group payloads by type when unordered'() {
+        when:
+        def bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, serverDescription, connectionDescription, false,
+                WriteConcern.MAJORITY, true, false, getWriteRequests(), sessionContext)
+        def payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'documents'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[0], getWriteRequestsAsDocuments()[3], getWriteRequestsAsDocuments()[4],
+                                 getWriteRequestsAsDocuments()[8]]
+        bulkWriteBatch.hasAnotherBatch()
+        bulkWriteBatch.getCommand() == toBsonDocument('''{"insert": "coll", "ordered": false,
+                "writeConcern": {"w" : "majority"}, "bypassDocumentValidation" : true }''')
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'updates'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[1], getWriteRequestsAsDocuments()[2]]
+        bulkWriteBatch.hasAnotherBatch()
+        bulkWriteBatch.getCommand() == toBsonDocument('''{"update": "coll", "ordered": false,
+                "writeConcern": {"w" : "majority"}, "bypassDocumentValidation" : true }''')
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'updates'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[5]]
+        bulkWriteBatch.hasAnotherBatch()
+        bulkWriteBatch.getCommand() == toBsonDocument('''{"update": "coll", "ordered": false,
+                "writeConcern": {"w" : "majority"}, "bypassDocumentValidation" : true }''')
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(payload.getPayload().size())
+
+        then:
+        payload.getPayloadName() == 'deletes'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[6], getWriteRequestsAsDocuments()[7], getWriteRequestsAsDocuments()[9]]
+        !bulkWriteBatch.hasAnotherBatch()
+        bulkWriteBatch.getCommand() == toBsonDocument('''{"delete": "coll", "ordered": false,
+                "writeConcern": {"w" : "majority"}, "bypassDocumentValidation" : true }''')
+    }
+
+    def 'should split payloads if only payload partially processed'() {
+        when:
+        def bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, serverDescription, connectionDescription, false,
+                WriteConcern.ACKNOWLEDGED, null, false, getWriteRequests()[0..3], sessionContext)
+        def payload = bulkWriteBatch.getPayload()
+        payload.setPosition(1)
+
+        then:
+        payload.getPayloadName() == 'documents'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[0], getWriteRequestsAsDocuments()[3]]
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(1)
+
+        then:
+        payload.getPayloadName() == 'documents'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[3]]
+        bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(1)
+
+        then:
+        payload.getPayloadName() == 'updates'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[1], getWriteRequestsAsDocuments()[2]]
+        !bulkWriteBatch.hasAnotherBatch()
+
+        when:
+        bulkWriteBatch = bulkWriteBatch.getNextBatch()
+        payload = bulkWriteBatch.getPayload()
+        payload.setPosition(1)
+
+        then:
+        payload.getPayloadName() == 'updates'
+        payload.getPayload() == [getWriteRequestsAsDocuments()[2]]
+        !bulkWriteBatch.hasAnotherBatch()
+    }
+
+    def 'should not retry when at least one write is not retryable'() {
+        when:
+        def bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, serverDescription, connectionDescription, false,
+                WriteConcern.ACKNOWLEDGED, null, true,
+                [new DeleteRequest(new BsonDocument()).multi(true), new InsertRequest(new BsonDocument())], sessionContext)
+
+        then:
+        !bulkWriteBatch.getRetryWrites()
+    }
+
+    def 'should handle operation responses'() {
+        given:
+        def bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, serverDescription, connectionDescription, true,
+                WriteConcern.ACKNOWLEDGED, null, false, getWriteRequests()[1..1], sessionContext)
+        def writeConcernError = toBsonDocument('{ok: 1, n: 1, upserted: [{_id: 2, index: 0}]}')
+
+        when:
+        bulkWriteBatch.addResult(writeConcernError)
+
+        then:
+        !bulkWriteBatch.hasErrors()
+        bulkWriteBatch.getResult() == BulkWriteResult.acknowledged(0, 0, 0, 0, [new BulkWriteUpsert(0, new BsonInt32(2))])
+        bulkWriteBatch.shouldProcessBatch()
+    }
+
+    def 'should handle writeConcernError error responses'() {
+        given:
+        def bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, serverDescription, connectionDescription, true,
+                WriteConcern.ACKNOWLEDGED, null, false, getWriteRequests()[0..0], sessionContext)
+        def writeConcernError = toBsonDocument('{n: 1, writeConcernError: {code: 75, errmsg: "wtimeout", errInfo: {wtimeout: "0"}}}')
+
+        when:
+        bulkWriteBatch.addResult(writeConcernError)
+
+        then:
+        bulkWriteBatch.hasErrors()
+        bulkWriteBatch.getError().getWriteErrors().isEmpty()
+        bulkWriteBatch.getError().getWriteConcernError()
+        bulkWriteBatch.shouldProcessBatch()
+    }
+
+    def 'should handle writeErrors error responses'() {
+        given:
+        def bulkWriteBatch = BulkWriteBatch.createBulkWriteBatch(namespace, serverDescription, connectionDescription, true,
+                WriteConcern.ACKNOWLEDGED, null, false, getWriteRequests()[0..0], sessionContext)
+        def writeError = toBsonDocument('''{"ok": 0, "n": 1, "code": 65, "errmsg": "bulk op errors",
+            "writeErrors": [{ "index" : 0, "code" : 100, "errmsg": "some error"}] }''')
+
+        when:
+        bulkWriteBatch.addResult(writeError)
+
+        then:
+        bulkWriteBatch.hasErrors()
+        bulkWriteBatch.getError().getWriteErrors().size() == 1
+        !bulkWriteBatch.shouldProcessBatch()
+    }
+
+    private static List<WriteRequest> getWriteRequests() {
+        [new InsertRequest(toBsonDocument('{_id: 1, x: 1}')),
+         new UpdateRequest(toBsonDocument('{ _id: 2}'), toBsonDocument('{$set: {x : 2}}'), UPDATE).upsert(true),
+         new UpdateRequest(toBsonDocument('{ _id: 3}'), toBsonDocument('{$set: {x : 3}}'), UPDATE),
+         new InsertRequest(toBsonDocument('{_id: 4, x: 4}')),
+         new InsertRequest(toBsonDocument('{_id: 5, x: 5}')),
+         new UpdateRequest(toBsonDocument('{ _id: 6}'), toBsonDocument('{_id: 6, x: 6}'), REPLACE)
+                 .collation(Collation.builder().locale('en').build()),
+         new DeleteRequest(toBsonDocument('{_id: 7}')),
+         new DeleteRequest(toBsonDocument('{_id: 8}')),
+         new InsertRequest(toBsonDocument('{_id: 9, x: 9}')),
+         new DeleteRequest(toBsonDocument('{_id: 10}')).collation(Collation.builder().locale('de').build())
+        ]
+    }
+
+    private static List<BsonDocument> getWriteRequestsAsDocuments() {
+        ['{_id: 1, x: 1}',
+         '{"q": { "_id" : 2}, "u": { "$set": {"x": 2}}, "multi": true, "upsert": true }',
+         '{"q": { "_id" : 3}, "u": { "$set": {"x": 3}}, "multi": true}',
+         '{"_id": 4, "x": 4}',
+         '{"_id": 5, "x": 5}',
+         '{"q": { "_id" : 6 }, "u": { "_id": 6, "x": 6 }, "collation": { "locale": "en" }}',
+         '{"q": { "_id" : 7 }, "limit": 0 }',
+         '{"q": { "_id" : 8 }, "limit": 0 }',
+         '{"_id": 9, "x": 9}',
+         '{"q": { "_id" : 10 }, "limit": 0, "collation" : { "locale" : "de" }}'
+        ].collect { toBsonDocument(it) }
+    }
+
+    private static BsonDocument toBsonDocument(final String json) {
+        BsonDocument.parse(json)
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/operation/ChangeStreamBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/ChangeStreamBatchCursorSpecification.groovy
new file mode 100644
index 00000000000..3c963c4800d
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/ChangeStreamBatchCursorSpecification.groovy
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+
+import com.mongodb.binding.ReadBinding
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import spock.lang.Specification
+
+class ChangeStreamBatchCursorSpecification extends Specification {
+
+    def 'should call the underlying QueryBatchCursor'() {
+        given:
+        def changeStreamOperation = Stub(ChangeStreamOperation)
+        def binding = Stub(ReadBinding)
+        def wrapped = Mock(QueryBatchCursor)
+        def resumeToken = new BsonDocument('_id': new BsonInt32(1))
+        def cursor = new ChangeStreamBatchCursor(changeStreamOperation, wrapped, binding, resumeToken)
+
+        when:
+        cursor.setBatchSize(10)
+
+        then:
+        1 * wrapped.setBatchSize(10)
+
+        when:
+        cursor.tryNext()
+
+        then:
+        1 * wrapped.tryNext()
+        1 * wrapped.getPostBatchResumeToken()
+
+        when:
+        cursor.next()
+
+        then:
+        1 * wrapped.next()
+        1 * wrapped.getPostBatchResumeToken()
+
+        when:
+        cursor.close()
+
+        then:
+        1 * wrapped.close()
+
+        when:
+        cursor.close()
+
+        then:
+        0 * wrapped.close()
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/operation/CommandOperationHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/CommandOperationHelperSpecification.groovy
index ae221ed23e3..36fefd724d9 100644
--- a/driver-core/src/test/unit/com/mongodb/operation/CommandOperationHelperSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/operation/CommandOperationHelperSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 package com.mongodb.operation
 
 import com.mongodb.MongoCommandException
+import com.mongodb.MongoWriteConcernException
+import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
 import com.mongodb.ServerAddress
 import com.mongodb.async.SingleResultCallback
@@ -29,17 +31,25 @@ import com.mongodb.binding.WriteBinding
 import com.mongodb.connection.AsyncConnection
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerType
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import com.mongodb.session.SessionContext
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonString
+import org.bson.codecs.BsonDocumentCodec
 import org.bson.codecs.Decoder
 import spock.lang.Specification
 
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocol
-import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.operation.CommandOperationHelper.executeRetryableCommand
+import static com.mongodb.operation.CommandOperationHelper.executeCommand
+import static com.mongodb.operation.CommandOperationHelper.executeCommandAsync
 import static com.mongodb.operation.CommandOperationHelper.isNamespaceError
 import static com.mongodb.operation.CommandOperationHelper.rethrowIfNotNamespaceError
+import static com.mongodb.operation.OperationUnitSpecification.getMaxWireVersionForServerVersion
 
 class CommandOperationHelperSpecification extends Specification {
 
@@ -104,13 +114,13 @@ class CommandOperationHelperSpecification extends Specification {
                                                              new ServerAddress()), 'some value') == 'some value'
     }
 
-    def 'should set slaveOK to false when using WriteBinding'() {
+    def 'should set read preference to primary to false when using WriteBinding'() {
         given:
         def dbName = 'db'
         def command = new BsonDocument()
         def decoder = Stub(Decoder)
         def connection = Mock(Connection)
-        def function = Stub(CommandOperationHelper.CommandTransformer)
+        def function = Stub(CommandOperationHelper.CommandWriteTransformer)
         def connectionSource = Stub(ConnectionSource) {
             getConnection() >> connection
         }
@@ -120,20 +130,117 @@ class CommandOperationHelperSpecification extends Specification {
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeWrappedCommandProtocol(writeBinding, dbName, command, decoder, function)
+        executeCommand(writeBinding, dbName, command, decoder, function)
 
         then:
         _ * connection.getDescription() >> connectionDescription
-        1 * connection.command(dbName, command, false, _, decoder)
+        1 * connection.command(dbName, command, _, primary(), decoder, _)
         1 * connection.release()
     }
 
-    def 'should use the ReadBindings readPreference to set slaveOK'() {
+    def 'should retry with retryable exception'() {
+        given:
+        def dbName = 'db'
+        def command = BsonDocument.parse('''{findAndModify: "coll", query: {a: 1}, new: false, update: {$inc: {a :1}}, txnNumber: 1}''')
+        def commandCreator = { serverDescription, connectionDescription -> command }
+        def decoder = new BsonDocumentCodec()
+        def results = [
+            BsonDocument.parse('{ok: 1.0, writeConcernError: {code: 91, errmsg: "Replication is being shut down"}}'),
+            BsonDocument.parse('{ok: 1.0, writeConcernError: {code: -1, errmsg: "UnknownError"}}')] as Queue
+        def connection = Mock(Connection) {
+            _ * release()
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> getMaxWireVersionForServerVersion([4, 0, 0])
+                getServerType() >> ServerType.REPLICA_SET_PRIMARY
+            }
+        }
+        def connectionSource = Stub(ConnectionSource) {
+            _ * getConnection() >> connection
+            _ * getServerDescription() >> Stub(ServerDescription) {
+                getLogicalSessionTimeoutMinutes() >> 1
+            }
+        }
+        def writeBinding = Stub(WriteBinding) {
+            getWriteConnectionSource() >> connectionSource
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+
+        when:
+        executeRetryableCommand(writeBinding, dbName, primary(), new NoOpFieldNameValidator(), decoder, commandCreator,
+                FindAndModifyHelper.transformer())
+
+        then:
+        2 * connection.command(dbName, command, _, primary(), decoder, _) >> { results.poll() }
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError.code == -1
+    }
+
+    def 'should retry with retryable exception async'() {
+        given:
+        def dbName = 'db'
+        def command = BsonDocument.parse('''{findAndModify: "coll", query: {a: 1}, new: false, update: {$inc: {a :1}}, txnNumber: 1}''')
+        def serverDescription = Stub(ServerDescription)
+        def connectionDescription = Stub(ConnectionDescription) {
+            getMaxWireVersion() >> getMaxWireVersionForServerVersion([4, 0, 0])
+            getServerType() >> ServerType.REPLICA_SET_PRIMARY
+        }
+        def commandCreator = { serverDesc, connectionDesc -> command }
+        def callback = new SingleResultCallback() {
+            def result
+            def throwable
+            @Override
+            void onResult(final Object result, final Throwable t) {
+                this.result = result
+                this.throwable = t
+            }
+        }
+        def decoder = new BsonDocumentCodec()
+        def results = [
+                BsonDocument.parse('{ok: 1.0, writeConcernError: {code: 91, errmsg: "Replication is being shut down"}}'),
+                BsonDocument.parse('{ok: 1.0, writeConcernError: {code: -1, errmsg: "UnknownError"}}')] as Queue
+
+        def connection = Mock(AsyncConnection) {
+            _ * getDescription() >> connectionDescription
+        }
+
+        def connectionSource = Stub(AsyncConnectionSource) {
+            getConnection(_) >> { it[0].onResult(connection, null) }
+            _ * getServerDescription() >> serverDescription
+        }
+        def asyncWriteBinding = Stub(AsyncWriteBinding) {
+            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getSessionContext() >> Stub(SessionContext) {
+                hasSession() >> true
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+
+        when:
+        executeRetryableCommand(asyncWriteBinding, dbName, primary(), new NoOpFieldNameValidator(), decoder,
+                commandCreator, FindAndModifyHelper.asyncTransformer(), callback)
+
+        then:
+        2 * connection.commandAsync(dbName, command, _, primary(), decoder, _, _) >> { it.last().onResult(results.poll(), null) }
+
+        then:
+        callback.throwable instanceof MongoWriteConcernException
+        callback.throwable.writeConcernError.code == -1
+    }
+
+    def 'should use the ReadBindings readPreference'() {
         given:
         def dbName = 'db'
         def command = new BsonDocument()
+        def commandCreator = { serverDescription, connectionDescription -> command }
         def decoder = Stub(Decoder)
-        def function = Stub(CommandOperationHelper.CommandTransformer)
+        def function = Stub(CommandOperationHelper.CommandReadTransformer)
         def connection = Mock(Connection)
         def connectionSource = Stub(ConnectionSource) {
             getConnection() >> connection
@@ -145,24 +252,24 @@ class CommandOperationHelperSpecification extends Specification {
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeWrappedCommandProtocol(readBinding, dbName, command, decoder, function)
+        executeCommand(readBinding, dbName, commandCreator, decoder, function, false)
 
         then:
         _ * connection.getDescription() >> connectionDescription
-        1 * connection.command(dbName, command, readPreference.isSlaveOk(), _, decoder)
+        1 * connection.command(dbName, command, _, readPreference, decoder, _)
         1 * connection.release()
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        readPreference << [primary(), ReadPreference.secondary()]
     }
 
-    def 'should set slaveOK to false when using AsyncWriteBinding'() {
+    def 'should set read preference to primary to false when using AsyncWriteBinding'() {
         given:
         def dbName = 'db'
         def command = new BsonDocument()
         def decoder = Stub(Decoder)
         def callback = Stub(SingleResultCallback)
-        def function = Stub(CommandOperationHelper.CommandTransformer)
+        def function = Stub(CommandOperationHelper.CommandWriteTransformerAsync)
         def connection = Mock(AsyncConnection)
         def connectionSource = Stub(AsyncConnectionSource) {
             getConnection(_) >> { it[0].onResult(connection, null) }
@@ -173,21 +280,22 @@ class CommandOperationHelperSpecification extends Specification {
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeWrappedCommandProtocolAsync(asyncWriteBinding, dbName, command, decoder, function, callback)
+        executeCommandAsync(asyncWriteBinding, dbName, command, decoder, function, callback)
 
         then:
         _ * connection.getDescription() >> connectionDescription
-        1 * connection.commandAsync(dbName, command, false, _, decoder, _) >> { it[5].onResult(1, null) }
+        1 * connection.commandAsync(dbName, command, _, primary(), decoder, _, _) >> { it[6].onResult(1, null) }
         1 * connection.release()
     }
 
-    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
+    def 'should use the AsyncReadBindings readPreference'() {
         given:
         def dbName = 'db'
         def command = new BsonDocument()
+        def commandCreator = { serverDescription, connectionDescription -> command }
         def decoder = Stub(Decoder)
         def callback = Stub(SingleResultCallback)
-        def function = Stub(CommandOperationHelper.CommandTransformer)
+        def function = Stub(CommandOperationHelper.CommandReadTransformerAsync)
         def connection = Mock(AsyncConnection)
         def connectionSource = Stub(AsyncConnectionSource) {
             getConnection(_) >> { it[0].onResult(connection, null) }
@@ -199,15 +307,15 @@ class CommandOperationHelperSpecification extends Specification {
         def connectionDescription = Stub(ConnectionDescription)
 
         when:
-        executeWrappedCommandProtocolAsync(asyncReadBinding, dbName, command, decoder, function, callback)
+        executeCommandAsync(asyncReadBinding, dbName, commandCreator, decoder, function, false, callback)
 
         then:
         _ * connection.getDescription() >> connectionDescription
-        1 * connection.commandAsync(dbName, command, readPreference.isSlaveOk(), _, decoder, _) >> { it[5].onResult(1, null) }
+        1 * connection.commandAsync(dbName, command, _, readPreference, decoder, _, _) >> { it[6].onResult(1, null) }
         1 * connection.release()
 
         where:
-        readPreference << [ReadPreference.primary(), ReadPreference.secondary()]
+        readPreference << [primary(), ReadPreference.secondary()]
     }
 
 }
diff --git a/driver-core/src/test/unit/com/mongodb/operation/CommitTransactionOperationUnitSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/CommitTransactionOperationUnitSpecification.groovy
new file mode 100644
index 00000000000..a11ff666f7c
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/CommitTransactionOperationUnitSpecification.groovy
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.MongoException
+import com.mongodb.MongoTimeoutException
+import com.mongodb.WriteConcern
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.binding.AsyncWriteBinding
+import com.mongodb.binding.WriteBinding
+import com.mongodb.session.SessionContext
+
+class CommitTransactionOperationUnitSpecification extends OperationUnitSpecification {
+    def 'should add UnknownTransactionCommitResult error label to MongoTimeoutException'() {
+        given:
+        def writeBinding = Stub(WriteBinding) {
+            getWriteConnectionSource() >> { throw new MongoTimeoutException('Time out!') }
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> true
+            }
+        }
+        def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED)
+
+        when:
+        operation.execute(writeBinding)
+
+        then:
+        def e = thrown(MongoTimeoutException)
+        e.hasErrorLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
+    }
+
+    def 'should add UnknownTransactionCommitResult error label to MongoTimeoutException asynchronously'() {
+        given:
+        def writeBinding = Stub(AsyncWriteBinding) {
+            getWriteConnectionSource(_) >> {
+                it[0].onResult(null, new MongoTimeoutException('Time out!'))
+            }
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> true
+            }
+        }
+        def operation = new CommitTransactionOperation(WriteConcern.ACKNOWLEDGED)
+        def callback = new FutureResultCallback()
+
+        when:
+        operation.executeAsync(writeBinding, callback)
+        callback.get()
+
+        then:
+        def e = thrown(MongoTimeoutException)
+        e.hasErrorLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
+    }
+}
diff --git a/driver-core/src/test/unit/com/mongodb/operation/CursorHelperTest.java b/driver-core/src/test/unit/com/mongodb/operation/CursorHelperTest.java
index ecd581db628..a99ca90c061 100644
--- a/driver-core/src/test/unit/com/mongodb/operation/CursorHelperTest.java
+++ b/driver-core/src/test/unit/com/mongodb/operation/CursorHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/com/mongodb/operation/DeleteRequestSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/DeleteRequestSpecification.groovy
similarity index 80%
rename from driver/src/test/unit/com/mongodb/operation/DeleteRequestSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/operation/DeleteRequestSpecification.groovy
index 4832d6851d4..7ad75404591 100644
--- a/driver/src/test/unit/com/mongodb/operation/DeleteRequestSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/operation/DeleteRequestSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ package com.mongodb.operation
 
 import com.mongodb.bulk.DeleteRequest
 import com.mongodb.bulk.WriteRequest
+import com.mongodb.client.model.Collation
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import spock.lang.Specification
@@ -59,4 +60,13 @@ class DeleteRequestSpecification extends Specification {
         expect:
         !new DeleteRequest(new BsonDocument()).multi(false).isMulti()
     }
+
+    def 'should set collation property'() {
+        when:
+        def collation = Collation.builder().locale('en').build()
+
+        then:
+        new DeleteRequest(new BsonDocument()).collation(null).getCollation() == null
+        new DeleteRequest(new BsonDocument()).collation(collation).getCollation() == collation
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/operation/FindOperationUnitSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/FindOperationUnitSpecification.groovy
new file mode 100644
index 00000000000..1d883cafc30
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/FindOperationUnitSpecification.groovy
@@ -0,0 +1,348 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
+import com.mongodb.async.SingleResultCallback
+import com.mongodb.binding.AsyncConnectionSource
+import com.mongodb.binding.AsyncReadBinding
+import com.mongodb.binding.ConnectionSource
+import com.mongodb.binding.ReadBinding
+import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.Connection
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.QueryResult
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonInt64
+import org.bson.BsonString
+import org.bson.Document
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.Decoder
+import org.bson.codecs.DocumentCodec
+
+import static com.mongodb.CursorType.TailableAwait
+import static com.mongodb.connection.ServerType.STANDALONE
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+
+class FindOperationUnitSpecification extends OperationUnitSpecification {
+
+    def 'should query with the correct arguments'() {
+        given:
+        def serverVersion = new ServerVersion(3, 0)
+        def connectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                serverVersion, 3, STANDALONE, 1000, 16000000, 48000000, [])
+        def connection = Mock(Connection) {
+            _ * getDescription() >> connectionDescription
+        }
+        def connectionSource = Stub(ConnectionSource) {
+            getConnection() >> connection
+        }
+        def readBinding = Stub(ReadBinding) {
+            getReadPreference() >> readPreference
+            getReadConnectionSource() >> connectionSource
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+        def queryResult = new QueryResult(namespace, [], 0, new ServerAddress())
+        def expectedQueryWithOverrides = BsonDocument.parse('''{
+            "$query": { abc : { $gte: 100 }},
+            "$comment": "my comment",
+            "$hint": { hint: 1 },
+            "$min": { abc: 99 },
+            "$max": { abc: 1000 },
+            "$maxScan" : { "$numberLong": "42" },
+            "$returnKey": true,
+            "$showDiskLoc": true,
+            "$snapshot": true
+        }''')
+        def operation = new FindOperation<BsonDocument>(namespace, decoder)
+
+        // Defaults
+        when:
+        operation.execute(readBinding)
+
+        then:
+        1 * connection.query(namespace, new BsonDocument(), operation.getProjection(), operation.getSkip(), operation.getLimit(),
+                operation.getBatchSize(), readPreference.isSlaveOk(), false, false, false, false, false, decoder) >> queryResult
+        1 * connection.release()
+
+        // modifiers
+        when:
+        operation.modifiers(modifiers)
+        operation.execute(readBinding)
+
+        then:
+        1 * connection.query(namespace, modifiers, operation.getProjection(), operation.getSkip(), operation.getLimit(),
+                operation.getBatchSize(), readPreference.isSlaveOk(), false, false, false, false, false, decoder) >> queryResult
+        1 * connection.release()
+
+        // Overrides
+        and:
+        operation.filter(BsonDocument.parse('{ abc : { $gte: 100 }}'))
+                .projection(new BsonDocument('x', new BsonInt32(1)))
+                .skip(2)
+                .limit(100)
+                .batchSize(10)
+                .cursorType(TailableAwait)
+                .oplogReplay(true)
+                .noCursorTimeout(true)
+                .partial(true)
+                .oplogReplay(true)
+                .comment('my comment')
+                .hint(BsonDocument.parse('{ hint : 1}'))
+                .min(BsonDocument.parse('{ abc: 99 }'))
+                .max(BsonDocument.parse('{ abc: 1000 }'))
+                .maxScan(42L)
+                .returnKey(true)
+                .showRecordId(true)
+                .snapshot(true)
+
+        when:
+        operation.execute(readBinding)
+
+        then:
+        1 * connection.query(namespace, expectedQueryWithOverrides, operation.getProjection(), operation.getSkip(), operation.getLimit(),
+                operation.getBatchSize(), readPreference.isSlaveOk(), true, true, true, true, true, decoder) >> queryResult
+        1 * connection.release()
+    }
+
+
+    def 'should find with correct command'() {
+        when:
+        def operation = new FindOperation<BsonDocument>(namespace, new BsonDocumentCodec())
+        def expectedCommand = new BsonDocument('find', new BsonString(namespace.getCollectionName()))
+
+        then:
+        testOperation(operation, [3, 2, 0], expectedCommand, async, commandResult)
+
+        // Modifiers
+        when:
+        operation.modifiers(modifiers)
+        expectedCommand.append('filter', modifiers.getDocument('$query'))
+                .append('comment', modifiers.getString('$comment'))
+                .append('hint', modifiers.getDocument('$hint'))
+                .append('min', modifiers.getDocument('$min'))
+                .append('max', modifiers.getDocument('$max'))
+                .append('maxScan', modifiers.getInt64('$maxScan'))
+                .append('returnKey', modifiers.getBoolean('$returnKey'))
+                .append('showRecordId', modifiers.getBoolean('$showDiskLoc'))
+                .append('snapshot', modifiers.getBoolean('$snapshot'))
+
+        then:
+        testOperation(operation, [3, 2, 0], expectedCommand, async, commandResult)
+
+        // Overrides
+        when:
+        operation.filter(new BsonDocument('a', BsonBoolean.TRUE))
+                .projection(new BsonDocument('x', new BsonInt32(1)))
+                .skip(2)
+                .limit(limit)
+                .batchSize(batchSize)
+                .cursorType(TailableAwait)
+                .oplogReplay(true)
+                .noCursorTimeout(true)
+                .partial(true)
+                .oplogReplay(true)
+                .maxTime(10, MILLISECONDS)
+                .comment('my comment')
+                .hint(BsonDocument.parse('{ hint : 1}'))
+                .min(BsonDocument.parse('{ abc: 99 }'))
+                .max(BsonDocument.parse('{ abc: 1000 }'))
+                .maxScan(42L)
+                .returnKey(true)
+                .showRecordId(true)
+                .snapshot(true)
+
+        expectedCommand.append('filter', operation.getFilter())
+                .append('projection', operation.getProjection())
+                .append('skip', new BsonInt32(operation.getSkip()))
+                .append('tailable', BsonBoolean.TRUE)
+                .append('awaitData', BsonBoolean.TRUE)
+                .append('allowPartialResults', BsonBoolean.TRUE)
+                .append('noCursorTimeout', BsonBoolean.TRUE)
+                .append('oplogReplay', BsonBoolean.TRUE)
+                .append('snapshot', BsonBoolean.TRUE)
+                .append('maxTimeMS', new BsonInt64(operation.getMaxTime(MILLISECONDS)))
+                .append('comment', new BsonString(operation.getComment()))
+                .append('hint', operation.getHint())
+                .append('min', operation.getMin())
+                .append('max', operation.getMax())
+                .append('maxScan', new BsonInt64(operation.getMaxScan()))
+                .append('returnKey', BsonBoolean.TRUE)
+                .append('showRecordId', BsonBoolean.TRUE)
+                .append('snapshot', BsonBoolean.TRUE)
+
+        if (commandLimit != null) {
+            expectedCommand.append('limit', new BsonInt32(commandLimit))
+        }
+        if (commandBatchSize != null) {
+            expectedCommand.append('batchSize', new BsonInt32(commandBatchSize))
+        }
+        if (commandSingleBatch != null) {
+            expectedCommand.append('singleBatch', BsonBoolean.valueOf(commandSingleBatch))
+        }
+
+        then:
+        testOperation(operation, [3, 2, 0], expectedCommand, async, commandResult)
+
+        where:
+        async << [true, true, true, true, true, false, false, false, false, false]
+        limit << [100, -100, 100, 0, 100, 100, -100, 100, 0, 100]
+        batchSize << [10, 10, -10, 10, 0, 10, 10, -10, 10, 0]
+        commandLimit << [100, 100, 10, null, 100, 100, 100, 10, null, 100]
+        commandBatchSize << [10, null, null, 10, null, 10, null, null, 10, null]
+        commandSingleBatch << [null, true, true, null, null, null, true, true, null, null]
+    }
+
+    def 'should use the ReadBindings readPreference to set slaveOK'() {
+        given:
+        def dbName = 'db'
+        def collectionName = 'coll'
+        def namespace = new MongoNamespace(dbName, collectionName)
+        def decoder = Stub(Decoder)
+        def connectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 0), 3, STANDALONE, 1000, 16000000, 48000000, [])
+        def connection = Mock(Connection) {
+            _ * getDescription() >> connectionDescription
+        }
+        def readBinding = Stub(ReadBinding) {
+            getReadConnectionSource() >> Stub(ConnectionSource) {
+                getConnection() >> connection
+            }
+            getReadPreference() >> Stub(ReadPreference) {
+                isSlaveOk() >> slaveOk
+            }
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+        def queryResult = Mock(QueryResult) {
+            _ * getNamespace() >> namespace
+            _ * getResults() >> []
+        }
+        def operation = new FindOperation<BsonDocument>(namespace, decoder)
+
+        when:
+        operation.execute(readBinding)
+
+        then:
+        1 * connection.query(namespace, _, _, _, _, _, slaveOk, _, _, _, _, _, _) >> queryResult
+        1 * connection.release()
+
+        where:
+        slaveOk << [true, false]
+    }
+
+    def 'should use the AsyncReadBindings readPreference to set slaveOK'() {
+        given:
+        def dbName = 'db'
+        def collectionName = 'coll'
+        def namespace = new MongoNamespace(dbName, collectionName)
+        def decoder = Stub(Decoder)
+        def connectionDescription = new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())),
+                new ServerVersion(3, 0), 3, STANDALONE, 1000, 16000000, 48000000, [])
+
+        def connection = Mock(AsyncConnection) {
+            _ * getDescription() >> connectionDescription
+        }
+        def connectionSource = Stub(AsyncConnectionSource) {
+            getConnection(_) >> { it[0].onResult(connection, null) }
+        }
+        def readBinding = Stub(AsyncReadBinding) {
+            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getReadPreference() >> Stub(ReadPreference) {
+                isSlaveOk() >> slaveOk
+            }
+            getSessionContext() >> Stub(SessionContext) {
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+        def queryResult = Mock(QueryResult) {
+            _ * getNamespace() >> namespace
+            _ * getResults() >> []
+        }
+        def operation = new FindOperation<BsonDocument>(namespace, decoder)
+
+        when:
+        operation.executeAsync(readBinding, Stub(SingleResultCallback))
+
+        then:
+        1 * connection.queryAsync(namespace, _, _, _, _, _, slaveOk, _, _, _, _, _, _, _) >> { it[13].onResult(queryResult, null) }
+        1 * connection.release()
+
+        where:
+        slaveOk << [true, false]
+    }
+
+
+    def 'should use the readPreference to set slaveOK for commands'() {
+        when:
+        def operation = new FindOperation<BsonDocument>(namespace, new DocumentCodec())
+
+        then:
+        testOperationSlaveOk(operation, [3, 2, 0], readPreference, async, commandResult)
+
+        where:
+        [async, readPreference] << [[true, false], [ReadPreference.primary(), ReadPreference.secondary()]].combinations()
+    }
+
+    def 'should throw an exception when using an unsupported Collation'() {
+        given:
+        def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
+                .filter(BsonDocument.parse('{str: "FOO"}'))
+                .collation(defaultCollation)
+
+        when:
+        testOperationThrows(operation, [3, 2, 0], async)
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        where:
+        async << [true, false]
+    }
+
+    def namespace = new MongoNamespace('db', 'coll')
+    def decoder = new BsonDocumentCodec()
+    def readPreference = ReadPreference.secondary()
+    def commandResult = new BsonDocument('cursor', new BsonDocument('id', new BsonInt64(0))
+            .append('ns', new BsonString('db.coll'))
+            .append('firstBatch', new BsonArrayWrapper([])))
+    def modifiers = BsonDocument.parse('''{
+            "$query": { zzz : { $gte: 100 }},
+            "$comment": "modifier comment",
+            "$hint": { modHint: 1 },
+            "$min": { zzz: 99 },
+            "$max": { zzz: 1000 },
+            "$maxScan" : { "$numberLong": "99" },
+            "$returnKey": false,
+            "$showDiskLoc": false,
+            "$snapshot": false
+        }''')
+}
diff --git a/driver/src/test/unit/com/mongodb/operation/InsertRequestSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/InsertRequestSpecification.groovy
similarity index 97%
rename from driver/src/test/unit/com/mongodb/operation/InsertRequestSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/operation/InsertRequestSpecification.groovy
index b236afd3a18..2a170975c16 100644
--- a/driver/src/test/unit/com/mongodb/operation/InsertRequestSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/operation/InsertRequestSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/operation/OperationHelperSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/OperationHelperSpecification.groovy
new file mode 100644
index 00000000000..15158ff6bd9
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/OperationHelperSpecification.groovy
@@ -0,0 +1,488 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.MongoClientException
+import com.mongodb.ReadConcern
+import com.mongodb.ServerAddress
+import com.mongodb.binding.AsyncConnectionSource
+import com.mongodb.bulk.DeleteRequest
+import com.mongodb.bulk.IndexRequest
+import com.mongodb.bulk.UpdateRequest
+import com.mongodb.bulk.WriteRequest
+import com.mongodb.client.model.Collation
+import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.Connection
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.ServerVersion
+import com.mongodb.session.SessionContext
+import org.bson.BsonDocument
+import spock.lang.Specification
+
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
+import static com.mongodb.connection.ServerConnectionState.CONNECTED
+import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection
+import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource
+import static com.mongodb.operation.OperationHelper.isRetryableRead
+import static com.mongodb.operation.OperationHelper.isRetryableWrite
+import static com.mongodb.operation.OperationHelper.validateCollation
+import static com.mongodb.operation.OperationHelper.validateCollationAndWriteConcern
+import static com.mongodb.operation.OperationHelper.validateIndexRequestCollations
+import static com.mongodb.operation.OperationHelper.validateReadConcern
+import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation
+import static com.mongodb.operation.OperationHelper.validateWriteRequests
+
+class OperationHelperSpecification extends Specification {
+
+    def 'should accept valid read concern'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateReadConcern(connection, readConcern)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateReadConcern(asyncConnection, readConcern, asyncCallableWithConnection)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnectionSource = Stub(AsyncConnectionSource)
+        validateReadConcern(asyncConnectionSource, asyncConnection, readConcern, asyncCallableWithConnectionAndSource)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        where:
+        connectionDescription           | readConcern
+        threeSixConnectionDescription   | ReadConcern.LOCAL
+        threeFourConnectionDescription  | ReadConcern.MAJORITY
+        threeTwoConnectionDescription   | ReadConcern.MAJORITY
+        threeConnectionDescription      | ReadConcern.DEFAULT
+    }
+
+    def 'should throw on invalid read concern'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateReadConcern(connection, readConcern)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateReadConcern(asyncConnection, readConcern, asyncCallableWithConnection)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def asyncConnectionSource = Stub(AsyncConnectionSource)
+        validateReadConcern(asyncConnectionSource, asyncConnection, readConcern, asyncCallableWithConnectionAndSource)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        connectionDescription       | readConcern
+        threeConnectionDescription  | ReadConcern.LOCAL
+        threeConnectionDescription  | ReadConcern.MAJORITY
+    }
+
+    def 'should accept valid collation'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateCollation(connection, collation)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateCollation(asyncConnection, collation, asyncCallableWithConnection)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnactionSource = Stub(AsyncConnectionSource)
+        validateCollation(asyncConnactionSource, asyncConnection, collation, asyncCallableWithConnectionAndSource)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        validateCollationAndWriteConcern(connectionDescription, collation, ACKNOWLEDGED)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        where:
+        connectionDescription          | collation
+        threeFourConnectionDescription | enCollation
+        threeConnectionDescription     | null
+    }
+
+    def 'should throw on invalid collation'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateCollation(connection, collation)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateCollation(asyncConnection, collation, asyncCallableWithConnection)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        validateCollationAndWriteConcern(connectionDescription, collation, UNACKNOWLEDGED)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+
+        validateCollationAndWriteConcern(threeSixConnectionDescription, collation, UNACKNOWLEDGED)
+
+        then:
+        thrown(MongoClientException)
+
+        where:
+        connectionDescription           | collation
+        threeTwoConnectionDescription   | enCollation
+    }
+
+    def 'should accept valid readConcern and collation'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateReadConcernAndCollation(connection, readConcern, collation)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateReadConcernAndCollation(asyncConnection, readConcern, collation, asyncCallableWithConnection)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnactionSource = Stub(AsyncConnectionSource)
+        validateReadConcernAndCollation(asyncConnactionSource, asyncConnection, readConcern, collation,
+                asyncCallableWithConnectionAndSource)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        where:
+        connectionDescription          | readConcern           | collation
+        threeFourConnectionDescription | ReadConcern.DEFAULT   | enCollation
+        threeConnectionDescription     | ReadConcern.DEFAULT   | null
+    }
+
+    def 'should throw on invalid readConcern and collation'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateReadConcernAndCollation(connection, readConcern, collation)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateReadConcernAndCollation(asyncConnection, readConcern, collation, asyncCallableWithConnection)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def asyncConnactionSource = Stub(AsyncConnectionSource)
+        validateReadConcernAndCollation(asyncConnactionSource, asyncConnection, readConcern, collation,
+                asyncCallableWithConnectionAndSource)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        connectionDescription          | readConcern           | collation
+        threeConnectionDescription     | ReadConcern.MAJORITY  | null
+        threeConnectionDescription     | ReadConcern.DEFAULT   | enCollation
+    }
+
+    def 'should accept valid writeRequests'() {
+        when:
+        validateWriteRequests(connectionDescription, bypassDocumentValidation,  writeRequests, writeConcern)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateWriteRequests(asyncConnection, bypassDocumentValidation, writeRequests, writeConcern, asyncCallableWithConnection)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        where:
+        connectionDescription          | bypassDocumentValidation | writeConcern   | writeRequests
+        threeConnectionDescription     | null                     | ACKNOWLEDGED   | [new DeleteRequest(BsonDocument.parse('{a: "a"}}'))]
+        threeTwoConnectionDescription  | null                     | UNACKNOWLEDGED | [new DeleteRequest(BsonDocument.parse('{a: "a"}}'))]
+        threeFourConnectionDescription | null                     | ACKNOWLEDGED   | [new DeleteRequest(BsonDocument.parse('{a: "a"}}'))
+                                                                                              .collation(enCollation)]
+        threeFourConnectionDescription | true                     | ACKNOWLEDGED   | [new UpdateRequest(BsonDocument.parse('{a: "a"}}'),
+                                                                                      BsonDocument.parse('{$set: {a: "A"}}'),
+                                                                                      WriteRequest.Type.REPLACE).collation(enCollation)]
+    }
+
+    def 'should throw on invalid writeRequests'() {
+        given:
+        def asyncThreeTwoConnection = Stub(AsyncConnection) {
+            getDescription() >> threeTwoConnectionDescription
+        }
+        def writeRequests = [new DeleteRequest(BsonDocument.parse('{a: "a"}}'))]
+
+        when:
+        validateWriteRequests(asyncThreeTwoConnection, false, writeRequests, UNACKNOWLEDGED, asyncCallableWithConnection)
+
+        then:
+        thrown(MongoClientException)
+
+        when:
+        def writeRequestsWithCollation = [new DeleteRequest(BsonDocument.parse('{a: "a"}}'))
+                                            .collation(enCollation)]
+        validateWriteRequests(asyncThreeTwoConnection, false, writeRequestsWithCollation, ACKNOWLEDGED, asyncCallableWithConnection)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def asyncThreeFourConnection = Stub(AsyncConnection) {
+            getDescription() >> threeFourConnectionDescription
+        }
+        validateWriteRequests(asyncThreeFourConnection, null, writeRequestsWithCollation, UNACKNOWLEDGED, asyncCallableWithConnection)
+
+        then:
+        thrown(MongoClientException)
+    }
+
+    def 'should accept valid indexRequests'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateIndexRequestCollations(connection, indexRequests)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateIndexRequestCollations(asyncConnection, indexRequests, asyncCallableWithConnection)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        where:
+        connectionDescription          | indexRequests
+        threeFourConnectionDescription | [new IndexRequest(BsonDocument.parse('{a: 1}}')).collation(enCollation)]
+        threeConnectionDescription     | [new IndexRequest(BsonDocument.parse('{a: 1}}'))]
+    }
+
+
+    def 'should throw on invalid indexRequests'() {
+        given:
+        def connection = Stub(Connection) {
+            getDescription() >> connectionDescription
+        }
+
+        when:
+        validateIndexRequestCollations(connection, indexRequests)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        def asyncConnection = Stub(AsyncConnection) {
+            getDescription() >> connectionDescription
+        }
+        validateIndexRequestCollations(asyncConnection, indexRequests, asyncCallableWithConnection)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        connectionDescription       | indexRequests
+        threeConnectionDescription  | [new IndexRequest(BsonDocument.parse('{a: 1}}')).collation(enCollation)]
+    }
+
+
+
+    def 'should check if a valid retryable write'() {
+        given:
+        def activeTransactionSessionContext = Stub(SessionContext) {
+            hasSession() >> true
+            hasActiveTransaction() >> true
+        }
+        def noTransactionSessionContext = Stub(SessionContext) {
+            hasSession() >> true
+            hasActiveTransaction() >> false
+        }
+        def noOpSessionContext = Stub(SessionContext) {
+            hasSession() >> false
+            hasActiveTransaction() >> false
+        }
+
+        expect:
+        isRetryableWrite(retryWrites, writeConcern, serverDescription, connectionDescription, noTransactionSessionContext) == expected
+        !isRetryableWrite(retryWrites, writeConcern, serverDescription, connectionDescription, activeTransactionSessionContext)
+        !isRetryableWrite(retryWrites, writeConcern, serverDescription, connectionDescription, noOpSessionContext)
+
+        where:
+        retryWrites | writeConcern   | serverDescription             | connectionDescription                 | expected
+        false       | ACKNOWLEDGED   | retryableServerDescription    | threeSixConnectionDescription         | false
+        true        | UNACKNOWLEDGED | retryableServerDescription    | threeSixConnectionDescription         | false
+        true        | ACKNOWLEDGED   | nonRetryableServerDescription | threeSixConnectionDescription         | false
+        true        | ACKNOWLEDGED   | retryableServerDescription    | threeFourConnectionDescription        | false
+        true        | ACKNOWLEDGED   | retryableServerDescription    | threeSixConnectionDescription         | false
+        true        | ACKNOWLEDGED   | retryableServerDescription    | threeSixPrimaryConnectionDescription  | true
+    }
+
+    def 'should check if a valid retryable read'() {
+        given:
+        def activeTransactionSessionContext = Stub(SessionContext) {
+            hasSession() >> true
+            hasActiveTransaction() >> true
+        }
+        def noTransactionSessionContext = Stub(SessionContext) {
+            hasSession() >> true
+            hasActiveTransaction() >> false
+        }
+        def noOpSessionContext = Stub(SessionContext) {
+            hasSession() >> false
+            hasActiveTransaction() >> false
+        }
+
+        expect:
+        isRetryableRead(retryReads, serverDescription, connectionDescription, noTransactionSessionContext) == expected
+        !isRetryableRead(retryReads, serverDescription, connectionDescription, activeTransactionSessionContext)
+        !isRetryableRead(retryReads, serverDescription, connectionDescription, noOpSessionContext)
+
+        where:
+        retryReads  | serverDescription             | connectionDescription                 | expected
+        false       | retryableServerDescription    | threeSixConnectionDescription         | false
+        true        | retryableServerDescription    | threeSixConnectionDescription         | true
+        true        | nonRetryableServerDescription | threeSixConnectionDescription         | false
+        true        | retryableServerDescription    | threeFourConnectionDescription        | false
+        true        | retryableServerDescription    | threeSixPrimaryConnectionDescription  | true
+    }
+
+
+    static ConnectionId connectionId = new ConnectionId(new ServerId(new ClusterId(), new ServerAddress()))
+    static ConnectionDescription threeSixConnectionDescription = new ConnectionDescription(connectionId, new ServerVersion(3, 6), 6,
+            STANDALONE, 1000, 100000, 100000, [])
+    static ConnectionDescription threeSixPrimaryConnectionDescription = new ConnectionDescription(connectionId, new ServerVersion(3, 6), 6,
+            REPLICA_SET_PRIMARY, 1000, 100000, 100000, [])
+    static ConnectionDescription threeFourConnectionDescription = new ConnectionDescription(connectionId, new ServerVersion(3, 4), 5,
+            STANDALONE, 1000, 100000, 100000, [])
+    static ConnectionDescription threeTwoConnectionDescription = new ConnectionDescription(connectionId, new ServerVersion(3, 2), 4,
+            STANDALONE, 1000, 100000, 100000, [])
+    static ConnectionDescription threeConnectionDescription = new ConnectionDescription(connectionId, new ServerVersion(3, 0), 3,
+            STANDALONE, 1000, 100000, 100000, [])
+
+    static ServerDescription retryableServerDescription = ServerDescription.builder().address(new ServerAddress()).state(CONNECTED)
+            .logicalSessionTimeoutMinutes(1).build()
+    static ServerDescription nonRetryableServerDescription = ServerDescription.builder().address(new ServerAddress())
+            .state(CONNECTED).build()
+
+    static Collation enCollation = Collation.builder().locale('en').build()
+
+    static asyncCallableWithConnection = new AsyncCallableWithConnection() {
+        @Override
+        void call(final AsyncConnection conn, final Throwable t) {
+            if (t != null) {
+                throw t
+            }
+        }
+    }
+
+    static asyncCallableWithConnectionAndSource = new AsyncCallableWithConnectionAndSource() {
+        @Override
+        void call(final AsyncConnectionSource source, final AsyncConnection conn, final Throwable t) {
+            if (t != null) {
+                throw t
+            }
+        }
+    }
+
+}
diff --git a/driver-core/src/test/unit/com/mongodb/operation/OperationUnitSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/OperationUnitSpecification.groovy
new file mode 100644
index 00000000000..353ccd79a3f
--- /dev/null
+++ b/driver-core/src/test/unit/com/mongodb/operation/OperationUnitSpecification.groovy
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.operation
+
+import com.mongodb.MongoException
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import com.mongodb.async.FutureResultCallback
+import com.mongodb.binding.AsyncConnectionSource
+import com.mongodb.binding.AsyncReadBinding
+import com.mongodb.binding.AsyncWriteBinding
+import com.mongodb.binding.ConnectionSource
+import com.mongodb.binding.ReadBinding
+import com.mongodb.binding.WriteBinding
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
+import com.mongodb.connection.AsyncConnection
+import com.mongodb.connection.Connection
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.session.SessionContext
+import org.bson.BsonDocument
+import spock.lang.Shared
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+class OperationUnitSpecification extends Specification {
+
+    // Have to add to this map for every server release
+    private static final SERVER_TO_WIRE_VERSION_MAP = [
+            [2, 6]: 2,
+            [3, 0]: 3,
+            [3, 2]: 4,
+            [3, 4]: 5,
+            [3, 6]: 6,
+            [4, 0]: 7,
+            [4, 1]: 8,
+            [4, 2]: 8
+    ]
+
+    static int getMaxWireVersionForServerVersion(List<Integer> serverVersion) {
+        def maxWireVersion = SERVER_TO_WIRE_VERSION_MAP[serverVersion.subList(0, 2)]
+
+        if (maxWireVersion == null) {
+            throw new IllegalArgumentException('Unknown server version ' + serverVersion.subList(0, 2) + '.  Check if it has been added ' +
+                    'to SERVER_TO_WIRE_VERSION_MAP')
+        }
+
+        maxWireVersion
+    }
+
+    void testOperation(operation, List<Integer> serverVersion, BsonDocument expectedCommand, boolean async, BsonDocument result) {
+        def test = async ? this.&testAsyncOperation : this.&testSyncOperation
+        test(operation, serverVersion, result, true, expectedCommand)
+    }
+
+    void testOperationSlaveOk(operation, List<Integer> serverVersion, ReadPreference readPreference, boolean async, result = null) {
+        def test = async ? this.&testAsyncOperation : this.&testSyncOperation
+        test(operation, serverVersion, result, false, null, true, readPreference)
+    }
+
+    void testOperationThrows(operation, List<Integer> serverVersion, boolean async) {
+        def test = async ? this.&testAsyncOperation : this.&testSyncOperation
+        test(operation, serverVersion, null, false)
+    }
+
+    def testSyncOperation(operation, List<Integer> serverVersion, result, Boolean checkCommand=true,
+                          BsonDocument expectedCommand=null,
+                          Boolean checkSlaveOk=false, ReadPreference readPreference=ReadPreference.primary()) {
+        def connection = Mock(Connection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> getMaxWireVersionForServerVersion(serverVersion)
+            }
+        }
+
+        def connectionSource = Stub(ConnectionSource) {
+            getConnection() >> connection
+        }
+        def readBinding = Stub(ReadBinding) {
+            getReadConnectionSource() >> connectionSource
+            getReadPreference() >> readPreference
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+        def writeBinding = Stub(WriteBinding) {
+            getWriteConnectionSource() >> connectionSource
+        }
+
+        if (checkCommand) {
+            1 * connection.command(*_) >> {
+                assert(it[1] == expectedCommand)
+                result
+            }
+        } else if (checkSlaveOk) {
+            1 * connection.command(*_) >> {
+                assert(it[3] == readPreference)
+                result
+            }
+        }
+
+        0 * connection.command(_, _, _, _, _, _) >> {
+            // Unexpected Command
+            result
+        }
+
+        1 * connection.release()
+
+        if (operation instanceof ReadOperation) {
+            operation.execute(readBinding)
+        } else if (operation instanceof WriteOperation) {
+            operation.execute(writeBinding)
+        }
+    }
+
+    def testAsyncOperation(operation, List<Integer> serverVersion, result = null,
+                           Boolean checkCommand=true, BsonDocument expectedCommand=null,
+                           Boolean checkSlaveOk=false, ReadPreference readPreference=ReadPreference.primary()) {
+        def connection = Mock(AsyncConnection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> getMaxWireVersionForServerVersion(serverVersion)
+            }
+        }
+
+        def connectionSource = Stub(AsyncConnectionSource) {
+            getConnection(_) >> { it[0].onResult(connection, null) }
+        }
+        def readBinding = Stub(AsyncReadBinding) {
+            getReadConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+            getReadPreference() >> readPreference
+            getSessionContext() >> Stub(SessionContext) {
+                hasActiveTransaction() >> false
+                getReadConcern() >> ReadConcern.DEFAULT
+            }
+        }
+        def writeBinding = Stub(AsyncWriteBinding) {
+            getWriteConnectionSource(_) >> { it[0].onResult(connectionSource, null) }
+        }
+        def callback = new FutureResultCallback()
+
+        if (checkCommand) {
+            1 * connection.commandAsync(*_) >> {
+                assert(it[1] == expectedCommand)
+                it.last().onResult(result, null)
+            }
+        } else if (checkSlaveOk) {
+            1 * connection.commandAsync(*_) >> {
+                assert(it[3] == readPreference)
+                it.last().onResult(result, null)
+            }
+        }
+
+        0 * connection.commandAsync(_, _, _, _, _, _, _) >> {
+            // Unexpected Command
+            it[6].onResult(result, null)
+        }
+
+        1 * connection.release()
+
+        if (operation instanceof AsyncReadOperation) {
+            operation.executeAsync(readBinding, callback)
+        } else if (operation instanceof AsyncWriteOperation) {
+            operation.executeAsync(writeBinding, callback)
+        }
+         try {
+             callback.get(1000, TimeUnit.MILLISECONDS)
+         } catch (MongoException e) {
+            throw e.cause
+        }
+    }
+
+    @Shared
+    Collation defaultCollation = Collation.builder()
+            .locale('en')
+            .caseLevel(true)
+            .collationCaseFirst(CollationCaseFirst.OFF)
+            .collationStrength(CollationStrength.IDENTICAL)
+            .numericOrdering(true)
+            .collationAlternate(CollationAlternate.SHIFTED)
+            .collationMaxVariable(CollationMaxVariable.SPACE)
+            .normalization(true)
+            .backwards(true)
+            .build()
+
+    @Shared
+    Collation caseInsensitiveCollation = Collation.builder()
+            .locale('en')
+            .collationStrength(CollationStrength.SECONDARY)
+            .build()
+}
diff --git a/driver-core/src/test/unit/com/mongodb/operation/QueryBatchCursorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/QueryBatchCursorSpecification.groovy
index 5403a0fe929..3644b456d81 100644
--- a/driver-core/src/test/unit/com/mongodb/operation/QueryBatchCursorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/operation/QueryBatchCursorSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,13 @@
 package com.mongodb.operation
 
 import com.mongodb.MongoNamespace
+import com.mongodb.MongoSocketException
+import com.mongodb.MongoSocketOpenException
 import com.mongodb.ServerAddress
 import com.mongodb.binding.ConnectionSource
 import com.mongodb.connection.Connection
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.QueryResult
-import com.mongodb.connection.ServerVersion
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
@@ -36,7 +37,7 @@ class QueryBatchCursorSpecification extends Specification {
         given:
         def connection = Mock(Connection) {
             _ * getDescription() >> Stub(ConnectionDescription) {
-                getServerVersion() >> new ServerVersion([3, 2, 0])
+                getMaxWireVersion() >> 4
             }
         }
         def connectionSource = Stub(ConnectionSource) {
@@ -71,7 +72,7 @@ class QueryBatchCursorSpecification extends Specification {
         cursor.hasNext()
 
         then:
-        1 * connection.command(database, expectedCommand, _, _, _) >> {
+        1 * connection.command(database, expectedCommand, _, _, _, _) >> {
             reply
         }
         1 * connection.release()
@@ -82,4 +83,62 @@ class QueryBatchCursorSpecification extends Specification {
         2          | 0          | null
         0          | 100        | 100
     }
+
+    def 'should handle exceptions when closing'() {
+        given:
+        def serverAddress = new ServerAddress()
+        def connection = Mock(Connection) {
+            _ * getDescription() >> Stub(ConnectionDescription) {
+                getMaxWireVersion() >> 4
+            }
+            _ * killCursor(_, _) >> { throw new MongoSocketException('No MongoD', serverAddress) }
+            _ * command(_, _, _, _, _) >> { throw new MongoSocketException('No MongoD', serverAddress) }
+        }
+        def connectionSource = Stub(ConnectionSource) {
+            getConnection() >> { connection }
+        }
+        connectionSource.retain() >> connectionSource
+
+        def namespace = new MongoNamespace('test', 'QueryBatchCursorSpecification')
+        def firstBatch = new QueryResult(namespace, [], 42, serverAddress)
+        def cursor = new QueryBatchCursor<Document>(firstBatch, 0, 2, 100, new BsonDocumentCodec(), connectionSource, connection)
+
+        when:
+        cursor.close()
+
+        then:
+        notThrown(MongoSocketException)
+
+        when:
+        cursor.close()
+
+        then:
+        notThrown(Exception)
+    }
+
+    def 'should handle exceptions when killing cursor and a connection can not be obtained'() {
+        given:
+        def serverAddress = new ServerAddress()
+        def connection = Mock(Connection)
+        def connectionSource = Stub(ConnectionSource) {
+            getConnection() >> { throw new MongoSocketOpenException("can't open socket", serverAddress, new IOException()) }
+        }
+        connectionSource.retain() >> connectionSource
+
+        def namespace = new MongoNamespace('test', 'QueryBatchCursorSpecification')
+        def firstBatch = new QueryResult(namespace, [], 42, serverAddress)
+        def cursor = new QueryBatchCursor<Document>(firstBatch, 0, 2, 100, new BsonDocumentCodec(), connectionSource, connection)
+
+        when:
+        cursor.close()
+
+        then:
+        notThrown(MongoSocketException)
+
+        when:
+        cursor.close()
+
+        then:
+        notThrown(Exception)
+    }
 }
diff --git a/driver/src/test/unit/com/mongodb/operation/UpdateRequestSpecification.groovy b/driver-core/src/test/unit/com/mongodb/operation/UpdateRequestSpecification.groovy
similarity index 79%
rename from driver/src/test/unit/com/mongodb/operation/UpdateRequestSpecification.groovy
rename to driver-core/src/test/unit/com/mongodb/operation/UpdateRequestSpecification.groovy
index 624babe7cea..151bb0a613c 100644
--- a/driver/src/test/unit/com/mongodb/operation/UpdateRequestSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/operation/UpdateRequestSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,19 +18,18 @@ package com.mongodb.operation
 
 import com.mongodb.bulk.UpdateRequest
 import com.mongodb.bulk.WriteRequest
+import com.mongodb.client.model.Collation
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import spock.lang.Specification
 
-
 class UpdateRequestSpecification extends Specification {
 
     def 'should have correct type'() {
         expect:
         new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.UPDATE).getType() == WriteRequest.Type.UPDATE
         new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.REPLACE).getType() == WriteRequest.Type.REPLACE
-
     }
 
     def 'should throw if type is not update or replace'() {
@@ -73,8 +72,7 @@ class UpdateRequestSpecification extends Specification {
 
         then:
         updateRequest.filter == filter
-        updateRequest.update == update
-
+        updateRequest.updateValue == update
     }
 
     def 'multi property should default to true'() {
@@ -107,4 +105,24 @@ class UpdateRequestSpecification extends Specification {
         new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.UPDATE).upsert(true).isUpsert()
     }
 
+    def 'should set collation property'() {
+        when:
+        def collation = Collation.builder().locale('en').build()
+
+        then:
+        new UpdateRequest(new BsonDocument(), new BsonDocument(), type).collation(null).getCollation() == null
+        new UpdateRequest(new BsonDocument(), new BsonDocument(), type).collation(collation).getCollation() == collation
+
+        where:
+        type << [WriteRequest.Type.UPDATE, WriteRequest.Type.REPLACE]
+    }
+
+    def 'should set arrayFilters property'() {
+        expect:
+        new UpdateRequest(new BsonDocument(), new BsonDocument(), WriteRequest.Type.UPDATE).arrayFilters(arrayFilters)
+                .getArrayFilters() == arrayFilters
+
+        where:
+        arrayFilters << [null, [], [new BsonDocument('a.b', new BsonInt32(42))]]
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/selector/CompositeServerSelectorTest.java b/driver-core/src/test/unit/com/mongodb/selector/CompositeServerSelectorTest.java
index e38bba5d1e8..14ad7ba4b0f 100644
--- a/driver-core/src/test/unit/com/mongodb/selector/CompositeServerSelectorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/selector/CompositeServerSelectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,16 @@
 
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterSettings;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerSettings;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.net.UnknownHostException;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import static com.mongodb.ReadPreference.secondary;
 import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
@@ -34,6 +38,8 @@
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class CompositeServerSelectorTest {
     private CompositeServerSelector selector;
@@ -84,4 +90,27 @@ public void shouldCollapseNestedComposite() {
         assertEquals(selector.select(new ClusterDescription(MULTIPLE, REPLICA_SET, asList(first, second, third))), asList(second, third));
 
     }
+
+    @Test
+    public void shouldPassOnClusterDescriptionWithCorrectServersAndSettings() {
+        TestServerSelector firstSelector = new TestServerSelector();
+        TestServerSelector secondSelector = new TestServerSelector();
+        CompositeServerSelector composedSelector = new CompositeServerSelector(asList(firstSelector, secondSelector));
+        composedSelector.select(new ClusterDescription(MULTIPLE, REPLICA_SET, asList(first, second, third),
+                                                              ClusterSettings.builder().hosts(asList(new ServerAddress())).build(),
+                                                              ServerSettings.builder().build()));
+        assertTrue(secondSelector.clusterDescription.getServerDescriptions().isEmpty());
+        assertNotNull(secondSelector.clusterDescription.getClusterSettings());
+        assertNotNull(secondSelector.clusterDescription.getServerSettings());
+    }
+
+    static class TestServerSelector implements ServerSelector {
+        private ClusterDescription clusterDescription;
+
+        @Override
+        public List<ServerDescription> select(final ClusterDescription clusterDescription) {
+            this.clusterDescription = clusterDescription;
+            return Collections.emptyList();
+        }
+    }
 }
diff --git a/driver-core/src/test/unit/com/mongodb/selector/LatencyMinimizingServerSelectorTest.java b/driver-core/src/test/unit/com/mongodb/selector/LatencyMinimizingServerSelectorTest.java
index d827ca351aa..2861f34ad6d 100644
--- a/driver-core/src/test/unit/com/mongodb/selector/LatencyMinimizingServerSelectorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/selector/LatencyMinimizingServerSelectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/selector/PrimaryServerSelectorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/selector/PrimaryServerSelectorSpecification.groovy
index 6b1e0415253..932470e75b8 100644
--- a/driver-core/src/test/unit/com/mongodb/selector/PrimaryServerSelectorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/selector/PrimaryServerSelectorSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/selector/ReadPreferenceServerSelectorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/selector/ReadPreferenceServerSelectorSpecification.groovy
index 1bc25201671..57cdc63ddae 100644
--- a/driver-core/src/test/unit/com/mongodb/selector/ReadPreferenceServerSelectorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/selector/ReadPreferenceServerSelectorSpecification.groovy
@@ -1,10 +1,12 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/driver-core/src/test/unit/com/mongodb/selector/ServerAddressSelectorTest.java b/driver-core/src/test/unit/com/mongodb/selector/ServerAddressSelectorTest.java
index 1fbbcefa314..8e82d6471ba 100644
--- a/driver-core/src/test/unit/com/mongodb/selector/ServerAddressSelectorTest.java
+++ b/driver-core/src/test/unit/com/mongodb/selector/ServerAddressSelectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-core/src/test/unit/com/mongodb/selector/WritableServerSelectorSpecification.groovy b/driver-core/src/test/unit/com/mongodb/selector/WritableServerSelectorSpecification.groovy
index 0a6dcc6f854..b3719e1557c 100644
--- a/driver-core/src/test/unit/com/mongodb/selector/WritableServerSelectorSpecification.groovy
+++ b/driver-core/src/test/unit/com/mongodb/selector/WritableServerSelectorSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE
+import static com.mongodb.connection.ClusterConnectionMode.SINGLE
 import static com.mongodb.connection.ServerConnectionState.CONNECTED
 import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
 import static com.mongodb.connection.ServerType.REPLICA_SET_SECONDARY
@@ -49,4 +50,15 @@ class WritableServerSelectorSpecification extends Specification {
         []                 | new ClusterDescription(MULTIPLE, ClusterType.REPLICA_SET, [SECONDARY_SERVER])
     }
 
+    @Unroll
+    def 'WritableServerSelector will choose secondary server in single mode for #clusterDescription'() throws UnknownHostException {
+        expect:
+        WritableServerSelector selector = new WritableServerSelector()
+        expectedServerList == selector.select(clusterDescription)
+
+        where:
+        expectedServerList | clusterDescription
+        [SECONDARY_SERVER] | new ClusterDescription(SINGLE, ClusterType.REPLICA_SET, [SECONDARY_SERVER])
+    }
+
 }
diff --git a/driver-embedded/build.gradle b/driver-embedded/build.gradle
new file mode 100644
index 00000000000..471b388c3f3
--- /dev/null
+++ b/driver-embedded/build.gradle
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+archivesBaseName = 'mongodb-driver-embedded'
+description =  'The MongoDB Embedded Driver'
+ext {
+    pomName = 'The MongoDB Embedded Driver'
+}
+
+dependencies {
+    compile project(':driver-sync')
+    compile "org.mongodb:embedded-capi:[4.0,4.1)"
+
+    testCompile project(':bson').sourceSets.test.output
+    testCompile project(':driver-core').sourceSets.test.output
+    testCompile project(':driver-sync').sourceSets.test.output
+}
+
+clirr {
+    enabled = false
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedCluster.java b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedCluster.java
new file mode 100644
index 00000000000..2eeda020885
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedCluster.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.MongoConfigurationException;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.embedded.capi.MongoEmbeddedLibrary;
+import com.mongodb.selector.ServerSelector;
+import org.bson.BsonTimestamp;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+
+@SuppressWarnings("deprecation")
+final class EmbeddedCluster implements Cluster {
+
+    private static final Logger LOGGER = Loggers.getLogger("cluster");
+    private final ClusterSettings clusterSettings;
+    private final ClusterDescription clusterDescription;
+    private final EmbeddedServer server;
+    private volatile boolean isClosed;
+
+    EmbeddedCluster(final MongoEmbeddedLibrary mongoEmbeddedLibrary, final MongoClientSettings mongoClientSettings) {
+        this.server = new EmbeddedServer(mongoEmbeddedLibrary, mongoClientSettings);
+        this.clusterSettings = ClusterSettings.builder().hosts(singletonList(new ServerAddress())).build();
+        this.clusterDescription = new ClusterDescription(ClusterConnectionMode.SINGLE, ClusterType.STANDALONE,
+                singletonList(server.getDescription()));
+    }
+
+    @Override
+    public ClusterSettings getSettings() {
+        return clusterSettings;
+    }
+
+    @Override
+    public ClusterDescription getDescription() {
+        return clusterDescription;
+    }
+
+    @Override
+    public ClusterDescription getCurrentDescription() {
+        return clusterDescription;
+    }
+
+    @Override
+    public BsonTimestamp getClusterTime() {
+        return null;
+    }
+
+    @Override
+    public Server selectServer(final ServerSelector serverSelector) {
+        isTrue("open", !isClosed());
+        List<ServerDescription> servers = serverSelector.select(clusterDescription);
+        if (!servers.isEmpty()) {
+            return server;
+        } else {
+            if (LOGGER.isInfoEnabled()) {
+                    LOGGER.info(format("No server chosen by %s from cluster description %s.", serverSelector, clusterDescription));
+            }
+            throw new MongoConfigurationException(format("No server that matches %s. Client view of cluster state is %s",
+                    serverSelector, clusterDescription.getShortDescription()));
+        }
+    }
+
+    @Override
+    public void selectServerAsync(final ServerSelector serverSelector, final SingleResultCallback<Server> callback) {
+        throw new UnsupportedOperationException("Async not supported");
+    }
+
+    @Override
+    public void close() {
+        if (!isClosed()) {
+            isClosed = true;
+            server.close();
+        }
+    }
+
+    @Override
+    public boolean isClosed() {
+        return isClosed;
+    }
+
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnection.java b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnection.java
new file mode 100644
index 00000000000..62879f6330d
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnection.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.MongoCompressor;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncCompletionHandler;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.connection.Stream;
+import com.mongodb.connection.StreamFactory;
+import com.mongodb.embedded.capi.MongoEmbeddedClient;
+import com.mongodb.embedded.capi.MongoEmbeddedInstance;
+import com.mongodb.event.CommandListener;
+import com.mongodb.internal.connection.Authenticator;
+import com.mongodb.internal.connection.CommandMessage;
+import com.mongodb.internal.connection.InternalConnection;
+import com.mongodb.internal.connection.InternalStreamConnection;
+import com.mongodb.internal.connection.InternalStreamConnectionInitializer;
+import com.mongodb.internal.connection.ResponseBuffers;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.ByteBuf;
+import org.bson.ByteBufNIO;
+import org.bson.codecs.Decoder;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@SuppressWarnings("deprecation")
+class EmbeddedInternalConnection implements InternalConnection {
+    private final InternalConnection wrapped;
+    private final MongoEmbeddedClient client;
+
+    EmbeddedInternalConnection(final MongoEmbeddedInstance instance, final CommandListener commandListener,
+                               final BsonDocument clientMetadataDocument) {
+        this.client = instance.createClient();
+        this.wrapped = new InternalStreamConnection(new ServerId(new ClusterId(), new ServerAddress()),
+                new StreamFactory() {
+                    @Override
+                    public Stream create(final ServerAddress serverAddress) {
+                        return new EmbeddedInternalStream();
+                    }
+                }, Collections.<MongoCompressor>emptyList(), commandListener,
+                new InternalStreamConnectionInitializer(Collections.<Authenticator>emptyList(), clientMetadataDocument,
+                        Collections.<MongoCompressor>emptyList()));
+    }
+
+    @Override
+    public ConnectionDescription getDescription() {
+        return wrapped.getDescription();
+    }
+
+    @Override
+    public void open() {
+        wrapped.open();
+    }
+
+    @Override
+    public void openAsync(final SingleResultCallback<Void> callback) {
+        wrapped.openAsync(callback);
+    }
+
+    @Override
+    public void close() {
+        if (!wrapped.isClosed()) {
+            wrapped.close();
+            client.close();
+        }
+    }
+
+    @Override
+    public boolean opened() {
+        return wrapped.opened();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return wrapped.isClosed();
+    }
+
+    @Override
+    public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+        return wrapped.sendAndReceive(message, decoder, sessionContext);
+    }
+
+    @Override
+    public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext,
+                                        final SingleResultCallback<T> callback) {
+        wrapped.sendAndReceiveAsync(message, decoder, sessionContext, callback);
+    }
+
+    @Override
+    public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
+        wrapped.sendMessage(byteBuffers, lastRequestId);
+    }
+
+    @Override
+    public ResponseBuffers receiveMessage(final int responseTo) {
+        return wrapped.receiveMessage(responseTo);
+    }
+
+    @Override
+    public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
+        wrapped.sendMessageAsync(byteBuffers, lastRequestId, callback);
+    }
+
+    @Override
+    public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
+        wrapped.receiveMessageAsync(responseTo, callback);
+    }
+
+    @Override
+    public ByteBuf getBuffer(final int size) {
+        return wrapped.getBuffer(size);
+    }
+
+   class EmbeddedInternalStream implements Stream {
+        private volatile boolean isClosed;
+        private volatile ByteBuffer curResponse;
+
+        @Override
+        public void open() {
+            // nothing to do here
+        }
+
+        @Override
+        public void openAsync(final AsyncCompletionHandler<Void> handler) {
+            // nothing to do here
+            handler.completed(null);
+        }
+
+        @Override
+        public void write(final List<ByteBuf> buffers) {
+            curResponse = client.write(createMessage(buffers));
+        }
+
+        @Override
+        public ByteBuf read(final int numBytes) {
+            ByteBuffer slice = curResponse.slice();
+            ((Buffer) slice).limit(numBytes);
+            ((Buffer) curResponse).position(((Buffer) curResponse).position() + numBytes);
+            return new ByteBufNIO(slice);
+        }
+
+        @Override
+        public void writeAsync(final List<ByteBuf> buffers, final AsyncCompletionHandler<Void> handler) {
+            throw new UnsupportedOperationException(getClass() + " does not support asynchronous operations.");
+        }
+
+        @Override
+        public void readAsync(final int numBytes, final AsyncCompletionHandler<ByteBuf> handler) {
+            throw new UnsupportedOperationException(getClass() + " does not support asynchronous operations.");
+        }
+
+        @Override
+        public ServerAddress getAddress() {
+            return wrapped.getDescription().getServerAddress();
+        }
+
+        @Override
+        public void close() {
+            isClosed = true;
+        }
+
+        @Override
+        public boolean isClosed() {
+            return isClosed;
+        }
+
+        @Override
+        public ByteBuf getBuffer(final int size) {
+            return new ByteBufNIO(ByteBuffer.wrap(new byte[size]));
+        }
+
+        private ByteBuffer createMessage(final List<ByteBuf> byteBufList) {
+            List<ByteBuffer> buffers = asByteBufferList(byteBufList);
+            int totalLength = 0;
+            for (ByteBuffer cur : buffers) {
+                totalLength += cur.remaining();
+            }
+            byte[] completeMessage = new byte[totalLength];
+
+            int offset = 0;
+            for (ByteBuffer cur : buffers) {
+                int remaining = cur.remaining();
+                cur.get(completeMessage, offset, cur.remaining());
+                offset += remaining;
+            }
+            return ByteBuffer.wrap(completeMessage);
+        }
+
+        private List<ByteBuffer> asByteBufferList(final List<ByteBuf> byteBufList) {
+            List<ByteBuffer> retVal = new ArrayList<ByteBuffer>(byteBufList.size());
+            for (ByteBuf cur: byteBufList) {
+                retVal.add(cur.asNIO());
+            }
+            return retVal;
+        }
+    }
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnectionFactory.java b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnectionFactory.java
new file mode 100644
index 00000000000..a55bc378666
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnectionFactory.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+interface EmbeddedInternalConnectionFactory {
+
+    EmbeddedInternalConnection create();
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnectionPool.java b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnectionPool.java
new file mode 100644
index 00000000000..9a9076bb235
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedInternalConnectionPool.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.internal.connection.CommandMessage;
+import com.mongodb.internal.connection.ConcurrentPool;
+import com.mongodb.internal.connection.InternalConnection;
+import com.mongodb.internal.connection.ResponseBuffers;
+import com.mongodb.session.SessionContext;
+import org.bson.ByteBuf;
+import org.bson.codecs.Decoder;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+
+@SuppressWarnings("deprecation")
+class EmbeddedInternalConnectionPool {
+    private final ConcurrentPool<EmbeddedInternalConnection> pool;
+    private volatile boolean closed;
+
+    EmbeddedInternalConnectionPool(final EmbeddedInternalConnectionFactory internalConnectionFactory) {
+        this.pool = new ConcurrentPool<EmbeddedInternalConnection>(Integer.MAX_VALUE,
+                new EmbeddedConnectionItemFactory(internalConnectionFactory));
+    }
+
+    InternalConnection get() {
+        isTrue("Embedded connection pool is open", !closed);
+        return getPooledConnection();
+    }
+
+    void close() {
+        if (!closed) {
+            pool.close();
+            closed = true;
+        }
+    }
+
+    private static class EmbeddedConnectionItemFactory implements ConcurrentPool.ItemFactory<EmbeddedInternalConnection> {
+        private final EmbeddedInternalConnectionFactory internalConnectionFactory;
+
+        EmbeddedConnectionItemFactory(final EmbeddedInternalConnectionFactory internalConnectionFactory) {
+            this.internalConnectionFactory = internalConnectionFactory;
+        }
+
+        @Override
+        public EmbeddedInternalConnection create(final boolean initialize) {
+            return internalConnectionFactory.create();
+        }
+
+        @Override
+        public void close(final EmbeddedInternalConnection embeddedInternalConnection) {
+            embeddedInternalConnection.close();
+        }
+
+        @Override
+        public ConcurrentPool.Prune shouldPrune(final EmbeddedInternalConnection embeddedInternalConnection) {
+            return ConcurrentPool.Prune.NO;
+        }
+    }
+
+    private InternalConnection getPooledConnection() {
+        PooledConnection connection = new PooledConnection(pool.get());
+        if (!connection.opened()) {
+            connection.open();
+        }
+        return connection;
+    }
+
+    private class PooledConnection implements InternalConnection {
+        private final EmbeddedInternalConnection wrapped;
+        private final AtomicBoolean isClosed = new AtomicBoolean();
+
+        PooledConnection(final EmbeddedInternalConnection wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public ConnectionDescription getDescription() {
+            return wrapped.getDescription();
+        }
+
+        @Override
+        public void open() {
+            wrapped.open();
+        }
+
+        @Override
+        public void openAsync(final SingleResultCallback<Void> callback) {
+            wrapped.openAsync(callback);
+        }
+
+        @Override
+        public void close() {
+            // All but the first call is a no-op
+            if (!isClosed.getAndSet(true)) {
+                pool.release(wrapped, wrapped.isClosed());
+            }
+        }
+
+        @Override
+        public boolean opened() {
+            return wrapped.opened();
+        }
+
+        @Override
+        public boolean isClosed() {
+            return wrapped.isClosed();
+        }
+
+        @Override
+        public <T> T sendAndReceive(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext) {
+            return wrapped.sendAndReceive(message, decoder, sessionContext);
+        }
+
+        @Override
+        public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<T> decoder, final SessionContext sessionContext,
+                                            final SingleResultCallback<T> callback) {
+            wrapped.sendAndReceiveAsync(message, decoder, sessionContext, callback);
+        }
+
+        @Override
+        public void sendMessage(final List<ByteBuf> byteBuffers, final int lastRequestId) {
+            wrapped.sendMessage(byteBuffers, lastRequestId);
+        }
+
+        @Override
+        public ResponseBuffers receiveMessage(final int responseTo) {
+            return wrapped.receiveMessage(responseTo);
+        }
+
+        @Override
+        public void sendMessageAsync(final List<ByteBuf> byteBuffers, final int lastRequestId, final SingleResultCallback<Void> callback) {
+            wrapped.sendMessageAsync(byteBuffers, lastRequestId, callback);
+        }
+
+        @Override
+        public void receiveMessageAsync(final int responseTo, final SingleResultCallback<ResponseBuffers> callback) {
+            wrapped.receiveMessageAsync(responseTo, callback);
+        }
+
+        @Override
+        public ByteBuf getBuffer(final int size) {
+            return wrapped.getBuffer(size);
+        }
+    }
+
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedServer.java b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedServer.java
new file mode 100644
index 00000000000..9c254757a7b
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedServer.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.MongoException;
+import com.mongodb.ServerAddress;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.connection.AsyncConnection;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+import com.mongodb.embedded.capi.MongoEmbeddedInstance;
+import com.mongodb.embedded.capi.MongoEmbeddedLibrary;
+import com.mongodb.event.CommandListener;
+import com.mongodb.internal.connection.ClusterClock;
+import com.mongodb.internal.connection.ClusterClockAdvancingSessionContext;
+import com.mongodb.internal.connection.CommandHelper;
+import com.mongodb.internal.connection.CommandProtocol;
+import com.mongodb.internal.connection.DefaultServerConnection;
+import com.mongodb.internal.connection.DescriptionHelper;
+import com.mongodb.internal.connection.InternalConnection;
+import com.mongodb.internal.connection.LegacyProtocol;
+import com.mongodb.internal.connection.ProtocolExecutor;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+
+import java.io.Closeable;
+import java.io.File;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
+import static com.mongodb.internal.connection.ClientMetadataHelper.createClientMetadataDocument;
+import static com.mongodb.internal.event.EventListenerHelper.getCommandListener;
+import static java.lang.String.format;
+
+@SuppressWarnings("deprecation")
+class EmbeddedServer implements Server, Closeable {
+    private static final Logger LOGGER = Loggers.getLogger("embedded.client");
+    private static final MongoDriverInformation MONGO_DRIVER_INFORMATION = MongoDriverInformation.builder().driverName("embedded").build();
+    private final MongoEmbeddedInstance instance;
+    private final ClusterClock clusterClock;
+    private final CommandListener commandListener;
+    private final ServerAddress serverAddress;
+    private final ServerDescription serverDescription;
+    private final EmbeddedInternalConnectionPool connectionPool;
+
+    private volatile boolean isClosed;
+
+
+    EmbeddedServer(final MongoEmbeddedLibrary mongoEmbeddedLibrary, final MongoClientSettings mongoClientSettings) {
+        this.instance = createInstance(mongoEmbeddedLibrary, mongoClientSettings);
+        this.clusterClock = new ClusterClock();
+        this.commandListener =  getCommandListener(mongoClientSettings.getCommandListeners());
+        this.serverAddress = new ServerAddress();
+        this.connectionPool = new EmbeddedInternalConnectionPool(new EmbeddedInternalConnectionFactory() {
+            @Override
+            public EmbeddedInternalConnection create() {
+                return new EmbeddedInternalConnection(instance, commandListener,
+                        createClientMetadataDocument(mongoClientSettings.getApplicationName(), MONGO_DRIVER_INFORMATION));
+            }
+        });
+
+        this.serverDescription = createServerDescription();
+    }
+
+    @Override
+    public ServerDescription getDescription() {
+        isTrue("open", !isClosed);
+        return serverDescription;
+    }
+
+    @Override
+    public Connection getConnection() {
+        isTrue("open", !isClosed);
+        return new DefaultServerConnection(connectionPool.get(), new DefaultServerProtocolExecutor(), ClusterConnectionMode.SINGLE);
+    }
+
+    @Override
+    public void getConnectionAsync(final SingleResultCallback<AsyncConnection> callback) {
+        throw new UnsupportedOperationException("Async not supported");
+    }
+
+    @Override
+    public void close() {
+        if (!isClosed) {
+            isClosed = true;
+            connectionPool.close();
+            instance.close();
+        }
+    }
+
+    private MongoEmbeddedInstance createInstance(final MongoEmbeddedLibrary mongoEmbeddedLibrary,
+                                                 final MongoClientSettings mongoClientSettings) {
+        File directory = new File(mongoClientSettings.getDbPath());
+        try {
+            if (directory.mkdirs() && LOGGER.isInfoEnabled()) {
+                LOGGER.info(format("Created dbpath directory: %s", mongoClientSettings.getDbPath()));
+            }
+        } catch (SecurityException e) {
+            throw new MongoException(format("Could not validate / create the dbpath: %s", mongoClientSettings.getDbPath()));
+        }
+
+        String yamlConfig = createYamlConfig(mongoClientSettings);
+        return mongoEmbeddedLibrary.createInstance(yamlConfig);
+    }
+
+    private String createYamlConfig(final MongoClientSettings mongoClientSettings) {
+        return format("{ storage: { dbPath: %s } }", mongoClientSettings.getDbPath());
+    }
+
+    private class DefaultServerProtocolExecutor implements ProtocolExecutor {
+
+        @Override
+        public <T> T execute(final LegacyProtocol<T> protocol, final InternalConnection connection) {
+            protocol.setCommandListener(commandListener);
+            return protocol.execute(connection);
+        }
+
+        @Override
+        public <T> void executeAsync(final LegacyProtocol<T> protocol, final InternalConnection connection,
+                                     final SingleResultCallback<T> callback) {
+            protocol.setCommandListener(commandListener);
+            protocol.executeAsync(connection, callback);
+        }
+
+        @Override
+        public <T> T execute(final CommandProtocol<T> protocol, final InternalConnection connection,
+                             final SessionContext sessionContext) {
+            protocol.sessionContext(new ClusterClockAdvancingSessionContext(sessionContext, clusterClock));
+            return protocol.execute(connection);
+        }
+
+        @Override
+        public <T> void executeAsync(final CommandProtocol<T> protocol, final InternalConnection connection,
+                                     final SessionContext sessionContext, final SingleResultCallback<T> callback) {
+            protocol.sessionContext(new ClusterClockAdvancingSessionContext(sessionContext, clusterClock));
+            protocol.executeAsync(connection, errorHandlingCallback(callback, LOGGER));
+        }
+    }
+
+    private ServerDescription createServerDescription() {
+        InternalConnection connection = connectionPool.get();
+        try {
+            long start = System.nanoTime();
+            BsonDocument isMasterResult = CommandHelper.executeCommand("admin", new BsonDocument("ismaster", new BsonInt32(1)),
+                    clusterClock, connection);
+            return DescriptionHelper.createServerDescription(serverAddress, isMasterResult, connection.getDescription().getServerVersion(),
+                    System.nanoTime() - start);
+        } finally {
+            connection.close();
+        }
+    }
+
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/MongoClientEmbeddedException.java b/driver-embedded/src/main/com/mongodb/embedded/client/MongoClientEmbeddedException.java
new file mode 100644
index 00000000000..ef40cbdbf97
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/MongoClientEmbeddedException.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.MongoException;
+
+import static java.lang.String.format;
+
+/**
+ * Exceptions indicating a failure condition with the embedded MongoClient.
+ *
+ * @since 3.8
+ * @deprecated the embedded driver will be removed in the next major release
+ */
+@Deprecated
+public final class MongoClientEmbeddedException extends MongoException {
+    private static final long serialVersionUID = 8314840681404996248L;
+
+    /**
+     * Constructs a new instance
+     *
+     * @param errorCode the error code
+     * @param subErrorCode the sub category error code
+     * @param reason the reason for the exception
+     */
+    public MongoClientEmbeddedException(final int errorCode, final int subErrorCode, final String reason) {
+        super(errorCode, format("%s (%s:%s)", reason, errorCode, subErrorCode));
+    }
+
+    /**
+     * Constructs a new instance.
+     *
+     * @param message the message
+     */
+    public MongoClientEmbeddedException(final String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new instance.
+     *
+     * @param message the message
+     * @param cause the cause
+     */
+    public MongoClientEmbeddedException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/MongoClientSettings.java b/driver-embedded/src/main/com/mongodb/embedded/client/MongoClientSettings.java
new file mode 100644
index 00000000000..244d0f71fe3
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/MongoClientSettings.java
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientException;
+import com.mongodb.annotations.Immutable;
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.event.CommandListener;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.lang.String.format;
+
+/**
+ * Various settings to control the behavior of an Embedded {@code MongoClient}.
+ *
+ * @since 3.8
+ * @mongodb.server.release 4.0
+ * @deprecated the embedded driver will be removed in the next major release
+ */
+@Deprecated
+@Immutable
+public final class MongoClientSettings {
+    private static final CodecRegistry DEFAULT_CODEC_REGISTRY = com.mongodb.MongoClientSettings.getDefaultCodecRegistry();
+
+    private final com.mongodb.MongoClientSettings wrappedMongoClientSettings;
+    private final String dbPath;
+
+    /**
+     * Gets the default codec registry.  It includes the following providers:
+     *
+     * <ul>
+     * <li>{@link org.bson.codecs.ValueCodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonValueCodecProvider}</li>
+     * <li>{@link com.mongodb.DBRefCodecProvider}</li>
+     * <li>{@link com.mongodb.DBObjectCodecProvider}</li>
+     * <li>{@link org.bson.codecs.DocumentCodecProvider}</li>
+     * <li>{@link org.bson.codecs.IterableCodecProvider}</li>
+     * <li>{@link org.bson.codecs.MapCodecProvider}</li>
+     * <li>{@link com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider}</li>
+     * <li>{@link com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider}</li>
+     * <li>{@link org.bson.codecs.jsr310.Jsr310CodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonCodecProvider}</li>
+     * </ul>
+     *
+     * @return the default codec registry
+     */
+    public static CodecRegistry getDefaultCodecRegistry() {
+        return DEFAULT_CODEC_REGISTRY;
+    }
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Convenience method to create a from an existing {@code MongoClientSettings}.
+     *
+     * @param settings create a builder from existing settings
+     * @return a builder
+     */
+    public static Builder builder(final MongoClientSettings settings) {
+        return new Builder(settings);
+    }
+
+    /**
+     * A builder for {@code MongoClientSettings} so that {@code MongoClientSettings} can be immutable, and to support easier construction
+     * through chaining.
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private com.mongodb.MongoClientSettings.Builder wrappedBuilder;
+        private String dbPath;
+
+        private Builder() {
+            wrappedBuilder = com.mongodb.MongoClientSettings.builder();
+        }
+
+        private Builder(final MongoClientSettings settings) {
+            notNull("settings", settings);
+            wrappedBuilder = com.mongodb.MongoClientSettings.builder(settings.wrappedMongoClientSettings);
+            dbPath = settings.dbPath;
+        }
+
+        /**
+         * Takes the settings from the given {@code ConnectionString} and applies them to the builder
+         *
+         * @param connectionString the connection string containing details of how to connect to MongoDB
+         * @return this
+         */
+        public Builder applyConnectionString(final ConnectionString connectionString) {
+            wrappedBuilder.applyConnectionString(connectionString);
+            if (connectionString.getHosts().size() == 1) {
+                try {
+                    dbPath = URLDecoder.decode(connectionString.getHosts().get(0), "UTF-8");
+                } catch (UnsupportedEncodingException e) {
+                    throw new MongoClientException(format("Connection String contains an invalid host: %s",
+                            connectionString.getHosts().get(0)));
+                }
+            } else {
+                throw new MongoClientEmbeddedException(format("Connection String contains invalid hosts: %s", connectionString.getHosts()));
+            }
+            return this;
+        }
+
+        /**
+         * Sets the codec registry
+         *
+         * @param codecRegistry the codec registry
+         * @return this
+         * @see MongoClientSettings#getCodecRegistry()
+         */
+        public Builder codecRegistry(final CodecRegistry codecRegistry) {
+            wrappedBuilder.codecRegistry(codecRegistry);
+            return this;
+        }
+
+        /**
+         * Adds the given command listener.
+         *
+         * @param commandListener the command listener
+         * @return this
+         */
+        public Builder addCommandListener(final CommandListener commandListener) {
+            wrappedBuilder.addCommandListener(commandListener);
+            return this;
+        }
+
+        /**
+         * Sets the the command listeners
+         *
+         * @param commandListeners the list of command listeners
+         * @return this
+         */
+        public Builder commandListenerList(final List<CommandListener> commandListeners) {
+            wrappedBuilder.commandListenerList(commandListeners);
+            return this;
+        }
+
+        /**
+         * Sets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+         * the application to the server, for use in server logs, slow query logs, and profile collection.
+         *
+         * @param applicationName the logical name of the application using this MongoClient.  It may be null.
+         *                        The UTF-8 encoding may not exceed 128 bytes.
+         * @return this
+         * @see #getApplicationName()
+         */
+        public Builder applicationName(final String applicationName) {
+           wrappedBuilder.applicationName(applicationName);
+            return this;
+        }
+
+        /**
+         * Sets the dbPath for the mongod.
+         *
+         * @param dbPath the path for the database
+         * @return this
+         */
+        public Builder dbPath(final String dbPath) {
+            this.dbPath = notNull("dbPath", dbPath);
+            return this;
+        }
+
+        /**
+         * Build an instance of {@code MongoClientSettings}.
+         *
+         * @return the settings from this builder
+         */
+        public MongoClientSettings build() {
+            return new MongoClientSettings(this);
+        }
+    }
+
+    /**
+     * Gets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+     * the application to the server, for use in server logs, slow query logs, and profile collection.
+     *
+     * <p>Default is null.</p>
+     *
+     * @return the application name, which may be null
+     */
+    public String getApplicationName() {
+        return wrappedMongoClientSettings.getApplicationName();
+    }
+
+    /**
+     * The codec registry to use, or null if not set.
+     *
+     * @return the codec registry
+     */
+    public CodecRegistry getCodecRegistry() {
+        return wrappedMongoClientSettings.getCodecRegistry();
+    }
+
+    /**
+     * Gets the list of added {@code CommandListener}.
+     *
+     * <p>The default is an empty list.</p>
+     *
+     * @return the unmodifiable list of command listeners
+     */
+    public List<CommandListener> getCommandListeners() {
+        return wrappedMongoClientSettings.getCommandListeners();
+    }
+
+    /**
+     * Gets the dbPath for the embedded mongod.
+     *
+     * @return the dbPath
+     */
+    public String getDbPath() {
+        return dbPath;
+    }
+
+    /**
+     * Returns the wrapped MongoClientSettings instance
+     *
+     * @return the wrapped MongoClient Settings instance.
+     */
+    public com.mongodb.MongoClientSettings getWrappedMongoClientSettings() {
+        return wrappedMongoClientSettings;
+    }
+
+    private MongoClientSettings(final Builder builder) {
+        isTrue("dbPath is set", builder.dbPath != null && !builder.dbPath.isEmpty());
+        dbPath = builder.dbPath;
+        wrappedMongoClientSettings = builder.wrappedBuilder.build();
+    }
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/MongoClients.java b/driver-embedded/src/main/com/mongodb/embedded/client/MongoClients.java
new file mode 100644
index 00000000000..0350ad65d1a
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/MongoClients.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.internal.MongoClientImpl;
+import com.mongodb.connection.Cluster;
+import com.mongodb.embedded.capi.MongoEmbeddedCAPI;
+import com.mongodb.embedded.capi.MongoEmbeddedLibrary;
+
+import static java.lang.String.format;
+
+/**
+ * A factory for {@link MongoClient} instances.
+ *
+ * @see MongoClient
+ * @since 3.8
+ * @deprecated the embedded driver will be removed in the next major release
+ */
+@Deprecated
+public final class MongoClients {
+
+    private static MongoEmbeddedLibrary mongoEmbeddedLibrary;
+
+    /**
+     * Initializes the mongod library for use.
+     *
+     * <p>The library must be called at most once per process before calling {@link #create(MongoClientSettings)}.</p>
+     * @param mongoEmbeddedSettings the settings for the embedded driver.
+     */
+    public static synchronized void init(final MongoEmbeddedSettings mongoEmbeddedSettings) {
+        if (mongoEmbeddedLibrary != null) {
+            throw new MongoClientEmbeddedException("The mongo embedded library has already been initialized");
+        }
+        try {
+            mongoEmbeddedLibrary = MongoEmbeddedCAPI.create(mongoEmbeddedSettings.getYamlConfig(),
+                    mongoEmbeddedSettings.getLogLevel().toCapiLogLevel(), mongoEmbeddedSettings.getLibraryPath());
+        } catch (Exception e) {
+            throw new MongoClientEmbeddedException(format("The mongo embedded library could not be initialized%n"
+                    + "Server error message: %s", e.getMessage()), e);
+        }
+
+    }
+
+    /**
+     * Creates a new client.
+     *
+     * @param mongoClientSettings the mongoClientSettings
+     * @return the client
+     */
+    public static synchronized MongoClient create(final MongoClientSettings mongoClientSettings) {
+        if (mongoEmbeddedLibrary == null) {
+            throw new MongoClientEmbeddedException("The mongo embedded library must be initialized first.");
+        }
+        try {
+            Cluster cluster = new EmbeddedCluster(mongoEmbeddedLibrary, mongoClientSettings);
+            return new MongoClientImpl(cluster, mongoClientSettings.getWrappedMongoClientSettings(), null);
+        } catch (Exception e) {
+            throw new MongoClientEmbeddedException(format("Could not create a new embedded cluster.%n"
+                    + "Please ensure any existing MongoClients are fully closed before trying to create a new one.%n"
+                    + "Server error message: %s", e.getMessage()), e);
+        }
+    }
+
+    /**
+     * Closes down the mongod library
+     */
+    public static synchronized void close() {
+        if (mongoEmbeddedLibrary != null) {
+            try {
+                mongoEmbeddedLibrary.close();
+            } catch (Exception e) {
+                throw new MongoClientEmbeddedException(format("Could not close the mongo embedded library.%n"
+                        + "Please ensure that any MongoClient instances have been closed first.%n"
+                        + "Server error message: %s", e.getMessage()), e);
+            }
+            mongoEmbeddedLibrary = null;
+
+        }
+    }
+
+    private MongoClients() {
+    }
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/MongoEmbeddedLogLevel.java b/driver-embedded/src/main/com/mongodb/embedded/client/MongoEmbeddedLogLevel.java
new file mode 100644
index 00000000000..54d306dfd28
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/MongoEmbeddedLogLevel.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.MongoConfigurationException;
+import com.mongodb.embedded.capi.LogLevel;
+
+import static java.lang.String.format;
+
+/**
+ * The EmbeddedLogLevel represents the supported logging levels for the embedded mongod
+ *
+ * @since 3.8
+ * @deprecated the embedded driver will be removed in the next major release
+ */
+@Deprecated
+public enum MongoEmbeddedLogLevel {
+    /**
+     * Turn off logging
+     */
+    NONE(0),
+
+    /**
+     * Log to stdout
+     */
+    STDOUT(1),
+
+    /**
+     * Log to stderr
+     */
+    STDERR(2),
+
+    /**
+     * Log via the {@code org.mongodb.embedded.capi} logger
+     */
+    LOGGER(4);
+
+    private final int level;
+
+    /**
+     * @return the logging level
+     */
+    public int getLevel(){
+        return level;
+    }
+
+    LogLevel toCapiLogLevel() {
+        switch (level) {
+            case 0:
+                return LogLevel.NONE;
+            case 1:
+                return LogLevel.STDOUT;
+            case 2:
+                return LogLevel.STDERR;
+            case 4:
+                return LogLevel.LOGGER;
+            default:
+                throw new MongoConfigurationException(format("Unsupported logLevel %s", level));
+        }
+    }
+
+    MongoEmbeddedLogLevel(final int level){
+        this.level = level;
+    }
+}
+
+
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/MongoEmbeddedSettings.java b/driver-embedded/src/main/com/mongodb/embedded/client/MongoEmbeddedSettings.java
new file mode 100644
index 00000000000..2179e2a39e2
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/MongoEmbeddedSettings.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+
+import com.mongodb.annotations.Immutable;
+import com.mongodb.annotations.NotThreadSafe;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * Various settings to configure the underlying mongod library
+ *
+ * @since 3.8
+ * @deprecated the embedded driver will be removed in the next major release
+ */
+@Deprecated
+@Immutable
+public final class MongoEmbeddedSettings {
+    private final String libraryPath;
+    private final String yamlConfig;
+    private final MongoEmbeddedLogLevel logLevel;
+
+    /**
+     * Convenience method to create a Builder.
+     *
+     * @return a builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Convenience method to create a from an existing {@code MongoClientSettings}.
+     *
+     * @param settings create a builder from existing settings
+     * @return a builder
+     */
+    public static Builder builder(final MongoEmbeddedSettings settings) {
+        return new Builder(settings);
+    }
+
+    /**
+     * A builder for {@code MongoEmbeddedSettings} so that {@code MongoEmbeddedSettings} can be immutable, and to support easier
+     * construction through chaining.
+     */
+    @NotThreadSafe
+    public static final class Builder {
+        private String libraryPath;
+        private String yamlConfig;
+        private MongoEmbeddedLogLevel logLevel = MongoEmbeddedLogLevel.LOGGER;
+
+        private Builder() {
+        }
+
+        private Builder(final MongoEmbeddedSettings settings) {
+            notNull("settings", settings);
+            libraryPath = settings.libraryPath;
+            yamlConfig = settings.yamlConfig;
+            logLevel = settings.logLevel;
+        }
+
+        /**
+         * Sets the library path for mongod.
+         *
+         * @param libraryPath the library path for mongod
+         * @return this
+         */
+        public Builder libraryPath(final String libraryPath) {
+            this.libraryPath = libraryPath;
+            return this;
+        }
+
+        /**
+         * Sets the yaml configuration for mongod.
+         *
+         * @param yamlConfig the yaml configuration for mongod
+         * @return this
+         * @mongodb.driver.manual reference/configuration-options/
+         */
+        public Builder yamlConfig(final String yamlConfig) {
+            this.yamlConfig = yamlConfig;
+            return this;
+        }
+
+        /**
+         * Sets the logging level for the mongod.
+         *
+         * @param logLevel the library path for mongod
+         * @return this
+         */
+        public Builder logLevel(final MongoEmbeddedLogLevel logLevel) {
+            this.logLevel = logLevel;
+            return this;
+        }
+
+        /**
+         * Build an instance of {@code MongoClientSettings}.
+         *
+         * @return the settings from this builder
+         */
+        public MongoEmbeddedSettings build() {
+            return new MongoEmbeddedSettings(this);
+        }
+    }
+
+    /**
+     * Gets the library path for the embedded mongod
+     *
+     * @return the library path if set or null
+     */
+    public String getLibraryPath() {
+        return libraryPath;
+    }
+
+    /**
+     * Returns the yaml configuration for mongod.
+     *
+     * @return the yaml configuration for mongod
+     * @mongodb.driver.manual reference/configuration-options/
+     */
+    public String getYamlConfig() {
+        return yamlConfig;
+    }
+
+    /**
+     * Gets the logging level for the embedded mongod
+     *
+     * @return the logging level
+     */
+    public MongoEmbeddedLogLevel getLogLevel() {
+        return logLevel;
+    }
+
+    private MongoEmbeddedSettings(final Builder builder) {
+        this.libraryPath = builder.libraryPath;
+        this.yamlConfig = builder.yamlConfig;
+        this.logLevel = builder.logLevel;
+    }
+}
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/package-info.java b/driver-embedded/src/main/com/mongodb/embedded/client/package-info.java
new file mode 100644
index 00000000000..a856b32ea4e
--- /dev/null
+++ b/driver-embedded/src/main/com/mongodb/embedded/client/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This packages contains classes for the embedded client
+ */
+package com.mongodb.embedded.client;
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/CrudTest.java b/driver-embedded/src/test/functional/com/mongodb/embedded/client/CrudTest.java
new file mode 100644
index 00000000000..c031ade60d7
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/CrudTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.client.JsonPoweredCrudTestHelper;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.embedded.client.Fixture.getMongoClient;
+import static com.mongodb.embedded.client.Fixture.getServerVersion;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/crud/tests
+@RunWith(Parameterized.class)
+public class CrudTest extends DatabaseTestCase {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private MongoDatabase database;
+    private MongoCollection<BsonDocument> collection;
+    private JsonPoweredCrudTestHelper helper;
+
+    public CrudTest(final String filename, final String description, final String databaseName, final BsonArray data,
+                    final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = databaseName;
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        assumeFalse(description.startsWith("Aggregate with $listLocalSessions"));
+        database = getMongoClient().getDatabase(databaseName);
+        collection = database.getCollection(getClass().getName(), BsonDocument.class);
+        if (!data.isEmpty()) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+            collection.insertMany(documents);
+        }
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
+    }
+
+    @After
+    public void tearDown() {
+        if (collection != null) {
+            collection.drop();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        BsonDocument expectedOutcome = definition.getDocument("outcome", null);
+        // check if v1 test
+        if (definition.containsKey("operation")) {
+            runOperation(expectedOutcome, definition.getDocument("operation"),
+                    expectedOutcome != null && expectedOutcome.containsKey("result") && expectedOutcome.isDocument("result")
+                            ? expectedOutcome.get("result") : null);
+        } else {  // v2 test
+            BsonArray operations = definition.getArray("operations");
+            for (BsonValue operation : operations) {
+                runOperation(expectedOutcome, operation.asDocument(), operation.asDocument().get("result", null));
+            }
+        }
+    }
+
+    private void runOperation(final BsonDocument expectedOutcome, final BsonDocument operation, final BsonValue expectedResult) {
+        BsonDocument outcome = null;
+        boolean wasException = false;
+        try {
+            outcome = helper.getOperationResults(operation);
+        } catch (Exception e) {
+            wasException = true;
+        }
+
+        if (operation.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+            assertEquals(operation.containsKey("error"), wasException);
+        }
+
+        if (expectedResult != null) {
+            // Hack to workaround the lack of upsertedCount
+            BsonValue actualResult = outcome.get("result");
+            if (actualResult.isDocument()
+                    && actualResult.asDocument().containsKey("upsertedCount")
+                    && actualResult.asDocument().getNumber("upsertedCount").intValue() == 0
+                    && !expectedResult.asDocument().containsKey("upsertedCount")) {
+                expectedResult.asDocument().append("upsertedCount", actualResult.asDocument().get("upsertedCount"));
+            }
+
+            // Hack to workaround the lack of insertedIds
+            if (expectedResult.isDocument()
+                    && !expectedResult.asDocument().containsKey("insertedIds")) {
+                actualResult.asDocument().remove("insertedIds");
+            }
+
+            assertEquals(description, expectedResult, actualResult);
+        }
+
+        if (expectedOutcome.containsKey("collection")) {
+            assertCollectionEquals(expectedOutcome.getDocument("collection"));
+        }
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        if (!Fixture.runEmbeddedTests()) {
+            return data;
+        }
+
+        for (File file : JsonPoweredTestHelper.getTestFiles("/crud")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test: testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getArray("data", new BsonArray()), test.asDocument(),
+                        skipTest(testDocument, test.asDocument(), getServerVersion())});
+            }
+        }
+        return data;
+    }
+
+    private void assertCollectionEquals(final BsonDocument expectedCollection) {
+        MongoCollection<BsonDocument> collectionToCompare = collection;
+        if (expectedCollection.containsKey("name")) {
+            collectionToCompare = database.getCollection(expectedCollection.getString("name").getValue(), BsonDocument.class);
+        }
+        assertEquals(description, expectedCollection.getArray("data"), collectionToCompare.find().into(new BsonArray()));
+    }
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/DatabaseTestCase.java b/driver-embedded/src/test/functional/com/mongodb/embedded/client/DatabaseTestCase.java
new file mode 100644
index 00000000000..f54af4d94c4
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/DatabaseTestCase.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import org.junit.BeforeClass;
+
+import static org.junit.Assume.assumeTrue;
+
+public class DatabaseTestCase {
+
+    @BeforeClass
+    public static void beforeAll() {
+        assumeTrue("Embedded driver tests not run. Requires JDK 7+ & an embedded path.", Fixture.runEmbeddedTests());
+        assumeTrue("The embedded path does not exist.", Fixture.hasLibraryPath());
+        Fixture.getMongoClient();
+    }
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/Fixture.java b/driver-embedded/src/test/functional/com/mongodb/embedded/client/Fixture.java
new file mode 100644
index 00000000000..0dacfea2d58
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/Fixture.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+
+import com.mongodb.ConnectionString;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.connection.ServerVersion;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.Document;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7;
+import static java.util.Arrays.asList;
+
+
+/**
+ * Helper class for the acceptance tests.
+ */
+public final class Fixture {
+    private static final String CONNECTION_STRING_PROPERTY_NAME = "org.mongodb.test.uri";
+    private static final String DEFAULT_CONNECTION_STRING = "mongodb://%2Ftmp%2Fembedded_mongo/?appName=testApp";
+    private static final String EMBEDDED_PATH_PROPERTY_NAME = "org.mongodb.test.embedded.path";
+    private static final String DEFAULT_DATABASE_NAME = "JavaDriverTest";
+
+    private static MongoClient mongoClient;
+    private static MongoEmbeddedSettings mongoEmbeddedSettings;
+    private static MongoClientSettings mongoClientSettings;
+    private static ServerVersion serverVersion;
+
+    private Fixture() {
+    }
+
+    static synchronized MongoClient getMongoClient() {
+        if (mongoClient == null) {
+            cleanDBPath();
+            MongoClients.init(getMongoEmbeddedSettings());
+            mongoClient = MongoClients.create(getMongoClientSettings());
+            Runtime.getRuntime().addShutdownHook(new ShutdownHook());
+        }
+        return mongoClient;
+    }
+
+    static class ShutdownHook extends Thread {
+        @Override
+        public void run() {
+            close();
+        }
+    }
+
+    static synchronized void close() {
+        if (mongoClient != null) {
+            mongoClient.close();
+            MongoClients.close();
+            mongoClient = null;
+        }
+    }
+
+    static synchronized MongoDatabase getDefaultDatabase() {
+        return getMongoClient().getDatabase(getDefaultDatabaseName());
+    }
+
+    static String getDefaultDatabaseName() {
+        return DEFAULT_DATABASE_NAME;
+    }
+
+    static synchronized ServerVersion getServerVersion() {
+        if (serverVersion == null) {
+            BsonDocument buildInfoResult = getMongoClient().getDatabase("admin")
+                    .runCommand(new Document("buildInfo", 1), BsonDocument.class);
+            List<BsonValue> versionArray = buildInfoResult.getArray("versionArray").subList(0, 3);
+
+            serverVersion = new ServerVersion(asList(versionArray.get(0).asInt32().getValue(),
+                    versionArray.get(1).asInt32().getValue(),
+                    versionArray.get(2).asInt32().getValue()));
+        }
+        return serverVersion;
+    }
+
+    private static String getConnectionStringProperty() {
+        String connectionString = System.getProperty(CONNECTION_STRING_PROPERTY_NAME);
+        return connectionString == null || connectionString.isEmpty() ? DEFAULT_CONNECTION_STRING : connectionString;
+    }
+
+    static boolean hasLibraryPath() {
+        String libraryPath = Fixture.getMongoEmbeddedSettings().getLibraryPath();
+        return libraryPath != null && new File(libraryPath).exists();
+    }
+
+    static synchronized MongoClientSettings getMongoClientSettings() {
+        if (mongoClientSettings == null) {
+            MongoClientSettings.Builder builder = MongoClientSettings.builder()
+                    .applyConnectionString(new ConnectionString(getConnectionStringProperty()));
+            mongoClientSettings = builder.build();
+        }
+        return mongoClientSettings;
+    }
+
+    static boolean runEmbeddedTests() {
+        return !(isNotAtLeastJava7() || System.getProperty(EMBEDDED_PATH_PROPERTY_NAME, "").isEmpty());
+    }
+
+    static synchronized MongoEmbeddedSettings getMongoEmbeddedSettings() {
+        if (mongoEmbeddedSettings == null) {
+            mongoEmbeddedSettings = MongoEmbeddedSettings.builder()
+                    .libraryPath(System.getProperty(EMBEDDED_PATH_PROPERTY_NAME))
+                    .logLevel(MongoEmbeddedLogLevel.LOGGER)
+                    .build();
+        }
+        return mongoEmbeddedSettings;
+    }
+
+    private static List<Integer> getVersionList(final String versionString) {
+        List<Integer> versionList = new ArrayList<Integer>();
+        for (String s : versionString.split("\\.")) {
+            versionList.add(Integer.valueOf(s));
+        }
+        while (versionList.size() < 3) {
+            versionList.add(0);
+        }
+        return versionList;
+    }
+
+    static void cleanDBPath() {
+        rmDir(new File(getMongoClientSettings().getDbPath()));
+    }
+
+    private static boolean rmDir(final File dir) {
+        if (dir.isDirectory()) {
+            String[] children = dir.list();
+            if (children != null) {
+                for (String child : children) {
+                    boolean success = rmDir(new File(dir, child));
+                    if (!success) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return dir.delete();
+    }
+
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoClientSettingsSpecification.groovy b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoClientSettingsSpecification.groovy
new file mode 100644
index 00000000000..d88aed90c71
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoClientSettingsSpecification.groovy
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client
+
+import com.mongodb.ConnectionString
+import com.mongodb.event.CommandListener
+import org.bson.codecs.configuration.CodecRegistry
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static spock.util.matcher.HamcrestSupport.expect
+
+@IgnoreIf({ !Fixture.runEmbeddedTests() })
+class MongoClientSettingsSpecification extends Specification {
+    private static final String DB_PATH = '/path/to/db'
+
+    def 'should require a dbPath'() {
+        when:
+        MongoClientSettings.builder().build()
+
+        then:
+        thrown(IllegalStateException)
+    }
+
+    def 'should set the correct default values'() {
+        given:
+        def settings = MongoClientSettings.builder().dbPath(DB_PATH).build()
+
+        expect:
+        settings.getDbPath() == DB_PATH
+        settings.getCommandListeners().isEmpty()
+        settings.getApplicationName() == null
+    }
+
+    @SuppressWarnings('UnnecessaryObjectReferences')
+    def 'should handle illegal arguments'() {
+        given:
+        def builder = MongoClientSettings.builder()
+
+        when:
+        builder.codecRegistry(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.addCommandListener(null)
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should build with set configuration'() {
+        given:
+        def codecRegistry = Stub(CodecRegistry)
+        def commandListener = Stub(CommandListener)
+
+        when:
+        def settings = MongoClientSettings.builder()
+                .dbPath(DB_PATH)
+                .applicationName('app1')
+                .addCommandListener(commandListener)
+                .codecRegistry(codecRegistry)
+                .build()
+
+        then:
+        settings.getDbPath() == DB_PATH
+        settings.getApplicationName() == 'app1'
+        settings.getCommandListeners() == [commandListener]
+        settings.getCodecRegistry() == codecRegistry
+    }
+
+    def 'should be easy to create new settings from existing'() {
+        when:
+        def settings = MongoClientSettings.builder().dbPath(DB_PATH).build()
+
+        then:
+        expect settings, isTheSameAs(MongoClientSettings.builder(settings).build())
+
+        when:
+        def codecRegistry = Stub(CodecRegistry)
+        def commandListener = Stub(CommandListener)
+
+        settings = MongoClientSettings.builder()
+                .dbPath(DB_PATH)
+                .applicationName('app1')
+                .addCommandListener(commandListener)
+                .codecRegistry(codecRegistry)
+                .build()
+
+        then:
+        expect settings, isTheSameAs(MongoClientSettings.builder(settings).build())
+    }
+
+    def 'applicationName can be 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 126 + '\u00A0'
+
+        when:
+        def settings = MongoClientSettings.builder().dbPath(DB_PATH).applicationName(applicationName).build()
+
+        then:
+        settings.getApplicationName() == applicationName
+    }
+
+    def 'should throw IllegalArgumentException if applicationName exceeds 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 127 + '\u00A0'
+
+        when:
+        MongoClientSettings.builder().applicationName(applicationName)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should add command listeners'() {
+        given:
+        CommandListener commandListenerOne = Mock(CommandListener)
+        CommandListener commandListenerTwo = Mock(CommandListener)
+        CommandListener commandListenerThree = Mock(CommandListener)
+
+        when:
+        def settings = MongoClientSettings.builder().dbPath(DB_PATH).build()
+
+        then:
+        settings.getCommandListeners().size() == 0
+
+        when:
+        settings = MongoClientSettings.builder().dbPath(DB_PATH).addCommandListener(commandListenerOne).build()
+
+        then:
+        settings.getCommandListeners().size() == 1
+        settings.getCommandListeners()[0].is commandListenerOne
+
+        when:
+        settings = MongoClientSettings.builder()
+                .dbPath(DB_PATH)
+                .addCommandListener(commandListenerOne)
+                .addCommandListener(commandListenerTwo)
+                .build()
+
+        then:
+        settings.getCommandListeners().size() == 2
+        settings.getCommandListeners()[0].is commandListenerOne
+        settings.getCommandListeners()[1].is commandListenerTwo
+
+        when:
+        def copied = MongoClientSettings.builder(settings).addCommandListener(commandListenerThree).build()
+
+        then:
+        copied.getCommandListeners().size() == 3
+        copied.getCommandListeners()[0].is commandListenerOne
+        copied.getCommandListeners()[1].is commandListenerTwo
+        copied.getCommandListeners()[2].is commandListenerThree
+        settings.getCommandListeners().size() == 2
+        settings.getCommandListeners()[0].is commandListenerOne
+        settings.getCommandListeners()[1].is commandListenerTwo
+    }
+
+    def 'should build settings from a connection string'() {
+        when:
+        ConnectionString connectionString = new ConnectionString('mongodb://%2Ftmp%2Fembedded/?appName=MyApp')
+        MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(connectionString).build()
+        MongoClientSettings expected = MongoClientSettings.builder()
+            .dbPath('/tmp/embedded')
+            .applicationName('MyApp')
+            .build()
+
+        then:
+        expect expected, isTheSameAs(settings, ['wrappedMongoClientSettings'])
+    }
+
+    def 'should only have the following fields in the builder'() {
+        when:
+        // A regression test so that if anymore fields are added then the builder(final MongoClientSettings settings) should be updated
+        def actual = MongoClientSettings.Builder.declaredFields.grep {  !it.synthetic } *.name.sort()
+        def expected = ['dbPath', 'wrappedBuilder']
+
+        then:
+        actual == expected
+    }
+
+    def 'should only have the following methods in the builder'() {
+        when:
+        // A regression test so that if anymore methods are added then the builder(final MongoClientSettings settings) should be updated
+        def actual = MongoClientSettings.Builder.declaredMethods.grep {  !it.synthetic } *.name.sort()
+        def expected = ['addCommandListener', 'applicationName', 'applyConnectionString', 'build', 'codecRegistry', 'commandListenerList',
+                        'dbPath']
+        then:
+        actual == expected
+    }
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoClientsTest.java b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoClientsTest.java
new file mode 100644
index 00000000000..330fe2202e4
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoClientsTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.client.MongoClient;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static com.mongodb.embedded.client.Fixture.getMongoClientSettings;
+import static com.mongodb.embedded.client.Fixture.getMongoEmbeddedSettings;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+public class MongoClientsTest {
+
+    @BeforeClass
+    public static void beforeAll() {
+        assumeTrue("Embedded driver tests not run. Requires JDK 7+ & an embedded path.", Fixture.runEmbeddedTests());
+        Fixture.close();
+    }
+
+    @Test(expected = MongoClientEmbeddedException.class)
+    public void shouldThrowIfInitCalledTwice() {
+        try {
+            MongoClients.init(getMongoEmbeddedSettings());
+            MongoClients.init(getMongoEmbeddedSettings());
+            fail();
+        } finally {
+            MongoClients.close();
+        }
+    }
+
+    @Test(expected = MongoClientEmbeddedException.class)
+    public void shouldThrowIfCreateCalledWithoutCallingInit() {
+        MongoClients.create(getMongoClientSettings());
+    }
+
+    @Test(expected = MongoClientEmbeddedException.class)
+    public void shouldThrowIfLibHandlesStillExist() {
+        MongoClients.init(getMongoEmbeddedSettings());
+        MongoClient mongoClient = MongoClients.create(getMongoClientSettings());
+        try {
+            MongoClients.close();
+            fail();
+        } finally {
+            mongoClient.close();
+            MongoClients.close();
+        }
+    }
+
+    @Test(expected = MongoClientEmbeddedException.class)
+    public void shouldThrowWhenTryingToOpenMultipleClients() {
+        MongoClients.init(getMongoEmbeddedSettings());
+        MongoClient mongoClient = MongoClients.create(getMongoClientSettings());
+        try {
+            MongoClients.create(getMongoClientSettings());
+            fail();
+        } finally {
+            mongoClient.close();
+            MongoClients.close();
+        }
+    }
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedLogLevelSpecification.groovy b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedLogLevelSpecification.groovy
new file mode 100644
index 00000000000..a84db6422f9
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedLogLevelSpecification.groovy
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client
+
+import com.mongodb.embedded.capi.LogLevel
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+@IgnoreIf({ !Fixture.runEmbeddedTests() })
+class MongoEmbeddedLogLevelSpecification extends Specification {
+
+    def 'should mirror capi LogLevel'() {
+        expect:
+        mongoEmbeddedLogLevel.toCapiLogLevel() == logLevel
+
+        where:
+        mongoEmbeddedLogLevel           | logLevel
+        MongoEmbeddedLogLevel.LOGGER    | LogLevel.LOGGER
+        MongoEmbeddedLogLevel.NONE      | LogLevel.NONE
+        MongoEmbeddedLogLevel.STDERR    | LogLevel.STDERR
+        MongoEmbeddedLogLevel.STDOUT    | LogLevel.STDOUT
+    }
+
+    def 'should have the same named enum constants as LogLevel'() {
+        when:
+        // A regression test so that if anymore enums are added then MongoEmbeddedLogLevel should be updated
+        def actual = MongoEmbeddedLogLevel.getEnumConstants()*.name().sort()
+        def expected = LogLevel.getEnumConstants()*.name().sort()
+
+        then:
+        actual == expected
+    }
+
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedSettingsSpecification.groovy b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedSettingsSpecification.groovy
new file mode 100644
index 00000000000..a744cdab7bb
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedSettingsSpecification.groovy
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client
+
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static spock.util.matcher.HamcrestSupport.expect
+
+@IgnoreIf({ !Fixture.runEmbeddedTests() })
+class MongoEmbeddedSettingsSpecification extends Specification {
+
+
+    def 'should set the correct default values'() {
+        given:
+        def settings = MongoEmbeddedSettings.builder().build()
+
+        expect:
+        settings.getLibraryPath() == null
+        settings.getLogLevel() == MongoEmbeddedLogLevel.LOGGER
+        settings.getYamlConfig() == null
+    }
+
+    def 'should set the correct settings'() {
+        given:
+        def libraryPath = '/mongo/lib/'
+        def logLevel = MongoEmbeddedLogLevel.NONE
+        def yamlConfig = '{systemLog: {verbosity: 5} }'
+
+        when:
+        def settings = MongoEmbeddedSettings.builder()
+                .libraryPath(libraryPath)
+                .logLevel(logLevel)
+                .yamlConfig(yamlConfig)
+                .build()
+
+        then:
+        settings.getLibraryPath() == libraryPath
+        settings.getLogLevel() == logLevel
+        settings.getYamlConfig() == yamlConfig
+        expect settings, isTheSameAs(MongoEmbeddedSettings.builder(settings).build())
+    }
+
+    def 'should only have the following fields in the builder'() {
+        when:
+        // A regression test so that if anymore fields are added then the builder(final MongoEmbeddedSettings settings) should be updated
+        def actual = MongoEmbeddedSettings.Builder.declaredFields.grep {  !it.synthetic } *.name.sort()
+        def expected = ['libraryPath', 'logLevel', 'yamlConfig']
+
+        then:
+        actual == expected
+    }
+
+    def 'should only have the following methods in the builder'() {
+        when:
+        // A regression test so that if anymore methods are added then the builder(final MongoEmbeddedSettings settings) should be updated
+        def actual = MongoEmbeddedSettings.Builder.declaredMethods.grep {  !it.synthetic } *.name.sort()
+        def expected = ['build', 'libraryPath', 'logLevel', 'yamlConfig']
+
+        then:
+        actual == expected
+    }
+
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedSettingsTest.java b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedSettingsTest.java
new file mode 100644
index 00000000000..d8084f124eb
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/MongoEmbeddedSettingsTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class MongoEmbeddedSettingsTest {
+
+    @Test
+    public void shouldSetTheCorrectDefaults() {
+        MongoEmbeddedSettings settings = MongoEmbeddedSettings.builder().build();
+
+        assertNull(settings.getLibraryPath());
+        assertNull(settings.getYamlConfig());
+        assertEquals(MongoEmbeddedLogLevel.LOGGER, settings.getLogLevel());
+    }
+
+    @Test
+    public void shouldSetTheCorrectSettings() {
+        String libraryPath = "/mongo/lib/";
+        MongoEmbeddedLogLevel logLevel = MongoEmbeddedLogLevel.NONE;
+        String yamlConfig = "{systemLog: {verbosity: 5} }";
+
+        MongoEmbeddedSettings settings = MongoEmbeddedSettings.builder()
+                .libraryPath(libraryPath)
+                .logLevel(logLevel)
+                .yamlConfig(yamlConfig)
+                .build();
+
+        assertEquals(libraryPath, settings.getLibraryPath());
+        assertEquals(logLevel, settings.getLogLevel());
+        assertEquals(yamlConfig, settings.getYamlConfig());
+
+        MongoEmbeddedSettings copiedSettings = MongoEmbeddedSettings.builder(settings).build();
+
+        assertEquals(copiedSettings.getLibraryPath(), settings.getLibraryPath());
+        assertEquals(copiedSettings.getLogLevel(), settings.getLogLevel());
+        assertEquals(copiedSettings.getYamlConfig(), settings.getYamlConfig());
+    }
+}
diff --git a/driver-embedded/src/test/functional/com/mongodb/embedded/client/SmokeTest.java b/driver-embedded/src/test/functional/com/mongodb/embedded/client/SmokeTest.java
new file mode 100644
index 00000000000..0f6f5c81286
--- /dev/null
+++ b/driver-embedded/src/test/functional/com/mongodb/embedded/client/SmokeTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.embedded.client;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Aggregates;
+import org.bson.Document;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class SmokeTest extends DatabaseTestCase {
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void shouldHandleCommonCRUDScenariosWithoutError() {
+        MongoDatabase database = Fixture.getDefaultDatabase();
+        MongoCollection<Document> collection = database.getCollection("test");
+        collection.drop();
+
+        Document document = new Document("_id", 1);
+        Document updatedDocument = new Document("_id", 1).append("a", 1);
+
+        assertEquals(0, collection.countDocuments());
+        assertEquals(null, collection.find().first());
+
+        collection.insertOne(document);
+        assertEquals(1, collection.count());
+
+        assertEquals(document, collection.find().first());
+
+        assertTrue(collection.updateOne(document, Document.parse("{$set: {a: 1}}")).wasAcknowledged());
+        assertEquals(updatedDocument, collection.find().first());
+
+        assertEquals(updatedDocument, collection.aggregate(Collections.singletonList(Aggregates.match(new Document("a", 1)))).first());
+        assertEquals(1, collection.deleteOne(new Document()).getDeletedCount());
+
+        assertEquals(0, collection.countDocuments());
+
+        collection.insertMany(asList(new Document("id", "a"), new Document("id", "b"), new Document("id", "c")));
+
+        assertEquals(asList("a", "b", "c"), collection.distinct("id", String.class).into(new ArrayList<String>()));
+    }
+
+    @Test
+    public void shouldHandleCommonAdministrativeScenariosWithoutError() {
+        MongoClient mongoClient = Fixture.getMongoClient();
+        MongoDatabase database = Fixture.getDefaultDatabase();
+        database.drop();
+        List<String> databaseNames = mongoClient.listDatabaseNames().into(new ArrayList<String>());
+
+        String collectionName = "test";
+        database.createCollection(collectionName);
+
+        List<String> updatedDatabaseNames = mongoClient.listDatabaseNames().into(new ArrayList<String>());
+        assertEquals(databaseNames.size() + 1, updatedDatabaseNames.size());
+
+        List<String> collectionNames = database.listCollectionNames().into(new ArrayList<String>());
+        assertThat(collectionNames, contains(collectionName));
+
+        MongoCollection<Document> collection = database.getCollection(collectionName);
+        collection.drop();
+
+        assertThat(database.listCollectionNames().into(new ArrayList<String>()), not(contains(collectionName)));
+    }
+}
diff --git a/driver-legacy/build.gradle b/driver-legacy/build.gradle
new file mode 100644
index 00000000000..7b7b6ca493d
--- /dev/null
+++ b/driver-legacy/build.gradle
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+archivesBaseName = 'mongodb-driver-legacy'
+description =  'The MongoDB Legacy Driver'
+ext {
+    pomName = 'The Legacy MongoDB Driver'
+}
+
+sourceSets {
+    test.groovy.srcDirs += ['src/examples']
+}
+
+test {
+    exclude 'tour/**'
+}
+
+clirr {
+    enabled = false
+}
+
+dependencies {
+    compile project(':bson')
+    compile project(':driver-core')
+    compile project(':driver-sync')
+
+    testCompile project(':bson').sourceSets.test.output
+    testCompile project(':driver-core').sourceSets.test.output
+    testCompile project(':driver-sync').sourceSets.test.output
+}
diff --git a/driver-legacy/src/examples/tour/Decimal128LegacyAPIQuickTour.java b/driver-legacy/src/examples/tour/Decimal128LegacyAPIQuickTour.java
new file mode 100644
index 00000000000..a07fc0f4588
--- /dev/null
+++ b/driver-legacy/src/examples/tour/Decimal128LegacyAPIQuickTour.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DB;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+import com.mongodb.QueryBuilder;
+import org.bson.types.Decimal128;
+
+import java.math.BigDecimal;
+
+/**
+ * Decimal128 Quick Tour for the Legacy API
+ */
+@SuppressWarnings("deprecation")
+public class Decimal128LegacyAPIQuickTour {
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * @param args takes an optional single argument for the connection string
+     */
+    public static void main(final String[] args) {
+        MongoClient mongoClient;
+
+        if (args.length == 0) {
+            // connect to the local database server
+            mongoClient = new MongoClient();
+        } else {
+            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+        }
+
+        // get handle to "mydb" database
+        DB database = mongoClient.getDB("mydb");
+
+
+        // get a handle to the "test" collection
+        DBCollection collection = database.getCollection("test");
+
+        // drop all the data in it
+        collection.drop();
+
+        // make a document and insert it
+        BasicDBObject doc = new BasicDBObject("name", "MongoDB")
+                                    .append("amount1", Decimal128.parse(".10"))
+                                    .append("amount2", new Decimal128(42L))
+                                    .append("amount3", new Decimal128(new BigDecimal(".200")));
+
+        collection.insert(doc);
+
+
+        DBObject first = collection.findOne(QueryBuilder.start("amount1").is(new Decimal128(new BigDecimal(".10"))).get());
+
+        Decimal128 amount3 = (Decimal128) first.get("amount3");
+        BigDecimal amount2AsBigDecimal = amount3.bigDecimalValue();
+
+        System.out.println(amount3.toString());
+        System.out.println(amount2AsBigDecimal.toString());
+
+    }
+}
diff --git a/driver-legacy/src/examples/tour/package-info.java b/driver-legacy/src/examples/tour/package-info.java
new file mode 100644
index 00000000000..ebd69343c4a
--- /dev/null
+++ b/driver-legacy/src/examples/tour/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the quick tour examples
+ */
+package tour;
diff --git a/driver/src/main/com/mongodb/AcknowledgedBulkWriteResult.java b/driver-legacy/src/main/com/mongodb/AcknowledgedBulkWriteResult.java
similarity index 83%
rename from driver/src/main/com/mongodb/AcknowledgedBulkWriteResult.java
rename to driver-legacy/src/main/com/mongodb/AcknowledgedBulkWriteResult.java
index 7333857d998..4a5d6ef8976 100644
--- a/driver/src/main/com/mongodb/AcknowledgedBulkWriteResult.java
+++ b/driver-legacy/src/main/com/mongodb/AcknowledgedBulkWriteResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ class AcknowledgedBulkWriteResult extends BulkWriteResult {
     private int insertedCount;
     private int matchedCount;
     private int removedCount;
-    private Integer modifiedCount;
+    private int modifiedCount;
     private final List<BulkWriteUpsert> upserts;
 
     AcknowledgedBulkWriteResult(final int insertedCount, final int matchedCount, final int removedCount,
@@ -33,7 +33,7 @@ class AcknowledgedBulkWriteResult extends BulkWriteResult {
         this.insertedCount = insertedCount;
         this.matchedCount = matchedCount;
         this.removedCount = removedCount;
-        this.modifiedCount = modifiedCount;
+        this.modifiedCount = notNull("modifiedCount", modifiedCount);
         this.upserts = Collections.unmodifiableList(notNull("upserts", upserts));
     }
 
@@ -58,16 +58,13 @@ public int getRemovedCount() {
     }
 
     @Override
+    @Deprecated
     public boolean isModifiedCountAvailable() {
-        return modifiedCount != null;
+        return true;
     }
 
     @Override
     public int getModifiedCount() {
-        if (modifiedCount == null) {
-            throw new UnsupportedOperationException("The modifiedCount is not available because at least one of the servers "
-                    + "updated was not able to provide this information (the server must be at least version 2.6 or higher.");
-        }
         return modifiedCount;
     }
 
@@ -96,7 +93,7 @@ public boolean equals(final Object o) {
         if (removedCount != that.removedCount) {
             return false;
         }
-        if (modifiedCount != null ? !modifiedCount.equals(that.modifiedCount) : that.modifiedCount != null) {
+        if (modifiedCount != that.modifiedCount) {
             return false;
         }
         if (!upserts.equals(that.upserts)) {
@@ -111,7 +108,7 @@ public int hashCode() {
         int result = insertedCount;
         result = 31 * result + matchedCount;
         result = 31 * result + removedCount;
-        result = 31 * result + (modifiedCount != null ? modifiedCount.hashCode() : 0);
+        result = 31 * result + modifiedCount;
         result = 31 * result + upserts.hashCode();
         return result;
     }
diff --git a/driver-legacy/src/main/com/mongodb/AggregationOptions.java b/driver-legacy/src/main/com/mongodb/AggregationOptions.java
new file mode 100644
index 00000000000..044c05c33fe
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/AggregationOptions.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.client.model.Collation;
+
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * The options to apply to an aggregate operation.
+ *
+ * @mongodb.server.release 2.2
+ * @mongodb.driver.manual reference/command/aggregate/ aggregate
+ * @since 2.12
+ */
+public class AggregationOptions {
+    private final Integer batchSize;
+    private final Boolean allowDiskUse;
+    private final OutputMode outputMode;
+    private final long maxTimeMS;
+    private final Boolean bypassDocumentValidation;
+    private final Collation collation;
+
+    /**
+     * Enumeration to define where the results of the aggregation will be output.
+     * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+     * that support it (&gt;= 2.6).  The driver will ignore this as of MongoDB 3.6, which does not support inline results for the aggregate
+     * command.
+     */
+    @Deprecated
+    public enum OutputMode {
+        /**
+         * The output of the aggregate operation is returned inline.
+         */
+        INLINE,
+
+        /**
+         * The output of the aggregate operation is returned using a cursor.
+         *
+         * @mongodb.server.release 2.6
+         */
+        CURSOR
+    }
+
+    AggregationOptions(final Builder builder) {
+        batchSize = builder.batchSize;
+        allowDiskUse = builder.allowDiskUse;
+        outputMode = builder.outputMode;
+        maxTimeMS = builder.maxTimeMS;
+        bypassDocumentValidation = builder.bypassDocumentValidation;
+        collation = builder.collation;
+    }
+
+    /**
+     * If true, this enables external sort capabilities, otherwise $sort produces an error if the operation consumes 10 percent or more of
+     * RAM.
+     *
+     * @return true if aggregation stages can write data to temporary files
+     * @mongodb.server.release 2.6
+     */
+    public Boolean getAllowDiskUse() {
+        return allowDiskUse;
+    }
+
+    /**
+     * The size of batches to use when iterating over results.
+     *
+     * @return the batch size
+     * @mongodb.server.release 2.6
+     */
+    public Integer getBatchSize() {
+        return batchSize;
+    }
+
+    /**
+     * The mode of output for this configuration.
+     *
+     * @return whether the output will be inline or via a cursor, which defaults to {@link OutputMode#CURSOR}
+     * @see OutputMode
+     * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+     * that support it (&gt;= 2.6).  The driver will ignore this as of MongoDB 3.6, which does not support inline results for the aggregate
+     * command.
+     */
+    @Deprecated
+    public OutputMode getOutputMode() {
+        return outputMode;
+    }
+
+    /**
+     * Gets the maximum execution time for the aggregation command.
+     *
+     * @param timeUnit the time unit for the result
+     * @return the max time
+     * @mongodb.server.release 2.6
+     * @since 2.12
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        return timeUnit.convert(maxTimeMS, MILLISECONDS);
+    }
+
+    /**
+     * Gets whether to bypass document validation, or null if unspecified.  The default is null.
+     *
+     * @return whether to bypass document validation, or null if unspecified.
+     * @since 2.14
+     * @mongodb.server.release 3.2
+     */
+    public Boolean getBypassDocumentValidation() {
+        return bypassDocumentValidation;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    @Override
+    public String toString() {
+        return "AggregationOptions{"
+                + "batchSize=" + batchSize
+                + ", allowDiskUse=" + allowDiskUse
+                + ", outputMode=" + outputMode
+                + ", maxTimeMS=" + maxTimeMS
+                + ", bypassDocumentValidation=" + bypassDocumentValidation
+                + ", collation=" + collation
+                + "}";
+    }
+
+    /**
+     * Creates a new Builder for {@code AggregationOptions}.
+     *
+     * @return a new empty builder.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Builder for creating {@code AggregationOptions}.
+     *
+     * @mongodb.server.release 2.2
+     * @mongodb.driver.manual reference/command/aggregate/ aggregate
+     */
+    @NotThreadSafe
+    public static class Builder {
+        private Integer batchSize;
+        private Boolean allowDiskUse;
+        private OutputMode outputMode = OutputMode.CURSOR;
+        private long maxTimeMS;
+        private Boolean bypassDocumentValidation;
+        private Collation collation;
+
+        private Builder() {
+        }
+
+        /**
+         * Sets the size of batches to use when iterating over results. Can be null.
+         *
+         * @param size the batch size to apply to the cursor
+         * @return {@code this} so calls can be chained
+         * @mongodb.server.release 2.6
+         */
+        public Builder batchSize(final Integer size) {
+            batchSize = size;
+            return this;
+        }
+
+        /**
+         * Set whether to enable external sort capabilities. If set to false, $sort produces an error if the operation consumes 10 percent
+         * or more RAM.
+         *
+         * @param allowDiskUse whether or not aggregation stages can write data to temporary files
+         * @return {@code this} so calls can be chained
+         * @mongodb.server.release 2.6
+         */
+        public Builder allowDiskUse(final Boolean allowDiskUse) {
+            this.allowDiskUse = allowDiskUse;
+            return this;
+        }
+
+        /**
+         * The mode of output for this configuration.
+         *
+         * @param mode an {@code OutputMode} that defines how to output the results of the aggregation.
+         * @return {@code this} so calls can be chained
+         * @see OutputMode
+         * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+         * that support it (&gt;= 2.6).  The driver will ignore this as of MongoDB 3.6, which does not support inline results for the
+         * aggregate command.
+         */
+        @Deprecated
+        public Builder outputMode(final OutputMode mode) {
+            outputMode = mode;
+            return this;
+        }
+
+        /**
+         * Sets the maximum execution time for the aggregation command.
+         *
+         * @param maxTime  the max time
+         * @param timeUnit the time unit
+         * @return {@code this} so calls can be chained
+         * @mongodb.server.release 2.6
+         */
+        public Builder maxTime(final long maxTime, final TimeUnit timeUnit) {
+            maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
+            return this;
+        }
+
+        /**
+         * Sets whether to bypass document validation.
+         *
+         * @param bypassDocumentValidation whether to bypass document validation, or null if unspecified
+         * @return this
+         * @since 2.14
+         * @mongodb.server.release 3.2
+         */
+        public Builder bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+            this.bypassDocumentValidation = bypassDocumentValidation;
+            return this;
+        }
+
+        /**
+         * Sets the collation
+         *
+         * @param collation the collation
+         * @return this
+         * @since 3.4
+         * @mongodb.server.release 3.4
+         */
+        public Builder collation(final Collation collation) {
+            this.collation = collation;
+            return this;
+        }
+
+        /**
+         * Return the options based on this builder.
+         *
+         * @return the aggregation options
+         */
+        public AggregationOptions build() {
+            return new AggregationOptions(this);
+        }
+    }
+}
diff --git a/driver/src/main/com/mongodb/AggregationOutput.java b/driver-legacy/src/main/com/mongodb/AggregationOutput.java
similarity index 83%
rename from driver/src/main/com/mongodb/AggregationOutput.java
rename to driver-legacy/src/main/com/mongodb/AggregationOutput.java
index 932f52acc71..cbcb5629ea9 100644
--- a/driver/src/main/com/mongodb/AggregationOutput.java
+++ b/driver-legacy/src/main/com/mongodb/AggregationOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,10 @@
  *
  * @mongodb.server.release 2.2
  * @mongodb.driver.manual aggregation/ Aggregation
+ * @deprecated Replace with use of aggregate methods in {@link DBCollection} that return instances of {@link Cursor}.
+ * @see DBCollection#aggregate(List, AggregationOptions)
  */
+@Deprecated
 public class AggregationOutput {
     private final List<DBObject> results;
 
diff --git a/driver-legacy/src/main/com/mongodb/BulkUpdateRequestBuilder.java b/driver-legacy/src/main/com/mongodb/BulkUpdateRequestBuilder.java
new file mode 100644
index 00000000000..974719c9c0a
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/BulkUpdateRequestBuilder.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.Encoder;
+
+import java.util.List;
+
+/**
+ * A builder for a single update request.
+ *
+ * @mongodb.server.release 2.6
+ * @mongodb.driver.manual /reference/command/update
+ * @since 2.12
+ */
+public class BulkUpdateRequestBuilder {
+    private final BulkWriteOperation bulkWriteOperation;
+    private final DBObject query;
+    private final boolean upsert;
+    private final Encoder<DBObject> queryCodec;
+    private final Encoder<DBObject> replacementCodec;
+    private Collation collation;
+    private final List<? extends DBObject> arrayFilters;
+
+    BulkUpdateRequestBuilder(final BulkWriteOperation bulkWriteOperation, final DBObject query, final boolean upsert,
+                             final Encoder<DBObject> queryCodec, final Encoder<DBObject> replacementCodec,
+                             @Nullable final Collation collation, @Nullable final List<? extends DBObject> arrayFilters) {
+        this.bulkWriteOperation = bulkWriteOperation;
+        this.query = query;
+        this.upsert = upsert;
+        this.queryCodec = queryCodec;
+        this.replacementCodec = replacementCodec;
+        this.collation = collation;
+        this.arrayFilters = arrayFilters;
+    }
+
+    /**
+     * Returns the collation
+     *
+     * @return the collation
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public BulkUpdateRequestBuilder collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Gets the array filters to apply to the update operation
+     * @return the array filters, which may be null
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    public List<? extends DBObject> getArrayFilters() {
+        return arrayFilters;
+    }
+
+    /**
+     * Adds a request to replace one document in the collection that matches the query with which this builder was created.
+     *
+     * @param document the replacement document, which must be structured just as a document you would insert.  It can not contain any
+     *                 update operators.
+     */
+    public void replaceOne(final DBObject document) {
+        bulkWriteOperation.addRequest(new ReplaceRequest(query, document, upsert, queryCodec, replacementCodec, collation));
+    }
+
+    /**
+     * Adds a request to update all documents in the collection that match the query with which this builder was created.
+     *
+     * @param update the update criteria
+     */
+    public void update(final DBObject update) {
+        bulkWriteOperation.addRequest(new UpdateRequest(query, update, true, upsert, queryCodec, collation, arrayFilters));
+    }
+
+    /**
+     * Adds a request to update one document in the collection that matches the query with which this builder was created.
+     *
+     * @param update the update criteria
+     */
+    public void updateOne(final DBObject update) {
+        bulkWriteOperation.addRequest(new UpdateRequest(query, update, false, upsert, queryCodec, collation, arrayFilters));
+    }
+}
diff --git a/driver/src/main/com/mongodb/BulkWriteError.java b/driver-legacy/src/main/com/mongodb/BulkWriteError.java
similarity index 90%
rename from driver/src/main/com/mongodb/BulkWriteError.java
rename to driver-legacy/src/main/com/mongodb/BulkWriteError.java
index a5c5e2bb8d8..7b2474fbb70 100644
--- a/driver/src/main/com/mongodb/BulkWriteError.java
+++ b/driver-legacy/src/main/com/mongodb/BulkWriteError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,4 +117,14 @@ public int hashCode() {
         result = 31 * result + details.hashCode();
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "BulkWriteError{"
+                       + "index=" + index
+                       + ", code=" + code
+                       + ", message='" + message + '\''
+                       + ", details=" + details
+                       + '}';
+    }
 }
diff --git a/driver/src/main/com/mongodb/BulkWriteException.java b/driver-legacy/src/main/com/mongodb/BulkWriteException.java
similarity index 98%
rename from driver/src/main/com/mongodb/BulkWriteException.java
rename to driver-legacy/src/main/com/mongodb/BulkWriteException.java
index dba12e2c23c..c0a64648d66 100644
--- a/driver/src/main/com/mongodb/BulkWriteException.java
+++ b/driver-legacy/src/main/com/mongodb/BulkWriteException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/BulkWriteHelper.java b/driver-legacy/src/main/com/mongodb/BulkWriteHelper.java
similarity index 82%
rename from driver/src/main/com/mongodb/BulkWriteHelper.java
rename to driver-legacy/src/main/com/mongodb/BulkWriteHelper.java
index 814846c512d..8daff918e2e 100644
--- a/driver/src/main/com/mongodb/BulkWriteHelper.java
+++ b/driver-legacy/src/main/com/mongodb/BulkWriteHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentReader;
-import org.bson.codecs.Codec;
 import org.bson.codecs.Decoder;
 import org.bson.codecs.DecoderContext;
 
@@ -30,9 +29,8 @@ final class BulkWriteHelper {
     static BulkWriteResult translateBulkWriteResult(final com.mongodb.bulk.BulkWriteResult bulkWriteResult,
                                                     final Decoder<DBObject> decoder) {
         if (bulkWriteResult.wasAcknowledged()) {
-            Integer modifiedCount = (bulkWriteResult.isModifiedCountAvailable()) ? bulkWriteResult.getModifiedCount() : null;
             return new AcknowledgedBulkWriteResult(bulkWriteResult.getInsertedCount(), bulkWriteResult.getMatchedCount(),
-                                                   bulkWriteResult.getDeletedCount(), modifiedCount,
+                                                   bulkWriteResult.getDeletedCount(), bulkWriteResult.getModifiedCount(),
                                                    translateBulkWriteUpserts(bulkWriteResult.getUpserts(), decoder));
         } else {
             return new UnacknowledgedBulkWriteResult();
@@ -70,15 +68,6 @@ static List<BulkWriteError> translateWriteErrors(final List<com.mongodb.bulk.Bul
         return retVal;
     }
 
-    static List<com.mongodb.bulk.WriteRequest> translateWriteRequestsToNew(final List<WriteRequest> writeRequests,
-                                                                                final Codec<DBObject> objectCodec) {
-        List<com.mongodb.bulk.WriteRequest> retVal = new ArrayList<com.mongodb.bulk.WriteRequest>(writeRequests.size());
-        for (WriteRequest cur : writeRequests) {
-            retVal.add(cur.toNew());
-        }
-        return retVal;
-    }
-
     private BulkWriteHelper() {
     }
 }
diff --git a/driver/src/main/com/mongodb/BulkWriteOperation.java b/driver-legacy/src/main/com/mongodb/BulkWriteOperation.java
similarity index 99%
rename from driver/src/main/com/mongodb/BulkWriteOperation.java
rename to driver-legacy/src/main/com/mongodb/BulkWriteOperation.java
index 0bdd67f4a58..17e45ae51fd 100644
--- a/driver/src/main/com/mongodb/BulkWriteOperation.java
+++ b/driver-legacy/src/main/com/mongodb/BulkWriteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/main/com/mongodb/BulkWriteRequestBuilder.java b/driver-legacy/src/main/com/mongodb/BulkWriteRequestBuilder.java
new file mode 100644
index 00000000000..4e424eecb53
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/BulkWriteRequestBuilder.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.Encoder;
+
+import java.util.List;
+
+/**
+ * A builder for a single write request.
+ *
+ * @mongodb.server.release 2.6
+ * @mongodb.driver.manual reference/command/delete/ Delete
+ * @mongodb.driver.manual reference/command/update/ Update
+ * @mongodb.driver.manual reference/command/insert/ Insert
+ * @since 2.12
+ */
+public class BulkWriteRequestBuilder {
+    private final BulkWriteOperation bulkWriteOperation;
+    private final DBObject query;
+    private final Encoder<DBObject> codec;
+    private final Encoder<DBObject> replacementCodec;
+    private Collation collation;
+
+    BulkWriteRequestBuilder(final BulkWriteOperation bulkWriteOperation, final DBObject query, final Encoder<DBObject> queryCodec,
+                            final Encoder<DBObject> replacementCodec) {
+        this.bulkWriteOperation = bulkWriteOperation;
+        this.query = query;
+        this.codec = queryCodec;
+        this.replacementCodec = replacementCodec;
+    }
+
+    /**
+     * Returns the collation
+     *
+     * @return the collation
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public BulkWriteRequestBuilder collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Adds a request to remove all documents in the collection that match the query with which this builder was created.
+     */
+    public void remove() {
+        bulkWriteOperation.addRequest(new RemoveRequest(query, true, codec, collation));
+    }
+
+    /**
+     * Adds a request to remove one document in the collection that matches the query with which this builder was created.
+     */
+    public void removeOne() {
+        bulkWriteOperation.addRequest(new RemoveRequest(query, false, codec, collation));
+    }
+
+    /**
+     * Adds a request to replace one document in the collection that matches the query with which this builder was created.
+     *
+     * @param document the replacement document, which must be structured just as a document you would insert.  It can not contain any
+     *                 update operators.
+     */
+    public void replaceOne(final DBObject document) {
+        new BulkUpdateRequestBuilder(bulkWriteOperation, query, false, codec, replacementCodec, collation, null).replaceOne(document);
+    }
+
+    /**
+     * Adds a request to update all documents in the collection that match the query with which this builder was created.
+     *
+     * @param update the update criteria
+     */
+    public void update(final DBObject update) {
+        new BulkUpdateRequestBuilder(bulkWriteOperation, query, false, codec, replacementCodec, collation, null).update(update);
+    }
+
+    /**
+     * Adds a request to update one document in the collection that matches the query with which this builder was created.
+     *
+     * @param update the update criteria
+     */
+    public void updateOne(final DBObject update) {
+        new BulkUpdateRequestBuilder(bulkWriteOperation, query, false, codec, replacementCodec, collation, null).updateOne(update);
+    }
+
+    /**
+     * Specifies that the request being built should be an upsert.
+     *
+     * @return a new builder that allows only update and replace, since upsert does not apply to remove.
+     * @mongodb.driver.manual tutorial/modify-documents/#upsert-option Upsert
+     */
+    public BulkUpdateRequestBuilder upsert() {
+        return new BulkUpdateRequestBuilder(bulkWriteOperation, query, true, codec, replacementCodec, collation, null);
+    }
+
+    /**
+     * Specifies that the request being built should use the given array filters for an update.  Note that this option only applies to
+     * update operations and will be ignored for replace operations
+     *
+     * @param arrayFilters the array filters to apply to the update operation
+     * @return a new builder that allows only update and replace, since upsert does not apply to remove.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public BulkUpdateRequestBuilder arrayFilters(final List<? extends DBObject> arrayFilters) {
+        return new BulkUpdateRequestBuilder(bulkWriteOperation, query, false, codec, replacementCodec, collation, arrayFilters);
+    }
+}
diff --git a/driver/src/main/com/mongodb/BulkWriteResult.java b/driver-legacy/src/main/com/mongodb/BulkWriteResult.java
similarity index 85%
rename from driver/src/main/com/mongodb/BulkWriteResult.java
rename to driver-legacy/src/main/com/mongodb/BulkWriteResult.java
index e455a1150c2..fafe71f0778 100644
--- a/driver/src/main/com/mongodb/BulkWriteResult.java
+++ b/driver-legacy/src/main/com/mongodb/BulkWriteResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,14 +67,19 @@ public abstract class BulkWriteResult {
     public abstract int getRemovedCount();
 
     /**
-     * Returns true if the server was able to provide a count of modified documents.  If this method returns false (which can happen if the
-     * server is not at least version 2.6) then the {@code getModifiedCount} method will throw {@code UnsupportedOperationException}.
+     * Returns true if the server was able to provide a count of modified documents.
+     *
+     * <p>
+     * This method now always returns true, as modified count is available since MongoDB 2.6.
+     * </p>
      *
      * @return true if modifiedCount is available
      * @throws java.lang.UnsupportedOperationException if the write was unacknowledged.
      * @see WriteConcern#UNACKNOWLEDGED
      * @see #getModifiedCount()
+     * @deprecated no longer needed since all supported server versions support modified count
      */
+    @Deprecated
     public abstract boolean isModifiedCountAvailable();
 
     /**
@@ -82,13 +87,8 @@ public abstract class BulkWriteResult {
      * count documents that were actually changed; for example, if you set the value of some field , and the field already has that value,
      * that will not count as a modification.</p>
      *
-     * <p>If the server is not able to provide a count of modified documents (which can happen if the server is not at least version 2.6),
-     * then this method will throw an {@code UnsupportedOperationException} </p>
-     *
      * @return the number of documents modified by the write operation
-     * @throws java.lang.UnsupportedOperationException if the write was unacknowledged or if no modified count is available
      * @see WriteConcern#UNACKNOWLEDGED
-     * @see #isModifiedCountAvailable()
      */
     public abstract int getModifiedCount();
 
diff --git a/driver/src/main/com/mongodb/BulkWriteUpsert.java b/driver-legacy/src/main/com/mongodb/BulkWriteUpsert.java
similarity index 98%
rename from driver/src/main/com/mongodb/BulkWriteUpsert.java
rename to driver-legacy/src/main/com/mongodb/BulkWriteUpsert.java
index c7fcf27d654..560b81d68d4 100644
--- a/driver/src/main/com/mongodb/BulkWriteUpsert.java
+++ b/driver-legacy/src/main/com/mongodb/BulkWriteUpsert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/Bytes.java b/driver-legacy/src/main/com/mongodb/Bytes.java
similarity index 95%
rename from driver/src/main/com/mongodb/Bytes.java
rename to driver-legacy/src/main/com/mongodb/Bytes.java
index 51f9ec7b6da..54e0e63fa00 100644
--- a/driver/src/main/com/mongodb/Bytes.java
+++ b/driver-legacy/src/main/com/mongodb/Bytes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 package com.mongodb;
 
-import org.bson.BSON;
+import com.mongodb.lang.Nullable;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
@@ -30,8 +30,11 @@
 
 /**
  * Class that hold definitions of the wire protocol
+ * @deprecated there is no replacement for this class
  */
-public class Bytes extends BSON {
+@Deprecated
+@SuppressWarnings("deprecation")
+public class Bytes extends org.bson.BSON {
 
     /**
      * Little-endian
@@ -100,7 +103,7 @@ public class Bytes extends BSON {
 
 
     static class OptionHolder {
-        OptionHolder(final OptionHolder parent) {
+        OptionHolder(@Nullable final OptionHolder parent) {
             _parent = parent;
         }
 
diff --git a/driver/src/main/com/mongodb/CommandResult.java b/driver-legacy/src/main/com/mongodb/CommandResult.java
similarity index 87%
rename from driver/src/main/com/mongodb/CommandResult.java
rename to driver-legacy/src/main/com/mongodb/CommandResult.java
index d3fb320d329..d50227058c0 100644
--- a/driver/src/main/com/mongodb/CommandResult.java
+++ b/driver-legacy/src/main/com/mongodb/CommandResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import org.bson.BsonDocument;
 
 import static com.mongodb.DBObjects.toDBObject;
@@ -35,7 +36,7 @@ public class CommandResult extends BasicDBObject {
         this(response, null);
     }
 
-    CommandResult(final BsonDocument response, final ServerAddress address) {
+    CommandResult(final BsonDocument response, @Nullable final ServerAddress address) {
         this.address = address;
         this.response = notNull("response", response);
         putAll(toDBObject(response));
@@ -62,6 +63,7 @@ public boolean ok() {
      *
      * @return The error message or null
      */
+    @Nullable
     public String getErrorMessage() {
         Object foo = get("errmsg");
         if (foo == null) {
@@ -75,9 +77,10 @@ public String getErrorMessage() {
      *
      * @return The mongo exception, or null if the command was successful.
      */
+    @Nullable
     public MongoException getException() {
         if (!ok()) {
-            return new MongoCommandException(response, address);
+            return createException();
         }
 
         return null;
@@ -91,7 +94,11 @@ public MongoException getException() {
      */
     public void throwOnError() {
         if (!ok()) {
-            throw getException();
+            throw createException();
         }
     }
+
+    private MongoException createException() {
+        return new MongoCommandException(response, address);
+    }
 }
diff --git a/driver/src/main/com/mongodb/CompoundDBObjectCodec.java b/driver-legacy/src/main/com/mongodb/CompoundDBObjectCodec.java
similarity index 89%
rename from driver/src/main/com/mongodb/CompoundDBObjectCodec.java
rename to driver-legacy/src/main/com/mongodb/CompoundDBObjectCodec.java
index 8a406f0ae82..4d0f0ecff97 100644
--- a/driver/src/main/com/mongodb/CompoundDBObjectCodec.java
+++ b/driver-legacy/src/main/com/mongodb/CompoundDBObjectCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,12 +29,12 @@ class CompoundDBObjectCodec implements Codec<DBObject> {
     private final Encoder<DBObject> encoder;
     private final Decoder<DBObject> decoder;
 
-    public CompoundDBObjectCodec(final Encoder<DBObject> encoder, final Decoder<DBObject> decoder) {
+    CompoundDBObjectCodec(final Encoder<DBObject> encoder, final Decoder<DBObject> decoder) {
         this.encoder = encoder;
         this.decoder = decoder;
     }
 
-    public CompoundDBObjectCodec(final Codec<DBObject> codec) {
+    CompoundDBObjectCodec(final Codec<DBObject> codec) {
         this(codec, codec);
     }
 
diff --git a/driver/src/main/com/mongodb/Cursor.java b/driver-legacy/src/main/com/mongodb/Cursor.java
similarity index 97%
rename from driver/src/main/com/mongodb/Cursor.java
rename to driver-legacy/src/main/com/mongodb/Cursor.java
index dd6993618d6..2ec94ed873b 100644
--- a/driver/src/main/com/mongodb/Cursor.java
+++ b/driver-legacy/src/main/com/mongodb/Cursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DB.java b/driver-legacy/src/main/com/mongodb/DB.java
similarity index 77%
rename from driver/src/main/com/mongodb/DB.java
rename to driver-legacy/src/main/com/mongodb/DB.java
index 2c6e0b2ad3f..f395ed201b1 100644
--- a/driver/src/main/com/mongodb/DB.java
+++ b/driver-legacy/src/main/com/mongodb/DB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,22 @@
 package com.mongodb;
 
 import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.client.internal.MongoIterableImpl;
+import com.mongodb.client.internal.OperationExecutor;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.DBCreateViewOptions;
 import com.mongodb.client.model.ValidationAction;
 import com.mongodb.client.model.ValidationLevel;
 import com.mongodb.connection.BufferProvider;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
 import com.mongodb.operation.CommandReadOperation;
 import com.mongodb.operation.CommandWriteOperation;
 import com.mongodb.operation.CreateCollectionOperation;
-import com.mongodb.operation.CreateUserOperation;
-import com.mongodb.operation.DropUserOperation;
+import com.mongodb.operation.CreateViewOperation;
+import com.mongodb.operation.DropDatabaseOperation;
 import com.mongodb.operation.ListCollectionsOperation;
-import com.mongodb.operation.OperationExecutor;
-import com.mongodb.operation.UpdateUserOperation;
-import com.mongodb.operation.UserExistsOperation;
+import com.mongodb.operation.ReadOperation;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWrapper;
 import org.bson.BsonInt32;
@@ -43,8 +47,11 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static com.mongodb.MongoCredential.createMongoCRCredential;
+import static com.mongodb.DBCollection.createWriteConcernException;
+import static com.mongodb.MongoCredential.createCredential;
+import static com.mongodb.MongoNamespace.checkDatabaseNameValidity;
 import static com.mongodb.ReadPreference.primary;
+import static com.mongodb.assertions.Assertions.notNull;
 import static java.util.Arrays.asList;
 
 /**
@@ -63,6 +70,7 @@
  * @see MongoClient
  */
 @ThreadSafe
+@SuppressWarnings("deprecation")
 public class DB {
     private final Mongo mongo;
     private final String name;
@@ -75,9 +83,7 @@ public class DB {
     private volatile ReadConcern readConcern;
 
     DB(final Mongo mongo, final String name, final OperationExecutor executor) {
-        if (!isValidName(name)) {
-            throw new IllegalArgumentException("Invalid database name format. Database name is either empty or it contains spaces.");
-        }
+        checkDatabaseNameValidity(name);
         this.mongo = mongo;
         this.name = name;
         this.executor = executor;
@@ -91,7 +97,9 @@ public class DB {
      *
      * @param mongo the mongo instance
      * @param name  the database name - must not be empty and cannot contain spaces
+     * @deprecated Prefer {@link MongoClient#getDB(String)}
      */
+    @Deprecated
     public DB(final Mongo mongo, final String name) {
         this(mongo, name, mongo.createOperationExecutor());
     }
@@ -99,12 +107,29 @@ public DB(final Mongo mongo, final String name) {
     /**
      * Gets the Mongo instance
      *
-     * @return the mongo instance that this database was created from.
+     * @return the mongo instance that this database was created from
+     * @deprecated Use {@link #getMongoClient()} instead
      */
+    @Deprecated
     public Mongo getMongo() {
         return mongo;
     }
 
+    /**
+     * Gets the MongoClient instance
+     *
+     * @return the MongoClient instance that this database was constructed from
+     * @throws IllegalStateException if this DB was not created from a MongoClient instance
+     * @since 3.9
+     */
+    public MongoClient getMongoClient() {
+        if (mongo instanceof MongoClient) {
+            return (MongoClient) mongo;
+        } else {
+            throw new IllegalStateException("This DB was not created from a MongoClient.  Use getMongo instead");
+        }
+    }
+
     /**
      * Sets the read preference for this database. Will be used as default for read operations from any collection in this database. See the
      * documentation for {@link ReadPreference} for more information.
@@ -178,7 +203,11 @@ public ReadConcern getReadConcern() {
      *
      * @param name the name of the collection
      * @return the collection
+     * @throws IllegalArgumentException if the name is invalid
+     * @see MongoNamespace#checkCollectionNameValidity(String)
+     * @deprecated there is no replacement for this method
      */
+    @Deprecated
     protected DBCollection doGetCollection(final String name) {
         return getCollection(name);
     }
@@ -188,6 +217,8 @@ protected DBCollection doGetCollection(final String name) {
      *
      * @param name the name of the collection to return
      * @return the collection
+     * @throws IllegalArgumentException if the name is invalid
+     * @see MongoNamespace#checkCollectionNameValidity(String)
      */
     public DBCollection getCollection(final String name) {
         DBCollection collection = collectionCache.get(name);
@@ -213,7 +244,11 @@ public DBCollection getCollection(final String name) {
      * @mongodb.driver.manual reference/command/dropDatabase/ Drop Database
      */
     public void dropDatabase() {
-        executeCommand(new BsonDocument("dropDatabase", new BsonInt32(1)));
+        try {
+            getExecutor().execute(new DropDatabaseOperation(getName(), getWriteConcern()), getReadConcern());
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
     }
 
     /**
@@ -221,7 +256,9 @@ public void dropDatabase() {
      *
      * @param collectionName the name of the collection
      * @return the collection
+     * @deprecated Prefer {@link #getCollection(String)}
      */
+    @Deprecated
     public DBCollection getCollectionFromString(final String collectionName) {
         return getCollection(collectionName);
     }
@@ -243,14 +280,20 @@ public String getName() {
      * @mongodb.driver.manual reference/method/db.getCollectionNames/ getCollectionNames()
      */
     public Set<String> getCollectionNames() {
-        List<String> collectionNames = new OperationIterable<DBObject>(new ListCollectionsOperation<DBObject>(name, commandCodec),
-                                                                       primary(), executor)
-                                       .map(new Function<DBObject, String>() {
-                                           @Override
-                                           public String apply(final DBObject result) {
-                                               return (String) result.get("name");
-                                           }
-                                       }).into(new ArrayList<String>());
+        List<String> collectionNames =
+                new MongoIterableImpl<DBObject>(null, executor, ReadConcern.DEFAULT, primary(),
+                        mongo.getMongoClientOptions().getRetryReads()) {
+                    @Override
+                    public ReadOperation<BatchCursor<DBObject>> asReadOperation() {
+                        return new ListCollectionsOperation<DBObject>(name, commandCodec)
+                                .nameOnly(true);
+                    }
+                }.map(new Function<DBObject, String>() {
+                            @Override
+                            public String apply(final DBObject result) {
+                                return (String) result.get("name");
+                            }
+                        }).into(new ArrayList<String>());
         Collections.sort(collectionNames);
         return new LinkedHashSet<String>(collectionNames);
     }
@@ -274,16 +317,70 @@ public String apply(final DBObject result) {
      * @param collectionName the name of the collection to return
      * @param options        options
      * @return the collection
-     * @throws MongoException if there's a failure
+     * @throws MongoCommandException if the server is unable to create the collection
+     * @throws WriteConcernException if the {@code WriteConcern} specified on this {@code DB} could not be satisfied
+     * @throws MongoException for all other failures
      * @mongodb.driver.manual reference/method/db.createCollection/ createCollection()
      */
-    public DBCollection createCollection(final String collectionName, final DBObject options) {
+    public DBCollection createCollection(final String collectionName, @Nullable final DBObject options) {
         if (options != null) {
-            executor.execute(getCreateCollectionOperation(collectionName, options));
+            try {
+                executor.execute(getCreateCollectionOperation(collectionName, options), getReadConcern());
+            } catch (MongoWriteConcernException e) {
+                throw createWriteConcernException(e);
+            }
         }
         return getCollection(collectionName);
     }
 
+    /**
+     * Creates a view with the given name, backing collection/view name, and aggregation pipeline that defines the view.
+     *
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @return the view as a DBCollection
+     * @throws MongoCommandException if the server is unable to create the collection
+     * @throws WriteConcernException if the {@code WriteConcern} specified on this {@code DB} could not be satisfied
+     * @throws MongoException for all other failures
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    public DBCollection createView(final String viewName, final String viewOn, final List<? extends DBObject> pipeline) {
+        return createView(viewName, viewOn, pipeline, new DBCreateViewOptions());
+    }
+
+    /**
+     * Creates a view with the given name, backing collection/view name, aggregation pipeline, and options that defines the view.
+     *
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @param options  the options for creating the view
+     * @return the view as a DBCollection
+     * @throws MongoCommandException if the server is unable to create the collection
+     * @throws WriteConcernException if the {@code WriteConcern} specified on this {@code DB} could not be satisfied
+     * @throws MongoException for all other failures
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    public DBCollection createView(final String viewName, final String viewOn, final List<? extends DBObject> pipeline,
+                                   final DBCreateViewOptions options) {
+        try {
+            notNull("options", options);
+            DBCollection view = getCollection(viewName);
+            executor.execute(new CreateViewOperation(name, viewName, viewOn, view.preparePipeline(pipeline), writeConcern)
+                                     .collation(options.getCollation()), getReadConcern());
+            return view;
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
+    }
+
+
+    @SuppressWarnings("deprecation")
     private CreateCollectionOperation getCreateCollectionOperation(final String collectionName, final DBObject options) {
         if (options.get("size") != null && !(options.get("size") instanceof Number)) {
             throw new IllegalArgumentException("'size' should be Number");
@@ -354,9 +451,10 @@ private CreateCollectionOperation getCreateCollectionOperation(final String coll
         if (options.get("validationAction") != null) {
             validationAction = ValidationAction.fromString((String) options.get("validationAction"));
         }
-
-        return new CreateCollectionOperation(getName(), collectionName)
+        Collation collation = DBObjectCollationHelper.createCollationFromOptions(options);
+        return new CreateCollectionOperation(getName(), collectionName, getWriteConcern())
                    .capped(capped)
+                   .collation(collation)
                    .sizeInBytes(sizeInBytes)
                    .autoIndex(autoIndex)
                    .maxDocuments(maxDocuments)
@@ -418,7 +516,7 @@ public CommandResult command(final DBObject command, final DBEncoder encoder) {
      * @mongodb.driver.manual tutorial/use-database-commands Commands
      * @since 2.12
      */
-    public CommandResult command(final DBObject command, final ReadPreference readPreference, final DBEncoder encoder) {
+    public CommandResult command(final DBObject command, final ReadPreference readPreference, @Nullable final DBEncoder encoder) {
         try {
             return executeCommand(wrap(command, encoder), getCommandReadPreference(command, readPreference));
         } catch (MongoCommandException ex) {
@@ -491,7 +589,9 @@ public boolean collectionExists(final String collectionName) {
      * @return result of the command execution
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/method/db.eval/ db.eval()
+     * @deprecated The eval command was deprecated in MongoDB 3.0
      */
+    @Deprecated
     public CommandResult doEval(final String code, final Object... args) {
         DBObject commandDocument = new BasicDBObject("$eval", code).append("args", asList(args));
         return executeCommand(wrap(commandDocument));
@@ -506,7 +606,9 @@ public CommandResult doEval(final String code, final Object... args) {
      * @return result of the execution
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/method/db.eval/ db.eval()
+     * @deprecated The eval command was deprecated in MongoDB 3.0
      */
+    @Deprecated
     public Object eval(final String code, final Object... args) {
         CommandResult result = doEval(code, args);
         result.throwOnError();
@@ -519,7 +621,9 @@ public Object eval(final String code, final Object... args) {
      * @return result of the execution
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/dbStats/ Database Stats
+     * @deprecated Prefer {@link #command(DBObject)} to run the dbStats command
      */
+    @Deprecated
     public CommandResult getStats() {
         BsonDocument commandDocument = new BsonDocument("dbStats", new BsonInt32(1)).append("scale", new BsonInt32(1));
         return executeCommand(commandDocument);
@@ -528,6 +632,7 @@ public CommandResult getStats() {
     /**
      * Adds or updates a user for this database
      *
+     * <p>Never create or modify users over an insecure network without the use of TLS.</p>
      * @param userName the user name
      * @param password the password
      * @return the result of executing this operation
@@ -545,6 +650,7 @@ public WriteResult addUser(final String userName, final char[] password) {
     /**
      * Adds or updates a user for this database
      *
+     * <p>Never create or modify users over an insecure network without the use of TLS.</p>
      * @param userName the user name
      * @param password the password
      * @param readOnly if true, user will only be able to read
@@ -557,21 +663,25 @@ public WriteResult addUser(final String userName, final char[] password) {
      */
     @Deprecated
     public WriteResult addUser(final String userName, final char[] password, final boolean readOnly) {
-        MongoCredential credential = createMongoCRCredential(userName, getName(), password);
+        MongoCredential credential = createCredential(userName, getName(), password);
         boolean userExists = false;
         try {
-            userExists = executor.execute(new UserExistsOperation(getName(), userName), primary());
+            userExists = executor.execute(new com.mongodb.operation.UserExistsOperation(getName(), userName), primary(), getReadConcern());
         } catch (MongoCommandException e) {
             if (e.getCode() != 13) {
                 throw e;
             }
         }
-        if (userExists) {
-            executor.execute(new UpdateUserOperation(credential, readOnly));
-            return new WriteResult(1, true, null);
-        } else {
-            executor.execute(new CreateUserOperation(credential, readOnly));
-            return new WriteResult(1, false, null);
+        try {
+            if (userExists) {
+                executor.execute(new com.mongodb.operation.UpdateUserOperation(credential, readOnly, getWriteConcern()), getReadConcern());
+                return new WriteResult(1, true, null);
+            } else {
+                executor.execute(new com.mongodb.operation.CreateUserOperation(credential, readOnly, getWriteConcern()), getReadConcern());
+                return new WriteResult(1, false, null);
+            }
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
         }
     }
 
@@ -586,8 +696,12 @@ public WriteResult addUser(final String userName, final char[] password, final b
      */
     @Deprecated
     public WriteResult removeUser(final String userName) {
-        executor.execute(new DropUserOperation(getName(), userName));
-        return new WriteResult(1, true, null);
+        try {
+            executor.execute(new com.mongodb.operation.DropUserOperation(getName(), userName, getWriteConcern()), getReadConcern());
+            return new WriteResult(1, true, null);
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
     }
 
     /**
@@ -606,7 +720,9 @@ public void slaveOk() {
      *
      * @param option value to be added
      * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     * @deprecated Replaced with {@link DBCursor#addOption(int)}
      */
+    @Deprecated
     public void addOption(final int option) {
         optionHolder.add(option);
     }
@@ -616,7 +732,9 @@ public void addOption(final int option) {
      *
      * @param options bit vector of query options
      * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     * @deprecated Replaced with {@link DBCursor#setOptions(int)}
      */
+    @Deprecated
     public void setOptions(final int options) {
         optionHolder.set(options);
     }
@@ -624,7 +742,9 @@ public void setOptions(final int options) {
     /**
      * Resets the query options.
      * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     * @deprecated Replaced with {@link DBCursor#resetOptions()}
      */
+    @Deprecated
     public void resetOptions() {
         optionHolder.reset();
     }
@@ -634,7 +754,9 @@ public void resetOptions() {
      *
      * @return bit vector of query options
      * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     * @deprecated Replaced with {@link DBCursor#getOptions()}
      */
+    @Deprecated
     public int getOptions() {
         return optionHolder.get();
     }
@@ -646,13 +768,13 @@ public String toString() {
 
     CommandResult executeCommand(final BsonDocument commandDocument) {
         return new CommandResult(executor.execute(new CommandWriteOperation<BsonDocument>(getName(), commandDocument,
-                                                                                          new BsonDocumentCodec())));
+                                                                                          new BsonDocumentCodec()), getReadConcern()));
     }
 
     CommandResult executeCommand(final BsonDocument commandDocument, final ReadPreference readPreference) {
         return new CommandResult(executor.execute(new CommandReadOperation<BsonDocument>(getName(), commandDocument,
                                                                                          new BsonDocumentCodec()),
-                                                  readPreference));
+                                                  readPreference, getReadConcern()));
     }
 
     OperationExecutor getExecutor() {
@@ -667,15 +789,11 @@ BufferProvider getBufferPool() {
         return getMongo().getBufferProvider();
     }
 
-    private boolean isValidName(final String databaseName) {
-        return databaseName.length() != 0 && !databaseName.contains(" ");
-    }
-
     private BsonDocument wrap(final DBObject document) {
         return new BsonDocumentWrapper<DBObject>(document, commandCodec);
     }
 
-    private BsonDocument wrap(final DBObject document, final DBEncoder encoder) {
+    private BsonDocument wrap(final DBObject document, @Nullable final DBEncoder encoder) {
         if (encoder == null) {
             return wrap(document);
         } else {
@@ -691,7 +809,7 @@ private BsonDocument wrap(final DBObject document, final DBEncoder encoder) {
      * @return the read preference to use for the given command.  It will never return {@code null}.
      * @see com.mongodb.ReadPreference
      */
-    ReadPreference getCommandReadPreference(final DBObject command, final ReadPreference requestedPreference) {
+    ReadPreference getCommandReadPreference(final DBObject command, @Nullable final ReadPreference requestedPreference) {
         String comString = command.keySet().iterator().next().toLowerCase();
         boolean primaryRequired = !OBEDIENT_COMMANDS.contains(comString);
 
diff --git a/driver/src/main/com/mongodb/DBAddress.java b/driver-legacy/src/main/com/mongodb/DBAddress.java
similarity index 93%
rename from driver/src/main/com/mongodb/DBAddress.java
rename to driver-legacy/src/main/com/mongodb/DBAddress.java
index 7a43b1a2b6d..b2322249b7f 100644
--- a/driver/src/main/com/mongodb/DBAddress.java
+++ b/driver-legacy/src/main/com/mongodb/DBAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,12 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
 import java.net.InetAddress;
 
+import static com.mongodb.assertions.Assertions.notNull;
+
 /**
  * Represents a database address, which includes the properties of ServerAddress (host and port) and adds a database name.
  *
@@ -53,10 +57,9 @@ public DBAddress(final String urlFormat) {
         _check(_db, "db");
     }
 
+    @Nullable
     static String _getHostSection(final String urlFormat) {
-        if (urlFormat == null) {
-            throw new NullPointerException("urlFormat can't be null");
-        }
+        notNull("urlFormat", urlFormat);
 
         int idx = urlFormat.indexOf("/");
         if (idx >= 0) {
@@ -66,9 +69,7 @@ static String _getHostSection(final String urlFormat) {
     }
 
     static String _getDBSection(final String urlFormat) {
-        if (urlFormat == null) {
-            throw new NullPointerException("urlFormat can't be null");
-        }
+        notNull("urlFormat", urlFormat);
 
         int idx = urlFormat.indexOf("/");
         if (idx >= 0) {
@@ -125,9 +126,7 @@ public DBAddress(final InetAddress inetAddress, final int port, final String dat
     }
 
     static void _check(final String thing, final String name) {
-        if (thing == null) {
-            throw new NullPointerException(name + " can't be null ");
-        }
+        notNull("thing", thing);
 
         String trimmedThing = thing.trim();
         if (trimmedThing.length() == 0) {
diff --git a/driver/src/main/com/mongodb/DBCallback.java b/driver-legacy/src/main/com/mongodb/DBCallback.java
similarity index 94%
rename from driver/src/main/com/mongodb/DBCallback.java
rename to driver-legacy/src/main/com/mongodb/DBCallback.java
index 3c668f5c1f8..c59fef983ee 100644
--- a/driver/src/main/com/mongodb/DBCallback.java
+++ b/driver-legacy/src/main/com/mongodb/DBCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBCallbackFactory.java b/driver-legacy/src/main/com/mongodb/DBCallbackFactory.java
similarity index 95%
rename from driver/src/main/com/mongodb/DBCallbackFactory.java
rename to driver-legacy/src/main/com/mongodb/DBCallbackFactory.java
index 012eee27886..04b71b6c549 100644
--- a/driver/src/main/com/mongodb/DBCallbackFactory.java
+++ b/driver-legacy/src/main/com/mongodb/DBCallbackFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBCollection.java b/driver-legacy/src/main/com/mongodb/DBCollection.java
similarity index 76%
rename from driver/src/main/com/mongodb/DBCollection.java
rename to driver-legacy/src/main/com/mongodb/DBCollection.java
index 9492e0b5eb2..7a4e19f1010 100644
--- a/driver/src/main/com/mongodb/DBCollection.java
+++ b/driver-legacy/src/main/com/mongodb/DBCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,17 @@
 import com.mongodb.bulk.IndexRequest;
 import com.mongodb.bulk.InsertRequest;
 import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.client.internal.MongoBatchCursorAdapter;
+import com.mongodb.client.internal.MongoIterableImpl;
+import com.mongodb.client.internal.OperationExecutor;
+import com.mongodb.client.model.DBCollectionCountOptions;
+import com.mongodb.client.model.DBCollectionDistinctOptions;
+import com.mongodb.client.model.DBCollectionFindAndModifyOptions;
+import com.mongodb.client.model.DBCollectionFindOptions;
+import com.mongodb.client.model.DBCollectionRemoveOptions;
+import com.mongodb.client.model.DBCollectionUpdateOptions;
 import com.mongodb.connection.BufferProvider;
+import com.mongodb.lang.Nullable;
 import com.mongodb.operation.AggregateOperation;
 import com.mongodb.operation.AggregateToCollectionOperation;
 import com.mongodb.operation.BaseWriteOperation;
@@ -35,7 +45,6 @@
 import com.mongodb.operation.FindAndDeleteOperation;
 import com.mongodb.operation.FindAndReplaceOperation;
 import com.mongodb.operation.FindAndUpdateOperation;
-import com.mongodb.operation.FindOperation;
 import com.mongodb.operation.InsertOperation;
 import com.mongodb.operation.ListIndexesOperation;
 import com.mongodb.operation.MapReduceBatchCursor;
@@ -43,8 +52,8 @@
 import com.mongodb.operation.MapReduceToCollectionOperation;
 import com.mongodb.operation.MapReduceWithInlineResultsOperation;
 import com.mongodb.operation.MixedBulkWriteOperation;
-import com.mongodb.operation.OperationExecutor;
 import com.mongodb.operation.ParallelCollectionScanOperation;
+import com.mongodb.operation.ReadOperation;
 import com.mongodb.operation.RenameCollectionOperation;
 import com.mongodb.operation.UpdateOperation;
 import com.mongodb.operation.WriteOperation;
@@ -66,16 +75,17 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static com.mongodb.AggregationOptions.OutputMode.CURSOR;
-import static com.mongodb.AggregationOptions.OutputMode.INLINE;
 import static com.mongodb.BulkWriteHelper.translateBulkWriteResult;
-import static com.mongodb.BulkWriteHelper.translateWriteRequestsToNew;
+import static com.mongodb.MongoNamespace.checkCollectionNameValidity;
 import static com.mongodb.ReadPreference.primary;
 import static com.mongodb.ReadPreference.primaryPreferred;
+import static com.mongodb.assertions.Assertions.notNull;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -119,6 +129,8 @@ public class DBCollection {
     private final DB database;
     private final OperationExecutor executor;
     private final Bytes.OptionHolder optionHolder;
+    private final boolean retryWrites;
+    private final boolean retryReads;
     private volatile ReadPreference readPreference;
     private volatile WriteConcern writeConcern;
     private volatile ReadConcern readConcern;
@@ -135,12 +147,15 @@ public class DBCollection {
      * @param database      the database to which this collections belongs to
      */
     DBCollection(final String name, final DB database, final OperationExecutor executor) {
+        checkCollectionNameValidity(name);
         this.name = name;
         this.database = database;
         this.executor = executor;
         this.optionHolder = new Bytes.OptionHolder(database.getOptionHolder());
         this.objectFactory = new DBCollectionObjectFactory();
         this.objectCodec = new CompoundDBObjectCodec(getDefaultDBObjectCodec());
+        this.retryWrites = database.getMongo().getMongoClientOptions().getRetryWrites();
+        this.retryReads = database.getMongo().getMongoClientOptions().getRetryReads();
     }
 
     /**
@@ -170,6 +185,7 @@ private static BasicDBList toDBList(final BatchCursor<DBObject> source) {
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
@@ -185,6 +201,7 @@ public WriteResult insert(final DBObject document, final WriteConcern writeConce
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
@@ -199,9 +216,8 @@ public WriteResult insert(final DBObject... documents) {
      * @param documents    {@code DBObject}'s to be inserted
      * @param writeConcern {@code WriteConcern} to be used during operation
      * @return the result of the operation
-     * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
-     * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
-     * @throws MongoException if the operation failed for some other reason
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
     public WriteResult insert(final WriteConcern writeConcern, final DBObject... documents) {
@@ -217,6 +233,7 @@ public WriteResult insert(final WriteConcern writeConcern, final DBObject... doc
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
@@ -232,6 +249,7 @@ public WriteResult insert(final DBObject[] documents, final WriteConcern writeCo
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
@@ -248,6 +266,7 @@ public WriteResult insert(final List<? extends DBObject> documents) {
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
@@ -265,6 +284,7 @@ public WriteResult insert(final List<? extends DBObject> documents, final WriteC
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
@@ -282,10 +302,12 @@ public WriteResult insert(final DBObject[] documents, final WriteConcern aWriteC
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
-    public WriteResult insert(final List<? extends DBObject> documents, final WriteConcern aWriteConcern, final DBEncoder dbEncoder) {
+    public WriteResult insert(final List<? extends DBObject> documents, final WriteConcern aWriteConcern,
+                              @Nullable final DBEncoder dbEncoder) {
         return insert(documents, new InsertOptions().writeConcern(aWriteConcern).dbEncoder(dbEncoder));
     }
 
@@ -302,6 +324,7 @@ public WriteResult insert(final List<? extends DBObject> documents, final WriteC
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/insert-documents/ Insert Documents
      */
@@ -319,18 +342,18 @@ public WriteResult insert(final List<? extends DBObject> documents, final Insert
         return insert(insertRequestList, writeConcern, insertOptions.isContinueOnError(), insertOptions.getBypassDocumentValidation());
     }
 
-    private Encoder<DBObject> toEncoder(final DBEncoder dbEncoder) {
+    private Encoder<DBObject> toEncoder(@Nullable final DBEncoder dbEncoder) {
         return dbEncoder != null ? new DBEncoderAdapter(dbEncoder) : objectCodec;
     }
 
     private WriteResult insert(final List<InsertRequest> insertRequestList, final WriteConcern writeConcern,
-                               final boolean continueOnError, final Boolean bypassDocumentValidation) {
-        return executeWriteOperation(new InsertOperation(getNamespace(), !continueOnError, writeConcern, insertRequestList)
+                               final boolean continueOnError, @Nullable final Boolean bypassDocumentValidation) {
+        return executeWriteOperation(new InsertOperation(getNamespace(), !continueOnError, writeConcern, retryWrites, insertRequestList)
                                      .bypassDocumentValidation(bypassDocumentValidation));
     }
 
     WriteResult executeWriteOperation(final BaseWriteOperation operation) {
-        return translateWriteResult(executor.execute(operation));
+        return translateWriteResult(executor.execute(operation, getReadConcern()));
     }
 
     private WriteResult translateWriteResult(final WriteConcernResult writeConcernResult) {
@@ -342,7 +365,7 @@ private WriteResult translateWriteResult(final WriteConcernResult writeConcernRe
                                     writeConcernResult.getUpsertedId());
     }
 
-    private WriteResult translateWriteResult(final int count, final boolean isUpdateOfExisting, final BsonValue upsertedId) {
+    private WriteResult translateWriteResult(final int count, final boolean isUpdateOfExisting, @Nullable final BsonValue upsertedId) {
         Object newUpsertedId = upsertedId == null
                                ? null
                                : getObjectCodec().decode(new BsonDocumentReader(new BsonDocument("_id", upsertedId)),
@@ -366,6 +389,7 @@ private WriteResult translateWriteResult(final int count, final boolean isUpdate
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert or update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/#modify-a-document-with-save-method Save
      */
@@ -389,6 +413,7 @@ public WriteResult save(final DBObject document) {
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the insert or update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/#modify-a-document-with-save-method Save
      */
@@ -408,7 +433,8 @@ private WriteResult replaceOrInsert(final DBObject obj, final Object id, final W
         UpdateRequest replaceRequest = new UpdateRequest(wrap(filter), wrap(obj, objectCodec),
                                                          com.mongodb.bulk.WriteRequest.Type.REPLACE).upsert(true);
 
-        return executeWriteOperation(new UpdateOperation(getNamespace(), false, writeConcern, asList(replaceRequest)));
+        return executeWriteOperation(new UpdateOperation(getNamespace(), false, writeConcern, retryWrites,
+                singletonList(replaceRequest)));
     }
 
     /**
@@ -424,6 +450,7 @@ private WriteResult replaceOrInsert(final DBObject obj, final Object id, final W
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/ Modify Documents
      */
@@ -446,13 +473,13 @@ public WriteResult update(final DBObject query, final DBObject update, final boo
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/ Modify Documents
      */
-    @SuppressWarnings("unchecked")
     public WriteResult update(final DBObject query, final DBObject update, final boolean upsert, final boolean multi,
-                              final WriteConcern concern, final DBEncoder encoder) {
-        return updateImpl(query, update, upsert, multi, concern, null, encoder);
+                              final WriteConcern concern, @Nullable final DBEncoder encoder) {
+        return update(query, update, upsert, multi, concern, null, encoder);
     }
 
     /**
@@ -469,41 +496,18 @@ public WriteResult update(final DBObject query, final DBObject update, final boo
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/ Modify
      * @since 2.14
      */
     public WriteResult update(final DBObject query, final DBObject update, final boolean upsert, final boolean multi,
-                              final WriteConcern concern, final boolean bypassDocumentValidation, final DBEncoder encoder) {
-        return updateImpl(query, update, upsert, multi, concern, bypassDocumentValidation, encoder);
-    }
-
-    private WriteResult updateImpl(final DBObject query, final DBObject update, final boolean upsert, final boolean multi,
-                                   final WriteConcern concern, final Boolean bypassDocumentValidation, final DBEncoder encoder) {
-        if (update == null) {
-            throw new IllegalArgumentException("update can not be null");
-        }
-
-        if (query == null) {
-            throw new IllegalArgumentException("update query can not be null");
-        }
-
-        if (!update.keySet().isEmpty() && update.keySet().iterator().next().startsWith("$")) {
-            UpdateRequest updateRequest = new UpdateRequest(wrap(query), wrap(update, encoder),
-                                                            com.mongodb.bulk.WriteRequest.Type.UPDATE).upsert(upsert).multi(multi);
-
-            return executeWriteOperation(new UpdateOperation(getNamespace(), false, concern, asList(updateRequest))
-                                         .bypassDocumentValidation(bypassDocumentValidation));
-        } else {
-            UpdateRequest replaceRequest = new UpdateRequest(wrap(query), wrap(update, encoder),
-                                                             com.mongodb.bulk.WriteRequest.Type.REPLACE)
-                                           .upsert(upsert);
-            return executeWriteOperation(new UpdateOperation(getNamespace(), true, concern, asList(replaceRequest))
-                                         .bypassDocumentValidation(bypassDocumentValidation));
-        }
+                              final WriteConcern concern, @Nullable final Boolean bypassDocumentValidation,
+                              @Nullable final DBEncoder encoder) {
+        return update(query, update, new DBCollectionUpdateOptions().upsert(upsert).multi(multi)
+                .writeConcern(concern).bypassDocumentValidation(bypassDocumentValidation).encoder(encoder));
     }
 
-
     /**
      * Modify an existing document or documents in collection. The query parameter employs the same query selectors, as used in {@code
      * find()}.
@@ -515,6 +519,7 @@ private WriteResult updateImpl(final DBObject query, final DBObject update, fina
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/ Modify Documents
      */
@@ -530,6 +535,7 @@ public WriteResult update(final DBObject query, final DBObject update, final boo
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/ Modify Documents
      */
@@ -545,6 +551,7 @@ public WriteResult update(final DBObject query, final DBObject update) {
      * @return the result of the operation
      * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/modify-documents/ Modify Documents
      */
@@ -552,6 +559,36 @@ public WriteResult updateMulti(final DBObject query, final DBObject update) {
         return update(query, update, false, true);
     }
 
+    /**
+     * Modify an existing document or documents in collection.
+     *
+     * @param query the selection criteria for the update
+     * @param update the modifications to apply
+     * @param options the options to apply to the update operation
+     * @return the result of the operation
+     * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
+     * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
+     * @throws MongoException if the operation failed for some other reason
+     * @mongodb.driver.manual tutorial/modify-documents/ Modify
+     * @since 3.4
+     */
+    public WriteResult update(final DBObject query, final DBObject update, final DBCollectionUpdateOptions options) {
+        notNull("query", query);
+        notNull("update", update);
+        notNull("options", options);
+        WriteConcern writeConcern = options.getWriteConcern() != null ? options.getWriteConcern() : getWriteConcern();
+        com.mongodb.bulk.WriteRequest.Type updateType = !update.keySet().isEmpty() && update.keySet().iterator().next().startsWith("$")
+                                                                ? com.mongodb.bulk.WriteRequest.Type.UPDATE
+                                                                : com.mongodb.bulk.WriteRequest.Type.REPLACE;
+        UpdateRequest updateRequest = new UpdateRequest(wrap(query), wrap(update, options.getEncoder()), updateType)
+                                              .upsert(options.isUpsert()).multi(options.isMulti())
+                                              .collation(options.getCollation())
+                                              .arrayFilters(wrapAllowNull(options.getArrayFilters(), options.getEncoder()));
+        return executeWriteOperation(new UpdateOperation(getNamespace(), true, writeConcern, retryWrites,
+                singletonList(updateRequest)).bypassDocumentValidation(options.getBypassDocumentValidation()));
+    }
+
     /**
      * Remove documents from a collection.
      *
@@ -559,6 +596,7 @@ public WriteResult updateMulti(final DBObject query, final DBObject update) {
      *              in the collection.
      * @return the result of the operation
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the delete command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/remove-documents/ Remove Documents
      */
@@ -574,11 +612,12 @@ public WriteResult remove(final DBObject query) {
      * @param writeConcern {@code WriteConcern} to be used during operation
      * @return the result of the operation
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the delete command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/remove-documents/ Remove Documents
      */
     public WriteResult remove(final DBObject query, final WriteConcern writeConcern) {
-        return executeWriteOperation(new DeleteOperation(getNamespace(), false, writeConcern, asList(new DeleteRequest(wrap(query)))));
+        return remove(query, new DBCollectionRemoveOptions().writeConcern(writeConcern));
     }
 
     /**
@@ -590,13 +629,34 @@ public WriteResult remove(final DBObject query, final WriteConcern writeConcern)
      * @param encoder      {@code DBEncoder} to be used
      * @return the result of the operation
      * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the delete command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual tutorial/remove-documents/ Remove Documents
      */
     public WriteResult remove(final DBObject query, final WriteConcern writeConcern, final DBEncoder encoder) {
-        DeleteRequest deleteRequest = new DeleteRequest(wrap(query, encoder));
+        return remove(query, new DBCollectionRemoveOptions().writeConcern(writeConcern).encoder(encoder));
+    }
 
-        return executeWriteOperation(new DeleteOperation(getNamespace(), false, writeConcern, asList(deleteRequest)));
+    /**
+     * Remove documents from a collection.
+     *
+     * @param query   the deletion criteria using query operators. Omit the query parameter or pass an empty document to delete all
+     *                documents in the collection.
+     * @param options the options to apply to the delete operation
+     * @return the result of the operation
+     * @throws com.mongodb.WriteConcernException if the write failed due some other failure specific to the delete command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
+     * @throws MongoException if the operation failed for some other reason
+     * @mongodb.driver.manual tutorial/remove-documents/ Remove Documents
+     * @since 3.4
+     */
+    public WriteResult remove(final DBObject query, final DBCollectionRemoveOptions options) {
+        notNull("query", query);
+        notNull("options", options);
+        WriteConcern writeConcern = options.getWriteConcern() != null ? options.getWriteConcern() : getWriteConcern();
+        DeleteRequest deleteRequest = new DeleteRequest(wrap(query, options.getEncoder())).collation(options.getCollation());
+        return executeWriteOperation(new DeleteOperation(getNamespace(), false, writeConcern, retryWrites,
+                singletonList(deleteRequest)));
     }
 
     /**
@@ -673,12 +733,27 @@ public DBCursor find() {
         return find(new BasicDBObject());
     }
 
+    /**
+     * Select documents in collection and get a cursor to the selected documents.
+     *
+     * @param query         the selection criteria using query operators. Omit the query parameter or pass an empty document to return all
+     *                      documents in the collection.
+     * @param options       the options for the find operation.
+     * @return A cursor to the documents that match the query criteria
+     * @mongodb.driver.manual tutorial/query-documents/ Querying
+     * @since 3.4
+     */
+    public DBCursor find(@Nullable final DBObject query, final DBCollectionFindOptions options) {
+        return new DBCursor(this, query, options);
+    }
+
     /**
      * Get a single document from collection.
      *
      * @return A document that satisfies the query specified as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
+    @Nullable
     public DBObject findOne() {
         return findOne(new BasicDBObject());
     }
@@ -690,6 +765,7 @@ public DBObject findOne() {
      * @return A document that satisfies the query specified as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
+    @Nullable
     public DBObject findOne(final DBObject query) {
         return findOne(query, null, null, getReadPreference());
     }
@@ -702,6 +778,7 @@ public DBObject findOne(final DBObject query) {
      * @return A document that satisfies the query specified as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
+    @Nullable
     public DBObject findOne(final DBObject query, final DBObject projection) {
         return findOne(query, projection, null, getReadPreference());
     }
@@ -715,6 +792,7 @@ public DBObject findOne(final DBObject query, final DBObject projection) {
      * @return A document that satisfies the query specified as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
+    @Nullable
     public DBObject findOne(final DBObject query, final DBObject projection, final DBObject sort) {
         return findOne(query, projection, sort, getReadPreference());
     }
@@ -728,6 +806,7 @@ public DBObject findOne(final DBObject query, final DBObject projection, final D
      * @return A document that satisfies the query specified as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
+    @Nullable
     public DBObject findOne(final DBObject query, final DBObject projection, final ReadPreference readPreference) {
         return findOne(query, projection, null, readPreference);
     }
@@ -742,40 +821,11 @@ public DBObject findOne(final DBObject query, final DBObject projection, final R
      * @return A document that satisfies the query specified as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
-    public DBObject findOne(final DBObject query, final DBObject projection, final DBObject sort,
+    @Nullable
+    public DBObject findOne(@Nullable final DBObject query, @Nullable final DBObject projection, @Nullable final DBObject sort,
                             final ReadPreference readPreference) {
-        return findOne(query, projection, sort, readPreference, getReadConcern(), 0, MILLISECONDS);
-    }
-
-    /**
-     * Get a single document from collection.
-     *
-     * @param query          the selection criteria using query operators.
-     * @param projection     specifies which projection MongoDB will return from the documents in the result set.
-     * @param sort           A document whose fields specify the attributes on which to sort the result set.
-     * @param readPreference {@code ReadPreference} to be used for this operation
-     * @param readConcern    {@code ReadConcern} to be used for this operation
-     * @param maxTime        the maximum time that the server will allow this operation to execute before killing it
-     * @param maxTimeUnit    the unit that maxTime is specified in
-     * @return A document that satisfies the query specified as the argument to this method.
-     * @mongodb.driver.manual tutorial/query-documents/ Querying
-     * @since 2.12.0
-     */
-    DBObject findOne(final DBObject query, final DBObject projection, final DBObject sort,
-                     final ReadPreference readPreference, final ReadConcern readConcern,
-                     final long maxTime, final TimeUnit maxTimeUnit) {
-        FindOperation<DBObject> operation = new FindOperation<DBObject>(getNamespace(),
-                                                                            objectCodec)
-                                                    .readConcern(readConcern)
-                                                    .projection(wrapAllowNull(projection))
-                                                    .sort(wrapAllowNull(sort))
-                                                    .limit(-1)
-                                                    .maxTime(maxTime, maxTimeUnit);
-        if (query != null) {
-            operation.filter(wrap(query));
-        }
-        BatchCursor<DBObject> cursor = executor.execute(operation, readPreference);
-        return cursor.hasNext() ? cursor.next().iterator().next() : null;
+        return findOne(query != null ? query : new BasicDBObject(),
+                new DBCollectionFindOptions().projection(projection).sort(sort).readPreference(readPreference));
     }
 
     /**
@@ -785,8 +835,9 @@ DBObject findOne(final DBObject query, final DBObject projection, final DBObject
      * @return A document with '_id' provided as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
+    @Nullable
     public DBObject findOne(final Object id) {
-        return findOne(id, null);
+        return findOne(new BasicDBObject("_id", id), new DBCollectionFindOptions());
     }
 
     /**
@@ -797,8 +848,23 @@ public DBObject findOne(final Object id) {
      * @return A document that satisfies the query specified as the argument to this method.
      * @mongodb.driver.manual tutorial/query-documents/ Querying
      */
+    @Nullable
     public DBObject findOne(final Object id, final DBObject projection) {
-        return findOne(new BasicDBObject("_id", id), projection);
+        return findOne(new BasicDBObject("_id", id), new DBCollectionFindOptions().projection(projection));
+    }
+
+    /**
+     * Get a single document from collection.
+     *
+     * @param query          the selection criteria using query operators.
+     * @param findOptions    the options for the find operation.
+     * @return A document that satisfies the query specified as the argument to this method.
+     * @mongodb.driver.manual tutorial/query-documents/ Querying
+     * @since 3.4
+     */
+    @Nullable
+    public DBObject findOne(@Nullable final DBObject query, final DBCollectionFindOptions findOptions) {
+        return find(query, findOptions).one();
     }
 
     /**
@@ -809,7 +875,7 @@ public DBObject findOne(final Object id, final DBObject projection) {
      * @mongodb.driver.manual reference/command/count/ Count
      */
     public long count() {
-        return getCount(new BasicDBObject(), null);
+        return getCount(new BasicDBObject(), new DBCollectionCountOptions());
     }
 
     /**
@@ -820,8 +886,8 @@ public long count() {
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/count/ Count
      */
-    public long count(final DBObject query) {
-        return getCount(query, null);
+    public long count(@Nullable final DBObject query) {
+        return getCount(query, new DBCollectionCountOptions());
     }
 
     /**
@@ -833,10 +899,24 @@ public long count(final DBObject query) {
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/count/ Count
      */
-    public long count(final DBObject query, final ReadPreference readPreference) {
+    public long count(@Nullable final DBObject query, final ReadPreference readPreference) {
         return getCount(query, null, readPreference);
     }
 
+    /**
+     * Get the count of documents in collection that would match a criteria.
+     *
+     * @param query     specifies the selection criteria
+     * @param options   the options for the count operation.
+     * @return the number of documents that matches selection criteria
+     * @throws MongoException if the operation failed
+     * @mongodb.driver.manual reference/command/count/ Count
+     * @since 3.4
+     */
+    public long count(@Nullable final DBObject query, final DBCollectionCountOptions options) {
+        return getCount(query, options);
+    }
+
     /**
      * Get the count of documents in collection.
      *
@@ -845,7 +925,7 @@ public long count(final DBObject query, final ReadPreference readPreference) {
      * @mongodb.driver.manual reference/command/count/ Count
      */
     public long getCount() {
-        return getCount(new BasicDBObject(), null);
+        return getCount(new BasicDBObject(), new DBCollectionCountOptions());
     }
 
     /**
@@ -868,8 +948,8 @@ public long getCount(final ReadPreference readPreference) {
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/count/ Count
      */
-    public long getCount(final DBObject query) {
-        return getCount(query, null);
+    public long getCount(@Nullable final DBObject query) {
+        return getCount(query, new DBCollectionCountOptions());
     }
 
     /**
@@ -880,8 +960,10 @@ public long getCount(final DBObject query) {
      * @return the number of documents that matches selection criteria
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/count/ Count
+     * @deprecated Prefer {@link #count(DBObject, DBCollectionCountOptions)}
      */
-    public long getCount(final DBObject query, final DBObject projection) {
+    @Deprecated
+    public long getCount(@Nullable final DBObject query, final DBObject projection) {
         return getCount(query, projection, 0, 0);
     }
 
@@ -894,8 +976,10 @@ public long getCount(final DBObject query, final DBObject projection) {
      * @return the number of documents that matches selection criteria
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/count/ Count
+     * @deprecated Prefer {@link #count(DBObject, DBCollectionCountOptions)}
      */
-    public long getCount(final DBObject query, final DBObject projection, final ReadPreference readPreference) {
+    @Deprecated
+    public long getCount(@Nullable final DBObject query, @Nullable final DBObject projection, final ReadPreference readPreference) {
         return getCount(query, projection, 0, 0, readPreference);
     }
 
@@ -909,8 +993,10 @@ public long getCount(final DBObject query, final DBObject projection, final Read
      * @return the number of documents that matches selection criteria
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/count/ Count
+     * @deprecated Prefer {@link #count(DBObject, DBCollectionCountOptions)}
      */
-    public long getCount(final DBObject query, final DBObject projection, final long limit, final long skip) {
+    @Deprecated
+    public long getCount(@Nullable final DBObject query, @Nullable final DBObject projection, final long limit, final long skip) {
         return getCount(query, projection, limit, skip, getReadPreference());
     }
 
@@ -925,41 +1011,48 @@ public long getCount(final DBObject query, final DBObject projection, final long
      * @return the number of documents that matches selection criteria
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/count/ Count
+     * @deprecated Prefer {@link #count(DBObject, DBCollectionCountOptions)}
      */
-    public long getCount(final DBObject query, final DBObject projection, final long limit, final long skip,
+    @Deprecated
+    public long getCount(@Nullable final DBObject query, @Nullable final DBObject projection, final long limit, final long skip,
                          final ReadPreference readPreference) {
-        return getCount(query, limit, skip, readPreference, getReadConcern(), 0, MILLISECONDS);
-    }
-
-    long getCount(final DBObject query, final long limit, final long skip,
-                  final ReadPreference readPreference, final ReadConcern readConcern,
-                  final long maxTime, final TimeUnit maxTimeUnit) {
-        return getCount(query, limit, skip, readPreference, readConcern, maxTime, maxTimeUnit, null);
+        return getCount(query, new DBCollectionCountOptions().limit(limit).skip(skip).readPreference(readPreference));
     }
 
-    long getCount(final DBObject query, final long limit, final long skip,
-                  final ReadPreference readPreference, final ReadConcern readConcern,
-                  final long maxTime, final TimeUnit maxTimeUnit,
-                  final BsonValue hint) {
-
-        if (limit > Integer.MAX_VALUE) {
-            throw new IllegalArgumentException("limit is too large: " + limit);
-        }
-
-        if (skip > Integer.MAX_VALUE) {
-            throw new IllegalArgumentException("skip is too large: " + skip);
-        }
-
+    /**
+     * Get the count of documents in collection that would match a criteria.
+     *
+     * @param query     specifies the selection criteria
+     * @param options   the options for the count operation.
+     * @return the number of documents that matches selection criteria
+     * @throws MongoException if the operation failed
+     * @mongodb.driver.manual reference/command/count/ Count
+     * @since 3.4
+     */
+    public long getCount(@Nullable final DBObject query, final DBCollectionCountOptions options) {
+        notNull("countOptions", options);
         CountOperation operation = new CountOperation(getNamespace())
-                                       .readConcern(readConcern)
-                                       .hint(hint)
-                                       .skip(skip)
-                                       .limit(limit)
-                                       .maxTime(maxTime, maxTimeUnit);
+                                       .skip(options.getSkip())
+                                       .limit(options.getLimit())
+                                       .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                                       .collation(options.getCollation())
+                                       .retryReads(retryReads);
         if (query != null) {
             operation.filter(wrap(query));
         }
-        return executor.execute(operation, readPreference);
+        DBObject hint = options.getHint();
+        if (hint != null) {
+            operation.hint(wrap(hint));
+        } else {
+            String hintString = options.getHintString();
+            if (hintString != null) {
+                operation.hint(new BsonString(hintString));
+            }
+        }
+        ReadPreference optionsReadPreference = options.getReadPreference();
+        ReadConcern optionsReadConcern = options.getReadConcern();
+        return executor.execute(operation, optionsReadPreference != null ? optionsReadPreference : getReadPreference(),
+                optionsReadConcern != null ? optionsReadConcern : getReadConcern());
     }
 
     /**
@@ -984,10 +1077,14 @@ public DBCollection rename(final String newName) {
      * @mongodb.driver.manual reference/command/renameCollection/ Rename Collection
      */
     public DBCollection rename(final String newName, final boolean dropTarget) {
-        executor.execute(new RenameCollectionOperation(getNamespace(),
-                                                       new MongoNamespace(getNamespace().getDatabaseName(),
-                                                                          newName)).dropTarget(dropTarget));
-        return getDB().getCollection(newName);
+        try {
+            executor.execute(new RenameCollectionOperation(getNamespace(),
+                                                           new MongoNamespace(getNamespace().getDatabaseName(), newName), getWriteConcern())
+                                     .dropTarget(dropTarget), getReadConcern());
+            return getDB().getCollection(newName);
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
     }
 
     /**
@@ -1000,7 +1097,9 @@ public DBCollection rename(final String newName, final boolean dropTarget) {
      * @param reduce  specifies an $reduce function, that operates on the documents during the grouping operation
      * @return a document with the grouped records as well as the command meta-data
      * @mongodb.driver.manual reference/command/group/ Group Command
+     * @deprecated The group command was deprecated in MongoDB 3.4
      */
+    @Deprecated
     public DBObject group(final DBObject key, final DBObject cond, final DBObject initial, final String reduce) {
         return group(key, cond, initial, reduce, null);
     }
@@ -1016,9 +1115,11 @@ public DBObject group(final DBObject key, final DBObject cond, final DBObject in
      * @param finalize specifies a Javascript function that runs each item in the result set before final value will be returned
      * @return a document with the grouped records as well as the command meta-data
      * @mongodb.driver.manual reference/command/group/ Group Command
+     * @deprecated The group command was deprecated in MongoDB 3.4
      */
+    @Deprecated
     public DBObject group(final DBObject key, final DBObject cond, final DBObject initial, final String reduce,
-                          final String finalize) {
+                          @Nullable final String finalize) {
         return group(key, cond, initial, reduce, finalize, getReadPreference());
     }
 
@@ -1034,9 +1135,11 @@ public DBObject group(final DBObject key, final DBObject cond, final DBObject in
      * @param readPreference {@link ReadPreference} to be used for this operation
      * @return a document with the grouped records as well as the command meta-data
      * @mongodb.driver.manual reference/command/group/ Group Command
+     * @deprecated The group command was deprecated in MongoDB 3.4
      */
+    @Deprecated
     public DBObject group(final DBObject key, final DBObject cond, final DBObject initial, final String reduce,
-                          final String finalize, final ReadPreference readPreference) {
+                          @Nullable final String finalize, final ReadPreference readPreference) {
         return group(new GroupCommand(this, key, cond, initial, reduce, finalize), readPreference);
     }
 
@@ -1047,7 +1150,9 @@ public DBObject group(final DBObject key, final DBObject cond, final DBObject in
      * @param cmd the group command
      * @return a document with the grouped records as well as the command meta-data
      * @mongodb.driver.manual reference/command/group/ Group Command
+     * @deprecated The group command was deprecated in MongoDB 3.4
      */
+    @Deprecated
     public DBObject group(final GroupCommand cmd) {
         return group(cmd, getReadPreference());
     }
@@ -1060,9 +1165,12 @@ public DBObject group(final GroupCommand cmd) {
      * @param readPreference {@link ReadPreference} to be used for this operation
      * @return a document with the grouped records as well as the command meta-data
      * @mongodb.driver.manual reference/command/group/ Group Command
+     * @deprecated The group command was deprecated in MongoDB 3.4
      */
+    @Deprecated
     public DBObject group(final GroupCommand cmd, final ReadPreference readPreference) {
-        return toDBList(executor.execute(cmd.toOperation(getNamespace(), getDefaultDBObjectCodec()), readPreference));
+        return toDBList(executor.execute(cmd.toOperation(getNamespace(), getDefaultDBObjectCodec(), retryReads), readPreference,
+                getReadConcern()));
     }
 
     /**
@@ -1109,15 +1217,39 @@ public List distinct(final String fieldName, final DBObject query) {
      * @return A {@code List} of the distinct values
      * @mongodb.driver.manual reference/command/distinct Distinct Command
      */
-    @SuppressWarnings("unchecked")
     public List distinct(final String fieldName, final DBObject query, final ReadPreference readPreference) {
-        return new OperationIterable<BsonValue>(new DistinctOperation<BsonValue>(getNamespace(), fieldName,
-                                                new BsonValueCodec())
-                                                .readConcern(getReadConcern())
-                                                .filter(wrap(query)),
-                                                readPreference, executor).map(new Function<BsonValue, Object>() {
+        return distinct(fieldName, new DBCollectionDistinctOptions().filter(query).readPreference(readPreference));
+    }
+
+    /**
+     * Find the distinct values for a specified field across a collection and returns the results in an array.
+     *
+     * @param fieldName  Specifies the field for which to return the distinct values
+     * @param options    the options to apply for this operation
+     * @return A {@code List} of the distinct values
+     * @mongodb.driver.manual reference/command/distinct Distinct Command
+     * @since 3.4
+     */
+    @SuppressWarnings("unchecked")
+    public List distinct(final String fieldName, final DBCollectionDistinctOptions options) {
+        notNull("fieldName", fieldName);
+        return new MongoIterableImpl<BsonValue>(null, executor,
+                                                  options.getReadConcern() != null ? options.getReadConcern() : getReadConcern(),
+                                                  options.getReadPreference() != null ? options.getReadPreference() : getReadPreference(),
+                                                  retryReads) {
+            @Override
+            public ReadOperation<BatchCursor<BsonValue>> asReadOperation() {
+                return new DistinctOperation<BsonValue>(getNamespace(), fieldName, new BsonValueCodec())
+                               .filter(wrapAllowNull(options.getFilter()))
+                               .collation(options.getCollation())
+                               .retryReads(retryReads);
+            }
+        }.map(new Function<BsonValue, Object>() {
             @Override
             public Object apply(final BsonValue bsonValue) {
+                if (bsonValue == null) {
+                    return null;
+                }
                 BsonDocument document = new BsonDocument("value", bsonValue);
                 DBObject obj = getDefaultDBObjectCodec().decode(new BsonDocumentReader(document), DecoderContext.builder().build());
                 return obj.get("value");
@@ -1188,28 +1320,28 @@ public MapReduceOutput mapReduce(final String map, final String reduce, final St
      */
     public MapReduceOutput mapReduce(final MapReduceCommand command) {
         ReadPreference readPreference = command.getReadPreference() == null ? getReadPreference() : command.getReadPreference();
+        Map<String, Object> scope = command.getScope();
+        Boolean jsMode = command.getJsMode();
         if (command.getOutputType() == MapReduceCommand.OutputType.INLINE) {
 
             MapReduceWithInlineResultsOperation<DBObject> operation =
-                new MapReduceWithInlineResultsOperation<DBObject>(getNamespace(),
-                                                                  new BsonJavaScript(command.getMap()),
-                                                                  new BsonJavaScript(command.getReduce()),
-                                                                  getDefaultDBObjectCodec());
-            operation.readConcern(getReadConcern());
-            operation.filter(wrapAllowNull(command.getQuery()));
-            operation.limit(command.getLimit());
-            operation.maxTime(command.getMaxTime(MILLISECONDS), MILLISECONDS);
-            operation.jsMode(command.getJsMode() == null ? false : command.getJsMode());
-            operation.sort(wrapAllowNull(command.getSort()));
-            operation.verbose(command.isVerbose());
-
-            if (command.getScope() != null) {
-                operation.scope(wrap(new BasicDBObject(command.getScope())));
+                    new MapReduceWithInlineResultsOperation<DBObject>(getNamespace(), new BsonJavaScript(command.getMap()),
+                            new BsonJavaScript(command.getReduce()), getDefaultDBObjectCodec())
+                            .filter(wrapAllowNull(command.getQuery()))
+                            .limit(command.getLimit())
+                            .maxTime(command.getMaxTime(MILLISECONDS), MILLISECONDS)
+                            .jsMode(jsMode == null ? false : jsMode)
+                            .sort(wrapAllowNull(command.getSort()))
+                            .verbose(command.isVerbose())
+                            .collation(command.getCollation());
+
+            if (scope != null) {
+                operation.scope(wrap(new BasicDBObject(scope)));
             }
             if (command.getFinalize() != null) {
                 operation.finalizeFunction(new BsonJavaScript(command.getFinalize()));
             }
-            MapReduceBatchCursor<DBObject> executionResult = executor.execute(operation, readPreference);
+            MapReduceBatchCursor<DBObject> executionResult = executor.execute(operation, readPreference, getReadConcern());
             return new MapReduceOutput(command.toDBObject(), executionResult);
         } else {
             String action;
@@ -1231,27 +1363,33 @@ public MapReduceOutput mapReduce(final MapReduceCommand command) {
                 new MapReduceToCollectionOperation(getNamespace(),
                                                    new BsonJavaScript(command.getMap()),
                                                    new BsonJavaScript(command.getReduce()),
-                                                   command.getOutputTarget())
+                                                   command.getOutputTarget(),
+                                                   getWriteConcern())
                     .filter(wrapAllowNull(command.getQuery()))
                     .limit(command.getLimit())
                     .maxTime(command.getMaxTime(MILLISECONDS), MILLISECONDS)
-                    .jsMode(command.getJsMode() == null ? false : command.getJsMode())
+                    .jsMode(jsMode == null ? false : jsMode)
                     .sort(wrapAllowNull(command.getSort()))
                     .verbose(command.isVerbose())
                     .action(action)
                     .databaseName(command.getOutputDB())
-                    .bypassDocumentValidation(command.getBypassDocumentValidation());
+                    .bypassDocumentValidation(command.getBypassDocumentValidation())
+                    .collation(command.getCollation());
 
-            if (command.getScope() != null) {
-                operation.scope(wrap(new BasicDBObject(command.getScope())));
+            if (scope != null) {
+                operation.scope(wrap(new BasicDBObject(scope)));
             }
             if (command.getFinalize() != null) {
                 operation.finalizeFunction(new BsonJavaScript(command.getFinalize()));
             }
-            MapReduceStatistics mapReduceStatistics = executor.execute(operation);
-            DBCollection mapReduceOutputCollection = getMapReduceOutputCollection(command);
-            DBCursor executionResult = mapReduceOutputCollection.find();
-            return new MapReduceOutput(command.toDBObject(), executionResult, mapReduceStatistics, mapReduceOutputCollection);
+            try {
+                MapReduceStatistics mapReduceStatistics = executor.execute(operation, getReadConcern());
+                DBCollection mapReduceOutputCollection = getMapReduceOutputCollection(command);
+                DBCursor executionResult = mapReduceOutputCollection.find();
+                return new MapReduceOutput(command.toDBObject(), executionResult, mapReduceStatistics, mapReduceOutputCollection);
+            } catch (MongoWriteConcernException e) {
+                throw createWriteConcernException(e);
+            }
         }
     }
 
@@ -1260,7 +1398,7 @@ private DBCollection getMapReduceOutputCollection(final MapReduceCommand command
         DB database = requestedDatabaseName != null
                       ? getDB().getSisterDB(requestedDatabaseName)
                       : getDB();
-        return database.getCollection(command.getOutputTarget());
+        return database.getCollection(command.getOutputTargetNonNull());
     }
 
     /**
@@ -1271,7 +1409,7 @@ private DBCollection getMapReduceOutputCollection(final MapReduceCommand command
      * @return the aggregation operation's result set
      * @mongodb.driver.manual core/aggregation-pipeline/ Aggregation
      * @mongodb.server.release 2.2
-     * @deprecated Use {@link com.mongodb.DBCollection#aggregate(java.util.List)} instead
+     * @deprecated Use {@link #aggregate(List, AggregationOptions)} instead
      */
     @Deprecated
     @SuppressWarnings("unchecked")
@@ -1289,7 +1427,9 @@ public AggregationOutput aggregate(final DBObject firstOp, final DBObject... add
      * @return the aggregation's result set
      * @mongodb.driver.manual core/aggregation-pipeline/ Aggregation
      * @mongodb.server.release 2.2
+     * @deprecated Use {@link #aggregate(List, AggregationOptions)} instead
      */
+    @Deprecated
     public AggregationOutput aggregate(final List<? extends DBObject> pipeline) {
         return aggregate(pipeline, getReadPreference());
     }
@@ -1302,10 +1442,12 @@ public AggregationOutput aggregate(final List<? extends DBObject> pipeline) {
      * @return the aggregation's result set
      * @mongodb.driver.manual core/aggregation-pipeline/ Aggregation
      * @mongodb.server.release 2.2
+     * @deprecated Use {@link #aggregate(List, AggregationOptions, ReadPreference)} )} instead
      */
+    @Deprecated
     @SuppressWarnings("unchecked")
     public AggregationOutput aggregate(final List<? extends DBObject> pipeline, final ReadPreference readPreference) {
-        Cursor cursor = aggregate(pipeline, AggregationOptions.builder().outputMode(INLINE).build(), readPreference, false);
+        Cursor cursor = aggregate(pipeline, AggregationOptions.builder().build(), readPreference, false);
 
         if (cursor == null) {
             return new AggregationOutput(Collections.<DBObject>emptyList());
@@ -1315,7 +1457,6 @@ public AggregationOutput aggregate(final List<? extends DBObject> pipeline, fina
                 results.add(cursor.next());
             }
             return new AggregationOutput(results);
-
         }
     }
 
@@ -1344,37 +1485,49 @@ public Cursor aggregate(final List<? extends DBObject> pipeline, final Aggregati
      */
     public Cursor aggregate(final List<? extends DBObject> pipeline, final AggregationOptions options,
                             final ReadPreference readPreference) {
-        return aggregate(pipeline, options, readPreference, true);
+        Cursor cursor = aggregate(pipeline, options, readPreference, true);
+        if (cursor == null) {
+            throw new MongoInternalException("cursor can not be null in this context");
+        }
+        return cursor;
     }
 
+    @SuppressWarnings("deprecation")
+    @Nullable
     private Cursor aggregate(final List<? extends DBObject> pipeline, final AggregationOptions options, final ReadPreference readPreference,
                              final boolean returnCursorForOutCollection) {
-        if (options == null) {
-            throw new IllegalArgumentException("options can not be null");
-        }
+        notNull("options", options);
         List<BsonDocument> stages = preparePipeline(pipeline);
 
         BsonValue outCollection = stages.get(stages.size() - 1).get("$out");
 
         if (outCollection != null) {
-            AggregateToCollectionOperation operation = new AggregateToCollectionOperation(getNamespace(), stages)
+            AggregateToCollectionOperation operation = new AggregateToCollectionOperation(getNamespace(), stages,
+                    getReadConcern(), getWriteConcern())
                                                        .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
                                                        .allowDiskUse(options.getAllowDiskUse())
-                                                       .bypassDocumentValidation(options.getBypassDocumentValidation());
-            executor.execute(operation);
-            if (returnCursorForOutCollection) {
-                return new DBCursor(database.getCollection(outCollection.asString().getValue()), new BasicDBObject(), null, primary());
-            } else {
-                return null;
+                                                       .bypassDocumentValidation(options.getBypassDocumentValidation())
+                                                       .collation(options.getCollation());
+            try {
+                executor.execute(operation, getReadConcern());
+                if (returnCursorForOutCollection) {
+                    return new DBCursor(database.getCollection(outCollection.asString().getValue()), new BasicDBObject(),
+                            new DBCollectionFindOptions().readPreference(primary()).collation(options.getCollation()));
+                } else {
+                    return null;
+                }
+            } catch (MongoWriteConcernException e) {
+                throw createWriteConcernException(e);
             }
         } else {
             AggregateOperation<DBObject> operation = new AggregateOperation<DBObject>(getNamespace(), stages, getDefaultDBObjectCodec())
-                                                         .readConcern(getReadConcern())
-                                                         .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
-                                                         .allowDiskUse(options.getAllowDiskUse())
-                                                         .batchSize(options.getBatchSize())
-                                                         .useCursor(options.getOutputMode() == CURSOR);
-            BatchCursor<DBObject> cursor = executor.execute(operation, readPreference);
+                    .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                    .allowDiskUse(options.getAllowDiskUse())
+                    .batchSize(options.getBatchSize())
+                    .useCursor(options.getOutputMode() == com.mongodb.AggregationOptions.OutputMode.CURSOR)
+                    .collation(options.getCollation())
+                    .retryReads(retryReads);
+            BatchCursor<DBObject> cursor = executor.execute(operation, readPreference, getReadConcern());
             return new MongoCursorAdapter(new MongoBatchCursorAdapter<DBObject>(cursor));
         }
     }
@@ -1393,15 +1546,15 @@ public CommandResult explainAggregate(final List<? extends DBObject> pipeline, f
         AggregateOperation<BsonDocument> operation = new AggregateOperation<BsonDocument>(getNamespace(), preparePipeline(pipeline),
                                                                                           new BsonDocumentCodec())
                                                          .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
-                                                         .allowDiskUse(options.getAllowDiskUse());
-        return new CommandResult(executor.execute(operation.asExplainableOperation(ExplainVerbosity.QUERY_PLANNER), primaryPreferred()));
+                                                         .allowDiskUse(options.getAllowDiskUse())
+                                                         .collation(options.getCollation())
+                                                         .retryReads(retryReads);
+        return new CommandResult(executor.execute(operation.asExplainableOperation(ExplainVerbosity.QUERY_PLANNER), primaryPreferred(),
+                getReadConcern()));
     }
 
     @SuppressWarnings("unchecked")
-    private List<BsonDocument> preparePipeline(final List<? extends DBObject> pipeline) {
-        if (pipeline.isEmpty()) {
-            throw new MongoException("Aggregation pipelines can not be empty");
-        }
+    List<BsonDocument> preparePipeline(final List<? extends DBObject> pipeline) {
         List<BsonDocument> stages = new ArrayList<BsonDocument>();
         for (final DBObject op : pipeline) {
             stages.add(wrap(op));
@@ -1420,17 +1573,20 @@ private List<BsonDocument> preparePipeline(final List<? extends DBObject> pipeli
      * @mongodb.driver.manual reference/command/parallelCollectionScan/ Parallel Collection Scan
      * @mongodb.server.release 2.6
      * @since 2.12
+     * @deprecated the parallelCollectionScan command will be removed in MongoDB 4.2
      */
+    @Deprecated
     public List<Cursor> parallelScan(final ParallelScanOptions options) {
         List<Cursor> cursors = new ArrayList<Cursor>();
         ParallelCollectionScanOperation<DBObject> operation = new ParallelCollectionScanOperation<DBObject>(getNamespace(),
                                                                                                             options.getNumCursors(),
                                                                                                             objectCodec)
-                                                                  .readConcern(getReadConcern())
-                                                                  .batchSize(options.getBatchSize());
+                                                                  .batchSize(options.getBatchSize()).retryReads(retryReads);
+        ReadPreference readPreferenceFromOptions = options.getReadPreference();
         List<BatchCursor<DBObject>> mongoCursors = executor.execute(operation,
-                                                                    options.getReadPreference() != null ? options.getReadPreference()
-                                                                                                        : getReadPreference());
+                                                                    readPreferenceFromOptions != null ? readPreferenceFromOptions
+                                                                                                        : getReadPreference(),
+                getReadConcern());
 
         for (BatchCursor<DBObject> mongoCursor : mongoCursors) {
             cursors.add(new MongoCursorAdapter(new MongoBatchCursorAdapter<DBObject>(mongoCursor)));
@@ -1506,7 +1662,7 @@ public void createIndex(final DBObject keys, final String name) {
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual /administration/indexes-creation/ Index Creation Tutorials
      */
-    public void createIndex(final DBObject keys, final String name, final boolean unique) {
+    public void createIndex(final DBObject keys, @Nullable final String name, final boolean unique) {
         DBObject options = new BasicDBObject();
         if (name != null && name.length() > 0) {
             options.put("name", name);
@@ -1538,7 +1694,11 @@ public void createIndex(final DBObject keys) {
      * @mongodb.driver.manual /administration/indexes-creation/ Index Creation Tutorials
      */
     public void createIndex(final DBObject keys, final DBObject options) {
-        executor.execute(createIndexOperation(keys, options));
+        try {
+            executor.execute(createIndexOperation(keys, options), getReadConcern());
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
     }
 
     /**
@@ -1546,7 +1706,10 @@ public void createIndex(final DBObject keys, final DBObject options) {
      *
      * @return a list of {@code DBObject} to be used as hints.
      * @mongodb.driver.manual reference/operator/meta/hint/ $hint
+     * @deprecated Prefer {@link DBCursor#hint(DBObject)}
      */
+    @Deprecated
+    @Nullable
     public List<DBObject> getHintFields() {
         return hintFields;
     }
@@ -1556,7 +1719,9 @@ public List<DBObject> getHintFields() {
      *
      * @param indexes list of indexes to "hint" or force MongoDB to use when performing the query.
      * @mongodb.driver.manual reference/operator/meta/hint/ $hint
+     * @deprecated Prefer {@link DBCursor#hint(DBObject)}
      */
+    @Deprecated
     public void setHintFields(final List<? extends DBObject> indexes) {
         this.hintFields = new ArrayList<DBObject>(indexes);
     }
@@ -1570,10 +1735,12 @@ public void setHintFields(final List<? extends DBObject> indexes) {
      * @param update the modifications to apply
      * @return pre-modification document
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      */
-    public DBObject findAndModify(final DBObject query, final DBObject sort, final DBObject update) {
+    @Nullable
+    public DBObject findAndModify(@Nullable final DBObject query, @Nullable final DBObject sort, final DBObject update) {
         return findAndModify(query, null, sort, false, update, false, false);
     }
 
@@ -1585,10 +1752,12 @@ public DBObject findAndModify(final DBObject query, final DBObject sort, final D
      * @param update the modifications to apply
      * @return the document as it was before the modifications
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      */
-    public DBObject findAndModify(final DBObject query, final DBObject update) {
+    @Nullable
+    public DBObject findAndModify(@Nullable final DBObject query, final DBObject update) {
         return findAndModify(query, null, null, false, update, false, false);
     }
 
@@ -1598,10 +1767,12 @@ public DBObject findAndModify(final DBObject query, final DBObject update) {
      * @param query specifies the selection criteria for the modification
      * @return the document as it was before the modifications
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      */
-    public DBObject findAndRemove(final DBObject query) {
+    @Nullable
+    public DBObject findAndRemove(@Nullable final DBObject query) {
         return findAndModify(query, null, null, true, null, false, false);
     }
 
@@ -1619,11 +1790,13 @@ public DBObject findAndRemove(final DBObject query) {
      * @return the document as it was before the modifications, unless {@code returnNew} is true, in which case it returns the document
      * after the changes were made
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      */
-    public DBObject findAndModify(final DBObject query, final DBObject fields, final DBObject sort,
-                                  final boolean remove, final DBObject update,
+    @Nullable
+    public DBObject findAndModify(@Nullable final DBObject query, @Nullable final DBObject fields, @Nullable final DBObject sort,
+                                  final boolean remove, @Nullable final DBObject update,
                                   final boolean returnNew, final boolean upsert) {
         return findAndModify(query, fields, sort, remove, update, returnNew, upsert, 0L, MILLISECONDS);
     }
@@ -1643,14 +1816,16 @@ public DBObject findAndModify(final DBObject query, final DBObject fields, final
      * @return the document as it was before the modifications, unless {@code returnNew} is true, in which case it returns the document
      * after the changes were made
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @since 2.14
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      */
-    public DBObject findAndModify(final DBObject query, final DBObject fields, final DBObject sort, final boolean remove,
-                                  final DBObject update, final boolean returnNew,
+    @Nullable
+    public DBObject findAndModify(@Nullable final DBObject query, @Nullable final DBObject fields, @Nullable final DBObject sort,
+                                  final boolean remove, final DBObject update, final boolean returnNew,
                                   final boolean upsert, final WriteConcern writeConcern){
-        return findAndModifyImpl(query, fields, sort, remove, update, returnNew, upsert, null, 0L, MILLISECONDS, writeConcern);
+        return findAndModify(query, fields, sort, remove, update, returnNew, upsert, 0L, MILLISECONDS, writeConcern);
     }
 
     /**
@@ -1670,15 +1845,17 @@ public DBObject findAndModify(final DBObject query, final DBObject fields, final
      * @return the document as it was before the modifications, unless {@code returnNew} is true, in which case it returns the document
      * after the changes were made
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      * @since 2.12.0
      */
-    public DBObject findAndModify(final DBObject query, final DBObject fields, final DBObject sort,
-                                  final boolean remove, final DBObject update,
+    @Nullable
+    public DBObject findAndModify(@Nullable final DBObject query, @Nullable final DBObject fields, @Nullable final DBObject sort,
+                                  final boolean remove, @Nullable final DBObject update,
                                   final boolean returnNew, final boolean upsert,
                                   final long maxTime, final TimeUnit maxTimeUnit) {
-        return findAndModifyImpl(query, fields, sort, remove, update, returnNew, upsert, null, maxTime, maxTimeUnit, getWriteConcern());
+        return findAndModify(query, fields, sort, remove, update, returnNew, upsert, maxTime, maxTimeUnit, getWriteConcern());
 
     }
 
@@ -1700,16 +1877,26 @@ public DBObject findAndModify(final DBObject query, final DBObject fields, final
      * @return the document as it was before the modifications, unless {@code returnNew} is true, in which case it returns the document
      * after the changes were made
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      * @since 2.14.0
      */
-    public DBObject findAndModify(final DBObject query, final DBObject fields, final DBObject sort,
-                                  final boolean remove, final DBObject update,
+    @Nullable
+    public DBObject findAndModify(@Nullable final DBObject query, @Nullable final DBObject fields, @Nullable final DBObject sort,
+                                  final boolean remove, @Nullable final DBObject update,
                                   final boolean returnNew, final boolean upsert,
                                   final long maxTime, final TimeUnit maxTimeUnit,
                                   final WriteConcern writeConcern) {
-        return findAndModifyImpl(query, fields, sort, remove, update, returnNew, upsert, null, maxTime, maxTimeUnit, writeConcern);
+        return findAndModify(query != null ? query : new BasicDBObject(), new DBCollectionFindAndModifyOptions()
+                .projection(fields)
+                .sort(sort)
+                .remove(remove)
+                .update(update)
+                .returnNew(returnNew)
+                .upsert(upsert)
+                .maxTime(maxTime, maxTimeUnit)
+                .writeConcern(writeConcern));
     }
 
     /**
@@ -1730,17 +1917,19 @@ public DBObject findAndModify(final DBObject query, final DBObject fields, final
      * @return the document as it was before the modifications, unless {@code returnNew} is true, in which case it returns the document
      * after the changes were made
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      * @since 2.14.0
      */
+    @Nullable
     public DBObject findAndModify(final DBObject query, final DBObject fields, final DBObject sort,
-                                  final boolean remove, final DBObject update,
+                                  final boolean remove, @Nullable final DBObject update,
                                   final boolean returnNew, final boolean upsert,
                                   final boolean bypassDocumentValidation,
                                   final long maxTime, final TimeUnit maxTimeUnit) {
-        return findAndModifyImpl(query, fields, sort, remove, update, returnNew, upsert, bypassDocumentValidation, maxTime, maxTimeUnit,
-                                 getWriteConcern());
+        return findAndModify(query, fields, sort, remove, update, returnNew, upsert, bypassDocumentValidation, maxTime, maxTimeUnit,
+                getWriteConcern());
     }
 
     /**
@@ -1762,65 +1951,91 @@ public DBObject findAndModify(final DBObject query, final DBObject fields, final
      * @return the document as it was before the modifications, unless {@code returnNew} is true, in which case it returns the document
      * after the changes were made
      * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed for some other reason
      * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
      * @since 2.14.0
      */
-    public DBObject findAndModify(final DBObject query, final DBObject fields, final DBObject sort,
-                                  final boolean remove, final DBObject update,
+    public DBObject findAndModify(@Nullable final DBObject query, @Nullable final DBObject fields, @Nullable final DBObject sort,
+                                  final boolean remove, @Nullable final DBObject update,
                                   final boolean returnNew, final boolean upsert,
                                   final boolean bypassDocumentValidation,
                                   final long maxTime, final TimeUnit maxTimeUnit,
                                   final WriteConcern writeConcern) {
-        return findAndModifyImpl(query, fields, sort, remove, update, returnNew, upsert, bypassDocumentValidation, maxTime, maxTimeUnit,
-                                 writeConcern);
+        return findAndModify(query != null ? query : new BasicDBObject(), new DBCollectionFindAndModifyOptions()
+                .projection(fields)
+                .sort(sort)
+                .remove(remove)
+                .update(update)
+                .returnNew(returnNew)
+                .upsert(upsert)
+                .bypassDocumentValidation(bypassDocumentValidation)
+                .maxTime(maxTime, maxTimeUnit)
+                .writeConcern(writeConcern));
     }
 
-    private DBObject findAndModifyImpl(final DBObject query, final DBObject fields, final DBObject sort,
-                                       final boolean remove, final DBObject update,
-                                       final boolean returnNew, final boolean upsert,
-                                       final Boolean bypassDocumentValidation,
-                                       final long maxTime, final TimeUnit maxTimeUnit,
-                                       final WriteConcern writeConcern) {
+    /**
+     * Atomically modify and return a single document. By default, the returned document does not include the modifications made on the
+     * update.
+     *
+     * @param query    specifies the selection criteria for the modification
+     * @param options  the options regarding the find and modify operation
+     * @return the document as it was before the modifications, unless {@code oprtions.returnNew} is true, in which case it returns the
+     * document after the changes were made
+     * @throws WriteConcernException if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
+     * @throws MongoException if the operation failed for some other reason
+     * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
+     * @since 3.4
+     */
+    public DBObject findAndModify(final DBObject query, final DBCollectionFindAndModifyOptions options) {
+        notNull("query", query);
+        notNull("options", options);
+        WriteConcern optionsWriteConcern = options.getWriteConcern();
+        WriteConcern writeConcern = optionsWriteConcern != null ? optionsWriteConcern : getWriteConcern();
         WriteOperation<DBObject> operation;
-        if (remove) {
-            operation = new FindAndDeleteOperation<DBObject>(getNamespace(), writeConcern, objectCodec)
+        if (options.isRemove()) {
+            operation = new FindAndDeleteOperation<DBObject>(getNamespace(), writeConcern, retryWrites, objectCodec)
                         .filter(wrapAllowNull(query))
-                        .projection(wrapAllowNull(fields))
-                        .sort(wrapAllowNull(sort))
-                        .maxTime(maxTime, maxTimeUnit);
+                        .projection(wrapAllowNull(options.getProjection()))
+                        .sort(wrapAllowNull(options.getSort()))
+                        .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                        .collation(options.getCollation());
         } else {
+            DBObject update = options.getUpdate();
             if (update == null) {
-                throw new IllegalArgumentException("Update document can't be null");
+                throw new IllegalArgumentException("update can not be null unless it's a remove");
             }
             if (!update.keySet().isEmpty() && update.keySet().iterator().next().charAt(0) == '$') {
-                operation = new FindAndUpdateOperation<DBObject>(getNamespace(), writeConcern, objectCodec, wrapAllowNull(update))
-                            .filter(wrap(query))
-                            .projection(wrapAllowNull(fields))
-                            .sort(wrapAllowNull(sort))
-                            .returnOriginal(!returnNew)
-                            .upsert(upsert)
-                            .maxTime(maxTime, maxTimeUnit)
-                            .bypassDocumentValidation(bypassDocumentValidation);
+                operation = new FindAndUpdateOperation<DBObject>(getNamespace(), writeConcern, retryWrites, objectCodec,
+                        wrap(update))
+                        .filter(wrap(query))
+                        .projection(wrapAllowNull(options.getProjection()))
+                        .sort(wrapAllowNull(options.getSort()))
+                        .returnOriginal(!options.returnNew())
+                        .upsert(options.isUpsert())
+                        .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                        .bypassDocumentValidation(options.getBypassDocumentValidation())
+                        .collation(options.getCollation())
+                        .arrayFilters(wrapAllowNull(options.getArrayFilters(), (Encoder<DBObject>) null));
             } else {
-                operation = new FindAndReplaceOperation<DBObject>(getNamespace(), writeConcern, objectCodec, wrap(update))
-                            .filter(wrapAllowNull(query))
-                            .projection(wrapAllowNull(fields))
-                            .sort(wrapAllowNull(sort))
-                            .returnOriginal(!returnNew)
-                            .upsert(upsert)
-                            .maxTime(maxTime, maxTimeUnit)
-                            .bypassDocumentValidation(bypassDocumentValidation);
+                operation = new FindAndReplaceOperation<DBObject>(getNamespace(), writeConcern, retryWrites, objectCodec,
+                        wrap(update))
+                        .filter(wrap(query))
+                        .projection(wrapAllowNull(options.getProjection()))
+                        .sort(wrapAllowNull(options.getSort()))
+                        .returnOriginal(!options.returnNew())
+                        .upsert(options.isUpsert())
+                        .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
+                        .bypassDocumentValidation(options.getBypassDocumentValidation())
+                        .collation(options.getCollation());
             }
         }
 
         try {
-            return executor.execute(operation);
+            return executor.execute(operation, getReadConcern());
         } catch (MongoWriteConcernException e) {
-            throw new WriteConcernException(new BsonDocument("code", new BsonInt32(e.getWriteConcernError().getCode()))
-                                           .append("errmsg", new BsonString(e.getWriteConcernError().getMessage())),
-                                            e.getServerAddress(),
-                                            e.getWriteResult());
+            throw createWriteConcernException(e);
         }
     }
 
@@ -1909,7 +2124,6 @@ public ReadConcern getReadConcern() {
         return database.getReadConcern();
     }
 
-
     /**
      * Makes this query ok to run on a slave node
      *
@@ -1925,7 +2139,9 @@ public void slaveOk() {
      *
      * @param option value to be added
      * @mongodb.driver.manual reference/method/cursor.addOption/#flags Query Flags
+     * @deprecated Replaced with {@link DBCursor#addOption(int)}
      */
+    @Deprecated
     public void addOption(final int option) {
         optionHolder.add(option);
     }
@@ -1934,7 +2150,9 @@ public void addOption(final int option) {
      * Resets the default query options
      *
      * @mongodb.driver.manual reference/method/cursor.addOption/#flags Query Flags
+     * @deprecated Replaced with {@link DBCursor#resetOptions()}
      */
+    @Deprecated
     public void resetOptions() {
         optionHolder.reset();
     }
@@ -1944,7 +2162,9 @@ public void resetOptions() {
      *
      * @return bit vector of query options
      * @mongodb.driver.manual reference/method/cursor.addOption/#flags Query Flags
+     * @deprecated Replaced with {@link DBCursor#getOptions()}
      */
+    @Deprecated
     public int getOptions() {
         return optionHolder.get();
     }
@@ -1954,7 +2174,9 @@ public int getOptions() {
      *
      * @param options bit vector of query options
      * @mongodb.driver.manual reference/method/cursor.addOption/#flags Query Flags
+     * @deprecated Replaced with {@link DBCursor#setOptions(int)}
      */
+    @Deprecated
     public void setOptions(final int options) {
         optionHolder.set(options);
     }
@@ -1962,11 +2184,16 @@ public void setOptions(final int options) {
     /**
      * Drops (deletes) this collection from the database. Use with care.
      *
+     * @throws com.mongodb.MongoCommandException if the write failed due to a specific command exception
      * @throws MongoException if the operation failed
      * @mongodb.driver.manual reference/command/drop/ Drop Command
      */
     public void drop() {
-        executor.execute(new DropCollectionOperation(getNamespace()));
+        try {
+            executor.execute(new DropCollectionOperation(getNamespace(), getWriteConcern()), getReadConcern());
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
     }
 
     /**
@@ -1983,7 +2210,7 @@ public synchronized DBDecoderFactory getDBDecoderFactory() {
      *
      * @param factory the factory to set.
      */
-    public synchronized void setDBDecoderFactory(final DBDecoderFactory factory) {
+    public synchronized void setDBDecoderFactory(@Nullable final DBDecoderFactory factory) {
         this.decoderFactory = factory;
 
         //Are we are using default factory?
@@ -2008,7 +2235,7 @@ public synchronized DBEncoderFactory getDBEncoderFactory() {
      *
      * @param factory the factory to set.
      */
-    public synchronized void setDBEncoderFactory(final DBEncoderFactory factory) {
+    public synchronized void setDBEncoderFactory(@Nullable final DBEncoderFactory factory) {
         this.encoderFactory = factory;
 
         //Are we are using default factory?
@@ -2027,8 +2254,12 @@ public synchronized void setDBEncoderFactory(final DBEncoderFactory factory) {
      * @mongodb.driver.manual core/indexes/ Indexes
      */
     public List<DBObject> getIndexInfo() {
-        return new OperationIterable<DBObject>(new ListIndexesOperation<DBObject>(getNamespace(), getDefaultDBObjectCodec()),
-                                               primary(), executor).into(new ArrayList<DBObject>());
+        return new MongoIterableImpl<DBObject>(null, executor, ReadConcern.DEFAULT, primary(), retryReads) {
+            @Override
+            public ReadOperation<BatchCursor<DBObject>> asReadOperation() {
+                return new ListIndexesOperation<DBObject>(getNamespace(), getDefaultDBObjectCodec()).retryReads(retryReads);
+            }
+        }.into(new ArrayList<DBObject>());
     }
 
     /**
@@ -2040,7 +2271,11 @@ public List<DBObject> getIndexInfo() {
      * @mongodb.driver.manual core/indexes/ Indexes
      */
     public void dropIndex(final DBObject index) {
-        dropIndex(getIndexNameFromIndexFields(index));
+        try {
+            executor.execute(new DropIndexOperation(getNamespace(), wrap(index), getWriteConcern()), getReadConcern());
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
     }
 
     /**
@@ -2051,7 +2286,11 @@ public void dropIndex(final DBObject index) {
      * @mongodb.driver.manual core/indexes/ Indexes
      */
     public void dropIndex(final String indexName) {
-        executor.execute(new DropIndexOperation(getNamespace(), indexName));
+        try {
+            executor.execute(new DropIndexOperation(getNamespace(), indexName, getWriteConcern()), getReadConcern());
+        } catch (MongoWriteConcernException e) {
+            throw createWriteConcernException(e);
+        }
     }
 
     /**
@@ -2193,20 +2432,26 @@ BulkWriteResult executeBulkWriteOperation(final boolean ordered, final Boolean b
                                               final WriteConcern writeConcern) {
         try {
             return translateBulkWriteResult(executor.execute(new MixedBulkWriteOperation(getNamespace(),
-                                                                                         translateWriteRequestsToNew(writeRequests,
-                                                                                                                     getObjectCodec()),
-                                                                                         ordered, writeConcern)
-                                                             .bypassDocumentValidation(bypassDocumentValidation)),
-                                            getObjectCodec());
+                            translateWriteRequestsToNew(writeRequests), ordered, writeConcern, false)
+                            .bypassDocumentValidation(bypassDocumentValidation), getReadConcern()), getObjectCodec());
         } catch (MongoBulkWriteException e) {
             throw BulkWriteHelper.translateBulkWriteException(e, MongoClient.getDefaultCodecRegistry().get(DBObject.class));
         }
     }
 
-    DBObjectCodec getDefaultDBObjectCodec() {
-        return new DBObjectCodec(MongoClient.getDefaultCodecRegistry(),
+    private List<com.mongodb.bulk.WriteRequest> translateWriteRequestsToNew(final List<WriteRequest> writeRequests) {
+        List<com.mongodb.bulk.WriteRequest> retVal = new ArrayList<com.mongodb.bulk.WriteRequest>(writeRequests.size());
+        for (WriteRequest cur : writeRequests) {
+            retVal.add(cur.toNew(this));
+        }
+        return retVal;
+    }
+
+    Codec<DBObject> getDefaultDBObjectCodec() {
+        return new DBObjectCodec(getDB().getMongoClient().getCodecRegistry(),
                                  DBObjectCodec.getDefaultBsonTypeClassMap(),
-                                 getObjectFactory());
+                                 getObjectFactory())
+                .withUuidRepresentation(getDB().getMongoClient().getMongoClientOptions().getUuidRepresentation());
     }
 
     private <T> T convertOptionsToType(final DBObject options, final String field, final Class<T> clazz) {
@@ -2299,33 +2544,10 @@ private CreateIndexesOperation createIndexOperation(final DBObject key, final DB
         if (options.containsField("partialFilterExpression")) {
             request.partialFilterExpression(wrap(convertOptionsToType(options, "partialFilterExpression", DBObject.class)));
         }
-
-        return new CreateIndexesOperation(getNamespace(), asList(request));
-    }
-
-    private String getIndexNameFromIndexFields(final DBObject index) {
-        StringBuilder indexName = new StringBuilder();
-        for (final String keyNames : index.keySet()) {
-            if (indexName.length() != 0) {
-                indexName.append('_');
-            }
-            indexName.append(keyNames).append('_');
-            Object keyType = index.get(keyNames);
-            if (keyType instanceof Integer) {
-                List<Integer> validIndexTypes = asList(1, -1);
-                if (!validIndexTypes.contains(keyType)) {
-                    throw new UnsupportedOperationException("Unsupported index type: " + keyType);
-                }
-                indexName.append(((Integer) keyType));
-            } else if (keyType instanceof String) {
-                List<String> validIndexTypes = asList("2d", "2dsphere", "text", "geoHaystack", "hashed");
-                if (!validIndexTypes.contains(keyType)) {
-                    throw new UnsupportedOperationException("Unsupported index type: " + keyType);
-                }
-                indexName.append(((String) keyType).replace(' ', '_'));
-            }
+        if (options.containsField("collation")) {
+            request.collation(DBObjectCollationHelper.createCollationFromOptions(options));
         }
-        return indexName.toString();
+        return new CreateIndexesOperation(getNamespace(), singletonList(request), writeConcern);
     }
 
     Codec<DBObject> getObjectCodec() {
@@ -2344,18 +2566,37 @@ BufferProvider getBufferPool() {
         return getDB().getBufferPool();
     }
 
-    BsonDocument wrapAllowNull(final DBObject document) {
+    @Nullable
+    BsonDocument wrapAllowNull(@Nullable final DBObject document) {
         if (document == null) {
             return null;
         }
         return wrap(document);
     }
 
+    @Nullable
+    List<BsonDocument> wrapAllowNull(@Nullable final List<? extends DBObject> documentList, @Nullable final DBEncoder encoder) {
+        return wrapAllowNull(documentList, encoder == null ? null : new DBEncoderAdapter(encoder));
+    }
+
+    @Nullable
+    List<BsonDocument> wrapAllowNull(@Nullable final List<? extends DBObject> documentList, @Nullable final Encoder<DBObject> encoder) {
+        if (documentList == null) {
+            return null;
+        }
+        List<BsonDocument> wrappedDocumentList = new ArrayList<BsonDocument>(documentList.size());
+        for (DBObject cur : documentList) {
+            wrappedDocumentList.add(encoder == null ? wrap(cur) : wrap(cur, encoder));
+        }
+        return wrappedDocumentList;
+    }
+
+
     BsonDocument wrap(final DBObject document) {
         return new BsonDocumentWrapper<DBObject>(document, getDefaultDBObjectCodec());
     }
 
-    BsonDocument wrap(final DBObject document, final DBEncoder encoder) {
+    BsonDocument wrap(final DBObject document, @Nullable final DBEncoder encoder) {
         if (encoder == null) {
             return wrap(document);
         } else {
@@ -2363,11 +2604,19 @@ BsonDocument wrap(final DBObject document, final DBEncoder encoder) {
         }
     }
 
-    BsonDocument wrap(final DBObject document, final Encoder<DBObject> encoder) {
+    BsonDocument wrap(final DBObject document, @Nullable final Encoder<DBObject> encoder) {
         if (encoder == null) {
             return wrap(document);
         } else {
             return new BsonDocumentWrapper<DBObject>(document, encoder);
         }
     }
+
+    static WriteConcernException createWriteConcernException(final MongoWriteConcernException e) {
+        return new WriteConcernException(new BsonDocument("code", new BsonInt32(e.getWriteConcernError().getCode()))
+                                                .append("errmsg", new BsonString(e.getWriteConcernError().getMessage())),
+                                               e.getServerAddress(),
+                                               e.getWriteResult());
+    }
+
 }
diff --git a/driver/src/main/com/mongodb/DBCollectionObjectFactory.java b/driver-legacy/src/main/com/mongodb/DBCollectionObjectFactory.java
similarity index 87%
rename from driver/src/main/com/mongodb/DBCollectionObjectFactory.java
rename to driver-legacy/src/main/com/mongodb/DBCollectionObjectFactory.java
index bfb5e9d0fbf..81d10036104 100644
--- a/driver/src/main/com/mongodb/DBCollectionObjectFactory.java
+++ b/driver-legacy/src/main/com/mongodb/DBCollectionObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,20 @@
 
 import com.mongodb.annotations.Immutable;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @Immutable
+@SuppressWarnings("deprecation")
 final class DBCollectionObjectFactory implements DBObjectFactory {
 
     private final Map<List<String>, Class<? extends DBObject>> pathToClassMap;
     private final ReflectionDBObject.JavaWrapper wrapper;
 
-    public DBCollectionObjectFactory() {
+    DBCollectionObjectFactory() {
         this(Collections.<List<String>, Class<? extends DBObject>>emptyMap(), null);
     }
 
@@ -48,11 +50,15 @@ public DBObject getInstance() {
     public DBObject getInstance(final List<String> path) {
         Class<? extends DBObject> aClass = getClassForPath(path);
         try {
-            return aClass.newInstance();
+            return aClass.getDeclaredConstructor().newInstance();
         } catch (InstantiationException e) {
             throw createInternalException(aClass, e);
         } catch (IllegalAccessException e) {
             throw createInternalException(aClass, e);
+        } catch (NoSuchMethodException e) {
+            throw createInternalException(aClass, e);
+        } catch (InvocationTargetException e) {
+            throw createInternalException(aClass, e.getTargetException());
         }
     }
 
@@ -89,7 +95,7 @@ private boolean isReflectionDBObject(final Class<? extends DBObject> aClass) {
         return aClass != null && ReflectionDBObject.class.isAssignableFrom(aClass);
     }
 
-    private MongoInternalException createInternalException(final Class<? extends DBObject> aClass, final Exception e) {
+    private MongoInternalException createInternalException(final Class<? extends DBObject> aClass, final Throwable e) {
         throw new MongoInternalException("Can't instantiate class " + aClass, e);
     }
 }
diff --git a/driver-legacy/src/main/com/mongodb/DBCursor.java b/driver-legacy/src/main/com/mongodb/DBCursor.java
new file mode 100644
index 00000000000..b55a14697aa
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/DBCursor.java
@@ -0,0 +1,1129 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.internal.MongoBatchCursorAdapter;
+import com.mongodb.client.internal.OperationExecutor;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.DBCollectionCountOptions;
+import com.mongodb.client.model.DBCollectionFindOptions;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.FindOperation;
+import org.bson.codecs.Decoder;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.DBObjects.toDBObject;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * <p>An iterator over database results. Doing a {@code find()} query on a collection returns a {@code DBCursor}.</p>
+ * <p> An application should ensure that a cursor is closed in all circumstances, e.g. using a try-with-resources statement:</p>
+ * <blockquote><pre>
+ *    try (DBCursor cursor = collection.find(query)) {
+ *        while (cursor.hasNext()) {
+ *            System.out.println(cursor.next();
+ *        }
+ *    }
+ * </pre></blockquote>
+ *
+ * <p><b>Warning:</b> Calling {@code toArray} or {@code length} on a DBCursor will irrevocably turn it into an array.  This means that, if
+ * the cursor was iterating over ten million results (which it was lazily fetching from the database), suddenly there will be a ten-million
+ * element array in memory.  Before converting to an array, make sure that there are a reasonable number of results using {@code skip()} and
+ * {@code limit()}.
+ *
+ * <p>For example, to get an array of the 1000-1100th elements of a cursor, use</p>
+ *
+ * <pre>{@code
+ *    List<DBObject> obj = collection.find(query).skip(1000).limit(100).toArray();
+ * }</pre>
+ *
+ * See {@link Mongo#getDB(String)} for further information about the effective deprecation of this class.
+ *
+ * @mongodb.driver.manual core/read-operations Read Operations
+ */
+@NotThreadSafe
+@SuppressWarnings("deprecation")
+public class DBCursor implements Cursor, Iterable<DBObject> {
+    private final DBCollection collection;
+    private final DBObject filter;
+    private final DBCollectionFindOptions findOptions;
+    private final OperationExecutor executor;
+    private final boolean retryReads;
+    private int options;
+    private DBDecoderFactory decoderFactory;
+    private Decoder<DBObject> decoder;
+    private IteratorOrArray iteratorOrArray;
+    private DBObject currentObject;
+    private int numSeen;
+    private boolean closed;
+    private final List<DBObject> all = new ArrayList<DBObject>();
+    private MongoCursor<DBObject> cursor;
+    // This allows us to easily enable/disable finalizer for cleaning up un-closed cursors
+    @SuppressWarnings("UnusedDeclaration")// IDEs will say it can be converted to a local variable, resist the urge
+    private OptionalFinalizer optionalFinalizer;
+
+    /**
+     * Initializes a new database cursor.
+     *
+     * @param collection     collection to use
+     * @param query          the query filter to apply
+     * @param fields         keys to return from the query
+     * @param readPreference the read preference for this query
+     */
+    public DBCursor(final DBCollection collection, final DBObject query, @Nullable final DBObject fields,
+                    @Nullable final ReadPreference readPreference) {
+        this(collection, query, fields, readPreference, true);
+    }
+
+    /**
+     * Initializes a new database cursor.
+     *
+     * @param collection     collection to use
+     * @param query          the query filter to apply
+     * @param fields         keys to return from the query
+     * @param readPreference the read preference for this query
+     * @param retryReads     true if reads should be retried
+     */
+    public DBCursor(final DBCollection collection, final DBObject query, @Nullable final DBObject fields,
+                    @Nullable final ReadPreference readPreference, final boolean retryReads) {
+        this(collection, query, new DBCollectionFindOptions().projection(fields).readPreference(readPreference), retryReads);
+
+        addOption(collection.getOptions());
+        DBObject indexKeys = lookupSuitableHints(query, collection.getHintFields());
+        if (indexKeys != null) {
+            hint(indexKeys);
+        }
+    }
+
+    DBCursor(final DBCollection collection, @Nullable final DBObject filter, final DBCollectionFindOptions findOptions) {
+        this(collection, filter, findOptions, true);
+    }
+
+    DBCursor(final DBCollection collection, @Nullable final DBObject filter, final DBCollectionFindOptions findOptions,
+             final boolean retryReads) {
+        this(collection, filter, findOptions, collection.getExecutor(), collection.getDBDecoderFactory(),
+                collection.getObjectCodec(), retryReads);
+    }
+
+    private DBCursor(final DBCollection collection, @Nullable final DBObject filter, final DBCollectionFindOptions findOptions,
+                     final OperationExecutor executor, final DBDecoderFactory decoderFactory, final Decoder<DBObject> decoder,
+                     final boolean retryReads) {
+        this.collection = notNull("collection", collection);
+        this.filter = filter;
+        this.executor = notNull("executor", executor);
+        this.findOptions = notNull("findOptions", findOptions.copy());
+        this.decoderFactory = decoderFactory;
+        this.decoder = notNull("decoder", decoder);
+        this.retryReads = retryReads;
+    }
+
+    /**
+     * Creates a copy of an existing database cursor. The new cursor is an iterator, even if the original was an array.
+     *
+     * @return the new cursor
+     */
+    public DBCursor copy() {
+        return new DBCursor(collection, filter, findOptions, executor, decoderFactory, decoder, retryReads);
+    }
+
+    /**
+     * Checks if there is another object available.
+     *
+     * <p><em>Note</em>: Automatically adds the {@link Bytes#QUERYOPTION_AWAITDATA} option to any cursors with the
+     * {@link Bytes#QUERYOPTION_TAILABLE} option set. For non blocking tailable cursors see {@link #tryNext }.</p>
+     *
+     * @return true if there is another object available
+     * @mongodb.driver.manual /core/cursors/#cursor-batches Cursor Batches
+     */
+    @Override
+    public boolean hasNext() {
+        if (closed) {
+            throw new IllegalStateException("Cursor has been closed");
+        }
+
+        if (cursor == null) {
+            FindOperation<DBObject> operation = getQueryOperation(decoder);
+            if (operation.getCursorType() == CursorType.Tailable) {
+                operation.cursorType(CursorType.TailableAwait);
+            }
+            initializeCursor(operation);
+        }
+
+        boolean hasNext = cursor.hasNext();
+        setServerCursorOnFinalizer(cursor.getServerCursor());
+        return hasNext;
+    }
+
+    /**
+     * Returns the object the cursor is at and moves the cursor ahead by one.
+     *
+     * <p><em>Note</em>: Automatically adds the {@link Bytes#QUERYOPTION_AWAITDATA} option to any cursors with the
+     * {@link Bytes#QUERYOPTION_TAILABLE} option set. For non blocking tailable cursors see {@link #tryNext }.</p>
+     *
+     * @return the next element
+     * @mongodb.driver.manual /core/cursors/#cursor-batches Cursor Batches
+     */
+    @Override
+    public DBObject next() {
+        checkIteratorOrArray(IteratorOrArray.ITERATOR);
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+
+        return nextInternal();
+    }
+
+    /**
+     * Non blocking check for tailable cursors to see if another object is available.
+     *
+     * <p>Returns the object the cursor is at and moves the cursor ahead by one or
+     * return null if no documents is available.</p>
+     *
+     * @return the next element or null
+     * @throws MongoException if failed
+     * @throws IllegalArgumentException if the cursor is not tailable
+     * @mongodb.driver.manual /core/cursors/#cursor-batches Cursor Batches
+     */
+    @Nullable
+    public DBObject tryNext() {
+        if (cursor == null) {
+            FindOperation<DBObject> operation = getQueryOperation(decoder);
+            if (!operation.getCursorType().isTailable()) {
+                throw new IllegalArgumentException("Can only be used with a tailable cursor");
+            }
+            initializeCursor(operation);
+        }
+        DBObject next = cursor.tryNext();
+        setServerCursorOnFinalizer(cursor.getServerCursor());
+        return currentObject(next);
+    }
+
+
+    /**
+     * Returns the element the cursor is at.
+     *
+     * @return the current element
+     */
+    public DBObject curr() {
+        return currentObject;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Adds a query option. See Bytes.QUERYOPTION_* for list.
+     *
+     * @param option the option to be added
+     * @return {@code this} so calls can be chained
+     * @see Bytes
+     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     * @deprecated Prefer per-option methods, e.g. {@link #cursorType(CursorType)}, {@link #noCursorTimeout(boolean)}, etc.
+     */
+    @Deprecated
+    public DBCursor addOption(final int option) {
+        setOptions(this.options |= option);
+        return this;
+    }
+
+    /**
+     * Sets the query option - see Bytes.QUERYOPTION_* for list.
+     *
+     * @param options the bitmask of options
+     * @return {@code this} so calls can be chained
+     * @see Bytes
+     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     */
+    @Deprecated
+    public DBCursor setOptions(final int options) {
+        if ((options & Bytes.QUERYOPTION_EXHAUST) != 0) {
+            throw new UnsupportedOperationException("exhaust query option is not supported");
+        }
+        this.options = options;
+        return this;
+    }
+
+    /**
+     * Resets the query options.
+     *
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     */
+    @Deprecated
+    public DBCursor resetOptions() {
+        this.options = 0;
+        return this;
+    }
+
+    /**
+     * Gets the query options.
+     *
+     * @return the bitmask of options
+     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
+     */
+    @Deprecated
+    public int getOptions() {
+        return options;
+    }
+
+    /**
+     * Gets the query limit.
+     *
+     * @return the limit, or 0 if no limit is set
+     */
+    public int getLimit() {
+        return findOptions.getLimit();
+    }
+
+    /**
+     * Gets the batch size.
+     *
+     * @return the batch size
+     */
+    public int getBatchSize() {
+        return findOptions.getBatchSize();
+    }
+
+    /**
+     * Adds a special operator like $comment or $returnKey. For example:
+     * <pre>
+     *    addSpecial("$returnKey", 1)
+     *    addSpecial("$comment", "this is a special query)
+     * </pre>
+     *
+     * @param name  the name of the special query operator
+     * @param value the value of the special query operator
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual reference/operator Special Operators
+     * @deprecated Prefer per-operator methods, e.g. {@link #comment(String)}, {@link #explain()}, etc.
+     */
+    @SuppressWarnings("deprecation")
+    @Deprecated
+    public DBCursor addSpecial(@Nullable final String name, @Nullable final Object value) {
+        if (name == null || value == null) {
+            return this;
+        }
+
+        if ("$comment".equals(name)) {
+            comment(value.toString());
+        } else if ("$explain".equals(name)) {
+            findOptions.getModifiers().put("$explain", true);
+        } else if ("$hint".equals(name)) {
+            if (value instanceof String) {
+                hint((String) value);
+            } else {
+                hint((DBObject) value);
+            }
+        } else if ("$maxScan".equals(name)) {
+            maxScan(((Number) value).intValue());
+        } else if ("$maxTimeMS".equals(name)) {
+            maxTime(((Number) value).longValue(), MILLISECONDS);
+        } else if ("$max".equals(name)) {
+            max((DBObject) value);
+        } else if ("$min".equals(name)) {
+            min((DBObject) value);
+        } else if ("$orderby".equals(name)) {
+            sort((DBObject) value);
+        } else if ("$returnKey".equals(name)) {
+            returnKey();
+        } else if ("$showDiskLoc".equals(name)) {
+            showDiskLoc();
+        } else if ("$snapshot".equals(name)) {
+            snapshot();
+        } else if ("$natural".equals(name)) {
+            sort(new BasicDBObject("$natural", ((Number) value).intValue()));
+        } else {
+            throw new IllegalArgumentException(name + "is not a supported modifier");
+        }
+        return this;
+    }
+
+    /**
+     * Adds a comment to the query to identify queries in the database profiler output.
+     *
+     * @param comment the comment that is to appear in the profiler output
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual reference/operator/meta/comment/ $comment
+     * @since 2.12
+     */
+    public DBCursor comment(final String comment) {
+        findOptions.comment(comment);
+        return this;
+    }
+
+    /**
+     * Limits the number of documents a cursor will return for a query.
+     *
+     * @param max the maximum number of documents to return
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual reference/operator/meta/maxScan/ $maxScan
+     * @see #limit(int)
+     * @since 2.12
+     * @deprecated Deprecated as of MongoDB 4.0 release
+     */
+    @Deprecated
+    public DBCursor maxScan(final int max) {
+        findOptions.getModifiers().put("$maxScan", max);
+        return this;
+    }
+
+    /**
+     * Specifies an <em>exclusive</em> upper limit for the index to use in a query.
+     *
+     * @param max a document specifying the fields, and the upper bound values for those fields
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual reference/operator/meta/max/ $max
+     * @since 2.12
+     */
+    public DBCursor max(final DBObject max) {
+        findOptions.max(max);
+        return this;
+    }
+
+    /**
+     * Specifies an <em>inclusive</em> lower limit for the index to use in a query.
+     *
+     * @param min a document specifying the fields, and the lower bound values for those fields
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual reference/operator/meta/min/ $min
+     * @since 2.12
+     */
+    public DBCursor min(final DBObject min) {
+        findOptions.min(min);
+        return this;
+    }
+
+    /**
+     * Forces the cursor to only return fields included in the index.
+     *
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual reference/operator/meta/returnKey/ $returnKey
+     * @since 2.12
+     */
+    public DBCursor returnKey() {
+        findOptions.returnKey(true);
+        return this;
+    }
+
+    /**
+     * Modifies the documents returned to include references to the on-disk location of each document.  The location will be returned in a
+     * property named {@code $diskLoc}
+     *
+     * @return {@code this} so calls can be chained
+     * @mongodb.driver.manual reference/operator/meta/showDiskLoc/ $showDiskLoc
+     * @since 2.12
+     * @deprecated showDiskLoc has been deprecated in the MongoDB server.  There is no replacement for it.
+     */
+    @Deprecated
+    public DBCursor showDiskLoc() {
+        findOptions.getModifiers().put("$showDiskLoc", true);
+        return this;
+    }
+
+    /**
+     * Informs the database of indexed fields of the collection in order to improve performance.
+     *
+     * @param indexKeys a {@code DBObject} with fields and direction
+     * @return same DBCursor for chaining operations
+     * @mongodb.driver.manual reference/operator/meta/hint/ $hint
+     */
+    public DBCursor hint(final DBObject indexKeys) {
+        findOptions.hint(indexKeys);
+        return this;
+    }
+
+    /**
+     * Informs the database of an indexed field of the collection in order to improve performance.
+     *
+     * @param indexName the name of an index
+     * @return same DBCursor for chaining operations
+     * @mongodb.driver.manual reference/operator/meta/hint/ $hint
+     * @deprecated Prefer {@link #hint(DBObject)}
+     */
+    @Deprecated
+    public DBCursor hint(final String indexName) {
+        findOptions.getModifiers().put("$hint", indexName);
+        return this;
+    }
+
+    /**
+     * Set the maximum execution time for operations on this cursor.
+     *
+     * @param maxTime  the maximum time that the server will allow the query to run, before killing the operation. A non-zero value requires
+     *                 a server version &gt;= 2.6
+     * @param timeUnit the time unit
+     * @return same DBCursor for chaining operations
+     * @mongodb.server.release 2.6
+     * @mongodb.driver.manual reference/operator/meta/maxTimeMS/ $maxTimeMS
+     * @since 2.12.0
+     */
+    public DBCursor maxTime(final long maxTime, final TimeUnit timeUnit) {
+        findOptions.maxTime(maxTime, timeUnit);
+        return this;
+    }
+
+    /**
+     * Use snapshot mode for the query. Snapshot mode prevents the cursor from returning a document more than once because an intervening
+     * write operation results in a move of the document. Even in snapshot mode, documents inserted or deleted during the lifetime of the
+     * cursor may or may not be returned.  Currently, snapshot mode may not be used with sorting or explicit hints.
+     *
+     * @return {@code this} so calls can be chained
+     *
+     * @see com.mongodb.DBCursor#sort(DBObject)
+     * @see com.mongodb.DBCursor#hint(DBObject)
+     * @mongodb.driver.manual reference/operator/meta/snapshot/ $snapshot
+     * @deprecated Deprecated in MongoDB 3.6 release and removed in MongoDB 4.0 release
+     */
+    @Deprecated
+    public DBCursor snapshot() {
+        findOptions.getModifiers().put("$snapshot", true);
+        return this;
+    }
+
+    /**
+     * Returns an object containing basic information about the execution of the query that created this cursor. This creates a {@code
+     * DBObject} with a number of fields, including but not limited to:
+     * <ul>
+     *     <li><i>cursor:</i> cursor type</li>
+     *     <li><i>nScanned:</i> number of records examined by the database for this query </li>
+     *     <li><i>n:</i> the number of records that the database returned</li>
+     *     <li><i>millis:</i> how long it took the database to execute the query</li>
+     * </ul>
+     *
+     * @return a {@code DBObject} containing the explain output for this DBCursor's query
+     * @throws MongoException if the operation failed
+     * @mongodb.driver.manual reference/command/explain Explain Output
+     * @deprecated Replace with direct use of the explain command using the runCommand helper method
+     */
+    @Deprecated
+    public DBObject explain() {
+        return toDBObject(executor.execute(getQueryOperation(collection.getObjectCodec())
+                                           .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER),
+                                           getReadPreference(), getReadConcern()));
+    }
+
+    /**
+     * Sets the cursor type.
+     *
+     * @param cursorType the cursor type, which may not be null
+     * @return this
+     * @since 3.9
+     */
+    public DBCursor cursorType(final CursorType cursorType) {
+        findOptions.cursorType(cursorType);
+        return this;
+    }
+
+    /**
+     * Users should not set this under normal circumstances.
+     *
+     * @param oplogReplay if oplog replay is enabled
+     * @return this
+     * @since 3.9
+     */
+    public DBCursor oplogReplay(final boolean oplogReplay) {
+        findOptions.oplogReplay(oplogReplay);
+        return this;
+    }
+
+    /**
+     * The server normally times out idle cursors after an inactivity period (10 minutes)
+     * to prevent excess memory use. Set this option to prevent that.
+     *
+     * @param noCursorTimeout true if cursor timeout is disabled
+     * @return this
+     * @since 3.9
+     */
+    public DBCursor noCursorTimeout(final boolean noCursorTimeout) {
+        findOptions.noCursorTimeout(noCursorTimeout);
+        return this;
+    }
+
+    /**
+     * Get partial results from a sharded cluster if one or more shards are unreachable (instead of throwing an error).
+     *
+     * @param partial if partial results for sharded clusters is enabled
+     * @return this
+     * @since 3.9
+     */
+    public DBCursor partial(final boolean partial) {
+        findOptions.partial(partial);
+        return this;
+    }
+
+    @SuppressWarnings("deprecation")
+    private FindOperation<DBObject> getQueryOperation(final Decoder<DBObject> decoder) {
+        FindOperation<DBObject> operation = new FindOperation<DBObject>(collection.getNamespace(), decoder)
+                                                .filter(collection.wrapAllowNull(filter))
+                                                .batchSize(findOptions.getBatchSize())
+                                                .skip(findOptions.getSkip())
+                                                .limit(findOptions.getLimit())
+                                                .maxAwaitTime(findOptions.getMaxAwaitTime(MILLISECONDS), MILLISECONDS)
+                                                .maxTime(findOptions.getMaxTime(MILLISECONDS), MILLISECONDS)
+                                                .modifiers(collection.wrapAllowNull(findOptions.getModifiers()))
+                                                .projection(collection.wrapAllowNull(findOptions.getProjection()))
+                                                .sort(collection.wrapAllowNull(findOptions.getSort()))
+                                                .collation(findOptions.getCollation())
+                                                .comment(findOptions.getComment())
+                                                .hint(collection.wrapAllowNull(findOptions.getHint()))
+                                                .min(collection.wrapAllowNull(findOptions.getMin()))
+                                                .max(collection.wrapAllowNull(findOptions.getMax()))
+                                                .returnKey(findOptions.isReturnKey())
+                                                .showRecordId(findOptions.isShowRecordId())
+                                                .retryReads(retryReads);
+
+        if ((this.options & Bytes.QUERYOPTION_TAILABLE) != 0) {
+            if ((this.options & Bytes.QUERYOPTION_AWAITDATA) != 0) {
+                operation.cursorType(CursorType.TailableAwait);
+            } else {
+                operation.cursorType(CursorType.Tailable);
+            }
+        } else {
+            operation.cursorType(findOptions.getCursorType());
+        }
+        if ((this.options & Bytes.QUERYOPTION_OPLOGREPLAY) != 0) {
+            operation.oplogReplay(true);
+        } else {
+            operation.oplogReplay(findOptions.isOplogReplay());
+        }
+        if ((this.options & Bytes.QUERYOPTION_NOTIMEOUT) != 0) {
+            operation.noCursorTimeout(true);
+        } else {
+            operation.noCursorTimeout(findOptions.isNoCursorTimeout());
+        }
+        if ((this.options & Bytes.QUERYOPTION_PARTIAL) != 0) {
+            operation.partial(true);
+        } else {
+            operation.partial(findOptions.isPartial());
+        }
+        return operation;
+    }
+
+    /**
+     * Sorts this cursor's elements. This method must be called before getting any object from the cursor.
+     *
+     * @param orderBy the fields by which to sort
+     * @return a cursor pointing to the first element of the sorted results
+     */
+    public DBCursor sort(final DBObject orderBy) {
+        findOptions.sort(orderBy);
+        return this;
+    }
+
+    /**
+     * Limits the number of elements returned. Note: parameter {@code limit} should be positive, although a negative value is
+     * supported for legacy reason. Passing a negative value will call {@link DBCursor#batchSize(int)} which is the preferred method.
+     *
+     * @param limit the number of elements to return
+     * @return a cursor to iterate the results
+     * @mongodb.driver.manual reference/method/cursor.limit Limit
+     */
+    public DBCursor limit(final int limit) {
+        findOptions.limit(limit);
+        return this;
+    }
+
+    /**
+     * <p>Limits the number of elements returned in one batch. A cursor typically fetches a batch of result objects and store them
+     * locally.</p>
+     *
+     * <p>If {@code batchSize} is positive, it represents the size of each batch of objects retrieved. It can be adjusted to optimize
+     * performance and limit data transfer.</p>
+     *
+     * <p>If {@code batchSize} is negative, it will limit of number objects returned, that fit within the max batch size limit (usually
+     * 4MB), and cursor will be closed. For example if {@code batchSize} is -10, then the server will return a maximum of 10 documents and
+     * as many as can fit in 4MB, then close the cursor. Note that this feature is different from limit() in that documents must fit within
+     * a maximum size, and it removes the need to send a request to close the cursor server-side.</p>
+     *
+     * @param numberOfElements the number of elements to return in a batch
+     * @return {@code this} so calls can be chained
+     */
+    public DBCursor batchSize(final int numberOfElements) {
+        findOptions.batchSize(numberOfElements);
+        return this;
+    }
+
+    /**
+     * Discards a given number of elements at the beginning of the cursor.
+     *
+     * @param numberOfElements the number of elements to skip
+     * @return a cursor pointing to the new first element of the results
+     * @throws IllegalStateException if the cursor has started to be iterated through
+     */
+    public DBCursor skip(final int numberOfElements) {
+        findOptions.skip(numberOfElements);
+        return this;
+    }
+
+    @Override
+    public long getCursorId() {
+        if (cursor != null) {
+            ServerCursor serverCursor = cursor.getServerCursor();
+            if (serverCursor == null) {
+                return 0;
+            }
+            return serverCursor.getId();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Returns the number of objects through which the cursor has iterated.
+     *
+     * @return the number of objects seen
+     */
+    public int numSeen() {
+        return numSeen;
+    }
+
+    @Override
+    public void close() {
+        closed = true;
+        if (cursor != null) {
+            cursor.close();
+            cursor = null;
+            setServerCursorOnFinalizer(null);
+        }
+
+        currentObject = null;
+    }
+
+    /**
+     * Declare that this query can run on a secondary server.
+     *
+     * @return a copy of the same cursor (for chaining)
+     * @see ReadPreference#secondaryPreferred()
+     * @deprecated Replaced with {@link com.mongodb.ReadPreference#secondaryPreferred()}
+     */
+    @Deprecated
+    public DBCursor slaveOk() {
+        return addOption(Bytes.QUERYOPTION_SLAVEOK);
+    }
+
+    /**
+     * <p>Creates a copy of this cursor object that can be iterated. Note: - you can iterate the DBCursor itself without calling this method
+     * - no actual data is getting copied.</p>
+     *
+     * <p>Note that use of this method does not let you call close the underlying cursor in the case of either an exception or an early
+     * break.  The preferred method of iteration is to use DBCursor as an Iterator, so that you can call close() on it in a finally
+     * block.</p>
+     *
+     * @return an iterator
+     */
+    @Override
+    public Iterator<DBObject> iterator() {
+        return this.copy();
+    }
+
+    /**
+     * Converts this cursor to an array.
+     *
+     * @return an array of elements
+     * @throws MongoException if failed
+     */
+    public List<DBObject> toArray() {
+        return toArray(Integer.MAX_VALUE);
+    }
+
+    /**
+     * Converts this cursor to an array.
+     *
+     * @param max the maximum number of objects to return
+     * @return an array of objects
+     * @throws MongoException if failed
+     */
+    public List<DBObject> toArray(final int max) {
+        checkIteratorOrArray(IteratorOrArray.ARRAY);
+        fillArray(max - 1);
+        return all;
+    }
+
+    /**
+     * Counts the number of objects matching the query. This does not take limit/skip into consideration, and does initiate a call to the
+     * server.
+     *
+     * @return the number of objects
+     * @throws MongoException if the operation failed
+     * @see DBCursor#size
+     */
+    public int count() {
+        DBCollectionCountOptions countOptions = getDbCollectionCountOptions();
+        return (int) collection.getCount(getQuery(), countOptions);
+    }
+
+    /**
+     * Returns the first document that matches the query.
+     *
+     * @return the first matching document
+     * @since 2.12
+     */
+    @Nullable
+    public DBObject one() {
+        DBCursor findOneCursor = copy().limit(-1);
+        try {
+            return findOneCursor.hasNext() ? findOneCursor.next() : null;
+        } finally {
+            findOneCursor.close();
+        }
+    }
+
+    /**
+     * Pulls back all items into an array and returns the number of objects. Note: this can be resource intensive.
+     *
+     * @return the number of elements in the array
+     * @throws MongoException if failed
+     * @see #count()
+     * @see #size()
+     */
+    public int length() {
+        checkIteratorOrArray(IteratorOrArray.ARRAY);
+        fillArray(Integer.MAX_VALUE);
+        return all.size();
+    }
+
+    /**
+     * For testing only! Iterates cursor and counts objects
+     *
+     * @return num objects
+     * @throws MongoException if failed
+     * @see #count()
+     */
+    public int itcount() {
+        int n = 0;
+        while (this.hasNext()) {
+            this.next();
+            n++;
+        }
+        return n;
+    }
+
+    /**
+     * Counts the number of objects matching the query this does take limit/skip into consideration
+     *
+     * @return the number of objects
+     * @throws MongoException if the operation failed
+     * @see #count()
+     */
+    public int size() {
+        DBCollectionCountOptions countOptions = getDbCollectionCountOptions().skip(findOptions.getSkip()).limit(findOptions.getLimit());
+        return (int) collection.getCount(getQuery(), countOptions);
+    }
+
+    /**
+     * Gets the fields to be returned.
+     *
+     * @return the field selector that cursor used
+     */
+    @Nullable
+    public DBObject getKeysWanted() {
+        return findOptions.getProjection();
+    }
+
+    /**
+     * Gets the query.
+     *
+     * @return the query that cursor used
+     */
+    public DBObject getQuery() {
+        return filter;
+    }
+
+    /**
+     * Gets the collection.
+     *
+     * @return the collection that data is pulled from
+     */
+    public DBCollection getCollection() {
+        return collection;
+    }
+
+    @Override
+    @Nullable
+    public ServerAddress getServerAddress() {
+        if (cursor != null) {
+            return cursor.getServerAddress();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Sets the read preference for this cursor. See the documentation for {@link ReadPreference} for more information.
+     *
+     * @param readPreference read preference to use
+     * @return {@code this} so calls can be chained
+     */
+    public DBCursor setReadPreference(final ReadPreference readPreference) {
+        findOptions.readPreference(readPreference);
+        return this;
+    }
+
+    /**
+     * Gets the default read preference.
+     *
+     * @return the readPreference used by this cursor
+     */
+    public ReadPreference getReadPreference() {
+        ReadPreference readPreference = findOptions.getReadPreference();
+        if (readPreference != null) {
+            return readPreference;
+        }
+        return collection.getReadPreference();
+    }
+
+
+    /**
+     * Sets the read concern for this collection.
+     *
+     * @param readConcern the read concern to use for this collection
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    DBCursor setReadConcern(@Nullable final ReadConcern readConcern) {
+        findOptions.readConcern(readConcern);
+        return this;
+    }
+
+    /**
+     * Get the read concern for this collection.
+     *
+     * @return the {@link com.mongodb.ReadConcern}
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    ReadConcern getReadConcern() {
+        ReadConcern readConcern = findOptions.getReadConcern();
+        if (readConcern != null) {
+            return readConcern;
+        }
+        return collection.getReadConcern();
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return findOptions.getCollation();
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    public DBCursor setCollation(@Nullable final Collation collation) {
+        findOptions.collation(collation);
+        return this;
+    }
+
+    /**
+     * Sets the factory that will be used create a {@code DBDecoder} that will be used to decode BSON documents into DBObject instances.
+     *
+     * @param factory the DBDecoderFactory
+     * @return {@code this} so calls can be chained
+     */
+    public DBCursor setDecoderFactory(final DBDecoderFactory factory) {
+        this.decoderFactory = factory;
+
+        //Not creating new CompoundDBObjectCodec because we don't care about encoder.
+        this.decoder = new DBDecoderAdapter(factory.create(), collection, getCollection().getBufferPool());
+        return this;
+    }
+
+    /**
+     * Gets the decoder factory that creates the decoder this cursor will use to decode objects from MongoDB.
+     *
+     * @return the decoder factory.
+     */
+    public DBDecoderFactory getDecoderFactory() {
+        return decoderFactory;
+    }
+
+    @Override
+    public String toString() {
+        return "DBCursor{"
+               + "collection=" + collection
+               + ", find=" + findOptions
+               + (cursor != null ? (", cursor=" + cursor.getServerCursor()) : "")
+               + '}';
+    }
+
+    private void initializeCursor(final FindOperation<DBObject> operation) {
+        cursor = new MongoBatchCursorAdapter<DBObject>(executor.execute(operation, getReadPreferenceForCursor(), getReadConcern()));
+        if (isCursorFinalizerEnabled() && cursor.getServerCursor() != null) {
+            optionalFinalizer = new OptionalFinalizer(collection.getDB().getMongo(), collection.getNamespace());
+        }
+    }
+
+    private boolean isCursorFinalizerEnabled() {
+        return collection.getDB().getMongo().getMongoClientOptions().isCursorFinalizerEnabled();
+    }
+
+    private void setServerCursorOnFinalizer(@Nullable final ServerCursor serverCursor) {
+        if (optionalFinalizer != null) {
+            optionalFinalizer.setServerCursor(serverCursor);
+        }
+    }
+
+    private void checkIteratorOrArray(final IteratorOrArray expected) {
+        if (iteratorOrArray == null) {
+            iteratorOrArray = expected;
+            return;
+        }
+
+        if (expected == iteratorOrArray) {
+            return;
+        }
+
+        throw new IllegalArgumentException("Can't switch cursor access methods");
+    }
+
+    private ReadPreference getReadPreferenceForCursor() {
+        ReadPreference readPreference = getReadPreference();
+        if ((options & Bytes.QUERYOPTION_SLAVEOK) != 0 && !readPreference.isSlaveOk()) {
+            readPreference = ReadPreference.secondaryPreferred();
+        }
+        return readPreference;
+    }
+
+    private void fillArray(final int n) {
+        checkIteratorOrArray(IteratorOrArray.ARRAY);
+        while (n >= all.size() && hasNext()) {
+            all.add(nextInternal());
+        }
+    }
+
+    private DBObject nextInternal() {
+        if (iteratorOrArray == null) {
+            checkIteratorOrArray(IteratorOrArray.ITERATOR);
+        }
+
+        DBObject next = cursor.next();
+        setServerCursorOnFinalizer(cursor.getServerCursor());
+        return currentObjectNonNull(next);
+    }
+
+    @Nullable
+    private DBObject currentObject(@Nullable final DBObject newCurrentObject){
+        if (newCurrentObject != null) {
+            currentObject = newCurrentObject;
+            numSeen++;
+
+            DBObject projection = findOptions.getProjection();
+            if (projection != null && !(projection.keySet().isEmpty())) {
+                currentObject.markAsPartialObject();
+            }
+        }
+        return newCurrentObject;
+    }
+
+    private DBObject currentObjectNonNull(final DBObject newCurrentObject){
+        currentObject = newCurrentObject;
+        numSeen++;
+
+        DBObject projection = findOptions.getProjection();
+        if (projection != null && !(projection.keySet().isEmpty())) {
+            currentObject.markAsPartialObject();
+        }
+        return newCurrentObject;
+    }
+
+    @Nullable
+    private static DBObject lookupSuitableHints(final DBObject query, @Nullable final List<DBObject> hints) {
+        if (hints == null) {
+            return null;
+        }
+
+        Set<String> keys = query.keySet();
+
+        for (final DBObject hint : hints) {
+            if (keys.containsAll(hint.keySet())) {
+                return hint;
+            }
+        }
+        return null;
+    }
+
+    private enum IteratorOrArray {
+        ITERATOR,
+        ARRAY
+    }
+
+    private static class OptionalFinalizer {
+        private final Mongo mongo;
+        private final MongoNamespace namespace;
+        private volatile ServerCursor serverCursor;
+
+        private OptionalFinalizer(final Mongo mongo, final MongoNamespace namespace) {
+            this.namespace = notNull("namespace", namespace);
+            this.mongo = notNull("mongo", mongo);
+        }
+
+        private void setServerCursor(@Nullable final ServerCursor serverCursor) {
+            this.serverCursor = serverCursor;
+        }
+
+        @Override
+        @SuppressWarnings("deprecation")
+        protected void finalize() {
+            if (serverCursor != null) {
+                mongo.addOrphanedCursor(serverCursor, namespace);
+            }
+        }
+    }
+
+    private DBCollectionCountOptions getDbCollectionCountOptions() {
+        DBCollectionCountOptions countOptions = new DBCollectionCountOptions()
+                .readPreference(getReadPreferenceForCursor())
+                .readConcern(getReadConcern())
+                .collation(getCollation())
+                .maxTime(findOptions.getMaxTime(MILLISECONDS), MILLISECONDS);
+
+        Object hint = findOptions.getHint() != null ? findOptions.getHint() : findOptions.getModifiers().get("$hint");
+        if (hint != null) {
+            if (hint instanceof String) {
+                countOptions.hintString((String) hint);
+            } else {
+                countOptions.hint((DBObject) hint);
+            }
+        }
+        return countOptions;
+    }
+}
diff --git a/driver/src/main/com/mongodb/DBDecoder.java b/driver-legacy/src/main/com/mongodb/DBDecoder.java
similarity index 97%
rename from driver/src/main/com/mongodb/DBDecoder.java
rename to driver-legacy/src/main/com/mongodb/DBDecoder.java
index 6e3f29aa6a3..69ecb8fe535 100644
--- a/driver/src/main/com/mongodb/DBDecoder.java
+++ b/driver-legacy/src/main/com/mongodb/DBDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBDecoderAdapter.java b/driver-legacy/src/main/com/mongodb/DBDecoderAdapter.java
similarity index 93%
rename from driver/src/main/com/mongodb/DBDecoderAdapter.java
rename to driver-legacy/src/main/com/mongodb/DBDecoderAdapter.java
index 241ca216af1..7bf98f6e0a1 100644
--- a/driver/src/main/com/mongodb/DBDecoderAdapter.java
+++ b/driver-legacy/src/main/com/mongodb/DBDecoderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class DBDecoderAdapter implements Decoder<DBObject> {
     private final DBCollection collection;
     private final BufferProvider bufferProvider;
 
-    public DBDecoderAdapter(final DBDecoder decoder, final DBCollection collection, final BufferProvider bufferProvider) {
+    DBDecoderAdapter(final DBDecoder decoder, final DBCollection collection, final BufferProvider bufferProvider) {
         this.decoder = decoder;
         this.collection = collection;
         this.bufferProvider = bufferProvider;
diff --git a/driver/src/main/com/mongodb/DBDecoderFactory.java b/driver-legacy/src/main/com/mongodb/DBDecoderFactory.java
similarity index 95%
rename from driver/src/main/com/mongodb/DBDecoderFactory.java
rename to driver-legacy/src/main/com/mongodb/DBDecoderFactory.java
index fd4a427ee87..ece26b4dc40 100644
--- a/driver/src/main/com/mongodb/DBDecoderFactory.java
+++ b/driver-legacy/src/main/com/mongodb/DBDecoderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBEncoder.java b/driver-legacy/src/main/com/mongodb/DBEncoder.java
similarity index 96%
rename from driver/src/main/com/mongodb/DBEncoder.java
rename to driver-legacy/src/main/com/mongodb/DBEncoder.java
index 0b3bf4bd3e7..79ceba31c52 100644
--- a/driver/src/main/com/mongodb/DBEncoder.java
+++ b/driver-legacy/src/main/com/mongodb/DBEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBEncoderAdapter.java b/driver-legacy/src/main/com/mongodb/DBEncoderAdapter.java
similarity index 95%
rename from driver/src/main/com/mongodb/DBEncoderAdapter.java
rename to driver-legacy/src/main/com/mongodb/DBEncoderAdapter.java
index e86ae32ed74..d645873b858 100644
--- a/driver/src/main/com/mongodb/DBEncoderAdapter.java
+++ b/driver-legacy/src/main/com/mongodb/DBEncoderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class DBEncoderAdapter implements Encoder<DBObject> {
 
     private final DBEncoder encoder;
 
-    public DBEncoderAdapter(final DBEncoder encoder) {
+    DBEncoderAdapter(final DBEncoder encoder) {
         this.encoder = notNull("encoder", encoder);
     }
 
diff --git a/driver/src/main/com/mongodb/DBEncoderFactory.java b/driver-legacy/src/main/com/mongodb/DBEncoderFactory.java
similarity index 95%
rename from driver/src/main/com/mongodb/DBEncoderFactory.java
rename to driver-legacy/src/main/com/mongodb/DBEncoderFactory.java
index d2982732f53..a793d3eb7c7 100644
--- a/driver/src/main/com/mongodb/DBEncoderFactory.java
+++ b/driver-legacy/src/main/com/mongodb/DBEncoderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DBEncoderFactoryAdapter.java b/driver-legacy/src/main/com/mongodb/DBEncoderFactoryAdapter.java
similarity index 90%
rename from driver/src/main/com/mongodb/DBEncoderFactoryAdapter.java
rename to driver-legacy/src/main/com/mongodb/DBEncoderFactoryAdapter.java
index 28c8b262306..8cf828621a3 100644
--- a/driver/src/main/com/mongodb/DBEncoderFactoryAdapter.java
+++ b/driver-legacy/src/main/com/mongodb/DBEncoderFactoryAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ class DBEncoderFactoryAdapter implements Encoder<DBObject> {
 
     private final DBEncoderFactory encoderFactory;
 
-    public DBEncoderFactoryAdapter(final DBEncoderFactory encoderFactory) {
+    DBEncoderFactoryAdapter(final DBEncoderFactory encoderFactory) {
         this.encoderFactory = encoderFactory;
     }
 
diff --git a/driver-legacy/src/main/com/mongodb/DBObjectCollationHelper.java b/driver-legacy/src/main/com/mongodb/DBObjectCollationHelper.java
new file mode 100644
index 00000000000..d41454a516b
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/DBObjectCollationHelper.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.CollationAlternate;
+import com.mongodb.client.model.CollationCaseFirst;
+import com.mongodb.client.model.CollationMaxVariable;
+import com.mongodb.client.model.CollationStrength;
+import com.mongodb.lang.Nullable;
+
+final class DBObjectCollationHelper {
+
+    @Nullable
+    static Collation createCollationFromOptions(final DBObject options) {
+        if (options.get("collation") == null) {
+            return null;
+        } else if (!(options.get("collation") instanceof DBObject)) {
+            throw new IllegalArgumentException("collation options should be a document");
+        } else {
+            Collation.Builder builder = Collation.builder();
+            DBObject collation = (DBObject) options.get("collation");
+
+            if (collation.get("locale") == null) {
+                throw new IllegalArgumentException("'locale' is required when providing collation options");
+            } else {
+                Object locale = collation.get("locale");
+                if (!(locale instanceof String)) {
+                    throw new IllegalArgumentException("collation 'locale' should be a String");
+                } else {
+                    builder.locale((String) locale);
+                }
+            }
+            if (collation.get("caseLevel") != null){
+                Object caseLevel = collation.get("caseLevel");
+                if (!(caseLevel instanceof Boolean)) {
+                    throw new IllegalArgumentException("collation 'caseLevel' should be a Boolean");
+                } else {
+                    builder.caseLevel((Boolean) caseLevel);
+                }
+            }
+            if (collation.get("caseFirst") != null) {
+                Object caseFirst = collation.get("caseFirst");
+                if (!(caseFirst instanceof String)) {
+                    throw new IllegalArgumentException("collation 'caseFirst' should be a String");
+                } else {
+                    builder.collationCaseFirst(CollationCaseFirst.fromString((String) caseFirst));
+                }
+            }
+            if (collation.get("strength") != null) {
+                Object strength = collation.get("strength");
+                if (!(strength instanceof Integer)) {
+                    throw new IllegalArgumentException("collation 'strength' should be an Integer");
+                } else {
+                    builder.collationStrength(CollationStrength.fromInt((Integer) strength));
+                }
+            }
+            if (collation.get("numericOrdering") != null) {
+                Object numericOrdering = collation.get("numericOrdering");
+                if (!(numericOrdering instanceof Boolean)) {
+                    throw new IllegalArgumentException("collation 'numericOrdering' should be a Boolean");
+                } else {
+                    builder.numericOrdering((Boolean) numericOrdering);
+                }
+            }
+            if (collation.get("alternate") != null) {
+                Object alternate = collation.get("alternate");
+                if (!(alternate instanceof String)) {
+                    throw new IllegalArgumentException("collation 'alternate' should be a String");
+                } else {
+                    builder.collationAlternate(CollationAlternate.fromString((String) alternate));
+                }
+            }
+            if (collation.get("maxVariable") != null) {
+                Object maxVariable = collation.get("maxVariable");
+                if (!(maxVariable instanceof String)) {
+                    throw new IllegalArgumentException("collation 'maxVariable' should be a String");
+                } else {
+                    builder.collationMaxVariable(CollationMaxVariable.fromString((String) maxVariable));
+                }
+            }
+            if (collation.get("normalization") != null) {
+                Object normalization = collation.get("normalization");
+                if (!(normalization instanceof Boolean)) {
+                    throw new IllegalArgumentException("collation 'normalization' should be a Boolean");
+                } else {
+                    builder.normalization((Boolean) normalization);
+                }
+            }
+            if (collation.get("backwards") != null) {
+                Object backwards = collation.get("backwards");
+                if (!(backwards instanceof Boolean)) {
+                    throw new IllegalArgumentException("collation 'backwards' should be a Boolean");
+                } else {
+                    builder.backwards((Boolean) backwards);
+                }
+            }
+            return builder.build();
+        }
+    }
+
+    private DBObjectCollationHelper() {
+    }
+}
diff --git a/driver/src/main/com/mongodb/DBObjects.java b/driver-legacy/src/main/com/mongodb/DBObjects.java
similarity index 96%
rename from driver/src/main/com/mongodb/DBObjects.java
rename to driver-legacy/src/main/com/mongodb/DBObjects.java
index 0c2d31d76d0..94f2308324f 100644
--- a/driver/src/main/com/mongodb/DBObjects.java
+++ b/driver-legacy/src/main/com/mongodb/DBObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DefaultDBCallback.java b/driver-legacy/src/main/com/mongodb/DefaultDBCallback.java
similarity index 98%
rename from driver/src/main/com/mongodb/DefaultDBCallback.java
rename to driver-legacy/src/main/com/mongodb/DefaultDBCallback.java
index 09fee75b340..f32b6f10862 100644
--- a/driver/src/main/com/mongodb/DefaultDBCallback.java
+++ b/driver-legacy/src/main/com/mongodb/DefaultDBCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DefaultDBDecoder.java b/driver-legacy/src/main/com/mongodb/DefaultDBDecoder.java
similarity index 97%
rename from driver/src/main/com/mongodb/DefaultDBDecoder.java
rename to driver-legacy/src/main/com/mongodb/DefaultDBDecoder.java
index 64fe129d532..9c1f53f448e 100644
--- a/driver/src/main/com/mongodb/DefaultDBDecoder.java
+++ b/driver-legacy/src/main/com/mongodb/DefaultDBDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/DefaultDBEncoder.java b/driver-legacy/src/main/com/mongodb/DefaultDBEncoder.java
similarity index 85%
rename from driver/src/main/com/mongodb/DefaultDBEncoder.java
rename to driver-legacy/src/main/com/mongodb/DefaultDBEncoder.java
index f7ed00c8375..a11ec801f12 100644
--- a/driver/src/main/com/mongodb/DefaultDBEncoder.java
+++ b/driver-legacy/src/main/com/mongodb/DefaultDBEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,12 @@ protected boolean putSpecial(final String name, final Object value) {
      * @param ref  the database reference object
      */
     protected void putDBRef(final String name, final DBRef ref) {
-        putObject(name, new BasicDBObject("$ref", ref.getCollectionName()).append("$id", ref.getId()));
+        BasicDBObject dbRefDocument = new BasicDBObject("$ref", ref.getCollectionName()).append("$id", ref.getId());
+        if (ref.getDatabaseName() != null) {
+            dbRefDocument.put("$db", ref.getDatabaseName());
+        }
+
+        putObject(name, dbRefDocument);
     }
 
     @Override
diff --git a/driver-legacy/src/main/com/mongodb/GroupCommand.java b/driver-legacy/src/main/com/mongodb/GroupCommand.java
new file mode 100644
index 00000000000..442fa0ec109
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/GroupCommand.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.GroupOperation;
+import org.bson.BsonDocumentWrapper;
+import org.bson.BsonJavaScript;
+import org.bson.codecs.Codec;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * This class groups the argument for a group operation and can build the underlying command object
+ *
+ * @mongodb.driver.manual reference/command/group/ Group
+ * @deprecated the group command was deprecated in MongoDB 3.4
+ */
+@Deprecated
+public class GroupCommand {
+    private final String collectionName;
+    private final DBObject keys;
+    private final String keyf;
+    private final DBObject condition;
+    private final DBObject initial;
+    private final String reduce;
+    private final String finalize;
+    private final Collation collation;
+
+    /**
+     * Creates a new group command.
+     *
+     * @param collection the collection from which to perform the group by operation.
+     * @param keys       the field or fields to group.
+     * @param condition  optional - a filter to determine which documents in the collection to process.
+     * @param initial    the initial state of the aggregation result document.
+     * @param reduce     a JavaScript aggregation function that operates on the documents during the grouping operation.
+     * @param finalize   optional - a JavaScript function that runs each item in the result set before group returns the final value.
+     */
+    public GroupCommand(final DBCollection collection, final DBObject keys, final DBObject condition,
+                        final DBObject initial, final String reduce, @Nullable final String finalize) {
+        this(collection, keys, condition, initial, reduce, finalize, null);
+    }
+
+    /**
+     * Creates a new group command.
+     *
+     * @param collection the collection from which to perform the group by operation.
+     * @param keys       the field or fields to group.
+     * @param condition  optional - a filter to determine which documents in the collection to process.
+     * @param initial    the initial state of the aggregation result document.
+     * @param reduce     a JavaScript aggregation function that operates on the documents during the grouping operation.
+     * @param finalize   optional - a JavaScript function that runs each item in the result set before group returns the final value.
+     * @param collation  optional - the collation options
+     *
+     * @since 3.4
+     */
+    public GroupCommand(final DBCollection collection, final DBObject keys, final DBObject condition,
+                        final DBObject initial, final String reduce, @Nullable final String finalize, @Nullable final Collation collation) {
+        notNull("collection", collection);
+        this.collectionName = collection.getName();
+        this.keys = keys;
+        this.condition = condition;
+        this.initial = initial;
+        this.reduce = reduce;
+        this.finalize = finalize;
+        this.keyf = null;
+        this.collation = collation;
+    }
+
+    /**
+     * Creates a new group command.
+     *
+     * @param collection the collection from which to perform the group by operation.
+     * @param keyf       the function that creates a "key object" for use as the grouping key
+     * @param condition  optional - a filter to determine which documents in the collection to process.
+     * @param initial    the initial state of the aggregation result document.
+     * @param reduce     a JavaScript aggregation function that operates on the documents during the grouping operation.
+     * @param finalize   optional - a JavaScript function that runs each item in the result set before group returns the final value.
+     *
+     * @since 3.1
+     */
+    public GroupCommand(final DBCollection collection, final String keyf, final DBObject condition,
+                        final DBObject initial, final String reduce, final String finalize) {
+        this(collection, keyf, condition, initial, reduce, finalize, null);
+    }
+
+    /**
+     * Creates a new group command.
+     *
+     * @param collection the collection from which to perform the group by operation.
+     * @param keyf       the function that creates a "key object" for use as the grouping key
+     * @param condition  optional - a filter to determine which documents in the collection to process.
+     * @param initial    the initial state of the aggregation result document.
+     * @param reduce     a JavaScript aggregation function that operates on the documents during the grouping operation.
+     * @param finalize   optional - a JavaScript function that runs each item in the result set before group returns the final value.
+     * @param collation  optional - the collation options
+     *
+     * @since 3.4
+     */
+    public GroupCommand(final DBCollection collection, final String keyf, final DBObject condition,
+                        final DBObject initial, final String reduce, @Nullable final String finalize, @Nullable final Collation collation) {
+        notNull("collection", collection);
+        this.collectionName = collection.getName();
+        this.keyf = notNull("keyf", keyf);
+        this.condition = condition;
+        this.initial = initial;
+        this.reduce = reduce;
+        this.finalize = finalize;
+        this.keys = null;
+        this.collation = collation;
+    }
+
+    /**
+     * Turns this group command into the DBObject format of the command.
+     *
+     * @return a DBObject containing the group command as a MongoDB document
+     */
+    public DBObject toDBObject() {
+        DBObject args = new BasicDBObject("ns", collectionName).append("cond", condition)
+                                                               .append("$reduce", reduce)
+                                                               .append("initial", initial);
+
+        if (keys != null) {
+            args.put("key", keys);
+        }
+
+        if (keyf != null) {
+            args.put("$keyf", keyf);
+        }
+
+        if (finalize != null) {
+            args.put("finalize", finalize);
+        }
+        return new BasicDBObject("group", args);
+    }
+
+    GroupOperation<DBObject> toOperation(final MongoNamespace namespace, final Codec<DBObject> codec, final boolean retryReads) {
+        if (initial == null) {
+            throw new IllegalArgumentException("Group command requires an initial document for the aggregate result");
+        }
+
+        if (reduce == null) {
+            throw new IllegalArgumentException("Group command requires a reduce function for the aggregate result");
+        }
+
+        GroupOperation<DBObject> operation = new GroupOperation<DBObject>(namespace, new BsonJavaScript(reduce),
+                new BsonDocumentWrapper<DBObject>(initial, codec), codec).retryReads(retryReads);
+
+        if (keys != null) {
+            operation.key(new BsonDocumentWrapper<DBObject>(keys, codec));
+        }
+
+        if (keyf != null) {
+            operation.keyFunction(new BsonJavaScript(keyf));
+        }
+
+        if (condition != null) {
+            operation.filter(new BsonDocumentWrapper<DBObject>(condition, codec));
+        }
+
+        if (finalize != null) {
+            operation.finalizeFunction(new BsonJavaScript(finalize));
+        }
+        operation.collation(collation);
+        return operation;
+    }
+
+}
diff --git a/driver/src/main/com/mongodb/InsertOptions.java b/driver-legacy/src/main/com/mongodb/InsertOptions.java
similarity index 90%
rename from driver/src/main/com/mongodb/InsertOptions.java
rename to driver-legacy/src/main/com/mongodb/InsertOptions.java
index 811dd763f25..2235d90ea7e 100644
--- a/driver/src/main/com/mongodb/InsertOptions.java
+++ b/driver-legacy/src/main/com/mongodb/InsertOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
 /**
  * Options related to insertion of documents into MongoDB.  The setter methods return {@code this} so that a chaining style can be used.
  *
@@ -34,7 +36,7 @@ public final class InsertOptions {
      * @param writeConcern the write concern
      * @return this
      */
-    public InsertOptions writeConcern(final WriteConcern writeConcern) {
+    public InsertOptions writeConcern(@Nullable final WriteConcern writeConcern) {
         this.writeConcern = writeConcern;
         return this;
     }
@@ -56,7 +58,7 @@ public InsertOptions continueOnError(final boolean continueOnError) {
      * @param dbEncoder the encoder
      * @return this
      */
-    public InsertOptions dbEncoder(final DBEncoder dbEncoder) {
+    public InsertOptions dbEncoder(@Nullable final DBEncoder dbEncoder) {
         this.dbEncoder = dbEncoder;
         return this;
     }
@@ -66,6 +68,7 @@ public InsertOptions dbEncoder(final DBEncoder dbEncoder) {
      *
      * @return the write concern, or null if the default will be used.
      */
+    @Nullable
     public WriteConcern getWriteConcern() {
         return writeConcern;
     }
@@ -85,6 +88,7 @@ public boolean isContinueOnError() {
      *
      * @return the encoder, or null if the default will be used
      */
+    @Nullable
     public DBEncoder getDbEncoder() {
         return dbEncoder;
     }
@@ -97,6 +101,7 @@ public DBEncoder getDbEncoder() {
      * @since 2.14
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -109,7 +114,7 @@ public Boolean getBypassDocumentValidation() {
      * @since 2.14
      * @mongodb.server.release 3.2
      */
-    public InsertOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public InsertOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
         return this;
     }
diff --git a/driver/src/main/com/mongodb/InsertRequest.java b/driver-legacy/src/main/com/mongodb/InsertRequest.java
similarity index 84%
rename from driver/src/main/com/mongodb/InsertRequest.java
rename to driver-legacy/src/main/com/mongodb/InsertRequest.java
index e67984fd2ca..2dd0d363a96 100644
--- a/driver/src/main/com/mongodb/InsertRequest.java
+++ b/driver-legacy/src/main/com/mongodb/InsertRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ class InsertRequest extends WriteRequest {
     private final DBObject document;
     private final Encoder<DBObject> codec;
 
-    public InsertRequest(final DBObject document, final Encoder<DBObject> codec) {
+    InsertRequest(final DBObject document, final Encoder<DBObject> codec) {
         this.document = document;
         this.codec = codec;
     }
@@ -33,7 +33,7 @@ public DBObject getDocument() {
     }
 
     @Override
-    com.mongodb.bulk.WriteRequest toNew() {
+    com.mongodb.bulk.WriteRequest toNew(final DBCollection dbCollection) {
         return new com.mongodb.bulk.InsertRequest(new BsonDocumentWrapper<DBObject>(document, codec));
     }
 }
diff --git a/driver/src/main/com/mongodb/LazyDBCallback.java b/driver-legacy/src/main/com/mongodb/LazyDBCallback.java
similarity index 92%
rename from driver/src/main/com/mongodb/LazyDBCallback.java
rename to driver-legacy/src/main/com/mongodb/LazyDBCallback.java
index 7b3fa0a6644..612da12c285 100644
--- a/driver/src/main/com/mongodb/LazyDBCallback.java
+++ b/driver-legacy/src/main/com/mongodb/LazyDBCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import org.bson.LazyBSONCallback;
 import org.bson.types.ObjectId;
 
@@ -32,7 +33,7 @@ public class LazyDBCallback extends LazyBSONCallback implements DBCallback {
      *
      * @param collection the {@code DBCollection} containing the document.  This parameter is no longer used.
      */
-    public LazyDBCallback(final DBCollection collection) {
+    public LazyDBCallback(@Nullable final DBCollection collection) {
     }
 
     @Override
diff --git a/driver/src/main/com/mongodb/LazyDBDecoder.java b/driver-legacy/src/main/com/mongodb/LazyDBDecoder.java
similarity index 92%
rename from driver/src/main/com/mongodb/LazyDBDecoder.java
rename to driver-legacy/src/main/com/mongodb/LazyDBDecoder.java
index 2f46ebc5416..28b3c378248 100644
--- a/driver/src/main/com/mongodb/LazyDBDecoder.java
+++ b/driver-legacy/src/main/com/mongodb/LazyDBDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import org.bson.LazyBSONDecoder;
 
 import java.io.IOException;
@@ -27,7 +28,7 @@
 public class LazyDBDecoder extends LazyBSONDecoder implements DBDecoder {
 
     @Override
-    public DBCallback getDBCallback(final DBCollection collection) {
+    public DBCallback getDBCallback(@Nullable final DBCollection collection) {
         // callback doesn't do anything special, could be unique per decoder
         // but have to create per collection due to DBRef, at least
         return new LazyDBCallback(collection);
diff --git a/driver/src/main/com/mongodb/LazyDBEncoder.java b/driver-legacy/src/main/com/mongodb/LazyDBEncoder.java
similarity index 97%
rename from driver/src/main/com/mongodb/LazyDBEncoder.java
rename to driver-legacy/src/main/com/mongodb/LazyDBEncoder.java
index e1a96b61bd6..3917edb8af7 100644
--- a/driver/src/main/com/mongodb/LazyDBEncoder.java
+++ b/driver-legacy/src/main/com/mongodb/LazyDBEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/LazyDBList.java b/driver-legacy/src/main/com/mongodb/LazyDBList.java
similarity index 76%
rename from driver/src/main/com/mongodb/LazyDBList.java
rename to driver-legacy/src/main/com/mongodb/LazyDBList.java
index babd8b99a46..77227e03d7f 100644
--- a/driver/src/main/com/mongodb/LazyDBList.java
+++ b/driver-legacy/src/main/com/mongodb/LazyDBList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,4 +56,17 @@ public void markAsPartialObject() {
     public boolean isPartialObject() {
         return isPartial;
     }
+
+    /**
+     * Returns a JSON serialization of this object
+     *
+     * @return JSON serialization
+     * @deprecated there is no replacement for this method, as the driver no longer supports generating top-level JSON arrays. To encode
+     * an instance of this class to JSON it must be embedded inside a document.
+     */
+    @SuppressWarnings("deprecation")
+    @Deprecated
+    public String toString() {
+        return com.mongodb.util.JSON.serialize(this);
+    }
 }
diff --git a/driver/src/main/com/mongodb/LazyDBObject.java b/driver-legacy/src/main/com/mongodb/LazyDBObject.java
similarity index 87%
rename from driver/src/main/com/mongodb/LazyDBObject.java
rename to driver-legacy/src/main/com/mongodb/LazyDBObject.java
index 47212f97a79..ad36358932f 100644
--- a/driver/src/main/com/mongodb/LazyDBObject.java
+++ b/driver-legacy/src/main/com/mongodb/LazyDBObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,4 +59,14 @@ public void markAsPartialObject() {
     public boolean isPartialObject() {
         return isPartial;
     }
+
+    /**
+     * Returns a JSON serialization of this object
+     *
+     * @return JSON serialization
+     */
+    @SuppressWarnings("deprecation")
+    public String toString() {
+        return com.mongodb.util.JSON.serialize(this);
+    }
 }
diff --git a/driver/src/main/com/mongodb/MapReduceCommand.java b/driver-legacy/src/main/com/mongodb/MapReduceCommand.java
similarity index 87%
rename from driver/src/main/com/mongodb/MapReduceCommand.java
rename to driver-legacy/src/main/com/mongodb/MapReduceCommand.java
index fff3c4b12fd..0f4128e1d6e 100644
--- a/driver/src/main/com/mongodb/MapReduceCommand.java
+++ b/driver-legacy/src/main/com/mongodb/MapReduceCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,9 @@
 
 package com.mongodb;
 
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -44,6 +47,7 @@ public class MapReduceCommand {
     private Boolean jsMode;
     private Boolean verbose;
     private Boolean bypassDocumentValidation;
+    private Collation collation;
 
     /**
      * Represents the command for a map reduce operation Runs the command in REPLACE output type to a named collection
@@ -57,8 +61,8 @@ public class MapReduceCommand {
      *                         function.
      * @mongodb.driver.manual reference/command/mapReduce/ Map Reduce Command
      */
-    public MapReduceCommand(final DBCollection inputCollection, final String map, final String reduce, final String outputCollection,
-                            final OutputType type, final DBObject query) {
+    public MapReduceCommand(final DBCollection inputCollection, final String map, final String reduce,
+                            @Nullable final String outputCollection, final OutputType type, final DBObject query) {
         this.mapReduce = inputCollection.getName();
         this.map = map;
         this.reduce = reduce;
@@ -120,6 +124,7 @@ public String getReduce() {
      *
      * @return The outputCollection
      */
+    @Nullable
     public String getOutputTarget() {
         return outputCollection;
     }
@@ -140,6 +145,7 @@ public OutputType getOutputType() {
      *
      * @return The finalize function (as a JS String).
      */
+    @Nullable
     public String getFinalize() {
         return finalize;
     }
@@ -149,7 +155,7 @@ public String getFinalize() {
      *
      * @param finalize The finalize function (as a JS String)
      */
-    public void setFinalize(final String finalize) {
+    public void setFinalize(@Nullable final String finalize) {
         this.finalize = finalize;
     }
 
@@ -158,6 +164,7 @@ public void setFinalize(final String finalize) {
      *
      * @return The query object
      */
+    @Nullable
     public DBObject getQuery() {
         return query;
     }
@@ -167,6 +174,7 @@ public DBObject getQuery() {
      *
      * @return the Sort DBObject
      */
+    @Nullable
     public DBObject getSort() {
         return sort;
     }
@@ -176,7 +184,7 @@ public DBObject getSort() {
      *
      * @param sort The sort specification object
      */
-    public void setSort(final DBObject sort) {
+    public void setSort(@Nullable final DBObject sort) {
         this.sort = sort;
     }
 
@@ -227,6 +235,7 @@ public void setMaxTime(final long maxTime, final TimeUnit timeUnit) {
      *
      * @return The JavaScript scope
      */
+    @Nullable
     public Map<String, Object> getScope() {
         return scope;
     }
@@ -236,7 +245,7 @@ public Map<String, Object> getScope() {
      *
      * @param scope The JavaScript scope
      */
-    public void setScope(final Map<String, Object> scope) {
+    public void setScope(@Nullable final Map<String, Object> scope) {
         this.scope = scope;
     }
 
@@ -246,6 +255,7 @@ public void setScope(final Map<String, Object> scope) {
      * @return The JavaScript mode
      * @since 2.13
      */
+    @Nullable
     public Boolean getJsMode() {
         return jsMode;
     }
@@ -256,7 +266,7 @@ public Boolean getJsMode() {
      * @param jsMode Specifies whether to convert intermediate data into BSON format between the execution of the map and reduce functions
      * @since 2.13
      */
-    public void setJsMode(final Boolean jsMode) {
+    public void setJsMode(final @Nullable Boolean jsMode) {
         this.jsMode = jsMode;
     }
 
@@ -265,6 +275,7 @@ public void setJsMode(final Boolean jsMode) {
      *
      * @return the name of the database the result is stored in, or null.
      */
+    @Nullable
     public String getOutputDB() {
         return this.outputDB;
     }
@@ -274,7 +285,7 @@ public String getOutputDB() {
      *
      * @param outputDB the name of the database to send the Map Reduce output to
      */
-    public void setOutputDB(final String outputDB) {
+    public void setOutputDB(@Nullable final String outputDB) {
         this.outputDB = outputDB;
     }
 
@@ -285,6 +296,7 @@ public void setOutputDB(final String outputDB) {
      * @since 2.14
      * @mongodb.server.release 3.2
      */
+    @Nullable
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -296,7 +308,7 @@ public Boolean getBypassDocumentValidation() {
      * @since 2.14
      * @mongodb.server.release 3.2
      */
-    public void setBypassDocumentValidation(final Boolean bypassDocumentValidation) {
+    public void setBypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
         this.bypassDocumentValidation = bypassDocumentValidation;
     }
 
@@ -374,7 +386,7 @@ public DBObject toDBObject() {
      *
      * @param preference Read Preference to use
      */
-    public void setReadPreference(final ReadPreference preference) {
+    public void setReadPreference(@Nullable final ReadPreference preference) {
         this.readPreference = preference;
     }
 
@@ -383,15 +395,47 @@ public void setReadPreference(final ReadPreference preference) {
      *
      * @return the readPreference
      */
+    @Nullable
     public ReadPreference getReadPreference() {
         return readPreference;
     }
 
+    /**
+     * Returns the collation
+     *
+     * @return the collation
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation options
+     *
+     * @param collation the collation options
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public void setCollation(final Collation collation) {
+        this.collation = collation;
+    }
+
     @Override
     public String toString() {
         return toDBObject().toString();
     }
 
+    String getOutputTargetNonNull() {
+        if (outputCollection == null) {
+            throw new MongoInternalException("outputCollection can not be null in this context");
+        }
+        return outputCollection;
+    }
+
     /**
      * Represents the different options available for outputting the results of a map-reduce operation.
      *
diff --git a/driver/src/main/com/mongodb/MapReduceOutput.java b/driver-legacy/src/main/com/mongodb/MapReduceOutput.java
similarity index 98%
rename from driver/src/main/com/mongodb/MapReduceOutput.java
rename to driver-legacy/src/main/com/mongodb/MapReduceOutput.java
index 3a27a2ec31b..3336ef05889 100644
--- a/driver/src/main/com/mongodb/MapReduceOutput.java
+++ b/driver-legacy/src/main/com/mongodb/MapReduceOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import com.mongodb.operation.MapReduceBatchCursor;
 import com.mongodb.operation.MapReduceStatistics;
 
@@ -123,6 +124,7 @@ public String toString() {
      *
      * @return the name of the collection that the map reduce results are stored in
      */
+    @Nullable
     public final String getCollectionName() {
         return collection == null ? null : collection.getName();
     }
diff --git a/driver/src/main/com/mongodb/Mongo.java b/driver-legacy/src/main/com/mongodb/Mongo.java
similarity index 76%
rename from driver/src/main/com/mongodb/Mongo.java
rename to driver-legacy/src/main/com/mongodb/Mongo.java
index 19cc046918e..e659298c9d6 100644
--- a/driver/src/main/com/mongodb/Mongo.java
+++ b/driver-legacy/src/main/com/mongodb/Mongo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@
 package com.mongodb;
 
 import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.binding.ClusterBinding;
 import com.mongodb.binding.ConnectionSource;
-import com.mongodb.binding.ReadBinding;
 import com.mongodb.binding.ReadWriteBinding;
 import com.mongodb.binding.SingleServerBinding;
-import com.mongodb.binding.WriteBinding;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.internal.MongoClientDelegate;
+import com.mongodb.client.internal.MongoIterableImpl;
+import com.mongodb.client.internal.OperationExecutor;
+import com.mongodb.client.internal.SimpleMongoClient;
 import com.mongodb.connection.BufferProvider;
 import com.mongodb.connection.Cluster;
 import com.mongodb.connection.ClusterConnectionMode;
@@ -33,20 +35,17 @@
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.connection.SocketStreamFactory;
 import com.mongodb.event.ClusterListener;
-import com.mongodb.event.CommandEventMulticaster;
-import com.mongodb.event.CommandListener;
 import com.mongodb.internal.connection.PowerOfTwoBufferPool;
+import com.mongodb.internal.session.ServerSessionPool;
 import com.mongodb.internal.thread.DaemonThreadFactory;
-import com.mongodb.management.JMXConnectionPoolListener;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
 import com.mongodb.operation.CurrentOpOperation;
 import com.mongodb.operation.FsyncUnlockOperation;
 import com.mongodb.operation.ListDatabasesOperation;
-import com.mongodb.operation.OperationExecutor;
 import com.mongodb.operation.ReadOperation;
-import com.mongodb.operation.WriteOperation;
-import com.mongodb.selector.LatencyMinimizingServerSelector;
-import com.mongodb.selector.ServerSelector;
 import org.bson.BsonBoolean;
+import org.bson.codecs.configuration.CodecRegistry;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -60,13 +59,16 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import static com.mongodb.ReadPreference.primary;
+import static com.mongodb.client.internal.Crypts.createCrypt;
 import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
 import static com.mongodb.connection.ClusterType.REPLICA_SET;
+import static com.mongodb.internal.event.EventListenerHelper.getCommandListener;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.bson.internal.CodecRegistryHelper.createRegistry;
 
 /**
  * <p>A database connection with internal connection pooling. For most applications, you should have one Mongo instance for the entire
@@ -77,8 +79,11 @@
  * @see MongoClient
  * @see ReadPreference
  * @see WriteConcern
+ * @deprecated Replaced by {@link MongoClient}.  Any non-deprecated methods will be moved to MongoClient. The rest will be removed along
+ * with this class.
  */
 @ThreadSafe
+@Deprecated
 public class Mongo {
     static final String ADMIN_DATABASE_NAME = "admin";
 
@@ -91,13 +96,14 @@ public class Mongo {
     private final MongoClientOptions options;
     private final List<MongoCredential> credentialsList;
 
+    @SuppressWarnings("deprecation")
     private final Bytes.OptionHolder optionHolder;
 
-    private final Cluster cluster;
     private final BufferProvider bufferProvider = new PowerOfTwoBufferPool();
 
     private final ConcurrentLinkedQueue<ServerCursorAndNamespace> orphanedCursors = new ConcurrentLinkedQueue<ServerCursorAndNamespace>();
     private final ExecutorService cursorCleaningService;
+    private final MongoClientDelegate delegate;
 
     /**
      * Creates a Mongo instance based on a (single) mongodb node (localhost, default port)
@@ -284,30 +290,55 @@ public Mongo(
     }
 
     Mongo(final ServerAddress serverAddress, final List<MongoCredential> credentialsList, final MongoClientOptions options) {
-        this(createCluster(serverAddress, credentialsList, options), options, credentialsList);
+        this(serverAddress, credentialsList, options, null);
+    }
+
+    Mongo(final ServerAddress serverAddress, final List<MongoCredential> credentialsList, final MongoClientOptions options,
+          @Nullable final MongoDriverInformation mongoDriverInformation) {
+        this(createCluster(serverAddress, credentialsList, options, mongoDriverInformation), options, credentialsList);
     }
 
     Mongo(final List<ServerAddress> seedList, final List<MongoCredential> credentialsList, final MongoClientOptions options) {
-        this(createCluster(seedList, credentialsList, options), options, credentialsList);
+        this(seedList, credentialsList, options, null);
+    }
+
+    Mongo(final List<ServerAddress> seedList, final List<MongoCredential> credentialsList, final MongoClientOptions options,
+          @Nullable final MongoDriverInformation mongoDriverInformation) {
+        this(createCluster(seedList, credentialsList, options, mongoDriverInformation), options, credentialsList);
     }
 
     Mongo(final MongoClientURI mongoURI) {
-        this(createCluster(mongoURI),
-             mongoURI.getOptions(),
-             mongoURI.getCredentials() != null ? asList(mongoURI.getCredentials()) : Collections.<MongoCredential>emptyList());
+        this(mongoURI, null);
+    }
+
+    Mongo(final MongoClientURI mongoURI, @Nullable final MongoDriverInformation mongoDriverInformation) {
+        this(createCluster(mongoURI, mongoDriverInformation), mongoURI.getOptions(),
+                mongoURI.getCredentials() != null ? asList(mongoURI.getCredentials()) : Collections.<MongoCredential>emptyList());
     }
 
+    @SuppressWarnings("deprecation")
     Mongo(final Cluster cluster, final MongoClientOptions options, final List<MongoCredential> credentialsList) {
-        this.cluster = cluster;
         this.options = options;
-        this.readPreference = options.getReadPreference() != null ? options.getReadPreference() : primary();
-        this.writeConcern = options.getWriteConcern() != null ? options.getWriteConcern() : WriteConcern.UNACKNOWLEDGED;
-        this.readConcern = options.getReadConcern() != null ? options.getReadConcern() : ReadConcern.DEFAULT;
+        this.readPreference = options.getReadPreference();
+        this.writeConcern = options.getWriteConcern();
+        this.readConcern = options.getReadConcern();
         this.optionHolder = new Bytes.OptionHolder(null);
         this.credentialsList = unmodifiableList(credentialsList);
+
+        AutoEncryptionSettings autoEncryptionSettings = options.getAutoEncryptionSettings();
+        this.delegate = new MongoClientDelegate(cluster,
+                createRegistry(options.getCodecRegistry(), options.getUuidRepresentation()),
+                credentialsList, this,
+                autoEncryptionSettings == null ? null : createCrypt(asSimpleMongoClient(), autoEncryptionSettings));
+
         cursorCleaningService = options.isCursorFinalizerEnabled() ? createCursorCleaningService() : null;
     }
 
+    // bit of a hack, but it works because only MongoClient subclass will ever make use of this
+    SimpleMongoClient asSimpleMongoClient() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * Sets the default write concern to use for write operations executed on any {@link DBCollection} created indirectly from this
      * instance, via a {@link DB} instance created from {@link #getDB(String)}.
@@ -375,9 +406,9 @@ public ReadPreference getReadPreference() {
      * @return list of server addresses
      * @throws MongoException if there's a failure
      */
+    @Deprecated
     public List<ServerAddress> getAllAddress() {
-        //TODO It should return the address list without auto-discovered nodes. Not sure if it's required. Maybe users confused with name.
-        return getServerAddressList();
+        return delegate.getCluster().getSettings().getHosts();
     }
 
     /**
@@ -386,16 +417,13 @@ public List<ServerAddress> getAllAddress() {
      * @return list of server addresses
      * @throws MongoException if there's a failure
      */
+    @Deprecated
     public List<ServerAddress> getServerAddressList() {
-        List<ServerAddress> serverAddresses = new ArrayList<ServerAddress>();
-        for (final ServerDescription cur : getClusterDescription().getServerDescriptions()) {
-            serverAddresses.add(cur.getAddress());
-        }
-        return serverAddresses;
+        return delegate.getServerAddressList();
     }
 
     private ClusterDescription getClusterDescription() {
-        return cluster.getDescription();
+        return delegate.getCluster().getDescription();
     }
 
     /**
@@ -403,7 +431,9 @@ private ClusterDescription getClusterDescription() {
      *
      * @return the address
      */
+    @Deprecated
     @SuppressWarnings("deprecation")
+    @Nullable
     public ServerAddress getAddress() {
         ClusterDescription description = getClusterDescription();
         if (description.getPrimaries().isEmpty()) {
@@ -421,6 +451,7 @@ public ServerAddress getAddress() {
      * @deprecated Please use {@link MongoClient} class to connect to server and corresponding {@link
      * com.mongodb.MongoClient#getMongoClientOptions()}
      */
+    @SuppressWarnings("deprecation")
     @Deprecated
     public MongoOptions getMongoOptions() {
         return new MongoOptions(getMongoClientOptions());
@@ -431,10 +462,13 @@ public MongoOptions getMongoOptions() {
      *
      * @return replica set status information
      */
+    @SuppressWarnings("deprecation")
+    @Deprecated
+    @Nullable
     public ReplicaSetStatus getReplicaSetStatus() {
         ClusterDescription clusterDescription = getClusterDescription();
         return clusterDescription.getType() == REPLICA_SET && clusterDescription.getConnectionMode() == MULTIPLE
-               ? new ReplicaSetStatus(cluster) : null; // this is intended behavior in 2.x
+               ? new ReplicaSetStatus(delegate.getCluster()) : null; // this is intended behavior in 2.x
     }
 
 
@@ -447,14 +481,18 @@ public ReplicaSetStatus getReplicaSetStatus() {
      */
     @Deprecated
     public List<String> getDatabaseNames() {
-      return new OperationIterable<DBObject>(new ListDatabasesOperation<DBObject>(MongoClient.getCommandCodec()),
-          primary(), createOperationExecutor())
-          .map(new Function<DBObject, String>() {
-              @Override
-              public String apply(final DBObject result) {
-                  return (String) result.get("name");
-              }
-          }).into(new ArrayList<String>());
+        return new MongoIterableImpl<DBObject>(null, createOperationExecutor(), ReadConcern.DEFAULT, primary(),
+                options.getRetryReads()) {
+            @Override
+            public ReadOperation<BatchCursor<DBObject>> asReadOperation() {
+                return new ListDatabasesOperation<DBObject>(MongoClient.getCommandCodec());
+            }
+        }.map(new Function<DBObject, String>() {
+            @Override
+            public String apply(final DBObject result) {
+                return (String) result.get("name");
+            }
+        }).into(new ArrayList<String>());
     }
 
     /**
@@ -469,9 +507,13 @@ public String apply(final DBObject result) {
      *
      * @param dbName the name of the database to retrieve
      * @return a DB representing the specified database
-     * @deprecated use {@link com.mongodb.MongoClient#getDatabase(String)}
+     * @throws IllegalArgumentException if the name is invalid
+     * @see MongoNamespace#checkDatabaseNameValidity(String)
+     * @deprecated This method is not currently scheduled for removal, but prefer {@link com.mongodb.MongoClient#getDatabase(String)} for
+     * new code.  Note that {@link DB} and {@link com.mongodb.client.MongoDatabase} can be used together in the same application, whith the
+     * same {@link MongoClient} instance.
      */
-    @Deprecated
+    @Deprecated // NOT CURRENTLY INTENDED FOR REMOVAL
     public DB getDB(final String dbName) {
         DB db = dbCache.get(dbName);
         if (db != null) {
@@ -492,6 +534,7 @@ public DB getDB(final String dbName) {
      *
      * @return a collection of database objects
      */
+    @Deprecated
     public Collection<DB> getUsedDatabases() {
         return dbCache.values();
     }
@@ -512,7 +555,7 @@ public void dropDatabase(final String dbName) {
      * databases obtained from it can no longer be used.
      */
     public void close() {
-        cluster.close();
+        delegate.close();
         if (cursorCleaningService != null) {
             cursorCleaningService.shutdownNow();
         }
@@ -524,6 +567,7 @@ public void close() {
      * @see ReadPreference#secondaryPreferred()
      * @deprecated Replaced with {@code ReadPreference.secondaryPreferred()}
      */
+    @SuppressWarnings("deprecation")
     @Deprecated
     public void slaveOk() {
         addOption(Bytes.QUERYOPTION_SLAVEOK);
@@ -595,6 +639,7 @@ public int getOptions() {
      * @throws MongoException if there's a failure
      * @mongodb.driver.manual reference/command/fsync/ fsync command
      */
+    @Deprecated
     public CommandResult fsync(final boolean async) {
         DBObject command = new BasicDBObject("fsync", 1);
         if (async) {
@@ -611,6 +656,7 @@ public CommandResult fsync(final boolean async) {
      * @throws MongoException if there's a failure
      * @mongodb.driver.manual reference/command/fsync/ fsync command
      */
+    @Deprecated
     public CommandResult fsyncAndLock() {
         DBObject command = new BasicDBObject("fsync", 1);
         command.put("lock", 1);
@@ -625,8 +671,9 @@ public CommandResult fsyncAndLock() {
      * @throws MongoException if there's a failure
      * @mongodb.driver.manual reference/command/fsync/ fsync command
      */
+    @Deprecated
     public DBObject unlock() {
-        return DBObjects.toDBObject(execute(new FsyncUnlockOperation()));
+        return DBObjects.toDBObject(createOperationExecutor().execute(new FsyncUnlockOperation(), readPreference, readConcern));
     }
 
     /**
@@ -636,9 +683,10 @@ public DBObject unlock() {
      * @throws MongoException if the operation fails
      * @mongodb.driver.manual reference/command/fsync/ fsync command
      */
+    @Deprecated
     public boolean isLocked() {
-        return execute(new CurrentOpOperation(), ReadPreference.primary())
-               .getBoolean("fsyncLock", BsonBoolean.FALSE).getValue();
+        return createOperationExecutor().execute(new CurrentOpOperation(), ReadPreference.primary(), readConcern)
+                       .getBoolean("fsyncLock", BsonBoolean.FALSE).getValue();
     }
 
     @Override
@@ -655,6 +703,7 @@ public String toString() {
      * @return the maximum size, or 0 if not obtained from servers yet.
      * @throws MongoException if there's a failure
      */
+    @Deprecated
     @SuppressWarnings("deprecation")
     public int getMaxBsonObjectSize() {
         List<ServerDescription> primaries = getClusterDescription().getPrimaries();
@@ -666,106 +715,94 @@ public int getMaxBsonObjectSize() {
      *
      * @return server address in a host:port form
      */
+    @Deprecated
+    @Nullable
     public String getConnectPoint() {
         ServerAddress master = getAddress();
         return master != null ? String.format("%s:%d", master.getHost(), master.getPort()) : null;
     }
 
     private static MongoClientOptions createLegacyOptions() {
-        return MongoClientOptions.builder()
-                                 .legacyDefaults()
-                                 .build();
+        return MongoClientOptions.builder().legacyDefaults().build();
     }
 
-    private static Cluster createCluster(final MongoClientURI mongoURI) {
-
+    private static Cluster createCluster(final MongoClientURI mongoURI, @Nullable final MongoDriverInformation mongoDriverInformation) {
         List<MongoCredential> credentialList = mongoURI.getCredentials() != null
-                                               ? asList(mongoURI.getCredentials())
-                                               : Collections.<MongoCredential>emptyList();
-
-        if (mongoURI.getHosts().size() == 1) {
-            return createCluster(new ServerAddress(mongoURI.getHosts().get(0)),
-                                 credentialList,
-                                 mongoURI.getOptions());
-        } else {
-            List<ServerAddress> seedList = new ArrayList<ServerAddress>(mongoURI.getHosts().size());
-            for (final String host : mongoURI.getHosts()) {
-                seedList.add(new ServerAddress(host));
-            }
-            return createCluster(seedList, credentialList, mongoURI.getOptions());
-        }
+                ? singletonList(mongoURI.getCredentials()) : Collections.<MongoCredential>emptyList();
+        return createCluster(getClusterSettings(ClusterSettings.builder().applyConnectionString(mongoURI.getProxied()),
+                mongoURI.getOptions()), credentialList, mongoURI.getOptions(), mongoDriverInformation);
     }
 
     private static Cluster createCluster(final List<ServerAddress> seedList,
-                                         final List<MongoCredential> credentialsList, final MongoClientOptions options) {
-        return createCluster(ClusterSettings.builder().hosts(createNewSeedList(seedList))
-                                            .requiredReplicaSetName(options.getRequiredReplicaSetName())
-                                            .serverSelectionTimeout(options.getServerSelectionTimeout(), MILLISECONDS)
-                                            .serverSelector(createServerSelector(options))
-                                            .description(options.getDescription())
-                                            .maxWaitQueueSize(options.getConnectionPoolSettings().getMaxWaitQueueSize()),
-                             credentialsList, options);
+                                         final List<MongoCredential> credentialsList, final MongoClientOptions options,
+                                         @Nullable final MongoDriverInformation mongoDriverInformation) {
+        return createCluster(getClusterSettings(seedList, options, ClusterConnectionMode.MULTIPLE), credentialsList, options,
+                mongoDriverInformation);
     }
 
     private static Cluster createCluster(final ServerAddress serverAddress, final List<MongoCredential> credentialsList,
-                                         final MongoClientOptions options) {
-        return createCluster(ClusterSettings.builder()
-                                            .mode(getSingleServerClusterMode(options))
-                                            .hosts(asList(serverAddress))
-                                            .requiredReplicaSetName(options.getRequiredReplicaSetName())
-                                            .serverSelectionTimeout(options.getServerSelectionTimeout(), MILLISECONDS)
-                                            .serverSelector(createServerSelector(options))
-                                            .description(options.getDescription())
-                                            .maxWaitQueueSize(options.getConnectionPoolSettings().getMaxWaitQueueSize()),
-                             credentialsList, options);
-    }
-
-    private static Cluster createCluster(final ClusterSettings.Builder settingsBuilder, final List<MongoCredential> credentialsList,
-                                         final MongoClientOptions options) {
-        for (ClusterListener cur : options.getClusterListeners()) {
-            settingsBuilder.addClusterListener(cur);
-        }
-        return new DefaultClusterFactory().create(settingsBuilder.build(),
-                                                  options.getServerSettings(),
-                                                  options.getConnectionPoolSettings(),
-                                                  new SocketStreamFactory(options.getSocketSettings(),
-                                                                          options.getSslSettings(),
-                                                                          options.getSocketFactory()),
-                                                  new SocketStreamFactory(options.getHeartbeatSocketSettings(),
-                                                                          options.getSslSettings(),
-                                                                          options.getSocketFactory()),
-                                                  credentialsList, null,
-                                                  new JMXConnectionPoolListener(), null,
-                                                  createCommandListener(options.getCommandListeners()));
-    }
-
-    private static CommandListener createCommandListener(final List<CommandListener> commandListeners) {
-        switch (commandListeners.size()) {
-            case 0:
-                return null;
-            case 1:
-                return commandListeners.get(0);
-            default:
-                return new CommandEventMulticaster(commandListeners);
+                                         final MongoClientOptions options, @Nullable final MongoDriverInformation mongoDriverInformation) {
+        return createCluster(getClusterSettings(singletonList(serverAddress), options, getSingleServerClusterMode(options)),
+                credentialsList, options, mongoDriverInformation);
+    }
+
+    private static Cluster createCluster(final ClusterSettings clusterSettings, final List<MongoCredential> credentialsList,
+                                         final MongoClientOptions options, @Nullable final MongoDriverInformation mongoDriverInformation) {
+        MongoDriverInformation.Builder builder = mongoDriverInformation == null ? MongoDriverInformation.builder()
+                    : MongoDriverInformation.builder(mongoDriverInformation);
+        return new DefaultClusterFactory().createCluster(clusterSettings,
+                options.getServerSettings(),
+                options.getConnectionPoolSettings(),
+                new SocketStreamFactory(options.getSocketSettings(),
+                                        options.getSslSettings(),
+                                        options.getSocketFactory()),
+                new SocketStreamFactory(options.getHeartbeatSocketSettings(),
+                                        options.getSslSettings(),
+                                        options.getSocketFactory()),
+                credentialsList,
+                getCommandListener(options.getCommandListeners()),
+                options.getApplicationName(),
+                builder.driverName("legacy").build(),
+                options.getCompressorList());
+    }
+
+    private static ClusterSettings getClusterSettings(final ClusterSettings.Builder builder, final MongoClientOptions options) {
+        builder.requiredReplicaSetName(options.getRequiredReplicaSetName())
+                .serverSelectionTimeout(options.getServerSelectionTimeout(), MILLISECONDS)
+                .localThreshold(options.getLocalThreshold(), MILLISECONDS)
+                .serverSelector(options.getServerSelector())
+                .description(options.getDescription())
+                .maxWaitQueueSize(options.getConnectionPoolSettings().getMaxWaitQueueSize());
+        for (ClusterListener clusterListener: options.getClusterListeners()) {
+            builder.addClusterListener(clusterListener);
         }
+        return builder.build();
     }
 
-    private static List<ServerAddress> createNewSeedList(final List<ServerAddress> seedList) {
-        List<ServerAddress> retVal = new ArrayList<ServerAddress>(seedList.size());
-        for (final ServerAddress cur : seedList) {
-            retVal.add(cur);
-        }
-        return retVal;
+    private static ClusterSettings getClusterSettings(final List<ServerAddress> seedList, final MongoClientOptions options,
+                                                      final ClusterConnectionMode clusterConnectionMode) {
+        return getClusterSettings(ClusterSettings.builder()
+                .hosts(new ArrayList<ServerAddress>(seedList))
+                .mode(clusterConnectionMode), options);
     }
 
-    private static ServerSelector createServerSelector(final MongoClientOptions options) {
-        return new LatencyMinimizingServerSelector(options.getLocalThreshold(), MILLISECONDS);
+    Cluster getCluster() {
+        return delegate.getCluster();
     }
 
-    Cluster getCluster() {
-        return cluster;
+    MongoClientDelegate getDelegate() {
+        return delegate;
+    }
+
+    CodecRegistry getCodecRegistry() {
+        return delegate.getCodecRegistry();
     }
 
+    ServerSessionPool getServerSessionPool() {
+        return delegate.getServerSessionPool();
+    }
+
+    @SuppressWarnings("deprecation")
     Bytes.OptionHolder getOptionHolder() {
         return optionHolder;
     }
@@ -782,56 +819,21 @@ List<MongoCredential> getCredentialsList() {
         return credentialsList;
     }
 
-    WriteBinding getWriteBinding() {
-        return getReadWriteBinding(primary());
-    }
-
-    ReadBinding getReadBinding(final ReadPreference readPreference) {
-        return getReadWriteBinding(readPreference);
-    }
-
-    private ReadWriteBinding getReadWriteBinding(final ReadPreference readPreference) {
-        return new ClusterBinding(getCluster(), readPreference);
-    }
-
     void addOrphanedCursor(final ServerCursor serverCursor, final MongoNamespace namespace) {
         orphanedCursors.add(new ServerCursorAndNamespace(serverCursor, namespace));
     }
 
     OperationExecutor createOperationExecutor() {
-        return new OperationExecutor() {
-            @Override
-            public <T> T execute(final ReadOperation<T> operation, final ReadPreference readPreference) {
-                return Mongo.this.execute(operation, readPreference);
-            }
-
-            @Override
-            public <T> T execute(final WriteOperation<T> operation) {
-                return Mongo.this.execute(operation);
-            }
-        };
+        return delegate.getOperationExecutor();
     }
 
-    <T> T execute(final ReadOperation<T> operation, final ReadPreference readPreference) {
-        ReadBinding binding = getReadBinding(readPreference);
-        try {
-            return operation.execute(binding);
-        } finally {
-            binding.release();
-        }
-    }
-
-    <T> T execute(final WriteOperation<T> operation) {
-        WriteBinding binding = getWriteBinding();
-        try {
-            return operation.execute(binding);
-        } finally {
-            binding.release();
-        }
+    @Nullable
+    ClientSession createClientSession(final ClientSessionOptions options) {
+        return delegate.createClientSession(options, readConcern, writeConcern, readPreference);
     }
 
     private ExecutorService createCursorCleaningService() {
-        ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory());
+        ScheduledExecutorService newTimer = Executors.newSingleThreadScheduledExecutor(new DaemonThreadFactory("CleanCursors"));
         newTimer.scheduleAtFixedRate(new Runnable() {
             @Override
             public void run() {
@@ -844,7 +846,7 @@ public void run() {
     private void cleanCursors() {
         ServerCursorAndNamespace cur;
         while ((cur = orphanedCursors.poll()) != null) {
-            ReadWriteBinding binding = new SingleServerBinding(cluster, cur.serverCursor.getAddress());
+            ReadWriteBinding binding = new SingleServerBinding(delegate.getCluster(), cur.serverCursor.getAddress());
             try {
                 ConnectionSource source = binding.getReadConnectionSource();
                 try {
@@ -875,7 +877,7 @@ private static class ServerCursorAndNamespace {
         private final ServerCursor serverCursor;
         private final MongoNamespace namespace;
 
-        public ServerCursorAndNamespace(final ServerCursor serverCursor, final MongoNamespace namespace) {
+        ServerCursorAndNamespace(final ServerCursor serverCursor, final MongoNamespace namespace) {
             this.serverCursor = serverCursor;
             this.namespace = namespace;
         }
@@ -885,6 +887,7 @@ public ServerCursorAndNamespace(final ServerCursor serverCursor, final MongoName
      * Mongo.Holder can be used as a static place to hold several instances of Mongo. Security is not enforced at this level, and needs to
      * be done on the application side.
      */
+    @Deprecated
     public static class Holder {
 
         private static final Holder INSTANCE = new Holder();
@@ -908,6 +911,7 @@ public static Holder singleton() {
          * @throws MongoException if there's a failure
          * @deprecated Please use {@link #connect(MongoClientURI)} instead.
          */
+        @SuppressWarnings("deprecation")
         @Deprecated
         public Mongo connect(final MongoURI uri) {
             return connect(uri.toClientURI());
diff --git a/driver-legacy/src/main/com/mongodb/MongoClient.java b/driver-legacy/src/main/com/mongodb/MongoClient.java
new file mode 100644
index 00000000000..63daf35fee4
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/MongoClient.java
@@ -0,0 +1,739 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.ListDatabasesIterable;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.MongoIterable;
+import com.mongodb.client.internal.MongoDatabaseImpl;
+import com.mongodb.client.internal.MongoIterables;
+import com.mongodb.client.internal.SimpleMongoClient;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.io.Closeable;
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.connection.ServerAddressHelper.createServerAddress;
+import static java.util.Collections.singletonList;
+
+/**
+ * <p>A MongoDB client with internal connection pooling. For most applications, you should have one MongoClient instance for the entire
+ * JVM.
+ * <p>The following are equivalent, and all connect to the local database running on the default port:</p>
+ * <pre>
+ * MongoClient mongoClient1 = new MongoClient();
+ * MongoClient mongoClient1 = new MongoClient("localhost");
+ * MongoClient mongoClient2 = new MongoClient("localhost", 27017);
+ * MongoClient mongoClient4 = new MongoClient(new ServerAddress("localhost"));
+ * MongoClient mongoClient5 = new MongoClient(new ServerAddress("localhost"), MongoClientOptions.builder().build());
+ * </pre>
+ * <p>You can connect to a <a href="http://www.mongodb.org/display/DOCS/Replica+Sets">replica set</a> using the Java driver by passing a
+ * ServerAddress list to the MongoClient constructor. For example:</p>
+ * <pre>
+ * MongoClient mongoClient = new MongoClient(Arrays.asList(
+ *   new ServerAddress("localhost", 27017),
+ *   new ServerAddress("localhost", 27018),
+ *   new ServerAddress("localhost", 27019)));
+ * </pre>
+ * <p>You can connect to a sharded cluster using the same constructor.  MongoClient will auto-detect whether the servers are a list of
+ * replica set members or a list of mongos servers.</p>
+ *
+ * <p>By default, all read and write operations will be made on the primary, but it's possible to read from secondaries by changing the read
+ * preference:</p>
+ * <pre>
+ * mongoClient.setReadPreference(ReadPreference.secondaryPreferred());
+ * </pre>
+ * <p>By default, all write operations will wait for acknowledgment by the server, as the default write concern is {@code
+ * WriteConcern.ACKNOWLEDGED}.</p>
+ *
+ * <p>Note: This class supersedes the {@code Mongo} class.  While it extends {@code Mongo}, it differs from it in that the default write
+ * concern is to wait for acknowledgment from the server of all write operations.  In addition, its constructors accept instances of {@code
+ * MongoClientOptions} and {@code MongoClientURI}, which both also set the same default write concern.</p>
+ *
+ * <p>In general, users of this class will pick up all of the default options specified in {@code MongoClientOptions}.  In particular, note
+ * that the default value of the connectionsPerHost option has been increased to 100 from the old default value of 10 used by the superseded
+ * {@code Mongo} class.</p>
+ *
+ * @see ReadPreference#primary()
+ * @see com.mongodb.WriteConcern#ACKNOWLEDGED
+ * @see MongoClientOptions
+ * @see MongoClientURI
+ * @since 2.10.0
+ */
+@SuppressWarnings("deprecation")
+public class MongoClient extends Mongo implements Closeable {
+
+    /**
+     * Gets the default codec registry.  It includes the following providers:
+     *
+     * <ul>
+     * <li>{@link org.bson.codecs.ValueCodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonValueCodecProvider}</li>
+     * <li>{@link com.mongodb.DBRefCodecProvider}</li>
+     * <li>{@link com.mongodb.DBObjectCodecProvider}</li>
+     * <li>{@link org.bson.codecs.DocumentCodecProvider}</li>
+     * <li>{@link org.bson.codecs.IterableCodecProvider}</li>
+     * <li>{@link org.bson.codecs.MapCodecProvider}</li>
+     * <li>{@link com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider}</li>
+     * <li>{@link com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider}</li>
+     * <li>{@link org.bson.codecs.jsr310.Jsr310CodecProvider}</li>
+     * <li>{@link org.bson.codecs.BsonCodecProvider}</li>
+     * </ul>
+     *
+     * @return the default codec registry
+     * @see MongoClientOptions#getCodecRegistry()
+     * @since 3.0
+     */
+    public static CodecRegistry getDefaultCodecRegistry() {
+        return com.mongodb.MongoClientSettings.getDefaultCodecRegistry();
+    }
+
+    /**
+     * Creates an instance based on a (single) mongodb node (localhost, default port).
+     */
+    public MongoClient() {
+        this(new ServerAddress());
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongodb node.
+     *
+     * @param host server to connect to in format host[:port]
+     */
+    public MongoClient(final String host) {
+        this(createServerAddress(host));
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongodb node (default port).
+     *
+     * @param host    server to connect to in format host[:port]
+     * @param options default query options
+     */
+    public MongoClient(final String host, final MongoClientOptions options) {
+        this(createServerAddress(host), options);
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongodb node.
+     *
+     * @param host the database's host address
+     * @param port the port on which the database is running
+     */
+    public MongoClient(final String host, final int port) {
+        this(createServerAddress(host, port));
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongodb node
+     *
+     * @param addr the database address
+     * @see com.mongodb.ServerAddress
+     */
+    public MongoClient(final ServerAddress addr) {
+        this(addr, new MongoClientOptions.Builder().build());
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongodb node and a list of credentials
+     *
+     * @param addr            the database address
+     * @param credentialsList the list of credentials used to authenticate all connections
+     * @see com.mongodb.ServerAddress
+     * @since 2.11.0
+     * @deprecated Prefer {@link #MongoClient(ServerAddress, MongoCredential, MongoClientOptions)}
+     */
+    @Deprecated
+    public MongoClient(final ServerAddress addr, final List<MongoCredential> credentialsList) {
+        this(addr, credentialsList, MongoClientOptions.builder().build());
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongo node using a given ServerAddress and default options.
+     *
+     * @param addr    the database address
+     * @param options default options
+     * @see com.mongodb.ServerAddress
+     */
+    public MongoClient(final ServerAddress addr, final MongoClientOptions options) {
+        super(addr, options);
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongo node using a given ServerAddress and default options.
+     *
+     * @param addr            the database address
+     * @param credentialsList the list of credentials used to authenticate all connections
+     * @param options         default options
+     * @see com.mongodb.ServerAddress
+     * @since 2.11.0
+     * @deprecated Prefer {@link #MongoClient(ServerAddress, MongoCredential, MongoClientOptions)}
+     */
+    @Deprecated
+    public MongoClient(final ServerAddress addr, final List<MongoCredential> credentialsList, final MongoClientOptions options) {
+        super(addr, credentialsList, options);
+    }
+
+    /**
+     * Creates a Mongo instance based on a (single) mongo node using a given server address, credential, and options
+     *
+     * @param addr            the database address
+     * @param credential      the credential used to authenticate all connections
+     * @param options         default options
+     * @see com.mongodb.ServerAddress
+     * @since 3.6.0
+     */
+    public MongoClient(final ServerAddress addr, final MongoCredential credential, final MongoClientOptions options) {
+        super(addr, singletonList(credential), options);
+    }
+
+    /**
+     * <p>Creates an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
+     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
+     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress)} constructor instead.</p>
+     *
+     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
+     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
+     * The servers to randomly select from are further limited by the local threshold.  See
+     * {@link MongoClientOptions#getLocalThreshold()}</p>
+     *
+     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
+     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
+     * @see MongoClientOptions#getLocalThreshold()
+     */
+    public MongoClient(final List<ServerAddress> seeds) {
+        this(seeds, new MongoClientOptions.Builder().build());
+    }
+
+    /**
+     * <p>Creates an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
+     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
+     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress, List)}
+     * constructor instead.</p>
+     *
+     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
+     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
+     * The servers to randomly select from are further limited by the local threshold.  See
+     * {@link MongoClientOptions#getLocalThreshold()}</p>
+     *
+     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
+     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
+     * @param credentialsList the list of credentials used to authenticate all connections
+     * @see MongoClientOptions#getLocalThreshold()
+     * @since 2.11.0
+     * @deprecated Prefer {@link #MongoClient(List, MongoCredential, MongoClientOptions)}
+     */
+    @Deprecated
+    public MongoClient(final List<ServerAddress> seeds, final List<MongoCredential> credentialsList) {
+        this(seeds, credentialsList, new MongoClientOptions.Builder().build());
+    }
+
+    /**
+     * <p>Construct an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
+     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
+     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress, MongoClientOptions)} constructor
+     * instead.</p>
+     *
+     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
+     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
+     * The servers to randomly select from are further limited by the local threshold.  See
+     * {@link MongoClientOptions#getLocalThreshold()}</p>
+     *
+     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
+     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
+     * @param options the options
+     * @see MongoClientOptions#getLocalThreshold()
+     */
+    public MongoClient(final List<ServerAddress> seeds, final MongoClientOptions options) {
+        super(seeds, options);
+    }
+
+    /**
+     * <p>Creates an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
+     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
+     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress, List, MongoClientOptions)}
+     * constructor instead.</p>
+     *
+     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
+     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
+     * The servers to randomly select from are further limited by the local threshold.  See
+     * {@link MongoClientOptions#getLocalThreshold()}</p>
+     *
+     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
+     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
+     * @param credentialsList the list of credentials used to authenticate all connections
+     * @param options         the options
+     * @see MongoClientOptions#getLocalThreshold()
+     * @since 2.11.0
+     * @deprecated Prefer {@link #MongoClient(List, MongoCredential, MongoClientOptions)}
+     */
+    @Deprecated
+    public MongoClient(final List<ServerAddress> seeds, final List<MongoCredential> credentialsList, final MongoClientOptions options) {
+        super(seeds, credentialsList, options);
+    }
+
+    /**
+     * <p>Creates an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
+     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
+     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress, List, MongoClientOptions)}
+     * constructor instead.</p>
+     *
+     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
+     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
+     * The servers to randomly select from are further limited by the local threshold.  See
+     * {@link MongoClientOptions#getLocalThreshold()}</p>
+     *
+     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
+     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
+     * @param credential the credential used to authenticate all connections
+     * @param options         the options
+     * @see MongoClientOptions#getLocalThreshold()
+     * @since 3.6.0
+     */
+    public MongoClient(final List<ServerAddress> seeds, final MongoCredential credential, final MongoClientOptions options) {
+        super(seeds, singletonList(credential), options);
+    }
+
+    /**
+     * Creates a Mongo described by a URI. If only one address is used it will only connect to that node, otherwise it will discover all
+     * nodes.
+     *
+     * @param uri the URI
+     * @throws MongoException if theres a failure
+     */
+    public MongoClient(final MongoClientURI uri) {
+        super(uri);
+    }
+
+    /**
+     * Creates a Mongo described by a URI.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param uri the URI
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @throws MongoException if theres a failure
+     * @since 3.4
+     */
+    public MongoClient(final MongoClientURI uri, final MongoDriverInformation mongoDriverInformation) {
+        super(uri, mongoDriverInformation);
+    }
+
+    /**
+     * Creates a MongoClient to a single node using a given ServerAddress.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param addr            the database address
+     * @param credentialsList the list of credentials used to authenticate all connections
+     * @param options         default options
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @see com.mongodb.ServerAddress
+     * @since 3.4
+     * @deprecated Prefer {@link #MongoClient(ServerAddress, MongoCredential, MongoClientOptions, MongoDriverInformation)}
+     */
+    @Deprecated
+    public MongoClient(final ServerAddress addr, final List<MongoCredential> credentialsList, final MongoClientOptions options,
+                       final MongoDriverInformation mongoDriverInformation) {
+        super(addr, credentialsList, options, mongoDriverInformation);
+    }
+
+    /**
+     * Creates a MongoClient to a single node using a given ServerAddress.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param addr            the database address
+     * @param credential      the credential used to authenticate all connections
+     * @param options         default options
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @see com.mongodb.ServerAddress
+     * @since 3.6
+     */
+    public MongoClient(final ServerAddress addr, final MongoCredential credential, final MongoClientOptions options,
+                       final MongoDriverInformation mongoDriverInformation) {
+        super(addr, singletonList(credential), options, mongoDriverInformation);
+    }
+
+    /**
+     * Creates a MongoClient
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
+     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
+     * @param credentialsList the list of credentials used to authenticate all connections
+     * @param options         the options
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @since 3.4
+     * @deprecated Prefer {@link #MongoClient(List, MongoCredential, MongoClientOptions, MongoDriverInformation)}
+     */
+    @Deprecated
+    public MongoClient(final List<ServerAddress> seeds, final List<MongoCredential> credentialsList, final MongoClientOptions options,
+                       final MongoDriverInformation mongoDriverInformation) {
+        super(seeds, credentialsList, options, mongoDriverInformation);
+    }
+
+    /**
+     * Creates a MongoClient
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
+     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
+     * @param credential      the credential used to authenticate all connections
+     * @param options         the options
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @since 3.6
+     */
+    public MongoClient(final List<ServerAddress> seeds, final MongoCredential credential, final MongoClientOptions options,
+                       final MongoDriverInformation mongoDriverInformation) {
+        super(seeds, singletonList(credential), options, mongoDriverInformation);
+    }
+
+    /**
+     * Gets the options that this client uses to connect to server.
+     *
+     * <p>Note: {@link MongoClientOptions} is immutable.</p>
+     *
+     * @return the options
+     */
+    public MongoClientOptions getMongoClientOptions() {
+        return super.getMongoClientOptions();
+    }
+
+    /**
+     * Gets the credential that this client authenticates all connections with
+     *
+     * @return the credential, which may be null in unsecured deployments
+     * @since 3.9
+     */
+    @Nullable
+    public MongoCredential getCredential() {
+        if (getCredentialsList().size() > 1) {
+            throw new IllegalStateException("Instance constructed with more than one MongoCredential");
+        } else if (getCredentialsList().isEmpty()) {
+            return null;
+        } else {
+            return getCredentialsList().get(0);
+        }
+    }
+
+    /**
+     * Gets the list of credentials that this client authenticates all connections with
+     *
+     * @return the list of credentials
+     * @since 2.11.0
+     * @deprecated Prefer {@link #getCredential()}
+     */
+    @Deprecated
+    public List<MongoCredential> getCredentialsList() {
+        return super.getCredentialsList();
+    }
+
+    /**
+     * Get a list of the database names
+     *
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     * @return an iterable containing all the names of all the databases
+     * @since 3.0
+     */
+    public MongoIterable<String> listDatabaseNames() {
+        return createListDatabaseNamesIterable(null);
+    }
+
+    /**
+     * Get a list of the database names
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return an iterable containing all the names of all the databases
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     */
+    public MongoIterable<String> listDatabaseNames(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return createListDatabaseNamesIterable(clientSession);
+    }
+
+    private MongoIterable<String> createListDatabaseNamesIterable(@Nullable final ClientSession clientSession) {
+        return createListDatabasesIterable(clientSession, BsonDocument.class).nameOnly(true).map(new Function<BsonDocument, String>() {
+            @Override
+            public String apply(final BsonDocument result) {
+                return result.getString("name").getValue();
+            }
+        });
+    }
+
+    /**
+     * Gets the list of databases
+     *
+     * @return the list of databases
+     * @since 3.0
+     */
+    public ListDatabasesIterable<Document> listDatabases() {
+        return listDatabases(Document.class);
+    }
+
+    /**
+     * Gets the list of databases
+     *
+     * @param clazz the class to cast the database documents to
+     * @param <T>   the type of the class to use instead of {@code Document}.
+     * @return the list of databases
+     * @since 3.0
+     */
+    public <T> ListDatabasesIterable<T> listDatabases(final Class<T> clazz) {
+        return createListDatabasesIterable(null, clazz);
+    }
+
+    /**
+     * Gets the list of databases
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the list of databases
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public ListDatabasesIterable<Document> listDatabases(final ClientSession clientSession) {
+        return listDatabases(clientSession, Document.class);
+    }
+
+    /**
+     * Gets the list of databases
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param clazz the class to cast the database documents to
+     * @param <T>   the type of the class to use instead of {@code Document}.
+     * @return the list of databases
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public <T> ListDatabasesIterable<T> listDatabases(final ClientSession clientSession, final Class<T> clazz) {
+        notNull("clientSession", clientSession);
+        return createListDatabasesIterable(clientSession, clazz);
+    }
+
+    private <T> ListDatabasesIterable<T> createListDatabasesIterable(@Nullable final ClientSession clientSession, final Class<T> clazz) {
+        return MongoIterables.listDatabasesOf(clientSession, clazz, getCodecRegistry(),
+                ReadPreference.primary(), createOperationExecutor(), getMongoClientOptions().getRetryReads());
+    }
+
+    /**
+     * @param databaseName the name of the database to retrieve
+     * @return a {@code MongoDatabase} representing the specified database
+     * @throws IllegalArgumentException if databaseName is invalid
+     * @see MongoNamespace#checkDatabaseNameValidity(String)
+     */
+    public MongoDatabase getDatabase(final String databaseName) {
+        MongoClientOptions clientOptions = getMongoClientOptions();
+        return new MongoDatabaseImpl(databaseName, getCodecRegistry(), clientOptions.getReadPreference(),
+                clientOptions.getWriteConcern(), clientOptions.getRetryWrites(), clientOptions.getRetryReads(),
+                clientOptions.getReadConcern(),
+                clientOptions.getUuidRepresentation(),
+                createOperationExecutor());
+    }
+
+    /**
+     * Creates a client session with default session options.
+     *
+     * @return the client session
+     * @throws MongoClientException if the MongoDB cluster to which this client is connected does not support sessions
+     * @mongodb.server.release 3.6
+     * @since 3.8
+     */
+    public ClientSession startSession() {
+        return startSession(ClientSessionOptions.builder().build());
+    }
+
+    /**
+     * Creates a client session.
+     *
+     * @param options the options for the client session
+     * @return the client session
+     * @throws MongoClientException if the MongoDB cluster to which this client is connected does not support sessions
+     * @mongodb.server.release 3.6
+     * @since 3.6
+     */
+    public ClientSession startSession(final ClientSessionOptions options) {
+        ClientSession clientSession = createClientSession(notNull("options", options));
+        if (clientSession == null) {
+            throw new MongoClientException("Sessions are not supported by the MongoDB cluster to which this client is connected");
+        }
+        return clientSession;
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public ChangeStreamIterable<Document> watch() {
+        return watch(Collections.<Bson>emptyList());
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public <TResult> ChangeStreamIterable<TResult> watch(final Class<TResult> resultClass) {
+        return watch(Collections.<Bson>emptyList(), resultClass);
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public ChangeStreamIterable<Document> watch(final List<? extends Bson> pipeline) {
+        return watch(pipeline, Document.class);
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public <TResult> ChangeStreamIterable<TResult> watch(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createChangeStreamIterable(null, pipeline, resultClass);
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession) {
+        return watch(clientSession, Collections.<Bson>emptyList(), Document.class);
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return watch(clientSession, Collections.<Bson>emptyList(), resultClass);
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return watch(clientSession, pipeline, Document.class);
+    }
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                         final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createChangeStreamIterable(clientSession, pipeline, resultClass);
+    }
+
+    /**
+     * Closes all resources associated with this instance, in particular any open network connections. Once called, this instance and any
+     * databases obtained from it can no longer be used.
+     */
+    public void close() {
+        super.close();
+    }
+
+    @Override
+    SimpleMongoClient asSimpleMongoClient() {
+        return new SimpleMongoClient() {
+            @Override
+            public MongoDatabase getDatabase(final String databaseName) {
+                return MongoClient.this.getDatabase(databaseName);
+            }
+
+            @Override
+            public void close() {
+                MongoClient.this.close();
+            }
+        };
+    }
+
+    private <TResult> ChangeStreamIterable<TResult> createChangeStreamIterable(@Nullable final ClientSession clientSession,
+                                                                               final List<? extends Bson> pipeline,
+                                                                               final Class<TResult> resultClass) {
+        MongoClientOptions clientOptions = getMongoClientOptions();
+        return MongoIterables.changeStreamOf(clientSession, "admin",
+                getCodecRegistry(), clientOptions.getReadPreference(), clientOptions.getReadConcern(),
+                createOperationExecutor(), pipeline, resultClass, ChangeStreamLevel.CLIENT, clientOptions.getRetryReads());
+    }
+
+
+    static DBObjectCodec getCommandCodec() {
+        return new DBObjectCodec(getDefaultCodecRegistry());
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/MongoClientOptions.java b/driver-legacy/src/main/com/mongodb/MongoClientOptions.java
new file mode 100644
index 00000000000..d1dd54cd70b
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/MongoClientOptions.java
@@ -0,0 +1,1738 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.annotations.Immutable;
+import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.event.ClusterListener;
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.ConnectionPoolListener;
+import com.mongodb.event.ServerListener;
+import com.mongodb.event.ServerMonitorListener;
+import com.mongodb.lang.Nullable;
+import com.mongodb.selector.ServerSelector;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.Collections.unmodifiableList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * <p>Various settings to control the behavior of a {@code MongoClient}.</p>
+ *
+ * <p>Note: This class is a replacement for {@code MongoOptions}, to be used with {@code MongoClient}.  The main difference in behavior is
+ * that the default write concern is {@code WriteConcern.ACKNOWLEDGED}.</p>
+ *
+ * @see MongoClient
+ * @since 2.10.0
+ */
+@Immutable
+public class MongoClientOptions {
+
+    private static final SocketFactory DEFAULT_SSL_SOCKET_FACTORY = SSLSocketFactory.getDefault();
+    private static final SocketFactory DEFAULT_SOCKET_FACTORY = SocketFactory.getDefault();
+
+    private final String description;
+    private final String applicationName;
+    private final List<MongoCompressor> compressorList;
+    private final ReadPreference readPreference;
+    private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private final boolean retryReads;
+    private final ReadConcern readConcern;
+    private final CodecRegistry codecRegistry;
+    private final UuidRepresentation uuidRepresentation;
+    private final ServerSelector serverSelector;
+
+    private final int minConnectionsPerHost;
+    private final int maxConnectionsPerHost;
+    private final int threadsAllowedToBlockForConnectionMultiplier;
+    private final int serverSelectionTimeout;
+    private final int maxWaitTime;
+    private final int maxConnectionIdleTime;
+    private final int maxConnectionLifeTime;
+
+    private final int connectTimeout;
+    private final int socketTimeout;
+    private final boolean socketKeepAlive;
+    private final boolean sslEnabled;
+    private final boolean sslInvalidHostNameAllowed;
+    private final SSLContext sslContext;
+    private final boolean alwaysUseMBeans;
+    private final int heartbeatFrequency;
+    private final int minHeartbeatFrequency;
+    private final int heartbeatConnectTimeout;
+    private final int heartbeatSocketTimeout;
+    private final int localThreshold;
+
+    private final String requiredReplicaSetName;
+    private final DBDecoderFactory dbDecoderFactory;
+    private final DBEncoderFactory dbEncoderFactory;
+    private final SocketFactory socketFactory;
+    private final boolean cursorFinalizerEnabled;
+    private final ConnectionPoolSettings connectionPoolSettings;
+    private final SocketSettings socketSettings;
+    private final ServerSettings serverSettings;
+    private final SocketSettings heartbeatSocketSettings;
+    private final SslSettings sslSettings;
+
+    private final List<ClusterListener> clusterListeners;
+    private final List<CommandListener> commandListeners;
+
+    private final AutoEncryptionSettings autoEncryptionSettings;
+
+    @SuppressWarnings("deprecation")
+    private MongoClientOptions(final Builder builder) {
+        description = builder.description;
+        applicationName = builder.applicationName;
+        compressorList = builder.compressorList;
+        minConnectionsPerHost = builder.minConnectionsPerHost;
+        maxConnectionsPerHost = builder.maxConnectionsPerHost;
+        threadsAllowedToBlockForConnectionMultiplier = builder.threadsAllowedToBlockForConnectionMultiplier;
+        serverSelectionTimeout = builder.serverSelectionTimeout;
+        maxWaitTime = builder.maxWaitTime;
+        maxConnectionIdleTime = builder.maxConnectionIdleTime;
+        maxConnectionLifeTime = builder.maxConnectionLifeTime;
+        connectTimeout = builder.connectTimeout;
+        socketTimeout = builder.socketTimeout;
+        socketKeepAlive = builder.socketKeepAlive;
+        readPreference = builder.readPreference;
+        writeConcern = builder.writeConcern;
+        retryWrites = builder.retryWrites;
+        retryReads = builder.retryReads;
+        readConcern = builder.readConcern;
+        codecRegistry = builder.codecRegistry;
+        uuidRepresentation = builder.uuidRepresentation;
+        serverSelector = builder.serverSelector;
+        sslEnabled = builder.sslEnabled;
+        sslInvalidHostNameAllowed = builder.sslInvalidHostNameAllowed;
+        sslContext = builder.sslContext;
+        alwaysUseMBeans = builder.alwaysUseMBeans;
+        heartbeatFrequency = builder.heartbeatFrequency;
+        minHeartbeatFrequency = builder.minHeartbeatFrequency;
+        heartbeatConnectTimeout = builder.heartbeatConnectTimeout;
+        heartbeatSocketTimeout = builder.heartbeatSocketTimeout;
+        localThreshold = builder.localThreshold;
+        requiredReplicaSetName = builder.requiredReplicaSetName;
+        dbDecoderFactory = builder.dbDecoderFactory;
+        dbEncoderFactory = builder.dbEncoderFactory;
+        socketFactory = builder.socketFactory;
+        cursorFinalizerEnabled = builder.cursorFinalizerEnabled;
+
+        clusterListeners = unmodifiableList(builder.clusterListeners);
+        commandListeners = unmodifiableList(builder.commandListeners);
+        autoEncryptionSettings = builder.autoEncryptionSettings;
+
+        ConnectionPoolSettings.Builder connectionPoolSettingsBuilder = ConnectionPoolSettings.builder()
+                .minSize(getMinConnectionsPerHost())
+                .maxSize(getConnectionsPerHost())
+                .maxWaitQueueSize(getThreadsAllowedToBlockForConnectionMultiplier() * getConnectionsPerHost())
+                .maxWaitTime(getMaxWaitTime(), MILLISECONDS)
+                .maxConnectionIdleTime(getMaxConnectionIdleTime(), MILLISECONDS)
+                .maxConnectionLifeTime(getMaxConnectionLifeTime(), MILLISECONDS);
+
+        for (ConnectionPoolListener connectionPoolListener : builder.connectionPoolListeners) {
+            connectionPoolSettingsBuilder.addConnectionPoolListener(connectionPoolListener);
+        }
+
+        connectionPoolSettings = connectionPoolSettingsBuilder.build();
+
+        socketSettings = SocketSettings.builder()
+                .connectTimeout(getConnectTimeout(), MILLISECONDS)
+                .readTimeout(getSocketTimeout(), MILLISECONDS)
+                .keepAlive(isSocketKeepAlive())
+                .build();
+        heartbeatSocketSettings = SocketSettings.builder()
+                .connectTimeout(getHeartbeatConnectTimeout(), MILLISECONDS)
+                .readTimeout(getHeartbeatSocketTimeout(), MILLISECONDS)
+                .keepAlive(isSocketKeepAlive())
+                .build();
+
+        ServerSettings.Builder serverSettingsBuilder = ServerSettings.builder()
+                .heartbeatFrequency(getHeartbeatFrequency(), MILLISECONDS)
+                .minHeartbeatFrequency(getMinHeartbeatFrequency(), MILLISECONDS);
+
+        for (ServerListener serverListener : builder.serverListeners) {
+            serverSettingsBuilder.addServerListener(serverListener);
+        }
+
+        for (ServerMonitorListener serverMonitorListener : builder.serverMonitorListeners) {
+            serverSettingsBuilder.addServerMonitorListener(serverMonitorListener);
+        }
+
+        serverSettings = serverSettingsBuilder.build();
+
+        try {
+            sslSettings = SslSettings.builder()
+                    .enabled(sslEnabled)
+                    .invalidHostNameAllowed(sslInvalidHostNameAllowed)
+                    .context(sslContext)
+                    .build();
+        } catch (MongoInternalException e) {
+            // The error message from SslSettings needs to be translated to make sense for users of MongoClientOptions
+            throw new MongoInternalException("By default, SSL connections are only supported on Java 7 or later.  If the application "
+                    + "must run on Java 6, you must set the MongoClientOptions.sslInvalidHostNameAllowed "
+                    + "property to true");
+        }
+    }
+
+    /**
+     * Creates a builder instance.
+     *
+     * @return a builder
+     * @since 3.0.0
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Creates a builder instance.
+     *
+     * @param options existing MongoClientOptions to default the builder settings on.
+     * @return a builder
+     * @since 3.0.0
+     */
+    public static Builder builder(final MongoClientOptions options) {
+        return new Builder(options);
+    }
+
+    /**
+     * <p>Gets the description for this MongoClient, which is used in various places like logging and JMX.</p>
+     *
+     * <p>Default is null.</p>
+     *
+     * @return the description
+     * @deprecated Prefer {@link #getApplicationName()}
+     */
+    @Deprecated
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Gets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+     * the application to the server, for use in server logs, slow query logs, and profile collection.
+     *
+     * <p>Default is null.</p>
+     *
+     * @return the application name, which may be null
+     * @mongodb.server.release 3.4
+     * @since 3.4
+     */
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    /**
+     * Gets the compressors to use for compressing messages to the server. The driver will use the first compressor in the list
+     * that the server is configured to support.
+     *
+     * <p>Default is the empty list.</p>
+     *
+     * @return the compressors
+     * @mongodb.server.release 3.4
+     * @since 3.6
+     */
+    public List<MongoCompressor> getCompressorList() {
+        return compressorList;
+    }
+
+    /**
+     * <p>The maximum number of connections allowed per host for this MongoClient instance. Those connections will be kept in a pool when
+     * idle. Once the pool is exhausted, any operation requiring a connection will block waiting for an available connection.</p>
+     *
+     * <p>Default is 100.</p>
+     *
+     * @return the maximum size of the connection pool per host
+     */
+    public int getConnectionsPerHost() {
+        return maxConnectionsPerHost;
+    }
+
+    /**
+     * <p>The minimum number of connections per host for this MongoClient instance. Those connections will be kept in a pool when idle, and
+     * the pool will ensure over time that it contains at least this minimum number.</p>
+     *
+     * <p>Default is 0.</p>
+     *
+     * @return the minimum size of the connection pool per host
+     */
+    public int getMinConnectionsPerHost() {
+        return minConnectionsPerHost;
+    }
+
+    /**
+     * <p>This multiplier, multiplied with the connectionsPerHost setting, gives the maximum number of threads that may be waiting for a
+     * connection to become available from the pool. All further threads will get an exception right away. For example if connectionsPerHost
+     * is 10 and threadsAllowedToBlockForConnectionMultiplier is 5, then up to 50 threads can wait for a connection.</p>
+     *
+     * <p>Default is 5.</p>
+     *
+     * @deprecated in the next major release, wait queue size limitations will be removed
+     * @return the multiplier
+     */
+    @Deprecated
+    public int getThreadsAllowedToBlockForConnectionMultiplier() {
+        return threadsAllowedToBlockForConnectionMultiplier;
+    }
+
+    /**
+     * <p>Gets the server selection timeout in milliseconds, which defines how long the driver will wait for server selection to
+     * succeed before throwing an exception.</p>
+     *
+     * <p>Default is 30,000 milliseconds. A value of 0 means that it will timeout immediately if no server is available.  A negative value
+     * means to wait indefinitely.</p>
+     *
+     * @return the server selection timeout in milliseconds.
+     */
+    public int getServerSelectionTimeout() {
+        return serverSelectionTimeout;
+    }
+
+    /**
+     * <p>The maximum wait time in milliseconds that a thread may wait for a connection to become available.</p>
+     *
+     * <p>Default is 120,000 milliseconds. A value of 0 means that it will not wait.  A negative value means to wait indefinitely.</p>
+     *
+     * @return the maximum wait time.
+     */
+    public int getMaxWaitTime() {
+        return maxWaitTime;
+    }
+
+    /**
+     * The maximum idle time of a pooled connection.  A zero value indicates no limit to the idle time.  A pooled connection that has
+     * exceeded its idle time will be closed and replaced when necessary by a new connection.
+     *
+     * <p>Default is 0, indicating no limit to the idle time.</p>
+     *
+     * @return the maximum idle time, in milliseconds
+     * @since 2.12
+     */
+    public int getMaxConnectionIdleTime() {
+        return maxConnectionIdleTime;
+    }
+
+    /**
+     * The maximum life time of a pooled connection.  A zero value indicates no limit to the life time.  A pooled connection that has
+     * exceeded its life time will be closed and replaced when necessary by a new connection.
+     *
+     * <p>Default is 0, indicating no limit to the life time.</p>
+     *
+     * @return the maximum life time, in milliseconds
+     * @since 2.12
+     */
+    public int getMaxConnectionLifeTime() {
+        return maxConnectionLifeTime;
+    }
+
+    /**
+     * <p>The connection timeout in milliseconds.  A value of 0 means no timeout. It is used solely when establishing a new connection
+     * {@link java.net.Socket#connect(java.net.SocketAddress, int) }</p>
+     *
+     * <p>Default is 10,000 milliseconds.</p>
+     *
+     * @return the socket connect timeout
+     */
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    /**
+     * <p>The socket timeout in milliseconds. It is used for I/O socket read and write operations {@link
+     * java.net.Socket#setSoTimeout(int)}</p>
+     *
+     * <p>Default is 0 and means no timeout.</p>
+     *
+     * @return the socket timeout, in milliseconds
+     */
+    public int getSocketTimeout() {
+        return socketTimeout;
+    }
+
+    /**
+     * <p>This flag controls the socket keep-alive feature that keeps a connection alive through firewalls {@link
+     * java.net.Socket#setKeepAlive(boolean)}</p>
+     *
+     * <p>Default is {@code true}.</p>
+     *
+     * @return whether keep-alive is enabled on each socket
+     * @see <a href="https://docs.mongodb.com/manual/faq/diagnostics/#does-tcp-keepalive-time-affect-mongodb-deployments">
+     * Does TCP keep-alive time affect MongoDB Deployments?</a>
+     * @deprecated configuring keep-alive has been deprecated. It now defaults to true and disabling it is not recommended.
+     */
+    @Deprecated
+    public boolean isSocketKeepAlive() {
+        return socketKeepAlive;
+    }
+
+    /**
+     * Gets the heartbeat frequency. This is the frequency that the driver will attempt to determine the current state of each server in the
+     * cluster.
+     *
+     * <p>Default is 10,000 milliseconds.</p>
+     *
+     * @return the heartbeat frequency, in milliseconds
+     * @since 2.12
+     */
+    public int getHeartbeatFrequency() {
+        return heartbeatFrequency;
+    }
+
+    /**
+     * Gets the minimum heartbeat frequency.  In the event that the driver has to frequently re-check a server's availability,
+     * it will wait at least this long since the previous check to avoid wasted effort.
+     *
+     * <p>Default is 500 milliseconds.</p>
+     *
+     * @return the minimum heartbeat frequency, in milliseconds
+     * @since 2.13
+     */
+    public int getMinHeartbeatFrequency() {
+        return minHeartbeatFrequency;
+    }
+
+    /**
+     * <p>Gets the connect timeout for connections used for the cluster heartbeat.</p>
+     *
+     * <p>Default is 20,000 milliseconds.</p>
+     *
+     * @return the heartbeat connect timeout, in milliseconds
+     * @since 2.12
+     */
+    public int getHeartbeatConnectTimeout() {
+        return heartbeatConnectTimeout;
+    }
+
+    /**
+     * Gets the socket timeout for connections used for the cluster heartbeat.
+     *
+     * <p>Default is 20,000 milliseconds.</p>
+     *
+     * @return the heartbeat socket timeout, in milliseconds
+     * @since 2.12
+     */
+    public int getHeartbeatSocketTimeout() {
+        return heartbeatSocketTimeout;
+    }
+
+    /**
+     * <p>Gets the local threshold.  When choosing among multiple MongoDB servers to send a request, the MongoClient will only
+     * send that request to a server whose ping time is less than or equal to the server with the fastest ping time plus the local
+     * threshold.</p>
+     *
+     * <p>For example, let's say that the client is choosing a server to send a query when the read preference is {@code
+     * ReadPreference.secondary()}, and that there are three secondaries, server1, server2, and server3, whose ping times are 10, 15, and 16
+     * milliseconds, respectively.  With a local threshold of 5 milliseconds, the client will send the query to either
+     * server1 or server2 (randomly selecting between the two).
+     * </p>
+     *
+     * <p>Default is 15 milliseconds.</p>
+     *
+     * @return the local threshold, in milliseconds
+     * @mongodb.driver.manual reference/program/mongos/#cmdoption--localThreshold Local Threshold
+     * @since 2.13.0
+     */
+    public int getLocalThreshold() {
+        return localThreshold;
+    }
+
+    /**
+     * <p>Gets the required replica set name.  With this option set, the MongoClient instance will</p>
+     *
+     * <ol>
+     *     <li>Connect in replica set mode, and discover all members of the set based on the given servers</li>
+     *     <li>Make sure that the set name reported by all members matches the required set name.</li>
+     *     <li>Refuse to service any requests if any member of the seed list is not part of a replica set with the required name.</li>
+     * </ol>
+     *
+     * @return the required replica set name
+     * @since 2.12
+     */
+    @Nullable
+    public String getRequiredReplicaSetName() {
+        return requiredReplicaSetName;
+    }
+
+    /**
+     * Whether to use SSL.
+     *
+     * <p>Default is {@code false}.</p>
+     *
+     * @return true if SSL should be used
+     * @since 3.0
+     */
+    public boolean isSslEnabled() {
+        return sslEnabled;
+    }
+
+    /**
+     * Returns whether invalid host names should be allowed if SSL is enabled.  Take care before setting this to
+     * true, as it makes the application susceptible to man-in-the-middle attacks.  Note that host name verification currently requires
+     * Java 7, so if your application is using SSL and must run on Java 6, this property must be set to {@code true}.
+     *
+     * <p>Default is {@code false}.</p>
+     *
+     * @return true if invalid host names are allowed.
+     */
+    public boolean isSslInvalidHostNameAllowed() {
+        return sslInvalidHostNameAllowed;
+    }
+
+    /**
+     * Returns the SSLContext.  This property is ignored when either sslEnabled is false or socketFactory is non-null.
+     *
+     * @return the configured SSLContext, which may be null.  In that case {@code SSLContext.getDefault()} will be used when SSL is enabled.
+     * @since 3.5
+     */
+    public SSLContext getSslContext() {
+        return sslContext;
+    }
+
+    /**
+     * <p>The read preference to use for queries, map-reduce, aggregation, and count.</p>
+     *
+     * <p>Default is {@code ReadPreference.primary()}.</p>
+     *
+     * @return the read preference
+     * @see com.mongodb.ReadPreference#primary()
+     */
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    /**
+     * <p>The write concern to use.</p>
+     *
+     * <p>Default is {@code WriteConcern.ACKNOWLEDGED}.</p>
+     *
+     * @return the write concern
+     * @see WriteConcern#ACKNOWLEDGED
+     */
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Returns true if writes should be retried if they fail due to a network error or other retryable error.
+     *
+     * <p>Starting with the 3.11.0 release, the default value is true</p>
+     *
+     * @return the retryWrites value
+     * @mongodb.server.release 3.6
+     * @since 3.6
+     */
+    public boolean getRetryWrites() {
+        return retryWrites;
+    }
+
+    /**
+     * Returns true if reads should be retried if they fail due to a network error or other retryable error.
+     *
+     * @return the retryReads value
+     * @mongodb.server.release 3.6
+     * @since 3.11
+     */
+    public boolean getRetryReads() {
+        return retryReads;
+    }
+
+    /**
+     * <p>The read concern to use.</p>
+     *
+     * @return the read concern
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     * @since 3.2
+     */
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    /**
+     * <p>The codec registry to use.  By default, a {@code MongoClient} will be able to encode and decode instances of {@code
+     * Document}.</p>
+     *
+     * <p>Note that instances of {@code DB} and {@code DBCollection} do not use the registry, so it's not necessary to include a codec for
+     * DBObject in the registry.</p>
+     *
+     * @return the codec registry
+     * @see MongoClient#getDatabase
+     * @since 3.0
+     */
+    public CodecRegistry getCodecRegistry() {
+        return codecRegistry;
+    }
+
+    /**
+     * Gets the UUID representation to use when encoding instances of {@link java.util.UUID} and when decoding BSON binary values with
+     * subtype of 3.
+     *
+     * <p>The default is {@link UuidRepresentation#JAVA_LEGACY}, but it will be changing to {@link UuidRepresentation#UNSPECIFIED} in
+     * the next major release.  If your application stores UUID values in MongoDB, consider setting this value to the desired
+     * representation in order to avoid a breaking change when upgrading.  New applications should prefer
+     * {@link UuidRepresentation#STANDARD}, while existing Java applications should prefer {@link UuidRepresentation#JAVA_LEGACY}.
+     * Applications wishing to interoperate with existing Python or .NET applications should prefer
+     * {@link UuidRepresentation#PYTHON_LEGACY} or {@link UuidRepresentation#C_SHARP_LEGACY}, respectively. Applications that do not
+     * store UUID values in MongoDB don't need to set this value.
+     * </p>
+     *
+     * @return the UUID representation, which may not be null
+     * @since 3.12
+     */
+    public UuidRepresentation getUuidRepresentation() {
+        return uuidRepresentation;
+    }
+
+    /**
+     * Gets the server selector.
+     *
+     * <p>The server selector augments the normal server selection rules applied by the driver when determining
+     * which server to send an operation to.  At the point that it's called by the driver, the
+     * {@link com.mongodb.connection.ClusterDescription} which is passed to it contains a list of
+     * {@link com.mongodb.connection.ServerDescription} instances which satisfy either the configured {@link ReadPreference} for any
+     * read operation or ones that can take writes (e.g. a standalone, mongos, or replica set primary).</p>
+     * <p>The server selector can then filter the {@code ServerDescription} list using whatever criteria that is required by the
+     * application.</p>
+     * <p>After this selector executes, two additional selectors are applied by the driver:</p>
+     * <ul>
+     * <li>select from within the latency window</li>
+     * <li>select a random server from those remaining</li>
+     * </ul>
+     * <p>To skip the latency window selector, an application can:</p>
+     * <ul>
+     * <li>configure the local threshold to a sufficiently high value so that it doesn't exclude any servers</li>
+     * <li>return a list containing a single server from this selector (which will also make the random member selector a no-op)</li>
+     * </ul>
+     *
+     * @return the server selector, which may be null
+     * @since 3.6
+     */
+    public ServerSelector getServerSelector() {
+        return serverSelector;
+    }
+
+    /**
+     * Gets the list of added {@code ClusterListener}. The default is an empty list.
+     *
+     * @return the unmodifiable list of cluster listeners
+     * @since 3.3
+     */
+    public List<ClusterListener> getClusterListeners() {
+        return clusterListeners;
+    }
+
+    /**
+     * Gets the list of added {@code CommandListener}.
+     *
+     * <p>Default is an empty list.</p>
+     *
+     * @return the unmodifiable list of command listeners
+     * @since 3.1
+     */
+    public List<CommandListener> getCommandListeners() {
+        return commandListeners;
+    }
+
+    /**
+     * Gets the list of added {@code ConnectionPoolListener}. The default is an empty list.
+     *
+     * @return the unmodifiable list of connection pool listeners
+     * @since 3.5
+     */
+    public List<ConnectionPoolListener> getConnectionPoolListeners() {
+        return connectionPoolSettings.getConnectionPoolListeners();
+    }
+
+    /**
+     * Gets the list of added {@code ServerListener}. The default is an empty list.
+     *
+     * @return the unmodifiable list of server listeners
+     * @since 3.3
+     */
+    public List<ServerListener> getServerListeners() {
+        return serverSettings.getServerListeners();
+    }
+
+    /**
+     * Gets the list of added {@code ServerMonitorListener}. The default is an empty list.
+     *
+     * @return the unmodifiable list of server monitor listeners
+     * @since 3.3
+     */
+    public List<ServerMonitorListener> getServerMonitorListeners() {
+        return serverSettings.getServerMonitorListeners();
+    }
+
+    /**
+     * Override the decoder factory.
+     *
+     * <p>Default is for the standard Mongo Java driver configuration.</p>
+     *
+     * @return the decoder factory
+     */
+    public DBDecoderFactory getDbDecoderFactory() {
+        return dbDecoderFactory;
+    }
+
+    /**
+     * Override the encoder factory.
+     *
+     * <p>Default is for the standard Mongo Java driver configuration.</p>
+     *
+     * @return the encoder factory
+     */
+    public DBEncoderFactory getDbEncoderFactory() {
+        return dbEncoderFactory;
+    }
+
+    /**
+     * <p>Gets whether JMX beans registered by the driver should always be MBeans, regardless of whether the VM is Java 6 or greater. If
+     * false, the driver will use MXBeans if the VM is Java 6 or greater, and use MBeans if the VM is Java 5.</p>
+     *
+     * <p>Default is {@code false}.</p>
+     *
+     * @return true if JMX beans should always be MBeans
+     * @deprecated there is no replacement for this property
+     */
+    @Deprecated
+    public boolean isAlwaysUseMBeans() {
+        return alwaysUseMBeans;
+    }
+
+    /**
+     * <p>The socket factory for creating sockets to the mongo server.</p>
+     *
+     * <p>Default is SocketFactory.getDefault()</p>
+     *
+     * @return the socket factory
+     * @deprecated Prefer {@link #isSslEnabled()} and {@link #getSslContext()}
+     */
+    @Deprecated
+    public SocketFactory getSocketFactory() {
+        if (socketFactory != null) {
+            return socketFactory;
+        } else if (getSslSettings().isEnabled()) {
+            return sslContext == null ? DEFAULT_SSL_SOCKET_FACTORY : sslContext.getSocketFactory();
+        } else {
+            return DEFAULT_SOCKET_FACTORY;
+        }
+    }
+
+    /**
+     * <p>Gets whether there is a a finalize method created that cleans up instances of DBCursor that the client does not close.  If you are
+     * careful to always call the close method of DBCursor, then this can safely be set to false.</p>
+     *
+     * <p>Default is true.</p>
+     *
+     * @return whether finalizers are enabled on cursors
+     * @see DBCursor
+     * @see com.mongodb.DBCursor#close()
+     */
+    public boolean isCursorFinalizerEnabled() {
+        return cursorFinalizerEnabled;
+    }
+
+    /**
+     * Gets the auto-encryption settings
+     *
+     * @return the auto-encryption settings, which may be null
+     * @since 3.11
+     */
+    @Nullable
+    public AutoEncryptionSettings getAutoEncryptionSettings() {
+        return autoEncryptionSettings;
+    }
+
+    ConnectionPoolSettings getConnectionPoolSettings() {
+        return connectionPoolSettings;
+    }
+
+    SocketSettings getSocketSettings() {
+        return socketSettings;
+    }
+
+    ServerSettings getServerSettings() {
+        return serverSettings;
+    }
+
+    SocketSettings getHeartbeatSocketSettings() {
+        return heartbeatSocketSettings;
+    }
+
+    SslSettings getSslSettings() {
+        return sslSettings;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MongoClientOptions that = (MongoClientOptions) o;
+
+        if (localThreshold != that.localThreshold) {
+            return false;
+        }
+        if (alwaysUseMBeans != that.alwaysUseMBeans) {
+            return false;
+        }
+        if (connectTimeout != that.connectTimeout) {
+            return false;
+        }
+        if (cursorFinalizerEnabled != that.cursorFinalizerEnabled) {
+            return false;
+        }
+        if (minHeartbeatFrequency != that.minHeartbeatFrequency) {
+            return false;
+        }
+        if (heartbeatConnectTimeout != that.heartbeatConnectTimeout) {
+            return false;
+        }
+        if (heartbeatFrequency != that.heartbeatFrequency) {
+            return false;
+        }
+        if (heartbeatSocketTimeout != that.heartbeatSocketTimeout) {
+            return false;
+        }
+        if (maxConnectionIdleTime != that.maxConnectionIdleTime) {
+            return false;
+        }
+        if (maxConnectionLifeTime != that.maxConnectionLifeTime) {
+            return false;
+        }
+        if (maxConnectionsPerHost != that.maxConnectionsPerHost) {
+            return false;
+        }
+        if (serverSelectionTimeout != that.serverSelectionTimeout) {
+            return false;
+        }
+        if (maxWaitTime != that.maxWaitTime) {
+            return false;
+        }
+        if (minConnectionsPerHost != that.minConnectionsPerHost) {
+            return false;
+        }
+        if (socketKeepAlive != that.socketKeepAlive) {
+            return false;
+        }
+        if (socketTimeout != that.socketTimeout) {
+            return false;
+        }
+        if (sslEnabled != that.sslEnabled) {
+            return false;
+        }
+        if (sslInvalidHostNameAllowed != that.sslInvalidHostNameAllowed) {
+            return false;
+        }
+        if (sslContext != null ? !sslContext.equals(that.sslContext) : that.sslContext != null) {
+            return false;
+        }
+        if (threadsAllowedToBlockForConnectionMultiplier != that.threadsAllowedToBlockForConnectionMultiplier) {
+            return false;
+        }
+        if (dbDecoderFactory != null ? !dbDecoderFactory.equals(that.dbDecoderFactory) : that.dbDecoderFactory != null) {
+            return false;
+        }
+        if (dbEncoderFactory != null ? !dbEncoderFactory.equals(that.dbEncoderFactory) : that.dbEncoderFactory != null) {
+            return false;
+        }
+        if (description != null ? !description.equals(that.description) : that.description != null) {
+            return false;
+        }
+        if (applicationName != null ? !applicationName.equals(that.applicationName) : that.applicationName != null) {
+            return false;
+        }
+        if (!readPreference.equals(that.readPreference)) {
+            return false;
+        }
+        if (!writeConcern.equals(that.writeConcern)) {
+            return false;
+        }
+        if (retryWrites != that.retryWrites) {
+            return false;
+        }
+        if (retryReads != that.retryReads) {
+            return false;
+        }
+        if (!readConcern.equals(that.readConcern)) {
+            return false;
+        }
+        if (!codecRegistry.equals(that.codecRegistry)) {
+            return false;
+        }
+        if (!uuidRepresentation.equals(that.uuidRepresentation)) {
+            return false;
+        }
+        if (serverSelector != null ? !serverSelector.equals(that.serverSelector) : that.serverSelector != null) {
+            return false;
+        }
+        if (!clusterListeners.equals(that.clusterListeners)) {
+            return false;
+        }
+        if (!commandListeners.equals(that.commandListeners)) {
+            return false;
+        }
+        if (requiredReplicaSetName != null ? !requiredReplicaSetName.equals(that.requiredReplicaSetName)
+                : that.requiredReplicaSetName != null) {
+            return false;
+        }
+        if (socketFactory != null ? !socketFactory.equals(that.socketFactory) : that.socketFactory != null) {
+            return false;
+        }
+        if (!compressorList.equals(that.compressorList)) {
+            return false;
+        }
+        if (autoEncryptionSettings != null ? !autoEncryptionSettings.equals(that.autoEncryptionSettings)
+                : that.autoEncryptionSettings != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = description != null ? description.hashCode() : 0;
+        result = 31 * result + (applicationName != null ? applicationName.hashCode() : 0);
+        result = 31 * result + readPreference.hashCode();
+        result = 31 * result + writeConcern.hashCode();
+        result = 31 * result + (retryWrites ? 1 : 0);
+        result = 31 * result + (retryReads ? 1 : 0);
+        result = 31 * result + (readConcern != null ? readConcern.hashCode() : 0);
+        result = 31 * result + codecRegistry.hashCode();
+        result = 31 * result + uuidRepresentation.hashCode();
+        result = 31 * result + (serverSelector != null ? serverSelector.hashCode() : 0);
+        result = 31 * result + clusterListeners.hashCode();
+        result = 31 * result + commandListeners.hashCode();
+        result = 31 * result + minConnectionsPerHost;
+        result = 31 * result + maxConnectionsPerHost;
+        result = 31 * result + threadsAllowedToBlockForConnectionMultiplier;
+        result = 31 * result + serverSelectionTimeout;
+        result = 31 * result + maxWaitTime;
+        result = 31 * result + maxConnectionIdleTime;
+        result = 31 * result + maxConnectionLifeTime;
+        result = 31 * result + connectTimeout;
+        result = 31 * result + socketTimeout;
+        result = 31 * result + (socketKeepAlive ? 1 : 0);
+        result = 31 * result + (sslEnabled ? 1 : 0);
+        result = 31 * result + (sslInvalidHostNameAllowed ? 1 : 0);
+        result = 31 * result + (sslContext != null ? sslContext.hashCode() : 0);
+        result = 31 * result + (alwaysUseMBeans ? 1 : 0);
+        result = 31 * result + heartbeatFrequency;
+        result = 31 * result + minHeartbeatFrequency;
+        result = 31 * result + heartbeatConnectTimeout;
+        result = 31 * result + heartbeatSocketTimeout;
+        result = 31 * result + localThreshold;
+        result = 31 * result + (requiredReplicaSetName != null ? requiredReplicaSetName.hashCode() : 0);
+        result = 31 * result + (dbDecoderFactory != null ? dbDecoderFactory.hashCode() : 0);
+        result = 31 * result + (dbEncoderFactory != null ? dbEncoderFactory.hashCode() : 0);
+        result = 31 * result + (cursorFinalizerEnabled ? 1 : 0);
+        result = 31 * result + (socketFactory != null ? socketFactory.hashCode() : 0);
+        result = 31 * result + compressorList.hashCode();
+        result = 31 * result + (autoEncryptionSettings != null ? autoEncryptionSettings.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "MongoClientOptions{"
+                + "description='" + description + '\''
+                + ", applicationName='" + applicationName + '\''
+                + ", compressors='" + compressorList + '\''
+                + ", readPreference=" + readPreference
+                + ", writeConcern=" + writeConcern
+                + ", retryWrites=" + retryWrites
+                + ", retryReads=" + retryReads
+                + ", readConcern=" + readConcern
+                + ", codecRegistry=" + codecRegistry
+                + ", uuidRepresentation=" + uuidRepresentation
+                + ", serverSelector=" + serverSelector
+                + ", clusterListeners=" + clusterListeners
+                + ", commandListeners=" + commandListeners
+                + ", minConnectionsPerHost=" + minConnectionsPerHost
+                + ", maxConnectionsPerHost=" + maxConnectionsPerHost
+                + ", threadsAllowedToBlockForConnectionMultiplier=" + threadsAllowedToBlockForConnectionMultiplier
+                + ", serverSelectionTimeout=" + serverSelectionTimeout
+                + ", maxWaitTime=" + maxWaitTime
+                + ", maxConnectionIdleTime=" + maxConnectionIdleTime
+                + ", maxConnectionLifeTime=" + maxConnectionLifeTime
+                + ", connectTimeout=" + connectTimeout
+                + ", socketTimeout=" + socketTimeout
+                + ", socketKeepAlive=" + socketKeepAlive
+                + ", sslEnabled=" + sslEnabled
+                + ", sslInvalidHostNamesAllowed=" + sslInvalidHostNameAllowed
+                + ", sslContext=" + sslContext
+                + ", alwaysUseMBeans=" + alwaysUseMBeans
+                + ", heartbeatFrequency=" + heartbeatFrequency
+                + ", minHeartbeatFrequency=" + minHeartbeatFrequency
+                + ", heartbeatConnectTimeout=" + heartbeatConnectTimeout
+                + ", heartbeatSocketTimeout=" + heartbeatSocketTimeout
+                + ", localThreshold=" + localThreshold
+                + ", requiredReplicaSetName='" + requiredReplicaSetName + '\''
+                + ", dbDecoderFactory=" + dbDecoderFactory
+                + ", dbEncoderFactory=" + dbEncoderFactory
+                + ", socketFactory=" + socketFactory
+                + ", cursorFinalizerEnabled=" + cursorFinalizerEnabled
+                + ", connectionPoolSettings=" + connectionPoolSettings
+                + ", socketSettings=" + socketSettings
+                + ", serverSettings=" + serverSettings
+                + ", heartbeatSocketSettings=" + heartbeatSocketSettings
+                + ", autoEncryptionSettings=" + autoEncryptionSettings
+                + '}';
+    }
+
+    /**
+     * A builder for MongoClientOptions so that MongoClientOptions can be immutable, and to support easier construction through chaining.
+     *
+     * @since 2.10.0
+     */
+    @NotThreadSafe
+    public static class Builder {
+        private final List<ClusterListener> clusterListeners = new ArrayList<ClusterListener>();
+        private final List<CommandListener> commandListeners = new ArrayList<CommandListener>();
+        private final List<ConnectionPoolListener> connectionPoolListeners = new ArrayList<ConnectionPoolListener>();
+        private final List<ServerListener> serverListeners = new ArrayList<ServerListener>();
+        private final List<ServerMonitorListener> serverMonitorListeners = new ArrayList<ServerMonitorListener>();
+
+        private String description;
+        private String applicationName;
+        private List<MongoCompressor> compressorList = Collections.emptyList();
+        private ReadPreference readPreference = ReadPreference.primary();
+        private WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
+        private boolean retryWrites = true;
+        private boolean retryReads = true;
+        private ReadConcern readConcern = ReadConcern.DEFAULT;
+        private CodecRegistry codecRegistry = MongoClient.getDefaultCodecRegistry();
+        private UuidRepresentation uuidRepresentation = UuidRepresentation.JAVA_LEGACY;
+        private ServerSelector serverSelector;
+        private int minConnectionsPerHost;
+        private int maxConnectionsPerHost = 100;
+        private int threadsAllowedToBlockForConnectionMultiplier = 5;
+        private int serverSelectionTimeout = 1000 * 30;
+        private int maxWaitTime = 1000 * 60 * 2;
+        private int maxConnectionIdleTime;
+        private int maxConnectionLifeTime;
+        private int connectTimeout = 1000 * 10;
+        private int socketTimeout = 0;
+        private boolean socketKeepAlive = true;
+        private boolean sslEnabled = false;
+        private boolean sslInvalidHostNameAllowed = false;
+        private SSLContext sslContext;
+        private boolean alwaysUseMBeans = false;
+
+        private int heartbeatFrequency = 10000;
+        private int minHeartbeatFrequency = 500;
+        private int heartbeatConnectTimeout = 20000;
+        private int heartbeatSocketTimeout = 20000;
+        private int localThreshold = 15;
+
+        private String requiredReplicaSetName;
+        private DBDecoderFactory dbDecoderFactory = DefaultDBDecoder.FACTORY;
+        private DBEncoderFactory dbEncoderFactory = DefaultDBEncoder.FACTORY;
+        private SocketFactory socketFactory;
+        private boolean cursorFinalizerEnabled = true;
+        private AutoEncryptionSettings autoEncryptionSettings;
+
+        /**
+         * Creates a Builder for MongoClientOptions, getting the appropriate system properties for initialization.
+         */
+        public Builder() {
+            heartbeatFrequency(Integer.parseInt(System.getProperty("com.mongodb.updaterIntervalMS", "10000")));
+            minHeartbeatFrequency(Integer.parseInt(System.getProperty("com.mongodb.updaterIntervalNoMasterMS", "500")));
+            heartbeatConnectTimeout(Integer.parseInt(System.getProperty("com.mongodb.updaterConnectTimeoutMS", "20000")));
+            heartbeatSocketTimeout(Integer.parseInt(System.getProperty("com.mongodb.updaterSocketTimeoutMS", "20000")));
+            localThreshold(Integer.parseInt(System.getProperty("com.mongodb.slaveAcceptableLatencyMS", "15")));
+        }
+
+        /**
+         * Creates a Builder from an existing MongoClientOptions.
+         *
+         * @param options create a builder from existing options
+         */
+        @SuppressWarnings("deprecation")
+        public Builder(final MongoClientOptions options) {
+            description = options.getDescription();
+            applicationName = options.getApplicationName();
+            compressorList = options.getCompressorList();
+            minConnectionsPerHost = options.getMinConnectionsPerHost();
+            maxConnectionsPerHost = options.getConnectionsPerHost();
+            threadsAllowedToBlockForConnectionMultiplier = options.getThreadsAllowedToBlockForConnectionMultiplier();
+            serverSelectionTimeout = options.getServerSelectionTimeout();
+            maxWaitTime = options.getMaxWaitTime();
+            maxConnectionIdleTime = options.getMaxConnectionIdleTime();
+            maxConnectionLifeTime = options.getMaxConnectionLifeTime();
+            connectTimeout = options.getConnectTimeout();
+            socketTimeout = options.getSocketTimeout();
+            socketKeepAlive = options.isSocketKeepAlive();
+            readPreference = options.getReadPreference();
+            writeConcern = options.getWriteConcern();
+            retryWrites = options.getRetryWrites();
+            retryReads = options.getRetryReads();
+            readConcern = options.getReadConcern();
+            codecRegistry = options.getCodecRegistry();
+            uuidRepresentation = options.getUuidRepresentation();
+            serverSelector = options.getServerSelector();
+            sslEnabled = options.isSslEnabled();
+            sslInvalidHostNameAllowed = options.isSslInvalidHostNameAllowed();
+            sslContext = options.getSslContext();
+            alwaysUseMBeans = options.isAlwaysUseMBeans();
+            heartbeatFrequency = options.getHeartbeatFrequency();
+            minHeartbeatFrequency = options.getMinHeartbeatFrequency();
+            heartbeatConnectTimeout = options.getHeartbeatConnectTimeout();
+            heartbeatSocketTimeout = options.getHeartbeatSocketTimeout();
+            localThreshold = options.getLocalThreshold();
+            requiredReplicaSetName = options.getRequiredReplicaSetName();
+            dbDecoderFactory = options.getDbDecoderFactory();
+            dbEncoderFactory = options.getDbEncoderFactory();
+            socketFactory = options.socketFactory;
+            cursorFinalizerEnabled = options.isCursorFinalizerEnabled();
+            clusterListeners.addAll(options.getClusterListeners());
+            commandListeners.addAll(options.getCommandListeners());
+            connectionPoolListeners.addAll(options.getConnectionPoolListeners());
+            serverListeners.addAll(options.getServerListeners());
+            serverMonitorListeners.addAll(options.getServerMonitorListeners());
+            autoEncryptionSettings = options.getAutoEncryptionSettings();
+        }
+
+        /**
+         * Sets the description.
+         *
+         * @param description the description of this MongoClient
+         * @return {@code this}
+         * @see com.mongodb.MongoClientOptions#getDescription()
+         * @deprecated Prefer {@link MongoClientOptions.Builder#applicationName(String)}
+         */
+        @Deprecated
+        public Builder description(final String description) {
+            this.description = description;
+            return this;
+        }
+
+        /**
+         * Sets the logical name of the application using this MongoClient.  The application name may be used by the client to identify
+         * the application to the server, for use in server logs, slow query logs, and profile collection.
+         *
+         * @param applicationName the logical name of the application using this MongoClient.  It may be null.
+         *                        The UTF-8 encoding may not exceed 128 bytes.
+         * @return {@code this}
+         * @mongodb.server.release 3.4
+         * @see #getApplicationName()
+         * @since 3.4
+         */
+        public Builder applicationName(final String applicationName) {
+            if (applicationName != null) {
+                isTrueArgument("applicationName UTF-8 encoding length <= 128",
+                        applicationName.getBytes(Charset.forName("UTF-8")).length <= 128);
+            }
+            this.applicationName = applicationName;
+            return this;
+        }
+
+        /**
+         * Sets the compressors to use for compressing messages to the server. The driver will use the first compressor in the list
+         * that the server is configured to support.
+         *
+         * @param compressorList the list of compressors to request
+         * @return {@code this}
+         * @mongodb.server.release 3.4
+         * @see #getCompressorList()
+         * @since 3.6
+         */
+        public Builder compressorList(final List<MongoCompressor> compressorList) {
+            notNull("compressorList", compressorList);
+            this.compressorList = Collections.unmodifiableList(new ArrayList<MongoCompressor>(compressorList));
+            return this;
+        }
+
+        /**
+         * Sets the minimum number of connections per host.
+         *
+         * @param minConnectionsPerHost minimum number of connections
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code minConnectionsPerHost < 0}
+         * @see MongoClientOptions#getMinConnectionsPerHost()
+         * @since 2.12
+         */
+        public Builder minConnectionsPerHost(final int minConnectionsPerHost) {
+            isTrueArgument("minConnectionsPerHost must be >= 0", minConnectionsPerHost >= 0);
+            this.minConnectionsPerHost = minConnectionsPerHost;
+            return this;
+        }
+
+        /**
+         * Sets the maximum number of connections per host.
+         *
+         * @param connectionsPerHost maximum number of connections
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code connectionsPerHost < 1}
+         * @see MongoClientOptions#getConnectionsPerHost()
+         */
+        public Builder connectionsPerHost(final int connectionsPerHost) {
+            isTrueArgument("connectionPerHost must be > 0", connectionsPerHost > 0);
+            this.maxConnectionsPerHost = connectionsPerHost;
+            return this;
+        }
+
+        /**
+         * Sets the multiplier for number of threads allowed to block waiting for a connection.
+         *
+         * @param threadsAllowedToBlockForConnectionMultiplier the multiplier
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code threadsAllowedToBlockForConnectionMultiplier < 1}
+         * @see MongoClientOptions#getThreadsAllowedToBlockForConnectionMultiplier()
+         * @deprecated in the next major release, wait queue size limitations will be removed
+         */
+        @Deprecated
+        public Builder threadsAllowedToBlockForConnectionMultiplier(final int threadsAllowedToBlockForConnectionMultiplier) {
+            isTrueArgument("threadsAllowedToBlockForConnectionMultiplier must be > 0", threadsAllowedToBlockForConnectionMultiplier > 0);
+            this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
+            return this;
+        }
+
+        /**
+         * <p>Sets the server selection timeout in milliseconds, which defines how long the driver will wait for server selection to
+         * succeed before throwing an exception.</p>
+         *
+         * <p> A value of 0 means that it will timeout immediately if no server is available.  A negative value means to wait
+         * indefinitely.</p>
+         *
+         * @param serverSelectionTimeout the server selection timeout, in milliseconds
+         * @return {@code this}
+         * @see com.mongodb.MongoClientOptions#getServerSelectionTimeout()
+         */
+        public Builder serverSelectionTimeout(final int serverSelectionTimeout) {
+            this.serverSelectionTimeout = serverSelectionTimeout;
+            return this;
+        }
+
+        /**
+         * Sets the maximum time that a thread will block waiting for a connection.
+         *
+         * @param maxWaitTime the maximum wait time, in milliseconds
+         * @return {@code this}
+         * @see MongoClientOptions#getMaxWaitTime()
+         */
+        public Builder maxWaitTime(final int maxWaitTime) {
+            this.maxWaitTime = maxWaitTime;
+            return this;
+        }
+
+        /**
+         * Sets the maximum idle time for a pooled connection.
+         *
+         * @param maxConnectionIdleTime the maximum idle time, in milliseconds, which must be &gt;= 0.
+         *                              A zero value indicates no limit to the life time.
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code maxConnectionIdleTime < 0}
+         * @see com.mongodb.MongoClientOptions#getMaxConnectionIdleTime()
+         * @since 2.12
+         */
+        public Builder maxConnectionIdleTime(final int maxConnectionIdleTime) {
+            this.maxConnectionIdleTime = maxConnectionIdleTime;
+            return this;
+        }
+
+        /**
+         * Sets the maximum life time for a pooled connection.
+         *
+         * @param maxConnectionLifeTime the maximum life time, in milliseconds, which must be &gt;= 0.
+         *                              A zero value indicates no limit to the life time.
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code maxConnectionLifeTime < 0}
+         * @see com.mongodb.MongoClientOptions#getMaxConnectionIdleTime()
+         * @since 2.12
+         */
+        public Builder maxConnectionLifeTime(final int maxConnectionLifeTime) {
+            this.maxConnectionLifeTime = maxConnectionLifeTime;
+            return this;
+        }
+
+
+        /**
+         * Sets the connection timeout.
+         *
+         * @param connectTimeout the connection timeout, in milliseconds, which must be &gt; 0
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code connectTimeout <= 0}
+         * @see com.mongodb.MongoClientOptions#getConnectTimeout()
+         */
+        public Builder connectTimeout(final int connectTimeout) {
+            isTrueArgument("connectTimeout must be >= 0", connectTimeout >= 0);
+            this.connectTimeout = connectTimeout;
+            return this;
+        }
+
+        /**
+         * Sets the socket timeout.
+         *
+         * @param socketTimeout the socket timeout, in milliseconds
+         * @return {@code this}
+         * @see com.mongodb.MongoClientOptions#getSocketTimeout()
+         */
+        public Builder socketTimeout(final int socketTimeout) {
+            this.socketTimeout = socketTimeout;
+            return this;
+        }
+
+        /**
+         * Sets whether socket keep-alive is enabled.
+         *
+         * @param socketKeepAlive keep-alive
+         * @return {@code this}
+         * @see <a href="https://docs.mongodb.com/manual/faq/diagnostics/#does-tcp-keepalive-time-affect-mongodb-deployments">
+         * Does TCP keep-alive time affect MongoDB Deployments?</a>
+         * @deprecated configuring keep-alive has been deprecated. It now defaults to true and disabling it is not recommended.
+         */
+        @Deprecated
+        public Builder socketKeepAlive(final boolean socketKeepAlive) {
+            this.socketKeepAlive = socketKeepAlive;
+            return this;
+        }
+
+        /**
+         * Sets whether to use SSL.
+         *
+         * <p>If the socketFactory is unset, setting this to true will also set the socketFactory to
+         * {@link SSLSocketFactory#getDefault()} and setting it to false will set the socketFactory to
+         * {@link SocketFactory#getDefault()}</p>
+         *
+         * <p>If the socket factory is set and sslEnabled is also set, the socket factory must create instances of
+         * {@link javax.net.ssl.SSLSocket}. Otherwise, MongoClient will refuse to connect.</p>
+         *
+         * @param sslEnabled set to true if using SSL
+         * @return {@code this}
+         * @see MongoClientOptions#isSslEnabled()
+         * @see MongoClientOptions#getSocketFactory()
+         * @since 3.0
+         */
+        public Builder sslEnabled(final boolean sslEnabled) {
+            this.sslEnabled = sslEnabled;
+            return this;
+        }
+
+        /**
+         * Define whether invalid host names should be allowed.  Defaults to false.  Take care before setting this to true, as it makes
+         * the application susceptible to man-in-the-middle attacks.
+         *
+         * @param sslInvalidHostNameAllowed whether invalid host names are allowed in SSL certificates.
+         * @return this
+         */
+        public Builder sslInvalidHostNameAllowed(final boolean sslInvalidHostNameAllowed) {
+            this.sslInvalidHostNameAllowed = sslInvalidHostNameAllowed;
+            return this;
+        }
+
+        /**
+         * Sets the SSLContext to be used with SSL is enabled.  This property is ignored when either sslEnabled is false or socketFactory is
+         * non-null.
+         *
+         * @param sslContext the SSLContext to be used for SSL connections
+         * @return {@code this}
+         * @since 3.5
+         */
+        public Builder sslContext(final SSLContext sslContext) {
+            this.sslContext = sslContext;
+            return this;
+        }
+
+        /**
+         * Sets the read preference.
+         *
+         * @param readPreference read preference
+         * @return {@code this}
+         * @see MongoClientOptions#getReadPreference()
+         */
+        public Builder readPreference(final ReadPreference readPreference) {
+            this.readPreference = notNull("readPreference", readPreference);
+            return this;
+        }
+
+        /**
+         * Sets the write concern.
+         *
+         * @param writeConcern the write concern
+         * @return {@code this}
+         * @see MongoClientOptions#getWriteConcern()
+         */
+        public Builder writeConcern(final WriteConcern writeConcern) {
+            this.writeConcern = notNull("writeConcern", writeConcern);
+            return this;
+        }
+
+        /**
+         * Sets whether writes should be retried if they fail due to a network error.
+         *
+         * <p>Starting with the 3.11.0 release, the default value is true</p>
+         *
+         * @param retryWrites sets if writes should be retried if they fail due to a network error.
+         * @return {@code this}
+         * @mongodb.server.release 3.6
+         * @see #getRetryWrites()
+         * @since 3.6
+         */
+        public Builder retryWrites(final boolean retryWrites) {
+            this.retryWrites = retryWrites;
+            return this;
+        }
+
+        /**
+         * Sets whether reads should be retried if they fail due to a network error.
+         *
+         * @param retryReads sets if reads should be retried if they fail due to a network error.
+         * @return {@code this}
+         * @mongodb.server.release 3.6
+         * @see #getRetryReads()
+         * @since 3.11
+         */
+        public Builder retryReads(final boolean retryReads) {
+            this.retryReads = retryReads;
+            return this;
+        }
+
+        /**
+         * Sets the read concern.
+         *
+         * @param readConcern the read concern.
+         * @return this
+         * @mongodb.server.release 3.2
+         * @mongodb.driver.manual reference/readConcern/ Read Concern
+         * @see MongoClientOptions#getReadConcern()
+         * @since 3.2
+         */
+        public Builder readConcern(final ReadConcern readConcern) {
+            this.readConcern = notNull("readConcern", readConcern);
+            return this;
+        }
+
+        /**
+         * Sets the codec registry
+         *
+         * <p>Note that instances of {@code DB} and {@code DBCollection} do not use the registry, so it's not necessary to include a
+         * codec for DBObject in the registry.</p>
+         *
+         * @param codecRegistry the codec registry
+         * @return {@code this}
+         * @see MongoClientOptions#getCodecRegistry()
+         * @since 3.0
+         */
+        public Builder codecRegistry(final CodecRegistry codecRegistry) {
+            this.codecRegistry = notNull("codecRegistry", codecRegistry);
+            return this;
+        }
+
+        /**
+         * Sets the UUID representation to use when encoding instances of {@link java.util.UUID} and when decoding BSON binary values with
+         * subtype of 3.
+         *
+         * <p>See {@link #getUuidRepresentation()} for recommendations on settings this value</p>
+         *
+         * @param uuidRepresentation the UUID representation, which may not be null
+         * @return this
+         * @since 3.12
+         */
+        public Builder uuidRepresentation(final UuidRepresentation uuidRepresentation) {
+            this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
+            return this;
+        }
+
+        /**
+         * Sets a server selector that augments the normal server selection rules applied by the driver when determining
+         * which server to send an operation to.  See {@link #getServerSelector()} for further details.
+         *
+         * @param serverSelector the server selector
+         * @return this
+         * @see #getServerSelector()
+         * @since 3.6
+         */
+        public Builder serverSelector(final ServerSelector serverSelector) {
+            this.serverSelector = serverSelector;
+            return this;
+        }
+
+        /**
+         * Adds the given command listener.
+         *
+         * @param commandListener the non-null command listener
+         * @return this
+         * @since 3.1
+         */
+        public Builder addCommandListener(final CommandListener commandListener) {
+            commandListeners.add(notNull("commandListener", commandListener));
+            return this;
+        }
+
+        /**
+         * Adds the given connection pool listener.
+         *
+         * @param connectionPoolListener the non-null connection pool listener
+         * @return this
+         * @since 3.5
+         */
+        public Builder addConnectionPoolListener(final ConnectionPoolListener connectionPoolListener) {
+            connectionPoolListeners.add(notNull("connectionPoolListener", connectionPoolListener));
+            return this;
+        }
+
+        /**
+         * Adds the given cluster listener.
+         *
+         * @param clusterListener the non-null cluster listener
+         * @return this
+         * @since 3.3
+         */
+        public Builder addClusterListener(final ClusterListener clusterListener) {
+            clusterListeners.add(notNull("clusterListener", clusterListener));
+            return this;
+        }
+
+        /**
+         * Adds the given server listener.
+         *
+         * @param serverListener the non-null server listener
+         * @return this
+         * @since 3.3
+         */
+        public Builder addServerListener(final ServerListener serverListener) {
+            serverListeners.add(notNull("serverListener", serverListener));
+            return this;
+        }
+
+        /**
+         * Adds the given server monitor listener.
+         *
+         * @param serverMonitorListener the non-null server monitor listener
+         * @return this
+         * @since 3.3
+         */
+        public Builder addServerMonitorListener(final ServerMonitorListener serverMonitorListener) {
+            serverMonitorListeners.add(notNull("serverMonitorListener", serverMonitorListener));
+            return this;
+        }
+
+        /**
+         * Sets the socket factory.
+         *
+         * @param socketFactory the socket factory
+         * @return {@code this}
+         * @see MongoClientOptions#getSocketFactory()
+         * @deprecated Prefer {@link #sslEnabled(boolean)} and {@link #sslContext(SSLContext)}
+         */
+        @Deprecated
+        public Builder socketFactory(final SocketFactory socketFactory) {
+            this.socketFactory = socketFactory;
+            return this;
+        }
+
+        /**
+         * Sets whether cursor finalizers are enabled.
+         *
+         * @param cursorFinalizerEnabled whether cursor finalizers are enabled.
+         * @return {@code this}
+         * @see MongoClientOptions#isCursorFinalizerEnabled()
+         */
+        public Builder cursorFinalizerEnabled(final boolean cursorFinalizerEnabled) {
+            this.cursorFinalizerEnabled = cursorFinalizerEnabled;
+            return this;
+        }
+
+        /**
+         * Sets whether JMX beans registered by the driver should always be MBeans, regardless of whether the VM is Java 6 or greater. If
+         * false, the driver will use MXBeans if the VM is Java 6 or greater, and use MBeans if the VM is Java 5.
+         *
+         * @param alwaysUseMBeans true if driver should always use MBeans, regardless of VM version
+         * @return this
+         * @see MongoClientOptions#isAlwaysUseMBeans()
+         * @deprecated there is no replacement for this property
+         */
+        @Deprecated
+        public Builder alwaysUseMBeans(final boolean alwaysUseMBeans) {
+            this.alwaysUseMBeans = alwaysUseMBeans;
+            return this;
+        }
+
+        /**
+         * Sets the decoder factory.
+         *
+         * @param dbDecoderFactory the decoder factory
+         * @return {@code this}
+         * @see MongoClientOptions#getDbDecoderFactory()
+         */
+        public Builder dbDecoderFactory(final DBDecoderFactory dbDecoderFactory) {
+            if (dbDecoderFactory == null) {
+                throw new IllegalArgumentException("null is not a legal value");
+            }
+            this.dbDecoderFactory = dbDecoderFactory;
+            return this;
+        }
+
+        /**
+         * Sets the encoder factory.
+         *
+         * @param dbEncoderFactory the encoder factory
+         * @return {@code this}
+         * @see MongoClientOptions#getDbEncoderFactory()
+         */
+        public Builder dbEncoderFactory(final DBEncoderFactory dbEncoderFactory) {
+            if (dbEncoderFactory == null) {
+                throw new IllegalArgumentException("null is not a legal value");
+            }
+            this.dbEncoderFactory = dbEncoderFactory;
+            return this;
+        }
+
+        /**
+         * Sets the heartbeat frequency. This is the frequency that the driver will attempt to determine the current state of each server in
+         * the cluster. The default value is 10,000 milliseconds
+         *
+         * @param heartbeatFrequency the heartbeat frequency for the cluster, in milliseconds, which must be &gt; 0
+         * @return {@code this}
+         * @throws IllegalArgumentException if heartbeatFrequency is not &gt; 0
+         * @see MongoClientOptions#getHeartbeatFrequency()
+         * @since 2.12
+         */
+        public Builder heartbeatFrequency(final int heartbeatFrequency) {
+            isTrueArgument("heartbeatFrequency must be > 0", heartbeatFrequency > 0);
+            this.heartbeatFrequency = heartbeatFrequency;
+            return this;
+        }
+
+        /**
+         * Sets the minimum heartbeat frequency.  In the event that the driver has to frequently re-check a server's availability,
+         * it will wait at least this long since the previous check to avoid wasted effort.  The default value is 500 milliseconds.
+         *
+         * @param minHeartbeatFrequency the minimum heartbeat frequency, in milliseconds, which must be &gt; 0
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code minHeartbeatFrequency <= 0}
+         * @see MongoClientOptions#getMinHeartbeatFrequency()
+         * @since 2.13
+         */
+        public Builder minHeartbeatFrequency(final int minHeartbeatFrequency) {
+            isTrueArgument("minHeartbeatFrequency must be > 0", minHeartbeatFrequency > 0);
+            this.minHeartbeatFrequency = minHeartbeatFrequency;
+            return this;
+        }
+
+        /**
+         * Sets the connect timeout for connections used for the cluster heartbeat.
+         *
+         * @param connectTimeout the connection timeout, in milliseconds
+         * @return {@code this}
+         * @see MongoClientOptions#getHeartbeatConnectTimeout()
+         * @since 2.12
+         */
+        public Builder heartbeatConnectTimeout(final int connectTimeout) {
+            this.heartbeatConnectTimeout = connectTimeout;
+            return this;
+        }
+
+        /**
+         * Sets the socket timeout for connections used for the cluster heartbeat.
+         *
+         * @param socketTimeout the socket timeout, in milliseconds
+         * @return {@code this}
+         * @see MongoClientOptions#getHeartbeatSocketTimeout()
+         * @since 2.12
+         */
+        public Builder heartbeatSocketTimeout(final int socketTimeout) {
+            this.heartbeatSocketTimeout = socketTimeout;
+            return this;
+        }
+
+        /**
+         * Sets the local threshold.
+         *
+         * @param localThreshold the acceptable latency difference, in milliseconds, which must be &gt;= 0
+         * @return {@code this}
+         * @throws IllegalArgumentException if {@code localThreshold < 0}
+         * @see com.mongodb.MongoClientOptions#getLocalThreshold()
+         * @since 2.13.0
+         */
+        public Builder localThreshold(final int localThreshold) {
+            isTrueArgument("localThreshold must be >= 0", localThreshold >= 0);
+            this.localThreshold = localThreshold;
+            return this;
+        }
+
+        /**
+         * Sets the required replica set name for the cluster.
+         *
+         * @param requiredReplicaSetName the required replica set name for the replica set.
+         * @return this
+         * @see MongoClientOptions#getRequiredReplicaSetName()
+         * @since 2.12
+         */
+        public Builder requiredReplicaSetName(final String requiredReplicaSetName) {
+            this.requiredReplicaSetName = requiredReplicaSetName;
+            return this;
+        }
+
+        /**
+         * Set options for auto-encryption.
+         *
+         * @param autoEncryptionSettings auto encryption settings
+         * @return this
+         * @since 3.11
+         */
+        public Builder autoEncryptionSettings(final AutoEncryptionSettings autoEncryptionSettings) {
+            this.autoEncryptionSettings = autoEncryptionSettings;
+            return this;
+        }
+
+        /**
+         * Sets defaults to be what they are in {@code MongoOptions}.
+         *
+         * @return {@code this}
+         * @see MongoOptions
+         * @deprecated there is no replacement for this method
+         */
+        @Deprecated
+        public Builder legacyDefaults() {
+            this.connectionsPerHost(10).writeConcern(WriteConcern.UNACKNOWLEDGED);
+            return this;
+        }
+
+        /**
+         * Build an instance of MongoClientOptions.
+         *
+         * @return the options from this builder
+         */
+        public MongoClientOptions build() {
+            return new MongoClientOptions(this);
+        }
+
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/MongoClientURI.java b/driver-legacy/src/main/com/mongodb/MongoClientURI.java
new file mode 100644
index 00000000000..7cfb2facfac
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/MongoClientURI.java
@@ -0,0 +1,479 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.lang.Nullable;
+
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * Represents a <a href="http://www.mongodb.org/display/DOCS/Connections">URI</a>
+ * which can be used to create a MongoClient instance. The URI describes the hosts to
+ * be used and options.
+ * <p>The format of the URI is:
+ * <pre>
+ *   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database.collection][?options]]
+ * </pre>
+ * <ul>
+ * <li>{@code mongodb://} is a required prefix to identify that this is a string in the standard connection format.</li>
+ * <li>{@code username:password@} are optional.  If given, the driver will attempt to login to a database after
+ * connecting to a database server.  For some authentication mechanisms, only the username is specified and the password is not,
+ * in which case the ":" after the username is left off as well</li>
+ * <li>{@code host1} is the only required part of the connection string. It identifies a server address to connect to.
+ * Support for Unix domain sockets was added in 3.7. Note: The path must be urlencoded eg: {@code mongodb://%2Ftmp%2Fmongodb-27017.sock}
+ * and the {@code jnr.unixsocket} library installed.
+ * <li>{@code :portX} is optional and defaults to :27017 if not provided.</li>
+ * <li>{@code /database} is the name of the database to login to and thus is only relevant if the
+ * {@code username:password@} syntax is used. If not specified the "admin" database will be used by default.</li>
+ * <li>{@code ?options} are connection options. Note that if {@code database} is absent there is still a {@code /}
+ * required between the last host and the {@code ?} introducing the options. Options are name=value pairs and the pairs
+ * are separated by "&amp;". For backwards compatibility, ";" is accepted as a separator in addition to "&amp;",
+ * but should be considered as deprecated.</li>
+ * </ul>
+ * <p>An alternative format, using the mongodb+srv protocol, is:
+ * <pre>
+ *   mongodb+srv://[username:password@]host[/[database][?options]]
+ * </pre>
+ * <ul>
+ * <li>{@code mongodb+srv://} is a required prefix for this format.</li>
+ * <li>{@code username:password@} are optional.  If given, the driver will attempt to login to a database after
+ * connecting to a database server.  For some authentication mechanisms, only the username is specified and the password is not,
+ * in which case the ":" after the username is left off as well</li>
+ * <li>{@code host} is the only required part of the URI.  It identifies a single host name for which SRV records are looked up
+ * from a Domain Name Server after prefixing the host name with {@code "_mongodb._tcp"}.  The host/port for each SRV record becomes the
+ * seed list used to connect, as if each one were provided as host/port pair in a URI using the normal mongodb protocol.</li>
+ * <li>{@code /database} is the name of the database to login to and thus is only relevant if the
+ * {@code username:password@} syntax is used. If not specified the "admin" database will be used by default.</li>
+ * <li>{@code ?options} are connection options. Note that if {@code database} is absent there is still a {@code /}
+ * required between the last host and the {@code ?} introducing the options. Options are name=value pairs and the pairs
+ * are separated by "&amp;". For backwards compatibility, ";" is accepted as a separator in addition to "&amp;",
+ * but should be considered as deprecated. Additionally with the mongodb+srv protocol, TXT records are looked up from a Domain Name
+ * Server for the given host, and the text value of each one is prepended to any options on the URI itself.  Because the last specified
+ * value for any option wins, that means that options provided on the URI will override any that are provided via TXT records.</li>
+ * </ul>
+ * <p>The following options are supported (case insensitive):</p>
+ *
+ * <p>Server Selection Configuration:</p>
+ * <ul>
+ * <li>{@code serverSelectionTimeoutMS=ms}: How long the driver will wait for server selection to succeed before throwing an exception.</li>
+ * <li>{@code localThresholdMS=ms}: When choosing among multiple MongoDB servers to send a request, the driver will only
+ * send that request to a server whose ping time is less than or equal to the server with the fastest ping time plus the local
+ * threshold.</li>
+ * </ul>
+ * <p>Server Monitoring Configuration:</p>
+ * <ul>
+ * <li>{@code heartbeatFrequencyMS=ms}: The frequency that the driver will attempt to determine the current state of each server in the
+ * cluster.</li>
+ * </ul>
+ * <p>Replica set configuration:</p>
+ * <ul>
+ * <li>{@code replicaSet=name}: Implies that the hosts given are a seed list, and the driver will attempt to find
+ * all members of the set.</li>
+ * </ul>
+ *
+ * <p>Connection Configuration:</p>
+ * <ul>
+ * <li>{@code ssl=true|false}: Whether to connect using TLS.</li>
+ * <li>{@code tls=true|false}: Whether to connect using TLS. Supersedes the ssl option</li>
+ * <li>{@code tlsInsecure=true|false}: If connecting with TLS, this option enables insecure TLS connections. Currently this has the
+ * same effect of setting tlsAllowInvalidHostnames to true. Other mechanism for relaxing TLS security constraints must be handled in
+ * the application by customizing the {@link javax.net.ssl.SSLContext}</li>
+ * <li>{@code sslInvalidHostNameAllowed=true|false}: Whether to allow invalid host names for TLS connections.</li>
+ * <li>{@code tlsAllowInvalidHostnames=true|false}: Whether to allow invalid host names for TLS connections. Supersedes the
+ * sslInvalidHostNameAllowed option</li>
+ * <li>{@code connectTimeoutMS=ms}: How long a connection can take to be opened before timing out.</li>
+ * <li>{@code socketTimeoutMS=ms}: How long a send or receive on a socket can take before timing out.</li>
+ * <li>{@code maxIdleTimeMS=ms}: Maximum idle time of a pooled connection. A connection that exceeds this limit will be closed</li>
+ * <li>{@code maxLifeTimeMS=ms}: Maximum life time of a pooled connection. A connection that exceeds this limit will be closed</li>
+ * </ul>
+ *
+ * <p>Connection pool configuration:</p>
+ * <ul>
+ * <li>{@code maxPoolSize=n}: The maximum number of connections in the connection pool.</li>
+ * <li>{@code waitQueueMultiple=n} : this multiplier, multiplied with the maxPoolSize setting, gives the maximum number of
+ * threads that may be waiting for a connection to become available from the pool.  All further threads will get an
+ * exception right away.  Note that this configuration option is deprecated and will be removed in the next major release.</li>
+ * <li>{@code waitQueueTimeoutMS=ms}: The maximum wait time in milliseconds that a thread may wait for a connection to
+ * become available.</li>
+ * </ul>
+ *
+ * <p>Write concern configuration:</p>
+ * <ul>
+ *  <li>{@code safe=true|false}
+ *      <ul>
+ *          <li>{@code true}: the driver ensures that all writes are acknowledged by the MongoDB server, or else throws an exception.
+ * (see also {@code w} and {@code wtimeoutMS}).</li>
+ *          <li>{@code false}: the driver does not ensure that all writes are acknowledged by the MongoDB server.</li>
+ *      </ul>
+ *  </li>
+ * <li>{@code journal=true|false}
+ *  <ul>
+ *      <li>{@code true}: the driver waits for the server to group commit to the journal file on disk.</li>
+ *      <li>{@code false}: the driver does not wait for the server to group commit to the journal file on disk.</li>
+ *  </ul>
+ * </li>
+ *  <li>{@code w=wValue}
+ *      <ul>
+ *          <li>The driver adds { w : wValue } to all write commands. Implies {@code safe=true}.</li>
+ *          <li>wValue is typically a number, but can be any string in order to allow for specifications like
+ * {@code "majority"}</li>
+ *      </ul>
+ *  </li>
+ *  <li>{@code wtimeoutMS=ms}
+ *      <ul>
+ *          <li>The driver adds { wtimeout : ms } to all write commands. Implies {@code safe=true}.</li>
+ *          <li>Used in combination with {@code w}</li>
+ *      </ul>
+ *  </li>
+ *  <li>{@code retryWrites=true|false}. If true the driver will retry supported write operations if they fail due to a network error.
+ *  Defaults to false.</li>
+ *  <li>{@code retryReads=true|false}. If true the driver will retry supported read operations if they fail due to a network error.
+ *  Defaults to false.</li>
+ * </ul>
+ *
+ *
+ * <p>Read preference configuration:</p>
+ * <ul>
+ * <li>{@code slaveOk=true|false}: Whether a driver connected to a replica set will send reads to slaves/secondaries.</li>
+ * <li>{@code readPreference=enum}: The read preference for this connection.  If set, it overrides any slaveOk value.
+ * <ul>
+ * <li>Enumerated values:
+ * <ul>
+ * <li>{@code primary}</li>
+ * <li>{@code primaryPreferred}</li>
+ * <li>{@code secondary}</li>
+ * <li>{@code secondaryPreferred}</li>
+ * <li>{@code nearest}</li>
+ * </ul>
+ * </li>
+ * </ul>
+ * </li>
+ * <li>{@code readPreferenceTags=string}.  A representation of a tag set as a comma-separated list of colon-separated
+ * key-value pairs, e.g. {@code "dc:ny,rack:1}".  Spaces are stripped from beginning and end of all keys and values.
+ * To specify a list of tag sets, using multiple readPreferenceTags,
+ * e.g. {@code readPreferenceTags=dc:ny,rack:1;readPreferenceTags=dc:ny;readPreferenceTags=}
+ * <ul>
+ * <li>Note the empty value for the last one, which means match any secondary as a last resort.</li>
+ * <li>Order matters when using multiple readPreferenceTags.</li>
+ * </ul>
+ * </li>
+ * <li>{@code maxStalenessSeconds=seconds}. The maximum staleness in seconds. For use with any non-primary read preference, the driver
+ * estimates the staleness of each secondary, based on lastWriteDate values provided in server isMaster responses, and selects only those
+ * secondaries whose staleness is less than or equal to maxStalenessSeconds.  Not providing the parameter or explicitly setting it to -1
+ * indicates that there should be no max staleness check.  The maximum staleness feature is designed to prevent badly-lagging servers from
+ * being selected. The staleness estimate is imprecise and shouldn't be used to try to select "up-to-date" secondaries.  The minimum value
+ * is either 90 seconds, or the heartbeat frequency plus 10 seconds, whichever is greatest.
+ * </li>
+ * </ul>
+ * <p>Authentication configuration:</p>
+ * <ul>
+ * <li>{@code authMechanism=MONGO-CR|GSSAPI|PLAIN|MONGODB-X509}: The authentication mechanism to use if a credential was supplied.
+ * The default is unspecified, in which case the client will pick the most secure mechanism available based on the sever version.  For the
+ * GSSAPI and MONGODB-X509 mechanisms, no password is accepted, only the username.
+ * </li>
+ * <li>{@code authSource=string}: The source of the authentication credentials.  This is typically the database that
+ * the credentials have been created.  The value defaults to the database specified in the path portion of the URI.
+ * If the database is specified in neither place, the default value is "admin".  This option is only respected when using the MONGO-CR
+ * mechanism (the default).
+ * </li>
+ * <li>{@code gssapiServiceName=string}: This option only applies to the GSSAPI mechanism and is used to alter the service name..
+ * </li>
+ * </ul>
+ * <p>Server Handshake configuration:</p>
+ * <ul>
+ * <li>{@code appName=string}: Sets the logical name of the application.  The application name may be used by the client to identify
+ * the application to the server, for use in server logs, slow query logs, and profile collection.</li>
+ * </ul>
+ * <p>Compressor configuration:</p>
+ * <ul>
+ * <li>{@code compressors=string}: A comma-separated list of compressors to request from the server.  The supported compressors
+ * currently are 'zlib', 'snappy' and 'zstd'.</li>
+ * <li>{@code zlibCompressionLevel=integer}: Integer value from -1 to 9 representing the zlib compression level. Lower values will make
+ * compression faster, while higher values will make compression better.</li>
+ * </ul>
+ * <p>General configuration:</p>
+ * <ul>
+ * <li>{@code retryWrites=true|false}. If true the driver will retry supported write operations if they fail due to a network error.
+ *  Defaults to true.</li>
+ * <li>{@code retryReads=true|false}. If true the driver will retry supported read operations if they fail due to a network error.
+ *  Defaults to true.</li>
+ * <li>{@code uuidRepresentation=unspecified|standard|javaLegacy|csharpLegacy|pythonLegacy}.  See
+ * {@link MongoClientOptions#getUuidRepresentation()} for documentation of semantics of this parameter.  Defaults to "javaLegacy", but
+ * will change to "unspecified" in the next major release.</li>
+ * </ul>
+ *
+ * <p>Note: This class is a replacement for {@code MongoURI}, to be used with {@code MongoClient}.  The main difference in
+ * behavior is that the default write concern is {@code WriteConcern.ACKNOWLEDGED}.</p>
+ *
+ * @mongodb.driver.manual reference/connection-string Connection String URI Format
+ * @see MongoClientOptions for the default values for all options
+ * @since 2.10.0
+ */
+public class MongoClientURI {
+    private final ConnectionString proxied;
+    private final MongoClientOptions.Builder builder;
+
+    /**
+     * Creates a MongoURI from the given string.
+     *
+     * @param uri the URI
+     */
+    public MongoClientURI(final String uri) {
+        this(uri, new MongoClientOptions.Builder());
+    }
+
+    /**
+     * Creates a MongoURI from the given URI string, and MongoClientOptions.Builder.  The builder can be configured with default options,
+     * which may be overridden by options specified in the URI string.
+     *
+     * <p>
+     * The {@code MongoClientURI} takes ownership of the {@code MongoClientOptions.Builder} instance that is passed to this constructor,
+     * and may modify it.
+     * </p>
+     *
+     * @param uri     the URI
+     * @param builder a non-null Builder, which may be modified within this constructor,
+     * @since 2.11.0
+     */
+    public MongoClientURI(final String uri, final MongoClientOptions.Builder builder) {
+        this.builder = notNull("builder", builder);
+        proxied = new ConnectionString(uri);
+    }
+
+    ConnectionString getProxied() {
+        return proxied;
+    }
+
+    // ---------------------------------
+
+    /**
+     * Gets the username
+     *
+     * @return the username
+     */
+    @Nullable
+    public String getUsername() {
+        return proxied.getUsername();
+    }
+
+    /**
+     * Gets the password
+     *
+     * @return the password
+     */
+    @Nullable
+    public char[] getPassword() {
+        return proxied.getPassword();
+    }
+
+    /**
+     * Gets the list of hosts
+     *
+     * @return the host list
+     */
+    public List<String> getHosts() {
+        return proxied.getHosts();
+    }
+
+    /**
+     * Gets the database name
+     *
+     * @return the database name
+     */
+    @Nullable
+    public String getDatabase() {
+        return proxied.getDatabase();
+    }
+
+
+    /**
+     * Gets the collection name
+     *
+     * @return the collection name
+     */
+    @Nullable
+    public String getCollection() {
+        return proxied.getCollection();
+    }
+
+    /**
+     * Get the unparsed URI.
+     *
+     * @return the URI
+     */
+    public String getURI() {
+        return proxied.getConnectionString();
+    }
+
+    /**
+     * Gets the credentials.
+     *
+     * @return the credentials
+     */
+    @Nullable
+    public MongoCredential getCredentials() {
+        return proxied.getCredential();
+    }
+
+    /**
+     * Gets the options
+     *
+     * @return the MongoClientOptions based on this URI.
+     */
+    public MongoClientOptions getOptions() {
+        ReadPreference readPreference = proxied.getReadPreference();
+        if (readPreference != null) {
+            builder.readPreference(readPreference);
+        }
+        ReadConcern readConcern = proxied.getReadConcern();
+        if (readConcern != null) {
+            builder.readConcern(readConcern);
+        }
+        WriteConcern writeConcern = proxied.getWriteConcern();
+        if (writeConcern != null) {
+            builder.writeConcern(writeConcern);
+        }
+        if (proxied.getRetryWritesValue() != null) {
+            builder.retryWrites(proxied.getRetryWritesValue());
+        }
+        if (proxied.getRetryReads() != null) {
+            builder.retryReads(proxied.getRetryReads());
+        }
+
+        Integer maxConnectionPoolSize = proxied.getMaxConnectionPoolSize();
+        if (maxConnectionPoolSize != null) {
+            builder.connectionsPerHost(maxConnectionPoolSize);
+        }
+        Integer integer = proxied.getMinConnectionPoolSize();
+        if (integer != null) {
+            builder.minConnectionsPerHost(integer);
+        }
+        Integer maxWaitTime = proxied.getMaxWaitTime();
+        if (maxWaitTime != null) {
+            builder.maxWaitTime(maxWaitTime);
+        }
+        Integer threadsAllowedToBlockForConnectionMultiplier = proxied.getThreadsAllowedToBlockForConnectionMultiplier();
+        if (threadsAllowedToBlockForConnectionMultiplier != null) {
+            builder.threadsAllowedToBlockForConnectionMultiplier(threadsAllowedToBlockForConnectionMultiplier);
+        }
+        Integer maxConnectionIdleTime = proxied.getMaxConnectionIdleTime();
+        if (maxConnectionIdleTime != null) {
+            builder.maxConnectionIdleTime(maxConnectionIdleTime);
+        }
+        Integer maxConnectionLifeTime = proxied.getMaxConnectionLifeTime();
+        if (maxConnectionLifeTime != null) {
+            builder.maxConnectionLifeTime(maxConnectionLifeTime);
+        }
+        Integer socketTimeout = proxied.getSocketTimeout();
+        if (socketTimeout != null) {
+            builder.socketTimeout(socketTimeout);
+        }
+        Integer connectTimeout = proxied.getConnectTimeout();
+        if (connectTimeout != null) {
+            builder.connectTimeout(connectTimeout);
+        }
+        String requiredReplicaSetName = proxied.getRequiredReplicaSetName();
+        if (requiredReplicaSetName != null) {
+            builder.requiredReplicaSetName(requiredReplicaSetName);
+        }
+        Boolean sslEnabled = proxied.getSslEnabled();
+        if (sslEnabled != null) {
+            builder.sslEnabled(sslEnabled);
+        }
+        Boolean sslInvalidHostnameAllowed = proxied.getSslInvalidHostnameAllowed();
+        if (sslInvalidHostnameAllowed != null) {
+            builder.sslInvalidHostNameAllowed(sslInvalidHostnameAllowed);
+        }
+        Integer serverSelectionTimeout = proxied.getServerSelectionTimeout();
+        if (serverSelectionTimeout != null) {
+            builder.serverSelectionTimeout(serverSelectionTimeout);
+        }
+        Integer localThreshold = proxied.getLocalThreshold();
+        if (localThreshold != null) {
+            builder.localThreshold(localThreshold);
+        }
+        Integer heartbeatFrequency = proxied.getHeartbeatFrequency();
+        if (heartbeatFrequency != null) {
+            builder.heartbeatFrequency(heartbeatFrequency);
+        }
+        String applicationName = proxied.getApplicationName();
+        if (applicationName != null) {
+            builder.applicationName(applicationName);
+        }
+        if (!proxied.getCompressorList().isEmpty()) {
+            builder.compressorList(proxied.getCompressorList());
+        }
+        return builder.build();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        MongoClientURI that = (MongoClientURI) o;
+
+        if (!getHosts().equals(that.getHosts())) {
+            return false;
+        }
+        String database = getDatabase();
+        if (database != null ? !database.equals(that.getDatabase()) : that.getDatabase() != null) {
+            return false;
+        }
+        String collection = getCollection();
+        if (collection != null ? !collection.equals(that.getCollection()) : that.getCollection() != null) {
+            return false;
+        }
+        MongoCredential credentials = getCredentials();
+        if (credentials != null ? !credentials.equals(that.getCredentials()) : that.getCredentials() != null) {
+            return false;
+        }
+        if (!getOptions().equals(that.getOptions())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getOptions().hashCode();
+        result = 31 * result + getHosts().hashCode();
+
+        MongoCredential credentials = getCredentials();
+        result = 31 * result + (credentials != null ? credentials.hashCode() : 0);
+
+        String database = getDatabase();
+        result = 31 * result + (database != null ? database.hashCode() : 0);
+
+        String collection = getCollection();
+        result = 31 * result + (collection != null ? collection.hashCode() : 0);
+
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return proxied.toString();
+    }
+}
diff --git a/driver/src/main/com/mongodb/MongoCursorAdapter.java b/driver-legacy/src/main/com/mongodb/MongoCursorAdapter.java
similarity index 82%
rename from driver/src/main/com/mongodb/MongoCursorAdapter.java
rename to driver-legacy/src/main/com/mongodb/MongoCursorAdapter.java
index d1d4738e0cb..6d3388d299d 100644
--- a/driver/src/main/com/mongodb/MongoCursorAdapter.java
+++ b/driver-legacy/src/main/com/mongodb/MongoCursorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,17 @@
 class MongoCursorAdapter implements Cursor {
     private final MongoCursor<DBObject> cursor;
 
-    public MongoCursorAdapter(final MongoCursor<DBObject> cursor) {
+    MongoCursorAdapter(final MongoCursor<DBObject> cursor) {
         this.cursor = cursor;
     }
 
     @Override
     public long getCursorId() {
-        return cursor.getServerCursor().getId();
+        ServerCursor serverCursor = cursor.getServerCursor();
+        if (serverCursor == null) {
+            return 0;
+        }
+        return serverCursor.getId();
     }
 
     @Override
diff --git a/driver/src/main/com/mongodb/MongoOptions.java b/driver-legacy/src/main/com/mongodb/MongoOptions.java
similarity index 99%
rename from driver/src/main/com/mongodb/MongoOptions.java
rename to driver-legacy/src/main/com/mongodb/MongoOptions.java
index 023fd60528a..8a1a90104f2 100644
--- a/driver/src/main/com/mongodb/MongoOptions.java
+++ b/driver-legacy/src/main/com/mongodb/MongoOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -171,6 +171,7 @@ public MongoOptions() {
      * @param options the MongoClientOptions to copy values from into the new MongoOptions.
      * @deprecated use {@link com.mongodb.MongoClientOptions}
      */
+    @SuppressWarnings("deprecation")
     @Deprecated
     public MongoOptions(final MongoClientOptions options) {
         connectionsPerHost = options.getConnectionsPerHost();
@@ -245,6 +246,7 @@ public MongoOptions copy() {
         return m;
     }
 
+    @SuppressWarnings("deprecation")
     MongoClientOptions toClientOptions() {
         Builder builder = MongoClientOptions.builder()
                                             .requiredReplicaSetName(requiredReplicaSetName)
@@ -274,6 +276,7 @@ MongoClientOptions toClientOptions() {
      *
      * @return a WriteConcern for the current MongoOptions.
      */
+    @SuppressWarnings("deprecation")
     public WriteConcern getWriteConcern() {
         WriteConcern retVal;
 
diff --git a/driver/src/main/com/mongodb/MongoURI.java b/driver-legacy/src/main/com/mongodb/MongoURI.java
similarity index 83%
rename from driver/src/main/com/mongodb/MongoURI.java
rename to driver-legacy/src/main/com/mongodb/MongoURI.java
index 7e14a229872..3a976772ef3 100644
--- a/driver/src/main/com/mongodb/MongoURI.java
+++ b/driver-legacy/src/main/com/mongodb/MongoURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.List;
 
 
@@ -37,6 +39,7 @@ public class MongoURI {
     public static final String MONGODB_PREFIX = "mongodb://";
     private final MongoClientURI proxied;
 
+    @SuppressWarnings("deprecation")
     private final MongoOptions options;
 
     /**
@@ -46,6 +49,7 @@ public class MongoURI {
      * @mongodb.driver.manual reference/connection-string Connection String URI Format
      * @deprecated Replaced by {@link MongoClientURI#MongoClientURI(String)}
      */
+    @SuppressWarnings("deprecation")
     @Deprecated
     public MongoURI(final String uri) {
         this.proxied = new MongoClientURI(uri, MongoClientOptions.builder()
@@ -60,6 +64,7 @@ public MongoURI(final String uri) {
      *
      * @param proxied the MongoClientURI to wrap with this deprecated class. * @deprecated Replaced by {@link MongoClientURI})
      */
+    @SuppressWarnings("deprecation")
     @Deprecated
     public MongoURI(final MongoClientURI proxied) {
         this.proxied = proxied;
@@ -73,6 +78,7 @@ public MongoURI(final MongoClientURI proxied) {
      *
      * @return the username
      */
+    @Nullable
     public String getUsername() {
         return proxied.getUsername();
     }
@@ -82,6 +88,7 @@ public String getUsername() {
      *
      * @return the password
      */
+    @Nullable
     public char[] getPassword() {
         return proxied.getPassword();
     }
@@ -100,6 +107,7 @@ public List<String> getHosts() {
      *
      * @return the database name
      */
+    @Nullable
     public String getDatabase() {
         return proxied.getDatabase();
     }
@@ -109,6 +117,7 @@ public String getDatabase() {
      *
      * @return the collection name
      */
+    @Nullable
     public String getCollection() {
         return proxied.getCollection();
     }
@@ -119,6 +128,7 @@ public String getCollection() {
      * @since 2.11.0
      * @return the MongoCredential for conneting to MongoDB servers.
      */
+    @Nullable
     public MongoCredential getCredentials() {
         return proxied.getCredentials();
     }
@@ -153,7 +163,7 @@ public Mongo connect() {
      * @throws MongoException if there's a failure
      */
     public DB connectDB() {
-        return connect().getDB(getDatabase());
+        return connect().getDB(getDatabaseNonNull());
     }
 
     /**
@@ -162,8 +172,9 @@ public DB connectDB() {
      * @param mongo the Mongo instance to get the database from.
      * @return the database specified in this URI
      */
+    @SuppressWarnings("deprecation")
     public DB connectDB(final Mongo mongo) {
-        return mongo.getDB(getDatabase());
+        return mongo.getDB(getDatabaseNonNull());
     }
 
     /**
@@ -173,7 +184,7 @@ public DB connectDB(final Mongo mongo) {
      * @return the collection specified in this URI
      */
     public DBCollection connectCollection(final DB db) {
-        return db.getCollection(getCollection());
+        return db.getCollection(getCollectionNonNull());
     }
 
     /**
@@ -182,8 +193,9 @@ public DBCollection connectCollection(final DB db) {
      * @param mongo the mongo instance to get the collection from
      * @return the collection specified in this URI
      */
+    @SuppressWarnings("deprecation")
     public DBCollection connectCollection(final Mongo mongo) {
-        return connectDB(mongo).getCollection(getCollection());
+        return connectDB(mongo).getCollection(getCollectionNonNull());
     }
 
     @Override
@@ -194,4 +206,21 @@ public String toString() {
     MongoClientURI toClientURI() {
         return proxied;
     }
+
+    private String getDatabaseNonNull() {
+        String database = getDatabase();
+        if (database == null) {
+            throw new MongoClientException("Database name can not be null in this context");
+        }
+        return database;
+    }
+
+    private String getCollectionNonNull() {
+        String collection = getCollection();
+        if (collection == null) {
+            throw new MongoClientException("Collection name can not be null in this context");
+        }
+        return collection;
+    }
+
 }
diff --git a/driver/src/main/com/mongodb/ParallelScanOptions.java b/driver-legacy/src/main/com/mongodb/ParallelScanOptions.java
similarity index 95%
rename from driver/src/main/com/mongodb/ParallelScanOptions.java
rename to driver-legacy/src/main/com/mongodb/ParallelScanOptions.java
index 90d9ca044f1..9e78db8c833 100644
--- a/driver/src/main/com/mongodb/ParallelScanOptions.java
+++ b/driver-legacy/src/main/com/mongodb/ParallelScanOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import com.mongodb.annotations.Immutable;
 import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.lang.Nullable;
 
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
@@ -27,7 +28,9 @@
  *
  * @mongodb.driver.manual reference/command/parallelCollectionScan/ Parallel Collection Scan
  * @since 2.12
+ * @deprecated the parallelCollectionScan command will be removed in MongoDB 4.2
  */
+@Deprecated
 @Immutable
 public final class ParallelScanOptions {
     private final int numCursors;
@@ -121,6 +124,7 @@ public int getBatchSize() {
      *
      * @return read preference
      */
+    @Nullable
     public ReadPreference getReadPreference() {
         return readPreference;
     }
diff --git a/driver/src/main/com/mongodb/QueryBuilder.java b/driver-legacy/src/main/com/mongodb/QueryBuilder.java
similarity index 97%
rename from driver/src/main/com/mongodb/QueryBuilder.java
rename to driver-legacy/src/main/com/mongodb/QueryBuilder.java
index e435f1fb991..1a9ed821ec4 100644
--- a/driver/src/main/com/mongodb/QueryBuilder.java
+++ b/driver-legacy/src/main/com/mongodb/QueryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import static com.mongodb.assertions.Assertions.notNull;
 import static java.util.Arrays.asList;
 
 /**
@@ -347,7 +350,8 @@ public QueryBuilder withinBox(final double x, final double y, final double x2, f
      * @return {@code this}
      */
     public QueryBuilder withinPolygon(final List<Double[]> points) {
-        if (points == null || points.isEmpty() || points.size() < 3) {
+        notNull("points", points);
+        if (points.isEmpty() || points.size() < 3) {
             throw new IllegalArgumentException("Polygon insufficient number of vertices defined");
         }
         addOperand(QueryOperators.WITHIN,
@@ -384,7 +388,7 @@ public QueryBuilder text(final String search) {
      * @return {@code this}
      * @mongodb.server.release 2.6
      */
-    public QueryBuilder text(final String search, final String language) {
+    public QueryBuilder text(final String search, @Nullable final String language) {
         if (_currentKey != null) {
             throw new QueryBuilderException("The text operand may only occur at the top-level of a query. It does"
                                             + " not apply to a specific element, but rather to a document as a whole.");
@@ -459,7 +463,7 @@ public DBObject get() {
         return _query;
     }
 
-    private void addOperand(final String op, final Object value) {
+    private void addOperand(@Nullable final String op, final Object value) {
         Object valueToPut = value;
         if (op == null) {
             if (_hasNot) {
diff --git a/driver/src/main/com/mongodb/QueryOperators.java b/driver-legacy/src/main/com/mongodb/QueryOperators.java
similarity index 93%
rename from driver/src/main/com/mongodb/QueryOperators.java
rename to driver-legacy/src/main/com/mongodb/QueryOperators.java
index 24a07c8db51..536f94ab8d6 100644
--- a/driver/src/main/com/mongodb/QueryOperators.java
+++ b/driver-legacy/src/main/com/mongodb/QueryOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,15 +63,35 @@ public class QueryOperators {
     public static final String LANGUAGE = "$language";
 
     // meta query operators (to be implemented in QueryBuilder)
+
+    @Deprecated
     public static final String RETURN_KEY = "$returnKey";
+
+    @Deprecated
     public static final String MAX_SCAN = "$maxScan";
+
+    @Deprecated
     public static final String ORDER_BY = "$orderby";
+
+    @Deprecated
     public static final String EXPLAIN = "$explain";
+
+    @Deprecated
     public static final String SNAPSHOT = "$snapshot";
+
+    @Deprecated
     public static final String MIN = "$min";
+
+    @Deprecated
     public static final String MAX = "$max";
+
+    @Deprecated
     public static final String SHOW_DISK_LOC = "$showDiskLoc";
+
+    @Deprecated
     public static final String HINT = "$hint";
+
+    @Deprecated
     public static final String COMMENT = "$comment";
 
     private QueryOperators() {
diff --git a/driver/src/main/com/mongodb/ReflectionDBObject.java b/driver-legacy/src/main/com/mongodb/ReflectionDBObject.java
similarity index 97%
rename from driver/src/main/com/mongodb/ReflectionDBObject.java
rename to driver-legacy/src/main/com/mongodb/ReflectionDBObject.java
index 1e242407d19..050c0848765 100644
--- a/driver/src/main/com/mongodb/ReflectionDBObject.java
+++ b/driver-legacy/src/main/com/mongodb/ReflectionDBObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
 import org.bson.BSONObject;
 
 import java.lang.reflect.Method;
@@ -32,11 +33,14 @@
 
 /**
  * This class enables to map simple Class fields to a BSON object fields
+ * @deprecated Replaced by {@link org.bson.codecs.pojo.PojoCodecProvider}
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
+@Deprecated
 public abstract class ReflectionDBObject implements DBObject {
 
     @Override
+    @Nullable
     public Object get(final String key) {
         return getWrapper().get(this, key);
     }
@@ -46,7 +50,7 @@ public Set<String> keySet() {
         return getWrapper().keySet();
     }
 
-    @Deprecated
+    @SuppressWarnings("deprecation")
     @Override
     public boolean containsKey(final String key) {
         return containsField(key);
@@ -220,6 +224,7 @@ public boolean containsKey(final String key) {
          * @param fieldName the name of the field to get the value for
          * @return the value for the given field name
          */
+        @Nullable
         public Object get(final ReflectionDBObject document, final String fieldName) {
             FieldInfo i = fields.get(fieldName);
             if (i == null) {
@@ -252,6 +257,7 @@ public Object set(final ReflectionDBObject document, final String fieldName, fin
             }
         }
 
+        @Nullable
         Class<? extends DBObject> getInternalClass(final List<String> path) {
             String cur = path.get(0);
 
@@ -303,6 +309,7 @@ boolean ok() {
      * @param c the class to be wrapped
      * @return the wrapper
      */
+    @Nullable
     public static JavaWrapper getWrapperIfReflectionObject(final Class c) {
         if (ReflectionDBObject.class.isAssignableFrom(c)) {
             return getWrapper(c);
diff --git a/driver-legacy/src/main/com/mongodb/RemoveRequest.java b/driver-legacy/src/main/com/mongodb/RemoveRequest.java
new file mode 100644
index 00000000000..20d55032619
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/RemoveRequest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.client.model.Collation;
+import org.bson.BsonDocumentWrapper;
+import org.bson.codecs.Encoder;
+
+class RemoveRequest extends WriteRequest {
+    private final DBObject query;
+    private final boolean multi;
+    private final Encoder<DBObject> codec;
+    private final Collation collation;
+
+    RemoveRequest(final DBObject query, final boolean multi, final Encoder<DBObject> codec, final Collation collation) {
+        this.query = query;
+        this.multi = multi;
+        this.codec = codec;
+        this.collation = collation;
+    }
+
+    public DBObject getQuery() {
+        return query;
+    }
+
+    public boolean isMulti() {
+        return multi;
+    }
+
+    @Override
+    com.mongodb.bulk.WriteRequest toNew(final DBCollection dbCollection) {
+        return new DeleteRequest(new BsonDocumentWrapper<DBObject>(query, this.codec)).multi(isMulti()).collation(collation);
+    }
+}
diff --git a/driver/src/main/com/mongodb/ReplaceRequest.java b/driver-legacy/src/main/com/mongodb/ReplaceRequest.java
similarity index 75%
rename from driver/src/main/com/mongodb/ReplaceRequest.java
rename to driver-legacy/src/main/com/mongodb/ReplaceRequest.java
index 6ac46e99e64..2e7e83505d2 100644
--- a/driver/src/main/com/mongodb/ReplaceRequest.java
+++ b/driver-legacy/src/main/com/mongodb/ReplaceRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb;
 
+import com.mongodb.client.model.Collation;
 import org.bson.BsonDocumentWrapper;
 import org.bson.codecs.Encoder;
 
@@ -25,14 +26,16 @@ class ReplaceRequest extends WriteRequest {
     private final boolean upsert;
     private final Encoder<DBObject> codec;
     private final Encoder<DBObject> replacementCodec;
+    private final Collation collation;
 
-    public ReplaceRequest(final DBObject query, final DBObject document, final boolean upsert, final Encoder<DBObject> codec,
-                          final Encoder<DBObject> replacementCodec) {
+    ReplaceRequest(final DBObject query, final DBObject document, final boolean upsert, final Encoder<DBObject> codec,
+                          final Encoder<DBObject> replacementCodec, final Collation collation) {
         this.query = query;
         this.document = document;
         this.upsert = upsert;
         this.codec = codec;
         this.replacementCodec = replacementCodec;
+        this.collation = collation;
     }
 
     public DBObject getQuery() {
@@ -47,11 +50,16 @@ public boolean isUpsert() {
         return upsert;
     }
 
+    public Collation getCollation() {
+        return collation;
+    }
+
     @Override
-    com.mongodb.bulk.WriteRequest toNew() {
+    com.mongodb.bulk.WriteRequest toNew(final DBCollection dbCollection) {
         return new com.mongodb.bulk.UpdateRequest(new BsonDocumentWrapper<DBObject>(query, codec),
                                                        new BsonDocumentWrapper<DBObject>(document, replacementCodec),
                                                        com.mongodb.bulk.WriteRequest.Type.REPLACE)
-               .upsert(isUpsert());
+               .upsert(isUpsert())
+               .collation(getCollation());
     }
 }
diff --git a/driver/src/main/com/mongodb/ReplicaSetStatus.java b/driver-legacy/src/main/com/mongodb/ReplicaSetStatus.java
similarity index 88%
rename from driver/src/main/com/mongodb/ReplicaSetStatus.java
rename to driver-legacy/src/main/com/mongodb/ReplicaSetStatus.java
index 91691c31534..5f817a2a82d 100644
--- a/driver/src/main/com/mongodb/ReplicaSetStatus.java
+++ b/driver-legacy/src/main/com/mongodb/ReplicaSetStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,17 @@
 import com.mongodb.connection.Cluster;
 import com.mongodb.connection.ClusterDescription;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.event.ClusterListener;
+import com.mongodb.lang.Nullable;
 
 import java.util.List;
 
 /**
  * Keeps replica set status.
+ *
+ * @deprecated Prefer {@link MongoClientOptions.Builder#addClusterListener(ClusterListener)}
  */
+@Deprecated
 public class ReplicaSetStatus {
 
     private final Cluster cluster;
@@ -40,6 +45,7 @@ public class ReplicaSetStatus {
      * @return the name of the replica set.
      */
     @SuppressWarnings("deprecation")
+    @Nullable
     public String getName() {
         List<ServerDescription> any = getClusterDescription().getAnyPrimaryOrSecondary();
         return any.isEmpty() ? null : any.get(0).getSetName();
@@ -52,6 +58,7 @@ public String getName() {
      * @throws MongoException if there's a failure
      */
     @SuppressWarnings("deprecation")
+    @Nullable
     public ServerAddress getMaster() {
         List<ServerDescription> primaries = getClusterDescription().getPrimaries();
         return primaries.isEmpty() ? null : primaries.get(0).getAddress();
@@ -64,7 +71,8 @@ public ServerAddress getMaster() {
      * @return true if the given ServerAddress is the current Master/Primary
      */
     public boolean isMaster(final ServerAddress serverAddress) {
-        return getMaster().equals(serverAddress);
+        ServerAddress masterServerAddress = getMaster();
+        return masterServerAddress != null && masterServerAddress.equals(serverAddress);
     }
 
     /**
diff --git a/driver/src/main/com/mongodb/UnacknowledgedBulkWriteResult.java b/driver-legacy/src/main/com/mongodb/UnacknowledgedBulkWriteResult.java
similarity index 97%
rename from driver/src/main/com/mongodb/UnacknowledgedBulkWriteResult.java
rename to driver-legacy/src/main/com/mongodb/UnacknowledgedBulkWriteResult.java
index 1a083b10a15..d63b1bfdef6 100644
--- a/driver/src/main/com/mongodb/UnacknowledgedBulkWriteResult.java
+++ b/driver-legacy/src/main/com/mongodb/UnacknowledgedBulkWriteResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ public int getRemovedCount() {
     }
 
     @Override
+    @Deprecated
     public boolean isModifiedCountAvailable() {
         throw getUnacknowledgedWriteException();
     }
diff --git a/driver-legacy/src/main/com/mongodb/UpdateRequest.java b/driver-legacy/src/main/com/mongodb/UpdateRequest.java
new file mode 100644
index 00000000000..138f62daee1
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/UpdateRequest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.model.Collation;
+import org.bson.BsonDocumentWrapper;
+import org.bson.codecs.Encoder;
+
+import java.util.List;
+
+class UpdateRequest extends WriteRequest {
+    private final DBObject query;
+    private final DBObject update;
+    private final boolean multi;
+    private final boolean upsert;
+    private final Encoder<DBObject> codec;
+    private final Collation collation;
+    private final List<? extends DBObject> arrayFilters;
+
+    UpdateRequest(final DBObject query, final DBObject update, final boolean multi, final boolean upsert,
+                  final Encoder<DBObject> codec, final Collation collation, final List<? extends DBObject> arrayFilters) {
+        this.query = query;
+        this.update = update;
+        this.multi = multi;
+        this.upsert = upsert;
+        this.codec = codec;
+        this.collation = collation;
+        this.arrayFilters = arrayFilters;
+    }
+
+    public DBObject getQuery() {
+        return query;
+    }
+
+    public DBObject getUpdate() {
+        return update;
+    }
+
+    public boolean isUpsert() {
+        return upsert;
+    }
+
+    public boolean isMulti() {
+        return multi;
+    }
+
+    public Collation getCollation() {
+        return collation;
+    }
+
+    public List<? extends DBObject> getArrayFilters() {
+        return arrayFilters;
+    }
+
+    @Override
+    com.mongodb.bulk.WriteRequest toNew(final DBCollection dbCollection) {
+        return new com.mongodb.bulk.UpdateRequest(new BsonDocumentWrapper<DBObject>(query, codec),
+                                                       new BsonDocumentWrapper<DBObject>(update, codec),
+                                                       com.mongodb.bulk.WriteRequest.Type.UPDATE)
+               .upsert(isUpsert())
+               .multi(isMulti())
+               .collation(getCollation())
+               .arrayFilters(dbCollection.wrapAllowNull(arrayFilters, codec));
+    }
+}
diff --git a/driver/src/main/com/mongodb/WriteConcernError.java b/driver-legacy/src/main/com/mongodb/WriteConcernError.java
similarity index 98%
rename from driver/src/main/com/mongodb/WriteConcernError.java
rename to driver-legacy/src/main/com/mongodb/WriteConcernError.java
index a193a84c18c..c5d96d8a10b 100644
--- a/driver/src/main/com/mongodb/WriteConcernError.java
+++ b/driver-legacy/src/main/com/mongodb/WriteConcernError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/WriteRequest.java b/driver-legacy/src/main/com/mongodb/WriteRequest.java
similarity index 84%
rename from driver/src/main/com/mongodb/WriteRequest.java
rename to driver-legacy/src/main/com/mongodb/WriteRequest.java
index fcdb66a1f9b..eec85733504 100644
--- a/driver/src/main/com/mongodb/WriteRequest.java
+++ b/driver-legacy/src/main/com/mongodb/WriteRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,5 +17,5 @@
 package com.mongodb;
 
 abstract class WriteRequest {
-    abstract com.mongodb.bulk.WriteRequest toNew();
+    abstract com.mongodb.bulk.WriteRequest toNew(DBCollection dbCollection);
 }
diff --git a/driver/src/main/com/mongodb/WriteResult.java b/driver-legacy/src/main/com/mongodb/WriteResult.java
similarity index 85%
rename from driver/src/main/com/mongodb/WriteResult.java
rename to driver-legacy/src/main/com/mongodb/WriteResult.java
index fe64033f08d..e7fd9df0ce8 100644
--- a/driver/src/main/com/mongodb/WriteResult.java
+++ b/driver-legacy/src/main/com/mongodb/WriteResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,11 @@
 package com.mongodb;
 
 
+import com.mongodb.lang.Nullable;
+
 /**
  * This class lets you access the results of the previous acknowledged write. If the write was unacknowledged, all property access
- * methods will throw {@link java.lang.UnsupportedOperationException}.
+ * methods will throw {@link UnsupportedOperationException}.
  *
  * @see WriteConcern#UNACKNOWLEDGED
  */
@@ -45,9 +47,9 @@ public static WriteResult unacknowledged() {
      *
      * @param n the number of existing documents affected by this operation
      * @param updateOfExisting true if the operation was an update and an existing document was updated
-     * @param upsertedId the _id of a document that was upserted by this operation
+     * @param upsertedId the _id of a document that was upserted by this operation, which may be null
      */
-    public WriteResult(final int n, final boolean updateOfExisting, final Object upsertedId) {
+    public WriteResult(final int n, final boolean updateOfExisting, @Nullable final Object upsertedId) {
         this.acknowledged = true;
         this.n = n;
         this.updateOfExisting = updateOfExisting;
@@ -65,7 +67,7 @@ public WriteResult(final int n, final boolean updateOfExisting, final Object ups
      * Returns true if the write was acknowledged.
      *
      * @return true if the write was acknowledged
-     * @see com.mongodb.WriteConcern#UNACKNOWLEDGED
+     * @see WriteConcern#UNACKNOWLEDGED
      * @since 3.0
      */
     public boolean wasAcknowledged() {
@@ -76,7 +78,7 @@ public boolean wasAcknowledged() {
      * Gets the "n" field, which contains the number of documents affected in the write operation.
      *
      * @return the value of the "n" field
-     * @throws java.lang.UnsupportedOperationException if the write was unacknowledged
+     * @throws UnsupportedOperationException if the write was unacknowledged
      * @see WriteConcern#UNACKNOWLEDGED
      */
     public int getN() {
@@ -88,10 +90,11 @@ public int getN() {
      * Gets the _id value of an upserted document that resulted from this write.  Note that for MongoDB servers prior to version 2.6,
      * this method will return null unless the _id of the upserted document was of type ObjectId.
      *
-     * @return the value of the _id of an upserted document
-     * @throws java.lang.UnsupportedOperationException if the write was unacknowledged
+     * @return the value of the _id of an upserted document, which may be null
+     * @throws UnsupportedOperationException if the write was unacknowledged
      * @since 2.12
      */
+    @Nullable
     public Object getUpsertedId() {
         throwIfUnacknowledged("upsertedId");
         return upsertedId;
@@ -102,7 +105,7 @@ public Object getUpsertedId() {
      * Returns true if this write resulted in an update of an existing document.
      *
      * @return whether the write resulted in an update of an existing document.
-     * @throws java.lang.UnsupportedOperationException if the write was unacknowledged
+     * @throws UnsupportedOperationException if the write was unacknowledged
      * @since 2.12
      */
     public boolean isUpdateOfExisting() {
@@ -114,7 +117,7 @@ public boolean isUpdateOfExisting() {
     public String toString() {
         if (acknowledged) {
             return "WriteResult{"
-                   + ", n=" + n
+                   + "n=" + n
                    + ", updateOfExisting=" + updateOfExisting
                    + ", upsertedId=" + upsertedId
                    + '}';
diff --git a/driver-legacy/src/main/com/mongodb/client/jndi/MongoClientFactory.java b/driver-legacy/src/main/com/mongodb/client/jndi/MongoClientFactory.java
new file mode 100644
index 00000000000..93419e5b763
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/jndi/MongoClientFactory.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.jndi;
+
+import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
+import com.mongodb.MongoException;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+import javax.naming.spi.ObjectFactory;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import static java.lang.String.format;
+
+/**
+ * An ObjectFactory for MongoClient instances.
+ *
+ * @since 3.3
+ */
+public class MongoClientFactory implements ObjectFactory {
+
+    private static final Logger LOGGER = Loggers.getLogger("client.jndi");
+
+    private static final String CONNECTION_STRING = "connectionString";
+
+    /**
+     * This implementation will create instances of {@link MongoClient} based on a connection string conforming to the format specified in
+     * {@link MongoClientURI}.
+     * <p>The connection string is specified in one of two ways:</p>
+     * <ul>
+     * <li>As the {@code String} value of a property in the {@code environment} parameter with a key of {@code "connectionString"}</li>
+     * <li>As the {@code String} value of a {@link RefAddr} with type {@code "connectionString"} in an {@code obj} parameter
+     * of type {@link Reference}</li>
+     * </ul>
+     *
+     * Specification of the connection string in the {@code environment} parameter takes precedence over specification in the {@code obj}
+     * parameter.  The {@code name} and {@code nameCtx} parameters are ignored.
+     *
+     * If a non-empty connection string is not specified in either of these two ways, a {@link MongoException} is thrown.
+     * @return an instance of {@link MongoClient} based on the specified connection string
+     * @throws MongoException
+     *
+     * Note: Not all options that can be specified via {@link com.mongodb.MongoClientOptions} can be specified via the connection string.
+     */
+    @Override
+    public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> environment)
+            throws Exception {
+
+        // Some app servers, e.g. Wildfly, use the environment to pass location information to an ObjectFactory
+        String connectionString = null;
+
+        if (environment.get(CONNECTION_STRING) instanceof String) {
+            connectionString = (String) environment.get(CONNECTION_STRING);
+        }
+
+        if (connectionString == null || connectionString.isEmpty()) {
+            LOGGER.debug(format("No '%s' property in environment.  Casting 'obj' to java.naming.Reference to look for a "
+                                        + "javax.naming.RefAddr with type equal to '%s'", CONNECTION_STRING, CONNECTION_STRING));
+
+            // Some app servers, e.g. Tomcat, pass obj as an instance of javax.naming.Reference and pass location information in a
+            // javax.naming.RefAddr
+            if (obj instanceof Reference) {
+                Enumeration<RefAddr> props = ((Reference) obj).getAll();
+
+                while (props.hasMoreElements()) {
+                    RefAddr addr = props.nextElement();
+                    if (addr != null) {
+                        if (CONNECTION_STRING.equals(addr.getType())) {
+                            if (addr.getContent() instanceof String) {
+                                connectionString = (String) addr.getContent();
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (connectionString == null || connectionString.isEmpty()) {
+            throw new MongoException(format("Could not locate '%s' in either environment or obj", CONNECTION_STRING));
+        }
+
+        MongoClientURI uri = new MongoClientURI(connectionString);
+
+        return new MongoClient(uri);
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/client/jndi/package-info.java b/driver-legacy/src/main/com/mongodb/client/jndi/package-info.java
new file mode 100644
index 00000000000..02358c8003b
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/jndi/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains a JNDI ObjectFactory implementation.
+ *
+ * @since 3.4
+ */
+package com.mongodb.client.jndi;
diff --git a/driver-legacy/src/main/com/mongodb/client/model/DBCollectionCountOptions.java b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionCountOptions.java
new file mode 100644
index 00000000000..660d0013c96
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionCountOptions.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.DBObject;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.lang.Nullable;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The options for a count operation.
+ *
+ * @since 3.4
+ * @mongodb.driver.manual reference/command/count/ Count
+ */
+public class DBCollectionCountOptions {
+    private DBObject hint;
+    private String hintString;
+    private int limit;
+    private int skip;
+    private long maxTimeMS;
+    private ReadPreference readPreference;
+    private ReadConcern readConcern;
+    private Collation collation;
+
+    /**
+     * Construct a new instance
+     */
+    public DBCollectionCountOptions() {
+    }
+
+    /**
+     * Gets the hint to apply.
+     *
+     * @return the hint, which should describe an existing
+     */
+    @Nullable
+    public DBObject getHint() {
+        return hint;
+    }
+
+    /**
+     * Gets the hint string to apply.
+     *
+     * @return the hint string, which should be the name of an existing index
+     */
+    @Nullable
+    public String getHintString() {
+        return hintString;
+    }
+
+    /**
+     * Sets the hint to apply.
+     *
+     * @param hint a document describing the index which should be used for this operation.
+     * @return this
+     */
+    public DBCollectionCountOptions hint(@Nullable final DBObject hint) {
+        this.hint = hint;
+        return this;
+    }
+
+    /**
+     * Sets the hint to apply.
+     *
+     * @param hint the name of the index which should be used for the operation
+     * @return this
+     */
+    public DBCollectionCountOptions hintString(@Nullable final String hint) {
+        this.hintString = hint;
+        return this;
+    }
+
+    /**
+     * Gets the limit to apply.  The default is 0, which means there is no limit.
+     *
+     * @return the limit
+     * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
+     */
+    public int getLimit() {
+        return limit;
+    }
+
+    /**
+     * Sets the limit to apply.
+     *
+     * @param limit the limit
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
+     */
+    public DBCollectionCountOptions limit(final int limit) {
+        this.limit = limit;
+        return this;
+    }
+
+    /**
+     * Gets the number of documents to skip.  The default is 0.
+     *
+     * @return the number of documents to skip
+     * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
+     */
+    public int getSkip() {
+        return skip;
+    }
+
+    /**
+     * Sets the number of documents to skip.
+     *
+     * @param skip the number of documents to skip
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
+     */
+    public DBCollectionCountOptions skip(final int skip) {
+        this.skip = skip;
+        return this;
+    }
+
+    /**
+     * Sets the limit to apply.
+     *
+     * @param limit the limit
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
+     */
+    public DBCollectionCountOptions limit(final long limit) {
+        isTrue("limit is too large", limit <= Integer.MAX_VALUE);
+        this.limit = (int) limit;
+        return this;
+    }
+
+    /**
+     * Sets the number of documents to skip.
+     *
+     * @param skip the number of documents to skip
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
+     */
+    public DBCollectionCountOptions skip(final long skip) {
+        isTrue("skip is too large", skip <= Integer.MAX_VALUE);
+        this.skip = (int) skip;
+        return this;
+    }
+
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     */
+    public DBCollectionCountOptions maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    /**
+     * Returns the readPreference
+     *
+     * @return the readPreference
+     */
+    @Nullable
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    /**
+     * Sets the readPreference
+     *
+     * @param readPreference the readPreference
+     * @return this
+     */
+    public DBCollectionCountOptions readPreference(@Nullable final ReadPreference readPreference) {
+        this.readPreference = readPreference;
+        return this;
+    }
+
+    /**
+     * Returns the readConcern
+     *
+     * @return the readConcern
+     * @mongodb.server.release 3.2
+     */
+    @Nullable
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    /**
+     * Sets the readConcern
+     *
+     * @param readConcern the readConcern
+     * @return this
+     * @mongodb.server.release 3.2
+     */
+    public DBCollectionCountOptions readConcern(@Nullable final ReadConcern readConcern) {
+        this.readConcern = readConcern;
+        return this;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public DBCollectionCountOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+}
+
diff --git a/driver-legacy/src/main/com/mongodb/client/model/DBCollectionDistinctOptions.java b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionDistinctOptions.java
new file mode 100644
index 00000000000..42e43221500
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionDistinctOptions.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.DBObject;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.lang.Nullable;
+
+/**
+ * The options for a distinct operation.
+ *
+ * @since 3.4
+ * @mongodb.driver.manual reference/command/count/ Count
+ */
+public class DBCollectionDistinctOptions {
+    private DBObject filter;
+    private ReadPreference readPreference;
+    private ReadConcern readConcern;
+    private Collation collation;
+
+    /**
+     * Construct a new instance
+     */
+    public DBCollectionDistinctOptions() {
+    }
+
+    /**
+     * Gets the selection query to determine the subset of documents from which to retrieve the distinct values
+     *
+     * @return the query
+     */
+    @Nullable
+    public DBObject getFilter() {
+        return filter;
+    }
+
+    /**
+     * Sets the selection query to determine the subset of documents from which to retrieve the distinct values.
+     *
+     * @param filter the selection query to determine the subset of documents from which to retrieve the distinct values
+     * @return this
+     */
+    public DBCollectionDistinctOptions filter(@Nullable final DBObject filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    /**
+     * Returns the readPreference
+     *
+     * @return the readPreference
+     */
+    @Nullable
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    /**
+     * Sets the readPreference
+     *
+     * @param readPreference the readPreference
+     * @return this
+     */
+    public DBCollectionDistinctOptions readPreference(@Nullable final ReadPreference readPreference) {
+        this.readPreference = readPreference;
+        return this;
+    }
+
+    /**
+     * Returns the readConcern
+     *
+     * @return the readConcern
+     * @mongodb.server.release 3.2
+     */
+    @Nullable
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    /**
+     * Sets the readConcern
+     *
+     * @param readConcern the readConcern
+     * @return this
+     * @mongodb.server.release 3.2
+     */
+    public DBCollectionDistinctOptions readConcern(@Nullable final ReadConcern readConcern) {
+        this.readConcern = readConcern;
+        return this;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public DBCollectionDistinctOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+}
+
diff --git a/driver-legacy/src/main/com/mongodb/client/model/DBCollectionFindAndModifyOptions.java b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionFindAndModifyOptions.java
new file mode 100644
index 00000000000..81909ddaa8e
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionFindAndModifyOptions.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.DBObject;
+import com.mongodb.WriteConcern;
+import com.mongodb.lang.Nullable;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The oprtions for find and modify operations.
+ *
+ * @since 3.4
+ */
+public final class DBCollectionFindAndModifyOptions {
+    private DBObject projection;
+    private DBObject sort;
+    private boolean remove;
+    private DBObject update;
+    private boolean upsert;
+    private boolean returnNew;
+    private Boolean bypassDocumentValidation;
+    private long maxTimeMS;
+    private WriteConcern writeConcern;
+    private Collation collation;
+    private List<? extends DBObject> arrayFilters;
+
+    /**
+     * Construct a new instance
+     */
+    public DBCollectionFindAndModifyOptions() {
+    }
+
+    /**
+     * Returns the projection
+     *
+     * @return the projection
+     */
+    @Nullable
+    public DBObject getProjection() {
+        return projection;
+    }
+
+    /**
+     * Sets the projection
+     *
+     * @param projection the projection
+     * @return this
+     */
+    public DBCollectionFindAndModifyOptions projection(@Nullable final DBObject projection) {
+        this.projection = projection;
+        return this;
+    }
+
+    /**
+     * Returns the sort
+     *
+     * @return the sort
+     */
+    @Nullable
+    public DBObject getSort() {
+        return sort;
+    }
+
+    /**
+     * Sets the sort
+     *
+     * @param sort the sort
+     * @return this
+     */
+    public DBCollectionFindAndModifyOptions sort(@Nullable final DBObject sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    /**
+     * Returns the remove
+     *
+     * @return the remove
+     */
+    public boolean isRemove() {
+        return remove;
+    }
+
+    /**
+     * Sets the remove
+     *
+     * @param remove the remove
+     * @return this
+     */
+    public DBCollectionFindAndModifyOptions remove(final boolean remove) {
+        this.remove = remove;
+        return this;
+    }
+
+    /**
+     * Returns the update
+     *
+     * @return the update
+     */
+    @Nullable
+    public DBObject getUpdate() {
+        return update;
+    }
+
+    /**
+     * Sets the update
+     *
+     * @param update the update
+     * @return this
+     */
+    public DBCollectionFindAndModifyOptions update(@Nullable final DBObject update) {
+        this.update = update;
+        return this;
+    }
+
+    /**
+     * Returns the upsert
+     *
+     * @return the upsert
+     */
+    public boolean isUpsert() {
+        return upsert;
+    }
+
+    /**
+     * Sets the upsert
+     *
+     * @param upsert the upsert
+     * @return this
+     */
+    public DBCollectionFindAndModifyOptions upsert(final boolean upsert) {
+        this.upsert = upsert;
+        return this;
+    }
+
+    /**
+     * Returns the returnNew
+     *
+     * @return the returnNew
+     */
+    public boolean returnNew() {
+        return returnNew;
+    }
+
+    /**
+     * Sets the returnNew
+     *
+     * @param returnNew the returnNew
+     * @return this
+     */
+    public DBCollectionFindAndModifyOptions returnNew(final boolean returnNew) {
+        this.returnNew = returnNew;
+        return this;
+    }
+
+    /**
+     * Returns the bypassDocumentValidation
+     *
+     * @return the bypassDocumentValidation
+     */
+    public Boolean getBypassDocumentValidation() {
+        return bypassDocumentValidation;
+    }
+
+    /**
+     * Sets the bypassDocumentValidation
+     *
+     * @param bypassDocumentValidation the bypassDocumentValidation
+     * @return this
+     */
+    public DBCollectionFindAndModifyOptions bypassDocumentValidation(final Boolean bypassDocumentValidation) {
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        return this;
+    }
+
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public DBCollectionFindAndModifyOptions maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        isTrueArgument("maxTime > = 0", maxTime >= 0);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    /**
+     * Returns the writeConcern
+     *
+     * @return the writeConcern
+     * @mongodb.server.release 3.2
+     */
+    @Nullable
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Sets the writeConcern
+     *
+     * @param writeConcern the writeConcern
+     * @return this
+     * @mongodb.server.release 3.2
+     */
+    public DBCollectionFindAndModifyOptions writeConcern(@Nullable final WriteConcern writeConcern) {
+        this.writeConcern = writeConcern;
+        return this;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public DBCollectionFindAndModifyOptions collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Sets the array filters option
+     *
+     * @param arrayFilters the array filters, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public DBCollectionFindAndModifyOptions arrayFilters(final List<? extends DBObject> arrayFilters) {
+        this.arrayFilters = arrayFilters;
+        return this;
+    }
+
+    /**
+     * Returns the array filters option
+     *
+     * @return the array filters, which may be null
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public List<? extends DBObject> getArrayFilters() {
+        return arrayFilters;
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/client/model/DBCollectionFindOptions.java b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionFindOptions.java
new file mode 100644
index 00000000000..ccaf7e93e3f
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionFindOptions.java
@@ -0,0 +1,591 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.CursorType;
+import com.mongodb.DBObject;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.lang.Nullable;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.isTrueArgument;
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * The options to apply to a find operation (also commonly referred to as a query).
+ *
+ * @since 3.4
+ * @mongodb.driver.manual tutorial/query-documents/ Find
+ * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query OP_QUERY
+ */
+public final class DBCollectionFindOptions {
+    private int batchSize;
+    private int limit;
+    private DBObject modifiers = new BasicDBObject();
+    private DBObject projection;
+    private long maxTimeMS;
+    private long maxAwaitTimeMS;
+    private int skip;
+    private DBObject sort;
+    private CursorType cursorType = CursorType.NonTailable;
+    private boolean noCursorTimeout;
+    private boolean oplogReplay;
+    private boolean partial;
+    private ReadPreference readPreference;
+    private ReadConcern readConcern;
+    private Collation collation;
+    private String comment;
+    private DBObject hint;
+    private DBObject max;
+    private DBObject min;
+    private boolean returnKey;
+    private boolean showRecordId;
+
+    /**
+     * Construct a new instance
+     */
+    public DBCollectionFindOptions() {
+    }
+
+    /**
+     * Copy this DBCollectionFindOptions instance into a new instance.
+     *
+     * @return the new DBCollectionFindOptions with the same settings as this instance.
+     */
+    public DBCollectionFindOptions copy() {
+        DBCollectionFindOptions copiedOptions = new DBCollectionFindOptions();
+        copiedOptions.batchSize(batchSize);
+        copiedOptions.limit(limit);
+        copiedOptions.modifiers(modifiers);
+        copiedOptions.projection(projection);
+        copiedOptions.maxTime(maxTimeMS, TimeUnit.MILLISECONDS);
+        copiedOptions.maxAwaitTime(maxAwaitTimeMS, TimeUnit.MILLISECONDS);
+        copiedOptions.skip(skip);
+        copiedOptions.sort(sort);
+        copiedOptions.cursorType(cursorType);
+        copiedOptions.noCursorTimeout(noCursorTimeout);
+        copiedOptions.oplogReplay(oplogReplay);
+        copiedOptions.partial(partial);
+        copiedOptions.readPreference(readPreference);
+        copiedOptions.readConcern(readConcern);
+        copiedOptions.collation(collation);
+        copiedOptions.comment(comment);
+        copiedOptions.hint(hint);
+        copiedOptions.max(max);
+        copiedOptions.min(min);
+        copiedOptions.returnKey(returnKey);
+        copiedOptions.showRecordId(showRecordId);
+        return copiedOptions;
+    }
+
+    /**
+     * Gets the limit to apply.  The default is null.
+     *
+     * @return the limit
+     * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
+     */
+    public int getLimit() {
+        return limit;
+    }
+
+    /**
+     * Sets the limit to apply.
+     *
+     * @param limit the limit, which may be null
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
+     */
+    public DBCollectionFindOptions limit(final int limit) {
+        this.limit = limit;
+        return this;
+    }
+
+    /**
+     * Gets the number of documents to skip.  The default is 0.
+     *
+     * @return the number of documents to skip, which may be null
+     * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
+     */
+    public int getSkip() {
+        return skip;
+    }
+
+    /**
+     * Sets the number of documents to skip.
+     *
+     * @param skip the number of documents to skip
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
+     */
+    public DBCollectionFindOptions skip(final int skip) {
+        this.skip = skip;
+        return this;
+    }
+
+    /**
+     * Gets the maximum execution time on the server for this operation.  The default is 0, which places no limit on the execution time.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum execution time in the given time unit
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public long getMaxTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public DBCollectionFindOptions maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        isTrueArgument("maxTime > = 0", maxTime >= 0);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    /**
+     * The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor
+     * query. This only applies to a TAILABLE_AWAIT cursor. When the cursor is not a TAILABLE_AWAIT cursor,
+     * this option is ignored.
+     *
+     * On servers &gt;= 3.2, this option will be specified on the getMore command as "maxTimeMS". The default
+     * is no value: no "maxTimeMS" is sent to the server with the getMore command.
+     *
+     * On servers &lt; 3.2, this option is ignored, and indicates that the driver should respect the server's default value
+     *
+     * A zero value will be ignored.
+     *
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum await execution time in the given time unit
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public long getMaxAwaitTime(final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        return timeUnit.convert(maxAwaitTimeMS, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * Sets the maximum await execution time on the server for this operation.
+     *
+     * @param maxAwaitTime  the max await time.  A zero value will be ignored, and indicates that the driver should respect the server's
+     *                      default value
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    public DBCollectionFindOptions maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        isTrueArgument("maxAwaitTime > = 0", maxAwaitTime >= 0);
+        this.maxAwaitTimeMS = TimeUnit.MILLISECONDS.convert(maxAwaitTime, timeUnit);
+        return this;
+    }
+
+    /**
+     * Gets the number of documents to return per batch.  Default to 0, which indicates that the server chooses an appropriate batch
+     * size.
+     *
+     * @return the batch size, which may be null
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    public int getBatchSize() {
+        return batchSize;
+    }
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    public DBCollectionFindOptions batchSize(final int batchSize) {
+        this.batchSize = batchSize;
+        return this;
+    }
+
+    /**
+     * Gets the query modifiers to apply to this operation.  The default is not to apply any modifiers.
+     *
+     * @return the query modifiers, which may be null
+     * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
+     * @deprecated use the individual setters instead
+     */
+    @Deprecated
+    public DBObject getModifiers() {
+        return modifiers;
+    }
+
+    /**
+     * Sets the query modifiers to apply to this operation.
+     *
+     * @param modifiers the query modifiers to apply, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
+     * @deprecated use the individual setters instead
+     */
+    @Deprecated
+    public DBCollectionFindOptions modifiers(@Nullable final DBObject modifiers) {
+        this.modifiers = notNull("modifiers", modifiers);
+        return this;
+    }
+
+    /**
+     * Gets a document describing the fields to return for all matching documents.
+     *
+     * @return the project document, which may be null
+     * @mongodb.driver.manual reference/method/db.collection.find/ Projection
+     */
+    @Nullable
+    public DBObject getProjection() {
+        return projection;
+    }
+
+    /**
+     * Sets a document describing the fields to return for all matching documents.
+     *
+     * @param projection the project document, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/method/db.collection.find/ Projection
+     */
+    public DBCollectionFindOptions projection(@Nullable final DBObject projection) {
+        this.projection = projection;
+        return this;
+    }
+
+    /**
+     * Gets the sort criteria to apply to the query. The default is null, which means that the documents will be returned in an undefined
+     * order.
+     *
+     * @return a document describing the sort criteria
+     * @mongodb.driver.manual reference/method/cursor.sort/ Sort
+     */
+    @Nullable
+    public DBObject getSort() {
+        return sort;
+    }
+
+    /**
+     * Sets the sort criteria to apply to the query.
+     *
+     * @param sort the sort criteria, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.sort/ Sort
+     */
+    public DBCollectionFindOptions sort(@Nullable final DBObject sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    /**
+     * The server normally times out idle cursors after an inactivity period (10 minutes)
+     * to prevent excess memory use.  If true, that timeout is disabled.
+     *
+     * @return true if cursor timeout is disabled
+     */
+    public boolean isNoCursorTimeout() {
+        return noCursorTimeout;
+    }
+
+    /**
+     * The server normally times out idle cursors after an inactivity period (10 minutes)
+     * to prevent excess memory use. Set this option to prevent that.
+     *
+     * @param noCursorTimeout true if cursor timeout is disabled
+     * @return this
+     */
+    public DBCollectionFindOptions noCursorTimeout(final boolean noCursorTimeout) {
+        this.noCursorTimeout = noCursorTimeout;
+        return this;
+    }
+
+    /**
+     * Users should not set this under normal circumstances.
+     *
+     * @return if oplog replay is enabled
+     */
+    public boolean isOplogReplay() {
+        return oplogReplay;
+    }
+
+    /**
+     * Users should not set this under normal circumstances.
+     *
+     * @param oplogReplay if oplog replay is enabled
+     * @return this
+     */
+    public DBCollectionFindOptions oplogReplay(final boolean oplogReplay) {
+        this.oplogReplay = oplogReplay;
+        return this;
+    }
+
+    /**
+     * Get partial results from a sharded cluster if one or more shards are unreachable (instead of throwing an error).
+     *
+     * @return if partial results for sharded clusters is enabled
+     */
+    public boolean isPartial() {
+        return partial;
+    }
+
+    /**
+     * Get partial results from a sharded cluster if one or more shards are unreachable (instead of throwing an error).
+     *
+     * @param partial if partial results for sharded clusters is enabled
+     * @return this
+     */
+    public DBCollectionFindOptions partial(final boolean partial) {
+        this.partial = partial;
+        return this;
+    }
+
+    /**
+     * Get the cursor type.
+     *
+     * @return the cursor type
+     */
+    public CursorType getCursorType() {
+        return cursorType;
+    }
+
+    /**
+     * Sets the cursor type.
+     *
+     * @param cursorType the cursor type
+     * @return this
+     */
+    public DBCollectionFindOptions cursorType(final CursorType cursorType) {
+        this.cursorType = notNull("cursorType", cursorType);
+        return this;
+    }
+
+    /**
+     * Returns the readPreference
+     *
+     * @return the readPreference
+     */
+    @Nullable
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    /**
+     * Sets the readPreference
+     *
+     * @param readPreference the readPreference
+     * @return this
+     */
+    public DBCollectionFindOptions readPreference(@Nullable final ReadPreference readPreference) {
+        this.readPreference = readPreference;
+        return this;
+    }
+
+    /**
+     * Returns the readConcern
+     *
+     * @return the readConcern
+     * @mongodb.server.release 3.2
+     */
+    @Nullable
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    /**
+     * Sets the readConcern
+     *
+     * @param readConcern the readConcern
+     * @return this
+     * @mongodb.server.release 3.2
+     */
+    public DBCollectionFindOptions readConcern(@Nullable final ReadConcern readConcern) {
+        this.readConcern = readConcern;
+        return this;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public DBCollectionFindOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Returns the comment to send with the query. The default is not to include a comment with the query.
+     *
+     * @return the comment
+     * @since 3.9
+     */
+    @Nullable
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the comment to the query. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.9
+     */
+    public DBCollectionFindOptions comment(@Nullable final String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    /**
+     * Returns the hint for which index to use. The default is not to set a hint.
+     *
+     * @return the hint
+     * @since 3.9
+     */
+    @Nullable
+    public DBObject getHint() {
+        return hint;
+    }
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.9
+     */
+    public DBCollectionFindOptions hint(@Nullable final DBObject hint) {
+        this.hint = hint;
+        return this;
+    }
+
+    /**
+     * Returns the exclusive upper bound for a specific index. By default there is no max bound.
+     *
+     * @return the max
+     * @since 3.9
+     */
+    @Nullable
+    public DBObject getMax() {
+        return max;
+    }
+
+    /**
+     * Sets the exclusive upper bound for a specific index. A null value means no max is set.
+     *
+     * @param max the max
+     * @return this
+     * @since 3.9
+     */
+    public DBCollectionFindOptions max(@Nullable final DBObject max) {
+        this.max = max;
+        return this;
+    }
+
+    /**
+     * Returns the minimum inclusive lower bound for a specific index. By default there is no min bound.
+     *
+     * @return the min
+     * @since 3.9
+     */
+    @Nullable
+    public DBObject getMin() {
+        return min;
+    }
+
+    /**
+     * Sets the minimum inclusive lower bound for a specific index. A null value means no max is set.
+     *
+     * @param min the min
+     * @return this
+     * @since 3.9
+     */
+    public DBCollectionFindOptions min(@Nullable final DBObject min) {
+        this.min = min;
+        return this;
+    }
+
+    /**
+     * Returns the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * Default value is false. If returnKey is true and the find command does not use an index, the returned documents will be empty.
+     *
+     * @return the returnKey
+     * @since 3.9
+     */
+    public boolean isReturnKey() {
+        return returnKey;
+    }
+
+    /**
+     * Sets the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * @param returnKey the returnKey
+     * @return this
+     * @since 3.9
+     */
+    public DBCollectionFindOptions returnKey(final boolean returnKey) {
+        this.returnKey = returnKey;
+        return this;
+    }
+
+    /**
+     * Returns the showRecordId.
+     *
+     * Determines whether to return the record identifier for each document. If true, adds a field $recordId to the returned documents.
+     * The default is false.
+     *
+     * @return the showRecordId
+     * @since 3.9
+     */
+    public boolean isShowRecordId() {
+        return showRecordId;
+    }
+
+    /**
+     * Sets the showRecordId. Set to true to add a field {@code $recordId} to the returned documents.
+     *
+     * @param showRecordId the showRecordId
+     * @return this
+     * @since 3.9
+     */
+    public DBCollectionFindOptions showRecordId(final boolean showRecordId) {
+        this.showRecordId = showRecordId;
+        return this;
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/client/model/DBCollectionRemoveOptions.java b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionRemoveOptions.java
new file mode 100644
index 00000000000..7b31523c647
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionRemoveOptions.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.DBEncoder;
+import com.mongodb.WriteConcern;
+import com.mongodb.lang.Nullable;
+
+/**
+ * The options to apply when removing documents from the DBCollection
+ *
+ * @since 3.4
+ * @mongodb.driver.manual tutorial/remove-documents/ Remove Documents
+ */
+public final class DBCollectionRemoveOptions {
+    private Collation collation;
+    private WriteConcern writeConcern;
+    private DBEncoder encoder;
+
+    /**
+     * Construct a new instance
+     */
+    public DBCollectionRemoveOptions() {
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public DBCollectionRemoveOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * The write concern to use for the insertion.  By default the write concern configured for the DBCollection instance will be used.
+     *
+     * @return the write concern, or null if the default will be used.
+     */
+    @Nullable
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Sets the write concern
+     *
+     * @param writeConcern the write concern
+     * @return this
+     */
+    public DBCollectionRemoveOptions writeConcern(@Nullable final WriteConcern writeConcern) {
+        this.writeConcern = writeConcern;
+        return this;
+    }
+
+    /**
+     * Returns the encoder
+     *
+     * @return the encoder
+     */
+    @Nullable
+    public DBEncoder getEncoder() {
+        return encoder;
+    }
+
+    /**
+     * Sets the encoder
+     *
+     * @param encoder the encoder
+     * @return this
+     */
+    public DBCollectionRemoveOptions encoder(@Nullable final DBEncoder encoder) {
+        this.encoder = encoder;
+        return this;
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/client/model/DBCollectionUpdateOptions.java b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionUpdateOptions.java
new file mode 100644
index 00000000000..5d0f4ebf789
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/model/DBCollectionUpdateOptions.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+import com.mongodb.DBEncoder;
+import com.mongodb.DBObject;
+import com.mongodb.WriteConcern;
+import com.mongodb.lang.Nullable;
+
+import java.util.List;
+
+/**
+ * The options to apply when updating documents in the DBCollection
+ *
+ * @since 3.4
+ * @mongodb.driver.manual tutorial/modify-documents/ Updates
+ * @mongodb.driver.manual reference/operator/update/ Update Operators
+ * @mongodb.driver.manual reference/command/update/ Update Command
+ */
+public class DBCollectionUpdateOptions {
+    private boolean upsert;
+    private Boolean bypassDocumentValidation;
+    private boolean multi;
+    private Collation collation;
+    private List<? extends DBObject> arrayFilters;
+    private WriteConcern writeConcern;
+    private DBEncoder encoder;
+
+    /**
+     * Construct a new instance
+     */
+    public DBCollectionUpdateOptions() {
+    }
+
+    /**
+     * Returns true if a new document should be inserted if there are no matches to the query filter.  The default is false.
+     *
+     * @return true if a new document should be inserted if there are no matches to the query filter
+     */
+    public boolean isUpsert() {
+        return upsert;
+    }
+
+    /**
+     * Set to true if a new document should be inserted if there are no matches to the query filter.
+     *
+     * @param isUpsert true if a new document should be inserted if there are no matches to the query filter
+     * @return this
+     */
+    public DBCollectionUpdateOptions upsert(final boolean isUpsert) {
+        this.upsert = isUpsert;
+        return this;
+    }
+
+    /**
+     * Gets the the bypass document level validation flag
+     *
+     * @return the bypass document level validation flag
+     * @mongodb.server.release 3.2
+     */
+    @Nullable
+    public Boolean getBypassDocumentValidation() {
+        return bypassDocumentValidation;
+    }
+
+    /**
+     * Sets the bypass document level validation flag.
+     *
+     * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
+     * @return this
+     * @mongodb.server.release 3.2
+     */
+    public DBCollectionUpdateOptions bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        return this;
+    }
+
+    /**
+     * Sets whether all documents matching the query filter will be removed.
+     *
+     * @param multi true if all documents matching the query filter will be removed
+     * @return this
+     */
+    public DBCollectionUpdateOptions multi(final boolean multi) {
+        this.multi = multi;
+        return this;
+    }
+
+    /**
+     * Gets whether all documents matching the query filter will be removed.  The default is true.
+     *
+     * @return whether all documents matching the query filter will be removed
+     */
+    public boolean isMulti() {
+        return multi;
+    }
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     * @mongodb.server.release 3.4
+     */
+    @Nullable
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     * @mongodb.server.release 3.4
+     */
+    public DBCollectionUpdateOptions collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    /**
+     * Sets the array filters option
+     *
+     * @param arrayFilters the array filters, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    public DBCollectionUpdateOptions arrayFilters(@Nullable final List<? extends DBObject> arrayFilters) {
+        this.arrayFilters = arrayFilters;
+        return this;
+    }
+
+    /**
+     * Returns the array filters option
+     *
+     * @return the array filters, which may be null
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    public List<? extends DBObject> getArrayFilters() {
+        return arrayFilters;
+    }
+
+    /**
+     * The write concern to use for the insertion.  By default the write concern configured for the DBCollection instance will be used.
+     *
+     * @return the write concern, or null if the default will be used.
+     */
+    @Nullable
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    /**
+     * Sets the write concern
+     *
+     * @param writeConcern the write concern
+     * @return this
+     */
+    public DBCollectionUpdateOptions writeConcern(@Nullable final WriteConcern writeConcern) {
+        this.writeConcern = writeConcern;
+        return this;
+    }
+
+    /**
+     * Returns the encoder
+     *
+     * @return the encoder
+     */
+    @Nullable
+    public DBEncoder getEncoder() {
+        return encoder;
+    }
+
+    /**
+     * Sets the encoder
+     *
+     * @param encoder the encoder
+     * @return this
+     */
+    public DBCollectionUpdateOptions encoder(@Nullable final DBEncoder encoder) {
+        this.encoder = encoder;
+        return this;
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/client/model/DBCreateViewOptions.java b/driver-legacy/src/main/com/mongodb/client/model/DBCreateViewOptions.java
new file mode 100644
index 00000000000..e9b6c2f9752
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/client/model/DBCreateViewOptions.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model;
+
+/**
+ * The options to apply when creating a view
+ *
+ * @since 3.4
+ * @mongodb.server.release 3.4
+ * @mongodb.driver.manual reference/command/create Create Command
+ */
+public class DBCreateViewOptions {
+    private Collation collation;
+
+    /**
+     * Returns the collation options
+     *
+     * @return the collation options
+     */
+    public Collation getCollation() {
+        return collation;
+    }
+
+    /**
+     * Sets the collation
+     *
+     * @param collation the collation
+     * @return this
+     */
+    public DBCreateViewOptions collation(final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+}
diff --git a/driver/src/main/com/mongodb/gridfs/CLI.java b/driver-legacy/src/main/com/mongodb/gridfs/CLI.java
similarity index 95%
rename from driver/src/main/com/mongodb/gridfs/CLI.java
rename to driver-legacy/src/main/com/mongodb/gridfs/CLI.java
index 8a245321490..de51b81e0a1 100644
--- a/driver/src/main/com/mongodb/gridfs/CLI.java
+++ b/driver-legacy/src/main/com/mongodb/gridfs/CLI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
-import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
 import com.mongodb.util.Util;
 
@@ -29,12 +28,16 @@
 
 /**
  * A simple CLI for GridFS.
+ *
+ * @deprecated there is no replacement for this class
  */
+@SuppressWarnings("deprecation")
+@Deprecated
 public class CLI {
 
     private static String host = "127.0.0.1";
     private static String db = "test";
-    private static Mongo mongo = null;
+    private static com.mongodb.Mongo mongo = null;
     private static GridFS gridFS;
 
     /**
@@ -51,7 +54,7 @@ private static void printUsage() {
     }
     // CHECKSTYLE:ON
 
-    private static Mongo getMongo() throws Exception {
+    private static com.mongodb.Mongo getMongo() throws Exception {
         if (mongo == null) {
             mongo = new MongoClient(host);
         }
diff --git a/driver/src/main/com/mongodb/gridfs/GridFS.java b/driver-legacy/src/main/com/mongodb/gridfs/GridFS.java
similarity index 99%
rename from driver/src/main/com/mongodb/gridfs/GridFS.java
rename to driver-legacy/src/main/com/mongodb/gridfs/GridFS.java
index c609dc41975..36b0aa279fc 100644
--- a/driver/src/main/com/mongodb/gridfs/GridFS.java
+++ b/driver-legacy/src/main/com/mongodb/gridfs/GridFS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/gridfs/GridFSDBFile.java b/driver-legacy/src/main/com/mongodb/gridfs/GridFSDBFile.java
similarity index 99%
rename from driver/src/main/com/mongodb/gridfs/GridFSDBFile.java
rename to driver-legacy/src/main/com/mongodb/gridfs/GridFSDBFile.java
index 7642a148fdd..134199fe1f8 100644
--- a/driver/src/main/com/mongodb/gridfs/GridFSDBFile.java
+++ b/driver-legacy/src/main/com/mongodb/gridfs/GridFSDBFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/gridfs/GridFSFile.java b/driver-legacy/src/main/com/mongodb/gridfs/GridFSFile.java
similarity index 96%
rename from driver/src/main/com/mongodb/gridfs/GridFSFile.java
rename to driver-legacy/src/main/com/mongodb/gridfs/GridFSFile.java
index 0241afab904..73af5677cec 100644
--- a/driver/src/main/com/mongodb/gridfs/GridFSFile.java
+++ b/driver-legacy/src/main/com/mongodb/gridfs/GridFSFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.mongodb.MongoException;
-import com.mongodb.util.JSON;
 import org.bson.BSONObject;
 
 import java.util.Collections;
@@ -74,7 +73,9 @@ public void save() {
      * Verifies that the MD5 matches between the database and the local file. This should be called after transferring a file.
      *
      * @throws MongoException if there's a failure
+     * @deprecated there is no replacement for this method
      */
+    @Deprecated
     public void validate() {
         if (fs == null) {
             throw new MongoException("no fs");
@@ -196,7 +197,9 @@ public void setMetaData(final DBObject metadata) {
      * Gets the observed MD5 during transfer
      *
      * @return md5
+     * @deprecated there is no replacement for this method
      */
+    @Deprecated
     public String getMD5() {
         return md5;
     }
@@ -277,8 +280,9 @@ public void markAsPartialObject() {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public String toString() {
-        return JSON.serialize(this);
+        return com.mongodb.util.JSON.serialize(this);
     }
 
     /**
diff --git a/driver/src/main/com/mongodb/gridfs/GridFSInputFile.java b/driver-legacy/src/main/com/mongodb/gridfs/GridFSInputFile.java
similarity index 99%
rename from driver/src/main/com/mongodb/gridfs/GridFSInputFile.java
rename to driver-legacy/src/main/com/mongodb/gridfs/GridFSInputFile.java
index e7e39cc46c0..f515ec6a86a 100644
--- a/driver/src/main/com/mongodb/gridfs/GridFSInputFile.java
+++ b/driver-legacy/src/main/com/mongodb/gridfs/GridFSInputFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/main/com/mongodb/gridfs/package-info.java b/driver-legacy/src/main/com/mongodb/gridfs/package-info.java
new file mode 100644
index 00000000000..ba6238f27e3
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/gridfs/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Contains the classes for supporting MongoDB's specification for storing very large files, GridFS.
+ * @mongodb.driver.manual core/gridfs/ GridFS
+ */
+package com.mongodb.gridfs;
diff --git a/driver/src/main/com/mongodb/util/AbstractObjectSerializer.java b/driver-legacy/src/main/com/mongodb/util/AbstractObjectSerializer.java
similarity index 95%
rename from driver/src/main/com/mongodb/util/AbstractObjectSerializer.java
rename to driver-legacy/src/main/com/mongodb/util/AbstractObjectSerializer.java
index b524e0e5989..604302930c0 100644
--- a/driver/src/main/com/mongodb/util/AbstractObjectSerializer.java
+++ b/driver-legacy/src/main/com/mongodb/util/AbstractObjectSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/util/ClassMapBasedObjectSerializer.java b/driver-legacy/src/main/com/mongodb/util/ClassMapBasedObjectSerializer.java
similarity index 88%
rename from driver/src/main/com/mongodb/util/ClassMapBasedObjectSerializer.java
rename to driver-legacy/src/main/com/mongodb/util/ClassMapBasedObjectSerializer.java
index 63f20a6ac21..9dd45eac054 100644
--- a/driver/src/main/com/mongodb/util/ClassMapBasedObjectSerializer.java
+++ b/driver-legacy/src/main/com/mongodb/util/ClassMapBasedObjectSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package com.mongodb.util;
 
-import com.mongodb.Bytes;
-import org.bson.util.ClassMap;
-
 import java.util.List;
 
 /**
@@ -28,6 +25,7 @@
  *
  * @author breinero
  */
+@SuppressWarnings("deprecation")
 class ClassMapBasedObjectSerializer extends AbstractObjectSerializer {
 
     /**
@@ -52,7 +50,7 @@ void addObjectSerializer(final Class c, final ObjectSerializer serializer) {
     public void serialize(final Object obj, final StringBuilder buf) {
         Object objectToSerialize = obj;
 
-        objectToSerialize = Bytes.applyEncodingHooks(objectToSerialize);
+        objectToSerialize = com.mongodb.Bytes.applyEncodingHooks(objectToSerialize);
 
         if (objectToSerialize == null) {
             buf.append(" null ");
@@ -62,7 +60,7 @@ public void serialize(final Object obj, final StringBuilder buf) {
         ObjectSerializer serializer = null;
 
         List<Class<?>> ancestors;
-        ancestors = ClassMap.getAncestry(objectToSerialize.getClass());
+        ancestors = org.bson.util.ClassMap.getAncestry(objectToSerialize.getClass());
 
         for (final Class<?> ancestor : ancestors) {
             serializer = _serializers.get(ancestor);
@@ -82,5 +80,5 @@ public void serialize(final Object obj, final StringBuilder buf) {
         serializer.serialize(objectToSerialize, buf);
     }
 
-    private final ClassMap<ObjectSerializer> _serializers = new ClassMap<ObjectSerializer>();
+    private final org.bson.util.ClassMap<ObjectSerializer> _serializers = new org.bson.util.ClassMap<ObjectSerializer>();
 }
diff --git a/driver/src/main/com/mongodb/util/JSON.java b/driver-legacy/src/main/com/mongodb/util/JSON.java
similarity index 97%
rename from driver/src/main/com/mongodb/util/JSON.java
rename to driver-legacy/src/main/com/mongodb/util/JSON.java
index e9541be2903..e209117e855 100644
--- a/driver/src/main/com/mongodb/util/JSON.java
+++ b/driver-legacy/src/main/com/mongodb/util/JSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,22 @@
  * limitations under the License.
  */
 
-// JSON.java
-
 package com.mongodb.util;
 
 import org.bson.BSONCallback;
 
 /**
  * Helper methods for JSON serialization and de-serialization
+ *
+ * @see org.bson.json.JsonReader
+ * @see org.bson.json.JsonWriter
+ * @see com.mongodb.BasicDBObject#toJson()
+ * @see com.mongodb.BasicDBObject#parse(String)
+ *
+ * @deprecated This class has been superseded by to toJson and parse methods on BasicDBObject
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class JSON {
 
     /**
@@ -129,17 +136,12 @@ class JSONParser {
     int pos = 0;
     final BSONCallback _callback;
 
-    /**
-     * Create a new parser.
-     */
-    public JSONParser(final String s) {
+    JSONParser(final String s) {
         this(s, null);
     }
 
-    /**
-     * Create a new parser.
-     */
-    public JSONParser(final String s, final BSONCallback callback) {
+    @SuppressWarnings("deprecation")
+    JSONParser(final String s, final BSONCallback callback) {
         this.s = s;
         _callback = (callback == null) ? new JSONCallback() : callback;
     }
diff --git a/driver/src/main/com/mongodb/util/JSONCallback.java b/driver-legacy/src/main/com/mongodb/util/JSONCallback.java
similarity index 86%
rename from driver/src/main/com/mongodb/util/JSONCallback.java
rename to driver-legacy/src/main/com/mongodb/util/JSONCallback.java
index 947449690d4..7e5ceb7805c 100644
--- a/driver/src/main/com/mongodb/util/JSONCallback.java
+++ b/driver-legacy/src/main/com/mongodb/util/JSONCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,19 +22,19 @@
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
-import org.bson.BSON;
 import org.bson.BSONObject;
 import org.bson.BasicBSONCallback;
 import org.bson.BsonUndefined;
+import org.bson.internal.Base64;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
 
-import javax.xml.bind.DatatypeConverter;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -45,7 +45,11 @@
 
 /**
  * Converts JSON to DBObjects and vice versa.
+ *
+ * @deprecated This class has been superseded by to toJson and parse methods on BasicDBObject
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class JSONCallback extends BasicBSONCallback {
 
     @Override
@@ -99,7 +103,7 @@ public Object objectDone() {
             }
         } else if (b.containsField("$regex")) {
             o = Pattern.compile((String) b.get("$regex"),
-                                BSON.regexFlags((String) b.get("$options")));
+                                org.bson.BSON.regexFlags((String) b.get("$options")));
         } else if (b.containsField("$ts")) { //Legacy timestamp format
             Integer ts = ((Number) b.get("$ts")).intValue();
             Integer inc = ((Number) b.get("$inc")).intValue();
@@ -124,19 +128,21 @@ public Object objectDone() {
         } else if (b.containsField("$uuid")) {
             o = UUID.fromString((String) b.get("$uuid"));
         } else if (b.containsField("$binary")) {
-            int type = (Integer) b.get("$type");
-            byte[] bytes = DatatypeConverter.parseBase64Binary((String) b.get("$binary"));
+            int type = (b.get("$type") instanceof String) ? Integer.valueOf((String) b.get("$type"), 16) : (Integer) b.get("$type");
+            byte[] bytes = Base64.decode((String) b.get("$binary"));
             o = new Binary((byte) type, bytes);
         } else if (b.containsField("$undefined") && b.get("$undefined").equals(true)) {
             o = new BsonUndefined();
         } else if (b.containsField("$numberLong")) {
             o = Long.valueOf((String) b.get("$numberLong"));
+        } else if (b.containsField("$numberDecimal")) {
+            o = Decimal128.parse((String) b.get("$numberDecimal"));
         }
 
         if (!isStackEmpty()) {
             _put(name, o);
         } else {
-            o = !BSON.hasDecodeHooks() ? o : BSON.applyDecodingHooks(o);
+            o = !org.bson.BSON.hasDecodeHooks() ? o : org.bson.BSON.applyDecodingHooks(o);
             setRoot(o);
         }
         return o;
diff --git a/driver/src/main/com/mongodb/util/JSONParseException.java b/driver-legacy/src/main/com/mongodb/util/JSONParseException.java
similarity index 95%
rename from driver/src/main/com/mongodb/util/JSONParseException.java
rename to driver-legacy/src/main/com/mongodb/util/JSONParseException.java
index fd8132be855..f7420cc7ffa 100644
--- a/driver/src/main/com/mongodb/util/JSONParseException.java
+++ b/driver-legacy/src/main/com/mongodb/util/JSONParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,9 @@
  * { "x" : 3, "y" : 4, some invalid json.... }
  *                     ^
  * </pre>
+ * @deprecated there is no replacement for this class
  */
+@Deprecated
 public class JSONParseException extends RuntimeException {
 
     private static final long serialVersionUID = -4415279469780082174L;
diff --git a/driver/src/main/com/mongodb/util/JSONSerializers.java b/driver-legacy/src/main/com/mongodb/util/JSONSerializers.java
similarity index 94%
rename from driver/src/main/com/mongodb/util/JSONSerializers.java
rename to driver-legacy/src/main/com/mongodb/util/JSONSerializers.java
index 5ba9952cf5d..1c543cc38a0 100644
--- a/driver/src/main/com/mongodb/util/JSONSerializers.java
+++ b/driver-legacy/src/main/com/mongodb/util/JSONSerializers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,20 @@
 package com.mongodb.util;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.Bytes;
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 import org.bson.BsonUndefined;
+import org.bson.internal.Base64;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
 import org.bson.types.Symbol;
 
-import javax.xml.bind.DatatypeConverter;
 import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -43,7 +43,16 @@
 
 /**
  * Defines static methods for getting {@code ObjectSerializer} instances that produce various flavors of JSON.
+ *
+ * @see org.bson.json.JsonReader
+ * @see org.bson.json.JsonWriter
+ * @see com.mongodb.BasicDBObject#toJson()
+ * @see com.mongodb.BasicDBObject#parse(String)
+ *
+ * @deprecated This class has been superseded by to toJson and parse methods on BasicDBObject
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class JSONSerializers {
 
     private JSONSerializers() {
@@ -108,6 +117,7 @@ static ClassMapBasedObjectSerializer addCommonSerializers() {
         serializer.addObjectSerializer(Symbol.class, new SymbolSerializer(serializer));
         serializer.addObjectSerializer(UUID.class, new UuidSerializer(serializer));
         serializer.addObjectSerializer(BsonUndefined.class, new UndefinedSerializer(serializer));
+        serializer.addObjectSerializer(Decimal128.class, new Decimal128Serializer(serializer));
         return serializer;
     }
 
@@ -380,7 +390,7 @@ public void serialize(final Object obj, final StringBuilder buf) {
             DBObject externalForm = new BasicDBObject();
             externalForm.put("$regex", obj.toString());
             if (((Pattern) obj).flags() != 0) {
-                externalForm.put("$options", Bytes.regexFlags(((Pattern) obj).flags()));
+                externalForm.put("$options", com.mongodb.Bytes.regexFlags(((Pattern) obj).flags()));
             }
             serializer.serialize(externalForm, buf);
         }
@@ -464,7 +474,7 @@ private abstract static class BinarySerializerBase extends CompoundObjectSeriali
 
         protected void serialize(final byte[] bytes, final byte type, final StringBuilder buf) {
             DBObject temp = new BasicDBObject();
-            temp.put("$binary", DatatypeConverter.printBase64Binary(bytes));
+            temp.put("$binary", Base64.encode(bytes));
             temp.put("$type", type);
             serializer.serialize(temp, buf);
         }
@@ -509,4 +519,16 @@ public void serialize(final Object obj, final StringBuilder buf) {
         }
 
     }
+
+    private static class Decimal128Serializer extends CompoundObjectSerializer {
+
+        Decimal128Serializer(final ObjectSerializer serializer) {
+            super(serializer);
+        }
+
+        @Override
+        public void serialize(final Object obj, final StringBuilder buf) {
+            serializer.serialize(new BasicDBObject("$numberDecimal", obj.toString()), buf);
+        }
+    }
 }
diff --git a/driver/src/main/com/mongodb/util/ObjectSerializer.java b/driver-legacy/src/main/com/mongodb/util/ObjectSerializer.java
similarity index 90%
rename from driver/src/main/com/mongodb/util/ObjectSerializer.java
rename to driver-legacy/src/main/com/mongodb/util/ObjectSerializer.java
index 5999f6f5d4e..4bac31db649 100644
--- a/driver/src/main/com/mongodb/util/ObjectSerializer.java
+++ b/driver-legacy/src/main/com/mongodb/util/ObjectSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@
 
 /**
  * Interface describing methods for serializing an object to a string.
+ * @deprecated there is no replacement for this interface
  */
+@Deprecated
 public interface ObjectSerializer {
     /**
      * Serializes {@code obj} into {@code buf}.
diff --git a/driver-legacy/src/main/com/mongodb/util/Util.java b/driver-legacy/src/main/com/mongodb/util/Util.java
new file mode 100644
index 00000000000..38e4567359d
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/util/Util.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.util;
+
+import com.mongodb.internal.HexUtils;
+
+import java.nio.ByteBuffer;
+
+/**
+ * General utilities that are useful throughout the driver.
+ * @deprecated there is no replacement for this class
+ */
+@Deprecated
+public class Util {
+    /**
+     * Converts the given byte buffer to a hexadecimal string using {@link java.lang.Integer#toHexString(int)}.
+     *
+     * @param bytes the bytes to convert to hex
+     * @return a String containing the hex representation of the given bytes.
+     */
+    public static String toHex(final byte[] bytes) {
+        return HexUtils.toHex(bytes);
+    }
+
+    /**
+     * Produce hex representation of the MD5 digest of a byte array.
+     *
+     * @param data bytes to digest
+     * @return hex string of the MD5 digest
+     */
+    public static String hexMD5(final byte[] data) {
+        return HexUtils.hexMD5(data);
+    }
+
+    /**
+     * Produce hex representation of the MD5 digest of a byte array.
+     *
+     * @param buf    byte buffer containing the bytes to digest
+     * @param offset the position to start reading bytes from
+     * @param len    the number of bytes to read from the buffer
+     * @return hex string of the MD5 digest
+     */
+    public static String hexMD5(final ByteBuffer buf, final int offset, final int len) {
+        return HexUtils.hexMD5(buf, offset, len);
+    }
+}
diff --git a/driver-legacy/src/main/com/mongodb/util/package-info.java b/driver-legacy/src/main/com/mongodb/util/package-info.java
new file mode 100644
index 00000000000..ad285543d57
--- /dev/null
+++ b/driver-legacy/src/main/com/mongodb/util/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Contains classes that can be used everywhere in the driver, and have no specific domain.
+ */
+package com.mongodb.util;
diff --git a/driver/src/test/functional/com/mongodb/ClassA.java b/driver-legacy/src/test/functional/com/mongodb/ClassA.java
similarity index 94%
rename from driver/src/test/functional/com/mongodb/ClassA.java
rename to driver-legacy/src/test/functional/com/mongodb/ClassA.java
index b791d7e493b..c22f30ca8ee 100644
--- a/driver/src/test/functional/com/mongodb/ClassA.java
+++ b/driver-legacy/src/test/functional/com/mongodb/ClassA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/functional/com/mongodb/ClassB.java b/driver-legacy/src/test/functional/com/mongodb/ClassB.java
similarity index 94%
rename from driver/src/test/functional/com/mongodb/ClassB.java
rename to driver-legacy/src/test/functional/com/mongodb/ClassB.java
index a255cd044ee..b489ed5e055 100644
--- a/driver/src/test/functional/com/mongodb/ClassB.java
+++ b/driver-legacy/src/test/functional/com/mongodb/ClassB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/test/functional/com/mongodb/ClientSideEncryptionLegacyTest.java b/driver-legacy/src/test/functional/com/mongodb/ClientSideEncryptionLegacyTest.java
new file mode 100644
index 00000000000..c0a6d59561e
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/ClientSideEncryptionLegacyTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.AbstractClientSideEncryptionTest;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.junit.After;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static com.mongodb.ClusterFixture.getConnectionString;
+
+// See https://github.com/mongodb/specifications/tree/master/source/client-side-encryption/tests
+@RunWith(Parameterized.class)
+public class ClientSideEncryptionLegacyTest extends AbstractClientSideEncryptionTest {
+
+    private MongoClient mongoClient;
+
+    public ClientSideEncryptionLegacyTest(final String filename, final String description, final BsonDocument specDocument,
+                                          final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        super(filename, description, specDocument, data, definition, skipTest);
+    }
+
+    @Override
+    protected void createMongoClient(final AutoEncryptionSettings autoEncryptionSettings, final TestCommandListener commandListener) {
+        mongoClient = new MongoClient(new MongoClientURI(getConnectionString().getConnectionString(),
+                MongoClientOptions.builder()
+                        .autoEncryptionSettings(autoEncryptionSettings)
+                        .addCommandListener(commandListener)));
+    }
+
+    @Override
+    protected MongoDatabase getDatabase(final String databaseName) {
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/ConnectivityTest.java b/driver-legacy/src/test/functional/com/mongodb/ConnectivityTest.java
new file mode 100644
index 00000000000..1be0b980082
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/ConnectivityTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import org.bson.Document;
+import org.junit.Test;
+
+public class ConnectivityTest {
+
+    // the test succeeds if no exception is thrown, and fail otherwise
+    @Test
+    public void testConnectivity() {
+        MongoClient client = new MongoClient(Fixture.getMongoClientURI());
+
+        try {
+            // test that a command that doesn't require auth completes normally
+            client.getDatabase("admin").runCommand(new Document("ismaster", 1));
+
+            // test that a command that requires auth completes normally
+            client.getDatabase("test").getCollection("test").estimatedDocumentCount();
+        } finally {
+            client.close();
+        }
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/DBCollectionAggregationTest.java b/driver-legacy/src/test/functional/com/mongodb/DBCollectionAggregationTest.java
similarity index 87%
rename from driver/src/test/functional/com/mongodb/DBCollectionAggregationTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBCollectionAggregationTest.java
index 7d0135bdac5..02246f78c1b 100644
--- a/driver/src/test/functional/com/mongodb/DBCollectionAggregationTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCollectionAggregationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import static com.mongodb.ClusterFixture.clusterIsType;
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint;
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.connection.ClusterType.REPLICA_SET;
@@ -43,6 +44,7 @@
 import static org.junit.Assume.assumeThat;
 import static org.junit.Assume.assumeTrue;
 
+@SuppressWarnings("deprecation")
 public class DBCollectionAggregationTest extends DatabaseTestCase {
 
     @Test
@@ -79,8 +81,6 @@ public void testAggregation() {
 
     @Test
     public void testAggregationCursor() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
-
         List<DBObject> pipeline = prepareData();
 
         verify(pipeline, AggregationOptions.builder()
@@ -103,7 +103,6 @@ public void testAggregationCursor() {
 
     @Test
     public void testInlineAndDollarOut() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         String aggCollection = "aggCollection";
         database.getCollection(aggCollection)
             .drop();
@@ -122,7 +121,6 @@ public void testInlineAndDollarOut() {
 
     @Test
     public void testDollarOut() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         String aggCollection = "aggCollection";
         database.getCollection(aggCollection)
             .drop();
@@ -140,7 +138,6 @@ public void testDollarOut() {
 
     @Test
     public void testDollarOutOnSecondary() throws UnknownHostException, InterruptedException {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         assumeTrue(clusterIsType(REPLICA_SET));
 
         List<DBObject> pipeline = new ArrayList<DBObject>(prepareData());
@@ -148,10 +145,10 @@ public void testDollarOutOnSecondary() throws UnknownHostException, InterruptedE
         AggregationOptions options = AggregationOptions.builder()
             .outputMode(AggregationOptions.OutputMode.CURSOR)
             .build();
-        Cursor cursor = verify(pipeline, options, ReadPreference.secondary(), collection);
+        ServerAddress serverAddress = verify(pipeline, options, ReadPreference.secondary(), collection);
         assertEquals(2, database.getCollection("aggCollection")
             .count());
-        assertEquals(Fixture.getPrimary(), cursor.getServerAddress());
+        assertEquals(Fixture.getPrimary(), serverAddress);
     }
 
     public List<DBObject> prepareData() {
@@ -172,7 +169,6 @@ public List<DBObject> prepareData() {
 
     @Test
     public void testOldAggregationWithOut() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         collection.drop();
         List<DBObject> pipeline = new ArrayList<DBObject>(prepareData());
         pipeline.add(new BasicDBObject("$out", "aggCollection"));
@@ -186,7 +182,6 @@ public void testOldAggregationWithOut() {
 
     @Test
     public void testOldAggregationWithOutOnSecondary() throws UnknownHostException, InterruptedException {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         collection.drop();
         List<DBObject> pipeline = new ArrayList<DBObject>(prepareData());
         pipeline.add(new BasicDBObject("$out", "aggCollection"));
@@ -200,7 +195,6 @@ public void testOldAggregationWithOutOnSecondary() throws UnknownHostException,
 
     @Test
     public void testExplain() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         List<DBObject> pipeline = new ArrayList<DBObject>(prepareData());
         pipeline.add(new BasicDBObject("$out", "aggCollection"));
         CommandResult out = collection.explainAggregate(pipeline, AggregationOptions.builder()
@@ -220,7 +214,6 @@ public void testNullOptions() {
     @Test
     public void testMaxTime() {
         assumeThat(isSharded(), is(false));
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         enableMaxTimeFailPoint();
         DBCollection collection = database.getCollection("testMaxTime");
         try {
@@ -233,6 +226,20 @@ public void testMaxTime() {
         }
     }
 
+    @Test
+    public void testWriteConcern() {
+        assumeThat(isDiscoverableReplicaSet(), is(true));
+        assumeTrue(serverVersionAtLeast(3, 4));
+        DBCollection collection = database.getCollection("testWriteConcern");
+        collection.setWriteConcern(new WriteConcern(5));
+        try {
+            collection.aggregate(asList(new BasicDBObject("$out", "copy")), AggregationOptions.builder().build());
+            fail("Should have thrown");
+        } catch (WriteConcernException e) {
+            assertEquals(100, e.getCode());
+        }
+    }
+
     private void verify(final List<DBObject> pipeline, final AggregationOptions options) {
         verify(pipeline, options, ReadPreference.primary());
     }
@@ -241,14 +248,20 @@ private void verify(final List<DBObject> pipeline, final AggregationOptions opti
         verify(pipeline, options, readPreference, collection);
     }
 
-    private Cursor verify(final List<DBObject> pipeline, final AggregationOptions options, final ReadPreference readPreference,
+    private ServerAddress verify(final List<DBObject> pipeline, final AggregationOptions options, final ReadPreference readPreference,
         final DBCollection collection) {
         Cursor cursor = collection.aggregate(pipeline, options, readPreference);
-
-        Map<String, DBObject> results = new HashMap<String, DBObject>();
-        while (cursor.hasNext()) {
-            DBObject next = cursor.next();
-            results.put((String) next.get("_id"), next);
+        ServerAddress serverAddress = null;
+        Map<String, DBObject> results;
+        try {
+            results = new HashMap<String, DBObject>();
+            while (cursor.hasNext()) {
+                DBObject next = cursor.next();
+                results.put((String) next.get("_id"), next);
+            }
+        } finally {
+            serverAddress = cursor.getServerAddress();
+            cursor.close();
         }
 
 
@@ -262,6 +275,6 @@ private Cursor verify(final List<DBObject> pipeline, final AggregationOptions op
         assertEquals(1, barResult.get("docsPerName"));
         assertEquals(2, barResult.get("countPerName"));
 
-        return cursor;
+        return serverAddress;
     }
 }
diff --git a/driver-legacy/src/test/functional/com/mongodb/DBCollectionFunctionalSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/DBCollectionFunctionalSpecification.groovy
new file mode 100644
index 00000000000..51b7530b4a6
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCollectionFunctionalSpecification.groovy
@@ -0,0 +1,825 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
+import com.mongodb.client.model.DBCollectionCountOptions
+import com.mongodb.client.model.DBCollectionFindAndModifyOptions
+import com.mongodb.client.model.DBCollectionRemoveOptions
+import com.mongodb.client.model.DBCollectionUpdateOptions
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWrapper
+import spock.lang.IgnoreIf
+import spock.lang.Unroll
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static org.hamcrest.Matchers.contains
+import static org.hamcrest.Matchers.containsInAnyOrder
+import static spock.util.matcher.HamcrestSupport.that
+
+@SuppressWarnings('DuplicateMapLiteral')
+class DBCollectionFunctionalSpecification extends FunctionalSpecification {
+    private idOfExistingDocument
+
+    def setupSpec() {
+        Map.metaClass.bitwiseNegate = { new BasicDBObject(delegate) }
+    }
+
+    def setup() {
+        def existingDocument = ~['a': ~[:],
+                                 'b': ~[:]]
+        collection.insert(existingDocument);
+        idOfExistingDocument = existingDocument.get('_id')
+        collection.setObjectClass(BasicDBObject)
+    }
+
+    def 'should update a document'() {
+        when:
+        collection.update(new BasicDBObject('_id', 1), new BasicDBObject('$set', new BasicDBObject('x', 1)), true, false)
+
+        then:
+        collection.findOne(new BasicDBObject('_id', 1)) == new BasicDBObject('_id', 1).append('x', 1)
+
+        when:
+        collection.update(new BasicDBObject('_id', 2), new BasicDBObject('$set', new BasicDBObject('x', 1)));
+
+        then:
+        collection.findOne(new BasicDBObject('_id', 2)) == null
+    }
+
+    def 'should update multiple documents'() {
+        given:
+        collection.insert([new BasicDBObject('x', 1), new BasicDBObject('x', 1)])
+
+        when:
+        collection.update(new BasicDBObject('x', 1), new BasicDBObject('$set', new BasicDBObject('x', 2)), false, true);
+
+        then:
+        collection.count(new BasicDBObject('x', 2)) == 2
+    }
+
+    def 'should replace a document'() {
+        when:
+        collection.update(new BasicDBObject('_id', 1), new BasicDBObject('_id', 1).append('x', 1), true, false)
+
+        then:
+        collection.findOne(new BasicDBObject('_id', 1)) == new BasicDBObject('_id', 1).append('x', 1)
+
+        when:
+        collection.update(new BasicDBObject('_id', 2), new BasicDBObject('_id', 2).append('x', 1))
+
+        then:
+        collection.findOne(new BasicDBObject('_id', 2)) == null
+    }
+
+    def 'should drop collection that exists'() {
+        given:
+        collection.insert(~['name': 'myName']);
+
+        when:
+        collection.drop();
+
+        then:
+        !(this.collectionName in database.getCollectionNames())
+    }
+
+    def 'should not error when dropping a collection that does not exist'() {
+        given:
+        !(this.collectionName in database.getCollectionNames())
+
+        when:
+        collection.drop();
+
+        then:
+        notThrown(MongoException)
+    }
+
+    def 'should use top-level class for findAndModify'() {
+        given:
+        collection.setObjectClass(ClassA)
+
+        when:
+        DBObject document = collection.findAndModify(null, ~['_id': idOfExistingDocument, 'c': 1])
+
+        then:
+        document instanceof ClassA
+    }
+
+    def 'should use internal classes for findAndModify'() {
+        given:
+        collection.setInternalClass('a', ClassA);
+        collection.setInternalClass('b', ClassB);
+
+        when:
+        DBObject document = collection.findAndModify(null, ~['_id': idOfExistingDocument, 'c': 1])
+
+        then:
+        document.get('a') instanceof ClassA
+        document.get('b') instanceof ClassB
+    }
+
+    def 'should support index options'() {
+        given:
+        def options = ~[
+                'sparse'            : true,
+                'background'        : true,
+                'expireAfterSeconds': 42
+        ]
+
+        when:
+        collection.createIndex(~['y': 1], options);
+
+        then:
+        collection.getIndexInfo().size() == 2
+
+        DBObject document = collection.getIndexInfo()[1]
+        document.get('expireAfterSeconds') == 42
+        document.get('background') == true
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 0) })
+    def 'should support legacy dropDups when creating a unique index'() {
+        when:
+        collection.drop()
+        collection.insert(~['y': 1])
+        collection.insert(~['y': 1])
+
+        then:
+        collection.count() == 2
+
+        when:
+        collection.createIndex(~['y': 1], ~['unique': true]);
+
+        then:
+        thrown(DuplicateKeyException)
+
+        when:
+        collection.createIndex(~['y': 1], ~['unique': true, 'dropDups': true]);
+
+        then:
+        notThrown(DuplicateKeyException)
+        collection.count() == 1
+    }
+
+    def 'drop index should not fail if collection does not exist'() {
+        given:
+        collection.drop();
+
+        expect:
+        collection.dropIndex('indexOnCollectionThatDoesNotExist');
+    }
+
+    def 'drop index should error if index does not exist'() {
+        given:
+        collection.createIndex(new BasicDBObject('x', 1));
+
+        when:
+        collection.dropIndex('y_1');
+
+        then:
+        def exception = thrown(MongoCommandException)
+        exception.getErrorMessage().contains('index not found')
+    }
+
+    def 'should throw Exception if dropping an index with an incorrect type'() {
+        given:
+        BasicDBObject index = new BasicDBObject('x', 1);
+        collection.createIndex(index);
+
+        when:
+        collection.dropIndex(new BasicDBObject('x', '2d'));
+
+        then:
+        def exception = thrown(MongoCommandException)
+        exception.getErrorMessage().contains('can\'t find index')
+    }
+
+    def 'should drop nested index'() {
+        given:
+        collection.save(new BasicDBObject('x', new BasicDBObject('y', 1)));
+        BasicDBObject index = new BasicDBObject('x.y', 1);
+        collection.createIndex(index);
+        assert collection.indexInfo.size() == 2
+
+        when:
+        collection.dropIndex(index);
+
+        then:
+        collection.indexInfo.size() == 1
+    }
+
+    def 'should drop all indexes except the default index on _id'() {
+        given:
+        collection.createIndex(new BasicDBObject('x', 1));
+        collection.createIndex(new BasicDBObject('x.y', 1));
+        assert collection.indexInfo.size() == 3
+
+        when:
+        collection.dropIndexes();
+
+        then:
+        collection.indexInfo.size() == 1
+    }
+
+    def 'should drop unique index'() {
+        given:
+        BasicDBObject index = new BasicDBObject('x', 1);
+        collection.createIndex(index, new BasicDBObject('unique', true));
+
+        when:
+        collection.dropIndex(index);
+
+        then:
+        collection.indexInfo.size() == 1
+    }
+
+    def 'should use compound index for min query'() {
+        given:
+        collection.createIndex(new BasicDBObject('a', 1).append('_id', 1));
+
+        when:
+        def cursor = collection.find().min(new BasicDBObject('a', 1).append('_id', idOfExistingDocument))
+
+        then:
+        cursor.size() == 1
+    }
+
+    def 'should be able to rename a collection'() {
+        given:
+        assert database.getCollectionNames().contains(collectionName)
+        String newCollectionName = 'someNewName'
+
+        when:
+        collection.rename(newCollectionName);
+
+        then:
+        !database.getCollectionNames().contains(collectionName)
+
+        database.getCollection(newCollectionName) != null
+        database.getCollectionNames().contains(newCollectionName)
+    }
+
+    def 'should be able to rename collection to an existing collection name and replace it when drop is true'() {
+        given:
+        String existingCollectionName = 'anExistingCollection';
+        String originalCollectionName = 'someOriginalCollection';
+
+        DBCollection originalCollection = database.getCollection(originalCollectionName);
+        String keyInOriginalCollection = 'someKey';
+        String valueInOriginalCollection = 'someValue';
+        originalCollection.insert(new BasicDBObject(keyInOriginalCollection, valueInOriginalCollection));
+
+        DBCollection existingCollection = database.getCollection(existingCollectionName);
+        String keyInExistingCollection = 'aDifferentDocument';
+        existingCollection.insert(new BasicDBObject(keyInExistingCollection, 'withADifferentValue'));
+
+        assert database.getCollectionNames().contains(originalCollectionName)
+        assert database.getCollectionNames().contains(existingCollectionName)
+
+        when:
+        originalCollection.rename(existingCollectionName, true);
+
+        then:
+        !database.getCollectionNames().contains(originalCollectionName)
+        database.getCollectionNames().contains(existingCollectionName)
+
+        DBCollection replacedCollection = database.getCollection(existingCollectionName);
+        replacedCollection.findOne().get(keyInExistingCollection) == null
+        replacedCollection.findOne().get(keyInOriginalCollection).toString() == valueInOriginalCollection
+    }
+
+    def 'should return a list of all the values of a given field without duplicates'() {
+        given:
+        collection.drop()
+        (0..99).each { collection.save(~['_id': it, 'x' : it % 10]) }
+        assert collection.count() == 100;
+
+        when:
+        List distinctValuesOfFieldX = collection.distinct('x')
+
+        then:
+        distinctValuesOfFieldX.size() == 10
+        that distinctValuesOfFieldX, contains(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+    }
+
+    def 'should query database for values and return a list of all the distinct values of a given field that match the filter'() {
+        given:
+        collection.drop()
+        (0..99).each { collection.save(~['_id': it, 'x' : it % 10, 'isOddNumber': it % 2]) }
+        assert collection.count() == 100;
+
+        when:
+        List distinctValuesOfFieldX = collection.distinct('x', ~['isOddNumber': 1]);
+
+        then:
+        distinctValuesOfFieldX.size() == 5
+        that distinctValuesOfFieldX, contains(1, 3, 5, 7, 9)
+    }
+
+    def 'should return distinct values of differing types '() {
+        given:
+        collection.drop()
+        def documents = [~['id' : null], ~['id' :'a'], ~['id' : 1],
+                         ~['id' : ~['b': 'c']],  ~['id' : ~['list': [2, 'd', ~['e': 3]]]]]
+
+        collection.insert(documents)
+
+        when:
+        List distinctValues = collection.distinct('id')
+
+        then:
+        distinctValues.size() == 5
+        that distinctValues, containsInAnyOrder(null, 'a', 1, ~['b': 'c'], ~['list': [2, 'd', ~['e': 3]]])
+    }
+
+    @SuppressWarnings('UnnecessaryObjectReferences')
+    def insertDataForGroupTests() {
+        collection.drop();
+        collection.save(~['x': 'a']);
+        collection.save(~['x': 'a']);
+        collection.save(~['x': 'a']);
+        collection.save(~['x': 'b']);
+        collection.save(~['x': 'b']);
+        collection.save(~['x': 'b']);
+        collection.save(~['x': 'b']);
+        collection.save(~['x': 'c']);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should group by the x field and apply the provided count function'() {
+        given:
+        insertDataForGroupTests()
+
+        when:
+        DBObject result = collection.group(~['x': 1],
+                                           null,
+                                           ~['count': 0],
+                                           'function(o , p){ p.count++; }');
+
+        then:
+        result.size() == 3
+        that result, contains(~['x': 'a', 'count': 3.0D], ~['x': 'b', 'count': 4.0D], ~['x': 'c', 'count': 1.0D]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should group by the x field and apply the provided count function using a GroupCommand'() {
+        given:
+        insertDataForGroupTests()
+        GroupCommand command = new GroupCommand(collection,
+                                                ~['x': 1],
+                                                null,
+                                                ~['count': 0],
+                                                'function(o , p){ p.count++; }',
+                                                null);
+
+        when:
+        DBObject result = collection.group(command);
+
+        then:
+        result.size() == 3
+        that result, contains(~['x': 'a', 'count': 3.0D], ~['x': 'b', 'count': 4.0D], ~['x': 'c', 'count': 1.0D]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should group using a key function in a GroupCommand'() {
+        given:
+        insertDataForGroupTests()
+        GroupCommand command = new GroupCommand(collection,
+                'function(doc){ return {x: doc.x} }',
+                null,
+                ~['count': 0],
+                'function(o , p){ p.count++; }',
+                null);
+
+        when:
+        DBObject result = collection.group(command);
+
+        then:
+        result.size() == 3
+        that result, contains(~['x': 'a', 'count': 3.0D], ~['x': 'b', 'count': 4.0D], ~['x': 'c', 'count': 1.0D]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should group and count only those documents that fulfull the given condition'() {
+        given:
+        insertDataForGroupTests()
+
+        when:
+        def result = collection.group(~['x': 1],
+                                      ~['x': 'b'],
+                                      ~['count': 0],
+                                      'function(o , p){ p.count++; }')
+
+        then:
+        result.size() == 1;
+        that result, contains(~['x': 'b', 'count': 4.0D]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should be able to set a value in the results'() {
+        given:
+        insertDataForGroupTests()
+
+        when:
+        def result = collection.group(~['x': 1],
+                                      ~['x': 'c'],
+                                      ~['valueFound': false],
+                                      'function(o, p){ p.valueFound = true; }');
+
+        then:
+        result.size() == 1;
+        that result, contains(~['x': 'c', 'valueFound': true]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should return results set by the function, based on condition supplied without key'() {
+        given:
+        insertDataForGroupTests()
+
+        when:
+        def result = collection.group(null,
+                                      ~['x': 'b'],
+                                      ~['valueFound': 0],
+                                      'function(o, p){ p.valueFound = true; }');
+
+        then:
+        result.size() == 1
+        that result, contains(~['valueFound': true]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'finalize function should replace the whole result document if a document is the return type of finalize function'() {
+        given:
+        insertDataForGroupTests()
+
+        when:
+        def result = collection.group(~['x': 1],
+                                      ~['x': 'b'],
+                                      ~['valueFound': 0],
+                                      'function(o, p){ p.valueFound = true; }',
+                                      'function(o){ return { a:1 } }');
+
+        then:
+        result.size() == 1;
+        that result, contains(~['a': 1.0D]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'finalize function should modify the result document'() {
+        given:
+        insertDataForGroupTests()
+
+        when:
+        def result = collection.group(~['x': 1],
+                                      ~['x': 'b'],
+                                      ~['valueFound': 0],
+                                      'function(o, p){ p.valueFound = true; }',
+                                      'function(o){ o.a = 1 }');
+
+        then:
+        result.size() == 1;
+        that result, contains(~['x': 'b', 'valueFound': true, 'a': 1.0D]);
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should throw an Exception if no initial document provided'() {
+        when:
+        collection.group(~['x': 1],
+                         ~['x': 'b'],
+                         null,
+                         'function(o, p){ p.valueFound = true; }');
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(4, 1) })
+    def 'should throw an Exception if no reduce function provided'() {
+        when:
+        collection.group(~['x': 1],
+                         ~['x': 'b'],
+                         ~['z': 0],
+                         null);
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should return null when findOne finds nothing'() {
+        expect:
+        collection.findOne([field: 'That Does Not Exist']) == null
+    }
+
+    def 'should return null when findOne finds nothing and a projection field is specified'() {
+        given:
+        collection.drop()
+
+        expect:
+        collection.findOne(null, [_id: true] as BasicDBObject) == null
+    }
+
+    @Unroll
+    def 'should return #result when performing findOne with #criteria'() {
+        given:
+        collection.insert([_id: 100, x: 1, y: 2] as BasicDBObject)
+        collection.insert([_id: 123, x: 2, z: 2] as BasicDBObject)
+
+        expect:
+        result == collection.findOne(criteria)
+
+        where:
+        criteria                | result
+        123                     | [_id: 123, x: 2, z: 2]
+        [x: 1] as BasicDBObject | [_id: 100, x: 1, y: 2]
+    }
+
+    @Unroll
+    def 'should return #result when performing findOne with #criteria and projection #projection'() {
+        given:
+        collection.insert([_id: 100, x: 1, y: 2] as BasicDBObject)
+        collection.insert([_id: 123, x: 2, z: 2] as BasicDBObject)
+
+        expect:
+        result == collection.findOne(criteria, projection)
+
+        where:
+        criteria                | projection              | result
+        123                     | [x: 1] as BasicDBObject | [_id: 123, x: 2]
+        [x: 1] as BasicDBObject | [y: 1] as BasicDBObject | [_id: 100, y: 2]
+    }
+
+    @Unroll
+    def 'should sort with #sortBy and filter with #criteria before selecting first result'() {
+        given:
+        collection.drop()
+        collection.insert([_id: 1, x: 100, y: 'abc'] as BasicDBObject)
+        collection.insert([_id: 2, x: 200, y: 'abc'] as BasicDBObject)
+        collection.insert([_id: 3, x: 1, y: 'abc'] as BasicDBObject)
+        collection.insert([_id: 4, x: -100, y: 'xyz'] as BasicDBObject)
+        collection.insert([_id: 5, x: -50, y: 'zzz'] as BasicDBObject)
+        collection.insert([_id: 6, x: 9, y: 'aaa'] as BasicDBObject)
+
+        expect:
+        collection.findOne(criteria, null, sortBy)['_id'] == expectedId;
+
+        where:
+        criteria                                  | sortBy                        | expectedId
+        new BasicDBObject()                       | [x: 1] as BasicDBObject       | 4
+        new BasicDBObject()                       | [x: -1] as BasicDBObject      | 2
+        [x: 1] as BasicDBObject                   | [x: 1, y: 1] as BasicDBObject | 3
+        QueryBuilder.start('x').lessThan(2).get() | [y: -1] as BasicDBObject      | 5
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for rename'() {
+        given:
+        assert database.getCollectionNames().contains(collectionName)
+        collection.setWriteConcern(new WriteConcern(5))
+
+        when:
+        collection.rename('someOtherNewName');
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        collection.setWriteConcern(null)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for drop'() {
+        given:
+        assert database.getCollectionNames().contains(collectionName)
+        collection.setWriteConcern(new WriteConcern(5))
+
+        when:
+        collection.drop()
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        collection.setWriteConcern(null)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for createIndex'() {
+        given:
+        assert database.getCollectionNames().contains(collectionName)
+        collection.setWriteConcern(new WriteConcern(5))
+
+        when:
+        collection.createIndex(new BasicDBObject('somekey', 1))
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        collection.setWriteConcern(null)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for dropIndex'() {
+        given:
+        assert database.getCollectionNames().contains(collectionName)
+        collection.createIndex(new BasicDBObject('somekey', 1))
+        collection.setWriteConcern(new WriteConcern(5))
+
+        when:
+        collection.dropIndex(new BasicDBObject('somekey', 1))
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        collection.setWriteConcern(null)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support creating an index with collation options'() {
+        given:
+        def collation = Collation.builder()
+                .locale('en')
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .normalization(false)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .backwards(true)
+                .build()
+
+        def options = BasicDBObject.parse('''{ collation: { locale: "en", caseLevel: true, caseFirst: "off", strength: 5,
+                    numericOrdering: true, alternate: "shifted",  maxVariable: "space", backwards: true }}''')
+
+        when:
+        collection.drop()
+        collection.createIndex(~['y': 1], new BasicDBObject(options))
+
+        then:
+        collection.getIndexInfo().size() == 2
+
+        when:
+        BsonDocument indexCollation = new BsonDocumentWrapper<DBObject>(collection.getIndexInfo()[1].get('collation'),
+                collection.getDefaultDBObjectCodec())
+        indexCollation.remove('version')
+
+        then:
+        indexCollation == collation.asDocument()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should find with collation'() {
+        given:
+        def document = BasicDBObject.parse('{_id: 1, str: "foo"}')
+        collection.insert(document)
+
+        when:
+        def result = collection.find(BasicDBObject.parse('{str: "FOO"}'))
+
+        then:
+        !result.hasNext()
+
+        when:
+        result = collection.find(BasicDBObject.parse('{str: "FOO"}')).setCollation(caseInsensitive)
+
+        then:
+        result.hasNext()
+        ++result == document
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should aggregate with collation'() {
+        given:
+        def document = BasicDBObject.parse('{_id: 1, str: "foo"}')
+        collection.insert(document)
+
+        when:
+        def result = collection.aggregate([BasicDBObject.parse('{ $match: { str: "FOO"}}')], AggregationOptions.builder().build())
+
+        then:
+        !result.hasNext()
+
+        when:
+        result = collection.aggregate([BasicDBObject.parse('{ $match: { str: "FOO"}}')],
+                AggregationOptions.builder().collation(caseInsensitive).build())
+
+        then:
+        result.hasNext()
+        ++result == document
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should count with collation'() {
+        given:
+        collection.insert(BasicDBObject.parse('{_id: 1, str: "foo"}'))
+
+        when:
+        def result = collection.count(BasicDBObject.parse('{str: "FOO"}'))
+
+        then:
+        result == 0L
+
+        when:
+        result = collection.count(BasicDBObject.parse('{str: "FOO"}'), new DBCollectionCountOptions().collation(caseInsensitive))
+
+        then:
+        result == 1L
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should update with collation'() {
+        given:
+        collection.insert(BasicDBObject.parse('{_id: 1, str: "foo"}'))
+
+        when:
+        def result = collection.update(BasicDBObject.parse('{str: "FOO"}'), BasicDBObject.parse('{str: "bar"}'))
+
+        then:
+        result.getN() == 0
+
+        when:
+        result = collection.update(BasicDBObject.parse('{str: "FOO"}'), BasicDBObject.parse('{str: "bar"}'),
+                new DBCollectionUpdateOptions().collation(caseInsensitive))
+
+        then:
+        result.getN() == 1
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should remove with collation'() {
+        given:
+        collection.insert(BasicDBObject.parse('{_id: 1, str: "foo"}'))
+
+        when:
+        def result = collection.remove(BasicDBObject.parse('{str: "FOO"}'))
+
+        then:
+        result.getN() == 0
+
+        when:
+        result = collection.remove(BasicDBObject.parse('{str: "FOO"}'), new DBCollectionRemoveOptions().collation(caseInsensitive))
+
+        then:
+        result.getN() == 1
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should find and modify with collation'() {
+        given:
+        def document = BasicDBObject.parse('{_id: 1, str: "foo"}')
+        collection.insert(document)
+
+        when:
+        def result = collection.findAndModify(BasicDBObject.parse('{str: "FOO"}'),
+                new DBCollectionFindAndModifyOptions().update(BasicDBObject.parse('{_id: 1, str: "BAR"}')))
+
+        then:
+        result == null
+
+        when:
+        result = collection.findAndModify(BasicDBObject.parse('{str: "FOO"}'),
+                new DBCollectionFindAndModifyOptions().update(BasicDBObject.parse('{_id: 1, str: "BAR"}')).collation(caseInsensitive))
+
+        then:
+        result == document
+    }
+
+    def 'should drop compound index by key'() {
+        given:
+        def indexKeys = new BasicDBObject('x', 1).append('y', -1)
+        collection.createIndex(indexKeys)
+
+        when:
+        collection.dropIndex(indexKeys)
+
+        then:
+        collection.getIndexInfo().size() == 1
+    }
+
+    def caseInsensitive = Collation.builder().locale('en').collationStrength(CollationStrength.SECONDARY).build()
+}
diff --git a/driver/src/test/functional/com/mongodb/DBCollectionOldTest.java b/driver-legacy/src/test/functional/com/mongodb/DBCollectionOldTest.java
similarity index 99%
rename from driver/src/test/functional/com/mongodb/DBCollectionOldTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBCollectionOldTest.java
index 920a870aecc..338372713f6 100644
--- a/driver/src/test/functional/com/mongodb/DBCollectionOldTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCollectionOldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy
new file mode 100644
index 00000000000..a6bbd01cca1
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCollectionSpecification.groovy
@@ -0,0 +1,928 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.bulk.DeleteRequest
+import com.mongodb.bulk.IndexRequest
+import com.mongodb.bulk.InsertRequest
+import com.mongodb.bulk.UpdateRequest
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
+import com.mongodb.client.model.DBCollectionCountOptions
+import com.mongodb.client.model.DBCollectionDistinctOptions
+import com.mongodb.client.model.DBCollectionFindAndModifyOptions
+import com.mongodb.client.model.DBCollectionFindOptions
+import com.mongodb.client.model.DBCollectionRemoveOptions
+import com.mongodb.client.model.DBCollectionUpdateOptions
+import com.mongodb.operation.AggregateOperation
+import com.mongodb.operation.AggregateToCollectionOperation
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.CommandReadOperation
+import com.mongodb.operation.CountOperation
+import com.mongodb.operation.CreateIndexesOperation
+import com.mongodb.operation.DeleteOperation
+import com.mongodb.operation.DistinctOperation
+import com.mongodb.operation.FindAndDeleteOperation
+import com.mongodb.operation.FindAndReplaceOperation
+import com.mongodb.operation.FindAndUpdateOperation
+import com.mongodb.operation.FindOperation
+import com.mongodb.operation.GroupOperation
+import com.mongodb.operation.InsertOperation
+import com.mongodb.operation.MapReduceBatchCursor
+import com.mongodb.operation.MapReduceStatistics
+import com.mongodb.operation.MapReduceToCollectionOperation
+import com.mongodb.operation.MapReduceWithInlineResultsOperation
+import com.mongodb.operation.MixedBulkWriteOperation
+import com.mongodb.operation.ParallelCollectionScanOperation
+import com.mongodb.operation.UpdateOperation
+import org.bson.BsonBinary
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWrapper
+import org.bson.BsonInt32
+import org.bson.BsonJavaScript
+import org.bson.BsonString
+import org.bson.UuidRepresentation
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.BsonValueCodec
+import org.bson.codecs.UuidCodec
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static Fixture.getMongoClient
+import static java.util.Arrays.asList
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
+import static spock.util.matcher.HamcrestSupport.expect
+
+class DBCollectionSpecification extends Specification {
+
+    private static final DEFAULT_DBOBJECT_CODEC_FACTORY = new DBObjectCodec(MongoClient.getDefaultCodecRegistry(),
+            DBObjectCodec.getDefaultBsonTypeClassMap(),
+            new DBCollectionObjectFactory());
+
+    def 'should throw IllegalArgumentException if name is invalid'() {
+        when:
+        new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([])).getCollection('')
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should use MongoClient CodecRegistry'() {
+        given:
+        def mongoClient = Stub(MongoClient) {
+            getCodecRegistry() >> fromCodecs(new UuidCodec(UuidRepresentation.STANDARD))
+            getReadConcern() >> ReadConcern.DEFAULT
+            getWriteConcern() >> WriteConcern.ACKNOWLEDGED
+            getMongoClientOptions() >> MongoClientOptions.builder().build()
+        }
+        def executor = new TestOperationExecutor([WriteConcernResult.unacknowledged()])
+        def db = new DB(mongoClient, 'myDatabase', executor)
+        def collection = db.getCollection('test')
+        def uuid = UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')
+
+        when:
+        collection.insert(new BasicDBObject('_id', uuid))
+        def operation = executor.writeOperation as InsertOperation
+
+        then:
+        operation.insertRequests[0].document.getBinary('_id') == new BsonBinary(uuid, UuidRepresentation.STANDARD)
+    }
+
+    def 'should get and set read concern'() {
+        when:
+        def db = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([]))
+        db.setReadConcern(ReadConcern.MAJORITY)
+        def collection = db.getCollection('test')
+
+        then:
+        collection.readConcern == ReadConcern.MAJORITY
+
+        when:
+        collection.setReadConcern(ReadConcern.LOCAL)
+
+        then:
+        collection.readConcern == ReadConcern.LOCAL
+
+        when:
+        collection.setReadConcern(null)
+
+        then:
+        collection.readConcern == ReadConcern.MAJORITY
+    }
+
+    def 'should use CreateIndexOperation properly'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def keys = new BasicDBObject('a', 1);
+
+        when:
+        collection.createIndex(keys)
+        def request = (executor.getWriteOperation() as CreateIndexesOperation).requests[0]
+
+        then:
+        expect request, isTheSameAs(new IndexRequest(new BsonDocument('a', new BsonInt32(1))))
+
+        when:
+        def storageEngine = '{ wiredTiger: { configString: "block_compressor=zlib" }}'
+        def partialFilterExpression = '{ a: { $gte: 10 } }'
+        def collation = Collation.builder()
+                .locale('en')
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .backwards(true)
+                .build()
+        collection.createIndex(keys, new BasicDBObject(['background': true, 'unique': true, 'sparse': true, 'name': 'aIndex',
+                                                      'expireAfterSeconds': 100, 'v': 1, 'weights': new BasicDBObject(['a': 1000]),
+                                                      'default_language': 'es', 'language_override': 'language', 'textIndexVersion': 1,
+                                                      '2dsphereIndexVersion': 1, 'bits': 1, 'min': new Double(-180.0),
+                                                      'max'          : new Double(180.0), 'bucketSize': new Double(200.0), 'dropDups': true,
+                                                      'storageEngine': BasicDBObject.parse(storageEngine),
+                                                      'partialFilterExpression':  BasicDBObject.parse(partialFilterExpression),
+                                                      'collation': BasicDBObject.parse(collation.asDocument().toJson())]))
+
+        request = (executor.getWriteOperation() as CreateIndexesOperation).requests[0]
+
+        then:
+        expect request, isTheSameAs(new IndexRequest(new BsonDocument('a', new BsonInt32(1)))
+                .background(true)
+                .unique(true)
+                .sparse(true)
+                .name('aIndex')
+                .expireAfter(100, TimeUnit.SECONDS)
+                .version(1)
+                .weights(new BsonDocument('a', new BsonInt32(1000)))
+                .defaultLanguage('es')
+                .languageOverride('language')
+                .textVersion(1)
+                .sphereVersion(1)
+                .bits(1)
+                .min(-180.0)
+                .max(180.0)
+                .bucketSize(200.0)
+                .dropDups(true)
+                .storageEngine(BsonDocument.parse(storageEngine))
+                .partialFilterExpression(BsonDocument.parse(partialFilterExpression))
+                .collation(collation))
+    }
+
+    def 'should support boolean index options that are numbers'() {
+        given:
+        def executor = new TestOperationExecutor([null, null]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def options = new BasicDBObject('sparse', value);
+
+        when:
+        collection.createIndex(new BasicDBObject('y', 1), options);
+
+        then:
+        def operation = executor.getWriteOperation() as CreateIndexesOperation
+        operation.requests[0].sparse == expectedValue
+
+        where:
+        value | expectedValue
+        0     | false
+        0F    | false
+        0D    | false
+        1     | true
+        -1    | true
+        4L    | true
+        4.3F  | true
+        4.0D  | true
+    }
+
+    def 'should support integer index options that are numbers'() {
+        given:
+        def executor = new TestOperationExecutor([null, null]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def options = new BasicDBObject('expireAfterSeconds', integerValue);
+
+        when:
+        collection.createIndex(new BasicDBObject('y', 1), options);
+
+        then:
+        def operation = executor.getWriteOperation() as CreateIndexesOperation
+        operation.requests[0].getExpireAfter(TimeUnit.SECONDS) == integerValue
+
+        where:
+        integerValue << [4, 4L, (double) 4.0]
+    }
+
+    def 'should support double index options that are numbers'() {
+        given:
+        def executor = new TestOperationExecutor([null, null]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def options = new BasicDBObject('max', doubleValue);
+
+        when:
+        collection.createIndex(new BasicDBObject('y', '2d'), options);
+
+        then:
+        def operation = executor.getWriteOperation() as CreateIndexesOperation
+        operation.requests[0].max == doubleValue
+
+        where:
+        doubleValue << [4, 4L, (double) 4.0]
+    }
+
+    def 'should throw IllegalArgumentException for unsupported option value type'() {
+        given:
+        def executor = new TestOperationExecutor([null, null]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def options = new BasicDBObject('sparse', 'true');
+
+
+        when:
+        collection.createIndex(new BasicDBObject('y', '1'), options);
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'getStats should execute the expected command with the collection default read preference'() {
+        given:
+        def executor = new TestOperationExecutor([new BsonDocument('ok', new BsonInt32(1))]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        collection.setReadPreference(ReadPreference.secondary())
+
+        when:
+        collection.getStats()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new CommandReadOperation('myDatabase',
+                                                                                 new BsonDocument('collStats', new BsonString('test')),
+                                                                new BsonDocumentCodec()))
+        executor.getReadPreference() == collection.getReadPreference()
+    }
+
+    def 'find should create the correct FindOperation'() {
+        given:
+        def cursor = Stub(BatchCursor) {
+            hasNext() >> false
+            getServerCursor() >> new ServerCursor(12L, new ServerAddress())
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+
+        when:
+        collection.find().iterator().hasNext()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .filter(new BsonDocument())
+                .modifiers(new BsonDocument())
+                .retryReads(true))
+
+        when: // Inherits from DB
+        db.setReadConcern(ReadConcern.MAJORITY)
+        collection.find().iterator().hasNext()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .filter(new BsonDocument())
+                .modifiers(new BsonDocument())
+                .retryReads(true))
+
+        when:
+        collection.setReadConcern(ReadConcern.LOCAL)
+        collection.find(new BasicDBObject(), new DBCollectionFindOptions().collation(collation)).iterator().hasNext()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .filter(new BsonDocument())
+                .modifiers(new BsonDocument())
+                .collation(collation)
+                .retryReads(true))
+    }
+
+    def 'findOne should create the correct FindOperation'() {
+        given:
+        def dbObject = new BasicDBObject('_id', 1)
+        def cursor = Stub(BatchCursor) {
+            next() >> [dbObject]
+            hasNext() >> true
+            getServerCursor() >> new ServerCursor(12L, new ServerAddress())
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+
+        when:
+        collection.findOne()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .filter(new BsonDocument())
+                .modifiers(new BsonDocument())
+                .limit(-1)
+                .retryReads(true))
+
+        when: // Inherits from DB
+        db.setReadConcern(ReadConcern.MAJORITY)
+        collection.findOne()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .filter(new BsonDocument())
+                .modifiers(new BsonDocument())
+                .limit(-1)
+                .retryReads(true))
+
+        when:
+        collection.setReadConcern(ReadConcern.LOCAL)
+        collection.findOne(new BasicDBObject(), new DBCollectionFindOptions().collation(collation))
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .filter(new BsonDocument())
+                .modifiers(new BsonDocument())
+                .limit(-1)
+                .collation(collation)
+                .retryReads(true))
+    }
+
+    def 'findAndRemove should create the correct FindAndDeleteOperation'() {
+        given:
+        def query = new BasicDBObject()
+        def cannedResult = BasicDBObject.parse('{value: {}}')
+        def executor = new TestOperationExecutor([cannedResult, cannedResult, cannedResult])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def retryWrites = db.getMongoClient().getMongoClientOptions().getRetryWrites()
+        def collection = db.getCollection('test')
+
+        when:
+        collection.findAndRemove(query)
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new FindAndDeleteOperation<DBObject>(collection.getNamespace(),
+                WriteConcern.ACKNOWLEDGED, retryWrites, collection.getObjectCodec()).filter(new BsonDocument()))
+    }
+
+    def 'findAndModify should create the correct FindAndUpdateOperation'() {
+        given:
+        def query = new BasicDBObject()
+        def updateJson = '{$set: {a : 1}}'
+        def update = BasicDBObject.parse(updateJson)
+        def bsonUpdate = BsonDocument.parse(updateJson)
+        def cannedResult = BasicDBObject.parse('{value: {}}')
+        def executor = new TestOperationExecutor([cannedResult, cannedResult, cannedResult])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def retryWrites = db.getMongoClient().getMongoClientOptions().getRetryWrites()
+        def collection = db.getCollection('test')
+
+        when:
+        collection.findAndModify(query, update)
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new FindAndUpdateOperation<DBObject>(collection.getNamespace(),
+                WriteConcern.ACKNOWLEDGED, retryWrites, collection.getObjectCodec(), bsonUpdate)
+                .filter(new BsonDocument()))
+
+        when: // With options
+        collection.findAndModify(query, new DBCollectionFindAndModifyOptions().update(update).collation(collation)
+                .arrayFilters(dbObjectArrayFilters).writeConcern(WriteConcern.W3))
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new FindAndUpdateOperation<DBObject>(collection.getNamespace(), WriteConcern.W3,
+                retryWrites, collection.getObjectCodec(), bsonUpdate)
+                .filter(new BsonDocument())
+                .collation(collation).arrayFilters(bsonDocumentWrapperArrayFilters))
+
+        where:
+        dbObjectArrayFilters <<            [null, [], [new BasicDBObject('i.b', 1)]]
+        bsonDocumentWrapperArrayFilters << [null, [], [new BsonDocumentWrapper<BasicDBObject>(new BasicDBObject('i.b', 1),
+                DEFAULT_DBOBJECT_CODEC_FACTORY)]]
+    }
+
+    def 'findAndModify should create the correct FindAndReplaceOperation'() {
+        given:
+        def query = new BasicDBObject()
+        def replacementJson = '{a : 1}'
+        def replace = BasicDBObject.parse(replacementJson)
+        def bsonReplace = BsonDocument.parse(replacementJson)
+        def cannedResult = BasicDBObject.parse('{value: {}}')
+        def executor = new TestOperationExecutor([cannedResult, cannedResult, cannedResult])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def retryWrites = db.getMongoClient().getMongoClientOptions().getRetryWrites()
+        def collection = db.getCollection('test')
+
+        when:
+        collection.findAndModify(query, replace)
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new FindAndReplaceOperation<DBObject>(collection.getNamespace(),
+                WriteConcern.ACKNOWLEDGED, retryWrites, collection.getObjectCodec(), bsonReplace)
+                .filter(new BsonDocument()))
+
+        when: // With options
+        collection.findAndModify(query, new DBCollectionFindAndModifyOptions().update(replace).collation(collation)
+                .writeConcern(WriteConcern.W3))
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new FindAndReplaceOperation<DBObject>(collection.getNamespace(), WriteConcern.W3,
+                retryWrites, collection.getObjectCodec(), bsonReplace)
+                .filter(new BsonDocument())
+                .collation(collation))
+    }
+
+    def 'count should create the correct CountOperation'() {
+        given:
+        def executor = new TestOperationExecutor([42L, 42L, 42L]);
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+
+        when:
+        collection.count()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
+                .filter(new BsonDocument()).retryReads(true))
+
+        when: // Inherits from DB
+        db.setReadConcern(ReadConcern.MAJORITY)
+        collection.count()
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
+                .filter(new BsonDocument()).retryReads(true))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        when:
+        collection.setReadConcern(ReadConcern.LOCAL)
+        collection.count(new BasicDBObject(), new DBCollectionCountOptions().collation(collation))
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
+                .filter(new BsonDocument()).retryReads(true)
+                .collation(collation))
+        executor.getReadConcern() == ReadConcern.LOCAL
+    }
+
+    def 'distinct should create the correct DistinctOperation'() {
+        given:
+        def cursor = Stub(BatchCursor) {
+            def count = 0
+            next() >> {
+                count++
+                [new BsonInt32(1), new BsonInt32(2)]
+            }
+            hasNext() >> {
+                count == 0
+            }
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor]);
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+
+        when:
+        def distinctFieldValues = collection.distinct('field1')
+
+        then:
+        distinctFieldValues == [1, 2]
+        expect executor.getReadOperation(), isTheSameAs(new DistinctOperation(collection.getNamespace(), 'field1', new BsonValueCodec())
+                                                                .filter(new BsonDocument()).retryReads(true))
+        executor.getReadConcern() == ReadConcern.DEFAULT
+
+        when: // Inherits from DB
+        db.setReadConcern(ReadConcern.MAJORITY)
+        collection.distinct('field1')
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new DistinctOperation(collection.getNamespace(), 'field1', new BsonValueCodec())
+                .filter(new BsonDocument()).retryReads(true))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        when:
+        collection.setReadConcern(ReadConcern.LOCAL)
+        collection.distinct('field1', new DBCollectionDistinctOptions().collation(collation))
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new DistinctOperation(collection.getNamespace(), 'field1', new BsonValueCodec())
+                .collation(collation).retryReads(true))
+        executor.getReadConcern() == ReadConcern.LOCAL
+    }
+
+    def 'group should create the correct GroupOperation'() {
+        given:
+        def cursor = Stub(BatchCursor) {
+            next() >> []
+            hasNext() >> false
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor])
+        def key = BasicDBObject.parse('{name: 1}')
+        def reduce = 'function ( curr, result ) { }'
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+
+        when:
+        collection.group(key, new BasicDBObject(), new BasicDBObject(), reduce)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new GroupOperation<DBObject>(collection.getNamespace(), new BsonJavaScript(reduce),
+                new BsonDocument(), collection.getDefaultDBObjectCodec()).key(BsonDocument.parse('{name: 1}'))
+                .filter(new BsonDocument()).retryReads(true))
+
+        when: // Can set collation
+        def groupCommand = new GroupCommand(collection, key, new BasicDBObject(), new BasicDBObject(), reduce, null, collation)
+        collection.group(groupCommand)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new GroupOperation<DBObject>(collection.getNamespace(), new BsonJavaScript(reduce),
+                new BsonDocument(), collection.getDefaultDBObjectCodec()).key(BsonDocument.parse('{name: 1}')).collation(collation)
+                .filter(new BsonDocument()).retryReads(true)
+        )
+    }
+
+    def 'mapReduce should create the correct MapReduceInlineResultsOperation'() {
+        given:
+        def cursor = Stub(MapReduceBatchCursor) {
+            next() >> { }
+            hasNext() >> false
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+
+        when:
+        collection.mapReduce('map', 'reduce', null, MapReduceCommand.OutputType.INLINE, new BasicDBObject())
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(
+                new MapReduceWithInlineResultsOperation(collection.getNamespace(), new BsonJavaScript('map'), new BsonJavaScript('reduce'),
+                        collection.getDefaultDBObjectCodec())
+                        .verbose(true)
+                        .filter(new BsonDocument()))
+        executor.getReadConcern() == ReadConcern.DEFAULT
+
+        when: // Inherits from DB
+        db.setReadConcern(ReadConcern.LOCAL)
+        collection.mapReduce('map', 'reduce', null, MapReduceCommand.OutputType.INLINE, new BasicDBObject())
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(
+                new MapReduceWithInlineResultsOperation(collection.getNamespace(), new BsonJavaScript('map'), new BsonJavaScript('reduce'),
+                        collection.getDefaultDBObjectCodec())
+                        .verbose(true)
+                        .filter(new BsonDocument()))
+        executor.getReadConcern() == ReadConcern.LOCAL
+
+        when:
+        collection.setReadConcern(ReadConcern.MAJORITY)
+        def mapReduceCommand = new MapReduceCommand(collection, 'map', 'reduce', null, MapReduceCommand.OutputType.INLINE,
+                new BasicDBObject())
+        mapReduceCommand.setCollation(collation)
+        collection.mapReduce(mapReduceCommand)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(
+                new MapReduceWithInlineResultsOperation(collection.getNamespace(), new BsonJavaScript('map'), new BsonJavaScript('reduce'),
+                        collection.getDefaultDBObjectCodec())
+                        .verbose(true)
+                        .filter(new BsonDocument())
+                        .collation(collation))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+    }
+
+    def 'mapReduce should create the correct MapReduceToCollectionOperation'() {
+        given:
+        def stats = Stub(MapReduceStatistics)
+        def executor = new TestOperationExecutor([stats, stats, stats])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+
+        when:
+        collection.mapReduce('map', 'reduce', 'myColl', MapReduceCommand.OutputType.REPLACE, new BasicDBObject())
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(
+                new MapReduceToCollectionOperation(collection.getNamespace(), new BsonJavaScript('map'), new BsonJavaScript('reduce'),
+                        'myColl', collection.getWriteConcern())
+                        .verbose(true)
+                        .filter(new BsonDocument())
+        )
+
+        when: // Inherits from DB
+        collection.mapReduce('map', 'reduce', 'myColl', MapReduceCommand.OutputType.REPLACE, new BasicDBObject())
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(
+                new MapReduceToCollectionOperation(collection.getNamespace(), new BsonJavaScript('map'), new BsonJavaScript('reduce'),
+                        'myColl', collection.getWriteConcern())
+                        .verbose(true)
+                        .filter(new BsonDocument())
+        )
+
+        when:
+        def mapReduceCommand = new MapReduceCommand(collection, 'map', 'reduce', 'myColl', MapReduceCommand.OutputType.REPLACE,
+                new BasicDBObject())
+        mapReduceCommand.setCollation(collation)
+        collection.mapReduce(mapReduceCommand)
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(
+                new MapReduceToCollectionOperation(collection.getNamespace(), new BsonJavaScript('map'), new BsonJavaScript('reduce'),
+                        'myColl', collection.getWriteConcern())
+                        .verbose(true)
+                        .filter(new BsonDocument())
+                        .collation(collation)
+        )
+    }
+
+    def 'aggregate should create the correct AggregateOperation'() {
+        given:
+        def cursor = Stub(MapReduceBatchCursor) {
+            next() >> { }
+            hasNext() >> false
+        }
+        def executor = new TestOperationExecutor([cursor, cursor, cursor])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+        def pipeline = [BasicDBObject.parse('{$match: {}}')]
+        def bsonPipeline = [BsonDocument.parse('{$match: {}}')]
+
+        when:
+        collection.aggregate(pipeline)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), bsonPipeline,
+                collection.getDefaultDBObjectCodec()).useCursor(true).retryReads(true))
+        executor.getReadConcern() == ReadConcern.DEFAULT
+
+        when: // Inherits from DB
+        db.setReadConcern(ReadConcern.MAJORITY)
+        collection.aggregate(pipeline)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), bsonPipeline,
+                collection.getDefaultDBObjectCodec()).useCursor(true).retryReads(true))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        when:
+        collection.setReadConcern(ReadConcern.LOCAL)
+        collection.aggregate(pipeline, AggregationOptions.builder().collation(collation).build())
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), bsonPipeline,
+                collection.getDefaultDBObjectCodec()).useCursor(true).collation(collation).retryReads(true))
+        executor.getReadConcern() == ReadConcern.LOCAL
+    }
+
+    def 'aggregate should create the correct AggregateToCollectionOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+        def pipeline = [BasicDBObject.parse('{$match: {}}'), BasicDBObject.parse('{$out: "myColl"}')]
+        def bsonPipeline = [BsonDocument.parse('{$match: {}}'), BsonDocument.parse('{$out: "myColl"}')]
+
+        when:
+        collection.aggregate(pipeline)
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new AggregateToCollectionOperation(collection.getNamespace(),
+                bsonPipeline, collection.getReadConcern(), collection.getWriteConcern()))
+
+        when: // Inherits from DB
+        collection.aggregate(pipeline)
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new AggregateToCollectionOperation(collection.getNamespace(),
+                bsonPipeline, collection.getReadConcern(), collection.getWriteConcern()))
+
+        when:
+        collection.aggregate(pipeline, AggregationOptions.builder().collation(collation).build())
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new AggregateToCollectionOperation(collection.getNamespace(),
+                bsonPipeline, collection.getReadConcern(), collection.getWriteConcern()).collation(collation))
+    }
+
+    def 'explainAggregate should create the correct AggregateOperation'() {
+        given:
+        def result = BsonDocument.parse('{ok: 1}')
+        def executor = new TestOperationExecutor([result, result, result])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+        def options = AggregationOptions.builder().collation(collation).build()
+        def pipeline = [BasicDBObject.parse('{$match: {}}')]
+        def bsonPipeline = [BsonDocument.parse('{$match: {}}')]
+
+        when:
+        collection.explainAggregate(pipeline, options)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), bsonPipeline,
+                collection.getDefaultDBObjectCodec()).retryReads(true).collation(collation)
+                .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER))
+
+        when: // Inherits from DB
+        db.setReadConcern(ReadConcern.MAJORITY)
+        collection.explainAggregate(pipeline, options)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), bsonPipeline,
+                collection.getDefaultDBObjectCodec()).retryReads(true).collation(collation)
+                .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER))
+
+        when:
+        collection.setReadConcern(ReadConcern.LOCAL)
+        collection.explainAggregate(pipeline, options)
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(), bsonPipeline,
+                collection.getDefaultDBObjectCodec()).retryReads(true).useCursor(false).collation(collation)
+                .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER))
+    }
+
+    def 'parallel should create the correct ParallelCollectionScanOperation'() {
+        given:
+        def executor = new TestOperationExecutor([[Stub(BatchCursor) {
+            hasNext() >> {
+                false
+            }
+        }]])
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        collection.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        def cursors = collection.parallelScan(ParallelScanOptions.builder().build())
+
+        then:
+        cursors.size() == 1
+        expect executor.getReadOperation(), isTheSameAs(new ParallelCollectionScanOperation(collection.getNamespace(), 1,
+                                                                                            collection.getObjectCodec()).retryReads(true))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+    }
+
+    def 'update should create the correct UpdateOperation'() {
+        given:
+        def result = Stub(WriteConcernResult)
+        def executor = new TestOperationExecutor([result, result, result])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def retryWrites = db.getMongoClient().getMongoClientOptions().getRetryWrites()
+        def collection = db.getCollection('test')
+        def query = '{a: 1}'
+        def update = '{$set: {a: 2}}'
+
+        when:
+        def updateRequest = new UpdateRequest(BsonDocument.parse(query), BsonDocument.parse(update),
+                com.mongodb.bulk.WriteRequest.Type.UPDATE).multi(false)
+        collection.update(BasicDBObject.parse(query), BasicDBObject.parse(update))
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new UpdateOperation(collection.getNamespace(), true,
+                WriteConcern.ACKNOWLEDGED, retryWrites, asList(updateRequest)))
+
+        when: // Inherits from DB
+        db.setWriteConcern(WriteConcern.W3)
+        collection.update(BasicDBObject.parse(query), BasicDBObject.parse(update))
+
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new UpdateOperation(collection.getNamespace(), true,
+                WriteConcern.W3, retryWrites, asList(updateRequest)))
+
+        when:
+        collection.setWriteConcern(WriteConcern.W1)
+        updateRequest.collation(collation)
+        collection.update(BasicDBObject.parse(query), BasicDBObject.parse(update),
+                new DBCollectionUpdateOptions().collation(collation).arrayFilters(dbObjectArrayFilters))
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new UpdateOperation(collection.getNamespace(), true,
+                WriteConcern.W1, retryWrites, asList(updateRequest.arrayFilters(bsonDocumentWrapperArrayFilters))))
+
+        where:
+        dbObjectArrayFilters <<            [null, [], [new BasicDBObject('i.b', 1)]]
+        bsonDocumentWrapperArrayFilters << [null, [], [new BsonDocumentWrapper<BasicDBObject>(new BasicDBObject('i.b', 1),
+                DEFAULT_DBOBJECT_CODEC_FACTORY)]]
+    }
+
+    def 'remove should create the correct DeleteOperation'() {
+        given:
+        def result = Stub(WriteConcernResult)
+        def executor = new TestOperationExecutor([result, result, result])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def retryWrites = db.getMongoClient().getMongoClientOptions().getRetryWrites()
+        def collection = db.getCollection('test')
+        def query = '{a: 1}'
+
+        when:
+        def deleteRequest = new DeleteRequest(BsonDocument.parse(query))
+        collection.remove(BasicDBObject.parse(query))
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new DeleteOperation(collection.getNamespace(), false,
+                WriteConcern.ACKNOWLEDGED, retryWrites, asList(deleteRequest)))
+
+        when: // Inherits from DB
+        db.setWriteConcern(WriteConcern.W3)
+        collection.remove(BasicDBObject.parse(query))
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new DeleteOperation(collection.getNamespace(), false,
+                WriteConcern.W3, retryWrites, asList(deleteRequest)))
+
+        when:
+        collection.setWriteConcern(WriteConcern.W1)
+        deleteRequest.collation(collation)
+        collection.remove(BasicDBObject.parse(query), new DBCollectionRemoveOptions().collation(collation))
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new DeleteOperation(collection.getNamespace(), false,
+                WriteConcern.W1, retryWrites, asList(deleteRequest)))
+    }
+
+    def 'should create the correct MixedBulkWriteOperation'() {
+        given:
+        def result = Stub(com.mongodb.bulk.BulkWriteResult)
+        def executor = new TestOperationExecutor([result, result, result])
+        def db = new DB(getMongoClient(), 'myDatabase', executor)
+        def collection = db.getCollection('test')
+        def query = '{a: 1}'
+        def update = '{$set: {level: 1}}'
+        def insertedDocument = new BasicDBObject('_id', 1)
+        def insertRequest = new InsertRequest(new BsonDocumentWrapper(insertedDocument, collection.getDefaultDBObjectCodec()))
+        def updateRequest = new UpdateRequest(BsonDocument.parse(query), BsonDocument.parse(update),
+                com.mongodb.bulk.WriteRequest.Type.UPDATE).multi(false).collation(collation)
+                .arrayFilters(bsonDocumentWrapperArrayFilters)
+        def deleteRequest = new DeleteRequest(BsonDocument.parse(query)).multi(false).collation(frenchCollation)
+        def writeRequests = asList(insertRequest, updateRequest, deleteRequest)
+
+        when:
+        def bulk = {
+            def bulkOp = ordered ? collection.initializeOrderedBulkOperation() : collection.initializeUnorderedBulkOperation()
+            bulkOp.insert(insertedDocument)
+            bulkOp.find(BasicDBObject.parse(query)).collation(collation).arrayFilters(dbObjectArrayFilters)
+                    .updateOne(BasicDBObject.parse(update))
+            bulkOp.find(BasicDBObject.parse(query)).collation(frenchCollation).removeOne()
+            bulkOp
+        }
+        bulk().execute()
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new MixedBulkWriteOperation(collection.getNamespace(), writeRequests, ordered,
+                WriteConcern.ACKNOWLEDGED, false))
+
+        when: // Inherits from DB
+        db.setWriteConcern(WriteConcern.W3)
+        bulk().execute()
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new MixedBulkWriteOperation(collection.getNamespace(), writeRequests, ordered,
+                WriteConcern.W3, false))
+
+        when:
+        collection.setWriteConcern(WriteConcern.W1)
+        bulk().execute()
+
+        then:
+        expect executor.getWriteOperation(), isTheSameAs(new MixedBulkWriteOperation(collection.getNamespace(), writeRequests, ordered,
+                WriteConcern.W1, false))
+
+        where:
+        ordered << [true, false, true]
+        dbObjectArrayFilters <<            [null, [], [new BasicDBObject('i.b', 1)]]
+        bsonDocumentWrapperArrayFilters << [null, [], [new BsonDocumentWrapper<BasicDBObject>(new BasicDBObject('i.b', 1),
+                DEFAULT_DBOBJECT_CODEC_FACTORY)]]
+    }
+
+    def collation = Collation.builder()
+            .locale('en')
+            .caseLevel(true)
+            .collationCaseFirst(CollationCaseFirst.OFF)
+            .collationStrength(CollationStrength.IDENTICAL)
+            .numericOrdering(true)
+            .collationAlternate(CollationAlternate.SHIFTED)
+            .collationMaxVariable(CollationMaxVariable.SPACE)
+            .backwards(true)
+            .build()
+
+    def frenchCollation = Collation.builder().locale('fr').build()
+}
diff --git a/driver/src/test/functional/com/mongodb/DBCollectionTest.java b/driver-legacy/src/test/functional/com/mongodb/DBCollectionTest.java
similarity index 96%
rename from driver/src/test/functional/com/mongodb/DBCollectionTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBCollectionTest.java
index 1651cfe35a8..04ee0129c1c 100644
--- a/driver/src/test/functional/com/mongodb/DBCollectionTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCollectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,6 +69,7 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;
 
+@SuppressWarnings("deprecation")
 public class DBCollectionTest extends DatabaseTestCase {
 
     @Test
@@ -115,6 +116,16 @@ public void testDefaultSettings() {
         assertEquals(0, collection.getOptions());
     }
 
+    @Test
+    public void insertEmptyListShouldThrowIllegalArgumentException() {
+        try {
+            collection.insert(Collections.<DBObject>emptyList());
+            fail("Should throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+           // empty
+        }
+    }
+
     @Test
     public void testInsert() {
         WriteResult res = collection.insert(new BasicDBObject("_id", 1).append("x", 2));
@@ -123,6 +134,12 @@ public void testInsert() {
         assertEquals(new BasicDBObject("_id", 1).append("x", 2), collection.findOne());
     }
 
+    @Test
+    public void testFindWithNullQuery() {
+        collection.insert(new BasicDBObject("_id", 1).append("x", 2));
+        assertEquals(new BasicDBObject("_id", 1).append("x", 2), collection.find(null).next());
+    }
+
     @Test
     public void testInsertDuplicateKeyException() {
         DBObject doc = new BasicDBObject("_id", 1);
@@ -228,7 +245,6 @@ public void testInsertWithDBEncoderFactorySet() {
 
     @Test(expected = MongoCommandException.class)
     public void testCreateIndexWithInvalidIndexType() {
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         DBObject index = new BasicDBObject("x", "funny");
         collection.createIndex(index);
     }
@@ -288,8 +304,6 @@ public void testCreateIndexAs2d() {
 
     @Test
     public void testCreateIndexAs2dsphere() {
-        assumeThat(serverVersionAtLeast(asList(2, 4, 0)), is(true));
-
         // when
         DBObject index = new BasicDBObject("x", "2dsphere");
         collection.createIndex(index);
@@ -301,7 +315,6 @@ public void testCreateIndexAs2dsphere() {
 
     @Test
     public void testCreateIndexAsText() {
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         DBObject index = new BasicDBObject("x", "text");
         collection.createIndex(index);
 
@@ -429,7 +442,6 @@ public void findAndUpdateAndReturnNew() {
     @Test(expected = MongoExecutionTimeoutException.class)
     public void testFindAndUpdateTimeout() {
         assumeThat(ClusterFixture.isAuthenticated(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         collection.insert(new BasicDBObject("_id", 1));
         enableMaxTimeFailPoint();
         try {
@@ -443,7 +455,6 @@ public void testFindAndUpdateTimeout() {
     @Test(expected = MongoExecutionTimeoutException.class)
     public void testFindAndReplaceTimeout() {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         collection.insert(new BasicDBObject("_id", 1));
         enableMaxTimeFailPoint();
         try {
@@ -457,7 +468,6 @@ public void testFindAndReplaceTimeout() {
     @Test(expected = MongoExecutionTimeoutException.class)
     public void testFindAndRemoveTimeout() {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         collection.insert(new BasicDBObject("_id", 1));
         enableMaxTimeFailPoint();
         try {
@@ -532,7 +542,8 @@ public void testPathToClassMapDecoding() {
         DBObject doc = new TopLevelDBObject().append("a", new NestedOneDBObject().append("b", asList(new NestedTwoDBObject()))
                                                           .append("c", new BasicDBObject()));
         collection.save(doc);
-        assertEquals(doc, collection.findOne());
+        DBObject found = collection.findOne();
+        assertEquals(doc, found);
     }
 
 
@@ -710,9 +721,7 @@ public void testBulkWriteOperation() {
         assertEquals(1, result.getInsertedCount());
         assertEquals(4, result.getMatchedCount());
         assertEquals(3, result.getRemovedCount());
-        if (result.isModifiedCountAvailable()) {
-            assertEquals(4, result.getModifiedCount());
-        }
+        assertEquals(4, result.getModifiedCount());
         assertEquals(Arrays.asList(new BulkWriteUpsert(1, upsertOneId),
                                    new BulkWriteUpsert(2, upsertTwoId)),
                      result.getUpserts());
@@ -860,7 +869,7 @@ public void testWriteConcernExceptionOnUpdate() throws UnknownHostException {
 
     @Test
     public void testWriteConcernExceptionOnFindAndModify() throws UnknownHostException {
-        assumeThat(serverVersionAtLeast(asList(3, 2, 0)), is(true));
+        assumeThat(serverVersionAtLeast(3, 2), is(true));
         assumeThat(isDiscoverableReplicaSet(), is(true));
 
         ObjectId id = new ObjectId();
@@ -959,7 +968,7 @@ public void testBulkWriteConcernException() throws UnknownHostException {
     @Category(Slow.class)
     public void testParallelScan() throws UnknownHostException {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
+        assumeThat(serverVersionAtLeast(4, 1), is(false));
 
         Set<Integer> ids = new HashSet<Integer>();
         List<BasicDBObject> documents = new ArrayList<BasicDBObject>(2000);
@@ -993,7 +1002,7 @@ public void testBypassDocumentValidationForInserts() {
 
         try {
             c.insert(Collections.<DBObject>singletonList(new BasicDBObject("level", 9)));
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1003,7 +1012,7 @@ public void testBypassDocumentValidationForInserts() {
         try {
             c.insert(Collections.<DBObject>singletonList(new BasicDBObject("level", 9)),
                      new InsertOptions().bypassDocumentValidation(false));
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1023,7 +1032,7 @@ public void testBypassDocumentValidationForInserts() {
                      new InsertOptions()
                      .bypassDocumentValidation(true)
                      .writeConcern(WriteConcern.UNACKNOWLEDGED));
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1041,7 +1050,7 @@ public void testBypassDocumentValidationForUpdates() {
         try {
             c.update(new BasicDBObject("_id", 1), new BasicDBObject("_id", 1).append("level", 9), true, false, WriteConcern.ACKNOWLEDGED,
                      null);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1051,7 +1060,7 @@ public void testBypassDocumentValidationForUpdates() {
         try {
             c.update(new BasicDBObject("_id", 1), new BasicDBObject("_id", 1).append("level", 9), true, false, WriteConcern.ACKNOWLEDGED,
                      false, null);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1077,7 +1086,7 @@ public void testBypassDocumentValidationForUpdates() {
             c.update(new BasicDBObject("_id", 1), new BasicDBObject("_id", 1).append("level", 9), true, false,
                      WriteConcern.UNACKNOWLEDGED,
                      true, null);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1095,7 +1104,7 @@ public void testBypassDocumentValidationForFindAndModify() {
 
         try {
             c.findAndModify(new BasicDBObject("_id", 1), new BasicDBObject("_id", 1).append("level", 9));
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1105,7 +1114,7 @@ public void testBypassDocumentValidationForFindAndModify() {
         try {
             c.findAndModify(new BasicDBObject("_id", 1), null, null, false, new BasicDBObject("_id", 1).append("level", 9), false, false,
                             false, 0, TimeUnit.SECONDS);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1137,7 +1146,7 @@ public void testBypassDocumentValidationForBulkInsert() {
             BulkWriteOperation bulk = c.initializeOrderedBulkOperation();
             bulk.insert(new BasicDBObject("level", 9));
             bulk.execute();
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1149,7 +1158,7 @@ public void testBypassDocumentValidationForBulkInsert() {
             bulk.setBypassDocumentValidation(false);
             bulk.insert(new BasicDBObject("level", 9));
             bulk.execute();
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1189,7 +1198,7 @@ public void testBypassDocumentValidationForBulkInsert() {
             bulk.setBypassDocumentValidation(true);
             bulk.insert(new BasicDBObject("level", 9));
             bulk.execute(WriteConcern.UNACKNOWLEDGED);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1207,7 +1216,7 @@ public void testBypassDocumentValidationForBulkUpdate() {
             BulkWriteOperation bulk = c.initializeOrderedBulkOperation();
             bulk.find(new BasicDBObject("_id", 1)).upsert().update(new BasicDBObject("$set", new BasicDBObject("level", 9)));
             bulk.execute();
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1219,7 +1228,7 @@ public void testBypassDocumentValidationForBulkUpdate() {
             bulk.setBypassDocumentValidation(false);
             bulk.find(new BasicDBObject("_id", 1)).upsert().update(new BasicDBObject("$set", new BasicDBObject("level", 9)));
             bulk.execute();
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1259,7 +1268,7 @@ public void testBypassDocumentValidationForBulkUpdate() {
             bulk.setBypassDocumentValidation(true);
             bulk.find(new BasicDBObject("_id", 1)).upsert().update(new BasicDBObject("$set", new BasicDBObject("level", 9)));
             bulk.execute(WriteConcern.UNACKNOWLEDGED);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1277,7 +1286,7 @@ public void testBypassDocumentValidationForBulkReplace() {
             BulkWriteOperation bulk = c.initializeOrderedBulkOperation();
             bulk.find(new BasicDBObject("_id", 1)).upsert().replaceOne(new BasicDBObject("level", 9));
             bulk.execute();
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1289,7 +1298,7 @@ public void testBypassDocumentValidationForBulkReplace() {
             bulk.setBypassDocumentValidation(false);
             bulk.find(new BasicDBObject("_id", 1)).upsert().replaceOne(new BasicDBObject("level", 9));
             bulk.execute();
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1329,7 +1338,7 @@ public void testBypassDocumentValidationForBulkReplace() {
             bulk.setBypassDocumentValidation(true);
             bulk.find(new BasicDBObject("_id", 1)).upsert().replaceOne(new BasicDBObject("level", 9));
             bulk.execute(WriteConcern.UNACKNOWLEDGED);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1338,9 +1347,8 @@ public void testBypassDocumentValidationForBulkReplace() {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testBypassDocumentValidationForAggregateDollarOut() {
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
-
         //given
         DBObject options = new BasicDBObject("validator", QueryBuilder.start("level").greaterThanEquals(10).get());
         DBCollection cOut = database.createCollection(collectionName + ".out", options);
@@ -1350,7 +1358,7 @@ public void testBypassDocumentValidationForAggregateDollarOut() {
 
         try {
             c.aggregate(Collections.<DBObject>singletonList(new BasicDBObject("$out", cOut.getName())));
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1362,7 +1370,7 @@ public void testBypassDocumentValidationForAggregateDollarOut() {
                         AggregationOptions.builder()
                         .bypassDocumentValidation(false)
                         .build());
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1403,7 +1411,7 @@ public void testBypassDocumentValidationForNonInlineMapReduce() {
             MapReduceCommand mapReduceCommand = new MapReduceCommand(c, map, reduce, cOut.getName(), MapReduceCommand.OutputType.REPLACE,
                                                                      new BasicDBObject());
             c.mapReduce(mapReduceCommand);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
@@ -1415,7 +1423,7 @@ public void testBypassDocumentValidationForNonInlineMapReduce() {
                                                                      new BasicDBObject());
             mapReduceCommand.setBypassDocumentValidation(false);
             c.mapReduce(mapReduceCommand);
-            if (serverVersionAtLeast(asList(3, 2, 0))) {
+            if (serverVersionAtLeast(3, 2)) {
                 fail();
             }
         } catch (MongoException e) {
diff --git a/driver/src/test/functional/com/mongodb/DBCursorFunctionalSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/DBCursorFunctionalSpecification.groovy
similarity index 85%
rename from driver/src/test/functional/com/mongodb/DBCursorFunctionalSpecification.groovy
rename to driver-legacy/src/test/functional/com/mongodb/DBCursorFunctionalSpecification.groovy
index 4e719a8b331..077733c7127 100644
--- a/driver/src/test/functional/com/mongodb/DBCursorFunctionalSpecification.groovy
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCursorFunctionalSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,14 @@
 
 package com.mongodb
 
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationStrength
 import com.mongodb.operation.BatchCursor
 import spock.lang.IgnoreIf
 import spock.lang.Subject
 
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
 
 class DBCursorFunctionalSpecification extends FunctionalSpecification {
 
@@ -49,7 +51,7 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
         1 * decoder.decode(_ as byte[], collection)
     }
 
-    @IgnoreIf({ serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ serverVersionAtLeast(3, 0) })
     def 'should use provided hints for queries'() {
         given:
         collection.createIndex(new BasicDBObject('a', 1))
@@ -67,8 +69,8 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
         dbCursor.explain().get('cursor') == 'BtreeCursor a_1'
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 0, 0)) })
-    def 'should use provided hints for queries mongod > 2.7'() {
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
+    def 'should use provided hints for queries mongod > 3.0'() {
         given:
         collection.createIndex(new BasicDBObject('a', 1))
 
@@ -94,7 +96,7 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
         collection.find().hint(new BasicDBObject('a', 1)).count() == 1
     }
 
-    @IgnoreIf({ serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ serverVersionAtLeast(3, 0) })
     def 'should use provided string hints for queries'() {
         given:
         collection.createIndex(new BasicDBObject('a', 1))
@@ -113,7 +115,7 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
     }
 
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
     def 'should use provided string hints for queries mongodb > 2.7'() {
         given:
         collection.createIndex(new BasicDBObject('a', 1))
@@ -151,26 +153,17 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
         collection.createIndex(new BasicDBObject('x', 1), new BasicDBObject('sparse', true));
 
         then:
-        collection.find(new BasicDBObject('a', 1)).hint('x_1').count() == (serverVersionAtLeast(asList(2, 6, 0)) ? 0 : 1)
+        collection.find(new BasicDBObject('a', 1)).hint('x_1').count() == 0
         collection.find().hint('a_1').count() == 2
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should throw with bad hint with mongod 2.6+'() {
+    def 'should throw with bad hint'() {
         when:
         collection.find(new BasicDBObject('a', 1)).hint('BAD HINT').count()
         then:
         thrown(MongoException)
     }
 
-    @IgnoreIf({ serverVersionAtLeast(asList(2, 6, 0)) })
-    def 'should ignore bad hints with mongod < 2.6'() {
-        when:
-        collection.find(new BasicDBObject('a', 1)).hint('BAD HINT').count()
-        then:
-        notThrown(MongoException)
-    }
-
     def 'should be able to use addSpecial with count'() {
         when:
         collection.insert(new BasicDBObject('a', 2));
@@ -189,10 +182,10 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
         def countWithHint = collection.find(new BasicDBObject('a', 1)).addSpecial('$hint', 'x_1').count()
 
         then:
-        countWithHint == (serverVersionAtLeast(asList(2, 6, 0)) ? 0 : 1)
+        countWithHint == 0
     }
 
-    @IgnoreIf({ serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ serverVersionAtLeast(3, 0) })
     def 'should be able to use addSpecial with $explain'() {
         given:
         collection.createIndex(new BasicDBObject('a', 1))
@@ -205,7 +198,7 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
         dbCursor.next().get('cursor') == 'BtreeCursor a_1'
     }
 
-    @IgnoreIf({ !serverVersionAtLeast(asList(3, 0, 0)) })
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
     def 'should be able to use addSpecial with $explain mongod > 2.7'() {
         given:
         collection.createIndex(new BasicDBObject('a', 1))
@@ -378,6 +371,52 @@ class DBCursorFunctionalSpecification extends FunctionalSpecification {
         executor.getReadPreference() == ReadPreference.secondaryPreferred()
     }
 
+    @IgnoreIf({ serverVersionAtLeast(3, 4) })
+    def 'should throw an exception when using an unsupported Collation'() {
+        given:
+        dbCursor = collection.find().setCollation(caseInsensitiveCollation)
+
+        when:
+        dbCursor.count()
+
+        then:
+        def exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        when:
+        dbCursor.one()
+
+        then:
+        exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+
+        when:
+        ++dbCursor.iterator()
+
+        then:
+        exception = thrown(IllegalArgumentException)
+        exception.getMessage().startsWith('Collation not supported by server version:')
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) })
+    def 'should support collation'() {
+        when:
+        def document = BasicDBObject.parse('{_id: 1, str: "foo"}')
+        collection.insert(document)
+        dbCursor = collection.find(BasicDBObject.parse('{str: "FOO"}')).setCollation(caseInsensitiveCollation)
+
+        then:
+        dbCursor.count() == 1
+
+        then:
+        dbCursor.one() == document
+
+        then:
+        ++dbCursor.iterator() == document
+    }
+
+    def caseInsensitiveCollation = Collation.builder().locale('en').collationStrength(CollationStrength.SECONDARY).build()
+
     static DBObject getKeyPattern(DBObject explainPlan) {
         if (explainPlan.queryPlanner.winningPlan.inputStage != null) {
             return explainPlan.queryPlanner.winningPlan.inputStage.keyPattern
diff --git a/driver/src/test/functional/com/mongodb/DBCursorOldTest.java b/driver-legacy/src/test/functional/com/mongodb/DBCursorOldTest.java
similarity index 97%
rename from driver/src/test/functional/com/mongodb/DBCursorOldTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBCursorOldTest.java
index 3f98592740e..f8ed7c3f797 100644
--- a/driver/src/test/functional/com/mongodb/DBCursorOldTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCursorOldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 import java.util.concurrent.TimeoutException;
 
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static java.util.Arrays.asList;
+import static com.mongodb.ClusterFixture.serverVersionLessThan;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
@@ -38,7 +38,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
 
+@SuppressWarnings("deprecation")
 public class DBCursorOldTest extends DatabaseTestCase {
 
     @Test
@@ -82,7 +84,9 @@ public void testCount() {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testSnapshot() {
+        assumeTrue(serverVersionLessThan("3.7"));
         insertTestData(collection, 100);
         assertEquals(100, collection.find().count());
         assertEquals(100, collection.find().toArray().size());
@@ -136,6 +140,8 @@ public void testTailable() {
         assertEquals(null, cur.tryNext());
         assertEquals(secondDBObject, cur.curr());
         assertEquals(2, cur.numSeen());
+
+        cur.close();
     }
 
     @Test
@@ -179,6 +185,8 @@ public Integer call() throws Exception {
         // this doc should unblock thread
         c.save(new BasicDBObject("x", 10), WriteConcern.ACKNOWLEDGED);
         assertEquals(10, (long) future.get(5, SECONDS));
+
+        cur.close();
     }
 
     @Test
@@ -221,6 +229,8 @@ public Integer call() throws Exception {
         // this doc should unblock thread
         c.save(new BasicDBObject("x", 10), WriteConcern.ACKNOWLEDGED);
         assertEquals(10, (long) future.get(5, SECONDS));
+
+        cur.close();
     }
 
     @Test
@@ -238,6 +248,8 @@ public void shouldSupportTryNextOnTailableCursors() {
             cur.tryNext();
         } catch (IllegalArgumentException e) {
             fail();
+        } finally {
+            cur.close();
         }
     }
 
@@ -257,6 +269,8 @@ public void shouldSupportTryNextOnTailableAwaitCursors() {
             cur.tryNext();
         } catch (IllegalArgumentException e) {
             fail();
+        } finally {
+            cur.close();
         }
     }
 
@@ -276,7 +290,7 @@ public void shouldThrowExceptionOnTryNextForNonTailableCursors() {
 
     @Test
     public void testExplain() {
-        assumeThat(serverVersionAtLeast(asList(3, 0, 0)), is(false));
+        assumeThat(serverVersionAtLeast(3, 0), is(false));
         insertTestData(collection, 100);
 
         DBObject q = BasicDBObjectBuilder.start().push("x").add("$gt", 50).get();
diff --git a/driver/src/test/functional/com/mongodb/DBCursorTest.java b/driver-legacy/src/test/functional/com/mongodb/DBCursorTest.java
similarity index 87%
rename from driver/src/test/functional/com/mongodb/DBCursorTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBCursorTest.java
index b71d4b373c2..5f7186b9320 100644
--- a/driver/src/test/functional/com/mongodb/DBCursorTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBCursorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.concurrent.TimeUnit;
@@ -31,7 +30,7 @@
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint;
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static java.util.Arrays.asList;
+import static com.mongodb.ClusterFixture.serverVersionLessThan;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
@@ -40,7 +39,9 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
 
 public class DBCursorTest extends DatabaseTestCase {
     private static final int NUMBER_OF_DOCUMENTS = 10;
@@ -209,16 +210,25 @@ public void testSkip() {
     @Test
     public void testGetCursorId() {
         DBCursor cursor = collection.find().batchSize(2);
-        assertEquals(0, cursor.getCursorId());
-        cursor.hasNext();
-        assertThat(cursor.getCursorId(), is(not(0L)));
+        try {
+            assertEquals(0, cursor.getCursorId());
+            cursor.hasNext();
+            assertThat(cursor.getCursorId(), is(not(0L)));
+        } finally {
+            cursor.close();
+        }
 
         cursor = collection.find();
-        assertEquals(0, cursor.getCursorId());
-        cursor.hasNext();
-        assertThat(cursor.getCursorId(), is(0L));
+        try {
+            assertEquals(0, cursor.getCursorId());
+            cursor.hasNext();
+            assertThat(cursor.getCursorId(), is(0L));
+        } finally {
+            cursor.close();
+        }
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testGetServerAddress() {
         DBCursor cursor = collection.find().limit(2);
@@ -301,7 +311,9 @@ public void testConstructor() {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testMaxScan() {
+        assumeFalse(serverVersionAtLeast(4, 1));
         countResults(new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
                      .addSpecial("$maxScan", 4), 4);
         countResults(new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary()).maxScan(4), 4);
@@ -309,18 +321,24 @@ public void testMaxScan() {
 
     @Test
     public void testMax() {
+        collection.createIndex(new BasicDBObject("x", 1));
         countResults(new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-                     .addSpecial("$max", new BasicDBObject("x", 4)), 4);
+                     .addSpecial("$max", new BasicDBObject("x", 4))
+                     .addSpecial("$hint", new BasicDBObject("x", 1)), 4);
         countResults(new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-                     .max(new BasicDBObject("x", 4)), 4);
+                     .max(new BasicDBObject("x", 4))
+                     .hint(new BasicDBObject("x", 1)), 4);
     }
 
     @Test
     public void testMin() {
+        collection.createIndex(new BasicDBObject("x", 1));
         countResults(new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-                     .addSpecial("$min", new BasicDBObject("x", 4)), 6);
+                     .addSpecial("$min", new BasicDBObject("x", 4))
+                     .addSpecial("$hint", new BasicDBObject("x", 1)), 6);
         countResults(new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-                     .min(new BasicDBObject("x", 4)), 6);
+                     .min(new BasicDBObject("x", 4))
+                     .hint(new BasicDBObject("x", 1)), 6);
     }
 
     @Test
@@ -349,7 +367,7 @@ public void testReturnKey() {
 
     @Test
     public void testShowDiskLoc() {
-        String fieldName = serverVersionAtLeast(Arrays.asList(3, 1, 0)) ? "$recordId" : "$diskLoc";
+        String fieldName = serverVersionAtLeast(3, 2) ? "$recordId" : "$diskLoc";
         DBCursor cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
                           .addSpecial("$showDiskLoc", true);
         try {
@@ -374,6 +392,7 @@ public void testShowDiskLoc() {
 
     @Test
     public void testSnapshot() {
+        assumeTrue(serverVersionLessThan("3.7"));
         DBCursor cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
                           .addSpecial("$snapshot", true);
         try {
@@ -400,29 +419,36 @@ public void testSettingACommentInsertsCommentIntoProfileCollectionWhenProfilingI
         assumeThat(isSharded(), is(false));
 
         // given
-        database.command(new BasicDBObject("profile", 2));
         String expectedComment = "test comment";
 
-        // when
-        DBCursor cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-                          .comment(expectedComment);
-        while (cursor.hasNext()) {
-            cursor.next();
-        }
-
-        // then
         DBCollection profileCollection = database.getCollection("system.profile");
-        assertEquals(1, profileCollection.count());
+        profileCollection.drop();
+
+        database.command(new BasicDBObject("profile", 2));
+
+        try {
+            // when
+            DBCursor cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+                              .comment(expectedComment);
+            while (cursor.hasNext()) {
+                cursor.next();
+            }
 
-        DBObject profileDocument = profileCollection.findOne();
-        if (serverVersionAtLeast(asList(3, 1, 7))) {
-            assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("comment"));
-        } else {
-            assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("$comment"));
+            // then
+            assertEquals(1, profileCollection.count());
+
+            DBObject profileDocument = profileCollection.findOne();
+            if (serverVersionAtLeast(3, 6)) {
+                assertEquals(expectedComment, ((DBObject) profileDocument.get("command")).get("comment"));
+            } else if (serverVersionAtLeast(3, 2)) {
+                assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("comment"));
+            } else {
+                assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("$comment"));
+            }
+        } finally {
+            database.command(new BasicDBObject("profile", 0));
+            profileCollection.drop();
         }
-        // finally
-        database.command(new BasicDBObject("profile", 0));
-        profileCollection.drop();
     }
 
     @Test
@@ -448,7 +474,6 @@ public void testShouldReturnOnlyTheFieldThatWasInTheIndexUsedForTheFindWhenRetur
 
     @Test
     public void testMaxTimeForIterator() {
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         enableMaxTimeFailPoint();
         DBCursor cursor = new DBCursor(collection, new BasicDBObject("x", 1), new BasicDBObject(), ReadPreference.primary());
         cursor.maxTime(1, TimeUnit.SECONDS);
@@ -465,7 +490,6 @@ public void testMaxTimeForIterator() {
     @Test
     public void testMaxTimeForIterable() {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         enableMaxTimeFailPoint();
         DBCursor cursor = new DBCursor(collection, new BasicDBObject("x", 1), new BasicDBObject(), ReadPreference.primary());
         cursor.maxTime(1, TimeUnit.SECONDS);
@@ -482,7 +506,6 @@ public void testMaxTimeForIterable() {
     @Test
     public void testMaxTimeForOne() {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         enableMaxTimeFailPoint();
         DBCursor cursor = new DBCursor(collection, new BasicDBObject("x", 1), new BasicDBObject(), ReadPreference.primary());
         cursor.maxTime(1, TimeUnit.SECONDS);
@@ -499,7 +522,6 @@ public void testMaxTimeForOne() {
     @Test
     public void testMaxTimeForCount() {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         enableMaxTimeFailPoint();
         DBCursor cursor = new DBCursor(collection, new BasicDBObject("x", 1), new BasicDBObject(), ReadPreference.primary());
         cursor.maxTime(1, TimeUnit.SECONDS);
@@ -516,7 +538,6 @@ public void testMaxTimeForCount() {
     @Test
     public void testMaxTimeForSize() {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         enableMaxTimeFailPoint();
         DBCursor cursor = new DBCursor(collection, new BasicDBObject("x", 1), new BasicDBObject(), ReadPreference.primary());
         cursor.maxTime(1, TimeUnit.SECONDS);
@@ -530,6 +551,7 @@ public void testMaxTimeForSize() {
         }
     }
 
+    @SuppressWarnings("deprecation")
     @Test(expected = UnsupportedOperationException.class)
     public void exhaustOptionShouldThrowUnsupportedOperationException() {
         DBCursor cursor = new DBCursor(collection, new BasicDBObject("x", 1), new BasicDBObject(), ReadPreference.primary());
diff --git a/driver-legacy/src/test/functional/com/mongodb/DBFunctionalSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/DBFunctionalSpecification.groovy
new file mode 100644
index 00000000000..79f39416312
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/DBFunctionalSpecification.groovy
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.client.internal.OperationExecutor
+import org.bson.BsonDocument
+import org.bson.BsonDouble
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.junit.Test
+import spock.lang.IgnoreIf
+
+import static Fixture.getMongoClient
+import static com.mongodb.ClusterFixture.configureFailPoint
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+
+class DBFunctionalSpecification extends FunctionalSpecification {
+
+    def 'DB addUser should work around localhost exception issues'() {
+        given:
+        def executor = Stub(OperationExecutor) {
+            execute(_, _, _) >> {
+                throw new MongoCommandException(new BsonDocument('ok', new BsonDouble(0))
+                                                          .append('code', new BsonInt32(13))
+                                                          .append('errmsg', new BsonString('not authorized on admin to execute ' +
+                                                                                           'command { usersInfo: "admin" }')),
+                                                  new ServerAddress())
+            }
+
+            execute(_) >> null
+        }
+        def database = new DB(getMongoClient(), 'admin', executor)
+
+        when:
+        def result = database.addUser('ross', 'pwd'.toCharArray())
+
+        then:
+        notThrown(MongoCommandException)
+        !result.updateOfExisting
+        result.getN() == 1
+    }
+
+    def 'DB addUser should throw non localhost exception issues'() {
+        given:
+        def executor = Stub(OperationExecutor) {
+            execute(_, _, _) >> { throw new MongoException('Some error') }
+        }
+        def database = new DB(getMongoClient(), 'admin', executor)
+
+        when:
+        database.addUser('ross', 'pwd'.toCharArray())
+
+        then:
+        thrown(MongoException)
+
+        when:
+        executor = Stub(OperationExecutor) {
+            execute(_, _, _) >> {
+                throw new MongoCommandException(new BsonDocument('ok', new BsonDouble(0))
+                                                          .append('code', new BsonInt32(13))
+                                                          .append('errmsg', new BsonString('not authorized on admin to execute ' +
+                                                                                           'command { usersInfo: "admin" }')),
+                                                  new ServerAddress())
+            }
+
+            execute(_, _) >> { throw new MongoException('Some error') }
+        }
+        database = new DB(getMongoClient(), 'admin', executor)
+        database.addUser('ross', 'pwd'.toCharArray())
+
+        then:
+        thrown(MongoException)
+    }
+
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for drop'() {
+        given:
+        database.createCollection('ctest', new BasicDBObject())
+
+        // On servers older than 4.0 that don't support this failpoint, use a crazy w value instead
+        def w = serverVersionAtLeast(4, 0) ? 2 : 5
+        database.setWriteConcern(new WriteConcern(w))
+        if (serverVersionAtLeast(4, 0)) {
+            configureFailPoint(BsonDocument.parse('{ configureFailPoint: "failCommand", ' +
+                    'mode : {times : 1}, ' +
+                    'data : {failCommands : ["dropDatabase"], ' +
+                    'writeConcernError : {code : 100, errmsg : "failed"}}}'))
+        }
+
+        when:
+        database.dropDatabase()
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        database.setWriteConcern(null)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for create collection'() {
+        given:
+        database.setWriteConcern(new WriteConcern(5))
+
+        when:
+        database.createCollection('ctest', new BasicDBObject())
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        database.setWriteConcern(null)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for create view'() {
+        given:
+        database.setWriteConcern(new WriteConcern(5))
+
+        when:
+        database.createView('view1', 'collection1', [])
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        database.setWriteConcern(null)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for add user'() {
+        given:
+        database.setWriteConcern(new WriteConcern(5))
+
+        when:
+        database.addUser('writeConcernUser', 'foo'.toCharArray())
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        database.setWriteConcern(null)
+        database.removeUser('writeConcernUser')
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 0) || !isDiscoverableReplicaSet() })
+    def 'should throw WriteConcernException on write concern error for remove user'() {
+        given:
+        database.addUser('writeConcernUser', 'foo'.toCharArray())
+        database.setWriteConcern(new WriteConcern(5))
+
+        when:
+        database.removeUser('writeConcernUser')
+
+        then:
+        def e = thrown(WriteConcernException)
+        e.getErrorCode() == 100
+
+        cleanup:
+        database.setWriteConcern(null)
+    }
+
+    @Test
+    def 'should execute command with customer encoder'() {
+        when:
+        CommandResult commandResult = database.command(new BasicDBObject('isMaster', 1), DefaultDBEncoder.FACTORY.create());
+
+        then:
+        commandResult.ok()
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/DBObjectCodecReflectionTest.java b/driver-legacy/src/test/functional/com/mongodb/DBObjectCodecReflectionTest.java
similarity index 96%
rename from driver/src/test/functional/com/mongodb/DBObjectCodecReflectionTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBObjectCodecReflectionTest.java
index a1794ebc4ec..2242f24968a 100644
--- a/driver/src/test/functional/com/mongodb/DBObjectCodecReflectionTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBObjectCodecReflectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+@SuppressWarnings("deprecation")
 public class DBObjectCodecReflectionTest extends DatabaseTestCase {
 
     @Test
diff --git a/driver/src/test/functional/com/mongodb/DBObjectCodecTest.java b/driver-legacy/src/test/functional/com/mongodb/DBObjectCodecTest.java
similarity index 96%
rename from driver/src/test/functional/com/mongodb/DBObjectCodecTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBObjectCodecTest.java
index cb715283966..b8d78c0bd54 100644
--- a/driver/src/test/functional/com/mongodb/DBObjectCodecTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBObjectCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package com.mongodb;
 
-import org.bson.BSON;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWriter;
@@ -42,6 +41,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+@SuppressWarnings("deprecation")
 public class DBObjectCodecTest extends DatabaseTestCase {
 
     @Test
@@ -50,7 +50,7 @@ public void testTransformers() {
             collection.save(new BasicDBObject("_id", 1).append("x", 1.1));
             assertEquals(Double.class, collection.findOne().get("x").getClass());
 
-            BSON.addEncodingHook(Double.class, new Transformer() {
+            org.bson.BSON.addEncodingHook(Double.class, new Transformer() {
                 public Object transform(final Object o) {
                     return o.toString();
                 }
@@ -59,20 +59,20 @@ public Object transform(final Object o) {
             collection.save(new BasicDBObject("_id", 1).append("x", 1.1));
             assertEquals(String.class, collection.findOne().get("x").getClass());
 
-            BSON.clearAllHooks();
+            org.bson.BSON.clearAllHooks();
             collection.save(new BasicDBObject("_id", 1).append("x", 1.1));
             assertEquals(Double.class, collection.findOne().get("x").getClass());
 
-            BSON.addDecodingHook(Double.class, new Transformer() {
+            org.bson.BSON.addDecodingHook(Double.class, new Transformer() {
                 public Object transform(final Object o) {
                     return o.toString();
                 }
             });
             assertEquals(String.class, collection.findOne().get("x").getClass());
-            BSON.clearAllHooks();
+            org.bson.BSON.clearAllHooks();
             assertEquals(Double.class, collection.findOne().get("x").getClass());
         } finally {
-            BSON.clearAllHooks();
+            org.bson.BSON.clearAllHooks();
         }
     }
 
diff --git a/driver/src/test/functional/com/mongodb/DBRefTest.java b/driver-legacy/src/test/functional/com/mongodb/DBRefTest.java
similarity index 99%
rename from driver/src/test/functional/com/mongodb/DBRefTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBRefTest.java
index 32ecaf99c86..d2c0a21c950 100644
--- a/driver/src/test/functional/com/mongodb/DBRefTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBRefTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/functional/com/mongodb/DBTest.java b/driver-legacy/src/test/functional/com/mongodb/DBTest.java
similarity index 79%
rename from driver/src/test/functional/com/mongodb/DBTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DBTest.java
index 6cbf6ce3b3c..4cf6b279337 100644
--- a/driver/src/test/functional/com/mongodb/DBTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DBTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,16 @@
 
 package com.mongodb;
 
-import category.ReplicaSet;
-import com.mongodb.operation.UserExistsOperation;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.CollationAlternate;
+import com.mongodb.client.model.CollationCaseFirst;
+import com.mongodb.client.model.CollationMaxVariable;
+import com.mongodb.client.model.CollationStrength;
+import com.mongodb.operation.ListCollectionsOperation;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.codecs.BsonDocumentCodec;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 import java.net.UnknownHostException;
 
@@ -32,9 +38,9 @@
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.DBObjectMatchers.hasFields;
 import static com.mongodb.DBObjectMatchers.hasSubdocument;
+import static com.mongodb.Fixture.getDefaultDatabaseName;
 import static com.mongodb.Fixture.getMongoClient;
 import static com.mongodb.ReadPreference.secondary;
-import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.hasItems;
@@ -60,6 +66,21 @@ public void shouldGetDefaultReadPreference() {
         assertEquals(ReadPreference.primary(), database.getReadPreference());
     }
 
+    @Test
+    public void shouldGetMongoClient() {
+        assertEquals(getMongoClient(), database.getMongoClient());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void shouldThrowGettingMongoClientIfFromMongo() {
+        Mongo mongo = new Mongo();
+        try {
+            mongo.getDB("test").getMongoClient();
+        } finally {
+            mongo.close();
+        }
+    }
+
     @Test
     public void shouldReturnCachedCollectionObjectIfExists() {
         DBCollection collection1 = database.getCollection("test");
@@ -112,11 +133,6 @@ public void shouldGetCollectionGivenAStringName() {
         assertEquals("foo.bar.zoo.dork", collection.getName());
     }
 
-    @Test(expected = MongoException.class)
-    public void shouldReceiveAnErrorIfCreatingCappedCollectionWithoutSize() {
-        database.createCollection("someName", new BasicDBObject("capped", true));
-    }
-
     @Test
     public void shouldDeferCollectionCreationIfOptionsIsNull() {
         collection.drop();
@@ -132,15 +148,6 @@ public void shouldCreateCappedCollection() {
         assertTrue(database.getCollection(collectionName).isCapped());
     }
 
-    @Test(expected = MongoCommandException.class)
-    public void shouldErrorIfCreatingACollectionThatAlreadyExists() {
-        // given
-        database.createCollection(collectionName, new BasicDBObject());
-
-        // when
-        database.createCollection(collectionName, new BasicDBObject());
-    }
-
     @Test
     public void shouldCreateCappedCollectionWithMaxNumberOfDocuments() {
         collection.drop();
@@ -173,6 +180,47 @@ public void shouldThrowErrorIfCreatingACappedCollectionWithANegativeSize() {
         database.createCollection(collectionName, creationOptions);
     }
 
+    @Test
+    public void shouldCreateCollectionWithTheSetCollation() {
+        assumeThat(serverVersionAtLeast(3, 4), is(true));
+        // Given
+        collection.drop();
+        Collation collation = Collation.builder()
+                .locale("en")
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .backwards(true)
+                .build();
+
+        DBObject options = BasicDBObject.parse("{ collation: { locale: 'en', caseLevel: true, caseFirst: 'off', strength: 5,"
+                + "numericOrdering: true, alternate: 'shifted',  maxVariable: 'space', backwards: true }}");
+
+        // When
+        database.createCollection(collectionName, options);
+        BsonDocument collectionCollation = getCollectionInfo(collectionName).getDocument("options").getDocument("collation");
+
+        // Then
+        BsonDocument collationDocument = collation.asDocument();
+        for (String key: collationDocument.keySet()) {
+            assertEquals(collationDocument.get(key), collectionCollation.get(key));
+        }
+
+        // When - collation set on the database
+        database.getCollection(collectionName).drop();
+        database.createCollection(collectionName, new BasicDBObject("collation", BasicDBObject.parse(collation.asDocument().toJson())));
+        collectionCollation = getCollectionInfo(collectionName).getDocument("options").getDocument("collation");
+
+        // Then
+        collationDocument = collation.asDocument();
+        for (String key: collationDocument.keySet()) {
+            assertEquals(collationDocument.get(key), collectionCollation.get(key));
+        }
+    }
+
     @Test(expected = DuplicateKeyException.class)
     public void shouldGetDuplicateKeyException() {
         DBObject doc = new BasicDBObject("_id", 1);
@@ -183,6 +231,8 @@ public void shouldGetDuplicateKeyException() {
     @Test
     public void shouldDoEval() {
         assumeThat(isAuthenticated(), is(false));
+        assumeThat(serverVersionAtLeast(4, 1), is(false));
+
         String code = "function(name, incAmount) {\n"
                       + "var doc = db.myCollection.findOne( { name : name } );\n"
                       + "doc = doc || { name : name , num : 0 , total : 0 , avg : 0 , _id: 1 };\n"
@@ -211,6 +261,8 @@ public void shouldThrowErrorwhileDoingEval() {
     @Test
     public void shouldInsertDocumentsUsingEval() {
         assumeThat(isAuthenticated(), is(false));
+        assumeThat(serverVersionAtLeast(4, 1), is(false));
+
         // when
         database.eval("db." + collectionName + ".insert({name: 'Bob'})");
 
@@ -233,7 +285,6 @@ public void shouldExecuteCommand() {
     @Test(expected = MongoExecutionTimeoutException.class)
     public void shouldTimeOutCommand() {
         assumeThat(isSharded(), is(false));
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
         enableMaxTimeFailPoint();
         try {
             database.command(new BasicDBObject("isMaster", 1).append("maxTimeMS", 1));
@@ -243,16 +294,15 @@ public void shouldTimeOutCommand() {
     }
 
     @Test
-    @Category(ReplicaSet.class)
     public void shouldExecuteCommandWithReadPreference() {
-        assumeThat(isSharded(), is(false));
+        assumeTrue(isDiscoverableReplicaSet());
         CommandResult commandResult = database.command(new BasicDBObject("dbStats", 1).append("scale", 1), secondary());
         assertThat(commandResult, hasFields(new String[]{"collections", "avgObjSize", "indexes", "db", "indexSize", "storageSize"}));
     }
 
     @Test
     public void shouldNotThrowAnExceptionOnCommandFailure() {
-        CommandResult commandResult = database.command(new BasicDBObject("collStats", "a" + System.currentTimeMillis()));
+        CommandResult commandResult = database.command(new BasicDBObject("nonExistentCommand", 1));
         assertThat(commandResult, hasFields(new String[]{"ok", "errmsg"}));
     }
 
@@ -270,7 +320,7 @@ public void shouldAddUser() {
         WriteResult result = database.addUser(userName, password, readOnly);
         assertEquals(1, result.getN());
         assertFalse(result.isUpdateOfExisting());
-        assertTrue(new UserExistsOperation(database.getName(), userName).execute(getBinding()));
+        assertTrue(new com.mongodb.operation.UserExistsOperation(database.getName(), userName).execute(getBinding()));
     }
 
     @Test
@@ -293,7 +343,7 @@ public void shouldUpdateUser() {
         result = database.addUser(userName, newPassword, newReadOnly);
         assertEquals(1, result.getN());
         assertTrue(result.isUpdateOfExisting());
-        assertTrue(new UserExistsOperation(database.getName(), userName).execute(getBinding()));
+        assertTrue(new com.mongodb.operation.UserExistsOperation(database.getName(), userName).execute(getBinding()));
     }
 
     @Test
@@ -306,7 +356,7 @@ public void shouldRemoveUser() {
 
         database.removeUser(userName);
 
-        assertFalse(new UserExistsOperation(database.getName(), userName).execute(getBinding()));
+        assertFalse(new com.mongodb.operation.UserExistsOperation(database.getName(), userName).execute(getBinding()));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -339,7 +389,7 @@ public void shouldIgnoreCaseWhenCheckingIfACollectionExists() {
 
     @Test
     public void shouldReturnFailureWithErrorMessageWhenExecutingInvalidCommand() {
-        assumeTrue(serverVersionAtLeast(asList(2, 4, 0)) || !isSharded());
+        assumeTrue(!isSharded());
 
         // When
         CommandResult commandResult = database.command(new BasicDBObject("NotRealCommandName", 1));
@@ -360,7 +410,6 @@ public void shouldReturnOKWhenASimpleCommandExecutesSuccessfully() {
     }
 
     @Test
-    @Category(ReplicaSet.class)
     public void shouldRunCommandAgainstSecondaryWhenOnlySecondaryReadPreferenceSpecified() throws UnknownHostException {
         assumeTrue(isDiscoverableReplicaSet());
 
@@ -373,7 +422,6 @@ public void shouldRunCommandAgainstSecondaryWhenOnlySecondaryReadPreferenceSpeci
     }
 
     @Test
-    @Category(ReplicaSet.class)
     public void shouldRunStringCommandAgainstSecondaryWhenSecondaryReadPreferenceSpecified() throws UnknownHostException {
         assumeTrue(isDiscoverableReplicaSet());
 
@@ -386,7 +434,6 @@ public void shouldRunStringCommandAgainstSecondaryWhenSecondaryReadPreferenceSpe
     }
 
     @Test
-    @Category(ReplicaSet.class)
     public void shouldRunCommandAgainstSecondaryWhenOnlySecondaryReadPreferenceSpecifiedAlongWithEncoder() throws UnknownHostException {
         assumeTrue(isDiscoverableReplicaSet());
 
@@ -397,4 +444,9 @@ public void shouldRunCommandAgainstSecondaryWhenOnlySecondaryReadPreferenceSpeci
         assertThat(commandResult.ok(), is(true));
         assertThat((String) commandResult.get("serverUsed"), not(containsString(":27017")));
     }
+
+    BsonDocument getCollectionInfo(final String collectionName) {
+        return new ListCollectionsOperation<BsonDocument>(getDefaultDatabaseName(), new BsonDocumentCodec())
+                .filter(new BsonDocument("name", new BsonString(collectionName))).execute(getBinding()).next().get(0);
+    }
 }
diff --git a/driver-legacy/src/test/functional/com/mongodb/DatabaseTestCase.java b/driver-legacy/src/test/functional/com/mongodb/DatabaseTestCase.java
new file mode 100644
index 00000000000..afc4f480869
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/DatabaseTestCase.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import org.junit.After;
+import org.junit.Before;
+
+import static com.mongodb.Fixture.getDefaultDatabaseName;
+import static com.mongodb.Fixture.getMongoClient;
+import static com.mongodb.Fixture.getServerSessionPoolInUseCount;
+
+public class DatabaseTestCase {
+    //For ease of use and readability, in this specific case we'll allow protected variables
+    //CHECKSTYLE:OFF
+    protected DB database;
+    protected DBCollection collection;
+    protected String collectionName;
+    //CHECKSTYLE:ON
+
+    @Before
+    @SuppressWarnings("deprecation") // This is for testing the old API, so it will use deprecated methods
+    public void setUp() {
+        database = getMongoClient().getDB(getDefaultDatabaseName());
+
+        //create a brand new collection for each test
+        collectionName = getClass().getName() + System.nanoTime();
+        collection = database.getCollection(collectionName);
+    }
+
+    @After
+    public void tearDown() {
+        collection.drop();
+
+        if (getServerSessionPoolInUseCount() != 0) {
+            throw new IllegalStateException("Server session in use count is " + getServerSessionPoolInUseCount());
+        }
+    }
+
+    public MongoClient getClient() {
+        return getMongoClient();
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/DefaultDBDecoderTest.java b/driver-legacy/src/test/functional/com/mongodb/DefaultDBDecoderTest.java
similarity index 97%
rename from driver/src/test/functional/com/mongodb/DefaultDBDecoderTest.java
rename to driver-legacy/src/test/functional/com/mongodb/DefaultDBDecoderTest.java
index 3751af00718..b42b09109dc 100644
--- a/driver/src/test/functional/com/mongodb/DefaultDBDecoderTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/DefaultDBDecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/test/functional/com/mongodb/ExplicitUuidCodecUuidRepresentationTest.java b/driver-legacy/src/test/functional/com/mongodb/ExplicitUuidCodecUuidRepresentationTest.java
new file mode 100644
index 00000000000..2c9b5a7e56f
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/ExplicitUuidCodecUuidRepresentationTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.AbstractExplicitUuidCodecUuidRepresentationTest;
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonBinarySubType;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.UuidCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.junit.After;
+
+import java.util.UUID;
+
+public class ExplicitUuidCodecUuidRepresentationTest extends AbstractExplicitUuidCodecUuidRepresentationTest {
+    private MongoClient mongoClient;
+
+    public ExplicitUuidCodecUuidRepresentationTest(final UuidRepresentation uuidRepresentationForClient,
+                                                   final UuidRepresentation uuidRepresentationForExplicitEncoding,
+                                                   final BsonBinarySubType subType,
+                                                   final UuidCodec uuidCodec, final UUID uuid, final byte[] encodedValue,
+                                                   final byte[] standardEncodedValue) {
+        super(uuidRepresentationForClient, uuidRepresentationForExplicitEncoding, subType, uuidCodec, uuid, encodedValue,
+                standardEncodedValue);
+    }
+
+    @Override
+    protected void createMongoClient(final UuidRepresentation uuidRepresentation, final CodecRegistry codecRegistry) {
+        mongoClient = new com.mongodb.MongoClient(Fixture.getMongoClientURI(MongoClientOptions.builder(Fixture.getOptions())
+                .uuidRepresentation(uuidRepresentation)
+                .codecRegistry(codecRegistry)));
+    }
+
+    @Override
+    protected MongoDatabase getDatabase(final String databaseName) {
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/Fixture.java b/driver-legacy/src/test/functional/com/mongodb/Fixture.java
new file mode 100644
index 00000000000..28c7d8cc9f1
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/Fixture.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.connection.ServerDescription;
+
+import java.util.List;
+
+/**
+ * Helper class for the acceptance tests.
+ */
+public final class Fixture {
+    private static final String DEFAULT_DATABASE_NAME = "JavaDriverTest";
+
+    private static MongoClient mongoClient;
+    private static MongoClientURI mongoClientURI;
+    private static DB defaultDatabase;
+
+    private Fixture() {
+    }
+
+    public static synchronized com.mongodb.MongoClient getMongoClient() {
+        if (mongoClient == null) {
+            MongoClientURI mongoURI = getMongoClientURI();
+            mongoClient = new MongoClient(mongoURI);
+            Runtime.getRuntime().addShutdownHook(new ShutdownHook());
+        }
+        return mongoClient;
+    }
+
+    public static synchronized com.mongodb.MongoClient getLegacyMongoClient() {
+        if (mongoClient == null) {
+            MongoClientURI mongoURI = getMongoClientURI();
+            mongoClient = new MongoClient(mongoURI);
+            Runtime.getRuntime().addShutdownHook(new ShutdownHook());
+        }
+        return mongoClient;
+    }
+
+    public static int getServerSessionPoolInUseCount() {
+        return getMongoClient().getServerSessionPool().getInUseCount();
+    }
+
+    @SuppressWarnings("deprecation") // This is for access to the old API, so it will use deprecated methods
+    public static synchronized DB getDefaultDatabase() {
+        if (defaultDatabase == null) {
+            defaultDatabase = getMongoClient().getDB(getDefaultDatabaseName());
+        }
+        return defaultDatabase;
+    }
+
+    public static String getDefaultDatabaseName() {
+        return DEFAULT_DATABASE_NAME;
+    }
+
+    static class ShutdownHook extends Thread {
+        @Override
+        public void run() {
+            synchronized (Fixture.class) {
+                if (mongoClient != null) {
+                    if (defaultDatabase != null) {
+                        defaultDatabase.dropDatabase();
+                    }
+                    mongoClient.close();
+                    mongoClient = null;
+                }
+            }
+        }
+    }
+
+    public static synchronized String getMongoClientURIString() {
+        return ClusterFixture.getConnectionString().getConnectionString();
+    }
+
+    public static synchronized MongoClientURI getMongoClientURI() {
+        if (mongoClientURI == null) {
+            mongoClientURI = getMongoClientURI(MongoClientOptions.builder());
+        }
+        return mongoClientURI;
+    }
+
+    public static synchronized MongoClientURI getMongoClientURI(final MongoClientOptions.Builder builder) {
+        MongoClientURI mongoClientURI = null;
+        String mongoURIString = getMongoClientURIString();
+        if (System.getProperty("java.version").startsWith("1.6.")) {
+            builder.sslInvalidHostNameAllowed(true);
+        }
+
+        mongoClientURI = new MongoClientURI(mongoURIString, builder);
+        return mongoClientURI;
+    }
+
+    public static MongoClientOptions getOptions() {
+        return getMongoClientURI().getOptions();
+    }
+
+    @SuppressWarnings("deprecation")
+    public static ServerAddress getPrimary() throws InterruptedException {
+        getMongoClient();
+        List<ServerDescription> serverDescriptions = mongoClient.getCluster().getDescription().getPrimaries();
+        while (serverDescriptions.isEmpty()) {
+            Thread.sleep(100);
+            serverDescriptions = mongoClient.getCluster().getDescription().getPrimaries();
+        }
+        return serverDescriptions.get(0).getAddress();
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/FunctionalSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/FunctionalSpecification.groovy
new file mode 100644
index 00000000000..f44233355af
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/FunctionalSpecification.groovy
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import spock.lang.Specification
+
+import static com.mongodb.Fixture.getDefaultDatabaseName
+import static com.mongodb.Fixture.getMongoClient
+import static com.mongodb.Fixture.getServerSessionPoolInUseCount
+
+class FunctionalSpecification extends Specification {
+    protected DB database;
+    protected DBCollection collection;
+
+    def setup() {
+        database = getMongoClient().getDB(getDefaultDatabaseName())
+        collection = database.getCollection(getClass().getName())
+        collection.drop();
+    }
+
+    def cleanup() {
+        if (collection != null) {
+            collection.drop()
+        }
+        if (getServerSessionPoolInUseCount() != 0) {
+            throw new IllegalStateException('Server session in use count is ' + getServerSessionPoolInUseCount());
+        }
+    }
+
+    String getDatabaseName() {
+        getDefaultDatabaseName()
+    }
+
+    String getCollectionName() {
+        collection.getName()
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/MapReduceOutputSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/MapReduceOutputSpecification.groovy
similarity index 99%
rename from driver/src/test/functional/com/mongodb/MapReduceOutputSpecification.groovy
rename to driver-legacy/src/test/functional/com/mongodb/MapReduceOutputSpecification.groovy
index 16770174ebe..fac6538c45b 100644
--- a/driver/src/test/functional/com/mongodb/MapReduceOutputSpecification.groovy
+++ b/driver-legacy/src/test/functional/com/mongodb/MapReduceOutputSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/functional/com/mongodb/MapReduceTest.java b/driver-legacy/src/test/functional/com/mongodb/MapReduceTest.java
similarity index 93%
rename from driver/src/test/functional/com/mongodb/MapReduceTest.java
rename to driver-legacy/src/test/functional/com/mongodb/MapReduceTest.java
index de42decaf31..bb5b18bd8d2 100644
--- a/driver/src/test/functional/com/mongodb/MapReduceTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/MapReduceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,11 +27,11 @@
 
 import static com.mongodb.ClusterFixture.disableMaxTimeFailPoint;
 import static com.mongodb.ClusterFixture.enableMaxTimeFailPoint;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.DBObjectMatchers.hasFields;
 import static com.mongodb.DBObjectMatchers.hasSubdocument;
-import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.everyItem;
@@ -45,7 +45,9 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
 
 public class MapReduceTest extends DatabaseTestCase {
 
@@ -86,7 +88,6 @@ public void testMapReduceInline() {
     @Test(expected = MongoExecutionTimeoutException.class)
     public void testMapReduceExecutionTimeout() {
         assumeThat(isSharded(), is(false));
-        assumeThat(serverVersionAtLeast(asList(2, 6, 0)), is(true));
         enableMaxTimeFailPoint();
         try {
             MapReduceCommand command = new MapReduceCommand(collection,
@@ -102,6 +103,22 @@ public void testMapReduceExecutionTimeout() {
         }
     }
 
+    @Test
+    public void testWriteConcern() {
+        assumeThat(isDiscoverableReplicaSet(), is(true));
+        assumeTrue(serverVersionAtLeast(3, 4));
+        DBCollection collection = database.getCollection("testWriteConcernForMapReduce");
+        collection.insert(new BasicDBObject("x", new String[]{"a", "b"}).append("s", 1));
+        collection.setWriteConcern(new WriteConcern(5));
+        try {
+            String anotherCollectionName = "anotherCollection" + System.nanoTime();
+            collection.mapReduce(DEFAULT_MAP, DEFAULT_REDUCE, anotherCollectionName, null);
+            fail("Should have thrown");
+        } catch (WriteConcernException e) {
+            assertEquals(100, e.getCode());
+        }
+    }
+
     @Test
     public void testMapReduce() {
         MapReduceOutput output = collection.mapReduce(DEFAULT_MAP,
@@ -136,7 +153,7 @@ public void testMapReduceWithOutputToAnotherDatabase() {
         MapReduceOutput output = collection.mapReduce(command);
 
 
-        DB db = database.getMongo().getDB(MR_DATABASE);
+        DB db = database.getMongoClient().getDB(MR_DATABASE);
         assertTrue(db.collectionExists(DEFAULT_COLLECTION));
         assertEquals(toList(output.results()), toList(db.getCollection(DEFAULT_COLLECTION).find()));
     }
diff --git a/driver-legacy/src/test/functional/com/mongodb/MongoClientListenerRegistrationSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/MongoClientListenerRegistrationSpecification.groovy
new file mode 100644
index 00000000000..f5df5cc4d09
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/MongoClientListenerRegistrationSpecification.groovy
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.event.ClusterListener
+import com.mongodb.event.CommandListener
+import com.mongodb.event.ConnectionPoolListener
+import com.mongodb.event.ServerListener
+import com.mongodb.event.ServerMonitorListener
+import org.bson.Document
+
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+import static Fixture.mongoClientURI
+
+class MongoClientListenerRegistrationSpecification extends FunctionalSpecification {
+
+    def 'should register event listeners'() {
+        given:
+        def clusterListener = Mock(ClusterListener) {
+            (1.._) * _
+        }
+        def commandListener = Mock(CommandListener) {
+            (1.._) * _
+        }
+        def connectionPoolListener = Mock(ConnectionPoolListener) {
+            (1.._) * _
+        }
+        def serverListener = Mock(ServerListener) {
+            (1.._) * _
+        }
+        def serverMonitorListener = Mock(ServerMonitorListener) {
+            (1.._) * _
+        }
+
+        when:
+        def optionBuilder = MongoClientOptions.builder(mongoClientURI.options)
+                .addClusterListener(clusterListener)
+                .addCommandListener(commandListener)
+                .addConnectionPoolListener(connectionPoolListener)
+                .addServerListener(serverListener)
+                .addServerMonitorListener(serverMonitorListener)
+        def client = new MongoClient(getMongoClientURI(optionBuilder))
+
+        then:
+        client.getDatabase('admin').runCommand(new Document('ping', 1))
+    }
+
+    def 'should register single command listener'() {
+        given:
+        def first = Mock(CommandListener)
+        def optionsBuilder = MongoClientOptions.builder(mongoClientURI.options)
+                .addCommandListener(first)
+        def client = new MongoClient(getMongoClientURI(optionsBuilder))
+
+        when:
+        client.getDatabase('admin').runCommand(new Document('ping', 1))
+
+        then:
+        1 * first.commandStarted(_)
+        1 * first.commandSucceeded(_)
+    }
+
+    def 'should register multiple command listeners'() {
+        given:
+        def first = Mock(CommandListener)
+        def second = Mock(CommandListener)
+        def optionsBuilder = MongoClientOptions.builder(mongoClientURI.options)
+                .addCommandListener(first)
+                .addCommandListener(second)
+        def client = new MongoClient(getMongoClientURI(optionsBuilder));
+
+        when:
+        client.getDatabase('admin').runCommand(new Document('ping', 1))
+
+        then:
+        1 * first.commandStarted(_)
+        1 * second.commandStarted(_)
+        1 * first.commandSucceeded(_)
+        1 * second.commandSucceeded(_)
+    }
+
+    def 'should register single listeners for monitor events'() {
+        given:
+        def latch = new CountDownLatch(1)
+        def clusterListener = Mock(ClusterListener) {
+           1 * clusterOpening(_)
+        }
+        def serverListener = Mock(ServerListener) {
+            (1.._) * serverOpening(_)
+        }
+        def serverMonitorListener = Mock(ServerMonitorListener){
+            (1.._) * serverHearbeatStarted(_) >> {
+                if (latch.count > 0) {
+                    latch.countDown()
+                }
+            }
+        }
+
+        def optionsBuilder = MongoClientOptions.builder(mongoClientURI.options)
+                .addClusterListener(clusterListener)
+                .addServerListener(serverListener)
+                .addServerMonitorListener(serverMonitorListener)
+        def client = new MongoClient(getMongoClientURI(optionsBuilder));
+
+        when:
+        def finished = latch.await(5, TimeUnit.SECONDS)
+
+        then:
+        finished
+
+        cleanup:
+        client?.close()
+    }
+
+    def 'should register multiple listeners for monitor events'() {
+        given:
+        def latch = new CountDownLatch(2)
+        def clusterListener = Mock(ClusterListener) {
+            1 * clusterOpening(_)
+        }
+        def serverListener = Mock(ServerListener) {
+            (1.._) * serverOpening(_)
+        }
+        def serverMonitorListener = Mock(ServerMonitorListener){
+            (1.._) * serverHearbeatStarted(_) >> {
+                if (latch.count > 0) {
+                    latch.countDown()
+                }
+            }
+        }
+        def clusterListenerTwo = Mock(ClusterListener) {
+            1 * clusterOpening(_)
+        }
+        def serverListenerTwo = Mock(ServerListener) {
+            (1.._) * serverOpening(_)
+        }
+        def serverMonitorListenerTwo = Mock(ServerMonitorListener){
+            (1.._) * serverHearbeatStarted(_) >> {
+                if (latch.count > 0) {
+                    latch.countDown()
+                }
+            }
+        }
+
+        def optionsBuilder = MongoClientOptions.builder(mongoClientURI.options)
+                .addClusterListener(clusterListener)
+                .addServerListener(serverListener)
+                .addServerMonitorListener(serverMonitorListener)
+                .addClusterListener(clusterListenerTwo)
+                .addServerListener(serverListenerTwo)
+                .addServerMonitorListener(serverMonitorListenerTwo)
+        def client = new MongoClient(getMongoClientURI(optionsBuilder));
+
+        when:
+        def finished = latch.await(5, TimeUnit.SECONDS)
+
+        then:
+        finished
+
+        cleanup:
+        client?.close()
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/MongoClientSessionSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/MongoClientSessionSpecification.groovy
new file mode 100644
index 00000000000..544b951a320
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/MongoClientSessionSpecification.groovy
@@ -0,0 +1,449 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import category.Slow
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.internal.connection.TestCommandListener
+import org.bson.BsonBinarySubType
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonTimestamp
+import org.bson.Document
+import org.junit.Assert
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+
+import java.util.concurrent.TimeUnit
+
+import static Fixture.getDefaultDatabaseName
+import static Fixture.getMongoClientURI
+import static com.mongodb.ClusterFixture.isAuthenticated
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.isStandalone
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.Fixture.getMongoClient
+import static com.mongodb.MongoCredential.createCredential
+
+class MongoClientSessionSpecification extends FunctionalSpecification {
+
+    def 'should throw IllegalArgumentException if options are null'() {
+        when:
+        getMongoClient().startSession(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 6) && !isStandalone() })
+    def 'should throw MongoClientException starting a session when sessions are not supported'() {
+        when:
+        getMongoClient().startSession()
+
+        then:
+        thrown(MongoClientException)
+
+        when:
+        getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        then:
+        thrown(MongoClientException)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should create session with correct defaults'() {
+        given:
+        def clientSession = getMongoClient().startSession()
+
+        expect:
+        clientSession.getOriginator() == getMongoClient()
+        clientSession.isCausallyConsistent()
+        clientSession.getOptions() == ClientSessionOptions.builder()
+                .defaultTransactionOptions(TransactionOptions.builder()
+                .readConcern(ReadConcern.DEFAULT)
+                .writeConcern(WriteConcern.ACKNOWLEDGED)
+                .readPreference(ReadPreference.primary())
+                .build())
+                .build()
+        clientSession.getClusterTime() == null
+        clientSession.getOperationTime() == null
+        clientSession.getServerSession() != null
+
+        cleanup:
+        clientSession?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 0) || isStandalone()  })
+    def 'should use mutated client properties for default transaction options'() {
+        given:
+        def originalWriteConcern = getMongoClient().getWriteConcern()
+        def originalReadPreference = getMongoClient().getReadPreference()
+        getMongoClient().setWriteConcern(WriteConcern.MAJORITY)
+        getMongoClient().setReadPreference(ReadPreference.secondary())
+
+        when:
+        def clientSession = getMongoClient().startSession()
+
+        then:
+        clientSession.getOptions().defaultTransactionOptions == TransactionOptions.builder()
+                .readConcern(ReadConcern.DEFAULT)
+                .writeConcern(WriteConcern.MAJORITY)
+                .readPreference(ReadPreference.secondary())
+                .build()
+
+        cleanup:
+        getMongoClient().setWriteConcern(originalWriteConcern)
+        getMongoClient().setReadPreference(originalReadPreference)
+        clientSession?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone()  })
+    def 'cluster time should advance'() {
+        given:
+        def firstOperationTime = new BsonTimestamp(42, 1)
+        def secondOperationTime = new BsonTimestamp(52, 1)
+        def thirdOperationTime = new BsonTimestamp(22, 1)
+        def firstClusterTime = new BsonDocument('clusterTime', firstOperationTime)
+        def secondClusterTime = new BsonDocument('clusterTime', secondOperationTime)
+        def olderClusterTime = new BsonDocument('clusterTime', thirdOperationTime)
+
+        when:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        then:
+        clientSession.getClusterTime() == null
+
+        when:
+        clientSession.advanceClusterTime(null)
+
+        then:
+        clientSession.getClusterTime() == null
+
+        when:
+        clientSession.advanceClusterTime(firstClusterTime)
+
+        then:
+        clientSession.getClusterTime() == firstClusterTime
+
+        when:
+        clientSession.advanceClusterTime(secondClusterTime)
+
+        then:
+        clientSession.getClusterTime() == secondClusterTime
+
+        when:
+        clientSession.advanceClusterTime(olderClusterTime)
+
+        then:
+        clientSession.getClusterTime() == secondClusterTime
+
+        cleanup:
+        clientSession?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone()  })
+    def 'operation time should advance'() {
+        given:
+        def firstOperationTime = new BsonTimestamp(42, 1)
+        def secondOperationTime = new BsonTimestamp(52, 1)
+        def olderOperationTime = new BsonTimestamp(22, 1)
+
+        when:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        then:
+        clientSession.getOperationTime() == null
+
+        when:
+        clientSession.advanceOperationTime(null)
+
+        then:
+        clientSession.getOperationTime() == null
+
+        when:
+        clientSession.advanceOperationTime(firstOperationTime)
+
+        then:
+        clientSession.getOperationTime() == firstOperationTime
+
+        when:
+        clientSession.advanceOperationTime(secondOperationTime)
+
+        then:
+        clientSession.getOperationTime() == secondOperationTime
+
+        when:
+        clientSession.advanceOperationTime(olderOperationTime)
+
+        then:
+        clientSession.getOperationTime() == secondOperationTime
+
+        cleanup:
+        clientSession?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone()  })
+    def 'methods that use the session should throw if the session is closed'() {
+        given:
+        def options = ClientSessionOptions.builder().build()
+        def clientSession = getMongoClient().startSession(options)
+        clientSession.close()
+
+        when:
+        clientSession.getServerSession()
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        clientSession.advanceOperationTime(new BsonTimestamp(42, 0))
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        clientSession.advanceClusterTime(new BsonDocument())
+
+        then:
+        thrown(IllegalStateException)
+
+        cleanup:
+        clientSession?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone()  })
+    def 'informational methods should not throw if the session is closed'() {
+        given:
+        def options = ClientSessionOptions.builder().build()
+        def clientSession = getMongoClient().startSession(options)
+        clientSession.close()
+
+        when:
+        clientSession.getOptions()
+        clientSession.isCausallyConsistent()
+        clientSession.getClusterTime()
+        clientSession.getOperationTime()
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        clientSession?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone()  })
+    def 'should apply causally consistent session option to client session'() {
+        when:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder()
+                .causallyConsistent(causallyConsistent)
+                .build())
+
+        then:
+        clientSession != null
+        clientSession.isCausallyConsistent() == causallyConsistent
+
+        cleanup:
+        clientSession?.close()
+
+        where:
+        causallyConsistent << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone()  })
+    def 'client session should have server session with valid identifier'() {
+        given:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        when:
+        def identifier = clientSession.getServerSession().identifier
+
+        then:
+        identifier.size() == 1
+        identifier.containsKey('id')
+        identifier.get('id').isBinary()
+        identifier.getBinary('id').getType() == BsonBinarySubType.UUID_STANDARD.value
+        identifier.getBinary('id').data.length == 16
+
+        cleanup:
+        clientSession?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone()  })
+    def 'should use a default session'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def optionsBuilder = MongoClientOptions.builder()
+                .addCommandListener(commandListener)
+        def client = new MongoClient(getMongoClientURI(optionsBuilder))
+
+        when:
+        client.getDatabase('admin').runCommand(new BsonDocument('ping', new BsonInt32(1)))
+
+        then:
+        commandListener.events.size() == 2
+        def pingCommandStartedEvent = commandListener.events.get(0) as CommandStartedEvent
+        pingCommandStartedEvent.command.containsKey('lsid')
+
+        cleanup:
+        client?.close()
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 6) && !isStandalone() })
+    def 'should not use a default session when sessions are not supported'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def optionsBuilder = MongoClientOptions.builder()
+                .addCommandListener(commandListener)
+        def client = new MongoClient(getMongoClientURI(optionsBuilder))
+
+        when:
+        client.getDatabase('admin').runCommand(new BsonDocument('ping', new BsonInt32(1)))
+
+        then:
+        def pingCommandStartedEvent = commandListener.events.get(0)
+        !(pingCommandStartedEvent as CommandStartedEvent).command.containsKey('lsid')
+        cleanup:
+        client?.close()
+    }
+
+    // This test attempts attempts to demonstrate that causal consistency works correctly by inserting a document and then immediately
+    // searching for that document on a secondary by its _id and failing the test if the document is not found.  Without causal consistency
+    // enabled the expectation is that eventually that test would fail since generally the find will execute on the secondary before
+    // the secondary has a chance to replicate the document.
+    // This test is inherently racy as it's possible that the server _does_ replicate fast enough and therefore the test passes anyway
+    // even if causal consistency was not actually in effect.  For that reason the test iterates a number of times in order to increase
+    // confidence that it's really causal consistency that is causing the test to succeed
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    @Category(Slow)
+    def 'should find inserted document on a secondary when causal consistency is enabled'() {
+        given:
+        def collection = getMongoClient().getDatabase(getDefaultDatabaseName()).getCollection(getCollectionName())
+
+        expect:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder()
+                .causallyConsistent(true)
+                .build())
+        try {
+            for (int i = 0; i < 16; i++) {
+                Document document = new Document('_id', i);
+                collection.insertOne(clientSession, document)
+                Document foundDocument = collection
+                        .withReadPreference(ReadPreference.secondaryPreferred()) // read from secondary if available
+                        .withReadConcern(readConcern)
+                        .find(clientSession, document)
+                        .maxTime(30, TimeUnit.SECONDS)  // to avoid the test running forever in case replication is broken
+                        .first();
+                if (foundDocument == null) {
+                    Assert.fail('Should have found recently inserted document on secondary with causal consistency enabled');
+                }
+            }
+        } finally {
+            clientSession.close()
+        }
+
+        where:
+        readConcern << [ReadConcern.DEFAULT, ReadConcern.LOCAL, ReadConcern.MAJORITY]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || !isAuthenticated() })
+    @SuppressWarnings('deprecation')
+    def 'should not use a default session when there is more than one authenticated user'() {
+        given:
+        def sessionTestUserName = 'sessionTestUser'
+        def sessionTestPassword = 'sessionTestPassword'
+        getMongoClient().getDB('admin').addUser(sessionTestUserName, sessionTestPassword.toCharArray())
+
+        def commandListener = new TestCommandListener()
+        def optionsBuilder = MongoClientOptions.builder()
+                .addCommandListener(commandListener)
+        def mongoClientURI = getMongoClientURI(optionsBuilder)
+        def credentials = [mongoClientURI.getCredentials(),
+                           createCredential(sessionTestUserName, 'admin', sessionTestPassword.toCharArray())]
+        def client = new MongoClient(mongoClientURI.getHosts().collect { new ServerAddress(it) },
+                credentials, mongoClientURI.getOptions())
+
+        when:
+        client.getDatabase('admin').runCommand(new BsonDocument('ping', new BsonInt32(1)))
+
+        then:
+        def pingCommandStartedEvent = commandListener.events.get(0) as CommandStartedEvent
+        !pingCommandStartedEvent.command.containsKey('lsid')
+
+        cleanup:
+        getMongoClient().getDB('admin').removeUser(sessionTestUserName)
+        client?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def 'should not use an implicit session for an unacknowledged write'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def optionsBuilder = MongoClientOptions.builder()
+                .addCommandListener(commandListener)
+        def mongoClientURI = getMongoClientURI(optionsBuilder)
+        def client = new MongoClient(mongoClientURI)
+
+        when:
+        client.getDatabase(getDatabaseName()).getCollection(getCollectionName())
+                .withWriteConcern(WriteConcern.UNACKNOWLEDGED)
+                .insertOne(new Document())
+
+        then:
+        def insertEvent = commandListener.events.get(0) as CommandStartedEvent
+        !insertEvent.command.containsKey('lsid')
+
+        cleanup:
+        client?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should throw exception if unacknowledged write used with explicit session'() {
+        given:
+        def session = getMongoClient().startSession()
+
+        when:
+        getMongoClient().getDatabase(getDatabaseName()).getCollection(getCollectionName())
+                .withWriteConcern(WriteConcern.UNACKNOWLEDGED)
+                .insertOne(session, new Document())
+
+        then:
+        thrown(MongoClientException)
+
+        cleanup:
+        session?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 0) || !isDiscoverableReplicaSet() })
+    def 'should ignore unacknowledged write concern when in a transaction'() {
+        given:
+        def collection = getMongoClient().getDatabase(getDatabaseName()).getCollection(getCollectionName())
+        collection.insertOne(new Document())
+
+        def session = getMongoClient().startSession()
+        session.startTransaction()
+
+        when:
+        collection.withWriteConcern(WriteConcern.UNACKNOWLEDGED)
+                .insertOne(session, new Document())
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        session.close()
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/MongoClientsSpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/MongoClientsSpecification.groovy
new file mode 100644
index 00000000000..b432a4348aa
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/MongoClientsSpecification.groovy
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.connection.ClusterDescription
+import com.mongodb.connection.ServerDescription
+import com.mongodb.event.CommandFailedEvent
+import com.mongodb.event.CommandListener
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.event.CommandSucceededEvent
+import spock.lang.IgnoreIf
+
+import static Fixture.getDefaultDatabaseName
+import static Fixture.getMongoClientURI
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+
+class  MongoClientsSpecification extends FunctionalSpecification {
+
+    @IgnoreIf({ !isDiscoverableReplicaSet() })
+    def 'should use server selector from MongoClientOptions'() {
+        given:
+        def expectedWinningAddresses = [] as Set
+        def actualWinningAddresses = [] as Set
+        def optionsBuilder = MongoClientOptions.builder()
+        // select the suitable server with the highest port number
+                .serverSelector { ClusterDescription clusterDescription ->
+            def highestPortServer
+            for (ServerDescription cur : clusterDescription.getServerDescriptions()) {
+                if (highestPortServer == null || cur.address.port > highestPortServer.address.port) {
+                    highestPortServer = cur
+                }
+            }
+            if (highestPortServer == null) {
+                return []
+            }
+            expectedWinningAddresses.add(highestPortServer.address)
+            [highestPortServer]
+        }.addCommandListener(new CommandListener() {
+            // record each address actually used
+            @Override
+            void commandStarted(final CommandStartedEvent event) {
+                actualWinningAddresses.add(event.connectionDescription.connectionId.serverId.address)
+            }
+
+            @Override
+            void commandSucceeded(final CommandSucceededEvent event) {
+            }
+
+            @Override
+            void commandFailed(final CommandFailedEvent event) {
+            }
+        })
+
+        def client = new MongoClient(getMongoClientURI(optionsBuilder))
+        def collection = client.getDatabase(getDefaultDatabaseName()).getCollection(getCollectionName())
+                .withReadPreference(ReadPreference.nearest())
+
+        when:
+        for (int i = 0; i < 10; i++) {
+            collection.countDocuments()
+        }
+
+        then:
+        expectedWinningAddresses.containsAll(actualWinningAddresses)
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/MongoMethodsTest.java b/driver-legacy/src/test/functional/com/mongodb/MongoMethodsTest.java
similarity index 96%
rename from driver/src/test/functional/com/mongodb/MongoMethodsTest.java
rename to driver-legacy/src/test/functional/com/mongodb/MongoMethodsTest.java
index 986cb885ea4..8ea862b0bfa 100644
--- a/driver/src/test/functional/com/mongodb/MongoMethodsTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/MongoMethodsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
+@SuppressWarnings("deprecation")
 public class MongoMethodsTest extends DatabaseTestCase {
     @Test
     @SuppressWarnings("deprecation") // This is for testing the old API, so it will use deprecated methods
diff --git a/driver/src/test/functional/com/mongodb/QueryBuilderTest.java b/driver-legacy/src/test/functional/com/mongodb/QueryBuilderTest.java
similarity index 98%
rename from driver/src/test/functional/com/mongodb/QueryBuilderTest.java
rename to driver-legacy/src/test/functional/com/mongodb/QueryBuilderTest.java
index 20ca21261bb..357c85d0135 100644
--- a/driver/src/test/functional/com/mongodb/QueryBuilderTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/QueryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@
 import java.util.Arrays;
 import java.util.regex.Pattern;
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -324,10 +322,6 @@ public void shouldThrowExceptionIfInsufficientVerticesDefinedForPolygon() {
 
     @Test
     public void textTest() {
-        if (!serverVersionAtLeast(asList(2, 6, 0))) {
-            return;
-        }
-
         BasicDBObject enableTextCommand = new BasicDBObject("setParameter", 1).append("textSearchEnabled", true);
         database.getSisterDB("admin").command(enableTextCommand);
         DBCollection collection = database.getCollection("text-test");
diff --git a/driver/src/test/functional/com/mongodb/QueryTest.java b/driver-legacy/src/test/functional/com/mongodb/QueryTest.java
similarity index 97%
rename from driver/src/test/functional/com/mongodb/QueryTest.java
rename to driver-legacy/src/test/functional/com/mongodb/QueryTest.java
index 61291776921..c9b3a2ea3bf 100644
--- a/driver/src/test/functional/com/mongodb/QueryTest.java
+++ b/driver-legacy/src/test/functional/com/mongodb/QueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/test/functional/com/mongodb/UuidRepresentationTest.java b/driver-legacy/src/test/functional/com/mongodb/UuidRepresentationTest.java
new file mode 100644
index 00000000000..34135a2b624
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/UuidRepresentationTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import com.mongodb.client.AbstractUuidRepresentationTest;
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonBinarySubType;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.junit.After;
+
+import java.util.UUID;
+
+public class UuidRepresentationTest extends AbstractUuidRepresentationTest {
+
+    private MongoClient mongoClient;
+
+    public UuidRepresentationTest(final UuidRepresentation uuidRepresentation, final BsonBinarySubType subType,
+                                  final UUID uuid, final byte[] encodedValue, final byte[] standardEncodedValue) {
+        super(uuidRepresentation, subType, uuid, encodedValue, standardEncodedValue);
+    }
+
+
+    @Override
+    protected void createMongoClient(final UuidRepresentation uuidRepresentation, final CodecRegistry codecRegistry) {
+        mongoClient = new MongoClient(Fixture.getMongoClientURI(MongoClientOptions.builder(Fixture.getOptions())
+                .uuidRepresentation(uuidRepresentation)
+                .codecRegistry(codecRegistry)));
+    }
+
+    @Override
+    protected MongoDatabase getDatabase(final String databaseName) {
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/client/LegacyCrudTest.java b/driver-legacy/src/test/functional/com/mongodb/client/LegacyCrudTest.java
new file mode 100644
index 00000000000..b0751c1719a
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/client/LegacyCrudTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClientSettings;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/crud/tests
+@RunWith(Parameterized.class)
+public class LegacyCrudTest {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final String collectionName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private final TestCommandListener commandListener;
+    private MongoCollection<BsonDocument> collection;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoClient mongoClient;
+    private MongoDatabase database;
+    private JsonPoweredCrudTestHelper helper;
+
+    public LegacyCrudTest(final String filename, final String description, final String databaseName, final String collectionName,
+                          final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+        this.commandListener = new TestCommandListener();
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        assumeFalse(isSharded());
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+
+        collectionHelper.killAllSessions();
+        collectionHelper.create(collectionName, new CreateCollectionOptions(), WriteConcern.ACKNOWLEDGED);
+
+        MongoClientSettings settings = MongoClientSettings.builder(getMongoClientSettings())
+                .addCommandListener(commandListener)
+                .build();
+
+        mongoClient = MongoClients.create(settings);
+        database = mongoClient.getDatabase(databaseName);
+
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
+        if (!data.isEmpty()) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+
+            collectionHelper.drop();
+            if (documents.size() > 0) {
+                collectionHelper.insertDocuments(documents, WriteConcern.MAJORITY);
+            }
+        }
+        commandListener.reset();
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        BsonDocument expectedOutcome = definition.getDocument("outcome", null);
+        // check if v1 test
+        if (definition.containsKey("operation")) {
+            runOperation(expectedOutcome, definition.getDocument("operation"),
+                    expectedOutcome.containsKey("result") && expectedOutcome.isDocument("result")
+                            ? expectedOutcome.get("result") : null);
+        } else {  // v2 test
+            BsonArray operations = definition.getArray("operations");
+            for (BsonValue operation : operations) {
+                runOperation(expectedOutcome, operation.asDocument(),
+                        operation.asDocument().containsKey("result") ? operation.asDocument().get("result") : null);
+            }
+        }
+    }
+
+    private void runOperation(final BsonDocument expectedOutcome, final BsonDocument operation, final BsonValue expectedResult) {
+        BsonDocument outcome = null;
+        boolean wasException = false;
+        try {
+            outcome = helper.getOperationResults(operation);
+        } catch (Exception e) {
+            wasException = true;
+        }
+
+        if (operation.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+            assertEquals(operation.containsKey("error"), wasException);
+        }
+
+        if (expectedResult != null) {
+            // Hack to workaround the lack of upsertedCount
+            BsonValue actualResult = outcome.get("result");
+            if (actualResult.isDocument()
+                    && actualResult.asDocument().containsKey("upsertedCount")
+                    && actualResult.asDocument().getNumber("upsertedCount").intValue() == 0
+                    && !expectedResult.asDocument().containsKey("upsertedCount")) {
+                expectedResult.asDocument().append("upsertedCount", actualResult.asDocument().get("upsertedCount"));
+            }
+            // Hack to workaround the lack of insertedIds
+            removeIdList("insertedIds", expectedResult, actualResult);
+            removeIdList("upsertedIds", expectedResult, actualResult);
+
+            removeZeroCountField("deletedCount", expectedResult, actualResult);
+            removeZeroCountField("insertedCount", expectedResult, actualResult);
+
+            assertEquals(description, expectedResult, actualResult);
+        }
+        if (definition.containsKey("expectations")) {
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName, null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+
+            assertEventsEquality(expectedEvents, events.subList(0, expectedEvents.size()));
+        }
+        if (expectedOutcome != null && expectedOutcome.containsKey("collection")) {
+            assertCollectionEquals(expectedOutcome.getDocument("collection"));
+        }
+    }
+
+    private void removeZeroCountField(final String key, final BsonValue expectedResult, final BsonValue actualResult) {
+        if (actualResult.isDocument()
+                && actualResult.asDocument().containsKey(key)
+                && actualResult.asDocument().getNumber(key).intValue() == 0
+                && !expectedResult.asDocument().containsKey(key)) {
+            actualResult.asDocument().remove(key);
+        }
+    }
+
+    private void removeIdList(final String key, final BsonValue expectedResult, final BsonValue actualResult) {
+        if (expectedResult.isDocument() && !expectedResult.asDocument().containsKey(key)) {
+            actualResult.asDocument().remove(key);
+        }
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/crud")) {
+            BsonDocument testDocument = util.JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test: testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getString("collection_name", new BsonString("test")).getValue(),
+                        testDocument.getArray("data", new BsonArray()), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+    private void assertCollectionEquals(final BsonDocument expectedCollection) {
+        MongoCollection<BsonDocument> collectionToCompare = collection;
+        if (expectedCollection.containsKey("name")) {
+            collectionToCompare = database.getCollection(expectedCollection.getString("name").getValue(), BsonDocument.class);
+        }
+        assertEquals(description, expectedCollection.getArray("data"), collectionToCompare.find().into(new BsonArray()));
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/client/LegacyDatabaseTestCase.java b/driver-legacy/src/test/functional/com/mongodb/client/LegacyDatabaseTestCase.java
new file mode 100644
index 00000000000..69b730a4e56
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/client/LegacyDatabaseTestCase.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoClient;
+import com.mongodb.MongoNamespace;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.internal.connection.ServerHelper;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWrapper;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+
+import static com.mongodb.Fixture.getDefaultDatabaseName;
+import static com.mongodb.Fixture.getMongoClient;
+import static com.mongodb.Fixture.getPrimary;
+import static com.mongodb.Fixture.getServerSessionPoolInUseCount;
+
+public class LegacyDatabaseTestCase {
+    //For ease of use and readability, in this specific case we'll allow protected variables
+    //CHECKSTYLE:OFF
+    protected MongoClient client;
+    protected MongoDatabase database;
+    protected MongoCollection<Document> collection;
+    //CHECKSTYLE:ON
+
+    @Before
+    public void setUp() {
+        client =  getMongoClient();
+        database = client.getDatabase(getDefaultDatabaseName());
+        collection = database.getCollection(getClass().getName());
+        collection.drop();
+    }
+
+    @After
+    public void tearDown() {
+        if (collection != null) {
+            collection.drop();
+        }
+        try {
+            ServerHelper.checkPool(getPrimary());
+        } catch (InterruptedException e) {
+            // ignore
+        }
+
+        if (getServerSessionPoolInUseCount() != 0) {
+            throw new IllegalStateException("Server session in use count is " + getServerSessionPoolInUseCount());
+        }
+    }
+
+    protected String getDatabaseName() {
+        return database.getName();
+    }
+
+    protected String getCollectionName() {
+        return collection.getNamespace().getCollectionName();
+    }
+
+    protected MongoNamespace getNamespace() {
+        return collection.getNamespace();
+    }
+
+    protected CollectionHelper<Document> getCollectionHelper() {
+        return new CollectionHelper<Document>(new DocumentCodec(), getNamespace());
+    }
+
+    protected BsonDocument wrap(final Document document) {
+        return new BsonDocumentWrapper<Document>(document, new DocumentCodec());
+    }
+}
diff --git a/driver-legacy/src/test/functional/com/mongodb/client/jndi/MongoClientFactorySpecification.groovy b/driver-legacy/src/test/functional/com/mongodb/client/jndi/MongoClientFactorySpecification.groovy
new file mode 100644
index 00000000000..4a39ed7d246
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/client/jndi/MongoClientFactorySpecification.groovy
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.jndi
+
+import com.mongodb.Fixture
+import com.mongodb.FunctionalSpecification
+import com.mongodb.MongoClient
+import com.mongodb.MongoException
+
+import javax.naming.Reference
+import javax.naming.StringRefAddr
+
+class MongoClientFactorySpecification extends FunctionalSpecification {
+    def mongoClientFactory = new MongoClientFactory()
+
+    def 'should create MongoClient from environment'() {
+        given:
+        def environment = new Hashtable<String, String>()
+        environment.put('connectionString', Fixture.getMongoClientURIString())
+
+        when:
+        MongoClient client = mongoClientFactory.getObjectInstance(null, null, null, environment)
+
+        then:
+        client != null
+
+        cleanup:
+        client?.close()
+    }
+
+    def 'should create MongoClient from obj that is of type Reference'() {
+        given:
+        def environment = new Hashtable<String, String>()
+        def reference = new Reference(null, new StringRefAddr('connectionString', Fixture.getMongoClientURIString()))
+
+        when:
+        MongoClient client = mongoClientFactory.getObjectInstance(reference, null, null, environment)
+
+        then:
+        client != null
+
+        cleanup:
+        client?.close()
+    }
+
+    def 'should throw if no connection string is provided'() {
+        given:
+        def environment = new Hashtable<String, String>()
+
+        when:
+        mongoClientFactory.getObjectInstance(null, null, null, environment)
+
+        then:
+        thrown(MongoException)
+    }
+}
+
diff --git a/driver-legacy/src/test/functional/com/mongodb/gridfs/GridFSTest.java b/driver-legacy/src/test/functional/com/mongodb/gridfs/GridFSTest.java
new file mode 100644
index 00000000000..283d99e39e1
--- /dev/null
+++ b/driver-legacy/src/test/functional/com/mongodb/gridfs/GridFSTest.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.gridfs;
+
+import category.Slow;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import com.mongodb.DatabaseTestCase;
+import com.mongodb.MongoException;
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.Scanner;
+
+import static java.nio.charset.Charset.defaultCharset;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class GridFSTest extends DatabaseTestCase {
+    private GridFS gridFS;
+
+    @Before
+    public void setUp() {
+        super.setUp();
+        gridFS = new GridFS(database);
+    }
+
+    @Test
+    public void testSmall() throws Exception {
+        testInOut("this is a simple test");
+    }
+
+    @Test
+    public void testBig() throws Exception {
+        int target = GridFS.DEFAULT_CHUNKSIZE * 3;
+        StringBuilder buf = new StringBuilder(target);
+        while (buf.length() < target) {
+            buf.append("asdasdkjasldkjasldjlasjdlajsdljasldjlasjdlkasjdlaskjdlaskjdlsakjdlaskjdasldjsad");
+        }
+        String s = buf.toString();
+        testInOut(s);
+    }
+
+    void testOutStream(final String s) throws Exception {
+
+        int[] start = getCurrentCollectionCounts();
+
+        GridFSInputFile in = gridFS.createFile();
+        OutputStream writeStream = in.getOutputStream();
+        writeStream.write(s.getBytes(defaultCharset()), 0, s.length());
+        writeStream.close();
+        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
+        assert (out.getId().equals(in.getId()));
+        assert (out.getChunkSize() == (long) GridFS.DEFAULT_CHUNKSIZE);
+
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        out.writeTo(bout);
+        String outString = new String(bout.toByteArray(), defaultCharset());
+        assert (outString.equals(s));
+
+        out.remove();
+        int[] end = getCurrentCollectionCounts();
+        assertEquals(start[0], end[0]);
+        assertEquals(start[1], end[1]);
+    }
+
+    @Test
+    public void testOutStreamSmall() throws Exception {
+        testOutStream("this is a simple test");
+    }
+
+    @Test
+    public void testOutStreamBig() throws Exception {
+        int target = (int) (GridFS.DEFAULT_CHUNKSIZE * 3.5);
+        StringBuilder buf = new StringBuilder(target);
+        while (buf.length() < target) {
+            buf.append("asdasdkjasldkjasldjlasjdlajsdljasldjlasjdlkasjdlaskjdlaskjdlsakjdlaskjdasldjsad");
+        }
+        String s = buf.toString();
+        testOutStream(s);
+    }
+
+    @Test
+    public void testOutStreamBigAligned() throws Exception {
+        int target = (GridFS.DEFAULT_CHUNKSIZE * 4);
+        StringBuilder buf = new StringBuilder(target);
+        while (buf.length() < target) {
+            buf.append("a");
+        }
+        String s = buf.toString();
+        testOutStream(s);
+    }
+
+    @Test
+    public void testCreateFileWithFile() throws Exception {
+        URI fileURI = GridFSTest.class.getResource("/GridFSLegacy/GridFSTestFile.txt").toURI();
+        GridFSInputFile in = gridFS.createFile(new File(fileURI));
+        in.save();
+
+        String expectedString = new Scanner(new File(fileURI)).useDelimiter("\\Z").next();
+
+        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        out.writeTo(bout);
+        String outString = new String(bout.toByteArray(), defaultCharset()).trim();
+
+        assertEquals(expectedString, outString);
+    }
+
+    @Test
+    public void testMetadata() throws Exception {
+
+        GridFSInputFile in = gridFS.createFile("foo".getBytes(defaultCharset()));
+        in.put("meta", 5);
+        in.save();
+        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
+        assertTrue(out.get("meta").equals(5));
+    }
+
+    @Test
+    public void testFind() throws Exception {
+
+        GridFSInputFile in = gridFS.createFile(new ByteArrayInputStream("foo".getBytes(defaultCharset())), "testFind");
+        in.save();
+        assertNotNull(gridFS.find((ObjectId) in.getId()));
+        assertNotNull(gridFS.findOne((ObjectId) in.getId()));
+        assertNotNull(gridFS.findOne("testFind"));
+        assertNotNull(gridFS.findOne(new BasicDBObject("_id", in.getId())));
+    }
+
+    @Test
+    public void testBadChunkSize() throws Exception {
+        byte[] randomBytes = new byte[256];
+        GridFSInputFile inputFile = gridFS.createFile(randomBytes);
+        inputFile.setFilename("bad_chunk_size.bin");
+        try {
+            inputFile.save(0);
+            fail("should have received an exception about a chunk size being zero");
+        } catch (MongoException e) {
+            //We expect this exception to complain about the chunksize
+            assertTrue(e.toString().contains("chunkSize must be greater than zero"));
+        }
+    }
+
+    @Test
+    @Category(Slow.class)
+    public void testMultipleChunks() throws Exception {
+        int fileSize = 1024 * 128;
+        byte[] randomBytes = new byte[fileSize];
+        for (int idx = 0; idx < fileSize; ++idx) {
+            randomBytes[idx] = (byte) (256 * Math.random());
+        }
+
+        GridFSInputFile inputFile = gridFS.createFile(randomBytes);
+        inputFile.setFilename("bad_chunk_size.bin");
+
+        //For good measure let's save and restore the bytes
+        inputFile.save(1024);
+        GridFSDBFile savedFile = gridFS.findOne(new BasicDBObject("_id", inputFile.getId()));
+        ByteArrayOutputStream savedFileByteStream = new ByteArrayOutputStream();
+        savedFile.writeTo(savedFileByteStream);
+        byte[] savedFileBytes = savedFileByteStream.toByteArray();
+
+        assertArrayEquals(randomBytes, savedFileBytes);
+    }
+
+    @Test
+    @Category(Slow.class)
+    public void getBigChunkSize() throws Exception {
+        GridFSInputFile file = gridFS.createFile("512kb_bucket");
+        file.setChunkSize(file.getChunkSize() * 2);
+        OutputStream os = file.getOutputStream();
+        for (int i = 0; i < 1024; i++) {
+            os.write(new byte[GridFS.DEFAULT_CHUNKSIZE / 1024 + 1]);
+        }
+        os.close();
+    }
+
+
+    @Test
+    public void testInputStreamSkipping() throws Exception {
+        //int chunkSize = 5;
+        int chunkSize = GridFS.DEFAULT_CHUNKSIZE;
+        int fileSize = (int) (7.25 * chunkSize);
+
+        byte[] fileBytes = new byte[fileSize];
+        for (int idx = 0; idx < fileSize; ++idx) {
+            fileBytes[idx] = (byte) (idx % 251);
+        }
+        //Don't want chunks to be aligned at byte position 0
+
+        GridFSInputFile inputFile = gridFS.createFile(fileBytes);
+        inputFile.setFilename("input_stream_skipping.bin");
+        inputFile.save(chunkSize);
+
+        GridFSDBFile savedFile = gridFS.findOne(new BasicDBObject("_id", inputFile.getId()));
+        InputStream inputStream = savedFile.getInputStream();
+
+        //Quick run-through, make sure the file is as expected
+        for (int idx = 0; idx < fileSize; ++idx) {
+            assertEquals((byte) (idx % 251), (byte) inputStream.read());
+        }
+
+        inputStream = savedFile.getInputStream();
+
+        long skipped = inputStream.skip(1);
+        assertEquals(1, skipped);
+        int position = 1;
+        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
+
+        skipped = inputStream.skip(chunkSize);
+        assertEquals(chunkSize, skipped);
+        position += chunkSize;
+        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
+
+        skipped = inputStream.skip(-1);
+        assertEquals(0, skipped);
+        skipped = inputStream.skip(0);
+        assertEquals(0, skipped);
+
+        skipped = inputStream.skip(3 * chunkSize);
+        assertEquals(3 * chunkSize, skipped);
+        position += 3 * chunkSize;
+        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
+
+        //Make sure skipping works when we skip to an exact chunk boundary
+        long toSkip = inputStream.available();
+        skipped = inputStream.skip(toSkip);
+        assertEquals(toSkip, skipped);
+        position += toSkip;
+        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
+
+        skipped = inputStream.skip(2 * fileSize);
+        assertEquals(fileSize - position, skipped);
+        assertEquals(-1, inputStream.read());
+    }
+
+    @Test
+    public void testCustomFileID() throws IOException {
+        // given
+        int id = 1;
+        gridFS.remove(new BasicDBObject("_id", id));
+
+        int chunkSize = 10;
+        int fileSize = (int) (3.25 * chunkSize);
+
+        byte[] fileBytes = new byte[fileSize];
+        for (int idx = 0; idx < fileSize; ++idx) {
+            fileBytes[idx] = (byte) (idx % 251);
+        }
+
+        // when
+        GridFSInputFile inputFile = gridFS.createFile(fileBytes);
+        inputFile.setId(id);
+        inputFile.setFilename("custom_file_id.bin");
+        inputFile.save(chunkSize);
+        assertEquals(id, inputFile.getId());
+
+        // then
+        GridFSDBFile savedFile = gridFS.findOne(new BasicDBObject("_id", id));
+        InputStream inputStream = savedFile.getInputStream();
+
+        for (int idx = 0; idx < fileSize; ++idx) {
+            assertEquals((byte) (idx % 251), (byte) inputStream.read());
+        }
+
+        // finally
+        gridFS.remove(new BasicDBObject("_id", id));
+    }
+
+    void testInOut(final String s) throws Exception {
+
+        int[] start = getCurrentCollectionCounts();
+
+        GridFSInputFile in = gridFS.createFile(s.getBytes(defaultCharset()));
+        in.save();
+        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
+        assert (out.getId().equals(in.getId()));
+        assert (out.getChunkSize() == (long) GridFS.DEFAULT_CHUNKSIZE);
+
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        out.writeTo(bout);
+        String outString = new String(bout.toByteArray(), defaultCharset());
+        assert (outString.equals(s));
+
+        out.remove();
+        int[] end = getCurrentCollectionCounts();
+        assertEquals(start[0], end[0]);
+        assertEquals(start[1], end[1]);
+    }
+
+    int[] getCurrentCollectionCounts() {
+        int[] i = new int[2];
+        i[0] = gridFS.getFilesCollection().find().count();
+        i[1] = gridFS.getChunksCollection().find().count();
+        return i;
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveWhenObjectIdIsNull() {
+        ObjectId objectId = null;
+        gridFS.remove(objectId);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveWhenFileNameIsNull() {
+        String fileName = null;
+        gridFS.remove(fileName);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveWhenQueryIsNull() {
+        DBObject dbObjectQuery = null;
+        gridFS.remove(dbObjectQuery);
+    }
+}
diff --git a/driver/src/test/resources/GridFSLegacy/GridFSTestFile.txt b/driver-legacy/src/test/resources/GridFSLegacy/GridFSTestFile.txt
similarity index 100%
rename from driver/src/test/resources/GridFSLegacy/GridFSTestFile.txt
rename to driver-legacy/src/test/resources/GridFSLegacy/GridFSTestFile.txt
diff --git a/driver/src/test/unit/com/mongodb/AggregationOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/AggregationOptionsSpecification.groovy
similarity index 97%
rename from driver/src/test/unit/com/mongodb/AggregationOptionsSpecification.groovy
rename to driver-legacy/src/test/unit/com/mongodb/AggregationOptionsSpecification.groovy
index 639192ef015..4f0fc665674 100644
--- a/driver/src/test/unit/com/mongodb/AggregationOptionsSpecification.groovy
+++ b/driver-legacy/src/test/unit/com/mongodb/AggregationOptionsSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/test/unit/com/mongodb/ClientSessionOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/ClientSessionOptionsSpecification.groovy
new file mode 100644
index 00000000000..d48199f7b12
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/ClientSessionOptionsSpecification.groovy
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import spock.lang.Specification
+
+class ClientSessionOptionsSpecification extends Specification {
+
+    def 'should have correct defaults'() {
+        when:
+        def options = ClientSessionOptions.builder().build()
+
+        then:
+        options.isCausallyConsistent() == null
+        options.defaultTransactionOptions == TransactionOptions.builder().build()
+    }
+
+    def 'should apply options set in builder'() {
+        when:
+        def options = ClientSessionOptions.builder()
+                .causallyConsistent(causallyConsistent)
+                .defaultTransactionOptions(transactionOptions)
+                .build()
+
+        then:
+        options.isCausallyConsistent() == causallyConsistent
+        options.defaultTransactionOptions == transactionOptions
+
+        where:
+        causallyConsistent << [true, false]
+        transactionOptions << [TransactionOptions.builder().build(), TransactionOptions.builder().readConcern(ReadConcern.LOCAL).build()]
+    }
+
+    def 'should apply options to builder'() {
+        expect:
+        ClientSessionOptions.builder(baseOptions).build() == baseOptions
+
+        where:
+        baseOptions << [ClientSessionOptions.builder().build(),
+                        ClientSessionOptions.builder()
+                                .causallyConsistent(true)
+                                .defaultTransactionOptions(TransactionOptions.builder()
+                                .writeConcern(WriteConcern.MAJORITY)
+                                .readConcern(ReadConcern
+                                .MAJORITY).build())
+                                .build()]
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/CommandResultTest.java b/driver-legacy/src/test/unit/com/mongodb/CommandResultTest.java
similarity index 98%
rename from driver/src/test/unit/com/mongodb/CommandResultTest.java
rename to driver-legacy/src/test/unit/com/mongodb/CommandResultTest.java
index 52c2377ab20..2a8326f9a94 100644
--- a/driver/src/test/unit/com/mongodb/CommandResultTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/CommandResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/com/mongodb/DBAddressTest.java b/driver-legacy/src/test/unit/com/mongodb/DBAddressTest.java
similarity index 98%
rename from driver/src/test/unit/com/mongodb/DBAddressTest.java
rename to driver-legacy/src/test/unit/com/mongodb/DBAddressTest.java
index a605a3b5c40..2f3be31755f 100644
--- a/driver/src/test/unit/com/mongodb/DBAddressTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/DBAddressTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/com/mongodb/DBCollectionObjectFactoryTest.java b/driver-legacy/src/test/unit/com/mongodb/DBCollectionObjectFactoryTest.java
similarity index 98%
rename from driver/src/test/unit/com/mongodb/DBCollectionObjectFactoryTest.java
rename to driver-legacy/src/test/unit/com/mongodb/DBCollectionObjectFactoryTest.java
index c2c761280bf..c41eb349f7a 100644
--- a/driver/src/test/unit/com/mongodb/DBCollectionObjectFactoryTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/DBCollectionObjectFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertThat;
 
+@SuppressWarnings("deprecation")
 public class DBCollectionObjectFactoryTest {
 
     private DBCollectionObjectFactory factory;
diff --git a/driver-legacy/src/test/unit/com/mongodb/DBCursorSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/DBCursorSpecification.groovy
new file mode 100644
index 00000000000..3cf154842df
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/DBCursorSpecification.groovy
@@ -0,0 +1,367 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.DBCollectionFindOptions
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.CountOperation
+import com.mongodb.operation.FindOperation
+import org.bson.BsonDocument
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static Fixture.getMongoClient
+import static spock.util.matcher.HamcrestSupport.expect
+
+
+class DBCursorSpecification extends Specification {
+
+    def 'should get and set read preference'() {
+        when:
+        def collection = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([])).getCollection('test')
+        collection.setReadPreference(ReadPreference.nearest())
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.nearest())
+
+        then:
+        cursor.readPreference == ReadPreference.nearest()
+
+        when:
+        cursor.setReadPreference(ReadPreference.secondary())
+
+        then:
+        cursor.readPreference == ReadPreference.secondary()
+
+        when:
+        cursor.setReadPreference(null)
+
+        then:
+        cursor.readPreference == ReadPreference.nearest()
+    }
+
+    def 'should get and set read concern'() {
+        when:
+        def collection = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([])).getCollection('test')
+        collection.setReadConcern(ReadConcern.MAJORITY)
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+
+        then:
+        cursor.readConcern == ReadConcern.MAJORITY
+
+        when:
+        cursor.setReadConcern(ReadConcern.LOCAL)
+
+        then:
+        cursor.readConcern == ReadConcern.LOCAL
+
+        when:
+        cursor.setReadConcern(null)
+
+        then:
+        cursor.readConcern == ReadConcern.MAJORITY
+    }
+
+    def 'should get and set collation'() {
+        when:
+        def collection = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([])).getCollection('test')
+        def collation = Collation.builder().locale('en').build()
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+
+        then:
+        cursor.getCollation() == null
+
+        when:
+        cursor.setCollation(collation)
+
+        then:
+        cursor.getCollation() == collation
+
+        when:
+        cursor.setCollation(null)
+
+        then:
+        cursor.getCollation() == null
+    }
+
+    def 'should copy as expected'() {
+        when:
+        def collection = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([])).getCollection('test')
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.nearest())
+            .setReadConcern(ReadConcern.LOCAL)
+            .setCollation(Collation.builder().locale('en').build())
+
+        then:
+        expect(cursor, isTheSameAs(cursor.copy()))
+    }
+
+    def 'find should create the correct FindOperation'() {
+        given:
+        def executor = new TestOperationExecutor([stubBatchCursor()]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+        cursor.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        cursor.toArray()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                                                                .filter(new BsonDocument())
+                                                                .projection(new BsonDocument())
+                                                                .modifiers(new BsonDocument())
+                                                                .retryReads(true))
+    }
+
+
+    def 'one should create the correct FindOperation'() {
+        given:
+        def executor = new TestOperationExecutor([stubBatchCursor()]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+        cursor.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        cursor.one()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                                                                .limit(-1)
+                                                                .filter(new BsonDocument())
+                                                                .projection(new BsonDocument())
+                                                                .modifiers(new BsonDocument())
+                                                                .retryReads(true))
+    }
+
+    def 'DBCursor methods should be used to create the expected operation'() {
+        given:
+        def executor = new TestOperationExecutor([stubBatchCursor()]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def collation = Collation.builder().locale('en').build()
+        def cursorType = CursorType.NonTailable
+        def filter = new BasicDBObject()
+        def sort = BasicDBObject.parse('{a: 1}')
+        def bsonFilter = new BsonDocument()
+        def bsonSort = BsonDocument.parse(sort.toJson())
+        def readConcern = ReadConcern.LOCAL
+        def readPreference = ReadPreference.nearest()
+        def findOptions = new DBCollectionFindOptions()
+        def cursor = new DBCursor(collection, filter, findOptions)
+                .setReadConcern(readConcern)
+                .setReadPreference(readPreference)
+                .setCollation(collation)
+                .batchSize(1)
+                .cursorType(cursorType)
+                .limit(1)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .noCursorTimeout(true)
+                .oplogReplay(true)
+                .partial(true)
+                .skip(1)
+                .sort(sort)
+
+        when:
+        cursor.toArray()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .batchSize(1)
+                .collation(collation)
+                .cursorType(cursorType)
+                .filter(bsonFilter)
+                .limit(1)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .noCursorTimeout(true)
+                .oplogReplay(true)
+                .partial(true)
+                .skip(1)
+                .sort(bsonSort)
+                .modifiers(new BsonDocument())
+                .retryReads(true)
+        )
+
+        executor.getReadPreference() == readPreference
+        executor.getReadConcern() == readConcern
+    }
+
+    def 'DBCollectionFindOptions should be used to create the expected operation'() {
+        given:
+        def executor = new TestOperationExecutor([stubBatchCursor()]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def collation = Collation.builder().locale('en').build()
+        def cursorType = CursorType.NonTailable
+        def filter = new BasicDBObject()
+        def projection = BasicDBObject.parse('{a: 1, _id: 0}')
+        def sort = BasicDBObject.parse('{a: 1}')
+        def modifiers = BasicDBObject.parse('{$comment: 1}')
+        def bsonFilter = new BsonDocument()
+        def bsonModifiers = BsonDocument.parse(modifiers.toJson())
+        def bsonProjection = BsonDocument.parse(projection.toJson())
+        def bsonSort = BsonDocument.parse(sort.toJson())
+        def comment = 'comment'
+        def hint = BasicDBObject.parse('{x : 1}')
+        def min = BasicDBObject.parse('{y : 1}')
+        def max = BasicDBObject.parse('{y : 100}')
+        def bsonHint = BsonDocument.parse(hint.toJson())
+        def bsonMin = BsonDocument.parse(min.toJson())
+        def bsonMax = BsonDocument.parse(max.toJson())
+        def readConcern = ReadConcern.LOCAL
+        def readPreference = ReadPreference.nearest()
+        def findOptions = new DBCollectionFindOptions()
+                .batchSize(1)
+                .collation(collation)
+                .cursorType(cursorType)
+                .limit(1)
+                .maxAwaitTime(1, TimeUnit.MILLISECONDS)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .modifiers(modifiers)
+                .noCursorTimeout(true)
+                .oplogReplay(true)
+                .partial(true)
+                .projection(projection)
+                .readConcern(readConcern)
+                .readPreference(readPreference)
+                .skip(1)
+                .sort(sort)
+                .comment(comment)
+                .hint(hint)
+                .max(max)
+                .min(min)
+                .returnKey(true)
+                .showRecordId(true)
+
+        def cursor = new DBCursor(collection, filter, findOptions)
+
+        when:
+        cursor.toArray()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .batchSize(1)
+                .collation(collation)
+                .cursorType(cursorType)
+                .filter(bsonFilter)
+                .limit(1)
+                .maxAwaitTime(1, TimeUnit.MILLISECONDS)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .modifiers(bsonModifiers)
+                .noCursorTimeout(true)
+                .oplogReplay(true)
+                .partial(true)
+                .projection(bsonProjection)
+                .skip(1)
+                .sort(bsonSort)
+                .comment(comment)
+                .hint(bsonHint)
+                .max(bsonMax)
+                .min(bsonMin)
+                .returnKey(true)
+                .showRecordId(true)
+                .retryReads(true)
+        )
+
+        executor.getReadPreference() == findOptions.getReadPreference()
+    }
+
+    def 'DBCursor options should override DBCollectionFindOptions'() {
+        given:
+        def executor = new TestOperationExecutor([stubBatchCursor()]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def cursorType = CursorType.NonTailable
+        def readPreference = ReadPreference.primary()
+        def filter = new BasicDBObject()
+        def bsonFilter = new BsonDocument()
+        def findOptions = new DBCollectionFindOptions()
+                .cursorType(cursorType)
+                .noCursorTimeout(false)
+                .oplogReplay(false)
+                .partial(false)
+                .readPreference(readPreference)
+
+        def cursor = new DBCursor(collection, filter , findOptions)
+                .addOption(Bytes.QUERYOPTION_AWAITDATA)
+                .addOption(Bytes.QUERYOPTION_NOTIMEOUT)
+                .addOption(Bytes.QUERYOPTION_OPLOGREPLAY)
+                .addOption(Bytes.QUERYOPTION_PARTIAL)
+                .addOption(Bytes.QUERYOPTION_SLAVEOK)
+                .addOption(Bytes.QUERYOPTION_TAILABLE)
+
+        when:
+        cursor.toArray()
+
+        then:
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
+                .modifiers(new BsonDocument())
+                .cursorType(CursorType.TailableAwait)
+                .filter(bsonFilter)
+                .noCursorTimeout(true)
+                .oplogReplay(true)
+                .partial(true)
+                .retryReads(true)
+        )
+
+        executor.getReadPreference() == ReadPreference.secondaryPreferred()
+    }
+
+    def 'count should create the correct CountOperation'() {
+        def executor = new TestOperationExecutor([42L]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+        cursor.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        def result = cursor.count()
+
+        then:
+        result == 42
+        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
+                                                                .filter(new BsonDocument()).retryReads(true))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+    }
+
+    def 'size should create the correct CountOperation'() {
+        def executor = new TestOperationExecutor([42L]);
+        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
+        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+        cursor.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        def result = cursor.size()
+
+        then:
+        result == 42
+        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
+                                                                .filter(new BsonDocument()).retryReads(true))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+    }
+
+    private stubBatchCursor() {
+        Stub(BatchCursor) {
+            def count = 0
+            next() >> {
+                count++
+                [new BasicDBObject('_id', 1)]
+            }
+            hasNext() >> {
+                count == 0
+            }
+            getServerCursor() >> new ServerCursor(12L, new ServerAddress())
+        };
+    }
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/DBEncoderDecoderDBRefSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/DBEncoderDecoderDBRefSpecification.groovy
new file mode 100644
index 00000000000..a000ecfc048
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/DBEncoderDecoderDBRefSpecification.groovy
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import org.bson.BSONDecoder
+import org.bson.BasicBSONDecoder
+import org.bson.io.BasicOutputBuffer
+import org.bson.io.OutputBuffer
+import spock.lang.Specification
+
+class DBEncoderDecoderDBRefSpecification extends Specification {
+
+    def 'should encode and decode DBRefs'() {
+        given:
+        DBRef reference = new DBRef('coll', 'hello world');
+        DBObject document = new BasicDBObject('!', reference);
+        OutputBuffer buffer = new BasicOutputBuffer();
+
+        when:
+        DefaultDBEncoder.FACTORY.create().writeObject(buffer, document);
+        DefaultDBCallback callback = new DefaultDBCallback(null);
+        BSONDecoder decoder = new BasicBSONDecoder();
+        decoder.decode(buffer.toByteArray(), callback);
+        DBRef decoded = ((DBObject) callback.get()).get('!');
+
+        then:
+        decoded.databaseName == null
+        decoded.collectionName == 'coll'
+        decoded.id == 'hello world'
+    }
+
+    def 'should encode and decode DBRefs with a database name'() {
+        given:
+        DBRef reference = new DBRef('db', 'coll', 'hello world');
+        DBObject document = new BasicDBObject('!', reference);
+        OutputBuffer buffer = new BasicOutputBuffer();
+
+        when:
+        DefaultDBEncoder.FACTORY.create().writeObject(buffer, document);
+        DefaultDBCallback callback = new DefaultDBCallback(null);
+        BSONDecoder decoder = new BasicBSONDecoder();
+        decoder.decode(buffer.toByteArray(), callback);
+        DBRef decoded = ((DBObject) callback.get()).get('!');
+
+        then:
+        decoded.databaseName == 'db'
+        decoded.collectionName == 'coll'
+        decoded.id == 'hello world'
+    }
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/DBObjectCollationHelperSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/DBObjectCollationHelperSpecification.groovy
new file mode 100644
index 00000000000..914f7243b4c
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/DBObjectCollationHelperSpecification.groovy
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
+import spock.lang.Specification
+
+class DBObjectCollationHelperSpecification extends Specification {
+
+    def 'should create the expected collation'() {
+        expect:
+        DBObjectCollationHelper.createCollationFromOptions(new BasicDBObject('collation', BasicDBObject.parse(options))) == collation
+
+        where:
+        collation                                | options
+        Collation.builder().locale('en').build() | '{locale: "en"}'
+        Collation.builder()
+                .locale('en')
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .normalization(true)
+                .backwards(true)
+                .build()                         | '''{locale: "en", caseLevel: true, caseFirst: "off", strength: 5,
+                                                                  numericOrdering: true, alternate: "shifted",
+                                                                  maxVariable: "space", normalization: true, backwards: true}'''
+    }
+
+    def 'should return null if no options are set'() {
+        DBObjectCollationHelper.createCollationFromOptions(new BasicDBObject()) == null
+    }
+
+    def 'should throw an exception if the collation options are invalid'() {
+        when:
+        DBObjectCollationHelper.createCollationFromOptions(new BasicDBObject('collation', BasicDBObject.parse(options)))
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        options << ['{}',
+                    '{locale: true}',
+                    '{ locale: "en", caseLevel: "true"}',
+                    '{ locale: "en", caseFirst: false}',
+                    '{ locale: "en", strength: true }',
+                    '{ locale: "en", numericOrdering: 1}',
+                    '{ locale: "en", alternate: true}',
+                    '{ locale: "en", maxVariable: true}',
+                    '{ locale: "en", normalization: 1}',
+                    '{ locale: "en", backwards: 1}']
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/DBObjectMatchers.java b/driver-legacy/src/test/unit/com/mongodb/DBObjectMatchers.java
similarity index 98%
rename from driver/src/test/unit/com/mongodb/DBObjectMatchers.java
rename to driver-legacy/src/test/unit/com/mongodb/DBObjectMatchers.java
index 9dd6773992a..f82cb75bcda 100644
--- a/driver/src/test/unit/com/mongodb/DBObjectMatchers.java
+++ b/driver-legacy/src/test/unit/com/mongodb/DBObjectMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-legacy/src/test/unit/com/mongodb/DBSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/DBSpecification.groovy
new file mode 100644
index 00000000000..ed213ff6d6b
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/DBSpecification.groovy
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CollationAlternate
+import com.mongodb.client.model.CollationCaseFirst
+import com.mongodb.client.model.CollationMaxVariable
+import com.mongodb.client.model.CollationStrength
+import com.mongodb.client.model.DBCreateViewOptions
+import com.mongodb.client.model.ValidationAction
+import com.mongodb.client.model.ValidationLevel
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.CreateCollectionOperation
+import com.mongodb.operation.CreateViewOperation
+import com.mongodb.operation.ListCollectionsOperation
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonDouble
+import spock.lang.Specification
+
+import static Fixture.getMongoClient
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static spock.util.matcher.HamcrestSupport.expect
+
+class DBSpecification extends Specification {
+
+    def 'should throw IllegalArgumentException if name is invalid'() {
+        when:
+        new DB(getMongoClient(), 'a.b', new TestOperationExecutor())
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should get and set read concern'() {
+        when:
+        def db = new DB(getMongoClient(), 'test', new TestOperationExecutor([]))
+
+        then:
+        db.readConcern == ReadConcern.DEFAULT
+
+        when:
+        db.setReadConcern(ReadConcern.MAJORITY)
+
+        then:
+        db.readConcern == ReadConcern.MAJORITY
+
+        when:
+        db.setReadConcern(null)
+
+        then:
+        db.readConcern == ReadConcern.DEFAULT
+    }
+
+    def 'should execute CreateCollectionOperation'() {
+        given:
+        def mongo = Stub(MongoClient)
+        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
+        def executor = new TestOperationExecutor([1L, 2L, 3L])
+        def db = new DB(mongo, 'test', executor)
+        db.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        db.createCollection('ctest', new BasicDBObject())
+
+        then:
+        def operation = executor.getWriteOperation() as CreateCollectionOperation
+        expect operation, isTheSameAs(new CreateCollectionOperation('test', 'ctest', db.getWriteConcern()))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        when:
+        def options = new BasicDBObject()
+                .append('size', 100000)
+                .append('max', 2000)
+                .append('capped', true)
+                .append('autoIndexId', true)
+                .append('storageEngine', BasicDBObject.parse('{ wiredTiger: {}}'))
+                .append('indexOptionDefaults', BasicDBObject.parse('{storageEngine: { mmapv1: {}}}'))
+                .append('validator', BasicDBObject.parse('{level : { $gte: 10 } }'))
+                .append('validationLevel', ValidationLevel.MODERATE.getValue())
+                .append('validationAction', ValidationAction.WARN.getValue())
+
+
+        db.createCollection('ctest', options)
+        operation = executor.getWriteOperation() as CreateCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateCollectionOperation('test', 'ctest', db.getWriteConcern())
+                .sizeInBytes(100000)
+                .maxDocuments(2000)
+                .capped(true)
+                .autoIndex(true)
+                .storageEngineOptions(BsonDocument.parse('{ wiredTiger: {}}'))
+                .indexOptionDefaults(BsonDocument.parse('{storageEngine: { mmapv1: {}}}'))
+                .validator(BsonDocument.parse('{level : { $gte: 10 } }'))
+                .validationLevel(ValidationLevel.MODERATE)
+                .validationAction(ValidationAction.WARN))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        when:
+        def collation = Collation.builder()
+                .locale('en')
+                .caseLevel(true)
+                .collationCaseFirst(CollationCaseFirst.OFF)
+                .collationStrength(CollationStrength.IDENTICAL)
+                .numericOrdering(true)
+                .collationAlternate(CollationAlternate.SHIFTED)
+                .collationMaxVariable(CollationMaxVariable.SPACE)
+                .backwards(true)
+                .build()
+
+        db.createCollection('ctest', new BasicDBObject('collation', BasicDBObject.parse(collation.asDocument().toJson())))
+        operation = executor.getWriteOperation() as CreateCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateCollectionOperation('test', 'ctest', db.getWriteConcern()).collation(collation))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+    }
+
+    def 'should execute CreateViewOperation'() {
+        given:
+        def mongo = Stub(MongoClient) {
+            getCodecRegistry() >> MongoClient.defaultCodecRegistry
+        }
+        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
+        def executor = new TestOperationExecutor([1L, 2L, 3L])
+
+        def databaseName = 'test'
+        def viewName = 'view1'
+        def viewOn = 'collection1'
+        def pipeline = [new BasicDBObject('$match', new BasicDBObject('x', true))]
+        def writeConcern = WriteConcern.JOURNALED
+        def collation = Collation.builder().locale('en').build()
+
+        def db = new DB(mongo, databaseName, executor)
+        db.setWriteConcern(writeConcern)
+        db.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        db.createView(viewName, viewOn, pipeline)
+
+        then:
+        def operation = executor.getWriteOperation() as CreateViewOperation
+        expect operation, isTheSameAs(new CreateViewOperation(databaseName, viewName, viewOn,
+                [new BsonDocument('$match', new BsonDocument('x', BsonBoolean.TRUE))], writeConcern))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        when:
+        db.createView(viewName, viewOn, pipeline, new DBCreateViewOptions().collation(collation))
+        operation = executor.getWriteOperation() as CreateViewOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateViewOperation(databaseName, viewName, viewOn,
+                [new BsonDocument('$match', new BsonDocument('x', BsonBoolean.TRUE))], writeConcern).collation(collation))
+        executor.getReadConcern() == ReadConcern.MAJORITY
+    }
+
+    def 'should execute ListCollectionsOperation'() {
+        given:
+        def mongo = Stub(Mongo)
+        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
+        def executor = new TestOperationExecutor([Stub(BatchCursor), Stub(BatchCursor)])
+
+        def databaseName = 'test'
+
+        def db = new DB(mongo, databaseName, executor)
+
+        when:
+        db.getCollectionNames()
+        def operation = executor.getReadOperation() as ListCollectionsOperation
+
+        then:
+        expect operation, isTheSameAs(new ListCollectionsOperation(databaseName, MongoClient.getCommandCodec()).nameOnly(true))
+
+        when:
+        db.collectionExists('someCollection')
+        operation = executor.getReadOperation() as ListCollectionsOperation
+
+        then:
+        expect operation, isTheSameAs(new ListCollectionsOperation(databaseName, MongoClient.getCommandCodec()).nameOnly(true))
+    }
+
+    def 'should use provided read preference for obedient commands'() {
+        given:
+        def mongo = Stub(Mongo)
+        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
+        def executor = new TestOperationExecutor([new BsonDocument('ok', new BsonDouble(1.0))])
+        def database = new DB(mongo, 'test', executor)
+        database.setReadPreference(ReadPreference.secondary())
+        database.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        database.command(cmd)
+
+        then:
+        executor.getReadPreference() == expectedReadPreference
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        where:
+        expectedReadPreference     | cmd
+        ReadPreference.secondary() | new BasicDBObject('listCollections', 1)
+        ReadPreference.secondary() | new BasicDBObject('collStats', 1)
+        ReadPreference.secondary() | new BasicDBObject('dbStats', 1)
+        ReadPreference.secondary() | new BasicDBObject('distinct', 1)
+        ReadPreference.secondary() | new BasicDBObject('geoNear', 1)
+        ReadPreference.secondary() | new BasicDBObject('geoSearch', 1)
+        ReadPreference.secondary() | new BasicDBObject('group', 1)
+        ReadPreference.secondary() | new BasicDBObject('listCollections', 1)
+        ReadPreference.secondary() | new BasicDBObject('listIndexes', 1)
+        ReadPreference.secondary() | new BasicDBObject('parallelCollectionScan', 1)
+        ReadPreference.secondary() | new BasicDBObject('text', 1)
+    }
+
+    def 'should use primary read preference for non obedient commands'() {
+        given:
+        def mongo = Stub(Mongo)
+        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
+        def executor = new TestOperationExecutor([new BsonDocument('ok', new BsonDouble(1.0))])
+        def database = new DB(mongo, 'test', executor)
+        database.setReadPreference(ReadPreference.secondary())
+        database.setReadConcern(ReadConcern.MAJORITY)
+
+        when:
+        database.command(cmd)
+
+        then:
+        executor.getReadPreference() == expectedReadPreference
+        executor.getReadConcern() == ReadConcern.MAJORITY
+
+        where:
+        expectedReadPreference      | cmd
+        ReadPreference.primary()    | new BasicDBObject('command', 1)
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/GroupCommandSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/GroupCommandSpecification.groovy
similarity index 97%
rename from driver/src/test/unit/com/mongodb/GroupCommandSpecification.groovy
rename to driver-legacy/src/test/unit/com/mongodb/GroupCommandSpecification.groovy
index 8e22d2fb9d9..9159316c919 100644
--- a/driver/src/test/unit/com/mongodb/GroupCommandSpecification.groovy
+++ b/driver-legacy/src/test/unit/com/mongodb/GroupCommandSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/com/mongodb/LazyDBEncoderTest.java b/driver-legacy/src/test/unit/com/mongodb/LazyDBEncoderTest.java
similarity index 97%
rename from driver/src/test/unit/com/mongodb/LazyDBEncoderTest.java
rename to driver-legacy/src/test/unit/com/mongodb/LazyDBEncoderTest.java
index 8ac80cbbc49..8d1dd419e1e 100644
--- a/driver/src/test/unit/com/mongodb/LazyDBEncoderTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/LazyDBEncoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/com/mongodb/LazyDBObjectSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/LazyDBObjectSpecification.groovy
similarity index 99%
rename from driver/src/test/unit/com/mongodb/LazyDBObjectSpecification.groovy
rename to driver-legacy/src/test/unit/com/mongodb/LazyDBObjectSpecification.groovy
index f5a39c1adaa..e2fc4380c05 100644
--- a/driver/src/test/unit/com/mongodb/LazyDBObjectSpecification.groovy
+++ b/driver-legacy/src/test/unit/com/mongodb/LazyDBObjectSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/unit/com/mongodb/MapReduceCommandSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/MapReduceCommandSpecification.groovy
similarity index 96%
rename from driver/src/test/unit/com/mongodb/MapReduceCommandSpecification.groovy
rename to driver-legacy/src/test/unit/com/mongodb/MapReduceCommandSpecification.groovy
index 202ae333c0a..1a739508526 100644
--- a/driver/src/test/unit/com/mongodb/MapReduceCommandSpecification.groovy
+++ b/driver-legacy/src/test/unit/com/mongodb/MapReduceCommandSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -44,7 +44,6 @@ class MapReduceCommandSpecification extends Specification {
 
     @Unroll
     def 'should have the correct default for #field'() throws Exception {
-
         expect:
         value == expected
 
@@ -69,7 +68,6 @@ class MapReduceCommandSpecification extends Specification {
 
     @Unroll
     def 'should be able to change the default for #field'() throws Exception {
-
         expect:
         value == expected
 
diff --git a/driver-legacy/src/test/unit/com/mongodb/MongoClientOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/MongoClientOptionsSpecification.groovy
new file mode 100644
index 00000000000..0a1fc4af63d
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/MongoClientOptionsSpecification.groovy
@@ -0,0 +1,706 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.connection.ConnectionPoolSettings
+import com.mongodb.connection.ServerSettings
+import com.mongodb.connection.SocketSettings
+import com.mongodb.connection.SslSettings
+import com.mongodb.event.ClusterListener
+import com.mongodb.event.CommandListener
+import com.mongodb.event.ConnectionPoolListener
+import com.mongodb.event.ServerListener
+import com.mongodb.event.ServerMonitorListener
+import com.mongodb.selector.ServerSelector
+import org.bson.UuidRepresentation
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import javax.net.SocketFactory
+import javax.net.ssl.SSLContext
+import javax.net.ssl.SSLContextSpi
+import javax.net.ssl.SSLSocketFactory
+import java.security.Provider
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+import static spock.util.matcher.HamcrestSupport.expect
+
+@SuppressWarnings('deprecation')
+class MongoClientOptionsSpecification extends Specification {
+
+    def 'should set the correct default values'() {
+        given:
+        def options = new MongoClientOptions.Builder().build()
+
+        expect:
+        options.getDescription() == null
+        options.getApplicationName() == null
+        options.getWriteConcern() == WriteConcern.ACKNOWLEDGED
+        options.getRetryWrites()
+        options.getRetryReads()
+        options.getCodecRegistry() == MongoClientSettings.defaultCodecRegistry
+        options.getUuidRepresentation() == UuidRepresentation.JAVA_LEGACY
+        options.getMinConnectionsPerHost() == 0
+        options.getConnectionsPerHost() == 100
+        options.getConnectTimeout() == 10000
+        options.getReadPreference() == ReadPreference.primary()
+        options.getServerSelector() == null;
+        options.getThreadsAllowedToBlockForConnectionMultiplier() == 5
+        options.isSocketKeepAlive()
+        !options.isSslEnabled()
+        !options.isSslInvalidHostNameAllowed()
+        options.getSslContext() == null
+        options.getSocketFactory() != null
+        !(options.getSocketFactory() instanceof SSLSocketFactory)
+        options.getDbDecoderFactory() == DefaultDBDecoder.FACTORY
+        options.getDbEncoderFactory() == DefaultDBEncoder.FACTORY
+        options.getLocalThreshold() == 15
+        options.isCursorFinalizerEnabled()
+        options.getHeartbeatFrequency() == 10000
+        options.getMinHeartbeatFrequency() == 500
+        options.getServerSelectionTimeout() == 30000
+
+        options.getCommandListeners() == []
+        options.getClusterListeners() == []
+        options.getConnectionPoolListeners() == []
+        options.getServerListeners() == []
+        options.getServerMonitorListeners() == []
+
+        options.connectionPoolSettings == ConnectionPoolSettings.builder().build()
+        options.socketSettings == SocketSettings.builder().build()
+        options.heartbeatSocketSettings == SocketSettings.builder().connectTimeout(20, SECONDS).readTimeout(20, SECONDS).build()
+        options.serverSettings == ServerSettings.builder().heartbeatFrequency(10000, MILLISECONDS)
+                                                .minHeartbeatFrequency(500, MILLISECONDS)
+                                                .build()
+        options.sslSettings == SslSettings.builder().build();
+        options.compressorList == []
+        options.getAutoEncryptionSettings() == null
+    }
+
+    @SuppressWarnings('UnnecessaryObjectReferences')
+    def 'should handle illegal arguments'() {
+        given:
+        def builder = new MongoClientOptions.Builder()
+
+        when:
+        builder.localThreshold(-1)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.heartbeatFrequency(0)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.minHeartbeatFrequency(0)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.writeConcern(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.readPreference(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.connectionsPerHost(0)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.minConnectionsPerHost(-1)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.connectTimeout(-1)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.threadsAllowedToBlockForConnectionMultiplier(0)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.dbDecoderFactory(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.dbEncoderFactory(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.compressorList(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        builder.uuidRepresentation(null)
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should build with set options'() {
+        given:
+        def encoderFactory = new MyDBEncoderFactory()
+        def socketFactory = SSLSocketFactory.getDefault()
+        def serverSelector = Mock(ServerSelector)
+        def autoEncryptionSettings = AutoEncryptionSettings.builder()
+                .keyVaultNamespace('admin.keys')
+                .kmsProviders(['local': ['key': new byte[64]]])
+                .build()
+        def options = MongoClientOptions.builder()
+                                        .description('test')
+                                        .applicationName('appName')
+                                        .readPreference(ReadPreference.secondary())
+                                        .retryWrites(true)
+                                        .retryReads(false)
+                                        .writeConcern(WriteConcern.JOURNALED)
+                                        .minConnectionsPerHost(30)
+                                        .connectionsPerHost(500)
+                                        .connectTimeout(100)
+                                        .socketTimeout(700)
+                                        .serverSelector(serverSelector)
+                                        .serverSelectionTimeout(150)
+                                        .maxWaitTime(200)
+                                        .maxConnectionIdleTime(300)
+                                        .maxConnectionLifeTime(400)
+                                        .threadsAllowedToBlockForConnectionMultiplier(2)
+                                        .socketKeepAlive(false)
+                                        .socketFactory(socketFactory)
+                                        .sslEnabled(true)
+                                        .sslInvalidHostNameAllowed(true)
+                                        .sslContext(SSLContext.getDefault())
+                                        .dbDecoderFactory(LazyDBDecoder.FACTORY)
+                                        .heartbeatFrequency(5)
+                                        .minHeartbeatFrequency(11)
+                                        .heartbeatConnectTimeout(15)
+                                        .heartbeatSocketTimeout(20)
+                                        .localThreshold(25)
+                                        .requiredReplicaSetName('test')
+                                        .cursorFinalizerEnabled(false)
+                                        .dbEncoderFactory(encoderFactory)
+                                        .compressorList([MongoCompressor.createZlibCompressor()])
+                                        .autoEncryptionSettings(autoEncryptionSettings)
+                                        .build()
+
+        expect:
+        options.getDescription() == 'test'
+        options.getApplicationName() == 'appName'
+        options.getReadPreference() == ReadPreference.secondary()
+        options.getWriteConcern() == WriteConcern.JOURNALED
+        options.getServerSelector() == serverSelector
+        options.getRetryWrites()
+        !options.getRetryReads()
+        options.getServerSelectionTimeout() == 150
+        options.getMaxWaitTime() == 200
+        options.getMaxConnectionIdleTime() == 300
+        options.getMaxConnectionLifeTime() == 400
+        options.getMinConnectionsPerHost() == 30
+        options.getConnectionsPerHost() == 500
+        options.getConnectTimeout() == 100
+        options.getSocketTimeout() == 700
+        options.getThreadsAllowedToBlockForConnectionMultiplier() == 2
+        !options.isSocketKeepAlive()
+        options.socketFactory == socketFactory
+        options.isSslEnabled()
+        options.isSslInvalidHostNameAllowed()
+        options.getSslContext() == SSLContext.getDefault()
+        options.getDbDecoderFactory() == LazyDBDecoder.FACTORY
+        options.getDbEncoderFactory() == encoderFactory
+        options.getHeartbeatFrequency() == 5
+        options.getMinHeartbeatFrequency() == 11
+        options.getHeartbeatConnectTimeout() == 15
+        options.getHeartbeatSocketTimeout() == 20
+        options.getLocalThreshold() == 25
+        options.getRequiredReplicaSetName() == 'test'
+        !options.isCursorFinalizerEnabled()
+        options.getServerSettings().getHeartbeatFrequency(MILLISECONDS) == 5
+        options.getServerSettings().getMinHeartbeatFrequency(MILLISECONDS) == 11
+
+        options.connectionPoolSettings == ConnectionPoolSettings.builder().maxSize(500).minSize(30).maxWaitQueueSize(1000)
+                                                                .maxWaitTime(200, MILLISECONDS).maxConnectionLifeTime(400, MILLISECONDS)
+                                                                .maxConnectionIdleTime(300, MILLISECONDS).build()
+        options.socketSettings == SocketSettings.builder().connectTimeout(100, MILLISECONDS).readTimeout(700, MILLISECONDS)
+                                                .keepAlive(false).build()
+        options.heartbeatSocketSettings == SocketSettings.builder().connectTimeout(15, MILLISECONDS).readTimeout(20, MILLISECONDS)
+                                                         .keepAlive(false).build()
+        options.serverSettings == ServerSettings.builder().minHeartbeatFrequency(11, MILLISECONDS).heartbeatFrequency(5, MILLISECONDS)
+                                                .build()
+        options.sslSettings == SslSettings.builder().enabled(true).invalidHostNameAllowed(true)
+                .context(SSLContext.getDefault()).build()
+        options.compressorList == [MongoCompressor.createZlibCompressor()]
+        options.getAutoEncryptionSettings() == autoEncryptionSettings
+    }
+
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should get socketFactory based on sslEnabled'() {
+        when:
+        MongoClientOptions.Builder builder = MongoClientOptions.builder()
+
+        then:
+        builder.build().getSocketFactory() == MongoClientOptions.DEFAULT_SOCKET_FACTORY
+
+        when:
+        builder.sslEnabled(true)
+
+        then:
+        builder.build().getSocketFactory() == MongoClientOptions.DEFAULT_SSL_SOCKET_FACTORY
+    }
+
+    //  Can't use a Stub for this since SSLContext.getSocketFactory is a final method
+    class SSLContextSubClass extends SSLContext {
+        protected SSLContextSubClass(final SSLContextSpi contextSpi, final Provider provider) {
+            super(contextSpi, provider, 'Default')
+        }
+    }
+
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should get socketFactory based on sslContext'() {
+        given:
+        def expectedSocketFactory = Mock(SSLSocketFactory)
+        def sslContextSpi = Stub(SSLContextSpi) {
+            engineGetSocketFactory() >> expectedSocketFactory
+        }
+        def sslContext = new SSLContextSubClass(sslContextSpi, Stub(Provider))
+        def options = MongoClientOptions.builder()
+                .sslEnabled(true)
+                .sslContext(sslContext)
+                .build()
+
+        when:
+        def socketFactory = options.getSocketFactory()
+
+        then:
+        socketFactory == expectedSocketFactory
+    }
+
+    @IgnoreIf({ isNotAtLeastJava7() })
+    def 'should get socketFactory based on configured socketFactory'() {
+        given:
+        def expectedSocketFactory = Mock(SocketFactory)
+        def options = MongoClientOptions.builder()
+                .socketFactory(expectedSocketFactory)
+                .build()
+
+        when:
+        def socketFactory = options.getSocketFactory()
+
+        then:
+        socketFactory == expectedSocketFactory
+    }
+
+    def 'should be easy to create new options from existing'() {
+        when:
+        def options = MongoClientOptions.builder()
+                .description('test')
+                .applicationName('appName')
+                .readPreference(ReadPreference.secondary())
+                .retryReads(true)
+                .uuidRepresentation(UuidRepresentation.STANDARD)
+                .writeConcern(WriteConcern.JOURNALED)
+                .minConnectionsPerHost(30)
+                .connectionsPerHost(500)
+                .connectTimeout(100)
+                .socketTimeout(700)
+                .serverSelectionTimeout(150)
+                .maxWaitTime(200)
+                .maxConnectionIdleTime(300)
+                .maxConnectionLifeTime(400)
+                .threadsAllowedToBlockForConnectionMultiplier(2)
+                .socketKeepAlive(false)
+                .sslEnabled(true)
+                .sslInvalidHostNameAllowed(true)
+                .sslContext(SSLContext.getDefault())
+                .dbDecoderFactory(LazyDBDecoder.FACTORY)
+                .heartbeatFrequency(5)
+                .minHeartbeatFrequency(11)
+                .heartbeatConnectTimeout(15)
+                .heartbeatSocketTimeout(20)
+                .localThreshold(25)
+                .requiredReplicaSetName('test')
+                .cursorFinalizerEnabled(false)
+                .dbEncoderFactory(new MyDBEncoderFactory())
+                .addCommandListener(Mock(CommandListener))
+                .addConnectionPoolListener(Mock(ConnectionPoolListener))
+                .addClusterListener(Mock(ClusterListener))
+                .addServerListener(Mock(ServerListener))
+                .addServerMonitorListener(Mock(ServerMonitorListener))
+                .compressorList([MongoCompressor.createZlibCompressor()])
+                .autoEncryptionSettings(AutoEncryptionSettings.builder()
+                        .keyVaultNamespace('admin.keys')
+                        .kmsProviders(['local': ['key': new byte[64]]])
+                        .build())
+                .build()
+
+        then:
+        expect options, isTheSameAs(MongoClientOptions.builder(options).build())
+    }
+
+    def 'applicationName can be 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 126 + '\u00A0'
+
+        when:
+        def options = MongoClientOptions.builder().applicationName(applicationName).build()
+
+        then:
+        options.applicationName == applicationName
+    }
+
+    def 'should throw IllegalArgumentException if applicationName exceeds 128 bytes when encoded as UTF-8'() {
+        given:
+        def applicationName = 'a' * 127 + '\u00A0'
+
+        when:
+        MongoClientOptions.builder().applicationName(applicationName)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should throw MongoInternalException mentioning MongoClientOptions if sslEnabled is true and sslInvalidHostNameAllowed is false'() {
+        given:
+        String javaVersion = System.getProperty('java.version')
+        when:
+
+        System.setProperty('java.version', '1.6.0_45')
+        MongoClientOptions.builder().sslEnabled(true).build()
+
+        then:
+        def e = thrown(MongoInternalException)
+        e.message.contains('MongoClientOptions.sslInvalidHostNameAllowed')
+
+        cleanup:
+        System.setProperty('java.version', javaVersion)
+    }
+
+    def 'should add command listeners'() {
+        given:
+        CommandListener commandListenerOne = Mock(CommandListener)
+        CommandListener commandListenerTwo = Mock(CommandListener)
+        CommandListener commandListenerThree = Mock(CommandListener)
+
+        when:
+        def options = MongoClientOptions.builder()
+                                        .build()
+
+        then:
+        options.commandListeners.size() == 0
+
+        when:
+        options = MongoClientOptions.builder()
+                                    .addCommandListener(commandListenerOne)
+                                    .build()
+
+        then:
+        options.commandListeners.size() == 1
+        options.commandListeners[0].is commandListenerOne
+
+        when:
+        options = MongoClientOptions.builder()
+                                    .addCommandListener(commandListenerOne)
+                                    .addCommandListener(commandListenerTwo)
+                                    .build()
+
+        then:
+        options.commandListeners.size() == 2
+        options.commandListeners[0].is commandListenerOne
+        options.commandListeners[1].is commandListenerTwo
+
+        when:
+        def copiedOptions = MongoClientOptions.builder(options).addCommandListener(commandListenerThree).build()
+
+        then:
+        copiedOptions.commandListeners.size() == 3
+        copiedOptions.commandListeners[0].is commandListenerOne
+        copiedOptions.commandListeners[1].is commandListenerTwo
+        copiedOptions.commandListeners[2].is commandListenerThree
+        options.commandListeners.size() == 2
+        options.commandListeners[0].is commandListenerOne
+        options.commandListeners[1].is commandListenerTwo
+    }
+
+    def 'should add connection pool listeners'() {
+        given:
+        ConnectionPoolListener connectionPoolListenerOne = Mock(ConnectionPoolListener)
+        ConnectionPoolListener connectionPoolListenerTwo = Mock(ConnectionPoolListener)
+        ConnectionPoolListener connectionPoolListenerThree = Mock(ConnectionPoolListener)
+
+        when:
+        def options = MongoClientOptions.builder()
+                .build()
+
+        then:
+        options.connectionPoolListeners.size() == 0
+
+        when:
+        options = MongoClientOptions.builder()
+                .addConnectionPoolListener(connectionPoolListenerOne)
+                .build()
+
+        then:
+        options.connectionPoolListeners.size() == 1
+        options.connectionPoolListeners[0].is connectionPoolListenerOne
+
+        when:
+        options = MongoClientOptions.builder()
+                .addConnectionPoolListener(connectionPoolListenerOne)
+                .addConnectionPoolListener(connectionPoolListenerTwo)
+                .build()
+
+        then:
+        options.connectionPoolListeners.size() == 2
+        options.connectionPoolListeners[0].is connectionPoolListenerOne
+        options.connectionPoolListeners[1].is connectionPoolListenerTwo
+
+        when:
+        def copiedOptions = MongoClientOptions.builder(options).addConnectionPoolListener(connectionPoolListenerThree).build()
+
+        then:
+        copiedOptions.connectionPoolListeners.size() == 3
+        copiedOptions.connectionPoolListeners[0].is connectionPoolListenerOne
+        copiedOptions.connectionPoolListeners[1].is connectionPoolListenerTwo
+        copiedOptions.connectionPoolListeners[2].is connectionPoolListenerThree
+        options.connectionPoolListeners.size() == 2
+        options.connectionPoolListeners[0].is connectionPoolListenerOne
+        options.connectionPoolListeners[1].is connectionPoolListenerTwo
+    }
+
+    def 'should add cluster listeners'() {
+        given:
+        ClusterListener clusterListenerOne = Mock(ClusterListener)
+        ClusterListener clusterListenerTwo = Mock(ClusterListener)
+        ClusterListener clusterListenerThree = Mock(ClusterListener)
+
+        when:
+        def options = MongoClientOptions.builder()
+                .build()
+
+        then:
+        options.clusterListeners.size() == 0
+
+        when:
+        options = MongoClientOptions.builder()
+                .addClusterListener(clusterListenerOne)
+                .build()
+
+        then:
+        options.clusterListeners.size() == 1
+        options.clusterListeners[0].is clusterListenerOne
+
+        when:
+        options = MongoClientOptions.builder()
+                .addClusterListener(clusterListenerOne)
+                .addClusterListener(clusterListenerTwo)
+                .build()
+
+        then:
+        options.clusterListeners.size() == 2
+        options.clusterListeners[0].is clusterListenerOne
+        options.clusterListeners[1].is clusterListenerTwo
+
+        when:
+        def copiedOptions = MongoClientOptions.builder(options).addClusterListener(clusterListenerThree).build()
+
+        then:
+        copiedOptions.clusterListeners.size() == 3
+        copiedOptions.clusterListeners[0].is clusterListenerOne
+        copiedOptions.clusterListeners[1].is clusterListenerTwo
+        copiedOptions.clusterListeners[2].is clusterListenerThree
+        options.clusterListeners.size() == 2
+        options.clusterListeners[0].is clusterListenerOne
+        options.clusterListeners[1].is clusterListenerTwo
+    }
+
+    def 'should add server listeners'() {
+        given:
+        ServerListener serverListenerOne = Mock(ServerListener)
+        ServerListener serverListenerTwo = Mock(ServerListener)
+        ServerListener serverListenerThree = Mock(ServerListener)
+
+        when:
+        def options = MongoClientOptions.builder()
+                .build()
+
+        then:
+        options.serverListeners.size() == 0
+
+        when:
+        options = MongoClientOptions.builder()
+                .addServerListener(serverListenerOne)
+                .build()
+
+        then:
+        options.serverListeners.size() == 1
+        options.serverListeners[0].is serverListenerOne
+
+        when:
+        options = MongoClientOptions.builder()
+                .addServerListener(serverListenerOne)
+                .addServerListener(serverListenerTwo)
+                .build()
+
+        then:
+        options.serverListeners.size() == 2
+        options.serverListeners[0].is serverListenerOne
+        options.serverListeners[1].is serverListenerTwo
+
+        when:
+        def copiedOptions = MongoClientOptions.builder(options).addServerListener(serverListenerThree).build()
+
+        then:
+        copiedOptions.serverListeners.size() == 3
+        copiedOptions.serverListeners[0].is serverListenerOne
+        copiedOptions.serverListeners[1].is serverListenerTwo
+        copiedOptions.serverListeners[2].is serverListenerThree
+        options.serverListeners.size() == 2
+        options.serverListeners[0].is serverListenerOne
+        options.serverListeners[1].is serverListenerTwo
+    }
+
+    def 'should add server monitor listeners'() {
+        given:
+        ServerMonitorListener serverMonitorListenerOne = Mock(ServerMonitorListener)
+        ServerMonitorListener serverMonitorListenerTwo = Mock(ServerMonitorListener)
+        ServerMonitorListener serverMonitorListenerThree = Mock(ServerMonitorListener)
+
+        when:
+        def options = MongoClientOptions.builder()
+                .build()
+
+        then:
+        options.serverMonitorListeners.size() == 0
+
+        when:
+        options = MongoClientOptions.builder()
+                .addServerMonitorListener(serverMonitorListenerOne)
+                .build()
+
+        then:
+        options.serverMonitorListeners.size() == 1
+        options.serverMonitorListeners[0].is serverMonitorListenerOne
+
+        when:
+        options = MongoClientOptions.builder()
+                .addServerMonitorListener(serverMonitorListenerOne)
+                .addServerMonitorListener(serverMonitorListenerTwo)
+                .build()
+
+        then:
+        options.serverMonitorListeners.size() == 2
+        options.serverMonitorListeners[0].is serverMonitorListenerOne
+        options.serverMonitorListeners[1].is serverMonitorListenerTwo
+
+        when:
+        def copiedOptions = MongoClientOptions.builder(options).addServerMonitorListener(serverMonitorListenerThree).build()
+
+        then:
+        copiedOptions.serverMonitorListeners.size() == 3
+        copiedOptions.serverMonitorListeners[0].is serverMonitorListenerOne
+        copiedOptions.serverMonitorListeners[1].is serverMonitorListenerTwo
+        copiedOptions.serverMonitorListeners[2].is serverMonitorListenerThree
+        options.serverMonitorListeners.size() == 2
+        options.serverMonitorListeners[0].is serverMonitorListenerOne
+        options.serverMonitorListeners[1].is serverMonitorListenerTwo
+    }
+
+    def 'builder should copy all values from the existing MongoClientOptions'() {
+        given:
+        def options = MongoClientOptions.builder()
+                .description('test')
+                .applicationName('appName')
+                .readPreference(ReadPreference.secondary())
+                .writeConcern(WriteConcern.JOURNALED)
+                .retryWrites(true)
+                .retryReads(true)
+                .uuidRepresentation(UuidRepresentation.STANDARD)
+                .minConnectionsPerHost(30)
+                .connectionsPerHost(500)
+                .connectTimeout(100)
+                .socketTimeout(700)
+                .serverSelectionTimeout(150)
+                .maxWaitTime(200)
+                .maxConnectionIdleTime(300)
+                .maxConnectionLifeTime(400)
+                .threadsAllowedToBlockForConnectionMultiplier(2)
+                .socketKeepAlive(false)
+                .sslEnabled(true)
+                .sslInvalidHostNameAllowed(true)
+                .sslContext(SSLContext.getDefault())
+                .socketFactory(SSLSocketFactory.getDefault())
+                .dbDecoderFactory(LazyDBDecoder.FACTORY)
+                .heartbeatFrequency(5)
+                .minHeartbeatFrequency(11)
+                .heartbeatConnectTimeout(15)
+                .heartbeatSocketTimeout(20)
+                .localThreshold(25)
+                .requiredReplicaSetName('test')
+                .cursorFinalizerEnabled(false)
+                .dbEncoderFactory(new MyDBEncoderFactory())
+                .addCommandListener(Mock(CommandListener))
+                .addClusterListener(Mock(ClusterListener))
+                .addConnectionPoolListener(Mock(ConnectionPoolListener))
+                .addServerListener(Mock(ServerListener))
+                .addServerMonitorListener(Mock(ServerMonitorListener))
+                .compressorList([MongoCompressor.createZlibCompressor()])
+                .autoEncryptionSettings()
+                .build()
+
+        when:
+        def copy = MongoClientOptions.builder(options).build()
+
+        then:
+        copy == options
+    }
+
+    def 'should only have the following fields in the builder'() {
+        when:
+        // A regression test so that if any more methods are added then the builder(final MongoClientOptions options) should be updated
+        def actual = MongoClientOptions.Builder.declaredFields.grep { !it.synthetic } *.name.sort()
+        def expected = ['alwaysUseMBeans', 'applicationName', 'autoEncryptionSettings', 'clusterListeners', 'codecRegistry',
+                        'commandListeners', 'compressorList', 'connectTimeout', 'connectionPoolListeners', 'cursorFinalizerEnabled',
+                        'dbDecoderFactory', 'dbEncoderFactory', 'description', 'heartbeatConnectTimeout', 'heartbeatFrequency',
+                        'heartbeatSocketTimeout', 'localThreshold', 'maxConnectionIdleTime', 'maxConnectionLifeTime',
+                        'maxConnectionsPerHost', 'maxWaitTime', 'minConnectionsPerHost', 'minHeartbeatFrequency', 'readConcern',
+                        'readPreference', 'requiredReplicaSetName', 'retryReads', 'retryWrites', 'serverListeners',
+                        'serverMonitorListeners', 'serverSelectionTimeout', 'serverSelector', 'socketFactory',
+                        'socketKeepAlive', 'socketTimeout', 'sslContext', 'sslEnabled', 'sslInvalidHostNameAllowed',
+                        'threadsAllowedToBlockForConnectionMultiplier', 'uuidRepresentation', 'writeConcern']
+
+        then:
+        actual == expected
+    }
+
+    private static class MyDBEncoderFactory implements DBEncoderFactory {
+        @Override
+        DBEncoder create() {
+            new DefaultDBEncoder()
+        }
+    }
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/MongoClientSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/MongoClientSpecification.groovy
new file mode 100644
index 00000000000..d604d4a3785
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/MongoClientSpecification.groovy
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb
+
+import com.mongodb.client.ClientSession
+import com.mongodb.client.internal.MongoClientImpl
+import com.mongodb.client.internal.MongoDatabaseImpl
+import com.mongodb.client.internal.MongoIterables
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import com.mongodb.client.model.geojson.MultiPolygon
+import com.mongodb.connection.Cluster
+import org.bson.BsonDocument
+import org.bson.Document
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecRegistry
+import org.bson.internal.OverridableUuidRepresentationCodecRegistry
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.MongoClientSettings.getDefaultCodecRegistry
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.ReadPreference.secondary
+import static com.mongodb.client.internal.TestHelper.execute
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MongoClientSpecification extends Specification {
+
+    private static CodecRegistry codecRegistry = fromProviders(new ValueCodecProvider())
+
+    def 'default codec registry should contain all supported providers'() {
+        given:
+        def codecRegistry = getDefaultCodecRegistry()
+
+        expect:
+        codecRegistry.get(BsonDocument)
+        codecRegistry.get(BasicDBObject)
+        codecRegistry.get(Document)
+        codecRegistry.get(Integer)
+        codecRegistry.get(MultiPolygon)
+        codecRegistry.get(Iterable)
+    }
+
+    def 'should use ListDatabasesIterableImpl correctly'() {
+        given:
+        def executor = new TestOperationExecutor([null, null])
+        def client = Spy(MongoClient) {
+            3 * createOperationExecutor() >> {
+                executor
+            }
+        }
+        def listDatabasesMethod = client.&listDatabases
+        def listDatabasesNamesMethod = client.&listDatabaseNames
+
+        when:
+        def listDatabasesIterable = execute(listDatabasesMethod, session)
+
+        then:
+        expect listDatabasesIterable, isTheSameAs(MongoIterables.listDatabasesOf(session, Document, getDefaultCodecRegistry(),
+                primary(), executor, true))
+
+        when:
+        listDatabasesIterable = execute(listDatabasesMethod, session, BsonDocument)
+
+        then:
+        expect listDatabasesIterable, isTheSameAs(MongoIterables.listDatabasesOf(session, BsonDocument,
+                getDefaultCodecRegistry(), primary(), executor, true))
+
+        when:
+        def listDatabaseNamesIterable = execute(listDatabasesNamesMethod, session)
+
+        then:
+        // listDatabaseNamesIterable is an instance of a MappingIterable, so have to get the mapped iterable inside it
+        expect listDatabaseNamesIterable.getMapped(), isTheSameAs(MongoIterables.listDatabasesOf(session, BsonDocument,
+                getDefaultCodecRegistry(), primary(), executor, true).nameOnly(true))
+
+        cleanup:
+        client?.close()
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should create ChangeStreamIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def namespace = new MongoNamespace('admin', 'ignored')
+        def settings = MongoClientOptions.builder().build()
+        def codecRegistry = settings.getCodecRegistry()
+        def readPreference = settings.getReadPreference()
+        def readConcern = settings.getReadConcern()
+
+        def client = Spy(MongoClient) {
+            3 * createOperationExecutor() >> {
+                executor
+            }
+        }
+        def watchMethod = client.&watch
+
+        when:
+        def changeStreamIterable = execute(watchMethod, session)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry,
+                readPreference,
+                readConcern, executor, [], Document, ChangeStreamLevel.CLIENT, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.CLIENT, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], BsonDocument, ChangeStreamLevel.CLIENT, true), ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the ChangeStreamIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def client = new MongoClientImpl(Stub(Cluster), MongoClientSettings.builder().build(), executor)
+
+        when:
+        client.watch((Class) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        client.watch([null]).into([])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+    def 'should pass the correct settings to getDatabase'() {
+        given:
+        def options = MongoClientOptions.builder()
+                .readPreference(secondary())
+                .writeConcern(WriteConcern.MAJORITY)
+                .readConcern(ReadConcern.MAJORITY)
+                .retryWrites(true)
+                .codecRegistry(codecRegistry)
+                .uuidRepresentation(STANDARD)
+                .build()
+        def client = new MongoClient('localhost', options)
+
+        when:
+        def database = client.getDatabase('name')
+
+        then:
+        expect database, isTheSameAs(new MongoDatabaseImpl('name', client.getDelegate().getCodecRegistry(), secondary(),
+                WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, STANDARD,
+                client.getDelegate().getOperationExecutor()))
+    }
+
+    def 'should create registry reflecting UuidRepresentation'() {
+        given:
+        def options = MongoClientOptions.builder()
+                .codecRegistry(codecRegistry)
+                .uuidRepresentation(STANDARD)
+                .build()
+
+        when:
+        def client = new MongoClient('localhost', options)
+        def registry = client.getCodecRegistry()
+
+        then:
+        registry instanceof OverridableUuidRepresentationCodecRegistry
+        (registry as OverridableUuidRepresentationCodecRegistry).uuidRepresentation == STANDARD
+        (registry as OverridableUuidRepresentationCodecRegistry).wrapped == codecRegistry
+
+        cleanup:
+        client?.close()
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/MongoClientURISpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/MongoClientURISpecification.groovy
similarity index 82%
rename from driver/src/test/unit/com/mongodb/MongoClientURISpecification.groovy
rename to driver-legacy/src/test/unit/com/mongodb/MongoClientURISpecification.groovy
index ac982de3381..3ffb7de3e28 100644
--- a/driver/src/test/unit/com/mongodb/MongoClientURISpecification.groovy
+++ b/driver-legacy/src/test/unit/com/mongodb/MongoClientURISpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,14 @@
 
 package com.mongodb
 
+
 import spock.lang.IgnoreIf
 import spock.lang.Specification
 import spock.lang.Unroll
 
+import javax.net.ssl.SSLContext
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava7
 import static com.mongodb.MongoCredential.createCredential
 import static com.mongodb.MongoCredential.createGSSAPICredential
 import static com.mongodb.MongoCredential.createMongoCRCredential
@@ -123,10 +127,25 @@ class MongoClientURISpecification extends Specification {
                                                                                                          .withWTimeout(5, MILLISECONDS)
     }
 
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
-    @Unroll
+    @IgnoreIf({ isNotAtLeastJava7() })
     def 'should correctly parse URI options for #type'() {
-        expect:
+        given:
+        def uri = new MongoClientURI('mongodb://localhost/?minPoolSize=5&maxPoolSize=10&waitQueueMultiple=7&waitQueueTimeoutMS=150&'
+                + 'maxIdleTimeMS=200&maxLifeTimeMS=300&replicaSet=test&'
+                + 'connectTimeoutMS=2500&socketTimeoutMS=5500&'
+                + 'safe=false&w=1&wtimeout=2500&fsync=true&ssl=true&readPreference=secondary&'
+                + 'sslInvalidHostNameAllowed=true&'
+                + 'serverSelectionTimeoutMS=25000&'
+                + 'localThresholdMS=30&'
+                + 'heartbeatFrequencyMS=20000&'
+                + 'retryWrites=true&'
+                + 'retryReads=true&'
+                + 'appName=app1')
+
+        when:
+        def options = uri.getOptions()
+
+        then:
         options.getWriteConcern() == new WriteConcern(1, 2500, true)
         options.getReadPreference() == ReadPreference.secondary()
         options.getConnectionsPerHost() == 10
@@ -143,37 +162,9 @@ class MongoClientURISpecification extends Specification {
         options.getServerSelectionTimeout() == 25000
         options.getLocalThreshold() == 30
         options.getHeartbeatFrequency() == 20000
-
-        where:
-        options <<
-        [new MongoClientURI('mongodb://localhost/?minPoolSize=5&maxPoolSize=10&waitQueueMultiple=7&waitQueueTimeoutMS=150&'
-                                    + 'maxIdleTimeMS=200&maxLifeTimeMS=300&replicaSet=test&'
-                                    + 'connectTimeoutMS=2500&socketTimeoutMS=5500&'
-                                    + 'safe=false&w=1&wtimeout=2500&fsync=true&ssl=true&readPreference=secondary&'
-                                    + 'sslInvalidHostNameAllowed=true&'
-                                    + 'serverSelectionTimeoutMS=25000&'
-                                    + 'localThresholdMS=30&'
-                                    + 'heartbeatFrequencyMS=20000').getOptions(),
-         new MongoClientURI('mongodb://localhost/?minPoolSize=5;maxPoolSize=10;waitQueueMultiple=7;waitQueueTimeoutMS=150;'
-                                    + 'maxIdleTimeMS=200;maxLifeTimeMS=300;replicaSet=test;'
-                                    + 'connectTimeoutMS=2500;socketTimeoutMS=5500;ssl=true;'
-                                    + 'safe=false;w=1;wtimeout=2500;fsync=true;readPreference=secondary;'
-                                    + 'sslInvalidHostNameAllowed=true;'
-                                    + 'serverSelectionTimeoutMS=25000;'
-                                    + 'localThresholdMS=30;'
-                                    + 'heartbeatFrequencyMS=20000').getOptions(),
-
-         new MongoClientURI('mongodb://localhost/test?minPoolSize=5;maxPoolSize=10&waitQueueMultiple=7;waitQueueTimeoutMS=150;'
-                                    + 'maxIdleTimeMS=200&maxLifeTimeMS=300&replicaSet=test;'
-                                    + 'connectTimeoutMS=2500;'
-                                    + 'socketTimeoutMS=5500&'
-                                    + 'safe=false&w=1;wtimeout=2500;fsync=true&ssl=true;readPreference=secondary&'
-                                    + 'sslInvalidHostNameAllowed=true;'
-                                    + 'serverSelectionTimeoutMS=25000&'
-                                    + 'localThresholdMS=30;'
-                                    + 'heartbeatFrequencyMS=20000').getOptions()]
-         //for documentation, i.e. the Unroll description for each type
-        type << ['amp', 'semi', 'mixed']
+        options.getRetryWrites()
+        options.getRetryReads()
+        options.getApplicationName() == 'app1'
     }
 
     def 'should have correct defaults for options'() {
@@ -181,16 +172,80 @@ class MongoClientURISpecification extends Specification {
         MongoClientOptions options = new MongoClientURI('mongodb://localhost').getOptions();
 
         then:
-        options.getConnectionsPerHost() == 100;
-        options.getThreadsAllowedToBlockForConnectionMultiplier() == 5;
-        options.getMaxWaitTime() == 120000;
-        options.getConnectTimeout() == 10000;
-        options.getSocketTimeout() == 0;
-        !options.isSocketKeepAlive();
-        options.getDescription() == null;
-        options.getReadPreference() == ReadPreference.primary();
+        options.getConnectionsPerHost() == 100
+        options.getThreadsAllowedToBlockForConnectionMultiplier() == 5
+        options.getMaxWaitTime() == 120000
+        options.getConnectTimeout() == 10000
+        options.getSocketTimeout() == 0
+        options.getDescription() == null
+        options.getReadPreference() == ReadPreference.primary()
         options.getRequiredReplicaSetName() == null
         !options.isSslEnabled()
+        options.getRetryWrites()
+        options.getRetryReads()
+    }
+
+    def 'should apply default uri to options'() {
+        given:
+        def optionsBuilder = MongoClientOptions.builder()
+                .description('test')
+                .applicationName('appName')
+                .readPreference(ReadPreference.secondary())
+                .retryWrites(true)
+                .retryReads(true)
+                .writeConcern(WriteConcern.JOURNALED)
+                .minConnectionsPerHost(30)
+                .connectionsPerHost(500)
+                .connectTimeout(100)
+                .socketTimeout(700)
+                .serverSelectionTimeout(150)
+                .maxWaitTime(200)
+                .maxConnectionIdleTime(300)
+                .maxConnectionLifeTime(400)
+                .threadsAllowedToBlockForConnectionMultiplier(2)
+                .socketKeepAlive(false)
+                .sslEnabled(true)
+                .sslInvalidHostNameAllowed(true)
+                .sslContext(SSLContext.getDefault())
+                .heartbeatFrequency(5)
+                .minHeartbeatFrequency(11)
+                .heartbeatConnectTimeout(15)
+                .heartbeatSocketTimeout(20)
+                .localThreshold(25)
+                .requiredReplicaSetName('test')
+                .compressorList([MongoCompressor.createZlibCompressor()])
+
+        when:
+        def options = new MongoClientURI('mongodb://localhost', optionsBuilder).getOptions()
+
+        then:
+        options.getDescription() == 'test'
+        options.getApplicationName() == 'appName'
+        options.getReadPreference() == ReadPreference.secondary()
+        options.getWriteConcern() == WriteConcern.JOURNALED
+        options.getRetryWrites()
+        options.getRetryReads()
+        options.getServerSelectionTimeout() == 150
+        options.getMaxWaitTime() == 200
+        options.getMaxConnectionIdleTime() == 300
+        options.getMaxConnectionLifeTime() == 400
+        options.getMinConnectionsPerHost() == 30
+        options.getConnectionsPerHost() == 500
+        options.getConnectTimeout() == 100
+        options.getSocketTimeout() == 700
+        options.getThreadsAllowedToBlockForConnectionMultiplier() == 2
+        !options.isSocketKeepAlive()
+        options.isSslEnabled()
+        options.isSslInvalidHostNameAllowed()
+        options.getHeartbeatFrequency() == 5
+        options.getMinHeartbeatFrequency() == 11
+        options.getHeartbeatConnectTimeout() == 15
+        options.getHeartbeatSocketTimeout() == 20
+        options.getLocalThreshold() == 25
+        options.getRequiredReplicaSetName() == 'test'
+        options.getServerSettings().getHeartbeatFrequency(MILLISECONDS) == 5
+        options.getServerSettings().getMinHeartbeatFrequency(MILLISECONDS) == 11
+        options.compressorList == [MongoCompressor.createZlibCompressor()]
     }
 
     @Unroll
@@ -214,7 +269,7 @@ class MongoClientURISpecification extends Specification {
         new MongoClientURI('mongodb://jeff@localhost/?' +
                            'authMechanism=GSSAPI')            | createGSSAPICredential('jeff')
         new MongoClientURI('mongodb://jeff:123@localhost/?' +
-                           'authMechanism=PLAIN')             | createPlainCredential('jeff', 'admin', '123'.toCharArray())
+                           'authMechanism=PLAIN')             | createPlainCredential('jeff', '$external', '123'.toCharArray())
         new MongoClientURI('mongodb://jeff@localhost/?' +
                            'authMechanism=MONGODB-X509')      | createMongoX509Credential('jeff')
         new MongoClientURI('mongodb://jeff@localhost/?' +
@@ -265,7 +320,7 @@ class MongoClientURISpecification extends Specification {
         options.getConnectionsPerHost() == 250
     }
 
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
+    @IgnoreIf({ isNotAtLeastJava7() })
     def 'should be equal to another MongoClientURI with the same string values'() {
         expect:
         uri1 == uri2
diff --git a/driver-legacy/src/test/unit/com/mongodb/MongoConstructorsTest.java b/driver-legacy/src/test/unit/com/mongodb/MongoConstructorsTest.java
new file mode 100644
index 00000000000..5e1dcbaa6a5
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/MongoConstructorsTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.net.UnknownHostException;
+import java.util.List;
+
+import static com.mongodb.MongoCredential.createCredential;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
+@SuppressWarnings("deprecation")
+public class MongoConstructorsTest {
+
+    @Test
+    @Ignore
+    public void shouldDefaultToLocalhost() throws UnknownHostException {
+        Mongo mongo = new MongoClient();
+        try {
+            assertEquals(asList(new ServerAddress()), mongo.getServerAddressList());
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    @Ignore
+    public void shouldUseGivenHost() throws UnknownHostException {
+        Mongo mongo = new MongoClient("localhost");
+        try {
+            assertEquals(asList(new ServerAddress("localhost")), mongo.getServerAddressList());
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    public void shouldGetSeedList() throws UnknownHostException {
+        List<ServerAddress> seedList = asList(new ServerAddress("localhost"), new ServerAddress("localhost:27018"));
+        Mongo mongo = new MongoClient(seedList);
+        try {
+            assertEquals(seedList, mongo.getAllAddress());
+            try {
+                mongo.getAllAddress().add(new ServerAddress("localhost:27019"));
+                fail("Address list modification should be unsupported");
+            } catch (UnsupportedOperationException e) {
+                // all good
+            }
+
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    public void shouldDefaultToPrimaryReadPreference() throws UnknownHostException {
+        Mongo mongo = new MongoClient();
+        try {
+            assertEquals(ReadPreference.primary(), mongo.getReadPreference());
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    public void shouldAllowRequiredReplicaSetNameForSingleServerConstructors() throws UnknownHostException {
+        Mongo mongo = new MongoClient("localhost", MongoClientOptions.builder().requiredReplicaSetName("test").build());
+        mongo.close();
+
+        mongo = new MongoClient(new ServerAddress(), MongoClientOptions.builder().requiredReplicaSetName("test").build());
+        mongo.close();
+
+        mongo = new MongoClient(new MongoClientURI("mongodb://localhost/?setName=test"));
+        mongo.close();
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void shouldSaveDefaultReadPreference() throws UnknownHostException {
+        Mongo mongo = new MongoClient();
+        try {
+            mongo.setReadPreference(ReadPreference.nearest());
+            assertEquals(ReadPreference.nearest(), mongo.getReadPreference());
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void shouldSaveDefaultWriteConcern() throws UnknownHostException {
+        Mongo mongo = new MongoClient();
+        try {
+            mongo.setWriteConcern(WriteConcern.ACKNOWLEDGED);
+            assertEquals(WriteConcern.ACKNOWLEDGED, mongo.getWriteConcern());
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    public void shouldCloseWithoutExceptionWhenCursorFinalizerIsDisabled() {
+        Mongo mongo = new MongoClient(new ServerAddress(), MongoClientOptions.builder().cursorFinalizerEnabled(false).build());
+        mongo.close();
+    }
+
+    @Test
+    @SuppressWarnings("deprecation") // This is for testing the old API, so it will use deprecated methods
+    public void shouldGetDB() throws UnknownHostException {
+        Mongo mongo = new MongoClient();
+        try {
+            DB db = mongo.getDB("test");
+            assertNotNull(db);
+            assertEquals("test", db.getName());
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    @SuppressWarnings("deprecation") // This is for testing the old API, so it will use deprecated methods
+    public void shouldGetSameDB() throws UnknownHostException {
+        Mongo mongo = new MongoClient();
+        try {
+            assertSame(mongo.getDB("test"), mongo.getDB("test"));
+        } finally {
+            mongo.close();
+        }
+    }
+
+    @Test
+    public void shouldGetCredential() {
+        MongoClient mongoClient = new MongoClient();
+        try {
+            assertNull(mongoClient.getCredential());
+        } finally {
+            mongoClient.close();
+        }
+
+        mongoClient = new MongoClient(new ServerAddress(),
+                asList(createCredential("u1", "test1", "p1".toCharArray()),
+                        createCredential("u2", "test2", "p2".toCharArray())));
+        try {
+            mongoClient.getCredential();
+            fail();
+        } catch (IllegalStateException e) {
+            // ignore
+        } finally {
+            mongoClient.close();
+        }
+
+        MongoCredential credential = createCredential("u1", "test1", "p1".toCharArray());
+        mongoClient = new MongoClient(new ServerAddress(), credential, MongoClientOptions.builder().build());
+        try {
+            assertEquals(credential, mongoClient.getCredential());
+        } finally {
+            mongoClient.close();
+        }
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/MongoOptionsTest.java b/driver-legacy/src/test/unit/com/mongodb/MongoOptionsTest.java
similarity index 97%
rename from driver/src/test/unit/com/mongodb/MongoOptionsTest.java
rename to driver-legacy/src/test/unit/com/mongodb/MongoOptionsTest.java
index 3566398d38e..8d98a58b910 100644
--- a/driver/src/test/unit/com/mongodb/MongoOptionsTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/MongoOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +29,10 @@
 /**
  * The mongo options test.
  */
+@SuppressWarnings("deprecation")
 public class MongoOptionsTest {
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testCopy() throws Exception {
 
         MongoOptions options = new MongoOptions();
@@ -79,7 +79,6 @@ public void testCopy() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testGetterSetters() throws Exception {
 
         MongoOptions options = new MongoOptions();
@@ -126,7 +125,6 @@ public void testGetterSetters() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testGetWriteConcern() {
         MongoOptions options = new MongoOptions();
         assertEquals(WriteConcern.NORMAL, options.getWriteConcern());
@@ -153,7 +151,6 @@ public void testGetWriteConcern() {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testToClientOptions() throws UnknownHostException {
         MongoOptions options = new MongoOptions();
         options.description = "my client";
diff --git a/driver/src/test/unit/com/mongodb/MongoSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/MongoSpecification.groovy
similarity index 78%
rename from driver/src/test/unit/com/mongodb/MongoSpecification.groovy
rename to driver-legacy/src/test/unit/com/mongodb/MongoSpecification.groovy
index 82e50982b27..fcd42e106d1 100644
--- a/driver/src/test/unit/com/mongodb/MongoSpecification.groovy
+++ b/driver-legacy/src/test/unit/com/mongodb/MongoSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,21 @@
 
 package com.mongodb
 
+import com.mongodb.client.internal.OperationExecutor
 import com.mongodb.connection.Cluster
 import com.mongodb.connection.ClusterConnectionMode
 import com.mongodb.connection.ClusterDescription
 import com.mongodb.connection.ClusterType
+import com.mongodb.operation.CurrentOpOperation
+import com.mongodb.operation.FsyncUnlockOperation
 import org.bson.BsonBoolean
 import org.bson.BsonDocument
 import org.bson.BsonInt32
 import spock.lang.Specification
 import spock.lang.Subject
 
+import static com.mongodb.CustomMatchers.compare
+
 @SuppressWarnings('UnnecessaryParenthesesForMethodCallWithClosure')
 class MongoSpecification extends Specification {
     private final ClusterDescription clusterDescription = Mock()
@@ -94,16 +99,23 @@ class MongoSpecification extends Specification {
 
     def 'should lock and unlock as server'() {
         given:
-        DBCollection unlockCollection = Mock()
-        DBCollection inprogCollection = Mock()
-        DB db = Mock() {
-            getCollection('$cmd.sys.unlock') >> unlockCollection
-            getCollection('$cmd.sys.inprog') >> inprogCollection
-        }
+        DB db = Mock(DB)
         mongo = Spy(Mongo, constructorArgs: [cluster, MongoClientOptions.builder().build(), []]) {
-            getDB('admin') >> db
-            execute(_, _) >> new BsonDocument('fsyncLock', BsonBoolean.TRUE)
-            execute(_) >> new BsonDocument('ok', new BsonInt32(1))
+            1 * getDB('admin') >> db
+            1 * createOperationExecutor() >> {
+                Mock(OperationExecutor) {
+                    1 * execute({ compare(new CurrentOpOperation(), it) }, ReadPreference.primary(), _) >> {
+                        new BsonDocument('fsyncLock', BsonBoolean.TRUE)
+                    }
+                }
+            }
+            1 * createOperationExecutor() >> {
+                Mock(OperationExecutor) {
+                    1 * execute({ compare(new FsyncUnlockOperation(), it) }, ReadPreference.primary(), _) >> {
+                        new BsonDocument('ok', new BsonInt32(1))
+                    }
+                }
+            }
         }
 
         when:
diff --git a/driver/src/test/unit/com/mongodb/ReplicaSetStatusSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/ReplicaSetStatusSpecification.groovy
similarity index 90%
rename from driver/src/test/unit/com/mongodb/ReplicaSetStatusSpecification.groovy
rename to driver-legacy/src/test/unit/com/mongodb/ReplicaSetStatusSpecification.groovy
index 346d2f2db6c..6c625e3e1d5 100644
--- a/driver/src/test/unit/com/mongodb/ReplicaSetStatusSpecification.groovy
+++ b/driver-legacy/src/test/unit/com/mongodb/ReplicaSetStatusSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,6 +83,13 @@ class ReplicaSetStatusSpecification extends Specification {
         !replicaSetStatus.isMaster(new ServerAddress('localhost', 4000));
     }
 
+    def 'should test specific server for being master when there is no primary'() throws UnknownHostException {
+        given:
+        clusterDescription.getPrimaries() >> []
+
+        expect:
+        !replicaSetStatus.isMaster(new ServerAddress('localhost', 4000));
+    }
 
     def 'should return max bson object size'() {
         given:
diff --git a/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionCountOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionCountOptionsSpecification.groovy
new file mode 100644
index 00000000000..920065e2439
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionCountOptionsSpecification.groovy
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import com.mongodb.BasicDBObject
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+class DBCollectionCountOptionsSpecification extends Specification {
+
+    def 'should have the expected default values'() {
+        when:
+        def options = new DBCollectionCountOptions()
+
+        then:
+        options.getCollation() == null
+        options.getHint() == null
+        options.getHintString() == null
+        options.getLimit() == 0
+        options.getMaxTime(TimeUnit.MILLISECONDS) == 0
+        options.getReadConcern() == null
+        options.getReadPreference() == null
+        options.getSkip() == 0
+    }
+
+    def 'should set and return the expected values'() {
+        given:
+        def collation = Collation.builder().locale('en').build()
+        def readConcern = ReadConcern.LOCAL
+        def readPreference = ReadPreference.nearest()
+        def hint = BasicDBObject.parse('{a: 1}')
+        def hintString = 'a_1'
+
+        when:
+        def options = new DBCollectionCountOptions()
+                .collation(collation)
+                .hint(hint)
+                .hintString(hintString)
+                .limit(1)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .readConcern(readConcern)
+                .readPreference(readPreference)
+                .skip(1)
+
+        then:
+        options.getCollation() == collation
+        options.getHint() == hint
+        options.getHintString() == hintString
+        options.getLimit() == 1
+        options.getMaxTime(TimeUnit.MILLISECONDS) == 1
+        options.getReadConcern() == readConcern
+        options.getReadPreference() == readPreference
+        options.getSkip() == 1
+    }
+
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionDistinctOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionDistinctOptionsSpecification.groovy
new file mode 100644
index 00000000000..c25c2c44875
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionDistinctOptionsSpecification.groovy
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import com.mongodb.BasicDBObject
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import spock.lang.Specification
+
+class DBCollectionDistinctOptionsSpecification extends Specification {
+
+    def 'should have the expected default values'() {
+        when:
+        def options = new DBCollectionDistinctOptions()
+
+        then:
+        options.getCollation() == null
+        options.getFilter() == null
+        options.getReadConcern() == null
+        options.getReadPreference() == null
+    }
+
+    def 'should set and return the expected values'() {
+        given:
+        def collation = Collation.builder().locale('en').build()
+        def readConcern = ReadConcern.LOCAL
+        def readPreference = ReadPreference.nearest()
+        def filter = BasicDBObject.parse('{a: 1}')
+
+        when:
+        def options = new DBCollectionDistinctOptions()
+                .collation(collation)
+                .filter(filter)
+                .readConcern(readConcern)
+                .readPreference(readPreference)
+
+        then:
+        options.getCollation() == collation
+        options.getFilter() == filter
+        options.getReadConcern() == readConcern
+        options.getReadPreference() == readPreference
+    }
+
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionFindAndModifyOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionFindAndModifyOptionsSpecification.groovy
new file mode 100644
index 00000000000..0dc42c85815
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionFindAndModifyOptionsSpecification.groovy
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import com.mongodb.BasicDBObject
+import com.mongodb.WriteConcern
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+class DBCollectionFindAndModifyOptionsSpecification extends Specification {
+
+    def 'should have the expected default values'() {
+        when:
+        def options = new DBCollectionFindAndModifyOptions()
+
+        then:
+        !options.isRemove()
+        !options.isUpsert()
+        !options.returnNew()
+        options.getBypassDocumentValidation() == null
+        options.getCollation() == null
+        options.getArrayFilters() == null
+        options.getMaxTime(TimeUnit.MILLISECONDS) == 0
+        options.getProjection() == null
+        options.getSort() == null
+        options.getUpdate() == null
+        options.getWriteConcern() == null
+    }
+
+    def 'should set and return the expected values'() {
+        given:
+        def collation = Collation.builder().locale('en').build()
+        def writeConcern = WriteConcern.MAJORITY
+        def projection = BasicDBObject.parse('{a: 1, _id: 0}')
+        def sort = BasicDBObject.parse('{a: 1}')
+        def update = BasicDBObject.parse('{$set: {a:  2}}')
+        def arrayFilters = [new BasicDBObject('i.b', 1)]
+
+        when:
+        def options = new DBCollectionFindAndModifyOptions()
+                .bypassDocumentValidation(true)
+                .collation(collation)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .projection(projection)
+                .remove(true)
+                .returnNew(true)
+                .sort(sort)
+                .update(update)
+                .upsert(true)
+                .arrayFilters(arrayFilters)
+                .writeConcern(writeConcern)
+
+        then:
+        options.getBypassDocumentValidation()
+        options.getCollation() == collation
+        options.getMaxTime(TimeUnit.MILLISECONDS) == 1
+        options.getProjection() == projection
+        options.getSort() == sort
+        options.getUpdate() == update
+        options.getWriteConcern() == writeConcern
+        options.isRemove()
+        options.isUpsert()
+        options.returnNew()
+        options.arrayFilters(arrayFilters)
+    }
+
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionFindOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionFindOptionsSpecification.groovy
new file mode 100644
index 00000000000..f9378e40b24
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionFindOptionsSpecification.groovy
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import com.mongodb.BasicDBObject
+import com.mongodb.CursorType
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+class DBCollectionFindOptionsSpecification extends Specification {
+
+    def 'should have the expected default values'() {
+        when:
+        def options = new DBCollectionFindOptions()
+
+        then:
+        !options.isNoCursorTimeout()
+        !options.isOplogReplay()
+        !options.isPartial()
+        options.getBatchSize() == 0
+        options.getCollation() == null
+        options.getCursorType() == CursorType.NonTailable
+        options.getLimit() == 0
+        options.getMaxAwaitTime(TimeUnit.MILLISECONDS) == 0
+        options.getMaxTime(TimeUnit.MILLISECONDS) == 0
+        options.getModifiers() == new BasicDBObject()
+        options.getProjection() == null
+        options.getReadConcern() == null
+        options.getReadPreference() == null
+        options.getSkip() == 0
+        options.getSort() == null
+        options.getComment() == null
+        options.getHint() == null
+        options.getMax() == null
+        options.getMin() == null
+        !options.isReturnKey()
+        !options.isShowRecordId()
+    }
+
+    def 'should set and return the expected values'() {
+        given:
+        def collation = Collation.builder().locale('en').build()
+        def projection = BasicDBObject.parse('{a: 1, _id: 0}')
+        def sort = BasicDBObject.parse('{a: 1}')
+        def cursorType = CursorType.TailableAwait
+        def modifiers = BasicDBObject.parse('{$comment: 1}')
+        def readConcern = ReadConcern.LOCAL
+        def readPreference = ReadPreference.nearest()
+        def comment = 'comment'
+        def hint = BasicDBObject.parse('{x : 1}')
+        def min = BasicDBObject.parse('{y : 1}')
+        def max = BasicDBObject.parse('{y : 100}')
+
+        when:
+        def options = new DBCollectionFindOptions()
+                .batchSize(1)
+                .collation(collation)
+                .cursorType(cursorType)
+                .limit(1)
+                .maxAwaitTime(1, TimeUnit.MILLISECONDS)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .modifiers(modifiers)
+                .noCursorTimeout(true)
+                .oplogReplay(true)
+                .partial(true)
+                .projection(projection)
+                .readConcern(readConcern)
+                .readPreference(readPreference)
+                .skip(1)
+                .sort(sort)
+                .comment(comment)
+                .hint(hint)
+                .max(max)
+                .min(min)
+                .returnKey(true)
+                .showRecordId(true)
+
+        then:
+        options.getBatchSize() == 1
+        options.getCollation() == collation
+        options.getCursorType() == cursorType
+        options.getLimit() == 1
+        options.getMaxAwaitTime(TimeUnit.MILLISECONDS) == 1
+        options.getMaxTime(TimeUnit.MILLISECONDS) == 1
+        options.getModifiers() == modifiers
+        options.getProjection() == projection
+        options.getReadConcern() == readConcern
+        options.getReadPreference() == readPreference
+        options.getSkip() == 1
+        options.getSort() == sort
+        options.isNoCursorTimeout()
+        options.isOplogReplay()
+        options.isPartial()
+        options.getComment() == comment
+        options.getHint() == hint
+        options.getMax() == max
+        options.getMin() == min
+        options.isReturnKey()
+        options.isShowRecordId()
+    }
+
+    def 'it should copy and return the expected values'() {
+        given:
+        def collation = Collation.builder().locale('en').build()
+        def projection = BasicDBObject.parse('{a: 1, _id: 0}')
+        def sort = BasicDBObject.parse('{a: 1}')
+        def cursorType = CursorType.TailableAwait
+        def modifiers = BasicDBObject.parse('{$comment: 1}')
+        def readConcern = ReadConcern.LOCAL
+        def readPreference = ReadPreference.nearest()
+        def comment = 'comment'
+        def hint = BasicDBObject.parse('{x : 1}')
+        def min = BasicDBObject.parse('{y : 1}')
+        def max = BasicDBObject.parse('{y : 100}')
+
+        when:
+        def original = new DBCollectionFindOptions()
+                .batchSize(1)
+                .collation(collation)
+                .cursorType(cursorType)
+                .limit(1)
+                .maxAwaitTime(1, TimeUnit.MILLISECONDS)
+                .maxTime(1, TimeUnit.MILLISECONDS)
+                .modifiers(modifiers)
+                .noCursorTimeout(true)
+                .oplogReplay(true)
+                .partial(true)
+                .projection(projection)
+                .readConcern(readConcern)
+                .readPreference(readPreference)
+                .skip(1)
+                .sort(sort)
+                .comment(comment)
+                .hint(hint)
+                .max(max)
+                .min(min)
+                .returnKey(true)
+                .showRecordId(true)
+
+        def options = original.copy()
+
+        then:
+        original != options
+
+        options.getBatchSize() == 1
+        options.getCollation() == collation
+        options.getCursorType() == cursorType
+        options.getLimit() == 1
+        options.getMaxAwaitTime(TimeUnit.MILLISECONDS) == 1
+        options.getMaxTime(TimeUnit.MILLISECONDS) == 1
+        options.getModifiers() == modifiers
+        options.getProjection() == projection
+        options.getReadConcern() == readConcern
+        options.getReadPreference() == readPreference
+        options.getSkip() == 1
+        options.getSort() == sort
+        options.isNoCursorTimeout()
+        options.isOplogReplay()
+        options.isPartial()
+        options.getComment() == comment
+        options.getHint() == hint
+        options.getMax() == max
+        options.getMin() == min
+        options.isReturnKey()
+        options.isShowRecordId()
+    }
+
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionRemoveOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionRemoveOptionsSpecification.groovy
new file mode 100644
index 00000000000..32c3300853c
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionRemoveOptionsSpecification.groovy
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import com.mongodb.DefaultDBEncoder
+import com.mongodb.WriteConcern
+import spock.lang.Specification
+
+class DBCollectionRemoveOptionsSpecification extends Specification {
+
+    def 'should have the expected default values'() {
+        when:
+        def options = new DBCollectionRemoveOptions()
+
+        then:
+        options.getCollation() == null
+        options.getEncoder() == null
+        options.getWriteConcern() == null
+    }
+
+    def 'should set and return the expected values'() {
+        given:
+        def collation = Collation.builder().locale('en').build()
+        def writeConcern = WriteConcern.MAJORITY
+        def encoder = new DefaultDBEncoder()
+
+        when:
+        def options = new DBCollectionRemoveOptions()
+                .collation(collation)
+                .encoder(encoder)
+                .writeConcern(writeConcern)
+
+        then:
+        options.getCollation() == collation
+        options.getEncoder() == encoder
+        options.getWriteConcern() == writeConcern
+    }
+
+}
diff --git a/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionUpdateOptionsSpecification.groovy b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionUpdateOptionsSpecification.groovy
new file mode 100644
index 00000000000..a755a533740
--- /dev/null
+++ b/driver-legacy/src/test/unit/com/mongodb/client/model/DBCollectionUpdateOptionsSpecification.groovy
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model
+
+import com.mongodb.BasicDBObject
+import com.mongodb.DefaultDBEncoder
+import com.mongodb.WriteConcern
+import spock.lang.Specification
+
+class DBCollectionUpdateOptionsSpecification extends Specification {
+
+    def 'should have the expected default values'() {
+        when:
+        def options = new DBCollectionUpdateOptions()
+
+        then:
+        !options.isMulti()
+        !options.isUpsert()
+        options.getArrayFilters() == null
+        options.getBypassDocumentValidation() == null
+        options.getEncoder() == null
+        options.getWriteConcern() == null
+    }
+
+    def 'should set and return the expected values'() {
+        given:
+        def writeConcern = WriteConcern.MAJORITY
+        def encoder = new DefaultDBEncoder()
+        def arrayFilters = [new BasicDBObject('i.b', 1)]
+
+        when:
+        def options = new DBCollectionUpdateOptions()
+                .bypassDocumentValidation(true)
+                .encoder(encoder)
+                .multi(true)
+                .upsert(true)
+                .arrayFilters(arrayFilters)
+                .writeConcern(writeConcern)
+
+        then:
+        options.getBypassDocumentValidation()
+        options.getEncoder() == encoder
+        options.getWriteConcern() == writeConcern
+        options.isMulti()
+        options.isUpsert()
+        options.getArrayFilters() == arrayFilters
+    }
+
+}
diff --git a/driver/src/test/unit/com/mongodb/util/JSONCallbackTest.java b/driver-legacy/src/test/unit/com/mongodb/util/JSONCallbackTest.java
similarity index 86%
rename from driver/src/test/unit/com/mongodb/util/JSONCallbackTest.java
rename to driver-legacy/src/test/unit/com/mongodb/util/JSONCallbackTest.java
index 025fc2efa31..ae4ea9038fd 100644
--- a/driver/src/test/unit/com/mongodb/util/JSONCallbackTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/util/JSONCallbackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
-import org.bson.BSON;
 import org.bson.BsonUndefined;
 import org.bson.Transformer;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Binary;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 import org.junit.Test;
 
@@ -36,6 +36,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
+@SuppressWarnings("deprecation")
 public class JSONCallbackTest {
 
     @Test
@@ -65,7 +66,7 @@ public void dateParsing() {
 
     @Test
     public void encodingHooks() {
-        BSON.addDecodingHook(Date.class, new Transformer() {
+        org.bson.BSON.addDecodingHook(Date.class, new Transformer() {
             @Override
             public Object transform(final Object o) {
                 return ((Date) o).getTime();
@@ -81,7 +82,7 @@ public Object transform(final Object o) {
             DBObject doc = (DBObject) JSON.parse("{ date : { \"$date\" : " + now.getTime() + "} }");
             assertEquals(Long.class, doc.get("date").getClass());
         } finally {
-            BSON.removeDecodingHooks(Date.class);
+            org.bson.BSON.removeDecodingHooks(Date.class);
         }
     }
 
@@ -90,6 +91,10 @@ public void binaryParsing() {
         Binary parsedBinary = (Binary) JSON.parse(("{ \"$binary\" : \"YWJjZA==\", \"$type\" : 0 }"));
         assertEquals(0, parsedBinary.getType());
         assertArrayEquals(new byte[]{97, 98, 99, 100}, parsedBinary.getData());
+
+        Binary parsedBinaryWithHexType = (Binary) JSON.parse(("{ \"$binary\" : \"YWJjZA==\", \"$type\" : \"80\" }"));
+        assertEquals((byte) 128, parsedBinaryWithHexType.getType());
+        assertArrayEquals(new byte[]{97, 98, 99, 100}, parsedBinaryWithHexType.getData());
     }
 
     @Test
@@ -133,4 +138,9 @@ public void numberLongParsing() {
 
     }
 
+    @Test
+    public void numberDecimalParsing() {
+        Decimal128 number = (Decimal128) JSON.parse(("{\"$numberDecimal\" : \"314E-2\"}"));
+        assertEquals(number, Decimal128.parse("314E-2"));
+    }
 }
diff --git a/driver/src/test/unit/com/mongodb/util/JSONSerializersTest.java b/driver-legacy/src/test/unit/com/mongodb/util/JSONSerializersTest.java
similarity index 95%
rename from driver/src/test/unit/com/mongodb/util/JSONSerializersTest.java
rename to driver-legacy/src/test/unit/com/mongodb/util/JSONSerializersTest.java
index 11220aea62a..09e33eeff47 100644
--- a/driver/src/test/unit/com/mongodb/util/JSONSerializersTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/util/JSONSerializersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,19 @@
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBRef;
 import org.bson.BsonUndefined;
+import org.bson.internal.Base64;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.BasicBSONList;
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
 import org.bson.types.Symbol;
 import org.junit.Test;
 
-import javax.xml.bind.DatatypeConverter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -44,6 +45,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+@SuppressWarnings("deprecation")
 public class JSONSerializersTest {
 
     @Test
@@ -77,7 +79,7 @@ public void testLegacySerialization() {
         assertEquals("{ \"binary\" : <Binary Data>}", buf.toString());
 
         // test  BOOLEAN
-        testObj = new BasicDBObject("boolean", new Boolean(true));
+        testObj = new BasicDBObject("boolean", Boolean.TRUE);
         buf = new StringBuilder();
         serializer.serialize(testObj, buf);
         assertEquals(buf.toString(), "{ \"boolean\" : true}");
@@ -162,7 +164,7 @@ public void testLegacySerialization() {
         // test  NUMBER
         Random rand = new Random();
         long val = rand.nextLong();
-        Long longVal = new Long(val);
+        Long longVal = val;
         buf = new StringBuilder();
         serializer.serialize(longVal, buf);
         assertEquals(String.valueOf(val), buf.toString());
@@ -187,6 +189,12 @@ public void testLegacySerialization() {
         buf = new StringBuilder();
         serializer.serialize(uuid, buf);
         assertEquals("{ \"$uuid\" : \"" + uuid.toString() + "\"}", buf.toString());
+
+        // test Decimal128
+        Decimal128 decimal128 = Decimal128.parse("3.140");
+        buf = new StringBuilder();
+        serializer.serialize(decimal128, buf);
+        assertEquals("{ \"$numberDecimal\" : \"3.140\"}", buf.toString());
     }
 
     @Test
@@ -195,7 +203,7 @@ public void testStrictSerialization() {
 
         // test  BINARY
         byte[] b = {1, 2, 3, 4};
-        String base64 = DatatypeConverter.printBase64Binary(b);
+        String base64 = Base64.encode(b);
         StringBuilder buf = new StringBuilder();
         serializer.serialize(new Binary(b), buf);
         assertEquals("{ \"$binary\" : \"" + base64 + "\" , \"$type\" : 0}", buf.toString());
diff --git a/driver/src/test/unit/com/mongodb/util/JSONTest.java b/driver-legacy/src/test/unit/com/mongodb/util/JSONTest.java
similarity index 97%
rename from driver/src/test/unit/com/mongodb/util/JSONTest.java
rename to driver-legacy/src/test/unit/com/mongodb/util/JSONTest.java
index b7ea662ecbe..b4984a6327f 100644
--- a/driver/src/test/unit/com/mongodb/util/JSONTest.java
+++ b/driver-legacy/src/test/unit/com/mongodb/util/JSONTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import com.mongodb.BasicDBObject;
 import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DBObject;
-import org.bson.BSON;
 import org.bson.BasicBSONObject;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Code;
@@ -39,6 +38,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+@SuppressWarnings("deprecation")
 public class JSONTest {
 
     @Test
@@ -296,7 +296,7 @@ public void testPattern() {
         assertEquals(serializedPattern, JSON.serialize(pattern));
 
         BasicDBObject a = new BasicDBObject("x", pattern);
-        assertEquals("{ \"x\" : " + serializedPattern + "}", a.toString());
+        assertEquals("{ \"x\" : " + serializedPattern + "}", JSON.serialize(a));
 
         DBObject b = (DBObject) JSON.parse(a.toString());
         assertEquals(Pattern.class, b.get("x").getClass());
@@ -313,7 +313,7 @@ public void testRegexNoOptions() {
         assertEquals(JSON.serialize(pattern), serializedPattern);
 
         BasicDBObject a = new BasicDBObject("x", pattern);
-        assertEquals(a.toString(), "{ \"x\" : " + serializedPattern + "}");
+        assertEquals("{ \"x\" : " + serializedPattern + "}", JSON.serialize(a));
 
         DBObject b = (DBObject) JSON.parse(a.toString());
         assertEquals(Pattern.class, b.get("x").getClass());
@@ -365,7 +365,7 @@ public void testJSONEncoding() throws ParseException {
         format.setCalendar(new GregorianCalendar(new SimpleTimeZone(0, "GMT")));
         assertEquals(format.parse("2011-05-18T18:56:00Z"), a.get("date"));
         Pattern pat = (Pattern) a.get("pat");
-        Pattern pat2 = Pattern.compile(".*", BSON.regexFlags(""));
+        Pattern pat2 = Pattern.compile(".*", org.bson.BSON.regexFlags(""));
         assertEquals(pat.pattern(), pat2.pattern());
         assertEquals(pat.flags(), pat2.flags());
         ObjectId oid = (ObjectId) a.get("oid");
diff --git a/driver-sync/build.gradle b/driver-sync/build.gradle
new file mode 100644
index 00000000000..55009587a03
--- /dev/null
+++ b/driver-sync/build.gradle
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+archivesBaseName = 'mongodb-driver-sync'
+description =  'The MongoDB Synchronous Driver'
+ext {
+    pomName = 'MongoDB Driver'
+}
+
+dependencies {
+    compile project(':bson')
+    compile project(':driver-core')
+
+    testCompile project(':bson').sourceSets.test.output
+    testCompile project(':driver-core').sourceSets.test.output
+}
+
+sourceSets {
+    test.groovy.srcDirs += ['src/examples']
+}
+
+test {
+    exclude 'tour/**'
+}
+
+clirr {
+    excludeFilter = new File("$configDir/clirr-exclude.yml")
+    baseline 'org.mongodb:mongodb-driver-sync:3.8.0'
+    failOnErrors = false
+}
+
+tasks.withType(Checkstyle) {
+    // needed so the Javadoc checks can find the code in other modules
+    classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output)
+}
+
+jar {
+    manifest {
+        instruction 'Automatic-Module-Name', 'org.mongodb.driver.sync.client'
+        instruction 'Build-Version', project.gitVersion
+        instruction 'Import-Package',
+                'org.bson.*',
+                'com.mongodb.*'
+    }
+}
diff --git a/driver-sync/src/examples/documentation/CausalConsistencyExamples.java b/driver-sync/src/examples/documentation/CausalConsistencyExamples.java
new file mode 100644
index 00000000000..5435523e65a
--- /dev/null
+++ b/driver-sync/src/examples/documentation/CausalConsistencyExamples.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package documentation;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonNull;
+import org.bson.Document;
+
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Updates.set;
+
+public final class CausalConsistencyExamples {
+
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * @param args takes an optional single argument for the connection string
+     */
+    public static void main(final String[] args) {
+        setupDatabase();
+        MongoClient client = MongoClients.create();
+
+        // Start Causal Consistency Example 1
+        // Example 1: Use a causally consistent session to ensure that the update occurs before the insert.
+        ClientSession session1 = client.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
+        Date currentDate = new Date();
+        MongoCollection<Document> items = client.getDatabase("test")
+                .withReadConcern(ReadConcern.MAJORITY)
+                .withWriteConcern(WriteConcern.MAJORITY.withWTimeout(1000, TimeUnit.MILLISECONDS))
+                .getCollection("test");
+
+        items.updateOne(session1, eq("sku", "111"), set("end", currentDate));
+
+        Document document = new Document("sku", "nuts-111")
+                .append("name", "Pecans")
+                .append("start", currentDate);
+        items.insertOne(session1, document);
+        // End Causal Consistency Example 1
+
+        // Start Causal Consistency Example 2
+        // Example 2: Advance the cluster time and the operation time to that of the other session to ensure that
+        // this client is causally consistent with the other session and read after the two writes.
+        ClientSession session2 = client.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
+        session2.advanceClusterTime(session1.getClusterTime());
+        session2.advanceOperationTime(session1.getOperationTime());
+
+        items = client.getDatabase("test")
+                .withReadPreference(ReadPreference.secondary())
+                .withReadConcern(ReadConcern.MAJORITY)
+                .withWriteConcern(WriteConcern.MAJORITY.withWTimeout(1000, TimeUnit.MILLISECONDS))
+                .getCollection("items");
+
+        for (Document item: items.find(session2, eq("end", BsonNull.VALUE))) {
+            System.out.println(item);
+        }
+        // End Causal Consistency Example 2
+    }
+
+    private static void setupDatabase() {
+        MongoClient client = MongoClients.create();
+        client.getDatabase("test").drop();
+
+        MongoDatabase database = client.getDatabase("test");
+        database.getCollection("items").drop();
+        MongoCollection<Document> items = database.getCollection("items");
+
+        Document document = new Document("sku", "111")
+                .append("name", "Peanuts")
+                .append("start", new Date());
+        items.insertOne(document);
+        client.close();
+    }
+
+    private CausalConsistencyExamples() {}
+}
diff --git a/driver-sync/src/examples/documentation/ChangeStreamSamples.java b/driver-sync/src/examples/documentation/ChangeStreamSamples.java
new file mode 100644
index 00000000000..8da36836212
--- /dev/null
+++ b/driver-sync/src/examples/documentation/ChangeStreamSamples.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package documentation;
+
+import com.mongodb.client.MongoChangeStreamCursor;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Updates;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.FullDocument;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+
+
+public final class ChangeStreamSamples {
+
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * @param args takes an optional single argument for the connection string
+     */
+    public static void main(final String[] args) {
+        MongoClient mongoClient;
+
+        if (args.length == 0) {
+            // connect to the local database server
+            mongoClient = MongoClients.create("mongodb://localhost:27017,localhost:27018,localhost:27019");
+        } else {
+            mongoClient = MongoClients.create(args[0]);
+        }
+
+        // Select the MongoDB database.
+        MongoDatabase database = mongoClient.getDatabase("testChangeStreams");
+        database.drop();
+        sleep();
+
+        // Select the collection to query.
+        MongoCollection<Document> collection = database.getCollection("documents");
+
+        /*
+         * Example 1
+         * Create a simple change stream against an existing collection.
+         */
+        System.out.println("1. Initial document from the Change Stream:");
+
+        // Create the change stream cursor.
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+
+        // Insert a test document into the collection.
+        collection.insertOne(Document.parse("{username: 'alice123', name: 'Alice'}"));
+        ChangeStreamDocument<Document> next = cursor.next();
+        System.out.println(next);
+        cursor.close();
+        sleep();
+
+        /*
+         * Example 2
+         * Create a change stream with 'lookup' option enabled.
+         * The test document will be returned with a full version of the updated document.
+         */
+        System.out.println("2. Document from the Change Stream, with lookup enabled:");
+
+        // Create the change stream cursor.
+        cursor = collection.watch().fullDocument(FullDocument.UPDATE_LOOKUP).cursor();
+
+        // Update the test document.
+        collection.updateOne(Document.parse("{username: 'alice123'}"), Document.parse("{$set : { email: 'alice@example.com'}}"));
+
+        // Block until the next result is returned
+        next = cursor.next();
+        System.out.println(next);
+        cursor.close();
+        sleep();
+
+        /*
+         * Example 3
+         * Create a change stream with 'lookup' option using a $match and ($redact or $project) stage.
+         */
+        System.out.println("3. Document from the Change Stream, with lookup enabled, matching `update` operations only: ");
+
+        // Insert some dummy data.
+        collection.insertMany(asList(Document.parse("{updateMe: 1}"), Document.parse("{replaceMe: 1}")));
+
+        // Create $match pipeline stage.
+        List<Bson> pipeline = singletonList(
+                Aggregates.match(
+                        Filters.or(
+                                Document.parse("{'fullDocument.username': 'alice123'}"),
+                                Filters.in("operationType", asList("update", "replace", "delete"))
+                        )
+                )
+        );
+
+        // Create the change stream cursor with $match.
+        cursor = collection.watch(pipeline).fullDocument(FullDocument.UPDATE_LOOKUP).cursor();
+
+        // Forward to the end of the change stream
+        next = cursor.tryNext();
+
+        // Update the test document.
+        collection.updateOne(Filters.eq("updateMe", 1), Updates.set("updated", true));
+        next = cursor.next();
+        System.out.println(format("Update operationType: %s %n %s", next.getUpdateDescription(), next));
+
+        // Replace the test document.
+        collection.replaceOne(Filters.eq("replaceMe", 1), Document.parse("{replaced: true}"));
+        next = cursor.next();
+        System.out.println(format("Replace operationType: %s", next));
+
+        // Delete the test document.
+        collection.deleteOne(Filters.eq("username", "alice123"));
+        next = cursor.next();
+        System.out.println(format("Delete operationType: %s", next));
+        cursor.close();
+        sleep();
+
+        /**
+         * Example 4
+         * Resume a change stream using a resume token.
+         */
+        System.out.println("4. Document from the Change Stream including a resume token:");
+
+        // Get the resume token from the last document we saw in the previous change stream cursor.
+        BsonDocument resumeToken = cursor.getResumeToken();
+        System.out.println(resumeToken);
+
+        // Pass the resume token to the resume after function to continue the change stream cursor.
+        cursor = collection.watch().resumeAfter(resumeToken).cursor();
+
+        // Insert a test document.
+        collection.insertOne(Document.parse("{test: 'd'}"));
+
+        // Block until the next result is returned
+        next = cursor.next();
+        System.out.println(next);
+        cursor.close();
+    }
+
+    private static void sleep() {
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            // Ignore.
+        }
+    }
+
+    private ChangeStreamSamples() {
+    }
+}
diff --git a/driver-sync/src/examples/documentation/DocumentationSamples.java b/driver-sync/src/examples/documentation/DocumentationSamples.java
new file mode 100644
index 00000000000..95501bf56ad
--- /dev/null
+++ b/driver-sync/src/examples/documentation/DocumentationSamples.java
@@ -0,0 +1,794 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package documentation;
+
+import com.mongodb.Block;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.DatabaseTestCase;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Field;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.Indexes;
+import com.mongodb.client.model.Variable;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.FullDocument;
+import org.bson.BsonDocument;
+import org.bson.BsonType;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.junit.After;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClient;
+import static com.mongodb.client.model.Accumulators.sum;
+import static com.mongodb.client.model.Aggregates.addFields;
+import static com.mongodb.client.model.Aggregates.group;
+import static com.mongodb.client.model.Aggregates.lookup;
+import static com.mongodb.client.model.Aggregates.match;
+import static com.mongodb.client.model.Aggregates.project;
+import static com.mongodb.client.model.Aggregates.sort;
+import static com.mongodb.client.model.Aggregates.unwind;
+import static com.mongodb.client.model.Filters.all;
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.elemMatch;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.exists;
+import static com.mongodb.client.model.Filters.expr;
+import static com.mongodb.client.model.Filters.gt;
+import static com.mongodb.client.model.Filters.in;
+import static com.mongodb.client.model.Filters.lt;
+import static com.mongodb.client.model.Filters.lte;
+import static com.mongodb.client.model.Filters.or;
+import static com.mongodb.client.model.Filters.regex;
+import static com.mongodb.client.model.Filters.size;
+import static com.mongodb.client.model.Filters.type;
+import static com.mongodb.client.model.Projections.computed;
+import static com.mongodb.client.model.Projections.exclude;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
+import static com.mongodb.client.model.Projections.slice;
+import static com.mongodb.client.model.Sorts.ascending;
+import static com.mongodb.client.model.Updates.combine;
+import static com.mongodb.client.model.Updates.currentDate;
+import static com.mongodb.client.model.Updates.set;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+// imports required for change streams
+// end required change streams imports
+// imports required for filters, projections and updates
+// end required filters, projections and updates imports
+
+
+public final class DocumentationSamples extends DatabaseTestCase {
+
+    private final MongoDatabase database = getMongoClient().getDatabase(getDefaultDatabaseName());
+    private final MongoCollection<Document> collection = database.getCollection("inventory");
+
+    @Test
+    public void testInsert() {
+
+        // Start Example 1
+        Document canvas = new Document("item", "canvas")
+                .append("qty", 100)
+                .append("tags", singletonList("cotton"));
+
+        Document size = new Document("h", 28)
+                .append("w", 35.5)
+                .append("uom", "cm");
+        canvas.put("size", size);
+
+        collection.insertOne(canvas);
+        // End Example 1
+
+        // Start Example 2
+        FindIterable<Document> findIterable = collection.find(eq("item", "canvas"));
+        // End Example 2
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 3
+        Document journal = new Document("item", "journal")
+                .append("qty", 25)
+                .append("tags", asList("blank", "red"));
+
+        Document journalSize = new Document("h", 14)
+                .append("w", 21)
+                .append("uom", "cm");
+        journal.put("size", journalSize);
+
+        Document mat = new Document("item", "mat")
+                .append("qty", 85)
+                .append("tags", singletonList("gray"));
+
+        Document matSize = new Document("h", 27.9)
+                .append("w", 35.5)
+                .append("uom", "cm");
+        mat.put("size", matSize);
+
+        Document mousePad = new Document("item", "mousePad")
+                .append("qty", 25)
+                .append("tags", asList("gel", "blue"));
+
+        Document mousePadSize = new Document("h", 19)
+                .append("w", 22.85)
+                .append("uom", "cm");
+        mousePad.put("size", mousePadSize);
+
+        collection.insertMany(asList(journal, mat, mousePad));
+        // End Example 3
+
+        assertEquals(4, collection.countDocuments());
+    }
+
+    @Test
+    public void testQueryingAtTheTopLevel() {
+        // Start Example 6
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'A' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }")
+        ));
+        // End Example 6
+
+        assertEquals(5, collection.countDocuments());
+
+        // Start Example 7
+        FindIterable<Document> findIterable = collection.find(new Document());
+        // End Example 7
+
+        assertEquals(5, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 8
+        findIterable = collection.find();
+        // End Example 8
+
+        assertEquals(5, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 9
+        findIterable = collection.find(eq("status", "D"));
+        // End Example 9
+
+        assertEquals(2, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 10
+        findIterable = collection.find(in("status", "A", "D"));
+        // End Example 10
+
+        assertEquals(5, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 11
+        findIterable = collection.find(and(eq("status", "A"), lt("qty", 30)));
+        // End Example 11
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 12
+        findIterable = collection.find(or(eq("status", "A"), lt("qty", 30)));
+        // End Example 12
+
+        assertEquals(3, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 13
+        findIterable = collection.find(
+                and(eq("status", "A"),
+                        or(lt("qty", 30), regex("item", "^p")))
+        );
+        // End Example 13
+
+        assertEquals(2, findIterable.into(new ArrayList<Document>()).size());
+    }
+
+    @Test
+    public void testQueryingEmbeddedDocuments() {
+        // Start Example 14
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'A' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }")
+        ));
+        // End Example 14
+
+        assertEquals(5, collection.countDocuments());
+
+        // Start Example 15
+        FindIterable<Document> findIterable = collection.find(eq("size", Document.parse("{ h: 14, w: 21, uom: 'cm' }")));
+        // End Example 15
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 16
+        findIterable = collection.find(eq("size", Document.parse("{ w: 21, h: 14, uom: 'cm' }")));
+        // End Example 16
+
+        assertEquals(0, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 17
+        findIterable = collection.find(eq("size.uom", "in"));
+        // End Example 17
+
+        assertEquals(2, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 18
+        findIterable = collection.find(lt("size.h", 15));
+        // End Example 18
+
+        assertEquals(4, findIterable.into(new ArrayList<Document>()).size());
+
+        // Start Example 19
+        findIterable = collection.find(and(
+                lt("size.h", 15),
+                eq("size.uom", "in"),
+                eq("status", "D")
+        ));
+        // End Example 19
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+    }
+
+    @Test
+    public void testQueryingArrayValues() {
+
+        //Start Example 20
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, tags: ['blank', 'red'], dim_cm: [ 14, 21 ] }"),
+                Document.parse("{ item: 'notebook', qty: 50, tags: ['red', 'blank'], dim_cm: [ 14, 21 ] }"),
+                Document.parse("{ item: 'paper', qty: 100, tags: ['red', 'blank', 'plain'], dim_cm: [ 14, 21 ] }"),
+                Document.parse("{ item: 'planner', qty: 75, tags: ['blank', 'red'], dim_cm: [ 22.85, 30 ] }"),
+                Document.parse("{ item: 'postcard', qty: 45, tags: ['blue'], dim_cm: [ 10, 15.25 ] }")
+        ));
+        //End Example 20
+
+        assertEquals(5, collection.countDocuments());
+
+        //Start Example 21
+        FindIterable<Document> findIterable = collection.find(eq("tags", asList("red", "blank")));
+        //End Example 21
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 22
+        findIterable = collection.find(all("tags", asList("red", "blank")));
+        //End Example 22
+
+        assertEquals(4, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 23
+        findIterable = collection.find(eq("tags", "red"));
+        //End Example 23
+
+        assertEquals(4, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 24
+        findIterable = collection.find(gt("dim_cm", 25));
+        //End Example 24
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 25
+        findIterable = collection.find(and(gt("dim_cm", 15), lt("dim_cm", 20)));
+        //End Example 25
+
+        assertEquals(4, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 26
+        findIterable = collection.find(elemMatch("dim_cm", Document.parse("{ $gt: 22, $lt: 30 }")));
+        //End Example 26
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 27
+        findIterable = collection.find(gt("dim_cm.1", 25));
+        //End Example 27
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 28
+        findIterable = collection.find(size("tags", 3));
+        //End Example 28
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+    }
+
+    @Test
+    public void testQueryingArraysContainingDocuments() {
+
+        //Start Example 29
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', instock: [ { warehouse: 'A', qty: 5 }, { warehouse: 'C', qty: 15 } ] }"),
+                Document.parse("{ item: 'notebook', instock: [ { warehouse: 'C', qty: 5 } ] }"),
+                Document.parse("{ item: 'paper', instock: [ { warehouse: 'A', qty: 60 }, { warehouse: 'B', qty: 15 } ] }"),
+                Document.parse("{ item: 'planner', instock: [ { warehouse: 'A', qty: 40 }, { warehouse: 'B', qty: 5 } ] }"),
+                Document.parse("{ item: 'postcard', instock: [ { warehouse: 'B', qty: 15 }, { warehouse: 'C', qty: 35 } ] }")
+        ));
+        //End Example 29
+
+        assertEquals(5, collection.countDocuments());
+
+        //Start Example 30
+        FindIterable<Document> findIterable = collection.find(eq("instock", Document.parse("{ warehouse: 'A', qty: 5 }")));
+        //End Example 30
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 31
+        findIterable = collection.find(eq("instock", Document.parse("{ qty: 5, warehouse: 'A' }")));
+        //End Example 31
+
+        assertEquals(0, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 32
+        findIterable = collection.find(lte("instock.0.qty", 20));
+        //End Example 32
+
+        assertEquals(3, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 33
+        findIterable = collection.find(lte("instock.qty", 20));
+        //End Example 33
+
+        assertEquals(5, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 34
+        findIterable = collection.find(elemMatch("instock", Document.parse("{ qty: 5, warehouse: 'A' }")));
+        //End Example 34
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 35
+        findIterable = collection.find(elemMatch("instock", Document.parse("{ qty: { $gt: 10, $lte: 20 } }")));
+        //End Example 35
+
+        assertEquals(3, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 36
+        findIterable = collection.find(and(gt("instock.qty", 10), lte("instock.qty", 20)));
+        //End Example 36
+
+        assertEquals(4, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 37
+        findIterable = collection.find(and(eq("instock.qty", 5), eq("instock.warehouse", "A")));
+        //End Example 37
+
+        assertEquals(2, findIterable.into(new ArrayList<Document>()).size());
+    }
+
+    @Test
+    public void testQueryingNullandMissingFields() {
+
+        //Start Example 38
+        collection.insertMany(asList(
+                Document.parse("{'_id': 1, 'item': null}"),
+                Document.parse("{'_id': 2}")
+        ));
+        //End Example 38
+
+        assertEquals(2, collection.countDocuments());
+
+        //Start Example 39
+        FindIterable<Document> findIterable = collection.find(eq("item", null));
+        //End Example 39
+
+        assertEquals(2, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 40
+        findIterable = collection.find(type("item", BsonType.NULL));
+        //End Example 40
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 41
+        findIterable = collection.find(exists("item", false));
+        //End Example 41
+
+        assertEquals(1, findIterable.into(new ArrayList<Document>()).size());
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testProjectingFields() {
+
+        //Start Example 42
+        collection.insertMany(asList(
+            Document.parse("{ item: 'journal', status: 'A', size: { h: 14, w: 21, uom: 'cm' }, instock: [ { warehouse: 'A', qty: 5 }]}"),
+            Document.parse("{ item: 'notebook', status: 'A',  size: { h: 8.5, w: 11, uom: 'in' }, instock: [ { warehouse: 'C', qty: 5}]}"),
+            Document.parse("{ item: 'paper', status: 'D', size: { h: 8.5, w: 11, uom: 'in' }, instock: [ { warehouse: 'A', qty: 60 }]}"),
+            Document.parse("{ item: 'planner', status: 'D', size: { h: 22.85, w: 30, uom: 'cm' }, instock: [ { warehouse: 'A', qty: 40}]}"),
+            Document.parse("{ item: 'postcard', status: 'A', size: { h: 10, w: 15.25, uom: 'cm' }, "
+                    + "instock: [ { warehouse: 'B', qty: 15 }, { warehouse: 'C', qty: 35 } ] }")
+        ));
+        //End Example 42
+
+        assertEquals(5, collection.countDocuments());
+
+        //Start Example 43
+        FindIterable<Document> findIterable = collection.find(eq("status", "A"));
+        //End Example 43
+
+        assertEquals(3, findIterable.into(new ArrayList<Document>()).size());
+
+        //Start Example 44
+        findIterable = collection.find(eq("status", "A")).projection(include("item", "status"));
+        //End Example 44
+
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "status")), document.keySet());
+            }
+        });
+
+        //Start Example 45
+        findIterable = collection.find(eq("status", "A"))
+                .projection(fields(include("item", "status"), excludeId()));
+        //End Example 45
+
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("item", "status")), document.keySet());
+            }
+        });
+
+        //Start Example 46
+        findIterable = collection.find(eq("status", "A")).projection(exclude("item", "status"));
+        //End Example 46
+
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "size", "instock")), document.keySet());
+            }
+        });
+
+        //Start Example 47
+        findIterable = collection.find(eq("status", "A")).projection(include("item", "status", "size.uom"));
+        //End Example 47
+
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "status", "size")), document.keySet());
+                assertEquals(new HashSet<String>(singletonList("uom")), document.get("size", Document.class).keySet());
+            }
+        });
+
+        //Start Example 48
+        findIterable = collection.find(eq("status", "A")).projection(exclude("size.uom"));
+        //End Example 48
+
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "instock", "status", "size")), document.keySet());
+                assertEquals(new HashSet<String>(asList("h", "w")), document.get("size", Document.class).keySet());
+            }
+        });
+
+        //Start Example 49
+        findIterable = collection.find(eq("status", "A")).projection(include("item", "status", "instock.qty"));
+        //End Example 49
+
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "instock", "status")), document.keySet());
+
+                List<Document> instock = (List<Document>) document.get("instock");
+                for (Document stockDocument : instock) {
+                    assertEquals(new HashSet<String>(singletonList("qty")), stockDocument.keySet());
+                }
+            }
+        });
+
+        //Start Example 50
+        findIterable = collection.find(eq("status", "A"))
+                .projection(fields(include("item", "status"), slice("instock", -1)));
+        //End Example 50
+
+        findIterable.forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(new HashSet<String>(asList("_id", "item", "instock", "status")), document.keySet());
+
+                List<Document> instock = (List<Document>) document.get("instock");
+                assertEquals(1, instock.size());
+            }
+        });
+    }
+
+    @Test
+    public void testAggregate() {
+
+        assumeTrue(serverVersionAtLeast(3, 6));
+
+        MongoCollection<Document> salesCollection = database.getCollection("sales");
+
+        // Start Aggregation Example 1
+        AggregateIterable<Document> aggregateIterable = salesCollection.aggregate(asList(
+                match(eq("items.fruit", "banana")),
+                sort(ascending("date"))
+        ));
+        // End Aggregation Example 1
+
+        aggregateIterable.into(new ArrayList<Document>());
+
+        // Start Aggregation Example 2
+        aggregateIterable = salesCollection.aggregate(asList(
+                unwind("$items"),
+                match(eq("items.fruit", "banana")),
+                group(new Document("day", new Document("$dayOfWeek", "$date")),
+                        sum("count", "$items.quantity")),
+                project(fields(
+                        computed("dayOfWeek", "$_id.day"),
+                        computed("numberSold", "$count"),
+                        excludeId())),
+                sort(Indexes.ascending("numberSold"))));
+        // End Aggregation Example 2
+
+        aggregateIterable.into(new ArrayList<Document>());
+
+        // Start Aggregation Example 3
+        aggregateIterable = salesCollection.aggregate(asList(
+                unwind("$items"),
+                group(new Document("day", new Document("$dayOfWeek", "$date")),
+                        sum("items_old", "$items.quantity"),
+                        sum("revenue", new Document("$multiply", asList("$items.quantity", "$items.price")))),
+                project(fields(
+                        computed("day", "$_id.day"),
+                        include("revenue", "items_sold"),
+                        computed("discount",
+                                new Document("$cond",
+                                        new Document("if", new Document("$lte", Arrays.<Object>asList("$revenue", 250)))
+                                                .append("then", 25)
+                                                .append("else", 0)))))));
+        // End Aggregation Example 3
+
+        aggregateIterable.into(new ArrayList<Document>());
+
+        MongoCollection<Document> airAlliancesCollection = database.getCollection("air_alliances");
+
+        // Start Aggregation Example 4
+        aggregateIterable = airAlliancesCollection.aggregate(asList(
+                lookup("air_airlines",
+                        singletonList(new Variable<String>("constituents", "$airlines")),
+                        singletonList(match(expr(new Document("$in", asList("$name", "$$constituents"))))),
+                        "airlines"),
+                project(fields(
+                        excludeId(),
+                        include("name"),
+                        computed("airlines",
+                                new Document("$filter",
+                                        new Document("input", "$airlines")
+                                                .append("as", "airline")
+                                                .append("cond", new Document("$eq", asList("$$airline.country", "Canada")))))))));
+
+        // End Aggregation Example 4
+
+        aggregateIterable.into(new ArrayList<Document>());
+    }
+
+    @Test
+    public void testUpdates() {
+        //Start Example 51
+        collection.insertMany(asList(
+                Document.parse("{ item: 'canvas', qty: 100, size: { h: 28, w: 35.5, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'mat', qty: 85, size: { h: 27.9, w: 35.5, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'mousepad', qty: 25, size: { h: 19, w: 22.85, uom: 'cm' }, status: 'P' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'P' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'sketchbook', qty: 80, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'sketch pad', qty: 95, size: { h: 22.85, w: 30.5, uom: 'cm' }, status: 'A' }")
+        ));
+        //End Example 51
+
+        assertEquals(10, collection.countDocuments());
+
+        //Start Example 52
+        collection.updateOne(eq("item", "paper"),
+                combine(set("size.uom", "cm"), set("status", "P"), currentDate("lastModified")));
+        //End Example 52
+
+        collection.find(eq("item", "paper")).forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals("cm", document.get("size", Document.class).getString("uom"));
+                assertEquals("P", document.getString("status"));
+                assertTrue(document.containsKey("lastModified"));
+            }
+        });
+
+
+        //Start Example 53
+        collection.updateMany(lt("qty", 50),
+                combine(set("size.uom", "in"), set("status", "P"), currentDate("lastModified")));
+        //End Example 53
+
+        collection.find(lt("qty", 50)).forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals("in", document.get("size", Document.class).getString("uom"));
+                assertEquals("P", document.getString("status"));
+                assertTrue(document.containsKey("lastModified"));
+            }
+        });
+
+        //Start Example 54
+        collection.replaceOne(eq("item", "paper"),
+                Document.parse("{ item: 'paper', instock: [ { warehouse: 'A', qty: 60 }, { warehouse: 'B', qty: 40 } ] }"));
+        //End Example 54
+
+        collection.find(eq("item", "paper")).projection(excludeId()).forEach(new Block<Document>() {
+            @Override
+            public void apply(final Document document) {
+                assertEquals(Document.parse("{ item: 'paper', instock: [ { warehouse: 'A', qty: 60 }, { warehouse: 'B', qty: 40 } ] }"),
+                        document);
+            }
+        });
+
+    }
+
+    @Test
+    public void testDeletions() {
+
+        //Start Example 55
+        collection.insertMany(asList(
+                Document.parse("{ item: 'journal', qty: 25, size: { h: 14, w: 21, uom: 'cm' }, status: 'A' }"),
+                Document.parse("{ item: 'notebook', qty: 50, size: { h: 8.5, w: 11, uom: 'in' }, status: 'A' }"),
+                Document.parse("{ item: 'paper', qty: 100, size: { h: 8.5, w: 11, uom: 'in' }, status: 'D' }"),
+                Document.parse("{ item: 'planner', qty: 75, size: { h: 22.85, w: 30, uom: 'cm' }, status: 'D' }"),
+                Document.parse("{ item: 'postcard', qty: 45, size: { h: 10, w: 15.25, uom: 'cm' }, status: 'A' }")
+        ));
+        //End Example 55
+
+        assertEquals(5, collection.countDocuments());
+
+        //Start Example 57
+        collection.deleteMany(eq("status", "A"));
+        //End Example 57
+
+        assertEquals(2, collection.countDocuments());
+
+        //Start Example 58
+        collection.deleteOne(eq("status", "D"));
+        //End Example 58
+
+        assertEquals(1, collection.countDocuments());
+
+        //Start Example 56
+        collection.deleteMany(new Document());
+        //End Example 56
+
+        assertEquals(0, collection.countDocuments());
+    }
+
+    @Test
+    public void testWatch() {
+        assumeTrue(isDiscoverableReplicaSet() && serverVersionAtLeast(3, 6));
+
+        final MongoCollection<Document> inventory = collection;
+        final AtomicBoolean stop = new AtomicBoolean(false);
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                while (!stop.get()) {
+                    collection.insertMany(asList(new Document("username", "alice"), new Document()));
+                    try {
+                        Thread.sleep(10);
+                    } catch (InterruptedException e) {
+                        // ignore
+                    }
+                    collection.deleteOne(new Document("username", "alice"));
+                }
+            }
+        }).start();
+
+
+        // Start Changestream Example 1
+        MongoCursor<ChangeStreamDocument<Document>> cursor = inventory.watch().iterator();
+        ChangeStreamDocument<Document> next = cursor.next();
+        // End Changestream Example 1
+
+        cursor.close();
+
+        // Start Changestream Example 2
+        cursor = inventory.watch().fullDocument(FullDocument.UPDATE_LOOKUP).iterator();
+        next = cursor.next();
+        // End Changestream Example 2
+
+        cursor.close();
+
+        // Start Changestream Example 3
+        BsonDocument resumeToken = next.getResumeToken();
+        cursor = inventory.watch().resumeAfter(resumeToken).iterator();
+        next = cursor.next();
+        // End Changestream Example 3
+
+        cursor.close();
+
+        // Start Changestream Example 4
+        List<Bson> pipeline = asList(match(Document.parse("{'fullDocument.username': 'alice'}")),
+                addFields(new Field<String>("newField", "this is an added field!")));
+        cursor = inventory.watch(pipeline).iterator();
+        next = cursor.next();
+        // End Changestream Example 4
+
+        cursor.close();
+
+        stop.set(true);
+    }
+
+    @Test
+    public void testRunCommand() {
+        // Start runCommand Example 1
+        database.runCommand(new Document("buildInfo", 1));
+        // End runCommand Example 1
+
+        database.getCollection("restaurants").drop();
+        database.createCollection("restaurants");
+
+        // Start runCommand Example 2
+        database.runCommand(new Document("collStats", "restaurants"));
+        // End runCommand Example 2
+    }
+
+    @Test
+    public void testCreateIndexes() {
+
+        assumeTrue(serverVersionAtLeast(3, 2));
+
+        // Start Index Example 1
+        collection.createIndex(Indexes.ascending("score"));
+        // End Index Example 1
+
+        // Start Index Example 2
+        collection.createIndex(Indexes.ascending("cuisine", "name"),
+                new IndexOptions().partialFilterExpression(Filters.gt("rating", 5)));
+        // End Index Example 2
+    }
+
+    @After
+    public void tearDown() {
+        collection.drop();
+    }
+}
diff --git a/driver-sync/src/examples/documentation/TransactionExample.java b/driver-sync/src/examples/documentation/TransactionExample.java
new file mode 100644
index 00000000000..7eb4e41f769
--- /dev/null
+++ b/driver-sync/src/examples/documentation/TransactionExample.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2018 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package documentation;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Updates;
+import org.bson.Document;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static org.junit.Assume.assumeTrue;
+
+public class TransactionExample {
+    private MongoClient client;
+
+    @Before
+    public void setUp() {
+        assumeTrue(canRunTest());
+        MongoClientSettings.Builder builder = getMongoClientSettingsBuilder()
+                .applyConnectionString(new ConnectionString(
+                        "mongodb://localhost,localhost:27018,localhost:27019/?serverSelectionTimeoutMS=5000"));
+        client = MongoClients.create(builder.build());
+
+        createCollection(client, "hr", "employees");
+        createCollection(client, "reporting", "events");
+    }
+
+    @After
+    public void cleanUp() {
+        if (client != null) {
+            client.close();
+        }
+    }
+
+    @Test
+    public void updateEmployeeInfoWithRetry() {
+        runTransactionWithRetry(new Runnable() {
+            @Override
+            public void run() {
+                updateEmployeeInfo();
+            }
+        });
+    }
+
+    private void runTransactionWithRetry(final Runnable transactional) {
+        while (true) {
+            try {
+                transactional.run();
+                break;
+            } catch (MongoException e) {
+                System.out.println("Transaction aborted. Caught exception during transaction.");
+
+                if (e.hasErrorLabel(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL)) {
+                    System.out.println("TransientTransactionError, aborting transaction and retrying ...");
+                } else {
+                    throw e;
+                }
+            }
+        }
+    }
+
+    private void commitWithRetry(final ClientSession clientSession) {
+        while (true) {
+            try {
+                clientSession.commitTransaction();
+                System.out.println("Transaction committed");
+                break;
+            } catch (MongoException e) {
+                // can retry commit
+                if (e.hasErrorLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) {
+                    System.out.println("UnknownTransactionCommitResult, retrying commit operation ...");
+                } else {
+                    System.out.println("Exception during commit ...");
+                    throw e;
+                }
+            }
+        }
+    }
+
+    private void updateEmployeeInfo() {
+        MongoCollection<Document> employeesCollection = client.getDatabase("hr").getCollection("employees");
+        MongoCollection<Document> eventsCollection = client.getDatabase("reporting").getCollection("events");
+
+        TransactionOptions txnOptions = TransactionOptions.builder()
+                .readPreference(ReadPreference.primary())
+                .readConcern(ReadConcern.MAJORITY)
+                .writeConcern(WriteConcern.MAJORITY)
+                .build();
+
+        ClientSession clientSession = client.startSession();
+        try {
+            clientSession.startTransaction(txnOptions);
+
+            employeesCollection.updateOne(clientSession,
+                    Filters.eq("employee", 3),
+                    Updates.set("status", "Inactive"));
+            eventsCollection.insertOne(clientSession,
+                    new Document("employee", 3).append("status", new Document("new", "Inactive").append("old", "Active")));
+
+            commitWithRetry(clientSession);
+        } finally {
+            clientSession.close();
+        }
+    }
+
+    private void createCollection(final MongoClient client, final String dbName, final String collectionName) {
+        try {
+            client.getDatabase(dbName).createCollection(collectionName);
+        } catch (MongoCommandException e) {
+            if (!e.getErrorCodeName().equals("NamespaceExists")) {
+                throw e;
+            }
+        }
+    }
+
+    private boolean canRunTest() {
+        if (isSharded()) {
+            return serverVersionAtLeast(4, 1);
+        } else if (isDiscoverableReplicaSet()) {
+            return serverVersionAtLeast(4, 0);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/driver/src/examples/gridfs/GridFSTour.java b/driver-sync/src/examples/gridfs/GridFSTour.java
similarity index 95%
rename from driver/src/examples/gridfs/GridFSTour.java
rename to driver-sync/src/examples/gridfs/GridFSTour.java
index d0ed1d9d076..ac577b1ffc3 100644
--- a/driver/src/examples/gridfs/GridFSTour.java
+++ b/driver-sync/src/examples/gridfs/GridFSTour.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,8 +17,8 @@
 package gridfs;
 
 import com.mongodb.Block;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.gridfs.GridFSBucket;
 import com.mongodb.client.gridfs.GridFSBuckets;
@@ -56,9 +56,9 @@ public static void main(final String[] args) throws FileNotFoundException, IOExc
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // get handle to "mydb" database
diff --git a/driver-sync/src/examples/gridfs/package-info.java b/driver-sync/src/examples/gridfs/package-info.java
new file mode 100644
index 00000000000..2ee200c7122
--- /dev/null
+++ b/driver-sync/src/examples/gridfs/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the gridfs tour example
+ */
+package gridfs;
diff --git a/driver/src/examples/primer/AggregatePrimer.java b/driver-sync/src/examples/primer/AggregatePrimer.java
similarity index 97%
rename from driver/src/examples/primer/AggregatePrimer.java
rename to driver-sync/src/examples/primer/AggregatePrimer.java
index 733bc93b1b9..d791483a29e 100644
--- a/driver/src/examples/primer/AggregatePrimer.java
+++ b/driver-sync/src/examples/primer/AggregatePrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver/src/examples/primer/IndexesPrimer.java b/driver-sync/src/examples/primer/IndexesPrimer.java
similarity index 93%
rename from driver/src/examples/primer/IndexesPrimer.java
rename to driver-sync/src/examples/primer/IndexesPrimer.java
index c2a687333d4..81da072a0a0 100644
--- a/driver/src/examples/primer/IndexesPrimer.java
+++ b/driver-sync/src/examples/primer/IndexesPrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,6 @@
 
 package primer;
 
-
 import org.junit.Test;
 
 // @imports: start
diff --git a/driver/src/examples/primer/InsertPrimer.java b/driver-sync/src/examples/primer/InsertPrimer.java
similarity index 96%
rename from driver/src/examples/primer/InsertPrimer.java
rename to driver-sync/src/examples/primer/InsertPrimer.java
index 89a571dd4aa..a2d69624cec 100644
--- a/driver/src/examples/primer/InsertPrimer.java
+++ b/driver-sync/src/examples/primer/InsertPrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver/src/examples/primer/PrimerTestCase.java b/driver-sync/src/examples/primer/PrimerTestCase.java
similarity index 81%
rename from driver/src/examples/primer/PrimerTestCase.java
rename to driver-sync/src/examples/primer/PrimerTestCase.java
index ec37142ea32..2466cc03578 100644
--- a/driver/src/examples/primer/PrimerTestCase.java
+++ b/driver-sync/src/examples/primer/PrimerTestCase.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,10 @@
 
 package primer;
 
-import com.mongodb.DatabaseTestCase;
+import com.mongodb.client.DatabaseTestCase;
 import com.mongodb.client.MongoDatabase;
 
-import static com.mongodb.Fixture.getMongoClient;
+import static com.mongodb.client.Fixture.getMongoClient;
 
 public class PrimerTestCase extends DatabaseTestCase {
     MongoDatabase db = getDatabase();
diff --git a/driver/src/examples/primer/QueryPrimer.java b/driver-sync/src/examples/primer/QueryPrimer.java
similarity index 96%
rename from driver/src/examples/primer/QueryPrimer.java
rename to driver-sync/src/examples/primer/QueryPrimer.java
index 8bdf1439787..e18d45977cf 100644
--- a/driver/src/examples/primer/QueryPrimer.java
+++ b/driver-sync/src/examples/primer/QueryPrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,8 +23,13 @@
 import com.mongodb.Block;
 import com.mongodb.client.FindIterable;
 
-import static com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.gt;
+import static com.mongodb.client.model.Filters.lt;
+import static com.mongodb.client.model.Filters.or;
 import static com.mongodb.client.model.Sorts.ascending;
+
 import static java.util.Arrays.asList;
 // @imports: end
 
diff --git a/driver/src/examples/primer/RemovePrimer.java b/driver-sync/src/examples/primer/RemovePrimer.java
similarity index 95%
rename from driver/src/examples/primer/RemovePrimer.java
rename to driver-sync/src/examples/primer/RemovePrimer.java
index 1d2d36fba7c..a5c5a16ac0b 100644
--- a/driver/src/examples/primer/RemovePrimer.java
+++ b/driver-sync/src/examples/primer/RemovePrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver/src/examples/primer/UpdatePrimer.java b/driver-sync/src/examples/primer/UpdatePrimer.java
similarity index 91%
rename from driver/src/examples/primer/UpdatePrimer.java
rename to driver-sync/src/examples/primer/UpdatePrimer.java
index a936f11c7a6..05aab852378 100644
--- a/driver/src/examples/primer/UpdatePrimer.java
+++ b/driver-sync/src/examples/primer/UpdatePrimer.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,22 +17,18 @@
 package primer;
 
 import org.junit.Test;
+
 // @import: start
 import org.bson.Document;
 
 import static java.util.Arrays.asList;
 // @import: end
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static org.junit.Assume.assumeTrue;
-
 
 public class UpdatePrimer extends PrimerTestCase {
 
     @Test
     public void updateTopLevelFields() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
-
         // @begin: update-top-level-fields
         // @code: start
         db.getCollection("restaurants").updateOne(new Document("name", "Juni"),
@@ -69,8 +65,6 @@ public void updateEmbeddedField() {
 
     @Test
     public void updateMultipleDocuments() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
-
         // @begin: update-multiple-documents
         // @code: start
         db.getCollection("restaurants").updateMany(new Document("address.zipcode", "10016").append("cuisine", "Other"),
@@ -89,8 +83,6 @@ public void updateMultipleDocuments() {
 
     @Test
     public void replaceDocument() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
-
         // @begin: replace-document
         // @code: start
         db.getCollection("restaurants").replaceOne(new Document("restaurant_id", "41704620"),
diff --git a/driver-sync/src/examples/tour/Address.java b/driver-sync/src/examples/tour/Address.java
new file mode 100644
index 00000000000..fb4612c9c31
--- /dev/null
+++ b/driver-sync/src/examples/tour/Address.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+/**
+ * The Address POJO
+ */
+public final class Address {
+
+    private String street;
+    private String city;
+    private String zip;
+
+    /**
+     * Construct a new instance
+     */
+    public Address() {
+    }
+
+    /**
+     * Construct a new instance
+     *
+     * @param street the street
+     * @param city the city
+     * @param zip the zip / postal code
+     */
+    public Address(final String street, final String city, final String zip) {
+        this.street = street;
+        this.city = city;
+        this.zip = zip;
+    }
+
+    /**
+     * Returns the street
+     *
+     * @return the street
+     */
+    public String getStreet() {
+        return street;
+    }
+
+    /**
+     * Sets the street
+     *
+     * @param street the street
+     */
+    public void setStreet(final String street) {
+        this.street = street;
+    }
+
+    /**
+     * Returns the city
+     *
+     * @return the city
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * Sets the city
+     *
+     * @param city the city
+     */
+    public void setCity(final String city) {
+        this.city = city;
+    }
+
+    /**
+     * Returns the zip
+     *
+     * @return the zip
+     */
+    public String getZip() {
+        return zip;
+    }
+
+    /**
+     * Sets the zip
+     *
+     * @param zip the zip
+     */
+    public void setZip(final String zip) {
+        this.zip = zip;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Address address = (Address) o;
+
+        if (getStreet() != null ? !getStreet().equals(address.getStreet()) : address.getStreet() != null) {
+            return false;
+        }
+        if (getCity() != null ? !getCity().equals(address.getCity()) : address.getCity() != null) {
+            return false;
+        }
+        if (getZip() != null ? !getZip().equals(address.getZip()) : address.getZip() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getStreet() != null ? getStreet().hashCode() : 0;
+        result = 31 * result + (getCity() != null ? getCity().hashCode() : 0);
+        result = 31 * result + (getZip() != null ? getZip().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Address{"
+                + "street='" + street + "'"
+                + ", city='" + city + "'"
+                + ", zip='" + zip + "'"
+                + "}";
+    }
+}
diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
new file mode 100644
index 00000000000..c1680193c4d
--- /dev/null
+++ b/driver-sync/src/examples/tour/ClientSideEncryptionAutoEncryptionSettingsTour.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.Document;
+
+import java.security.SecureRandom;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ClientSideEncryption AutoEncryptionSettings tour
+ */
+public class ClientSideEncryptionAutoEncryptionSettingsTour {
+
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * Requires the mongodb-crypt library in the class path and mongocryptd on the system path.
+     *
+     * @param args ignored args
+     */
+    public static void main(final String[] args) {
+
+        // This would have to be the same master key as was used to create the encryption key
+        final byte[] localMasterKey = new byte[96];
+        new SecureRandom().nextBytes(localMasterKey);
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
+           put("local", new HashMap<String, Object>() {{
+               put("key", localMasterKey);
+           }});
+        }};
+
+        String keyVaultNamespace = "admin.datakeys";
+        ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder()
+                .keyVaultMongoClientSettings(MongoClientSettings.builder()
+                        .applyConnectionString(new ConnectionString("mongodb://localhost"))
+                        .build())
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .build();
+
+        ClientEncryption clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+        BsonBinary dataKeyId = clientEncryption.createDataKey("local", new DataKeyOptions());
+        final String base64DataKeyId = Base64.getEncoder().encodeToString(dataKeyId.getData());
+
+        final String dbName = "test";
+        final String collName = "coll";
+        AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .schemaMap(new HashMap<String, BsonDocument>() {{
+                    put(dbName + "." + collName,
+                            // Need a schema that references the new data key
+                            BsonDocument.parse("{"
+                                    + "  properties: {"
+                                    + "    encryptedField: {"
+                                    + "      encrypt: {"
+                                    + "        keyId: [{"
+                                    + "          \"$binary\": {"
+                                    + "            \"base64\": \"" + base64DataKeyId + "\","
+                                    + "            \"subType\": \"04\""
+                                    + "          }"
+                                    + "        }],"
+                                    + "        bsonType: \"string\","
+                                    + "        algorithm: \"AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic\""
+                                    + "      }"
+                                    + "    }"
+                                    + "  },"
+                                    + "  \"bsonType\": \"object\""
+                                    + "}"));
+                }}).build();
+
+        MongoClientSettings clientSettings = MongoClientSettings.builder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+
+        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoCollection<Document> collection = mongoClient.getDatabase("test").getCollection("coll");
+        collection.drop(); // Clear old data
+
+        collection.insertOne(new Document("encryptedField", "123456789"));
+
+        System.out.println(collection.find().first().toJson());
+
+        // release resources
+        mongoClient.close();
+    }
+}
diff --git a/driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java b/driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java
new file mode 100644
index 00000000000..bf2cf668364
--- /dev/null
+++ b/driver-sync/src/examples/tour/ClientSideEncryptionSimpleTour.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import org.bson.Document;
+
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ClientSideEncryption Simple tour
+ */
+public class ClientSideEncryptionSimpleTour {
+
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * Requires the mongodb-crypt library in the class path and mongocryptd on the system path.
+     * Assumes the schema has already been created in MongoDB.
+     *
+     * @param args ignored args
+     */
+    public static void main(final String[] args) {
+
+        // This would have to be the same master key as was used to create the encryption key
+        final byte[] localMasterKey = new byte[96];
+        new SecureRandom().nextBytes(localMasterKey);
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>() {{
+           put("local", new HashMap<String, Object>() {{
+               put("key", localMasterKey);
+           }});
+        }};
+
+        String keyVaultNamespace = "admin.datakeys";
+
+        AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProviders)
+                .build();
+
+        MongoClientSettings clientSettings = MongoClientSettings.builder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+
+        MongoClient mongoClient = MongoClients.create(clientSettings);
+        MongoCollection<Document> collection = mongoClient.getDatabase("test").getCollection("coll");
+        collection.drop(); // Clear old data
+
+        collection.insertOne(new Document("encryptedField", "123456789"));
+
+        System.out.println(collection.find().first().toJson());
+
+        // release resources
+        mongoClient.close();
+    }
+}
diff --git a/driver-sync/src/examples/tour/Decimal128QuickTour.java b/driver-sync/src/examples/tour/Decimal128QuickTour.java
new file mode 100644
index 00000000000..fe5c213cf70
--- /dev/null
+++ b/driver-sync/src/examples/tour/Decimal128QuickTour.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Filters;
+import org.bson.Document;
+import org.bson.types.Decimal128;
+
+import java.math.BigDecimal;
+
+/**
+ * Decimal128 Quick tour
+ */
+public class Decimal128QuickTour {
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * @param args takes an optional single argument for the connection string
+     */
+    public static void main(final String[] args) {
+        MongoClient mongoClient;
+
+        if (args.length == 0) {
+            // connect to the local database server
+            mongoClient = MongoClients.create();
+        } else {
+            mongoClient = MongoClients.create(args[0]);
+        }
+
+
+        // get handle to "mydb" database
+        MongoDatabase database = mongoClient.getDatabase("mydb");
+
+
+        // get a handle to the "test" collection
+        MongoCollection<Document> collection = database.getCollection("test");
+
+        // drop all the data in it
+        collection.drop();
+
+        // make a document and insert it
+        Document doc = new Document("name", "MongoDB")
+                               .append("amount1", Decimal128.parse(".10"))
+                               .append("amount2", new Decimal128(42L))
+                               .append("amount3", new Decimal128(new BigDecimal(".200")));
+
+        collection.insertOne(doc);
+
+
+        Document first = collection.find().filter(Filters.eq("amount1", new Decimal128(new BigDecimal(".10")))).first();
+
+        Decimal128 amount3 = (Decimal128) first.get("amount3");
+        BigDecimal amount2AsBigDecimal = amount3.bigDecimalValue();
+
+        System.out.println(amount3.toString());
+        System.out.println(amount2AsBigDecimal.toString());
+
+    }
+}
diff --git a/driver-sync/src/examples/tour/Person.java b/driver-sync/src/examples/tour/Person.java
new file mode 100644
index 00000000000..9294ff5e19d
--- /dev/null
+++ b/driver-sync/src/examples/tour/Person.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import org.bson.types.ObjectId;
+
+/**
+ * The Person Pojo
+ */
+public final class Person {
+    private ObjectId id;
+    private String name;
+    private int age;
+    private Address address;
+
+    /**
+     * Construct a new instance
+     */
+    public Person() {
+    }
+
+    /**
+     * Construct a new instance
+     *
+     * @param name the name
+     * @param age the age
+     * @param address the address
+     */
+    public Person(final String name, final int age, final Address address) {
+        this.name = name;
+        this.age = age;
+        this.address = address;
+    }
+
+    /**
+     * Returns the id
+     *
+     * @return the id
+     */
+    public ObjectId getId() {
+        return id;
+    }
+
+    /**
+     * Sets the id
+     *
+     * @param id the id
+     */
+    public void setId(final ObjectId id) {
+        this.id = id;
+    }
+
+    /**
+     * Returns the name
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the name
+     *
+     * @param name the name
+     */
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns the age
+     *
+     * @return the age
+     */
+    public int getAge() {
+        return age;
+    }
+
+    /**
+     * Sets the age
+     *
+     * @param age the age
+     */
+    public void setAge(final int age) {
+        this.age = age;
+    }
+
+    /**
+     * Returns the address
+     *
+     * @return the address
+     */
+    public Address getAddress() {
+        return address;
+    }
+
+    /**
+     * Sets the address
+     *
+     * @param address the address
+     */
+    public void setAddress(final Address address) {
+        this.address = address;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Person person = (Person) o;
+
+        if (getAge() != person.getAge()) {
+            return false;
+        }
+        if (getId() != null ? !getId().equals(person.getId()) : person.getId() != null) {
+            return false;
+        }
+        if (getName() != null ? !getName().equals(person.getName()) : person.getName() != null) {
+            return false;
+        }
+        if (getAddress() != null ? !getAddress().equals(person.getAddress()) : person.getAddress() != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId() != null ? getId().hashCode() : 0;
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        result = 31 * result + getAge();
+        result = 31 * result + (getAddress() != null ? getAddress().hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Person{"
+                + "id='" + id + "'"
+                + ", name='" + name + "'"
+                + ", age=" + age
+                + ", address=" + address
+                + "}";
+    }
+}
diff --git a/driver-sync/src/examples/tour/PojoQuickTour.java b/driver-sync/src/examples/tour/PojoQuickTour.java
new file mode 100644
index 00000000000..a7173fda824
--- /dev/null
+++ b/driver-sync/src/examples/tour/PojoQuickTour.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tour;
+
+import com.mongodb.Block;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+
+import java.util.List;
+
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.gt;
+import static com.mongodb.client.model.Filters.not;
+import static com.mongodb.client.model.Updates.combine;
+import static com.mongodb.client.model.Updates.set;
+import static java.util.Arrays.asList;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+
+/**
+ * The POJO QuickTour code example
+ */
+public class PojoQuickTour {
+    /**
+     * Run this main method to see the output of this quick example.
+     *
+     * @param args takes an optional single argument for the connection string
+     */
+    public static void main(final String[] args) {
+        MongoClient mongoClient;
+
+        if (args.length == 0) {
+            // connect to the local database server
+            mongoClient = MongoClients.create();
+        } else {
+            mongoClient = MongoClients.create(args[0]);
+        }
+
+        // create codec registry for POJOs
+        CodecRegistry pojoCodecRegistry = fromRegistries(MongoClientSettings.getDefaultCodecRegistry(),
+                fromProviders(PojoCodecProvider.builder().automatic(true).build()));
+
+        // get handle to "mydb" database
+        MongoDatabase database = mongoClient.getDatabase("mydb").withCodecRegistry(pojoCodecRegistry);
+
+        // get a handle to the "people" collection
+        MongoCollection<Person> collection = database.getCollection("people", Person.class);
+
+        // drop all the data in it
+        collection.drop();
+
+        // make a document and insert it
+        Person ada = new Person("Ada Byron", 20, new Address("St James Square", "London", "W1"));
+        System.out.println("Original Person Model: " + ada);
+        collection.insertOne(ada);
+
+        // Person will now have an ObjectId
+        System.out.println("Mutated Person Model: " + ada);
+
+        // get it (since it's the only one in there since we dropped the rest earlier on)
+        Person somebody = collection.find().first();
+        System.out.println(somebody);
+
+        // now, lets add some more people so we can explore queries and cursors
+        List<Person> people = asList(
+                new Person("Charles Babbage", 45, new Address("5 Devonshire Street", "London", "W11")),
+                new Person("Alan Turing", 28, new Address("Bletchley Hall", "Bletchley Park", "MK12")),
+                new Person("Timothy Berners-Lee", 61, new Address("Colehill", "Wimborne", null))
+        );
+
+        collection.insertMany(people);
+        System.out.println("total # of people " + collection.countDocuments());
+
+        System.out.println("");
+        // lets get all the documents in the collection and print them out
+        Block<Person> printBlock = new Block<Person>() {
+            @Override
+            public void apply(final Person person) {
+                System.out.println(person);
+            }
+        };
+
+        collection.find().forEach(printBlock);
+
+        System.out.println("");
+        // now use a query to get 1 document out
+        somebody = collection.find(eq("address.city", "Wimborne")).first();
+        System.out.println(somebody);
+
+        System.out.println("");
+        // now lets find every over 30
+        collection.find(gt("age", 30)).forEach(printBlock);
+
+        System.out.println("");
+        // Update One
+        collection.updateOne(eq("name", "Ada Byron"), combine(set("age", 23), set("name", "Ada Lovelace")));
+
+        System.out.println("");
+        // Update Many
+        UpdateResult updateResult = collection.updateMany(not(eq("zip", null)), set("zip", null));
+        System.out.println(updateResult.getModifiedCount());
+
+        System.out.println("");
+        // Replace One
+        updateResult = collection.replaceOne(eq("name", "Ada Lovelace"), ada);
+        System.out.println(updateResult.getModifiedCount());
+
+        // Delete One
+        collection.deleteOne(eq("address.city", "Wimborne"));
+
+        // Delete Many
+        DeleteResult deleteResult = collection.deleteMany(eq("address.city", "London"));
+        System.out.println(deleteResult.getDeletedCount());
+
+        // Clean up
+        database.drop();
+
+        // release resources
+        mongoClient.close();
+    }
+}
diff --git a/driver/src/examples/tour/QuickTour.java b/driver-sync/src/examples/tour/QuickTour.java
similarity index 95%
rename from driver/src/examples/tour/QuickTour.java
rename to driver-sync/src/examples/tour/QuickTour.java
index 16ed4be5681..027dc645fef 100644
--- a/driver/src/examples/tour/QuickTour.java
+++ b/driver-sync/src/examples/tour/QuickTour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package tour;
 
 import com.mongodb.Block;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
@@ -54,7 +54,7 @@
 import static java.util.Collections.singletonList;
 
 /**
- * The QuickTour code example see: https://mongodb.github.io/mongo-java-driver/3.0/getting-started
+ * The QuickTour code example
  */
 public class QuickTour {
     /**
@@ -67,9 +67,9 @@ public static void main(final String[] args) {
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // get handle to "mydb" database
@@ -100,7 +100,7 @@ public static void main(final String[] args) {
             documents.add(new Document("i", i));
         }
         collection.insertMany(documents);
-        System.out.println("total # of documents after inserting 100 small ones (should be 101) " + collection.count());
+        System.out.println("total # of documents after inserting 100 small ones (should be 101) " + collection.countDocuments());
 
         // find first
         myDoc = collection.find().first();
diff --git a/driver/src/examples/tour/QuickTourAdmin.java b/driver-sync/src/examples/tour/QuickTourAdmin.java
similarity index 89%
rename from driver/src/examples/tour/QuickTourAdmin.java
rename to driver-sync/src/examples/tour/QuickTourAdmin.java
index d2386a3e469..02bc222682b 100644
--- a/driver/src/examples/tour/QuickTourAdmin.java
+++ b/driver-sync/src/examples/tour/QuickTourAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package tour;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.CreateCollectionOptions;
@@ -29,7 +29,7 @@
 import static com.mongodb.client.model.Filters.text;
 
 /**
- * The QuickTourAdmin code example see: https://mongodb.github.io/mongo-java-driver/3.0/getting-started
+ * The QuickTourAdmin code example
  */
 public class QuickTourAdmin {
     /**
@@ -42,9 +42,9 @@ public static void main(final String[] args) {
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // get handle to "mydb" database
@@ -92,12 +92,12 @@ public static void main(final String[] args) {
         collection.insertOne(new Document("_id", 2).append("content", "irrelevant content"));
 
         // Find using the text index
-        long matchCount = collection.count(text("textual content -irrelevant"));
+        long matchCount = collection.countDocuments(text("textual content -irrelevant"));
         System.out.println("Text search matches: " + matchCount);
 
         // Find using the $language operator
         Bson textSearch = text("textual content -irrelevant", new TextSearchOptions().language("english"));
-        matchCount = collection.count(textSearch);
+        matchCount = collection.countDocuments(textSearch);
         System.out.println("Text search matches (english): " + matchCount);
 
         // Find the highest scoring match
diff --git a/driver-sync/src/examples/tour/package-info.java b/driver-sync/src/examples/tour/package-info.java
new file mode 100644
index 00000000000..ebd69343c4a
--- /dev/null
+++ b/driver-sync/src/examples/tour/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the quick tour examples
+ */
+package tour;
diff --git a/driver-sync/src/main/com/mongodb/client/AggregateIterable.java b/driver-sync/src/main/com/mongodb/client/AggregateIterable.java
new file mode 100644
index 00000000000..17b8c937656
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/AggregateIterable.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Iterable for aggregate.
+ *
+ * @param <TResult> The type of the result.
+ * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+ * @since 3.0
+ */
+public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
+
+    /**
+     * Aggregates documents according to the specified aggregation pipeline, which must end with a $out or $merge stage.
+     *
+     * @throws IllegalStateException if the pipeline does not end with a $out or $merge stage
+     * @mongodb.driver.manual reference/operator/aggregation/out/ $out stage
+     * @mongodb.driver.manual reference/operator/aggregation/merge/ $merge stage
+     * @since 3.4
+     */
+    void toCollection();
+
+    /**
+     * Enables writing to temporary files. A null value indicates that it's unspecified.
+     *
+     * @param allowDiskUse true if writing to temporary files is enabled
+     * @return this
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     * @mongodb.server.release 2.6
+     */
+    AggregateIterable<TResult> allowDiskUse(@Nullable Boolean allowDiskUse);
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    AggregateIterable<TResult> batchSize(int batchSize);
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    AggregateIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
+
+    /**
+     * Sets whether the server should use a cursor to return results.
+     *
+     * @param useCursor whether the server should use a cursor to return results
+     * @return this
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     * @mongodb.server.release 2.6
+     * @deprecated There is no replacement for this.  Applications can assume that the driver will use a cursor for server versions
+     * that support it (&gt;= 2.6).  The driver will ignore this as of MongoDB 3.6, which does not support inline results for the aggregate
+     * command.
+     */
+    @Deprecated
+    AggregateIterable<TResult> useCursor(@Nullable Boolean useCursor);
+
+    /**
+     * The maximum amount of time for the server to wait on new documents to satisfy a {@code $changeStream} aggregation.
+     *
+     * A zero value will be ignored.
+     *
+     * @param maxAwaitTime  the max await time
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum await execution time in the given time unit
+     * @mongodb.server.release 3.6
+     * @since 3.6
+     */
+    AggregateIterable<TResult> maxAwaitTime(long maxAwaitTime, TimeUnit timeUnit);
+
+    /**
+     * Sets the bypass document level validation flag.
+     *
+     * <p>Note: This only applies when an $out or $merge stage is specified</p>.
+     *
+     * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
+     * @return this
+     * @since 3.2
+     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
+     * @mongodb.server.release 3.2
+     */
+    AggregateIterable<TResult> bypassDocumentValidation(@Nullable Boolean bypassDocumentValidation);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    AggregateIterable<TResult> collation(@Nullable Collation collation);
+
+    /**
+     * Sets the comment to the aggregation. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<TResult> comment(@Nullable String comment);
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<TResult> hint(@Nullable Bson hint);
+}
diff --git a/driver-sync/src/main/com/mongodb/client/ChangeStreamIterable.java b/driver-sync/src/main/com/mongodb/client/ChangeStreamIterable.java
new file mode 100644
index 00000000000..cd85d10f7d2
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/ChangeStreamIterable.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Iterable for change streams.
+ *
+ * <p>Note: the {@link ChangeStreamDocument} class will not be applicable for all change stream outputs. If using custom pipelines that
+ * radically change the result, then the {@link #withDocumentClass(Class)} method can be used to provide an alternative document format.</p>
+ *
+ * @param <TResult> The type of the result.
+ * @mongodb.server.release 3.6
+ * @since 3.6
+ */
+public interface ChangeStreamIterable<TResult> extends MongoIterable<ChangeStreamDocument<TResult>> {
+
+    /**
+     * Returns a cursor used for iterating over elements of type {@code ChangeStreamDocument<TResult>}. The cursor has
+     * a covariant return type to additionally provide a method to access the resume token in change stream batches.
+     *
+     * @return the change stream cursor
+     * @since 3.11
+     */
+    MongoChangeStreamCursor<ChangeStreamDocument<TResult>> cursor();
+
+    /**
+     * Sets the fullDocument value.
+     *
+     * @param fullDocument the fullDocument
+     * @return this
+     */
+    ChangeStreamIterable<TResult> fullDocument(FullDocument fullDocument);
+
+    /**
+     * Sets the logical starting point for the new change stream.
+     *
+     * @param resumeToken the resume token
+     * @return this
+     */
+    ChangeStreamIterable<TResult> resumeAfter(BsonDocument resumeToken);
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    ChangeStreamIterable<TResult> batchSize(int batchSize);
+
+    /**
+     * Sets the maximum await execution time on the server for this operation.
+     *
+     * @param maxAwaitTime  the max await time.  A zero value will be ignored, and indicates that the driver should respect the server's
+     *                      default value
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     */
+    ChangeStreamIterable<TResult>  maxAwaitTime(long maxAwaitTime, TimeUnit timeUnit);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     */
+    ChangeStreamIterable<TResult> collation(@Nullable Collation collation);
+
+    /**
+     * Returns a {@code MongoIterable} containing the results of the change stream based on the document class provided.
+     *
+     * @param clazz the class to use for the raw result.
+     * @param <TDocument> the result type
+     * @return the new Mongo Iterable
+     */
+    <TDocument> MongoIterable<TDocument> withDocumentClass(Class<TDocument> clazz);
+
+    /**
+     * The change stream will only provide changes that occurred at or after the specified timestamp.
+     *
+     * <p>Any command run against the server will return an operation time that can be used here.</p>
+     * <p>The default value is an operation time obtained from the server before the change stream was created.</p>
+     *
+     * @param startAtOperationTime the start at operation time
+     * @since 3.8
+     * @return this
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.manual reference/method/db.runCommand/
+     */
+    ChangeStreamIterable<TResult> startAtOperationTime(BsonTimestamp startAtOperationTime);
+
+    /**
+     * Similar to {@code resumeAfter}, this option takes a resume token and starts a
+     * new change stream returning the first notification after the token.
+     *
+     * <p>This will allow users to watch collections that have been dropped and recreated
+     * or newly renamed collections without missing any notifications.</p>
+     *
+     * <p>Note: The server will report an error if both {@code startAfter} and {@code resumeAfter} are specified.</p>
+     *
+     * @param startAfter the startAfter resumeToken
+     * @return this
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual changeStreams/#change-stream-start-after
+     */
+    ChangeStreamIterable<TResult> startAfter(BsonDocument startAfter);
+}
diff --git a/driver-sync/src/main/com/mongodb/client/ClientSession.java b/driver-sync/src/main/com/mongodb/client/ClientSession.java
new file mode 100644
index 00000000000..2177f0f3859
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/ClientSession.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.TransactionOptions;
+import com.mongodb.lang.Nullable;
+
+/**
+ * A client session that supports transactions.
+ *
+ * @since 3.8
+ */
+public interface ClientSession extends com.mongodb.session.ClientSession {
+    /**
+     * Returns the server address of the pinned mongos on this session.
+     *
+     * @return the server address of the pinned mongos.
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    @Nullable
+    ServerAddress getPinnedServerAddress();
+
+    /**
+     * Pin the server address of the mongos on this session.
+     *
+     * @param address the server address to pin to this session
+     * @mongodb.server.release 4.2
+     * @since 3.11
+     */
+    void setPinnedServerAddress(@Nullable ServerAddress address);
+
+    /**
+     * Returns true if there is an active transaction on this session, and false otherwise
+     *
+     * @return true if there is an active transaction on this session
+     * @mongodb.server.release 4.0
+     */
+    boolean hasActiveTransaction();
+
+    /**
+     *  Notify the client session that a message has been sent.
+     *  <p>
+     *      For internal use only
+     *  </p>
+     *
+     * @return true if this is the first message sent, false otherwise
+     */
+    boolean notifyMessageSent();
+
+    /**
+     * Gets the transaction options.  Only call this method of the session has an active transaction
+     *
+     * @return the transaction options
+     */
+    TransactionOptions getTransactionOptions();
+
+    /**
+     * Start a transaction in the context of this session with default transaction options. A transaction can not be started if there is
+     * already an active transaction on this session.
+     *
+     * @mongodb.server.release 4.0
+     */
+    void startTransaction();
+
+    /**
+     * Start a transaction in the context of this session with the given transaction options. A transaction can not be started if there is
+     * already an active transaction on this session.
+     *
+     * @param transactionOptions the options to apply to the transaction
+     *
+     * @mongodb.server.release 4.0
+     */
+    void startTransaction(TransactionOptions transactionOptions);
+
+    /**
+     * Commit a transaction in the context of this session.  A transaction can only be commmited if one has first been started.
+     *
+     * @mongodb.server.release 4.0
+     */
+    void commitTransaction();
+
+    /**
+     * Abort a transaction in the context of this session.  A transaction can only be aborted if one has first been started.
+     *
+     * @mongodb.server.release 4.0
+     */
+    void abortTransaction();
+
+    /**
+     * Execute the given function within a transaction.
+     *
+     * @param <T> the return type of the transaction body
+     * @param transactionBody the body of the transaction
+     * @return the return value of the transaction body
+     * @mongodb.server.release 4.0
+     * @since 3.11
+     */
+    <T> T withTransaction(TransactionBody<T> transactionBody);
+
+    /**
+     * Execute the given function within a transaction.
+     *
+     * @param <T> the return type of the transaction body
+     * @param transactionBody the body of the transaction
+     * @param options         the transaction options
+     * @return the return value of the transaction body
+     * @mongodb.server.release 4.0
+     * @since 3.11
+     */
+    <T> T withTransaction(TransactionBody<T> transactionBody, TransactionOptions options);
+}
diff --git a/driver-sync/src/main/com/mongodb/client/DistinctIterable.java b/driver-sync/src/main/com/mongodb/client/DistinctIterable.java
new file mode 100644
index 00000000000..4171f468dd2
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/DistinctIterable.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Iterable interface for distinct.
+ *
+ * @param <TResult> The type of the result.
+ * @since 3.0
+ */
+public interface DistinctIterable<TResult> extends MongoIterable<TResult> {
+
+    /**
+     * Sets the query filter to apply to the query.
+     *
+     * @param filter the filter, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/method/db.collection.find/ Filter
+     */
+    DistinctIterable<TResult> filter(@Nullable Bson filter);
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     */
+    DistinctIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    DistinctIterable<TResult> batchSize(int batchSize);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    DistinctIterable<TResult> collation(@Nullable Collation collation);
+}
diff --git a/driver-sync/src/main/com/mongodb/client/FindIterable.java b/driver-sync/src/main/com/mongodb/client/FindIterable.java
new file mode 100644
index 00000000000..8341a71ef1b
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/FindIterable.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.CursorType;
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Iterable for find.
+ *
+ * @param <TResult> The type of the result.
+ * @since 3.0
+ */
+public interface FindIterable<TResult> extends MongoIterable<TResult> {
+
+    /**
+     * Sets the query filter to apply to the query.
+     *
+     * @param filter the filter, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/method/db.collection.find/ Filter
+     */
+    FindIterable<TResult> filter(@Nullable Bson filter);
+
+    /**
+     * Sets the limit to apply.
+     *
+     * @param limit the limit, which may be 0
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
+     */
+    FindIterable<TResult> limit(int limit);
+    /**
+     * Sets the number of documents to skip.
+     *
+     * @param skip the number of documents to skip
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
+     */
+    FindIterable<TResult> skip(int skip);
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     */
+    FindIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
+
+    /**
+     * The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor
+     * query. This only applies to a TAILABLE_AWAIT cursor. When the cursor is not a TAILABLE_AWAIT cursor,
+     * this option is ignored.
+     *
+     * On servers &gt;= 3.2, this option will be specified on the getMore command as "maxTimeMS". The default
+     * is no value: no "maxTimeMS" is sent to the server with the getMore command.
+     *
+     * On servers &lt; 3.2, this option is ignored, and indicates that the driver should respect the server's default value
+     *
+     * A zero value will be ignored.
+     *
+     * @param maxAwaitTime  the max await time
+     * @param timeUnit the time unit to return the result in
+     * @return the maximum await execution time in the given time unit
+     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
+     * @since 3.2
+     */
+    FindIterable<TResult> maxAwaitTime(long maxAwaitTime, TimeUnit timeUnit);
+
+    /**
+     * Sets the query modifiers to apply to this operation.
+     *
+     * @param modifiers the query modifiers to apply, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
+     * @deprecated use the individual setters instead
+     */
+    @Deprecated
+    FindIterable<TResult> modifiers(@Nullable Bson modifiers);
+
+    /**
+     * Sets a document describing the fields to return for all matching documents.
+     *
+     * @param projection the project document, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/method/db.collection.find/ Projection
+     */
+    FindIterable<TResult> projection(@Nullable Bson projection);
+
+    /**
+     * Sets the sort criteria to apply to the query.
+     *
+     * @param sort the sort criteria, which may be null.
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.sort/ Sort
+     */
+    FindIterable<TResult> sort(@Nullable Bson sort);
+
+    /**
+     * The server normally times out idle cursors after an inactivity period (10 minutes)
+     * to prevent excess memory use. Set this option to prevent that.
+     *
+     * @param noCursorTimeout true if cursor timeout is disabled
+     * @return this
+     */
+    FindIterable<TResult> noCursorTimeout(boolean noCursorTimeout);
+
+    /**
+     * Users should not set this under normal circumstances.
+     *
+     * @param oplogReplay if oplog replay is enabled
+     * @return this
+     */
+    FindIterable<TResult> oplogReplay(boolean oplogReplay);
+
+    /**
+     * Get partial results from a sharded cluster if one or more shards are unreachable (instead of throwing an error).
+     *
+     * @param partial if partial results for sharded clusters is enabled
+     * @return this
+     */
+    FindIterable<TResult> partial(boolean partial);
+
+    /**
+     * Sets the cursor type.
+     *
+     * @param cursorType the cursor type
+     * @return this
+     */
+    FindIterable<TResult> cursorType(CursorType cursorType);
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    @Override
+    FindIterable<TResult> batchSize(int batchSize);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    FindIterable<TResult> collation(@Nullable Collation collation);
+
+    /**
+     * Sets the comment to the query. A null value means no comment is set.
+     *
+     * @param comment the comment
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<TResult> comment(@Nullable String comment);
+
+    /**
+     * Sets the hint for which index to use. A null value means no hint is set.
+     *
+     * @param hint the hint
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<TResult> hint(@Nullable Bson hint);
+
+    /**
+     * Sets the hint to apply.
+     *
+     * <p>Note: If {@link FindIterable#hint(Bson)} is set that will be used instead of any hint string.</p>
+     *
+     * @param hint the name of the index which should be used for the operation
+     * @return this
+     * @since 3.12
+     */
+    FindIterable<TResult> hintString(@Nullable String hint);
+
+    /**
+     * Sets the exclusive upper bound for a specific index. A null value means no max is set.
+     *
+     * @param max the max
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<TResult> max(@Nullable Bson max);
+
+    /**
+     * Sets the minimum inclusive lower bound for a specific index. A null value means no max is set.
+     *
+     * @param min the min
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<TResult> min(@Nullable Bson min);
+
+    /**
+     * Sets the maximum number of documents or index keys to scan when executing the query.
+     *
+     * A zero value or less will be ignored, and indicates that the driver should respect the server's default value.
+     *
+     * @param maxScan the maxScan
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated as of MongoDB 4.0 release
+     */
+    @Deprecated
+    FindIterable<TResult> maxScan(long maxScan);
+
+    /**
+     * Sets the returnKey. If true the find operation will return only the index keys in the resulting documents.
+     *
+     * @param returnKey the returnKey
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<TResult> returnKey(boolean returnKey);
+
+    /**
+     * Sets the showRecordId. Set to true to add a field {@code $recordId} to the returned documents.
+     *
+     * @param showRecordId the showRecordId
+     * @return this
+     * @since 3.5
+     */
+    FindIterable<TResult> showRecordId(boolean showRecordId);
+
+    /**
+     * Sets the snapshot.
+     *
+     * If true it prevents the cursor from returning a document more than once because of an intervening write operation.
+     *
+     * @param snapshot the snapshot
+     * @return this
+     * @since 3.5
+     * @deprecated Deprecated in MongoDB 3.6 release and removed in MongoDB 4.0 release
+     */
+    @Deprecated
+    FindIterable<TResult> snapshot(boolean snapshot);
+}
diff --git a/driver/src/main/com/mongodb/client/ListCollectionsIterable.java b/driver-sync/src/main/com/mongodb/client/ListCollectionsIterable.java
similarity index 92%
rename from driver/src/main/com/mongodb/client/ListCollectionsIterable.java
rename to driver-sync/src/main/com/mongodb/client/ListCollectionsIterable.java
index 8e2eb9f00ce..4865e4171be 100644
--- a/driver/src/main/com/mongodb/client/ListCollectionsIterable.java
+++ b/driver-sync/src/main/com/mongodb/client/ListCollectionsIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.mongodb.client;
 
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -35,7 +36,7 @@ public interface ListCollectionsIterable<TResult> extends MongoIterable<TResult>
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      */
-    ListCollectionsIterable<TResult> filter(Bson filter);
+    ListCollectionsIterable<TResult> filter(@Nullable Bson filter);
 
     /**
      * Sets the maximum execution time on the server for this operation.
diff --git a/driver-sync/src/main/com/mongodb/client/ListDatabasesIterable.java b/driver-sync/src/main/com/mongodb/client/ListDatabasesIterable.java
new file mode 100644
index 00000000000..471f56040a8
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/ListDatabasesIterable.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Iterable for ListDatabases.
+ *
+ * @param <TResult> The type of the result.
+ * @since 3.0
+ */
+public interface ListDatabasesIterable<TResult> extends MongoIterable<TResult> {
+
+    /**
+     * Sets the maximum execution time on the server for this operation.
+     *
+     * @param maxTime  the max time
+     * @param timeUnit the time unit, which may not be null
+     * @return this
+     * @mongodb.driver.manual reference/operator/meta/maxTimeMS/ Max Time
+     */
+    ListDatabasesIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
+
+    /**
+     * Sets the number of documents to return per batch.
+     *
+     * @param batchSize the batch size
+     * @return this
+     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
+     */
+    @Override
+    ListDatabasesIterable<TResult> batchSize(int batchSize);
+
+    /**
+     * Sets the query filter to apply to the returned database names.
+     *
+     * @param filter the filter, which may be null.
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.4.2
+     */
+    ListDatabasesIterable<TResult> filter(@Nullable Bson filter);
+
+    /**
+     * Sets the nameOnly flag that indicates whether the command should return just the database names or return the database names and
+     * size information.
+     *
+     * @param nameOnly the nameOnly flag, which may be null
+     * @return this
+     * @since 3.6
+     * @mongodb.server.release 3.4.3
+     */
+    ListDatabasesIterable<TResult> nameOnly(@Nullable Boolean nameOnly);
+}
diff --git a/driver/src/main/com/mongodb/client/ListIndexesIterable.java b/driver-sync/src/main/com/mongodb/client/ListIndexesIterable.java
similarity index 97%
rename from driver/src/main/com/mongodb/client/ListIndexesIterable.java
rename to driver-sync/src/main/com/mongodb/client/ListIndexesIterable.java
index 4c37e9b430b..f106217234a 100644
--- a/driver/src/main/com/mongodb/client/ListIndexesIterable.java
+++ b/driver-sync/src/main/com/mongodb/client/ListIndexesIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/main/com/mongodb/client/MapReduceIterable.java b/driver-sync/src/main/com/mongodb/client/MapReduceIterable.java
similarity index 75%
rename from driver/src/main/com/mongodb/client/MapReduceIterable.java
rename to driver-sync/src/main/com/mongodb/client/MapReduceIterable.java
index 356b81fa620..a1ed726b98c 100644
--- a/driver/src/main/com/mongodb/client/MapReduceIterable.java
+++ b/driver-sync/src/main/com/mongodb/client/MapReduceIterable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,9 @@
 
 package com.mongodb.client;
 
+import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.MapReduceAction;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -32,6 +34,16 @@
  */
 public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
 
+    /**
+     * Aggregates documents to a collection according to the specified map-reduce function with the given options, which must specify a
+     * non-inline result.
+     *
+     * @throws IllegalStateException if a collection name to write the results to has not been specified
+     * @see #collectionName(String)
+     * @since 3.4
+     */
+    void toCollection();
+
     /**
      * Sets the collectionName for the output of the MapReduce
      *
@@ -40,7 +52,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @param collectionName the name of the collection that you want the map-reduce operation to write its output.
      * @return this
      */
-    MapReduceIterable<TResult> collectionName(final String collectionName);
+    MapReduceIterable<TResult> collectionName(String collectionName);
 
     /**
      * Sets the JavaScript function that follows the reduce method and modifies the output.
@@ -49,7 +61,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce/#mapreduce-finalize-cmd Requirements for the finalize Function
      */
-    MapReduceIterable<TResult> finalizeFunction(final String finalizeFunction);
+    MapReduceIterable<TResult> finalizeFunction(@Nullable String finalizeFunction);
 
     /**
      * Sets the global variables that are accessible in the map, reduce and finalize functions.
@@ -58,7 +70,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce mapReduce
      */
-    MapReduceIterable<TResult> scope(final Bson scope);
+    MapReduceIterable<TResult> scope(@Nullable Bson scope);
 
     /**
      * Sets the sort criteria to apply to the query.
@@ -67,7 +79,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    MapReduceIterable<TResult> sort(final Bson sort);
+    MapReduceIterable<TResult> sort(@Nullable Bson sort);
 
     /**
      * Sets the query filter to apply to the query.
@@ -76,7 +88,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      */
-    MapReduceIterable<TResult> filter(final Bson filter);
+    MapReduceIterable<TResult> filter(@Nullable Bson filter);
 
     /**
      * Sets the limit to apply.
@@ -85,7 +97,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
      */
-    MapReduceIterable<TResult> limit(final int limit);
+    MapReduceIterable<TResult> limit(int limit);
 
     /**
      * Sets the flag that specifies whether to convert intermediate data into BSON format between the execution of the map and reduce
@@ -96,7 +108,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return jsMode
      * @mongodb.driver.manual reference/command/mapReduce mapReduce
      */
-    MapReduceIterable<TResult> jsMode(final boolean jsMode);
+    MapReduceIterable<TResult> jsMode(boolean jsMode);
 
     /**
      * Sets whether to include the timing information in the result information.
@@ -104,7 +116,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @param verbose whether to include the timing information in the result information.
      * @return this
      */
-    MapReduceIterable<TResult> verbose(final boolean verbose);
+    MapReduceIterable<TResult> verbose(boolean verbose);
 
     /**
      * Sets the maximum execution time on the server for this operation.
@@ -114,7 +126,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
      */
-    MapReduceIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit);
+    MapReduceIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
 
     /**
      * Specify the {@code MapReduceAction} to be used when writing to a collection.
@@ -122,7 +134,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @param action an {@link MapReduceAction} to perform on the collection
      * @return this
      */
-    MapReduceIterable<TResult> action(final MapReduceAction action);
+    MapReduceIterable<TResult> action(MapReduceAction action);
 
     /**
      * Sets the name of the database to output into.
@@ -131,7 +143,8 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce/#output-to-a-collection-with-an-action output with an action
      */
-    MapReduceIterable<TResult> databaseName(final String databaseName);
+    MapReduceIterable<TResult> databaseName(@Nullable String databaseName);
+
     /**
      * Sets if the output database is sharded
      *
@@ -139,7 +152,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce/#output-to-a-collection-with-an-action output with an action
      */
-    MapReduceIterable<TResult> sharded(final boolean sharded);
+    MapReduceIterable<TResult> sharded(boolean sharded);
 
     /**
      * Sets if the post-processing step will prevent MongoDB from locking the database.
@@ -150,7 +163,7 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @return this
      * @mongodb.driver.manual reference/command/mapReduce/#output-to-a-collection-with-an-action output with an action
      */
-    MapReduceIterable<TResult> nonAtomic(final boolean nonAtomic);
+    MapReduceIterable<TResult> nonAtomic(boolean nonAtomic);
 
     /**
      * Sets the number of documents to return per batch.
@@ -173,5 +186,16 @@ public interface MapReduceIterable<TResult> extends MongoIterable<TResult> {
      * @mongodb.driver.manual reference/command/mapReduce mapReduce
      * @mongodb.server.release 3.2
      */
-    MapReduceIterable<TResult> bypassDocumentValidation(final Boolean bypassDocumentValidation);
+    MapReduceIterable<TResult> bypassDocumentValidation(@Nullable Boolean bypassDocumentValidation);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    MapReduceIterable<TResult> collation(@Nullable Collation collation);
 }
diff --git a/driver-sync/src/main/com/mongodb/client/MongoChangeStreamCursor.java b/driver-sync/src/main/com/mongodb/client/MongoChangeStreamCursor.java
new file mode 100644
index 00000000000..16a3bb5f117
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/MongoChangeStreamCursor.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+
+/**
+ * The Mongo Cursor interface for change streams implementing the iterator protocol.
+ * <p>
+ * An application should ensure that a cursor is closed in all circumstances, e.g. using a try-with-resources statement:
+ * </p>
+ * <blockquote><pre>
+ * try (MongoChangeStreamCursor&lt;Document&gt; cursor = collection.find().cursor()) {
+ *     while (cursor.hasNext()) {
+ *         System.out.println(cursor.next());
+ *     }
+ * }
+ * </pre></blockquote>
+ *
+ * @since 3.11
+ * @param <TResult> The type of documents the cursor contains
+ */
+public interface MongoChangeStreamCursor<TResult> extends MongoCursor<TResult> {
+    /**
+     * Returns the resume token. If a batch has been iterated to the last change stream document in the batch
+     * and a postBatchResumeToken is included in the document, the postBatchResumeToken will be returned.
+     * Otherwise, the resume token contained in the last change stream document will be returned.
+     *
+     * @return the resume token, which can be null if the cursor has either not been iterated yet, or the cursor is closed.
+     */
+    @Nullable
+    BsonDocument getResumeToken();
+}
diff --git a/driver-sync/src/main/com/mongodb/client/MongoClient.java b/driver-sync/src/main/com/mongodb/client/MongoClient.java
new file mode 100644
index 00000000000..c0b0565df81
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/MongoClient.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.MongoNamespace;
+import com.mongodb.annotations.Immutable;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.event.ClusterListener;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
+import java.io.Closeable;
+import java.util.List;
+
+/**
+ * A client-side representation of a MongoDB cluster.  Instances can represent either a standalone MongoDB instance, a replica set,
+ * or a sharded cluster.  Instance of this class are responsible for maintaining an up-to-date state of the cluster,
+ * and possibly cache resources related to this, including background threads for monitoring, and connection pools.
+ * <p>
+ * Instances of this class serve as factories for {@link MongoDatabase} instances.
+ * </p>
+ * <p>
+ * Instances of this class can be created via the {@link MongoClients} factory.
+ * </p>
+ * @see MongoClients
+ * @since 3.7
+ */
+@Immutable
+public interface MongoClient extends Closeable {
+
+    /**
+     * Gets a {@link MongoDatabase} instance for the given database name.
+     *
+     * @param databaseName the name of the database to retrieve
+     * @return a {@code MongoDatabase} representing the specified database
+     * @throws IllegalArgumentException if databaseName is invalid
+     * @see MongoNamespace#checkDatabaseNameValidity(String)
+     */
+    MongoDatabase getDatabase(String databaseName);
+
+    /**
+     * Creates a client session with default options.
+     *
+     * <p>Note: A ClientSession instance can not be used concurrently in multiple operations.</p>
+     *
+     * @return the client session
+     * @mongodb.server.release 3.6
+     */
+    ClientSession startSession();
+
+    /**
+     * Creates a client session.
+     *
+     * <p>Note: A ClientSession instance can not be used concurrently in multiple operations.</p>
+     *
+     * @param options  the options for the client session
+     * @return the client session
+     * @mongodb.server.release 3.6
+     */
+    ClientSession startSession(ClientSessionOptions options);
+
+    /**
+     * Close the client, which will close all underlying cached resources, including, for example,
+     * sockets and background monitoring threads.
+     */
+    void close();
+
+    /**
+     * Get a list of the database names
+     *
+     * @return an iterable containing all the names of all the databases
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     */
+    MongoIterable<String> listDatabaseNames();
+
+    /**
+     * Get a list of the database names
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return an iterable containing all the names of all the databases
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     * @mongodb.server.release 3.6
+     */
+    MongoIterable<String> listDatabaseNames(ClientSession clientSession);
+
+    /**
+     * Gets the list of databases
+     *
+     * @return the list databases iterable interface
+     */
+    ListDatabasesIterable<Document> listDatabases();
+
+    /**
+     * Gets the list of databases
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the list databases iterable interface
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     * @mongodb.server.release 3.6
+     */
+    ListDatabasesIterable<Document> listDatabases(ClientSession clientSession);
+
+    /**
+     * Gets the list of databases
+     *
+     * @param resultClass the class to cast the database documents to
+     * @param <TResult>   the type of the class to use instead of {@code Document}.
+     * @return the list databases iterable interface
+     */
+    <TResult> ListDatabasesIterable<TResult> listDatabases(Class<TResult> resultClass);
+
+    /**
+     * Gets the list of databases
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to cast the database documents to
+     * @param <TResult>   the type of the class to use instead of {@code Document}.
+     * @return the list databases iterable interface
+     * @mongodb.driver.manual reference/command/listDatabases List Databases
+     * @mongodb.server.release 3.6
+     */
+    <TResult> ListDatabasesIterable<TResult> listDatabases(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch();
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch(List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this client.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Gets the current cluster description.
+     *
+     * <p>
+     * This method will not block, meaning that it may return a {@link ClusterDescription} whose {@code clusterType} is unknown
+     * and whose {@link com.mongodb.connection.ServerDescription}s are all in the connecting state.  If the application requires
+     * notifications after the driver has connected to a member of the cluster, it should register a {@link ClusterListener} via
+     * the {@link ClusterSettings} in {@link com.mongodb.MongoClientSettings}.
+     * </p>
+     *
+     * @return the current cluster description
+     * @see ClusterSettings.Builder#addClusterListener(ClusterListener)
+     * @see com.mongodb.MongoClientSettings.Builder#applyToClusterSettings(com.mongodb.Block)
+     * @since 3.11
+     */
+    ClusterDescription getClusterDescription();
+}
diff --git a/driver-sync/src/main/com/mongodb/client/MongoClientFactory.java b/driver-sync/src/main/com/mongodb/client/MongoClientFactory.java
new file mode 100644
index 00000000000..f8e8d7bd627
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/MongoClientFactory.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoException;
+import com.mongodb.diagnostics.logging.Logger;
+import com.mongodb.diagnostics.logging.Loggers;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+import javax.naming.spi.ObjectFactory;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import static java.lang.String.format;
+
+/**
+ * A JNDI ObjectFactory for {@link MongoClient} instances.
+ *
+ * @since 3.10
+ */
+public class MongoClientFactory implements ObjectFactory {
+
+    private static final Logger LOGGER = Loggers.getLogger("client");
+
+    private static final String CONNECTION_STRING = "connectionString";
+
+    /**
+     * This implementation will create instances of {@link MongoClient} based on a connection string conforming to the format specified in
+     * {@link com.mongodb.ConnectionString}.
+     * <p>The connection string is specified in one of two ways:</p>
+     * <ul>
+     * <li>As the {@code String} value of a property in the {@code environment} parameter with a key of {@code "connectionString"}</li>
+     * <li>As the {@code String} value of a {@link RefAddr} with type {@code "connectionString"} in an {@code obj} parameter
+     * of type {@link Reference}</li>
+     * </ul>
+     *
+     * Specification of the connection string in the {@code environment} parameter takes precedence over specification in the {@code obj}
+     * parameter.  The {@code name} and {@code nameCtx} parameters are ignored.
+     *
+     * If a non-empty connection string is not specified in either of these two ways, a {@link MongoException} is thrown.
+     * @return an instance of {@link MongoClient} based on the specified connection string
+     */
+    @Override
+    public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> environment) {
+
+        // Some app servers, e.g. Wildfly, use the environment to pass location information to an ObjectFactory
+        String connectionString = null;
+
+        if (environment.get(CONNECTION_STRING) instanceof String) {
+            connectionString = (String) environment.get(CONNECTION_STRING);
+        }
+
+        if (connectionString == null || connectionString.isEmpty()) {
+            LOGGER.debug(format("No '%s' property in environment.  Casting 'obj' to java.naming.Reference to look for a "
+                                        + "javax.naming.RefAddr with type equal to '%s'", CONNECTION_STRING, CONNECTION_STRING));
+
+            // Some app servers, e.g. Tomcat, pass obj as an instance of javax.naming.Reference and pass location information in a
+            // javax.naming.RefAddr
+            if (obj instanceof Reference) {
+                Enumeration<RefAddr> props = ((Reference) obj).getAll();
+
+                while (props.hasMoreElements()) {
+                    RefAddr addr = props.nextElement();
+                    if (addr != null) {
+                        if (CONNECTION_STRING.equals(addr.getType())) {
+                            if (addr.getContent() instanceof String) {
+                                connectionString = (String) addr.getContent();
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (connectionString == null || connectionString.isEmpty()) {
+            throw new MongoException(format("Could not locate '%s' in either environment or obj", CONNECTION_STRING));
+        }
+
+        return MongoClients.create(connectionString);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/MongoClients.java b/driver-sync/src/main/com/mongodb/client/MongoClients.java
new file mode 100644
index 00000000000..53199697cfe
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/MongoClients.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.client.internal.MongoClientImpl;
+import com.mongodb.lang.Nullable;
+
+
+/**
+ * A factory for {@link MongoClient} instances.  Use of this class is now the recommended way to connect to MongoDB via the Java driver.
+ *
+ * @see MongoClient
+ * @since 3.7
+ */
+public final class MongoClients {
+
+    /**
+     * Creates a new client with the default connection string "mongodb://localhost".
+     *
+     * @return the client
+     */
+    public static MongoClient create() {
+        return create(new ConnectionString("mongodb://localhost"));
+    }
+
+    /**
+     * Create a new client with the given client settings.
+     *
+     * @param settings the settings
+     * @return the client
+     */
+    public static MongoClient create(final MongoClientSettings settings) {
+        return create(settings, null);
+    }
+
+    /**
+     * Create a new client with the given connection string as if by a call to {@link #create(ConnectionString)}.
+     *
+     * @param connectionString the connection
+     * @return the client
+     * @see #create(ConnectionString)
+     */
+    public static MongoClient create(final String connectionString) {
+        return create(new ConnectionString(connectionString));
+    }
+
+    /**
+     * Create a new client with the given connection string.
+     * <p>
+     * For each of the settings classed configurable via {@link MongoClientSettings}, the connection string is applied by calling the
+     * {@code applyConnectionString} method on an instance of setting's builder class, building the setting, and adding it to an instance of
+     * {@link com.mongodb.MongoClientSettings.Builder}.
+     * </p>
+     * <p>
+     * The connection string's stream type is then applied by setting the
+     * {@link com.mongodb.connection.StreamFactory} to an instance of NettyStreamFactory,
+     * </p>
+     *
+     * @param connectionString the settings
+     * @return the client
+     * @throws IllegalArgumentException if the connection string's stream type is not one of "netty" or "nio2"
+     *
+     * @see com.mongodb.MongoClientSettings.Builder#applyConnectionString(ConnectionString)
+     */
+    public static MongoClient create(final ConnectionString connectionString) {
+        return create(connectionString, null);
+    }
+
+    /**
+     * Create a new client with the given connection string.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param connectionString       the settings
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @return the client
+     * @throws IllegalArgumentException if the connection string's stream type is not one of "netty" or "nio2"
+     * @see MongoClients#create(ConnectionString)
+     */
+    public static MongoClient create(final ConnectionString connectionString,
+                                     @Nullable final MongoDriverInformation mongoDriverInformation) {
+        return create(MongoClientSettings.builder().applyConnectionString(connectionString).build(), mongoDriverInformation);
+    }
+
+    /**
+     * Creates a new client with the given client settings.
+     *
+     * <p>Note: Intended for driver and library authors to associate extra driver metadata with the connections.</p>
+     *
+     * @param settings               the settings
+     * @param mongoDriverInformation any driver information to associate with the MongoClient
+     * @return the client
+     */
+    public static MongoClient create(final MongoClientSettings settings, @Nullable final MongoDriverInformation mongoDriverInformation) {
+        MongoDriverInformation.Builder builder = mongoDriverInformation == null ? MongoDriverInformation.builder()
+                : MongoDriverInformation.builder(mongoDriverInformation);
+        return new MongoClientImpl(settings, builder.driverName("sync").build());
+    }
+
+    private MongoClients() {
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/MongoCollection.java b/driver-sync/src/main/com/mongodb/client/MongoCollection.java
new file mode 100644
index 00000000000..d831d6df79f
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/MongoCollection.java
@@ -0,0 +1,2051 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.CreateIndexOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropIndexOptions;
+import com.mongodb.client.model.EstimatedDocumentCountOptions;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.IndexModel;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.InsertManyOptions;
+import com.mongodb.client.model.InsertOneOptions;
+import com.mongodb.client.model.RenameCollectionOptions;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.lang.Nullable;
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+/**
+ * The MongoCollection interface.
+ *
+ * <p>Note: Additions to this interface will not be considered to break binary compatibility.</p>
+ *
+ * <p>MongoCollection is generic allowing for different types to represent documents. Any custom classes must have a
+ * {@link org.bson.codecs.Codec} registered in the {@link CodecRegistry}.
+ * </p>
+ *
+ * @param <TDocument> The type that this collection will encode documents from and decode documents to.
+ * @since 3.0
+ */
+@ThreadSafe
+public interface MongoCollection<TDocument> {
+
+    /**
+     * Gets the namespace of this collection.
+     *
+     * @return the namespace
+     */
+    MongoNamespace getNamespace();
+
+    /**
+     * Get the class of documents stored in this collection.
+     *
+     * @return the class
+     */
+    Class<TDocument> getDocumentClass();
+
+    /**
+     * Get the codec registry for the MongoCollection.
+     *
+     * @return the {@link org.bson.codecs.configuration.CodecRegistry}
+     */
+    CodecRegistry getCodecRegistry();
+
+    /**
+     * Get the read preference for the MongoCollection.
+     *
+     * @return the {@link com.mongodb.ReadPreference}
+     */
+    ReadPreference getReadPreference();
+
+    /**
+     * Get the write concern for the MongoCollection.
+     *
+     * @return the {@link com.mongodb.WriteConcern}
+     */
+    WriteConcern getWriteConcern();
+
+    /**
+     * Get the read concern for the MongoCollection.
+     *
+     * @return the {@link com.mongodb.ReadConcern}
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    ReadConcern getReadConcern();
+
+    /**
+     * Create a new MongoCollection instance with a different default class to cast any documents returned from the database into..
+     *
+     * @param clazz the default class to cast any documents returned from the database into.
+     * @param <NewTDocument> The type that the new collection will encode documents from and decode documents to
+     * @return a new MongoCollection instance with the different default class
+     */
+    <NewTDocument> MongoCollection<NewTDocument> withDocumentClass(Class<NewTDocument> clazz);
+
+    /**
+     * Create a new MongoCollection instance with a different codec registry.
+     *
+     * @param codecRegistry the new {@link org.bson.codecs.configuration.CodecRegistry} for the collection
+     * @return a new MongoCollection instance with the different codec registry
+     */
+    MongoCollection<TDocument> withCodecRegistry(CodecRegistry codecRegistry);
+
+    /**
+     * Create a new MongoCollection instance with a different read preference.
+     *
+     * @param readPreference the new {@link com.mongodb.ReadPreference} for the collection
+     * @return a new MongoCollection instance with the different readPreference
+     */
+    MongoCollection<TDocument> withReadPreference(ReadPreference readPreference);
+
+    /**
+     * Create a new MongoCollection instance with a different write concern.
+     *
+     * @param writeConcern the new {@link com.mongodb.WriteConcern} for the collection
+     * @return a new MongoCollection instance with the different writeConcern
+     */
+    MongoCollection<TDocument> withWriteConcern(WriteConcern writeConcern);
+
+    /**
+     * Create a new MongoCollection instance with a different read concern.
+     *
+     * @param readConcern the new {@link ReadConcern} for the collection
+     * @return a new MongoCollection instance with the different ReadConcern
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    MongoCollection<TDocument> withReadConcern(ReadConcern readConcern);
+
+    /**
+     * Counts the number of documents in the collection.
+     *
+     * @return the number of documents in the collection
+     * @deprecated use {@link #countDocuments()} or {@link #estimatedDocumentCount()} instead
+     */
+    @Deprecated
+    long count();
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * @param filter the query filter
+     * @return the number of documents in the collection
+     * @deprecated use {@link #countDocuments(Bson)} instead
+     */
+    @Deprecated
+    long count(Bson filter);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * @param filter  the query filter
+     * @param options the options describing the count
+     * @return the number of documents in the collection
+     * @deprecated use {@link #countDocuments(Bson, CountOptions)} instead
+     */
+    @Deprecated
+    long count(Bson filter, CountOptions options);
+
+    /**
+     * Counts the number of documents in the collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the number of documents in the collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated use {@link #countDocuments(ClientSession)} instead
+     */
+    @Deprecated
+    long count(ClientSession clientSession);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter
+     * @return the number of documents in the collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated use {@link #countDocuments(ClientSession, Bson)} instead
+     */
+    @Deprecated
+    long count(ClientSession clientSession, Bson filter);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  the query filter
+     * @param options the options describing the count
+     * @return the number of documents in the collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @deprecated use {@link #countDocuments(ClientSession, Bson, CountOptions)} instead
+     */
+    @Deprecated
+    long count(ClientSession clientSession, Bson filter, CountOptions options);
+
+    /**
+     * Counts the number of documents in the collection.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount()}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @return the number of documents in the collection
+     * @since 3.8
+     */
+    long countDocuments();
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount()}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param filter the query filter
+     * @return the number of documents in the collection
+     * @since 3.8
+     */
+    long countDocuments(Bson filter);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount()}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param filter  the query filter
+     * @param options the options describing the count
+     * @return the number of documents in the collection
+     * @since 3.8
+     */
+    long countDocuments(Bson filter, CountOptions options);
+
+    /**
+     * Counts the number of documents in the collection.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount()}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the number of documents in the collection
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    long countDocuments(ClientSession clientSession);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount()}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter
+     * @return the number of documents in the collection
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    long countDocuments(ClientSession clientSession, Bson filter);
+
+    /**
+     * Counts the number of documents in the collection according to the given options.
+     *
+     * <p>
+     * Note: For a fast count of the total documents in a collection see {@link #estimatedDocumentCount()}.
+     * When migrating from {@code count()} to {@code countDocuments()} the following query operators must be replaced:
+     * </p>
+     * <pre>
+     *
+     *  +-------------+--------------------------------+
+     *  | Operator    | Replacement                    |
+     *  +=============+================================+
+     *  | $where      |  $expr                         |
+     *  +-------------+--------------------------------+
+     *  | $near       |  $geoWithin with $center       |
+     *  +-------------+--------------------------------+
+     *  | $nearSphere |  $geoWithin with $centerSphere |
+     *  +-------------+--------------------------------+
+     * </pre>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  the query filter
+     * @param options the options describing the count
+     * @return the number of documents in the collection
+     * @since 3.8
+     * @mongodb.server.release 3.6
+     */
+    long countDocuments(ClientSession clientSession, Bson filter, CountOptions options);
+
+    /**
+     * Gets an estimate of the count of documents in a collection using collection metadata.
+     *
+     * @return the number of documents in the collection
+     * @since 3.8
+     */
+    long estimatedDocumentCount();
+
+    /**
+     * Gets an estimate of the count of documents in a collection using collection metadata.
+     *
+     * @param options the options describing the count
+     * @return the number of documents in the collection
+     * @since 3.8
+     */
+    long estimatedDocumentCount(EstimatedDocumentCountOptions options);
+
+    /**
+     * Gets the distinct values of the specified field name.
+     *
+     * @param fieldName   the field name
+     * @param resultClass the class to cast any distinct items into.
+     * @param <TResult>   the target type of the iterable.
+     * @return an iterable of distinct values
+     * @mongodb.driver.manual reference/command/distinct/ Distinct
+     */
+    <TResult> DistinctIterable<TResult> distinct(String fieldName, Class<TResult> resultClass);
+
+    /**
+     * Gets the distinct values of the specified field name.
+     *
+     * @param fieldName   the field name
+     * @param filter      the query filter
+     * @param resultClass the class to cast any distinct items into.
+     * @param <TResult>   the target type of the iterable.
+     * @return an iterable of distinct values
+     * @mongodb.driver.manual reference/command/distinct/ Distinct
+     */
+    <TResult> DistinctIterable<TResult> distinct(String fieldName, Bson filter, Class<TResult> resultClass);
+
+    /**
+     * Gets the distinct values of the specified field name.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param fieldName   the field name
+     * @param resultClass the class to cast any distinct items into.
+     * @param <TResult>   the target type of the iterable.
+     * @return an iterable of distinct values
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/distinct/ Distinct
+     */
+    <TResult> DistinctIterable<TResult> distinct(ClientSession clientSession, String fieldName, Class<TResult> resultClass);
+
+    /**
+     * Gets the distinct values of the specified field name.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param fieldName   the field name
+     * @param filter      the query filter
+     * @param resultClass the class to cast any distinct items into.
+     * @param <TResult>   the target type of the iterable.
+     * @return an iterable of distinct values
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/distinct/ Distinct
+     */
+    <TResult> DistinctIterable<TResult> distinct(ClientSession clientSession, String fieldName, Bson filter, Class<TResult> resultClass);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    FindIterable<TDocument> find();
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    <TResult> FindIterable<TResult> find(Class<TResult> resultClass);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param filter the query filter
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    FindIterable<TDocument> find(Bson filter);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param filter      the query filter
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    <TResult> FindIterable<TResult> find(Bson filter, Class<TResult> resultClass);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the find iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    FindIterable<TDocument> find(ClientSession clientSession);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the find iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    <TResult> FindIterable<TResult> find(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter
+     * @return the find iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    FindIterable<TDocument> find(ClientSession clientSession, Bson filter);
+
+    /**
+     * Finds all documents in the collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter      the query filter
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the find iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    <TResult> FindIterable<TResult> find(ClientSession clientSession, Bson filter, Class<TResult> resultClass);
+
+    /**
+     * Aggregates documents according to the specified aggregation pipeline.
+     *
+     * @param pipeline the aggregation pipeline
+     * @return an iterable containing the result of the aggregation operation
+     * @mongodb.driver.manual aggregation/ Aggregation
+     * @mongodb.server.release 2.2
+     */
+    AggregateIterable<TDocument> aggregate(List<? extends Bson> pipeline);
+
+    /**
+     * Aggregates documents according to the specified aggregation pipeline.
+     *
+     * @param pipeline    the aggregation pipeline
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return an iterable containing the result of the aggregation operation
+     * @mongodb.driver.manual aggregation/ Aggregation
+     * @mongodb.server.release 2.2
+     */
+    <TResult> AggregateIterable<TResult> aggregate(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Aggregates documents according to the specified aggregation pipeline.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual aggregation/ Aggregation
+     */
+    AggregateIterable<TDocument> aggregate(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Aggregates documents according to the specified aggregation pipeline.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual aggregation/ Aggregation
+     */
+    <TResult> AggregateIterable<TResult> aggregate(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     */
+    ChangeStreamIterable<TDocument> watch();
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     */
+    ChangeStreamIterable<TDocument> watch(List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.6
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the change stream iterable
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<TDocument> watch(ClientSession clientSession);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<TDocument> watch(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Aggregates documents according to the specified map-reduce function.
+     *
+     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
+     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
+     * @return an iterable containing the result of the map-reduce operation
+     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
+     */
+    MapReduceIterable<TDocument> mapReduce(String mapFunction, String reduceFunction);
+
+    /**
+     * Aggregates documents according to the specified map-reduce function.
+     *
+     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
+     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
+     * @param resultClass    the class to decode each resulting document into.
+     * @param <TResult>      the target document type of the iterable.
+     * @return an iterable containing the result of the map-reduce operation
+     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
+     */
+    <TResult> MapReduceIterable<TResult> mapReduce(String mapFunction, String reduceFunction, Class<TResult> resultClass);
+
+    /**
+     * Aggregates documents according to the specified map-reduce function.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
+     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
+     * @return an iterable containing the result of the map-reduce operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
+     */
+    MapReduceIterable<TDocument> mapReduce(ClientSession clientSession, String mapFunction, String reduceFunction);
+
+    /**
+     * Aggregates documents according to the specified map-reduce function.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
+     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
+     * @param resultClass    the class to decode each resulting document into.
+     * @param <TResult>      the target document type of the iterable.
+     * @return an iterable containing the result of the map-reduce operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
+     */
+    <TResult> MapReduceIterable<TResult> mapReduce(ClientSession clientSession, String mapFunction, String reduceFunction,
+                                                   Class<TResult> resultClass);
+
+    /**
+     * Executes a mix of inserts, updates, replaces, and deletes.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
+     * @param requests the writes to execute
+     * @return the result of the bulk write
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoException          if there's an exception running the operation
+     */
+    BulkWriteResult bulkWrite(List<? extends WriteModel<? extends TDocument>> requests);
+
+    /**
+     * Executes a mix of inserts, updates, replaces, and deletes.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
+     * @param requests the writes to execute
+     * @param options  the options to apply to the bulk write operation
+     * @return the result of the bulk write
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoException          if there's an exception running the operation
+     */
+    BulkWriteResult bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWriteOptions options);
+
+    /**
+     * Executes a mix of inserts, updates, replaces, and deletes.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param requests the writes to execute
+     * @return the result of the bulk write
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoException          if there's an exception running the operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    BulkWriteResult bulkWrite(ClientSession clientSession, List<? extends WriteModel<? extends TDocument>> requests);
+
+    /**
+     * Executes a mix of inserts, updates, replaces, and deletes.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.
+     * The eligibility for retryable write support for bulk operations is determined on the whole bulk write. If the {@code requests}
+     * contain any {@code UpdateManyModels} or {@code DeleteManyModels} then the bulk operation will not support retryable writes.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param requests the writes to execute
+     * @param options  the options to apply to the bulk write operation
+     * @return the result of the bulk write
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoException          if there's an exception running the operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    BulkWriteResult bulkWrite(ClientSession clientSession, List<? extends WriteModel<? extends TDocument>> requests,
+                              BulkWriteOptions options);
+
+    /**
+     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param document the document to insert
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     */
+    void insertOne(TDocument document);
+
+    /**
+     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param document the document to insert
+     * @param options  the options to apply to the operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.2
+     */
+    void insertOne(TDocument document, InsertOneOptions options);
+
+    /**
+     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param document      the document to insert
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertOne(ClientSession clientSession, TDocument document);
+
+    /**
+     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param document      the document to insert
+     * @param options       the options to apply to the operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertOne(ClientSession clientSession, TDocument document, InsertOneOptions options);
+
+    /**
+     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param documents the documents to insert
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoCommandException   if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException          if the write failed due some other failure
+     * @see com.mongodb.client.MongoCollection#bulkWrite
+     */
+    void insertMany(List<? extends TDocument> documents);
+
+    /**
+     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param documents the documents to insert
+     * @param options   the options to apply to the operation
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoCommandException   if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException          if the write failed due some other failure
+     */
+    void insertMany(List<? extends TDocument> documents, InsertManyOptions options);
+
+    /**
+     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param documents the documents to insert
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoCommandException   if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException          if the write failed due some other failure
+     * @see com.mongodb.client.MongoCollection#bulkWrite
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertMany(ClientSession clientSession, List<? extends TDocument> documents);
+
+    /**
+     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param documents the documents to insert
+     * @param options   the options to apply to the operation
+     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
+     * @throws com.mongodb.MongoCommandException   if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException          if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void insertMany(ClientSession clientSession, List<? extends TDocument> documents, InsertManyOptions options);
+
+    /**
+     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
+     * modified.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter the query filter to apply the the delete operation
+     * @return the result of the remove one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     */
+    DeleteResult deleteOne(Bson filter);
+
+    /**
+     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
+     * modified.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @return the result of the remove one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.4
+     */
+    DeleteResult deleteOne(Bson filter, DeleteOptions options);
+
+    /**
+     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
+     * modified.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter to apply the the delete operation
+     * @return the result of the remove one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    DeleteResult deleteOne(ClientSession clientSession, Bson filter);
+
+    /**
+     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
+     * modified.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @return the result of the remove one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    DeleteResult deleteOne(ClientSession clientSession, Bson filter, DeleteOptions options);
+
+    /**
+     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
+     *
+     * @param filter the query filter to apply the the delete operation
+     * @return the result of the remove many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     */
+    DeleteResult deleteMany(Bson filter);
+
+    /**
+     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
+     *
+     * @param filter the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @return the result of the remove many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.4
+     */
+    DeleteResult deleteMany(Bson filter, DeleteOptions options);
+
+    /**
+     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter to apply the the delete operation
+     * @return the result of the remove many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    DeleteResult deleteMany(ClientSession clientSession, Bson filter);
+
+    /**
+     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter to apply the the delete operation
+     * @param options  the options to apply to the delete operation
+     * @return the result of the remove many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    DeleteResult deleteMany(ClientSession clientSession, Bson filter, DeleteOptions options);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(Bson, Bson)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @return the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     */
+    UpdateResult replaceOne(Bson filter, TDocument replacement);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(Bson, Bson, UpdateOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter        the query filter to apply the the replace operation
+     * @param replacement   the replacement document
+     * @param updateOptions the options to apply to the replace operation
+     * @return the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @deprecated use {@link #replaceOne(Bson, Object, ReplaceOptions)} instead
+     */
+    @Deprecated
+    UpdateResult replaceOne(Bson filter, TDocument replacement, UpdateOptions updateOptions);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(Bson, Bson, UpdateOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter        the query filter to apply the the replace operation
+     * @param replacement   the replacement document
+     * @param replaceOptions the options to apply to the replace operation
+     * @return the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.7
+     */
+    UpdateResult replaceOne(Bson filter, TDocument replacement, ReplaceOptions replaceOptions);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(ClientSession, Bson, Bson)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @return the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     */
+    UpdateResult replaceOne(ClientSession clientSession, Bson filter, TDocument replacement);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(ClientSession, Bson, Bson, UpdateOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        the query filter to apply the the replace operation
+     * @param replacement   the replacement document
+     * @param updateOptions the options to apply to the replace operation
+     * @return the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @deprecated use {@link #replaceOne(ClientSession, Bson, Object, ReplaceOptions)} instead
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     */
+    @Deprecated
+    UpdateResult replaceOne(ClientSession clientSession, Bson filter, TDocument replacement, UpdateOptions updateOptions);
+
+    /**
+     * Replace a document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #updateOne(ClientSession, Bson, Bson, UpdateOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        the query filter to apply the the replace operation
+     * @param replacement   the replacement document
+     * @param replaceOptions the options to apply to the replace operation
+     * @return the result of the replace one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.7
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     */
+    UpdateResult replaceOne(ClientSession clientSession, Bson filter, TDocument replacement, ReplaceOptions replaceOptions);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(Bson, Object)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a document describing the update, which may not be null. The update to apply must include at least one update operator.
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.client.MongoCollection#replaceOne(Bson, Object)
+     */
+    UpdateResult updateOne(Bson filter, Bson update);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(Bson, Object, ReplaceOptions)}
+     * method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a document describing the update, which may not be null. The update to apply must include at least one update
+     *                      operator.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.client.MongoCollection#replaceOne(Bson, Object, ReplaceOptions)
+     */
+    UpdateResult updateOne(Bson filter, Bson update, UpdateOptions updateOptions);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(ClientSession, Bson, Object)}
+     * method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a document describing the update, which may not be null. The update to apply must include at least one update operator.
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.client.MongoCollection#replaceOne(ClientSession, Bson, Object)
+     */
+    UpdateResult updateOne(ClientSession clientSession, Bson filter, Bson update);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #replaceOne(ClientSession, Bson, Object,
+     * ReplaceOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a document describing the update, which may not be null. The update to apply must include at least one update
+     *                     operator.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.client.MongoCollection#replaceOne(ClientSession, Bson, Object, ReplaceOptions)
+     */
+    UpdateResult updateOne(ClientSession clientSession, Bson filter, Bson update, UpdateOptions updateOptions);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateOne(Bson filter, List<? extends Bson> update);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateOne(Bson filter, List<? extends Bson> update, UpdateOptions updateOptions);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateOne(ClientSession clientSession, Bson filter, List<? extends Bson> update);
+
+    /**
+     * Update a single document in the collection according to the specified arguments.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update one operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateOne(ClientSession clientSession, Bson filter, List<? extends Bson> update, UpdateOptions updateOptions);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(Bson filter, Bson update);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(Bson filter, Bson update, UpdateOptions updateOptions);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(ClientSession clientSession, Bson filter, Bson update);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a document describing the update, which may not be null. The update to apply must include only update operators.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due to some specific write exception
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due to being unable to fulfil the write concern
+     * @throws com.mongodb.MongoCommandException      if the write failed due to a specific command exception
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(ClientSession clientSession, Bson filter, Bson update, UpdateOptions updateOptions);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(Bson filter, List<? extends Bson> update);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(Bson filter, List<? extends Bson> update, UpdateOptions updateOptions);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(ClientSession clientSession, Bson filter, List<? extends Bson> update);
+
+    /**
+     * Update all documents in the collection according to the specified arguments.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter        a document describing the query filter, which may not be null.
+     * @param update        a pipeline describing the update, which may not be null.
+     * @param updateOptions the options to apply to the update operation
+     * @return the result of the update many operation
+     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
+     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
+     * @throws com.mongodb.MongoException             if the write failed due some other failure
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     * @mongodb.driver.manual tutorial/modify-documents/ Updates
+     * @mongodb.driver.manual reference/operator/update/ Update Operators
+     */
+    UpdateResult updateMany(ClientSession clientSession, Bson filter, List<? extends Bson> update, UpdateOptions updateOptions);
+
+    /**
+     * Atomically find a document and remove it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter the query filter to find the document with
+     * @return the document that was removed.  If no documents matched the query filter, then null will be returned
+     */
+    @Nullable
+    TDocument findOneAndDelete(Bson filter);
+
+    /**
+     * Atomically find a document and remove it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter  the query filter to find the document with
+     * @param options the options to apply to the operation
+     * @return the document that was removed.  If no documents matched the query filter, then null will be returned
+     */
+    @Nullable
+    TDocument findOneAndDelete(Bson filter, FindOneAndDeleteOptions options);
+
+    /**
+     * Atomically find a document and remove it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter to find the document with
+     * @return the document that was removed.  If no documents matched the query filter, then null will be returned
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    TDocument findOneAndDelete(ClientSession clientSession, Bson filter);
+
+    /**
+     * Atomically find a document and remove it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  the query filter to find the document with
+     * @param options the options to apply to the operation
+     * @return the document that was removed.  If no documents matched the query filter, then null will be returned
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    TDocument findOneAndDelete(ClientSession clientSession, Bson filter, FindOneAndDeleteOptions options);
+
+    /**
+     * Atomically find a document and replace it.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(Bson, Bson)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @return the document that was replaced.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     */
+    @Nullable
+    TDocument findOneAndReplace(Bson filter, TDocument replacement);
+
+    /**
+     * Atomically find a document and replace it.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(Bson, Bson, FindOneAndUpdateOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param options     the options to apply to the operation
+     * @return the document that was replaced.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     */
+    @Nullable
+    TDocument findOneAndReplace(Bson filter, TDocument replacement, FindOneAndReplaceOptions options);
+
+    /**
+     * Atomically find a document and replace it.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(ClientSession, Bson, Bson)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @return the document that was replaced.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    TDocument findOneAndReplace(ClientSession clientSession, Bson filter, TDocument replacement);
+
+    /**
+     * Atomically find a document and replace it.
+     *
+     * <p>Use this method to replace a document using the specified replacement argument. To update the document with update operators, use
+     * the corresponding {@link #findOneAndUpdate(ClientSession, Bson, Bson, FindOneAndUpdateOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter      the query filter to apply the the replace operation
+     * @param replacement the replacement document
+     * @param options     the options to apply to the operation
+     * @return the document that was replaced.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    @Nullable
+    TDocument findOneAndReplace(ClientSession clientSession, Bson filter, TDocument replacement, FindOneAndReplaceOptions options);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(Bson, Object)} method.
+     * </p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a document describing the update, which may not be null. The update to apply must include at least one update operator.
+     * @return the document that was updated before the update was applied.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.client.MongoCollection#findOneAndReplace(Bson, Object)
+     */
+    @Nullable
+    TDocument findOneAndUpdate(Bson filter, Bson update);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(Bson, Object,
+     * FindOneAndReplaceOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a document describing the update, which may not be null. The update to apply must include at least one update
+     *               operator.
+     * @param options the options to apply to the operation
+     * @return the document that was updated.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @see com.mongodb.client.MongoCollection#findOneAndReplace(Bson, Object, FindOneAndReplaceOptions)
+     */
+    @Nullable
+    TDocument findOneAndUpdate(Bson filter, Bson update, FindOneAndUpdateOptions options);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(ClientSession, Bson,
+     * Object)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a document describing the update, which may not be null. The update to apply must include at least one update operator.
+     * @return the document that was updated before the update was applied.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @see com.mongodb.client.MongoCollection#findOneAndReplace(ClientSession, Bson, Object)
+     */
+    @Nullable
+    TDocument findOneAndUpdate(ClientSession clientSession, Bson filter, Bson update);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Use this method to only update the corresponding fields in the document according to the update operators used in the update
+     * document. To replace the entire document with a new document, use the corresponding {@link #findOneAndReplace(ClientSession, Bson,
+     * Object, FindOneAndReplaceOptions)} method.</p>
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a document describing the update, which may not be null. The update to apply must include at least one update
+     *               operator.
+     * @param options the options to apply to the operation
+     * @return the document that was updated.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @mongodb.driver.manual reference/command/update   Update Command Behaviors
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @see com.mongodb.client.MongoCollection#findOneAndReplace(ClientSession, Bson, Object, FindOneAndReplaceOptions)
+     */
+    @Nullable
+    TDocument findOneAndUpdate(ClientSession clientSession, Bson filter, Bson update, FindOneAndUpdateOptions options);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @return the document that was updated before the update was applied.  If no documents matched the query filter, then null will be
+     * returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    @Nullable
+    TDocument findOneAndUpdate(Bson filter, List<? extends Bson> update);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a pipeline describing the update, which may not be null.
+     * @param options the options to apply to the operation
+     * @return the document that was updated.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    @Nullable
+    TDocument findOneAndUpdate(Bson filter, List<? extends Bson> update, FindOneAndUpdateOptions options);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter a document describing the query filter, which may not be null.
+     * @param update a pipeline describing the update, which may not be null.
+     * @return the document that was updated before the update was applied.  If no documents matched the query filter, then null will be
+     * returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    @Nullable
+    TDocument findOneAndUpdate(ClientSession clientSession, Bson filter, List<? extends Bson> update);
+
+    /**
+     * Atomically find a document and update it.
+     *
+     * <p>Note: Supports retryable writes on MongoDB server versions 3.6 or higher when the retryWrites setting is enabled.</p>
+     * @param clientSession the client session with which to associate this operation
+     * @param filter  a document describing the query filter, which may not be null.
+     * @param update  a pipeline describing the update, which may not be null.
+     * @param options the options to apply to the operation
+     * @return the document that was updated.  Depending on the value of the {@code returnOriginal} property, this will either be the
+     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
+     * returned
+     * @since 3.11
+     * @mongodb.server.release 4.2
+     */
+    @Nullable
+    TDocument findOneAndUpdate(ClientSession clientSession, Bson filter, List<? extends Bson> update, FindOneAndUpdateOptions options);
+
+    /**
+     * Drops this collection from the Database.
+     *
+     * @mongodb.driver.manual reference/command/drop/ Drop Collection
+     */
+    void drop();
+
+    /**
+     * Drops this collection from the Database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @mongodb.driver.manual reference/command/drop/ Drop Collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void drop(ClientSession clientSession);
+
+    /**
+     * Create an index with the given keys.
+     *
+     * @param keys an object describing the index key(s), which may not be null.
+     * @return the index name
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     */
+    String createIndex(Bson keys);
+
+    /**
+     * Create an index with the given keys and options.
+     *
+     * @param keys                an object describing the index key(s), which may not be null.
+     * @param indexOptions the options for the index
+     * @return the index name
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     */
+    String createIndex(Bson keys, IndexOptions indexOptions);
+
+    /**
+     * Create an index with the given keys.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param keys an object describing the index key(s), which may not be null.
+     * @return the index name
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     */
+    String createIndex(ClientSession clientSession, Bson keys);
+
+    /**
+     * Create an index with the given keys and options.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param keys                an object describing the index key(s), which may not be null.
+     * @param indexOptions the options for the index
+     * @return the index name
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     */
+    String createIndex(ClientSession clientSession, Bson keys, IndexOptions indexOptions);
+
+    /**
+     * Create multiple indexes.
+     *
+     * @param indexes the list of indexes
+     * @return the list of index names
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     * @mongodb.server.release 2.6
+     */
+    List<String> createIndexes(List<IndexModel> indexes);
+
+    /**
+     * Create multiple indexes.
+     *
+     * @param indexes the list of indexes
+     * @param createIndexOptions options to use when creating indexes
+     * @return the list of index names
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     * @since 3.6
+     */
+    List<String> createIndexes(List<IndexModel> indexes, CreateIndexOptions createIndexOptions);
+
+    /**
+     * Create multiple indexes.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param indexes the list of indexes
+     * @return the list of index names
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     */
+    List<String> createIndexes(ClientSession clientSession, List<IndexModel> indexes);
+
+    /**
+     * Create multiple indexes.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param indexes the list of indexes
+     * @param createIndexOptions options to use when creating indexes
+     * @return the list of index names
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/createIndexes Create indexes
+     */
+    List<String> createIndexes(ClientSession clientSession, List<IndexModel> indexes, CreateIndexOptions createIndexOptions);
+
+    /**
+     * Get all the indexes in this collection.
+     *
+     * @return the list indexes iterable interface
+     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
+     */
+    ListIndexesIterable<Document> listIndexes();
+
+    /**
+     * Get all the indexes in this collection.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the list indexes iterable interface
+     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
+     */
+    <TResult> ListIndexesIterable<TResult> listIndexes(Class<TResult> resultClass);
+
+    /**
+     * Get all the indexes in this collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the list indexes iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
+     */
+    ListIndexesIterable<Document> listIndexes(ClientSession clientSession);
+
+    /**
+     * Get all the indexes in this collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the list indexes iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
+     */
+    <TResult> ListIndexesIterable<TResult> listIndexes(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Drops the index given its name.
+     *
+     * @param indexName the name of the index to remove
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndex(String indexName);
+
+    /**
+     * Drops the index given its name.
+     *
+     * @param indexName the name of the index to remove
+     * @param dropIndexOptions the options to use when dropping indexes
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     */
+    void dropIndex(String indexName, DropIndexOptions dropIndexOptions);
+
+    /**
+     * Drops the index given the keys used to create it.
+     *
+     * @param keys the keys of the index to remove
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndex(Bson keys);
+
+    /**
+     * Drops the index given the keys used to create it.
+     *
+     * @param keys the keys of the index to remove
+     * @param dropIndexOptions the options to use when dropping indexes
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     */
+    void dropIndex(Bson keys, DropIndexOptions dropIndexOptions);
+
+    /**
+     * Drops the index given its name.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param indexName the name of the index to remove
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndex(ClientSession clientSession, String indexName);
+
+    /**
+     * Drops the index given the keys used to create it.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param keys the keys of the index to remove
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndex(ClientSession clientSession, Bson keys);
+
+    /**
+     * Drops the index given its name.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param indexName the name of the index to remove
+     * @param dropIndexOptions the options to use when dropping indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndex(ClientSession clientSession, String indexName, DropIndexOptions dropIndexOptions);
+
+    /**
+     * Drops the index given the keys used to create it.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param keys the keys of the index to remove
+     * @param dropIndexOptions the options to use when dropping indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndex(ClientSession clientSession, Bson keys, DropIndexOptions dropIndexOptions);
+
+    /**
+     * Drop all the indexes on this collection, except for the default on _id.
+     *
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndexes();
+
+    /**
+     * Drop all the indexes on this collection, except for the default on _id.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndexes(ClientSession clientSession);
+
+    /**
+     * Drop all the indexes on this collection, except for the default on _id.
+     *
+     * @param dropIndexOptions the options to use when dropping indexes
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     * @since 3.6
+     */
+    void dropIndexes(DropIndexOptions dropIndexOptions);
+
+    /**
+     * Drop all the indexes on this collection, except for the default on _id.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param dropIndexOptions the options to use when dropping indexes
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
+     */
+    void dropIndexes(ClientSession clientSession, DropIndexOptions dropIndexOptions);
+
+    /**
+     * Rename the collection with oldCollectionName to the newCollectionName.
+     *
+     * @param newCollectionNamespace the namespace the collection will be renamed to
+     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection, or if the
+     *                                          oldCollectionName is the name of a collection that doesn't exist
+     * @mongodb.driver.manual reference/command/renameCollection Rename collection
+     */
+    void renameCollection(MongoNamespace newCollectionNamespace);
+
+    /**
+     * Rename the collection with oldCollectionName to the newCollectionName.
+     *
+     * @param newCollectionNamespace  the name the collection will be renamed to
+     * @param renameCollectionOptions the options for renaming a collection
+     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection and dropTarget
+     *                                          is false, or if the oldCollectionName is the name of a collection that doesn't exist
+     * @mongodb.driver.manual reference/command/renameCollection Rename collection
+     */
+    void renameCollection(MongoNamespace newCollectionNamespace, RenameCollectionOptions renameCollectionOptions);
+
+    /**
+     * Rename the collection with oldCollectionName to the newCollectionName.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param newCollectionNamespace the namespace the collection will be renamed to
+     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection, or if the
+     *                                          oldCollectionName is the name of a collection that doesn't exist
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/renameCollection Rename collection
+     */
+    void renameCollection(ClientSession clientSession, MongoNamespace newCollectionNamespace);
+
+    /**
+     * Rename the collection with oldCollectionName to the newCollectionName.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param newCollectionNamespace  the name the collection will be renamed to
+     * @param renameCollectionOptions the options for renaming a collection
+     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection and dropTarget
+     *                                          is false, or if the oldCollectionName is the name of a collection that doesn't exist
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/renameCollection Rename collection
+     */
+    void renameCollection(ClientSession clientSession, MongoNamespace newCollectionNamespace,
+                          RenameCollectionOptions renameCollectionOptions);
+}
diff --git a/driver/src/main/com/mongodb/client/MongoCursor.java b/driver-sync/src/main/com/mongodb/client/MongoCursor.java
similarity index 81%
rename from driver/src/main/com/mongodb/client/MongoCursor.java
rename to driver-sync/src/main/com/mongodb/client/MongoCursor.java
index 43a277e0021..2fa28ac75a5 100644
--- a/driver/src/main/com/mongodb/client/MongoCursor.java
+++ b/driver-sync/src/main/com/mongodb/client/MongoCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,30 @@
 import com.mongodb.ServerAddress;
 import com.mongodb.ServerCursor;
 import com.mongodb.annotations.NotThreadSafe;
+import com.mongodb.lang.Nullable;
 
 import java.io.Closeable;
 import java.util.Iterator;
 
 /**
- * The Mongo Cursor interface implementing the iterator protocol
+ * The Mongo Cursor interface implementing the iterator protocol.
+ * <p>
+ * An application should ensure that a cursor is closed in all circumstances, e.g. using a try-with-resources statement:
+ *
+ * <blockquote><pre>
+ * try (MongoCursor&lt;Document&gt; cursor = collection.find().iterator()) {
+ *     while (cursor.hasNext()) {
+ *         System.out.println(cursor.next());
+ *     }
+ * }
+ * </pre></blockquote>
  *
  * @since 3.0
  * @param <TResult> The type of documents the cursor contains
  */
 @NotThreadSafe
 public interface MongoCursor<TResult> extends Iterator<TResult>, Closeable {
+
     @Override
     void close();
 
@@ -49,6 +61,7 @@ public interface MongoCursor<TResult> extends Iterator<TResult>, Closeable {
      * @return the next element in the iteration if available or null.
      * @mongodb.driver.manual reference/glossary/#term-tailable-cursor Tailable Cursor
      */
+    @Nullable
     TResult tryNext();
 
     /**
@@ -56,6 +69,7 @@ public interface MongoCursor<TResult> extends Iterator<TResult>, Closeable {
      *
      * @return the ServerCursor, which can be null.
      */
+    @Nullable
     ServerCursor getServerCursor();
 
     /**
diff --git a/driver-sync/src/main/com/mongodb/client/MongoDatabase.java b/driver-sync/src/main/com/mongodb/client/MongoDatabase.java
new file mode 100644
index 00000000000..e1812bc6d3d
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/MongoDatabase.java
@@ -0,0 +1,542 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.CreateViewOptions;
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+/**
+ * The MongoDatabase interface.
+ *
+ * <p>Note: Additions to this interface will not be considered to break binary compatibility.</p>
+ *
+ * @since 3.0
+ */
+@ThreadSafe
+public interface MongoDatabase {
+
+    /**
+     * Gets the name of the database.
+     *
+     * @return the database name
+     */
+    String getName();
+
+    /**
+     * Get the codec registry for the MongoDatabase.
+     *
+     * @return the {@link org.bson.codecs.configuration.CodecRegistry}
+     */
+    CodecRegistry getCodecRegistry();
+
+    /**
+     * Get the read preference for the MongoDatabase.
+     *
+     * @return the {@link com.mongodb.ReadPreference}
+     */
+    ReadPreference getReadPreference();
+
+    /**
+     * Get the write concern for the MongoDatabase.
+     *
+     * @return the {@link com.mongodb.WriteConcern}
+     */
+    WriteConcern getWriteConcern();
+
+    /**
+     * Get the read concern for the MongoDatabase.
+     *
+     * @return the {@link com.mongodb.ReadConcern}
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    ReadConcern getReadConcern();
+
+    /**
+     * Create a new MongoDatabase instance with a different codec registry.
+     *
+     * @param codecRegistry the new {@link org.bson.codecs.configuration.CodecRegistry} for the database
+     * @return a new MongoDatabase instance with the different codec registry
+     */
+    MongoDatabase withCodecRegistry(CodecRegistry codecRegistry);
+
+    /**
+     * Create a new MongoDatabase instance with a different read preference.
+     *
+     * @param readPreference the new {@link ReadPreference} for the database
+     * @return a new MongoDatabase instance with the different readPreference
+     */
+    MongoDatabase withReadPreference(ReadPreference readPreference);
+
+    /**
+     * Create a new MongoDatabase instance with a different write concern.
+     *
+     * @param writeConcern the new {@link WriteConcern} for the database
+     * @return a new MongoDatabase instance with the different writeConcern
+     */
+    MongoDatabase withWriteConcern(WriteConcern writeConcern);
+
+    /**
+     * Create a new MongoDatabase instance with a different read concern.
+     *
+     * @param readConcern the new {@link ReadConcern} for the database
+     * @return a new MongoDatabase instance with the different ReadConcern
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    MongoDatabase withReadConcern(ReadConcern readConcern);
+
+    /**
+     * Gets a collection.
+     *
+     * @param collectionName the name of the collection to return
+     * @return the collection
+     * @throws IllegalArgumentException if collectionName is invalid
+     * @see com.mongodb.MongoNamespace#checkCollectionNameValidity(String)
+     */
+    MongoCollection<Document> getCollection(String collectionName);
+
+    /**
+     * Gets a collection, with a specific default document class.
+     *
+     * @param collectionName the name of the collection to return
+     * @param documentClass  the default class to cast any documents returned from the database into.
+     * @param <TDocument>    the type of the class to use instead of {@code Document}.
+     * @return the collection
+     */
+    <TDocument> MongoCollection<TDocument> getCollection(String collectionName, Class<TDocument> documentClass);
+
+    /**
+     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
+     *
+     * @param command the command to be run
+     * @return the command result
+     */
+    Document runCommand(Bson command);
+
+    /**
+     * Executes the given command in the context of the current database with the given read preference.
+     *
+     * @param command        the command to be run
+     * @param readPreference the {@link ReadPreference} to be used when executing the command
+     * @return the command result
+     */
+    Document runCommand(Bson command, ReadPreference readPreference);
+
+    /**
+     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
+     *
+     * @param command     the command to be run
+     * @param resultClass the class to decode each document into
+     * @param <TResult> the type of the class to use instead of {@code Document}.
+     * @return the command result
+     */
+    <TResult> TResult runCommand(Bson command, Class<TResult> resultClass);
+
+    /**
+     * Executes the given command in the context of the current database with the given read preference.
+     *
+     * @param command        the command to be run
+     * @param readPreference the {@link ReadPreference} to be used when executing the command
+     * @param resultClass    the class to decode each document into
+     * @param <TResult>      the type of the class to use instead of {@code Document}.
+     * @return the command result
+     */
+    <TResult> TResult runCommand(Bson command, ReadPreference readPreference, Class<TResult> resultClass);
+
+    /**
+     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param command the command to be run
+     * @return the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    Document runCommand(ClientSession clientSession, Bson command);
+
+    /**
+     * Executes the given command in the context of the current database with the given read preference.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param command        the command to be run
+     * @param readPreference the {@link ReadPreference} to be used when executing the command
+     * @return the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    Document runCommand(ClientSession clientSession, Bson command, ReadPreference readPreference);
+
+    /**
+     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param command     the command to be run
+     * @param resultClass the class to decode each document into
+     * @param <TResult> the type of the class to use instead of {@code Document}.
+     * @return the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> TResult runCommand(ClientSession clientSession, Bson command, Class<TResult> resultClass);
+
+    /**
+     * Executes the given command in the context of the current database with the given read preference.
+     *
+     * @param clientSession  the client session with which to associate this operation
+     * @param command        the command to be run
+     * @param readPreference the {@link ReadPreference} to be used when executing the command
+     * @param resultClass    the class to decode each document into
+     * @param <TResult>      the type of the class to use instead of {@code Document}.
+     * @return the command result
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    <TResult> TResult runCommand(ClientSession clientSession, Bson command, ReadPreference readPreference, Class<TResult> resultClass);
+
+    /**
+     * Drops this database.
+     *
+     * @mongodb.driver.manual reference/command/dropDatabase/#dbcmd.dropDatabase Drop database
+     */
+    void drop();
+
+    /**
+     * Drops this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/dropDatabase/#dbcmd.dropDatabase Drop database
+     */
+    void drop(ClientSession clientSession);
+
+    /**
+     * Gets the names of all the collections in this database.
+     *
+     * @return an iterable containing all the names of all the collections in this database
+     */
+    MongoIterable<String> listCollectionNames();
+
+    /**
+     * Finds all the collections in this database.
+     *
+     * @return the list collections iterable interface
+     * @mongodb.driver.manual reference/command/listCollections listCollections
+     */
+    ListCollectionsIterable<Document> listCollections();
+
+    /**
+     * Finds all the collections in this database.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the list collections iterable interface
+     * @mongodb.driver.manual reference/command/listCollections listCollections
+     */
+    <TResult> ListCollectionsIterable<TResult> listCollections(Class<TResult> resultClass);
+
+    /**
+     * Gets the names of all the collections in this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return an iterable containing all the names of all the collections in this database
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    MongoIterable<String> listCollectionNames(ClientSession clientSession);
+
+    /**
+     * Finds all the collections in this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the list collections iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/listCollections listCollections
+     */
+    ListCollectionsIterable<Document> listCollections(ClientSession clientSession);
+
+    /**
+     * Finds all the collections in this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the list collections iterable interface
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/listCollections listCollections
+     */
+    <TResult> ListCollectionsIterable<TResult> listCollections(ClientSession clientSession, Class<TResult> resultClass);
+
+
+    /**
+     * Create a new collection with the given name.
+     *
+     * @param collectionName the name for the new collection to create
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createCollection(String collectionName);
+
+    /**
+     * Create a new collection with the selected options
+     *
+     * @param collectionName          the name for the new collection to create
+     * @param createCollectionOptions various options for creating the collection
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createCollection(String collectionName, CreateCollectionOptions createCollectionOptions);
+
+    /**
+     * Create a new collection with the given name.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param collectionName the name for the new collection to create
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createCollection(ClientSession clientSession, String collectionName);
+
+    /**
+     * Create a new collection with the selected options
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param collectionName          the name for the new collection to create
+     * @param createCollectionOptions various options for creating the collection
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createCollection(ClientSession clientSession, String collectionName, CreateCollectionOptions createCollectionOptions);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, and aggregation pipeline that defines the view.
+     *
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createView(String viewName, String viewOn, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, aggregation pipeline, and options that defines the view.
+     *
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @param createViewOptions various options for creating the view
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createView(String viewName, String viewOn, List<? extends Bson> pipeline, CreateViewOptions createViewOptions);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, and aggregation pipeline that defines the view.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createView(ClientSession clientSession, String viewName, String viewOn, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a view with the given name, backing collection/view name, aggregation pipeline, and options that defines the view.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param viewName the name of the view to create
+     * @param viewOn   the backing collection/view for the view
+     * @param pipeline the pipeline that defines the view
+     * @param createViewOptions various options for creating the view
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     * @mongodb.driver.manual reference/command/create Create Command
+     */
+    void createView(ClientSession clientSession, String viewName, String viewOn, List<? extends Bson> pipeline,
+                    CreateViewOptions createViewOptions);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch();
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    ChangeStreamIterable<Document> watch(List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, Class<TResult> resultClass);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline to apply to the change stream.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    ChangeStreamIterable<Document> watch(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Creates a change stream for this database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline to apply to the change stream
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return the change stream iterable
+     * @since 3.8
+     * @mongodb.server.release 4.0
+     * @mongodb.driver.dochub core/changestreams Change Streams
+     */
+    <TResult> ChangeStreamIterable<TResult> watch(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param pipeline the aggregation pipeline
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<Document> aggregate(List<? extends Bson> pipeline);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param pipeline    the aggregation pipeline
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    <TResult> AggregateIterable<TResult> aggregate(List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline the aggregation pipeline
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    AggregateIterable<Document> aggregate(ClientSession clientSession, List<? extends Bson> pipeline);
+
+    /**
+     * Runs an aggregation framework pipeline on the database for pipeline stages
+     * that do not require an underlying collection, such as {@code $currentOp} and {@code $listLocalSessions}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param pipeline    the aggregation pipeline
+     * @param resultClass the class to decode each document into
+     * @param <TResult>   the target document type of the iterable.
+     * @return an iterable containing the result of the aggregation operation
+     * @since 3.10
+     * @mongodb.driver.manual reference/command/aggregate/#dbcmd.aggregate Aggregate Command
+     * @mongodb.server.release 3.6
+     */
+    <TResult> AggregateIterable<TResult> aggregate(ClientSession clientSession, List<? extends Bson> pipeline, Class<TResult> resultClass);
+
+}
diff --git a/driver/src/main/com/mongodb/client/MongoIterable.java b/driver-sync/src/main/com/mongodb/client/MongoIterable.java
similarity index 83%
rename from driver/src/main/com/mongodb/client/MongoIterable.java
rename to driver-sync/src/main/com/mongodb/client/MongoIterable.java
index d91a571e49c..1d348e3a629 100644
--- a/driver/src/main/com/mongodb/client/MongoIterable.java
+++ b/driver-sync/src/main/com/mongodb/client/MongoIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,10 @@
 
 import com.mongodb.Block;
 import com.mongodb.Function;
+import com.mongodb.lang.Nullable;
 
 import java.util.Collection;
+import java.util.function.Consumer;
 
 /**
  *The MongoIterable is the results from an operation, such as a query.
@@ -32,11 +34,20 @@ public interface MongoIterable<TResult> extends Iterable<TResult> {
     @Override
     MongoCursor<TResult> iterator();
 
+    /**
+     * Returns a cursor used for iterating over elements of type {@code TResult}. The cursor is primarily used for change streams.
+     *
+     * @return a cursor
+     * @since 3.11
+     */
+    MongoCursor<TResult> cursor();
+
     /**
      * Helper to return the first item in the iterator or null.
      *
      * @return T the first item or null.
      */
+    @Nullable
     TResult first();
 
     /**
@@ -54,7 +65,9 @@ public interface MongoIterable<TResult> extends Iterable<TResult> {
      * <p>Similar to {@code map} but the function is fully encapsulated with no returned result.</p>
      *
      * @param block the block to apply to each document of type T.
+     * @deprecated Prefer {@link Iterable#forEach(Consumer)}, which was added in Java 8
      */
+    @Deprecated
     void forEach(Block<? super TResult> block);
 
     /**
diff --git a/driver-sync/src/main/com/mongodb/client/TransactionBody.java b/driver-sync/src/main/com/mongodb/client/TransactionBody.java
new file mode 100644
index 00000000000..bd2e801f282
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/TransactionBody.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+/**
+ * A functional interface representing the body of a transaction.  Implementations of this interface should be idempotent in order to
+ * support transaction retry logic.
+ *
+ * @param <T> the return type
+ * @see ClientSession#withTransaction(TransactionBody)
+ * @since 3.10
+ */
+public interface TransactionBody<T> {
+
+    /**
+     * Execute the body of the transaction.
+     *
+     * @return the result of the transaction body
+     */
+    T execute();
+}
diff --git a/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucket.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucket.java
new file mode 100644
index 00000000000..693cb20ed03
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucket.java
@@ -0,0 +1,771 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.gridfs;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.annotations.ThreadSafe;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+import org.bson.BsonValue;
+import org.bson.conversions.Bson;
+import org.bson.types.ObjectId;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Represents a GridFS Bucket
+ *
+ * @since 3.1
+ */
+@ThreadSafe
+public interface GridFSBucket {
+
+    /**
+     * The bucket name.
+     *
+     * @return the bucket name
+     */
+    String getBucketName();
+
+    /**
+     * Sets the chunk size in bytes. Defaults to 255.
+     *
+     * @return the chunk size in bytes.
+     */
+    int getChunkSizeBytes();
+
+    /**
+     * Get the write concern for the GridFSBucket.
+     *
+     * @return the {@link com.mongodb.WriteConcern}
+     */
+    WriteConcern getWriteConcern();
+
+    /**
+     * Get the read preference for the GridFSBucket.
+     *
+     * @return the {@link com.mongodb.ReadPreference}
+     */
+    ReadPreference getReadPreference();
+
+    /**
+     * Get the read concern for the GridFSBucket.
+     *
+     * @return the {@link com.mongodb.ReadConcern}
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    ReadConcern getReadConcern();
+
+    /**
+     * Returns true if computing MD5 checksums when uploading files is disabled.
+     *
+     * @return true if computing MD5 checksums when uploading files is disabled.
+     * @since 3.8
+     * @deprecated there is no replacement for this method, as MD5 is being removed
+     */
+    @Deprecated
+    boolean getDisableMD5();
+
+    /**
+     *  Create a new GridFSBucket instance with a new chunk size in bytes.
+     *
+     * @param chunkSizeBytes the new chunk size in bytes.
+     * @return a new GridFSBucket instance with the different chunk size in bytes
+     */
+    GridFSBucket withChunkSizeBytes(int chunkSizeBytes);
+
+    /**
+     * Create a new GridFSBucket instance with a different read preference.
+     *
+     * @param readPreference the new {@link ReadPreference} for the GridFSBucket
+     * @return a new GridFSBucket instance with the different readPreference
+     */
+    GridFSBucket withReadPreference(ReadPreference readPreference);
+
+    /**
+     * Create a new GridFSBucket instance with a different write concern.
+     *
+     * @param writeConcern the new {@link WriteConcern} for the GridFSBucket
+     * @return a new GridFSBucket instance with the different writeConcern
+     */
+    GridFSBucket withWriteConcern(WriteConcern writeConcern);
+
+    /**
+     * Create a new GridFSBucket instance with a different read concern.
+     *
+     * @param readConcern the new {@link ReadConcern} for the GridFSBucket
+     * @return a new GridFSBucket instance with the different ReadConcern
+     * @since 3.2
+     * @mongodb.server.release 3.2
+     * @mongodb.driver.manual reference/readConcern/ Read Concern
+     */
+    GridFSBucket withReadConcern(ReadConcern readConcern);
+
+    /**
+     * Create a new GridFSBucket instance with the set disable MD5 value.
+     *
+     * @param disableMD5 true if computing MD5 checksums when uploading files should be disabled.
+     * @return a new GridFSBucket instance with the new disable MD5 value.
+     * @since 3.8
+     * @deprecated there is no replacement for this method, as MD5 is being removed
+     */
+    @Deprecated
+    GridFSBucket withDisableMD5(boolean disableMD5);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param filename the filename for the stream
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     */
+    GridFSUploadStream openUploadStream(String filename);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     * @param filename the filename for the stream
+     * @param options the GridFSUploadOptions
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     */
+    GridFSUploadStream openUploadStream(String filename, GridFSUploadOptions options);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     * @since 3.3
+     */
+    GridFSUploadStream openUploadStream(BsonValue id, String filename);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param options the GridFSUploadOptions
+     * @return the GridFSUploadStream that includes the _id for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     * @since 3.3
+     */
+    GridFSUploadStream openUploadStream(BsonValue id, String filename, GridFSUploadOptions options);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, String filename);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @param options the GridFSUploadOptions
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, String filename, GridFSUploadOptions options);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, BsonValue id, String filename);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, ObjectId id, String filename);
+
+    /**
+     * Opens a Stream that the application can write the contents of the file to.
+     *<p>
+     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
+     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
+     * document is created in the files collection.
+     *</p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param options the GridFSUploadOptions
+     * @return the GridFSUploadStream that includes the _id for the file to be uploaded and the Stream to which the
+     *          application will write the contents.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSUploadStream openUploadStream(ClientSession clientSession, BsonValue id, String filename, GridFSUploadOptions options);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     *<p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     *</p>
+     *
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @return the ObjectId of the uploaded file.
+     */
+    ObjectId uploadFromStream(String filename, InputStream source);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @param options the GridFSUploadOptions
+     * @return the ObjectId of the uploaded file.
+     */
+    ObjectId uploadFromStream(String filename, InputStream source, GridFSUploadOptions options);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     *<p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     *</p>
+     *
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @since 3.3
+     */
+    void uploadFromStream(BsonValue id, String filename, InputStream source);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @param options the GridFSUploadOptions
+     * @since 3.3
+     */
+    void uploadFromStream(BsonValue id, String filename, InputStream source, GridFSUploadOptions options);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     *<p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     *</p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @return the ObjectId of the uploaded file.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ObjectId uploadFromStream(ClientSession clientSession, String filename, InputStream source);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @param options the GridFSUploadOptions
+     * @return the ObjectId of the uploaded file.
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    ObjectId uploadFromStream(ClientSession clientSession, String filename, InputStream source, GridFSUploadOptions options);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     *<p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     *</p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void uploadFromStream(ClientSession clientSession, BsonValue id, String filename, InputStream source);
+
+    /**
+     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
+     * <p>
+     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
+     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
+     * </p>
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file
+     * @param filename the filename for the stream
+     * @param source the Stream providing the file data
+     * @param options the GridFSUploadOptions
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void uploadFromStream(ClientSession clientSession, BsonValue id, String filename, InputStream source, GridFSUploadOptions options);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code id}.
+     *
+     * @param id the ObjectId of the file to be put into a stream.
+     * @return the stream
+     */
+    GridFSDownloadStream openDownloadStream(ObjectId id);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code id}.
+     *
+     * @param id the custom id value of the file, to be put into a stream.
+     * @return the stream
+     */
+    GridFSDownloadStream openDownloadStream(BsonValue id);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the latest version of the stored file specified by the
+     * {@code filename}.
+     *
+     * @param filename the name of the file to be downloaded
+     * @return the stream
+     * @since 3.3
+     */
+    GridFSDownloadStream openDownloadStream(String filename);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code filename} and the revision
+     * in {@code options}.
+     *
+     * @param filename the name of the file to be downloaded
+     * @param options the download options
+     * @return the stream
+     * @since 3.3
+     */
+    GridFSDownloadStream openDownloadStream(String filename, GridFSDownloadOptions options);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code id}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the ObjectId of the file to be put into a stream.
+     * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, ObjectId id);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code id}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id value of the file, to be put into a stream.
+     * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, BsonValue id);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the latest version of the stored file specified by the
+     * {@code filename}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the name of the file to be downloaded
+     * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, String filename);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code filename} and the revision
+     * in {@code options}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the name of the file to be downloaded
+     * @param options the download options
+     * @return the stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSDownloadStream openDownloadStream(ClientSession clientSession, String filename, GridFSDownloadOptions options);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination} Stream.
+     *
+     * @param id the ObjectId of the file to be written to the destination stream
+     * @param destination the destination stream
+     */
+    void downloadToStream(ObjectId id, OutputStream destination);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination} Stream.
+     *
+     * @param id the custom id of the file, to be written to the destination stream
+     * @param destination the destination stream
+     */
+    void downloadToStream(BsonValue id, OutputStream destination);
+
+    /**
+     * Downloads the contents of the latest version of the stored file specified by {@code filename} and writes the contents to
+     * the {@code destination} Stream.
+     *
+     * @param filename the name of the file to be downloaded
+     * @param destination the destination stream
+     * @since 3.3
+     */
+    void downloadToStream(String filename, OutputStream destination);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code filename} and by the revision in {@code options} and writes the
+     * contents to the {@code destination} Stream.
+     *
+     * @param filename the name of the file to be downloaded
+     * @param destination the destination stream
+     * @param options the download options
+     * @since 3.3
+     */
+    void downloadToStream(String filename, OutputStream destination, GridFSDownloadOptions options);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination} Stream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the ObjectId of the file to be written to the destination stream
+     * @param destination the destination stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, ObjectId id, OutputStream destination);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination} Stream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the custom id of the file, to be written to the destination stream
+     * @param destination the destination stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, BsonValue id, OutputStream destination);
+
+    /**
+     * Downloads the contents of the latest version of the stored file specified by {@code filename} and writes the contents to
+     * the {@code destination} Stream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the name of the file to be downloaded
+     * @param destination the destination stream
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, String filename, OutputStream destination);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code filename} and by the revision in {@code options} and writes the
+     * contents to the {@code destination} Stream.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filename the name of the file to be downloaded
+     * @param destination the destination stream
+     * @param options the download options
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void downloadToStream(ClientSession clientSession, String filename, OutputStream destination, GridFSDownloadOptions options);
+
+    /**
+     * Finds all documents in the files collection.
+     *
+     * @return the GridFS find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     */
+    GridFSFindIterable find();
+
+    /**
+     * Finds all documents in the collection that match the filter.
+     *
+     * <p>
+     *     Below is an example of filtering against the filename and some nested metadata that can also be stored along with the file data:
+     *  <pre>
+     *  {@code
+     *      Filters.and(Filters.eq("filename", "mongodb.png"), Filters.eq("metadata.contentType", "image/png"));
+     *  }
+     *  </pre>
+     *
+     * @param filter the query filter
+     * @return the GridFS find iterable interface
+     * @see com.mongodb.client.model.Filters
+     */
+    GridFSFindIterable find(Bson filter);
+
+    /**
+     * Finds all documents in the files collection.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @return the GridFS find iterable interface
+     * @mongodb.driver.manual tutorial/query-documents/ Find
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSFindIterable find(ClientSession clientSession);
+
+    /**
+     * Finds all documents in the collection that match the filter.
+     *
+     * <p>
+     *     Below is an example of filtering against the filename and some nested metadata that can also be stored along with the file data:
+     *  <pre>
+     *  {@code
+     *      Filters.and(Filters.eq("filename", "mongodb.png"), Filters.eq("metadata.contentType", "image/png"));
+     *  }
+     *  </pre>
+     *
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param filter the query filter
+     * @return the GridFS find iterable interface
+     * @see com.mongodb.client.model.Filters
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    GridFSFindIterable find(ClientSession clientSession, Bson filter);
+
+    /**
+     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
+     * @param id the ObjectId of the file to be deleted
+     */
+    void delete(ObjectId id);
+
+    /**
+     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
+     * @param id the id of the file to be deleted
+     * @since 3.3
+     */
+    void delete(BsonValue id);
+
+    /**
+     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
+     *
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the ObjectId of the file to be deleted
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void delete(ClientSession clientSession, ObjectId id);
+
+    /**
+     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the id of the file to be deleted
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void delete(ClientSession clientSession, BsonValue id);
+
+    /**
+     * Renames the stored file with the specified {@code id}.
+     *
+     * @param id the id of the file in the files collection to rename
+     * @param newFilename the new filename for the file
+     */
+    void rename(ObjectId id, String newFilename);
+
+    /**
+     * Renames the stored file with the specified {@code id}.
+     *
+     * @param id the id of the file in the files collection to rename
+     * @param newFilename the new filename for the file
+     * @since 3.3
+     */
+    void rename(BsonValue id, String newFilename);
+
+    /**
+     * Renames the stored file with the specified {@code id}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the id of the file in the files collection to rename
+     * @param newFilename the new filename for the file
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void rename(ClientSession clientSession, ObjectId id, String newFilename);
+
+    /**
+     * Renames the stored file with the specified {@code id}.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @param id the id of the file in the files collection to rename
+     * @param newFilename the new filename for the file
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void rename(ClientSession clientSession, BsonValue id, String newFilename);
+
+    /**
+     * Drops the data associated with this bucket from the database.
+     */
+    void drop();
+
+    /**
+     * Drops the data associated with this bucket from the database.
+     *
+     * @param clientSession the client session with which to associate this operation
+     * @since 3.6
+     * @mongodb.server.release 3.6
+     */
+    void drop(ClientSession clientSession);
+
+    // Deprecated APIs
+
+    /**
+     * Opens a Stream from which the application can read the contents of the latest version of the stored file specified by the
+     * {@code filename}.
+     *
+     * @param filename the name of the file to be downloaded
+     * @deprecated use {@link #openDownloadStream(String)} instead.
+     * @return the stream
+     */
+    @Deprecated
+    GridFSDownloadStream openDownloadStreamByName(String filename);
+
+    /**
+     * Opens a Stream from which the application can read the contents of the stored file specified by {@code filename} and the revision
+     * in {@code options}.
+     *
+     * @param filename the name of the file to be downloaded
+     * @param options the download options
+     * @deprecated use {@link #openDownloadStream(String, GridFSDownloadOptions)} instead.
+     * @return the stream
+     */
+    @Deprecated
+    @SuppressWarnings("deprecation")
+    GridFSDownloadStream openDownloadStreamByName(String filename, com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions options);
+
+    /**
+     * Downloads the contents of the latest version of the stored file specified by {@code filename} and writes the contents to
+     * the {@code destination} Stream.
+     *
+     * @param filename the name of the file to be downloaded
+     * @param destination the destination stream
+     * @deprecated use {@link #downloadToStream(String, OutputStream)} instead.
+     */
+    @Deprecated
+    void downloadToStreamByName(String filename, OutputStream destination);
+
+    /**
+     * Downloads the contents of the stored file specified by {@code filename} and by the revision in {@code options} and writes the
+     * contents to the {@code destination} Stream.
+     *
+     * @param filename the name of the file to be downloaded
+     * @param destination the destination stream
+     * @param options the download options
+     * @deprecated use {@link #downloadToStream(String, OutputStream, GridFSDownloadOptions)} instead.
+     */
+    @Deprecated
+    @SuppressWarnings("deprecation")
+    void downloadToStreamByName(String filename, OutputStream destination,
+                                com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions options);
+
+}
diff --git a/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java
new file mode 100644
index 00000000000..cf2a940478b
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java
@@ -0,0 +1,621 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.gridfs;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoGridFSException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
+import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.lang.Nullable;
+import com.mongodb.client.ClientSession;
+import org.bson.BsonDocument;
+import org.bson.BsonObjectId;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.bson.types.ObjectId;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+
+import static com.mongodb.ReadPreference.primary;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.lang.String.format;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+
+final class GridFSBucketImpl implements GridFSBucket {
+    private static final int DEFAULT_CHUNKSIZE_BYTES = 255 * 1024;
+    private final String bucketName;
+    private final int chunkSizeBytes;
+    private final MongoCollection<GridFSFile> filesCollection;
+    private final MongoCollection<Document> chunksCollection;
+    private final boolean disableMD5;
+    private volatile boolean checkedIndexes;
+
+    GridFSBucketImpl(final MongoDatabase database) {
+        this(database, "fs");
+    }
+
+    GridFSBucketImpl(final MongoDatabase database, final String bucketName) {
+        this(notNull("bucketName", bucketName), DEFAULT_CHUNKSIZE_BYTES,
+                getFilesCollection(notNull("database", database), bucketName),
+                getChunksCollection(database, bucketName), false);
+    }
+
+    GridFSBucketImpl(final String bucketName, final int chunkSizeBytes, final MongoCollection<GridFSFile> filesCollection,
+                     final MongoCollection<Document> chunksCollection, final boolean disableMD5) {
+        this.bucketName = notNull("bucketName", bucketName);
+        this.chunkSizeBytes = chunkSizeBytes;
+        this.filesCollection = notNull("filesCollection", filesCollection);
+        this.chunksCollection = notNull("chunksCollection", chunksCollection);
+        this.disableMD5 = disableMD5;
+    }
+
+    @Override
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    @Override
+    public int getChunkSizeBytes() {
+        return chunkSizeBytes;
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return filesCollection.getReadPreference();
+    }
+
+    @Override
+    public WriteConcern getWriteConcern() {
+        return filesCollection.getWriteConcern();
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return filesCollection.getReadConcern();
+    }
+
+    @Override
+    public boolean getDisableMD5() {
+        return disableMD5;
+    }
+
+    @Override
+    public GridFSBucket withChunkSizeBytes(final int chunkSizeBytes) {
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection, chunksCollection, disableMD5);
+    }
+
+    @Override
+    public GridFSBucket withReadPreference(final ReadPreference readPreference) {
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadPreference(readPreference),
+                chunksCollection.withReadPreference(readPreference), disableMD5);
+    }
+
+    @Override
+    public GridFSBucket withWriteConcern(final WriteConcern writeConcern) {
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withWriteConcern(writeConcern),
+                chunksCollection.withWriteConcern(writeConcern), disableMD5);
+    }
+
+    @Override
+    public GridFSBucket withReadConcern(final ReadConcern readConcern) {
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadConcern(readConcern),
+                chunksCollection.withReadConcern(readConcern), disableMD5);
+    }
+
+    @Override
+    public GridFSBucket withDisableMD5(final boolean disableMD5) {
+        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection, chunksCollection, disableMD5);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final String filename) {
+        return openUploadStream(new BsonObjectId(), filename);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final String filename, final GridFSUploadOptions options) {
+        return openUploadStream(new BsonObjectId(), filename, options);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final BsonValue id, final String filename) {
+        return openUploadStream(id, filename, new GridFSUploadOptions());
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final BsonValue id, final String filename, final GridFSUploadOptions options) {
+        return createGridFSUploadStream(null, id, filename, options);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final String filename) {
+        return openUploadStream(clientSession, new BsonObjectId(), filename);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final String filename,
+                                               final GridFSUploadOptions options) {
+        return openUploadStream(clientSession, new BsonObjectId(), filename, options);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final ObjectId id, final String filename) {
+        return openUploadStream(clientSession, new BsonObjectId(id), filename);
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final BsonValue id, final String filename) {
+        return openUploadStream(clientSession, id, filename, new GridFSUploadOptions());
+    }
+
+    @Override
+    public GridFSUploadStream openUploadStream(final ClientSession clientSession, final BsonValue id, final String filename,
+                                               final GridFSUploadOptions options) {
+        notNull("clientSession", clientSession);
+        return createGridFSUploadStream(clientSession, id, filename, options);
+    }
+
+    private GridFSUploadStream createGridFSUploadStream(@Nullable final ClientSession clientSession, final BsonValue id,
+                                                        final String filename, final GridFSUploadOptions options) {
+        notNull("options", options);
+        Integer chunkSizeBytes = options.getChunkSizeBytes();
+        int chunkSize = chunkSizeBytes == null ? this.chunkSizeBytes : chunkSizeBytes;
+        checkCreateIndex(clientSession);
+        return new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, id, filename, chunkSize,
+                disableMD5, options.getMetadata());
+    }
+
+    @Override
+    public ObjectId uploadFromStream(final String filename, final InputStream source) {
+        return uploadFromStream(filename, source, new GridFSUploadOptions());
+    }
+
+    @Override
+    public ObjectId uploadFromStream(final String filename, final InputStream source, final GridFSUploadOptions options) {
+        ObjectId id = new ObjectId();
+        uploadFromStream(new BsonObjectId(id), filename, source, options);
+        return id;
+    }
+
+    @Override
+    public void uploadFromStream(final BsonValue id, final String filename, final InputStream source) {
+        uploadFromStream(id, filename, source, new GridFSUploadOptions());
+    }
+
+    @Override
+    public void uploadFromStream(final BsonValue id, final String filename, final InputStream source,
+                                 final GridFSUploadOptions options) {
+        executeUploadFromStream(null, id, filename, source, options);
+    }
+
+    @Override
+    public ObjectId uploadFromStream(final ClientSession clientSession, final String filename, final InputStream source) {
+        return uploadFromStream(clientSession, filename, source, new GridFSUploadOptions());
+    }
+
+    @Override
+    public ObjectId uploadFromStream(final ClientSession clientSession, final String filename, final InputStream source,
+                                     final GridFSUploadOptions options) {
+        ObjectId id = new ObjectId();
+        uploadFromStream(clientSession, new BsonObjectId(id), filename, source, options);
+        return id;
+    }
+
+    @Override
+    public void uploadFromStream(final ClientSession clientSession, final BsonValue id, final String filename, final InputStream source) {
+        uploadFromStream(clientSession, id, filename, source, new GridFSUploadOptions());
+    }
+
+    @Override
+    public void uploadFromStream(final ClientSession clientSession, final BsonValue id, final String filename, final InputStream source,
+                                 final GridFSUploadOptions options) {
+        notNull("clientSession", clientSession);
+        executeUploadFromStream(clientSession, id, filename, source, options);
+    }
+
+    private void executeUploadFromStream(@Nullable final ClientSession clientSession, final BsonValue id, final String filename,
+                                         final InputStream source, final GridFSUploadOptions options) {
+        GridFSUploadStream uploadStream = createGridFSUploadStream(clientSession, id, filename, options);
+        Integer chunkSizeBytes = options.getChunkSizeBytes();
+        int chunkSize = chunkSizeBytes == null ? this.chunkSizeBytes : chunkSizeBytes;
+        byte[] buffer = new byte[chunkSize];
+        int len;
+        try {
+            while ((len = source.read(buffer)) != -1) {
+                uploadStream.write(buffer, 0, len);
+            }
+            uploadStream.close();
+        } catch (IOException e) {
+            uploadStream.abort();
+            throw new MongoGridFSException("IOException when reading from the InputStream", e);
+        }
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final ObjectId id) {
+        return openDownloadStream(new BsonObjectId(id));
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final BsonValue id) {
+        return createGridFSDownloadStream(null, getFileInfoById(null, id));
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final String filename) {
+        return openDownloadStream(filename, new GridFSDownloadOptions());
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final String filename, final GridFSDownloadOptions options) {
+        return createGridFSDownloadStream(null, getFileByName(null, filename, options));
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final ObjectId id) {
+        return openDownloadStream(clientSession, new BsonObjectId(id));
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final BsonValue id) {
+        notNull("clientSession", clientSession);
+        return createGridFSDownloadStream(clientSession, getFileInfoById(clientSession, id));
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final String filename) {
+        return openDownloadStream(clientSession, filename, new GridFSDownloadOptions());
+    }
+
+    @Override
+    public GridFSDownloadStream openDownloadStream(final ClientSession clientSession, final String filename,
+                                                   final GridFSDownloadOptions options) {
+        notNull("clientSession", clientSession);
+        return createGridFSDownloadStream(clientSession, getFileByName(clientSession, filename, options));
+    }
+
+    private GridFSDownloadStream createGridFSDownloadStream(@Nullable final ClientSession clientSession, final GridFSFile gridFSFile) {
+        return new GridFSDownloadStreamImpl(clientSession, gridFSFile, chunksCollection);
+    }
+
+    @Override
+    public void downloadToStream(final ObjectId id, final OutputStream destination) {
+        downloadToStream(new BsonObjectId(id), destination);
+    }
+
+    @Override
+    public void downloadToStream(final BsonValue id, final OutputStream destination) {
+        downloadToStream(openDownloadStream(id), destination);
+    }
+
+    @Override
+    public void downloadToStream(final String filename, final OutputStream destination) {
+        downloadToStream(filename, destination, new GridFSDownloadOptions());
+    }
+
+    @Override
+    public void downloadToStream(final String filename, final OutputStream destination, final GridFSDownloadOptions options) {
+        downloadToStream(openDownloadStream(filename, options), destination);
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final ObjectId id, final OutputStream destination) {
+        downloadToStream(clientSession, new BsonObjectId(id), destination);
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final BsonValue id, final OutputStream destination) {
+        notNull("clientSession", clientSession);
+        downloadToStream(openDownloadStream(clientSession, id), destination);
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final String filename, final OutputStream destination) {
+        downloadToStream(clientSession, filename, destination, new GridFSDownloadOptions());
+    }
+
+    @Override
+    public void downloadToStream(final ClientSession clientSession, final String filename, final OutputStream destination,
+                                 final GridFSDownloadOptions options) {
+        notNull("clientSession", clientSession);
+        downloadToStream(openDownloadStream(clientSession, filename, options), destination);
+    }
+
+    @Override
+    public GridFSFindIterable find() {
+        return createGridFSFindIterable(null, null);
+    }
+
+    @Override
+    public GridFSFindIterable find(final Bson filter) {
+        notNull("filter", filter);
+        return createGridFSFindIterable(null, filter);
+    }
+
+    @Override
+    public GridFSFindIterable find(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return createGridFSFindIterable(clientSession, null);
+    }
+
+    @Override
+    public GridFSFindIterable find(final ClientSession clientSession, final Bson filter) {
+        notNull("clientSession", clientSession);
+        notNull("filter", filter);
+        return createGridFSFindIterable(clientSession, filter);
+    }
+
+    private GridFSFindIterable createGridFSFindIterable(@Nullable final ClientSession clientSession, @Nullable final Bson filter) {
+        return new GridFSFindIterableImpl(createFindIterable(clientSession, filter));
+    }
+
+    @Override
+    public void delete(final ObjectId id) {
+        delete(new BsonObjectId(id));
+    }
+
+    @Override
+    public void delete(final BsonValue id) {
+        executeDelete(null, id);
+    }
+
+    @Override
+    public void delete(final ClientSession clientSession, final ObjectId id) {
+        delete(clientSession, new BsonObjectId(id));
+    }
+
+    @Override
+    public void delete(final ClientSession clientSession, final BsonValue id) {
+        notNull("clientSession", clientSession);
+        executeDelete(clientSession, id);
+    }
+
+    private void executeDelete(@Nullable final ClientSession clientSession, final BsonValue id) {
+        DeleteResult result;
+        if (clientSession != null) {
+            result = filesCollection.deleteOne(clientSession, new BsonDocument("_id", id));
+            chunksCollection.deleteMany(clientSession, new BsonDocument("files_id", id));
+        } else {
+            result = filesCollection.deleteOne(new BsonDocument("_id", id));
+            chunksCollection.deleteMany(new BsonDocument("files_id", id));
+        }
+
+        if (result.wasAcknowledged() && result.getDeletedCount() == 0) {
+            throw new MongoGridFSException(format("No file found with the id: %s", id));
+        }
+    }
+
+    @Override
+    public void rename(final ObjectId id, final String newFilename) {
+        rename(new BsonObjectId(id), newFilename);
+    }
+
+    @Override
+    public void rename(final BsonValue id, final String newFilename) {
+        executeRename(null, id, newFilename);
+    }
+
+    @Override
+    public void rename(final ClientSession clientSession, final ObjectId id, final String newFilename) {
+        rename(clientSession, new BsonObjectId(id), newFilename);
+    }
+
+    @Override
+    public void rename(final ClientSession clientSession, final BsonValue id, final String newFilename) {
+        notNull("clientSession", clientSession);
+        executeRename(clientSession, id, newFilename);
+    }
+
+    private void executeRename(@Nullable final ClientSession clientSession, final BsonValue id, final String newFilename) {
+        UpdateResult updateResult;
+        if (clientSession != null) {
+            updateResult = filesCollection.updateOne(clientSession, new BsonDocument("_id", id),
+                    new BsonDocument("$set", new BsonDocument("filename", new BsonString(newFilename))));
+        } else {
+            updateResult = filesCollection.updateOne(new BsonDocument("_id", id),
+                    new BsonDocument("$set", new BsonDocument("filename", new BsonString(newFilename))));
+        }
+
+        if (updateResult.wasAcknowledged() && updateResult.getMatchedCount() == 0) {
+            throw new MongoGridFSException(format("No file found with the id: %s", id));
+        }
+    }
+
+    @Override
+    public void drop() {
+        filesCollection.drop();
+        chunksCollection.drop();
+    }
+
+    @Override
+    public void drop(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        filesCollection.drop(clientSession);
+        chunksCollection.drop(clientSession);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public GridFSDownloadStream openDownloadStreamByName(final String filename) {
+        return openDownloadStreamByName(filename, new com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public GridFSDownloadStream openDownloadStreamByName(final String filename,
+                                                         final com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions options) {
+        return openDownloadStream(filename, new GridFSDownloadOptions().revision(options.getRevision()));
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void downloadToStreamByName(final String filename, final OutputStream destination) {
+        downloadToStreamByName(filename, destination, new com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void downloadToStreamByName(final String filename, final OutputStream destination,
+                                       final com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions options) {
+        downloadToStream(filename, destination, new GridFSDownloadOptions().revision(options.getRevision()));
+    }
+
+    private static MongoCollection<GridFSFile> getFilesCollection(final MongoDatabase database, final String bucketName) {
+        return database.getCollection(bucketName + ".files", GridFSFile.class).withCodecRegistry(
+                fromRegistries(database.getCodecRegistry(), MongoClientSettings.getDefaultCodecRegistry())
+        );
+    }
+
+    private static MongoCollection<Document> getChunksCollection(final MongoDatabase database, final String bucketName) {
+        return database.getCollection(bucketName + ".chunks").withCodecRegistry(MongoClientSettings.getDefaultCodecRegistry());
+    }
+
+    private void checkCreateIndex(@Nullable final ClientSession clientSession) {
+        if (!checkedIndexes) {
+            if (collectionIsEmpty(clientSession, filesCollection.withDocumentClass(Document.class).withReadPreference(primary()))) {
+                Document filesIndex = new Document("filename", 1).append("uploadDate", 1);
+                if (!hasIndex(clientSession, filesCollection.withReadPreference(primary()), filesIndex)) {
+                    createIndex(clientSession, filesCollection, filesIndex, new IndexOptions());
+                }
+                Document chunksIndex = new Document("files_id", 1).append("n", 1);
+                if (!hasIndex(clientSession, chunksCollection.withReadPreference(primary()), chunksIndex)) {
+                    createIndex(clientSession, chunksCollection, chunksIndex, new IndexOptions().unique(true));
+                }
+            }
+            checkedIndexes = true;
+        }
+    }
+
+    private <T> boolean collectionIsEmpty(@Nullable final ClientSession clientSession, final MongoCollection<T> collection) {
+        if (clientSession != null) {
+            return collection.find(clientSession).projection(new Document("_id", 1)).first() == null;
+        } else {
+            return collection.find().projection(new Document("_id", 1)).first() == null;
+        }
+    }
+
+    private <T> boolean hasIndex(@Nullable final ClientSession clientSession, final MongoCollection<T> collection, final Document index) {
+        boolean hasIndex = false;
+        ListIndexesIterable<Document> listIndexesIterable;
+        if (clientSession != null) {
+            listIndexesIterable = collection.listIndexes(clientSession);
+        } else {
+            listIndexesIterable = collection.listIndexes();
+        }
+
+        ArrayList<Document> indexes = listIndexesIterable.into(new ArrayList<Document>());
+        for (Document indexDoc : indexes) {
+            if (indexDoc.get("key", Document.class).equals(index)) {
+                hasIndex = true;
+                break;
+            }
+        }
+        return hasIndex;
+    }
+
+    private <T> void createIndex(@Nullable final ClientSession clientSession, final MongoCollection<T> collection, final Document index,
+                                 final IndexOptions indexOptions) {
+       if (clientSession != null) {
+           collection.createIndex(clientSession, index, indexOptions);
+       } else {
+           collection.createIndex(index, indexOptions);
+       }
+    }
+
+    private GridFSFile getFileByName(@Nullable final ClientSession clientSession, final String filename,
+                                     final GridFSDownloadOptions options) {
+        int revision = options.getRevision();
+        int skip;
+        int sort;
+        if (revision >= 0) {
+            skip = revision;
+            sort = 1;
+        } else {
+            skip = (-revision) - 1;
+            sort = -1;
+        }
+
+        GridFSFile fileInfo = createGridFSFindIterable(clientSession, new Document("filename", filename)).skip(skip)
+                .sort(new Document("uploadDate", sort)).first();
+        if (fileInfo == null) {
+            throw new MongoGridFSException(format("No file found with the filename: %s and revision: %s", filename, revision));
+        }
+        return fileInfo;
+    }
+
+    private GridFSFile getFileInfoById(@Nullable final ClientSession clientSession, final BsonValue id) {
+        notNull("id", id);
+        GridFSFile fileInfo = createFindIterable(clientSession, new Document("_id", id)).first();
+        if (fileInfo == null) {
+            throw new MongoGridFSException(format("No file found with the id: %s", id));
+        }
+        return fileInfo;
+    }
+
+    private FindIterable<GridFSFile> createFindIterable(@Nullable final ClientSession clientSession, @Nullable final Bson filter) {
+        FindIterable<GridFSFile> findIterable;
+        if (clientSession != null) {
+            findIterable = filesCollection.find(clientSession);
+        } else {
+            findIterable = filesCollection.find();
+        }
+        if (filter != null) {
+            findIterable = findIterable.filter(filter);
+        }
+        return findIterable;
+    }
+
+    private void downloadToStream(final GridFSDownloadStream downloadStream, final OutputStream destination) {
+        byte[] buffer = new byte[downloadStream.getGridFSFile().getChunkSize()];
+        int len;
+        MongoGridFSException savedThrowable = null;
+        try {
+            while ((len = downloadStream.read(buffer)) != -1) {
+                destination.write(buffer, 0, len);
+            }
+        } catch (IOException e) {
+            savedThrowable = new MongoGridFSException("IOException when reading from the OutputStream", e);
+        } catch (Exception e) {
+            savedThrowable = new MongoGridFSException("Unexpected Exception when reading GridFS and writing to the Stream", e);
+        } finally {
+            try {
+                downloadStream.close();
+            } catch (Exception e) {
+                // Do nothing
+            }
+            if (savedThrowable != null) {
+                throw savedThrowable;
+            }
+        }
+    }
+}
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSBuckets.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBuckets.java
similarity index 94%
rename from driver/src/main/com/mongodb/client/gridfs/GridFSBuckets.java
rename to driver-sync/src/main/com/mongodb/client/gridfs/GridFSBuckets.java
index 214ffb5602d..ad3e5fabbd4 100644
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSBuckets.java
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSBuckets.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSDownloadStream.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSDownloadStream.java
similarity index 96%
rename from driver/src/main/com/mongodb/client/gridfs/GridFSDownloadStream.java
rename to driver-sync/src/main/com/mongodb/client/gridfs/GridFSDownloadStream.java
index 04b0512a03a..e1ea78633ba 100644
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSDownloadStream.java
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSDownloadStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSDownloadStreamImpl.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSDownloadStreamImpl.java
similarity index 83%
rename from driver/src/main/com/mongodb/client/gridfs/GridFSDownloadStreamImpl.java
rename to driver-sync/src/main/com/mongodb/client/gridfs/GridFSDownloadStreamImpl.java
index 926d5e57a4a..79b9e18a632 100644
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSDownloadStreamImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSDownloadStreamImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,9 +17,12 @@
 package com.mongodb.client.gridfs;
 
 import com.mongodb.MongoGridFSException;
+import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.lang.Nullable;
+import com.mongodb.client.ClientSession;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.types.Binary;
@@ -29,6 +32,7 @@
 import static java.lang.String.format;
 
 class GridFSDownloadStreamImpl extends GridFSDownloadStream {
+    private final ClientSession clientSession;
     private final GridFSFile fileInfo;
     private final MongoCollection<Document> chunksCollection;
     private final BsonValue fileId;
@@ -47,7 +51,9 @@ class GridFSDownloadStreamImpl extends GridFSDownloadStream {
     private final Object cursorLock = new Object();
     private boolean closed = false;
 
-    GridFSDownloadStreamImpl(final GridFSFile fileInfo, final MongoCollection<Document> chunksCollection) {
+    GridFSDownloadStreamImpl(@Nullable final ClientSession clientSession, final GridFSFile fileInfo,
+                             final MongoCollection<Document> chunksCollection) {
+        this.clientSession = clientSession;
         this.fileInfo = notNull("file information", fileInfo);
         this.chunksCollection = notNull("chunks collection", chunksCollection);
 
@@ -114,7 +120,7 @@ public long skip(final long bytesToSkip) {
         }
 
         long skippedPosition = currentPosition + bytesToSkip;
-        bufferOffset = (int) skippedPosition % chunkSizeInBytes;
+        bufferOffset = (int) (skippedPosition % chunkSizeInBytes);
         if (skippedPosition >= length) {
             long skipped = length - currentPosition;
             chunkIndex = numberOfChunks - 1;
@@ -123,7 +129,7 @@ public long skip(final long bytesToSkip) {
             discardCursor();
             return skipped;
         } else {
-            int newChunkIndex = (int) Math.floor((float) skippedPosition / chunkSizeInBytes);
+            int newChunkIndex = (int) Math.floor(skippedPosition / (double) chunkSizeInBytes);
             if (chunkIndex != newChunkIndex) {
                 chunkIndex = newChunkIndex;
                 buffer = null;
@@ -161,13 +167,13 @@ public synchronized void reset() {
             return;
         }
 
-        bufferOffset = (int) markPosition % chunkSizeInBytes;
+        bufferOffset = (int) (markPosition % chunkSizeInBytes);
         currentPosition = markPosition;
-        int markChunkIndex = (int) Math.floor((float) markPosition / chunkSizeInBytes);
+        int markChunkIndex = (int) Math.floor(markPosition / (double) chunkSizeInBytes);
         if (markChunkIndex != chunkIndex) {
             chunkIndex = markChunkIndex;
             buffer = null;
-            cursor = null;
+            discardCursor();
         }
     }
 
@@ -203,10 +209,10 @@ private void discardCursor() {
         }
     }
 
+    @Nullable
     private Document getChunk(final int startChunkIndex) {
         if (cursor == null) {
-            cursor = chunksCollection.find(new Document("files_id", fileId).append("n", new Document("$gte", startChunkIndex)))
-                    .batchSize(batchSize).sort(new Document("n", 1)).iterator();
+            cursor = getCursor(startChunkIndex);
         }
         Document chunk = null;
         if (cursor.hasNext()) {
@@ -223,7 +229,18 @@ private Document getChunk(final int startChunkIndex) {
         return chunk;
     }
 
-    private byte[] getBufferFromChunk(final Document chunk, final int expectedChunkIndex) {
+    private MongoCursor<Document> getCursor(final int startChunkIndex) {
+        FindIterable<Document> findIterable;
+        Document filter = new Document("files_id", fileId).append("n", new Document("$gte", startChunkIndex));
+        if (clientSession != null) {
+            findIterable = chunksCollection.find(clientSession, filter);
+        } else {
+            findIterable = chunksCollection.find(filter);
+        }
+        return findIterable.batchSize(batchSize).sort(new Document("n", 1)).iterator();
+    }
+
+    private byte[] getBufferFromChunk(@Nullable final Document chunk, final int expectedChunkIndex) {
 
         if (chunk == null || chunk.getInteger("n") != expectedChunkIndex) {
             throw new MongoGridFSException(format("Could not find file chunk for file_id: %s at chunk index %s.",
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSFindIterable.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSFindIterable.java
similarity index 84%
rename from driver/src/main/com/mongodb/client/gridfs/GridFSFindIterable.java
rename to driver-sync/src/main/com/mongodb/client/gridfs/GridFSFindIterable.java
index 03404d9e29c..9b8cb8b9117 100644
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSFindIterable.java
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSFindIterable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,6 +18,8 @@
 
 import com.mongodb.client.MongoIterable;
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.concurrent.TimeUnit;
@@ -45,7 +47,7 @@ public interface GridFSFindIterable extends MongoIterable<GridFSFile> {
      * @mongodb.driver.manual reference/method/db.collection.find/ Filter
      * @see com.mongodb.client.model.Filters
      */
-    GridFSFindIterable filter(Bson filter);
+    GridFSFindIterable filter(@Nullable Bson filter);
 
     /**
      * Sets the limit to apply.
@@ -72,7 +74,7 @@ public interface GridFSFindIterable extends MongoIterable<GridFSFile> {
      * @return this
      * @mongodb.driver.manual reference/method/cursor.sort/ Sort
      */
-    GridFSFindIterable sort(Bson sort);
+    GridFSFindIterable sort(@Nullable Bson sort);
 
     /**
      * The server normally times out idle cursors after an inactivity period (10 minutes)
@@ -102,4 +104,15 @@ public interface GridFSFindIterable extends MongoIterable<GridFSFile> {
      */
     @Override
     GridFSFindIterable batchSize(int batchSize);
+
+    /**
+     * Sets the collation options
+     *
+     * <p>A null value represents the server default.</p>
+     * @param collation the collation options to use
+     * @return this
+     * @since 3.4
+     * @mongodb.server.release 3.4
+     */
+    GridFSFindIterable collation(@Nullable Collation collation);
 }
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSFindIterableImpl.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSFindIterableImpl.java
similarity index 79%
rename from driver/src/main/com/mongodb/client/gridfs/GridFSFindIterableImpl.java
rename to driver-sync/src/main/com/mongodb/client/gridfs/GridFSFindIterableImpl.java
index d9fddfc87c4..b02881d74a2 100644
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSFindIterableImpl.java
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSFindIterableImpl.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,6 +22,8 @@
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoIterable;
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
 import java.util.Collection;
@@ -30,12 +32,12 @@
 class GridFSFindIterableImpl implements GridFSFindIterable {
     private final FindIterable<GridFSFile> underlying;
 
-    public GridFSFindIterableImpl(final FindIterable<GridFSFile> underlying) {
+    GridFSFindIterableImpl(final FindIterable<GridFSFile> underlying) {
         this.underlying = underlying;
     }
 
     @Override
-    public GridFSFindIterable sort(final Bson sort) {
+    public GridFSFindIterable sort(@Nullable final Bson sort) {
         underlying.sort(sort);
         return this;
     }
@@ -53,7 +55,7 @@ public GridFSFindIterable limit(final int limit) {
     }
 
     @Override
-    public GridFSFindIterable filter(final Bson filter) {
+    public GridFSFindIterable filter(@Nullable final Bson filter) {
         underlying.filter(filter);
         return this;
     }
@@ -70,6 +72,12 @@ public GridFSFindIterable batchSize(final int batchSize) {
         return this;
     }
 
+    @Override
+    public GridFSFindIterable collation(@Nullable final Collation collation) {
+        underlying.collation(collation);
+        return this;
+    }
+
     @Override
     public GridFSFindIterable noCursorTimeout(final boolean noCursorTimeout) {
         underlying.noCursorTimeout(noCursorTimeout);
@@ -81,6 +89,12 @@ public MongoCursor<GridFSFile> iterator() {
         return underlying.iterator();
     }
 
+    @Override
+    public MongoCursor<GridFSFile> cursor() {
+        return iterator();
+    }
+
+    @Nullable
     @Override
     public GridFSFile first() {
         return underlying.first();
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSUploadStream.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStream.java
similarity index 96%
rename from driver/src/main/com/mongodb/client/gridfs/GridFSUploadStream.java
rename to driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStream.java
index 4e0690343ad..fa823100ba2 100644
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSUploadStream.java
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStream.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java
new file mode 100644
index 00000000000..fcfb3bcb845
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.gridfs;
+
+import com.mongodb.MongoGridFSException;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.lang.Nullable;
+import com.mongodb.client.ClientSession;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.types.Binary;
+import org.bson.types.ObjectId;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.internal.HexUtils.toHex;
+
+final class GridFSUploadStreamImpl extends GridFSUploadStream {
+    private final ClientSession clientSession;
+    private final MongoCollection<GridFSFile> filesCollection;
+    private final MongoCollection<Document> chunksCollection;
+    private final BsonValue fileId;
+    private final String filename;
+    private final int chunkSizeBytes;
+    private final Document metadata;
+    private final MessageDigest md5;
+    private byte[] buffer;
+    private long lengthInBytes;
+    private int bufferOffset;
+    private int chunkIndex;
+
+    private final Object closeLock = new Object();
+    private boolean closed = false;
+
+    GridFSUploadStreamImpl(@Nullable final ClientSession clientSession, final MongoCollection<GridFSFile> filesCollection,
+                           final MongoCollection<Document> chunksCollection, final BsonValue fileId, final String filename,
+                           final int chunkSizeBytes, final boolean disableMD5, @Nullable final Document metadata) {
+        this.clientSession = clientSession;
+        this.filesCollection = notNull("files collection", filesCollection);
+        this.chunksCollection = notNull("chunks collection", chunksCollection);
+        this.fileId = notNull("File Id", fileId);
+        this.filename = notNull("filename", filename);
+        this.chunkSizeBytes = chunkSizeBytes;
+        this.md5 = createMD5Digest(disableMD5);
+        this.metadata = metadata;
+        chunkIndex = 0;
+        bufferOffset = 0;
+        buffer = new byte[chunkSizeBytes];
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public ObjectId getFileId() {
+        return getObjectId();
+    }
+
+    @Override
+    public ObjectId getObjectId() {
+        if (!fileId.isObjectId()) {
+            throw new MongoGridFSException("Custom id type used for this GridFS upload stream");
+        }
+        return fileId.asObjectId().getValue();
+    }
+
+    @Override
+    public BsonValue getId() {
+        return fileId;
+    }
+
+    @Override
+    public void abort() {
+        synchronized (closeLock) {
+            checkClosed();
+            closed = true;
+        }
+        if (clientSession != null) {
+            chunksCollection.deleteMany(clientSession, new Document("files_id", fileId));
+        } else {
+            chunksCollection.deleteMany(new Document("files_id", fileId));
+        }
+    }
+
+    @Override
+    public void write(final int b) {
+        byte[] byteArray = new byte[1];
+        byteArray[0] = (byte) (0xFF & b);
+        write(byteArray, 0, 1);
+    }
+
+    @Override
+    public void write(final byte[] b) {
+        write(b, 0, b.length);
+    }
+
+    @Override
+    public void write(final byte[] b, final int off, final int len) {
+        checkClosed();
+        notNull("b", b);
+
+        if ((off < 0) || (off > b.length) || (len < 0)
+                || ((off + len) > b.length) || ((off + len) < 0)) {
+            throw new IndexOutOfBoundsException();
+        } else if (len == 0) {
+            return;
+        }
+
+        int currentOffset = off;
+        int lengthToWrite = len;
+        int amountToCopy = 0;
+
+        while (lengthToWrite > 0) {
+            amountToCopy = lengthToWrite;
+            if (amountToCopy > chunkSizeBytes - bufferOffset) {
+                amountToCopy = chunkSizeBytes - bufferOffset;
+            }
+            System.arraycopy(b, currentOffset, buffer, bufferOffset, amountToCopy);
+
+            bufferOffset += amountToCopy;
+            currentOffset += amountToCopy;
+            lengthToWrite -= amountToCopy;
+            lengthInBytes += amountToCopy;
+
+            if (bufferOffset == chunkSizeBytes) {
+                writeChunk();
+            }
+        }
+    }
+
+    @Override
+    public void close() {
+        synchronized (closeLock) {
+            if (closed) {
+                return;
+            }
+            closed = true;
+        }
+        writeChunk();
+        GridFSFile gridFSFile = new GridFSFile(fileId, filename, lengthInBytes, chunkSizeBytes, new Date(),
+                getMD5Digest(), metadata);
+        if (clientSession != null) {
+            filesCollection.insertOne(clientSession, gridFSFile);
+        } else {
+            filesCollection.insertOne(gridFSFile);
+        }
+        buffer = null;
+    }
+
+    private void writeChunk() {
+        if (bufferOffset > 0) {
+            if (clientSession != null) {
+                chunksCollection.insertOne(clientSession, new Document("files_id", fileId).append("n", chunkIndex)
+                        .append("data", getData()));
+            } else {
+                chunksCollection.insertOne(new Document("files_id", fileId).append("n", chunkIndex).append("data", getData()));
+            }
+            updateMD5();
+            chunkIndex++;
+            bufferOffset = 0;
+        }
+    }
+
+    private Binary getData() {
+        if (bufferOffset < chunkSizeBytes) {
+            byte[] sizedBuffer = new byte[bufferOffset];
+            System.arraycopy(buffer, 0, sizedBuffer, 0, bufferOffset);
+            buffer = sizedBuffer;
+        }
+        return new Binary(buffer);
+    }
+
+    private void checkClosed() {
+        synchronized (closeLock) {
+            if (closed) {
+                throw new MongoGridFSException("The OutputStream has been closed");
+            }
+        }
+    }
+
+    @Nullable
+    private MessageDigest createMD5Digest(final boolean disableMD5) {
+        if (disableMD5) {
+            return null;
+        } else {
+            try {
+                return MessageDigest.getInstance("MD5");
+            } catch (NoSuchAlgorithmException e) {
+                throw new MongoGridFSException("No MD5 message digest available. "
+                        + "Use `GridFSBucket.withDisableMD5(true)` to disable creating a MD5 hash.", e);
+            }
+        }
+    }
+
+    @Nullable
+    private String getMD5Digest() {
+        return md5 != null ? toHex(md5.digest()) : null;
+    }
+
+    private void updateMD5() {
+        if (md5 != null) {
+            md5.update(buffer);
+        }
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/gridfs/package-info.java b/driver-sync/src/main/com/mongodb/client/gridfs/package-info.java
new file mode 100644
index 00000000000..e967b4366cc
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/gridfs/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the new GridFS implementation
+ *
+ * @since 3.1
+ */
+@NonNullApi
+package com.mongodb.client.gridfs;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-sync/src/main/com/mongodb/client/internal/AggregateIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/AggregateIterableImpl.java
new file mode 100644
index 00000000000..56086cda801
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/AggregateIterableImpl.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.FindOptions;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ReadOperation;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class AggregateIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements AggregateIterable<TResult> {
+    private SyncOperations<TDocument> operations;
+    private final MongoNamespace namespace;
+    private final Class<TDocument> documentClass;
+    private final Class<TResult> resultClass;
+    private final CodecRegistry codecRegistry;
+    private final List<? extends Bson> pipeline;
+    private final AggregationLevel aggregationLevel;
+
+    private Boolean allowDiskUse;
+    private long maxTimeMS;
+    private long maxAwaitTimeMS;
+    private Boolean useCursor;
+    private Boolean bypassDocumentValidation;
+    private Collation collation;
+    private String comment;
+    private Bson hint;
+
+    AggregateIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                          final List<? extends Bson> pipeline, final AggregationLevel aggregationLevel) {
+        this(clientSession, new MongoNamespace(databaseName, "ignored"), documentClass, resultClass, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, pipeline, aggregationLevel, true);
+    }
+
+    AggregateIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                          final List<? extends Bson> pipeline, final AggregationLevel aggregationLevel, final boolean retryReads) {
+        this(clientSession, new MongoNamespace(databaseName, "ignored"), documentClass, resultClass, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
+
+    AggregateIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                          final List<? extends Bson> pipeline, final AggregationLevel aggregationLevel, final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.operations = new SyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                true, retryReads);
+        this.namespace = notNull("namespace", namespace);
+        this.documentClass = notNull("documentClass", documentClass);
+        this.resultClass = notNull("resultClass", resultClass);
+        this.codecRegistry = notNull("codecRegistry", codecRegistry);
+        this.pipeline = notNull("pipeline", pipeline);
+        this.aggregationLevel = notNull("aggregationLevel", aggregationLevel);
+    }
+
+    @Override
+    public void toCollection() {
+        if (getOutNamespace() == null) {
+            throw new IllegalStateException("The last stage of the aggregation pipeline must be $out or $merge");
+        }
+
+        getExecutor().execute(operations.aggregateToCollection(pipeline, maxTimeMS, allowDiskUse, bypassDocumentValidation, collation, hint,
+                comment, aggregationLevel), getReadConcern(), getClientSession());
+    }
+
+    @Override
+    public AggregateIterable<TResult> allowDiskUse(@Nullable final Boolean allowDiskUse) {
+        this.allowDiskUse = allowDiskUse;
+        return this;
+    }
+
+    @Override
+    public AggregateIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public AggregateIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public AggregateIterable<TResult> useCursor(@Nullable final Boolean useCursor) {
+        this.useCursor = useCursor;
+        return this;
+    }
+
+    @Override
+    public AggregateIterable<TResult> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxAwaitTimeMS = TimeUnit.MILLISECONDS.convert(maxAwaitTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public AggregateIterable<TResult> bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        return this;
+    }
+
+    @Override
+    public AggregateIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public AggregateIterable<TResult> comment(@Nullable final String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    @Override
+    public AggregateIterable<TResult> hint(@Nullable final Bson hint) {
+        this.hint = hint;
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public ReadOperation<BatchCursor<TResult>> asReadOperation() {
+        MongoNamespace outNamespace = getOutNamespace();
+
+        if (outNamespace != null) {
+            getExecutor().execute(operations.aggregateToCollection(pipeline, maxTimeMS, allowDiskUse, bypassDocumentValidation, collation,
+                    hint, comment, aggregationLevel), getReadConcern(), getClientSession());
+
+            FindOptions findOptions = new FindOptions().collation(collation);
+            Integer batchSize = getBatchSize();
+            if (batchSize != null) {
+                findOptions.batchSize(batchSize);
+            }
+            return operations.find(outNamespace, new BsonDocument(), resultClass, findOptions);
+        } else {
+            return operations.aggregate(pipeline, resultClass, maxTimeMS, maxAwaitTimeMS, getBatchSize(), collation,
+                    hint, comment, allowDiskUse, useCursor, aggregationLevel);
+        }
+    }
+
+    @Nullable
+    private MongoNamespace getOutNamespace() {
+        if (pipeline.size() == 0) {
+            return null;
+        }
+
+        Bson lastStage = notNull("last stage", pipeline.get(pipeline.size() - 1));
+        BsonDocument lastStageDocument = lastStage.toBsonDocument(documentClass, codecRegistry);
+        if (lastStageDocument.containsKey("$out")) {
+            return new MongoNamespace(namespace.getDatabaseName(), lastStageDocument.getString("$out").getValue());
+        } else if (lastStageDocument.containsKey("$merge")) {
+            BsonDocument mergeDocument = lastStageDocument.getDocument("$merge");
+            if (mergeDocument.isDocument("into")) {
+                BsonDocument intoDocument = mergeDocument.getDocument("into");
+                return new MongoNamespace(intoDocument.getString("db", new BsonString(namespace.getDatabaseName())).getValue(),
+                        intoDocument.getString("coll").getValue());
+            } else if (mergeDocument.isString("into")) {
+                return new MongoNamespace(namespace.getDatabaseName(), mergeDocument.getString("into").getValue());
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java
new file mode 100644
index 00000000000..d10c945bb1d
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ChangeStreamIterableImpl.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoChangeStreamCursor;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoIterable;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ChangeStreamOperation;
+import com.mongodb.operation.ReadOperation;
+import org.bson.BsonDocument;
+import org.bson.BsonTimestamp;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.Codec;
+import org.bson.codecs.RawBsonDocumentCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+/**
+ * This class is NOT part of the public API. It may change at any time without notification.
+ */
+class ChangeStreamIterableImpl<TResult> extends MongoIterableImpl<ChangeStreamDocument<TResult>> implements ChangeStreamIterable<TResult> {
+    private final MongoNamespace namespace;
+    private final CodecRegistry codecRegistry;
+    private final List<? extends Bson> pipeline;
+    private final Codec<ChangeStreamDocument<TResult>> codec;
+    private final ChangeStreamLevel changeStreamLevel;
+
+    private FullDocument fullDocument = FullDocument.DEFAULT;
+    private BsonDocument resumeToken;
+    private BsonDocument startAfter;
+    private long maxAwaitTimeMS;
+    private Collation collation;
+    private BsonTimestamp startAtOperationTime;
+
+    ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, final String databaseName,
+                             final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
+                             final OperationExecutor executor, final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                             final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        this(clientSession, new MongoNamespace(databaseName, "ignored"), codecRegistry, readPreference, readConcern, executor, pipeline,
+                resultClass, changeStreamLevel, retryReads);
+    }
+
+    ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace,
+                             final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
+                             final OperationExecutor executor, final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                             final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.namespace = notNull("namespace", namespace);
+        this.codecRegistry = notNull("codecRegistry", codecRegistry);
+        this.pipeline = notNull("pipeline", pipeline);
+        this.codec = ChangeStreamDocument.createCodec(notNull("resultClass", resultClass), codecRegistry);
+        this.changeStreamLevel = notNull("changeStreamLevel", changeStreamLevel);
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> fullDocument(final FullDocument fullDocument) {
+        this.fullDocument = notNull("fullDocument", fullDocument);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> resumeAfter(final BsonDocument resumeAfter) {
+        this.resumeToken = notNull("resumeAfter", resumeAfter);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxAwaitTimeMS = MILLISECONDS.convert(maxAwaitTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = notNull("collation", collation);
+        return this;
+    }
+
+    @Override
+    public <TDocument> MongoIterable<TDocument> withDocumentClass(final Class<TDocument> clazz) {
+        return new MongoIterableImpl<TDocument>(getClientSession(), getExecutor(), getReadConcern(), getReadPreference(), getRetryReads()) {
+            @Override
+            public MongoCursor<TDocument> iterator() {
+                return cursor();
+            }
+
+            @Override
+            public MongoChangeStreamCursor<TDocument> cursor() {
+                return new MongoChangeStreamCursorImpl<TDocument>(execute(), codecRegistry.get(clazz), initialResumeToken());
+            }
+
+            @Override
+            public ReadOperation<BatchCursor<TDocument>> asReadOperation() {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    @Override
+    public ChangeStreamIterable<TResult> startAtOperationTime(final BsonTimestamp startAtOperationTime) {
+        this.startAtOperationTime = notNull("startAtOperationTime", startAtOperationTime);
+        return this;
+    }
+
+    @Override
+    public ChangeStreamIterableImpl<TResult> startAfter(final BsonDocument startAfter) {
+        this.startAfter = notNull("startAfter", startAfter);
+        return this;
+    }
+
+    @Override
+    public MongoCursor<ChangeStreamDocument<TResult>> iterator() {
+        return cursor();
+    }
+
+    @Override
+    public MongoChangeStreamCursor<ChangeStreamDocument<TResult>> cursor() {
+        return new MongoChangeStreamCursorImpl<ChangeStreamDocument<TResult>>(execute(), codec, initialResumeToken());
+    }
+
+    @Nullable
+    @Override
+    public ChangeStreamDocument<TResult> first() {
+        MongoChangeStreamCursor<ChangeStreamDocument<TResult>> cursor = cursor();
+        try {
+            if (!cursor.hasNext()) {
+                return null;
+            }
+            return cursor.next();
+        } finally {
+            cursor.close();
+        }
+    }
+
+    @Override
+    public ReadOperation<BatchCursor<ChangeStreamDocument<TResult>>> asReadOperation() {
+        throw new UnsupportedOperationException();
+    }
+
+    private ReadOperation<BatchCursor<RawBsonDocument>> createChangeStreamOperation() {
+        return new ChangeStreamOperation<RawBsonDocument>(namespace, fullDocument,  createBsonDocumentList(pipeline),
+                new RawBsonDocumentCodec(), changeStreamLevel)
+                        .batchSize(getBatchSize())
+                        .collation(collation)
+                        .maxAwaitTime(maxAwaitTimeMS, MILLISECONDS)
+                        .resumeAfter(resumeToken)
+                        .startAtOperationTime(startAtOperationTime)
+                        .startAfter(startAfter)
+                        .retryReads(getRetryReads());
+    }
+
+    private List<BsonDocument> createBsonDocumentList(final List<? extends Bson> pipeline) {
+        List<BsonDocument> aggregateList = new ArrayList<BsonDocument>(pipeline.size());
+        for (Bson obj : pipeline) {
+            if (obj == null) {
+                throw new IllegalArgumentException("pipeline cannot contain a null value");
+            }
+            aggregateList.add(obj.toBsonDocument(BsonDocument.class, codecRegistry));
+        }
+        return aggregateList;
+    }
+
+    private BatchCursor<RawBsonDocument> execute() {
+        return getExecutor().execute(createChangeStreamOperation(), getReadPreference(), getReadConcern(), getClientSession());
+    }
+
+    private BsonDocument initialResumeToken() {
+        return startAfter != null ? startAfter : resumeToken;
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientEncryptionImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ClientEncryptionImpl.java
new file mode 100644
index 00000000000..4480eff81c5
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ClientEncryptionImpl.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+
+import java.io.Closeable;
+
+public class ClientEncryptionImpl implements ClientEncryption, Closeable {
+    private final Crypt crypt;
+    private final ClientEncryptionSettings options;
+    private final MongoClient keyVaultClient;
+
+    public ClientEncryptionImpl(final ClientEncryptionSettings options) {
+        this.keyVaultClient = MongoClients.create(options.getKeyVaultMongoClientSettings());
+        this.crypt = Crypts.create(SimpleMongoClients.create(keyVaultClient), options);
+        this.options = options;
+    }
+
+    @Override
+    public BsonBinary createDataKey(final String kmsProvider) {
+        return createDataKey(kmsProvider, new DataKeyOptions());
+    }
+
+    @Override
+    public BsonBinary createDataKey(final String kmsProvider, final DataKeyOptions dataKeyOptions) {
+        BsonDocument dataKeyDocument = crypt.createDataKey(kmsProvider, dataKeyOptions);
+
+        MongoNamespace namespace = new MongoNamespace(options.getKeyVaultNamespace());
+        keyVaultClient.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName(), BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY)
+                .insertOne(dataKeyDocument);
+        return dataKeyDocument.getBinary("_id");
+    }
+
+    @Override
+    public BsonBinary encrypt(final BsonValue value, final EncryptOptions options) {
+        return crypt.encryptExplicitly(value, options);
+    }
+
+    @Override
+    public BsonValue decrypt(final BsonBinary value) {
+        return crypt.decryptExplicitly(value);
+    }
+
+    @Override
+    public void close() {
+        crypt.close();
+        keyVaultClient.close();
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
new file mode 100644
index 00000000000..5ee9028106d
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionBinding.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.binding.ConnectionSource;
+import com.mongodb.binding.ReadWriteBinding;
+import com.mongodb.binding.SingleServerBinding;
+import com.mongodb.client.ClientSession;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.Server;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.ClusterAwareReadWriteBinding;
+import com.mongodb.internal.session.ClientSessionContext;
+import com.mongodb.selector.ReadPreferenceServerSelector;
+import com.mongodb.session.SessionContext;
+
+import static org.bson.assertions.Assertions.notNull;
+
+/**
+ * This class is not part of the public API and may be removed or changed at any time.
+ */
+public class ClientSessionBinding implements ReadWriteBinding {
+    private final ClusterAwareReadWriteBinding wrapped;
+    private final ClientSession session;
+    private final boolean ownsSession;
+    private final ClientSessionContext sessionContext;
+
+    public ClientSessionBinding(final ClientSession session, final boolean ownsSession, final ClusterAwareReadWriteBinding wrapped) {
+        this.wrapped = wrapped;
+        this.session = notNull("session", session);
+        this.ownsSession = ownsSession;
+        this.sessionContext = new SyncClientSessionContext(session);
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return wrapped.getReadPreference();
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public ReadWriteBinding retain() {
+        wrapped.retain();
+        return this;
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+        closeSessionIfCountIsZero();
+    }
+
+    private void closeSessionIfCountIsZero() {
+        if (getCount() == 0 && ownsSession) {
+            session.close();
+        }
+    }
+
+    @Override
+    public ConnectionSource getReadConnectionSource() {
+        return new SessionBindingConnectionSource(wrapConnectionSource(wrapped.getReadConnectionSource()));
+    }
+
+    public ConnectionSource getWriteConnectionSource() {
+        return new SessionBindingConnectionSource(wrapConnectionSource(wrapped.getWriteConnectionSource()));
+    }
+
+    private ConnectionSource wrapConnectionSource(final ConnectionSource connectionSource) {
+        ConnectionSource retVal = connectionSource;
+        if (isActiveShardedTxn()) {
+            setPinnedServerAddress();
+            SingleServerBinding binding = new SingleServerBinding(wrapped.getCluster(), session.getPinnedServerAddress(),
+                    wrapped.getReadPreference());
+            retVal = binding.getWriteConnectionSource();
+            binding.release();
+        }
+        return retVal;
+    }
+
+    @Override
+    public SessionContext getSessionContext() {
+        return sessionContext;
+    }
+
+    private boolean isActiveShardedTxn() {
+        return session.hasActiveTransaction() && wrapped.getCluster().getDescription().getType() == ClusterType.SHARDED;
+    }
+
+    private void setPinnedServerAddress() {
+        if (session.getPinnedServerAddress() == null) {
+            Server server = wrapped.getCluster().selectServer(new ReadPreferenceServerSelector(wrapped.getReadPreference()));
+            session.setPinnedServerAddress(server.getDescription().getAddress());
+        }
+    }
+
+    private class SessionBindingConnectionSource implements ConnectionSource {
+        private ConnectionSource wrapped;
+
+        SessionBindingConnectionSource(final ConnectionSource wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public ServerDescription getServerDescription() {
+            return wrapped.getServerDescription();
+        }
+
+        @Override
+        public SessionContext getSessionContext() {
+            return sessionContext;
+        }
+
+        @Override
+        public Connection getConnection() {
+            return wrapped.getConnection();
+        }
+
+        @Override
+        @SuppressWarnings("checkstyle:methodlength")
+        public ConnectionSource retain() {
+            wrapped = wrapped.retain();
+            return this;
+        }
+
+        @Override
+        public int getCount() {
+            return wrapped.getCount();
+        }
+
+        @Override
+        public void release() {
+            wrapped.release();
+            closeSessionIfCountIsZero();
+        }
+    }
+
+    private final class SyncClientSessionContext extends ClientSessionContext implements SessionContext {
+
+        private final ClientSession clientSession;
+
+        SyncClientSessionContext(final ClientSession clientSession) {
+            super(clientSession);
+            this.clientSession = clientSession;
+        }
+
+        @Override
+        public boolean isImplicitSession() {
+            return ownsSession;
+        }
+
+        @Override
+        public boolean notifyMessageSent() {
+            return clientSession.notifyMessageSent();
+        }
+
+        @Override
+        public boolean hasActiveTransaction() {
+            return clientSession.hasActiveTransaction();
+        }
+
+        @Override
+        public ReadConcern getReadConcern() {
+            if (clientSession.hasActiveTransaction()) {
+                return clientSession.getTransactionOptions().getReadConcern();
+            } else {
+               return wrapped.getSessionContext().getReadConcern();
+            }
+        }
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionClock.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionClock.java
new file mode 100644
index 00000000000..8e43ea72373
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionClock.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+public final class ClientSessionClock {
+    public static final ClientSessionClock INSTANCE = new ClientSessionClock(0L);
+
+    private long currentTime;
+
+    private ClientSessionClock(final long millis) {
+        currentTime = millis;
+    }
+
+    public long now() {
+        if (currentTime == 0L) {
+            return System.currentTimeMillis();
+        }
+        return currentTime;
+    }
+
+    public void setTime(final long millis) {
+        currentTime = millis;
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java
new file mode 100644
index 00000000000..c9fe640d324
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoExecutionTimeoutException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.ReadConcern;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.TransactionBody;
+import com.mongodb.internal.session.BaseClientSessionImpl;
+import com.mongodb.internal.session.ServerSessionPool;
+import com.mongodb.operation.AbortTransactionOperation;
+import com.mongodb.operation.CommitTransactionOperation;
+
+import static com.mongodb.MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL;
+import static com.mongodb.MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL;
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+final class ClientSessionImpl extends BaseClientSessionImpl implements ClientSession {
+
+    private enum TransactionState {
+        NONE, IN, COMMITTED, ABORTED
+    }
+
+    private static final int MAX_RETRY_TIME_LIMIT_MS = 120000;
+
+    private final MongoClientDelegate delegate;
+    private TransactionState transactionState = TransactionState.NONE;
+    private boolean messageSentInCurrentTransaction;
+    private boolean commitInProgress;
+    private TransactionOptions transactionOptions;
+
+    ClientSessionImpl(final ServerSessionPool serverSessionPool, final Object originator, final ClientSessionOptions options,
+                      final MongoClientDelegate delegate) {
+        super(serverSessionPool, originator, options);
+        this.delegate = delegate;
+    }
+
+    @Override
+    public boolean hasActiveTransaction() {
+        return transactionState == TransactionState.IN || (transactionState == TransactionState.COMMITTED && commitInProgress);
+    }
+
+    @Override
+    public boolean notifyMessageSent() {
+        if (hasActiveTransaction()) {
+            boolean firstMessageInCurrentTransaction = !messageSentInCurrentTransaction;
+            messageSentInCurrentTransaction = true;
+            return firstMessageInCurrentTransaction;
+        } else {
+            if (transactionState == TransactionState.COMMITTED || transactionState == TransactionState.ABORTED) {
+                cleanupTransaction(TransactionState.NONE);
+            }
+            return false;
+        }
+    }
+
+    @Override
+    public TransactionOptions getTransactionOptions() {
+        isTrue("in transaction", transactionState == TransactionState.IN || transactionState == TransactionState.COMMITTED);
+        return transactionOptions;
+    }
+
+    @Override
+    public void startTransaction() {
+        startTransaction(TransactionOptions.builder().build());
+    }
+
+    @Override
+    public void startTransaction(final TransactionOptions transactionOptions) {
+        notNull("transactionOptions", transactionOptions);
+        if (transactionState == TransactionState.IN) {
+            throw new IllegalStateException("Transaction already in progress");
+        }
+        if (transactionState == TransactionState.COMMITTED) {
+            cleanupTransaction(TransactionState.IN);
+        } else {
+            transactionState = TransactionState.IN;
+        }
+        getServerSession().advanceTransactionNumber();
+        this.transactionOptions = TransactionOptions.merge(transactionOptions, getOptions().getDefaultTransactionOptions());
+        WriteConcern writeConcern = this.transactionOptions.getWriteConcern();
+        if (writeConcern == null) {
+            throw new MongoInternalException("Invariant violated.  Transaction options write concern can not be null");
+        }
+        if (!writeConcern.isAcknowledged()) {
+            throw new MongoClientException("Transactions do not support unacknowledged write concern");
+        }
+        setPinnedServerAddress(null);
+    }
+
+    @Override
+    public void commitTransaction() {
+        if (transactionState == TransactionState.ABORTED) {
+            throw new IllegalStateException("Cannot call commitTransaction after calling abortTransaction");
+        }
+        if (transactionState == TransactionState.NONE) {
+            throw new IllegalStateException("There is no transaction started");
+        }
+
+        try {
+            if (messageSentInCurrentTransaction) {
+                ReadConcern readConcern = transactionOptions.getReadConcern();
+                if (readConcern == null) {
+                    throw new MongoInternalException("Invariant violated.  Transaction options read concern can not be null");
+                }
+                commitInProgress = true;
+                delegate.getOperationExecutor().execute(new CommitTransactionOperation(transactionOptions.getWriteConcern(),
+                        transactionState == TransactionState.COMMITTED)
+                                .recoveryToken(getRecoveryToken())
+                                .maxCommitTime(transactionOptions.getMaxCommitTime(MILLISECONDS), MILLISECONDS),
+                        readConcern, this);
+            }
+        } catch (MongoException e) {
+            unpinServerAddressOnError(e);
+            throw e;
+        } finally {
+            transactionState = TransactionState.COMMITTED;
+            commitInProgress = false;
+        }
+    }
+
+    @Override
+    public void abortTransaction() {
+        if (transactionState == TransactionState.ABORTED) {
+            throw new IllegalStateException("Cannot call abortTransaction twice");
+        }
+        if (transactionState == TransactionState.COMMITTED) {
+            throw new IllegalStateException("Cannot call abortTransaction after calling commitTransaction");
+        }
+        if (transactionState == TransactionState.NONE) {
+            throw new IllegalStateException("There is no transaction started");
+        }
+        try {
+            if (messageSentInCurrentTransaction) {
+                ReadConcern readConcern = transactionOptions.getReadConcern();
+                if (readConcern == null) {
+                    throw new MongoInternalException("Invariant violated.  Transaction options read concern can not be null");
+                }
+                delegate.getOperationExecutor().execute(new AbortTransactionOperation(transactionOptions.getWriteConcern())
+                                .recoveryToken(getRecoveryToken()),
+                        readConcern, this);
+            }
+        } catch (Exception e) {
+            if (e instanceof MongoException) {
+                unpinServerAddressOnError((MongoException) e);
+            }
+        } finally {
+            cleanupTransaction(TransactionState.ABORTED);
+        }
+    }
+
+    private void unpinServerAddressOnError(final MongoException e) {
+        if (e.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL) || e.hasErrorLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) {
+            setPinnedServerAddress(null);
+        }
+    }
+
+    @Override
+    public <T> T withTransaction(final TransactionBody<T> transactionBody) {
+        return withTransaction(transactionBody, TransactionOptions.builder().build());
+    }
+
+    @Override
+    public <T> T withTransaction(final TransactionBody<T> transactionBody, final TransactionOptions options) {
+        notNull("transactionBody", transactionBody);
+        long startTime = ClientSessionClock.INSTANCE.now();
+        outer:
+        while (true) {
+            T retVal;
+            try {
+                startTransaction(options);
+                retVal = transactionBody.execute();
+            } catch (RuntimeException e) {
+                if (transactionState == TransactionState.IN) {
+                    abortTransaction();
+                }
+                if (e instanceof MongoException) {
+                    if (((MongoException) e).hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)
+                            && ClientSessionClock.INSTANCE.now() - startTime < MAX_RETRY_TIME_LIMIT_MS) {
+                        continue;
+                    }
+                }
+                throw e;
+            }
+            if (transactionState == TransactionState.IN) {
+                while (true) {
+                    try {
+                        commitTransaction();
+                        break;
+                    } catch (MongoException e) {
+                        unpinServerAddressOnError(e);
+                        if (ClientSessionClock.INSTANCE.now() - startTime < MAX_RETRY_TIME_LIMIT_MS) {
+                            applyMajorityWriteConcernToTransactionOptions();
+
+                            if (!(e instanceof MongoExecutionTimeoutException)
+                                    && e.hasErrorLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) {
+                                continue;
+                            } else if (e.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)) {
+                                continue outer;
+                            }
+                        }
+                        throw e;
+                    }
+                }
+            }
+            return retVal;
+        }
+    }
+
+    // Apply majority write concern if the commit is to be retried.
+    private void applyMajorityWriteConcernToTransactionOptions() {
+        if (transactionOptions != null) {
+            WriteConcern writeConcern = transactionOptions.getWriteConcern();
+            if (writeConcern != null) {
+                transactionOptions = TransactionOptions.merge(TransactionOptions.builder()
+                        .writeConcern(writeConcern.withW("majority")).build(), transactionOptions);
+            } else {
+                transactionOptions = TransactionOptions.merge(TransactionOptions.builder()
+                        .writeConcern(WriteConcern.MAJORITY).build(), transactionOptions);
+            }
+        } else {
+            transactionOptions = TransactionOptions.builder().writeConcern(WriteConcern.MAJORITY).build();
+        }
+    }
+
+    @Override
+    public void close() {
+        try {
+            if (transactionState == TransactionState.IN) {
+                abortTransaction();
+            }
+        } finally {
+            super.close();
+        }
+    }
+
+    private void cleanupTransaction(final TransactionState nextState) {
+        messageSentInCurrentTransaction = false;
+        transactionOptions = null;
+        transactionState = nextState;
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/CollectionInfoRetriever.java b/driver-sync/src/main/com/mongodb/client/internal/CollectionInfoRetriever.java
new file mode 100644
index 00000000000..fbb7c09defb
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/CollectionInfoRetriever.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class CollectionInfoRetriever {
+
+    private final SimpleMongoClient client;
+
+    CollectionInfoRetriever(final SimpleMongoClient client) {
+        this.client = notNull("client", client);
+    }
+
+    @Nullable
+    public BsonDocument filter(final String databaseName, final BsonDocument filter) {
+        return client.getDatabase(databaseName).listCollections(BsonDocument.class).filter(filter).first();
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java b/driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java
new file mode 100644
index 00000000000..4af45a1b11d
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/CommandMarker.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.Block;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.MongoTimeoutException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.connection.ClusterSettings;
+import org.bson.RawBsonDocument;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongocryptdSpawnArgs;
+
+@SuppressWarnings("UseOfProcessBuilder")
+class CommandMarker implements Closeable {
+    private MongoClient client;
+    private final ProcessBuilder processBuilder;
+
+    CommandMarker(final Map<String, Object> options) {
+        String connectionString;
+
+        if (options.containsKey("mongocryptdURI")) {
+            connectionString = (String) options.get("mongocryptdURI");
+        } else {
+            connectionString = "mongodb://localhost:27020";
+        }
+
+        if (!options.containsKey("mongocryptdBypassSpawn") || !((Boolean) options.get("mongocryptdBypassSpawn"))) {
+            processBuilder = new ProcessBuilder(createMongocryptdSpawnArgs(options));
+            startProcess();
+        } else {
+            processBuilder = null;
+        }
+
+        client = MongoClients.create(MongoClientSettings.builder()
+                .applyConnectionString(new ConnectionString(connectionString))
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    public void apply(final ClusterSettings.Builder builder) {
+                        builder.serverSelectionTimeout(1, TimeUnit.SECONDS);
+                    }
+                })
+                .build());
+    }
+
+    RawBsonDocument mark(final String databaseName, final RawBsonDocument command) {
+        try {
+            try {
+                return executeCommand(databaseName, command);
+            } catch (MongoTimeoutException e) {
+                if (processBuilder == null) {  // mongocryptdBypassSpawn=true
+                    throw e;
+                }
+                startProcess();
+                return executeCommand(databaseName, command);
+            }
+        } catch (MongoException e) {
+            throw wrapInClientException(e);
+        }
+    }
+
+    @Override
+    public void close() {
+        client.close();
+    }
+
+    private RawBsonDocument executeCommand(final String databaseName, final RawBsonDocument markableCommand) {
+        return client.getDatabase(databaseName)
+                .withReadConcern(ReadConcern.DEFAULT)
+                .withReadPreference(ReadPreference.primary())
+                .runCommand(markableCommand, RawBsonDocument.class);
+    }
+
+    private void startProcess() {
+        try {
+            processBuilder.start();
+        } catch (IOException e) {
+            throw new MongoClientException("Exception starting mongocryptd process. Is `mongocryptd` on the system path?", e);
+        }
+    }
+
+    private MongoClientException wrapInClientException(final MongoException e) {
+        return new MongoClientException("Exception in encryption library: " + e.getMessage(), e);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Crypt.java b/driver-sync/src/main/com/mongodb/client/internal/Crypt.java
new file mode 100644
index 00000000000..1981359904d
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Crypt.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.crypt.capi.MongoCrypt;
+import com.mongodb.crypt.capi.MongoCryptContext;
+import com.mongodb.crypt.capi.MongoCryptException;
+import com.mongodb.crypt.capi.MongoDataKeyOptions;
+import com.mongodb.crypt.capi.MongoExplicitEncryptOptions;
+import com.mongodb.crypt.capi.MongoKeyDecryptor;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.RawBsonDocument;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.crypt.capi.MongoCryptContext.State;
+
+class Crypt implements Closeable {
+
+    private final MongoCrypt mongoCrypt;
+    private final CollectionInfoRetriever collectionInfoRetriever;
+    private final CommandMarker commandMarker;
+    private final KeyRetriever keyRetriever;
+    private final KeyManagementService keyManagementService;
+    private final boolean bypassAutoEncryption;
+
+    /**
+     * Create an instance to use for explicit encryption and decryption, and data key creation.
+     *
+     * @param mongoCrypt the mongoCrypt wrapper
+     * @param keyRetriever the key retriever
+     * @param keyManagementService the key management service
+     */
+    Crypt(final MongoCrypt mongoCrypt, final KeyRetriever keyRetriever, final KeyManagementService keyManagementService) {
+        this(mongoCrypt, null, null, keyRetriever, keyManagementService, false);
+    }
+
+    /**
+     * Create an instance to use for auto-encryption and auto-decryption.
+     *
+     * @param mongoCrypt the mongoCrypt wrapper
+     * @param keyRetriever the key retriever
+     * @param keyManagementService the key management service
+     * @param collectionInfoRetriever the collection info retriever
+     * @param commandMarker the command marker
+     */
+    Crypt(final MongoCrypt mongoCrypt, @Nullable final CollectionInfoRetriever collectionInfoRetriever,
+          @Nullable final CommandMarker commandMarker, final KeyRetriever keyRetriever, final KeyManagementService keyManagementService,
+          final boolean bypassAutoEncryption) {
+        this.mongoCrypt = mongoCrypt;
+        this.collectionInfoRetriever = collectionInfoRetriever;
+        this.commandMarker = commandMarker;
+        this.keyRetriever = keyRetriever;
+        this.keyManagementService = keyManagementService;
+        this.bypassAutoEncryption = bypassAutoEncryption;
+    }
+
+    /**
+     * Encrypt the given command
+     *
+     * @param databaseName the namespace
+     * @param command   the unencrypted command
+     * @return the encrypted command
+     */
+    public RawBsonDocument encrypt(final String databaseName, final RawBsonDocument command) {
+        notNull("databaseName", databaseName);
+        notNull("command", command);
+
+        if (bypassAutoEncryption) {
+            return command;
+        }
+
+        try {
+            MongoCryptContext encryptionContext = mongoCrypt.createEncryptionContext(databaseName, command);
+
+            try {
+                return executeStateMachine(encryptionContext, databaseName);
+            } finally {
+                encryptionContext.close();
+            }
+        } catch (MongoCryptException e) {
+            throw wrapInClientException(e);
+        }
+    }
+
+    /**
+     * Decrypt the given command response
+     *
+     * @param commandResponse the encrypted command response
+     * @return the decrypted command response
+     */
+    RawBsonDocument decrypt(final RawBsonDocument commandResponse) {
+        notNull("commandResponse", commandResponse);
+
+        try {
+            MongoCryptContext decryptionContext = mongoCrypt.createDecryptionContext(commandResponse);
+
+            try {
+                return executeStateMachine(decryptionContext, null);
+            } finally {
+                decryptionContext.close();
+            }
+        } catch (MongoCryptException e) {
+            throw wrapInClientException(e);
+        }
+    }
+
+    /**
+     * Create a data key.
+     *
+     * @param kmsProvider the KMS provider to create the data key for
+     * @param options     the data key options
+     * @return the document representing the data key to be added to the key vault
+     */
+    BsonDocument createDataKey(final String kmsProvider, final DataKeyOptions options) {
+        notNull("kmsProvider", kmsProvider);
+        notNull("options", options);
+
+        try {
+            MongoCryptContext dataKeyCreationContext = mongoCrypt.createDataKeyContext(kmsProvider,
+                    MongoDataKeyOptions.builder()
+                            .keyAltNames(options.getKeyAltNames())
+                            .masterKey(options.getMasterKey())
+                            .build());
+
+            try {
+                return executeStateMachine(dataKeyCreationContext, null);
+            } finally {
+                dataKeyCreationContext.close();
+            }
+        } catch (MongoCryptException e) {
+            throw wrapInClientException(e);
+        }
+    }
+
+    /**
+     * Encrypt the given value with the given options
+     *
+     * @param value the value to encrypt
+     * @param options the options
+     * @return the encrypted value
+     */
+    BsonBinary encryptExplicitly(final BsonValue value, final EncryptOptions options) {
+        notNull("value", value);
+        notNull("options", options);
+
+        try {
+            MongoExplicitEncryptOptions.Builder encryptOptionsBuilder = MongoExplicitEncryptOptions.builder()
+                    .algorithm(options.getAlgorithm());
+
+            if (options.getKeyId() != null) {
+                encryptOptionsBuilder.keyId(options.getKeyId());
+            }
+
+            if (options.getKeyAltName() != null) {
+                encryptOptionsBuilder.keyAltName(options.getKeyAltName());
+            }
+
+            MongoCryptContext encryptionContext = mongoCrypt.createExplicitEncryptionContext(
+                    new BsonDocument("v", value), encryptOptionsBuilder.build());
+            try {
+                return executeStateMachine(encryptionContext, null).getBinary("v");
+            } finally {
+                encryptionContext.close();
+            }
+        } catch (MongoCryptException e) {
+            throw wrapInClientException(e);
+        }
+    }
+
+    /**
+     * Decrypt the given encrypted value.
+     *
+     * @param value the encrypted value
+     * @return the decrypted value
+     */
+    BsonValue decryptExplicitly(final BsonBinary value) {
+        notNull("value", value);
+
+        try {
+            MongoCryptContext decryptionContext = mongoCrypt.createExplicitDecryptionContext(new BsonDocument("v", value));
+
+            try {
+                return executeStateMachine(decryptionContext, null).get("v");
+            } finally {
+                decryptionContext.close();
+            }
+        } catch (MongoCryptException e) {
+            throw wrapInClientException(e);
+        }
+    }
+
+    @Override
+    public void close() {
+        mongoCrypt.close();
+        if (commandMarker != null) {
+            commandMarker.close();
+        }
+        keyRetriever.close();
+    }
+
+    private RawBsonDocument executeStateMachine(final MongoCryptContext cryptContext, final String databaseName) {
+        while (true) {
+            State state = cryptContext.getState();
+            switch (state) {
+                case NEED_MONGO_COLLINFO:
+                    collInfo(cryptContext, databaseName);
+                    break;
+                case NEED_MONGO_MARKINGS:
+                    mark(cryptContext, databaseName);
+                    break;
+                case NEED_MONGO_KEYS:
+                    fetchKeys(cryptContext);
+                    break;
+                case NEED_KMS:
+                    decryptKeys(cryptContext);
+                    break;
+                case READY:
+                    return cryptContext.finish();
+                default:
+                    throw new MongoInternalException("Unsupported encryptor state + " + state);
+            }
+        }
+    }
+
+    private void collInfo(final MongoCryptContext cryptContext, final String databaseName) {
+        try {
+            BsonDocument collectionInfo = collectionInfoRetriever.filter(databaseName, cryptContext.getMongoOperation());
+            if (collectionInfo != null) {
+                cryptContext.addMongoOperationResult(collectionInfo);
+            }
+            cryptContext.completeMongoOperation();
+        } catch (Throwable t) {
+            throw MongoException.fromThrowableNonNull(t);
+        }
+    }
+
+    private void mark(final MongoCryptContext cryptContext, final String databaseName) {
+        try {
+            RawBsonDocument markedCommand = commandMarker.mark(databaseName, cryptContext.getMongoOperation());
+            cryptContext.addMongoOperationResult(markedCommand);
+            cryptContext.completeMongoOperation();
+        } catch (Throwable t) {
+            throw wrapInClientException(t);
+        }
+    }
+
+    private void fetchKeys(final MongoCryptContext keyBroker) {
+        try {
+            for (BsonDocument bsonDocument : keyRetriever.find(keyBroker.getMongoOperation())) {
+                keyBroker.addMongoOperationResult(bsonDocument);
+            }
+            keyBroker.completeMongoOperation();
+        } catch (Throwable t) {
+            throw MongoException.fromThrowableNonNull(t);
+        }
+    }
+
+    private void decryptKeys(final MongoCryptContext cryptContext) {
+        try {
+            MongoKeyDecryptor keyDecryptor = cryptContext.nextKeyDecryptor();
+            while (keyDecryptor != null) {
+                decryptKey(keyDecryptor);
+                keyDecryptor = cryptContext.nextKeyDecryptor();
+            }
+            cryptContext.completeKeyDecryptors();
+        } catch (Throwable t) {
+            throw wrapInClientException(t);
+        }
+    }
+
+    private void decryptKey(final MongoKeyDecryptor keyDecryptor) throws IOException {
+        InputStream inputStream = keyManagementService.stream(keyDecryptor.getHostName(), keyDecryptor.getMessage());
+        try {
+            int bytesNeeded = keyDecryptor.bytesNeeded();
+
+            while (bytesNeeded > 0) {
+                byte[] bytes = new byte[bytesNeeded];
+                int bytesRead = inputStream.read(bytes, 0, bytes.length);
+                keyDecryptor.feed(ByteBuffer.wrap(bytes, 0, bytesRead));
+                bytesNeeded = keyDecryptor.bytesNeeded();
+            }
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                // ignore
+            }
+        }
+    }
+
+    private MongoClientException wrapInClientException(final Throwable t) {
+        return new MongoClientException("Exception in encryption library: " + t.getMessage(), t);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java b/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java
new file mode 100644
index 00000000000..bd05f633a65
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.binding.ConnectionSource;
+import com.mongodb.binding.ReadWriteBinding;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.ClusterAwareReadWriteBinding;
+import com.mongodb.session.SessionContext;
+
+class CryptBinding implements ClusterAwareReadWriteBinding {
+    private final ClusterAwareReadWriteBinding wrapped;
+    private final Crypt crypt;
+
+    CryptBinding(final ClusterAwareReadWriteBinding wrapped, final Crypt crypt) {
+        this.crypt = crypt;
+        this.wrapped = wrapped;
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return wrapped.getReadPreference();
+    }
+
+    @Override
+    public ConnectionSource getReadConnectionSource() {
+        return new CryptConnectionSource(wrapped.getReadConnectionSource());
+    }
+
+    @Override
+    public ConnectionSource getWriteConnectionSource() {
+        return new CryptConnectionSource(wrapped.getWriteConnectionSource());
+    }
+
+    @Override
+    public SessionContext getSessionContext() {
+        return wrapped.getSessionContext();
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public ReadWriteBinding retain() {
+        wrapped.retain();
+        return this;
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+    }
+
+    @Override
+    public Cluster getCluster() {
+        return wrapped.getCluster();
+    }
+
+    private class CryptConnectionSource implements ConnectionSource {
+        private final ConnectionSource wrapped;
+
+        CryptConnectionSource(final ConnectionSource wrapped) {
+            this.wrapped = wrapped;
+        }
+
+        @Override
+        public ServerDescription getServerDescription() {
+            return wrapped.getServerDescription();
+        }
+
+        @Override
+        public SessionContext getSessionContext() {
+            return wrapped.getSessionContext();
+        }
+
+        @Override
+        public Connection getConnection() {
+            return new CryptConnection(wrapped.getConnection(), crypt);
+        }
+
+        @Override
+        public int getCount() {
+            return wrapped.getCount();
+        }
+
+        @Override
+        public ConnectionSource retain() {
+            wrapped.retain();
+            return this;
+        }
+
+        @Override
+        public void release() {
+            wrapped.release();
+        }
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/CryptConnection.java b/driver-sync/src/main/com/mongodb/client/internal/CryptConnection.java
new file mode 100644
index 00000000000..aa2d3b7e4b6
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/CryptConnection.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.bulk.DeleteRequest;
+import com.mongodb.bulk.InsertRequest;
+import com.mongodb.bulk.UpdateRequest;
+import com.mongodb.connection.Connection;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.QueryResult;
+import com.mongodb.connection.SplittablePayload;
+import com.mongodb.internal.connection.MessageSettings;
+import com.mongodb.internal.connection.SplittablePayloadBsonWriter;
+import com.mongodb.internal.validator.MappedFieldNameValidator;
+import com.mongodb.lang.Nullable;
+import com.mongodb.session.SessionContext;
+import org.bson.BsonBinaryReader;
+import org.bson.BsonBinaryWriter;
+import org.bson.BsonBinaryWriterSettings;
+import org.bson.BsonDocument;
+import org.bson.BsonWriter;
+import org.bson.BsonWriterSettings;
+import org.bson.FieldNameValidator;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.Decoder;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.RawBsonDocumentCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.io.BasicOutputBuffer;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotTwo;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+
+// because this class implements deprecated methods
+@SuppressWarnings("deprecation")
+class CryptConnection implements Connection {
+    private static final CodecRegistry REGISTRY = fromProviders(new BsonValueCodecProvider());
+    private static final int MAX_SPLITTABLE_DOCUMENT_SIZE = 2097152;
+
+    private final Connection wrapped;
+    private final Crypt crypt;
+
+    CryptConnection(final Connection wrapped, final Crypt crypt) {
+        this.wrapped = wrapped;
+        this.crypt = crypt;
+    }
+
+    @Override
+    public int getCount() {
+        return wrapped.getCount();
+    }
+
+    @Override
+    public CryptConnection retain() {
+        wrapped.retain();
+        return this;
+    }
+
+    @Override
+    public void release() {
+        wrapped.release();
+    }
+
+    @Override
+    public ConnectionDescription getDescription() {
+        return wrapped.getDescription();
+    }
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final FieldNameValidator commandFieldNameValidator,
+                         final ReadPreference readPreference, final Decoder<T> commandResultDecoder, final SessionContext sessionContext,
+                         final boolean responseExpected, @Nullable final SplittablePayload payload,
+                         @Nullable final FieldNameValidator payloadFieldNameValidator) {
+
+        if (serverIsLessThanVersionFourDotTwo(wrapped.getDescription())) {
+            throw new MongoClientException("Auto-encryption requires a minimum MongoDB version of 4.2");
+        }
+
+        BasicOutputBuffer bsonOutput = new BasicOutputBuffer();
+        BsonBinaryWriter bsonBinaryWriter = new BsonBinaryWriter(new BsonWriterSettings(),
+                new BsonBinaryWriterSettings(getDescription().getMaxDocumentSize()),
+                bsonOutput, getFieldNameValidator(payload, commandFieldNameValidator, payloadFieldNameValidator));
+        BsonWriter writer = payload == null
+                ? bsonBinaryWriter
+                : new SplittablePayloadBsonWriter(bsonBinaryWriter, bsonOutput, createSplittablePayloadMessageSettings(), payload,
+                MAX_SPLITTABLE_DOCUMENT_SIZE);
+
+        getEncoder(command).encode(writer, command, EncoderContext.builder().build());
+
+        RawBsonDocument encryptedCommand = crypt.encrypt(database,
+                new RawBsonDocument(bsonOutput.getInternalBuffer(), 0, bsonOutput.getSize()));
+
+        RawBsonDocument encryptedResponse = wrapped.command(database, encryptedCommand, commandFieldNameValidator, readPreference,
+                new RawBsonDocumentCodec(), sessionContext, responseExpected, null, null);
+
+        RawBsonDocument decryptedResponse = crypt.decrypt(encryptedResponse);
+
+        BsonBinaryReader reader = new BsonBinaryReader(decryptedResponse.getByteBuffer().asNIO());
+
+        return commandResultDecoder.decode(reader, DecoderContext.builder().build());
+    }
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final FieldNameValidator fieldNameValidator,
+                         final ReadPreference readPreference, final Decoder<T> commandResultDecoder, final SessionContext sessionContext) {
+        return command(database, command, fieldNameValidator, readPreference, commandResultDecoder, sessionContext, true, null, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    private Codec<BsonDocument> getEncoder(final BsonDocument command) {
+        return (Codec<BsonDocument>) REGISTRY.get(command.getClass());
+    }
+
+    private FieldNameValidator getFieldNameValidator(@Nullable final SplittablePayload payload,
+                                                     final FieldNameValidator commandFieldNameValidator,
+                                                     @Nullable final FieldNameValidator payloadFieldNameValidator) {
+        if (payload == null) {
+            return commandFieldNameValidator;
+        }
+
+        Map<String, FieldNameValidator> rootMap = new HashMap<String, FieldNameValidator>();
+        rootMap.put(payload.getPayloadName(), payloadFieldNameValidator);
+        return new MappedFieldNameValidator(commandFieldNameValidator, rootMap);
+    }
+
+    private MessageSettings createSplittablePayloadMessageSettings() {
+        return MessageSettings.builder()
+                .maxBatchCount(getDescription().getMaxBatchCount())
+                .maxMessageSize(getDescription().getMaxMessageSize())
+                .maxDocumentSize(getDescription().getMaxDocumentSize())
+                .build();
+    }
+
+
+    // UNSUPPORTED METHODS for encryption/decryption
+
+    @Override
+    public <T> T command(final String database, final BsonDocument command, final boolean slaveOk,
+                         final FieldNameValidator fieldNameValidator, final Decoder<T> commandResultDecoder) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public WriteConcernResult insert(final MongoNamespace namespace, final boolean ordered, final InsertRequest insertRequest) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public WriteConcernResult update(final MongoNamespace namespace, final boolean ordered, final UpdateRequest updateRequest) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public WriteConcernResult delete(final MongoNamespace namespace, final boolean ordered, final DeleteRequest deleteRequest) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                                    final int numberToReturn, final int skip, final boolean slaveOk, final boolean tailableCursor,
+                                    final boolean awaitData, final boolean noCursorTimeout, final boolean partial,
+                                    final boolean oplogReplay, final Decoder<T> resultDecoder) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T> QueryResult<T> query(final MongoNamespace namespace, final BsonDocument queryDocument, final BsonDocument fields,
+                                    final int skip, final int limit, final int batchSize, final boolean slaveOk,
+                                    final boolean tailableCursor, final boolean awaitData, final boolean noCursorTimeout,
+                                    final boolean partial, final boolean oplogReplay, final Decoder<T> resultDecoder) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T> QueryResult<T> getMore(final MongoNamespace namespace, final long cursorId, final int numberToReturn,
+                                      final Decoder<T> resultDecoder) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void killCursor(final List<Long> cursors) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void killCursor(final MongoNamespace namespace, final List<Long> cursors) {
+        throw new UnsupportedOperationException();
+    }
+
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Crypts.java b/driver-sync/src/main/com/mongodb/client/internal/Crypts.java
new file mode 100644
index 00000000000..76a205915b8
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Crypts.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.client.MongoClients;
+import com.mongodb.crypt.capi.MongoCrypts;
+
+import javax.net.ssl.SSLContext;
+import java.security.NoSuchAlgorithmException;
+
+import static com.mongodb.internal.capi.MongoCryptOptionsHelper.createMongoCryptOptions;
+
+public final class Crypts {
+
+    public static Crypt createCrypt(final SimpleMongoClient client, final AutoEncryptionSettings options) {
+        return new Crypt(MongoCrypts.create(createMongoCryptOptions(options.getKmsProviders(),
+                options.getSchemaMap())),
+                new CollectionInfoRetriever(client),
+                new CommandMarker(options.getExtraOptions()),
+                createKeyRetriever(client, options.getKeyVaultMongoClientSettings(), options.getKeyVaultNamespace()),
+                createKeyManagementService(),
+                options.isBypassAutoEncryption());
+    }
+
+    static Crypt create(final SimpleMongoClient keyVaultClient, final ClientEncryptionSettings options) {
+        return new Crypt(MongoCrypts.create(
+                createMongoCryptOptions(options.getKmsProviders(), null)),
+                createKeyRetriever(keyVaultClient, false, options.getKeyVaultNamespace()),
+                createKeyManagementService());
+    }
+
+    private static KeyRetriever createKeyRetriever(final SimpleMongoClient defaultKeyVaultClient,
+                                                   final MongoClientSettings keyVaultMongoClientSettings,
+                                                   final String keyVaultNamespaceString) {
+        SimpleMongoClient keyVaultClient;
+        boolean keyRetrieverOwnsClient;
+        if (keyVaultMongoClientSettings != null) {
+            keyVaultClient = SimpleMongoClients.create(MongoClients.create(keyVaultMongoClientSettings));
+            keyRetrieverOwnsClient = true;
+        } else {
+            keyVaultClient = defaultKeyVaultClient;
+            keyRetrieverOwnsClient = false;
+        }
+
+        return createKeyRetriever(keyVaultClient, keyRetrieverOwnsClient, keyVaultNamespaceString);
+    }
+
+    private static KeyRetriever createKeyRetriever(final SimpleMongoClient keyVaultClient, final boolean keyRetrieverOwnsClient,
+                                                   final String keyVaultNamespaceString) {
+        return new KeyRetriever(keyVaultClient, keyRetrieverOwnsClient, new MongoNamespace(keyVaultNamespaceString));
+    }
+
+    private static KeyManagementService createKeyManagementService() {
+        return new KeyManagementService(getSslContext(), 443, 10000);
+    }
+
+    private static SSLContext getSslContext() {
+        SSLContext sslContext;
+        try {
+            sslContext = SSLContext.getDefault();
+        } catch (NoSuchAlgorithmException e) {
+            throw new MongoClientException("Unable to create default SSLContext", e);
+        }
+        return sslContext;
+    }
+
+    private Crypts() {
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/DistinctIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/DistinctIterableImpl.java
new file mode 100644
index 00000000000..59ee81f5707
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/DistinctIterableImpl.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.DistinctIterable;
+import com.mongodb.client.model.Collation;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.client.ClientSession;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class DistinctIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements DistinctIterable<TResult> {
+    private final SyncOperations<TDocument> operations;
+
+    private final Class<TResult> resultClass;
+    private final String fieldName;
+
+    private Bson filter;
+    private long maxTimeMS;
+    private Collation collation;
+
+    DistinctIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                         final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                         final ReadConcern readConcern, final OperationExecutor executor, final String fieldName, final Bson filter) {
+        this(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern, executor, fieldName,
+                filter, true);
+    }
+
+    DistinctIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                         final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                         final ReadConcern readConcern, final OperationExecutor executor, final String fieldName, final Bson filter,
+                         final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.operations = new SyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, retryReads);
+        this.resultClass = notNull("resultClass", resultClass);
+        this.fieldName = notNull("mapFunction", fieldName);
+        this.filter = filter;
+    }
+
+    @Override
+    public DistinctIterable<TResult> filter(@Nullable final Bson filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    @Override
+    public DistinctIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public DistinctIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public DistinctIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    public ReadOperation<BatchCursor<TResult>> asReadOperation() {
+        return operations.distinct(fieldName, filter, resultClass, maxTimeMS, collation);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/FallbackMongoIterableFactory.java b/driver-sync/src/main/com/mongodb/client/internal/FallbackMongoIterableFactory.java
new file mode 100644
index 00000000000..336c6a53630
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/FallbackMongoIterableFactory.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.DistinctIterable;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.ListCollectionsIterable;
+import com.mongodb.client.ListDatabasesIterable;
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+class FallbackMongoIterableFactory implements MongoIterableFactory {
+    @Override
+    public <TDocument, TResult>
+    FindIterable<TResult> findOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                 final Class<TDocument> documentClass, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                 final ReadPreference readPreference, final ReadConcern readConcern, final OperationExecutor executor,
+                                 final Bson filter, final boolean retryReads) {
+        return new FindIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, filter, retryReads);
+    }
+
+    @Override
+    public <TDocument, TResult> AggregateIterable<TResult> aggregateOf(final @Nullable ClientSession clientSession,
+                                                                       final MongoNamespace namespace, final Class<TDocument> documentClass,
+                                                                       final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                                                       final ReadPreference readPreference, final ReadConcern readConcern,
+                                                                       final WriteConcern writeConcern, final OperationExecutor executor,
+                                                                       final List<? extends Bson> pipeline,
+                                                                       final AggregationLevel aggregationLevel, final boolean retryReads) {
+        return new AggregateIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
+
+    @Override
+    public <TDocument, TResult> AggregateIterable<TResult> aggregateOf(final @Nullable ClientSession clientSession,
+                                                                       final String databaseName, final Class<TDocument> documentClass,
+                                                                       final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                                                       final ReadPreference readPreference, final ReadConcern readConcern,
+                                                                       final WriteConcern writeConcern, final OperationExecutor executor,
+                                                                       final List<? extends Bson> pipeline,
+                                                                       final AggregationLevel aggregationLevel, final boolean retryReads) {
+        return new AggregateIterableImpl<TDocument, TResult>(clientSession, databaseName, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(final @Nullable ClientSession clientSession, final String databaseName,
+                                                 final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                 final ReadConcern readConcern, final OperationExecutor executor,
+                                                 final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                 final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        return new ChangeStreamIterableImpl<TResult>(clientSession, databaseName, codecRegistry, readPreference, readConcern, executor,
+                pipeline, resultClass, changeStreamLevel, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                                 final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                 final ReadConcern readConcern, final OperationExecutor executor,
+                                                 final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                 final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        return new ChangeStreamIterableImpl<TResult>(clientSession, namespace, codecRegistry, readPreference, readConcern, executor,
+                pipeline, resultClass, changeStreamLevel, retryReads);
+    }
+
+
+    @Override
+    public <TDocument, TResult>
+    DistinctIterable<TResult> distinctOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                         final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                         final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                         final ReadConcern readConcern, final OperationExecutor executor, final String fieldName,
+                                         final Bson filter, final boolean retryReads) {
+        return new DistinctIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, fieldName, filter, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ListDatabasesIterable<TResult> listDatabasesOf(final @Nullable ClientSession clientSession, final Class<TResult> resultClass,
+                                                   final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                   final OperationExecutor executor, final boolean retryReads) {
+        return new ListDatabasesIterableImpl<TResult>(clientSession, resultClass, codecRegistry, readPreference, executor, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ListCollectionsIterable<TResult> listCollectionsOf(final @Nullable ClientSession clientSession, final String databaseName,
+                                                       final boolean collectionNamesOnly, final Class<TResult> resultClass,
+                                                       final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                       final OperationExecutor executor, final boolean retryReads) {
+        return new ListCollectionsIterableImpl<TResult>(clientSession, databaseName, collectionNamesOnly, resultClass, codecRegistry,
+                readPreference, executor, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ListIndexesIterable<TResult> listIndexesOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                               final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                               final ReadPreference readPreference, final OperationExecutor executor,
+                                               final boolean retryReads) {
+        return new ListIndexesIterableImpl<TResult>(clientSession, namespace, resultClass, codecRegistry, readPreference,
+                executor, retryReads);
+    }
+
+    @Override
+    public <TDocument, TResult>
+    MapReduceIterable<TResult> mapReduceOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                           final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                           final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                           final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                                           final String mapFunction, final String reduceFunction) {
+        return new MapReduceIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, mapFunction, reduceFunction);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/FindIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/FindIterableImpl.java
new file mode 100644
index 00000000000..3a6defe669f
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/FindIterableImpl.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.CursorType;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.FindOptions;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ReadOperation;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+@SuppressWarnings("deprecation")
+class FindIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements FindIterable<TResult> {
+
+    private final SyncOperations<TDocument> operations;
+
+    private final Class<TResult> resultClass;
+    private final FindOptions findOptions;
+
+    private Bson filter;
+
+    FindIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                     final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                     final ReadConcern readConcern, final OperationExecutor executor, final Bson filter) {
+        this(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern, executor, filter, true);
+    }
+
+    FindIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                     final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                     final ReadConcern readConcern, final OperationExecutor executor, final Bson filter, final boolean retryReads) {
+        super(clientSession, executor, readConcern, readPreference, retryReads);
+        this.operations = new SyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, retryReads);
+        this.resultClass = notNull("resultClass", resultClass);
+        this.filter = notNull("filter", filter);
+        this.findOptions = new FindOptions();
+    }
+
+    @Override
+    public FindIterable<TResult> filter(@Nullable final Bson filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> limit(final int limit) {
+        findOptions.limit(limit);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> skip(final int skip) {
+        findOptions.skip(skip);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        findOptions.maxTime(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        findOptions.maxAwaitTime(maxAwaitTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        findOptions.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> collation(@Nullable final Collation collation) {
+        findOptions.collation(collation);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public FindIterable<TResult> modifiers(@Nullable final Bson modifiers) {
+        findOptions.modifiers(modifiers);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> projection(@Nullable final Bson projection) {
+        findOptions.projection(projection);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> sort(@Nullable final Bson sort) {
+        findOptions.sort(sort);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> noCursorTimeout(final boolean noCursorTimeout) {
+        findOptions.noCursorTimeout(noCursorTimeout);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> oplogReplay(final boolean oplogReplay) {
+        findOptions.oplogReplay(oplogReplay);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> partial(final boolean partial) {
+        findOptions.partial(partial);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> cursorType(final CursorType cursorType) {
+        findOptions.cursorType(cursorType);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> comment(@Nullable final String comment) {
+        findOptions.comment(comment);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> hint(@Nullable final Bson hint) {
+        findOptions.hint(hint);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> hintString(@Nullable final String hint) {
+        findOptions.hintString(hint);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> max(@Nullable final Bson max) {
+        findOptions.max(max);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> min(@Nullable final Bson min) {
+        findOptions.min(min);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public FindIterable<TResult> maxScan(final long maxScan) {
+        findOptions.maxScan(maxScan);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> returnKey(final boolean returnKey) {
+        findOptions.returnKey(returnKey);
+        return this;
+    }
+
+    @Override
+    public FindIterable<TResult> showRecordId(final boolean showRecordId) {
+        findOptions.showRecordId(showRecordId);
+        return this;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public FindIterable<TResult> snapshot(final boolean snapshot) {
+        findOptions.snapshot(snapshot);
+        return this;
+    }
+
+    @Nullable
+    @Override
+    public TResult first() {
+        BatchCursor<TResult> batchCursor = getExecutor().execute(operations.findFirst(filter, resultClass, findOptions),
+                getReadPreference(), getReadConcern(), getClientSession());
+        try {
+            return batchCursor.hasNext() ? batchCursor.next().iterator().next() : null;
+        } finally {
+            batchCursor.close();
+        }
+    }
+
+    public ReadOperation<BatchCursor<TResult>> asReadOperation() {
+        return operations.find(filter, resultClass, findOptions);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8AggregateIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8AggregateIterableImpl.java
new file mode 100644
index 00000000000..2f5388532f4
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8AggregateIterableImpl.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+class Java8AggregateIterableImpl<TDocument, TResult> extends AggregateIterableImpl<TDocument, TResult> {
+
+    Java8AggregateIterableImpl(@Nullable final ClientSession clientSession, final String databaseName,
+                               final Class<TDocument> documentClass, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                               final ReadPreference readPreference, final ReadConcern readConcern, final WriteConcern writeConcern,
+                               final OperationExecutor executor, final List<? extends Bson> pipeline,
+                               final AggregationLevel aggregationLevel, final boolean retryReads) {
+        super(clientSession, databaseName, documentClass, resultClass, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, aggregationLevel, retryReads);
+    }
+
+    Java8AggregateIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace,
+                               final Class<TDocument> documentClass, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                               final ReadPreference readPreference, final ReadConcern readConcern, final WriteConcern writeConcern,
+                               final OperationExecutor executor, final List<? extends Bson> pipeline,
+                               final AggregationLevel aggregationLevel, final boolean retryReads) {
+        super(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, aggregationLevel, retryReads);
+    }
+
+    @Override
+    public void forEach(final Consumer<? super TResult> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8ChangeStreamIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8ChangeStreamIterableImpl.java
new file mode 100644
index 00000000000..7a89f105552
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8ChangeStreamIterableImpl.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+class Java8ChangeStreamIterableImpl<TResult> extends ChangeStreamIterableImpl<TResult> {
+    Java8ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final CodecRegistry codecRegistry,
+                                  final ReadPreference readPreference, final ReadConcern readConcern, final OperationExecutor executor,
+                                  final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                  final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        super(clientSession, databaseName, codecRegistry, readPreference, readConcern, executor, pipeline, resultClass,
+                changeStreamLevel, retryReads);
+    }
+
+    Java8ChangeStreamIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace,
+                                  final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
+                                  final OperationExecutor executor, final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                  final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        super(clientSession, namespace, codecRegistry, readPreference, readConcern, executor, pipeline, resultClass,
+                changeStreamLevel, retryReads);
+    }
+
+    @Override
+    public void forEach(final Consumer<? super ChangeStreamDocument<TResult>> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8DistinctIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8DistinctIterableImpl.java
new file mode 100644
index 00000000000..4a105821762
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8DistinctIterableImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.function.Consumer;
+
+class Java8DistinctIterableImpl<TDocument, TResult> extends DistinctIterableImpl<TDocument, TResult> {
+    Java8DistinctIterableImpl(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                              final Class<TDocument> documentClass, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                              final ReadPreference readPreference, final ReadConcern readConcern, final OperationExecutor executor,
+                              final String fieldName, final Bson filter, final boolean retryReads) {
+        super(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern, executor, fieldName,
+                filter, retryReads);
+    }
+
+    @Override
+    public void forEach(final Consumer<? super TResult> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8FindIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8FindIterableImpl.java
new file mode 100644
index 00000000000..ad3f3897617
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8FindIterableImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.function.Consumer;
+
+class Java8FindIterableImpl<TDocument, TResult> extends FindIterableImpl<TDocument, TResult> {
+
+    Java8FindIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final OperationExecutor executor, final Bson filter, final boolean retryReads) {
+        super(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern, executor,
+                filter, retryReads);
+    }
+
+    @Override
+    public void forEach(final Consumer<? super TResult> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8ForEachHelper.java b/driver-sync/src/main/com/mongodb/client/internal/Java8ForEachHelper.java
new file mode 100644
index 00000000000..64207fd36a0
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8ForEachHelper.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoIterable;
+
+import java.util.function.Consumer;
+
+final class Java8ForEachHelper {
+
+    static <TResult> void forEach(final MongoIterable<TResult> iterable, final Consumer<? super TResult> block) {
+        MongoCursor<TResult> cursor = iterable.iterator();
+        try {
+            while (cursor.hasNext()) {
+                block.accept(cursor.next());
+            }
+        } finally {
+            cursor.close();
+        }
+    }
+
+    private Java8ForEachHelper() {
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8ListCollectionsIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8ListCollectionsIterableImpl.java
new file mode 100644
index 00000000000..ed9eea6c64a
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8ListCollectionsIterableImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.function.Consumer;
+
+class Java8ListCollectionsIterableImpl<TResult> extends ListCollectionsIterableImpl<TResult> {
+    Java8ListCollectionsIterableImpl(final @Nullable ClientSession clientSession, final String databaseName,
+                                     final boolean collectionNamesOnly, final Class<TResult> resultClass,
+                                     final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                     final OperationExecutor executor, final boolean retryReads) {
+        super(clientSession, databaseName, collectionNamesOnly, resultClass, codecRegistry, readPreference, executor, retryReads);
+    }
+
+    @Override
+    public void forEach(final Consumer<? super TResult> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8ListDatabasesIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8ListDatabasesIterableImpl.java
new file mode 100644
index 00000000000..31a61cf24f6
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8ListDatabasesIterableImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.function.Consumer;
+
+class Java8ListDatabasesIterableImpl<TResult> extends ListDatabasesIterableImpl<TResult> {
+    Java8ListDatabasesIterableImpl(final @Nullable ClientSession clientSession, final Class<TResult> resultClass,
+                                   final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                   final OperationExecutor executor, final boolean retryReads) {
+        super(clientSession, resultClass, codecRegistry, readPreference, executor, retryReads);
+    }
+
+
+    @Override
+    public void forEach(final Consumer<? super TResult> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8ListIndexesIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8ListIndexesIterableImpl.java
new file mode 100644
index 00000000000..e178042dceb
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8ListIndexesIterableImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.function.Consumer;
+
+class Java8ListIndexesIterableImpl<TResult> extends ListIndexesIterableImpl<TResult> {
+    Java8ListIndexesIterableImpl(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                 final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                 final ReadPreference readPreference, final OperationExecutor executor, final boolean retryReads) {
+        super(clientSession, namespace, resultClass, codecRegistry, readPreference, executor, retryReads);
+    }
+
+    @Override
+    public void forEach(final Consumer<? super TResult> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8MapReduceIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/Java8MapReduceIterableImpl.java
new file mode 100644
index 00000000000..a152fd68510
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8MapReduceIterableImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.ClientSession;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.function.Consumer;
+
+class Java8MapReduceIterableImpl<TDocument, TResult> extends MapReduceIterableImpl<TDocument, TResult> {
+    Java8MapReduceIterableImpl(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                               final Class<TDocument> documentClass, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                               final ReadPreference readPreference, final ReadConcern readConcern, final WriteConcern writeConcern,
+                               final OperationExecutor executor, final String mapFunction, final String reduceFunction) {
+        super(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                mapFunction, reduceFunction);
+    }
+
+    @Override
+    public void forEach(final Consumer<? super TResult> action) {
+        Java8ForEachHelper.forEach(this, action);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/Java8MongoIterableFactory.java b/driver-sync/src/main/com/mongodb/client/internal/Java8MongoIterableFactory.java
new file mode 100644
index 00000000000..a7c04a284e4
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/Java8MongoIterableFactory.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.DistinctIterable;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.ListCollectionsIterable;
+import com.mongodb.client.ListDatabasesIterable;
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+class Java8MongoIterableFactory implements MongoIterableFactory {
+    @Override
+    public <TDocument, TResult>
+    FindIterable<TResult> findOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                 final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                 final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                 final ReadConcern readConcern, final OperationExecutor executor,
+                                 final Bson filter, final boolean retryReads) {
+        return new Java8FindIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, filter, retryReads);
+    }
+
+    @Override
+    public <TDocument, TResult> AggregateIterable<TResult> aggregateOf(final @Nullable ClientSession clientSession,
+                                                                       final MongoNamespace namespace, final Class<TDocument> documentClass,
+                                                                       final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                                                       final ReadPreference readPreference, final ReadConcern readConcern,
+                                                                       final WriteConcern writeConcern, final OperationExecutor executor,
+                                                                       final List<? extends Bson> pipeline,
+                                                                       final AggregationLevel aggregationLevel,
+                                                                       final boolean retryReads) {
+        return new Java8AggregateIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
+
+    @Override
+    public <TDocument, TResult> AggregateIterable<TResult> aggregateOf(final @Nullable ClientSession clientSession,
+                                                                       final String databaseName, final Class<TDocument> documentClass,
+                                                                       final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                                                       final ReadPreference readPreference, final ReadConcern readConcern,
+                                                                       final WriteConcern writeConcern, final OperationExecutor executor,
+                                                                       final List<? extends Bson> pipeline,
+                                                                       final AggregationLevel aggregationLevel,
+                                                                       final boolean retryReads) {
+        return new Java8AggregateIterableImpl<TDocument, TResult>(clientSession, databaseName, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(final @Nullable ClientSession clientSession, final String databaseName,
+                                                 final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                 final ReadConcern readConcern, final OperationExecutor executor,
+                                                 final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                 final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        return new Java8ChangeStreamIterableImpl<TResult>(clientSession, databaseName, codecRegistry, readPreference, readConcern, executor,
+                pipeline, resultClass, changeStreamLevel, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                                 final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                 final ReadConcern readConcern, final OperationExecutor executor,
+                                                 final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                 final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        return new Java8ChangeStreamIterableImpl<TResult>(clientSession, namespace, codecRegistry, readPreference, readConcern, executor,
+                pipeline, resultClass, changeStreamLevel, retryReads);
+    }
+
+    @Override
+    public <TDocument, TResult>
+    DistinctIterable<TResult> distinctOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                         final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                         final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                         final ReadConcern readConcern, final OperationExecutor executor, final String fieldName,
+                                         final Bson filter, final boolean retryReads) {
+        return new Java8DistinctIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, fieldName, filter, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ListDatabasesIterable<TResult> listDatabasesOf(final @Nullable ClientSession clientSession, final Class<TResult> resultClass,
+                                                   final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                   final OperationExecutor executor, final boolean retryReads) {
+        return new Java8ListDatabasesIterableImpl<TResult>(clientSession, resultClass, codecRegistry, readPreference, executor, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ListCollectionsIterable<TResult> listCollectionsOf(final @Nullable ClientSession clientSession, final String databaseName,
+                                                       final boolean collectionNamesOnly, final Class<TResult> resultClass,
+                                                       final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                       final OperationExecutor executor, final boolean retryReads) {
+        return new Java8ListCollectionsIterableImpl<TResult>(clientSession, databaseName, collectionNamesOnly, resultClass, codecRegistry,
+                readPreference, executor, retryReads);
+    }
+
+    @Override
+    public <TResult>
+    ListIndexesIterable<TResult> listIndexesOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                               final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                               final ReadPreference readPreference, final OperationExecutor executor,
+                                               final boolean retryReads) {
+        return new Java8ListIndexesIterableImpl<TResult>(clientSession, namespace, resultClass, codecRegistry, readPreference,
+                executor, retryReads);
+    }
+
+    @Override
+    public <TDocument, TResult>
+    MapReduceIterable<TResult> mapReduceOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                           final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                           final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                           final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                                           final String mapFunction, final String reduceFunction) {
+        return new Java8MapReduceIterableImpl<TDocument, TResult>(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, mapFunction, reduceFunction);
+    }
+}
+
diff --git a/driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java b/driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java
new file mode 100644
index 00000000000..e1c786d27e0
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ServerAddress;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+
+class KeyManagementService {
+    private final SSLContext sslContext;
+    private final int defaultPort;
+    private final int timeoutMillis;
+
+    KeyManagementService(final SSLContext sslContext, final int defaultPort, final int timeoutMillis) {
+        this.sslContext = sslContext;
+        this.defaultPort = defaultPort;
+        this.timeoutMillis = timeoutMillis;
+    }
+
+    public InputStream stream(final String host, final ByteBuffer message) throws IOException {
+        ServerAddress serverAddress = host.contains(":") ? new ServerAddress(host) : new ServerAddress(host, defaultPort);
+        Socket socket = sslContext.getSocketFactory().createSocket();
+
+        try {
+            socket.setSoTimeout(timeoutMillis);
+            socket.connect(serverAddress.getSocketAddress(), timeoutMillis);
+        } catch (IOException e) {
+            closeSocket(socket);
+            throw e;
+        }
+
+        try {
+            OutputStream outputStream = socket.getOutputStream();
+
+            byte[] bytes = new byte[message.remaining()];
+
+            message.get(bytes);
+            outputStream.write(bytes);
+        } catch (IOException e) {
+            closeSocket(socket);
+            throw e;
+        }
+
+        try {
+            return socket.getInputStream();
+        } catch (IOException e) {
+            closeSocket(socket);
+            throw e;
+        }
+    }
+
+    public int getDefaultPort() {
+        return defaultPort;
+    }
+
+    private void closeSocket(final Socket socket) {
+        try {
+            socket.close();
+        } catch (IOException e) {
+            // ignore
+        }
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/KeyRetriever.java b/driver-sync/src/main/com/mongodb/client/internal/KeyRetriever.java
new file mode 100644
index 00000000000..d7c2811677c
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/KeyRetriever.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import org.bson.BsonDocument;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+class KeyRetriever implements Closeable {
+    private final SimpleMongoClient client;
+    private final boolean ownsClient;
+    private final MongoNamespace namespace;
+
+    KeyRetriever(final SimpleMongoClient client, final boolean ownsClient, final MongoNamespace namespace) {
+        this.client = notNull("client", client);
+        this.ownsClient = ownsClient;
+        this.namespace = notNull("namespace", namespace);
+    }
+
+    public List<BsonDocument> find(final BsonDocument keyFilter) {
+        return client.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName(), BsonDocument.class)
+                .withReadConcern(ReadConcern.MAJORITY)
+                .find(keyFilter).into(new ArrayList<BsonDocument>());
+    }
+
+    @Override
+    public void close() {
+        if (ownsClient) {
+            client.close();
+        }
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ListCollectionsIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ListCollectionsIterableImpl.java
new file mode 100644
index 00000000000..accefb7d7ac
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ListCollectionsIterableImpl.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ListCollectionsIterable;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.client.ClientSession;
+import org.bson.BsonDocument;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+class ListCollectionsIterableImpl<TResult> extends MongoIterableImpl<TResult> implements ListCollectionsIterable<TResult> {
+    private final SyncOperations<BsonDocument> operations;
+    private final String databaseName;
+    private final Class<TResult> resultClass;
+
+    private Bson filter;
+    private final boolean collectionNamesOnly;
+    private long maxTimeMS;
+
+    ListCollectionsIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final boolean collectionNamesOnly,
+                                final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                final OperationExecutor executor) {
+        this(clientSession, databaseName, collectionNamesOnly, resultClass, codecRegistry, readPreference, executor, true);
+    }
+
+    ListCollectionsIterableImpl(@Nullable final ClientSession clientSession, final String databaseName, final boolean collectionNamesOnly,
+                                final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                final OperationExecutor executor, final boolean retryReads) {
+        super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads); // TODO: read concern?
+        this.collectionNamesOnly = collectionNamesOnly;
+        this.operations = new SyncOperations<BsonDocument>(BsonDocument.class, readPreference, codecRegistry, retryReads);
+        this.databaseName = notNull("databaseName", databaseName);
+        this.resultClass = notNull("resultClass", resultClass);
+    }
+
+    @Override
+    public ListCollectionsIterable<TResult> filter(@Nullable final Bson filter) {
+        notNull("filter", filter);
+        this.filter = filter;
+        return this;
+    }
+
+    @Override
+    public ListCollectionsIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public ListCollectionsIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public ReadOperation<BatchCursor<TResult>> asReadOperation() {
+        return operations.listCollections(databaseName, resultClass, filter, collectionNamesOnly, getBatchSize(), maxTimeMS);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ListDatabasesIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ListDatabasesIterableImpl.java
new file mode 100644
index 00000000000..72c3beb8ffb
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ListDatabasesIterableImpl.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.ListDatabasesIterable;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ReadOperation;
+import org.bson.BsonDocument;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+
+/**
+ * This class is not part of the public API and may be removed or changed at any time.
+ */
+class ListDatabasesIterableImpl<TResult> extends MongoIterableImpl<TResult> implements ListDatabasesIterable<TResult> {
+    private final SyncOperations<BsonDocument> operations;
+    private final Class<TResult> resultClass;
+
+    private long maxTimeMS;
+    private Bson filter;
+    private Boolean nameOnly;
+
+    ListDatabasesIterableImpl(@Nullable final ClientSession clientSession, final Class<TResult> resultClass,
+                              final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                              final OperationExecutor executor) {
+        this(clientSession, resultClass, codecRegistry, readPreference, executor, true);
+    }
+
+    ListDatabasesIterableImpl(@Nullable final ClientSession clientSession, final Class<TResult> resultClass,
+                              final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                              final OperationExecutor executor, final boolean retryReads) {
+        super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads); // TODO: read concern?
+        this.operations = new SyncOperations<BsonDocument>(BsonDocument.class, readPreference, codecRegistry, retryReads);
+        this.resultClass = notNull("clazz", resultClass);
+    }
+
+    @Override
+    public ListDatabasesIterableImpl<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public ListDatabasesIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public ListDatabasesIterable<TResult> filter(@Nullable final Bson filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    @Override
+    public ListDatabasesIterable<TResult> nameOnly(@Nullable final Boolean nameOnly) {
+        this.nameOnly = nameOnly;
+        return this;
+    }
+
+    @Override
+    public ReadOperation<BatchCursor<TResult>> asReadOperation() {
+        return operations.listDatabases(resultClass, filter, nameOnly, maxTimeMS);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/ListIndexesIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/ListIndexesIterableImpl.java
new file mode 100644
index 00000000000..83f6536258b
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/ListIndexesIterableImpl.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.client.ClientSession;
+import org.bson.BsonDocument;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+class ListIndexesIterableImpl<TResult> extends MongoIterableImpl<TResult> implements ListIndexesIterable<TResult> {
+    private final SyncOperations<BsonDocument> operations;
+    private final Class<TResult> resultClass;
+    private long maxTimeMS;
+
+    ListIndexesIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TResult> resultClass,
+                            final CodecRegistry codecRegistry, final ReadPreference readPreference, final OperationExecutor executor) {
+        this(clientSession, namespace, resultClass, codecRegistry, readPreference, executor, true);
+    }
+
+    ListIndexesIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TResult> resultClass,
+                            final CodecRegistry codecRegistry, final ReadPreference readPreference, final OperationExecutor executor,
+                            final boolean retryReads) {
+        super(clientSession, executor, ReadConcern.DEFAULT, readPreference, retryReads);
+        this.operations = new SyncOperations<BsonDocument>(namespace, BsonDocument.class, readPreference, codecRegistry, retryReads);
+        this.resultClass = notNull("resultClass", resultClass);
+    }
+
+    @Override
+    public ListIndexesIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public ListIndexesIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public ReadOperation<BatchCursor<TResult>> asReadOperation() {
+        return operations.listIndexes(resultClass, getBatchSize(), maxTimeMS);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
new file mode 100644
index 00000000000..8919593c9e8
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MapReduceIterableImpl.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.binding.ReadBinding;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.FindOptions;
+import com.mongodb.client.model.MapReduceAction;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.MapReduceBatchCursor;
+import com.mongodb.operation.MapReduceStatistics;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.operation.WriteOperation;
+import com.mongodb.client.ClientSession;
+import org.bson.BsonDocument;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ReadPreference.primary;
+import static com.mongodb.assertions.Assertions.notNull;
+
+class MapReduceIterableImpl<TDocument, TResult> extends MongoIterableImpl<TResult> implements MapReduceIterable<TResult> {
+    private final SyncOperations<TDocument> operations;
+    private final MongoNamespace namespace;
+    private final Class<TResult> resultClass;
+    private final String mapFunction;
+    private final String reduceFunction;
+
+    private boolean inline = true;
+    private String collectionName;
+    private String finalizeFunction;
+    private Bson scope;
+    private Bson filter;
+    private Bson sort;
+    private int limit;
+    private boolean jsMode;
+    private boolean verbose = true;
+    private long maxTimeMS;
+    private MapReduceAction action = MapReduceAction.REPLACE;
+    private String databaseName;
+    private boolean sharded;
+    private boolean nonAtomic;
+    private Boolean bypassDocumentValidation;
+    private Collation collation;
+
+    MapReduceIterableImpl(@Nullable final ClientSession clientSession, final MongoNamespace namespace, final Class<TDocument> documentClass,
+                          final Class<TResult> resultClass, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                          final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                          final String mapFunction, final String reduceFunction) {
+        super(clientSession, executor, readConcern, readPreference, false);
+        this.operations = new SyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                false, false);
+        this.namespace = notNull("namespace", namespace);
+        this.resultClass = notNull("resultClass", resultClass);
+        this.mapFunction = notNull("mapFunction", mapFunction);
+        this.reduceFunction = notNull("reduceFunction", reduceFunction);
+    }
+
+    @Override
+    public void toCollection() {
+        if (inline) {
+            throw new IllegalStateException("The options must specify a non-inline result");
+        }
+
+        getExecutor().execute(createMapReduceToCollectionOperation(), getReadConcern(), getClientSession());
+    }
+
+    @Override
+    public MapReduceIterable<TResult> collectionName(final String collectionName) {
+        this.collectionName = notNull("collectionName", collectionName);
+        this.inline = false;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> finalizeFunction(@Nullable final String finalizeFunction) {
+        this.finalizeFunction = finalizeFunction;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> scope(@Nullable final Bson scope) {
+        this.scope = scope;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> sort(@Nullable final Bson sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> filter(@Nullable final Bson filter) {
+        this.filter = filter;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> limit(final int limit) {
+        this.limit = limit;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> jsMode(final boolean jsMode) {
+        this.jsMode = jsMode;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> verbose(final boolean verbose) {
+        this.verbose = verbose;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
+        notNull("timeUnit", timeUnit);
+        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> action(final MapReduceAction action) {
+        this.action = action;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> databaseName(@Nullable final String databaseName) {
+        this.databaseName = databaseName;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> sharded(final boolean sharded) {
+        this.sharded = sharded;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> nonAtomic(final boolean nonAtomic) {
+        this.nonAtomic = nonAtomic;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> batchSize(final int batchSize) {
+        super.batchSize(batchSize);
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> bypassDocumentValidation(@Nullable final Boolean bypassDocumentValidation) {
+        this.bypassDocumentValidation = bypassDocumentValidation;
+        return this;
+    }
+
+    @Override
+    public MapReduceIterable<TResult> collation(@Nullable final Collation collation) {
+        this.collation = collation;
+        return this;
+    }
+
+    @Override
+    ReadPreference getReadPreference() {
+        if (inline) {
+            return super.getReadPreference();
+        } else {
+            return primary();
+        }
+    }
+
+    @Override
+    public ReadOperation<BatchCursor<TResult>> asReadOperation() {
+        if (inline) {
+            ReadOperation<MapReduceBatchCursor<TResult>> operation = operations.mapReduce(mapFunction, reduceFunction, finalizeFunction,
+                    resultClass, filter, limit, maxTimeMS, jsMode, scope, sort, verbose, collation);
+            return new WrappedMapReduceReadOperation<TResult>(operation);
+        } else {
+            getExecutor().execute(createMapReduceToCollectionOperation(), getReadConcern(), getClientSession());
+
+            String dbName = databaseName != null ? databaseName : namespace.getDatabaseName();
+
+            FindOptions findOptions = new FindOptions().collation(collation);
+            Integer batchSize = getBatchSize();
+            if (batchSize != null) {
+                findOptions.batchSize(batchSize);
+            }
+            return operations.find(new MongoNamespace(dbName, collectionName), new BsonDocument(), resultClass, findOptions);
+        }
+
+    }
+
+    private WriteOperation<MapReduceStatistics> createMapReduceToCollectionOperation() {
+        return operations.mapReduceToCollection(databaseName, collectionName, mapFunction, reduceFunction, finalizeFunction, filter,
+                limit, maxTimeMS, jsMode, scope, sort, verbose, action, nonAtomic, sharded, bypassDocumentValidation, collation
+        );
+    }
+
+    // this could be inlined, but giving it a name so that it's unit-testable
+    static class WrappedMapReduceReadOperation<TResult> implements ReadOperation<BatchCursor<TResult>> {
+        private final ReadOperation<MapReduceBatchCursor<TResult>> operation;
+
+        ReadOperation<MapReduceBatchCursor<TResult>> getOperation() {
+            return operation;
+        }
+
+        WrappedMapReduceReadOperation(final ReadOperation<MapReduceBatchCursor<TResult>> operation) {
+            this.operation = operation;
+        }
+
+        @Override
+        public BatchCursor<TResult> execute(final ReadBinding binding) {
+            return operation.execute(binding);
+        }
+    }
+}
diff --git a/driver/src/main/com/mongodb/MappingIterable.java b/driver-sync/src/main/com/mongodb/client/internal/MappingIterable.java
similarity index 78%
rename from driver/src/main/com/mongodb/MappingIterable.java
rename to driver-sync/src/main/com/mongodb/client/internal/MappingIterable.java
index 5ece4ca2a0e..255c9f996d4 100644
--- a/driver/src/main/com/mongodb/MappingIterable.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MappingIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-package com.mongodb;
+package com.mongodb.client.internal;
 
+import com.mongodb.Block;
+import com.mongodb.Function;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoIterable;
+import com.mongodb.lang.Nullable;
 
 import java.util.Collection;
 
@@ -26,7 +29,7 @@ class MappingIterable<U, V> implements MongoIterable<V> {
     private final MongoIterable<U> iterable;
     private final Function<U, V> mapper;
 
-    public MappingIterable(final MongoIterable<U> iterable, final Function<U, V> mapper) {
+    MappingIterable(final MongoIterable<U> iterable, final Function<U, V> mapper) {
         this.iterable = iterable;
         this.mapper = mapper;
     }
@@ -36,13 +39,19 @@ public MongoCursor<V> iterator() {
         return new MongoMappingCursor<U, V>(iterable.iterator(), mapper);
     }
 
+    @Override
+    public MongoCursor<V> cursor() {
+        return iterator();
+    }
+
+    @Nullable
     @Override
     public V first() {
-        MongoCursor<V> iterator = iterator();
-        if (!iterator.hasNext()) {
+        U first = iterable.first();
+        if (first == null) {
             return null;
         }
-        return iterator.next();
+        return mapper.apply(first);
     }
 
     @Override
@@ -76,4 +85,8 @@ public MappingIterable<U, V> batchSize(final int batchSize) {
     public <W> MongoIterable<W> map(final Function<V, W> newMap) {
         return new MappingIterable<V, W>(this, newMap);
     }
+
+    MongoIterable<U> getMapped() {
+        return iterable;
+    }
 }
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoBatchCursorAdapter.java b/driver-sync/src/main/com/mongodb/client/internal/MongoBatchCursorAdapter.java
new file mode 100644
index 00000000000..26388b6d7bd
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoBatchCursorAdapter.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+/**
+ * This class is not part of the public API and may be removed or changed at any time.
+ *
+ * @param <T> the result type
+ */
+public class MongoBatchCursorAdapter<T> implements MongoCursor<T> {
+    private final BatchCursor<T> batchCursor;
+    private List<T> curBatch;
+    private int curPos;
+
+    public MongoBatchCursorAdapter(final BatchCursor<T> batchCursor) {
+        this.batchCursor = batchCursor;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("Cursors do not support removal");
+    }
+
+    @Override
+    public void close() {
+        batchCursor.close();
+    }
+
+    @Override
+    public boolean hasNext() {
+        return curBatch != null || batchCursor.hasNext();
+    }
+
+    @Override
+    public T next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+
+        if (curBatch == null) {
+            curBatch = batchCursor.next();
+        }
+
+        return getNextInBatch();
+    }
+
+    @Nullable
+    @Override
+    public T tryNext() {
+        if (curBatch == null) {
+            curBatch = batchCursor.tryNext();
+        }
+
+        return curBatch == null ? null : getNextInBatch();
+    }
+
+    @Nullable
+    @Override
+    public ServerCursor getServerCursor() {
+        return batchCursor.getServerCursor();
+    }
+
+    @Override
+    public ServerAddress getServerAddress() {
+        return batchCursor.getServerAddress();
+    }
+
+    private T getNextInBatch() {
+        T nextInBatch = curBatch.get(curPos);
+        if (curPos < curBatch.size() - 1) {
+            curPos++;
+        } else {
+            curBatch = null;
+            curPos = 0;
+        }
+        return nextInBatch;
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoChangeStreamCursorImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoChangeStreamCursorImpl.java
new file mode 100644
index 00000000000..358459c000d
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoChangeStreamCursorImpl.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
+import com.mongodb.client.MongoChangeStreamCursor;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.AggregateResponseBatchCursor;
+import com.mongodb.operation.BatchCursor;
+import org.bson.BsonDocument;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.Decoder;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class MongoChangeStreamCursorImpl<T> implements MongoChangeStreamCursor<T> {
+    private final AggregateResponseBatchCursor<RawBsonDocument> batchCursor;
+    private final Decoder<T> decoder;
+    private List<RawBsonDocument> curBatch;
+    private int curPos;
+    private BsonDocument resumeToken;
+
+    public MongoChangeStreamCursorImpl(final BatchCursor<RawBsonDocument> batchCursor, final Decoder<T> decoder,
+                                       @Nullable final BsonDocument initialResumeToken) {
+        this.batchCursor = (AggregateResponseBatchCursor<RawBsonDocument>) batchCursor;
+        this.decoder = decoder;
+        this.resumeToken = initialResumeToken;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("Cursors do not support removal");
+    }
+
+    @Override
+    public void close() {
+        batchCursor.close();
+    }
+
+    @Override
+    public boolean hasNext() {
+        return curBatch != null || batchCursor.hasNext();
+    }
+
+    @Override
+    public T next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+
+        if (curBatch == null) {
+            curBatch = batchCursor.next();
+        }
+
+        return getNextInBatch();
+    }
+
+    @Nullable
+    @Override
+    public T tryNext() {
+        if (curBatch == null) {
+            curBatch = batchCursor.tryNext();
+        }
+
+        if (curBatch == null) {
+            if (batchCursor.getPostBatchResumeToken() != null) {
+                resumeToken = batchCursor.getPostBatchResumeToken();
+            }
+        }
+
+        return curBatch == null ? null : getNextInBatch();
+    }
+
+    @Nullable
+    @Override
+    public ServerCursor getServerCursor() {
+        return batchCursor.getServerCursor();
+    }
+
+    @Override
+    public ServerAddress getServerAddress() {
+        return batchCursor.getServerAddress();
+    }
+
+    private T getNextInBatch() {
+        RawBsonDocument nextInBatch = curBatch.get(curPos);
+        resumeToken = nextInBatch.getDocument("_id");
+        if (curPos < curBatch.size() - 1) {
+            curPos++;
+        } else {
+            curBatch = null;
+            curPos = 0;
+            if (batchCursor.getPostBatchResumeToken() != null) {
+                resumeToken = batchCursor.getPostBatchResumeToken();
+            }
+        }
+
+        return nextInBatch.decode(decoder);
+    }
+
+    @Nullable
+    public BsonDocument getResumeToken() {
+        return resumeToken;
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClientDelegate.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClientDelegate.java
new file mode 100644
index 00000000000..254ce3e55d4
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClientDelegate.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoQueryException;
+import com.mongodb.MongoSocketException;
+import com.mongodb.MongoTimeoutException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.binding.ClusterBinding;
+import com.mongodb.binding.ReadBinding;
+import com.mongodb.binding.ReadWriteBinding;
+import com.mongodb.binding.WriteBinding;
+import com.mongodb.client.ClientSession;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.binding.ClusterAwareReadWriteBinding;
+import com.mongodb.internal.session.ServerSessionPool;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.operation.WriteOperation;
+import com.mongodb.selector.ServerSelector;
+import org.bson.codecs.configuration.CodecRegistry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.mongodb.MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL;
+import static com.mongodb.MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL;
+import static com.mongodb.ReadPreference.primary;
+import static com.mongodb.assertions.Assertions.isTrue;
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * This class is not part of the public API and may be removed or changed at any time.
+ */
+public class MongoClientDelegate {
+    private final Cluster cluster;
+    private final ServerSessionPool serverSessionPool;
+    private final List<MongoCredential> credentialList;
+    private final Object originator;
+    private final OperationExecutor operationExecutor;
+    private final Crypt crypt;
+    private final CodecRegistry codecRegistry;
+
+    public MongoClientDelegate(final Cluster cluster, final CodecRegistry codecRegistry, final List<MongoCredential> credentialList,
+                               final Object originator, @Nullable final Crypt crypt) {
+        this(cluster, codecRegistry, credentialList, originator, null, crypt);
+    }
+
+    MongoClientDelegate(final Cluster cluster, final CodecRegistry codecRegistry, final List<MongoCredential> credentialList,
+                        final Object originator, @Nullable final OperationExecutor operationExecutor,
+                        @Nullable final Crypt crypt) {
+        this.cluster = cluster;
+        this.codecRegistry = codecRegistry;
+        this.serverSessionPool = new ServerSessionPool(cluster);
+        this.credentialList = credentialList;
+        this.originator = originator;
+        this.operationExecutor = operationExecutor == null ? new DelegateOperationExecutor() : operationExecutor;
+        this.crypt = crypt;
+    }
+
+    public OperationExecutor getOperationExecutor() {
+        return operationExecutor;
+    }
+
+    @Nullable
+    public ClientSession createClientSession(final ClientSessionOptions options, final ReadConcern readConcern,
+                                             final WriteConcern writeConcern, final ReadPreference readPreference) {
+        notNull("readConcern", readConcern);
+        notNull("writeConcern", writeConcern);
+        notNull("readPreference", readPreference);
+
+        if (credentialList.size() > 1) {
+            return null;
+        }
+
+        ClusterDescription connectedClusterDescription = getConnectedClusterDescription();
+
+        if (connectedClusterDescription.getType() == ClusterType.STANDALONE
+                || connectedClusterDescription.getLogicalSessionTimeoutMinutes() == null) {
+            return null;
+        } else {
+            ClientSessionOptions mergedOptions = ClientSessionOptions.builder(options)
+                    .defaultTransactionOptions(
+                            TransactionOptions.merge(
+                                    options.getDefaultTransactionOptions(),
+                                    TransactionOptions.builder()
+                                            .readConcern(readConcern)
+                                            .writeConcern(writeConcern)
+                                            .readPreference(readPreference)
+                                            .build()))
+                    .build();
+            return new ClientSessionImpl(serverSessionPool, originator, mergedOptions, this);
+        }
+    }
+
+    public List<ServerAddress> getServerAddressList() {
+        List<ServerAddress> serverAddresses = new ArrayList<ServerAddress>();
+        for (final ServerDescription cur : cluster.getDescription().getServerDescriptions()) {
+            serverAddresses.add(cur.getAddress());
+        }
+        return serverAddresses;
+    }
+
+    public void close() {
+        if (crypt != null) {
+            crypt.close();
+        }
+        serverSessionPool.close();
+        cluster.close();
+    }
+
+    public Cluster getCluster() {
+        return cluster;
+    }
+
+    public CodecRegistry getCodecRegistry() {
+        return codecRegistry;
+    }
+
+    public ServerSessionPool getServerSessionPool() {
+        return serverSessionPool;
+    }
+
+    private ClusterDescription getConnectedClusterDescription() {
+        ClusterDescription clusterDescription = cluster.getDescription();
+        if (getServerDescriptionListToConsiderForSessionSupport(clusterDescription).isEmpty()) {
+            cluster.selectServer(new ServerSelector() {
+                @Override
+                public List<ServerDescription> select(final ClusterDescription clusterDescription) {
+                    return getServerDescriptionListToConsiderForSessionSupport(clusterDescription);
+                }
+            });
+            clusterDescription = cluster.getDescription();
+        }
+        return clusterDescription;
+    }
+
+    @SuppressWarnings("deprecation")
+    private List<ServerDescription> getServerDescriptionListToConsiderForSessionSupport(final ClusterDescription clusterDescription) {
+        if (clusterDescription.getConnectionMode() == ClusterConnectionMode.SINGLE) {
+            return clusterDescription.getAny();
+        } else {
+            return clusterDescription.getAnyPrimaryOrSecondary();
+        }
+    }
+
+    private class DelegateOperationExecutor implements OperationExecutor {
+        @Override
+        public <T> T execute(final ReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern) {
+            return execute(operation, readPreference, readConcern, null);
+        }
+
+        @Override
+        public <T> T execute(final WriteOperation<T> operation, final ReadConcern readConcern) {
+            return execute(operation, readConcern, null);
+        }
+
+        @Override
+        public <T> T execute(final ReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern,
+                             @Nullable final ClientSession session) {
+            ClientSession actualClientSession = getClientSession(session);
+            ReadBinding binding = getReadBinding(readPreference, readConcern, actualClientSession,
+                    session == null && actualClientSession != null);
+
+            try {
+                if (session != null && session.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) {
+                    throw new MongoClientException("Read preference in a transaction must be primary");
+                }
+                return operation.execute(binding);
+            } catch (MongoException e) {
+                labelException(session, e);
+                unpinServerAddressOnTransientTransactionError(session, e);
+                throw e;
+            } finally {
+                binding.release();
+            }
+        }
+
+        @Override
+        public <T> T execute(final WriteOperation<T> operation, final ReadConcern readConcern, @Nullable final ClientSession session) {
+            ClientSession actualClientSession = getClientSession(session);
+            WriteBinding binding = getWriteBinding(readConcern, actualClientSession,
+                    session == null && actualClientSession != null);
+
+            try {
+                return operation.execute(binding);
+            } catch (MongoException e) {
+                labelException(session, e);
+                unpinServerAddressOnTransientTransactionError(session, e);
+                throw e;
+            } finally {
+                binding.release();
+            }
+        }
+
+        WriteBinding getWriteBinding(final ReadConcern readConcern, @Nullable final ClientSession session, final boolean ownsSession) {
+            return getReadWriteBinding(primary(), readConcern, session, ownsSession);
+        }
+
+        ReadBinding getReadBinding(final ReadPreference readPreference, final ReadConcern readConcern,
+                                   @Nullable final ClientSession session, final boolean ownsSession) {
+            return getReadWriteBinding(readPreference, readConcern, session, ownsSession);
+        }
+
+        ReadWriteBinding getReadWriteBinding(final ReadPreference readPreference, final ReadConcern readConcern,
+                                             @Nullable final ClientSession session, final boolean ownsSession) {
+            ClusterAwareReadWriteBinding readWriteBinding = new ClusterBinding(cluster,
+                    getReadPreferenceForBinding(readPreference, session), readConcern);
+
+            if (crypt != null) {
+                readWriteBinding = new CryptBinding(readWriteBinding, crypt);
+            }
+
+            if (session != null) {
+                return new ClientSessionBinding(session, ownsSession, readWriteBinding);
+            } else {
+                return readWriteBinding;
+            }
+        }
+
+        private void labelException(final @Nullable ClientSession session, final MongoException e) {
+            if (session != null && session.hasActiveTransaction()
+                    && (e instanceof MongoSocketException || e instanceof MongoTimeoutException
+                    || (e instanceof MongoQueryException && e.getCode() == 91))
+                    && !e.hasErrorLabel(UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)) {
+                e.addLabel(TRANSIENT_TRANSACTION_ERROR_LABEL);
+            }
+        }
+
+        private void unpinServerAddressOnTransientTransactionError(final @Nullable ClientSession session, final MongoException e) {
+            if (session != null && e.hasErrorLabel(TRANSIENT_TRANSACTION_ERROR_LABEL)) {
+                session.setPinnedServerAddress(null);
+            }
+        }
+
+        private ReadPreference getReadPreferenceForBinding(final ReadPreference readPreference, @Nullable final ClientSession session) {
+            if (session == null) {
+                return readPreference;
+            }
+            if (session.hasActiveTransaction()) {
+                ReadPreference readPreferenceForBinding = session.getTransactionOptions().getReadPreference();
+                if (readPreferenceForBinding == null) {
+                    throw new MongoInternalException("Invariant violated.  Transaction options read preference can not be null");
+                }
+                return readPreferenceForBinding;
+            }
+            return readPreference;
+        }
+
+        @Nullable
+        ClientSession getClientSession(@Nullable final ClientSession clientSessionFromOperation) {
+            ClientSession session;
+            if (clientSessionFromOperation != null) {
+                isTrue("ClientSession from same MongoClient", clientSessionFromOperation.getOriginator() == originator);
+                session = clientSessionFromOperation;
+            } else {
+                session = createClientSession(ClientSessionOptions.builder().causallyConsistent(false).build(), ReadConcern.DEFAULT,
+                        WriteConcern.ACKNOWLEDGED, ReadPreference.primary());
+            }
+            return session;
+        }
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java
new file mode 100644
index 00000000000..8ea7dbf2488
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoClientImpl.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.Function;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoDriverInformation;
+import com.mongodb.ReadPreference;
+import com.mongodb.TransactionOptions;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.ListDatabasesIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.MongoIterable;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.connection.Cluster;
+import com.mongodb.connection.ClusterDescription;
+import com.mongodb.connection.DefaultClusterFactory;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SocketStreamFactory;
+import com.mongodb.connection.StreamFactory;
+import com.mongodb.connection.StreamFactoryFactory;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static org.bson.internal.CodecRegistryHelper.createRegistry;
+import static com.mongodb.client.internal.Crypts.createCrypt;
+import static com.mongodb.internal.event.EventListenerHelper.getCommandListener;
+import static java.util.Collections.singletonList;
+
+public final class MongoClientImpl implements MongoClient {
+
+    private final MongoClientSettings settings;
+    private final MongoClientDelegate delegate;
+
+    public MongoClientImpl(final MongoClientSettings settings, @Nullable final MongoDriverInformation mongoDriverInformation) {
+        this(createCluster(settings, mongoDriverInformation), settings, null);
+    }
+
+    public MongoClientImpl(final Cluster cluster, final MongoClientSettings settings,
+                           @Nullable final OperationExecutor operationExecutor) {
+        this.settings = notNull("settings", settings);
+        AutoEncryptionSettings autoEncryptionSettings = settings.getAutoEncryptionSettings();
+        this.delegate = new MongoClientDelegate(notNull("cluster", cluster),
+                createRegistry(settings.getCodecRegistry(), settings.getUuidRepresentation()),
+                singletonList(settings.getCredential()), this, operationExecutor,
+                autoEncryptionSettings == null ? null : createCrypt(SimpleMongoClients.create(this), autoEncryptionSettings));
+    }
+
+    @Override
+    public MongoDatabase getDatabase(final String databaseName) {
+        return new MongoDatabaseImpl(databaseName, delegate.getCodecRegistry(), settings.getReadPreference(), settings.getWriteConcern(),
+                settings.getRetryWrites(), settings.getRetryReads(), settings.getReadConcern(),
+                settings.getUuidRepresentation(), delegate.getOperationExecutor());
+    }
+
+    @Override
+    public MongoIterable<String> listDatabaseNames() {
+        return createListDatabaseNamesIterable(null);
+    }
+
+    @Override
+    public MongoIterable<String> listDatabaseNames(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return createListDatabaseNamesIterable(clientSession);
+    }
+
+    @Override
+    public ListDatabasesIterable<Document> listDatabases() {
+        return listDatabases(Document.class);
+    }
+
+    @Override
+    public <T> ListDatabasesIterable<T> listDatabases(final Class<T> clazz) {
+        return createListDatabasesIterable(null, clazz);
+    }
+
+    @Override
+    public ListDatabasesIterable<Document> listDatabases(final ClientSession clientSession) {
+        return listDatabases(clientSession, Document.class);
+    }
+
+    @Override
+    public <T> ListDatabasesIterable<T> listDatabases(final ClientSession clientSession, final Class<T> clazz) {
+        notNull("clientSession", clientSession);
+        return createListDatabasesIterable(clientSession, clazz);
+    }
+
+    @Override
+    public ClientSession startSession() {
+        return startSession(ClientSessionOptions
+                .builder()
+                .defaultTransactionOptions(TransactionOptions.builder()
+                        .readConcern(settings.getReadConcern())
+                        .writeConcern(settings.getWriteConcern())
+                        .build())
+                .build());
+    }
+
+    @Override
+    public ClientSession startSession(final ClientSessionOptions options) {
+        ClientSession clientSession = delegate.createClientSession(notNull("options", options),
+                settings.getReadConcern(), settings.getWriteConcern(), settings.getReadPreference());
+        if (clientSession == null) {
+            throw new MongoClientException("Sessions are not supported by the MongoDB cluster to which this client is connected");
+        }
+        return clientSession;
+    }
+
+    @Override
+    public void close() {
+        delegate.close();
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch() {
+        return watch(Collections.<Bson>emptyList());
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final Class<TResult> resultClass) {
+        return watch(Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final List<? extends Bson> pipeline) {
+        return watch(pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createChangeStreamIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession) {
+        return watch(clientSession, Collections.<Bson>emptyList(), Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return watch(clientSession, Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return watch(clientSession, pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                         final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createChangeStreamIterable(clientSession, pipeline, resultClass);
+    }
+
+    @Override
+    public ClusterDescription getClusterDescription() {
+        return delegate.getCluster().getCurrentDescription();
+    }
+
+    private <TResult> ChangeStreamIterable<TResult> createChangeStreamIterable(@Nullable final ClientSession clientSession,
+                                                                               final List<? extends Bson> pipeline,
+                                                                               final Class<TResult> resultClass) {
+        return MongoIterables.changeStreamOf(clientSession, "admin", settings.getCodecRegistry(),
+                settings.getReadPreference(), settings.getReadConcern(), delegate.getOperationExecutor(), pipeline, resultClass,
+                ChangeStreamLevel.CLIENT, settings.getRetryReads());
+    }
+
+    public Cluster getCluster() {
+        return delegate.getCluster();
+    }
+
+    public CodecRegistry getCodecRegistry() {
+        return delegate.getCodecRegistry();
+    }
+
+    private static Cluster createCluster(final MongoClientSettings settings,
+                                         @Nullable final MongoDriverInformation mongoDriverInformation) {
+        notNull("settings", settings);
+        List<MongoCredential> credentialList = settings.getCredential() != null ? singletonList(settings.getCredential())
+                : Collections.<MongoCredential>emptyList();
+        return new DefaultClusterFactory().createCluster(settings.getClusterSettings(), settings.getServerSettings(),
+                settings.getConnectionPoolSettings(), getStreamFactory(settings, false), getStreamFactory(settings, true), credentialList,
+                getCommandListener(settings.getCommandListeners()), settings.getApplicationName(), mongoDriverInformation,
+                settings.getCompressorList());
+    }
+
+    private static StreamFactory getStreamFactory(final MongoClientSettings settings, final boolean isHeartbeat) {
+        StreamFactoryFactory streamFactoryFactory = settings.getStreamFactoryFactory();
+        SocketSettings socketSettings = isHeartbeat ? settings.getHeartbeatSocketSettings() : settings.getSocketSettings();
+        if (streamFactoryFactory == null) {
+            return new SocketStreamFactory(socketSettings, settings.getSslSettings());
+        } else {
+            return streamFactoryFactory.create(socketSettings, settings.getSslSettings());
+        }
+    }
+
+    private <T> ListDatabasesIterable<T> createListDatabasesIterable(@Nullable final ClientSession clientSession, final Class<T> clazz) {
+        return MongoIterables.listDatabasesOf(clientSession, clazz, delegate.getCodecRegistry(),
+                ReadPreference.primary(), delegate.getOperationExecutor(), settings.getRetryReads());
+    }
+
+    private MongoIterable<String> createListDatabaseNamesIterable(final @Nullable ClientSession clientSession) {
+        return createListDatabasesIterable(clientSession, BsonDocument.class).nameOnly(true).map(new Function<BsonDocument, String>() {
+            @Override
+            public String apply(final BsonDocument result) {
+                return result.getString("name").getValue();
+            }
+        });
+    }
+}
+
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java
new file mode 100755
index 00000000000..b59253ccedd
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java
@@ -0,0 +1,1091 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoBulkWriteException;
+import com.mongodb.MongoInternalException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoWriteConcernException;
+import com.mongodb.MongoWriteException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.WriteConcernResult;
+import com.mongodb.WriteError;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.bulk.WriteRequest;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.DistinctIterable;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.CreateIndexOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropIndexOptions;
+import com.mongodb.client.model.EstimatedDocumentCountOptions;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.IndexModel;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.InsertManyOptions;
+import com.mongodb.client.model.InsertOneOptions;
+import com.mongodb.client.model.RenameCollectionOptions;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.internal.client.model.CountStrategy;
+import com.mongodb.internal.operation.IndexHelper;
+import com.mongodb.internal.operation.SyncOperations;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.RenameCollectionOperation;
+import com.mongodb.operation.WriteOperation;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.assertions.Assertions.notNull;
+import static com.mongodb.bulk.WriteRequest.Type.DELETE;
+import static com.mongodb.bulk.WriteRequest.Type.INSERT;
+import static com.mongodb.bulk.WriteRequest.Type.REPLACE;
+import static com.mongodb.bulk.WriteRequest.Type.UPDATE;
+import static org.bson.internal.CodecRegistryHelper.createRegistry;
+import static com.mongodb.client.model.ReplaceOptions.createReplaceOptions;
+import static com.mongodb.internal.client.model.CountOptionsHelper.fromEstimatedDocumentCountOptions;
+import static java.util.Collections.singletonList;
+
+class MongoCollectionImpl<TDocument> implements MongoCollection<TDocument> {
+    private final MongoNamespace namespace;
+    private final Class<TDocument> documentClass;
+    private final ReadPreference readPreference;
+    private final CodecRegistry codecRegistry;
+    private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private final boolean retryReads;
+    private final ReadConcern readConcern;
+    private final SyncOperations<TDocument> operations;
+    private final UuidRepresentation uuidRepresentation;
+    private final OperationExecutor executor;
+
+    MongoCollectionImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final CodecRegistry codecRegistry,
+                        final ReadPreference readPreference, final WriteConcern writeConcern, final boolean retryWrites,
+                        final boolean retryReads, final ReadConcern readConcern, final UuidRepresentation uuidRepresentation,
+                        final OperationExecutor executor) {
+        this.namespace = notNull("namespace", namespace);
+        this.documentClass = notNull("documentClass", documentClass);
+        this.codecRegistry = notNull("codecRegistry", codecRegistry);
+        this.readPreference = notNull("readPreference", readPreference);
+        this.writeConcern = notNull("writeConcern", writeConcern);
+        this.retryWrites = retryWrites;
+        this.retryReads = retryReads;
+        this.readConcern = notNull("readConcern", readConcern);
+        this.executor = notNull("executor", executor);
+        this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
+        this.operations = new SyncOperations<TDocument>(namespace, documentClass, readPreference, codecRegistry, readConcern, writeConcern,
+                retryWrites, retryReads);
+    }
+
+    @Override
+    public MongoNamespace getNamespace() {
+        return namespace;
+    }
+
+    @Override
+    public Class<TDocument> getDocumentClass() {
+        return documentClass;
+    }
+
+    @Override
+    public CodecRegistry getCodecRegistry() {
+        return codecRegistry;
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    @Override
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    @Override
+    public <NewTDocument> MongoCollection<NewTDocument> withDocumentClass(final Class<NewTDocument> clazz) {
+        return new MongoCollectionImpl<NewTDocument>(namespace, clazz, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoCollection<TDocument> withCodecRegistry(final CodecRegistry codecRegistry) {
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, createRegistry(codecRegistry, uuidRepresentation),
+                readPreference, writeConcern, retryWrites, retryReads, readConcern, uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoCollection<TDocument> withReadPreference(final ReadPreference readPreference) {
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoCollection<TDocument> withWriteConcern(final WriteConcern writeConcern) {
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoCollection<TDocument> withReadConcern(final ReadConcern readConcern) {
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public long count() {
+        return count(new BsonDocument(), new CountOptions());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public long count(final Bson filter) {
+        return count(filter, new CountOptions());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public long count(final Bson filter, final CountOptions options) {
+        return executeCount(null, filter, options, CountStrategy.COMMAND);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public long count(final ClientSession clientSession) {
+        return count(clientSession, new BsonDocument());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public long count(final ClientSession clientSession, final Bson filter) {
+        return count(clientSession, filter, new CountOptions());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public long count(final ClientSession clientSession, final Bson filter, final CountOptions options) {
+        notNull("clientSession", clientSession);
+        return executeCount(clientSession, filter, options, CountStrategy.COMMAND);
+    }
+
+    @Override
+    public long countDocuments() {
+        return countDocuments(new BsonDocument());
+    }
+
+    @Override
+    public long countDocuments(final Bson filter) {
+        return countDocuments(filter, new CountOptions());
+    }
+
+    @Override
+    public long countDocuments(final Bson filter, final CountOptions options) {
+        return executeCount(null, filter, options, CountStrategy.AGGREGATE);
+    }
+
+    @Override
+    public long countDocuments(final ClientSession clientSession) {
+        return countDocuments(clientSession, new BsonDocument());
+    }
+
+    @Override
+    public long countDocuments(final ClientSession clientSession, final Bson filter) {
+        return countDocuments(clientSession, filter, new CountOptions());
+    }
+
+    @Override
+    public long countDocuments(final ClientSession clientSession, final Bson filter, final CountOptions options) {
+        notNull("clientSession", clientSession);
+        return executeCount(clientSession, filter, options, CountStrategy.AGGREGATE);
+    }
+
+    @Override
+    public long estimatedDocumentCount() {
+        return estimatedDocumentCount(new EstimatedDocumentCountOptions());
+    }
+
+    @Override
+    public long estimatedDocumentCount(final EstimatedDocumentCountOptions options) {
+        return executeCount(null, new BsonDocument(), fromEstimatedDocumentCountOptions(options), CountStrategy.COMMAND);
+    }
+
+    private long executeCount(@Nullable final ClientSession clientSession, final Bson filter, final CountOptions options,
+                              final CountStrategy countStrategy) {
+        return executor.execute(operations.count(filter, options, countStrategy), readPreference, readConcern, clientSession);
+    }
+
+    @Override
+    public <TResult> DistinctIterable<TResult> distinct(final String fieldName, final Class<TResult> resultClass) {
+        return distinct(fieldName, new BsonDocument(), resultClass);
+    }
+
+    @Override
+    public <TResult> DistinctIterable<TResult> distinct(final String fieldName, final Bson filter, final Class<TResult> resultClass) {
+        return createDistinctIterable(null, fieldName, filter, resultClass);
+    }
+
+    @Override
+    public <TResult> DistinctIterable<TResult> distinct(final ClientSession clientSession, final String fieldName,
+                                                        final Class<TResult> resultClass) {
+        return distinct(clientSession, fieldName, new BsonDocument(), resultClass);
+    }
+
+    @Override
+    public <TResult> DistinctIterable<TResult> distinct(final ClientSession clientSession, final String fieldName, final Bson filter,
+                                                        final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createDistinctIterable(clientSession, fieldName, filter, resultClass);
+    }
+
+    private <TResult> DistinctIterable<TResult> createDistinctIterable(@Nullable final ClientSession clientSession, final String fieldName,
+                                                                       final Bson filter, final Class<TResult> resultClass) {
+        return MongoIterables.distinctOf(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, fieldName, filter, retryReads);
+    }
+
+    @Override
+    public FindIterable<TDocument> find() {
+        return find(new BsonDocument(), documentClass);
+    }
+
+    @Override
+    public <TResult> FindIterable<TResult> find(final Class<TResult> resultClass) {
+        return find(new BsonDocument(), resultClass);
+    }
+
+    @Override
+    public FindIterable<TDocument> find(final Bson filter) {
+        return find(filter, documentClass);
+    }
+
+    @Override
+    public <TResult> FindIterable<TResult> find(final Bson filter, final Class<TResult> resultClass) {
+        return createFindIterable(null, filter, resultClass);
+    }
+
+    @Override
+    public FindIterable<TDocument> find(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return find(clientSession, new BsonDocument(), documentClass);
+    }
+
+    @Override
+    public <TResult> FindIterable<TResult> find(final ClientSession clientSession, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return find(clientSession, new BsonDocument(), resultClass);
+    }
+
+    @Override
+    public FindIterable<TDocument> find(final ClientSession clientSession, final Bson filter) {
+        notNull("clientSession", clientSession);
+        return find(clientSession, filter, documentClass);
+    }
+
+    @Override
+    public <TResult> FindIterable<TResult> find(final ClientSession clientSession, final Bson filter,
+                                                final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createFindIterable(clientSession, filter, resultClass);
+    }
+
+    private <TResult> FindIterable<TResult> createFindIterable(@Nullable final ClientSession clientSession, final Bson filter,
+                                                               final Class<TResult> resultClass) {
+        return MongoIterables.findOf(clientSession, namespace, this.documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, filter, retryReads);
+    }
+
+    @Override
+    public AggregateIterable<TDocument> aggregate(final List<? extends Bson> pipeline) {
+        return aggregate(pipeline, documentClass);
+    }
+
+    @Override
+    public <TResult> AggregateIterable<TResult> aggregate(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createAggregateIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public AggregateIterable<TDocument> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return aggregate(clientSession, pipeline, documentClass);
+    }
+
+    @Override
+    public <TResult> AggregateIterable<TResult> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                          final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createAggregateIterable(clientSession, pipeline, resultClass);
+    }
+
+    private <TResult> AggregateIterable<TResult> createAggregateIterable(@Nullable final ClientSession clientSession,
+                                                                         final List<? extends Bson> pipeline,
+                                                                         final Class<TResult> resultClass) {
+        return MongoIterables.aggregateOf(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, retryReads);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch() {
+        return watch(Collections.<Bson>emptyList());
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final Class<TResult> resultClass) {
+        return watch(Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch(final List<? extends Bson> pipeline) {
+        return watch(pipeline, documentClass);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createChangeStreamIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch(final ClientSession clientSession) {
+        return watch(clientSession, Collections.<Bson>emptyList(), documentClass);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return watch(clientSession, Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<TDocument> watch(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return watch(clientSession, pipeline, documentClass);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                         final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createChangeStreamIterable(clientSession, pipeline, resultClass);
+    }
+
+    private <TResult> ChangeStreamIterable<TResult> createChangeStreamIterable(@Nullable final ClientSession clientSession,
+                                                                               final List<? extends Bson> pipeline,
+                                                                               final Class<TResult> resultClass) {
+        return MongoIterables.changeStreamOf(clientSession, namespace, codecRegistry, readPreference, readConcern, executor,
+                pipeline, resultClass, ChangeStreamLevel.COLLECTION, retryReads);
+    }
+
+    @Override
+    public MapReduceIterable<TDocument> mapReduce(final String mapFunction, final String reduceFunction) {
+        return mapReduce(mapFunction, reduceFunction, documentClass);
+    }
+
+    @Override
+    public <TResult> MapReduceIterable<TResult> mapReduce(final String mapFunction, final String reduceFunction,
+                                                          final Class<TResult> resultClass) {
+        return createMapReduceIterable(null, mapFunction, reduceFunction, resultClass);
+    }
+
+    @Override
+    public MapReduceIterable<TDocument> mapReduce(final ClientSession clientSession, final String mapFunction,
+                                                  final String reduceFunction) {
+        return mapReduce(clientSession, mapFunction, reduceFunction, documentClass);
+    }
+
+    @Override
+    public <TResult> MapReduceIterable<TResult> mapReduce(final ClientSession clientSession, final String mapFunction,
+                                                          final String reduceFunction, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createMapReduceIterable(clientSession, mapFunction, reduceFunction, resultClass);
+    }
+
+    private <TResult> MapReduceIterable<TResult> createMapReduceIterable(@Nullable final ClientSession clientSession,
+                                                                         final String mapFunction, final String reduceFunction,
+                                                                         final Class<TResult> resultClass) {
+        return MongoIterables.mapReduceOf(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, mapFunction, reduceFunction);
+    }
+
+    @Override
+    public BulkWriteResult bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests) {
+        return bulkWrite(requests, new BulkWriteOptions());
+    }
+
+    @Override
+    public BulkWriteResult bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests, final BulkWriteOptions options) {
+        return executeBulkWrite(null, requests, options);
+    }
+
+    @Override
+    public BulkWriteResult bulkWrite(final ClientSession clientSession, final List<? extends WriteModel<? extends TDocument>> requests) {
+        return bulkWrite(clientSession, requests, new BulkWriteOptions());
+    }
+
+    @Override
+    public BulkWriteResult bulkWrite(final ClientSession clientSession, final List<? extends WriteModel<? extends TDocument>> requests,
+                                     final BulkWriteOptions options) {
+        notNull("clientSession", clientSession);
+        return executeBulkWrite(clientSession, requests, options);
+    }
+
+    @SuppressWarnings("unchecked")
+    private BulkWriteResult executeBulkWrite(@Nullable final ClientSession clientSession,
+                                             final List<? extends WriteModel<? extends TDocument>> requests,
+                                             final BulkWriteOptions options) {
+        notNull("requests", requests);
+        return executor.execute(operations.bulkWrite(requests, options), readConcern, clientSession);
+    }
+
+    @Override
+    public void insertOne(final TDocument document) {
+        insertOne(document, new InsertOneOptions());
+    }
+
+    @Override
+    public void insertOne(final TDocument document, final InsertOneOptions options) {
+        notNull("document", document);
+        executeInsertOne(null, document, options);
+    }
+
+    @Override
+    public void insertOne(final ClientSession clientSession, final TDocument document) {
+        insertOne(clientSession, document, new InsertOneOptions());
+    }
+
+    @Override
+    public void insertOne(final ClientSession clientSession, final TDocument document, final InsertOneOptions options) {
+        notNull("clientSession", clientSession);
+        notNull("document", document);
+        executeInsertOne(clientSession, document, options);
+    }
+
+    private void executeInsertOne(@Nullable final ClientSession clientSession, final TDocument document, final InsertOneOptions options) {
+        executeSingleWriteRequest(clientSession, operations.insertOne(document, options), INSERT);
+    }
+
+    @Override
+    public void insertMany(final List<? extends TDocument> documents) {
+        insertMany(documents, new InsertManyOptions());
+    }
+
+    @Override
+    public void insertMany(final List<? extends TDocument> documents, final InsertManyOptions options) {
+        executeInsertMany(null, documents, options);
+    }
+
+    @Override
+    public void insertMany(final ClientSession clientSession, final List<? extends TDocument> documents) {
+        insertMany(clientSession, documents, new InsertManyOptions());
+    }
+
+    @Override
+    public void insertMany(final ClientSession clientSession, final List<? extends TDocument> documents, final InsertManyOptions options) {
+        notNull("clientSession", clientSession);
+        executeInsertMany(clientSession, documents, options);
+    }
+
+    private void executeInsertMany(@Nullable final ClientSession clientSession, final List<? extends TDocument> documents,
+                                   final InsertManyOptions options) {
+        executor.execute(operations.insertMany(documents, options), readConcern, clientSession);
+    }
+
+    @Override
+    public DeleteResult deleteOne(final Bson filter) {
+        return deleteOne(filter, new DeleteOptions());
+    }
+
+    @Override
+    public DeleteResult deleteOne(final Bson filter, final DeleteOptions options) {
+        return executeDelete(null, filter, options, false);
+    }
+
+    @Override
+    public DeleteResult deleteOne(final ClientSession clientSession, final Bson filter) {
+        return deleteOne(clientSession, filter, new DeleteOptions());
+    }
+
+    @Override
+    public DeleteResult deleteOne(final ClientSession clientSession, final Bson filter, final DeleteOptions options) {
+        notNull("clientSession", clientSession);
+        return executeDelete(clientSession, filter, options, false);
+    }
+
+    @Override
+    public DeleteResult deleteMany(final Bson filter) {
+        return deleteMany(filter, new DeleteOptions());
+    }
+
+    @Override
+    public DeleteResult deleteMany(final Bson filter, final DeleteOptions options) {
+        return executeDelete(null, filter, options, true);
+    }
+
+    @Override
+    public DeleteResult deleteMany(final ClientSession clientSession, final Bson filter) {
+        return deleteMany(clientSession, filter, new DeleteOptions());
+    }
+
+    @Override
+    public DeleteResult deleteMany(final ClientSession clientSession, final Bson filter, final DeleteOptions options) {
+        notNull("clientSession", clientSession);
+        return executeDelete(clientSession, filter, options, true);
+    }
+
+    @Override
+    public UpdateResult replaceOne(final Bson filter, final TDocument replacement) {
+        return replaceOne(filter, replacement, new ReplaceOptions());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public UpdateResult replaceOne(final Bson filter, final TDocument replacement, final UpdateOptions updateOptions) {
+        return replaceOne(filter, replacement, createReplaceOptions(updateOptions));
+    }
+
+    @Override
+    public UpdateResult replaceOne(final Bson filter, final TDocument replacement, final ReplaceOptions replaceOptions) {
+        return executeReplaceOne(null, filter, replacement, replaceOptions);
+    }
+
+    @Override
+    public UpdateResult replaceOne(final ClientSession clientSession, final Bson filter, final TDocument replacement) {
+        return replaceOne(clientSession, filter, replacement, new ReplaceOptions());
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public UpdateResult replaceOne(final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                   final UpdateOptions updateOptions) {
+        return replaceOne(clientSession, filter, replacement, createReplaceOptions(updateOptions));
+    }
+
+    @Override
+    public UpdateResult replaceOne(final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                   final ReplaceOptions replaceOptions) {
+        notNull("clientSession", clientSession);
+        return executeReplaceOne(clientSession, filter, replacement, replaceOptions);
+    }
+
+    private UpdateResult executeReplaceOne(@Nullable final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                           final ReplaceOptions replaceOptions) {
+        return toUpdateResult(executeSingleWriteRequest(clientSession, operations.replaceOne(filter, replacement, replaceOptions),
+                REPLACE));
+    }
+
+    @Override
+    public UpdateResult updateOne(final Bson filter, final Bson update) {
+        return updateOne(filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateOne(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return executeUpdate(null, filter, update, updateOptions, false);
+    }
+
+    @Override
+    public UpdateResult updateOne(final ClientSession clientSession, final Bson filter, final Bson update) {
+        return updateOne(clientSession, filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateOne(final ClientSession clientSession, final Bson filter, final Bson update,
+                                  final UpdateOptions updateOptions) {
+        notNull("clientSession", clientSession);
+        return executeUpdate(clientSession, filter, update, updateOptions, false);
+
+    }
+
+    @Override
+    public UpdateResult updateOne(final Bson filter, final List<? extends Bson> update) {
+        return updateOne(filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateOne(final Bson filter, final List<? extends Bson> update, final UpdateOptions updateOptions) {
+        return executeUpdate(null, filter, update, updateOptions, false);
+    }
+
+    @Override
+    public UpdateResult updateOne(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update) {
+        return updateOne(clientSession, filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateOne(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                                  final UpdateOptions updateOptions) {
+        notNull("clientSession", clientSession);
+        return executeUpdate(clientSession, filter, update, updateOptions, false);
+
+    }
+
+    @Override
+    public UpdateResult updateMany(final Bson filter, final Bson update) {
+        return updateMany(filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateMany(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
+        return executeUpdate(null, filter, update, updateOptions, true);
+    }
+
+    @Override
+    public UpdateResult updateMany(final ClientSession clientSession, final Bson filter, final Bson update) {
+        return updateMany(clientSession, filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateMany(final ClientSession clientSession, final Bson filter, final Bson update,
+                                   final UpdateOptions updateOptions) {
+        notNull("clientSession", clientSession);
+        return executeUpdate(clientSession, filter, update, updateOptions, true);
+    }
+
+    @Override
+    public UpdateResult updateMany(final Bson filter, final List<? extends Bson> update) {
+        return updateMany(filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateMany(final Bson filter, final List<? extends Bson> update, final UpdateOptions updateOptions) {
+        return executeUpdate(null, filter, update, updateOptions, true);
+    }
+
+    @Override
+    public UpdateResult updateMany(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update) {
+        return updateMany(clientSession, filter, update, new UpdateOptions());
+    }
+
+    @Override
+    public UpdateResult updateMany(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                                   final UpdateOptions updateOptions) {
+        notNull("clientSession", clientSession);
+        return executeUpdate(clientSession, filter, update, updateOptions, true);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndDelete(final Bson filter) {
+        return findOneAndDelete(filter, new FindOneAndDeleteOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndDelete(final Bson filter, final FindOneAndDeleteOptions options) {
+        return executeFindOneAndDelete(null, filter, options);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndDelete(final ClientSession clientSession, final Bson filter) {
+        return findOneAndDelete(clientSession, filter, new FindOneAndDeleteOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndDelete(final ClientSession clientSession, final Bson filter, final FindOneAndDeleteOptions options) {
+        notNull("clientSession", clientSession);
+        return executeFindOneAndDelete(clientSession, filter, options);
+    }
+
+    @Nullable
+    private TDocument executeFindOneAndDelete(@Nullable final ClientSession clientSession, final Bson filter,
+                                              final FindOneAndDeleteOptions options) {
+        return executor.execute(operations.findOneAndDelete(filter, options), readConcern, clientSession);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndReplace(final Bson filter, final TDocument replacement) {
+        return findOneAndReplace(filter, replacement, new FindOneAndReplaceOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndReplace(final Bson filter, final TDocument replacement, final FindOneAndReplaceOptions options) {
+        return executeFindOneAndReplace(null, filter, replacement, options);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndReplace(final ClientSession clientSession, final Bson filter, final TDocument replacement) {
+        return findOneAndReplace(clientSession, filter, replacement, new FindOneAndReplaceOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndReplace(final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                       final FindOneAndReplaceOptions options) {
+        notNull("clientSession", clientSession);
+        return executeFindOneAndReplace(clientSession, filter, replacement, options);
+    }
+
+    @Nullable
+    private TDocument executeFindOneAndReplace(@Nullable final ClientSession clientSession, final Bson filter, final TDocument replacement,
+                                               final FindOneAndReplaceOptions options) {
+        return executor.execute(operations.findOneAndReplace(filter, replacement, options), readConcern, clientSession);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final Bson filter, final Bson update) {
+        return findOneAndUpdate(filter, update, new FindOneAndUpdateOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final Bson filter, final Bson update, final FindOneAndUpdateOptions options) {
+        return executeFindOneAndUpdate(null, filter, update, options);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final ClientSession clientSession, final Bson filter, final Bson update) {
+        return findOneAndUpdate(clientSession, filter, update, new FindOneAndUpdateOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final ClientSession clientSession, final Bson filter, final Bson update,
+                                      final FindOneAndUpdateOptions options) {
+        notNull("clientSession", clientSession);
+        return executeFindOneAndUpdate(clientSession, filter, update, options);
+    }
+
+    @Nullable
+    private TDocument executeFindOneAndUpdate(@Nullable final ClientSession clientSession, final Bson filter, final Bson update,
+                                              final FindOneAndUpdateOptions options) {
+        return executor.execute(operations.findOneAndUpdate(filter, update, options), readConcern, clientSession);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final Bson filter, final List<? extends Bson> update) {
+        return findOneAndUpdate(filter, update, new FindOneAndUpdateOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final Bson filter, final List<? extends Bson> update, final FindOneAndUpdateOptions options) {
+        return executeFindOneAndUpdate(null, filter, update, options);
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update) {
+        return findOneAndUpdate(clientSession, filter, update, new FindOneAndUpdateOptions());
+    }
+
+    @Override
+    @Nullable
+    public TDocument findOneAndUpdate(final ClientSession clientSession, final Bson filter, final List<? extends Bson> update,
+                                      final FindOneAndUpdateOptions options) {
+        notNull("clientSession", clientSession);
+        return executeFindOneAndUpdate(clientSession, filter, update, options);
+    }
+
+    @Nullable
+    private TDocument executeFindOneAndUpdate(@Nullable final ClientSession clientSession, final Bson filter,
+                                              final List<? extends Bson> update, final FindOneAndUpdateOptions options) {
+        return executor.execute(operations.findOneAndUpdate(filter, update, options), readConcern, clientSession);
+    }
+
+    @Override
+    public void drop() {
+        executeDrop(null);
+    }
+
+    @Override
+    public void drop(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        executeDrop(clientSession);
+    }
+
+    private void executeDrop(@Nullable final ClientSession clientSession) {
+        executor.execute(operations.dropCollection(), readConcern, clientSession);
+    }
+
+    @Override
+    public String createIndex(final Bson keys) {
+        return createIndex(keys, new IndexOptions());
+    }
+
+    @Override
+    public String createIndex(final Bson keys, final IndexOptions indexOptions) {
+        return createIndexes(singletonList(new IndexModel(keys, indexOptions))).get(0);
+    }
+
+    @Override
+    public String createIndex(final ClientSession clientSession, final Bson keys) {
+        return createIndex(clientSession, keys, new IndexOptions());
+    }
+
+    @Override
+    public String createIndex(final ClientSession clientSession, final Bson keys, final IndexOptions indexOptions) {
+        return createIndexes(clientSession, singletonList(new IndexModel(keys, indexOptions))).get(0);
+    }
+
+    @Override
+    public List<String> createIndexes(final List<IndexModel> indexes) {
+        return createIndexes(indexes, new CreateIndexOptions());
+    }
+
+    @Override
+    public List<String> createIndexes(final List<IndexModel> indexes, final CreateIndexOptions createIndexOptions) {
+        return executeCreateIndexes(null, indexes, createIndexOptions);
+    }
+
+    @Override
+    public List<String> createIndexes(final ClientSession clientSession, final List<IndexModel> indexes) {
+        return createIndexes(clientSession, indexes, new CreateIndexOptions());
+    }
+
+    @Override
+    public List<String> createIndexes(final ClientSession clientSession, final List<IndexModel> indexes,
+                                      final CreateIndexOptions createIndexOptions) {
+        notNull("clientSession", clientSession);
+        return executeCreateIndexes(clientSession, indexes, createIndexOptions);
+    }
+
+    private List<String> executeCreateIndexes(@Nullable final ClientSession clientSession, final List<IndexModel> indexes,
+                                              final CreateIndexOptions createIndexOptions) {
+        executor.execute(operations.createIndexes(indexes, createIndexOptions), readConcern, clientSession);
+        return IndexHelper.getIndexNames(indexes, codecRegistry);
+    }
+
+    @Override
+    public ListIndexesIterable<Document> listIndexes() {
+        return listIndexes(Document.class);
+    }
+
+    @Override
+    public <TResult> ListIndexesIterable<TResult> listIndexes(final Class<TResult> resultClass) {
+        return createListIndexesIterable(null, resultClass);
+    }
+
+    @Override
+    public ListIndexesIterable<Document> listIndexes(final ClientSession clientSession) {
+        return listIndexes(clientSession, Document.class);
+    }
+
+    @Override
+    public <TResult> ListIndexesIterable<TResult> listIndexes(final ClientSession clientSession, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createListIndexesIterable(clientSession, resultClass);
+    }
+
+    private <TResult> ListIndexesIterable<TResult> createListIndexesIterable(@Nullable final ClientSession clientSession,
+                                                                             final Class<TResult> resultClass) {
+        return MongoIterables.listIndexesOf(clientSession, getNamespace(), resultClass, codecRegistry, ReadPreference.primary(),
+                executor, retryReads);
+    }
+
+    @Override
+    public void dropIndex(final String indexName) {
+        dropIndex(indexName, new DropIndexOptions());
+    }
+
+    @Override
+    public void dropIndex(final String indexName, final DropIndexOptions dropIndexOptions) {
+        executeDropIndex(null, indexName, dropIndexOptions);
+    }
+
+    @Override
+    public void dropIndex(final Bson keys) {
+        dropIndex(keys, new DropIndexOptions());
+    }
+
+    @Override
+    public void dropIndex(final Bson keys, final DropIndexOptions dropIndexOptions) {
+        executeDropIndex(null, keys, dropIndexOptions);
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final String indexName) {
+        dropIndex(clientSession, indexName, new DropIndexOptions());
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final Bson keys) {
+        dropIndex(clientSession, keys, new DropIndexOptions());
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final String indexName, final DropIndexOptions dropIndexOptions) {
+        notNull("clientSession", clientSession);
+        executeDropIndex(clientSession, indexName, dropIndexOptions);
+    }
+
+    @Override
+    public void dropIndex(final ClientSession clientSession, final Bson keys, final DropIndexOptions dropIndexOptions) {
+        notNull("clientSession", clientSession);
+        executeDropIndex(clientSession, keys, dropIndexOptions);
+    }
+
+    @Override
+    public void dropIndexes() {
+        dropIndex("*");
+    }
+
+    @Override
+    public void dropIndexes(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        executeDropIndex(clientSession, "*", new DropIndexOptions());
+    }
+
+    @Override
+    public void dropIndexes(final DropIndexOptions dropIndexOptions) {
+        dropIndex("*", dropIndexOptions);
+    }
+
+    @Override
+    public void dropIndexes(final ClientSession clientSession, final DropIndexOptions dropIndexOptions) {
+        dropIndex(clientSession, "*", dropIndexOptions);
+    }
+
+    private void executeDropIndex(@Nullable final ClientSession clientSession, final String indexName,
+                                  final DropIndexOptions dropIndexOptions) {
+        notNull("dropIndexOptions", dropIndexOptions);
+        executor.execute(operations.dropIndex(indexName, dropIndexOptions), readConcern, clientSession);
+    }
+
+    private void executeDropIndex(@Nullable final ClientSession clientSession, final Bson keys, final DropIndexOptions dropIndexOptions) {
+        executor.execute(operations.dropIndex(keys, dropIndexOptions), readConcern, clientSession);
+    }
+
+    @Override
+    public void renameCollection(final MongoNamespace newCollectionNamespace) {
+        renameCollection(newCollectionNamespace, new RenameCollectionOptions());
+    }
+
+    @Override
+    public void renameCollection(final MongoNamespace newCollectionNamespace, final RenameCollectionOptions renameCollectionOptions) {
+        executeRenameCollection(null, newCollectionNamespace, renameCollectionOptions);
+    }
+
+    @Override
+    public void renameCollection(final ClientSession clientSession, final MongoNamespace newCollectionNamespace) {
+        renameCollection(clientSession, newCollectionNamespace, new RenameCollectionOptions());
+    }
+
+    @Override
+    public void renameCollection(final ClientSession clientSession, final MongoNamespace newCollectionNamespace,
+                                 final RenameCollectionOptions renameCollectionOptions) {
+        notNull("clientSession", clientSession);
+        executeRenameCollection(clientSession, newCollectionNamespace, renameCollectionOptions);
+    }
+
+    private void executeRenameCollection(@Nullable final ClientSession clientSession, final MongoNamespace newCollectionNamespace,
+                                         final RenameCollectionOptions renameCollectionOptions) {
+        executor.execute(new RenameCollectionOperation(getNamespace(), newCollectionNamespace, writeConcern)
+                        .dropTarget(renameCollectionOptions.isDropTarget()),
+                readConcern, clientSession);
+    }
+
+    private DeleteResult executeDelete(@Nullable final ClientSession clientSession, final Bson filter, final DeleteOptions deleteOptions,
+                                       final boolean multi) {
+        com.mongodb.bulk.BulkWriteResult result = executeSingleWriteRequest(clientSession,
+                multi ? operations.deleteMany(filter, deleteOptions) : operations.deleteOne(filter, deleteOptions), DELETE);
+        if (result.wasAcknowledged()) {
+            return DeleteResult.acknowledged(result.getDeletedCount());
+        } else {
+            return DeleteResult.unacknowledged();
+        }
+    }
+
+    private UpdateResult executeUpdate(@Nullable final ClientSession clientSession, final Bson filter, final Bson update,
+                                       final UpdateOptions updateOptions, final boolean multi) {
+        return toUpdateResult(executeSingleWriteRequest(clientSession,
+                multi ? operations.updateMany(filter, update, updateOptions) : operations.updateOne(filter, update, updateOptions),
+                UPDATE));
+    }
+
+    private UpdateResult executeUpdate(@Nullable final ClientSession clientSession, final Bson filter,
+                                       final List<? extends Bson> update, final UpdateOptions updateOptions, final boolean multi) {
+        return toUpdateResult(executeSingleWriteRequest(clientSession,
+                multi ? operations.updateMany(filter, update, updateOptions) : operations.updateOne(filter, update, updateOptions),
+                UPDATE));
+    }
+
+    private BulkWriteResult executeSingleWriteRequest(@Nullable final ClientSession clientSession,
+                                                      final WriteOperation<BulkWriteResult> writeOperation,
+                                                      final WriteRequest.Type type) {
+        try {
+            return executor.execute(writeOperation, readConcern, clientSession);
+        } catch (MongoBulkWriteException e) {
+            if (e.getWriteErrors().isEmpty()) {
+                throw new MongoWriteConcernException(e.getWriteConcernError(),
+                        translateBulkWriteResult(type, e.getWriteResult()),
+                        e.getServerAddress());
+            } else {
+                throw new MongoWriteException(new WriteError(e.getWriteErrors().get(0)), e.getServerAddress());
+            }
+        }
+    }
+
+    private WriteConcernResult translateBulkWriteResult(final WriteRequest.Type type, final BulkWriteResult writeResult) {
+        switch (type) {
+            case INSERT:
+                return WriteConcernResult.acknowledged(writeResult.getInsertedCount(), false, null);
+            case DELETE:
+                return WriteConcernResult.acknowledged(writeResult.getDeletedCount(), false, null);
+            case UPDATE:
+            case REPLACE:
+                return WriteConcernResult.acknowledged(writeResult.getMatchedCount() + writeResult.getUpserts().size(),
+                        writeResult.getMatchedCount() > 0,
+                        writeResult.getUpserts().isEmpty()
+                                ? null : writeResult.getUpserts().get(0).getId());
+            default:
+                throw new MongoInternalException("Unhandled write request type: " + type);
+        }
+    }
+
+    private UpdateResult toUpdateResult(final com.mongodb.bulk.BulkWriteResult result) {
+        if (result.wasAcknowledged()) {
+            BsonValue upsertedId = result.getUpserts().isEmpty() ? null : result.getUpserts().get(0).getId();
+            return UpdateResult.acknowledged(result.getMatchedCount(), (long) result.getModifiedCount(), upsertedId);
+        } else {
+            return UpdateResult.unacknowledged();
+        }
+    }
+
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoDatabaseImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoDatabaseImpl.java
new file mode 100644
index 00000000000..885f7da78ea
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoDatabaseImpl.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.Function;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.ListCollectionsIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.MongoIterable;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.CreateViewOptions;
+import com.mongodb.client.model.IndexOptionDefaults;
+import com.mongodb.client.model.ValidationOptions;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.CommandReadOperation;
+import com.mongodb.operation.CreateCollectionOperation;
+import com.mongodb.operation.CreateViewOperation;
+import com.mongodb.operation.DropDatabaseOperation;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.MongoNamespace.checkDatabaseNameValidity;
+import static com.mongodb.assertions.Assertions.notNull;
+import static org.bson.internal.CodecRegistryHelper.createRegistry;
+
+/**
+ * This class is not part of the public API and may be removed or changed at any time.
+ */
+public class MongoDatabaseImpl implements MongoDatabase {
+    private final String name;
+    private final ReadPreference readPreference;
+    private final CodecRegistry codecRegistry;
+    private final WriteConcern writeConcern;
+    private final boolean retryWrites;
+    private final boolean retryReads;
+    private final ReadConcern readConcern;
+    private final OperationExecutor executor;
+    private UuidRepresentation uuidRepresentation;
+
+    public MongoDatabaseImpl(final String name, final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                             final WriteConcern writeConcern, final boolean retryWrites, final boolean retryReads,
+                             final ReadConcern readConcern, final UuidRepresentation uuidRepresentation, final OperationExecutor executor) {
+        checkDatabaseNameValidity(name);
+        this.name = notNull("name", name);
+        this.codecRegistry = notNull("codecRegistry", codecRegistry);
+        this.readPreference = notNull("readPreference", readPreference);
+        this.writeConcern = notNull("writeConcern", writeConcern);
+        this.retryWrites = retryWrites;
+        this.retryReads = retryReads;
+        this.readConcern = notNull("readConcern", readConcern);
+        this.uuidRepresentation = notNull("uuidRepresentation", uuidRepresentation);
+        this.executor = notNull("executor", executor);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public CodecRegistry getCodecRegistry() {
+        return codecRegistry;
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    @Override
+    public WriteConcern getWriteConcern() {
+        return writeConcern;
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    @Override
+    public MongoDatabase withCodecRegistry(final CodecRegistry codecRegistry) {
+        return new MongoDatabaseImpl(name, createRegistry(codecRegistry, uuidRepresentation), readPreference, writeConcern, retryWrites,
+                retryReads, readConcern, uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoDatabase withReadPreference(final ReadPreference readPreference) {
+        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern,
+                uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoDatabase withWriteConcern(final WriteConcern writeConcern) {
+        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern,
+                uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoDatabase withReadConcern(final ReadConcern readConcern) {
+        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, retryWrites, retryReads, readConcern,
+                uuidRepresentation, executor);
+    }
+
+    @Override
+    public MongoCollection<Document> getCollection(final String collectionName) {
+        return getCollection(collectionName, Document.class);
+    }
+
+    @Override
+    public <TDocument> MongoCollection<TDocument> getCollection(final String collectionName, final Class<TDocument> documentClass) {
+        return new MongoCollectionImpl<TDocument>(new MongoNamespace(name, collectionName), documentClass, codecRegistry, readPreference,
+                writeConcern, retryWrites, retryReads, readConcern, uuidRepresentation, executor);
+    }
+
+    @Override
+    public Document runCommand(final Bson command) {
+        return runCommand(command, Document.class);
+    }
+
+    @Override
+    public Document runCommand(final Bson command, final ReadPreference readPreference) {
+        return runCommand(command, readPreference, Document.class);
+    }
+
+    @Override
+    public <TResult> TResult runCommand(final Bson command, final Class<TResult> resultClass) {
+        return runCommand(command, ReadPreference.primary(), resultClass);
+    }
+
+    @Override
+    public <TResult> TResult runCommand(final Bson command, final ReadPreference readPreference, final Class<TResult> resultClass) {
+        return executeCommand(null, command, readPreference, resultClass);
+    }
+
+    @Override
+    public Document runCommand(final ClientSession clientSession, final Bson command) {
+        return runCommand(clientSession, command, ReadPreference.primary(), Document.class);
+    }
+
+    @Override
+    public Document runCommand(final ClientSession clientSession, final Bson command, final ReadPreference readPreference) {
+        return runCommand(clientSession, command, readPreference, Document.class);
+    }
+
+    @Override
+    public <TResult> TResult runCommand(final ClientSession clientSession, final Bson command, final Class<TResult> resultClass) {
+        return runCommand(clientSession, command, ReadPreference.primary(), resultClass);
+    }
+
+    @Override
+    public <TResult> TResult runCommand(final ClientSession clientSession, final Bson command, final ReadPreference readPreference,
+                                        final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return executeCommand(clientSession, command, readPreference, resultClass);
+    }
+
+    private <TResult> TResult executeCommand(@Nullable final ClientSession clientSession, final Bson command,
+                                             final ReadPreference readPreference, final Class<TResult> resultClass) {
+        notNull("readPreference", readPreference);
+        if (clientSession != null && clientSession.hasActiveTransaction() && !readPreference.equals(ReadPreference.primary())) {
+            throw new MongoClientException("Read preference in a transaction must be primary");
+        }
+        return executor.execute(new CommandReadOperation<TResult>(getName(), toBsonDocument(command), codecRegistry.get(resultClass)),
+                readPreference, readConcern, clientSession);
+    }
+
+    @Override
+    public void drop() {
+        executeDrop(null);
+    }
+
+    @Override
+    public void drop(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        executeDrop(clientSession);
+    }
+
+    private void executeDrop(@Nullable final ClientSession clientSession) {
+        executor.execute(new DropDatabaseOperation(name, getWriteConcern()), readConcern, clientSession);
+    }
+
+    @Override
+    public MongoIterable<String> listCollectionNames() {
+        return createListCollectionNamesIterable(null);
+    }
+
+    @Override
+    public MongoIterable<String> listCollectionNames(final ClientSession clientSession) {
+        notNull("clientSession", clientSession);
+        return createListCollectionNamesIterable(clientSession);
+    }
+
+    private MongoIterable<String> createListCollectionNamesIterable(@Nullable final ClientSession clientSession) {
+        return createListCollectionsIterable(clientSession, BsonDocument.class, true)
+                .map(new Function<BsonDocument, String>() {
+                    @Override
+                    public String apply(final BsonDocument result) {
+                        return result.getString("name").getValue();
+                    }
+                });
+    }
+
+    @Override
+    public ListCollectionsIterable<Document> listCollections() {
+        return listCollections(Document.class);
+    }
+
+    @Override
+    public <TResult> ListCollectionsIterable<TResult> listCollections(final Class<TResult> resultClass) {
+        return createListCollectionsIterable(null, resultClass, false);
+    }
+
+    @Override
+    public ListCollectionsIterable<Document> listCollections(final ClientSession clientSession) {
+        return listCollections(clientSession, Document.class);
+    }
+
+    @Override
+    public <TResult> ListCollectionsIterable<TResult> listCollections(final ClientSession clientSession, final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createListCollectionsIterable(clientSession, resultClass, false);
+    }
+
+    private <TResult> ListCollectionsIterable<TResult> createListCollectionsIterable(@Nullable final ClientSession clientSession,
+                                                                                     final Class<TResult> resultClass,
+                                                                                     final boolean collectionNamesOnly) {
+        return MongoIterables.listCollectionsOf(clientSession, name, collectionNamesOnly, resultClass, codecRegistry,
+                ReadPreference.primary(), executor, retryReads);
+    }
+
+    @Override
+    public void createCollection(final String collectionName) {
+        createCollection(collectionName, new CreateCollectionOptions());
+    }
+
+    @Override
+    public void createCollection(final String collectionName, final CreateCollectionOptions createCollectionOptions) {
+        executeCreateCollection(null, collectionName, createCollectionOptions);
+    }
+
+    @Override
+    public void createCollection(final ClientSession clientSession, final String collectionName) {
+        createCollection(clientSession, collectionName, new CreateCollectionOptions());
+    }
+
+    @Override
+    public void createCollection(final ClientSession clientSession, final String collectionName,
+                                 final CreateCollectionOptions createCollectionOptions) {
+        notNull("clientSession", clientSession);
+        executeCreateCollection(clientSession, collectionName, createCollectionOptions);
+    }
+
+    @SuppressWarnings("deprecation")
+    private void executeCreateCollection(@Nullable final ClientSession clientSession, final String collectionName,
+                                         final CreateCollectionOptions createCollectionOptions) {
+        CreateCollectionOperation operation = new CreateCollectionOperation(name, collectionName, writeConcern)
+                .collation(createCollectionOptions.getCollation())
+                .capped(createCollectionOptions.isCapped())
+                .sizeInBytes(createCollectionOptions.getSizeInBytes())
+                .autoIndex(createCollectionOptions.isAutoIndex())
+                .maxDocuments(createCollectionOptions.getMaxDocuments())
+                .usePowerOf2Sizes(createCollectionOptions.isUsePowerOf2Sizes())
+                .storageEngineOptions(toBsonDocument(createCollectionOptions.getStorageEngineOptions()));
+
+        IndexOptionDefaults indexOptionDefaults = createCollectionOptions.getIndexOptionDefaults();
+        Bson storageEngine = indexOptionDefaults.getStorageEngine();
+        if (storageEngine != null) {
+            operation.indexOptionDefaults(new BsonDocument("storageEngine", toBsonDocument(storageEngine)));
+        }
+        ValidationOptions validationOptions = createCollectionOptions.getValidationOptions();
+        Bson validator = validationOptions.getValidator();
+        if (validator != null) {
+            operation.validator(toBsonDocument(validator));
+        }
+        if (validationOptions.getValidationLevel() != null) {
+            operation.validationLevel(validationOptions.getValidationLevel());
+        }
+        if (validationOptions.getValidationAction() != null) {
+            operation.validationAction(validationOptions.getValidationAction());
+        }
+        executor.execute(operation, readConcern, clientSession);
+    }
+
+    @Override
+    public void createView(final String viewName, final String viewOn, final List<? extends Bson> pipeline) {
+        createView(viewName, viewOn, pipeline, new CreateViewOptions());
+    }
+
+    @Override
+    public void createView(final String viewName, final String viewOn, final List<? extends Bson> pipeline,
+                           final CreateViewOptions createViewOptions) {
+        executeCreateView(null, viewName, viewOn, pipeline, createViewOptions);
+    }
+
+    @Override
+    public void createView(final ClientSession clientSession, final String viewName, final String viewOn,
+                           final List<? extends Bson> pipeline) {
+        createView(clientSession, viewName, viewOn, pipeline, new CreateViewOptions());
+    }
+
+    @Override
+    public void createView(final ClientSession clientSession, final String viewName, final String viewOn,
+                           final List<? extends Bson> pipeline, final CreateViewOptions createViewOptions) {
+        notNull("clientSession", clientSession);
+        executeCreateView(clientSession, viewName, viewOn, pipeline, createViewOptions);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch() {
+        return watch(Collections.<Bson>emptyList());
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final Class<TResult> resultClass) {
+        return watch(Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final List<? extends Bson> pipeline) {
+        return watch(pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createChangeStreamIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession) {
+        return watch(clientSession, Collections.<Bson>emptyList(), Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final Class<TResult> resultClass) {
+        return watch(clientSession, Collections.<Bson>emptyList(), resultClass);
+    }
+
+    @Override
+    public ChangeStreamIterable<Document> watch(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return watch(clientSession, pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> ChangeStreamIterable<TResult> watch(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                         final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createChangeStreamIterable(clientSession, pipeline, resultClass);
+    }
+
+    @Override
+    public AggregateIterable<Document> aggregate(final List<? extends Bson> pipeline) {
+        return aggregate(pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> AggregateIterable<TResult> aggregate(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
+        return createAggregateIterable(null, pipeline, resultClass);
+    }
+
+    @Override
+    public AggregateIterable<Document> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline) {
+        return aggregate(clientSession, pipeline, Document.class);
+    }
+
+    @Override
+    public <TResult> AggregateIterable<TResult> aggregate(final ClientSession clientSession, final List<? extends Bson> pipeline,
+                                                          final Class<TResult> resultClass) {
+        notNull("clientSession", clientSession);
+        return createAggregateIterable(clientSession, pipeline, resultClass);
+    }
+
+    private <TResult> AggregateIterable<TResult> createAggregateIterable(@Nullable final ClientSession clientSession,
+                                                                         final List<? extends Bson> pipeline,
+                                                                         final Class<TResult> resultClass) {
+        return MongoIterables.aggregateOf(clientSession, name, Document.class, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, retryReads);
+    }
+
+    private <TResult> ChangeStreamIterable<TResult> createChangeStreamIterable(@Nullable final ClientSession clientSession,
+                                                                               final List<? extends Bson> pipeline,
+                                                                               final Class<TResult> resultClass) {
+        return MongoIterables.changeStreamOf(clientSession, name, codecRegistry, readPreference,
+                readConcern, executor, pipeline, resultClass, ChangeStreamLevel.DATABASE, retryReads);
+    }
+
+    private void executeCreateView(@Nullable final ClientSession clientSession, final String viewName, final String viewOn,
+                                   final List<? extends Bson> pipeline, final CreateViewOptions createViewOptions) {
+        notNull("createViewOptions", createViewOptions);
+        executor.execute(new CreateViewOperation(name, viewName, viewOn, createBsonDocumentList(pipeline), writeConcern)
+                        .collation(createViewOptions.getCollation()),
+                readConcern, clientSession);
+    }
+
+    private List<BsonDocument> createBsonDocumentList(final List<? extends Bson> pipeline) {
+        notNull("pipeline", pipeline);
+        List<BsonDocument> bsonDocumentPipeline = new ArrayList<BsonDocument>(pipeline.size());
+        for (Bson obj : pipeline) {
+            if (obj == null) {
+                throw new IllegalArgumentException("pipeline can not contain a null value");
+            }
+            bsonDocumentPipeline.add(obj.toBsonDocument(BsonDocument.class, codecRegistry));
+        }
+        return bsonDocumentPipeline;
+    }
+
+    @Nullable
+    private BsonDocument toBsonDocument(@Nullable final Bson document) {
+        return document == null ? null : document.toBsonDocument(BsonDocument.class, codecRegistry);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoIterableFactory.java b/driver-sync/src/main/com/mongodb/client/internal/MongoIterableFactory.java
new file mode 100644
index 00000000000..ce615d2a4df
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoIterableFactory.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.DistinctIterable;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.ListCollectionsIterable;
+import com.mongodb.client.ListDatabasesIterable;
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+interface MongoIterableFactory {
+    <TDocument, TResult>
+    FindIterable<TResult> findOf(@Nullable ClientSession clientSession, MongoNamespace namespace, Class<TDocument> documentClass,
+                                 Class<TResult> resultClass, CodecRegistry codecRegistry, ReadPreference readPreference,
+                                 ReadConcern readConcern, OperationExecutor executor, Bson filter, boolean retryReads);
+
+    <TDocument, TResult>
+    AggregateIterable<TResult> aggregateOf(@Nullable ClientSession clientSession, MongoNamespace namespace, Class<TDocument> documentClass,
+                                           Class<TResult> resultClass, CodecRegistry codecRegistry, ReadPreference readPreference,
+                                           ReadConcern readConcern, WriteConcern writeConcern, OperationExecutor executor,
+                                           List<? extends Bson> pipeline, AggregationLevel aggregationLevel, boolean retryReads);
+
+    <TDocument, TResult>
+    AggregateIterable<TResult> aggregateOf(@Nullable ClientSession clientSession, String databaseName, Class<TDocument> documentClass,
+                                           Class<TResult> resultClass, CodecRegistry codecRegistry, ReadPreference readPreference,
+                                           ReadConcern readConcern, WriteConcern writeConcern, OperationExecutor executor,
+                                           List<? extends Bson> pipeline, AggregationLevel aggregationLevel, boolean retryReads);
+
+    <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(@Nullable ClientSession clientSession, String databaseName, CodecRegistry codecRegistry,
+                                                 ReadPreference readPreference, ReadConcern readConcern, OperationExecutor executor,
+                                                 List<? extends Bson> pipeline, Class<TResult> resultClass,
+                                                 ChangeStreamLevel changeStreamLevel, boolean retryReads);
+
+    <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(@Nullable ClientSession clientSession, MongoNamespace namespace,
+                                                 CodecRegistry codecRegistry, ReadPreference readPreference, ReadConcern readConcern,
+                                                 OperationExecutor executor, List<? extends Bson> pipeline, Class<TResult> resultClass,
+                                                 ChangeStreamLevel changeStreamLevel, boolean retryReads);
+
+    <TDocument, TResult>
+    DistinctIterable<TResult> distinctOf(@Nullable ClientSession clientSession, MongoNamespace namespace, Class<TDocument> documentClass,
+                                         Class<TResult> resultClass, CodecRegistry codecRegistry, ReadPreference readPreference,
+                                         ReadConcern readConcern, OperationExecutor executor, String fieldName, Bson filter,
+                                         boolean retryReads);
+
+    <TResult>
+    ListDatabasesIterable<TResult> listDatabasesOf(@Nullable ClientSession clientSession, Class<TResult> resultClass,
+                                                   CodecRegistry codecRegistry, ReadPreference readPreference,
+                                                   OperationExecutor executor, boolean retryReads);
+    <TResult>
+    ListCollectionsIterable<TResult> listCollectionsOf(@Nullable ClientSession clientSession, String databaseName,
+                                                       boolean collectionNamesOnly, Class<TResult> resultClass, CodecRegistry codecRegistry,
+                                                       ReadPreference readPreference, OperationExecutor executor, boolean retryReads);
+    <TResult>
+    ListIndexesIterable<TResult> listIndexesOf(@Nullable ClientSession clientSession, MongoNamespace namespace, Class<TResult> resultClass,
+                                               CodecRegistry codecRegistry, ReadPreference readPreference, OperationExecutor executor,
+                                               boolean retryReads);
+
+    <TDocument, TResult>
+    MapReduceIterable<TResult> mapReduceOf(@Nullable ClientSession clientSession, MongoNamespace namespace, Class<TDocument> documentClass,
+                                           Class<TResult> resultClass, CodecRegistry codecRegistry, ReadPreference readPreference,
+                                           ReadConcern readConcern, WriteConcern writeConcern, OperationExecutor executor,
+                                           String mapFunction, String reduceFunction);
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoIterableImpl.java b/driver-sync/src/main/com/mongodb/client/internal/MongoIterableImpl.java
new file mode 100644
index 00000000000..5380b350957
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoIterableImpl.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.Block;
+import com.mongodb.Function;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoIterable;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.BatchCursor;
+import com.mongodb.operation.ReadOperation;
+
+import java.util.Collection;
+
+import static com.mongodb.assertions.Assertions.notNull;
+
+/**
+ * This class is not part of the public API and may be removed or changed at any time.
+ *
+ * @param <TResult> the result type
+ */
+public abstract class MongoIterableImpl<TResult> implements MongoIterable<TResult> {
+    private final ClientSession clientSession;
+    private final ReadConcern readConcern;
+    private final OperationExecutor executor;
+    private final ReadPreference readPreference;
+    private final boolean retryReads;
+    private Integer batchSize;
+
+    public MongoIterableImpl(@Nullable final ClientSession clientSession, final OperationExecutor executor, final ReadConcern readConcern,
+                             final ReadPreference readPreference, final boolean retryReads) {
+        this.clientSession = clientSession;
+        this.executor = notNull("executor", executor);
+        this.readConcern = notNull("readConcern", readConcern);
+        this.readPreference = notNull("readPreference", readPreference);
+        this.retryReads = notNull("retryReads", retryReads);
+    }
+
+    public abstract ReadOperation<BatchCursor<TResult>> asReadOperation();
+
+    @Nullable
+    ClientSession getClientSession() {
+        return clientSession;
+    }
+
+    OperationExecutor getExecutor() {
+        return executor;
+    }
+
+    ReadPreference getReadPreference() {
+        return readPreference;
+    }
+
+    protected ReadConcern getReadConcern() {
+        return readConcern;
+    }
+
+    protected boolean getRetryReads() {
+        return retryReads;
+    }
+
+    @Nullable
+    public Integer getBatchSize() {
+        return batchSize;
+    }
+
+    @Override
+    public MongoIterable<TResult> batchSize(final int batchSize) {
+        this.batchSize = batchSize;
+        return this;
+    }
+
+    @Override
+    public MongoCursor<TResult> iterator() {
+        return new MongoBatchCursorAdapter<TResult>(execute());
+    }
+
+    @Override
+    public MongoCursor<TResult> cursor() {
+        return iterator();
+    }
+
+    @Nullable
+    @Override
+    public TResult first() {
+        MongoCursor<TResult> cursor = iterator();
+        try {
+            if (!cursor.hasNext()) {
+                return null;
+            }
+            return cursor.next();
+        } finally {
+            cursor.close();
+        }
+    }
+
+    @Override
+    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
+        return new MappingIterable<TResult, U>(this, mapper);
+    }
+
+    @Override
+    public void forEach(final Block<? super TResult> block) {
+        MongoCursor<TResult> cursor = iterator();
+        try {
+            while (cursor.hasNext()) {
+                block.apply(cursor.next());
+            }
+        } finally {
+            cursor.close();
+        }
+    }
+
+    @Override
+    public <A extends Collection<? super TResult>> A into(final A target) {
+        forEach(new Block<TResult>() {
+            @Override
+            public void apply(final TResult t) {
+                target.add(t);
+            }
+        });
+        return target;
+    }
+
+    private BatchCursor<TResult> execute() {
+        return executor.execute(asReadOperation(), readPreference, readConcern, clientSession);
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/MongoIterables.java b/driver-sync/src/main/com/mongodb/client/internal/MongoIterables.java
new file mode 100644
index 00000000000..b7e6a083d0f
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoIterables.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.ChangeStreamIterable;
+import com.mongodb.client.ClientSession;
+import com.mongodb.client.DistinctIterable;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.ListCollectionsIterable;
+import com.mongodb.client.ListDatabasesIterable;
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.model.changestream.ChangeStreamLevel;
+import com.mongodb.client.model.AggregationLevel;
+import com.mongodb.lang.Nullable;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.conversions.Bson;
+
+import java.util.List;
+
+// Helper class for instantiating the right implementation class for each MongoIterable.  In proper Java 8 environments, which includes
+// the java.util.function.Consumer interface, it instantiates an implementation which overrides the default forEach(Consumer<TResult)
+// method that in Java 8 is defined as a default method on java.lang.Iterable.  Otherwise it instantiates an implementation which does not
+// override this method.
+// It does this by delegating to an implementation of MongoIterableFactory that is determined based on a runtime check for the existence of
+// the java.util.function.Consumer class.
+public final class MongoIterables {
+    private static MongoIterableFactory factory;
+
+    static {
+        try {
+            // Protect against running in an environment where Consumer is not available.  Either
+            // 1. Java version < 8
+            // 2. Android (which doesn't currently include Consumer even with its Java 8 support
+            Class.forName("java.util.function.Consumer");
+            factory = new Java8MongoIterableFactory();
+        } catch (ClassNotFoundException e) {
+            factory = new FallbackMongoIterableFactory();
+        }
+    }
+
+    public static <TDocument, TResult>
+    FindIterable<TResult> findOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                 final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                 final CodecRegistry codecRegistry,
+                                 final ReadPreference readPreference, final ReadConcern readConcern,
+                                 final OperationExecutor executor, final Bson filter, final boolean retryReads) {
+        return factory.findOf(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern, executor,
+                filter, retryReads);
+    }
+
+    public static <TDocument, TResult>
+    AggregateIterable<TResult> aggregateOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                           final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                           final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                           final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                                           final List<? extends Bson> pipeline, final AggregationLevel aggregationLevel,
+                                           final boolean retryReads) {
+        return factory.aggregateOf(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
+
+    public static <TDocument, TResult>
+    AggregateIterable<TResult> aggregateOf(final @Nullable ClientSession clientSession, final String databaseName,
+                                           final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                           final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                           final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                                           final List<? extends Bson> pipeline, final AggregationLevel aggregationLevel,
+                                           final boolean retryReads) {
+        return factory.aggregateOf(clientSession, databaseName, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, aggregationLevel, retryReads);
+    }
+
+    public static <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(final @Nullable ClientSession clientSession, final String databaseName,
+                                                 final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                 final ReadConcern readConcern, final OperationExecutor executor,
+                                                 final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                 final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        return factory.changeStreamOf(clientSession, databaseName, codecRegistry, readPreference, readConcern, executor, pipeline,
+                resultClass, changeStreamLevel, retryReads);
+    }
+
+    public static <TResult>
+    ChangeStreamIterable<TResult> changeStreamOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                                 final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                 final ReadConcern readConcern, final OperationExecutor executor,
+                                                 final List<? extends Bson> pipeline, final Class<TResult> resultClass,
+                                                 final ChangeStreamLevel changeStreamLevel, final boolean retryReads) {
+        return factory.changeStreamOf(clientSession, namespace, codecRegistry, readPreference, readConcern, executor, pipeline, resultClass,
+                changeStreamLevel, retryReads);
+    }
+
+    public static <TDocument, TResult>
+    DistinctIterable<TResult> distinctOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                         final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                         final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                         final ReadConcern readConcern, final OperationExecutor executor,
+                                         final String fieldName, final Bson filter, final boolean retryReads) {
+        return factory.distinctOf(clientSession, namespace, documentClass, resultClass, codecRegistry,
+                readPreference, readConcern, executor, fieldName, filter, retryReads);
+    }
+
+    public static <TResult>
+    ListDatabasesIterable<TResult> listDatabasesOf(final @Nullable ClientSession clientSession, final Class<TResult> resultClass,
+                                                   final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                   final OperationExecutor executor, final boolean retryReads) {
+        return factory.listDatabasesOf(clientSession, resultClass, codecRegistry, readPreference, executor, retryReads);
+    }
+
+    public static <TResult>
+    ListCollectionsIterable<TResult> listCollectionsOf(final @Nullable ClientSession clientSession, final String databaseName,
+                                                       final boolean collectionNamesOnly, final Class<TResult> resultClass,
+                                                       final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                                       final OperationExecutor executor, final boolean retryReads) {
+        return factory.listCollectionsOf(clientSession, databaseName, collectionNamesOnly, resultClass, codecRegistry, readPreference,
+                executor, retryReads);
+    }
+
+    public static <TResult>
+    ListIndexesIterable<TResult> listIndexesOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                               final Class<TResult> resultClass, final CodecRegistry codecRegistry,
+                                               final ReadPreference readPreference, final OperationExecutor executor,
+                                               final boolean retryReads) {
+        return factory.listIndexesOf(clientSession, namespace, resultClass, codecRegistry, readPreference, executor, retryReads);
+    }
+
+    public static <TDocument, TResult>
+    MapReduceIterable<TResult> mapReduceOf(final @Nullable ClientSession clientSession, final MongoNamespace namespace,
+                                           final Class<TDocument> documentClass, final Class<TResult> resultClass,
+                                           final CodecRegistry codecRegistry, final ReadPreference readPreference,
+                                           final ReadConcern readConcern, final WriteConcern writeConcern, final OperationExecutor executor,
+                                           final String mapFunction, final String reduceFunction) {
+        return factory.mapReduceOf(clientSession, namespace, documentClass, resultClass, codecRegistry, readPreference, readConcern,
+                writeConcern, executor, mapFunction, reduceFunction);
+    }
+
+    private MongoIterables() {
+    }
+}
diff --git a/driver/src/main/com/mongodb/MongoMappingCursor.java b/driver-sync/src/main/com/mongodb/client/internal/MongoMappingCursor.java
similarity index 83%
rename from driver/src/main/com/mongodb/MongoMappingCursor.java
rename to driver-sync/src/main/com/mongodb/client/internal/MongoMappingCursor.java
index 3c223b79306..bb7effa4cbf 100644
--- a/driver/src/main/com/mongodb/MongoMappingCursor.java
+++ b/driver-sync/src/main/com/mongodb/client/internal/MongoMappingCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-package com.mongodb;
+package com.mongodb.client.internal;
 
+import com.mongodb.Function;
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
 import com.mongodb.client.MongoCursor;
+import com.mongodb.lang.Nullable;
 
 import static com.mongodb.assertions.Assertions.notNull;
 
@@ -24,7 +28,7 @@ class MongoMappingCursor<T, U> implements MongoCursor<U> {
     private final MongoCursor<T> proxied;
     private final Function<T, U> mapper;
 
-    public MongoMappingCursor(final MongoCursor<T> proxied, final Function<T, U> mapper) {
+    MongoMappingCursor(final MongoCursor<T> proxied, final Function<T, U> mapper) {
         this.proxied = notNull("proxied", proxied);
         this.mapper = notNull("mapper", mapper);
     }
@@ -44,6 +48,7 @@ public U next() {
         return mapper.apply(proxied.next());
     }
 
+    @Nullable
     @Override
     public U tryNext() {
         T proxiedNext = proxied.tryNext();
@@ -59,6 +64,7 @@ public void remove() {
         proxied.remove();
     }
 
+    @Nullable
     @Override
     public ServerCursor getServerCursor() {
         return proxied.getServerCursor();
diff --git a/driver-sync/src/main/com/mongodb/client/internal/OperationExecutor.java b/driver-sync/src/main/com/mongodb/client/internal/OperationExecutor.java
new file mode 100644
index 00000000000..e6c80f87f4f
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/OperationExecutor.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.operation.WriteOperation;
+import com.mongodb.client.ClientSession;
+
+/**
+ * An interface describing the execution of a read or a write operation.
+ *
+ * This class is not part of the public API and may be removed or changed at any time.
+ */
+public interface OperationExecutor {
+    /**
+     * Execute the read operation with the given read preference.
+     *
+     * @param <T> the operations result type.
+     * @param operation the read operation.
+     * @param readPreference the read preference.
+     * @param readConcern the read concern
+     * @return the result of executing the operation.
+     */
+    <T> T execute(ReadOperation<T> operation, ReadPreference readPreference, ReadConcern readConcern);
+
+    /**
+     * Execute the write operation.
+     *
+     * @param operation the write operation.
+     * @param readConcern the read concern
+     * @param <T> the operations result type.
+     * @return the result of executing the operation.
+     */
+    <T> T execute(WriteOperation<T> operation, ReadConcern readConcern);
+
+    /**
+     * Execute the read operation with the given read preference.
+     *
+     * @param <T> the operations result type.
+     * @param operation the read operation.
+     * @param readPreference the read preference.
+     * @param readConcern the read concern
+     * @param session the session to associate this operation with
+     * @return the result of executing the operation.
+     */
+    <T> T execute(ReadOperation<T> operation, ReadPreference readPreference, ReadConcern readConcern, @Nullable ClientSession session);
+
+    /**
+     * Execute the write operation.
+     *
+     * @param operation the write operation.
+     * @param readConcern the read concern
+     * @param session the session to associate this operation with
+     * @param <T> the operations result type.
+     * @return the result of executing the operation.
+     */
+    <T> T execute(WriteOperation<T> operation, ReadConcern readConcern, @Nullable ClientSession session);
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/SimpleMongoClient.java b/driver-sync/src/main/com/mongodb/client/internal/SimpleMongoClient.java
new file mode 100644
index 00000000000..4064bd74b56
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/SimpleMongoClient.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.client.MongoDatabase;
+
+import java.io.Closeable;
+
+// To unify the two MongoClients
+public interface SimpleMongoClient extends Closeable {
+
+    MongoDatabase getDatabase(String databaseName);
+
+    void close();
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/SimpleMongoClients.java b/driver-sync/src/main/com/mongodb/client/internal/SimpleMongoClients.java
new file mode 100644
index 00000000000..35519be6ff4
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/SimpleMongoClients.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoDatabase;
+
+final class SimpleMongoClients {
+
+    static SimpleMongoClient create(final MongoClient mongoClient) {
+        return new SimpleMongoClient() {
+            @Override
+            public MongoDatabase getDatabase(final String databaseName) {
+                return mongoClient.getDatabase(databaseName);
+            }
+
+            @Override
+            public void close() {
+                mongoClient.close();
+            }
+        };
+    }
+
+    private SimpleMongoClients() {
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/internal/package-info.java b/driver-sync/src/main/com/mongodb/client/internal/package-info.java
new file mode 100644
index 00000000000..4ad4a9813dd
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/internal/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@NonNullApi
+package com.mongodb.client.internal;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-sync/src/main/com/mongodb/client/package-info.java b/driver-sync/src/main/com/mongodb/client/package-info.java
new file mode 100644
index 00000000000..f98e983c21c
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the synchronous CRUD API.
+ */
+@NonNullApi
+package com.mongodb.client;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-sync/src/main/com/mongodb/client/vault/ClientEncryption.java b/driver-sync/src/main/com/mongodb/client/vault/ClientEncryption.java
new file mode 100644
index 00000000000..36d33ed11c0
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/vault/ClientEncryption.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.vault;
+
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import org.bson.BsonBinary;
+import org.bson.BsonValue;
+
+import java.io.Closeable;
+
+/**
+ * The Key vault.
+ * <p>
+ * Used to create data encryption keys, and to explicitly encrypt and decrypt values when auto-encryption is not an option.
+ * </p>
+ *
+ * @since 3.11
+ */
+public interface ClientEncryption extends Closeable {
+
+    /**
+     * Create a data key with the given KMS provider.
+     *
+     * <p>
+     * Creates a new key document and inserts into the key vault collection.
+     * </p>
+     *
+     * @param kmsProvider the KMS provider
+     * @return the identifier for the created data key
+     */
+    BsonBinary createDataKey(String kmsProvider);
+
+    /**
+     * Create a data key with the given KMS provider and options.
+     *
+     * <p>
+     * Creates a new key document and inserts into the key vault collection.
+     * </p>
+     *
+     * @param kmsProvider    the KMS provider
+     * @param dataKeyOptions the options for data key creation
+     * @return the identifier for the created data key
+     */
+    BsonBinary createDataKey(String kmsProvider, DataKeyOptions dataKeyOptions);
+
+    /**
+     * Encrypt the given value with the given options.
+     * <p>
+     *  The driver may throw an exception for prohibited BSON value types
+     * </p>
+     *
+     * @param value   the value to encrypt
+     * @param options the options for data encryption
+     * @return the encrypted value, a BSON binary of subtype 6
+     */
+    BsonBinary encrypt(BsonValue value, EncryptOptions options);
+
+    /**
+     * Decrypt the given value.
+     *
+     * @param value the value to decrypt, which must be of subtype 6
+     * @return the decrypted value
+     */
+    BsonValue decrypt(BsonBinary value);
+
+    @Override
+    void close();
+}
diff --git a/driver-sync/src/main/com/mongodb/client/vault/ClientEncryptions.java b/driver-sync/src/main/com/mongodb/client/vault/ClientEncryptions.java
new file mode 100644
index 00000000000..e3efe6f4154
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/vault/ClientEncryptions.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.vault;
+
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.client.internal.ClientEncryptionImpl;
+
+/**
+ * Factory for ClientEncryption implementations.
+ *
+ * @since 3.11
+ */
+public final class ClientEncryptions {
+
+    /**
+     * Create a key vault with the given options.
+     *
+     * @param options the key vault options
+     * @return the key vault
+     */
+    public static ClientEncryption create(final ClientEncryptionSettings options) {
+        return new ClientEncryptionImpl(options);
+    }
+
+    private ClientEncryptions() {
+    }
+}
diff --git a/driver-sync/src/main/com/mongodb/client/vault/package-info.java b/driver-sync/src/main/com/mongodb/client/vault/package-info.java
new file mode 100644
index 00000000000..726f7fd8fd5
--- /dev/null
+++ b/driver-sync/src/main/com/mongodb/client/vault/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the Key Vault API
+ *
+ * <p>
+ * Note: support for client-side encryption is in beta.  Backwards-breaking changes may be made before the final release.
+ * </p>
+ * @since 3.11
+ */
+
+@NonNullApi
+package com.mongodb.client.vault;
+
+import com.mongodb.lang.NonNullApi;
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java
new file mode 100644
index 00000000000..91f402b5959
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoWriteConcernException;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.ValidationOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.CrudTestHelper.replaceTypeAssertionWithActual;
+import static com.mongodb.client.Fixture.getMongoClient;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/client-side-encryption/tests
+@RunWith(Parameterized.class)
+public abstract class AbstractClientSideEncryptionTest {
+
+    @SuppressWarnings({"FieldCanBeLocal", "unused"})
+    private final String filename;
+    private final BsonDocument specDocument;
+    private final String description;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private JsonPoweredCrudTestHelper helper;
+    private TestCommandListener commandListener;
+    private CollectionHelper<BsonDocument> collectionHelper;
+
+    public AbstractClientSideEncryptionTest(final String filename, final String description, final BsonDocument specDocument,
+                                            final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.specDocument = specDocument;
+        this.description = description;
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    private boolean hasErrorContainsField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorContains");
+    }
+
+    private boolean hasErrorCodeNameField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorCodeName");
+    }
+
+    private boolean hasErrorField(final BsonValue expectedResult, final String key) {
+        return expectedResult != null && expectedResult.isDocument() && expectedResult.asDocument().containsKey(key);
+    }
+
+    private String getErrorField(final BsonValue expectedResult, final String key) {
+        if (hasErrorField(expectedResult, key)) {
+            return expectedResult.asDocument().getString(key).getValue();
+        } else {
+            return "";
+        }
+    }
+
+    private String getErrorContainsField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorContains");
+    }
+
+    private String getErrorCodeNameField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorCodeName");
+    }
+
+
+    @Before
+    public void setUp() {
+        assumeTrue("Client side encryption tests disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+        assumeFalse("Client side encryption requires Java 8+", isNotAtLeastJava8());
+        assumeFalse("runOn requirements not satisfied", skipTest);
+        assumeFalse(definition.getString("skipReason", new BsonString("")).getValue(), definition.containsKey("skipReason"));
+
+        String databaseName = specDocument.getString("database_name").getValue();
+        String collectionName = specDocument.getString("collection_name").getValue();
+        collectionHelper = new CollectionHelper<BsonDocument>(new BsonDocumentCodec(), new MongoNamespace(databaseName, collectionName));
+        MongoDatabase database = getMongoClient().getDatabase(databaseName);
+        MongoCollection<BsonDocument> collection = database
+                .getCollection(collectionName, BsonDocument.class);
+        collection.drop();
+
+        /* Create the collection for auto encryption. */
+        if (specDocument.containsKey("json_schema")) {
+            database.createCollection(collectionName, new CreateCollectionOptions()
+                    .validationOptions(new ValidationOptions()
+                            .validator(new BsonDocument("$jsonSchema", specDocument.getDocument("json_schema")))));
+        }
+
+        /* Insert data into the collection */
+        List<BsonDocument> documents = new ArrayList<BsonDocument>();
+        if (!data.isEmpty()) {
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+            database.getCollection(collectionName, BsonDocument.class).insertMany(documents);
+        }
+
+        /* Insert data into the "admin.datakeys" key vault. */
+        BsonArray data = specDocument.getArray("key_vault_data", new BsonArray());
+        collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
+        collection.drop();
+        if (!data.isEmpty()) {
+            documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+            collection.insertMany(documents);
+        }
+
+
+        commandListener = new TestCommandListener();
+
+        BsonDocument clientOptions = definition.getDocument("clientOptions");
+        BsonDocument cryptOptions = clientOptions.getDocument("autoEncryptOpts");
+        BsonDocument kmsProviders = cryptOptions.getDocument("kmsProviders");
+        boolean bypassAutoEncryption = cryptOptions.getBoolean("bypassAutoEncryption", BsonBoolean.FALSE).getValue();
+
+        Map<String, BsonDocument> namespaceToSchemaMap = new HashMap<String, BsonDocument>();
+
+        if (cryptOptions.containsKey("schemaMap")) {
+            BsonDocument autoEncryptMapDocument = cryptOptions.getDocument("schemaMap");
+
+            for (Map.Entry<String, BsonValue> entries : autoEncryptMapDocument.entrySet()) {
+                final BsonDocument autoEncryptOptionsDocument = entries.getValue().asDocument();
+                namespaceToSchemaMap.put(entries.getKey(), autoEncryptOptionsDocument);
+            }
+        }
+
+        Map<String, Object> extraOptions = new HashMap<String, Object>();
+        if (cryptOptions.containsKey("extraOptions")) {
+            BsonDocument extraOptionsDocument = cryptOptions.getDocument("extraOptions");
+            if (extraOptionsDocument.containsKey("mongocryptdSpawnArgs")) {
+                List<String> mongocryptdSpawnArgsValue = new ArrayList<String>();
+                for (BsonValue cur: extraOptionsDocument.getArray("mongocryptdSpawnArgs")) {
+                    mongocryptdSpawnArgsValue.add(cur.asString().getValue());
+                }
+                extraOptions.put("mongocryptdSpawnArgs", mongocryptdSpawnArgsValue);
+            }
+            if (extraOptionsDocument.containsKey("mongocryptdBypassSpawn")) {
+                extraOptions.put("mongocryptdBypassSpawn", extraOptionsDocument.getBoolean("mongocryptdBypassSpawn").getValue());
+            }
+            if (extraOptionsDocument.containsKey("mongocryptdURI")) {
+                extraOptions.put("mongocryptdURI", extraOptionsDocument.getString("mongocryptdURI").getValue());
+            }
+        }
+
+        Map<String, Map<String, Object>> kmsProvidersMap = new HashMap<String, Map<String, Object>>();
+
+        for (String kmsProviderKey : kmsProviders.keySet()) {
+            BsonDocument kmsProviderOptions = kmsProviders.get(kmsProviderKey).asDocument();
+            Map<String, Object> kmsProviderMap = new HashMap<String, Object>();
+
+            if (kmsProviderKey.equals("aws")) {
+                kmsProviderMap.put("accessKeyId", System.getProperty("org.mongodb.test.awsAccessKeyId"));
+                kmsProviderMap.put("secretAccessKey", System.getProperty("org.mongodb.test.awsSecretAccessKey"));
+                kmsProvidersMap.put("aws", kmsProviderMap);
+            } else if (kmsProviderKey.equals("local")) {
+                kmsProviderMap.put("key", kmsProviderOptions.getBinary("key").getData());
+                kmsProvidersMap.put("local", kmsProviderMap);
+            }
+        }
+
+        String keyVaultNamespace = "admin.datakeys";
+        if (cryptOptions.containsKey("keyVaultNamespace")) {
+            keyVaultNamespace = cryptOptions.getString("keyVaultNamespace").getValue();
+        }
+
+        createMongoClient(AutoEncryptionSettings.builder()
+                .keyVaultNamespace(keyVaultNamespace)
+                .kmsProviders(kmsProvidersMap)
+                .schemaMap(namespaceToSchemaMap)
+                .bypassAutoEncryption(bypassAutoEncryption)
+                .extraOptions(extraOptions)
+                .build(), commandListener);
+
+        database = getDatabase(databaseName);
+        helper = new JsonPoweredCrudTestHelper(description, database, database.getCollection("default", BsonDocument.class));
+    }
+
+    protected abstract void createMongoClient(AutoEncryptionSettings build, TestCommandListener commandListener);
+
+    protected abstract MongoDatabase getDatabase(String databaseName);
+
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        for (BsonValue cur : definition.getArray("operations")) {
+            BsonDocument operation = cur.asDocument();
+            String operationName = operation.getString("name").getValue();
+            BsonValue expectedResult = operation.get("result");
+            try {
+                BsonDocument actualOutcome = helper.getOperationResults(operation);
+                if (expectedResult != null) {
+                    BsonValue actualResult = actualOutcome.get("result");
+                    assertEquals("Expected operation result differs from actual", expectedResult, actualResult);
+                }
+
+                assertFalse(String.format("Expected error '%s' but none thrown for operation %s",
+                        getErrorContainsField(expectedResult), operationName), hasErrorContainsField(expectedResult));
+                assertFalse(String.format("Expected error code '%s' but none thrown for operation %s",
+                        getErrorCodeNameField(expectedResult), operationName), hasErrorCodeNameField(expectedResult));
+            } catch (RuntimeException e) {
+                boolean passedAssertion = false;
+                if (hasErrorContainsField(expectedResult)) {
+                    String expectedError = getErrorContainsField(expectedResult);
+                    assertTrue(String.format("Expected '%s' but got '%s' for operation %s", expectedError, e.getMessage(),
+                            operationName), e.getMessage().toLowerCase().contains(expectedError.toLowerCase()));
+                    passedAssertion = true;
+                }
+                if (hasErrorCodeNameField(expectedResult)) {
+                    String expectedErrorCodeName = getErrorCodeNameField(expectedResult);
+                    if (e instanceof MongoCommandException) {
+                        assertEquals(expectedErrorCodeName, ((MongoCommandException) e).getErrorCodeName());
+                        passedAssertion = true;
+                    } else if (e instanceof MongoWriteConcernException) {
+                        assertEquals(expectedErrorCodeName, ((MongoWriteConcernException) e).getWriteConcernError().getCodeName());
+                        passedAssertion = true;
+                    }
+                }
+                if (!passedAssertion) {
+                    throw e;
+                }
+            }
+
+        }
+
+        if (definition.containsKey("expectations")) {
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), "default", null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+            assertEventsEquality(expectedEvents, events);
+        }
+
+        BsonDocument expectedOutcome = definition.getDocument("outcome", new BsonDocument());
+        if (expectedOutcome.containsKey("collection")) {
+            List<BsonDocument> collectionData = collectionHelper.find();
+            List<BsonValue> expectedData = expectedOutcome.getDocument("collection").getArray("data").getValues();
+            assertEquals(collectionData.size(), expectedData.size());
+            int count = collectionData.size();
+            for (int i = 0; i < count; i++) {
+                BsonDocument actual = collectionData.get(i);
+                BsonDocument expected = expectedData.get(i).asDocument();
+                replaceTypeAssertionWithActual(expected, actual);
+                assertEquals(expected, actual);
+            }
+        }
+
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/client-side-encryption")) {
+            BsonDocument specDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : specDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(), specDocument,
+                        specDocument.getArray("data", new BsonArray()), test.asDocument(), skipTest(specDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractExplicitUuidCodecUuidRepresentationTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractExplicitUuidCodecUuidRepresentationTest.java
new file mode 100644
index 00000000000..65b3a168a31
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractExplicitUuidCodecUuidRepresentationTest.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import org.bson.BSONException;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.UuidCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+import org.bson.types.Binary;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.Hex;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+
+import static com.mongodb.MongoClientSettings.getDefaultCodecRegistry;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClient;
+import static org.bson.BsonBinarySubType.UUID_LEGACY;
+import static org.bson.BsonBinarySubType.UUID_STANDARD;
+import static org.bson.UuidRepresentation.C_SHARP_LEGACY;
+import static org.bson.UuidRepresentation.JAVA_LEGACY;
+import static org.bson.UuidRepresentation.PYTHON_LEGACY;
+import static org.bson.UuidRepresentation.STANDARD;
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(Parameterized.class)
+public abstract class AbstractExplicitUuidCodecUuidRepresentationTest {
+
+    private UuidRepresentation uuidRepresentationForExplicitEncoding;
+    private final UuidCodec uuidCodec;
+    private final UuidRepresentation uuidRepresentationForClient;
+    private final BsonBinarySubType subType;
+    private final UUID uuid;
+    private final byte[] encodedValue;
+    private byte[] standardEncodedValue;
+    private MongoCollection<Document> documentCollection;
+    private MongoCollection<DBObject> dbObjectCollection;
+    private MongoCollection<UuidIdPojo> uuidIdPojoCollection;
+    private MongoCollection<BsonDocument> bsonDocumentCollection;
+
+    public AbstractExplicitUuidCodecUuidRepresentationTest(final UuidRepresentation uuidRepresentationForClient,
+                                                           final UuidRepresentation uuidRepresentationForExplicitEncoding,
+                                                           final BsonBinarySubType subType,
+                                                           final UuidCodec uuidCodec, final UUID uuid,
+                                                           final byte[] encodedValue, final byte[] standardEncodedValue) {
+        this.uuidRepresentationForExplicitEncoding = uuidRepresentationForExplicitEncoding;
+        this.uuidRepresentationForClient = uuidRepresentationForClient;
+        this.uuidCodec = uuidCodec;
+        this.subType = subType;
+        this.uuid = uuid;
+        this.encodedValue = encodedValue;
+        this.standardEncodedValue = standardEncodedValue;
+    }
+
+    protected abstract void createMongoClient(UuidRepresentation uuidRepresentation, CodecRegistry codecRegistry);
+
+    protected abstract MongoDatabase getDatabase(String databaseName);
+
+    @Before
+    public void setUp() {
+        CodecRegistry codecRegistry = fromRegistries(
+                fromCodecs(uuidCodec), getDefaultCodecRegistry(),
+                fromProviders(PojoCodecProvider.builder().automatic(true).build()));
+
+        createMongoClient(uuidRepresentationForClient, codecRegistry);
+        MongoDatabase database = getDatabase(getDefaultDatabaseName());
+        documentCollection = database.getCollection(getClass().getName());
+        dbObjectCollection = documentCollection.withDocumentClass(DBObject.class);
+        uuidIdPojoCollection = documentCollection.withDocumentClass(UuidIdPojo.class);
+
+        bsonDocumentCollection = getMongoClient().getDatabase(getDefaultDatabaseName())
+                .getCollection(getClass().getName())
+                .withDocumentClass(BsonDocument.class);
+
+        bsonDocumentCollection.drop();
+    }
+
+    @Test
+    public void shouldEncodeDocumentWithUuidRepresentation() {
+        documentCollection.insertOne(new Document("_id", uuid));
+
+        BsonDocument document = bsonDocumentCollection.find().first();
+        assertNotNull(document);
+        BsonBinary uuidAsBinary = document.getBinary("_id");
+        assertEquals(subType.getValue(), uuidAsBinary.getType());
+        assertArrayEquals(encodedValue, uuidAsBinary.getData());
+    }
+
+    @Test
+    public void shouldEncodeDbObjectWithUuidRepresentation() {
+        dbObjectCollection.insertOne(new BasicDBObject("_id", uuid));
+
+        BsonDocument document = bsonDocumentCollection.find().first();
+        assertNotNull(document);
+        BsonBinary uuidAsBinary = document.getBinary("_id");
+        assertEquals(subType.getValue(), uuidAsBinary.getType());
+        assertEquals(subType.getValue(), uuidAsBinary.getType());
+        assertArrayEquals(encodedValue, uuidAsBinary.getData());
+    }
+
+    @Test
+    public void shouldEncodePojoWithUuidRepresentation() {
+        uuidIdPojoCollection.insertOne(new UuidIdPojo(uuid));
+
+        BsonDocument document = bsonDocumentCollection.find().first();
+        assertNotNull(document);
+        BsonBinary uuidAsBinary = document.getBinary("_id");
+        assertEquals(subType.getValue(), uuidAsBinary.getType());
+        assertArrayEquals(encodedValue, uuidAsBinary.getData());
+    }
+
+    @Test
+    public void shouldDecodeDocumentWithUuidRepresentation() {
+        bsonDocumentCollection.insertOne(new BsonDocument("standard", new BsonBinary(uuid, UuidRepresentation.STANDARD))
+                .append("legacy", new BsonBinary(uuid, uuidRepresentationForExplicitEncoding)));
+
+        Document document;
+        try {
+            document = documentCollection.find().first();
+            assertNotNull(document);
+        } catch (BSONException e) {
+            if (uuidCodec.getUuidRepresentation() != STANDARD) {
+                throw e;
+            }
+            return;
+        }
+
+        if (uuidRepresentationForClient == UuidRepresentation.STANDARD) {
+            assertEquals(UUID.class, document.get("standard").getClass());
+            assertEquals(uuid, document.get("standard"));
+
+            assertEquals(Binary.class, document.get("legacy").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_LEGACY, encodedValue), document.get("legacy"));
+        } else {
+            if (uuidRepresentationForClient == UuidRepresentation.JAVA_LEGACY) {
+                assertEquals(UUID.class, document.get("standard").getClass());
+                assertEquals(uuid, document.get("standard"));
+            } else {
+                assertEquals(Binary.class, document.get("standard").getClass());
+                assertEquals(new Binary(BsonBinarySubType.UUID_STANDARD, standardEncodedValue), document.get("standard"));
+            }
+
+            assertEquals(UUID.class, document.get("legacy").getClass());
+            assertEquals(uuid, document.get("legacy"));
+        }
+    }
+
+    @Test
+    public void shouldDecodeDBObjectWithUuidRepresentation() {
+        bsonDocumentCollection.insertOne(new BsonDocument("standard", new BsonBinary(uuid, UuidRepresentation.STANDARD))
+                .append("legacy", new BsonBinary(uuid, uuidRepresentationForExplicitEncoding)));
+
+        DBObject document;
+        try {
+            document = dbObjectCollection.find().first();
+            assertNotNull(document);
+        } catch (BSONException e) {
+            if (uuidCodec.getUuidRepresentation() != STANDARD) {
+                throw e;
+            }
+            return;
+        }
+
+        if (uuidRepresentationForClient == UuidRepresentation.STANDARD) {
+            assertEquals(UUID.class, document.get("standard").getClass());
+            assertEquals(uuid, document.get("standard"));
+
+            assertEquals(Binary.class, document.get("legacy").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_LEGACY, encodedValue), document.get("legacy"));
+        } else {
+            if (uuidRepresentationForClient == UuidRepresentation.JAVA_LEGACY) {
+                assertEquals(UUID.class, document.get("standard").getClass());
+                assertEquals(uuid, document.get("standard"));
+            } else {
+                assertEquals(Binary.class, document.get("standard").getClass());
+                assertEquals(new Binary(BsonBinarySubType.UUID_STANDARD, standardEncodedValue), document.get("standard"));
+            }
+
+            assertEquals(UUID.class, document.get("legacy").getClass());
+            assertEquals(uuid, document.get("legacy"));
+        }
+    }
+
+    @Test
+    public void shouldDecodePojoWithStandardUuidRepresentation() {
+        bsonDocumentCollection.insertOne(new BsonDocument("_id", new BsonBinary(uuid, STANDARD)));
+
+        try {
+            UuidIdPojo document = uuidIdPojoCollection.find().first();
+            assertNotNull(document);
+            assertEquals(uuid, document.getId());
+        } catch (BSONException e) {
+            if (uuidCodec.getUuidRepresentation() == uuidRepresentationForClient) {
+                throw e;
+            }
+        }
+    }
+
+    @Test
+    public void shouldDecodePojoWithLegacyUuidRepresentation() {
+        bsonDocumentCollection.insertOne(new BsonDocument("_id", new BsonBinary(uuid, uuidRepresentationForExplicitEncoding)));
+
+        try {
+            UuidIdPojo document = uuidIdPojoCollection.find().first();
+            assertNotNull(document);
+            assertEquals(uuid, document.getId());
+        } catch (BSONException e) {
+            if (uuidCodec.getUuidRepresentation() == uuidRepresentationForExplicitEncoding) {
+                throw e;
+            }
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}/{1}/{2}")
+    public static Collection<Object[]> data() {
+        UUID uuid = UUID.fromString("00112233-4455-6677-8899-aabbccddeeff");
+
+        byte[] standardEncodedValue = Hex.decode("00112233445566778899AABBCCDDEEFF");
+
+        List<Object[]> data = new ArrayList<Object[]>();
+        data.add(new Object[]{
+                JAVA_LEGACY,
+                PYTHON_LEGACY,
+                UUID_STANDARD,
+                new UuidCodec(STANDARD),
+                uuid,
+                standardEncodedValue,
+                standardEncodedValue});
+        data.add(new Object[]{
+                STANDARD,
+                C_SHARP_LEGACY,
+                UUID_LEGACY,
+                new UuidCodec(UuidRepresentation.C_SHARP_LEGACY),
+                uuid,
+                Hex.decode("33221100554477668899AABBCCDDEEFF"),
+                standardEncodedValue});
+        data.add(new Object[]{
+                STANDARD,
+                JAVA_LEGACY,
+                UUID_LEGACY,
+                new UuidCodec(JAVA_LEGACY),
+                uuid,
+                Hex.decode("7766554433221100FFEEDDCCBBAA9988"),
+                standardEncodedValue});
+        data.add(new Object[]{
+                STANDARD,
+                PYTHON_LEGACY,
+                UUID_LEGACY,
+                new UuidCodec(PYTHON_LEGACY),
+                uuid,
+                standardEncodedValue,
+                standardEncodedValue});
+        return data;
+    }
+
+
+public static class UuidIdPojo {
+    private UUID id;
+
+    @SuppressWarnings("unused")
+    public UuidIdPojo() {
+    }
+
+    UuidIdPojo(final UUID id) {
+        this.id = id;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(final UUID id) {
+        this.id = id;
+    }
+}
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java
new file mode 100644
index 00000000000..e7c9fad6806
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java
@@ -0,0 +1,615 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.Block;
+import com.mongodb.ClientSessionOptions;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoWriteConcernException;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.getConnectionString;
+import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+@RunWith(Parameterized.class)
+public abstract class AbstractUnifiedTest {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private JsonPoweredCrudTestHelper helper;
+    private final TestCommandListener commandListener;
+    private MongoClient mongoClient;
+    private CollectionHelper<Document> collectionHelper;
+    private Map<String, ClientSession> sessionsMap;
+    private Map<String, BsonDocument> lsidMap;
+    private boolean useMultipleMongoses = false;
+    private ConnectionString connectionString = null;
+    private final String collectionName = "test";
+
+    private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
+
+    public AbstractUnifiedTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+                               final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = getDefaultDatabaseName();
+        this.data = data;
+        this.definition = definition;
+        this.commandListener = new TestCommandListener();
+        this.skipTest = skipTest;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        assumeTrue("Skipping test: " + definition.getString("skipReason", new BsonString("")).getValue(),
+                !definition.containsKey("skipReason"));
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+
+        collectionHelper.killAllSessions();
+        collectionHelper.create(collectionName, new CreateCollectionOptions(), WriteConcern.MAJORITY);
+
+        if (!data.isEmpty()) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+
+            collectionHelper.insertDocuments(documents, WriteConcern.MAJORITY);
+        }
+
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+
+        final BsonDocument clientOptions = definition.getDocument("clientOptions", new BsonDocument());
+
+        connectionString = getConnectionString();
+        useMultipleMongoses = definition.getBoolean("useMultipleMongoses", BsonBoolean.FALSE).getValue();
+        if (useMultipleMongoses) {
+            assumeTrue(isSharded());
+            connectionString = getMultiMongosConnectionString();
+            assumeTrue("The system property org.mongodb.test.transaction.uri is not set.", connectionString != null);
+        }
+
+        MongoClientSettings.Builder builder = getMongoClientSettingsBuilder()
+                .applyConnectionString(connectionString)
+                .addCommandListener(commandListener)
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+                    @Override
+                    public void apply(final SocketSettings.Builder builder) {
+                        builder.readTimeout(5, TimeUnit.SECONDS);
+                    }
+                })
+                .writeConcern(getWriteConcern(clientOptions))
+                .readConcern(getReadConcern(clientOptions))
+                .readPreference(getReadPreference(clientOptions))
+                .retryWrites(clientOptions.getBoolean("retryWrites", BsonBoolean.FALSE).getValue())
+                .retryReads(false)
+                .applyToServerSettings(new Block<ServerSettings.Builder>() {
+                    @Override
+                    public void apply(final ServerSettings.Builder builder) {
+                        builder.minHeartbeatFrequency(MIN_HEARTBEAT_FREQUENCY_MS, MILLISECONDS);
+                    }
+                });
+        if (clientOptions.containsKey("heartbeatFrequencyMS")) {
+            builder.applyToServerSettings(new Block<ServerSettings.Builder>() {
+                @Override
+                public void apply(final ServerSettings.Builder builder) {
+                    builder.heartbeatFrequency(clientOptions.getInt32("heartbeatFrequencyMS").intValue(), MILLISECONDS);
+                }
+            });
+        }
+        mongoClient = MongoClients.create(builder.build());
+
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+
+        if (useMultipleMongoses) {
+            // non-transactional distinct operation to avoid StaleDbVersion error
+            runDistinctOnEachNode();
+        }
+
+        helper = new JsonPoweredCrudTestHelper(description, database, database.getCollection(collectionName, BsonDocument.class));
+
+        ClientSession sessionZero = createSession("session0");
+        ClientSession sessionOne = createSession("session1");
+
+        sessionsMap = new HashMap<String, ClientSession>();
+        sessionsMap.put("session0", sessionZero);
+        sessionsMap.put("session1", sessionOne);
+        lsidMap = new HashMap<String, BsonDocument>();
+        lsidMap.put("session0", sessionZero.getServerSession().getIdentifier());
+        lsidMap.put("session1", sessionOne.getServerSession().getIdentifier());
+    }
+
+    private ReadConcern getReadConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readConcernLevel")) {
+             return new ReadConcern(ReadConcernLevel.fromString(clientOptions.getString("readConcernLevel").getValue()));
+        } else {
+            return ReadConcern.DEFAULT;
+        }
+    }
+
+    private WriteConcern getWriteConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("w")) {
+            if (clientOptions.isNumber("w")) {
+                return new WriteConcern(clientOptions.getNumber("w").intValue());
+            } else {
+                return new WriteConcern(clientOptions.getString("w").getValue());
+            }
+        } else {
+            return WriteConcern.ACKNOWLEDGED;
+        }
+    }
+
+    private ReadPreference getReadPreference(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readPreference")) {
+            return ReadPreference.valueOf(clientOptions.getString("readPreference").getValue());
+        } else {
+            return ReadPreference.primary();
+        }
+    }
+
+    private ClientSession createSession(final String sessionName) {
+        BsonDocument optionsDocument = definition.getDocument("sessionOptions", new BsonDocument())
+                .getDocument(sessionName, new BsonDocument());
+        ClientSessionOptions options = ClientSessionOptions.builder()
+                .causallyConsistent(optionsDocument.getBoolean("causalConsistency", BsonBoolean.TRUE).getValue())
+                .defaultTransactionOptions(createDefaultTransactionOptions(optionsDocument))
+                .build();
+        return mongoClient.startSession(options);
+    }
+
+    private TransactionOptions createDefaultTransactionOptions(final BsonDocument optionsDocument) {
+        TransactionOptions.Builder builder = TransactionOptions.builder();
+        if (optionsDocument.containsKey("defaultTransactionOptions")) {
+            BsonDocument defaultTransactionOptionsDocument = optionsDocument.getDocument("defaultTransactionOptions");
+            if (defaultTransactionOptionsDocument.containsKey("readConcern")) {
+                builder.readConcern(helper.getReadConcern(defaultTransactionOptionsDocument));
+            }
+            if (defaultTransactionOptionsDocument.containsKey("writeConcern")) {
+                builder.writeConcern(helper.getWriteConcern(defaultTransactionOptionsDocument));
+            }
+            if (defaultTransactionOptionsDocument.containsKey("readPreference")) {
+                builder.readPreference(helper.getReadPreference(defaultTransactionOptionsDocument));
+            }
+            if (defaultTransactionOptionsDocument.containsKey("maxCommitTimeMS")) {
+                builder.maxCommitTime(defaultTransactionOptionsDocument.getNumber("maxCommitTimeMS").longValue(), MILLISECONDS);
+            }
+        }
+        return builder.build();
+    }
+
+    private void runDistinctOnEachNode() {
+        List<String> hosts = connectionString.getHosts();
+        for (String host : hosts) {
+            runDistinctOnHost(host);
+        }
+    }
+
+    private void runDistinctOnHost(final String host) {
+        MongoClient client = MongoClients.create(MongoClientSettings.builder()
+                .applyConnectionString(connectionString)
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    public void apply(final ClusterSettings.Builder builder) {
+                        builder.hosts(singletonList(new ServerAddress(host)));
+                    }
+                }).build());
+        client.getDatabase(databaseName).getCollection(collectionName).distinct("_id", BsonValue.class).into(new BsonArray());
+        client.close();
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+
+        if (collectionHelper != null && definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(new BsonDocument("configureFailPoint",
+                    definition.getDocument("failPoint").getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+        }
+    }
+
+    private void closeAllSessions() {
+        for (ClientSession cur : sessionsMap.values()) {
+            cur.close();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        try {
+            executeOperations(definition.getArray("operations"), false);
+        } finally {
+            closeAllSessions();
+        }
+
+        if (definition.containsKey("expectations")) {
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName, null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+            assertEventsEquality(expectedEvents, events, lsidMap);
+        }
+
+        BsonDocument expectedOutcome = definition.getDocument("outcome", new BsonDocument());
+        if (expectedOutcome.containsKey("collection")) {
+            List<BsonDocument> collectionData = collectionHelper.find(new BsonDocumentCodec());
+            assertEquals(expectedOutcome.getDocument("collection").getArray("data").getValues(), collectionData);
+        }
+    }
+
+    private void executeOperations(final BsonArray operations, final boolean throwExceptions) {
+        TargetedFailPoint failPoint = null;
+
+        try {
+            for (BsonValue cur : operations) {
+                final BsonDocument operation = cur.asDocument();
+                String operationName = operation.getString("name").getValue();
+                BsonValue expectedResult = operation.get("result");
+                String receiver = operation.getString("object").getValue();
+
+                ClientSession clientSession = receiver.startsWith("session") ? sessionsMap.get(receiver) : null;
+                if (clientSession == null) {
+                    clientSession = operation.getDocument("arguments", new BsonDocument()).containsKey("session")
+                            ? sessionsMap.get(operation.getDocument("arguments").getString("session").getValue()) : null;
+                }
+                try {
+                    if (operationName.equals("startTransaction")) {
+                        BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                        if (arguments.containsKey("options")) {
+                            TransactionOptions transactionOptions = createTransactionOptions(arguments.getDocument("options"));
+                            nonNullClientSession(clientSession).startTransaction(transactionOptions);
+                        } else {
+                            nonNullClientSession(clientSession).startTransaction();
+                        }
+                    } else if (operationName.equals("commitTransaction")) {
+                        nonNullClientSession(clientSession).commitTransaction();
+                    } else if (operationName.equals("abortTransaction")) {
+                        nonNullClientSession(clientSession).abortTransaction();
+                    } else if (operationName.equals("withTransaction")) {
+                        final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+
+                        TransactionOptions transactionOptions = null;
+                        if (arguments.containsKey("options")) {
+                            transactionOptions = createTransactionOptions(arguments.getDocument("options"));
+                        }
+
+                        if (transactionOptions == null) {
+                            nonNullClientSession(clientSession).withTransaction(new TransactionBody<Object>() {
+                                @Override
+                                public Void execute() {
+                                    executeOperations(arguments.getDocument("callback").getArray("operations"), true);
+                                    return null;
+                                }
+                            });
+                        } else {
+                            nonNullClientSession(clientSession).withTransaction(new TransactionBody<Object>() {
+                                @Override
+                                public Void execute() {
+                                    executeOperations(arguments.getDocument("callback").getArray("operations"), true);
+                                    return null;
+                                }
+                            }, transactionOptions);
+                        }
+                    } else if (operationName.equals("targetedFailPoint")) {
+                        assertTrue(failPoint == null);
+                        failPoint = new TargetedFailPoint(operation);
+                        failPoint.executeFailPoint();
+                    } else if (operationName.equals("assertSessionPinned")) {
+                        final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                        assertNotNull(sessionsMap.get(arguments.getString("session").getValue()).getPinnedServerAddress());
+                    } else if (operationName.equals("assertSessionUnpinned")) {
+                        final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                        assertNull(sessionsMap.get(arguments.getString("session").getValue()).getPinnedServerAddress());
+                    } else if (operationName.equals("assertSessionTransactionState")) {
+                        final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+                        ClientSession session = sessionsMap.get(arguments.getString("session").getValue());
+                        String state = arguments.getString("state").getValue();
+                        if (state.equals("starting") || state.equals("in_progress")) {
+                            assertTrue(session.hasActiveTransaction());
+                        } else {
+                            assertFalse(session.hasActiveTransaction());
+                        }
+                    } else if (operationName.equals("endSession")) {
+                        clientSession.close();
+                    } else if (operation.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+                        try {
+                            helper.getOperationResults(operation, clientSession);
+                            fail("Error expected but none thrown");
+                        } catch (Exception e) {
+                            // Expected failure ignore
+                        }
+                    } else if (operationName.equals("assertDifferentLsidOnLastTwoCommands")) {
+                        List<CommandEvent> events = lastTwoCommandEvents();
+                        assertNotEquals(((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
+                                ((CommandStartedEvent) events.get(1)).getCommand().getDocument("lsid"));
+                    } else if (operationName.equals("assertSameLsidOnLastTwoCommands")) {
+                        List<CommandEvent> events = lastTwoCommandEvents();
+                        assertEquals(((CommandStartedEvent) events.get(0)).getCommand().getDocument("lsid"),
+                                ((CommandStartedEvent) events.get(1)).getCommand().getDocument("lsid"));
+                    } else if (operationName.equals("assertSessionDirty")) {
+                        assertNotNull(clientSession);
+                        assertNotNull(clientSession.getServerSession());
+                        assertTrue(clientSession.getServerSession().isMarkedDirty());
+                    } else if (operationName.equals("assertSessionNotDirty")) {
+                        assertNotNull(clientSession);
+                        assertNotNull(clientSession.getServerSession());
+                        assertFalse(clientSession.getServerSession().isMarkedDirty());
+                    } else {
+                        BsonDocument actualOutcome = helper.getOperationResults(operation, clientSession);
+                        if (expectedResult != null) {
+                            BsonValue actualResult = actualOutcome.get("result");
+                            if (actualResult.isDocument()) {
+                                if (((BsonDocument) actualResult).containsKey("recoveryToken")) {
+                                    ((BsonDocument) actualResult).remove("recoveryToken");
+                                }
+                            }
+
+                            assertEquals("Expected operation result differs from actual", expectedResult, actualResult);
+                        }
+                    }
+                    assertFalse(String.format("Expected error '%s' but none thrown for operation %s",
+                            getErrorContainsField(expectedResult), operationName), hasErrorContainsField(expectedResult));
+                    assertFalse(String.format("Expected error code '%s' but none thrown for operation %s",
+                            getErrorCodeNameField(expectedResult), operationName), hasErrorCodeNameField(expectedResult));
+                } catch (RuntimeException e) {
+                    if (!assertExceptionState(e, expectedResult, operationName) || throwExceptions) {
+                        throw e;
+                    }
+                }
+            }
+        } finally {
+            if (failPoint != null) {
+                failPoint.disableFailPoint();
+            }
+        }
+    }
+
+    private boolean assertExceptionState(final RuntimeException e, final BsonValue expectedResult, final String operationName) {
+        boolean passedAssertion = false;
+        if (hasErrorLabelsContainField(expectedResult)) {
+            if (e instanceof MongoException) {
+                MongoException mongoException = (MongoException) e;
+                for (String curErrorLabel : getErrorLabelsContainField(expectedResult)) {
+                    assertTrue(String.format("Expected error label '%s but found labels '%s' for operation %s",
+                            curErrorLabel, mongoException.getErrorLabels(), operationName),
+                            mongoException.hasErrorLabel(curErrorLabel));
+                }
+                passedAssertion = true;
+            }
+        }
+        if (hasErrorLabelsOmitField(expectedResult)) {
+            if (e instanceof MongoException) {
+                MongoException mongoException = (MongoException) e;
+                for (String curErrorLabel : getErrorLabelsOmitField(expectedResult)) {
+                    assertFalse(String.format("Expected error label '%s omitted but found labels '%s' for operation %s",
+                            curErrorLabel, mongoException.getErrorLabels(), operationName),
+                            mongoException.hasErrorLabel(curErrorLabel));
+                }
+                passedAssertion = true;
+            }
+        }
+        if (hasErrorContainsField(expectedResult)) {
+            String expectedError = getErrorContainsField(expectedResult);
+            assertTrue(String.format("Expected '%s' but got '%s' for operation %s", expectedError, e.getMessage(),
+                    operationName), e.getMessage().toLowerCase().contains(expectedError.toLowerCase()));
+            passedAssertion = true;
+        }
+        if (hasErrorCodeNameField(expectedResult)) {
+            String expectedErrorCodeName = getErrorCodeNameField(expectedResult);
+            if (e instanceof MongoCommandException) {
+                assertEquals(expectedErrorCodeName, ((MongoCommandException) e).getErrorCodeName());
+                passedAssertion = true;
+            } else if (e instanceof MongoWriteConcernException) {
+                assertEquals(expectedErrorCodeName, ((MongoWriteConcernException) e).getWriteConcernError().getCodeName());
+                passedAssertion = true;
+            }
+        }
+        return passedAssertion;
+    }
+
+    private List<CommandEvent> lastTwoCommandEvents() {
+        List<CommandEvent> events = commandListener.getCommandStartedEvents();
+        assertTrue(events.size() >= 2);
+        return events.subList(events.size() - 2, events.size());
+    }
+
+    private TransactionOptions createTransactionOptions(final BsonDocument options) {
+        TransactionOptions.Builder builder = TransactionOptions.builder();
+        if (options.containsKey("writeConcern")) {
+            builder.writeConcern(helper.getWriteConcern(options));
+        }
+        if (options.containsKey("readConcern")) {
+            builder.readConcern(helper.getReadConcern(options));
+        }
+        if (options.containsKey("readPreference")) {
+            builder.readPreference(helper.getReadPreference(options));
+        }
+        if (options.containsKey("maxCommitTimeMS")) {
+            builder.maxCommitTime(options.getNumber("maxCommitTimeMS").longValue(), MILLISECONDS);
+        }
+        return builder.build();
+    }
+
+    private String getErrorContainsField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorContains");
+    }
+
+    private String getErrorCodeNameField(final BsonValue expectedResult) {
+        return getErrorField(expectedResult, "errorCodeName");
+    }
+
+    private String getErrorField(final BsonValue expectedResult, final String key) {
+        if (hasErrorField(expectedResult, key)) {
+            return expectedResult.asDocument().getString(key).getValue();
+        } else {
+            return "";
+        }
+    }
+
+    private boolean hasErrorLabelsContainField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorLabelsContain");
+    }
+
+    private List<String> getErrorLabelsContainField(final BsonValue expectedResult) {
+        return getListOfStringsFromBsonArrays(expectedResult.asDocument(), "errorLabelsContain");
+    }
+
+    private boolean hasErrorLabelsOmitField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorLabelsOmit");
+    }
+
+    private List<String> getErrorLabelsOmitField(final BsonValue expectedResult) {
+        return getListOfStringsFromBsonArrays(expectedResult.asDocument(), "errorLabelsOmit");
+    }
+
+
+    private List<String> getListOfStringsFromBsonArrays(final BsonDocument expectedResult, final String arrayFieldName) {
+        List<String> errorLabelContainsList = new ArrayList<String>();
+        for (BsonValue cur : expectedResult.asDocument().getArray(arrayFieldName)) {
+            errorLabelContainsList.add(cur.asString().getValue());
+        }
+        return errorLabelContainsList;
+    }
+
+    private boolean hasErrorContainsField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorContains");
+    }
+
+    private boolean hasErrorCodeNameField(final BsonValue expectedResult) {
+        return hasErrorField(expectedResult, "errorCodeName");
+    }
+
+    private boolean hasErrorField(final BsonValue expectedResult, final String key) {
+        return expectedResult != null && expectedResult.isDocument() && expectedResult.asDocument().containsKey(key);
+    }
+
+    private ClientSession nonNullClientSession(@Nullable final ClientSession clientSession) {
+        if (clientSession == null) {
+            throw new IllegalArgumentException("clientSession can't be null in this context");
+        }
+        return clientSession;
+    }
+
+    private class TargetedFailPoint {
+        private final BsonDocument failPointDocument;
+        private final MongoDatabase adminDB;
+        private MongoClient mongoClient;
+
+        TargetedFailPoint(final BsonDocument operation) {
+            final BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+            final ClientSession clientSession = sessionsMap.get(arguments.getString("session").getValue());
+
+            if (clientSession.getPinnedServerAddress() != null) {
+                mongoClient = MongoClients.create(MongoClientSettings.builder()
+                        .applyConnectionString(connectionString)
+                        .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                            @Override
+                            public void apply(final ClusterSettings.Builder builder) {
+                                builder.hosts(singletonList(clientSession.getPinnedServerAddress()));
+                            }
+                        }).build());
+
+                adminDB = mongoClient.getDatabase("admin");
+            } else {
+                adminDB = null;
+            }
+            failPointDocument = arguments.getDocument("failPoint");
+        }
+
+        public void executeFailPoint() {
+            executeCommand(failPointDocument);
+        }
+
+        public void disableFailPoint() {
+            executeCommand(new BsonDocument("configureFailPoint",
+                    failPointDocument.getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+            if (mongoClient != null) {
+                mongoClient.close();
+            }
+        }
+
+        private void executeCommand(final BsonDocument doc) {
+            if (adminDB != null) {
+                adminDB.runCommand(doc);
+            } else {
+                collectionHelper.runAdminCommand(doc);
+            }
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractUuidRepresentationTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractUuidRepresentationTest.java
new file mode 100644
index 00000000000..27fa303dc7c
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/AbstractUuidRepresentationTest.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
+import org.bson.BSONException;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+import org.bson.types.Binary;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.Hex;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+
+import static com.mongodb.MongoClientSettings.getDefaultCodecRegistry;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClient;
+import static org.bson.UuidRepresentation.JAVA_LEGACY;
+import static org.bson.UuidRepresentation.STANDARD;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+@RunWith(Parameterized.class)
+public abstract class AbstractUuidRepresentationTest {
+    private final UuidRepresentation uuidRepresentation;
+    private final BsonBinarySubType subType;
+    private final UUID uuid;
+    private final byte[] encodedValue;
+    private byte[] standardEncodedValue;
+    private MongoCollection<Document> documentCollection;
+    private MongoCollection<DBObject> dbObjectCollection;
+    private MongoCollection<UuidIdPojo> uuidIdPojoCollection;
+    private MongoCollection<BsonDocument> bsonDocumentCollection;
+
+
+    public AbstractUuidRepresentationTest(final UuidRepresentation uuidRepresentation, final BsonBinarySubType subType,
+                                          final UUID uuid,
+                                          final byte[] encodedValue, final byte[] standardEncodedValue) {
+        this.uuidRepresentation = uuidRepresentation;
+        this.subType = subType;
+        this.uuid = uuid;
+        this.encodedValue = encodedValue;
+        this.standardEncodedValue = standardEncodedValue;
+    }
+
+    protected abstract void createMongoClient(UuidRepresentation uuidRepresentation, CodecRegistry codecRegistry);
+
+    protected abstract MongoDatabase getDatabase(String databaseName);
+
+
+    @Before
+    public void setUp() {
+        PojoCodecProvider pojoCodecProvider = PojoCodecProvider.builder().automatic(true).build();
+        CodecRegistry codecRegistry = fromRegistries(getDefaultCodecRegistry(), fromProviders(pojoCodecProvider));
+
+        createMongoClient(uuidRepresentation, codecRegistry);
+        MongoDatabase database = getDatabase(getDefaultDatabaseName());
+        documentCollection = database.getCollection(getClass().getName());
+        dbObjectCollection = documentCollection.withDocumentClass(DBObject.class);
+        uuidIdPojoCollection = documentCollection.withDocumentClass(UuidIdPojo.class);
+
+        bsonDocumentCollection = getMongoClient().getDatabase(getDefaultDatabaseName())
+                .getCollection(getClass().getName())
+                .withDocumentClass(BsonDocument.class);
+
+        bsonDocumentCollection.drop();
+    }
+
+    @Test
+    public void shouldEncodeDocumentWithUuidRepresentation() {
+
+        if (uuidRepresentation == UuidRepresentation.UNSPECIFIED) {
+            try {
+                documentCollection.insertOne(new Document("_id", uuid));
+                fail();
+            } catch (CodecConfigurationException e) {
+                // all good
+            }
+        } else {
+            documentCollection.insertOne(new Document("_id", uuid));
+
+            BsonDocument document = bsonDocumentCollection.find().first();
+            assertNotNull(document);
+            BsonBinary uuidAsBinary = document.getBinary("_id");
+            assertEquals(subType.getValue(), uuidAsBinary.getType());
+            assertArrayEquals(encodedValue, uuidAsBinary.getData());
+        }
+    }
+
+    @Test
+    public void shouldEncodeDbObjectWithUuidRepresentation() {
+
+        if (uuidRepresentation == UuidRepresentation.UNSPECIFIED) {
+            try {
+                dbObjectCollection.insertOne(new BasicDBObject("_id", uuid));
+                fail();
+            } catch (CodecConfigurationException e) {
+                // all good
+            }
+        } else {
+            dbObjectCollection.insertOne(new BasicDBObject("_id", uuid));
+
+            BsonDocument document = bsonDocumentCollection.find().first();
+            assertNotNull(document);
+            BsonBinary uuidAsBinary = document.getBinary("_id");
+            assertEquals(subType.getValue(), uuidAsBinary.getType());
+            assertEquals(subType.getValue(), uuidAsBinary.getType());
+            assertArrayEquals(encodedValue, uuidAsBinary.getData());
+        }
+    }
+
+    @Test
+    public void shouldEncodePojoWithUuidRepresentation() {
+        if (uuidRepresentation == UuidRepresentation.UNSPECIFIED) {
+            try {
+                uuidIdPojoCollection.insertOne(new UuidIdPojo(uuid));
+                fail();
+            } catch (CodecConfigurationException e) {
+                // all good
+            }
+        } else {
+            uuidIdPojoCollection.insertOne(new UuidIdPojo(uuid));
+
+            BsonDocument document = bsonDocumentCollection.find().first();
+            assertNotNull(document);
+            BsonBinary uuidAsBinary = document.getBinary("_id");
+            assertEquals(subType.getValue(), uuidAsBinary.getType());
+            assertEquals(subType.getValue(), uuidAsBinary.getType());
+            assertArrayEquals(encodedValue, uuidAsBinary.getData());
+        }
+    }
+
+    @Test
+    public void shouldDecodeDocumentWithUuidRepresentation() {
+
+        bsonDocumentCollection.insertOne(new BsonDocument("standard", new BsonBinary(uuid, UuidRepresentation.STANDARD))
+                .append("legacy", new BsonBinary(uuid,
+                        uuidRepresentation == UuidRepresentation.UNSPECIFIED || uuidRepresentation == UuidRepresentation.STANDARD
+                                ? UuidRepresentation.PYTHON_LEGACY
+                                : uuidRepresentation)));
+
+        Document document;
+        try {
+            document = documentCollection.find().first();
+            assertNotNull(document);
+        } catch (BSONException e) {
+            if (uuidRepresentation != STANDARD && uuidRepresentation != JAVA_LEGACY) {
+                throw e;
+            }
+            return;
+        }
+
+        if (uuidRepresentation == UuidRepresentation.UNSPECIFIED) {
+            assertEquals(Binary.class, document.get("standard").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_STANDARD, standardEncodedValue), document.get("standard"));
+
+            assertEquals(Binary.class, document.get("legacy").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_LEGACY, standardEncodedValue), document.get("legacy"));
+        } else if (uuidRepresentation == UuidRepresentation.STANDARD) {
+            assertEquals(UUID.class, document.get("standard").getClass());
+            assertEquals(uuid, document.get("standard"));
+
+            assertEquals(Binary.class, document.get("legacy").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_LEGACY, standardEncodedValue), document.get("legacy"));
+        } else {
+            if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY) {
+                assertEquals(UUID.class, document.get("standard").getClass());
+                assertEquals(uuid, document.get("standard"));
+            } else {
+                assertEquals(Binary.class, document.get("standard").getClass());
+                assertEquals(new Binary(BsonBinarySubType.UUID_STANDARD, standardEncodedValue), document.get("standard"));
+            }
+
+            assertEquals(UUID.class, document.get("legacy").getClass());
+            assertEquals(uuid, document.get("legacy"));
+        }
+    }
+
+    @Test
+    public void shouldDecodeDbObjectWithUuidRepresentation() {
+
+        bsonDocumentCollection.insertOne(new BsonDocument("standard", new BsonBinary(uuid, UuidRepresentation.STANDARD))
+                .append("legacy", new BsonBinary(uuid,
+                        uuidRepresentation == UuidRepresentation.UNSPECIFIED || uuidRepresentation == UuidRepresentation.STANDARD
+                                ? UuidRepresentation.PYTHON_LEGACY
+                                : uuidRepresentation)));
+
+        DBObject document;
+        try {
+            document = dbObjectCollection.find().first();
+            assertNotNull(document);
+        } catch (BSONException e) {
+            if (uuidRepresentation != STANDARD && uuidRepresentation != JAVA_LEGACY) {
+                throw e;
+            }
+            return;
+        }
+
+        if (uuidRepresentation == UuidRepresentation.UNSPECIFIED) {
+            assertEquals(Binary.class, document.get("standard").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_STANDARD, standardEncodedValue), document.get("standard"));
+
+            assertEquals(Binary.class, document.get("legacy").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_LEGACY, standardEncodedValue), document.get("legacy"));
+        } else if (uuidRepresentation == UuidRepresentation.STANDARD) {
+            assertEquals(UUID.class, document.get("standard").getClass());
+            assertEquals(uuid, document.get("standard"));
+
+            assertEquals(Binary.class, document.get("legacy").getClass());
+            assertEquals(new Binary(BsonBinarySubType.UUID_LEGACY, standardEncodedValue), document.get("legacy"));
+        } else {
+            if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY) {
+                assertEquals(UUID.class, document.get("standard").getClass());
+                assertEquals(uuid, document.get("standard"));
+            } else {
+                assertEquals(Binary.class, document.get("standard").getClass());
+                assertEquals(new Binary(BsonBinarySubType.UUID_STANDARD, standardEncodedValue), document.get("standard"));
+            }
+
+            assertEquals(UUID.class, document.get("legacy").getClass());
+            assertEquals(uuid, document.get("legacy"));
+        }
+    }
+
+    @Test
+    public void shouldDecodePojoWithStandardUuidRepresentation() {
+
+        bsonDocumentCollection.insertOne(new BsonDocument("_id", new BsonBinary(uuid, UuidRepresentation.STANDARD)));
+
+        try {
+            UuidIdPojo document = uuidIdPojoCollection.find().first();
+            assertNotNull(document);
+            assertEquals(uuid, document.getId());
+        } catch (BSONException e) {
+            assertNotEquals(UuidRepresentation.STANDARD, uuidRepresentation);
+        }
+    }
+
+    @Test
+    public void shouldDecodePojoWithLegacyUuidRepresentation() {
+
+        bsonDocumentCollection.insertOne(new BsonDocument("_id", new BsonBinary(uuid,
+                uuidRepresentation == UuidRepresentation.UNSPECIFIED || uuidRepresentation == UuidRepresentation.STANDARD
+                        ? UuidRepresentation.PYTHON_LEGACY
+                        : uuidRepresentation)));
+
+        try {
+            UuidIdPojo document = uuidIdPojoCollection.find().first();
+            assertNotNull(document);
+            assertEquals(uuid, document.getId());
+        } catch (BSONException e) {
+            assertNotEquals(UuidRepresentation.C_SHARP_LEGACY, uuidRepresentation);
+            assertNotEquals(UuidRepresentation.PYTHON_LEGACY, uuidRepresentation);
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}/{1}/{2}")
+    public static Collection<Object[]> data() {
+        UUID uuid = UUID.fromString("00112233-4455-6677-8899-aabbccddeeff");
+
+        byte[] standardEncodedValue = Hex.decode("00112233445566778899AABBCCDDEEFF");
+
+        List<Object[]> data = new ArrayList<Object[]>();
+        data.add(new Object[]{
+                UuidRepresentation.JAVA_LEGACY,
+                BsonBinarySubType.UUID_LEGACY,
+                uuid,
+                Hex.decode("7766554433221100FFEEDDCCBBAA9988"),
+                standardEncodedValue});
+        data.add(new Object[]{
+                UuidRepresentation.C_SHARP_LEGACY,
+                BsonBinarySubType.UUID_LEGACY,
+                uuid,
+                Hex.decode("33221100554477668899AABBCCDDEEFF"),
+                standardEncodedValue});
+        data.add(new Object[]{
+                UuidRepresentation.PYTHON_LEGACY,
+                BsonBinarySubType.UUID_LEGACY,
+                uuid,
+                standardEncodedValue,
+                standardEncodedValue});
+        data.add(new Object[]{
+                UuidRepresentation.STANDARD,
+                BsonBinarySubType.UUID_STANDARD,
+                uuid,
+                standardEncodedValue,
+                standardEncodedValue});
+        data.add(new Object[]{
+                UuidRepresentation.UNSPECIFIED,
+                null,
+                uuid,
+                null,
+                standardEncodedValue});
+        return data;
+    }
+
+    public static class UuidIdPojo {
+        private UUID id;
+
+        @SuppressWarnings("unused")
+        public UuidIdPojo() {
+        }
+
+        UuidIdPojo(final UUID id) {
+            this.id = id;
+        }
+
+        public UUID getId() {
+            return id;
+        }
+
+        public void setId(final UUID id) {
+            this.id = id;
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ChangeStreamProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/ChangeStreamProseTest.java
new file mode 100644
index 00000000000..17785a503ce
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ChangeStreamProseTest.java
@@ -0,0 +1,467 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoChangeStreamException;
+import com.mongodb.MongoCommandException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoInterruptedException;
+import com.mongodb.MongoQueryException;
+import com.mongodb.client.internal.MongoChangeStreamCursorImpl;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.operation.AggregateResponseBatchCursor;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+import org.bson.Document;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.ClusterFixture.serverVersionLessThan;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/change-streams/tests/README.rst#prose-tests
+public class ChangeStreamProseTest extends DatabaseTestCase {
+    private BsonDocument failPointDocument;
+
+    @Before
+    @Override
+    public void setUp() {
+        assumeTrue(canRunTests());
+        super.setUp();
+
+        // create the collection before starting tests
+        collection.insertOne(Document.parse("{ _id : 0 }"));
+    }
+
+    class ChangeStreamWatcher implements Runnable {
+        private volatile boolean interruptedExceptionOccurred = false;
+        private final MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor;
+
+        ChangeStreamWatcher(final MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor) {
+            this.cursor = cursor;
+        }
+
+        @Override
+        public void run() {
+            try {
+                cursor.next();
+            } catch (final MongoInterruptedException e) {
+                interruptedExceptionOccurred = true;
+            } finally {
+                cursor.close();
+            }
+        }
+
+        public boolean getInterruptedExceptionOccurred() {
+            return interruptedExceptionOccurred;
+        }
+    }
+
+    //
+    // Test that MongoInterruptedException is not retryable so that a thread can be interrupted.
+    //
+    @Test
+    public void testThreadInterrupted() throws InterruptedException {
+        final ChangeStreamWatcher watcher = new ChangeStreamWatcher(collection.watch().cursor());
+        final Thread t = new Thread(watcher);
+        t.start();
+        t.interrupt();
+        t.join();
+        assertTrue(watcher.getInterruptedExceptionOccurred());
+    }
+
+    //
+    // Test that the ChangeStream continuously tracks the last seen resumeToken.
+    //
+    @Test
+    public void testChangeStreamTracksResumeToken() {
+        MongoCursor<ChangeStreamDocument<Document>> cursor = collection.watch().iterator();
+
+        try {
+            collection.insertOne(Document.parse("{x: 1}"));
+            BsonDocument initialResumeToken = cursor.next().getResumeToken();
+            assertNotNull(initialResumeToken);
+
+            collection.insertOne(Document.parse("{x: 2}"));
+            BsonDocument nextResumeToken = cursor.next().getResumeToken();
+            assertNotNull(nextResumeToken);
+            assertNotEquals(initialResumeToken, nextResumeToken);
+        } finally {
+            cursor.close();
+        }
+    }
+
+    //
+    // Test that the ChangeStream will throw an exception if the server response is missing the resume token (if wire version is < 8).
+    //
+    @Test
+    public void testMissingResumeTokenThrowsException() {
+        boolean exceptionFound = false;
+
+        MongoCursor<ChangeStreamDocument<Document>> cursor = collection.watch(asList(Aggregates.project(Document.parse("{ _id : 0 }"))))
+                .iterator();
+        try {
+            collection.insertOne(Document.parse("{ x: 1 }"));
+            cursor.next();
+        } catch (MongoChangeStreamException e) {
+            exceptionFound = true;
+        } catch (MongoQueryException e) {
+            if (serverVersionAtLeast(4, 1)) {
+                exceptionFound = true;
+            }
+        } finally {
+            cursor.close();
+        }
+        assertTrue(exceptionFound);
+    }
+
+    //
+    // Test that the ChangeStream will automatically resume one time on a resumable error (including not master)
+    // with the initial pipeline and options, except for the addition/update of a resumeToken.
+    //
+    @Test
+    public void testResumeOneTimeOnError() {
+        assumeTrue(serverVersionAtLeast(4, 0));
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        collection.insertOne(Document.parse("{ x: 1 }"));
+        setFailPoint("getMore", 10107);
+        try {
+            assertNotNull(cursor.next());
+        } finally {
+            disableFailPoint();
+            cursor.close();
+        }
+    }
+
+    //
+    // Test that ChangeStream will not attempt to resume on any error encountered while executing an aggregate command.
+    //
+    @Test
+    public void testNoResumeForAggregateErrors() {
+        boolean exceptionFound = false;
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = null;
+
+        try {
+            cursor = collection.watch(asList(Document.parse("{ $unsupportedStage: { _id : 0 } }"))).cursor();
+        } catch (MongoCommandException e) {
+            exceptionFound = true;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        assertTrue(exceptionFound);
+    }
+
+    //
+    // ChangeStream will not attempt to resume after encountering error code 11601 (Interrupted), 136 (CappedPositionLost),
+    // or 237 (CursorKilled) while executing a getMore command.
+    //
+    @Test
+    public void testNoResumeErrors() {
+        assumeTrue(serverVersionAtLeast(4, 0));
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        collection.insertOne(Document.parse("{ x: 1 }"));
+
+        for (int errCode : asList(136, 237, 11601)) {
+            try {
+                setFailPoint("getMore", errCode);
+                cursor.next();
+            } catch (MongoException e) {
+                assertEquals(errCode, e.getCode());
+            } finally {
+                disableFailPoint();
+            }
+        }
+        cursor.close();
+    }
+
+    //
+    // Ensure that a cursor returned from an aggregate command with a cursor id and an initial empty batch
+    // is not closed on the driver side.
+    //
+    @Test
+    public void testCursorNotClosed() {
+        MongoCursor<ChangeStreamDocument<Document>> cursor = collection.watch().iterator();
+        assertNotNull(cursor.getServerCursor());
+        cursor.close();
+    }
+
+    //
+    // 11. For a ChangeStream under these conditions:
+    //   Running against a server >=4.0.7.
+    //   The batch is empty or has been iterated to the last document.
+    // Expected result:
+    //   getResumeToken must return the postBatchResumeToken from the current command response.
+    //
+    @Test
+    public void testGetResumeTokenReturnsPostBatchResumeToken() throws NoSuchFieldException, IllegalAccessException {
+        assumeTrue(serverVersionAtLeast(asList(4, 0, 7)));
+
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        assertNull(cursor.getResumeToken());
+        collection.insertOne(Document.parse("{ _id: 42, x: 1 }"));
+        try {
+            cursor.next();
+
+            // use reflection to access the postBatchResumeToken
+            AggregateResponseBatchCursor<?> batchCursor = getBatchCursor(cursor);
+            assertEquals(cursor.getResumeToken(), batchCursor.getPostBatchResumeToken());
+        } finally {
+            cursor.close();
+        }
+    }
+
+    //
+    // 12. For a ChangeStream under these conditions:
+    //   Running against a server <4.0.7.
+    //   The batch is empty or has been iterated to the last document.
+    // Expected result:
+    //   getResumeToken must return the _id of the last document returned if one exists.
+    //   getResumeToken must return resumeAfter from the initial aggregate if the option was specified.
+    //   If the resumeAfter option was not specified, the getResumeToken result must be empty.
+    //
+    @Test
+    public void testGetResumeTokenShouldWorkAsExpectedForEmptyAndIteratedBatch() {
+        assumeTrue(serverVersionLessThan(asList(4, 0, 7)));
+
+        BsonDocument resumeAfterToken;
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        try {
+            cursor.tryNext();
+            assertNull(cursor.getResumeToken());
+            collection.insertOne(Document.parse("{ _id: 42, x: 1 }"));
+            collection.insertOne(Document.parse("{ _id: 43, x: 1 }"));
+            resumeAfterToken = cursor.next().getResumeToken();
+
+            cursor.next(); // iterate to the end of the batch
+            BsonDocument lastResumeToken = cursor.getResumeToken();
+            assertNotNull(lastResumeToken);
+
+            cursor.tryNext(); // returns an empty batch
+            assertEquals(lastResumeToken, cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+
+        cursor = collection.watch().resumeAfter(resumeAfterToken).cursor();
+        try {
+            assertEquals(resumeAfterToken, cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+    }
+
+    //
+    // 13. For a ChangeStream under these conditions:
+    //   The batch is not empty.
+    //   The batch has been iterated up to but not including the last element.
+    // Expected result:
+    //   getResumeToken must return the _id of the previous document returned.
+    //
+    @Test
+    public void testGetResumeTokenEqualsIdOfPreviousDocument() {
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().batchSize(3).cursor();
+        collection.insertOne(Document.parse("{ _id: 42, x: 1 }"));
+        collection.insertOne(Document.parse("{ _id: 43, x: 1 }"));
+        collection.insertOne(Document.parse("{ _id: 44, x: 1 }"));
+        try {
+            cursor.next();
+            assertEquals(cursor.next().getResumeToken(), cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+    }
+
+    //
+    // 14. For a ChangeStream under these conditions: (startAfter only supported for 4.2)
+    //   The batch is not empty.
+    //   The batch hasn’t been iterated at all.
+    //   Only the initial aggregate command has been executed.
+    // Expected result:
+    //   getResumeToken must return startAfter from the initial aggregate if the option was specified.
+    //   If startAfter is not specified, the getResumeToken result must be empty.
+    //
+    @Test
+    public void testGetResumeTokenReturnsStartAfter() {
+        assumeTrue(serverVersionAtLeast(asList(4, 1, 11)));
+
+        BsonDocument resumeToken;
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        collection.insertOne(Document.parse("{ _id: 42, x: 1 }"));
+        collection.insertOne(Document.parse("{ _id: 43, x: 1 }"));
+        try {
+            resumeToken = cursor.next().getResumeToken();
+        } finally {
+            cursor.close();
+        }
+
+        cursor = collection.watch().startAfter(resumeToken).cursor();
+        try {
+            assertEquals(resumeToken, cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+
+        cursor = collection.watch().cursor();
+        try {
+            assertNull(cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+    }
+
+    //
+    // 14. For a ChangeStream under these conditions:
+    //   The batch is not empty.
+    //   The batch hasn’t been iterated at all.
+    //   Only the initial aggregate command has been executed.
+    // Expected result:
+    //   getResumeToken must return resumeAfter from the initial aggregate if the option was specified.
+    //   If resumeAfter is not specified, the getResumeToken result must be empty.
+    //
+    @Test
+    public void testGetResumeTokenReturnsResumeAfter() {
+        BsonDocument resumeAfterResumeToken;
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        collection.insertOne(Document.parse("{ _id: 42, x: 1 }"));
+        collection.insertOne(Document.parse("{ _id: 43, x: 1 }"));
+        try {
+            resumeAfterResumeToken = cursor.next().getResumeToken();
+        } finally {
+            cursor.close();
+        }
+
+        cursor = collection.watch().resumeAfter(resumeAfterResumeToken).cursor();
+        try {
+            assertEquals(resumeAfterResumeToken, cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+
+        cursor = collection.watch().cursor();
+        try {
+            assertNull(cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+    }
+
+    //
+    // 15. For a ChangeStream under these conditions:
+    //   Running against a server >=4.0.7.
+    //   The batch is not empty.
+    //   The batch hasn’t been iterated at all.
+    //   The stream has iterated beyond a previous batch and a getMore command has just been executed.
+    // Expected result:
+    //   getResumeToken must return the postBatchResumeToken from the previous command response.
+    //
+    @Test
+    public void testGetResumeTokenReturnsPostBatchResumeTokenAfterGetMore()
+            throws NoSuchFieldException, IllegalAccessException {
+        assumeTrue(serverVersionAtLeast(asList(4, 0, 7)));
+
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        collection.insertOne(Document.parse("{ _id: 42, x: 1 }"));
+        try {
+            // use reflection to access the postBatchResumeToken
+            AggregateResponseBatchCursor<?> batchCursor = getBatchCursor(cursor);
+
+            // check equality in the case where the batch has not been iterated at all
+            assertEquals(cursor.getResumeToken(), batchCursor.getPostBatchResumeToken());
+
+            cursor.next();
+            assertEquals(cursor.getResumeToken(), batchCursor.getPostBatchResumeToken());
+        } finally {
+            cursor.close();
+        }
+    }
+
+    //
+    // 16. For a ChangeStream under these conditions:
+    //   Running against a server <4.0.7.
+    //   The batch is not empty.
+    //   The batch hasn’t been iterated at all.
+    //   The stream has iterated beyond a previous batch and a getMore command has just been executed.
+    // Expected result:
+    //   getResumeToken must return the _id of the previous document returned if one exists.
+    //   getResumeToken must return resumeAfter from the initial aggregate if the option was specified.
+    //   If the resumeAfter option was not specified, the getResumeToken result must be empty.
+    //
+    @Test
+    public void testGetResumeTokenReturnsIdOfPreviousDocument() {
+        assumeTrue(serverVersionLessThan(asList(4, 0, 7)));
+
+        BsonDocument resumeToken;
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor = collection.watch().cursor();
+        collection.insertOne(Document.parse("{ _id: 42, x: 1 }"));
+        try {
+            cursor.next();
+            resumeToken = cursor.getResumeToken();
+            assertNotNull(resumeToken);
+
+            collection.insertOne(Document.parse("{ _id: 43, x: 1 }"));
+            cursor.next();
+            assertNotNull(cursor.getResumeToken());
+        } finally {
+            cursor.close();
+        }
+
+        MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor2 = collection.watch().resumeAfter(resumeToken).cursor();
+        try {
+            assertEquals(resumeToken, cursor2.getResumeToken());
+        } finally {
+            cursor2.close();
+        }
+    }
+
+    private void setFailPoint(final String command, final int errCode) {
+        failPointDocument = new BsonDocument("configureFailPoint", new BsonString("failCommand"))
+                .append("mode", new BsonDocument("times", new BsonInt32(1)))
+                .append("data", new BsonDocument("failCommands", new BsonArray(asList(new BsonString(command))))
+                        .append("errorCode", new BsonInt32(errCode)));
+        getCollectionHelper().runAdminCommand(failPointDocument);
+    }
+
+    private void disableFailPoint() {
+        getCollectionHelper().runAdminCommand(failPointDocument.append("mode", new BsonString("off")));
+    }
+
+    private boolean canRunTests() {
+        return isDiscoverableReplicaSet() && serverVersionAtLeast(3, 6);
+    }
+
+    private AggregateResponseBatchCursor<?> getBatchCursor(final MongoChangeStreamCursor<ChangeStreamDocument<Document>> cursor)
+            throws NoSuchFieldException, IllegalAccessException {
+        Field batchCursorField = MongoChangeStreamCursorImpl.class.getDeclaredField("batchCursor");
+        batchCursorField.setAccessible(true);
+        return (AggregateResponseBatchCursor<?>) (batchCursorField.get(cursor));
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ChangeStreamsTest.java b/driver-sync/src/test/functional/com/mongodb/client/ChangeStreamsTest.java
new file mode 100644
index 00000000000..59ba652984d
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ChangeStreamsTest.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.OperationType;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonValue;
+import org.bson.codecs.BsonDocumentCodec;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static java.lang.String.format;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/change-streams/tests
+@RunWith(Parameterized.class)
+public class ChangeStreamsTest {
+    private final String filename;
+    private final String description;
+    private final MongoNamespace namespace;
+    private final MongoNamespace namespace2;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+
+private MongoClient mongoClient;
+    private TestCommandListener commandListener;
+
+    public ChangeStreamsTest(final String filename, final String description, final MongoNamespace namespace,
+                             final MongoNamespace namespace2, final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.namespace = namespace;
+        this.namespace2 = namespace2;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+    }
+
+    @AfterClass
+    public static void afterClass() {
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        CollectionHelper.dropDatabase(namespace.getDatabaseName(), WriteConcern.MAJORITY);
+        CollectionHelper<BsonDocument> collectionHelper = new CollectionHelper<BsonDocument>(new BsonDocumentCodec(), namespace);
+        collectionHelper.drop();
+        collectionHelper.create();
+
+        CollectionHelper.dropDatabase(namespace2.getDatabaseName(), WriteConcern.MAJORITY);
+        CollectionHelper<BsonDocument> collectionHelper2 = new CollectionHelper<BsonDocument>(new BsonDocumentCodec(), namespace2);
+        collectionHelper2.drop();
+        collectionHelper2.create();
+
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+
+        commandListener = new TestCommandListener();
+        mongoClient = MongoClients.create(getMongoClientSettingsBuilder().addCommandListener(commandListener).build());
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        BsonDocument result = definition.getDocument("result");
+        MongoCursor<ChangeStreamDocument<BsonDocument>> cursor = createCursor(result);
+        if (cursor == null) {
+            return;
+        }
+
+        try {
+            handleOperations();
+
+            checkStreamValues(result, cursor);
+
+        } finally {
+            cursor.close();
+        }
+
+        checkExpectations();
+
+    }
+
+    private void checkStreamValues(final BsonDocument result, final MongoCursor<ChangeStreamDocument<BsonDocument>> cursor) {
+        for (BsonValue success : result.getArray("success", new BsonArray())) {
+            BsonDocument expected = success.asDocument();
+            ChangeStreamDocument<BsonDocument> actual = cursor.next();
+
+            MongoNamespace expectedNamespace = null;
+            if (expected.containsKey("ns")) {
+                BsonDocument nsDocument = expected.getDocument("ns");
+                expectedNamespace = nsDocument != null
+                        ? new MongoNamespace(nsDocument.getString("db").getValue(), nsDocument.getString("coll").getValue())
+                        : null;
+            }
+            assertEquals(expectedNamespace, actual.getNamespace());
+            assertEquals(OperationType.fromString(expected.getString("operationType").getValue()), actual.getOperationType());
+            if (actual.getFullDocument() != null) {
+                actual.getFullDocument().remove("_id");
+            }
+
+            assertEquals(expected.get("fullDocument"), actual.getFullDocument());
+        }
+        if (result.containsKey("error")) {
+            BsonDocument error = result.getDocument("error");
+            try {
+                cursor.next();
+            } catch (MongoException e) {
+                assertTrue(e.getCode() == error.getInt32("code").intValue()
+                        || !Collections.disjoint(e.getErrorLabels(), error.getArray("errorLabels")));
+            }
+        }
+    }
+
+    @Nullable
+    private MongoCursor<ChangeStreamDocument<BsonDocument>> createCursor(final BsonDocument result) {
+        MongoCursor<ChangeStreamDocument<BsonDocument>> cursor;
+        try {
+            cursor = createChangeStreamCursor();
+        } catch (MongoException e) {
+            assertEquals(result.getDocument("error", new BsonDocument()).getInt32("code", new BsonInt32(-1)).getValue(), e.getCode());
+            return null;
+        }
+        return cursor;
+    }
+
+    private void checkExpectations() {
+        if (definition.containsKey("expectations") && definition.getArray("expectations").size() > 0) {
+
+            String database = definition.getString("target").getValue().equals("client") ? "admin" : namespace.getDatabaseName();
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), database, new BsonDocument());
+            List<CommandEvent> events = commandListener.getEvents();
+
+            for (int i = 0; i < expectedEvents.size(); i++) {
+                CommandEvent expectedEvent = expectedEvents.get(i);
+                CommandEvent event = events.get(i);
+                CommandMonitoringTestHelper.assertEventsEquality(singletonList(expectedEvent), singletonList(event));
+            }
+        }
+    }
+
+
+    private MongoCursor<ChangeStreamDocument<BsonDocument>> createChangeStreamCursor() {
+        String target = definition.getString("target").getValue();
+        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
+        for (BsonValue bsonValue : definition.getArray("changeStreamPipeline", new BsonArray())) {
+            pipeline.add(bsonValue.asDocument());
+        }
+
+        ChangeStreamIterable<BsonDocument> changeStreamIterable;
+
+        if (target.equals("client")) {
+            changeStreamIterable = mongoClient.watch(pipeline, BsonDocument.class);
+        } else if (target.equals("database")) {
+            changeStreamIterable = mongoClient.getDatabase(namespace.getDatabaseName()).watch(pipeline, BsonDocument.class);
+        } else if (target.equals("collection")) {
+            changeStreamIterable = mongoClient.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName())
+                    .watch(pipeline, BsonDocument.class);
+        } else {
+            throw new IllegalArgumentException(format("Unknown target: %s", target));
+        }
+
+        BsonDocument options = definition.getDocument("changeStreamOptions", new BsonDocument());
+
+        if (options.containsKey("batchSize")) {
+            changeStreamIterable.batchSize(options.getNumber("batchSize").intValue());
+        }
+
+        return changeStreamIterable.iterator();
+    }
+
+    private void handleOperations() {
+        for (BsonValue operations : definition.getArray("operations")) {
+            BsonDocument op = operations.asDocument();
+            MongoNamespace opNamespace = new MongoNamespace(op.getString("database").getValue(), op.getString("collection").getValue());
+            createJsonPoweredCrudTestHelper(Fixture.getMongoClient(), opNamespace).getOperationResults(op);
+        }
+    }
+
+    private JsonPoweredCrudTestHelper createJsonPoweredCrudTestHelper(final MongoClient localMongoClient, final MongoNamespace namespace) {
+        return new JsonPoweredCrudTestHelper(description, localMongoClient.getDatabase(namespace.getDatabaseName()),
+                localMongoClient.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName(), BsonDocument.class));
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/change-streams")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            MongoNamespace namespace = new MongoNamespace(testDocument.getString("database_name").getValue(),
+                    testDocument.getString("collection_name").getValue());
+            MongoNamespace namespace2 = new MongoNamespace(testDocument.getString("database2_name").getValue(),
+                    testDocument.getString("collection2_name").getValue());
+
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        namespace, namespace2, test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientEncryptionCustomEndpointTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientEncryptionCustomEndpointTest.java
new file mode 100644
index 00000000000..626e35ec17e
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientEncryptionCustomEndpointTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientException;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.Fixture.getMongoClientSettings;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+@RunWith(Parameterized.class)
+public class ClientEncryptionCustomEndpointTest {
+
+    private ClientEncryption clientEncryption;
+    private BsonDocument masterKey;
+    private final Class<? extends RuntimeException> exceptionClass;
+    // Delay loading this class because one of the expected classes is MongoCryptException, which should only be loaded after we
+    // determine that we're running on Java 8+ (since MongoCryptException is compiled with Java 8 target version)
+    private final String wrappedExceptionClassName;
+    private final String messageContainedInException;
+
+    public ClientEncryptionCustomEndpointTest(@SuppressWarnings("unused") final String name,
+                                              final BsonDocument masterKey,
+                                              @Nullable final Class<? extends RuntimeException> exceptionClass,
+                                              @Nullable final String wrappedExceptionClassName,
+                                              @Nullable final String messageContainedInException) {
+        this.masterKey = masterKey;
+        this.exceptionClass = exceptionClass;
+        this.wrappedExceptionClassName = wrappedExceptionClassName;
+        this.messageContainedInException = messageContainedInException;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Encryption test with external keyVault is disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> awsCreds = new HashMap<String, Object>();
+        awsCreds.put("accessKeyId", System.getProperty("org.mongodb.test.awsAccessKeyId"));
+        awsCreds.put("secretAccessKey", System.getProperty("org.mongodb.test.awsSecretAccessKey"));
+        kmsProviders.put("aws", awsCreds);
+
+        ClientEncryptionSettings.Builder clientEncryptionSettingsBuilder = ClientEncryptionSettings.builder().
+                keyVaultMongoClientSettings(getMongoClientSettings())
+                .kmsProviders(kmsProviders)
+                .keyVaultNamespace("admin.datakeys");
+
+        ClientEncryptionSettings clientEncryptionSettings = clientEncryptionSettingsBuilder.build();
+        clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+    }
+
+    @After
+    public void after() {
+        if (clientEncryption != null) {
+            try {
+                clientEncryption.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+
+    @Test
+    public void testEndpoint() throws Exception {
+        try {
+            BsonBinary dataKeyId = clientEncryption.createDataKey("aws", new DataKeyOptions()
+                    .masterKey(masterKey));
+
+            assertNull("Expected exception, but encryption succeeded", exceptionClass);
+
+            clientEncryption.encrypt(new BsonString("test"), new EncryptOptions("AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+                    .keyId(dataKeyId));
+        } catch (Exception e) {
+            if (exceptionClass == null) {
+                throw e;
+            }
+            assertEquals(exceptionClass, e.getClass());
+            assertEquals(wrappedExceptionClassName, e.getCause().getClass().getName());
+            if (messageContainedInException != null) {
+                assertTrue(e.getCause().getMessage().contains(messageContainedInException));
+            }
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Object[]> data() {
+        List<Object[]> data = new ArrayList<Object[]>();
+
+        data.add(new Object[]{"default endpoint",
+                getDefaultMasterKey(),
+                null, null, null});
+        data.add(new Object[]{"valid endpoint",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-1.amazonaws.com")),
+                null, null, null});
+        data.add(new Object[]{"valid endpoint port",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-1.amazonaws.com:443")),
+                null, null, null});
+        data.add(new Object[]{"invalid endpoint port",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-1.amazonaws.com:12345")),
+                MongoClientException.class, "java.net.ConnectException", "Connection refused"});
+        data.add(new Object[]{"invalid amazon region in endpoint",
+                getDefaultMasterKey().append("endpoint", new BsonString("kms.us-east-2.amazonaws.com")),
+                MongoClientException.class, "com.mongodb.crypt.capi.MongoCryptException", "us-east-1"});
+        data.add(new Object[]{"invalid endpoint host",
+                getDefaultMasterKey().append("endpoint", new BsonString("example.com")),
+                MongoClientException.class, "com.mongodb.crypt.capi.MongoCryptException", "parse error"});
+
+        return data;
+    }
+
+    private static BsonDocument getDefaultMasterKey() {
+        return new BsonDocument()
+                .append("region", new BsonString("us-east-1"))
+                .append("key", new BsonString("arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"));
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy
new file mode 100644
index 00000000000..45765039482
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client
+
+import com.mongodb.AutoEncryptionSettings
+import com.mongodb.ClientEncryptionSettings
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoWriteException
+import com.mongodb.WriteConcern
+import com.mongodb.client.vault.ClientEncryption
+import com.mongodb.client.vault.ClientEncryptions
+import com.mongodb.internal.connection.TestCommandListener
+import org.bson.BsonDocument
+import org.bson.BsonString
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.client.Fixture.getDefaultDatabaseName
+import static com.mongodb.client.Fixture.getMongoClient
+import static com.mongodb.client.Fixture.getMongoClientSettings
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder
+import static java.util.Collections.singletonMap
+import static org.junit.Assume.assumeFalse
+import static org.junit.Assume.assumeTrue
+import static util.JsonPoweredTestHelper.getTestDocument
+
+class ClientSideEncryptionBsonSizeLimitsSpecification extends FunctionalSpecification {
+
+    private final String collectionName = 'ClientSideEncryptionBsonSizeLimitsSpecification'
+    private final MongoNamespace keyVaultNamespace = new MongoNamespace('test.datakeys')
+    private final MongoNamespace autoEncryptingCollectionNamespace = new MongoNamespace(getDefaultDatabaseName(),
+            collectionName)
+    private final MongoCollection dataKeyCollection = getMongoClient()
+            .getDatabase(keyVaultNamespace.databaseName).getCollection(keyVaultNamespace.collectionName, BsonDocument)
+            .withWriteConcern(WriteConcern.MAJORITY)
+    private final MongoCollection<BsonDocument> dataCollection = getMongoClient()
+            .getDatabase(autoEncryptingCollectionNamespace.databaseName).getCollection(autoEncryptingCollectionNamespace.collectionName,
+            BsonDocument)
+    private final TestCommandListener commandListener = new TestCommandListener()
+
+    private MongoClient autoEncryptingClient
+    private ClientEncryption clientEncryption
+    private MongoCollection<BsonDocument> autoEncryptingDataCollection
+
+    def setup() {
+        assumeFalse(isNotAtLeastJava8())
+        assumeTrue(serverVersionAtLeast(4, 2))
+        assumeTrue('Client encryption tests disabled',
+                System.getProperty('org.mongodb.test.awsAccessKeyId') != null
+                        && !System.getProperty('org.mongodb.test.awsAccessKeyId').isEmpty())
+        dataKeyCollection.drop()
+        dataCollection.drop()
+
+        dataKeyCollection.insertOne(getTestDocument('/client-side-encryption-limits/limits-key.json'))
+
+        def providerProperties =
+                ['local': ['key': Base64.getDecoder().decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN'
+                        + '3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk')]
+                ]
+
+        autoEncryptingClient = MongoClients.create(getMongoClientSettingsBuilder()
+                .autoEncryptionSettings(AutoEncryptionSettings.builder()
+                        .keyVaultNamespace(keyVaultNamespace.fullName)
+                        .kmsProviders(providerProperties)
+                        .schemaMap(singletonMap(autoEncryptingCollectionNamespace.fullName,
+                                getTestDocument('/client-side-encryption-limits/limits-schema.json')))
+                        .build())
+                .addCommandListener(commandListener)
+                .build())
+
+        autoEncryptingDataCollection = autoEncryptingClient.getDatabase(autoEncryptingCollectionNamespace.databaseName)
+                .getCollection(autoEncryptingCollectionNamespace.collectionName, BsonDocument)
+
+        clientEncryption = ClientEncryptions.create(ClientEncryptionSettings.builder()
+                .keyVaultMongoClientSettings(getMongoClientSettings())
+                .keyVaultNamespace(keyVaultNamespace.fullName)
+                .kmsProviders(providerProperties)
+                .build())
+    }
+
+    def 'test BSON size limits'() {
+        when:
+        autoEncryptingDataCollection.insertOne(
+                new BsonDocument('_id', new BsonString('over_2mib_under_16mib'))
+                        .append('unencrypted', new BsonString('a' * 2097152)))
+        then:
+        noExceptionThrown()
+
+        when:
+        autoEncryptingDataCollection.insertOne(getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                .append('_id', new BsonString('encryption_exceeds_2mib'))
+                .append('unencrypted', new BsonString('a' * (2097152 - 2000))))
+
+        then:
+        noExceptionThrown()
+
+        when:
+        commandListener.reset()
+        autoEncryptingDataCollection.insertMany(
+                [
+                        new BsonDocument('_id', new BsonString('over_2mib_1'))
+                                .append('unencrypted', new BsonString('a' * 2097152)),
+                        new BsonDocument('_id', new BsonString('over_2mib_2'))
+                                .append('unencrypted', new BsonString('a' * 2097152))
+                ])
+
+        then:
+        noExceptionThrown()
+        countStartedEvents('insert') == 2
+
+        when:
+        commandListener.reset()
+        autoEncryptingDataCollection.insertMany(
+                [
+                        getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                                .append('_id', new BsonString('encryption_exceeds_2mib_1'))
+                                .append('unencrypted', new BsonString('a' * (2097152 - 2000))),
+                        getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                                .append('_id', new BsonString('encryption_exceeds_2mib_2'))
+                                .append('unencrypted', new BsonString('a' * (2097152 - 2000))),
+                ])
+
+        then:
+        noExceptionThrown()
+        countStartedEvents('insert') == 2
+
+        when:
+        autoEncryptingDataCollection.insertOne(
+                new BsonDocument('_id', new BsonString('under_16mib'))
+                        .append('unencrypted', new BsonString('a' * (16777216 - 2000))))
+
+        then:
+        noExceptionThrown()
+
+        when:
+        autoEncryptingDataCollection.insertOne(getTestDocument('/client-side-encryption-limits/limits-doc.json')
+                .append('_id', new BsonString('encryption_exceeds_16mib'))
+                .append('unencrypted', new BsonString('a' * (16777216 - 2000))))
+
+        then:
+        thrown(MongoWriteException)
+    }
+
+    private int countStartedEvents(String name) {
+        int count = 0
+        for (def cur : commandListener.commandStartedEvents) {
+            if (cur.commandName == name) {
+                count++
+            }
+        }
+        count
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionCorpusTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionCorpusTest.java
new file mode 100644
index 00000000000..d42489ce282
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionCorpusTest.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.UuidCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.Fixture.getMongoClientSettings;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static org.bson.codecs.configuration.CodecRegistries.fromCodecs;
+import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static util.JsonPoweredTestHelper.getTestDocument;
+
+// See https://github.com/mongodb/specifications/tree/master/source/client-side-encryption/corpus
+@RunWith(Parameterized.class)
+public class ClientSideEncryptionCorpusTest {
+    private final boolean useLocalSchema;
+    private MongoClient client;
+    private MongoClient autoEncryptingClient;
+    private ClientEncryption clientEncryption;
+
+    public ClientSideEncryptionCorpusTest(final boolean useLocalSchema) {
+        this.useLocalSchema = useLocalSchema;
+    }
+
+    @Before
+    public void setUp() throws IOException, URISyntaxException {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Corpus tests disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        MongoClientSettings clientSettings = getMongoClientSettingsBuilder()
+                .codecRegistry(fromRegistries(fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)),
+                        MongoClientSettings.getDefaultCodecRegistry())).build();
+
+        // Step 1: create unencrypted client
+        client = MongoClients.create(clientSettings);
+        MongoDatabase db = client.getDatabase("db");
+
+        // Step 2: Drop and recreate db.coll with schema
+        BsonDocument schemaDocument = bsonDocumentFromPath("corpus-schema.json");
+
+        db.getCollection("coll").drop();
+        db.runCommand(new BsonDocument("create", new BsonString("coll"))
+                .append("validator", new BsonDocument("$jsonSchema", schemaDocument)));
+
+        // Step 3: Drop and create admin.datakeys
+        MongoDatabase adminDatabase = client.getDatabase("admin");
+        MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
+        dataKeysCollection.drop();
+        dataKeysCollection.insertOne(bsonDocumentFromPath("corpus-key-aws.json"));
+        dataKeysCollection.insertOne(bsonDocumentFromPath("corpus-key-local.json"));
+
+        // Step 4: Configure our objects
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> awsCreds = new HashMap<String, Object>();
+        Map<String, Object> localMasterkey = new HashMap<String, Object>();
+        awsCreds.put("accessKeyId", System.getProperty("org.mongodb.test.awsAccessKeyId"));
+        awsCreds.put("secretAccessKey", System.getProperty("org.mongodb.test.awsSecretAccessKey"));
+
+        byte[] localMasterkeyBytes = Base64.getDecoder().decode("Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBM"
+                + "UN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk");
+        localMasterkey.put("key", localMasterkeyBytes);
+        kmsProviders.put("aws", awsCreds);
+        kmsProviders.put("local", localMasterkey);
+
+        HashMap<String, BsonDocument> schemaMap = new HashMap<String, BsonDocument>();
+        schemaMap.put("db.coll", schemaDocument);
+
+        AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
+                .keyVaultNamespace("admin.datakeys")
+                .kmsProviders(kmsProviders);
+
+        if (useLocalSchema) {
+            autoEncryptionSettingsBuilder.schemaMap(schemaMap);
+        }
+
+        clientSettings = getMongoClientSettingsBuilder()
+                .codecRegistry(fromRegistries(
+                        fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)), MongoClientSettings.getDefaultCodecRegistry()))
+                .autoEncryptionSettings(autoEncryptionSettingsBuilder.build())
+                .build();
+        autoEncryptingClient = MongoClients.create(clientSettings);
+
+        ClientEncryptionSettings clientEncryptionSettings = ClientEncryptionSettings.builder().
+                keyVaultMongoClientSettings(getMongoClientSettings()).
+                kmsProviders(kmsProviders).
+                keyVaultNamespace("admin.datakeys").build();
+        clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+    }
+
+    @Test
+    public void testCorpus() throws IOException, URISyntaxException {
+
+        // Step 5: Iterate over corpus
+        BsonDocument corpus = bsonDocumentFromPath("corpus.json");
+        BsonDocument corpusCopied = new BsonDocument();
+        for (String field : corpus.keySet()) {
+            if (field.equals("_id") || field.equals("altname_aws") || field.equals("altname_local")) {
+                corpusCopied.append(field, corpus.get(field));
+                continue;
+            }
+
+            BsonDocument fieldDocument = corpus.getDocument(field).clone();
+            String kms = fieldDocument.getString("kms").getValue();
+            String abbreviatedAlgorithName = fieldDocument.getString("algo").getValue();
+            String method = fieldDocument.getString("method").getValue();
+            String identifier = fieldDocument.getString("identifier").getValue();
+            boolean allowed = fieldDocument.getBoolean("allowed").getValue();
+            BsonValue value = fieldDocument.get("value");
+
+            byte[] awsKeyId = Base64.getDecoder().decode("AWSAAAAAAAAAAAAAAAAAAA==");
+            byte[] localKeyId = Base64.getDecoder().decode("LOCALAAAAAAAAAAAAAAAAA==");
+
+            if (method.equals("auto")) {
+                corpusCopied.append(field, corpus.get(field));
+                continue;
+            }
+
+            if (!method.equals("explicit")) {
+                throw new UnsupportedOperationException("Unsupported method: " + method);
+            }
+
+            String fullAlgorithmName = "AEAD_AES_256_CBC_HMAC_SHA_512-";
+            if (abbreviatedAlgorithName.equals("rand")) {
+                fullAlgorithmName += "Random";
+            } else if (abbreviatedAlgorithName.equals("det")) {
+                fullAlgorithmName += "Deterministic";
+            } else {
+                throw new UnsupportedOperationException("Unsupported algorithm: " + abbreviatedAlgorithName);
+            }
+
+            EncryptOptions opts = new EncryptOptions(fullAlgorithmName);
+            if (identifier.equals("id")) {
+                if (kms.equals("aws")) {
+                    opts.keyId(new BsonBinary(BsonBinarySubType.UUID_STANDARD, awsKeyId));
+                } else if (kms.equals("local")) {
+                    opts.keyId(new BsonBinary(BsonBinarySubType.UUID_STANDARD, localKeyId));
+                } else {
+                    throw new UnsupportedOperationException("Unsupported provider: " + kms);
+                }
+            } else if (identifier.equals("altname")) {
+                opts.keyAltName(kms);
+            } else {
+                throw new UnsupportedOperationException("Unsupported identifier: " + identifier);
+            }
+
+            try {
+                BsonValue encryptedValue = clientEncryption.encrypt(value, opts);
+                fieldDocument.put("value", encryptedValue);
+                corpusCopied.append(field, fieldDocument);
+            } catch (MongoException e) {
+                if (allowed) {
+                    throw e;
+                }
+                corpusCopied.append(field, fieldDocument);
+            }
+        }
+
+        // Step 6: insert corpusCopied
+        MongoCollection<BsonDocument> encryptedCollection = autoEncryptingClient.getDatabase("db")
+                .getCollection("coll", BsonDocument.class);
+        encryptedCollection.insertOne(corpusCopied);
+
+        // Step 7: check the auto decrypted document
+        BsonDocument corpusDecrypted = encryptedCollection.find(new BsonDocument()).first();
+        assertEquals(corpus, corpusDecrypted);
+
+        // Step 8: check the document with an unencrypted client
+        MongoCollection<BsonDocument> coll = client.getDatabase("db").getCollection("coll", BsonDocument.class);
+        BsonDocument corpusEncryptedActual = coll.find(new BsonDocument()).first();
+        BsonDocument corpusEncryptedExpected = bsonDocumentFromPath("corpus-encrypted.json");
+
+        for (String field : corpusEncryptedExpected.keySet()) {
+            if (field.equals("_id") || field.equals("altname_aws") || field.equals("altname_local")) {
+                continue;
+            }
+
+            boolean allowed = corpusEncryptedActual.getDocument(field).getBoolean("allowed").getValue();
+            String algorithm = corpusEncryptedActual.getDocument(field).getString("algo").getValue();
+            BsonValue actualValue = corpusEncryptedActual.getDocument(field).get("value");
+            BsonValue expectedValue = corpusEncryptedExpected.getDocument(field).get("value");
+
+            if (algorithm.equals("det")) {
+                assertEquals(actualValue, expectedValue);
+            } else if (algorithm.equals("rand")) {
+                if (allowed) {
+                    assertNotEquals(actualValue, expectedValue);
+                }
+            } else {
+                throw new UnsupportedOperationException("Unsupported algorithm type: " + algorithm);
+            }
+
+            if (allowed) {
+                BsonValue decrypted = clientEncryption.decrypt(actualValue.asBinary());
+                assertEquals("Values should be equal for field " + field, clientEncryption.decrypt(expectedValue.asBinary()), decrypted);
+            } else {
+                assertEquals("Values should be equal for field " + field, expectedValue, actualValue);
+            }
+        }
+    }
+
+    private static BsonDocument bsonDocumentFromPath(final String path) throws IOException, URISyntaxException {
+        return getTestDocument(new File(ClientSideEncryptionTest.class
+                .getResource("/client-side-encryption-corpus/" + path).toURI()));
+    }
+
+    @Parameterized.Parameters(name = "useLocalSchema: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[]{true}, new Object[]{false});
+    }
+
+    @After
+    public void after() {
+        if (client != null) {
+            try {
+                client.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+
+        if (autoEncryptingClient != null) {
+            try {
+                autoEncryptingClient.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+
+        if (clientEncryption != null) {
+            try {
+                clientEncryption.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultSpecification.groovy b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultSpecification.groovy
new file mode 100644
index 00000000000..96dcced039c
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultSpecification.groovy
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client
+
+import com.mongodb.AutoEncryptionSettings
+import com.mongodb.ClientEncryptionSettings
+import com.mongodb.MongoClientException
+import com.mongodb.MongoNamespace
+import com.mongodb.WriteConcern
+import com.mongodb.client.model.vault.DataKeyOptions
+import com.mongodb.client.model.vault.EncryptOptions
+import com.mongodb.client.vault.ClientEncryption
+import com.mongodb.client.vault.ClientEncryptions
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.internal.connection.TestCommandListener
+import org.bson.BsonBinarySubType
+import org.bson.BsonDocument
+import org.bson.BsonString
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.client.Fixture.getDefaultDatabaseName
+import static com.mongodb.client.Fixture.getMongoClient
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder
+import static com.mongodb.client.model.Filters.eq
+import static java.util.Collections.singletonMap
+import static org.junit.Assume.assumeFalse
+import static org.junit.Assume.assumeTrue
+
+class ClientSideEncryptionExternalKeyVaultSpecification extends FunctionalSpecification {
+
+    private final MongoNamespace keyVaultNamespace = new MongoNamespace('test.datakeys')
+    private final MongoNamespace autoEncryptingCollectionNamespace = new MongoNamespace(getDefaultDatabaseName(),
+            'ClientSideEncryptionProseTestSpecification')
+    private final MongoCollection dataKeyCollection = getMongoClient()
+            .getDatabase(keyVaultNamespace.databaseName).getCollection(keyVaultNamespace.collectionName, BsonDocument)
+            .withWriteConcern(WriteConcern.MAJORITY)
+    private final MongoCollection<BsonDocument> dataCollection = getMongoClient()
+            .getDatabase(autoEncryptingCollectionNamespace.databaseName).getCollection(autoEncryptingCollectionNamespace.collectionName,
+            BsonDocument)
+
+    private MongoClient autoEncryptingClient
+    private ClientEncryption clientEncryption
+    private MongoCollection<BsonDocument> autoEncryptingDataCollection
+    private TestCommandListener commandListener
+
+    def setup() {
+        assumeFalse(isNotAtLeastJava8())
+        assumeTrue(serverVersionAtLeast(4, 2))
+        assumeTrue('Key vault tests disabled',
+                System.getProperty('org.mongodb.test.awsAccessKeyId') != null
+                        && !System.getProperty('org.mongodb.test.awsAccessKeyId').isEmpty())
+        dataKeyCollection.drop()
+        dataCollection.drop()
+
+        def providerProperties =
+                ['local': ['key': Base64.getDecoder().decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN'
+                        + '3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk')],
+                 'aws'  : ['accessKeyId'    : System.getProperty('org.mongodb.test.awsAccessKeyId'),
+                           'secretAccessKey': System.getProperty('org.mongodb.test.awsSecretAccessKey')]
+                ]
+
+        autoEncryptingClient = MongoClients.create(getMongoClientSettingsBuilder()
+                .autoEncryptionSettings(AutoEncryptionSettings.builder()
+                        .keyVaultNamespace(keyVaultNamespace.fullName)
+                        .kmsProviders(providerProperties)
+                        .schemaMap(singletonMap(autoEncryptingCollectionNamespace.fullName,
+                                BsonDocument.parse(
+                                        '''
+    {
+      "bsonType": "object",
+      "properties": {
+        "encrypted_placeholder": {
+          "encrypt": {
+            "keyId": "/placeholder",
+            "bsonType": "string",
+            "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+          }
+        }
+      }
+    }''')))
+                        .build())
+                .build())
+
+        autoEncryptingDataCollection = autoEncryptingClient.getDatabase(autoEncryptingCollectionNamespace.databaseName)
+                .getCollection(autoEncryptingCollectionNamespace.collectionName, BsonDocument)
+
+        commandListener = new TestCommandListener()
+        clientEncryption = ClientEncryptions.create(ClientEncryptionSettings.builder()
+                .keyVaultMongoClientSettings(getMongoClientSettingsBuilder()
+                        .addCommandListener(commandListener)
+                        .build())
+                .keyVaultNamespace(keyVaultNamespace.fullName)
+                .kmsProviders(providerProperties)
+                .build())
+    }
+
+    def 'test external key vault'() {
+        when:
+        def localDataKeyId = clientEncryption.createDataKey('local', new DataKeyOptions().keyAltNames(['local_altname']))
+
+        then:
+        commandListener.getCommandStartedEvents().size() == 1
+        def event = commandListener.getCommandStartedEvents().get(0) as CommandStartedEvent
+        event.getCommand().containsKey('writeConcern')
+        event.getCommand().getDocument('writeConcern') == WriteConcern.MAJORITY.asDocument()
+
+        localDataKeyId != null
+        localDataKeyId.type == BsonBinarySubType.UUID_STANDARD.value
+        dataKeyCollection.find(eq('masterKey.provider', 'local')).into([]).size() == 1
+
+        when:
+        def localEncrypted = clientEncryption.encrypt(new BsonString('hello local'),
+                new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                .keyId(localDataKeyId))
+
+        then:
+        localEncrypted.asBinary().getType() == (byte) 6
+
+        when:
+        autoEncryptingDataCollection.insertOne(new BsonDocument('_id', new BsonString('local'))
+                .append('value', localEncrypted))
+
+        then:
+        autoEncryptingDataCollection.find(eq('_id', new BsonString('local'))).first().getString('value')
+                .value == 'hello local'
+
+        when:
+        def localEncryptedWithAltName = clientEncryption.encrypt(new BsonString('hello local'),
+                new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                .keyAltName('local_altname'))
+
+        then:
+        localEncryptedWithAltName == localEncrypted
+
+        when:
+        def awsDataKeyId = clientEncryption.createDataKey('aws',
+                new DataKeyOptions().keyAltNames(['aws_altname'])
+                .masterKey(new BsonDocument('region', new BsonString('us-east-1'))
+                .append('key', new BsonString('arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0'))))
+
+        then:
+        awsDataKeyId != null
+        awsDataKeyId.type == BsonBinarySubType.UUID_STANDARD.value
+        dataKeyCollection.find(eq('masterKey.provider', 'aws')).into([]).size() == 1
+
+        when:
+        def awsEncrypted = clientEncryption.encrypt(new BsonString('hello aws'),
+                new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                        .keyId(awsDataKeyId))
+
+        then:
+        awsEncrypted.asBinary().getType() == (byte) 6
+
+        when:
+        autoEncryptingDataCollection.insertOne(new BsonDocument('_id', new BsonString('aws'))
+                .append('value', awsEncrypted))
+
+        then:
+        autoEncryptingDataCollection.find(eq('_id', new BsonString('aws'))).first().getString('value')
+                .value == 'hello aws'
+
+        when:
+        def awsEncryptedWithAltName = clientEncryption.encrypt(new BsonString('hello aws'),
+                new EncryptOptions('AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic')
+                        .keyAltName('aws_altname'))
+
+        then:
+        awsEncryptedWithAltName == awsEncrypted
+
+        when:
+        autoEncryptingDataCollection.insertOne(new BsonDocument('encrypted_placeholder', localEncrypted))
+
+        then:
+        thrown(MongoClientException)
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultTest.java
new file mode 100644
index 00000000000..ea09d40fd71
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultTest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoCredential;
+import com.mongodb.MongoSecurityException;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static com.mongodb.client.Fixture.getMongoClient;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static util.JsonPoweredTestHelper.getTestDocument;
+
+@RunWith(Parameterized.class)
+public class ClientSideEncryptionExternalKeyVaultTest {
+    private MongoClient client, clientEncrypted;
+    private ClientEncryption clientEncryption;
+    private final boolean withExternalKeyVault;
+
+    public ClientSideEncryptionExternalKeyVaultTest(final boolean withExternalKeyVault) {
+        this.withExternalKeyVault = withExternalKeyVault;
+    }
+
+    @Before
+    public void setUp() throws IOException, URISyntaxException {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Encryption test with external keyVault is disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                    && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        /* Step 1: get unencrypted client and recreate keys collection */
+        client = getMongoClient();
+        MongoDatabase admin = client.getDatabase("admin");
+        MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
+        datakeys.drop();
+        datakeys.insertOne(bsonDocumentFromPath("external-key.json"));
+
+        /* Step 2: create encryption objects. */
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> localMasterkey = new HashMap<String, Object>();
+        Map<String, BsonDocument> schemaMap = new HashMap<String, BsonDocument>();
+
+        byte[] localMasterkeyBytes = Base64.getDecoder().decode("Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBM"
+                + "UN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk");
+        localMasterkey.put("key", localMasterkeyBytes);
+        kmsProviders.put("local", localMasterkey);
+        schemaMap.put("db.coll", bsonDocumentFromPath("external-schema.json"));
+
+        AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
+                .keyVaultNamespace("admin.datakeys")
+                .kmsProviders(kmsProviders)
+                .schemaMap(schemaMap);
+
+        MongoClientSettings externalClientSettings = null;
+        if (withExternalKeyVault) {
+            externalClientSettings = getMongoClientSettingsBuilder()
+                    .credential(MongoCredential.createCredential("fake-user", "admin", "fake-pwd".toCharArray()))
+                    .build();
+            autoEncryptionSettingsBuilder.keyVaultMongoClientSettings(externalClientSettings);
+        }
+
+        AutoEncryptionSettings autoEncryptionSettings = autoEncryptionSettingsBuilder.build();
+
+        MongoClientSettings clientSettings = getMongoClientSettingsBuilder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+        clientEncrypted = MongoClients.create(clientSettings);
+
+        ClientEncryptionSettings.Builder clientEncryptionSettingsBuilder = ClientEncryptionSettings.builder().
+                keyVaultMongoClientSettings(getMongoClientSettingsBuilder().build())
+                .kmsProviders(kmsProviders)
+                .keyVaultNamespace("admin.datakeys");
+
+        if (withExternalKeyVault) {
+            clientEncryptionSettingsBuilder.keyVaultMongoClientSettings(externalClientSettings);
+        }
+
+        ClientEncryptionSettings clientEncryptionSettings = clientEncryptionSettingsBuilder.build();
+        clientEncryption = ClientEncryptions.create(clientEncryptionSettings);
+    }
+
+    @Test
+    public void testExternal() {
+        boolean authExceptionThrown = false;
+        MongoCollection<BsonDocument> coll = clientEncrypted
+                .getDatabase("db")
+                .getCollection("coll", BsonDocument.class);
+        try {
+            coll.insertOne(new BsonDocument().append("encrypted", new BsonString("test")));
+        } catch (MongoSecurityException mse) {
+            authExceptionThrown = true;
+        }
+        assertEquals(authExceptionThrown, withExternalKeyVault);
+
+        EncryptOptions encryptOptions = new EncryptOptions("AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+                .keyId(new BsonBinary(BsonBinarySubType.UUID_STANDARD, Base64.getDecoder().decode("LOCALAAAAAAAAAAAAAAAAA==")));
+        authExceptionThrown = false;
+        try {
+            clientEncryption.encrypt(new BsonString("test"), encryptOptions);
+        } catch (MongoSecurityException mse) {
+            authExceptionThrown = true;
+        }
+        assertEquals(authExceptionThrown, withExternalKeyVault);
+    }
+
+    private static BsonDocument bsonDocumentFromPath(final String path) throws IOException, URISyntaxException {
+        return getTestDocument(new File(ClientSideEncryptionExternalKeyVaultTest.class
+                .getResource("/client-side-encryption-external/" + path).toURI()));
+    }
+
+    @Parameterized.Parameters(name = "withExternalKeyVault: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[]{true}, new Object[]{false});
+    }
+
+    @After
+    public void after() {
+        if (clientEncrypted != null) {
+            try {
+                clientEncrypted.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+        if (clientEncryption != null) {
+            try {
+                clientEncryption.close();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionTest.java
new file mode 100644
index 00000000000..4dee287f3be
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.junit.After;
+
+public class ClientSideEncryptionTest extends AbstractClientSideEncryptionTest {
+    private MongoClient mongoClient;
+
+    public ClientSideEncryptionTest(final String filename, final String description, final BsonDocument specDocument,
+                                    final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        super(filename, description, specDocument, data, definition, skipTest);
+    }
+
+    @Override
+    protected void createMongoClient(final AutoEncryptionSettings autoEncryptionSettings, final TestCommandListener commandListener) {
+        mongoClient = MongoClients.create(Fixture.getMongoClientSettingsBuilder()
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .addCommandListener(commandListener)
+                .build());
+    }
+
+    @Override
+    protected MongoDatabase getDatabase(final String databaseName) {
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionViewAreProhibitedTest.java b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionViewAreProhibitedTest.java
new file mode 100644
index 00000000000..cd5b8491bb1
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionViewAreProhibitedTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Base64;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.mongodb.ClusterFixture.isNotAtLeastJava8;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static com.mongodb.client.Fixture.getMongoClient;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.fail;
+
+public class ClientSideEncryptionViewAreProhibitedTest {
+    private MongoClient clientEncrypted;
+
+    @Before
+    public void setUp() {
+        assumeFalse(isNotAtLeastJava8());
+        assumeTrue(serverVersionAtLeast(4, 1));
+        assumeTrue("Encryption test with external keyVault is disabled",
+                System.getProperty("org.mongodb.test.awsAccessKeyId") != null
+                        && !System.getProperty("org.mongodb.test.awsAccessKeyId").isEmpty());
+
+        MongoClient client = getMongoClient();
+
+        MongoDatabase db = client.getDatabase("db");
+        db.getCollection("view").drop();
+        db.createView("view", "coll", Collections.<BsonDocument>emptyList());
+
+        Map<String, Map<String, Object>> kmsProviders = new HashMap<String, Map<String, Object>>();
+        Map<String, Object> localMasterkey = new HashMap<String, Object>();
+
+        byte[] localMasterkeyBytes = Base64.getDecoder().decode("Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBM"
+                + "UN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk");
+        localMasterkey.put("key", localMasterkeyBytes);
+        kmsProviders.put("local", localMasterkey);
+
+        AutoEncryptionSettings.Builder autoEncryptionSettingsBuilder = AutoEncryptionSettings.builder()
+                .keyVaultNamespace("admin.datakeys")
+                .kmsProviders(kmsProviders);
+
+        AutoEncryptionSettings autoEncryptionSettings = autoEncryptionSettingsBuilder.build();
+
+        MongoClientSettings.Builder clientSettingsBuilder = getMongoClientSettingsBuilder();
+        MongoClientSettings clientSettings = clientSettingsBuilder
+                .autoEncryptionSettings(autoEncryptionSettings)
+                .build();
+        clientEncrypted = MongoClients.create(clientSettings);
+    }
+
+    @Test
+    public void shouldThrowError() {
+        MongoCollection<BsonDocument> coll = clientEncrypted
+                .getDatabase("db")
+                .getCollection("view", BsonDocument.class);
+        try {
+            coll.insertOne(new BsonDocument().append("encrypted", new BsonString("test")));
+            fail();
+        } catch (MongoException me) {
+            assertTrue(me.getMessage().contains("cannot auto encrypt a view"));
+        }
+    }
+
+    @After
+    public void after() {
+        if (clientEncrypted != null) {
+            clientEncrypted.close();
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/CommandMonitoringTest.java b/driver-sync/src/test/functional/com/mongodb/client/CommandMonitoringTest.java
new file mode 100644
index 00000000000..b4bcd4cf973
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/CommandMonitoringTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/command-monitoring/tests
+@RunWith(Parameterized.class)
+public class CommandMonitoringTest {
+
+    private static MongoClient mongoClient;
+    private static TestCommandListener commandListener;
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final String collectionName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private MongoCollection<BsonDocument> collection;
+    private JsonPoweredCrudTestHelper helper;
+
+    public CommandMonitoringTest(final String filename, final String description, final String databaseName, final String collectionName,
+                                 final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    @BeforeClass
+    public static void beforeClass() {
+        commandListener = new TestCommandListener();
+        mongoClient = MongoClients.create(getMongoClientSettingsBuilder()
+                .retryWrites(false)
+                .addCommandListener(commandListener).build());
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        List<BsonDocument> documents = new ArrayList<BsonDocument>();
+        for (BsonValue document : data) {
+            documents.add(document.asDocument());
+        }
+        CollectionHelper<Document> collectionHelper = new CollectionHelper<Document>(new DocumentCodec(),
+                                                                                     new MongoNamespace(databaseName,
+                                                                                                        collectionName));
+        collectionHelper.drop();
+        collectionHelper.insertDocuments(documents);
+
+        commandListener.reset();
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        if (definition.getDocument("operation").containsKey("read_preference")) {
+            collection = collection.withReadPreference(ReadPreference.valueOf(definition.getDocument("operation")
+                                                                                        .getDocument("read_preference")
+                                                                                        .getString("mode").getValue()));
+        }
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        executeOperation();
+
+        List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName,
+                definition.getDocument("operation"));
+        List<CommandEvent> events = commandListener.getEvents();
+
+        CommandMonitoringTestHelper.assertEventsEquality(expectedEvents, events);
+    }
+
+    private void executeOperation() {
+        try {
+            helper.getOperationResults(definition.getDocument("operation"));
+        } catch (MongoException e) {
+            // ignore, as some of these are expected to throw exceptions
+        }
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/command-monitoring")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getString("collection_name").getValue(), testDocument.getArray("data"), test.asDocument(),
+                        skipTest(testDocument, test.asDocument())
+                });
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/client/Concrete.java b/driver-sync/src/test/functional/com/mongodb/client/Concrete.java
similarity index 91%
rename from driver/src/test/functional/com/mongodb/client/Concrete.java
rename to driver-sync/src/test/functional/com/mongodb/client/Concrete.java
index fdc8e6f31e7..cb827bf03bb 100644
--- a/driver/src/test/functional/com/mongodb/client/Concrete.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/Concrete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ class Concrete {
     private final double d;
     private final long date;
 
-    public Concrete(final String str, final int i, final long l, final double d, final long date) {
+    Concrete(final String str, final int i, final long l, final double d, final long date) {
         this.str = str;
         this.i = i;
         this.l = l;
@@ -34,7 +34,7 @@ public Concrete(final String str, final int i, final long l, final double d, fin
         this.date = date;
     }
 
-    public Concrete(final ObjectId id, final String str, final int i, final long l, final double d, final long date) {
+    Concrete(final ObjectId id, final String str, final int i, final long l, final double d, final long date) {
         this(str, i, l, d, date);
         this.id = id;
     }
diff --git a/driver/src/test/functional/com/mongodb/client/ConcreteCodec.java b/driver-sync/src/test/functional/com/mongodb/client/ConcreteCodec.java
similarity index 98%
rename from driver/src/test/functional/com/mongodb/client/ConcreteCodec.java
rename to driver-sync/src/test/functional/com/mongodb/client/ConcreteCodec.java
index c8fb6bdf785..6c417753239 100644
--- a/driver/src/test/functional/com/mongodb/client/ConcreteCodec.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/ConcreteCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/functional/com/mongodb/client/ConcreteCodecProvider.java b/driver-sync/src/test/functional/com/mongodb/client/ConcreteCodecProvider.java
similarity index 96%
rename from driver/src/test/functional/com/mongodb/client/ConcreteCodecProvider.java
rename to driver-sync/src/test/functional/com/mongodb/client/ConcreteCodecProvider.java
index 63bdd4978b4..7c0652c1f03 100644
--- a/driver/src/test/functional/com/mongodb/client/ConcreteCodecProvider.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/ConcreteCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ConnectionsSurvivePrimaryStepDownProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/ConnectionsSurvivePrimaryStepDownProseTest.java
new file mode 100644
index 00000000000..01b2d3515be
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ConnectionsSurvivePrimaryStepDownProseTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.Block;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.MongoNotPrimaryException;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.event.ConnectionAddedEvent;
+import com.mongodb.internal.connection.TestConnectionPoolListener;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.Fixture.getMongoClientSettings;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/connections-survive-step-down/tests
+public class ConnectionsSurvivePrimaryStepDownProseTest {
+    private static final String COLLECTION_NAME = "step-down";
+
+    private TestConnectionPoolListener connectionPoolListener;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoClient client;
+    private MongoCollection<Document> collection;
+
+    @Before
+    public void setUp() {
+        assumeTrue(isDiscoverableReplicaSet() && serverVersionAtLeast(4, 0));
+        connectionPoolListener = new TestConnectionPoolListener();
+        MongoClientSettings settings = MongoClientSettings.builder(getMongoClientSettings()).retryWrites(false)
+                .applyToConnectionPoolSettings(new Block<ConnectionPoolSettings.Builder>() {
+                    @Override
+                    public void apply(final ConnectionPoolSettings.Builder builder) {
+                        builder.addConnectionPoolListener(connectionPoolListener);
+                    }
+                }).build();
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(),
+                new MongoNamespace(getDefaultDatabaseName(), COLLECTION_NAME));
+        client = MongoClients.create(settings);
+        MongoDatabase database = client.getDatabase(getDefaultDatabaseName());
+        collection = client.getDatabase(getDefaultDatabaseName()).getCollection(COLLECTION_NAME);
+        collection.withWriteConcern(WriteConcern.MAJORITY).drop();
+
+        database.withWriteConcern(WriteConcern.MAJORITY).createCollection(COLLECTION_NAME);
+    }
+
+    @After
+    public void tearDown() {
+        if (client != null) {
+            collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand', mode: 'off'}");
+
+            try {
+                client.getDatabase(getDefaultDatabaseName()).drop();
+            } catch (MongoNotPrimaryException e) {
+                // GetMore will use the same connection so won't force an server description update
+                client.getDatabase(getDefaultDatabaseName()).drop();
+            }
+            client.close();
+        }
+    }
+
+    @Test
+    public void testGetMoreIteration() {
+        assumeTrue(serverVersionAtLeast(asList(4, 1, 10)));
+
+        List<Document> documents = asList(Document.parse("{_id: 1}"), Document.parse("{_id: 2}"), Document.parse("{_id: 3}"),
+                Document.parse("{_id: 4}"), Document.parse("{_id: 5}"));
+        collection.withWriteConcern(WriteConcern.MAJORITY).insertMany(documents);
+
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+        MongoCursor<Document> cursor = collection.find().batchSize(2).iterator();
+        assertEquals(asList(documents.get(0), documents.get(1)), asList(cursor.next(), cursor.next()));
+
+        collectionHelper.runAdminCommand("{replSetStepDown: 5, force: true}");
+
+        assertEquals(asList(documents.get(2), documents.get(3), documents.get(4)), asList(cursor.next(), cursor.next(), cursor.next()));
+        assertEquals(connectionCount, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testNotMasterKeepConnectionPool() {
+        assumeTrue(serverVersionAtLeast(asList(4, 1, 10)));
+
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 10107}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            collection.insertOne(new Document());
+            fail();
+        } catch (MongoException e) {
+            assertEquals(10107, e.getCode());
+        }
+
+        collection.insertOne(new Document());
+        assertEquals(connectionCount, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testNotMasterClearConnectionPool() {
+        assumeFalse(serverVersionAtLeast(asList(4, 1, 0)));
+
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 10107}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            collection.insertOne(new Document());
+            fail();
+        } catch (MongoException e) {
+            assertEquals(10107, e.getCode());
+        }
+
+        collection.insertOne(new Document());
+        assertEquals(connectionCount + 1, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testInterruptedAtShutdownResetsConnectionPool() {
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 11600}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            collection.insertOne(new Document());
+            fail();
+        } catch (MongoException e) {
+            assertEquals(11600, e.getCode());
+        }
+
+        collection.insertOne(new Document());
+        assertEquals(connectionCount + 1, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+    @Test
+    public void testShutdownInProgressResetsConnectionPool() {
+        collectionHelper.runAdminCommand("{configureFailPoint: 'failCommand',  mode: {times: 1}, data: {failCommands: ['insert'], "
+                + "errorCode: 91}}");
+        int connectionCount = connectionPoolListener.countEvents(ConnectionAddedEvent.class);
+
+        try {
+            collection.insertOne(new Document());
+            fail();
+        } catch (MongoException e) {
+            assertEquals(91, e.getCode());
+        }
+
+        collection.insertOne(new Document());
+        assertEquals(connectionCount + 1, connectionPoolListener.countEvents(ConnectionAddedEvent.class));
+    }
+
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ConnectivityTest.java b/driver-sync/src/test/functional/com/mongodb/client/ConnectivityTest.java
new file mode 100644
index 00000000000..97ac99ae04e
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ConnectivityTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.Document;
+import org.junit.Test;
+
+public class ConnectivityTest {
+
+    // the test succeeds if no exception is thrown, and fail otherwise
+    @Test
+    public void testConnectivity() {
+        MongoClient client = MongoClients.create(Fixture.getMongoClientSettings());
+
+        try {
+            // test that a command that doesn't require auth completes normally
+            client.getDatabase("admin").runCommand(new Document("ismaster", 1));
+
+            // test that a command that requires auth completes normally
+            client.getDatabase("test").getCollection("test").estimatedDocumentCount();
+        } finally {
+            client.close();
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/CrudTest.java b/driver-sync/src/test/functional/com/mongodb/client/CrudTest.java
new file mode 100644
index 00000000000..552a9c3d67e
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/CrudTest.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.Fixture.getMongoClientSettings;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/crud/tests
+@RunWith(Parameterized.class)
+public class CrudTest {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final String collectionName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoClient mongoClient;
+    private MongoDatabase database;
+    private MongoCollection<BsonDocument> collection;
+    private JsonPoweredCrudTestHelper helper;
+    private final TestCommandListener commandListener;
+
+    public CrudTest(final String filename, final String description, final String databaseName, final String collectionName,
+                    final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+        this.commandListener = new TestCommandListener();
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        assumeFalse(isSharded());
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+
+        collectionHelper.killAllSessions();
+        collectionHelper.create(collectionName, new CreateCollectionOptions(), WriteConcern.ACKNOWLEDGED);
+
+        MongoClientSettings settings = MongoClientSettings.builder(getMongoClientSettings())
+                .addCommandListener(commandListener)
+                .build();
+
+        mongoClient = MongoClients.create(settings);
+        database = mongoClient.getDatabase(databaseName);
+
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
+        if (!data.isEmpty()) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+
+            collectionHelper.drop();
+            if (documents.size() > 0) {
+                collectionHelper.insertDocuments(documents, WriteConcern.MAJORITY);
+            }
+        }
+        commandListener.reset();
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        BsonDocument expectedOutcome = definition.getDocument("outcome", null);
+        // check if v1 test
+        if (definition.containsKey("operation")) {
+            runOperation(expectedOutcome, definition.getDocument("operation"),
+                    expectedOutcome != null && expectedOutcome.containsKey("result") && expectedOutcome.isDocument("result")
+                            ? expectedOutcome.get("result") : null);
+        } else {  // v2 test
+            BsonArray operations = definition.getArray("operations");
+            for (BsonValue operation : operations) {
+                runOperation(expectedOutcome, operation.asDocument(), operation.asDocument().get("result", null));
+            }
+        }
+    }
+
+    private void runOperation(final BsonDocument expectedOutcome, final BsonDocument operation, final BsonValue expectedResult) {
+        BsonDocument outcome = null;
+        boolean wasException = false;
+        try {
+            outcome = helper.getOperationResults(operation);
+        } catch (Exception e) {
+            wasException = true;
+        }
+
+        if (operation.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+            assertEquals(operation.containsKey("error"), wasException);
+        }
+
+        if (expectedResult != null) {
+            // Hack to workaround the lack of upsertedCount
+            BsonValue actualResult = outcome.get("result");
+            if (actualResult.isDocument()
+                    && actualResult.asDocument().containsKey("upsertedCount")
+                    && actualResult.asDocument().getNumber("upsertedCount").intValue() == 0
+                    && !expectedResult.asDocument().containsKey("upsertedCount")) {
+                expectedResult.asDocument().append("upsertedCount", actualResult.asDocument().get("upsertedCount"));
+            }
+            // Hack to workaround the lack of insertedIds
+            removeIdList("insertedIds", expectedResult, actualResult);
+            removeIdList("upsertedIds", expectedResult, actualResult);
+
+            removeZeroCountField("deletedCount", expectedResult, actualResult);
+            removeZeroCountField("insertedCount", expectedResult, actualResult);
+
+            if (expectedResult.isDocument()
+                    && !expectedResult.asDocument().containsKey("insertedIds")) {
+                actualResult.asDocument().remove("insertedIds");
+            }
+
+            assertEquals(description, expectedResult, actualResult);
+        }
+        if (definition.containsKey("expectations")) {
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName, null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+
+            assertEventsEquality(expectedEvents, events.subList(0, expectedEvents.size()));
+        }
+        if (expectedOutcome != null && expectedOutcome.containsKey("collection")) {
+            assertCollectionEquals(expectedOutcome.getDocument("collection"));
+        }
+    }
+
+    private void removeZeroCountField(final String key, final BsonValue expectedResult, final BsonValue actualResult) {
+        if (actualResult.isDocument()
+                && actualResult.asDocument().containsKey(key)
+                && actualResult.asDocument().getNumber(key).intValue() == 0
+                && !expectedResult.asDocument().containsKey(key)) {
+            actualResult.asDocument().remove(key);
+        }
+    }
+
+    private void removeIdList(final String key, final BsonValue expectedResult, final BsonValue actualResult) {
+        if (expectedResult.isDocument() && !expectedResult.asDocument().containsKey(key)) {
+            actualResult.asDocument().remove(key);
+        }
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/crud")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getString("collection_name", new BsonString("test")).getValue(),
+                        testDocument.getArray("data", new BsonArray()), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+    private void assertCollectionEquals(final BsonDocument expectedCollection) {
+        MongoCollection<BsonDocument> collectionToCompare = collection;
+        if (expectedCollection.containsKey("name")) {
+            collectionToCompare = database.getCollection(expectedCollection.getString("name").getValue(), BsonDocument.class);
+        }
+        assertEquals(description, expectedCollection.getArray("data"), collectionToCompare.find().into(new BsonArray()));
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/DatabaseTestCase.java b/driver-sync/src/test/functional/com/mongodb/client/DatabaseTestCase.java
new file mode 100644
index 00000000000..6baf247f0d8
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/DatabaseTestCase.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoNamespace;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.internal.connection.ServerHelper;
+import org.bson.BsonDocument;
+import org.bson.BsonDocumentWrapper;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClient;
+import static com.mongodb.client.Fixture.getPrimary;
+
+public class DatabaseTestCase {
+    //For ease of use and readability, in this specific case we'll allow protected variables
+    //CHECKSTYLE:OFF
+    protected MongoClient client;
+    protected MongoDatabase database;
+    protected MongoCollection<Document> collection;
+    //CHECKSTYLE:ON
+
+    @Before
+    public void setUp() {
+        client =  getMongoClient();
+        database = client.getDatabase(getDefaultDatabaseName());
+        collection = database.getCollection(getClass().getName());
+        collection.drop();
+    }
+
+    @After
+    public void tearDown() {
+        if (collection != null) {
+            collection.drop();
+        }
+        try {
+            ServerHelper.checkPool(getPrimary());
+        } catch (InterruptedException e) {
+            // ignore
+        }
+    }
+
+    protected String getDatabaseName() {
+        return database.getName();
+    }
+
+    protected String getCollectionName() {
+        return collection.getNamespace().getCollectionName();
+    }
+
+    protected MongoNamespace getNamespace() {
+        return collection.getNamespace();
+    }
+
+    protected CollectionHelper<Document> getCollectionHelper() {
+        return new CollectionHelper<Document>(new DocumentCodec(), getNamespace());
+    }
+
+    protected BsonDocument wrap(final Document document) {
+        return new BsonDocumentWrapper<Document>(document, new DocumentCodec());
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ExplicitUuidCodecUuidRepresentationTest.java b/driver-sync/src/test/functional/com/mongodb/client/ExplicitUuidCodecUuidRepresentationTest.java
new file mode 100644
index 00000000000..c193469fd6a
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ExplicitUuidCodecUuidRepresentationTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonBinarySubType;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.UuidCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.junit.After;
+
+import java.util.UUID;
+
+public class ExplicitUuidCodecUuidRepresentationTest extends AbstractExplicitUuidCodecUuidRepresentationTest {
+    private MongoClient mongoClient;
+
+    public ExplicitUuidCodecUuidRepresentationTest(final UuidRepresentation uuidRepresentationForClient,
+                                                   final UuidRepresentation uuidRepresentationForExplicitEncoding,
+                                                   final BsonBinarySubType subType,
+                                                   final UuidCodec uuidCodec, final UUID uuid, final byte[] encodedValue,
+                                                   final byte[] standardEncodedValue) {
+        super(uuidRepresentationForClient, uuidRepresentationForExplicitEncoding, subType, uuidCodec, uuid, encodedValue,
+                standardEncodedValue);
+    }
+
+    @Override
+    protected void createMongoClient(final UuidRepresentation uuidRepresentation, final CodecRegistry codecRegistry) {
+        mongoClient = MongoClients.create(Fixture.getMongoClientSettingsBuilder()
+                .uuidRepresentation(uuidRepresentation)
+                .codecRegistry(codecRegistry)
+                .build());
+    }
+
+    @Override
+    protected MongoDatabase getDatabase(final String databaseName) {
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/Fixture.java b/driver-sync/src/test/functional/com/mongodb/client/Fixture.java
new file mode 100644
index 00000000000..12ed35474ef
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/Fixture.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.Block;
+import com.mongodb.ClusterFixture;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ServerAddress;
+import com.mongodb.client.internal.MongoClientImpl;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SslSettings;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Helper class for the acceptance tests.
+ */
+public final class Fixture {
+    private static final String DEFAULT_DATABASE_NAME = "JavaDriverTest";
+    private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
+
+    private static MongoClient mongoClient;
+    private static MongoClientSettings mongoClientSettings;
+    private static MongoDatabase defaultDatabase;
+
+    private Fixture() {
+    }
+
+    public static synchronized MongoClient getMongoClient() {
+        if (mongoClient == null) {
+            mongoClient = MongoClients.create(getMongoClientSettings());
+            Runtime.getRuntime().addShutdownHook(new ShutdownHook());
+        }
+        return mongoClient;
+    }
+
+    public static synchronized MongoDatabase getDefaultDatabase() {
+        if (defaultDatabase == null) {
+            defaultDatabase = getMongoClient().getDatabase(getDefaultDatabaseName());
+        }
+        return defaultDatabase;
+    }
+
+    public static String getDefaultDatabaseName() {
+        return DEFAULT_DATABASE_NAME;
+    }
+
+    static class ShutdownHook extends Thread {
+        @Override
+        public void run() {
+            synchronized (Fixture.class) {
+                if (mongoClient != null) {
+                    if (defaultDatabase != null) {
+                        defaultDatabase.drop();
+                    }
+                    mongoClient.close();
+                    mongoClient = null;
+                }
+            }
+        }
+    }
+
+    private static synchronized String getConnectionStringProperty() {
+        return ClusterFixture.getConnectionString().getConnectionString();
+    }
+
+    public static synchronized MongoClientSettings getMongoClientSettings() {
+        if (mongoClientSettings == null) {
+            MongoClientSettings.Builder builder = MongoClientSettings.builder()
+                    .applyConnectionString(new ConnectionString(getConnectionStringProperty()))
+                    .applyToServerSettings(new Block<ServerSettings.Builder>() {
+                        @Override
+                        public void apply(final ServerSettings.Builder builder) {
+                            builder.minHeartbeatFrequency(MIN_HEARTBEAT_FREQUENCY_MS, TimeUnit.MILLISECONDS);
+                        }
+                    });
+            if (System.getProperty("java.version").startsWith("1.6.")) {
+                builder.applyToSslSettings(new Block<SslSettings.Builder>() {
+                    @Override
+                    public void apply(final SslSettings.Builder builder) {
+                        builder.invalidHostNameAllowed(true);
+                    }
+                });
+            }
+            mongoClientSettings = builder.build();
+        }
+        return mongoClientSettings;
+    }
+
+    public static MongoClientSettings.Builder getMongoClientSettingsBuilder() {
+        return MongoClientSettings.builder(getMongoClientSettings());
+    }
+
+    @SuppressWarnings("deprecation")
+    public static ServerAddress getPrimary() throws InterruptedException {
+        getMongoClient();
+        List<ServerDescription> serverDescriptions = ((MongoClientImpl) mongoClient).getCluster().getDescription().getPrimaries();
+        while (serverDescriptions.isEmpty()) {
+            Thread.sleep(100);
+            serverDescriptions = ((MongoClientImpl) mongoClient).getCluster().getDescription().getPrimaries();
+        }
+        return serverDescriptions.get(0).getAddress();
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/FunctionalSpecification.groovy b/driver-sync/src/test/functional/com/mongodb/client/FunctionalSpecification.groovy
new file mode 100644
index 00000000000..06c4db04923
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/FunctionalSpecification.groovy
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client
+
+import org.bson.Document
+import spock.lang.Specification
+
+class FunctionalSpecification extends Specification {
+    protected MongoDatabase database;
+    protected MongoCollection<Document> collection;
+
+    def setup() {
+        database = Fixture.getMongoClient().getDatabase(Fixture.getDefaultDatabaseName())
+        collection = database.getCollection(getClass().getName())
+        collection.drop()
+    }
+
+    def cleanup() {
+        if (collection != null) {
+            collection.drop()
+        }
+    }
+
+    String getDatabaseName() {
+        Fixture.getDefaultDatabaseName()
+    }
+
+    String getCollectionName() {
+        collection.namespace.collectionName
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/InitialDnsSeedlistDiscoveryTest.java b/driver-sync/src/test/functional/com/mongodb/client/InitialDnsSeedlistDiscoveryTest.java
new file mode 100644
index 00000000000..39d7b76139c
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/InitialDnsSeedlistDiscoveryTest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.Block;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ServerDescription;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.event.ClusterClosedEvent;
+import com.mongodb.event.ClusterDescriptionChangedEvent;
+import com.mongodb.event.ClusterListener;
+import com.mongodb.event.ClusterOpeningEvent;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.mongodb.ClusterFixture.getSslSettings;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/initial-dns-seedlist-discovery/tests
+@RunWith(Parameterized.class)
+public class InitialDnsSeedlistDiscoveryTest {
+
+    private final String filename;
+    private final String uri;
+    private final List<String> seeds;
+    private final List<ServerAddress> hosts;
+    private final boolean isError;
+    private final BsonDocument options;
+
+    public InitialDnsSeedlistDiscoveryTest(final String filename, final String uri, final List<String> seeds,
+                                           final List<ServerAddress> hosts, final boolean isError, final BsonDocument options) {
+        this.filename = filename;
+        this.uri = uri;
+        this.seeds = seeds;
+        this.hosts = hosts;
+        this.isError = isError;
+        this.options = options;
+    }
+
+    @Test
+    public void shouldResolveTxtRecord() throws InterruptedException {
+        if (isError) {
+            MongoClient client = null;
+            try {
+                final AtomicReference<MongoException> exceptionReference = new AtomicReference<MongoException>();
+                final CountDownLatch latch = new CountDownLatch(1);
+
+                ConnectionString connectionString = new ConnectionString(uri);
+                final SslSettings sslSettings = getSslSettings(connectionString);
+                MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(connectionString)
+                        .applyToSslSettings(new Block<SslSettings.Builder>() {
+                            @Override
+                            public void apply(final SslSettings.Builder builder) {
+                                builder.applySettings(sslSettings);
+                            }
+                        })
+                        .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                            @Override
+                            public void apply(final ClusterSettings.Builder builder) {
+                                builder.addClusterListener(new ClusterListener() {
+                                    @Override
+                                    public void clusterOpening(final ClusterOpeningEvent event) {
+                                    }
+
+                                    @Override
+                                    public void clusterClosed(final ClusterClosedEvent event) {
+                                    }
+
+                                    @Override
+                                    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
+                                        if (event.getNewDescription().getSrvResolutionException() != null) {
+                                            exceptionReference.set(event.getNewDescription().getSrvResolutionException());
+                                            latch.countDown();
+                                        }
+                                    }
+                                });
+                            }
+                        })
+                        .build();
+                    client = MongoClients.create(settings);
+                    if (!latch.await(5, TimeUnit.SECONDS)) {
+                        fail("");
+                    }
+                    throw exceptionReference.get();
+            } catch (IllegalArgumentException e) {
+               // all good
+            } catch (MongoClientException e) {
+                // all good
+            } finally {
+                if (client != null) {
+                    client.close();
+                }
+            }
+        } else {
+            ConnectionString connectionString = new ConnectionString(this.uri);
+
+            for (Map.Entry<String, BsonValue> entry : options.entrySet()) {
+                if (entry.getKey().equals("replicaSet")) {
+                    assertEquals(entry.getValue().asString().getValue(), connectionString.getRequiredReplicaSetName());
+                } else if (entry.getKey().equals("ssl")) {
+                    assertEquals(entry.getValue().asBoolean().getValue(), connectionString.getSslEnabled());
+                } else if (entry.getKey().equals("authSource")) {
+                    // ignoring authSource for now, because without at least a userName also in the connection string,
+                    // the authSource is ignored.  If the test gets this far, at least we know that a TXT record
+                    // containing in authSource doesn't blow up.  We just don't test that it's actually used.
+                    assertTrue(true);
+                } else {
+                    throw new UnsupportedOperationException("No support configured yet for " + entry.getKey());
+                }
+            }
+        }
+    }
+
+    @Test
+    public void shouldDiscoverSrvRecord() throws InterruptedException {
+        if (seeds.isEmpty()) {
+            return;
+        }
+        final CountDownLatch latch = new CountDownLatch(1);
+        final ConnectionString connectionString = new ConnectionString(uri);
+        final SslSettings sslSettings = getSslSettings(connectionString);
+
+        assumeTrue("It's not a replica set", isDiscoverableReplicaSet());
+        assumeTrue("SSL settings don't match", getSslSettings().isEnabled() == sslSettings.isEnabled());
+
+        MongoClientSettings settings = MongoClientSettings.builder()
+                .applyToClusterSettings(new Block<ClusterSettings.Builder>() {
+                    @Override
+                    public void apply(final ClusterSettings.Builder builder) {
+                        builder.applyConnectionString(connectionString)
+                                .addClusterListener(new ClusterListener() {
+                                    @Override
+                                    public void clusterOpening(final ClusterOpeningEvent event) {
+                                    }
+
+                                    @Override
+                                    public void clusterClosed(final ClusterClosedEvent event) {
+                                    }
+
+                                    @Override
+                                    public void clusterDescriptionChanged(final ClusterDescriptionChangedEvent event) {
+                                        List<ServerAddress> curHostList = new ArrayList<ServerAddress>();
+                                        for (ServerDescription cur : event.getNewDescription().getServerDescriptions()) {
+                                            if (cur.isOk()) {
+                                                curHostList.add(cur.getAddress());
+                                            }
+                                        }
+                                        if (hosts.size() == curHostList.size() && curHostList.containsAll(hosts)) {
+                                            latch.countDown();
+                                        }
+                                    }
+                                });
+                    }
+                })
+                .applyToSslSettings(new Block<SslSettings.Builder>() {
+                    @Override
+                    public void apply(final SslSettings.Builder builder) {
+                        builder.applySettings(sslSettings);
+                        builder.invalidHostNameAllowed(true);
+                    }
+                })
+                .build();
+
+        MongoClient client = MongoClients.create(settings);
+
+        try {
+            assertTrue(latch.await(500, TimeUnit.SECONDS));
+            assertTrue(client.getDatabase("admin").runCommand(new Document("ping", 1)).containsKey("ok"));
+        } finally {
+            client.close();
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/initial-dns-seedlist-discovery")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            data.add(new Object[]{
+                    file.getName(),
+                    testDocument.getString("uri").getValue(),
+                    toStringList(testDocument.getArray("seeds")),
+                    toServerAddressList(testDocument.getArray("hosts")),
+                    testDocument.getBoolean("error", BsonBoolean.FALSE).getValue(),
+                    testDocument.getDocument("options", new BsonDocument())
+            });
+
+        }
+        return data;
+    }
+
+    private static List<String> toStringList(final BsonArray bsonArray) {
+        List<String> retVal = new ArrayList<String>(bsonArray.size());
+        for (BsonValue cur : bsonArray) {
+            retVal.add(cur.asString().getValue());
+        }
+        return retVal;
+    }
+
+    private static List<ServerAddress> toServerAddressList(final BsonArray bsonArray) {
+        List<ServerAddress> retVal = new ArrayList<ServerAddress>(bsonArray.size());
+        for (BsonValue cur : bsonArray) {
+            retVal.add(new ServerAddress(cur.asString().getValue()));
+        }
+        return retVal;
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/JsonPoweredCrudTestHelper.java b/driver-sync/src/test/functional/com/mongodb/client/JsonPoweredCrudTestHelper.java
new file mode 100644
index 00000000000..7cef84609de
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/JsonPoweredCrudTestHelper.java
@@ -0,0 +1,1125 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoBulkWriteException;
+import com.mongodb.MongoException;
+import com.mongodb.MongoGridFSException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.bulk.BulkWriteError;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.bulk.BulkWriteUpsert;
+import com.mongodb.client.gridfs.GridFSBucket;
+import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.Collation;
+import com.mongodb.client.model.CollationAlternate;
+import com.mongodb.client.model.CollationCaseFirst;
+import com.mongodb.client.model.CollationMaxVariable;
+import com.mongodb.client.model.CollationStrength;
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOneModel;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.FindOneAndDeleteOptions;
+import com.mongodb.client.model.FindOneAndReplaceOptions;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.InsertManyOptions;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.InsertOneOptions;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.model.UpdateManyModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonNull;
+import org.bson.BsonObjectId;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.AssumptionViolatedException;
+import util.Hex;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static java.lang.String.format;
+
+public class JsonPoweredCrudTestHelper {
+    private final String description;
+    private final MongoDatabase database;
+    private final MongoCollection<BsonDocument> baseCollection;
+    private final GridFSBucket gridFSBucket;
+    private final MongoClient mongoClient;
+
+    public JsonPoweredCrudTestHelper(final String description, final MongoDatabase database,
+                                     final MongoCollection<BsonDocument> collection) {
+        this(description, database, collection, null, null);
+    }
+
+    public JsonPoweredCrudTestHelper(final String description, final MongoDatabase database,
+                                     final MongoCollection<BsonDocument> collection, final GridFSBucket gridFSBucket,
+                                     final MongoClient mongoClient) {
+        this.description = description;
+        this.database = database;
+        this.baseCollection = collection;
+        this.gridFSBucket = gridFSBucket;
+        this.mongoClient = mongoClient;
+    }
+
+    public BsonDocument getOperationResults(final BsonDocument operation) {
+        return getOperationResults(operation, null);
+    }
+
+    BsonDocument getOperationResults(final BsonDocument operation, @Nullable final ClientSession clientSession) {
+        BsonDocument collectionOptions = operation.getDocument("collectionOptions", new BsonDocument());
+        BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
+
+        String methodName = createMethodName(operation.getString("name").getValue(),
+                operation.getString("object", new BsonString("")).getValue());
+        try {
+            Method method = getClass().getDeclaredMethod(methodName, BsonDocument.class, BsonDocument.class, ClientSession.class);
+            return (BsonDocument) method.invoke(this, collectionOptions, arguments, clientSession);
+        } catch (NoSuchMethodException e) {
+            throw new UnsupportedOperationException("No handler for operation " + methodName);
+        } catch (InvocationTargetException e) {
+            if (e.getTargetException() instanceof AssumptionViolatedException) {
+                throw (AssumptionViolatedException) e.getTargetException();
+            }
+            if (e.getTargetException() instanceof MongoException) {
+                throw (MongoException) e.getTargetException();
+            }
+            throw (RuntimeException) e.getTargetException();
+        } catch (IllegalAccessException e) {
+            throw new UnsupportedOperationException("Invalid handler access for operation " + methodName);
+        }
+    }
+
+    private String createMethodName(final String name, final String object) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("get");
+        if (!object.isEmpty() && !object.equals("collection") && !object.equals("gridfsbucket")) {
+            appendInitCapToBuilder(builder, object);
+        }
+        if (name.indexOf('_') >= 0) {
+            String[] nameParts = name.split("_");
+            for (String part : nameParts) {
+                appendInitCapToBuilder(builder, part);
+            }
+        } else {
+            appendInitCapToBuilder(builder, name);
+        }
+        builder.append("Result");
+        return builder.toString();
+    }
+
+    private void appendInitCapToBuilder(final StringBuilder builder, final String object) {
+        builder.append(object.substring(0, 1).toUpperCase());
+        builder.append(object.substring(1));
+    }
+
+    BsonDocument toResult(final int count) {
+        return toResult(new BsonInt32(count));
+    }
+
+    BsonDocument toResult(final MongoIterable<BsonDocument> results) {
+        return toResult(new BsonArray(results.into(new ArrayList<BsonDocument>())));
+    }
+
+    BsonDocument toResult(final String key, final BsonValue value) {
+        return toResult(new BsonDocument(key, value));
+    }
+
+    BsonDocument toResult(final UpdateResult updateResult) {
+        BsonDocument resultDoc = new BsonDocument("matchedCount", new BsonInt32((int) updateResult.getMatchedCount()));
+        resultDoc.append("modifiedCount", new BsonInt32((int) updateResult.getModifiedCount()));
+        if (updateResult.getUpsertedId() != null) {
+            resultDoc.append("upsertedId", updateResult.getUpsertedId());
+        }
+        resultDoc.append("upsertedCount", updateResult.getUpsertedId() == null ? new BsonInt32(0) : new BsonInt32(1));
+
+        return toResult(resultDoc);
+    }
+
+    BsonDocument toResult(final BulkWriteResult bulkWriteResult, final List<? extends WriteModel<BsonDocument>> writeModels,
+                          final List<BulkWriteError> writeErrors) {
+
+        BsonDocument resultDoc = new BsonDocument();
+        if (bulkWriteResult.wasAcknowledged()) {
+            resultDoc.append("deletedCount", new BsonInt32(bulkWriteResult.getDeletedCount()));
+
+            // Determine insertedIds
+            BsonDocument insertedIds = new BsonDocument();
+            for (int i = 0; i < writeModels.size(); i++) {
+                WriteModel<BsonDocument> cur = writeModels.get(i);
+                if (cur instanceof InsertOneModel && writeSuccessful(i, writeErrors)) {
+                    InsertOneModel<BsonDocument> insertOneModel = (InsertOneModel<BsonDocument>) cur;
+                    insertedIds.put(Integer.toString(i), insertOneModel.getDocument().get("_id"));
+                }
+            }
+            resultDoc.append("insertedIds", insertedIds);
+            resultDoc.append("insertedCount", new BsonInt32(insertedIds.size()));
+
+            resultDoc.append("matchedCount", new BsonInt32(bulkWriteResult.getMatchedCount()));
+            resultDoc.append("modifiedCount", new BsonInt32(bulkWriteResult.getModifiedCount()));
+            resultDoc.append("upsertedCount", bulkWriteResult.getUpserts() == null
+                    ? new BsonInt32(0) : new BsonInt32(bulkWriteResult.getUpserts().size()));
+            BsonDocument upserts = new BsonDocument();
+            for (BulkWriteUpsert bulkWriteUpsert : bulkWriteResult.getUpserts()) {
+                upserts.put(String.valueOf(bulkWriteUpsert.getIndex()), bulkWriteUpsert.getId());
+            }
+            resultDoc.append("upsertedIds", upserts);
+        }
+        return toResult(resultDoc);
+    }
+
+    private boolean writeSuccessful(final int index, final List<BulkWriteError> writeErrors) {
+        for (BulkWriteError cur : writeErrors) {
+            if (cur.getIndex() == index) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    BsonDocument toResult(@Nullable final BsonValue results) {
+        return new BsonDocument("result", results != null ? results : BsonNull.VALUE);
+    }
+
+    BsonDocument getDatabaseRunCommandResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                             @Nullable final ClientSession clientSession) {
+        return getRunCommandResult(collectionOptions, arguments, clientSession);
+    }
+
+    BsonDocument getRunCommandResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        BsonDocument response;
+        BsonDocument command = arguments.getDocument("command");
+        ReadPreference readPreference = arguments.containsKey("readPreference") ? getReadPreference(arguments) : null;
+
+        if (clientSession == null) {
+            if (readPreference == null) {
+                response = database.runCommand(command, BsonDocument.class);
+            } else {
+                response = database.runCommand(command, readPreference, BsonDocument.class);
+            }
+        } else {
+            if (readPreference == null) {
+                response = database.runCommand(clientSession, command, BsonDocument.class);
+            } else {
+                response = database.runCommand(clientSession, command, readPreference, BsonDocument.class);
+            }
+        }
+        response.remove("ok");
+        response.remove("operationTime");
+        response.remove("opTime");
+        response.remove("electionId");
+        response.remove("$clusterTime");
+        return toResult(response);
+    }
+
+    BsonDocument getAggregateResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
+        for (BsonValue stage : arguments.getArray("pipeline")) {
+            pipeline.add(stage.asDocument());
+        }
+
+        AggregateIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).aggregate(pipeline);
+        } else {
+            iterable = getCollection(collectionOptions).aggregate(clientSession, pipeline);
+        }
+
+        if (arguments.containsKey("batchSize")) {
+            iterable.batchSize(arguments.getNumber("batchSize").intValue());
+        }
+        if (arguments.containsKey("maxTimeMS")) {
+            iterable.maxTime(arguments.getNumber("maxTimeMS").longValue(), TimeUnit.MILLISECONDS);
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getDatabaseAggregateResult(final BsonDocument operationOptions, final BsonDocument arguments,
+                                            @Nullable final ClientSession clientSession) {
+        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
+        for (BsonValue stage : arguments.getArray("pipeline")) {
+            pipeline.add(stage.asDocument());
+        }
+
+        AggregateIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = database.aggregate(pipeline, BsonDocument.class);
+        } else {
+            iterable = database.aggregate(clientSession, pipeline, BsonDocument.class);
+        }
+
+        if (arguments.containsKey("allowDiskUse")) {
+            iterable.allowDiskUse(arguments.getBoolean("allowDiskUse").getValue());
+        }
+        if (arguments.containsKey("batchSize")) {
+            iterable.batchSize(arguments.getNumber("batchSize").intValue());
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        BsonDocument results = toResult(iterable);
+        for (BsonValue result : results.getArray("result", new BsonArray())) {
+            if (result.isDocument()) {
+                BsonDocument command = result.asDocument().getDocument("command", new BsonDocument());
+                command.remove("$readPreference");
+                command.remove("$clusterTime");
+                command.remove("signature");
+                command.remove("keyId");
+            }
+        }
+        return results;
+    }
+
+    @SuppressWarnings("deprecation")
+    BsonDocument getCountResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                @Nullable final ClientSession clientSession) {
+        CountOptions options = new CountOptions();
+        if (arguments.containsKey("skip")) {
+            options.skip(arguments.getNumber("skip").intValue());
+        }
+        if (arguments.containsKey("limit")) {
+            options.limit(arguments.getNumber("limit").intValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        BsonDocument filter = arguments.getDocument("filter", new BsonDocument());
+        int count;
+        if (clientSession == null) {
+            count = (int) getCollection(collectionOptions).count(filter, options);
+        } else {
+            count = (int) getCollection(collectionOptions).count(clientSession, filter, options);
+        }
+        return toResult(count);
+    }
+
+    BsonDocument getEstimatedDocumentCountResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                                 @Nullable final ClientSession clientSession) {
+        if (!arguments.isEmpty()) {
+            throw new UnsupportedOperationException("Unexpected arguments: " + arguments);
+        }
+        return toResult((int) getCollection(collectionOptions).estimatedDocumentCount());
+    }
+
+    BsonDocument getClientListDatabasesResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                              @Nullable final ClientSession clientSession) {
+        ListDatabasesIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = mongoClient.listDatabases(BsonDocument.class);
+        } else {
+            iterable = mongoClient.listDatabases(clientSession, BsonDocument.class);
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getClientListDatabaseObjectsResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                    @Nullable final ClientSession clientSession) {
+        return getClientListDatabasesResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getClientListDatabaseNamesResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                  @Nullable final ClientSession clientSession) {
+        return getClientListDatabasesResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getDatabaseListCollectionObjectsResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                        @Nullable final ClientSession clientSession) {
+        return getDatabaseListCollectionsResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getDatabaseListCollectionNamesResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+                                                      @Nullable final ClientSession clientSession) {
+        return getDatabaseListCollectionsResult(databaseOptions, arguments, clientSession);
+    }
+
+    BsonDocument getDatabaseListCollectionsResult(final BsonDocument databaseOptions, final BsonDocument arguments,
+        @Nullable final ClientSession clientSession) {
+        ListCollectionsIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = database.listCollections(BsonDocument.class);
+        } else {
+            iterable = database.listCollections(clientSession, BsonDocument.class);
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getListIndexesResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                      @Nullable final ClientSession clientSession) {
+        ListIndexesIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).listIndexes(BsonDocument.class);
+        } else {
+            iterable = getCollection(collectionOptions).listIndexes(clientSession, BsonDocument.class);
+        }
+        return toResult(iterable);
+    }
+
+    BsonDocument getCountDocumentsResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                         @Nullable final ClientSession clientSession) {
+        CountOptions options = new CountOptions();
+        if (arguments.containsKey("skip")) {
+            options.skip(arguments.getNumber("skip").intValue());
+        }
+        if (arguments.containsKey("limit")) {
+            options.limit(arguments.getNumber("limit").intValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        BsonDocument filter = arguments.getDocument("filter", new BsonDocument());
+        int count;
+        if (clientSession == null) {
+            count = (int) getCollection(collectionOptions).countDocuments(filter, options);
+        } else {
+            count = (int) getCollection(collectionOptions).countDocuments(clientSession, filter, options);
+        }
+        return toResult(count);
+    }
+
+    BsonDocument getDistinctResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                   @Nullable final ClientSession clientSession) {
+        DistinctIterable<BsonValue> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).distinct(arguments.getString("fieldName").getValue(), BsonValue.class);
+        } else {
+            iterable = getCollection(collectionOptions).distinct(clientSession, arguments.getString("fieldName").getValue(),
+                    BsonValue.class);
+        }
+
+        if (arguments.containsKey("filter")) {
+            iterable.filter(arguments.getDocument("filter"));
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+        return toResult(iterable.into(new BsonArray()));
+    }
+
+    @SuppressWarnings("deprecation")
+    BsonDocument getFindOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                  @Nullable final ClientSession clientSession) {
+        return toResult(createFindIterable(collectionOptions, arguments, clientSession).first());
+    }
+
+    @SuppressWarnings("deprecation")
+    BsonDocument getFindResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                               @Nullable final ClientSession clientSession) {
+        return toResult(createFindIterable(collectionOptions, arguments, clientSession));
+    }
+
+    private FindIterable<BsonDocument> createFindIterable(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                                          @Nullable final ClientSession clientSession) {
+        FindIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).find(arguments.getDocument("filter", new BsonDocument()));
+        } else {
+            iterable = getCollection(collectionOptions).find(clientSession, arguments.getDocument("filter", new BsonDocument()));
+        }
+
+        if (arguments.containsKey("skip")) {
+            iterable.skip(arguments.getNumber("skip").intValue());
+        }
+        if (arguments.containsKey("limit")) {
+            iterable.limit(arguments.getNumber("limit").intValue());
+        }
+        if (arguments.containsKey("batchSize")) {
+            iterable.batchSize(arguments.getNumber("batchSize").intValue());
+        }
+        if (arguments.containsKey("sort")) {
+            iterable.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("modifiers")) {
+            iterable.modifiers(arguments.getDocument("modifiers"));
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+        return iterable;
+    }
+
+    BsonDocument getMapReduceResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        MapReduceIterable<BsonDocument> iterable;
+        if (clientSession == null) {
+            iterable = getCollection(collectionOptions).mapReduce(arguments.get("map").asJavaScript().getCode(),
+                    arguments.get("reduce").asJavaScript().getCode());
+        } else {
+            iterable = getCollection(collectionOptions).mapReduce(clientSession, arguments.get("map").asJavaScript().getCode(),
+                    arguments.get("reduce").asJavaScript().getCode());
+        }
+
+        if (arguments.containsKey("filter")) {
+            iterable.filter(arguments.getDocument("filter"));
+        }
+        if (arguments.containsKey("collation")) {
+            iterable.collation(getCollation(arguments.getDocument("collation")));
+        }
+        return toResult(iterable.into(new BsonArray()));
+    }
+
+    BsonDocument getDeleteManyResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        DeleteOptions options = new DeleteOptions();
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        int deletedCount;
+        if (clientSession == null) {
+            deletedCount = (int) getCollection(collectionOptions).deleteMany(arguments.getDocument("filter"), options).getDeletedCount();
+        } else {
+            deletedCount = (int) getCollection(collectionOptions).deleteMany(clientSession, arguments.getDocument("filter"), options)
+                    .getDeletedCount();
+        }
+
+        return toResult("deletedCount",
+                new BsonInt32(deletedCount));
+    }
+
+    BsonDocument getDeleteOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        DeleteOptions options = new DeleteOptions();
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        int deletedCount;
+        if (clientSession == null) {
+            deletedCount = (int) getCollection(collectionOptions).deleteOne(arguments.getDocument("filter"), options).getDeletedCount();
+        } else {
+            deletedCount = (int) getCollection(collectionOptions).deleteOne(clientSession, arguments.getDocument("filter"), options)
+                    .getDeletedCount();
+        }
+
+        return toResult("deletedCount", new BsonInt32(deletedCount));
+    }
+
+    BsonDocument getFindOneAndDeleteResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                           @Nullable final ClientSession clientSession) {
+        FindOneAndDeleteOptions options = new FindOneAndDeleteOptions();
+        if (arguments.containsKey("projection")) {
+            options.projection(arguments.getDocument("projection"));
+        }
+        if (arguments.containsKey("sort")) {
+            options.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        BsonDocument result;
+        if (clientSession == null) {
+            result = getCollection(collectionOptions).findOneAndDelete(arguments.getDocument("filter"), options);
+        } else {
+            result = getCollection(collectionOptions).findOneAndDelete(clientSession, arguments.getDocument("filter"), options);
+        }
+
+
+        return toResult(result);
+    }
+
+    BsonDocument getFindOneAndReplaceResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                            @Nullable final ClientSession clientSession) {
+        FindOneAndReplaceOptions options = new FindOneAndReplaceOptions();
+        if (arguments.containsKey("projection")) {
+            options.projection(arguments.getDocument("projection"));
+        }
+        if (arguments.containsKey("sort")) {
+            options.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("returnDocument")) {
+            options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
+                    : ReturnDocument.BEFORE);
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+
+        BsonDocument result;
+        if (clientSession == null) {
+            result = getCollection(collectionOptions).findOneAndReplace(arguments.getDocument("filter"),
+                    arguments.getDocument("replacement"), options);
+        } else {
+            result = getCollection(collectionOptions).findOneAndReplace(clientSession, arguments.getDocument("filter"),
+                    arguments.getDocument("replacement"), options);
+        }
+
+        return toResult(result);
+    }
+
+    BsonDocument getFindOneAndUpdateResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                           @Nullable final ClientSession clientSession) {
+        FindOneAndUpdateOptions options = new FindOneAndUpdateOptions();
+        if (arguments.containsKey("projection")) {
+            options.projection(arguments.getDocument("projection"));
+        }
+        if (arguments.containsKey("sort")) {
+            options.sort(arguments.getDocument("sort"));
+        }
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("returnDocument")) {
+            options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
+                    : ReturnDocument.BEFORE);
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("arrayFilters")) {
+            options.arrayFilters((getListOfDocuments(arguments.getArray("arrayFilters"))));
+        }
+
+        BsonDocument result;
+        if (clientSession == null) {
+            if (arguments.isDocument("update")) {
+                result = getCollection(collectionOptions).findOneAndUpdate(arguments.getDocument("filter"), arguments.getDocument("update"),
+                        options);
+            } else {  // update is a pipeline
+                result = getCollection(collectionOptions).findOneAndUpdate(arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options);
+            }
+        } else {
+            if (arguments.isDocument("update")) {
+                result = getCollection(collectionOptions).findOneAndUpdate(clientSession, arguments.getDocument("filter"),
+                        arguments.getDocument("update"), options);
+            } else {  // update is a pipeline
+                result = getCollection(collectionOptions).findOneAndUpdate(clientSession, arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options);
+            }
+        }
+
+        return toResult(result);
+    }
+
+    BsonDocument getInsertOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        BsonDocument document = arguments.getDocument("document");
+        InsertOneOptions options = new InsertOneOptions();
+        if (arguments.containsKey("bypassDocumentValidation")) {
+                options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+        if (clientSession == null) {
+            getCollection(collectionOptions).insertOne(document, options);
+        } else {
+            getCollection(collectionOptions).insertOne(clientSession, document, options);
+        }
+
+        return toResult(new BsonDocument("insertedId", document.get("_id")));
+    }
+
+    BsonDocument getInsertManyResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        List<BsonDocument> documents = new ArrayList<BsonDocument>();
+        for (BsonValue document : arguments.getArray("documents")) {
+            documents.add(document.asDocument());
+        }
+
+        try {
+            InsertManyOptions options = new InsertManyOptions().ordered(arguments.getDocument("options", new BsonDocument())
+                    .getBoolean("ordered", BsonBoolean.TRUE).getValue());
+            if (arguments.containsKey("bypassDocumentValidation")) {
+                options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+            }
+
+            if (clientSession == null) {
+                getCollection(collectionOptions).insertMany(documents, options);
+            } else {
+                getCollection(collectionOptions).insertMany(clientSession, documents, options);
+            }
+
+            BsonDocument insertedIds = new BsonDocument();
+            for (int i = 0; i < documents.size(); i++) {
+                insertedIds.put(Integer.toString(i), documents.get(i).get("_id"));
+            }
+            return toResult(new BsonDocument("insertedIds", insertedIds));
+        } catch (MongoBulkWriteException e) {
+            // For transaction tests, the exception is expected to be returned.
+            if (clientSession != null && clientSession.hasActiveTransaction()) {
+                throw e;
+            }
+            // Test results are expecting this to look just like bulkWrite error, so translate to InsertOneModel so the result
+            // translation code can be reused.
+            List<InsertOneModel<BsonDocument>> writeModels = new ArrayList<InsertOneModel<BsonDocument>>();
+            for (BsonValue document : arguments.getArray("documents")) {
+                writeModels.add(new InsertOneModel<BsonDocument>(document.asDocument()));
+            }
+            BsonDocument result = toResult(e.getWriteResult(), writeModels, e.getWriteErrors());
+            result.put("error", BsonBoolean.TRUE);
+            return result;
+        }
+    }
+
+    BsonDocument getReplaceOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        ReplaceOptions options = new ReplaceOptions();
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("bypassDocumentValidation")) {
+            options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+
+        UpdateResult updateResult;
+        if (clientSession == null) {
+            updateResult = getCollection(collectionOptions).replaceOne(arguments.getDocument("filter"),
+                    arguments.getDocument("replacement"), options);
+        } else {
+            updateResult = getCollection(collectionOptions).replaceOne(clientSession, arguments.getDocument("filter"),
+                    arguments.getDocument("replacement"), options);
+        }
+
+        return toResult(updateResult);
+    }
+
+    BsonDocument getUpdateManyResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                     @Nullable final ClientSession clientSession) {
+        UpdateOptions options = new UpdateOptions();
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("arrayFilters")) {
+            options.arrayFilters((getListOfDocuments(arguments.getArray("arrayFilters"))));
+        }
+        if (arguments.containsKey("bypassDocumentValidation")) {
+            options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+
+        UpdateResult updateResult;
+        if (clientSession == null) {
+            if (arguments.isDocument("update")) {
+                updateResult = getCollection(collectionOptions).updateMany(arguments.getDocument("filter"), arguments.getDocument("update"),
+                        options);
+            } else {  // update is a pipeline
+                updateResult = getCollection(collectionOptions).updateMany(arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options);
+            }
+        } else {
+            if (arguments.isDocument("update")) {
+                updateResult = getCollection(collectionOptions).updateMany(clientSession, arguments.getDocument("filter"),
+                        arguments.getDocument("update"), options);
+            } else {  // update is a pipeline
+                updateResult = getCollection(collectionOptions).updateMany(clientSession, arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options);
+            }
+        }
+
+        return toResult(updateResult);
+    }
+
+    @SuppressWarnings("unchecked")
+    BsonDocument getUpdateOneResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    @Nullable final ClientSession clientSession) {
+        UpdateOptions options = new UpdateOptions();
+        if (arguments.containsKey("upsert")) {
+            options.upsert(arguments.getBoolean("upsert").getValue());
+        }
+        if (arguments.containsKey("collation")) {
+            options.collation(getCollation(arguments.getDocument("collation")));
+        }
+        if (arguments.containsKey("arrayFilters")) {
+            options.arrayFilters((getListOfDocuments(arguments.getArray("arrayFilters"))));
+        }
+        if (arguments.containsKey("bypassDocumentValidation")) {
+            options.bypassDocumentValidation(arguments.getBoolean("bypassDocumentValidation").getValue());
+        }
+
+        UpdateResult updateResult;
+        if (clientSession == null) {
+            if (arguments.isDocument("update")) {
+                updateResult = getCollection(collectionOptions).updateOne(arguments.getDocument("filter"), arguments.getDocument("update"),
+                        options);
+            } else {  // update is a pipeline
+                updateResult = getCollection(collectionOptions).updateOne(arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options);
+            }
+        } else {
+            if (arguments.isDocument("update")) {
+                updateResult = getCollection(collectionOptions).updateOne(clientSession, arguments.getDocument("filter"),
+                        arguments.getDocument("update"), options);
+            } else {  // update is a pipeline
+                updateResult = getCollection(collectionOptions).updateOne(clientSession, arguments.getDocument("filter"),
+                        getListOfDocuments(arguments.getArray("update")), options);
+            }
+        }
+
+        return toResult(updateResult);
+    }
+
+    BsonDocument getBulkWriteResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                    final @Nullable ClientSession clientSession) {
+        List<WriteModel<BsonDocument>> writeModels = new ArrayList<WriteModel<BsonDocument>>();
+        for (BsonValue bsonValue : arguments.getArray("requests")) {
+            BsonDocument cur = bsonValue.asDocument();
+            String name = cur.getString("name").getValue();
+            BsonDocument requestArguments = cur.getDocument("arguments");
+            if (name.equals("insertOne")) {
+                writeModels.add(new InsertOneModel<BsonDocument>(requestArguments.getDocument("document")));
+            } else if (name.equals("updateOne")) {
+                if (requestArguments.isDocument("update")) {
+                    writeModels.add(new UpdateOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            requestArguments.getDocument("update"),
+                            getUpdateOptions(requestArguments)));
+                } else {  // update is a pipeline
+                    writeModels.add(new UpdateOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            getListOfDocuments(requestArguments.getArray("update")),
+                            getUpdateOptions(requestArguments)));
+                }
+            } else if (name.equals("updateMany")) {
+                if (requestArguments.isDocument("update")) {
+                    writeModels.add(new UpdateManyModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            requestArguments.getDocument("update"),
+                            getUpdateOptions(requestArguments)));
+                } else {  // update is a pipeline
+                    writeModels.add(new UpdateManyModel<BsonDocument>(requestArguments.getDocument("filter"),
+                            getListOfDocuments(requestArguments.getArray("update")),
+                            getUpdateOptions(requestArguments)));
+                }
+            } else if (name.equals("deleteOne")) {
+                writeModels.add(new DeleteOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                        getDeleteOptions(requestArguments)));
+            } else if (name.equals("deleteMany")) {
+                writeModels.add(new DeleteManyModel<BsonDocument>(requestArguments.getDocument("filter"),
+                        getDeleteOptions(requestArguments)));
+            } else if (name.equals("replaceOne")) {
+                writeModels.add(new ReplaceOneModel<BsonDocument>(requestArguments.getDocument("filter"),
+                        requestArguments.getDocument("replacement"), getReplaceOptions(requestArguments)));
+            } else {
+                throw new UnsupportedOperationException(format("Unsupported write request type: %s", name));
+            }
+        }
+
+        try {
+            BulkWriteResult bulkWriteResult;
+            BsonDocument optionsDocument = arguments.getDocument("options", new BsonDocument());
+            BulkWriteOptions options = new BulkWriteOptions()
+                    .ordered(optionsDocument.getBoolean("ordered", BsonBoolean.TRUE).getValue());
+            if (optionsDocument.containsKey("bypassDocumentValidation")) {
+                options.bypassDocumentValidation(optionsDocument.getBoolean("bypassDocumentValidation").getValue());
+            }
+
+            if (clientSession == null) {
+                bulkWriteResult = getCollection(collectionOptions).bulkWrite(writeModels, options);
+            } else {
+                bulkWriteResult = getCollection(collectionOptions).bulkWrite(clientSession, writeModels, options);
+            }
+
+            return toResult(bulkWriteResult, writeModels, Collections.<BulkWriteError>emptyList());
+        } catch (MongoBulkWriteException e) {
+            BsonDocument result = toResult(e.getWriteResult(), writeModels, e.getWriteErrors());
+            result.put("error", BsonBoolean.TRUE);
+            return result;
+        }
+    }
+
+    BsonDocument getRenameResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                 @Nullable final ClientSession clientSession) {
+        MongoNamespace toNamespace = new MongoNamespace(database.getName(), arguments.getString("to").getValue());
+        if (clientSession == null) {
+            getCollection(collectionOptions).renameCollection(toNamespace);
+        } else {
+            getCollection(collectionOptions).renameCollection(clientSession, toNamespace);
+        }
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    BsonDocument getDropResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                 @Nullable final ClientSession clientSession) {
+        if (clientSession == null) {
+            getCollection(collectionOptions).drop();
+        } else {
+            getCollection(collectionOptions).drop(clientSession);
+        }
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    // GridFSBucket operations
+
+    BsonDocument getDownloadByNameResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                         @Nullable final ClientSession clientSession) throws IOException {
+        ByteArrayOutputStream outputStream = null;
+
+        try {
+            outputStream = new ByteArrayOutputStream();
+            GridFSDownloadOptions downloadOptions = new GridFSDownloadOptions();
+            if (arguments.containsKey("options")) {
+                int revision = arguments.getDocument("options").getInt32("revision").getValue();
+                downloadOptions = downloadOptions.revision(revision);
+            }
+            gridFSBucket.downloadToStream(arguments.getString("filename").getValue(), outputStream, downloadOptions);
+            String output = outputStream.toString();
+        } finally {
+            outputStream.close();
+        }
+        return toResult("result", new BsonString(Hex.encode(outputStream.toByteArray()).toLowerCase()));
+    }
+
+    BsonDocument getDeleteResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                 @Nullable final ClientSession clientSession) {
+        try {
+            gridFSBucket.delete(arguments.getObjectId("id").getValue());
+            return new BsonDocument("ok", new BsonInt32(1));
+        } catch (MongoGridFSException e) {
+            BsonDocument result = toResult("message", new BsonString(e.getMessage()));
+            result.put("error", BsonBoolean.TRUE);
+            return result;
+        }
+    }
+
+    BsonDocument getDownloadResult(final BsonDocument collectionOptions, final BsonDocument arguments,
+                                   @Nullable final ClientSession clientSession) throws IOException {
+        ByteArrayOutputStream outputStream = null;
+
+        try {
+            outputStream = new ByteArrayOutputStream();
+            gridFSBucket.downloadToStream(arguments.getObjectId("id").getValue(), outputStream);
+        } finally {
+            outputStream.close();
+        }
+        return toResult("result", new BsonString(Hex.encode(outputStream.toByteArray()).toLowerCase()));
+    }
+
+    BsonDocument getUploadResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                 @Nullable final ClientSession clientSession) {
+        ObjectId objectId = null;
+        BsonDocument arguments = parseHexDocument(rawArguments, "source");
+
+        GridFSBucket gridFSUploadBucket = gridFSBucket;
+        String filename = arguments.getString("filename").getValue();
+        InputStream input = new ByteArrayInputStream(arguments.getBinary("source").getData());
+        GridFSUploadOptions options = new GridFSUploadOptions();
+        BsonDocument rawOptions = arguments.getDocument("options", new BsonDocument());
+        if (rawOptions.containsKey("chunkSizeBytes")) {
+            options.chunkSizeBytes(rawOptions.getInt32("chunkSizeBytes").getValue());
+        }
+        if (rawOptions.containsKey("metadata")) {
+            options.metadata(Document.parse(rawOptions.getDocument("metadata").toJson()));
+        }
+        if (rawOptions.containsKey("disableMD5")) {
+            gridFSUploadBucket.withDisableMD5(rawOptions.getBoolean("disableMD5").getValue());
+        }
+
+        return new BsonDocument("objectId", new BsonObjectId(gridFSUploadBucket.uploadFromStream(filename, input, options)));
+    }
+
+    // Change streams operations
+
+    BsonDocument getClientWatchResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                      @Nullable final ClientSession clientSession) {
+        MongoCursor<ChangeStreamDocument<Document>> cursor = mongoClient.watch().iterator();
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    BsonDocument getWatchResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                      @Nullable final ClientSession clientSession) {
+        MongoCursor<ChangeStreamDocument<BsonDocument>> cursor = baseCollection.watch().iterator();
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    BsonDocument getDatabaseWatchResult(final BsonDocument collectionOptions, final BsonDocument rawArguments,
+                                        @Nullable final ClientSession clientSession) {
+        MongoCursor<ChangeStreamDocument<Document>> cursor = database.watch().iterator();
+        return new BsonDocument("ok", new BsonInt32(1));
+    }
+
+    Collation getCollation(final BsonDocument bsonCollation) {
+        Collation.Builder builder = Collation.builder();
+        if (bsonCollation.containsKey("locale")) {
+            builder.locale(bsonCollation.getString("locale").getValue());
+        }
+        if (bsonCollation.containsKey("caseLevel")) {
+            builder.caseLevel(bsonCollation.getBoolean("caseLevel").getValue());
+        }
+        if (bsonCollation.containsKey("caseFirst")) {
+            builder.collationCaseFirst(CollationCaseFirst.fromString(bsonCollation.getString("caseFirst").getValue()));
+        }
+        if (bsonCollation.containsKey("strength")) {
+            builder.collationStrength(CollationStrength.fromInt(bsonCollation.getInt32("strength").getValue()));
+        }
+        if (bsonCollation.containsKey("numericOrdering")) {
+            builder.numericOrdering(bsonCollation.getBoolean("numericOrdering").getValue());
+        }
+        if (bsonCollation.containsKey("strength")) {
+            builder.collationStrength(CollationStrength.fromInt(bsonCollation.getInt32("strength").getValue()));
+        }
+        if (bsonCollation.containsKey("alternate")) {
+            builder.collationAlternate(CollationAlternate.fromString(bsonCollation.getString("alternate").getValue()));
+        }
+        if (bsonCollation.containsKey("maxVariable")) {
+            builder.collationMaxVariable(CollationMaxVariable.fromString(bsonCollation.getString("maxVariable").getValue()));
+        }
+        if (bsonCollation.containsKey("normalization")) {
+            builder.normalization(bsonCollation.getBoolean("normalization").getValue());
+        }
+        if (bsonCollation.containsKey("backwards")) {
+            builder.backwards(bsonCollation.getBoolean("backwards").getValue());
+        }
+        return builder.build();
+    }
+
+    private UpdateOptions getUpdateOptions(final BsonDocument requestArguments) {
+        UpdateOptions options = new UpdateOptions();
+        if (requestArguments.containsKey("upsert")) {
+            options.upsert(true);
+        }
+        if (requestArguments.containsKey("arrayFilters")) {
+            options.arrayFilters(getListOfDocuments(requestArguments.getArray("arrayFilters")));
+        }
+        if (requestArguments.containsKey("collation")) {
+            options.collation(getCollation(requestArguments.getDocument("collation")));
+        }
+        return options;
+    }
+
+    private DeleteOptions getDeleteOptions(final BsonDocument requestArguments) {
+        DeleteOptions options = new DeleteOptions();
+        if (requestArguments.containsKey("collation")) {
+            options.collation(getCollation(requestArguments.getDocument("collation")));
+        }
+        return options;
+    }
+
+    private ReplaceOptions getReplaceOptions(final BsonDocument requestArguments) {
+        ReplaceOptions options = new ReplaceOptions();
+        if (requestArguments.containsKey("upsert")) {
+            options.upsert(true);
+        }
+        if (requestArguments.containsKey("collation")) {
+            options.collation(getCollation(requestArguments.getDocument("collation")));
+        }
+        return options;
+    }
+
+    @Nullable
+    private List<BsonDocument> getListOfDocuments(@Nullable final BsonArray bsonArray) {
+        if (bsonArray == null) {
+            return null;
+        }
+        List<BsonDocument> arrayFilters = new ArrayList<BsonDocument>(bsonArray.size());
+        for (BsonValue cur : bsonArray) {
+            arrayFilters.add(cur.asDocument());
+        }
+        return arrayFilters;
+    }
+
+    private MongoCollection<BsonDocument> getCollection(final BsonDocument collectionOptions) {
+        MongoCollection<BsonDocument> retVal = baseCollection;
+        if (collectionOptions.containsKey("readPreference")) {
+            retVal = retVal.withReadPreference(getReadPreference(collectionOptions));
+        }
+
+        if (collectionOptions.containsKey("writeConcern")) {
+            WriteConcern writeConcern = getWriteConcern(collectionOptions);
+            retVal = retVal.withWriteConcern(writeConcern);
+        }
+
+        if (collectionOptions.containsKey("readConcern")) {
+            ReadConcern readConcern = getReadConcern(collectionOptions);
+            retVal = retVal.withReadConcern(readConcern);
+        }
+
+        return retVal;
+    }
+
+    ReadPreference getReadPreference(final BsonDocument arguments) {
+        return ReadPreference.valueOf(
+                arguments.getDocument("readPreference").getString("mode").getValue());
+    }
+
+    WriteConcern getWriteConcern(final BsonDocument arguments) {
+        WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
+        BsonDocument writeConcernDocument = arguments.getDocument("writeConcern");
+        for (Map.Entry<String, BsonValue> entry: writeConcernDocument.entrySet()) {
+            if (entry.getKey().equals("w")) {
+                if (entry.getValue().isNumber()) {
+                    writeConcern = writeConcern.withW(entry.getValue().asNumber().intValue());
+                } else {
+                    writeConcern = writeConcern.withW(entry.getValue().asString().getValue());
+                }
+            } else if (entry.getKey().equals("j")) {
+                writeConcern = writeConcern.withJournal(entry.getValue().asBoolean().getValue());
+            } else if (entry.getKey().equals("wtimeout")) {
+                writeConcern = writeConcern.withWTimeout(entry.getValue().asNumber().intValue(), TimeUnit.MILLISECONDS);
+            } else {
+                throw new UnsupportedOperationException("Unsupported write concern document key: " + entry.getKey());
+            }
+        }
+        return writeConcern;
+    }
+
+    ReadConcern getReadConcern(final BsonDocument arguments) {
+        return new ReadConcern(ReadConcernLevel.fromString(arguments.getDocument("readConcern").getString("level").getValue()));
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document, final String hexDocument) {
+        if (document.containsKey(hexDocument) && document.get(hexDocument).isDocument()) {
+            byte[] bytes = Hex.decode(document.getDocument(hexDocument).getString("$hex").getValue());
+            document.put(hexDocument, new BsonBinary(bytes));
+        }
+        return document;
+    }
+
+    boolean isSharded() {
+        return database.runCommand(Document.parse("{isMaster: 1}")).get("msg", "").equals("isdbgrid");
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/MainTransactionsTest.java b/driver-sync/src/test/functional/com/mongodb/client/MainTransactionsTest.java
new file mode 100644
index 00000000000..a4e65f983ca
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/MainTransactionsTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+
+// See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
+@RunWith(Parameterized.class)
+public class MainTransactionsTest extends AbstractUnifiedTest {
+    public MainTransactionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+                                final boolean skipTest) {
+        super(filename, description, data, definition, skipTest);
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/transactions")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/MongoClientFactorySpecification.groovy b/driver-sync/src/test/functional/com/mongodb/client/MongoClientFactorySpecification.groovy
new file mode 100644
index 00000000000..ff3a14a12a4
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/MongoClientFactorySpecification.groovy
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client
+
+import com.mongodb.ClusterFixture
+import com.mongodb.MongoException
+
+import javax.naming.Reference
+import javax.naming.StringRefAddr
+
+class MongoClientFactorySpecification extends FunctionalSpecification {
+    def mongoClientFactory = new MongoClientFactory()
+
+    def 'should create MongoClient from environment'() {
+        given:
+        def environment = new Hashtable<String, String>()
+        environment.put('connectionString', ClusterFixture.getConnectionString().getConnectionString())
+
+        when:
+        MongoClient client = mongoClientFactory.getObjectInstance(null, null, null, environment) as MongoClient
+
+        then:
+        client != null
+
+        cleanup:
+        client?.close()
+    }
+
+    def 'should create MongoClient from obj that is of type Reference'() {
+        given:
+        def environment = new Hashtable<String, String>()
+        def reference = new Reference(null, new StringRefAddr('connectionString',
+                ClusterFixture.getConnectionString().getConnectionString()))
+
+        when:
+        MongoClient client = mongoClientFactory.getObjectInstance(reference, null, null, environment) as MongoClient
+
+        then:
+        client != null
+
+        cleanup:
+        client?.close()
+    }
+
+    def 'should throw if no connection string is provided'() {
+        given:
+        def environment = new Hashtable<String, String>()
+
+        when:
+        mongoClientFactory.getObjectInstance(null, null, null, environment)
+
+        then:
+        thrown(MongoException)
+    }
+}
+
diff --git a/driver-sync/src/test/functional/com/mongodb/client/MongoClientSessionSpecification.groovy b/driver-sync/src/test/functional/com/mongodb/client/MongoClientSessionSpecification.groovy
new file mode 100644
index 00000000000..eddd26ae0b6
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/MongoClientSessionSpecification.groovy
@@ -0,0 +1,382 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client
+
+import category.Slow
+import com.mongodb.ClientSessionOptions
+import com.mongodb.MongoClientException
+import com.mongodb.MongoClientSettings
+import com.mongodb.ReadConcern
+import com.mongodb.ReadPreference
+import com.mongodb.TransactionOptions
+import com.mongodb.WriteConcern
+import com.mongodb.event.CommandStartedEvent
+import com.mongodb.internal.connection.TestCommandListener
+import org.bson.BsonBinarySubType
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonTimestamp
+import org.bson.Document
+import org.junit.Assert
+import org.junit.experimental.categories.Category
+import spock.lang.IgnoreIf
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
+import static com.mongodb.ClusterFixture.isStandalone
+import static com.mongodb.ClusterFixture.serverVersionAtLeast
+import static com.mongodb.client.Fixture.getDefaultDatabaseName
+import static com.mongodb.client.Fixture.getMongoClient
+import static com.mongodb.client.Fixture.getMongoClientSettings
+
+class MongoClientSessionSpecification extends FunctionalSpecification {
+
+    def 'should throw IllegalArgumentException if options are null'() {
+        when:
+        getMongoClient().startSession(null)
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 6) && !isStandalone() })
+    def 'should throw MongoClientException starting a session when sessions are not supported'() {
+        when:
+        getMongoClient().startSession()
+
+        then:
+        thrown(MongoClientException)
+
+        when:
+        getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        then:
+        thrown(MongoClientException)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should create session with correct defaults'() {
+        expect:
+        clientSession.getOriginator() == getMongoClient()
+        clientSession.isCausallyConsistent()
+        clientSession.getOptions() == ClientSessionOptions.builder()
+                .defaultTransactionOptions(TransactionOptions.builder()
+                .readConcern(ReadConcern.DEFAULT)
+                .writeConcern(WriteConcern.ACKNOWLEDGED)
+                .readPreference(ReadPreference.primary())
+                .build())
+                .build()
+        clientSession.getClusterTime() == null
+        clientSession.getOperationTime() == null
+        clientSession.getServerSession() != null
+
+        cleanup:
+        clientSession?.close()
+
+        where:
+        clientSession << [getMongoClient().startSession(),
+                          getMongoClient().startSession(ClientSessionOptions.builder().build())]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'cluster time should advance'() {
+        given:
+        def firstOperationTime = new BsonTimestamp(42, 1)
+        def secondOperationTime = new BsonTimestamp(52, 1)
+        def thirdOperationTime = new BsonTimestamp(22, 1)
+        def firstClusterTime = new BsonDocument('clusterTime', firstOperationTime)
+        def secondClusterTime = new BsonDocument('clusterTime', secondOperationTime)
+        def olderClusterTime = new BsonDocument('clusterTime', thirdOperationTime)
+
+        when:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        then:
+        clientSession.getClusterTime() == null
+
+        when:
+        clientSession.advanceClusterTime(null)
+
+        then:
+        clientSession.getClusterTime() == null
+
+        when:
+        clientSession.advanceClusterTime(firstClusterTime)
+
+        then:
+        clientSession.getClusterTime() == firstClusterTime
+
+        when:
+        clientSession.advanceClusterTime(secondClusterTime)
+
+        then:
+        clientSession.getClusterTime() == secondClusterTime
+
+        when:
+        clientSession.advanceClusterTime(olderClusterTime)
+
+        then:
+        clientSession.getClusterTime() == secondClusterTime
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'operation time should advance'() {
+        given:
+        def firstOperationTime = new BsonTimestamp(42, 1)
+        def secondOperationTime = new BsonTimestamp(52, 1)
+        def olderOperationTime = new BsonTimestamp(22, 1)
+
+        when:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        then:
+        clientSession.getOperationTime() == null
+
+        when:
+        clientSession.advanceOperationTime(null)
+
+        then:
+        clientSession.getOperationTime() == null
+
+        when:
+        clientSession.advanceOperationTime(firstOperationTime)
+
+        then:
+        clientSession.getOperationTime() == firstOperationTime
+
+        when:
+        clientSession.advanceOperationTime(secondOperationTime)
+
+        then:
+        clientSession.getOperationTime() == secondOperationTime
+
+        when:
+        clientSession.advanceOperationTime(olderOperationTime)
+
+        then:
+        clientSession.getOperationTime() == secondOperationTime
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'methods that use the session should throw if the session is closed'() {
+        given:
+        def options = ClientSessionOptions.builder().build()
+        def clientSession = getMongoClient().startSession(options)
+        clientSession.close()
+
+        when:
+        clientSession.getServerSession()
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        clientSession.advanceOperationTime(new BsonTimestamp(42, 0))
+
+        then:
+        thrown(IllegalStateException)
+
+        when:
+        clientSession.advanceClusterTime(new BsonDocument())
+
+        then:
+        thrown(IllegalStateException)
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'informational methods should not throw if the session is closed'() {
+        given:
+        def options = ClientSessionOptions.builder().build()
+        def clientSession = getMongoClient().startSession(options)
+        clientSession.close()
+
+        when:
+        clientSession.getOptions()
+        clientSession.isCausallyConsistent()
+        clientSession.getClusterTime()
+        clientSession.getOperationTime()
+
+        then:
+        noExceptionThrown()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should apply causally consistent session option to client session'() {
+        when:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder()
+                .causallyConsistent(causallyConsistent)
+                .build())
+
+        then:
+        clientSession != null
+        clientSession.isCausallyConsistent() == causallyConsistent
+
+        where:
+        causallyConsistent << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'client session should have server session with valid identifier'() {
+        given:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder().build())
+
+        when:
+        def identifier = clientSession.getServerSession().identifier
+
+        then:
+        identifier.size() == 1
+        identifier.containsKey('id')
+        identifier.get('id').isBinary()
+        identifier.getBinary('id').getType() == BsonBinarySubType.UUID_STANDARD.value
+        identifier.getBinary('id').data.length == 16
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should use a default session'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def settings = MongoClientSettings.builder(getMongoClientSettings()).commandListenerList([commandListener]).build()
+        def client = MongoClients.create(settings)
+
+        when:
+        client.getDatabase('admin').runCommand(new BsonDocument('ping', new BsonInt32(1)))
+
+        then:
+        commandListener.events.size() == 2
+        def pingCommandStartedEvent = commandListener.events.get(0) as CommandStartedEvent
+        pingCommandStartedEvent.command.containsKey('lsid')
+
+        cleanup:
+        client?.close()
+    }
+
+    @IgnoreIf({ serverVersionAtLeast(3, 6) && !isStandalone() })
+    def 'should not use a default session when sessions are not supported'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def settings = MongoClientSettings.builder(getMongoClientSettings()).commandListenerList([commandListener]).build()
+        def client = MongoClients.create(settings)
+
+        when:
+        client.getDatabase('admin').runCommand(new BsonDocument('ping', new BsonInt32(1)))
+
+        then:
+        def pingCommandStartedEvent = commandListener.events.get(0)
+        !(pingCommandStartedEvent as CommandStartedEvent).command.containsKey('lsid')
+
+        cleanup:
+        client?.close()
+    }
+
+    // This test attempts attempts to demonstrate that causal consistency works correctly by inserting a document and then immediately
+    // searching for that document on a secondary by its _id and failing the test if the document is not found.  Without causal consistency
+    // enabled the expectation is that eventually that test would fail since generally the find will execute on the secondary before
+    // the secondary has a chance to replicate the document.
+    // This test is inherently racy as it's possible that the server _does_ replicate fast enough and therefore the test passes anyway
+    // even if causal consistency was not actually in effect.  For that reason the test iterates a number of times in order to increase
+    // confidence that it's really causal consistency that is causing the test to succeed
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    @Category(Slow)
+    def 'should find inserted document on a secondary when causal consistency is enabled'() {
+        given:
+        def collection = getMongoClient().getDatabase(getDefaultDatabaseName()).getCollection(getCollectionName())
+
+        expect:
+        def clientSession = getMongoClient().startSession(ClientSessionOptions.builder()
+                .causallyConsistent(true)
+                .build())
+        try {
+            for (int i = 0; i < 16; i++) {
+                Document document = new Document('_id', i);
+                collection.insertOne(clientSession, document)
+                Document foundDocument = collection
+                        .withReadPreference(ReadPreference.secondaryPreferred()) // read from secondary if available
+                        .withReadConcern(readConcern)
+                        .find(clientSession, document)
+                        .maxTime(30, TimeUnit.SECONDS)  // to avoid the test running forever in case replication is broken
+                        .first();
+                if (foundDocument == null) {
+                    Assert.fail('Should have found recently inserted document on secondary with causal consistency enabled');
+                }
+            }
+        } finally {
+            clientSession.close()
+        }
+
+        where:
+        readConcern << [ReadConcern.DEFAULT, ReadConcern.LOCAL, ReadConcern.MAJORITY]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) })
+    def 'should not use an implicit session for an unacknowledged write'() {
+        given:
+        def commandListener = new TestCommandListener()
+        def settings = MongoClientSettings.builder(getMongoClientSettings()).commandListenerList([commandListener]).build()
+        def client = MongoClients.create(settings)
+
+        when:
+        client.getDatabase(getDatabaseName()).getCollection(getCollectionName())
+                .withWriteConcern(WriteConcern.UNACKNOWLEDGED)
+                .insertOne(new Document())
+
+        then:
+        def insertEvent = commandListener.events.get(0) as CommandStartedEvent
+        !insertEvent.command.containsKey('lsid')
+
+        cleanup:
+        client?.close()
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 6) || isStandalone() })
+    def 'should throw exception if unacknowledged write used with explicit session'() {
+        given:
+        def session = getMongoClient().startSession()
+
+        when:
+        getMongoClient().getDatabase(getDatabaseName()).getCollection(getCollectionName())
+                .withWriteConcern(WriteConcern.UNACKNOWLEDGED)
+                .insertOne(session, new Document())
+
+        then:
+        thrown(MongoClientException)
+
+        cleanup:
+        session?.close()
+    }
+
+
+    @IgnoreIf({ !serverVersionAtLeast(4, 0) || !isDiscoverableReplicaSet() })
+    def 'should ignore unacknowledged write concern when in a transaction'() {
+        given:
+        def collection = getMongoClient().getDatabase(getDatabaseName()).getCollection(getCollectionName())
+        collection.insertOne(new Document())
+
+        def session = getMongoClient().startSession()
+        session.startTransaction()
+
+        when:
+        collection.withWriteConcern(WriteConcern.UNACKNOWLEDGED)
+                .insertOne(session, new Document())
+
+        then:
+        noExceptionThrown()
+
+        cleanup:
+        session.close()
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/client/MongoCollectionTest.java b/driver-sync/src/test/functional/com/mongodb/client/MongoCollectionTest.java
similarity index 97%
rename from driver/src/test/functional/com/mongodb/client/MongoCollectionTest.java
rename to driver-sync/src/test/functional/com/mongodb/client/MongoCollectionTest.java
index a723ddb37db..ae8f0357c43 100644
--- a/driver/src/test/functional/com/mongodb/client/MongoCollectionTest.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/MongoCollectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,14 +33,12 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static java.util.Arrays.asList;
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assume.assumeTrue;
 
 public class MongoCollectionTest extends DatabaseTestCase {
 
@@ -143,8 +141,6 @@ public void testMapReduceWithGenerics() {
 
     @Test
     public void testAggregationToACollection() {
-        assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
-
         // given
         List<Document> documents = asList(new Document("_id", 1), new Document("_id", 2));
 
diff --git a/driver/src/test/functional/com/mongodb/client/Name.java b/driver-sync/src/test/functional/com/mongodb/client/Name.java
similarity index 97%
rename from driver/src/test/functional/com/mongodb/client/Name.java
rename to driver-sync/src/test/functional/com/mongodb/client/Name.java
index 69513a91ec3..629ba0d7670 100644
--- a/driver/src/test/functional/com/mongodb/client/Name.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/Name.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/functional/com/mongodb/client/NameCodec.java b/driver-sync/src/test/functional/com/mongodb/client/NameCodec.java
similarity index 97%
rename from driver/src/test/functional/com/mongodb/client/NameCodec.java
rename to driver-sync/src/test/functional/com/mongodb/client/NameCodec.java
index 1e597302c87..71ed7b138fa 100644
--- a/driver/src/test/functional/com/mongodb/client/NameCodec.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/NameCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver/src/test/functional/com/mongodb/client/NameCodecProvider.java b/driver-sync/src/test/functional/com/mongodb/client/NameCodecProvider.java
similarity index 96%
rename from driver/src/test/functional/com/mongodb/client/NameCodecProvider.java
rename to driver-sync/src/test/functional/com/mongodb/client/NameCodecProvider.java
index 2f334be4dd6..db72aa4c7ab 100644
--- a/driver/src/test/functional/com/mongodb/client/NameCodecProvider.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/NameCodecProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/driver-sync/src/test/functional/com/mongodb/client/ReadConcernTest.java b/driver-sync/src/test/functional/com/mongodb/client/ReadConcernTest.java
new file mode 100644
index 00000000000..f016ff48513
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/ReadConcernTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.Block;
+import com.mongodb.ReadConcern;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static org.junit.Assume.assumeTrue;
+
+public class ReadConcernTest {
+    private MongoClient mongoClient;
+    private TestCommandListener commandListener;
+
+    @Before
+    public void setUp() {
+        assumeTrue(canRunTests());
+
+        commandListener = new TestCommandListener();
+        mongoClient = MongoClients.create(getMongoClientSettingsBuilder()
+                .addCommandListener(commandListener)
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+                    @Override
+                    public void apply(final SocketSettings.Builder builder) {
+                        builder.readTimeout(5, TimeUnit.SECONDS);
+                    }
+                })
+                .build());
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    public void shouldIncludeReadConcernInCommand() {
+        mongoClient.getDatabase(getDefaultDatabaseName()).getCollection("test")
+                .withReadConcern(ReadConcern.LOCAL).count();
+
+        List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+        BsonDocument commandDocument = new BsonDocument("count", new BsonString("test"))
+                .append("readConcern", ReadConcern.LOCAL.asDocument())
+                .append("query", new BsonDocument());
+        if (serverVersionAtLeast(3, 6)) {
+            commandDocument.put("$db", new BsonString(getDefaultDatabaseName()));
+        }
+        assertEventsEquality(Arrays.<CommandEvent>asList(new CommandStartedEvent(1, null, getDefaultDatabaseName(),
+                        "count", commandDocument)), events);
+    }
+
+    private boolean canRunTests() {
+        return serverVersionAtLeast(3, 2);
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/RetryableReadsTest.java b/driver-sync/src/test/functional/com/mongodb/client/RetryableReadsTest.java
new file mode 100644
index 00000000000..53510e86917
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/RetryableReadsTest.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.Block;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+import com.mongodb.client.gridfs.GridFSBucket;
+import com.mongodb.client.gridfs.GridFSBuckets;
+import com.mongodb.client.test.CollectionHelper;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.event.CommandEvent;
+import com.mongodb.internal.connection.TestCommandListener;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonInt64;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.BsonDocumentCodec;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.Hex;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.getConnectionString;
+import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
+import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static java.util.Collections.singletonList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/retryable-writes/tests
+@RunWith(Parameterized.class)
+public class RetryableReadsTest {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final String collectionName;
+    private final String gridFSBucketName;
+    private final BsonDocument gridFSData;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private MongoClient mongoClient;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoCollection<BsonDocument> collection;
+    private final TestCommandListener commandListener;
+    private JsonPoweredCrudTestHelper helper;
+    private GridFSBucket gridFSBucket;
+    private MongoCollection<BsonDocument> filesCollection;
+    private MongoCollection<BsonDocument> chunksCollection;
+    private boolean useMultipleMongoses = false;
+
+    public RetryableReadsTest(final String filename, final String description, final String databaseName,
+                              final String collectionName, final BsonArray data, final BsonString bucketName,
+                              final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
+        this.definition = definition;
+        this.gridFSBucketName = (bucketName != null ? bucketName.getValue() : null);
+        this.gridFSData = (bucketName != null ? (BsonDocument) data.get(0) : null);
+        this.data = (bucketName != null ? null : data);
+        this.commandListener = new TestCommandListener();
+        this.skipTest = skipTest;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        assumeTrue("Skipping test: " + definition.getString("skipReason", new BsonString("")).getValue(),
+                !definition.containsKey("skipReason"));
+
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+        final BsonDocument clientOptions = definition.getDocument("clientOptions", new BsonDocument());
+
+        ConnectionString connectionString = getConnectionString();
+        useMultipleMongoses = definition.getBoolean("useMultipleMongoses", BsonBoolean.FALSE).getValue();
+        if (useMultipleMongoses) {
+            assumeTrue(isSharded());
+            connectionString = getMultiMongosConnectionString();
+            assumeTrue("The system property org.mongodb.test.transaction.uri is not set.", connectionString != null);
+        }
+
+        MongoClientSettings.Builder builder = getMongoClientSettingsBuilder()
+                .applyConnectionString(connectionString)
+                .addCommandListener(commandListener)
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+                    @Override
+                    public void apply(final SocketSettings.Builder builder) {
+                        builder.readTimeout(5, TimeUnit.SECONDS);
+                    }
+                })
+                .writeConcern(getWriteConcern(clientOptions))
+                .readConcern(getReadConcern(clientOptions))
+                .readPreference(getReadPreference(clientOptions))
+                .retryWrites(clientOptions.getBoolean("retryWrites", BsonBoolean.FALSE).getValue())
+                .retryReads(clientOptions.getBoolean("retryReads", BsonBoolean.TRUE).getValue());
+
+        mongoClient = MongoClients.create(builder.build());
+
+        if (data != null) {
+            List<BsonDocument> documents = new ArrayList<BsonDocument>();
+            for (BsonValue document : data) {
+                documents.add(document.asDocument());
+            }
+
+            collectionHelper.drop();
+            if (documents.size() > 0) {
+                collectionHelper.insertDocuments(documents);
+            }
+        }
+
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+        if (gridFSBucketName != null) {
+            setupGridFSBuckets(database);
+            commandListener.reset();
+        }
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        helper = new JsonPoweredCrudTestHelper(description, database, collection, gridFSBucket, mongoClient);
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+    }
+
+    private ReadConcern getReadConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readConcernLevel")) {
+            return new ReadConcern(ReadConcernLevel.fromString(clientOptions.getString("readConcernLevel").getValue()));
+        } else {
+            return ReadConcern.DEFAULT;
+        }
+    }
+
+    private WriteConcern getWriteConcern(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("w")) {
+            if (clientOptions.isNumber("w")) {
+                return new WriteConcern(clientOptions.getNumber("w").intValue());
+            } else {
+                return new WriteConcern(clientOptions.getString("w").getValue());
+            }
+        } else {
+            return WriteConcern.ACKNOWLEDGED;
+        }
+    }
+
+    private ReadPreference getReadPreference(final BsonDocument clientOptions) {
+        if (clientOptions.containsKey("readPreference")) {
+            return ReadPreference.valueOf(clientOptions.getString("readPreference").getValue());
+        } else {
+            return ReadPreference.primary();
+        }
+    }
+
+    private void setupGridFSBuckets(final MongoDatabase database) {
+        gridFSBucket = GridFSBuckets.create(database);
+        filesCollection = database.getCollection("fs.files", BsonDocument.class);
+        chunksCollection = database.getCollection("fs.chunks", BsonDocument.class);
+
+        filesCollection.drop();
+        chunksCollection.drop();
+
+        List<BsonDocument> filesDocuments = processFiles(
+                gridFSData.getArray("fs.files", new BsonArray()), new ArrayList<BsonDocument>());
+        if (!filesDocuments.isEmpty()) {
+            filesCollection.insertMany(filesDocuments);
+        }
+
+        List<BsonDocument> chunksDocuments = processChunks(
+                gridFSData.getArray("fs.chunks", new BsonArray()), new ArrayList<BsonDocument>());
+        if (!chunksDocuments.isEmpty()) {
+            chunksCollection.insertMany(chunksDocuments);
+        }
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+        if (collectionHelper != null && definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(new BsonDocument("configureFailPoint",
+                    definition.getDocument("failPoint").getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        executeOperations(definition.getArray("operations"));
+
+        if (definition.containsKey("expectations")) {
+            List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"), databaseName, null);
+            List<CommandEvent> events = commandListener.getCommandStartedEvents();
+
+            assertEventsEquality(expectedEvents, events);
+        }
+
+        BsonDocument expectedOutcome = definition.getDocument("outcome", new BsonDocument());
+        if (expectedOutcome.containsKey("collection")) {
+            List<BsonDocument> collectionData = collectionHelper.find(new BsonDocumentCodec());
+            assertEquals(expectedOutcome.getDocument("collection").getArray("data").getValues(), collectionData);
+        }
+    }
+
+    private void executeOperations(final BsonArray operations) {
+        for (BsonValue cur : operations) {
+            final BsonDocument operation = cur.asDocument();
+            BsonValue expectedResult = operation.get("result");
+
+            try {
+                BsonDocument actualOutcome = helper.getOperationResults(operation);
+                if (expectedResult != null) {
+                    BsonValue actualResult = actualOutcome.get("result");
+                    if (actualResult.isDocument()) {
+                        assertEquals("Expected operation result differs from actual", expectedResult, actualResult);
+                    }
+                }
+            } catch (MongoException e) {
+                assertTrue("Unexpected error in operation", operation.getBoolean("error", BsonBoolean.FALSE).getValue());
+            }
+        }
+    }
+
+    @Parameterized.Parameters(name = "{0}: {2}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/retryable-reads")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getString("collection_name",
+                                new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
+                        (testDocument.containsKey("bucket_name") ? new BsonArray(singletonList(testDocument.getDocument("data")))
+                                : testDocument.getArray("data")),
+                        testDocument.getString("bucket_name", null), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+    private List<BsonDocument> processFiles(final BsonArray bsonArray, final List<BsonDocument> documents) {
+        for (BsonValue rawDocument : bsonArray.getValues()) {
+            if (rawDocument.isDocument()) {
+                BsonDocument document = rawDocument.asDocument();
+                if (document.get("length").isInt32()) {
+                    document.put("length", new BsonInt64(document.getInt32("length").getValue()));
+                }
+                if (document.containsKey("metadata") && document.getDocument("metadata").isEmpty()) {
+                    document.remove("metadata");
+                }
+                if (document.containsKey("aliases") && document.getArray("aliases").getValues().size() == 0) {
+                    document.remove("aliases");
+                }
+                if (document.containsKey("contentType") && document.getString("contentType").getValue().length() == 0) {
+                    document.remove("contentType");
+                }
+                documents.add(document);
+            }
+        }
+        return documents;
+    }
+
+    private List<BsonDocument> processChunks(final BsonArray bsonArray, final List<BsonDocument> documents) {
+        for (BsonValue rawDocument: bsonArray.getValues()) {
+            if (rawDocument.isDocument()) {
+                documents.add(parseHexDocument(rawDocument.asDocument()));
+            }
+        }
+        return documents;
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document) {
+        return parseHexDocument(document, "data");
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document, final String hexDocument) {
+        if (document.containsKey(hexDocument) && document.get(hexDocument).isDocument()) {
+            byte[] bytes = Hex.decode(document.getDocument(hexDocument).getString("$hex").getValue());
+            document.put(hexDocument, new BsonBinary(bytes));
+        }
+        return document;
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesProseTest.java
new file mode 100644
index 00000000000..db854e08aff
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesProseTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.MongoException;
+import org.bson.Document;
+import org.junit.Before;
+import org.junit.Test;
+
+import static com.mongodb.ClusterFixture.getServerStatus;
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static com.mongodb.ClusterFixture.serverVersionLessThan;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+public class RetryableWritesProseTest extends DatabaseTestCase {
+
+    @Before
+    @Override
+    public void setUp() {
+        assumeTrue(canRunTests());
+        super.setUp();
+    }
+
+    @Test
+    public void testRetryWritesWithInsertOneAgainstMMAPv1RaisesError() {
+        boolean exceptionFound = false;
+
+        try {
+            collection.insertOne(Document.parse("{x: 1}"));
+        } catch (MongoClientException e) {
+            assertTrue(e.getMessage().equals("This MongoDB deployment does not support retryable writes. "
+                    + "Please add retryWrites=false to your connection string."));
+            assertTrue(((MongoException) e.getCause()).getCode() == 20);
+            assertTrue(e.getCause().getMessage().contains("Transaction numbers"));
+            exceptionFound = true;
+        }
+        assertTrue(exceptionFound);
+    }
+
+    @Test
+    public void testRetryWritesWithFindOneAndDeleteAgainstMMAPv1RaisesError() {
+        boolean exceptionFound = false;
+
+        try {
+            collection.findOneAndDelete(Document.parse("{x: 1}"));
+        } catch (MongoClientException e) {
+            assertTrue(e.getMessage().equals("This MongoDB deployment does not support retryable writes. "
+                    + "Please add retryWrites=false to your connection string."));
+            assertTrue(((MongoException) e.getCause()).getCode() == 20);
+            assertTrue(e.getCause().getMessage().contains("Transaction numbers"));
+            exceptionFound = true;
+        }
+        assertTrue(exceptionFound);
+    }
+
+    private boolean canRunTests() {
+        Document storageEngine = (Document) getServerStatus().get("storageEngine");
+
+        return ((isSharded() || isDiscoverableReplicaSet())
+                && storageEngine != null && storageEngine.get("name").equals("mmapv1")
+                && serverVersionAtLeast(3, 6) && serverVersionLessThan(4, 1));
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesTest.java b/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesTest.java
new file mode 100644
index 00000000000..fc8b053f500
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/RetryableWritesTest.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.client.test.CollectionHelper;
+import org.bson.BsonArray;
+import org.bson.BsonBoolean;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeFalse;
+
+// See https://github.com/mongodb/specifications/tree/master/source/retryable-writes/tests
+@RunWith(Parameterized.class)
+public class RetryableWritesTest {
+    private final String filename;
+    private final String description;
+    private final String databaseName;
+    private final String collectionName;
+    private final BsonArray data;
+    private final BsonDocument definition;
+    private final boolean skipTest;
+    private MongoClient mongoClient;
+    private CollectionHelper<Document> collectionHelper;
+    private MongoCollection<BsonDocument> collection;
+    private JsonPoweredCrudTestHelper helper;
+
+    public RetryableWritesTest(final String filename, final String description, final String databaseName, final BsonArray data,
+                               final BsonDocument definition, final boolean skipTest) {
+        this.filename = filename;
+        this.description = description;
+        this.databaseName = databaseName;
+        this.collectionName = filename.substring(0, filename.lastIndexOf("."));
+        this.data = data;
+        this.definition = definition;
+        this.skipTest = skipTest;
+    }
+
+    @Before
+    public void setUp() {
+        assumeFalse(skipTest);
+        collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
+        BsonDocument clientOptions = definition.getDocument("clientOptions", new BsonDocument());
+        MongoClientSettings.Builder builder = getMongoClientSettingsBuilder();
+
+        if (clientOptions.containsKey("retryWrites")) {
+            builder.retryWrites(clientOptions.getBoolean("retryWrites").getValue());
+        }
+        mongoClient = MongoClients.create(builder.build());
+
+        List<BsonDocument> documents = new ArrayList<BsonDocument>();
+        for (BsonValue document : data) {
+            documents.add(document.asDocument());
+        }
+
+        collectionHelper.drop();
+        collectionHelper.insertDocuments(documents);
+
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
+        if (definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(definition.getDocument("failPoint"));
+        }
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+        if (collectionHelper != null && definition.containsKey("failPoint")) {
+            collectionHelper.runAdminCommand(new BsonDocument("configureFailPoint",
+                    definition.getDocument("failPoint").getString("configureFailPoint"))
+                    .append("mode", new BsonString("off")));
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+
+        BsonDocument operation = definition.getDocument("operation");
+        BsonDocument outcome = definition.getDocument("outcome");
+
+        BsonDocument result = new BsonDocument();
+        boolean wasException = false;
+        try {
+            result = helper.getOperationResults(operation);
+        } catch (Exception e) {
+            wasException = true;
+        }
+
+        if (outcome.containsKey("collection")) {
+            List<BsonDocument> collectionData = collection.withDocumentClass(BsonDocument.class).find().into(new ArrayList<BsonDocument>());
+            assertEquals(outcome.getDocument("collection").getArray("data").getValues(), collectionData);
+        }
+
+        if (outcome.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+            assertEquals(outcome.containsKey("error"), wasException);
+        } else {
+            BsonDocument fixedExpectedResult = outcome.getDocument("result", new BsonDocument());
+            assertEquals(fixedExpectedResult, result.getDocument("result", new BsonDocument()));
+        }
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/retryable-writes")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
+                        testDocument.getArray("data"), test.asDocument(),
+                        !isDiscoverableReplicaSet() || skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/SessionsTest.java b/driver-sync/src/test/functional/com/mongodb/client/SessionsTest.java
new file mode 100644
index 00000000000..ef67f1c1e4b
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/SessionsTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+
+// See https://github.com/mongodb/specifications/tree/master/source/sessions/tests
+@RunWith(Parameterized.class)
+public class SessionsTest extends AbstractUnifiedTest {
+    public SessionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+                        final boolean skipTest) {
+        super(filename, description, data, definition, skipTest);
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/sessions")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/TransactionFailureTest.java b/driver-sync/src/test/functional/com/mongodb/client/TransactionFailureTest.java
new file mode 100644
index 00000000000..651f9075c94
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/TransactionFailureTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoClientException;
+import org.bson.Document;
+import org.junit.Before;
+import org.junit.Test;
+
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.serverVersionLessThan;
+import static org.junit.Assume.assumeTrue;
+
+public class TransactionFailureTest extends DatabaseTestCase {
+    public TransactionFailureTest() {
+    }
+
+    @Before
+    public void setUp() {
+        assumeTrue(canRunTests());
+        super.setUp();
+    }
+
+    @Test(expected = MongoClientException.class)
+    public void testTransactionFails() {
+        ClientSession clientSession = client.startSession();
+        try {
+            clientSession.startTransaction();
+            collection.insertOne(clientSession, Document.parse("{_id: 1, a: 1}"));
+        } finally {
+            clientSession.close();
+        }
+    }
+
+    private boolean canRunTests() {
+        return serverVersionLessThan("4.0")
+                || (serverVersionLessThan("4.1.0") && isSharded());
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/TransactionProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/TransactionProseTest.java
new file mode 100644
index 00000000000..35a293b3498
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/TransactionProseTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.Block;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoException;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import org.bson.Document;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
+import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/blob/master/source/transactions/tests/README.rst#mongos-pinning-prose-tests
+public class TransactionProseTest {
+    private MongoClient client;
+    private MongoCollection<Document> collection;
+
+    @Before
+    public void setUp() {
+        assumeTrue(canRunTests());
+        MongoClientSettings.Builder builder = MongoClientSettings.builder()
+                .applyConnectionString(getMultiMongosConnectionString());
+        if (System.getProperty("java.version").startsWith("1.6.")) {
+            builder.applyToSslSettings(new Block<SslSettings.Builder>() {
+                @Override
+                public void apply(final SslSettings.Builder builder) {
+                    builder.invalidHostNameAllowed(true);
+                }
+            });
+        }
+
+        client = MongoClients.create(MongoClientSettings.builder(builder.build())
+                .applyToSocketSettings(new Block<SocketSettings.Builder>() {
+                    @Override
+                    public void apply(final SocketSettings.Builder builder) {
+                        builder.readTimeout(5, TimeUnit.SECONDS);
+                    }
+                })
+                .build());
+
+        collection = client.getDatabase(getDefaultDatabaseName()).getCollection(getClass().getName());
+        collection.drop();
+    }
+
+    @After
+    public void tearDown() {
+        if (collection != null) {
+            collection.drop();
+        }
+        if (client != null) {
+            client.close();
+        }
+    }
+
+        // Test that starting a new transaction on a pinned ClientSession unpins the session and normal
+    // server selection is performed for the next operation.
+    @Test
+    public void testNewTransactionUnpinsSession() throws MongoException {
+        ClientSession session = null;
+        try {
+            collection.insertOne(Document.parse("{}"));
+            session = client.startSession();
+            session.startTransaction();
+            collection.insertOne(session, Document.parse("{ _id : 1 }"));
+            session.commitTransaction();
+
+            Set<FindIterable<Document>> addresses = new HashSet<FindIterable<Document>>();
+            int iterations = 50;
+            while (iterations-- > 0) {
+                session.startTransaction();
+                addresses.add(collection.find(session, Document.parse("{}")));
+                session.commitTransaction();
+            }
+            assertTrue(addresses.size() > 1);
+        } finally {
+            if (session != null) {
+                session.close();
+            }
+            if (collection != null) {
+                collection.drop();
+            }
+        }
+    }
+
+    // Test non-transaction operations using a pinned ClientSession unpins the session and normal server selection is performed.
+    @Test
+    public void testNonTransactionOpsUnpinsSession() throws MongoException {
+        ClientSession session = null;
+        try {
+            collection.insertOne(Document.parse("{}"));
+            session = client.startSession();
+            session.startTransaction();
+            collection.insertOne(session, Document.parse("{ _id : 1 }"));
+
+            Set<FindIterable<Document>> addresses = new HashSet<FindIterable<Document>>();
+            int iterations = 50;
+            while (iterations-- > 0) {
+                addresses.add(collection.find(session, Document.parse("{}")));
+            }
+            assertTrue(addresses.size() > 1);
+        } finally {
+            if (session != null) {
+                session.close();
+            }
+            if (collection != null) {
+                collection.drop();
+            }
+        }
+    }
+
+    private boolean canRunTests() {
+        if (isSharded()) {
+            return serverVersionAtLeast(4, 1);
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/UuidRepresentationTest.java b/driver-sync/src/test/functional/com/mongodb/client/UuidRepresentationTest.java
new file mode 100644
index 00000000000..9d7c275ff2e
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/UuidRepresentationTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonBinarySubType;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.junit.After;
+
+import java.util.UUID;
+
+public class UuidRepresentationTest extends AbstractUuidRepresentationTest{
+    private MongoClient mongoClient;
+
+    public UuidRepresentationTest(final UuidRepresentation uuidRepresentation, final BsonBinarySubType subType,
+                                  final UUID uuid, final byte[] encodedValue, final byte[] standardEncodedValue) {
+        super(uuidRepresentation, subType, uuid, encodedValue, standardEncodedValue);
+    }
+
+
+    @Override
+    protected void createMongoClient(final UuidRepresentation uuidRepresentation, final CodecRegistry codecRegistry) {
+        mongoClient = MongoClients.create(Fixture.getMongoClientSettingsBuilder()
+                .uuidRepresentation(uuidRepresentation)
+                .codecRegistry(codecRegistry)
+                .build());
+    }
+
+    @Override
+    protected MongoDatabase getDatabase(final String databaseName) {
+        return mongoClient.getDatabase(databaseName);
+    }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/WithTransactionHelperTransactionsTest.java b/driver-sync/src/test/functional/com/mongodb/client/WithTransactionHelperTransactionsTest.java
new file mode 100644
index 00000000000..e5eff45a9a5
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/WithTransactionHelperTransactionsTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import org.bson.BsonArray;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.JsonPoweredTestHelper;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+
+// See https://github.com/mongodb/specifications/tree/master/source/transactions-convenient-api/tests
+@RunWith(Parameterized.class)
+public class WithTransactionHelperTransactionsTest extends AbstractUnifiedTest {
+    public WithTransactionHelperTransactionsTest(final String filename, final String description, final BsonArray data,
+                                                 final BsonDocument definition, final boolean skipTest) {
+        super(filename, description, data, definition, skipTest);
+    }
+
+    @Parameterized.Parameters(name = "{0}: {1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/transactions-convenient-api")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test : testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
+            }
+        }
+        return data;
+    }
+
+}
diff --git a/driver-sync/src/test/functional/com/mongodb/client/WithTransactionProseTest.java b/driver-sync/src/test/functional/com/mongodb/client/WithTransactionProseTest.java
new file mode 100644
index 00000000000..066c19d8a85
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/WithTransactionProseTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client;
+
+import com.mongodb.MongoException;
+
+import com.mongodb.client.internal.ClientSessionClock;
+import org.bson.Document;
+import org.junit.Before;
+import org.junit.Test;
+
+import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
+import static com.mongodb.ClusterFixture.isSharded;
+import static com.mongodb.ClusterFixture.serverVersionAtLeast;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+// See https://github.com/mongodb/specifications/tree/master/source/transactions-convenient-api/tests/README.rst#prose-tests
+public class WithTransactionProseTest extends DatabaseTestCase {
+    private static final long START_TIME_MS = 1L;
+    private static final long ERROR_GENERATING_INTERVAL = 121000L;
+
+    @Before
+    @Override
+    public void setUp() {
+        assumeTrue(canRunTests());
+        super.setUp();
+
+        // create the collection before starting transactions
+        collection.insertOne(Document.parse("{ _id : 0 }"));
+    }
+
+    //
+    // Test that the callback raises a custom exception or error that does not include either UnknownTransactionCommitResult or
+    // TransientTransactionError error labels. The callback will execute using withTransaction and assert that the callback's error
+    // bypasses any retry logic within withTransaction and is propagated to the caller of withTransaction.
+    //
+    @Test
+    public void testCallbackRaisesCustomError() {
+        final String exceptionMessage = "NotTransientOrUnknownError";
+        ClientSession session = client.startSession();
+        try {
+            session.withTransaction(new TransactionBody<Void>() {
+                @Override
+                public Void execute() {
+                    throw new MongoException(exceptionMessage);
+                }
+            });
+            // should not get here
+            fail("Test should have thrown an exception.");
+        } catch (MongoException e) {
+            assertEquals(exceptionMessage, e.getMessage());
+        } finally {
+            session.close();
+        }
+    }
+
+    //
+    // Test that the callback that returns a custom value (e.g. boolean, string, object). Execute this callback using withTransaction
+    // and assert that the callback's return value is propagated to the caller of withTransaction.
+    //
+    @Test
+    public void testCallbackReturnsValue() {
+        ClientSession session = client.startSession();
+        final String msg = "Inserted document";
+        try {
+            String returnValueFromCallback = session.withTransaction(new TransactionBody<String>() {
+                @Override
+                public String execute() {
+                    collection.insertOne(Document.parse("{ _id : 1 }"));
+                    return msg;
+                }
+            });
+            assertEquals(msg, returnValueFromCallback);
+        } finally {
+            session.close();
+        }
+    }
+
+    //
+    // If the callback raises an error with the TransientTransactionError label and the retry timeout has been exceeded, withTransaction
+    // should propagate the error to its caller.
+    //
+    @Test
+    public void testRetryTimeoutEnforcedTransientTransactionError() {
+        final String errorMessage = "transient transaction error";
+
+        ClientSession session = client.startSession();
+        ClientSessionClock.INSTANCE.setTime(START_TIME_MS);
+        try {
+            session.withTransaction(new TransactionBody<Void>() {
+                @Override
+                public Void execute() {
+                ClientSessionClock.INSTANCE.setTime(ERROR_GENERATING_INTERVAL);
+                    MongoException e = new MongoException(112, errorMessage);
+                    e.addLabel(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL);
+                    throw e;
+                }
+            });
+            fail("Test should have thrown an exception.");
+        } catch (RuntimeException e) {
+            assertEquals(errorMessage, e.getMessage());
+            assertTrue(((MongoException) e).getErrorLabels().contains(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL));
+        } finally {
+            session.close();
+        }
+    }
+
+    //
+    // If committing raises an error with the UnknownTransactionCommitResult label, the error is not a write concern timeout, and the
+    // retry timeout has been exceeded, withTransaction should propagate the error to its caller.
+    //
+    @Test
+    public void testRetryTimeoutEnforcedUnknownTransactionCommit() {
+        final MongoDatabase failPointAdminDb = client.getDatabase("admin");
+        failPointAdminDb.runCommand(
+                Document.parse("{'configureFailPoint': 'failCommand', 'mode': {'times': 2}, "
+                        + "'data': {'failCommands': ['commitTransaction'], 'errorCode': 91, 'closeConnection': false}}"));
+
+        final ClientSession session = client.startSession();
+        ClientSessionClock.INSTANCE.setTime(START_TIME_MS);
+        try {
+            session.withTransaction(new TransactionBody<Void>() {
+                @Override
+                public Void execute() {
+                    ClientSessionClock.INSTANCE.setTime(ERROR_GENERATING_INTERVAL);
+                    collection.insertOne(session, new Document("_id", 2));
+                    return null;
+                }
+            });
+            fail("Test should have thrown an exception.");
+        } catch (RuntimeException e) {
+            assertEquals(91, ((MongoException) e).getCode());
+            assertTrue(((MongoException) e).getErrorLabels().contains(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL));
+        } finally {
+            session.close();
+            failPointAdminDb.runCommand(Document.parse("{'configureFailPoint': 'failCommand', 'mode': 'off'}"));
+        }
+    }
+
+    //
+    // If committing raises an error with the TransientTransactionError label and the retry timeout has been exceeded, withTransaction
+    // should propagate the error to its caller. This case may occur if the commit was internally retried against a new primary after
+    // a failover and the second primary returned a NoSuchTransaction error response.
+    //
+    @Test
+    public void testRetryTimeoutEnforcedTransientTransactionErrorOnCommit() {
+        final MongoDatabase failPointAdminDb = client.getDatabase("admin");
+        failPointAdminDb.runCommand(
+                Document.parse("{'configureFailPoint': 'failCommand', 'mode': {'times': 2}, "
+                        + "'data': {'failCommands': ['commitTransaction'], 'errorCode': 251, 'codeName': 'NoSuchTransaction', "
+                        + "'errmsg': 'Transaction 0 has been aborted', 'closeConnection': false}}"));
+
+        final ClientSession session = client.startSession();
+        ClientSessionClock.INSTANCE.setTime(START_TIME_MS);
+        try {
+            session.withTransaction(new TransactionBody<Void>() {
+                @Override
+                public Void execute() {
+                    ClientSessionClock.INSTANCE.setTime(ERROR_GENERATING_INTERVAL);
+                    collection.insertOne(session, Document.parse("{ _id : 1 }"));
+                    return null;
+                }
+            });
+            fail("Test should have thrown an exception.");
+        } catch (RuntimeException e) {
+            assertEquals(251, ((MongoException) e).getCode());
+            assertTrue(((MongoException) e).getErrorLabels().contains(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL));
+        } finally {
+            session.close();
+            failPointAdminDb.runCommand(Document.parse("{'configureFailPoint': 'failCommand', 'mode': 'off'}"));
+        }
+    }
+
+    private boolean canRunTests() {
+        if (isSharded()) {
+            return serverVersionAtLeast(4, 1);
+        } else if (isDiscoverableReplicaSet()) {
+            return serverVersionAtLeast(4, 0);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/driver/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy b/driver-sync/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
similarity index 80%
rename from driver/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
rename to driver-sync/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
index fdc513dd6c0..fa5bd4fbf06 100644
--- a/driver/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
+++ b/driver-sync/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,8 +16,9 @@
 
 package com.mongodb.client.gridfs
 
-import com.mongodb.FunctionalSpecification
+import com.mongodb.MongoClientSettings
 import com.mongodb.MongoGridFSException
+import com.mongodb.client.FunctionalSpecification
 import com.mongodb.client.MongoCollection
 import com.mongodb.client.MongoDatabase
 import com.mongodb.client.gridfs.model.GridFSDownloadOptions
@@ -33,11 +34,13 @@ import spock.lang.Unroll
 
 import java.security.MessageDigest
 
-import static com.mongodb.Fixture.getDefaultDatabaseName
-import static com.mongodb.Fixture.getMongoClient
+import static com.mongodb.client.Fixture.getDefaultDatabase
+import static com.mongodb.client.model.Filters.eq
+import static com.mongodb.client.model.Updates.unset
 import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
 import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
 
+@SuppressWarnings('deprecation')
 class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
     protected MongoDatabase mongoDatabase;
     protected MongoCollection<GridFSFile> filesCollection;
@@ -47,7 +50,7 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
     def multiChunkString = singleChunkString.padLeft(1024 * 255 * 5)
 
     def setup() {
-        mongoDatabase = getMongoClient().getDatabase(getDefaultDatabaseName())
+        mongoDatabase = getDefaultDatabase()
         filesCollection = mongoDatabase.getCollection('fs.files', GridFSFile)
         chunksCollection = mongoDatabase.getCollection('fs.chunks')
         filesCollection.drop()
@@ -68,40 +71,41 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         def content = multiChunk ? multiChunkString : singleChunkString
         def contentBytes = content as byte[]
         def expectedLength = contentBytes.length as Long
-        def expectedMD5 = MessageDigest.getInstance('MD5').digest(contentBytes).encodeHex().toString()
+        def expectedMD5 = md5Disabled ? null : MessageDigest.getInstance('MD5').digest(contentBytes).encodeHex().toString()
+        def bucket = gridFSBucket.withDisableMD5(md5Disabled)
         ObjectId fileId
         byte[] gridFSContentBytes
 
         when:
         if (direct) {
-            fileId = gridFSBucket.uploadFromStream('myFile', new ByteArrayInputStream(contentBytes));
+            fileId = bucket.uploadFromStream('myFile', new ByteArrayInputStream(contentBytes))
         } else {
-            def outputStream = gridFSBucket.openUploadStream('myFile')
+            def outputStream = bucket.openUploadStream('myFile')
             outputStream.write(contentBytes)
             outputStream.close()
             fileId = outputStream.getObjectId()
         }
 
         then:
-        filesCollection.count() == 1
-        chunksCollection.count() == chunkCount
+        filesCollection.countDocuments() == 1
+        chunksCollection.countDocuments() == chunkCount
 
         when:
         def file = filesCollection.find().first()
 
         then:
         file.getObjectId() == fileId
-        file.getChunkSize() == gridFSBucket.getChunkSizeBytes()
+        file.getChunkSize() == bucket.getChunkSizeBytes()
         file.getLength() == expectedLength
         file.getMD5() == expectedMD5
         file.getMetadata() == null
 
         when:
         if (direct) {
-            gridFSContentBytes = gridFSBucket.openDownloadStream(fileId).getBytes()
+            gridFSContentBytes = bucket.openDownloadStream(fileId).getBytes()
         } else {
             def outputStream = new ByteArrayOutputStream(expectedLength as int)
-            gridFSBucket.downloadToStream(fileId, outputStream)
+            bucket.downloadToStream(fileId, outputStream)
             outputStream.close()
             gridFSContentBytes = outputStream.toByteArray()
         }
@@ -110,11 +114,13 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         gridFSContentBytes == contentBytes
 
         where:
-        description              | multiChunk | chunkCount | direct
-        'a small file directly'  | false      | 1          | true
-        'a small file to stream' | false      | 1          | false
-        'a large file directly'  | true       | 5          | true
-        'a large file to stream' | true       | 5          | false
+        description                     | multiChunk | chunkCount | direct | md5Disabled
+        'a small file directly'         | false      | 1          | true   | false
+        'a small file to stream'        | false      | 1          | false  | false
+        'a large file directly'         | true       | 5          | true   | false
+        'a large file to stream'        | true       | 5          | false  | false
+        'a small file directly no md5'  | false      | 1          | true   | true
+        'a small file to stream no md5' | false      | 1          | false  | true
     }
 
     def 'should round trip with a batchSize of 1'() {
@@ -130,8 +136,8 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         fileId = gridFSBucket.uploadFromStream('myFile', new ByteArrayInputStream(contentBytes));
 
         then:
-        filesCollection.count() == 1
-        chunksCollection.count() == 5
+        filesCollection.countDocuments() == 1
+        chunksCollection.countDocuments() == 5
 
         when:
         def file = filesCollection.find().first()
@@ -174,8 +180,8 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         gridFSBucket.delete(fileId)
 
         then:
-        filesCollection.count() == 0
-        chunksCollection.count() == 0
+        filesCollection.countDocuments() == 0
+        chunksCollection.countDocuments() == 0
     }
 
     def 'should use custom uploadOptions when uploading' () {
@@ -204,8 +210,8 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         }
 
         then:
-        filesCollection.count() == 1
-        chunksCollection.count() == expectedNoChunks
+        filesCollection.countDocuments() == 1
+        chunksCollection.countDocuments() == expectedNoChunks
 
         when:
         def fileInfo = filesCollection.find().first()
@@ -334,15 +340,15 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         def fileId = gridFSBucket.uploadFromStream(filename, new ByteArrayInputStream('Hello GridFS' as byte[]))
 
         then:
-        filesCollection.count() == 1
-        chunksCollection.count() == 1
+        filesCollection.countDocuments() == 1
+        chunksCollection.countDocuments() == 1
 
         when:
         gridFSBucket.delete(fileId)
 
         then:
-        filesCollection.count() == 0
-        chunksCollection.count() == 0
+        filesCollection.countDocuments() == 0
+        chunksCollection.countDocuments() == 0
     }
 
     def 'should thrown when deleting nonexistent file'() {
@@ -361,8 +367,8 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         filesCollection.drop()
 
         then:
-        filesCollection.count() == 0
-        chunksCollection.count() == 1
+        filesCollection.countDocuments() == 0
+        chunksCollection.countDocuments() == 1
 
         when:
         gridFSBucket.delete(fileId)
@@ -371,8 +377,8 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         thrown(MongoGridFSException)
 
         then:
-        filesCollection.count() == 0
-        chunksCollection.count() == 0
+        filesCollection.countDocuments() == 0
+        chunksCollection.countDocuments() == 0
     }
 
     def 'should rename a file'() {
@@ -384,15 +390,15 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         def fileId = gridFSBucket.uploadFromStream(filename, new ByteArrayInputStream('Hello GridFS' as byte[]))
 
         then:
-        filesCollection.count() == 1
-        chunksCollection.count() == 1
+        filesCollection.countDocuments() == 1
+        chunksCollection.countDocuments() == 1
 
         when:
         gridFSBucket.rename(fileId, 'newFileName')
 
         then:
-        filesCollection.count() == 1
-        chunksCollection.count() == 1
+        filesCollection.countDocuments() == 1
+        chunksCollection.countDocuments() == 1
 
         when:
         gridFSBucket.openDownloadStream(newFileName)
@@ -470,8 +476,8 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
                 new GridFSUploadOptions().chunkSizeBytes(500));
 
         then:
-        filesCollection.count() == 1
-        chunksCollection.count() == 2
+        filesCollection.countDocuments() == 1
+        chunksCollection.countDocuments() == 2
 
         when:
         def gridFSDownloadStream = gridFSBucket.openDownloadStream(fileId)
@@ -514,8 +520,9 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
 
     def 'should use the user provided codec registries for encoding / decoding data'() {
         given:
-        def codecRegistry = fromRegistries(fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)), MongoClient.getDefaultCodecRegistry())
-        def database = getMongoClient().getDatabase(getDefaultDatabaseName()).withCodecRegistry(codecRegistry)
+        def codecRegistry = fromRegistries(fromCodecs(new UuidCodec(UuidRepresentation.STANDARD)),
+                MongoClientSettings.getDefaultCodecRegistry())
+        def database = getDefaultDatabase().withCodecRegistry(codecRegistry)
         def uuid = UUID.randomUUID()
         def fileMeta = new Document('uuid', uuid)
         def gridFSBucket = GridFSBuckets.create(database)
@@ -557,4 +564,47 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
         then:
         gridFSContentBytes == contentBytes
     }
+
+    @Unroll
+    def 'should handle missing file name data when downloading #description'() {
+        given:
+        def content = multiChunkString
+        def contentBytes = content as byte[]
+        ObjectId fileId
+        byte[] gridFSContentBytes
+
+        when:
+        if (direct) {
+            fileId = gridFSBucket.uploadFromStream('myFile', new ByteArrayInputStream(contentBytes));
+        } else {
+            def outputStream = gridFSBucket.openUploadStream('myFile')
+            outputStream.write(contentBytes)
+            outputStream.close()
+            fileId = outputStream.getObjectId()
+        }
+
+        then:
+        filesCollection.countDocuments() == 1
+
+        when:
+        // Remove filename
+        filesCollection.updateOne(eq('_id', fileId), unset('filename'))
+
+        if (direct) {
+            gridFSContentBytes = gridFSBucket.openDownloadStream(fileId).getBytes()
+        } else {
+            def outputStream = new ByteArrayOutputStream(contentBytes.length)
+            gridFSBucket.downloadToStream(fileId, outputStream)
+            outputStream.close()
+            gridFSContentBytes = outputStream.toByteArray()
+        }
+
+        then:
+        gridFSContentBytes == contentBytes
+
+        where:
+        description | direct
+        'directly'  | true
+        'a stream'  | false
+    }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/gridfs/GridFSTest.java b/driver-sync/src/test/functional/com/mongodb/client/gridfs/GridFSTest.java
new file mode 100644
index 00000000000..ef124c213de
--- /dev/null
+++ b/driver-sync/src/test/functional/com/mongodb/client/gridfs/GridFSTest.java
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.gridfs;
+
+import com.mongodb.MongoGridFSException;
+import com.mongodb.client.DatabaseTestCase;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonInt64;
+import org.bson.BsonObjectId;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import util.Hex;
+import util.JsonPoweredTestHelper;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+// See https://github.com/10gen/specifications/tree/master/source/gridfs/tests
+@RunWith(Parameterized.class)
+public class GridFSTest extends DatabaseTestCase {
+    private final String filename;
+    private final String description;
+    private final BsonDocument data;
+    private final BsonDocument definition;
+    private MongoCollection<BsonDocument> filesCollection;
+    private MongoCollection<BsonDocument> chunksCollection;
+    private GridFSBucket gridFSBucket;
+
+    public GridFSTest(final String filename, final String description, final BsonDocument data, final BsonDocument definition) {
+        this.filename = filename;
+        this.description = description;
+        this.data = data;
+        this.definition = definition;
+    }
+
+    @Before
+    public void setUp() {
+        super.setUp();
+
+        gridFSBucket = GridFSBuckets.create(database);
+        filesCollection = database.getCollection("fs.files", BsonDocument.class);
+        chunksCollection = database.getCollection("fs.chunks", BsonDocument.class);
+
+        filesCollection.drop();
+        chunksCollection.drop();
+
+        List<BsonDocument> filesDocuments = processFiles(data.getArray("files", new BsonArray()), new ArrayList<BsonDocument>());
+        if (!filesDocuments.isEmpty()) {
+        filesCollection.insertMany(filesDocuments);
+        }
+
+        List<BsonDocument> chunksDocuments = processChunks(data.getArray("chunks", new BsonArray()), new ArrayList<BsonDocument>());
+        if (!chunksDocuments.isEmpty()) {
+            chunksCollection.insertMany(chunksDocuments);
+        }
+    }
+
+    @Test
+    public void shouldPassAllOutcomes() {
+        arrangeGridFS(definition.getDocument("arrange", new BsonDocument()));
+        actionGridFS(definition.getDocument("act"), definition.getDocument("assert"));
+    }
+
+    @Parameterized.Parameters(name = "{1}")
+    public static Collection<Object[]> data() throws URISyntaxException, IOException {
+        List<Object[]> data = new ArrayList<Object[]>();
+        for (File file : JsonPoweredTestHelper.getTestFiles("/gridfs-tests")) {
+            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
+            for (BsonValue test: testDocument.getArray("tests")) {
+                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
+                        testDocument.getDocument("data"), test.asDocument()});
+            }
+        }
+        return data;
+    }
+
+    private void arrangeGridFS(final BsonDocument arrange) {
+        if (arrange.isEmpty()) {
+            return;
+        }
+        for (BsonValue fileToArrange: arrange.getArray("data", new BsonArray())) {
+            BsonDocument document = fileToArrange.asDocument();
+            if (document.containsKey("delete") && document.containsKey("deletes")) {
+                for (BsonValue toDelete : document.getArray("deletes")) {
+                    BsonDocument query = toDelete.asDocument().getDocument("q");
+                    int limit = toDelete.asDocument().getInt32("limit").getValue();
+
+                    MongoCollection<BsonDocument> collection;
+                    if (document.getString("delete").getValue().equals("fs.files")) {
+                        collection = filesCollection;
+                    } else {
+                        collection = chunksCollection;
+                    }
+
+                    if (limit == 1) {
+                        collection.deleteOne(query);
+                    } else {
+                        collection.deleteMany(query);
+                    }
+                }
+            } else if (document.containsKey("insert") && document.containsKey("documents")) {
+                if (document.getString("insert").getValue().equals("fs.files")) {
+                    filesCollection.insertMany(processFiles(document.getArray("documents"), new ArrayList<BsonDocument>()));
+                } else {
+                    chunksCollection.insertMany(processChunks(document.getArray("documents"), new ArrayList<BsonDocument>()));
+                }
+            } else if (document.containsKey("update") && document.containsKey("updates")) {
+                MongoCollection<BsonDocument> collection;
+                if (document.getString("update").getValue().equals("fs.files")) {
+                    collection = filesCollection;
+                } else {
+                    collection = chunksCollection;
+                }
+
+                for (BsonValue rawUpdate : document.getArray("updates")){
+                    BsonDocument query = rawUpdate.asDocument().getDocument("q");
+                    BsonDocument update = rawUpdate.asDocument().getDocument("u");
+                    update.put("$set", parseHexDocument(update.getDocument("$set")));
+
+                    collection.updateMany(query, update);
+                }
+            } else {
+                throw new IllegalArgumentException("Unsupported arrange: " + document);
+            }
+        }
+    }
+
+    private void actionGridFS(final BsonDocument action, final BsonDocument assertion) {
+        if (action.isEmpty()) {
+            return;
+        }
+
+        String operation = action.getString("operation").getValue();
+        if (operation.equals("delete")) {
+            doDelete(action.getDocument("arguments"), assertion);
+        } else if (operation.equals("download")) {
+            doDownload(action.getDocument("arguments"), assertion);
+        } else if (operation.equals("download_by_name")) {
+            doDownloadByName(action.getDocument("arguments"), assertion);
+        } else if (operation.equals("upload")) {
+            doUpload(action.getDocument("arguments"), assertion);
+        } else {
+            throw new IllegalArgumentException("Unknown operation: " + operation);
+        }
+    }
+
+    private void doDelete(final BsonDocument arguments, final BsonDocument assertion) {
+        Throwable error = null;
+
+        try {
+            gridFSBucket.delete(arguments.getObjectId("id").getValue());
+        } catch (MongoGridFSException e) {
+            error = e;
+        }
+
+        if (assertion.containsKey("error")) {
+            assertNotNull("Should have thrown an exception", error);
+        } else {
+            assertNull("Should not have thrown an exception", error);
+            for (BsonValue rawDataItem : assertion.getArray("data")) {
+                BsonDocument dataItem = rawDataItem.asDocument();
+                for (BsonValue deletedItem : dataItem.getArray("deletes", new BsonArray())) {
+                    String delete = dataItem.getString("delete", new BsonString("none")).getValue();
+                    BsonObjectId id = new BsonObjectId(new ObjectId());
+                    if (delete.equals("expected.files")) {
+                        id = deletedItem.asDocument().getDocument("q").getObjectId("_id");
+                    } else if (delete.equals("expected.chunks")) {
+                        id = deletedItem.asDocument().getDocument("q").getObjectId("files_id");
+                    }
+                    assertEquals(filesCollection.countDocuments(new BsonDocument("_id", id)), 0);
+                    assertEquals(chunksCollection.countDocuments(new BsonDocument("files_id", id)), 0);
+                }
+            }
+        }
+    }
+
+    private void doDownload(final BsonDocument arguments, final BsonDocument assertion) {
+        Throwable error = null;
+        ByteArrayOutputStream outputStream = null;
+
+        try {
+            outputStream = new ByteArrayOutputStream();
+            gridFSBucket.downloadToStream(arguments.getObjectId("id").getValue(), outputStream);
+            outputStream.close();
+        } catch (Throwable e) {
+            error = e;
+        }
+
+        if (assertion.containsKey("result")) {
+            assertNull("Should not have thrown an exception", error);
+            assertEquals(Hex.encode(outputStream.toByteArray()).toLowerCase(),
+                    assertion.getDocument("result").getString("$hex").getValue());
+        } else if (assertion.containsKey("error")) {
+            assertNotNull("Should have thrown an exception", error);
+        }
+    }
+
+    private void doDownloadByName(final BsonDocument arguments, final BsonDocument assertion) {
+        Throwable error = null;
+        ByteArrayOutputStream outputStream = null;
+
+        try {
+            outputStream = new ByteArrayOutputStream();
+            GridFSDownloadOptions options = new GridFSDownloadOptions();
+            if (arguments.containsKey("options")) {
+                int revision = arguments.getDocument("options").getInt32("revision").getValue();
+                options = options.revision(revision);
+            }
+            gridFSBucket.downloadToStream(arguments.getString("filename").getValue(), outputStream, options);
+            outputStream.close();
+        } catch (Throwable e) {
+            error = e;
+        }
+        if (assertion.containsKey("result")) {
+            assertNull("Should not have thrown an exception", error);
+            assertEquals(Hex.encode(outputStream.toByteArray()).toLowerCase(),
+                    assertion.getDocument("result").getString("$hex").getValue());
+        } else if (assertion.containsKey("error")) {
+            assertNotNull("Should have thrown an exception", error);
+        }
+    }
+
+    private void doUpload(final BsonDocument rawArguments, final BsonDocument assertion) {
+        Throwable error = null;
+        ObjectId objectId = null;
+        BsonDocument arguments = parseHexDocument(rawArguments, "source");
+        try {
+            GridFSBucket gridFSUploadBucket = gridFSBucket;
+            String filename = arguments.getString("filename").getValue();
+            InputStream input = new ByteArrayInputStream(arguments.getBinary("source").getData());
+            GridFSUploadOptions options = new GridFSUploadOptions();
+            BsonDocument rawOptions = arguments.getDocument("options", new BsonDocument());
+            if (rawOptions.containsKey("chunkSizeBytes")) {
+                options = options.chunkSizeBytes(rawOptions.getInt32("chunkSizeBytes").getValue());
+            }
+            if (rawOptions.containsKey("metadata")) {
+                options = options.metadata(Document.parse(rawOptions.getDocument("metadata").toJson()));
+            }
+            if (rawOptions.containsKey("disableMD5")) {
+                gridFSUploadBucket = gridFSUploadBucket.withDisableMD5(rawOptions.getBoolean("disableMD5").getValue());
+            }
+
+            objectId = gridFSUploadBucket.uploadFromStream(filename, input, options);
+        } catch (Throwable e) {
+            error = e;
+        }
+
+        if (assertion.containsKey("error")) {
+            // We don't need to read anything more so don't see the extra chunk
+            if (!assertion.getString("error").getValue().equals("ExtraChunk")) {
+                assertNotNull("Should have thrown an exception", error);
+            }
+        } else {
+            assertNull("Should not have thrown an exception", error);
+            for (BsonValue rawDataItem : assertion.getArray("data", new BsonArray())) {
+                BsonDocument dataItem = rawDataItem.asDocument();
+                String insert = dataItem.getString("insert", new BsonString("none")).getValue();
+                if (insert.equals("expected.files")) {
+                    List<BsonDocument> documents = processFiles(dataItem.getArray("documents", new BsonArray()),
+                            new ArrayList<BsonDocument>());
+                    assertEquals(filesCollection.countDocuments(), documents.size());
+
+                    BsonDocument actual = filesCollection.find().first();
+                    for (BsonDocument expected : documents) {
+                        assertEquals(expected.get("length"), actual.get("length"));
+                        assertEquals(expected.get("chunkSize"), actual.get("chunkSize"));
+                        assertEquals(expected.get("md5"), actual.get("md5"));
+                        assertEquals(expected.get("filename"), actual.get("filename"));
+
+                        if (expected.containsKey("metadata")) {
+                            assertEquals(expected.get("metadata"), actual.get("metadata"));
+                        }
+                    }
+                } else if (insert.equals("expected.chunks")) {
+                    List<BsonDocument> documents = processChunks(dataItem.getArray("documents", new BsonArray()),
+                            new ArrayList<BsonDocument>());
+                    assertEquals(chunksCollection.countDocuments(), documents.size());
+
+                    List<BsonDocument> actualDocuments = chunksCollection.find().into(new ArrayList<BsonDocument>());
+                    for (int i = 0; i < documents.size(); i++) {
+                        BsonDocument expected = documents.get(i);
+                        BsonDocument actual = actualDocuments.get(i);
+
+                        assertEquals(new BsonObjectId(objectId), actual.getObjectId("files_id"));
+                        assertEquals(expected.get("n"), actual.get("n"));
+                        assertEquals(expected.get("data"), actual.get("data"));
+                    }
+                }
+            }
+        }
+    }
+
+    private List<BsonDocument> processFiles(final BsonArray bsonArray, final List<BsonDocument> documents) {
+        for (BsonValue rawDocument : bsonArray.getValues()) {
+            if (rawDocument.isDocument()) {
+                BsonDocument document = rawDocument.asDocument();
+                if (document.get("length").isInt32()) {
+                    document.put("length", new BsonInt64(document.getInt32("length").getValue()));
+                }
+                if (document.containsKey("metadata") && document.getDocument("metadata").isEmpty()) {
+                    document.remove("metadata");
+                }
+                if (document.containsKey("aliases") && document.getArray("aliases").getValues().size() == 0) {
+                    document.remove("aliases");
+                }
+                if (document.containsKey("contentType") && document.getString("contentType").getValue().length() == 0) {
+                    document.remove("contentType");
+                }
+                documents.add(document);
+            }
+        }
+        return documents;
+    }
+
+    private List<BsonDocument> processChunks(final BsonArray bsonArray, final List<BsonDocument> documents) {
+        for (BsonValue rawDocument: bsonArray.getValues()) {
+            if (rawDocument.isDocument()) {
+                documents.add(parseHexDocument(rawDocument.asDocument()));
+            }
+        }
+        return documents;
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document) {
+        return parseHexDocument(document, "data");
+    }
+
+    private BsonDocument parseHexDocument(final BsonDocument document, final String hexDocument) {
+        if (document.containsKey(hexDocument) && document.get(hexDocument).isDocument()) {
+            byte[] bytes = Hex.decode(document.getDocument(hexDocument).getString("$hex").getValue());
+            document.put(hexDocument, new BsonBinary(bytes));
+        }
+        return document;
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/MongoClientSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/MongoClientSpecification.groovy
new file mode 100644
index 00000000000..754d7c1804f
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/MongoClientSpecification.groovy
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client
+
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.ServerAddress
+import com.mongodb.WriteConcern
+import com.mongodb.client.internal.MongoClientImpl
+import com.mongodb.client.internal.MongoDatabaseImpl
+import com.mongodb.client.internal.MongoIterables
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import com.mongodb.connection.Cluster
+import com.mongodb.connection.ClusterConnectionMode
+import com.mongodb.connection.ClusterDescription
+import com.mongodb.connection.ClusterType
+import com.mongodb.connection.ServerConnectionState
+import com.mongodb.connection.ServerDescription
+import com.mongodb.connection.ServerType
+import com.mongodb.connection.ServerVersion
+import org.bson.BsonDocument
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecRegistry
+import org.bson.internal.OverridableUuidRepresentationCodecRegistry
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.MongoClientSettings.getDefaultCodecRegistry
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.ReadPreference.secondary
+import static com.mongodb.client.internal.TestHelper.execute
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MongoClientSpecification extends Specification {
+
+    private static CodecRegistry codecRegistry = fromProviders(new ValueCodecProvider())
+
+    def 'should pass the correct settings to getDatabase'() {
+        given:
+        def settings = MongoClientSettings.builder()
+                .readPreference(secondary())
+                .writeConcern(WriteConcern.MAJORITY)
+                .readConcern(ReadConcern.MAJORITY)
+                .retryWrites(true)
+                .codecRegistry(codecRegistry)
+                .build()
+        def client = new MongoClientImpl(Stub(Cluster), settings, new TestOperationExecutor([]))
+
+        when:
+        def database = client.getDatabase('name')
+
+        then:
+        expect database, isTheSameAs(expectedDatabase)
+
+        where:
+        expectedDatabase << new MongoDatabaseImpl('name', codecRegistry, secondary(),
+                WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, JAVA_LEGACY, new TestOperationExecutor([]))
+    }
+
+    def 'should use ListDatabasesIterableImpl correctly'() {
+        given:
+        def executor = new TestOperationExecutor([null, null])
+        def client = new MongoClientImpl(Stub(Cluster), MongoClientSettings.builder().build(), executor)
+        def listDatabasesMethod = client.&listDatabases
+        def listDatabasesNamesMethod = client.&listDatabaseNames
+
+        when:
+        def listDatabasesIterable = execute(listDatabasesMethod, session)
+
+        then:
+        expect listDatabasesIterable, isTheSameAs(MongoIterables.listDatabasesOf(session, Document, getDefaultCodecRegistry(),
+                primary(), executor, true))
+
+        when:
+        listDatabasesIterable = execute(listDatabasesMethod, session, BsonDocument)
+
+        then:
+        expect listDatabasesIterable, isTheSameAs(MongoIterables.listDatabasesOf(session, BsonDocument,
+                getDefaultCodecRegistry(), primary(), executor, true))
+
+        when:
+        def listDatabaseNamesIterable = execute(listDatabasesNamesMethod, session) as MongoIterable<String>
+
+        then:
+        // listDatabaseNamesIterable is an instance of a MappingIterable, so have to get the mapped iterable inside it
+        expect listDatabaseNamesIterable.getMapped(), isTheSameAs(MongoIterables.listDatabasesOf(session, BsonDocument,
+                getDefaultCodecRegistry(), primary(), executor, true).nameOnly(true))
+
+        cleanup:
+        client?.close()
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should create ChangeStreamIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def namespace = new MongoNamespace('admin', 'ignored')
+        def settings = MongoClientSettings.builder()
+                .readPreference(secondary())
+                .readConcern(ReadConcern.MAJORITY)
+                .codecRegistry(getDefaultCodecRegistry())
+                .build()
+        def codecRegistry = settings.getCodecRegistry()
+        def readPreference = settings.getReadPreference()
+        def readConcern = settings.getReadConcern()
+        def client = new MongoClientImpl(Stub(Cluster), settings, executor)
+        def watchMethod = client.&watch
+
+        when:
+        def changeStreamIterable = execute(watchMethod, session)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [], Document, ChangeStreamLevel.CLIENT, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.CLIENT, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], BsonDocument, ChangeStreamLevel.CLIENT, true), ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the ChangeStreamIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def client = new MongoClientImpl(Stub(Cluster), MongoClientSettings.builder().build(), executor)
+
+        when:
+        client.watch((Class) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        client.watch([null]).into([])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should get the cluster description'() {
+        given:
+        def clusterDescription = new ClusterDescription(ClusterConnectionMode.SINGLE, ClusterType.STANDALONE,
+                [ServerDescription.builder()
+                         .address(new ServerAddress())
+                         .type(ServerType.UNKNOWN)
+                         .state(ServerConnectionState.CONNECTING)
+                         .version(new ServerVersion())
+                         .build()])
+        def cluster = Mock(Cluster) {
+            1 * getCurrentDescription() >> {
+                clusterDescription
+            }
+        }
+        def settings = MongoClientSettings.builder().build()
+        def client = new MongoClientImpl(cluster, settings, new TestOperationExecutor([]))
+
+        expect:
+        client.getClusterDescription() == clusterDescription
+    }
+
+    def 'should create registry reflecting UuidRepresentation'() {
+        given:
+        def codecRegistry = fromProviders([new BsonValueCodecProvider()])
+        def settings = MongoClientSettings.builder()
+                .codecRegistry(codecRegistry)
+                .uuidRepresentation(STANDARD)
+                .build()
+
+        when:
+        def client = new MongoClientImpl(Stub(Cluster), settings, new TestOperationExecutor([]))
+        def registry = client.getCodecRegistry()
+
+        then:
+        registry instanceof OverridableUuidRepresentationCodecRegistry
+        (registry as OverridableUuidRepresentationCodecRegistry).uuidRepresentation == STANDARD
+        (registry as OverridableUuidRepresentationCodecRegistry).wrapped == codecRegistry
+
+        cleanup:
+        client?.close()
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy
new file mode 100644
index 00000000000..663359ca35d
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy
@@ -0,0 +1,914 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.gridfs
+
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoGridFSException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.client.ClientSession
+import com.mongodb.client.FindIterable
+import com.mongodb.client.ListIndexesIterable
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.MongoCursor
+import com.mongodb.client.gridfs.model.GridFSDownloadOptions
+import com.mongodb.client.gridfs.model.GridFSFile
+import com.mongodb.client.internal.MongoDatabaseImpl
+import com.mongodb.client.internal.OperationExecutor
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.result.DeleteResult
+import com.mongodb.client.result.UpdateResult
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.FindOperation
+import org.bson.BsonDocument
+import org.bson.BsonObjectId
+import org.bson.BsonString
+import org.bson.Document
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.types.Binary
+import org.bson.types.ObjectId
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.ReadPreference.secondary
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+@SuppressWarnings('ClosureAsLastMethodParameter')
+class GridFSBucketSpecification extends Specification {
+
+    def readConcern = ReadConcern.DEFAULT
+    def registry = MongoClientSettings.getDefaultCodecRegistry()
+    def database = databaseWithExecutor(Stub(OperationExecutor))
+    def databaseWithExecutor(OperationExecutor executor) {
+        new MongoDatabaseImpl('test', registry, primary(), WriteConcern.ACKNOWLEDGED, false, false, readConcern, JAVA_LEGACY, executor)
+    }
+    def disableMD5 = false
+
+    def 'should return the correct bucket name'() {
+        when:
+        def bucketName = new GridFSBucketImpl(database).getBucketName()
+
+        then:
+        bucketName == 'fs'
+
+        when:
+        bucketName = new GridFSBucketImpl(database, 'custom').getBucketName()
+
+        then:
+        bucketName == 'custom'
+    }
+
+    def 'should behave correctly when using withChunkSizeBytes'() {
+        given:
+        def newChunkSize = 200
+
+        when:
+        def gridFSBucket = new GridFSBucketImpl(database).withChunkSizeBytes(newChunkSize)
+
+        then:
+        gridFSBucket.getChunkSizeBytes() == newChunkSize
+    }
+
+    def 'should behave correctly when using withReadPreference'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def newReadPreference = secondary()
+
+        when:
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+                .withReadPreference(newReadPreference)
+
+        then:
+        1 * filesCollection.withReadPreference(newReadPreference) >> filesCollection
+        1 * chunksCollection.withReadPreference(newReadPreference) >> chunksCollection
+
+        when:
+        gridFSBucket.getReadConcern()
+
+        then:
+        1 * filesCollection.getReadConcern()
+    }
+
+    def 'should behave correctly when using withWriteConcern'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def newWriteConcern = WriteConcern.MAJORITY
+
+        when:
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+                .withWriteConcern(newWriteConcern)
+
+        then:
+        1 * filesCollection.withWriteConcern(newWriteConcern) >> filesCollection
+        1 * chunksCollection.withWriteConcern(newWriteConcern) >> chunksCollection
+
+        when:
+        gridFSBucket.getWriteConcern()
+
+        then:
+        1 * filesCollection.getWriteConcern()
+    }
+
+    def 'should behave correctly when using withReadConcern'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def newReadConcern = ReadConcern.MAJORITY
+
+        when:
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+                .withReadConcern(newReadConcern)
+
+        then:
+        1 * filesCollection.withReadConcern(newReadConcern) >> filesCollection
+        1 * chunksCollection.withReadConcern(newReadConcern) >> chunksCollection
+
+        when:
+        gridFSBucket.getReadConcern()
+
+        then:
+        1 * filesCollection.getReadConcern() >> newReadConcern
+    }
+
+    def 'should behave correctly when using withDisableMD5'() {
+        when:
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, Stub(MongoCollection), Stub(MongoCollection), disableMD5)
+
+        then:
+        !gridFSBucket.getDisableMD5()
+
+        when:
+        gridFSBucket = gridFSBucket.withDisableMD5(true)
+
+        then:
+        gridFSBucket.getDisableMD5()
+    }
+
+    def 'should get defaults from MongoDatabase'() {
+        given:
+        def defaultChunkSizeBytes = 255 * 1024
+        def database = new MongoDatabaseImpl('test', fromProviders(new DocumentCodecProvider()), secondary(), WriteConcern.ACKNOWLEDGED,
+                false, false, readConcern, JAVA_LEGACY, new TestOperationExecutor([]))
+
+        when:
+        def gridFSBucket = new GridFSBucketImpl(database)
+
+        then:
+        gridFSBucket.getChunkSizeBytes() == defaultChunkSizeBytes
+        gridFSBucket.getReadPreference() == database.getReadPreference()
+        gridFSBucket.getWriteConcern() == database.getWriteConcern()
+        gridFSBucket.getReadConcern() == database.getReadConcern()
+        gridFSBucket.getDisableMD5() == disableMD5
+    }
+
+    def 'should create the expected GridFSUploadStream'() {
+        given:
+        def filesCollection = Stub(MongoCollection)
+        def chunksCollection = Stub(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        def stream
+        if (clientSession != null) {
+            stream = gridFSBucket.openUploadStream(clientSession, 'filename')
+        } else {
+            stream = gridFSBucket.openUploadStream('filename')
+        }
+
+        then:
+        expect stream, isTheSameAs(new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, stream.getId(), 'filename',
+                255, disableMD5, null), ['md5', 'closeLock'])
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should upload from stream'() {
+        given:
+        def findIterable = Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+        def contentBytes = 'content' as byte[]
+        def inputStream = new ByteArrayInputStream(contentBytes)
+
+        when:
+        gridFSBucket.uploadFromStream('filename', inputStream)
+
+        then: 'index check'
+        1 * filesCollection.withDocumentClass(Document) >> filesCollection
+        1 * filesCollection.withReadPreference(primary()) >> filesCollection
+        1 * filesCollection.find() >> findIterable
+        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
+        1 * findIterable.first() >> new Document()
+
+        then:
+        1 * chunksCollection.insertOne(_)
+
+        then:
+        1 * filesCollection.insertOne(_)
+    }
+
+    def 'should clean up any chunks when upload from stream throws an IOException'() {
+        given:
+        def findIterable = Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+        def inputStream = Mock(InputStream) {
+            2 * read(_) >> 255 >> { throw new IOException('stream failure') }
+        }
+
+        when:
+        gridFSBucket.uploadFromStream('filename', inputStream)
+
+        then: 'index check'
+        1 * filesCollection.withDocumentClass(Document) >> filesCollection
+        1 * filesCollection.withReadPreference(primary()) >> filesCollection
+        1 * filesCollection.find() >> findIterable
+        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
+        1 * findIterable.first() >> new Document()
+
+        then:
+        1 * chunksCollection.insertOne(_)
+
+        then:
+        1 * chunksCollection.deleteMany(_)
+
+        then:
+        0 * filesCollection.insertOne(_)
+
+        then:
+        def exception = thrown(MongoGridFSException)
+        exception.getMessage() == 'IOException when reading from the InputStream'
+    }
+
+    def 'should not clean up any chunks when upload throws an exception'() {
+        given:
+        def findIterable = Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def alternativeException = new MongoGridFSException('Alternative failure')
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+        def inputStream = Mock(InputStream) {
+            2 * read(_) >> 255 >> { throw alternativeException }
+        }
+
+        when:
+        gridFSBucket.uploadFromStream('filename', inputStream)
+
+        then: 'index check'
+        1 * filesCollection.withDocumentClass(Document) >> filesCollection
+        1 * filesCollection.withReadPreference(primary()) >> filesCollection
+        1 * filesCollection.find() >> findIterable
+        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
+        1 * findIterable.first() >> new Document()
+
+        then:
+        1 * chunksCollection.insertOne(_)
+
+        then:
+        0 * chunksCollection.deleteMany(_)
+
+        then:
+        0 * filesCollection.insertOne(_)
+
+        then:
+        def exception = thrown(MongoGridFSException)
+        exception == alternativeException
+    }
+
+    def 'should create the expected GridFSDownloadStream'() {
+        given:
+        def fileId = new BsonObjectId(new ObjectId())
+        def fileInfo = new GridFSFile(fileId, 'File 1', 10, 255, new Date(), '1234', new Document())
+        def findIterable =  Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Stub(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        def stream
+        if (clientSession != null) {
+            stream = gridFSBucket.openDownloadStream(clientSession, fileId.getValue())
+        } else {
+            stream = gridFSBucket.openDownloadStream(fileId.getValue())
+        }
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(_) >> findIterable
+        1 * findIterable.first() >> fileInfo
+
+        then:
+        expect stream, isTheSameAs(new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection), ['closeLock', 'cursorLock'])
+
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should download to stream'() {
+        given:
+        def fileId = new ObjectId()
+        def bsonFileId = new BsonObjectId(fileId)
+        def fileInfo = new GridFSFile(bsonFileId, 'filename', 10, 255, new Date(), '1234', new Document())
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable =  Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def tenBytes = new byte[10]
+        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(tenBytes))
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+        def outputStream = new ByteArrayOutputStream(10)
+
+        when:
+        if (clientSession != null) {
+            gridFSBucket.downloadToStream(clientSession, fileId, outputStream)
+        } else {
+            gridFSBucket.downloadToStream(fileId, outputStream)
+        }
+        outputStream.close()
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(new Document('_id', bsonFileId)) >> findIterable
+        1 * findIterable.first() >> fileInfo
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(_) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        then:
+        outputStream.toByteArray() == tenBytes
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should download to stream using BsonValue'() {
+        given:
+        def bsonFileId = new BsonString('1')
+        def fileInfo = new GridFSFile(bsonFileId, 'filename', 10L, 255, new Date(), '1234', new Document())
+        def mongoCursor =  Mock(MongoCursor)
+        def findIterable =  Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def tenBytes = new byte[10]
+        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(tenBytes))
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+        def outputStream = new ByteArrayOutputStream(10)
+
+        when:
+        if (clientSession != null) {
+            gridFSBucket.downloadToStream(clientSession, bsonFileId, outputStream)
+        } else {
+            gridFSBucket.downloadToStream(bsonFileId, outputStream)
+        }
+        outputStream.close()
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(new Document('_id', bsonFileId)) >> findIterable
+        1 * findIterable.first() >> fileInfo
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(_) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        then:
+        outputStream.toByteArray() == tenBytes
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should download to stream by name'() {
+        given:
+        def filename = 'filename'
+        def fileId = new ObjectId()
+        def bsonFileId = new BsonObjectId(fileId)
+        def fileInfo = new GridFSFile(bsonFileId, filename, 10, 255, new Date(), '1234', new Document())
+        def mongoCursor =  Mock(MongoCursor)
+        def findIterable =  Mock(FindIterable)
+        def findChunkIterable =  Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def tenBytes = new byte[10]
+        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(tenBytes))
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+        def outputStream = new ByteArrayOutputStream(10)
+
+        when:
+        if (clientSession != null) {
+            gridFSBucket.downloadToStream(clientSession, filename, outputStream)
+        } else {
+            gridFSBucket.downloadToStream(filename, outputStream)
+        }
+        outputStream.close()
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.filter(new Document('filename', filename)) >> findIterable
+        1 * findIterable.skip(_) >> findIterable
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.first() >> fileInfo
+
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findChunkIterable
+        } else {
+            1 * chunksCollection.find(_) >> findChunkIterable
+        }
+        1 * findChunkIterable.sort(_) >> findChunkIterable
+        1 * findChunkIterable.batchSize(_) >> findChunkIterable
+        1 * findChunkIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        then:
+        outputStream.toByteArray() == tenBytes
+
+        then:
+        1 * mongoCursor.close()
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should throw an exception if file not found'() {
+        given:
+        def fileId = new ObjectId()
+        def bsonFileId = new BsonObjectId(fileId)
+        def findIterable =  Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Stub(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        if (clientSession != null) {
+            gridFSBucket.openDownloadStream(clientSession, fileId)
+        } else {
+            gridFSBucket.openDownloadStream(fileId)
+        }
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+
+        1 * findIterable.filter(new Document('_id', bsonFileId)) >> findIterable
+        1 * findIterable.first() >> null
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    @Unroll
+    def 'should create the expected GridFSDownloadStream when opening by name with version: #version'() {
+        given:
+        def filename = 'filename'
+        def fileId = new ObjectId()
+        def bsonFileId = new BsonObjectId(fileId)
+        def fileInfo = new GridFSFile(bsonFileId, filename, 10, 255, new Date(), '1234', new Document())
+        def findIterable =  Mock(FindIterable)
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Stub(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        def stream = gridFSBucket.openDownloadStream(filename, new GridFSDownloadOptions().revision(version))
+
+        then:
+        1 * filesCollection.find() >> findIterable
+        1 * findIterable.filter(new Document('filename', filename)) >> findIterable
+
+        then:
+        1 * findIterable.skip(skip) >> findIterable
+
+        then:
+        1 * findIterable.sort(new Document('uploadDate', sortOrder)) >> findIterable
+        1 * findIterable.first() >> fileInfo
+
+        then:
+        expect stream, isTheSameAs(new GridFSDownloadStreamImpl(null, fileInfo, chunksCollection), ['closeLock', 'cursorLock'])
+
+        where:
+        version | skip | sortOrder
+          0     |  0   | 1
+          1     |  1   | 1
+          2     |  2   | 1
+          3     |  3   | 1
+          -1    |  0   | -1
+          -2    |  1   | -1
+          -3    |  2   | -1
+    }
+
+    def 'should create the expected GridFSFindIterable'() {
+        given:
+        def collection = Mock(MongoCollection)
+        def findIterable = Mock(FindIterable)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, collection, Stub(MongoCollection), disableMD5)
+
+        when:
+        def result
+        if (clientSession != null) {
+            result = gridFSBucket.find(clientSession)
+        } else {
+            result = gridFSBucket.find()
+        }
+        then:
+        if (clientSession != null) {
+            1 * collection.find(clientSession) >> findIterable
+        } else {
+            1 * collection.find() >> findIterable
+        }
+        expect result, isTheSameAs(new GridFSFindIterableImpl(findIterable))
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should execute the expected FindOperation when finding a file'() {
+        given:
+        def executor = new TestOperationExecutor([Stub(BatchCursor), Stub(BatchCursor)])
+        def database = databaseWithExecutor(executor)
+        def gridFSBucket = new GridFSBucketImpl(database)
+        def decoder = registry.get(GridFSFile)
+
+        when:
+        gridFSBucket.find().iterator()
+
+        then:
+        executor.getReadPreference() == primary()
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation<GridFSFile>(new MongoNamespace('test.fs.files'), decoder)
+                .filter(new BsonDocument()))
+
+        when:
+        def filter = new BsonDocument('filename', new BsonString('filename'))
+        def readConcern = ReadConcern.MAJORITY
+        gridFSBucket.withReadPreference(secondary()).withReadConcern(readConcern).find(filter).iterator()
+
+        then:
+        executor.getReadPreference() == secondary()
+        expect executor.getReadOperation(), isTheSameAs(new FindOperation<GridFSFile>(new MongoNamespace('test.fs.files'), decoder)
+                .filter(filter).slaveOk(true))
+    }
+
+    def 'should throw an exception if file not found when opening by name'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Stub(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        if (clientSession != null) {
+            gridFSBucket.openDownloadStream(clientSession, 'filename')
+        } else {
+            gridFSBucket.openDownloadStream('filename')
+        }
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+
+        1 * findIterable.filter(new Document('filename', 'filename')) >> findIterable
+        1 * findIterable.skip(0) >> findIterable
+        1 * findIterable.sort(new Document('uploadDate', -1)) >> findIterable
+        1 * findIterable.first() >> null
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should create indexes on write'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def listIndexesIterable = Mock(ListIndexesIterable)
+        def findIterable = Mock(FindIterable)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        if (clientSession != null) {
+            gridFSBucket.openUploadStream(clientSession, 'filename')
+        } else {
+            gridFSBucket.openUploadStream('filename')
+        }
+
+        then:
+        1 * filesCollection.withDocumentClass(Document) >> filesCollection
+        1 * filesCollection.withReadPreference(primary()) >> filesCollection
+        if (clientSession != null) {
+            1 * filesCollection.find(clientSession) >> findIterable
+        } else {
+            1 * filesCollection.find() >> findIterable
+        }
+        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
+        1 * findIterable.first() >> null
+
+        then:
+        1 * filesCollection.withReadPreference(primary()) >> filesCollection
+        if (clientSession != null) {
+            1 * filesCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * filesCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_) >> []
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.createIndex(clientSession, { index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') },
+                    { indexOptions -> !indexOptions.isUnique() })
+        } else {
+            1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') },
+                    { indexOptions -> !indexOptions.isUnique() })
+        }
+
+        then:
+        1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
+        if (clientSession != null) {
+            1 * chunksCollection.listIndexes(clientSession) >> listIndexesIterable
+        } else {
+            1 * chunksCollection.listIndexes() >> listIndexesIterable
+        }
+        1 * listIndexesIterable.into(_) >> []
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.createIndex(clientSession, { index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() })
+        } else {
+            1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
+                    { indexOptions -> indexOptions.isUnique() })
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should not create indexes if they already exist'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def listIndexesIterable = Mock(ListIndexesIterable)
+        def findIterable = Mock(FindIterable)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        gridFSBucket.openUploadStream('filename')
+
+        then:
+        1 * filesCollection.withDocumentClass(Document) >> filesCollection
+        1 * filesCollection.withReadPreference(primary()) >> filesCollection
+        1 * filesCollection.find() >> findIterable
+        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
+        1 * findIterable.first() >> null
+
+        then:
+        1 * filesCollection.withReadPreference(primary()) >> filesCollection
+        1 * filesCollection.listIndexes() >> listIndexesIterable
+        1 * listIndexesIterable.into(_) >> [Document.parse('{"key": {"_id": 1}}'),
+                                            Document.parse('{"key": {"filename": 1, "uploadDate": 1 }}')]
+
+        then:
+        0 * filesCollection.createIndex(_)
+
+        then:
+        1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
+        1 * chunksCollection.listIndexes() >> listIndexesIterable
+        1 * listIndexesIterable.into(_) >> [Document.parse('{"key": {"_id": 1}}'),
+                                            Document.parse('{"key": {"files_id": 1, "n": 1 }}')]
+
+        then:
+        0 * chunksCollection.createIndex(_)
+    }
+
+    def 'should delete from files collection then chunks collection'() {
+        given:
+        def fileId = new ObjectId()
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        gridFSBucket.delete(fileId)
+
+        then: 'Delete from the files collection first'
+        1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId))) >> DeleteResult.acknowledged(1)
+
+        then:
+        1 * chunksCollection.deleteMany(new Document('files_id', new BsonObjectId(fileId)))
+    }
+
+    def 'should throw an exception when deleting if no record in the files collection'() {
+        given:
+        def fileId = new ObjectId()
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        gridFSBucket.delete(fileId)
+
+        then: 'Delete from the files collection first'
+        1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId))) >> DeleteResult.acknowledged(0)
+
+        then: 'Should still delete any orphan chunks'
+        1 * chunksCollection.deleteMany(new Document('files_id', new BsonObjectId(fileId)))
+
+        then:
+        thrown(MongoGridFSException)
+    }
+
+    def 'should rename a file'() {
+        given:
+        def id = new ObjectId()
+        def fileId = new BsonObjectId(id)
+        def filesCollection = Mock(MongoCollection)
+        def newFilename = 'newFilename'
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection), disableMD5)
+
+        when:
+        gridFSBucket.rename(id, newFilename)
+
+        then:
+        1 * filesCollection.updateOne(new BsonDocument('_id', fileId),
+                new BsonDocument('$set',
+                        new BsonDocument('filename', new BsonString(newFilename)))) >> new UpdateResult.UnacknowledgedUpdateResult()
+
+        when:
+        gridFSBucket.rename(fileId, newFilename)
+
+        then:
+        1 * filesCollection.updateOne(new BsonDocument('_id', fileId),
+                new BsonDocument('$set',
+                        new BsonDocument('filename', new BsonString(newFilename)))) >> new UpdateResult.UnacknowledgedUpdateResult()
+    }
+
+    def 'should throw an exception renaming non existent file'() {
+        given:
+        def fileId = new ObjectId()
+        def filesCollection = Mock(MongoCollection) {
+            1 * updateOne(_, _) >> new UpdateResult.AcknowledgedUpdateResult(0, 0, null)
+        }
+        def newFilename = 'newFilename'
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection), disableMD5)
+
+        when:
+        gridFSBucket.rename(fileId, newFilename)
+
+        then:
+        thrown(MongoGridFSException)
+    }
+
+    def 'should be able to drop the bucket'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        gridFSBucket.drop()
+
+        then: 'drop the files collection first'
+        1 * filesCollection.drop()
+
+        then:
+        1 * chunksCollection.drop()
+    }
+
+    def 'should validate the clientSession is not null'() {
+        given:
+        def objectId = new ObjectId()
+        def bsonValue = new BsonObjectId(objectId)
+        def filename = 'filename'
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection, disableMD5)
+
+        when:
+        gridFSBucket.delete(null, objectId)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.downloadToStream(null, filename, Stub(OutputStream))
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.downloadToStream(null, objectId, Stub(OutputStream))
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.drop(null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.find((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openDownloadStream(null, filename)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openDownloadStream(null, objectId)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openUploadStream(null, filename)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.openUploadStream(null, bsonValue, filename)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.rename(null, objectId, filename)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.uploadFromStream(null, filename, Stub(InputStream))
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        gridFSBucket.uploadFromStream(null, bsonValue, filename, Stub(InputStream))
+        then:
+        thrown(IllegalArgumentException)
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy
similarity index 76%
rename from driver/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy
rename to driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy
index 5119dcf4a07..c991d779e9f 100644
--- a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSBucketsSpecification.groovy
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,15 +16,16 @@
 
 package com.mongodb.client.gridfs
 
-import com.mongodb.MongoDatabaseImpl
 import com.mongodb.ReadConcern
 import com.mongodb.ReadPreference
 import com.mongodb.WriteConcern
-import com.mongodb.operation.OperationExecutor
+import com.mongodb.client.internal.MongoDatabaseImpl
+import com.mongodb.client.internal.OperationExecutor
 import org.bson.codecs.configuration.CodecRegistry
 import spock.lang.Specification
 
 import static com.mongodb.CustomMatchers.isTheSameAs
+import static org.bson.UuidRepresentation.JAVA_LEGACY
 import static spock.util.matcher.HamcrestSupport.expect
 
 class GridFSBucketsSpecification extends Specification {
@@ -33,8 +34,8 @@ class GridFSBucketsSpecification extends Specification {
 
     def 'should create a GridFSBucket with default bucket name'() {
         given:
-        def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), readConcern,
-                Stub(OperationExecutor))
+        def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), false, true, readConcern,
+                JAVA_LEGACY, Stub(OperationExecutor))
 
         when:
         def gridFSBucket = GridFSBuckets.create(database)
@@ -46,8 +47,8 @@ class GridFSBucketsSpecification extends Specification {
 
     def 'should create a GridFSBucket with custom bucket name'() {
         given:
-        def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), readConcern,
-                Stub(OperationExecutor))
+        def database = new MongoDatabaseImpl('db', Stub(CodecRegistry), Stub(ReadPreference), Stub(WriteConcern), false, true, readConcern,
+                JAVA_LEGACY, Stub(OperationExecutor))
         def customName = 'custom'
 
         when:
diff --git a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSDownloadStreamSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSDownloadStreamSpecification.groovy
new file mode 100644
index 00000000000..4ba6a17de9a
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSDownloadStreamSpecification.groovy
@@ -0,0 +1,656 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.gridfs
+
+import com.mongodb.MongoGridFSException
+import com.mongodb.client.FindIterable
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.MongoCursor
+import com.mongodb.client.gridfs.model.GridFSFile
+import com.mongodb.client.ClientSession
+import org.bson.BsonObjectId
+import org.bson.Document
+import org.bson.types.Binary
+import org.bson.types.ObjectId
+import spock.lang.Specification
+
+class GridFSDownloadStreamSpecification extends Specification {
+    def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 3L, 2, new Date(), 'abc', new Document())
+
+    def 'should return the file info'() {
+        when:
+        def downloadStream = new GridFSDownloadStreamImpl(null, fileInfo, Stub(MongoCollection))
+
+        then:
+        downloadStream.getGridFSFile() == fileInfo
+    }
+
+    def 'should query the chunks collection as expected'() {
+        when:
+        def twoBytes = new byte[2]
+        def oneByte = new byte[1]
+        def findQuery = new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 0))
+        def sort = new Document('n', 1)
+        def chunkDocument = new Document('files_id', fileInfo.getId())
+                .append('n', 0)
+                .append('data', new Binary(twoBytes))
+
+        def secondChunkDocument = new Document('files_id', fileInfo.getId())
+                .append('n', 1)
+                .append('data', new Binary(oneByte))
+
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        then:
+        downloadStream.available() == 0
+
+        when:
+        def result = downloadStream.read()
+
+        then:
+        result == (twoBytes[0] & 0xFF)
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQuery) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQuery) >> findIterable
+        }
+        1 * findIterable.sort(sort) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+
+        then:
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        downloadStream.available() == 1
+
+        when:
+        result = downloadStream.read()
+
+        then:
+        result == (twoBytes[1] & 0xFF)
+        0 * mongoCursor.hasNext()
+        0 * mongoCursor.next()
+        downloadStream.available() == 0
+
+        when:
+        result = downloadStream.read()
+
+        then:
+        result == (oneByte[0] & 0xFF)
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> secondChunkDocument
+
+        when:
+        result = downloadStream.read()
+
+        then:
+        result == -1
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should create a new cursor each time when using batchSize 1'() {
+        when:
+        def twoBytes = new byte[2]
+        def oneByte = new byte[1]
+        def findQuery = new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 0))
+        def secondFindQuery = new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 1))
+        def sort = new Document('n', 1)
+        def chunkDocument = new Document('files_id', fileInfo.getId())
+                .append('n', 0)
+                .append('data', new Binary(twoBytes))
+
+        def secondChunkDocument = new Document('files_id', fileInfo.getId())
+                .append('n', 1)
+                .append('data', new Binary(oneByte))
+
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection).batchSize(1)
+
+        then:
+        downloadStream.available() == 0
+
+        when:
+        def result = downloadStream.read()
+
+        then:
+        result == (twoBytes[0] & 0xFF)
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQuery) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQuery) >> findIterable
+        }
+        1 * findIterable.sort(sort) >> findIterable
+        1 * findIterable.batchSize(1) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+
+        then:
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        downloadStream.available() == 1
+
+        when:
+        result = downloadStream.read()
+
+        then:
+        result == (twoBytes[1] & 0xFF)
+        0 * mongoCursor.hasNext()
+        0 * mongoCursor.next()
+        downloadStream.available() == 0
+
+        when:
+        result = downloadStream.read()
+
+        then:
+        result == (oneByte[0] & 0xFF)
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, secondFindQuery) >> findIterable
+        } else {
+            1 * chunksCollection.find(secondFindQuery) >> findIterable
+        }
+        1 * findIterable.sort(sort) >> findIterable
+        1 * findIterable.batchSize(1) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> secondChunkDocument
+
+        when:
+        result = downloadStream.read()
+
+        then:
+        result == -1
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should skip to the correct point'() {
+        given:
+        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 4194297L, 32,
+                new Date(), 'abc', new Document())
+
+        def firstChunkBytes = 1..32 as byte[]
+        def lastChunkBytes = 33 .. 57 as byte[]
+
+        def sort = new Document('n', 1)
+
+        def findQueries = [new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 0)),
+                           new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 131071))]
+        def chunkDocuments =
+                [new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(firstChunkBytes)),
+                 new Document('files_id', fileInfo.getId()).append('n', 131071).append('data', new Binary(lastChunkBytes))]
+
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        when:
+        def skipResult = downloadStream.skip(15)
+
+        then:
+        skipResult == 15L
+        0 * chunksCollection.find(*_)
+
+        when:
+        def readByte = new byte[5]
+        downloadStream.read(readByte)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQueries[0]) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQueries[0]) >> findIterable
+        }
+        1 * findIterable.sort(sort) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocuments[0]
+
+        then:
+        readByte == [16, 17, 18, 19, 20] as byte[]
+
+        when:
+        skipResult = downloadStream.skip(4194272)
+
+        then:
+        skipResult == 4194272L
+        0 * chunksCollection.find(*_)
+
+        when:
+        downloadStream.read(readByte)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, findQueries[1]) >> findIterable
+        } else {
+            1 * chunksCollection.find(findQueries[1]) >> findIterable
+        }
+        1 * findIterable.sort(sort) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocuments[1]
+
+        then:
+        readByte == [53, 54, 55, 56, 57] as byte[]
+
+        when:
+        skipResult = downloadStream.skip(1)
+
+        then:
+        skipResult == 0L
+        0 * chunksCollection.find(*_)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should mark and reset to the correct point'() {
+        given:
+        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 25L, 25, new Date(), 'abc', new Document())
+
+        def expected10Bytes = 11 .. 20 as byte[]
+        def firstChunkBytes = 1..25 as byte[]
+
+        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(firstChunkBytes))
+
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        when:
+        def readByte = new byte[10]
+        downloadStream.read(readByte)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        then:
+        readByte == 1 .. 10 as byte[]
+
+        when:
+        downloadStream.mark()
+
+        then:
+        0 * chunksCollection.find(*_)
+
+        when:
+        downloadStream.read(readByte)
+
+        then:
+        readByte == expected10Bytes
+
+        when:
+        downloadStream.reset()
+
+        then:
+        0 * chunksCollection.find(*_)
+
+        when:
+        downloadStream.read(readByte)
+
+        then:
+        0 * chunksCollection.find(*_)
+        readByte == expected10Bytes
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+
+    def 'should mark and reset across chunks'() {
+        given:
+        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 50L, 25, new Date(), 'abc', new Document())
+
+        def firstChunkBytes = 1..25 as byte[]
+        def secondChunkBytes = 26 .. 50 as byte[]
+
+        def chunkDocuments =
+                [new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(firstChunkBytes)),
+                 new Document('files_id', fileInfo.getId()).append('n', 1).append('data', new Binary(secondChunkBytes))]
+
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        when:
+        downloadStream.mark()
+        def readByte = new byte[25]
+        downloadStream.read(readByte)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocuments[0]
+
+        then:
+        readByte == firstChunkBytes
+
+        then:
+        0 * chunksCollection.find(*_)
+
+        when:
+        downloadStream.read(readByte)
+
+        then:
+        readByte == secondChunkBytes
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocuments[1]
+
+        when: 'check read to EOF'
+        def result = downloadStream.read(readByte)
+
+        then:
+        result == -1
+
+        when:
+        downloadStream.reset()
+
+        then:
+        0 * chunksCollection.find(*_)
+
+        when:
+        downloadStream.read(readByte)
+
+        then:
+        readByte == firstChunkBytes
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocuments[0]
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate next chunk when marked and reset at eof'() {
+        given:
+        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 25L, 25, new Date(), 'abc', new Document())
+
+        def chunkBytes = 1..25 as byte[]
+        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(chunkBytes))
+
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        when:
+        def readByte = new byte[25]
+        downloadStream.read(readByte)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        then:
+        readByte == chunkBytes
+
+        when:
+        downloadStream.mark()
+
+        then:
+        0 * chunksCollection.find(*_)
+
+        when:
+        downloadStream.reset()
+
+        then:
+        0 * chunksCollection.find(*_)
+
+        when: 'Trying to read past eof'
+        def result = downloadStream.read(readByte)
+
+        then:
+        result == -1
+
+        when: 'Resets back to eof'
+        downloadStream.reset()
+
+        then:
+        0 * chunksCollection.find(*_)
+
+        when:
+        result = downloadStream.read(readByte)
+
+        then:
+        result == -1
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should not throw an exception when trying to mark post close'() {
+        given:
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, Stub(MongoCollection))
+        downloadStream.close()
+
+        when:
+        downloadStream.mark()
+
+        then:
+        notThrown(MongoGridFSException)
+
+        when:
+        downloadStream.mark(1)
+
+        then:
+        notThrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should handle negative skip value correctly '() {
+        given:
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, Stub(MongoCollection))
+
+        when:
+        def result = downloadStream.skip(-1)
+
+        then:
+        result == 0L
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should handle skip that is larger or equal to the file length'() {
+        given:
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        when:
+        def result = downloadStream.skip(skipValue)
+
+        then:
+        result == 3L
+        0 * chunksCollection.find(*_)
+
+        when:
+        result = downloadStream.read()
+
+        then:
+        result == -1
+
+        where:
+        [skipValue, clientSession] << [[3, 100], [null, Stub(ClientSession)]].combinations()
+    }
+
+    def 'should throw if trying to pass negative batchSize'() {
+        given:
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, Stub(MongoCollection))
+
+        when:
+        downloadStream.batchSize(0)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+
+        when:
+        downloadStream.batchSize(-1)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should throw if no chunks found when data is expected'() {
+        given:
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        when:
+        downloadStream.read()
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> false
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should throw if chunk data differs from the expected'() {
+        given:
+        def chunkDocument = new Document('files_id', fileInfo.getId())
+                .append('n', 0)
+                .append('data', new Binary(data))
+
+        def mongoCursor = Mock(MongoCursor)
+        def findIterable = Mock(FindIterable)
+        def chunksCollection = Mock(MongoCollection)
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, chunksCollection)
+
+        when:
+        downloadStream.read()
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.find(clientSession, _) >> findIterable
+        } else {
+            1 * chunksCollection.find(_) >> findIterable
+        }
+        1 * findIterable.sort(_) >> findIterable
+        1 * findIterable.batchSize(0) >> findIterable
+        1 * findIterable.iterator() >> mongoCursor
+        1 * mongoCursor.hasNext() >> true
+        1 * mongoCursor.next() >> chunkDocument
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        [data, clientSession] << [[new byte[1], new byte[100]], [null, Stub(ClientSession)]].combinations()
+    }
+
+    def 'should throw an exception when trying to action post close'() {
+        given:
+        def downloadStream = new GridFSDownloadStreamImpl(clientSession, fileInfo, Stub(MongoCollection))
+        downloadStream.close()
+
+        when:
+        downloadStream.read()
+
+        then:
+        thrown(MongoGridFSException)
+
+        when:
+        downloadStream.skip(10)
+
+        then:
+        thrown(MongoGridFSException)
+
+        when:
+        downloadStream.reset()
+
+        then:
+        thrown(MongoGridFSException)
+
+        when:
+        downloadStream.read(new byte[10])
+
+        then:
+        thrown(MongoGridFSException)
+
+        when:
+        downloadStream.read(new byte[10], 0, 10)
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy
similarity index 79%
rename from driver/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy
rename to driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy
index c5787b9cf52..45c8f0e463b 100644
--- a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSFindIterableSpecification.groovy
@@ -1,14 +1,14 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -18,15 +18,15 @@ package com.mongodb.client.gridfs
 
 import com.mongodb.Block
 import com.mongodb.CursorType
-import com.mongodb.FindIterableImpl
 import com.mongodb.Function
-import com.mongodb.MongoClient
+import com.mongodb.MongoClientSettings
 import com.mongodb.MongoNamespace
 import com.mongodb.ReadConcern
-import com.mongodb.TestOperationExecutor
-import com.mongodb.client.gridfs.model.GridFSFile
 import com.mongodb.client.gridfs.codecs.GridFSFileCodec
-import com.mongodb.client.model.FindOptions
+import com.mongodb.client.gridfs.model.GridFSFile
+import com.mongodb.client.internal.FindIterableImpl
+import com.mongodb.client.internal.TestOperationExecutor
+import com.mongodb.client.model.Collation
 import com.mongodb.operation.BatchCursor
 import com.mongodb.operation.FindOperation
 import org.bson.BsonDocument
@@ -43,17 +43,18 @@ import static spock.util.matcher.HamcrestSupport.expect
 
 class GridFSFindIterableSpecification extends Specification {
 
-    def codecRegistry = MongoClient.getDefaultCodecRegistry()
+    def codecRegistry = MongoClientSettings.getDefaultCodecRegistry()
     def gridFSFileCodec = new GridFSFileCodec(codecRegistry)
     def readPreference = secondary()
     def readConcern = ReadConcern.DEFAULT
+    def collation = Collation.builder().locale('en').build()
     def namespace = new MongoNamespace('test', 'fs.files')
 
     def 'should build the expected findOperation'() {
         given:
-        def executor = new TestOperationExecutor([null, null]);
-        def underlying = new FindIterableImpl(namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
-                new Document(), new FindOptions())
+        def executor = new TestOperationExecutor([null, null])
+        def underlying = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
+                new Document())
         def findIterable = new GridFSFindIterableImpl(underlying)
 
         when: 'default input should be as expected'
@@ -63,7 +64,8 @@ class GridFSFindIterableSpecification extends Specification {
         def readPreference = executor.getReadPreference()
 
         then:
-        expect operation, isTheSameAs(new FindOperation<GridFSFile>(namespace, gridFSFileCodec).filter(new BsonDocument()).slaveOk(true))
+        expect operation, isTheSameAs(new FindOperation<GridFSFile>(namespace, gridFSFileCodec)
+                .filter(new BsonDocument()).slaveOk(true).retryReads(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
@@ -74,6 +76,7 @@ class GridFSFindIterableSpecification extends Specification {
                 .limit(99)
                 .skip(9)
                 .noCursorTimeout(true)
+                .collation(collation)
                 .iterator()
 
         operation = executor.getReadOperation() as FindOperation<GridFSFile>
@@ -88,15 +91,16 @@ class GridFSFindIterableSpecification extends Specification {
                 .skip(9)
                 .noCursorTimeout(true)
                 .slaveOk(true)
+                .collation(collation)
+                .retryReads(true)
         )
     }
 
     def 'should handle mixed types'() {
         given:
-        def executor = new TestOperationExecutor([null, null]);
-        def findOptions = new FindOptions()
-        def findIterable = new FindIterableImpl(namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
-                new Document('filter', 1), findOptions)
+        def executor = new TestOperationExecutor([null, null])
+        def findIterable = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern,
+                executor, new Document('filter', 1))
 
         when:
         findIterable.filter(new Document('filter', 1))
@@ -113,6 +117,7 @@ class GridFSFindIterableSpecification extends Specification {
                 .modifiers(new BsonDocument('modifier', new BsonInt32(1)))
                 .cursorType(CursorType.NonTailable)
                 .slaveOk(true)
+                .retryReads(true)
         )
     }
 
@@ -141,12 +146,11 @@ class GridFSFindIterableSpecification extends Specification {
                 hasNext() >> {
                     count == 0
                 }
-
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def underlying = new FindIterableImpl(namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
-                new Document(), new FindOptions())
+        def underlying = new FindIterableImpl(null, namespace, GridFSFile, GridFSFile, codecRegistry, readPreference, readConcern, executor,
+                new Document())
         def mongoIterable = new GridFSFindIterableImpl(underlying)
 
         when:
@@ -186,7 +190,6 @@ class GridFSFindIterableSpecification extends Specification {
 
         then:
         target == cannedResults*.getFilename()
-
     }
 
 }
diff --git a/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSUploadStreamSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSUploadStreamSpecification.groovy
new file mode 100644
index 00000000000..154b0896d23
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/gridfs/GridFSUploadStreamSpecification.groovy
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.gridfs
+
+import com.mongodb.MongoGridFSException
+import com.mongodb.client.MongoCollection
+import com.mongodb.client.gridfs.model.GridFSFile
+import com.mongodb.client.ClientSession
+import org.bson.BsonObjectId
+import org.bson.BsonString
+import org.bson.Document
+import org.bson.types.Binary
+import spock.lang.Specification
+
+import java.security.MessageDigest
+
+class GridFSUploadStreamSpecification extends Specification {
+    def fileId = new BsonObjectId()
+    def filename = 'filename'
+    def metadata = new Document()
+    def disableMD5 = false
+
+    def 'should return the file id'() {
+        when:
+        def uploadStream = new GridFSUploadStreamImpl(null, Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255,
+                disableMD5, metadata)
+        then:
+        uploadStream.getId() == fileId
+    }
+
+    def 'should write the buffer it reaches the chunk size'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 2,
+                disableMD5, metadata)
+        when:
+        uploadStream.write(1)
+
+        then:
+        0 * chunksCollection.insertOne(*_)
+
+        when:
+        uploadStream.write(1)
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _)
+        } else {
+            1 * chunksCollection.insertOne(_)
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should write to the files collection on close'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, null)
+
+        when:
+        uploadStream.write('file content ' as byte[])
+
+        then:
+        0 * chunksCollection.insertOne(*_)
+
+        when:
+        uploadStream.close()
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession, _)
+            1 * filesCollection.insertOne(clientSession, _)
+        } else {
+            1 * chunksCollection.insertOne(_)
+            1 * filesCollection.insertOne(_)
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should write to the files and chunks collection as expected close'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def content = 'file content ' as byte[]
+        def metadata = new Document('contentType', 'text/txt')
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                md5Disabled, metadata)
+        def chunksData
+        def fileData
+
+        when:
+        uploadStream.write(content)
+        uploadStream.close()
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.insertOne(clientSession) { Document data -> chunksData = data }
+        } else {
+            1 * chunksCollection.insertOne { Document data -> chunksData = data }
+        }
+
+        chunksData.get('files_id') == fileId
+        chunksData.getInteger('n') == 0
+        chunksData.get('data', Binary).getData() == content
+
+        then:
+        if (clientSession != null) {
+            1 * filesCollection.insertOne(clientSession) { GridFSFile data -> fileData = data }
+        } else {
+            1 * filesCollection.insertOne { GridFSFile data -> fileData = data }
+        }
+
+        fileData.getId() == fileId
+        fileData.getFilename() == filename
+        fileData.getLength() == content.length as Long
+        fileData.getChunkSize() == 255
+        fileData.getMD5() == md5Disabled ? null : MessageDigest.getInstance('MD5').digest(content).encodeHex().toString()
+        fileData.getMetadata() == metadata
+
+        where:
+        [clientSession, md5Disabled] << [[null, Stub(ClientSession)], [true, false]].combinations()
+    }
+
+    def 'should not write an empty chunk'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata)
+        when:
+        uploadStream.close()
+
+        then:
+        0 * chunksCollection.insertOne(*_)
+        if (clientSession != null) {
+            1 * filesCollection.insertOne(clientSession, _)
+        } else {
+            1 * filesCollection.insertOne(_)
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should delete any chunks when calling abort'() {
+        given:
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), chunksCollection, fileId, filename, 255,
+                disableMD5, metadata)
+
+        when:
+        uploadStream.write('file content ' as byte[])
+        uploadStream.abort()
+
+        then:
+        if (clientSession != null) {
+            1 * chunksCollection.deleteMany(clientSession, new Document('files_id', fileId))
+        } else {
+            1 * chunksCollection.deleteMany(new Document('files_id', fileId))
+        }
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should close the stream on abort'() {
+        given:
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255,
+                disableMD5, metadata)
+        uploadStream.write('file content ' as byte[])
+        uploadStream.abort()
+
+        when:
+        uploadStream.write(1)
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should not do anything when calling flush'() {
+        given:
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, Stub(MongoCollection), chunksCollection, fileId, filename, 255,
+                disableMD5, metadata)
+
+        when:
+        uploadStream.write('file content ' as byte[])
+        uploadStream.flush()
+
+        then:
+        0 * chunksCollection.insertOne(*_)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should throw an exception when trying to action post close'() {
+        given:
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata)
+        when:
+        uploadStream.close()
+        uploadStream.write(1)
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should throw an exception when calling getObjectId and the fileId is not an ObjectId'() {
+        given:
+        def fileId = new BsonString('myFile')
+        def filesCollection = Mock(MongoCollection)
+        def chunksCollection = Mock(MongoCollection)
+        def uploadStream = new GridFSUploadStreamImpl(clientSession, filesCollection, chunksCollection, fileId, filename, 255,
+                disableMD5, metadata)
+        when:
+        uploadStream.getObjectId()
+
+        then:
+        thrown(MongoGridFSException)
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/AggregateIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/AggregateIterableSpecification.groovy
new file mode 100644
index 00000000000..d9d9adaa289
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/AggregateIterableSpecification.groovy
@@ -0,0 +1,512 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.client.ClientSession
+import com.mongodb.client.model.AggregationLevel
+import com.mongodb.client.model.Collation
+import com.mongodb.operation.AggregateOperation
+import com.mongodb.operation.AggregateToCollectionOperation
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.FindOperation
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class AggregateIterableSpecification extends Specification {
+
+    def namespace = new MongoNamespace('db', 'coll')
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
+    def readPreference = secondary()
+    def readConcern = ReadConcern.MAJORITY
+    def writeConcern = WriteConcern.MAJORITY
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should build the expected AggregationOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null, null, null]);
+        def pipeline = [new Document('$match', 1)]
+        def aggregationIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                                                            readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION,
+                true)
+
+        when: 'default input should be as expected'
+        aggregationIterable.iterator()
+
+        def operation = executor.getReadOperation() as AggregateOperation<Document>
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new AggregateOperation<Document>(namespace,
+                [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec()).retryReads(true))
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        aggregationIterable
+                .maxAwaitTime(99, MILLISECONDS)
+                .maxTime(999, MILLISECONDS)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .iterator()
+
+        operation = executor.getReadOperation() as AggregateOperation<Document>
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new AggregateOperation<Document>(namespace,
+                [new BsonDocument('$match', new BsonInt32(1))], new DocumentCodec())
+                .retryReads(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+                .maxAwaitTime(99, MILLISECONDS)
+                .maxTime(999, MILLISECONDS)
+                .useCursor(true))
+    }
+
+    def 'should build the expected AggregateToCollectionOperation for $out'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null, null, null])
+        def collectionName = 'collectionName'
+        def collectionNamespace = new MongoNamespace(namespace.getDatabaseName(), collectionName)
+        def pipeline = [new Document('$match', 1), new Document('$out', collectionName)]
+
+        when: 'aggregation includes $out'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                                  pipeline, AggregationLevel.COLLECTION, false)
+                .batchSize(99)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment').iterator()
+
+        def operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))],
+                readConcern, writeConcern, AggregationLevel.COLLECTION)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+        )
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getBatchSize() == 99
+        operation.getCollation() == collation
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'aggregation includes $out and is at the database level'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.DATABASE, false)
+                .batchSize(99)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment').iterator()
+
+        operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))],
+                readConcern, writeConcern,
+                AggregationLevel.DATABASE)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+        )
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getBatchSize() == 99
+        operation.getCollation() == collation
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'toCollection should work as expected'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, false)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .toCollection()
+
+        operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))],
+                readConcern, writeConcern)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
+    }
+
+    def 'should build the expected AggregateToCollectionOperation for $merge'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null, null, null, null, null])
+        def collectionName = 'collectionName'
+        def collectionNamespace = new MongoNamespace(namespace.getDatabaseName(), collectionName)
+        def pipeline = [new Document('$match', 1), new Document('$merge', new Document('into', collectionName))]
+        def pipelineWithIntoDocument = [new Document('$match', 1), new Document('$merge',
+                new Document('into', new Document('db', 'db2').append('coll', collectionName)))]
+
+        when: 'aggregation includes $merge'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, false)
+                .batchSize(99)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment').iterator()
+
+        def operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into', new BsonString(collectionName)))],
+                readConcern, writeConcern,
+                AggregationLevel.COLLECTION)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+        )
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getBatchSize() == 99
+        operation.getCollation() == collation
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'aggregation includes $merge into a different database'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipelineWithIntoDocument, AggregationLevel.COLLECTION, false)
+                .batchSize(99)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment').iterator()
+
+        operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into',
+                         new BsonDocument('db', new BsonString('db2')).append('coll', new BsonString(collectionName))))],
+                readConcern, writeConcern,
+                AggregationLevel.COLLECTION)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+        )
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == new MongoNamespace('db2', collectionName)
+        operation.getBatchSize() == 99
+        operation.getCollation() == collation
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'aggregation includes $merge and is at the database level'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.DATABASE, false)
+                .batchSize(99)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .useCursor(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment').iterator()
+
+        operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into', new BsonString(collectionName)))],
+                readConcern, writeConcern,
+                AggregationLevel.DATABASE)
+                .maxTime(999, MILLISECONDS)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment')
+        )
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getBatchSize() == 99
+        operation.getCollation() == collation
+        operation.getMaxAwaitTime(MILLISECONDS) == 0
+        operation.getMaxTime(MILLISECONDS) == 0
+
+        when: 'toCollection should work as expected'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                pipeline, AggregationLevel.COLLECTION, false)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new Document('a', 1))
+                .comment('this is a comment')
+                .toCollection()
+
+        operation = executor.getWriteOperation() as AggregateToCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
+                [new BsonDocument('$match', new BsonInt32(1)),
+                 new BsonDocument('$merge', new BsonDocument('into', new BsonString(collectionName)))],
+                readConcern, writeConcern)
+                .allowDiskUse(true)
+                .collation(collation)
+                .hint(new BsonDocument('a', new BsonInt32(1)))
+                .comment('this is a comment'))
+    }
+
+
+    def 'should use ClientSession for AggregationOperation'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([batchCursor, batchCursor]);
+        def pipeline = [new Document('$match', 1)]
+        def aggregationIterable = new AggregateIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false)
+
+        when:
+        aggregationIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        aggregationIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should use ClientSession for AggregateToCollectionOperation'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([null, batchCursor, null, batchCursor, null]);
+        def pipeline = [new Document('$match', 1), new Document('$out', 'collName')]
+        def aggregationIterable = new AggregateIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false)
+
+        when:
+        aggregationIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        aggregationIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+        executor.getClientSession() == clientSession
+
+        when:
+        aggregationIterable.toCollection()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should handle exceptions correctly'() {
+        given:
+        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
+        def executor = new TestOperationExecutor([new MongoException('failure')])
+        def pipeline = [new BsonDocument('$match', new BsonInt32(1))]
+        def aggregationIterable = new AggregateIterableImpl(null, namespace, BsonDocument, BsonDocument, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, false)
+
+        when: 'The operation fails with an exception'
+        aggregationIterable.iterator()
+
+        then: 'the future should handle the exception'
+        thrown(MongoException)
+
+        when: 'toCollection should throw IllegalStateException when last state is not $out'
+        aggregationIterable.toCollection()
+
+        then:
+        thrown(IllegalStateException)
+
+        when: 'a codec is missing'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                                  pipeline, AggregationLevel.COLLECTION, false).iterator()
+
+        then:
+        thrown(CodecConfigurationException)
+
+        when: 'pipeline contains null'
+        new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                [null], AggregationLevel.COLLECTION, false).iterator()
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def results;
+                def getResult = {
+                    count++
+                    results = count == 1 ? cannedResults : null
+                    results
+                }
+                next() >> {
+                    getResult()
+                }
+                hasNext() >> {
+                    count == 0
+                }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()])
+        def mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, [new Document('$match', 1)], AggregationLevel.COLLECTION, false)
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results == cannedResults[0]
+
+        when:
+        def count = 0
+        mongoIterable.forEach(new Block<Document>() {
+            @Override
+            void apply(Document document) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target == cannedResults
+
+        when:
+        target = []
+        mongoIterable.map(new Function<Document, Integer>() {
+            @Override
+            Integer apply(Document document) {
+                document.getInteger('_id')
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new AggregateIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, Stub(OperationExecutor), [new Document('$match', 1)], AggregationLevel.COLLECTION,
+                false)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ChangeStreamIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ChangeStreamIterableSpecification.groovy
new file mode 100644
index 00000000000..5f11b266f7a
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ChangeStreamIterableSpecification.groovy
@@ -0,0 +1,279 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.changestream.ChangeStreamDocument
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import com.mongodb.client.model.changestream.FullDocument
+import com.mongodb.operation.AggregateResponseBatchCursor
+import com.mongodb.operation.ChangeStreamOperation
+import com.mongodb.client.ClientSession
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonTimestamp
+import org.bson.Document
+import org.bson.RawBsonDocument
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.RawBsonDocumentCodec
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class ChangeStreamIterableSpecification extends Specification {
+    def namespace = new MongoNamespace('db', 'coll')
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
+    def readPreference = secondary()
+    def readConcern = ReadConcern.MAJORITY
+    def writeConcern = WriteConcern.MAJORITY
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should build the expected ChangeStreamOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null, null, null])
+        def pipeline = [new Document('$match', 1)]
+        def changeStreamIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern,
+                executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true)
+
+        when: 'default input should be as expected'
+        changeStreamIterable.iterator()
+
+        def codec = new RawBsonDocumentCodec();
+        def operation = executor.getReadOperation() as ChangeStreamOperation<Document>
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new ChangeStreamOperation<Document>(namespace, FullDocument.DEFAULT,
+                [BsonDocument.parse('{$match: 1}')], codec, ChangeStreamLevel.COLLECTION).retryReads(true))
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        def resumeToken = RawBsonDocument.parse('{_id: {a: 1}}')
+        def startAtOperationTime = new BsonTimestamp(99)
+        changeStreamIterable.collation(collation).maxAwaitTime(99, MILLISECONDS)
+                .fullDocument(FullDocument.UPDATE_LOOKUP).resumeAfter(resumeToken).startAtOperationTime(startAtOperationTime)
+                .startAfter(resumeToken).iterator()
+
+        operation = executor.getReadOperation() as ChangeStreamOperation<Document>
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new ChangeStreamOperation<Document>(namespace, FullDocument.UPDATE_LOOKUP,
+                [BsonDocument.parse('{$match: 1}')], codec, ChangeStreamLevel.COLLECTION)
+                .retryReads(true)
+                .collation(collation).maxAwaitTime(99, MILLISECONDS)
+                .resumeAfter(resumeToken).startAtOperationTime(startAtOperationTime).startAfter(resumeToken))
+    }
+
+    def 'should use ClientSession'() {
+        given:
+        def batchCursor = Stub(AggregateResponseBatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([batchCursor, batchCursor])
+        def changeStreamIterable = new ChangeStreamIterableImpl(clientSession, namespace, codecRegistry, readPreference, readConcern,
+                executor, [], Document, ChangeStreamLevel.COLLECTION, true)
+
+        when:
+        changeStreamIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        changeStreamIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should handle exceptions correctly'() {
+        given:
+        def altRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
+        def executor = new TestOperationExecutor([new MongoException('failure')])
+        def pipeline = [new BsonDocument('$match', new BsonInt32(1))]
+        def changeStreamIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern,
+                executor, pipeline, BsonDocument, ChangeStreamLevel.COLLECTION, true)
+
+        when: 'The operation fails with an exception'
+        changeStreamIterable.iterator()
+
+        then:
+        thrown(MongoException)
+
+        when: 'a codec is missing'
+        new ChangeStreamIterableImpl(null, namespace, altRegistry, readPreference, readConcern, executor, pipeline, Document,
+                ChangeStreamLevel.COLLECTION, true).iterator()
+
+        then:
+        thrown(CodecConfigurationException)
+
+        when: 'pipeline contains null'
+        new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [null], Document,
+                ChangeStreamLevel.COLLECTION, true).iterator()
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def count = 0
+        def cannedResults = ['{_id: {_data: 1}}', '{_id: {_data: 2}}', '{_id: {_data: 3}}'].collect {
+            RawBsonDocument.parse(it)
+        }
+        def executor = new TestOperationExecutor([cursor(cannedResults), cursor(cannedResults), cursor(cannedResults),
+                                                  cursor(cannedResults)])
+        def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [],
+                Document, ChangeStreamLevel.COLLECTION, true)
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results.getResumeToken().equals(cannedResults[0].getDocument('_id'))
+
+        when:
+        mongoIterable.forEach(new Block<ChangeStreamDocument<Document>>() {
+            @Override
+            void apply(ChangeStreamDocument<Document> result) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target[0].getResumeToken().equals(cannedResults[0].getDocument('_id'))
+        target[1].getResumeToken().equals(cannedResults[1].getDocument('_id'))
+        target[2].getResumeToken().equals(cannedResults[2].getDocument('_id'))
+
+        when:
+        target = []
+        mongoIterable.map(new Function<ChangeStreamDocument<Document>, Integer>() {
+            @Override
+            Integer apply(ChangeStreamDocument<Document> document) {
+                document.getResumeToken().getInt32('_data').intValue()
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+    def 'should be able to return the raw results'() {
+        given:
+        def count = 0
+        def cannedResults = ['{_id: { _data: 1}}', '{_id: {_data: 2}}', '{_id: {_data: 3}}'].collect { RawBsonDocument.parse(it) }
+        def executor = new TestOperationExecutor([cursor(cannedResults), cursor(cannedResults), cursor(cannedResults),
+                                                  cursor(cannedResults)])
+        def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern, executor, [],
+                Document, ChangeStreamLevel.COLLECTION, true).withDocumentClass(RawBsonDocument)
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results == cannedResults[0]
+
+        when:
+        mongoIterable.forEach(new Block<RawBsonDocument>() {
+            @Override
+            void apply(final RawBsonDocument rawBsonDocument) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target == cannedResults
+
+        when:
+        target = []
+        mongoIterable.map(new Function<BsonDocument, Integer>() {
+            @Override
+            Integer apply(BsonDocument document) {
+                document.getDocument('_id').getInt32('_data').intValue()
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ChangeStreamIterableImpl(null, namespace, codecRegistry, readPreference, readConcern,
+                Stub(OperationExecutor), [BsonDocument.parse('{$match: 1}')], BsonDocument, ChangeStreamLevel.COLLECTION, true)
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+
+    def cursor(List<?> cannedResults) {
+        Stub(AggregateResponseBatchCursor) {
+            def counter = 0
+            def results
+            def getResult = {
+                counter++
+                results = counter == 1 ? cannedResults : null
+                results
+            }
+            next() >> {
+                getResult()
+            }
+            hasNext() >> {
+                counter == 0
+            }
+        }
+    }
+
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
new file mode 100644
index 00000000000..c40c0b58f11
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ClientSessionBindingSpecification.groovy
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.ReadPreference
+import com.mongodb.binding.ClusterBinding
+import com.mongodb.binding.ConnectionSource
+import com.mongodb.binding.ReadWriteBinding
+import com.mongodb.connection.Cluster
+import com.mongodb.internal.session.ClientSessionContext
+import com.mongodb.client.ClientSession
+import spock.lang.Specification
+
+class ClientSessionBindingSpecification extends Specification {
+    def 'should return the session context from the binding'() {
+        given:
+        def session = Stub(ClientSession)
+        def wrappedBinding = Stub(ClusterBinding)
+        def binding = new ClientSessionBinding(session, false, wrappedBinding)
+
+        when:
+        def context = binding.getSessionContext()
+
+        then:
+        (context as ClientSessionContext).getClientSession() == session
+    }
+
+    def 'should return the session context from the connection source'() {
+        given:
+        def session = Stub(ClientSession)
+        def wrappedBinding = Mock(ClusterBinding)
+        def binding = new ClientSessionBinding(session, false, wrappedBinding)
+
+        when:
+        def readConnectionSource = binding.getReadConnectionSource()
+        def context = readConnectionSource.getSessionContext()
+
+        then:
+        (context as ClientSessionContext).getClientSession() == session
+        1 * wrappedBinding.getReadConnectionSource() >> {
+            Stub(ConnectionSource)
+        }
+
+        when:
+        def writeConnectionSource = binding.getWriteConnectionSource()
+        context = writeConnectionSource.getSessionContext()
+
+        then:
+        (context as ClientSessionContext).getClientSession() == session
+        1 * wrappedBinding.getWriteConnectionSource() >> {
+            Stub(ConnectionSource)
+        }
+    }
+
+    def 'should close client session when binding reference count drops to zero if it is owned by the binding'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+        def binding = new ClientSessionBinding(session, true, wrappedBinding)
+        binding.retain()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        binding.release()
+
+        then:
+        1 * session.close()
+    }
+
+    def 'should close client session when binding reference count drops to zero due to connection source if it is owned by the binding'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+        def binding = new ClientSessionBinding(session, true, wrappedBinding)
+        def readConnectionSource = binding.getReadConnectionSource()
+        def writeConnectionSource = binding.getWriteConnectionSource()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        writeConnectionSource.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        readConnectionSource.release()
+
+        then:
+        1 * session.close()
+    }
+
+    def 'should not close client session when binding reference count drops to zero if it is not owned by the binding'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+        def binding = new ClientSessionBinding(session, false, wrappedBinding)
+        binding.retain()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+
+        when:
+        binding.release()
+
+        then:
+        0 * session.close()
+    }
+
+    def 'owned session is implicit'() {
+        given:
+        def session = Mock(ClientSession)
+        def wrappedBinding = createStubBinding()
+
+        when:
+        def binding = new ClientSessionBinding(session, ownsSession, wrappedBinding)
+
+        then:
+        binding.getSessionContext().isImplicitSession() == ownsSession
+
+        where:
+        ownsSession << [true, false]
+    }
+
+    private ReadWriteBinding createStubBinding() {
+        def cluster = Stub(Cluster)
+        new ClusterBinding(cluster, ReadPreference.primary())
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/CryptConnectionSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/CryptConnectionSpecification.groovy
new file mode 100644
index 00000000000..e15636ab2f5
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/CryptConnectionSpecification.groovy
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.ReadPreference
+import com.mongodb.ServerAddress
+import com.mongodb.connection.ClusterId
+import com.mongodb.connection.Connection
+import com.mongodb.connection.ConnectionDescription
+import com.mongodb.connection.ConnectionId
+import com.mongodb.connection.ServerId
+import com.mongodb.connection.SplittablePayload
+import com.mongodb.internal.connection.NoOpSessionContext
+import com.mongodb.internal.validator.NoOpFieldNameValidator
+import org.bson.BsonArray
+import org.bson.BsonBinary
+import org.bson.BsonBinaryReader
+import org.bson.BsonBinaryWriter
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWrapper
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.Document
+import org.bson.RawBsonDocument
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.DecoderContext
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.RawBsonDocumentCodec
+import org.bson.io.BasicOutputBuffer
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.ClusterFixture.notAtLeastJava8
+import static com.mongodb.connection.ServerType.STANDALONE
+import static com.mongodb.connection.SplittablePayload.Type.INSERT
+
+@IgnoreIf( { notAtLeastJava8 })
+class CryptConnectionSpecification extends Specification {
+
+    def 'should encrypt and decrypt a command'() {
+        given:
+        def wrappedConnection = Mock(Connection)
+        def crypt = Mock(Crypt)
+        def cryptConnection = new CryptConnection(wrappedConnection, crypt)
+        def codec = new DocumentCodec()
+        def encryptedCommand = toRaw(new BsonDocument('find', new BsonString('test'))
+                .append('ssid', new BsonBinary(6 as byte, new byte[10])))
+
+        def encryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1))
+                .append('cursor',
+                new BsonDocument('firstBatch',
+                        new BsonArray([new BsonDocument('_id', new BsonInt32(1))
+                                               .append('ssid', new BsonBinary(6 as byte, new byte[10]))]))))
+
+        def decryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1))
+                .append('cursor', new BsonDocument('firstBatch',
+                new BsonArray([new BsonDocument('_id', new BsonInt32(1))
+                                       .append('ssid', new BsonString('555-55-5555'))]))))
+
+        when:
+        def response = cryptConnection.command('db',
+                new BsonDocumentWrapper(new Document('find', 'test')
+                        .append('filter', new Document('ssid', '555-55-5555')), codec),
+                new NoOpFieldNameValidator(), ReadPreference.primary(), codec,
+                NoOpSessionContext.INSTANCE)
+
+        then:
+        _ * wrappedConnection.getDescription() >> {
+            new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())), 8, STANDALONE,
+                    1000, 1024 * 16_000, 1024 * 48_000, [])
+        }
+        1 * crypt.encrypt('db', toRaw(new BsonDocument('find', new BsonString('test'))
+                .append('filter', new BsonDocument('ssid', new BsonString('555-55-5555'))))) >> {
+             encryptedCommand
+        }
+        1 * wrappedConnection.command('db', encryptedCommand, _ as NoOpFieldNameValidator, ReadPreference.primary(),
+                _ as RawBsonDocumentCodec, NoOpSessionContext.INSTANCE, true, null, null) >> {
+            encryptedResponse
+        }
+        1 * crypt.decrypt(encryptedResponse) >> {
+            decryptedResponse
+        }
+        response == rawToDocument(decryptedResponse)
+    }
+
+    def 'should split at 2 MiB'() {
+        given:
+        def wrappedConnection = Mock(Connection)
+        def crypt = Mock(Crypt)
+        def cryptConnection = new CryptConnection(wrappedConnection, crypt)
+        def codec = new DocumentCodec()
+        def bytes = new byte[2097152 - 85]
+        def payload = new SplittablePayload(INSERT, [
+                new BsonDocumentWrapper(new Document('_id', 1).append('ssid', '555-55-5555').append('b', bytes), codec),
+                new BsonDocumentWrapper(new Document('_id', 2).append('ssid', '666-66-6666').append('b', bytes), codec)
+        ])
+        def encryptedCommand = toRaw(new BsonDocument('insert', new BsonString('test')).append('documents', new BsonArray(
+                [
+                        new BsonDocument('_id', new BsonInt32(1))
+                                .append('ssid', new BsonBinary(6 as byte, new byte[10]))
+                                .append('b', new BsonBinary(bytes))
+                ])))
+
+        def encryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1)))
+        def decryptedResponse = encryptedResponse
+
+        when:
+        def response = cryptConnection.command('db',
+                new BsonDocumentWrapper(new Document('insert', 'test'), codec),
+                new NoOpFieldNameValidator(), ReadPreference.primary(), new BsonDocumentCodec(),
+                NoOpSessionContext.INSTANCE, true,
+                payload,
+                new NoOpFieldNameValidator())
+
+        then:
+        _ * wrappedConnection.getDescription() >> {
+            new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())), 8, STANDALONE,
+                    1000, 1024 * 16_000, 1024 * 48_000, [])
+        }
+        1 * crypt.encrypt('db',
+                toRaw(new BsonDocument('insert', new BsonString('test')).append('documents',
+                        new BsonArray([
+                                new BsonDocument('_id', new BsonInt32(1))
+                                        .append('ssid', new BsonString('555-55-5555'))
+                                        .append('b', new BsonBinary(bytes))
+                        ])))) >> {
+            encryptedCommand
+        }
+        1 * wrappedConnection.command('db', encryptedCommand, _ as NoOpFieldNameValidator, ReadPreference.primary(),
+                _ as RawBsonDocumentCodec, NoOpSessionContext.INSTANCE, true, null, null) >> {
+            encryptedResponse
+        }
+        1 * crypt.decrypt(encryptedResponse) >> {
+            decryptedResponse
+        }
+        response == rawToBsonDocument(decryptedResponse)
+        payload.getPosition() == 1
+    }
+
+    def 'should split at maxBatchCount'() {
+        given:
+        def wrappedConnection = Mock(Connection)
+        def crypt = Mock(Crypt)
+        def cryptConnection = new CryptConnection(wrappedConnection, crypt)
+        def codec = new DocumentCodec()
+        def maxBatchCount = 2
+        def payload = new SplittablePayload(INSERT, [
+                new BsonDocumentWrapper(new Document('_id', 1), codec),
+                new BsonDocumentWrapper(new Document('_id', 2), codec),
+                new BsonDocumentWrapper(new Document('_id', 3), codec)
+        ])
+        def encryptedCommand = toRaw(new BsonDocument('insert', new BsonString('test')).append('documents', new BsonArray(
+                [
+                        new BsonDocument('_id', new BsonInt32(1)),
+                        new BsonDocument('_id', new BsonInt32(2)),
+
+                ])))
+
+        def encryptedResponse = toRaw(new BsonDocument('ok', new BsonInt32(1)))
+        def decryptedResponse = encryptedResponse
+
+        when:
+        def response = cryptConnection.command('db',
+                new BsonDocumentWrapper(new Document('insert', 'test'), codec),
+                new NoOpFieldNameValidator(), ReadPreference.primary(), new BsonDocumentCodec(),
+                NoOpSessionContext.INSTANCE, true,
+                payload,
+                new NoOpFieldNameValidator())
+
+        then:
+        _ * wrappedConnection.getDescription() >> {
+            new ConnectionDescription(new ConnectionId(new ServerId(new ClusterId(), new ServerAddress())), 8, STANDALONE,
+                    maxBatchCount, 1024 * 16_000, 1024 * 48_000, [])
+        }
+        1 * crypt.encrypt('db',
+                toRaw(new BsonDocument('insert', new BsonString('test')).append('documents',
+                        new BsonArray([
+                                new BsonDocument('_id', new BsonInt32(1)),
+                                new BsonDocument('_id', new BsonInt32(2))
+                        ])))) >> {
+            encryptedCommand
+        }
+        1 * wrappedConnection.command('db', encryptedCommand, _ as NoOpFieldNameValidator, ReadPreference.primary(),
+                _ as RawBsonDocumentCodec, NoOpSessionContext.INSTANCE, true, null, null) >> {
+            encryptedResponse
+        }
+        1 * crypt.decrypt(encryptedResponse) >> {
+            decryptedResponse
+        }
+        response == rawToBsonDocument(decryptedResponse)
+        payload.getPosition() == 2
+    }
+
+    RawBsonDocument toRaw(BsonDocument document) {
+        def buffer = new BasicOutputBuffer()
+        def writer = new BsonBinaryWriter(buffer)
+        new BsonDocumentCodec().encode(writer, document, EncoderContext.builder().build())
+        new RawBsonDocument(buffer.getInternalBuffer(), 0, buffer.getSize())
+    }
+
+    Document rawToDocument(RawBsonDocument document) {
+        new DocumentCodec().decode(new BsonBinaryReader(document.getByteBuffer().asNIO()), DecoderContext.builder().build())
+    }
+
+    BsonDocument rawToBsonDocument(RawBsonDocument document) {
+        new BsonDocumentCodec().decode(new BsonBinaryReader(document.getByteBuffer().asNIO()), DecoderContext.builder().build())
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/DistinctIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/DistinctIterableSpecification.groovy
new file mode 100644
index 00000000000..bed472c04d0
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/DistinctIterableSpecification.groovy
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.client.model.Collation
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.DistinctOperation
+import com.mongodb.client.ClientSession
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class DistinctIterableSpecification extends Specification {
+
+    def namespace = new MongoNamespace('db', 'coll')
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
+    def readPreference = secondary()
+    def readConcern = ReadConcern.MAJORITY
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should build the expected DistinctOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null]);
+        def distinctIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, 'field', new BsonDocument(), true)
+
+        when: 'default input should be as expected'
+        distinctIterable.iterator()
+
+        def operation = executor.getReadOperation() as DistinctOperation<Document>
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new DistinctOperation<Document>(namespace, 'field', new DocumentCodec())
+                .filter(new BsonDocument()).retryReads(true))
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        distinctIterable.filter(new Document('field', 1)).maxTime(999, MILLISECONDS).batchSize(99).collation(collation).iterator()
+
+        operation = executor.getReadOperation() as DistinctOperation<Document>
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new DistinctOperation<Document>(namespace, 'field', new DocumentCodec())
+                .filter(new BsonDocument('field', new BsonInt32(1)))
+                .maxTime(999, MILLISECONDS).collation(collation).retryReads(true))
+    }
+
+    def 'should use ClientSession'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([batchCursor, batchCursor]);
+        def distinctIterable = new DistinctIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, executor, 'field', new BsonDocument())
+
+        when:
+        distinctIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        distinctIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should handle exceptions correctly'() {
+        given:
+        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
+        def executor = new TestOperationExecutor([new MongoException('failure')])
+        def distinctIterable = new DistinctIterableImpl(null, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, executor, 'field', new BsonDocument())
+
+        when: 'The operation fails with an exception'
+        distinctIterable.iterator()
+
+        then: 'the future should handle the exception'
+        thrown(MongoException)
+
+        when: 'a codec is missing'
+        distinctIterable.filter(new Document('field', 1)).iterator()
+        then:
+        thrown(CodecConfigurationException)
+    }
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def results;
+                def getResult = {
+                    count++
+                    results = count == 1 ? cannedResults : null
+                    results
+                }
+                next() >> {
+                    getResult()
+                }
+                hasNext() >> {
+                    count == 0
+                }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
+        def mongoIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, ReadConcern.LOCAL,
+                executor, 'field', new BsonDocument())
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results == cannedResults[0]
+
+        when:
+        def count = 0
+        mongoIterable.forEach(new Block<Document>() {
+            @Override
+            void apply(Document document) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target == cannedResults
+
+        when:
+        target = []
+        mongoIterable.map(new Function<Document, Integer>() {
+            @Override
+            Integer apply(Document document) {
+                document.getInteger('_id')
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                Stub(OperationExecutor), 'field', new BsonDocument())
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy
new file mode 100644
index 00000000000..6a0ab73db8f
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.CursorType
+import com.mongodb.Function
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.client.model.Collation
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.FindOperation
+import com.mongodb.client.ClientSession
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonString
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import org.bson.conversions.Bson
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static java.util.concurrent.TimeUnit.SECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class FindIterableSpecification extends Specification {
+
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(),
+                                       new BsonValueCodecProvider()])
+    def readPreference = secondary()
+    def readConcern = ReadConcern.MAJORITY
+    def namespace = new MongoNamespace('db', 'coll')
+    def collation = Collation.builder().locale('en').build()
+
+    @SuppressWarnings('deprecation')
+    def 'should build the expected findOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null])
+        def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, new Document('filter', 1), true)
+                .sort(new Document('sort', 1))
+                .modifiers(new Document('modifier', 1))
+                .projection(new Document('projection', 1))
+                .maxTime(10, SECONDS)
+                .maxAwaitTime(20, SECONDS)
+                .batchSize(100)
+                .limit(100)
+                .skip(10)
+                .cursorType(CursorType.NonTailable)
+                .oplogReplay(false)
+                .noCursorTimeout(false)
+                .partial(false)
+                .collation(null)
+                .comment('my comment')
+                .hintString('a_1')
+                .min(new Document('min', 1))
+                .max(new Document('max', 1))
+                .maxScan(42L)
+                .returnKey(false)
+                .showRecordId(false)
+                .snapshot(false)
+
+        when: 'default input should be as expected'
+        findIterable.iterator()
+
+        def operation = executor.getReadOperation() as FindOperation<Document>
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
+                .filter(new BsonDocument('filter', new BsonInt32(1)))
+                .sort(new BsonDocument('sort', new BsonInt32(1)))
+                .modifiers(new BsonDocument('modifier', new BsonInt32(1)))
+                .projection(new BsonDocument('projection', new BsonInt32(1)))
+                .maxTime(10000, MILLISECONDS)
+                .maxAwaitTime(20000, MILLISECONDS)
+                .batchSize(100)
+                .limit(100)
+                .skip(10)
+                .cursorType(CursorType.NonTailable)
+                .slaveOk(true)
+                .comment('my comment')
+                .hint(new BsonString('a_1'))
+                .min(new BsonDocument('min', new BsonInt32(1)))
+                .max(new BsonDocument('max', new BsonInt32(1)))
+                .maxScan(42L)
+                .returnKey(false)
+                .showRecordId(false)
+                .snapshot(false)
+                .retryReads(true)
+        )
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        findIterable.filter(new Document('filter', 2))
+                .sort(new Document('sort', 2))
+                .modifiers(new Document('modifier', 2))
+                .projection(new Document('projection', 2))
+                .maxTime(9, SECONDS)
+                .maxAwaitTime(18, SECONDS)
+                .batchSize(99)
+                .limit(99)
+                .skip(9)
+                .cursorType(CursorType.Tailable)
+                .oplogReplay(true)
+                .noCursorTimeout(true)
+                .partial(true)
+                .collation(collation)
+                .comment('alt comment')
+                .hint(new Document('hint', 2))
+                .min(new Document('min', 2))
+                .max(new Document('max', 2))
+                .maxScan(88L)
+                .returnKey(true)
+                .showRecordId(true)
+                .snapshot(true)
+                .iterator()
+
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
+                .filter(new BsonDocument('filter', new BsonInt32(2)))
+                .sort(new BsonDocument('sort', new BsonInt32(2)))
+                .modifiers(new BsonDocument('modifier', new BsonInt32(2)))
+                .projection(new BsonDocument('projection', new BsonInt32(2)))
+                .maxTime(9000, MILLISECONDS)
+                .maxAwaitTime(18000, MILLISECONDS)
+                .batchSize(99)
+                .limit(99)
+                .skip(9)
+                .cursorType(CursorType.Tailable)
+                .oplogReplay(true)
+                .noCursorTimeout(true)
+                .partial(true)
+                .slaveOk(true)
+                .collation(collation)
+                .comment('alt comment')
+                .hint(new BsonDocument('hint', new BsonInt32(2)))
+                .min(new BsonDocument('min', new BsonInt32(2)))
+                .max(new BsonDocument('max', new BsonInt32(2)))
+                .maxScan(88L)
+                .returnKey(true)
+                .showRecordId(true)
+                .snapshot(true)
+                .retryReads(true)
+        )
+
+        when: 'passing nulls to nullable methods'
+        new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, new Document('filter', 1), true)
+                .filter(null as Bson)
+                .collation(null)
+                .modifiers(null)
+                .projection(null)
+                .sort(null as Bson)
+                .comment(null)
+                .hint(null)
+                .max(null as Bson)
+                .min(null as Bson)
+                .iterator()
+
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should set an empty doc for the filter'
+        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
+                .filter(new BsonDocument()).slaveOk(true).retryReads(true))
+    }
+
+    def 'should use ClientSession'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([batchCursor, batchCursor]);
+        def findIterable = new FindIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, new Document('filter', 1))
+
+        when:
+        findIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        findIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should handle mixed types'() {
+        given:
+        def executor = new TestOperationExecutor([null, null])
+        def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, new Document('filter', 1), true)
+
+        when:
+        findIterable.filter(new Document('filter', 1))
+                  .sort(new BsonDocument('sort', new BsonInt32(1)))
+                  .modifiers(new Document('modifier', 1))
+                  .iterator()
+
+        def operation = executor.getReadOperation() as FindOperation<Document>
+
+        then:
+        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
+                .filter(new BsonDocument('filter', new BsonInt32(1)))
+                .sort(new BsonDocument('sort', new BsonInt32(1)))
+                .modifiers(new BsonDocument('modifier', new BsonInt32(1)))
+                .cursorType(CursorType.NonTailable)
+                .slaveOk(true)
+                .retryReads(true)
+        )
+    }
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def results;
+                def getResult = {
+                    count++
+                    results = count == 1 ? cannedResults : null
+                    results
+                }
+                next() >> {
+                    getResult()
+                }
+                hasNext() >> {
+                    count == 0
+                }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()])
+        def mongoIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, new Document())
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results == cannedResults[0]
+
+        when:
+        def count = 0
+        mongoIterable.forEach(new Block<Document>() {
+            @Override
+            void apply(Document document) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target == cannedResults
+
+        when:
+        target = []
+        mongoIterable.map(new Function<Document, Integer>() {
+            @Override
+            Integer apply(Document document) {
+                document.getInteger('_id')
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, Stub(OperationExecutor), new Document())
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/Java8MongoIterablesSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/Java8MongoIterablesSpecification.groovy
new file mode 100644
index 00000000000..c3c11372184
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/Java8MongoIterablesSpecification.groovy
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoInternalException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.client.model.AggregationLevel
+import com.mongodb.operation.BatchCursor
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.Document
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import java.util.function.Consumer
+
+import static com.mongodb.ReadPreference.secondary
+
+class Java8MongoIterablesSpecification extends Specification {
+
+    static final boolean IS_CONSUMER_CLASS_AVAILABLE
+
+    static {
+        try {
+            Java8MongoIterablesSpecification.classLoader.loadClass('java.util.function.Consumer')
+            IS_CONSUMER_CLASS_AVAILABLE = true;
+        } catch (ClassNotFoundException ignored) {
+            IS_CONSUMER_CLASS_AVAILABLE = false;
+        }
+    }
+
+    static namespace = new MongoNamespace('databaseName', 'collectionName')
+    static codecRegistry = MongoClientSettings.getDefaultCodecRegistry()
+    static readPreference = secondary()
+    static readConcern = ReadConcern.MAJORITY
+    static writeConcern = WriteConcern.MAJORITY
+    static filter = new BsonDocument('x', BsonBoolean.TRUE)
+    static pipeline = Collections.emptyList()
+
+    @IgnoreIf({ !IS_CONSUMER_CLASS_AVAILABLE })
+    def 'should properly override Iterable forEach of Consumer'() {
+        given:
+        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def isClosed = false
+        def count = 0
+        def accepted = 0
+
+        def cursor = {
+            Stub(BatchCursor) {
+                def results;
+                def getResult = {
+                    count++
+                    results = count == 1 ? cannedResults : null
+                    results
+                }
+                next() >> {
+                    getResult()
+                }
+                hasNext() >> {
+                    count == 0
+                }
+                close() >> {
+                    isClosed = true
+                }
+            }
+        }
+
+        when:
+        count = 0
+        accepted = 0
+        def mongoIterable = mongoIterableFactory(new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]))
+        mongoIterable.forEach(new Consumer<Document>() {
+            @Override
+            void accept(Document document) {
+                accepted++
+            }
+        })
+
+        then:
+        accepted == 3
+        isClosed
+
+        when:
+        count = 0
+        accepted = 0
+        mongoIterable = mongoIterableFactory(new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]))
+        mongoIterable.forEach(new Consumer<Document>() {
+            @Override
+            void accept(Document document) {
+                accepted++
+                throw new MongoInternalException("I don't accept this")
+            }
+        })
+
+        then:
+        thrown(MongoInternalException)
+        accepted == 1
+        isClosed
+
+        where:
+        mongoIterableFactory << [
+                { executor ->
+                    new Java8FindIterableImpl(null, namespace, Document, Document, codecRegistry,
+                            readPreference, readConcern, executor, filter, true)
+                },
+                { executor ->
+                    new Java8AggregateIterableImpl(null, namespace, Document, Document, codecRegistry,
+                            readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, true)
+                },
+                { executor ->
+                    new Java8DistinctIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                            executor, 'f1', filter, true)
+                },
+                { executor ->
+                    new Java8ListDatabasesIterableImpl(null, Document, codecRegistry, readPreference,
+                            executor, true)
+                },
+                { executor ->
+                    new Java8ListCollectionsIterableImpl(null, 'test', true, Document,
+                            codecRegistry, readPreference, executor, true)
+                },
+                { executor ->
+                    new Java8ListIndexesIterableImpl(null, namespace, Document, codecRegistry,
+                            readPreference, executor, true)
+                },
+                { executor ->
+                    new Java8MapReduceIterableImpl(null, namespace, Document, BsonDocument,
+                            codecRegistry, readPreference, readConcern, writeConcern, executor, 'map', 'reduce')
+                }
+        ]
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ListCollectionsIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ListCollectionsIterableSpecification.groovy
new file mode 100644
index 00000000000..c0a8e70d844
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ListCollectionsIterableSpecification.groovy
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.ListCollectionsOperation
+import com.mongodb.client.ClientSession
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class ListCollectionsIterableSpecification extends Specification {
+
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(),
+                                       new BsonValueCodecProvider()])
+    def readPreference = secondary()
+
+    def 'should build the expected listCollectionOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null]);
+        def listCollectionIterable = new ListCollectionsIterableImpl<Document>(null, 'db', false, Document, codecRegistry,
+                readPreference, executor)
+                .filter(new Document('filter', 1))
+                .batchSize(100)
+                .maxTime(1000, MILLISECONDS)
+        def listCollectionNamesIterable = new ListCollectionsIterableImpl<Document>(null, 'db', true, Document, codecRegistry,
+                readPreference, executor)
+
+        when: 'default input should be as expected'
+        listCollectionIterable.iterator()
+
+        def operation = executor.getReadOperation() as ListCollectionsOperation<Document>
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec())
+                .filter(new BsonDocument('filter', new BsonInt32(1))).batchSize(100).maxTime(1000, MILLISECONDS)
+                .retryReads(true))
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        listCollectionIterable.filter(new Document('filter', 2)).batchSize(99).maxTime(999, MILLISECONDS).iterator()
+
+        operation = executor.getReadOperation() as ListCollectionsOperation<Document>
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec())
+                .filter(new BsonDocument('filter', new BsonInt32(2))).batchSize(99).maxTime(999, MILLISECONDS)
+                .retryReads(true))
+
+        when: 'requesting collection names only'
+        listCollectionNamesIterable.iterator()
+
+        operation = executor.getReadOperation() as ListCollectionsOperation<Document>
+
+        then: 'should create operation with nameOnly'
+        expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec()).nameOnly(true)
+                .retryReads(true))
+    }
+
+    def 'should use ClientSession'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([batchCursor, batchCursor]);
+        def listCollectionIterable = new ListCollectionsIterableImpl<Document>(clientSession, 'db', false, Document, codecRegistry,
+                readPreference, executor)
+
+        when:
+        listCollectionIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        listCollectionIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def results;
+                def getResult = {
+                    count++
+                    results = count == 1 ? cannedResults : null
+                    results
+                }
+                next() >> {
+                    getResult()
+                }
+                hasNext() >> {
+                    count == 0
+                }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
+        def mongoIterable = new ListCollectionsIterableImpl<Document>(null, 'db', false, Document, codecRegistry, readPreference,
+                executor)
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results == cannedResults[0]
+
+        when:
+        def count = 0
+        mongoIterable.forEach(new Block<Document>() {
+            @Override
+            void apply(Document document) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target == cannedResults
+
+        when:
+        target = []
+        mongoIterable.map(new Function<Document, Integer>() {
+            @Override
+            Integer apply(Document document) {
+                document.getInteger('_id')
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ListCollectionsIterableImpl<Document>(null, 'db', false, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor))
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+}
diff --git a/driver/src/test/unit/com/mongodb/ListDatabasesIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ListDatabasesIterableSpecification.groovy
similarity index 76%
rename from driver/src/test/unit/com/mongodb/ListDatabasesIterableSpecification.groovy
rename to driver-sync/src/test/unit/com/mongodb/client/internal/ListDatabasesIterableSpecification.groovy
index b6c16cefa85..38e91082828 100644
--- a/driver/src/test/unit/com/mongodb/ListDatabasesIterableSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ListDatabasesIterableSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-package com.mongodb
+package com.mongodb.client.internal
 
+import com.mongodb.Block
+import com.mongodb.Function
 import com.mongodb.operation.BatchCursor
 import com.mongodb.operation.ListDatabasesOperation
+import org.bson.BsonDocument
 import org.bson.Document
 import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.DocumentCodec
@@ -34,13 +37,13 @@ import static spock.util.matcher.HamcrestSupport.expect
 class ListDatabasesIterableSpecification extends Specification {
 
     def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(),
-                                       new DBObjectCodecProvider(), new BsonValueCodecProvider()])
+                                       new BsonValueCodecProvider()])
     def readPreference = secondary()
 
     def 'should build the expected listCollectionOperation'() {
         given:
         def executor = new TestOperationExecutor([null, null]);
-        def listDatabaseIterable = new ListDatabasesIterableImpl<Document>(Document, codecRegistry, readPreference, executor)
+        def listDatabaseIterable = new ListDatabasesIterableImpl<Document>(null, Document, codecRegistry, readPreference, executor)
                 .maxTime(1000, MILLISECONDS)
 
         when: 'default input should be as expected'
@@ -50,16 +53,18 @@ class ListDatabasesIterableSpecification extends Specification {
         def readPreference = executor.getReadPreference()
 
         then:
-        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(1000, MILLISECONDS))
+        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(1000, MILLISECONDS)
+                .retryReads(true))
         readPreference == secondary()
 
         when: 'overriding initial options'
-        listDatabaseIterable.maxTime(999, MILLISECONDS).iterator()
+        listDatabaseIterable.maxTime(999, MILLISECONDS).filter(Document.parse('{a: 1}')).nameOnly(true).iterator()
 
         operation = executor.getReadOperation() as ListDatabasesOperation<Document>
 
         then: 'should use the overrides'
-        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(999, MILLISECONDS))
+        expect operation, isTheSameAs(new ListDatabasesOperation<Document>(new DocumentCodec()).maxTime(999, MILLISECONDS)
+                .filter(BsonDocument.parse('{a: 1}')).nameOnly(true).retryReads(true))
     }
 
     def 'should follow the MongoIterable interface as expected'() {
@@ -80,11 +85,10 @@ class ListDatabasesIterableSpecification extends Specification {
                 hasNext() >> {
                     count == 0
                 }
-
             }
         }
         def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new ListDatabasesIterableImpl<Document>(Document, codecRegistry, readPreference, executor)
+        def mongoIterable = new ListDatabasesIterableImpl<Document>(null, Document, codecRegistry, readPreference, executor)
 
         when:
         def results = mongoIterable.first()
@@ -123,4 +127,20 @@ class ListDatabasesIterableSpecification extends Specification {
         then:
         target == [1, 2, 3]
     }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ListDatabasesIterableImpl<Document>(null, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor))
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
 }
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/ListIndexesIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/ListIndexesIterableSpecification.groovy
new file mode 100644
index 00000000000..85ce03c1359
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/ListIndexesIterableSpecification.groovy
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.MongoNamespace
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.ListIndexesOperation
+import com.mongodb.client.ClientSession
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class ListIndexesIterableSpecification extends Specification {
+
+    def namespace = new MongoNamespace('db', 'coll')
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(),
+                                       new BsonValueCodecProvider()])
+    def readPreference = secondary()
+
+    def 'should build the expected listIndexesOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null]);
+        def listIndexesIterable = new ListIndexesIterableImpl<Document>(null, namespace, Document, codecRegistry, readPreference, executor)
+                .batchSize(100).maxTime(1000, MILLISECONDS)
+
+        when: 'default input should be as expected'
+        listIndexesIterable.iterator()
+
+        def operation = executor.getReadOperation() as ListIndexesOperation<Document>
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new ListIndexesOperation<Document>(namespace, new DocumentCodec())
+                .batchSize(100).maxTime(1000, MILLISECONDS).retryReads(true))
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        listIndexesIterable.batchSize(99)
+                .maxTime(999, MILLISECONDS)
+                .iterator()
+
+        operation = executor.getReadOperation() as ListIndexesOperation<Document>
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new ListIndexesOperation<Document>(namespace, new DocumentCodec())
+                .batchSize(99).maxTime(999, MILLISECONDS).retryReads(true))
+    }
+
+    def 'should use ClientSession'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([batchCursor, batchCursor]);
+        def listIndexesIterable = new ListIndexesIterableImpl<Document>(clientSession, namespace, Document, codecRegistry, readPreference,
+                executor)
+
+        when:
+        listIndexesIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        listIndexesIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def results;
+                def getResult = {
+                    count++
+                    results = count == 1 ? cannedResults : null
+                    results
+                }
+                next() >> {
+                    getResult()
+                }
+                hasNext() >> {
+                    count == 0
+                }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
+        def mongoIterable = new ListIndexesIterableImpl<Document>(null, namespace, Document, codecRegistry, readPreference, executor)
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results == cannedResults[0]
+
+        when:
+        def count = 0
+        mongoIterable.forEach(new Block<Document>() {
+            @Override
+            void apply(Document document) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target == cannedResults
+
+        when:
+        target = []
+        mongoIterable.map(new Function<Document, Integer>() {
+            @Override
+            Integer apply(Document document) {
+                document.getInteger('_id')
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new ListIndexesIterableImpl<Document>(null, namespace, Document, codecRegistry, readPreference,
+                Stub(OperationExecutor))
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MapReduceIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MapReduceIterableSpecification.groovy
new file mode 100644
index 00000000000..c81eda643ed
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MapReduceIterableSpecification.groovy
@@ -0,0 +1,334 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.MapReduceAction
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.FindOperation
+import com.mongodb.operation.MapReduceToCollectionOperation
+import com.mongodb.operation.MapReduceWithInlineResultsOperation
+import com.mongodb.client.ClientSession
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.BsonJavaScript
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecConfigurationException
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MapReduceIterableSpecification extends Specification {
+
+    def namespace = new MongoNamespace('db', 'coll')
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
+    def readPreference = secondary()
+    def readConcern = ReadConcern.MAJORITY
+    def writeConcern = WriteConcern.MAJORITY
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should build the expected MapReduceWithInlineResultsOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null]);
+        def mapReduceIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, 'map', 'reduce')
+
+        when: 'default input should be as expected'
+        mapReduceIterable.iterator()
+
+        def operation = (executor.getReadOperation() as MapReduceIterableImpl.WrappedMapReduceReadOperation<Document>).getOperation()
+        def readPreference = executor.getReadPreference()
+
+        then:
+        expect operation, isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
+                new BsonJavaScript('reduce'), new DocumentCodec())
+                .verbose(true))
+        readPreference == secondary()
+
+        when: 'overriding initial options'
+        mapReduceIterable.filter(new Document('filter', 1))
+                .finalizeFunction('finalize')
+                .limit(999)
+                .maxTime(999, MILLISECONDS)
+                .scope(new Document('scope', 1))
+                .sort(new Document('sort', 1))
+                .verbose(false)
+                .collation(collation)
+                .iterator()
+
+        operation = (executor.getReadOperation() as MapReduceIterableImpl.WrappedMapReduceReadOperation<Document>).getOperation()
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
+                new BsonJavaScript('reduce'), new DocumentCodec())
+                .filter(new BsonDocument('filter', new BsonInt32(1)))
+                .finalizeFunction(new BsonJavaScript('finalize'))
+                .limit(999)
+                .maxTime(999, MILLISECONDS)
+                .scope(new BsonDocument('scope', new BsonInt32(1)))
+                .sort(new BsonDocument('sort', new BsonInt32(1)))
+                .verbose(false)
+                .collation(collation)
+        )
+    }
+
+    def 'should build the expected MapReduceToCollectionOperation'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null]);
+
+        when: 'mapReduce to a collection'
+        def collectionNamespace = new MongoNamespace('dbName', 'collName')
+        def mapReduceIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                writeConcern, executor, 'map', 'reduce')
+                .collectionName(collectionNamespace.getCollectionName())
+                .databaseName(collectionNamespace.getDatabaseName())
+                .filter(new Document('filter', 1))
+                .finalizeFunction('finalize')
+                .limit(999)
+                .maxTime(999, MILLISECONDS)
+                .scope(new Document('scope', 1))
+                .sort(new Document('sort', 1))
+                .verbose(false)
+                .batchSize(99)
+                .nonAtomic(true)
+                .action(MapReduceAction.MERGE)
+                .sharded(true)
+                .jsMode(true)
+                .bypassDocumentValidation(true)
+                .collation(collation)
+        mapReduceIterable.iterator()
+
+        def operation = executor.getWriteOperation() as MapReduceToCollectionOperation
+        def expectedOperation = new MapReduceToCollectionOperation(namespace, new BsonJavaScript('map'),
+                new BsonJavaScript('reduce'), 'collName', writeConcern)
+                .databaseName(collectionNamespace.getDatabaseName())
+                .filter(new BsonDocument('filter', new BsonInt32(1)))
+                .finalizeFunction(new BsonJavaScript('finalize'))
+                .limit(999)
+                .maxTime(999, MILLISECONDS)
+                .scope(new BsonDocument('scope', new BsonInt32(1)))
+                .sort(new BsonDocument('sort', new BsonInt32(1)))
+                .verbose(false)
+                .nonAtomic(true)
+                .action(MapReduceAction.MERGE.getValue())
+                .jsMode(true)
+                .sharded(true)
+                .bypassDocumentValidation(true)
+                .collation(collation)
+
+        then: 'should use the overrides'
+        expect operation, isTheSameAs(expectedOperation)
+
+        when: 'the subsequent read should have the batchSize set'
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should use the correct settings'
+        operation.getNamespace() == collectionNamespace
+        operation.getBatchSize() == 99
+        operation.getCollation() == collation
+
+        when: 'toCollection should work as expected'
+        mapReduceIterable.toCollection()
+
+        operation = executor.getWriteOperation() as MapReduceToCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+    }
+
+    def 'should use ClientSession for MapReduceWithInlineResultsOperation'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([batchCursor, batchCursor]);
+        def mapReduceIterable = new MapReduceIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, 'map', 'reduce')
+
+        when:
+        mapReduceIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        when:
+        mapReduceIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+    def 'should use ClientSession for MapReduceToCollectionOperation'() {
+        given:
+        def batchCursor = Stub(BatchCursor) {
+            _ * hasNext() >> { false }
+        }
+        def executor = new TestOperationExecutor([null, batchCursor, null, batchCursor, null]);
+        def mapReduceIterable = new MapReduceIterableImpl(clientSession, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, 'map', 'reduce')
+                .collectionName('collName')
+
+        when:
+        mapReduceIterable.first()
+
+        then:
+        executor.getClientSession() == clientSession
+        executor.getClientSession() == clientSession
+
+        when:
+        mapReduceIterable.iterator()
+
+        then:
+        executor.getClientSession() == clientSession
+        executor.getClientSession() == clientSession
+
+        when:
+        mapReduceIterable.toCollection()
+
+        then:
+        executor.getClientSession() == clientSession
+
+        where:
+        clientSession << [null, Stub(ClientSession)]
+    }
+
+
+    def 'should handle exceptions correctly'() {
+        given:
+        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
+        def executor = new TestOperationExecutor([new MongoException('failure')])
+        def mapReduceIterable = new MapReduceIterableImpl(null, namespace, BsonDocument, BsonDocument, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, 'map', 'reduce')
+
+
+        when: 'The operation fails with an exception'
+        mapReduceIterable.iterator()
+
+        then: 'the future should handle the exception'
+        thrown(MongoException)
+
+        when: 'toCollection should throw IllegalStateException if its inline'
+        mapReduceIterable.toCollection()
+
+        then:
+        thrown(IllegalStateException)
+
+        when: 'a codec is missing'
+        new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, writeConcern, executor,
+                'map', 'reduce').iterator()
+
+        then:
+        thrown(CodecConfigurationException)
+    }
+
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
+        def cursor = {
+            Stub(BatchCursor) {
+                def count = 0
+                def results;
+                def getResult = {
+                    count++
+                    results = count == 1 ? cannedResults : null
+                    results
+                }
+                next() >> {
+                    getResult()
+                }
+                hasNext() >> {
+                    count == 0
+                }
+            }
+        }
+        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
+        def mongoIterable = new MapReduceIterableImpl(null, namespace, BsonDocument, BsonDocument, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, 'map', 'reduce')
+
+        when:
+        def results = mongoIterable.first()
+
+        then:
+        results == cannedResults[0]
+
+        when:
+        def count = 0
+        mongoIterable.forEach(new Block<Document>() {
+            @Override
+            void apply(Document document) {
+                count++
+            }
+        })
+
+        then:
+        count == 3
+
+        when:
+        def target = []
+        mongoIterable.into(target)
+
+        then:
+        target == cannedResults
+
+        when:
+        target = []
+        mongoIterable.map(new Function<Document, Integer>() {
+            @Override
+            Integer apply(Document document) {
+                document.getInteger('_id')
+            }
+        }).into(target)
+
+        then:
+        target == [1, 2, 3]
+    }
+
+    def 'should get and set batchSize as expected'() {
+        when:
+        def batchSize = 5
+        def mongoIterable = new MapReduceIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, Stub(OperationExecutor), 'map', 'reduce')
+
+        then:
+        mongoIterable.getBatchSize() == null
+
+        when:
+        mongoIterable.batchSize(batchSize)
+
+        then:
+        mongoIterable.getBatchSize() == batchSize
+    }
+
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MappingIterableSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MappingIterableSpecification.groovy
new file mode 100644
index 00000000000..fbc40ee2bf4
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MappingIterableSpecification.groovy
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.Block
+import com.mongodb.Function
+import com.mongodb.client.MongoCursor
+import com.mongodb.client.MongoIterable
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MappingIterableSpecification extends Specification {
+
+    def 'should follow the MongoIterable interface as expected'() {
+        given:
+        def iterable = Mock(MongoIterable)
+        def mapper = { doc -> doc }
+        def mappingIterable = new MappingIterable(iterable, mapper)
+
+        when:
+        mappingIterable.first()
+
+        then:
+        1 * iterable.first()
+
+        when:
+        mappingIterable.forEach( { } as Block)
+
+        then:
+        1 * iterable.forEach(_)
+
+        when:
+        mappingIterable.into([])
+
+        then:
+        1 * iterable.forEach(_)  // Use foreach to populate the target
+
+        when:
+        mappingIterable.batchSize(5)
+
+        then:
+        1 * iterable.batchSize(5)
+
+        when:
+        mappingIterable.iterator()
+
+        then:
+        1 * iterable.iterator() >> Stub(MongoCursor)
+
+        when:
+        def newMapper = { } as Function
+
+        then:
+        expect mappingIterable.map(newMapper), isTheSameAs(new MappingIterable(mappingIterable, newMapper))
+    }
+
+}
diff --git a/driver/src/test/unit/com/mongodb/MongoBatchCursorAdapterSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoBatchCursorAdapterSpecification.groovy
similarity index 95%
rename from driver/src/test/unit/com/mongodb/MongoBatchCursorAdapterSpecification.groovy
rename to driver-sync/src/test/unit/com/mongodb/client/internal/MongoBatchCursorAdapterSpecification.groovy
index f9a83fbbc10..2fa4e7a5bbe 100644
--- a/driver/src/test/unit/com/mongodb/MongoBatchCursorAdapterSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoBatchCursorAdapterSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package com.mongodb
+package com.mongodb.client.internal
 
+import com.mongodb.ServerAddress
+import com.mongodb.ServerCursor
 import com.mongodb.operation.BatchCursor
 import org.bson.Document
 import spock.lang.Specification
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoChangeStreamCursorSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoChangeStreamCursorSpecification.groovy
new file mode 100644
index 00000000000..b01f339fede
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoChangeStreamCursorSpecification.groovy
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.ServerAddress
+import com.mongodb.ServerCursor
+import com.mongodb.operation.AggregateResponseBatchCursor
+import org.bson.BsonDocument
+import org.bson.BsonInt32;
+import org.bson.codecs.Decoder;
+import org.bson.RawBsonDocument;
+import org.bson.codecs.RawBsonDocumentCodec
+import spock.lang.Specification
+
+
+class MongoChangeStreamCursorSpecification extends Specification {
+    def 'should get server cursor and address'() {
+        given:
+        def batchCursor = Stub(AggregateResponseBatchCursor)
+        def decoder = Mock(Decoder)
+        def resumeToken = Mock(BsonDocument)
+        def address = new ServerAddress('host', 27018)
+        def serverCursor = new ServerCursor(5, address)
+        batchCursor.getServerAddress() >> address
+        batchCursor.getServerCursor() >> serverCursor
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, decoder, resumeToken)
+
+        expect:
+        cursor.serverAddress.is(address)
+        cursor.serverCursor.is(serverCursor)
+    }
+
+    def 'should throw on remove'() {
+        given:
+        def batchCursor = Stub(AggregateResponseBatchCursor)
+        def decoder = Mock(Decoder)
+        def resumeToken = Mock(BsonDocument)
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, decoder, resumeToken)
+
+        when:
+        cursor.remove()
+
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    def 'should close batch cursor'() {
+        given:
+        def batchCursor = Mock(AggregateResponseBatchCursor)
+        def decoder = Mock(Decoder)
+        def resumeToken = Mock(BsonDocument)
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, decoder, resumeToken)
+
+        when:
+        cursor.close()
+
+        then:
+        1 * batchCursor.close()
+    }
+
+    def 'next should throw if there is no next'() {
+        given:
+        def batchCursor = Stub(AggregateResponseBatchCursor)
+        def codec = new RawBsonDocumentCodec();
+        def resumeToken = Mock(BsonDocument)
+
+        batchCursor.hasNext() >> false
+
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, codec, resumeToken)
+
+        when:
+        cursor.next()
+
+        then:
+        thrown(NoSuchElementException)
+    }
+
+
+    def 'should get next from batch cursor'() {
+        given:
+        def firstBatch = [RawBsonDocument.parse('{ _id: { _data: 1 }, x: 1 }'),
+                          RawBsonDocument.parse('{ _id: { _data: 2 }, x: 1 }')]
+        def secondBatch = [RawBsonDocument.parse('{ _id: { _data: 3 }, x: 2 }')]
+
+        def batchCursor = Stub(AggregateResponseBatchCursor)
+        def codec = new RawBsonDocumentCodec();
+        def resumeToken = Mock(BsonDocument)
+
+        batchCursor.hasNext() >>> [true, true, true, true, false]
+        batchCursor.next() >>> [firstBatch, secondBatch]
+
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, codec, resumeToken)
+
+        expect:
+        cursor.hasNext()
+        cursor.next() == firstBatch[0]
+        cursor.hasNext()
+        cursor.next() == firstBatch[1]
+        cursor.hasNext()
+        cursor.next() == secondBatch[0]
+        !cursor.hasNext()
+    }
+
+    def 'should try next from batch cursor'() {
+        given:
+        def firstBatch = [RawBsonDocument.parse('{ _id: { _data: 1 }, x: 1 }'),
+                          RawBsonDocument.parse('{ _id: { _data: 2 }, x: 1 }')]
+        def secondBatch = [RawBsonDocument.parse('{ _id: { _data: 3 }, x: 2 }')]
+
+        def batchCursor = Stub(AggregateResponseBatchCursor)
+        def codec = new RawBsonDocumentCodec();
+        def resumeToken = Mock(BsonDocument)
+
+        batchCursor.tryNext() >>> [firstBatch, null, secondBatch, null]
+
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, codec, resumeToken)
+
+        expect:
+        cursor.tryNext() == firstBatch[0]
+        cursor.tryNext() == firstBatch[1]
+        cursor.tryNext() == null
+        cursor.tryNext() == secondBatch[0]
+        cursor.tryNext() == null
+    }
+
+    def 'should get cached resume token after next'() {
+        given:
+        def firstBatch = [RawBsonDocument.parse('{ _id: { _data: 1 }, x: 1 }'),
+                          RawBsonDocument.parse('{ _id: { _data: 2 }, x: 1 }')]
+        def secondBatch = [RawBsonDocument.parse('{ _id: { _data: 3 }, x: 2 }')]
+
+        def batchCursor = Stub(AggregateResponseBatchCursor)
+        def codec = new RawBsonDocumentCodec();
+        def resumeToken = new BsonDocument('_data', new BsonInt32(1))
+
+        batchCursor.hasNext() >>> [true, true, true, false]
+        batchCursor.next() >>> [firstBatch, secondBatch]
+        batchCursor.getPostBatchResumeToken() >>> [new BsonDocument('_data', new BsonInt32(2)),
+                                                   new BsonDocument('_data', new BsonInt32(2)),
+                                                   new BsonDocument('_data', new BsonInt32(3)),
+                                                   new BsonDocument('_data', new BsonInt32(3))]
+
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, codec, resumeToken)
+
+        expect:
+        cursor.getResumeToken() == resumeToken
+        cursor.next()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(1))
+        cursor.next()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(2))
+        cursor.next()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(3))
+    }
+
+    def 'should get cached resume token after tryNext'() {
+        given:
+        def firstBatch = [RawBsonDocument.parse('{ _id: { _data: 1 }, x: 1 }'),
+                          RawBsonDocument.parse('{ _id: { _data: 2 }, x: 1 }')]
+        def secondBatch = [RawBsonDocument.parse('{ _id: { _data: 3 }, x: 2 }')]
+
+        def batchCursor = Stub(AggregateResponseBatchCursor)
+        def codec = new RawBsonDocumentCodec();
+        def resumeToken = new BsonDocument('_data', new BsonInt32(1))
+
+        batchCursor.hasNext() >>> [true, true, true, false]
+        batchCursor.tryNext() >>> [firstBatch, null, secondBatch, null]
+        batchCursor.getPostBatchResumeToken() >>> [new BsonDocument('_data', new BsonInt32(2)),
+                                                   new BsonDocument('_data', new BsonInt32(2)),
+                                                   new BsonDocument('_data', new BsonInt32(2)),
+                                                   new BsonDocument('_data', new BsonInt32(2)),
+                                                   new BsonDocument('_data', new BsonInt32(3)),
+                                                   new BsonDocument('_data', new BsonInt32(3)),
+                                                   new BsonDocument('_data', new BsonInt32(3))]
+
+        def cursor = new MongoChangeStreamCursorImpl(batchCursor, codec, resumeToken)
+
+        expect:
+        cursor.getResumeToken() == resumeToken
+        cursor.tryNext()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(1))
+        cursor.tryNext()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(2))
+        !cursor.tryNext()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(2))
+        cursor.tryNext()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(3))
+        !cursor.tryNext()
+        cursor.getResumeToken() == new BsonDocument('_data', new BsonInt32(3))
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy
new file mode 100644
index 00000000000..9bb8ef2ba3f
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoCollectionSpecification.groovy
@@ -0,0 +1,1601 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.MongoBulkWriteException
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoException
+import com.mongodb.MongoNamespace
+import com.mongodb.MongoWriteConcernException
+import com.mongodb.MongoWriteException
+import com.mongodb.ReadConcern
+import com.mongodb.ServerAddress
+import com.mongodb.WriteConcern
+import com.mongodb.WriteConcernResult
+import com.mongodb.WriteError
+import com.mongodb.bulk.DeleteRequest
+import com.mongodb.bulk.IndexRequest
+import com.mongodb.bulk.InsertRequest
+import com.mongodb.bulk.UpdateRequest
+import com.mongodb.client.ClientSession
+import com.mongodb.client.ImmutableDocument
+import com.mongodb.client.ImmutableDocumentCodecProvider
+import com.mongodb.client.model.AggregationLevel
+import com.mongodb.client.model.BulkWriteOptions
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CountOptions
+import com.mongodb.client.model.CreateIndexOptions
+import com.mongodb.client.model.DeleteManyModel
+import com.mongodb.client.model.DeleteOneModel
+import com.mongodb.client.model.DeleteOptions
+import com.mongodb.client.model.DropIndexOptions
+import com.mongodb.client.model.EstimatedDocumentCountOptions
+import com.mongodb.client.model.FindOneAndDeleteOptions
+import com.mongodb.client.model.FindOneAndReplaceOptions
+import com.mongodb.client.model.FindOneAndUpdateOptions
+import com.mongodb.client.model.IndexModel
+import com.mongodb.client.model.IndexOptions
+import com.mongodb.client.model.InsertManyOptions
+import com.mongodb.client.model.InsertOneModel
+import com.mongodb.client.model.InsertOneOptions
+import com.mongodb.client.model.RenameCollectionOptions
+import com.mongodb.client.model.ReplaceOneModel
+import com.mongodb.client.model.ReplaceOptions
+import com.mongodb.client.model.UpdateManyModel
+import com.mongodb.client.model.UpdateOneModel
+import com.mongodb.client.model.UpdateOptions
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import com.mongodb.client.result.DeleteResult
+import com.mongodb.client.result.UpdateResult
+import com.mongodb.client.test.Worker
+import com.mongodb.internal.client.model.CountStrategy
+import com.mongodb.operation.BatchCursor
+import com.mongodb.operation.CountOperation
+import com.mongodb.operation.CreateIndexesOperation
+import com.mongodb.operation.DropCollectionOperation
+import com.mongodb.operation.DropIndexOperation
+import com.mongodb.operation.FindAndDeleteOperation
+import com.mongodb.operation.FindAndReplaceOperation
+import com.mongodb.operation.FindAndUpdateOperation
+import com.mongodb.operation.ListIndexesOperation
+import com.mongodb.operation.MixedBulkWriteOperation
+import com.mongodb.operation.RenameCollectionOperation
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.Document
+import org.bson.codecs.BsonDocumentCodec
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodec
+import org.bson.codecs.ValueCodecProvider
+import org.bson.codecs.configuration.CodecConfigurationException
+import org.bson.codecs.configuration.CodecRegistries
+import org.bson.conversions.Bson
+import org.bson.internal.OverridableUuidRepresentationCodecRegistry
+import spock.lang.Specification
+
+import java.util.concurrent.TimeUnit
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.ReadPreference.secondary
+import static com.mongodb.WriteConcern.ACKNOWLEDGED
+import static com.mongodb.WriteConcern.UNACKNOWLEDGED
+import static com.mongodb.bulk.BulkWriteResult.acknowledged
+import static com.mongodb.bulk.BulkWriteResult.unacknowledged
+import static com.mongodb.bulk.WriteRequest.Type.DELETE
+import static com.mongodb.bulk.WriteRequest.Type.INSERT
+import static com.mongodb.bulk.WriteRequest.Type.REPLACE
+import static com.mongodb.bulk.WriteRequest.Type.UPDATE
+import static com.mongodb.client.internal.TestHelper.execute
+import static java.util.concurrent.TimeUnit.MILLISECONDS
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+@SuppressWarnings('ClassSize')
+class MongoCollectionSpecification extends Specification {
+
+    def namespace = new MongoNamespace('databaseName', 'collectionName')
+    def codecRegistry = MongoClientSettings.getDefaultCodecRegistry()
+    def readPreference = secondary()
+    def readConcern = ReadConcern.MAJORITY
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should return the correct name from getName'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, JAVA_LEGACY, new TestOperationExecutor([null]))
+
+        expect:
+        collection.getNamespace() == namespace
+    }
+
+    def 'should behave correctly when using withDocumentClass'() {
+        given:
+        def newClass = Worker
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor).withDocumentClass(newClass)
+
+        then:
+        collection.getDocumentClass() == newClass
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, newClass, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor))
+    }
+
+    def 'should behave correctly when using withCodecRegistry'() {
+        given:
+        def newCodecRegistry = fromProviders(new ValueCodecProvider())
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor).withCodecRegistry(newCodecRegistry)
+
+        then:
+        collection.getCodecRegistry() == newCodecRegistry
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, newCodecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor))
+
+        when:
+        collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, STANDARD, executor).withCodecRegistry(newCodecRegistry)
+
+        then:
+        collection.getCodecRegistry() instanceof OverridableUuidRepresentationCodecRegistry
+        (collection.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).uuidRepresentation == STANDARD
+        (collection.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).wrapped == newCodecRegistry
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, collection.getCodecRegistry(), readPreference,
+                ACKNOWLEDGED, true, true, readConcern, STANDARD, executor))
+    }
+
+    def 'should behave correctly when using withReadPreference'() {
+        given:
+        def newReadPreference = primary()
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor).withReadPreference(newReadPreference)
+
+        then:
+        collection.getReadPreference() == newReadPreference
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, newReadPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor))
+    }
+
+    def 'should behave correctly when using withWriteConcern'() {
+        given:
+        def newWriteConcern = WriteConcern.MAJORITY
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor).withWriteConcern(newWriteConcern)
+
+        then:
+        collection.getWriteConcern() == newWriteConcern
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, newWriteConcern,
+                true, true, readConcern, JAVA_LEGACY, executor))
+    }
+
+    def 'should behave correctly when using withReadConcern'() {
+        given:
+        def newReadConcern = ReadConcern.MAJORITY
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor).withReadConcern(newReadConcern)
+
+        then:
+        collection.getReadConcern() == newReadConcern
+        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, newReadConcern, JAVA_LEGACY, executor))
+    }
+
+    def 'should use CountOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor([1L, 2L, 3L])
+        def filter = new BsonDocument()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new CountOperation(namespace)
+                .filter(filter)
+                .retryReads(true)
+
+        def countMethod = collection.&count
+
+        when:
+        execute(countMethod, session)
+        def operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation)
+
+        when:
+        filter = new BsonDocument('a', new BsonInt32(1))
+        execute(countMethod, session, filter)
+        operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.filter(filter))
+
+        when:
+        def hint = new BsonDocument('hint', new BsonInt32(1))
+        execute(countMethod, session, filter, new CountOptions().hint(hint).skip(10).limit(100)
+                .maxTime(100, MILLISECONDS).collation(collation))
+        operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.filter(filter).hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS)
+                .collation(collation))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use CountOperation correctly with documentCount'() {
+        given:
+        def executor = new TestOperationExecutor([1L, 2L, 3L, 4L])
+        def filter = new BsonDocument()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new CountOperation(namespace, CountStrategy.AGGREGATE).filter(filter).retryReads(true)
+
+        def countMethod = collection.&countDocuments
+
+        when:
+        execute(countMethod, session)
+        def operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation)
+
+        when:
+        filter = new BsonDocument('a', new BsonInt32(1))
+        execute(countMethod, session, filter)
+        operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.filter(filter))
+
+        when:
+        def hint = new BsonDocument('hint', new BsonInt32(1))
+        execute(countMethod, session, filter, new CountOptions().hint(hint).skip(10).limit(100)
+                .maxTime(100, MILLISECONDS).collation(collation))
+        operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.filter(filter).hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS)
+                .collation(collation))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use CountOperation correctly with estimatedDocumentCount'() {
+        given:
+        def executor = new TestOperationExecutor([1L, 2L])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED, true,
+                true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new CountOperation(namespace, CountStrategy.COMMAND).filter(new BsonDocument())
+                .retryReads(true)
+
+        def countMethod = collection.&estimatedDocumentCount
+
+        when:
+        execute(countMethod, session)
+        def operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation)
+
+        when:
+        execute(countMethod, session, new EstimatedDocumentCountOptions().maxTime(100, MILLISECONDS))
+        operation = executor.getReadOperation() as CountOperation
+
+        then:
+        executor.getClientSession() == session
+        expect operation, isTheSameAs(expectedOperation.maxTime(100, MILLISECONDS))
+
+        where:
+        session << [null]
+    }
+
+    def 'should create DistinctIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def filter = new Document('a', 1)
+        def distinctMethod = collection.&distinct
+
+        when:
+        def distinctIterable = execute(distinctMethod, session, 'field', String)
+
+        then:
+        expect distinctIterable, isTheSameAs(MongoIterables.distinctOf(session, namespace, Document, String,
+                codecRegistry, readPreference, readConcern, executor, 'field', new BsonDocument(), true))
+
+        when:
+        distinctIterable = execute(distinctMethod, session, 'field', String).filter(filter)
+
+        then:
+        expect distinctIterable, isTheSameAs(MongoIterables.distinctOf(session, namespace, Document, String, codecRegistry, readPreference,
+                readConcern, executor, 'field', filter, true))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should create FindIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def findMethod = collection.&find
+
+        when:
+        def findIterable = execute(findMethod, session)
+
+        then:
+        expect findIterable, isTheSameAs(MongoIterables.findOf(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern, executor, new BsonDocument(), true))
+
+        when:
+        findIterable = execute(findMethod, session, BsonDocument)
+
+        then:
+        expect findIterable, isTheSameAs(MongoIterables.findOf(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, executor, new BsonDocument(), true))
+
+        when:
+        findIterable = execute(findMethod, session, new Document())
+
+        then:
+        expect findIterable, isTheSameAs(MongoIterables.findOf(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern, executor, new Document(), true))
+
+        when:
+        findIterable = execute(findMethod, session, new Document(), BsonDocument)
+
+        then:
+        expect findIterable, isTheSameAs(MongoIterables.findOf(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, executor, new Document(), true))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should create AggregateIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def aggregateMethod = collection.&aggregate
+
+        when:
+        def aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect aggregateIterable, isTheSameAs(MongoIterables.aggregateOf(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, [new Document('$match', 1)], AggregationLevel.COLLECTION, true))
+
+        when:
+        aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect aggregateIterable, isTheSameAs(MongoIterables.aggregateOf(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, [new Document('$match', 1)], AggregationLevel.COLLECTION, true))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the aggregation pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+
+        when:
+        collection.aggregate(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.aggregate([null]).into([])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should create ChangeStreamIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def watchMethod = collection.&watch
+
+        when:
+        def changeStreamIterable = execute(watchMethod, session)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [], Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], BsonDocument, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the ChangeStreamIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+
+        when:
+        collection.watch((Class) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.watch([null]).into([])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should create MapReduceIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def mapReduceMethod = collection.&mapReduce
+
+        when:
+        def mapReduceIterable = execute(mapReduceMethod, session, 'map', 'reduce')
+
+        then:
+        expect mapReduceIterable, isTheSameAs(MongoIterables.mapReduceOf(session, namespace, Document, Document, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, 'map', 'reduce'))
+
+
+        when:
+        mapReduceIterable = execute(mapReduceMethod, session, 'map', 'reduce', BsonDocument)
+
+        then:
+        expect mapReduceIterable, isTheSameAs(MongoIterables.mapReduceOf(session, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern,  ACKNOWLEDGED, executor, 'map', 'reduce'))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'bulkWrite should use MixedBulkWriteOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, []) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, BsonDocument, codecRegistry, readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation, List<Bson> arrayFilters ->
+            new MixedBulkWriteOperation(namespace, [
+                    new InsertRequest(BsonDocument.parse('{_id: 1}')),
+                    new UpdateRequest(BsonDocument.parse('{a: 2}'), BsonDocument.parse('{a: 200}'), REPLACE)
+                            .multi(false).upsert(true).collation(collation),
+                    new UpdateRequest(BsonDocument.parse('{a: 3}'), BsonDocument.parse('{$set: {a: 1}}'), UPDATE)
+                            .multi(false).upsert(true).collation(collation).arrayFilters(arrayFilters),
+                    new UpdateRequest(BsonDocument.parse('{a: 4}'), BsonDocument.parse('{$set: {a: 1}}'), UPDATE).multi(true)
+                            .upsert(true).collation(collation).arrayFilters(arrayFilters),
+                    new DeleteRequest(BsonDocument.parse('{a: 5}')).multi(false),
+                    new DeleteRequest(BsonDocument.parse('{a: 6}')).multi(true).collation(collation)
+            ], ordered, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation)
+        }
+        def updateOptions = new UpdateOptions().upsert(true).collation(collation).arrayFilters(arrayFilters)
+        def replaceOptions = new ReplaceOptions().upsert(true).collation(collation)
+        def deleteOptions = new DeleteOptions().collation(collation)
+        def bulkOperations = [new InsertOneModel(BsonDocument.parse('{_id: 1}')),
+                              new ReplaceOneModel(BsonDocument.parse('{a: 2}'), BsonDocument.parse('{a: 200}'), replaceOptions),
+                              new UpdateOneModel(BsonDocument.parse('{a: 3}'), BsonDocument.parse('{$set: {a: 1}}'), updateOptions),
+                              new UpdateManyModel(BsonDocument.parse('{a: 4}'), BsonDocument.parse('{$set: {a: 1}}'), updateOptions),
+                              new DeleteOneModel(BsonDocument.parse('{a: 5}')),
+                              new DeleteManyModel(BsonDocument.parse('{a: 6}'), deleteOptions)]
+        def bulkWriteMethod = collection.&bulkWrite
+
+        when:
+        def result = execute(bulkWriteMethod, session, bulkOperations)
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, null, arrayFilters))
+
+        when:
+        result = execute(bulkWriteMethod, session, bulkOperations, new BulkWriteOptions().ordered(true).bypassDocumentValidation(true))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true, arrayFilters))
+
+        when:
+        result = execute(bulkWriteMethod, session, bulkOperations, new BulkWriteOptions().ordered(false).bypassDocumentValidation(false))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, false, arrayFilters))
+
+        where:
+        [writeConcern, arrayFilters, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'should handle exceptions in bulkWrite correctly'() {
+        given:
+        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
+        def executor = new TestOperationExecutor([new MongoException('failure')])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+
+        when:
+        collection.bulkWrite(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.bulkWrite([null])
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when: 'a codec is missing its acceptable to immediately throw'
+        collection.bulkWrite([new InsertOneModel(new Document('_id', 1))])
+
+        then:
+        thrown(CodecConfigurationException)
+    }
+
+    def 'insertOne should use MixedBulkWriteOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, []) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = { WriteConcern wc, Boolean bypassDocumentValidation ->
+            new MixedBulkWriteOperation(namespace, [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))],
+                    true, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation)
+        }
+        def insertOneMethod = collection.&insertOne
+
+        when:
+        execute(insertOneMethod, session, new Document('_id', 1))
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(writeConcern, null))
+        executor.getClientSession() == session
+
+        when:
+        execute(insertOneMethod, session, new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(true))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(writeConcern, true))
+        executor.getClientSession() == session
+
+        when:
+        execute(insertOneMethod, session, new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(false))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(writeConcern, false))
+        executor.getClientSession() == session
+
+        where:
+        [writeConcern, session, retryWrites, retryReads] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'insertMany should use MixedBulkWriteOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? acknowledged(INSERT, 0, []) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation ->
+            new MixedBulkWriteOperation(namespace,
+                    [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
+                     new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))],
+                    ordered, wc, retryWrites).bypassDocumentValidation(bypassDocumentValidation)
+        }
+        def insertManyMethod = collection.&insertMany
+
+        when:
+        execute(insertManyMethod, session, [new Document('_id', 1), new Document('_id', 2)])
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, null))
+        executor.getClientSession() == session
+
+        when:
+        execute(insertManyMethod, session, [new Document('_id', 1), new Document('_id', 2)],
+                new InsertManyOptions().ordered(true).bypassDocumentValidation(true))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
+        executor.getClientSession() == session
+
+        when:
+        execute(insertManyMethod, session, [new Document('_id', 1), new Document('_id', 2)],
+                new InsertManyOptions().ordered(false).bypassDocumentValidation(false))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, false))
+        executor.getClientSession() == session
+
+        where:
+        [writeConcern, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'should validate the insertMany data correctly'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, Stub(OperationExecutor))
+
+        when:
+        collection.insertMany(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.insertMany([null])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'deleteOne should use MixedBulkWriteOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(DELETE, 1, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? DeleteResult.acknowledged(1) : DeleteResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def deleteOneMethod = collection.&deleteOne
+
+        when:
+        def result = execute(deleteOneMethod, session, new Document('_id', 1))
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(false)],
+                true, writeConcern, retryWrites))
+        result == expectedResult
+        executor.getClientSession() == session
+
+        when:
+        result = execute(deleteOneMethod, session, new Document('_id', 1), new DeleteOptions().collation(collation))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(false).collation(collation)],
+                true, writeConcern, retryWrites))
+        result == expectedResult
+        executor.getClientSession() == session
+
+        where:
+        [writeConcern, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'deleteOne should translate BulkWriteException correctly'() {
+        given:
+        def bulkWriteException = new MongoBulkWriteException(acknowledged(0, 0, 1, null, []), [],
+                                                             new com.mongodb.bulk.WriteConcernError(100, '', new BsonDocument()),
+                                                             new ServerAddress())
+
+        def executor = new TestOperationExecutor([bulkWriteException])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+
+        when:
+        collection.deleteOne(new Document('_id', 1))
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError == bulkWriteException.writeConcernError
+        ex.writeResult.wasAcknowledged()
+        ex.writeResult.count == 1
+        !ex.writeResult.updateOfExisting
+        ex.writeResult.upsertedId == null
+    }
+
+    def 'deleteMany should use MixedBulkWriteOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(DELETE, 1, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? DeleteResult.acknowledged(1) : DeleteResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def deleteManyMethod = collection.&deleteMany
+
+        when:
+        def result = execute(deleteManyMethod, session, new Document('_id', 1))
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(true)],
+                true, writeConcern, retryWrites))
+        result == expectedResult
+
+        when:
+        result = execute(deleteManyMethod, session, new Document('_id', 1), new DeleteOptions().collation(collation))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        result.wasAcknowledged() == writeConcern.isAcknowledged()
+        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
+                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1))).multi(true).collation(collation)],
+                true, writeConcern, retryWrites))
+        result == expectedResult
+
+        where:
+        [writeConcern, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'replaceOne should use MixedBulkWriteOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ?
+                    acknowledged(REPLACE, 1, modifiedCount,
+                            upsertedId == null ? [] : [new com.mongodb.bulk.BulkWriteUpsert(0, upsertedId)]) :
+                    unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ?
+                UpdateResult.acknowledged(1, modifiedCount, upsertedId) : UpdateResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+
+        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation ->
+            new MixedBulkWriteOperation(namespace,
+                    [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), REPLACE)
+                             .collation(collation).upsert(upsert)], true, wc, retryWrites)
+                    .bypassDocumentValidation(bypassDocumentValidation)
+        }
+        def replaceOneMethod = collection.&replaceOne
+
+        when:
+        def result = execute(replaceOneMethod, session, new Document('a', 1), new Document('a', 10),
+                new UpdateOptions().bypassDocumentValidation(bypassDocumentValidation))
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, bypassDocumentValidation, null))
+        executor.getClientSession() == session
+        result == expectedResult
+
+        when:
+        result = execute(replaceOneMethod, session, new Document('a', 1), new Document('a', 10),
+                new ReplaceOptions().upsert(true).bypassDocumentValidation(bypassDocumentValidation).collation(collation))
+        executor.getClientSession() == session
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, bypassDocumentValidation, collation))
+        result == expectedResult
+
+        where:
+        [bypassDocumentValidation, modifiedCount, upsertedId, writeConcern, session, retryWrites] << [
+                [null, true, false],
+                [1],
+                [null, new BsonInt32(42)],
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'replaceOne should translate BulkWriteException correctly'() {
+        given:
+        def bulkWriteException = new MongoBulkWriteException(bulkWriteResult, [],
+                                                             new com.mongodb.bulk.WriteConcernError(100, '', new BsonDocument()),
+                                                             new ServerAddress())
+
+        def executor = new TestOperationExecutor([bulkWriteException])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+
+        when:
+        collection.replaceOne(new Document('_id', 1), new Document('_id', 1))
+
+        then:
+        def ex = thrown(MongoWriteConcernException)
+        ex.writeConcernError == bulkWriteException.writeConcernError
+        ex.writeResult.wasAcknowledged() == writeResult.wasAcknowledged()
+        ex.writeResult.count == writeResult.count
+        ex.writeResult.updateOfExisting == writeResult.updateOfExisting
+        ex.writeResult.upsertedId == writeResult.upsertedId
+
+        where:
+        bulkWriteResult                                                           | writeResult
+        acknowledged(0, 1, 0, 1, [])                                              | WriteConcernResult.acknowledged(1, true, null)
+        acknowledged(0, 0, 0, 0,
+                     [new com.mongodb.bulk.BulkWriteUpsert(0, new BsonInt32(1))]) | WriteConcernResult.acknowledged(1, false,
+                                                                                                                    new BsonInt32(1))
+    }
+
+    def 'updateOne should use MixedBulkWriteOperationOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(UPDATE, 1, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? UpdateResult.acknowledged(1, 0, null) : UpdateResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation,
+            List<Bson> arrayFilters ->
+            new MixedBulkWriteOperation(namespace,
+                    [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), UPDATE)
+                             .multi(false).upsert(upsert).collation(collation).arrayFilters(arrayFilters)], true, wc, retryWrites)
+                    .bypassDocumentValidation(bypassDocumentValidation)
+        }
+        def updateOneMethod = collection.&updateOne
+
+        when:
+        def result = execute(updateOneMethod, session, new Document('a', 1), new Document('a', 10))
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null, null, null))
+        executor.getClientSession() == session
+        result == expectedResult
+
+        when:
+        result = execute(updateOneMethod, session, new Document('a', 1), new Document('a', 10),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true).collation(collation)
+                        .arrayFilters(arrayFilters))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true, collation, arrayFilters))
+        executor.getClientSession() == session
+        result == expectedResult
+
+        where:
+        [writeConcern, arrayFilters, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'updateMany should use MixedBulkWriteOperationOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..2).collect {
+            writeConcern.isAcknowledged() ? acknowledged(UPDATE, 5, 3, []) : unacknowledged()
+        })
+        def expectedResult = writeConcern.isAcknowledged() ? UpdateResult.acknowledged(5, 3, null) : UpdateResult.unacknowledged()
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation, Collation collation,
+                                  List<Bson> arrayFilters ->
+            new MixedBulkWriteOperation(namespace,
+                    [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)), new BsonDocument('a', new BsonInt32(10)), UPDATE)
+                             .multi(true).upsert(upsert).collation(collation).arrayFilters(arrayFilters)], true, wc, retryWrites)
+                    .bypassDocumentValidation(bypassDocumentValidation)
+        }
+        def updateManyMethod = collection.&updateMany
+
+        when:
+        def result = execute(updateManyMethod, session, new Document('a', 1), new Document('a', 10))
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null, null, null))
+        result == expectedResult
+
+        when:
+        result = execute(updateManyMethod, session, new Document('a', 1), new Document('a', 10),
+                new UpdateOptions().upsert(true).bypassDocumentValidation(true).collation(collation)
+                        .arrayFilters(arrayFilters))
+        operation = executor.getWriteOperation() as MixedBulkWriteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true, collation, arrayFilters))
+        result == expectedResult
+
+        where:
+        [writeConcern, arrayFilters, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'should translate MongoBulkWriteException to MongoWriteException'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+
+        when:
+        collection.insertOne(new Document('_id', 1))
+
+        then:
+        def e = thrown(MongoWriteException)
+        e.error == new WriteError(11000, 'oops', new BsonDocument())
+
+        where:
+        executor << new TestOperationExecutor([new MongoBulkWriteException(acknowledged(INSERT, 1, []),
+                [new com.mongodb.bulk.BulkWriteError(11000, 'oops',
+                        new BsonDocument(), 0)],
+                null, new ServerAddress())])
+    }
+
+    def 'should translate MongoBulkWriteException to MongoWriteConcernException'() {
+        given:
+        def executor = new TestOperationExecutor([new MongoBulkWriteException(acknowledged(INSERT, 1, []), [],
+                new com.mongodb.bulk.WriteConcernError(42, 'oops',
+                        new BsonDocument()),
+                new ServerAddress())])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+
+        when:
+        collection.insertOne(new Document('_id', 1))
+
+        then:
+        def e = thrown(MongoWriteConcernException)
+        e.writeConcernError == new com.mongodb.bulk.WriteConcernError(42, 'oops', new BsonDocument())
+    }
+
+    def 'should use FindOneAndDeleteOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..4).collect {
+            writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, ACKNOWLEDGED,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new FindAndDeleteOperation(namespace, ACKNOWLEDGED, retryWrites,  new DocumentCodec())
+                .filter(new BsonDocument('a', new BsonInt32(1)))
+        def findOneAndDeleteMethod = collection.&findOneAndDelete
+
+        when:
+        execute(findOneAndDeleteMethod, session, new Document('a', 1))
+        def operation = executor.getWriteOperation() as FindAndDeleteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+
+        when:
+        execute(findOneAndDeleteMethod, session, new Document('a', 1),
+                new FindOneAndDeleteOptions().projection(new Document('projection', 1))
+                        .maxTime(100, MILLISECONDS).collation(collation))
+        operation = executor.getWriteOperation() as FindAndDeleteOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
+                .maxTime(100, MILLISECONDS).collation(collation))
+
+        where:
+        [writeConcern, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'should use FindOneAndReplaceOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : WriteConcernResult.unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new FindAndReplaceOperation(namespace, writeConcern, retryWrites, new DocumentCodec(),
+                new BsonDocument('a', new BsonInt32(10))).filter(new BsonDocument('a', new BsonInt32(1)))
+        def findOneAndReplaceMethod = collection.&findOneAndReplace
+
+        when:
+        execute(findOneAndReplaceMethod, session, new Document('a', 1), new Document('a', 10))
+        def operation = executor.getWriteOperation() as FindAndReplaceOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+
+        when:
+        execute(findOneAndReplaceMethod, session, new Document('a', 1), new Document('a', 10),
+                new FindOneAndReplaceOptions().projection(new Document('projection', 1))
+                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
+        operation = executor.getWriteOperation() as FindAndReplaceOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
+                .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
+
+        when:
+        execute(findOneAndReplaceMethod, session, new Document('a', 1), new Document('a', 10),
+                new FindOneAndReplaceOptions().projection(new Document('projection', 1))
+                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(true).collation(collation))
+        operation = executor.getWriteOperation() as FindAndReplaceOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
+                .maxTime(100, MILLISECONDS).bypassDocumentValidation(true).collation(collation))
+
+        where:
+        [writeConcern, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, Stub(ClientSession)],
+                [true, false]
+        ].combinations()
+    }
+
+    def 'should use FindAndUpdateOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor((1..3).collect {
+            writeConcern.isAcknowledged() ? WriteConcernResult.acknowledged(1, true, null) : unacknowledged()
+        })
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry,  readPreference, writeConcern,
+                retryWrites, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, retryWrites, new DocumentCodec(),
+                new BsonDocument('a', new BsonInt32(10))).filter(new BsonDocument('a', new BsonInt32(1)))
+        def findOneAndUpdateMethod = collection.&findOneAndUpdate
+
+        when:
+        execute(findOneAndUpdateMethod, session, new Document('a', 1), new Document('a', 10))
+        def operation = executor.getWriteOperation() as FindAndUpdateOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+
+        when:
+        execute(findOneAndUpdateMethod, session, new Document('a', 1), new Document('a', 10),
+                new FindOneAndUpdateOptions().projection(new Document('projection', 1)).maxTime(100, MILLISECONDS)
+                        .bypassDocumentValidation(bypassDocumentValidation).collation(collation).arrayFilters(arrayFilters))
+        operation = executor.getWriteOperation() as FindAndUpdateOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
+                .maxTime(100, MILLISECONDS).bypassDocumentValidation(bypassDocumentValidation).collation(collation)
+                .arrayFilters(arrayFilters))
+
+        where:
+        [writeConcern, arrayFilters, bypassDocumentValidation, session, retryWrites] << [
+                [ACKNOWLEDGED, UNACKNOWLEDGED],
+                [null, [], [new BsonDocument('a.b', new BsonInt32(42))]],
+                [true, false],
+                [null, Stub(ClientSession)],
+                [true, false],
+        ].combinations()
+   }
+
+    def 'should use DropCollectionOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor([null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new DropCollectionOperation(namespace, ACKNOWLEDGED)
+        def dropMethod = collection.&drop
+
+        when:
+        execute(dropMethod, session)
+        def operation = executor.getWriteOperation() as DropCollectionOperation
+        executor.getClientSession() == session
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use CreateIndexOperations correctly'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def createIndexMethod = collection.&createIndex
+        def createIndexesMethod = collection.&createIndexes
+
+        when:
+        def expectedOperation = new CreateIndexesOperation(namespace,
+                [new IndexRequest(new BsonDocument('key', new BsonInt32(1)))], ACKNOWLEDGED)
+        def indexName = execute(createIndexMethod, session, new Document('key', 1))
+        def operation = executor.getWriteOperation() as CreateIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        indexName == 'key_1'
+
+        when:
+        expectedOperation = new CreateIndexesOperation(namespace,
+                [new IndexRequest(new BsonDocument('key', new BsonInt32(1))),
+                 new IndexRequest(new BsonDocument('key1', new BsonInt32(1)))], ACKNOWLEDGED)
+        def indexNames = execute(createIndexesMethod, session, [new IndexModel(new Document('key', 1)),
+                                                                                       new IndexModel(new Document('key1', 1))])
+        operation = executor.getWriteOperation() as CreateIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+        indexNames == ['key_1', 'key1_1']
+
+        when:
+        expectedOperation = expectedOperation.maxTime(10, MILLISECONDS)
+        indexNames = execute(createIndexesMethod, session,
+                [new IndexModel(new Document('key', 1)), new IndexModel(new Document('key1', 1))],
+                new CreateIndexOptions().maxTime(10, MILLISECONDS))
+        operation = executor.getWriteOperation() as CreateIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+        indexNames == ['key_1', 'key1_1']
+
+        when:
+        expectedOperation = new CreateIndexesOperation(namespace,
+                [new IndexRequest(new BsonDocument('key', new BsonInt32(1)))
+                         .background(true)
+                         .unique(true)
+                         .sparse(true)
+                         .name('aIndex')
+                         .expireAfter(100, TimeUnit.SECONDS)
+                         .version(1)
+                         .weights(new BsonDocument('a', new BsonInt32(1000)))
+                         .defaultLanguage('es')
+                         .languageOverride('language')
+                         .textVersion(1)
+                         .sphereVersion(2)
+                         .bits(1)
+                         .min(-180.0)
+                         .max(180.0)
+                         .bucketSize(200.0)
+                         .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
+                         .partialFilterExpression(BsonDocument.parse('{status: "active"}'))
+                         .collation(collation)
+                         .wildcardProjection(new BsonDocument('a', new BsonInt32(1)))
+                ], ACKNOWLEDGED)
+        indexName = execute(createIndexMethod, session, new Document('key', 1), new IndexOptions()
+                .background(true)
+                .unique(true)
+                .sparse(true)
+                .name('aIndex')
+                .expireAfter(100, TimeUnit.SECONDS)
+                .version(1)
+                .weights(new BsonDocument('a', new BsonInt32(1000)))
+                .defaultLanguage('es')
+                .languageOverride('language')
+                .textVersion(1)
+                .sphereVersion(2)
+                .bits(1)
+                .min(-180.0)
+                .max(180.0)
+                .bucketSize(200.0)
+                .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
+                .partialFilterExpression(BsonDocument.parse('{status: "active"}'))
+                .collation(collation)
+                .wildcardProjection(new BsonDocument('a', new BsonInt32(1))))
+        operation = executor.getWriteOperation() as CreateIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+        indexName == 'aIndex'
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the createIndexes data correctly'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, Stub(OperationExecutor))
+
+        when:
+        collection.createIndexes(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.createIndexes([null])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should use ListIndexesOperations correctly'() {
+        given:
+        def batchCursor = Stub(BatchCursor)
+        def executor = new TestOperationExecutor([batchCursor, batchCursor, batchCursor])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def listIndexesMethod = collection.&listIndexes
+
+        when:
+        execute(listIndexesMethod, session).into([])
+        def operation = executor.getReadOperation() as ListIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()).retryReads(true))
+        executor.getClientSession() == session
+
+        when:
+        def indexes = execute(listIndexesMethod, session, BsonDocument).into([])
+        operation = executor.getReadOperation() as ListIndexesOperation
+        indexes == []
+
+        then:
+        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new BsonDocumentCodec()).retryReads(true))
+        executor.getClientSession() == session
+
+        when:
+        execute(listIndexesMethod, session).batchSize(10).maxTime(10, MILLISECONDS).iterator()
+        operation = executor.getReadOperation() as ListIndexesOperation
+
+        then:
+        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()).batchSize(10)
+                .maxTime(10, MILLISECONDS).retryReads(true))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use DropIndexOperation correctly for dropIndex'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def dropIndexMethod = collection.&dropIndex
+
+        when:
+        def expectedOperation = new DropIndexOperation(namespace, 'indexName', ACKNOWLEDGED)
+        execute(dropIndexMethod, session, 'indexName')
+        def operation = executor.getWriteOperation() as DropIndexOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        when:
+        def keys = new BsonDocument('x', new BsonInt32(1))
+        expectedOperation = new DropIndexOperation(namespace, keys, ACKNOWLEDGED)
+        execute(dropIndexMethod, session, keys)
+        operation = executor.getWriteOperation() as DropIndexOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        when:
+        expectedOperation = expectedOperation.maxTime(10, MILLISECONDS)
+        execute(dropIndexMethod, session, keys, new DropIndexOptions().maxTime(10, MILLISECONDS))
+        operation = executor.getWriteOperation() as DropIndexOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use DropIndexOperation correctly for dropIndexes'() {
+        given:
+        def executor = new TestOperationExecutor([null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def expectedOperation = new DropIndexOperation(namespace, '*', ACKNOWLEDGED)
+        def dropIndexesMethod = collection.&dropIndexes
+
+        when:
+        execute(dropIndexesMethod, session)
+        def operation = executor.getWriteOperation() as DropIndexOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        when:
+        expectedOperation = expectedOperation.maxTime(10, MILLISECONDS)
+        execute(dropIndexesMethod, session, new DropIndexOptions().maxTime(10, MILLISECONDS))
+        operation = executor.getWriteOperation() as DropIndexOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use RenameCollectionOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor([null, null])
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def newNamespace = new MongoNamespace(namespace.getDatabaseName(), 'newName')
+        def renameCollectionOptions = new RenameCollectionOptions().dropTarget(dropTarget)
+        def expectedOperation = new RenameCollectionOperation(namespace, newNamespace, ACKNOWLEDGED)
+        def renameCollection = collection.&renameCollection
+
+        when:
+        execute(renameCollection, session, newNamespace)
+        def operation = executor.getWriteOperation() as RenameCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation)
+        executor.getClientSession() == session
+
+        when:
+        execute(renameCollection, session, newNamespace, renameCollectionOptions)
+        operation = executor.getWriteOperation() as RenameCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.dropTarget(dropTarget))
+        executor.getClientSession() == session
+
+        where:
+        [session, dropTarget] << [[null, Stub(ClientSession)], [true, false]].combinations()
+    }
+
+    def 'should not expect to mutate the document when inserting'() {
+        given:
+        def executor = new TestOperationExecutor([null])
+        def customCodecRegistry = CodecRegistries.fromRegistries(fromProviders(new ImmutableDocumentCodecProvider()), codecRegistry)
+        def collection = new MongoCollectionImpl(namespace, ImmutableDocument, customCodecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def document = new ImmutableDocument(['a': 1])
+
+        when:
+        collection.insertOne(document)
+
+        then:
+        !document.containsKey('_id')
+
+        when:
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+        def request = operation.writeRequests.get(0) as InsertRequest
+
+        then:
+        request.getDocument().containsKey('_id')
+    }
+
+    def 'should not expect to mutate the document when bulk writing'() {
+        given:
+        def executor = new TestOperationExecutor([null])
+        def customCodecRegistry = CodecRegistries.fromRegistries(fromProviders(new ImmutableDocumentCodecProvider()), codecRegistry)
+        def collection = new MongoCollectionImpl(namespace, ImmutableDocument, customCodecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, executor)
+        def document = new ImmutableDocument(['a': 1])
+
+        when:
+        collection.bulkWrite([new InsertOneModel<ImmutableDocument>(document)])
+
+        then:
+        !document.containsKey('_id')
+
+        when:
+        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
+        def request = operation.writeRequests.get(0) as InsertRequest
+
+        then:
+        request.getDocument().containsKey('_id')
+    }
+
+    def 'should validate the client session correctly'() {
+        given:
+        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
+                true, true, readConcern, JAVA_LEGACY, Stub(OperationExecutor))
+
+        when:
+        collection.aggregate(null, [Document.parse('{$match:{}}')])
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.bulkWrite(null, [new InsertOneModel(new Document())])
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.count((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.createIndex(null, new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.createIndexes(null, [Stub(IndexModel)])
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.deleteMany(null, new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.deleteOne(null, new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.distinct(null, 'field', Document)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.distinct(null, new Document(), Document)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.drop((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.dropIndex(null, 'index')
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.dropIndex(null, new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.dropIndexes((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.find((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.findOneAndDelete(null, new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.findOneAndReplace(null, new Document(), new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.findOneAndUpdate(null, new Document(), new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.insertMany(null, [new Document()])
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.insertOne(null, new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.listIndexes((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.mapReduce(null, '')
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.renameCollection(null, new MongoNamespace('db', 'coll'))
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.replaceOne(null, new Document(), new Document())
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.updateMany(null, new Document(), Document.parse('{$set: {a: 1}}'))
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.updateOne(null, new Document(), Document.parse('{$set: {a: 1}}'))
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        collection.watch((ClientSession) null)
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoDatabaseSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoDatabaseSpecification.groovy
new file mode 100644
index 00000000000..762fb1de075
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoDatabaseSpecification.groovy
@@ -0,0 +1,548 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.client.ClientSession
+import com.mongodb.client.model.AggregationLevel
+import com.mongodb.client.model.Collation
+import com.mongodb.client.model.CreateCollectionOptions
+import com.mongodb.client.model.CreateViewOptions
+import com.mongodb.client.model.IndexOptionDefaults
+import com.mongodb.client.model.ValidationAction
+import com.mongodb.client.model.ValidationLevel
+import com.mongodb.client.model.ValidationOptions
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import com.mongodb.operation.CommandReadOperation
+import com.mongodb.operation.CreateCollectionOperation
+import com.mongodb.operation.CreateViewOperation
+import com.mongodb.operation.DropDatabaseOperation
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.BsonInt32
+import org.bson.Document
+import org.bson.codecs.BsonValueCodecProvider
+import org.bson.codecs.DocumentCodecProvider
+import org.bson.codecs.ValueCodecProvider
+import org.bson.internal.OverridableUuidRepresentationCodecRegistry
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.primary
+import static com.mongodb.ReadPreference.primaryPreferred
+import static com.mongodb.ReadPreference.secondary
+import static com.mongodb.client.internal.TestHelper.execute
+import static org.bson.UuidRepresentation.JAVA_LEGACY
+import static org.bson.UuidRepresentation.STANDARD
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MongoDatabaseSpecification extends Specification {
+
+    def name = 'databaseName'
+    def codecRegistry = MongoClientSettings.getDefaultCodecRegistry()
+    def readPreference = secondary()
+    def writeConcern = WriteConcern.ACKNOWLEDGED
+    def readConcern = ReadConcern.DEFAULT
+    def collation = Collation.builder().locale('en').build()
+
+    def 'should throw IllegalArgumentException if name is invalid'() {
+        when:
+        new MongoDatabaseImpl('a.b', codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY, new
+                TestOperationExecutor([]))
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should throw IllegalArgumentException from getCollection if collectionName is invalid'() {
+        given:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                new TestOperationExecutor([]))
+
+        when:
+        database.getCollection('')
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should return the correct name from getName'() {
+        given:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                new TestOperationExecutor([]))
+
+        expect:
+        database.getName() == name
+    }
+
+    def 'should behave correctly when using withCodecRegistry'() {
+        given:
+        def newCodecRegistry = fromProviders(new ValueCodecProvider())
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+                .withCodecRegistry(newCodecRegistry)
+
+        then:
+        database.getCodecRegistry() == newCodecRegistry
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, newCodecRegistry, readPreference, writeConcern, false, false, readConcern,
+                JAVA_LEGACY, executor))
+
+        when:
+        database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, true, readConcern,
+                STANDARD, executor)
+                .withCodecRegistry(newCodecRegistry)
+
+        then:
+        database.getCodecRegistry() instanceof OverridableUuidRepresentationCodecRegistry
+        (database.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).uuidRepresentation == STANDARD
+        (database.getCodecRegistry() as OverridableUuidRepresentationCodecRegistry).wrapped == newCodecRegistry
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, database.getCodecRegistry(), readPreference, writeConcern,
+                false, true, readConcern, STANDARD, executor))
+    }
+
+    def 'should behave correctly when using withReadPreference'() {
+        given:
+        def newReadPreference = primary()
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+                .withReadPreference(newReadPreference)
+
+        then:
+        database.getReadPreference() == newReadPreference
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, newReadPreference, writeConcern, false, false, readConcern,
+                JAVA_LEGACY, executor))
+    }
+
+    def 'should behave correctly when using withWriteConcern'() {
+        given:
+        def newWriteConcern = WriteConcern.MAJORITY
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+                .withWriteConcern(newWriteConcern)
+
+        then:
+        database.getWriteConcern() == newWriteConcern
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, newWriteConcern, false, false, readConcern,
+                JAVA_LEGACY, executor))
+    }
+
+    def 'should behave correctly when using withReadConcern'() {
+        given:
+        def newReadConcern = ReadConcern.MAJORITY
+        def executor = new TestOperationExecutor([])
+
+        when:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+                .withReadConcern(newReadConcern)
+
+        then:
+        database.getReadConcern() == newReadConcern
+        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, newReadConcern,
+                JAVA_LEGACY, executor))
+    }
+
+    def 'should be able to executeCommand correctly'() {
+        given:
+        def command = new BsonDocument('command', new BsonInt32(1))
+        def executor = new TestOperationExecutor([null, null, null, null])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+        def runCommandMethod = database.&runCommand
+
+        when:
+        TestHelper.execute(runCommandMethod, session, command)
+        def operation = executor.getReadOperation() as CommandReadOperation<Document>
+
+        then:
+        operation.command == command
+        executor.getClientSession() == session
+        executor.getReadPreference() == primary()
+
+        when:
+        TestHelper.execute(runCommandMethod, session, command, primaryPreferred())
+        operation = executor.getReadOperation() as CommandReadOperation<Document>
+
+        then:
+        operation.command == command
+        executor.getClientSession() == session
+        executor.getReadPreference() == primaryPreferred()
+
+        when:
+        TestHelper.execute(runCommandMethod, session, command, BsonDocument)
+        operation = executor.getReadOperation() as CommandReadOperation<BsonDocument>
+
+        then:
+        operation.command == command
+        executor.getClientSession() == session
+        executor.getReadPreference() == primary()
+
+        when:
+        TestHelper.execute(runCommandMethod, session, command, primaryPreferred(), BsonDocument)
+        operation = executor.getReadOperation() as CommandReadOperation<BsonDocument>
+
+        then:
+        operation.command == command
+        executor.getClientSession() == session
+        executor.getReadPreference() == primaryPreferred()
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use DropDatabaseOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor([null])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+        def dropMethod = database.&drop
+
+        when:
+        TestHelper.execute(dropMethod, session)
+        def operation = executor.getWriteOperation() as DropDatabaseOperation
+
+        then:
+        expect operation, isTheSameAs(new DropDatabaseOperation(name, writeConcern))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use ListCollectionsOperation correctly'() {
+        given:
+        def executor = new TestOperationExecutor([null, null, null])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+        def listCollectionsMethod = database.&listCollections
+        def listCollectionNamesMethod = database.&listCollectionNames
+
+        when:
+        def listCollectionIterable = TestHelper.execute(listCollectionsMethod, session)
+
+        then:
+        expect listCollectionIterable, isTheSameAs(MongoIterables.listCollectionsOf(session, name, false, Document, codecRegistry,
+                primary(), executor, false))
+
+        when:
+        listCollectionIterable = TestHelper.execute(listCollectionsMethod, session, BsonDocument)
+
+        then:
+        expect listCollectionIterable, isTheSameAs(MongoIterables.listCollectionsOf(session, name, false, BsonDocument,
+                codecRegistry, primary(), executor, false))
+
+        when:
+        def listCollectionNamesIterable = TestHelper.execute(listCollectionNamesMethod, session)
+
+        then:
+        // listCollectionNamesIterable is an instance of a MappingIterable, so have to get the mapped iterable inside it
+        expect listCollectionNamesIterable.getMapped(), isTheSameAs(MongoIterables.listCollectionsOf(session, name, true,
+                BsonDocument, codecRegistry, primary(), executor, false))
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use CreateCollectionOperation correctly'() {
+        given:
+        def collectionName = 'collectionName'
+        def executor = new TestOperationExecutor([null, null])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+        def createCollectionMethod = database.&createCollection
+
+        when:
+        TestHelper.execute(createCollectionMethod, session, collectionName)
+        def operation = executor.getWriteOperation() as CreateCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName, writeConcern))
+        executor.getClientSession() == session
+
+        when:
+        def createCollectionOptions = new CreateCollectionOptions()
+                .autoIndex(false)
+                .capped(true)
+                .usePowerOf2Sizes(true)
+                .maxDocuments(100)
+                .sizeInBytes(1000)
+                .storageEngineOptions(BsonDocument.parse('{ wiredTiger : {}}'))
+                .indexOptionDefaults(new IndexOptionDefaults().storageEngine(BsonDocument.parse('{ mmapv1 : {}}')))
+                .validationOptions(new ValidationOptions().validator(BsonDocument.parse('{level: {$gte: 10}}'))
+                    .validationLevel(ValidationLevel.MODERATE)
+                    .validationAction(ValidationAction.WARN))
+                .collation(collation)
+
+        TestHelper.execute(createCollectionMethod, session, collectionName, createCollectionOptions)
+        operation = executor.getWriteOperation() as CreateCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName, writeConcern)
+                .collation(collation)
+                .autoIndex(false)
+                .capped(true)
+                .usePowerOf2Sizes(true)
+                .maxDocuments(100)
+                .sizeInBytes(1000)
+                .storageEngineOptions(BsonDocument.parse('{ wiredTiger : {}}'))
+                .indexOptionDefaults(BsonDocument.parse('{ storageEngine : { mmapv1 : {}}}'))
+                .validator(BsonDocument.parse('{level: {$gte: 10}}'))
+                .validationLevel(ValidationLevel.MODERATE)
+                .validationAction(ValidationAction.WARN))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should use CreateViewOperation correctly'() {
+        given:
+        def viewName = 'view1'
+        def viewOn = 'col1'
+        def pipeline = [new Document('$match', new Document('x', true))];
+        def writeConcern = WriteConcern.JOURNALED
+        def executor = new TestOperationExecutor([null, null])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+        def createViewMethod = database.&createView
+
+        when:
+        TestHelper.execute(createViewMethod, session, viewName, viewOn, pipeline)
+        def operation = executor.getWriteOperation() as CreateViewOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateViewOperation(name, viewName, viewOn,
+                [new BsonDocument('$match', new BsonDocument('x', BsonBoolean.TRUE))], writeConcern))
+        executor.getClientSession() == session
+
+        when:
+        TestHelper.execute(createViewMethod, session, viewName, viewOn, pipeline, new CreateViewOptions().collation(collation))
+        operation = executor.getWriteOperation() as CreateViewOperation
+
+        then:
+        expect operation, isTheSameAs(new CreateViewOperation(name, viewName, viewOn,
+                [new BsonDocument('$match', new BsonDocument('x', BsonBoolean.TRUE))], writeConcern).collation(collation))
+        executor.getClientSession() == session
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the createView pipeline data correctly'() {
+        given:
+        def viewName = 'view1'
+        def viewOn = 'col1'
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false,
+                readConcern, JAVA_LEGACY, Stub(OperationExecutor))
+
+        when:
+        database.createView(viewName, viewOn, null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.createView(viewName, viewOn, [null])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should create ChangeStreamIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def namespace = new MongoNamespace(name, 'ignored')
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+        def watchMethod = database.&watch
+
+        when:
+        def changeStreamIterable = execute(watchMethod, session)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [], Document, ChangeStreamLevel.DATABASE, false), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], Document, ChangeStreamLevel.DATABASE, false), ['codec'])
+
+        when:
+        changeStreamIterable = execute(watchMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(MongoIterables.changeStreamOf(session, namespace, codecRegistry, readPreference,
+                readConcern, executor, [new Document('$match', 1)], BsonDocument, ChangeStreamLevel.DATABASE, false), ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the ChangeStreamIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+
+        when:
+        database.watch((Class) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.watch([null]).into([])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should create AggregateIterable correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+        def aggregateMethod = database.&aggregate
+
+        when:
+        def aggregateIterable = execute(aggregateMethod, session, [])
+
+        then:
+        expect aggregateIterable, isTheSameAs(MongoIterables.aggregateOf(session, name, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, [], AggregationLevel.DATABASE, false), ['codec'])
+
+        when:
+        aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)])
+
+        then:
+        expect aggregateIterable, isTheSameAs(MongoIterables.aggregateOf(session, name, Document, Document, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, [new Document('$match', 1)], AggregationLevel.DATABASE, false), ['codec'])
+
+        when:
+        aggregateIterable = execute(aggregateMethod, session, [new Document('$match', 1)], BsonDocument)
+
+        then:
+        expect aggregateIterable, isTheSameAs(MongoIterables.aggregateOf(session, name, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, [new Document('$match', 1)], AggregationLevel.DATABASE, false),
+                ['codec'])
+
+        where:
+        session << [null, Stub(ClientSession)]
+    }
+
+    def 'should validate the AggregationIterable pipeline data correctly'() {
+        given:
+        def executor = new TestOperationExecutor([])
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false, false, readConcern, JAVA_LEGACY,
+                executor)
+
+        when:
+        database.aggregate(null, [])
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.aggregate((List) null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.aggregate([null]).into([])
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+    def 'should pass the correct options to getCollection'() {
+        given:
+        def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
+        def database = new MongoDatabaseImpl('databaseName', codecRegistry, secondary(), WriteConcern.MAJORITY, true, true,
+                ReadConcern.MAJORITY, JAVA_LEGACY, new TestOperationExecutor([]))
+
+        when:
+        def collection = database.getCollection('collectionName')
+
+        then:
+        expect collection, isTheSameAs(expectedCollection)
+
+        where:
+        expectedCollection = new MongoCollectionImpl<Document>(new MongoNamespace('databaseName', 'collectionName'), Document,
+                fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()]), secondary(),
+                WriteConcern.MAJORITY, true, true, ReadConcern.MAJORITY, JAVA_LEGACY, new TestOperationExecutor([]))
+    }
+
+    def 'should validate the client session correctly'() {
+        given:
+        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, false,
+                false, readConcern, JAVA_LEGACY, Stub(OperationExecutor))
+
+        when:
+        database.createCollection(null, 'newColl')
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.createView(null, 'newView', [Document.parse('{$match: {}}')])
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.drop(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.listCollectionNames(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.listCollections(null)
+
+        then:
+        thrown(IllegalArgumentException)
+
+        when:
+        database.runCommand(null, Document.parse('{}'))
+
+        then:
+        thrown(IllegalArgumentException)
+    }
+
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/MongoIterablesSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoIterablesSpecification.groovy
new file mode 100644
index 00000000000..82d37b21be6
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoIterablesSpecification.groovy
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.MongoClientSettings
+import com.mongodb.MongoNamespace
+import com.mongodb.ReadConcern
+import com.mongodb.WriteConcern
+import com.mongodb.client.ClientSession
+import com.mongodb.client.model.AggregationLevel
+import com.mongodb.client.model.changestream.ChangeStreamLevel
+import org.bson.BsonBoolean
+import org.bson.BsonDocument
+import org.bson.Document
+import spock.lang.IgnoreIf
+import spock.lang.Specification
+
+import static com.mongodb.CustomMatchers.isTheSameAs
+import static com.mongodb.ReadPreference.secondary
+import static spock.util.matcher.HamcrestSupport.expect
+
+class MongoIterablesSpecification extends Specification {
+
+    def executor = new TestOperationExecutor([])
+    def clientSession = Stub(ClientSession)
+    def namespace = new MongoNamespace('databaseName', 'collectionName')
+    def codecRegistry = MongoClientSettings.getDefaultCodecRegistry()
+    def readPreference = secondary()
+    def readConcern = ReadConcern.MAJORITY
+    def writeConcern = WriteConcern.MAJORITY
+    def filter = new BsonDocument('x', BsonBoolean.TRUE)
+    def pipeline = Collections.emptyList()
+
+    @IgnoreIf({ !Java8MongoIterablesSpecification.IS_CONSUMER_CLASS_AVAILABLE })
+    def 'should create Java 8 iterables when java.util.function.Consumer is available'() {
+        when:
+        def findIterable = MongoIterables.findOf(clientSession, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, executor, filter, true)
+
+        then:
+        expect findIterable, isTheSameAs(new Java8FindIterableImpl<Document, BsonDocument>(clientSession, namespace, Document,
+                BsonDocument, codecRegistry, readPreference, readConcern, executor, filter, true))
+
+        when:
+        def aggregateIterable = MongoIterables.aggregateOf(clientSession, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, true)
+
+        then:
+        expect aggregateIterable, isTheSameAs(new Java8AggregateIterableImpl<Document, BsonDocument>(clientSession, namespace,
+                Document, BsonDocument, codecRegistry, readPreference, readConcern, writeConcern, executor, pipeline,
+                AggregationLevel.COLLECTION, true))
+
+        when:
+        aggregateIterable = MongoIterables.aggregateOf(clientSession, namespace.databaseName, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, true)
+
+        then:
+        expect aggregateIterable, isTheSameAs(new Java8AggregateIterableImpl<Document, BsonDocument>(clientSession, namespace.databaseName,
+                Document, BsonDocument, codecRegistry, readPreference, readConcern, writeConcern, executor, pipeline,
+                AggregationLevel.DATABASE, true))
+
+        when:
+        def changeStreamIterable = MongoIterables.changeStreamOf(clientSession, namespace, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new Java8ChangeStreamIterableImpl(clientSession, namespace, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        when:
+        changeStreamIterable = MongoIterables.changeStreamOf(clientSession, namespace.databaseName, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new Java8ChangeStreamIterableImpl(clientSession, namespace.databaseName, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        when:
+        def distinctIterable = MongoIterables.distinctOf(clientSession, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, executor, 'f1', filter, true)
+
+        then:
+        expect distinctIterable, isTheSameAs(new Java8DistinctIterableImpl(clientSession, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, executor, 'f1', filter, true))
+
+        when:
+        def listDatabasesIterable = MongoIterables.listDatabasesOf(clientSession, Document, codecRegistry, readPreference, executor, true)
+
+        then:
+        expect listDatabasesIterable, isTheSameAs(new Java8ListDatabasesIterableImpl(clientSession, Document, codecRegistry, readPreference,
+                executor, true))
+
+        when:
+        def listCollectionsIterable = MongoIterables.listCollectionsOf(clientSession, 'test', true, Document,
+                codecRegistry, readPreference, executor, true)
+
+        then:
+        expect listCollectionsIterable, isTheSameAs(new Java8ListCollectionsIterableImpl(clientSession, 'test', true, Document,
+                codecRegistry, readPreference, executor, true))
+
+        when:
+        def listIndexesIterable = MongoIterables.listIndexesOf(clientSession, namespace, Document, codecRegistry, readPreference, executor,
+                true)
+
+        then:
+        expect listIndexesIterable, isTheSameAs(new Java8ListIndexesIterableImpl(clientSession, namespace, Document, codecRegistry,
+                readPreference, executor, true))
+
+        when:
+        def mapReduceIterable = MongoIterables.mapReduceOf(clientSession, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, 'map', 'reduce')
+
+        then:
+        expect mapReduceIterable, isTheSameAs(new Java8MapReduceIterableImpl(clientSession, namespace, Document, BsonDocument,
+                codecRegistry, readPreference, readConcern, writeConcern, executor, 'map', 'reduce'))
+    }
+
+    @IgnoreIf({ Java8MongoIterablesSpecification.IS_CONSUMER_CLASS_AVAILABLE })
+    def 'should create non-Java 8 iterables when java.util.function.Consumer is unavailable'() {
+        when:
+        def findIterable = MongoIterables.findOf(clientSession, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, executor, filter, true)
+
+        then:
+        expect findIterable, isTheSameAs(new FindIterableImpl<Document, BsonDocument>(clientSession, namespace, Document,
+                BsonDocument, codecRegistry, readPreference, readConcern, executor, filter))
+
+        when:
+        def aggregateIterable = MongoIterables.aggregateOf(clientSession, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.COLLECTION, true)
+
+        then:
+        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl<Document, BsonDocument>(clientSession, namespace,
+                Document, BsonDocument, codecRegistry, readPreference, readConcern, writeConcern, executor, pipeline,
+                AggregationLevel.COLLECTION, true))
+
+        when:
+        aggregateIterable = MongoIterables.aggregateOf(clientSession, namespace.databaseName, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, writeConcern, executor, pipeline, AggregationLevel.DATABASE, true)
+
+        then:
+        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl<Document, BsonDocument>(clientSession, namespace.databaseName,
+                Document, BsonDocument, codecRegistry, readPreference, readConcern, writeConcern, executor, pipeline,
+                AggregationLevel.DATABASE))
+
+        when:
+        def changeStreamIterable = MongoIterables.changeStreamOf(clientSession, namespace, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(clientSession, namespace, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        when:
+        changeStreamIterable = MongoIterables.changeStreamOf(clientSession, namespace.databaseName, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true)
+
+        then:
+        expect changeStreamIterable, isTheSameAs(new ChangeStreamIterableImpl(clientSession, namespace.databaseName, codecRegistry,
+                readPreference, readConcern, executor, pipeline, Document, ChangeStreamLevel.COLLECTION, true), ['codec'])
+
+        when:
+        def distinctIterable = MongoIterables.distinctOf(clientSession, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, executor, 'f1', filter, true)
+
+        then:
+        expect distinctIterable, isTheSameAs(new DistinctIterableImpl(clientSession, namespace, Document, BsonDocument, codecRegistry,
+                readPreference, readConcern, executor, 'f1', filter))
+
+        when:
+        def listDatabasesIterable = MongoIterables.listDatabasesOf(clientSession, Document, codecRegistry, readPreference, executor, true)
+
+        then:
+        expect listDatabasesIterable, isTheSameAs(new ListDatabasesIterableImpl(clientSession, Document, codecRegistry, readPreference,
+                executor))
+
+        when:
+        def listCollectionsIterable = MongoIterables.listCollectionsOf(clientSession, 'test', true, Document,
+                codecRegistry, readPreference, executor, true)
+
+        then:
+        expect listCollectionsIterable, isTheSameAs(new ListCollectionsIterableImpl(clientSession, 'test', true, Document,
+                codecRegistry, readPreference, executor))
+
+        when:
+        def mapReduceIterable = MongoIterables.mapReduceOf(clientSession, namespace, Document, BsonDocument, codecRegistry, readPreference,
+                readConcern, writeConcern, executor, 'map', 'reduce')
+
+        then:
+        expect mapReduceIterable, isTheSameAs(new MapReduceIterableImpl(clientSession, namespace, Document, BsonDocument,
+                codecRegistry, readPreference, readConcern, writeConcern, executor, 'map', 'reduce'))    }
+}
diff --git a/driver/src/test/unit/com/mongodb/MongoMappingCursorSpecification.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoMappingCursorSpecification.groovy
similarity index 95%
rename from driver/src/test/unit/com/mongodb/MongoMappingCursorSpecification.groovy
rename to driver-sync/src/test/unit/com/mongodb/client/internal/MongoMappingCursorSpecification.groovy
index 9b278e29be6..3478fe1e236 100644
--- a/driver/src/test/unit/com/mongodb/MongoMappingCursorSpecification.groovy
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/MongoMappingCursorSpecification.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package com.mongodb
+package com.mongodb.client.internal
 
+import com.mongodb.ServerAddress
+import com.mongodb.ServerCursor
 import com.mongodb.client.MongoCursor
 import org.bson.Document
 import spock.lang.Specification
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/TestHelper.groovy b/driver-sync/src/test/unit/com/mongodb/client/internal/TestHelper.groovy
new file mode 100644
index 00000000000..e743fe13cdd
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/TestHelper.groovy
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal
+
+import com.mongodb.client.ClientSession
+
+class TestHelper {
+    static <T> T execute(final Closure<T> method, final ClientSession session, ... restOfArgs) {
+        if (session == null) {
+            method.call(restOfArgs)
+        }  else {
+            method.call([session, *restOfArgs] as Object[])
+        }
+    }
+}
diff --git a/driver-sync/src/test/unit/com/mongodb/client/internal/TestOperationExecutor.java b/driver-sync/src/test/unit/com/mongodb/client/internal/TestOperationExecutor.java
new file mode 100644
index 00000000000..d42ddf085dd
--- /dev/null
+++ b/driver-sync/src/test/unit/com/mongodb/client/internal/TestOperationExecutor.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.internal;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.lang.Nullable;
+import com.mongodb.operation.ReadOperation;
+import com.mongodb.operation.WriteOperation;
+import com.mongodb.client.ClientSession;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SuppressWarnings("rawtypes")
+public class TestOperationExecutor implements OperationExecutor {
+
+    private final List<Object> responses;
+    private List<ClientSession> clientSessions = new ArrayList<ClientSession>();
+    private List<ReadPreference> readPreferences = new ArrayList<ReadPreference>();
+    private List<ReadConcern> readConcerns = new ArrayList<ReadConcern>();
+    private List<ReadOperation> readOperations = new ArrayList<ReadOperation>();
+    private List<WriteOperation> writeOperations = new ArrayList<WriteOperation>();
+
+    public TestOperationExecutor(final List<Object> responses) {
+        this.responses = responses;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T execute(final ReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern) {
+        return execute(operation, readPreference, readConcern, null);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T execute(final WriteOperation<T> operation, final ReadConcern readConcern) {
+        return execute(operation, readConcern, null);
+    }
+
+    @Override
+    public <T> T execute(final ReadOperation<T> operation, final ReadPreference readPreference, final ReadConcern readConcern,
+                         @Nullable final ClientSession session) {
+        clientSessions.add(session);
+        readOperations.add(operation);
+        readPreferences.add(readPreference);
+        readConcerns.add(readConcern);
+        return getResponse();
+    }
+
+    @Override
+    public <T> T execute(final WriteOperation<T> operation, final ReadConcern readConcern, @Nullable final ClientSession session) {
+        clientSessions.add(session);
+        writeOperations.add(operation);
+        readConcerns.add(readConcern);
+        return getResponse();
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T getResponse() {
+        Object response = responses.remove(0);
+        if (response instanceof RuntimeException) {
+            throw (RuntimeException) response;
+        }
+        return (T) response;
+    }
+
+    public ClientSession getClientSession() {
+        return clientSessions.remove(0);
+    }
+
+    @Nullable
+    public ReadOperation getReadOperation() {
+        return readOperations.isEmpty() ? null : readOperations.remove(0);
+    }
+
+    @Nullable
+    public ReadPreference getReadPreference() {
+        return readPreferences.isEmpty() ? null : readPreferences.remove(0);
+    }
+
+    @Nullable
+    public ReadConcern getReadConcern() {
+        return readConcerns.isEmpty() ? null : readConcerns.remove(0);
+    }
+
+    @Nullable
+    public WriteOperation getWriteOperation() {
+       return writeOperations.isEmpty() ? null : writeOperations.remove(0);
+    }
+}
diff --git a/driver/build.gradle b/driver/build.gradle
deleted file mode 100644
index 43391f8fd66..00000000000
--- a/driver/build.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: 'org.kordamp.gradle.clirr'
-
-archivesBaseName = 'mongodb-driver'
-def configDir = new File(rootDir, 'config')
-
-sourceSets {
-    test.java.srcDirs += ['src/test/acceptance', 'src/examples']
-}
-
-test {
-    exclude 'tour/**'
-}
-
-dependencies {
-    compile project(':bson')
-    compile project(':driver-core')
-
-    testCompile project(':bson').sourceSets.test.output
-    testCompile project(':driver-core').sourceSets.test.output
-}
-
-clirr {
-    excludeFilter = new File("$configDir/clirr-exclude.yml")
-    baseline 'org.mongodb:mongodb-driver:3.2.0'
-    failOnErrors = false
-}
-
-tasks.withType(Checkstyle) {
-    // needed so the Javadoc checks can find the code in other modules
-    classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output);
-}
-
-modifyPom {
-    project {
-        name 'MongoDB Driver'
-        description 'The MongoDB Driver'
-        url 'http://www.mongodb.org'
-    }
-}
diff --git a/driver/src/examples/gridfs/package-info.java b/driver/src/examples/gridfs/package-info.java
deleted file mode 100644
index ea6f91648ae..00000000000
--- a/driver/src/examples/gridfs/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains the gridfs tour example
- */
-package gridfs;
diff --git a/driver/src/examples/tour/package-info.java b/driver/src/examples/tour/package-info.java
deleted file mode 100644
index 6eabbcae495..00000000000
--- a/driver/src/examples/tour/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains the quick tour examples
- */
-package tour;
diff --git a/driver/src/main/com/mongodb/AggregateIterableImpl.java b/driver/src/main/com/mongodb/AggregateIterableImpl.java
deleted file mode 100644
index 363c172a1d6..00000000000
--- a/driver/src/main/com/mongodb/AggregateIterableImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.AggregateIterable;
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.client.model.FindOptions;
-import com.mongodb.operation.AggregateOperation;
-import com.mongodb.operation.AggregateToCollectionOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.BsonDocument;
-import org.bson.BsonValue;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-class AggregateIterableImpl<TDocument, TResult> implements AggregateIterable<TResult> {
-    private final MongoNamespace namespace;
-    private final Class<TDocument> documentClass;
-    private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-    private final OperationExecutor executor;
-    private final List<? extends Bson> pipeline;
-
-    private Boolean allowDiskUse;
-    private Integer batchSize;
-    private long maxTimeMS;
-    private Boolean useCursor;
-    private Boolean bypassDocumentValidation;
-
-    AggregateIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                          final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                          final OperationExecutor executor, final List<? extends Bson> pipeline) {
-        this.namespace = notNull("namespace", namespace);
-        this.documentClass = notNull("documentClass", documentClass);
-        this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
-        this.pipeline = notNull("pipeline", pipeline);
-    }
-
-    @Override
-    public AggregateIterable<TResult> allowDiskUse(final Boolean allowDiskUse) {
-        this.allowDiskUse = allowDiskUse;
-        return this;
-    }
-
-    @Override
-    public AggregateIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
-        return this;
-    }
-
-    @Override
-    public AggregateIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public AggregateIterable<TResult> useCursor(final Boolean useCursor) {
-        this.useCursor = useCursor;
-        return this;
-    }
-
-    @Override
-    public AggregateIterable<TResult> bypassDocumentValidation(final Boolean bypassDocumentValidation) {
-        this.bypassDocumentValidation = bypassDocumentValidation;
-        return this;
-    }
-
-    @Override
-    public MongoCursor<TResult> iterator() {
-        return execute().iterator();
-    }
-
-    @Override
-    public TResult first() {
-        return execute().first();
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block) {
-        execute().forEach(block);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> A into(final A target) {
-        return execute().into(target);
-    }
-
-    private MongoIterable<TResult> execute() {
-        List<BsonDocument> aggregateList = createBsonDocumentList(pipeline);
-
-        BsonValue outCollection = aggregateList.size() == 0 ? null : aggregateList.get(aggregateList.size() - 1).get("$out");
-
-        if (outCollection != null) {
-            AggregateToCollectionOperation operation = new AggregateToCollectionOperation(namespace, aggregateList)
-                    .maxTime(maxTimeMS, MILLISECONDS)
-                    .allowDiskUse(allowDiskUse)
-                    .bypassDocumentValidation(bypassDocumentValidation);
-            executor.execute(operation);
-            FindIterable<TResult> findOperation = new FindIterableImpl<TDocument, TResult>(new MongoNamespace(namespace.getDatabaseName(),
-                    outCollection.asString().getValue()), documentClass, resultClass, codecRegistry, readPreference, readConcern, executor,
-                    new BsonDocument(), new FindOptions());
-            if (batchSize != null) {
-                findOperation.batchSize(batchSize);
-            }
-            return findOperation;
-        } else {
-            return new OperationIterable<TResult>(new AggregateOperation<TResult>(namespace, aggregateList, codecRegistry.get(resultClass))
-                    .maxTime(maxTimeMS, MILLISECONDS)
-                    .allowDiskUse(allowDiskUse)
-                    .batchSize(batchSize)
-                    .useCursor(useCursor)
-                    .readConcern(readConcern),
-                    readPreference, executor);
-        }
-    }
-
-    private List<BsonDocument> createBsonDocumentList(final List<? extends Bson> pipeline) {
-        List<BsonDocument> aggregateList = new ArrayList<BsonDocument>(pipeline.size());
-        for (Bson obj : pipeline) {
-            aggregateList.add(obj.toBsonDocument(documentClass, codecRegistry));
-        }
-        return aggregateList;
-    }
-}
diff --git a/driver/src/main/com/mongodb/AggregationOptions.java b/driver/src/main/com/mongodb/AggregationOptions.java
deleted file mode 100644
index f3d507c5ae2..00000000000
--- a/driver/src/main/com/mongodb/AggregationOptions.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-
-import com.mongodb.annotations.NotThreadSafe;
-
-import java.util.concurrent.TimeUnit;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-/**
- * The options to apply to an aggregate operation.
- *
- * @mongodb.server.release 2.2
- * @mongodb.driver.manual reference/command/aggregate/ aggregate
- * @since 2.12
- */
-public class AggregationOptions {
-    private final Integer batchSize;
-    private final Boolean allowDiskUse;
-    private final OutputMode outputMode;
-    private final long maxTimeMS;
-    private final Boolean bypassDocumentValidation;
-
-    /**
-     * Enumeration to define where the results of the aggregation will be output.
-     */
-    public enum OutputMode {
-        /**
-         * The output of the aggregate operation is returned inline.
-         */
-        INLINE,
-
-        /**
-         * The output of the aggregate operation is returned using a cursor.
-         *
-         * @mongodb.server.release 2.6
-         */
-        CURSOR
-    }
-
-    AggregationOptions(final Builder builder) {
-        batchSize = builder.batchSize;
-        allowDiskUse = builder.allowDiskUse;
-        outputMode = builder.outputMode;
-        maxTimeMS = builder.maxTimeMS;
-        bypassDocumentValidation = builder.bypassDocumentValidation;
-    }
-
-    /**
-     * If true, this enables external sort capabilities, otherwise $sort produces an error if the operation consumes 10 percent or more of
-     * RAM.
-     *
-     * @return true if aggregation stages can write data to temporary files
-     * @mongodb.server.release 2.6
-     */
-    public Boolean getAllowDiskUse() {
-        return allowDiskUse;
-    }
-
-    /**
-     * The size of batches to use when iterating over results.
-     *
-     * @return the batch size
-     * @mongodb.server.release 2.6
-     */
-    public Integer getBatchSize() {
-        return batchSize;
-    }
-
-    /**
-     * The mode of output for this configuration.
-     *
-     * @return whether the output will be inline or via a cursor
-     * @see OutputMode
-     */
-    public OutputMode getOutputMode() {
-        return outputMode;
-    }
-
-    /**
-     * Gets the maximum execution time for the aggregation command.
-     *
-     * @param timeUnit the time unit for the result
-     * @return the max time
-     * @mongodb.server.release 2.6
-     * @since 2.12
-     */
-    public long getMaxTime(final TimeUnit timeUnit) {
-        return timeUnit.convert(maxTimeMS, MILLISECONDS);
-    }
-
-    /**
-     * Gets whether to bypass document validation, or null if unspecified.  The default is null.
-     *
-     * @return whether to bypass document validation, or null if unspecified.
-     * @since 2.14
-     * @mongodb.server.release 3.2
-     */
-    public Boolean getBypassDocumentValidation() {
-        return bypassDocumentValidation;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder("AggregationOptions{");
-        sb.append("allowDiskUse=")
-          .append(allowDiskUse);
-        sb.append(", batchSize=")
-          .append(batchSize);
-        sb.append(", outputMode=")
-          .append(outputMode);
-        sb.append(", maxTimeMS=")
-          .append(maxTimeMS);
-        sb.append(", bypassDocumentValidation=")
-        .append(bypassDocumentValidation);
-        sb.append('}');
-        return sb.toString();
-    }
-
-    /**
-     * Creates a new Builder for {@code AggregationOptions}.
-     *
-     * @return a new empty builder.
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    /**
-     * Builder for creating {@code AggregationOptions}.
-     *
-     * @mongodb.server.release 2.2
-     * @mongodb.driver.manual reference/command/aggregate/ aggregate
-     */
-    @NotThreadSafe
-    public static class Builder {
-        private Integer batchSize;
-        private Boolean allowDiskUse;
-        private OutputMode outputMode = OutputMode.INLINE;
-        private long maxTimeMS;
-        private Boolean bypassDocumentValidation;
-
-        private Builder() {
-        }
-
-        /**
-         * Sets the size of batches to use when iterating over results. Can be null.
-         *
-         * @param size the batch size to apply to the cursor
-         * @return {@code this} so calls can be chained
-         * @mongodb.server.release 2.6
-         */
-        public Builder batchSize(final Integer size) {
-            batchSize = size;
-            return this;
-        }
-
-        /**
-         * Set whether to enable external sort capabilities. If set to false, $sort produces an error if the operation consumes 10 percent
-         * or more RAM.
-         *
-         * @param allowDiskUse whether or not aggregation stages can write data to temporary files
-         * @return {@code this} so calls can be chained
-         * @mongodb.server.release 2.6
-         */
-        public Builder allowDiskUse(final Boolean allowDiskUse) {
-            this.allowDiskUse = allowDiskUse;
-            return this;
-        }
-
-        /**
-         * The mode of output for this configuration.
-         *
-         * @param mode an {@code OutputMode} that defines how to output the results of the aggregation
-         * @return {@code this} so calls can be chained
-         * @see OutputMode
-         */
-        public Builder outputMode(final OutputMode mode) {
-            outputMode = mode;
-            return this;
-        }
-
-        /**
-         * Sets the maximum execution time for the aggregation command.
-         *
-         * @param maxTime  the max time
-         * @param timeUnit the time unit
-         * @return {@code this} so calls can be chained
-         * @mongodb.server.release 2.6
-         */
-        public Builder maxTime(final long maxTime, final TimeUnit timeUnit) {
-            maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
-            return this;
-        }
-
-        /**
-         * Sets whether to bypass document validation.
-         *
-         * @param bypassDocumentValidation whether to bypass document validation, or null if unspecified
-         * @return this
-         * @since 2.14
-         * @mongodb.server.release 3.2
-         */
-        public Builder bypassDocumentValidation(final Boolean bypassDocumentValidation) {
-            this.bypassDocumentValidation = bypassDocumentValidation;
-            return this;
-        }
-
-        /**
-         * Return the options based on this builder.
-         *
-         * @return the aggregation options
-         */
-        public AggregationOptions build() {
-            return new AggregationOptions(this);
-        }
-    }
-}
diff --git a/driver/src/main/com/mongodb/BasicDBObject.java b/driver/src/main/com/mongodb/BasicDBObject.java
deleted file mode 100644
index ec5262dc637..00000000000
--- a/driver/src/main/com/mongodb/BasicDBObject.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.util.JSON;
-import org.bson.BasicBSONObject;
-import org.bson.BsonDocument;
-import org.bson.BsonDocumentWrapper;
-import org.bson.codecs.Decoder;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.Encoder;
-import org.bson.codecs.EncoderContext;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-import org.bson.json.JsonReader;
-import org.bson.json.JsonWriter;
-import org.bson.json.JsonWriterSettings;
-
-import java.io.StringWriter;
-import java.util.Map;
-
-import static com.mongodb.MongoClient.getDefaultCodecRegistry;
-
-/**
- * A basic implementation of BSON object that is MongoDB specific. A {@code DBObject} can be created as follows, using this class:
- * <pre>
- * DBObject obj = new BasicDBObject();
- * obj.put( "foo", "bar" );
- * </pre>
- *
- * @mongodb.driver.manual core/document/ MongoDB Documents
- */
-@SuppressWarnings({"rawtypes"})
-public class BasicDBObject extends BasicBSONObject implements DBObject, Bson {
-    private static final long serialVersionUID = -4415279469780082174L;
-
-    private boolean isPartialObject;
-
-    /**
-     * Parses a string in MongoDB Extended JSON format to a {@code BasicDBObject}.
-     *
-     * @param json the JSON string
-     * @return a corresponding {@code BasicDBObject} object
-     * @see org.bson.json.JsonReader
-     * @mongodb.driver.manual reference/mongodb-extended-json/ MongoDB Extended JSON
-     */
-    public static BasicDBObject parse(final String json) {
-        return parse(json, getDefaultCodecRegistry().get(BasicDBObject.class));
-    }
-
-    /**
-     * Parses a string in MongoDB Extended JSON format to a {@code BasicDBObject}.
-     *
-     * @param json the JSON string
-     * @param decoder the decoder to use to decode the BasicDBObject instance
-     * @return a corresponding {@code BasicDBObject} object
-     * @see org.bson.json.JsonReader
-     * @mongodb.driver.manual reference/mongodb-extended-json/ MongoDB Extended JSON
-     */
-    public static BasicDBObject parse(final String json, final Decoder<BasicDBObject> decoder) {
-        return decoder.decode(new JsonReader(json), DecoderContext.builder().build());
-    }
-
-    /**
-     * Creates an empty object.
-     */
-    public BasicDBObject() {
-        super();
-    }
-
-    /**
-     * Creates an empty object
-     *
-     * @param size an estimate of number of fields that will be inserted
-     */
-    public BasicDBObject(final int size) {
-        super(size);
-    }
-
-    /**
-     * Creates an object with the given key/value
-     *
-     * @param key   key under which to store
-     * @param value value to store
-     */
-    public BasicDBObject(final String key, final Object value) {
-        super(key, value);
-    }
-
-    /**
-     * Creates an object from a map.
-     *
-     * @param map map to convert
-     */
-    public BasicDBObject(final Map map) {
-        super(map);
-    }
-
-    /**
-     * Add a key/value pair to this object
-     *
-     * @param key the field name
-     * @param val the field value
-     * @return this BasicDBObject with the new values added
-     */
-    @Override
-    public BasicDBObject append(final String key, final Object val) {
-        put(key, val);
-        return this;
-    }
-
-    /**
-     * Whether {@link #markAsPartialObject} was ever called only matters if you are going to upsert and do not want to risk losing fields.
-     *
-     * @return true if this has been marked as a partial object
-     */
-    @Override
-    public boolean isPartialObject() {
-        return isPartialObject;
-    }
-
-    /**
-     * Gets a JSON representation of this document
-     *
-     * <p>With the default {@link JsonWriterSettings} and {@link DBObjectCodec}.</p>
-     *
-     * @return a JSON representation of this document
-     * @throws org.bson.codecs.configuration.CodecConfigurationException if the document contains types not in the default registry
-     */
-    public String toJson() {
-        return toJson(new JsonWriterSettings());
-    }
-
-    /**
-     * Gets a JSON representation of this document
-     *
-     * <p>With the default {@link DBObjectCodec}.</p>
-     *
-     * @param writerSettings the json writer settings to use when encoding
-     * @return a JSON representation of this document
-     * @throws org.bson.codecs.configuration.CodecConfigurationException if the document contains types not in the default registry
-     */
-    public String toJson(final JsonWriterSettings writerSettings) {
-        return toJson(writerSettings, getDefaultCodecRegistry().get(BasicDBObject.class));
-    }
-
-    /**
-     * Gets a JSON representation of this document
-     *
-     * <p>With the default {@link JsonWriterSettings}.</p>
-     *
-     * @param encoder the BasicDBObject codec instance to encode the document with
-     * @return a JSON representation of this document
-     * @throws org.bson.codecs.configuration.CodecConfigurationException if the registry does not contain a codec for the document values.
-     */
-    public String toJson(final Encoder<BasicDBObject> encoder) {
-        return toJson(new JsonWriterSettings(), encoder);
-    }
-
-    /**
-     * Gets a JSON representation of this document
-     *
-     * @param writerSettings the json writer settings to use when encoding
-     * @param encoder the BasicDBObject codec instance to encode the document with
-     * @return a JSON representation of this document
-     * @throws org.bson.codecs.configuration.CodecConfigurationException if the registry does not contain a codec for the document values.
-     */
-    public String toJson(final JsonWriterSettings writerSettings, final Encoder<BasicDBObject> encoder) {
-        JsonWriter writer = new JsonWriter(new StringWriter(), writerSettings);
-        encoder.encode(writer, this, EncoderContext.builder().isEncodingCollectibleDocument(true).build());
-        return writer.getWriter().toString();
-    }
-
-    /**
-     * <p>Returns a JSON serialization of this object</p>
-     *
-     * <p>The output will look like: {@code  {"a":1, "b":["x","y","z"]} }</p>
-     *
-     * @return JSON serialization
-     */
-    public String toString() {
-        return JSON.serialize(this);
-    }
-
-    /**
-     * If this object was retrieved with only some fields (using a field filter) this method will be called to mark it as such.
-     */
-    @Override
-    public void markAsPartialObject() {
-        isPartialObject = true;
-    }
-
-    /**
-     * Creates a new instance which is a copy of this BasicDBObject.
-     *
-     * @return a BasicDBObject with exactly the same values as this instance.
-     */
-    public Object copy() {
-        // copy field values into new object
-        BasicDBObject newCopy = new BasicDBObject(this.toMap());
-        // need to clone the sub obj
-        for (final String field : keySet()) {
-            Object val = get(field);
-            if (val instanceof BasicDBObject) {
-                newCopy.put(field, ((BasicDBObject) val).copy());
-            } else if (val instanceof BasicDBList) {
-                newCopy.put(field, ((BasicDBList) val).copy());
-            }
-        }
-        return newCopy;
-    }
-
-    @Override
-    public <TDocument> BsonDocument toBsonDocument(final Class<TDocument> documentClass, final CodecRegistry codecRegistry) {
-        return new BsonDocumentWrapper<BasicDBObject>(this, codecRegistry.get(BasicDBObject.class));
-    }
-}
diff --git a/driver/src/main/com/mongodb/BulkUpdateRequestBuilder.java b/driver/src/main/com/mongodb/BulkUpdateRequestBuilder.java
deleted file mode 100644
index 338dd5be8c2..00000000000
--- a/driver/src/main/com/mongodb/BulkUpdateRequestBuilder.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import org.bson.codecs.Encoder;
-
-/**
- * A builder for a single update request.
- *
- * @mongodb.server.release 2.6
- * @mongodb.driver.manual /reference/command/update
- * @since 2.12
- */
-public class BulkUpdateRequestBuilder {
-    private final BulkWriteOperation bulkWriteOperation;
-    private final DBObject query;
-    private final boolean upsert;
-    private final Encoder<DBObject> queryCodec;
-    private final Encoder<DBObject> replacementCodec;
-
-    BulkUpdateRequestBuilder(final BulkWriteOperation bulkWriteOperation, final DBObject query, final boolean upsert,
-                             final Encoder<DBObject> queryCodec, final Encoder<DBObject> replacementCodec) {
-        this.bulkWriteOperation = bulkWriteOperation;
-        this.query = query;
-        this.upsert = upsert;
-        this.queryCodec = queryCodec;
-        this.replacementCodec = replacementCodec;
-    }
-
-    /**
-     * Adds a request to replace one document in the collection that matches the query with which this builder was created.
-     *
-     * @param document the replacement document, which must be structured just as a document you would insert.  It can not contain any
-     *                 update operators.
-     */
-    public void replaceOne(final DBObject document) {
-        bulkWriteOperation.addRequest(new ReplaceRequest(query, document, upsert, queryCodec, replacementCodec));
-    }
-
-    /**
-     * Adds a request to update all documents in the collection that match the query with which this builder was created.
-     *
-     * @param update the update criteria
-     */
-    public void update(final DBObject update) {
-        bulkWriteOperation.addRequest(new UpdateRequest(query, update, true, upsert, queryCodec));
-    }
-
-    /**
-     * Adds a request to update one document in the collection that matches the query with which this builder was created.
-     *
-     * @param update the update criteria
-     */
-    public void updateOne(final DBObject update) {
-        bulkWriteOperation.addRequest(new UpdateRequest(query, update, false, upsert, queryCodec));
-    }
-}
diff --git a/driver/src/main/com/mongodb/BulkWriteRequestBuilder.java b/driver/src/main/com/mongodb/BulkWriteRequestBuilder.java
deleted file mode 100644
index 04505e28e9e..00000000000
--- a/driver/src/main/com/mongodb/BulkWriteRequestBuilder.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import org.bson.codecs.Encoder;
-
-/**
- * A builder for a single write request.
- *
- * @mongodb.server.release 2.6
- * @mongodb.driver.manual /reference/command/delete/ Delete
- * @mongodb.driver.manual /reference/command/update/ Update
- * @mongodb.driver.manual /reference/command/insert/ Insert
- * @since 2.12
- */
-public class BulkWriteRequestBuilder {
-    private final BulkWriteOperation bulkWriteOperation;
-    private final DBObject query;
-    private final Encoder<DBObject> codec;
-    private final Encoder<DBObject> replacementCodec;
-
-    BulkWriteRequestBuilder(final BulkWriteOperation bulkWriteOperation, final DBObject query, final Encoder<DBObject> queryCodec,
-                            final Encoder<DBObject> replacementCodec) {
-        this.bulkWriteOperation = bulkWriteOperation;
-        this.query = query;
-        this.codec = queryCodec;
-        this.replacementCodec = replacementCodec;
-    }
-
-    /**
-     * Adds a request to remove all documents in the collection that match the query with which this builder was created.
-     */
-    public void remove() {
-        bulkWriteOperation.addRequest(new RemoveRequest(query, true, codec));
-    }
-
-    /**
-     * Adds a request to remove one document in the collection that matches the query with which this builder was created.
-     */
-    public void removeOne() {
-        bulkWriteOperation.addRequest(new RemoveRequest(query, false, codec));
-    }
-
-    /**
-     * Adds a request to replace one document in the collection that matches the query with which this builder was created.
-     *
-     * @param document the replacement document, which must be structured just as a document you would insert.  It can not contain any
-     *                 update operators.
-     */
-    public void replaceOne(final DBObject document) {
-        new BulkUpdateRequestBuilder(bulkWriteOperation, query, false, codec, replacementCodec).replaceOne(document);
-    }
-
-    /**
-     * Adds a request to update all documents in the collection that match the query with which this builder was created.
-     *
-     * @param update the update criteria
-     */
-    public void update(final DBObject update) {
-        new BulkUpdateRequestBuilder(bulkWriteOperation, query, false, codec, replacementCodec).update(update);
-    }
-
-    /**
-     * Adds a request to update one document in the collection that matches the query with which this builder was created.
-     *
-     * @param update the update criteria
-     */
-    public void updateOne(final DBObject update) {
-        new BulkUpdateRequestBuilder(bulkWriteOperation, query, false, codec, replacementCodec).updateOne(update);
-    }
-
-    /**
-     * Specifies that the request being built should be an upsert.
-     *
-     * @return a new builder that allows only update and replace, since upsert does not apply to remove.
-     * @mongodb.driver.manual tutorial/modify-documents/#upsert-option Upsert
-     */
-    public BulkUpdateRequestBuilder upsert() {
-        return new BulkUpdateRequestBuilder(bulkWriteOperation, query, true, codec, replacementCodec);
-    }
-}
diff --git a/driver/src/main/com/mongodb/DBCursor.java b/driver/src/main/com/mongodb/DBCursor.java
deleted file mode 100644
index 729c31881cb..00000000000
--- a/driver/src/main/com/mongodb/DBCursor.java
+++ /dev/null
@@ -1,958 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.annotations.NotThreadSafe;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.model.FindOptions;
-import com.mongodb.operation.FindOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.codecs.Decoder;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.DBObjects.toDBObject;
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-/**
- * <p>An iterator over database results. Doing a {@code find()} query on a collection returns a {@code DBCursor} thus</p>
- * <pre>
- *    DBCursor cursor = collection.find(query);
- *    if(cursor.hasNext()) {
- *       DBObject obj = cursor.next();
- *    }
- * </pre>
- * <p><b>Warning:</b> Calling {@code toArray} or {@code length} on a DBCursor will irrevocably turn it into an array.  This means that, if
- * the cursor was iterating over ten million results (which it was lazily fetching from the database), suddenly there will be a ten-million
- * element array in memory.  Before converting to an array, make sure that there are a reasonable number of results using {@code skip()} and
- * {@code limit()}.
- *
- * <p>For example, to get an array of the 1000-1100th elements of a cursor, use</p>
- *
- * <pre>{@code
- *    List<DBObject> obj = collection.find(query).skip(1000).limit(100).toArray();
- * }</pre>
- *
- * See {@link Mongo#getDB(String)} for further information about the effective deprecation of this class.
- *
- * @mongodb.driver.manual core/read-operations Read Operations
- */
-@NotThreadSafe
-public class DBCursor implements Cursor, Iterable<DBObject> {
-    private final DBCollection collection;
-    private final OperationExecutor executor;
-    private final DBObject filter;
-    private final DBObject modifiers;
-    private DBObject projection;
-    private DBObject sort;
-    private final FindOptions findOptions;
-    private int options;
-    private ReadPreference readPreference;
-    private ReadConcern readConcern;
-    private Decoder<DBObject> resultDecoder;
-    private DBDecoderFactory decoderFactory;
-    private IteratorOrArray iteratorOrArray;
-    private DBObject currentObject;
-    private int numSeen;
-    private boolean closed;
-    private final List<DBObject> all = new ArrayList<DBObject>();
-    private MongoCursor<DBObject> cursor;
-    // This allows us to easily enable/disable finalizer for cleaning up un-closed cursors
-    @SuppressWarnings("UnusedDeclaration")// IDEs will say it can be converted to a local variable, resist the urge
-    private OptionalFinalizer optionalFinalizer;
-
-
-    /**
-     * Initializes a new database cursor.
-     *
-     * @param collection     collection to use
-     * @param query          the query filter to apply
-     * @param fields         keys to return from the query
-     * @param readPreference the read preference for this query
-     */
-    public DBCursor(final DBCollection collection, final DBObject query, final DBObject fields, final ReadPreference readPreference) {
-        this(collection, collection.getExecutor(), query, new BasicDBObject(), fields, null, new FindOptions(), readPreference);
-
-        addOption(collection.getOptions());
-
-        DBObject indexKeys = lookupSuitableHints(query, collection.getHintFields());
-        if (indexKeys != null) {
-            hint(indexKeys);
-        }
-    }
-
-    private DBCursor(final DBCollection collection, final OperationExecutor executor, final DBObject filter,
-                     final DBObject modifiers, final DBObject fields, final DBObject sort,
-                     final FindOptions findOptions,
-                     final ReadPreference readPreference) {
-        if (collection == null) {
-            throw new IllegalArgumentException("Collection can't be null");
-        }
-        this.collection = collection;
-        this.executor = executor;
-        this.filter = filter;
-        this.modifiers = modifiers;
-        this.projection = fields;
-        this.sort = sort;
-        this.findOptions = findOptions;
-        this.readPreference = readPreference;
-        this.resultDecoder = collection.getObjectCodec();
-        this.decoderFactory = collection.getDBDecoderFactory();
-    }
-
-    /**
-     * Creates a copy of an existing database cursor. The new cursor is an iterator, even if the original was an array.
-     *
-     * @return the new cursor
-     */
-    public DBCursor copy() {
-        return new DBCursor(collection, executor, filter, modifiers, projection, sort, new FindOptions(findOptions), readPreference);
-    }
-
-    /**
-     * Checks if there is another object available.
-     *
-     * <p><em>Note</em>: Automatically adds the {@link Bytes#QUERYOPTION_AWAITDATA} option to any cursors with the
-     * {@link Bytes#QUERYOPTION_TAILABLE} option set. For non blocking tailable cursors see {@link #tryNext }.</p>
-     *
-     * @return true if there is another object available
-     * @mongodb.driver.manual /core/cursors/#cursor-batches Cursor Batches
-     */
-    @Override
-    public boolean hasNext() {
-        if (closed) {
-            throw new IllegalStateException("Cursor has been closed");
-        }
-
-        if (cursor == null) {
-            FindOperation<DBObject> operation = getQueryOperation(findOptions, resultDecoder);
-            if (operation.getCursorType() == CursorType.Tailable) {
-                operation.cursorType(CursorType.TailableAwait);
-            }
-            initializeCursor(operation);
-        }
-
-        boolean hasNext = cursor.hasNext();
-        setServerCursorOnFinalizer(cursor.getServerCursor());
-        return hasNext;
-    }
-
-    /**
-     * Returns the object the cursor is at and moves the cursor ahead by one.
-     *
-     * <p><em>Note</em>: Automatically adds the {@link Bytes#QUERYOPTION_AWAITDATA} option to any cursors with the
-     * {@link Bytes#QUERYOPTION_TAILABLE} option set. For non blocking tailable cursors see {@link #tryNext }.</p>
-     *
-     * @return the next element
-     * @mongodb.driver.manual /core/cursors/#cursor-batches Cursor Batches
-     */
-    @Override
-    public DBObject next() {
-        checkIteratorOrArray(IteratorOrArray.ITERATOR);
-        if (!hasNext()) {
-            throw new NoSuchElementException();
-        }
-
-        return nextInternal();
-    }
-
-    /**
-     * Non blocking check for tailable cursors to see if another object is available.
-     *
-     * <p>Returns the object the cursor is at and moves the cursor ahead by one or
-     * return null if no documents is available.</p>
-     *
-     * @return the next element or null
-     * @throws MongoException if failed
-     * @throws IllegalArgumentException if the cursor is not tailable
-     * @mongodb.driver.manual /core/cursors/#cursor-batches Cursor Batches
-     */
-    public DBObject tryNext() {
-        if (cursor == null) {
-            FindOperation<DBObject> operation = getQueryOperation(findOptions, resultDecoder);
-            if (!operation.getCursorType().isTailable()) {
-                throw new IllegalArgumentException("Can only be used with a tailable cursor");
-            }
-            initializeCursor(operation);
-        }
-        DBObject next = cursor.tryNext();
-        setServerCursorOnFinalizer(cursor.getServerCursor());
-        return currentObject(next);
-    }
-
-
-    /**
-     * Returns the element the cursor is at.
-     *
-     * @return the current element
-     */
-    public DBObject curr() {
-        return currentObject;
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Adds a query option. See Bytes.QUERYOPTION_* for list.
-     *
-     * @param option the option to be added
-     * @return {@code this} so calls can be chained
-     * @see Bytes
-     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
-     */
-    public DBCursor addOption(final int option) {
-        setOptions(this.options |= option);
-        return this;
-    }
-
-    /**
-     * Sets the query option - see Bytes.QUERYOPTION_* for list.
-     *
-     * @param options the bitmask of options
-     * @return {@code this} so calls can be chained
-     * @see Bytes
-     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
-     */
-    public DBCursor setOptions(final int options) {
-        if ((options & Bytes.QUERYOPTION_EXHAUST) != 0) {
-            throw new UnsupportedOperationException("exhaust query option is not supported");
-        }
-        this.options = options;
-        return this;
-    }
-
-    /**
-     * Resets the query options.
-     *
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
-     */
-    public DBCursor resetOptions() {
-        this.options = 0;
-        return this;
-    }
-
-    /**
-     * Gets the query options.
-     *
-     * @return the bitmask of options
-     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-query Query Flags
-     */
-    public int getOptions() {
-        return options;
-    }
-
-    /**
-     * Gets the query limit.
-     *
-     * @return the limit, or 0 if no limit is set
-     */
-    public int getLimit() {
-        return findOptions.getLimit();
-    }
-
-    /**
-     * Gets the batch size.
-     *
-     * @return the batch size
-     */
-    public int getBatchSize() {
-        return findOptions.getBatchSize();
-    }
-
-    /**
-     * Adds a special operator like $maxScan or $returnKey. For example:
-     * <pre>
-     *    addSpecial("$returnKey", 1)
-     *    addSpecial("$maxScan", 100)
-     * </pre>
-     *
-     * @param name  the name of the special query operator
-     * @param value the value of the special query operator
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual reference/operator Special Operators
-     */
-    public DBCursor addSpecial(final String name, final Object value) {
-        if (name == null || value == null) {
-            return this;
-        }
-
-        if ("$comment".equals(name)) {
-            comment(value.toString());
-        } else if ("$explain".equals(name)) {
-            modifiers.put("$explain", true);
-        } else if ("$hint".equals(name)) {
-            if (value instanceof String) {
-                hint((String) value);
-            } else {
-                hint((DBObject) value);
-            }
-        } else if ("$maxScan".equals(name)) {
-            maxScan(((Number) value).intValue());
-        } else if ("$maxTimeMS".equals(name)) {
-            maxTime(((Number) value).longValue(), MILLISECONDS);
-        } else if ("$max".equals(name)) {
-            max((DBObject) value);
-        } else if ("$min".equals(name)) {
-            min((DBObject) value);
-        } else if ("$orderby".equals(name)) {
-            sort((DBObject) value);
-        } else if ("$returnKey".equals(name)) {
-            returnKey();
-        } else if ("$showDiskLoc".equals(name)) {
-            showDiskLoc();
-        } else if ("$snapshot".equals(name)) {
-            snapshot();
-        } else if ("$natural".equals(name)) {
-            sort(new BasicDBObject("$natural", ((Number) value).intValue()));
-        } else {
-            throw new IllegalArgumentException(name + "is not a supported modifier");
-        }
-        return this;
-    }
-
-    /**
-     * Adds a comment to the query to identify queries in the database profiler output.
-     *
-     * @param comment the comment that is to appear in the profiler output
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual reference/operator/meta/comment/ $comment
-     * @since 2.12
-     */
-    public DBCursor comment(final String comment) {
-        modifiers.put("$comment", comment);
-        return this;
-    }
-
-    /**
-     * Limits the number of documents a cursor will return for a query.
-     *
-     * @param max the maximum number of documents to return
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual reference/operator/meta/maxScan/ $maxScan
-     * @see #limit(int)
-     * @since 2.12
-     */
-    public DBCursor maxScan(final int max) {
-        modifiers.put("$maxScan", max);
-        return this;
-    }
-
-    /**
-     * Specifies an <em>exclusive</em> upper limit for the index to use in a query.
-     *
-     * @param max a document specifying the fields, and the upper bound values for those fields
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual reference/operator/meta/max/ $max
-     * @since 2.12
-     */
-    public DBCursor max(final DBObject max) {
-        modifiers.put("$max", max);
-        return this;
-    }
-
-    /**
-     * Specifies an <em>inclusive</em> lower limit for the index to use in a query.
-     *
-     * @param min a document specifying the fields, and the lower bound values for those fields
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual reference/operator/meta/min/ $min
-     * @since 2.12
-     */
-    public DBCursor min(final DBObject min) {
-        modifiers.put("$min", min);
-        return this;
-    }
-
-    /**
-     * Forces the cursor to only return fields included in the index.
-     *
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual reference/operator/meta/returnKey/ $returnKey
-     * @since 2.12
-     */
-    public DBCursor returnKey() {
-        modifiers.put("$returnKey", true);
-        return this;
-    }
-
-    /**
-     * Modifies the documents returned to include references to the on-disk location of each document.  The location will be returned in a
-     * property named {@code $diskLoc}
-     *
-     * @return {@code this} so calls can be chained
-     * @mongodb.driver.manual reference/operator/meta/showDiskLoc/ $showDiskLoc
-     * @since 2.12
-     */
-    public DBCursor showDiskLoc() {
-        modifiers.put("$showDiskLoc", true);
-        return this;
-    }
-
-    /**
-     * Informs the database of indexed fields of the collection in order to improve performance.
-     *
-     * @param indexKeys a {@code DBObject} with fields and direction
-     * @return same DBCursor for chaining operations
-     * @mongodb.driver.manual reference/operator/meta/hint/ $hint
-     */
-    public DBCursor hint(final DBObject indexKeys) {
-        modifiers.put("$hint", indexKeys);
-        return this;
-    }
-
-    /**
-     * Informs the database of an indexed field of the collection in order to improve performance.
-     *
-     * @param indexName the name of an index
-     * @return same DBCursor for chaining operations
-     * @mongodb.driver.manual reference/operator/meta/hint/ $hint
-     */
-    public DBCursor hint(final String indexName) {
-        modifiers.put("$hint", indexName);
-        return this;
-    }
-
-    /**
-     * Set the maximum execution time for operations on this cursor.
-     *
-     * @param maxTime  the maximum time that the server will allow the query to run, before killing the operation. A non-zero value requires
-     *                 a server version &gt;= 2.6
-     * @param timeUnit the time unit
-     * @return same DBCursor for chaining operations
-     * @mongodb.server.release 2.6
-     * @mongodb.driver.manual reference/operator/meta/maxTimeMS/ $maxTimeMS
-     * @since 2.12.0
-     */
-    public DBCursor maxTime(final long maxTime, final TimeUnit timeUnit) {
-        findOptions.maxTime(maxTime, timeUnit);
-        return this;
-    }
-
-    /**
-     * Use snapshot mode for the query. Snapshot mode prevents the cursor from returning a document more than once because an intervening
-     * write operation results in a move of the document. Even in snapshot mode, documents inserted or deleted during the lifetime of the
-     * cursor may or may not be returned.  Currently, snapshot mode may not be used with sorting or explicit hints.
-     *
-     * @return {@code this} so calls can be chained
-     *
-     * @see com.mongodb.DBCursor#sort(DBObject)
-     * @see com.mongodb.DBCursor#hint(DBObject)
-     * @mongodb.driver.manual reference/operator/meta/snapshot/ $snapshot
-     */
-    public DBCursor snapshot() {
-        modifiers.put("$snapshot", true);
-        return this;
-    }
-
-    /**
-     * Returns an object containing basic information about the execution of the query that created this cursor. This creates a {@code
-     * DBObject} with a number of fields, including but not limited to:
-     * <ul>
-     *     <li><i>cursor:</i> cursor type</li>
-     *     <li><i>nScanned:</i> number of records examined by the database for this query </li>
-     *     <li><i>n:</i> the number of records that the database returned</li>
-     *     <li><i>millis:</i> how long it took the database to execute the query</li>
-     * </ul>
-     *
-     * @return a {@code DBObject} containing the explain output for this DBCursor's query
-     * @throws MongoException if the operation failed
-     * @mongodb.driver.manual reference/explain Explain Output
-     */
-    public DBObject explain() {
-        return toDBObject(executor.execute(getQueryOperation(findOptions, collection.getObjectCodec())
-                                           .asExplainableOperation(ExplainVerbosity.QUERY_PLANNER),
-                                           getReadPreference()));
-    }
-
-    private FindOperation<DBObject> getQueryOperation(final FindOptions options, final Decoder<DBObject> decoder) {
-        FindOperation<DBObject> operation = new FindOperation<DBObject>(collection.getNamespace(), decoder)
-                                                .readConcern(getReadConcern())
-                                                .filter(collection.wrapAllowNull(filter))
-                                                .batchSize(options.getBatchSize())
-                                                .skip(options.getSkip())
-                                                .limit(options.getLimit())
-                                                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
-                                                .modifiers(collection.wrap(modifiers))
-                                                .projection(collection.wrapAllowNull(projection))
-                                                .sort(collection.wrapAllowNull(sort))
-                                                .noCursorTimeout(options.isNoCursorTimeout())
-                                                .oplogReplay(options.isOplogReplay())
-                                                .partial(options.isPartial());
-
-        if ((this.options & Bytes.QUERYOPTION_TAILABLE) != 0) {
-            if ((this.options & Bytes.QUERYOPTION_AWAITDATA) != 0) {
-                operation.cursorType(CursorType.TailableAwait);
-            } else {
-                operation.cursorType(CursorType.Tailable);
-            }
-        }
-        if ((this.options & Bytes.QUERYOPTION_OPLOGREPLAY) != 0) {
-            operation.oplogReplay(true);
-        }
-        if ((this.options & Bytes.QUERYOPTION_NOTIMEOUT) != 0) {
-            operation.noCursorTimeout(true);
-        }
-        if ((this.options & Bytes.QUERYOPTION_PARTIAL) != 0) {
-            operation.partial(true);
-        }
-        return operation;
-    }
-
-    /**
-     * Sorts this cursor's elements. This method must be called before getting any object from the cursor.
-     *
-     * @param orderBy the fields by which to sort
-     * @return a cursor pointing to the first element of the sorted results
-     */
-    public DBCursor sort(final DBObject orderBy) {
-        this.sort = orderBy;
-        return this;
-    }
-
-    /**
-     * Limits the number of elements returned. Note: parameter {@code limit} should be positive, although a negative value is
-     * supported for legacy reason. Passing a negative value will call {@link DBCursor#batchSize(int)} which is the preferred method.
-     *
-     * @param limit the number of elements to return
-     * @return a cursor to iterate the results
-     * @mongodb.driver.manual reference/method/cursor.limit Limit
-     */
-    public DBCursor limit(final int limit) {
-        findOptions.limit(limit);
-        return this;
-    }
-
-    /**
-     * <p>Limits the number of elements returned in one batch. A cursor typically fetches a batch of result objects and store them
-     * locally.</p>
-     *
-     * <p>If {@code batchSize} is positive, it represents the size of each batch of objects retrieved. It can be adjusted to optimize
-     * performance and limit data transfer.</p>
-     *
-     * <p>If {@code batchSize} is negative, it will limit of number objects returned, that fit within the max batch size limit (usually
-     * 4MB), and cursor will be closed. For example if {@code batchSize} is -10, then the server will return a maximum of 10 documents and
-     * as many as can fit in 4MB, then close the cursor. Note that this feature is different from limit() in that documents must fit within
-     * a maximum size, and it removes the need to send a request to close the cursor server-side.</p>
-     *
-     * @param numberOfElements the number of elements to return in a batch
-     * @return {@code this} so calls can be chained
-     */
-    public DBCursor batchSize(final int numberOfElements) {
-        findOptions.batchSize(numberOfElements);
-        return this;
-    }
-
-    /**
-     * Discards a given number of elements at the beginning of the cursor.
-     *
-     * @param numberOfElements the number of elements to skip
-     * @return a cursor pointing to the new first element of the results
-     * @throws IllegalStateException if the cursor has started to be iterated through
-     */
-    public DBCursor skip(final int numberOfElements) {
-        findOptions.skip(numberOfElements);
-        return this;
-    }
-
-    @Override
-    public long getCursorId() {
-        if (cursor != null && cursor.getServerCursor() != null) {
-            return cursor.getServerCursor().getId();
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Returns the number of objects through which the cursor has iterated.
-     *
-     * @return the number of objects seen
-     */
-    public int numSeen() {
-        return numSeen;
-    }
-
-    @Override
-    public void close() {
-        closed = true;
-        if (cursor != null) {
-            cursor.close();
-            cursor = null;
-            setServerCursorOnFinalizer(null);
-        }
-
-        currentObject = null;
-    }
-
-    /**
-     * Declare that this query can run on a secondary server.
-     *
-     * @return a copy of the same cursor (for chaining)
-     * @see ReadPreference#secondaryPreferred()
-     * @deprecated Replaced with {@link com.mongodb.ReadPreference#secondaryPreferred()}
-     */
-    @Deprecated
-    public DBCursor slaveOk() {
-        return addOption(Bytes.QUERYOPTION_SLAVEOK);
-    }
-
-    /**
-     * <p>Creates a copy of this cursor object that can be iterated. Note: - you can iterate the DBCursor itself without calling this method
-     * - no actual data is getting copied.</p>
-     *
-     * <p>Note that use of this method does not let you call close the underlying cursor in the case of either an exception or an early
-     * break.  The preferred method of iteration is to use DBCursor as an Iterator, so that you can call close() on it in a finally
-     * block.</p>
-     *
-     * @return an iterator
-     */
-    @Override
-    public Iterator<DBObject> iterator() {
-        return this.copy();
-    }
-
-    /**
-     * Converts this cursor to an array.
-     *
-     * @return an array of elements
-     * @throws MongoException if failed
-     */
-    public List<DBObject> toArray() {
-        return toArray(Integer.MAX_VALUE);
-    }
-
-    /**
-     * Converts this cursor to an array.
-     *
-     * @param max the maximum number of objects to return
-     * @return an array of objects
-     * @throws MongoException if failed
-     */
-    public List<DBObject> toArray(final int max) {
-        checkIteratorOrArray(IteratorOrArray.ARRAY);
-        fillArray(max - 1);
-        return all;
-    }
-
-    /**
-     * Counts the number of objects matching the query. This does not take limit/skip into consideration, and does initiate a call to the
-     * server.
-     *
-     * @return the number of objects
-     * @throws MongoException if the operation failed
-     * @see DBCursor#size
-     */
-    public int count() {
-        return (int) collection.getCount(getQuery(), 0, 0, getReadPreferenceForCursor(), getReadConcern(),
-                                         findOptions.getMaxTime(MILLISECONDS), MILLISECONDS,
-                                         collection.wrap(modifiers).get("$hint"));
-    }
-
-    /**
-     * Returns the first document that matches the query.
-     *
-     * @return the first matching document
-     * @since 2.12
-     */
-    public DBObject one() {
-        return collection.findOne(getQuery(), getKeysWanted(), sort,
-                                  getReadPreferenceForCursor(), getReadConcern(), findOptions.getMaxTime(MILLISECONDS), MILLISECONDS);
-    }
-
-    /**
-     * Pulls back all items into an array and returns the number of objects. Note: this can be resource intensive.
-     *
-     * @return the number of elements in the array
-     * @throws MongoException if failed
-     * @see #count()
-     * @see #size()
-     */
-    public int length() {
-        checkIteratorOrArray(IteratorOrArray.ARRAY);
-        fillArray(Integer.MAX_VALUE);
-        return all.size();
-    }
-
-    /**
-     * For testing only! Iterates cursor and counts objects
-     *
-     * @return num objects
-     * @throws MongoException if failed
-     * @see #count()
-     */
-    public int itcount() {
-        int n = 0;
-        while (this.hasNext()) {
-            this.next();
-            n++;
-        }
-        return n;
-    }
-
-
-    /**
-     * Counts the number of objects matching the query this does take limit/skip into consideration
-     *
-     * @return the number of objects
-     * @throws MongoException if the operation failed
-     * @see #count()
-     */
-    public int size() {
-        return (int) collection.getCount(getQuery(), findOptions.getLimit(),
-                                         findOptions.getSkip(), getReadPreference(), getReadConcern(),
-                                         findOptions.getMaxTime(MILLISECONDS), MILLISECONDS);
-    }
-
-    /**
-     * Gets the fields to be returned.
-     *
-     * @return the field selector that cursor used
-     */
-    public DBObject getKeysWanted() {
-        return projection;
-    }
-
-    /**
-     * Gets the query.
-     *
-     * @return the query that cursor used
-     */
-    public DBObject getQuery() {
-        return filter;
-    }
-
-    /**
-     * Gets the collection.
-     *
-     * @return the collection that data is pulled from
-     */
-    public DBCollection getCollection() {
-        return collection;
-    }
-
-    @Override
-    public ServerAddress getServerAddress() {
-        if (cursor != null) {
-            return cursor.getServerAddress();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the read preference for this cursor. See the documentation for {@link ReadPreference} for more information.
-     *
-     * @param readPreference read preference to use
-     * @return {@code this} so calls can be chained
-     */
-    public DBCursor setReadPreference(final ReadPreference readPreference) {
-        this.readPreference = readPreference;
-        return this;
-    }
-
-    /**
-     * Gets the default read preference.
-     *
-     * @return the readPreference used by this cursor
-     */
-    public ReadPreference getReadPreference() {
-        if (readPreference != null) {
-            return readPreference;
-        }
-        return collection.getReadPreference();
-    }
-
-
-    /**
-     * Sets the read concern for this collection.
-     *
-     * @param readConcern the read concern to use for this collection
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    DBCursor setReadConcern(final ReadConcern readConcern) {
-        this.readConcern = readConcern;
-        return this;
-    }
-
-    /**
-     * Get the read concern for this collection.
-     *
-     * @return the {@link com.mongodb.ReadConcern}
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    ReadConcern getReadConcern() {
-        if (readConcern != null) {
-            return readConcern;
-        }
-        return collection.getReadConcern();
-    }
-
-    /**
-     * Sets the factory that will be used create a {@code DBDecoder} that will be used to decode BSON documents into DBObject instances.
-     *
-     * @param factory the DBDecoderFactory
-     * @return {@code this} so calls can be chained
-     */
-    public DBCursor setDecoderFactory(final DBDecoderFactory factory) {
-        this.decoderFactory = factory;
-
-        //Not creating new CompoundDBObjectCodec because we don't care about encoder.
-        this.resultDecoder = new DBDecoderAdapter(factory.create(), collection, getCollection().getBufferPool());
-        return this;
-    }
-
-    /**
-     * Gets the decoder factory that creates the decoder this cursor will use to decode objects from MongoDB.
-     *
-     * @return the decoder factory.
-     */
-    public DBDecoderFactory getDecoderFactory() {
-        return decoderFactory;
-    }
-
-    @Override
-    public String toString() {
-        return "DBCursor{"
-               + "collection=" + collection
-               + ", find=" + findOptions
-               + (cursor != null ? (", cursor=" + cursor.getServerCursor()) : "")
-               + '}';
-    }
-
-    private void initializeCursor(final FindOperation<DBObject> operation) {
-        cursor = new MongoBatchCursorAdapter<DBObject>(executor.execute(operation, getReadPreferenceForCursor()));
-        if (isCursorFinalizerEnabled() && cursor.getServerCursor() != null) {
-            optionalFinalizer = new OptionalFinalizer(collection.getDB().getMongo(), collection.getNamespace());
-        }
-    }
-
-    private boolean isCursorFinalizerEnabled() {
-        return collection.getDB().getMongo().getMongoClientOptions().isCursorFinalizerEnabled();
-    }
-
-    private void setServerCursorOnFinalizer(final ServerCursor serverCursor) {
-        if (optionalFinalizer != null) {
-            optionalFinalizer.setServerCursor(serverCursor);
-        }
-    }
-
-    private void checkIteratorOrArray(final IteratorOrArray expected) {
-        if (iteratorOrArray == null) {
-            iteratorOrArray = expected;
-            return;
-        }
-
-        if (expected == iteratorOrArray) {
-            return;
-        }
-
-        throw new IllegalArgumentException("Can't switch cursor access methods");
-    }
-
-    private ReadPreference getReadPreferenceForCursor() {
-        ReadPreference readPreference = getReadPreference();
-        if ((options & Bytes.QUERYOPTION_SLAVEOK) != 0 && !readPreference.isSlaveOk()) {
-            readPreference = ReadPreference.secondaryPreferred();
-        }
-        return readPreference;
-    }
-
-    private void fillArray(final int n) {
-        checkIteratorOrArray(IteratorOrArray.ARRAY);
-        while (n >= all.size() && hasNext()) {
-            all.add(nextInternal());
-        }
-    }
-
-    private DBObject nextInternal() {
-        if (iteratorOrArray == null) {
-            checkIteratorOrArray(IteratorOrArray.ITERATOR);
-        }
-
-        DBObject next = cursor.next();
-        setServerCursorOnFinalizer(cursor.getServerCursor());
-        return currentObject(next);
-    }
-
-    private DBObject currentObject(final DBObject newCurrentObject){
-        if (newCurrentObject != null) {
-            currentObject = newCurrentObject;
-            numSeen++;
-
-            if (projection != null && !(projection.keySet().isEmpty())) {
-                currentObject.markAsPartialObject();
-            }
-        }
-        return newCurrentObject;
-    }
-
-    private static DBObject lookupSuitableHints(final DBObject query, final List<DBObject> hints) {
-        if (hints == null) {
-            return null;
-        }
-
-        Set<String> keys = query.keySet();
-
-        for (final DBObject hint : hints) {
-            if (keys.containsAll(hint.keySet())) {
-                return hint;
-            }
-        }
-        return null;
-    }
-
-    private static enum IteratorOrArray {
-        ITERATOR,
-        ARRAY
-    }
-
-    private static class OptionalFinalizer {
-        private final Mongo mongo;
-        private final MongoNamespace namespace;
-        private volatile ServerCursor serverCursor;
-
-        private OptionalFinalizer(final Mongo mongo, final MongoNamespace namespace) {
-            this.namespace = notNull("namespace", namespace);
-            this.mongo = notNull("mongo", mongo);
-        }
-
-        private void setServerCursor(final ServerCursor serverCursor) {
-            this.serverCursor = serverCursor;
-        }
-
-        @Override
-        protected void finalize() {
-            if (serverCursor != null) {
-                mongo.addOrphanedCursor(serverCursor, namespace);
-            }
-        }
-    }
-}
diff --git a/driver/src/main/com/mongodb/DBObjectCodec.java b/driver/src/main/com/mongodb/DBObjectCodec.java
deleted file mode 100644
index 207fa87911e..00000000000
--- a/driver/src/main/com/mongodb/DBObjectCodec.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import org.bson.BSON;
-import org.bson.BSONObject;
-import org.bson.BsonBinary;
-import org.bson.BsonDbPointer;
-import org.bson.BsonDocument;
-import org.bson.BsonDocumentWriter;
-import org.bson.BsonReader;
-import org.bson.BsonType;
-import org.bson.BsonValue;
-import org.bson.BsonWriter;
-import org.bson.codecs.BsonTypeClassMap;
-import org.bson.codecs.BsonTypeCodecMap;
-import org.bson.codecs.Codec;
-import org.bson.codecs.CollectibleCodec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.EncoderContext;
-import org.bson.codecs.IdGenerator;
-import org.bson.codecs.ObjectIdGenerator;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.types.BSONTimestamp;
-import org.bson.types.Binary;
-import org.bson.types.CodeWScope;
-import org.bson.types.Symbol;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static org.bson.BsonBinarySubType.BINARY;
-import static org.bson.BsonBinarySubType.OLD_BINARY;
-import static org.bson.BsonBinarySubType.UUID_LEGACY;
-import static org.bson.BsonBinarySubType.UUID_STANDARD;
-
-/**
- * A collectible codec for a DBObject.
- *
- * @since 3.0
- */
-@SuppressWarnings("rawtypes")
-public class DBObjectCodec implements CollectibleCodec<DBObject> {
-
-    private static final BsonTypeClassMap DEFAULT_BSON_TYPE_CLASS_MAP = createDefaultBsonTypeClassMap();
-    private static final String ID_FIELD_NAME = "_id";
-
-    private final CodecRegistry codecRegistry;
-    private final BsonTypeCodecMap bsonTypeCodecMap;
-    private final DBObjectFactory objectFactory;
-    private final IdGenerator idGenerator = new ObjectIdGenerator();
-
-    static BsonTypeClassMap createDefaultBsonTypeClassMap() {
-        Map<BsonType, Class<?>> replacements = new HashMap<BsonType, Class<?>>();
-        replacements.put(BsonType.REGULAR_EXPRESSION, Pattern.class);
-        replacements.put(BsonType.SYMBOL, String.class);
-        replacements.put(BsonType.TIMESTAMP, BSONTimestamp.class);
-        replacements.put(BsonType.JAVASCRIPT_WITH_SCOPE, null);
-        replacements.put(BsonType.DOCUMENT, null);
-
-        return new BsonTypeClassMap(replacements);
-    }
-
-    static BsonTypeClassMap getDefaultBsonTypeClassMap() {
-        return DEFAULT_BSON_TYPE_CLASS_MAP;
-    }
-
-    /**
-     * Construct an instance with the given codec registry.
-     *
-     * @param codecRegistry the non-null codec registry
-     */
-    public DBObjectCodec(final CodecRegistry codecRegistry) {
-        this(codecRegistry, DEFAULT_BSON_TYPE_CLASS_MAP);
-    }
-
-    /**
-     * Construct an instance.
-     *
-     * @param codecRegistry the codec registry
-     * @param bsonTypeClassMap the non-null BsonTypeClassMap
-     */
-    public DBObjectCodec(final CodecRegistry codecRegistry, final BsonTypeClassMap bsonTypeClassMap) {
-        this(codecRegistry, bsonTypeClassMap, new BasicDBObjectFactory());
-    }
-
-    /**
-     * Construct an instance.
-     *
-     *  @param codecRegistry the non-null codec registry
-     * @param bsonTypeClassMap the non-null BsonTypeClassMap
-     * @param objectFactory the non-null object factory used to create empty DBObject instances when decoding
-     */
-    public DBObjectCodec(final CodecRegistry codecRegistry, final BsonTypeClassMap bsonTypeClassMap, final DBObjectFactory objectFactory) {
-        this.objectFactory = notNull("objectFactory", objectFactory);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.bsonTypeCodecMap = new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), codecRegistry);
-    }
-
-    @Override
-    public void encode(final BsonWriter writer, final DBObject document, final EncoderContext encoderContext) {
-        writer.writeStartDocument();
-
-        beforeFields(writer, encoderContext, document);
-
-        for (final String key : document.keySet()) {
-            if (skipField(encoderContext, key)) {
-                continue;
-            }
-            writer.writeName(key);
-            writeValue(writer, encoderContext, document.get(key));
-        }
-        writer.writeEndDocument();
-    }
-
-    @Override
-    public DBObject decode(final BsonReader reader, final DecoderContext decoderContext) {
-        List<String> path = new ArrayList<String>(10);
-        return readDocument(reader, decoderContext, path);
-    }
-
-    @Override
-    public Class<DBObject> getEncoderClass() {
-        return DBObject.class;
-    }
-
-    @Override
-    public boolean documentHasId(final DBObject document) {
-        return document.containsField(ID_FIELD_NAME);
-    }
-
-    @Override
-    public BsonValue getDocumentId(final DBObject document) {
-        if (!documentHasId(document)) {
-            throw new IllegalStateException("The document does not contain an _id");
-        }
-
-        Object id = document.get(ID_FIELD_NAME);
-        if (id instanceof BsonValue) {
-            return (BsonValue) id;
-        }
-
-        BsonDocument idHoldingDocument = new BsonDocument();
-        BsonWriter writer = new BsonDocumentWriter(idHoldingDocument);
-        writer.writeStartDocument();
-        writer.writeName(ID_FIELD_NAME);
-        writeValue(writer, EncoderContext.builder().build(), id);
-        writer.writeEndDocument();
-        return idHoldingDocument.get(ID_FIELD_NAME);
-    }
-
-    @Override
-    public DBObject generateIdIfAbsentFromDocument(final DBObject document) {
-        if (!documentHasId(document)) {
-            document.put(ID_FIELD_NAME, idGenerator.generate());
-        }
-        return document;
-    }
-
-    private void beforeFields(final BsonWriter bsonWriter, final EncoderContext encoderContext, final DBObject document) {
-        if (encoderContext.isEncodingCollectibleDocument() && document.containsField(ID_FIELD_NAME)) {
-            bsonWriter.writeName(ID_FIELD_NAME);
-            writeValue(bsonWriter, null, document.get(ID_FIELD_NAME));
-        }
-    }
-
-    private boolean skipField(final EncoderContext encoderContext, final String key) {
-        return encoderContext.isEncodingCollectibleDocument() && key.equals(ID_FIELD_NAME);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void writeValue(final BsonWriter bsonWriter, final EncoderContext encoderContext, final Object initialValue) {
-        Object value = BSON.applyEncodingHooks(initialValue);
-        if (value == null) {
-            bsonWriter.writeNull();
-        } else if (value instanceof DBRef) {
-            encodeDBRef(bsonWriter, (DBRef) value);
-        } else if (value instanceof Map) {
-            encodeMap(bsonWriter, (Map<String, Object>) value);
-        } else if (value instanceof Iterable) {
-            encodeIterable(bsonWriter, (Iterable) value);
-        } else if (value instanceof BSONObject) {
-            encodeBsonObject(bsonWriter, ((BSONObject) value));
-        } else if (value instanceof CodeWScope) {
-            encodeCodeWScope(bsonWriter, (CodeWScope) value);
-        } else if (value instanceof byte[]) {
-            encodeByteArray(bsonWriter, (byte[]) value);
-        } else if (value.getClass().isArray()) {
-            encodeArray(bsonWriter, value);
-        } else if (value instanceof Symbol) {
-            bsonWriter.writeSymbol(((Symbol) value).getSymbol());
-        } else {
-            Codec codec = codecRegistry.get(value.getClass());
-            codec.encode(bsonWriter, value, encoderContext);
-        }
-    }
-
-    private void encodeMap(final BsonWriter bsonWriter, final Map<String, Object> document) {
-        bsonWriter.writeStartDocument();
-
-        for (final Map.Entry<String, Object> entry : document.entrySet()) {
-            bsonWriter.writeName(entry.getKey());
-            writeValue(bsonWriter, null, entry.getValue());
-        }
-        bsonWriter.writeEndDocument();
-    }
-
-    private void encodeBsonObject(final BsonWriter bsonWriter, final BSONObject document) {
-        bsonWriter.writeStartDocument();
-
-        for (String key : document.keySet()) {
-            bsonWriter.writeName(key);
-            writeValue(bsonWriter, null, document.get(key));
-        }
-        bsonWriter.writeEndDocument();
-    }
-
-    private void encodeByteArray(final BsonWriter bsonWriter, final byte[] value) {
-        bsonWriter.writeBinaryData(new BsonBinary(value));
-    }
-
-    private void encodeArray(final BsonWriter bsonWriter, final Object value) {
-        bsonWriter.writeStartArray();
-
-        int size = Array.getLength(value);
-        for (int i = 0; i < size; i++) {
-            writeValue(bsonWriter, null, Array.get(value, i));
-        }
-
-        bsonWriter.writeEndArray();
-    }
-
-    private void encodeDBRef(final BsonWriter bsonWriter, final DBRef dbRef) {
-        bsonWriter.writeStartDocument();
-
-        bsonWriter.writeString("$ref", dbRef.getCollectionName());
-        bsonWriter.writeName("$id");
-        writeValue(bsonWriter, null, dbRef.getId());
-
-        bsonWriter.writeEndDocument();
-    }
-
-    @SuppressWarnings("unchecked")
-    private void encodeCodeWScope(final BsonWriter bsonWriter, final CodeWScope value) {
-        bsonWriter.writeJavaScriptWithScope(value.getCode());
-        encodeBsonObject(bsonWriter, value.getScope());
-    }
-
-    private void encodeIterable(final BsonWriter bsonWriter, final Iterable iterable) {
-        bsonWriter.writeStartArray();
-        for (final Object cur : iterable) {
-            writeValue(bsonWriter, null, cur);
-        }
-        bsonWriter.writeEndArray();
-    }
-
-    private Object readValue(final BsonReader reader, final DecoderContext decoderContext, final String fieldName,
-                             final List<String> path) {
-        Object initialRetVal;
-        BsonType bsonType = reader.getCurrentBsonType();
-
-        if (bsonType.isContainer() && fieldName != null) {
-            //if we got into some new context like nested document or array
-            path.add(fieldName);
-        }
-
-        switch (bsonType) {
-            case DOCUMENT:
-                initialRetVal = verifyForDBRef(readDocument(reader, decoderContext, path));
-                break;
-            case ARRAY:
-                initialRetVal = readArray(reader, decoderContext, path);
-                break;
-            case JAVASCRIPT_WITH_SCOPE: //custom for driver-compat types
-                initialRetVal = readCodeWScope(reader, decoderContext, path);
-                break;
-            case DB_POINTER: //custom for driver-compat types
-                BsonDbPointer dbPointer = reader.readDBPointer();
-                initialRetVal = new DBRef(dbPointer.getNamespace(), dbPointer.getId());
-                break;
-            case BINARY:
-                initialRetVal = readBinary(reader, decoderContext);
-                break;
-            case NULL:
-                reader.readNull();
-                initialRetVal = null;
-                break;
-            default:
-                initialRetVal = bsonTypeCodecMap.get(bsonType).decode(reader, decoderContext);
-        }
-
-        if (bsonType.isContainer() && fieldName != null) {
-            //step out of current context to a parent
-            path.remove(fieldName);
-        }
-
-        return BSON.applyDecodingHooks(initialRetVal);
-    }
-
-    private Object readBinary(final BsonReader reader, final DecoderContext decoderContext) {
-        byte bsonSubType = reader.peekBinarySubType();
-
-        if (bsonSubType == UUID_STANDARD.getValue() || bsonSubType == UUID_LEGACY.getValue()) {
-            return codecRegistry.get(UUID.class).decode(reader, decoderContext);
-        } else if (bsonSubType == BINARY.getValue() || bsonSubType == OLD_BINARY.getValue()) {
-            return codecRegistry.get(byte[].class).decode(reader, decoderContext);
-        } else {
-            return codecRegistry.get(Binary.class).decode(reader, decoderContext);
-        }
-    }
-
-    private List readArray(final BsonReader reader, final DecoderContext decoderContext, final List<String> path) {
-        reader.readStartArray();
-        BasicDBList list = new BasicDBList();
-        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-            list.add(readValue(reader, decoderContext, null, path));
-        }
-        reader.readEndArray();
-        return list;
-    }
-
-    private DBObject readDocument(final BsonReader reader, final DecoderContext decoderContext, final List<String> path) {
-        DBObject document = objectFactory.getInstance(path);
-
-        reader.readStartDocument();
-        while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-            String fieldName = reader.readName();
-            document.put(fieldName, readValue(reader, decoderContext, fieldName, path));
-        }
-
-        reader.readEndDocument();
-        return document;
-    }
-
-    private CodeWScope readCodeWScope(final BsonReader reader, final DecoderContext decoderContext, final List<String> path) {
-        return new CodeWScope(reader.readJavaScriptWithScope(), readDocument(reader, decoderContext, path));
-    }
-
-    private Object verifyForDBRef(final DBObject document) {
-        if (document.containsField("$ref") && document.containsField("$id")) {
-            return new DBRef((String) document.get("$ref"), document.get("$id"));
-        } else {
-            return document;
-        }
-    }
-}
-
diff --git a/driver/src/main/com/mongodb/DistinctIterableImpl.java b/driver/src/main/com/mongodb/DistinctIterableImpl.java
deleted file mode 100644
index 53acf253c3d..00000000000
--- a/driver/src/main/com/mongodb/DistinctIterableImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.DistinctIterable;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.operation.DistinctOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-class DistinctIterableImpl<TDocument, TResult> implements DistinctIterable<TResult> {
-    private final MongoNamespace namespace;
-    private final Class<TDocument> documentClass;
-    private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-    private final OperationExecutor executor;
-    private final String fieldName;
-
-    private Bson filter;
-    private long maxTimeMS;
-
-
-    DistinctIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                         final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                         final OperationExecutor executor, final String fieldName, final Bson filter) {
-        this.namespace = notNull("namespace", namespace);
-        this.documentClass = notNull("documentClass", documentClass);
-        this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
-        this.fieldName = notNull("mapFunction", fieldName);
-        this.filter = filter;
-    }
-
-    @Override
-    public DistinctIterable<TResult> filter(final Bson filter) {
-        this.filter = filter;
-        return this;
-    }
-
-    @Override
-    public DistinctIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public DistinctIterable<TResult> batchSize(final int batchSize) {
-        // Noop - not supported by DistinctIterable
-        return this;
-    }
-
-    @Override
-    public MongoCursor<TResult> iterator() {
-        return execute().iterator();
-    }
-
-    @Override
-    public TResult first() {
-        return execute().first();
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block) {
-        execute().forEach(block);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> A into(final A target) {
-        return execute().into(target);
-    }
-
-    private MongoIterable<TResult> execute() {
-        DistinctOperation<TResult> operation = new DistinctOperation<TResult>(namespace, fieldName, codecRegistry.get(resultClass))
-                .filter(filter == null ? null : filter.toBsonDocument(documentClass, codecRegistry))
-                .maxTime(maxTimeMS, MILLISECONDS)
-                .readConcern(readConcern);
-        return new OperationIterable<TResult>(operation, readPreference, executor);
-    }
-}
diff --git a/driver/src/main/com/mongodb/FindIterableImpl.java b/driver/src/main/com/mongodb/FindIterableImpl.java
deleted file mode 100644
index 0ff1ad820f1..00000000000
--- a/driver/src/main/com/mongodb/FindIterableImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.client.model.FindOptions;
-import com.mongodb.operation.BatchCursor;
-import com.mongodb.operation.FindOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.BsonDocument;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-final class FindIterableImpl<TDocument, TResult> implements FindIterable<TResult> {
-    private final MongoNamespace namespace;
-    private final Class<TDocument> documentClass;
-    private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-    private final OperationExecutor executor;
-    private final FindOptions findOptions;
-    private Bson filter;
-
-    FindIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                     final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                     final OperationExecutor executor, final Bson filter, final FindOptions findOptions) {
-        this.namespace = notNull("namespace", namespace);
-        this.documentClass = notNull("documentClass", documentClass);
-        this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
-        this.filter = notNull("filter", filter);
-        this.findOptions = notNull("findOptions", findOptions);
-    }
-
-    @Override
-    public FindIterable<TResult> filter(final Bson filter) {
-        this.filter = filter;
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> limit(final int limit) {
-        findOptions.limit(limit);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> skip(final int skip) {
-        findOptions.skip(skip);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        findOptions.maxTime(maxTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> maxAwaitTime(final long maxAwaitTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        findOptions.maxAwaitTime(maxAwaitTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> batchSize(final int batchSize) {
-        findOptions.batchSize(batchSize);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> modifiers(final Bson modifiers) {
-        findOptions.modifiers(modifiers);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> projection(final Bson projection) {
-        findOptions.projection(projection);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> sort(final Bson sort) {
-        findOptions.sort(sort);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> noCursorTimeout(final boolean noCursorTimeout) {
-        findOptions.noCursorTimeout(noCursorTimeout);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> oplogReplay(final boolean oplogReplay) {
-        findOptions.oplogReplay(oplogReplay);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> partial(final boolean partial) {
-        findOptions.partial(partial);
-        return this;
-    }
-
-    @Override
-    public FindIterable<TResult> cursorType(final CursorType cursorType) {
-        findOptions.cursorType(cursorType);
-        return this;
-    }
-
-    @Override
-    public MongoCursor<TResult> iterator() {
-        return execute().iterator();
-    }
-
-    @Override
-    public TResult first() {
-        return execute().first();
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block) {
-        execute().forEach(block);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> A into(final A target) {
-        return execute().into(target);
-    }
-
-    private MongoIterable<TResult> execute() {
-        return new FindOperationIterable(createQueryOperation(), readPreference, executor);
-    }
-
-    private FindOperation<TResult> createQueryOperation() {
-        return new FindOperation<TResult>(namespace, codecRegistry.get(resultClass))
-                   .filter(filter.toBsonDocument(documentClass, codecRegistry))
-                   .batchSize(findOptions.getBatchSize())
-                   .skip(findOptions.getSkip())
-                   .limit(findOptions.getLimit())
-                   .maxTime(findOptions.getMaxTime(MILLISECONDS), MILLISECONDS)
-                   .maxAwaitTime(findOptions.getMaxAwaitTime(MILLISECONDS), MILLISECONDS)
-                   .modifiers(toBsonDocument(findOptions.getModifiers()))
-                   .projection(toBsonDocument(findOptions.getProjection()))
-                   .sort(toBsonDocument(findOptions.getSort()))
-                   .cursorType(findOptions.getCursorType())
-                   .noCursorTimeout(findOptions.isNoCursorTimeout())
-                   .oplogReplay(findOptions.isOplogReplay())
-                   .partial(findOptions.isPartial())
-                   .slaveOk(readPreference.isSlaveOk())
-                   .readConcern(readConcern);
-    }
-
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(documentClass, codecRegistry);
-    }
-
-    private final class FindOperationIterable extends OperationIterable<TResult> {
-        private final ReadPreference readPreference;
-        private final OperationExecutor executor;
-
-        FindOperationIterable(final FindOperation<TResult> operation, final ReadPreference readPreference,
-                              final OperationExecutor executor) {
-            super(operation, readPreference, executor);
-            this.readPreference = readPreference;
-            this.executor = executor;
-        }
-
-        @Override
-        public TResult first() {
-            FindOperation<TResult> findFirstOperation = createQueryOperation().batchSize(0).limit(-1);
-            BatchCursor<TResult> batchCursor = executor.execute(findFirstOperation, readPreference);
-            return batchCursor.hasNext() ? batchCursor.next().iterator().next() : null;
-        }
-    }
-}
diff --git a/driver/src/main/com/mongodb/GroupCommand.java b/driver/src/main/com/mongodb/GroupCommand.java
deleted file mode 100644
index 57f8a85a632..00000000000
--- a/driver/src/main/com/mongodb/GroupCommand.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.operation.GroupOperation;
-import org.bson.BsonDocumentWrapper;
-import org.bson.BsonJavaScript;
-
-import static com.mongodb.assertions.Assertions.notNull;
-
-/**
- * This class groups the argument for a group operation and can build the underlying command object
- *
- * @mongodb.driver.manual reference/command/group/ Group
- */
-public class GroupCommand {
-    private final String collectionName;
-    private final DBObject keys;
-    private final String keyf;
-    private final DBObject condition;
-    private final DBObject initial;
-    private final String reduce;
-    private final String finalize;
-
-    /**
-     * Creates a new group command.
-     *
-     * @param collection the collection from which to perform the group by operation.
-     * @param keys       the field or fields to group.
-     * @param condition  optional - a filter to determine which documents in the collection to process.
-     * @param initial    the initial state of the aggregation result document.
-     * @param reduce     a JavaScript aggregation function that operates on the documents during the grouping operation.
-     * @param finalize   optional - a JavaScript function that runs each item in the result set before group returns the final value.
-     */
-    public GroupCommand(final DBCollection collection, final DBObject keys, final DBObject condition,
-                        final DBObject initial, final String reduce, final String finalize) {
-        notNull("collection", collection);
-        this.collectionName = collection.getName();
-        this.keys = keys;
-        this.condition = condition;
-        this.initial = initial;
-        this.reduce = reduce;
-        this.finalize = finalize;
-        this.keyf = null;
-    }
-
-    /**
-     * Creates a new group command.
-     *
-     * @param collection the collection from which to perform the group by operation.
-     * @param keyf       the function that creates a "key object" for use as the grouping key
-     * @param condition  optional - a filter to determine which documents in the collection to process.
-     * @param initial    the initial state of the aggregation result document.
-     * @param reduce     a JavaScript aggregation function that operates on the documents during the grouping operation.
-     * @param finalize   optional - a JavaScript function that runs each item in the result set before group returns the final value.
-     *
-     * @since 3.1
-     */
-    public GroupCommand(final DBCollection collection, final String keyf, final DBObject condition,
-                        final DBObject initial, final String reduce, final String finalize) {
-        notNull("collection", collection);
-        this.collectionName = collection.getName();
-        this.keyf = notNull("keyf", keyf);
-        this.condition = condition;
-        this.initial = initial;
-        this.reduce = reduce;
-        this.finalize = finalize;
-        this.keys = null;
-    }
-
-    /**
-     * Turns this group command into the DBObject format of the command.
-     *
-     * @return a DBObject containing the group command as a MongoDB document
-     */
-    public DBObject toDBObject() {
-        DBObject args = new BasicDBObject("ns", collectionName).append("cond", condition)
-                                                               .append("$reduce", reduce)
-                                                               .append("initial", initial);
-
-        if (keys != null) {
-            args.put("key", keys);
-        }
-
-        if (keyf != null) {
-            args.put("$keyf", keyf);
-        }
-
-        if (finalize != null) {
-            args.put("finalize", finalize);
-        }
-        return new BasicDBObject("group", args);
-    }
-
-    GroupOperation<DBObject> toOperation(final MongoNamespace namespace, final DBObjectCodec codec) {
-        if (initial == null) {
-            throw new IllegalArgumentException("Group command requires an initial document for the aggregate result");
-        }
-
-        if (reduce == null) {
-            throw new IllegalArgumentException("Group command requires a reduce function for the aggregate result");
-        }
-
-        GroupOperation<DBObject> operation = new GroupOperation<DBObject>(namespace,
-                                                                          new BsonJavaScript(reduce),
-                                                                          new BsonDocumentWrapper<DBObject>(initial, codec), codec);
-
-        if (keys != null) {
-            operation.key(new BsonDocumentWrapper<DBObject>(keys, codec));
-        }
-
-        if (keyf != null) {
-            operation.keyFunction(new BsonJavaScript(keyf));
-        }
-
-        if (condition != null) {
-            operation.filter(new BsonDocumentWrapper<DBObject>(condition, codec));
-        }
-
-        if (finalize != null) {
-            operation.finalizeFunction(new BsonJavaScript(finalize));
-        }
-
-        return operation;
-    }
-
-}
diff --git a/driver/src/main/com/mongodb/ListCollectionsIterableImpl.java b/driver/src/main/com/mongodb/ListCollectionsIterableImpl.java
deleted file mode 100644
index da5aa80275e..00000000000
--- a/driver/src/main/com/mongodb/ListCollectionsIterableImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.ListCollectionsIterable;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.operation.ListCollectionsOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.BsonDocument;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-final class ListCollectionsIterableImpl<TResult> implements ListCollectionsIterable<TResult> {
-    private final String databaseName;
-    private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final OperationExecutor executor;
-
-    private Bson filter;
-    private int batchSize;
-    private long maxTimeMS;
-
-    ListCollectionsIterableImpl(final String databaseName, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
-                                final ReadPreference readPreference, final OperationExecutor executor) {
-        this.databaseName = notNull("databaseName", databaseName);
-        this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.executor = notNull("executor", executor);
-    }
-
-    @Override
-    public ListCollectionsIterable<TResult> filter(final Bson filter) {
-        notNull("filter", filter);
-        this.filter = filter;
-        return this;
-    }
-
-    @Override
-    public ListCollectionsIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        this.maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public ListCollectionsIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
-        return this;
-    }
-
-    @Override
-    public MongoCursor<TResult> iterator() {
-        return execute().iterator();
-    }
-
-    @Override
-    public TResult first() {
-        return execute().first();
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block) {
-        execute().forEach(block);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> A into(final A target) {
-        return execute().into(target);
-    }
-
-    private MongoIterable<TResult> execute() {
-        return new OperationIterable<TResult>(createListCollectionsOperation(), readPreference, executor);
-    }
-
-    private ListCollectionsOperation<TResult> createListCollectionsOperation() {
-        return new ListCollectionsOperation<TResult>(databaseName, codecRegistry.get(resultClass))
-                .filter(toBsonDocument(filter))
-                .batchSize(batchSize)
-                .maxTime(maxTimeMS, MILLISECONDS);
-    }
-
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(BsonDocument.class, codecRegistry);
-    }
-
-}
diff --git a/driver/src/main/com/mongodb/ListDatabasesIterableImpl.java b/driver/src/main/com/mongodb/ListDatabasesIterableImpl.java
deleted file mode 100644
index c6310549fb1..00000000000
--- a/driver/src/main/com/mongodb/ListDatabasesIterableImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.mongodb;
-
-import com.mongodb.client.ListDatabasesIterable;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.operation.ListDatabasesOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.codecs.configuration.CodecRegistry;
-
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-
-final class ListDatabasesIterableImpl<TResult> implements ListDatabasesIterable<TResult> {
-    private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final OperationExecutor executor;
-
-    private long maxTimeMS;
-
-    ListDatabasesIterableImpl(final Class<TResult> resultClass, final CodecRegistry codecRegistry,
-                              final ReadPreference readPreference, final OperationExecutor executor) {
-        this.resultClass = notNull("clazz", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.executor = notNull("executor", executor);
-    }
-
-    @Override
-    public ListDatabasesIterableImpl<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        this.maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public MongoCursor<TResult> iterator() {
-        return execute().iterator();
-    }
-
-    @Override
-    public TResult first() {
-        return execute().first();
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block) {
-        execute().forEach(block);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> A into(final A target) {
-        return execute().into(target);
-    }
-
-    @Override
-    public ListDatabasesIterable<TResult> batchSize(final int batchSize) {
-        // Noop - not supported by listDatabasesIterable
-        return this;
-    }
-
-    private MongoIterable<TResult> execute() {
-        return new OperationIterable<TResult>(createListCollectionsOperation(), readPreference, executor);
-    }
-
-    private ListDatabasesOperation<TResult> createListCollectionsOperation() {
-        return new ListDatabasesOperation<TResult>(codecRegistry.get(resultClass)).maxTime(maxTimeMS, MILLISECONDS);
-    }
-
-}
diff --git a/driver/src/main/com/mongodb/ListIndexesIterableImpl.java b/driver/src/main/com/mongodb/ListIndexesIterableImpl.java
deleted file mode 100644
index 318eeb25e6f..00000000000
--- a/driver/src/main/com/mongodb/ListIndexesIterableImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.ListIndexesIterable;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.operation.ListIndexesOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.codecs.configuration.CodecRegistry;
-
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-final class ListIndexesIterableImpl<TResult> implements ListIndexesIterable<TResult> {
-    private final MongoNamespace namespace;
-    private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final OperationExecutor executor;
-
-    private int batchSize;
-    private long maxTimeMS;
-
-    ListIndexesIterableImpl(final MongoNamespace namespace, final Class<TResult> resultClass, final CodecRegistry codecRegistry,
-                            final ReadPreference readPreference, final OperationExecutor executor) {
-        this.namespace = notNull("namespace", namespace);
-        this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.executor = notNull("executor", executor);
-    }
-
-    @Override
-    public ListIndexesIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        this.maxTimeMS = MILLISECONDS.convert(maxTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public ListIndexesIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
-        return this;
-    }
-
-    @Override
-    public MongoCursor<TResult> iterator() {
-        return execute().iterator();
-    }
-
-    @Override
-    public TResult first() {
-        return execute().first();
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block) {
-        execute().forEach(block);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> A into(final A target) {
-        return execute().into(target);
-    }
-
-    private MongoIterable<TResult> execute() {
-        return new OperationIterable<TResult>(createListIndexesOperation(), readPreference, executor);
-    }
-
-    private ListIndexesOperation<TResult> createListIndexesOperation() {
-        return new ListIndexesOperation<TResult>(namespace, codecRegistry.get(resultClass))
-                .batchSize(batchSize)
-                .maxTime(maxTimeMS, MILLISECONDS);
-    }
-
-}
diff --git a/driver/src/main/com/mongodb/MapReduceIterableImpl.java b/driver/src/main/com/mongodb/MapReduceIterableImpl.java
deleted file mode 100644
index b174c3545cc..00000000000
--- a/driver/src/main/com/mongodb/MapReduceIterableImpl.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.MapReduceIterable;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.client.model.FindOptions;
-import com.mongodb.client.model.MapReduceAction;
-import com.mongodb.operation.MapReduceToCollectionOperation;
-import com.mongodb.operation.MapReduceWithInlineResultsOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.BsonDocument;
-import org.bson.BsonJavaScript;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.ReadPreference.primary;
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-class MapReduceIterableImpl<TDocument, TResult> implements MapReduceIterable<TResult> {
-    private final MongoNamespace namespace;
-    private final Class<TDocument> documentClass;
-    private final Class<TResult> resultClass;
-    private final ReadPreference readPreference;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-    private final OperationExecutor executor;
-    private final String mapFunction;
-    private final String reduceFunction;
-
-    private boolean inline = true;
-    private String collectionName;
-    private String finalizeFunction;
-    private Bson scope;
-    private Bson filter;
-    private Bson sort;
-    private int limit;
-    private boolean jsMode;
-    private boolean verbose = true;
-    private long maxTimeMS;
-    private MapReduceAction action = MapReduceAction.REPLACE;
-    private String databaseName;
-    private boolean sharded;
-    private boolean nonAtomic;
-    private int batchSize;
-    private Boolean bypassDocumentValidation;
-
-    MapReduceIterableImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final Class<TResult> resultClass,
-                          final CodecRegistry codecRegistry, final ReadPreference readPreference, final ReadConcern readConcern,
-                          final OperationExecutor executor, final String mapFunction, final String reduceFunction) {
-        this.namespace = notNull("namespace", namespace);
-        this.documentClass = notNull("documentClass", documentClass);
-        this.resultClass = notNull("resultClass", resultClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
-        this.mapFunction = notNull("mapFunction", mapFunction);
-        this.reduceFunction = notNull("reduceFunction", reduceFunction);
-    }
-
-    @Override
-    public MapReduceIterable<TResult> collectionName(final String collectionName) {
-        this.collectionName = notNull("collectionName", collectionName);
-        this.inline = false;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> finalizeFunction(final String finalizeFunction) {
-        this.finalizeFunction = finalizeFunction;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> scope(final Bson scope) {
-        this.scope = scope;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> sort(final Bson sort) {
-        this.sort = sort;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> filter(final Bson filter) {
-        this.filter = filter;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> limit(final int limit) {
-        this.limit = limit;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> jsMode(final boolean jsMode) {
-        this.jsMode = jsMode;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> verbose(final boolean verbose) {
-        this.verbose = verbose;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit) {
-        notNull("timeUnit", timeUnit);
-        this.maxTimeMS = TimeUnit.MILLISECONDS.convert(maxTime, timeUnit);
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> action(final MapReduceAction action) {
-        this.action = action;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> databaseName(final String databaseName) {
-        this.databaseName = databaseName;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> sharded(final boolean sharded) {
-        this.sharded = sharded;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> nonAtomic(final boolean nonAtomic) {
-        this.nonAtomic = nonAtomic;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> batchSize(final int batchSize) {
-        this.batchSize = batchSize;
-        return this;
-    }
-
-    @Override
-    public MapReduceIterable<TResult> bypassDocumentValidation(final Boolean bypassDocumentValidation) {
-        this.bypassDocumentValidation = bypassDocumentValidation;
-        return this;
-    }
-
-    @Override
-    public MongoCursor<TResult> iterator() {
-        return execute().iterator();
-    }
-
-    @Override
-    public TResult first() {
-        return execute().first();
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<TResult, U> mapper) {
-        return new MappingIterable<TResult, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super TResult> block) {
-        execute().forEach(block);
-    }
-
-    @Override
-    public <A extends Collection<? super TResult>> A into(final A target) {
-        return execute().into(target);
-    }
-
-    MongoIterable<TResult> execute() {
-        if (inline) {
-            MapReduceWithInlineResultsOperation<TResult> operation =
-                    new MapReduceWithInlineResultsOperation<TResult>(namespace,
-                            new BsonJavaScript(mapFunction),
-                            new BsonJavaScript(reduceFunction),
-                            codecRegistry.get(resultClass))
-                            .filter(toBsonDocument(filter))
-                            .limit(limit)
-                            .maxTime(maxTimeMS, MILLISECONDS)
-                            .jsMode(jsMode)
-                            .scope(toBsonDocument(scope))
-                            .sort(toBsonDocument(sort))
-                            .verbose(verbose)
-                            .readConcern(readConcern);
-            if (finalizeFunction != null) {
-                operation.finalizeFunction(new BsonJavaScript(finalizeFunction));
-            }
-            return new OperationIterable<TResult>(operation, readPreference, executor);
-        } else {
-            MapReduceToCollectionOperation operation =
-                    new MapReduceToCollectionOperation(namespace, new BsonJavaScript(mapFunction), new BsonJavaScript(reduceFunction),
-                            collectionName)
-                            .filter(toBsonDocument(filter))
-                            .limit(limit)
-                            .maxTime(maxTimeMS, MILLISECONDS)
-                            .jsMode(jsMode)
-                            .scope(toBsonDocument(scope))
-                            .sort(toBsonDocument(sort))
-                            .verbose(verbose)
-                            .action(action.getValue())
-                            .nonAtomic(nonAtomic)
-                            .sharded(sharded)
-                            .databaseName(databaseName)
-                            .bypassDocumentValidation(bypassDocumentValidation);
-
-            if (finalizeFunction != null) {
-                operation.finalizeFunction(new BsonJavaScript(finalizeFunction));
-            }
-            executor.execute(operation);
-
-            String dbName = databaseName != null ? databaseName : namespace.getDatabaseName();
-            return new FindIterableImpl<TDocument, TResult>(new MongoNamespace(dbName, collectionName), documentClass, resultClass,
-                                                            codecRegistry, primary(), readConcern, executor, new BsonDocument(),
-                                                            new FindOptions()).batchSize(batchSize);
-        }
-    }
-
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(documentClass, codecRegistry);
-    }
-
-}
diff --git a/driver/src/main/com/mongodb/MongoBatchCursorAdapter.java b/driver/src/main/com/mongodb/MongoBatchCursorAdapter.java
deleted file mode 100644
index 94eed599498..00000000000
--- a/driver/src/main/com/mongodb/MongoBatchCursorAdapter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.MongoCursor;
-import com.mongodb.operation.BatchCursor;
-
-import java.util.List;
-import java.util.NoSuchElementException;
-
-class MongoBatchCursorAdapter<T> implements MongoCursor<T> {
-    private final BatchCursor<T> batchCursor;
-    private List<T> curBatch;
-    private int curPos;
-
-    public MongoBatchCursorAdapter(final BatchCursor<T> batchCursor) {
-        this.batchCursor = batchCursor;
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException("Cursors do not support removal");
-    }
-
-    @Override
-    public void close() {
-        batchCursor.close();
-    }
-
-    @Override
-    public boolean hasNext() {
-        return !needsNewBatch() || batchCursor.hasNext();
-    }
-
-    @Override
-    public T next() {
-        if (!hasNext()) {
-            throw new NoSuchElementException();
-        }
-
-        if (needsNewBatch()) {
-            curBatch = batchCursor.next();
-            curPos = 0;
-        }
-
-        return curBatch.get(curPos++);
-    }
-
-    @Override
-    public T tryNext() {
-        if (needsNewBatch()) {
-            curBatch = batchCursor.tryNext();
-            curPos = 0;
-        }
-
-        return curBatch == null ? null : curBatch.get(curPos++);
-    }
-
-    @Override
-    public ServerCursor getServerCursor() {
-        return batchCursor.getServerCursor();
-    }
-
-    @Override
-    public ServerAddress getServerAddress() {
-        return batchCursor.getServerAddress();
-    }
-
-    private boolean needsNewBatch() {
-        return curBatch == null || curPos == curBatch.size();
-    }
-}
diff --git a/driver/src/main/com/mongodb/MongoClient.java b/driver/src/main/com/mongodb/MongoClient.java
deleted file mode 100644
index 09aec0c07cb..00000000000
--- a/driver/src/main/com/mongodb/MongoClient.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.ListDatabasesIterable;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider;
-import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider;
-import org.bson.BsonDocument;
-import org.bson.Document;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.DocumentCodecProvider;
-import org.bson.codecs.IterableCodecProvider;
-import org.bson.codecs.ValueCodecProvider;
-import org.bson.codecs.configuration.CodecRegistry;
-
-import java.io.Closeable;
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
-
-/**
- * <p>A MongoDB client with internal connection pooling. For most applications, you should have one MongoClient instance for the entire
- * JVM.
- * <p>The following are equivalent, and all connect to the local database running on the default port:</p>
- * <pre>
- * MongoClient mongoClient1 = new MongoClient();
- * MongoClient mongoClient1 = new MongoClient("localhost");
- * MongoClient mongoClient2 = new MongoClient("localhost", 27017);
- * MongoClient mongoClient4 = new MongoClient(new ServerAddress("localhost"));
- * MongoClient mongoClient5 = new MongoClient(new ServerAddress("localhost"), new MongoClientOptions.Builder().build());
- * </pre>
- * <p>You can connect to a <a href="http://www.mongodb.org/display/DOCS/Replica+Sets">replica set</a> using the Java driver by passing a
- * ServerAddress list to the MongoClient constructor. For example:</p>
- * <pre>
- * MongoClient mongoClient = new MongoClient(Arrays.asList(
- *   new ServerAddress("localhost", 27017),
- *   new ServerAddress("localhost", 27018),
- *   new ServerAddress("localhost", 27019)));
- * </pre>
- * <p>You can connect to a sharded cluster using the same constructor.  MongoClient will auto-detect whether the servers are a list of
- * replica set members or a list of mongos servers.</p>
- *
- * <p>By default, all read and write operations will be made on the primary, but it's possible to read from secondaries by changing the read
- * preference:</p>
- * <pre>
- * mongoClient.setReadPreference(ReadPreference.secondaryPreferred());
- * </pre>
- * <p>By default, all write operations will wait for acknowledgment by the server, as the default write concern is {@code
- * WriteConcern.ACKNOWLEDGED}.</p>
- *
- * <p>Note: This class supersedes the {@code Mongo} class.  While it extends {@code Mongo}, it differs from it in that the default write
- * concern is to wait for acknowledgment from the server of all write operations.  In addition, its constructors accept instances of {@code
- * MongoClientOptions} and {@code MongoClientURI}, which both also set the same default write concern.</p>
- *
- * <p>In general, users of this class will pick up all of the default options specified in {@code MongoClientOptions}.  In particular, note
- * that the default value of the connectionsPerHost option has been increased to 100 from the old default value of 10 used by the superseded
- * {@code Mongo} class.</p>
- *
- * @see ReadPreference#primary()
- * @see com.mongodb.WriteConcern#ACKNOWLEDGED
- * @see MongoClientOptions
- * @see MongoClientURI
- * @since 2.10.0
- */
-public class MongoClient extends Mongo implements Closeable {
-
-    private static final CodecRegistry DEFAULT_CODEC_REGISTRY =
-            fromProviders(asList(new ValueCodecProvider(),
-                    new DBRefCodecProvider(),
-                    new DocumentCodecProvider(new DocumentToDBRefTransformer()),
-                    new DBObjectCodecProvider(),
-                    new BsonValueCodecProvider(),
-                    new IterableCodecProvider(new DocumentToDBRefTransformer()),
-                    new GeoJsonCodecProvider(),
-                    new GridFSFileCodecProvider()));
-
-    /**
-     * Gets the default codec registry.  It includes the following providers:
-     * <ul>
-     * <li>{@link org.bson.codecs.ValueCodecProvider}</li>
-     * <li>{@link org.bson.codecs.DocumentCodecProvider}</li>
-     * <li>{@link com.mongodb.DBObjectCodecProvider}</li>
-     * <li>{@link org.bson.codecs.BsonValueCodecProvider}</li>
-     * <li>{@link com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider}</li>
-     * </ul>
-     *
-     * @return the default codec registry
-     * @see MongoClientOptions#getCodecRegistry()
-     * @since 3.0
-     */
-    public static CodecRegistry getDefaultCodecRegistry() {
-        return DEFAULT_CODEC_REGISTRY;
-    }
-
-    /**
-     * Creates an instance based on a (single) mongodb node (localhost, default port).
-     */
-    public MongoClient() {
-        this(new ServerAddress());
-    }
-
-    /**
-     * Creates a Mongo instance based on a (single) mongodb node.
-     *
-     * @param host server to connect to in format host[:port]
-     */
-    public MongoClient(final String host) {
-        this(new ServerAddress(host));
-    }
-
-    /**
-     * Creates a Mongo instance based on a (single) mongodb node (default port).
-     *
-     * @param host    server to connect to in format host[:port]
-     * @param options default query options
-     */
-    public MongoClient(final String host, final MongoClientOptions options) {
-        this(new ServerAddress(host), options);
-    }
-
-    /**
-     * Creates a Mongo instance based on a (single) mongodb node.
-     *
-     * @param host the database's host address
-     * @param port the port on which the database is running
-     */
-    public MongoClient(final String host, final int port) {
-        this(new ServerAddress(host, port));
-    }
-
-    /**
-     * Creates a Mongo instance based on a (single) mongodb node
-     *
-     * @param addr the database address
-     * @see com.mongodb.ServerAddress
-     */
-    public MongoClient(final ServerAddress addr) {
-        this(addr, new MongoClientOptions.Builder().build());
-    }
-
-    /**
-     * Creates a Mongo instance based on a (single) mongodb node and a list of credentials
-     *
-     * @param addr            the database address
-     * @param credentialsList the list of credentials used to authenticate all connections
-     * @see com.mongodb.ServerAddress
-     * @since 2.11.0
-     */
-    public MongoClient(final ServerAddress addr, final List<MongoCredential> credentialsList) {
-        this(addr, credentialsList, new MongoClientOptions.Builder().build());
-    }
-
-    /**
-     * Creates a Mongo instance based on a (single) mongo node using a given ServerAddress and default options.
-     *
-     * @param addr    the database address
-     * @param options default options
-     * @see com.mongodb.ServerAddress
-     */
-    public MongoClient(final ServerAddress addr, final MongoClientOptions options) {
-        super(addr, options);
-    }
-
-    /**
-     * Creates a Mongo instance based on a (single) mongo node using a given ServerAddress and default options.
-     *
-     * @param addr            the database address
-     * @param credentialsList the list of credentials used to authenticate all connections
-     * @param options         default options
-     * @see com.mongodb.ServerAddress
-     * @since 2.11.0
-     */
-    public MongoClient(final ServerAddress addr, final List<MongoCredential> credentialsList, final MongoClientOptions options) {
-        super(addr, credentialsList, options);
-    }
-
-    /**
-     * <p>Creates an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
-     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
-     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress)} constructor instead.</p>
-     *
-     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
-     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
-     * The servers to randomly select from are further limited by the local threshold.  See
-     * {@link MongoClientOptions#getLocalThreshold()}</p>
-     *
-     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
-     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
-     * @see MongoClientOptions#getLocalThreshold()
-     */
-    public MongoClient(final List<ServerAddress> seeds) {
-        this(seeds, new MongoClientOptions.Builder().build());
-    }
-
-    /**
-     * <p>Creates an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
-     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
-     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress, List)}
-     * constructor instead.</p>
-     *
-     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
-     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
-     * The servers to randomly select from are further limited by the local threshold.  See
-     * {@link MongoClientOptions#getLocalThreshold()}</p>
-     *
-     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
-     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
-     * @param credentialsList the list of credentials used to authenticate all connections
-     * @see MongoClientOptions#getLocalThreshold()
-     * @since 2.11.0
-     */
-    public MongoClient(final List<ServerAddress> seeds, final List<MongoCredential> credentialsList) {
-        this(seeds, credentialsList, new MongoClientOptions.Builder().build());
-    }
-
-    /**
-     * <p>Construct an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
-     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
-     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress, MongoClientOptions)} constructor
-     * instead.</p>
-     *
-     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
-     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
-     * The servers to randomly select from are further limited by the local threshold.  See
-     * {@link MongoClientOptions#getLocalThreshold()}</p>
-     *
-     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
-     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
-     * @param options the options
-     * @see MongoClientOptions#getLocalThreshold()
-     */
-    public MongoClient(final List<ServerAddress> seeds, final MongoClientOptions options) {
-        super(seeds, options);
-    }
-
-    /**
-     * <p>Creates an instance based on a list of replica set members or mongos servers. For a replica set it will discover all members.
-     * For a list with a single seed, the driver will still discover all members of the replica set.  For a direct
-     * connection to a replica set member, with no discovery, use the {@link #MongoClient(ServerAddress, List, MongoClientOptions)}
-     * constructor instead.</p>
-     *
-     * <p>When there is more than one server to choose from based on the type of request (read or write) and the read preference (if it's a
-     * read request), the driver will randomly select a server to send a request. This applies to both replica sets and sharded clusters.
-     * The servers to randomly select from are further limited by the local threshold.  See
-     * {@link MongoClientOptions#getLocalThreshold()}</p>
-     *
-     * @param seeds Put as many servers as you can in the list and the system will figure out the rest.  This can either be a list of mongod
-     *              servers in the same replica set or a list of mongos servers in the same sharded cluster.
-     * @param credentialsList the list of credentials used to authenticate all connections
-     * @param options         the options
-     * @see MongoClientOptions#getLocalThreshold()
-     * @since 2.11.0
-     */
-    public MongoClient(final List<ServerAddress> seeds, final List<MongoCredential> credentialsList, final MongoClientOptions options) {
-        super(seeds, credentialsList, options);
-    }
-
-    /**
-     * Creates a Mongo described by a URI. If only one address is used it will only connect to that node, otherwise it will discover all
-     * nodes.
-     *
-     * @param uri the URI
-     * @throws MongoException if theres a failure
-     */
-    public MongoClient(final MongoClientURI uri) {
-        super(uri);
-    }
-
-    /**
-     * Gets the options that this client uses to connect to server.
-     *
-     * <p>Note: {@link MongoClientOptions} is immutable.</p>
-     *
-     * @return the options
-     */
-    public MongoClientOptions getMongoClientOptions() {
-        return super.getMongoClientOptions();
-    }
-
-    /**
-     * Gets the list of credentials that this client authenticates all connections with
-     *
-     * @return the list of credentials
-     * @since 2.11.0
-     */
-    public List<MongoCredential> getCredentialsList() {
-        return super.getCredentialsList();
-    }
-
-    /**
-     * Get a list of the database names
-     *
-     * @mongodb.driver.manual reference/command/listDatabases List Databases
-     * @return an iterable containing all the names of all the databases
-     * @since 3.0
-     */
-    public MongoIterable<String> listDatabaseNames() {
-        return new ListDatabasesIterableImpl<BsonDocument>(BsonDocument.class, getDefaultCodecRegistry(),
-                ReadPreference.primary(), createOperationExecutor()).map(new Function<BsonDocument, String>() {
-            @Override
-            public String apply(final BsonDocument result) {
-                return result.getString("name").getValue();
-            }
-        });
-    }
-
-    /**
-     * Gets the list of databases
-     *
-     * @return the list of databases
-     * @since 3.0
-     */
-    public ListDatabasesIterable<Document> listDatabases() {
-        return listDatabases(Document.class);
-    }
-
-    /**
-     * Gets the list of databases
-     *
-     * @param clazz the class to cast the database documents to
-     * @param <T>   the type of the class to use instead of {@code Document}.
-     * @return the list of databases
-     * @since 3.0
-     */
-    public <T> ListDatabasesIterable<T> listDatabases(final Class<T> clazz) {
-        return new ListDatabasesIterableImpl<T>(clazz, getMongoClientOptions().getCodecRegistry(),
-                ReadPreference.primary(), createOperationExecutor());
-    }
-
-    /**
-     * @param databaseName the name of the database to retrieve
-     * @return a {@code MongoDatabase} representing the specified database
-     */
-    public MongoDatabase getDatabase(final String databaseName) {
-        MongoClientOptions clientOptions = getMongoClientOptions();
-        return new MongoDatabaseImpl(databaseName, clientOptions.getCodecRegistry(), clientOptions.getReadPreference(),
-                clientOptions.getWriteConcern(), clientOptions.getReadConcern(), createOperationExecutor());
-    }
-
-    static DBObjectCodec getCommandCodec() {
-        return new DBObjectCodec(getDefaultCodecRegistry());
-    }
-}
diff --git a/driver/src/main/com/mongodb/MongoClientOptions.java b/driver/src/main/com/mongodb/MongoClientOptions.java
deleted file mode 100644
index 6435fb1137b..00000000000
--- a/driver/src/main/com/mongodb/MongoClientOptions.java
+++ /dev/null
@@ -1,1344 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.annotations.Immutable;
-import com.mongodb.annotations.NotThreadSafe;
-import com.mongodb.connection.ConnectionPoolSettings;
-import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.SslSettings;
-import com.mongodb.event.ClusterListener;
-import com.mongodb.event.CommandListener;
-import com.mongodb.event.ServerListener;
-import com.mongodb.event.ServerMonitorListener;
-import org.bson.codecs.configuration.CodecRegistry;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLSocketFactory;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.isTrueArgument;
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-/**
- * <p>Various settings to control the behavior of a {@code MongoClient}.</p>
- *
- * <p>Note: This class is a replacement for {@code MongoOptions}, to be used with {@code MongoClient}.  The main difference in behavior is
- * that the default write concern is {@code WriteConcern.ACKNOWLEDGED}.</p>
- *
- * @see MongoClient
- * @since 2.10.0
- */
-@Immutable
-public class MongoClientOptions {
-
-    private final String description;
-    private final ReadPreference readPreference;
-    private final WriteConcern writeConcern;
-    private final ReadConcern readConcern;
-    private final CodecRegistry codecRegistry;
-
-    private final int minConnectionsPerHost;
-    private final int maxConnectionsPerHost;
-    private final int threadsAllowedToBlockForConnectionMultiplier;
-    private final int serverSelectionTimeout;
-    private final int maxWaitTime;
-    private final int maxConnectionIdleTime;
-    private final int maxConnectionLifeTime;
-
-    private final int connectTimeout;
-    private final int socketTimeout;
-    private final boolean socketKeepAlive;
-    private final boolean sslEnabled;
-    private final boolean sslInvalidHostNameAllowed;
-    private final boolean alwaysUseMBeans;
-    private final int heartbeatFrequency;
-    private final int minHeartbeatFrequency;
-    private final int heartbeatConnectTimeout;
-    private final int heartbeatSocketTimeout;
-    private final int localThreshold;
-
-    private final String requiredReplicaSetName;
-    private final DBDecoderFactory dbDecoderFactory;
-    private final DBEncoderFactory dbEncoderFactory;
-    private final SocketFactory socketFactory;
-    private final boolean cursorFinalizerEnabled;
-    private final ConnectionPoolSettings connectionPoolSettings;
-    private final SocketSettings socketSettings;
-    private final ServerSettings serverSettings;
-    private final SocketSettings heartbeatSocketSettings;
-    private final SslSettings sslSettings;
-    private final List<CommandListener> commandListeners;
-    private final List<ClusterListener> clusterListeners;
-    private final List<ServerListener> serverListeners;
-    private final List<ServerMonitorListener> serverMonitorListeners;
-
-    private MongoClientOptions(final Builder builder) {
-        description = builder.description;
-        minConnectionsPerHost = builder.minConnectionsPerHost;
-        maxConnectionsPerHost = builder.maxConnectionsPerHost;
-        threadsAllowedToBlockForConnectionMultiplier = builder.threadsAllowedToBlockForConnectionMultiplier;
-        serverSelectionTimeout = builder.serverSelectionTimeout;
-        maxWaitTime = builder.maxWaitTime;
-        maxConnectionIdleTime = builder.maxConnectionIdleTime;
-        maxConnectionLifeTime = builder.maxConnectionLifeTime;
-        connectTimeout = builder.connectTimeout;
-        socketTimeout = builder.socketTimeout;
-        socketKeepAlive = builder.socketKeepAlive;
-        readPreference = builder.readPreference;
-        writeConcern = builder.writeConcern;
-        readConcern = builder.readConcern;
-        codecRegistry = builder.codecRegistry;
-        sslEnabled = builder.sslEnabled;
-        sslInvalidHostNameAllowed = builder.sslInvalidHostNameAllowed;
-        alwaysUseMBeans = builder.alwaysUseMBeans;
-        heartbeatFrequency = builder.heartbeatFrequency;
-        minHeartbeatFrequency = builder.minHeartbeatFrequency;
-        heartbeatConnectTimeout = builder.heartbeatConnectTimeout;
-        heartbeatSocketTimeout = builder.heartbeatSocketTimeout;
-        localThreshold = builder.localThreshold;
-        requiredReplicaSetName = builder.requiredReplicaSetName;
-        dbDecoderFactory = builder.dbDecoderFactory;
-        dbEncoderFactory = builder.dbEncoderFactory;
-        socketFactory = builder.socketFactory;
-        cursorFinalizerEnabled = builder.cursorFinalizerEnabled;
-        commandListeners = builder.commandListeners;
-        clusterListeners = builder.clusterListeners;
-        serverListeners = builder.serverListeners;
-        serverMonitorListeners = builder.serverMonitorListeners;
-
-        connectionPoolSettings = ConnectionPoolSettings.builder()
-                                                       .minSize(getMinConnectionsPerHost())
-                                                       .maxSize(getConnectionsPerHost())
-                                                       .maxWaitQueueSize(getThreadsAllowedToBlockForConnectionMultiplier()
-                                                                         * getConnectionsPerHost())
-                                                       .maxWaitTime(getMaxWaitTime(), MILLISECONDS)
-                                                       .maxConnectionIdleTime(getMaxConnectionIdleTime(), MILLISECONDS)
-                                                       .maxConnectionLifeTime(getMaxConnectionLifeTime(), MILLISECONDS)
-                                                       .build();
-
-        socketSettings = SocketSettings.builder()
-                                       .connectTimeout(getConnectTimeout(), MILLISECONDS)
-                                       .readTimeout(getSocketTimeout(), MILLISECONDS)
-                                       .keepAlive(isSocketKeepAlive())
-                                       .build();
-        heartbeatSocketSettings = SocketSettings.builder()
-                                                .connectTimeout(getHeartbeatConnectTimeout(), MILLISECONDS)
-                                                .readTimeout(getHeartbeatSocketTimeout(), MILLISECONDS)
-                                                .keepAlive(isSocketKeepAlive())
-                                                .build();
-
-        ServerSettings.Builder serverSettingsBuilder = ServerSettings.builder()
-                                                               .heartbeatFrequency(getHeartbeatFrequency(), MILLISECONDS)
-                                                               .minHeartbeatFrequency(getMinHeartbeatFrequency(), MILLISECONDS);
-
-        for (ServerListener cur : serverListeners) {
-            serverSettingsBuilder.addServerListener(cur);
-        }
-        for (ServerMonitorListener cur : serverMonitorListeners) {
-            serverSettingsBuilder.addServerMonitorListener(cur);
-        }
-
-        serverSettings = serverSettingsBuilder.build();
-
-        try {
-            sslSettings = SslSettings.builder()
-                                     .enabled(sslEnabled)
-                                     .invalidHostNameAllowed(sslInvalidHostNameAllowed)
-                                     .build();
-        } catch (MongoInternalException e) {
-            // The error message from SslSettings needs to be translated to make sense for users of MongoClientOptions
-            throw new MongoInternalException("By default, SSL connections are only supported on Java 7 or later.  If the application "
-                                             + "must run on Java 6, you must set the MongoClientOptions.sslInvalidHostNameAllowed "
-                                             + "property to false");
-        }
-    }
-
-    /**
-     * Creates a builder instance.
-     *
-     * @return a builder
-     * @since 3.0.0
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    /**
-     * Creates a builder instance.
-     *
-     * @param options existing MongoClientOptions to default the builder settings on.
-     * @return a builder
-     * @since 3.0.0
-     */
-    public static Builder builder(final MongoClientOptions options) {
-        return new Builder(options);
-    }
-
-    /**
-     * <p>Gets the description for this MongoClient, which is used in various places like logging and JMX.</p>
-     *
-     * <p>Default is null.</p>
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * <p>The maximum number of connections allowed per host for this MongoClient instance. Those connections will be kept in a pool when
-     * idle. Once the pool is exhausted, any operation requiring a connection will block waiting for an available connection.</p>
-     *
-     * <p>Default is 100.</p>
-     *
-     * @return the maximum size of the connection pool per host
-     * @see MongoClientOptions#getThreadsAllowedToBlockForConnectionMultiplier()
-     */
-    public int getConnectionsPerHost() {
-        return maxConnectionsPerHost;
-    }
-
-    /**
-     * <p>The minimum number of connections per host for this MongoClient instance. Those connections will be kept in a pool when idle, and
-     * the pool will ensure over time that it contains at least this minimum number.</p>
-     *
-     * <p>Default is 0.</p>
-     *
-     * @return the minimum size of the connection pool per host
-     */
-    public int getMinConnectionsPerHost() {
-        return minConnectionsPerHost;
-    }
-
-    /**
-     * <p>This multiplier, multiplied with the connectionsPerHost setting, gives the maximum number of threads that may be waiting for a
-     * connection to become available from the pool. All further threads will get an exception right away. For example if connectionsPerHost
-     * is 10 and threadsAllowedToBlockForConnectionMultiplier is 5, then up to 50 threads can wait for a connection.</p>
-     *
-     * <p>Default is 5.</p>
-     *
-     * @return the multiplier
-     */
-    public int getThreadsAllowedToBlockForConnectionMultiplier() {
-        return threadsAllowedToBlockForConnectionMultiplier;
-    }
-
-    /**
-     * <p>Gets the server selection timeout in milliseconds, which defines how long the driver will wait for server selection to
-     * succeed before throwing an exception.</p>
-     *
-     * <p>Default is 30,000. A value of 0 means that it will timeout immediately if no server is available.  A negative value means to
-     * wait indefinitely.</p>
-     *
-     * @return the server selection timeout in milliseconds.
-     */
-    public int getServerSelectionTimeout() {
-        return serverSelectionTimeout;
-    }
-
-    /**
-     * <p>The maximum wait time in milliseconds that a thread may wait for a connection to become available.</p>
-     *
-     * <p>Default is 120,000. A value of 0 means that it will not wait.  A negative value means to wait indefinitely.</p>
-     *
-     * @return the maximum wait time.
-     */
-    public int getMaxWaitTime() {
-        return maxWaitTime;
-    }
-
-    /**
-     * The maximum idle time of a pooled connection.  A zero value indicates no limit to the idle time.  A pooled connection that has
-     * exceeded its idle time will be closed and replaced when necessary by a new connection.
-     *
-     * @return the maximum idle time, in milliseconds
-     * @since 2.12
-     */
-    public int getMaxConnectionIdleTime() {
-        return maxConnectionIdleTime;
-    }
-
-    /**
-     * The maximum life time of a pooled connection.  A zero value indicates no limit to the life time.  A pooled connection that has
-     * exceeded its life time will be closed and replaced when necessary by a new connection.
-     *
-     * @return the maximum life time, in milliseconds
-     * @since 2.12
-     */
-    public int getMaxConnectionLifeTime() {
-        return maxConnectionLifeTime;
-    }
-
-    /**
-     * <p>The connection timeout in milliseconds.  A value of 0 means no timeout. It is used solely when establishing a new connection
-     * {@link java.net.Socket#connect(java.net.SocketAddress, int) }</p>
-     *
-     * <p>Default is 10,000.</p>
-     *
-     * @return the socket connect timeout
-     */
-    public int getConnectTimeout() {
-        return connectTimeout;
-    }
-
-    /**
-     * <p>The socket timeout in milliseconds. It is used for I/O socket read and write operations {@link
-     * java.net.Socket#setSoTimeout(int)}</p>
-     *
-     * <p>Default is 0 and means no timeout.</p>
-     *
-     * @return the socket timeout, in milliseconds
-     */
-    public int getSocketTimeout() {
-        return socketTimeout;
-    }
-
-    /**
-     * <p>This flag controls the socket keep alive feature that keeps a connection alive through firewalls {@link
-     * java.net.Socket#setKeepAlive(boolean)}</p>
-     *
-     * <p>Default is false.</p>
-     *
-     * @return whether keep-alive is enabled on each socket
-     */
-    public boolean isSocketKeepAlive() {
-        return socketKeepAlive;
-    }
-
-    /**
-     * Gets the heartbeat frequency. This is the frequency that the driver will attempt to determine the current state of each server in the
-     * cluster. The default value is 10,000 milliseconds.
-     *
-     * @return the heartbeat frequency, in milliseconds
-     * @since 2.12
-     */
-    public int getHeartbeatFrequency() {
-        return heartbeatFrequency;
-    }
-
-    /**
-     * Gets the minimum heartbeat frequency.  In the event that the driver has to frequently re-check a server's availability,
-     * it will wait at least this long since the previous check to avoid wasted effort.  The default value is 500 milliseconds.
-     *
-     * @return the minimum heartbeat frequency, in milliseconds
-     * @since 2.13
-     */
-    public int getMinHeartbeatFrequency() {
-        return minHeartbeatFrequency;
-    }
-
-    /**
-     * <p>Gets the connect timeout for connections used for the cluster heartbeat.</p>
-     *
-     * <p>The default value is 20,000 milliseconds.</p>
-     *
-     * @return the heartbeat connect timeout, in milliseconds
-     * @since 2.12
-     */
-    public int getHeartbeatConnectTimeout() {
-        return heartbeatConnectTimeout;
-    }
-
-    /**
-     * Gets the socket timeout for connections used for the cluster heartbeat.  The default value is 20,000 milliseconds.
-     *
-     * @return the heartbeat socket timeout, in milliseconds
-     * @since 2.12
-     */
-    public int getHeartbeatSocketTimeout() {
-        return heartbeatSocketTimeout;
-    }
-
-    /**
-     * <p>Gets the local threshold.  When choosing among multiple MongoDB servers to send a request, the MongoClient will only
-     * send that request to a server whose ping time is less than or equal to the server with the fastest ping time plus the local
-     * threshold.</p>
-     *
-     * <p>For example, let's say that the client is choosing a server to send a query when the read preference is {@code
-     * ReadPreference.secondary()}, and that there are three secondaries, server1, server2, and server3, whose ping times are 10, 15, and 16
-     * milliseconds, respectively.  With a local threshold of 5 milliseconds, the client will send the query to either
-     * server1 or server2 (randomly selecting between the two).
-     * </p>
-     *
-     * <p> The default value is 15 milliseconds.</p>
-     *
-     * @return the local threshold, in milliseconds
-     * @since 2.13.0
-     * @mongodb.driver.manual reference/program/mongos/#cmdoption--localThreshold Local Threshold
-     */
-    public int getLocalThreshold() {
-        return localThreshold;
-    }
-
-    /**
-     * <p>Gets the required replica set name.  With this option set, the MongoClient instance will</p>
-     *
-     * <ol>
-     *     <li>Connect in replica set mode, and discover all members of the set based on the given servers</li>
-     *     <li>Make sure that the set name reported by all members matches the required set name.</li>
-     *     <li>Refuse to service any requests if any member of the seed list is not part of a replica set with the required name.</li>
-     * </ol>
-     *
-     * @return the required replica set name
-     * @since 2.12
-     */
-    public String getRequiredReplicaSetName() {
-        return requiredReplicaSetName;
-    }
-
-    /**
-     * Whether to use SSL. The default is {@code false}.
-     *
-     * @return true if SSL should be used
-     * @since 3.0
-     */
-    public boolean isSslEnabled() {
-        return sslEnabled;
-    }
-
-    /**
-     * Returns whether invalid host names should be allowed if SSL is enabled.  Defaults to false.  Take care before setting this to
-     * true, as it makes the application susceptible to man-in-the-middle attacks.  Note that host name verification currently requires
-     * Java 7, so if your application is using SSL and must run on Java 6, this property must be set to {@code true}.
-     *
-     * @return true if invalid host names are allowed.
-     */
-    public boolean isSslInvalidHostNameAllowed() {
-        return sslInvalidHostNameAllowed;
-    }
-
-    /**
-     * <p>The read preference to use for queries, map-reduce, aggregation, and count.</p>
-     *
-     * <p>Default is {@code ReadPreference.primary()}.</p>
-     *
-     * @return the read preference
-     * @see com.mongodb.ReadPreference#primary()
-     */
-    public ReadPreference getReadPreference() {
-        return readPreference;
-    }
-
-    /**
-     * <p>The write concern to use.</p>
-     *
-     * <p>Default is {@code WriteConcern.ACKNOWLEDGED}.</p>
-     *
-     * @return the write concern
-     * @see WriteConcern#ACKNOWLEDGED
-     */
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    /**
-     * <p>The read concern to use.</p>
-     *
-     * @return the read concern
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    public ReadConcern getReadConcern() {
-        return readConcern;
-    }
-
-    /**
-     * <p>The codec registry to use.  By default, a {@code MongoClient} will be able to encode and decode instances of {@code
-     * Document}.</p>
-     *
-     * <p>Note that instances of {@code DB} and {@code DBCollection} do not use the registry, so it's not necessary to include a codec for
-     * DBObject in the registry.</p>
-     *
-     * @return the codec registry
-     * @see MongoClient#getDatabase
-     * @since 3.0
-     */
-    public CodecRegistry getCodecRegistry() {
-        return codecRegistry;
-    }
-
-    /**
-     * Gets the list of added {@code CommandListener}. The default is an empty list.
-     *
-     * @return the unmodifiable list of command listeners
-     * @since 3.1
-     */
-    public List<CommandListener> getCommandListeners() {
-        return Collections.unmodifiableList(commandListeners);
-    }
-
-    /**
-     * Gets the list of added {@code ClusterListener}. The default is an empty list.
-     *
-     * @return the unmodifiable list of cluster listeners
-     * @since 3.3
-     */
-    public List<ClusterListener> getClusterListeners() {
-        return Collections.unmodifiableList(clusterListeners);
-    }
-
-    /**
-     * Gets the list of added {@code ServerListener}. The default is an empty list.
-     *
-     * @return the unmodifiable list of server listeners
-     * @since 3.3
-     */
-    public List<ServerListener> getServerListeners() {
-        return Collections.unmodifiableList(serverListeners);
-    }
-
-    /**
-     * Gets the list of added {@code ServerMonitorListener}. The default is an empty list.
-     *
-     * @return the unmodifiable list of server monitor listeners
-     * @since 3.3
-     */
-    public List<ServerMonitorListener> getServerMonitorListeners() {
-        return Collections.unmodifiableList(serverMonitorListeners);
-    }
-
-    /**
-     * Override the decoder factory. Default is for the standard Mongo Java driver configuration.
-     *
-     * @return the decoder factory
-     */
-    public DBDecoderFactory getDbDecoderFactory() {
-        return dbDecoderFactory;
-    }
-
-    /**
-     * Override the encoder factory. Default is for the standard Mongo Java driver configuration.
-     *
-     * @return the encoder factory
-     */
-    public DBEncoderFactory getDbEncoderFactory() {
-        return dbEncoderFactory;
-    }
-
-    /**
-     * <p>Gets whether JMX beans registered by the driver should always be MBeans, regardless of whether the VM is Java 6 or greater. If
-     * false, the driver will use MXBeans if the VM is Java 6 or greater, and use MBeans if the VM is Java 5.</p>
-     *
-     * <p> Default is false. </p>
-     *
-     * @return true if JMX beans should always be MBeans
-     */
-    public boolean isAlwaysUseMBeans() {
-        return alwaysUseMBeans;
-    }
-
-    /**
-     * <p>The socket factory for creating sockets to the mongo server.</p>
-     *
-     * <p>Default is SocketFactory.getDefault()</p>
-     *
-     * @return the socket factory
-     */
-    public SocketFactory getSocketFactory() {
-        return socketFactory;
-    }
-
-    /**
-     * <p>Gets whether there is a a finalize method created that cleans up instances of DBCursor that the client does not close.  If you are
-     * careful to always call the close method of DBCursor, then this can safely be set to false.</p>
-     *
-     * <p>Default is true.</p>
-     *
-     * @return whether finalizers are enabled on cursors
-     * @see DBCursor
-     * @see com.mongodb.DBCursor#close()
-     */
-    public boolean isCursorFinalizerEnabled() {
-        return cursorFinalizerEnabled;
-    }
-
-    ConnectionPoolSettings getConnectionPoolSettings() {
-        return connectionPoolSettings;
-    }
-
-    SocketSettings getSocketSettings() {
-        return socketSettings;
-    }
-
-    ServerSettings getServerSettings() {
-        return serverSettings;
-    }
-
-    SocketSettings getHeartbeatSocketSettings() {
-        return heartbeatSocketSettings;
-    }
-
-    SslSettings getSslSettings() {
-        return sslSettings;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        MongoClientOptions that = (MongoClientOptions) o;
-
-        if (localThreshold != that.localThreshold) {
-            return false;
-        }
-        if (alwaysUseMBeans != that.alwaysUseMBeans) {
-            return false;
-        }
-        if (connectTimeout != that.connectTimeout) {
-            return false;
-        }
-        if (cursorFinalizerEnabled != that.cursorFinalizerEnabled) {
-            return false;
-        }
-        if (minHeartbeatFrequency != that.minHeartbeatFrequency) {
-            return false;
-        }
-        if (heartbeatConnectTimeout != that.heartbeatConnectTimeout) {
-            return false;
-        }
-        if (heartbeatFrequency != that.heartbeatFrequency) {
-            return false;
-        }
-        if (heartbeatSocketTimeout != that.heartbeatSocketTimeout) {
-            return false;
-        }
-        if (maxConnectionIdleTime != that.maxConnectionIdleTime) {
-            return false;
-        }
-        if (maxConnectionLifeTime != that.maxConnectionLifeTime) {
-            return false;
-        }
-        if (maxConnectionsPerHost != that.maxConnectionsPerHost) {
-            return false;
-        }
-        if (serverSelectionTimeout != that.serverSelectionTimeout) {
-            return false;
-        }
-        if (maxWaitTime != that.maxWaitTime) {
-            return false;
-        }
-        if (minConnectionsPerHost != that.minConnectionsPerHost) {
-            return false;
-        }
-        if (socketKeepAlive != that.socketKeepAlive) {
-            return false;
-        }
-        if (socketTimeout != that.socketTimeout) {
-            return false;
-        }
-        if (sslEnabled != that.sslEnabled) {
-            return false;
-        }
-        if (sslInvalidHostNameAllowed != that.sslInvalidHostNameAllowed) {
-            return false;
-        }
-        if (threadsAllowedToBlockForConnectionMultiplier != that.threadsAllowedToBlockForConnectionMultiplier) {
-            return false;
-        }
-        if (dbDecoderFactory != null ? !dbDecoderFactory.equals(that.dbDecoderFactory) : that.dbDecoderFactory != null) {
-            return false;
-        }
-        if (dbEncoderFactory != null ? !dbEncoderFactory.equals(that.dbEncoderFactory) : that.dbEncoderFactory != null) {
-            return false;
-        }
-        if (description != null ? !description.equals(that.description) : that.description != null) {
-            return false;
-        }
-        if (!readPreference.equals(that.readPreference)) {
-            return false;
-        }
-        if (!writeConcern.equals(that.writeConcern)) {
-            return false;
-        }
-        if (!readConcern.equals(that.readConcern)) {
-            return false;
-        }
-        if (!codecRegistry.equals(that.codecRegistry)) {
-            return false;
-        }
-        if (!commandListeners.equals(that.commandListeners)) {
-            return false;
-        }
-        if (!clusterListeners.equals(that.clusterListeners)) {
-            return false;
-        }
-        if (!serverListeners.equals(that.serverListeners)) {
-            return false;
-        }
-        if (!serverMonitorListeners.equals(that.serverMonitorListeners)) {
-            return false;
-        }
-        if (requiredReplicaSetName != null ? !requiredReplicaSetName.equals(that.requiredReplicaSetName)
-                                           : that.requiredReplicaSetName != null) {
-            return false;
-        }
-        if (!socketFactory.getClass().equals(that.socketFactory.getClass())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = description != null ? description.hashCode() : 0;
-        result = 31 * result + readPreference.hashCode();
-        result = 31 * result + writeConcern.hashCode();
-        result = 31 * result + (readConcern != null ? readConcern.hashCode() : 0);
-        result = 31 * result + codecRegistry.hashCode();
-        result = 31 * result + commandListeners.hashCode();
-        result = 31 * result + clusterListeners.hashCode();
-        result = 31 * result + serverListeners.hashCode();
-        result = 31 * result + serverMonitorListeners.hashCode();
-        result = 31 * result + minConnectionsPerHost;
-        result = 31 * result + maxConnectionsPerHost;
-        result = 31 * result + threadsAllowedToBlockForConnectionMultiplier;
-        result = 31 * result + serverSelectionTimeout;
-        result = 31 * result + maxWaitTime;
-        result = 31 * result + maxConnectionIdleTime;
-        result = 31 * result + maxConnectionLifeTime;
-        result = 31 * result + connectTimeout;
-        result = 31 * result + socketTimeout;
-        result = 31 * result + (socketKeepAlive ? 1 : 0);
-        result = 31 * result + (sslEnabled ? 1 : 0);
-        result = 31 * result + (sslInvalidHostNameAllowed ? 1 : 0);
-        result = 31 * result + (alwaysUseMBeans ? 1 : 0);
-        result = 31 * result + heartbeatFrequency;
-        result = 31 * result + minHeartbeatFrequency;
-        result = 31 * result + heartbeatConnectTimeout;
-        result = 31 * result + heartbeatSocketTimeout;
-        result = 31 * result + localThreshold;
-        result = 31 * result + (requiredReplicaSetName != null ? requiredReplicaSetName.hashCode() : 0);
-        result = 31 * result + (dbDecoderFactory != null ? dbDecoderFactory.hashCode() : 0);
-        result = 31 * result + (dbEncoderFactory != null ? dbEncoderFactory.hashCode() : 0);
-        result = 31 * result + (cursorFinalizerEnabled ? 1 : 0);
-        result = 31 * result + socketFactory.getClass().hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "MongoClientOptions{"
-               + "description='" + description + '\''
-               + ", readPreference=" + readPreference
-               + ", writeConcern=" + writeConcern
-               + ", readConcern=" + readConcern
-               + ", codecRegistry=" + codecRegistry
-               + ", commandListeners=" + commandListeners
-               + ", clusterListeners=" + clusterListeners
-               + ", serverListeners=" + serverListeners
-               + ", serverMonitorListeners=" + serverMonitorListeners
-               + ", minConnectionsPerHost=" + minConnectionsPerHost
-               + ", maxConnectionsPerHost=" + maxConnectionsPerHost
-               + ", threadsAllowedToBlockForConnectionMultiplier=" + threadsAllowedToBlockForConnectionMultiplier
-               + ", serverSelectionTimeout=" + serverSelectionTimeout
-               + ", maxWaitTime=" + maxWaitTime
-               + ", maxConnectionIdleTime=" + maxConnectionIdleTime
-               + ", maxConnectionLifeTime=" + maxConnectionLifeTime
-               + ", connectTimeout=" + connectTimeout
-               + ", socketTimeout=" + socketTimeout
-               + ", socketKeepAlive=" + socketKeepAlive
-               + ", sslEnabled=" + sslEnabled
-               + ", sslInvalidHostNamesAllowed=" + sslInvalidHostNameAllowed
-               + ", alwaysUseMBeans=" + alwaysUseMBeans
-               + ", heartbeatFrequency=" + heartbeatFrequency
-               + ", minHeartbeatFrequency=" + minHeartbeatFrequency
-               + ", heartbeatConnectTimeout=" + heartbeatConnectTimeout
-               + ", heartbeatSocketTimeout=" + heartbeatSocketTimeout
-               + ", localThreshold=" + localThreshold
-               + ", requiredReplicaSetName='" + requiredReplicaSetName + '\''
-               + ", dbDecoderFactory=" + dbDecoderFactory
-               + ", dbEncoderFactory=" + dbEncoderFactory
-               + ", socketFactory=" + socketFactory
-               + ", cursorFinalizerEnabled=" + cursorFinalizerEnabled
-               + ", connectionPoolSettings=" + connectionPoolSettings
-               + ", socketSettings=" + socketSettings
-               + ", serverSettings=" + serverSettings
-               + ", heartbeatSocketSettings=" + heartbeatSocketSettings
-               + '}';
-    }
-
-    /**
-     * A builder for MongoClientOptions so that MongoClientOptions can be immutable, and to support easier construction through chaining.
-     *
-     * @since 2.10.0
-     */
-    @NotThreadSafe
-    public static class Builder {
-        private String description;
-        private ReadPreference readPreference = ReadPreference.primary();
-        private WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
-        private ReadConcern readConcern = ReadConcern.DEFAULT;
-        private CodecRegistry codecRegistry = MongoClient.getDefaultCodecRegistry();
-        private final List<CommandListener> commandListeners = new ArrayList<CommandListener>();
-        private final List<ClusterListener> clusterListeners = new ArrayList<ClusterListener>();
-        private final List<ServerListener> serverListeners = new ArrayList<ServerListener>();
-        private final List<ServerMonitorListener> serverMonitorListeners = new ArrayList<ServerMonitorListener>();
-
-        private int minConnectionsPerHost;
-        private int maxConnectionsPerHost = 100;
-        private int threadsAllowedToBlockForConnectionMultiplier = 5;
-        private int serverSelectionTimeout = 1000 * 30;
-        private int maxWaitTime = 1000 * 60 * 2;
-        private int maxConnectionIdleTime;
-        private int maxConnectionLifeTime;
-        private int connectTimeout = 1000 * 10;
-        private int socketTimeout = 0;
-        private boolean socketKeepAlive = false;
-        private boolean sslEnabled = false;
-        private boolean sslInvalidHostNameAllowed = false;
-        private boolean alwaysUseMBeans = false;
-
-        private int heartbeatFrequency = 10000;
-        private int minHeartbeatFrequency = 500;
-        private int heartbeatConnectTimeout = 20000;
-        private int heartbeatSocketTimeout = 20000;
-        private int localThreshold = 15;
-
-        private String requiredReplicaSetName;
-        private DBDecoderFactory dbDecoderFactory = DefaultDBDecoder.FACTORY;
-        private DBEncoderFactory dbEncoderFactory = DefaultDBEncoder.FACTORY;
-        private SocketFactory socketFactory = SocketFactory.getDefault();
-        private boolean cursorFinalizerEnabled = true;
-
-        /**
-         * Creates a Builder for MongoClientOptions, getting the appropriate system properties for initialization.
-         */
-        public Builder() {
-            heartbeatFrequency(Integer.parseInt(System.getProperty("com.mongodb.updaterIntervalMS", "10000")));
-            minHeartbeatFrequency(Integer.parseInt(System.getProperty("com.mongodb.updaterIntervalNoMasterMS", "500")));
-            heartbeatConnectTimeout(Integer.parseInt(System.getProperty("com.mongodb.updaterConnectTimeoutMS", "20000")));
-            heartbeatSocketTimeout(Integer.parseInt(System.getProperty("com.mongodb.updaterSocketTimeoutMS", "20000")));
-            localThreshold(Integer.parseInt(System.getProperty("com.mongodb.slaveAcceptableLatencyMS", "15")));
-        }
-
-        /**
-         * Creates a Builder from an existing MongoClientOptions.
-         *
-         * @param options create a builder from existing options
-         */
-        public Builder(final MongoClientOptions options) {
-            description = options.getDescription();
-            minConnectionsPerHost = options.getMinConnectionsPerHost();
-            maxConnectionsPerHost = options.getConnectionsPerHost();
-            threadsAllowedToBlockForConnectionMultiplier = options.getThreadsAllowedToBlockForConnectionMultiplier();
-            serverSelectionTimeout = options.getServerSelectionTimeout();
-            maxWaitTime = options.getMaxWaitTime();
-            maxConnectionIdleTime = options.getMaxConnectionIdleTime();
-            maxConnectionLifeTime = options.getMaxConnectionLifeTime();
-            connectTimeout = options.getConnectTimeout();
-            socketTimeout = options.getSocketTimeout();
-            socketKeepAlive = options.isSocketKeepAlive();
-            readPreference = options.getReadPreference();
-            writeConcern = options.getWriteConcern();
-            readConcern = options.getReadConcern();
-            codecRegistry = options.getCodecRegistry();
-            sslEnabled = options.isSslEnabled();
-            sslInvalidHostNameAllowed = options.isSslInvalidHostNameAllowed();
-            alwaysUseMBeans = options.isAlwaysUseMBeans();
-            heartbeatFrequency = options.getHeartbeatFrequency();
-            minHeartbeatFrequency = options.getMinHeartbeatFrequency();
-            heartbeatConnectTimeout = options.getHeartbeatConnectTimeout();
-            heartbeatSocketTimeout = options.getHeartbeatSocketTimeout();
-            localThreshold = options.getLocalThreshold();
-            requiredReplicaSetName = options.getRequiredReplicaSetName();
-            dbDecoderFactory = options.getDbDecoderFactory();
-            dbEncoderFactory = options.getDbEncoderFactory();
-            socketFactory = options.getSocketFactory();
-            cursorFinalizerEnabled = options.isCursorFinalizerEnabled();
-            commandListeners.addAll(options.getCommandListeners());
-            clusterListeners.addAll(options.getClusterListeners());
-            serverListeners.addAll(options.getServerListeners());
-            serverMonitorListeners.addAll(options.getServerMonitorListeners());
-        }
-
-        /**
-         * Sets the description.
-         *
-         * @param description the description of this MongoClient
-         * @return {@code this}
-         * @see com.mongodb.MongoClientOptions#getDescription()
-         */
-        public Builder description(final String description) {
-            this.description = description;
-            return this;
-        }
-
-        /**
-         * Sets the minimum number of connections per host.
-         *
-         * @param minConnectionsPerHost minimum number of connections
-         * @return {@code this}
-         * @throws IllegalArgumentException if {@code minConnectionsPerHost < 0}
-         * @see MongoClientOptions#getMinConnectionsPerHost()
-         * @since 2.12
-         */
-        public Builder minConnectionsPerHost(final int minConnectionsPerHost) {
-            isTrueArgument("minConnectionsPerHost must be >= 0", minConnectionsPerHost >= 0);
-            this.minConnectionsPerHost = minConnectionsPerHost;
-            return this;
-        }
-
-        /**
-         * Sets the maximum number of connections per host.
-         *
-         * @param connectionsPerHost maximum number of connections
-         * @return {@code this}
-         * @throws IllegalArgumentException if {@code connectionsPerHost < 1}
-         * @see MongoClientOptions#getConnectionsPerHost()
-         */
-        public Builder connectionsPerHost(final int connectionsPerHost) {
-            isTrueArgument("connectionPerHost must be > 0", connectionsPerHost > 0);
-            this.maxConnectionsPerHost = connectionsPerHost;
-            return this;
-        }
-
-        /**
-         * Sets the multiplier for number of threads allowed to block waiting for a connection.
-         *
-         * @param threadsAllowedToBlockForConnectionMultiplier the multiplier
-         * @return {@code this}
-         * @throws IllegalArgumentException if {@code threadsAllowedToBlockForConnectionMultiplier < 1}
-         * @see MongoClientOptions#getThreadsAllowedToBlockForConnectionMultiplier()
-         */
-        public Builder threadsAllowedToBlockForConnectionMultiplier(final int threadsAllowedToBlockForConnectionMultiplier) {
-            isTrueArgument("threadsAllowedToBlockForConnectionMultiplier must be > 0", threadsAllowedToBlockForConnectionMultiplier > 0);
-            this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
-            return this;
-        }
-
-        /**
-         * <p>Sets the server selection timeout in milliseconds, which defines how long the driver will wait for server selection to
-         * succeed before throwing an exception.</p>
-         *
-         * <p> A value of 0 means that it will timeout immediately if no server is available.  A negative value means to wait
-         * indefinitely.</p>
-         *
-         * @param serverSelectionTimeout the server selection timeout, in milliseconds
-         * @return {@code this}
-         * @see com.mongodb.MongoClientOptions#getServerSelectionTimeout()
-         */
-        public Builder serverSelectionTimeout(final int serverSelectionTimeout) {
-            this.serverSelectionTimeout = serverSelectionTimeout;
-            return this;
-        }
-
-        /**
-         * Sets the maximum time that a thread will block waiting for a connection.
-         *
-         * @param maxWaitTime the maximum wait time, in milliseconds
-         * @return {@code this}
-         * @see MongoClientOptions#getMaxWaitTime()
-         */
-        public Builder maxWaitTime(final int maxWaitTime) {
-            this.maxWaitTime = maxWaitTime;
-            return this;
-        }
-
-        /**
-         * Sets the maximum idle time for a pooled connection.
-         *
-         * @param maxConnectionIdleTime the maximum idle time, in milliseconds, which must be &gt; 0
-         * @return {@code this}
-         * @throws IllegalArgumentException if {@code maxConnectionIdleTime <= 0}
-         * @see com.mongodb.MongoClientOptions#getMaxConnectionIdleTime()
-         * @since 2.12
-         */
-        public Builder maxConnectionIdleTime(final int maxConnectionIdleTime) {
-            this.maxConnectionIdleTime = maxConnectionIdleTime;
-            return this;
-        }
-
-        /**
-         * Sets the maximum life time for a pooled connection.
-         *
-         * @param maxConnectionLifeTime the maximum life time, in milliseconds, which must be &gt; 0
-         * @return {@code this}
-         * @throws IllegalArgumentException if {@code maxConnectionLifeTime <= 0}
-         * @see com.mongodb.MongoClientOptions#getMaxConnectionIdleTime()
-         * @since 2.12
-         */
-        public Builder maxConnectionLifeTime(final int maxConnectionLifeTime) {
-            this.maxConnectionLifeTime = maxConnectionLifeTime;
-            return this;
-        }
-
-
-        /**
-         * Sets the connection timeout.
-         *
-         * @param connectTimeout the connection timeout, in milliseconds, which must be &gt; 0
-         * @throws IllegalArgumentException if {@code connectTimeout <= 0}
-         * @return {@code this}
-         * @see com.mongodb.MongoClientOptions#getConnectTimeout()
-         */
-        public Builder connectTimeout(final int connectTimeout) {
-            isTrueArgument("connectTimeout must be >= 0", connectTimeout >= 0);
-            this.connectTimeout = connectTimeout;
-            return this;
-        }
-
-        /**
-         * Sets the socket timeout.
-         *
-         * @param socketTimeout the socket timeout, in milliseconds
-         * @return {@code this}
-         * @see com.mongodb.MongoClientOptions#getSocketTimeout()
-         */
-        public Builder socketTimeout(final int socketTimeout) {
-            this.socketTimeout = socketTimeout;
-            return this;
-        }
-
-        /**
-         * Sets whether socket keep alive is enabled.
-         *
-         * @param socketKeepAlive keep alive
-         * @return {@code this}
-         * @see com.mongodb.MongoClientOptions#isSocketKeepAlive()
-         */
-        public Builder socketKeepAlive(final boolean socketKeepAlive) {
-            this.socketKeepAlive = socketKeepAlive;
-            return this;
-        }
-
-        /**
-         * Sets whether to use SSL.  Setting this to true will also set the socketFactory to {@code SSLSocketFactory.getDefault()} and
-         * setting it to false will set the socketFactory to {@code SocketFactory.getDefault()}
-         *
-         * @param sslEnabled set to true if using SSL
-         * @return {@code this}
-         * @see MongoClientOptions#isSslEnabled()
-         * @since 3.0
-         */
-        public Builder sslEnabled(final boolean sslEnabled) {
-            this.sslEnabled = sslEnabled;
-            this.socketFactory(sslEnabled ? SSLSocketFactory.getDefault() : SocketFactory.getDefault());
-            return this;
-        }
-
-        /**
-         * Define whether invalid host names should be allowed.  Defaults to false.  Take care before setting this to true, as it makes
-         * the application susceptible to man-in-the-middle attacks.
-         *
-         * @param sslInvalidHostNameAllowed whether invalid host names are allowed in SSL certificates.
-         * @return this
-         */
-        public Builder sslInvalidHostNameAllowed(final boolean sslInvalidHostNameAllowed) {
-            this.sslInvalidHostNameAllowed = sslInvalidHostNameAllowed;
-            return this;
-        }
-
-
-        /**
-         * Sets the read preference.
-         *
-         * @param readPreference read preference
-         * @return {@code this}
-         * @see MongoClientOptions#getReadPreference()
-         */
-        public Builder readPreference(final ReadPreference readPreference) {
-            this.readPreference = notNull("readPreference", readPreference);
-            return this;
-        }
-
-        /**
-         * Sets the write concern.
-         *
-         * @param writeConcern the write concern
-         * @return {@code this}
-         * @see MongoClientOptions#getWriteConcern()
-         */
-        public Builder writeConcern(final WriteConcern writeConcern) {
-            this.writeConcern = notNull("writeConcern", writeConcern);
-            return this;
-        }
-
-
-        /**
-         * Sets the read concern.
-         *
-         * @param readConcern the read concern.
-         * @return this
-         * @see MongoClientOptions#getReadConcern()
-         * @since 3.2
-         * @mongodb.server.release 3.2
-         * @mongodb.driver.manual reference/readConcern/ Read Concern
-         */
-        public Builder readConcern(final ReadConcern readConcern) {
-            this.readConcern = notNull("readConcern", readConcern);
-            return this;
-        }
-
-        /**
-         * Sets the codec registry
-         *
-         * <p>Note that instances of {@code DB} and {@code DBCollection} do not use the registry, so it's not necessary to include a
-         * codec for DBObject in the registry.</p>
-
-         * @param codecRegistry the codec registry
-         * @return {@code this}
-         * @see MongoClientOptions#getCodecRegistry()
-         * @since 3.0
-         */
-        public Builder codecRegistry(final CodecRegistry codecRegistry) {
-            this.codecRegistry = notNull("codecRegistry", codecRegistry);
-            return this;
-        }
-
-        /**
-         * Adds the given command listener.
-         *
-         * @param commandListener the non-null command listener
-         * @return this
-         * @since 3.1
-         */
-        public Builder addCommandListener(final CommandListener commandListener) {
-            notNull("commandListener", commandListener);
-            commandListeners.add(commandListener);
-            return this;
-        }
-
-        /**
-         * Adds the given cluster listener.
-         *
-         * @param clusterListener the non-null cluster listener
-         * @return this
-         * @since 3.3
-         */
-        public Builder addClusterListener(final ClusterListener clusterListener) {
-            notNull("clusterListener", clusterListener);
-            clusterListeners.add(clusterListener);
-            return this;
-        }
-
-        /**
-         * Adds the given server listener.
-         *
-         * @param serverListener the non-null server listener
-         * @return this
-         * @since 3.3
-         */
-        public Builder addServerListener(final ServerListener serverListener) {
-            notNull("serverListener", serverListener);
-            serverListeners.add(serverListener);
-            return this;
-        }
-
-        /**
-         * Adds the given server monitro listener.
-         *
-         * @param serverMonitorListener the non-null server monitor listener
-         * @return this
-         * @since 3.3
-         */
-        public Builder addServerMonitorListener(final ServerMonitorListener serverMonitorListener) {
-            notNull("serverMonitorListener", serverMonitorListener);
-            serverMonitorListeners.add(serverMonitorListener);
-            return this;
-        }
-
-
-        /**
-         * Sets the socket factory.
-         *
-         * @param socketFactory the socket factory
-         * @return {@code this}
-         * @see MongoClientOptions#getSocketFactory()
-         */
-        public Builder socketFactory(final SocketFactory socketFactory) {
-            if (socketFactory == null) {
-                throw new IllegalArgumentException("null is not a legal value");
-            }
-            this.socketFactory = socketFactory;
-            return this;
-        }
-
-        /**
-         * Sets whether cursor finalizers are enabled.
-         *
-         * @param cursorFinalizerEnabled whether cursor finalizers are enabled.
-         * @return {@code this}
-         * @see MongoClientOptions#isCursorFinalizerEnabled()
-         */
-        public Builder cursorFinalizerEnabled(final boolean cursorFinalizerEnabled) {
-            this.cursorFinalizerEnabled = cursorFinalizerEnabled;
-            return this;
-        }
-
-        /**
-         * Sets whether JMX beans registered by the driver should always be MBeans, regardless of whether the VM is Java 6 or greater. If
-         * false, the driver will use MXBeans if the VM is Java 6 or greater, and use MBeans if the VM is Java 5.
-         *
-         * @param alwaysUseMBeans true if driver should always use MBeans, regardless of VM version
-         * @return this
-         * @see MongoClientOptions#isAlwaysUseMBeans()
-         */
-        public Builder alwaysUseMBeans(final boolean alwaysUseMBeans) {
-            this.alwaysUseMBeans = alwaysUseMBeans;
-            return this;
-        }
-
-        /**
-         * Sets the decoder factory.
-         *
-         * @param dbDecoderFactory the decoder factory
-         * @return {@code this}
-         * @see MongoClientOptions#getDbDecoderFactory()
-         */
-        public Builder dbDecoderFactory(final DBDecoderFactory dbDecoderFactory) {
-            if (dbDecoderFactory == null) {
-                throw new IllegalArgumentException("null is not a legal value");
-            }
-            this.dbDecoderFactory = dbDecoderFactory;
-            return this;
-        }
-
-        /**
-         * Sets the encoder factory.
-         *
-         * @param dbEncoderFactory the encoder factory
-         * @return {@code this}
-         * @see MongoClientOptions#getDbEncoderFactory()
-         */
-        public Builder dbEncoderFactory(final DBEncoderFactory dbEncoderFactory) {
-            if (dbEncoderFactory == null) {
-                throw new IllegalArgumentException("null is not a legal value");
-            }
-            this.dbEncoderFactory = dbEncoderFactory;
-            return this;
-        }
-
-        /**
-         * Sets the heartbeat frequency. This is the frequency that the driver will attempt to determine the current state of each server in
-         * the cluster. The default value is 10,000 milliseconds
-         *
-         * @param heartbeatFrequency the heartbeat frequency for the cluster, in milliseconds, which must be &gt; 0
-         * @return {@code this}
-         * @throws IllegalArgumentException if heartbeatFrequency is not &gt; 0
-         * @see MongoClientOptions#getHeartbeatFrequency()
-         * @since 2.12
-         */
-        public Builder heartbeatFrequency(final int heartbeatFrequency) {
-            isTrueArgument("heartbeatFrequency must be > 0", heartbeatFrequency > 0);
-            this.heartbeatFrequency = heartbeatFrequency;
-            return this;
-        }
-
-        /**
-         * Sets the minimum heartbeat frequency.  In the event that the driver has to frequently re-check a server's availability,
-         * it will wait at least this long since the previous check to avoid wasted effort.  The default value is 500 milliseconds.
-         *
-         * @param minHeartbeatFrequency the minimum heartbeat frequency, in milliseconds, which must be &gt; 0
-         * @return {@code this}
-         * @throws IllegalArgumentException if {@code minHeartbeatFrequency <= 0}
-         * @see MongoClientOptions#getMinHeartbeatFrequency()
-         * @since 2.13
-         */
-        public Builder minHeartbeatFrequency(final int minHeartbeatFrequency) {
-            isTrueArgument("minHeartbeatFrequency must be > 0", minHeartbeatFrequency > 0);
-            this.minHeartbeatFrequency = minHeartbeatFrequency;
-            return this;
-        }
-
-        /**
-         * Sets the connect timeout for connections used for the cluster heartbeat.
-         *
-         * @param connectTimeout the connection timeout, in milliseconds
-         * @return {@code this}
-         * @see MongoClientOptions#getHeartbeatConnectTimeout()
-         * @since 2.12
-         */
-        public Builder heartbeatConnectTimeout(final int connectTimeout) {
-            this.heartbeatConnectTimeout = connectTimeout;
-            return this;
-        }
-
-        /**
-         * Sets the socket timeout for connections used for the cluster heartbeat.
-         *
-         * @param socketTimeout the socket timeout, in milliseconds
-         * @return {@code this}
-         * @see MongoClientOptions#getHeartbeatSocketTimeout()
-         * @since 2.12
-         */
-        public Builder heartbeatSocketTimeout(final int socketTimeout) {
-            this.heartbeatSocketTimeout = socketTimeout;
-            return this;
-        }
-
-        /**
-         * Sets the local threshold.
-         *
-         * @param localThreshold the acceptable latency difference, in milliseconds, which must be &gt;= 0
-         * @return {@code this}
-         * @throws IllegalArgumentException if {@code localThreshold < 0}
-         * @see com.mongodb.MongoClientOptions#getLocalThreshold()
-         * @since 2.13.0
-         */
-        public Builder localThreshold(final int localThreshold) {
-            isTrueArgument("localThreshold must be >= 0", localThreshold >= 0);
-            this.localThreshold = localThreshold;
-            return this;
-        }
-
-        /**
-         * Sets the required replica set name for the cluster.
-         *
-         * @param requiredReplicaSetName the required replica set name for the replica set.
-         * @return this
-         * @see MongoClientOptions#getRequiredReplicaSetName()
-         * @since 2.12
-         */
-        public Builder requiredReplicaSetName(final String requiredReplicaSetName) {
-            this.requiredReplicaSetName = requiredReplicaSetName;
-            return this;
-        }
-
-        /**
-         * Sets defaults to be what they are in {@code MongoOptions}.
-         *
-         * @return {@code this}
-         * @see MongoOptions
-         */
-        public Builder legacyDefaults() {
-            this.connectionsPerHost(10).writeConcern(WriteConcern.UNACKNOWLEDGED);
-            return this;
-        }
-
-        /**
-         * Build an instance of MongoClientOptions.
-         *
-         * @return the options from this builder
-         */
-        public MongoClientOptions build() {
-            return new MongoClientOptions(this);
-        }
-
-    }
-}
diff --git a/driver/src/main/com/mongodb/MongoClientURI.java b/driver/src/main/com/mongodb/MongoClientURI.java
deleted file mode 100644
index 419a0241064..00000000000
--- a/driver/src/main/com/mongodb/MongoClientURI.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import java.util.List;
-
-import static com.mongodb.assertions.Assertions.notNull;
-
-/**
- * Represents a <a href="http://www.mongodb.org/display/DOCS/Connections">URI</a>
- * which can be used to create a MongoClient instance. The URI describes the hosts to
- * be used and options.
- * <p>The format of the URI is:
- * <pre>
- *   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
- * </pre>
- * <ul>
- * <li>{@code mongodb://} is a required prefix to identify that this is a string in the standard connection format.</li>
- * <li>{@code username:password@} are optional.  If given, the driver will attempt to login to a database after
- * connecting to a database server.  For some authentication mechanisms, only the username is specified and the password is not,
- * in which case the ":" after the username is left off as well</li>
- * <li>{@code host1} is the only required part of the URI.  It identifies a server address to connect to.</li>
- * <li>{@code :portX} is optional and defaults to :27017 if not provided.</li>
- * <li>{@code /database} is the name of the database to login to and thus is only relevant if the
- * {@code username:password@} syntax is used. If not specified the "admin" database will be used by default.</li>
- * <li>{@code ?options} are connection options. Note that if {@code database} is absent there is still a {@code /}
- * required between the last host and the {@code ?} introducing the options. Options are name=value pairs and the pairs
- * are separated by "&amp;". For backwards compatibility, ";" is accepted as a separator in addition to "&amp;",
- * but should be considered as deprecated.</li>
- * </ul>
- * <p>The following options are supported (case insensitive):</p>
- *
- * <p>Server Selection Configuration:</p>
- * <ul>
- * <li>{@code serverSelectionTimeoutMS=ms}: How long the driver will wait for server selection to succeed before throwing an exception.</li>
- * <li>{@code localThresholdMS=ms}: When choosing among multiple MongoDB servers to send a request, the driver will only
- * send that request to a server whose ping time is less than or equal to the server with the fastest ping time plus the local
- * threshold.</li>
- * </ul>
- * <p>Server Monitoring Configuration:</p>
- * <ul>
- * <li>{@code heartbeatFrequencyMS=ms}: The frequency that the driver will attempt to determine the current state of each server in the
- * cluster.</li>
- * </ul>
- * <p>Replica set configuration:</p>
- * <ul>
- * <li>{@code replicaSet=name}: Implies that the hosts given are a seed list, and the driver will attempt to find
- * all members of the set.</li>
- * </ul>
- *
- * <p>Connection Configuration:</p>
- * <ul>
- * <li>{@code ssl=true|false}: Whether to connect using SSL.</li>
- * <li>{@code sslInvalidHostNameAllowed=true|false}: Whether to allow invalid host names for SSL connections.</li>
- * <li>{@code connectTimeoutMS=ms}: How long a connection can take to be opened before timing out.</li>
- * <li>{@code socketTimeoutMS=ms}: How long a send or receive on a socket can take before timing out.</li>
- * </ul>
- *
- * <p>Connection pool configuration:</p>
- * <ul>
- * <li>{@code maxPoolSize=n}: The maximum number of connections in the connection pool.</li>
- * <li>{@code waitQueueMultiple=n} : this multiplier, multiplied with the maxPoolSize setting, gives the maximum number of
- * threads that may be waiting for a connection to become available from the pool.  All further threads will get an
- * exception right away.</li>
- * <li>{@code waitQueueTimeoutMS=ms}: The maximum wait time in milliseconds that a thread may wait for a connection to
- * become available.</li>
- * </ul>
- *
- * <p>Write concern configuration:</p>
- * <ul>
- *  <li>{@code safe=true|false}
- *      <ul>
- *          <li>{@code true}: the driver sends a getLastError command after every update to ensure that the update succeeded
- * (see also {@code w} and {@code wtimeoutMS}).</li>
- *          <li>{@code false}: the driver does not send a getLastError command after every update.</li>
- *      </ul>
- *  </li>
- * <li>{@code journal=true|false}
- *  <ul>
- *      <li>{@code true}: the driver waits for the server to group commit to the journal file on disk.</li>
- *      <li>{@code false}: the driver does not wait for the server to group commit to the journal file on disk.</li>
- *  </ul>
- * </li>
- *  <li>{@code w=wValue}
- *      <ul>
- *          <li>The driver adds { w : wValue } to the getLastError command. Implies {@code safe=true}.</li>
- *          <li>wValue is typically a number, but can be any string in order to allow for specifications like
- * {@code "majority"}</li>
- *      </ul>
- *  </li>
- *  <li>{@code wtimeoutMS=ms}
- *      <ul>
- *          <li>The driver adds { wtimeout : ms } to the getlasterror command. Implies {@code safe=true}.</li>
- *          <li>Used in combination with {@code w}</li>
- *      </ul>
- *  </li>
- * </ul>
- *
- * <p>Read preference configuration:</p>
- * <ul>
- * <li>{@code slaveOk=true|false}: Whether a driver connected to a replica set will send reads to slaves/secondaries.</li>
- * <li>{@code readPreference=enum}: The read preference for this connection.  If set, it overrides any slaveOk value.
- * <ul>
- * <li>Enumerated values:
- * <ul>
- * <li>{@code primary}</li>
- * <li>{@code primaryPreferred}</li>
- * <li>{@code secondary}</li>
- * <li>{@code secondaryPreferred}</li>
- * <li>{@code nearest}</li>
- * </ul>
- * </li>
- * </ul>
- * </li>
- * <li>{@code readPreferenceTags=string}.  A representation of a tag set as a comma-separated list of colon-separated
- * key-value pairs, e.g. {@code "dc:ny,rack:1}".  Spaces are stripped from beginning and end of all keys and values.
- * To specify a list of tag sets, using multiple readPreferenceTags,
- * e.g. {@code readPreferenceTags=dc:ny,rack:1;readPreferenceTags=dc:ny;readPreferenceTags=}
- * <ul>
- * <li>Note the empty value for the last one, which means match any secondary as a last resort.</li>
- * <li>Order matters when using multiple readPreferenceTags.</li>
- * </ul>
- * </li>
- * </ul>
- * <p>Authentication configuration:</p>
- * <ul>
- * <li>{@code authMechanism=MONGO-CR|GSSAPI|PLAIN|MONGODB-X509}: The authentication mechanism to use if a credential was supplied.
- * The default is unspecified, in which case the client will pick the most secure mechanism available based on the sever version.  For the
- * GSSAPI and MONGODB-X509 mechanisms, no password is accepted, only the username.
- * </li>
- * <li>{@code authSource=string}: The source of the authentication credentials.  This is typically the database that
- * the credentials have been created.  The value defaults to the database specified in the path portion of the URI.
- * If the database is specified in neither place, the default value is "admin".  This option is only respected when using the MONGO-CR
- * mechanism (the default).
- * </li>
- * <li>{@code gssapiServiceName=string}: This option only applies to the GSSAPI mechanism and is used to alter the service name..
- * </li>
- * </ul>
- *
- * <p>Note: This class is a replacement for {@code MongoURI}, to be used with {@code MongoClient}.  The main difference in
- * behavior is that the default write concern is {@code WriteConcern.ACKNOWLEDGED}.</p>
- *
- * @mongodb.driver.manual reference/connection-string Connection String URI Format
- * @see MongoClientOptions for the default values for all options
- * @since 2.10.0
- */
-public class MongoClientURI {
-    private final ConnectionString proxied;
-    private final MongoClientOptions.Builder builder;
-
-    /**
-     * Creates a MongoURI from the given string.
-     *
-     * @param uri the URI
-     */
-    public MongoClientURI(final String uri) {
-        this(uri, new MongoClientOptions.Builder());
-    }
-
-    /**
-     * Creates a MongoURI from the given URI string, and MongoClientOptions.Builder.  The builder can be configured with default options,
-     * which may be overridden by options specified in the URI string.
-     *
-     * <p>
-     * The {@code MongoClientURI} takes ownership of the {@code MongoClientOptions.Builder} instance that is passed to this constructor,
-     * and may modify it.
-     * </p>
-     *
-     * @param uri     the URI
-     * @param builder a non-null Builder, which may be modified within this constructor,
-     * @since 2.11.0
-     */
-    public MongoClientURI(final String uri, final MongoClientOptions.Builder builder) {
-        this.builder = notNull("builder", builder);
-        proxied = new ConnectionString(uri);
-    }
-
-
-    // ---------------------------------
-
-    /**
-     * Gets the username
-     *
-     * @return the username
-     */
-    public String getUsername() {
-        return proxied.getUsername();
-    }
-
-    /**
-     * Gets the password
-     *
-     * @return the password
-     */
-    public char[] getPassword() {
-        return proxied.getPassword();
-    }
-
-    /**
-     * Gets the list of hosts
-     *
-     * @return the host list
-     */
-    public List<String> getHosts() {
-        return proxied.getHosts();
-    }
-
-    /**
-     * Gets the database name
-     *
-     * @return the database name
-     */
-    public String getDatabase() {
-        return proxied.getDatabase();
-    }
-
-
-    /**
-     * Gets the collection name
-     *
-     * @return the collection name
-     */
-    public String getCollection() {
-        return proxied.getCollection();
-    }
-
-    /**
-     * Get the unparsed URI.
-     *
-     * @return the URI
-     */
-    public String getURI() {
-        return proxied.getConnectionString();
-    }
-
-    /**
-     * Gets the credentials.
-     *
-     * @return the credentials
-     */
-    public MongoCredential getCredentials() {
-        if (proxied.getCredentialList().isEmpty()) {
-            return null;
-        } else {
-            return proxied.getCredentialList().get(0);
-        }
-    }
-
-    /**
-     * Gets the options
-     *
-     * @return the MongoClientOptions based on this URI.
-     */
-    public MongoClientOptions getOptions() {
-        if (proxied.getReadPreference() != null) {
-            builder.readPreference(proxied.getReadPreference());
-        }
-        if (proxied.getReadConcern() != null) {
-            builder.readConcern(proxied.getReadConcern());
-        }
-        if (proxied.getWriteConcern() != null) {
-            builder.writeConcern(proxied.getWriteConcern());
-        }
-        if (proxied.getMaxConnectionPoolSize() != null) {
-            builder.connectionsPerHost(proxied.getMaxConnectionPoolSize());
-        }
-        if (proxied.getMinConnectionPoolSize() != null) {
-            builder.minConnectionsPerHost(proxied.getMinConnectionPoolSize());
-        }
-        if (proxied.getMaxWaitTime() != null) {
-            builder.maxWaitTime(proxied.getMaxWaitTime());
-        }
-        if (proxied.getThreadsAllowedToBlockForConnectionMultiplier() != null) {
-            builder.threadsAllowedToBlockForConnectionMultiplier(proxied.getThreadsAllowedToBlockForConnectionMultiplier());
-        }
-        if (proxied.getMaxConnectionIdleTime() != null) {
-            builder.maxConnectionIdleTime(proxied.getMaxConnectionIdleTime());
-        }
-        if (proxied.getMaxConnectionLifeTime() != null) {
-            builder.maxConnectionLifeTime(proxied.getMaxConnectionLifeTime());
-        }
-        if (proxied.getSocketTimeout() != null) {
-            builder.socketTimeout(proxied.getSocketTimeout());
-        }
-        if (proxied.getConnectTimeout() != null) {
-            builder.connectTimeout(proxied.getConnectTimeout());
-        }
-        if (proxied.getRequiredReplicaSetName() != null) {
-            builder.requiredReplicaSetName(proxied.getRequiredReplicaSetName());
-        }
-        if (proxied.getSslEnabled() != null) {
-            builder.sslEnabled(proxied.getSslEnabled());
-        }
-        if (proxied.getSslInvalidHostnameAllowed() != null) {
-            builder.sslInvalidHostNameAllowed(proxied.getSslInvalidHostnameAllowed());
-        }
-        if (proxied.getServerSelectionTimeout() != null) {
-            builder.serverSelectionTimeout(proxied.getServerSelectionTimeout());
-        }
-        if (proxied.getLocalThreshold() != null) {
-            builder.localThreshold(proxied.getLocalThreshold());
-        }
-        if (proxied.getHeartbeatFrequency() != null) {
-            builder.heartbeatFrequency(proxied.getHeartbeatFrequency());
-        }
-
-        return builder.build();
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        MongoClientURI that = (MongoClientURI) o;
-
-        if (!getHosts().equals(that.getHosts())) {
-            return false;
-        }
-        if (getDatabase() != null ? !getDatabase().equals(that.getDatabase()) : that.getDatabase() != null) {
-            return false;
-        }
-        if (getCollection() != null ? !getCollection().equals(that.getCollection()) : that.getCollection() != null) {
-            return false;
-        }
-        if (getCredentials() != null ? !getCredentials().equals(that.getCredentials()) : that.getCredentials() != null) {
-            return false;
-        }
-        if (!getOptions().equals(that.getOptions())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getOptions().hashCode();
-        result = 31 * result + (getCredentials() != null ? getCredentials().hashCode() : 0);
-        result = 31 * result + getHosts().hashCode();
-        result = 31 * result + (getDatabase() != null ? getDatabase().hashCode() : 0);
-        result = 31 * result + (getCollection() != null ? getCollection().hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return proxied.toString();
-    }
-}
diff --git a/driver/src/main/com/mongodb/MongoCollectionImpl.java b/driver/src/main/com/mongodb/MongoCollectionImpl.java
deleted file mode 100755
index d23eab5451b..00000000000
--- a/driver/src/main/com/mongodb/MongoCollectionImpl.java
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.bulk.DeleteRequest;
-import com.mongodb.bulk.IndexRequest;
-import com.mongodb.bulk.InsertRequest;
-import com.mongodb.bulk.UpdateRequest;
-import com.mongodb.bulk.WriteRequest;
-import com.mongodb.client.AggregateIterable;
-import com.mongodb.client.DistinctIterable;
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.ListIndexesIterable;
-import com.mongodb.client.MapReduceIterable;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.BulkWriteOptions;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.DeleteManyModel;
-import com.mongodb.client.model.DeleteOneModel;
-import com.mongodb.client.model.FindOneAndDeleteOptions;
-import com.mongodb.client.model.FindOneAndReplaceOptions;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.FindOptions;
-import com.mongodb.client.model.IndexModel;
-import com.mongodb.client.model.IndexOptions;
-import com.mongodb.client.model.InsertManyOptions;
-import com.mongodb.client.model.InsertOneModel;
-import com.mongodb.client.model.InsertOneOptions;
-import com.mongodb.client.model.RenameCollectionOptions;
-import com.mongodb.client.model.ReplaceOneModel;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.model.UpdateManyModel;
-import com.mongodb.client.model.UpdateOneModel;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.WriteModel;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
-import com.mongodb.operation.CountOperation;
-import com.mongodb.operation.CreateIndexesOperation;
-import com.mongodb.operation.DropCollectionOperation;
-import com.mongodb.operation.DropIndexOperation;
-import com.mongodb.operation.FindAndDeleteOperation;
-import com.mongodb.operation.FindAndReplaceOperation;
-import com.mongodb.operation.FindAndUpdateOperation;
-import com.mongodb.operation.MixedBulkWriteOperation;
-import com.mongodb.operation.OperationExecutor;
-import com.mongodb.operation.RenameCollectionOperation;
-import org.bson.BsonDocument;
-import org.bson.BsonDocumentWrapper;
-import org.bson.BsonString;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.codecs.Codec;
-import org.bson.codecs.CollectibleCodec;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-class MongoCollectionImpl<TDocument> implements MongoCollection<TDocument> {
-    private final MongoNamespace namespace;
-    private final Class<TDocument> documentClass;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final WriteConcern writeConcern;
-    private final ReadConcern readConcern;
-    private final OperationExecutor executor;
-
-    MongoCollectionImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final CodecRegistry codecRegistry,
-                        final ReadPreference readPreference, final WriteConcern writeConcern, final ReadConcern readConcern,
-                        final OperationExecutor executor) {
-        this.namespace = notNull("namespace", namespace);
-        this.documentClass = notNull("documentClass", documentClass);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.writeConcern = notNull("writeConcern", writeConcern);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
-    }
-
-    @Override
-    public MongoNamespace getNamespace() {
-        return namespace;
-    }
-
-    @Override
-    public Class<TDocument> getDocumentClass() {
-        return documentClass;
-    }
-
-    @Override
-    public CodecRegistry getCodecRegistry() {
-        return codecRegistry;
-    }
-
-    @Override
-    public ReadPreference getReadPreference() {
-        return readPreference;
-    }
-
-    @Override
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    @Override
-    public ReadConcern getReadConcern() {
-        return readConcern;
-    }
-
-    @Override
-    public <NewTDocument> MongoCollection<NewTDocument> withDocumentClass(final Class<NewTDocument> clazz) {
-        return new MongoCollectionImpl<NewTDocument>(namespace, clazz, codecRegistry, readPreference, writeConcern, readConcern, executor);
-    }
-
-    @Override
-    public MongoCollection<TDocument> withCodecRegistry(final CodecRegistry codecRegistry) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
-    }
-
-    @Override
-    public MongoCollection<TDocument> withReadPreference(final ReadPreference readPreference) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
-    }
-
-    @Override
-    public MongoCollection<TDocument> withWriteConcern(final WriteConcern writeConcern) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
-    }
-
-    @Override
-    public MongoCollection<TDocument> withReadConcern(final ReadConcern readConcern) {
-        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, readConcern,
-                executor);
-    }
-
-    @Override
-    public long count() {
-        return count(new BsonDocument(), new CountOptions());
-    }
-
-    @Override
-    public long count(final Bson filter) {
-        return count(filter, new CountOptions());
-    }
-
-    @Override
-    public long count(final Bson filter, final CountOptions options) {
-        CountOperation operation = new CountOperation(namespace)
-                                       .filter(toBsonDocument(filter))
-                                       .skip(options.getSkip())
-                                       .limit(options.getLimit())
-                                       .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS);
-        if (options.getHint() != null) {
-            operation.hint(toBsonDocument(options.getHint()));
-        } else if (options.getHintString() != null) {
-            operation.hint(new BsonString(options.getHintString()));
-        }
-        return executor.execute(operation, readPreference);
-    }
-
-    @Override
-    public <TResult> DistinctIterable<TResult> distinct(final String fieldName, final Class<TResult> resultClass) {
-        return distinct(fieldName, new BsonDocument(), resultClass);
-    }
-
-    @Override
-    public <TResult> DistinctIterable<TResult> distinct(final String fieldName, final Bson filter, final Class<TResult> resultClass) {
-        return new DistinctIterableImpl<TDocument, TResult>(namespace, documentClass, resultClass, codecRegistry, readPreference,
-                readConcern, executor, fieldName, filter);
-    }
-
-    @Override
-    public FindIterable<TDocument> find() {
-        return find(new BsonDocument(), documentClass);
-    }
-
-    @Override
-    public <TResult> FindIterable<TResult> find(final Class<TResult> resultClass) {
-        return find(new BsonDocument(), resultClass);
-    }
-
-    @Override
-    public FindIterable<TDocument> find(final Bson filter) {
-        return find(filter, documentClass);
-    }
-
-    @Override
-    public <TResult> FindIterable<TResult> find(final Bson filter, final Class<TResult> resultClass) {
-        return new FindIterableImpl<TDocument, TResult>(namespace, this.documentClass, resultClass, codecRegistry, readPreference,
-                readConcern, executor, filter, new FindOptions());
-    }
-
-    @Override
-    public AggregateIterable<TDocument> aggregate(final List<? extends Bson> pipeline) {
-        return aggregate(pipeline, documentClass);
-    }
-
-    @Override
-    public <TResult> AggregateIterable<TResult> aggregate(final List<? extends Bson> pipeline, final Class<TResult> resultClass) {
-        return new AggregateIterableImpl<TDocument, TResult>(namespace, documentClass, resultClass, codecRegistry, readPreference,
-                readConcern, executor, pipeline);
-    }
-
-    @Override
-    public MapReduceIterable<TDocument> mapReduce(final String mapFunction, final String reduceFunction) {
-        return mapReduce(mapFunction, reduceFunction, documentClass);
-    }
-
-    @Override
-    public <TResult> MapReduceIterable<TResult> mapReduce(final String mapFunction, final String reduceFunction,
-                                                          final Class<TResult> resultClass) {
-        return new MapReduceIterableImpl<TDocument, TResult>(namespace, documentClass, resultClass, codecRegistry, readPreference,
-                readConcern, executor, mapFunction, reduceFunction);
-    }
-
-    @Override
-    public BulkWriteResult bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests) {
-        return bulkWrite(requests, new BulkWriteOptions());
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public BulkWriteResult bulkWrite(final List<? extends WriteModel<? extends TDocument>> requests, final BulkWriteOptions options) {
-        List<WriteRequest> writeRequests = new ArrayList<WriteRequest>(requests.size());
-        for (WriteModel<? extends TDocument> writeModel : requests) {
-            WriteRequest writeRequest;
-            if (writeModel instanceof InsertOneModel) {
-                TDocument document = ((InsertOneModel<TDocument>) writeModel).getDocument();
-                if (getCodec() instanceof CollectibleCodec) {
-                    document = ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(document);
-                }
-                writeRequest = new InsertRequest(documentToBsonDocument(document));
-            } else if (writeModel instanceof ReplaceOneModel) {
-                ReplaceOneModel<TDocument> replaceOneModel = (ReplaceOneModel<TDocument>) writeModel;
-                writeRequest = new UpdateRequest(toBsonDocument(replaceOneModel.getFilter()), documentToBsonDocument(replaceOneModel
-                                                                                                                     .getReplacement()),
-                                                 WriteRequest.Type.REPLACE)
-                                   .upsert(replaceOneModel.getOptions().isUpsert());
-            } else if (writeModel instanceof UpdateOneModel) {
-                UpdateOneModel<TDocument> updateOneModel = (UpdateOneModel<TDocument>) writeModel;
-                writeRequest = new UpdateRequest(toBsonDocument(updateOneModel.getFilter()), toBsonDocument(updateOneModel.getUpdate()),
-                                                 WriteRequest.Type.UPDATE)
-                                   .multi(false)
-                                   .upsert(updateOneModel.getOptions().isUpsert());
-            } else if (writeModel instanceof UpdateManyModel) {
-                UpdateManyModel<TDocument> updateManyModel = (UpdateManyModel<TDocument>) writeModel;
-                writeRequest = new UpdateRequest(toBsonDocument(updateManyModel.getFilter()), toBsonDocument(updateManyModel.getUpdate()),
-                                                 WriteRequest.Type.UPDATE)
-                                   .multi(true)
-                                   .upsert(updateManyModel.getOptions().isUpsert());
-            } else if (writeModel instanceof DeleteOneModel) {
-                DeleteOneModel<TDocument> deleteOneModel = (DeleteOneModel<TDocument>) writeModel;
-                writeRequest = new DeleteRequest(toBsonDocument(deleteOneModel.getFilter())).multi(false);
-            } else if (writeModel instanceof DeleteManyModel) {
-                DeleteManyModel<TDocument> deleteManyModel = (DeleteManyModel<TDocument>) writeModel;
-                writeRequest = new DeleteRequest(toBsonDocument(deleteManyModel.getFilter())).multi(true);
-            } else {
-                throw new UnsupportedOperationException(format("WriteModel of type %s is not supported", writeModel.getClass()));
-            }
-
-            writeRequests.add(writeRequest);
-        }
-
-        return executor.execute(new MixedBulkWriteOperation(namespace, writeRequests, options.isOrdered(), writeConcern)
-                .bypassDocumentValidation(options.getBypassDocumentValidation()));
-    }
-
-    @Override
-    public void insertOne(final TDocument document) {
-        insertOne(document, new InsertOneOptions());
-    }
-
-    @Override
-    public void insertOne(final TDocument document, final InsertOneOptions options) {
-        TDocument insertDocument = document;
-        if (getCodec() instanceof CollectibleCodec) {
-            insertDocument = ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(document);
-        }
-        executeSingleWriteRequest(new InsertRequest(documentToBsonDocument(insertDocument)), options.getBypassDocumentValidation());
-    }
-
-    @Override
-    public void insertMany(final List<? extends TDocument> documents) {
-        insertMany(documents, new InsertManyOptions());
-    }
-
-    @Override
-    public void insertMany(final List<? extends TDocument> documents, final InsertManyOptions options) {
-        List<InsertRequest> requests = new ArrayList<InsertRequest>(documents.size());
-        for (TDocument document : documents) {
-            if (getCodec() instanceof CollectibleCodec) {
-                document = ((CollectibleCodec<TDocument>) getCodec()).generateIdIfAbsentFromDocument(document);
-            }
-            requests.add(new InsertRequest(documentToBsonDocument(document)));
-        }
-        executor.execute(new MixedBulkWriteOperation(namespace, requests, options.isOrdered(), writeConcern)
-                .bypassDocumentValidation(options.getBypassDocumentValidation()));
-    }
-
-    @Override
-    public DeleteResult deleteOne(final Bson filter) {
-        return delete(filter, false);
-    }
-
-    @Override
-    public DeleteResult deleteMany(final Bson filter) {
-        return delete(filter, true);
-    }
-
-    @Override
-    public UpdateResult replaceOne(final Bson filter, final TDocument replacement) {
-        return replaceOne(filter, replacement, new UpdateOptions());
-    }
-
-    @Override
-    public UpdateResult replaceOne(final Bson filter, final TDocument replacement, final UpdateOptions updateOptions) {
-        return toUpdateResult(executeSingleWriteRequest(new UpdateRequest(toBsonDocument(filter), documentToBsonDocument(replacement),
-                WriteRequest.Type.REPLACE).upsert(updateOptions.isUpsert()), updateOptions.getBypassDocumentValidation()));
-    }
-
-    @Override
-    public UpdateResult updateOne(final Bson filter, final Bson update) {
-        return updateOne(filter, update, new UpdateOptions());
-    }
-
-    @Override
-    public UpdateResult updateOne(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
-        return update(filter, update, updateOptions, false);
-    }
-
-    @Override
-    public UpdateResult updateMany(final Bson filter, final Bson update) {
-        return updateMany(filter, update, new UpdateOptions());
-    }
-
-    @Override
-    public UpdateResult updateMany(final Bson filter, final Bson update, final UpdateOptions updateOptions) {
-        return update(filter, update, updateOptions, true);
-    }
-
-    @Override
-    public TDocument findOneAndDelete(final Bson filter) {
-        return findOneAndDelete(filter, new FindOneAndDeleteOptions());
-    }
-
-    @Override
-    public TDocument findOneAndDelete(final Bson filter, final FindOneAndDeleteOptions options) {
-        return executor.execute(new FindAndDeleteOperation<TDocument>(namespace, writeConcern, getCodec())
-                .filter(toBsonDocument(filter))
-                .projection(toBsonDocument(options.getProjection()))
-                .sort(toBsonDocument(options.getSort()))
-                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS));
-    }
-
-    @Override
-    public TDocument findOneAndReplace(final Bson filter, final TDocument replacement) {
-        return findOneAndReplace(filter, replacement, new FindOneAndReplaceOptions());
-    }
-
-    @Override
-    public TDocument findOneAndReplace(final Bson filter, final TDocument replacement, final FindOneAndReplaceOptions options) {
-        return executor.execute(new FindAndReplaceOperation<TDocument>(namespace, writeConcern, getCodec(),
-                documentToBsonDocument(replacement))
-                .filter(toBsonDocument(filter))
-                .projection(toBsonDocument(options.getProjection()))
-                .sort(toBsonDocument(options.getSort()))
-                .returnOriginal(options.getReturnDocument() == ReturnDocument.BEFORE)
-                .upsert(options.isUpsert())
-                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
-                .bypassDocumentValidation(options.getBypassDocumentValidation()));
-    }
-
-    @Override
-    public TDocument findOneAndUpdate(final Bson filter, final Bson update) {
-        return findOneAndUpdate(filter, update, new FindOneAndUpdateOptions());
-    }
-
-    @Override
-    public TDocument findOneAndUpdate(final Bson filter, final Bson update, final FindOneAndUpdateOptions options) {
-        return executor.execute(new FindAndUpdateOperation<TDocument>(namespace, writeConcern, getCodec(), toBsonDocument(update))
-                .filter(toBsonDocument(filter))
-                .projection(toBsonDocument(options.getProjection()))
-                .sort(toBsonDocument(options.getSort()))
-                .returnOriginal(options.getReturnDocument() == ReturnDocument.BEFORE)
-                .upsert(options.isUpsert())
-                .maxTime(options.getMaxTime(MILLISECONDS), MILLISECONDS)
-                .bypassDocumentValidation(options.getBypassDocumentValidation()));
-    }
-
-    @Override
-    public void drop() {
-        executor.execute(new DropCollectionOperation(namespace));
-    }
-
-    @Override
-    public String createIndex(final Bson keys) {
-        return createIndex(keys, new IndexOptions());
-    }
-
-    @Override
-    public String createIndex(final Bson keys, final IndexOptions indexOptions) {
-        return createIndexes(singletonList(new IndexModel(keys, indexOptions))).get(0);
-    }
-
-    @Override
-    public List<String> createIndexes(final List<IndexModel> indexes) {
-        notNull("indexes", indexes);
-
-        List<IndexRequest> indexRequests = new ArrayList<IndexRequest>(indexes.size());
-        for (IndexModel model : indexes) {
-            indexRequests.add(new IndexRequest(toBsonDocument(model.getKeys()))
-                         .name(model.getOptions().getName())
-                         .background(model.getOptions().isBackground())
-                         .unique(model.getOptions().isUnique())
-                         .sparse(model.getOptions().isSparse())
-                         .expireAfter(model.getOptions().getExpireAfter(TimeUnit.SECONDS), TimeUnit.SECONDS)
-                         .version(model.getOptions().getVersion())
-                         .weights(toBsonDocument(model.getOptions().getWeights()))
-                         .defaultLanguage(model.getOptions().getDefaultLanguage())
-                         .languageOverride(model.getOptions().getLanguageOverride())
-                         .textVersion(model.getOptions().getTextVersion())
-                         .sphereVersion(model.getOptions().getSphereVersion())
-                         .bits(model.getOptions().getBits())
-                         .min(model.getOptions().getMin())
-                         .max(model.getOptions().getMax())
-                         .bucketSize(model.getOptions().getBucketSize())
-                         .storageEngine(toBsonDocument(model.getOptions().getStorageEngine()))
-                         .partialFilterExpression(toBsonDocument(model.getOptions().getPartialFilterExpression())));
-        }
-        CreateIndexesOperation createIndexesOperation = new CreateIndexesOperation(getNamespace(), indexRequests);
-        executor.execute(createIndexesOperation);
-        return createIndexesOperation.getIndexNames();
-    }
-
-    @Override
-    public ListIndexesIterable<Document> listIndexes() {
-        return listIndexes(Document.class);
-    }
-
-    @Override
-    public <TResult> ListIndexesIterable<TResult> listIndexes(final Class<TResult> resultClass) {
-        return new ListIndexesIterableImpl<TResult>(getNamespace(), resultClass, codecRegistry, ReadPreference.primary(), executor);
-    }
-
-    @Override
-    public void dropIndex(final String indexName) {
-        executor.execute(new DropIndexOperation(namespace, indexName));
-    }
-
-    @Override
-    public void dropIndex(final Bson keys) {
-        executor.execute(new DropIndexOperation(namespace, keys.toBsonDocument(BsonDocument.class, codecRegistry)));
-    }
-
-    @Override
-    public void dropIndexes() {
-        dropIndex("*");
-    }
-
-    @Override
-    public void renameCollection(final MongoNamespace newCollectionNamespace) {
-        renameCollection(newCollectionNamespace, new RenameCollectionOptions());
-    }
-
-    @Override
-    public void renameCollection(final MongoNamespace newCollectionNamespace, final RenameCollectionOptions renameCollectionOptions) {
-        executor.execute(new RenameCollectionOperation(getNamespace(), newCollectionNamespace)
-                             .dropTarget(renameCollectionOptions.isDropTarget()));
-    }
-
-    private DeleteResult delete(final Bson filter, final boolean multi) {
-        com.mongodb.bulk.BulkWriteResult result = executeSingleWriteRequest(new DeleteRequest(toBsonDocument(filter)).multi(multi), null);
-        if (result.wasAcknowledged()) {
-            return DeleteResult.acknowledged(result.getDeletedCount());
-        } else {
-            return DeleteResult.unacknowledged();
-        }
-    }
-
-    private UpdateResult update(final Bson filter, final Bson update, final UpdateOptions updateOptions, final boolean multi) {
-        return toUpdateResult(executeSingleWriteRequest(new UpdateRequest(toBsonDocument(filter), toBsonDocument(update),
-                WriteRequest.Type.UPDATE).upsert(updateOptions.isUpsert()).multi(multi), updateOptions.getBypassDocumentValidation()));
-    }
-
-
-    private BulkWriteResult executeSingleWriteRequest(final WriteRequest request, final Boolean bypassDocumentValidation) {
-        try {
-            return executor.execute(new MixedBulkWriteOperation(namespace, asList(request), true, writeConcern)
-                    .bypassDocumentValidation(bypassDocumentValidation));
-        } catch (MongoBulkWriteException e) {
-            if (e.getWriteErrors().isEmpty()) {
-                throw new MongoWriteConcernException(e.getWriteConcernError(),
-                                                     translateBulkWriteResult(request, e.getWriteResult()),
-                                                     e.getServerAddress());
-            } else {
-                throw new MongoWriteException(new WriteError(e.getWriteErrors().get(0)), e.getServerAddress());
-            }
-        }
-    }
-
-    private WriteConcernResult translateBulkWriteResult(final WriteRequest request, final BulkWriteResult writeResult) {
-        switch (request.getType()) {
-            case INSERT:
-                return WriteConcernResult.acknowledged(writeResult.getInsertedCount(), false, null);
-            case DELETE:
-                return WriteConcernResult.acknowledged(writeResult.getDeletedCount(), false, null);
-            case UPDATE:
-            case REPLACE:
-                return WriteConcernResult.acknowledged(writeResult.getMatchedCount() + writeResult.getUpserts().size(),
-                                                       writeResult.getMatchedCount() > 0,
-                                                       writeResult.getUpserts().isEmpty()
-                                                       ? null : writeResult.getUpserts().get(0).getId());
-            default:
-                throw new MongoInternalException("Unhandled write request type: " + request.getType());
-        }
-    }
-
-    private UpdateResult toUpdateResult(final com.mongodb.bulk.BulkWriteResult result) {
-        if (result.wasAcknowledged()) {
-            Long modifiedCount = result.isModifiedCountAvailable() ? (long) result.getModifiedCount() : null;
-            BsonValue upsertedId = result.getUpserts().isEmpty() ? null : result.getUpserts().get(0).getId();
-            return UpdateResult.acknowledged(result.getMatchedCount(), modifiedCount, upsertedId);
-        } else {
-            return UpdateResult.unacknowledged();
-        }
-    }
-
-    private Codec<TDocument> getCodec() {
-        return codecRegistry.get(documentClass);
-    }
-
-    private BsonDocument documentToBsonDocument(final TDocument document) {
-        return BsonDocumentWrapper.asBsonDocument(document, codecRegistry);
-    }
-
-    private BsonDocument toBsonDocument(final Bson bson) {
-        return bson == null ? null : bson.toBsonDocument(documentClass, codecRegistry);
-    }
-}
diff --git a/driver/src/main/com/mongodb/MongoDatabaseImpl.java b/driver/src/main/com/mongodb/MongoDatabaseImpl.java
deleted file mode 100644
index 61c47a65dee..00000000000
--- a/driver/src/main/com/mongodb/MongoDatabaseImpl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.ListCollectionsIterable;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.client.model.CreateCollectionOptions;
-import com.mongodb.client.model.IndexOptionDefaults;
-import com.mongodb.client.model.ValidationOptions;
-import com.mongodb.operation.CommandReadOperation;
-import com.mongodb.operation.CreateCollectionOperation;
-import com.mongodb.operation.DropDatabaseOperation;
-import com.mongodb.operation.OperationExecutor;
-import org.bson.BsonDocument;
-import org.bson.Document;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import static com.mongodb.MongoClient.getDefaultCodecRegistry;
-import static com.mongodb.assertions.Assertions.notNull;
-
-class MongoDatabaseImpl implements MongoDatabase {
-    private final String name;
-    private final ReadPreference readPreference;
-    private final CodecRegistry codecRegistry;
-    private final WriteConcern writeConcern;
-    private final ReadConcern readConcern;
-    private final OperationExecutor executor;
-
-    MongoDatabaseImpl(final String name, final CodecRegistry codecRegistry, final ReadPreference readPreference,
-                      final WriteConcern writeConcern, final ReadConcern readConcern, final OperationExecutor executor) {
-        this.name = notNull("name", name);
-        this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.readPreference = notNull("readPreference", readPreference);
-        this.writeConcern = notNull("writeConcern", writeConcern);
-        this.readConcern = notNull("readConcern", readConcern);
-        this.executor = notNull("executor", executor);
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public CodecRegistry getCodecRegistry() {
-        return codecRegistry;
-    }
-
-    @Override
-    public ReadPreference getReadPreference() {
-        return readPreference;
-    }
-
-    @Override
-    public WriteConcern getWriteConcern() {
-        return writeConcern;
-    }
-
-    @Override
-    public ReadConcern getReadConcern() {
-        return readConcern;
-    }
-
-    @Override
-    public MongoDatabase withCodecRegistry(final CodecRegistry codecRegistry) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
-    }
-
-    @Override
-    public MongoDatabase withReadPreference(final ReadPreference readPreference) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
-    }
-
-    @Override
-    public MongoDatabase withWriteConcern(final WriteConcern writeConcern) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
-    }
-
-    @Override
-    public MongoDatabase withReadConcern(final ReadConcern readConcern) {
-        return new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor);
-    }
-
-    @Override
-    public MongoCollection<Document> getCollection(final String collectionName) {
-        return getCollection(collectionName, Document.class);
-    }
-
-    @Override
-    public <TDocument> MongoCollection<TDocument> getCollection(final String collectionName, final Class<TDocument> documentClass) {
-        return new MongoCollectionImpl<TDocument>(new MongoNamespace(name, collectionName), documentClass, codecRegistry, readPreference,
-                                                  writeConcern, readConcern, executor);
-    }
-
-    @Override
-    public Document runCommand(final Bson command) {
-        return runCommand(command, Document.class);
-    }
-
-    @Override
-    public Document runCommand(final Bson command, final ReadPreference readPreference) {
-        return runCommand(command, readPreference, Document.class);
-    }
-
-    @Override
-    public <TResult> TResult runCommand(final Bson command, final Class<TResult> resultClass) {
-        return runCommand(command, ReadPreference.primary(), resultClass);
-    }
-
-    @Override
-    public <TResult> TResult runCommand(final Bson command, final ReadPreference readPreference, final Class<TResult> resultClass) {
-        notNull("readPreference", readPreference);
-        return executor.execute(new CommandReadOperation<TResult>(getName(), toBsonDocument(command), codecRegistry.get(resultClass)),
-                readPreference);
-    }
-
-    @Override
-    public void drop() {
-        executor.execute(new DropDatabaseOperation(name));
-    }
-
-    @Override
-    public MongoIterable<String> listCollectionNames() {
-        return new ListCollectionsIterableImpl<BsonDocument>(name, BsonDocument.class, getDefaultCodecRegistry(), ReadPreference.primary(),
-                executor).map(new Function<BsonDocument, String>() {
-            @Override
-            public String apply(final BsonDocument result) {
-                return result.getString("name").getValue();
-            }
-        });
-    }
-
-    @Override
-    public ListCollectionsIterable<Document> listCollections() {
-        return listCollections(Document.class);
-    }
-
-    @Override
-    public <TResult> ListCollectionsIterable<TResult> listCollections(final Class<TResult> resultClass) {
-        return new ListCollectionsIterableImpl<TResult>(name, resultClass, codecRegistry, ReadPreference.primary(), executor);
-    }
-
-    @Override
-    public void createCollection(final String collectionName) {
-        createCollection(collectionName, new CreateCollectionOptions());
-    }
-
-    @Override
-    public void createCollection(final String collectionName, final CreateCollectionOptions createCollectionOptions) {
-        CreateCollectionOperation operation = new CreateCollectionOperation(name, collectionName)
-                .capped(createCollectionOptions.isCapped())
-                .sizeInBytes(createCollectionOptions.getSizeInBytes())
-                .autoIndex(createCollectionOptions.isAutoIndex())
-                .maxDocuments(createCollectionOptions.getMaxDocuments())
-                .usePowerOf2Sizes(createCollectionOptions.isUsePowerOf2Sizes())
-                .storageEngineOptions(toBsonDocument(createCollectionOptions.getStorageEngineOptions()));
-
-        IndexOptionDefaults indexOptionDefaults = createCollectionOptions.getIndexOptionDefaults();
-        if (indexOptionDefaults.getStorageEngine() != null) {
-            operation.indexOptionDefaults(new BsonDocument("storageEngine", toBsonDocument(indexOptionDefaults.getStorageEngine())));
-        }
-        ValidationOptions validationOptions = createCollectionOptions.getValidationOptions();
-        if (validationOptions.getValidator() != null) {
-            operation.validator(toBsonDocument(validationOptions.getValidator()));
-        }
-        if (validationOptions.getValidationLevel() != null) {
-            operation.validationLevel(validationOptions.getValidationLevel());
-        }
-        if (validationOptions.getValidationAction() != null) {
-            operation.validationAction(validationOptions.getValidationAction());
-        }
-        executor.execute(operation);
-    }
-
-    private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(BsonDocument.class, codecRegistry);
-    }
-}
diff --git a/driver/src/main/com/mongodb/OperationIterable.java b/driver/src/main/com/mongodb/OperationIterable.java
deleted file mode 100644
index 43028f239d7..00000000000
--- a/driver/src/main/com/mongodb/OperationIterable.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoIterable;
-import com.mongodb.operation.BatchCursor;
-import com.mongodb.operation.OperationExecutor;
-import com.mongodb.operation.ReadOperation;
-
-import java.util.Collection;
-
-/**
- * MongoIterable implementation that aids iteration over the results of results of an inline map-reduce operation.
- *
- * @param <T> the return type of the map reduce
- * @since 3.0
- */
-class OperationIterable<T> implements MongoIterable<T> {
-    private final ReadOperation<? extends BatchCursor<T>> operation;
-    private final ReadPreference readPreference;
-    private final OperationExecutor executor;
-
-    OperationIterable(final ReadOperation<? extends BatchCursor<T>> operation, final ReadPreference readPreference,
-                      final OperationExecutor executor) {
-        this.operation = operation;
-        this.readPreference = readPreference;
-        this.executor = executor;
-    }
-
-    @Override
-    public MongoCursor<T> iterator() {
-        return new MongoBatchCursorAdapter<T>(executor.execute(operation, readPreference));
-    }
-
-    @Override
-    public T first() {
-        MongoCursor<T> cursor = iterator();
-        try {
-            if (!cursor.hasNext())  {
-                return null;
-            }
-            return cursor.next();
-        } finally {
-            cursor.close();
-        }
-    }
-
-    @Override
-    public <U> MongoIterable<U> map(final Function<T, U> mapper) {
-        return new MappingIterable<T, U>(this, mapper);
-    }
-
-    @Override
-    public void forEach(final Block<? super T> block) {
-        MongoCursor<T> cursor = iterator();
-        try {
-            while (cursor.hasNext()) {
-                block.apply(cursor.next());
-            }
-        } finally {
-            cursor.close();
-        }
-    }
-
-    @Override
-    public <A extends Collection<? super T>> A into(final A target) {
-        forEach(new Block<T>() {
-            @Override
-            public void apply(final T t) {
-                target.add(t);
-            }
-        });
-        return target;
-    }
-
-    @Override
-    public MongoIterable<T> batchSize(final int batchSize) {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/driver/src/main/com/mongodb/RemoveRequest.java b/driver/src/main/com/mongodb/RemoveRequest.java
deleted file mode 100644
index ff4bf1d8d1e..00000000000
--- a/driver/src/main/com/mongodb/RemoveRequest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.bulk.DeleteRequest;
-import org.bson.BsonDocumentWrapper;
-import org.bson.codecs.Encoder;
-
-class RemoveRequest extends WriteRequest {
-    private final DBObject query;
-    private final boolean multi;
-    private final Encoder<DBObject> codec;
-
-    public RemoveRequest(final DBObject query, final boolean multi, final Encoder<DBObject> codec) {
-        this.query = query;
-        this.multi = multi;
-        this.codec = codec;
-    }
-
-    public DBObject getQuery() {
-        return query;
-    }
-
-    public boolean isMulti() {
-        return multi;
-    }
-
-    @Override
-    com.mongodb.bulk.WriteRequest toNew() {
-        return new DeleteRequest(new BsonDocumentWrapper<DBObject>(query, this.codec)).multi(isMulti());
-    }
-}
diff --git a/driver/src/main/com/mongodb/UpdateRequest.java b/driver/src/main/com/mongodb/UpdateRequest.java
deleted file mode 100644
index e0edd5b3f93..00000000000
--- a/driver/src/main/com/mongodb/UpdateRequest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import org.bson.BsonDocumentWrapper;
-import org.bson.codecs.Encoder;
-
-class UpdateRequest extends WriteRequest {
-    private final DBObject query;
-    private final DBObject update;
-    private final boolean multi;
-    private final boolean upsert;
-    private final Encoder<DBObject> codec;
-
-    public UpdateRequest(final DBObject query, final DBObject update, final boolean multi, final boolean upsert,
-                         final Encoder<DBObject> codec) {
-        this.query = query;
-        this.update = update;
-        this.multi = multi;
-        this.upsert = upsert;
-        this.codec = codec;
-    }
-
-    public DBObject getQuery() {
-        return query;
-    }
-
-    public DBObject getUpdate() {
-        return update;
-    }
-
-    public boolean isUpsert() {
-        return upsert;
-    }
-
-    public boolean isMulti() {
-        return multi;
-    }
-
-    @Override
-    com.mongodb.bulk.WriteRequest toNew() {
-        return new com.mongodb.bulk.UpdateRequest(new BsonDocumentWrapper<DBObject>(query, codec),
-                                                       new BsonDocumentWrapper<DBObject>(update, codec),
-                                                       com.mongodb.bulk.WriteRequest.Type.UPDATE)
-               .upsert(isUpsert())
-               .multi(isMulti());
-    }
-}
diff --git a/driver/src/main/com/mongodb/client/AggregateIterable.java b/driver/src/main/com/mongodb/client/AggregateIterable.java
deleted file mode 100644
index 57f39c80247..00000000000
--- a/driver/src/main/com/mongodb/client/AggregateIterable.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Iterable for aggregate.
- *
- * @param <TResult> The type of the result.
- * @since 3.0
- */
-public interface AggregateIterable<TResult> extends MongoIterable<TResult> {
-
-    /**
-     * Enables writing to temporary files. A null value indicates that it's unspecified.
-     *
-     * @param allowDiskUse true if writing to temporary files is enabled
-     * @return this
-     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
-     * @mongodb.server.release 2.6
-     */
-    AggregateIterable<TResult> allowDiskUse(final Boolean allowDiskUse);
-
-    /**
-     * Sets the number of documents to return per batch.
-     *
-     * @param batchSize the batch size
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
-     */
-    AggregateIterable<TResult> batchSize(final int batchSize);
-
-    /**
-     * Sets the maximum execution time on the server for this operation.
-     *
-     * @param maxTime  the max time
-     * @param timeUnit the time unit, which may not be null
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
-     */
-    AggregateIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit);
-
-    /**
-     * Sets whether the server should use a cursor to return results.
-     *
-     * @param useCursor whether the server should use a cursor to return results
-     * @return this
-     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
-     * @mongodb.server.release 2.6
-     */
-    AggregateIterable<TResult> useCursor(final Boolean useCursor);
-
-    /**
-     * Sets the bypass document level validation flag.
-     *
-     * <p>Note: This only applies when an $out stage is specified</p>.
-     *
-     * @param bypassDocumentValidation If true, allows the write to opt-out of document level validation.
-     * @return this
-     * @since 3.2
-     * @mongodb.driver.manual reference/command/aggregate/ Aggregation
-     * @mongodb.server.release 3.2
-     */
-    AggregateIterable<TResult> bypassDocumentValidation(final Boolean bypassDocumentValidation);
-
-}
diff --git a/driver/src/main/com/mongodb/client/DistinctIterable.java b/driver/src/main/com/mongodb/client/DistinctIterable.java
deleted file mode 100644
index 5fd2144d183..00000000000
--- a/driver/src/main/com/mongodb/client/DistinctIterable.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import org.bson.conversions.Bson;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Iterable interface for distinct.
- *
- * @param <TResult> The type of the result.
- * @since 3.0
- */
-public interface DistinctIterable<TResult> extends MongoIterable<TResult> {
-
-    /**
-     * Sets the query filter to apply to the query.
-     *
-     * @param filter the filter, which may be null.
-     * @return this
-     * @mongodb.driver.manual reference/method/db.collection.find/ Filter
-     */
-    DistinctIterable<TResult> filter(Bson filter);
-
-    /**
-     * Sets the maximum execution time on the server for this operation.
-     *
-     * @param maxTime  the max time
-     * @param timeUnit the time unit, which may not be null
-     * @return this
-     */
-    DistinctIterable<TResult> maxTime(final long maxTime, final TimeUnit timeUnit);
-
-    /**
-     * Sets the number of documents to return per batch.
-     *
-     * @param batchSize the batch size
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
-     */
-    DistinctIterable<TResult> batchSize(final int batchSize);
-}
diff --git a/driver/src/main/com/mongodb/client/FindIterable.java b/driver/src/main/com/mongodb/client/FindIterable.java
deleted file mode 100644
index af00ac125cc..00000000000
--- a/driver/src/main/com/mongodb/client/FindIterable.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import com.mongodb.CursorType;
-import org.bson.conversions.Bson;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Iterable for find.
- *
- * @param <TResult> The type of the result.
- * @since 3.0
- */
-public interface FindIterable<TResult> extends MongoIterable<TResult> {
-
-    /**
-     * Sets the query filter to apply to the query.
-     *
-     * @param filter the filter, which may be null.
-     * @return this
-     * @mongodb.driver.manual reference/method/db.collection.find/ Filter
-     */
-    FindIterable<TResult> filter(Bson filter);
-
-    /**
-     * Sets the limit to apply.
-     *
-     * @param limit the limit, which may be null
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.limit/#cursor.limit Limit
-     */
-    FindIterable<TResult> limit(int limit);
-    /**
-     * Sets the number of documents to skip.
-     *
-     * @param skip the number of documents to skip
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.skip/#cursor.skip Skip
-     */
-    FindIterable<TResult> skip(int skip);
-
-    /**
-     * Sets the maximum execution time on the server for this operation.
-     *
-     * @param maxTime  the max time
-     * @param timeUnit the time unit, which may not be null
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
-     */
-    FindIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
-
-    /**
-     * The maximum amount of time for the server to wait on new documents to satisfy a tailable cursor
-     * query. This only applies to a TAILABLE_AWAIT cursor. When the cursor is not a TAILABLE_AWAIT cursor,
-     * this option is ignored.
-     *
-     * On servers &gt;= 3.2, this option will be specified on the getMore command as "maxTimeMS". The default
-     * is no value: no "maxTimeMS" is sent to the server with the getMore command.
-     *
-     * On servers &lt; 3.2, this option is ignored, and indicates that the driver should respect the server's default value
-     *
-     * A zero value will be ignored.
-     *
-     * @param maxAwaitTime  the max await time
-     * @param timeUnit the time unit to return the result in
-     * @return the maximum await execution time in the given time unit
-     * @mongodb.driver.manual reference/method/cursor.maxTimeMS/#cursor.maxTimeMS Max Time
-     * @since 3.2
-     */
-    FindIterable<TResult> maxAwaitTime(long maxAwaitTime, TimeUnit timeUnit);
-
-    /**
-     * Sets the query modifiers to apply to this operation.
-     *
-     * @param modifiers the query modifiers to apply, which may be null.
-     * @return this
-     * @mongodb.driver.manual reference/operator/query-modifier/ Query Modifiers
-     */
-    FindIterable<TResult> modifiers(Bson modifiers);
-
-    /**
-     * Sets a document describing the fields to return for all matching documents.
-     *
-     * @param projection the project document, which may be null.
-     * @return this
-     * @mongodb.driver.manual reference/method/db.collection.find/ Projection
-     */
-    FindIterable<TResult> projection(Bson projection);
-    /**
-     * Sets the sort criteria to apply to the query.
-     *
-     * @param sort the sort criteria, which may be null.
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.sort/ Sort
-     */
-    FindIterable<TResult> sort(Bson sort);
-
-    /**
-     * The server normally times out idle cursors after an inactivity period (10 minutes)
-     * to prevent excess memory use. Set this option to prevent that.
-     *
-     * @param noCursorTimeout true if cursor timeout is disabled
-     * @return this
-     */
-    FindIterable<TResult> noCursorTimeout(boolean noCursorTimeout);
-
-    /**
-     * Users should not set this under normal circumstances.
-     *
-     * @param oplogReplay if oplog replay is enabled
-     * @return this
-     */
-    FindIterable<TResult> oplogReplay(boolean oplogReplay);
-
-    /**
-     * Get partial results from a sharded cluster if one or more shards are unreachable (instead of throwing an error).
-     *
-     * @param partial if partial results for sharded clusters is enabled
-     * @return this
-     */
-    FindIterable<TResult> partial(boolean partial);
-
-    /**
-     * Sets the cursor type.
-     *
-     * @param cursorType the cursor type
-     * @return this
-     */
-    FindIterable<TResult> cursorType(CursorType cursorType);
-
-    /**
-     * Sets the number of documents to return per batch.
-     *
-     * @param batchSize the batch size
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
-     */
-    @Override
-    FindIterable<TResult> batchSize(int batchSize);
-}
diff --git a/driver/src/main/com/mongodb/client/ListDatabasesIterable.java b/driver/src/main/com/mongodb/client/ListDatabasesIterable.java
deleted file mode 100644
index b92d8095a2b..00000000000
--- a/driver/src/main/com/mongodb/client/ListDatabasesIterable.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Iterable for ListDatabases.
- *
- * @param <TResult> The type of the result.
- * @since 3.0
- */
-public interface ListDatabasesIterable<TResult> extends MongoIterable<TResult> {
-
-    /**
-     * Sets the maximum execution time on the server for this operation.
-     *
-     * @param maxTime  the max time
-     * @param timeUnit the time unit, which may not be null
-     * @return this
-     * @mongodb.driver.manual reference/operator/meta/maxTimeMS/ Max Time
-     */
-    ListDatabasesIterable<TResult> maxTime(long maxTime, TimeUnit timeUnit);
-
-    /**
-     * Sets the number of documents to return per batch.
-     *
-     * @param batchSize the batch size
-     * @return this
-     * @mongodb.driver.manual reference/method/cursor.batchSize/#cursor.batchSize Batch Size
-     */
-    @Override
-    ListDatabasesIterable<TResult> batchSize(int batchSize);
-}
diff --git a/driver/src/main/com/mongodb/client/MongoCollection.java b/driver/src/main/com/mongodb/client/MongoCollection.java
deleted file mode 100644
index 2c7696a1857..00000000000
--- a/driver/src/main/com/mongodb/client/MongoCollection.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import com.mongodb.MongoNamespace;
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.client.model.BulkWriteOptions;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.FindOneAndDeleteOptions;
-import com.mongodb.client.model.FindOneAndReplaceOptions;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.IndexModel;
-import com.mongodb.client.model.IndexOptions;
-import com.mongodb.client.model.InsertManyOptions;
-import com.mongodb.client.model.InsertOneOptions;
-import com.mongodb.client.model.RenameCollectionOptions;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.WriteModel;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
-import org.bson.Document;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-import java.util.List;
-
-/**
- * The MongoCollection interface.
- *
- * <p>Note: Additions to this interface will not be considered to break binary compatibility.</p>
- *
- * <p>MongoCollection is generic allowing for different types to represent documents. Any custom classes must have a
- * {@link org.bson.codecs.Codec} registered in the {@link CodecRegistry}. The default {@code CodecRegistry} includes built-in support for:
- * {@link org.bson.BsonDocument}, {@link Document} and {@link com.mongodb.DBObject}.
- * </p>
- *
- * @param <TDocument> The type that this collection will encode documents from and decode documents to.
- * @since 3.0
- */
-@ThreadSafe
-public interface MongoCollection<TDocument> {
-
-    /**
-     * Gets the namespace of this collection.
-     *
-     * @return the namespace
-     */
-    MongoNamespace getNamespace();
-
-    /**
-     * Get the class of documents stored in this collection.
-     *
-     * @return the class
-     */
-    Class<TDocument> getDocumentClass();
-
-    /**
-     * Get the codec registry for the MongoCollection.
-     *
-     * @return the {@link org.bson.codecs.configuration.CodecRegistry}
-     */
-    CodecRegistry getCodecRegistry();
-
-    /**
-     * Get the read preference for the MongoCollection.
-     *
-     * @return the {@link com.mongodb.ReadPreference}
-     */
-    ReadPreference getReadPreference();
-
-    /**
-     * Get the write concern for the MongoCollection.
-     *
-     * @return the {@link com.mongodb.WriteConcern}
-     */
-    WriteConcern getWriteConcern();
-
-    /**
-     * Get the read concern for the MongoCollection.
-     *
-     * @return the {@link com.mongodb.ReadConcern}
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    ReadConcern getReadConcern();
-
-    /**
-     * Create a new MongoCollection instance with a different default class to cast any documents returned from the database into..
-     *
-     * @param clazz the default class to cast any documents returned from the database into.
-     * @param <NewTDocument> The type that the new collection will encode documents from and decode documents to
-     * @return a new MongoCollection instance with the different default class
-     */
-    <NewTDocument> MongoCollection<NewTDocument> withDocumentClass(Class<NewTDocument> clazz);
-
-    /**
-     * Create a new MongoCollection instance with a different codec registry.
-     *
-     * @param codecRegistry the new {@link org.bson.codecs.configuration.CodecRegistry} for the collection
-     * @return a new MongoCollection instance with the different codec registry
-     */
-    MongoCollection<TDocument> withCodecRegistry(CodecRegistry codecRegistry);
-
-    /**
-     * Create a new MongoCollection instance with a different read preference.
-     *
-     * @param readPreference the new {@link com.mongodb.ReadPreference} for the collection
-     * @return a new MongoCollection instance with the different readPreference
-     */
-    MongoCollection<TDocument> withReadPreference(ReadPreference readPreference);
-
-    /**
-     * Create a new MongoCollection instance with a different write concern.
-     *
-     * @param writeConcern the new {@link com.mongodb.WriteConcern} for the collection
-     * @return a new MongoCollection instance with the different writeConcern
-     */
-    MongoCollection<TDocument> withWriteConcern(WriteConcern writeConcern);
-
-    /**
-     * Create a new MongoCollection instance with a different read concern.
-     *
-     * @param readConcern the new {@link ReadConcern} for the collection
-     * @return a new MongoCollection instance with the different ReadConcern
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    MongoCollection<TDocument> withReadConcern(ReadConcern readConcern);
-
-    /**
-     * Counts the number of documents in the collection.
-     *
-     * @return the number of documents in the collection
-     */
-    long count();
-
-    /**
-     * Counts the number of documents in the collection according to the given options.
-     *
-     * @param filter the query filter
-     * @return the number of documents in the collection
-     */
-    long count(Bson filter);
-
-    /**
-     * Counts the number of documents in the collection according to the given options.
-     *
-     * @param filter  the query filter
-     * @param options the options describing the count
-     * @return the number of documents in the collection
-     */
-    long count(Bson filter, CountOptions options);
-
-    /**
-     * Gets the distinct values of the specified field name.
-     *
-     * @param fieldName   the field name
-     * @param resultClass the class to cast any distinct items into.
-     * @param <TResult>   the target type of the iterable.
-     * @return an iterable of distinct values
-     * @mongodb.driver.manual reference/command/distinct/ Distinct
-     */
-    <TResult> DistinctIterable<TResult> distinct(String fieldName, Class<TResult> resultClass);
-
-    /**
-     * Gets the distinct values of the specified field name.
-     *
-     * @param fieldName   the field name
-     * @param filter      the query filter
-     * @param resultClass the class to cast any distinct items into.
-     * @param <TResult>   the target type of the iterable.
-     * @return an iterable of distinct values
-     * @mongodb.driver.manual reference/command/distinct/ Distinct
-     */
-    <TResult> DistinctIterable<TResult> distinct(String fieldName, Bson filter, Class<TResult> resultClass);
-
-    /**
-     * Finds all documents in the collection.
-     *
-     * @return the find iterable interface
-     * @mongodb.driver.manual tutorial/query-documents/ Find
-     */
-    FindIterable<TDocument> find();
-
-    /**
-     * Finds all documents in the collection.
-     *
-     * @param resultClass the class to decode each document into
-     * @param <TResult>   the target document type of the iterable.
-     * @return the find iterable interface
-     * @mongodb.driver.manual tutorial/query-documents/ Find
-     */
-    <TResult> FindIterable<TResult> find(Class<TResult> resultClass);
-
-    /**
-     * Finds all documents in the collection.
-     *
-     * @param filter the query filter
-     * @return the find iterable interface
-     * @mongodb.driver.manual tutorial/query-documents/ Find
-     */
-    FindIterable<TDocument> find(Bson filter);
-
-    /**
-     * Finds all documents in the collection.
-     *
-     * @param filter      the query filter
-     * @param resultClass the class to decode each document into
-     * @param <TResult>   the target document type of the iterable.
-     * @return the find iterable interface
-     * @mongodb.driver.manual tutorial/query-documents/ Find
-     */
-    <TResult> FindIterable<TResult> find(Bson filter, Class<TResult> resultClass);
-
-    /**
-     * Aggregates documents according to the specified aggregation pipeline.
-     *
-     * @param pipeline the aggregate pipeline
-     * @return an iterable containing the result of the aggregation operation
-     * @mongodb.driver.manual aggregation/ Aggregation
-     * @mongodb.server.release 2.2
-     */
-    AggregateIterable<TDocument> aggregate(List<? extends Bson> pipeline);
-
-    /**
-     * Aggregates documents according to the specified aggregation pipeline.
-     *
-     * @param pipeline    the aggregate pipeline
-     * @param resultClass the class to decode each document into
-     * @param <TResult>   the target document type of the iterable.
-     * @return an iterable containing the result of the aggregation operation
-     * @mongodb.driver.manual aggregation/ Aggregation
-     * @mongodb.server.release 2.2
-     */
-    <TResult> AggregateIterable<TResult> aggregate(List<? extends Bson> pipeline, Class<TResult> resultClass);
-
-    /**
-     * Aggregates documents according to the specified map-reduce function.
-     *
-     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
-     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
-     * @return an iterable containing the result of the map-reduce operation
-     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
-     */
-    MapReduceIterable<TDocument> mapReduce(String mapFunction, String reduceFunction);
-
-    /**
-     * Aggregates documents according to the specified map-reduce function.
-     *
-     * @param mapFunction    A JavaScript function that associates or "maps" a value with a key and emits the key and value pair.
-     * @param reduceFunction A JavaScript function that "reduces" to a single object all the values associated with a particular key.
-     * @param resultClass    the class to decode each resulting document into.
-     * @param <TResult>      the target document type of the iterable.
-     * @return an iterable containing the result of the map-reduce operation
-     * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
-     */
-    <TResult> MapReduceIterable<TResult> mapReduce(String mapFunction, String reduceFunction, Class<TResult> resultClass);
-
-    /**
-     * Executes a mix of inserts, updates, replaces, and deletes.
-     *
-     * @param requests the writes to execute
-     * @return the result of the bulk write
-     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
-     * @throws com.mongodb.MongoException          if there's an exception running the operation
-     */
-    BulkWriteResult bulkWrite(List<? extends WriteModel<? extends TDocument>> requests);
-
-    /**
-     * Executes a mix of inserts, updates, replaces, and deletes.
-     *
-     * @param requests the writes to execute
-     * @param options  the options to apply to the bulk write operation
-     * @return the result of the bulk write
-     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
-     * @throws com.mongodb.MongoException          if there's an exception running the operation
-     */
-    BulkWriteResult bulkWrite(List<? extends WriteModel<? extends TDocument>> requests, BulkWriteOptions options);
-
-    /**
-     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
-     *
-     * @param document the document to insert
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the insert command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     */
-    void insertOne(TDocument document);
-
-    /**
-     * Inserts the provided document. If the document is missing an identifier, the driver should generate one.
-     *
-     * @param document the document to insert
-     * @param options  the options to apply to the operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the insert command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoCommandException      if the write failed due to document validation reasons
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     * @since 3.2
-     */
-    void insertOne(TDocument document, InsertOneOptions options);
-
-    /**
-     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
-     *
-     * @param documents the documents to insert
-     * @throws com.mongodb.MongoBulkWriteException if there's an exception in the bulk write operation
-     * @throws com.mongodb.MongoException          if the write failed due some other failure
-     * @see com.mongodb.client.MongoCollection#bulkWrite
-     */
-    void insertMany(List<? extends TDocument> documents);
-
-    /**
-     * Inserts one or more documents.  A call to this method is equivalent to a call to the {@code bulkWrite} method
-     *
-     * @param documents the documents to insert
-     * @param options   the options to apply to the operation
-     * @throws com.mongodb.DuplicateKeyException if the write failed to a duplicate unique key
-     * @throws com.mongodb.WriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException        if the write failed due some other failure
-     */
-    void insertMany(List<? extends TDocument> documents, InsertManyOptions options);
-
-    /**
-     * Removes at most one document from the collection that matches the given filter.  If no documents match, the collection is not
-     * modified.
-     *
-     * @param filter the query filter to apply the the delete operation
-     * @return the result of the remove one operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the delete command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     */
-    DeleteResult deleteOne(Bson filter);
-
-    /**
-     * Removes all documents from the collection that match the given query filter.  If no documents match, the collection is not modified.
-     *
-     * @param filter the query filter to apply the the delete operation
-     * @return the result of the remove many operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the delete command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     */
-    DeleteResult deleteMany(Bson filter);
-
-    /**
-     * Replace a document in the collection according to the specified arguments.
-     *
-     * @param filter      the query filter to apply the the replace operation
-     * @param replacement the replacement document
-     * @return the result of the replace one operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the replace command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
-     */
-    UpdateResult replaceOne(Bson filter, TDocument replacement);
-
-    /**
-     * Replace a document in the collection according to the specified arguments.
-     *
-     * @param filter        the query filter to apply the the replace operation
-     * @param replacement   the replacement document
-     * @param updateOptions the options to apply to the replace operation
-     * @return the result of the replace one operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the replace command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     * @mongodb.driver.manual tutorial/modify-documents/#replace-the-document Replace
-     */
-    UpdateResult replaceOne(Bson filter, TDocument replacement, UpdateOptions updateOptions);
-
-    /**
-     * Update a single document in the collection according to the specified arguments.
-     *
-     * @param filter a document describing the query filter, which may not be null.
-     * @param update a document describing the update, which may not be null. The update to apply must include only update operators.
-     * @return the result of the update one operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     * @mongodb.driver.manual tutorial/modify-documents/ Updates
-     * @mongodb.driver.manual reference/operator/update/ Update Operators
-     */
-    UpdateResult updateOne(Bson filter, Bson update);
-
-    /**
-     * Update a single document in the collection according to the specified arguments.
-     *
-     * @param filter        a document describing the query filter, which may not be null.
-     * @param update        a document describing the update, which may not be null. The update to apply must include only update operators.
-     * @param updateOptions the options to apply to the update operation
-     * @return the result of the update one operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     * @mongodb.driver.manual tutorial/modify-documents/ Updates
-     * @mongodb.driver.manual reference/operator/update/ Update Operators
-     */
-    UpdateResult updateOne(Bson filter, Bson update, UpdateOptions updateOptions);
-
-    /**
-     * Update all documents in the collection according to the specified arguments.
-     *
-     * @param filter a document describing the query filter, which may not be null.
-     * @param update a document describing the update, which may not be null. The update to apply must include only update operators.
-     * @return the result of the update many operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     * @mongodb.driver.manual tutorial/modify-documents/ Updates
-     * @mongodb.driver.manual reference/operator/update/ Update Operators
-     */
-    UpdateResult updateMany(Bson filter, Bson update);
-
-    /**
-     * Update all documents in the collection according to the specified arguments.
-     *
-     * @param filter        a document describing the query filter, which may not be null.
-     * @param update        a document describing the update, which may not be null. The update to apply must include only update operators.
-     * @param updateOptions the options to apply to the update operation
-     * @return the result of the update many operation
-     * @throws com.mongodb.MongoWriteException        if the write failed due some other failure specific to the update command
-     * @throws com.mongodb.MongoWriteConcernException if the write failed due being unable to fulfil the write concern
-     * @throws com.mongodb.MongoException             if the write failed due some other failure
-     * @mongodb.driver.manual tutorial/modify-documents/ Updates
-     * @mongodb.driver.manual reference/operator/update/ Update Operators
-     */
-    UpdateResult updateMany(Bson filter, Bson update, UpdateOptions updateOptions);
-
-    /**
-     * Atomically find a document and remove it.
-     *
-     * @param filter the query filter to find the document with
-     * @return the document that was removed.  If no documents matched the query filter, then null will be returned
-     */
-    TDocument findOneAndDelete(Bson filter);
-
-    /**
-     * Atomically find a document and remove it.
-     *
-     * @param filter  the query filter to find the document with
-     * @param options the options to apply to the operation
-     * @return the document that was removed.  If no documents matched the query filter, then null will be returned
-     */
-    TDocument findOneAndDelete(Bson filter, FindOneAndDeleteOptions options);
-
-    /**
-     * Atomically find a document and replace it.
-     *
-     * @param filter      the query filter to apply the the replace operation
-     * @param replacement the replacement document
-     * @return the document that was replaced.  Depending on the value of the {@code returnOriginal} property, this will either be the
-     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
-     * returned
-     */
-    TDocument findOneAndReplace(Bson filter, TDocument replacement);
-
-    /**
-     * Atomically find a document and replace it.
-     *
-     * @param filter      the query filter to apply the the replace operation
-     * @param replacement the replacement document
-     * @param options     the options to apply to the operation
-     * @return the document that was replaced.  Depending on the value of the {@code returnOriginal} property, this will either be the
-     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
-     * returned
-     */
-    TDocument findOneAndReplace(Bson filter, TDocument replacement, FindOneAndReplaceOptions options);
-
-    /**
-     * Atomically find a document and update it.
-     *
-     * @param filter a document describing the query filter, which may not be null.
-     * @param update a document describing the update, which may not be null. The update to apply must include only update operators.
-     * @return the document that was updated before the update was applied.  If no documents matched the query filter, then null will be
-     * returned
-     */
-    TDocument findOneAndUpdate(Bson filter, Bson update);
-
-    /**
-     * Atomically find a document and update it.
-     *
-     * @param filter  a document describing the query filter, which may not be null.
-     * @param update  a document describing the update, which may not be null. The update to apply must include only update operators.
-     * @param options the options to apply to the operation
-     * @return the document that was updated.  Depending on the value of the {@code returnOriginal} property, this will either be the
-     * document as it was before the update or as it is after the update.  If no documents matched the query filter, then null will be
-     * returned
-     */
-    TDocument findOneAndUpdate(Bson filter, Bson update, FindOneAndUpdateOptions options);
-
-    /**
-     * Drops this collection from the Database.
-     *
-     * @mongodb.driver.manual reference/command/drop/ Drop Collection
-     */
-    void drop();
-
-    /**
-     * Create an index with the given keys.
-     *
-     * @param keys an object describing the index key(s), which may not be null.
-     * @return the index name
-     * @mongodb.driver.manual reference/command/createIndexes Create indexes
-     */
-    String createIndex(Bson keys);
-
-    /**
-     * Create an index with the given keys and options.
-     *
-     * @param keys                an object describing the index key(s), which may not be null.
-     * @param indexOptions the options for the index
-     * @return the index name
-     * @mongodb.driver.manual reference/command/createIndexes Create indexes
-     */
-    String createIndex(Bson keys, IndexOptions indexOptions);
-
-    /**
-     * Create multiple indexes.
-     *
-     * @param indexes the list of indexes
-     * @return the list of index names
-     * @mongodb.driver.manual reference/command/createIndexes Create indexes
-     * @mongodb.server.release 2.6
-     */
-    List<String> createIndexes(List<IndexModel> indexes);
-
-    /**
-     * Get all the indexes in this collection.
-     *
-     * @return the list indexes iterable interface
-     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
-     */
-    ListIndexesIterable<Document> listIndexes();
-
-    /**
-     * Get all the indexes in this collection.
-     *
-     * @param resultClass the class to decode each document into
-     * @param <TResult>   the target document type of the iterable.
-     * @return the list indexes iterable interface
-     * @mongodb.driver.manual reference/command/listIndexes/ List indexes
-     */
-    <TResult> ListIndexesIterable<TResult> listIndexes(Class<TResult> resultClass);
-
-    /**
-     * Drops the index given its name.
-     *
-     * @param indexName the name of the index to remove
-     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
-     */
-    void dropIndex(String indexName);
-
-    /**
-     * Drops the index given the keys used to create it.
-     *
-     * @param keys the keys of the index to remove
-     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
-     */
-    void dropIndex(Bson keys);
-
-    /**
-     * Drop all the indexes on this collection, except for the default on _id.
-     *
-     * @mongodb.driver.manual reference/command/dropIndexes/ Drop indexes
-     */
-    void dropIndexes();
-
-    /**
-     * Rename the collection with oldCollectionName to the newCollectionName.
-     *
-     * @param newCollectionNamespace the namespace the collection will be renamed to
-     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection, or if the
-     *                                          oldCollectionName is the name of a collection that doesn't exist
-     * @mongodb.driver.manual reference/command/renameCollection Rename collection
-     */
-    void renameCollection(MongoNamespace newCollectionNamespace);
-
-    /**
-     * Rename the collection with oldCollectionName to the newCollectionName.
-     *
-     * @param newCollectionNamespace  the name the collection will be renamed to
-     * @param renameCollectionOptions the options for renaming a collection
-     * @throws com.mongodb.MongoServerException if you provide a newCollectionName that is the name of an existing collection and dropTarget
-     *                                          is false, or if the oldCollectionName is the name of a collection that doesn't exist
-     * @mongodb.driver.manual reference/command/renameCollection Rename collection
-     */
-    void renameCollection(MongoNamespace newCollectionNamespace, RenameCollectionOptions renameCollectionOptions);
-
-}
diff --git a/driver/src/main/com/mongodb/client/MongoDatabase.java b/driver/src/main/com/mongodb/client/MongoDatabase.java
deleted file mode 100644
index f5639523863..00000000000
--- a/driver/src/main/com/mongodb/client/MongoDatabase.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.client.model.CreateCollectionOptions;
-import org.bson.Document;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.conversions.Bson;
-
-/**
- * The MongoDatabase interface.
- *
- * <p>Note: Additions to this interface will not be considered to break binary compatibility.</p>
- *
- * @since 3.0
- */
-@ThreadSafe
-public interface MongoDatabase {
-
-    /**
-     * Gets the name of the database.
-     *
-     * @return the database name
-     */
-    String getName();
-
-    /**
-     * Get the codec registry for the MongoDatabase.
-     *
-     * @return the {@link org.bson.codecs.configuration.CodecRegistry}
-     */
-    CodecRegistry getCodecRegistry();
-
-    /**
-     * Get the read preference for the MongoDatabase.
-     *
-     * @return the {@link com.mongodb.ReadPreference}
-     */
-    ReadPreference getReadPreference();
-
-    /**
-     * Get the write concern for the MongoDatabase.
-     *
-     * @return the {@link com.mongodb.WriteConcern}
-     */
-    WriteConcern getWriteConcern();
-
-    /**
-     * Get the read concern for the MongoDatabase.
-     *
-     * @return the {@link com.mongodb.ReadConcern}
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    ReadConcern getReadConcern();
-
-    /**
-     * Create a new MongoDatabase instance with a different codec registry.
-     *
-     * @param codecRegistry the new {@link org.bson.codecs.configuration.CodecRegistry} for the database
-     * @return a new MongoDatabase instance with the different codec registry
-     */
-    MongoDatabase withCodecRegistry(CodecRegistry codecRegistry);
-
-    /**
-     * Create a new MongoDatabase instance with a different read preference.
-     *
-     * @param readPreference the new {@link ReadPreference} for the database
-     * @return a new MongoDatabase instance with the different readPreference
-     */
-    MongoDatabase withReadPreference(ReadPreference readPreference);
-
-    /**
-     * Create a new MongoDatabase instance with a different write concern.
-     *
-     * @param writeConcern the new {@link WriteConcern} for the database
-     * @return a new MongoDatabase instance with the different writeConcern
-     */
-    MongoDatabase withWriteConcern(WriteConcern writeConcern);
-
-    /**
-     * Create a new MongoDatabase instance with a different read concern.
-     *
-     * @param readConcern the new {@link ReadConcern} for the database
-     * @return a new MongoDatabase instance with the different ReadConcern
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    MongoDatabase withReadConcern(ReadConcern readConcern);
-
-    /**
-     * Gets a collection.
-     *
-     * @param collectionName the name of the collection to return
-     * @return the collection
-     */
-    MongoCollection<Document> getCollection(String collectionName);
-
-    /**
-     * Gets a collection, with a specific default document class.
-     *
-     * @param collectionName the name of the collection to return
-     * @param documentClass  the default class to cast any documents returned from the database into.
-     * @param <TDocument>    the type of the class to use instead of {@code Document}.
-     * @return the collection
-     */
-    <TDocument> MongoCollection<TDocument> getCollection(String collectionName, Class<TDocument> documentClass);
-
-    /**
-     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
-     *
-     * @param command the command to be run
-     * @return the command result
-     */
-    Document runCommand(Bson command);
-
-    /**
-     * Executes the given command in the context of the current database with the given read preference.
-     *
-     * @param command        the command to be run
-     * @param readPreference the {@link ReadPreference} to be used when executing the command
-     * @return the command result
-     */
-    Document runCommand(Bson command, ReadPreference readPreference);
-
-    /**
-     * Executes the given command in the context of the current database with a read preference of {@link ReadPreference#primary()}.
-     *
-     * @param command     the command to be run
-     * @param resultClass the default class to cast any documents returned from the database into.
-     * @param <TResult> the type of the class to use instead of {@code Document}.
-     * @return the command result
-     */
-    <TResult> TResult runCommand(Bson command, Class<TResult> resultClass);
-
-    /**
-     * Executes the given command in the context of the current database with the given read preference.
-     *
-     * @param command        the command to be run
-     * @param readPreference the {@link ReadPreference} to be used when executing the command
-     * @param resultClass    the default class to cast any documents returned from the database into.
-     * @param <TResult>      the type of the class to use instead of {@code Document}.
-     * @return the command result
-     */
-    <TResult> TResult runCommand(Bson command, ReadPreference readPreference, Class<TResult> resultClass);
-
-    /**
-     * Drops this database.
-     *
-     * @mongodb.driver.manual reference/command/dropDatabase/#dbcmd.dropDatabase Drop database
-     */
-    void drop();
-
-    /**
-     * Gets the names of all the collections in this database.
-     *
-     * @return an iterable containing all the names of all the collections in this database
-     */
-    MongoIterable<String> listCollectionNames();
-
-    /**
-     * Finds all the collections in this database.
-     *
-     * @return the list collections iterable interface
-     * @mongodb.driver.manual reference/command/listCollections listCollections
-     */
-    ListCollectionsIterable<Document> listCollections();
-
-    /**
-     * Finds all the collections in this database.
-     *
-     * @param resultClass the class to decode each document into
-     * @param <TResult>   the target document type of the iterable.
-     * @return the list collections iterable interface
-     * @mongodb.driver.manual reference/command/listCollections listCollections
-     */
-    <TResult> ListCollectionsIterable<TResult> listCollections(Class<TResult> resultClass);
-
-    /**
-     * Create a new collection with the given name.
-     *
-     * @param collectionName the name for the new collection to create
-     * @mongodb.driver.manual reference/command/create Create Command
-     */
-    void createCollection(String collectionName);
-
-    /**
-     * Create a new collection with the selected options
-     *
-     * @param collectionName          the name for the new collection to create
-     * @param createCollectionOptions various options for creating the collection
-     * @mongodb.driver.manual reference/command/create Create Command
-     */
-    void createCollection(String collectionName, CreateCollectionOptions createCollectionOptions);
-
-}
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSBucket.java b/driver/src/main/com/mongodb/client/gridfs/GridFSBucket.java
deleted file mode 100644
index 882a1d06c9b..00000000000
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSBucket.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.gridfs;
-
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.annotations.ThreadSafe;
-import com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions;
-import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
-import com.mongodb.client.gridfs.model.GridFSUploadOptions;
-import org.bson.BsonValue;
-import org.bson.conversions.Bson;
-import org.bson.types.ObjectId;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Represents a GridFS Bucket
- *
- * @since 3.1
- */
-@ThreadSafe
-@SuppressWarnings("deprecation")
-public interface GridFSBucket {
-
-    /**
-     * The bucket name.
-     *
-     * @return the bucket name
-     */
-    String getBucketName();
-
-    /**
-     * Sets the chunk size in bytes. Defaults to 255.
-     *
-     * @return the chunk size in bytes.
-     */
-    int getChunkSizeBytes();
-
-    /**
-     * Get the write concern for the GridFSBucket.
-     *
-     * @return the {@link com.mongodb.WriteConcern}
-     */
-    WriteConcern getWriteConcern();
-
-    /**
-     * Get the read preference for the GridFSBucket.
-     *
-     * @return the {@link com.mongodb.ReadPreference}
-     */
-    ReadPreference getReadPreference();
-
-    /**
-     * Get the read concern for the GridFSBucket.
-     *
-     * @return the {@link com.mongodb.ReadConcern}
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    ReadConcern getReadConcern();
-
-    /**
-     *  Create a new GridFSBucket instance with a new chunk size in bytes.
-     *
-     * @param chunkSizeBytes the new chunk size in bytes.
-     * @return a new GridFSBucket instance with the different chunk size in bytes
-     */
-    GridFSBucket withChunkSizeBytes(int chunkSizeBytes);
-
-    /**
-     * Create a new GridFSBucket instance with a different read preference.
-     *
-     * @param readPreference the new {@link ReadPreference} for the database
-     * @return a new GridFSBucket instance with the different readPreference
-     */
-    GridFSBucket withReadPreference(ReadPreference readPreference);
-
-    /**
-     * Create a new GridFSBucket instance with a different write concern.
-     *
-     * @param writeConcern the new {@link WriteConcern} for the database
-     * @return a new GridFSBucket instance with the different writeConcern
-     */
-    GridFSBucket withWriteConcern(WriteConcern writeConcern);
-
-    /**
-     * Create a new MongoDatabase instance with a different read concern.
-     *
-     * @param readConcern the new {@link ReadConcern} for the database
-     * @return a new GridFSBucket instance with the different ReadConcern
-     * @since 3.2
-     * @mongodb.server.release 3.2
-     * @mongodb.driver.manual reference/readConcern/ Read Concern
-     */
-    GridFSBucket withReadConcern(ReadConcern readConcern);
-
-    /**
-     * Opens a Stream that the application can write the contents of the file to.
-     *<p>
-     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
-     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
-     * document is created in the files collection.
-     *</p>
-     *
-     * @param filename the filename for the stream
-     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
-     *          application will write the contents.
-     */
-    GridFSUploadStream openUploadStream(String filename);
-
-    /**
-     * Opens a Stream that the application can write the contents of the file to.
-     *<p>
-     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
-     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
-     * document is created in the files collection.
-     *</p>
-     * @param filename the filename for the stream
-     * @param options the GridFSUploadOptions
-     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
-     *          application will write the contents.
-     */
-    GridFSUploadStream openUploadStream(String filename, GridFSUploadOptions options);
-
-    /**
-     * Opens a Stream that the application can write the contents of the file to.
-     *<p>
-     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
-     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
-     * document is created in the files collection.
-     *</p>
-     *
-     * @param id the custom id value of the file
-     * @param filename the filename for the stream
-     * @return the GridFSUploadStream that provides the ObjectId for the file to be uploaded and the Stream to which the
-     *          application will write the contents.
-     * @since 3.3
-     */
-    GridFSUploadStream openUploadStream(BsonValue id, String filename);
-
-    /**
-     * Opens a Stream that the application can write the contents of the file to.
-     *<p>
-     * As the application writes the contents to the returned Stream, the contents are uploaded as chunks in the chunks collection. When
-     * the application signals it is done writing the contents of the file by calling close on the returned Stream, a files collection
-     * document is created in the files collection.
-     *</p>
-     *
-     * @param id the custom id value of the file
-     * @param filename the filename for the stream
-     * @param options the GridFSUploadOptions
-     * @return the GridFSUploadStream that includes the _id for the file to be uploaded and the Stream to which the
-     *          application will write the contents.
-     * @since 3.3
-     */
-    GridFSUploadStream openUploadStream(BsonValue id, String filename, GridFSUploadOptions options);
-
-    /**
-     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
-     *<p>
-     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
-     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
-     *</p>
-     *
-     * @param filename the filename for the stream
-     * @param source the Stream providing the file data
-     * @return the ObjectId of the uploaded file.
-     */
-    ObjectId uploadFromStream(String filename, InputStream source);
-
-    /**
-     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
-     * <p>
-     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
-     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
-     * </p>
-     *
-     * @param filename the filename for the stream
-     * @param source the Stream providing the file data
-     * @param options the GridFSUploadOptions
-     * @return the ObjectId of the uploaded file.
-     */
-    ObjectId uploadFromStream(String filename, InputStream source, GridFSUploadOptions options);
-
-    /**
-     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
-     *<p>
-     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
-     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
-     *</p>
-     *
-     * @param id the custom id value of the file
-     * @param filename the filename for the stream
-     * @param source the Stream providing the file data
-     * @since 3.3
-     */
-    void uploadFromStream(BsonValue id, String filename, InputStream source);
-
-    /**
-     * Uploads the contents of the given {@code InputStream} to a GridFS bucket.
-     * <p>
-     * Reads the contents of the user file from the {@code Stream} and uploads it as chunks in the chunks collection. After all the
-     * chunks have been uploaded, it creates a files collection document for {@code filename} in the files collection.
-     * </p>
-     *
-     * @param id the custom id value of the file
-     * @param filename the filename for the stream
-     * @param source the Stream providing the file data
-     * @param options the GridFSUploadOptions
-     * @since 3.3
-     */
-    void uploadFromStream(BsonValue id, String filename, InputStream source, GridFSUploadOptions options);
-
-    /**
-     * Opens a Stream from which the application can read the contents of the stored file specified by {@code id}.
-     *
-     * @param id the ObjectId of the file to be put into a stream.
-     * @return the stream
-     */
-    GridFSDownloadStream openDownloadStream(ObjectId id);
-
-    /**
-     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination} Stream.
-     *
-     * @param id the ObjectId of the file to be written to the destination stream
-     * @param destination the destination stream
-     */
-    void downloadToStream(ObjectId id, OutputStream destination);
-
-    /**
-     * Opens a Stream from which the application can read the contents of the stored file specified by {@code id}.
-     *
-     * @param id the custom id value of the file, to be put into a stream.
-     * @return the stream
-     */
-    GridFSDownloadStream openDownloadStream(BsonValue id);
-
-    /**
-     * Downloads the contents of the stored file specified by {@code id} and writes the contents to the {@code destination} Stream.
-     *
-     * @param id the custom id of the file, to be written to the destination stream
-     * @param destination the destination stream
-     */
-    void downloadToStream(BsonValue id, OutputStream destination);
-
-    /**
-     * Downloads the contents of the latest version of the stored file specified by {@code filename} and writes the contents to
-     * the {@code destination} Stream.
-     *
-     * @param filename the name of the file to be downloaded
-     * @param destination the destination stream
-     * @since 3.3
-     */
-    void downloadToStream(String filename, OutputStream destination);
-
-    /**
-     * Downloads the contents of the stored file specified by {@code filename} and by the revision in {@code options} and writes the
-     * contents to the {@code destination} Stream.
-     *
-     * @param filename the name of the file to be downloaded
-     * @param destination the destination stream
-     * @param options the download options
-     * @since 3.3
-     */
-    void downloadToStream(String filename, OutputStream destination, GridFSDownloadOptions options);
-
-    /**
-     * Opens a Stream from which the application can read the contents of the latest version of the stored file specified by the
-     * {@code filename}.
-     *
-     * @param filename the name of the file to be downloaded
-     * @return the stream
-     * @since 3.3
-     */
-    GridFSDownloadStream openDownloadStream(String filename);
-
-    /**
-     * Opens a Stream from which the application can read the contents of the stored file specified by {@code filename} and the revision
-     * in {@code options}.
-     *
-     * @param filename the name of the file to be downloaded
-     * @param options the download options
-     * @return the stream
-     * @since 3.3
-     */
-    GridFSDownloadStream openDownloadStream(String filename, GridFSDownloadOptions options);
-
-    /**
-     * Finds all documents in the files collection.
-     *
-     * @return the GridFS find iterable interface
-     * @mongodb.driver.manual tutorial/query-documents/ Find
-     */
-    GridFSFindIterable find();
-
-    /**
-     * Finds all documents in the collection that match the filter.
-     *
-     * <p>
-     *     Below is an example of filtering against the filename and some nested metadata that can also be stored along with the file data:
-     *  <pre>
-     *  {@code
-     *      Filters.and(Filters.eq("filename", "mongodb.png"), Filters.eq("metadata.contentType", "image/png"));
-     *  }
-     *  </pre>
-     *
-     * @param filter the query filter
-     * @return the GridFS find iterable interface
-     * @see com.mongodb.client.model.Filters
-     */
-    GridFSFindIterable find(Bson filter);
-
-    /**
-     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
-     * @param id the ObjectId of the file to be deleted
-     */
-    void delete(ObjectId id);
-
-    /**
-     * Given a {@code id}, delete this stored file's files collection document and associated chunks from a GridFS bucket.
-     * @param id the id of the file to be deleted
-     * @since 3.3
-     */
-    void delete(BsonValue id);
-
-    /**
-     * Renames the stored file with the specified {@code id}.
-     *
-     * @param id the id of the file in the files collection to rename
-     * @param newFilename the new filename for the file
-     */
-    void rename(ObjectId id, String newFilename);
-
-    /**
-     * Renames the stored file with the specified {@code id}.
-     *
-     * @param id the id of the file in the files collection to rename
-     * @param newFilename the new filename for the file
-     * @since 3.3
-     */
-    void rename(BsonValue id, String newFilename);
-
-    /**
-     * Drops the data associated with this bucket from the database.
-     */
-    void drop();
-
-    // Deprecated APIs
-
-    /**
-     * Opens a Stream from which the application can read the contents of the latest version of the stored file specified by the
-     * {@code filename}.
-     *
-     * @param filename the name of the file to be downloaded
-     * @deprecated use {@link #openDownloadStream(String)} instead.
-     * @return the stream
-     */
-    @Deprecated
-    GridFSDownloadStream openDownloadStreamByName(String filename);
-
-    /**
-     * Opens a Stream from which the application can read the contents of the stored file specified by {@code filename} and the revision
-     * in {@code options}.
-     *
-     * @param filename the name of the file to be downloaded
-     * @param options the download options
-     * @deprecated use {@link #openDownloadStream(String, GridFSDownloadOptions)} instead.
-     * @return the stream
-     */
-    @Deprecated
-    GridFSDownloadStream openDownloadStreamByName(String filename, GridFSDownloadByNameOptions options);
-
-    /**
-     * Downloads the contents of the latest version of the stored file specified by {@code filename} and writes the contents to
-     * the {@code destination} Stream.
-     *
-     * @param filename the name of the file to be downloaded
-     * @param destination the destination stream
-     * @deprecated use {@link #downloadToStream(String, OutputStream)} instead.
-     */
-    @Deprecated
-    void downloadToStreamByName(String filename, OutputStream destination);
-
-    /**
-     * Downloads the contents of the stored file specified by {@code filename} and by the revision in {@code options} and writes the
-     * contents to the {@code destination} Stream.
-     *
-     * @param filename the name of the file to be downloaded
-     * @param destination the destination stream
-     * @param options the download options
-     * @deprecated use {@link #downloadToStream(String, OutputStream, GridFSDownloadOptions)} instead.
-     */
-    @Deprecated
-    void downloadToStreamByName(String filename, OutputStream destination, GridFSDownloadByNameOptions options);
-
-}
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java b/driver/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java
deleted file mode 100644
index 5a889986373..00000000000
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSBucketImpl.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.gridfs;
-
-import com.mongodb.MongoClient;
-import com.mongodb.MongoGridFSException;
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.gridfs.model.GridFSDownloadByNameOptions;
-import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
-import com.mongodb.client.gridfs.model.GridFSFile;
-import com.mongodb.client.gridfs.model.GridFSUploadOptions;
-import com.mongodb.client.model.IndexOptions;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
-import org.bson.BsonDocument;
-import org.bson.BsonObjectId;
-import org.bson.BsonString;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.conversions.Bson;
-import org.bson.types.ObjectId;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-import static com.mongodb.ReadPreference.primary;
-import static com.mongodb.assertions.Assertions.notNull;
-import static java.lang.String.format;
-import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
-
-final class GridFSBucketImpl implements GridFSBucket {
-    private static final int DEFAULT_CHUNKSIZE_BYTES = 255 * 1024;
-    private final String bucketName;
-    private final int chunkSizeBytes;
-    private final MongoCollection<GridFSFile> filesCollection;
-    private final MongoCollection<Document> chunksCollection;
-    private volatile boolean checkedIndexes;
-
-    GridFSBucketImpl(final MongoDatabase database) {
-        this(database, "fs");
-    }
-
-    GridFSBucketImpl(final MongoDatabase database, final String bucketName) {
-        this(notNull("bucketName", bucketName), DEFAULT_CHUNKSIZE_BYTES,
-                getFilesCollection(notNull("database", database), bucketName),
-                getChunksCollection(database, bucketName));
-    }
-
-    GridFSBucketImpl(final String bucketName, final int chunkSizeBytes, final MongoCollection<GridFSFile> filesCollection,
-                     final MongoCollection<Document> chunksCollection) {
-        this.bucketName = notNull("bucketName", bucketName);
-        this.chunkSizeBytes = chunkSizeBytes;
-        this.filesCollection = notNull("filesCollection", filesCollection);
-        this.chunksCollection = notNull("chunksCollection", chunksCollection);
-    }
-
-    @Override
-    public String getBucketName() {
-        return bucketName;
-    }
-
-    @Override
-    public int getChunkSizeBytes() {
-        return chunkSizeBytes;
-    }
-
-    @Override
-    public ReadPreference getReadPreference() {
-        return filesCollection.getReadPreference();
-    }
-
-    @Override
-    public WriteConcern getWriteConcern() {
-        return filesCollection.getWriteConcern();
-    }
-
-    @Override
-    public ReadConcern getReadConcern() {
-        return filesCollection.getReadConcern();
-    }
-
-    @Override
-    public GridFSBucket withChunkSizeBytes(final int chunkSizeBytes) {
-        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection, chunksCollection);
-    }
-
-    @Override
-    public GridFSBucket withReadPreference(final ReadPreference readPreference) {
-        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadPreference(readPreference),
-                chunksCollection.withReadPreference(readPreference));
-    }
-
-    @Override
-    public GridFSBucket withWriteConcern(final WriteConcern writeConcern) {
-        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withWriteConcern(writeConcern),
-                chunksCollection.withWriteConcern(writeConcern));
-    }
-
-    @Override
-    public GridFSBucket withReadConcern(final ReadConcern readConcern) {
-        return new GridFSBucketImpl(bucketName, chunkSizeBytes, filesCollection.withReadConcern(readConcern),
-                chunksCollection.withReadConcern(readConcern));
-    }
-
-    @Override
-    public GridFSUploadStream openUploadStream(final String filename) {
-        return openUploadStream(new BsonObjectId(), filename);
-    }
-
-    @Override
-    public GridFSUploadStream openUploadStream(final String filename, final GridFSUploadOptions options) {
-        return openUploadStream(new BsonObjectId(), filename, options);
-    }
-
-    @Override
-    public GridFSUploadStream openUploadStream(final BsonValue id, final String filename) {
-        return openUploadStream(id, filename, new GridFSUploadOptions());
-    }
-
-    @Override
-    public GridFSUploadStream openUploadStream(final BsonValue id, final String filename, final GridFSUploadOptions options) {
-        int chunkSize = options.getChunkSizeBytes() == null ? chunkSizeBytes : options.getChunkSizeBytes();
-        checkCreateIndex();
-        return new GridFSUploadStreamImpl(filesCollection, chunksCollection, id, filename, chunkSize, options.getMetadata());
-    }
-
-    @Override
-    public ObjectId uploadFromStream(final String filename, final InputStream source) {
-        return uploadFromStream(filename, source, new GridFSUploadOptions());
-    }
-
-    @Override
-    public ObjectId uploadFromStream(final String filename, final InputStream source, final GridFSUploadOptions options) {
-        ObjectId id = new ObjectId();
-        uploadFromStream(new BsonObjectId(id), filename, source, options);
-        return id;
-    }
-
-    @Override
-    public void uploadFromStream(final BsonValue id, final String filename, final InputStream source) {
-        uploadFromStream(id, filename, source, new GridFSUploadOptions());
-    }
-
-    @Override
-    public void uploadFromStream(final BsonValue id, final String filename, final InputStream source, final
-    GridFSUploadOptions options) {
-        GridFSUploadStream uploadStream = openUploadStream(id, filename, options);
-        int chunkSize = options.getChunkSizeBytes() == null ? chunkSizeBytes : options.getChunkSizeBytes();
-        byte[] buffer = new byte[chunkSize];
-        int len;
-        try {
-            while ((len = source.read(buffer)) != -1) {
-                uploadStream.write(buffer, 0, len);
-            }
-            uploadStream.close();
-        } catch (IOException e) {
-            uploadStream.abort();
-            throw new MongoGridFSException("IOException when reading from the InputStream", e);
-        }
-    }
-
-    @Override
-    public GridFSDownloadStream openDownloadStream(final ObjectId id) {
-        return findTheFileInfoAndOpenDownloadStream(new BsonObjectId(id));
-    }
-
-    @Override
-    public void downloadToStream(final ObjectId id, final OutputStream destination) {
-        downloadToStream(findTheFileInfoAndOpenDownloadStream(new BsonObjectId(id)), destination);
-    }
-
-    @Override
-    public void downloadToStream(final BsonValue id, final OutputStream destination) {
-        downloadToStream(findTheFileInfoAndOpenDownloadStream(id), destination);
-    }
-
-    @Override
-    public void downloadToStream(final String filename, final OutputStream destination) {
-        downloadToStream(filename, destination, new GridFSDownloadOptions());
-    }
-
-    @Override
-    public void downloadToStream(final String filename, final OutputStream destination, final GridFSDownloadOptions options) {
-        downloadToStream(openDownloadStream(filename, options), destination);
-    }
-
-    @Override
-    public GridFSDownloadStream openDownloadStream(final BsonValue id) {
-        return findTheFileInfoAndOpenDownloadStream(id);
-    }
-
-    @Override
-    public GridFSDownloadStream openDownloadStream(final String filename) {
-        return openDownloadStream(filename, new GridFSDownloadOptions());
-    }
-
-    @Override
-    public GridFSDownloadStream openDownloadStream(final String filename, final GridFSDownloadOptions options) {
-        return new GridFSDownloadStreamImpl(getFileByName(filename, options), chunksCollection);
-    }
-
-    @Override
-    public GridFSFindIterable find() {
-        return new GridFSFindIterableImpl(filesCollection.find());
-    }
-
-    @Override
-    public GridFSFindIterable find(final Bson filter) {
-        return find().filter(filter);
-    }
-
-    @Override
-    public void delete(final ObjectId id) {
-        delete(new BsonObjectId(id));
-    }
-
-    @Override
-    public void delete(final BsonValue id) {
-        DeleteResult result = filesCollection.deleteOne(new BsonDocument("_id", id));
-        chunksCollection.deleteMany(new BsonDocument("files_id", id));
-
-        if (result.wasAcknowledged() && result.getDeletedCount() == 0) {
-            throw new MongoGridFSException(format("No file found with the id: %s", id));
-        }
-    }
-
-    @Override
-    public void rename(final ObjectId id, final String newFilename) {
-        rename(new BsonObjectId(id), newFilename);
-    }
-
-    @Override
-    public void rename(final BsonValue id, final String newFilename) {
-        UpdateResult updateResult = filesCollection.updateOne(new BsonDocument("_id", id),
-                new BsonDocument("$set", new BsonDocument("filename", new BsonString(newFilename))));
-
-        if (updateResult.wasAcknowledged() && updateResult.getMatchedCount() == 0) {
-            throw new MongoGridFSException(format("No file found with the id: %s", id));
-        }
-    }
-
-    @Override
-    public void drop() {
-        filesCollection.drop();
-        chunksCollection.drop();
-    }
-
-    @Override
-    @Deprecated
-    public GridFSDownloadStream openDownloadStreamByName(final String filename) {
-        return openDownloadStreamByName(filename, new GridFSDownloadByNameOptions());
-    }
-
-    @Override
-    @Deprecated
-    public GridFSDownloadStream openDownloadStreamByName(final String filename, final GridFSDownloadByNameOptions options) {
-        return openDownloadStream(filename, new GridFSDownloadOptions().revision(options.getRevision()));
-    }
-
-    @Override
-    @Deprecated
-    public void downloadToStreamByName(final String filename, final OutputStream destination) {
-        downloadToStreamByName(filename, destination, new GridFSDownloadByNameOptions());
-    }
-
-    @Override
-    @Deprecated
-    public void downloadToStreamByName(final String filename, final OutputStream destination, final GridFSDownloadByNameOptions options) {
-        downloadToStream(filename, destination, new GridFSDownloadOptions().revision(options.getRevision()));
-    }
-
-    private static MongoCollection<GridFSFile> getFilesCollection(final MongoDatabase database, final String bucketName) {
-        return database.getCollection(bucketName + ".files", GridFSFile.class).withCodecRegistry(
-                fromRegistries(database.getCodecRegistry(), MongoClient.getDefaultCodecRegistry())
-        );
-    }
-
-    private static MongoCollection<Document> getChunksCollection(final MongoDatabase database, final String bucketName) {
-        return database.getCollection(bucketName + ".chunks").withCodecRegistry(MongoClient.getDefaultCodecRegistry());
-    }
-
-    private void checkCreateIndex() {
-        if (!checkedIndexes) {
-            if (filesCollection.withDocumentClass(Document.class).withReadPreference(primary())
-                    .find().projection(new Document("_id", 1)).first() == null) {
-                Document filesIndex = new Document("filename", 1).append("uploadDate", 1);
-                if (!hasIndex(filesCollection.withReadPreference(primary()), filesIndex)) {
-                    filesCollection.createIndex(filesIndex);
-                }
-                Document chunksIndex = new Document("files_id", 1).append("n", 1);
-                if (!hasIndex(chunksCollection.withReadPreference(primary()), chunksIndex)) {
-                    chunksCollection.createIndex(chunksIndex, new IndexOptions().unique(true));
-                }
-            }
-            checkedIndexes = true;
-        }
-    }
-
-    private <T> boolean hasIndex(final MongoCollection<T> collection, final Document index) {
-        boolean hasIndex = false;
-        ArrayList<Document> indexes = collection.listIndexes().into(new ArrayList<Document>());
-        for (Document indexDoc : indexes) {
-            if (indexDoc.get("key", Document.class).equals(index)) {
-                hasIndex = true;
-                break;
-            }
-        }
-        return hasIndex;
-    }
-
-    private GridFSFile getFileByName(final String filename, final GridFSDownloadOptions options) {
-        int revision = options.getRevision();
-        int skip;
-        int sort;
-        if (revision >= 0) {
-            skip = revision;
-            sort = 1;
-        } else {
-            skip = (-revision) - 1;
-            sort = -1;
-        }
-
-        GridFSFile fileInfo = find(new Document("filename", filename)).skip(skip).sort(new Document("uploadDate", sort)).first();
-        if (fileInfo == null) {
-            throw new MongoGridFSException(format("No file found with the filename: %s and revision: %s", filename, revision));
-        }
-        return fileInfo;
-    }
-
-    private GridFSDownloadStream findTheFileInfoAndOpenDownloadStream(final BsonValue id) {
-        GridFSFile fileInfo = find(new Document("_id", id)).first();
-        if (fileInfo == null) {
-            throw new MongoGridFSException(format("No file found with the id: %s", id));
-        }
-        return new GridFSDownloadStreamImpl(fileInfo, chunksCollection);
-    }
-
-    private void downloadToStream(final GridFSDownloadStream downloadStream, final OutputStream destination) {
-        byte[] buffer = new byte[downloadStream.getGridFSFile().getChunkSize()];
-        int len;
-        MongoGridFSException savedThrowable = null;
-        try {
-            while ((len = downloadStream.read(buffer)) != -1) {
-                destination.write(buffer, 0, len);
-            }
-        } catch (IOException e) {
-            savedThrowable = new MongoGridFSException("IOException when reading from the OutputStream", e);
-        } catch (Exception e) {
-            savedThrowable = new MongoGridFSException("Unexpected Exception when reading GridFS and writing to the Stream", e);
-        } finally {
-            try {
-                downloadStream.close();
-            } catch (Exception e) {
-                // Do nothing
-            }
-            if (savedThrowable != null) {
-                throw savedThrowable;
-            }
-        }
-    }
-}
diff --git a/driver/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java b/driver/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java
deleted file mode 100644
index 0bf774e3588..00000000000
--- a/driver/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.gridfs;
-
-import com.mongodb.MongoGridFSException;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.gridfs.model.GridFSFile;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.types.Binary;
-import org.bson.types.ObjectId;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-
-import static com.mongodb.assertions.Assertions.notNull;
-import static com.mongodb.util.Util.toHex;
-
-final class GridFSUploadStreamImpl extends GridFSUploadStream {
-    private final MongoCollection<GridFSFile> filesCollection;
-    private final MongoCollection<Document> chunksCollection;
-    private final BsonValue fileId;
-    private final String filename;
-    private final int chunkSizeBytes;
-    private final Document metadata;
-    private final MessageDigest md5;
-    private byte[] buffer;
-    private long lengthInBytes;
-    private int bufferOffset;
-    private int chunkIndex;
-
-    private final Object closeLock = new Object();
-    private boolean closed = false;
-
-    GridFSUploadStreamImpl(final MongoCollection<GridFSFile> filesCollection, final MongoCollection<Document> chunksCollection,
-                           final BsonValue fileId, final String filename, final int chunkSizeBytes, final Document metadata) {
-        this.filesCollection = notNull("files collection", filesCollection);
-        this.chunksCollection = notNull("chunks collection", chunksCollection);
-        this.fileId = notNull("File Id", fileId);
-        this.filename = notNull("filename", filename);
-        this.chunkSizeBytes = chunkSizeBytes;
-        this.metadata = metadata;
-        try {
-            md5 = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException e) {
-            throw new MongoGridFSException("No MD5 message digest available, cannot upload file", e);
-        }
-        chunkIndex = 0;
-        bufferOffset = 0;
-        buffer = new byte[chunkSizeBytes];
-    }
-
-    @Override
-    @Deprecated
-    public ObjectId getFileId() {
-        return getObjectId();
-    }
-
-    @Override
-    public ObjectId getObjectId() {
-        if (!fileId.isObjectId()) {
-            throw new MongoGridFSException("Custom id type used for this GridFS upload stream");
-        }
-        return fileId.asObjectId().getValue();
-    }
-
-    @Override
-    public BsonValue getId() {
-        return fileId;
-    }
-
-    @Override
-    public void abort() {
-        synchronized (closeLock) {
-            checkClosed();
-            closed = true;
-        }
-        chunksCollection.deleteMany(new Document("files_id", fileId));
-    }
-
-    @Override
-    public void write(final int b) {
-        byte[] byteArray = new byte[1];
-        byteArray[0] = (byte) (0xFF & b);
-        write(byteArray, 0, 1);
-    }
-
-    @Override
-    public void write(final byte[] b) {
-        write(b, 0, b.length);
-    }
-
-    @Override
-    public void write(final byte[] b, final int off, final int len) {
-        checkClosed();
-        if (b == null) {
-            throw new NullPointerException();
-        } else if ((off < 0) || (off > b.length) || (len < 0)
-                || ((off + len) > b.length) || ((off + len) < 0)) {
-            throw new IndexOutOfBoundsException();
-        } else if (len == 0) {
-            return;
-        }
-
-        int currentOffset = off;
-        int lengthToWrite = len;
-        int amountToCopy = 0;
-
-        while (lengthToWrite > 0) {
-            amountToCopy = lengthToWrite;
-            if (amountToCopy > chunkSizeBytes - bufferOffset) {
-                amountToCopy = chunkSizeBytes - bufferOffset;
-            }
-            System.arraycopy(b, currentOffset, buffer, bufferOffset, amountToCopy);
-
-            bufferOffset += amountToCopy;
-            currentOffset += amountToCopy;
-            lengthToWrite -= amountToCopy;
-            lengthInBytes += amountToCopy;
-
-            if (bufferOffset == chunkSizeBytes) {
-                writeChunk();
-            }
-        }
-    }
-
-    @Override
-    public void close() {
-        synchronized (closeLock) {
-            if (closed) {
-                return;
-            }
-            closed = true;
-        }
-        writeChunk();
-        GridFSFile gridFSFile = new GridFSFile(fileId, filename, lengthInBytes, chunkSizeBytes, new Date(),
-                toHex(md5.digest()), metadata);
-        filesCollection.insertOne(gridFSFile);
-        buffer = null;
-    }
-
-    private void writeChunk() {
-        if (bufferOffset > 0) {
-            chunksCollection.insertOne(new Document("files_id", fileId).append("n", chunkIndex).append("data", getData()));
-            md5.update(buffer);
-            chunkIndex++;
-            bufferOffset = 0;
-        }
-    }
-
-    private Binary getData() {
-        if (bufferOffset < chunkSizeBytes) {
-            byte[] sizedBuffer = new byte[bufferOffset];
-            System.arraycopy(buffer, 0, sizedBuffer, 0, bufferOffset);
-            buffer = sizedBuffer;
-        }
-        return new Binary(buffer);
-    }
-
-    private void checkClosed() {
-        synchronized (closeLock) {
-            if (closed) {
-                throw new MongoGridFSException("The OutputStream has been closed");
-            }
-        }
-    }
-
-}
diff --git a/driver/src/main/com/mongodb/client/gridfs/package-info.java b/driver/src/main/com/mongodb/client/gridfs/package-info.java
deleted file mode 100644
index 92b5fb3d984..00000000000
--- a/driver/src/main/com/mongodb/client/gridfs/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains the new GridFS implementation
- *
- * @since 3.1
- */
-package com.mongodb.client.gridfs;
diff --git a/driver/src/main/com/mongodb/client/package-info.java b/driver/src/main/com/mongodb/client/package-info.java
deleted file mode 100644
index 04cdc8b1db2..00000000000
--- a/driver/src/main/com/mongodb/client/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains client interfaces
- */
-package com.mongodb.client;
diff --git a/driver/src/main/com/mongodb/gridfs/package-info.java b/driver/src/main/com/mongodb/gridfs/package-info.java
deleted file mode 100644
index 95c0a10ffa9..00000000000
--- a/driver/src/main/com/mongodb/gridfs/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains the classes for supporting MongoDB's specification for storing very large files, GridFS.
- * @mongodb.driver.manual core/gridfs/ GridFS
- */
-package com.mongodb.gridfs;
diff --git a/driver/src/main/com/mongodb/package-info.java b/driver/src/main/com/mongodb/package-info.java
deleted file mode 100644
index 2b2221d6201..00000000000
--- a/driver/src/main/com/mongodb/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package is the main entry point to the MongoDB Java Driver, and it contains the classes for the existing API from 2.x versions.
- */
-package com.mongodb;
diff --git a/driver/src/main/com/mongodb/util/Util.java b/driver/src/main/com/mongodb/util/Util.java
deleted file mode 100644
index 55e0f25645d..00000000000
--- a/driver/src/main/com/mongodb/util/Util.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.util;
-
-import com.mongodb.internal.HexUtils;
-
-import java.nio.ByteBuffer;
-
-/**
- * General utilities that are useful throughout the driver.
- */
-public class Util {
-    /**
-     * Converts the given byte buffer to a hexadecimal string using {@link java.lang.Integer#toHexString(int)}.
-     *
-     * @param bytes the bytes to convert to hex
-     * @return a String containing the hex representation of the given bytes.
-     */
-    public static String toHex(final byte[] bytes) {
-        return HexUtils.toHex(bytes);
-    }
-
-    /**
-     * Produce hex representation of the MD5 digest of a byte array.
-     *
-     * @param data bytes to digest
-     * @return hex string of the MD5 digest
-     */
-    public static String hexMD5(final byte[] data) {
-        return HexUtils.hexMD5(data);
-    }
-
-    /**
-     * Produce hex representation of the MD5 digest of a byte array.
-     *
-     * @param buf    byte buffer containing the bytes to digest
-     * @param offset the position to start reading bytes from
-     * @param len    the number of bytes to read from the buffer
-     * @return hex string of the MD5 digest
-     */
-    public static String hexMD5(final ByteBuffer buf, final int offset, final int len) {
-        return HexUtils.hexMD5(buf, offset, len);
-    }
-}
diff --git a/driver/src/main/com/mongodb/util/package-info.java b/driver/src/main/com/mongodb/util/package-info.java
deleted file mode 100644
index de57d51074d..00000000000
--- a/driver/src/main/com/mongodb/util/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains classes that can be used everywhere in the driver, and have no specific domain.
- */
-package com.mongodb.util;
diff --git a/driver/src/main/org/bson/io/package-info.java b/driver/src/main/org/bson/io/package-info.java
deleted file mode 100644
index 930f3549bfa..00000000000
--- a/driver/src/main/org/bson/io/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains I/O utilities
- */
-package org.bson.io;
diff --git a/driver/src/main/org/bson/package-info.java b/driver/src/main/org/bson/package-info.java
deleted file mode 100644
index 9d3adca45ff..00000000000
--- a/driver/src/main/org/bson/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains bson classes required for the driver
- */
-package org.bson;
diff --git a/driver/src/main/org/bson/types/package-info.java b/driver/src/main/org/bson/types/package-info.java
deleted file mode 100644
index 0bc7110e55b..00000000000
--- a/driver/src/main/org/bson/types/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This package contains driver specific type classes
- */
-package org.bson.types;
diff --git a/driver/src/main/org/bson/util/package-info.java b/driver/src/main/org/bson/util/package-info.java
deleted file mode 100644
index ecb50409bfc..00000000000
--- a/driver/src/main/org/bson/util/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Contains helper classes for working with the BSON protocol.
- */
-package org.bson.util;
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndDeleteAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndDeleteAcceptanceTest.java
deleted file mode 100644
index 516f867137a..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndDeleteAcceptanceTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.atomicoperations;
-
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.FindOneAndDeleteOptions;
-import org.bson.Document;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * Documents and tests the functionality provided for find-and-remove atomic operations.
- *
- * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
- */
-public class FindAndDeleteAcceptanceTest extends DatabaseTestCase {
-    private static final String KEY = "searchKey";
-    private static final String VALUE_TO_CARE_ABOUT = "Value to match";
-
-    @Test
-    public void shouldRemoveSingleDocument() {
-        // given
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        // when
-        Document filter = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        Document documentRetrieved = collection.findOneAndDelete(filter);
-
-        // then
-        assertThat("Document should have been deleted from the collection", collection.count(), is(0L));
-        assertThat("Document retrieved from removeAndGet should match the document that was inserted",
-                   documentRetrieved, equalTo(documentInserted));
-
-    }
-
-    @Test
-    public void shouldRemoveSingleDocumentWhenMultipleNonMatchingDocumentsExist() {
-        // given
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        collection.insertOne(documentInserted);
-        collection.insertOne(new Document("nonSearchKey", "Value we don't care about"));
-        collection.insertOne(new Document("anotherKey", "Another value"));
-
-        assertThat(collection.count(), is(3L));
-
-        // when
-        Document filter = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        Document documentRetrieved = collection.findOneAndDelete(filter);
-
-        // then
-        assertThat("Document should have been deleted from the collection", collection.count(), is(2L));
-        assertThat("Document retrieved from removeAndGet should match the document that was inserted",
-                   documentRetrieved, equalTo(documentInserted));
-    }
-
-    @Test
-    public void shouldRemoveSingleDocumentWhenMultipleDocumentsWithSameKeyExist() {
-        // given
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        collection.insertOne(documentInserted);
-        collection.insertOne(new Document(KEY, "Value we don't care about"));
-        collection.insertOne(new Document(KEY, "Another value"));
-
-        assertThat(collection.count(), is(3L));
-
-        // when
-        Document filter = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        Document documentRetrieved = collection.findOneAndDelete(filter);
-
-        // then
-        assertThat("Document should have been deleted from the collection", collection.count(), is(2L));
-        assertThat("Document retrieved from removeAndGet should match the document that was inserted",
-                   documentRetrieved, equalTo(documentInserted));
-    }
-
-    @Test
-    public void shouldRemoveOnlyOneDocumentWhenMultipleDocumentsMatchSearch() {
-        // given
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        collection.insertOne(documentInserted);
-        collection.insertOne(new Document(KEY, VALUE_TO_CARE_ABOUT));
-        collection.insertOne(new Document(KEY, VALUE_TO_CARE_ABOUT));
-
-        assertThat(collection.count(), is(3L));
-
-        // when
-        Document filter = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        assertThat(collection.count(filter, new CountOptions()), is(3L));
-
-        Document documentRetrieved = collection.findOneAndDelete(filter);
-
-        // then
-        assertThat("Document should have been deleted from the collection", collection.count(), is(2L));
-        assertThat("Document retrieved from removeAndGet should match the document that was inserted",
-                   documentRetrieved, equalTo(documentInserted));
-    }
-
-    @Test
-    public void shouldRemoveOnlyTheFirstValueMatchedByFilter() {
-        // given
-        String secondKey = "secondKey";
-        Document documentToRemove = new Document(KEY, VALUE_TO_CARE_ABOUT).append(secondKey, 1);
-        //inserting in non-ordered fashion
-        collection.insertOne(new Document(KEY, VALUE_TO_CARE_ABOUT).append(secondKey, 2));
-        collection.insertOne(new Document(KEY, VALUE_TO_CARE_ABOUT).append(secondKey, 3));
-        collection.insertOne(documentToRemove);
-
-        assertThat(collection.count(), is(3L));
-
-        // when
-        Document filter = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        Document documentRetrieved = collection.findOneAndDelete(filter, new FindOneAndDeleteOptions().sort(new Document(secondKey, 1)));
-
-        // then
-        assertThat("Document should have been deleted from the collection", collection.count(), is(2L));
-        assertThat("Document retrieved from removeAndGet should match the document that was inserted",
-                   documentRetrieved, equalTo(documentToRemove));
-    }
-
-    @Test
-    public void shouldReturnNullIfNoDocumentRemoved() {
-        // when
-        Document filter = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        Document documentRetrieved = collection.findOneAndDelete(filter);
-
-        // then
-        assertThat(documentRetrieved, is(nullValue()));
-    }
-
-    @Test
-    public void shouldReturnFullDocumentThatWasRemoved() {
-        // given
-        Document pete = new Document("name", "Pete").append("job", "handyman");
-        Document sam = new Document("name", "Sam").append("job", "plumber");
-
-        collection.insertOne(pete);
-        collection.insertOne(sam);
-
-        // when
-        Document removedDocument = collection.findOneAndDelete(new Document("name", "Pete"));
-
-        // then
-        assertThat(collection.count(), is(1L));
-        assertThat(collection.find().first(), is(sam));
-        assertThat(removedDocument, is(pete));
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndReplaceAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndReplaceAcceptanceTest.java
deleted file mode 100644
index 33fab2d4868..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndReplaceAcceptanceTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.atomicoperations;
-
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.FindOneAndReplaceOptions;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.test.Worker;
-import com.mongodb.client.test.WorkerCodecProvider;
-import org.bson.Document;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.DocumentCodecProvider;
-import org.bson.codecs.ValueCodecProvider;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.types.ObjectId;
-import org.junit.Test;
-
-import java.util.Date;
-
-import static java.util.Arrays.asList;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-/**
- * Documents and tests the functionality provided for find-and-replace atomic operations.
- *
- * @mongodb.driver.manual reference/command/findAndModify/ Find and Modify
- */
-public class FindAndReplaceAcceptanceTest extends DatabaseTestCase {
-    private static final String KEY = "searchKey";
-    private static final String VALUE_TO_CARE_ABOUT = "Value to match";
-
-    @Test
-    public void shouldReplaceDocumentAndReturnOriginal() {
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT).append("someOtherField", "withSomeOtherValue");
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        Document document = collection.findOneAndReplace(new Document(KEY, VALUE_TO_CARE_ABOUT),
-                                                         new Document("foo", "bar").append("_id", documentInserted.get("_id")));
-
-        assertThat("Document, retrieved from replaceAndGet should match the document inserted before",
-                   document, equalTo(documentInserted));
-    }
-
-    @Test
-    public void shouldReplaceAndReturnOriginalItemWithDocumentRequiringACustomEncoder() {
-        Worker pat = new Worker(new ObjectId(), "Pat", "Sales", new Date(), 0);
-        CodecRegistry codecRegistry = fromProviders(asList(new ValueCodecProvider(), new DocumentCodecProvider(),
-                new BsonValueCodecProvider(), new WorkerCodecProvider()));
-        MongoCollection<Worker> collection = database
-                .getCollection(getCollectionName(), Worker.class)
-                .withCodecRegistry(codecRegistry);
-
-        collection.insertOne(pat);
-
-        assertThat(collection.count(), is(1L));
-
-        Worker jordan = new Worker(pat.getId(), "Jordan", "Engineer", new Date(), 1);
-        Worker returnedDocument = collection.findOneAndReplace(new Document("name", "Pat"), jordan);
-
-        assertThat("Document, retrieved from getOneAndReplace, should match the document inserted before",
-                   returnedDocument, equalTo(pat));
-    }
-
-    @Test
-    public void shouldReplaceAndReturnNewItemWithDocumentRequiringACustomEncoder() {
-        Worker pat = new Worker(new ObjectId(), "Pat", "Sales", new Date(), 3);
-        CodecRegistry codecRegistry = fromProviders(asList(new ValueCodecProvider(), new DocumentCodecProvider(),
-                new BsonValueCodecProvider(), new WorkerCodecProvider()));
-        MongoCollection<Worker> collection = database
-                .getCollection(getCollectionName(), Worker.class)
-                .withCodecRegistry(codecRegistry);
-        collection.insertOne(pat);
-
-        assertThat(collection.count(), is(1L));
-
-        Worker jordan = new Worker(pat.getId(), "Jordan", "Engineer", new Date(), 7);
-        Worker returnedDocument = collection.findOneAndReplace(new Document("name", "Pat"), jordan,
-                                                               new FindOneAndReplaceOptions().returnDocument(ReturnDocument.AFTER));
-
-        assertThat("Worker retrieved from replaceOneAndGet should match the updated Worker",
-                   returnedDocument, equalTo(jordan));
-    }
-
-    @Test
-    public void shouldReturnNewDocumentAfterReplaceWhenUsingReplaceOneAndGet() {
-        ObjectId id = new ObjectId();
-        Document documentInserted = new Document("_id", id).append(KEY, VALUE_TO_CARE_ABOUT);
-        Document documentReplacement = new Document("_id", id).append("foo", "bar");
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        Document document = collection.findOneAndReplace(new Document(KEY, VALUE_TO_CARE_ABOUT), documentReplacement,
-                                                         new FindOneAndReplaceOptions().returnDocument(ReturnDocument.AFTER));
-
-
-        assertThat("Document, retrieved from replaceAndGet after change applied should match the document used as replacement",
-                   document, equalTo(documentReplacement));
-    }
-
-    @Test
-    public void shouldReturnNullWhenNothingToReplaceForGetOneAndReplace() {
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        Document document = collection.findOneAndReplace(new Document(KEY, "bar"), new Document("foo", "bar"));
-
-        assertNull("Document retrieved from getOneAndReplace should be null when no matching document found", document);
-    }
-
-    @Test
-    public void shouldReturnNullWhenNothingToReplaceForReplaceOneAndGet() {
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        Document document = collection.findOneAndReplace(new Document(KEY, "bar"), new Document("foo", "bar"));
-
-        assertNull("Document retrieved from replaceOneAndGet should be null when no matching document found", document);
-    }
-
-    @Test
-    public void shouldInsertDocumentWhenFilterDoesNotMatchAnyDocumentsAndUpsertFlagIsSet() {
-        Document originalDocument = new Document(KEY, VALUE_TO_CARE_ABOUT);
-        collection.insertOne(originalDocument);
-
-        assertThat(collection.count(), is(1L));
-
-        Document replacementDocument = new Document("_id", new ObjectId()).append("foo", "bar");
-
-        Document document = collection.findOneAndReplace(new Document(KEY, "valueThatDoesNotMatch"),
-                                                         replacementDocument,
-                                                         new FindOneAndReplaceOptions()
-                                                             .upsert(true)
-                                                             .returnDocument(ReturnDocument.AFTER));
-
-        assertThat(collection.count(), is(2L));
-        assertThat("Document retrieved from replaceOneAndGet with filter that doesn't match should match the replacement document",
-                   document, equalTo(replacementDocument));
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndUpdateAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndUpdateAcceptanceTest.java
deleted file mode 100644
index 4e8a365cf66..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/atomicoperations/FindAndUpdateAcceptanceTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.atomicoperations;
-
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.test.Worker;
-import com.mongodb.client.test.WorkerCodecProvider;
-import org.bson.Document;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.DocumentCodecProvider;
-import org.bson.codecs.ValueCodecProvider;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.types.ObjectId;
-import org.junit.Test;
-
-import java.util.Date;
-
-import static java.util.Arrays.asList;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-public class FindAndUpdateAcceptanceTest extends DatabaseTestCase {
-    private static final String KEY = "searchKey";
-    private static final String VALUE_TO_CARE_ABOUT = "Value to match";
-
-    @Test
-    public void shouldUpdateDocumentAndReturnOriginal() {
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT).append("someNumber", 11);
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        Document updateOperation = new Document("$inc", new Document("someNumber", 1));
-        Document documentBeforeChange = collection.findOneAndUpdate(new Document(KEY, VALUE_TO_CARE_ABOUT), updateOperation);
-
-        assertThat("Document returned from getOneAndUpdate should be the original document",
-                   (Integer) documentBeforeChange.get("someNumber"), equalTo(11));
-    }
-
-    @Test
-    public void shouldUpdateDocumentAndReturnNew() {
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT).append("someNumber", 11);
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        Document updateOperation = new Document("$inc", new Document("someNumber", 1));
-        Document updatedDocument = collection.findOneAndUpdate(new Document(KEY, VALUE_TO_CARE_ABOUT), updateOperation,
-                                                               new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER));
-
-        assertThat("Document returned from updateOneAndGet should be the updated document",
-                   (Integer) updatedDocument.get("someNumber"), equalTo(12));
-    }
-
-    @Test
-    public void shouldFindAndReplaceWithDocumentRequiringACustomEncoder() {
-        Worker pat = new Worker(new ObjectId(), "Pat", "Sales", new Date(), 7);
-        CodecRegistry codecRegistry = fromProviders(asList(new ValueCodecProvider(), new DocumentCodecProvider(),
-                new BsonValueCodecProvider(), new WorkerCodecProvider()));
-        MongoCollection<Worker> collection = database
-                .getCollection(getCollectionName(), Worker.class)
-                .withCodecRegistry(codecRegistry);
-        collection.insertOne(pat);
-
-        assertThat(collection.count(), is(1L));
-
-        Document updateOperation = new Document("$inc", new Document("numberOfJobs", 1));
-        Worker updatedDocument = collection.findOneAndUpdate(new Document("name", "Pat"), updateOperation,
-                                                             new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER));
-
-        assertThat("Worker returned from updateOneAndGet should have the",
-                   updatedDocument.getNumberOfJobs(), equalTo(8));
-    }
-
-    @Test
-    public void shouldReturnNullWhenNothingToUpdate() {
-        Document documentInserted = new Document(KEY, VALUE_TO_CARE_ABOUT).append("someNumber", 11);
-        collection.insertOne(documentInserted);
-
-        assertThat(collection.count(), is(1L));
-
-        Document updateOperation = new Document("$inc", new Document("someNumber", 1));
-        Document document = collection.findOneAndUpdate(new Document(KEY, "someValueThatDoesNotExist"), updateOperation);
-
-        assertNull("Document retrieved from getOneAndUpdate should be null", document);
-    }
-
-    @Test
-    public void shouldInsertDocumentWhenFilterDoesNotMatchAnyDocumentsAndUpsertSelected() {
-        Document originalDocument = new Document(KEY, VALUE_TO_CARE_ABOUT).append("someNumber", 11);
-        collection.insertOne(originalDocument);
-
-        assertThat(collection.count(), is(1L));
-
-        String newValueThatDoesNotMatchAnythingInDatabase = "valueThatDoesNotMatch";
-        Document updateOperation = new Document("$inc", new Document("someNumber", 1));
-        Document document = collection.findOneAndUpdate(new Document(KEY, newValueThatDoesNotMatchAnythingInDatabase), updateOperation,
-                                                        new FindOneAndUpdateOptions().upsert(true).returnDocument(ReturnDocument.AFTER));
-
-        assertThat(collection.count(), is(2L));
-        assertThat("Document retrieved from updateOneAndGet and upsert true should have the new values",
-                   (Integer) document.get("someNumber"), equalTo(1));
-        assertThat("Document retrieved from updateOneAndGet and upsert true should have the new values",
-                   document.get(KEY).toString(), equalTo(newValueThatDoesNotMatchAnythingInDatabase));
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/core/ClientAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/core/ClientAcceptanceTest.java
deleted file mode 100644
index ee3d3a20ae2..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/core/ClientAcceptanceTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.core;
-
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoDatabase;
-import org.bson.Document;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * Documents the basic functionality available for the MongoClient via the Java driver.
- */
-public class ClientAcceptanceTest extends DatabaseTestCase {
-
-    @Test
-    public void shouldListDatabaseNamesFromDatabase() {
-        database.createCollection(getCollectionName());
-        List<String> names = client.listDatabaseNames().into(new ArrayList<String>());
-
-        assertThat(names.contains(getDatabaseName()), is(true));
-    }
-
-    @Test
-    public void shouldBeAbleToListAllTheDatabaseNamesAvailable() {
-        MongoDatabase firstDatabase = client.getDatabase("FirstNewDatabase");
-        MongoDatabase secondDatabase = client.getDatabase("SecondNewDatabase");
-        MongoDatabase otherDatabase = client.getDatabase("DatabaseThatDoesNotExistYet");
-
-        try {
-            // given
-            firstDatabase.getCollection("coll").insertOne(new Document("aDoc", "to force database creation"));
-            secondDatabase.getCollection("coll").insertOne(new Document("aDoc", "to force database creation"));
-
-            //when
-            List<String> databaseNames = client.listDatabaseNames().into(new ArrayList<String>());
-
-            //then
-            assertThat(databaseNames, hasItems(firstDatabase.getName(), secondDatabase.getName()));
-            assertThat(databaseNames, not(hasItem(otherDatabase.getName())));
-        } finally {
-            //tear down
-            firstDatabase.drop();
-            secondDatabase.drop();
-        }
-    }
-
-    @Test
-    public void shouldListDatabase() {
-        List<Document> databases = client.listDatabases().into(new ArrayList<Document>());
-
-        database.createCollection(getCollectionName());
-        databases = client.listDatabases().into(new ArrayList<Document>());
-        assertThat(databases, new DatabaseNameMatcher(getDatabaseName()));
-    }
-
-    private static final class DatabaseNameMatcher extends BaseMatcher<List<Document>> {
-
-        private final String name;
-
-        DatabaseNameMatcher(final String name) {
-            this.name = name;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public boolean matches(final Object item) {
-            List<Document> databases = (List<Document>) item;
-            for (Document cur : databases) {
-                if (cur.get("name").equals(name)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        @Override
-        public void describeTo(final Description description) {
-            description.appendText("Document containing a name of " + name);
-        }
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/core/CollectionAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/core/CollectionAcceptanceTest.java
deleted file mode 100644
index 22152d785bd..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/core/CollectionAcceptanceTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.core;
-
-import com.mongodb.Block;
-import com.mongodb.Function;
-import com.mongodb.MongoNamespace;
-import com.mongodb.WriteConcern;
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.model.RenameCollectionOptions;
-import org.bson.BsonArray;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonRegularExpression;
-import org.bson.BsonString;
-import org.bson.BsonTimestamp;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.types.Binary;
-import org.bson.types.Code;
-import org.bson.types.CodeWithScope;
-import org.bson.types.MaxKey;
-import org.bson.types.MinKey;
-import org.bson.types.ObjectId;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Documents the basic functionality of MongoDB Collections available via the Java driver.
- */
-public class CollectionAcceptanceTest extends DatabaseTestCase {
-
-    @Test
-    public void shouldBeAbleToIterateOverACollection() {
-        int numberOfDocuments = 10;
-        initialiseCollectionWithDocuments(numberOfDocuments);
-
-        int countOfDocumentsInIterator = 0;
-        for (final Document document : collection.find()) {
-            assertThat(document, is(notNullValue()));
-            countOfDocumentsInIterator++;
-        }
-        assertThat(countOfDocumentsInIterator, is(numberOfDocuments));
-    }
-
-    @Test
-    public void shouldBeAbleToIterateOverACursor() {
-        int numberOfDocuments = 10;
-        initialiseCollectionWithDocuments(numberOfDocuments);
-
-        MongoCursor<Document> cursor = collection.find().iterator();
-        int countOfDocumentsInIterator = 0;
-        try {
-            while (cursor.hasNext()) {
-                assertThat(cursor.next(), is(notNullValue()));
-                countOfDocumentsInIterator++;
-            }
-        } finally {
-            cursor.close();
-        }
-        assertThat(countOfDocumentsInIterator, is(numberOfDocuments));
-    }
-
-    @Test
-    public void shouldCountNumberOfDocumentsInCollection() {
-        assertThat(collection.count(), is(0L));
-
-        collection.insertOne(new Document("myField", "myValue"));
-
-        assertThat(collection.count(), is(1L));
-    }
-
-    @Test
-    public void shouldDropExistingCollection() {
-        String collectionName = "shouldDropExistingCollection";
-        database.createCollection(collectionName);
-        MongoCollection<Document> newCollection = database.getCollection(collectionName);
-
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(collectionName), is(true));
-
-        newCollection.drop();
-
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(collectionName), is(false));
-    }
-
-    @Test
-    public void shouldAcceptDocumentsWithAllValidValueTypes() {
-        Document doc = new Document();
-        doc.append("_id", new ObjectId());
-        doc.append("bool", true);
-        doc.append("int", 3);
-        doc.append("long", 5L);
-        doc.append("str", "Hello MongoDB");
-        doc.append("double", 1.1);
-        doc.append("date", new Date());
-        doc.append("ts", new BsonTimestamp(5, 1));
-        doc.append("pattern", new BsonRegularExpression("abc"));
-        doc.append("minKey", new MinKey());
-        doc.append("maxKey", new MaxKey());
-        doc.append("js", new Code("code"));
-        doc.append("jsWithScope", new CodeWithScope("code", new Document()));
-        doc.append("null", null);
-        doc.append("binary", new Binary((byte) 42, new byte[]{10, 11, 12}));
-        doc.append("list", Arrays.asList(7, 8, 9));
-        doc.append("doc list", Arrays.asList(new Document("x", 1), new Document("x", 2)));
-
-        collection.insertOne(doc);
-        Document found = collection.find().first();
-        assertNotNull(found);
-        assertEquals(ObjectId.class, found.get("_id").getClass());
-        assertEquals(Boolean.class, found.get("bool").getClass());
-        assertEquals(Integer.class, found.get("int").getClass());
-        assertEquals(Long.class, found.get("long").getClass());
-        assertEquals(String.class, found.get("str").getClass());
-        assertEquals(Double.class, found.get("double").getClass());
-        assertEquals(Date.class, found.get("date").getClass());
-        assertEquals(BsonTimestamp.class, found.get("ts").getClass());
-        assertEquals(BsonRegularExpression.class, found.get("pattern").getClass());
-        assertEquals(MinKey.class, found.get("minKey").getClass());
-        assertEquals(MaxKey.class, found.get("maxKey").getClass());
-        assertEquals(Code.class, found.get("js").getClass());
-        assertEquals(CodeWithScope.class, found.get("jsWithScope").getClass());
-        assertNull(found.get("null"));
-        assertEquals(Binary.class, found.get("binary").getClass());
-        assertTrue(found.get("list") instanceof List);
-        assertTrue(found.get("doc list") instanceof List);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldRejectDocumentsWithFieldNamesContainingDots() {
-        collection.insertOne(new Document("x.y", 1));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldRejectNestedDocumentsWithFieldNamesContainingDots() {
-        collection.insertOne(new Document("x", new Document("a.b", 1)));
-    }
-
-    @Test
-    public void shouldIterateOverAllDocumentsInCollection() {
-        initialiseCollectionWithDocuments(10);
-        List<Document> iteratedDocuments = new ArrayList<Document>();
-        for (final Document cur : collection.find()) {
-            iteratedDocuments.add(cur);
-        }
-        assertEquals(10, iteratedDocuments.size());
-    }
-
-    @Test
-    public void shouldForEachOverAllDocumentsInCollection() {
-        initialiseCollectionWithDocuments(10);
-        final List<Document> iteratedDocuments = new ArrayList<Document>();
-        collection.find().forEach(new Block<Document>() {
-            @Override
-            public void apply(final Document document) {
-                iteratedDocuments.add(document);
-            }
-        });
-        assertEquals(10, iteratedDocuments.size());
-    }
-
-
-    @Test
-    public void shouldAddAllDocumentsIntoListWhenUsingFind() {
-        initialiseCollectionWithDocuments(10);
-        List<Document> iteratedDocuments = collection.find().into(new ArrayList<Document>());
-        assertEquals(10, iteratedDocuments.size());
-    }
-
-    @Test
-    public void shouldMapAllDocumentsIntoListWhenUsingFind() {
-        initialiseCollectionWithDocuments(5);
-        List<String> iteratedDocuments = collection.find().map(new Function<Document, String>() {
-            @Override
-            public String apply(final Document document) {
-                return document.getInteger("_id").toString();
-            }
-        }).into(new ArrayList<String>());
-        Collections.sort(iteratedDocuments);
-        assertEquals(asList("0", "1", "2", "3", "4"), iteratedDocuments);
-    }
-
-    @Test
-    public void shouldSortDocumentsWhenUsingAggregate() {
-        List<Document> documents = insertAggregationTestDocuments();
-        List<Document> sorted = collection.aggregate(asList(new Document("$sort", new Document("_id", 1)))).into(new ArrayList<Document>());
-        assertEquals(documents, sorted);
-    }
-
-    @Test
-    public void shouldSkipDocumentsWhenUsingAggregate() {
-        List<Document> documents = insertAggregationTestDocuments();
-        List<Document> skipped = collection.aggregate(asList(new Document("$sort", new Document("_id", 1)),
-                                                             new Document("$skip", 1))).into(new ArrayList<Document>());
-        assertEquals(documents.subList(1, 3), skipped);
-    }
-
-    @Test
-    public void shouldLimitDocumentsWhenUsingAggregate() {
-        List<Document> documents = insertAggregationTestDocuments();
-        List<Document> limited = collection.aggregate(asList(new Document("$sort", new Document("_id", 1)),
-                                                             new Document("$limit", 2))).into(new ArrayList<Document>());
-        assertEquals(documents.subList(0, 2), limited);
-    }
-
-    @Test
-    public void shouldFindDocumentsWhenUsingAggregate() {
-        List<Document> documents = insertAggregationTestDocuments();
-        List<Document> matched = collection.aggregate(asList(new Document("$match", new Document("_id", "10012"))))
-                                           .into(new ArrayList<Document>());
-        assertEquals(documents.subList(1, 2), matched);
-    }
-
-    @Test
-    public void shouldProjectDocumentsWhenUsingAggregate() {
-        insertAggregationTestDocuments();
-        List<Document> sorted = collection.aggregate(asList(new Document("$sort", new Document("_id", 1)),
-                                                            new Document("$project", new Document("_id", 0).append("zip", "$_id")))
-                                                    ).into(new ArrayList<Document>());
-        assertEquals(asList(new Document("zip", "01778"), new Document("zip", "10012"), new Document("zip", "94301")), sorted);
-    }
-
-    @Test
-    public void shouldUnwindDocumentsWhenUsingAggregate() {
-        insertAggregationTestDocuments();
-        List<Document> unwound = collection.aggregate(asList(new Document("$sort", new Document("_id", 1)),
-                                                             new Document("$project", new Document("_id", 0).append("tags", 1)),
-                                                             new Document("$unwind", "$tags"))
-                                                     ).into(new ArrayList<Document>());
-        assertEquals(asList(new Document("tags", "driver"),
-                            new Document("tags", "driver"),
-                            new Document("tags", "SA"),
-                            new Document("tags", "CE"),
-                            new Document("tags", "kernel"),
-                            new Document("tags", "driver"),
-                            new Document("tags", "SA"),
-                            new Document("tags", "CE")),
-                     unwound);
-    }
-
-    @Test
-    public void shouldGroupDocumentsWhenUsingAggregate() {
-        insertAggregationTestDocuments();
-        List<Document> grouped = collection.aggregate(asList(new Document("$sort", new Document("_id", 1)),
-                                                             new Document("$project", new Document("_id", 0).append("tags", 1)),
-                                                             new Document("$unwind", "$tags"),
-                                                             new Document("$group", new Document("_id", "$tags")),
-                                                             new Document("$sort", new Document("_id", 1))))
-                                           .into(new ArrayList<Document>());
-        assertEquals(asList(new Document("_id", "CE"),
-                            new Document("_id", "SA"),
-                            new Document("_id", "driver"),
-                            new Document("_id", "kernel")),
-                     grouped);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void shouldBeAbleToUseBsonValueToDistinctDocumentsOfVaryingTypes() {
-        List<Object> mixedList = new ArrayList<Object>();
-        mixedList.add(2);
-        mixedList.add("d");
-        mixedList.add(new Document("e", 3));
-
-        collection.drop();
-        collection.insertMany(asList(new Document("id", "a"), new Document("id", 1),
-                                     new Document("id", new Document("b", "c")),
-                                     new Document("id", new Document("list", mixedList))));
-
-        List<BsonValue> distinct = collection.distinct("id", BsonValue.class).into(new ArrayList<BsonValue>());
-        assertTrue(distinct.containsAll(asList(new BsonString("a"), new BsonInt32(1), new BsonDocument("b", new BsonString("c")),
-                new BsonDocument("list", new BsonArray(asList(new BsonInt32(2), new BsonString("d"),
-                        new BsonDocument("e", new BsonInt32(3))))))));
-
-        distinct = collection.distinct("id", new Document("id", new Document("$ne", 1)), BsonValue.class).into(new ArrayList<BsonValue>());
-        assertTrue(distinct.containsAll(asList(new BsonString("a"), new BsonDocument("b", new BsonString("c")),
-                new BsonDocument("list", new BsonArray(asList(new BsonInt32(2), new BsonString("d"),
-                        new BsonDocument("e", new BsonInt32(3))))))));
-    }
-
-    private void initialiseCollectionWithDocuments(final int numberOfDocuments) {
-        MongoCollection<Document> collection = database.getCollection(getCollectionName()).withWriteConcern(WriteConcern.ACKNOWLEDGED);
-        for (int i = 0; i < numberOfDocuments; i++) {
-            collection.insertOne(new Document("_id", i));
-        }
-    }
-
-    public List<Document> insertAggregationTestDocuments() {
-        List<Document> documents = new ArrayList<Document>();
-        documents.add(new Document("_id", "01778").append("city", "WAYLAND").append("state", "MA").append("population", 13100)
-                                                  .append("loc", asList(42.3635, 71.3619)).append("tags", asList("driver")));
-        documents.add(new Document("_id", "10012").append("city", "NEW YORK CITY")
-                                                  .append("state", "NY")
-                                                  .append("population", 8245000)
-                                                  .append("loc", asList(40.7260, 71.3619))
-                                                  .append("tags", asList("driver", "SA", "CE", "kernel")));
-        documents.add(new Document("_id", "94301").append("city", "PALO ALTO")
-                                                  .append("state", "CA")
-                                                  .append("population", 65412)
-                                                  .append("loc", asList(37.4419, 122.1419))
-                                                  .append("tags", asList("driver", "SA", "CE")));
-
-        List<Document> shuffledDocuments = new ArrayList<Document>(documents);
-        Collections.shuffle(shuffledDocuments);
-        collection.insertMany(shuffledDocuments);
-        return documents;
-    }
-
-
-    @Test
-    public void shouldChangeACollectionNameWhenRenameIsCalled() {
-        //given
-        collection.insertOne(new Document("someKey", "someValue"));
-
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(getCollectionName()), is(true));
-
-        //when
-        String newCollectionName = "TheNewCollectionName";
-        collection.renameCollection(new MongoNamespace(getDatabaseName(), newCollectionName));
-
-        //then
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(getCollectionName()), is(false));
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(newCollectionName), is(true));
-
-        MongoCollection<Document> renamedCollection = database.getCollection(newCollectionName);
-        assertThat("Renamed collection should have the same number of documents as original",
-                   renamedCollection.count(), is(1L));
-    }
-
-    @Test
-    public void shouldBeAbleToRenameCollectionToAnExistingCollectionNameAndReplaceItWhenDropIsTrue() {
-        //given
-        String existingCollectionName = "anExistingCollection";
-
-        String keyInOriginalCollection = "someKey";
-        String valueInOriginalCollection = "someValue";
-        collection.insertOne(new Document(keyInOriginalCollection, valueInOriginalCollection));
-
-        MongoCollection<Document> existingCollection = database.getCollection(existingCollectionName);
-        String keyInExistingCollection = "aDifferentDocument";
-        String valueInExistingCollection = "withADifferentValue";
-        existingCollection.insertOne(new Document(keyInExistingCollection, valueInExistingCollection));
-
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(getCollectionName()), is(true));
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(existingCollectionName), is(true));
-
-        //when
-        collection.renameCollection(new MongoNamespace(getDatabaseName(), existingCollectionName),
-                                    new RenameCollectionOptions().dropTarget(true));
-
-        //then
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(getCollectionName()), is(false));
-        assertThat(database.listCollectionNames().into(new ArrayList<String>()).contains(existingCollectionName), is(true));
-
-        MongoCollection<Document> replacedCollection = database.getCollection(existingCollectionName);
-        assertThat(replacedCollection.find().first().get(keyInExistingCollection), is(nullValue()));
-        assertThat(replacedCollection.find().first().get(keyInOriginalCollection).toString(), is(valueInOriginalCollection));
-    }
-
-    @Test
-    @Ignore("not implemented")
-    public void shouldFailRenameIfSharded() {
-
-    }
-
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/core/DatabaseAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/core/DatabaseAcceptanceTest.java
deleted file mode 100644
index 410f282cd07..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/core/DatabaseAcceptanceTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.core;
-
-import com.mongodb.MongoClient;
-import com.mongodb.ReadPreference;
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.model.CreateCollectionOptions;
-import org.bson.Document;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.mongodb.Fixture.getMongoClient;
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * Documents the basic functionality available for Databases via the Java driver.
- */
-public class DatabaseAcceptanceTest extends DatabaseTestCase {
-
-    @Test
-    public void shouldCreateCollection() {
-        database.createCollection(getCollectionName());
-
-        List<String> collections = database.listCollectionNames().into(new ArrayList<String>());
-        assertThat(collections.contains(getCollectionName()), is(true));
-    }
-
-    @Test
-    public void shouldCreateCappedCollection() {
-        database.createCollection(getCollectionName(), new CreateCollectionOptions().capped(true).sizeInBytes(40 * 1024));
-
-        List<String> collections = database.listCollectionNames().into(new ArrayList<String>());
-        assertThat(collections.contains(getCollectionName()), is(true));
-
-        MongoCollection<Document> collection = database.getCollection(getCollectionName());
-        Document collStatsCommand = new Document("collStats", getCollectionName());
-        Boolean isCapped = database.runCommand(collStatsCommand, ReadPreference.primary()).getBoolean("capped");
-        assertThat(isCapped, is(true));
-
-        assertThat("Should have the default index on _id", collection.listIndexes().into(new ArrayList<Document>()).size(), is(1));
-    }
-
-    @Test
-    public void shouldCreateCappedCollectionWithoutAutoIndex() {
-        database.createCollection(getCollectionName(), new CreateCollectionOptions()
-                .capped(true)
-                .sizeInBytes(40 * 1024)
-                .autoIndex(false));
-
-        List<String> collections = database.listCollectionNames().into(new ArrayList<String>());
-        assertThat(collections.contains(getCollectionName()), is(true));
-
-        MongoCollection<Document> collection = database.getCollection(getCollectionName());
-        Document collStatsCommand = new Document("collStats", getCollectionName());
-        Boolean isCapped = database.runCommand(collStatsCommand, ReadPreference.primary()).getBoolean("capped");
-        assertThat(isCapped, is(true));
-
-        assertThat("Should NOT have the default index on _id", collection.listIndexes().into(new ArrayList<Document>()).size(), is(0));
-    }
-
-    @Test
-    public void shouldSupportMaxNumberOfDocumentsInACappedCollection() {
-        int maxDocuments = 5;
-        database.createCollection(getCollectionName(), new CreateCollectionOptions()
-                .capped(true)
-                .sizeInBytes(40 * 1024)
-                .autoIndex(false)
-                .maxDocuments(maxDocuments));
-
-        List<String> collections = database.listCollectionNames().into(new ArrayList<String>());
-        assertThat(collections.contains(getCollectionName()), is(true));
-
-        Document collStatsCommand = new Document("collStats", getCollectionName());
-        Document collectionStatistics = database.runCommand(collStatsCommand, ReadPreference.primary());
-        assertThat("max is set correctly in collection statistics", collectionStatistics.getInteger("max"), is(maxDocuments));
-    }
-
-    @Test
-    public void shouldListCollectionNamesFromDatabase() {
-        database.createCollection(getCollectionName());
-        List<String> collections = database.listCollectionNames().into(new ArrayList<String>());
-
-        assertThat(collections.contains(getCollectionName()), is(true));
-    }
-
-    @Test
-    public void shouldListCollectionsFromDatabase() {
-        database.drop();
-
-        List<Document> collections = database.listCollections().into(new ArrayList<Document>());
-        assertThat(collections.size(), is(0));
-
-        for (int i = 0; i < 20; i++) {
-            database.createCollection("coll" + i);
-        }
-
-        collections = database.listCollections().into(new ArrayList<Document>());
-        assertThat(collections.size(), is(greaterThanOrEqualTo(20)));
-
-        collections = database.listCollections().filter(new Document("name", "coll1")).into(new ArrayList<Document>());
-        assertThat(collections.size(), is(1));
-
-    }
-
-    @Test
-    public void shouldBeAbleToListAllTheDatabasesAvailable() {
-        MongoClient mongoClient = getMongoClient();
-        MongoDatabase firstDatabase = mongoClient.getDatabase("FirstNewDatabase");
-        MongoDatabase secondDatabase = mongoClient.getDatabase("SecondNewDatabase");
-        MongoDatabase otherDatabase = mongoClient.getDatabase("DatabaseThatDoesNotExistYet");
-
-        try {
-            // given
-            firstDatabase.getCollection("coll").insertOne(new Document("aDoc", "to force database creation"));
-            secondDatabase.getCollection("coll").insertOne(new Document("aDoc", "to force database creation"));
-
-            //when
-            List<String> databaseNames = mongoClient.listDatabaseNames().into(new ArrayList<String>());
-
-            //then
-            assertThat(databaseNames, hasItems(firstDatabase.getName(), secondDatabase.getName()));
-            assertThat(databaseNames, not(hasItem(otherDatabase.getName())));
-        } finally {
-            //tear down
-            firstDatabase.drop();
-            secondDatabase.drop();
-        }
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/DeleteAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/DeleteAcceptanceTest.java
deleted file mode 100644
index 0bed6f17a45..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/DeleteAcceptanceTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.crud;
-
-import com.mongodb.client.DatabaseTestCase;
-import org.bson.Document;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * This acceptance test demonstrates the use and expected behaviour of the remove() and removeOne() methods.
- *
- * @since 3.0
- */
-public class DeleteAcceptanceTest extends DatabaseTestCase {
-    @Test
-    public void shouldDeleteOnlyOneMatchingDocumentWithDeleteOne() {
-        // Given
-        Document firstDocument = new Document("_id", 1).append("a", 1);
-        collection.insertOne(firstDocument);
-        Document secondDocument = new Document("_id", 2).append("a", 1);
-        collection.insertOne(secondDocument);
-
-        // When
-        Document filter = new Document("a", 1);
-        collection.deleteOne(filter);
-
-        // Then
-        assertThat(collection.count(), is(1L));
-    }
-
-    @Test
-    public void shouldDeleteAllMatchingDocumentsWithDeleteMany() {
-        // Given
-        Document firstDocument = new Document("_id", 1).append("a", 1);
-        collection.insertOne(firstDocument);
-        Document secondDocument = new Document("_id", 2).append("a", 1);
-        collection.insertOne(secondDocument);
-
-        // When
-        Document filter = new Document("a", 1);
-        collection.deleteMany(filter);
-
-        // Then
-        assertThat(collection.count(), is(0L));
-    }
-
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/InsertAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/InsertAcceptanceTest.java
deleted file mode 100644
index c887dc987fc..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/InsertAcceptanceTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.crud;
-
-import com.mongodb.client.DatabaseTestCase;
-import org.bson.Document;
-import org.junit.Test;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-public class InsertAcceptanceTest extends DatabaseTestCase {
-    @Test
-    public void shouldInsertSimpleUntypedDocument() {
-
-        // When
-        Document simpleDocument = new Document("name", "Billy");
-        collection.insertOne(simpleDocument);
-
-        // Then
-        assertThat(collection.count(), is(1L));
-
-        Document insertedDocument = collection.find(new Document("name", "Billy")).first();
-        assertThat(insertedDocument.getString("name"), is("Billy"));
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/ReplaceAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/ReplaceAcceptanceTest.java
deleted file mode 100644
index 616cc9854ba..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/ReplaceAcceptanceTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.crud;
-
-import com.mongodb.MongoWriteException;
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.model.UpdateOptions;
-import org.bson.Document;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.anyOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-public class ReplaceAcceptanceTest extends DatabaseTestCase {
-    @Test
-    public void shouldReplaceASingleDocumentMatchingTheSelectorWhenUsingReplaceOne() {
-        // Given
-        Document firstDocument = new Document("_id", 1).append("a", 1).append("x", 3);
-        collection.insertOne(firstDocument);
-        Document secondDocument = new Document("_id", 2).append("a", 1).append("x", 3);
-        collection.insertOne(secondDocument);
-
-        // When
-        Document filter = new Document("_id", 2);
-        Document newDocumentWithoutFieldForA = new Document("_id", 2).append("x", 7);
-        collection.replaceOne(filter, newDocumentWithoutFieldForA);
-
-        // Then
-        Document document = collection.find(filter).first();
-        assertThat(document, is(newDocumentWithoutFieldForA));
-    }
-
-    @Test
-    public void shouldInsertTheDocumentIfReplacingWithUpsertAndDocumentNotFoundInCollection() {
-        // given
-        assertThat(collection.count(), is(0L));
-
-        // when
-        Document replacement = new Document("_id", 3).append("x", 2);
-        collection.replaceOne(new Document(), replacement, new UpdateOptions().upsert(true));
-
-        // then
-        assertThat(collection.count(), is(1L));
-        assertThat(collection.find(new Document("_id", 3)).iterator().next(), is(replacement));
-    }
-
-    @Test
-    public void shouldReplaceTheDocumentIfReplacingWithUpsertAndDocumentIsFoundInCollection() {
-        // given
-        Document originalDocument = new Document("_id", 3).append("x", 2);
-        collection.replaceOne(new Document(), originalDocument, new UpdateOptions().upsert(true));
-        assertThat(collection.count(), is(1L));
-
-        // when
-        Document replacement = originalDocument.append("y", 5);
-        collection.replaceOne(new Document(), replacement, new UpdateOptions().upsert(true));
-
-        // then
-        assertThat(collection.count(), is(1L));
-        assertThat(collection.find(new Document("_id", 3)).iterator().next(),  is(replacement));
-    }
-
-    @Test
-    public void shouldThrowExceptionIfTryingToChangeTheIdOfADocument() {
-        // Given
-        Document firstDocument = new Document("_id", 1).append("a", 1);
-        collection.insertOne(firstDocument);
-
-        // When
-        Document filter = new Document("a", 1);
-        Document newDocumentWithDifferentId = new Document("_id", 2).append("a", 3);
-        try {
-            collection.replaceOne(filter, newDocumentWithDifferentId);
-            fail("Should have thrown an exception");
-        } catch (MongoWriteException e) {
-            // Then
-            assertThat("Error code should match one of these error codes", e.getCode(), anyOf(is(13596), is(16837)));
-        }
-    }
-
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/UpdateAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/UpdateAcceptanceTest.java
deleted file mode 100644
index f5eb37acecf..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/UpdateAcceptanceTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.crud;
-
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.UpdateOptions;
-import org.bson.Document;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * This acceptance test demonstrates the use and expected behaviour of the update() and updateOne() methods.
- *
- * @since 3.0
- */
-public class UpdateAcceptanceTest extends DatabaseTestCase {
-    @Test
-    public void shouldSetANewFieldOnAnExistingDocument() {
-        // given
-        Document originalDocument = new Document("_id", 1);
-        collection.insertOne(originalDocument);
-
-        // when
-        collection.updateOne(new Document("_id", 1), new Document("$set", new Document("x", 2)));
-
-        // then
-        assertThat(collection.count(), is(1L));
-        Document expectedDocument = new Document("_id", 1).append("x", 2);
-        assertThat(collection.find().first(), is(expectedDocument));
-    }
-
-    @Test
-    public void shouldIncrementAnIntValue() {
-        // given
-        Document originalDocument = new Document("_id", 1).append("x", 2);
-        collection.insertOne(originalDocument);
-
-        // when
-        collection.updateOne(new Document("_id", 1), new Document("$inc", new Document("x", 1)));
-
-        // then
-        assertThat(collection.count(), is(1L));
-        Document expectedDocument = new Document("_id", 1).append("x", 3);
-        assertThat(collection.find().first(), is(expectedDocument));
-    }
-
-    @Test
-    public void shouldInsertTheDocumentIfUpdatingAllWithUpsertAndDocumentNotFoundInCollection() {
-        // given
-        Document originalDocument = new Document("_id", 1).append("x", 2);
-        collection.insertOne(originalDocument);
-
-        // when
-        Document filter = new Document("_id", 2);
-        collection.updateMany(filter, new Document("$set", new Document("x", 5)), new UpdateOptions().upsert(true));
-
-        // then
-        assertThat(collection.count(), is(2L));
-        Document expectedDocument = new Document("_id", 2).append("x", 5);
-        assertThat(collection.find(filter).iterator().next(), is(expectedDocument));
-    }
-
-    @Test
-    public void shouldInsertTheDocumentIfUpdatingOneWithUpsertAndDocumentNotFoundInCollection() {
-        // given
-        Document originalDocument = new Document("_id", 1).append("x", 2);
-        collection.insertOne(originalDocument);
-
-        // when
-        Document filter = new Document("_id", 2);
-        collection.updateOne(filter, new Document("$set", new Document("x", 5)), new UpdateOptions().upsert(true));
-
-        // then
-        assertThat(collection.count(), is(2L));
-        Document expectedDocument = new Document("_id", 2).append("x", 5);
-        assertThat(collection.find(filter).iterator().next(), is(expectedDocument));
-    }
-
-    @Test
-    public void shouldUpdateAllDocumentsIfUpdatingAllWithUpsertAndMultipleDocumentsFoundInCollection() {
-        // given
-        Document firstDocument = new Document("_id", 1).append("x", 3);
-        collection.insertOne(firstDocument);
-        Document secondDocument = new Document("_id", 2).append("x", 3);
-        collection.insertOne(secondDocument);
-
-        // when
-        Document filter = new Document("x", 3);
-        collection.updateMany(filter, new Document("$set", new Document("x", 5)), new UpdateOptions().upsert(true));
-
-
-        // then
-        assertThat(collection.count(new Document("x", 5), new CountOptions()), is(2L));
-    }
-
-    @Test
-    public void shouldUpdateOneDocumentIfUpdatingOneWithUpsertAndMultipleDocumentsFoundInCollection() {
-        // given
-        Document firstDocument = new Document("_id", 1).append("x", 3);
-        collection.insertOne(firstDocument);
-        Document secondDocument = new Document("_id", 2).append("x", 3);
-        collection.insertOne(secondDocument);
-
-        // when
-        Document filter = new Document("x", 3);
-        collection.updateOne(filter, new Document("$set", new Document("x", 5)), new UpdateOptions().upsert(true));
-
-        // then
-        assertThat(collection.count(new Document("x", 5), new CountOptions()), is(1L));
-    }
-
-    @Test
-    public void shouldUpdateASingleDocumentMatchingTheSelectorWhenUsingUpdateOne() {
-        // Given
-        Document firstDocument = new Document("a", 1).append("x", 3);
-        collection.insertOne(firstDocument);
-        Document secondDocument = new Document("a", 1).append("x", 3);
-        collection.insertOne(secondDocument);
-
-        // When
-        Document filter = new Document("a", 1);
-        Document incrementXValueByOne = new Document("$inc", new Document("x", 1));
-        collection.updateOne(filter, incrementXValueByOne);
-
-        // Then
-        assertThat(collection.count(new Document("x", 4), new CountOptions()), is(1L));
-    }
-
-    @Test
-    public void shouldUpdateAllDocumentsMatchingTheSelectorWhenUsingUpdate() {
-        // Given
-        Document firstDocument = new Document("a", 1).append("x", 3);
-        collection.insertOne(firstDocument);
-        Document secondDocument = new Document("a", 1).append("x", 3);
-        collection.insertOne(secondDocument);
-
-        // When
-        Document filter = new Document("a", 1);
-        Document incrementXValueByOne = new Document("$inc", new Document("x", 1));
-        collection.updateMany(filter, incrementXValueByOne);
-
-        // Then
-        assertThat(collection.count(new Document("x", 4), new CountOptions()), is(2L));
-    }
-
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Address.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Address.java
deleted file mode 100644
index d405d0ebecb..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Address.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.crud.pojo;
-
-public class Address {
-    private String addressLineOne;
-    private String town;
-    private Postcode postcode;
-
-    //CHECKSTYLE:OFF
-    //necessary evil until we do smart stuff around identifying the ID
-    private String _id;
-    //CHECKSTYLE:ON
-
-    public Address(final String addressLineOne, final String town, final Postcode postcode) {
-        this.addressLineOne = addressLineOne;
-        this.town = town;
-        this.postcode = postcode;
-    }
-
-    public Address() {
-        // no-args constructor required for decoding from database
-    }
-
-    // *** Standard Boilerplate
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Address address = (Address) o;
-
-        return !(_id != null ? !_id.equals(address._id) : address._id != null)
-               && addressLineOne.equals(address.addressLineOne)
-               && postcode.equals(address.postcode)
-               && town.equals(address.town);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = addressLineOne.hashCode();
-        result = 31 * result + town.hashCode();
-        result = 31 * result + postcode.hashCode();
-        result = 31 * result + (_id != null ? _id.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "Address{"
-               + "addressLineOne='" + addressLineOne + '\''
-               + ", town='" + town + '\''
-               + ", postcode=" + postcode
-               + ", _id='" + _id + '\''
-               + '}';
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Person.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Person.java
deleted file mode 100644
index 4bd658db449..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Person.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.crud.pojo;
-
-public class Person {
-    private String firstName;
-    private String lastName;
-    private final transient String ignoredValue = "ignoreMe!";
-
-    //CHECKSTYLE:OFF
-    //necessary evil until we do smart stuff around identifying the ID
-    private String _id;
-    //CHECKSTYLE:ON
-
-    public Person(final String firstName, final String lastName) {
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
-
-    public Person() {
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    // *** boilerplate required for tests
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Person person = (Person) o;
-
-        return !(_id != null ? !_id.equals(person._id) : person._id != null)
-               && firstName.equals(person.firstName)
-               && lastName.equals(person.lastName);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = firstName.hashCode();
-        result = 31 * result + lastName.hashCode();
-        result = 31 * result + (_id != null ? _id.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "Person{"
-               + "firstName='" + firstName + '\''
-               + ", lastName='" + lastName + '\''
-               + ", _id='" + _id + '\''
-               + '}';
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Postcode.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Postcode.java
deleted file mode 100644
index 2c4c65da528..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/crud/pojo/Postcode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.crud.pojo;
-
-public class Postcode {
-    private String postcode;
-
-    public Postcode(final String postcode) {
-        this.postcode = postcode;
-    }
-
-    public Postcode() {
-        //no-args constructor required for decoding from database
-    }
-
-    // *** Standard Boilerplate
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        return postcode.equals(((Postcode) o).postcode);
-    }
-
-    @Override
-    public int hashCode() {
-        return postcode.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return "Postcode{postcode='" + postcode + '\'' + '}';
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/index/AddIndexAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/index/AddIndexAcceptanceTest.java
deleted file mode 100644
index 631f3947227..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/index/AddIndexAcceptanceTest.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.index;
-
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.IndexOptions;
-import com.mongodb.operation.OrderBy;
-import org.bson.Document;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.operation.OrderBy.ASC;
-import static com.mongodb.operation.OrderBy.DESC;
-import static com.mongodb.operation.OrderBy.fromInt;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * Use cases for adding indexes to your MongoDB database via the Java driver.  Documents the index options that are currently supported by
- * the updated driver.
- */
-public class AddIndexAcceptanceTest extends DatabaseTestCase {
-
-    @Test
-    public void shouldGetExistingIndexesOnDatabase() {
-        collection.insertOne(new Document("new", "value"));
-
-        List<Document> indexes = collection.listIndexes().into(new ArrayList<Document>());
-        assertThat("Should have the default index on _id when a document exists", indexes.size(), is(1));
-        String nameOfIndex = indexes.get(0).getString("name");
-        assertThat("Should be the default index on id", nameOfIndex, is("_id_"));
-    }
-
-    @Test
-    public void shouldCreateIndexOnCollectionWithoutIndex() {
-        collection.createIndex(new Document("field", 1));
-
-        assertThat("Should be default index and new index on the database now",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(2));
-    }
-
-    @Test
-    public void shouldCreateIndexWithNameOfFieldPlusOrder() {
-        collection.createIndex(new Document("field", 1));
-
-        String nameOfCreatedIndex = (String) collection.listIndexes().into(new ArrayList<Document>()).get(1).get("name");
-        assertThat("Should be an index with name of field, ascending", nameOfCreatedIndex, is("field_1"));
-    }
-
-    @Test
-    public void shouldCreateAnAscendingIndex() {
-        collection.createIndex(new Document("field", 1));
-
-        Document newIndexDetails = collection.listIndexes().into(new ArrayList<Document>()).get(1);
-        OrderBy order = fromInt((Integer) ((Document) newIndexDetails.get("key")).get("field"));
-        assertThat("Index created should be ascending", order, is(ASC));
-    }
-
-    @Test
-    public void shouldCreateADescendingIndex() {
-        collection.createIndex(new Document("field", -1));
-
-        Document newIndexDetails = collection.listIndexes().into(new ArrayList<Document>()).get(1);
-        OrderBy order = fromInt((Integer) ((Document) newIndexDetails.get("key")).get("field"));
-        assertThat("Index created should be descending", order, is(DESC));
-    }
-
-    @Test
-    public void shouldCreateNonUniqueIndexByDefault() {
-        collection.createIndex(new Document("field", 1));
-
-        Document newIndexDetails = collection.listIndexes().into(new ArrayList<Document>()).get(1);
-        assertThat("Index created should not be unique", newIndexDetails.get("unique"), is(nullValue()));
-    }
-
-    @Test
-    public void shouldCreateIndexOfUniqueValues() {
-        collection.createIndex(new Document("field", 1), new IndexOptions().unique(true));
-
-        Document newIndexDetails = collection.listIndexes().into(new ArrayList<Document>()).get(1);
-        Boolean unique = (Boolean) newIndexDetails.get("unique");
-        assertThat("Index created should be unique", unique, is(true));
-    }
-
-    @Test
-    public void shouldSupportCompoundIndexes() {
-        collection.createIndex(new Document("theFirstField", 1).append("theSecondField", 1));
-        Document newIndexDetails = collection.listIndexes().into(new ArrayList<Document>()).get(1);
-
-        Document keys = (Document) newIndexDetails.get("key");
-        Object theFirstField = keys.get("theFirstField");
-        assertThat("Index should contain the first key", theFirstField, is(notNullValue()));
-        OrderBy orderBy = fromInt((Integer) theFirstField);
-        assertThat("Index created should be ascending", orderBy, is(ASC));
-
-        Object theSecondField = keys.get("theSecondField");
-        assertThat("Index should contain the second key", theSecondField, is(notNullValue()));
-        orderBy = fromInt((Integer) theSecondField);
-        assertThat("Index created should be ascending", orderBy, is(ASC));
-
-        assertThat("Index name should contain both field names", (String) newIndexDetails.get("name"),
-                   is("theFirstField_1_theSecondField_1"));
-    }
-
-    @Test
-    public void shouldSupportCompoundIndexesWithDifferentOrders() {
-        collection.createIndex(new Document("theFirstField", 1).append("theSecondField", -1));
-
-        Document newIndexDetails = collection.listIndexes().into(new ArrayList<Document>()).get(1);
-
-        Document keys = (Document) newIndexDetails.get("key");
-
-        OrderBy orderBy = fromInt((Integer) keys.get("theFirstField"));
-        assertThat("First index should be ascending", orderBy, is(ASC));
-
-        orderBy = fromInt((Integer) keys.get("theSecondField"));
-        assertThat("Second index should be descending", orderBy, is(DESC));
-
-        assertThat("Index name should contain both field names",
-                   (String) newIndexDetails.get("name"),
-                   is("theFirstField_1_theSecondField_-1"));
-    }
-
-    @Test
-    public void shouldOnlyReturnIndexesForTheSelectedCollection() {
-        collection.createIndex(new Document("field", 1));
-
-        MongoCollection<Document> anotherCollection = database.getCollection("anotherCollection");
-        anotherCollection.createIndex(new Document("someOtherField", 1));
-
-        assertThat("Should be default index and new index on the first database",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(2));
-        assertThat("Should be default index and new index on the second database", anotherCollection.listIndexes()
-                                                                                                    .into(new
-                                                                                                          ArrayList<Document>())
-                                                                                                    .size(), is(2));
-    }
-
-    @Test
-    public void shouldBeAbleToAddGeoIndexes() {
-        collection.createIndex(new Document("locationField", "2d"));
-        assertThat("Should be default index and new index on the database now",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(2));
-    }
-
-    @Test
-    public void shouldBeAbleToAddGeoSphereIndexes() {
-        collection.createIndex(new Document("locationField", "2dsphere"));
-        assertThat("Should be default index and new index on the database now",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(2));
-    }
-
-    @Test
-    public void shouldSupportCompoundIndexesOfOrderedFieldsAndGeoFields() {
-        collection.createIndex(new Document("locationField", "2d").append("someOtherField", 1));
-
-        Document newIndexDetails = collection.listIndexes().into(new ArrayList<Document>()).get(1);
-
-        Document keys = (Document) newIndexDetails.get("key");
-        Object geoField = keys.get("locationField");
-        assertThat("Index should contain the first key", geoField, is(notNullValue()));
-        String geoIndexValue = geoField.toString();
-        assertThat("Index created should be a geo index", geoIndexValue, is("2d"));
-
-        Object orderedField = keys.get("someOtherField");
-        assertThat("Index should contain the second key", orderedField, is(notNullValue()));
-        OrderBy orderBy = fromInt((Integer) orderedField);
-        assertThat("Index created should be ascending", orderBy, is(ASC));
-
-        assertThat("Index name should contain both field names",
-                   (String) newIndexDetails.get("name"),
-                   is("locationField_2d_someOtherField_1"));
-    }
-
-    @Test
-    public void shouldAllowAliasForIndex() {
-        String indexAlias = "indexAlias";
-        collection.createIndex(new Document("theField", 1), new IndexOptions().name(indexAlias));
-
-        String nameOfCreatedIndex = collection.listIndexes().into(new ArrayList<Document>()).get(1).getString("name");
-        assertThat("Should be an index named after the alias", nameOfCreatedIndex, is(indexAlias));
-    }
-
-    @Test
-    public void shouldCreateASparseIndex() {
-        collection.createIndex(new Document("theField", 1), new IndexOptions().sparse(true));
-
-        Boolean sparse = collection.listIndexes().into(new ArrayList<Document>()).get(1).getBoolean("sparse");
-        assertThat("Should be a sparse index", sparse, is(true));
-    }
-
-    @Test
-    @Ignore("Ingore until SERVER-16274 if resolved")
-    public void shouldCreateABackgroundIndex() {
-        collection.createIndex(new Document("theField", 1), new IndexOptions().background(true));
-
-        Boolean background = collection.listIndexes().into(new ArrayList<Document>()).get(1).getBoolean("background");
-        assertThat("Should be a background index", background, is(true));
-    }
-
-    @Test
-    public void shouldCreateATtlIndex() {
-        collection.createIndex(new Document("theField", 1), new IndexOptions().expireAfter(1600L, TimeUnit.SECONDS));
-
-        Long ttl = collection.listIndexes().into(new ArrayList<Document>()).get(1).getLong("expireAfterSeconds");
-        assertThat("Should be a ttl index", ttl, is(1600L));
-    }
-
-    //TODO: other ordering options
-    //TODO: can you disable the index on ID for non-capped collections?
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/index/DropIndexAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/index/DropIndexAcceptanceTest.java
deleted file mode 100644
index 4c7951328e2..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/index/DropIndexAcceptanceTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.index;
-
-import com.mongodb.MongoCommandException;
-import com.mongodb.client.DatabaseTestCase;
-import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-public class DropIndexAcceptanceTest extends DatabaseTestCase {
-    @Before
-    public void setUp() {
-        super.setUp();
-        //create a brand new collection for each test
-        collection = database.getCollection("Collection" + System.currentTimeMillis());
-        assertThat("Should be no indexes on the database at all at this stage",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(0));
-    }
-
-    @Test
-    public void shouldDropSingleNamedIndex() {
-        // Given
-        collection.createIndex(new Document("field", 1));
-
-        assertThat("Should be default index and new index on the database now",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(2));
-
-        // When
-        collection.dropIndex("field_1");
-
-        // Then
-        assertThat("Should be one less index", collection.listIndexes().into(new ArrayList<Document>()).size(), is(1));
-    }
-
-    @Test
-    public void shouldDropSingleIndexByKeys() {
-        // Given
-        Document keys = new Document("field", 1);
-        collection.createIndex(keys);
-
-        assertThat("Should be default index and new index on the database now",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(2));
-
-        // When
-        collection.dropIndex(keys);
-
-        // Then
-        assertThat("Should be one less index", collection.listIndexes().into(new ArrayList<Document>()).size(), is(1));
-    }
-
-    @Test
-    public void shouldDropAllIndexesForCollection() {
-        // Given
-        collection.createIndex(new Document("field", 1));
-        collection.createIndex(new Document("anotherField", 1));
-
-        assertThat("Should be three indexes on the collection now", collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(3));
-
-        // When
-        collection.dropIndexes();
-
-        // Then
-        assertThat("Should only be the default index on the collection",
-                   collection.listIndexes().into(new ArrayList<Document>()).size(),
-                   is(1));
-    }
-
-    @Test(expected = MongoCommandException.class)
-    public void shouldErrorWhenDroppingAnIndexThatDoesNotExist() {
-        //Given
-        collection.insertOne(new Document("to", "createTheCollection"));
-
-        // When
-        collection.dropIndex("nonExistentIndex");
-    }
-
-    @Test
-    public void shouldNotErrorWhenTryingToDropIndexesOnACollectionThatDoesNotExist() {
-        collection.dropIndex("nonExistentIndex");
-    }
-
-    @Test
-    public void shouldNotErrorWhenTryingToDropAllIndexesOnACollectionThatDoesNotExist() {
-        collection.dropIndexes();
-    }
-
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/FilterAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/FilterAcceptanceTest.java
deleted file mode 100644
index 20666b5527d..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/FilterAcceptanceTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.querying;
-
-import com.mongodb.MongoQueryException;
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCursor;
-import org.bson.Document;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-public class FilterAcceptanceTest extends DatabaseTestCase {
-
-    @Test
-    public void shouldFindASingleDocumentById() {
-        int numberOfDocuments = 10;
-        initialiseCollectionWithDocuments(numberOfDocuments);
-
-        List<Document> filteredCollection = collection.find().filter(new Document("_id", 3)).into(new ArrayList<Document>());
-        assertEquals(1, filteredCollection.size());
-        assertThat((Integer) filteredCollection.get(0).get("_id"), is(3));
-    }
-
-    @Test
-    public void shouldSortDescending() {
-        initialiseCollectionWithDocuments(10);
-
-        MongoCursor<Document> filteredAndSortedCollection = collection.find()
-                                                                      .sort(new Document("_id", -1))
-                                                                      .iterator();
-
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(9));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(8));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(7));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(6));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(5));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(4));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(3));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(2));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(1));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(0));
-    }
-
-    @Test
-    public void shouldReturnResultsInTheOrderTheyAreOnDiskWhenNaturalSortApplied() {
-        // Given
-        collection.insertOne(new Document("name", "Chris"));
-        collection.insertOne(new Document("name", "Adam"));
-        collection.insertOne(new Document("name", "Bob"));
-
-        // When
-        MongoCursor<Document> sortedCollection = collection.find().sort(new Document("$natural", 1)).iterator();
-
-        // Then
-        assertThat(sortedCollection.next().get("name").toString(), is("Chris"));
-        assertThat(sortedCollection.next().get("name").toString(), is("Adam"));
-        assertThat(sortedCollection.next().get("name").toString(), is("Bob"));
-    }
-
-    @Test
-    public void shouldReturnResultsInTheReverseOrderTheyAreOnDiskWhenNaturalSortOfMinusOneApplied() {
-        // Given
-        collection.insertOne(new Document("name", "Chris"));
-        collection.insertOne(new Document("name", "Adam"));
-        collection.insertOne(new Document("name", "Bob"));
-
-        // When
-        MongoCursor<Document> sortedCollection = collection.find().sort(new Document("$natural", -1)).iterator();
-
-        // Then
-        assertThat(sortedCollection.next().get("name").toString(), is("Bob"));
-        assertThat(sortedCollection.next().get("name").toString(), is("Adam"));
-        assertThat(sortedCollection.next().get("name").toString(), is("Chris"));
-    }
-
-    @Test
-    public void shouldSupportSkipAndLimit() {
-        int numberOfDocuments = 10;
-        initialiseCollectionWithDocuments(numberOfDocuments);
-
-        MongoCursor<Document> filteredAndSortedCollection = collection.find()
-                                                                      .skip(3)
-                                                                      .limit(2)
-                                                                      .sort(new Document("_id", -1))
-                                                                      .iterator();
-
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(6));
-        assertThat((Integer) filteredAndSortedCollection.next().get("_id"), is(5));
-        assertThat(filteredAndSortedCollection.hasNext(), is(false));
-    }
-
-    @Test
-    public void shouldFindIDsThatAreGreaterThanTwo() {
-        int numberOfDocuments = 6;
-        initialiseCollectionWithDocuments(numberOfDocuments);
-
-        MongoCursor<Document> filterResults = collection.find()
-                                                        .filter(new Document("_id", new Document("$gt", 2)))
-                                                        .sort(new Document("_id", 1))
-                                                        .iterator();
-
-        assertThat((Integer) filterResults.next().get("_id"), is(3));
-        assertThat((Integer) filterResults.next().get("_id"), is(4));
-        assertThat((Integer) filterResults.next().get("_id"), is(5));
-    }
-
-    @Test
-    public void shouldReturnASingleDocumentFromTheCollection() {
-        int numberOfDocuments = 6;
-        initialiseCollectionWithDocuments(numberOfDocuments);
-        List<Document> documents = collection.find().limit(1).into(new ArrayList<Document>());
-
-        assertEquals(1, documents.size());
-        assertThat((Integer) documents.get(0).get("_id"), is(0));
-    }
-
-    @Test(expected = MongoQueryException.class)
-    public void shouldThrowQueryFailureException() {
-        collection.insertOne(new Document("loc", asList(0.0, 0.0)));
-        collection.find().filter(new Document("loc", new Document("$near", asList(0.0, 0.0)))).first();
-    }
-
-    @Test
-    public void shouldReturnTheExpectedFirstDocument() {
-        int numberOfDocuments = 6;
-        initialiseCollectionWithDocuments(numberOfDocuments);
-        Document document = collection.find().skip(3).first();
-
-        assertThat((Integer) document.get("_id"), is(3));
-    }
-
-    private void initialiseCollectionWithDocuments(final int numberOfDocuments) {
-        for (int i = 0; i < numberOfDocuments; i++) {
-            collection.insertOne(new Document("_id", i));
-        }
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/MapReduceAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/MapReduceAcceptanceTest.java
deleted file mode 100644
index a5857a17bfa..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/MapReduceAcceptanceTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.querying;
-
-import com.mongodb.Function;
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoIterable;
-import org.bson.Document;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsCollectionContaining.hasItem;
-import static org.junit.Assert.assertThat;
-
-public class MapReduceAcceptanceTest extends DatabaseTestCase {
-    private void insertLabelData() {
-        collection.insertMany(asList(new Document("_id", 0).append("labels", asList("a", "b")),
-                                     new Document("_id", 1).append("labels", asList("a", "b")),
-                                     new Document("_id", 2).append("labels", asList("b", "c")),
-                                     new Document("_id", 3).append("labels", asList("c", "d")),
-                                     new Document("_id", 4).append("labels", asList("a", "b")),
-                                     new Document("_id", 5).append("labels", asList("b", "c")),
-                                     new Document("_id", 6).append("labels", asList("b", "c")),
-                                     new Document("_id", 7).append("labels", asList("a", "b")),
-                                     new Document("_id", 8).append("labels", asList("b", "c")),
-                                     new Document("_id", 9).append("labels", asList("c", "d"))));
-    }
-
-    @Test
-    public void shouldReturnCountOfAllArrayValuesUsingSimpleMapReduce() {
-        //given
-        insertLabelData();
-
-        //when
-        // perform Map Reduce on all data
-        MongoIterable<Document> results = collection.mapReduce("  function(){ "
-                                                               + "  for ( var i=0; i < this.labels.length; i++ ){ "
-                                                               + "    emit( this.labels[i] , 1 ); "
-                                                               + "  }"
-                                                               + "}",
-
-                                                               "  function(key,values){ "
-                                                               + "  var sum=0; "
-                                                               + "  for( var i=0; i < values.length; i++ ) "
-                                                               + "    sum += values[i]; "
-                                                               + "  return sum;"
-                                                               + "}");
-
-        //then
-        List<Document> resultList = results.into(new ArrayList<Document>());
-        assertThat("There are four distinct labels, a b c d", resultList.size(), is(4));
-
-        assertThat("There are four 'a's in the data", resultList, hasItem(new Document("_id", "a").append("value", 4.0)));
-        assertThat("There are eight 'b's in the data", resultList, hasItem(new Document("_id", "b").append("value", 8.0)));
-        assertThat("There are six 'c's in the data", resultList, hasItem(new Document("_id", "c").append("value", 6.0)));
-        assertThat("There are two 'd's in the data", resultList, hasItem(new Document("_id", "d").append("value", 2.0)));
-    }
-
-    @Test
-    public void shouldPerformMapReduceOnALimitedSetOfData() {
-        //given
-        insertLabelData();
-
-        //when
-        MongoIterable<Document> results = collection.mapReduce("  function(){ "
-                                                               + "  for ( var i=0; i < this.labels.length; i++ ){ "
-                                                               + "    emit( this.labels[i] , 1 ); "
-                                                               + "  }"
-                                                               + "}",
-
-                                                               "  function(key,values){ "
-                                                               + "  var sum=0; "
-                                                               + "  for( var i=0; i < values.length; i++ ) "
-                                                               + "    sum += values[i]; "
-                                                               + "  return sum;"
-                                                               + "}")
-                .filter(new Document("_id", new Document("$gt", 1))) //find all IDs greater than 1
-                .sort(new Document("_id", 1))   // sort by ID
-                .limit(6); // limit to 6 of the remaining results
-        // will perform Map Reduce on _ids 2-7
-
-        //then
-        List<Document> resultList = results.into(new ArrayList<Document>());
-        assertThat("There are four distinct labels, a b c d", resultList.size(), is(4));
-
-        assertThat("There are two 'a's in the data", resultList, hasItem(new Document("_id", "a").append("value", 2.0)));
-        assertThat("There are five 'b's in the data", resultList, hasItem(new Document("_id", "b").append("value", 5.0)));
-        assertThat("There are four 'c's in the data", resultList, hasItem(new Document("_id", "c").append("value", 4.0)));
-        assertThat("There is one 'd's in the data", resultList, hasItem(new Document("_id", "d").append("value", 1.0)));
-    }
-
-    @Test
-    public void shouldMapIterableOfDocumentsIntoAnObjectOfYourChoice() {
-        //given
-        insertLabelData();
-
-        //when
-        MongoIterable<Document> results = collection.mapReduce("  function(){ "
-                                                               + "  for ( var i=0; i < this.labels.length; i++ ){ "
-                                                               + "    emit( this.labels[i] , 1 ); "
-                                                               + "  }"
-                                                               + "}",
-
-                                                               "  function(key,values){ "
-                                                               + "  var sum=0; "
-                                                               + "  for( var i=0; i < values.length; i++ ) "
-                                                               + "    sum += values[i]; "
-                                                               + "  return sum;"
-                                                               + "}")
-                .filter(new Document("_id", new Document("$gt", 1))) //find all IDs greater than 1
-                .sort(new Document("_id", 1))   // sort by ID
-                .limit(6); // limit to 6 of the remaining results
-        // will perform Map Reduce on _ids 2-7
-
-        //transforms Documents into LabelCount objects
-        List<LabelCount> labelCounts = results.map(new Function<Document, LabelCount>() {
-            @Override
-            public LabelCount apply(final Document document) {
-                return new LabelCount(document.getString("_id"), document.getDouble("value"));
-            }
-        })
-                                              .into(new ArrayList<LabelCount>());
-
-        //then
-        assertThat("Transformed results should still be the same size as original results", labelCounts.size(), is(4));
-
-        Collections.sort(labelCounts);
-        assertThat("Should be LabelCount ordered by count ascending", labelCounts, contains(new LabelCount("d", 1),
-                                                                                            new LabelCount("a", 2),
-                                                                                            new LabelCount("c", 4),
-                                                                                            new LabelCount("b", 5)));
-    }
-
-    private void insertCustomerData() {
-        // see http://docs.mongodb.org/manual/core/map-reduce/
-        collection.insertMany(asList(new Document("cust_id", "A123").append("amount", 500).append("status", "A"),
-                                     new Document("cust_id", "A123").append("amount", 250).append("status", "A"),
-                                     new Document("cust_id", "B212").append("amount", 200).append("status", "A"),
-                                     new Document("cust_id", "A123").append("amount", 300).append("status", "D")));
-    }
-
-    @Test
-    public void shouldSumFilteredAmounts() {
-        // Given
-        insertCustomerData();
-
-        // When
-        //find all orders with status "A"
-        MongoIterable<Document> results = collection.mapReduce("  function(){ "
-                                                               + "  emit( this.cust_id, this.amount ); "
-                                                               + "}",
-
-                                                               "  function(key,values){ "
-                                                               + "  return Array.sum(values);"
-                                                               + "}"
-                                                              ).filter(new Document("status", "A"));
-
-        // Then
-        List<Document> totalForOrdersWithStatusAPerCustomer = results.into(new ArrayList<Document>());
-        assertThat(totalForOrdersWithStatusAPerCustomer.size(), is(2));
-
-        assertThat(totalForOrdersWithStatusAPerCustomer, contains(new Document("_id", "A123").append("value", 750.0),
-                                                                  new Document("_id", "B212").append("value", 200.0)));
-    }
-
-    @Test
-    public void shouldInsertMapReduceResultsIntoACollectionWhenOutputTypeIsNotInline() {
-        //given
-        insertLabelData();
-
-        //when
-        // perform Map Reduce on all data
-        MongoIterable<Document> results = collection.mapReduce("  function(){ "
-                                                                   + "  for ( var i=0; i < this.labels.length; i++ ){ "
-                                                                   + "    emit( this.labels[i] , 1 ); "
-                                                                   + "  }"
-                                                                   + "}",
-
-                                                                   "  function(key,values){ "
-                                                                   + "  var sum=0; "
-                                                                   + "  for( var i=0; i < values.length; i++ ) "
-                                                                   + "    sum += values[i]; "
-                                                                   + "  return sum;"
-                                                                   + "}").collectionName(getCollectionName() + "-output");
-
-        //then
-        List<Document> resultList = results.into(new ArrayList<Document>());
-        assertThat("There are four distinct labels, a b c d", resultList.size(), is(4));
-
-        assertThat("There are four 'a's in the data", resultList, hasItem(new Document("_id", "a").append("value", 4.0)));
-        assertThat("There are eight 'b's in the data", resultList, hasItem(new Document("_id", "b").append("value", 8.0)));
-        assertThat("There are six 'c's in the data", resultList, hasItem(new Document("_id", "c").append("value", 6.0)));
-        assertThat("There are two 'd's in the data", resultList, hasItem(new Document("_id", "d").append("value", 2.0)));
-    }
-
-    static class LabelCount implements Comparable<LabelCount> {
-        private final String tag;
-        private final double count;
-
-        LabelCount(final String tag, final double count) {
-            this.tag = tag;
-            this.count = count;
-        }
-
-        @SuppressWarnings("RedundantIfStatement")
-        @Override
-        public boolean equals(final Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-
-            LabelCount labelCount = (LabelCount) o;
-
-            if (Double.compare(labelCount.count, count) != 0) {
-                return false;
-            }
-            if (!tag.equals(labelCount.tag)) {
-                return false;
-            }
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result;
-            long temp;
-            result = tag.hashCode();
-            temp = Double.doubleToLongBits(count);
-            result = 31 * result + (int) (temp ^ (temp >>> 32));
-            return result;
-        }
-
-        // So Collections.sort works.  Sorts by count.
-        @Override
-        public int compareTo(final LabelCount labelCount) {
-            int cmp = Double.compare(count, labelCount.count);
-            if (cmp != 0) {
-                return cmp;
-            }
-            return tag.compareTo(labelCount.tag);
-        }
-
-        @Override
-        public String toString() {
-            return "TagCount{"
-                   + "tag='" + tag + '\''
-                   + ", count=" + count
-                   + '}';
-        }
-    }
-}
diff --git a/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/QueryAcceptanceTest.java b/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/QueryAcceptanceTest.java
deleted file mode 100644
index 076f61d8288..00000000000
--- a/driver/src/test/acceptance/com/mongodb/acceptancetest/querying/QueryAcceptanceTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.acceptancetest.querying;
-
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-import org.bson.BsonObjectId;
-import org.bson.BsonReader;
-import org.bson.BsonWriter;
-import org.bson.Document;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.Codec;
-import org.bson.codecs.CollectibleCodec;
-import org.bson.codecs.DecoderContext;
-import org.bson.codecs.DocumentCodecProvider;
-import org.bson.codecs.EncoderContext;
-import org.bson.codecs.ValueCodecProvider;
-import org.bson.codecs.configuration.CodecProvider;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.types.ObjectId;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.mongodb.client.model.Filters.or;
-import static com.mongodb.client.model.Filters.type;
-import static com.mongodb.client.model.Sorts.descending;
-import static java.util.Arrays.asList;
-import static org.bson.BsonType.INT32;
-import static org.bson.BsonType.INT64;
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-public class QueryAcceptanceTest extends DatabaseTestCase {
-    @Test
-    public void shouldBeAbleToQueryWithDocumentSpecification() {
-        collection.insertOne(new Document("name", "Bob"));
-
-        Document query = new Document("name", "Bob");
-        MongoCursor<Document> results = collection.find().filter(query).iterator();
-
-        assertThat(results.next().get("name").toString(), is("Bob"));
-    }
-
-    @Test
-    public void shouldBeAbleToQueryWithDocument() {
-        collection.insertOne(new Document("name", "Bob"));
-
-        Document query = new Document("name", "Bob");
-        MongoCursor<Document> results = collection.find(query).iterator();
-
-        assertThat(results.next().get("name").toString(), is("Bob"));
-    }
-
-    @Test
-    public void shouldBeAbleToQueryTypedCollectionWithDocument() {
-        CodecRegistry codecRegistry = fromProviders(asList(new ValueCodecProvider(), new DocumentCodecProvider(),
-                new BsonValueCodecProvider(), new PersonCodecProvider()));
-        MongoCollection<Person> collection = database
-                .getCollection(getCollectionName(), Person.class)
-                .withCodecRegistry(codecRegistry);
-        collection.insertOne(new Person("Bob"));
-
-        MongoCursor<Person> results = collection.find(new Document("name", "Bob")).iterator();
-
-        assertThat(results.next().name, is("Bob"));
-    }
-
-    @Test
-    public void shouldBeAbleToFilterByType() {
-        collection.insertOne(new Document("product", "Book").append("numTimesOrdered", "some"));
-        collection.insertOne(new Document("product", "CD").append("numTimesOrdered", "6"));
-        collection.insertOne(new Document("product", "DVD").append("numTimesOrdered", 9));
-        collection.insertOne(new Document("product", "SomethingElse").append("numTimesOrdered", 10));
-
-        List<Document> results = new ArrayList<Document>();
-        collection.find(new Document("numTimesOrdered", new Document("$type", 16)))
-                  .sort(new Document("numTimesOrdered", -1)).into(results);
-
-        assertThat(results.size(), is(2));
-        assertThat(results.get(0).get("product").toString(), is("SomethingElse"));
-        assertThat(results.get(1).get("product").toString(), is("DVD"));
-    }
-
-    @Test
-    public void shouldUseFriendlyQueryType() {
-        collection.insertOne(new Document("product", "Book").append("numTimesOrdered", "some"));
-        collection.insertOne(new Document("product", "CD").append("numTimesOrdered", "6"));
-        collection.insertOne(new Document("product", "DVD").append("numTimesOrdered", 9));
-        collection.insertOne(new Document("product", "SomethingElse").append("numTimesOrdered", 10));
-        collection.insertOne(new Document("product", "VeryPopular").append("numTimesOrdered", 7843273657286478L));
-
-        List<Document> results = new ArrayList<Document>();
-        //TODO make BSON type serializable
-        Document filter = new Document("$or", asList(new Document("numTimesOrdered", new Document("$type", INT32.getValue())),
-                                                     new Document("numTimesOrdered", new Document("$type", INT64.getValue()))));
-        collection.find(filter).sort(new Document("numTimesOrdered", -1)).into(results);
-
-        assertThat(results.size(), is(3));
-        assertThat(results.get(0).get("product").toString(), is("VeryPopular"));
-        assertThat(results.get(1).get("product").toString(), is("SomethingElse"));
-        assertThat(results.get(2).get("product").toString(), is("DVD"));
-    }
-
-    @Test
-    public void shouldBeAbleToSortAscending() {
-        collection.insertOne(new Document("product", "Book"));
-        collection.insertOne(new Document("product", "DVD"));
-        collection.insertOne(new Document("product", "CD"));
-
-        List<Document> results = new ArrayList<Document>();
-        collection.find().sort(new Document("product", 1)).into(results);
-
-        assertThat(results.size(), is(3));
-        assertThat(results.get(0).get("product").toString(), is("Book"));
-        assertThat(results.get(1).get("product").toString(), is("CD"));
-        assertThat(results.get(2).get("product").toString(), is("DVD"));
-    }
-
-    @Test
-    public void shouldBeAbleToUseQueryBuilderForFilter() {
-        collection.insertOne(new Document("product", "Book").append("numTimesOrdered", "some"));
-        collection.insertOne(new Document("product", "CD").append("numTimesOrdered", "6"));
-        collection.insertOne(new Document("product", "DVD").append("numTimesOrdered", 9));
-        collection.insertOne(new Document("product", "SomethingElse").append("numTimesOrdered", 10));
-        collection.insertOne(new Document("product", "VeryPopular").append("numTimesOrdered", 7843273657286478L));
-
-        List<Document> results = new ArrayList<Document>();
-
-        collection.find(or(type("numTimesOrdered", INT32), type("numTimesOrdered", INT64)))
-                  .sort(descending("numTimesOrdered")).into(results);
-
-        assertThat(results.size(), is(3));
-        assertThat(results.get(0).get("product").toString(), is("VeryPopular"));
-        assertThat(results.get(1).get("product").toString(), is("SomethingElse"));
-        assertThat(results.get(2).get("product").toString(), is("DVD"));
-    }
-
-
-    @Test
-    @Ignore("JSON stuff not implemented")
-    public void shouldBeAbleToQueryWithJSON() {
-    }
-
-    private class PersonCodecProvider implements CodecProvider {
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
-            if (clazz.equals(Person.class)) {
-                return (Codec<T>) new PersonCodec();
-            }
-
-            return null;
-        }
-    }
-
-    private class PersonCodec implements CollectibleCodec<Person> {
-        @Override
-        public boolean documentHasId(final Person document) {
-            return true;
-        }
-
-        @Override
-        public BsonObjectId getDocumentId(final Person document) {
-            return new BsonObjectId(document.id);
-        }
-
-        @Override
-        public Person generateIdIfAbsentFromDocument(final Person person) {
-            return person;
-        }
-
-        @Override
-        public void encode(final BsonWriter writer, final Person value, final EncoderContext encoderContext) {
-            writer.writeStartDocument();
-            writer.writeObjectId("_id", value.id);
-            writer.writeString("name", value.name);
-            writer.writeEndDocument();
-        }
-
-        @Override
-        public Person decode(final BsonReader reader, final DecoderContext decoderContext) {
-            reader.readStartDocument();
-            ObjectId id = reader.readObjectId("_id");
-            String name = reader.readString("name");
-            reader.readEndDocument();
-            return new Person(id, name);
-        }
-
-        @Override
-        public Class<Person> getEncoderClass() {
-            return Person.class;
-        }
-    }
-
-    private class Person {
-        private ObjectId id = new ObjectId();
-        private final String name;
-
-        public Person(final String name) {
-            this.name = name;
-        }
-
-        public Person(final ObjectId id, final String name) {
-            this.id = id;
-            this.name = name;
-        }
-    }
-
-}
diff --git a/driver/src/test/functional/com/mongodb/DBCollectionFunctionalSpecification.groovy b/driver/src/test/functional/com/mongodb/DBCollectionFunctionalSpecification.groovy
deleted file mode 100644
index 8dfc3be376a..00000000000
--- a/driver/src/test/functional/com/mongodb/DBCollectionFunctionalSpecification.groovy
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import spock.lang.IgnoreIf
-import spock.lang.Unroll
-
-import static com.mongodb.ClusterFixture.serverVersionAtLeast
-import static java.util.Arrays.asList
-import static org.hamcrest.Matchers.contains
-import static spock.util.matcher.HamcrestSupport.that
-
-@SuppressWarnings('DuplicateMapLiteral')
-class DBCollectionFunctionalSpecification extends FunctionalSpecification {
-    private idOfExistingDocument
-
-    def setupSpec() {
-        Map.metaClass.bitwiseNegate = { new BasicDBObject(delegate) }
-    }
-
-    def setup() {
-        def existingDocument = ~['a': ~[:],
-                                 'b': ~[:]]
-        collection.insert(existingDocument);
-        idOfExistingDocument = existingDocument.get('_id')
-        collection.setObjectClass(BasicDBObject)
-    }
-
-    def 'should update a document'() {
-        when:
-        collection.update(new BasicDBObject('_id', 1), new BasicDBObject('$set', new BasicDBObject('x', 1)), true, false)
-
-        then:
-        collection.findOne(new BasicDBObject('_id', 1)) == new BasicDBObject('_id', 1).append('x', 1)
-
-        when:
-        collection.update(new BasicDBObject('_id', 2), new BasicDBObject('$set', new BasicDBObject('x', 1)));
-
-        then:
-        collection.findOne(new BasicDBObject('_id', 2)) == null
-    }
-
-    def 'should update multiple documents'() {
-        given:
-        collection.insert([new BasicDBObject('x', 1), new BasicDBObject('x', 1)])
-
-        when:
-        collection.update(new BasicDBObject('x', 1), new BasicDBObject('$set', new BasicDBObject('x', 2)), false, true);
-
-        then:
-        collection.count(new BasicDBObject('x', 2)) == 2
-    }
-
-    def 'should replace a document'() {
-        when:
-        collection.update(new BasicDBObject('_id', 1), new BasicDBObject('_id', 1).append('x', 1), true, false)
-
-        then:
-        collection.findOne(new BasicDBObject('_id', 1)) == new BasicDBObject('_id', 1).append('x', 1)
-
-        when:
-        collection.update(new BasicDBObject('_id', 2), new BasicDBObject('_id', 2).append('x', 1))
-
-        then:
-        collection.findOne(new BasicDBObject('_id', 2)) == null
-    }
-
-    def 'should drop collection that exists'() {
-        given:
-        collection.insert(~['name': 'myName']);
-
-        when:
-        collection.drop();
-
-        then:
-        !(this.collectionName in database.getCollectionNames())
-    }
-
-    def 'should not error when dropping a collection that does not exist'() {
-        given:
-        !(this.collectionName in database.getCollectionNames())
-
-        when:
-        collection.drop();
-
-        then:
-        notThrown(MongoException)
-    }
-
-    def 'should use top-level class for findAndModify'() {
-        given:
-        collection.setObjectClass(ClassA)
-
-        when:
-        DBObject document = collection.findAndModify(null, ~['_id': idOfExistingDocument, 'c': 1])
-
-        then:
-        document instanceof ClassA
-
-    }
-
-    def 'should use internal classes for findAndModify'() {
-        given:
-        collection.setInternalClass('a', ClassA);
-        collection.setInternalClass('b', ClassB);
-
-        when:
-        DBObject document = collection.findAndModify(null, ~['_id': idOfExistingDocument, 'c': 1])
-
-        then:
-        document.get('a') instanceof ClassA
-        document.get('b') instanceof ClassB
-    }
-
-    def 'should support index options'() {
-        given:
-        def options = ~[
-                'sparse'            : true,
-                'background'        : true,
-                'expireAfterSeconds': 42
-        ]
-
-        when:
-        collection.createIndex(~['y': 1], options);
-
-        then:
-        collection.getIndexInfo().size() == 2
-
-        DBObject document = collection.getIndexInfo()[1]
-        document.get('expireAfterSeconds') == 42
-        document.get('background') == true
-    }
-
-    @IgnoreIf({ serverVersionAtLeast(asList(3, 0, 0)) })
-    def 'should support legacy dropDups when creating a unique index'() {
-        when:
-        collection.drop()
-        collection.insert(~['y': 1])
-        collection.insert(~['y': 1])
-
-        then:
-        collection.count() == 2
-
-        when:
-        collection.createIndex(~['y': 1], ~['unique': true]);
-
-        then:
-        thrown(DuplicateKeyException)
-
-        when:
-        collection.createIndex(~['y': 1], ~['unique': true, 'dropDups': true]);
-
-        then:
-        notThrown(DuplicateKeyException)
-        collection.count() == 1
-    }
-
-    def 'drop index should not fail if collection does not exist'() {
-        given:
-        collection.drop();
-
-        expect:
-        collection.dropIndex('indexOnCollectionThatDoesNotExist');
-    }
-
-    def 'drop index should error if index does not exist'() {
-        given:
-        collection.createIndex(new BasicDBObject('x', 1));
-
-        when:
-        collection.dropIndex('y_1');
-
-        then:
-        def exception = thrown(MongoCommandException)
-        exception.getErrorMessage().contains('index not found')
-    }
-
-    def 'should throw Exception if dropping an index with an incorrect type'() {
-        given:
-        BasicDBObject index = new BasicDBObject('x', 1);
-        collection.createIndex(index);
-
-        when:
-        collection.dropIndex(new BasicDBObject('x', '2d'));
-
-        then:
-        def exception = thrown(MongoCommandException)
-        exception.getErrorMessage().contains('index not found')
-    }
-
-    def 'should drop nested index'() {
-        given:
-        collection.save(new BasicDBObject('x', new BasicDBObject('y', 1)));
-        BasicDBObject index = new BasicDBObject('x.y', 1);
-        collection.createIndex(index);
-        assert collection.indexInfo.size() == 2
-
-        when:
-        collection.dropIndex(index);
-
-        then:
-        collection.indexInfo.size() == 1
-    }
-
-    def 'should drop all indexes except the default index on _id'() {
-        given:
-        collection.createIndex(new BasicDBObject('x', 1));
-        collection.createIndex(new BasicDBObject('x.y', 1));
-        assert collection.indexInfo.size() == 3
-
-        when:
-        collection.dropIndexes();
-
-        then:
-        collection.indexInfo.size() == 1
-    }
-
-    def 'should drop unique index'() {
-        given:
-        BasicDBObject index = new BasicDBObject('x', 1);
-        collection.createIndex(index, new BasicDBObject('unique', true));
-
-        when:
-        collection.dropIndex(index);
-
-        then:
-        collection.indexInfo.size() == 1
-    }
-
-    def 'should use compound index for min query'() {
-        given:
-        collection.createIndex(new BasicDBObject('a', 1).append('_id', 1));
-
-        when:
-        def cursor = collection.find().min(new BasicDBObject('a', 1).append('_id', idOfExistingDocument))
-
-        then:
-        cursor.size() == 1
-    }
-
-    def 'should be able to rename a collection'() {
-        given:
-        assert database.getCollectionNames().contains(collectionName)
-        String newCollectionName = 'someNewName'
-
-        when:
-        collection.rename(newCollectionName);
-
-        then:
-        !database.getCollectionNames().contains(collectionName)
-
-        database.getCollection(newCollectionName) != null
-        database.getCollectionNames().contains(newCollectionName)
-    }
-
-    def 'should be able to rename collection to an existing collection name and replace it when drop is true'() {
-        given:
-        String existingCollectionName = 'anExistingCollection';
-        String originalCollectionName = 'someOriginalCollection';
-
-        DBCollection originalCollection = database.getCollection(originalCollectionName);
-        String keyInOriginalCollection = 'someKey';
-        String valueInOriginalCollection = 'someValue';
-        originalCollection.insert(new BasicDBObject(keyInOriginalCollection, valueInOriginalCollection));
-
-        DBCollection existingCollection = database.getCollection(existingCollectionName);
-        String keyInExistingCollection = 'aDifferentDocument';
-        existingCollection.insert(new BasicDBObject(keyInExistingCollection, 'withADifferentValue'));
-
-        assert database.getCollectionNames().contains(originalCollectionName)
-        assert database.getCollectionNames().contains(existingCollectionName)
-
-        when:
-        originalCollection.rename(existingCollectionName, true);
-
-        then:
-        !database.getCollectionNames().contains(originalCollectionName)
-        database.getCollectionNames().contains(existingCollectionName)
-
-        DBCollection replacedCollection = database.getCollection(existingCollectionName);
-        replacedCollection.findOne().get(keyInExistingCollection) == null
-        replacedCollection.findOne().get(keyInOriginalCollection).toString() == valueInOriginalCollection
-    }
-
-    def 'should return a list of all the values of a given field without duplicates'() {
-        given:
-        collection.drop()
-        (0..99).each { collection.save(~['_id': it, 'x' : it % 10]) }
-        assert collection.count() == 100;
-
-        when:
-        List distinctValuesOfFieldX = collection.distinct('x')
-
-        then:
-        distinctValuesOfFieldX.size() == 10
-        that distinctValuesOfFieldX, contains(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
-    }
-
-    def 'should query database for values and return a list of all the distinct values of a given field that match the filter'() {
-        given:
-        collection.drop()
-        (0..99).each { collection.save(~['_id': it, 'x' : it % 10, 'isOddNumber': it % 2]) }
-        assert collection.count() == 100;
-
-        when:
-        List distinctValuesOfFieldX = collection.distinct('x', ~['isOddNumber': 1]);
-
-        then:
-        distinctValuesOfFieldX.size() == 5
-        that distinctValuesOfFieldX, contains(1, 3, 5, 7, 9)
-    }
-
-    def 'should return distinct values of differing types '() {
-        given:
-        collection.drop()
-        def documents = [~['id' :'a'], ~['id' : 1],
-                         ~['id' : ~['b': 'c']],  ~['id' : ~['list': [2, 'd', ~['e': 3]]]]]
-
-        collection.insert(documents)
-        assert collection.count() == 4;
-
-        when:
-        List distinctValues = collection.distinct('id')
-
-        then:
-        distinctValues.size() == 4
-        that distinctValues, contains('a', 1, ~['b': 'c'], ~['list': [2, 'd', ~['e': 3]]])
-    }
-
-    @SuppressWarnings('UnnecessaryObjectReferences')
-    def insertDataForGroupTests() {
-        collection.drop();
-        collection.save(~['x': 'a']);
-        collection.save(~['x': 'a']);
-        collection.save(~['x': 'a']);
-        collection.save(~['x': 'b']);
-        collection.save(~['x': 'b']);
-        collection.save(~['x': 'b']);
-        collection.save(~['x': 'b']);
-        collection.save(~['x': 'c']);
-    }
-
-    def 'should group by the x field and apply the provided count function'() {
-        given:
-        insertDataForGroupTests()
-
-        when:
-        DBObject result = collection.group(~['x': 1],
-                                           null,
-                                           ~['count': 0],
-                                           'function(o , p){ p.count++; }');
-
-        then:
-        result.size() == 3
-        that result, contains(~['x': 'a', 'count': 3.0D], ~['x': 'b', 'count': 4.0D], ~['x': 'c', 'count': 1.0D]);
-    }
-
-    def 'should group by the x field and apply the provided count function using a GroupCommand'() {
-        given:
-        insertDataForGroupTests()
-        GroupCommand command = new GroupCommand(collection,
-                                                ~['x': 1],
-                                                null,
-                                                ~['count': 0],
-                                                'function(o , p){ p.count++; }',
-                                                null);
-
-        when:
-        DBObject result = collection.group(command);
-
-        then:
-        result.size() == 3
-        that result, contains(~['x': 'a', 'count': 3.0D], ~['x': 'b', 'count': 4.0D], ~['x': 'c', 'count': 1.0D]);
-    }
-
-    def 'should group using a key function in a GroupCommand'() {
-        given:
-        insertDataForGroupTests()
-        GroupCommand command = new GroupCommand(collection,
-                'function(doc){ return {x: doc.x} }',
-                null,
-                ~['count': 0],
-                'function(o , p){ p.count++; }',
-                null);
-
-        when:
-        DBObject result = collection.group(command);
-
-        then:
-        result.size() == 3
-        that result, contains(~['x': 'a', 'count': 3.0D], ~['x': 'b', 'count': 4.0D], ~['x': 'c', 'count': 1.0D]);
-    }
-
-    def 'should group and count only those documents that fulfull the given condition'() {
-        given:
-        insertDataForGroupTests()
-
-        when:
-        def result = collection.group(~['x': 1],
-                                      ~['x': 'b'],
-                                      ~['count': 0],
-                                      'function(o , p){ p.count++; }')
-
-        then:
-        result.size() == 1;
-        that result, contains(~['x': 'b', 'count': 4.0D]);
-    }
-
-    def 'should be able to set a value in the results'() {
-        given:
-        insertDataForGroupTests()
-
-        when:
-        def result = collection.group(~['x': 1],
-                                      ~['x': 'c'],
-                                      ~['valueFound': false],
-                                      'function(o, p){ p.valueFound = true; }');
-
-        then:
-        result.size() == 1;
-        that result, contains(~['x': 'c', 'valueFound': true]);
-    }
-
-    def 'should return results set by the function, based on condition supplied without key'() {
-        given:
-        insertDataForGroupTests()
-
-        when:
-        def result = collection.group(null,
-                                      ~['x': 'b'],
-                                      ~['valueFound': 0],
-                                      'function(o, p){ p.valueFound = true; }');
-
-        then:
-        result.size() == 1
-        that result, contains(~['valueFound': true]);
-    }
-
-    def 'finalize function should replace the whole result document if a document is the return type of finalize function'() {
-        given:
-        insertDataForGroupTests()
-
-        when:
-        def result = collection.group(~['x': 1],
-                                      ~['x': 'b'],
-                                      ~['valueFound': 0],
-                                      'function(o, p){ p.valueFound = true; }',
-                                      'function(o){ return { a:1 } }');
-
-        then:
-        result.size() == 1;
-        that result, contains(~['a': 1.0D]);
-    }
-
-    def 'finalize function should modify the result document'() {
-        given:
-        insertDataForGroupTests()
-
-        when:
-        def result = collection.group(~['x': 1],
-                                      ~['x': 'b'],
-                                      ~['valueFound': 0],
-                                      'function(o, p){ p.valueFound = true; }',
-                                      'function(o){ o.a = 1 }');
-
-        then:
-        result.size() == 1;
-        that result, contains(~['x': 'b', 'valueFound': true, 'a': 1.0D]);
-    }
-
-    def 'should throw an Exception if no initial document provided'() {
-        when:
-        collection.group(~['x': 1],
-                         ~['x': 'b'],
-                         null,
-                         'function(o, p){ p.valueFound = true; }');
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-    def 'should throw an Exception if no reduce function provided'() {
-        when:
-        collection.group(~['x': 1],
-                         ~['x': 'b'],
-                         ~['z': 0],
-                         null);
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-    def 'should return null when findOne finds nothing'() {
-        expect:
-        collection.findOne([field: 'That Does Not Exist']) == null
-    }
-
-    def 'should return null when findOne finds nothing and a projection field is specified'() {
-        given:
-        collection.drop()
-
-        expect:
-        collection.findOne(null, [_id: true] as BasicDBObject) == null
-    }
-
-    @Unroll
-    def 'should return #result when performing findOne with #criteria'() {
-        given:
-        collection.insert([_id: 100, x: 1, y: 2] as BasicDBObject)
-        collection.insert([_id: 123, x: 2, z: 2] as BasicDBObject)
-
-        expect:
-        result == collection.findOne(criteria)
-
-        where:
-        criteria                | result
-        123                     | [_id: 123, x: 2, z: 2]
-        [x: 1] as BasicDBObject | [_id: 100, x: 1, y: 2]
-    }
-
-    @Unroll
-    def 'should return #result when performing findOne with #criteria and projection #projection'() {
-        given:
-        collection.insert([_id: 100, x: 1, y: 2] as BasicDBObject)
-        collection.insert([_id: 123, x: 2, z: 2] as BasicDBObject)
-
-        expect:
-        result == collection.findOne(criteria, projection)
-
-        where:
-        criteria                | projection              | result
-        123                     | [x: 1] as BasicDBObject | [_id: 123, x: 2]
-        [x: 1] as BasicDBObject | [y: 1] as BasicDBObject | [_id: 100, y: 2]
-    }
-
-    @Unroll
-    def 'should sort with #sortBy and filter with #criteria before selecting first result'() {
-        given:
-        collection.drop()
-        collection.insert([_id: 1, x: 100, y: 'abc'] as BasicDBObject)
-        collection.insert([_id: 2, x: 200, y: 'abc'] as BasicDBObject)
-        collection.insert([_id: 3, x: 1, y: 'abc'] as BasicDBObject)
-        collection.insert([_id: 4, x: -100, y: 'xyz'] as BasicDBObject)
-        collection.insert([_id: 5, x: -50, y: 'zzz'] as BasicDBObject)
-        collection.insert([_id: 6, x: 9, y: 'aaa'] as BasicDBObject)
-
-        expect:
-        collection.findOne(criteria, null, sortBy)['_id'] == expectedId;
-
-        where:
-        criteria                                  | sortBy                        | expectedId
-        new BasicDBObject()                       | [x: 1] as BasicDBObject       | 4
-        new BasicDBObject()                       | [x: -1] as BasicDBObject      | 2
-        [x: 1] as BasicDBObject                   | [x: 1, y: 1] as BasicDBObject | 3
-        QueryBuilder.start('x').lessThan(2).get() | [y: -1] as BasicDBObject      | 5
-
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/DBCollectionSpecification.groovy b/driver/src/test/functional/com/mongodb/DBCollectionSpecification.groovy
deleted file mode 100644
index b152bf43985..00000000000
--- a/driver/src/test/functional/com/mongodb/DBCollectionSpecification.groovy
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.bulk.IndexRequest
-import com.mongodb.operation.AggregateOperation
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.CommandReadOperation
-import com.mongodb.operation.CountOperation
-import com.mongodb.operation.CreateIndexesOperation
-import com.mongodb.operation.DistinctOperation
-import com.mongodb.operation.FindOperation
-import com.mongodb.operation.MapReduceBatchCursor
-import com.mongodb.operation.MapReduceWithInlineResultsOperation
-import com.mongodb.operation.ParallelCollectionScanOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonJavaScript
-import org.bson.BsonString
-import org.bson.codecs.BsonDocumentCodec
-import org.bson.codecs.BsonValueCodec
-import spock.lang.Specification
-
-import java.util.concurrent.TimeUnit
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.Fixture.getMongoClient
-import static spock.util.matcher.HamcrestSupport.expect
-
-class DBCollectionSpecification extends Specification {
-
-    def 'should get and set read concern'() {
-        when:
-        def db = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([]))
-        db.setReadConcern(ReadConcern.MAJORITY)
-        def collection = db.getCollection('test')
-
-        then:
-        collection.readConcern == ReadConcern.MAJORITY
-
-        when:
-        collection.setReadConcern(ReadConcern.LOCAL)
-
-        then:
-        collection.readConcern == ReadConcern.LOCAL
-
-        when:
-        collection.setReadConcern(null)
-
-        then:
-        collection.readConcern == ReadConcern.MAJORITY
-    }
-
-    def 'should use CreateIndexOperation properly'() {
-
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def keys = new BasicDBObject('a', 1);
-
-        when:
-        collection.createIndex(keys)
-        def request = (executor.getWriteOperation() as CreateIndexesOperation).requests[0]
-
-        then:
-        expect request, isTheSameAs(new IndexRequest(new BsonDocument('a', new BsonInt32(1))))
-
-        when:
-        def storageEngine = '{ wiredTiger: { configString: "block_compressor=zlib" }}'
-        def partialFilterExpression = '{ a: { $gte: 10 } }'
-        collection.createIndex(keys, new BasicDBObject(['background': true, 'unique': true, 'sparse': true, 'name': 'aIndex',
-                                                      'expireAfterSeconds': 100, 'v': 1, 'weights': new BasicDBObject(['a': 1000]),
-                                                      'default_language': 'es', 'language_override': 'language', 'textIndexVersion': 1,
-                                                      '2dsphereIndexVersion': 1, 'bits': 1, 'min': new Double(-180.0),
-                                                      'max'          : new Double(180.0), 'bucketSize': new Double(200.0), 'dropDups': true,
-                                                      'storageEngine': BasicDBObject.parse(storageEngine),
-                                                      'partialFilterExpression':  BasicDBObject.parse(partialFilterExpression)]))
-
-        request = (executor.getWriteOperation() as CreateIndexesOperation).requests[0]
-
-        then:
-        expect request, isTheSameAs(new IndexRequest(new BsonDocument('a', new BsonInt32(1)))
-                                            .background(true)
-                                            .unique(true)
-                                            .sparse(true)
-                                            .name('aIndex')
-                                            .expireAfter(100, TimeUnit.SECONDS)
-                                            .version(1)
-                                            .weights(new BsonDocument('a', new BsonInt32(1000)))
-                                            .defaultLanguage('es')
-                                            .languageOverride('language')
-                                            .textVersion(1)
-                                            .sphereVersion(1)
-                                            .bits(1)
-                                            .min(-180.0)
-                                            .max(180.0)
-                                            .bucketSize(200.0)
-                                            .dropDups(true)
-                                            .storageEngine(BsonDocument.parse(storageEngine))
-                                            .partialFilterExpression(BsonDocument.parse(partialFilterExpression)))
-    }
-
-    def 'should support boolean index options that are numbers'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def options = new BasicDBObject('sparse', value);
-
-        when:
-        collection.createIndex(new BasicDBObject('y', 1), options);
-
-        then:
-        def operation = executor.getWriteOperation() as CreateIndexesOperation
-        operation.requests[0].sparse == expectedValue
-
-        where:
-        value | expectedValue
-        0     | false
-        0F    | false
-        0D    | false
-        1     | true
-        -1    | true
-        4L    | true
-        4.3F  | true
-        4.0D  | true
-    }
-
-    def 'should support integer index options that are numbers'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def options = new BasicDBObject('expireAfterSeconds', integerValue);
-
-        when:
-        collection.createIndex(new BasicDBObject('y', 1), options);
-
-        then:
-        def operation = executor.getWriteOperation() as CreateIndexesOperation
-        operation.requests[0].getExpireAfter(TimeUnit.SECONDS) == integerValue
-
-        where:
-        integerValue << [4, 4L, (double) 4.0]
-    }
-
-    def 'should support double index options that are numbers'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def options = new BasicDBObject('max', doubleValue);
-
-        when:
-        collection.createIndex(new BasicDBObject('y', '2d'), options);
-
-        then:
-        def operation = executor.getWriteOperation() as CreateIndexesOperation
-        operation.requests[0].max == doubleValue
-
-        where:
-        doubleValue << [4, 4L, (double) 4.0]
-    }
-
-    def 'should throw IllegalArgumentException for unsupported option value type'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def options = new BasicDBObject('sparse', 'true');
-
-
-        when:
-        collection.createIndex(new BasicDBObject('y', '1'), options);
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-    def 'getStats should execute the expected command with the collection default read preference'() {
-        given:
-        def executor = new TestOperationExecutor([new BsonDocument('ok', new BsonInt32(1))]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        collection.setReadPreference(ReadPreference.secondary())
-
-        when:
-        collection.getStats()
-
-        then:
-        expect executor.getReadOperation(), isTheSameAs(new CommandReadOperation('myDatabase',
-                                                                                 new BsonDocument('collStats', new BsonString('test')),
-                                                                new BsonDocumentCodec()))
-        executor.getReadPreference() == collection.getReadPreference()
-    }
-
-    def 'findOne should create the correct FindOperation'() {
-        given:
-        def dbObject = new BasicDBObject('_id', 1)
-        def executor = new TestOperationExecutor([Stub(BatchCursor) {
-            next() >> {
-                [dbObject]
-            }
-            hasNext() >> {
-                true
-            }
-        }]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        collection.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def one = collection.findOne()
-
-        then:
-        one == dbObject
-        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .filter(new BsonDocument())
-                                                                .limit(-1))
-    }
-
-    def 'count should create the correct CountOperation'() {
-        given:
-        def executor = new TestOperationExecutor([42L]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        collection.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def count = collection.count
-
-        then:
-        count == 42L
-        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .filter(new BsonDocument())
-        )
-    }
-
-    def 'distinct should create the correct DistinctOperation'() {
-        given:
-        def executor = new TestOperationExecutor([Stub(BatchCursor) {
-            def count = 0
-            next() >> {
-                count++
-                [new BsonInt32(1), new BsonInt32(2)]
-            }
-            hasNext() >> {
-                count == 0
-            }
-        }]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        collection.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def distinctFieldValues = collection.distinct('field1')
-
-        then:
-        distinctFieldValues == [1, 2]
-        expect executor.getReadOperation(), isTheSameAs(new DistinctOperation(collection.getNamespace(), 'field1', new BsonValueCodec())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .filter(new BsonDocument())
-        )
-    }
-
-    def 'mapReduce should create the correct MapReduceOperation'() {
-        given:
-        def dbObject = new BasicDBObject('_id', 1)
-        def executor = new TestOperationExecutor([Stub(MapReduceBatchCursor) {
-            def count = 0
-            next() >> {
-                count++
-                [dbObject]
-            }
-            hasNext() >> {
-                count == 0
-            }
-        }])
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        collection.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def mapReduceOutput = collection.mapReduce('map', 'reduce', null, MapReduceCommand.OutputType.INLINE, new BasicDBObject())
-
-        then:
-        mapReduceOutput.results() == [dbObject]
-        expect executor.getReadOperation(), isTheSameAs(new MapReduceWithInlineResultsOperation(collection.getNamespace(),
-                                                                                                new BsonJavaScript('map'),
-                                                                                                new BsonJavaScript('reduce'),
-                                                                                                collection.getDefaultDBObjectCodec())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .verbose(true)
-                                                                .filter(new BsonDocument())
-        )
-    }
-
-    def 'aggregate should create the correct AggregateOperation'() {
-        given:
-        def dbObject = new BasicDBObject('_id', 1)
-        def executor = new TestOperationExecutor([Stub(BatchCursor) {
-            def count = 0
-            next() >> {
-                count++
-                [dbObject]
-            }
-            hasNext() >> {
-                count == 0
-            }
-        }])
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        collection.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def aggregationOutput = collection.aggregate([new BasicDBObject('$match', new BasicDBObject())])
-
-        then:
-        aggregationOutput.results() == [dbObject]
-        expect executor.getReadOperation(), isTheSameAs(new AggregateOperation(collection.getNamespace(),
-                                                                               [new BsonDocument('$match', new BsonDocument())],
-                                                                               collection.getDefaultDBObjectCodec())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .useCursor(false)
-        )
-    }
-
-    def 'parallel should create the correct ParallelCollectionScanOperation'() {
-        given:
-        def executor = new TestOperationExecutor([[Stub(BatchCursor) {
-            hasNext() >> {
-                false
-            }
-        }]])
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        collection.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def cursors = collection.parallelScan(ParallelScanOptions.builder().build())
-
-        then:
-        cursors.size() == 1
-        expect executor.getReadOperation(), isTheSameAs(new ParallelCollectionScanOperation(collection.getNamespace(), 1,
-                                                                                            collection.getObjectCodec())
-                                                                .readConcern(ReadConcern.MAJORITY)
-        )
-    }
-
-}
diff --git a/driver/src/test/functional/com/mongodb/DBFunctionalSpecification.groovy b/driver/src/test/functional/com/mongodb/DBFunctionalSpecification.groovy
deleted file mode 100644
index 1e4b9eb7897..00000000000
--- a/driver/src/test/functional/com/mongodb/DBFunctionalSpecification.groovy
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.operation.OperationExecutor
-import org.bson.BsonDocument
-import org.bson.BsonDouble
-import org.bson.BsonInt32
-import org.bson.BsonString
-
-import static com.mongodb.Fixture.getMongoClient
-
-class DBFunctionalSpecification extends FunctionalSpecification {
-
-    def 'DB addUser should work around localhost exception issues'() {
-        given:
-        def executor = Stub(OperationExecutor) {
-            execute(_, _) >> {
-                throw new MongoCommandException(new BsonDocument('ok', new BsonDouble(0))
-                                                          .append('code', new BsonInt32(13))
-                                                          .append('errmsg', new BsonString('not authorized on admin to execute ' +
-                                                                                           'command { usersInfo: "admin" }')),
-                                                  new ServerAddress())
-            }
-
-            execute(_) >> null
-        }
-        def database = new DB(getMongoClient(), 'admin', executor)
-
-        when:
-        def result = database.addUser('ross', 'pwd'.toCharArray())
-
-        then:
-        notThrown(MongoCommandException)
-        !result.updateOfExisting
-        result.getN() == 1
-    }
-
-    def 'DB addUser should throw non localhost exception issues'() {
-        given:
-        def executor = Stub(OperationExecutor) {
-            execute(_, _) >> { throw new MongoException('Some error') }
-        }
-        def database = new DB(getMongoClient(), 'admin', executor)
-
-        when:
-        database.addUser('ross', 'pwd'.toCharArray())
-
-        then:
-        thrown(MongoException)
-
-        when:
-        executor = Stub(OperationExecutor) {
-            execute(_, _) >> {
-                throw new MongoCommandException(new BsonDocument('ok', new BsonDouble(0))
-                                                          .append('code', new BsonInt32(13))
-                                                          .append('errmsg', new BsonString('not authorized on admin to execute ' +
-                                                                                           'command { usersInfo: "admin" }')),
-                                                  new ServerAddress())
-            }
-
-            execute(_) >> { throw new MongoException('Some error') }
-        }
-        database = new DB(getMongoClient(), 'admin', executor)
-        database.addUser('ross', 'pwd'.toCharArray())
-
-        then:
-        thrown(MongoException)
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/DatabaseTestCase.java b/driver/src/test/functional/com/mongodb/DatabaseTestCase.java
deleted file mode 100644
index 6de1a248419..00000000000
--- a/driver/src/test/functional/com/mongodb/DatabaseTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import org.junit.After;
-import org.junit.Before;
-
-import static com.mongodb.Fixture.getDefaultDatabaseName;
-import static com.mongodb.Fixture.getMongoClient;
-
-public class DatabaseTestCase {
-    //For ease of use and readability, in this specific case we'll allow protected variables
-    //CHECKSTYLE:OFF
-    protected DB database;
-    protected DBCollection collection;
-    protected String collectionName;
-    //CHECKSTYLE:ON
-
-    @Before
-    @SuppressWarnings("deprecation") // This is for testing the old API, so it will use deprecated methods
-    public void setUp() {
-        database = getMongoClient().getDB(getDefaultDatabaseName());
-
-        //create a brand new collection for each test
-        collectionName = getClass().getName() + System.nanoTime();
-        collection = database.getCollection(collectionName);
-    }
-
-    @After
-    public void tearDown() {
-        collection.drop();
-    }
-
-    public MongoClient getClient() {
-        return getMongoClient();
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/Fixture.java b/driver/src/test/functional/com/mongodb/Fixture.java
deleted file mode 100644
index 788dba0728b..00000000000
--- a/driver/src/test/functional/com/mongodb/Fixture.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.connection.ServerDescription;
-
-import java.util.List;
-
-/**
- * Helper class for the acceptance tests.  Considering replacing with MongoClientTestBase.
- */
-public final class Fixture {
-    public static final String DEFAULT_URI = "mongodb://localhost:27017";
-    public static final String MONGODB_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.uri";
-    private static final String DEFAULT_DATABASE_NAME = "JavaDriverTest";
-
-    private static MongoClient mongoClient;
-    private static MongoClientURI mongoClientURI;
-    private static DB defaultDatabase;
-
-    private Fixture() {
-    }
-
-    public static synchronized MongoClient getMongoClient() {
-        if (mongoClient == null) {
-            MongoClientURI mongoURI = getMongoClientURI();
-            mongoClient = new MongoClient(mongoURI);
-            Runtime.getRuntime().addShutdownHook(new ShutdownHook());
-        }
-        return mongoClient;
-    }
-
-    @SuppressWarnings("deprecation") // This is for access to the old API, so it will use deprecated methods
-    public static synchronized DB getDefaultDatabase() {
-        if (defaultDatabase == null) {
-            defaultDatabase = getMongoClient().getDB(getDefaultDatabaseName());
-        }
-        return defaultDatabase;
-    }
-
-    public static String getDefaultDatabaseName() {
-        return DEFAULT_DATABASE_NAME;
-    }
-
-    static class ShutdownHook extends Thread {
-        @Override
-        public void run() {
-            synchronized (Fixture.class) {
-                if (mongoClient != null) {
-                    if (defaultDatabase != null) {
-                        defaultDatabase.dropDatabase();
-                    }
-                    mongoClient.close();
-                    mongoClient = null;
-                }
-            }
-        }
-    }
-
-    public static synchronized String getMongoClientURIString() {
-        String mongoURIProperty = System.getProperty(MONGODB_URI_SYSTEM_PROPERTY_NAME);
-        return mongoURIProperty == null || mongoURIProperty.isEmpty()
-               ? DEFAULT_URI : mongoURIProperty;
-    }
-
-    public static synchronized MongoClientURI getMongoClientURI() {
-        if (mongoClientURI == null) {
-            mongoClientURI = getMongoClientURI(MongoClientOptions.builder());
-        }
-        return mongoClientURI;
-    }
-
-    public static synchronized MongoClientURI getMongoClientURI(final MongoClientOptions.Builder builder) {
-        MongoClientURI mongoClientURI = null;
-        String mongoURIString = getMongoClientURIString();
-        if (System.getProperty("java.version").startsWith("1.6.")) {
-            builder.sslInvalidHostNameAllowed(true);
-        }
-
-        mongoClientURI = new MongoClientURI(mongoURIString, builder);
-        return mongoClientURI;
-    }
-
-    public static MongoClientOptions getOptions() {
-        return getMongoClientURI().getOptions();
-    }
-
-    @SuppressWarnings("deprecation")
-    public static ServerAddress getPrimary() throws InterruptedException {
-        getMongoClient();
-        List<ServerDescription> serverDescriptions = mongoClient.getCluster().getDescription().getPrimaries();
-        while (serverDescriptions.isEmpty()) {
-            Thread.sleep(100);
-            serverDescriptions = mongoClient.getCluster().getDescription().getPrimaries();
-        }
-        return serverDescriptions.get(0).getAddress();
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/FunctionalSpecification.groovy b/driver/src/test/functional/com/mongodb/FunctionalSpecification.groovy
deleted file mode 100644
index 5ff30c9f8c2..00000000000
--- a/driver/src/test/functional/com/mongodb/FunctionalSpecification.groovy
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import spock.lang.Specification
-
-import static com.mongodb.Fixture.getDefaultDatabaseName
-import static com.mongodb.Fixture.getMongoClient
-
-class FunctionalSpecification extends Specification {
-    protected DB database;
-    protected DBCollection collection;
-
-    def setup() {
-        database = getMongoClient().getDB(getDefaultDatabaseName())
-        collection = database.getCollection(getClass().getName())
-        collection.drop();
-    }
-
-    def cleanup() {
-        if (collection != null) {
-            collection.drop()
-        }
-    }
-
-    String getDatabaseName() {
-        getDefaultDatabaseName()
-    }
-
-    String getCollectionName() {
-        collection.getName()
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/MongoClientListenerRegistrationSpecification.groovy b/driver/src/test/functional/com/mongodb/MongoClientListenerRegistrationSpecification.groovy
deleted file mode 100644
index f9035ffbe88..00000000000
--- a/driver/src/test/functional/com/mongodb/MongoClientListenerRegistrationSpecification.groovy
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.event.ClusterListener
-import com.mongodb.event.CommandListener
-import com.mongodb.event.ServerListener
-import com.mongodb.event.ServerMonitorListener
-import org.bson.Document
-
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-import static com.mongodb.Fixture.mongoClientURI
-
-class MongoClientListenerRegistrationSpecification extends FunctionalSpecification {
-
-    def 'should register single command listener'() {
-        given:
-        def first = Mock(CommandListener)
-        def client = new MongoClient(mongoClientURI.getHosts().collect { new ServerAddress(it) },
-                MongoClientOptions.builder(mongoClientURI.options)
-                                                       .addCommandListener(first)
-                                                       .build());
-
-        when:
-        client.getDatabase('admin').runCommand(new Document('ping', 1))
-
-        then:
-        1 * first.commandStarted(_)
-        1 * first.commandSucceeded(_)
-    }
-
-    def 'should register multiple command listeners'() {
-        given:
-        def first = Mock(CommandListener)
-        def second = Mock(CommandListener)
-        def client = new MongoClient(mongoClientURI.getHosts().collect { new ServerAddress(it) },
-                                     MongoClientOptions.builder(mongoClientURI.options)
-                                                       .addCommandListener(first)
-                                                       .addCommandListener(second).build());
-
-        when:
-        client.getDatabase('admin').runCommand(new Document('ping', 1))
-
-        then:
-        1 * first.commandStarted(_)
-        1 * second.commandStarted(_)
-        1 * first.commandSucceeded(_)
-        1 * second.commandSucceeded(_)
-    }
-
-    def 'should register single listeners for monitor events'() {
-        given:
-        def latch = new CountDownLatch(1)
-        def clusterListener = Mock(ClusterListener) {
-           1 * clusterOpening(_)
-        }
-        def serverListener = Mock(ServerListener) {
-            (1.._) * serverOpening(_)
-        }
-        def serverMonitorListener = Mock(ServerMonitorListener){
-            (1.._) * serverHearbeatStarted(_) >> {
-                if (latch.count > 0) {
-                    latch.countDown()
-                }
-            }
-        }
-
-        def client = new MongoClient(mongoClientURI.getHosts().collect { new ServerAddress(it) },
-                MongoClientOptions.builder(mongoClientURI.options)
-                        .addClusterListener(clusterListener)
-                        .addServerListener(serverListener)
-                        .addServerMonitorListener(serverMonitorListener)
-                        .build());
-
-        when:
-        def finished = latch.await(5, TimeUnit.SECONDS)
-
-        then:
-        finished
-
-        cleanup:
-        client?.close()
-    }
-
-    def 'should register multiple listeners for monitor events'() {
-        given:
-        def latch = new CountDownLatch(2)
-        def clusterListener = Mock(ClusterListener) {
-            1 * clusterOpening(_)
-        }
-        def serverListener = Mock(ServerListener) {
-            (1.._) * serverOpening(_)
-        }
-        def serverMonitorListener = Mock(ServerMonitorListener){
-            (1.._) * serverHearbeatStarted(_) >> {
-                if (latch.count > 0) {
-                    latch.countDown()
-                }
-            }
-        }
-        def clusterListenerTwo = Mock(ClusterListener) {
-            1 * clusterOpening(_)
-        }
-        def serverListenerTwo = Mock(ServerListener) {
-            (1.._) * serverOpening(_)
-        }
-        def serverMonitorListenerTwo = Mock(ServerMonitorListener){
-            (1.._) * serverHearbeatStarted(_) >> {
-                if (latch.count > 0) {
-                    latch.countDown()
-                }
-            }
-        }
-
-        def client = new MongoClient(mongoClientURI.getHosts().collect { new ServerAddress(it) },
-                MongoClientOptions.builder(mongoClientURI.options)
-                        .addClusterListener(clusterListener)
-                        .addServerListener(serverListener)
-                        .addServerMonitorListener(serverMonitorListener)
-                        .addClusterListener(clusterListenerTwo)
-                        .addServerListener(serverListenerTwo)
-                        .addServerMonitorListener(serverMonitorListenerTwo)
-                        .build());
-
-        when:
-        def finished = latch.await(5, TimeUnit.SECONDS)
-
-        then:
-        finished
-
-        cleanup:
-        client?.close()
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/client/CommandMonitoringTest.java b/driver/src/test/functional/com/mongodb/client/CommandMonitoringTest.java
deleted file mode 100644
index 9993e4c46b8..00000000000
--- a/driver/src/test/functional/com/mongodb/client/CommandMonitoringTest.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright 2015-2016 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import com.mongodb.ClusterFixture;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoException;
-import com.mongodb.MongoNamespace;
-import com.mongodb.ReadPreference;
-import com.mongodb.client.test.CollectionHelper;
-import com.mongodb.connection.ServerVersion;
-import com.mongodb.connection.TestCommandListener;
-import com.mongodb.event.CommandEvent;
-import com.mongodb.event.CommandFailedEvent;
-import com.mongodb.event.CommandStartedEvent;
-import com.mongodb.event.CommandSucceededEvent;
-import org.bson.BsonArray;
-import org.bson.BsonBoolean;
-import org.bson.BsonDocument;
-import org.bson.BsonDocumentWriter;
-import org.bson.BsonDouble;
-import org.bson.BsonInt32;
-import org.bson.BsonInt64;
-import org.bson.BsonString;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.codecs.BsonDocumentCodec;
-import org.bson.codecs.BsonValueCodecProvider;
-import org.bson.codecs.Codec;
-import org.bson.codecs.DocumentCodec;
-import org.bson.codecs.EncoderContext;
-import org.bson.codecs.configuration.CodecProvider;
-import org.bson.codecs.configuration.CodecRegistries;
-import org.bson.codecs.configuration.CodecRegistry;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import util.JsonPoweredTestHelper;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
-import static com.mongodb.ClusterFixture.isSharded;
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static com.mongodb.Fixture.getMongoClientURI;
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
-
-// See https://github.com/mongodb/specifications/tree/master/source/command-monitoring/tests
-@RunWith(Parameterized.class)
-public class CommandMonitoringTest {
-    private static final CodecRegistry CODEC_REGISTRY_HACK = CodecRegistries.fromProviders(new BsonValueCodecProvider(),
-            new CodecProvider() {
-                @Override
-                @SuppressWarnings("unchecked")
-                public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
-                    // Use BsonDocumentCodec even for a private sub-class of BsonDocument
-                    if (BsonDocument.class.isAssignableFrom(clazz)) {
-                        return (Codec<T>) new BsonDocumentCodec(registry);
-                    }
-                    return null;
-                }
-            });
-
-    private static MongoClient mongoClient;
-    private static TestCommandListener commandListener;
-    private final String filename;
-    private final String description;
-    private final String databaseName;
-    private final String collectionName;
-    private final BsonArray data;
-    private final BsonDocument definition;
-    private MongoCollection<BsonDocument> collection;
-    private JsonPoweredCrudTestHelper helper;
-
-    public CommandMonitoringTest(final String filename, final String description, final String databaseName, final String collectionName,
-                                 final BsonArray data, final BsonDocument definition) {
-        this.filename = filename;
-        this.description = description;
-        this.databaseName = databaseName;
-        this.collectionName = collectionName;
-        this.data = data;
-        this.definition = definition;
-    }
-
-    @BeforeClass
-    public static void beforeClass() {
-        commandListener = new TestCommandListener();
-        mongoClient = new MongoClient(getMongoClientURI(MongoClientOptions.builder().addCommandListener(commandListener)));
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        if (mongoClient != null) {
-            mongoClient.close();
-        }
-    }
-
-    @Before
-    public void setUp() {
-
-        ServerVersion serverVersion = ClusterFixture.getServerVersion();
-        if (definition.containsKey("ignore_if_server_version_less_than")) {
-            assumeFalse(serverVersion.compareTo(getServerVersion("ignore_if_server_version_less_than")) < 0);
-        }
-        if (definition.containsKey("ignore_if_server_version_greater_than")) {
-            assumeFalse(serverVersion.compareTo(getServerVersion("ignore_if_server_version_greater_than")) > 0);
-        }
-        if (definition.containsKey("ignore_if_topology_type")) {
-            BsonArray topologyTypes = definition.getArray("ignore_if_topology_type");
-            for (BsonValue type : topologyTypes) {
-                String typeString = type.asString().getValue();
-                if (typeString.equals("sharded")) {
-                    assumeFalse(isSharded());
-                } else if (typeString.equals("replica_set")) {
-                    assumeFalse(isDiscoverableReplicaSet());
-                } else if (typeString.equals("standalone")) {
-                    assumeFalse(isSharded());
-                }
-            }
-        }
-
-        List<BsonDocument> documents = new ArrayList<BsonDocument>();
-        for (BsonValue document : data) {
-            documents.add(document.asDocument());
-        }
-        CollectionHelper<Document> collectionHelper = new CollectionHelper<Document>(new DocumentCodec(),
-                                                                                     new MongoNamespace(databaseName,
-                                                                                                        collectionName));
-        collectionHelper.drop();
-        collectionHelper.insertDocuments(documents);
-
-        commandListener.reset();
-        collection = mongoClient.getDatabase(databaseName).getCollection(collectionName, BsonDocument.class);
-        if (definition.getDocument("operation").containsKey("read_preference")) {
-            collection = collection.withReadPreference(ReadPreference.valueOf(definition.getDocument("operation")
-                                                                                        .getDocument("read_preference")
-                                                                                        .getString("mode").getValue()));
-        }
-        helper = new JsonPoweredCrudTestHelper(description, collection);
-    }
-
-    private ServerVersion getServerVersion(final String fieldName) {
-        String[] versionStringArray = definition.getString(fieldName).getValue().split("\\.");
-        return new ServerVersion(Integer.parseInt(versionStringArray[0]), Integer.parseInt(versionStringArray[1]));
-    }
-
-    @Test
-    public void shouldPassAllOutcomes() {
-        // On server <= 2.4, insertMany generates an insert command for every document, so the test fails
-        assumeFalse(filename.startsWith("insertMany") && !serverVersionAtLeast(asList(2, 6, 0)));
-
-        executeOperation();
-
-        List<CommandEvent> expectedEvents = getExpectedEvents(definition.getArray("expectations"));
-        List<CommandEvent> events = commandListener.getEvents();
-
-        assertEquals(expectedEvents.size(), events.size());
-
-        for (int i = 0; i < events.size(); i++) {
-            CommandEvent actual = events.get(i);
-            CommandEvent expected = expectedEvents.get(i);
-
-            assertEquals(expected.getClass(), actual.getClass());
-            assertEquals(expected.getCommandName(), actual.getCommandName());
-
-            if (actual.getClass().equals(CommandStartedEvent.class)) {
-                CommandStartedEvent actualCommandStartedEvent = massageActualCommandStartedEvent((CommandStartedEvent) actual);
-                CommandStartedEvent expectedCommandStartedEvent = (CommandStartedEvent) expected;
-
-                assertEquals(expectedCommandStartedEvent.getDatabaseName(), actualCommandStartedEvent.getDatabaseName());
-                assertEquals(expectedCommandStartedEvent.getCommand(), actualCommandStartedEvent.getCommand());
-
-            } else if (actual.getClass().equals(CommandSucceededEvent.class)) {
-                CommandSucceededEvent actualCommandSucceededEvent = massageActualCommandSucceededEvent((CommandSucceededEvent) actual);
-                CommandSucceededEvent expectedCommandSucceededEvent = massageExpectedCommandSucceededEvent((CommandSucceededEvent)
-                                                                                                           expected);
-
-                assertEquals(expectedCommandSucceededEvent.getCommandName(), actualCommandSucceededEvent.getCommandName());
-                assertTrue(actualCommandSucceededEvent.getElapsedTime(TimeUnit.NANOSECONDS) > 0);
-
-                if (expectedCommandSucceededEvent.getResponse() == null) {
-                    assertNull(actualCommandSucceededEvent.getResponse());
-                } else {
-                    assertTrue(String.format("\nExpected: %s\nActual:   %s",
-                                             expectedCommandSucceededEvent.getResponse(),
-                                             actualCommandSucceededEvent.getResponse()),
-                              actualCommandSucceededEvent.getResponse().entrySet()
-                                                          .containsAll(expectedCommandSucceededEvent.getResponse().entrySet()));
-                }
-            } else if (actual.getClass().equals(CommandFailedEvent.class)) {
-                // nothing else to assert here
-            } else {
-                throw new UnsupportedOperationException("Unsupported event type: " + actual.getClass());
-            }
-        }
-    }
-
-    private CommandSucceededEvent massageExpectedCommandSucceededEvent(final CommandSucceededEvent expected) {
-        // massage numbers that are the wrong BSON type
-        expected.getResponse().put("ok", new BsonDouble(expected.getResponse().getNumber("ok").doubleValue()));
-        return expected;
-    }
-
-    private CommandSucceededEvent massageActualCommandSucceededEvent(final CommandSucceededEvent actual) {
-        BsonDocument response = getWritableCloneOfCommand(actual.getResponse());
-
-        // massage numbers that are the wrong BSON type
-        response.put("ok", new BsonDouble(response.getNumber("ok").doubleValue()));
-        if (response.containsKey("n")) {
-            response.put("n", new BsonInt32(response.getNumber("n").intValue()));
-        }
-
-        if (actual.getCommandName().equals("find") || actual.getCommandName().equals("getMore")) {
-            if (response.containsKey("cursor")) {
-                if (response.getDocument("cursor").containsKey("id")
-                    && !response.getDocument("cursor").getInt64("id").equals(new BsonInt64(0))) {
-                    response.getDocument("cursor").put("id", new BsonInt64(42));
-                }
-            }
-        } else if (actual.getCommandName().equals("killCursors")) {
-            response.getArray("cursorsUnknown").set(0, new BsonInt64(42));
-        } else if (isWriteCommand(actual.getCommandName())) {
-            if (response.containsKey("writeErrors")) {
-                for (Iterator<BsonValue> iter = response.getArray("writeErrors").iterator(); iter.hasNext();) {
-                    BsonDocument cur = iter.next().asDocument();
-                    cur.put("code", new BsonInt32(42));
-                    cur.put("errmsg", new BsonString(""));
-                }
-            }
-            if (actual.getCommandName().equals("update")) {
-                response.remove("nModified");
-            }
-        }
-        return new CommandSucceededEvent(actual.getRequestId(), actual.getConnectionDescription(), actual.getCommandName(), response,
-                actual.getElapsedTime(TimeUnit.NANOSECONDS));
-    }
-
-    private boolean isWriteCommand(final String commandName) {
-        return asList("insert", "update", "delete").contains(commandName);
-    }
-
-    private CommandStartedEvent massageActualCommandStartedEvent(final CommandStartedEvent actual) {
-        BsonDocument command = getWritableCloneOfCommand(actual.getCommand());
-
-        if (actual.getCommandName().equals("update")) {
-            for (Iterator<BsonValue> iter = command.getArray("updates").iterator(); iter.hasNext();) {
-                BsonDocument curUpdate = iter.next().asDocument();
-                if (!curUpdate.containsKey("multi")) {
-                    curUpdate.put("multi", BsonBoolean.FALSE);
-                }
-                if (!curUpdate.containsKey("upsert")) {
-                    curUpdate.put("upsert", BsonBoolean.FALSE);
-                }
-            }
-        } else if (actual.getCommandName().equals("getMore")) {
-            command.put("getMore", new BsonInt64(42));
-        } else if (actual.getCommandName().equals("killCursors")) {
-            command.getArray("cursors").set(0, new BsonInt64(42));
-        }
-
-        return new CommandStartedEvent(actual.getRequestId(), actual.getConnectionDescription(), actual.getDatabaseName(),
-                actual.getCommandName(), command);
-    }
-
-    private void executeOperation() {
-        try {
-            helper.getOperationResults(definition.getDocument("operation"));
-        } catch (MongoException e) {
-            // ignore, as some of these are expected to throw exceptions
-        }
-    }
-
-    private List<CommandEvent> getExpectedEvents(final BsonArray expectedEventDocuments) {
-        List<CommandEvent> expectedEvents = new ArrayList<CommandEvent>(expectedEventDocuments.size());
-        for (Iterator<BsonValue> iterator = expectedEventDocuments.iterator(); iterator.hasNext();) {
-            BsonDocument curExpectedEventDocument = iterator.next().asDocument();
-            String eventType = curExpectedEventDocument.keySet().iterator().next();
-            BsonDocument eventDescriptionDocument = curExpectedEventDocument.getDocument(eventType);
-            CommandEvent commandEvent;
-            if (eventType.equals("command_started_event")) {
-                commandEvent = new CommandStartedEvent(1, null, databaseName,
-                                                       eventDescriptionDocument.getString("command_name").getValue(),
-                                                       eventDescriptionDocument.getDocument("command"));
-            } else if (eventType.equals("command_succeeded_event")) {
-                BsonDocument replyDocument = eventDescriptionDocument.get("reply").asDocument();
-                commandEvent = new CommandSucceededEvent(1, null, eventDescriptionDocument.getString("command_name").getValue(),
-                                                         replyDocument, 1);
-
-            } else if (eventType.equals("command_failed_event")) {
-                commandEvent = new CommandFailedEvent(1, null, eventDescriptionDocument.getString("command_name").getValue(), 1, null);
-            } else {
-                throw new UnsupportedOperationException("Unsupported command event type: " + eventType);
-            }
-            expectedEvents.add(commandEvent);
-        }
-        return expectedEvents;
-    }
-
-
-    private BsonDocument getWritableCloneOfCommand(final BsonDocument original) {
-        BsonDocument clone = new BsonDocument();
-        BsonDocumentWriter writer = new BsonDocumentWriter(clone);
-        new BsonDocumentCodec(CODEC_REGISTRY_HACK).encode(writer, original, EncoderContext.builder().build());
-        return clone;
-    }
-
-
-    @Parameterized.Parameters(name = "{1}")
-    public static Collection<Object[]> data() throws URISyntaxException, IOException {
-        List<Object[]> data = new ArrayList<Object[]>();
-        for (File file : JsonPoweredTestHelper.getTestFiles("/command-monitoring")) {
-            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
-            for (BsonValue test : testDocument.getArray("tests")) {
-                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
-                                      testDocument.getString("database_name").getValue(),
-                                      testDocument.getString("collection_name").getValue(),
-                                      testDocument.getArray("data"), test.asDocument()});
-            }
-        }
-        return data;
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/client/CrudTest.java b/driver/src/test/functional/com/mongodb/client/CrudTest.java
deleted file mode 100644
index 448d539dbcf..00000000000
--- a/driver/src/test/functional/com/mongodb/client/CrudTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import org.bson.BsonArray;
-import org.bson.BsonDocument;
-import org.bson.BsonValue;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import util.JsonPoweredTestHelper;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-
-// See https://github.com/mongodb/specifications/tree/master/source/crud/tests
-@RunWith(Parameterized.class)
-public class CrudTest extends DatabaseTestCase {
-    private final String filename;
-    private final String description;
-    private final BsonArray data;
-    private final BsonDocument definition;
-    private MongoCollection<BsonDocument> collection;
-    private JsonPoweredCrudTestHelper helper;
-
-    public CrudTest(final String filename, final String description, final BsonArray data, final BsonDocument definition) {
-        this.filename = filename;
-        this.description = description;
-        this.data = data;
-        this.definition = definition;
-    }
-
-    @Before
-    public void setUp() {
-        super.setUp();
-        List<BsonDocument> documents = new ArrayList<BsonDocument>();
-        for (BsonValue document: data) {
-            documents.add(document.asDocument());
-        }
-        getCollectionHelper().insertDocuments(documents);
-        collection = database.getCollection(getClass().getName(), BsonDocument.class);
-        helper = new JsonPoweredCrudTestHelper(description, collection);
-    }
-
-    @Test
-    public void shouldPassAllOutcomes() {
-        // Server versions prior to 2.6 do not properly recognize non-ObjectId _id values for upserts, so skipping a test that relies on
-        // that unless the server version is at least 2.6
-        if (description.equals("ReplaceOne with upsert when no documents match without an id specified")){
-            Assume.assumeTrue(serverVersionAtLeast(asList(2, 6, 0)));
-        }
-
-        BsonDocument outcome = helper.getOperationResults(definition.getDocument("operation"));
-        BsonDocument expectedOutcome = definition.getDocument("outcome");
-
-        if (checkResult()) {
-            if (!serverVersionAtLeast(asList(2, 6, 0))) {
-                if (expectedOutcome.isDocument("result")) {
-                    expectedOutcome.getDocument("result").remove("modifiedCount");
-                }
-            }
-            assertEquals(description, expectedOutcome.get("result"), outcome.get("result"));
-        }
-        if (expectedOutcome.containsKey("collection")) {
-            assertCollectionEquals(expectedOutcome.getDocument("collection"));
-        }
-    }
-
-    @Parameterized.Parameters(name = "{1}")
-    public static Collection<Object[]> data() throws URISyntaxException, IOException {
-        List<Object[]> data = new ArrayList<Object[]>();
-        for (File file : JsonPoweredTestHelper.getTestFiles("/crud")) {
-            BsonDocument testDocument = util.JsonPoweredTestHelper.getTestDocument(file);
-            for (BsonValue test: testDocument.getArray("tests")) {
-                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
-                        testDocument.getArray("data"), test.asDocument()});
-            }
-        }
-        return data;
-    }
-
-    private boolean checkResult() {
-        if (filename.contains("insert")) {
-            // We don't return any id's for insert commands
-            return false;
-        } else if (!serverVersionAtLeast(asList(3, 0, 0))
-                && description.contains("when no documents match with upsert returning the document before modification")) {
-            // Pre 3.0 versions of MongoDB return an empty document rather than a null
-            return false;
-        }
-        return true;
-    }
-
-    private void assertCollectionEquals(final BsonDocument expectedCollection) {
-        MongoCollection<BsonDocument> collectionToCompare = collection;
-        if (expectedCollection.containsKey("name")) {
-            collectionToCompare = database.getCollection(expectedCollection.getString("name").getValue(), BsonDocument.class);
-        }
-        assertEquals(description, expectedCollection.getArray("data"), collectionToCompare.find().into(new BsonArray()));
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/client/DatabaseTestCase.java b/driver/src/test/functional/com/mongodb/client/DatabaseTestCase.java
deleted file mode 100644
index e713b1abd3f..00000000000
--- a/driver/src/test/functional/com/mongodb/client/DatabaseTestCase.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import com.mongodb.MongoClient;
-import com.mongodb.MongoNamespace;
-import com.mongodb.client.test.CollectionHelper;
-import com.mongodb.connection.ServerHelper;
-import org.bson.BsonDocument;
-import org.bson.BsonDocumentWrapper;
-import org.bson.Document;
-import org.bson.codecs.DocumentCodec;
-import org.junit.After;
-import org.junit.Before;
-
-import static com.mongodb.Fixture.getDefaultDatabaseName;
-import static com.mongodb.Fixture.getMongoClient;
-import static com.mongodb.Fixture.getPrimary;
-
-public class DatabaseTestCase {
-    //For ease of use and readability, in this specific case we'll allow protected variables
-    //CHECKSTYLE:OFF
-    protected MongoClient client;
-    protected MongoDatabase database;
-    protected MongoCollection<Document> collection;
-    //CHECKSTYLE:ON
-
-    @Before
-    public void setUp() {
-        client =  getMongoClient();
-        database = client.getDatabase(getDefaultDatabaseName());
-        collection = database.getCollection(getClass().getName());
-        collection.drop();
-    }
-
-    @After
-    public void tearDown() {
-        if (collection != null) {
-            collection.drop();
-        }
-        try {
-            ServerHelper.checkPool(getPrimary());
-        } catch (InterruptedException e) {
-            // ignore
-        }
-    }
-
-    protected String getDatabaseName() {
-        return database.getName();
-    }
-
-    protected String getCollectionName() {
-        return collection.getNamespace().getCollectionName();
-    }
-
-    protected MongoNamespace getNamespace() {
-        return collection.getNamespace();
-    }
-
-    protected CollectionHelper<Document> getCollectionHelper() {
-        return new CollectionHelper<Document>(new DocumentCodec(), getNamespace());
-    }
-
-    protected BsonDocument wrap(final Document document) {
-        return new BsonDocumentWrapper<Document>(document, new DocumentCodec());
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/client/JsonPoweredCrudTestHelper.java b/driver/src/test/functional/com/mongodb/client/JsonPoweredCrudTestHelper.java
deleted file mode 100644
index 3283a59541d..00000000000
--- a/driver/src/test/functional/com/mongodb/client/JsonPoweredCrudTestHelper.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client;
-
-import com.mongodb.MongoException;
-import com.mongodb.WriteConcern;
-import com.mongodb.bulk.BulkWriteResult;
-import com.mongodb.client.model.BulkWriteOptions;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.FindOneAndDeleteOptions;
-import com.mongodb.client.model.FindOneAndReplaceOptions;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.InsertManyOptions;
-import com.mongodb.client.model.InsertOneModel;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.model.UpdateOneModel;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.WriteModel;
-import com.mongodb.client.result.UpdateResult;
-import org.bson.BsonArray;
-import org.bson.BsonBoolean;
-import org.bson.BsonDocument;
-import org.bson.BsonInt32;
-import org.bson.BsonNull;
-import org.bson.BsonValue;
-import org.junit.Assume;
-import org.junit.AssumptionViolatedException;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-
-public class JsonPoweredCrudTestHelper {
-    private final String description;
-    private final MongoCollection<BsonDocument> collection;
-
-    public JsonPoweredCrudTestHelper(final String description, final MongoCollection<BsonDocument> collection) {
-        this.description = description;
-        this.collection = collection;
-    }
-
-    BsonDocument getOperationResults(final BsonDocument operation) {
-        String name = operation.getString("name").getValue();
-        BsonDocument arguments = operation.getDocument("arguments");
-
-        String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1) + "Result";
-        try {
-            Method method = getClass().getDeclaredMethod(methodName, BsonDocument.class);
-            return (BsonDocument) method.invoke(this, arguments);
-        } catch (NoSuchMethodException e) {
-            throw new UnsupportedOperationException("No handler for operation " + methodName);
-        } catch (InvocationTargetException e) {
-            if (e.getTargetException() instanceof AssumptionViolatedException) {
-                throw (AssumptionViolatedException) e.getTargetException();
-            }
-            if (e.getTargetException() instanceof MongoException) {
-                throw (MongoException) e.getTargetException();
-            }
-            throw (RuntimeException) e.getTargetException();
-        } catch (IllegalAccessException e) {
-            throw new UnsupportedOperationException("Invalid handler access for operation " + methodName);
-        }
-    }
-
-    BsonDocument toResult(final int count) {
-        return toResult(new BsonInt32(count));
-    }
-
-    BsonDocument toResult(final MongoIterable<BsonDocument> results) {
-        return toResult(new BsonArray(results.into(new ArrayList<BsonDocument>())));
-    }
-
-    BsonDocument toResult(final String key, final BsonValue value) {
-        return toResult(new BsonDocument(key, value));
-    }
-
-    BsonDocument toResult(final UpdateResult updateResult) {
-        BsonDocument resultDoc = new BsonDocument("matchedCount", new BsonInt32((int) updateResult.getMatchedCount()));
-        if (updateResult.isModifiedCountAvailable()) {
-            resultDoc.append("modifiedCount", new BsonInt32((int) updateResult.getModifiedCount()));
-        }
-        if (updateResult.getUpsertedId() != null) {
-            resultDoc.append("upsertedId", updateResult.getUpsertedId());
-        }
-        return toResult(resultDoc);
-    }
-
-    BsonDocument toResult(final BulkWriteResult bulkWriteResult) {
-        BsonDocument resultDoc = new BsonDocument();  // TODO: complete this, but not needed for command monitoring tests
-        return toResult(resultDoc);
-    }
-
-    BsonDocument toResult(final BsonValue results) {
-        return new BsonDocument("result", results != null ? results : BsonNull.VALUE);
-    }
-
-    BsonDocument getAggregateResult(final BsonDocument arguments) {
-        if (!serverVersionAtLeast(Arrays.asList(2, 6, 0))) {
-            Assume.assumeFalse(description.contains("$out"));
-        }
-
-        List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
-        for (BsonValue stage : arguments.getArray("pipeline")) {
-            pipeline.add(stage.asDocument());
-        }
-        return toResult(collection.aggregate(pipeline).batchSize(arguments.getNumber("batchSize").intValue()));
-    }
-
-    BsonDocument getCountResult(final BsonDocument arguments) {
-        CountOptions options = new CountOptions();
-        if (arguments.containsKey("skip")) {
-            options.skip(arguments.getNumber("skip").intValue());
-        }
-        if (arguments.containsKey("limit")) {
-            options.limit(arguments.getNumber("limit").intValue());
-        }
-
-        return toResult((int) collection.count(arguments.getDocument("filter"), options));
-    }
-
-    BsonDocument getDistinctResult(final BsonDocument arguments) {
-        return toResult(collection.distinct(arguments.getString("fieldName").getValue(), BsonInt32.class)
-                                .filter(arguments.getDocument("filter")).into(new BsonArray()));
-    }
-
-    BsonDocument getFindResult(final BsonDocument arguments) {
-        FindIterable<BsonDocument> findIterable = collection.find(arguments.getDocument("filter"));
-        if (arguments.containsKey("skip")) {
-            findIterable.skip(arguments.getNumber("skip").intValue());
-        }
-        if (arguments.containsKey("limit")) {
-            findIterable.limit(arguments.getNumber("limit").intValue());
-        }
-        if (arguments.containsKey("batchSize")) {
-            findIterable.batchSize(arguments.getNumber("batchSize").intValue());
-        }
-        if (arguments.containsKey("sort")) {
-            findIterable.sort(arguments.getDocument("sort"));
-        }
-        if (arguments.containsKey("modifiers")) {
-            findIterable.modifiers(arguments.getDocument("modifiers"));
-        }
-        return toResult(findIterable);
-    }
-
-    BsonDocument getDeleteManyResult(final BsonDocument arguments) {
-        return toResult("deletedCount",
-                        new BsonInt32((int) collection.deleteMany(arguments.getDocument("filter")).getDeletedCount()));
-    }
-
-    BsonDocument getDeleteOneResult(final BsonDocument arguments) {
-        return toResult("deletedCount",
-                        new BsonInt32((int) collection.deleteOne(arguments.getDocument("filter")).getDeletedCount()));
-    }
-
-    BsonDocument getFindOneAndDeleteResult(final BsonDocument arguments) {
-        FindOneAndDeleteOptions options = new FindOneAndDeleteOptions();
-        if (arguments.containsKey("projection")) {
-            options.projection(arguments.getDocument("projection"));
-        }
-        if (arguments.containsKey("sort")) {
-            options.sort(arguments.getDocument("sort"));
-        }
-        return toResult(collection.findOneAndDelete(arguments.getDocument("filter"), options));
-    }
-
-    BsonDocument getFindOneAndReplaceResult(final BsonDocument arguments) {
-        // in 2.4 the server can ignore the supplied _id and creates an ObjectID
-        Assume.assumeTrue(serverVersionAtLeast(Arrays.asList(2, 6, 0)));
-
-        FindOneAndReplaceOptions options = new FindOneAndReplaceOptions();
-        if (arguments.containsKey("projection")) {
-            options.projection(arguments.getDocument("projection"));
-        }
-        if (arguments.containsKey("sort")) {
-            options.sort(arguments.getDocument("sort"));
-        }
-        if (arguments.containsKey("upsert")) {
-            options.upsert(arguments.getBoolean("upsert").getValue());
-        }
-        if (arguments.containsKey("returnDocument")) {
-            options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
-                                                                                                    : ReturnDocument.BEFORE);
-        }
-        return toResult(collection
-                                .findOneAndReplace(arguments.getDocument("filter"), arguments.getDocument("replacement"), options));
-    }
-
-    BsonDocument getFindOneAndUpdateResult(final BsonDocument arguments) {
-        FindOneAndUpdateOptions options = new FindOneAndUpdateOptions();
-        if (arguments.containsKey("projection")) {
-            options.projection(arguments.getDocument("projection"));
-        }
-        if (arguments.containsKey("sort")) {
-            options.sort(arguments.getDocument("sort"));
-        }
-        if (arguments.containsKey("upsert")) {
-            options.upsert(arguments.getBoolean("upsert").getValue());
-        }
-        if (arguments.containsKey("returnDocument")) {
-            options.returnDocument(arguments.getString("returnDocument").getValue().equals("After") ? ReturnDocument.AFTER
-                                                                                                    : ReturnDocument.BEFORE);
-        }
-        return toResult(collection
-                                .findOneAndUpdate(arguments.getDocument("filter"), arguments.getDocument("update"), options));
-    }
-
-    BsonDocument getInsertOneResult(final BsonDocument arguments) {
-        collection.insertOne(arguments.getDocument("document"));
-        return toResult((BsonValue) null);
-    }
-
-    BsonDocument getInsertManyResult(final BsonDocument arguments) {
-        List<BsonDocument> documents = new ArrayList<BsonDocument>();
-        for (BsonValue document : arguments.getArray("documents")) {
-            documents.add(document.asDocument());
-        }
-        collection.insertMany(documents,
-                              new InsertManyOptions().ordered(arguments.getBoolean("ordered", BsonBoolean.TRUE).getValue()));
-        return toResult((BsonValue) null);
-    }
-
-    BsonDocument getReplaceOneResult(final BsonDocument arguments) {
-        UpdateOptions options = new UpdateOptions();
-        if (arguments.containsKey("upsert")) {
-            options.upsert(arguments.getBoolean("upsert").getValue());
-        }
-        return toResult(collection
-                                .replaceOne(arguments.getDocument("filter"), arguments.getDocument("replacement"), options));
-    }
-
-    BsonDocument getUpdateManyResult(final BsonDocument arguments) {
-        UpdateOptions options = new UpdateOptions();
-        if (arguments.containsKey("upsert")) {
-            options.upsert(arguments.getBoolean("upsert").getValue());
-        }
-        return toResult(collection.updateMany(arguments.getDocument("filter"), arguments.getDocument("update"), options));
-    }
-
-    BsonDocument getUpdateOneResult(final BsonDocument arguments) {
-        UpdateOptions options = new UpdateOptions();
-        if (arguments.containsKey("upsert")) {
-            options.upsert(arguments.getBoolean("upsert").getValue());
-        }
-        return toResult(collection.updateOne(arguments.getDocument("filter"), arguments.getDocument("update"), options));
-    }
-
-    BsonDocument getBulkWriteResult(final BsonDocument arguments) {
-        WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED;
-        if (arguments.containsKey("writeConcern")) {
-            if (arguments.getDocument("writeConcern").size() > 1) {
-                throw new UnsupportedOperationException("Write concern document contains unexpected keys: "
-                                                        + arguments.getDocument("writeConcern").keySet());
-            }
-            writeConcern = new WriteConcern(arguments.getDocument("writeConcern").getInt32("w").intValue());
-        }
-
-        List<WriteModel<BsonDocument>> writeModels = new ArrayList<WriteModel<BsonDocument>>();
-        for (Iterator<BsonValue> iter = arguments.getArray("requests").iterator(); iter.hasNext();) {
-            BsonDocument cur = iter.next().asDocument();
-            if (cur.get("insertOne") != null) {
-                writeModels.add(new InsertOneModel<BsonDocument>(cur.getDocument("insertOne").getDocument("document")));
-            } else if (cur.get("updateOne") != null) {
-                writeModels.add(new UpdateOneModel<BsonDocument>(cur.getDocument("updateOne").getDocument("filter"),
-                                                                 cur.getDocument("updateOne").getDocument("update")));
-            } else {
-                throw new UnsupportedOperationException("Unsupported write request type");
-            }
-        }
-
-        return toResult(collection.withWriteConcern(writeConcern).bulkWrite(writeModels,
-                                                                            new BulkWriteOptions()
-                                                                            .ordered(arguments.getBoolean("ordered", BsonBoolean.TRUE)
-                                                                                              .getValue())));
-
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/client/gridfs/GridFSTest.java b/driver/src/test/functional/com/mongodb/client/gridfs/GridFSTest.java
deleted file mode 100644
index c82dba1a477..00000000000
--- a/driver/src/test/functional/com/mongodb/client/gridfs/GridFSTest.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.gridfs;
-
-import com.mongodb.MongoGridFSException;
-import com.mongodb.client.DatabaseTestCase;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.gridfs.model.GridFSDownloadOptions;
-import com.mongodb.client.gridfs.model.GridFSUploadOptions;
-import org.bson.BsonArray;
-import org.bson.BsonBinary;
-import org.bson.BsonDocument;
-import org.bson.BsonInt64;
-import org.bson.BsonObjectId;
-import org.bson.BsonString;
-import org.bson.BsonValue;
-import org.bson.Document;
-import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import util.JsonPoweredTestHelper;
-
-import javax.xml.bind.DatatypeConverter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import static javax.xml.bind.DatatypeConverter.printHexBinary;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-// See https://github.com/10gen/specifications/tree/master/source/gridfs/tests
-@RunWith(Parameterized.class)
-public class GridFSTest extends DatabaseTestCase {
-    private final String filename;
-    private final String description;
-    private final BsonDocument data;
-    private final BsonDocument definition;
-    private MongoCollection<BsonDocument> filesCollection;
-    private MongoCollection<BsonDocument> chunksCollection;
-    private GridFSBucket gridFSBucket;
-
-    public GridFSTest(final String filename, final String description, final BsonDocument data, final BsonDocument definition) {
-        this.filename = filename;
-        this.description = description;
-        this.data = data;
-        this.definition = definition;
-    }
-
-    @Before
-    public void setUp() {
-        super.setUp();
-
-        gridFSBucket = GridFSBuckets.create(database);
-        filesCollection = database.getCollection("fs.files", BsonDocument.class);
-        chunksCollection = database.getCollection("fs.chunks", BsonDocument.class);
-
-        filesCollection.drop();
-        chunksCollection.drop();
-
-        List<BsonDocument> filesDocuments = processFiles(data.getArray("files", new BsonArray()), new ArrayList<BsonDocument>());
-        if (!filesDocuments.isEmpty()) {
-        filesCollection.insertMany(filesDocuments);
-        }
-
-        List<BsonDocument> chunksDocuments = processChunks(data.getArray("chunks", new BsonArray()), new ArrayList<BsonDocument>());
-        if (!chunksDocuments.isEmpty()) {
-            chunksCollection.insertMany(chunksDocuments);
-        }
-    }
-
-    @Test
-    public void shouldPassAllOutcomes() {
-        arrangeGridFS(definition.getDocument("arrange", new BsonDocument()));
-        actionGridFS(definition.getDocument("act"), definition.getDocument("assert"));
-    }
-
-    @Parameterized.Parameters(name = "{1}")
-    public static Collection<Object[]> data() throws URISyntaxException, IOException {
-        List<Object[]> data = new ArrayList<Object[]>();
-        for (File file : JsonPoweredTestHelper.getTestFiles("/gridfs-tests")) {
-            BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
-            for (BsonValue test: testDocument.getArray("tests")) {
-                data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
-                        testDocument.getDocument("data"), test.asDocument()});
-            }
-        }
-        return data;
-    }
-
-    private void arrangeGridFS(final BsonDocument arrange) {
-        if (arrange.isEmpty()) {
-            return;
-        }
-        for (BsonValue fileToArrange: arrange.getArray("data", new BsonArray())) {
-            BsonDocument document = fileToArrange.asDocument();
-            if (document.containsKey("delete") && document.containsKey("deletes")) {
-                for (BsonValue toDelete : document.getArray("deletes")) {
-                    BsonDocument query = toDelete.asDocument().getDocument("q");
-                    int limit = toDelete.asDocument().getInt32("limit").getValue();
-
-                    MongoCollection<BsonDocument> collection;
-                    if (document.getString("delete").getValue().equals("fs.files")) {
-                        collection = filesCollection;
-                    } else {
-                        collection = chunksCollection;
-                    }
-
-                    if (limit == 1) {
-                        collection.deleteOne(query);
-                    } else {
-                        collection.deleteMany(query);
-                    }
-                }
-            } else if (document.containsKey("insert") && document.containsKey("documents")) {
-                if (document.getString("insert").getValue().equals("fs.files")) {
-                    filesCollection.insertMany(processFiles(document.getArray("documents"), new ArrayList<BsonDocument>()));
-                } else {
-                    chunksCollection.insertMany(processChunks(document.getArray("documents"), new ArrayList<BsonDocument>()));
-                }
-            } else if (document.containsKey("update") && document.containsKey("updates")) {
-                MongoCollection<BsonDocument> collection;
-                if (document.getString("update").getValue().equals("fs.files")) {
-                    collection = filesCollection;
-                } else {
-                    collection = chunksCollection;
-                }
-
-                for (BsonValue rawUpdate : document.getArray("updates")){
-                    BsonDocument query = rawUpdate.asDocument().getDocument("q");
-                    BsonDocument update = rawUpdate.asDocument().getDocument("u");
-                    update.put("$set", parseHexDocument(update.getDocument("$set")));
-
-                    collection.updateMany(query, update);
-                }
-            } else {
-                throw new IllegalArgumentException("Unsupported arrange: " + document);
-            }
-        }
-    }
-
-    private void actionGridFS(final BsonDocument action, final BsonDocument assertion) {
-        if (action.isEmpty()) {
-            return;
-        }
-
-        String operation = action.getString("operation").getValue();
-        if (operation.equals("delete")) {
-            doDelete(action.getDocument("arguments"), assertion);
-        } else if (operation.equals("download")) {
-            doDownload(action.getDocument("arguments"), assertion);
-        } else if (operation.equals("download_by_name")) {
-            doDownloadByName(action.getDocument("arguments"), assertion);
-        } else if (operation.equals("upload")) {
-            doUpload(action.getDocument("arguments"), assertion);
-        } else {
-            throw new IllegalArgumentException("Unknown operation: " + operation);
-        }
-    }
-
-    private void doDelete(final BsonDocument arguments, final BsonDocument assertion) {
-        Throwable error = null;
-
-        try {
-            gridFSBucket.delete(arguments.getObjectId("id").getValue());
-        } catch (MongoGridFSException e) {
-            error = e;
-        }
-
-        if (assertion.containsKey("error")) {
-            assertNotNull("Should have thrown an exception", error);
-        } else {
-            assertNull("Should not have thrown an exception", error);
-            for (BsonValue rawDataItem : assertion.getArray("data")) {
-                BsonDocument dataItem = rawDataItem.asDocument();
-                for (BsonValue deletedItem : dataItem.getArray("deletes", new BsonArray())) {
-                    String delete = dataItem.getString("delete", new BsonString("none")).getValue();
-                    BsonObjectId id = new BsonObjectId(new ObjectId());
-                    if (delete.equals("expected.files")) {
-                        id = deletedItem.asDocument().getDocument("q").getObjectId("_id");
-                    } else if (delete.equals("expected.chunks")) {
-                        id = deletedItem.asDocument().getDocument("q").getObjectId("files_id");
-                    }
-                    assertEquals(filesCollection.count(new BsonDocument("_id", id)), 0);
-                    assertEquals(chunksCollection.count(new BsonDocument("files_id", id)), 0);
-                }
-            }
-        }
-    }
-
-    private void doDownload(final BsonDocument arguments, final BsonDocument assertion) {
-        Throwable error = null;
-        ByteArrayOutputStream outputStream = null;
-
-        try {
-            outputStream = new ByteArrayOutputStream();
-            gridFSBucket.downloadToStream(arguments.getObjectId("id").getValue(), outputStream);
-            outputStream.close();
-        } catch (Throwable e) {
-            error = e;
-        }
-
-        if (assertion.containsKey("result")) {
-            assertNull("Should not have thrown an exception", error);
-            assertEquals(printHexBinary(outputStream.toByteArray()).toLowerCase(),
-                    assertion.getDocument("result").getString("$hex").getValue());
-        } else if (assertion.containsKey("error")) {
-            assertNotNull("Should have thrown an exception", error);
-        }
-    }
-
-    private void doDownloadByName(final BsonDocument arguments, final BsonDocument assertion) {
-        Throwable error = null;
-        ByteArrayOutputStream outputStream = null;
-
-        try {
-            outputStream = new ByteArrayOutputStream();
-            GridFSDownloadOptions options = new GridFSDownloadOptions();
-            if (arguments.containsKey("options")) {
-                int revision = arguments.getDocument("options").getInt32("revision").getValue();
-                options = options.revision(revision);
-            }
-            gridFSBucket.downloadToStream(arguments.getString("filename").getValue(), outputStream, options);
-            outputStream.close();
-        } catch (Throwable e) {
-            error = e;
-        }
-        if (assertion.containsKey("result")) {
-            assertNull("Should not have thrown an exception", error);
-            assertEquals(printHexBinary(outputStream.toByteArray()).toLowerCase(),
-                    assertion.getDocument("result").getString("$hex").getValue());
-        } else if (assertion.containsKey("error")) {
-            assertNotNull("Should have thrown an exception", error);
-        }
-    }
-
-    private void doUpload(final BsonDocument rawArguments, final BsonDocument assertion) {
-        Throwable error = null;
-        ObjectId objectId = null;
-        BsonDocument arguments = parseHexDocument(rawArguments, "source");
-        try {
-            String filename = arguments.getString("filename").getValue();
-            InputStream input = new ByteArrayInputStream(arguments.getBinary("source").getData());
-            GridFSUploadOptions options = new GridFSUploadOptions();
-            BsonDocument rawOptions = arguments.getDocument("options", new BsonDocument());
-            if (rawOptions.containsKey("chunkSizeBytes")) {
-                options = options.chunkSizeBytes(rawOptions.getInt32("chunkSizeBytes").getValue());
-            }
-            if (rawOptions.containsKey("metadata")) {
-                options = options.metadata(Document.parse(rawOptions.getDocument("metadata").toJson()));
-            }
-
-            objectId = gridFSBucket.uploadFromStream(filename, input, options);
-        } catch (Throwable e) {
-            error = e;
-        }
-
-        if (assertion.containsKey("error")) {
-            // We don't need to read anything more so don't see the extra chunk
-            if (!assertion.getString("error").getValue().equals("ExtraChunk")) {
-                assertNotNull("Should have thrown an exception", error);
-            }
-        } else {
-            assertNull("Should not have thrown an exception", error);
-            for (BsonValue rawDataItem : assertion.getArray("data", new BsonArray())) {
-                BsonDocument dataItem = rawDataItem.asDocument();
-                String insert = dataItem.getString("insert", new BsonString("none")).getValue();
-                if (insert.equals("expected.files")) {
-                    List<BsonDocument> documents = processFiles(dataItem.getArray("documents", new BsonArray()),
-                            new ArrayList<BsonDocument>());
-                    assertEquals(filesCollection.count(), documents.size());
-
-                    BsonDocument actual = filesCollection.find().first();
-                    for (BsonDocument expected : documents) {
-                        assertEquals(expected.get("length"), actual.get("length"));
-                        assertEquals(expected.get("chunkSize"), actual.get("chunkSize"));
-                        assertEquals(expected.get("md5"), actual.get("md5"));
-                        assertEquals(expected.get("filename"), actual.get("filename"));
-
-                        if (expected.containsKey("metadata")) {
-                            assertEquals(expected.get("metadata"), actual.get("metadata"));
-                        }
-                    }
-                } else if (insert.equals("expected.chunks")) {
-                    List<BsonDocument> documents = processChunks(dataItem.getArray("documents", new BsonArray()),
-                            new ArrayList<BsonDocument>());
-                    assertEquals(chunksCollection.count(), documents.size());
-
-                    List<BsonDocument> actualDocuments = chunksCollection.find().into(new ArrayList<BsonDocument>());
-                    for (int i = 0; i < documents.size(); i++) {
-                        BsonDocument expected = documents.get(i);
-                        BsonDocument actual = actualDocuments.get(i);
-
-                        assertEquals(new BsonObjectId(objectId), actual.getObjectId("files_id"));
-                        assertEquals(expected.get("n"), actual.get("n"));
-                        assertEquals(expected.get("data"), actual.get("data"));
-                    }
-                }
-            }
-        }
-    }
-
-    private List<BsonDocument> processFiles(final BsonArray bsonArray, final List<BsonDocument> documents) {
-        for (BsonValue rawDocument : bsonArray.getValues()) {
-            if (rawDocument.isDocument()) {
-                BsonDocument document = rawDocument.asDocument();
-                if (document.get("length").isInt32()) {
-                    document.put("length", new BsonInt64(document.getInt32("length").getValue()));
-                }
-                if (document.containsKey("metadata") && document.getDocument("metadata").isEmpty()) {
-                    document.remove("metadata");
-                }
-                if (document.containsKey("aliases") && document.getArray("aliases").getValues().size() == 0) {
-                    document.remove("aliases");
-                }
-                if (document.containsKey("contentType") && document.getString("contentType").getValue().length() == 0) {
-                    document.remove("contentType");
-                }
-                documents.add(document);
-            }
-        }
-        return documents;
-    }
-
-    private List<BsonDocument> processChunks(final BsonArray bsonArray, final List<BsonDocument> documents) {
-        for (BsonValue rawDocument: bsonArray.getValues()) {
-            if (rawDocument.isDocument()) {
-                documents.add(parseHexDocument(rawDocument.asDocument()));
-            }
-        }
-        return documents;
-    }
-
-    private BsonDocument parseHexDocument(final BsonDocument document) {
-        return parseHexDocument(document, "data");
-    }
-
-    private BsonDocument parseHexDocument(final BsonDocument document, final String hexDocument) {
-        if (document.containsKey(hexDocument) && document.get(hexDocument).isDocument()) {
-            byte[] bytes = DatatypeConverter.parseHexBinary(document.getDocument(hexDocument).getString("$hex").getValue());
-            document.put(hexDocument, new BsonBinary(bytes));
-        }
-        return document;
-    }
-}
diff --git a/driver/src/test/functional/com/mongodb/gridfs/GridFSTest.java b/driver/src/test/functional/com/mongodb/gridfs/GridFSTest.java
deleted file mode 100644
index f2703fa84f3..00000000000
--- a/driver/src/test/functional/com/mongodb/gridfs/GridFSTest.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.gridfs;
-
-import category.Slow;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.DatabaseTestCase;
-import com.mongodb.MongoException;
-import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.Scanner;
-
-import static java.nio.charset.Charset.defaultCharset;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class GridFSTest extends DatabaseTestCase {
-    private GridFS gridFS;
-
-    @Before
-    public void setUp() {
-        super.setUp();
-        gridFS = new GridFS(database);
-    }
-
-    @Test
-    public void testSmall() throws Exception {
-        testInOut("this is a simple test");
-    }
-
-    @Test
-    public void testBig() throws Exception {
-        int target = GridFS.DEFAULT_CHUNKSIZE * 3;
-        StringBuilder buf = new StringBuilder(target);
-        while (buf.length() < target) {
-            buf.append("asdasdkjasldkjasldjlasjdlajsdljasldjlasjdlkasjdlaskjdlaskjdlsakjdlaskjdasldjsad");
-        }
-        String s = buf.toString();
-        testInOut(s);
-    }
-
-    void testOutStream(final String s) throws Exception {
-
-        int[] start = getCurrentCollectionCounts();
-
-        GridFSInputFile in = gridFS.createFile();
-        OutputStream writeStream = in.getOutputStream();
-        writeStream.write(s.getBytes(defaultCharset()), 0, s.length());
-        writeStream.close();
-        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
-        assert (out.getId().equals(in.getId()));
-        assert (out.getChunkSize() == (long) GridFS.DEFAULT_CHUNKSIZE);
-
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        out.writeTo(bout);
-        String outString = new String(bout.toByteArray(), defaultCharset());
-        assert (outString.equals(s));
-
-        out.remove();
-        int[] end = getCurrentCollectionCounts();
-        assertEquals(start[0], end[0]);
-        assertEquals(start[1], end[1]);
-    }
-
-    @Test
-    public void testOutStreamSmall() throws Exception {
-        testOutStream("this is a simple test");
-    }
-
-    @Test
-    public void testOutStreamBig() throws Exception {
-        int target = (int) (GridFS.DEFAULT_CHUNKSIZE * 3.5);
-        StringBuilder buf = new StringBuilder(target);
-        while (buf.length() < target) {
-            buf.append("asdasdkjasldkjasldjlasjdlajsdljasldjlasjdlkasjdlaskjdlaskjdlsakjdlaskjdasldjsad");
-        }
-        String s = buf.toString();
-        testOutStream(s);
-    }
-
-    @Test
-    public void testOutStreamBigAligned() throws Exception {
-        int target = (GridFS.DEFAULT_CHUNKSIZE * 4);
-        StringBuilder buf = new StringBuilder(target);
-        while (buf.length() < target) {
-            buf.append("a");
-        }
-        String s = buf.toString();
-        testOutStream(s);
-    }
-
-    @Test
-    public void testCreateFileWithFile() throws Exception {
-        URI fileURI = GridFSTest.class.getResource("/GridFSLegacy/GridFSTestFile.txt").toURI();
-        GridFSInputFile in = gridFS.createFile(new File(fileURI));
-        in.save();
-
-        String expectedString = new Scanner(new File(fileURI)).useDelimiter("\\Z").next();
-
-        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        out.writeTo(bout);
-        String outString = new String(bout.toByteArray(), defaultCharset()).trim();
-
-        assertEquals(expectedString, outString);
-    }
-
-    @Test
-    public void testMetadata() throws Exception {
-
-        GridFSInputFile in = gridFS.createFile("foo".getBytes(defaultCharset()));
-        in.put("meta", 5);
-        in.save();
-        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
-        assertTrue(out.get("meta").equals(5));
-    }
-
-    @Test
-    public void testFind() throws Exception {
-
-        GridFSInputFile in = gridFS.createFile(new ByteArrayInputStream("foo".getBytes(defaultCharset())), "testFind");
-        in.save();
-        assertNotNull(gridFS.find((ObjectId) in.getId()));
-        assertNotNull(gridFS.findOne((ObjectId) in.getId()));
-        assertNotNull(gridFS.findOne("testFind"));
-        assertNotNull(gridFS.findOne(new BasicDBObject("_id", in.getId())));
-    }
-
-    @Test
-    public void testBadChunkSize() throws Exception {
-        byte[] randomBytes = new byte[256];
-        GridFSInputFile inputFile = gridFS.createFile(randomBytes);
-        inputFile.setFilename("bad_chunk_size.bin");
-        try {
-            inputFile.save(0);
-            fail("should have received an exception about a chunk size being zero");
-        } catch (MongoException e) {
-            //We expect this exception to complain about the chunksize
-            assertTrue(e.toString().contains("chunkSize must be greater than zero"));
-        }
-    }
-
-    @Test
-    @Category(Slow.class)
-    public void testMultipleChunks() throws Exception {
-        int fileSize = 1024 * 128;
-        byte[] randomBytes = new byte[fileSize];
-        for (int idx = 0; idx < fileSize; ++idx) {
-            randomBytes[idx] = (byte) (256 * Math.random());
-        }
-
-        GridFSInputFile inputFile = gridFS.createFile(randomBytes);
-        inputFile.setFilename("bad_chunk_size.bin");
-
-        //For good measure let's save and restore the bytes
-        inputFile.save(1024);
-        GridFSDBFile savedFile = gridFS.findOne(new BasicDBObject("_id", inputFile.getId()));
-        ByteArrayOutputStream savedFileByteStream = new ByteArrayOutputStream();
-        savedFile.writeTo(savedFileByteStream);
-        byte[] savedFileBytes = savedFileByteStream.toByteArray();
-
-        assertArrayEquals(randomBytes, savedFileBytes);
-    }
-
-    @Test
-    @Category(Slow.class)
-    public void getBigChunkSize() throws Exception {
-        GridFSInputFile file = gridFS.createFile("512kb_bucket");
-        file.setChunkSize(file.getChunkSize() * 2);
-        OutputStream os = file.getOutputStream();
-        for (int i = 0; i < 1024; i++) {
-            os.write(new byte[GridFS.DEFAULT_CHUNKSIZE / 1024 + 1]);
-        }
-        os.close();
-    }
-
-
-    @Test
-    public void testInputStreamSkipping() throws Exception {
-        //int chunkSize = 5;
-        int chunkSize = GridFS.DEFAULT_CHUNKSIZE;
-        int fileSize = (int) (7.25 * chunkSize);
-
-        byte[] fileBytes = new byte[fileSize];
-        for (int idx = 0; idx < fileSize; ++idx) {
-            fileBytes[idx] = (byte) (idx % 251);
-        }
-        //Don't want chunks to be aligned at byte position 0
-
-        GridFSInputFile inputFile = gridFS.createFile(fileBytes);
-        inputFile.setFilename("input_stream_skipping.bin");
-        inputFile.save(chunkSize);
-
-        GridFSDBFile savedFile = gridFS.findOne(new BasicDBObject("_id", inputFile.getId()));
-        InputStream inputStream = savedFile.getInputStream();
-
-        //Quick run-through, make sure the file is as expected
-        for (int idx = 0; idx < fileSize; ++idx) {
-            assertEquals((byte) (idx % 251), (byte) inputStream.read());
-        }
-
-        inputStream = savedFile.getInputStream();
-
-        long skipped = inputStream.skip(1);
-        assertEquals(1, skipped);
-        int position = 1;
-        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
-
-        skipped = inputStream.skip(chunkSize);
-        assertEquals(chunkSize, skipped);
-        position += chunkSize;
-        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
-
-        skipped = inputStream.skip(-1);
-        assertEquals(0, skipped);
-        skipped = inputStream.skip(0);
-        assertEquals(0, skipped);
-
-        skipped = inputStream.skip(3 * chunkSize);
-        assertEquals(3 * chunkSize, skipped);
-        position += 3 * chunkSize;
-        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
-
-        //Make sure skipping works when we skip to an exact chunk boundary
-        long toSkip = inputStream.available();
-        skipped = inputStream.skip(toSkip);
-        assertEquals(toSkip, skipped);
-        position += toSkip;
-        assertEquals((byte) (position++ % 251), (byte) inputStream.read());
-
-        skipped = inputStream.skip(2 * fileSize);
-        assertEquals(fileSize - position, skipped);
-        assertEquals(-1, inputStream.read());
-    }
-
-    @Test
-    public void testCustomFileID() throws IOException {
-        // given
-        int id = 1;
-        gridFS.remove(new BasicDBObject("_id", id));
-
-        int chunkSize = 10;
-        int fileSize = (int) (3.25 * chunkSize);
-
-        byte[] fileBytes = new byte[fileSize];
-        for (int idx = 0; idx < fileSize; ++idx) {
-            fileBytes[idx] = (byte) (idx % 251);
-        }
-
-        // when
-        GridFSInputFile inputFile = gridFS.createFile(fileBytes);
-        inputFile.setId(id);
-        inputFile.setFilename("custom_file_id.bin");
-        inputFile.save(chunkSize);
-        assertEquals(id, inputFile.getId());
-
-        // then
-        GridFSDBFile savedFile = gridFS.findOne(new BasicDBObject("_id", id));
-        InputStream inputStream = savedFile.getInputStream();
-
-        for (int idx = 0; idx < fileSize; ++idx) {
-            assertEquals((byte) (idx % 251), (byte) inputStream.read());
-        }
-
-        // finally
-        gridFS.remove(new BasicDBObject("_id", id));
-    }
-
-    void testInOut(final String s) throws Exception {
-
-        int[] start = getCurrentCollectionCounts();
-
-        GridFSInputFile in = gridFS.createFile(s.getBytes(defaultCharset()));
-        in.save();
-        GridFSDBFile out = gridFS.findOne(new BasicDBObject("_id", in.getId()));
-        assert (out.getId().equals(in.getId()));
-        assert (out.getChunkSize() == (long) GridFS.DEFAULT_CHUNKSIZE);
-
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        out.writeTo(bout);
-        String outString = new String(bout.toByteArray(), defaultCharset());
-        assert (outString.equals(s));
-
-        out.remove();
-        int[] end = getCurrentCollectionCounts();
-        assertEquals(start[0], end[0]);
-        assertEquals(start[1], end[1]);
-    }
-
-    int[] getCurrentCollectionCounts() {
-        int[] i = new int[2];
-        i[0] = gridFS.getFilesCollection().find().count();
-        i[1] = gridFS.getChunksCollection().find().count();
-        return i;
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testRemoveWhenObjectIdIsNull() {
-        ObjectId objectId = null;
-        gridFS.remove(objectId);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testRemoveWhenFileNameIsNull() {
-        String fileName = null;
-        gridFS.remove(fileName);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testRemoveWhenQueryIsNull() {
-        DBObject dbObjectQuery = null;
-        gridFS.remove(dbObjectQuery);
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/AggregateIterableSpecification.groovy b/driver/src/test/unit/com/mongodb/AggregateIterableSpecification.groovy
deleted file mode 100644
index 5f4b7b899e8..00000000000
--- a/driver/src/test/unit/com/mongodb/AggregateIterableSpecification.groovy
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.operation.AggregateOperation
-import com.mongodb.operation.AggregateToCollectionOperation
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.FindOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonString
-import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.codecs.configuration.CodecConfigurationException
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.secondary
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class AggregateIterableSpecification extends Specification {
-
-    def namespace = new MongoNamespace('db', 'coll')
-    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
-    def readPreference = secondary()
-    def readConcern = ReadConcern.DEFAULT
-
-    def 'should build the expected AggregationOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null, null, null, null]);
-        def pipeline = [new Document('$match', 1)]
-        def aggregationIterable = new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                                                            readConcern, executor, pipeline)
-
-        when: 'default input should be as expected'
-        aggregationIterable.iterator()
-
-        def operation = executor.getReadOperation() as AggregateOperation<Document>
-        def readPreference = executor.getReadPreference()
-
-        then:
-        expect operation, isTheSameAs(new AggregateOperation<Document>(namespace, [new BsonDocument('$match', new BsonInt32(1))],
-                new DocumentCodec()));
-        readPreference == secondary()
-
-        when: 'overriding initial options'
-        aggregationIterable.maxTime(999, MILLISECONDS).useCursor(true).iterator()
-
-        operation = executor.getReadOperation() as AggregateOperation<Document>
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(new AggregateOperation<Document>(namespace, [new BsonDocument('$match', new BsonInt32(1))],
-                new DocumentCodec())
-                .maxTime(999, MILLISECONDS)
-                .useCursor(true))
-
-    }
-
-    def 'should build the expected AggregateToCollectionOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null, null]);
-        def collectionName = 'collectionName'
-        def collectionNamespace = new MongoNamespace(namespace.getDatabaseName(), collectionName)
-        def pipeline = [new Document('$match', 1), new Document('$out', collectionName)]
-
-        when: 'aggregation includes $out'
-        new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
-                                  pipeline)
-                .batchSize(99)
-                .maxTime(999, MILLISECONDS)
-                .allowDiskUse(true)
-                .useCursor(true).iterator()
-
-        def operation = executor.getWriteOperation() as AggregateToCollectionOperation
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(new AggregateToCollectionOperation(namespace,
-                [new BsonDocument('$match', new BsonInt32(1)), new BsonDocument('$out', new BsonString(collectionName))])
-                .maxTime(999, MILLISECONDS)
-                .allowDiskUse(true))
-
-        when: 'the subsequent read should have the batchSize set'
-        operation = executor.getReadOperation() as FindOperation<Document>
-
-        then: 'should use the correct settings'
-        operation.getNamespace() == collectionNamespace
-        operation.getBatchSize() == 99
-    }
-
-    def 'should handle exceptions correctly'() {
-        given:
-        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
-        def executor = new TestOperationExecutor([new MongoException('failure')])
-        def pipeline = [new BsonDocument('$match', new BsonInt32(1))]
-        def aggregationIterable = new AggregateIterableImpl(namespace, BsonDocument, BsonDocument, codecRegistry,
-                                                            readPreference, readConcern, executor, pipeline)
-
-        when: 'The operation fails with an exception'
-        aggregationIterable.iterator()
-
-        then: 'the future should handle the exception'
-        thrown(MongoException)
-
-        when: 'a codec is missing'
-        new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
-                                  pipeline).iterator()
-
-        then:
-        thrown(CodecConfigurationException)
-    }
-
-    def 'should follow the MongoIterable interface as expected'() {
-        given:
-        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        def cursor = {
-            Stub(BatchCursor) {
-                def count = 0
-                def results;
-                def getResult = {
-                    count++
-                    results = count == 1 ? cannedResults : null
-                    results
-                }
-                next() >> {
-                    getResult()
-                }
-                hasNext() >> {
-                    count == 0
-                }
-
-            }
-        }
-        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new AggregateIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, executor, [new Document('$match', 1)])
-
-        when:
-        def results = mongoIterable.first()
-
-        then:
-        results == cannedResults[0]
-
-        when:
-        def count = 0
-        mongoIterable.forEach(new Block<Document>() {
-            @Override
-            void apply(Document document) {
-                count++
-            }
-        })
-
-        then:
-        count == 3
-
-        when:
-        def target = []
-        mongoIterable.into(target)
-
-        then:
-        target == cannedResults
-
-        when:
-        target = []
-        mongoIterable.map(new Function<Document, Integer>() {
-            @Override
-            Integer apply(Document document) {
-                document.getInteger('_id')
-            }
-        }).into(target)
-
-        then:
-        target == [1, 2, 3]
-    }
-
-}
diff --git a/driver/src/test/unit/com/mongodb/BasicDBObjectTest.java b/driver/src/test/unit/com/mongodb/BasicDBObjectTest.java
deleted file mode 100644
index 4e7d85399a9..00000000000
--- a/driver/src/test/unit/com/mongodb/BasicDBObjectTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.util.JSON;
-import org.bson.BasicBSONObject;
-import org.bson.json.JsonMode;
-import org.bson.json.JsonWriterSettings;
-import org.bson.types.ObjectId;
-import org.junit.Test;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-import static com.mongodb.MongoClient.getDefaultCodecRegistry;
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-public class BasicDBObjectTest {
-
-    @Test
-    public void testParse() {
-        BasicDBObject document = BasicDBObject.parse("{ 'int' : 1, 'string' : 'abc' }");
-        assertEquals(new BasicDBObject("int", 1).append("string", "abc"), document);
-
-        document = BasicDBObject.parse("{ 'int' : 1, 'string' : 'abc' }", getDefaultCodecRegistry().get(BasicDBObject.class));
-        assertEquals(new BasicDBObject("int", 1).append("string", "abc"), document);
-
-        document = BasicDBObject.parse("{_id : ObjectId('5524094c2cf8fb61dede210c')}");
-        assertEquals(new BasicDBObject("_id", new ObjectId("5524094c2cf8fb61dede210c")), document);
-    }
-
-    @Test
-    public void testToJson() {
-        BasicDBObject doc = new BasicDBObject("_id", new ObjectId("5522d5d12cf8fb556a991f45")).append("int", 1).append("string", "abc");
-
-        assertEquals("{ \"_id\" : { \"$oid\" : \"5522d5d12cf8fb556a991f45\" }, \"int\" : 1, \"string\" : \"abc\" }", doc.toJson());
-        assertEquals("{ \"_id\" : ObjectId(\"5522d5d12cf8fb556a991f45\"), \"int\" : 1, \"string\" : \"abc\" }",
-                     doc.toJson(new JsonWriterSettings(JsonMode.SHELL)));
-
-        assertEquals("{ \"_id\" : { \"$oid\" : \"5522d5d12cf8fb556a991f45\" }, \"int\" : 1, \"string\" : \"abc\" }",
-                     doc.toJson(getDefaultCodecRegistry().get(BasicDBObject.class)));
-
-        assertEquals("{ \"_id\" : ObjectId(\"5522d5d12cf8fb556a991f45\"), \"int\" : 1, \"string\" : \"abc\" }",
-                     doc.toJson(new JsonWriterSettings(JsonMode.SHELL), getDefaultCodecRegistry().get(BasicDBObject.class)));
-    }
-
-    @Test
-    public void testGetDate() {
-        final Date date = new Date();
-        BasicDBObject doc = new BasicDBObject("foo", date);
-        assertTrue(doc.getDate("foo").equals(date));
-    }
-
-    @Test
-    public void testGetDateWithDefault() {
-        final Date date = new Date();
-        BasicDBObject doc = new BasicDBObject("foo", date);
-        assertTrue(doc.getDate("foo", new Date()).equals(date));
-        assertTrue(doc.getDate("bar", date).equals(date));
-    }
-
-    @Test
-    public void testGetObjectId() {
-        final ObjectId objId = ObjectId.get();
-        BasicDBObject doc = new BasicDBObject("foo", objId);
-        assertTrue(doc.getObjectId("foo").equals(objId));
-    }
-
-    @Test
-    public void testGetObjectIdWithDefault() {
-        final ObjectId objId = ObjectId.get();
-        BasicDBObject doc = new BasicDBObject("foo", objId);
-        assertTrue(doc.getObjectId("foo", ObjectId.get()).equals(objId));
-        assertTrue(doc.getObjectId("bar", objId).equals(objId));
-    }
-
-    @Test
-    public void testGetLongWithDefault() {
-        final long test = 100;
-        BasicDBObject doc = new BasicDBObject("foo", test);
-        assertTrue(doc.getLong("foo", 0L) == test);
-        assertTrue(doc.getLong("bar", 0L) == 0L);
-    }
-
-    @Test
-    public void testGetDoubleWithDefault() {
-        BasicDBObject doc = new BasicDBObject("foo", Double.MAX_VALUE);
-        assertTrue(doc.getDouble("foo", (double) 0) == Double.MAX_VALUE);
-        assertTrue(doc.getDouble("bar", Double.MIN_VALUE) == Double.MIN_VALUE);
-    }
-
-    @Test
-    public void testGetStringWithDefault() {
-        BasicDBObject doc = new BasicDBObject("foo", "badmf");
-        assertTrue(doc.getString("foo", "ID").equals("badmf"));
-        assertTrue(doc.getString("bar", "DEFAULT").equals("DEFAULT"));
-    }
-
-    @Test
-    public void testBuilderIsEmpty() {
-        BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
-        assertTrue(b.isEmpty());
-        b.append("a", 1);
-        assertFalse(b.isEmpty());
-        assertEquals(b.get(), new BasicDBObject("a", 1));
-    }
-
-    @Test
-    public void testBuilderNested() {
-        BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
-        b.add("a", 1);
-        b.push("b").append("c", 2).pop();
-        DBObject a = b.get();
-        assertEquals(a, JSON.parse("{ 'a' : 1, 'b' : { 'c' : 2 } }"));
-    }
-
-    @Test
-    public void testDown1() {
-        BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
-        b.append("x", 1);
-        b.push("y");
-        b.append("a", 2);
-        b.pop();
-        b.push("z");
-        b.append("b", 3);
-
-        assertEquals(b.get(), JSON.parse("{ 'x' : 1 , 'y' : { 'a' : 2 } , 'z' : { 'b' : 3 } }"));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        assertEquality(new BasicDBObject(), new BasicDBObject());
-
-        assertEquality(new BasicDBObject("x", 1), new BasicDBObject("x", 1));
-
-        assertEquality(new BasicBSONObject("x", 1), new BasicDBObject("x", 1));
-
-        assertInequality(new BasicDBObject("x", 1), new BasicDBObject("x", 2));
-
-        assertInequality(new BasicDBObject("x", 1), new BasicDBObject("y", 1));
-
-        assertEquality(new BasicDBObject("x", asList(1, 2, 3)), new BasicDBObject("x", new int[]{1, 2, 3}));
-
-        BasicDBList list = new BasicDBList();
-        list.put(0, 1);
-        list.put(1, 2);
-        list.put(2, 3);
-
-        assertEquality(new BasicDBObject("x", asList(1, 2, 3)), new BasicDBObject("x", list));
-
-        assertEquality(new BasicDBObject("x", 1).append("y", 2), new BasicDBObject("y", 2).append("x", 1));
-
-        assertEquality(new BasicDBObject("a", new BasicDBObject("y", 2).append("x", 1)),
-                       new BasicDBObject("a", new BasicDBObject("x", 1).append("y", 2)));
-
-        assertEquality(new BasicDBObject("a", asList(new BasicDBObject("y", 2).append("x", 1))),
-                       new BasicDBObject("a", asList(new BasicDBObject("x", 1).append("y", 2))));
-
-        assertEquality(new BasicDBObject("a", new BasicDBList().put(1, new BasicDBObject("y", 2).append("x", 1))),
-                       new BasicDBObject("a", new BasicDBList().put(1, new BasicDBObject("x", 1).append("y", 2))));
-
-        Map<String, Object> first = new HashMap<String, Object>();
-        first.put("1", new BasicDBObject("y", 2).append("x", 1));
-        first.put("2", new BasicDBObject("a", 2).append("b", 1));
-        Map<String, Object> second = new TreeMap<String, Object>();
-        second.put("2", new BasicDBObject("b", 1).append("a", 2));
-        second.put("1", new BasicDBObject("x", 1).append("y", 2));
-
-        assertEquality(new BasicDBObject("a", first), new BasicDBObject("a", second));
-    }
-
-    void assertEquality(final BasicBSONObject x, final BasicBSONObject y) {
-        assertEquals(x, y);
-        assertEquals(y, x);
-        assertEquals(x.hashCode(), y.hashCode());
-    }
-
-    void assertInequality(final BasicBSONObject x, final BasicBSONObject y) {
-        assertThat(x, not(y));
-        assertThat(y, not(x));
-        assertThat(x.hashCode(), not(y.hashCode()));
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/DBCursorSpecification.groovy b/driver/src/test/unit/com/mongodb/DBCursorSpecification.groovy
deleted file mode 100644
index 2863fb43006..00000000000
--- a/driver/src/test/unit/com/mongodb/DBCursorSpecification.groovy
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.CountOperation
-import com.mongodb.operation.FindOperation
-import org.bson.BsonDocument
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.Fixture.getMongoClient
-import static spock.util.matcher.HamcrestSupport.expect
-
-
-class DBCursorSpecification extends Specification {
-
-    def 'should get and set read preference'() {
-        when:
-        def collection = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([])).getCollection('test')
-        collection.setReadPreference(ReadPreference.nearest())
-        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.nearest())
-
-        then:
-        cursor.readPreference == ReadPreference.nearest()
-
-        when:
-        cursor.setReadPreference(ReadPreference.secondary())
-
-        then:
-        cursor.readPreference == ReadPreference.secondary()
-
-        when:
-        cursor.setReadPreference(null)
-
-        then:
-        cursor.readPreference == ReadPreference.nearest()
-    }
-
-    def 'should get and set read concern'() {
-        when:
-        def collection = new DB(getMongoClient(), 'myDatabase', new TestOperationExecutor([])).getCollection('test')
-        collection.setReadConcern(ReadConcern.MAJORITY)
-        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-
-        then:
-        cursor.readConcern == ReadConcern.MAJORITY
-
-        when:
-        cursor.setReadConcern(ReadConcern.LOCAL)
-
-        then:
-        cursor.readConcern == ReadConcern.LOCAL
-
-        when:
-        cursor.setReadConcern(null)
-
-        then:
-        cursor.readConcern == ReadConcern.MAJORITY
-    }
-
-    def 'find should create the correct FindOperation'() {
-        given:
-        def dbObject = new BasicDBObject('_id', 1)
-        def executor = new TestOperationExecutor([Stub(BatchCursor) {
-            def count = 0
-            next() >> {
-                count++
-                [dbObject]
-            }
-            hasNext() >> {
-                count == 0
-            }
-            getServerCursor() >> {
-                null
-            }
-        }]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-        cursor.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def results = cursor.toArray()
-
-        then:
-        results == [dbObject]
-        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .filter(new BsonDocument())
-                                                                .projection(new BsonDocument())
-                                                                .modifiers(new BsonDocument()))
-    }
-
-    def 'one should create the correct FindOperation'() {
-        given:
-        def dbObject = new BasicDBObject('_id', 1)
-        def executor = new TestOperationExecutor([Stub(BatchCursor) {
-            def count = 0
-            next() >> {
-                count++
-                [dbObject]
-            }
-            hasNext() >> {
-                count == 0
-            }
-        }]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-        cursor.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def result = cursor.one()
-
-        then:
-        result == dbObject
-        expect executor.getReadOperation(), isTheSameAs(new FindOperation(collection.getNamespace(), collection.getObjectCodec())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .filter(new BsonDocument())
-                                                                .limit(-1)
-                                                                .projection(new BsonDocument()))
-    }
-
-    def 'count should create the correct CountOperation'() {
-        def executor = new TestOperationExecutor([42L]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-        cursor.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def result = cursor.count()
-
-        then:
-        result == 42
-        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .filter(new BsonDocument()))
-    }
-
-    def 'size should create the correct CountOperation'() {
-        def executor = new TestOperationExecutor([42L]);
-        def collection = new DB(getMongoClient(), 'myDatabase', executor).getCollection('test')
-        def cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-        cursor.setReadConcern(ReadConcern.MAJORITY)
-
-        when:
-        def result = cursor.size()
-
-        then:
-        result == 42
-        expect executor.getReadOperation(), isTheSameAs(new CountOperation(collection.getNamespace())
-                                                                .readConcern(ReadConcern.MAJORITY)
-                                                                .filter(new BsonDocument()))
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/DBObjectCodecSpecification.groovy b/driver/src/test/unit/com/mongodb/DBObjectCodecSpecification.groovy
deleted file mode 100644
index 7fa6fab96e4..00000000000
--- a/driver/src/test/unit/com/mongodb/DBObjectCodecSpecification.groovy
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *
- *  * Copyright (c) 2008-2014 MongoDB, Inc.
- *  *
- *  * Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  *   http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
- *
- */
-
-package com.mongodb
-
-import org.bson.BsonBinary
-import org.bson.BsonBinarySubType
-import org.bson.BsonDocument
-import org.bson.BsonDocumentReader
-import org.bson.BsonDocumentWriter
-import org.bson.BsonSymbol
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DecoderContext
-import org.bson.codecs.EncoderContext
-import org.bson.codecs.UuidCodec
-import org.bson.codecs.ValueCodecProvider
-import org.bson.types.Binary
-import org.bson.types.Symbol
-import spock.lang.Specification
-
-import java.sql.Timestamp
-
-import static org.bson.UuidRepresentation.STANDARD
-import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
-
-class DBObjectCodecSpecification extends Specification {
-
-    def bsonDoc = new BsonDocument()
-    def codecRegistry = fromProviders([new ValueCodecProvider(), new DBObjectCodecProvider(), new BsonValueCodecProvider()])
-    def dbObjectCodec = new DBObjectCodec(codecRegistry)
-
-    def 'should encode and decode UUID as Binary'() {
-        given:
-        def uuid = UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')
-        def doc = new BasicDBObject('uuid', uuid)
-
-        when:
-        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
-
-        then:
-        bsonDoc.getBinary('uuid') == new BsonBinary(BsonBinarySubType.UUID_LEGACY,
-                                                    [8, 7, 6, 5, 4, 3, 2, 1, 16, 15, 14, 13, 12, 11, 10, 9] as byte[])
-        when:
-        def decodedUuid = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
-
-        then:
-        decodedUuid.get('uuid') == uuid
-    }
-
-    def 'should encode and decode UUID as Binary with alternate UUID Codec'() {
-        given:
-        def codecWithAlternateUUIDCodec = new DBObjectCodec(fromRegistries(fromCodecs(new UuidCodec(STANDARD)), codecRegistry))
-        def uuid = UUID.fromString('01020304-0506-0708-090a-0b0c0d0e0f10')
-        def doc = new BasicDBObject('uuid', uuid)
-
-        when:
-        codecWithAlternateUUIDCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
-
-        then:
-        bsonDoc.getBinary('uuid') == new BsonBinary(BsonBinarySubType.UUID_STANDARD,
-                                                    [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as byte[])
-
-        when:
-        def decodedDoc = codecWithAlternateUUIDCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
-
-        then:
-        decodedDoc.get('uuid') == uuid
-    }
-
-    def 'should encode and decode byte array value as binary'() {
-        given:
-        def array = [0, 1, 2, 4, 4] as byte[]
-        def doc = new BasicDBObject('byteArray', array)
-
-        when:
-        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
-
-        then:
-        bsonDoc.getBinary('byteArray') == new BsonBinary(array)
-
-        when:
-        DBObject decodedUuid = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
-
-        then:
-        decodedUuid.get('byteArray') == array
-    }
-
-    def 'should encode and decode Binary value as binary'() {
-        given:
-        def subType = (byte) 42
-        def array = [0, 1, 2, 4, 4] as byte[]
-        def doc = new BasicDBObject('byteArray', new Binary(subType, array))
-
-        when:
-        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
-
-        then:
-        bsonDoc.getBinary('byteArray') == new BsonBinary(subType, array)
-
-        when:
-        DBObject decodedUuid = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
-
-        then:
-        decodedUuid.get('byteArray') == new Binary(subType, array)
-    }
-
-    def 'should encode Symbol to BsonSymbol and decode BsonSymbol to String'() {
-        given:
-        def symbol = new Symbol('symbol');
-        def doc = new BasicDBObject('symbol', symbol)
-
-        when:
-        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
-
-        then:
-        bsonDoc.get('symbol') == new BsonSymbol('symbol')
-
-        when:
-        def decodedSymbol = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
-
-        then:
-        decodedSymbol.get('symbol') == symbol.toString()
-    }
-
-    def 'should encode java.sql.Date as date'() {
-        given:
-        def sqlDate = new java.sql.Date(System.currentTimeMillis())
-        def doc = new BasicDBObject('d', sqlDate)
-
-        when:
-        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
-
-        then:
-        def decodededDoc = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
-
-        then:
-        ((Date) decodededDoc.get('d')).getTime() == sqlDate.getTime()
-    }
-
-    def 'should encode java.sql.Timestamp as date'() {
-        given:
-        def sqlTimestamp = new Timestamp(System.currentTimeMillis())
-        def doc = new BasicDBObject('d', sqlTimestamp)
-
-        when:
-        dbObjectCodec.encode(new BsonDocumentWriter(bsonDoc), doc, EncoderContext.builder().build())
-
-        then:
-        def decodededDoc = dbObjectCodec.decode(new BsonDocumentReader(bsonDoc), DecoderContext.builder().build())
-
-        then:
-        ((Date) decodededDoc.get('d')).getTime() == sqlTimestamp.getTime()
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/DBRefSpecification.groovy b/driver/src/test/unit/com/mongodb/DBRefSpecification.groovy
deleted file mode 100644
index 35ce8a6d659..00000000000
--- a/driver/src/test/unit/com/mongodb/DBRefSpecification.groovy
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import org.bson.BSONDecoder
-import org.bson.BasicBSONDecoder
-import org.bson.io.BasicOutputBuffer
-import org.bson.io.OutputBuffer
-import spock.lang.Specification
-
-class DBRefSpecification extends Specification {
-
-    def 'should set properties'() {
-        when:
-        DBRef referenceA = new DBRef('foo.bar', 5)
-        DBRef referenceB = new DBRef('mydb', 'foo.bar', 5)
-        DBRef referenceC = new DBRef(null, 'foo.bar', 5)
-
-        then:
-        referenceA.databaseName == null
-        referenceA.collectionName == 'foo.bar'
-        referenceA.id == 5
-        referenceB.databaseName == 'mydb'
-        referenceB.collectionName == 'foo.bar'
-        referenceB.id == 5
-        referenceC.databaseName == null
-        referenceC.collectionName == 'foo.bar'
-        referenceC.id == 5
-    }
-
-    def 'constructor should throw if collection name is null'() {
-        when:
-        new DBRef(null, 5)
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-    def 'constructor should throw if id is null'() {
-        when:
-        new DBRef('foo.bar', null)
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-    def 'equivalent instances should be equal and have the same hash code'() {
-        given:
-        DBRef referenceA = new DBRef('foo.bar', 4);
-        DBRef referenceB = new DBRef('foo.bar', 4);
-        DBRef referenceC = new DBRef('mydb', 'foo.bar', 4);
-        DBRef referenceD = new DBRef('mydb', 'foo.bar', 4);
-
-        expect:
-        referenceA.equals(referenceA)
-        referenceA.equals(referenceB)
-        referenceC.equals(referenceD)
-        referenceA.hashCode() == referenceB.hashCode()
-        referenceC.hashCode() == referenceD.hashCode()
-    }
-
-    def 'non-equivalent instances should not be equal and have different hash codes'() {
-        given:
-        DBRef referenceA = new DBRef('foo.bar', 4);
-        DBRef referenceB = new DBRef('foo.baz', 4);
-        DBRef referenceC = new DBRef('foo.bar', 5);
-        DBRef referenceD = new DBRef('mydb', 'foo.bar', 4);
-        DBRef referenceE = new DBRef('yourdb', 'foo.bar', 4);
-
-        expect:
-        !referenceA.equals(null)
-        !referenceA.equals('some other class instance')
-        !referenceA.equals(referenceB)
-        referenceA.hashCode() != referenceB.hashCode()
-        !referenceA.equals(referenceC)
-        referenceA.hashCode() != referenceC.hashCode()
-        !referenceA.equals(referenceD)
-        referenceA.hashCode() != referenceD.hashCode()
-        !referenceD.equals(referenceE)
-        referenceD.hashCode() != referenceE.hashCode()
-    }
-
-    def 'should stringify'() {
-        expect:
-        new DBRef('foo.bar', 4).toString() == '{ "$ref" : "foo.bar", "$id" : "4 }'
-        new DBRef('mydb', 'foo.bar', 4).toString() == '{ "$ref" : "foo.bar", "$id" : "4, "$db" : "mydb" }'
-    }
-
-    def 'should encode and decode DBRefs'() {
-        given:
-        DBRef reference = new DBRef('coll', 'hello world');
-        DBObject document = new BasicDBObject('!', reference);
-        OutputBuffer buffer = new BasicOutputBuffer();
-
-        when:
-        DefaultDBEncoder.FACTORY.create().writeObject(buffer, document);
-        DefaultDBCallback callback = new DefaultDBCallback(null);
-        BSONDecoder decoder = new BasicBSONDecoder();
-        decoder.decode(buffer.toByteArray(), callback);
-        DBRef decoded = ((DBObject) callback.get()).get('!');
-
-        then:
-        decoded.databaseName == null
-        decoded.collectionName == 'coll'
-        decoded.id == 'hello world'
-    }
-
-    def 'should encode and decode DBRefs with a database name'() {
-        given:
-        DBRef reference = new DBRef('db', 'coll', 'hello world');
-        DBObject document = new BasicDBObject('!', reference);
-        OutputBuffer buffer = new BasicOutputBuffer();
-
-        when:
-        DefaultDBEncoder.FACTORY.create().writeObject(buffer, document);
-        DefaultDBCallback callback = new DefaultDBCallback(null);
-        BSONDecoder decoder = new BasicBSONDecoder();
-        decoder.decode(buffer.toByteArray(), callback);
-        DBRef decoded = ((DBObject) callback.get()).get('!');
-
-        then:
-        decoded.databaseName == 'db'
-        decoded.collectionName == 'coll'
-        decoded.id == 'hello world'
-    }
-
-    def 'testSerialization'() throws Exception {
-        given:
-        DBRef originalDBRef = new DBRef('col', 42);
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ObjectOutputStream objectOutputStream = new ObjectOutputStream(outputStream);
-
-        when:
-        objectOutputStream.writeObject(originalDBRef);
-        ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(outputStream.toByteArray()));
-        DBRef deserializedDBRef = (DBRef) objectInputStream.readObject();
-
-        then:
-        originalDBRef == deserializedDBRef
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/DBSpecification.groovy b/driver/src/test/unit/com/mongodb/DBSpecification.groovy
deleted file mode 100644
index 1078b9f5ad7..00000000000
--- a/driver/src/test/unit/com/mongodb/DBSpecification.groovy
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2014-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.client.model.ValidationAction
-import com.mongodb.client.model.ValidationLevel
-import com.mongodb.operation.CreateCollectionOperation
-import org.bson.BsonDocument
-import org.bson.BsonDouble
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.Fixture.getMongoClient
-import static spock.util.matcher.HamcrestSupport.expect
-
-class DBSpecification extends Specification {
-
-    def 'should get and set read concern'() {
-        when:
-        def db = new DB(getMongoClient(), 'test', new TestOperationExecutor([]))
-
-        then:
-        db.readConcern == ReadConcern.DEFAULT
-
-        when:
-        db.setReadConcern(ReadConcern.MAJORITY)
-
-        then:
-        db.readConcern == ReadConcern.MAJORITY
-
-        when:
-        db.setReadConcern(null)
-
-        then:
-        db.readConcern == ReadConcern.DEFAULT
-    }
-
-    def 'should execute CreateCollectionOperation'() {
-        given:
-        def mongo = Stub(Mongo)
-        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
-        def executor = new TestOperationExecutor([1L, 2L, 3L])
-        def db = new DB(mongo, 'test', executor)
-
-        when:
-        db.createCollection('ctest', new BasicDBObject())
-
-        then:
-        def operation = executor.getWriteOperation() as CreateCollectionOperation
-        expect operation, isTheSameAs(new CreateCollectionOperation('test', 'ctest'))
-
-        when:
-        def options = new BasicDBObject()
-                .append('size', 100000)
-                .append('max', 2000)
-                .append('capped', true)
-                .append('autoIndexId', true)
-                .append('storageEngine', BasicDBObject.parse('{ wiredTiger: {}}'))
-                .append('indexOptionDefaults', BasicDBObject.parse('{storageEngine: { mmapv1: {}}}'))
-                .append('validator', BasicDBObject.parse('{level : { $gte: 10 } }'))
-                .append('validationLevel', ValidationLevel.MODERATE.getValue())
-                .append('validationAction', ValidationAction.WARN.getValue())
-
-        db.createCollection('ctest', options)
-        operation = executor.getWriteOperation() as CreateCollectionOperation
-
-        then:
-        expect operation, isTheSameAs(new CreateCollectionOperation('test', 'ctest')
-                                              .sizeInBytes(100000)
-                                              .maxDocuments(2000)
-                                              .capped(true)
-                                              .autoIndex(true)
-                                              .storageEngineOptions(BsonDocument.parse('{ wiredTiger: {}}'))
-                                              .indexOptionDefaults(BsonDocument.parse('{storageEngine: { mmapv1: {}}}'))
-                                              .validator(BsonDocument.parse('{level : { $gte: 10 } }'))
-                                              .validationLevel(ValidationLevel.MODERATE)
-                                              .validationAction(ValidationAction.WARN))
-    }
-
-
-    def 'should use provided read preference for obedient commands'() {
-        given:
-        def mongo = Stub(Mongo)
-        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
-        def executor = new TestOperationExecutor([new BsonDocument('ok', new BsonDouble(1.0))])
-        def database = new DB(mongo, 'test', executor)
-        database.setReadPreference(ReadPreference.secondary())
-
-        when:
-        database.command(cmd)
-
-        then:
-        executor.getReadPreference() == expectedReadPreference
-
-        where:
-        expectedReadPreference     | cmd
-        ReadPreference.secondary() | new BasicDBObject('listCollections', 1)
-        ReadPreference.secondary() | new BasicDBObject('collStats', 1)
-        ReadPreference.secondary() | new BasicDBObject('dbStats', 1)
-        ReadPreference.secondary() | new BasicDBObject('distinct', 1)
-        ReadPreference.secondary() | new BasicDBObject('geoNear', 1)
-        ReadPreference.secondary() | new BasicDBObject('geoSearch', 1)
-        ReadPreference.secondary() | new BasicDBObject('group', 1)
-        ReadPreference.secondary() | new BasicDBObject('listCollections', 1)
-        ReadPreference.secondary() | new BasicDBObject('listIndexes', 1)
-        ReadPreference.secondary() | new BasicDBObject('parallelCollectionScan', 1)
-        ReadPreference.secondary() | new BasicDBObject('text', 1)
-    }
-
-    def 'should use primary read preference for non obedient commands'() {
-        given:
-        def mongo = Stub(Mongo)
-        mongo.mongoClientOptions >> MongoClientOptions.builder().build()
-        def executor = new TestOperationExecutor([new BsonDocument('ok', new BsonDouble(1.0))])
-        def database = new DB(mongo, 'test', executor)
-        database.setReadPreference(ReadPreference.secondary())
-
-        when:
-        database.command(cmd)
-
-        then:
-        executor.getReadPreference() == expectedReadPreference
-
-        where:
-        expectedReadPreference      | cmd
-        ReadPreference.primary()    | new BasicDBObject('command', 1)
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/DistinctIterableSpecification.groovy b/driver/src/test/unit/com/mongodb/DistinctIterableSpecification.groovy
deleted file mode 100644
index 45ee9b1250c..00000000000
--- a/driver/src/test/unit/com/mongodb/DistinctIterableSpecification.groovy
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.DistinctOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.codecs.configuration.CodecConfigurationException
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.secondary
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class DistinctIterableSpecification extends Specification {
-
-    def namespace = new MongoNamespace('db', 'coll')
-    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
-    def readPreference = secondary()
-    def readConcern = ReadConcern.DEFAULT
-
-    def 'should build the expected DistinctOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def distinctIterable = new DistinctIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, 'field', new BsonDocument())
-
-        when: 'default input should be as expected'
-        distinctIterable.iterator()
-
-        def operation = executor.getReadOperation() as DistinctOperation<Document>
-        def readPreference = executor.getReadPreference()
-
-        then:
-        expect operation, isTheSameAs(new DistinctOperation<Document>(namespace, 'field', new DocumentCodec()).filter(new BsonDocument()));
-        readPreference == secondary()
-
-        when: 'overriding initial options'
-        distinctIterable.filter(new Document('field', 1)).maxTime(999, MILLISECONDS).batchSize(99).iterator()
-
-        operation = executor.getReadOperation() as DistinctOperation<Document>
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(new DistinctOperation<Document>(namespace, 'field', new DocumentCodec())
-                .filter(new BsonDocument('field', new BsonInt32(1)))
-                .maxTime(999, MILLISECONDS))
-    }
-
-    def 'should handle exceptions correctly'() {
-        given:
-        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
-        def executor = new TestOperationExecutor([new MongoException('failure')])
-        def distinctIterable = new DistinctIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference,
-                readConcern, executor, 'field', new BsonDocument())
-
-        when: 'The operation fails with an exception'
-        distinctIterable.iterator()
-
-        then: 'the future should handle the exception'
-        thrown(MongoException)
-
-        when: 'a codec is missing'
-        distinctIterable.filter(new Document('field', 1)).iterator()
-        then:
-        thrown(CodecConfigurationException)
-    }
-
-    def 'should follow the MongoIterable interface as expected'() {
-        given:
-        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        def cursor = {
-            Stub(BatchCursor) {
-                def count = 0
-                def results;
-                def getResult = {
-                    count++
-                    results = count == 1 ? cannedResults : null
-                    results
-                }
-                next() >> {
-                    getResult()
-                }
-                hasNext() >> {
-                    count == 0
-                }
-
-            }
-        }
-        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new DistinctIterableImpl(namespace, Document, Document, codecRegistry, readPreference, ReadConcern.LOCAL,
-                executor, 'field', new BsonDocument())
-
-        when:
-        def results = mongoIterable.first()
-
-        then:
-        results == cannedResults[0]
-
-        when:
-        def count = 0
-        mongoIterable.forEach(new Block<Document>() {
-            @Override
-            void apply(Document document) {
-                count++
-            }
-        })
-
-        then:
-        count == 3
-
-        when:
-        def target = []
-        mongoIterable.into(target)
-
-        then:
-        target == cannedResults
-
-        when:
-        target = []
-        mongoIterable.map(new Function<Document, Integer>() {
-            @Override
-            Integer apply(Document document) {
-                document.getInteger('_id')
-            }
-        }).into(target)
-
-        then:
-        target == [1, 2, 3]
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/FindIterableSpecification.groovy b/driver/src/test/unit/com/mongodb/FindIterableSpecification.groovy
deleted file mode 100644
index 7bc99c38eda..00000000000
--- a/driver/src/test/unit/com/mongodb/FindIterableSpecification.groovy
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.client.model.FindOptions
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.FindOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.secondary
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static java.util.concurrent.TimeUnit.SECONDS
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class FindIterableSpecification extends Specification {
-
-    def codecRegistry = fromProviders([new ValueCodecProvider(),  new DocumentCodecProvider(),
-                                       new DBObjectCodecProvider(), new BsonValueCodecProvider()])
-    def readPreference = secondary()
-    def readConcern = ReadConcern.DEFAULT
-    def namespace = new MongoNamespace('db', 'coll')
-
-    def 'should build the expected findOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def findOptions = new FindOptions().sort(new Document('sort', 1))
-                                           .modifiers(new Document('modifier', 1))
-                                           .projection(new Document('projection', 1))
-                                           .maxTime(10, SECONDS)
-                                           .maxAwaitTime(20, SECONDS)
-                                           .batchSize(100)
-                                           .limit(100)
-                                           .skip(10)
-                                           .cursorType(CursorType.NonTailable)
-                                           .oplogReplay(false)
-                                           .noCursorTimeout(false)
-                                           .partial(false)
-        def findIterable = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, new Document('filter', 1), findOptions)
-
-        when: 'default input should be as expected'
-        findIterable.iterator()
-
-        def operation = executor.getReadOperation() as FindOperation<Document>
-        def readPreference = executor.getReadPreference()
-
-        then:
-        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(1)))
-                .sort(new BsonDocument('sort', new BsonInt32(1)))
-                .modifiers(new BsonDocument('modifier', new BsonInt32(1)))
-                .projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(10000, MILLISECONDS)
-                .maxAwaitTime(20000, MILLISECONDS)
-                .batchSize(100)
-                .limit(100)
-                .skip(10)
-                .cursorType(CursorType.NonTailable)
-                .slaveOk(true)
-        )
-        readPreference == secondary()
-
-        when: 'overriding initial options'
-        findIterable.filter(new Document('filter', 2))
-                .sort(new Document('sort', 2))
-                .modifiers(new Document('modifier', 2))
-                .projection(new Document('projection', 2))
-                .maxTime(9, SECONDS)
-                .maxAwaitTime(18, SECONDS)
-                .batchSize(99)
-                .limit(99)
-                .skip(9)
-                .cursorType(CursorType.Tailable)
-                .oplogReplay(true)
-                .noCursorTimeout(true)
-                .partial(true)
-                .iterator()
-
-        operation = executor.getReadOperation() as FindOperation<Document>
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(2)))
-                .sort(new BsonDocument('sort', new BsonInt32(2)))
-                .modifiers(new BsonDocument('modifier', new BsonInt32(2)))
-                .projection(new BsonDocument('projection', new BsonInt32(2)))
-                .maxTime(9000, MILLISECONDS)
-                .maxAwaitTime(18000, MILLISECONDS)
-                .batchSize(99)
-                .limit(99)
-                .skip(9)
-                .cursorType(CursorType.Tailable)
-                .oplogReplay(true)
-                .noCursorTimeout(true)
-                .partial(true)
-                .slaveOk(true)
-        )
-    }
-
-    def 'should handle mixed types'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def findOptions = new FindOptions()
-        def findIterable = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, new Document('filter', 1), findOptions)
-
-        when:
-        findIterable.filter(new Document('filter', 1))
-                  .sort(new BsonDocument('sort', new BsonInt32(1)))
-                  .modifiers(new Document('modifier', 1))
-                  .iterator()
-
-        def operation = executor.getReadOperation() as FindOperation<Document>
-
-        then:
-        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(1)))
-                .sort(new BsonDocument('sort', new BsonInt32(1)))
-                .modifiers(new BsonDocument('modifier', new BsonInt32(1)))
-                .cursorType(CursorType.NonTailable)
-                .slaveOk(true)
-        )
-    }
-
-    def 'should follow the MongoIterable interface as expected'() {
-        given:
-        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        def cursor = {
-            Stub(BatchCursor) {
-                def count = 0
-                def results;
-                def getResult = {
-                    count++
-                    results = count == 1 ? cannedResults : null
-                    results
-                }
-                next() >> {
-                    getResult()
-                }
-                hasNext() >> {
-                    count == 0
-                }
-
-            }
-        }
-        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def findOptions = new FindOptions()
-        def mongoIterable = new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, new Document(), findOptions)
-
-        when:
-        def results = mongoIterable.first()
-
-        then:
-        results == cannedResults[0]
-
-        when:
-        def count = 0
-        mongoIterable.forEach(new Block<Document>() {
-            @Override
-            void apply(Document document) {
-                count++
-            }
-        })
-
-        then:
-        count == 3
-
-        when:
-        def target = []
-        mongoIterable.into(target)
-
-        then:
-        target == cannedResults
-
-        when:
-        target = []
-        mongoIterable.map(new Function<Document, Integer>() {
-            @Override
-            Integer apply(Document document) {
-                document.getInteger('_id')
-            }
-        }).into(target)
-
-        then:
-        target == [1, 2, 3]
-    }
-
-}
diff --git a/driver/src/test/unit/com/mongodb/ListCollectionsIterableSpecification.groovy b/driver/src/test/unit/com/mongodb/ListCollectionsIterableSpecification.groovy
deleted file mode 100644
index 8a7250b3b3c..00000000000
--- a/driver/src/test/unit/com/mongodb/ListCollectionsIterableSpecification.groovy
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.ListCollectionsOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.secondary
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class ListCollectionsIterableSpecification extends Specification {
-
-    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(),
-                                       new DBObjectCodecProvider(), new BsonValueCodecProvider()])
-    def readPreference = secondary()
-
-    def 'should build the expected listCollectionOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def listCollectionIterable = new ListCollectionsIterableImpl<Document>('db', Document, codecRegistry, readPreference, executor)
-                .filter(new Document('filter', 1))
-                .batchSize(100)
-                .maxTime(1000, MILLISECONDS)
-
-        when: 'default input should be as expected'
-        listCollectionIterable.iterator()
-
-        def operation = executor.getReadOperation() as ListCollectionsOperation<Document>
-        def readPreference = executor.getReadPreference()
-
-        then:
-        expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(1))).batchSize(100).maxTime(1000, MILLISECONDS))
-        readPreference == secondary()
-
-        when: 'overriding initial options'
-        listCollectionIterable.filter(new Document('filter', 2)).batchSize(99).maxTime(999, MILLISECONDS).iterator()
-
-        operation = executor.getReadOperation() as ListCollectionsOperation<Document>
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(new ListCollectionsOperation<Document>('db', new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(2))).batchSize(99).maxTime(999, MILLISECONDS))
-    }
-
-    def 'should follow the MongoIterable interface as expected'() {
-        given:
-        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        def cursor = {
-            Stub(BatchCursor) {
-                def count = 0
-                def results;
-                def getResult = {
-                    count++
-                    results = count == 1 ? cannedResults : null
-                    results
-                }
-                next() >> {
-                    getResult()
-                }
-                hasNext() >> {
-                    count == 0
-                }
-
-            }
-        }
-        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new ListCollectionsIterableImpl<Document>('db', Document, codecRegistry, readPreference, executor)
-
-        when:
-        def results = mongoIterable.first()
-
-        then:
-        results == cannedResults[0]
-
-        when:
-        def count = 0
-        mongoIterable.forEach(new Block<Document>() {
-            @Override
-            void apply(Document document) {
-                count++
-            }
-        })
-
-        then:
-        count == 3
-
-        when:
-        def target = []
-        mongoIterable.into(target)
-
-        then:
-        target == cannedResults
-
-        when:
-        target = []
-        mongoIterable.map(new Function<Document, Integer>() {
-            @Override
-            Integer apply(Document document) {
-                document.getInteger('_id')
-            }
-        }).into(target)
-
-        then:
-        target == [1, 2, 3]
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/ListIndexesIterableSpecification.groovy b/driver/src/test/unit/com/mongodb/ListIndexesIterableSpecification.groovy
deleted file mode 100644
index 3e8902790bb..00000000000
--- a/driver/src/test/unit/com/mongodb/ListIndexesIterableSpecification.groovy
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.ListIndexesOperation
-import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.secondary
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class ListIndexesIterableSpecification extends Specification {
-
-    def namespace = new MongoNamespace('db', 'coll')
-    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(),
-                                       new DBObjectCodecProvider(), new BsonValueCodecProvider()])
-    def readPreference = secondary()
-
-    def 'should build the expected listIndexesOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def listIndexesIterable = new ListIndexesIterableImpl<Document>(namespace, Document, codecRegistry, readPreference, executor)
-                .batchSize(100).maxTime(1000, MILLISECONDS)
-
-        when: 'default input should be as expected'
-        listIndexesIterable.iterator()
-
-        def operation = executor.getReadOperation() as ListIndexesOperation<Document>
-        def readPreference = executor.getReadPreference()
-
-        then:
-        expect operation, isTheSameAs(new ListIndexesOperation<Document>(namespace, new DocumentCodec())
-                .batchSize(100).maxTime(1000, MILLISECONDS))
-        readPreference == secondary()
-
-        when: 'overriding initial options'
-        listIndexesIterable.batchSize(99)
-                .maxTime(999, MILLISECONDS)
-                .iterator()
-
-        operation = executor.getReadOperation() as ListIndexesOperation<Document>
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(new ListIndexesOperation<Document>(namespace, new DocumentCodec())
-                .batchSize(99).maxTime(999, MILLISECONDS))
-    }
-
-
-    def 'should follow the MongoIterable interface as expected'() {
-        given:
-        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        def cursor = {
-            Stub(BatchCursor) {
-                def count = 0
-                def results;
-                def getResult = {
-                    count++
-                    results = count == 1 ? cannedResults : null
-                    results
-                }
-                next() >> {
-                    getResult()
-                }
-                hasNext() >> {
-                    count == 0
-                }
-
-            }
-        }
-        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new ListIndexesIterableImpl<Document>(namespace, Document, codecRegistry, readPreference, executor)
-
-        when:
-        def results = mongoIterable.first()
-
-        then:
-        results == cannedResults[0]
-
-        when:
-        def count = 0
-        mongoIterable.forEach(new Block<Document>() {
-            @Override
-            void apply(Document document) {
-                count++
-            }
-        })
-
-        then:
-        count == 3
-
-        when:
-        def target = []
-        mongoIterable.into(target)
-
-        then:
-        target == cannedResults
-
-        when:
-        target = []
-        mongoIterable.map(new Function<Document, Integer>() {
-            @Override
-            Integer apply(Document document) {
-                document.getInteger('_id')
-            }
-        }).into(target)
-
-        then:
-        target == [1, 2, 3]
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/MapReduceIterableSpecification.groovy b/driver/src/test/unit/com/mongodb/MapReduceIterableSpecification.groovy
deleted file mode 100644
index d3bf0c1bbca..00000000000
--- a/driver/src/test/unit/com/mongodb/MapReduceIterableSpecification.groovy
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.client.model.MapReduceAction
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.FindOperation
-import com.mongodb.operation.MapReduceToCollectionOperation
-import com.mongodb.operation.MapReduceWithInlineResultsOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.BsonJavaScript
-import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.codecs.configuration.CodecConfigurationException
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.secondary
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class MapReduceIterableSpecification extends Specification {
-
-    def namespace = new MongoNamespace('db', 'coll')
-    def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
-    def readPreference = secondary()
-    def readConcern = ReadConcern.DEFAULT
-
-    def 'should build the expected MapReduceWithInlineResultsOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-        def mapReduceIterable = new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, executor, 'map', 'reduce')
-
-        when: 'default input should be as expected'
-        mapReduceIterable.iterator()
-
-        def operation = executor.getReadOperation() as MapReduceWithInlineResultsOperation<Document>
-        def readPreference = executor.getReadPreference()
-
-        then:
-        expect operation, isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
-                new BsonJavaScript('reduce'), new DocumentCodec()).verbose(true));
-        readPreference == secondary()
-
-        when: 'overriding initial options'
-        mapReduceIterable.filter(new Document('filter', 1))
-                .finalizeFunction('finalize')
-                .limit(999)
-                .maxTime(999, MILLISECONDS)
-                .scope(new Document('scope', 1))
-                .sort(new Document('sort', 1))
-                .verbose(false)
-                .iterator()
-
-        operation = executor.getReadOperation() as MapReduceWithInlineResultsOperation<Document>
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(new MapReduceWithInlineResultsOperation<Document>(namespace, new BsonJavaScript('map'),
-                new BsonJavaScript('reduce'), new DocumentCodec())
-                .filter(new BsonDocument('filter', new BsonInt32(1)))
-                .finalizeFunction(new BsonJavaScript('finalize'))
-                .limit(999)
-                .maxTime(999, MILLISECONDS)
-                .scope(new BsonDocument('scope', new BsonInt32(1)))
-                .sort(new BsonDocument('sort', new BsonInt32(1)))
-                .verbose(false)
-        )
-    }
-
-    def 'should build the expected MapReduceToCollectionOperation'() {
-        given:
-        def executor = new TestOperationExecutor([null, null]);
-
-        when: 'mapReduce to a collection'
-        def collectionNamespace = new MongoNamespace('dbName', 'collName')
-        def mapReduceIterable = new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern,
-                executor, 'map', 'reduce')
-                .collectionName(collectionNamespace.getCollectionName())
-                .databaseName(collectionNamespace.getDatabaseName())
-                .filter(new Document('filter', 1))
-                .finalizeFunction('finalize')
-                .limit(999)
-                .maxTime(999, MILLISECONDS)
-                .scope(new Document('scope', 1))
-                .sort(new Document('sort', 1))
-                .verbose(false)
-                .batchSize(99)
-                .nonAtomic(true)
-                .action(MapReduceAction.MERGE)
-                .sharded(true)
-                .jsMode(true)
-                .bypassDocumentValidation(true)
-        mapReduceIterable.iterator()
-
-        def operation = executor.getWriteOperation() as MapReduceToCollectionOperation
-        def expectedOperation = new MapReduceToCollectionOperation(namespace, new BsonJavaScript('map'),
-                new BsonJavaScript('reduce'), 'collName')
-                .databaseName(collectionNamespace.getDatabaseName())
-                .filter(new BsonDocument('filter', new BsonInt32(1)))
-                .finalizeFunction(new BsonJavaScript('finalize'))
-                .limit(999)
-                .maxTime(999, MILLISECONDS)
-                .scope(new BsonDocument('scope', new BsonInt32(1)))
-                .sort(new BsonDocument('sort', new BsonInt32(1)))
-                .verbose(false)
-                .nonAtomic(true)
-                .action(MapReduceAction.MERGE.getValue())
-                .jsMode(true)
-                .sharded(true)
-                .bypassDocumentValidation(true)
-
-        then: 'should use the overrides'
-        expect operation, isTheSameAs(expectedOperation)
-
-        when: 'the subsequent read should have the batchSize set'
-        operation = executor.getReadOperation() as FindOperation<Document>
-
-        then: 'should use the correct settings'
-        operation.getNamespace() == collectionNamespace
-        operation.getBatchSize() == 99
-    }
-
-    def 'should handle exceptions correctly'() {
-        given:
-        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
-        def executor = new TestOperationExecutor([new MongoException('failure')])
-        def mapReduceIterable = new MapReduceIterableImpl(namespace, BsonDocument, BsonDocument, codecRegistry,
-                                                          readPreference, readConcern, executor, 'map', 'reduce')
-
-
-        when: 'The operation fails with an exception'
-        mapReduceIterable.iterator()
-
-        then: 'the future should handle the exception'
-        thrown(MongoException)
-
-        when: 'a codec is missing'
-        new MapReduceIterableImpl(namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
-                                  'map', 'reduce').iterator()
-
-        then:
-        thrown(CodecConfigurationException)
-    }
-
-
-    def 'should follow the MongoIterable interface as expected'() {
-        given:
-        def cannedResults = [new Document('_id', 1), new Document('_id', 2), new Document('_id', 3)]
-        def cursor = {
-            Stub(BatchCursor) {
-                def count = 0
-                def results;
-                def getResult = {
-                    count++
-                    results = count == 1 ? cannedResults : null
-                    results
-                }
-                next() >> {
-                    getResult()
-                }
-                hasNext() >> {
-                    count == 0
-                }
-
-            }
-        }
-        def executor = new TestOperationExecutor([cursor(), cursor(), cursor(), cursor()]);
-        def mongoIterable = new MapReduceIterableImpl(namespace, BsonDocument, BsonDocument, codecRegistry, readPreference,
-                readConcern, executor, 'map', 'reduce')
-
-        when:
-        def results = mongoIterable.first()
-
-        then:
-        results == cannedResults[0]
-
-        when:
-        def count = 0
-        mongoIterable.forEach(new Block<Document>() {
-            @Override
-            void apply(Document document) {
-                count++
-            }
-        })
-
-        then:
-        count == 3
-
-        when:
-        def target = []
-        mongoIterable.into(target)
-
-        then:
-        target == cannedResults
-
-        when:
-        target = []
-        mongoIterable.map(new Function<Document, Integer>() {
-            @Override
-            Integer apply(Document document) {
-                document.getInteger('_id')
-            }
-        }).into(target)
-
-        then:
-        target == [1, 2, 3]
-    }
-
-}
diff --git a/driver/src/test/unit/com/mongodb/MongoClientOptionsSpecification.groovy b/driver/src/test/unit/com/mongodb/MongoClientOptionsSpecification.groovy
deleted file mode 100644
index 71bd81202c9..00000000000
--- a/driver/src/test/unit/com/mongodb/MongoClientOptionsSpecification.groovy
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.connection.ConnectionPoolSettings
-import com.mongodb.connection.ServerSettings
-import com.mongodb.connection.SocketSettings
-import com.mongodb.connection.SslSettings
-import com.mongodb.event.ClusterListener
-import com.mongodb.event.CommandListener
-import com.mongodb.event.ServerListener
-import com.mongodb.event.ServerMonitorListener
-import spock.lang.IgnoreIf
-import spock.lang.Specification
-
-import javax.net.SocketFactory
-import javax.net.ssl.SSLSocketFactory
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static java.util.concurrent.TimeUnit.SECONDS
-import static spock.util.matcher.HamcrestSupport.expect
-
-class MongoClientOptionsSpecification extends Specification {
-
-    def 'should set the correct default values'() {
-        given:
-        def options = new MongoClientOptions.Builder().build()
-
-        expect:
-        options.getDescription() == null
-        options.getWriteConcern() == WriteConcern.ACKNOWLEDGED
-        options.getMinConnectionsPerHost() == 0
-        options.getConnectionsPerHost() == 100
-        options.getConnectTimeout() == 10000
-        options.getReadPreference() == ReadPreference.primary()
-        options.getThreadsAllowedToBlockForConnectionMultiplier() == 5
-        !options.isSocketKeepAlive()
-        !options.isSslEnabled()
-        !options.isSslInvalidHostNameAllowed()
-        options.getSocketFactory() != null
-        !(options.getSocketFactory() instanceof SSLSocketFactory)
-        options.getDbDecoderFactory() == DefaultDBDecoder.FACTORY
-        options.getDbEncoderFactory() == DefaultDBEncoder.FACTORY
-        options.getLocalThreshold() == 15
-        options.isCursorFinalizerEnabled()
-        options.getHeartbeatFrequency() == 10000
-        options.getMinHeartbeatFrequency() == 500
-        options.getServerSelectionTimeout() == 30000
-
-        options.getCommandListeners() == []
-        options.getClusterListeners() == []
-        options.getServerListeners() == []
-        options.getServerMonitorListeners() == []
-
-        options.connectionPoolSettings == ConnectionPoolSettings.builder().build()
-        options.socketSettings == SocketSettings.builder().build()
-        options.heartbeatSocketSettings == SocketSettings.builder().connectTimeout(20, SECONDS).readTimeout(20, SECONDS).build()
-        options.serverSettings == ServerSettings.builder().heartbeatFrequency(10000, MILLISECONDS)
-                                                .minHeartbeatFrequency(500, MILLISECONDS)
-                                                .build()
-        options.sslSettings == SslSettings.builder().build();
-    }
-
-    @SuppressWarnings('UnnecessaryObjectReferences')
-    def 'should handle illegal arguments'() {
-        given:
-        def builder = new MongoClientOptions.Builder()
-
-        when:
-        builder.localThreshold(-1)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.heartbeatFrequency(0)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.minHeartbeatFrequency(0)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.writeConcern(null)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.readPreference(null)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.connectionsPerHost(0)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.minConnectionsPerHost(-1)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.connectTimeout(-1)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.threadsAllowedToBlockForConnectionMultiplier(0)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.dbDecoderFactory(null)
-        then:
-        thrown(IllegalArgumentException)
-
-        when:
-        builder.dbEncoderFactory(null)
-        then:
-        thrown(IllegalArgumentException)
-
-    }
-
-    def 'should build with set options'() {
-        given:
-        def encoderFactory = new MyDBEncoderFactory()
-        def options = MongoClientOptions.builder()
-                                        .description('test')
-                                        .readPreference(ReadPreference.secondary())
-                                        .writeConcern(WriteConcern.JOURNALED)
-                                        .minConnectionsPerHost(30)
-                                        .connectionsPerHost(500)
-                                        .connectTimeout(100)
-                                        .socketTimeout(700)
-                                        .serverSelectionTimeout(150)
-                                        .maxWaitTime(200)
-                                        .maxConnectionIdleTime(300)
-                                        .maxConnectionLifeTime(400)
-                                        .threadsAllowedToBlockForConnectionMultiplier(2)
-                                        .socketKeepAlive(true)
-                                        .sslEnabled(true)
-                                        .sslInvalidHostNameAllowed(true)
-                                        .dbDecoderFactory(LazyDBDecoder.FACTORY)
-                                        .heartbeatFrequency(5)
-                                        .minHeartbeatFrequency(11)
-                                        .heartbeatConnectTimeout(15)
-                                        .heartbeatSocketTimeout(20)
-                                        .localThreshold(25)
-                                        .requiredReplicaSetName('test')
-                                        .cursorFinalizerEnabled(false)
-                                        .dbEncoderFactory(encoderFactory)
-                                        .build()
-
-        expect:
-        options.getDescription() == 'test'
-        options.getReadPreference() == ReadPreference.secondary()
-        options.getWriteConcern() == WriteConcern.JOURNALED
-        options.getServerSelectionTimeout() == 150
-        options.getMaxWaitTime() == 200
-        options.getMaxConnectionIdleTime() == 300
-        options.getMaxConnectionLifeTime() == 400
-        options.getMinConnectionsPerHost() == 30
-        options.getConnectionsPerHost() == 500
-        options.getConnectTimeout() == 100
-        options.getSocketTimeout() == 700
-        options.getThreadsAllowedToBlockForConnectionMultiplier() == 2
-        options.isSocketKeepAlive()
-        options.isSslEnabled()
-        options.isSslInvalidHostNameAllowed()
-        options.getDbDecoderFactory() == LazyDBDecoder.FACTORY
-        options.getDbEncoderFactory() == encoderFactory
-        options.getHeartbeatFrequency() == 5
-        options.getMinHeartbeatFrequency() == 11
-        options.getHeartbeatConnectTimeout() == 15
-        options.getHeartbeatSocketTimeout() == 20
-        options.getLocalThreshold() == 25
-        options.getRequiredReplicaSetName() == 'test'
-        !options.isCursorFinalizerEnabled()
-        options.getServerSettings().getHeartbeatFrequency(MILLISECONDS) == 5
-        options.getServerSettings().getMinHeartbeatFrequency(MILLISECONDS) == 11
-
-        options.connectionPoolSettings == ConnectionPoolSettings.builder().maxSize(500).minSize(30).maxWaitQueueSize(1000)
-                                                                .maxWaitTime(200, MILLISECONDS).maxConnectionLifeTime(400, MILLISECONDS)
-                                                                .maxConnectionIdleTime(300, MILLISECONDS).build()
-        options.socketSettings == SocketSettings.builder().connectTimeout(100, MILLISECONDS).readTimeout(700, MILLISECONDS)
-                                                .keepAlive(true).build()
-        options.heartbeatSocketSettings == SocketSettings.builder().connectTimeout(15, MILLISECONDS).readTimeout(20, MILLISECONDS)
-                                                         .keepAlive(true).build()
-        options.serverSettings == ServerSettings.builder().minHeartbeatFrequency(11, MILLISECONDS).heartbeatFrequency(5, MILLISECONDS)
-                                                .build()
-        options.sslSettings == SslSettings.builder().enabled(true).invalidHostNameAllowed(true).build()
-    }
-
-    @IgnoreIf({ System.getProperty('java.version').startsWith('1.6.') })
-    def 'should set sslEnabled based on socketFactory'() {
-        given:
-        MongoClientOptions.Builder builder = MongoClientOptions.builder()
-        SocketFactory socketFactory = SSLSocketFactory.getDefault()
-
-        when:
-        builder.socketFactory(socketFactory)
-        then:
-        builder.build().getSocketFactory() == socketFactory
-        builder.sslEnabled(false)
-        builder.build().getSocketFactory() != null
-        !(builder.build().getSocketFactory() instanceof SSLSocketFactory)
-
-        when:
-        builder.sslEnabled(true)
-        then:
-        builder.build().getSocketFactory() instanceof SSLSocketFactory
-    }
-
-    def 'should be easy to create new options from existing'() {
-        when:
-        def options = MongoClientOptions.builder()
-                .description('test')
-                .readPreference(ReadPreference.secondary())
-                .writeConcern(WriteConcern.JOURNALED)
-                .minConnectionsPerHost(30)
-                .connectionsPerHost(500)
-                .connectTimeout(100)
-                .socketTimeout(700)
-                .serverSelectionTimeout(150)
-                .maxWaitTime(200)
-                .maxConnectionIdleTime(300)
-                .maxConnectionLifeTime(400)
-                .threadsAllowedToBlockForConnectionMultiplier(2)
-                .socketKeepAlive(true)
-                .sslEnabled(true)
-                .sslInvalidHostNameAllowed(true)
-                .dbDecoderFactory(LazyDBDecoder.FACTORY)
-                .heartbeatFrequency(5)
-                .minHeartbeatFrequency(11)
-                .heartbeatConnectTimeout(15)
-                .heartbeatSocketTimeout(20)
-                .localThreshold(25)
-                .requiredReplicaSetName('test')
-                .cursorFinalizerEnabled(false)
-                .dbEncoderFactory(new MyDBEncoderFactory())
-                .addCommandListener(Mock(CommandListener))
-                .addClusterListener(Mock(ClusterListener))
-                .addServerListener(Mock(ServerListener))
-                .addServerMonitorListener(Mock(ServerMonitorListener))
-                .build()
-
-        then:
-        expect options, isTheSameAs(MongoClientOptions.builder(options).build())
-    }
-
-    def 'should throw MongoInternalException mentioning MongoClientOptions if sslEnabled is true and sslInvalidHostNameAllowed is false'() {
-        given:
-        String javaVersion = System.getProperty('java.version')
-        when:
-
-        System.setProperty('java.version', '1.6.0_45')
-        MongoClientOptions.builder().sslEnabled(true).build()
-
-        then:
-        def e = thrown(MongoInternalException)
-        e.message.contains('MongoClientOptions.sslInvalidHostNameAllowed')
-
-        cleanup:
-        System.setProperty('java.version', javaVersion)
-    }
-
-    def 'should add command listeners'() {
-        given:
-        CommandListener commandListenerOne = Mock(CommandListener)
-        CommandListener commandListenerTwo = Mock(CommandListener)
-        CommandListener commandListenerThree = Mock(CommandListener)
-
-        when:
-        def options = MongoClientOptions.builder()
-                                        .build()
-
-        then:
-        options.commandListeners.size() == 0
-
-        when:
-        options = MongoClientOptions.builder()
-                                    .addCommandListener(commandListenerOne)
-                                    .build()
-
-        then:
-        options.commandListeners.size() == 1
-        options.commandListeners[0].is commandListenerOne
-
-        when:
-        options = MongoClientOptions.builder()
-                                    .addCommandListener(commandListenerOne)
-                                    .addCommandListener(commandListenerTwo)
-                                    .build()
-
-        then:
-        options.commandListeners.size() == 2
-        options.commandListeners[0].is commandListenerOne
-        options.commandListeners[1].is commandListenerTwo
-
-        when:
-        def copiedOptions = MongoClientOptions.builder(options).addCommandListener(commandListenerThree).build()
-
-        then:
-        copiedOptions.commandListeners.size() == 3
-        copiedOptions.commandListeners[0].is commandListenerOne
-        copiedOptions.commandListeners[1].is commandListenerTwo
-        copiedOptions.commandListeners[2].is commandListenerThree
-        options.commandListeners.size() == 2
-        options.commandListeners[0].is commandListenerOne
-        options.commandListeners[1].is commandListenerTwo
-    }
-
-    def 'should add cluster listeners'() {
-        given:
-        ClusterListener clusterListenerOne = Mock(ClusterListener)
-        ClusterListener clusterListenerTwo = Mock(ClusterListener)
-        ClusterListener clusterListenerThree = Mock(ClusterListener)
-
-        when:
-        def options = MongoClientOptions.builder()
-                .build()
-
-        then:
-        options.clusterListeners.size() == 0
-
-        when:
-        options = MongoClientOptions.builder()
-                .addClusterListener(clusterListenerOne)
-                .build()
-
-        then:
-        options.clusterListeners.size() == 1
-        options.clusterListeners[0].is clusterListenerOne
-
-        when:
-        options = MongoClientOptions.builder()
-                .addClusterListener(clusterListenerOne)
-                .addClusterListener(clusterListenerTwo)
-                .build()
-
-        then:
-        options.clusterListeners.size() == 2
-        options.clusterListeners[0].is clusterListenerOne
-        options.clusterListeners[1].is clusterListenerTwo
-
-        when:
-        def copiedOptions = MongoClientOptions.builder(options).addClusterListener(clusterListenerThree).build()
-
-        then:
-        copiedOptions.clusterListeners.size() == 3
-        copiedOptions.clusterListeners[0].is clusterListenerOne
-        copiedOptions.clusterListeners[1].is clusterListenerTwo
-        copiedOptions.clusterListeners[2].is clusterListenerThree
-        options.clusterListeners.size() == 2
-        options.clusterListeners[0].is clusterListenerOne
-        options.clusterListeners[1].is clusterListenerTwo
-    }
-
-    def 'should add server listeners'() {
-        given:
-        ServerListener serverListenerOne = Mock(ServerListener)
-        ServerListener serverListenerTwo = Mock(ServerListener)
-        ServerListener serverListenerThree = Mock(ServerListener)
-
-        when:
-        def options = MongoClientOptions.builder()
-                .build()
-
-        then:
-        options.serverListeners.size() == 0
-
-        when:
-        options = MongoClientOptions.builder()
-                .addServerListener(serverListenerOne)
-                .build()
-
-        then:
-        options.serverListeners.size() == 1
-        options.serverListeners[0].is serverListenerOne
-
-        when:
-        options = MongoClientOptions.builder()
-                .addServerListener(serverListenerOne)
-                .addServerListener(serverListenerTwo)
-                .build()
-
-        then:
-        options.serverListeners.size() == 2
-        options.serverListeners[0].is serverListenerOne
-        options.serverListeners[1].is serverListenerTwo
-
-        when:
-        def copiedOptions = MongoClientOptions.builder(options).addServerListener(serverListenerThree).build()
-
-        then:
-        copiedOptions.serverListeners.size() == 3
-        copiedOptions.serverListeners[0].is serverListenerOne
-        copiedOptions.serverListeners[1].is serverListenerTwo
-        copiedOptions.serverListeners[2].is serverListenerThree
-        options.serverListeners.size() == 2
-        options.serverListeners[0].is serverListenerOne
-        options.serverListeners[1].is serverListenerTwo
-    }
-
-    def 'should add server monitor listeners'() {
-        given:
-        ServerMonitorListener serverMonitorListenerOne = Mock(ServerMonitorListener)
-        ServerMonitorListener serverMonitorListenerTwo = Mock(ServerMonitorListener)
-        ServerMonitorListener serverMonitorListenerThree = Mock(ServerMonitorListener)
-
-        when:
-        def options = MongoClientOptions.builder()
-                .build()
-
-        then:
-        options.serverMonitorListeners.size() == 0
-
-        when:
-        options = MongoClientOptions.builder()
-                .addServerMonitorListener(serverMonitorListenerOne)
-                .build()
-
-        then:
-        options.serverMonitorListeners.size() == 1
-        options.serverMonitorListeners[0].is serverMonitorListenerOne
-
-        when:
-        options = MongoClientOptions.builder()
-                .addServerMonitorListener(serverMonitorListenerOne)
-                .addServerMonitorListener(serverMonitorListenerTwo)
-                .build()
-
-        then:
-        options.serverMonitorListeners.size() == 2
-        options.serverMonitorListeners[0].is serverMonitorListenerOne
-        options.serverMonitorListeners[1].is serverMonitorListenerTwo
-
-        when:
-        def copiedOptions = MongoClientOptions.builder(options).addServerMonitorListener(serverMonitorListenerThree).build()
-
-        then:
-        copiedOptions.serverMonitorListeners.size() == 3
-        copiedOptions.serverMonitorListeners[0].is serverMonitorListenerOne
-        copiedOptions.serverMonitorListeners[1].is serverMonitorListenerTwo
-        copiedOptions.serverMonitorListeners[2].is serverMonitorListenerThree
-        options.serverMonitorListeners.size() == 2
-        options.serverMonitorListeners[0].is serverMonitorListenerOne
-        options.serverMonitorListeners[1].is serverMonitorListenerTwo
-    }
-
-    def 'builder should copy all values from the existing MongoClientOptions'() {
-        given:
-        def options = Mock(MongoClientOptions)
-
-
-        when:
-        MongoClientOptions.builder(options)
-
-        then:
-        1 * options.isAlwaysUseMBeans()
-        1 * options.getCodecRegistry()
-        1 * options.getConnectionsPerHost()
-        1 * options.getConnectTimeout()
-        1 * options.isCursorFinalizerEnabled()
-        1 * options.getDbDecoderFactory()
-        1 * options.getDbEncoderFactory()
-        1 * options.getDescription()
-        1 * options.getHeartbeatConnectTimeout()
-        1 * options.getHeartbeatFrequency()
-        1 * options.getHeartbeatSocketTimeout()
-        1 * options.getLocalThreshold()
-        1 * options.getMaxConnectionIdleTime()
-        1 * options.getMaxConnectionLifeTime()
-        1 * options.getMaxWaitTime()
-        1 * options.getMinConnectionsPerHost()
-        1 * options.getMinHeartbeatFrequency()
-        1 * options.getReadPreference()
-        1 * options.getRequiredReplicaSetName()
-        1 * options.getServerSelectionTimeout()
-        1 * options.getSocketFactory()
-        1 * options.isSocketKeepAlive()
-        1 * options.getSocketTimeout()
-        1 * options.isSslEnabled()
-        1 * options.isSslInvalidHostNameAllowed()
-        1 * options.getThreadsAllowedToBlockForConnectionMultiplier()
-        1 * options.getWriteConcern()
-        1 * options.getReadConcern()
-        1 * options.getCommandListeners() >> Collections.unmodifiableList(Collections.emptyList())
-        1 * options.getClusterListeners() >> Collections.unmodifiableList(Collections.emptyList())
-        1 * options.getServerListeners() >> Collections.unmodifiableList(Collections.emptyList())
-        1 * options.getServerMonitorListeners() >> Collections.unmodifiableList(Collections.emptyList())
-
-        0 * options._ // Ensure no other interactions
-    }
-
-    def 'should only have the following fields in the builder'() {
-        when:
-        // A regression test so that if any more methods are added then the builder(final MongoClientOptions options) should be updated
-        def actual = MongoClientOptions.Builder.declaredFields.grep {  !it.synthetic } *.name.sort()
-        def expected = ['alwaysUseMBeans', 'clusterListeners', 'codecRegistry', 'commandListeners', 'connectTimeout',
-                        'cursorFinalizerEnabled', 'dbDecoderFactory', 'dbEncoderFactory', 'description', 'heartbeatConnectTimeout',
-                        'heartbeatFrequency', 'heartbeatSocketTimeout', 'localThreshold', 'maxConnectionIdleTime', 'maxConnectionLifeTime',
-                        'maxConnectionsPerHost', 'maxWaitTime', 'minConnectionsPerHost', 'minHeartbeatFrequency', 'readConcern',
-                        'readPreference', 'requiredReplicaSetName', 'serverListeners', 'serverMonitorListeners', 'serverSelectionTimeout',
-                        'socketFactory', 'socketKeepAlive', 'socketTimeout', 'sslEnabled', 'sslInvalidHostNameAllowed',
-                        'threadsAllowedToBlockForConnectionMultiplier', 'writeConcern']
-
-        then:
-        actual == expected
-    }
-
-    private static class MyDBEncoderFactory implements DBEncoderFactory {
-        @Override
-        DBEncoder create() {
-            new DefaultDBEncoder()
-        }
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/MongoClientSpecification.groovy b/driver/src/test/unit/com/mongodb/MongoClientSpecification.groovy
deleted file mode 100644
index 0e35878ab16..00000000000
--- a/driver/src/test/unit/com/mongodb/MongoClientSpecification.groovy
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.client.model.geojson.MultiPolygon
-import org.bson.BsonDocument
-import org.bson.Document
-import spock.lang.Specification
-
-class MongoClientSpecification extends Specification {
-
-    def 'default codec registry should contain all supported providers'() {
-        given:
-        def codecRegistry = MongoClient.getDefaultCodecRegistry()
-
-        expect:
-        codecRegistry.get(BsonDocument)
-        codecRegistry.get(BasicDBObject)
-        codecRegistry.get(Document)
-        codecRegistry.get(Integer)
-        codecRegistry.get(MultiPolygon)
-        codecRegistry.get(Iterable)
-    }
-}
\ No newline at end of file
diff --git a/driver/src/test/unit/com/mongodb/MongoCollectionSpecification.groovy b/driver/src/test/unit/com/mongodb/MongoCollectionSpecification.groovy
deleted file mode 100644
index e612eb22298..00000000000
--- a/driver/src/test/unit/com/mongodb/MongoCollectionSpecification.groovy
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
- * Copyright (c) 2008-2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.bulk.DeleteRequest
-import com.mongodb.bulk.IndexRequest
-import com.mongodb.bulk.InsertRequest
-import com.mongodb.bulk.UpdateRequest
-import com.mongodb.client.model.BulkWriteOptions
-import com.mongodb.client.model.CountOptions
-import com.mongodb.client.model.DeleteManyModel
-import com.mongodb.client.model.DeleteOneModel
-import com.mongodb.client.model.FindOneAndDeleteOptions
-import com.mongodb.client.model.FindOneAndReplaceOptions
-import com.mongodb.client.model.FindOneAndUpdateOptions
-import com.mongodb.client.model.FindOptions
-import com.mongodb.client.model.IndexModel
-import com.mongodb.client.model.IndexOptions
-import com.mongodb.client.model.InsertManyOptions
-import com.mongodb.client.model.InsertOneModel
-import com.mongodb.client.model.InsertOneOptions
-import com.mongodb.client.model.ReplaceOneModel
-import com.mongodb.client.model.UpdateManyModel
-import com.mongodb.client.model.UpdateOneModel
-import com.mongodb.client.model.UpdateOptions
-import com.mongodb.client.result.DeleteResult
-import com.mongodb.client.result.UpdateResult
-import com.mongodb.client.test.Worker
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.CountOperation
-import com.mongodb.operation.CreateIndexesOperation
-import com.mongodb.operation.DropCollectionOperation
-import com.mongodb.operation.DropIndexOperation
-import com.mongodb.operation.FindAndDeleteOperation
-import com.mongodb.operation.FindAndReplaceOperation
-import com.mongodb.operation.FindAndUpdateOperation
-import com.mongodb.operation.ListIndexesOperation
-import com.mongodb.operation.MixedBulkWriteOperation
-import com.mongodb.operation.RenameCollectionOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.Document
-import org.bson.codecs.BsonDocumentCodec
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodec
-import org.bson.codecs.ValueCodecProvider
-import org.bson.codecs.configuration.CodecConfigurationException
-import org.bson.codecs.configuration.CodecRegistry
-import spock.lang.Specification
-
-import java.util.concurrent.TimeUnit
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.primary
-import static com.mongodb.ReadPreference.secondary
-import static com.mongodb.bulk.BulkWriteResult.acknowledged
-import static com.mongodb.bulk.BulkWriteResult.unacknowledged
-import static com.mongodb.bulk.WriteRequest.Type.DELETE
-import static com.mongodb.bulk.WriteRequest.Type.INSERT
-import static com.mongodb.bulk.WriteRequest.Type.REPLACE
-import static com.mongodb.bulk.WriteRequest.Type.UPDATE
-import static java.util.concurrent.TimeUnit.MILLISECONDS
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class MongoCollectionSpecification extends Specification {
-
-    def namespace = new MongoNamespace('databaseName', 'collectionName')
-    def codecRegistry = MongoClient.getDefaultCodecRegistry()
-    def readPreference = secondary()
-    def writeConcern = WriteConcern.ACKNOWLEDGED
-    def readConcern = ReadConcern.DEFAULT
-
-    def 'should return the correct name from getName'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
-                readConcern, new TestOperationExecutor([null]))
-
-        expect:
-        collection.getNamespace() == namespace
-    }
-
-    def 'should behave correctly when using withDefaultClass'() {
-        given:
-        def newClass = Worker
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withDocumentClass(newClass)
-
-        then:
-        collection.getDocumentClass() == newClass
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, newClass, codecRegistry, readPreference, writeConcern,
-                readConcern, executor))
-    }
-
-    def 'should behave correctly when using withCodecRegistry'() {
-        given:
-        def newCodecRegistry = Stub(CodecRegistry)
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
-                readConcern, executor).withCodecRegistry(newCodecRegistry)
-
-        then:
-        collection.getCodecRegistry() == newCodecRegistry
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, newCodecRegistry, readPreference, writeConcern,
-                readConcern, executor))
-    }
-
-    def 'should behave correctly when using withReadPreference'() {
-        given:
-        def newReadPreference = primary()
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
-                readConcern, executor).withReadPreference(newReadPreference)
-
-        then:
-        collection.getReadPreference() == newReadPreference
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, newReadPreference, writeConcern,
-                readConcern, executor))
-    }
-
-    def 'should behave correctly when using withWriteConcern'() {
-        given:
-        def newWriteConcern = WriteConcern.MAJORITY
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
-                readConcern, executor).withWriteConcern(newWriteConcern)
-
-        then:
-        collection.getWriteConcern() == newWriteConcern
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, newWriteConcern,
-                readConcern, executor))
-    }
-
-    def 'should behave correctly when using withReadConcern'() {
-        given:
-        def newWReadConcern = ReadConcern.MAJORITY
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
-                readConcern, executor).withReadConcern(newWReadConcern)
-
-        then:
-        collection.getReadConcern() == newWReadConcern
-        expect collection, isTheSameAs(new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern,
-                newWReadConcern, executor))
-    }
-
-    def 'should use CountOperation correctly'() {
-        given:
-        def executor = new TestOperationExecutor([1L, 2L, 3L])
-        def filter = new BsonDocument()
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new CountOperation(namespace).filter(filter)
-
-        when:
-        collection.count()
-        def operation = executor.getReadOperation() as CountOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-
-        when:
-        filter = new BsonDocument('a', new BsonInt32(1))
-        collection.count(filter)
-        operation = executor.getReadOperation() as CountOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.filter(filter))
-
-        when:
-        def hint = new BsonDocument('hint', new BsonInt32(1))
-        collection.count(filter, new CountOptions().hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS))
-        operation = executor.getReadOperation() as CountOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.filter(filter).hint(hint).skip(10).limit(100).maxTime(100, MILLISECONDS))
-    }
-
-    def 'should create DistinctIterable correctly'() {
-        given:
-        def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def filter = new Document('a', 1)
-
-        when:
-        def distinctIterable = collection.distinct('field', String)
-
-        then:
-        expect distinctIterable, isTheSameAs(new DistinctIterableImpl(namespace, Document, String, codecRegistry, readPreference,
-                readConcern, executor, 'field', new BsonDocument()))
-
-        when:
-        distinctIterable = collection.distinct('field', String).filter(filter)
-
-        then:
-        expect distinctIterable, isTheSameAs(new DistinctIterableImpl(namespace, Document, String, codecRegistry, readPreference,
-                readConcern, executor, 'field', filter))
-
-        when:
-        distinctIterable = collection.distinct('field', filter, String).maxTime(100, MILLISECONDS)
-
-        then:
-        expect distinctIterable, isTheSameAs(new DistinctIterableImpl(namespace, Document, String, codecRegistry, readPreference,
-                readConcern, executor, 'field', filter).maxTime(100, MILLISECONDS))
-    }
-
-    def 'should create FindIterable correctly'() {
-        given:
-        def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def findIterable = collection.find()
-
-        then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, executor, new BsonDocument(), new FindOptions()))
-
-        when:
-        findIterable = collection.find(BsonDocument)
-
-        then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference,
-                readConcern, executor, new BsonDocument(), new FindOptions()))
-
-        when:
-        findIterable = collection.find(new Document())
-
-        then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, Document, codecRegistry, readPreference,
-                readConcern, executor, new Document(), new FindOptions()))
-
-        when:
-        findIterable = collection.find(new Document(), BsonDocument)
-
-        then:
-        expect findIterable, isTheSameAs(new FindIterableImpl(namespace, Document, BsonDocument, codecRegistry, readPreference,
-                readConcern, executor, new Document(), new FindOptions()))
-    }
-
-    def 'should create AggregateIterable correctly'() {
-        given:
-        def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def aggregateIterable = collection.aggregate([new Document('$match', 1)])
-
-        then:
-        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(namespace, Document, Document, codecRegistry,
-                readPreference, readConcern, executor, [new Document('$match', 1)]))
-
-        when:
-        aggregateIterable = collection.aggregate([new Document('$match', 1)], BsonDocument)
-
-        then:
-        expect aggregateIterable, isTheSameAs(new AggregateIterableImpl(namespace, Document, BsonDocument, codecRegistry,
-                readPreference, readConcern, executor, [new Document('$match', 1)]))
-    }
-
-    def 'should create MapReduceIterable correctly'() {
-        given:
-        def executor = new TestOperationExecutor([])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def mapReduceIterable = collection.mapReduce('map', 'reduce')
-
-        then:
-        expect mapReduceIterable, isTheSameAs(new MapReduceIterableImpl(namespace, Document, Document, codecRegistry,
-                readPreference, readConcern, executor, 'map', 'reduce'))
-    }
-
-    def 'bulkWrite should use MixedBulkWriteOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation ->
-            new MixedBulkWriteOperation(namespace, [
-                    new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                    new UpdateRequest(new BsonDocument('a', new BsonInt32(2)),
-                            new BsonDocument('a', new BsonInt32(200)), REPLACE).multi(false).upsert(true),
-                    new UpdateRequest(new BsonDocument('a', new BsonInt32(3)),
-                            new BsonDocument('$set', new BsonDocument('a', new BsonInt32(300))), UPDATE).multi(false).upsert(true),
-                    new UpdateRequest(new BsonDocument('a', new BsonInt32(4)),
-                            new BsonDocument('$set', new BsonDocument('a', new BsonInt32(400))), UPDATE).multi(true).upsert(true),
-                    new DeleteRequest(new BsonDocument('a', new BsonInt32(5))).multi(false),
-                    new DeleteRequest(new BsonDocument('a', new BsonInt32(6))).multi(true)
-            ], ordered, wc).bypassDocumentValidation(bypassDocumentValidation)
-        }
-        def updateOptions = new UpdateOptions().upsert(true)
-        def bulkOperations = [new InsertOneModel(new Document('_id', 1)),
-                              new ReplaceOneModel(new Document('a', 2), new Document('a', 200), updateOptions),
-                              new UpdateOneModel(new Document('a', 3), new Document('$set', new Document('a', 300)), updateOptions),
-                              new UpdateManyModel(new Document('a', 4), new Document('$set', new Document('a', 400)), updateOptions),
-                              new DeleteOneModel(new Document('a', 5)),
-                              new DeleteManyModel(new Document('a', 6))]
-
-        when:
-        def result = collection.bulkWrite(bulkOperations)
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        result.wasAcknowledged() == writeConcern.isAcknowledged()
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, null))
-
-        when:
-        result = collection.bulkWrite(bulkOperations, new BulkWriteOptions().ordered(true).bypassDocumentValidation(true))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        result.wasAcknowledged() == writeConcern.isAcknowledged()
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
-
-        when:
-        result = collection.bulkWrite(bulkOperations, new BulkWriteOptions().ordered(false).bypassDocumentValidation(false))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        result.wasAcknowledged() == writeConcern.isAcknowledged()
-        expect operation, isTheSameAs(expectedOperation(false, writeConcern, false))
-
-        where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, [])])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(), unacknowledged(), unacknowledged()])
-    }
-
-    def 'should handle exceptions in bulkWrite correctly'() {
-        given:
-        def codecRegistry = fromProviders([new ValueCodecProvider(), new BsonValueCodecProvider()])
-        def executor = new TestOperationExecutor([new MongoException('failure')])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when: 'a codec is missing its acceptable to immediately throw'
-        collection.bulkWrite([new InsertOneModel(new Document('_id', 1))])
-
-        then:
-        thrown(CodecConfigurationException)
-    }
-
-    def 'insertOne should use MixedBulkWriteOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { WriteConcern wc, Boolean bypassDocumentValidation ->
-            new MixedBulkWriteOperation(namespace, [new InsertRequest(new BsonDocument('_id', new BsonInt32(1)))],
-                    true, wc).bypassDocumentValidation(bypassDocumentValidation)
-        }
-
-        when:
-        collection.insertOne(new Document('_id', 1))
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(writeConcern, null))
-
-        when:
-        collection.insertOne(new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(true))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(writeConcern, true))
-
-        when:
-        collection.insertOne(new Document('_id', 1), new InsertOneOptions().bypassDocumentValidation(false))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(writeConcern, false))
-
-        where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, [])])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(), unacknowledged(), unacknowledged()])
-    }
-
-    def 'insertMany should use MixedBulkWriteOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { boolean ordered, WriteConcern wc, Boolean bypassDocumentValidation ->
-            new MixedBulkWriteOperation(namespace,
-                    [new InsertRequest(new BsonDocument('_id', new BsonInt32(1))),
-                     new InsertRequest(new BsonDocument('_id', new BsonInt32(2)))],
-                    ordered, wc).bypassDocumentValidation(bypassDocumentValidation)
-        }
-
-        when:
-        collection.insertMany([new Document('_id', 1), new Document('_id', 2)])
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, null))
-
-        when:
-        collection.insertMany([new Document('_id', 1), new Document('_id', 2)],
-                new InsertManyOptions().ordered(true).bypassDocumentValidation(true))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
-
-        when:
-        collection.insertMany([new Document('_id', 1), new Document('_id', 2)],
-                new InsertManyOptions().ordered(false).bypassDocumentValidation(false))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(false, writeConcern, false))
-
-        where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, []),
-                                                                 acknowledged(INSERT, 0, [])])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(), unacknowledged(), unacknowledged()])
-    }
-
-    def 'deleteOne should use MixedBulkWriteOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def result = collection.deleteOne(new Document('_id', 1))
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        result.wasAcknowledged() == writeConcern.isAcknowledged()
-        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace,
-                [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))
-                         .multi(false)],
-                true, writeConcern))
-        result == expectedResult
-
-        where:
-        writeConcern                | executor                                                 | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(DELETE, 1, [])]) | DeleteResult.acknowledged(1)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged()])            | DeleteResult.unacknowledged()
-    }
-
-    def 'deleteOne should translate BulkWriteException correctly'() {
-        given:
-        def bulkWriteException = new MongoBulkWriteException(acknowledged(0, 0, 1, null, []), [],
-                                                             new com.mongodb.bulk.WriteConcernError(100, '', new BsonDocument()),
-                                                             new ServerAddress());
-
-        def executor = new TestOperationExecutor([bulkWriteException])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, WriteConcern.ACKNOWLEDGED,
-                                                 readConcern, executor)
-
-        when:
-        collection.deleteOne(new Document('_id', 1))
-
-        then:
-        def ex = thrown(MongoWriteConcernException)
-        ex.writeConcernError == bulkWriteException.writeConcernError
-        ex.writeResult.wasAcknowledged()
-        ex.writeResult.count == 1
-        !ex.writeResult.updateOfExisting
-        ex.writeResult.upsertedId == null
-    }
-
-    def 'deleteMany should use MixedBulkWriteOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def result = collection.deleteMany(new Document('_id', 1))
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        result.wasAcknowledged() == writeConcern.isAcknowledged()
-        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new DeleteRequest(new BsonDocument('_id', new BsonInt32(1)))
-                                                                                      .multi(true)],
-                true, writeConcern))
-        result == expectedResult
-
-        where:
-        writeConcern                | executor                                                 | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(DELETE, 6, [])]) | DeleteResult.acknowledged(6)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged()])            | DeleteResult.unacknowledged()
-    }
-
-    @SuppressWarnings('LineLength')
-    def 'replaceOne should use MixedBulkWriteOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def result = collection.replaceOne(new Document('a', 1), new Document('a', 10),
-                new UpdateOptions().bypassDocumentValidation(bypassDocumentValidation))
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                new BsonDocument('a', new BsonInt32(10)), REPLACE)], true, writeConcern).bypassDocumentValidation(bypassDocumentValidation))
-        result == expectedResult
-
-        where:
-        bypassDocumentValidation << [null, true, false, null]
-
-        writeConcern                | executor                                                        | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(REPLACE, 1, null, [])]) | UpdateResult.acknowledged(1, null, null)
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(REPLACE, 1, 1, [])])    | UpdateResult.acknowledged(1, 1, null)
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(REPLACE, 1, 1,
-                [new com.mongodb.bulk.BulkWriteUpsert(0, new BsonInt32(42))])])                       | UpdateResult.acknowledged(1, 1, new BsonInt32(42))
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged()])                   | UpdateResult.unacknowledged()
-    }
-
-    def 'replaceOne should translate BulkWriteException correctly'() {
-        given:
-        def bulkWriteException = new MongoBulkWriteException(bulkWriteResult, [],
-                                                             new com.mongodb.bulk.WriteConcernError(100, '', new BsonDocument()),
-                                                             new ServerAddress());
-
-        def executor = new TestOperationExecutor([bulkWriteException])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, WriteConcern.ACKNOWLEDGED,
-                                                 readConcern, executor)
-
-        when:
-        collection.replaceOne(new Document('_id', 1), new Document('_id', 1))
-
-        then:
-        def ex = thrown(MongoWriteConcernException)
-        ex.writeConcernError == bulkWriteException.writeConcernError
-        ex.writeResult.wasAcknowledged() == writeResult.wasAcknowledged()
-        ex.writeResult.count == writeResult.count
-        ex.writeResult.updateOfExisting == writeResult.updateOfExisting
-        ex.writeResult.upsertedId == writeResult.upsertedId
-
-        where:
-        bulkWriteResult                                                           | writeResult
-        acknowledged(0, 1, 0, 1, [])                                              | WriteConcernResult.acknowledged(1, true, null)
-        acknowledged(0, 0, 0, 0,
-                     [new com.mongodb.bulk.BulkWriteUpsert(0, new BsonInt32(1))]) | WriteConcernResult.acknowledged(1, false,
-                                                                                                                    new BsonInt32(1))
-    }
-
-    def 'updateOne should use MixedBulkWriteOperationOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation ->
-            new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                    new BsonDocument('a', new BsonInt32(10)), UPDATE).multi(false).upsert(upsert)],
-                    true, wc).bypassDocumentValidation(bypassDocumentValidation)
-        }
-
-        when:
-        def result = collection.updateOne(new Document('a', 1), new Document('a', 10))
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null))
-        result == expectedResult
-
-        when:
-        result = collection.updateOne(new Document('a', 1), new Document('a', 10),
-                new UpdateOptions().upsert(true).bypassDocumentValidation(true))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
-        result == expectedResult
-
-        where:
-        writeConcern                | executor                                                 | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(UPDATE, 1, []),
-                                                                 acknowledged(UPDATE, 1, [])]) | UpdateResult.acknowledged(1, 0, null)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(),
-                                                                 unacknowledged()])            | UpdateResult.unacknowledged()
-    }
-
-    def 'updateMany should use MixedBulkWriteOperationOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = { boolean upsert, WriteConcern wc, Boolean bypassDocumentValidation ->
-            new MixedBulkWriteOperation(namespace, [new UpdateRequest(new BsonDocument('a', new BsonInt32(1)),
-                    new BsonDocument('a', new BsonInt32(10)), UPDATE).multi(true).upsert(upsert)],
-                    true, wc).bypassDocumentValidation(bypassDocumentValidation)
-        }
-
-        when:
-        def result = collection.updateMany(new Document('a', 1), new Document('a', 10))
-        def operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(false, writeConcern, null))
-        result == expectedResult
-
-        when:
-        result = collection.updateMany(new Document('a', 1), new Document('a', 10),
-                new UpdateOptions().upsert(true).bypassDocumentValidation(true))
-        operation = executor.getWriteOperation() as MixedBulkWriteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation(true, writeConcern, true))
-        result == expectedResult
-
-        where:
-        writeConcern                | executor                                                    | expectedResult
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([acknowledged(UPDATE, 5, 3, []),
-                                                                 acknowledged(UPDATE, 5, 3, [])]) | UpdateResult.acknowledged(5, 3, null)
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([unacknowledged(),
-                                                                 unacknowledged()])               | UpdateResult.unacknowledged()
-    }
-
-    def 'should translate MongoBulkWriteException to MongoWriteException'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        collection.insertOne(new Document('_id', 1))
-
-        then:
-        def e = thrown(MongoWriteException)
-        e.error == new WriteError(11000, 'oops', new BsonDocument())
-
-        where:
-        executor << new TestOperationExecutor([new MongoBulkWriteException(acknowledged(INSERT, 1, []),
-                [new com.mongodb.bulk.BulkWriteError(11000, 'oops',
-                        new BsonDocument(), 0)],
-                null, new ServerAddress())])
-    }
-
-    def 'should translate MongoBulkWriteException to MongoWriteConcernException'() {
-        given:
-        def executor = new TestOperationExecutor([new MongoBulkWriteException(acknowledged(INSERT, 1, []), [],
-                new com.mongodb.bulk.WriteConcernError(42, 'oops',
-                        new BsonDocument()),
-                new ServerAddress())])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        collection.insertOne(new Document('_id', 1))
-
-        then:
-        def e = thrown(MongoWriteConcernException)
-        e.writeConcernError == new com.mongodb.bulk.WriteConcernError(42, 'oops', new BsonDocument())
-    }
-
-    def 'should use FindOneAndDeleteOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new FindAndDeleteOperation(namespace, writeConcern, new DocumentCodec())
-                .filter(new BsonDocument('a', new BsonInt32(1)))
-
-        when:
-        collection.findOneAndDelete(new Document('a', 1))
-        def operation = executor.getWriteOperation() as FindAndDeleteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-
-        when:
-        collection.findOneAndDelete(new Document('a', 1), new FindOneAndDeleteOptions().projection(new Document('projection', 1))
-                .maxTime(100, MILLISECONDS))
-        operation = executor.getWriteOperation() as FindAndDeleteOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS))
-
-        where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null)])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged()])
-    }
-
-    def 'should use FindOneAndReplaceOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new FindAndReplaceOperation(namespace, writeConcern, new DocumentCodec(),
-                new BsonDocument('a', new BsonInt32(10))).filter(new BsonDocument('a', new BsonInt32(1)))
-
-        when:
-        collection.findOneAndReplace(new Document('a', 1), new Document('a', 10))
-        def operation = executor.getWriteOperation() as FindAndReplaceOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-
-        when:
-        collection.findOneAndReplace(new Document('a', 1), new Document('a', 10),
-                new FindOneAndReplaceOptions().projection(new Document('projection', 1))
-                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
-        operation = executor.getWriteOperation() as FindAndReplaceOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
-
-        when:
-        collection.findOneAndReplace(new Document('a', 1), new Document('a', 10),
-                new FindOneAndReplaceOptions().projection(new Document('projection', 1))
-                        .maxTime(100, MILLISECONDS).bypassDocumentValidation(true))
-        operation = executor.getWriteOperation() as FindAndReplaceOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS).bypassDocumentValidation(true))
-
-        where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null)])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged()])
-    }
-
-    def 'should use FindAndUpdateOperation correctly'() {
-        given:
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new FindAndUpdateOperation(namespace, writeConcern, new DocumentCodec(),
-                new BsonDocument('a', new BsonInt32(10))).filter(new BsonDocument('a', new BsonInt32(1)))
-
-        when:
-        collection.findOneAndUpdate(new Document('a', 1), new Document('a', 10))
-        def operation = executor.getWriteOperation() as FindAndUpdateOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-
-        when:
-        collection.findOneAndUpdate(new Document('a', 1), new Document('a', 10),
-                new FindOneAndUpdateOptions().projection(new Document('projection', 1)).maxTime(100, MILLISECONDS)
-                        .bypassDocumentValidation(false))
-        operation = executor.getWriteOperation() as FindAndUpdateOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS).bypassDocumentValidation(false))
-
-        when:
-        collection.findOneAndUpdate(new Document('a', 1), new Document('a', 10),
-                new FindOneAndUpdateOptions().projection(new Document('projection', 1)).maxTime(100, MILLISECONDS)
-                        .bypassDocumentValidation(true))
-        operation = executor.getWriteOperation() as FindAndUpdateOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation.projection(new BsonDocument('projection', new BsonInt32(1)))
-                .maxTime(100, MILLISECONDS).bypassDocumentValidation(true))
-
-        where:
-        writeConcern                | executor
-        WriteConcern.ACKNOWLEDGED   | new TestOperationExecutor([WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null),
-                                                                 WriteConcernResult.acknowledged(1, true, null)])
-        WriteConcern.UNACKNOWLEDGED | new TestOperationExecutor([WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged(),
-                                                                 WriteConcernResult.unacknowledged()])
-    }
-
-    def 'should use DropCollectionOperation correctly'() {
-        given:
-        def executor = new TestOperationExecutor([null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new DropCollectionOperation(namespace)
-
-        when:
-        collection.drop()
-        def operation = executor.getWriteOperation() as DropCollectionOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-    }
-
-    def 'should use CreateIndexOperations correctly'() {
-        given:
-        def executor = new TestOperationExecutor([null, null, null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def expectedOperation = new CreateIndexesOperation(namespace, [new IndexRequest(new BsonDocument('key', new BsonInt32(1)))])
-        def indexName = collection.createIndex(new Document('key', 1))
-        def operation = executor.getWriteOperation() as CreateIndexesOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-        indexName == 'key_1'
-
-        when:
-        expectedOperation = new CreateIndexesOperation(namespace, [new IndexRequest(new BsonDocument('key', new BsonInt32(1))),
-                                                                   new IndexRequest(new BsonDocument('key1', new BsonInt32(1)))])
-        def indexNames = collection.createIndexes([new IndexModel(new Document('key', 1)), new IndexModel(new Document('key1', 1))])
-        operation = executor.getWriteOperation() as CreateIndexesOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-        indexNames == ['key_1', 'key1_1']
-
-        when:
-        expectedOperation = new CreateIndexesOperation(namespace,
-                [new IndexRequest(new BsonDocument('key', new BsonInt32(1)))
-                         .background(true)
-                         .unique(true)
-                         .sparse(true)
-                         .name('aIndex')
-                         .expireAfter(100, TimeUnit.SECONDS)
-                         .version(1)
-                         .weights(new BsonDocument('a', new BsonInt32(1000)))
-                         .defaultLanguage('es')
-                         .languageOverride('language')
-                         .textVersion(1)
-                         .sphereVersion(2)
-                         .bits(1)
-                         .min(-180.0)
-                         .max(180.0)
-                         .bucketSize(200.0)
-                         .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
-                         .partialFilterExpression(BsonDocument.parse('{status: "active"}'))
-                ])
-        indexName = collection.createIndex(new Document('key', 1), new IndexOptions()
-                .background(true)
-                .unique(true)
-                .sparse(true)
-                .name('aIndex')
-                .expireAfter(100, TimeUnit.SECONDS)
-                .version(1)
-                .weights(new BsonDocument('a', new BsonInt32(1000)))
-                .defaultLanguage('es')
-                .languageOverride('language')
-                .textVersion(1)
-                .sphereVersion(2)
-                .bits(1)
-                .min(-180.0)
-                .max(180.0)
-                .bucketSize(200.0)
-                .storageEngine(BsonDocument.parse('{wiredTiger: {configString: "block_compressor=zlib"}}'))
-                .partialFilterExpression(BsonDocument.parse('{status: "active"}')))
-        operation = executor.getWriteOperation() as CreateIndexesOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-        indexName == 'aIndex'
-    }
-
-    def 'should use ListIndexesOperations correctly'() {
-        given:
-        def batchCursor = Stub(BatchCursor)
-        def executor = new TestOperationExecutor([batchCursor, batchCursor, batchCursor])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        collection.listIndexes().into([])
-        def operation = executor.getReadOperation() as ListIndexesOperation
-
-        then:
-        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()))
-
-        when:
-        def indexes = collection.listIndexes(BsonDocument).into([])
-        operation = executor.getReadOperation() as ListIndexesOperation
-        indexes == []
-
-        then:
-        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new BsonDocumentCodec()))
-
-        when:
-        collection.listIndexes().batchSize(10).maxTime(10, MILLISECONDS).iterator()
-        operation = executor.getReadOperation() as ListIndexesOperation
-
-        then:
-        expect operation, isTheSameAs(new ListIndexesOperation(namespace, new DocumentCodec()).batchSize(10).maxTime(10, MILLISECONDS))
-    }
-
-    def 'should use DropIndexOperation correctly for dropIndex'() {
-        given:
-        def executor = new TestOperationExecutor([null, null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def expectedOperation = new DropIndexOperation(namespace, 'indexName')
-        collection.dropIndex('indexName')
-        def operation = executor.getWriteOperation() as DropIndexOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-
-        when:
-        def keys = new BsonDocument('x', new BsonInt32(1))
-        expectedOperation = new DropIndexOperation(namespace, keys)
-        collection.dropIndex(keys)
-        operation = executor.getWriteOperation() as DropIndexOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-    }
-
-    def 'should use DropIndexOperation correctly for dropIndexes'() {
-        given:
-        def executor = new TestOperationExecutor([null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def expectedOperation = new DropIndexOperation(namespace, '*')
-
-        when:
-        collection.dropIndexes()
-        def operation = executor.getWriteOperation() as DropIndexOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-    }
-
-    def 'should use RenameCollectionOperation correctly'() {
-        given:
-        def executor = new TestOperationExecutor([null])
-        def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, writeConcern, readConcern, executor)
-        def newNamespace = new MongoNamespace(namespace.getDatabaseName(), 'newName')
-        def expectedOperation = new RenameCollectionOperation(namespace, newNamespace)
-
-        when:
-        collection.renameCollection(newNamespace)
-        def operation = executor.getWriteOperation() as RenameCollectionOperation
-
-        then:
-        expect operation, isTheSameAs(expectedOperation)
-    }
-
-}
diff --git a/driver/src/test/unit/com/mongodb/MongoConstructorsTest.java b/driver/src/test/unit/com/mongodb/MongoConstructorsTest.java
deleted file mode 100644
index 44fa6f77609..00000000000
--- a/driver/src/test/unit/com/mongodb/MongoConstructorsTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Collections;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-
-public class MongoConstructorsTest {
-
-    @Test
-    @Ignore
-    public void shouldDefaultToLocalhost() throws UnknownHostException {
-        Mongo mongo = new MongoClient();
-        try {
-            assertEquals(Arrays.asList(new ServerAddress()), mongo.getServerAddressList());
-        } finally {
-            mongo.close();
-        }
-    }
-
-    @Test
-    @Ignore
-    public void shouldUseGivenHost() throws UnknownHostException {
-        Mongo mongo = new MongoClient("localhost");
-        try {
-            assertEquals(Arrays.asList(new ServerAddress("localhost")), mongo.getServerAddressList());
-        } finally {
-            mongo.close();
-        }
-    }
-
-    @Test
-    @Ignore
-    public void shouldUseGivenServerAddress() throws UnknownHostException {
-        Mongo mongo = new MongoClient(new ServerAddress("localhost"));
-        try {
-            assertEquals(Arrays.asList(new ServerAddress("localhost")), mongo.getServerAddressList());
-        } finally {
-            mongo.close();
-        }
-    }
-
-    @Test
-    public void shouldUseGivenCredentials() throws UnknownHostException {
-        Mongo mongo = new MongoClient(new ServerAddress(),
-                                      Arrays.asList(MongoCredential.createMongoCRCredential("user", "admin", "pwd".toCharArray())));
-        mongo.close();
-    }
-
-    @Test
-    public void shouldDefaultToPrimaryReadPreference() throws UnknownHostException {
-        Mongo mongo = new MongoClient();
-        try {
-            assertEquals(ReadPreference.primary(), mongo.getReadPreference());
-        } finally {
-            mongo.close();
-        }
-    }
-
-    @Test
-    public void shouldAllowRequiredReplicaSetNameForSingleServerConstructors() throws UnknownHostException {
-        Mongo mongo = new MongoClient("localhost", MongoClientOptions.builder().requiredReplicaSetName("test").build());
-        mongo.close();
-
-        mongo = new MongoClient(new ServerAddress(), Collections.<MongoCredential>emptyList(),
-                                MongoClientOptions.builder().requiredReplicaSetName("test").build());
-        mongo.close();
-
-        mongo = new MongoClient(new MongoClientURI("mongodb://localhost/?setName=test"));
-        mongo.close();
-    }
-
-    @Test
-    @SuppressWarnings("deprecation")
-    public void shouldSaveDefaultReadPreference() throws UnknownHostException {
-        Mongo mongo = new MongoClient();
-        try {
-            mongo.setReadPreference(ReadPreference.nearest());
-            assertEquals(ReadPreference.nearest(), mongo.getReadPreference());
-        } finally {
-            mongo.close();
-        }
-    }
-
-    @Test
-    @SuppressWarnings("deprecation")
-    public void shouldSaveDefaultWriteConcern() throws UnknownHostException {
-        Mongo mongo = new MongoClient();
-        try {
-            mongo.setWriteConcern(WriteConcern.ACKNOWLEDGED);
-            assertEquals(WriteConcern.ACKNOWLEDGED, mongo.getWriteConcern());
-        } finally {
-            mongo.close();
-        }
-    }
-
-    @Test
-    public void shouldCloseWithoutExceptionWhenCursorFinalizerIsDisabled() {
-        Mongo mongo = new MongoClient(new ServerAddress(), MongoClientOptions.builder().cursorFinalizerEnabled(false).build());
-        mongo.close();
-    }
-
-    @Test
-    @SuppressWarnings("deprecation") // This is for testing the old API, so it will use deprecated methods
-    public void shouldGetDB() throws UnknownHostException {
-        Mongo mongo = new MongoClient();
-        try {
-            DB db = mongo.getDB("test");
-            assertNotNull(db);
-            assertEquals("test", db.getName());
-        } finally {
-            mongo.close();
-        }
-    }
-
-    @Test
-    @SuppressWarnings("deprecation") // This is for testing the old API, so it will use deprecated methods
-    public void shouldGetSameDB() throws UnknownHostException {
-        Mongo mongo = new MongoClient();
-        try {
-            assertSame(mongo.getDB("test"), mongo.getDB("test"));
-        } finally {
-            mongo.close();
-        }
-    }
-
-}
diff --git a/driver/src/test/unit/com/mongodb/MongoDatabaseSpecification.groovy b/driver/src/test/unit/com/mongodb/MongoDatabaseSpecification.groovy
deleted file mode 100644
index 4978309d1fd..00000000000
--- a/driver/src/test/unit/com/mongodb/MongoDatabaseSpecification.groovy
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb
-
-import com.mongodb.client.model.CreateCollectionOptions
-import com.mongodb.client.model.IndexOptionDefaults
-import com.mongodb.client.model.ValidationAction
-import com.mongodb.client.model.ValidationLevel
-import com.mongodb.client.model.ValidationOptions
-import com.mongodb.operation.CommandReadOperation
-import com.mongodb.operation.CreateCollectionOperation
-import com.mongodb.operation.DropDatabaseOperation
-import org.bson.BsonDocument
-import org.bson.BsonInt32
-import org.bson.Document
-import org.bson.codecs.BsonValueCodecProvider
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.codecs.ValueCodecProvider
-import org.bson.codecs.configuration.CodecRegistry
-import spock.lang.Specification
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.primary
-import static com.mongodb.ReadPreference.primaryPreferred
-import static com.mongodb.ReadPreference.secondary
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-class MongoDatabaseSpecification extends Specification {
-
-    def name = 'databaseName'
-    def codecRegistry = MongoClient.getDefaultCodecRegistry()
-    def readPreference = secondary()
-    def writeConcern = WriteConcern.ACKNOWLEDGED
-    def readConcern = ReadConcern.DEFAULT
-
-    def 'should return the correct name from getName'() {
-        given:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, new TestOperationExecutor([]))
-
-        expect:
-        database.getName() == name
-    }
-
-    def 'should behave correctly when using withCodecRegistry'() {
-        given:
-        def newCodecRegistry = Stub(CodecRegistry)
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern,
-                readConcern, executor).withCodecRegistry(newCodecRegistry)
-
-        then:
-        database.getCodecRegistry() == newCodecRegistry
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, newCodecRegistry, readPreference, writeConcern, readConcern, executor))
-    }
-
-    def 'should behave correctly when using withReadPreference'() {
-        given:
-        def newReadPreference = primary()
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withReadPreference(newReadPreference)
-
-        then:
-        database.getReadPreference() == newReadPreference
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, newReadPreference, writeConcern, readConcern, executor))
-    }
-
-    def 'should behave correctly when using withWriteConcern'() {
-        given:
-        def newWriteConcern = WriteConcern.MAJORITY
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withWriteConcern(newWriteConcern)
-
-        then:
-        database.getWriteConcern() == newWriteConcern
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, newWriteConcern, readConcern, executor))
-    }
-
-    def 'should behave correctly when using withReadConcern'() {
-        given:
-        def newReadConcern = ReadConcern.MAJORITY
-        def executor = new TestOperationExecutor([])
-
-        when:
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern,
-                executor).withReadConcern(newReadConcern)
-
-        then:
-        database.getReadConcern() == newReadConcern
-        expect database, isTheSameAs(new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, newReadConcern, executor))
-    }
-
-    def 'should be able to executeCommand correctly'() {
-        given:
-        def command = new BsonDocument('command', new BsonInt32(1))
-        def executor = new TestOperationExecutor([null, null, null, null])
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        database.runCommand(command)
-        def operation = executor.getReadOperation() as CommandReadOperation<Document>
-
-        then:
-        operation.command == command
-        executor.getReadPreference() == primary()
-
-        when:
-        database.runCommand(command, primaryPreferred())
-        operation = executor.getReadOperation() as CommandReadOperation<Document>
-
-        then:
-        operation.command == command
-        executor.getReadPreference() == primaryPreferred()
-
-        when:
-        database.runCommand(command, BsonDocument)
-        operation = executor.getReadOperation() as CommandReadOperation<BsonDocument>
-
-        then:
-        operation.command == command
-        executor.getReadPreference() == primary()
-
-        when:
-        database.runCommand(command, primaryPreferred(), BsonDocument)
-        operation = executor.getReadOperation() as CommandReadOperation<BsonDocument>
-
-        then:
-        operation.command == command
-        executor.getReadPreference() == primaryPreferred()
-    }
-
-    def 'should use DropDatabaseOperation correctly'() {
-        given:
-        def executor = new TestOperationExecutor([null])
-
-        when:
-        new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor).drop()
-        def operation = executor.getWriteOperation() as DropDatabaseOperation
-
-        then:
-        expect operation, isTheSameAs(new DropDatabaseOperation(name))
-    }
-
-    def 'should use ListCollectionsOperation correctly'() {
-        given:
-        def executor = new TestOperationExecutor([null, null, null])
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        def listCollectionIterable = database.listCollections()
-
-        then:
-        expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<Document>(name, Document, codecRegistry, primary(),
-                executor))
-
-        when:
-        listCollectionIterable = database.listCollections(BsonDocument)
-
-        then:
-        expect listCollectionIterable, isTheSameAs(new ListCollectionsIterableImpl<BsonDocument>(name, BsonDocument, codecRegistry,
-                primary(), executor))
-    }
-
-    def 'should use CreateCollectionOperation correctly'() {
-        given:
-        def collectionName = 'collectionName'
-        def executor = new TestOperationExecutor([null, null])
-        def database = new MongoDatabaseImpl(name, codecRegistry, readPreference, writeConcern, readConcern, executor)
-
-        when:
-        database.createCollection(collectionName)
-        def operation = executor.getWriteOperation() as CreateCollectionOperation
-
-        then:
-        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName))
-
-        when:
-        def createCollectionOptions = new CreateCollectionOptions()
-                .autoIndex(false)
-                .capped(true)
-                .usePowerOf2Sizes(true)
-                .maxDocuments(100)
-                .sizeInBytes(1000)
-                .storageEngineOptions(BsonDocument.parse('{ wiredTiger : {}}'))
-                .indexOptionDefaults(new IndexOptionDefaults().storageEngine(BsonDocument.parse('{ mmapv1 : {}}')))
-                .validationOptions(new ValidationOptions().validator(BsonDocument.parse('{level: {$gte: 10}}'))
-                    .validationLevel(ValidationLevel.MODERATE)
-                    .validationAction(ValidationAction.WARN))
-
-        database.createCollection(collectionName, createCollectionOptions)
-        operation = executor.getWriteOperation() as CreateCollectionOperation
-
-        then:
-        expect operation, isTheSameAs(new CreateCollectionOperation(name, collectionName)
-                .autoIndex(false)
-                .capped(true)
-                .usePowerOf2Sizes(true)
-                .maxDocuments(100)
-                .sizeInBytes(1000)
-                .storageEngineOptions(BsonDocument.parse('{ wiredTiger : {}}'))
-                .indexOptionDefaults(BsonDocument.parse('{ storageEngine : { mmapv1 : {}}}'))
-                .validator(BsonDocument.parse('{level: {$gte: 10}}'))
-                .validationLevel(ValidationLevel.MODERATE)
-                .validationAction(ValidationAction.WARN))
-    }
-
-    def 'should pass the correct options to getCollection'() {
-        given:
-        def codecRegistry = fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()])
-        def database = new MongoDatabaseImpl('databaseName', codecRegistry, secondary(), WriteConcern.MAJORITY, ReadConcern.MAJORITY,
-                new TestOperationExecutor([]))
-
-        when:
-        def collection = database.getCollection('collectionName')
-
-        then:
-        expect collection, isTheSameAs(expectedCollection)
-
-        where:
-        expectedCollection = new MongoCollectionImpl<Document>(new MongoNamespace('databaseName', 'collectionName'), Document,
-                fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()]), secondary(),
-                WriteConcern.MAJORITY, ReadConcern.MAJORITY, new TestOperationExecutor([]))
-    }
-
-}
diff --git a/driver/src/test/unit/com/mongodb/TestOperationExecutor.java b/driver/src/test/unit/com/mongodb/TestOperationExecutor.java
deleted file mode 100644
index e094a9104a1..00000000000
--- a/driver/src/test/unit/com/mongodb/TestOperationExecutor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb;
-
-import com.mongodb.operation.OperationExecutor;
-import com.mongodb.operation.ReadOperation;
-import com.mongodb.operation.WriteOperation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings("rawtypes")
-class TestOperationExecutor implements OperationExecutor {
-
-    private final List<Object> responses;
-    private List<ReadPreference> readPreferences = new ArrayList<ReadPreference>();
-    private List<ReadOperation> readOperations = new ArrayList<ReadOperation>();
-    private List<WriteOperation> writeOperations = new ArrayList<WriteOperation>();
-
-    TestOperationExecutor(final List<Object> responses) {
-        this.responses = responses;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T execute(final ReadOperation<T> operation, final ReadPreference readPreference) {
-        readOperations.add(operation);
-        readPreferences.add(readPreference);
-        return (T) getResponse();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T execute(final WriteOperation<T> operation) {
-        writeOperations.add(operation);
-        return (T) getResponse();
-    }
-
-    private Object getResponse() {
-        Object response = responses.remove(0);
-        if (response instanceof RuntimeException) {
-            throw (RuntimeException) response;
-        }
-        return response;
-    }
-
-    ReadOperation getReadOperation() {
-        return readOperations.isEmpty() ? null : readOperations.remove(0);
-    }
-
-    ReadPreference getReadPreference() {
-        return readPreferences.isEmpty() ? null : readPreferences.remove(0);
-    }
-
-    WriteOperation getWriteOperation() {
-       return writeOperations.isEmpty() ? null : writeOperations.remove(0);
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy b/driver/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy
deleted file mode 100644
index e3f36846b4f..00000000000
--- a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSBucketSpecification.groovy
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.gridfs
-
-import com.mongodb.MongoClient
-import com.mongodb.MongoDatabaseImpl
-import com.mongodb.MongoGridFSException
-import com.mongodb.MongoNamespace
-import com.mongodb.ReadConcern
-import com.mongodb.TestOperationExecutor
-import com.mongodb.WriteConcern
-import com.mongodb.client.FindIterable
-import com.mongodb.client.ListIndexesIterable
-import com.mongodb.client.MongoCollection
-import com.mongodb.client.MongoCursor
-import com.mongodb.client.gridfs.model.GridFSDownloadOptions
-import com.mongodb.client.gridfs.model.GridFSFile
-import com.mongodb.client.result.DeleteResult
-import com.mongodb.client.result.UpdateResult
-import com.mongodb.operation.BatchCursor
-import com.mongodb.operation.FindOperation
-import com.mongodb.operation.OperationExecutor
-import org.bson.BsonDocument
-import org.bson.BsonObjectId
-import org.bson.BsonString
-import org.bson.Document
-import org.bson.codecs.DocumentCodecProvider
-import org.bson.types.Binary
-import org.bson.types.ObjectId
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import static com.mongodb.CustomMatchers.isTheSameAs
-import static com.mongodb.ReadPreference.primary
-import static com.mongodb.ReadPreference.secondary
-import static org.bson.codecs.configuration.CodecRegistries.fromProviders
-import static spock.util.matcher.HamcrestSupport.expect
-
-@SuppressWarnings('ClosureAsLastMethodParameter')
-class GridFSBucketSpecification extends Specification {
-
-    def readConcern = ReadConcern.DEFAULT
-    def registry = MongoClient.getDefaultCodecRegistry()
-    def database = databaseWithExecutor(Stub(OperationExecutor))
-    def databaseWithExecutor(OperationExecutor executor) {
-        new MongoDatabaseImpl('test', registry, primary(), WriteConcern.ACKNOWLEDGED, readConcern, executor)
-    }
-
-    def 'should return the correct bucket name'() {
-        when:
-        def bucketName = new GridFSBucketImpl(database).getBucketName()
-
-        then:
-        bucketName == 'fs'
-
-        when:
-        bucketName = new GridFSBucketImpl(database, 'custom').getBucketName()
-
-        then:
-        bucketName == 'custom'
-    }
-
-    def 'should behave correctly when using withChunkSizeBytes'() {
-        given:
-        def newChunkSize = 200
-
-        when:
-        def gridFSBucket = new GridFSBucketImpl(database).withChunkSizeBytes(newChunkSize)
-
-        then:
-        gridFSBucket.getChunkSizeBytes() == newChunkSize
-    }
-
-    def 'should behave correctly when using withReadPreference'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def newReadPreference = secondary()
-
-        when:
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection).withReadPreference(newReadPreference)
-
-        then:
-        1 * filesCollection.withReadPreference(newReadPreference) >> filesCollection
-        1 * chunksCollection.withReadPreference(newReadPreference) >> chunksCollection
-
-        when:
-        gridFSBucket.getReadConcern()
-
-        then:
-        1 * filesCollection.getReadConcern()
-    }
-
-    def 'should behave correctly when using withWriteConcern'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def newWriteConcern = WriteConcern.MAJORITY
-
-        when:
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection).withWriteConcern(newWriteConcern)
-
-        then:
-        1 * filesCollection.withWriteConcern(newWriteConcern) >> filesCollection
-        1 * chunksCollection.withWriteConcern(newWriteConcern) >> chunksCollection
-
-        when:
-        gridFSBucket.getWriteConcern()
-
-        then:
-        1 * filesCollection.getWriteConcern()
-    }
-
-    def 'should behave correctly when using withReadConcern'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def newReadConcern = ReadConcern.MAJORITY
-
-        when:
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection).withReadConcern(newReadConcern)
-
-        then:
-        1 * filesCollection.withReadConcern(newReadConcern) >> filesCollection
-        1 * chunksCollection.withReadConcern(newReadConcern) >> chunksCollection
-
-        when:
-        gridFSBucket.getReadConcern()
-
-        then:
-        1 * filesCollection.getReadConcern() >> newReadConcern
-    }
-
-    def 'should get defaults from MongoDatabase'() {
-        given:
-        def defaultChunkSizeBytes = 255 * 1024
-        def database = new MongoDatabaseImpl('test', fromProviders(new DocumentCodecProvider()), secondary(), WriteConcern.ACKNOWLEDGED,
-                readConcern, new TestOperationExecutor([]))
-
-        when:
-        def gridFSBucket = new GridFSBucketImpl(database)
-
-        then:
-        gridFSBucket.getChunkSizeBytes() == defaultChunkSizeBytes
-        gridFSBucket.getReadPreference() == database.getReadPreference()
-        gridFSBucket.getWriteConcern() == database.getWriteConcern()
-        gridFSBucket.getReadConcern() == database.getReadConcern()
-    }
-
-    def 'should create the expected GridFSUploadStream'() {
-        given:
-        def filesCollection = Stub(MongoCollection)
-        def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        def stream = gridFSBucket.openUploadStream('filename')
-
-        then:
-        expect stream, isTheSameAs(new GridFSUploadStreamImpl(filesCollection, chunksCollection, stream.getId(), 'filename',
-                255, null), ['md5', 'closeLock'])
-    }
-
-    def 'should upload from stream'() {
-        given:
-        def findIterable = Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-        def contentBytes = 'content' as byte[]
-        def inputStream = new ByteArrayInputStream(contentBytes)
-
-        when:
-        gridFSBucket.uploadFromStream('filename', inputStream)
-
-        then: 'index check'
-        1 * filesCollection.withDocumentClass(Document) >> filesCollection
-        1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
-        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first() >> new Document()
-
-        then:
-        1 * chunksCollection.insertOne(_)
-
-        then:
-        1 * filesCollection.insertOne(_)
-    }
-
-    def 'should clean up any chunks when upload from stream throws an IOException'() {
-        given:
-        def findIterable = Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-        def inputStream = Mock(InputStream) {
-            2 * read(_) >> 255 >> { throw new IOException('stream failure') }
-        }
-
-        when:
-        gridFSBucket.uploadFromStream('filename', inputStream)
-
-        then: 'index check'
-        1 * filesCollection.withDocumentClass(Document) >> filesCollection
-        1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
-        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first() >> new Document()
-
-        then:
-        1 * chunksCollection.insertOne(_)
-
-        then:
-        1 * chunksCollection.deleteMany(_)
-
-        then:
-        0 * filesCollection.insertOne(_)
-
-        then:
-        def exception = thrown(MongoGridFSException)
-        exception.getMessage() == 'IOException when reading from the InputStream'
-    }
-
-    def 'should not clean up any chunks when upload throws an exception'() {
-        given:
-        def findIterable = Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def alternativeException = new MongoGridFSException('Alternative failure')
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-        def inputStream = Mock(InputStream) {
-            2 * read(_) >> 255 >> { throw alternativeException }
-        }
-
-        when:
-        gridFSBucket.uploadFromStream('filename', inputStream)
-
-        then: 'index check'
-        1 * filesCollection.withDocumentClass(Document) >> filesCollection
-        1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
-        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first() >> new Document()
-
-        then:
-        1 * chunksCollection.insertOne(_)
-
-        then:
-        0 * chunksCollection.deleteMany(_)
-
-        then:
-        0 * filesCollection.insertOne(_)
-
-        then:
-        def exception = thrown(MongoGridFSException)
-        exception == alternativeException
-    }
-
-    def 'should create the expected GridFSDownloadStream'() {
-        given:
-        def fileId = new BsonObjectId(new ObjectId())
-        def fileInfo = new GridFSFile(fileId, 'File 1', 10, 255, new Date(), '1234', new Document())
-        def findIterable =  Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection) {
-            1 * find() >> findIterable
-        }
-        def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        def stream = gridFSBucket.openDownloadStream(fileId.getValue())
-
-        then:
-        1 * findIterable.filter(_) >> findIterable
-        1 * findIterable.first() >> fileInfo
-
-        then:
-        expect stream, isTheSameAs(new GridFSDownloadStreamImpl(fileInfo, chunksCollection), ['closeLock', 'cursorLock'])
-    }
-
-    def 'should download to stream'() {
-        given:
-        def fileId = new ObjectId()
-        def bsonFileId = new BsonObjectId(fileId)
-        def fileInfo = new GridFSFile(bsonFileId, 'filename', 10, 255, new Date(), '1234', new Document())
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable =  Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection) {
-            1 * find() >> findIterable
-        }
-        def tenBytes = new byte[10]
-        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(tenBytes))
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-        def outputStream = new ByteArrayOutputStream(10)
-
-        when:
-        gridFSBucket.downloadToStream(fileId, outputStream)
-        outputStream.close()
-
-        then:
-        1 * findIterable.filter(new Document('_id', bsonFileId)) >> findIterable
-        1 * findIterable.first() >> fileInfo
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(_) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        then:
-        outputStream.toByteArray() == tenBytes
-    }
-
-    def 'should download to stream using BsonValue'() {
-        given:
-        def bsonFileId = new BsonString('1')
-        def fileInfo = new GridFSFile(bsonFileId, 'filename', 10L, 255, new Date(), '1234', new Document())
-        def mongoCursor =  Mock(MongoCursor)
-        def findIterable =  Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection) {
-            1 * find() >> findIterable
-        }
-        def tenBytes = new byte[10]
-        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(tenBytes))
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-        def outputStream = new ByteArrayOutputStream(10)
-
-        when:
-        gridFSBucket.downloadToStream(bsonFileId, outputStream)
-        outputStream.close()
-
-        then:
-        1 * findIterable.filter(new Document('_id', bsonFileId)) >> findIterable
-        1 * findIterable.first() >> fileInfo
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(_) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        then:
-        outputStream.toByteArray() == tenBytes
-    }
-
-    def 'should download to stream by name'() {
-        given:
-        def filename = 'filename'
-        def fileId = new ObjectId()
-        def bsonFileId = new BsonObjectId(fileId)
-        def fileInfo = new GridFSFile(bsonFileId, filename, 10, 255, new Date(), '1234', new Document())
-        def mongoCursor =  Mock(MongoCursor)
-        def findIterable =  Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection) {
-            1 * find() >> findIterable
-        }
-        def tenBytes = new byte[10]
-        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(tenBytes))
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-        def outputStream = new ByteArrayOutputStream(10)
-
-        when:
-        gridFSBucket.downloadToStream(filename, outputStream)
-        outputStream.close()
-
-        then:
-        1 * findIterable.filter(new Document('filename', filename)) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.first() >> fileInfo
-
-        then:
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(_) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        then:
-        outputStream.toByteArray() == tenBytes
-    }
-
-    def 'should throw an exception if file not found'() {
-        given:
-        def fileId = new ObjectId()
-        def bsonFileId = new BsonObjectId(fileId)
-        def findIterable =  Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection) {
-            1 * find() >> findIterable
-        }
-        def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        gridFSBucket.openDownloadStream(fileId)
-
-        then:
-        1 * findIterable.filter(new Document('_id', bsonFileId)) >> findIterable
-        1 * findIterable.first() >> null
-
-        then:
-        thrown(MongoGridFSException)
-    }
-
-    @Unroll
-    def 'should create the expected GridFSDownloadStream when opening by name with version: #version'() {
-        given:
-        def filename = 'filename'
-        def fileId = new ObjectId()
-        def bsonFileId = new BsonObjectId(fileId)
-        def fileInfo = new GridFSFile(bsonFileId, filename, 10, 255, new Date(), '1234', new Document())
-        def findIterable =  Mock(FindIterable)
-        def filesCollection = Mock(MongoCollection) {
-            1 * find() >> findIterable
-        }
-        def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        def stream = gridFSBucket.openDownloadStream(filename, new GridFSDownloadOptions().revision(version))
-
-        then:
-        1 * findIterable.filter(new Document('filename', filename)) >> findIterable
-        1 * findIterable.skip(skip) >> findIterable
-        1 * findIterable.sort(new Document('uploadDate', sortOrder)) >> findIterable
-        1 * findIterable.first() >> fileInfo
-
-        then:
-        expect stream, isTheSameAs(new GridFSDownloadStreamImpl(fileInfo, chunksCollection), ['closeLock', 'cursorLock'])
-
-        where:
-        version | skip | sortOrder
-          0     |  0   | 1
-          1     |  1   | 1
-          2     |  2   | 1
-          3     |  3   | 1
-          -1    |  0   | -1
-          -2    |  1   | -1
-          -3    |  2   | -1
-    }
-
-    def 'should create the expected GridFSFindIterable'() {
-        given:
-        def collection = Mock(MongoCollection)
-        def findIterable = Mock(FindIterable)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, collection, Stub(MongoCollection))
-
-
-        when:
-        def result = gridFSBucket.find()
-
-        then:
-        1 * collection.find() >> findIterable
-        expect result, isTheSameAs(new GridFSFindIterableImpl(findIterable))
-    }
-
-    def 'should execute the expected FindOperation when finding a file'() {
-        given:
-        def executor = new TestOperationExecutor([Stub(BatchCursor), Stub(BatchCursor)])
-        def database = databaseWithExecutor(executor)
-        def gridFSBucket = new GridFSBucketImpl(database)
-        def decoder = registry.get(GridFSFile)
-
-        when:
-        gridFSBucket.find().iterator()
-
-        then:
-        executor.getReadPreference() == primary()
-        expect executor.getReadOperation(), isTheSameAs(new FindOperation<GridFSFile>(new MongoNamespace('test.fs.files'), decoder)
-                .filter(new BsonDocument()))
-
-        when:
-        def filter = new BsonDocument('filename', new BsonString('filename'))
-        def readConcern = ReadConcern.MAJORITY
-        gridFSBucket.withReadPreference(secondary()).withReadConcern(readConcern).find(filter).iterator()
-
-        then:
-        executor.getReadPreference() == secondary()
-        expect executor.getReadOperation(), isTheSameAs(new FindOperation<GridFSFile>(new MongoNamespace('test.fs.files'), decoder)
-                .readConcern(readConcern).filter(filter).slaveOk(true))
-    }
-
-    def 'should throw an exception if file not found when opening by name'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Stub(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-        when:
-        gridFSBucket.openDownloadStream('filename')
-
-        then:
-        1 * filesCollection.find() >> findIterable
-        1 * findIterable.filter(new Document('filename', 'filename')) >> findIterable
-        1 * findIterable.skip(0) >> findIterable
-        1 * findIterable.sort(new Document('uploadDate', -1)) >> findIterable
-        1 * findIterable.first() >> null
-
-        then:
-        thrown(MongoGridFSException)
-    }
-
-    def 'should create indexes on write'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def listIndexesIterable = Mock(ListIndexesIterable)
-        def findIterable = Mock(FindIterable)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        gridFSBucket.openUploadStream('filename')
-
-        then:
-        1 * filesCollection.withDocumentClass(Document) >> filesCollection
-        1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
-        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first() >> null
-
-        then:
-        1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_) >> []
-
-        then:
-        1 * filesCollection.createIndex({ index -> index == Document.parse('{"filename": 1, "uploadDate": 1 }') })
-
-        then:
-        1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_) >> []
-
-        then:
-        1 * chunksCollection.createIndex({ index -> index == Document.parse('{"files_id": 1, "n": 1}') },
-                { indexOptions -> indexOptions.isUnique() })
-    }
-
-    def 'should not create indexes if they already exist'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def listIndexesIterable = Mock(ListIndexesIterable)
-        def findIterable = Mock(FindIterable)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        gridFSBucket.openUploadStream('filename')
-
-        then:
-        1 * filesCollection.withDocumentClass(Document) >> filesCollection
-        1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.find() >> findIterable
-        1 * findIterable.projection(new Document('_id', 1)) >> findIterable
-        1 * findIterable.first() >> null
-
-        then:
-        1 * filesCollection.withReadPreference(primary()) >> filesCollection
-        1 * filesCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_) >> [Document.parse('{"key": {"_id": 1}}'),
-                                            Document.parse('{"key": {"filename": 1, "uploadDate": 1 }}')]
-
-        then:
-        0 * filesCollection.createIndex(_)
-
-        then:
-        1 * chunksCollection.withReadPreference(primary()) >> chunksCollection
-        1 * chunksCollection.listIndexes() >> listIndexesIterable
-        1 * listIndexesIterable.into(_) >> [Document.parse('{"key": {"_id": 1}}'),
-                                            Document.parse('{"key": {"files_id": 1, "n": 1 }}')]
-
-        then:
-        0 * chunksCollection.createIndex(_)
-    }
-
-    def 'should delete from files collection then chunks collection'() {
-        given:
-        def fileId = new ObjectId()
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        gridFSBucket.delete(fileId)
-
-        then: 'Delete from the files collection first'
-        1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId))) >> DeleteResult.acknowledged(1)
-
-        then:
-        1 * chunksCollection.deleteMany(new Document('files_id', new BsonObjectId(fileId)))
-    }
-
-    def 'should throw an exception when deleting if no record in the files collection'() {
-        given:
-        def fileId = new ObjectId()
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        gridFSBucket.delete(fileId)
-
-        then: 'Delete from the files collection first'
-        1 * filesCollection.deleteOne(new Document('_id', new BsonObjectId(fileId))) >> DeleteResult.acknowledged(0)
-
-        then: 'Should still delete any orphan chunks'
-        1 * chunksCollection.deleteMany(new Document('files_id', new BsonObjectId(fileId)))
-
-        then:
-        thrown(MongoGridFSException)
-    }
-
-    def 'should rename a file'() {
-        given:
-        def id = new ObjectId()
-        def fileId = new BsonObjectId(id)
-        def filesCollection = Mock(MongoCollection)
-        def newFilename = 'newFilename'
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection))
-
-        when:
-        gridFSBucket.rename(id, newFilename)
-
-        then:
-        1 * filesCollection.updateOne(new BsonDocument('_id', fileId),
-                new BsonDocument('$set',
-                        new BsonDocument('filename', new BsonString(newFilename)))) >> new UpdateResult.UnacknowledgedUpdateResult()
-
-        when:
-        gridFSBucket.rename(fileId, newFilename)
-
-        then:
-        1 * filesCollection.updateOne(new BsonDocument('_id', fileId),
-                new BsonDocument('$set',
-                        new BsonDocument('filename', new BsonString(newFilename)))) >> new UpdateResult.UnacknowledgedUpdateResult()
-    }
-
-    def 'should throw an exception renaming non existent file'() {
-        given:
-        def fileId = new ObjectId()
-        def filesCollection = Mock(MongoCollection) {
-            1 * updateOne(_, _) >> new UpdateResult.AcknowledgedUpdateResult(0, 0, null)
-        }
-        def newFilename = 'newFilename'
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, Stub(MongoCollection))
-
-        when:
-        gridFSBucket.rename(fileId, newFilename)
-
-        then:
-        thrown(MongoGridFSException)
-    }
-
-    def 'should be able to drop the bucket'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def gridFSBucket = new GridFSBucketImpl('fs', 255, filesCollection, chunksCollection)
-
-        when:
-        gridFSBucket.drop()
-
-        then: 'drop the files collection first'
-        1 * filesCollection.drop()
-
-        then:
-        1 * chunksCollection.drop()
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSDownloadStreamSpecification.groovy b/driver/src/test/unit/com/mongodb/client/gridfs/GridFSDownloadStreamSpecification.groovy
deleted file mode 100644
index 050cc401700..00000000000
--- a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSDownloadStreamSpecification.groovy
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.gridfs
-
-import com.mongodb.MongoGridFSException
-import com.mongodb.client.FindIterable
-import com.mongodb.client.MongoCollection
-import com.mongodb.client.MongoCursor
-import com.mongodb.client.gridfs.model.GridFSFile
-import org.bson.BsonObjectId
-import org.bson.Document
-import org.bson.types.Binary
-import org.bson.types.ObjectId
-import spock.lang.Specification
-
-class GridFSDownloadStreamSpecification extends Specification {
-    def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 3L, 2, new Date(), 'abc', new Document())
-
-    def 'should return the file info'() {
-        when:
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, Stub(MongoCollection))
-
-        then:
-        downloadStream.getGridFSFile() == fileInfo
-    }
-
-    def 'should query the chunks collection as expected'() {
-        when:
-        def twoBytes = new byte[2]
-        def oneByte = new byte[1]
-        def findQuery = new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 0))
-        def sort = new Document('n', 1)
-        def chunkDocument = new Document('files_id', fileInfo.getId())
-                .append('n', 0)
-                .append('data', new Binary(twoBytes))
-
-        def secondChunkDocument = new Document('files_id', fileInfo.getId())
-                .append('n', 1)
-                .append('data', new Binary(oneByte))
-
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        then:
-        downloadStream.available() == 0
-
-        when:
-        def result = downloadStream.read()
-
-        then:
-        result == (twoBytes[0] & 0xFF)
-        1 * chunksCollection.find(findQuery) >> findIterable
-        1 * findIterable.sort(sort) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-
-        then:
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        downloadStream.available() == 1
-
-        when:
-        result = downloadStream.read()
-
-        then:
-        result == (twoBytes[1] & 0xFF)
-        0 * mongoCursor.hasNext()
-        0 * mongoCursor.next()
-        downloadStream.available() == 0
-
-        when:
-        result = downloadStream.read()
-
-        then:
-        result == (oneByte[0] & 0xFF)
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> secondChunkDocument
-
-        when:
-        result = downloadStream.read()
-
-        then:
-        result == -1
-    }
-
-    def 'should create a new cursor each time when using batchSize 1'() {
-        when:
-        def twoBytes = new byte[2]
-        def oneByte = new byte[1]
-        def findQuery = new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 0))
-        def secondFindQuery = new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 1))
-        def sort = new Document('n', 1)
-        def chunkDocument = new Document('files_id', fileInfo.getId())
-                .append('n', 0)
-                .append('data', new Binary(twoBytes))
-
-        def secondChunkDocument = new Document('files_id', fileInfo.getId())
-                .append('n', 1)
-                .append('data', new Binary(oneByte))
-
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection).batchSize(1)
-
-        then:
-        downloadStream.available() == 0
-
-        when:
-        def result = downloadStream.read()
-
-        then:
-        result == (twoBytes[0] & 0xFF)
-        1 * chunksCollection.find(findQuery) >> findIterable
-        1 * findIterable.sort(sort) >> findIterable
-        1 * findIterable.batchSize(1) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-
-        then:
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        downloadStream.available() == 1
-
-        when:
-        result = downloadStream.read()
-
-        then:
-        result == (twoBytes[1] & 0xFF)
-        0 * mongoCursor.hasNext()
-        0 * mongoCursor.next()
-        downloadStream.available() == 0
-
-        when:
-        result = downloadStream.read()
-
-        then:
-        result == (oneByte[0] & 0xFF)
-        1 * chunksCollection.find(secondFindQuery) >> findIterable
-        1 * findIterable.sort(sort) >> findIterable
-        1 * findIterable.batchSize(1) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> secondChunkDocument
-
-        when:
-        result = downloadStream.read()
-
-        then:
-        result == -1
-    }
-
-    def 'should skip to the correct point'() {
-        given:
-        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 60L, 25, new Date(), 'abc', new Document())
-
-        def firstChunkBytes = 1..25 as byte[]
-        def thirdChunkBytes = 51 .. 60 as byte[]
-
-        def sort = new Document('n', 1)
-
-        def findQueries = [new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 0)),
-                           new Document('files_id', fileInfo.getId()).append('n', new Document('$gte', 2))]
-        def chunkDocuments =
-                [new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(firstChunkBytes)),
-                 new Document('files_id', fileInfo.getId()).append('n', 2).append('data', new Binary(thirdChunkBytes))]
-
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        when:
-        def skipResult = downloadStream.skip(15)
-
-        then:
-        skipResult == 15L
-        0 * chunksCollection.find(_)
-
-        when:
-        def readByte = new byte[5]
-        downloadStream.read(readByte)
-
-        then:
-        1 * chunksCollection.find(findQueries[0]) >> findIterable
-        1 * findIterable.sort(sort) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocuments[0]
-
-        then:
-        readByte == [16, 17, 18, 19, 20] as byte[]
-
-        when:
-        skipResult = downloadStream.skip(35)
-
-        then:
-        skipResult == 35L
-        0 * chunksCollection.find(_)
-
-        when:
-        downloadStream.read(readByte)
-
-        then:
-        1 * chunksCollection.find(findQueries[1]) >> findIterable
-        1 * findIterable.sort(sort) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocuments[1]
-
-        then:
-        readByte == [56, 57, 58, 59, 60] as byte[]
-
-        when:
-        skipResult = downloadStream.skip(1)
-
-        then:
-        skipResult == 0L
-        0 * chunksCollection.find(_)
-    }
-
-    def 'should mark and reset to the correct point'() {
-        given:
-        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 25L, 25, new Date(), 'abc', new Document())
-
-        def expected10Bytes = 11 .. 20 as byte[]
-        def firstChunkBytes = 1..25 as byte[]
-
-        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(firstChunkBytes))
-
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        when:
-        def readByte = new byte[10]
-        downloadStream.read(readByte)
-
-        then:
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        then:
-        readByte == 1 .. 10 as byte[]
-
-        when:
-        downloadStream.mark()
-
-        then:
-        0 * chunksCollection.find(_)
-
-        when:
-        downloadStream.read(readByte)
-
-        then:
-        readByte == expected10Bytes
-
-        when:
-        downloadStream.reset()
-
-        then:
-        0 * chunksCollection.find(_)
-
-        when:
-        downloadStream.read(readByte)
-
-        then:
-        0 * chunksCollection.find(_)
-        readByte == expected10Bytes
-    }
-
-
-    def 'should mark and reset across chunks'() {
-        given:
-        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 50L, 25, new Date(), 'abc', new Document())
-
-        def firstChunkBytes = 1..25 as byte[]
-        def secondChunkBytes = 26 .. 50 as byte[]
-
-        def chunkDocuments =
-                [new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(firstChunkBytes)),
-                 new Document('files_id', fileInfo.getId()).append('n', 1).append('data', new Binary(secondChunkBytes))]
-
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        when:
-        downloadStream.mark()
-        def readByte = new byte[25]
-        downloadStream.read(readByte)
-
-        then:
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocuments[0]
-
-        then:
-        readByte == firstChunkBytes
-
-        then:
-        0 * chunksCollection.find(_)
-
-        when:
-        downloadStream.read(readByte)
-
-        then:
-        readByte == secondChunkBytes
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocuments[1]
-
-        when: 'check read to EOF'
-        def result = downloadStream.read(readByte)
-
-        then:
-        result == -1
-
-        when:
-        downloadStream.reset()
-
-        then:
-        0 * chunksCollection.find(_)
-
-        when:
-        downloadStream.read(readByte)
-
-        then:
-        readByte == firstChunkBytes
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocuments[0]
-    }
-
-    def 'should validate next chunk when marked and reset at eof'() {
-        given:
-        def fileInfo = new GridFSFile(new BsonObjectId(new ObjectId()), 'filename', 25L, 25, new Date(), 'abc', new Document())
-
-        def chunkBytes = 1..25 as byte[]
-        def chunkDocument = new Document('files_id', fileInfo.getId()).append('n', 0).append('data', new Binary(chunkBytes))
-
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        when:
-        def readByte = new byte[25]
-        downloadStream.read(readByte)
-
-        then:
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        then:
-        readByte == chunkBytes
-
-        when:
-        downloadStream.mark()
-
-        then:
-        0 * chunksCollection.find(_)
-
-        when:
-        downloadStream.reset()
-
-        then:
-        0 * chunksCollection.find(_)
-
-        when: 'Trying to read past eof'
-        def result = downloadStream.read(readByte)
-
-        then:
-        result == -1
-
-        when: 'Resets back to eof'
-        downloadStream.reset()
-
-        then:
-        0 * chunksCollection.find(_)
-
-        when:
-        result = downloadStream.read(readByte)
-
-        then:
-        result == -1
-
-    }
-
-    def 'should not throw an exception when trying to mark post close'() {
-        given:
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, Stub(MongoCollection))
-        downloadStream.close()
-
-        when:
-        downloadStream.mark()
-
-        then:
-        notThrown(MongoGridFSException)
-
-        when:
-        downloadStream.mark(1)
-
-        then:
-        notThrown(MongoGridFSException)
-    }
-
-    def 'should handle negative skip value correctly '() {
-        given:
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, Stub(MongoCollection))
-
-        when:
-        def result = downloadStream.skip(-1)
-
-        then:
-        result == 0L
-    }
-
-    def 'should handle skip that is larger or equal to the file length'() {
-        given:
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        when:
-        def result = downloadStream.skip(skipValue)
-
-        then:
-        result == 3L
-        0 * chunksCollection.find(_)
-
-        when:
-        result = downloadStream.read()
-
-        then:
-        result == -1
-
-        where:
-        skipValue << [3, 100]
-    }
-
-    def 'should throw if trying to pass negative batchSize'() {
-        given:
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, Stub(MongoCollection))
-
-        when:
-        downloadStream.batchSize(0)
-
-        then:
-        notThrown(IllegalArgumentException)
-
-
-        when:
-        downloadStream.batchSize(-1)
-
-        then:
-        thrown(IllegalArgumentException)
-    }
-
-    def 'should throw if no chunks found when data is expected'() {
-        given:
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        when:
-        downloadStream.read()
-
-        then:
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> false
-
-        then:
-        thrown(MongoGridFSException)
-    }
-
-    def 'should throw if chunk data differs from the expected'() {
-        given:
-        def chunkDocument = new Document('files_id', fileInfo.getId())
-                .append('n', 0)
-                .append('data', new Binary(data))
-
-        def mongoCursor = Mock(MongoCursor)
-        def findIterable = Mock(FindIterable)
-        def chunksCollection = Mock(MongoCollection)
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, chunksCollection)
-
-        when:
-        downloadStream.read()
-
-        then:
-        1 * chunksCollection.find(_) >> findIterable
-        1 * findIterable.sort(_) >> findIterable
-        1 * findIterable.batchSize(0) >> findIterable
-        1 * findIterable.iterator() >> mongoCursor
-        1 * mongoCursor.hasNext() >> true
-        1 * mongoCursor.next() >> chunkDocument
-
-        then:
-        thrown(MongoGridFSException)
-
-        where:
-        data << [new byte[1], new byte[100]]
-    }
-
-    def 'should throw an exception when trying to action post close'() {
-        given:
-        def downloadStream = new GridFSDownloadStreamImpl(fileInfo, Stub(MongoCollection))
-        downloadStream.close()
-
-        when:
-        downloadStream.read()
-
-        then:
-        thrown(MongoGridFSException)
-
-        when:
-        downloadStream.skip(10)
-
-        then:
-        thrown(MongoGridFSException)
-
-        when:
-        downloadStream.reset()
-
-        then:
-        thrown(MongoGridFSException)
-
-        when:
-        downloadStream.read(new byte[10])
-
-        then:
-        thrown(MongoGridFSException)
-
-        when:
-        downloadStream.read(new byte[10], 0, 10)
-
-        then:
-        thrown(MongoGridFSException)
-    }
-}
diff --git a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSUploadStreamSpecification.groovy b/driver/src/test/unit/com/mongodb/client/gridfs/GridFSUploadStreamSpecification.groovy
deleted file mode 100644
index 6df996bc6d2..00000000000
--- a/driver/src/test/unit/com/mongodb/client/gridfs/GridFSUploadStreamSpecification.groovy
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.mongodb.client.gridfs
-
-import com.mongodb.MongoGridFSException
-import com.mongodb.client.MongoCollection
-import com.mongodb.client.gridfs.model.GridFSFile
-import org.bson.BsonObjectId
-import org.bson.BsonString
-import org.bson.Document
-import org.bson.types.Binary
-import spock.lang.Specification
-
-import java.security.MessageDigest
-
-class GridFSUploadStreamSpecification extends Specification {
-    def fileId = new BsonObjectId()
-    def filename = 'filename'
-    def metadata = new Document()
-
-    def 'should return the file id'() {
-        when:
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255, metadata)
-
-        then:
-        uploadStream.getId() == fileId
-    }
-
-    def 'should write the buffer it reaches the chunk size'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 2, metadata)
-
-        when:
-        uploadStream.write(1)
-
-        then:
-        0 * chunksCollection.insertOne(_)
-
-        when:
-        uploadStream.write(1)
-
-        then:
-        1 * chunksCollection.insertOne(_)
-    }
-
-    def 'should write to the files collection on close'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, null)
-
-        when:
-        uploadStream.write('file content ' as byte[])
-
-        then:
-        0 * chunksCollection.insertOne(_)
-
-        when:
-        uploadStream.close()
-
-        then:
-        1 * chunksCollection.insertOne(_)
-        1 * filesCollection.insertOne(_)
-    }
-
-    def 'should write to the files and chunks collection as expected close'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def content = 'file content ' as byte[]
-        def metadata = new Document('contentType', 'text/txt')
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata)
-        def chunksData
-        def fileData
-
-        when:
-        uploadStream.write(content)
-        uploadStream.close()
-
-        then:
-        1 * chunksCollection.insertOne { Document data -> chunksData = data }
-
-        then:
-        1 * filesCollection.insertOne { GridFSFile data -> fileData = data }
-        then:
-        chunksData.get('files_id') == fileId
-        chunksData.getInteger('n') == 0
-        chunksData.get('data', Binary).getData() == content
-
-        fileData.getId() == fileId
-        fileData.getFilename() == filename
-        fileData.getLength() == content.length as Long
-        fileData.getChunkSize() == 255
-        fileData.getMD5() == MessageDigest.getInstance('MD5').digest(content).encodeHex().toString()
-        fileData.getMetadata() == metadata
-    }
-
-    def 'should not write an empty chunk'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata)
-
-        when:
-        uploadStream.close()
-
-        then:
-        0 * chunksCollection.insertOne(_)
-        1 * filesCollection.insertOne(_)
-    }
-
-    def 'should delete any chunks when calling abort'() {
-        given:
-        def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), chunksCollection, fileId, filename, 255, metadata)
-
-        when:
-        uploadStream.write('file content ' as byte[])
-        uploadStream.abort()
-
-        then:
-        1 * chunksCollection.deleteMany(new Document('files_id', fileId))
-    }
-
-    def 'should close the stream on abort'() {
-        given:
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), Stub(MongoCollection), fileId, filename, 255, metadata)
-        uploadStream.write('file content ' as byte[])
-        uploadStream.abort()
-
-        when:
-        uploadStream.write(1)
-
-        then:
-        thrown(MongoGridFSException)
-    }
-
-    def 'should not do anything when calling flush'() {
-        given:
-        def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(Stub(MongoCollection), chunksCollection, fileId, filename, 255, metadata)
-
-        when:
-        uploadStream.write('file content ' as byte[])
-        uploadStream.flush()
-
-        then:
-        0 * chunksCollection.insertOne(_)
-    }
-
-    def 'should throw an exception when trying to action post close'() {
-        given:
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata)
-
-        when:
-        uploadStream.close()
-        uploadStream.write(1)
-
-        then:
-        thrown(MongoGridFSException)
-    }
-
-    def 'should throw an exception when calling getObjectId and the fileId is not an ObjectId'() {
-        given:
-        def fileId = new BsonString('myFile')
-        def filesCollection = Mock(MongoCollection)
-        def chunksCollection = Mock(MongoCollection)
-        def uploadStream = new GridFSUploadStreamImpl(filesCollection, chunksCollection, fileId, filename, 255, metadata)
-
-        when:
-        uploadStream.getObjectId()
-
-        then:
-        thrown(MongoGridFSException)
-    }
-}
diff --git a/driver/src/test/unit/org/bson/LazyBSONObjectSpecification.groovy b/driver/src/test/unit/org/bson/LazyBSONObjectSpecification.groovy
deleted file mode 100644
index 41b898685d9..00000000000
--- a/driver/src/test/unit/org/bson/LazyBSONObjectSpecification.groovy
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bson
-
-import com.mongodb.BasicDBObject
-import org.bson.types.BSONTimestamp
-import org.bson.types.Binary
-import org.bson.types.Code
-import org.bson.types.CodeWScope
-import org.bson.types.MaxKey
-import org.bson.types.MinKey
-import org.bson.types.ObjectId
-import org.bson.types.Symbol
-import spock.lang.Specification
-import spock.lang.Unroll
-
-import java.util.regex.Pattern
-
-@SuppressWarnings(['LineLength'])
-class LazyBSONObjectSpecification extends Specification {
-
-    def setupSpec() {
-        Map.metaClass.bitwiseNegate = { new BasicDBObject(delegate) }
-        Pattern.metaClass.equals = { Pattern other ->
-            delegate.pattern() == other.pattern() && delegate.flags() == other.flags()
-        }
-    }
-
-    @Unroll
-    def 'should read #type'() {
-        def lazyBSONObject = new LazyBSONObject(bytes as byte[], new LazyBSONCallback())
-        given:
-
-        expect:
-        value == lazyBSONObject.get('f')
-        lazyBSONObject.keySet().contains('f')
-
-        where:
-        value                                                                 | bytes
-        -1.01                                                                 | [16, 0, 0, 0, 1, 102, 0, 41, 92, -113, -62, -11, 40, -16, -65, 0]
-        Float.MIN_VALUE                                                       | [16, 0, 0, 0, 1, 102, 0, 0, 0, 0, 0, 0, 0, -96, 54, 0]
-        Double.MAX_VALUE                                                      | [16, 0, 0, 0, 1, 102, 0, -1, -1, -1, -1, -1, -1, -17, 127, 0]
-        0.0                                                                   | [16, 0, 0, 0, 1, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-        ''                                                                    | [13, 0, 0, 0, 2, 102, 0, 1, 0, 0, 0, 0, 0]
-        'danke'                                                               | [18, 0, 0, 0, 2, 102, 0, 6, 0, 0, 0, 100, 97, 110, 107, 101, 0, 0]
-        ',+\\\"<>;[]{}@#$%^&*()+_'                                            | [35, 0, 0, 0, 2, 102, 0, 23, 0, 0, 0, 44, 43, 92, 34, 60, 62, 59, 91, 93, 123, 125, 64, 35, 36, 37, 94, 38, 42, 40, 41, 43, 95, 0, 0]
-        'a\u00e9\u3042\u0430\u0432\u0431\u0434'                               | [27, 0, 0, 0, 2, 102, 0, 15, 0, 0, 0, 97, -61, -87, -29, -127, -126, -48, -80, -48, -78, -48, -79, -48, -76, 0, 0]
-        new LazyBSONObject([5, 0, 0, 0, 0] as byte[], new LazyBSONCallback()) | [13, 0, 0, 0, 3, 102, 0, 5, 0, 0, 0, 0, 0]
-        []                                                                    | [13, 0, 0, 0, 4, 102, 0, 5, 0, 0, 0, 0, 0]
-        [1, 2, 3] as int[]                                                    | [34, 0, 0, 0, 4, 102, 0, 26, 0, 0, 0, 16, 48, 0, 1, 0, 0, 0, 16, 49, 0, 2, 0, 0, 0, 16, 50, 0, 3, 0, 0, 0, 0, 0]
-        [[]]                                                                  | [21, 0, 0, 0, 4, 102, 0, 13, 0, 0, 0, 4, 48, 0, 5, 0, 0, 0, 0, 0, 0]
-        new Binary((byte) 0x01, (byte[]) [115, 116, 11])                      | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 1, 115, 116, 11, 0]
-        [13, 12] as byte[]                                                    | [15, 0, 0, 0, 5, 102, 0, 2, 0, 0, 0, 0, 13, 12, 0]
-        [102, 111, 111] as byte[]                                             | [16, 0, 0, 0, 5, 102, 0, 3, 0, 0, 0, 0, 102, 111, 111, 0]
-        new ObjectId('50d3332018c6a1d8d1662b61')                              | [20, 0, 0, 0, 7, 102, 0, 80, -45, 51, 32, 24, -58, -95, -40, -47, 102, 43, 97, 0]
-        true                                                                  | [9, 0, 0, 0, 8, 102, 0, 1, 0]
-        false                                                                 | [9, 0, 0, 0, 8, 102, 0, 0, 0]
-        new Date(582163200)                                                   | [16, 0, 0, 0, 9, 102, 0, 0, 27, -77, 34, 0, 0, 0, 0, 0]
-        null                                                                  | [8, 0, 0, 0, 10, 102, 0, 0]
-        null                                                                  | [8, 0, 0, 0, 6, 102, 0, 0]
-        Pattern.compile('[a]*', Pattern.CASE_INSENSITIVE)                     | [15, 0, 0, 0, 11, 102, 0, 91, 97, 93, 42, 0, 105, 0, 0]
-        new Code('var i = 0')                                                 | [22, 0, 0, 0, 13, 102, 0, 10, 0, 0, 0, 118, 97, 114, 32, 105, 32, 61, 32, 48, 0, 0]
-        new Symbol('c')                                                       | [14, 0, 0, 0, 14, 102, 0, 2, 0, 0, 0, 99, 0, 0]
-        new CodeWScope('i++', ~['x': 1])                                      | [32, 0, 0, 0, 15, 102, 0, 24, 0, 0, 0, 4, 0, 0, 0, 105, 43, 43, 0, 12, 0, 0, 0, 16, 120, 0, 1, 0, 0, 0, 0, 0]
-        -12                                                                   | [12, 0, 0, 0, 16, 102, 0, -12, -1, -1, -1, 0]
-        Integer.MIN_VALUE                                                     | [12, 0, 0, 0, 16, 102, 0, 0, 0, 0, -128, 0]
-        0                                                                     | [12, 0, 0, 0, 16, 102, 0, 0, 0, 0, 0, 0]
-        new BSONTimestamp(123999401, 44332)                                   | [16, 0, 0, 0, 17, 102, 0, 44, -83, 0, 0, -87, 20, 100, 7, 0]
-        Long.MAX_VALUE                                                        | [16, 0, 0, 0, 18, 102, 0, -1, -1, -1, -1, -1, -1, -1, 127, 0]
-        new MinKey()                                                          | [8, 0, 0, 0, -1, 102, 0, 0]
-        new MaxKey()                                                          | [8, 0, 0, 0, 127, 102, 0, 0]
-
-        type = BsonType.findByValue(bytes[4])
-    }
-
-    def 'should have nested items as lazy'() {
-        given:
-        byte[] bytes = [
-                53, 0, 0, 0, 4, 97, 0, 26, 0, 0, 0, 16, 48, 0, 1, 0, 0, 0, 16, 49, 0, 2, 0, 0, 0, 16, 50, 0,
-                3, 0, 0, 0, 0, 3, 111, 0, 16, 0, 0, 0, 1, 122, 0, -102, -103, -103, -103, -103, -103, -71, 63, 0, 0
-        ];
-
-        when:
-        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
-
-        then:
-        document.get('a') instanceof LazyBSONList
-        document.get('o') instanceof LazyBSONObject
-    }
-
-    def 'should not understand DBRefs'() {
-        given:
-        byte[] bytes = [
-                44, 0, 0, 0, 3, 102, 0, 36, 0, 0, 0, 2, 36, 114, 101, 102,
-                0, 4, 0, 0, 0, 97, 46, 98, 0, 7, 36, 105, 100, 0, 18, 52,
-                86, 120, -112, 18, 52, 86, 120, -112, 18, 52, 0, 0,
-        ]
-
-        when:
-        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
-
-        then:
-        document.get('f') instanceof LazyBSONObject
-        document.get('f').keySet() == ['$ref', '$id'] as Set
-
-    }
-
-    def 'should retain fields order'() {
-        given:
-        byte[] bytes = [
-                47, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 16, 98, 0, 2, 0, 0, 0, 16, 100, 0, 3, 0, 0,
-                0, 16, 99, 0, 4, 0, 0, 0, 16, 101, 0, 5, 0, 0, 0, 16, 48, 0, 6, 0, 0, 0, 0
-        ]
-
-        when:
-        Iterator<String> iterator = new LazyBSONObject(bytes, new LazyBSONCallback()).keySet().iterator()
-
-        then:
-        iterator.next() == 'a'
-        iterator.next() == 'b'
-        iterator.next() == 'd'
-        iterator.next() == 'c'
-        iterator.next() == 'e'
-        iterator.next() == '0'
-        !iterator.hasNext()
-    }
-
-    def 'should be able to compare itself to others'() {
-        given:
-        byte[] bytes = [
-                39, 0, 0, 0, 3, 97, 0,
-                14, 0, 0, 0, 2, 120, 0, 2, 0, 0, 0, 121, 0, 0,
-                3, 98, 0,
-                14, 0, 0, 0, 2, 120, 0, 2, 0, 0, 0, 121, 0, 0,
-                0
-        ]
-
-        when:
-        LazyBSONObject bsonObject1 = new LazyBSONObject(bytes, new LazyBSONCallback())
-        LazyBSONObject bsonObject2 = new LazyBSONObject(bytes, new LazyBSONCallback())
-        LazyBSONObject bsonObject3 = new LazyBSONObject(bytes, 7, new LazyBSONCallback())
-        LazyBSONObject bsonObject4 = new LazyBSONObject(bytes, 24, new LazyBSONCallback())
-
-
-        then:
-        bsonObject1 == bsonObject2
-        bsonObject3 == bsonObject4
-        bsonObject1 != bsonObject3
-        bsonObject4 == new LazyBSONObject([14, 0, 0, 0, 2, 120, 0, 2, 0, 0, 0, 121, 0, 0] as byte[], new LazyBSONCallback())
-        bsonObject1 != new LazyBSONObject([] as byte[], new LazyBSONCallback())
-    }
-
-    def 'should return the size of a document'() {
-        given:
-        byte[] bytes = [12, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 0]
-
-        when:
-        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
-
-        then:
-        document.getBSONSize() == 12
-    }
-
-    def 'should understand that object is empty'() {
-        given:
-        byte[] bytes = [5, 0, 0, 0, 0]
-
-        when:
-        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
-
-        then:
-        document.isEmpty()
-    }
-
-    def 'should implement Map.keySet()'() {
-        given:
-        byte[] bytes = [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0]
-
-        when:
-        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
-
-        then:
-        document.containsField('a')
-        !document.containsField('z')
-        document.get('z') == null
-        document.keySet() == ['a', 'b'] as Set
-    }
-
-    def 'should implement Map.entrySet()'() {
-        given:
-        byte[] bytes = [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0]
-
-        when:
-        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
-
-        then:
-        document.entrySet().size() == 2
-        document.entrySet().find { it.value == 1 } != null
-        document.entrySet().find { it.value == true } != null
-    }
-
-    def 'should throw on modification'() {
-        given:
-        LazyBSONObject document = new LazyBSONObject(
-                [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0] as byte[],
-                new LazyBSONCallback()
-        )
-
-        when:
-        document.keySet().add('c')
-
-        then:
-        thrown(UnsupportedOperationException)
-
-        when:
-        document.put('c', 2)
-
-        then:
-        thrown(UnsupportedOperationException)
-
-        when:
-        document.removeField('a')
-
-        then:
-        thrown(UnsupportedOperationException)
-
-        when:
-        document.toMap().put('a', 22)
-
-        then:
-        thrown(UnsupportedOperationException)
-    }
-
-    def 'should pipe to stream'() {
-        given:
-        byte[] bytes = [16, 0, 0, 0, 16, 97, 0, 1, 0, 0, 0, 8, 98, 0, 1, 0];
-        LazyBSONObject document = new LazyBSONObject(bytes, new LazyBSONCallback())
-        ByteArrayOutputStream baos = new ByteArrayOutputStream()
-
-        when:
-        document.pipe(baos)
-
-        then:
-        bytes == baos.toByteArray()
-
-    }
-
-
-}
diff --git a/gradle.properties b/gradle.properties
index b9e4f00dbff..c7d4a40e24e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008-2014 MongoDB, Inc.
+# Copyright 2008-present MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,3 +15,4 @@
 #
 
 org.gradle.daemon=true
+org.gradle.jvmargs=-Duser.country=US -Duser.language=en
diff --git a/gradle/deploy.gradle b/gradle/deploy.gradle
index 6ab358ba2d2..a70a2d2e9cf 100644
--- a/gradle/deploy.gradle
+++ b/gradle/deploy.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,53 +14,37 @@
  * limitations under the License.
  */
 
-/**
- * Configures the nexus plugin - see: https://github.com/bmuschko/gradle-nexus-plugin
- *
- * Ensure you have configured ~/.gradle/gradle.properties for both the nexus and signing plugins
- */
-configure(subprojects - project(':util')) {
-    apply plugin: 'com.bmuschko.nexus'
-
-    modifyPom {
-        project {
-
-            url 'https://github.com/mongodb/mongo-java-driver'
-
-            scm {
-                url 'https://github.com/mongodb/mongo-java-driver'
-                connection 'scm:https://github.com/mongodb/mongo-java-driver.git'
-                developerConnection 'scm:git@github.com:mongodb/mongo-java-driver.git'
-            }
-
-            licenses {
-                license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    distribution 'repo'
-                }
-            }
-
-            developers {
-                developer {
-                    name 'Various'
-                    organization = 'MongoDB'
-                }
-            }
+def deployedProjects = subprojects.findAll { !['util'].contains(it.name) }
+configure(deployedProjects) {
+    
+    task publishSnapshots {
+        group = 'publishing'
+        description = 'Publishes snapshots to Sonatype'
+        if (version.endsWith('-SNAPSHOT')) {
+            dependsOn tasks.withType(PublishToMavenRepository)
         }
     }
 
-    modifyPom { pom ->
-        pom.dependencies.findAll {dep -> dep.groupId == 'io.netty' || dep.groupId == 'org.slf4j' }.each { it.optional = true }
-        // no need to publish test dependencies
-        pom.dependencies.removeAll { it.scope == "test" }
-    }
-
-    task uploadSnapshotArchives(dependsOn: uploadArchives) {
-        if (!version.endsWith("-SNAPSHOT")) {
-            enabled = false;
-            dependsOn = [];
+    task publishArchives {
+        group = 'publishing'
+        description = 'Publishes a release and uploads to Sonatype / Maven Central'
+        doFirst { 
+            if (project.gitVersion != version) {
+                def cause = """
+                | Version mismatch:
+                | =================
+                |
+                | $version != $gitVersion 
+                |
+                | The project version does not match the git tag.
+                |""".stripMargin()
+                throw new GradleException(cause)
+            } else {
+                println("Publishing: ${project.name} : ${project.gitVersion}")
+            }
+        }
+        if (project.gitVersion == version) {
+            dependsOn tasks.withType(PublishToMavenRepository)
         }
     }
-
 }
diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle
new file mode 100644
index 00000000000..b0da65e69ff
--- /dev/null
+++ b/gradle/javadoc.gradle
@@ -0,0 +1,96 @@
+import static org.gradle.util.CollectionUtils.single
+
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+def javaMainProjects = subprojects.findAll { !['util'].contains(it.name) }
+task docs(type: Javadoc) {
+    destinationDir = new File(rootDir, 'build/docs')
+    javaMainProjects.each { proj ->
+        proj.tasks.withType(Javadoc).each { javadocTask ->
+            source += javadocTask.source
+            classpath += javadocTask.classpath
+            excludes += javadocTask.excludes
+            includes += javadocTask.includes
+            dependsOn +=javadocTask.dependsOn
+        }
+    }
+}
+
+def utilProject = project(':util')
+allprojects {
+    afterEvaluate { project ->
+        tasks.withType(Javadoc) {
+            dependsOn utilProject.compileJava //We need taglets to be compiled
+            exclude "**/com/mongodb/**/benchmark/**"
+            exclude "**/com/mongodb/**/internal/**"
+            exclude "**/org/bson/**/internal/**"
+            options {
+                author = true
+                version = true
+                links 'https://docs.oracle.com/en/java/javase/11/docs/api/'
+                tagletPath single(utilProject.sourceSets.main.output.classesDirs)
+                taglets 'ManualTaglet'
+                taglets 'DochubTaglet'
+                taglets 'ServerReleaseTaglet'
+                encoding = 'UTF-8'
+                charSet 'UTF-8'
+                docEncoding 'UTF-8'
+                addBooleanOption("html5", true)
+                addBooleanOption("-allow-script-in-comments", true)
+                header = '''
+                    | <script type="text/javascript">
+                    | function setLocationHash() {
+                    |   try {
+                    |     locationHash = top.location.hash;
+                    |     if (window.name == "classFrame" && locationHash != "") {
+                    |       window.location.hash = locationHash;
+                    |     }
+                    |   } catch (error) {}
+                    | };
+                    | function setGATrackingCode() {
+                    |   if (window.name == "" || window.name == "classFrame") {
+                    |       var _elqQ = _elqQ || [];
+                    |       _elqQ.push(["elqSetSiteId", "413370795"]);
+                    |       _elqQ.push(["elqTrackPageView"]);
+                    |       (function () {
+                    |       function async_load() { var s = document.createElement("script"); s.type = "text/javascript"; s.async = true; s.src = "//img03.en25.com/i/elqCfg.min.js"; var x = document.getElementsByTagName("script")[0]; x.parentNode.insertBefore(s, x); }
+                    |       if (window.addEventListener) window.addEventListener("DOMContentLoaded", async_load, false);
+                    |       else if (window.attachEvent) window.attachEvent("onload", async_load);
+                    |       })();
+                    |   }
+                    | };
+                    | function setSearchUrlPrefix() {
+                    |   if (typeof getURLPrefix === 'function') {
+                    |     var getURLPrefixOri = getURLPrefix;
+                    |     getURLPrefix = function(ui) {
+                    |       var urlPrefix = getURLPrefixOri(ui);
+                    |       return (urlPrefix && urlPrefix != "undefined/"  ? urlPrefix: "");
+                    |     };
+                    |   } else {
+                    |     window.setTimeout(setSearchUrlPrefix, 500 );
+                    |   }
+                    | };
+                    | setLocationHash();
+                    | setGATrackingCode();
+                    | setSearchUrlPrefix();
+                    |
+                    | </script>'''.stripMargin()
+            }
+        }
+    }
+}
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
new file mode 100644
index 00000000000..db72a562da7
--- /dev/null
+++ b/gradle/publish.gradle
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Configures publishing of the main java projects
+ */
+
+// Publishing helpers
+ext {
+    configurePom = { project ->
+        { ->
+                name = project.hasProperty('pomName') ? project.getProperty('pomName') : project.name
+                description = project.description
+                url = project.hasProperty('pomURL') ? project.getProperty('pomURL') : 'http://www.mongodb.org'
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                scm {
+                    url = 'https://github.com/mongodb/mongo-java-driver'
+                    connection = 'scm:https://github.com/mongodb/mongo-java-driver.git'
+                    developerConnection = 'scm:git@github.com:mongodb/mongo-java-driver.git'
+                }
+                developers {
+                    developer {
+                        name = 'Various'
+                        organization = 'MongoDB'
+                    }
+                }
+            }
+    }
+    configureMavenRepositories = { project ->
+        { ->
+            def snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+            def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+            maven {
+                url = project.version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+                credentials {
+                    username project.hasProperty('nexusUsername') ? project.getProperty('nexusUsername') : ''
+                    password project.hasProperty('nexusPassword') ? project.getProperty('nexusPassword') : ''
+                }
+            }
+        }
+    }
+}
+
+def javaMainProjects = subprojects.findAll { !['util', 'driver-benchmarks', 'driver-embedded'].contains(it.name) }
+configure(javaMainProjects) { project ->
+    apply plugin: 'maven-publish'
+    apply plugin: 'signing'
+
+    task sourcesJar(type: Jar) {
+        from project.sourceSets.main.allJava
+        classifier = 'sources'
+    }
+
+    task javadocJar(type: Jar) {
+        from javadoc
+        classifier = 'javadoc'
+    }
+
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                artifactId = project.archivesBaseName
+                from project.components.java
+                artifact sourcesJar
+                artifact javadocJar
+
+                pom configurePom(project)
+            }
+        }
+
+        repositories configureMavenRepositories(project)
+    }
+
+    afterEvaluate {
+        signing {
+            sign publishing.publications.mavenJava
+        }
+    }
+}
+
+/*
+For security we allow the signing-related project properties to be passed in as environment variables, which
+Gradle enables if they are prefixed with "ORG_GRADLE_PROJECT_".  But since environment variables can not contain
+the '.' character and the signing-related properties contain '.', here we map signing-related project properties with '_'
+to ones with '.' that are expected by the signing plugin.
+*/
+gradle.taskGraph.whenReady { taskGraph ->
+    if (taskGraph.allTasks.any { it instanceof Sign }) {
+        if (project.hasProperty("signing_keyId")) {
+            allprojects { ext."signing.keyId" = project.property("signing_keyId") }
+        }
+        if (project.hasProperty("signing_secretKeyRingFile")) {
+            allprojects { ext."signing.secretKeyRingFile" = project.property("signing_secretKeyRingFile") }
+        }
+        if (project.hasProperty("signing_password")) {
+            allprojects { ext."signing.password" = project.property("signing_password") }
+        }
+    }
+}
diff --git a/gradle/testColorOutput.gradle b/gradle/testColorOutput.gradle
new file mode 100644
index 00000000000..eeeeafa95f3
--- /dev/null
+++ b/gradle/testColorOutput.gradle
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driver' }) {
+    tasks.withType(Test) {
+
+        boolean IS_LIFECYCLE = logger.isEnabled(LogLevel.LIFECYCLE)
+        boolean IS_TRAVIS = project.hasProperty('travistest') ? project.travistest : false  && IS_LIFECYCLE
+        String ANSI_BOLD_WHITE = "\u001B[0;1m"
+        String ANSI_RESET = "\u001B[0m"
+        String ANSI_BLACK = "\u001B[30m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_YELLOW = "\u001B[33m"
+        String ANSI_WHITE = "\u001B[37m"
+        String PASSED = "\u2713"
+        String SKIPPED = "\u005F"
+        String FAILED = "\u2717" + ' [TEST FAILURE]'
+
+
+        beforeSuite { suite ->
+            if (!IS_LIFECYCLE || suite.name.startsWith("Test Run") || suite.name.startsWith("Gradle Worker")) return
+
+            if (suite.parent != null && suite.className != null) {
+                if (IS_TRAVIS) {
+                    logger.lifecycle("travis_fold:start:" + suite.name + "\r")
+                }
+                logger.lifecycle(ANSI_BOLD_WHITE + suite.name + ANSI_RESET)
+            }
+
+        }
+
+        beforeTest { descr ->
+            if (IS_LIFECYCLE) {
+                System.out.print("     Starting ${descr.name}")
+            }
+        }
+
+        afterTest { descr, result ->
+            if (!IS_LIFECYCLE) return
+            def indicator = ANSI_WHITE
+
+            if (result.failedTestCount > 0) indicator = ANSI_RED + FAILED + ANSI_RESET
+            else if (result.skippedTestCount > 0) indicator = ANSI_YELLOW + SKIPPED + ANSI_RESET
+            else indicator = ANSI_GREEN + PASSED + ANSI_RESET
+
+            System.out.print("\033[1A") // Move up
+            System.out.print("\033[2K") // Erase line content
+
+            logger.lifecycle("     ${indicator} ${descr.name} (${result.getEndTime() - result.getStartTime()} ms)")
+            if (result.failedTestCount > 0) {
+                logger.lifecycle(' ')
+            }
+        }
+
+        afterSuite { suite, result ->
+            if (!IS_LIFECYCLE) return
+            if (suite.parent != null && suite.className != null) {
+                if (IS_TRAVIS && result.failedTestCount == 0) {
+                    println("travis_fold:end:" + suite.name + "\r")
+                }
+                logger.lifecycle(' ')
+            }
+
+            if (!suite.parent) { // will match the outermost suite
+                def failStyle = ANSI_RED
+                def skipStyle = ANSI_YELLOW
+                def summaryStyle = ANSI_WHITE
+                if (result.failedTestCount > 0) {
+                    failStyle = ANSI_RED
+                }
+                if (result.skippedTestCount > 0) {
+                    skipStyle = ANSI_YELLOW
+                }
+
+                switch (result.resultType) {
+                    case TestResult.ResultType.SUCCESS:
+                        summaryStyle = ANSI_GREEN
+                        break
+                    case TestResult.ResultType.FAILURE:
+                        summaryStyle = ANSI_RED
+                        break
+                }
+
+                logger.lifecycle("--------------------------------------------------------------------------")
+                logger.lifecycle("Results: " + summaryStyle + "${result.resultType}" + ANSI_RESET
+                        + " (${result.testCount} tests, "
+                        + ANSI_GREEN + "${result.successfulTestCount} passed" + ANSI_RESET
+                        + ", " + failStyle + "${result.failedTestCount} failed" + ANSI_RESET
+                        + ", " + skipStyle + "${result.skippedTestCount} skipped" + ANSI_RESET
+                        + ")")
+                logger.lifecycle("--------------------------------------------------------------------------")
+            }
+        }
+
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 085a1cdc27d..c44b679acd3 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index afa34a3e553..2c717e44039 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon May 18 10:50:24 BST 2015
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 91a7e269e19..cccdd3d517f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282aa68..f9553162f12 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/mongo-java-driver/build.gradle b/mongo-java-driver/build.gradle
index f6d86d49078..f28ad5c31b0 100644
--- a/mongo-java-driver/build.gradle
+++ b/mongo-java-driver/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,31 +14,34 @@
  * limitations under the License.
  */
 
-def configDir = new File(rootDir, 'config')
-
-apply plugin: 'idea'
-apply plugin: 'osgi'
-
 archivesBaseName = 'mongo-java-driver'
 
-idea {
-    module {
-        sourceDirs = [] // Ignore in idea (prevents intellij crashing due to sources outside project dir)
-}
+description =  'The MongoDB Java Driver uber-artifact, containing the legacy driver, the mongodb-driver, mongodb-driver-core, and bson'
+ext {
+    pomName = 'MongoDB Java Driver'
 }
 
+
 // dependencies copied from driver-core
 dependencies {
+    compile "com.github.jnr:jnr-unixsocket:$jnrUnixsocketVersion", optional
     compile "io.netty:netty-buffer:$nettyVersion", optional
     compile "io.netty:netty-transport:$nettyVersion", optional
     compile "io.netty:netty-handler:$nettyVersion", optional
+    compile "org.xerial.snappy:snappy-java:$snappyVersion", optional
+    compile "com.github.luben:zstd-jni:$zstdVersion", optional
+    compile "org.mongodb:mongodb-crypt:$mongoCryptVersion", optional
 }
 
 // srcDirs copied as well, so everything is compiled twice
 sourceSets {
     main {
         java {
-            srcDirs = ["$rootDir/driver/src/main", "$rootDir/driver-core/src/main", "$rootDir/bson/src/main"]
+            srcDirs = ["$rootDir/driver-legacy/src/main",
+                       "$rootDir/driver-sync/src/main",
+                       "$rootDir/driver-core/src/main",
+                       "$rootDir/driver-core/build/gen/buildconfig/src/main",
+                       "$rootDir/bson/src/main"]
         }
     }
 }
@@ -46,25 +49,24 @@ sourceSets {
 // copied from driver-core
 jar {
     manifest {
+        instruction 'Build-Version', project.gitVersion
         instruction 'Import-Package',
                     'javax.xml.bind.*',
                     'javax.crypto.*',
                     'javax.crypto.spec.*',
                     'javax.management.*',
+                    'javax.naming.*',
+                    'javax.naming.directory.*',
+                    'javax.naming.spi.*',
                     'javax.net.*',
                     'javax.net.ssl.*',
                     'javax.security.sasl.*',
                     'javax.security.auth.callback.*',
                     'org.ietf.jgss.*',
                     'io.netty.*;resolution:=optional',
-                    'org.slf4j;resolution:=optional'
-    }
-    }
-
-modifyPom {
-    project {
-        name 'MongoDB Java Driver'
-        description 'The MongoDB Java Driver uber-artifact, containing mongodb-driver, mongodb-driver-core, and bson'
-        url 'http://www.mongodb.org'
+                    'org.xerial.snappy.*;resolution:=optional',
+                    'com.github.luben.zstd.*;resolution:=optional',
+                    'org.slf4j;resolution:=optional',
+                    'jnr.unixsocket;resolution:=optional'
     }
 }
diff --git a/mongodb-driver/build.gradle b/mongodb-driver/build.gradle
new file mode 100644
index 00000000000..2260482dc56
--- /dev/null
+++ b/mongodb-driver/build.gradle
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+archivesBaseName = 'mongodb-driver'
+description =  'The MongoDB Driver uber-artifact that combines mongodb-driver-sync and the legacy driver'
+ext {
+    pomName = 'MongoDB Java Driver'
+}
+
+clirr {
+    enabled = false
+}
+
+dependencies {
+    compile project(':bson')
+    compile project(':driver-core')
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ["$rootDir/driver-legacy/src/main",
+                       "$rootDir/driver-sync/src/main"]
+        }
+    }
+}
+
+jar {
+    manifest {
+        instruction 'Build-Version', project.gitVersion
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index 818a10b6e73..ff479919037 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,5 +14,13 @@
  * limitations under the License.
  */
 
-include 'util','bson', 'driver-core', 'driver', 'driver-async', 'mongo-java-driver'
-
+include ':bson'
+include ':driver-async'
+include ':driver-benchmarks'
+include ':driver-core'
+include ':driver-embedded'
+include ':driver-legacy'
+include ':driver-sync'
+include ':mongo-java-driver'
+include ':mongodb-driver'
+include ':util'
diff --git a/settings.jar b/settings.jar
deleted file mode 100644
index 95dfd1b03c9..00000000000
Binary files a/settings.jar and /dev/null differ
diff --git a/util/build.gradle b/util/build.gradle
index ba3d0e4444d..4498034e07a 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,3 @@
  * limitations under the License.
  */
 
-apply plugin: 'java'
-
-sourceCompatibility = '1.6'
-targetCompatibility = '1.6'
-
-dependencies {
-    compile files("${System.getProperty('java.home')}/../lib/tools.jar")
-}
-
-sourceSets {
-    main { java.srcDirs = ['src/main'] }
-}
diff --git a/util/src/main/DocTaglet.java b/util/src/main/DocTaglet.java
index a2ec7395c5c..6e64a66acf8 100644
--- a/util/src/main/DocTaglet.java
+++ b/util/src/main/DocTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,57 +14,43 @@
  * limitations under the License.
  */
 
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.Taglet;
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.UnknownBlockTagTree;
+import jdk.javadoc.doclet.Taglet;
+import javax.lang.model.element.Element;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-public abstract class DocTaglet implements Taglet {
-
-    public boolean inConstructor() {
-        return true;
-    }
-
-    public boolean inField() {
-        return true;
-    }
-
-    public boolean inMethod() {
-        return true;
-    }
-
-    public boolean inOverview() {
-        return true;
-    }
+import static java.util.Arrays.asList;
+import static jdk.javadoc.doclet.Taglet.Location.*;
 
-    public boolean inPackage() {
-        return true;
-    }
+public abstract class DocTaglet implements Taglet {
 
-    public boolean inType() {
-        return true;
+    @Override
+    public Set<Location> getAllowedLocations() {
+        return new HashSet<Location>(asList(CONSTRUCTOR, METHOD, FIELD, OVERVIEW, PACKAGE, TYPE));
     }
 
+    @Override
     public boolean isInlineTag() {
         return false;
     }
 
-    public String toString(final Tag[] tags) {
-        if (tags.length == 0) {
+    @Override
+    public String toString(List<? extends DocTree> tags, Element element) {
+        if (tags.size() == 0) {
             return null;
         }
 
-        StringBuilder buf = new StringBuilder(String.format("\n<dl><dt><span class=\"strong\">%s</span></dt>\n", getHeader()));
-        for (Tag t : tags) {
-            buf.append("   <dd>").append(genLink(t.text())).append("</dd>\n");
+        StringBuilder buf = new StringBuilder(String.format("<dl><dt><span class=\"strong\">%s</span></dt>", getHeader()));
+        for (DocTree tag : tags) {
+            String text = ((UnknownBlockTagTree) tag).getContent().get(0).toString();
+            buf.append("<dd>").append(genLink(text)).append("</dd>");
         }
         return buf.toString();
     }
 
-    protected abstract String getHeader();
-
-    public String toString(final Tag tag) {
-        return toString(new Tag[]{tag});
-    }
-
     protected String genLink(final String text) {
         String relativePath = text;
         String display = text;
@@ -78,5 +64,7 @@ protected String genLink(final String text) {
         return String.format("<a href='%s%s'>%s</a>", getBaseDocURI(), relativePath, display);
     }
 
+    protected abstract String getHeader();
+
     protected abstract String getBaseDocURI();
 }
diff --git a/util/src/main/DochubTaglet.java b/util/src/main/DochubTaglet.java
new file mode 100644
index 00000000000..541775b1bff
--- /dev/null
+++ b/util/src/main/DochubTaglet.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class DochubTaglet extends DocTaglet {
+
+    @Override
+    public String getName() {
+        return "mongodb.driver.dochub";
+    }
+
+    @Override
+    protected String getHeader() {
+        return "MongoDB documentation";
+    }
+
+    @Override
+    protected String getBaseDocURI() {
+        return "http://dochub.mongodb.org/";
+    }
+
+}
diff --git a/util/src/main/ManualTaglet.java b/util/src/main/ManualTaglet.java
index 228f0d5d1c9..71312bd76e1 100644
--- a/util/src/main/ManualTaglet.java
+++ b/util/src/main/ManualTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,9 @@
  * limitations under the License.
  */
 
-import com.sun.tools.doclets.Taglet;
-
-import java.util.Map;
-
 public class ManualTaglet extends DocTaglet {
 
-    public static void register(final Map<String, Taglet> tagletMap) {
-        ManualTaglet t = new ManualTaglet();
-        tagletMap.put(t.getName(), t);
-    }
-
+    @Override
     public String getName() {
         return "mongodb.driver.manual";
     }
diff --git a/util/src/main/ServerReleaseTaglet.java b/util/src/main/ServerReleaseTaglet.java
index b6e2bfa115b..0b7b69a3421 100644
--- a/util/src/main/ServerReleaseTaglet.java
+++ b/util/src/main/ServerReleaseTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,29 +14,21 @@
  * limitations under the License.
  */
 
-import com.sun.tools.doclets.Taglet;
-
-import java.util.Map;
-
 public class ServerReleaseTaglet extends DocTaglet {
 
-    public static void register(final Map<String, Taglet> tagletMap) {
-        Taglet t = new ServerReleaseTaglet();
-        tagletMap.put(t.getName(), t);
-    }
-
     @Override
     public String getName() {
         return "mongodb.server.release";
     }
 
     @Override
-    protected String getBaseDocURI() {
-        return "http://docs.mongodb.org/manual/release-notes/";
+    protected String getHeader() {
+        return "Since server release";
     }
 
     @Override
-    protected String getHeader() {
-        return "Since server release";
+    protected String getBaseDocURI() {
+        return "http://docs.mongodb.org/manual/release-notes/";
     }
+
 }
diff --git a/util/src/main/category/Async.java b/util/src/main/category/Async.java
index 83c7c999e7d..7f439212e10 100644
--- a/util/src/main/category/Async.java
+++ b/util/src/main/category/Async.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/util/src/main/category/ReplicaSet.java b/util/src/main/category/ReplicaSet.java
deleted file mode 100644
index 9a7981d7a71..00000000000
--- a/util/src/main/category/ReplicaSet.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2008-2014 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package category;
-
-public interface ReplicaSet {
-}
diff --git a/util/src/main/category/Slow.java b/util/src/main/category/Slow.java
index 401e6df6bdb..8fdbedfe517 100644
--- a/util/src/main/category/Slow.java
+++ b/util/src/main/category/Slow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-present MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/util/src/main/category/SlowUnit.java b/util/src/main/category/SlowUnit.java
deleted file mode 100644
index 49f2da0e36f..00000000000
--- a/util/src/main/category/SlowUnit.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2015 MongoDB, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package category;
-
-/**
- * Marker for slow tests that do not need to be run against multiple versions or configurations of MongoDB.
- */
-public interface SlowUnit {
-}